diff --git a/.gitignore b/.gitignore
index 05f981a0ace..ab1893af903 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,12 +7,14 @@ tests/cases/perf/*
 test-args.txt
 ~*.docx
 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/configureNightly.js
@@ -26,11 +28,13 @@ rwc-report.html
 *.swp
 build.json
 *.actual
+tests/webTestServer.js
+tests/webTestServer.js.map
 tests/webhost/*.d.ts
 tests/webhost/webtsc.js
-tests/*.js
-tests/*.js.map
-tests/*.d.ts
+tests/cases/**/*.js
+tests/cases/**/*.js.map
+tests/cases/**/*.d.ts
 *.config
 scripts/debug.bat
 scripts/run.bat
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1dba1281dd7..7a99bf318d2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -13,7 +13,7 @@ Issues that ask questions answered in the FAQ will be closed without elaboration
 ## 3. Do you have a question?
 
 The issue tracker is for **issues**, in other words, bugs and suggestions.
-If you have a *question*, please use [http://stackoverflow.com/questions/tagged/typescript](Stack Overflow), [https://gitter.im/Microsoft/TypeScript](Gitter), your favorite search engine, or other resources.
+If you have a *question*, please use [Stack Overflow](http://stackoverflow.com/questions/tagged/typescript), [Gitter](https://gitter.im/Microsoft/TypeScript), your favorite search engine, or other resources.
 Due to increased traffic, we can no longer answer questions in the issue tracker.
 
 ## 4. Did you find a bug?
diff --git a/Jakefile.js b/Jakefile.js
index 879b9ba4cba..8e7dfb582ef 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -5,6 +5,7 @@ var os = require("os");
 var path = require("path");
 var child_process = require("child_process");
 var Linter = require("tslint");
+var readline = require("readline");
 
 // Variables
 var compilerDirectory = "src/compiler/";
@@ -178,30 +179,73 @@ var harnessSources = harnessCoreSources.concat([
     "reuseProgramStructure.ts",
     "cachingInServerLSHost.ts",
     "moduleResolution.ts",
-    "tsconfigParsing.ts"
+    "tsconfigParsing.ts",
+    "commandLineParsing.ts",
+    "convertCompilerOptionsFromJson.ts",
+    "convertTypingOptionsFromJson.ts"
 ].map(function (f) {
     return path.join(unittestsDirectory, f);
 })).concat([
     "protocol.d.ts",
     "session.ts",
     "client.ts",
-    "editorServices.ts",
+    "editorServices.ts"
 ].map(function (f) {
     return path.join(serverDirectory, f);
 }));
 
 var librarySourceMap = [
-        { target: "lib.core.d.ts", sources: ["header.d.ts", "core.d.ts"] },
-        { target: "lib.dom.d.ts", sources: ["importcore.d.ts", "intl.d.ts", "dom.generated.d.ts"], },
-        { target: "lib.webworker.d.ts", sources: ["importcore.d.ts", "intl.d.ts", "webworker.generated.d.ts"], },
-        { target: "lib.scriptHost.d.ts", sources: ["importcore.d.ts", "scriptHost.d.ts"], },
-        { target: "lib.d.ts", sources: ["header.d.ts", "core.d.ts", "intl.d.ts", "dom.generated.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"], },
-        { target: "lib.core.es6.d.ts", sources: ["header.d.ts", "core.d.ts", "es6.d.ts"]},
-        { target: "lib.es6.d.ts", sources: ["header.d.ts", "es6.d.ts", "core.d.ts", "intl.d.ts", "dom.generated.d.ts", "dom.es6.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"] },
-        { target: "lib.core.es7.d.ts", sources: ["header.d.ts", "core.d.ts", "es6.d.ts", "es7.d.ts"]},
-        { target: "lib.es7.d.ts", sources: ["header.d.ts", "es6.d.ts", "es7.d.ts", "core.d.ts", "intl.d.ts", "dom.generated.d.ts", "dom.es6.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"] }
+    { target: "lib.core.d.ts", sources: ["header.d.ts", "core.d.ts"] },
+    { target: "lib.dom.d.ts", sources: ["importcore.d.ts", "intl.d.ts", "dom.generated.d.ts"] },
+    { target: "lib.webworker.d.ts", sources: ["importcore.d.ts", "intl.d.ts", "webworker.generated.d.ts"] },
+    { target: "lib.scriptHost.d.ts", sources: ["importcore.d.ts", "scriptHost.d.ts"] },
+    { target: "lib.d.ts", sources: ["header.d.ts", "core.d.ts", "intl.d.ts", "dom.generated.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"] },
+    { target: "lib.core.es6.d.ts", sources: ["header.d.ts", "core.d.ts", "es6.d.ts"] },
+    { target: "lib.es6.d.ts", sources: ["header.d.ts", "es6.d.ts", "core.d.ts", "intl.d.ts", "dom.generated.d.ts", "dom.es6.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"] },
+    { target: "lib.core.es7.d.ts", sources: ["header.d.ts", "core.d.ts", "es6.d.ts", "es7.d.ts"] },
+    { target: "lib.es7.d.ts", sources: ["header.d.ts", "es6.d.ts", "es7.d.ts", "core.d.ts", "intl.d.ts", "dom.generated.d.ts", "dom.es6.d.ts", "webworker.importscripts.d.ts", "scriptHost.d.ts"] }
+];
+var es2015LibrarySources = [
+    "es2015.core.d.ts",
+    "es2015.collection.d.ts",
+    "es2015.generator.d.ts",
+    "es2015.iterable.d.ts",
+    "es2015.promise.d.ts",
+    "es2015.proxy.d.ts",
+    "es2015.reflect.d.ts",
+    "es2015.symbol.d.ts",
+    "es2015.symbol.wellknown.d.ts",
 ];
 
+var es2015LibrarySourceMap = es2015LibrarySources.map(function(source) {
+   return  { target: "lib." + source, sources: ["header.d.ts", source] };
+});
+
+var es2016LibrarySource = [ "es2016.array.include.d.ts" ];
+
+var es2016LibrarySourceMap = es2016LibrarySource.map(function(source) {
+    return { target: "lib." + source, sources: ["header.d.ts", source] };
+})
+
+var hostsLibrarySources = ["dom.generated.d.ts", "webworker.importscripts.d.ts", "scripthost.d.ts"]
+
+var librarySourceMap = [
+        // Host library
+        { target: "lib.dom.d.ts", sources: ["header.d.ts", "dom.generated.d.ts"], },
+        { target: "lib.dom.iterable.d.ts", sources: ["header.d.ts", "dom.iterable.d.ts"], },
+        { target: "lib.webworker.d.ts", sources: ["header.d.ts", "webworker.generated.d.ts"], },
+        { target: "lib.scripthost.d.ts", sources: ["header.d.ts", "scripthost.d.ts"], },
+        
+        // JavaScript library
+        { target: "lib.es5.d.ts", sources: ["header.d.ts", "es5.d.ts"] },
+        { target: "lib.es2015.d.ts", sources: ["header.d.ts", "es2015.d.ts"] },
+        { target: "lib.es2016.d.ts", sources: ["header.d.ts", "es2016.d.ts"] },
+        
+        // JavaScript + all host library
+        { target: "lib.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(hostsLibrarySources), },
+        { target: "lib.es6.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(es2015LibrarySources, hostsLibrarySources), },
+].concat(es2015LibrarySourceMap, es2016LibrarySourceMap);
+
 var libraryTargets = librarySourceMap.map(function (f) {
     return path.join(builtLocalDirectory, f.target);
 });
@@ -240,8 +284,7 @@ function concatenateFiles(destinationFile, sourceFiles) {
 }
 
 var useDebugMode = true;
-var useTransforms = process.env.USE_TRANSFORMS || false;
-var host = (process.env.host || process.env.TYPESCRIPT_HOST || "node");
+var host = (process.env.TYPESCRIPT_HOST || process.env.host || "node");
 var compilerFilename = "tsc.js";
 var LKGCompiler = path.join(LKGDirectory, compilerFilename);
 var builtLocalCompiler = path.join(builtLocalDirectory, compilerFilename);
@@ -252,56 +295,64 @@ var builtLocalCompiler = path.join(builtLocalDirectory, compilerFilename);
     * @param prereqs: prerequisite tasks to compiling the file
     * @param prefixes: a list of files to prepend to the target file
     * @param useBuiltCompiler: true to use the built compiler, false to use the LKG
-    * @param noOutFile: true to compile without using --out
-    * @param generateDeclarations: true to compile using --declaration
-    * @param outDir: true to compile using --outDir
-    * @param keepComments: false to compile using --removeComments
+    * @parap {Object}  opts - property bag containing auxiliary options
+    * @param {boolean} opts.noOutFile: true to compile without using --out
+    * @param {boolean} opts.generateDeclarations: true to compile using --declaration
+    * @param {string}  opts.outDir: value for '--outDir' command line option
+    * @param {boolean} opts.keepComments: false to compile using --removeComments
+    * @param {boolean} opts.preserveConstEnums: true if compiler should keep const enums in code
+    * @param {boolean} opts.noResolve: true if compiler should not include non-rooted files in compilation
+    * @param {boolean} opts.stripInternal: true if compiler should remove declarations marked as @internal
+    * @param {boolean} opts.noMapRoot: true if compiler omit mapRoot option
     * @param callback: a function to execute after the compilation process ends
     */
-function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, noOutFile, generateDeclarations, outDir, preserveConstEnums, keepComments, noResolve, stripInternal, callback) {
+function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, opts, callback) {
     file(outFile, prereqs, function() {
         var compilerPath = useBuiltCompiler ? builtLocalCompiler : LKGCompiler;
         var options = "--noImplicitAny --noEmitOnError --pretty";
-
+        opts = opts || {};
         // Keep comments when specifically requested
         // or when in debug mode.
-        if (!(keepComments || useDebugMode)) {
+        if (!(opts.keepComments || useDebugMode)) {
             options += " --removeComments";
         }
 
-        if (generateDeclarations) {
+        if (opts.generateDeclarations) {
             options += " --declaration";
         }
 
-        if (preserveConstEnums || useDebugMode) {
+        if (opts.preserveConstEnums || useDebugMode) {
             options += " --preserveConstEnums";
         }
 
-        if (outDir) {
-            options += " --outDir " + outDir;
+        if (opts.outDir) {
+            options += " --outDir " + opts.outDir;
         }
 
-        if (!noOutFile) {
+        if (!opts.noOutFile) {
             options += " --out " + outFile;
         }
         else {
-            options += " --module commonjs"
+            options += " --module commonjs";
         }
 
-        if(noResolve) {
+        if(opts.noResolve) {
             options += " --noResolve";
         }
 
         if (useDebugMode) {
-            options += " -sourcemap -mapRoot file:///" + path.resolve(path.dirname(outFile));
+            options += " -sourcemap";
+            if (!opts.noMapRoot) {
+                options += " -mapRoot file:///" + path.resolve(path.dirname(outFile));
+            }
         }
 
-        if (stripInternal) {
-            options += " --stripInternal"
+        if (opts.stripInternal) {
+            options += " --stripInternal";
         }
 
-        if (useBuiltCompiler && useTransforms) {
-            options += " --experimentalTransforms"
+        if (useBuiltCompiler && !environmentVariableIsDisabled("USE_TRANSFORMS")) {
+            console.warn("\u001b[93mwarning: 'USE_TRANSFORMS' environment variable is not set to 'false'. Experimental transforms will be enabled by default.\u001b[0m");
         }
 
         var cmd = host + " " + compilerPath + " " + options + " ";
@@ -415,22 +466,12 @@ compileFile(/*outfile*/configureNightlyJs,
             /*prereqs*/ [configureNightlyTs],
             /*prefixes*/ [],
             /*useBuiltCompiler*/ false,
-            /*noOutFile*/ false,
-            /*generateDeclarations*/ false,
-            /*outDir*/ undefined,
-            /*preserveConstEnums*/ undefined,
-            /*keepComments*/ false,
-            /*noResolve*/ false,
-            /*stripInternal*/ false);
+            { noOutFile: false, generateDeclarations: false, keepComments: false, noResolve: false, stripInternal: false });
 
 task("setDebugMode", function() {
     useDebugMode = true;
 });
 
-task("setTransforms", function() {
-    useTransforms = true;
-});
-
 task("configure-nightly", [configureNightlyJs], function() {
     var cmd = host + " " + configureNightlyJs + " " + packageJson + " " + programTs;
     console.log(cmd);
@@ -449,9 +490,9 @@ file(scriptsTsdJson);
 
 task("tsd-scripts", [scriptsTsdJson], function () {
     var cmd = "tsd --config " + scriptsTsdJson + " install";
-    console.log(cmd)
+    console.log(cmd);
     exec(cmd);
-}, { async: true })
+}, { async: true });
 
 var importDefinitelyTypedTestsDirectory = path.join(scriptsDirectory, "importDefinitelyTypedTests");
 var importDefinitelyTypedTestsJs = path.join(importDefinitelyTypedTestsDirectory, "importDefinitelyTypedTests.js");
@@ -475,6 +516,7 @@ var tscFile = path.join(builtLocalDirectory, compilerFilename);
 compileFile(tscFile, compilerSources, [builtLocalDirectory, copyright].concat(compilerSources), [copyright], /*useBuiltCompiler:*/ false);
 
 var servicesFile = path.join(builtLocalDirectory, "typescriptServices.js");
+var servicesFileInBrowserTest = path.join(builtLocalDirectory, "typescriptServicesInBrowserTest.js");
 var standaloneDefinitionsFile = path.join(builtLocalDirectory, "typescriptServices.d.ts");
 var nodePackageFile = path.join(builtLocalDirectory, "typescript.js");
 var nodeDefinitionsFile = path.join(builtLocalDirectory, "typescript.d.ts");
@@ -483,13 +525,7 @@ var nodeStandaloneDefinitionsFile = path.join(builtLocalDirectory, "typescript_s
 compileFile(servicesFile, servicesSources,[builtLocalDirectory, copyright].concat(servicesSources),
             /*prefixes*/ [copyright],
             /*useBuiltCompiler*/ true,
-            /*noOutFile*/ false,
-            /*generateDeclarations*/ true,
-            /*outDir*/ undefined,
-            /*preserveConstEnums*/ true,
-            /*keepComments*/ true,
-            /*noResolve*/ false,
-            /*stripInternal*/ true,
+            { noOutFile: false, generateDeclarations: true, preserveConstEnums: true, keepComments: true, noResolve: false, stripInternal: true },
             /*callback*/ function () {
                 jake.cpR(servicesFile, nodePackageFile, {silent: true});
 
@@ -512,6 +548,16 @@ compileFile(servicesFile, servicesSources,[builtLocalDirectory, copyright].conca
                 fs.writeFileSync(nodeStandaloneDefinitionsFile, nodeStandaloneDefinitionsFileContents);
             });
 
+compileFile(servicesFileInBrowserTest, servicesSources,[builtLocalDirectory, copyright].concat(servicesSources),
+            /*prefixes*/ [copyright],
+            /*useBuiltCompiler*/ true,
+            { noOutFile: false, generateDeclarations: true, preserveConstEnums: true, keepComments: true, noResolve: false, stripInternal: true, noMapRoot: true },
+            /*callback*/ function () {
+                var content = fs.readFileSync(servicesFileInBrowserTest).toString();
+                var i = content.lastIndexOf("\n");
+                fs.writeFileSync(servicesFileInBrowserTest, content.substring(0, i) + "\r\n//# sourceURL=../built/local/typeScriptServices.js" + content.substring(i));
+            });
+
 
 var serverFile = path.join(builtLocalDirectory, "tsserver.js");
 compileFile(serverFile, serverSources,[builtLocalDirectory, copyright].concat(serverSources), /*prefixes*/ [copyright], /*useBuiltCompiler*/ true);
@@ -523,8 +569,7 @@ compileFile(
     [builtLocalDirectory, copyright].concat(languageServiceLibrarySources),
     /*prefixes*/ [copyright],
     /*useBuiltCompiler*/ true,
-    /*noOutFile*/ false,
-    /*generateDeclarations*/ true);
+    { noOutFile: false, generateDeclarations: true });
 
 // Local target to build the language service server library
 desc("Builds language service server library");
@@ -614,7 +659,7 @@ directory(builtLocalDirectory);
 var run = path.join(builtLocalDirectory, "run.js");
 compileFile(run, harnessSources, [builtLocalDirectory, tscFile].concat(libraryTargets).concat(harnessSources), [], /*useBuiltCompiler:*/ true);
 
-var internalTests = "internal/"
+var internalTests = "internal/";
 
 var localBaseline = "tests/baselines/local/";
 var refBaseline = "tests/baselines/reference/";
@@ -671,10 +716,25 @@ function cleanTestDirs() {
 }
 
 // used to pass data from jake command line directly to run.js
-function writeTestConfigFile(tests, light, testConfigFile) {
-    console.log('Running test(s): ' + tests);
-    var testConfigContents = JSON.stringify({ test: [tests], light: light });
-    fs.writeFileSync('test.config', testConfigContents);
+function writeTestConfigFile(testConfigFile, tests, light, stackTraceLimit) {
+    var testConfig;
+    if (tests) {
+        console.log('Running test(s): ' + tests);
+        (testConfig || (testConfig = {})).tests = [tests];
+    }
+
+    if (light) {
+        (testConfig || (testConfig = {})).light = light;
+    }
+
+    if (/^(\d+|full)$/.test(stackTraceLimit)) {
+        (testConfig || (testConfig = {})).stackTraceLimit = stackTraceLimit;
+    }
+
+    if (testConfig) {
+        var testConfigContents = JSON.stringify(testConfig);
+        fs.writeFileSync(testConfigFile, testConfigContents);
+    }
 }
 
 function deleteTemporaryProjectOutput() {
@@ -683,25 +743,154 @@ function deleteTemporaryProjectOutput() {
     }
 }
 
-function runConsoleTests(defaultReporter, defaultSubsets, postLint) {
+function runTestsAndWriteOutput(file) {
     cleanTestDirs();
+    var tests = process.env.test || process.env.tests || process.env.t;
+    var light = process.env.light || false;
+    var testConfigFile = 'test.config';
+    if (fs.existsSync(testConfigFile)) {
+        fs.unlinkSync(testConfigFile);
+    }
+
+    writeTestConfigFile(testConfigFile, tests, light, 10);
+
+    if (tests && tests.toLocaleLowerCase() === "rwc") {
+        testTimeout = 100000;
+    }
+
+    var args = [];
+    args.push("-R", "tap");
+    args.push("--no-colors");
+    args.push("-t", testTimeout);
+    if (tests) {
+        args.push("-g", '"' + tests + '"');
+    }
+    args.push(run);
+
+    var cmd = "mocha " + args.join(" ");
+    console.log(cmd);
+    var p = child_process.spawn(
+        process.platform === "win32" ? "cmd" : "/bin/sh",
+        process.platform === "win32" ? ["/c", cmd] : ["-c", cmd], {
+            windowsVerbatimArguments: true
+        });
+
+    var out = fs.createWriteStream(file);
+    var tapRange = /^(\d+)\.\.(\d+)(?:$|\r\n?|\n)/;
+    var tapOk = /^ok\s/;
+    var tapNotOk = /^not\sok\s/;
+    var tapComment = /^#/;
+    var typeError = /^\s+TypeError:/;
+    var debugError = /^\s+Error:\sDebug\sFailure\./;
+    var progress = new ProgressBar("Running tests...");
+    var expectedTestCount = 0;
+    var testCount = 0;
+    var failureCount = 0;
+    var successCount = 0;
+    var comments = [];
+    var typeErrorCount = 0;
+    var debugErrorCount = 0;
+
+    var rl = readline.createInterface({
+        input: p.stdout,
+        terminal: false
+    });
+
+    function updateProgress(percentComplete) {
+        progress.update(percentComplete,
+            /*foregroundColor*/ failureCount > 0
+                ? "red"
+                : successCount === expectedTestCount
+                    ? "green"
+                    : "cyan",
+            /*backgroundColor*/ "gray"
+        );
+    }
+
+    rl.on("line", function (line) {
+        var m = tapRange.exec(line);
+        if (m) {
+            expectedTestCount = parseInt(m[2]);
+            return;
+        }
+
+        if (tapOk.test(line)) {
+            out.write(line.replace(/^ok\s+\d+\s+/, "ok ") + os.EOL);
+            successCount++;
+        }
+        else if (tapNotOk.test(line)) {
+            out.write(line.replace(/^not\s+ok\s+\d+\s+/, "not ok ") + os.EOL);
+            failureCount++;
+        }
+        else {
+            out.write(line + os.EOL);
+            if (tapComment.test(line)) {
+                comments.push(line);
+            }
+            else if (typeError.test(line)) {
+                typeErrorCount++;
+            }
+            else if (debugError.test(line)) {
+                debugErrorCount++;
+            }
+            return;
+        }
+
+        testCount++;
+
+        var percentComplete = testCount * 100 / expectedTestCount;
+        updateProgress(percentComplete);
+    });
+
+    p.on("exit", function (status) {
+        if (progress.visible) {
+            updateProgress(100);
+            process.stdout.write("done." + os.EOL);
+        }
+
+        console.log(comments.join(os.EOL));
+
+        if (typeErrorCount) {
+            console.log("# type errors: %s", typeErrorCount);
+        }
+
+        if (debugErrorCount) {
+            console.log("# debug errors: %s", debugErrorCount);
+        }
+
+        deleteTemporaryProjectOutput();
+        if (status) {
+            fail("Process exited with code " + status);
+        }
+        else {
+            complete();
+        }
+    });
+}
+
+function runConsoleTests(defaultReporter, defaultSubsets, 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 || 1;
     var testConfigFile = 'test.config';
-    if(fs.existsSync(testConfigFile)) {
+    if (fs.existsSync(testConfigFile)) {
         fs.unlinkSync(testConfigFile);
     }
 
     if (tests || light) {
-        writeTestConfigFile(tests, light, testConfigFile);
+        writeTestConfigFile(testConfigFile, tests, light, stackTraceLimit);
     }
 
     if (tests && tests.toLocaleLowerCase() === "rwc") {
         testTimeout = 100000;
     }
 
-    colors = process.env.colors || process.env.color
+    colors = process.env.colors || process.env.color;
     colors = colors ? ' --no-colors ' : ' --colors ';
     reporter = process.env.reporter || process.env.r || defaultReporter;
 
@@ -709,20 +898,20 @@ function runConsoleTests(defaultReporter, defaultSubsets, postLint) {
     // default timeout is 2sec which really should be enough, but maybe we just need a small amount longer
     var subsetRegexes;
     if(defaultSubsets.length === 0) {
-        subsetRegexes = [tests]
+        subsetRegexes = [tests];
     }
     else {
         var subsets = tests ? tests.split("|") : defaultSubsets;
         subsetRegexes = subsets.map(function (sub) { return "^" + sub + ".*$"; });
         subsetRegexes.push("^(?!" + subsets.join("|") + ").*$");
     }
-    subsetRegexes.forEach(function (subsetRegex) {
+    subsetRegexes.forEach(function (subsetRegex, i) {
         tests = subsetRegex ? ' -g "' + subsetRegex + '"' : '';
         var cmd = "mocha" + (debug ? " --debug-brk" : "") + " -R " + reporter + tests + colors + ' -t ' + testTimeout + ' ' + run;
         console.log(cmd);
         exec(cmd, function () {
             deleteTemporaryProjectOutput();
-            if (postLint) {
+            if (i === 0 && !dirty) {
                 var lint = jake.Task['lint'];
                 lint.addListener('complete', function () {
                     complete();
@@ -744,9 +933,16 @@ task("runtests-parallel", ["build-rules", "tests", builtLocalDirectory], functio
 
 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.");
 task("runtests", ["build-rules", "tests", builtLocalDirectory], function() {
-    runConsoleTests('mocha-fivemat-progress-reporter', [], /*postLint*/ true);
+    runConsoleTests('mocha-fivemat-progress-reporter', []);
 }, {async: true});
 
+task("runtests-file", ["build-rules", "tests", builtLocalDirectory], function () {
+    runTestsAndWriteOutput("tests/baselines/local/testresults.tap");
+}, { async: true });
+task("runtests-dirty", ["build-rules", "tests", builtLocalDirectory], function () {
+    runConsoleTests("mocha-fivemat-progress-reporter", [], /*dirty*/ true);
+}, { async: true });
+
 desc("Generates code coverage data via instanbul");
 task("generate-code-coverage", ["tests", builtLocalDirectory], function () {
     var cmd = 'istanbul cover node_modules/mocha/bin/_mocha -- -R min -t ' + testTimeout + ' ' + run;
@@ -755,20 +951,20 @@ task("generate-code-coverage", ["tests", builtLocalDirectory], function () {
 }, { async: true });
 
 // Browser tests
-var nodeServerOutFile = 'tests/webTestServer.js'
-var nodeServerInFile = 'tests/webTestServer.ts'
-compileFile(nodeServerOutFile, [nodeServerInFile], [builtLocalDirectory, tscFile], [], /*useBuiltCompiler:*/ true, /*noOutFile*/ true);
+var nodeServerOutFile = 'tests/webTestServer.js';
+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 -o built/local/bundle.js';
+    var cmd = 'browserify built/local/run.js -t ./scripts/browserify-optional -o built/local/bundle.js';
     exec(cmd);
 }, {async: true});
 
 desc("Runs the tests using the built run.js file like 'jake runtests'. Syntax is jake runtests-browser. Additional optional parameters tests=[regex], port=, browser=[chrome|IE]");
-task("runtests-browser", ["tests", "browserify", builtLocalDirectory], function() {
+task("runtests-browser", ["tests", "browserify", builtLocalDirectory, servicesFileInBrowserTest], function() {
     cleanTestDirs();
-    host = "node"
+    host = "node";
     port = process.env.port || process.env.p || '8888';
     browser = process.env.browser || process.env.b || "IE";
     tests = process.env.test || process.env.tests || process.env.t;
@@ -778,17 +974,17 @@ task("runtests-browser", ["tests", "browserify", builtLocalDirectory], function(
         fs.unlinkSync(testConfigFile);
     }
     if(tests || light) {
-        writeTestConfigFile(tests, light, testConfigFile);
+        writeTestConfigFile(testConfigFile, tests, light);
     }
 
     tests = tests ? tests : '';
-    var cmd = host + " tests/webTestServer.js " + port + " " + browser + " " + tests
+    var cmd = host + " tests/webTestServer.js " + port + " " + browser + " " + tests;
     console.log(cmd);
     exec(cmd);
 }, {async: true});
 
 function getDiffTool() {
-    var program = process.env['DIFF']
+    var program = process.env['DIFF'];
     if (!program) {
         fail("Add the 'DIFF' environment variable to the path of the program you want to use.");
     }
@@ -817,11 +1013,11 @@ task("tests-debug", ["setDebugMode", "tests"]);
 // Makes the test results the new baseline
 desc("Makes the most recent test results the new baseline, overwriting the old baseline");
 task("baseline-accept", function(hardOrSoft) {
-    if (!hardOrSoft || hardOrSoft == "hard") {
+    if (!hardOrSoft || hardOrSoft === "hard") {
         jake.rmRf(refBaseline);
         fs.renameSync(localBaseline, refBaseline);
     }
-    else if (hardOrSoft == "soft") {
+    else if (hardOrSoft === "soft") {
         var files = jake.readdirR(localBaseline);
         for (var i in files) {
             jake.cpR(files[i], refBaseline);
@@ -900,15 +1096,14 @@ task("update-sublime", ["local", serverFile], function() {
 });
 
 var tslintRuleDir = "scripts/tslint";
-var tslintRules = ([
+var tslintRules = [
     "nextLineRule",
-    "noNullRule",
     "preferConstRule",
     "booleanTriviaRule",
     "typeOperatorSpacingRule",
     "noInOperatorRule",
     "noIncrementDecrementRule"
-]);
+];
 var tslintRulesFiles = tslintRules.map(function(p) {
     return path.join(tslintRuleDir, p + ".ts");
 });
@@ -918,7 +1113,8 @@ var tslintRulesOutFiles = tslintRules.map(function(p) {
 desc("Compiles tslint rules to js");
 task("build-rules", tslintRulesOutFiles);
 tslintRulesFiles.forEach(function(ruleFile, i) {
-    compileFile(tslintRulesOutFiles[i], [ruleFile], [ruleFile], [], /*useBuiltCompiler*/ false, /*noOutFile*/ true, /*generateDeclarations*/ false, path.join(builtLocalDirectory, "tslint"));
+    compileFile(tslintRulesOutFiles[i], [ruleFile], [ruleFile], [], /*useBuiltCompiler*/ false,
+    { noOutFile: true, generateDeclarations: false, outDir: path.join(builtLocalDirectory, "tslint")});
 });
 
 function getLinterOptions() {
@@ -932,7 +1128,7 @@ function getLinterOptions() {
 
 function lintFileContents(options, path, contents) {
     var ll = new Linter(path, contents, options);
-    console.log("Linting '" + path + "'.")
+    console.log("Linting '" + path + "'.");
     return ll.lint();
 }
 
@@ -957,6 +1153,7 @@ var servicesLintTargets = [
     "patternMatcher.ts",
     "services.ts",
     "shims.ts",
+    "jsTyping.ts"
 ].map(function (s) {
     return path.join(servicesDirectory, s);
 });
@@ -1027,3 +1224,93 @@ task("lint-server", ["build-rules"], function() {
         lintWatchFile(lintTargets[i]);
     }
 });
+
+function ProgressBar(title) {
+    this.title = title;
+}
+ProgressBar.prototype = {
+    progressChars: ["\u0020", "\u2591", "\u2592", "\u2593", "\u2588"],
+    colors: {
+        foreground: {
+            black: "\u001b[90m",
+            red: "\u001b[91m",
+            green: "\u001b[92m",
+            yellow: "\u001b[93m",
+            blue: "\u001b[94m",
+            magenta: "\u001b[95m",
+            cyan: "\u001b[96m",
+            white: "\u001b[97m",
+            gray: "\u001b[37m"
+        },
+        background: {
+            black: "\u001b[40m",
+            red: "\u001b[41m",
+            green: "\u001b[42m",
+            yellow: "\u001b[43m",
+            blue: "\u001b[44m",
+            magenta: "\u001b[45m",
+            cyan: "\u001b[46m",
+            white: "\u001b[47m",
+            gray: "\u001b[100m"
+        },
+        reset: "\u001b[0m"
+    },
+    update: function (percentComplete, foregroundColor, backgroundColor) {
+        var progress = "";
+        for (var i = 0; i < 100; i += 4) {
+            progress += this.progressChars[Math.floor(Math.max(0, Math.min(4, percentComplete - i)))];
+        }
+
+        foregroundColor = foregroundColor && this.colors.foreground[foregroundColor];
+        backgroundColor = backgroundColor && this.colors.background[backgroundColor];
+        if (foregroundColor || backgroundColor) {
+            if (foregroundColor) {
+                progress = foregroundColor + progress;
+            }
+            if (backgroundColor) {
+                progress = backgroundColor + progress;
+            }
+
+            progress += this.colors.reset;
+        }
+
+        if (this._lastProgress !== progress || !this.visible) {
+            this._print(progress);
+        }
+    },
+    hide: function () {
+        if (this.visible) {
+            this._savedProgress = this._lastProgress;
+            this.clear();
+        }
+    },
+    show: function () {
+        if (this._savedProgress && !this.visible) {
+            this._print(this._savedProgress);
+            this._savedProgress = undefined;
+        }
+    },
+    clear: function () {
+        if (this._lastProgress) {
+            readline.moveCursor(process.stdout, -process.stdout.columns, 0);
+            readline.clearLine(process.stdout, 1);
+            this._lastProgress = undefined;
+            this.visible = false;
+        }
+    },
+    _print: function (progress) {
+        readline.moveCursor(process.stdout, -process.stdout.columns, 0);
+        process.stdout.write(this.title ? progress + " " + this.title : progress);
+        readline.clearLine(process.stdout, 1);
+        this._lastProgress = progress;
+        this.visible = true;
+    }
+};
+
+function environmentVariableIsEnabled(name) {
+    return /^(y(es)?|t(rue)?|on|enabled?|1|\+)$/.test(process.env[name]);
+}
+
+function environmentVariableIsDisabled(name) {
+    return /^(no?|f(alse)?|off|disabled?|0|-)$/.test(process.env[name]);
+}
diff --git a/doc/handbook/README.md b/doc/handbook/README.md
new file mode 100644
index 00000000000..2d2e0e83a46
--- /dev/null
+++ b/doc/handbook/README.md
@@ -0,0 +1,4 @@
+# The TypeScript Handbook
+
+The contents of the TypeScript Handbook can be read from [its GitHub repository](https://github.com/Microsoft/TypeScript-Handbook).
+Issues and pull requests should be directed there.
\ No newline at end of file
diff --git a/doc/wiki/README.md b/doc/wiki/README.md
new file mode 100644
index 00000000000..19961197840
--- /dev/null
+++ b/doc/wiki/README.md
@@ -0,0 +1,6 @@
+# The TypeScript Wiki
+
+To read the wiki, [visit the wiki on GitHub](https://github.com/Microsoft/TypeScript/wiki).
+
+To contribute by filing an issue or sending a pull request, [visit the wiki repository](https://github.com/Microsoft/TypeScript-wiki).
+
diff --git a/issue_template.md b/issue_template.md
new file mode 100644
index 00000000000..dcd2280570c
--- /dev/null
+++ b/issue_template.md
@@ -0,0 +1,27 @@
+<!--
+Thank you for contributing to TypeScript! Please review this checklist
+       before submitting your issue.
+[ ] Many common issues and suggestions are addressed in the FAQ
+     https://github.com/Microsoft/TypeScript/wiki/FAQ
+[ ] Search for duplicates before logging new issues
+    https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=is%3Aissue
+[ ] Questions are best asked and answered at Stack Overflow
+    http://stackoverflow.com/questions/tagged/typescript
+
+For bug reports, please include the information below.
+__________________________________________________________ -->
+
+**TypeScript Version:** 
+
+1.7.5 / 1.8.0-beta / nightly (1.9.0-dev.20160217)
+
+**Code**
+
+```ts
+// A self-contained demonstration of the problem follows...
+
+```
+
+**Expected behavior:**
+
+**Actual behavior:** 
diff --git a/lib/lib.core.es6.d.ts b/lib/lib.core.es6.d.ts
deleted file mode 100644
index 753c3bbf65f..00000000000
--- a/lib/lib.core.es6.d.ts
+++ /dev/null
@@ -1,5172 +0,0 @@
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation. All rights reserved. 
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0  
- 
-THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
-MERCHANTABLITY OR NON-INFRINGEMENT. 
- 
-See the Apache Version 2.0 License for specific language governing permissions
-and limitations under the License.
-***************************************************************************** */
-
-/// <reference no-default-lib="true"/>
-/////////////////////////////
-/// ECMAScript APIs
-/////////////////////////////
-
-declare var NaN: number;
-declare var Infinity: number;
-
-/**
-  * Evaluates JavaScript code and executes it. 
-  * @param x A String value that contains valid JavaScript code.
-  */
-declare function eval(x: string): any;
-
-/**
-  * Converts A string to an integer.
-  * @param s A string to convert into a number.
-  * @param radix A value between 2 and 36 that specifies the base of the number in numString. 
-  * If this argument is not supplied, strings with a prefix of '0x' are considered hexadecimal.
-  * All other strings are considered decimal.
-  */
-declare function parseInt(s: string, radix?: number): number;
-
-/**
-  * Converts a string to a floating-point number. 
-  * @param string A string that contains a floating-point number. 
-  */
-declare function parseFloat(string: string): number;
-
-/**
-  * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a number). 
-  * @param number A numeric value.
-  */
-declare function isNaN(number: number): boolean;
-
-/** 
-  * Determines whether a supplied number is finite.
-  * @param number Any numeric value.
-  */
-declare function isFinite(number: number): boolean;
-
-/**
-  * Gets the unencoded version of an encoded Uniform Resource Identifier (URI).
-  * @param encodedURI A value representing an encoded URI.
-  */
-declare function decodeURI(encodedURI: string): string;
-
-/**
-  * Gets the unencoded version of an encoded component of a Uniform Resource Identifier (URI).
-  * @param encodedURIComponent A value representing an encoded URI component.
-  */
-declare function decodeURIComponent(encodedURIComponent: string): string;
-
-/** 
-  * Encodes a text string as a valid Uniform Resource Identifier (URI)
-  * @param uri A value representing an encoded URI.
-  */
-declare function encodeURI(uri: string): string;
-
-/**
-  * Encodes a text string as a valid component of a Uniform Resource Identifier (URI).
-  * @param uriComponent A value representing an encoded URI component.
-  */
-declare function encodeURIComponent(uriComponent: string): string;
-
-interface PropertyDescriptor {
-    configurable?: boolean;
-    enumerable?: boolean;
-    value?: any;
-    writable?: boolean;
-    get? (): any;
-    set? (v: any): void;
-}
-
-interface PropertyDescriptorMap {
-    [s: string]: PropertyDescriptor;
-}
-
-interface Object {
-    /** The initial value of Object.prototype.constructor is the standard built-in Object constructor. */
-    constructor: Function;
-
-    /** Returns a string representation of an object. */
-    toString(): string;
-
-    /** Returns a date converted to a string using the current locale. */
-    toLocaleString(): string;
-
-    /** Returns the primitive value of the specified object. */
-    valueOf(): Object;
-
-    /**
-      * Determines whether an object has a property with the specified name. 
-      * @param v A property name.
-      */
-    hasOwnProperty(v: string): boolean;
-
-    /**
-      * Determines whether an object exists in another object's prototype chain. 
-      * @param v Another object whose prototype chain is to be checked.
-      */
-    isPrototypeOf(v: Object): boolean;
-
-    /** 
-      * Determines whether a specified property is enumerable.
-      * @param v A property name.
-      */
-    propertyIsEnumerable(v: string): boolean;
-}
-
-interface ObjectConstructor {
-    new (value?: any): Object;
-    (): any;
-    (value: any): any;
-
-    /** A reference to the prototype for a class of objects. */
-    prototype: Object;
-
-    /** 
-      * Returns the prototype of an object. 
-      * @param o The object that references the prototype.
-      */
-    getPrototypeOf(o: any): any;
-
-    /**
-      * Gets the own property descriptor of the specified object. 
-      * An own property descriptor is one that is defined directly on the object and is not inherited from the object's prototype. 
-      * @param o Object that contains the property.
-      * @param p Name of the property.
-    */
-    getOwnPropertyDescriptor(o: any, p: string): PropertyDescriptor;
-
-    /** 
-      * Returns the names of the own properties of an object. The own properties of an object are those that are defined directly 
-      * on that object, and are not inherited from the object's prototype. The properties of an object include both fields (objects) and functions.
-      * @param o Object that contains the own properties.
-      */
-    getOwnPropertyNames(o: any): string[];
-
-    /** 
-      * Creates an object that has the specified prototype, and that optionally contains specified properties.
-      * @param o Object to use as a prototype. May be null
-      * @param properties JavaScript object that contains one or more property descriptors. 
-      */
-    create(o: any, properties?: PropertyDescriptorMap): any;
-
-    /**
-      * Adds a property to an object, or modifies attributes of an existing property. 
-      * @param o Object on which to add or modify the property. This can be a native JavaScript object (that is, a user-defined object or a built in object) or a DOM object.
-      * @param p The property name.
-      * @param attributes Descriptor for the property. It can be for a data property or an accessor property.
-      */
-    defineProperty(o: any, p: string, attributes: PropertyDescriptor): any;
-
-    /**
-      * Adds one or more properties to an object, and/or modifies attributes of existing properties. 
-      * @param o Object on which to add or modify the properties. This can be a native JavaScript object or a DOM object.
-      * @param properties JavaScript object that contains one or more descriptor objects. Each descriptor object describes a data property or an accessor property.
-      */
-    defineProperties(o: any, properties: PropertyDescriptorMap): any;
-
-    /**
-      * Prevents the modification of attributes of existing properties, and prevents the addition of new properties.
-      * @param o Object on which to lock the attributes. 
-      */
-    seal<T>(o: T): T;
-
-    /**
-      * Prevents the modification of existing property attributes and values, and prevents the addition of new properties.
-      * @param o Object on which to lock the attributes.
-      */
-    freeze<T>(o: T): T;
-
-    /**
-      * Prevents the addition of new properties to an object.
-      * @param o Object to make non-extensible. 
-      */
-    preventExtensions<T>(o: T): T;
-
-    /**
-      * Returns true if existing property attributes cannot be modified in an object and new properties cannot be added to the object.
-      * @param o Object to test. 
-      */
-    isSealed(o: any): boolean;
-
-    /**
-      * Returns true if existing property attributes and values cannot be modified in an object, and new properties cannot be added to the object.
-      * @param o Object to test.  
-      */
-    isFrozen(o: any): boolean;
-
-    /**
-      * Returns a value that indicates whether new properties can be added to an object.
-      * @param o Object to test. 
-      */
-    isExtensible(o: any): boolean;
-
-    /**
-      * Returns the names of the enumerable properties and methods of an object.
-      * @param o Object that contains the properties and methods. This can be an object that you created or an existing Document Object Model (DOM) object.
-      */
-    keys(o: any): string[];
-}
-
-/**
-  * Provides functionality common to all JavaScript objects.
-  */
-declare var Object: ObjectConstructor;
-
-/**
-  * Creates a new function.
-  */
-interface Function {
-    /**
-      * Calls the function, substituting the specified object for the this value of the function, and the specified array for the arguments of the function.
-      * @param thisArg The object to be used as the this object.
-      * @param argArray A set of arguments to be passed to the function.
-      */
-    apply(thisArg: any, argArray?: any): any;
-
-    /**
-      * Calls a method of an object, substituting another object for the current object.
-      * @param thisArg The object to be used as the current object.
-      * @param argArray A list of arguments to be passed to the method.
-      */
-    call(thisArg: any, ...argArray: any[]): any;
-
-    /**
-      * For a given function, creates a bound function that has the same body as the original function. 
-      * The this object of the bound function is associated with the specified object, and has the specified initial parameters.
-      * @param thisArg An object to which the this keyword can refer inside the new function.
-      * @param argArray A list of arguments to be passed to the new function.
-      */
-    bind(thisArg: any, ...argArray: any[]): any;
-
-    prototype: any;
-    length: number;
-
-    // Non-standard extensions
-    arguments: any;
-    caller: Function;
-}
-
-interface FunctionConstructor {
-    /**
-      * Creates a new function.
-      * @param args A list of arguments the function accepts.
-      */
-    new (...args: string[]): Function;
-    (...args: string[]): Function;
-    prototype: Function;
-}
-
-declare var Function: FunctionConstructor;
-
-interface IArguments {
-    [index: number]: any;
-    length: number;
-    callee: Function;
-}
-
-interface String {
-    /** Returns a string representation of a string. */
-    toString(): string;
-
-    /**
-      * Returns the character at the specified index.
-      * @param pos The zero-based index of the desired character.
-      */
-    charAt(pos: number): string;
-
-    /** 
-      * Returns the Unicode value of the character at the specified location.
-      * @param index The zero-based index of the desired character. If there is no character at the specified index, NaN is returned.
-      */
-    charCodeAt(index: number): number;
-
-    /**
-      * Returns a string that contains the concatenation of two or more strings.
-      * @param strings The strings to append to the end of the string.  
-      */
-    concat(...strings: string[]): string;
-
-    /**
-      * Returns the position of the first occurrence of a substring. 
-      * @param searchString The substring to search for in the string
-      * @param position The index at which to begin searching the String object. If omitted, search starts at the beginning of the string.
-      */
-    indexOf(searchString: string, position?: number): number;
-
-    /**
-      * Returns the last occurrence of a substring in the string.
-      * @param searchString The substring to search for.
-      * @param position The index at which to begin searching. If omitted, the search begins at the end of the string.
-      */
-    lastIndexOf(searchString: string, position?: number): number;
-
-    /**
-      * Determines whether two strings are equivalent in the current locale.
-      * @param that String to compare to target string
-      */
-    localeCompare(that: string): number;
-
-    /** 
-      * Matches a string with a regular expression, and returns an array containing the results of that search.
-      * @param regexp A variable name or string literal containing the regular expression pattern and flags.
-      */
-    match(regexp: string): RegExpMatchArray;
-
-    /** 
-      * Matches a string with a regular expression, and returns an array containing the results of that search.
-      * @param regexp A regular expression object that contains the regular expression pattern and applicable flags. 
-      */
-    match(regexp: RegExp): RegExpMatchArray;
-
-    /**
-      * Replaces text in a string, using a regular expression or search string.
-      * @param searchValue A string that represents the regular expression.
-      * @param replaceValue A string containing the text to replace for every successful match of searchValue in this string.
-      */
-    replace(searchValue: string, replaceValue: string): string;
-
-    /**
-      * Replaces text in a string, using a regular expression or search string.
-      * @param searchValue A string that represents the regular expression.
-      * @param replacer A function that returns the replacement text.
-      */
-    replace(searchValue: string, replacer: (substring: string, ...args: any[]) => string): string;
-
-    /**
-      * Replaces text in a string, using a regular expression or search string.
-      * @param searchValue A Regular Expression object containing the regular expression pattern and applicable flags.
-      * @param replaceValue A string containing the text to replace for every successful match of searchValue in this string.
-      */
-    replace(searchValue: RegExp, replaceValue: string): string;
-
-    /**
-      * Replaces text in a string, using a regular expression or search string.
-      * @param searchValue A Regular Expression object containing the regular expression pattern and applicable flags
-      * @param replacer A function that returns the replacement text.
-      */
-    replace(searchValue: RegExp, replacer: (substring: string, ...args: any[]) => string): string;
-
-    /**
-      * Finds the first substring match in a regular expression search.
-      * @param regexp The regular expression pattern and applicable flags. 
-      */
-    search(regexp: string): number;
-
-    /**
-      * Finds the first substring match in a regular expression search.
-      * @param regexp The regular expression pattern and applicable flags. 
-      */
-    search(regexp: RegExp): number;
-
-    /**
-      * Returns a section of a string.
-      * @param start The index to the beginning of the specified portion of stringObj. 
-      * @param end The index to the end of the specified portion of stringObj. The substring includes the characters up to, but not including, the character indicated by end. 
-      * If this value is not specified, the substring continues to the end of stringObj.
-      */
-    slice(start?: number, end?: number): string;
-
-    /**
-      * Split a string into substrings using the specified separator and return them as an array.
-      * @param separator A string that identifies character or characters to use in separating the string. If omitted, a single-element array containing the entire string is returned. 
-      * @param limit A value used to limit the number of elements returned in the array.
-      */
-    split(separator: string, limit?: number): string[];
-
-    /**
-      * Split a string into substrings using the specified separator and return them as an array.
-      * @param separator A Regular Express that identifies character or characters to use in separating the string. If omitted, a single-element array containing the entire string is returned. 
-      * @param limit A value used to limit the number of elements returned in the array.
-      */
-    split(separator: RegExp, limit?: number): string[];
-
-    /**
-      * Returns the substring at the specified location within a String object. 
-      * @param start The zero-based index number indicating the beginning of the substring.
-      * @param end Zero-based index number indicating the end of the substring. The substring includes the characters up to, but not including, the character indicated by end.
-      * If end is omitted, the characters from start through the end of the original string are returned.
-      */
-    substring(start: number, end?: number): string;
-
-    /** Converts all the alphabetic characters in a string to lowercase. */
-    toLowerCase(): string;
-
-    /** Converts all alphabetic characters to lowercase, taking into account the host environment's current locale. */
-    toLocaleLowerCase(): string;
-
-    /** Converts all the alphabetic characters in a string to uppercase. */
-    toUpperCase(): string;
-
-    /** Returns a string where all alphabetic characters have been converted to uppercase, taking into account the host environment's current locale. */
-    toLocaleUpperCase(): string;
-
-    /** Removes the leading and trailing white space and line terminator characters from a string. */
-    trim(): string;
-
-    /** Returns the length of a String object. */
-    length: number;
-
-    // IE extensions
-    /**
-      * Gets a substring beginning at the specified location and having the specified length.
-      * @param from The starting position of the desired substring. The index of the first character in the string is zero.
-      * @param length The number of characters to include in the returned substring.
-      */
-    substr(from: number, length?: number): string;
-
-    /** Returns the primitive value of the specified object. */
-    valueOf(): string;
-
-    [index: number]: string;
-}
-
-interface StringConstructor {
-    new (value?: any): String;
-    (value?: any): string;
-    prototype: String;
-    fromCharCode(...codes: number[]): string;
-}
-
-/** 
-  * Allows manipulation and formatting of text strings and determination and location of substrings within strings. 
-  */
-declare var String: StringConstructor;
-
-interface Boolean {
-    /** Returns the primitive value of the specified object. */
-    valueOf(): boolean;
-}
-
-interface BooleanConstructor {
-    new (value?: any): Boolean;
-    (value?: any): boolean;
-    prototype: Boolean;
-}
-
-declare var Boolean: BooleanConstructor;
-
-interface Number {
-    /**
-      * Returns a string representation of an object.
-      * @param radix Specifies a radix for converting numeric values to strings. This value is only used for numbers.
-      */
-    toString(radix?: number): string;
-
-    /** 
-      * Returns a string representing a number in fixed-point notation.
-      * @param fractionDigits Number of digits after the decimal point. Must be in the range 0 - 20, inclusive.
-      */
-    toFixed(fractionDigits?: number): string;
-
-    /**
-      * Returns a string containing a number represented in exponential notation.
-      * @param fractionDigits Number of digits after the decimal point. Must be in the range 0 - 20, inclusive.
-      */
-    toExponential(fractionDigits?: number): string;
-
-    /**
-      * Returns a string containing a number represented either in exponential or fixed-point notation with a specified number of digits.
-      * @param precision Number of significant digits. Must be in the range 1 - 21, inclusive.
-      */
-    toPrecision(precision?: number): string;
-
-    /** Returns the primitive value of the specified object. */
-    valueOf(): number;
-}
-
-interface NumberConstructor {
-    new (value?: any): Number;
-    (value?: any): number;
-    prototype: Number;
-
-    /** The largest number that can be represented in JavaScript. Equal to approximately 1.79E+308. */
-    MAX_VALUE: number;
-
-    /** The closest number to zero that can be represented in JavaScript. Equal to approximately 5.00E-324. */
-    MIN_VALUE: number;
-
-    /** 
-      * A value that is not a number.
-      * In equality comparisons, NaN does not equal any value, including itself. To test whether a value is equivalent to NaN, use the isNaN function.
-      */
-    NaN: number;
-
-    /** 
-      * A value that is less than the largest negative number that can be represented in JavaScript.
-      * JavaScript displays NEGATIVE_INFINITY values as -infinity. 
-      */
-    NEGATIVE_INFINITY: number;
-
-    /**
-      * A value greater than the largest number that can be represented in JavaScript. 
-      * JavaScript displays POSITIVE_INFINITY values as infinity. 
-      */
-    POSITIVE_INFINITY: number;
-}
-
-/** An object that represents a number of any kind. All JavaScript numbers are 64-bit floating-point numbers. */
-declare var Number: NumberConstructor;
-
-interface TemplateStringsArray extends Array<string> {
-    raw: string[];
-}
-
-interface Math {
-    /** The mathematical constant e. This is Euler's number, the base of natural logarithms. */
-    E: number;
-    /** The natural logarithm of 10. */
-    LN10: number;
-    /** The natural logarithm of 2. */
-    LN2: number;
-    /** The base-2 logarithm of e. */
-    LOG2E: number;
-    /** The base-10 logarithm of e. */
-    LOG10E: number;
-    /** Pi. This is the ratio of the circumference of a circle to its diameter. */
-    PI: number;
-    /** The square root of 0.5, or, equivalently, one divided by the square root of 2. */
-    SQRT1_2: number;
-    /** The square root of 2. */
-    SQRT2: number;
-    /**
-      * Returns the absolute value of a number (the value without regard to whether it is positive or negative). 
-      * For example, the absolute value of -5 is the same as the absolute value of 5.
-      * @param x A numeric expression for which the absolute value is needed.
-      */
-    abs(x: number): number;
-    /**
-      * Returns the arc cosine (or inverse cosine) of a number. 
-      * @param x A numeric expression.
-      */
-    acos(x: number): number;
-    /** 
-      * Returns the arcsine of a number. 
-      * @param x A numeric expression.
-      */
-    asin(x: number): number;
-    /**
-      * Returns the arctangent of a number. 
-      * @param x A numeric expression for which the arctangent is needed.
-      */
-    atan(x: number): number;
-    /**
-      * Returns the angle (in radians) from the X axis to a point.
-      * @param y A numeric expression representing the cartesian y-coordinate.
-      * @param x A numeric expression representing the cartesian x-coordinate.
-      */
-    atan2(y: number, x: number): number;
-    /**
-      * Returns the smallest number greater than or equal to its numeric argument. 
-      * @param x A numeric expression.
-      */
-    ceil(x: number): number;
-    /**
-      * Returns the cosine of a number. 
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    cos(x: number): number;
-    /**
-      * Returns e (the base of natural logarithms) raised to a power. 
-      * @param x A numeric expression representing the power of e.
-      */
-    exp(x: number): number;
-    /**
-      * Returns the greatest number less than or equal to its numeric argument. 
-      * @param x A numeric expression.
-      */
-    floor(x: number): number;
-    /**
-      * Returns the natural logarithm (base e) of a number. 
-      * @param x A numeric expression.
-      */
-    log(x: number): number;
-    /**
-      * Returns the larger of a set of supplied numeric expressions. 
-      * @param values Numeric expressions to be evaluated.
-      */
-    max(...values: number[]): number;
-    /**
-      * Returns the smaller of a set of supplied numeric expressions. 
-      * @param values Numeric expressions to be evaluated.
-      */
-    min(...values: number[]): number;
-    /**
-      * Returns the value of a base expression taken to a specified power. 
-      * @param x The base value of the expression.
-      * @param y The exponent value of the expression.
-      */
-    pow(x: number, y: number): number;
-    /** Returns a pseudorandom number between 0 and 1. */
-    random(): number;
-    /** 
-      * Returns a supplied numeric expression rounded to the nearest number.
-      * @param x The value to be rounded to the nearest number.
-      */
-    round(x: number): number;
-    /**
-      * Returns the sine of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    sin(x: number): number;
-    /**
-      * Returns the square root of a number.
-      * @param x A numeric expression.
-      */
-    sqrt(x: number): number;
-    /**
-      * Returns the tangent of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    tan(x: number): number;
-}
-/** An intrinsic object that provides basic mathematics functionality and constants. */
-declare var Math: Math;
-
-/** Enables basic storage and retrieval of dates and times. */
-interface Date {
-    /** Returns a string representation of a date. The format of the string depends on the locale. */
-    toString(): string;
-    /** Returns a date as a string value. */
-    toDateString(): string;
-    /** Returns a time as a string value. */
-    toTimeString(): string;
-    /** Returns a value as a string value appropriate to the host environment's current locale. */
-    toLocaleString(): string;
-    /** Returns a date as a string value appropriate to the host environment's current locale. */
-    toLocaleDateString(): string;
-    /** Returns a time as a string value appropriate to the host environment's current locale. */
-    toLocaleTimeString(): string;
-    /** Returns the stored time value in milliseconds since midnight, January 1, 1970 UTC. */
-    valueOf(): number;
-    /** Gets the time value in milliseconds. */
-    getTime(): number;
-    /** Gets the year, using local time. */
-    getFullYear(): number;
-    /** Gets the year using Universal Coordinated Time (UTC). */
-    getUTCFullYear(): number;
-    /** Gets the month, using local time. */
-    getMonth(): number;
-    /** Gets the month of a Date object using Universal Coordinated Time (UTC). */
-    getUTCMonth(): number;
-    /** Gets the day-of-the-month, using local time. */
-    getDate(): number;
-    /** Gets the day-of-the-month, using Universal Coordinated Time (UTC). */
-    getUTCDate(): number;
-    /** Gets the day of the week, using local time. */
-    getDay(): number;
-    /** Gets the day of the week using Universal Coordinated Time (UTC). */
-    getUTCDay(): number;
-    /** Gets the hours in a date, using local time. */
-    getHours(): number;
-    /** Gets the hours value in a Date object using Universal Coordinated Time (UTC). */
-    getUTCHours(): number;
-    /** Gets the minutes of a Date object, using local time. */
-    getMinutes(): number;
-    /** Gets the minutes of a Date object using Universal Coordinated Time (UTC). */
-    getUTCMinutes(): number;
-    /** Gets the seconds of a Date object, using local time. */
-    getSeconds(): number;
-    /** Gets the seconds of a Date object using Universal Coordinated Time (UTC). */
-    getUTCSeconds(): number;
-    /** Gets the milliseconds of a Date, using local time. */
-    getMilliseconds(): number;
-    /** Gets the milliseconds of a Date object using Universal Coordinated Time (UTC). */
-    getUTCMilliseconds(): number;
-    /** Gets the difference in minutes between the time on the local computer and Universal Coordinated Time (UTC). */
-    getTimezoneOffset(): number;
-    /** 
-      * Sets the date and time value in the Date object.
-      * @param time A numeric value representing the number of elapsed milliseconds since midnight, January 1, 1970 GMT. 
-      */
-    setTime(time: number): number;
-    /**
-      * Sets the milliseconds value in the Date object using local time. 
-      * @param ms A numeric value equal to the millisecond value.
-      */
-    setMilliseconds(ms: number): number;
-    /** 
-      * Sets the milliseconds value in the Date object using Universal Coordinated Time (UTC).
-      * @param ms A numeric value equal to the millisecond value. 
-      */
-    setUTCMilliseconds(ms: number): number;
-
-    /**
-      * Sets the seconds value in the Date object using local time. 
-      * @param sec A numeric value equal to the seconds value.
-      * @param ms A numeric value equal to the milliseconds value.
-      */
-    setSeconds(sec: number, ms?: number): number;
-    /**
-      * Sets the seconds value in the Date object using Universal Coordinated Time (UTC).
-      * @param sec A numeric value equal to the seconds value.
-      * @param ms A numeric value equal to the milliseconds value.
-      */
-    setUTCSeconds(sec: number, ms?: number): number;
-    /**
-      * Sets the minutes value in the Date object using local time. 
-      * @param min A numeric value equal to the minutes value. 
-      * @param sec A numeric value equal to the seconds value. 
-      * @param ms A numeric value equal to the milliseconds value.
-      */
-    setMinutes(min: number, sec?: number, ms?: number): number;
-    /**
-      * Sets the minutes value in the Date object using Universal Coordinated Time (UTC).
-      * @param min A numeric value equal to the minutes value. 
-      * @param sec A numeric value equal to the seconds value. 
-      * @param ms A numeric value equal to the milliseconds value.
-      */
-    setUTCMinutes(min: number, sec?: number, ms?: number): number;
-    /**
-      * Sets the hour value in the Date object using local time.
-      * @param hours A numeric value equal to the hours value.
-      * @param min A numeric value equal to the minutes value.
-      * @param sec A numeric value equal to the seconds value. 
-      * @param ms A numeric value equal to the milliseconds value.
-      */
-    setHours(hours: number, min?: number, sec?: number, ms?: number): number;
-    /**
-      * Sets the hours value in the Date object using Universal Coordinated Time (UTC).
-      * @param hours A numeric value equal to the hours value.
-      * @param min A numeric value equal to the minutes value.
-      * @param sec A numeric value equal to the seconds value. 
-      * @param ms A numeric value equal to the milliseconds value.
-      */
-    setUTCHours(hours: number, min?: number, sec?: number, ms?: number): number;
-    /**
-      * Sets the numeric day-of-the-month value of the Date object using local time. 
-      * @param date A numeric value equal to the day of the month.
-      */
-    setDate(date: number): number;
-    /** 
-      * Sets the numeric day of the month in the Date object using Universal Coordinated Time (UTC).
-      * @param date A numeric value equal to the day of the month. 
-      */
-    setUTCDate(date: number): number;
-    /** 
-      * Sets the month value in the Date object using local time. 
-      * @param month A numeric value equal to the month. The value for January is 0, and other month values follow consecutively. 
-      * @param date A numeric value representing the day of the month. If this value is not supplied, the value from a call to the getDate method is used.
-      */
-    setMonth(month: number, date?: number): number;
-    /**
-      * Sets the month value in the Date object using Universal Coordinated Time (UTC).
-      * @param month A numeric value equal to the month. The value for January is 0, and other month values follow consecutively.
-      * @param date A numeric value representing the day of the month. If it is not supplied, the value from a call to the getUTCDate method is used.
-      */
-    setUTCMonth(month: number, date?: number): number;
-    /**
-      * Sets the year of the Date object using local time.
-      * @param year A numeric value for the year.
-      * @param month A zero-based numeric value for the month (0 for January, 11 for December). Must be specified if numDate is specified.
-      * @param date A numeric value equal for the day of the month.
-      */
-    setFullYear(year: number, month?: number, date?: number): number;
-    /**
-      * Sets the year value in the Date object using Universal Coordinated Time (UTC).
-      * @param year A numeric value equal to the year.
-      * @param month A numeric value equal to the month. The value for January is 0, and other month values follow consecutively. Must be supplied if numDate is supplied.
-      * @param date A numeric value equal to the day of the month.
-      */
-    setUTCFullYear(year: number, month?: number, date?: number): number;
-    /** Returns a date converted to a string using Universal Coordinated Time (UTC). */
-    toUTCString(): string;
-    /** Returns a date as a string value in ISO format. */
-    toISOString(): string;
-    /** Used by the JSON.stringify method to enable the transformation of an object's data for JavaScript Object Notation (JSON) serialization. */
-    toJSON(key?: any): string;
-}
-
-interface DateConstructor {
-    new (): Date;
-    new (value: number): Date;
-    new (value: string): Date;
-    new (year: number, month: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): Date;
-    (): string;
-    prototype: Date;
-    /**
-      * Parses a string containing a date, and returns the number of milliseconds between that date and midnight, January 1, 1970.
-      * @param s A date string
-      */
-    parse(s: string): number;
-    /**
-      * Returns the number of milliseconds between midnight, January 1, 1970 Universal Coordinated Time (UTC) (or GMT) and the specified date. 
-      * @param year The full year designation is required for cross-century date accuracy. If year is between 0 and 99 is used, then year is assumed to be 1900 + year.
-      * @param month The month as an number between 0 and 11 (January to December).
-      * @param date The date as an number between 1 and 31.
-      * @param hours Must be supplied if minutes is supplied. An number from 0 to 23 (midnight to 11pm) that specifies the hour.
-      * @param minutes Must be supplied if seconds is supplied. An number from 0 to 59 that specifies the minutes.
-      * @param seconds Must be supplied if milliseconds is supplied. An number from 0 to 59 that specifies the seconds.
-      * @param ms An number from 0 to 999 that specifies the milliseconds.
-      */
-    UTC(year: number, month: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): number;
-    now(): number;
-}
-
-declare var Date: DateConstructor;
-
-interface RegExpMatchArray extends Array<string> {
-    index?: number;
-    input?: string;
-}
-
-interface RegExpExecArray extends Array<string> {
-    index: number;
-    input: string;
-}
-
-interface RegExp {
-    /** 
-      * Executes a search on a string using a regular expression pattern, and returns an array containing the results of that search.
-      * @param string The String object or string literal on which to perform the search.
-      */
-    exec(string: string): RegExpExecArray;
-
-    /** 
-      * Returns a Boolean value that indicates whether or not a pattern exists in a searched string.
-      * @param string String on which to perform the search.
-      */
-    test(string: string): boolean;
-
-    /** Returns a copy of the text of the regular expression pattern. Read-only. The regExp argument is a Regular expression object. It can be a variable name or a literal. */
-    source: string;
-
-    /** Returns a Boolean value indicating the state of the global flag (g) used with a regular expression. Default is false. Read-only. */
-    global: boolean;
-
-    /** Returns a Boolean value indicating the state of the ignoreCase flag (i) used with a regular expression. Default is false. Read-only. */
-    ignoreCase: boolean;
-
-    /** Returns a Boolean value indicating the state of the multiline flag (m) used with a regular expression. Default is false. Read-only. */
-    multiline: boolean;
-
-    lastIndex: number;
-
-    // Non-standard extensions
-    compile(): RegExp;
-}
-
-interface RegExpConstructor {
-    new (pattern: string, flags?: string): RegExp;
-    (pattern: string, flags?: string): RegExp;
-    prototype: RegExp;
-
-    // Non-standard extensions
-    $1: string;
-    $2: string;
-    $3: string;
-    $4: string;
-    $5: string;
-    $6: string;
-    $7: string;
-    $8: string;
-    $9: string;
-    lastMatch: string;
-}
-
-declare var RegExp: RegExpConstructor;
-
-interface Error {
-    name: string;
-    message: string;
-}
-
-interface ErrorConstructor {
-    new (message?: string): Error;
-    (message?: string): Error;
-    prototype: Error;
-}
-
-declare var Error: ErrorConstructor;
-
-interface EvalError extends Error {
-}
-
-interface EvalErrorConstructor {
-    new (message?: string): EvalError;
-    (message?: string): EvalError;
-    prototype: EvalError;
-}
-
-declare var EvalError: EvalErrorConstructor;
-
-interface RangeError extends Error {
-}
-
-interface RangeErrorConstructor {
-    new (message?: string): RangeError;
-    (message?: string): RangeError;
-    prototype: RangeError;
-}
-
-declare var RangeError: RangeErrorConstructor;
-
-interface ReferenceError extends Error {
-}
-
-interface ReferenceErrorConstructor {
-    new (message?: string): ReferenceError;
-    (message?: string): ReferenceError;
-    prototype: ReferenceError;
-}
-
-declare var ReferenceError: ReferenceErrorConstructor;
-
-interface SyntaxError extends Error {
-}
-
-interface SyntaxErrorConstructor {
-    new (message?: string): SyntaxError;
-    (message?: string): SyntaxError;
-    prototype: SyntaxError;
-}
-
-declare var SyntaxError: SyntaxErrorConstructor;
-
-interface TypeError extends Error {
-}
-
-interface TypeErrorConstructor {
-    new (message?: string): TypeError;
-    (message?: string): TypeError;
-    prototype: TypeError;
-}
-
-declare var TypeError: TypeErrorConstructor;
-
-interface URIError extends Error {
-}
-
-interface URIErrorConstructor {
-    new (message?: string): URIError;
-    (message?: string): URIError;
-    prototype: URIError;
-}
-
-declare var URIError: URIErrorConstructor;
-
-interface JSON {
-    /**
-      * Converts a JavaScript Object Notation (JSON) string into an object.
-      * @param text A valid JSON string.
-      * @param reviver A function that transforms the results. This function is called for each member of the object. 
-      * If a member contains nested objects, the nested objects are transformed before the parent object is. 
-      */
-    parse(text: string, reviver?: (key: any, value: any) => any): any;
-    /**
-      * Converts a JavaScript value to a JavaScript Object Notation (JSON) string.
-      * @param value A JavaScript value, usually an object or array, to be converted.
-      */
-    stringify(value: any): string;
-    /**
-      * Converts a JavaScript value to a JavaScript Object Notation (JSON) string.
-      * @param value A JavaScript value, usually an object or array, to be converted.
-      * @param replacer A function that transforms the results.
-      */
-    stringify(value: any, replacer: (key: string, value: any) => any): string;
-    /**
-      * Converts a JavaScript value to a JavaScript Object Notation (JSON) string.
-      * @param value A JavaScript value, usually an object or array, to be converted.
-      * @param replacer Array that transforms the results.
-      */
-    stringify(value: any, replacer: any[]): string;
-    /**
-      * Converts a JavaScript value to a JavaScript Object Notation (JSON) string.
-      * @param value A JavaScript value, usually an object or array, to be converted.
-      * @param replacer A function that transforms the results.
-      * @param space Adds indentation, white space, and line break characters to the return-value JSON text to make it easier to read.
-      */
-    stringify(value: any, replacer: (key: string, value: any) => any, space: string | number): string;
-    /**
-      * Converts a JavaScript value to a JavaScript Object Notation (JSON) string.
-      * @param value A JavaScript value, usually an object or array, to be converted.
-      * @param replacer Array that transforms the results.
-      * @param space Adds indentation, white space, and line break characters to the return-value JSON text to make it easier to read.
-      */
-    stringify(value: any, replacer: any[], space: string | number): string;
-}
-/**
-  * An intrinsic object that provides functions to convert JavaScript values to and from the JavaScript Object Notation (JSON) format.
-  */
-declare var JSON: JSON;
-
-
-/////////////////////////////
-/// ECMAScript Array API (specially handled by compiler)
-/////////////////////////////
-
-interface Array<T> {
-    /**
-      * Gets or sets the length of the array. This is a number one higher than the highest element defined in an array.
-      */
-    length: number;
-    /**
-      * Returns a string representation of an array.
-      */
-    toString(): string;
-    toLocaleString(): string;
-    /**
-      * Appends new elements to an array, and returns the new length of the array.
-      * @param items New elements of the Array.
-      */
-    push(...items: T[]): number;
-    /**
-      * Removes the last element from an array and returns it.
-      */
-    pop(): T;
-    /**
-      * Combines two or more arrays.
-      * @param items Additional items to add to the end of array1.
-      */
-    concat<U extends T[]>(...items: U[]): T[];
-    /**
-      * Combines two or more arrays.
-      * @param items Additional items to add to the end of array1.
-      */
-    concat(...items: T[]): T[];
-    /**
-      * Adds all the elements of an array separated by the specified separator string.
-      * @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma.
-      */
-    join(separator?: string): string;
-    /**
-      * Reverses the elements in an Array. 
-      */
-    reverse(): T[];
-    /**
-      * Removes the first element from an array and returns it.
-      */
-    shift(): T;
-    /** 
-      * Returns a section of an array.
-      * @param start The beginning of the specified portion of the array.
-      * @param end The end of the specified portion of the array.
-      */
-    slice(start?: number, end?: number): T[];
-
-    /**
-      * Sorts an array.
-      * @param compareFn The name of the function used to determine the order of the elements. If omitted, the elements are sorted in ascending, ASCII character order.
-      */
-    sort(compareFn?: (a: T, b: T) => number): T[];
-
-    /**
-      * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements.
-      * @param start The zero-based location in the array from which to start removing elements.
-      */
-    splice(start: number): T[];
-
-    /**
-      * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements.
-      * @param start The zero-based location in the array from which to start removing elements.
-      * @param deleteCount The number of elements to remove.
-      * @param items Elements to insert into the array in place of the deleted elements.
-      */
-    splice(start: number, deleteCount: number, ...items: T[]): T[];
-
-    /**
-      * Inserts new elements at the start of an array.
-      * @param items  Elements to insert at the start of the Array.
-      */
-    unshift(...items: T[]): number;
-
-    /**
-      * Returns the index of the first occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at index 0.
-      */
-    indexOf(searchElement: T, fromIndex?: number): number;
-
-    /**
-      * Returns the index of the last occurrence of a specified value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at the last index in the array.
-      */
-    lastIndexOf(searchElement: T, fromIndex?: number): number;
-
-    /**
-      * Determines whether all the members of an array satisfy the specified test.
-      * @param callbackfn A function that accepts up to three arguments. The every method calls the callbackfn function for each element in array1 until the callbackfn returns false, or until the end of 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.
-      */
-    every(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
-
-    /**
-      * Determines whether the specified callback function returns true for any element of an array.
-      * @param callbackfn A function that accepts up to three arguments. The some method calls the callbackfn function for each element in array1 until the callbackfn returns true, or until the end of 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.
-      */
-    some(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
-
-    /**
-      * Performs the specified action for each element in an array.
-      * @param callbackfn  A function that accepts up to three arguments. forEach 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.
-      */
-    forEach(callbackfn: (value: T, index: number, array: T[]) => void, thisArg?: any): void;
-
-    /**
-      * Calls a defined callback function on each element of an array, and returns an array that contains the results.
-      * @param callbackfn A function that accepts up to three arguments. The map 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.
-      */
-    map<U>(callbackfn: (value: T, index: number, array: 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(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): T[];
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
-      */
-    reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T;
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
-      */
-    reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
-
-    /** 
-      * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array. 
-      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
-      */
-    reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T;
-    /** 
-      * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array. 
-      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
-      */
-    reduceRight<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
-
-    [n: number]: T;
-}
-
-interface ArrayConstructor {
-    new (arrayLength?: number): any[];
-    new <T>(arrayLength: number): T[];
-    new <T>(...items: T[]): T[];
-    (arrayLength?: number): any[];
-    <T>(arrayLength: number): T[];
-    <T>(...items: T[]): T[];
-    isArray(arg: any): arg is Array<any>;
-    prototype: Array<any>;
-}
-
-declare var Array: ArrayConstructor;
-
-interface TypedPropertyDescriptor<T> {
-    enumerable?: boolean;
-    configurable?: boolean;
-    writable?: boolean;
-    value?: T;
-    get?: () => T;
-    set?: (value: T) => void;
-}
-
-declare type ClassDecorator = <TFunction extends Function>(target: TFunction) => TFunction | void;
-declare type PropertyDecorator = (target: Object, propertyKey: string | symbol) => void;
-declare type MethodDecorator = <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T> | void;
-declare type ParameterDecorator = (target: Object, propertyKey: string | symbol, parameterIndex: number) => void;
-
-declare type PromiseConstructorLike = new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void) => PromiseLike<T>;
-
-interface PromiseLike<T> {
-    /**
-    * Attaches callbacks for the resolution and/or rejection of the Promise.
-    * @param onfulfilled The callback to execute when the Promise is resolved.
-    * @param onrejected The callback to execute when the Promise is rejected.
-    * @returns A Promise for the completion of which ever callback is executed.
-    */
-    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): PromiseLike<TResult>;
-    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): PromiseLike<TResult>;
-}
-
-interface ArrayLike<T> {
-    length: number;
-    [n: number]: T;
-}
-
-
-/**
-  * Represents a raw buffer of binary data, which is used to store data for the 
-  * different typed arrays. ArrayBuffers cannot be read from or written to directly, 
-  * but can be passed to a typed array or DataView Object to interpret the raw 
-  * buffer as needed. 
-  */
-interface ArrayBuffer {
-    /**
-      * Read-only. The length of the ArrayBuffer (in bytes).
-      */
-    byteLength: number;
-
-    /**
-      * Returns a section of an ArrayBuffer.
-      */
-    slice(begin:number, end?:number): ArrayBuffer;
-}
-
-interface ArrayBufferConstructor {
-    prototype: ArrayBuffer;
-    new (byteLength: number): ArrayBuffer;
-    isView(arg: any): arg is ArrayBufferView;
-}
-declare var ArrayBuffer: ArrayBufferConstructor;
-
-interface ArrayBufferView {
-    /**
-      * The ArrayBuffer instance referenced by the array. 
-      */
-    buffer: ArrayBuffer;
-
-    /**
-      * The length in bytes of the array.
-      */
-    byteLength: number;
-
-    /**
-      * The offset in bytes of the array.
-      */
-    byteOffset: number;
-}
-
-interface DataView {
-    buffer: ArrayBuffer;
-    byteLength: number;
-    byteOffset: number;
-    /**
-      * Gets the Float32 value at the specified byte offset from the start of the view. There is 
-      * no alignment constraint; multi-byte values may be fetched from any offset. 
-      * @param byteOffset The place in the buffer at which the value should be retrieved.
-      */
-    getFloat32(byteOffset: number, littleEndian?: boolean): number;
-
-    /**
-      * Gets the Float64 value at the specified byte offset from the start of the view. There is
-      * no alignment constraint; multi-byte values may be fetched from any offset. 
-      * @param byteOffset The place in the buffer at which the value should be retrieved.
-      */
-    getFloat64(byteOffset: number, littleEndian?: boolean): number;
-
-    /**
-      * Gets the Int8 value at the specified byte offset from the start of the view. There is 
-      * no alignment constraint; multi-byte values may be fetched from any offset. 
-      * @param byteOffset The place in the buffer at which the value should be retrieved.
-      */
-    getInt8(byteOffset: number): number;
-
-    /**
-      * Gets the Int16 value at the specified byte offset from the start of the view. There is 
-      * no alignment constraint; multi-byte values may be fetched from any offset. 
-      * @param byteOffset The place in the buffer at which the value should be retrieved.
-      */
-    getInt16(byteOffset: number, littleEndian?: boolean): number;
-    /**
-      * Gets the Int32 value at the specified byte offset from the start of the view. There is 
-      * no alignment constraint; multi-byte values may be fetched from any offset. 
-      * @param byteOffset The place in the buffer at which the value should be retrieved.
-      */
-    getInt32(byteOffset: number, littleEndian?: boolean): number;
-
-    /**
-      * Gets the Uint8 value at the specified byte offset from the start of the view. There is 
-      * no alignment constraint; multi-byte values may be fetched from any offset. 
-      * @param byteOffset The place in the buffer at which the value should be retrieved.
-      */
-    getUint8(byteOffset: number): number;
-
-    /**
-      * Gets the Uint16 value at the specified byte offset from the start of the view. There is 
-      * no alignment constraint; multi-byte values may be fetched from any offset. 
-      * @param byteOffset The place in the buffer at which the value should be retrieved.
-      */
-    getUint16(byteOffset: number, littleEndian?: boolean): number;
-
-    /**
-      * Gets the Uint32 value at the specified byte offset from the start of the view. There is 
-      * no alignment constraint; multi-byte values may be fetched from any offset. 
-      * @param byteOffset The place in the buffer at which the value should be retrieved.
-      */
-    getUint32(byteOffset: number, littleEndian?: boolean): number;
-
-    /**
-      * Stores an Float32 value at the specified byte offset from the start of the view. 
-      * @param byteOffset The place in the buffer at which the value should be set.
-      * @param value The value to set.
-      * @param littleEndian If false or undefined, a big-endian value should be written, 
-      * otherwise a little-endian value should be written.
-      */
-    setFloat32(byteOffset: number, value: number, littleEndian?: boolean): void;
-
-    /**
-      * Stores an Float64 value at the specified byte offset from the start of the view. 
-      * @param byteOffset The place in the buffer at which the value should be set.
-      * @param value The value to set.
-      * @param littleEndian If false or undefined, a big-endian value should be written, 
-      * otherwise a little-endian value should be written.
-      */
-    setFloat64(byteOffset: number, value: number, littleEndian?: boolean): void;
-
-    /**
-      * Stores an Int8 value at the specified byte offset from the start of the view. 
-      * @param byteOffset The place in the buffer at which the value should be set.
-      * @param value The value to set.
-      */
-    setInt8(byteOffset: number, value: number): void;
-
-    /**
-      * Stores an Int16 value at the specified byte offset from the start of the view. 
-      * @param byteOffset The place in the buffer at which the value should be set.
-      * @param value The value to set.
-      * @param littleEndian If false or undefined, a big-endian value should be written, 
-      * otherwise a little-endian value should be written.
-      */
-    setInt16(byteOffset: number, value: number, littleEndian?: boolean): void;
-
-    /**
-      * Stores an Int32 value at the specified byte offset from the start of the view. 
-      * @param byteOffset The place in the buffer at which the value should be set.
-      * @param value The value to set.
-      * @param littleEndian If false or undefined, a big-endian value should be written, 
-      * otherwise a little-endian value should be written.
-      */
-    setInt32(byteOffset: number, value: number, littleEndian?: boolean): void;
-
-    /**
-      * Stores an Uint8 value at the specified byte offset from the start of the view. 
-      * @param byteOffset The place in the buffer at which the value should be set.
-      * @param value The value to set.
-      */
-    setUint8(byteOffset: number, value: number): void;
-
-    /**
-      * Stores an Uint16 value at the specified byte offset from the start of the view. 
-      * @param byteOffset The place in the buffer at which the value should be set.
-      * @param value The value to set.
-      * @param littleEndian If false or undefined, a big-endian value should be written, 
-      * otherwise a little-endian value should be written.
-      */
-    setUint16(byteOffset: number, value: number, littleEndian?: boolean): void;
-
-    /**
-      * Stores an Uint32 value at the specified byte offset from the start of the view. 
-      * @param byteOffset The place in the buffer at which the value should be set.
-      * @param value The value to set.
-      * @param littleEndian If false or undefined, a big-endian value should be written, 
-      * otherwise a little-endian value should be written.
-      */
-    setUint32(byteOffset: number, value: number, littleEndian?: boolean): void;
-}
-
-interface DataViewConstructor {
-    new (buffer: ArrayBuffer, byteOffset?: number, byteLength?: number): DataView;
-}
-declare var DataView: DataViewConstructor;
-
-/**
-  * A typed array of 8-bit integer values. The contents are initialized to 0. If the requested 
-  * number of bytes could not be allocated an exception is raised.
-  */
-interface Int8Array {
-    /**
-      * The size in bytes of each element in the array. 
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * The ArrayBuffer instance referenced by the array. 
-      */
-    buffer: ArrayBuffer;
-
-    /**
-      * The length in bytes of the array.
-      */
-    byteLength: number;
-
-    /**
-      * The offset in bytes of the array.
-      */
-    byteOffset: number;
-
-    /** 
-      * Returns the this object after copying a section of the array identified by start and end
-      * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the 
-      * length of the array. 
-      * @param start If start is negative, it is treated as length+start. If end is negative, it 
-      * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value. 
-      */
-    copyWithin(target: number, start: number, end?: number): Int8Array;
-
-    /**
-      * Determines whether all the members of an array satisfy the specified test.
-      * @param callbackfn A function that accepts up to three arguments. The every method calls 
-      * the callbackfn function for each element in array1 until the callbackfn returns false, 
-      * or until the end of 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.
-      */
-    every(callbackfn: (value: number, index: number, array: Int8Array) => boolean, thisArg?: any): boolean;
-
-    /**
-        * Returns the this object after filling the section identified by start and end with value
-        * @param value value to fill array section with
-        * @param start index to start filling the array at. If start is negative, it is treated as 
-        * length+start where length is the length of the array. 
-        * @param end index to stop filling the array at. If end is negative, it is treated as 
-        * length+end.
-        */
-    fill(value: number, start?: number, end?: number): Int8Array;
-
-    /**
-      * 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(callbackfn: (value: number, index: number, array: Int8Array) => boolean, thisArg?: any): Int8Array;
-
-    /** 
-      * Returns the value of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
-
-    /** 
-      * Returns the index of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
-
-    /**
-      * Performs the specified action for each element in an array.
-      * @param callbackfn  A function that accepts up to three arguments. forEach 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.
-      */
-    forEach(callbackfn: (value: number, index: number, array: Int8Array) => void, thisArg?: any): void;
-
-    /**
-      * Returns the index of the first occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      *  search starts at index 0.
-      */
-    indexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * Adds all the elements of an array separated by the specified separator string.
-      * @param separator A string used to separate one element of an array from the next in the 
-      * resulting String. If omitted, the array elements are separated with a comma.
-      */
-    join(separator?: string): string;
-
-    /**
-      * Returns the index of the last occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the 
-      * search starts at index 0.
-      */
-    lastIndexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * The length of the array.
-      */
-    length: number;
-
-    /**
-      * Calls a defined callback function on each element of an array, and returns an array that 
-      * contains the results.
-      * @param callbackfn A function that accepts up to three arguments. The map 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.
-      */
-    map(callbackfn: (value: number, index: number, array: Int8Array) => number, thisArg?: any): Int8Array;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of 
-      * the callback function is the accumulated result, and is provided as an argument in the next 
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the 
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int8Array) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of 
-      * the callback function is the accumulated result, and is provided as an argument in the next 
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the 
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument 
-      * instead of an array value.
-      */
-    reduce<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Int8Array) => U, initialValue: U): U;
-
-    /** 
-      * Calls the specified callback function for all the elements in an array, in descending order. 
-      * The return value of the callback function is the accumulated result, and is provided as an 
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls 
-      * the callbackfn function one time for each element in the array. 
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an 
-      * argument instead of an array value.
-      */
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int8Array) => number, initialValue?: number): number;
-
-    /** 
-      * Calls the specified callback function for all the elements in an array, in descending order. 
-      * The return value of the callback function is the accumulated result, and is provided as an 
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array. 
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduceRight<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Int8Array) => U, initialValue: U): U;
-
-    /**
-      * Reverses the elements in an Array. 
-      */
-    reverse(): Int8Array;
-
-    /**
-      * Sets a value or an array of values.
-      * @param index The index of the location to set.
-      * @param value The value to set.
-      */
-    set(index: number, value: number): void;
-
-    /**
-      * Sets a value or an array of values.
-      * @param array A typed or untyped array of values to set.
-      * @param offset The index in the current array at which the values are to be written.
-      */
-    set(array: ArrayLike<number>, offset?: number): void;
-
-    /** 
-      * Returns a section of an array.
-      * @param start The beginning of the specified portion of the array.
-      * @param end The end of the specified portion of the array.
-      */
-    slice(start?: number, end?: number): Int8Array;
-
-    /**
-      * Determines whether the specified callback function returns true for any element of an array.
-      * @param callbackfn A function that accepts up to three arguments. The some method calls the 
-      * callbackfn function for each element in array1 until the callbackfn returns true, or until 
-      * the end of 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.
-      */
-    some(callbackfn: (value: number, index: number, array: Int8Array) => boolean, thisArg?: any): boolean;
-
-    /**
-      * Sorts an array.
-      * @param compareFn The name of the function used to determine the order of the elements. If 
-      * omitted, the elements are sorted in ascending, ASCII character order.
-      */
-    sort(compareFn?: (a: number, b: number) => number): Int8Array;
-
-    /**
-      * Gets a new Int8Array view of the ArrayBuffer store for this array, referencing the elements
-      * at begin, inclusive, up to end, exclusive. 
-      * @param begin The index of the beginning of the array.
-      * @param end The index of the end of the array.
-      */
-    subarray(begin: number, end?: number): Int8Array;
-
-    /**
-      * Converts a number to a string by using the current locale. 
-      */
-    toLocaleString(): string;
-
-    /**
-      * Returns a string representation of an array.
-      */
-    toString(): string;
-
-    [index: number]: number;
-}
-interface Int8ArrayConstructor {
-    prototype: Int8Array;
-    new (length: number): Int8Array;
-    new (array: ArrayLike<number>): Int8Array;
-    new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Int8Array;
-
-    /**
-      * The size in bytes of each element in the array. 
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * Returns a new array from a set of elements.
-      * @param items A set of elements to include in the new array object.
-      */
-    of(...items: number[]): Int8Array;
-    
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int8Array;
-
-}
-declare var Int8Array: Int8ArrayConstructor;
-
-/**
-  * A typed array of 8-bit unsigned integer values. The contents are initialized to 0. If the 
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Uint8Array {
-    /**
-      * The size in bytes of each element in the array. 
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * The ArrayBuffer instance referenced by the array. 
-      */
-    buffer: ArrayBuffer;
-
-    /**
-      * The length in bytes of the array.
-      */
-    byteLength: number;
-
-    /**
-      * The offset in bytes of the array.
-      */
-    byteOffset: number;
-
-    /** 
-      * Returns the this object after copying a section of the array identified by start and end
-      * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the 
-      * length of the array. 
-      * @param start If start is negative, it is treated as length+start. If end is negative, it 
-      * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value. 
-      */
-    copyWithin(target: number, start: number, end?: number): Uint8Array;
-
-    /**
-      * Determines whether all the members of an array satisfy the specified test.
-      * @param callbackfn A function that accepts up to three arguments. The every method calls 
-      * the callbackfn function for each element in array1 until the callbackfn returns false, 
-      * or until the end of 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.
-      */
-    every(callbackfn: (value: number, index: number, array: Uint8Array) => boolean, thisArg?: any): boolean;
-
-    /**
-        * Returns the this object after filling the section identified by start and end with value
-        * @param value value to fill array section with
-        * @param start index to start filling the array at. If start is negative, it is treated as 
-        * length+start where length is the length of the array. 
-        * @param end index to stop filling the array at. If end is negative, it is treated as 
-        * length+end.
-        */
-    fill(value: number, start?: number, end?: number): Uint8Array;
-
-    /**
-      * 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(callbackfn: (value: number, index: number, array: Uint8Array) => boolean, thisArg?: any): Uint8Array;
-
-    /** 
-      * Returns the value of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
-
-    /** 
-      * Returns the index of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
-
-    /**
-      * Performs the specified action for each element in an array.
-      * @param callbackfn  A function that accepts up to three arguments. forEach 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.
-      */
-    forEach(callbackfn: (value: number, index: number, array: Uint8Array) => void, thisArg?: any): void;
-
-    /**
-      * Returns the index of the first occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      *  search starts at index 0.
-      */
-    indexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * Adds all the elements of an array separated by the specified separator string.
-      * @param separator A string used to separate one element of an array from the next in the 
-      * resulting String. If omitted, the array elements are separated with a comma.
-      */
-    join(separator?: string): string;
-
-    /**
-      * Returns the index of the last occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the 
-      * search starts at index 0.
-      */
-    lastIndexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * The length of the array.
-      */
-    length: number;
-
-    /**
-      * Calls a defined callback function on each element of an array, and returns an array that 
-      * contains the results.
-      * @param callbackfn A function that accepts up to three arguments. The map 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.
-      */
-    map(callbackfn: (value: number, index: number, array: Uint8Array) => number, thisArg?: any): Uint8Array;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of 
-      * the callback function is the accumulated result, and is provided as an argument in the next 
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the 
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint8Array) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of 
-      * the callback function is the accumulated result, and is provided as an argument in the next 
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the 
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument 
-      * instead of an array value.
-      */
-    reduce<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Uint8Array) => U, initialValue: U): U;
-
-    /** 
-      * Calls the specified callback function for all the elements in an array, in descending order. 
-      * The return value of the callback function is the accumulated result, and is provided as an 
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls 
-      * the callbackfn function one time for each element in the array. 
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an 
-      * argument instead of an array value.
-      */
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint8Array) => number, initialValue?: number): number;
-
-    /** 
-      * Calls the specified callback function for all the elements in an array, in descending order. 
-      * The return value of the callback function is the accumulated result, and is provided as an 
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array. 
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduceRight<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Uint8Array) => U, initialValue: U): U;
-
-    /**
-      * Reverses the elements in an Array. 
-      */
-    reverse(): Uint8Array;
-
-    /**
-      * Sets a value or an array of values.
-      * @param index The index of the location to set.
-      * @param value The value to set.
-      */
-    set(index: number, value: number): void;
-
-    /**
-      * Sets a value or an array of values.
-      * @param array A typed or untyped array of values to set.
-      * @param offset The index in the current array at which the values are to be written.
-      */
-    set(array: ArrayLike<number>, offset?: number): void;
-
-    /** 
-      * Returns a section of an array.
-      * @param start The beginning of the specified portion of the array.
-      * @param end The end of the specified portion of the array.
-      */
-    slice(start?: number, end?: number): Uint8Array;
-
-    /**
-      * Determines whether the specified callback function returns true for any element of an array.
-      * @param callbackfn A function that accepts up to three arguments. The some method calls the 
-      * callbackfn function for each element in array1 until the callbackfn returns true, or until 
-      * the end of 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.
-      */
-    some(callbackfn: (value: number, index: number, array: Uint8Array) => boolean, thisArg?: any): boolean;
-
-    /**
-      * Sorts an array.
-      * @param compareFn The name of the function used to determine the order of the elements. If 
-      * omitted, the elements are sorted in ascending, ASCII character order.
-      */
-    sort(compareFn?: (a: number, b: number) => number): Uint8Array;
-
-    /**
-      * Gets a new Uint8Array view of the ArrayBuffer store for this array, referencing the elements
-      * at begin, inclusive, up to end, exclusive. 
-      * @param begin The index of the beginning of the array.
-      * @param end The index of the end of the array.
-      */
-    subarray(begin: number, end?: number): Uint8Array;
-
-    /**
-      * Converts a number to a string by using the current locale. 
-      */
-    toLocaleString(): string;
-
-    /**
-      * Returns a string representation of an array.
-      */
-    toString(): string;
-
-    [index: number]: number;
-}
-
-interface Uint8ArrayConstructor {
-    prototype: Uint8Array;
-    new (length: number): Uint8Array;
-    new (array: ArrayLike<number>): Uint8Array;
-    new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint8Array;
-
-    /**
-      * The size in bytes of each element in the array. 
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * Returns a new array from a set of elements.
-      * @param items A set of elements to include in the new array object.
-      */
-    of(...items: number[]): Uint8Array;
-    
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8Array;
-
-}
-declare var Uint8Array: Uint8ArrayConstructor;
-
-/**
-  * A typed array of 8-bit unsigned integer (clamped) values. The contents are initialized to 0. 
-  * If the requested number of bytes could not be allocated an exception is raised.
-  */
-interface Uint8ClampedArray {
-    /**
-      * The size in bytes of each element in the array. 
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * The ArrayBuffer instance referenced by the array. 
-      */
-    buffer: ArrayBuffer;
-
-    /**
-      * The length in bytes of the array.
-      */
-    byteLength: number;
-
-    /**
-      * The offset in bytes of the array.
-      */
-    byteOffset: number;
-
-    /** 
-      * Returns the this object after copying a section of the array identified by start and end
-      * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the 
-      * length of the array. 
-      * @param start If start is negative, it is treated as length+start. If end is negative, it 
-      * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value. 
-      */
-    copyWithin(target: number, start: number, end?: number): Uint8ClampedArray;
-
-    /**
-      * Determines whether all the members of an array satisfy the specified test.
-      * @param callbackfn A function that accepts up to three arguments. The every method calls 
-      * the callbackfn function for each element in array1 until the callbackfn returns false, 
-      * or until the end of 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.
-      */
-    every(callbackfn: (value: number, index: number, array: Uint8ClampedArray) => boolean, thisArg?: any): boolean;
-
-    /**
-        * Returns the this object after filling the section identified by start and end with value
-        * @param value value to fill array section with
-        * @param start index to start filling the array at. If start is negative, it is treated as 
-        * length+start where length is the length of the array. 
-        * @param end index to stop filling the array at. If end is negative, it is treated as 
-        * length+end.
-        */
-    fill(value: number, start?: number, end?: number): Uint8ClampedArray;
-
-    /**
-      * 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(callbackfn: (value: number, index: number, array: Uint8ClampedArray) => boolean, thisArg?: any): Uint8ClampedArray;
-
-    /** 
-      * Returns the value of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
-
-    /** 
-      * Returns the index of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
-
-    /**
-      * Performs the specified action for each element in an array.
-      * @param callbackfn  A function that accepts up to three arguments. forEach 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.
-      */
-    forEach(callbackfn: (value: number, index: number, array: Uint8ClampedArray) => void, thisArg?: any): void;
-
-    /**
-      * Returns the index of the first occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      *  search starts at index 0.
-      */
-    indexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * Adds all the elements of an array separated by the specified separator string.
-      * @param separator A string used to separate one element of an array from the next in the 
-      * resulting String. If omitted, the array elements are separated with a comma.
-      */
-    join(separator?: string): string;
-
-    /**
-      * Returns the index of the last occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the 
-      * search starts at index 0.
-      */
-    lastIndexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * The length of the array.
-      */
-    length: number;
-
-    /**
-      * Calls a defined callback function on each element of an array, and returns an array that 
-      * contains the results.
-      * @param callbackfn A function that accepts up to three arguments. The map 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.
-      */
-    map(callbackfn: (value: number, index: number, array: Uint8ClampedArray) => number, thisArg?: any): Uint8ClampedArray;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of 
-      * the callback function is the accumulated result, and is provided as an argument in the next 
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the 
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint8ClampedArray) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of 
-      * the callback function is the accumulated result, and is provided as an argument in the next 
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the 
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument 
-      * instead of an array value.
-      */
-    reduce<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Uint8ClampedArray) => U, initialValue: U): U;
-
-    /** 
-      * Calls the specified callback function for all the elements in an array, in descending order. 
-      * The return value of the callback function is the accumulated result, and is provided as an 
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls 
-      * the callbackfn function one time for each element in the array. 
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an 
-      * argument instead of an array value.
-      */
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint8ClampedArray) => number, initialValue?: number): number;
-
-    /** 
-      * Calls the specified callback function for all the elements in an array, in descending order. 
-      * The return value of the callback function is the accumulated result, and is provided as an 
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array. 
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduceRight<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Uint8ClampedArray) => U, initialValue: U): U;
-
-    /**
-      * Reverses the elements in an Array. 
-      */
-    reverse(): Uint8ClampedArray;
-
-    /**
-      * Sets a value or an array of values.
-      * @param index The index of the location to set.
-      * @param value The value to set.
-      */
-    set(index: number, value: number): void;
-
-    /**
-      * Sets a value or an array of values.
-      * @param array A typed or untyped array of values to set.
-      * @param offset The index in the current array at which the values are to be written.
-      */
-    set(array: Uint8ClampedArray, offset?: number): void;
-
-    /** 
-      * Returns a section of an array.
-      * @param start The beginning of the specified portion of the array.
-      * @param end The end of the specified portion of the array.
-      */
-    slice(start?: number, end?: number): Uint8ClampedArray;
-
-    /**
-      * Determines whether the specified callback function returns true for any element of an array.
-      * @param callbackfn A function that accepts up to three arguments. The some method calls the 
-      * callbackfn function for each element in array1 until the callbackfn returns true, or until 
-      * the end of 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.
-      */
-    some(callbackfn: (value: number, index: number, array: Uint8ClampedArray) => boolean, thisArg?: any): boolean;
-
-    /**
-      * Sorts an array.
-      * @param compareFn The name of the function used to determine the order of the elements. If 
-      * omitted, the elements are sorted in ascending, ASCII character order.
-      */
-    sort(compareFn?: (a: number, b: number) => number): Uint8ClampedArray;
-
-    /**
-      * Gets a new Uint8ClampedArray view of the ArrayBuffer store for this array, referencing the elements
-      * at begin, inclusive, up to end, exclusive. 
-      * @param begin The index of the beginning of the array.
-      * @param end The index of the end of the array.
-      */
-    subarray(begin: number, end?: number): Uint8ClampedArray;
-
-    /**
-      * Converts a number to a string by using the current locale. 
-      */
-    toLocaleString(): string;
-
-    /**
-      * Returns a string representation of an array.
-      */
-    toString(): string;
-
-    [index: number]: number;
-}
-
-interface Uint8ClampedArrayConstructor {
-    prototype: Uint8ClampedArray;
-    new (length: number): Uint8ClampedArray;
-    new (array: ArrayLike<number>): Uint8ClampedArray;
-    new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint8ClampedArray;
-
-    /**
-      * The size in bytes of each element in the array. 
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * Returns a new array from a set of elements.
-      * @param items A set of elements to include in the new array object.
-      */
-    of(...items: number[]): Uint8ClampedArray;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8ClampedArray;
-}
-declare var Uint8ClampedArray: Uint8ClampedArrayConstructor;
-
-/**
-  * A typed array of 16-bit signed integer values. The contents are initialized to 0. If the 
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Int16Array {
-    /**
-      * The size in bytes of each element in the array. 
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * The ArrayBuffer instance referenced by the array. 
-      */
-    buffer: ArrayBuffer;
-
-    /**
-      * The length in bytes of the array.
-      */
-    byteLength: number;
-
-    /**
-      * The offset in bytes of the array.
-      */
-    byteOffset: number;
-
-    /** 
-      * Returns the this object after copying a section of the array identified by start and end
-      * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the 
-      * length of the array. 
-      * @param start If start is negative, it is treated as length+start. If end is negative, it 
-      * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value. 
-      */
-    copyWithin(target: number, start: number, end?: number): Int16Array;
-
-    /**
-      * Determines whether all the members of an array satisfy the specified test.
-      * @param callbackfn A function that accepts up to three arguments. The every method calls 
-      * the callbackfn function for each element in array1 until the callbackfn returns false, 
-      * or until the end of 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.
-      */
-    every(callbackfn: (value: number, index: number, array: Int16Array) => boolean, thisArg?: any): boolean;
-
-    /**
-        * Returns the this object after filling the section identified by start and end with value
-        * @param value value to fill array section with
-        * @param start index to start filling the array at. If start is negative, it is treated as 
-        * length+start where length is the length of the array. 
-        * @param end index to stop filling the array at. If end is negative, it is treated as 
-        * length+end.
-        */
-    fill(value: number, start?: number, end?: number): Int16Array;
-
-    /**
-      * 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(callbackfn: (value: number, index: number, array: Int16Array) => boolean, thisArg?: any): Int16Array;
-
-    /** 
-      * Returns the value of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
-
-    /** 
-      * Returns the index of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
-
-    /**
-      * Performs the specified action for each element in an array.
-      * @param callbackfn  A function that accepts up to three arguments. forEach 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.
-      */
-    forEach(callbackfn: (value: number, index: number, array: Int16Array) => void, thisArg?: any): void;
-
-    /**
-      * Returns the index of the first occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      *  search starts at index 0.
-      */
-    indexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * Adds all the elements of an array separated by the specified separator string.
-      * @param separator A string used to separate one element of an array from the next in the 
-      * resulting String. If omitted, the array elements are separated with a comma.
-      */
-    join(separator?: string): string;
-
-    /**
-      * Returns the index of the last occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the 
-      * search starts at index 0.
-      */
-    lastIndexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * The length of the array.
-      */
-    length: number;
-
-    /**
-      * Calls a defined callback function on each element of an array, and returns an array that 
-      * contains the results.
-      * @param callbackfn A function that accepts up to three arguments. The map 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.
-      */
-    map(callbackfn: (value: number, index: number, array: Int16Array) => number, thisArg?: any): Int16Array;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of 
-      * the callback function is the accumulated result, and is provided as an argument in the next 
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the 
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int16Array) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of 
-      * the callback function is the accumulated result, and is provided as an argument in the next 
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the 
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument 
-      * instead of an array value.
-      */
-    reduce<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Int16Array) => U, initialValue: U): U;
-
-    /** 
-      * Calls the specified callback function for all the elements in an array, in descending order. 
-      * The return value of the callback function is the accumulated result, and is provided as an 
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls 
-      * the callbackfn function one time for each element in the array. 
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an 
-      * argument instead of an array value.
-      */
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int16Array) => number, initialValue?: number): number;
-
-    /** 
-      * Calls the specified callback function for all the elements in an array, in descending order. 
-      * The return value of the callback function is the accumulated result, and is provided as an 
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array. 
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduceRight<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Int16Array) => U, initialValue: U): U;
-
-    /**
-      * Reverses the elements in an Array. 
-      */
-    reverse(): Int16Array;
-
-    /**
-      * Sets a value or an array of values.
-      * @param index The index of the location to set.
-      * @param value The value to set.
-      */
-    set(index: number, value: number): void;
-
-    /**
-      * Sets a value or an array of values.
-      * @param array A typed or untyped array of values to set.
-      * @param offset The index in the current array at which the values are to be written.
-      */
-    set(array: ArrayLike<number>, offset?: number): void;
-
-    /** 
-      * Returns a section of an array.
-      * @param start The beginning of the specified portion of the array.
-      * @param end The end of the specified portion of the array.
-      */
-    slice(start?: number, end?: number): Int16Array;
-
-    /**
-      * Determines whether the specified callback function returns true for any element of an array.
-      * @param callbackfn A function that accepts up to three arguments. The some method calls the 
-      * callbackfn function for each element in array1 until the callbackfn returns true, or until 
-      * the end of 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.
-      */
-    some(callbackfn: (value: number, index: number, array: Int16Array) => boolean, thisArg?: any): boolean;
-
-    /**
-      * Sorts an array.
-      * @param compareFn The name of the function used to determine the order of the elements. If 
-      * omitted, the elements are sorted in ascending, ASCII character order.
-      */
-    sort(compareFn?: (a: number, b: number) => number): Int16Array;
-
-    /**
-      * Gets a new Int16Array view of the ArrayBuffer store for this array, referencing the elements
-      * at begin, inclusive, up to end, exclusive. 
-      * @param begin The index of the beginning of the array.
-      * @param end The index of the end of the array.
-      */
-    subarray(begin: number, end?: number): Int16Array;
-
-    /**
-      * Converts a number to a string by using the current locale. 
-      */
-    toLocaleString(): string;
-
-    /**
-      * Returns a string representation of an array.
-      */
-    toString(): string;
-
-    [index: number]: number;
-}
-
-interface Int16ArrayConstructor {
-    prototype: Int16Array;
-    new (length: number): Int16Array;
-    new (array: ArrayLike<number>): Int16Array;
-    new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Int16Array;
-
-    /**
-      * The size in bytes of each element in the array. 
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * Returns a new array from a set of elements.
-      * @param items A set of elements to include in the new array object.
-      */
-    of(...items: number[]): Int16Array;
-    
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int16Array;
-
-}
-declare var Int16Array: Int16ArrayConstructor;
-
-/**
-  * A typed array of 16-bit unsigned integer values. The contents are initialized to 0. If the 
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Uint16Array {
-    /**
-      * The size in bytes of each element in the array. 
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * The ArrayBuffer instance referenced by the array. 
-      */
-    buffer: ArrayBuffer;
-
-    /**
-      * The length in bytes of the array.
-      */
-    byteLength: number;
-
-    /**
-      * The offset in bytes of the array.
-      */
-    byteOffset: number;
-
-    /** 
-      * Returns the this object after copying a section of the array identified by start and end
-      * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the 
-      * length of the array. 
-      * @param start If start is negative, it is treated as length+start. If end is negative, it 
-      * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value. 
-      */
-    copyWithin(target: number, start: number, end?: number): Uint16Array;
-
-    /**
-      * Determines whether all the members of an array satisfy the specified test.
-      * @param callbackfn A function that accepts up to three arguments. The every method calls 
-      * the callbackfn function for each element in array1 until the callbackfn returns false, 
-      * or until the end of 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.
-      */
-    every(callbackfn: (value: number, index: number, array: Uint16Array) => boolean, thisArg?: any): boolean;
-
-    /**
-        * Returns the this object after filling the section identified by start and end with value
-        * @param value value to fill array section with
-        * @param start index to start filling the array at. If start is negative, it is treated as 
-        * length+start where length is the length of the array. 
-        * @param end index to stop filling the array at. If end is negative, it is treated as 
-        * length+end.
-        */
-    fill(value: number, start?: number, end?: number): Uint16Array;
-
-    /**
-      * 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(callbackfn: (value: number, index: number, array: Uint16Array) => boolean, thisArg?: any): Uint16Array;
-
-    /** 
-      * Returns the value of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
-
-    /** 
-      * Returns the index of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
-
-    /**
-      * Performs the specified action for each element in an array.
-      * @param callbackfn  A function that accepts up to three arguments. forEach 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.
-      */
-    forEach(callbackfn: (value: number, index: number, array: Uint16Array) => void, thisArg?: any): void;
-
-    /**
-      * Returns the index of the first occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      *  search starts at index 0.
-      */
-    indexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * Adds all the elements of an array separated by the specified separator string.
-      * @param separator A string used to separate one element of an array from the next in the 
-      * resulting String. If omitted, the array elements are separated with a comma.
-      */
-    join(separator?: string): string;
-
-    /**
-      * Returns the index of the last occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the 
-      * search starts at index 0.
-      */
-    lastIndexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * The length of the array.
-      */
-    length: number;
-
-    /**
-      * Calls a defined callback function on each element of an array, and returns an array that 
-      * contains the results.
-      * @param callbackfn A function that accepts up to three arguments. The map 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.
-      */
-    map(callbackfn: (value: number, index: number, array: Uint16Array) => number, thisArg?: any): Uint16Array;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of 
-      * the callback function is the accumulated result, and is provided as an argument in the next 
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the 
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint16Array) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of 
-      * the callback function is the accumulated result, and is provided as an argument in the next 
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the 
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument 
-      * instead of an array value.
-      */
-    reduce<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Uint16Array) => U, initialValue: U): U;
-
-    /** 
-      * Calls the specified callback function for all the elements in an array, in descending order. 
-      * The return value of the callback function is the accumulated result, and is provided as an 
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls 
-      * the callbackfn function one time for each element in the array. 
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an 
-      * argument instead of an array value.
-      */
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint16Array) => number, initialValue?: number): number;
-
-    /** 
-      * Calls the specified callback function for all the elements in an array, in descending order. 
-      * The return value of the callback function is the accumulated result, and is provided as an 
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array. 
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduceRight<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Uint16Array) => U, initialValue: U): U;
-
-    /**
-      * Reverses the elements in an Array. 
-      */
-    reverse(): Uint16Array;
-
-    /**
-      * Sets a value or an array of values.
-      * @param index The index of the location to set.
-      * @param value The value to set.
-      */
-    set(index: number, value: number): void;
-
-    /**
-      * Sets a value or an array of values.
-      * @param array A typed or untyped array of values to set.
-      * @param offset The index in the current array at which the values are to be written.
-      */
-    set(array: ArrayLike<number>, offset?: number): void;
-
-    /** 
-      * Returns a section of an array.
-      * @param start The beginning of the specified portion of the array.
-      * @param end The end of the specified portion of the array.
-      */
-    slice(start?: number, end?: number): Uint16Array;
-
-    /**
-      * Determines whether the specified callback function returns true for any element of an array.
-      * @param callbackfn A function that accepts up to three arguments. The some method calls the 
-      * callbackfn function for each element in array1 until the callbackfn returns true, or until 
-      * the end of 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.
-      */
-    some(callbackfn: (value: number, index: number, array: Uint16Array) => boolean, thisArg?: any): boolean;
-
-    /**
-      * Sorts an array.
-      * @param compareFn The name of the function used to determine the order of the elements. If 
-      * omitted, the elements are sorted in ascending, ASCII character order.
-      */
-    sort(compareFn?: (a: number, b: number) => number): Uint16Array;
-
-    /**
-      * Gets a new Uint16Array view of the ArrayBuffer store for this array, referencing the elements
-      * at begin, inclusive, up to end, exclusive. 
-      * @param begin The index of the beginning of the array.
-      * @param end The index of the end of the array.
-      */
-    subarray(begin: number, end?: number): Uint16Array;
-
-    /**
-      * Converts a number to a string by using the current locale. 
-      */
-    toLocaleString(): string;
-
-    /**
-      * Returns a string representation of an array.
-      */
-    toString(): string;
-
-    [index: number]: number;
-}
-
-interface Uint16ArrayConstructor {
-    prototype: Uint16Array;
-    new (length: number): Uint16Array;
-    new (array: ArrayLike<number>): Uint16Array;
-    new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint16Array;
-
-    /**
-      * The size in bytes of each element in the array. 
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * Returns a new array from a set of elements.
-      * @param items A set of elements to include in the new array object.
-      */
-    of(...items: number[]): Uint16Array;
-    
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint16Array;
-
-}
-declare var Uint16Array: Uint16ArrayConstructor;
-/**
-  * A typed array of 32-bit signed integer values. The contents are initialized to 0. If the 
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Int32Array {
-    /**
-      * The size in bytes of each element in the array. 
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * The ArrayBuffer instance referenced by the array. 
-      */
-    buffer: ArrayBuffer;
-
-    /**
-      * The length in bytes of the array.
-      */
-    byteLength: number;
-
-    /**
-      * The offset in bytes of the array.
-      */
-    byteOffset: number;
-
-    /** 
-      * Returns the this object after copying a section of the array identified by start and end
-      * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the 
-      * length of the array. 
-      * @param start If start is negative, it is treated as length+start. If end is negative, it 
-      * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value. 
-      */
-    copyWithin(target: number, start: number, end?: number): Int32Array;
-
-    /**
-      * Determines whether all the members of an array satisfy the specified test.
-      * @param callbackfn A function that accepts up to three arguments. The every method calls 
-      * the callbackfn function for each element in array1 until the callbackfn returns false, 
-      * or until the end of 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.
-      */
-    every(callbackfn: (value: number, index: number, array: Int32Array) => boolean, thisArg?: any): boolean;
-
-    /**
-        * Returns the this object after filling the section identified by start and end with value
-        * @param value value to fill array section with
-        * @param start index to start filling the array at. If start is negative, it is treated as 
-        * length+start where length is the length of the array. 
-        * @param end index to stop filling the array at. If end is negative, it is treated as 
-        * length+end.
-        */
-    fill(value: number, start?: number, end?: number): Int32Array;
-
-    /**
-      * 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(callbackfn: (value: number, index: number, array: Int32Array) => boolean, thisArg?: any): Int32Array;
-
-    /** 
-      * Returns the value of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
-
-    /** 
-      * Returns the index of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
-
-    /**
-      * Performs the specified action for each element in an array.
-      * @param callbackfn  A function that accepts up to three arguments. forEach 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.
-      */
-    forEach(callbackfn: (value: number, index: number, array: Int32Array) => void, thisArg?: any): void;
-
-    /**
-      * Returns the index of the first occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      *  search starts at index 0.
-      */
-    indexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * Adds all the elements of an array separated by the specified separator string.
-      * @param separator A string used to separate one element of an array from the next in the 
-      * resulting String. If omitted, the array elements are separated with a comma.
-      */
-    join(separator?: string): string;
-
-    /**
-      * Returns the index of the last occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the 
-      * search starts at index 0.
-      */
-    lastIndexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * The length of the array.
-      */
-    length: number;
-
-    /**
-      * Calls a defined callback function on each element of an array, and returns an array that 
-      * contains the results.
-      * @param callbackfn A function that accepts up to three arguments. The map 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.
-      */
-    map(callbackfn: (value: number, index: number, array: Int32Array) => number, thisArg?: any): Int32Array;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of 
-      * the callback function is the accumulated result, and is provided as an argument in the next 
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the 
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int32Array) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of 
-      * the callback function is the accumulated result, and is provided as an argument in the next 
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the 
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument 
-      * instead of an array value.
-      */
-    reduce<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Int32Array) => U, initialValue: U): U;
-
-    /** 
-      * Calls the specified callback function for all the elements in an array, in descending order. 
-      * The return value of the callback function is the accumulated result, and is provided as an 
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls 
-      * the callbackfn function one time for each element in the array. 
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an 
-      * argument instead of an array value.
-      */
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int32Array) => number, initialValue?: number): number;
-
-    /** 
-      * Calls the specified callback function for all the elements in an array, in descending order. 
-      * The return value of the callback function is the accumulated result, and is provided as an 
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array. 
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduceRight<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Int32Array) => U, initialValue: U): U;
-
-    /**
-      * Reverses the elements in an Array. 
-      */
-    reverse(): Int32Array;
-
-    /**
-      * Sets a value or an array of values.
-      * @param index The index of the location to set.
-      * @param value The value to set.
-      */
-    set(index: number, value: number): void;
-
-    /**
-      * Sets a value or an array of values.
-      * @param array A typed or untyped array of values to set.
-      * @param offset The index in the current array at which the values are to be written.
-      */
-    set(array: ArrayLike<number>, offset?: number): void;
-
-    /** 
-      * Returns a section of an array.
-      * @param start The beginning of the specified portion of the array.
-      * @param end The end of the specified portion of the array.
-      */
-    slice(start?: number, end?: number): Int32Array;
-
-    /**
-      * Determines whether the specified callback function returns true for any element of an array.
-      * @param callbackfn A function that accepts up to three arguments. The some method calls the 
-      * callbackfn function for each element in array1 until the callbackfn returns true, or until 
-      * the end of 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.
-      */
-    some(callbackfn: (value: number, index: number, array: Int32Array) => boolean, thisArg?: any): boolean;
-
-    /**
-      * Sorts an array.
-      * @param compareFn The name of the function used to determine the order of the elements. If 
-      * omitted, the elements are sorted in ascending, ASCII character order.
-      */
-    sort(compareFn?: (a: number, b: number) => number): Int32Array;
-
-    /**
-      * Gets a new Int32Array view of the ArrayBuffer store for this array, referencing the elements
-      * at begin, inclusive, up to end, exclusive. 
-      * @param begin The index of the beginning of the array.
-      * @param end The index of the end of the array.
-      */
-    subarray(begin: number, end?: number): Int32Array;
-
-    /**
-      * Converts a number to a string by using the current locale. 
-      */
-    toLocaleString(): string;
-
-    /**
-      * Returns a string representation of an array.
-      */
-    toString(): string;
-
-    [index: number]: number;
-}
-
-interface Int32ArrayConstructor {
-    prototype: Int32Array;
-    new (length: number): Int32Array;
-    new (array: ArrayLike<number>): Int32Array;
-    new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Int32Array;
-
-    /**
-      * The size in bytes of each element in the array. 
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * Returns a new array from a set of elements.
-      * @param items A set of elements to include in the new array object.
-      */
-    of(...items: number[]): Int32Array;
-    
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int32Array;
-}
-declare var Int32Array: Int32ArrayConstructor;
-
-/**
-  * A typed array of 32-bit unsigned integer values. The contents are initialized to 0. If the 
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Uint32Array {
-    /**
-      * The size in bytes of each element in the array. 
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * The ArrayBuffer instance referenced by the array. 
-      */
-    buffer: ArrayBuffer;
-
-    /**
-      * The length in bytes of the array.
-      */
-    byteLength: number;
-
-    /**
-      * The offset in bytes of the array.
-      */
-    byteOffset: number;
-
-    /** 
-      * Returns the this object after copying a section of the array identified by start and end
-      * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the 
-      * length of the array. 
-      * @param start If start is negative, it is treated as length+start. If end is negative, it 
-      * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value. 
-      */
-    copyWithin(target: number, start: number, end?: number): Uint32Array;
-
-    /**
-      * Determines whether all the members of an array satisfy the specified test.
-      * @param callbackfn A function that accepts up to three arguments. The every method calls 
-      * the callbackfn function for each element in array1 until the callbackfn returns false, 
-      * or until the end of 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.
-      */
-    every(callbackfn: (value: number, index: number, array: Uint32Array) => boolean, thisArg?: any): boolean;
-
-    /**
-        * Returns the this object after filling the section identified by start and end with value
-        * @param value value to fill array section with
-        * @param start index to start filling the array at. If start is negative, it is treated as 
-        * length+start where length is the length of the array. 
-        * @param end index to stop filling the array at. If end is negative, it is treated as 
-        * length+end.
-        */
-    fill(value: number, start?: number, end?: number): Uint32Array;
-
-    /**
-      * 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(callbackfn: (value: number, index: number, array: Uint32Array) => boolean, thisArg?: any): Uint32Array;
-
-    /** 
-      * Returns the value of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
-
-    /** 
-      * Returns the index of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
-
-    /**
-      * Performs the specified action for each element in an array.
-      * @param callbackfn  A function that accepts up to three arguments. forEach 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.
-      */
-    forEach(callbackfn: (value: number, index: number, array: Uint32Array) => void, thisArg?: any): void;
-
-    /**
-      * Returns the index of the first occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      *  search starts at index 0.
-      */
-    indexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * Adds all the elements of an array separated by the specified separator string.
-      * @param separator A string used to separate one element of an array from the next in the 
-      * resulting String. If omitted, the array elements are separated with a comma.
-      */
-    join(separator?: string): string;
-
-    /**
-      * Returns the index of the last occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the 
-      * search starts at index 0.
-      */
-    lastIndexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * The length of the array.
-      */
-    length: number;
-
-    /**
-      * Calls a defined callback function on each element of an array, and returns an array that 
-      * contains the results.
-      * @param callbackfn A function that accepts up to three arguments. The map 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.
-      */
-    map(callbackfn: (value: number, index: number, array: Uint32Array) => number, thisArg?: any): Uint32Array;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of 
-      * the callback function is the accumulated result, and is provided as an argument in the next 
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the 
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint32Array) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of 
-      * the callback function is the accumulated result, and is provided as an argument in the next 
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the 
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument 
-      * instead of an array value.
-      */
-    reduce<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Uint32Array) => U, initialValue: U): U;
-
-    /** 
-      * Calls the specified callback function for all the elements in an array, in descending order. 
-      * The return value of the callback function is the accumulated result, and is provided as an 
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls 
-      * the callbackfn function one time for each element in the array. 
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an 
-      * argument instead of an array value.
-      */
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint32Array) => number, initialValue?: number): number;
-
-    /** 
-      * Calls the specified callback function for all the elements in an array, in descending order. 
-      * The return value of the callback function is the accumulated result, and is provided as an 
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array. 
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduceRight<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Uint32Array) => U, initialValue: U): U;
-
-    /**
-      * Reverses the elements in an Array. 
-      */
-    reverse(): Uint32Array;
-
-    /**
-      * Sets a value or an array of values.
-      * @param index The index of the location to set.
-      * @param value The value to set.
-      */
-    set(index: number, value: number): void;
-
-    /**
-      * Sets a value or an array of values.
-      * @param array A typed or untyped array of values to set.
-      * @param offset The index in the current array at which the values are to be written.
-      */
-    set(array: ArrayLike<number>, offset?: number): void;
-
-    /** 
-      * Returns a section of an array.
-      * @param start The beginning of the specified portion of the array.
-      * @param end The end of the specified portion of the array.
-      */
-    slice(start?: number, end?: number): Uint32Array;
-
-    /**
-      * Determines whether the specified callback function returns true for any element of an array.
-      * @param callbackfn A function that accepts up to three arguments. The some method calls the 
-      * callbackfn function for each element in array1 until the callbackfn returns true, or until 
-      * the end of 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.
-      */
-    some(callbackfn: (value: number, index: number, array: Uint32Array) => boolean, thisArg?: any): boolean;
-
-    /**
-      * Sorts an array.
-      * @param compareFn The name of the function used to determine the order of the elements. If 
-      * omitted, the elements are sorted in ascending, ASCII character order.
-      */
-    sort(compareFn?: (a: number, b: number) => number): Uint32Array;
-
-    /**
-      * Gets a new Uint32Array view of the ArrayBuffer store for this array, referencing the elements
-      * at begin, inclusive, up to end, exclusive. 
-      * @param begin The index of the beginning of the array.
-      * @param end The index of the end of the array.
-      */
-    subarray(begin: number, end?: number): Uint32Array;
-
-    /**
-      * Converts a number to a string by using the current locale. 
-      */
-    toLocaleString(): string;
-
-    /**
-      * Returns a string representation of an array.
-      */
-    toString(): string;
-
-    [index: number]: number;
-}
-
-interface Uint32ArrayConstructor {
-    prototype: Uint32Array;
-    new (length: number): Uint32Array;
-    new (array: ArrayLike<number>): Uint32Array;
-    new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint32Array;
-
-    /**
-      * The size in bytes of each element in the array. 
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * Returns a new array from a set of elements.
-      * @param items A set of elements to include in the new array object.
-      */
-    of(...items: number[]): Uint32Array;
-    
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint32Array;
-}
-declare var Uint32Array: Uint32ArrayConstructor;
-
-/**
-  * A typed array of 32-bit float values. The contents are initialized to 0. If the requested number
-  * of bytes could not be allocated an exception is raised.
-  */
-interface Float32Array {
-    /**
-      * The size in bytes of each element in the array. 
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * The ArrayBuffer instance referenced by the array. 
-      */
-    buffer: ArrayBuffer;
-
-    /**
-      * The length in bytes of the array.
-      */
-    byteLength: number;
-
-    /**
-      * The offset in bytes of the array.
-      */
-    byteOffset: number;
-
-    /** 
-      * Returns the this object after copying a section of the array identified by start and end
-      * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the 
-      * length of the array. 
-      * @param start If start is negative, it is treated as length+start. If end is negative, it 
-      * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value. 
-      */
-    copyWithin(target: number, start: number, end?: number): Float32Array;
-
-    /**
-      * Determines whether all the members of an array satisfy the specified test.
-      * @param callbackfn A function that accepts up to three arguments. The every method calls 
-      * the callbackfn function for each element in array1 until the callbackfn returns false, 
-      * or until the end of 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.
-      */
-    every(callbackfn: (value: number, index: number, array: Float32Array) => boolean, thisArg?: any): boolean;
-
-    /**
-        * Returns the this object after filling the section identified by start and end with value
-        * @param value value to fill array section with
-        * @param start index to start filling the array at. If start is negative, it is treated as 
-        * length+start where length is the length of the array. 
-        * @param end index to stop filling the array at. If end is negative, it is treated as 
-        * length+end.
-        */
-    fill(value: number, start?: number, end?: number): Float32Array;
-
-    /**
-      * 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(callbackfn: (value: number, index: number, array: Float32Array) => boolean, thisArg?: any): Float32Array;
-
-    /** 
-      * Returns the value of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
-
-    /** 
-      * Returns the index of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
-
-    /**
-      * Performs the specified action for each element in an array.
-      * @param callbackfn  A function that accepts up to three arguments. forEach 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.
-      */
-    forEach(callbackfn: (value: number, index: number, array: Float32Array) => void, thisArg?: any): void;
-
-    /**
-      * Returns the index of the first occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      *  search starts at index 0.
-      */
-    indexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * Adds all the elements of an array separated by the specified separator string.
-      * @param separator A string used to separate one element of an array from the next in the 
-      * resulting String. If omitted, the array elements are separated with a comma.
-      */
-    join(separator?: string): string;
-
-    /**
-      * Returns the index of the last occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the 
-      * search starts at index 0.
-      */
-    lastIndexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * The length of the array.
-      */
-    length: number;
-
-    /**
-      * Calls a defined callback function on each element of an array, and returns an array that 
-      * contains the results.
-      * @param callbackfn A function that accepts up to three arguments. The map 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.
-      */
-    map(callbackfn: (value: number, index: number, array: Float32Array) => number, thisArg?: any): Float32Array;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of 
-      * the callback function is the accumulated result, and is provided as an argument in the next 
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the 
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Float32Array) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of 
-      * the callback function is the accumulated result, and is provided as an argument in the next 
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the 
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument 
-      * instead of an array value.
-      */
-    reduce<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Float32Array) => U, initialValue: U): U;
-
-    /** 
-      * Calls the specified callback function for all the elements in an array, in descending order. 
-      * The return value of the callback function is the accumulated result, and is provided as an 
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls 
-      * the callbackfn function one time for each element in the array. 
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an 
-      * argument instead of an array value.
-      */
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Float32Array) => number, initialValue?: number): number;
-
-    /** 
-      * Calls the specified callback function for all the elements in an array, in descending order. 
-      * The return value of the callback function is the accumulated result, and is provided as an 
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array. 
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduceRight<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Float32Array) => U, initialValue: U): U;
-
-    /**
-      * Reverses the elements in an Array. 
-      */
-    reverse(): Float32Array;
-
-    /**
-      * Sets a value or an array of values.
-      * @param index The index of the location to set.
-      * @param value The value to set.
-      */
-    set(index: number, value: number): void;
-
-    /**
-      * Sets a value or an array of values.
-      * @param array A typed or untyped array of values to set.
-      * @param offset The index in the current array at which the values are to be written.
-      */
-    set(array: ArrayLike<number>, offset?: number): void;
-
-    /** 
-      * Returns a section of an array.
-      * @param start The beginning of the specified portion of the array.
-      * @param end The end of the specified portion of the array.
-      */
-    slice(start?: number, end?: number): Float32Array;
-
-    /**
-      * Determines whether the specified callback function returns true for any element of an array.
-      * @param callbackfn A function that accepts up to three arguments. The some method calls the 
-      * callbackfn function for each element in array1 until the callbackfn returns true, or until 
-      * the end of 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.
-      */
-    some(callbackfn: (value: number, index: number, array: Float32Array) => boolean, thisArg?: any): boolean;
-
-    /**
-      * Sorts an array.
-      * @param compareFn The name of the function used to determine the order of the elements. If 
-      * omitted, the elements are sorted in ascending, ASCII character order.
-      */
-    sort(compareFn?: (a: number, b: number) => number): Float32Array;
-
-    /**
-      * Gets a new Float32Array view of the ArrayBuffer store for this array, referencing the elements
-      * at begin, inclusive, up to end, exclusive. 
-      * @param begin The index of the beginning of the array.
-      * @param end The index of the end of the array.
-      */
-    subarray(begin: number, end?: number): Float32Array;
-
-    /**
-      * Converts a number to a string by using the current locale. 
-      */
-    toLocaleString(): string;
-
-    /**
-      * Returns a string representation of an array.
-      */
-    toString(): string;
-
-    [index: number]: number;
-}
-
-interface Float32ArrayConstructor {
-    prototype: Float32Array;
-    new (length: number): Float32Array;
-    new (array: ArrayLike<number>): Float32Array;
-    new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Float32Array;
-
-    /**
-      * The size in bytes of each element in the array. 
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * Returns a new array from a set of elements.
-      * @param items A set of elements to include in the new array object.
-      */
-    of(...items: number[]): Float32Array;
-    
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float32Array;
-
-}
-declare var Float32Array: Float32ArrayConstructor;
-
-/**
-  * A typed array of 64-bit float values. The contents are initialized to 0. If the requested 
-  * number of bytes could not be allocated an exception is raised.
-  */
-interface Float64Array {
-    /**
-      * The size in bytes of each element in the array. 
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * The ArrayBuffer instance referenced by the array. 
-      */
-    buffer: ArrayBuffer;
-
-    /**
-      * The length in bytes of the array.
-      */
-    byteLength: number;
-
-    /**
-      * The offset in bytes of the array.
-      */
-    byteOffset: number;
-
-    /** 
-      * Returns the this object after copying a section of the array identified by start and end
-      * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the 
-      * length of the array. 
-      * @param start If start is negative, it is treated as length+start. If end is negative, it 
-      * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value. 
-      */
-    copyWithin(target: number, start: number, end?: number): Float64Array;
-
-    /**
-      * Determines whether all the members of an array satisfy the specified test.
-      * @param callbackfn A function that accepts up to three arguments. The every method calls 
-      * the callbackfn function for each element in array1 until the callbackfn returns false, 
-      * or until the end of 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.
-      */
-    every(callbackfn: (value: number, index: number, array: Float64Array) => boolean, thisArg?: any): boolean;
-
-    /**
-        * Returns the this object after filling the section identified by start and end with value
-        * @param value value to fill array section with
-        * @param start index to start filling the array at. If start is negative, it is treated as 
-        * length+start where length is the length of the array. 
-        * @param end index to stop filling the array at. If end is negative, it is treated as 
-        * length+end.
-        */
-    fill(value: number, start?: number, end?: number): Float64Array;
-
-    /**
-      * 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(callbackfn: (value: number, index: number, array: Float64Array) => boolean, thisArg?: any): Float64Array;
-
-    /** 
-      * Returns the value of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
-
-    /** 
-      * Returns the index of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
-
-    /**
-      * Performs the specified action for each element in an array.
-      * @param callbackfn  A function that accepts up to three arguments. forEach 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.
-      */
-    forEach(callbackfn: (value: number, index: number, array: Float64Array) => void, thisArg?: any): void;
-
-    /**
-      * Returns the index of the first occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the
-      *  search starts at index 0.
-      */
-    indexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * Adds all the elements of an array separated by the specified separator string.
-      * @param separator A string used to separate one element of an array from the next in the 
-      * resulting String. If omitted, the array elements are separated with a comma.
-      */
-    join(separator?: string): string;
-
-    /**
-      * Returns the index of the last occurrence of a value in an array.
-      * @param searchElement The value to locate in the array.
-      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the 
-      * search starts at index 0.
-      */
-    lastIndexOf(searchElement: number, fromIndex?: number): number;
-
-    /**
-      * The length of the array.
-      */
-    length: number;
-
-    /**
-      * Calls a defined callback function on each element of an array, and returns an array that 
-      * contains the results.
-      * @param callbackfn A function that accepts up to three arguments. The map 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.
-      */
-    map(callbackfn: (value: number, index: number, array: Float64Array) => number, thisArg?: any): Float64Array;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of 
-      * the callback function is the accumulated result, and is provided as an argument in the next 
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the 
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Float64Array) => number, initialValue?: number): number;
-
-    /**
-      * Calls the specified callback function for all the elements in an array. The return value of 
-      * the callback function is the accumulated result, and is provided as an argument in the next 
-      * call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the 
-      * callbackfn function one time for each element in the array.
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument 
-      * instead of an array value.
-      */
-    reduce<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Float64Array) => U, initialValue: U): U;
-
-    /** 
-      * Calls the specified callback function for all the elements in an array, in descending order. 
-      * The return value of the callback function is the accumulated result, and is provided as an 
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls 
-      * the callbackfn function one time for each element in the array. 
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an 
-      * argument instead of an array value.
-      */
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Float64Array) => number, initialValue?: number): number;
-
-    /** 
-      * Calls the specified callback function for all the elements in an array, in descending order. 
-      * The return value of the callback function is the accumulated result, and is provided as an 
-      * argument in the next call to the callback function.
-      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls
-      * the callbackfn function one time for each element in the array. 
-      * @param initialValue If initialValue is specified, it is used as the initial value to start 
-      * the accumulation. The first call to the callbackfn function provides this value as an argument
-      * instead of an array value.
-      */
-    reduceRight<U>(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Float64Array) => U, initialValue: U): U;
-
-    /**
-      * Reverses the elements in an Array. 
-      */
-    reverse(): Float64Array;
-
-    /**
-      * Sets a value or an array of values.
-      * @param index The index of the location to set.
-      * @param value The value to set.
-      */
-    set(index: number, value: number): void;
-
-    /**
-      * Sets a value or an array of values.
-      * @param array A typed or untyped array of values to set.
-      * @param offset The index in the current array at which the values are to be written.
-      */
-    set(array: ArrayLike<number>, offset?: number): void;
-
-    /** 
-      * Returns a section of an array.
-      * @param start The beginning of the specified portion of the array.
-      * @param end The end of the specified portion of the array.
-      */
-    slice(start?: number, end?: number): Float64Array;
-
-    /**
-      * Determines whether the specified callback function returns true for any element of an array.
-      * @param callbackfn A function that accepts up to three arguments. The some method calls the 
-      * callbackfn function for each element in array1 until the callbackfn returns true, or until 
-      * the end of 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.
-      */
-    some(callbackfn: (value: number, index: number, array: Float64Array) => boolean, thisArg?: any): boolean;
-
-    /**
-      * Sorts an array.
-      * @param compareFn The name of the function used to determine the order of the elements. If 
-      * omitted, the elements are sorted in ascending, ASCII character order.
-      */
-    sort(compareFn?: (a: number, b: number) => number): Float64Array;
-
-    /**
-      * Gets a new Float64Array view of the ArrayBuffer store for this array, referencing the elements
-      * at begin, inclusive, up to end, exclusive. 
-      * @param begin The index of the beginning of the array.
-      * @param end The index of the end of the array.
-      */
-    subarray(begin: number, end?: number): Float64Array;
-
-    /**
-      * Converts a number to a string by using the current locale. 
-      */
-    toLocaleString(): string;
-
-    /**
-      * Returns a string representation of an array.
-      */
-    toString(): string;
-
-    [index: number]: number;
-}
-
-interface Float64ArrayConstructor {
-    prototype: Float64Array;
-    new (length: number): Float64Array;
-    new (array: ArrayLike<number>): Float64Array;
-    new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Float64Array;
-
-    /**
-      * The size in bytes of each element in the array. 
-      */
-    BYTES_PER_ELEMENT: number;
-
-    /**
-      * Returns a new array from a set of elements.
-      * @param items A set of elements to include in the new array object.
-      */
-    of(...items: number[]): Float64Array;
-    
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float64Array;
-}
-declare var Float64Array: Float64ArrayConstructor;
-declare type PropertyKey = string | number | symbol;
-
-interface Symbol {
-    /** Returns a string representation of an object. */
-    toString(): string;
-
-    /** Returns the primitive value of the specified object. */
-    valueOf(): Object;
-
-    [Symbol.toStringTag]: "Symbol";
-}
-
-interface SymbolConstructor {
-    /** 
-      * A reference to the prototype. 
-      */
-    prototype: Symbol;
-
-    /**
-      * Returns a new unique Symbol value.
-      * @param  description Description of the new Symbol object.
-      */
-    (description?: string|number): symbol;
-
-    /**
-      * Returns a Symbol object from the global symbol registry matching the given key if found. 
-      * Otherwise, returns a new symbol with this key.
-      * @param key key to search for.
-      */
-    for(key: string): symbol;
-
-    /**
-      * Returns a key from the global symbol registry matching the given Symbol if found. 
-      * Otherwise, returns a undefined.
-      * @param sym Symbol to find the key for.
-      */
-    keyFor(sym: symbol): string;
-
-    // Well-known Symbols
-
-    /** 
-      * A method that determines if a constructor object recognizes an object as one of the 
-      * constructor’s instances. Called by the semantics of the instanceof operator. 
-      */
-    hasInstance: symbol;
-
-    /** 
-      * A Boolean value that if true indicates that an object should flatten to its array elements
-      * by Array.prototype.concat.
-      */
-    isConcatSpreadable: symbol;
-
-    /** 
-      * A method that returns the default iterator for an object. Called by the semantics of the 
-      * for-of statement.
-      */
-    iterator: symbol;
-
-    /**
-      * A regular expression method that matches the regular expression against a string. Called 
-      * by the String.prototype.match method. 
-      */
-    match: symbol;
-
-    /** 
-      * A regular expression method that replaces matched substrings of a string. Called by the 
-      * String.prototype.replace method.
-      */
-    replace: symbol;
-
-    /**
-      * A regular expression method that returns the index within a string that matches the 
-      * regular expression. Called by the String.prototype.search method.
-      */
-    search: symbol;
-
-    /** 
-      * A function valued property that is the constructor function that is used to create 
-      * derived objects.
-      */
-    species: symbol;
-
-    /**
-      * A regular expression method that splits a string at the indices that match the regular 
-      * expression. Called by the String.prototype.split method.
-      */
-    split: symbol;
-
-    /** 
-      * A method that converts an object to a corresponding primitive value.
-      * Called by the ToPrimitive abstract operation.
-      */
-    toPrimitive: symbol;
-
-    /** 
-      * A String value that is used in the creation of the default string description of an object.
-      * Called by the built-in method Object.prototype.toString.
-      */
-    toStringTag: symbol;
-
-    /**
-      * An Object whose own property names are property names that are excluded from the 'with'
-      * environment bindings of the associated objects.
-      */
-    unscopables: symbol;
-}
-declare var Symbol: SymbolConstructor;
-
-interface Object {
-    /**
-      * Determines whether an object has a property with the specified name. 
-      * @param v A property name.
-      */
-    hasOwnProperty(v: PropertyKey): boolean;
-
-    /** 
-      * Determines whether a specified property is enumerable.
-      * @param v A property name.
-      */
-    propertyIsEnumerable(v: PropertyKey): boolean;
-}
-
-interface ObjectConstructor {
-    /**
-      * Copy the values of all of the enumerable own properties from one or more source objects to a 
-      * target object. Returns the target object.
-      * @param target The target object to copy to.
-      * @param source The source object from which to copy properties.
-      */
-    assign<T, U>(target: T, source: U): T & U;
-
-    /**
-      * Copy the values of all of the enumerable own properties from one or more source objects to a 
-      * target object. Returns the target object.
-      * @param target The target object to copy to.
-      * @param source1 The first source object from which to copy properties.
-      * @param source2 The second source object from which to copy properties.
-      */
-    assign<T, U, V>(target: T, source1: U, source2: V): T & U & V;
-
-    /**
-      * Copy the values of all of the enumerable own properties from one or more source objects to a 
-      * target object. Returns the target object.
-      * @param target The target object to copy to.
-      * @param source1 The first source object from which to copy properties.
-      * @param source2 The second source object from which to copy properties.
-      * @param source3 The third source object from which to copy properties.
-      */
-    assign<T, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W;
-
-    /**
-      * Copy the values of all of the enumerable own properties from one or more source objects to a 
-      * target object. Returns the target object.
-      * @param target The target object to copy to.
-      * @param sources One or more source objects from which to copy properties
-      */
-    assign(target: any, ...sources: any[]): any;
-
-    /**
-      * Returns an array of all symbol properties found directly on object o.
-      * @param o Object to retrieve the symbols from.
-      */
-    getOwnPropertySymbols(o: any): symbol[];
-
-    /**
-      * Returns true if the values are the same value, false otherwise.
-      * @param value1 The first value.
-      * @param value2 The second value.
-      */
-    is(value1: any, value2: any): boolean;
-
-    /**
-      * Sets the prototype of a specified object o to  object proto or null. Returns the object o.
-      * @param o The object to change its prototype.
-      * @param proto The value of the new prototype or null.
-      */
-    setPrototypeOf(o: any, proto: any): any;
-
-    /**
-      * Gets the own property descriptor of the specified object. 
-      * An own property descriptor is one that is defined directly on the object and is not 
-      * inherited from the object's prototype. 
-      * @param o Object that contains the property.
-      * @param p Name of the property.
-    */
-    getOwnPropertyDescriptor(o: any, propertyKey: PropertyKey): PropertyDescriptor;
-
-    /**
-      * Adds a property to an object, or modifies attributes of an existing property. 
-      * @param o Object on which to add or modify the property. This can be a native JavaScript 
-      * object (that is, a user-defined object or a built in object) or a DOM object.
-      * @param p The property name.
-      * @param attributes Descriptor for the property. It can be for a data property or an accessor
-      *  property.
-      */
-    defineProperty(o: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): any;
-}
-
-interface Function {
-    /**
-      * Returns the name of the function. Function names are read-only and can not be changed.
-      */
-    name: string;
-
-    /**
-     * Determines whether the given value inherits from this function if this function was used
-     * as a constructor function.
-     *
-     * A constructor function can control which objects are recognized as its instances by
-     * 'instanceof' by overriding this method.
-     */
-    [Symbol.hasInstance](value: any): boolean;
-}
-
-interface NumberConstructor {
-    /**
-      * The value of Number.EPSILON is the difference between 1 and the smallest value greater than 1
-      * that is representable as a Number value, which is approximately: 
-      * 2.2204460492503130808472633361816 x 10‍−‍16.
-      */
-    EPSILON: number;
-
-    /**
-      * Returns true if passed value is finite.
-      * Unlike the global isFininte, Number.isFinite doesn't forcibly convert the parameter to a 
-      * number. Only finite values of the type number, result in true.
-      * @param number A numeric value.
-      */
-    isFinite(number: number): boolean;
-
-    /**
-      * Returns true if the value passed is an integer, false otherwise.
-      * @param number A numeric value.
-      */
-    isInteger(number: number): boolean;
-
-    /**
-      * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a 
-      * number). Unlike the global isNaN(), Number.isNaN() doesn't forcefully convert the parameter
-      * to a number. Only values of the type number, that are also NaN, result in true.
-      * @param number A numeric value.
-      */
-    isNaN(number: number): boolean;
-
-    /**
-      * Returns true if the value passed is a safe integer.
-      * @param number A numeric value.
-      */
-    isSafeInteger(number: number): boolean;
-
-    /** 
-      * The value of the largest integer n such that n and n + 1 are both exactly representable as 
-      * a Number value. 
-      * The value of Number.MIN_SAFE_INTEGER is 9007199254740991 2^53 − 1.
-      */
-    MAX_SAFE_INTEGER: number;
-
-    /** 
-      * The value of the smallest integer n such that n and n − 1 are both exactly representable as 
-      * a Number value. 
-      * The value of Number.MIN_SAFE_INTEGER is −9007199254740991 (−(2^53 − 1)).
-      */
-    MIN_SAFE_INTEGER: number;
-
-    /**
-      * Converts a string to a floating-point number. 
-      * @param string A string that contains a floating-point number. 
-      */
-    parseFloat(string: string): number;
-
-    /**
-      * Converts A string to an integer.
-      * @param s A string to convert into a number.
-      * @param radix A value between 2 and 36 that specifies the base of the number in numString. 
-      * If this argument is not supplied, strings with a prefix of '0x' are considered hexadecimal.
-      * All other strings are considered decimal.
-      */
-    parseInt(string: string, radix?: number): number;
-}
-
-interface Array<T> {
-    /** Iterator */
-    [Symbol.iterator](): IterableIterator<T>;
-
-    /**
-     * Returns an object whose properties have the value 'true'
-     * when they will be absent when used in a 'with' statement.
-     */
-    [Symbol.unscopables](): {
-        copyWithin: boolean;
-        entries: boolean;
-        fill: boolean;
-        find: boolean;
-        findIndex: boolean;
-        keys: boolean;
-        values: boolean;
-    };
-
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, T]>;
-
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<T>;
-
-    /** 
-      * Returns the value of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    find(predicate: (value: T, index: number, obj: Array<T>) => boolean, thisArg?: any): T;
-
-    /** 
-      * Returns the index of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    findIndex(predicate: (value: T) => boolean, thisArg?: any): number;
-
-    /**
-      * Returns the this object after filling the section identified by start and end with value
-      * @param value value to fill array section with
-      * @param start index to start filling the array at. If start is negative, it is treated as 
-      * length+start where length is the length of the array. 
-      * @param end index to stop filling the array at. If end is negative, it is treated as 
-      * length+end.
-      */
-    fill(value: T, start?: number, end?: number): T[];
-
-    /** 
-      * Returns the this object after copying a section of the array identified by start and end
-      * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the 
-      * length of the array. 
-      * @param start If start is negative, it is treated as length+start. If end is negative, it 
-      * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value. 
-      */
-    copyWithin(target: number, start: number, end?: number): T[];
-}
-
-interface IArguments {
-    /** Iterator */
-    [Symbol.iterator](): IterableIterator<any>;
-}
-
-interface ArrayConstructor {
-    /**
-      * Creates an array from an array-like object.
-      * @param arrayLike An array-like object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from<T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): Array<U>;
-
-    /**
-      * Creates an array from an iterable object.
-      * @param iterable An iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from<T, U>(iterable: Iterable<T>, mapfn: (v: T, k: number) => U, thisArg?: any): Array<U>;
-
-    /**
-      * Creates an array from an array-like object.
-      * @param arrayLike An array-like object to convert to an array.
-      */
-    from<T>(arrayLike: ArrayLike<T>): Array<T>;
-
-    /**
-      * Creates an array from an iterable object.
-      * @param iterable An iterable object to convert to an array.
-      */
-    from<T>(iterable: Iterable<T>): Array<T>;
-
-    /**
-      * Returns a new array from a set of elements.
-      * @param items A set of elements to include in the new array object.
-      */
-    of<T>(...items: T[]): Array<T>;
-}
-
-interface String {
-    /** Iterator */
-    [Symbol.iterator](): IterableIterator<string>;
-
-    /**
-      * Returns a nonnegative integer Number less than 1114112 (0x110000) that is the code point 
-      * value of the UTF-16 encoded code point starting at the string element at position pos in 
-      * the String resulting from converting this object to a String. 
-      * If there is no element at that position, the result is undefined. 
-      * If a valid UTF-16 surrogate pair does not begin at pos, the result is the code unit at pos.
-      */
-    codePointAt(pos: number): number;
-
-    /**
-      * Returns true if searchString appears as a substring of the result of converting this 
-      * object to a String, at one or more positions that are 
-      * greater than or equal to position; otherwise, returns false.
-      * @param searchString search string 
-      * @param position If position is undefined, 0 is assumed, so as to search all of the String.
-      */
-    includes(searchString: string, position?: number): boolean;
-
-    /**
-      * Returns true if the sequence of elements of searchString converted to a String is the 
-      * same as the corresponding elements of this object (converted to a String) starting at 
-      * endPosition – length(this). Otherwise returns false.
-      */
-    endsWith(searchString: string, endPosition?: number): boolean;
-
-    /**
-      * Returns the String value result of normalizing the string into the normalization form 
-      * named by form as specified in Unicode Standard Annex #15, Unicode Normalization Forms.
-      * @param form Applicable values: "NFC", "NFD", "NFKC", or "NFKD", If not specified default
-      * is "NFC"
-      */
-    normalize(form?: string): string;
-
-    /**
-      * Returns a String value that is made from count copies appended together. If count is 0, 
-      * T is the empty String is returned.
-      * @param count number of copies to append
-      */
-    repeat(count: number): string;
-
-    /**
-      * Returns true if the sequence of elements of searchString converted to a String is the 
-      * same as the corresponding elements of this object (converted to a String) starting at 
-      * position. Otherwise returns false.
-      */
-    startsWith(searchString: string, position?: number): boolean;
-
-    // Overloads for objects with methods of well-known symbols.
-
-    /**
-      * Matches a string an object that supports being matched against, and returns an array containing the results of that search.
-      * @param matcher An object that supports being matched against.
-      */
-    match(matcher: { [Symbol.match](string: string): RegExpMatchArray; }): RegExpMatchArray;
-
-    /**
-      * Replaces text in a string, using an object that supports replacement within a string.
-      * @param searchValue A object can search for and replace matches within a string.
-      * @param replaceValue A string containing the text to replace for every successful match of searchValue in this string.
-      */
-    replace(searchValue: { [Symbol.replace](string: string, replaceValue: string): string; }, replaceValue: string): string;
-
-    /**
-      * Replaces text in a string, using an object that supports replacement within a string.
-      * @param searchValue A object can search for and replace matches within a string.
-      * @param replacer A function that returns the replacement text.
-      */
-    replace(searchValue: { [Symbol.replace](string: string, replacer: (substring: string, ...args: any[]) => string): string; }, replacer: (substring: string, ...args: any[]) => string): string;
-
-    /**
-      * Finds the first substring match in a regular expression search.
-      * @param searcher An object which supports searching within a string.
-      */
-    search(searcher: { [Symbol.search](string: string): number; }): number;
-
-    /**
-      * Split a string into substrings using the specified separator and return them as an array.
-      * @param splitter An object that can split a string.
-      * @param limit A value used to limit the number of elements returned in the array.
-      */
-    split(splitter: { [Symbol.split](string: string, limit?: number): string[]; }, limit?: number): string[];
-
-    /**
-      * Returns an <a> HTML anchor element and sets the name attribute to the text value
-      * @param name
-      */
-    anchor(name: string): string;
-
-    /** Returns a <big> HTML element */
-    big(): string;
-
-    /** Returns a <blink> HTML element */
-    blink(): string;
-
-    /** Returns a <b> HTML element */
-    bold(): string;
-
-    /** Returns a <tt> HTML element */
-    fixed(): string
-
-    /** Returns a <font> HTML element and sets the color attribute value */
-    fontcolor(color: string): string
-
-    /** Returns a <font> HTML element and sets the size attribute value */
-    fontsize(size: number): string;
-
-    /** Returns a <font> HTML element and sets the size attribute value */
-    fontsize(size: string): string;
-
-    /** Returns an <i> HTML element */
-    italics(): string;
-
-    /** Returns an <a> HTML element and sets the href attribute value */
-    link(url: string): string;
-
-    /** Returns a <small> HTML element */
-    small(): string;
-
-    /** Returns a <strike> HTML element */
-    strike(): string;
-
-    /** Returns a <sub> HTML element */
-    sub(): string;
-
-    /** Returns a <sup> HTML element */
-    sup(): string;
-}
-
-interface StringConstructor {
-    /**
-      * Return the String value whose elements are, in order, the elements in the List elements.
-      * If length is 0, the empty string is returned.
-      */
-    fromCodePoint(...codePoints: number[]): string;
-
-    /**
-      * String.raw is intended for use as a tag function of a Tagged Template String. When called
-      * as such the first argument will be a well formed template call site object and the rest 
-      * parameter will contain the substitution values.
-      * @param template A well-formed template string call site representation.
-      * @param substitutions A set of substitution values.
-      */
-    raw(template: TemplateStringsArray, ...substitutions: any[]): string;
-}
-
-interface IteratorResult<T> {
-    done: boolean;
-    value?: T;
-}
-
-interface Iterator<T> {
-    next(value?: any): IteratorResult<T>;
-    return?(value?: any): IteratorResult<T>;
-    throw?(e?: any): IteratorResult<T>;
-}
-
-interface Iterable<T> {
-    [Symbol.iterator](): Iterator<T>;
-}
-
-interface IterableIterator<T> extends Iterator<T> {
-    [Symbol.iterator](): IterableIterator<T>;
-}
-
-interface GeneratorFunction extends Function {
-    [Symbol.toStringTag]: "GeneratorFunction";
-}
-
-interface GeneratorFunctionConstructor {
-    /**
-      * Creates a new Generator function.
-      * @param args A list of arguments the function accepts.
-      */
-    new (...args: string[]): GeneratorFunction;
-    (...args: string[]): GeneratorFunction;
-    prototype: GeneratorFunction;
-}
-declare var GeneratorFunction: GeneratorFunctionConstructor;
-
-interface Math {
-    /**
-      * Returns the number of leading zero bits in the 32-bit binary representation of a number.
-      * @param x A numeric expression.
-      */
-    clz32(x: number): number;
-
-    /**
-      * Returns the result of 32-bit multiplication of two numbers.
-      * @param x First number
-      * @param y Second number
-      */
-    imul(x: number, y: number): number;
-
-    /**
-      * Returns the sign of the x, indicating whether x is positive, negative or zero.
-      * @param x The numeric expression to test
-      */
-    sign(x: number): number;
-
-    /**
-      * Returns the base 10 logarithm of a number.
-      * @param x A numeric expression.
-      */
-    log10(x: number): number;
-
-    /**
-      * Returns the base 2 logarithm of a number.
-      * @param x A numeric expression.
-      */
-    log2(x: number): number;
-
-    /**
-      * Returns the natural logarithm of 1 + x.
-      * @param x A numeric expression.
-      */
-    log1p(x: number): number;
-
-    /**
-      * Returns the result of (e^x - 1) of x (e raised to the power of x, where e is the base of 
-      * the natural logarithms).
-      * @param x A numeric expression.
-      */
-    expm1(x: number): number;
-
-    /**
-      * Returns the hyperbolic cosine of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    cosh(x: number): number;
-
-    /**
-      * Returns the hyperbolic sine of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    sinh(x: number): number;
-
-    /**
-      * Returns the hyperbolic tangent of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    tanh(x: number): number;
-
-    /**
-      * Returns the inverse hyperbolic cosine of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    acosh(x: number): number;
-
-    /**
-      * Returns the inverse hyperbolic sine of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    asinh(x: number): number;
-
-    /**
-      * Returns the inverse hyperbolic tangent of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    atanh(x: number): number;
-
-    /**
-      * Returns the square root of the sum of squares of its arguments.
-      * @param values Values to compute the square root for.
-      *     If no arguments are passed, the result is +0.
-      *     If there is only one argument, the result is the absolute value.
-      *     If any argument is +Infinity or -Infinity, the result is +Infinity.
-      *     If any argument is NaN, the result is NaN.
-      *     If all arguments are either +0 or −0, the result is +0.
-      */
-    hypot(...values: number[] ): number;
-
-    /**
-      * Returns the integral part of the a numeric expression, x, removing any fractional digits.
-      * If x is already an integer, the result is x.
-      * @param x A numeric expression.
-      */
-    trunc(x: number): number;
-
-    /**
-      * Returns the nearest single precision float representation of a number.
-      * @param x A numeric expression.
-      */
-    fround(x: number): number;
-
-    /**
-      * Returns an implementation-dependent approximation to the cube root of number.
-      * @param x A numeric expression.
-      */
-    cbrt(x: number): number;
-
-    [Symbol.toStringTag]: "Math";
-}
-
-interface Date {
-    /**
-     * Converts a Date object to a string.
-     */
-    [Symbol.toPrimitive](hint: "default"): string;
-    /**
-     * Converts a Date object to a string.
-     */
-    [Symbol.toPrimitive](hint: "string"): string;
-    /**
-     * Converts a Date object to a number.
-     */
-    [Symbol.toPrimitive](hint: "number"): number;
-    /**
-     * Converts a Date object to a string or number.
-     *
-     * @param hint The strings "number", "string", or "default" to specify what primitive to return.
-     *
-     * @throws {TypeError} If 'hint' was given something other than "number", "string", or "default".
-     * @returns A number if 'hint' was "number", a string if 'hint' was "string" or "default".
-     */
-    [Symbol.toPrimitive](hint: string): string | number;
-}
-
-interface RegExp {
-    /**
-      * Matches a string with this regular expression, and returns an array containing the results of
-      * that search.
-      * @param string A string to search within.
-      */
-    [Symbol.match](string: string): RegExpMatchArray;
-
-    /**
-      * Replaces text in a string, using this regular expression.
-      * @param string A String object or string literal whose contents matching against
-      *               this regular expression will be replaced
-      * @param replaceValue A String object or string literal containing the text to replace for every 
-      *                     successful match of this regular expression.
-      */
-    [Symbol.replace](string: string, replaceValue: string): string;
-
-    /**
-      * Replaces text in a string, using this regular expression.
-      * @param string A String object or string literal whose contents matching against
-      *               this regular expression will be replaced
-      * @param replacer A function that returns the replacement text.
-      */
-    [Symbol.replace](string: string, replacer: (substring: string, ...args: any[]) => string): string;
-
-    /**
-      * Finds the position beginning first substring match in a regular expression search
-      * using this regular expression.
-      *
-      * @param string The string to search within.
-      */
-    [Symbol.search](string: string): number;
-
-    /**
-      * Returns an array of substrings that were delimited by strings in the original input that
-      * match against this regular expression.
-      *
-      * If the regular expression contains capturing parentheses, then each time this
-      * regular expression matches, the results (including any undefined results) of the
-      * capturing parentheses are spliced.
-      *
-      * @param string string value to split
-      * @param limit if not undefined, the output array is truncated so that it contains no more
-      * than 'limit' elements.
-      */
-    [Symbol.split](string: string, limit?: number): string[];
-
-    /**
-      * Returns a string indicating the flags of the regular expression in question. This field is read-only.
-      * The characters in this string are sequenced and concatenated in the following order:
-      *
-      *    - "g" for global
-      *    - "i" for ignoreCase
-      *    - "m" for multiline
-      *    - "u" for unicode
-      *    - "y" for sticky
-      *
-      * If no flags are set, the value is the empty string.
-      */
-    flags: string;
-
-    /** 
-      * Returns a Boolean value indicating the state of the sticky flag (y) used with a regular 
-      * expression. Default is false. Read-only. 
-      */
-    sticky: boolean;
-
-    /** 
-      * Returns a Boolean value indicating the state of the Unicode flag (u) used with a regular 
-      * expression. Default is false. Read-only. 
-      */
-    unicode: boolean;
-}
-
-interface RegExpConstructor {
-    [Symbol.species](): RegExpConstructor;
-}
-
-interface Map<K, V> {
-    clear(): void;
-    delete(key: K): boolean;
-    entries(): IterableIterator<[K, V]>;
-    forEach(callbackfn: (value: V, index: K, map: Map<K, V>) => void, thisArg?: any): void;
-    get(key: K): V;
-    has(key: K): boolean;
-    keys(): IterableIterator<K>;
-    set(key: K, value?: V): Map<K, V>;
-    size: number;
-    values(): IterableIterator<V>;
-    [Symbol.iterator]():IterableIterator<[K,V]>;
-    [Symbol.toStringTag]: "Map";
-}
-
-interface MapConstructor {
-    new (): Map<any, any>;
-    new <K, V>(): Map<K, V>;
-    new <K, V>(iterable: Iterable<[K, V]>): Map<K, V>;
-    prototype: Map<any, any>;
-}
-declare var Map: MapConstructor;
-
-interface WeakMap<K, V> {
-    clear(): void;
-    delete(key: K): boolean;
-    get(key: K): V;
-    has(key: K): boolean;
-    set(key: K, value?: V): WeakMap<K, V>;
-    [Symbol.toStringTag]: "WeakMap";
-}
-
-interface WeakMapConstructor {
-    new (): WeakMap<any, any>;
-    new <K, V>(): WeakMap<K, V>;
-    new <K, V>(iterable: Iterable<[K, V]>): WeakMap<K, V>;
-    prototype: WeakMap<any, any>;
-}
-declare var WeakMap: WeakMapConstructor;
-
-interface Set<T> {
-    add(value: T): Set<T>;
-    clear(): void;
-    delete(value: T): boolean;
-    entries(): IterableIterator<[T, T]>;
-    forEach(callbackfn: (value: T, index: T, set: Set<T>) => void, thisArg?: any): void;
-    has(value: T): boolean;
-    keys(): IterableIterator<T>;
-    size: number;
-    values(): IterableIterator<T>;
-    [Symbol.iterator]():IterableIterator<T>;
-    [Symbol.toStringTag]: "Set";
-}
-
-interface SetConstructor {
-    new (): Set<any>;
-    new <T>(): Set<T>;
-    new <T>(iterable: Iterable<T>): Set<T>;
-    prototype: Set<any>;
-}
-declare var Set: SetConstructor;
-
-interface WeakSet<T> {
-    add(value: T): WeakSet<T>;
-    clear(): void;
-    delete(value: T): boolean;
-    has(value: T): boolean;
-    [Symbol.toStringTag]: "WeakSet";
-}
-
-interface WeakSetConstructor {
-    new (): WeakSet<any>;
-    new <T>(): WeakSet<T>;
-    new <T>(iterable: Iterable<T>): WeakSet<T>;
-    prototype: WeakSet<any>;
-}
-declare var WeakSet: WeakSetConstructor;
-
-interface JSON {
-    [Symbol.toStringTag]: "JSON";
-}
-
-/**
-  * Represents a raw buffer of binary data, which is used to store data for the 
-  * different typed arrays. ArrayBuffers cannot be read from or written to directly, 
-  * but can be passed to a typed array or DataView Object to interpret the raw 
-  * buffer as needed. 
-  */
-interface ArrayBuffer {
-    [Symbol.toStringTag]: "ArrayBuffer";
-}
-
-interface DataView {
-    [Symbol.toStringTag]: "DataView";
-}
-
-/**
-  * A typed array of 8-bit integer values. The contents are initialized to 0. If the requested 
-  * number of bytes could not be allocated an exception is raised.
-  */
-interface Int8Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-    [Symbol.toStringTag]: "Int8Array";
-}
-
-interface Int8ArrayConstructor {
-    new (elements: Iterable<number>): Int8Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int8Array;
-}
-
-/**
-  * A typed array of 8-bit unsigned integer values. The contents are initialized to 0. If the 
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Uint8Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-    [Symbol.toStringTag]: "UInt8Array";
-}
-
-interface Uint8ArrayConstructor {
-    new (elements: Iterable<number>): Uint8Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8Array;
-}
-
-/**
-  * A typed array of 8-bit unsigned integer (clamped) values. The contents are initialized to 0. 
-  * If the requested number of bytes could not be allocated an exception is raised.
-  */
-interface Uint8ClampedArray {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-
-    [Symbol.iterator](): IterableIterator<number>;
-    [Symbol.toStringTag]: "Uint8ClampedArray";
-}
-
-interface Uint8ClampedArrayConstructor {
-    new (elements: Iterable<number>): Uint8ClampedArray;
-
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8ClampedArray;
-}
-
-/**
-  * A typed array of 16-bit signed integer values. The contents are initialized to 0. If the 
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Int16Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-
-
-    [Symbol.iterator](): IterableIterator<number>;
-    [Symbol.toStringTag]: "Int16Array";
-}
-
-interface Int16ArrayConstructor {
-    new (elements: Iterable<number>): Int16Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int16Array;
-}
-
-/**
-  * A typed array of 16-bit unsigned integer values. The contents are initialized to 0. If the 
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Uint16Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-    [Symbol.toStringTag]: "Uint16Array";
-}
-
-interface Uint16ArrayConstructor {
-    new (elements: Iterable<number>): Uint16Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint16Array;
-}
-
-/**
-  * A typed array of 32-bit signed integer values. The contents are initialized to 0. If the 
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Int32Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-    [Symbol.toStringTag]: "Int32Array";
-}
-
-interface Int32ArrayConstructor {
-    new (elements: Iterable<number>): Int32Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int32Array;
-}
-
-/**
-  * A typed array of 32-bit unsigned integer values. The contents are initialized to 0. If the 
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Uint32Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-    [Symbol.toStringTag]: "Uint32Array";
-}
-
-interface Uint32ArrayConstructor {
-    new (elements: Iterable<number>): Uint32Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint32Array;
-}
-
-/**
-  * A typed array of 32-bit float values. The contents are initialized to 0. If the requested number
-  * of bytes could not be allocated an exception is raised.
-  */
-interface Float32Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-    [Symbol.toStringTag]: "Float32Array";
-}
-
-interface Float32ArrayConstructor {
-    new (elements: Iterable<number>): Float32Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float32Array;
-}
-
-/**
-  * A typed array of 64-bit float values. The contents are initialized to 0. If the requested 
-  * number of bytes could not be allocated an exception is raised.
-  */
-interface Float64Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-    [Symbol.toStringTag]: "Float64Array";
-}
-
-interface Float64ArrayConstructor {
-    new (elements: Iterable<number>): Float64Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float64Array;
-}
-
-interface ProxyHandler<T> {
-    getPrototypeOf? (target: T): any;
-    setPrototypeOf? (target: T, v: any): boolean;
-    isExtensible? (target: T): boolean;
-    preventExtensions? (target: T): boolean;
-    getOwnPropertyDescriptor? (target: T, p: PropertyKey): PropertyDescriptor;
-    has? (target: T, p: PropertyKey): boolean;
-    get? (target: T, p: PropertyKey, receiver: any): any;
-    set? (target: T, p: PropertyKey, value: any, receiver: any): boolean;
-    deleteProperty? (target: T, p: PropertyKey): boolean;
-    defineProperty? (target: T, p: PropertyKey, attributes: PropertyDescriptor): boolean;
-    enumerate? (target: T): PropertyKey[];
-    ownKeys? (target: T): PropertyKey[];
-    apply? (target: T, thisArg: any, argArray?: any): any;
-    construct? (target: T, thisArg: any, argArray?: any): any;
-}
-
-interface ProxyConstructor {
-    revocable<T>(target: T, handler: ProxyHandler<T>): { proxy: T; revoke: () => void; };
-    new <T>(target: T, handler: ProxyHandler<T>): T
-}
-declare var Proxy: ProxyConstructor;
-
-declare namespace Reflect {
-    function apply(target: Function, thisArgument: any, argumentsList: ArrayLike<any>): any;
-    function construct(target: Function, argumentsList: ArrayLike<any>, newTarget?: any): any;
-    function defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean;
-    function deleteProperty(target: any, propertyKey: PropertyKey): boolean;
-    function enumerate(target: any): IterableIterator<any>;
-    function get(target: any, propertyKey: PropertyKey, receiver?: any): any;
-    function getOwnPropertyDescriptor(target: any, propertyKey: PropertyKey): PropertyDescriptor;
-    function getPrototypeOf(target: any): any;
-    function has(target: any, propertyKey: string): boolean;
-    function has(target: any, propertyKey: symbol): boolean;
-    function isExtensible(target: any): boolean;
-    function ownKeys(target: any): Array<PropertyKey>;
-    function preventExtensions(target: any): boolean;
-    function set(target: any, propertyKey: PropertyKey, value: any, receiver?: any): boolean;
-    function setPrototypeOf(target: any, proto: any): boolean;
-}
-
-/**
- * Represents the completion of an asynchronous operation
- */
-interface Promise<T> {
-    /**
-    * Attaches callbacks for the resolution and/or rejection of the Promise.
-    * @param onfulfilled The callback to execute when the Promise is resolved.
-    * @param onrejected The callback to execute when the Promise is rejected.
-    * @returns A Promise for the completion of which ever callback is executed.
-    */
-    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>;
-    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): Promise<TResult>;
-
-    /**
-     * Attaches a callback for only the rejection of the Promise.
-     * @param onrejected The callback to execute when the Promise is rejected.
-     * @returns A Promise for the completion of the callback.
-     */
-    catch(onrejected?: (reason: any) => T | PromiseLike<T>): Promise<T>;
-    catch(onrejected?: (reason: any) => void): Promise<T>;
-
-    [Symbol.toStringTag]: "Promise";
-}
-
-interface PromiseConstructor {
-    /** 
-      * A reference to the prototype. 
-      */
-    prototype: Promise<any>;
-
-    /**
-     * Creates a new Promise.
-     * @param executor A callback used to initialize the promise. This callback is passed two arguments: 
-     * a resolve callback used resolve the promise with a value or the result of another promise, 
-     * and a reject callback used to reject the promise with a provided reason or error.
-     */
-    new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
-
-    /**
-     * Creates a Promise that is resolved with an array of results when all of the provided Promises 
-     * resolve, or rejected when any Promise is rejected.
-     * @param values An array of Promises.
-     * @returns A new Promise.
-     */
-    all<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>, T10 | PromiseLike<T10>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>;
-    all<T1, T2, T3, T4, T5, T6, T7, T8, T9>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>;
-    all<T1, T2, T3, T4, T5, T6, T7, T8>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8]>;
-    all<T1, T2, T3, T4, T5, T6, T7>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>]): Promise<[T1, T2, T3, T4, T5, T6, T7]>;
-    all<T1, T2, T3, T4, T5, T6>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>]): Promise<[T1, T2, T3, T4, T5, T6]>;
-    all<T1, T2, T3, T4, T5>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>]): Promise<[T1, T2, T3, T4, T5]>;
-    all<T1, T2, T3, T4>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>]): Promise<[T1, T2, T3, T4]>;
-    all<T1, T2, T3>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>]): Promise<[T1, T2, T3]>;
-    all<T1, T2>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>]): Promise<[T1, T2]>;
-    all<TAll>(values: Iterable<TAll | PromiseLike<TAll>>): Promise<TAll[]>;
-
-    /**
-     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved 
-     * or rejected.
-     * @param values An array of Promises.
-     * @returns A new Promise.
-     */
-    race<T>(values: Iterable<T | PromiseLike<T>>): Promise<T>;
-
-    /**
-     * Creates a new rejected promise for the provided reason.
-     * @param reason The reason the promise was rejected.
-     * @returns A new rejected Promise.
-     */
-    reject(reason: any): Promise<void>;
-
-    /**
-     * Creates a new rejected promise for the provided reason.
-     * @param reason The reason the promise was rejected.
-     * @returns A new rejected Promise.
-     */
-    reject<T>(reason: any): Promise<T>;
-
-    /**
-      * Creates a new resolved promise for the provided value.
-      * @param value A promise.
-      * @returns A promise whose internal state matches the provided promise.
-      */
-    resolve<T>(value: T | PromiseLike<T>): Promise<T>;
-
-    /**
-     * Creates a new resolved promise .
-     * @returns A resolved promise.
-     */
-    resolve(): Promise<void>;
-
-    [Symbol.species]: Function;
-}
-
-declare var Promise: PromiseConstructor;
diff --git a/lib/lib.d.ts b/lib/lib.d.ts
index 5b2c53c7cc1..da43acc116a 100644
--- a/lib/lib.d.ts
+++ b/lib/lib.d.ts
@@ -18,8 +18,8 @@ and limitations under the License.
 /// ECMAScript APIs
 /////////////////////////////
 
-declare var NaN: number;
-declare var Infinity: number;
+declare const NaN: number;
+declare const Infinity: number;
 
 /**
   * Evaluates JavaScript code and executes it. 
@@ -129,7 +129,7 @@ interface ObjectConstructor {
     (value: any): any;
 
     /** A reference to the prototype for a class of objects. */
-    prototype: Object;
+    readonly prototype: Object;
 
     /** 
       * Returns the prototype of an object. 
@@ -220,7 +220,7 @@ interface ObjectConstructor {
 /**
   * Provides functionality common to all JavaScript objects.
   */
-declare var Object: ObjectConstructor;
+declare const Object: ObjectConstructor;
 
 /**
   * Creates a new function.
@@ -231,14 +231,16 @@ interface Function {
       * @param thisArg The object to be used as the this object.
       * @param argArray A set of arguments to be passed to the function.
       */
-    apply(thisArg: any, argArray?: any): any;
+    apply<T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U;
+    apply(this: Function, thisArg: any, argArray?: any): any;
 
     /**
       * Calls a method of an object, substituting another object for the current object.
       * @param thisArg The object to be used as the current object.
       * @param argArray A list of arguments to be passed to the method.
       */
-    call(thisArg: any, ...argArray: any[]): any;
+    call<T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): U;
+    call(this: Function, thisArg: any, ...argArray: any[]): any;
 
     /**
       * For a given function, creates a bound function that has the same body as the original function. 
@@ -246,10 +248,11 @@ interface Function {
       * @param thisArg An object to which the this keyword can refer inside the new function.
       * @param argArray A list of arguments to be passed to the new function.
       */
-    bind(thisArg: any, ...argArray: any[]): any;
+    bind<T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): (this: void, ...argArray: any[]) => U;
+    bind(this: Function, thisArg: any, ...argArray: any[]): any;
 
     prototype: any;
-    length: number;
+    readonly length: number;
 
     // Non-standard extensions
     arguments: any;
@@ -263,10 +266,10 @@ interface FunctionConstructor {
       */
     new (...args: string[]): Function;
     (...args: string[]): Function;
-    prototype: Function;
+    readonly prototype: Function;
 }
 
-declare var Function: FunctionConstructor;
+declare const Function: FunctionConstructor;
 
 interface IArguments {
     [index: number]: any;
@@ -320,13 +323,13 @@ interface String {
       * Matches a string with a regular expression, and returns an array containing the results of that search.
       * @param regexp A variable name or string literal containing the regular expression pattern and flags.
       */
-    match(regexp: string): RegExpMatchArray;
+    match(regexp: string): RegExpMatchArray | null;
 
     /** 
       * Matches a string with a regular expression, and returns an array containing the results of that search.
       * @param regexp A regular expression object that contains the regular expression pattern and applicable flags. 
       */
-    match(regexp: RegExp): RegExpMatchArray;
+    match(regexp: RegExp): RegExpMatchArray | null;
 
     /**
       * Replaces text in a string, using a regular expression or search string.
@@ -414,7 +417,7 @@ interface String {
     trim(): string;
 
     /** Returns the length of a String object. */
-    length: number;
+    readonly length: number;
 
     // IE extensions
     /**
@@ -427,20 +430,20 @@ interface String {
     /** Returns the primitive value of the specified object. */
     valueOf(): string;
 
-    [index: number]: string;
+    readonly [index: number]: string;
 }
 
 interface StringConstructor {
     new (value?: any): String;
     (value?: any): string;
-    prototype: String;
+    readonly prototype: String;
     fromCharCode(...codes: number[]): string;
 }
 
 /** 
   * Allows manipulation and formatting of text strings and determination and location of substrings within strings. 
   */
-declare var String: StringConstructor;
+declare const String: StringConstructor;
 
 interface Boolean {
     /** Returns the primitive value of the specified object. */
@@ -450,10 +453,10 @@ interface Boolean {
 interface BooleanConstructor {
     new (value?: any): Boolean;
     (value?: any): boolean;
-    prototype: Boolean;
+    readonly prototype: Boolean;
 }
 
-declare var Boolean: BooleanConstructor;
+declare const Boolean: BooleanConstructor;
 
 interface Number {
     /**
@@ -487,57 +490,57 @@ interface Number {
 interface NumberConstructor {
     new (value?: any): Number;
     (value?: any): number;
-    prototype: Number;
+    readonly prototype: Number;
 
     /** The largest number that can be represented in JavaScript. Equal to approximately 1.79E+308. */
-    MAX_VALUE: number;
+    readonly MAX_VALUE: number;
 
     /** The closest number to zero that can be represented in JavaScript. Equal to approximately 5.00E-324. */
-    MIN_VALUE: number;
+    readonly MIN_VALUE: number;
 
     /** 
       * A value that is not a number.
       * In equality comparisons, NaN does not equal any value, including itself. To test whether a value is equivalent to NaN, use the isNaN function.
       */
-    NaN: number;
+    readonly NaN: number;
 
     /** 
       * A value that is less than the largest negative number that can be represented in JavaScript.
       * JavaScript displays NEGATIVE_INFINITY values as -infinity. 
       */
-    NEGATIVE_INFINITY: number;
+    readonly NEGATIVE_INFINITY: number;
 
     /**
       * A value greater than the largest number that can be represented in JavaScript. 
       * JavaScript displays POSITIVE_INFINITY values as infinity. 
       */
-    POSITIVE_INFINITY: number;
+    readonly POSITIVE_INFINITY: number;
 }
 
 /** An object that represents a number of any kind. All JavaScript numbers are 64-bit floating-point numbers. */
-declare var Number: NumberConstructor;
+declare const Number: NumberConstructor;
 
 interface TemplateStringsArray extends Array<string> {
-    raw: string[];
+    readonly raw: string[];
 }
 
 interface Math {
     /** The mathematical constant e. This is Euler's number, the base of natural logarithms. */
-    E: number;
+    readonly E: number;
     /** The natural logarithm of 10. */
-    LN10: number;
+    readonly LN10: number;
     /** The natural logarithm of 2. */
-    LN2: number;
+    readonly LN2: number;
     /** The base-2 logarithm of e. */
-    LOG2E: number;
+    readonly LOG2E: number;
     /** The base-10 logarithm of e. */
-    LOG10E: number;
+    readonly LOG10E: number;
     /** Pi. This is the ratio of the circumference of a circle to its diameter. */
-    PI: number;
+    readonly PI: number;
     /** The square root of 0.5, or, equivalently, one divided by the square root of 2. */
-    SQRT1_2: number;
+    readonly SQRT1_2: number;
     /** The square root of 2. */
-    SQRT2: number;
+    readonly SQRT2: number;
     /**
       * Returns the absolute value of a number (the value without regard to whether it is positive or negative). 
       * For example, the absolute value of -5 is the same as the absolute value of 5.
@@ -630,7 +633,7 @@ interface Math {
     tan(x: number): number;
 }
 /** An intrinsic object that provides basic mathematics functionality and constants. */
-declare var Math: Math;
+declare const Math: Math;
 
 /** Enables basic storage and retrieval of dates and times. */
 interface Date {
@@ -792,7 +795,7 @@ interface DateConstructor {
     new (value: string): Date;
     new (year: number, month: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): Date;
     (): string;
-    prototype: Date;
+    readonly prototype: Date;
     /**
       * Parses a string containing a date, and returns the number of milliseconds between that date and midnight, January 1, 1970.
       * @param s A date string
@@ -812,7 +815,7 @@ interface DateConstructor {
     now(): number;
 }
 
-declare var Date: DateConstructor;
+declare const Date: DateConstructor;
 
 interface RegExpMatchArray extends Array<string> {
     index?: number;
@@ -829,7 +832,7 @@ interface RegExp {
       * Executes a search on a string using a regular expression pattern, and returns an array containing the results of that search.
       * @param string The String object or string literal on which to perform the search.
       */
-    exec(string: string): RegExpExecArray;
+    exec(string: string): RegExpExecArray | null;
 
     /** 
       * Returns a Boolean value that indicates whether or not a pattern exists in a searched string.
@@ -838,27 +841,27 @@ interface RegExp {
     test(string: string): boolean;
 
     /** Returns a copy of the text of the regular expression pattern. Read-only. The regExp argument is a Regular expression object. It can be a variable name or a literal. */
-    source: string;
+    readonly source: string;
 
     /** Returns a Boolean value indicating the state of the global flag (g) used with a regular expression. Default is false. Read-only. */
-    global: boolean;
+    readonly global: boolean;
 
     /** Returns a Boolean value indicating the state of the ignoreCase flag (i) used with a regular expression. Default is false. Read-only. */
-    ignoreCase: boolean;
+    readonly ignoreCase: boolean;
 
     /** Returns a Boolean value indicating the state of the multiline flag (m) used with a regular expression. Default is false. Read-only. */
-    multiline: boolean;
+    readonly multiline: boolean;
 
     lastIndex: number;
 
     // Non-standard extensions
-    compile(): RegExp;
+    compile(): this;
 }
 
 interface RegExpConstructor {
     new (pattern: string, flags?: string): RegExp;
     (pattern: string, flags?: string): RegExp;
-    prototype: RegExp;
+    readonly prototype: RegExp;
 
     // Non-standard extensions
     $1: string;
@@ -873,7 +876,7 @@ interface RegExpConstructor {
     lastMatch: string;
 }
 
-declare var RegExp: RegExpConstructor;
+declare const RegExp: RegExpConstructor;
 
 interface Error {
     name: string;
@@ -883,10 +886,10 @@ interface Error {
 interface ErrorConstructor {
     new (message?: string): Error;
     (message?: string): Error;
-    prototype: Error;
+    readonly prototype: Error;
 }
 
-declare var Error: ErrorConstructor;
+declare const Error: ErrorConstructor;
 
 interface EvalError extends Error {
 }
@@ -894,10 +897,10 @@ interface EvalError extends Error {
 interface EvalErrorConstructor {
     new (message?: string): EvalError;
     (message?: string): EvalError;
-    prototype: EvalError;
+    readonly prototype: EvalError;
 }
 
-declare var EvalError: EvalErrorConstructor;
+declare const EvalError: EvalErrorConstructor;
 
 interface RangeError extends Error {
 }
@@ -905,10 +908,10 @@ interface RangeError extends Error {
 interface RangeErrorConstructor {
     new (message?: string): RangeError;
     (message?: string): RangeError;
-    prototype: RangeError;
+    readonly prototype: RangeError;
 }
 
-declare var RangeError: RangeErrorConstructor;
+declare const RangeError: RangeErrorConstructor;
 
 interface ReferenceError extends Error {
 }
@@ -916,10 +919,10 @@ interface ReferenceError extends Error {
 interface ReferenceErrorConstructor {
     new (message?: string): ReferenceError;
     (message?: string): ReferenceError;
-    prototype: ReferenceError;
+    readonly prototype: ReferenceError;
 }
 
-declare var ReferenceError: ReferenceErrorConstructor;
+declare const ReferenceError: ReferenceErrorConstructor;
 
 interface SyntaxError extends Error {
 }
@@ -927,10 +930,10 @@ interface SyntaxError extends Error {
 interface SyntaxErrorConstructor {
     new (message?: string): SyntaxError;
     (message?: string): SyntaxError;
-    prototype: SyntaxError;
+    readonly prototype: SyntaxError;
 }
 
-declare var SyntaxError: SyntaxErrorConstructor;
+declare const SyntaxError: SyntaxErrorConstructor;
 
 interface TypeError extends Error {
 }
@@ -938,10 +941,10 @@ interface TypeError extends Error {
 interface TypeErrorConstructor {
     new (message?: string): TypeError;
     (message?: string): TypeError;
-    prototype: TypeError;
+    readonly prototype: TypeError;
 }
 
-declare var TypeError: TypeErrorConstructor;
+declare const TypeError: TypeErrorConstructor;
 
 interface URIError extends Error {
 }
@@ -949,10 +952,10 @@ interface URIError extends Error {
 interface URIErrorConstructor {
     new (message?: string): URIError;
     (message?: string): URIError;
-    prototype: URIError;
+    readonly prototype: URIError;
 }
 
-declare var URIError: URIErrorConstructor;
+declare const URIError: URIErrorConstructor;
 
 interface JSON {
     /**
@@ -997,13 +1000,115 @@ interface JSON {
 /**
   * An intrinsic object that provides functions to convert JavaScript values to and from the JavaScript Object Notation (JSON) format.
   */
-declare var JSON: JSON;
+declare const JSON: JSON;
 
 
 /////////////////////////////
 /// ECMAScript Array API (specially handled by compiler)
 /////////////////////////////
 
+interface ReadonlyArray<T> {
+    /**
+      * Gets the length of the array. This is a number one higher than the highest element defined in an array.
+      */
+    readonly length: number;
+    /**
+      * Returns a string representation of an array.
+      */
+    toString(): string;
+    toLocaleString(): string;
+    /**
+      * Combines two or more arrays.
+      * @param items Additional items to add to the end of array1.
+      */
+    concat<U extends ReadonlyArray<T>>(...items: U[]): T[];
+    /**
+      * Combines two or more arrays.
+      * @param items Additional items to add to the end of array1.
+      */
+    concat(...items: T[]): T[];
+    /**
+      * Adds all the elements of an array separated by the specified separator string.
+      * @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma.
+      */
+    join(separator?: string): string;
+    /**
+      * Returns a section of an array.
+      * @param start The beginning of the specified portion of the array.
+      * @param end The end of the specified portion of the array.
+      */
+    slice(start?: number, end?: number): T[];
+    /**
+      * Returns the index of the first occurrence of a value in an array.
+      * @param searchElement The value to locate in the array.
+      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at index 0.
+      */
+    indexOf(searchElement: T, fromIndex?: number): number;
+
+    /**
+      * Returns the index of the last occurrence of a specified value in an array.
+      * @param searchElement The value to locate in the array.
+      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at the last index in the array.
+      */
+    lastIndexOf(searchElement: T, fromIndex?: number): number;
+    /**
+      * Determines whether all the members of an array satisfy the specified test.
+      * @param callbackfn A function that accepts up to three arguments. The every method calls the callbackfn function for each element in array1 until the callbackfn returns false, or until the end of 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.
+      */
+    every(callbackfn: (value: T, index: number, array: ReadonlyArray<T>) => boolean, thisArg?: any): boolean;
+    /**
+      * Determines whether the specified callback function returns true for any element of an array.
+      * @param callbackfn A function that accepts up to three arguments. The some method calls the callbackfn function for each element in array1 until the callbackfn returns true, or until the end of 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.
+      */
+    some(callbackfn: (value: T, index: number, array: ReadonlyArray<T>) => boolean, thisArg?: any): boolean;
+    /**
+      * Performs the specified action for each element in an array.
+      * @param callbackfn  A function that accepts up to three arguments. forEach 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.
+      */
+    forEach(callbackfn: (value: T, index: number, array: ReadonlyArray<T>) => void, thisArg?: any): void;
+    /**
+      * Calls a defined callback function on each element of an array, and returns an array that contains the results.
+      * @param callbackfn A function that accepts up to three arguments. The map 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.
+      */
+    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(callbackfn: (value: T, index: number, array: ReadonlyArray<T>) => boolean, thisArg?: any): T[];
+    /**
+      * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
+      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array.
+      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
+      */
+    reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: ReadonlyArray<T>) => T, initialValue?: T): T;
+    /**
+      * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
+      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array.
+      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
+      */
+    reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: ReadonlyArray<T>) => U, initialValue: U): U;
+    /**
+      * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
+      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array. 
+      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
+      */
+    reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: ReadonlyArray<T>) => T, initialValue?: T): T;
+    /**
+      * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
+      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array. 
+      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
+      */
+    reduceRight<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: ReadonlyArray<T>) => U, initialValue: U): U;
+
+    readonly [n: number]: T;
+}
+
 interface Array<T> {
     /**
       * Gets or sets the length of the array. This is a number one higher than the highest element defined in an array.
@@ -1022,17 +1127,12 @@ interface Array<T> {
     /**
       * Removes the last element from an array and returns it.
       */
-    pop(): T;
+    pop(): T | undefined;
     /**
       * Combines two or more arrays.
       * @param items Additional items to add to the end of array1.
       */
-    concat<U extends T[]>(...items: U[]): T[];
-    /**
-      * Combines two or more arrays.
-      * @param items Additional items to add to the end of array1.
-      */
-    concat(...items: T[]): T[];
+    concat(...items: (T | T[])[]): T[];
     /**
       * Adds all the elements of an array separated by the specified separator string.
       * @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma.
@@ -1045,26 +1145,23 @@ interface Array<T> {
     /**
       * Removes the first element from an array and returns it.
       */
-    shift(): T;
+    shift(): T | undefined;
     /** 
       * Returns a section of an array.
       * @param start The beginning of the specified portion of the array.
       * @param end The end of the specified portion of the array.
       */
     slice(start?: number, end?: number): T[];
-
     /**
       * Sorts an array.
       * @param compareFn The name of the function used to determine the order of the elements. If omitted, the elements are sorted in ascending, ASCII character order.
       */
     sort(compareFn?: (a: T, b: T) => number): T[];
-
     /**
       * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements.
       * @param start The zero-based location in the array from which to start removing elements.
       */
     splice(start: number): T[];
-
     /**
       * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements.
       * @param start The zero-based location in the array from which to start removing elements.
@@ -1072,62 +1169,53 @@ interface Array<T> {
       * @param items Elements to insert into the array in place of the deleted elements.
       */
     splice(start: number, deleteCount: number, ...items: T[]): T[];
-
     /**
       * Inserts new elements at the start of an array.
       * @param items  Elements to insert at the start of the Array.
       */
     unshift(...items: T[]): number;
-
     /**
       * Returns the index of the first occurrence of a value in an array.
       * @param searchElement The value to locate in the array.
       * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at index 0.
       */
     indexOf(searchElement: T, fromIndex?: number): number;
-
     /**
       * Returns the index of the last occurrence of a specified value in an array.
       * @param searchElement The value to locate in the array.
       * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at the last index in the array.
       */
     lastIndexOf(searchElement: T, fromIndex?: number): number;
-
     /**
       * Determines whether all the members of an array satisfy the specified test.
       * @param callbackfn A function that accepts up to three arguments. The every method calls the callbackfn function for each element in array1 until the callbackfn returns false, or until the end of 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.
       */
     every(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
-
     /**
       * Determines whether the specified callback function returns true for any element of an array.
       * @param callbackfn A function that accepts up to three arguments. The some method calls the callbackfn function for each element in array1 until the callbackfn returns true, or until the end of 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.
       */
     some(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
-
     /**
       * Performs the specified action for each element in an array.
       * @param callbackfn  A function that accepts up to three arguments. forEach 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.
       */
     forEach(callbackfn: (value: T, index: number, array: T[]) => void, thisArg?: any): void;
-
     /**
       * Calls a defined callback function on each element of an array, and returns an array that contains the results.
       * @param callbackfn A function that accepts up to three arguments. The map 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.
       */
     map<U>(callbackfn: (value: T, index: number, array: 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(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): T[];
-
     /**
       * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
       * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array.
@@ -1140,7 +1228,6 @@ interface Array<T> {
       * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
       */
     reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
-
     /** 
       * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
       * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array. 
@@ -1165,10 +1252,10 @@ interface ArrayConstructor {
     <T>(arrayLength: number): T[];
     <T>(...items: T[]): T[];
     isArray(arg: any): arg is Array<any>;
-    prototype: Array<any>;
+    readonly prototype: Array<any>;
 }
 
-declare var Array: ArrayConstructor;
+declare const Array: ArrayConstructor;
 
 interface TypedPropertyDescriptor<T> {
     enumerable?: boolean;
@@ -1198,11 +1285,10 @@ interface PromiseLike<T> {
 }
 
 interface ArrayLike<T> {
-    length: number;
-    [n: number]: T;
+    readonly length: number;
+    readonly [n: number]: T;
 }
 
-
 /**
   * Represents a raw buffer of binary data, which is used to store data for the 
   * different typed arrays. ArrayBuffers cannot be read from or written to directly, 
@@ -1213,7 +1299,7 @@ interface ArrayBuffer {
     /**
       * Read-only. The length of the ArrayBuffer (in bytes).
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * Returns a section of an ArrayBuffer.
@@ -1222,11 +1308,11 @@ interface ArrayBuffer {
 }
 
 interface ArrayBufferConstructor {
-    prototype: ArrayBuffer;
+    readonly prototype: ArrayBuffer;
     new (byteLength: number): ArrayBuffer;
     isView(arg: any): arg is ArrayBufferView;
 }
-declare var ArrayBuffer: ArrayBufferConstructor;
+declare const ArrayBuffer: ArrayBufferConstructor;
 
 interface ArrayBufferView {
     /**
@@ -1246,9 +1332,9 @@ interface ArrayBufferView {
 }
 
 interface DataView {
-    buffer: ArrayBuffer;
-    byteLength: number;
-    byteOffset: number;
+    readonly buffer: ArrayBuffer;
+    readonly byteLength: number;
+    readonly byteOffset: number;
     /**
       * Gets the Float32 value at the specified byte offset from the start of the view. There is 
       * no alignment constraint; multi-byte values may be fetched from any offset. 
@@ -1376,7 +1462,7 @@ interface DataView {
 interface DataViewConstructor {
     new (buffer: ArrayBuffer, byteOffset?: number, byteLength?: number): DataView;
 }
-declare var DataView: DataViewConstructor;
+declare const DataView: DataViewConstructor;
 
 /**
   * A typed array of 8-bit integer values. The contents are initialized to 0. If the requested 
@@ -1386,22 +1472,22 @@ interface Int8Array {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -1452,7 +1538,7 @@ interface Int8Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -1463,7 +1549,7 @@ interface Int8Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -1500,7 +1586,7 @@ interface Int8Array {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -1624,7 +1710,7 @@ interface Int8Array {
     [index: number]: number;
 }
 interface Int8ArrayConstructor {
-    prototype: Int8Array;
+    readonly prototype: Int8Array;
     new (length: number): Int8Array;
     new (array: ArrayLike<number>): Int8Array;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Int8Array;
@@ -1632,7 +1718,7 @@ interface Int8ArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -1649,7 +1735,7 @@ interface Int8ArrayConstructor {
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int8Array;
 
 }
-declare var Int8Array: Int8ArrayConstructor;
+declare const Int8Array: Int8ArrayConstructor;
 
 /**
   * A typed array of 8-bit unsigned integer values. The contents are initialized to 0. If the 
@@ -1659,22 +1745,22 @@ interface Uint8Array {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -1725,7 +1811,7 @@ interface Uint8Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -1736,7 +1822,7 @@ interface Uint8Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -1773,7 +1859,7 @@ interface Uint8Array {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -1898,7 +1984,7 @@ interface Uint8Array {
 }
 
 interface Uint8ArrayConstructor {
-    prototype: Uint8Array;
+    readonly prototype: Uint8Array;
     new (length: number): Uint8Array;
     new (array: ArrayLike<number>): Uint8Array;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint8Array;
@@ -1906,7 +1992,7 @@ interface Uint8ArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -1923,7 +2009,7 @@ interface Uint8ArrayConstructor {
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8Array;
 
 }
-declare var Uint8Array: Uint8ArrayConstructor;
+declare const Uint8Array: Uint8ArrayConstructor;
 
 /**
   * A typed array of 8-bit unsigned integer (clamped) values. The contents are initialized to 0. 
@@ -1933,22 +2019,22 @@ interface Uint8ClampedArray {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -1999,7 +2085,7 @@ interface Uint8ClampedArray {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -2010,7 +2096,7 @@ interface Uint8ClampedArray {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -2047,7 +2133,7 @@ interface Uint8ClampedArray {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -2172,7 +2258,7 @@ interface Uint8ClampedArray {
 }
 
 interface Uint8ClampedArrayConstructor {
-    prototype: Uint8ClampedArray;
+    readonly prototype: Uint8ClampedArray;
     new (length: number): Uint8ClampedArray;
     new (array: ArrayLike<number>): Uint8ClampedArray;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint8ClampedArray;
@@ -2180,7 +2266,7 @@ interface Uint8ClampedArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -2196,7 +2282,7 @@ interface Uint8ClampedArrayConstructor {
       */
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8ClampedArray;
 }
-declare var Uint8ClampedArray: Uint8ClampedArrayConstructor;
+declare const Uint8ClampedArray: Uint8ClampedArrayConstructor;
 
 /**
   * A typed array of 16-bit signed integer values. The contents are initialized to 0. If the 
@@ -2206,22 +2292,22 @@ interface Int16Array {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -2272,7 +2358,7 @@ interface Int16Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -2283,7 +2369,7 @@ interface Int16Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -2320,7 +2406,7 @@ interface Int16Array {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -2445,7 +2531,7 @@ interface Int16Array {
 }
 
 interface Int16ArrayConstructor {
-    prototype: Int16Array;
+    readonly prototype: Int16Array;
     new (length: number): Int16Array;
     new (array: ArrayLike<number>): Int16Array;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Int16Array;
@@ -2453,7 +2539,7 @@ interface Int16ArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -2470,7 +2556,7 @@ interface Int16ArrayConstructor {
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int16Array;
 
 }
-declare var Int16Array: Int16ArrayConstructor;
+declare const Int16Array: Int16ArrayConstructor;
 
 /**
   * A typed array of 16-bit unsigned integer values. The contents are initialized to 0. If the 
@@ -2480,22 +2566,22 @@ interface Uint16Array {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -2546,7 +2632,7 @@ interface Uint16Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -2557,7 +2643,7 @@ interface Uint16Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -2594,7 +2680,7 @@ interface Uint16Array {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -2719,7 +2805,7 @@ interface Uint16Array {
 }
 
 interface Uint16ArrayConstructor {
-    prototype: Uint16Array;
+    readonly prototype: Uint16Array;
     new (length: number): Uint16Array;
     new (array: ArrayLike<number>): Uint16Array;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint16Array;
@@ -2727,7 +2813,7 @@ interface Uint16ArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -2744,7 +2830,7 @@ interface Uint16ArrayConstructor {
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint16Array;
 
 }
-declare var Uint16Array: Uint16ArrayConstructor;
+declare const Uint16Array: Uint16ArrayConstructor;
 /**
   * A typed array of 32-bit signed integer values. The contents are initialized to 0. If the 
   * requested number of bytes could not be allocated an exception is raised.
@@ -2753,22 +2839,22 @@ interface Int32Array {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -2819,7 +2905,7 @@ interface Int32Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -2830,7 +2916,7 @@ interface Int32Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -2867,7 +2953,7 @@ interface Int32Array {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -2992,7 +3078,7 @@ interface Int32Array {
 }
 
 interface Int32ArrayConstructor {
-    prototype: Int32Array;
+    readonly prototype: Int32Array;
     new (length: number): Int32Array;
     new (array: ArrayLike<number>): Int32Array;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Int32Array;
@@ -3000,7 +3086,7 @@ interface Int32ArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -3016,7 +3102,7 @@ interface Int32ArrayConstructor {
       */
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int32Array;
 }
-declare var Int32Array: Int32ArrayConstructor;
+declare const Int32Array: Int32ArrayConstructor;
 
 /**
   * A typed array of 32-bit unsigned integer values. The contents are initialized to 0. If the 
@@ -3026,22 +3112,22 @@ interface Uint32Array {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -3092,7 +3178,7 @@ interface Uint32Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -3103,7 +3189,7 @@ interface Uint32Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -3140,7 +3226,7 @@ interface Uint32Array {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -3265,7 +3351,7 @@ interface Uint32Array {
 }
 
 interface Uint32ArrayConstructor {
-    prototype: Uint32Array;
+    readonly prototype: Uint32Array;
     new (length: number): Uint32Array;
     new (array: ArrayLike<number>): Uint32Array;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint32Array;
@@ -3273,7 +3359,7 @@ interface Uint32ArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -3289,7 +3375,7 @@ interface Uint32ArrayConstructor {
       */
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint32Array;
 }
-declare var Uint32Array: Uint32ArrayConstructor;
+declare const Uint32Array: Uint32ArrayConstructor;
 
 /**
   * A typed array of 32-bit float values. The contents are initialized to 0. If the requested number
@@ -3299,22 +3385,22 @@ interface Float32Array {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -3365,7 +3451,7 @@ interface Float32Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -3376,7 +3462,7 @@ interface Float32Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -3413,7 +3499,7 @@ interface Float32Array {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -3538,7 +3624,7 @@ interface Float32Array {
 }
 
 interface Float32ArrayConstructor {
-    prototype: Float32Array;
+    readonly prototype: Float32Array;
     new (length: number): Float32Array;
     new (array: ArrayLike<number>): Float32Array;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Float32Array;
@@ -3546,7 +3632,7 @@ interface Float32ArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -3563,7 +3649,7 @@ interface Float32ArrayConstructor {
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float32Array;
 
 }
-declare var Float32Array: Float32ArrayConstructor;
+declare const Float32Array: Float32ArrayConstructor;
 
 /**
   * A typed array of 64-bit float values. The contents are initialized to 0. If the requested 
@@ -3573,22 +3659,22 @@ interface Float64Array {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -3639,7 +3725,7 @@ interface Float64Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -3650,7 +3736,7 @@ interface Float64Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -3687,7 +3773,7 @@ interface Float64Array {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -3812,7 +3898,7 @@ interface Float64Array {
 }
 
 interface Float64ArrayConstructor {
-    prototype: Float64Array;
+    readonly prototype: Float64Array;
     new (length: number): Float64Array;
     new (array: ArrayLike<number>): Float64Array;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Float64Array;
@@ -3820,7 +3906,7 @@ interface Float64ArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -3836,7 +3922,8 @@ interface Float64ArrayConstructor {
       */
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float64Array;
 }
-declare var Float64Array: Float64ArrayConstructor;
+declare const Float64Array: Float64ArrayConstructor;
+
 /////////////////////////////
 /// ECMAScript Internationalization API 
 /////////////////////////////
@@ -4037,8 +4124,6 @@ interface Date {
       */
     toLocaleTimeString(locale?: string, options?: Intl.DateTimeFormatOptions): string;
 }
-
-
 /////////////////////////////
 /// IE DOM APIs
 /////////////////////////////
@@ -4052,11 +4137,6 @@ interface AriaRequestEventInit extends EventInit {
     attributeValue?: string;
 }
 
-interface ClipboardEventInit extends EventInit {
-    data?: string;
-    dataType?: string;
-}
-
 interface CommandEventInit extends EventInit {
     commandName?: string;
     detail?: string;
@@ -4070,6 +4150,31 @@ interface ConfirmSiteSpecificExceptionsInformation extends ExceptionInformation
     arrayOfDomainStrings?: string[];
 }
 
+interface ConstrainBooleanParameters {
+    exact?: boolean;
+    ideal?: boolean;
+}
+
+interface ConstrainDOMStringParameters {
+    exact?: string | string[];
+    ideal?: string | string[];
+}
+
+interface ConstrainDoubleRange extends DoubleRange {
+    exact?: number;
+    ideal?: number;
+}
+
+interface ConstrainLongRange extends LongRange {
+    exact?: number;
+    ideal?: number;
+}
+
+interface ConstrainVideoFacingModeParameters {
+    exact?: string | string[];
+    ideal?: string | string[];
+}
+
 interface CustomEventInit extends EventInit {
     detail?: any;
 }
@@ -4080,17 +4185,44 @@ interface DeviceAccelerationDict {
     z?: number;
 }
 
+interface DeviceLightEventInit extends EventInit {
+    value?: number;
+}
+
 interface DeviceRotationRateDict {
     alpha?: number;
     beta?: number;
     gamma?: number;
 }
 
+interface DoubleRange {
+    max?: number;
+    min?: number;
+}
+
 interface EventInit {
     bubbles?: boolean;
     cancelable?: boolean;
 }
 
+interface EventModifierInit extends UIEventInit {
+    ctrlKey?: boolean;
+    shiftKey?: boolean;
+    altKey?: boolean;
+    metaKey?: boolean;
+    modifierAltGraph?: boolean;
+    modifierCapsLock?: boolean;
+    modifierFn?: boolean;
+    modifierFnLock?: boolean;
+    modifierHyper?: boolean;
+    modifierNumLock?: boolean;
+    modifierOS?: boolean;
+    modifierScrollLock?: boolean;
+    modifierSuper?: boolean;
+    modifierSymbol?: boolean;
+    modifierSymbolLock?: boolean;
+}
+
 interface ExceptionInformation {
     domain?: string;
 }
@@ -4104,17 +4236,415 @@ interface HashChangeEventInit extends EventInit {
     oldURL?: string;
 }
 
+interface IDBIndexParameters {
+    multiEntry?: boolean;
+    unique?: boolean;
+}
+
+interface IDBObjectStoreParameters {
+    autoIncrement?: boolean;
+    keyPath?: IDBKeyPath;
+}
+
 interface KeyAlgorithm {
     name?: string;
 }
 
-interface KeyboardEventInit extends SharedKeyboardAndMouseEventInit {
+interface KeyboardEventInit extends EventModifierInit {
     key?: string;
     location?: number;
     repeat?: boolean;
 }
 
-interface MouseEventInit extends SharedKeyboardAndMouseEventInit {
+interface LongRange {
+    max?: number;
+    min?: number;
+}
+
+interface MSAccountInfo {
+    rpDisplayName?: string;
+    userDisplayName?: string;
+    accountName?: string;
+    userId?: string;
+    accountImageUri?: string;
+}
+
+interface MSAudioLocalClientEvent extends MSLocalClientEventBase {
+    networkSendQualityEventRatio?: number;
+    networkDelayEventRatio?: number;
+    cpuInsufficientEventRatio?: number;
+    deviceHalfDuplexAECEventRatio?: number;
+    deviceRenderNotFunctioningEventRatio?: number;
+    deviceCaptureNotFunctioningEventRatio?: number;
+    deviceGlitchesEventRatio?: number;
+    deviceLowSNREventRatio?: number;
+    deviceLowSpeechLevelEventRatio?: number;
+    deviceClippingEventRatio?: number;
+    deviceEchoEventRatio?: number;
+    deviceNearEndToEchoRatioEventRatio?: number;
+    deviceRenderZeroVolumeEventRatio?: number;
+    deviceRenderMuteEventRatio?: number;
+    deviceMultipleEndpointsEventCount?: number;
+    deviceHowlingEventCount?: number;
+}
+
+interface MSAudioRecvPayload extends MSPayloadBase {
+    samplingRate?: number;
+    signal?: MSAudioRecvSignal;
+    packetReorderRatio?: number;
+    packetReorderDepthAvg?: number;
+    packetReorderDepthMax?: number;
+    burstLossLength1?: number;
+    burstLossLength2?: number;
+    burstLossLength3?: number;
+    burstLossLength4?: number;
+    burstLossLength5?: number;
+    burstLossLength6?: number;
+    burstLossLength7?: number;
+    burstLossLength8OrHigher?: number;
+    fecRecvDistance1?: number;
+    fecRecvDistance2?: number;
+    fecRecvDistance3?: number;
+    ratioConcealedSamplesAvg?: number;
+    ratioStretchedSamplesAvg?: number;
+    ratioCompressedSamplesAvg?: number;
+}
+
+interface MSAudioRecvSignal {
+    initialSignalLevelRMS?: number;
+    recvSignalLevelCh1?: number;
+    recvNoiseLevelCh1?: number;
+    renderSignalLevel?: number;
+    renderNoiseLevel?: number;
+    renderLoopbackSignalLevel?: number;
+}
+
+interface MSAudioSendPayload extends MSPayloadBase {
+    samplingRate?: number;
+    signal?: MSAudioSendSignal;
+    audioFECUsed?: boolean;
+    sendMutePercent?: number;
+}
+
+interface MSAudioSendSignal {
+    noiseLevel?: number;
+    sendSignalLevelCh1?: number;
+    sendNoiseLevelCh1?: number;
+}
+
+interface MSConnectivity {
+    iceType?: string;
+    iceWarningFlags?: MSIceWarningFlags;
+    relayAddress?: MSRelayAddress;
+}
+
+interface MSCredentialFilter {
+    accept?: MSCredentialSpec[];
+}
+
+interface MSCredentialParameters {
+    type?: string;
+}
+
+interface MSCredentialSpec {
+    type?: string;
+    id?: string;
+}
+
+interface MSDelay {
+    roundTrip?: number;
+    roundTripMax?: number;
+}
+
+interface MSDescription extends RTCStats {
+    connectivity?: MSConnectivity;
+    transport?: string;
+    networkconnectivity?: MSNetworkConnectivityInfo;
+    localAddr?: MSIPAddressInfo;
+    remoteAddr?: MSIPAddressInfo;
+    deviceDevName?: string;
+    reflexiveLocalIPAddr?: MSIPAddressInfo;
+}
+
+interface MSFIDOCredentialParameters extends MSCredentialParameters {
+    algorithm?: string | Algorithm;
+    authenticators?: AAGUID[];
+}
+
+interface MSIPAddressInfo {
+    ipAddr?: string;
+    port?: number;
+    manufacturerMacAddrMask?: string;
+}
+
+interface MSIceWarningFlags {
+    turnTcpTimedOut?: boolean;
+    turnUdpAllocateFailed?: boolean;
+    turnUdpSendFailed?: boolean;
+    turnTcpAllocateFailed?: boolean;
+    turnTcpSendFailed?: boolean;
+    udpLocalConnectivityFailed?: boolean;
+    udpNatConnectivityFailed?: boolean;
+    udpRelayConnectivityFailed?: boolean;
+    tcpNatConnectivityFailed?: boolean;
+    tcpRelayConnectivityFailed?: boolean;
+    connCheckMessageIntegrityFailed?: boolean;
+    allocationMessageIntegrityFailed?: boolean;
+    connCheckOtherError?: boolean;
+    turnAuthUnknownUsernameError?: boolean;
+    noRelayServersConfigured?: boolean;
+    multipleRelayServersAttempted?: boolean;
+    portRangeExhausted?: boolean;
+    alternateServerReceived?: boolean;
+    pseudoTLSFailure?: boolean;
+    turnTurnTcpConnectivityFailed?: boolean;
+    useCandidateChecksFailed?: boolean;
+    fipsAllocationFailure?: boolean;
+}
+
+interface MSJitter {
+    interArrival?: number;
+    interArrivalMax?: number;
+    interArrivalSD?: number;
+}
+
+interface MSLocalClientEventBase extends RTCStats {
+    networkReceiveQualityEventRatio?: number;
+    networkBandwidthLowEventRatio?: number;
+}
+
+interface MSNetwork extends RTCStats {
+    jitter?: MSJitter;
+    delay?: MSDelay;
+    packetLoss?: MSPacketLoss;
+    utilization?: MSUtilization;
+}
+
+interface MSNetworkConnectivityInfo {
+    vpn?: boolean;
+    linkspeed?: number;
+    networkConnectionDetails?: string;
+}
+
+interface MSNetworkInterfaceType {
+    interfaceTypeEthernet?: boolean;
+    interfaceTypeWireless?: boolean;
+    interfaceTypePPP?: boolean;
+    interfaceTypeTunnel?: boolean;
+    interfaceTypeWWAN?: boolean;
+}
+
+interface MSOutboundNetwork extends MSNetwork {
+    appliedBandwidthLimit?: number;
+}
+
+interface MSPacketLoss {
+    lossRate?: number;
+    lossRateMax?: number;
+}
+
+interface MSPayloadBase extends RTCStats {
+    payloadDescription?: string;
+}
+
+interface MSRelayAddress {
+    relayAddress?: string;
+    port?: number;
+}
+
+interface MSSignatureParameters {
+    userPrompt?: string;
+}
+
+interface MSTransportDiagnosticsStats extends RTCStats {
+    baseAddress?: string;
+    localAddress?: string;
+    localSite?: string;
+    networkName?: string;
+    remoteAddress?: string;
+    remoteSite?: string;
+    localMR?: string;
+    remoteMR?: string;
+    iceWarningFlags?: MSIceWarningFlags;
+    portRangeMin?: number;
+    portRangeMax?: number;
+    localMRTCPPort?: number;
+    remoteMRTCPPort?: number;
+    stunVer?: number;
+    numConsentReqSent?: number;
+    numConsentReqReceived?: number;
+    numConsentRespSent?: number;
+    numConsentRespReceived?: number;
+    interfaces?: MSNetworkInterfaceType;
+    baseInterface?: MSNetworkInterfaceType;
+    protocol?: string;
+    localInterface?: MSNetworkInterfaceType;
+    localAddrType?: string;
+    remoteAddrType?: string;
+    iceRole?: string;
+    rtpRtcpMux?: boolean;
+    allocationTimeInMs?: number;
+    msRtcEngineVersion?: string;
+}
+
+interface MSUtilization {
+    packets?: number;
+    bandwidthEstimation?: number;
+    bandwidthEstimationMin?: number;
+    bandwidthEstimationMax?: number;
+    bandwidthEstimationStdDev?: number;
+    bandwidthEstimationAvg?: number;
+}
+
+interface MSVideoPayload extends MSPayloadBase {
+    resoluton?: string;
+    videoBitRateAvg?: number;
+    videoBitRateMax?: number;
+    videoFrameRateAvg?: number;
+    videoPacketLossRate?: number;
+    durationSeconds?: number;
+}
+
+interface MSVideoRecvPayload extends MSVideoPayload {
+    videoFrameLossRate?: number;
+    recvCodecType?: string;
+    recvResolutionWidth?: number;
+    recvResolutionHeight?: number;
+    videoResolutions?: MSVideoResolutionDistribution;
+    recvFrameRateAverage?: number;
+    recvBitRateMaximum?: number;
+    recvBitRateAverage?: number;
+    recvVideoStreamsMax?: number;
+    recvVideoStreamsMin?: number;
+    recvVideoStreamsMode?: number;
+    videoPostFECPLR?: number;
+    lowBitRateCallPercent?: number;
+    lowFrameRateCallPercent?: number;
+    reorderBufferTotalPackets?: number;
+    recvReorderBufferReorderedPackets?: number;
+    recvReorderBufferPacketsDroppedDueToBufferExhaustion?: number;
+    recvReorderBufferMaxSuccessfullyOrderedExtent?: number;
+    recvReorderBufferMaxSuccessfullyOrderedLateTime?: number;
+    recvReorderBufferPacketsDroppedDueToTimeout?: number;
+    recvFpsHarmonicAverage?: number;
+    recvNumResSwitches?: number;
+}
+
+interface MSVideoResolutionDistribution {
+    cifQuality?: number;
+    vgaQuality?: number;
+    h720Quality?: number;
+    h1080Quality?: number;
+    h1440Quality?: number;
+    h2160Quality?: number;
+}
+
+interface MSVideoSendPayload extends MSVideoPayload {
+    sendFrameRateAverage?: number;
+    sendBitRateMaximum?: number;
+    sendBitRateAverage?: number;
+    sendVideoStreamsMax?: number;
+    sendResolutionWidth?: number;
+    sendResolutionHeight?: number;
+}
+
+interface MediaEncryptedEventInit extends EventInit {
+    initDataType?: string;
+    initData?: ArrayBuffer;
+}
+
+interface MediaKeyMessageEventInit extends EventInit {
+    messageType?: string;
+    message?: ArrayBuffer;
+}
+
+interface MediaKeySystemConfiguration {
+    initDataTypes?: string[];
+    audioCapabilities?: MediaKeySystemMediaCapability[];
+    videoCapabilities?: MediaKeySystemMediaCapability[];
+    distinctiveIdentifier?: string;
+    persistentState?: string;
+}
+
+interface MediaKeySystemMediaCapability {
+    contentType?: string;
+    robustness?: string;
+}
+
+interface MediaStreamConstraints {
+    video?: boolean | MediaTrackConstraints;
+    audio?: boolean | MediaTrackConstraints;
+}
+
+interface MediaStreamErrorEventInit extends EventInit {
+    error?: MediaStreamError;
+}
+
+interface MediaStreamTrackEventInit extends EventInit {
+    track?: MediaStreamTrack;
+}
+
+interface MediaTrackCapabilities {
+    width?: number | LongRange;
+    height?: number | LongRange;
+    aspectRatio?: number | DoubleRange;
+    frameRate?: number | DoubleRange;
+    facingMode?: string;
+    volume?: number | DoubleRange;
+    sampleRate?: number | LongRange;
+    sampleSize?: number | LongRange;
+    echoCancellation?: boolean[];
+    deviceId?: string;
+    groupId?: string;
+}
+
+interface MediaTrackConstraintSet {
+    width?: number | ConstrainLongRange;
+    height?: number | ConstrainLongRange;
+    aspectRatio?: number | ConstrainDoubleRange;
+    frameRate?: number | ConstrainDoubleRange;
+    facingMode?: string | string[] | ConstrainDOMStringParameters;
+    volume?: number | ConstrainDoubleRange;
+    sampleRate?: number | ConstrainLongRange;
+    sampleSize?: number | ConstrainLongRange;
+    echoCancelation?: boolean | ConstrainBooleanParameters;
+    deviceId?: string | string[] | ConstrainDOMStringParameters;
+    groupId?: string | string[] | ConstrainDOMStringParameters;
+}
+
+interface MediaTrackConstraints extends MediaTrackConstraintSet {
+    advanced?: MediaTrackConstraintSet[];
+}
+
+interface MediaTrackSettings {
+    width?: number;
+    height?: number;
+    aspectRatio?: number;
+    frameRate?: number;
+    facingMode?: string;
+    volume?: number;
+    sampleRate?: number;
+    sampleSize?: number;
+    echoCancellation?: boolean;
+    deviceId?: string;
+    groupId?: string;
+}
+
+interface MediaTrackSupportedConstraints {
+    width?: boolean;
+    height?: boolean;
+    aspectRatio?: boolean;
+    frameRate?: boolean;
+    facingMode?: boolean;
+    volume?: boolean;
+    sampleRate?: boolean;
+    sampleSize?: boolean;
+    echoCancellation?: boolean;
+    deviceId?: boolean;
+    groupId?: boolean;
+}
+
+interface MouseEventInit extends EventModifierInit {
     screenX?: number;
     screenY?: number;
     clientX?: number;
@@ -4147,6 +4677,10 @@ interface ObjectURLOptions {
     oneTimeOnly?: boolean;
 }
 
+interface PeriodicWaveConstraints {
+    disableNormalization?: boolean;
+}
+
 interface PointerEventInit extends MouseEventInit {
     pointerId?: number;
     width?: number;
@@ -4164,22 +4698,266 @@ interface PositionOptions {
     maximumAge?: number;
 }
 
-interface SharedKeyboardAndMouseEventInit extends UIEventInit {
-    ctrlKey?: boolean;
-    shiftKey?: boolean;
-    altKey?: boolean;
-    metaKey?: boolean;
-    keyModifierStateAltGraph?: boolean;
-    keyModifierStateCapsLock?: boolean;
-    keyModifierStateFn?: boolean;
-    keyModifierStateFnLock?: boolean;
-    keyModifierStateHyper?: boolean;
-    keyModifierStateNumLock?: boolean;
-    keyModifierStateOS?: boolean;
-    keyModifierStateScrollLock?: boolean;
-    keyModifierStateSuper?: boolean;
-    keyModifierStateSymbol?: boolean;
-    keyModifierStateSymbolLock?: boolean;
+interface RTCDTMFToneChangeEventInit extends EventInit {
+    tone?: string;
+}
+
+interface RTCDtlsFingerprint {
+    algorithm?: string;
+    value?: string;
+}
+
+interface RTCDtlsParameters {
+    role?: string;
+    fingerprints?: RTCDtlsFingerprint[];
+}
+
+interface RTCIceCandidate {
+    foundation?: string;
+    priority?: number;
+    ip?: string;
+    protocol?: string;
+    port?: number;
+    type?: string;
+    tcpType?: string;
+    relatedAddress?: string;
+    relatedPort?: number;
+}
+
+interface RTCIceCandidateAttributes extends RTCStats {
+    ipAddress?: string;
+    portNumber?: number;
+    transport?: string;
+    candidateType?: string;
+    priority?: number;
+    addressSourceUrl?: string;
+}
+
+interface RTCIceCandidateComplete {
+}
+
+interface RTCIceCandidatePair {
+    local?: RTCIceCandidate;
+    remote?: RTCIceCandidate;
+}
+
+interface RTCIceCandidatePairStats extends RTCStats {
+    transportId?: string;
+    localCandidateId?: string;
+    remoteCandidateId?: string;
+    state?: string;
+    priority?: number;
+    nominated?: boolean;
+    writable?: boolean;
+    readable?: boolean;
+    bytesSent?: number;
+    bytesReceived?: number;
+    roundTripTime?: number;
+    availableOutgoingBitrate?: number;
+    availableIncomingBitrate?: number;
+}
+
+interface RTCIceGatherOptions {
+    gatherPolicy?: string;
+    iceservers?: RTCIceServer[];
+}
+
+interface RTCIceParameters {
+    usernameFragment?: string;
+    password?: string;
+}
+
+interface RTCIceServer {
+    urls?: any;
+    username?: string;
+    credential?: string;
+}
+
+interface RTCInboundRTPStreamStats extends RTCRTPStreamStats {
+    packetsReceived?: number;
+    bytesReceived?: number;
+    packetsLost?: number;
+    jitter?: number;
+    fractionLost?: number;
+}
+
+interface RTCMediaStreamTrackStats extends RTCStats {
+    trackIdentifier?: string;
+    remoteSource?: boolean;
+    ssrcIds?: string[];
+    frameWidth?: number;
+    frameHeight?: number;
+    framesPerSecond?: number;
+    framesSent?: number;
+    framesReceived?: number;
+    framesDecoded?: number;
+    framesDropped?: number;
+    framesCorrupted?: number;
+    audioLevel?: number;
+    echoReturnLoss?: number;
+    echoReturnLossEnhancement?: number;
+}
+
+interface RTCOutboundRTPStreamStats extends RTCRTPStreamStats {
+    packetsSent?: number;
+    bytesSent?: number;
+    targetBitrate?: number;
+    roundTripTime?: number;
+}
+
+interface RTCRTPStreamStats extends RTCStats {
+    ssrc?: string;
+    associateStatsId?: string;
+    isRemote?: boolean;
+    mediaTrackId?: string;
+    transportId?: string;
+    codecId?: string;
+    firCount?: number;
+    pliCount?: number;
+    nackCount?: number;
+    sliCount?: number;
+}
+
+interface RTCRtcpFeedback {
+    type?: string;
+    parameter?: string;
+}
+
+interface RTCRtcpParameters {
+    ssrc?: number;
+    cname?: string;
+    reducedSize?: boolean;
+    mux?: boolean;
+}
+
+interface RTCRtpCapabilities {
+    codecs?: RTCRtpCodecCapability[];
+    headerExtensions?: RTCRtpHeaderExtension[];
+    fecMechanisms?: string[];
+}
+
+interface RTCRtpCodecCapability {
+    name?: string;
+    kind?: string;
+    clockRate?: number;
+    preferredPayloadType?: number;
+    maxptime?: number;
+    numChannels?: number;
+    rtcpFeedback?: RTCRtcpFeedback[];
+    parameters?: any;
+    options?: any;
+    maxTemporalLayers?: number;
+    maxSpatialLayers?: number;
+    svcMultiStreamSupport?: boolean;
+}
+
+interface RTCRtpCodecParameters {
+    name?: string;
+    payloadType?: any;
+    clockRate?: number;
+    maxptime?: number;
+    numChannels?: number;
+    rtcpFeedback?: RTCRtcpFeedback[];
+    parameters?: any;
+}
+
+interface RTCRtpContributingSource {
+    timestamp?: number;
+    csrc?: number;
+    audioLevel?: number;
+}
+
+interface RTCRtpEncodingParameters {
+    ssrc?: number;
+    codecPayloadType?: number;
+    fec?: RTCRtpFecParameters;
+    rtx?: RTCRtpRtxParameters;
+    priority?: number;
+    maxBitrate?: number;
+    minQuality?: number;
+    framerateBias?: number;
+    resolutionScale?: number;
+    framerateScale?: number;
+    active?: boolean;
+    encodingId?: string;
+    dependencyEncodingIds?: string[];
+    ssrcRange?: RTCSsrcRange;
+}
+
+interface RTCRtpFecParameters {
+    ssrc?: number;
+    mechanism?: string;
+}
+
+interface RTCRtpHeaderExtension {
+    kind?: string;
+    uri?: string;
+    preferredId?: number;
+    preferredEncrypt?: boolean;
+}
+
+interface RTCRtpHeaderExtensionParameters {
+    uri?: string;
+    id?: number;
+    encrypt?: boolean;
+}
+
+interface RTCRtpParameters {
+    muxId?: string;
+    codecs?: RTCRtpCodecParameters[];
+    headerExtensions?: RTCRtpHeaderExtensionParameters[];
+    encodings?: RTCRtpEncodingParameters[];
+    rtcp?: RTCRtcpParameters;
+}
+
+interface RTCRtpRtxParameters {
+    ssrc?: number;
+}
+
+interface RTCRtpUnhandled {
+    ssrc?: number;
+    payloadType?: number;
+    muxId?: string;
+}
+
+interface RTCSrtpKeyParam {
+    keyMethod?: string;
+    keySalt?: string;
+    lifetime?: string;
+    mkiValue?: number;
+    mkiLength?: number;
+}
+
+interface RTCSrtpSdesParameters {
+    tag?: number;
+    cryptoSuite?: string;
+    keyParams?: RTCSrtpKeyParam[];
+    sessionParams?: string[];
+}
+
+interface RTCSsrcRange {
+    min?: number;
+    max?: number;
+}
+
+interface RTCStats {
+    timestamp?: number;
+    type?: string;
+    id?: string;
+    msType?: string;
+}
+
+interface RTCStatsReport {
+}
+
+interface RTCTransportStats extends RTCStats {
+    bytesSent?: number;
+    bytesReceived?: number;
+    rtcpTransportStatsId?: string;
+    activeConnection?: boolean;
+    selectedCandidatePairId?: string;
+    localCertificateId?: string;
+    remoteCertificateId?: string;
 }
 
 interface StoreExceptionsInformation extends ExceptionInformation {
@@ -4225,18 +5003,18 @@ interface ANGLE_instanced_arrays {
     drawArraysInstancedANGLE(mode: number, first: number, count: number, primcount: number): void;
     drawElementsInstancedANGLE(mode: number, count: number, type: number, offset: number, primcount: number): void;
     vertexAttribDivisorANGLE(index: number, divisor: number): void;
-    VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE: number;
+    readonly VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE: number;
 }
 
 declare var ANGLE_instanced_arrays: {
     prototype: ANGLE_instanced_arrays;
     new(): ANGLE_instanced_arrays;
-    VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE: number;
+    readonly VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE: number;
 }
 
 interface AnalyserNode extends AudioNode {
     fftSize: number;
-    frequencyBinCount: number;
+    readonly frequencyBinCount: number;
     maxDecibels: number;
     minDecibels: number;
     smoothingTimeConstant: number;
@@ -4252,8 +5030,8 @@ declare var AnalyserNode: {
 }
 
 interface AnimationEvent extends Event {
-    animationName: string;
-    elapsedTime: number;
+    readonly animationName: string;
+    readonly elapsedTime: number;
     initAnimationEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, animationNameArg: string, elapsedTimeArg: number): void;
 }
 
@@ -4271,16 +5049,16 @@ interface ApplicationCache extends EventTarget {
     onobsolete: (ev: Event) => any;
     onprogress: (ev: ProgressEvent) => any;
     onupdateready: (ev: Event) => any;
-    status: number;
+    readonly status: number;
     abort(): void;
     swapCache(): void;
     update(): void;
-    CHECKING: number;
-    DOWNLOADING: number;
-    IDLE: number;
-    OBSOLETE: number;
-    UNCACHED: number;
-    UPDATEREADY: number;
+    readonly CHECKING: number;
+    readonly DOWNLOADING: number;
+    readonly IDLE: number;
+    readonly OBSOLETE: number;
+    readonly UNCACHED: number;
+    readonly UPDATEREADY: number;
     addEventListener(type: "cached", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "checking", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "downloading", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -4295,16 +5073,16 @@ interface ApplicationCache extends EventTarget {
 declare var ApplicationCache: {
     prototype: ApplicationCache;
     new(): ApplicationCache;
-    CHECKING: number;
-    DOWNLOADING: number;
-    IDLE: number;
-    OBSOLETE: number;
-    UNCACHED: number;
-    UPDATEREADY: number;
+    readonly CHECKING: number;
+    readonly DOWNLOADING: number;
+    readonly IDLE: number;
+    readonly OBSOLETE: number;
+    readonly UNCACHED: number;
+    readonly UPDATEREADY: number;
 }
 
 interface AriaRequestEvent extends Event {
-    attributeName: string;
+    readonly attributeName: string;
     attributeValue: string;
 }
 
@@ -4314,9 +5092,10 @@ declare var AriaRequestEvent: {
 }
 
 interface Attr extends Node {
-    name: string;
-    ownerElement: Element;
-    specified: boolean;
+    readonly name: string;
+    readonly ownerElement: Element;
+    readonly prefix: string;
+    readonly specified: boolean;
     value: string;
 }
 
@@ -4326,10 +5105,12 @@ declare var Attr: {
 }
 
 interface AudioBuffer {
-    duration: number;
-    length: number;
-    numberOfChannels: number;
-    sampleRate: number;
+    readonly duration: number;
+    readonly length: number;
+    readonly numberOfChannels: number;
+    readonly sampleRate: number;
+    copyFromChannel(destination: Float32Array, channelNumber: number, startInChannel?: number): void;
+    copyToChannel(source: Float32Array, channelNumber: number, startInChannel?: number): void;
     getChannelData(channel: number): Float32Array;
 }
 
@@ -4340,14 +5121,15 @@ declare var AudioBuffer: {
 
 interface AudioBufferSourceNode extends AudioNode {
     buffer: AudioBuffer;
+    readonly detune: AudioParam;
     loop: boolean;
     loopEnd: number;
     loopStart: number;
-    onended: (ev: Event) => any;
-    playbackRate: AudioParam;
+    onended: (ev: MediaStreamErrorEvent) => any;
+    readonly playbackRate: AudioParam;
     start(when?: number, offset?: number, duration?: number): void;
     stop(when?: number): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -4357,10 +5139,10 @@ declare var AudioBufferSourceNode: {
 }
 
 interface AudioContext extends EventTarget {
-    currentTime: number;
-    destination: AudioDestinationNode;
-    listener: AudioListener;
-    sampleRate: number;
+    readonly currentTime: number;
+    readonly destination: AudioDestinationNode;
+    readonly listener: AudioListener;
+    readonly sampleRate: number;
     state: string;
     createAnalyser(): AnalyserNode;
     createBiquadFilter(): BiquadFilterNode;
@@ -4373,13 +5155,14 @@ interface AudioContext extends EventTarget {
     createDynamicsCompressor(): DynamicsCompressorNode;
     createGain(): GainNode;
     createMediaElementSource(mediaElement: HTMLMediaElement): MediaElementAudioSourceNode;
+    createMediaStreamSource(mediaStream: MediaStream): MediaStreamAudioSourceNode;
     createOscillator(): OscillatorNode;
     createPanner(): PannerNode;
-    createPeriodicWave(real: Float32Array, imag: Float32Array): PeriodicWave;
+    createPeriodicWave(real: Float32Array, imag: Float32Array, constraints?: PeriodicWaveConstraints): PeriodicWave;
     createScriptProcessor(bufferSize?: number, numberOfInputChannels?: number, numberOfOutputChannels?: number): ScriptProcessorNode;
     createStereoPanner(): StereoPannerNode;
     createWaveShaper(): WaveShaperNode;
-    decodeAudioData(audioData: ArrayBuffer, successCallback: DecodeSuccessCallback, errorCallback?: DecodeErrorCallback): void;
+    decodeAudioData(audioData: ArrayBuffer, successCallback?: DecodeSuccessCallback, errorCallback?: DecodeErrorCallback): PromiseLike<AudioBuffer>;
 }
 
 declare var AudioContext: {
@@ -4388,7 +5171,7 @@ declare var AudioContext: {
 }
 
 interface AudioDestinationNode extends AudioNode {
-    maxChannelCount: number;
+    readonly maxChannelCount: number;
 }
 
 declare var AudioDestinationNode: {
@@ -4413,11 +5196,13 @@ interface AudioNode extends EventTarget {
     channelCount: number;
     channelCountMode: string;
     channelInterpretation: string;
-    context: AudioContext;
-    numberOfInputs: number;
-    numberOfOutputs: number;
+    readonly context: AudioContext;
+    readonly numberOfInputs: number;
+    readonly numberOfOutputs: number;
     connect(destination: AudioNode, output?: number, input?: number): void;
     disconnect(output?: number): void;
+    disconnect(destination: AudioNode, output?: number, input?: number): void;
+    disconnect(destination: AudioParam, output?: number): void;
 }
 
 declare var AudioNode: {
@@ -4426,7 +5211,7 @@ declare var AudioNode: {
 }
 
 interface AudioParam {
-    defaultValue: number;
+    readonly defaultValue: number;
     value: number;
     cancelScheduledValues(startTime: number): void;
     exponentialRampToValueAtTime(value: number, endTime: number): void;
@@ -4442,9 +5227,9 @@ declare var AudioParam: {
 }
 
 interface AudioProcessingEvent extends Event {
-    inputBuffer: AudioBuffer;
-    outputBuffer: AudioBuffer;
-    playbackTime: number;
+    readonly inputBuffer: AudioBuffer;
+    readonly outputBuffer: AudioBuffer;
+    readonly playbackTime: number;
 }
 
 declare var AudioProcessingEvent: {
@@ -4454,11 +5239,11 @@ declare var AudioProcessingEvent: {
 
 interface AudioTrack {
     enabled: boolean;
-    id: string;
+    readonly id: string;
     kind: string;
-    label: string;
+    readonly label: string;
     language: string;
-    sourceBuffer: SourceBuffer;
+    readonly sourceBuffer: SourceBuffer;
 }
 
 declare var AudioTrack: {
@@ -4467,7 +5252,7 @@ declare var AudioTrack: {
 }
 
 interface AudioTrackList extends EventTarget {
-    length: number;
+    readonly length: number;
     onaddtrack: (ev: TrackEvent) => any;
     onchange: (ev: Event) => any;
     onremovetrack: (ev: TrackEvent) => any;
@@ -4486,7 +5271,7 @@ declare var AudioTrackList: {
 }
 
 interface BarProp {
-    visible: boolean;
+    readonly visible: boolean;
 }
 
 declare var BarProp: {
@@ -4504,10 +5289,10 @@ declare var BeforeUnloadEvent: {
 }
 
 interface BiquadFilterNode extends AudioNode {
-    Q: AudioParam;
-    detune: AudioParam;
-    frequency: AudioParam;
-    gain: AudioParam;
+    readonly Q: AudioParam;
+    readonly detune: AudioParam;
+    readonly frequency: AudioParam;
+    readonly gain: AudioParam;
     type: string;
     getFrequencyResponse(frequencyHz: Float32Array, magResponse: Float32Array, phaseResponse: Float32Array): void;
 }
@@ -4518,8 +5303,8 @@ declare var BiquadFilterNode: {
 }
 
 interface Blob {
-    size: number;
-    type: string;
+    readonly size: number;
+    readonly type: string;
     msClose(): void;
     msDetachStream(): any;
     slice(start?: number, end?: number, contentType?: string): Blob;
@@ -4553,7 +5338,7 @@ declare var CSSConditionRule: {
 }
 
 interface CSSFontFaceRule extends CSSRule {
-    style: CSSStyleDeclaration;
+    readonly style: CSSStyleDeclaration;
 }
 
 declare var CSSFontFaceRule: {
@@ -4562,9 +5347,9 @@ declare var CSSFontFaceRule: {
 }
 
 interface CSSGroupingRule extends CSSRule {
-    cssRules: CSSRuleList;
-    deleteRule(index?: number): void;
-    insertRule(rule: string, index?: number): number;
+    readonly cssRules: CSSRuleList;
+    deleteRule(index: number): void;
+    insertRule(rule: string, index: number): number;
 }
 
 declare var CSSGroupingRule: {
@@ -4573,9 +5358,9 @@ declare var CSSGroupingRule: {
 }
 
 interface CSSImportRule extends CSSRule {
-    href: string;
-    media: MediaList;
-    styleSheet: CSSStyleSheet;
+    readonly href: string;
+    readonly media: MediaList;
+    readonly styleSheet: CSSStyleSheet;
 }
 
 declare var CSSImportRule: {
@@ -4585,7 +5370,7 @@ declare var CSSImportRule: {
 
 interface CSSKeyframeRule extends CSSRule {
     keyText: string;
-    style: CSSStyleDeclaration;
+    readonly style: CSSStyleDeclaration;
 }
 
 declare var CSSKeyframeRule: {
@@ -4594,7 +5379,7 @@ declare var CSSKeyframeRule: {
 }
 
 interface CSSKeyframesRule extends CSSRule {
-    cssRules: CSSRuleList;
+    readonly cssRules: CSSRuleList;
     name: string;
     appendRule(rule: string): void;
     deleteRule(rule: string): void;
@@ -4607,7 +5392,7 @@ declare var CSSKeyframesRule: {
 }
 
 interface CSSMediaRule extends CSSConditionRule {
-    media: MediaList;
+    readonly media: MediaList;
 }
 
 declare var CSSMediaRule: {
@@ -4616,8 +5401,8 @@ declare var CSSMediaRule: {
 }
 
 interface CSSNamespaceRule extends CSSRule {
-    namespaceURI: string;
-    prefix: string;
+    readonly namespaceURI: string;
+    readonly prefix: string;
 }
 
 declare var CSSNamespaceRule: {
@@ -4626,10 +5411,10 @@ declare var CSSNamespaceRule: {
 }
 
 interface CSSPageRule extends CSSRule {
-    pseudoClass: string;
-    selector: string;
+    readonly pseudoClass: string;
+    readonly selector: string;
     selectorText: string;
-    style: CSSStyleDeclaration;
+    readonly style: CSSStyleDeclaration;
 }
 
 declare var CSSPageRule: {
@@ -4639,42 +5424,42 @@ declare var CSSPageRule: {
 
 interface CSSRule {
     cssText: string;
-    parentRule: CSSRule;
-    parentStyleSheet: CSSStyleSheet;
-    type: number;
-    CHARSET_RULE: number;
-    FONT_FACE_RULE: number;
-    IMPORT_RULE: number;
-    KEYFRAMES_RULE: number;
-    KEYFRAME_RULE: number;
-    MEDIA_RULE: number;
-    NAMESPACE_RULE: number;
-    PAGE_RULE: number;
-    STYLE_RULE: number;
-    SUPPORTS_RULE: number;
-    UNKNOWN_RULE: number;
-    VIEWPORT_RULE: number;
+    readonly parentRule: CSSRule;
+    readonly parentStyleSheet: CSSStyleSheet;
+    readonly type: number;
+    readonly CHARSET_RULE: number;
+    readonly FONT_FACE_RULE: number;
+    readonly IMPORT_RULE: number;
+    readonly KEYFRAMES_RULE: number;
+    readonly KEYFRAME_RULE: number;
+    readonly MEDIA_RULE: number;
+    readonly NAMESPACE_RULE: number;
+    readonly PAGE_RULE: number;
+    readonly STYLE_RULE: number;
+    readonly SUPPORTS_RULE: number;
+    readonly UNKNOWN_RULE: number;
+    readonly VIEWPORT_RULE: number;
 }
 
 declare var CSSRule: {
     prototype: CSSRule;
     new(): CSSRule;
-    CHARSET_RULE: number;
-    FONT_FACE_RULE: number;
-    IMPORT_RULE: number;
-    KEYFRAMES_RULE: number;
-    KEYFRAME_RULE: number;
-    MEDIA_RULE: number;
-    NAMESPACE_RULE: number;
-    PAGE_RULE: number;
-    STYLE_RULE: number;
-    SUPPORTS_RULE: number;
-    UNKNOWN_RULE: number;
-    VIEWPORT_RULE: number;
+    readonly CHARSET_RULE: number;
+    readonly FONT_FACE_RULE: number;
+    readonly IMPORT_RULE: number;
+    readonly KEYFRAMES_RULE: number;
+    readonly KEYFRAME_RULE: number;
+    readonly MEDIA_RULE: number;
+    readonly NAMESPACE_RULE: number;
+    readonly PAGE_RULE: number;
+    readonly STYLE_RULE: number;
+    readonly SUPPORTS_RULE: number;
+    readonly UNKNOWN_RULE: number;
+    readonly VIEWPORT_RULE: number;
 }
 
 interface CSSRuleList {
-    length: number;
+    readonly length: number;
     item(index: number): CSSRule;
     [index: number]: CSSRule;
 }
@@ -4807,7 +5592,7 @@ interface CSSStyleDeclaration {
     justifyContent: string;
     kerning: string;
     left: string;
-    length: number;
+    readonly length: number;
     letterSpacing: string;
     lightingColor: string;
     lineHeight: string;
@@ -4894,7 +5679,7 @@ interface CSSStyleDeclaration {
     pageBreakAfter: string;
     pageBreakBefore: string;
     pageBreakInside: string;
-    parentRule: CSSRule;
+    readonly parentRule: CSSRule;
     perspective: string;
     perspectiveOrigin: string;
     pointerEvents: string;
@@ -4919,7 +5704,6 @@ interface CSSStyleDeclaration {
     textAlignLast: string;
     textAnchor: string;
     textDecoration: string;
-    textFillColor: string;
     textIndent: string;
     textJustify: string;
     textKashida: string;
@@ -4955,25 +5739,12 @@ interface CSSStyleDeclaration {
     webkitAnimationTimingFunction: string;
     webkitAppearance: string;
     webkitBackfaceVisibility: string;
-    webkitBackground: string;
-    webkitBackgroundAttachment: string;
     webkitBackgroundClip: string;
-    webkitBackgroundColor: string;
-    webkitBackgroundImage: string;
     webkitBackgroundOrigin: string;
-    webkitBackgroundPosition: string;
-    webkitBackgroundPositionX: string;
-    webkitBackgroundPositionY: string;
-    webkitBackgroundRepeat: string;
     webkitBackgroundSize: string;
     webkitBorderBottomLeftRadius: string;
     webkitBorderBottomRightRadius: string;
     webkitBorderImage: string;
-    webkitBorderImageOutset: string;
-    webkitBorderImageRepeat: string;
-    webkitBorderImageSlice: string;
-    webkitBorderImageSource: string;
-    webkitBorderImageWidth: string;
     webkitBorderRadius: string;
     webkitBorderTopLeftRadius: string;
     webkitBorderTopRightRadius: string;
@@ -5019,6 +5790,7 @@ interface CSSStyleDeclaration {
     webkitTransitionDuration: string;
     webkitTransitionProperty: string;
     webkitTransitionTimingFunction: string;
+    webkitUserModify: string;
     webkitUserSelect: string;
     webkitWritingMode: string;
     whiteSpace: string;
@@ -5044,9 +5816,9 @@ declare var CSSStyleDeclaration: {
 }
 
 interface CSSStyleRule extends CSSRule {
-    readOnly: boolean;
+    readonly readOnly: boolean;
     selectorText: string;
-    style: CSSStyleDeclaration;
+    readonly style: CSSStyleDeclaration;
 }
 
 declare var CSSStyleRule: {
@@ -5055,18 +5827,18 @@ declare var CSSStyleRule: {
 }
 
 interface CSSStyleSheet extends StyleSheet {
-    cssRules: CSSRuleList;
+    readonly cssRules: CSSRuleList;
     cssText: string;
-    href: string;
-    id: string;
-    imports: StyleSheetList;
-    isAlternate: boolean;
-    isPrefAlternate: boolean;
-    ownerRule: CSSRule;
-    owningElement: Element;
-    pages: StyleSheetPageList;
-    readOnly: boolean;
-    rules: CSSRuleList;
+    readonly href: string;
+    readonly id: string;
+    readonly imports: StyleSheetList;
+    readonly isAlternate: boolean;
+    readonly isPrefAlternate: boolean;
+    readonly ownerRule: CSSRule;
+    readonly owningElement: Element;
+    readonly pages: StyleSheetPageList;
+    readonly readOnly: boolean;
+    readonly rules: CSSRuleList;
     addImport(bstrURL: string, lIndex?: number): number;
     addPageRule(bstrSelector: string, bstrStyle: string, lIndex?: number): number;
     addRule(bstrSelector: string, bstrStyle?: string, lIndex?: number): number;
@@ -5106,8 +5878,8 @@ declare var CanvasPattern: {
     new(): CanvasPattern;
 }
 
-interface CanvasRenderingContext2D {
-    canvas: HTMLCanvasElement;
+interface CanvasRenderingContext2D extends Object, CanvasPathMethods {
+    readonly canvas: HTMLCanvasElement;
     fillStyle: string | CanvasGradient | CanvasPattern;
     font: string;
     globalAlpha: number;
@@ -5126,13 +5898,9 @@ interface CanvasRenderingContext2D {
     strokeStyle: string | CanvasGradient | CanvasPattern;
     textAlign: string;
     textBaseline: string;
-    arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void;
-    arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void;
     beginPath(): void;
-    bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void;
     clearRect(x: number, y: number, w: number, h: number): void;
     clip(fillRule?: string): void;
-    closePath(): void;
     createImageData(imageDataOrSw: number | ImageData, sh?: number): ImageData;
     createLinearGradient(x0: number, y0: number, x1: number, y1: number): CanvasGradient;
     createPattern(image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, repetition: string): CanvasPattern;
@@ -5144,12 +5912,8 @@ interface CanvasRenderingContext2D {
     getImageData(sx: number, sy: number, sw: number, sh: number): ImageData;
     getLineDash(): number[];
     isPointInPath(x: number, y: number, fillRule?: string): boolean;
-    lineTo(x: number, y: number): void;
     measureText(text: string): TextMetrics;
-    moveTo(x: number, y: number): void;
     putImageData(imagedata: ImageData, dx: number, dy: number, dirtyX?: number, dirtyY?: number, dirtyWidth?: number, dirtyHeight?: number): void;
-    quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
-    rect(x: number, y: number, w: number, h: number): void;
     restore(): void;
     rotate(angle: number): void;
     save(): void;
@@ -5186,7 +5950,7 @@ declare var ChannelSplitterNode: {
 
 interface CharacterData extends Node, ChildNode {
     data: string;
-    length: number;
+    readonly length: number;
     appendData(arg: string): void;
     deleteData(offset: number, count: number): void;
     insertData(offset: number, arg: string): void;
@@ -5202,11 +5966,11 @@ declare var CharacterData: {
 
 interface ClientRect {
     bottom: number;
-    height: number;
+    readonly height: number;
     left: number;
     right: number;
     top: number;
-    width: number;
+    readonly width: number;
 }
 
 declare var ClientRect: {
@@ -5215,7 +5979,7 @@ declare var ClientRect: {
 }
 
 interface ClientRectList {
-    length: number;
+    readonly length: number;
     item(index: number): ClientRect;
     [index: number]: ClientRect;
 }
@@ -5226,7 +5990,7 @@ declare var ClientRectList: {
 }
 
 interface ClipboardEvent extends Event {
-    clipboardData: DataTransfer;
+    readonly clipboardData: DataTransfer;
 }
 
 declare var ClipboardEvent: {
@@ -5235,9 +5999,9 @@ declare var ClipboardEvent: {
 }
 
 interface CloseEvent extends Event {
-    code: number;
-    reason: string;
-    wasClean: boolean;
+    readonly code: number;
+    readonly reason: string;
+    readonly wasClean: boolean;
     initCloseEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, wasCleanArg: boolean, codeArg: number, reasonArg: string): void;
 }
 
@@ -5247,8 +6011,8 @@ declare var CloseEvent: {
 }
 
 interface CommandEvent extends Event {
-    commandName: string;
-    detail: string;
+    readonly commandName: string;
+    readonly detail: string;
 }
 
 declare var CommandEvent: {
@@ -5266,8 +6030,8 @@ declare var Comment: {
 }
 
 interface CompositionEvent extends UIEvent {
-    data: string;
-    locale: string;
+    readonly data: string;
+    readonly locale: string;
     initCompositionEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, dataArg: string, locale: string): void;
 }
 
@@ -5284,6 +6048,7 @@ interface Console {
     dir(value?: any, ...optionalParams: any[]): void;
     dirxml(value: any): void;
     error(message?: any, ...optionalParams: any[]): void;
+    exception(message?: string, ...optionalParams: any[]): void;
     group(groupTitle?: string): void;
     groupCollapsed(groupTitle?: string): void;
     groupEnd(): void;
@@ -5293,6 +6058,7 @@ interface Console {
     profile(reportName?: string): void;
     profileEnd(): void;
     select(element: Element): void;
+    table(...data: any[]): void;
     time(timerName?: string): void;
     timeEnd(timerName?: string): void;
     trace(message?: any, ...optionalParams: any[]): void;
@@ -5315,13 +6081,13 @@ declare var ConvolverNode: {
 }
 
 interface Coordinates {
-    accuracy: number;
-    altitude: number;
-    altitudeAccuracy: number;
-    heading: number;
-    latitude: number;
-    longitude: number;
-    speed: number;
+    readonly accuracy: number;
+    readonly altitude: number;
+    readonly altitudeAccuracy: number;
+    readonly heading: number;
+    readonly latitude: number;
+    readonly longitude: number;
+    readonly speed: number;
 }
 
 declare var Coordinates: {
@@ -5330,7 +6096,7 @@ declare var Coordinates: {
 }
 
 interface Crypto extends Object, RandomSource {
-    subtle: SubtleCrypto;
+    readonly subtle: SubtleCrypto;
 }
 
 declare var Crypto: {
@@ -5339,10 +6105,10 @@ declare var Crypto: {
 }
 
 interface CryptoKey {
-    algorithm: KeyAlgorithm;
-    extractable: boolean;
-    type: string;
-    usages: string[];
+    readonly algorithm: KeyAlgorithm;
+    readonly extractable: boolean;
+    readonly type: string;
+    readonly usages: string[];
 }
 
 declare var CryptoKey: {
@@ -5361,7 +6127,7 @@ declare var CryptoKeyPair: {
 }
 
 interface CustomEvent extends Event {
-    detail: any;
+    readonly detail: any;
     initCustomEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, detailArg: any): void;
 }
 
@@ -5371,7 +6137,7 @@ declare var CustomEvent: {
 }
 
 interface DOMError {
-    name: string;
+    readonly name: string;
     toString(): string;
 }
 
@@ -5381,69 +6147,69 @@ declare var DOMError: {
 }
 
 interface DOMException {
-    code: number;
-    message: string;
-    name: string;
+    readonly code: number;
+    readonly message: string;
+    readonly name: string;
     toString(): string;
-    ABORT_ERR: number;
-    DATA_CLONE_ERR: number;
-    DOMSTRING_SIZE_ERR: number;
-    HIERARCHY_REQUEST_ERR: number;
-    INDEX_SIZE_ERR: number;
-    INUSE_ATTRIBUTE_ERR: number;
-    INVALID_ACCESS_ERR: number;
-    INVALID_CHARACTER_ERR: number;
-    INVALID_MODIFICATION_ERR: number;
-    INVALID_NODE_TYPE_ERR: number;
-    INVALID_STATE_ERR: number;
-    NAMESPACE_ERR: number;
-    NETWORK_ERR: number;
-    NOT_FOUND_ERR: number;
-    NOT_SUPPORTED_ERR: number;
-    NO_DATA_ALLOWED_ERR: number;
-    NO_MODIFICATION_ALLOWED_ERR: number;
-    PARSE_ERR: number;
-    QUOTA_EXCEEDED_ERR: number;
-    SECURITY_ERR: number;
-    SERIALIZE_ERR: number;
-    SYNTAX_ERR: number;
-    TIMEOUT_ERR: number;
-    TYPE_MISMATCH_ERR: number;
-    URL_MISMATCH_ERR: number;
-    VALIDATION_ERR: number;
-    WRONG_DOCUMENT_ERR: number;
+    readonly ABORT_ERR: number;
+    readonly DATA_CLONE_ERR: number;
+    readonly DOMSTRING_SIZE_ERR: number;
+    readonly HIERARCHY_REQUEST_ERR: number;
+    readonly INDEX_SIZE_ERR: number;
+    readonly INUSE_ATTRIBUTE_ERR: number;
+    readonly INVALID_ACCESS_ERR: number;
+    readonly INVALID_CHARACTER_ERR: number;
+    readonly INVALID_MODIFICATION_ERR: number;
+    readonly INVALID_NODE_TYPE_ERR: number;
+    readonly INVALID_STATE_ERR: number;
+    readonly NAMESPACE_ERR: number;
+    readonly NETWORK_ERR: number;
+    readonly NOT_FOUND_ERR: number;
+    readonly NOT_SUPPORTED_ERR: number;
+    readonly NO_DATA_ALLOWED_ERR: number;
+    readonly NO_MODIFICATION_ALLOWED_ERR: number;
+    readonly PARSE_ERR: number;
+    readonly QUOTA_EXCEEDED_ERR: number;
+    readonly SECURITY_ERR: number;
+    readonly SERIALIZE_ERR: number;
+    readonly SYNTAX_ERR: number;
+    readonly TIMEOUT_ERR: number;
+    readonly TYPE_MISMATCH_ERR: number;
+    readonly URL_MISMATCH_ERR: number;
+    readonly VALIDATION_ERR: number;
+    readonly WRONG_DOCUMENT_ERR: number;
 }
 
 declare var DOMException: {
     prototype: DOMException;
     new(): DOMException;
-    ABORT_ERR: number;
-    DATA_CLONE_ERR: number;
-    DOMSTRING_SIZE_ERR: number;
-    HIERARCHY_REQUEST_ERR: number;
-    INDEX_SIZE_ERR: number;
-    INUSE_ATTRIBUTE_ERR: number;
-    INVALID_ACCESS_ERR: number;
-    INVALID_CHARACTER_ERR: number;
-    INVALID_MODIFICATION_ERR: number;
-    INVALID_NODE_TYPE_ERR: number;
-    INVALID_STATE_ERR: number;
-    NAMESPACE_ERR: number;
-    NETWORK_ERR: number;
-    NOT_FOUND_ERR: number;
-    NOT_SUPPORTED_ERR: number;
-    NO_DATA_ALLOWED_ERR: number;
-    NO_MODIFICATION_ALLOWED_ERR: number;
-    PARSE_ERR: number;
-    QUOTA_EXCEEDED_ERR: number;
-    SECURITY_ERR: number;
-    SERIALIZE_ERR: number;
-    SYNTAX_ERR: number;
-    TIMEOUT_ERR: number;
-    TYPE_MISMATCH_ERR: number;
-    URL_MISMATCH_ERR: number;
-    VALIDATION_ERR: number;
-    WRONG_DOCUMENT_ERR: number;
+    readonly ABORT_ERR: number;
+    readonly DATA_CLONE_ERR: number;
+    readonly DOMSTRING_SIZE_ERR: number;
+    readonly HIERARCHY_REQUEST_ERR: number;
+    readonly INDEX_SIZE_ERR: number;
+    readonly INUSE_ATTRIBUTE_ERR: number;
+    readonly INVALID_ACCESS_ERR: number;
+    readonly INVALID_CHARACTER_ERR: number;
+    readonly INVALID_MODIFICATION_ERR: number;
+    readonly INVALID_NODE_TYPE_ERR: number;
+    readonly INVALID_STATE_ERR: number;
+    readonly NAMESPACE_ERR: number;
+    readonly NETWORK_ERR: number;
+    readonly NOT_FOUND_ERR: number;
+    readonly NOT_SUPPORTED_ERR: number;
+    readonly NO_DATA_ALLOWED_ERR: number;
+    readonly NO_MODIFICATION_ALLOWED_ERR: number;
+    readonly PARSE_ERR: number;
+    readonly QUOTA_EXCEEDED_ERR: number;
+    readonly SECURITY_ERR: number;
+    readonly SERIALIZE_ERR: number;
+    readonly SYNTAX_ERR: number;
+    readonly TIMEOUT_ERR: number;
+    readonly TYPE_MISMATCH_ERR: number;
+    readonly URL_MISMATCH_ERR: number;
+    readonly VALIDATION_ERR: number;
+    readonly WRONG_DOCUMENT_ERR: number;
 }
 
 interface DOMImplementation {
@@ -5477,7 +6243,7 @@ declare var DOMSettableTokenList: {
 }
 
 interface DOMStringList {
-    length: number;
+    readonly length: number;
     contains(str: string): boolean;
     item(index: number): string;
     [index: number]: string;
@@ -5498,7 +6264,7 @@ declare var DOMStringMap: {
 }
 
 interface DOMTokenList {
-    length: number;
+    readonly length: number;
     add(...token: string[]): void;
     contains(token: string): boolean;
     item(index: number): string;
@@ -5525,9 +6291,9 @@ declare var DataCue: {
 interface DataTransfer {
     dropEffect: string;
     effectAllowed: string;
-    files: FileList;
-    items: DataTransferItemList;
-    types: DOMStringList;
+    readonly files: FileList;
+    readonly items: DataTransferItemList;
+    readonly types: DOMStringList;
     clearData(format?: string): boolean;
     getData(format: string): string;
     setData(format: string, data: string): boolean;
@@ -5539,8 +6305,8 @@ declare var DataTransfer: {
 }
 
 interface DataTransferItem {
-    kind: string;
-    type: string;
+    readonly kind: string;
+    readonly type: string;
     getAsFile(): File;
     getAsString(_callback: FunctionStringCallback): void;
 }
@@ -5551,7 +6317,7 @@ declare var DataTransferItem: {
 }
 
 interface DataTransferItemList {
-    length: number;
+    readonly length: number;
     add(data: File): DataTransferItem;
     clear(): void;
     item(index: number): DataTransferItem;
@@ -5565,9 +6331,9 @@ declare var DataTransferItemList: {
 }
 
 interface DeferredPermissionRequest {
-    id: number;
-    type: string;
-    uri: string;
+    readonly id: number;
+    readonly type: string;
+    readonly uri: string;
     allow(): void;
     deny(): void;
 }
@@ -5578,7 +6344,7 @@ declare var DeferredPermissionRequest: {
 }
 
 interface DelayNode extends AudioNode {
-    delayTime: AudioParam;
+    readonly delayTime: AudioParam;
 }
 
 declare var DelayNode: {
@@ -5587,9 +6353,9 @@ declare var DelayNode: {
 }
 
 interface DeviceAcceleration {
-    x: number;
-    y: number;
-    z: number;
+    readonly x: number;
+    readonly y: number;
+    readonly z: number;
 }
 
 declare var DeviceAcceleration: {
@@ -5597,11 +6363,20 @@ declare var DeviceAcceleration: {
     new(): DeviceAcceleration;
 }
 
+interface DeviceLightEvent extends Event {
+    readonly value: number;
+}
+
+declare var DeviceLightEvent: {
+    prototype: DeviceLightEvent;
+    new(type: string, eventInitDict?: DeviceLightEventInit): DeviceLightEvent;
+}
+
 interface DeviceMotionEvent extends Event {
-    acceleration: DeviceAcceleration;
-    accelerationIncludingGravity: DeviceAcceleration;
-    interval: number;
-    rotationRate: DeviceRotationRate;
+    readonly acceleration: DeviceAcceleration;
+    readonly accelerationIncludingGravity: DeviceAcceleration;
+    readonly interval: number;
+    readonly rotationRate: DeviceRotationRate;
     initDeviceMotionEvent(type: string, bubbles: boolean, cancelable: boolean, acceleration: DeviceAccelerationDict, accelerationIncludingGravity: DeviceAccelerationDict, rotationRate: DeviceRotationRateDict, interval: number): void;
 }
 
@@ -5611,10 +6386,10 @@ declare var DeviceMotionEvent: {
 }
 
 interface DeviceOrientationEvent extends Event {
-    absolute: boolean;
-    alpha: number;
-    beta: number;
-    gamma: number;
+    readonly absolute: boolean;
+    readonly alpha: number;
+    readonly beta: number;
+    readonly gamma: number;
     initDeviceOrientationEvent(type: string, bubbles: boolean, cancelable: boolean, alpha: number, beta: number, gamma: number, absolute: boolean): void;
 }
 
@@ -5624,9 +6399,9 @@ declare var DeviceOrientationEvent: {
 }
 
 interface DeviceRotationRate {
-    alpha: number;
-    beta: number;
-    gamma: number;
+    readonly alpha: number;
+    readonly beta: number;
+    readonly gamma: number;
 }
 
 declare var DeviceRotationRate: {
@@ -5638,15 +6413,15 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Sets or gets the URL for the current document. 
       */
-    URL: string;
+    readonly URL: string;
     /**
       * Gets the URL for the document, stripped of any character encoding.
       */
-    URLUnencoded: string;
+    readonly URLUnencoded: string;
     /**
       * Gets the object that has the focus when the parent document has focus.
       */
-    activeElement: Element;
+    readonly activeElement: Element;
     /**
       * Sets or gets the color of all active links in the document.
       */
@@ -5654,15 +6429,15 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Returns a reference to the collection of elements contained by the object.
       */
-    all: HTMLCollection;
+    readonly all: HTMLAllCollection;
     /**
       * Retrieves a collection of all a objects that have a name and/or id property. Objects in this collection are in HTML source order.
       */
-    anchors: HTMLCollection;
+    anchors: HTMLCollectionOf<HTMLAnchorElement>;
     /**
       * Retrieves a collection of all applet objects in the document.
       */
-    applets: HTMLCollection;
+    applets: HTMLCollectionOf<HTMLAppletElement>;
     /**
       * Deprecated. Sets or retrieves a value that indicates the background color behind the object. 
       */
@@ -5671,7 +6446,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Specifies the beginning and end of the document body.
       */
     body: HTMLElement;
-    characterSet: string;
+    readonly characterSet: string;
     /**
       * Gets or sets the character set used to encode the object.
       */
@@ -5679,13 +6454,14 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Gets a value that indicates whether standards-compliant mode is switched on for the object.
       */
-    compatMode: string;
+    readonly compatMode: string;
     cookie: string;
+    readonly currentScript: HTMLScriptElement | SVGScriptElement;
     /**
       * Gets the default character set from the current regional language settings.
       */
-    defaultCharset: string;
-    defaultView: Window;
+    readonly defaultCharset: string;
+    readonly defaultView: Window;
     /**
       * Sets or gets a value that indicates whether the document can be edited.
       */
@@ -5697,7 +6473,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Gets an object representing the document type declaration associated with the current document. 
       */
-    doctype: DocumentType;
+    readonly doctype: DocumentType;
     /**
       * Gets a reference to the root node of the document. 
       */
@@ -5709,7 +6485,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Retrieves a collection of all embed objects in the document.
       */
-    embeds: HTMLCollection;
+    embeds: HTMLCollectionOf<HTMLEmbedElement>;
     /**
       * Sets or gets the foreground (text) color of the document.
       */
@@ -5717,27 +6493,27 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Retrieves a collection, in source order, of all form objects in the document.
       */
-    forms: HTMLCollection;
-    fullscreenElement: Element;
-    fullscreenEnabled: boolean;
-    head: HTMLHeadElement;
-    hidden: boolean;
+    forms: HTMLCollectionOf<HTMLFormElement>;
+    readonly fullscreenElement: Element;
+    readonly fullscreenEnabled: boolean;
+    readonly head: HTMLHeadElement;
+    readonly hidden: boolean;
     /**
       * Retrieves a collection, in source order, of img objects in the document.
       */
-    images: HTMLCollection;
+    images: HTMLCollectionOf<HTMLImageElement>;
     /**
       * Gets the implementation object of the current document. 
       */
-    implementation: DOMImplementation;
+    readonly implementation: DOMImplementation;
     /**
       * Returns the character encoding used to create the webpage that is loaded into the document object.
       */
-    inputEncoding: string;
+    readonly inputEncoding: string;
     /**
       * Gets the date that the page was last modified, if the page supplies one. 
       */
-    lastModified: string;
+    readonly lastModified: string;
     /**
       * Sets or gets the color of the document links. 
       */
@@ -5745,16 +6521,13 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Retrieves a collection of all a objects that specify the href property and all area objects in the document.
       */
-    links: HTMLCollection;
+    links: HTMLCollectionOf<HTMLAnchorElement | HTMLAreaElement>;
     /**
       * Contains information about the current URL. 
       */
-    location: Location;
-    media: string;
+    readonly location: Location;
     msCSSOMElementFloatMetrics: boolean;
     msCapsLockWarningOff: boolean;
-    msHidden: boolean;
-    msVisibilityState: string;
     /**
       * Fires when the user aborts the download.
       * @param ev The event.
@@ -5856,7 +6629,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Occurs when the end of playback is reached. 
       * @param ev The event
       */
-    onended: (ev: Event) => any;
+    onended: (ev: MediaStreamErrorEvent) => any;
     /**
       * Fires when an error occurs during object loading.
       * @param ev The event.
@@ -5870,6 +6643,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     onfullscreenchange: (ev: Event) => any;
     onfullscreenerror: (ev: Event) => any;
     oninput: (ev: Event) => any;
+    oninvalid: (ev: Event) => any;
     /**
       * Fires when the user presses a key.
       * @param ev The keyboard event
@@ -5934,7 +6708,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Fires when the wheel button is rotated. 
       * @param ev The mouse event
       */
-    onmousewheel: (ev: MouseWheelEvent) => any;
+    onmousewheel: (ev: WheelEvent) => any;
     onmscontentzoom: (ev: UIEvent) => any;
     onmsgesturechange: (ev: MSGestureEvent) => any;
     onmsgesturedoubletap: (ev: MSGestureEvent) => any;
@@ -6019,6 +6793,11 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * @param ev The event.
       */
     onselect: (ev: UIEvent) => any;
+    /**
+      * Fires when the selection state of a document changes.
+      * @param ev The event.
+      */
+    onselectionchange: (ev: Event) => any;
     onselectstart: (ev: Event) => any;
     /**
       * Occurs when the download has stopped. 
@@ -6057,51 +6836,51 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     onwaiting: (ev: Event) => any;
     onwebkitfullscreenchange: (ev: Event) => any;
     onwebkitfullscreenerror: (ev: Event) => any;
-    plugins: HTMLCollection;
-    pointerLockElement: Element;
+    plugins: HTMLCollectionOf<HTMLEmbedElement>;
+    readonly pointerLockElement: Element;
     /**
       * Retrieves a value that indicates the current state of the object.
       */
-    readyState: string;
+    readonly readyState: string;
     /**
       * Gets the URL of the location that referred the user to the current page.
       */
-    referrer: string;
+    readonly referrer: string;
     /**
       * Gets the root svg element in the document hierarchy.
       */
-    rootElement: SVGSVGElement;
+    readonly rootElement: SVGSVGElement;
     /**
       * Retrieves a collection of all script objects in the document.
       */
-    scripts: HTMLCollection;
-    security: string;
+    scripts: HTMLCollectionOf<HTMLScriptElement>;
+    readonly scrollingElement: Element;
     /**
       * Retrieves a collection of styleSheet objects representing the style sheets that correspond to each instance of a link or style object in the document.
       */
-    styleSheets: StyleSheetList;
+    readonly styleSheets: StyleSheetList;
     /**
       * Contains the title of the document.
       */
     title: string;
-    visibilityState: string;
+    readonly visibilityState: string;
     /** 
       * Sets or gets the color of the links that the user has visited.
       */
     vlinkColor: string;
-    webkitCurrentFullScreenElement: Element;
-    webkitFullscreenElement: Element;
-    webkitFullscreenEnabled: boolean;
-    webkitIsFullScreen: boolean;
-    xmlEncoding: string;
+    readonly webkitCurrentFullScreenElement: Element;
+    readonly webkitFullscreenElement: Element;
+    readonly webkitFullscreenEnabled: boolean;
+    readonly webkitIsFullScreen: boolean;
+    readonly xmlEncoding: string;
     xmlStandalone: boolean;
     /**
       * Gets or sets the version attribute specified in the declaration of an XML document.
       */
     xmlVersion: string;
-    currentScript: HTMLScriptElement;
     adoptNode(source: Node): Node;
     captureEvents(): void;
+    caretRangeFromPoint(x: number, y: number): Range;
     clear(): void;
     /**
       * Closes an output stream and forces the sent data to display.
@@ -6128,37 +6907,24 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * @param tagName The name of an element.
       */
     createElement(tagName: "a"): HTMLAnchorElement;
-    createElement(tagName: "abbr"): HTMLPhraseElement;
-    createElement(tagName: "acronym"): HTMLPhraseElement;
-    createElement(tagName: "address"): HTMLBlockElement;
     createElement(tagName: "applet"): HTMLAppletElement;
     createElement(tagName: "area"): HTMLAreaElement;
     createElement(tagName: "audio"): HTMLAudioElement;
-    createElement(tagName: "b"): HTMLPhraseElement;
     createElement(tagName: "base"): HTMLBaseElement;
     createElement(tagName: "basefont"): HTMLBaseFontElement;
-    createElement(tagName: "bdo"): HTMLPhraseElement;
-    createElement(tagName: "big"): HTMLPhraseElement;
-    createElement(tagName: "blockquote"): HTMLBlockElement;
+    createElement(tagName: "blockquote"): HTMLQuoteElement;
     createElement(tagName: "body"): HTMLBodyElement;
     createElement(tagName: "br"): HTMLBRElement;
     createElement(tagName: "button"): HTMLButtonElement;
     createElement(tagName: "canvas"): HTMLCanvasElement;
     createElement(tagName: "caption"): HTMLTableCaptionElement;
-    createElement(tagName: "center"): HTMLBlockElement;
-    createElement(tagName: "cite"): HTMLPhraseElement;
-    createElement(tagName: "code"): HTMLPhraseElement;
     createElement(tagName: "col"): HTMLTableColElement;
     createElement(tagName: "colgroup"): HTMLTableColElement;
     createElement(tagName: "datalist"): HTMLDataListElement;
-    createElement(tagName: "dd"): HTMLDDElement;
     createElement(tagName: "del"): HTMLModElement;
-    createElement(tagName: "dfn"): HTMLPhraseElement;
     createElement(tagName: "dir"): HTMLDirectoryElement;
     createElement(tagName: "div"): HTMLDivElement;
     createElement(tagName: "dl"): HTMLDListElement;
-    createElement(tagName: "dt"): HTMLDTElement;
-    createElement(tagName: "em"): HTMLPhraseElement;
     createElement(tagName: "embed"): HTMLEmbedElement;
     createElement(tagName: "fieldset"): HTMLFieldSetElement;
     createElement(tagName: "font"): HTMLFontElement;
@@ -6174,52 +6940,41 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     createElement(tagName: "head"): HTMLHeadElement;
     createElement(tagName: "hr"): HTMLHRElement;
     createElement(tagName: "html"): HTMLHtmlElement;
-    createElement(tagName: "i"): HTMLPhraseElement;
     createElement(tagName: "iframe"): HTMLIFrameElement;
     createElement(tagName: "img"): HTMLImageElement;
     createElement(tagName: "input"): HTMLInputElement;
     createElement(tagName: "ins"): HTMLModElement;
-    createElement(tagName: "isindex"): HTMLIsIndexElement;
-    createElement(tagName: "kbd"): HTMLPhraseElement;
-    createElement(tagName: "keygen"): HTMLBlockElement;
+    createElement(tagName: "isindex"): HTMLUnknownElement;
     createElement(tagName: "label"): HTMLLabelElement;
     createElement(tagName: "legend"): HTMLLegendElement;
     createElement(tagName: "li"): HTMLLIElement;
     createElement(tagName: "link"): HTMLLinkElement;
-    createElement(tagName: "listing"): HTMLBlockElement;
+    createElement(tagName: "listing"): HTMLPreElement;
     createElement(tagName: "map"): HTMLMapElement;
     createElement(tagName: "marquee"): HTMLMarqueeElement;
     createElement(tagName: "menu"): HTMLMenuElement;
     createElement(tagName: "meta"): HTMLMetaElement;
-    createElement(tagName: "nextid"): HTMLNextIdElement;
-    createElement(tagName: "nobr"): HTMLPhraseElement;
+    createElement(tagName: "meter"): HTMLMeterElement;
+    createElement(tagName: "nextid"): HTMLUnknownElement;
     createElement(tagName: "object"): HTMLObjectElement;
     createElement(tagName: "ol"): HTMLOListElement;
     createElement(tagName: "optgroup"): HTMLOptGroupElement;
     createElement(tagName: "option"): HTMLOptionElement;
     createElement(tagName: "p"): HTMLParagraphElement;
     createElement(tagName: "param"): HTMLParamElement;
-    createElement(tagName: "plaintext"): HTMLBlockElement;
+    createElement(tagName: "picture"): HTMLPictureElement;
     createElement(tagName: "pre"): HTMLPreElement;
     createElement(tagName: "progress"): HTMLProgressElement;
     createElement(tagName: "q"): HTMLQuoteElement;
-    createElement(tagName: "rt"): HTMLPhraseElement;
-    createElement(tagName: "ruby"): HTMLPhraseElement;
-    createElement(tagName: "s"): HTMLPhraseElement;
-    createElement(tagName: "samp"): HTMLPhraseElement;
     createElement(tagName: "script"): HTMLScriptElement;
     createElement(tagName: "select"): HTMLSelectElement;
-    createElement(tagName: "small"): HTMLPhraseElement;
     createElement(tagName: "source"): HTMLSourceElement;
     createElement(tagName: "span"): HTMLSpanElement;
-    createElement(tagName: "strike"): HTMLPhraseElement;
-    createElement(tagName: "strong"): HTMLPhraseElement;
     createElement(tagName: "style"): HTMLStyleElement;
-    createElement(tagName: "sub"): HTMLPhraseElement;
-    createElement(tagName: "sup"): HTMLPhraseElement;
     createElement(tagName: "table"): HTMLTableElement;
     createElement(tagName: "tbody"): HTMLTableSectionElement;
     createElement(tagName: "td"): HTMLTableDataCellElement;
+    createElement(tagName: "template"): HTMLTemplateElement;
     createElement(tagName: "textarea"): HTMLTextAreaElement;
     createElement(tagName: "tfoot"): HTMLTableSectionElement;
     createElement(tagName: "th"): HTMLTableHeaderCellElement;
@@ -6227,13 +6982,10 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     createElement(tagName: "title"): HTMLTitleElement;
     createElement(tagName: "tr"): HTMLTableRowElement;
     createElement(tagName: "track"): HTMLTrackElement;
-    createElement(tagName: "tt"): HTMLPhraseElement;
-    createElement(tagName: "u"): HTMLPhraseElement;
     createElement(tagName: "ul"): HTMLUListElement;
-    createElement(tagName: "var"): HTMLPhraseElement;
     createElement(tagName: "video"): HTMLVideoElement;
     createElement(tagName: "x-ms-webview"): MSHTMLWebViewElement;
-    createElement(tagName: "xmp"): HTMLBlockElement;
+    createElement(tagName: "xmp"): HTMLPreElement;
     createElement(tagName: string): HTMLElement;
     createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "a"): SVGAElement
     createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "circle"): SVGCircleElement
@@ -6318,7 +7070,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * @param data String that specifies the nodeValue property of the text node.
       */
     createTextNode(data: string): Text;
-    createTouch(view: any, target: EventTarget, identifier: number, pageX: number, pageY: number, screenX: number, screenY: number): Touch;
+    createTouch(view: Window, target: EventTarget, identifier: number, pageX: number, pageY: number, screenX: number, screenY: number): Touch;
     createTouchList(...touches: Touch[]): TouchList;
     /**
       * Creates a TreeWalker object that you can use to traverse filtered lists of nodes or elements in a document.
@@ -6369,44 +7121,44 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * @param name Specifies the name of an element.
       */
     getElementsByTagName(tagname: "a"): NodeListOf<HTMLAnchorElement>;
-    getElementsByTagName(tagname: "abbr"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "acronym"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "address"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "abbr"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "acronym"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "address"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "applet"): NodeListOf<HTMLAppletElement>;
     getElementsByTagName(tagname: "area"): NodeListOf<HTMLAreaElement>;
     getElementsByTagName(tagname: "article"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "aside"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "audio"): NodeListOf<HTMLAudioElement>;
-    getElementsByTagName(tagname: "b"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "b"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "base"): NodeListOf<HTMLBaseElement>;
     getElementsByTagName(tagname: "basefont"): NodeListOf<HTMLBaseFontElement>;
-    getElementsByTagName(tagname: "bdo"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "big"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "blockquote"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "bdo"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "big"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "blockquote"): NodeListOf<HTMLQuoteElement>;
     getElementsByTagName(tagname: "body"): NodeListOf<HTMLBodyElement>;
     getElementsByTagName(tagname: "br"): NodeListOf<HTMLBRElement>;
     getElementsByTagName(tagname: "button"): NodeListOf<HTMLButtonElement>;
     getElementsByTagName(tagname: "canvas"): NodeListOf<HTMLCanvasElement>;
     getElementsByTagName(tagname: "caption"): NodeListOf<HTMLTableCaptionElement>;
-    getElementsByTagName(tagname: "center"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "center"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "circle"): NodeListOf<SVGCircleElement>;
-    getElementsByTagName(tagname: "cite"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "cite"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "clippath"): NodeListOf<SVGClipPathElement>;
-    getElementsByTagName(tagname: "code"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "code"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "col"): NodeListOf<HTMLTableColElement>;
     getElementsByTagName(tagname: "colgroup"): NodeListOf<HTMLTableColElement>;
     getElementsByTagName(tagname: "datalist"): NodeListOf<HTMLDataListElement>;
-    getElementsByTagName(tagname: "dd"): NodeListOf<HTMLDDElement>;
+    getElementsByTagName(tagname: "dd"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "defs"): NodeListOf<SVGDefsElement>;
     getElementsByTagName(tagname: "del"): NodeListOf<HTMLModElement>;
     getElementsByTagName(tagname: "desc"): NodeListOf<SVGDescElement>;
-    getElementsByTagName(tagname: "dfn"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "dfn"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "dir"): NodeListOf<HTMLDirectoryElement>;
     getElementsByTagName(tagname: "div"): NodeListOf<HTMLDivElement>;
     getElementsByTagName(tagname: "dl"): NodeListOf<HTMLDListElement>;
-    getElementsByTagName(tagname: "dt"): NodeListOf<HTMLDTElement>;
+    getElementsByTagName(tagname: "dt"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "ellipse"): NodeListOf<SVGEllipseElement>;
-    getElementsByTagName(tagname: "em"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "em"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "embed"): NodeListOf<HTMLEmbedElement>;
     getElementsByTagName(tagname: "feblend"): NodeListOf<SVGFEBlendElement>;
     getElementsByTagName(tagname: "fecolormatrix"): NodeListOf<SVGFEColorMatrixElement>;
@@ -6454,22 +7206,22 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     getElementsByTagName(tagname: "hgroup"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "hr"): NodeListOf<HTMLHRElement>;
     getElementsByTagName(tagname: "html"): NodeListOf<HTMLHtmlElement>;
-    getElementsByTagName(tagname: "i"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "i"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "iframe"): NodeListOf<HTMLIFrameElement>;
     getElementsByTagName(tagname: "image"): NodeListOf<SVGImageElement>;
     getElementsByTagName(tagname: "img"): NodeListOf<HTMLImageElement>;
     getElementsByTagName(tagname: "input"): NodeListOf<HTMLInputElement>;
     getElementsByTagName(tagname: "ins"): NodeListOf<HTMLModElement>;
-    getElementsByTagName(tagname: "isindex"): NodeListOf<HTMLIsIndexElement>;
-    getElementsByTagName(tagname: "kbd"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "keygen"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "isindex"): NodeListOf<HTMLUnknownElement>;
+    getElementsByTagName(tagname: "kbd"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "keygen"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "label"): NodeListOf<HTMLLabelElement>;
     getElementsByTagName(tagname: "legend"): NodeListOf<HTMLLegendElement>;
     getElementsByTagName(tagname: "li"): NodeListOf<HTMLLIElement>;
     getElementsByTagName(tagname: "line"): NodeListOf<SVGLineElement>;
     getElementsByTagName(tagname: "lineargradient"): NodeListOf<SVGLinearGradientElement>;
     getElementsByTagName(tagname: "link"): NodeListOf<HTMLLinkElement>;
-    getElementsByTagName(tagname: "listing"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "listing"): NodeListOf<HTMLPreElement>;
     getElementsByTagName(tagname: "map"): NodeListOf<HTMLMapElement>;
     getElementsByTagName(tagname: "mark"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "marker"): NodeListOf<SVGMarkerElement>;
@@ -6478,9 +7230,10 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     getElementsByTagName(tagname: "menu"): NodeListOf<HTMLMenuElement>;
     getElementsByTagName(tagname: "meta"): NodeListOf<HTMLMetaElement>;
     getElementsByTagName(tagname: "metadata"): NodeListOf<SVGMetadataElement>;
+    getElementsByTagName(tagname: "meter"): NodeListOf<HTMLMeterElement>;
     getElementsByTagName(tagname: "nav"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "nextid"): NodeListOf<HTMLNextIdElement>;
-    getElementsByTagName(tagname: "nobr"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "nextid"): NodeListOf<HTMLUnknownElement>;
+    getElementsByTagName(tagname: "nobr"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "noframes"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "noscript"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "object"): NodeListOf<HTMLObjectElement>;
@@ -6491,7 +7244,8 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     getElementsByTagName(tagname: "param"): NodeListOf<HTMLParamElement>;
     getElementsByTagName(tagname: "path"): NodeListOf<SVGPathElement>;
     getElementsByTagName(tagname: "pattern"): NodeListOf<SVGPatternElement>;
-    getElementsByTagName(tagname: "plaintext"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "picture"): NodeListOf<HTMLPictureElement>;
+    getElementsByTagName(tagname: "plaintext"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "polygon"): NodeListOf<SVGPolygonElement>;
     getElementsByTagName(tagname: "polyline"): NodeListOf<SVGPolylineElement>;
     getElementsByTagName(tagname: "pre"): NodeListOf<HTMLPreElement>;
@@ -6499,28 +7253,29 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     getElementsByTagName(tagname: "q"): NodeListOf<HTMLQuoteElement>;
     getElementsByTagName(tagname: "radialgradient"): NodeListOf<SVGRadialGradientElement>;
     getElementsByTagName(tagname: "rect"): NodeListOf<SVGRectElement>;
-    getElementsByTagName(tagname: "rt"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "ruby"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "s"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "samp"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "rt"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "ruby"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "s"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "samp"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "script"): NodeListOf<HTMLScriptElement>;
     getElementsByTagName(tagname: "section"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "select"): NodeListOf<HTMLSelectElement>;
-    getElementsByTagName(tagname: "small"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "small"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "source"): NodeListOf<HTMLSourceElement>;
     getElementsByTagName(tagname: "span"): NodeListOf<HTMLSpanElement>;
     getElementsByTagName(tagname: "stop"): NodeListOf<SVGStopElement>;
-    getElementsByTagName(tagname: "strike"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "strong"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "strike"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "strong"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "style"): NodeListOf<HTMLStyleElement>;
-    getElementsByTagName(tagname: "sub"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "sup"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "sub"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "sup"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "svg"): NodeListOf<SVGSVGElement>;
     getElementsByTagName(tagname: "switch"): NodeListOf<SVGSwitchElement>;
     getElementsByTagName(tagname: "symbol"): NodeListOf<SVGSymbolElement>;
     getElementsByTagName(tagname: "table"): NodeListOf<HTMLTableElement>;
     getElementsByTagName(tagname: "tbody"): NodeListOf<HTMLTableSectionElement>;
     getElementsByTagName(tagname: "td"): NodeListOf<HTMLTableDataCellElement>;
+    getElementsByTagName(tagname: "template"): NodeListOf<HTMLTemplateElement>;
     getElementsByTagName(tagname: "text"): NodeListOf<SVGTextElement>;
     getElementsByTagName(tagname: "textpath"): NodeListOf<SVGTextPathElement>;
     getElementsByTagName(tagname: "textarea"): NodeListOf<HTMLTextAreaElement>;
@@ -6531,16 +7286,16 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     getElementsByTagName(tagname: "tr"): NodeListOf<HTMLTableRowElement>;
     getElementsByTagName(tagname: "track"): NodeListOf<HTMLTrackElement>;
     getElementsByTagName(tagname: "tspan"): NodeListOf<SVGTSpanElement>;
-    getElementsByTagName(tagname: "tt"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "u"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "tt"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "u"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "ul"): NodeListOf<HTMLUListElement>;
     getElementsByTagName(tagname: "use"): NodeListOf<SVGUseElement>;
-    getElementsByTagName(tagname: "var"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "var"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "video"): NodeListOf<HTMLVideoElement>;
     getElementsByTagName(tagname: "view"): NodeListOf<SVGViewElement>;
     getElementsByTagName(tagname: "wbr"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "x-ms-webview"): NodeListOf<MSHTMLWebViewElement>;
-    getElementsByTagName(tagname: "xmp"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "xmp"): NodeListOf<HTMLPreElement>;
     getElementsByTagName(tagname: string): NodeListOf<Element>;
     getElementsByTagNameNS(namespaceURI: string, localName: string): NodeListOf<Element>;
     /**
@@ -6552,8 +7307,8 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       */
     hasFocus(): boolean;
     importNode(importedNode: Node, deep: boolean): Node;
-    msElementsFromPoint(x: number, y: number): NodeList;
-    msElementsFromRect(left: number, top: number, width: number, height: number): NodeList;
+    msElementsFromPoint(x: number, y: number): NodeListOf<Element>;
+    msElementsFromRect(left: number, top: number, width: number, height: number): NodeListOf<Element>;
     /**
       * Opens a new window and loads a document specified by a given URL. Also, opens a new window that uses the url parameter and the name parameter to collect the output of the write method and the writeln method.
       * @param url Specifies a MIME type for the document.
@@ -6649,12 +7404,13 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "fullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "fullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -6667,7 +7423,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mssitemodejumplistitemremoved", listener: (ev: MSSiteModeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "msthumbnailclick", listener: (ev: MSSiteModeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -6691,6 +7447,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "selectionchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "selectstart", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "stop", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -6724,12 +7481,12 @@ declare var DocumentFragment: {
 }
 
 interface DocumentType extends Node, ChildNode {
-    entities: NamedNodeMap;
-    internalSubset: string;
-    name: string;
-    notations: NamedNodeMap;
-    publicId: string;
-    systemId: string;
+    readonly entities: NamedNodeMap;
+    readonly internalSubset: string;
+    readonly name: string;
+    readonly notations: NamedNodeMap;
+    readonly publicId: string;
+    readonly systemId: string;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6739,7 +7496,7 @@ declare var DocumentType: {
 }
 
 interface DragEvent extends MouseEvent {
-    dataTransfer: DataTransfer;
+    readonly dataTransfer: DataTransfer;
     initDragEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget, dataTransferArg: DataTransfer): void;
     msConvertURL(file: File, targetType: string, targetURL?: string): void;
 }
@@ -6750,12 +7507,12 @@ declare var DragEvent: {
 }
 
 interface DynamicsCompressorNode extends AudioNode {
-    attack: AudioParam;
-    knee: AudioParam;
-    ratio: AudioParam;
-    reduction: AudioParam;
-    release: AudioParam;
-    threshold: AudioParam;
+    readonly attack: AudioParam;
+    readonly knee: AudioParam;
+    readonly ratio: AudioParam;
+    readonly reduction: AudioParam;
+    readonly release: AudioParam;
+    readonly threshold: AudioParam;
 }
 
 declare var DynamicsCompressorNode: {
@@ -6763,26 +7520,36 @@ declare var DynamicsCompressorNode: {
     new(): DynamicsCompressorNode;
 }
 
+interface EXT_frag_depth {
+}
+
+declare var EXT_frag_depth: {
+    prototype: EXT_frag_depth;
+    new(): EXT_frag_depth;
+}
+
 interface EXT_texture_filter_anisotropic {
-    MAX_TEXTURE_MAX_ANISOTROPY_EXT: number;
-    TEXTURE_MAX_ANISOTROPY_EXT: number;
+    readonly MAX_TEXTURE_MAX_ANISOTROPY_EXT: number;
+    readonly TEXTURE_MAX_ANISOTROPY_EXT: number;
 }
 
 declare var EXT_texture_filter_anisotropic: {
     prototype: EXT_texture_filter_anisotropic;
     new(): EXT_texture_filter_anisotropic;
-    MAX_TEXTURE_MAX_ANISOTROPY_EXT: number;
-    TEXTURE_MAX_ANISOTROPY_EXT: number;
+    readonly MAX_TEXTURE_MAX_ANISOTROPY_EXT: number;
+    readonly TEXTURE_MAX_ANISOTROPY_EXT: number;
 }
 
 interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelector, ChildNode {
-    classList: DOMTokenList;
-    clientHeight: number;
-    clientLeft: number;
-    clientTop: number;
-    clientWidth: number;
+    readonly classList: DOMTokenList;
+    className: string;
+    readonly clientHeight: number;
+    readonly clientLeft: number;
+    readonly clientTop: number;
+    readonly clientWidth: number;
+    id: string;
     msContentZoomFactor: number;
-    msRegionOverflow: string;
+    readonly msRegionOverflow: string;
     onariarequest: (ev: AriaRequestEvent) => any;
     oncommand: (ev: CommandEvent) => any;
     ongotpointercapture: (ev: PointerEvent) => any;
@@ -6810,13 +7577,12 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     ontouchstart: (ev: TouchEvent) => any;
     onwebkitfullscreenchange: (ev: Event) => any;
     onwebkitfullscreenerror: (ev: Event) => any;
-    scrollHeight: number;
+    readonly prefix: string;
+    readonly scrollHeight: number;
     scrollLeft: number;
     scrollTop: number;
-    scrollWidth: number;
-    tagName: string;
-    id: string;
-    className: string;
+    readonly scrollWidth: number;
+    readonly tagName: string;
     innerHTML: string;
     getAttribute(name?: string): string;
     getAttributeNS(namespaceURI: string, localName: string): string;
@@ -6825,44 +7591,44 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     getBoundingClientRect(): ClientRect;
     getClientRects(): ClientRectList;
     getElementsByTagName(name: "a"): NodeListOf<HTMLAnchorElement>;
-    getElementsByTagName(name: "abbr"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "acronym"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "address"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "abbr"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "acronym"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "address"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "applet"): NodeListOf<HTMLAppletElement>;
     getElementsByTagName(name: "area"): NodeListOf<HTMLAreaElement>;
     getElementsByTagName(name: "article"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "aside"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "audio"): NodeListOf<HTMLAudioElement>;
-    getElementsByTagName(name: "b"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "b"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "base"): NodeListOf<HTMLBaseElement>;
     getElementsByTagName(name: "basefont"): NodeListOf<HTMLBaseFontElement>;
-    getElementsByTagName(name: "bdo"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "big"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "blockquote"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "bdo"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "big"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "blockquote"): NodeListOf<HTMLQuoteElement>;
     getElementsByTagName(name: "body"): NodeListOf<HTMLBodyElement>;
     getElementsByTagName(name: "br"): NodeListOf<HTMLBRElement>;
     getElementsByTagName(name: "button"): NodeListOf<HTMLButtonElement>;
     getElementsByTagName(name: "canvas"): NodeListOf<HTMLCanvasElement>;
     getElementsByTagName(name: "caption"): NodeListOf<HTMLTableCaptionElement>;
-    getElementsByTagName(name: "center"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "center"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "circle"): NodeListOf<SVGCircleElement>;
-    getElementsByTagName(name: "cite"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "cite"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "clippath"): NodeListOf<SVGClipPathElement>;
-    getElementsByTagName(name: "code"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "code"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "col"): NodeListOf<HTMLTableColElement>;
     getElementsByTagName(name: "colgroup"): NodeListOf<HTMLTableColElement>;
     getElementsByTagName(name: "datalist"): NodeListOf<HTMLDataListElement>;
-    getElementsByTagName(name: "dd"): NodeListOf<HTMLDDElement>;
+    getElementsByTagName(name: "dd"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "defs"): NodeListOf<SVGDefsElement>;
     getElementsByTagName(name: "del"): NodeListOf<HTMLModElement>;
     getElementsByTagName(name: "desc"): NodeListOf<SVGDescElement>;
-    getElementsByTagName(name: "dfn"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "dfn"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "dir"): NodeListOf<HTMLDirectoryElement>;
     getElementsByTagName(name: "div"): NodeListOf<HTMLDivElement>;
     getElementsByTagName(name: "dl"): NodeListOf<HTMLDListElement>;
-    getElementsByTagName(name: "dt"): NodeListOf<HTMLDTElement>;
+    getElementsByTagName(name: "dt"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "ellipse"): NodeListOf<SVGEllipseElement>;
-    getElementsByTagName(name: "em"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "em"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "embed"): NodeListOf<HTMLEmbedElement>;
     getElementsByTagName(name: "feblend"): NodeListOf<SVGFEBlendElement>;
     getElementsByTagName(name: "fecolormatrix"): NodeListOf<SVGFEColorMatrixElement>;
@@ -6910,22 +7676,22 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     getElementsByTagName(name: "hgroup"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "hr"): NodeListOf<HTMLHRElement>;
     getElementsByTagName(name: "html"): NodeListOf<HTMLHtmlElement>;
-    getElementsByTagName(name: "i"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "i"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "iframe"): NodeListOf<HTMLIFrameElement>;
     getElementsByTagName(name: "image"): NodeListOf<SVGImageElement>;
     getElementsByTagName(name: "img"): NodeListOf<HTMLImageElement>;
     getElementsByTagName(name: "input"): NodeListOf<HTMLInputElement>;
     getElementsByTagName(name: "ins"): NodeListOf<HTMLModElement>;
-    getElementsByTagName(name: "isindex"): NodeListOf<HTMLIsIndexElement>;
-    getElementsByTagName(name: "kbd"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "keygen"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "isindex"): NodeListOf<HTMLUnknownElement>;
+    getElementsByTagName(name: "kbd"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "keygen"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "label"): NodeListOf<HTMLLabelElement>;
     getElementsByTagName(name: "legend"): NodeListOf<HTMLLegendElement>;
     getElementsByTagName(name: "li"): NodeListOf<HTMLLIElement>;
     getElementsByTagName(name: "line"): NodeListOf<SVGLineElement>;
     getElementsByTagName(name: "lineargradient"): NodeListOf<SVGLinearGradientElement>;
     getElementsByTagName(name: "link"): NodeListOf<HTMLLinkElement>;
-    getElementsByTagName(name: "listing"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "listing"): NodeListOf<HTMLPreElement>;
     getElementsByTagName(name: "map"): NodeListOf<HTMLMapElement>;
     getElementsByTagName(name: "mark"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "marker"): NodeListOf<SVGMarkerElement>;
@@ -6934,9 +7700,10 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     getElementsByTagName(name: "menu"): NodeListOf<HTMLMenuElement>;
     getElementsByTagName(name: "meta"): NodeListOf<HTMLMetaElement>;
     getElementsByTagName(name: "metadata"): NodeListOf<SVGMetadataElement>;
+    getElementsByTagName(name: "meter"): NodeListOf<HTMLMeterElement>;
     getElementsByTagName(name: "nav"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "nextid"): NodeListOf<HTMLNextIdElement>;
-    getElementsByTagName(name: "nobr"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "nextid"): NodeListOf<HTMLUnknownElement>;
+    getElementsByTagName(name: "nobr"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "noframes"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "noscript"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "object"): NodeListOf<HTMLObjectElement>;
@@ -6947,7 +7714,8 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     getElementsByTagName(name: "param"): NodeListOf<HTMLParamElement>;
     getElementsByTagName(name: "path"): NodeListOf<SVGPathElement>;
     getElementsByTagName(name: "pattern"): NodeListOf<SVGPatternElement>;
-    getElementsByTagName(name: "plaintext"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "picture"): NodeListOf<HTMLPictureElement>;
+    getElementsByTagName(name: "plaintext"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "polygon"): NodeListOf<SVGPolygonElement>;
     getElementsByTagName(name: "polyline"): NodeListOf<SVGPolylineElement>;
     getElementsByTagName(name: "pre"): NodeListOf<HTMLPreElement>;
@@ -6955,28 +7723,29 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     getElementsByTagName(name: "q"): NodeListOf<HTMLQuoteElement>;
     getElementsByTagName(name: "radialgradient"): NodeListOf<SVGRadialGradientElement>;
     getElementsByTagName(name: "rect"): NodeListOf<SVGRectElement>;
-    getElementsByTagName(name: "rt"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "ruby"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "s"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "samp"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "rt"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "ruby"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "s"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "samp"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "script"): NodeListOf<HTMLScriptElement>;
     getElementsByTagName(name: "section"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "select"): NodeListOf<HTMLSelectElement>;
-    getElementsByTagName(name: "small"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "small"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "source"): NodeListOf<HTMLSourceElement>;
     getElementsByTagName(name: "span"): NodeListOf<HTMLSpanElement>;
     getElementsByTagName(name: "stop"): NodeListOf<SVGStopElement>;
-    getElementsByTagName(name: "strike"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "strong"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "strike"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "strong"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "style"): NodeListOf<HTMLStyleElement>;
-    getElementsByTagName(name: "sub"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "sup"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "sub"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "sup"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "svg"): NodeListOf<SVGSVGElement>;
     getElementsByTagName(name: "switch"): NodeListOf<SVGSwitchElement>;
     getElementsByTagName(name: "symbol"): NodeListOf<SVGSymbolElement>;
     getElementsByTagName(name: "table"): NodeListOf<HTMLTableElement>;
     getElementsByTagName(name: "tbody"): NodeListOf<HTMLTableSectionElement>;
     getElementsByTagName(name: "td"): NodeListOf<HTMLTableDataCellElement>;
+    getElementsByTagName(name: "template"): NodeListOf<HTMLTemplateElement>;
     getElementsByTagName(name: "text"): NodeListOf<SVGTextElement>;
     getElementsByTagName(name: "textpath"): NodeListOf<SVGTextPathElement>;
     getElementsByTagName(name: "textarea"): NodeListOf<HTMLTextAreaElement>;
@@ -6987,16 +7756,16 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     getElementsByTagName(name: "tr"): NodeListOf<HTMLTableRowElement>;
     getElementsByTagName(name: "track"): NodeListOf<HTMLTrackElement>;
     getElementsByTagName(name: "tspan"): NodeListOf<SVGTSpanElement>;
-    getElementsByTagName(name: "tt"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "u"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "tt"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "u"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "ul"): NodeListOf<HTMLUListElement>;
     getElementsByTagName(name: "use"): NodeListOf<SVGUseElement>;
-    getElementsByTagName(name: "var"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "var"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "video"): NodeListOf<HTMLVideoElement>;
     getElementsByTagName(name: "view"): NodeListOf<SVGViewElement>;
     getElementsByTagName(name: "wbr"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "x-ms-webview"): NodeListOf<MSHTMLWebViewElement>;
-    getElementsByTagName(name: "xmp"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "xmp"): NodeListOf<HTMLPreElement>;
     getElementsByTagName(name: string): NodeListOf<Element>;
     getElementsByTagNameNS(namespaceURI: string, localName: string): NodeListOf<Element>;
     hasAttribute(name: string): boolean;
@@ -7069,11 +7838,11 @@ declare var Element: {
 }
 
 interface ErrorEvent extends Event {
-    colno: number;
-    error: any;
-    filename: string;
-    lineno: number;
-    message: string;
+    readonly colno: number;
+    readonly error: any;
+    readonly filename: string;
+    readonly lineno: number;
+    readonly message: string;
     initErrorEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, messageArg: string, filenameArg: string, linenoArg: number): void;
 }
 
@@ -7083,39 +7852,39 @@ declare var ErrorEvent: {
 }
 
 interface Event {
-    bubbles: boolean;
+    readonly bubbles: boolean;
     cancelBubble: boolean;
-    cancelable: boolean;
-    currentTarget: EventTarget;
-    defaultPrevented: boolean;
-    eventPhase: number;
-    isTrusted: boolean;
+    readonly cancelable: boolean;
+    readonly currentTarget: EventTarget;
+    readonly defaultPrevented: boolean;
+    readonly eventPhase: number;
+    readonly isTrusted: boolean;
     returnValue: boolean;
-    srcElement: Element;
-    target: EventTarget;
-    timeStamp: number;
-    type: string;
+    readonly srcElement: Element;
+    readonly target: EventTarget;
+    readonly timeStamp: number;
+    readonly type: string;
     initEvent(eventTypeArg: string, canBubbleArg: boolean, cancelableArg: boolean): void;
     preventDefault(): void;
     stopImmediatePropagation(): void;
     stopPropagation(): void;
-    AT_TARGET: number;
-    BUBBLING_PHASE: number;
-    CAPTURING_PHASE: number;
+    readonly AT_TARGET: number;
+    readonly BUBBLING_PHASE: number;
+    readonly CAPTURING_PHASE: number;
 }
 
 declare var Event: {
     prototype: Event;
     new(type: string, eventInitDict?: EventInit): Event;
-    AT_TARGET: number;
-    BUBBLING_PHASE: number;
-    CAPTURING_PHASE: number;
+    readonly AT_TARGET: number;
+    readonly BUBBLING_PHASE: number;
+    readonly CAPTURING_PHASE: number;
 }
 
 interface EventTarget {
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
     dispatchEvent(evt: Event): boolean;
-    removeEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var EventTarget: {
@@ -7132,8 +7901,9 @@ declare var External: {
 }
 
 interface File extends Blob {
-    lastModifiedDate: any;
-    name: string;
+    readonly lastModifiedDate: any;
+    readonly name: string;
+    readonly webkitRelativePath: string;
 }
 
 declare var File: {
@@ -7142,7 +7912,7 @@ declare var File: {
 }
 
 interface FileList {
-    length: number;
+    readonly length: number;
     item(index: number): File;
     [index: number]: File;
 }
@@ -7153,7 +7923,7 @@ declare var FileList: {
 }
 
 interface FileReader extends EventTarget, MSBaseReader {
-    error: DOMError;
+    readonly error: DOMError;
     readAsArrayBuffer(blob: Blob): void;
     readAsBinaryString(blob: Blob): void;
     readAsDataURL(blob: Blob): void;
@@ -7167,7 +7937,7 @@ declare var FileReader: {
 }
 
 interface FocusEvent extends UIEvent {
-    relatedTarget: EventTarget;
+    readonly relatedTarget: EventTarget;
     initFocusEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, relatedTargetArg: EventTarget): void;
 }
 
@@ -7186,7 +7956,7 @@ declare var FormData: {
 }
 
 interface GainNode extends AudioNode {
-    gain: AudioParam;
+    readonly gain: AudioParam;
 }
 
 declare var GainNode: {
@@ -7195,13 +7965,13 @@ declare var GainNode: {
 }
 
 interface Gamepad {
-    axes: number[];
-    buttons: GamepadButton[];
-    connected: boolean;
-    id: string;
-    index: number;
-    mapping: string;
-    timestamp: number;
+    readonly axes: number[];
+    readonly buttons: GamepadButton[];
+    readonly connected: boolean;
+    readonly id: string;
+    readonly index: number;
+    readonly mapping: string;
+    readonly timestamp: number;
 }
 
 declare var Gamepad: {
@@ -7210,8 +7980,8 @@ declare var Gamepad: {
 }
 
 interface GamepadButton {
-    pressed: boolean;
-    value: number;
+    readonly pressed: boolean;
+    readonly value: number;
 }
 
 declare var GamepadButton: {
@@ -7220,7 +7990,7 @@ declare var GamepadButton: {
 }
 
 interface GamepadEvent extends Event {
-    gamepad: Gamepad;
+    readonly gamepad: Gamepad;
 }
 
 declare var GamepadEvent: {
@@ -7258,6 +8028,7 @@ interface HTMLAnchorElement extends HTMLElement {
       * Sets or retrieves the coordinates of the object.
       */
     coords: string;
+    download: string;
     /**
       * Contains the anchor portion of the URL including the hash sign (#).
       */
@@ -7278,12 +8049,12 @@ interface HTMLAnchorElement extends HTMLElement {
       * Sets or retrieves the language code of the object.
       */
     hreflang: string;
-    mimeType: string;
+    readonly mimeType: string;
     /**
       * Sets or retrieves the shape of the object.
       */
     name: string;
-    nameProp: string;
+    readonly nameProp: string;
     /**
       * Contains the pathname of the URL.
       */
@@ -7296,7 +8067,7 @@ interface HTMLAnchorElement extends HTMLElement {
       * Contains the protocol of the URL.
       */
     protocol: string;
-    protocolLong: string;
+    readonly protocolLong: string;
     /**
       * Sets or retrieves the relationship between the object and the destination of the link.
       */
@@ -7338,7 +8109,7 @@ interface HTMLAppletElement extends HTMLElement {
     /**
       * Retrieves a string of the URL where the object tag can be found. This is often the href of the document that the object is in, or the value set by a base element.
       */
-    BaseHref: string;
+    readonly BaseHref: string;
     align: string;
     /**
       * Sets or retrieves a text alternative to the graphic.
@@ -7365,7 +8136,7 @@ interface HTMLAppletElement extends HTMLElement {
     /**
       * Address of a pointer to the document this page or frame contains. If there is no document, then null will be returned.
       */
-    contentDocument: Document;
+    readonly contentDocument: Document;
     /**
       * Sets or retrieves the URL that references the data of the object.
       */
@@ -7374,7 +8145,7 @@ interface HTMLAppletElement extends HTMLElement {
       * Sets or retrieves a character string that can be used to implement your own declare functionality for the object.
       */
     declare: boolean;
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the height of the object.
       */
@@ -7415,6 +8186,7 @@ interface HTMLAreaElement extends HTMLElement {
       * Sets or retrieves the coordinates of the object.
       */
     coords: string;
+    download: string;
     /**
       * Sets or retrieves the subsection of the href property that follows the number sign (#).
       */
@@ -7540,23 +8312,6 @@ declare var HTMLBaseFontElement: {
     new(): HTMLBaseFontElement;
 }
 
-interface HTMLBlockElement extends HTMLElement {
-    /**
-      * Sets or retrieves reference information about the object.
-      */
-    cite: string;
-    clear: string;
-    /**
-      * Sets or retrieves the width of the object.
-      */
-    width: number;
-}
-
-declare var HTMLBlockElement: {
-    prototype: HTMLBlockElement;
-    new(): HTMLBlockElement;
-}
-
 interface HTMLBodyElement extends HTMLElement {
     aLink: any;
     background: string;
@@ -7584,7 +8339,6 @@ interface HTMLBodyElement extends HTMLElement {
     onunload: (ev: Event) => any;
     text: any;
     vLink: any;
-    createTextRange(): TextRange;
     addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -7609,10 +8363,10 @@ interface HTMLBodyElement extends HTMLElement {
     addEventListener(type: "afterprint", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeprint", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeunload", listener: (ev: BeforeUnloadEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
@@ -7623,9 +8377,9 @@ interface HTMLBodyElement extends HTMLElement {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -7637,7 +8391,7 @@ interface HTMLBodyElement extends HTMLElement {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
@@ -7645,6 +8399,7 @@ interface HTMLBodyElement extends HTMLElement {
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "hashchange", listener: (ev: HashChangeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -7662,13 +8417,13 @@ interface HTMLBodyElement extends HTMLElement {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "offline", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "online", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "orientationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "pagehide", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pageshow", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -7722,7 +8477,7 @@ interface HTMLButtonElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Overrides the action attribute (where the data on a form is sent) on the parent form element.
       */
@@ -7755,11 +8510,11 @@ interface HTMLButtonElement extends HTMLElement {
     /**
       * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
       */
-    validationMessage: string;
+    readonly validationMessage: string;
     /**
       * Returns a  ValidityState object that represents the validity states of an element.
       */
-    validity: ValidityState;
+    readonly validity: ValidityState;
     /** 
       * Sets or retrieves the default or selected value of the control.
       */
@@ -7767,15 +8522,11 @@ interface HTMLButtonElement extends HTMLElement {
     /**
       * Returns whether an element will successfully validate based on forms validation rules and constraints.
       */
-    willValidate: boolean;
+    readonly willValidate: boolean;
     /**
       * Returns whether a form will validate when it is submitted, without having to submit it.
       */
     checkValidity(): boolean;
-    /**
-      * Creates a TextRange object for the element.
-      */
-    createTextRange(): TextRange;
     /**
       * Sets a custom error message that is displayed when a form is submitted.
       * @param error Sets a custom error message that is displayed when a form is submitted.
@@ -7825,11 +8576,11 @@ interface HTMLCollection {
     /**
       * Sets or retrieves the number of objects in a collection.
       */
-    length: number;
+    readonly length: number;
     /**
       * Retrieves an object from various collections.
       */
-    item(nameOrIndex?: any, optionalIndex?: any): Element;
+    item(index: number): Element;
     /**
       * Retrieves a select object or an object from an options collection.
       */
@@ -7842,18 +8593,6 @@ declare var HTMLCollection: {
     new(): HTMLCollection;
 }
 
-interface HTMLDDElement extends HTMLElement {
-    /**
-      * Sets or retrieves whether the browser automatically performs wordwrap.
-      */
-    noWrap: boolean;
-}
-
-declare var HTMLDDElement: {
-    prototype: HTMLDDElement;
-    new(): HTMLDDElement;
-}
-
 interface HTMLDListElement extends HTMLElement {
     compact: boolean;
 }
@@ -7863,20 +8602,8 @@ declare var HTMLDListElement: {
     new(): HTMLDListElement;
 }
 
-interface HTMLDTElement extends HTMLElement {
-    /**
-      * Sets or retrieves whether the browser automatically performs wordwrap.
-      */
-    noWrap: boolean;
-}
-
-declare var HTMLDTElement: {
-    prototype: HTMLDTElement;
-    new(): HTMLDTElement;
-}
-
 interface HTMLDataListElement extends HTMLElement {
-    options: HTMLCollection;
+    options: HTMLCollectionOf<HTMLOptionElement>;
 }
 
 declare var HTMLDataListElement: {
@@ -7919,38 +8646,38 @@ declare var HTMLDocument: {
 
 interface HTMLElement extends Element {
     accessKey: string;
-    children: HTMLCollection;
+    readonly children: HTMLCollection;
     contentEditable: string;
-    dataset: DOMStringMap;
+    readonly dataset: DOMStringMap;
     dir: string;
     draggable: boolean;
     hidden: boolean;
     hideFocus: boolean;
     innerHTML: string;
     innerText: string;
-    isContentEditable: boolean;
+    readonly isContentEditable: boolean;
     lang: string;
-    offsetHeight: number;
-    offsetLeft: number;
-    offsetParent: Element;
-    offsetTop: number;
-    offsetWidth: number;
+    readonly offsetHeight: number;
+    readonly offsetLeft: number;
+    readonly offsetParent: Element;
+    readonly offsetTop: number;
+    readonly offsetWidth: number;
     onabort: (ev: Event) => any;
     onactivate: (ev: UIEvent) => any;
     onbeforeactivate: (ev: UIEvent) => any;
-    onbeforecopy: (ev: DragEvent) => any;
-    onbeforecut: (ev: DragEvent) => any;
+    onbeforecopy: (ev: ClipboardEvent) => any;
+    onbeforecut: (ev: ClipboardEvent) => any;
     onbeforedeactivate: (ev: UIEvent) => any;
-    onbeforepaste: (ev: DragEvent) => any;
+    onbeforepaste: (ev: ClipboardEvent) => any;
     onblur: (ev: FocusEvent) => any;
     oncanplay: (ev: Event) => any;
     oncanplaythrough: (ev: Event) => any;
     onchange: (ev: Event) => any;
     onclick: (ev: MouseEvent) => any;
     oncontextmenu: (ev: PointerEvent) => any;
-    oncopy: (ev: DragEvent) => any;
+    oncopy: (ev: ClipboardEvent) => any;
     oncuechange: (ev: Event) => any;
-    oncut: (ev: DragEvent) => any;
+    oncut: (ev: ClipboardEvent) => any;
     ondblclick: (ev: MouseEvent) => any;
     ondeactivate: (ev: UIEvent) => any;
     ondrag: (ev: DragEvent) => any;
@@ -7962,10 +8689,11 @@ interface HTMLElement extends Element {
     ondrop: (ev: DragEvent) => any;
     ondurationchange: (ev: Event) => any;
     onemptied: (ev: Event) => any;
-    onended: (ev: Event) => any;
+    onended: (ev: MediaStreamErrorEvent) => any;
     onerror: (ev: Event) => any;
     onfocus: (ev: FocusEvent) => any;
     oninput: (ev: Event) => any;
+    oninvalid: (ev: Event) => any;
     onkeydown: (ev: KeyboardEvent) => any;
     onkeypress: (ev: KeyboardEvent) => any;
     onkeyup: (ev: KeyboardEvent) => any;
@@ -7980,10 +8708,10 @@ interface HTMLElement extends Element {
     onmouseout: (ev: MouseEvent) => any;
     onmouseover: (ev: MouseEvent) => any;
     onmouseup: (ev: MouseEvent) => any;
-    onmousewheel: (ev: MouseWheelEvent) => any;
+    onmousewheel: (ev: WheelEvent) => any;
     onmscontentzoom: (ev: UIEvent) => any;
     onmsmanipulationstatechanged: (ev: MSManipulationEvent) => any;
-    onpaste: (ev: DragEvent) => any;
+    onpaste: (ev: ClipboardEvent) => any;
     onpause: (ev: Event) => any;
     onplay: (ev: Event) => any;
     onplaying: (ev: Event) => any;
@@ -8004,7 +8732,7 @@ interface HTMLElement extends Element {
     outerHTML: string;
     outerText: string;
     spellcheck: boolean;
-    style: CSSStyleDeclaration;
+    readonly style: CSSStyleDeclaration;
     tabIndex: number;
     title: string;
     blur(): void;
@@ -8040,10 +8768,10 @@ interface HTMLElement extends Element {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -8051,9 +8779,9 @@ interface HTMLElement extends Element {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -8065,11 +8793,12 @@ interface HTMLElement extends Element {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -8085,8 +8814,8 @@ interface HTMLElement extends Element {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -8148,7 +8877,7 @@ interface HTMLEmbedElement extends HTMLElement, GetSVGDocument {
     /**
       * Gets the source associated with the media element for use by the PlayToManager.
       */
-    msPlayToSource: any;
+    readonly msPlayToSource: any;
     /**
       * Sets or retrieves the name of the object.
       */
@@ -8156,12 +8885,12 @@ interface HTMLEmbedElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves the palette used for the embedded document.
       */
-    palette: string;
+    readonly palette: string;
     /**
       * Retrieves the URL of the plug-in used to view an embedded document.
       */
-    pluginspage: string;
-    readyState: string;
+    readonly pluginspage: string;
+    readonly readyState: string;
     /**
       * Sets or retrieves a URL to be loaded by the object.
       */
@@ -8191,19 +8920,19 @@ interface HTMLFieldSetElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
       */
-    validationMessage: string;
+    readonly validationMessage: string;
     /**
       * Returns a  ValidityState object that represents the validity states of an element.
       */
-    validity: ValidityState;
+    readonly validity: ValidityState;
     /**
       * Returns whether an element will successfully validate based on forms validation rules and constraints.
       */
-    willValidate: boolean;
+    readonly willValidate: boolean;
     /**
       * Returns whether a form will validate when it is submitted, without having to submit it.
       */
@@ -8249,7 +8978,7 @@ interface HTMLFormElement extends HTMLElement {
     /**
       * Retrieves a collection, in source order, of all controls in a given form.
       */
-    elements: HTMLCollection;
+    readonly elements: HTMLCollection;
     /**
       * Sets or retrieves the MIME encoding for the form.
       */
@@ -8261,7 +8990,7 @@ interface HTMLFormElement extends HTMLElement {
     /**
       * Sets or retrieves the number of objects in a collection.
       */
-    length: number;
+    readonly length: number;
     /**
       * Sets or retrieves how to send the form data to the server.
       */
@@ -8320,11 +9049,11 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves the document object of the page or frame.
       */
-    contentDocument: Document;
+    readonly contentDocument: Document;
     /**
       * Retrieves the object of the specified.
       */
-    contentWindow: Window;
+    readonly contentWindow: Window;
     /**
       * Sets or retrieves whether to display a border for the frame.
       */
@@ -8365,10 +9094,6 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
       * Sets or retrieves whether the frame can be scrolled.
       */
     scrolling: string;
-    /**
-      * Sets the value indicating whether the source file of a frame or iframe has specific security restrictions applied.
-      */
-    security: any;
     /**
       * Sets or retrieves a URL to be loaded by the object.
       */
@@ -8400,10 +9125,10 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -8411,9 +9136,9 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -8425,11 +9150,12 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -8446,8 +9172,8 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -8557,10 +9283,10 @@ interface HTMLFrameSetElement extends HTMLElement {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeprint", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeunload", listener: (ev: BeforeUnloadEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
@@ -8571,9 +9297,9 @@ interface HTMLFrameSetElement extends HTMLElement {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -8585,7 +9311,7 @@ interface HTMLFrameSetElement extends HTMLElement {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
@@ -8593,6 +9319,7 @@ interface HTMLFrameSetElement extends HTMLElement {
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "hashchange", listener: (ev: HashChangeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -8610,13 +9337,13 @@ interface HTMLFrameSetElement extends HTMLElement {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "offline", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "online", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "orientationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "pagehide", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pageshow", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -8695,7 +9422,6 @@ interface HTMLHeadingElement extends HTMLElement {
       * Sets or retrieves a value that indicates the table alignment.
       */
     align: string;
-    clear: string;
 }
 
 declare var HTMLHeadingElement: {
@@ -8728,11 +9454,11 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves the document object of the page or frame.
       */
-    contentDocument: Document;
+    readonly contentDocument: Document;
     /**
       * Retrieves the object of the specified.
       */
-    contentWindow: Window;
+    readonly contentWindow: Window;
     /**
       * Sets or retrieves whether to display a border for the frame.
       */
@@ -8773,15 +9499,11 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
       * Raised when the object has been completely received from the server.
       */
     onload: (ev: Event) => any;
-    sandbox: DOMSettableTokenList;
+    readonly sandbox: DOMSettableTokenList;
     /**
       * Sets or retrieves whether the frame can be scrolled.
       */
     scrolling: string;
-    /**
-      * Sets the value indicating whether the source file of a frame or iframe has specific security restrictions applied.
-      */
-    security: any;
     /**
       * Sets or retrieves a URL to be loaded by the object.
       */
@@ -8817,10 +9539,10 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -8828,9 +9550,9 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -8842,11 +9564,12 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -8863,8 +9586,8 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -8921,9 +9644,9 @@ interface HTMLImageElement extends HTMLElement {
     /**
       * Retrieves whether the object is fully loaded.
       */
-    complete: boolean;
+    readonly complete: boolean;
     crossOrigin: string;
-    currentSrc: string;
+    readonly currentSrc: string;
     /**
       * Sets or retrieves the height of the object.
       */
@@ -8940,6 +9663,7 @@ interface HTMLImageElement extends HTMLElement {
       * Sets or retrieves a Uniform Resource Identifier (URI) to a long description of the object.
       */
     longDesc: string;
+    lowsrc: string;
     /**
       * Gets or sets whether the DLNA PlayTo device is available.
       */
@@ -8952,7 +9676,7 @@ interface HTMLImageElement extends HTMLElement {
     /**
       * Gets the source associated with the media element for use by the PlayToManager.
       */
-    msPlayToSource: any;
+    readonly msPlayToSource: any;
     /**
       * Sets or retrieves the name of the object.
       */
@@ -8960,11 +9684,12 @@ interface HTMLImageElement extends HTMLElement {
     /**
       * The original height of the image resource before sizing.
       */
-    naturalHeight: number;
+    readonly naturalHeight: number;
     /**
       * The original width of the image resource before sizing.
       */
-    naturalWidth: number;
+    readonly naturalWidth: number;
+    sizes: string;
     /**
       * The address or URL of the a media resource that is to be considered.
       */
@@ -8982,8 +9707,8 @@ interface HTMLImageElement extends HTMLElement {
       * Sets or retrieves the width of the object.
       */
     width: number;
-    x: number;
-    y: number;
+    readonly x: number;
+    readonly y: number;
     msGetAsCastingSource(): any;
 }
 
@@ -9025,7 +9750,7 @@ interface HTMLInputElement extends HTMLElement {
     /**
       * Retrieves whether the object is fully loaded.
       */
-    complete: boolean;
+    readonly complete: boolean;
     /**
       * Sets or retrieves the state of the check box or radio button.
       */
@@ -9038,11 +9763,11 @@ interface HTMLInputElement extends HTMLElement {
     /**
       * Returns a FileList object on a file type input object.
       */
-    files: FileList;
+    readonly files: FileList;
     /**
       * Retrieves a reference to the form that the object is embedded in. 
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Overrides the action attribute (where the data on a form is sent) on the parent form element.
       */
@@ -9075,7 +9800,7 @@ interface HTMLInputElement extends HTMLElement {
     /**
       * Specifies the ID of a pre-defined datalist of options for an input element.
       */
-    list: HTMLElement;
+    readonly list: HTMLElement;
     /**
       * Defines the maximum acceptable value for an input element with type="number".When used with the min and step attributes, lets you control the range and increment (such as only even numbers) that the user can enter into an input field.
       */
@@ -9109,6 +9834,7 @@ interface HTMLInputElement extends HTMLElement {
       * When present, marks an element that can't be submitted without a value.
       */
     required: boolean;
+    selectionDirection: string;
     /**
       * Gets or sets the end position or offset of a text selection.
       */
@@ -9138,11 +9864,11 @@ interface HTMLInputElement extends HTMLElement {
     /**
       * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
       */
-    validationMessage: string;
+    readonly validationMessage: string;
     /**
       * Returns a  ValidityState object that represents the validity states of an element.
       */
-    validity: ValidityState;
+    readonly validity: ValidityState;
     /**
       * Returns the value of the data at the cursor's current position.
       */
@@ -9156,6 +9882,7 @@ interface HTMLInputElement extends HTMLElement {
       * Sets or retrieves the vertical margin for the object.
       */
     vspace: number;
+    webkitdirectory: boolean;
     /**
       * Sets or retrieves the width of the object.
       */
@@ -9163,15 +9890,12 @@ interface HTMLInputElement extends HTMLElement {
     /**
       * Returns whether an element will successfully validate based on forms validation rules and constraints.
       */
-    willValidate: boolean;
+    readonly willValidate: boolean;
+    minLength: number;
     /**
       * Returns whether a form will validate when it is submitted, without having to submit it.
       */
     checkValidity(): boolean;
-    /**
-      * Creates a TextRange object for the element.
-      */
-    createTextRange(): TextRange;
     /**
       * Makes the selection equal to the current object.
       */
@@ -9186,7 +9910,7 @@ interface HTMLInputElement extends HTMLElement {
       * @param start The offset into the text field for the start of the selection.
       * @param end The offset into the text field for the end of the selection.
       */
-    setSelectionRange(start: number, end: number): void;
+    setSelectionRange(start?: number, end?: number, direction?: string): void;
     /**
       * Decrements a range input control's value by the value given by the Step attribute. If the optional parameter is used, it will decrement the input control's step value multiplied by the parameter's value.
       * @param n Value to decrement the value by.
@@ -9204,23 +9928,6 @@ declare var HTMLInputElement: {
     new(): HTMLInputElement;
 }
 
-interface HTMLIsIndexElement extends HTMLElement {
-    /**
-      * Sets or retrieves the URL to which the form content is sent for processing.
-      */
-    action: string;
-    /**
-      * Retrieves a reference to the form that the object is embedded in. 
-      */
-    form: HTMLFormElement;
-    prompt: string;
-}
-
-declare var HTMLIsIndexElement: {
-    prototype: HTMLIsIndexElement;
-    new(): HTMLIsIndexElement;
-}
-
 interface HTMLLIElement extends HTMLElement {
     type: string;
     /**
@@ -9238,7 +9945,7 @@ interface HTMLLabelElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the object to which the given label object is assigned.
       */
@@ -9258,7 +9965,7 @@ interface HTMLLegendElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
 }
 
 declare var HTMLLegendElement: {
@@ -9300,6 +10007,7 @@ interface HTMLLinkElement extends HTMLElement, LinkStyle {
       * Sets or retrieves the MIME type of the object.
       */
     type: string;
+    import?: Document;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9312,7 +10020,7 @@ interface HTMLMapElement extends HTMLElement {
     /**
       * Retrieves a collection of the area objects defined for the given map object.
       */
-    areas: HTMLAreasCollection;
+    readonly areas: HTMLAreasCollection;
     /**
       * Sets or retrieves the name of the object.
       */
@@ -9364,10 +10072,10 @@ interface HTMLMarqueeElement extends HTMLElement {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "bounce", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -9376,9 +10084,9 @@ interface HTMLMarqueeElement extends HTMLElement {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -9390,12 +10098,13 @@ interface HTMLMarqueeElement extends HTMLElement {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "finish", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -9411,8 +10120,8 @@ interface HTMLMarqueeElement extends HTMLElement {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -9458,7 +10167,7 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Returns an AudioTrackList object with the audio tracks for a given video element.
       */
-    audioTracks: AudioTrackList;
+    readonly audioTracks: AudioTrackList;
     /**
       * Gets or sets a value that indicates whether to start playing the media automatically.
       */
@@ -9466,15 +10175,16 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Gets a collection of buffered time ranges.
       */
-    buffered: TimeRanges;
+    readonly buffered: TimeRanges;
     /**
       * Gets or sets a flag that indicates whether the client provides a set of controls for the media (in case the developer does not include controls for the player).
       */
     controls: boolean;
+    crossOrigin: string;
     /**
       * Gets the address or URL of the current media resource that is selected by IHTMLMediaElement.
       */
-    currentSrc: string;
+    readonly currentSrc: string;
     /**
       * Gets or sets the current playback position, in seconds.
       */
@@ -9487,19 +10197,20 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Returns the duration in seconds of the current media resource. A NaN value is returned if duration is not available, or Infinity if the media resource is streaming.
       */
-    duration: number;
+    readonly duration: number;
     /**
       * Gets information about whether the playback has ended or not.
       */
-    ended: boolean;
+    readonly ended: boolean;
     /**
       * Returns an object representing the current error state of the audio or video element.
       */
-    error: MediaError;
+    readonly error: MediaError;
     /**
       * Gets or sets a flag to specify whether playback should restart after it completes.
       */
     loop: boolean;
+    readonly mediaKeys: MediaKeys;
     /**
       * Specifies the purpose of the audio or video media, such as background audio or alerts.
       */
@@ -9508,11 +10219,11 @@ interface HTMLMediaElement extends HTMLElement {
       * Specifies the output device id that the audio will be sent to.
       */
     msAudioDeviceType: string;
-    msGraphicsTrustStatus: MSGraphicsTrust;
+    readonly msGraphicsTrustStatus: MSGraphicsTrust;
     /**
       * Gets the MSMediaKeys object, which is used for decrypting media data, that is associated with this media element.
       */
-    msKeys: MSMediaKeys;
+    readonly msKeys: MSMediaKeys;
     /**
       * Gets or sets whether the DLNA PlayTo device is available.
       */
@@ -9528,7 +10239,7 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Gets the source associated with the media element for use by the PlayToManager.
       */
-    msPlayToSource: any;
+    readonly msPlayToSource: any;
     /**
       * Specifies whether or not to enable low-latency playback on the media element.
       */
@@ -9540,12 +10251,13 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Gets the current network activity for the element.
       */
-    networkState: number;
+    readonly networkState: number;
+    onencrypted: (ev: MediaEncryptedEvent) => any;
     onmsneedkey: (ev: MSMediaKeyNeededEvent) => any;
     /**
       * Gets a flag that specifies whether playback is paused.
       */
-    paused: boolean;
+    readonly paused: boolean;
     /**
       * Gets or sets the current rate of speed for the media resource to play. This speed is expressed as a multiple of the normal speed of the media resource.
       */
@@ -9553,7 +10265,7 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Gets TimeRanges for the current media resource that has been played.
       */
-    played: TimeRanges;
+    readonly played: TimeRanges;
     /**
       * Gets or sets the current playback position, in seconds.
       */
@@ -9562,17 +10274,18 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Returns a TimeRanges object that represents the ranges of the current media resource that can be seeked.
       */
-    seekable: TimeRanges;
+    readonly seekable: TimeRanges;
     /**
       * Gets a flag that indicates whether the the client is currently moving to a new playback position in the media resource.
       */
-    seeking: boolean;
+    readonly seeking: boolean;
     /**
       * The address or URL of the a media resource that is to be considered.
       */
     src: string;
-    textTracks: TextTrackList;
-    videoTracks: VideoTrackList;
+    srcObject: MediaStream;
+    readonly textTracks: TextTrackList;
+    readonly videoTracks: VideoTrackList;
     /**
       * Gets or sets the volume level for audio portions of the media element.
       */
@@ -9608,15 +10321,16 @@ interface HTMLMediaElement extends HTMLElement {
       * Loads and starts playback of a media resource.
       */
     play(): void;
-    HAVE_CURRENT_DATA: number;
-    HAVE_ENOUGH_DATA: number;
-    HAVE_FUTURE_DATA: number;
-    HAVE_METADATA: number;
-    HAVE_NOTHING: number;
-    NETWORK_EMPTY: number;
-    NETWORK_IDLE: number;
-    NETWORK_LOADING: number;
-    NETWORK_NO_SOURCE: number;
+    setMediaKeys(mediaKeys: MediaKeys): PromiseLike<void>;
+    readonly HAVE_CURRENT_DATA: number;
+    readonly HAVE_ENOUGH_DATA: number;
+    readonly HAVE_FUTURE_DATA: number;
+    readonly HAVE_METADATA: number;
+    readonly HAVE_NOTHING: number;
+    readonly NETWORK_EMPTY: number;
+    readonly NETWORK_IDLE: number;
+    readonly NETWORK_LOADING: number;
+    readonly NETWORK_NO_SOURCE: number;
     addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -9640,10 +10354,10 @@ interface HTMLMediaElement extends HTMLElement {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -9651,9 +10365,9 @@ interface HTMLMediaElement extends HTMLElement {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -9665,11 +10379,13 @@ interface HTMLMediaElement extends HTMLElement {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "encrypted", listener: (ev: MediaEncryptedEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -9685,9 +10401,9 @@ interface HTMLMediaElement extends HTMLElement {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "msneedkey", listener: (ev: MSMediaKeyNeededEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -9726,15 +10442,15 @@ interface HTMLMediaElement extends HTMLElement {
 declare var HTMLMediaElement: {
     prototype: HTMLMediaElement;
     new(): HTMLMediaElement;
-    HAVE_CURRENT_DATA: number;
-    HAVE_ENOUGH_DATA: number;
-    HAVE_FUTURE_DATA: number;
-    HAVE_METADATA: number;
-    HAVE_NOTHING: number;
-    NETWORK_EMPTY: number;
-    NETWORK_IDLE: number;
-    NETWORK_LOADING: number;
-    NETWORK_NO_SOURCE: number;
+    readonly HAVE_CURRENT_DATA: number;
+    readonly HAVE_ENOUGH_DATA: number;
+    readonly HAVE_FUTURE_DATA: number;
+    readonly HAVE_METADATA: number;
+    readonly HAVE_NOTHING: number;
+    readonly NETWORK_EMPTY: number;
+    readonly NETWORK_IDLE: number;
+    readonly NETWORK_LOADING: number;
+    readonly NETWORK_NO_SOURCE: number;
 }
 
 interface HTMLMenuElement extends HTMLElement {
@@ -9779,6 +10495,20 @@ declare var HTMLMetaElement: {
     new(): HTMLMetaElement;
 }
 
+interface HTMLMeterElement extends HTMLElement {
+    high: number;
+    low: number;
+    max: number;
+    min: number;
+    optimum: number;
+    value: number;
+}
+
+declare var HTMLMeterElement: {
+    prototype: HTMLMeterElement;
+    new(): HTMLMeterElement;
+}
+
 interface HTMLModElement extends HTMLElement {
     /**
       * Sets or retrieves reference information about the object.
@@ -9795,15 +10525,6 @@ declare var HTMLModElement: {
     new(): HTMLModElement;
 }
 
-interface HTMLNextIdElement extends HTMLElement {
-    n: string;
-}
-
-declare var HTMLNextIdElement: {
-    prototype: HTMLNextIdElement;
-    new(): HTMLNextIdElement;
-}
-
 interface HTMLOListElement extends HTMLElement {
     compact: boolean;
     /**
@@ -9822,7 +10543,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves a string of the URL where the object tag can be found. This is often the href of the document that the object is in, or the value set by a base element.
       */
-    BaseHref: string;
+    readonly BaseHref: string;
     align: string;
     /**
       * Sets or retrieves a text alternative to the graphic.
@@ -9852,7 +10573,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves the document object of the page or frame.
       */
-    contentDocument: Document;
+    readonly contentDocument: Document;
     /**
       * Sets or retrieves the URL that references the data of the object.
       */
@@ -9861,7 +10582,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the height of the object.
       */
@@ -9882,7 +10603,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Gets the source associated with the media element for use by the PlayToManager.
       */
-    msPlayToSource: any;
+    readonly msPlayToSource: any;
     /**
       * Sets or retrieves the name of the object.
       */
@@ -9890,8 +10611,8 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves the contained object.
       */
-    object: any;
-    readyState: number;
+    readonly object: any;
+    readonly readyState: number;
     /**
       * Sets or retrieves a message to be displayed while an object is loading.
       */
@@ -9907,11 +10628,11 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
       */
-    validationMessage: string;
+    readonly validationMessage: string;
     /**
       * Returns a  ValidityState object that represents the validity states of an element.
       */
-    validity: ValidityState;
+    readonly validity: ValidityState;
     vspace: number;
     /**
       * Sets or retrieves the width of the object.
@@ -9920,7 +10641,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Returns whether an element will successfully validate based on forms validation rules and constraints.
       */
-    willValidate: boolean;
+    readonly willValidate: boolean;
     /**
       * Returns whether a form will validate when it is submitted, without having to submit it.
       */
@@ -9947,11 +10668,11 @@ interface HTMLOptGroupElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the ordinal position of an option in a list box.
       */
-    index: number;
+    readonly index: number;
     /**
       * Sets or retrieves a value that you can use to implement your own label functionality for the object.
       */
@@ -9963,7 +10684,7 @@ interface HTMLOptGroupElement extends HTMLElement {
     /**
       * Sets or retrieves the text string specified by the option tag.
       */
-    text: string;
+    readonly text: string;
     /**
       * Sets or retrieves the value which is returned to the server when the form control is submitted.
       */
@@ -9984,11 +10705,11 @@ interface HTMLOptionElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the ordinal position of an option in a list box.
       */
-    index: number;
+    readonly index: number;
     /**
       * Sets or retrieves a value that you can use to implement your own label functionality for the object.
       */
@@ -10013,6 +10734,18 @@ declare var HTMLOptionElement: {
     create(): HTMLOptionElement;
 }
 
+interface HTMLOptionsCollection extends HTMLCollection {
+    length: number;
+    selectedIndex: number;
+    add(element: HTMLOptionElement | HTMLOptGroupElement, before?: HTMLElement | number): void;
+    remove(index: number): void;
+}
+
+declare var HTMLOptionsCollection: {
+    prototype: HTMLOptionsCollection;
+    new(): HTMLOptionsCollection;
+}
+
 interface HTMLParagraphElement extends HTMLElement {
     /**
       * Sets or retrieves how the object is aligned with adjacent text. 
@@ -10050,28 +10783,15 @@ declare var HTMLParamElement: {
     new(): HTMLParamElement;
 }
 
-interface HTMLPhraseElement extends HTMLElement {
-    /**
-      * Sets or retrieves reference information about the object.
-      */
-    cite: string;
-    /**
-      * Sets or retrieves the date and time of a modification to the object.
-      */
-    dateTime: string;
+interface HTMLPictureElement extends HTMLElement {
 }
 
-declare var HTMLPhraseElement: {
-    prototype: HTMLPhraseElement;
-    new(): HTMLPhraseElement;
+declare var HTMLPictureElement: {
+    prototype: HTMLPictureElement;
+    new(): HTMLPictureElement;
 }
 
 interface HTMLPreElement extends HTMLElement {
-    /**
-      * Indicates a citation by rendering text in italic type.
-      */
-    cite: string;
-    clear: string;
     /**
       * Sets or gets a value that you can use to implement your own width functionality for the object.
       */
@@ -10087,7 +10807,7 @@ interface HTMLProgressElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Defines the maximum, or "done" value for a progress element.
       */
@@ -10095,7 +10815,7 @@ interface HTMLProgressElement extends HTMLElement {
     /**
       * Returns the quotient of value/max when the value attribute is set (determinate progress bar), or -1 when the value attribute is missing (indeterminate progress bar).
       */
-    position: number;
+    readonly position: number;
     /**
       * Sets or gets the current value of a progress element. The value must be a non-negative number between 0 and the max value.
       */
@@ -10112,10 +10832,6 @@ interface HTMLQuoteElement extends HTMLElement {
       * Sets or retrieves reference information about the object.
       */
     cite: string;
-    /**
-      * Sets or retrieves the date and time of a modification to the object.
-      */
-    dateTime: string;
 }
 
 declare var HTMLQuoteElement: {
@@ -10169,7 +10885,7 @@ interface HTMLSelectElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in. 
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the number of objects in a collection.
       */
@@ -10182,7 +10898,7 @@ interface HTMLSelectElement extends HTMLElement {
       * Sets or retrieves the name of the object.
       */
     name: string;
-    options: HTMLCollection;
+    options: HTMLCollectionOf<HTMLOptionElement>;
     /**
       * When present, marks an element that can't be submitted without a value.
       */
@@ -10191,6 +10907,7 @@ interface HTMLSelectElement extends HTMLElement {
       * Sets or retrieves the index of the selected option in a select object.
       */
     selectedIndex: number;
+    selectedOptions: HTMLCollectionOf<HTMLOptionElement>;
     /**
       * Sets or retrieves the number of rows in the list box. 
       */
@@ -10198,15 +10915,15 @@ interface HTMLSelectElement extends HTMLElement {
     /**
       * Retrieves the type of select control based on the value of the MULTIPLE attribute.
       */
-    type: string;
+    readonly type: string;
     /**
       * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
       */
-    validationMessage: string;
+    readonly validationMessage: string;
     /**
       * Returns a  ValidityState object that represents the validity states of an element.
       */
-    validity: ValidityState;
+    readonly validity: ValidityState;
     /**
       * Sets or retrieves the value which is returned to the server when the form control is submitted.
       */
@@ -10214,8 +10931,7 @@ interface HTMLSelectElement extends HTMLElement {
     /**
       * Returns whether an element will successfully validate based on forms validation rules and constraints.
       */
-    willValidate: boolean;
-    selectedOptions: HTMLCollection;
+    readonly willValidate: boolean;
     /**
       * Adds an element to the areas, controlRange, or options collection.
       * @param element Variant of type Number that specifies the index position in the collection where the element is placed. If no value is given, the method places the element at the end of the collection.
@@ -10261,10 +10977,12 @@ interface HTMLSourceElement extends HTMLElement {
      */
     media: string;
     msKeySystem: string;
+    sizes: string;
     /**
       * The address or URL of the a media resource that is to be considered.
       */
     src: string;
+    srcset: string;
     /**
      * Gets or sets the MIME type of a media resource.
      */
@@ -10285,6 +11003,7 @@ declare var HTMLSpanElement: {
 }
 
 interface HTMLStyleElement extends HTMLElement, LinkStyle {
+    disabled: boolean;
     /**
       * Sets or retrieves the media type.
       */
@@ -10334,7 +11053,7 @@ interface HTMLTableCellElement extends HTMLElement, HTMLTableAlignment {
     /**
       * Retrieves the position of the object in the cells collection of a row.
       */
-    cellIndex: number;
+    readonly cellIndex: number;
     /**
       * Sets or retrieves the number columns in the table that the object should span.
       */
@@ -10441,7 +11160,7 @@ interface HTMLTableElement extends HTMLElement {
     /**
       * Sets or retrieves the number of horizontal rows contained in the object.
       */
-    rows: HTMLCollection;
+    rows: HTMLCollectionOf<HTMLTableRowElement>;
     /**
       * Sets or retrieves which dividing lines (inner borders) are displayed.
       */
@@ -10453,7 +11172,7 @@ interface HTMLTableElement extends HTMLElement {
     /**
       * Retrieves a collection of all tBody objects in the table. Objects in this collection are in source order.
       */
-    tBodies: HTMLCollection;
+    tBodies: HTMLCollectionOf<HTMLTableSectionElement>;
     /**
       * Retrieves the tFoot object of the table.
       */
@@ -10532,7 +11251,7 @@ interface HTMLTableRowElement extends HTMLElement, HTMLTableAlignment {
     /**
       * Retrieves a collection of all cells in the table row.
       */
-    cells: HTMLCollection;
+    cells: HTMLCollectionOf<HTMLTableDataCellElement | HTMLTableHeaderCellElement>;
     /**
       * Sets or retrieves the height of the object.
       */
@@ -10540,11 +11259,11 @@ interface HTMLTableRowElement extends HTMLElement, HTMLTableAlignment {
     /**
       * Retrieves the position of the object in the rows collection for the table.
       */
-    rowIndex: number;
+    readonly rowIndex: number;
     /**
       * Retrieves the position of the object in the collection.
       */
-    sectionRowIndex: number;
+    readonly sectionRowIndex: number;
     /**
       * Removes the specified cell from the table row, as well as from the cells collection.
       * @param index Number that specifies the zero-based position of the cell to remove from the table row. If no value is provided, the last cell in the cells collection is deleted.
@@ -10554,7 +11273,7 @@ interface HTMLTableRowElement extends HTMLElement, HTMLTableAlignment {
       * Creates a new cell in the table row, and adds the cell to the cells collection.
       * @param index Number that specifies where to insert the cell in the tr. The default value is -1, which appends the new cell to the end of the cells collection.
       */
-    insertCell(index?: number): HTMLTableCellElement;
+    insertCell(index?: number): HTMLTableDataCellElement;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10571,7 +11290,7 @@ interface HTMLTableSectionElement extends HTMLElement, HTMLTableAlignment {
     /**
       * Sets or retrieves the number of horizontal rows contained in the object.
       */
-    rows: HTMLCollection;
+    rows: HTMLCollectionOf<HTMLTableRowElement>;
     /**
       * Removes the specified row (tr) from the element and from the rows collection.
       * @param index Number that specifies the zero-based position in the rows collection of the row to remove.
@@ -10590,6 +11309,15 @@ declare var HTMLTableSectionElement: {
     new(): HTMLTableSectionElement;
 }
 
+interface HTMLTemplateElement extends HTMLElement {
+    readonly content: DocumentFragment;
+}
+
+declare var HTMLTemplateElement: {
+    prototype: HTMLTemplateElement;
+    new(): HTMLTemplateElement;
+}
+
 interface HTMLTextAreaElement extends HTMLElement {
     /**
       * Provides a way to direct a user to a specific field when a document loads. This can provide both direction and convenience for a user, reducing the need to click or tab to a field when a page opens. This attribute is true when present on an element, and false when missing.
@@ -10607,7 +11335,7 @@ interface HTMLTextAreaElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the maximum number of characters that the user can enter in a text control.
       */
@@ -10647,15 +11375,15 @@ interface HTMLTextAreaElement extends HTMLElement {
     /**
       * Retrieves the type of control.
       */
-    type: string;
+    readonly type: string;
     /**
       * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
       */
-    validationMessage: string;
+    readonly validationMessage: string;
     /**
       * Returns a  ValidityState object that represents the validity states of an element.
       */
-    validity: ValidityState;
+    readonly validity: ValidityState;
     /**
       * Retrieves or sets the text in the entry field of the textArea element.
       */
@@ -10663,19 +11391,16 @@ interface HTMLTextAreaElement extends HTMLElement {
     /**
       * Returns whether an element will successfully validate based on forms validation rules and constraints.
       */
-    willValidate: boolean;
+    readonly willValidate: boolean;
     /**
       * Sets or retrieves how to handle wordwrapping in the object.
       */
     wrap: string;
+    minLength: number;
     /**
       * Returns whether a form will validate when it is submitted, without having to submit it.
       */
     checkValidity(): boolean;
-    /**
-      * Creates a TextRange object for the element.
-      */
-    createTextRange(): TextRange;
     /**
       * Highlights the input area of a form element.
       */
@@ -10714,23 +11439,23 @@ interface HTMLTrackElement extends HTMLElement {
     default: boolean;
     kind: string;
     label: string;
-    readyState: number;
+    readonly readyState: number;
     src: string;
     srclang: string;
-    track: TextTrack;
-    ERROR: number;
-    LOADED: number;
-    LOADING: number;
-    NONE: number;
+    readonly track: TextTrack;
+    readonly ERROR: number;
+    readonly LOADED: number;
+    readonly LOADING: number;
+    readonly NONE: number;
 }
 
 declare var HTMLTrackElement: {
     prototype: HTMLTrackElement;
     new(): HTMLTrackElement;
-    ERROR: number;
-    LOADED: number;
-    LOADING: number;
-    NONE: number;
+    readonly ERROR: number;
+    readonly LOADED: number;
+    readonly LOADING: number;
+    readonly NONE: number;
 }
 
 interface HTMLUListElement extends HTMLElement {
@@ -10757,8 +11482,8 @@ interface HTMLVideoElement extends HTMLMediaElement {
       */
     height: number;
     msHorizontalMirror: boolean;
-    msIsLayoutOptimalForPlayback: boolean;
-    msIsStereo3D: boolean;
+    readonly msIsLayoutOptimalForPlayback: boolean;
+    readonly msIsStereo3D: boolean;
     msStereo3DPackingMode: string;
     msStereo3DRenderMode: string;
     msZoom: boolean;
@@ -10772,13 +11497,13 @@ interface HTMLVideoElement extends HTMLMediaElement {
     /**
       * Gets the intrinsic height of a video in CSS pixels, or zero if the dimensions are not known.
       */
-    videoHeight: number;
+    readonly videoHeight: number;
     /**
       * Gets the intrinsic width of a video in CSS pixels, or zero if the dimensions are not known.
       */
-    videoWidth: number;
-    webkitDisplayingFullscreen: boolean;
-    webkitSupportsFullscreen: boolean;
+    readonly videoWidth: number;
+    readonly webkitDisplayingFullscreen: boolean;
+    readonly webkitSupportsFullscreen: boolean;
     /**
       * Gets or sets the width of the video element.
       */
@@ -10817,10 +11542,10 @@ interface HTMLVideoElement extends HTMLMediaElement {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -10828,9 +11553,9 @@ interface HTMLVideoElement extends HTMLMediaElement {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -10842,11 +11567,13 @@ interface HTMLVideoElement extends HTMLMediaElement {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "encrypted", listener: (ev: MediaEncryptedEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -10862,9 +11589,9 @@ interface HTMLVideoElement extends HTMLMediaElement {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "msneedkey", listener: (ev: MSMediaKeyNeededEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -10906,8 +11633,8 @@ declare var HTMLVideoElement: {
 }
 
 interface HashChangeEvent extends Event {
-    newURL: string;
-    oldURL: string;
+    readonly newURL: string;
+    readonly oldURL: string;
 }
 
 declare var HashChangeEvent: {
@@ -10916,8 +11643,8 @@ declare var HashChangeEvent: {
 }
 
 interface History {
-    length: number;
-    state: any;
+    readonly length: number;
+    readonly state: any;
     back(distance?: any): void;
     forward(distance?: any): void;
     go(delta?: any): void;
@@ -10931,31 +11658,31 @@ declare var History: {
 }
 
 interface IDBCursor {
-    direction: string;
-    key: any;
-    primaryKey: any;
-    source: any;
+    readonly direction: string;
+    key: IDBKeyRange | IDBValidKey;
+    readonly primaryKey: any;
+    source: IDBObjectStore | IDBIndex;
     advance(count: number): void;
-    continue(key?: any): void;
+    continue(key?: IDBKeyRange | IDBValidKey): void;
     delete(): IDBRequest;
     update(value: any): IDBRequest;
-    NEXT: string;
-    NEXT_NO_DUPLICATE: string;
-    PREV: string;
-    PREV_NO_DUPLICATE: string;
+    readonly NEXT: string;
+    readonly NEXT_NO_DUPLICATE: string;
+    readonly PREV: string;
+    readonly PREV_NO_DUPLICATE: string;
 }
 
 declare var IDBCursor: {
     prototype: IDBCursor;
     new(): IDBCursor;
-    NEXT: string;
-    NEXT_NO_DUPLICATE: string;
-    PREV: string;
-    PREV_NO_DUPLICATE: string;
+    readonly NEXT: string;
+    readonly NEXT_NO_DUPLICATE: string;
+    readonly PREV: string;
+    readonly PREV_NO_DUPLICATE: string;
 }
 
 interface IDBCursorWithValue extends IDBCursor {
-    value: any;
+    readonly value: any;
 }
 
 declare var IDBCursorWithValue: {
@@ -10964,15 +11691,17 @@ declare var IDBCursorWithValue: {
 }
 
 interface IDBDatabase extends EventTarget {
-    name: string;
-    objectStoreNames: DOMStringList;
+    readonly name: string;
+    readonly objectStoreNames: DOMStringList;
     onabort: (ev: Event) => any;
     onerror: (ev: Event) => any;
     version: number;
+    onversionchange: (ev: IDBVersionChangeEvent) => any;
     close(): void;
     createObjectStore(name: string, optionalParameters?: IDBObjectStoreParameters): IDBObjectStore;
     deleteObjectStore(name: string): void;
-    transaction(storeNames: any, mode?: string): IDBTransaction;
+    transaction(storeNames: string | string[], mode?: string): IDBTransaction;
+    addEventListener(type: "versionchange", listener: (ev: IDBVersionChangeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -10996,15 +11725,15 @@ declare var IDBFactory: {
 
 interface IDBIndex {
     keyPath: string | string[];
-    name: string;
-    objectStore: IDBObjectStore;
-    unique: boolean;
+    readonly name: string;
+    readonly objectStore: IDBObjectStore;
+    readonly unique: boolean;
     multiEntry: boolean;
-    count(key?: any): IDBRequest;
-    get(key: any): IDBRequest;
-    getKey(key: any): IDBRequest;
-    openCursor(range?: IDBKeyRange, direction?: string): IDBRequest;
-    openKeyCursor(range?: IDBKeyRange, direction?: string): IDBRequest;
+    count(key?: IDBKeyRange | IDBValidKey): IDBRequest;
+    get(key: IDBKeyRange | IDBValidKey): IDBRequest;
+    getKey(key: IDBKeyRange | IDBValidKey): IDBRequest;
+    openCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest;
+    openKeyCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest;
 }
 
 declare var IDBIndex: {
@@ -11013,36 +11742,37 @@ declare var IDBIndex: {
 }
 
 interface IDBKeyRange {
-    lower: any;
-    lowerOpen: boolean;
-    upper: any;
-    upperOpen: boolean;
+    readonly lower: any;
+    readonly lowerOpen: boolean;
+    readonly upper: any;
+    readonly upperOpen: boolean;
 }
 
 declare var IDBKeyRange: {
     prototype: IDBKeyRange;
     new(): IDBKeyRange;
     bound(lower: any, upper: any, lowerOpen?: boolean, upperOpen?: boolean): IDBKeyRange;
-    lowerBound(bound: any, open?: boolean): IDBKeyRange;
+    lowerBound(lower: any, open?: boolean): IDBKeyRange;
     only(value: any): IDBKeyRange;
-    upperBound(bound: any, open?: boolean): IDBKeyRange;
+    upperBound(upper: any, open?: boolean): IDBKeyRange;
 }
 
 interface IDBObjectStore {
-    indexNames: DOMStringList;
-    keyPath: string;
-    name: string;
-    transaction: IDBTransaction;
-    add(value: any, key?: any): IDBRequest;
+    readonly indexNames: DOMStringList;
+    keyPath: string | string[];
+    readonly name: string;
+    readonly transaction: IDBTransaction;
+    autoIncrement: boolean;
+    add(value: any, key?: IDBKeyRange | IDBValidKey): IDBRequest;
     clear(): IDBRequest;
-    count(key?: any): IDBRequest;
+    count(key?: IDBKeyRange | IDBValidKey): IDBRequest;
     createIndex(name: string, keyPath: string | string[], optionalParameters?: IDBIndexParameters): IDBIndex;
-    delete(key: any): IDBRequest;
+    delete(key: IDBKeyRange | IDBValidKey): IDBRequest;
     deleteIndex(indexName: string): void;
     get(key: any): IDBRequest;
     index(name: string): IDBIndex;
-    openCursor(range?: any, direction?: string): IDBRequest;
-    put(value: any, key?: any): IDBRequest;
+    openCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest;
+    put(value: any, key?: IDBKeyRange | IDBValidKey): IDBRequest;
 }
 
 declare var IDBObjectStore: {
@@ -11066,13 +11796,13 @@ declare var IDBOpenDBRequest: {
 }
 
 interface IDBRequest extends EventTarget {
-    error: DOMError;
+    readonly error: DOMError;
     onerror: (ev: Event) => any;
     onsuccess: (ev: Event) => any;
-    readyState: string;
-    result: any;
-    source: any;
-    transaction: IDBTransaction;
+    readonly readyState: string;
+    readonly result: any;
+    source: IDBObjectStore | IDBIndex | IDBCursor;
+    readonly transaction: IDBTransaction;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "success", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -11084,17 +11814,17 @@ declare var IDBRequest: {
 }
 
 interface IDBTransaction extends EventTarget {
-    db: IDBDatabase;
-    error: DOMError;
-    mode: string;
+    readonly db: IDBDatabase;
+    readonly error: DOMError;
+    readonly mode: string;
     onabort: (ev: Event) => any;
     oncomplete: (ev: Event) => any;
     onerror: (ev: Event) => any;
     abort(): void;
     objectStore(name: string): IDBObjectStore;
-    READ_ONLY: string;
-    READ_WRITE: string;
-    VERSION_CHANGE: string;
+    readonly READ_ONLY: string;
+    readonly READ_WRITE: string;
+    readonly VERSION_CHANGE: string;
     addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
@@ -11104,14 +11834,14 @@ interface IDBTransaction extends EventTarget {
 declare var IDBTransaction: {
     prototype: IDBTransaction;
     new(): IDBTransaction;
-    READ_ONLY: string;
-    READ_WRITE: string;
-    VERSION_CHANGE: string;
+    readonly READ_ONLY: string;
+    readonly READ_WRITE: string;
+    readonly VERSION_CHANGE: string;
 }
 
 interface IDBVersionChangeEvent extends Event {
-    newVersion: number;
-    oldVersion: number;
+    readonly newVersion: number;
+    readonly oldVersion: number;
 }
 
 declare var IDBVersionChangeEvent: {
@@ -11121,8 +11851,8 @@ declare var IDBVersionChangeEvent: {
 
 interface ImageData {
     data: Uint8ClampedArray;
-    height: number;
-    width: number;
+    readonly height: number;
+    readonly width: number;
 }
 
 declare var ImageData: {
@@ -11132,37 +11862,47 @@ declare var ImageData: {
 }
 
 interface KeyboardEvent extends UIEvent {
-    altKey: boolean;
-    char: string;
-    charCode: number;
-    ctrlKey: boolean;
-    key: string;
-    keyCode: number;
-    locale: string;
-    location: number;
-    metaKey: boolean;
-    repeat: boolean;
-    shiftKey: boolean;
-    which: number;
+    readonly altKey: boolean;
+    readonly char: string;
+    readonly charCode: number;
+    readonly ctrlKey: boolean;
+    readonly key: string;
+    readonly keyCode: number;
+    readonly locale: string;
+    readonly location: number;
+    readonly metaKey: boolean;
+    readonly repeat: boolean;
+    readonly shiftKey: boolean;
+    readonly which: number;
     getModifierState(keyArg: string): boolean;
     initKeyboardEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, keyArg: string, locationArg: number, modifiersListArg: string, repeat: boolean, locale: string): void;
-    DOM_KEY_LOCATION_JOYSTICK: number;
-    DOM_KEY_LOCATION_LEFT: number;
-    DOM_KEY_LOCATION_MOBILE: number;
-    DOM_KEY_LOCATION_NUMPAD: number;
-    DOM_KEY_LOCATION_RIGHT: number;
-    DOM_KEY_LOCATION_STANDARD: number;
+    readonly DOM_KEY_LOCATION_JOYSTICK: number;
+    readonly DOM_KEY_LOCATION_LEFT: number;
+    readonly DOM_KEY_LOCATION_MOBILE: number;
+    readonly DOM_KEY_LOCATION_NUMPAD: number;
+    readonly DOM_KEY_LOCATION_RIGHT: number;
+    readonly DOM_KEY_LOCATION_STANDARD: number;
 }
 
 declare var KeyboardEvent: {
     prototype: KeyboardEvent;
     new(typeArg: string, eventInitDict?: KeyboardEventInit): KeyboardEvent;
-    DOM_KEY_LOCATION_JOYSTICK: number;
-    DOM_KEY_LOCATION_LEFT: number;
-    DOM_KEY_LOCATION_MOBILE: number;
-    DOM_KEY_LOCATION_NUMPAD: number;
-    DOM_KEY_LOCATION_RIGHT: number;
-    DOM_KEY_LOCATION_STANDARD: number;
+    readonly DOM_KEY_LOCATION_JOYSTICK: number;
+    readonly DOM_KEY_LOCATION_LEFT: number;
+    readonly DOM_KEY_LOCATION_MOBILE: number;
+    readonly DOM_KEY_LOCATION_NUMPAD: number;
+    readonly DOM_KEY_LOCATION_RIGHT: number;
+    readonly DOM_KEY_LOCATION_STANDARD: number;
+}
+
+interface ListeningStateChangedEvent extends Event {
+    readonly label: string;
+    readonly state: string;
+}
+
+declare var ListeningStateChangedEvent: {
+    prototype: ListeningStateChangedEvent;
+    new(): ListeningStateChangedEvent;
 }
 
 interface Location {
@@ -11170,7 +11910,7 @@ interface Location {
     host: string;
     hostname: string;
     href: string;
-    origin: string;
+    readonly origin: string;
     pathname: string;
     port: string;
     protocol: string;
@@ -11187,7 +11927,7 @@ declare var Location: {
 }
 
 interface LongRunningScriptDetectedEvent extends Event {
-    executionTime: number;
+    readonly executionTime: number;
     stopPageScriptExecution: boolean;
 }
 
@@ -11206,29 +11946,29 @@ interface MSApp {
     execAsyncAtPriority(asynchronousCallback: MSExecAtPriorityFunctionCallback, priority: string, ...args: any[]): void;
     execAtPriority(synchronousCallback: MSExecAtPriorityFunctionCallback, priority: string, ...args: any[]): any;
     getCurrentPriority(): string;
-    getHtmlPrintDocumentSourceAsync(htmlDoc: any): any;
+    getHtmlPrintDocumentSourceAsync(htmlDoc: any): PromiseLike<any>;
     getViewId(view: any): any;
     isTaskScheduledAtPriorityOrHigher(priority: string): boolean;
     pageHandlesAllApplicationActivations(enabled: boolean): void;
     suppressSubdownloadCredentialPrompts(suppress: boolean): void;
     terminateApp(exceptionObject: any): void;
-    CURRENT: string;
-    HIGH: string;
-    IDLE: string;
-    NORMAL: string;
+    readonly CURRENT: string;
+    readonly HIGH: string;
+    readonly IDLE: string;
+    readonly NORMAL: string;
 }
 declare var MSApp: MSApp;
 
 interface MSAppAsyncOperation extends EventTarget {
-    error: DOMError;
+    readonly error: DOMError;
     oncomplete: (ev: Event) => any;
     onerror: (ev: Event) => any;
-    readyState: number;
-    result: any;
+    readonly readyState: number;
+    readonly result: any;
     start(): void;
-    COMPLETED: number;
-    ERROR: number;
-    STARTED: number;
+    readonly COMPLETED: number;
+    readonly ERROR: number;
+    readonly STARTED: number;
     addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -11237,9 +11977,19 @@ interface MSAppAsyncOperation extends EventTarget {
 declare var MSAppAsyncOperation: {
     prototype: MSAppAsyncOperation;
     new(): MSAppAsyncOperation;
-    COMPLETED: number;
-    ERROR: number;
-    STARTED: number;
+    readonly COMPLETED: number;
+    readonly ERROR: number;
+    readonly STARTED: number;
+}
+
+interface MSAssertion {
+    readonly id: string;
+    readonly type: string;
+}
+
+declare var MSAssertion: {
+    prototype: MSAssertion;
+    new(): MSAssertion;
 }
 
 interface MSBlobBuilder {
@@ -11252,44 +12002,46 @@ declare var MSBlobBuilder: {
     new(): MSBlobBuilder;
 }
 
-interface MSCSSMatrix {
-    a: number;
-    b: number;
-    c: number;
-    d: number;
-    e: number;
-    f: number;
-    m11: number;
-    m12: number;
-    m13: number;
-    m14: number;
-    m21: number;
-    m22: number;
-    m23: number;
-    m24: number;
-    m31: number;
-    m32: number;
-    m33: number;
-    m34: number;
-    m41: number;
-    m42: number;
-    m43: number;
-    m44: number;
-    inverse(): MSCSSMatrix;
-    multiply(secondMatrix: MSCSSMatrix): MSCSSMatrix;
-    rotate(angleX: number, angleY?: number, angleZ?: number): MSCSSMatrix;
-    rotateAxisAngle(x: number, y: number, z: number, angle: number): MSCSSMatrix;
-    scale(scaleX: number, scaleY?: number, scaleZ?: number): MSCSSMatrix;
-    setMatrixValue(value: string): void;
-    skewX(angle: number): MSCSSMatrix;
-    skewY(angle: number): MSCSSMatrix;
-    toString(): string;
-    translate(x: number, y: number, z?: number): MSCSSMatrix;
+interface MSCredentials {
+    getAssertion(challenge: string, filter?: MSCredentialFilter, params?: MSSignatureParameters): PromiseLike<MSAssertion>;
+    makeCredential(accountInfo: MSAccountInfo, params: MSCredentialParameters[], challenge?: string): PromiseLike<MSAssertion>;
 }
 
-declare var MSCSSMatrix: {
-    prototype: MSCSSMatrix;
-    new(text?: string): MSCSSMatrix;
+declare var MSCredentials: {
+    prototype: MSCredentials;
+    new(): MSCredentials;
+}
+
+interface MSFIDOCredentialAssertion extends MSAssertion {
+    readonly algorithm: string | Algorithm;
+    readonly attestation: any;
+    readonly publicKey: string;
+    readonly transportHints: string[];
+}
+
+declare var MSFIDOCredentialAssertion: {
+    prototype: MSFIDOCredentialAssertion;
+    new(): MSFIDOCredentialAssertion;
+}
+
+interface MSFIDOSignature {
+    readonly authnrData: string;
+    readonly clientData: string;
+    readonly signature: string;
+}
+
+declare var MSFIDOSignature: {
+    prototype: MSFIDOSignature;
+    new(): MSFIDOSignature;
+}
+
+interface MSFIDOSignatureAssertion extends MSAssertion {
+    readonly signature: MSFIDOSignature;
+}
+
+declare var MSFIDOSignatureAssertion: {
+    prototype: MSFIDOSignatureAssertion;
+    new(): MSFIDOSignatureAssertion;
 }
 
 interface MSGesture {
@@ -11304,44 +12056,44 @@ declare var MSGesture: {
 }
 
 interface MSGestureEvent extends UIEvent {
-    clientX: number;
-    clientY: number;
-    expansion: number;
-    gestureObject: any;
-    hwTimestamp: number;
-    offsetX: number;
-    offsetY: number;
-    rotation: number;
-    scale: number;
-    screenX: number;
-    screenY: number;
-    translationX: number;
-    translationY: number;
-    velocityAngular: number;
-    velocityExpansion: number;
-    velocityX: number;
-    velocityY: number;
+    readonly clientX: number;
+    readonly clientY: number;
+    readonly expansion: number;
+    readonly gestureObject: any;
+    readonly hwTimestamp: number;
+    readonly offsetX: number;
+    readonly offsetY: number;
+    readonly rotation: number;
+    readonly scale: number;
+    readonly screenX: number;
+    readonly screenY: number;
+    readonly translationX: number;
+    readonly translationY: number;
+    readonly velocityAngular: number;
+    readonly velocityExpansion: number;
+    readonly velocityX: number;
+    readonly velocityY: number;
     initGestureEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, offsetXArg: number, offsetYArg: number, translationXArg: number, translationYArg: number, scaleArg: number, expansionArg: number, rotationArg: number, velocityXArg: number, velocityYArg: number, velocityExpansionArg: number, velocityAngularArg: number, hwTimestampArg: number): void;
-    MSGESTURE_FLAG_BEGIN: number;
-    MSGESTURE_FLAG_CANCEL: number;
-    MSGESTURE_FLAG_END: number;
-    MSGESTURE_FLAG_INERTIA: number;
-    MSGESTURE_FLAG_NONE: number;
+    readonly MSGESTURE_FLAG_BEGIN: number;
+    readonly MSGESTURE_FLAG_CANCEL: number;
+    readonly MSGESTURE_FLAG_END: number;
+    readonly MSGESTURE_FLAG_INERTIA: number;
+    readonly MSGESTURE_FLAG_NONE: number;
 }
 
 declare var MSGestureEvent: {
     prototype: MSGestureEvent;
     new(): MSGestureEvent;
-    MSGESTURE_FLAG_BEGIN: number;
-    MSGESTURE_FLAG_CANCEL: number;
-    MSGESTURE_FLAG_END: number;
-    MSGESTURE_FLAG_INERTIA: number;
-    MSGESTURE_FLAG_NONE: number;
+    readonly MSGESTURE_FLAG_BEGIN: number;
+    readonly MSGESTURE_FLAG_CANCEL: number;
+    readonly MSGESTURE_FLAG_END: number;
+    readonly MSGESTURE_FLAG_INERTIA: number;
+    readonly MSGESTURE_FLAG_NONE: number;
 }
 
 interface MSGraphicsTrust {
-    constrictionActive: boolean;
-    status: string;
+    readonly constrictionActive: boolean;
+    readonly status: string;
 }
 
 declare var MSGraphicsTrust: {
@@ -11350,12 +12102,12 @@ declare var MSGraphicsTrust: {
 }
 
 interface MSHTMLWebViewElement extends HTMLElement {
-    canGoBack: boolean;
-    canGoForward: boolean;
-    containsFullScreenElement: boolean;
-    documentTitle: string;
+    readonly canGoBack: boolean;
+    readonly canGoForward: boolean;
+    readonly containsFullScreenElement: boolean;
+    readonly documentTitle: string;
     height: number;
-    settings: MSWebViewSettings;
+    readonly settings: MSWebViewSettings;
     src: string;
     width: number;
     addWebAllowedObject(name: string, applicationObject: any): void;
@@ -11381,12 +12133,12 @@ declare var MSHTMLWebViewElement: {
 }
 
 interface MSInputMethodContext extends EventTarget {
-    compositionEndOffset: number;
-    compositionStartOffset: number;
+    readonly compositionEndOffset: number;
+    readonly compositionStartOffset: number;
     oncandidatewindowhide: (ev: Event) => any;
     oncandidatewindowshow: (ev: Event) => any;
     oncandidatewindowupdate: (ev: Event) => any;
-    target: HTMLElement;
+    readonly target: HTMLElement;
     getCandidateWindowClientRect(): ClientRect;
     getCompositionAlternatives(): string[];
     hasComposition(): boolean;
@@ -11403,59 +12155,59 @@ declare var MSInputMethodContext: {
 }
 
 interface MSManipulationEvent extends UIEvent {
-    currentState: number;
-    inertiaDestinationX: number;
-    inertiaDestinationY: number;
-    lastState: number;
+    readonly currentState: number;
+    readonly inertiaDestinationX: number;
+    readonly inertiaDestinationY: number;
+    readonly lastState: number;
     initMSManipulationEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, lastState: number, currentState: number): void;
-    MS_MANIPULATION_STATE_ACTIVE: number;
-    MS_MANIPULATION_STATE_CANCELLED: number;
-    MS_MANIPULATION_STATE_COMMITTED: number;
-    MS_MANIPULATION_STATE_DRAGGING: number;
-    MS_MANIPULATION_STATE_INERTIA: number;
-    MS_MANIPULATION_STATE_PRESELECT: number;
-    MS_MANIPULATION_STATE_SELECTING: number;
-    MS_MANIPULATION_STATE_STOPPED: number;
+    readonly MS_MANIPULATION_STATE_ACTIVE: number;
+    readonly MS_MANIPULATION_STATE_CANCELLED: number;
+    readonly MS_MANIPULATION_STATE_COMMITTED: number;
+    readonly MS_MANIPULATION_STATE_DRAGGING: number;
+    readonly MS_MANIPULATION_STATE_INERTIA: number;
+    readonly MS_MANIPULATION_STATE_PRESELECT: number;
+    readonly MS_MANIPULATION_STATE_SELECTING: number;
+    readonly MS_MANIPULATION_STATE_STOPPED: number;
 }
 
 declare var MSManipulationEvent: {
     prototype: MSManipulationEvent;
     new(): MSManipulationEvent;
-    MS_MANIPULATION_STATE_ACTIVE: number;
-    MS_MANIPULATION_STATE_CANCELLED: number;
-    MS_MANIPULATION_STATE_COMMITTED: number;
-    MS_MANIPULATION_STATE_DRAGGING: number;
-    MS_MANIPULATION_STATE_INERTIA: number;
-    MS_MANIPULATION_STATE_PRESELECT: number;
-    MS_MANIPULATION_STATE_SELECTING: number;
-    MS_MANIPULATION_STATE_STOPPED: number;
+    readonly MS_MANIPULATION_STATE_ACTIVE: number;
+    readonly MS_MANIPULATION_STATE_CANCELLED: number;
+    readonly MS_MANIPULATION_STATE_COMMITTED: number;
+    readonly MS_MANIPULATION_STATE_DRAGGING: number;
+    readonly MS_MANIPULATION_STATE_INERTIA: number;
+    readonly MS_MANIPULATION_STATE_PRESELECT: number;
+    readonly MS_MANIPULATION_STATE_SELECTING: number;
+    readonly MS_MANIPULATION_STATE_STOPPED: number;
 }
 
 interface MSMediaKeyError {
-    code: number;
-    systemCode: number;
-    MS_MEDIA_KEYERR_CLIENT: number;
-    MS_MEDIA_KEYERR_DOMAIN: number;
-    MS_MEDIA_KEYERR_HARDWARECHANGE: number;
-    MS_MEDIA_KEYERR_OUTPUT: number;
-    MS_MEDIA_KEYERR_SERVICE: number;
-    MS_MEDIA_KEYERR_UNKNOWN: number;
+    readonly code: number;
+    readonly systemCode: number;
+    readonly MS_MEDIA_KEYERR_CLIENT: number;
+    readonly MS_MEDIA_KEYERR_DOMAIN: number;
+    readonly MS_MEDIA_KEYERR_HARDWARECHANGE: number;
+    readonly MS_MEDIA_KEYERR_OUTPUT: number;
+    readonly MS_MEDIA_KEYERR_SERVICE: number;
+    readonly MS_MEDIA_KEYERR_UNKNOWN: number;
 }
 
 declare var MSMediaKeyError: {
     prototype: MSMediaKeyError;
     new(): MSMediaKeyError;
-    MS_MEDIA_KEYERR_CLIENT: number;
-    MS_MEDIA_KEYERR_DOMAIN: number;
-    MS_MEDIA_KEYERR_HARDWARECHANGE: number;
-    MS_MEDIA_KEYERR_OUTPUT: number;
-    MS_MEDIA_KEYERR_SERVICE: number;
-    MS_MEDIA_KEYERR_UNKNOWN: number;
+    readonly MS_MEDIA_KEYERR_CLIENT: number;
+    readonly MS_MEDIA_KEYERR_DOMAIN: number;
+    readonly MS_MEDIA_KEYERR_HARDWARECHANGE: number;
+    readonly MS_MEDIA_KEYERR_OUTPUT: number;
+    readonly MS_MEDIA_KEYERR_SERVICE: number;
+    readonly MS_MEDIA_KEYERR_UNKNOWN: number;
 }
 
 interface MSMediaKeyMessageEvent extends Event {
-    destinationURL: string;
-    message: Uint8Array;
+    readonly destinationURL: string;
+    readonly message: Uint8Array;
 }
 
 declare var MSMediaKeyMessageEvent: {
@@ -11464,7 +12216,7 @@ declare var MSMediaKeyMessageEvent: {
 }
 
 interface MSMediaKeyNeededEvent extends Event {
-    initData: Uint8Array;
+    readonly initData: Uint8Array;
 }
 
 declare var MSMediaKeyNeededEvent: {
@@ -11473,9 +12225,9 @@ declare var MSMediaKeyNeededEvent: {
 }
 
 interface MSMediaKeySession extends EventTarget {
-    error: MSMediaKeyError;
-    keySystem: string;
-    sessionId: string;
+    readonly error: MSMediaKeyError;
+    readonly keySystem: string;
+    readonly sessionId: string;
     close(): void;
     update(key: Uint8Array): void;
 }
@@ -11486,7 +12238,7 @@ declare var MSMediaKeySession: {
 }
 
 interface MSMediaKeys {
-    keySystem: string;
+    readonly keySystem: string;
     createSession(type: string, initData: Uint8Array, cdmData?: Uint8Array): MSMediaKeySession;
 }
 
@@ -11494,40 +12246,22 @@ declare var MSMediaKeys: {
     prototype: MSMediaKeys;
     new(keySystem: string): MSMediaKeys;
     isTypeSupported(keySystem: string, type?: string): boolean;
-}
-
-interface MSMimeTypesCollection {
-    length: number;
-}
-
-declare var MSMimeTypesCollection: {
-    prototype: MSMimeTypesCollection;
-    new(): MSMimeTypesCollection;
-}
-
-interface MSPluginsCollection {
-    length: number;
-    refresh(reload?: boolean): void;
-}
-
-declare var MSPluginsCollection: {
-    prototype: MSPluginsCollection;
-    new(): MSPluginsCollection;
+    isTypeSupportedWithFeatures(keySystem: string, type?: string): string;
 }
 
 interface MSPointerEvent extends MouseEvent {
-    currentPoint: any;
-    height: number;
-    hwTimestamp: number;
-    intermediatePoints: any;
-    isPrimary: boolean;
-    pointerId: number;
-    pointerType: any;
-    pressure: number;
-    rotation: number;
-    tiltX: number;
-    tiltY: number;
-    width: number;
+    readonly currentPoint: any;
+    readonly height: number;
+    readonly hwTimestamp: number;
+    readonly intermediatePoints: any;
+    readonly isPrimary: boolean;
+    readonly pointerId: number;
+    readonly pointerType: any;
+    readonly pressure: number;
+    readonly rotation: number;
+    readonly tiltX: number;
+    readonly tiltY: number;
+    readonly width: number;
     getCurrentPoint(element: Element): void;
     getIntermediatePoints(element: Element): void;
     initPointerEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget, offsetXArg: number, offsetYArg: number, widthArg: number, heightArg: number, pressure: number, rotation: number, tiltX: number, tiltY: number, pointerIdArg: number, pointerType: any, hwTimestampArg: number, isPrimary: boolean): void;
@@ -11539,7 +12273,7 @@ declare var MSPointerEvent: {
 }
 
 interface MSRangeCollection {
-    length: number;
+    readonly length: number;
     item(index: number): Range;
     [index: number]: Range;
 }
@@ -11550,8 +12284,8 @@ declare var MSRangeCollection: {
 }
 
 interface MSSiteModeEvent extends Event {
-    actionURL: string;
-    buttonID: number;
+    readonly actionURL: string;
+    readonly buttonID: number;
 }
 
 declare var MSSiteModeEvent: {
@@ -11560,7 +12294,7 @@ declare var MSSiteModeEvent: {
 }
 
 interface MSStream {
-    type: string;
+    readonly type: string;
     msClose(): void;
     msDetachStream(): any;
 }
@@ -11571,7 +12305,7 @@ declare var MSStream: {
 }
 
 interface MSStreamReader extends EventTarget, MSBaseReader {
-    error: DOMError;
+    readonly error: DOMError;
     readAsArrayBuffer(stream: MSStream, size?: number): void;
     readAsBinaryString(stream: MSStream, size?: number): void;
     readAsBlob(stream: MSStream, size?: number): void;
@@ -11586,20 +12320,20 @@ declare var MSStreamReader: {
 }
 
 interface MSWebViewAsyncOperation extends EventTarget {
-    error: DOMError;
+    readonly error: DOMError;
     oncomplete: (ev: Event) => any;
     onerror: (ev: Event) => any;
-    readyState: number;
-    result: any;
-    target: MSHTMLWebViewElement;
-    type: number;
+    readonly readyState: number;
+    readonly result: any;
+    readonly target: MSHTMLWebViewElement;
+    readonly type: number;
     start(): void;
-    COMPLETED: number;
-    ERROR: number;
-    STARTED: number;
-    TYPE_CAPTURE_PREVIEW_TO_RANDOM_ACCESS_STREAM: number;
-    TYPE_CREATE_DATA_PACKAGE_FROM_SELECTION: number;
-    TYPE_INVOKE_SCRIPT: number;
+    readonly COMPLETED: number;
+    readonly ERROR: number;
+    readonly STARTED: number;
+    readonly TYPE_CAPTURE_PREVIEW_TO_RANDOM_ACCESS_STREAM: number;
+    readonly TYPE_CREATE_DATA_PACKAGE_FROM_SELECTION: number;
+    readonly TYPE_INVOKE_SCRIPT: number;
     addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -11608,12 +12342,12 @@ interface MSWebViewAsyncOperation extends EventTarget {
 declare var MSWebViewAsyncOperation: {
     prototype: MSWebViewAsyncOperation;
     new(): MSWebViewAsyncOperation;
-    COMPLETED: number;
-    ERROR: number;
-    STARTED: number;
-    TYPE_CAPTURE_PREVIEW_TO_RANDOM_ACCESS_STREAM: number;
-    TYPE_CREATE_DATA_PACKAGE_FROM_SELECTION: number;
-    TYPE_INVOKE_SCRIPT: number;
+    readonly COMPLETED: number;
+    readonly ERROR: number;
+    readonly STARTED: number;
+    readonly TYPE_CAPTURE_PREVIEW_TO_RANDOM_ACCESS_STREAM: number;
+    readonly TYPE_CREATE_DATA_PACKAGE_FROM_SELECTION: number;
+    readonly TYPE_INVOKE_SCRIPT: number;
 }
 
 interface MSWebViewSettings {
@@ -11626,6 +12360,32 @@ declare var MSWebViewSettings: {
     new(): MSWebViewSettings;
 }
 
+interface MediaDeviceInfo {
+    readonly deviceId: string;
+    readonly groupId: string;
+    readonly kind: string;
+    readonly label: string;
+}
+
+declare var MediaDeviceInfo: {
+    prototype: MediaDeviceInfo;
+    new(): MediaDeviceInfo;
+}
+
+interface MediaDevices extends EventTarget {
+    ondevicechange: (ev: Event) => any;
+    enumerateDevices(): any;
+    getSupportedConstraints(): MediaTrackSupportedConstraints;
+    getUserMedia(constraints: MediaStreamConstraints): PromiseLike<MediaStream>;
+    addEventListener(type: "devicechange", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var MediaDevices: {
+    prototype: MediaDevices;
+    new(): MediaDevices;
+}
+
 interface MediaElementAudioSourceNode extends AudioNode {
 }
 
@@ -11634,28 +12394,98 @@ declare var MediaElementAudioSourceNode: {
     new(): MediaElementAudioSourceNode;
 }
 
+interface MediaEncryptedEvent extends Event {
+    readonly initData: ArrayBuffer;
+    readonly initDataType: string;
+}
+
+declare var MediaEncryptedEvent: {
+    prototype: MediaEncryptedEvent;
+    new(type: string, eventInitDict?: MediaEncryptedEventInit): MediaEncryptedEvent;
+}
+
 interface MediaError {
-    code: number;
-    msExtendedCode: number;
-    MEDIA_ERR_ABORTED: number;
-    MEDIA_ERR_DECODE: number;
-    MEDIA_ERR_NETWORK: number;
-    MEDIA_ERR_SRC_NOT_SUPPORTED: number;
-    MS_MEDIA_ERR_ENCRYPTED: number;
+    readonly code: number;
+    readonly msExtendedCode: number;
+    readonly MEDIA_ERR_ABORTED: number;
+    readonly MEDIA_ERR_DECODE: number;
+    readonly MEDIA_ERR_NETWORK: number;
+    readonly MEDIA_ERR_SRC_NOT_SUPPORTED: number;
+    readonly MS_MEDIA_ERR_ENCRYPTED: number;
 }
 
 declare var MediaError: {
     prototype: MediaError;
     new(): MediaError;
-    MEDIA_ERR_ABORTED: number;
-    MEDIA_ERR_DECODE: number;
-    MEDIA_ERR_NETWORK: number;
-    MEDIA_ERR_SRC_NOT_SUPPORTED: number;
-    MS_MEDIA_ERR_ENCRYPTED: number;
+    readonly MEDIA_ERR_ABORTED: number;
+    readonly MEDIA_ERR_DECODE: number;
+    readonly MEDIA_ERR_NETWORK: number;
+    readonly MEDIA_ERR_SRC_NOT_SUPPORTED: number;
+    readonly MS_MEDIA_ERR_ENCRYPTED: number;
+}
+
+interface MediaKeyMessageEvent extends Event {
+    readonly message: ArrayBuffer;
+    readonly messageType: string;
+}
+
+declare var MediaKeyMessageEvent: {
+    prototype: MediaKeyMessageEvent;
+    new(type: string, eventInitDict?: MediaKeyMessageEventInit): MediaKeyMessageEvent;
+}
+
+interface MediaKeySession extends EventTarget {
+    readonly closed: PromiseLike<void>;
+    readonly expiration: number;
+    readonly keyStatuses: MediaKeyStatusMap;
+    readonly sessionId: string;
+    close(): PromiseLike<void>;
+    generateRequest(initDataType: string, initData: any): PromiseLike<void>;
+    load(sessionId: string): PromiseLike<boolean>;
+    remove(): PromiseLike<void>;
+    update(response: any): PromiseLike<void>;
+}
+
+declare var MediaKeySession: {
+    prototype: MediaKeySession;
+    new(): MediaKeySession;
+}
+
+interface MediaKeyStatusMap {
+    readonly size: number;
+    forEach(callback: ForEachCallback): void;
+    get(keyId: any): string;
+    has(keyId: any): boolean;
+}
+
+declare var MediaKeyStatusMap: {
+    prototype: MediaKeyStatusMap;
+    new(): MediaKeyStatusMap;
+}
+
+interface MediaKeySystemAccess {
+    readonly keySystem: string;
+    createMediaKeys(): PromiseLike<MediaKeys>;
+    getConfiguration(): MediaKeySystemConfiguration;
+}
+
+declare var MediaKeySystemAccess: {
+    prototype: MediaKeySystemAccess;
+    new(): MediaKeySystemAccess;
+}
+
+interface MediaKeys {
+    createSession(sessionType?: string): MediaKeySession;
+    setServerCertificate(serverCertificate: any): PromiseLike<void>;
+}
+
+declare var MediaKeys: {
+    prototype: MediaKeys;
+    new(): MediaKeys;
 }
 
 interface MediaList {
-    length: number;
+    readonly length: number;
     mediaText: string;
     appendMedium(newMedium: string): void;
     deleteMedium(oldMedium: string): void;
@@ -11670,8 +12500,8 @@ declare var MediaList: {
 }
 
 interface MediaQueryList {
-    matches: boolean;
-    media: string;
+    readonly matches: boolean;
+    readonly media: string;
     addListener(listener: MediaQueryListListener): void;
     removeListener(listener: MediaQueryListListener): void;
 }
@@ -11682,10 +12512,10 @@ declare var MediaQueryList: {
 }
 
 interface MediaSource extends EventTarget {
-    activeSourceBuffers: SourceBufferList;
+    readonly activeSourceBuffers: SourceBufferList;
     duration: number;
-    readyState: string;
-    sourceBuffers: SourceBufferList;
+    readonly readyState: string;
+    readonly sourceBuffers: SourceBufferList;
     addSourceBuffer(type: string): SourceBuffer;
     endOfStream(error?: number): void;
     removeSourceBuffer(sourceBuffer: SourceBuffer): void;
@@ -11697,9 +12527,104 @@ declare var MediaSource: {
     isTypeSupported(type: string): boolean;
 }
 
+interface MediaStream extends EventTarget {
+    readonly active: boolean;
+    readonly id: string;
+    onactive: (ev: Event) => any;
+    onaddtrack: (ev: TrackEvent) => any;
+    oninactive: (ev: Event) => any;
+    onremovetrack: (ev: TrackEvent) => any;
+    addTrack(track: MediaStreamTrack): void;
+    clone(): MediaStream;
+    getAudioTracks(): MediaStreamTrack[];
+    getTrackById(trackId: string): MediaStreamTrack;
+    getTracks(): MediaStreamTrack[];
+    getVideoTracks(): MediaStreamTrack[];
+    removeTrack(track: MediaStreamTrack): void;
+    stop(): void;
+    addEventListener(type: "active", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "addtrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "inactive", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "removetrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var MediaStream: {
+    prototype: MediaStream;
+    new(streamOrTracks?: MediaStream | MediaStreamTrack[]): MediaStream;
+}
+
+interface MediaStreamAudioSourceNode extends AudioNode {
+}
+
+declare var MediaStreamAudioSourceNode: {
+    prototype: MediaStreamAudioSourceNode;
+    new(): MediaStreamAudioSourceNode;
+}
+
+interface MediaStreamError {
+    readonly constraintName: string;
+    readonly message: string;
+    readonly name: string;
+}
+
+declare var MediaStreamError: {
+    prototype: MediaStreamError;
+    new(): MediaStreamError;
+}
+
+interface MediaStreamErrorEvent extends Event {
+    readonly error: MediaStreamError;
+}
+
+declare var MediaStreamErrorEvent: {
+    prototype: MediaStreamErrorEvent;
+    new(type: string, eventInitDict?: MediaStreamErrorEventInit): MediaStreamErrorEvent;
+}
+
+interface MediaStreamTrack extends EventTarget {
+    enabled: boolean;
+    readonly id: string;
+    readonly kind: string;
+    readonly label: string;
+    readonly muted: boolean;
+    onended: (ev: MediaStreamErrorEvent) => any;
+    onmute: (ev: Event) => any;
+    onoverconstrained: (ev: MediaStreamErrorEvent) => any;
+    onunmute: (ev: Event) => any;
+    readonly readonly: boolean;
+    readonly readyState: string;
+    readonly remote: boolean;
+    applyConstraints(constraints: MediaTrackConstraints): PromiseLike<void>;
+    clone(): MediaStreamTrack;
+    getCapabilities(): MediaTrackCapabilities;
+    getConstraints(): MediaTrackConstraints;
+    getSettings(): MediaTrackSettings;
+    stop(): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mute", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "overconstrained", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "unmute", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var MediaStreamTrack: {
+    prototype: MediaStreamTrack;
+    new(): MediaStreamTrack;
+}
+
+interface MediaStreamTrackEvent extends Event {
+    readonly track: MediaStreamTrack;
+}
+
+declare var MediaStreamTrackEvent: {
+    prototype: MediaStreamTrackEvent;
+    new(type: string, eventInitDict?: MediaStreamTrackEventInit): MediaStreamTrackEvent;
+}
+
 interface MessageChannel {
-    port1: MessagePort;
-    port2: MessagePort;
+    readonly port1: MessagePort;
+    readonly port2: MessagePort;
 }
 
 declare var MessageChannel: {
@@ -11708,10 +12633,10 @@ declare var MessageChannel: {
 }
 
 interface MessageEvent extends Event {
-    data: any;
-    origin: string;
-    ports: any;
-    source: Window;
+    readonly data: any;
+    readonly origin: string;
+    readonly ports: any;
+    readonly source: Window;
     initMessageEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, dataArg: any, originArg: string, lastEventIdArg: string, sourceArg: Window): void;
 }
 
@@ -11735,10 +12660,10 @@ declare var MessagePort: {
 }
 
 interface MimeType {
-    description: string;
-    enabledPlugin: Plugin;
-    suffixes: string;
-    type: string;
+    readonly description: string;
+    readonly enabledPlugin: Plugin;
+    readonly suffixes: string;
+    readonly type: string;
 }
 
 declare var MimeType: {
@@ -11747,7 +12672,7 @@ declare var MimeType: {
 }
 
 interface MimeTypeArray {
-    length: number;
+    readonly length: number;
     item(index: number): Plugin;
     namedItem(type: string): Plugin;
     [index: number]: Plugin;
@@ -11759,30 +12684,30 @@ declare var MimeTypeArray: {
 }
 
 interface MouseEvent extends UIEvent {
-    altKey: boolean;
-    button: number;
-    buttons: number;
-    clientX: number;
-    clientY: number;
-    ctrlKey: boolean;
-    fromElement: Element;
-    layerX: number;
-    layerY: number;
-    metaKey: boolean;
-    movementX: number;
-    movementY: number;
-    offsetX: number;
-    offsetY: number;
-    pageX: number;
-    pageY: number;
-    relatedTarget: EventTarget;
-    screenX: number;
-    screenY: number;
-    shiftKey: boolean;
-    toElement: Element;
-    which: number;
-    x: number;
-    y: number;
+    readonly altKey: boolean;
+    readonly button: number;
+    readonly buttons: number;
+    readonly clientX: number;
+    readonly clientY: number;
+    readonly ctrlKey: boolean;
+    readonly fromElement: Element;
+    readonly layerX: number;
+    readonly layerY: number;
+    readonly metaKey: boolean;
+    readonly movementX: number;
+    readonly movementY: number;
+    readonly offsetX: number;
+    readonly offsetY: number;
+    readonly pageX: number;
+    readonly pageY: number;
+    readonly relatedTarget: EventTarget;
+    readonly screenX: number;
+    readonly screenY: number;
+    readonly shiftKey: boolean;
+    readonly toElement: Element;
+    readonly which: number;
+    readonly x: number;
+    readonly y: number;
     getModifierState(keyArg: string): boolean;
     initMouseEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget): void;
 }
@@ -11792,36 +12717,24 @@ declare var MouseEvent: {
     new(typeArg: string, eventInitDict?: MouseEventInit): MouseEvent;
 }
 
-interface MouseWheelEvent extends MouseEvent {
-    wheelDelta: number;
-    wheelDeltaX: number;
-    wheelDeltaY: number;
-    initMouseWheelEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, buttonArg: number, relatedTargetArg: EventTarget, modifiersListArg: string, wheelDeltaArg: number): void;
-}
-
-declare var MouseWheelEvent: {
-    prototype: MouseWheelEvent;
-    new(): MouseWheelEvent;
-}
-
 interface MutationEvent extends Event {
-    attrChange: number;
-    attrName: string;
-    newValue: string;
-    prevValue: string;
-    relatedNode: Node;
+    readonly attrChange: number;
+    readonly attrName: string;
+    readonly newValue: string;
+    readonly prevValue: string;
+    readonly relatedNode: Node;
     initMutationEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, relatedNodeArg: Node, prevValueArg: string, newValueArg: string, attrNameArg: string, attrChangeArg: number): void;
-    ADDITION: number;
-    MODIFICATION: number;
-    REMOVAL: number;
+    readonly ADDITION: number;
+    readonly MODIFICATION: number;
+    readonly REMOVAL: number;
 }
 
 declare var MutationEvent: {
     prototype: MutationEvent;
     new(): MutationEvent;
-    ADDITION: number;
-    MODIFICATION: number;
-    REMOVAL: number;
+    readonly ADDITION: number;
+    readonly MODIFICATION: number;
+    readonly REMOVAL: number;
 }
 
 interface MutationObserver {
@@ -11836,15 +12749,15 @@ declare var MutationObserver: {
 }
 
 interface MutationRecord {
-    addedNodes: NodeList;
-    attributeName: string;
-    attributeNamespace: string;
-    nextSibling: Node;
-    oldValue: string;
-    previousSibling: Node;
-    removedNodes: NodeList;
-    target: Node;
-    type: string;
+    readonly addedNodes: NodeList;
+    readonly attributeName: string;
+    readonly attributeNamespace: string;
+    readonly nextSibling: Node;
+    readonly oldValue: string;
+    readonly previousSibling: Node;
+    readonly removedNodes: NodeList;
+    readonly target: Node;
+    readonly type: string;
 }
 
 declare var MutationRecord: {
@@ -11853,7 +12766,7 @@ declare var MutationRecord: {
 }
 
 interface NamedNodeMap {
-    length: number;
+    readonly length: number;
     getNamedItem(name: string): Attr;
     getNamedItemNS(namespaceURI: string, localName: string): Attr;
     item(index: number): Attr;
@@ -11870,8 +12783,8 @@ declare var NamedNodeMap: {
 }
 
 interface NavigationCompletedEvent extends NavigationEvent {
-    isSuccess: boolean;
-    webErrorStatus: number;
+    readonly isSuccess: boolean;
+    readonly webErrorStatus: number;
 }
 
 declare var NavigationCompletedEvent: {
@@ -11880,7 +12793,7 @@ declare var NavigationCompletedEvent: {
 }
 
 interface NavigationEvent extends Event {
-    uri: string;
+    readonly uri: string;
 }
 
 declare var NavigationEvent: {
@@ -11889,7 +12802,7 @@ declare var NavigationEvent: {
 }
 
 interface NavigationEventWithReferrer extends NavigationEvent {
-    referer: string;
+    readonly referer: string;
 }
 
 declare var NavigationEventWithReferrer: {
@@ -11897,27 +12810,22 @@ declare var NavigationEventWithReferrer: {
     new(): NavigationEventWithReferrer;
 }
 
-interface Navigator extends Object, NavigatorID, NavigatorOnLine, NavigatorContentUtils, NavigatorStorageUtils, NavigatorGeolocation, MSNavigatorDoNotTrack, MSFileSaver {
-    appCodeName: string;
-    appMinorVersion: string;
-    browserLanguage: string;
-    connectionSpeed: number;
-    cookieEnabled: boolean;
-    cpuClass: string;
-    language: string;
-    maxTouchPoints: number;
-    mimeTypes: MSMimeTypesCollection;
-    msManipulationViewsEnabled: boolean;
-    msMaxTouchPoints: number;
-    msPointerEnabled: boolean;
-    plugins: MSPluginsCollection;
-    pointerEnabled: boolean;
-    systemLanguage: string;
-    userLanguage: string;
-    webdriver: boolean;
+interface Navigator extends Object, NavigatorID, NavigatorOnLine, NavigatorContentUtils, NavigatorStorageUtils, NavigatorGeolocation, MSNavigatorDoNotTrack, MSFileSaver, NavigatorUserMedia {
+    readonly appCodeName: string;
+    readonly cookieEnabled: boolean;
+    readonly language: string;
+    readonly maxTouchPoints: number;
+    readonly mimeTypes: MimeTypeArray;
+    readonly msManipulationViewsEnabled: boolean;
+    readonly msMaxTouchPoints: number;
+    readonly msPointerEnabled: boolean;
+    readonly plugins: PluginArray;
+    readonly pointerEnabled: boolean;
+    readonly webdriver: boolean;
     getGamepads(): Gamepad[];
     javaEnabled(): boolean;
     msLaunchUri(uri: string, successCallback?: MSLaunchUriCallback, noHandlerCallback?: MSLaunchUriCallback): void;
+    requestMediaKeySystemAccess(keySystem: string, supportedConfigurations: MediaKeySystemConfiguration[]): PromiseLike<MediaKeySystemAccess>;
     vibrate(pattern: number | number[]): boolean;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
@@ -11928,26 +12836,26 @@ declare var Navigator: {
 }
 
 interface Node extends EventTarget {
-    attributes: NamedNodeMap;
-    baseURI: string;
-    childNodes: NodeList;
-    firstChild: Node;
-    lastChild: Node;
-    localName: string;
-    namespaceURI: string;
-    nextSibling: Node;
-    nodeName: string;
-    nodeType: number;
+    readonly attributes: NamedNodeMap;
+    readonly baseURI: string;
+    readonly childNodes: NodeList;
+    readonly firstChild: Node;
+    readonly lastChild: Node;
+    readonly localName: string;
+    readonly namespaceURI: string;
+    readonly nextSibling: Node;
+    readonly nodeName: string;
+    readonly nodeType: number;
     nodeValue: string;
-    ownerDocument: Document;
-    parentElement: HTMLElement;
-    parentNode: Node;
-    prefix: string;
-    previousSibling: Node;
+    readonly ownerDocument: Document;
+    readonly parentElement: HTMLElement;
+    readonly parentNode: Node;
+    readonly previousSibling: Node;
     textContent: string;
     appendChild(newChild: Node): Node;
     cloneNode(deep?: boolean): Node;
     compareDocumentPosition(other: Node): number;
+    contains(child: Node): boolean;
     hasAttributes(): boolean;
     hasChildNodes(): boolean;
     insertBefore(newChild: Node, refChild?: Node): Node;
@@ -11960,47 +12868,47 @@ interface Node extends EventTarget {
     removeChild(oldChild: Node): Node;
     replaceChild(newChild: Node, oldChild: Node): Node;
     contains(node: Node): boolean;
-    ATTRIBUTE_NODE: number;
-    CDATA_SECTION_NODE: number;
-    COMMENT_NODE: number;
-    DOCUMENT_FRAGMENT_NODE: number;
-    DOCUMENT_NODE: number;
-    DOCUMENT_POSITION_CONTAINED_BY: number;
-    DOCUMENT_POSITION_CONTAINS: number;
-    DOCUMENT_POSITION_DISCONNECTED: number;
-    DOCUMENT_POSITION_FOLLOWING: number;
-    DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number;
-    DOCUMENT_POSITION_PRECEDING: number;
-    DOCUMENT_TYPE_NODE: number;
-    ELEMENT_NODE: number;
-    ENTITY_NODE: number;
-    ENTITY_REFERENCE_NODE: number;
-    NOTATION_NODE: number;
-    PROCESSING_INSTRUCTION_NODE: number;
-    TEXT_NODE: number;
+    readonly ATTRIBUTE_NODE: number;
+    readonly CDATA_SECTION_NODE: number;
+    readonly COMMENT_NODE: number;
+    readonly DOCUMENT_FRAGMENT_NODE: number;
+    readonly DOCUMENT_NODE: number;
+    readonly DOCUMENT_POSITION_CONTAINED_BY: number;
+    readonly DOCUMENT_POSITION_CONTAINS: number;
+    readonly DOCUMENT_POSITION_DISCONNECTED: number;
+    readonly DOCUMENT_POSITION_FOLLOWING: number;
+    readonly DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number;
+    readonly DOCUMENT_POSITION_PRECEDING: number;
+    readonly DOCUMENT_TYPE_NODE: number;
+    readonly ELEMENT_NODE: number;
+    readonly ENTITY_NODE: number;
+    readonly ENTITY_REFERENCE_NODE: number;
+    readonly NOTATION_NODE: number;
+    readonly PROCESSING_INSTRUCTION_NODE: number;
+    readonly TEXT_NODE: number;
 }
 
 declare var Node: {
     prototype: Node;
     new(): Node;
-    ATTRIBUTE_NODE: number;
-    CDATA_SECTION_NODE: number;
-    COMMENT_NODE: number;
-    DOCUMENT_FRAGMENT_NODE: number;
-    DOCUMENT_NODE: number;
-    DOCUMENT_POSITION_CONTAINED_BY: number;
-    DOCUMENT_POSITION_CONTAINS: number;
-    DOCUMENT_POSITION_DISCONNECTED: number;
-    DOCUMENT_POSITION_FOLLOWING: number;
-    DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number;
-    DOCUMENT_POSITION_PRECEDING: number;
-    DOCUMENT_TYPE_NODE: number;
-    ELEMENT_NODE: number;
-    ENTITY_NODE: number;
-    ENTITY_REFERENCE_NODE: number;
-    NOTATION_NODE: number;
-    PROCESSING_INSTRUCTION_NODE: number;
-    TEXT_NODE: number;
+    readonly ATTRIBUTE_NODE: number;
+    readonly CDATA_SECTION_NODE: number;
+    readonly COMMENT_NODE: number;
+    readonly DOCUMENT_FRAGMENT_NODE: number;
+    readonly DOCUMENT_NODE: number;
+    readonly DOCUMENT_POSITION_CONTAINED_BY: number;
+    readonly DOCUMENT_POSITION_CONTAINS: number;
+    readonly DOCUMENT_POSITION_DISCONNECTED: number;
+    readonly DOCUMENT_POSITION_FOLLOWING: number;
+    readonly DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number;
+    readonly DOCUMENT_POSITION_PRECEDING: number;
+    readonly DOCUMENT_TYPE_NODE: number;
+    readonly ELEMENT_NODE: number;
+    readonly ENTITY_NODE: number;
+    readonly ENTITY_REFERENCE_NODE: number;
+    readonly NOTATION_NODE: number;
+    readonly PROCESSING_INSTRUCTION_NODE: number;
+    readonly TEXT_NODE: number;
 }
 
 interface NodeFilter {
@@ -12008,29 +12916,29 @@ interface NodeFilter {
 }
 
 declare var NodeFilter: {
-    FILTER_ACCEPT: number;
-    FILTER_REJECT: number;
-    FILTER_SKIP: number;
-    SHOW_ALL: number;
-    SHOW_ATTRIBUTE: number;
-    SHOW_CDATA_SECTION: number;
-    SHOW_COMMENT: number;
-    SHOW_DOCUMENT: number;
-    SHOW_DOCUMENT_FRAGMENT: number;
-    SHOW_DOCUMENT_TYPE: number;
-    SHOW_ELEMENT: number;
-    SHOW_ENTITY: number;
-    SHOW_ENTITY_REFERENCE: number;
-    SHOW_NOTATION: number;
-    SHOW_PROCESSING_INSTRUCTION: number;
-    SHOW_TEXT: number;
+    readonly FILTER_ACCEPT: number;
+    readonly FILTER_REJECT: number;
+    readonly FILTER_SKIP: number;
+    readonly SHOW_ALL: number;
+    readonly SHOW_ATTRIBUTE: number;
+    readonly SHOW_CDATA_SECTION: number;
+    readonly SHOW_COMMENT: number;
+    readonly SHOW_DOCUMENT: number;
+    readonly SHOW_DOCUMENT_FRAGMENT: number;
+    readonly SHOW_DOCUMENT_TYPE: number;
+    readonly SHOW_ELEMENT: number;
+    readonly SHOW_ENTITY: number;
+    readonly SHOW_ENTITY_REFERENCE: number;
+    readonly SHOW_NOTATION: number;
+    readonly SHOW_PROCESSING_INSTRUCTION: number;
+    readonly SHOW_TEXT: number;
 }
 
 interface NodeIterator {
-    expandEntityReferences: boolean;
-    filter: NodeFilter;
-    root: Node;
-    whatToShow: number;
+    readonly expandEntityReferences: boolean;
+    readonly filter: NodeFilter;
+    readonly root: Node;
+    readonly whatToShow: number;
     detach(): void;
     nextNode(): Node;
     previousNode(): Node;
@@ -12042,7 +12950,7 @@ declare var NodeIterator: {
 }
 
 interface NodeList {
-    length: number;
+    readonly length: number;
     item(index: number): Node;
     [index: number]: Node;
 }
@@ -12061,13 +12969,13 @@ declare var OES_element_index_uint: {
 }
 
 interface OES_standard_derivatives {
-    FRAGMENT_SHADER_DERIVATIVE_HINT_OES: number;
+    readonly FRAGMENT_SHADER_DERIVATIVE_HINT_OES: number;
 }
 
 declare var OES_standard_derivatives: {
     prototype: OES_standard_derivatives;
     new(): OES_standard_derivatives;
-    FRAGMENT_SHADER_DERIVATIVE_HINT_OES: number;
+    readonly FRAGMENT_SHADER_DERIVATIVE_HINT_OES: number;
 }
 
 interface OES_texture_float {
@@ -12087,7 +12995,7 @@ declare var OES_texture_float_linear: {
 }
 
 interface OfflineAudioCompletionEvent extends Event {
-    renderedBuffer: AudioBuffer;
+    readonly renderedBuffer: AudioBuffer;
 }
 
 declare var OfflineAudioCompletionEvent: {
@@ -12097,7 +13005,7 @@ declare var OfflineAudioCompletionEvent: {
 
 interface OfflineAudioContext extends AudioContext {
     oncomplete: (ev: Event) => any;
-    startRendering(): void;
+    startRendering(): PromiseLike<AudioBuffer>;
     addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
@@ -12108,14 +13016,14 @@ declare var OfflineAudioContext: {
 }
 
 interface OscillatorNode extends AudioNode {
-    detune: AudioParam;
-    frequency: AudioParam;
-    onended: (ev: Event) => any;
+    readonly detune: AudioParam;
+    readonly frequency: AudioParam;
+    onended: (ev: MediaStreamErrorEvent) => any;
     type: string;
     setPeriodicWave(periodicWave: PeriodicWave): void;
     start(when?: number): void;
     stop(when?: number): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -12124,8 +13032,25 @@ declare var OscillatorNode: {
     new(): OscillatorNode;
 }
 
+interface OverflowEvent extends UIEvent {
+    readonly horizontalOverflow: boolean;
+    readonly orient: number;
+    readonly verticalOverflow: boolean;
+    readonly BOTH: number;
+    readonly HORIZONTAL: number;
+    readonly VERTICAL: number;
+}
+
+declare var OverflowEvent: {
+    prototype: OverflowEvent;
+    new(): OverflowEvent;
+    readonly BOTH: number;
+    readonly HORIZONTAL: number;
+    readonly VERTICAL: number;
+}
+
 interface PageTransitionEvent extends Event {
-    persisted: boolean;
+    readonly persisted: boolean;
 }
 
 declare var PageTransitionEvent: {
@@ -12153,17 +13078,17 @@ declare var PannerNode: {
 }
 
 interface PerfWidgetExternal {
-    activeNetworkRequestCount: number;
-    averageFrameTime: number;
-    averagePaintTime: number;
-    extraInformationEnabled: boolean;
-    independentRenderingEnabled: boolean;
-    irDisablingContentString: string;
-    irStatusAvailable: boolean;
-    maxCpuSpeed: number;
-    paintRequestsPerSecond: number;
-    performanceCounter: number;
-    performanceCounterFrequency: number;
+    readonly activeNetworkRequestCount: number;
+    readonly averageFrameTime: number;
+    readonly averagePaintTime: number;
+    readonly extraInformationEnabled: boolean;
+    readonly independentRenderingEnabled: boolean;
+    readonly irDisablingContentString: string;
+    readonly irStatusAvailable: boolean;
+    readonly maxCpuSpeed: number;
+    readonly paintRequestsPerSecond: number;
+    readonly performanceCounter: number;
+    readonly performanceCounterFrequency: number;
     addEventListener(eventType: string, callback: Function): void;
     getMemoryUsage(): number;
     getProcessCpuUsage(): number;
@@ -12182,8 +13107,8 @@ declare var PerfWidgetExternal: {
 }
 
 interface Performance {
-    navigation: PerformanceNavigation;
-    timing: PerformanceTiming;
+    readonly navigation: PerformanceNavigation;
+    readonly timing: PerformanceTiming;
     clearMarks(markName?: string): void;
     clearMeasures(measureName?: string): void;
     clearResourceTimings(): void;
@@ -12205,10 +13130,10 @@ declare var Performance: {
 }
 
 interface PerformanceEntry {
-    duration: number;
-    entryType: string;
-    name: string;
-    startTime: number;
+    readonly duration: number;
+    readonly entryType: string;
+    readonly name: string;
+    readonly startTime: number;
 }
 
 declare var PerformanceEntry: {
@@ -12233,47 +13158,47 @@ declare var PerformanceMeasure: {
 }
 
 interface PerformanceNavigation {
-    redirectCount: number;
-    type: number;
+    readonly redirectCount: number;
+    readonly type: number;
     toJSON(): any;
-    TYPE_BACK_FORWARD: number;
-    TYPE_NAVIGATE: number;
-    TYPE_RELOAD: number;
-    TYPE_RESERVED: number;
+    readonly TYPE_BACK_FORWARD: number;
+    readonly TYPE_NAVIGATE: number;
+    readonly TYPE_RELOAD: number;
+    readonly TYPE_RESERVED: number;
 }
 
 declare var PerformanceNavigation: {
     prototype: PerformanceNavigation;
     new(): PerformanceNavigation;
-    TYPE_BACK_FORWARD: number;
-    TYPE_NAVIGATE: number;
-    TYPE_RELOAD: number;
-    TYPE_RESERVED: number;
+    readonly TYPE_BACK_FORWARD: number;
+    readonly TYPE_NAVIGATE: number;
+    readonly TYPE_RELOAD: number;
+    readonly TYPE_RESERVED: number;
 }
 
 interface PerformanceNavigationTiming extends PerformanceEntry {
-    connectEnd: number;
-    connectStart: number;
-    domComplete: number;
-    domContentLoadedEventEnd: number;
-    domContentLoadedEventStart: number;
-    domInteractive: number;
-    domLoading: number;
-    domainLookupEnd: number;
-    domainLookupStart: number;
-    fetchStart: number;
-    loadEventEnd: number;
-    loadEventStart: number;
-    navigationStart: number;
-    redirectCount: number;
-    redirectEnd: number;
-    redirectStart: number;
-    requestStart: number;
-    responseEnd: number;
-    responseStart: number;
-    type: string;
-    unloadEventEnd: number;
-    unloadEventStart: number;
+    readonly connectEnd: number;
+    readonly connectStart: number;
+    readonly domComplete: number;
+    readonly domContentLoadedEventEnd: number;
+    readonly domContentLoadedEventStart: number;
+    readonly domInteractive: number;
+    readonly domLoading: number;
+    readonly domainLookupEnd: number;
+    readonly domainLookupStart: number;
+    readonly fetchStart: number;
+    readonly loadEventEnd: number;
+    readonly loadEventStart: number;
+    readonly navigationStart: number;
+    readonly redirectCount: number;
+    readonly redirectEnd: number;
+    readonly redirectStart: number;
+    readonly requestStart: number;
+    readonly responseEnd: number;
+    readonly responseStart: number;
+    readonly type: string;
+    readonly unloadEventEnd: number;
+    readonly unloadEventStart: number;
 }
 
 declare var PerformanceNavigationTiming: {
@@ -12282,17 +13207,17 @@ declare var PerformanceNavigationTiming: {
 }
 
 interface PerformanceResourceTiming extends PerformanceEntry {
-    connectEnd: number;
-    connectStart: number;
-    domainLookupEnd: number;
-    domainLookupStart: number;
-    fetchStart: number;
-    initiatorType: string;
-    redirectEnd: number;
-    redirectStart: number;
-    requestStart: number;
-    responseEnd: number;
-    responseStart: number;
+    readonly connectEnd: number;
+    readonly connectStart: number;
+    readonly domainLookupEnd: number;
+    readonly domainLookupStart: number;
+    readonly fetchStart: number;
+    readonly initiatorType: string;
+    readonly redirectEnd: number;
+    readonly redirectStart: number;
+    readonly requestStart: number;
+    readonly responseEnd: number;
+    readonly responseStart: number;
 }
 
 declare var PerformanceResourceTiming: {
@@ -12301,27 +13226,27 @@ declare var PerformanceResourceTiming: {
 }
 
 interface PerformanceTiming {
-    connectEnd: number;
-    connectStart: number;
-    domComplete: number;
-    domContentLoadedEventEnd: number;
-    domContentLoadedEventStart: number;
-    domInteractive: number;
-    domLoading: number;
-    domainLookupEnd: number;
-    domainLookupStart: number;
-    fetchStart: number;
-    loadEventEnd: number;
-    loadEventStart: number;
-    msFirstPaint: number;
-    navigationStart: number;
-    redirectEnd: number;
-    redirectStart: number;
-    requestStart: number;
-    responseEnd: number;
-    responseStart: number;
-    unloadEventEnd: number;
-    unloadEventStart: number;
+    readonly connectEnd: number;
+    readonly connectStart: number;
+    readonly domComplete: number;
+    readonly domContentLoadedEventEnd: number;
+    readonly domContentLoadedEventStart: number;
+    readonly domInteractive: number;
+    readonly domLoading: number;
+    readonly domainLookupEnd: number;
+    readonly domainLookupStart: number;
+    readonly fetchStart: number;
+    readonly loadEventEnd: number;
+    readonly loadEventStart: number;
+    readonly msFirstPaint: number;
+    readonly navigationStart: number;
+    readonly redirectEnd: number;
+    readonly redirectStart: number;
+    readonly requestStart: number;
+    readonly responseEnd: number;
+    readonly responseStart: number;
+    readonly unloadEventEnd: number;
+    readonly unloadEventStart: number;
     toJSON(): any;
 }
 
@@ -12339,7 +13264,7 @@ declare var PeriodicWave: {
 }
 
 interface PermissionRequest extends DeferredPermissionRequest {
-    state: string;
+    readonly state: string;
     defer(): void;
 }
 
@@ -12349,7 +13274,7 @@ declare var PermissionRequest: {
 }
 
 interface PermissionRequestedEvent extends Event {
-    permissionRequest: PermissionRequest;
+    readonly permissionRequest: PermissionRequest;
 }
 
 declare var PermissionRequestedEvent: {
@@ -12358,11 +13283,11 @@ declare var PermissionRequestedEvent: {
 }
 
 interface Plugin {
-    description: string;
-    filename: string;
-    length: number;
-    name: string;
-    version: string;
+    readonly description: string;
+    readonly filename: string;
+    readonly length: number;
+    readonly name: string;
+    readonly version: string;
     item(index: number): MimeType;
     namedItem(type: string): MimeType;
     [index: number]: MimeType;
@@ -12374,7 +13299,7 @@ declare var Plugin: {
 }
 
 interface PluginArray {
-    length: number;
+    readonly length: number;
     item(index: number): Plugin;
     namedItem(name: string): Plugin;
     refresh(reload?: boolean): void;
@@ -12387,18 +13312,18 @@ declare var PluginArray: {
 }
 
 interface PointerEvent extends MouseEvent {
-    currentPoint: any;
-    height: number;
-    hwTimestamp: number;
-    intermediatePoints: any;
-    isPrimary: boolean;
-    pointerId: number;
-    pointerType: any;
-    pressure: number;
-    rotation: number;
-    tiltX: number;
-    tiltY: number;
-    width: number;
+    readonly currentPoint: any;
+    readonly height: number;
+    readonly hwTimestamp: number;
+    readonly intermediatePoints: any;
+    readonly isPrimary: boolean;
+    readonly pointerId: number;
+    readonly pointerType: any;
+    readonly pressure: number;
+    readonly rotation: number;
+    readonly tiltX: number;
+    readonly tiltY: number;
+    readonly width: number;
     getCurrentPoint(element: Element): void;
     getIntermediatePoints(element: Element): void;
     initPointerEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget, offsetXArg: number, offsetYArg: number, widthArg: number, heightArg: number, pressure: number, rotation: number, tiltX: number, tiltY: number, pointerIdArg: number, pointerType: any, hwTimestampArg: number, isPrimary: boolean): void;
@@ -12410,7 +13335,7 @@ declare var PointerEvent: {
 }
 
 interface PopStateEvent extends Event {
-    state: any;
+    readonly state: any;
     initPopStateEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, stateArg: any): void;
 }
 
@@ -12420,8 +13345,8 @@ declare var PopStateEvent: {
 }
 
 interface Position {
-    coords: Coordinates;
-    timestamp: number;
+    readonly coords: Coordinates;
+    readonly timestamp: number;
 }
 
 declare var Position: {
@@ -12430,24 +13355,24 @@ declare var Position: {
 }
 
 interface PositionError {
-    code: number;
-    message: string;
+    readonly code: number;
+    readonly message: string;
     toString(): string;
-    PERMISSION_DENIED: number;
-    POSITION_UNAVAILABLE: number;
-    TIMEOUT: number;
+    readonly PERMISSION_DENIED: number;
+    readonly POSITION_UNAVAILABLE: number;
+    readonly TIMEOUT: number;
 }
 
 declare var PositionError: {
     prototype: PositionError;
     new(): PositionError;
-    PERMISSION_DENIED: number;
-    POSITION_UNAVAILABLE: number;
-    TIMEOUT: number;
+    readonly PERMISSION_DENIED: number;
+    readonly POSITION_UNAVAILABLE: number;
+    readonly TIMEOUT: number;
 }
 
 interface ProcessingInstruction extends CharacterData {
-    target: string;
+    readonly target: string;
 }
 
 declare var ProcessingInstruction: {
@@ -12456,9 +13381,9 @@ declare var ProcessingInstruction: {
 }
 
 interface ProgressEvent extends Event {
-    lengthComputable: boolean;
-    loaded: number;
-    total: number;
+    readonly lengthComputable: boolean;
+    readonly loaded: number;
+    readonly total: number;
     initProgressEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, lengthComputableArg: boolean, loadedArg: number, totalArg: number): void;
 }
 
@@ -12467,13 +13392,210 @@ declare var ProgressEvent: {
     new(type: string, eventInitDict?: ProgressEventInit): ProgressEvent;
 }
 
+interface RTCDTMFToneChangeEvent extends Event {
+    readonly tone: string;
+}
+
+declare var RTCDTMFToneChangeEvent: {
+    prototype: RTCDTMFToneChangeEvent;
+    new(type: string, eventInitDict: RTCDTMFToneChangeEventInit): RTCDTMFToneChangeEvent;
+}
+
+interface RTCDtlsTransport extends RTCStatsProvider {
+    ondtlsstatechange: (ev: RTCDtlsTransportStateChangedEvent) => any;
+    onerror: (ev: Event) => any;
+    readonly state: string;
+    readonly transport: RTCIceTransport;
+    getLocalParameters(): RTCDtlsParameters;
+    getRemoteCertificates(): ArrayBuffer[];
+    getRemoteParameters(): RTCDtlsParameters;
+    start(remoteParameters: RTCDtlsParameters): void;
+    stop(): void;
+    addEventListener(type: "dtlsstatechange", listener: (ev: RTCDtlsTransportStateChangedEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCDtlsTransport: {
+    prototype: RTCDtlsTransport;
+    new(transport: RTCIceTransport): RTCDtlsTransport;
+}
+
+interface RTCDtlsTransportStateChangedEvent extends Event {
+    readonly state: string;
+}
+
+declare var RTCDtlsTransportStateChangedEvent: {
+    prototype: RTCDtlsTransportStateChangedEvent;
+    new(): RTCDtlsTransportStateChangedEvent;
+}
+
+interface RTCDtmfSender extends EventTarget {
+    readonly canInsertDTMF: boolean;
+    readonly duration: number;
+    readonly interToneGap: number;
+    ontonechange: (ev: RTCDTMFToneChangeEvent) => any;
+    readonly sender: RTCRtpSender;
+    readonly toneBuffer: string;
+    insertDTMF(tones: string, duration?: number, interToneGap?: number): void;
+    addEventListener(type: "tonechange", listener: (ev: RTCDTMFToneChangeEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCDtmfSender: {
+    prototype: RTCDtmfSender;
+    new(sender: RTCRtpSender): RTCDtmfSender;
+}
+
+interface RTCIceCandidatePairChangedEvent extends Event {
+    readonly pair: RTCIceCandidatePair;
+}
+
+declare var RTCIceCandidatePairChangedEvent: {
+    prototype: RTCIceCandidatePairChangedEvent;
+    new(): RTCIceCandidatePairChangedEvent;
+}
+
+interface RTCIceGatherer extends RTCStatsProvider {
+    readonly component: string;
+    onerror: (ev: Event) => any;
+    onlocalcandidate: (ev: RTCIceGathererEvent) => any;
+    createAssociatedGatherer(): RTCIceGatherer;
+    getLocalCandidates(): RTCIceCandidate[];
+    getLocalParameters(): RTCIceParameters;
+    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "localcandidate", listener: (ev: RTCIceGathererEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCIceGatherer: {
+    prototype: RTCIceGatherer;
+    new(options: RTCIceGatherOptions): RTCIceGatherer;
+}
+
+interface RTCIceGathererEvent extends Event {
+    readonly candidate: RTCIceCandidate | RTCIceCandidateComplete;
+}
+
+declare var RTCIceGathererEvent: {
+    prototype: RTCIceGathererEvent;
+    new(): RTCIceGathererEvent;
+}
+
+interface RTCIceTransport extends RTCStatsProvider {
+    readonly component: string;
+    readonly iceGatherer: RTCIceGatherer;
+    oncandidatepairchange: (ev: RTCIceCandidatePairChangedEvent) => any;
+    onicestatechange: (ev: RTCIceTransportStateChangedEvent) => any;
+    readonly role: string;
+    readonly state: string;
+    addRemoteCandidate(remoteCandidate: RTCIceCandidate | RTCIceCandidateComplete): void;
+    createAssociatedTransport(): RTCIceTransport;
+    getNominatedCandidatePair(): RTCIceCandidatePair;
+    getRemoteCandidates(): RTCIceCandidate[];
+    getRemoteParameters(): RTCIceParameters;
+    setRemoteCandidates(remoteCandidates: RTCIceCandidate[]): void;
+    start(gatherer: RTCIceGatherer, remoteParameters: RTCIceParameters, role?: string): void;
+    stop(): void;
+    addEventListener(type: "candidatepairchange", listener: (ev: RTCIceCandidatePairChangedEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "icestatechange", listener: (ev: RTCIceTransportStateChangedEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCIceTransport: {
+    prototype: RTCIceTransport;
+    new(): RTCIceTransport;
+}
+
+interface RTCIceTransportStateChangedEvent extends Event {
+    readonly state: string;
+}
+
+declare var RTCIceTransportStateChangedEvent: {
+    prototype: RTCIceTransportStateChangedEvent;
+    new(): RTCIceTransportStateChangedEvent;
+}
+
+interface RTCRtpReceiver extends RTCStatsProvider {
+    onerror: (ev: Event) => any;
+    readonly rtcpTransport: RTCDtlsTransport;
+    readonly track: MediaStreamTrack;
+    readonly transport: RTCDtlsTransport | RTCSrtpSdesTransport;
+    getContributingSources(): RTCRtpContributingSource[];
+    receive(parameters: RTCRtpParameters): void;
+    requestSendCSRC(csrc: number): void;
+    setTransport(transport: RTCDtlsTransport | RTCSrtpSdesTransport, rtcpTransport?: RTCDtlsTransport): void;
+    stop(): void;
+    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCRtpReceiver: {
+    prototype: RTCRtpReceiver;
+    new(transport: RTCDtlsTransport | RTCSrtpSdesTransport, kind: string, rtcpTransport?: RTCDtlsTransport): RTCRtpReceiver;
+    getCapabilities(kind?: string): RTCRtpCapabilities;
+}
+
+interface RTCRtpSender extends RTCStatsProvider {
+    onerror: (ev: Event) => any;
+    onssrcconflict: (ev: RTCSsrcConflictEvent) => any;
+    readonly rtcpTransport: RTCDtlsTransport;
+    readonly track: MediaStreamTrack;
+    readonly transport: RTCDtlsTransport | RTCSrtpSdesTransport;
+    send(parameters: RTCRtpParameters): void;
+    setTrack(track: MediaStreamTrack): void;
+    setTransport(transport: RTCDtlsTransport | RTCSrtpSdesTransport, rtcpTransport?: RTCDtlsTransport): void;
+    stop(): void;
+    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "ssrcconflict", listener: (ev: RTCSsrcConflictEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCRtpSender: {
+    prototype: RTCRtpSender;
+    new(track: MediaStreamTrack, transport: RTCDtlsTransport | RTCSrtpSdesTransport, rtcpTransport?: RTCDtlsTransport): RTCRtpSender;
+    getCapabilities(kind?: string): RTCRtpCapabilities;
+}
+
+interface RTCSrtpSdesTransport extends EventTarget {
+    onerror: (ev: Event) => any;
+    readonly transport: RTCIceTransport;
+    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCSrtpSdesTransport: {
+    prototype: RTCSrtpSdesTransport;
+    new(transport: RTCIceTransport, encryptParameters: RTCSrtpSdesParameters, decryptParameters: RTCSrtpSdesParameters): RTCSrtpSdesTransport;
+    getLocalParameters(): RTCSrtpSdesParameters[];
+}
+
+interface RTCSsrcConflictEvent extends Event {
+    readonly ssrc: number;
+}
+
+declare var RTCSsrcConflictEvent: {
+    prototype: RTCSsrcConflictEvent;
+    new(): RTCSsrcConflictEvent;
+}
+
+interface RTCStatsProvider extends EventTarget {
+    getStats(): PromiseLike<RTCStatsReport>;
+    msGetStats(): PromiseLike<RTCStatsReport>;
+}
+
+declare var RTCStatsProvider: {
+    prototype: RTCStatsProvider;
+    new(): RTCStatsProvider;
+}
+
 interface Range {
-    collapsed: boolean;
-    commonAncestorContainer: Node;
-    endContainer: Node;
-    endOffset: number;
-    startContainer: Node;
-    startOffset: number;
+    readonly collapsed: boolean;
+    readonly commonAncestorContainer: Node;
+    readonly endContainer: Node;
+    readonly endOffset: number;
+    readonly startContainer: Node;
+    readonly startOffset: number;
     cloneContents(): DocumentFragment;
     cloneRange(): Range;
     collapse(toStart: boolean): void;
@@ -12496,23 +13618,23 @@ interface Range {
     setStartBefore(refNode: Node): void;
     surroundContents(newParent: Node): void;
     toString(): string;
-    END_TO_END: number;
-    END_TO_START: number;
-    START_TO_END: number;
-    START_TO_START: number;
+    readonly END_TO_END: number;
+    readonly END_TO_START: number;
+    readonly START_TO_END: number;
+    readonly START_TO_START: number;
 }
 
 declare var Range: {
     prototype: Range;
     new(): Range;
-    END_TO_END: number;
-    END_TO_START: number;
-    START_TO_END: number;
-    START_TO_START: number;
+    readonly END_TO_END: number;
+    readonly END_TO_START: number;
+    readonly START_TO_END: number;
+    readonly START_TO_START: number;
 }
 
 interface SVGAElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference {
-    target: SVGAnimatedString;
+    readonly target: SVGAnimatedString;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -12522,32 +13644,32 @@ declare var SVGAElement: {
 }
 
 interface SVGAngle {
-    unitType: number;
+    readonly unitType: number;
     value: number;
     valueAsString: string;
     valueInSpecifiedUnits: number;
     convertToSpecifiedUnits(unitType: number): void;
     newValueSpecifiedUnits(unitType: number, valueInSpecifiedUnits: number): void;
-    SVG_ANGLETYPE_DEG: number;
-    SVG_ANGLETYPE_GRAD: number;
-    SVG_ANGLETYPE_RAD: number;
-    SVG_ANGLETYPE_UNKNOWN: number;
-    SVG_ANGLETYPE_UNSPECIFIED: number;
+    readonly SVG_ANGLETYPE_DEG: number;
+    readonly SVG_ANGLETYPE_GRAD: number;
+    readonly SVG_ANGLETYPE_RAD: number;
+    readonly SVG_ANGLETYPE_UNKNOWN: number;
+    readonly SVG_ANGLETYPE_UNSPECIFIED: number;
 }
 
 declare var SVGAngle: {
     prototype: SVGAngle;
     new(): SVGAngle;
-    SVG_ANGLETYPE_DEG: number;
-    SVG_ANGLETYPE_GRAD: number;
-    SVG_ANGLETYPE_RAD: number;
-    SVG_ANGLETYPE_UNKNOWN: number;
-    SVG_ANGLETYPE_UNSPECIFIED: number;
+    readonly SVG_ANGLETYPE_DEG: number;
+    readonly SVG_ANGLETYPE_GRAD: number;
+    readonly SVG_ANGLETYPE_RAD: number;
+    readonly SVG_ANGLETYPE_UNKNOWN: number;
+    readonly SVG_ANGLETYPE_UNSPECIFIED: number;
 }
 
 interface SVGAnimatedAngle {
-    animVal: SVGAngle;
-    baseVal: SVGAngle;
+    readonly animVal: SVGAngle;
+    readonly baseVal: SVGAngle;
 }
 
 declare var SVGAnimatedAngle: {
@@ -12556,7 +13678,7 @@ declare var SVGAnimatedAngle: {
 }
 
 interface SVGAnimatedBoolean {
-    animVal: boolean;
+    readonly animVal: boolean;
     baseVal: boolean;
 }
 
@@ -12566,7 +13688,7 @@ declare var SVGAnimatedBoolean: {
 }
 
 interface SVGAnimatedEnumeration {
-    animVal: number;
+    readonly animVal: number;
     baseVal: number;
 }
 
@@ -12576,7 +13698,7 @@ declare var SVGAnimatedEnumeration: {
 }
 
 interface SVGAnimatedInteger {
-    animVal: number;
+    readonly animVal: number;
     baseVal: number;
 }
 
@@ -12586,8 +13708,8 @@ declare var SVGAnimatedInteger: {
 }
 
 interface SVGAnimatedLength {
-    animVal: SVGLength;
-    baseVal: SVGLength;
+    readonly animVal: SVGLength;
+    readonly baseVal: SVGLength;
 }
 
 declare var SVGAnimatedLength: {
@@ -12596,8 +13718,8 @@ declare var SVGAnimatedLength: {
 }
 
 interface SVGAnimatedLengthList {
-    animVal: SVGLengthList;
-    baseVal: SVGLengthList;
+    readonly animVal: SVGLengthList;
+    readonly baseVal: SVGLengthList;
 }
 
 declare var SVGAnimatedLengthList: {
@@ -12606,7 +13728,7 @@ declare var SVGAnimatedLengthList: {
 }
 
 interface SVGAnimatedNumber {
-    animVal: number;
+    readonly animVal: number;
     baseVal: number;
 }
 
@@ -12616,8 +13738,8 @@ declare var SVGAnimatedNumber: {
 }
 
 interface SVGAnimatedNumberList {
-    animVal: SVGNumberList;
-    baseVal: SVGNumberList;
+    readonly animVal: SVGNumberList;
+    readonly baseVal: SVGNumberList;
 }
 
 declare var SVGAnimatedNumberList: {
@@ -12626,8 +13748,8 @@ declare var SVGAnimatedNumberList: {
 }
 
 interface SVGAnimatedPreserveAspectRatio {
-    animVal: SVGPreserveAspectRatio;
-    baseVal: SVGPreserveAspectRatio;
+    readonly animVal: SVGPreserveAspectRatio;
+    readonly baseVal: SVGPreserveAspectRatio;
 }
 
 declare var SVGAnimatedPreserveAspectRatio: {
@@ -12636,8 +13758,8 @@ declare var SVGAnimatedPreserveAspectRatio: {
 }
 
 interface SVGAnimatedRect {
-    animVal: SVGRect;
-    baseVal: SVGRect;
+    readonly animVal: SVGRect;
+    readonly baseVal: SVGRect;
 }
 
 declare var SVGAnimatedRect: {
@@ -12646,7 +13768,7 @@ declare var SVGAnimatedRect: {
 }
 
 interface SVGAnimatedString {
-    animVal: string;
+    readonly animVal: string;
     baseVal: string;
 }
 
@@ -12656,8 +13778,8 @@ declare var SVGAnimatedString: {
 }
 
 interface SVGAnimatedTransformList {
-    animVal: SVGTransformList;
-    baseVal: SVGTransformList;
+    readonly animVal: SVGTransformList;
+    readonly baseVal: SVGTransformList;
 }
 
 declare var SVGAnimatedTransformList: {
@@ -12666,9 +13788,9 @@ declare var SVGAnimatedTransformList: {
 }
 
 interface SVGCircleElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    cx: SVGAnimatedLength;
-    cy: SVGAnimatedLength;
-    r: SVGAnimatedLength;
+    readonly cx: SVGAnimatedLength;
+    readonly cy: SVGAnimatedLength;
+    readonly r: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -12678,7 +13800,7 @@ declare var SVGCircleElement: {
 }
 
 interface SVGClipPathElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGUnitTypes {
-    clipPathUnits: SVGAnimatedEnumeration;
+    readonly clipPathUnits: SVGAnimatedEnumeration;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -12688,30 +13810,30 @@ declare var SVGClipPathElement: {
 }
 
 interface SVGComponentTransferFunctionElement extends SVGElement {
-    amplitude: SVGAnimatedNumber;
-    exponent: SVGAnimatedNumber;
-    intercept: SVGAnimatedNumber;
-    offset: SVGAnimatedNumber;
-    slope: SVGAnimatedNumber;
-    tableValues: SVGAnimatedNumberList;
-    type: SVGAnimatedEnumeration;
-    SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_GAMMA: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_LINEAR: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_TABLE: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number;
+    readonly amplitude: SVGAnimatedNumber;
+    readonly exponent: SVGAnimatedNumber;
+    readonly intercept: SVGAnimatedNumber;
+    readonly offset: SVGAnimatedNumber;
+    readonly slope: SVGAnimatedNumber;
+    readonly tableValues: SVGAnimatedNumberList;
+    readonly type: SVGAnimatedEnumeration;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_GAMMA: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_LINEAR: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_TABLE: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number;
 }
 
 declare var SVGComponentTransferFunctionElement: {
     prototype: SVGComponentTransferFunctionElement;
     new(): SVGComponentTransferFunctionElement;
-    SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_GAMMA: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_LINEAR: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_TABLE: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_GAMMA: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_LINEAR: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_TABLE: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number;
 }
 
 interface SVGDefsElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
@@ -12733,7 +13855,6 @@ declare var SVGDescElement: {
 }
 
 interface SVGElement extends Element {
-    id: string;
     onclick: (ev: MouseEvent) => any;
     ondblclick: (ev: MouseEvent) => any;
     onfocusin: (ev: FocusEvent) => any;
@@ -12744,8 +13865,8 @@ interface SVGElement extends Element {
     onmouseout: (ev: MouseEvent) => any;
     onmouseover: (ev: MouseEvent) => any;
     onmouseup: (ev: MouseEvent) => any;
-    ownerSVGElement: SVGSVGElement;
-    viewportElement: SVGElement;
+    readonly ownerSVGElement: SVGSVGElement;
+    readonly viewportElement: SVGElement;
     xmlbase: string;
     className: any;
     addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -12803,14 +13924,14 @@ declare var SVGElement: {
 }
 
 interface SVGElementInstance extends EventTarget {
-    childNodes: SVGElementInstanceList;
-    correspondingElement: SVGElement;
-    correspondingUseElement: SVGUseElement;
-    firstChild: SVGElementInstance;
-    lastChild: SVGElementInstance;
-    nextSibling: SVGElementInstance;
-    parentNode: SVGElementInstance;
-    previousSibling: SVGElementInstance;
+    readonly childNodes: SVGElementInstanceList;
+    readonly correspondingElement: SVGElement;
+    readonly correspondingUseElement: SVGUseElement;
+    readonly firstChild: SVGElementInstance;
+    readonly lastChild: SVGElementInstance;
+    readonly nextSibling: SVGElementInstance;
+    readonly parentNode: SVGElementInstance;
+    readonly previousSibling: SVGElementInstance;
 }
 
 declare var SVGElementInstance: {
@@ -12819,7 +13940,7 @@ declare var SVGElementInstance: {
 }
 
 interface SVGElementInstanceList {
-    length: number;
+    readonly length: number;
     item(index: number): SVGElementInstance;
 }
 
@@ -12829,10 +13950,10 @@ declare var SVGElementInstanceList: {
 }
 
 interface SVGEllipseElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    cx: SVGAnimatedLength;
-    cy: SVGAnimatedLength;
-    rx: SVGAnimatedLength;
-    ry: SVGAnimatedLength;
+    readonly cx: SVGAnimatedLength;
+    readonly cy: SVGAnimatedLength;
+    readonly rx: SVGAnimatedLength;
+    readonly ry: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -12842,75 +13963,75 @@ declare var SVGEllipseElement: {
 }
 
 interface SVGFEBlendElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    in2: SVGAnimatedString;
-    mode: SVGAnimatedEnumeration;
-    SVG_FEBLEND_MODE_COLOR: number;
-    SVG_FEBLEND_MODE_COLOR_BURN: number;
-    SVG_FEBLEND_MODE_COLOR_DODGE: number;
-    SVG_FEBLEND_MODE_DARKEN: number;
-    SVG_FEBLEND_MODE_DIFFERENCE: number;
-    SVG_FEBLEND_MODE_EXCLUSION: number;
-    SVG_FEBLEND_MODE_HARD_LIGHT: number;
-    SVG_FEBLEND_MODE_HUE: number;
-    SVG_FEBLEND_MODE_LIGHTEN: number;
-    SVG_FEBLEND_MODE_LUMINOSITY: number;
-    SVG_FEBLEND_MODE_MULTIPLY: number;
-    SVG_FEBLEND_MODE_NORMAL: number;
-    SVG_FEBLEND_MODE_OVERLAY: number;
-    SVG_FEBLEND_MODE_SATURATION: number;
-    SVG_FEBLEND_MODE_SCREEN: number;
-    SVG_FEBLEND_MODE_SOFT_LIGHT: number;
-    SVG_FEBLEND_MODE_UNKNOWN: number;
+    readonly in1: SVGAnimatedString;
+    readonly in2: SVGAnimatedString;
+    readonly mode: SVGAnimatedEnumeration;
+    readonly SVG_FEBLEND_MODE_COLOR: number;
+    readonly SVG_FEBLEND_MODE_COLOR_BURN: number;
+    readonly SVG_FEBLEND_MODE_COLOR_DODGE: number;
+    readonly SVG_FEBLEND_MODE_DARKEN: number;
+    readonly SVG_FEBLEND_MODE_DIFFERENCE: number;
+    readonly SVG_FEBLEND_MODE_EXCLUSION: number;
+    readonly SVG_FEBLEND_MODE_HARD_LIGHT: number;
+    readonly SVG_FEBLEND_MODE_HUE: number;
+    readonly SVG_FEBLEND_MODE_LIGHTEN: number;
+    readonly SVG_FEBLEND_MODE_LUMINOSITY: number;
+    readonly SVG_FEBLEND_MODE_MULTIPLY: number;
+    readonly SVG_FEBLEND_MODE_NORMAL: number;
+    readonly SVG_FEBLEND_MODE_OVERLAY: number;
+    readonly SVG_FEBLEND_MODE_SATURATION: number;
+    readonly SVG_FEBLEND_MODE_SCREEN: number;
+    readonly SVG_FEBLEND_MODE_SOFT_LIGHT: number;
+    readonly SVG_FEBLEND_MODE_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEBlendElement: {
     prototype: SVGFEBlendElement;
     new(): SVGFEBlendElement;
-    SVG_FEBLEND_MODE_COLOR: number;
-    SVG_FEBLEND_MODE_COLOR_BURN: number;
-    SVG_FEBLEND_MODE_COLOR_DODGE: number;
-    SVG_FEBLEND_MODE_DARKEN: number;
-    SVG_FEBLEND_MODE_DIFFERENCE: number;
-    SVG_FEBLEND_MODE_EXCLUSION: number;
-    SVG_FEBLEND_MODE_HARD_LIGHT: number;
-    SVG_FEBLEND_MODE_HUE: number;
-    SVG_FEBLEND_MODE_LIGHTEN: number;
-    SVG_FEBLEND_MODE_LUMINOSITY: number;
-    SVG_FEBLEND_MODE_MULTIPLY: number;
-    SVG_FEBLEND_MODE_NORMAL: number;
-    SVG_FEBLEND_MODE_OVERLAY: number;
-    SVG_FEBLEND_MODE_SATURATION: number;
-    SVG_FEBLEND_MODE_SCREEN: number;
-    SVG_FEBLEND_MODE_SOFT_LIGHT: number;
-    SVG_FEBLEND_MODE_UNKNOWN: number;
+    readonly SVG_FEBLEND_MODE_COLOR: number;
+    readonly SVG_FEBLEND_MODE_COLOR_BURN: number;
+    readonly SVG_FEBLEND_MODE_COLOR_DODGE: number;
+    readonly SVG_FEBLEND_MODE_DARKEN: number;
+    readonly SVG_FEBLEND_MODE_DIFFERENCE: number;
+    readonly SVG_FEBLEND_MODE_EXCLUSION: number;
+    readonly SVG_FEBLEND_MODE_HARD_LIGHT: number;
+    readonly SVG_FEBLEND_MODE_HUE: number;
+    readonly SVG_FEBLEND_MODE_LIGHTEN: number;
+    readonly SVG_FEBLEND_MODE_LUMINOSITY: number;
+    readonly SVG_FEBLEND_MODE_MULTIPLY: number;
+    readonly SVG_FEBLEND_MODE_NORMAL: number;
+    readonly SVG_FEBLEND_MODE_OVERLAY: number;
+    readonly SVG_FEBLEND_MODE_SATURATION: number;
+    readonly SVG_FEBLEND_MODE_SCREEN: number;
+    readonly SVG_FEBLEND_MODE_SOFT_LIGHT: number;
+    readonly SVG_FEBLEND_MODE_UNKNOWN: number;
 }
 
 interface SVGFEColorMatrixElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    type: SVGAnimatedEnumeration;
-    values: SVGAnimatedNumberList;
-    SVG_FECOLORMATRIX_TYPE_HUEROTATE: number;
-    SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA: number;
-    SVG_FECOLORMATRIX_TYPE_MATRIX: number;
-    SVG_FECOLORMATRIX_TYPE_SATURATE: number;
-    SVG_FECOLORMATRIX_TYPE_UNKNOWN: number;
+    readonly in1: SVGAnimatedString;
+    readonly type: SVGAnimatedEnumeration;
+    readonly values: SVGAnimatedNumberList;
+    readonly SVG_FECOLORMATRIX_TYPE_HUEROTATE: number;
+    readonly SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA: number;
+    readonly SVG_FECOLORMATRIX_TYPE_MATRIX: number;
+    readonly SVG_FECOLORMATRIX_TYPE_SATURATE: number;
+    readonly SVG_FECOLORMATRIX_TYPE_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEColorMatrixElement: {
     prototype: SVGFEColorMatrixElement;
     new(): SVGFEColorMatrixElement;
-    SVG_FECOLORMATRIX_TYPE_HUEROTATE: number;
-    SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA: number;
-    SVG_FECOLORMATRIX_TYPE_MATRIX: number;
-    SVG_FECOLORMATRIX_TYPE_SATURATE: number;
-    SVG_FECOLORMATRIX_TYPE_UNKNOWN: number;
+    readonly SVG_FECOLORMATRIX_TYPE_HUEROTATE: number;
+    readonly SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA: number;
+    readonly SVG_FECOLORMATRIX_TYPE_MATRIX: number;
+    readonly SVG_FECOLORMATRIX_TYPE_SATURATE: number;
+    readonly SVG_FECOLORMATRIX_TYPE_UNKNOWN: number;
 }
 
 interface SVGFEComponentTransferElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
+    readonly in1: SVGAnimatedString;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -12920,70 +14041,70 @@ declare var SVGFEComponentTransferElement: {
 }
 
 interface SVGFECompositeElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    in2: SVGAnimatedString;
-    k1: SVGAnimatedNumber;
-    k2: SVGAnimatedNumber;
-    k3: SVGAnimatedNumber;
-    k4: SVGAnimatedNumber;
-    operator: SVGAnimatedEnumeration;
-    SVG_FECOMPOSITE_OPERATOR_ARITHMETIC: number;
-    SVG_FECOMPOSITE_OPERATOR_ATOP: number;
-    SVG_FECOMPOSITE_OPERATOR_IN: number;
-    SVG_FECOMPOSITE_OPERATOR_OUT: number;
-    SVG_FECOMPOSITE_OPERATOR_OVER: number;
-    SVG_FECOMPOSITE_OPERATOR_UNKNOWN: number;
-    SVG_FECOMPOSITE_OPERATOR_XOR: number;
+    readonly in1: SVGAnimatedString;
+    readonly in2: SVGAnimatedString;
+    readonly k1: SVGAnimatedNumber;
+    readonly k2: SVGAnimatedNumber;
+    readonly k3: SVGAnimatedNumber;
+    readonly k4: SVGAnimatedNumber;
+    readonly operator: SVGAnimatedEnumeration;
+    readonly SVG_FECOMPOSITE_OPERATOR_ARITHMETIC: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_ATOP: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_IN: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_OUT: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_OVER: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_UNKNOWN: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_XOR: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFECompositeElement: {
     prototype: SVGFECompositeElement;
     new(): SVGFECompositeElement;
-    SVG_FECOMPOSITE_OPERATOR_ARITHMETIC: number;
-    SVG_FECOMPOSITE_OPERATOR_ATOP: number;
-    SVG_FECOMPOSITE_OPERATOR_IN: number;
-    SVG_FECOMPOSITE_OPERATOR_OUT: number;
-    SVG_FECOMPOSITE_OPERATOR_OVER: number;
-    SVG_FECOMPOSITE_OPERATOR_UNKNOWN: number;
-    SVG_FECOMPOSITE_OPERATOR_XOR: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_ARITHMETIC: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_ATOP: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_IN: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_OUT: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_OVER: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_UNKNOWN: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_XOR: number;
 }
 
 interface SVGFEConvolveMatrixElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    bias: SVGAnimatedNumber;
-    divisor: SVGAnimatedNumber;
-    edgeMode: SVGAnimatedEnumeration;
-    in1: SVGAnimatedString;
-    kernelMatrix: SVGAnimatedNumberList;
-    kernelUnitLengthX: SVGAnimatedNumber;
-    kernelUnitLengthY: SVGAnimatedNumber;
-    orderX: SVGAnimatedInteger;
-    orderY: SVGAnimatedInteger;
-    preserveAlpha: SVGAnimatedBoolean;
-    targetX: SVGAnimatedInteger;
-    targetY: SVGAnimatedInteger;
-    SVG_EDGEMODE_DUPLICATE: number;
-    SVG_EDGEMODE_NONE: number;
-    SVG_EDGEMODE_UNKNOWN: number;
-    SVG_EDGEMODE_WRAP: number;
+    readonly bias: SVGAnimatedNumber;
+    readonly divisor: SVGAnimatedNumber;
+    readonly edgeMode: SVGAnimatedEnumeration;
+    readonly in1: SVGAnimatedString;
+    readonly kernelMatrix: SVGAnimatedNumberList;
+    readonly kernelUnitLengthX: SVGAnimatedNumber;
+    readonly kernelUnitLengthY: SVGAnimatedNumber;
+    readonly orderX: SVGAnimatedInteger;
+    readonly orderY: SVGAnimatedInteger;
+    readonly preserveAlpha: SVGAnimatedBoolean;
+    readonly targetX: SVGAnimatedInteger;
+    readonly targetY: SVGAnimatedInteger;
+    readonly SVG_EDGEMODE_DUPLICATE: number;
+    readonly SVG_EDGEMODE_NONE: number;
+    readonly SVG_EDGEMODE_UNKNOWN: number;
+    readonly SVG_EDGEMODE_WRAP: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEConvolveMatrixElement: {
     prototype: SVGFEConvolveMatrixElement;
     new(): SVGFEConvolveMatrixElement;
-    SVG_EDGEMODE_DUPLICATE: number;
-    SVG_EDGEMODE_NONE: number;
-    SVG_EDGEMODE_UNKNOWN: number;
-    SVG_EDGEMODE_WRAP: number;
+    readonly SVG_EDGEMODE_DUPLICATE: number;
+    readonly SVG_EDGEMODE_NONE: number;
+    readonly SVG_EDGEMODE_UNKNOWN: number;
+    readonly SVG_EDGEMODE_WRAP: number;
 }
 
 interface SVGFEDiffuseLightingElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    diffuseConstant: SVGAnimatedNumber;
-    in1: SVGAnimatedString;
-    kernelUnitLengthX: SVGAnimatedNumber;
-    kernelUnitLengthY: SVGAnimatedNumber;
-    surfaceScale: SVGAnimatedNumber;
+    readonly diffuseConstant: SVGAnimatedNumber;
+    readonly in1: SVGAnimatedString;
+    readonly kernelUnitLengthX: SVGAnimatedNumber;
+    readonly kernelUnitLengthY: SVGAnimatedNumber;
+    readonly surfaceScale: SVGAnimatedNumber;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -12993,32 +14114,32 @@ declare var SVGFEDiffuseLightingElement: {
 }
 
 interface SVGFEDisplacementMapElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    in2: SVGAnimatedString;
-    scale: SVGAnimatedNumber;
-    xChannelSelector: SVGAnimatedEnumeration;
-    yChannelSelector: SVGAnimatedEnumeration;
-    SVG_CHANNEL_A: number;
-    SVG_CHANNEL_B: number;
-    SVG_CHANNEL_G: number;
-    SVG_CHANNEL_R: number;
-    SVG_CHANNEL_UNKNOWN: number;
+    readonly in1: SVGAnimatedString;
+    readonly in2: SVGAnimatedString;
+    readonly scale: SVGAnimatedNumber;
+    readonly xChannelSelector: SVGAnimatedEnumeration;
+    readonly yChannelSelector: SVGAnimatedEnumeration;
+    readonly SVG_CHANNEL_A: number;
+    readonly SVG_CHANNEL_B: number;
+    readonly SVG_CHANNEL_G: number;
+    readonly SVG_CHANNEL_R: number;
+    readonly SVG_CHANNEL_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEDisplacementMapElement: {
     prototype: SVGFEDisplacementMapElement;
     new(): SVGFEDisplacementMapElement;
-    SVG_CHANNEL_A: number;
-    SVG_CHANNEL_B: number;
-    SVG_CHANNEL_G: number;
-    SVG_CHANNEL_R: number;
-    SVG_CHANNEL_UNKNOWN: number;
+    readonly SVG_CHANNEL_A: number;
+    readonly SVG_CHANNEL_B: number;
+    readonly SVG_CHANNEL_G: number;
+    readonly SVG_CHANNEL_R: number;
+    readonly SVG_CHANNEL_UNKNOWN: number;
 }
 
 interface SVGFEDistantLightElement extends SVGElement {
-    azimuth: SVGAnimatedNumber;
-    elevation: SVGAnimatedNumber;
+    readonly azimuth: SVGAnimatedNumber;
+    readonly elevation: SVGAnimatedNumber;
 }
 
 declare var SVGFEDistantLightElement: {
@@ -13068,9 +14189,9 @@ declare var SVGFEFuncRElement: {
 }
 
 interface SVGFEGaussianBlurElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    stdDeviationX: SVGAnimatedNumber;
-    stdDeviationY: SVGAnimatedNumber;
+    readonly in1: SVGAnimatedString;
+    readonly stdDeviationX: SVGAnimatedNumber;
+    readonly stdDeviationY: SVGAnimatedNumber;
     setStdDeviation(stdDeviationX: number, stdDeviationY: number): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
@@ -13081,7 +14202,7 @@ declare var SVGFEGaussianBlurElement: {
 }
 
 interface SVGFEImageElement extends SVGElement, SVGFilterPrimitiveStandardAttributes, SVGLangSpace, SVGURIReference, SVGExternalResourcesRequired {
-    preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
+    readonly preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13100,7 +14221,7 @@ declare var SVGFEMergeElement: {
 }
 
 interface SVGFEMergeNodeElement extends SVGElement {
-    in1: SVGAnimatedString;
+    readonly in1: SVGAnimatedString;
 }
 
 declare var SVGFEMergeNodeElement: {
@@ -13109,28 +14230,28 @@ declare var SVGFEMergeNodeElement: {
 }
 
 interface SVGFEMorphologyElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    operator: SVGAnimatedEnumeration;
-    radiusX: SVGAnimatedNumber;
-    radiusY: SVGAnimatedNumber;
-    SVG_MORPHOLOGY_OPERATOR_DILATE: number;
-    SVG_MORPHOLOGY_OPERATOR_ERODE: number;
-    SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number;
+    readonly in1: SVGAnimatedString;
+    readonly operator: SVGAnimatedEnumeration;
+    readonly radiusX: SVGAnimatedNumber;
+    readonly radiusY: SVGAnimatedNumber;
+    readonly SVG_MORPHOLOGY_OPERATOR_DILATE: number;
+    readonly SVG_MORPHOLOGY_OPERATOR_ERODE: number;
+    readonly SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEMorphologyElement: {
     prototype: SVGFEMorphologyElement;
     new(): SVGFEMorphologyElement;
-    SVG_MORPHOLOGY_OPERATOR_DILATE: number;
-    SVG_MORPHOLOGY_OPERATOR_ERODE: number;
-    SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number;
+    readonly SVG_MORPHOLOGY_OPERATOR_DILATE: number;
+    readonly SVG_MORPHOLOGY_OPERATOR_ERODE: number;
+    readonly SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number;
 }
 
 interface SVGFEOffsetElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    dx: SVGAnimatedNumber;
-    dy: SVGAnimatedNumber;
-    in1: SVGAnimatedString;
+    readonly dx: SVGAnimatedNumber;
+    readonly dy: SVGAnimatedNumber;
+    readonly in1: SVGAnimatedString;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13140,9 +14261,9 @@ declare var SVGFEOffsetElement: {
 }
 
 interface SVGFEPointLightElement extends SVGElement {
-    x: SVGAnimatedNumber;
-    y: SVGAnimatedNumber;
-    z: SVGAnimatedNumber;
+    readonly x: SVGAnimatedNumber;
+    readonly y: SVGAnimatedNumber;
+    readonly z: SVGAnimatedNumber;
 }
 
 declare var SVGFEPointLightElement: {
@@ -13151,12 +14272,12 @@ declare var SVGFEPointLightElement: {
 }
 
 interface SVGFESpecularLightingElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    kernelUnitLengthX: SVGAnimatedNumber;
-    kernelUnitLengthY: SVGAnimatedNumber;
-    specularConstant: SVGAnimatedNumber;
-    specularExponent: SVGAnimatedNumber;
-    surfaceScale: SVGAnimatedNumber;
+    readonly in1: SVGAnimatedString;
+    readonly kernelUnitLengthX: SVGAnimatedNumber;
+    readonly kernelUnitLengthY: SVGAnimatedNumber;
+    readonly specularConstant: SVGAnimatedNumber;
+    readonly specularExponent: SVGAnimatedNumber;
+    readonly surfaceScale: SVGAnimatedNumber;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13166,14 +14287,14 @@ declare var SVGFESpecularLightingElement: {
 }
 
 interface SVGFESpotLightElement extends SVGElement {
-    limitingConeAngle: SVGAnimatedNumber;
-    pointsAtX: SVGAnimatedNumber;
-    pointsAtY: SVGAnimatedNumber;
-    pointsAtZ: SVGAnimatedNumber;
-    specularExponent: SVGAnimatedNumber;
-    x: SVGAnimatedNumber;
-    y: SVGAnimatedNumber;
-    z: SVGAnimatedNumber;
+    readonly limitingConeAngle: SVGAnimatedNumber;
+    readonly pointsAtX: SVGAnimatedNumber;
+    readonly pointsAtY: SVGAnimatedNumber;
+    readonly pointsAtZ: SVGAnimatedNumber;
+    readonly specularExponent: SVGAnimatedNumber;
+    readonly x: SVGAnimatedNumber;
+    readonly y: SVGAnimatedNumber;
+    readonly z: SVGAnimatedNumber;
 }
 
 declare var SVGFESpotLightElement: {
@@ -13182,7 +14303,7 @@ declare var SVGFESpotLightElement: {
 }
 
 interface SVGFETileElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
+    readonly in1: SVGAnimatedString;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13192,41 +14313,41 @@ declare var SVGFETileElement: {
 }
 
 interface SVGFETurbulenceElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    baseFrequencyX: SVGAnimatedNumber;
-    baseFrequencyY: SVGAnimatedNumber;
-    numOctaves: SVGAnimatedInteger;
-    seed: SVGAnimatedNumber;
-    stitchTiles: SVGAnimatedEnumeration;
-    type: SVGAnimatedEnumeration;
-    SVG_STITCHTYPE_NOSTITCH: number;
-    SVG_STITCHTYPE_STITCH: number;
-    SVG_STITCHTYPE_UNKNOWN: number;
-    SVG_TURBULENCE_TYPE_FRACTALNOISE: number;
-    SVG_TURBULENCE_TYPE_TURBULENCE: number;
-    SVG_TURBULENCE_TYPE_UNKNOWN: number;
+    readonly baseFrequencyX: SVGAnimatedNumber;
+    readonly baseFrequencyY: SVGAnimatedNumber;
+    readonly numOctaves: SVGAnimatedInteger;
+    readonly seed: SVGAnimatedNumber;
+    readonly stitchTiles: SVGAnimatedEnumeration;
+    readonly type: SVGAnimatedEnumeration;
+    readonly SVG_STITCHTYPE_NOSTITCH: number;
+    readonly SVG_STITCHTYPE_STITCH: number;
+    readonly SVG_STITCHTYPE_UNKNOWN: number;
+    readonly SVG_TURBULENCE_TYPE_FRACTALNOISE: number;
+    readonly SVG_TURBULENCE_TYPE_TURBULENCE: number;
+    readonly SVG_TURBULENCE_TYPE_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFETurbulenceElement: {
     prototype: SVGFETurbulenceElement;
     new(): SVGFETurbulenceElement;
-    SVG_STITCHTYPE_NOSTITCH: number;
-    SVG_STITCHTYPE_STITCH: number;
-    SVG_STITCHTYPE_UNKNOWN: number;
-    SVG_TURBULENCE_TYPE_FRACTALNOISE: number;
-    SVG_TURBULENCE_TYPE_TURBULENCE: number;
-    SVG_TURBULENCE_TYPE_UNKNOWN: number;
+    readonly SVG_STITCHTYPE_NOSTITCH: number;
+    readonly SVG_STITCHTYPE_STITCH: number;
+    readonly SVG_STITCHTYPE_UNKNOWN: number;
+    readonly SVG_TURBULENCE_TYPE_FRACTALNOISE: number;
+    readonly SVG_TURBULENCE_TYPE_TURBULENCE: number;
+    readonly SVG_TURBULENCE_TYPE_UNKNOWN: number;
 }
 
 interface SVGFilterElement extends SVGElement, SVGUnitTypes, SVGStylable, SVGLangSpace, SVGURIReference, SVGExternalResourcesRequired {
-    filterResX: SVGAnimatedInteger;
-    filterResY: SVGAnimatedInteger;
-    filterUnits: SVGAnimatedEnumeration;
-    height: SVGAnimatedLength;
-    primitiveUnits: SVGAnimatedEnumeration;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly filterResX: SVGAnimatedInteger;
+    readonly filterResY: SVGAnimatedInteger;
+    readonly filterUnits: SVGAnimatedEnumeration;
+    readonly height: SVGAnimatedLength;
+    readonly primitiveUnits: SVGAnimatedEnumeration;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     setFilterRes(filterResX: number, filterResY: number): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
@@ -13237,10 +14358,10 @@ declare var SVGFilterElement: {
 }
 
 interface SVGForeignObjectElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    height: SVGAnimatedLength;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly height: SVGAnimatedLength;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13259,31 +14380,31 @@ declare var SVGGElement: {
 }
 
 interface SVGGradientElement extends SVGElement, SVGStylable, SVGExternalResourcesRequired, SVGURIReference, SVGUnitTypes {
-    gradientTransform: SVGAnimatedTransformList;
-    gradientUnits: SVGAnimatedEnumeration;
-    spreadMethod: SVGAnimatedEnumeration;
-    SVG_SPREADMETHOD_PAD: number;
-    SVG_SPREADMETHOD_REFLECT: number;
-    SVG_SPREADMETHOD_REPEAT: number;
-    SVG_SPREADMETHOD_UNKNOWN: number;
+    readonly gradientTransform: SVGAnimatedTransformList;
+    readonly gradientUnits: SVGAnimatedEnumeration;
+    readonly spreadMethod: SVGAnimatedEnumeration;
+    readonly SVG_SPREADMETHOD_PAD: number;
+    readonly SVG_SPREADMETHOD_REFLECT: number;
+    readonly SVG_SPREADMETHOD_REPEAT: number;
+    readonly SVG_SPREADMETHOD_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGGradientElement: {
     prototype: SVGGradientElement;
     new(): SVGGradientElement;
-    SVG_SPREADMETHOD_PAD: number;
-    SVG_SPREADMETHOD_REFLECT: number;
-    SVG_SPREADMETHOD_REPEAT: number;
-    SVG_SPREADMETHOD_UNKNOWN: number;
+    readonly SVG_SPREADMETHOD_PAD: number;
+    readonly SVG_SPREADMETHOD_REFLECT: number;
+    readonly SVG_SPREADMETHOD_REPEAT: number;
+    readonly SVG_SPREADMETHOD_UNKNOWN: number;
 }
 
 interface SVGImageElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference {
-    height: SVGAnimatedLength;
-    preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly height: SVGAnimatedLength;
+    readonly preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13293,43 +14414,43 @@ declare var SVGImageElement: {
 }
 
 interface SVGLength {
-    unitType: number;
+    readonly unitType: number;
     value: number;
     valueAsString: string;
     valueInSpecifiedUnits: number;
     convertToSpecifiedUnits(unitType: number): void;
     newValueSpecifiedUnits(unitType: number, valueInSpecifiedUnits: number): void;
-    SVG_LENGTHTYPE_CM: number;
-    SVG_LENGTHTYPE_EMS: number;
-    SVG_LENGTHTYPE_EXS: number;
-    SVG_LENGTHTYPE_IN: number;
-    SVG_LENGTHTYPE_MM: number;
-    SVG_LENGTHTYPE_NUMBER: number;
-    SVG_LENGTHTYPE_PC: number;
-    SVG_LENGTHTYPE_PERCENTAGE: number;
-    SVG_LENGTHTYPE_PT: number;
-    SVG_LENGTHTYPE_PX: number;
-    SVG_LENGTHTYPE_UNKNOWN: number;
+    readonly SVG_LENGTHTYPE_CM: number;
+    readonly SVG_LENGTHTYPE_EMS: number;
+    readonly SVG_LENGTHTYPE_EXS: number;
+    readonly SVG_LENGTHTYPE_IN: number;
+    readonly SVG_LENGTHTYPE_MM: number;
+    readonly SVG_LENGTHTYPE_NUMBER: number;
+    readonly SVG_LENGTHTYPE_PC: number;
+    readonly SVG_LENGTHTYPE_PERCENTAGE: number;
+    readonly SVG_LENGTHTYPE_PT: number;
+    readonly SVG_LENGTHTYPE_PX: number;
+    readonly SVG_LENGTHTYPE_UNKNOWN: number;
 }
 
 declare var SVGLength: {
     prototype: SVGLength;
     new(): SVGLength;
-    SVG_LENGTHTYPE_CM: number;
-    SVG_LENGTHTYPE_EMS: number;
-    SVG_LENGTHTYPE_EXS: number;
-    SVG_LENGTHTYPE_IN: number;
-    SVG_LENGTHTYPE_MM: number;
-    SVG_LENGTHTYPE_NUMBER: number;
-    SVG_LENGTHTYPE_PC: number;
-    SVG_LENGTHTYPE_PERCENTAGE: number;
-    SVG_LENGTHTYPE_PT: number;
-    SVG_LENGTHTYPE_PX: number;
-    SVG_LENGTHTYPE_UNKNOWN: number;
+    readonly SVG_LENGTHTYPE_CM: number;
+    readonly SVG_LENGTHTYPE_EMS: number;
+    readonly SVG_LENGTHTYPE_EXS: number;
+    readonly SVG_LENGTHTYPE_IN: number;
+    readonly SVG_LENGTHTYPE_MM: number;
+    readonly SVG_LENGTHTYPE_NUMBER: number;
+    readonly SVG_LENGTHTYPE_PC: number;
+    readonly SVG_LENGTHTYPE_PERCENTAGE: number;
+    readonly SVG_LENGTHTYPE_PT: number;
+    readonly SVG_LENGTHTYPE_PX: number;
+    readonly SVG_LENGTHTYPE_UNKNOWN: number;
 }
 
 interface SVGLengthList {
-    numberOfItems: number;
+    readonly numberOfItems: number;
     appendItem(newItem: SVGLength): SVGLength;
     clear(): void;
     getItem(index: number): SVGLength;
@@ -13345,10 +14466,10 @@ declare var SVGLengthList: {
 }
 
 interface SVGLineElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    x1: SVGAnimatedLength;
-    x2: SVGAnimatedLength;
-    y1: SVGAnimatedLength;
-    y2: SVGAnimatedLength;
+    readonly x1: SVGAnimatedLength;
+    readonly x2: SVGAnimatedLength;
+    readonly y1: SVGAnimatedLength;
+    readonly y2: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13358,10 +14479,10 @@ declare var SVGLineElement: {
 }
 
 interface SVGLinearGradientElement extends SVGGradientElement {
-    x1: SVGAnimatedLength;
-    x2: SVGAnimatedLength;
-    y1: SVGAnimatedLength;
-    y2: SVGAnimatedLength;
+    readonly x1: SVGAnimatedLength;
+    readonly x2: SVGAnimatedLength;
+    readonly y1: SVGAnimatedLength;
+    readonly y2: SVGAnimatedLength;
 }
 
 declare var SVGLinearGradientElement: {
@@ -13370,42 +14491,42 @@ declare var SVGLinearGradientElement: {
 }
 
 interface SVGMarkerElement extends SVGElement, SVGStylable, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox {
-    markerHeight: SVGAnimatedLength;
-    markerUnits: SVGAnimatedEnumeration;
-    markerWidth: SVGAnimatedLength;
-    orientAngle: SVGAnimatedAngle;
-    orientType: SVGAnimatedEnumeration;
-    refX: SVGAnimatedLength;
-    refY: SVGAnimatedLength;
+    readonly markerHeight: SVGAnimatedLength;
+    readonly markerUnits: SVGAnimatedEnumeration;
+    readonly markerWidth: SVGAnimatedLength;
+    readonly orientAngle: SVGAnimatedAngle;
+    readonly orientType: SVGAnimatedEnumeration;
+    readonly refX: SVGAnimatedLength;
+    readonly refY: SVGAnimatedLength;
     setOrientToAngle(angle: SVGAngle): void;
     setOrientToAuto(): void;
-    SVG_MARKERUNITS_STROKEWIDTH: number;
-    SVG_MARKERUNITS_UNKNOWN: number;
-    SVG_MARKERUNITS_USERSPACEONUSE: number;
-    SVG_MARKER_ORIENT_ANGLE: number;
-    SVG_MARKER_ORIENT_AUTO: number;
-    SVG_MARKER_ORIENT_UNKNOWN: number;
+    readonly SVG_MARKERUNITS_STROKEWIDTH: number;
+    readonly SVG_MARKERUNITS_UNKNOWN: number;
+    readonly SVG_MARKERUNITS_USERSPACEONUSE: number;
+    readonly SVG_MARKER_ORIENT_ANGLE: number;
+    readonly SVG_MARKER_ORIENT_AUTO: number;
+    readonly SVG_MARKER_ORIENT_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGMarkerElement: {
     prototype: SVGMarkerElement;
     new(): SVGMarkerElement;
-    SVG_MARKERUNITS_STROKEWIDTH: number;
-    SVG_MARKERUNITS_UNKNOWN: number;
-    SVG_MARKERUNITS_USERSPACEONUSE: number;
-    SVG_MARKER_ORIENT_ANGLE: number;
-    SVG_MARKER_ORIENT_AUTO: number;
-    SVG_MARKER_ORIENT_UNKNOWN: number;
+    readonly SVG_MARKERUNITS_STROKEWIDTH: number;
+    readonly SVG_MARKERUNITS_UNKNOWN: number;
+    readonly SVG_MARKERUNITS_USERSPACEONUSE: number;
+    readonly SVG_MARKER_ORIENT_ANGLE: number;
+    readonly SVG_MARKER_ORIENT_AUTO: number;
+    readonly SVG_MARKER_ORIENT_UNKNOWN: number;
 }
 
 interface SVGMaskElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGUnitTypes {
-    height: SVGAnimatedLength;
-    maskContentUnits: SVGAnimatedEnumeration;
-    maskUnits: SVGAnimatedEnumeration;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly height: SVGAnimatedLength;
+    readonly maskContentUnits: SVGAnimatedEnumeration;
+    readonly maskUnits: SVGAnimatedEnumeration;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13457,7 +14578,7 @@ declare var SVGNumber: {
 }
 
 interface SVGNumberList {
-    numberOfItems: number;
+    readonly numberOfItems: number;
     appendItem(newItem: SVGNumber): SVGNumber;
     clear(): void;
     getItem(index: number): SVGNumber;
@@ -13504,53 +14625,53 @@ declare var SVGPathElement: {
 }
 
 interface SVGPathSeg {
-    pathSegType: number;
-    pathSegTypeAsLetter: string;
-    PATHSEG_ARC_ABS: number;
-    PATHSEG_ARC_REL: number;
-    PATHSEG_CLOSEPATH: number;
-    PATHSEG_CURVETO_CUBIC_ABS: number;
-    PATHSEG_CURVETO_CUBIC_REL: number;
-    PATHSEG_CURVETO_CUBIC_SMOOTH_ABS: number;
-    PATHSEG_CURVETO_CUBIC_SMOOTH_REL: number;
-    PATHSEG_CURVETO_QUADRATIC_ABS: number;
-    PATHSEG_CURVETO_QUADRATIC_REL: number;
-    PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS: number;
-    PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL: number;
-    PATHSEG_LINETO_ABS: number;
-    PATHSEG_LINETO_HORIZONTAL_ABS: number;
-    PATHSEG_LINETO_HORIZONTAL_REL: number;
-    PATHSEG_LINETO_REL: number;
-    PATHSEG_LINETO_VERTICAL_ABS: number;
-    PATHSEG_LINETO_VERTICAL_REL: number;
-    PATHSEG_MOVETO_ABS: number;
-    PATHSEG_MOVETO_REL: number;
-    PATHSEG_UNKNOWN: number;
+    readonly pathSegType: number;
+    readonly pathSegTypeAsLetter: string;
+    readonly PATHSEG_ARC_ABS: number;
+    readonly PATHSEG_ARC_REL: number;
+    readonly PATHSEG_CLOSEPATH: number;
+    readonly PATHSEG_CURVETO_CUBIC_ABS: number;
+    readonly PATHSEG_CURVETO_CUBIC_REL: number;
+    readonly PATHSEG_CURVETO_CUBIC_SMOOTH_ABS: number;
+    readonly PATHSEG_CURVETO_CUBIC_SMOOTH_REL: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_ABS: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_REL: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL: number;
+    readonly PATHSEG_LINETO_ABS: number;
+    readonly PATHSEG_LINETO_HORIZONTAL_ABS: number;
+    readonly PATHSEG_LINETO_HORIZONTAL_REL: number;
+    readonly PATHSEG_LINETO_REL: number;
+    readonly PATHSEG_LINETO_VERTICAL_ABS: number;
+    readonly PATHSEG_LINETO_VERTICAL_REL: number;
+    readonly PATHSEG_MOVETO_ABS: number;
+    readonly PATHSEG_MOVETO_REL: number;
+    readonly PATHSEG_UNKNOWN: number;
 }
 
 declare var SVGPathSeg: {
     prototype: SVGPathSeg;
     new(): SVGPathSeg;
-    PATHSEG_ARC_ABS: number;
-    PATHSEG_ARC_REL: number;
-    PATHSEG_CLOSEPATH: number;
-    PATHSEG_CURVETO_CUBIC_ABS: number;
-    PATHSEG_CURVETO_CUBIC_REL: number;
-    PATHSEG_CURVETO_CUBIC_SMOOTH_ABS: number;
-    PATHSEG_CURVETO_CUBIC_SMOOTH_REL: number;
-    PATHSEG_CURVETO_QUADRATIC_ABS: number;
-    PATHSEG_CURVETO_QUADRATIC_REL: number;
-    PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS: number;
-    PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL: number;
-    PATHSEG_LINETO_ABS: number;
-    PATHSEG_LINETO_HORIZONTAL_ABS: number;
-    PATHSEG_LINETO_HORIZONTAL_REL: number;
-    PATHSEG_LINETO_REL: number;
-    PATHSEG_LINETO_VERTICAL_ABS: number;
-    PATHSEG_LINETO_VERTICAL_REL: number;
-    PATHSEG_MOVETO_ABS: number;
-    PATHSEG_MOVETO_REL: number;
-    PATHSEG_UNKNOWN: number;
+    readonly PATHSEG_ARC_ABS: number;
+    readonly PATHSEG_ARC_REL: number;
+    readonly PATHSEG_CLOSEPATH: number;
+    readonly PATHSEG_CURVETO_CUBIC_ABS: number;
+    readonly PATHSEG_CURVETO_CUBIC_REL: number;
+    readonly PATHSEG_CURVETO_CUBIC_SMOOTH_ABS: number;
+    readonly PATHSEG_CURVETO_CUBIC_SMOOTH_REL: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_ABS: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_REL: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL: number;
+    readonly PATHSEG_LINETO_ABS: number;
+    readonly PATHSEG_LINETO_HORIZONTAL_ABS: number;
+    readonly PATHSEG_LINETO_HORIZONTAL_REL: number;
+    readonly PATHSEG_LINETO_REL: number;
+    readonly PATHSEG_LINETO_VERTICAL_ABS: number;
+    readonly PATHSEG_LINETO_VERTICAL_REL: number;
+    readonly PATHSEG_MOVETO_ABS: number;
+    readonly PATHSEG_MOVETO_REL: number;
+    readonly PATHSEG_UNKNOWN: number;
 }
 
 interface SVGPathSegArcAbs extends SVGPathSeg {
@@ -13744,7 +14865,7 @@ declare var SVGPathSegLinetoVerticalRel: {
 }
 
 interface SVGPathSegList {
-    numberOfItems: number;
+    readonly numberOfItems: number;
     appendItem(newItem: SVGPathSeg): SVGPathSeg;
     clear(): void;
     getItem(index: number): SVGPathSeg;
@@ -13780,13 +14901,13 @@ declare var SVGPathSegMovetoRel: {
 }
 
 interface SVGPatternElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox, SVGURIReference, SVGUnitTypes {
-    height: SVGAnimatedLength;
-    patternContentUnits: SVGAnimatedEnumeration;
-    patternTransform: SVGAnimatedTransformList;
-    patternUnits: SVGAnimatedEnumeration;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly height: SVGAnimatedLength;
+    readonly patternContentUnits: SVGAnimatedEnumeration;
+    readonly patternTransform: SVGAnimatedTransformList;
+    readonly patternUnits: SVGAnimatedEnumeration;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13807,7 +14928,7 @@ declare var SVGPoint: {
 }
 
 interface SVGPointList {
-    numberOfItems: number;
+    readonly numberOfItems: number;
     appendItem(newItem: SVGPoint): SVGPoint;
     clear(): void;
     getItem(index: number): SVGPoint;
@@ -13843,47 +14964,47 @@ declare var SVGPolylineElement: {
 interface SVGPreserveAspectRatio {
     align: number;
     meetOrSlice: number;
-    SVG_MEETORSLICE_MEET: number;
-    SVG_MEETORSLICE_SLICE: number;
-    SVG_MEETORSLICE_UNKNOWN: number;
-    SVG_PRESERVEASPECTRATIO_NONE: number;
-    SVG_PRESERVEASPECTRATIO_UNKNOWN: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMIN: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMIN: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMIN: number;
+    readonly SVG_MEETORSLICE_MEET: number;
+    readonly SVG_MEETORSLICE_SLICE: number;
+    readonly SVG_MEETORSLICE_UNKNOWN: number;
+    readonly SVG_PRESERVEASPECTRATIO_NONE: number;
+    readonly SVG_PRESERVEASPECTRATIO_UNKNOWN: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMAXYMAX: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMAXYMID: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMAXYMIN: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMIDYMAX: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMIDYMID: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMIDYMIN: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMINYMAX: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMINYMID: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMINYMIN: number;
 }
 
 declare var SVGPreserveAspectRatio: {
     prototype: SVGPreserveAspectRatio;
     new(): SVGPreserveAspectRatio;
-    SVG_MEETORSLICE_MEET: number;
-    SVG_MEETORSLICE_SLICE: number;
-    SVG_MEETORSLICE_UNKNOWN: number;
-    SVG_PRESERVEASPECTRATIO_NONE: number;
-    SVG_PRESERVEASPECTRATIO_UNKNOWN: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMIN: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMIN: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMIN: number;
+    readonly SVG_MEETORSLICE_MEET: number;
+    readonly SVG_MEETORSLICE_SLICE: number;
+    readonly SVG_MEETORSLICE_UNKNOWN: number;
+    readonly SVG_PRESERVEASPECTRATIO_NONE: number;
+    readonly SVG_PRESERVEASPECTRATIO_UNKNOWN: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMAXYMAX: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMAXYMID: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMAXYMIN: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMIDYMAX: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMIDYMID: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMIDYMIN: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMINYMAX: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMINYMID: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMINYMIN: number;
 }
 
 interface SVGRadialGradientElement extends SVGGradientElement {
-    cx: SVGAnimatedLength;
-    cy: SVGAnimatedLength;
-    fx: SVGAnimatedLength;
-    fy: SVGAnimatedLength;
-    r: SVGAnimatedLength;
+    readonly cx: SVGAnimatedLength;
+    readonly cy: SVGAnimatedLength;
+    readonly fx: SVGAnimatedLength;
+    readonly fy: SVGAnimatedLength;
+    readonly r: SVGAnimatedLength;
 }
 
 declare var SVGRadialGradientElement: {
@@ -13904,12 +15025,12 @@ declare var SVGRect: {
 }
 
 interface SVGRectElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    height: SVGAnimatedLength;
-    rx: SVGAnimatedLength;
-    ry: SVGAnimatedLength;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly height: SVGAnimatedLength;
+    readonly rx: SVGAnimatedLength;
+    readonly ry: SVGAnimatedLength;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13922,22 +15043,22 @@ interface SVGSVGElement extends SVGElement, DocumentEvent, SVGLocatable, SVGTest
     contentScriptType: string;
     contentStyleType: string;
     currentScale: number;
-    currentTranslate: SVGPoint;
-    height: SVGAnimatedLength;
+    readonly currentTranslate: SVGPoint;
+    readonly height: SVGAnimatedLength;
     onabort: (ev: Event) => any;
     onerror: (ev: Event) => any;
     onresize: (ev: UIEvent) => any;
     onscroll: (ev: UIEvent) => any;
     onunload: (ev: Event) => any;
     onzoom: (ev: SVGZoomEvent) => any;
-    pixelUnitToMillimeterX: number;
-    pixelUnitToMillimeterY: number;
-    screenPixelToMillimeterX: number;
-    screenPixelToMillimeterY: number;
-    viewport: SVGRect;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly pixelUnitToMillimeterX: number;
+    readonly pixelUnitToMillimeterY: number;
+    readonly screenPixelToMillimeterX: number;
+    readonly screenPixelToMillimeterY: number;
+    readonly viewport: SVGRect;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     checkEnclosure(element: SVGElement, rect: SVGRect): boolean;
     checkIntersection(element: SVGElement, rect: SVGRect): boolean;
     createSVGAngle(): SVGAngle;
@@ -13953,8 +15074,8 @@ interface SVGSVGElement extends SVGElement, DocumentEvent, SVGLocatable, SVGTest
     getComputedStyle(elt: Element, pseudoElt?: string): CSSStyleDeclaration;
     getCurrentTime(): number;
     getElementById(elementId: string): Element;
-    getEnclosureList(rect: SVGRect, referenceElement: SVGElement): NodeList;
-    getIntersectionList(rect: SVGRect, referenceElement: SVGElement): NodeList;
+    getEnclosureList(rect: SVGRect, referenceElement: SVGElement): NodeListOf<SVGCircleElement | SVGEllipseElement | SVGImageElement | SVGLineElement | SVGPathElement | SVGPolygonElement | SVGPolylineElement | SVGRectElement | SVGTextElement | SVGUseElement>;
+    getIntersectionList(rect: SVGRect, referenceElement: SVGElement): NodeListOf<SVGCircleElement | SVGEllipseElement | SVGImageElement | SVGLineElement | SVGPathElement | SVGPolygonElement | SVGPolylineElement | SVGRectElement | SVGTextElement | SVGUseElement>;
     pauseAnimations(): void;
     setCurrentTime(seconds: number): void;
     suspendRedraw(maxWaitMilliseconds: number): number;
@@ -14032,7 +15153,7 @@ declare var SVGScriptElement: {
 }
 
 interface SVGStopElement extends SVGElement, SVGStylable {
-    offset: SVGAnimatedNumber;
+    readonly offset: SVGAnimatedNumber;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -14042,7 +15163,7 @@ declare var SVGStopElement: {
 }
 
 interface SVGStringList {
-    numberOfItems: number;
+    readonly numberOfItems: number;
     appendItem(newItem: string): string;
     clear(): void;
     getItem(index: number): string;
@@ -14058,6 +15179,7 @@ declare var SVGStringList: {
 }
 
 interface SVGStyleElement extends SVGElement, SVGLangSpace {
+    disabled: boolean;
     media: string;
     title: string;
     type: string;
@@ -14096,8 +15218,8 @@ declare var SVGTSpanElement: {
 }
 
 interface SVGTextContentElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    lengthAdjust: SVGAnimatedEnumeration;
-    textLength: SVGAnimatedLength;
+    readonly lengthAdjust: SVGAnimatedEnumeration;
+    readonly textLength: SVGAnimatedLength;
     getCharNumAtPosition(point: SVGPoint): number;
     getComputedTextLength(): number;
     getEndPositionOfChar(charnum: number): SVGPoint;
@@ -14107,18 +15229,18 @@ interface SVGTextContentElement extends SVGElement, SVGStylable, SVGTests, SVGLa
     getStartPositionOfChar(charnum: number): SVGPoint;
     getSubStringLength(charnum: number, nchars: number): number;
     selectSubString(charnum: number, nchars: number): void;
-    LENGTHADJUST_SPACING: number;
-    LENGTHADJUST_SPACINGANDGLYPHS: number;
-    LENGTHADJUST_UNKNOWN: number;
+    readonly LENGTHADJUST_SPACING: number;
+    readonly LENGTHADJUST_SPACINGANDGLYPHS: number;
+    readonly LENGTHADJUST_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGTextContentElement: {
     prototype: SVGTextContentElement;
     new(): SVGTextContentElement;
-    LENGTHADJUST_SPACING: number;
-    LENGTHADJUST_SPACINGANDGLYPHS: number;
-    LENGTHADJUST_UNKNOWN: number;
+    readonly LENGTHADJUST_SPACING: number;
+    readonly LENGTHADJUST_SPACINGANDGLYPHS: number;
+    readonly LENGTHADJUST_UNKNOWN: number;
 }
 
 interface SVGTextElement extends SVGTextPositioningElement, SVGTransformable {
@@ -14131,35 +15253,35 @@ declare var SVGTextElement: {
 }
 
 interface SVGTextPathElement extends SVGTextContentElement, SVGURIReference {
-    method: SVGAnimatedEnumeration;
-    spacing: SVGAnimatedEnumeration;
-    startOffset: SVGAnimatedLength;
-    TEXTPATH_METHODTYPE_ALIGN: number;
-    TEXTPATH_METHODTYPE_STRETCH: number;
-    TEXTPATH_METHODTYPE_UNKNOWN: number;
-    TEXTPATH_SPACINGTYPE_AUTO: number;
-    TEXTPATH_SPACINGTYPE_EXACT: number;
-    TEXTPATH_SPACINGTYPE_UNKNOWN: number;
+    readonly method: SVGAnimatedEnumeration;
+    readonly spacing: SVGAnimatedEnumeration;
+    readonly startOffset: SVGAnimatedLength;
+    readonly TEXTPATH_METHODTYPE_ALIGN: number;
+    readonly TEXTPATH_METHODTYPE_STRETCH: number;
+    readonly TEXTPATH_METHODTYPE_UNKNOWN: number;
+    readonly TEXTPATH_SPACINGTYPE_AUTO: number;
+    readonly TEXTPATH_SPACINGTYPE_EXACT: number;
+    readonly TEXTPATH_SPACINGTYPE_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGTextPathElement: {
     prototype: SVGTextPathElement;
     new(): SVGTextPathElement;
-    TEXTPATH_METHODTYPE_ALIGN: number;
-    TEXTPATH_METHODTYPE_STRETCH: number;
-    TEXTPATH_METHODTYPE_UNKNOWN: number;
-    TEXTPATH_SPACINGTYPE_AUTO: number;
-    TEXTPATH_SPACINGTYPE_EXACT: number;
-    TEXTPATH_SPACINGTYPE_UNKNOWN: number;
+    readonly TEXTPATH_METHODTYPE_ALIGN: number;
+    readonly TEXTPATH_METHODTYPE_STRETCH: number;
+    readonly TEXTPATH_METHODTYPE_UNKNOWN: number;
+    readonly TEXTPATH_SPACINGTYPE_AUTO: number;
+    readonly TEXTPATH_SPACINGTYPE_EXACT: number;
+    readonly TEXTPATH_SPACINGTYPE_UNKNOWN: number;
 }
 
 interface SVGTextPositioningElement extends SVGTextContentElement {
-    dx: SVGAnimatedLengthList;
-    dy: SVGAnimatedLengthList;
-    rotate: SVGAnimatedNumberList;
-    x: SVGAnimatedLengthList;
-    y: SVGAnimatedLengthList;
+    readonly dx: SVGAnimatedLengthList;
+    readonly dy: SVGAnimatedLengthList;
+    readonly rotate: SVGAnimatedNumberList;
+    readonly x: SVGAnimatedLengthList;
+    readonly y: SVGAnimatedLengthList;
 }
 
 declare var SVGTextPositioningElement: {
@@ -14177,38 +15299,38 @@ declare var SVGTitleElement: {
 }
 
 interface SVGTransform {
-    angle: number;
-    matrix: SVGMatrix;
-    type: number;
+    readonly angle: number;
+    readonly matrix: SVGMatrix;
+    readonly type: number;
     setMatrix(matrix: SVGMatrix): void;
     setRotate(angle: number, cx: number, cy: number): void;
     setScale(sx: number, sy: number): void;
     setSkewX(angle: number): void;
     setSkewY(angle: number): void;
     setTranslate(tx: number, ty: number): void;
-    SVG_TRANSFORM_MATRIX: number;
-    SVG_TRANSFORM_ROTATE: number;
-    SVG_TRANSFORM_SCALE: number;
-    SVG_TRANSFORM_SKEWX: number;
-    SVG_TRANSFORM_SKEWY: number;
-    SVG_TRANSFORM_TRANSLATE: number;
-    SVG_TRANSFORM_UNKNOWN: number;
+    readonly SVG_TRANSFORM_MATRIX: number;
+    readonly SVG_TRANSFORM_ROTATE: number;
+    readonly SVG_TRANSFORM_SCALE: number;
+    readonly SVG_TRANSFORM_SKEWX: number;
+    readonly SVG_TRANSFORM_SKEWY: number;
+    readonly SVG_TRANSFORM_TRANSLATE: number;
+    readonly SVG_TRANSFORM_UNKNOWN: number;
 }
 
 declare var SVGTransform: {
     prototype: SVGTransform;
     new(): SVGTransform;
-    SVG_TRANSFORM_MATRIX: number;
-    SVG_TRANSFORM_ROTATE: number;
-    SVG_TRANSFORM_SCALE: number;
-    SVG_TRANSFORM_SKEWX: number;
-    SVG_TRANSFORM_SKEWY: number;
-    SVG_TRANSFORM_TRANSLATE: number;
-    SVG_TRANSFORM_UNKNOWN: number;
+    readonly SVG_TRANSFORM_MATRIX: number;
+    readonly SVG_TRANSFORM_ROTATE: number;
+    readonly SVG_TRANSFORM_SCALE: number;
+    readonly SVG_TRANSFORM_SKEWX: number;
+    readonly SVG_TRANSFORM_SKEWY: number;
+    readonly SVG_TRANSFORM_TRANSLATE: number;
+    readonly SVG_TRANSFORM_UNKNOWN: number;
 }
 
 interface SVGTransformList {
-    numberOfItems: number;
+    readonly numberOfItems: number;
     appendItem(newItem: SVGTransform): SVGTransform;
     clear(): void;
     consolidate(): SVGTransform;
@@ -14226,19 +15348,19 @@ declare var SVGTransformList: {
 }
 
 interface SVGUnitTypes {
-    SVG_UNIT_TYPE_OBJECTBOUNDINGBOX: number;
-    SVG_UNIT_TYPE_UNKNOWN: number;
-    SVG_UNIT_TYPE_USERSPACEONUSE: number;
+    readonly SVG_UNIT_TYPE_OBJECTBOUNDINGBOX: number;
+    readonly SVG_UNIT_TYPE_UNKNOWN: number;
+    readonly SVG_UNIT_TYPE_USERSPACEONUSE: number;
 }
 declare var SVGUnitTypes: SVGUnitTypes;
 
 interface SVGUseElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference {
-    animatedInstanceRoot: SVGElementInstance;
-    height: SVGAnimatedLength;
-    instanceRoot: SVGElementInstance;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly animatedInstanceRoot: SVGElementInstance;
+    readonly height: SVGAnimatedLength;
+    readonly instanceRoot: SVGElementInstance;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -14248,7 +15370,7 @@ declare var SVGUseElement: {
 }
 
 interface SVGViewElement extends SVGElement, SVGExternalResourcesRequired, SVGFitToViewBox, SVGZoomAndPan {
-    viewTarget: SVGStringList;
+    readonly viewTarget: SVGStringList;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -14258,18 +15380,21 @@ declare var SVGViewElement: {
 }
 
 interface SVGZoomAndPan {
-    SVG_ZOOMANDPAN_DISABLE: number;
-    SVG_ZOOMANDPAN_MAGNIFY: number;
-    SVG_ZOOMANDPAN_UNKNOWN: number;
+    readonly zoomAndPan: number;
+}
+
+declare var SVGZoomAndPan: {
+    readonly SVG_ZOOMANDPAN_DISABLE: number;
+    readonly SVG_ZOOMANDPAN_MAGNIFY: number;
+    readonly SVG_ZOOMANDPAN_UNKNOWN: number;
 }
-declare var SVGZoomAndPan: SVGZoomAndPan;
 
 interface SVGZoomEvent extends UIEvent {
-    newScale: number;
-    newTranslate: SVGPoint;
-    previousScale: number;
-    previousTranslate: SVGPoint;
-    zoomRectScreen: SVGRect;
+    readonly newScale: number;
+    readonly newTranslate: SVGPoint;
+    readonly previousScale: number;
+    readonly previousTranslate: SVGPoint;
+    readonly zoomRectScreen: SVGRect;
 }
 
 declare var SVGZoomEvent: {
@@ -14278,22 +15403,22 @@ declare var SVGZoomEvent: {
 }
 
 interface Screen extends EventTarget {
-    availHeight: number;
-    availWidth: number;
+    readonly availHeight: number;
+    readonly availWidth: number;
     bufferDepth: number;
-    colorDepth: number;
-    deviceXDPI: number;
-    deviceYDPI: number;
-    fontSmoothingEnabled: boolean;
-    height: number;
-    logicalXDPI: number;
-    logicalYDPI: number;
-    msOrientation: string;
+    readonly colorDepth: number;
+    readonly deviceXDPI: number;
+    readonly deviceYDPI: number;
+    readonly fontSmoothingEnabled: boolean;
+    readonly height: number;
+    readonly logicalXDPI: number;
+    readonly logicalYDPI: number;
+    readonly msOrientation: string;
     onmsorientationchange: (ev: Event) => any;
-    pixelDepth: number;
-    systemXDPI: number;
-    systemYDPI: number;
-    width: number;
+    readonly pixelDepth: number;
+    readonly systemXDPI: number;
+    readonly systemYDPI: number;
+    readonly width: number;
     msLockOrientation(orientations: string | string[]): boolean;
     msUnlockOrientation(): void;
     addEventListener(type: "MSOrientationChange", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -14306,8 +15431,8 @@ declare var Screen: {
 }
 
 interface ScriptNotifyEvent extends Event {
-    callingUri: string;
-    value: string;
+    readonly callingUri: string;
+    readonly value: string;
 }
 
 declare var ScriptNotifyEvent: {
@@ -14316,7 +15441,7 @@ declare var ScriptNotifyEvent: {
 }
 
 interface ScriptProcessorNode extends AudioNode {
-    bufferSize: number;
+    readonly bufferSize: number;
     onaudioprocess: (ev: AudioProcessingEvent) => any;
     addEventListener(type: "audioprocess", listener: (ev: AudioProcessingEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -14328,13 +15453,13 @@ declare var ScriptProcessorNode: {
 }
 
 interface Selection {
-    anchorNode: Node;
-    anchorOffset: number;
-    focusNode: Node;
-    focusOffset: number;
-    isCollapsed: boolean;
-    rangeCount: number;
-    type: string;
+    readonly anchorNode: Node;
+    readonly anchorOffset: number;
+    readonly focusNode: Node;
+    readonly focusOffset: number;
+    readonly isCollapsed: boolean;
+    readonly rangeCount: number;
+    readonly type: string;
     addRange(range: Range): void;
     collapse(parentNode: Node, offset: number): void;
     collapseToEnd(): void;
@@ -14359,12 +15484,12 @@ declare var Selection: {
 interface SourceBuffer extends EventTarget {
     appendWindowEnd: number;
     appendWindowStart: number;
-    audioTracks: AudioTrackList;
-    buffered: TimeRanges;
+    readonly audioTracks: AudioTrackList;
+    readonly buffered: TimeRanges;
     mode: string;
     timestampOffset: number;
-    updating: boolean;
-    videoTracks: VideoTrackList;
+    readonly updating: boolean;
+    readonly videoTracks: VideoTrackList;
     abort(): void;
     appendBuffer(data: ArrayBuffer | ArrayBufferView): void;
     appendStream(stream: MSStream, maxSize?: number): void;
@@ -14377,7 +15502,7 @@ declare var SourceBuffer: {
 }
 
 interface SourceBufferList extends EventTarget {
-    length: number;
+    readonly length: number;
     item(index: number): SourceBuffer;
     [index: number]: SourceBuffer;
 }
@@ -14388,7 +15513,7 @@ declare var SourceBufferList: {
 }
 
 interface StereoPannerNode extends AudioNode {
-    pan: AudioParam;
+    readonly pan: AudioParam;
 }
 
 declare var StereoPannerNode: {
@@ -14397,9 +15522,9 @@ declare var StereoPannerNode: {
 }
 
 interface Storage {
-    length: number;
+    readonly length: number;
     clear(): void;
-    getItem(key: string): any;
+    getItem(key: string): string;
     key(index: number): string;
     removeItem(key: string): void;
     setItem(key: string, data: string): void;
@@ -14413,7 +15538,7 @@ declare var Storage: {
 }
 
 interface StorageEvent extends Event {
-    url: string;
+    readonly url: string;
     key?: string;
     oldValue?: string;
     newValue?: string;
@@ -14426,7 +15551,7 @@ declare var StorageEvent: {
 }
 
 interface StyleMedia {
-    type: string;
+    readonly type: string;
     matchMedium(mediaquery: string): boolean;
 }
 
@@ -14437,12 +15562,12 @@ declare var StyleMedia: {
 
 interface StyleSheet {
     disabled: boolean;
-    href: string;
-    media: MediaList;
-    ownerNode: Node;
-    parentStyleSheet: StyleSheet;
-    title: string;
-    type: string;
+    readonly href: string;
+    readonly media: MediaList;
+    readonly ownerNode: Node;
+    readonly parentStyleSheet: StyleSheet;
+    readonly title: string;
+    readonly type: string;
 }
 
 declare var StyleSheet: {
@@ -14451,7 +15576,7 @@ declare var StyleSheet: {
 }
 
 interface StyleSheetList {
-    length: number;
+    readonly length: number;
     item(index?: number): StyleSheet;
     [index: number]: StyleSheet;
 }
@@ -14462,7 +15587,7 @@ declare var StyleSheetList: {
 }
 
 interface StyleSheetPageList {
-    length: number;
+    readonly length: number;
     item(index: number): CSSPageRule;
     [index: number]: CSSPageRule;
 }
@@ -14473,18 +15598,18 @@ declare var StyleSheetPageList: {
 }
 
 interface SubtleCrypto {
-    decrypt(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): any;
-    deriveBits(algorithm: string | Algorithm, baseKey: CryptoKey, length: number): any;
-    deriveKey(algorithm: string | Algorithm, baseKey: CryptoKey, derivedKeyType: string | Algorithm, extractable: boolean, keyUsages: string[]): any;
-    digest(algorithm: string | Algorithm, data: ArrayBufferView): any;
-    encrypt(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): any;
-    exportKey(format: string, key: CryptoKey): any;
-    generateKey(algorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): any;
-    importKey(format: string, keyData: ArrayBufferView, algorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): any;
-    sign(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): any;
-    unwrapKey(format: string, wrappedKey: ArrayBufferView, unwrappingKey: CryptoKey, unwrapAlgorithm: string | Algorithm, unwrappedKeyAlgorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): any;
-    verify(algorithm: string | Algorithm, key: CryptoKey, signature: ArrayBufferView, data: ArrayBufferView): any;
-    wrapKey(format: string, key: CryptoKey, wrappingKey: CryptoKey, wrapAlgorithm: string | Algorithm): any;
+    decrypt(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): PromiseLike<any>;
+    deriveBits(algorithm: string | Algorithm, baseKey: CryptoKey, length: number): PromiseLike<any>;
+    deriveKey(algorithm: string | Algorithm, baseKey: CryptoKey, derivedKeyType: string | Algorithm, extractable: boolean, keyUsages: string[]): PromiseLike<any>;
+    digest(algorithm: string | Algorithm, data: ArrayBufferView): PromiseLike<any>;
+    encrypt(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): PromiseLike<any>;
+    exportKey(format: string, key: CryptoKey): PromiseLike<any>;
+    generateKey(algorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): PromiseLike<any>;
+    importKey(format: string, keyData: ArrayBufferView, algorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): PromiseLike<any>;
+    sign(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): PromiseLike<any>;
+    unwrapKey(format: string, wrappedKey: ArrayBufferView, unwrappingKey: CryptoKey, unwrapAlgorithm: string | Algorithm, unwrappedKeyAlgorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): PromiseLike<any>;
+    verify(algorithm: string | Algorithm, key: CryptoKey, signature: ArrayBufferView, data: ArrayBufferView): PromiseLike<any>;
+    wrapKey(format: string, key: CryptoKey, wrappingKey: CryptoKey, wrapAlgorithm: string | Algorithm): PromiseLike<any>;
 }
 
 declare var SubtleCrypto: {
@@ -14493,8 +15618,7 @@ declare var SubtleCrypto: {
 }
 
 interface Text extends CharacterData {
-    wholeText: string;
-    replaceWholeText(content: string): Text;
+    readonly wholeText: string;
     splitText(offset: number): Text;
 }
 
@@ -14504,39 +15628,39 @@ declare var Text: {
 }
 
 interface TextEvent extends UIEvent {
-    data: string;
-    inputMethod: number;
-    locale: string;
+    readonly data: string;
+    readonly inputMethod: number;
+    readonly locale: string;
     initTextEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, dataArg: string, inputMethod: number, locale: string): void;
-    DOM_INPUT_METHOD_DROP: number;
-    DOM_INPUT_METHOD_HANDWRITING: number;
-    DOM_INPUT_METHOD_IME: number;
-    DOM_INPUT_METHOD_KEYBOARD: number;
-    DOM_INPUT_METHOD_MULTIMODAL: number;
-    DOM_INPUT_METHOD_OPTION: number;
-    DOM_INPUT_METHOD_PASTE: number;
-    DOM_INPUT_METHOD_SCRIPT: number;
-    DOM_INPUT_METHOD_UNKNOWN: number;
-    DOM_INPUT_METHOD_VOICE: number;
+    readonly DOM_INPUT_METHOD_DROP: number;
+    readonly DOM_INPUT_METHOD_HANDWRITING: number;
+    readonly DOM_INPUT_METHOD_IME: number;
+    readonly DOM_INPUT_METHOD_KEYBOARD: number;
+    readonly DOM_INPUT_METHOD_MULTIMODAL: number;
+    readonly DOM_INPUT_METHOD_OPTION: number;
+    readonly DOM_INPUT_METHOD_PASTE: number;
+    readonly DOM_INPUT_METHOD_SCRIPT: number;
+    readonly DOM_INPUT_METHOD_UNKNOWN: number;
+    readonly DOM_INPUT_METHOD_VOICE: number;
 }
 
 declare var TextEvent: {
     prototype: TextEvent;
     new(): TextEvent;
-    DOM_INPUT_METHOD_DROP: number;
-    DOM_INPUT_METHOD_HANDWRITING: number;
-    DOM_INPUT_METHOD_IME: number;
-    DOM_INPUT_METHOD_KEYBOARD: number;
-    DOM_INPUT_METHOD_MULTIMODAL: number;
-    DOM_INPUT_METHOD_OPTION: number;
-    DOM_INPUT_METHOD_PASTE: number;
-    DOM_INPUT_METHOD_SCRIPT: number;
-    DOM_INPUT_METHOD_UNKNOWN: number;
-    DOM_INPUT_METHOD_VOICE: number;
+    readonly DOM_INPUT_METHOD_DROP: number;
+    readonly DOM_INPUT_METHOD_HANDWRITING: number;
+    readonly DOM_INPUT_METHOD_IME: number;
+    readonly DOM_INPUT_METHOD_KEYBOARD: number;
+    readonly DOM_INPUT_METHOD_MULTIMODAL: number;
+    readonly DOM_INPUT_METHOD_OPTION: number;
+    readonly DOM_INPUT_METHOD_PASTE: number;
+    readonly DOM_INPUT_METHOD_SCRIPT: number;
+    readonly DOM_INPUT_METHOD_UNKNOWN: number;
+    readonly DOM_INPUT_METHOD_VOICE: number;
 }
 
 interface TextMetrics {
-    width: number;
+    readonly width: number;
 }
 
 declare var TextMetrics: {
@@ -14544,83 +15668,27 @@ declare var TextMetrics: {
     new(): TextMetrics;
 }
 
-interface TextRange {
-    boundingHeight: number;
-    boundingLeft: number;
-    boundingTop: number;
-    boundingWidth: number;
-    htmlText: string;
-    offsetLeft: number;
-    offsetTop: number;
-    text: string;
-    collapse(start?: boolean): void;
-    compareEndPoints(how: string, sourceRange: TextRange): number;
-    duplicate(): TextRange;
-    execCommand(cmdID: string, showUI?: boolean, value?: any): boolean;
-    execCommandShowHelp(cmdID: string): boolean;
-    expand(Unit: string): boolean;
-    findText(string: string, count?: number, flags?: number): boolean;
-    getBookmark(): string;
-    getBoundingClientRect(): ClientRect;
-    getClientRects(): ClientRectList;
-    inRange(range: TextRange): boolean;
-    isEqual(range: TextRange): boolean;
-    move(unit: string, count?: number): number;
-    moveEnd(unit: string, count?: number): number;
-    moveStart(unit: string, count?: number): number;
-    moveToBookmark(bookmark: string): boolean;
-    moveToElementText(element: Element): void;
-    moveToPoint(x: number, y: number): void;
-    parentElement(): Element;
-    pasteHTML(html: string): void;
-    queryCommandEnabled(cmdID: string): boolean;
-    queryCommandIndeterm(cmdID: string): boolean;
-    queryCommandState(cmdID: string): boolean;
-    queryCommandSupported(cmdID: string): boolean;
-    queryCommandText(cmdID: string): string;
-    queryCommandValue(cmdID: string): any;
-    scrollIntoView(fStart?: boolean): void;
-    select(): void;
-    setEndPoint(how: string, SourceRange: TextRange): void;
-}
-
-declare var TextRange: {
-    prototype: TextRange;
-    new(): TextRange;
-}
-
-interface TextRangeCollection {
-    length: number;
-    item(index: number): TextRange;
-    [index: number]: TextRange;
-}
-
-declare var TextRangeCollection: {
-    prototype: TextRangeCollection;
-    new(): TextRangeCollection;
-}
-
 interface TextTrack extends EventTarget {
-    activeCues: TextTrackCueList;
-    cues: TextTrackCueList;
-    inBandMetadataTrackDispatchType: string;
-    kind: string;
-    label: string;
-    language: string;
+    readonly activeCues: TextTrackCueList;
+    readonly cues: TextTrackCueList;
+    readonly inBandMetadataTrackDispatchType: string;
+    readonly kind: string;
+    readonly label: string;
+    readonly language: string;
     mode: any;
     oncuechange: (ev: Event) => any;
     onerror: (ev: Event) => any;
     onload: (ev: Event) => any;
-    readyState: number;
+    readonly readyState: number;
     addCue(cue: TextTrackCue): void;
     removeCue(cue: TextTrackCue): void;
-    DISABLED: number;
-    ERROR: number;
-    HIDDEN: number;
-    LOADED: number;
-    LOADING: number;
-    NONE: number;
-    SHOWING: number;
+    readonly DISABLED: number;
+    readonly ERROR: number;
+    readonly HIDDEN: number;
+    readonly LOADED: number;
+    readonly LOADING: number;
+    readonly NONE: number;
+    readonly SHOWING: number;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -14630,13 +15698,13 @@ interface TextTrack extends EventTarget {
 declare var TextTrack: {
     prototype: TextTrack;
     new(): TextTrack;
-    DISABLED: number;
-    ERROR: number;
-    HIDDEN: number;
-    LOADED: number;
-    LOADING: number;
-    NONE: number;
-    SHOWING: number;
+    readonly DISABLED: number;
+    readonly ERROR: number;
+    readonly HIDDEN: number;
+    readonly LOADED: number;
+    readonly LOADING: number;
+    readonly NONE: number;
+    readonly SHOWING: number;
 }
 
 interface TextTrackCue extends EventTarget {
@@ -14647,7 +15715,7 @@ interface TextTrackCue extends EventTarget {
     pauseOnExit: boolean;
     startTime: number;
     text: string;
-    track: TextTrack;
+    readonly track: TextTrack;
     getCueAsHTML(): DocumentFragment;
     addEventListener(type: "enter", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "exit", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -14660,7 +15728,7 @@ declare var TextTrackCue: {
 }
 
 interface TextTrackCueList {
-    length: number;
+    readonly length: number;
     getCueById(id: string): TextTrackCue;
     item(index: number): TextTrackCue;
     [index: number]: TextTrackCue;
@@ -14672,7 +15740,7 @@ declare var TextTrackCueList: {
 }
 
 interface TextTrackList extends EventTarget {
-    length: number;
+    readonly length: number;
     onaddtrack: (ev: TrackEvent) => any;
     item(index: number): TextTrack;
     addEventListener(type: "addtrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void;
@@ -14686,7 +15754,7 @@ declare var TextTrackList: {
 }
 
 interface TimeRanges {
-    length: number;
+    readonly length: number;
     end(index: number): number;
     start(index: number): number;
 }
@@ -14697,14 +15765,14 @@ declare var TimeRanges: {
 }
 
 interface Touch {
-    clientX: number;
-    clientY: number;
-    identifier: number;
-    pageX: number;
-    pageY: number;
-    screenX: number;
-    screenY: number;
-    target: EventTarget;
+    readonly clientX: number;
+    readonly clientY: number;
+    readonly identifier: number;
+    readonly pageX: number;
+    readonly pageY: number;
+    readonly screenX: number;
+    readonly screenY: number;
+    readonly target: EventTarget;
 }
 
 declare var Touch: {
@@ -14713,13 +15781,13 @@ declare var Touch: {
 }
 
 interface TouchEvent extends UIEvent {
-    altKey: boolean;
-    changedTouches: TouchList;
-    ctrlKey: boolean;
-    metaKey: boolean;
-    shiftKey: boolean;
-    targetTouches: TouchList;
-    touches: TouchList;
+    readonly altKey: boolean;
+    readonly changedTouches: TouchList;
+    readonly ctrlKey: boolean;
+    readonly metaKey: boolean;
+    readonly shiftKey: boolean;
+    readonly targetTouches: TouchList;
+    readonly touches: TouchList;
 }
 
 declare var TouchEvent: {
@@ -14728,7 +15796,7 @@ declare var TouchEvent: {
 }
 
 interface TouchList {
-    length: number;
+    readonly length: number;
     item(index: number): Touch;
     [index: number]: Touch;
 }
@@ -14739,7 +15807,7 @@ declare var TouchList: {
 }
 
 interface TrackEvent extends Event {
-    track: any;
+    readonly track: any;
 }
 
 declare var TrackEvent: {
@@ -14748,8 +15816,8 @@ declare var TrackEvent: {
 }
 
 interface TransitionEvent extends Event {
-    elapsedTime: number;
-    propertyName: string;
+    readonly elapsedTime: number;
+    readonly propertyName: string;
     initTransitionEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, propertyNameArg: string, elapsedTimeArg: number): void;
 }
 
@@ -14760,10 +15828,10 @@ declare var TransitionEvent: {
 
 interface TreeWalker {
     currentNode: Node;
-    expandEntityReferences: boolean;
-    filter: NodeFilter;
-    root: Node;
-    whatToShow: number;
+    readonly expandEntityReferences: boolean;
+    readonly filter: NodeFilter;
+    readonly root: Node;
+    readonly whatToShow: number;
     firstChild(): Node;
     lastChild(): Node;
     nextNode(): Node;
@@ -14779,8 +15847,8 @@ declare var TreeWalker: {
 }
 
 interface UIEvent extends Event {
-    detail: number;
-    view: Window;
+    readonly detail: number;
+    readonly view: Window;
     initUIEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number): void;
 }
 
@@ -14790,13 +15858,29 @@ declare var UIEvent: {
 }
 
 interface URL {
+    hash: string;
+    host: string;
+    hostname: string;
+    href: string;
+    readonly origin: string;
+    password: string;
+    pathname: string;
+    port: string;
+    protocol: string;
+    search: string;
+    username: string;
+    toString(): string;
+}
+
+declare var URL: {
+    prototype: URL;
+    new(url: string, base?: string): URL;
     createObjectURL(object: any, options?: ObjectURLOptions): string;
     revokeObjectURL(url: string): void;
 }
-declare var URL: URL;
 
 interface UnviewableContentIdentifiedEvent extends NavigationEventWithReferrer {
-    mediaType: string;
+    readonly mediaType: string;
 }
 
 declare var UnviewableContentIdentifiedEvent: {
@@ -14805,16 +15889,16 @@ declare var UnviewableContentIdentifiedEvent: {
 }
 
 interface ValidityState {
-    badInput: boolean;
-    customError: boolean;
-    patternMismatch: boolean;
-    rangeOverflow: boolean;
-    rangeUnderflow: boolean;
-    stepMismatch: boolean;
-    tooLong: boolean;
-    typeMismatch: boolean;
-    valid: boolean;
-    valueMissing: boolean;
+    readonly badInput: boolean;
+    readonly customError: boolean;
+    readonly patternMismatch: boolean;
+    readonly rangeOverflow: boolean;
+    readonly rangeUnderflow: boolean;
+    readonly stepMismatch: boolean;
+    readonly tooLong: boolean;
+    readonly typeMismatch: boolean;
+    readonly valid: boolean;
+    readonly valueMissing: boolean;
 }
 
 declare var ValidityState: {
@@ -14823,11 +15907,11 @@ declare var ValidityState: {
 }
 
 interface VideoPlaybackQuality {
-    corruptedVideoFrames: number;
-    creationTime: number;
-    droppedVideoFrames: number;
-    totalFrameDelay: number;
-    totalVideoFrames: number;
+    readonly corruptedVideoFrames: number;
+    readonly creationTime: number;
+    readonly droppedVideoFrames: number;
+    readonly totalFrameDelay: number;
+    readonly totalVideoFrames: number;
 }
 
 declare var VideoPlaybackQuality: {
@@ -14836,12 +15920,12 @@ declare var VideoPlaybackQuality: {
 }
 
 interface VideoTrack {
-    id: string;
+    readonly id: string;
     kind: string;
-    label: string;
+    readonly label: string;
     language: string;
     selected: boolean;
-    sourceBuffer: SourceBuffer;
+    readonly sourceBuffer: SourceBuffer;
 }
 
 declare var VideoTrack: {
@@ -14850,11 +15934,11 @@ declare var VideoTrack: {
 }
 
 interface VideoTrackList extends EventTarget {
-    length: number;
+    readonly length: number;
     onaddtrack: (ev: TrackEvent) => any;
     onchange: (ev: Event) => any;
     onremovetrack: (ev: TrackEvent) => any;
-    selectedIndex: number;
+    readonly selectedIndex: number;
     getTrackById(id: string): VideoTrack;
     item(index: number): VideoTrack;
     addEventListener(type: "addtrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void;
@@ -14870,41 +15954,41 @@ declare var VideoTrackList: {
 }
 
 interface WEBGL_compressed_texture_s3tc {
-    COMPRESSED_RGBA_S3TC_DXT1_EXT: number;
-    COMPRESSED_RGBA_S3TC_DXT3_EXT: number;
-    COMPRESSED_RGBA_S3TC_DXT5_EXT: number;
-    COMPRESSED_RGB_S3TC_DXT1_EXT: number;
+    readonly COMPRESSED_RGBA_S3TC_DXT1_EXT: number;
+    readonly COMPRESSED_RGBA_S3TC_DXT3_EXT: number;
+    readonly COMPRESSED_RGBA_S3TC_DXT5_EXT: number;
+    readonly COMPRESSED_RGB_S3TC_DXT1_EXT: number;
 }
 
 declare var WEBGL_compressed_texture_s3tc: {
     prototype: WEBGL_compressed_texture_s3tc;
     new(): WEBGL_compressed_texture_s3tc;
-    COMPRESSED_RGBA_S3TC_DXT1_EXT: number;
-    COMPRESSED_RGBA_S3TC_DXT3_EXT: number;
-    COMPRESSED_RGBA_S3TC_DXT5_EXT: number;
-    COMPRESSED_RGB_S3TC_DXT1_EXT: number;
+    readonly COMPRESSED_RGBA_S3TC_DXT1_EXT: number;
+    readonly COMPRESSED_RGBA_S3TC_DXT3_EXT: number;
+    readonly COMPRESSED_RGBA_S3TC_DXT5_EXT: number;
+    readonly COMPRESSED_RGB_S3TC_DXT1_EXT: number;
 }
 
 interface WEBGL_debug_renderer_info {
-    UNMASKED_RENDERER_WEBGL: number;
-    UNMASKED_VENDOR_WEBGL: number;
+    readonly UNMASKED_RENDERER_WEBGL: number;
+    readonly UNMASKED_VENDOR_WEBGL: number;
 }
 
 declare var WEBGL_debug_renderer_info: {
     prototype: WEBGL_debug_renderer_info;
     new(): WEBGL_debug_renderer_info;
-    UNMASKED_RENDERER_WEBGL: number;
-    UNMASKED_VENDOR_WEBGL: number;
+    readonly UNMASKED_RENDERER_WEBGL: number;
+    readonly UNMASKED_VENDOR_WEBGL: number;
 }
 
 interface WEBGL_depth_texture {
-    UNSIGNED_INT_24_8_WEBGL: number;
+    readonly UNSIGNED_INT_24_8_WEBGL: number;
 }
 
 declare var WEBGL_depth_texture: {
     prototype: WEBGL_depth_texture;
     new(): WEBGL_depth_texture;
-    UNSIGNED_INT_24_8_WEBGL: number;
+    readonly UNSIGNED_INT_24_8_WEBGL: number;
 }
 
 interface WaveShaperNode extends AudioNode {
@@ -14918,9 +16002,9 @@ declare var WaveShaperNode: {
 }
 
 interface WebGLActiveInfo {
-    name: string;
-    size: number;
-    type: number;
+    readonly name: string;
+    readonly size: number;
+    readonly type: number;
 }
 
 declare var WebGLActiveInfo: {
@@ -14937,12 +16021,12 @@ declare var WebGLBuffer: {
 }
 
 interface WebGLContextEvent extends Event {
-    statusMessage: string;
+    readonly statusMessage: string;
 }
 
 declare var WebGLContextEvent: {
     prototype: WebGLContextEvent;
-    new(): WebGLContextEvent;
+    new(type: string, eventInitDict?: WebGLContextEventInit): WebGLContextEvent;
 }
 
 interface WebGLFramebuffer extends WebGLObject {
@@ -14978,9 +16062,9 @@ declare var WebGLRenderbuffer: {
 }
 
 interface WebGLRenderingContext {
-    canvas: HTMLCanvasElement;
-    drawingBufferHeight: number;
-    drawingBufferWidth: number;
+    readonly canvas: HTMLCanvasElement;
+    readonly drawingBufferHeight: number;
+    readonly drawingBufferWidth: number;
     activeTexture(texture: number): void;
     attachShader(program: WebGLProgram, shader: WebGLShader): void;
     bindAttribLocation(program: WebGLProgram, index: number, name: string): void;
@@ -15095,635 +16179,635 @@ interface WebGLRenderingContext {
     texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, video: HTMLVideoElement): void;
     texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, pixels: ImageData): void;
     uniform1f(location: WebGLUniformLocation, x: number): void;
-    uniform1fv(location: WebGLUniformLocation, v: Float32Array): void;
+    uniform1fv(location: WebGLUniformLocation, v: Float32Array | number[]): void;
     uniform1i(location: WebGLUniformLocation, x: number): void;
-    uniform1iv(location: WebGLUniformLocation, v: Int32Array): void;
+    uniform1iv(location: WebGLUniformLocation, v: Int32Array | number[]): void;
     uniform2f(location: WebGLUniformLocation, x: number, y: number): void;
-    uniform2fv(location: WebGLUniformLocation, v: Float32Array): void;
+    uniform2fv(location: WebGLUniformLocation, v: Float32Array | number[]): void;
     uniform2i(location: WebGLUniformLocation, x: number, y: number): void;
-    uniform2iv(location: WebGLUniformLocation, v: Int32Array): void;
+    uniform2iv(location: WebGLUniformLocation, v: Int32Array | number[]): void;
     uniform3f(location: WebGLUniformLocation, x: number, y: number, z: number): void;
-    uniform3fv(location: WebGLUniformLocation, v: Float32Array): void;
+    uniform3fv(location: WebGLUniformLocation, v: Float32Array | number[]): void;
     uniform3i(location: WebGLUniformLocation, x: number, y: number, z: number): void;
-    uniform3iv(location: WebGLUniformLocation, v: Int32Array): void;
+    uniform3iv(location: WebGLUniformLocation, v: Int32Array | number[]): void;
     uniform4f(location: WebGLUniformLocation, x: number, y: number, z: number, w: number): void;
-    uniform4fv(location: WebGLUniformLocation, v: Float32Array): void;
+    uniform4fv(location: WebGLUniformLocation, v: Float32Array | number[]): void;
     uniform4i(location: WebGLUniformLocation, x: number, y: number, z: number, w: number): void;
-    uniform4iv(location: WebGLUniformLocation, v: Int32Array): void;
-    uniformMatrix2fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array): void;
-    uniformMatrix3fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array): void;
-    uniformMatrix4fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array): void;
+    uniform4iv(location: WebGLUniformLocation, v: Int32Array | number[]): void;
+    uniformMatrix2fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | number[]): void;
+    uniformMatrix3fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | number[]): void;
+    uniformMatrix4fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | number[]): void;
     useProgram(program: WebGLProgram): void;
     validateProgram(program: WebGLProgram): void;
     vertexAttrib1f(indx: number, x: number): void;
-    vertexAttrib1fv(indx: number, values: Float32Array): void;
+    vertexAttrib1fv(indx: number, values: Float32Array | number[]): void;
     vertexAttrib2f(indx: number, x: number, y: number): void;
-    vertexAttrib2fv(indx: number, values: Float32Array): void;
+    vertexAttrib2fv(indx: number, values: Float32Array | number[]): void;
     vertexAttrib3f(indx: number, x: number, y: number, z: number): void;
-    vertexAttrib3fv(indx: number, values: Float32Array): void;
+    vertexAttrib3fv(indx: number, values: Float32Array | number[]): void;
     vertexAttrib4f(indx: number, x: number, y: number, z: number, w: number): void;
-    vertexAttrib4fv(indx: number, values: Float32Array): void;
+    vertexAttrib4fv(indx: number, values: Float32Array | number[]): void;
     vertexAttribPointer(indx: number, size: number, type: number, normalized: boolean, stride: number, offset: number): void;
     viewport(x: number, y: number, width: number, height: number): void;
-    ACTIVE_ATTRIBUTES: number;
-    ACTIVE_TEXTURE: number;
-    ACTIVE_UNIFORMS: number;
-    ALIASED_LINE_WIDTH_RANGE: number;
-    ALIASED_POINT_SIZE_RANGE: number;
-    ALPHA: number;
-    ALPHA_BITS: number;
-    ALWAYS: number;
-    ARRAY_BUFFER: number;
-    ARRAY_BUFFER_BINDING: number;
-    ATTACHED_SHADERS: number;
-    BACK: number;
-    BLEND: number;
-    BLEND_COLOR: number;
-    BLEND_DST_ALPHA: number;
-    BLEND_DST_RGB: number;
-    BLEND_EQUATION: number;
-    BLEND_EQUATION_ALPHA: number;
-    BLEND_EQUATION_RGB: number;
-    BLEND_SRC_ALPHA: number;
-    BLEND_SRC_RGB: number;
-    BLUE_BITS: number;
-    BOOL: number;
-    BOOL_VEC2: number;
-    BOOL_VEC3: number;
-    BOOL_VEC4: number;
-    BROWSER_DEFAULT_WEBGL: number;
-    BUFFER_SIZE: number;
-    BUFFER_USAGE: number;
-    BYTE: number;
-    CCW: number;
-    CLAMP_TO_EDGE: number;
-    COLOR_ATTACHMENT0: number;
-    COLOR_BUFFER_BIT: number;
-    COLOR_CLEAR_VALUE: number;
-    COLOR_WRITEMASK: number;
-    COMPILE_STATUS: number;
-    COMPRESSED_TEXTURE_FORMATS: number;
-    CONSTANT_ALPHA: number;
-    CONSTANT_COLOR: number;
-    CONTEXT_LOST_WEBGL: number;
-    CULL_FACE: number;
-    CULL_FACE_MODE: number;
-    CURRENT_PROGRAM: number;
-    CURRENT_VERTEX_ATTRIB: number;
-    CW: number;
-    DECR: number;
-    DECR_WRAP: number;
-    DELETE_STATUS: number;
-    DEPTH_ATTACHMENT: number;
-    DEPTH_BITS: number;
-    DEPTH_BUFFER_BIT: number;
-    DEPTH_CLEAR_VALUE: number;
-    DEPTH_COMPONENT: number;
-    DEPTH_COMPONENT16: number;
-    DEPTH_FUNC: number;
-    DEPTH_RANGE: number;
-    DEPTH_STENCIL: number;
-    DEPTH_STENCIL_ATTACHMENT: number;
-    DEPTH_TEST: number;
-    DEPTH_WRITEMASK: number;
-    DITHER: number;
-    DONT_CARE: number;
-    DST_ALPHA: number;
-    DST_COLOR: number;
-    DYNAMIC_DRAW: number;
-    ELEMENT_ARRAY_BUFFER: number;
-    ELEMENT_ARRAY_BUFFER_BINDING: number;
-    EQUAL: number;
-    FASTEST: number;
-    FLOAT: number;
-    FLOAT_MAT2: number;
-    FLOAT_MAT3: number;
-    FLOAT_MAT4: number;
-    FLOAT_VEC2: number;
-    FLOAT_VEC3: number;
-    FLOAT_VEC4: number;
-    FRAGMENT_SHADER: number;
-    FRAMEBUFFER: number;
-    FRAMEBUFFER_ATTACHMENT_OBJECT_NAME: number;
-    FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE: number;
-    FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE: number;
-    FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL: number;
-    FRAMEBUFFER_BINDING: number;
-    FRAMEBUFFER_COMPLETE: number;
-    FRAMEBUFFER_INCOMPLETE_ATTACHMENT: number;
-    FRAMEBUFFER_INCOMPLETE_DIMENSIONS: number;
-    FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: number;
-    FRAMEBUFFER_UNSUPPORTED: number;
-    FRONT: number;
-    FRONT_AND_BACK: number;
-    FRONT_FACE: number;
-    FUNC_ADD: number;
-    FUNC_REVERSE_SUBTRACT: number;
-    FUNC_SUBTRACT: number;
-    GENERATE_MIPMAP_HINT: number;
-    GEQUAL: number;
-    GREATER: number;
-    GREEN_BITS: number;
-    HIGH_FLOAT: number;
-    HIGH_INT: number;
-    IMPLEMENTATION_COLOR_READ_FORMAT: number;
-    IMPLEMENTATION_COLOR_READ_TYPE: number;
-    INCR: number;
-    INCR_WRAP: number;
-    INT: number;
-    INT_VEC2: number;
-    INT_VEC3: number;
-    INT_VEC4: number;
-    INVALID_ENUM: number;
-    INVALID_FRAMEBUFFER_OPERATION: number;
-    INVALID_OPERATION: number;
-    INVALID_VALUE: number;
-    INVERT: number;
-    KEEP: number;
-    LEQUAL: number;
-    LESS: number;
-    LINEAR: number;
-    LINEAR_MIPMAP_LINEAR: number;
-    LINEAR_MIPMAP_NEAREST: number;
-    LINES: number;
-    LINE_LOOP: number;
-    LINE_STRIP: number;
-    LINE_WIDTH: number;
-    LINK_STATUS: number;
-    LOW_FLOAT: number;
-    LOW_INT: number;
-    LUMINANCE: number;
-    LUMINANCE_ALPHA: number;
-    MAX_COMBINED_TEXTURE_IMAGE_UNITS: number;
-    MAX_CUBE_MAP_TEXTURE_SIZE: number;
-    MAX_FRAGMENT_UNIFORM_VECTORS: number;
-    MAX_RENDERBUFFER_SIZE: number;
-    MAX_TEXTURE_IMAGE_UNITS: number;
-    MAX_TEXTURE_SIZE: number;
-    MAX_VARYING_VECTORS: number;
-    MAX_VERTEX_ATTRIBS: number;
-    MAX_VERTEX_TEXTURE_IMAGE_UNITS: number;
-    MAX_VERTEX_UNIFORM_VECTORS: number;
-    MAX_VIEWPORT_DIMS: number;
-    MEDIUM_FLOAT: number;
-    MEDIUM_INT: number;
-    MIRRORED_REPEAT: number;
-    NEAREST: number;
-    NEAREST_MIPMAP_LINEAR: number;
-    NEAREST_MIPMAP_NEAREST: number;
-    NEVER: number;
-    NICEST: number;
-    NONE: number;
-    NOTEQUAL: number;
-    NO_ERROR: number;
-    ONE: number;
-    ONE_MINUS_CONSTANT_ALPHA: number;
-    ONE_MINUS_CONSTANT_COLOR: number;
-    ONE_MINUS_DST_ALPHA: number;
-    ONE_MINUS_DST_COLOR: number;
-    ONE_MINUS_SRC_ALPHA: number;
-    ONE_MINUS_SRC_COLOR: number;
-    OUT_OF_MEMORY: number;
-    PACK_ALIGNMENT: number;
-    POINTS: number;
-    POLYGON_OFFSET_FACTOR: number;
-    POLYGON_OFFSET_FILL: number;
-    POLYGON_OFFSET_UNITS: number;
-    RED_BITS: number;
-    RENDERBUFFER: number;
-    RENDERBUFFER_ALPHA_SIZE: number;
-    RENDERBUFFER_BINDING: number;
-    RENDERBUFFER_BLUE_SIZE: number;
-    RENDERBUFFER_DEPTH_SIZE: number;
-    RENDERBUFFER_GREEN_SIZE: number;
-    RENDERBUFFER_HEIGHT: number;
-    RENDERBUFFER_INTERNAL_FORMAT: number;
-    RENDERBUFFER_RED_SIZE: number;
-    RENDERBUFFER_STENCIL_SIZE: number;
-    RENDERBUFFER_WIDTH: number;
-    RENDERER: number;
-    REPEAT: number;
-    REPLACE: number;
-    RGB: number;
-    RGB565: number;
-    RGB5_A1: number;
-    RGBA: number;
-    RGBA4: number;
-    SAMPLER_2D: number;
-    SAMPLER_CUBE: number;
-    SAMPLES: number;
-    SAMPLE_ALPHA_TO_COVERAGE: number;
-    SAMPLE_BUFFERS: number;
-    SAMPLE_COVERAGE: number;
-    SAMPLE_COVERAGE_INVERT: number;
-    SAMPLE_COVERAGE_VALUE: number;
-    SCISSOR_BOX: number;
-    SCISSOR_TEST: number;
-    SHADER_TYPE: number;
-    SHADING_LANGUAGE_VERSION: number;
-    SHORT: number;
-    SRC_ALPHA: number;
-    SRC_ALPHA_SATURATE: number;
-    SRC_COLOR: number;
-    STATIC_DRAW: number;
-    STENCIL_ATTACHMENT: number;
-    STENCIL_BACK_FAIL: number;
-    STENCIL_BACK_FUNC: number;
-    STENCIL_BACK_PASS_DEPTH_FAIL: number;
-    STENCIL_BACK_PASS_DEPTH_PASS: number;
-    STENCIL_BACK_REF: number;
-    STENCIL_BACK_VALUE_MASK: number;
-    STENCIL_BACK_WRITEMASK: number;
-    STENCIL_BITS: number;
-    STENCIL_BUFFER_BIT: number;
-    STENCIL_CLEAR_VALUE: number;
-    STENCIL_FAIL: number;
-    STENCIL_FUNC: number;
-    STENCIL_INDEX: number;
-    STENCIL_INDEX8: number;
-    STENCIL_PASS_DEPTH_FAIL: number;
-    STENCIL_PASS_DEPTH_PASS: number;
-    STENCIL_REF: number;
-    STENCIL_TEST: number;
-    STENCIL_VALUE_MASK: number;
-    STENCIL_WRITEMASK: number;
-    STREAM_DRAW: number;
-    SUBPIXEL_BITS: number;
-    TEXTURE: number;
-    TEXTURE0: number;
-    TEXTURE1: number;
-    TEXTURE10: number;
-    TEXTURE11: number;
-    TEXTURE12: number;
-    TEXTURE13: number;
-    TEXTURE14: number;
-    TEXTURE15: number;
-    TEXTURE16: number;
-    TEXTURE17: number;
-    TEXTURE18: number;
-    TEXTURE19: number;
-    TEXTURE2: number;
-    TEXTURE20: number;
-    TEXTURE21: number;
-    TEXTURE22: number;
-    TEXTURE23: number;
-    TEXTURE24: number;
-    TEXTURE25: number;
-    TEXTURE26: number;
-    TEXTURE27: number;
-    TEXTURE28: number;
-    TEXTURE29: number;
-    TEXTURE3: number;
-    TEXTURE30: number;
-    TEXTURE31: number;
-    TEXTURE4: number;
-    TEXTURE5: number;
-    TEXTURE6: number;
-    TEXTURE7: number;
-    TEXTURE8: number;
-    TEXTURE9: number;
-    TEXTURE_2D: number;
-    TEXTURE_BINDING_2D: number;
-    TEXTURE_BINDING_CUBE_MAP: number;
-    TEXTURE_CUBE_MAP: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_X: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_Y: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_Z: number;
-    TEXTURE_CUBE_MAP_POSITIVE_X: number;
-    TEXTURE_CUBE_MAP_POSITIVE_Y: number;
-    TEXTURE_CUBE_MAP_POSITIVE_Z: number;
-    TEXTURE_MAG_FILTER: number;
-    TEXTURE_MIN_FILTER: number;
-    TEXTURE_WRAP_S: number;
-    TEXTURE_WRAP_T: number;
-    TRIANGLES: number;
-    TRIANGLE_FAN: number;
-    TRIANGLE_STRIP: number;
-    UNPACK_ALIGNMENT: number;
-    UNPACK_COLORSPACE_CONVERSION_WEBGL: number;
-    UNPACK_FLIP_Y_WEBGL: number;
-    UNPACK_PREMULTIPLY_ALPHA_WEBGL: number;
-    UNSIGNED_BYTE: number;
-    UNSIGNED_INT: number;
-    UNSIGNED_SHORT: number;
-    UNSIGNED_SHORT_4_4_4_4: number;
-    UNSIGNED_SHORT_5_5_5_1: number;
-    UNSIGNED_SHORT_5_6_5: number;
-    VALIDATE_STATUS: number;
-    VENDOR: number;
-    VERSION: number;
-    VERTEX_ATTRIB_ARRAY_BUFFER_BINDING: number;
-    VERTEX_ATTRIB_ARRAY_ENABLED: number;
-    VERTEX_ATTRIB_ARRAY_NORMALIZED: number;
-    VERTEX_ATTRIB_ARRAY_POINTER: number;
-    VERTEX_ATTRIB_ARRAY_SIZE: number;
-    VERTEX_ATTRIB_ARRAY_STRIDE: number;
-    VERTEX_ATTRIB_ARRAY_TYPE: number;
-    VERTEX_SHADER: number;
-    VIEWPORT: number;
-    ZERO: number;
+    readonly ACTIVE_ATTRIBUTES: number;
+    readonly ACTIVE_TEXTURE: number;
+    readonly ACTIVE_UNIFORMS: number;
+    readonly ALIASED_LINE_WIDTH_RANGE: number;
+    readonly ALIASED_POINT_SIZE_RANGE: number;
+    readonly ALPHA: number;
+    readonly ALPHA_BITS: number;
+    readonly ALWAYS: number;
+    readonly ARRAY_BUFFER: number;
+    readonly ARRAY_BUFFER_BINDING: number;
+    readonly ATTACHED_SHADERS: number;
+    readonly BACK: number;
+    readonly BLEND: number;
+    readonly BLEND_COLOR: number;
+    readonly BLEND_DST_ALPHA: number;
+    readonly BLEND_DST_RGB: number;
+    readonly BLEND_EQUATION: number;
+    readonly BLEND_EQUATION_ALPHA: number;
+    readonly BLEND_EQUATION_RGB: number;
+    readonly BLEND_SRC_ALPHA: number;
+    readonly BLEND_SRC_RGB: number;
+    readonly BLUE_BITS: number;
+    readonly BOOL: number;
+    readonly BOOL_VEC2: number;
+    readonly BOOL_VEC3: number;
+    readonly BOOL_VEC4: number;
+    readonly BROWSER_DEFAULT_WEBGL: number;
+    readonly BUFFER_SIZE: number;
+    readonly BUFFER_USAGE: number;
+    readonly BYTE: number;
+    readonly CCW: number;
+    readonly CLAMP_TO_EDGE: number;
+    readonly COLOR_ATTACHMENT0: number;
+    readonly COLOR_BUFFER_BIT: number;
+    readonly COLOR_CLEAR_VALUE: number;
+    readonly COLOR_WRITEMASK: number;
+    readonly COMPILE_STATUS: number;
+    readonly COMPRESSED_TEXTURE_FORMATS: number;
+    readonly CONSTANT_ALPHA: number;
+    readonly CONSTANT_COLOR: number;
+    readonly CONTEXT_LOST_WEBGL: number;
+    readonly CULL_FACE: number;
+    readonly CULL_FACE_MODE: number;
+    readonly CURRENT_PROGRAM: number;
+    readonly CURRENT_VERTEX_ATTRIB: number;
+    readonly CW: number;
+    readonly DECR: number;
+    readonly DECR_WRAP: number;
+    readonly DELETE_STATUS: number;
+    readonly DEPTH_ATTACHMENT: number;
+    readonly DEPTH_BITS: number;
+    readonly DEPTH_BUFFER_BIT: number;
+    readonly DEPTH_CLEAR_VALUE: number;
+    readonly DEPTH_COMPONENT: number;
+    readonly DEPTH_COMPONENT16: number;
+    readonly DEPTH_FUNC: number;
+    readonly DEPTH_RANGE: number;
+    readonly DEPTH_STENCIL: number;
+    readonly DEPTH_STENCIL_ATTACHMENT: number;
+    readonly DEPTH_TEST: number;
+    readonly DEPTH_WRITEMASK: number;
+    readonly DITHER: number;
+    readonly DONT_CARE: number;
+    readonly DST_ALPHA: number;
+    readonly DST_COLOR: number;
+    readonly DYNAMIC_DRAW: number;
+    readonly ELEMENT_ARRAY_BUFFER: number;
+    readonly ELEMENT_ARRAY_BUFFER_BINDING: number;
+    readonly EQUAL: number;
+    readonly FASTEST: number;
+    readonly FLOAT: number;
+    readonly FLOAT_MAT2: number;
+    readonly FLOAT_MAT3: number;
+    readonly FLOAT_MAT4: number;
+    readonly FLOAT_VEC2: number;
+    readonly FLOAT_VEC3: number;
+    readonly FLOAT_VEC4: number;
+    readonly FRAGMENT_SHADER: number;
+    readonly FRAMEBUFFER: number;
+    readonly FRAMEBUFFER_ATTACHMENT_OBJECT_NAME: number;
+    readonly FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE: number;
+    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE: number;
+    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL: number;
+    readonly FRAMEBUFFER_BINDING: number;
+    readonly FRAMEBUFFER_COMPLETE: number;
+    readonly FRAMEBUFFER_INCOMPLETE_ATTACHMENT: number;
+    readonly FRAMEBUFFER_INCOMPLETE_DIMENSIONS: number;
+    readonly FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: number;
+    readonly FRAMEBUFFER_UNSUPPORTED: number;
+    readonly FRONT: number;
+    readonly FRONT_AND_BACK: number;
+    readonly FRONT_FACE: number;
+    readonly FUNC_ADD: number;
+    readonly FUNC_REVERSE_SUBTRACT: number;
+    readonly FUNC_SUBTRACT: number;
+    readonly GENERATE_MIPMAP_HINT: number;
+    readonly GEQUAL: number;
+    readonly GREATER: number;
+    readonly GREEN_BITS: number;
+    readonly HIGH_FLOAT: number;
+    readonly HIGH_INT: number;
+    readonly IMPLEMENTATION_COLOR_READ_FORMAT: number;
+    readonly IMPLEMENTATION_COLOR_READ_TYPE: number;
+    readonly INCR: number;
+    readonly INCR_WRAP: number;
+    readonly INT: number;
+    readonly INT_VEC2: number;
+    readonly INT_VEC3: number;
+    readonly INT_VEC4: number;
+    readonly INVALID_ENUM: number;
+    readonly INVALID_FRAMEBUFFER_OPERATION: number;
+    readonly INVALID_OPERATION: number;
+    readonly INVALID_VALUE: number;
+    readonly INVERT: number;
+    readonly KEEP: number;
+    readonly LEQUAL: number;
+    readonly LESS: number;
+    readonly LINEAR: number;
+    readonly LINEAR_MIPMAP_LINEAR: number;
+    readonly LINEAR_MIPMAP_NEAREST: number;
+    readonly LINES: number;
+    readonly LINE_LOOP: number;
+    readonly LINE_STRIP: number;
+    readonly LINE_WIDTH: number;
+    readonly LINK_STATUS: number;
+    readonly LOW_FLOAT: number;
+    readonly LOW_INT: number;
+    readonly LUMINANCE: number;
+    readonly LUMINANCE_ALPHA: number;
+    readonly MAX_COMBINED_TEXTURE_IMAGE_UNITS: number;
+    readonly MAX_CUBE_MAP_TEXTURE_SIZE: number;
+    readonly MAX_FRAGMENT_UNIFORM_VECTORS: number;
+    readonly MAX_RENDERBUFFER_SIZE: number;
+    readonly MAX_TEXTURE_IMAGE_UNITS: number;
+    readonly MAX_TEXTURE_SIZE: number;
+    readonly MAX_VARYING_VECTORS: number;
+    readonly MAX_VERTEX_ATTRIBS: number;
+    readonly MAX_VERTEX_TEXTURE_IMAGE_UNITS: number;
+    readonly MAX_VERTEX_UNIFORM_VECTORS: number;
+    readonly MAX_VIEWPORT_DIMS: number;
+    readonly MEDIUM_FLOAT: number;
+    readonly MEDIUM_INT: number;
+    readonly MIRRORED_REPEAT: number;
+    readonly NEAREST: number;
+    readonly NEAREST_MIPMAP_LINEAR: number;
+    readonly NEAREST_MIPMAP_NEAREST: number;
+    readonly NEVER: number;
+    readonly NICEST: number;
+    readonly NONE: number;
+    readonly NOTEQUAL: number;
+    readonly NO_ERROR: number;
+    readonly ONE: number;
+    readonly ONE_MINUS_CONSTANT_ALPHA: number;
+    readonly ONE_MINUS_CONSTANT_COLOR: number;
+    readonly ONE_MINUS_DST_ALPHA: number;
+    readonly ONE_MINUS_DST_COLOR: number;
+    readonly ONE_MINUS_SRC_ALPHA: number;
+    readonly ONE_MINUS_SRC_COLOR: number;
+    readonly OUT_OF_MEMORY: number;
+    readonly PACK_ALIGNMENT: number;
+    readonly POINTS: number;
+    readonly POLYGON_OFFSET_FACTOR: number;
+    readonly POLYGON_OFFSET_FILL: number;
+    readonly POLYGON_OFFSET_UNITS: number;
+    readonly RED_BITS: number;
+    readonly RENDERBUFFER: number;
+    readonly RENDERBUFFER_ALPHA_SIZE: number;
+    readonly RENDERBUFFER_BINDING: number;
+    readonly RENDERBUFFER_BLUE_SIZE: number;
+    readonly RENDERBUFFER_DEPTH_SIZE: number;
+    readonly RENDERBUFFER_GREEN_SIZE: number;
+    readonly RENDERBUFFER_HEIGHT: number;
+    readonly RENDERBUFFER_INTERNAL_FORMAT: number;
+    readonly RENDERBUFFER_RED_SIZE: number;
+    readonly RENDERBUFFER_STENCIL_SIZE: number;
+    readonly RENDERBUFFER_WIDTH: number;
+    readonly RENDERER: number;
+    readonly REPEAT: number;
+    readonly REPLACE: number;
+    readonly RGB: number;
+    readonly RGB565: number;
+    readonly RGB5_A1: number;
+    readonly RGBA: number;
+    readonly RGBA4: number;
+    readonly SAMPLER_2D: number;
+    readonly SAMPLER_CUBE: number;
+    readonly SAMPLES: number;
+    readonly SAMPLE_ALPHA_TO_COVERAGE: number;
+    readonly SAMPLE_BUFFERS: number;
+    readonly SAMPLE_COVERAGE: number;
+    readonly SAMPLE_COVERAGE_INVERT: number;
+    readonly SAMPLE_COVERAGE_VALUE: number;
+    readonly SCISSOR_BOX: number;
+    readonly SCISSOR_TEST: number;
+    readonly SHADER_TYPE: number;
+    readonly SHADING_LANGUAGE_VERSION: number;
+    readonly SHORT: number;
+    readonly SRC_ALPHA: number;
+    readonly SRC_ALPHA_SATURATE: number;
+    readonly SRC_COLOR: number;
+    readonly STATIC_DRAW: number;
+    readonly STENCIL_ATTACHMENT: number;
+    readonly STENCIL_BACK_FAIL: number;
+    readonly STENCIL_BACK_FUNC: number;
+    readonly STENCIL_BACK_PASS_DEPTH_FAIL: number;
+    readonly STENCIL_BACK_PASS_DEPTH_PASS: number;
+    readonly STENCIL_BACK_REF: number;
+    readonly STENCIL_BACK_VALUE_MASK: number;
+    readonly STENCIL_BACK_WRITEMASK: number;
+    readonly STENCIL_BITS: number;
+    readonly STENCIL_BUFFER_BIT: number;
+    readonly STENCIL_CLEAR_VALUE: number;
+    readonly STENCIL_FAIL: number;
+    readonly STENCIL_FUNC: number;
+    readonly STENCIL_INDEX: number;
+    readonly STENCIL_INDEX8: number;
+    readonly STENCIL_PASS_DEPTH_FAIL: number;
+    readonly STENCIL_PASS_DEPTH_PASS: number;
+    readonly STENCIL_REF: number;
+    readonly STENCIL_TEST: number;
+    readonly STENCIL_VALUE_MASK: number;
+    readonly STENCIL_WRITEMASK: number;
+    readonly STREAM_DRAW: number;
+    readonly SUBPIXEL_BITS: number;
+    readonly TEXTURE: number;
+    readonly TEXTURE0: number;
+    readonly TEXTURE1: number;
+    readonly TEXTURE10: number;
+    readonly TEXTURE11: number;
+    readonly TEXTURE12: number;
+    readonly TEXTURE13: number;
+    readonly TEXTURE14: number;
+    readonly TEXTURE15: number;
+    readonly TEXTURE16: number;
+    readonly TEXTURE17: number;
+    readonly TEXTURE18: number;
+    readonly TEXTURE19: number;
+    readonly TEXTURE2: number;
+    readonly TEXTURE20: number;
+    readonly TEXTURE21: number;
+    readonly TEXTURE22: number;
+    readonly TEXTURE23: number;
+    readonly TEXTURE24: number;
+    readonly TEXTURE25: number;
+    readonly TEXTURE26: number;
+    readonly TEXTURE27: number;
+    readonly TEXTURE28: number;
+    readonly TEXTURE29: number;
+    readonly TEXTURE3: number;
+    readonly TEXTURE30: number;
+    readonly TEXTURE31: number;
+    readonly TEXTURE4: number;
+    readonly TEXTURE5: number;
+    readonly TEXTURE6: number;
+    readonly TEXTURE7: number;
+    readonly TEXTURE8: number;
+    readonly TEXTURE9: number;
+    readonly TEXTURE_2D: number;
+    readonly TEXTURE_BINDING_2D: number;
+    readonly TEXTURE_BINDING_CUBE_MAP: number;
+    readonly TEXTURE_CUBE_MAP: number;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_X: number;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_Y: number;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_Z: number;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_X: number;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_Y: number;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_Z: number;
+    readonly TEXTURE_MAG_FILTER: number;
+    readonly TEXTURE_MIN_FILTER: number;
+    readonly TEXTURE_WRAP_S: number;
+    readonly TEXTURE_WRAP_T: number;
+    readonly TRIANGLES: number;
+    readonly TRIANGLE_FAN: number;
+    readonly TRIANGLE_STRIP: number;
+    readonly UNPACK_ALIGNMENT: number;
+    readonly UNPACK_COLORSPACE_CONVERSION_WEBGL: number;
+    readonly UNPACK_FLIP_Y_WEBGL: number;
+    readonly UNPACK_PREMULTIPLY_ALPHA_WEBGL: number;
+    readonly UNSIGNED_BYTE: number;
+    readonly UNSIGNED_INT: number;
+    readonly UNSIGNED_SHORT: number;
+    readonly UNSIGNED_SHORT_4_4_4_4: number;
+    readonly UNSIGNED_SHORT_5_5_5_1: number;
+    readonly UNSIGNED_SHORT_5_6_5: number;
+    readonly VALIDATE_STATUS: number;
+    readonly VENDOR: number;
+    readonly VERSION: number;
+    readonly VERTEX_ATTRIB_ARRAY_BUFFER_BINDING: number;
+    readonly VERTEX_ATTRIB_ARRAY_ENABLED: number;
+    readonly VERTEX_ATTRIB_ARRAY_NORMALIZED: number;
+    readonly VERTEX_ATTRIB_ARRAY_POINTER: number;
+    readonly VERTEX_ATTRIB_ARRAY_SIZE: number;
+    readonly VERTEX_ATTRIB_ARRAY_STRIDE: number;
+    readonly VERTEX_ATTRIB_ARRAY_TYPE: number;
+    readonly VERTEX_SHADER: number;
+    readonly VIEWPORT: number;
+    readonly ZERO: number;
 }
 
 declare var WebGLRenderingContext: {
     prototype: WebGLRenderingContext;
     new(): WebGLRenderingContext;
-    ACTIVE_ATTRIBUTES: number;
-    ACTIVE_TEXTURE: number;
-    ACTIVE_UNIFORMS: number;
-    ALIASED_LINE_WIDTH_RANGE: number;
-    ALIASED_POINT_SIZE_RANGE: number;
-    ALPHA: number;
-    ALPHA_BITS: number;
-    ALWAYS: number;
-    ARRAY_BUFFER: number;
-    ARRAY_BUFFER_BINDING: number;
-    ATTACHED_SHADERS: number;
-    BACK: number;
-    BLEND: number;
-    BLEND_COLOR: number;
-    BLEND_DST_ALPHA: number;
-    BLEND_DST_RGB: number;
-    BLEND_EQUATION: number;
-    BLEND_EQUATION_ALPHA: number;
-    BLEND_EQUATION_RGB: number;
-    BLEND_SRC_ALPHA: number;
-    BLEND_SRC_RGB: number;
-    BLUE_BITS: number;
-    BOOL: number;
-    BOOL_VEC2: number;
-    BOOL_VEC3: number;
-    BOOL_VEC4: number;
-    BROWSER_DEFAULT_WEBGL: number;
-    BUFFER_SIZE: number;
-    BUFFER_USAGE: number;
-    BYTE: number;
-    CCW: number;
-    CLAMP_TO_EDGE: number;
-    COLOR_ATTACHMENT0: number;
-    COLOR_BUFFER_BIT: number;
-    COLOR_CLEAR_VALUE: number;
-    COLOR_WRITEMASK: number;
-    COMPILE_STATUS: number;
-    COMPRESSED_TEXTURE_FORMATS: number;
-    CONSTANT_ALPHA: number;
-    CONSTANT_COLOR: number;
-    CONTEXT_LOST_WEBGL: number;
-    CULL_FACE: number;
-    CULL_FACE_MODE: number;
-    CURRENT_PROGRAM: number;
-    CURRENT_VERTEX_ATTRIB: number;
-    CW: number;
-    DECR: number;
-    DECR_WRAP: number;
-    DELETE_STATUS: number;
-    DEPTH_ATTACHMENT: number;
-    DEPTH_BITS: number;
-    DEPTH_BUFFER_BIT: number;
-    DEPTH_CLEAR_VALUE: number;
-    DEPTH_COMPONENT: number;
-    DEPTH_COMPONENT16: number;
-    DEPTH_FUNC: number;
-    DEPTH_RANGE: number;
-    DEPTH_STENCIL: number;
-    DEPTH_STENCIL_ATTACHMENT: number;
-    DEPTH_TEST: number;
-    DEPTH_WRITEMASK: number;
-    DITHER: number;
-    DONT_CARE: number;
-    DST_ALPHA: number;
-    DST_COLOR: number;
-    DYNAMIC_DRAW: number;
-    ELEMENT_ARRAY_BUFFER: number;
-    ELEMENT_ARRAY_BUFFER_BINDING: number;
-    EQUAL: number;
-    FASTEST: number;
-    FLOAT: number;
-    FLOAT_MAT2: number;
-    FLOAT_MAT3: number;
-    FLOAT_MAT4: number;
-    FLOAT_VEC2: number;
-    FLOAT_VEC3: number;
-    FLOAT_VEC4: number;
-    FRAGMENT_SHADER: number;
-    FRAMEBUFFER: number;
-    FRAMEBUFFER_ATTACHMENT_OBJECT_NAME: number;
-    FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE: number;
-    FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE: number;
-    FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL: number;
-    FRAMEBUFFER_BINDING: number;
-    FRAMEBUFFER_COMPLETE: number;
-    FRAMEBUFFER_INCOMPLETE_ATTACHMENT: number;
-    FRAMEBUFFER_INCOMPLETE_DIMENSIONS: number;
-    FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: number;
-    FRAMEBUFFER_UNSUPPORTED: number;
-    FRONT: number;
-    FRONT_AND_BACK: number;
-    FRONT_FACE: number;
-    FUNC_ADD: number;
-    FUNC_REVERSE_SUBTRACT: number;
-    FUNC_SUBTRACT: number;
-    GENERATE_MIPMAP_HINT: number;
-    GEQUAL: number;
-    GREATER: number;
-    GREEN_BITS: number;
-    HIGH_FLOAT: number;
-    HIGH_INT: number;
-    IMPLEMENTATION_COLOR_READ_FORMAT: number;
-    IMPLEMENTATION_COLOR_READ_TYPE: number;
-    INCR: number;
-    INCR_WRAP: number;
-    INT: number;
-    INT_VEC2: number;
-    INT_VEC3: number;
-    INT_VEC4: number;
-    INVALID_ENUM: number;
-    INVALID_FRAMEBUFFER_OPERATION: number;
-    INVALID_OPERATION: number;
-    INVALID_VALUE: number;
-    INVERT: number;
-    KEEP: number;
-    LEQUAL: number;
-    LESS: number;
-    LINEAR: number;
-    LINEAR_MIPMAP_LINEAR: number;
-    LINEAR_MIPMAP_NEAREST: number;
-    LINES: number;
-    LINE_LOOP: number;
-    LINE_STRIP: number;
-    LINE_WIDTH: number;
-    LINK_STATUS: number;
-    LOW_FLOAT: number;
-    LOW_INT: number;
-    LUMINANCE: number;
-    LUMINANCE_ALPHA: number;
-    MAX_COMBINED_TEXTURE_IMAGE_UNITS: number;
-    MAX_CUBE_MAP_TEXTURE_SIZE: number;
-    MAX_FRAGMENT_UNIFORM_VECTORS: number;
-    MAX_RENDERBUFFER_SIZE: number;
-    MAX_TEXTURE_IMAGE_UNITS: number;
-    MAX_TEXTURE_SIZE: number;
-    MAX_VARYING_VECTORS: number;
-    MAX_VERTEX_ATTRIBS: number;
-    MAX_VERTEX_TEXTURE_IMAGE_UNITS: number;
-    MAX_VERTEX_UNIFORM_VECTORS: number;
-    MAX_VIEWPORT_DIMS: number;
-    MEDIUM_FLOAT: number;
-    MEDIUM_INT: number;
-    MIRRORED_REPEAT: number;
-    NEAREST: number;
-    NEAREST_MIPMAP_LINEAR: number;
-    NEAREST_MIPMAP_NEAREST: number;
-    NEVER: number;
-    NICEST: number;
-    NONE: number;
-    NOTEQUAL: number;
-    NO_ERROR: number;
-    ONE: number;
-    ONE_MINUS_CONSTANT_ALPHA: number;
-    ONE_MINUS_CONSTANT_COLOR: number;
-    ONE_MINUS_DST_ALPHA: number;
-    ONE_MINUS_DST_COLOR: number;
-    ONE_MINUS_SRC_ALPHA: number;
-    ONE_MINUS_SRC_COLOR: number;
-    OUT_OF_MEMORY: number;
-    PACK_ALIGNMENT: number;
-    POINTS: number;
-    POLYGON_OFFSET_FACTOR: number;
-    POLYGON_OFFSET_FILL: number;
-    POLYGON_OFFSET_UNITS: number;
-    RED_BITS: number;
-    RENDERBUFFER: number;
-    RENDERBUFFER_ALPHA_SIZE: number;
-    RENDERBUFFER_BINDING: number;
-    RENDERBUFFER_BLUE_SIZE: number;
-    RENDERBUFFER_DEPTH_SIZE: number;
-    RENDERBUFFER_GREEN_SIZE: number;
-    RENDERBUFFER_HEIGHT: number;
-    RENDERBUFFER_INTERNAL_FORMAT: number;
-    RENDERBUFFER_RED_SIZE: number;
-    RENDERBUFFER_STENCIL_SIZE: number;
-    RENDERBUFFER_WIDTH: number;
-    RENDERER: number;
-    REPEAT: number;
-    REPLACE: number;
-    RGB: number;
-    RGB565: number;
-    RGB5_A1: number;
-    RGBA: number;
-    RGBA4: number;
-    SAMPLER_2D: number;
-    SAMPLER_CUBE: number;
-    SAMPLES: number;
-    SAMPLE_ALPHA_TO_COVERAGE: number;
-    SAMPLE_BUFFERS: number;
-    SAMPLE_COVERAGE: number;
-    SAMPLE_COVERAGE_INVERT: number;
-    SAMPLE_COVERAGE_VALUE: number;
-    SCISSOR_BOX: number;
-    SCISSOR_TEST: number;
-    SHADER_TYPE: number;
-    SHADING_LANGUAGE_VERSION: number;
-    SHORT: number;
-    SRC_ALPHA: number;
-    SRC_ALPHA_SATURATE: number;
-    SRC_COLOR: number;
-    STATIC_DRAW: number;
-    STENCIL_ATTACHMENT: number;
-    STENCIL_BACK_FAIL: number;
-    STENCIL_BACK_FUNC: number;
-    STENCIL_BACK_PASS_DEPTH_FAIL: number;
-    STENCIL_BACK_PASS_DEPTH_PASS: number;
-    STENCIL_BACK_REF: number;
-    STENCIL_BACK_VALUE_MASK: number;
-    STENCIL_BACK_WRITEMASK: number;
-    STENCIL_BITS: number;
-    STENCIL_BUFFER_BIT: number;
-    STENCIL_CLEAR_VALUE: number;
-    STENCIL_FAIL: number;
-    STENCIL_FUNC: number;
-    STENCIL_INDEX: number;
-    STENCIL_INDEX8: number;
-    STENCIL_PASS_DEPTH_FAIL: number;
-    STENCIL_PASS_DEPTH_PASS: number;
-    STENCIL_REF: number;
-    STENCIL_TEST: number;
-    STENCIL_VALUE_MASK: number;
-    STENCIL_WRITEMASK: number;
-    STREAM_DRAW: number;
-    SUBPIXEL_BITS: number;
-    TEXTURE: number;
-    TEXTURE0: number;
-    TEXTURE1: number;
-    TEXTURE10: number;
-    TEXTURE11: number;
-    TEXTURE12: number;
-    TEXTURE13: number;
-    TEXTURE14: number;
-    TEXTURE15: number;
-    TEXTURE16: number;
-    TEXTURE17: number;
-    TEXTURE18: number;
-    TEXTURE19: number;
-    TEXTURE2: number;
-    TEXTURE20: number;
-    TEXTURE21: number;
-    TEXTURE22: number;
-    TEXTURE23: number;
-    TEXTURE24: number;
-    TEXTURE25: number;
-    TEXTURE26: number;
-    TEXTURE27: number;
-    TEXTURE28: number;
-    TEXTURE29: number;
-    TEXTURE3: number;
-    TEXTURE30: number;
-    TEXTURE31: number;
-    TEXTURE4: number;
-    TEXTURE5: number;
-    TEXTURE6: number;
-    TEXTURE7: number;
-    TEXTURE8: number;
-    TEXTURE9: number;
-    TEXTURE_2D: number;
-    TEXTURE_BINDING_2D: number;
-    TEXTURE_BINDING_CUBE_MAP: number;
-    TEXTURE_CUBE_MAP: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_X: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_Y: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_Z: number;
-    TEXTURE_CUBE_MAP_POSITIVE_X: number;
-    TEXTURE_CUBE_MAP_POSITIVE_Y: number;
-    TEXTURE_CUBE_MAP_POSITIVE_Z: number;
-    TEXTURE_MAG_FILTER: number;
-    TEXTURE_MIN_FILTER: number;
-    TEXTURE_WRAP_S: number;
-    TEXTURE_WRAP_T: number;
-    TRIANGLES: number;
-    TRIANGLE_FAN: number;
-    TRIANGLE_STRIP: number;
-    UNPACK_ALIGNMENT: number;
-    UNPACK_COLORSPACE_CONVERSION_WEBGL: number;
-    UNPACK_FLIP_Y_WEBGL: number;
-    UNPACK_PREMULTIPLY_ALPHA_WEBGL: number;
-    UNSIGNED_BYTE: number;
-    UNSIGNED_INT: number;
-    UNSIGNED_SHORT: number;
-    UNSIGNED_SHORT_4_4_4_4: number;
-    UNSIGNED_SHORT_5_5_5_1: number;
-    UNSIGNED_SHORT_5_6_5: number;
-    VALIDATE_STATUS: number;
-    VENDOR: number;
-    VERSION: number;
-    VERTEX_ATTRIB_ARRAY_BUFFER_BINDING: number;
-    VERTEX_ATTRIB_ARRAY_ENABLED: number;
-    VERTEX_ATTRIB_ARRAY_NORMALIZED: number;
-    VERTEX_ATTRIB_ARRAY_POINTER: number;
-    VERTEX_ATTRIB_ARRAY_SIZE: number;
-    VERTEX_ATTRIB_ARRAY_STRIDE: number;
-    VERTEX_ATTRIB_ARRAY_TYPE: number;
-    VERTEX_SHADER: number;
-    VIEWPORT: number;
-    ZERO: number;
+    readonly ACTIVE_ATTRIBUTES: number;
+    readonly ACTIVE_TEXTURE: number;
+    readonly ACTIVE_UNIFORMS: number;
+    readonly ALIASED_LINE_WIDTH_RANGE: number;
+    readonly ALIASED_POINT_SIZE_RANGE: number;
+    readonly ALPHA: number;
+    readonly ALPHA_BITS: number;
+    readonly ALWAYS: number;
+    readonly ARRAY_BUFFER: number;
+    readonly ARRAY_BUFFER_BINDING: number;
+    readonly ATTACHED_SHADERS: number;
+    readonly BACK: number;
+    readonly BLEND: number;
+    readonly BLEND_COLOR: number;
+    readonly BLEND_DST_ALPHA: number;
+    readonly BLEND_DST_RGB: number;
+    readonly BLEND_EQUATION: number;
+    readonly BLEND_EQUATION_ALPHA: number;
+    readonly BLEND_EQUATION_RGB: number;
+    readonly BLEND_SRC_ALPHA: number;
+    readonly BLEND_SRC_RGB: number;
+    readonly BLUE_BITS: number;
+    readonly BOOL: number;
+    readonly BOOL_VEC2: number;
+    readonly BOOL_VEC3: number;
+    readonly BOOL_VEC4: number;
+    readonly BROWSER_DEFAULT_WEBGL: number;
+    readonly BUFFER_SIZE: number;
+    readonly BUFFER_USAGE: number;
+    readonly BYTE: number;
+    readonly CCW: number;
+    readonly CLAMP_TO_EDGE: number;
+    readonly COLOR_ATTACHMENT0: number;
+    readonly COLOR_BUFFER_BIT: number;
+    readonly COLOR_CLEAR_VALUE: number;
+    readonly COLOR_WRITEMASK: number;
+    readonly COMPILE_STATUS: number;
+    readonly COMPRESSED_TEXTURE_FORMATS: number;
+    readonly CONSTANT_ALPHA: number;
+    readonly CONSTANT_COLOR: number;
+    readonly CONTEXT_LOST_WEBGL: number;
+    readonly CULL_FACE: number;
+    readonly CULL_FACE_MODE: number;
+    readonly CURRENT_PROGRAM: number;
+    readonly CURRENT_VERTEX_ATTRIB: number;
+    readonly CW: number;
+    readonly DECR: number;
+    readonly DECR_WRAP: number;
+    readonly DELETE_STATUS: number;
+    readonly DEPTH_ATTACHMENT: number;
+    readonly DEPTH_BITS: number;
+    readonly DEPTH_BUFFER_BIT: number;
+    readonly DEPTH_CLEAR_VALUE: number;
+    readonly DEPTH_COMPONENT: number;
+    readonly DEPTH_COMPONENT16: number;
+    readonly DEPTH_FUNC: number;
+    readonly DEPTH_RANGE: number;
+    readonly DEPTH_STENCIL: number;
+    readonly DEPTH_STENCIL_ATTACHMENT: number;
+    readonly DEPTH_TEST: number;
+    readonly DEPTH_WRITEMASK: number;
+    readonly DITHER: number;
+    readonly DONT_CARE: number;
+    readonly DST_ALPHA: number;
+    readonly DST_COLOR: number;
+    readonly DYNAMIC_DRAW: number;
+    readonly ELEMENT_ARRAY_BUFFER: number;
+    readonly ELEMENT_ARRAY_BUFFER_BINDING: number;
+    readonly EQUAL: number;
+    readonly FASTEST: number;
+    readonly FLOAT: number;
+    readonly FLOAT_MAT2: number;
+    readonly FLOAT_MAT3: number;
+    readonly FLOAT_MAT4: number;
+    readonly FLOAT_VEC2: number;
+    readonly FLOAT_VEC3: number;
+    readonly FLOAT_VEC4: number;
+    readonly FRAGMENT_SHADER: number;
+    readonly FRAMEBUFFER: number;
+    readonly FRAMEBUFFER_ATTACHMENT_OBJECT_NAME: number;
+    readonly FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE: number;
+    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE: number;
+    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL: number;
+    readonly FRAMEBUFFER_BINDING: number;
+    readonly FRAMEBUFFER_COMPLETE: number;
+    readonly FRAMEBUFFER_INCOMPLETE_ATTACHMENT: number;
+    readonly FRAMEBUFFER_INCOMPLETE_DIMENSIONS: number;
+    readonly FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: number;
+    readonly FRAMEBUFFER_UNSUPPORTED: number;
+    readonly FRONT: number;
+    readonly FRONT_AND_BACK: number;
+    readonly FRONT_FACE: number;
+    readonly FUNC_ADD: number;
+    readonly FUNC_REVERSE_SUBTRACT: number;
+    readonly FUNC_SUBTRACT: number;
+    readonly GENERATE_MIPMAP_HINT: number;
+    readonly GEQUAL: number;
+    readonly GREATER: number;
+    readonly GREEN_BITS: number;
+    readonly HIGH_FLOAT: number;
+    readonly HIGH_INT: number;
+    readonly IMPLEMENTATION_COLOR_READ_FORMAT: number;
+    readonly IMPLEMENTATION_COLOR_READ_TYPE: number;
+    readonly INCR: number;
+    readonly INCR_WRAP: number;
+    readonly INT: number;
+    readonly INT_VEC2: number;
+    readonly INT_VEC3: number;
+    readonly INT_VEC4: number;
+    readonly INVALID_ENUM: number;
+    readonly INVALID_FRAMEBUFFER_OPERATION: number;
+    readonly INVALID_OPERATION: number;
+    readonly INVALID_VALUE: number;
+    readonly INVERT: number;
+    readonly KEEP: number;
+    readonly LEQUAL: number;
+    readonly LESS: number;
+    readonly LINEAR: number;
+    readonly LINEAR_MIPMAP_LINEAR: number;
+    readonly LINEAR_MIPMAP_NEAREST: number;
+    readonly LINES: number;
+    readonly LINE_LOOP: number;
+    readonly LINE_STRIP: number;
+    readonly LINE_WIDTH: number;
+    readonly LINK_STATUS: number;
+    readonly LOW_FLOAT: number;
+    readonly LOW_INT: number;
+    readonly LUMINANCE: number;
+    readonly LUMINANCE_ALPHA: number;
+    readonly MAX_COMBINED_TEXTURE_IMAGE_UNITS: number;
+    readonly MAX_CUBE_MAP_TEXTURE_SIZE: number;
+    readonly MAX_FRAGMENT_UNIFORM_VECTORS: number;
+    readonly MAX_RENDERBUFFER_SIZE: number;
+    readonly MAX_TEXTURE_IMAGE_UNITS: number;
+    readonly MAX_TEXTURE_SIZE: number;
+    readonly MAX_VARYING_VECTORS: number;
+    readonly MAX_VERTEX_ATTRIBS: number;
+    readonly MAX_VERTEX_TEXTURE_IMAGE_UNITS: number;
+    readonly MAX_VERTEX_UNIFORM_VECTORS: number;
+    readonly MAX_VIEWPORT_DIMS: number;
+    readonly MEDIUM_FLOAT: number;
+    readonly MEDIUM_INT: number;
+    readonly MIRRORED_REPEAT: number;
+    readonly NEAREST: number;
+    readonly NEAREST_MIPMAP_LINEAR: number;
+    readonly NEAREST_MIPMAP_NEAREST: number;
+    readonly NEVER: number;
+    readonly NICEST: number;
+    readonly NONE: number;
+    readonly NOTEQUAL: number;
+    readonly NO_ERROR: number;
+    readonly ONE: number;
+    readonly ONE_MINUS_CONSTANT_ALPHA: number;
+    readonly ONE_MINUS_CONSTANT_COLOR: number;
+    readonly ONE_MINUS_DST_ALPHA: number;
+    readonly ONE_MINUS_DST_COLOR: number;
+    readonly ONE_MINUS_SRC_ALPHA: number;
+    readonly ONE_MINUS_SRC_COLOR: number;
+    readonly OUT_OF_MEMORY: number;
+    readonly PACK_ALIGNMENT: number;
+    readonly POINTS: number;
+    readonly POLYGON_OFFSET_FACTOR: number;
+    readonly POLYGON_OFFSET_FILL: number;
+    readonly POLYGON_OFFSET_UNITS: number;
+    readonly RED_BITS: number;
+    readonly RENDERBUFFER: number;
+    readonly RENDERBUFFER_ALPHA_SIZE: number;
+    readonly RENDERBUFFER_BINDING: number;
+    readonly RENDERBUFFER_BLUE_SIZE: number;
+    readonly RENDERBUFFER_DEPTH_SIZE: number;
+    readonly RENDERBUFFER_GREEN_SIZE: number;
+    readonly RENDERBUFFER_HEIGHT: number;
+    readonly RENDERBUFFER_INTERNAL_FORMAT: number;
+    readonly RENDERBUFFER_RED_SIZE: number;
+    readonly RENDERBUFFER_STENCIL_SIZE: number;
+    readonly RENDERBUFFER_WIDTH: number;
+    readonly RENDERER: number;
+    readonly REPEAT: number;
+    readonly REPLACE: number;
+    readonly RGB: number;
+    readonly RGB565: number;
+    readonly RGB5_A1: number;
+    readonly RGBA: number;
+    readonly RGBA4: number;
+    readonly SAMPLER_2D: number;
+    readonly SAMPLER_CUBE: number;
+    readonly SAMPLES: number;
+    readonly SAMPLE_ALPHA_TO_COVERAGE: number;
+    readonly SAMPLE_BUFFERS: number;
+    readonly SAMPLE_COVERAGE: number;
+    readonly SAMPLE_COVERAGE_INVERT: number;
+    readonly SAMPLE_COVERAGE_VALUE: number;
+    readonly SCISSOR_BOX: number;
+    readonly SCISSOR_TEST: number;
+    readonly SHADER_TYPE: number;
+    readonly SHADING_LANGUAGE_VERSION: number;
+    readonly SHORT: number;
+    readonly SRC_ALPHA: number;
+    readonly SRC_ALPHA_SATURATE: number;
+    readonly SRC_COLOR: number;
+    readonly STATIC_DRAW: number;
+    readonly STENCIL_ATTACHMENT: number;
+    readonly STENCIL_BACK_FAIL: number;
+    readonly STENCIL_BACK_FUNC: number;
+    readonly STENCIL_BACK_PASS_DEPTH_FAIL: number;
+    readonly STENCIL_BACK_PASS_DEPTH_PASS: number;
+    readonly STENCIL_BACK_REF: number;
+    readonly STENCIL_BACK_VALUE_MASK: number;
+    readonly STENCIL_BACK_WRITEMASK: number;
+    readonly STENCIL_BITS: number;
+    readonly STENCIL_BUFFER_BIT: number;
+    readonly STENCIL_CLEAR_VALUE: number;
+    readonly STENCIL_FAIL: number;
+    readonly STENCIL_FUNC: number;
+    readonly STENCIL_INDEX: number;
+    readonly STENCIL_INDEX8: number;
+    readonly STENCIL_PASS_DEPTH_FAIL: number;
+    readonly STENCIL_PASS_DEPTH_PASS: number;
+    readonly STENCIL_REF: number;
+    readonly STENCIL_TEST: number;
+    readonly STENCIL_VALUE_MASK: number;
+    readonly STENCIL_WRITEMASK: number;
+    readonly STREAM_DRAW: number;
+    readonly SUBPIXEL_BITS: number;
+    readonly TEXTURE: number;
+    readonly TEXTURE0: number;
+    readonly TEXTURE1: number;
+    readonly TEXTURE10: number;
+    readonly TEXTURE11: number;
+    readonly TEXTURE12: number;
+    readonly TEXTURE13: number;
+    readonly TEXTURE14: number;
+    readonly TEXTURE15: number;
+    readonly TEXTURE16: number;
+    readonly TEXTURE17: number;
+    readonly TEXTURE18: number;
+    readonly TEXTURE19: number;
+    readonly TEXTURE2: number;
+    readonly TEXTURE20: number;
+    readonly TEXTURE21: number;
+    readonly TEXTURE22: number;
+    readonly TEXTURE23: number;
+    readonly TEXTURE24: number;
+    readonly TEXTURE25: number;
+    readonly TEXTURE26: number;
+    readonly TEXTURE27: number;
+    readonly TEXTURE28: number;
+    readonly TEXTURE29: number;
+    readonly TEXTURE3: number;
+    readonly TEXTURE30: number;
+    readonly TEXTURE31: number;
+    readonly TEXTURE4: number;
+    readonly TEXTURE5: number;
+    readonly TEXTURE6: number;
+    readonly TEXTURE7: number;
+    readonly TEXTURE8: number;
+    readonly TEXTURE9: number;
+    readonly TEXTURE_2D: number;
+    readonly TEXTURE_BINDING_2D: number;
+    readonly TEXTURE_BINDING_CUBE_MAP: number;
+    readonly TEXTURE_CUBE_MAP: number;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_X: number;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_Y: number;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_Z: number;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_X: number;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_Y: number;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_Z: number;
+    readonly TEXTURE_MAG_FILTER: number;
+    readonly TEXTURE_MIN_FILTER: number;
+    readonly TEXTURE_WRAP_S: number;
+    readonly TEXTURE_WRAP_T: number;
+    readonly TRIANGLES: number;
+    readonly TRIANGLE_FAN: number;
+    readonly TRIANGLE_STRIP: number;
+    readonly UNPACK_ALIGNMENT: number;
+    readonly UNPACK_COLORSPACE_CONVERSION_WEBGL: number;
+    readonly UNPACK_FLIP_Y_WEBGL: number;
+    readonly UNPACK_PREMULTIPLY_ALPHA_WEBGL: number;
+    readonly UNSIGNED_BYTE: number;
+    readonly UNSIGNED_INT: number;
+    readonly UNSIGNED_SHORT: number;
+    readonly UNSIGNED_SHORT_4_4_4_4: number;
+    readonly UNSIGNED_SHORT_5_5_5_1: number;
+    readonly UNSIGNED_SHORT_5_6_5: number;
+    readonly VALIDATE_STATUS: number;
+    readonly VENDOR: number;
+    readonly VERSION: number;
+    readonly VERTEX_ATTRIB_ARRAY_BUFFER_BINDING: number;
+    readonly VERTEX_ATTRIB_ARRAY_ENABLED: number;
+    readonly VERTEX_ATTRIB_ARRAY_NORMALIZED: number;
+    readonly VERTEX_ATTRIB_ARRAY_POINTER: number;
+    readonly VERTEX_ATTRIB_ARRAY_SIZE: number;
+    readonly VERTEX_ATTRIB_ARRAY_STRIDE: number;
+    readonly VERTEX_ATTRIB_ARRAY_TYPE: number;
+    readonly VERTEX_SHADER: number;
+    readonly VIEWPORT: number;
+    readonly ZERO: number;
 }
 
 interface WebGLShader extends WebGLObject {
@@ -15735,9 +16819,9 @@ declare var WebGLShader: {
 }
 
 interface WebGLShaderPrecisionFormat {
-    precision: number;
-    rangeMax: number;
-    rangeMin: number;
+    readonly precision: number;
+    readonly rangeMax: number;
+    readonly rangeMin: number;
 }
 
 declare var WebGLShaderPrecisionFormat: {
@@ -15813,21 +16897,21 @@ declare var WebKitPoint: {
 
 interface WebSocket extends EventTarget {
     binaryType: string;
-    bufferedAmount: number;
-    extensions: string;
+    readonly bufferedAmount: number;
+    readonly extensions: string;
     onclose: (ev: CloseEvent) => any;
     onerror: (ev: Event) => any;
     onmessage: (ev: MessageEvent) => any;
     onopen: (ev: Event) => any;
-    protocol: string;
-    readyState: number;
-    url: string;
+    readonly protocol: string;
+    readonly readyState: number;
+    readonly url: string;
     close(code?: number, reason?: string): void;
     send(data: any): void;
-    CLOSED: number;
-    CLOSING: number;
-    CONNECTING: number;
-    OPEN: number;
+    readonly CLOSED: number;
+    readonly CLOSING: number;
+    readonly CONNECTING: number;
+    readonly OPEN: number;
     addEventListener(type: "close", listener: (ev: CloseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "message", listener: (ev: MessageEvent) => any, useCapture?: boolean): void;
@@ -15838,56 +16922,58 @@ interface WebSocket extends EventTarget {
 declare var WebSocket: {
     prototype: WebSocket;
     new(url: string, protocols?: string | string[]): WebSocket;
-    CLOSED: number;
-    CLOSING: number;
-    CONNECTING: number;
-    OPEN: number;
+    readonly CLOSED: number;
+    readonly CLOSING: number;
+    readonly CONNECTING: number;
+    readonly OPEN: number;
 }
 
 interface WheelEvent extends MouseEvent {
-    deltaMode: number;
-    deltaX: number;
-    deltaY: number;
-    deltaZ: number;
+    readonly deltaMode: number;
+    readonly deltaX: number;
+    readonly deltaY: number;
+    readonly deltaZ: number;
+    readonly wheelDelta: number;
+    readonly wheelDeltaX: number;
+    readonly wheelDeltaY: number;
     getCurrentPoint(element: Element): void;
     initWheelEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, buttonArg: number, relatedTargetArg: EventTarget, modifiersListArg: string, deltaXArg: number, deltaYArg: number, deltaZArg: number, deltaMode: number): void;
-    DOM_DELTA_LINE: number;
-    DOM_DELTA_PAGE: number;
-    DOM_DELTA_PIXEL: number;
+    readonly DOM_DELTA_LINE: number;
+    readonly DOM_DELTA_PAGE: number;
+    readonly DOM_DELTA_PIXEL: number;
 }
 
 declare var WheelEvent: {
     prototype: WheelEvent;
     new(typeArg: string, eventInitDict?: WheelEventInit): WheelEvent;
-    DOM_DELTA_LINE: number;
-    DOM_DELTA_PAGE: number;
-    DOM_DELTA_PIXEL: number;
+    readonly DOM_DELTA_LINE: number;
+    readonly DOM_DELTA_PAGE: number;
+    readonly DOM_DELTA_PIXEL: number;
 }
 
 interface Window extends EventTarget, WindowTimers, WindowSessionStorage, WindowLocalStorage, WindowConsole, GlobalEventHandlers, IDBEnvironment, WindowBase64 {
-    animationStartTime: number;
-    applicationCache: ApplicationCache;
-    clientInformation: Navigator;
-    closed: boolean;
-    crypto: Crypto;
+    readonly applicationCache: ApplicationCache;
+    readonly clientInformation: Navigator;
+    readonly closed: boolean;
+    readonly crypto: Crypto;
     defaultStatus: string;
-    devicePixelRatio: number;
-    doNotTrack: string;
-    document: Document;
+    readonly devicePixelRatio: number;
+    readonly doNotTrack: string;
+    readonly document: Document;
     event: Event;
-    external: External;
-    frameElement: Element;
-    frames: Window;
-    history: History;
-    innerHeight: number;
-    innerWidth: number;
-    length: number;
-    location: Location;
-    locationbar: BarProp;
-    menubar: BarProp;
-    msAnimationStartTime: number;
+    readonly external: External;
+    readonly frameElement: Element;
+    readonly frames: Window;
+    readonly history: History;
+    readonly innerHeight: number;
+    readonly innerWidth: number;
+    readonly length: number;
+    readonly location: Location;
+    readonly locationbar: BarProp;
+    readonly menubar: BarProp;
+    readonly msCredentials: MSCredentials;
     name: string;
-    navigator: Navigator;
+    readonly navigator: Navigator;
     offscreenBuffering: string | boolean;
     onabort: (ev: Event) => any;
     onafterprint: (ev: Event) => any;
@@ -15901,6 +16987,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     oncompassneedscalibration: (ev: Event) => any;
     oncontextmenu: (ev: PointerEvent) => any;
     ondblclick: (ev: MouseEvent) => any;
+    ondevicelight: (ev: DeviceLightEvent) => any;
     ondevicemotion: (ev: DeviceMotionEvent) => any;
     ondeviceorientation: (ev: DeviceOrientationEvent) => any;
     ondrag: (ev: DragEvent) => any;
@@ -15912,11 +16999,12 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     ondrop: (ev: DragEvent) => any;
     ondurationchange: (ev: Event) => any;
     onemptied: (ev: Event) => any;
-    onended: (ev: Event) => any;
+    onended: (ev: MediaStreamErrorEvent) => any;
     onerror: ErrorEventHandler;
     onfocus: (ev: FocusEvent) => any;
     onhashchange: (ev: HashChangeEvent) => any;
     oninput: (ev: Event) => any;
+    oninvalid: (ev: Event) => any;
     onkeydown: (ev: KeyboardEvent) => any;
     onkeypress: (ev: KeyboardEvent) => any;
     onkeyup: (ev: KeyboardEvent) => any;
@@ -15932,7 +17020,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     onmouseout: (ev: MouseEvent) => any;
     onmouseover: (ev: MouseEvent) => any;
     onmouseup: (ev: MouseEvent) => any;
-    onmousewheel: (ev: MouseWheelEvent) => any;
+    onmousewheel: (ev: WheelEvent) => any;
     onmsgesturechange: (ev: MSGestureEvent) => any;
     onmsgesturedoubletap: (ev: MSGestureEvent) => any;
     onmsgestureend: (ev: MSGestureEvent) => any;
@@ -15971,38 +17059,38 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     onsubmit: (ev: Event) => any;
     onsuspend: (ev: Event) => any;
     ontimeupdate: (ev: Event) => any;
-    ontouchcancel: any;
-    ontouchend: any;
-    ontouchmove: any;
-    ontouchstart: any;
+    ontouchcancel: (ev: TouchEvent) => any;
+    ontouchend: (ev: TouchEvent) => any;
+    ontouchmove: (ev: TouchEvent) => any;
+    ontouchstart: (ev: TouchEvent) => any;
     onunload: (ev: Event) => any;
     onvolumechange: (ev: Event) => any;
     onwaiting: (ev: Event) => any;
-    opener: Window;
+    readonly opener: Window;
     orientation: string | number;
-    outerHeight: number;
-    outerWidth: number;
-    pageXOffset: number;
-    pageYOffset: number;
-    parent: Window;
-    performance: Performance;
-    personalbar: BarProp;
-    screen: Screen;
-    screenLeft: number;
-    screenTop: number;
-    screenX: number;
-    screenY: number;
-    scrollX: number;
-    scrollY: number;
-    scrollbars: BarProp;
-    self: Window;
+    readonly outerHeight: number;
+    readonly outerWidth: number;
+    readonly pageXOffset: number;
+    readonly pageYOffset: number;
+    readonly parent: Window;
+    readonly performance: Performance;
+    readonly personalbar: BarProp;
+    readonly screen: Screen;
+    readonly screenLeft: number;
+    readonly screenTop: number;
+    readonly screenX: number;
+    readonly screenY: number;
+    readonly scrollX: number;
+    readonly scrollY: number;
+    readonly scrollbars: BarProp;
+    readonly self: Window;
     status: string;
-    statusbar: BarProp;
-    styleMedia: StyleMedia;
-    toolbar: BarProp;
-    top: Window;
-    window: Window;
-    URL: URL;
+    readonly statusbar: BarProp;
+    readonly styleMedia: StyleMedia;
+    readonly toolbar: BarProp;
+    readonly top: Window;
+    readonly window: Window;
+    URL: typeof URL;
     alert(message?: any): void;
     blur(): void;
     cancelAnimationFrame(handle: number): void;
@@ -16016,12 +17104,9 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     matchMedia(mediaQuery: string): MediaQueryList;
     moveBy(x?: number, y?: number): void;
     moveTo(x?: number, y?: number): void;
-    msCancelRequestAnimationFrame(handle: number): void;
-    msMatchMedia(mediaQuery: string): MediaQueryList;
-    msRequestAnimationFrame(callback: FrameRequestCallback): number;
     msWriteProfilerMark(profilerMarkName: string): void;
     open(url?: string, target?: string, features?: string, replace?: boolean): Window;
-    postMessage(message: any, targetOrigin: string, ports?: any): void;
+    postMessage(message: any, targetOrigin: string, transfer?: any[]): void;
     print(): void;
     prompt(message?: string, _default?: string): string;
     releaseEvents(): void;
@@ -16031,8 +17116,10 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     scroll(x?: number, y?: number): void;
     scrollBy(x?: number, y?: number): void;
     scrollTo(x?: number, y?: number): void;
+    webkitCancelAnimationFrame(handle: number): void;
     webkitConvertPointFromNodeToPage(node: Node, pt: WebKitPoint): WebKitPoint;
     webkitConvertPointFromPageToNode(node: Node, pt: WebKitPoint): WebKitPoint;
+    webkitRequestAnimationFrame(callback: FrameRequestCallback): number;
     addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -16060,6 +17147,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     addEventListener(type: "compassneedscalibration", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "devicelight", listener: (ev: DeviceLightEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "devicemotion", listener: (ev: DeviceMotionEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deviceorientation", listener: (ev: DeviceOrientationEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -16071,10 +17159,11 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "hashchange", listener: (ev: HashChangeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -16090,7 +17179,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "offline", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "online", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "orientationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -16160,16 +17249,15 @@ declare var XMLDocument: {
 interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
     msCaching: string;
     onreadystatechange: (ev: ProgressEvent) => any;
-    readyState: number;
-    response: any;
-    responseBody: any;
-    responseText: string;
+    readonly readyState: number;
+    readonly response: any;
+    readonly responseText: string;
     responseType: string;
-    responseXML: any;
-    status: number;
-    statusText: string;
+    readonly responseXML: any;
+    readonly status: number;
+    readonly statusText: string;
     timeout: number;
-    upload: XMLHttpRequestUpload;
+    readonly upload: XMLHttpRequestUpload;
     withCredentials: boolean;
     abort(): void;
     getAllResponseHeaders(): string;
@@ -16181,11 +17269,11 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
     send(data?: string): void;
     send(data?: any): void;
     setRequestHeader(header: string, value: string): void;
-    DONE: number;
-    HEADERS_RECEIVED: number;
-    LOADING: number;
-    OPENED: number;
-    UNSENT: number;
+    readonly DONE: number;
+    readonly HEADERS_RECEIVED: number;
+    readonly LOADING: number;
+    readonly OPENED: number;
+    readonly UNSENT: number;
     addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -16200,11 +17288,11 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
 declare var XMLHttpRequest: {
     prototype: XMLHttpRequest;
     new(): XMLHttpRequest;
-    DONE: number;
-    HEADERS_RECEIVED: number;
-    LOADING: number;
-    OPENED: number;
-    UNSENT: number;
+    readonly DONE: number;
+    readonly HEADERS_RECEIVED: number;
+    readonly LOADING: number;
+    readonly OPENED: number;
+    readonly UNSENT: number;
     create(): XMLHttpRequest;
 }
 
@@ -16256,40 +17344,40 @@ declare var XPathNSResolver: {
 }
 
 interface XPathResult {
-    booleanValue: boolean;
-    invalidIteratorState: boolean;
-    numberValue: number;
-    resultType: number;
-    singleNodeValue: Node;
-    snapshotLength: number;
-    stringValue: string;
+    readonly booleanValue: boolean;
+    readonly invalidIteratorState: boolean;
+    readonly numberValue: number;
+    readonly resultType: number;
+    readonly singleNodeValue: Node;
+    readonly snapshotLength: number;
+    readonly stringValue: string;
     iterateNext(): Node;
     snapshotItem(index: number): Node;
-    ANY_TYPE: number;
-    ANY_UNORDERED_NODE_TYPE: number;
-    BOOLEAN_TYPE: number;
-    FIRST_ORDERED_NODE_TYPE: number;
-    NUMBER_TYPE: number;
-    ORDERED_NODE_ITERATOR_TYPE: number;
-    ORDERED_NODE_SNAPSHOT_TYPE: number;
-    STRING_TYPE: number;
-    UNORDERED_NODE_ITERATOR_TYPE: number;
-    UNORDERED_NODE_SNAPSHOT_TYPE: number;
+    readonly ANY_TYPE: number;
+    readonly ANY_UNORDERED_NODE_TYPE: number;
+    readonly BOOLEAN_TYPE: number;
+    readonly FIRST_ORDERED_NODE_TYPE: number;
+    readonly NUMBER_TYPE: number;
+    readonly ORDERED_NODE_ITERATOR_TYPE: number;
+    readonly ORDERED_NODE_SNAPSHOT_TYPE: number;
+    readonly STRING_TYPE: number;
+    readonly UNORDERED_NODE_ITERATOR_TYPE: number;
+    readonly UNORDERED_NODE_SNAPSHOT_TYPE: number;
 }
 
 declare var XPathResult: {
     prototype: XPathResult;
     new(): XPathResult;
-    ANY_TYPE: number;
-    ANY_UNORDERED_NODE_TYPE: number;
-    BOOLEAN_TYPE: number;
-    FIRST_ORDERED_NODE_TYPE: number;
-    NUMBER_TYPE: number;
-    ORDERED_NODE_ITERATOR_TYPE: number;
-    ORDERED_NODE_SNAPSHOT_TYPE: number;
-    STRING_TYPE: number;
-    UNORDERED_NODE_ITERATOR_TYPE: number;
-    UNORDERED_NODE_SNAPSHOT_TYPE: number;
+    readonly ANY_TYPE: number;
+    readonly ANY_UNORDERED_NODE_TYPE: number;
+    readonly BOOLEAN_TYPE: number;
+    readonly FIRST_ORDERED_NODE_TYPE: number;
+    readonly NUMBER_TYPE: number;
+    readonly ORDERED_NODE_ITERATOR_TYPE: number;
+    readonly ORDERED_NODE_SNAPSHOT_TYPE: number;
+    readonly STRING_TYPE: number;
+    readonly UNORDERED_NODE_ITERATOR_TYPE: number;
+    readonly UNORDERED_NODE_SNAPSHOT_TYPE: number;
 }
 
 interface XSLTProcessor {
@@ -16314,6 +17402,18 @@ interface AbstractWorker {
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
+interface CanvasPathMethods {
+    arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void;
+    arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void;
+    bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void;
+    closePath(): void;
+    ellipse(x: number, y: number, radiusX: number, radiusY: number, rotation: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void;
+    lineTo(x: number, y: number): void;
+    moveTo(x: number, y: number): void;
+    quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
+    rect(x: number, y: number, w: number, h: number): void;
+}
+
 interface ChildNode {
     remove(): void;
 }
@@ -16336,6 +17436,7 @@ interface DocumentEvent {
     createEvent(eventInterface:"CommandEvent"): CommandEvent;
     createEvent(eventInterface:"CompositionEvent"): CompositionEvent;
     createEvent(eventInterface:"CustomEvent"): CustomEvent;
+    createEvent(eventInterface:"DeviceLightEvent"): DeviceLightEvent;
     createEvent(eventInterface:"DeviceMotionEvent"): DeviceMotionEvent;
     createEvent(eventInterface:"DeviceOrientationEvent"): DeviceOrientationEvent;
     createEvent(eventInterface:"DragEvent"): DragEvent;
@@ -16347,6 +17448,7 @@ interface DocumentEvent {
     createEvent(eventInterface:"HashChangeEvent"): HashChangeEvent;
     createEvent(eventInterface:"IDBVersionChangeEvent"): IDBVersionChangeEvent;
     createEvent(eventInterface:"KeyboardEvent"): KeyboardEvent;
+    createEvent(eventInterface:"ListeningStateChangedEvent"): ListeningStateChangedEvent;
     createEvent(eventInterface:"LongRunningScriptDetectedEvent"): LongRunningScriptDetectedEvent;
     createEvent(eventInterface:"MSGestureEvent"): MSGestureEvent;
     createEvent(eventInterface:"MSManipulationEvent"): MSManipulationEvent;
@@ -16354,21 +17456,31 @@ interface DocumentEvent {
     createEvent(eventInterface:"MSMediaKeyNeededEvent"): MSMediaKeyNeededEvent;
     createEvent(eventInterface:"MSPointerEvent"): MSPointerEvent;
     createEvent(eventInterface:"MSSiteModeEvent"): MSSiteModeEvent;
+    createEvent(eventInterface:"MediaEncryptedEvent"): MediaEncryptedEvent;
+    createEvent(eventInterface:"MediaKeyMessageEvent"): MediaKeyMessageEvent;
+    createEvent(eventInterface:"MediaStreamErrorEvent"): MediaStreamErrorEvent;
+    createEvent(eventInterface:"MediaStreamTrackEvent"): MediaStreamTrackEvent;
     createEvent(eventInterface:"MessageEvent"): MessageEvent;
     createEvent(eventInterface:"MouseEvent"): MouseEvent;
     createEvent(eventInterface:"MouseEvents"): MouseEvent;
-    createEvent(eventInterface:"MouseWheelEvent"): MouseWheelEvent;
     createEvent(eventInterface:"MutationEvent"): MutationEvent;
     createEvent(eventInterface:"MutationEvents"): MutationEvent;
     createEvent(eventInterface:"NavigationCompletedEvent"): NavigationCompletedEvent;
     createEvent(eventInterface:"NavigationEvent"): NavigationEvent;
     createEvent(eventInterface:"NavigationEventWithReferrer"): NavigationEventWithReferrer;
     createEvent(eventInterface:"OfflineAudioCompletionEvent"): OfflineAudioCompletionEvent;
+    createEvent(eventInterface:"OverflowEvent"): OverflowEvent;
     createEvent(eventInterface:"PageTransitionEvent"): PageTransitionEvent;
     createEvent(eventInterface:"PermissionRequestedEvent"): PermissionRequestedEvent;
     createEvent(eventInterface:"PointerEvent"): PointerEvent;
     createEvent(eventInterface:"PopStateEvent"): PopStateEvent;
     createEvent(eventInterface:"ProgressEvent"): ProgressEvent;
+    createEvent(eventInterface:"RTCDTMFToneChangeEvent"): RTCDTMFToneChangeEvent;
+    createEvent(eventInterface:"RTCDtlsTransportStateChangedEvent"): RTCDtlsTransportStateChangedEvent;
+    createEvent(eventInterface:"RTCIceCandidatePairChangedEvent"): RTCIceCandidatePairChangedEvent;
+    createEvent(eventInterface:"RTCIceGathererEvent"): RTCIceGathererEvent;
+    createEvent(eventInterface:"RTCIceTransportStateChangedEvent"): RTCIceTransportStateChangedEvent;
+    createEvent(eventInterface:"RTCSsrcConflictEvent"): RTCSsrcConflictEvent;
     createEvent(eventInterface:"SVGZoomEvent"): SVGZoomEvent;
     createEvent(eventInterface:"SVGZoomEvents"): SVGZoomEvent;
     createEvent(eventInterface:"ScriptNotifyEvent"): ScriptNotifyEvent;
@@ -16386,11 +17498,11 @@ interface DocumentEvent {
 }
 
 interface ElementTraversal {
-    childElementCount: number;
-    firstElementChild: Element;
-    lastElementChild: Element;
-    nextElementSibling: Element;
-    previousElementSibling: Element;
+    readonly childElementCount: number;
+    readonly firstElementChild: Element;
+    readonly lastElementChild: Element;
+    readonly nextElementSibling: Element;
+    readonly previousElementSibling: Element;
 }
 
 interface GetSVGDocument {
@@ -16435,12 +17547,11 @@ interface HTMLTableAlignment {
 }
 
 interface IDBEnvironment {
-    indexedDB: IDBFactory;
-    msIndexedDB: IDBFactory;
+    readonly indexedDB: IDBFactory;
 }
 
 interface LinkStyle {
-    sheet: StyleSheet;
+    readonly sheet: StyleSheet;
 }
 
 interface MSBaseReader {
@@ -16450,12 +17561,12 @@ interface MSBaseReader {
     onloadend: (ev: ProgressEvent) => any;
     onloadstart: (ev: Event) => any;
     onprogress: (ev: ProgressEvent) => any;
-    readyState: number;
-    result: any;
+    readonly readyState: number;
+    readonly result: any;
     abort(): void;
-    DONE: number;
-    EMPTY: number;
-    LOADING: number;
+    readonly DONE: number;
+    readonly EMPTY: number;
+    readonly LOADING: number;
     addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -16483,27 +17594,32 @@ interface NavigatorContentUtils {
 }
 
 interface NavigatorGeolocation {
-    geolocation: Geolocation;
+    readonly geolocation: Geolocation;
 }
 
 interface NavigatorID {
-    appName: string;
-    appVersion: string;
-    platform: string;
-    product: string;
-    productSub: string;
-    userAgent: string;
-    vendor: string;
-    vendorSub: string;
+    readonly appName: string;
+    readonly appVersion: string;
+    readonly platform: string;
+    readonly product: string;
+    readonly productSub: string;
+    readonly userAgent: string;
+    readonly vendor: string;
+    readonly vendorSub: string;
 }
 
 interface NavigatorOnLine {
-    onLine: boolean;
+    readonly onLine: boolean;
 }
 
 interface NavigatorStorageUtils {
 }
 
+interface NavigatorUserMedia {
+    readonly mediaDevices: MediaDevices;
+    getUserMedia(constraints: MediaStreamConstraints, successCallback: NavigatorUserMediaSuccessCallback, errorCallback: NavigatorUserMediaErrorCallback): void;
+}
+
 interface NodeSelector {
     querySelector(selectors: string): Element;
     querySelectorAll(selectors: string): NodeListOf<Element>;
@@ -16514,29 +17630,29 @@ interface RandomSource {
 }
 
 interface SVGAnimatedPathData {
-    pathSegList: SVGPathSegList;
+    readonly pathSegList: SVGPathSegList;
 }
 
 interface SVGAnimatedPoints {
-    animatedPoints: SVGPointList;
-    points: SVGPointList;
+    readonly animatedPoints: SVGPointList;
+    readonly points: SVGPointList;
 }
 
 interface SVGExternalResourcesRequired {
-    externalResourcesRequired: SVGAnimatedBoolean;
+    readonly externalResourcesRequired: SVGAnimatedBoolean;
 }
 
 interface SVGFilterPrimitiveStandardAttributes extends SVGStylable {
-    height: SVGAnimatedLength;
-    result: SVGAnimatedString;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly height: SVGAnimatedLength;
+    readonly result: SVGAnimatedString;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
 }
 
 interface SVGFitToViewBox {
-    preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
-    viewBox: SVGAnimatedRect;
+    readonly preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
+    readonly viewBox: SVGAnimatedRect;
 }
 
 interface SVGLangSpace {
@@ -16545,8 +17661,8 @@ interface SVGLangSpace {
 }
 
 interface SVGLocatable {
-    farthestViewportElement: SVGElement;
-    nearestViewportElement: SVGElement;
+    readonly farthestViewportElement: SVGElement;
+    readonly nearestViewportElement: SVGElement;
     getBBox(): SVGRect;
     getCTM(): SVGMatrix;
     getScreenCTM(): SVGMatrix;
@@ -16555,22 +17671,22 @@ interface SVGLocatable {
 
 interface SVGStylable {
     className: any;
-    style: CSSStyleDeclaration;
+    readonly style: CSSStyleDeclaration;
 }
 
 interface SVGTests {
-    requiredExtensions: SVGStringList;
-    requiredFeatures: SVGStringList;
-    systemLanguage: SVGStringList;
+    readonly requiredExtensions: SVGStringList;
+    readonly requiredFeatures: SVGStringList;
+    readonly systemLanguage: SVGStringList;
     hasExtension(extension: string): boolean;
 }
 
 interface SVGTransformable extends SVGLocatable {
-    transform: SVGAnimatedTransformList;
+    readonly transform: SVGAnimatedTransformList;
 }
 
 interface SVGURIReference {
-    href: SVGAnimatedString;
+    readonly href: SVGAnimatedString;
 }
 
 interface WindowBase64 {
@@ -16579,15 +17695,15 @@ interface WindowBase64 {
 }
 
 interface WindowConsole {
-    console: Console;
+    readonly console: Console;
 }
 
 interface WindowLocalStorage {
-    localStorage: Storage;
+    readonly localStorage: Storage;
 }
 
 interface WindowSessionStorage {
-    sessionStorage: Storage;
+    readonly sessionStorage: Storage;
 }
 
 interface WindowTimers extends Object, WindowTimersExtension {
@@ -16599,8 +17715,6 @@ interface WindowTimers extends Object, WindowTimersExtension {
 
 interface WindowTimersExtension {
     clearImmediate(handle: number): void;
-    msClearImmediate(handle: number): void;
-    msSetImmediate(expression: any, ...args: any[]): number;
     setImmediate(expression: any, ...args: any[]): number;
 }
 
@@ -16630,22 +17744,18 @@ interface StorageEventInit extends EventInit {
     storageArea?: Storage;
 }
 
-interface IDBObjectStoreParameters {
-    keyPath?: string | string[];
-    autoIncrement?: boolean;
-}
-
-interface IDBIndexParameters {
-    unique?: boolean;
-    multiEntry?: boolean;
-}
-
 interface NodeListOf<TNode extends Node> extends NodeList {
     length: number;
     item(index: number): TNode;
     [index: number]: TNode;
 }
 
+interface HTMLCollectionOf<T extends Element> extends HTMLCollection {
+    item(index: number): T;
+    namedItem(name: string): T;
+    [index: number]: T;
+}
+
 interface BlobPropertyBag {
     type?: string;
     endings?: string;
@@ -16675,15 +17785,6 @@ interface ProgressEventInit extends EventInit {
     total?: number;
 }
 
-interface HTMLTemplateElement extends HTMLElement {
-    content: DocumentFragment;
-}
-
-declare var HTMLTemplateElement: {
-    prototype: HTMLTemplateElement;
-    new(): HTMLTemplateElement;
-}
-
 interface HTMLPictureElement extends HTMLElement {
 }
 
@@ -16692,6 +17793,14 @@ declare var HTMLPictureElement: {
     new(): HTMLPictureElement;
 }
 
+interface ClipboardEventInit extends EventInit {
+    data?: string;
+    dataType?: string;
+}
+
+interface IDBArrayKey extends Array<IDBValidKey> {
+}
+
 declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
 
 interface ErrorEventHandler {
@@ -16725,15 +17834,23 @@ interface DecodeSuccessCallback {
     (decodedData: AudioBuffer): void;
 }
 interface DecodeErrorCallback {
-    (): void;
+    (error: DOMException): void;
 }
 interface FunctionStringCallback {
     (data: string): void;
 }
+interface NavigatorUserMediaSuccessCallback {
+    (stream: MediaStream): void;
+}
+interface NavigatorUserMediaErrorCallback {
+    (error: MediaStreamError): void;
+}
+interface ForEachCallback {
+    (keyId: any, status: string): void;
+}
 declare var Audio: {new(src?: string): HTMLAudioElement; };
 declare var Image: {new(width?: number, height?: number): HTMLImageElement; };
 declare var Option: {new(text?: string, value?: string, defaultSelected?: boolean, selected?: boolean): HTMLOptionElement; };
-declare var animationStartTime: number;
 declare var applicationCache: ApplicationCache;
 declare var clientInformation: Navigator;
 declare var closed: boolean;
@@ -16753,7 +17870,7 @@ declare var length: number;
 declare var location: Location;
 declare var locationbar: BarProp;
 declare var menubar: BarProp;
-declare var msAnimationStartTime: number;
+declare var msCredentials: MSCredentials;
 declare var name: string;
 declare var navigator: Navigator;
 declare var offscreenBuffering: string | boolean;
@@ -16769,6 +17886,7 @@ declare var onclick: (ev: MouseEvent) => any;
 declare var oncompassneedscalibration: (ev: Event) => any;
 declare var oncontextmenu: (ev: PointerEvent) => any;
 declare var ondblclick: (ev: MouseEvent) => any;
+declare var ondevicelight: (ev: DeviceLightEvent) => any;
 declare var ondevicemotion: (ev: DeviceMotionEvent) => any;
 declare var ondeviceorientation: (ev: DeviceOrientationEvent) => any;
 declare var ondrag: (ev: DragEvent) => any;
@@ -16780,11 +17898,12 @@ declare var ondragstart: (ev: DragEvent) => any;
 declare var ondrop: (ev: DragEvent) => any;
 declare var ondurationchange: (ev: Event) => any;
 declare var onemptied: (ev: Event) => any;
-declare var onended: (ev: Event) => any;
+declare var onended: (ev: MediaStreamErrorEvent) => any;
 declare var onerror: ErrorEventHandler;
 declare var onfocus: (ev: FocusEvent) => any;
 declare var onhashchange: (ev: HashChangeEvent) => any;
 declare var oninput: (ev: Event) => any;
+declare var oninvalid: (ev: Event) => any;
 declare var onkeydown: (ev: KeyboardEvent) => any;
 declare var onkeypress: (ev: KeyboardEvent) => any;
 declare var onkeyup: (ev: KeyboardEvent) => any;
@@ -16800,7 +17919,7 @@ declare var onmousemove: (ev: MouseEvent) => any;
 declare var onmouseout: (ev: MouseEvent) => any;
 declare var onmouseover: (ev: MouseEvent) => any;
 declare var onmouseup: (ev: MouseEvent) => any;
-declare var onmousewheel: (ev: MouseWheelEvent) => any;
+declare var onmousewheel: (ev: WheelEvent) => any;
 declare var onmsgesturechange: (ev: MSGestureEvent) => any;
 declare var onmsgesturedoubletap: (ev: MSGestureEvent) => any;
 declare var onmsgestureend: (ev: MSGestureEvent) => any;
@@ -16839,10 +17958,10 @@ declare var onstorage: (ev: StorageEvent) => any;
 declare var onsubmit: (ev: Event) => any;
 declare var onsuspend: (ev: Event) => any;
 declare var ontimeupdate: (ev: Event) => any;
-declare var ontouchcancel: any;
-declare var ontouchend: any;
-declare var ontouchmove: any;
-declare var ontouchstart: any;
+declare var ontouchcancel: (ev: TouchEvent) => any;
+declare var ontouchend: (ev: TouchEvent) => any;
+declare var ontouchmove: (ev: TouchEvent) => any;
+declare var ontouchstart: (ev: TouchEvent) => any;
 declare var onunload: (ev: Event) => any;
 declare var onvolumechange: (ev: Event) => any;
 declare var onwaiting: (ev: Event) => any;
@@ -16870,7 +17989,6 @@ declare var styleMedia: StyleMedia;
 declare var toolbar: BarProp;
 declare var top: Window;
 declare var window: Window;
-declare var URL: URL;
 declare function alert(message?: any): void;
 declare function blur(): void;
 declare function cancelAnimationFrame(handle: number): void;
@@ -16884,12 +18002,9 @@ declare function getSelection(): Selection;
 declare function matchMedia(mediaQuery: string): MediaQueryList;
 declare function moveBy(x?: number, y?: number): void;
 declare function moveTo(x?: number, y?: number): void;
-declare function msCancelRequestAnimationFrame(handle: number): void;
-declare function msMatchMedia(mediaQuery: string): MediaQueryList;
-declare function msRequestAnimationFrame(callback: FrameRequestCallback): number;
 declare function msWriteProfilerMark(profilerMarkName: string): void;
 declare function open(url?: string, target?: string, features?: string, replace?: boolean): Window;
-declare function postMessage(message: any, targetOrigin: string, ports?: any): void;
+declare function postMessage(message: any, targetOrigin: string, transfer?: any[]): void;
 declare function print(): void;
 declare function prompt(message?: string, _default?: string): string;
 declare function releaseEvents(): void;
@@ -16899,19 +18014,19 @@ declare function resizeTo(x?: number, y?: number): void;
 declare function scroll(x?: number, y?: number): void;
 declare function scrollBy(x?: number, y?: number): void;
 declare function scrollTo(x?: number, y?: number): void;
+declare function webkitCancelAnimationFrame(handle: number): void;
 declare function webkitConvertPointFromNodeToPage(node: Node, pt: WebKitPoint): WebKitPoint;
 declare function webkitConvertPointFromPageToNode(node: Node, pt: WebKitPoint): WebKitPoint;
+declare function webkitRequestAnimationFrame(callback: FrameRequestCallback): number;
 declare function toString(): string;
-declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+declare function addEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 declare function dispatchEvent(evt: Event): boolean;
-declare function removeEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+declare function removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 declare function clearInterval(handle: number): void;
 declare function clearTimeout(handle: number): void;
 declare function setInterval(handler: any, timeout?: any, ...args: any[]): number;
 declare function setTimeout(handler: any, timeout?: any, ...args: any[]): number;
 declare function clearImmediate(handle: number): void;
-declare function msClearImmediate(handle: number): void;
-declare function msSetImmediate(expression: any, ...args: any[]): number;
 declare function setImmediate(expression: any, ...args: any[]): number;
 declare var sessionStorage: Storage;
 declare var localStorage: Storage;
@@ -16926,7 +18041,6 @@ declare var onpointerover: (ev: PointerEvent) => any;
 declare var onpointerup: (ev: PointerEvent) => any;
 declare var onwheel: (ev: WheelEvent) => any;
 declare var indexedDB: IDBFactory;
-declare var msIndexedDB: IDBFactory;
 declare function atob(encodedString: string): string;
 declare function btoa(rawString: string): string;
 declare function addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -16956,6 +18070,7 @@ declare function addEventListener(type: "click", listener: (ev: MouseEvent) => a
 declare function addEventListener(type: "compassneedscalibration", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
+declare function addEventListener(type: "devicelight", listener: (ev: DeviceLightEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "devicemotion", listener: (ev: DeviceMotionEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "deviceorientation", listener: (ev: DeviceOrientationEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -16967,10 +18082,11 @@ declare function addEventListener(type: "dragstart", listener: (ev: DragEvent) =
 declare function addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+declare function addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "hashchange", listener: (ev: HashChangeEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+declare function addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -16986,7 +18102,7 @@ declare function addEventListener(type: "mousemove", listener: (ev: MouseEvent)
 declare function addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+declare function addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "offline", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "online", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "orientationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -17023,6 +18139,38 @@ declare function addEventListener(type: "volumechange", listener: (ev: Event) =>
 declare function addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+type AAGUID = string;
+type AlgorithmIdentifier = string | Algorithm;
+type ConstrainBoolean = boolean | ConstrainBooleanParameters;
+type ConstrainDOMString = string | string[] | ConstrainDOMStringParameters;
+type ConstrainDouble = number | ConstrainDoubleRange;
+type ConstrainLong = number | ConstrainLongRange;
+type CryptoOperationData = ArrayBufferView;
+type GLbitfield = number;
+type GLboolean = boolean;
+type GLbyte = number;
+type GLclampf = number;
+type GLenum = number;
+type GLfloat = number;
+type GLint = number;
+type GLintptr = number;
+type GLshort = number;
+type GLsizei = number;
+type GLsizeiptr = number;
+type GLubyte = number;
+type GLuint = number;
+type GLushort = number;
+type IDBKeyPath = string;
+type KeyFormat = string;
+type KeyType = string;
+type KeyUsage = string;
+type MSInboundPayload = MSVideoRecvPayload | MSAudioRecvPayload;
+type MSLocalClientEvent = MSLocalClientEventBase | MSAudioLocalClientEvent;
+type MSOutboundPayload = MSVideoSendPayload | MSAudioSendPayload;
+type RTCIceGatherCandidate = RTCIceCandidate | RTCIceCandidateComplete;
+type RTCTransport = RTCDtlsTransport | RTCSrtpSdesTransport;
+type payloadtype = number;
+type IDBValidKey = number | string | Date | IDBArrayKey;
 /////////////////////////////
 /// WorkerGlobalScope APIs 
 /////////////////////////////
diff --git a/lib/lib.dom.d.ts b/lib/lib.dom.d.ts
index 542149d7719..27a38590913 100644
--- a/lib/lib.dom.d.ts
+++ b/lib/lib.dom.d.ts
@@ -13,209 +13,7 @@ See the Apache Version 2.0 License for specific language governing permissions
 and limitations under the License.
 ***************************************************************************** */
 
-/// <reference path="lib.core.d.ts" />
-/////////////////////////////
-/// ECMAScript Internationalization API 
-/////////////////////////////
-
-declare module Intl {
-    interface CollatorOptions {
-        usage?: string;
-        localeMatcher?: string;
-        numeric?: boolean;
-        caseFirst?: string;
-        sensitivity?: string;
-        ignorePunctuation?: boolean;
-    }
-
-    interface ResolvedCollatorOptions {
-        locale: string;
-        usage: string;
-        sensitivity: string;
-        ignorePunctuation: boolean;
-        collation: string;
-        caseFirst: string;
-        numeric: boolean;
-    }
-
-    interface Collator {
-        compare(x: string, y: string): number;
-        resolvedOptions(): ResolvedCollatorOptions;
-    }
-    var Collator: {
-        new (locales?: string[], options?: CollatorOptions): Collator;
-        new (locale?: string, options?: CollatorOptions): Collator;
-        (locales?: string[], options?: CollatorOptions): Collator;
-        (locale?: string, options?: CollatorOptions): Collator;
-        supportedLocalesOf(locales: string[], options?: CollatorOptions): string[];
-        supportedLocalesOf(locale: string, options?: CollatorOptions): string[];
-    }
-
-    interface NumberFormatOptions {
-        localeMatcher?: string;
-        style?: string;
-        currency?: string;
-        currencyDisplay?: string;
-        useGrouping?: boolean;
-        minimumIntegerDigits?: number;
-        minimumFractionDigits?: number;
-        maximumFractionDigits?: number;
-        minimumSignificantDigits?: number;
-        maximumSignificantDigits?: number;
-    }
-
-    interface ResolvedNumberFormatOptions {
-        locale: string;
-        numberingSystem: string;
-        style: string;
-        currency?: string;
-        currencyDisplay?: string;
-        minimumIntegerDigits: number;
-        minimumFractionDigits: number;
-        maximumFractionDigits: number;
-        minimumSignificantDigits?: number;
-        maximumSignificantDigits?: number;
-        useGrouping: boolean;
-    }
-
-    interface NumberFormat {
-        format(value: number): string;
-        resolvedOptions(): ResolvedNumberFormatOptions;
-    }
-    var NumberFormat: {
-        new (locales?: string[], options?: NumberFormatOptions): NumberFormat;
-        new (locale?: string, options?: NumberFormatOptions): NumberFormat;
-        (locales?: string[], options?: NumberFormatOptions): NumberFormat;
-        (locale?: string, options?: NumberFormatOptions): NumberFormat;
-        supportedLocalesOf(locales: string[], options?: NumberFormatOptions): string[];
-        supportedLocalesOf(locale: string, options?: NumberFormatOptions): string[];
-    }
-
-    interface DateTimeFormatOptions {
-        localeMatcher?: string;
-        weekday?: string;
-        era?: string;
-        year?: string;
-        month?: string;
-        day?: string;
-        hour?: string;
-        minute?: string;
-        second?: string;
-        timeZoneName?: string;
-        formatMatcher?: string;
-        hour12?: boolean;
-        timeZone?: string;
-    }
-
-    interface ResolvedDateTimeFormatOptions {
-        locale: string;
-        calendar: string;
-        numberingSystem: string;
-        timeZone: string;
-        hour12?: boolean;
-        weekday?: string;
-        era?: string;
-        year?: string;
-        month?: string;
-        day?: string;
-        hour?: string;
-        minute?: string;
-        second?: string;
-        timeZoneName?: string;
-    }
-
-    interface DateTimeFormat {
-        format(date?: Date | number): string;
-        resolvedOptions(): ResolvedDateTimeFormatOptions;
-    }
-    var DateTimeFormat: {
-        new (locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
-        new (locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
-        (locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
-        (locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
-        supportedLocalesOf(locales: string[], options?: DateTimeFormatOptions): string[];
-        supportedLocalesOf(locale: string, options?: DateTimeFormatOptions): string[];
-    }
-}
-
-interface String {
-    /**
-      * Determines whether two strings are equivalent in the current locale.
-      * @param that String to compare to target string
-      * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used. This parameter must conform to BCP 47 standards; see the Intl.Collator object for details.
-      * @param options An object that contains one or more properties that specify comparison options. see the Intl.Collator object for details.
-      */
-    localeCompare(that: string, locales: string[], options?: Intl.CollatorOptions): number;
-
-    /**
-      * Determines whether two strings are equivalent in the current locale.
-      * @param that String to compare to target string
-      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used. This parameter must conform to BCP 47 standards; see the Intl.Collator object for details.
-      * @param options An object that contains one or more properties that specify comparison options. see the Intl.Collator object for details.
-      */
-    localeCompare(that: string, locale: string, options?: Intl.CollatorOptions): number;
-}
-
-interface Number {
-    /**
-      * Converts a number to a string by using the current or specified locale. 
-      * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleString(locales?: string[], options?: Intl.NumberFormatOptions): string;
-
-    /**
-      * Converts a number to a string by using the current or specified locale. 
-      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleString(locale?: string, options?: Intl.NumberFormatOptions): string;
-}
-
-interface Date {
-    /**
-      * Converts a date and time to a string by using the current or specified locale.  
-      * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleString(locales?: string[], options?: Intl.DateTimeFormatOptions): string;
-    /**
-      * Converts a date to a string by using the current or specified locale.  
-      * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleDateString(locales?: string[], options?: Intl.DateTimeFormatOptions): string;
-
-    /**
-      * Converts a time to a string by using the current or specified locale.  
-      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleTimeString(locale?: string[], options?: Intl.DateTimeFormatOptions): string;
-    
-    /**
-      * Converts a date and time to a string by using the current or specified locale.  
-      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleString(locale?: string, options?: Intl.DateTimeFormatOptions): string;
-    
-    /**
-      * Converts a date to a string by using the current or specified locale.  
-      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleDateString(locale?: string, options?: Intl.DateTimeFormatOptions): string;
-
-    /**
-      * Converts a time to a string by using the current or specified locale.  
-      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleTimeString(locale?: string, options?: Intl.DateTimeFormatOptions): string;
-}
-
-
+/// <reference no-default-lib="true"/>
 /////////////////////////////
 /// IE DOM APIs
 /////////////////////////////
@@ -229,11 +27,6 @@ interface AriaRequestEventInit extends EventInit {
     attributeValue?: string;
 }
 
-interface ClipboardEventInit extends EventInit {
-    data?: string;
-    dataType?: string;
-}
-
 interface CommandEventInit extends EventInit {
     commandName?: string;
     detail?: string;
@@ -247,6 +40,31 @@ interface ConfirmSiteSpecificExceptionsInformation extends ExceptionInformation
     arrayOfDomainStrings?: string[];
 }
 
+interface ConstrainBooleanParameters {
+    exact?: boolean;
+    ideal?: boolean;
+}
+
+interface ConstrainDOMStringParameters {
+    exact?: string | string[];
+    ideal?: string | string[];
+}
+
+interface ConstrainDoubleRange extends DoubleRange {
+    exact?: number;
+    ideal?: number;
+}
+
+interface ConstrainLongRange extends LongRange {
+    exact?: number;
+    ideal?: number;
+}
+
+interface ConstrainVideoFacingModeParameters {
+    exact?: string | string[];
+    ideal?: string | string[];
+}
+
 interface CustomEventInit extends EventInit {
     detail?: any;
 }
@@ -257,17 +75,44 @@ interface DeviceAccelerationDict {
     z?: number;
 }
 
+interface DeviceLightEventInit extends EventInit {
+    value?: number;
+}
+
 interface DeviceRotationRateDict {
     alpha?: number;
     beta?: number;
     gamma?: number;
 }
 
+interface DoubleRange {
+    max?: number;
+    min?: number;
+}
+
 interface EventInit {
     bubbles?: boolean;
     cancelable?: boolean;
 }
 
+interface EventModifierInit extends UIEventInit {
+    ctrlKey?: boolean;
+    shiftKey?: boolean;
+    altKey?: boolean;
+    metaKey?: boolean;
+    modifierAltGraph?: boolean;
+    modifierCapsLock?: boolean;
+    modifierFn?: boolean;
+    modifierFnLock?: boolean;
+    modifierHyper?: boolean;
+    modifierNumLock?: boolean;
+    modifierOS?: boolean;
+    modifierScrollLock?: boolean;
+    modifierSuper?: boolean;
+    modifierSymbol?: boolean;
+    modifierSymbolLock?: boolean;
+}
+
 interface ExceptionInformation {
     domain?: string;
 }
@@ -281,17 +126,415 @@ interface HashChangeEventInit extends EventInit {
     oldURL?: string;
 }
 
+interface IDBIndexParameters {
+    multiEntry?: boolean;
+    unique?: boolean;
+}
+
+interface IDBObjectStoreParameters {
+    autoIncrement?: boolean;
+    keyPath?: IDBKeyPath;
+}
+
 interface KeyAlgorithm {
     name?: string;
 }
 
-interface KeyboardEventInit extends SharedKeyboardAndMouseEventInit {
+interface KeyboardEventInit extends EventModifierInit {
     key?: string;
     location?: number;
     repeat?: boolean;
 }
 
-interface MouseEventInit extends SharedKeyboardAndMouseEventInit {
+interface LongRange {
+    max?: number;
+    min?: number;
+}
+
+interface MSAccountInfo {
+    rpDisplayName?: string;
+    userDisplayName?: string;
+    accountName?: string;
+    userId?: string;
+    accountImageUri?: string;
+}
+
+interface MSAudioLocalClientEvent extends MSLocalClientEventBase {
+    networkSendQualityEventRatio?: number;
+    networkDelayEventRatio?: number;
+    cpuInsufficientEventRatio?: number;
+    deviceHalfDuplexAECEventRatio?: number;
+    deviceRenderNotFunctioningEventRatio?: number;
+    deviceCaptureNotFunctioningEventRatio?: number;
+    deviceGlitchesEventRatio?: number;
+    deviceLowSNREventRatio?: number;
+    deviceLowSpeechLevelEventRatio?: number;
+    deviceClippingEventRatio?: number;
+    deviceEchoEventRatio?: number;
+    deviceNearEndToEchoRatioEventRatio?: number;
+    deviceRenderZeroVolumeEventRatio?: number;
+    deviceRenderMuteEventRatio?: number;
+    deviceMultipleEndpointsEventCount?: number;
+    deviceHowlingEventCount?: number;
+}
+
+interface MSAudioRecvPayload extends MSPayloadBase {
+    samplingRate?: number;
+    signal?: MSAudioRecvSignal;
+    packetReorderRatio?: number;
+    packetReorderDepthAvg?: number;
+    packetReorderDepthMax?: number;
+    burstLossLength1?: number;
+    burstLossLength2?: number;
+    burstLossLength3?: number;
+    burstLossLength4?: number;
+    burstLossLength5?: number;
+    burstLossLength6?: number;
+    burstLossLength7?: number;
+    burstLossLength8OrHigher?: number;
+    fecRecvDistance1?: number;
+    fecRecvDistance2?: number;
+    fecRecvDistance3?: number;
+    ratioConcealedSamplesAvg?: number;
+    ratioStretchedSamplesAvg?: number;
+    ratioCompressedSamplesAvg?: number;
+}
+
+interface MSAudioRecvSignal {
+    initialSignalLevelRMS?: number;
+    recvSignalLevelCh1?: number;
+    recvNoiseLevelCh1?: number;
+    renderSignalLevel?: number;
+    renderNoiseLevel?: number;
+    renderLoopbackSignalLevel?: number;
+}
+
+interface MSAudioSendPayload extends MSPayloadBase {
+    samplingRate?: number;
+    signal?: MSAudioSendSignal;
+    audioFECUsed?: boolean;
+    sendMutePercent?: number;
+}
+
+interface MSAudioSendSignal {
+    noiseLevel?: number;
+    sendSignalLevelCh1?: number;
+    sendNoiseLevelCh1?: number;
+}
+
+interface MSConnectivity {
+    iceType?: string;
+    iceWarningFlags?: MSIceWarningFlags;
+    relayAddress?: MSRelayAddress;
+}
+
+interface MSCredentialFilter {
+    accept?: MSCredentialSpec[];
+}
+
+interface MSCredentialParameters {
+    type?: string;
+}
+
+interface MSCredentialSpec {
+    type?: string;
+    id?: string;
+}
+
+interface MSDelay {
+    roundTrip?: number;
+    roundTripMax?: number;
+}
+
+interface MSDescription extends RTCStats {
+    connectivity?: MSConnectivity;
+    transport?: string;
+    networkconnectivity?: MSNetworkConnectivityInfo;
+    localAddr?: MSIPAddressInfo;
+    remoteAddr?: MSIPAddressInfo;
+    deviceDevName?: string;
+    reflexiveLocalIPAddr?: MSIPAddressInfo;
+}
+
+interface MSFIDOCredentialParameters extends MSCredentialParameters {
+    algorithm?: string | Algorithm;
+    authenticators?: AAGUID[];
+}
+
+interface MSIPAddressInfo {
+    ipAddr?: string;
+    port?: number;
+    manufacturerMacAddrMask?: string;
+}
+
+interface MSIceWarningFlags {
+    turnTcpTimedOut?: boolean;
+    turnUdpAllocateFailed?: boolean;
+    turnUdpSendFailed?: boolean;
+    turnTcpAllocateFailed?: boolean;
+    turnTcpSendFailed?: boolean;
+    udpLocalConnectivityFailed?: boolean;
+    udpNatConnectivityFailed?: boolean;
+    udpRelayConnectivityFailed?: boolean;
+    tcpNatConnectivityFailed?: boolean;
+    tcpRelayConnectivityFailed?: boolean;
+    connCheckMessageIntegrityFailed?: boolean;
+    allocationMessageIntegrityFailed?: boolean;
+    connCheckOtherError?: boolean;
+    turnAuthUnknownUsernameError?: boolean;
+    noRelayServersConfigured?: boolean;
+    multipleRelayServersAttempted?: boolean;
+    portRangeExhausted?: boolean;
+    alternateServerReceived?: boolean;
+    pseudoTLSFailure?: boolean;
+    turnTurnTcpConnectivityFailed?: boolean;
+    useCandidateChecksFailed?: boolean;
+    fipsAllocationFailure?: boolean;
+}
+
+interface MSJitter {
+    interArrival?: number;
+    interArrivalMax?: number;
+    interArrivalSD?: number;
+}
+
+interface MSLocalClientEventBase extends RTCStats {
+    networkReceiveQualityEventRatio?: number;
+    networkBandwidthLowEventRatio?: number;
+}
+
+interface MSNetwork extends RTCStats {
+    jitter?: MSJitter;
+    delay?: MSDelay;
+    packetLoss?: MSPacketLoss;
+    utilization?: MSUtilization;
+}
+
+interface MSNetworkConnectivityInfo {
+    vpn?: boolean;
+    linkspeed?: number;
+    networkConnectionDetails?: string;
+}
+
+interface MSNetworkInterfaceType {
+    interfaceTypeEthernet?: boolean;
+    interfaceTypeWireless?: boolean;
+    interfaceTypePPP?: boolean;
+    interfaceTypeTunnel?: boolean;
+    interfaceTypeWWAN?: boolean;
+}
+
+interface MSOutboundNetwork extends MSNetwork {
+    appliedBandwidthLimit?: number;
+}
+
+interface MSPacketLoss {
+    lossRate?: number;
+    lossRateMax?: number;
+}
+
+interface MSPayloadBase extends RTCStats {
+    payloadDescription?: string;
+}
+
+interface MSRelayAddress {
+    relayAddress?: string;
+    port?: number;
+}
+
+interface MSSignatureParameters {
+    userPrompt?: string;
+}
+
+interface MSTransportDiagnosticsStats extends RTCStats {
+    baseAddress?: string;
+    localAddress?: string;
+    localSite?: string;
+    networkName?: string;
+    remoteAddress?: string;
+    remoteSite?: string;
+    localMR?: string;
+    remoteMR?: string;
+    iceWarningFlags?: MSIceWarningFlags;
+    portRangeMin?: number;
+    portRangeMax?: number;
+    localMRTCPPort?: number;
+    remoteMRTCPPort?: number;
+    stunVer?: number;
+    numConsentReqSent?: number;
+    numConsentReqReceived?: number;
+    numConsentRespSent?: number;
+    numConsentRespReceived?: number;
+    interfaces?: MSNetworkInterfaceType;
+    baseInterface?: MSNetworkInterfaceType;
+    protocol?: string;
+    localInterface?: MSNetworkInterfaceType;
+    localAddrType?: string;
+    remoteAddrType?: string;
+    iceRole?: string;
+    rtpRtcpMux?: boolean;
+    allocationTimeInMs?: number;
+    msRtcEngineVersion?: string;
+}
+
+interface MSUtilization {
+    packets?: number;
+    bandwidthEstimation?: number;
+    bandwidthEstimationMin?: number;
+    bandwidthEstimationMax?: number;
+    bandwidthEstimationStdDev?: number;
+    bandwidthEstimationAvg?: number;
+}
+
+interface MSVideoPayload extends MSPayloadBase {
+    resoluton?: string;
+    videoBitRateAvg?: number;
+    videoBitRateMax?: number;
+    videoFrameRateAvg?: number;
+    videoPacketLossRate?: number;
+    durationSeconds?: number;
+}
+
+interface MSVideoRecvPayload extends MSVideoPayload {
+    videoFrameLossRate?: number;
+    recvCodecType?: string;
+    recvResolutionWidth?: number;
+    recvResolutionHeight?: number;
+    videoResolutions?: MSVideoResolutionDistribution;
+    recvFrameRateAverage?: number;
+    recvBitRateMaximum?: number;
+    recvBitRateAverage?: number;
+    recvVideoStreamsMax?: number;
+    recvVideoStreamsMin?: number;
+    recvVideoStreamsMode?: number;
+    videoPostFECPLR?: number;
+    lowBitRateCallPercent?: number;
+    lowFrameRateCallPercent?: number;
+    reorderBufferTotalPackets?: number;
+    recvReorderBufferReorderedPackets?: number;
+    recvReorderBufferPacketsDroppedDueToBufferExhaustion?: number;
+    recvReorderBufferMaxSuccessfullyOrderedExtent?: number;
+    recvReorderBufferMaxSuccessfullyOrderedLateTime?: number;
+    recvReorderBufferPacketsDroppedDueToTimeout?: number;
+    recvFpsHarmonicAverage?: number;
+    recvNumResSwitches?: number;
+}
+
+interface MSVideoResolutionDistribution {
+    cifQuality?: number;
+    vgaQuality?: number;
+    h720Quality?: number;
+    h1080Quality?: number;
+    h1440Quality?: number;
+    h2160Quality?: number;
+}
+
+interface MSVideoSendPayload extends MSVideoPayload {
+    sendFrameRateAverage?: number;
+    sendBitRateMaximum?: number;
+    sendBitRateAverage?: number;
+    sendVideoStreamsMax?: number;
+    sendResolutionWidth?: number;
+    sendResolutionHeight?: number;
+}
+
+interface MediaEncryptedEventInit extends EventInit {
+    initDataType?: string;
+    initData?: ArrayBuffer;
+}
+
+interface MediaKeyMessageEventInit extends EventInit {
+    messageType?: string;
+    message?: ArrayBuffer;
+}
+
+interface MediaKeySystemConfiguration {
+    initDataTypes?: string[];
+    audioCapabilities?: MediaKeySystemMediaCapability[];
+    videoCapabilities?: MediaKeySystemMediaCapability[];
+    distinctiveIdentifier?: string;
+    persistentState?: string;
+}
+
+interface MediaKeySystemMediaCapability {
+    contentType?: string;
+    robustness?: string;
+}
+
+interface MediaStreamConstraints {
+    video?: boolean | MediaTrackConstraints;
+    audio?: boolean | MediaTrackConstraints;
+}
+
+interface MediaStreamErrorEventInit extends EventInit {
+    error?: MediaStreamError;
+}
+
+interface MediaStreamTrackEventInit extends EventInit {
+    track?: MediaStreamTrack;
+}
+
+interface MediaTrackCapabilities {
+    width?: number | LongRange;
+    height?: number | LongRange;
+    aspectRatio?: number | DoubleRange;
+    frameRate?: number | DoubleRange;
+    facingMode?: string;
+    volume?: number | DoubleRange;
+    sampleRate?: number | LongRange;
+    sampleSize?: number | LongRange;
+    echoCancellation?: boolean[];
+    deviceId?: string;
+    groupId?: string;
+}
+
+interface MediaTrackConstraintSet {
+    width?: number | ConstrainLongRange;
+    height?: number | ConstrainLongRange;
+    aspectRatio?: number | ConstrainDoubleRange;
+    frameRate?: number | ConstrainDoubleRange;
+    facingMode?: string | string[] | ConstrainDOMStringParameters;
+    volume?: number | ConstrainDoubleRange;
+    sampleRate?: number | ConstrainLongRange;
+    sampleSize?: number | ConstrainLongRange;
+    echoCancelation?: boolean | ConstrainBooleanParameters;
+    deviceId?: string | string[] | ConstrainDOMStringParameters;
+    groupId?: string | string[] | ConstrainDOMStringParameters;
+}
+
+interface MediaTrackConstraints extends MediaTrackConstraintSet {
+    advanced?: MediaTrackConstraintSet[];
+}
+
+interface MediaTrackSettings {
+    width?: number;
+    height?: number;
+    aspectRatio?: number;
+    frameRate?: number;
+    facingMode?: string;
+    volume?: number;
+    sampleRate?: number;
+    sampleSize?: number;
+    echoCancellation?: boolean;
+    deviceId?: string;
+    groupId?: string;
+}
+
+interface MediaTrackSupportedConstraints {
+    width?: boolean;
+    height?: boolean;
+    aspectRatio?: boolean;
+    frameRate?: boolean;
+    facingMode?: boolean;
+    volume?: boolean;
+    sampleRate?: boolean;
+    sampleSize?: boolean;
+    echoCancellation?: boolean;
+    deviceId?: boolean;
+    groupId?: boolean;
+}
+
+interface MouseEventInit extends EventModifierInit {
     screenX?: number;
     screenY?: number;
     clientX?: number;
@@ -324,6 +567,10 @@ interface ObjectURLOptions {
     oneTimeOnly?: boolean;
 }
 
+interface PeriodicWaveConstraints {
+    disableNormalization?: boolean;
+}
+
 interface PointerEventInit extends MouseEventInit {
     pointerId?: number;
     width?: number;
@@ -341,22 +588,266 @@ interface PositionOptions {
     maximumAge?: number;
 }
 
-interface SharedKeyboardAndMouseEventInit extends UIEventInit {
-    ctrlKey?: boolean;
-    shiftKey?: boolean;
-    altKey?: boolean;
-    metaKey?: boolean;
-    keyModifierStateAltGraph?: boolean;
-    keyModifierStateCapsLock?: boolean;
-    keyModifierStateFn?: boolean;
-    keyModifierStateFnLock?: boolean;
-    keyModifierStateHyper?: boolean;
-    keyModifierStateNumLock?: boolean;
-    keyModifierStateOS?: boolean;
-    keyModifierStateScrollLock?: boolean;
-    keyModifierStateSuper?: boolean;
-    keyModifierStateSymbol?: boolean;
-    keyModifierStateSymbolLock?: boolean;
+interface RTCDTMFToneChangeEventInit extends EventInit {
+    tone?: string;
+}
+
+interface RTCDtlsFingerprint {
+    algorithm?: string;
+    value?: string;
+}
+
+interface RTCDtlsParameters {
+    role?: string;
+    fingerprints?: RTCDtlsFingerprint[];
+}
+
+interface RTCIceCandidate {
+    foundation?: string;
+    priority?: number;
+    ip?: string;
+    protocol?: string;
+    port?: number;
+    type?: string;
+    tcpType?: string;
+    relatedAddress?: string;
+    relatedPort?: number;
+}
+
+interface RTCIceCandidateAttributes extends RTCStats {
+    ipAddress?: string;
+    portNumber?: number;
+    transport?: string;
+    candidateType?: string;
+    priority?: number;
+    addressSourceUrl?: string;
+}
+
+interface RTCIceCandidateComplete {
+}
+
+interface RTCIceCandidatePair {
+    local?: RTCIceCandidate;
+    remote?: RTCIceCandidate;
+}
+
+interface RTCIceCandidatePairStats extends RTCStats {
+    transportId?: string;
+    localCandidateId?: string;
+    remoteCandidateId?: string;
+    state?: string;
+    priority?: number;
+    nominated?: boolean;
+    writable?: boolean;
+    readable?: boolean;
+    bytesSent?: number;
+    bytesReceived?: number;
+    roundTripTime?: number;
+    availableOutgoingBitrate?: number;
+    availableIncomingBitrate?: number;
+}
+
+interface RTCIceGatherOptions {
+    gatherPolicy?: string;
+    iceservers?: RTCIceServer[];
+}
+
+interface RTCIceParameters {
+    usernameFragment?: string;
+    password?: string;
+}
+
+interface RTCIceServer {
+    urls?: any;
+    username?: string;
+    credential?: string;
+}
+
+interface RTCInboundRTPStreamStats extends RTCRTPStreamStats {
+    packetsReceived?: number;
+    bytesReceived?: number;
+    packetsLost?: number;
+    jitter?: number;
+    fractionLost?: number;
+}
+
+interface RTCMediaStreamTrackStats extends RTCStats {
+    trackIdentifier?: string;
+    remoteSource?: boolean;
+    ssrcIds?: string[];
+    frameWidth?: number;
+    frameHeight?: number;
+    framesPerSecond?: number;
+    framesSent?: number;
+    framesReceived?: number;
+    framesDecoded?: number;
+    framesDropped?: number;
+    framesCorrupted?: number;
+    audioLevel?: number;
+    echoReturnLoss?: number;
+    echoReturnLossEnhancement?: number;
+}
+
+interface RTCOutboundRTPStreamStats extends RTCRTPStreamStats {
+    packetsSent?: number;
+    bytesSent?: number;
+    targetBitrate?: number;
+    roundTripTime?: number;
+}
+
+interface RTCRTPStreamStats extends RTCStats {
+    ssrc?: string;
+    associateStatsId?: string;
+    isRemote?: boolean;
+    mediaTrackId?: string;
+    transportId?: string;
+    codecId?: string;
+    firCount?: number;
+    pliCount?: number;
+    nackCount?: number;
+    sliCount?: number;
+}
+
+interface RTCRtcpFeedback {
+    type?: string;
+    parameter?: string;
+}
+
+interface RTCRtcpParameters {
+    ssrc?: number;
+    cname?: string;
+    reducedSize?: boolean;
+    mux?: boolean;
+}
+
+interface RTCRtpCapabilities {
+    codecs?: RTCRtpCodecCapability[];
+    headerExtensions?: RTCRtpHeaderExtension[];
+    fecMechanisms?: string[];
+}
+
+interface RTCRtpCodecCapability {
+    name?: string;
+    kind?: string;
+    clockRate?: number;
+    preferredPayloadType?: number;
+    maxptime?: number;
+    numChannels?: number;
+    rtcpFeedback?: RTCRtcpFeedback[];
+    parameters?: any;
+    options?: any;
+    maxTemporalLayers?: number;
+    maxSpatialLayers?: number;
+    svcMultiStreamSupport?: boolean;
+}
+
+interface RTCRtpCodecParameters {
+    name?: string;
+    payloadType?: any;
+    clockRate?: number;
+    maxptime?: number;
+    numChannels?: number;
+    rtcpFeedback?: RTCRtcpFeedback[];
+    parameters?: any;
+}
+
+interface RTCRtpContributingSource {
+    timestamp?: number;
+    csrc?: number;
+    audioLevel?: number;
+}
+
+interface RTCRtpEncodingParameters {
+    ssrc?: number;
+    codecPayloadType?: number;
+    fec?: RTCRtpFecParameters;
+    rtx?: RTCRtpRtxParameters;
+    priority?: number;
+    maxBitrate?: number;
+    minQuality?: number;
+    framerateBias?: number;
+    resolutionScale?: number;
+    framerateScale?: number;
+    active?: boolean;
+    encodingId?: string;
+    dependencyEncodingIds?: string[];
+    ssrcRange?: RTCSsrcRange;
+}
+
+interface RTCRtpFecParameters {
+    ssrc?: number;
+    mechanism?: string;
+}
+
+interface RTCRtpHeaderExtension {
+    kind?: string;
+    uri?: string;
+    preferredId?: number;
+    preferredEncrypt?: boolean;
+}
+
+interface RTCRtpHeaderExtensionParameters {
+    uri?: string;
+    id?: number;
+    encrypt?: boolean;
+}
+
+interface RTCRtpParameters {
+    muxId?: string;
+    codecs?: RTCRtpCodecParameters[];
+    headerExtensions?: RTCRtpHeaderExtensionParameters[];
+    encodings?: RTCRtpEncodingParameters[];
+    rtcp?: RTCRtcpParameters;
+}
+
+interface RTCRtpRtxParameters {
+    ssrc?: number;
+}
+
+interface RTCRtpUnhandled {
+    ssrc?: number;
+    payloadType?: number;
+    muxId?: string;
+}
+
+interface RTCSrtpKeyParam {
+    keyMethod?: string;
+    keySalt?: string;
+    lifetime?: string;
+    mkiValue?: number;
+    mkiLength?: number;
+}
+
+interface RTCSrtpSdesParameters {
+    tag?: number;
+    cryptoSuite?: string;
+    keyParams?: RTCSrtpKeyParam[];
+    sessionParams?: string[];
+}
+
+interface RTCSsrcRange {
+    min?: number;
+    max?: number;
+}
+
+interface RTCStats {
+    timestamp?: number;
+    type?: string;
+    id?: string;
+    msType?: string;
+}
+
+interface RTCStatsReport {
+}
+
+interface RTCTransportStats extends RTCStats {
+    bytesSent?: number;
+    bytesReceived?: number;
+    rtcpTransportStatsId?: string;
+    activeConnection?: boolean;
+    selectedCandidatePairId?: string;
+    localCertificateId?: string;
+    remoteCertificateId?: string;
 }
 
 interface StoreExceptionsInformation extends ExceptionInformation {
@@ -402,18 +893,18 @@ interface ANGLE_instanced_arrays {
     drawArraysInstancedANGLE(mode: number, first: number, count: number, primcount: number): void;
     drawElementsInstancedANGLE(mode: number, count: number, type: number, offset: number, primcount: number): void;
     vertexAttribDivisorANGLE(index: number, divisor: number): void;
-    VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE: number;
+    readonly VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE: number;
 }
 
 declare var ANGLE_instanced_arrays: {
     prototype: ANGLE_instanced_arrays;
     new(): ANGLE_instanced_arrays;
-    VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE: number;
+    readonly VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE: number;
 }
 
 interface AnalyserNode extends AudioNode {
     fftSize: number;
-    frequencyBinCount: number;
+    readonly frequencyBinCount: number;
     maxDecibels: number;
     minDecibels: number;
     smoothingTimeConstant: number;
@@ -429,8 +920,8 @@ declare var AnalyserNode: {
 }
 
 interface AnimationEvent extends Event {
-    animationName: string;
-    elapsedTime: number;
+    readonly animationName: string;
+    readonly elapsedTime: number;
     initAnimationEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, animationNameArg: string, elapsedTimeArg: number): void;
 }
 
@@ -448,16 +939,16 @@ interface ApplicationCache extends EventTarget {
     onobsolete: (ev: Event) => any;
     onprogress: (ev: ProgressEvent) => any;
     onupdateready: (ev: Event) => any;
-    status: number;
+    readonly status: number;
     abort(): void;
     swapCache(): void;
     update(): void;
-    CHECKING: number;
-    DOWNLOADING: number;
-    IDLE: number;
-    OBSOLETE: number;
-    UNCACHED: number;
-    UPDATEREADY: number;
+    readonly CHECKING: number;
+    readonly DOWNLOADING: number;
+    readonly IDLE: number;
+    readonly OBSOLETE: number;
+    readonly UNCACHED: number;
+    readonly UPDATEREADY: number;
     addEventListener(type: "cached", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "checking", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "downloading", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -472,16 +963,16 @@ interface ApplicationCache extends EventTarget {
 declare var ApplicationCache: {
     prototype: ApplicationCache;
     new(): ApplicationCache;
-    CHECKING: number;
-    DOWNLOADING: number;
-    IDLE: number;
-    OBSOLETE: number;
-    UNCACHED: number;
-    UPDATEREADY: number;
+    readonly CHECKING: number;
+    readonly DOWNLOADING: number;
+    readonly IDLE: number;
+    readonly OBSOLETE: number;
+    readonly UNCACHED: number;
+    readonly UPDATEREADY: number;
 }
 
 interface AriaRequestEvent extends Event {
-    attributeName: string;
+    readonly attributeName: string;
     attributeValue: string;
 }
 
@@ -491,9 +982,10 @@ declare var AriaRequestEvent: {
 }
 
 interface Attr extends Node {
-    name: string;
-    ownerElement: Element;
-    specified: boolean;
+    readonly name: string;
+    readonly ownerElement: Element;
+    readonly prefix: string;
+    readonly specified: boolean;
     value: string;
 }
 
@@ -503,10 +995,12 @@ declare var Attr: {
 }
 
 interface AudioBuffer {
-    duration: number;
-    length: number;
-    numberOfChannels: number;
-    sampleRate: number;
+    readonly duration: number;
+    readonly length: number;
+    readonly numberOfChannels: number;
+    readonly sampleRate: number;
+    copyFromChannel(destination: Float32Array, channelNumber: number, startInChannel?: number): void;
+    copyToChannel(source: Float32Array, channelNumber: number, startInChannel?: number): void;
     getChannelData(channel: number): Float32Array;
 }
 
@@ -517,14 +1011,15 @@ declare var AudioBuffer: {
 
 interface AudioBufferSourceNode extends AudioNode {
     buffer: AudioBuffer;
+    readonly detune: AudioParam;
     loop: boolean;
     loopEnd: number;
     loopStart: number;
-    onended: (ev: Event) => any;
-    playbackRate: AudioParam;
+    onended: (ev: MediaStreamErrorEvent) => any;
+    readonly playbackRate: AudioParam;
     start(when?: number, offset?: number, duration?: number): void;
     stop(when?: number): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -534,10 +1029,10 @@ declare var AudioBufferSourceNode: {
 }
 
 interface AudioContext extends EventTarget {
-    currentTime: number;
-    destination: AudioDestinationNode;
-    listener: AudioListener;
-    sampleRate: number;
+    readonly currentTime: number;
+    readonly destination: AudioDestinationNode;
+    readonly listener: AudioListener;
+    readonly sampleRate: number;
     state: string;
     createAnalyser(): AnalyserNode;
     createBiquadFilter(): BiquadFilterNode;
@@ -550,13 +1045,14 @@ interface AudioContext extends EventTarget {
     createDynamicsCompressor(): DynamicsCompressorNode;
     createGain(): GainNode;
     createMediaElementSource(mediaElement: HTMLMediaElement): MediaElementAudioSourceNode;
+    createMediaStreamSource(mediaStream: MediaStream): MediaStreamAudioSourceNode;
     createOscillator(): OscillatorNode;
     createPanner(): PannerNode;
-    createPeriodicWave(real: Float32Array, imag: Float32Array): PeriodicWave;
+    createPeriodicWave(real: Float32Array, imag: Float32Array, constraints?: PeriodicWaveConstraints): PeriodicWave;
     createScriptProcessor(bufferSize?: number, numberOfInputChannels?: number, numberOfOutputChannels?: number): ScriptProcessorNode;
     createStereoPanner(): StereoPannerNode;
     createWaveShaper(): WaveShaperNode;
-    decodeAudioData(audioData: ArrayBuffer, successCallback: DecodeSuccessCallback, errorCallback?: DecodeErrorCallback): void;
+    decodeAudioData(audioData: ArrayBuffer, successCallback?: DecodeSuccessCallback, errorCallback?: DecodeErrorCallback): PromiseLike<AudioBuffer>;
 }
 
 declare var AudioContext: {
@@ -565,7 +1061,7 @@ declare var AudioContext: {
 }
 
 interface AudioDestinationNode extends AudioNode {
-    maxChannelCount: number;
+    readonly maxChannelCount: number;
 }
 
 declare var AudioDestinationNode: {
@@ -590,11 +1086,13 @@ interface AudioNode extends EventTarget {
     channelCount: number;
     channelCountMode: string;
     channelInterpretation: string;
-    context: AudioContext;
-    numberOfInputs: number;
-    numberOfOutputs: number;
+    readonly context: AudioContext;
+    readonly numberOfInputs: number;
+    readonly numberOfOutputs: number;
     connect(destination: AudioNode, output?: number, input?: number): void;
     disconnect(output?: number): void;
+    disconnect(destination: AudioNode, output?: number, input?: number): void;
+    disconnect(destination: AudioParam, output?: number): void;
 }
 
 declare var AudioNode: {
@@ -603,7 +1101,7 @@ declare var AudioNode: {
 }
 
 interface AudioParam {
-    defaultValue: number;
+    readonly defaultValue: number;
     value: number;
     cancelScheduledValues(startTime: number): void;
     exponentialRampToValueAtTime(value: number, endTime: number): void;
@@ -619,9 +1117,9 @@ declare var AudioParam: {
 }
 
 interface AudioProcessingEvent extends Event {
-    inputBuffer: AudioBuffer;
-    outputBuffer: AudioBuffer;
-    playbackTime: number;
+    readonly inputBuffer: AudioBuffer;
+    readonly outputBuffer: AudioBuffer;
+    readonly playbackTime: number;
 }
 
 declare var AudioProcessingEvent: {
@@ -631,11 +1129,11 @@ declare var AudioProcessingEvent: {
 
 interface AudioTrack {
     enabled: boolean;
-    id: string;
+    readonly id: string;
     kind: string;
-    label: string;
+    readonly label: string;
     language: string;
-    sourceBuffer: SourceBuffer;
+    readonly sourceBuffer: SourceBuffer;
 }
 
 declare var AudioTrack: {
@@ -644,7 +1142,7 @@ declare var AudioTrack: {
 }
 
 interface AudioTrackList extends EventTarget {
-    length: number;
+    readonly length: number;
     onaddtrack: (ev: TrackEvent) => any;
     onchange: (ev: Event) => any;
     onremovetrack: (ev: TrackEvent) => any;
@@ -663,7 +1161,7 @@ declare var AudioTrackList: {
 }
 
 interface BarProp {
-    visible: boolean;
+    readonly visible: boolean;
 }
 
 declare var BarProp: {
@@ -681,10 +1179,10 @@ declare var BeforeUnloadEvent: {
 }
 
 interface BiquadFilterNode extends AudioNode {
-    Q: AudioParam;
-    detune: AudioParam;
-    frequency: AudioParam;
-    gain: AudioParam;
+    readonly Q: AudioParam;
+    readonly detune: AudioParam;
+    readonly frequency: AudioParam;
+    readonly gain: AudioParam;
     type: string;
     getFrequencyResponse(frequencyHz: Float32Array, magResponse: Float32Array, phaseResponse: Float32Array): void;
 }
@@ -695,8 +1193,8 @@ declare var BiquadFilterNode: {
 }
 
 interface Blob {
-    size: number;
-    type: string;
+    readonly size: number;
+    readonly type: string;
     msClose(): void;
     msDetachStream(): any;
     slice(start?: number, end?: number, contentType?: string): Blob;
@@ -730,7 +1228,7 @@ declare var CSSConditionRule: {
 }
 
 interface CSSFontFaceRule extends CSSRule {
-    style: CSSStyleDeclaration;
+    readonly style: CSSStyleDeclaration;
 }
 
 declare var CSSFontFaceRule: {
@@ -739,9 +1237,9 @@ declare var CSSFontFaceRule: {
 }
 
 interface CSSGroupingRule extends CSSRule {
-    cssRules: CSSRuleList;
-    deleteRule(index?: number): void;
-    insertRule(rule: string, index?: number): number;
+    readonly cssRules: CSSRuleList;
+    deleteRule(index: number): void;
+    insertRule(rule: string, index: number): number;
 }
 
 declare var CSSGroupingRule: {
@@ -750,9 +1248,9 @@ declare var CSSGroupingRule: {
 }
 
 interface CSSImportRule extends CSSRule {
-    href: string;
-    media: MediaList;
-    styleSheet: CSSStyleSheet;
+    readonly href: string;
+    readonly media: MediaList;
+    readonly styleSheet: CSSStyleSheet;
 }
 
 declare var CSSImportRule: {
@@ -762,7 +1260,7 @@ declare var CSSImportRule: {
 
 interface CSSKeyframeRule extends CSSRule {
     keyText: string;
-    style: CSSStyleDeclaration;
+    readonly style: CSSStyleDeclaration;
 }
 
 declare var CSSKeyframeRule: {
@@ -771,7 +1269,7 @@ declare var CSSKeyframeRule: {
 }
 
 interface CSSKeyframesRule extends CSSRule {
-    cssRules: CSSRuleList;
+    readonly cssRules: CSSRuleList;
     name: string;
     appendRule(rule: string): void;
     deleteRule(rule: string): void;
@@ -784,7 +1282,7 @@ declare var CSSKeyframesRule: {
 }
 
 interface CSSMediaRule extends CSSConditionRule {
-    media: MediaList;
+    readonly media: MediaList;
 }
 
 declare var CSSMediaRule: {
@@ -793,8 +1291,8 @@ declare var CSSMediaRule: {
 }
 
 interface CSSNamespaceRule extends CSSRule {
-    namespaceURI: string;
-    prefix: string;
+    readonly namespaceURI: string;
+    readonly prefix: string;
 }
 
 declare var CSSNamespaceRule: {
@@ -803,10 +1301,10 @@ declare var CSSNamespaceRule: {
 }
 
 interface CSSPageRule extends CSSRule {
-    pseudoClass: string;
-    selector: string;
+    readonly pseudoClass: string;
+    readonly selector: string;
     selectorText: string;
-    style: CSSStyleDeclaration;
+    readonly style: CSSStyleDeclaration;
 }
 
 declare var CSSPageRule: {
@@ -816,42 +1314,42 @@ declare var CSSPageRule: {
 
 interface CSSRule {
     cssText: string;
-    parentRule: CSSRule;
-    parentStyleSheet: CSSStyleSheet;
-    type: number;
-    CHARSET_RULE: number;
-    FONT_FACE_RULE: number;
-    IMPORT_RULE: number;
-    KEYFRAMES_RULE: number;
-    KEYFRAME_RULE: number;
-    MEDIA_RULE: number;
-    NAMESPACE_RULE: number;
-    PAGE_RULE: number;
-    STYLE_RULE: number;
-    SUPPORTS_RULE: number;
-    UNKNOWN_RULE: number;
-    VIEWPORT_RULE: number;
+    readonly parentRule: CSSRule;
+    readonly parentStyleSheet: CSSStyleSheet;
+    readonly type: number;
+    readonly CHARSET_RULE: number;
+    readonly FONT_FACE_RULE: number;
+    readonly IMPORT_RULE: number;
+    readonly KEYFRAMES_RULE: number;
+    readonly KEYFRAME_RULE: number;
+    readonly MEDIA_RULE: number;
+    readonly NAMESPACE_RULE: number;
+    readonly PAGE_RULE: number;
+    readonly STYLE_RULE: number;
+    readonly SUPPORTS_RULE: number;
+    readonly UNKNOWN_RULE: number;
+    readonly VIEWPORT_RULE: number;
 }
 
 declare var CSSRule: {
     prototype: CSSRule;
     new(): CSSRule;
-    CHARSET_RULE: number;
-    FONT_FACE_RULE: number;
-    IMPORT_RULE: number;
-    KEYFRAMES_RULE: number;
-    KEYFRAME_RULE: number;
-    MEDIA_RULE: number;
-    NAMESPACE_RULE: number;
-    PAGE_RULE: number;
-    STYLE_RULE: number;
-    SUPPORTS_RULE: number;
-    UNKNOWN_RULE: number;
-    VIEWPORT_RULE: number;
+    readonly CHARSET_RULE: number;
+    readonly FONT_FACE_RULE: number;
+    readonly IMPORT_RULE: number;
+    readonly KEYFRAMES_RULE: number;
+    readonly KEYFRAME_RULE: number;
+    readonly MEDIA_RULE: number;
+    readonly NAMESPACE_RULE: number;
+    readonly PAGE_RULE: number;
+    readonly STYLE_RULE: number;
+    readonly SUPPORTS_RULE: number;
+    readonly UNKNOWN_RULE: number;
+    readonly VIEWPORT_RULE: number;
 }
 
 interface CSSRuleList {
-    length: number;
+    readonly length: number;
     item(index: number): CSSRule;
     [index: number]: CSSRule;
 }
@@ -984,7 +1482,7 @@ interface CSSStyleDeclaration {
     justifyContent: string;
     kerning: string;
     left: string;
-    length: number;
+    readonly length: number;
     letterSpacing: string;
     lightingColor: string;
     lineHeight: string;
@@ -1071,7 +1569,7 @@ interface CSSStyleDeclaration {
     pageBreakAfter: string;
     pageBreakBefore: string;
     pageBreakInside: string;
-    parentRule: CSSRule;
+    readonly parentRule: CSSRule;
     perspective: string;
     perspectiveOrigin: string;
     pointerEvents: string;
@@ -1096,7 +1594,6 @@ interface CSSStyleDeclaration {
     textAlignLast: string;
     textAnchor: string;
     textDecoration: string;
-    textFillColor: string;
     textIndent: string;
     textJustify: string;
     textKashida: string;
@@ -1132,25 +1629,12 @@ interface CSSStyleDeclaration {
     webkitAnimationTimingFunction: string;
     webkitAppearance: string;
     webkitBackfaceVisibility: string;
-    webkitBackground: string;
-    webkitBackgroundAttachment: string;
     webkitBackgroundClip: string;
-    webkitBackgroundColor: string;
-    webkitBackgroundImage: string;
     webkitBackgroundOrigin: string;
-    webkitBackgroundPosition: string;
-    webkitBackgroundPositionX: string;
-    webkitBackgroundPositionY: string;
-    webkitBackgroundRepeat: string;
     webkitBackgroundSize: string;
     webkitBorderBottomLeftRadius: string;
     webkitBorderBottomRightRadius: string;
     webkitBorderImage: string;
-    webkitBorderImageOutset: string;
-    webkitBorderImageRepeat: string;
-    webkitBorderImageSlice: string;
-    webkitBorderImageSource: string;
-    webkitBorderImageWidth: string;
     webkitBorderRadius: string;
     webkitBorderTopLeftRadius: string;
     webkitBorderTopRightRadius: string;
@@ -1196,6 +1680,7 @@ interface CSSStyleDeclaration {
     webkitTransitionDuration: string;
     webkitTransitionProperty: string;
     webkitTransitionTimingFunction: string;
+    webkitUserModify: string;
     webkitUserSelect: string;
     webkitWritingMode: string;
     whiteSpace: string;
@@ -1221,9 +1706,9 @@ declare var CSSStyleDeclaration: {
 }
 
 interface CSSStyleRule extends CSSRule {
-    readOnly: boolean;
+    readonly readOnly: boolean;
     selectorText: string;
-    style: CSSStyleDeclaration;
+    readonly style: CSSStyleDeclaration;
 }
 
 declare var CSSStyleRule: {
@@ -1232,18 +1717,18 @@ declare var CSSStyleRule: {
 }
 
 interface CSSStyleSheet extends StyleSheet {
-    cssRules: CSSRuleList;
+    readonly cssRules: CSSRuleList;
     cssText: string;
-    href: string;
-    id: string;
-    imports: StyleSheetList;
-    isAlternate: boolean;
-    isPrefAlternate: boolean;
-    ownerRule: CSSRule;
-    owningElement: Element;
-    pages: StyleSheetPageList;
-    readOnly: boolean;
-    rules: CSSRuleList;
+    readonly href: string;
+    readonly id: string;
+    readonly imports: StyleSheetList;
+    readonly isAlternate: boolean;
+    readonly isPrefAlternate: boolean;
+    readonly ownerRule: CSSRule;
+    readonly owningElement: Element;
+    readonly pages: StyleSheetPageList;
+    readonly readOnly: boolean;
+    readonly rules: CSSRuleList;
     addImport(bstrURL: string, lIndex?: number): number;
     addPageRule(bstrSelector: string, bstrStyle: string, lIndex?: number): number;
     addRule(bstrSelector: string, bstrStyle?: string, lIndex?: number): number;
@@ -1283,8 +1768,8 @@ declare var CanvasPattern: {
     new(): CanvasPattern;
 }
 
-interface CanvasRenderingContext2D {
-    canvas: HTMLCanvasElement;
+interface CanvasRenderingContext2D extends Object, CanvasPathMethods {
+    readonly canvas: HTMLCanvasElement;
     fillStyle: string | CanvasGradient | CanvasPattern;
     font: string;
     globalAlpha: number;
@@ -1303,13 +1788,9 @@ interface CanvasRenderingContext2D {
     strokeStyle: string | CanvasGradient | CanvasPattern;
     textAlign: string;
     textBaseline: string;
-    arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void;
-    arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void;
     beginPath(): void;
-    bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void;
     clearRect(x: number, y: number, w: number, h: number): void;
     clip(fillRule?: string): void;
-    closePath(): void;
     createImageData(imageDataOrSw: number | ImageData, sh?: number): ImageData;
     createLinearGradient(x0: number, y0: number, x1: number, y1: number): CanvasGradient;
     createPattern(image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, repetition: string): CanvasPattern;
@@ -1321,12 +1802,8 @@ interface CanvasRenderingContext2D {
     getImageData(sx: number, sy: number, sw: number, sh: number): ImageData;
     getLineDash(): number[];
     isPointInPath(x: number, y: number, fillRule?: string): boolean;
-    lineTo(x: number, y: number): void;
     measureText(text: string): TextMetrics;
-    moveTo(x: number, y: number): void;
     putImageData(imagedata: ImageData, dx: number, dy: number, dirtyX?: number, dirtyY?: number, dirtyWidth?: number, dirtyHeight?: number): void;
-    quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
-    rect(x: number, y: number, w: number, h: number): void;
     restore(): void;
     rotate(angle: number): void;
     save(): void;
@@ -1363,7 +1840,7 @@ declare var ChannelSplitterNode: {
 
 interface CharacterData extends Node, ChildNode {
     data: string;
-    length: number;
+    readonly length: number;
     appendData(arg: string): void;
     deleteData(offset: number, count: number): void;
     insertData(offset: number, arg: string): void;
@@ -1379,11 +1856,11 @@ declare var CharacterData: {
 
 interface ClientRect {
     bottom: number;
-    height: number;
+    readonly height: number;
     left: number;
     right: number;
     top: number;
-    width: number;
+    readonly width: number;
 }
 
 declare var ClientRect: {
@@ -1392,7 +1869,7 @@ declare var ClientRect: {
 }
 
 interface ClientRectList {
-    length: number;
+    readonly length: number;
     item(index: number): ClientRect;
     [index: number]: ClientRect;
 }
@@ -1403,7 +1880,7 @@ declare var ClientRectList: {
 }
 
 interface ClipboardEvent extends Event {
-    clipboardData: DataTransfer;
+    readonly clipboardData: DataTransfer;
 }
 
 declare var ClipboardEvent: {
@@ -1412,9 +1889,9 @@ declare var ClipboardEvent: {
 }
 
 interface CloseEvent extends Event {
-    code: number;
-    reason: string;
-    wasClean: boolean;
+    readonly code: number;
+    readonly reason: string;
+    readonly wasClean: boolean;
     initCloseEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, wasCleanArg: boolean, codeArg: number, reasonArg: string): void;
 }
 
@@ -1424,8 +1901,8 @@ declare var CloseEvent: {
 }
 
 interface CommandEvent extends Event {
-    commandName: string;
-    detail: string;
+    readonly commandName: string;
+    readonly detail: string;
 }
 
 declare var CommandEvent: {
@@ -1443,8 +1920,8 @@ declare var Comment: {
 }
 
 interface CompositionEvent extends UIEvent {
-    data: string;
-    locale: string;
+    readonly data: string;
+    readonly locale: string;
     initCompositionEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, dataArg: string, locale: string): void;
 }
 
@@ -1461,6 +1938,7 @@ interface Console {
     dir(value?: any, ...optionalParams: any[]): void;
     dirxml(value: any): void;
     error(message?: any, ...optionalParams: any[]): void;
+    exception(message?: string, ...optionalParams: any[]): void;
     group(groupTitle?: string): void;
     groupCollapsed(groupTitle?: string): void;
     groupEnd(): void;
@@ -1470,6 +1948,7 @@ interface Console {
     profile(reportName?: string): void;
     profileEnd(): void;
     select(element: Element): void;
+    table(...data: any[]): void;
     time(timerName?: string): void;
     timeEnd(timerName?: string): void;
     trace(message?: any, ...optionalParams: any[]): void;
@@ -1492,13 +1971,13 @@ declare var ConvolverNode: {
 }
 
 interface Coordinates {
-    accuracy: number;
-    altitude: number;
-    altitudeAccuracy: number;
-    heading: number;
-    latitude: number;
-    longitude: number;
-    speed: number;
+    readonly accuracy: number;
+    readonly altitude: number;
+    readonly altitudeAccuracy: number;
+    readonly heading: number;
+    readonly latitude: number;
+    readonly longitude: number;
+    readonly speed: number;
 }
 
 declare var Coordinates: {
@@ -1507,7 +1986,7 @@ declare var Coordinates: {
 }
 
 interface Crypto extends Object, RandomSource {
-    subtle: SubtleCrypto;
+    readonly subtle: SubtleCrypto;
 }
 
 declare var Crypto: {
@@ -1516,10 +1995,10 @@ declare var Crypto: {
 }
 
 interface CryptoKey {
-    algorithm: KeyAlgorithm;
-    extractable: boolean;
-    type: string;
-    usages: string[];
+    readonly algorithm: KeyAlgorithm;
+    readonly extractable: boolean;
+    readonly type: string;
+    readonly usages: string[];
 }
 
 declare var CryptoKey: {
@@ -1538,7 +2017,7 @@ declare var CryptoKeyPair: {
 }
 
 interface CustomEvent extends Event {
-    detail: any;
+    readonly detail: any;
     initCustomEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, detailArg: any): void;
 }
 
@@ -1548,7 +2027,7 @@ declare var CustomEvent: {
 }
 
 interface DOMError {
-    name: string;
+    readonly name: string;
     toString(): string;
 }
 
@@ -1558,69 +2037,69 @@ declare var DOMError: {
 }
 
 interface DOMException {
-    code: number;
-    message: string;
-    name: string;
+    readonly code: number;
+    readonly message: string;
+    readonly name: string;
     toString(): string;
-    ABORT_ERR: number;
-    DATA_CLONE_ERR: number;
-    DOMSTRING_SIZE_ERR: number;
-    HIERARCHY_REQUEST_ERR: number;
-    INDEX_SIZE_ERR: number;
-    INUSE_ATTRIBUTE_ERR: number;
-    INVALID_ACCESS_ERR: number;
-    INVALID_CHARACTER_ERR: number;
-    INVALID_MODIFICATION_ERR: number;
-    INVALID_NODE_TYPE_ERR: number;
-    INVALID_STATE_ERR: number;
-    NAMESPACE_ERR: number;
-    NETWORK_ERR: number;
-    NOT_FOUND_ERR: number;
-    NOT_SUPPORTED_ERR: number;
-    NO_DATA_ALLOWED_ERR: number;
-    NO_MODIFICATION_ALLOWED_ERR: number;
-    PARSE_ERR: number;
-    QUOTA_EXCEEDED_ERR: number;
-    SECURITY_ERR: number;
-    SERIALIZE_ERR: number;
-    SYNTAX_ERR: number;
-    TIMEOUT_ERR: number;
-    TYPE_MISMATCH_ERR: number;
-    URL_MISMATCH_ERR: number;
-    VALIDATION_ERR: number;
-    WRONG_DOCUMENT_ERR: number;
+    readonly ABORT_ERR: number;
+    readonly DATA_CLONE_ERR: number;
+    readonly DOMSTRING_SIZE_ERR: number;
+    readonly HIERARCHY_REQUEST_ERR: number;
+    readonly INDEX_SIZE_ERR: number;
+    readonly INUSE_ATTRIBUTE_ERR: number;
+    readonly INVALID_ACCESS_ERR: number;
+    readonly INVALID_CHARACTER_ERR: number;
+    readonly INVALID_MODIFICATION_ERR: number;
+    readonly INVALID_NODE_TYPE_ERR: number;
+    readonly INVALID_STATE_ERR: number;
+    readonly NAMESPACE_ERR: number;
+    readonly NETWORK_ERR: number;
+    readonly NOT_FOUND_ERR: number;
+    readonly NOT_SUPPORTED_ERR: number;
+    readonly NO_DATA_ALLOWED_ERR: number;
+    readonly NO_MODIFICATION_ALLOWED_ERR: number;
+    readonly PARSE_ERR: number;
+    readonly QUOTA_EXCEEDED_ERR: number;
+    readonly SECURITY_ERR: number;
+    readonly SERIALIZE_ERR: number;
+    readonly SYNTAX_ERR: number;
+    readonly TIMEOUT_ERR: number;
+    readonly TYPE_MISMATCH_ERR: number;
+    readonly URL_MISMATCH_ERR: number;
+    readonly VALIDATION_ERR: number;
+    readonly WRONG_DOCUMENT_ERR: number;
 }
 
 declare var DOMException: {
     prototype: DOMException;
     new(): DOMException;
-    ABORT_ERR: number;
-    DATA_CLONE_ERR: number;
-    DOMSTRING_SIZE_ERR: number;
-    HIERARCHY_REQUEST_ERR: number;
-    INDEX_SIZE_ERR: number;
-    INUSE_ATTRIBUTE_ERR: number;
-    INVALID_ACCESS_ERR: number;
-    INVALID_CHARACTER_ERR: number;
-    INVALID_MODIFICATION_ERR: number;
-    INVALID_NODE_TYPE_ERR: number;
-    INVALID_STATE_ERR: number;
-    NAMESPACE_ERR: number;
-    NETWORK_ERR: number;
-    NOT_FOUND_ERR: number;
-    NOT_SUPPORTED_ERR: number;
-    NO_DATA_ALLOWED_ERR: number;
-    NO_MODIFICATION_ALLOWED_ERR: number;
-    PARSE_ERR: number;
-    QUOTA_EXCEEDED_ERR: number;
-    SECURITY_ERR: number;
-    SERIALIZE_ERR: number;
-    SYNTAX_ERR: number;
-    TIMEOUT_ERR: number;
-    TYPE_MISMATCH_ERR: number;
-    URL_MISMATCH_ERR: number;
-    VALIDATION_ERR: number;
-    WRONG_DOCUMENT_ERR: number;
+    readonly ABORT_ERR: number;
+    readonly DATA_CLONE_ERR: number;
+    readonly DOMSTRING_SIZE_ERR: number;
+    readonly HIERARCHY_REQUEST_ERR: number;
+    readonly INDEX_SIZE_ERR: number;
+    readonly INUSE_ATTRIBUTE_ERR: number;
+    readonly INVALID_ACCESS_ERR: number;
+    readonly INVALID_CHARACTER_ERR: number;
+    readonly INVALID_MODIFICATION_ERR: number;
+    readonly INVALID_NODE_TYPE_ERR: number;
+    readonly INVALID_STATE_ERR: number;
+    readonly NAMESPACE_ERR: number;
+    readonly NETWORK_ERR: number;
+    readonly NOT_FOUND_ERR: number;
+    readonly NOT_SUPPORTED_ERR: number;
+    readonly NO_DATA_ALLOWED_ERR: number;
+    readonly NO_MODIFICATION_ALLOWED_ERR: number;
+    readonly PARSE_ERR: number;
+    readonly QUOTA_EXCEEDED_ERR: number;
+    readonly SECURITY_ERR: number;
+    readonly SERIALIZE_ERR: number;
+    readonly SYNTAX_ERR: number;
+    readonly TIMEOUT_ERR: number;
+    readonly TYPE_MISMATCH_ERR: number;
+    readonly URL_MISMATCH_ERR: number;
+    readonly VALIDATION_ERR: number;
+    readonly WRONG_DOCUMENT_ERR: number;
 }
 
 interface DOMImplementation {
@@ -1654,7 +2133,7 @@ declare var DOMSettableTokenList: {
 }
 
 interface DOMStringList {
-    length: number;
+    readonly length: number;
     contains(str: string): boolean;
     item(index: number): string;
     [index: number]: string;
@@ -1675,7 +2154,7 @@ declare var DOMStringMap: {
 }
 
 interface DOMTokenList {
-    length: number;
+    readonly length: number;
     add(...token: string[]): void;
     contains(token: string): boolean;
     item(index: number): string;
@@ -1702,9 +2181,9 @@ declare var DataCue: {
 interface DataTransfer {
     dropEffect: string;
     effectAllowed: string;
-    files: FileList;
-    items: DataTransferItemList;
-    types: DOMStringList;
+    readonly files: FileList;
+    readonly items: DataTransferItemList;
+    readonly types: DOMStringList;
     clearData(format?: string): boolean;
     getData(format: string): string;
     setData(format: string, data: string): boolean;
@@ -1716,8 +2195,8 @@ declare var DataTransfer: {
 }
 
 interface DataTransferItem {
-    kind: string;
-    type: string;
+    readonly kind: string;
+    readonly type: string;
     getAsFile(): File;
     getAsString(_callback: FunctionStringCallback): void;
 }
@@ -1728,7 +2207,7 @@ declare var DataTransferItem: {
 }
 
 interface DataTransferItemList {
-    length: number;
+    readonly length: number;
     add(data: File): DataTransferItem;
     clear(): void;
     item(index: number): DataTransferItem;
@@ -1742,9 +2221,9 @@ declare var DataTransferItemList: {
 }
 
 interface DeferredPermissionRequest {
-    id: number;
-    type: string;
-    uri: string;
+    readonly id: number;
+    readonly type: string;
+    readonly uri: string;
     allow(): void;
     deny(): void;
 }
@@ -1755,7 +2234,7 @@ declare var DeferredPermissionRequest: {
 }
 
 interface DelayNode extends AudioNode {
-    delayTime: AudioParam;
+    readonly delayTime: AudioParam;
 }
 
 declare var DelayNode: {
@@ -1764,9 +2243,9 @@ declare var DelayNode: {
 }
 
 interface DeviceAcceleration {
-    x: number;
-    y: number;
-    z: number;
+    readonly x: number;
+    readonly y: number;
+    readonly z: number;
 }
 
 declare var DeviceAcceleration: {
@@ -1774,11 +2253,20 @@ declare var DeviceAcceleration: {
     new(): DeviceAcceleration;
 }
 
+interface DeviceLightEvent extends Event {
+    readonly value: number;
+}
+
+declare var DeviceLightEvent: {
+    prototype: DeviceLightEvent;
+    new(type: string, eventInitDict?: DeviceLightEventInit): DeviceLightEvent;
+}
+
 interface DeviceMotionEvent extends Event {
-    acceleration: DeviceAcceleration;
-    accelerationIncludingGravity: DeviceAcceleration;
-    interval: number;
-    rotationRate: DeviceRotationRate;
+    readonly acceleration: DeviceAcceleration;
+    readonly accelerationIncludingGravity: DeviceAcceleration;
+    readonly interval: number;
+    readonly rotationRate: DeviceRotationRate;
     initDeviceMotionEvent(type: string, bubbles: boolean, cancelable: boolean, acceleration: DeviceAccelerationDict, accelerationIncludingGravity: DeviceAccelerationDict, rotationRate: DeviceRotationRateDict, interval: number): void;
 }
 
@@ -1788,10 +2276,10 @@ declare var DeviceMotionEvent: {
 }
 
 interface DeviceOrientationEvent extends Event {
-    absolute: boolean;
-    alpha: number;
-    beta: number;
-    gamma: number;
+    readonly absolute: boolean;
+    readonly alpha: number;
+    readonly beta: number;
+    readonly gamma: number;
     initDeviceOrientationEvent(type: string, bubbles: boolean, cancelable: boolean, alpha: number, beta: number, gamma: number, absolute: boolean): void;
 }
 
@@ -1801,9 +2289,9 @@ declare var DeviceOrientationEvent: {
 }
 
 interface DeviceRotationRate {
-    alpha: number;
-    beta: number;
-    gamma: number;
+    readonly alpha: number;
+    readonly beta: number;
+    readonly gamma: number;
 }
 
 declare var DeviceRotationRate: {
@@ -1815,15 +2303,15 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Sets or gets the URL for the current document. 
       */
-    URL: string;
+    readonly URL: string;
     /**
       * Gets the URL for the document, stripped of any character encoding.
       */
-    URLUnencoded: string;
+    readonly URLUnencoded: string;
     /**
       * Gets the object that has the focus when the parent document has focus.
       */
-    activeElement: Element;
+    readonly activeElement: Element;
     /**
       * Sets or gets the color of all active links in the document.
       */
@@ -1831,15 +2319,15 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Returns a reference to the collection of elements contained by the object.
       */
-    all: HTMLCollection;
+    readonly all: HTMLAllCollection;
     /**
       * Retrieves a collection of all a objects that have a name and/or id property. Objects in this collection are in HTML source order.
       */
-    anchors: HTMLCollection;
+    anchors: HTMLCollectionOf<HTMLAnchorElement>;
     /**
       * Retrieves a collection of all applet objects in the document.
       */
-    applets: HTMLCollection;
+    applets: HTMLCollectionOf<HTMLAppletElement>;
     /**
       * Deprecated. Sets or retrieves a value that indicates the background color behind the object. 
       */
@@ -1848,7 +2336,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Specifies the beginning and end of the document body.
       */
     body: HTMLElement;
-    characterSet: string;
+    readonly characterSet: string;
     /**
       * Gets or sets the character set used to encode the object.
       */
@@ -1856,13 +2344,14 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Gets a value that indicates whether standards-compliant mode is switched on for the object.
       */
-    compatMode: string;
+    readonly compatMode: string;
     cookie: string;
+    readonly currentScript: HTMLScriptElement | SVGScriptElement;
     /**
       * Gets the default character set from the current regional language settings.
       */
-    defaultCharset: string;
-    defaultView: Window;
+    readonly defaultCharset: string;
+    readonly defaultView: Window;
     /**
       * Sets or gets a value that indicates whether the document can be edited.
       */
@@ -1874,7 +2363,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Gets an object representing the document type declaration associated with the current document. 
       */
-    doctype: DocumentType;
+    readonly doctype: DocumentType;
     /**
       * Gets a reference to the root node of the document. 
       */
@@ -1886,7 +2375,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Retrieves a collection of all embed objects in the document.
       */
-    embeds: HTMLCollection;
+    embeds: HTMLCollectionOf<HTMLEmbedElement>;
     /**
       * Sets or gets the foreground (text) color of the document.
       */
@@ -1894,27 +2383,27 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Retrieves a collection, in source order, of all form objects in the document.
       */
-    forms: HTMLCollection;
-    fullscreenElement: Element;
-    fullscreenEnabled: boolean;
-    head: HTMLHeadElement;
-    hidden: boolean;
+    forms: HTMLCollectionOf<HTMLFormElement>;
+    readonly fullscreenElement: Element;
+    readonly fullscreenEnabled: boolean;
+    readonly head: HTMLHeadElement;
+    readonly hidden: boolean;
     /**
       * Retrieves a collection, in source order, of img objects in the document.
       */
-    images: HTMLCollection;
+    images: HTMLCollectionOf<HTMLImageElement>;
     /**
       * Gets the implementation object of the current document. 
       */
-    implementation: DOMImplementation;
+    readonly implementation: DOMImplementation;
     /**
       * Returns the character encoding used to create the webpage that is loaded into the document object.
       */
-    inputEncoding: string;
+    readonly inputEncoding: string;
     /**
       * Gets the date that the page was last modified, if the page supplies one. 
       */
-    lastModified: string;
+    readonly lastModified: string;
     /**
       * Sets or gets the color of the document links. 
       */
@@ -1922,16 +2411,13 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Retrieves a collection of all a objects that specify the href property and all area objects in the document.
       */
-    links: HTMLCollection;
+    links: HTMLCollectionOf<HTMLAnchorElement | HTMLAreaElement>;
     /**
       * Contains information about the current URL. 
       */
-    location: Location;
-    media: string;
+    readonly location: Location;
     msCSSOMElementFloatMetrics: boolean;
     msCapsLockWarningOff: boolean;
-    msHidden: boolean;
-    msVisibilityState: string;
     /**
       * Fires when the user aborts the download.
       * @param ev The event.
@@ -2033,7 +2519,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Occurs when the end of playback is reached. 
       * @param ev The event
       */
-    onended: (ev: Event) => any;
+    onended: (ev: MediaStreamErrorEvent) => any;
     /**
       * Fires when an error occurs during object loading.
       * @param ev The event.
@@ -2047,6 +2533,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     onfullscreenchange: (ev: Event) => any;
     onfullscreenerror: (ev: Event) => any;
     oninput: (ev: Event) => any;
+    oninvalid: (ev: Event) => any;
     /**
       * Fires when the user presses a key.
       * @param ev The keyboard event
@@ -2111,7 +2598,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Fires when the wheel button is rotated. 
       * @param ev The mouse event
       */
-    onmousewheel: (ev: MouseWheelEvent) => any;
+    onmousewheel: (ev: WheelEvent) => any;
     onmscontentzoom: (ev: UIEvent) => any;
     onmsgesturechange: (ev: MSGestureEvent) => any;
     onmsgesturedoubletap: (ev: MSGestureEvent) => any;
@@ -2196,6 +2683,11 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * @param ev The event.
       */
     onselect: (ev: UIEvent) => any;
+    /**
+      * Fires when the selection state of a document changes.
+      * @param ev The event.
+      */
+    onselectionchange: (ev: Event) => any;
     onselectstart: (ev: Event) => any;
     /**
       * Occurs when the download has stopped. 
@@ -2234,51 +2726,51 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     onwaiting: (ev: Event) => any;
     onwebkitfullscreenchange: (ev: Event) => any;
     onwebkitfullscreenerror: (ev: Event) => any;
-    plugins: HTMLCollection;
-    pointerLockElement: Element;
+    plugins: HTMLCollectionOf<HTMLEmbedElement>;
+    readonly pointerLockElement: Element;
     /**
       * Retrieves a value that indicates the current state of the object.
       */
-    readyState: string;
+    readonly readyState: string;
     /**
       * Gets the URL of the location that referred the user to the current page.
       */
-    referrer: string;
+    readonly referrer: string;
     /**
       * Gets the root svg element in the document hierarchy.
       */
-    rootElement: SVGSVGElement;
+    readonly rootElement: SVGSVGElement;
     /**
       * Retrieves a collection of all script objects in the document.
       */
-    scripts: HTMLCollection;
-    security: string;
+    scripts: HTMLCollectionOf<HTMLScriptElement>;
+    readonly scrollingElement: Element;
     /**
       * Retrieves a collection of styleSheet objects representing the style sheets that correspond to each instance of a link or style object in the document.
       */
-    styleSheets: StyleSheetList;
+    readonly styleSheets: StyleSheetList;
     /**
       * Contains the title of the document.
       */
     title: string;
-    visibilityState: string;
+    readonly visibilityState: string;
     /** 
       * Sets or gets the color of the links that the user has visited.
       */
     vlinkColor: string;
-    webkitCurrentFullScreenElement: Element;
-    webkitFullscreenElement: Element;
-    webkitFullscreenEnabled: boolean;
-    webkitIsFullScreen: boolean;
-    xmlEncoding: string;
+    readonly webkitCurrentFullScreenElement: Element;
+    readonly webkitFullscreenElement: Element;
+    readonly webkitFullscreenEnabled: boolean;
+    readonly webkitIsFullScreen: boolean;
+    readonly xmlEncoding: string;
     xmlStandalone: boolean;
     /**
       * Gets or sets the version attribute specified in the declaration of an XML document.
       */
     xmlVersion: string;
-    currentScript: HTMLScriptElement;
     adoptNode(source: Node): Node;
     captureEvents(): void;
+    caretRangeFromPoint(x: number, y: number): Range;
     clear(): void;
     /**
       * Closes an output stream and forces the sent data to display.
@@ -2305,37 +2797,24 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * @param tagName The name of an element.
       */
     createElement(tagName: "a"): HTMLAnchorElement;
-    createElement(tagName: "abbr"): HTMLPhraseElement;
-    createElement(tagName: "acronym"): HTMLPhraseElement;
-    createElement(tagName: "address"): HTMLBlockElement;
     createElement(tagName: "applet"): HTMLAppletElement;
     createElement(tagName: "area"): HTMLAreaElement;
     createElement(tagName: "audio"): HTMLAudioElement;
-    createElement(tagName: "b"): HTMLPhraseElement;
     createElement(tagName: "base"): HTMLBaseElement;
     createElement(tagName: "basefont"): HTMLBaseFontElement;
-    createElement(tagName: "bdo"): HTMLPhraseElement;
-    createElement(tagName: "big"): HTMLPhraseElement;
-    createElement(tagName: "blockquote"): HTMLBlockElement;
+    createElement(tagName: "blockquote"): HTMLQuoteElement;
     createElement(tagName: "body"): HTMLBodyElement;
     createElement(tagName: "br"): HTMLBRElement;
     createElement(tagName: "button"): HTMLButtonElement;
     createElement(tagName: "canvas"): HTMLCanvasElement;
     createElement(tagName: "caption"): HTMLTableCaptionElement;
-    createElement(tagName: "center"): HTMLBlockElement;
-    createElement(tagName: "cite"): HTMLPhraseElement;
-    createElement(tagName: "code"): HTMLPhraseElement;
     createElement(tagName: "col"): HTMLTableColElement;
     createElement(tagName: "colgroup"): HTMLTableColElement;
     createElement(tagName: "datalist"): HTMLDataListElement;
-    createElement(tagName: "dd"): HTMLDDElement;
     createElement(tagName: "del"): HTMLModElement;
-    createElement(tagName: "dfn"): HTMLPhraseElement;
     createElement(tagName: "dir"): HTMLDirectoryElement;
     createElement(tagName: "div"): HTMLDivElement;
     createElement(tagName: "dl"): HTMLDListElement;
-    createElement(tagName: "dt"): HTMLDTElement;
-    createElement(tagName: "em"): HTMLPhraseElement;
     createElement(tagName: "embed"): HTMLEmbedElement;
     createElement(tagName: "fieldset"): HTMLFieldSetElement;
     createElement(tagName: "font"): HTMLFontElement;
@@ -2351,52 +2830,41 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     createElement(tagName: "head"): HTMLHeadElement;
     createElement(tagName: "hr"): HTMLHRElement;
     createElement(tagName: "html"): HTMLHtmlElement;
-    createElement(tagName: "i"): HTMLPhraseElement;
     createElement(tagName: "iframe"): HTMLIFrameElement;
     createElement(tagName: "img"): HTMLImageElement;
     createElement(tagName: "input"): HTMLInputElement;
     createElement(tagName: "ins"): HTMLModElement;
-    createElement(tagName: "isindex"): HTMLIsIndexElement;
-    createElement(tagName: "kbd"): HTMLPhraseElement;
-    createElement(tagName: "keygen"): HTMLBlockElement;
+    createElement(tagName: "isindex"): HTMLUnknownElement;
     createElement(tagName: "label"): HTMLLabelElement;
     createElement(tagName: "legend"): HTMLLegendElement;
     createElement(tagName: "li"): HTMLLIElement;
     createElement(tagName: "link"): HTMLLinkElement;
-    createElement(tagName: "listing"): HTMLBlockElement;
+    createElement(tagName: "listing"): HTMLPreElement;
     createElement(tagName: "map"): HTMLMapElement;
     createElement(tagName: "marquee"): HTMLMarqueeElement;
     createElement(tagName: "menu"): HTMLMenuElement;
     createElement(tagName: "meta"): HTMLMetaElement;
-    createElement(tagName: "nextid"): HTMLNextIdElement;
-    createElement(tagName: "nobr"): HTMLPhraseElement;
+    createElement(tagName: "meter"): HTMLMeterElement;
+    createElement(tagName: "nextid"): HTMLUnknownElement;
     createElement(tagName: "object"): HTMLObjectElement;
     createElement(tagName: "ol"): HTMLOListElement;
     createElement(tagName: "optgroup"): HTMLOptGroupElement;
     createElement(tagName: "option"): HTMLOptionElement;
     createElement(tagName: "p"): HTMLParagraphElement;
     createElement(tagName: "param"): HTMLParamElement;
-    createElement(tagName: "plaintext"): HTMLBlockElement;
+    createElement(tagName: "picture"): HTMLPictureElement;
     createElement(tagName: "pre"): HTMLPreElement;
     createElement(tagName: "progress"): HTMLProgressElement;
     createElement(tagName: "q"): HTMLQuoteElement;
-    createElement(tagName: "rt"): HTMLPhraseElement;
-    createElement(tagName: "ruby"): HTMLPhraseElement;
-    createElement(tagName: "s"): HTMLPhraseElement;
-    createElement(tagName: "samp"): HTMLPhraseElement;
     createElement(tagName: "script"): HTMLScriptElement;
     createElement(tagName: "select"): HTMLSelectElement;
-    createElement(tagName: "small"): HTMLPhraseElement;
     createElement(tagName: "source"): HTMLSourceElement;
     createElement(tagName: "span"): HTMLSpanElement;
-    createElement(tagName: "strike"): HTMLPhraseElement;
-    createElement(tagName: "strong"): HTMLPhraseElement;
     createElement(tagName: "style"): HTMLStyleElement;
-    createElement(tagName: "sub"): HTMLPhraseElement;
-    createElement(tagName: "sup"): HTMLPhraseElement;
     createElement(tagName: "table"): HTMLTableElement;
     createElement(tagName: "tbody"): HTMLTableSectionElement;
     createElement(tagName: "td"): HTMLTableDataCellElement;
+    createElement(tagName: "template"): HTMLTemplateElement;
     createElement(tagName: "textarea"): HTMLTextAreaElement;
     createElement(tagName: "tfoot"): HTMLTableSectionElement;
     createElement(tagName: "th"): HTMLTableHeaderCellElement;
@@ -2404,13 +2872,10 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     createElement(tagName: "title"): HTMLTitleElement;
     createElement(tagName: "tr"): HTMLTableRowElement;
     createElement(tagName: "track"): HTMLTrackElement;
-    createElement(tagName: "tt"): HTMLPhraseElement;
-    createElement(tagName: "u"): HTMLPhraseElement;
     createElement(tagName: "ul"): HTMLUListElement;
-    createElement(tagName: "var"): HTMLPhraseElement;
     createElement(tagName: "video"): HTMLVideoElement;
     createElement(tagName: "x-ms-webview"): MSHTMLWebViewElement;
-    createElement(tagName: "xmp"): HTMLBlockElement;
+    createElement(tagName: "xmp"): HTMLPreElement;
     createElement(tagName: string): HTMLElement;
     createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "a"): SVGAElement
     createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "circle"): SVGCircleElement
@@ -2495,7 +2960,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * @param data String that specifies the nodeValue property of the text node.
       */
     createTextNode(data: string): Text;
-    createTouch(view: any, target: EventTarget, identifier: number, pageX: number, pageY: number, screenX: number, screenY: number): Touch;
+    createTouch(view: Window, target: EventTarget, identifier: number, pageX: number, pageY: number, screenX: number, screenY: number): Touch;
     createTouchList(...touches: Touch[]): TouchList;
     /**
       * Creates a TreeWalker object that you can use to traverse filtered lists of nodes or elements in a document.
@@ -2546,44 +3011,44 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * @param name Specifies the name of an element.
       */
     getElementsByTagName(tagname: "a"): NodeListOf<HTMLAnchorElement>;
-    getElementsByTagName(tagname: "abbr"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "acronym"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "address"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "abbr"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "acronym"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "address"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "applet"): NodeListOf<HTMLAppletElement>;
     getElementsByTagName(tagname: "area"): NodeListOf<HTMLAreaElement>;
     getElementsByTagName(tagname: "article"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "aside"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "audio"): NodeListOf<HTMLAudioElement>;
-    getElementsByTagName(tagname: "b"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "b"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "base"): NodeListOf<HTMLBaseElement>;
     getElementsByTagName(tagname: "basefont"): NodeListOf<HTMLBaseFontElement>;
-    getElementsByTagName(tagname: "bdo"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "big"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "blockquote"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "bdo"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "big"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "blockquote"): NodeListOf<HTMLQuoteElement>;
     getElementsByTagName(tagname: "body"): NodeListOf<HTMLBodyElement>;
     getElementsByTagName(tagname: "br"): NodeListOf<HTMLBRElement>;
     getElementsByTagName(tagname: "button"): NodeListOf<HTMLButtonElement>;
     getElementsByTagName(tagname: "canvas"): NodeListOf<HTMLCanvasElement>;
     getElementsByTagName(tagname: "caption"): NodeListOf<HTMLTableCaptionElement>;
-    getElementsByTagName(tagname: "center"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "center"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "circle"): NodeListOf<SVGCircleElement>;
-    getElementsByTagName(tagname: "cite"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "cite"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "clippath"): NodeListOf<SVGClipPathElement>;
-    getElementsByTagName(tagname: "code"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "code"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "col"): NodeListOf<HTMLTableColElement>;
     getElementsByTagName(tagname: "colgroup"): NodeListOf<HTMLTableColElement>;
     getElementsByTagName(tagname: "datalist"): NodeListOf<HTMLDataListElement>;
-    getElementsByTagName(tagname: "dd"): NodeListOf<HTMLDDElement>;
+    getElementsByTagName(tagname: "dd"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "defs"): NodeListOf<SVGDefsElement>;
     getElementsByTagName(tagname: "del"): NodeListOf<HTMLModElement>;
     getElementsByTagName(tagname: "desc"): NodeListOf<SVGDescElement>;
-    getElementsByTagName(tagname: "dfn"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "dfn"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "dir"): NodeListOf<HTMLDirectoryElement>;
     getElementsByTagName(tagname: "div"): NodeListOf<HTMLDivElement>;
     getElementsByTagName(tagname: "dl"): NodeListOf<HTMLDListElement>;
-    getElementsByTagName(tagname: "dt"): NodeListOf<HTMLDTElement>;
+    getElementsByTagName(tagname: "dt"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "ellipse"): NodeListOf<SVGEllipseElement>;
-    getElementsByTagName(tagname: "em"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "em"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "embed"): NodeListOf<HTMLEmbedElement>;
     getElementsByTagName(tagname: "feblend"): NodeListOf<SVGFEBlendElement>;
     getElementsByTagName(tagname: "fecolormatrix"): NodeListOf<SVGFEColorMatrixElement>;
@@ -2631,22 +3096,22 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     getElementsByTagName(tagname: "hgroup"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "hr"): NodeListOf<HTMLHRElement>;
     getElementsByTagName(tagname: "html"): NodeListOf<HTMLHtmlElement>;
-    getElementsByTagName(tagname: "i"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "i"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "iframe"): NodeListOf<HTMLIFrameElement>;
     getElementsByTagName(tagname: "image"): NodeListOf<SVGImageElement>;
     getElementsByTagName(tagname: "img"): NodeListOf<HTMLImageElement>;
     getElementsByTagName(tagname: "input"): NodeListOf<HTMLInputElement>;
     getElementsByTagName(tagname: "ins"): NodeListOf<HTMLModElement>;
-    getElementsByTagName(tagname: "isindex"): NodeListOf<HTMLIsIndexElement>;
-    getElementsByTagName(tagname: "kbd"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "keygen"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "isindex"): NodeListOf<HTMLUnknownElement>;
+    getElementsByTagName(tagname: "kbd"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "keygen"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "label"): NodeListOf<HTMLLabelElement>;
     getElementsByTagName(tagname: "legend"): NodeListOf<HTMLLegendElement>;
     getElementsByTagName(tagname: "li"): NodeListOf<HTMLLIElement>;
     getElementsByTagName(tagname: "line"): NodeListOf<SVGLineElement>;
     getElementsByTagName(tagname: "lineargradient"): NodeListOf<SVGLinearGradientElement>;
     getElementsByTagName(tagname: "link"): NodeListOf<HTMLLinkElement>;
-    getElementsByTagName(tagname: "listing"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "listing"): NodeListOf<HTMLPreElement>;
     getElementsByTagName(tagname: "map"): NodeListOf<HTMLMapElement>;
     getElementsByTagName(tagname: "mark"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "marker"): NodeListOf<SVGMarkerElement>;
@@ -2655,9 +3120,10 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     getElementsByTagName(tagname: "menu"): NodeListOf<HTMLMenuElement>;
     getElementsByTagName(tagname: "meta"): NodeListOf<HTMLMetaElement>;
     getElementsByTagName(tagname: "metadata"): NodeListOf<SVGMetadataElement>;
+    getElementsByTagName(tagname: "meter"): NodeListOf<HTMLMeterElement>;
     getElementsByTagName(tagname: "nav"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "nextid"): NodeListOf<HTMLNextIdElement>;
-    getElementsByTagName(tagname: "nobr"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "nextid"): NodeListOf<HTMLUnknownElement>;
+    getElementsByTagName(tagname: "nobr"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "noframes"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "noscript"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "object"): NodeListOf<HTMLObjectElement>;
@@ -2668,7 +3134,8 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     getElementsByTagName(tagname: "param"): NodeListOf<HTMLParamElement>;
     getElementsByTagName(tagname: "path"): NodeListOf<SVGPathElement>;
     getElementsByTagName(tagname: "pattern"): NodeListOf<SVGPatternElement>;
-    getElementsByTagName(tagname: "plaintext"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "picture"): NodeListOf<HTMLPictureElement>;
+    getElementsByTagName(tagname: "plaintext"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "polygon"): NodeListOf<SVGPolygonElement>;
     getElementsByTagName(tagname: "polyline"): NodeListOf<SVGPolylineElement>;
     getElementsByTagName(tagname: "pre"): NodeListOf<HTMLPreElement>;
@@ -2676,28 +3143,29 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     getElementsByTagName(tagname: "q"): NodeListOf<HTMLQuoteElement>;
     getElementsByTagName(tagname: "radialgradient"): NodeListOf<SVGRadialGradientElement>;
     getElementsByTagName(tagname: "rect"): NodeListOf<SVGRectElement>;
-    getElementsByTagName(tagname: "rt"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "ruby"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "s"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "samp"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "rt"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "ruby"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "s"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "samp"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "script"): NodeListOf<HTMLScriptElement>;
     getElementsByTagName(tagname: "section"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "select"): NodeListOf<HTMLSelectElement>;
-    getElementsByTagName(tagname: "small"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "small"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "source"): NodeListOf<HTMLSourceElement>;
     getElementsByTagName(tagname: "span"): NodeListOf<HTMLSpanElement>;
     getElementsByTagName(tagname: "stop"): NodeListOf<SVGStopElement>;
-    getElementsByTagName(tagname: "strike"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "strong"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "strike"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "strong"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "style"): NodeListOf<HTMLStyleElement>;
-    getElementsByTagName(tagname: "sub"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "sup"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "sub"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "sup"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "svg"): NodeListOf<SVGSVGElement>;
     getElementsByTagName(tagname: "switch"): NodeListOf<SVGSwitchElement>;
     getElementsByTagName(tagname: "symbol"): NodeListOf<SVGSymbolElement>;
     getElementsByTagName(tagname: "table"): NodeListOf<HTMLTableElement>;
     getElementsByTagName(tagname: "tbody"): NodeListOf<HTMLTableSectionElement>;
     getElementsByTagName(tagname: "td"): NodeListOf<HTMLTableDataCellElement>;
+    getElementsByTagName(tagname: "template"): NodeListOf<HTMLTemplateElement>;
     getElementsByTagName(tagname: "text"): NodeListOf<SVGTextElement>;
     getElementsByTagName(tagname: "textpath"): NodeListOf<SVGTextPathElement>;
     getElementsByTagName(tagname: "textarea"): NodeListOf<HTMLTextAreaElement>;
@@ -2708,16 +3176,16 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     getElementsByTagName(tagname: "tr"): NodeListOf<HTMLTableRowElement>;
     getElementsByTagName(tagname: "track"): NodeListOf<HTMLTrackElement>;
     getElementsByTagName(tagname: "tspan"): NodeListOf<SVGTSpanElement>;
-    getElementsByTagName(tagname: "tt"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "u"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "tt"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "u"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "ul"): NodeListOf<HTMLUListElement>;
     getElementsByTagName(tagname: "use"): NodeListOf<SVGUseElement>;
-    getElementsByTagName(tagname: "var"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "var"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "video"): NodeListOf<HTMLVideoElement>;
     getElementsByTagName(tagname: "view"): NodeListOf<SVGViewElement>;
     getElementsByTagName(tagname: "wbr"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "x-ms-webview"): NodeListOf<MSHTMLWebViewElement>;
-    getElementsByTagName(tagname: "xmp"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "xmp"): NodeListOf<HTMLPreElement>;
     getElementsByTagName(tagname: string): NodeListOf<Element>;
     getElementsByTagNameNS(namespaceURI: string, localName: string): NodeListOf<Element>;
     /**
@@ -2729,8 +3197,8 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       */
     hasFocus(): boolean;
     importNode(importedNode: Node, deep: boolean): Node;
-    msElementsFromPoint(x: number, y: number): NodeList;
-    msElementsFromRect(left: number, top: number, width: number, height: number): NodeList;
+    msElementsFromPoint(x: number, y: number): NodeListOf<Element>;
+    msElementsFromRect(left: number, top: number, width: number, height: number): NodeListOf<Element>;
     /**
       * Opens a new window and loads a document specified by a given URL. Also, opens a new window that uses the url parameter and the name parameter to collect the output of the write method and the writeln method.
       * @param url Specifies a MIME type for the document.
@@ -2826,12 +3294,13 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "fullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "fullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -2844,7 +3313,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mssitemodejumplistitemremoved", listener: (ev: MSSiteModeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "msthumbnailclick", listener: (ev: MSSiteModeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -2868,6 +3337,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "selectionchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "selectstart", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "stop", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -2901,12 +3371,12 @@ declare var DocumentFragment: {
 }
 
 interface DocumentType extends Node, ChildNode {
-    entities: NamedNodeMap;
-    internalSubset: string;
-    name: string;
-    notations: NamedNodeMap;
-    publicId: string;
-    systemId: string;
+    readonly entities: NamedNodeMap;
+    readonly internalSubset: string;
+    readonly name: string;
+    readonly notations: NamedNodeMap;
+    readonly publicId: string;
+    readonly systemId: string;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -2916,7 +3386,7 @@ declare var DocumentType: {
 }
 
 interface DragEvent extends MouseEvent {
-    dataTransfer: DataTransfer;
+    readonly dataTransfer: DataTransfer;
     initDragEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget, dataTransferArg: DataTransfer): void;
     msConvertURL(file: File, targetType: string, targetURL?: string): void;
 }
@@ -2927,12 +3397,12 @@ declare var DragEvent: {
 }
 
 interface DynamicsCompressorNode extends AudioNode {
-    attack: AudioParam;
-    knee: AudioParam;
-    ratio: AudioParam;
-    reduction: AudioParam;
-    release: AudioParam;
-    threshold: AudioParam;
+    readonly attack: AudioParam;
+    readonly knee: AudioParam;
+    readonly ratio: AudioParam;
+    readonly reduction: AudioParam;
+    readonly release: AudioParam;
+    readonly threshold: AudioParam;
 }
 
 declare var DynamicsCompressorNode: {
@@ -2940,26 +3410,36 @@ declare var DynamicsCompressorNode: {
     new(): DynamicsCompressorNode;
 }
 
+interface EXT_frag_depth {
+}
+
+declare var EXT_frag_depth: {
+    prototype: EXT_frag_depth;
+    new(): EXT_frag_depth;
+}
+
 interface EXT_texture_filter_anisotropic {
-    MAX_TEXTURE_MAX_ANISOTROPY_EXT: number;
-    TEXTURE_MAX_ANISOTROPY_EXT: number;
+    readonly MAX_TEXTURE_MAX_ANISOTROPY_EXT: number;
+    readonly TEXTURE_MAX_ANISOTROPY_EXT: number;
 }
 
 declare var EXT_texture_filter_anisotropic: {
     prototype: EXT_texture_filter_anisotropic;
     new(): EXT_texture_filter_anisotropic;
-    MAX_TEXTURE_MAX_ANISOTROPY_EXT: number;
-    TEXTURE_MAX_ANISOTROPY_EXT: number;
+    readonly MAX_TEXTURE_MAX_ANISOTROPY_EXT: number;
+    readonly TEXTURE_MAX_ANISOTROPY_EXT: number;
 }
 
 interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelector, ChildNode {
-    classList: DOMTokenList;
-    clientHeight: number;
-    clientLeft: number;
-    clientTop: number;
-    clientWidth: number;
+    readonly classList: DOMTokenList;
+    className: string;
+    readonly clientHeight: number;
+    readonly clientLeft: number;
+    readonly clientTop: number;
+    readonly clientWidth: number;
+    id: string;
     msContentZoomFactor: number;
-    msRegionOverflow: string;
+    readonly msRegionOverflow: string;
     onariarequest: (ev: AriaRequestEvent) => any;
     oncommand: (ev: CommandEvent) => any;
     ongotpointercapture: (ev: PointerEvent) => any;
@@ -2987,13 +3467,12 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     ontouchstart: (ev: TouchEvent) => any;
     onwebkitfullscreenchange: (ev: Event) => any;
     onwebkitfullscreenerror: (ev: Event) => any;
-    scrollHeight: number;
+    readonly prefix: string;
+    readonly scrollHeight: number;
     scrollLeft: number;
     scrollTop: number;
-    scrollWidth: number;
-    tagName: string;
-    id: string;
-    className: string;
+    readonly scrollWidth: number;
+    readonly tagName: string;
     innerHTML: string;
     getAttribute(name?: string): string;
     getAttributeNS(namespaceURI: string, localName: string): string;
@@ -3002,44 +3481,44 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     getBoundingClientRect(): ClientRect;
     getClientRects(): ClientRectList;
     getElementsByTagName(name: "a"): NodeListOf<HTMLAnchorElement>;
-    getElementsByTagName(name: "abbr"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "acronym"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "address"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "abbr"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "acronym"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "address"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "applet"): NodeListOf<HTMLAppletElement>;
     getElementsByTagName(name: "area"): NodeListOf<HTMLAreaElement>;
     getElementsByTagName(name: "article"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "aside"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "audio"): NodeListOf<HTMLAudioElement>;
-    getElementsByTagName(name: "b"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "b"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "base"): NodeListOf<HTMLBaseElement>;
     getElementsByTagName(name: "basefont"): NodeListOf<HTMLBaseFontElement>;
-    getElementsByTagName(name: "bdo"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "big"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "blockquote"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "bdo"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "big"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "blockquote"): NodeListOf<HTMLQuoteElement>;
     getElementsByTagName(name: "body"): NodeListOf<HTMLBodyElement>;
     getElementsByTagName(name: "br"): NodeListOf<HTMLBRElement>;
     getElementsByTagName(name: "button"): NodeListOf<HTMLButtonElement>;
     getElementsByTagName(name: "canvas"): NodeListOf<HTMLCanvasElement>;
     getElementsByTagName(name: "caption"): NodeListOf<HTMLTableCaptionElement>;
-    getElementsByTagName(name: "center"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "center"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "circle"): NodeListOf<SVGCircleElement>;
-    getElementsByTagName(name: "cite"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "cite"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "clippath"): NodeListOf<SVGClipPathElement>;
-    getElementsByTagName(name: "code"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "code"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "col"): NodeListOf<HTMLTableColElement>;
     getElementsByTagName(name: "colgroup"): NodeListOf<HTMLTableColElement>;
     getElementsByTagName(name: "datalist"): NodeListOf<HTMLDataListElement>;
-    getElementsByTagName(name: "dd"): NodeListOf<HTMLDDElement>;
+    getElementsByTagName(name: "dd"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "defs"): NodeListOf<SVGDefsElement>;
     getElementsByTagName(name: "del"): NodeListOf<HTMLModElement>;
     getElementsByTagName(name: "desc"): NodeListOf<SVGDescElement>;
-    getElementsByTagName(name: "dfn"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "dfn"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "dir"): NodeListOf<HTMLDirectoryElement>;
     getElementsByTagName(name: "div"): NodeListOf<HTMLDivElement>;
     getElementsByTagName(name: "dl"): NodeListOf<HTMLDListElement>;
-    getElementsByTagName(name: "dt"): NodeListOf<HTMLDTElement>;
+    getElementsByTagName(name: "dt"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "ellipse"): NodeListOf<SVGEllipseElement>;
-    getElementsByTagName(name: "em"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "em"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "embed"): NodeListOf<HTMLEmbedElement>;
     getElementsByTagName(name: "feblend"): NodeListOf<SVGFEBlendElement>;
     getElementsByTagName(name: "fecolormatrix"): NodeListOf<SVGFEColorMatrixElement>;
@@ -3087,22 +3566,22 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     getElementsByTagName(name: "hgroup"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "hr"): NodeListOf<HTMLHRElement>;
     getElementsByTagName(name: "html"): NodeListOf<HTMLHtmlElement>;
-    getElementsByTagName(name: "i"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "i"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "iframe"): NodeListOf<HTMLIFrameElement>;
     getElementsByTagName(name: "image"): NodeListOf<SVGImageElement>;
     getElementsByTagName(name: "img"): NodeListOf<HTMLImageElement>;
     getElementsByTagName(name: "input"): NodeListOf<HTMLInputElement>;
     getElementsByTagName(name: "ins"): NodeListOf<HTMLModElement>;
-    getElementsByTagName(name: "isindex"): NodeListOf<HTMLIsIndexElement>;
-    getElementsByTagName(name: "kbd"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "keygen"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "isindex"): NodeListOf<HTMLUnknownElement>;
+    getElementsByTagName(name: "kbd"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "keygen"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "label"): NodeListOf<HTMLLabelElement>;
     getElementsByTagName(name: "legend"): NodeListOf<HTMLLegendElement>;
     getElementsByTagName(name: "li"): NodeListOf<HTMLLIElement>;
     getElementsByTagName(name: "line"): NodeListOf<SVGLineElement>;
     getElementsByTagName(name: "lineargradient"): NodeListOf<SVGLinearGradientElement>;
     getElementsByTagName(name: "link"): NodeListOf<HTMLLinkElement>;
-    getElementsByTagName(name: "listing"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "listing"): NodeListOf<HTMLPreElement>;
     getElementsByTagName(name: "map"): NodeListOf<HTMLMapElement>;
     getElementsByTagName(name: "mark"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "marker"): NodeListOf<SVGMarkerElement>;
@@ -3111,9 +3590,10 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     getElementsByTagName(name: "menu"): NodeListOf<HTMLMenuElement>;
     getElementsByTagName(name: "meta"): NodeListOf<HTMLMetaElement>;
     getElementsByTagName(name: "metadata"): NodeListOf<SVGMetadataElement>;
+    getElementsByTagName(name: "meter"): NodeListOf<HTMLMeterElement>;
     getElementsByTagName(name: "nav"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "nextid"): NodeListOf<HTMLNextIdElement>;
-    getElementsByTagName(name: "nobr"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "nextid"): NodeListOf<HTMLUnknownElement>;
+    getElementsByTagName(name: "nobr"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "noframes"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "noscript"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "object"): NodeListOf<HTMLObjectElement>;
@@ -3124,7 +3604,8 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     getElementsByTagName(name: "param"): NodeListOf<HTMLParamElement>;
     getElementsByTagName(name: "path"): NodeListOf<SVGPathElement>;
     getElementsByTagName(name: "pattern"): NodeListOf<SVGPatternElement>;
-    getElementsByTagName(name: "plaintext"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "picture"): NodeListOf<HTMLPictureElement>;
+    getElementsByTagName(name: "plaintext"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "polygon"): NodeListOf<SVGPolygonElement>;
     getElementsByTagName(name: "polyline"): NodeListOf<SVGPolylineElement>;
     getElementsByTagName(name: "pre"): NodeListOf<HTMLPreElement>;
@@ -3132,28 +3613,29 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     getElementsByTagName(name: "q"): NodeListOf<HTMLQuoteElement>;
     getElementsByTagName(name: "radialgradient"): NodeListOf<SVGRadialGradientElement>;
     getElementsByTagName(name: "rect"): NodeListOf<SVGRectElement>;
-    getElementsByTagName(name: "rt"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "ruby"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "s"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "samp"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "rt"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "ruby"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "s"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "samp"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "script"): NodeListOf<HTMLScriptElement>;
     getElementsByTagName(name: "section"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "select"): NodeListOf<HTMLSelectElement>;
-    getElementsByTagName(name: "small"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "small"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "source"): NodeListOf<HTMLSourceElement>;
     getElementsByTagName(name: "span"): NodeListOf<HTMLSpanElement>;
     getElementsByTagName(name: "stop"): NodeListOf<SVGStopElement>;
-    getElementsByTagName(name: "strike"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "strong"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "strike"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "strong"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "style"): NodeListOf<HTMLStyleElement>;
-    getElementsByTagName(name: "sub"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "sup"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "sub"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "sup"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "svg"): NodeListOf<SVGSVGElement>;
     getElementsByTagName(name: "switch"): NodeListOf<SVGSwitchElement>;
     getElementsByTagName(name: "symbol"): NodeListOf<SVGSymbolElement>;
     getElementsByTagName(name: "table"): NodeListOf<HTMLTableElement>;
     getElementsByTagName(name: "tbody"): NodeListOf<HTMLTableSectionElement>;
     getElementsByTagName(name: "td"): NodeListOf<HTMLTableDataCellElement>;
+    getElementsByTagName(name: "template"): NodeListOf<HTMLTemplateElement>;
     getElementsByTagName(name: "text"): NodeListOf<SVGTextElement>;
     getElementsByTagName(name: "textpath"): NodeListOf<SVGTextPathElement>;
     getElementsByTagName(name: "textarea"): NodeListOf<HTMLTextAreaElement>;
@@ -3164,16 +3646,16 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     getElementsByTagName(name: "tr"): NodeListOf<HTMLTableRowElement>;
     getElementsByTagName(name: "track"): NodeListOf<HTMLTrackElement>;
     getElementsByTagName(name: "tspan"): NodeListOf<SVGTSpanElement>;
-    getElementsByTagName(name: "tt"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "u"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "tt"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "u"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "ul"): NodeListOf<HTMLUListElement>;
     getElementsByTagName(name: "use"): NodeListOf<SVGUseElement>;
-    getElementsByTagName(name: "var"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "var"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "video"): NodeListOf<HTMLVideoElement>;
     getElementsByTagName(name: "view"): NodeListOf<SVGViewElement>;
     getElementsByTagName(name: "wbr"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "x-ms-webview"): NodeListOf<MSHTMLWebViewElement>;
-    getElementsByTagName(name: "xmp"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "xmp"): NodeListOf<HTMLPreElement>;
     getElementsByTagName(name: string): NodeListOf<Element>;
     getElementsByTagNameNS(namespaceURI: string, localName: string): NodeListOf<Element>;
     hasAttribute(name: string): boolean;
@@ -3246,11 +3728,11 @@ declare var Element: {
 }
 
 interface ErrorEvent extends Event {
-    colno: number;
-    error: any;
-    filename: string;
-    lineno: number;
-    message: string;
+    readonly colno: number;
+    readonly error: any;
+    readonly filename: string;
+    readonly lineno: number;
+    readonly message: string;
     initErrorEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, messageArg: string, filenameArg: string, linenoArg: number): void;
 }
 
@@ -3260,39 +3742,39 @@ declare var ErrorEvent: {
 }
 
 interface Event {
-    bubbles: boolean;
+    readonly bubbles: boolean;
     cancelBubble: boolean;
-    cancelable: boolean;
-    currentTarget: EventTarget;
-    defaultPrevented: boolean;
-    eventPhase: number;
-    isTrusted: boolean;
+    readonly cancelable: boolean;
+    readonly currentTarget: EventTarget;
+    readonly defaultPrevented: boolean;
+    readonly eventPhase: number;
+    readonly isTrusted: boolean;
     returnValue: boolean;
-    srcElement: Element;
-    target: EventTarget;
-    timeStamp: number;
-    type: string;
+    readonly srcElement: Element;
+    readonly target: EventTarget;
+    readonly timeStamp: number;
+    readonly type: string;
     initEvent(eventTypeArg: string, canBubbleArg: boolean, cancelableArg: boolean): void;
     preventDefault(): void;
     stopImmediatePropagation(): void;
     stopPropagation(): void;
-    AT_TARGET: number;
-    BUBBLING_PHASE: number;
-    CAPTURING_PHASE: number;
+    readonly AT_TARGET: number;
+    readonly BUBBLING_PHASE: number;
+    readonly CAPTURING_PHASE: number;
 }
 
 declare var Event: {
     prototype: Event;
     new(type: string, eventInitDict?: EventInit): Event;
-    AT_TARGET: number;
-    BUBBLING_PHASE: number;
-    CAPTURING_PHASE: number;
+    readonly AT_TARGET: number;
+    readonly BUBBLING_PHASE: number;
+    readonly CAPTURING_PHASE: number;
 }
 
 interface EventTarget {
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
     dispatchEvent(evt: Event): boolean;
-    removeEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var EventTarget: {
@@ -3309,8 +3791,9 @@ declare var External: {
 }
 
 interface File extends Blob {
-    lastModifiedDate: any;
-    name: string;
+    readonly lastModifiedDate: any;
+    readonly name: string;
+    readonly webkitRelativePath: string;
 }
 
 declare var File: {
@@ -3319,7 +3802,7 @@ declare var File: {
 }
 
 interface FileList {
-    length: number;
+    readonly length: number;
     item(index: number): File;
     [index: number]: File;
 }
@@ -3330,7 +3813,7 @@ declare var FileList: {
 }
 
 interface FileReader extends EventTarget, MSBaseReader {
-    error: DOMError;
+    readonly error: DOMError;
     readAsArrayBuffer(blob: Blob): void;
     readAsBinaryString(blob: Blob): void;
     readAsDataURL(blob: Blob): void;
@@ -3344,7 +3827,7 @@ declare var FileReader: {
 }
 
 interface FocusEvent extends UIEvent {
-    relatedTarget: EventTarget;
+    readonly relatedTarget: EventTarget;
     initFocusEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, relatedTargetArg: EventTarget): void;
 }
 
@@ -3363,7 +3846,7 @@ declare var FormData: {
 }
 
 interface GainNode extends AudioNode {
-    gain: AudioParam;
+    readonly gain: AudioParam;
 }
 
 declare var GainNode: {
@@ -3372,13 +3855,13 @@ declare var GainNode: {
 }
 
 interface Gamepad {
-    axes: number[];
-    buttons: GamepadButton[];
-    connected: boolean;
-    id: string;
-    index: number;
-    mapping: string;
-    timestamp: number;
+    readonly axes: number[];
+    readonly buttons: GamepadButton[];
+    readonly connected: boolean;
+    readonly id: string;
+    readonly index: number;
+    readonly mapping: string;
+    readonly timestamp: number;
 }
 
 declare var Gamepad: {
@@ -3387,8 +3870,8 @@ declare var Gamepad: {
 }
 
 interface GamepadButton {
-    pressed: boolean;
-    value: number;
+    readonly pressed: boolean;
+    readonly value: number;
 }
 
 declare var GamepadButton: {
@@ -3397,7 +3880,7 @@ declare var GamepadButton: {
 }
 
 interface GamepadEvent extends Event {
-    gamepad: Gamepad;
+    readonly gamepad: Gamepad;
 }
 
 declare var GamepadEvent: {
@@ -3435,6 +3918,7 @@ interface HTMLAnchorElement extends HTMLElement {
       * Sets or retrieves the coordinates of the object.
       */
     coords: string;
+    download: string;
     /**
       * Contains the anchor portion of the URL including the hash sign (#).
       */
@@ -3455,12 +3939,12 @@ interface HTMLAnchorElement extends HTMLElement {
       * Sets or retrieves the language code of the object.
       */
     hreflang: string;
-    mimeType: string;
+    readonly mimeType: string;
     /**
       * Sets or retrieves the shape of the object.
       */
     name: string;
-    nameProp: string;
+    readonly nameProp: string;
     /**
       * Contains the pathname of the URL.
       */
@@ -3473,7 +3957,7 @@ interface HTMLAnchorElement extends HTMLElement {
       * Contains the protocol of the URL.
       */
     protocol: string;
-    protocolLong: string;
+    readonly protocolLong: string;
     /**
       * Sets or retrieves the relationship between the object and the destination of the link.
       */
@@ -3515,7 +3999,7 @@ interface HTMLAppletElement extends HTMLElement {
     /**
       * Retrieves a string of the URL where the object tag can be found. This is often the href of the document that the object is in, or the value set by a base element.
       */
-    BaseHref: string;
+    readonly BaseHref: string;
     align: string;
     /**
       * Sets or retrieves a text alternative to the graphic.
@@ -3542,7 +4026,7 @@ interface HTMLAppletElement extends HTMLElement {
     /**
       * Address of a pointer to the document this page or frame contains. If there is no document, then null will be returned.
       */
-    contentDocument: Document;
+    readonly contentDocument: Document;
     /**
       * Sets or retrieves the URL that references the data of the object.
       */
@@ -3551,7 +4035,7 @@ interface HTMLAppletElement extends HTMLElement {
       * Sets or retrieves a character string that can be used to implement your own declare functionality for the object.
       */
     declare: boolean;
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the height of the object.
       */
@@ -3592,6 +4076,7 @@ interface HTMLAreaElement extends HTMLElement {
       * Sets or retrieves the coordinates of the object.
       */
     coords: string;
+    download: string;
     /**
       * Sets or retrieves the subsection of the href property that follows the number sign (#).
       */
@@ -3717,23 +4202,6 @@ declare var HTMLBaseFontElement: {
     new(): HTMLBaseFontElement;
 }
 
-interface HTMLBlockElement extends HTMLElement {
-    /**
-      * Sets or retrieves reference information about the object.
-      */
-    cite: string;
-    clear: string;
-    /**
-      * Sets or retrieves the width of the object.
-      */
-    width: number;
-}
-
-declare var HTMLBlockElement: {
-    prototype: HTMLBlockElement;
-    new(): HTMLBlockElement;
-}
-
 interface HTMLBodyElement extends HTMLElement {
     aLink: any;
     background: string;
@@ -3761,7 +4229,6 @@ interface HTMLBodyElement extends HTMLElement {
     onunload: (ev: Event) => any;
     text: any;
     vLink: any;
-    createTextRange(): TextRange;
     addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -3786,10 +4253,10 @@ interface HTMLBodyElement extends HTMLElement {
     addEventListener(type: "afterprint", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeprint", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeunload", listener: (ev: BeforeUnloadEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
@@ -3800,9 +4267,9 @@ interface HTMLBodyElement extends HTMLElement {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -3814,7 +4281,7 @@ interface HTMLBodyElement extends HTMLElement {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
@@ -3822,6 +4289,7 @@ interface HTMLBodyElement extends HTMLElement {
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "hashchange", listener: (ev: HashChangeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -3839,13 +4307,13 @@ interface HTMLBodyElement extends HTMLElement {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "offline", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "online", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "orientationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "pagehide", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pageshow", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -3899,7 +4367,7 @@ interface HTMLButtonElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Overrides the action attribute (where the data on a form is sent) on the parent form element.
       */
@@ -3932,11 +4400,11 @@ interface HTMLButtonElement extends HTMLElement {
     /**
       * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
       */
-    validationMessage: string;
+    readonly validationMessage: string;
     /**
       * Returns a  ValidityState object that represents the validity states of an element.
       */
-    validity: ValidityState;
+    readonly validity: ValidityState;
     /** 
       * Sets or retrieves the default or selected value of the control.
       */
@@ -3944,15 +4412,11 @@ interface HTMLButtonElement extends HTMLElement {
     /**
       * Returns whether an element will successfully validate based on forms validation rules and constraints.
       */
-    willValidate: boolean;
+    readonly willValidate: boolean;
     /**
       * Returns whether a form will validate when it is submitted, without having to submit it.
       */
     checkValidity(): boolean;
-    /**
-      * Creates a TextRange object for the element.
-      */
-    createTextRange(): TextRange;
     /**
       * Sets a custom error message that is displayed when a form is submitted.
       * @param error Sets a custom error message that is displayed when a form is submitted.
@@ -4002,11 +4466,11 @@ interface HTMLCollection {
     /**
       * Sets or retrieves the number of objects in a collection.
       */
-    length: number;
+    readonly length: number;
     /**
       * Retrieves an object from various collections.
       */
-    item(nameOrIndex?: any, optionalIndex?: any): Element;
+    item(index: number): Element;
     /**
       * Retrieves a select object or an object from an options collection.
       */
@@ -4019,18 +4483,6 @@ declare var HTMLCollection: {
     new(): HTMLCollection;
 }
 
-interface HTMLDDElement extends HTMLElement {
-    /**
-      * Sets or retrieves whether the browser automatically performs wordwrap.
-      */
-    noWrap: boolean;
-}
-
-declare var HTMLDDElement: {
-    prototype: HTMLDDElement;
-    new(): HTMLDDElement;
-}
-
 interface HTMLDListElement extends HTMLElement {
     compact: boolean;
 }
@@ -4040,20 +4492,8 @@ declare var HTMLDListElement: {
     new(): HTMLDListElement;
 }
 
-interface HTMLDTElement extends HTMLElement {
-    /**
-      * Sets or retrieves whether the browser automatically performs wordwrap.
-      */
-    noWrap: boolean;
-}
-
-declare var HTMLDTElement: {
-    prototype: HTMLDTElement;
-    new(): HTMLDTElement;
-}
-
 interface HTMLDataListElement extends HTMLElement {
-    options: HTMLCollection;
+    options: HTMLCollectionOf<HTMLOptionElement>;
 }
 
 declare var HTMLDataListElement: {
@@ -4096,38 +4536,38 @@ declare var HTMLDocument: {
 
 interface HTMLElement extends Element {
     accessKey: string;
-    children: HTMLCollection;
+    readonly children: HTMLCollection;
     contentEditable: string;
-    dataset: DOMStringMap;
+    readonly dataset: DOMStringMap;
     dir: string;
     draggable: boolean;
     hidden: boolean;
     hideFocus: boolean;
     innerHTML: string;
     innerText: string;
-    isContentEditable: boolean;
+    readonly isContentEditable: boolean;
     lang: string;
-    offsetHeight: number;
-    offsetLeft: number;
-    offsetParent: Element;
-    offsetTop: number;
-    offsetWidth: number;
+    readonly offsetHeight: number;
+    readonly offsetLeft: number;
+    readonly offsetParent: Element;
+    readonly offsetTop: number;
+    readonly offsetWidth: number;
     onabort: (ev: Event) => any;
     onactivate: (ev: UIEvent) => any;
     onbeforeactivate: (ev: UIEvent) => any;
-    onbeforecopy: (ev: DragEvent) => any;
-    onbeforecut: (ev: DragEvent) => any;
+    onbeforecopy: (ev: ClipboardEvent) => any;
+    onbeforecut: (ev: ClipboardEvent) => any;
     onbeforedeactivate: (ev: UIEvent) => any;
-    onbeforepaste: (ev: DragEvent) => any;
+    onbeforepaste: (ev: ClipboardEvent) => any;
     onblur: (ev: FocusEvent) => any;
     oncanplay: (ev: Event) => any;
     oncanplaythrough: (ev: Event) => any;
     onchange: (ev: Event) => any;
     onclick: (ev: MouseEvent) => any;
     oncontextmenu: (ev: PointerEvent) => any;
-    oncopy: (ev: DragEvent) => any;
+    oncopy: (ev: ClipboardEvent) => any;
     oncuechange: (ev: Event) => any;
-    oncut: (ev: DragEvent) => any;
+    oncut: (ev: ClipboardEvent) => any;
     ondblclick: (ev: MouseEvent) => any;
     ondeactivate: (ev: UIEvent) => any;
     ondrag: (ev: DragEvent) => any;
@@ -4139,10 +4579,11 @@ interface HTMLElement extends Element {
     ondrop: (ev: DragEvent) => any;
     ondurationchange: (ev: Event) => any;
     onemptied: (ev: Event) => any;
-    onended: (ev: Event) => any;
+    onended: (ev: MediaStreamErrorEvent) => any;
     onerror: (ev: Event) => any;
     onfocus: (ev: FocusEvent) => any;
     oninput: (ev: Event) => any;
+    oninvalid: (ev: Event) => any;
     onkeydown: (ev: KeyboardEvent) => any;
     onkeypress: (ev: KeyboardEvent) => any;
     onkeyup: (ev: KeyboardEvent) => any;
@@ -4157,10 +4598,10 @@ interface HTMLElement extends Element {
     onmouseout: (ev: MouseEvent) => any;
     onmouseover: (ev: MouseEvent) => any;
     onmouseup: (ev: MouseEvent) => any;
-    onmousewheel: (ev: MouseWheelEvent) => any;
+    onmousewheel: (ev: WheelEvent) => any;
     onmscontentzoom: (ev: UIEvent) => any;
     onmsmanipulationstatechanged: (ev: MSManipulationEvent) => any;
-    onpaste: (ev: DragEvent) => any;
+    onpaste: (ev: ClipboardEvent) => any;
     onpause: (ev: Event) => any;
     onplay: (ev: Event) => any;
     onplaying: (ev: Event) => any;
@@ -4181,7 +4622,7 @@ interface HTMLElement extends Element {
     outerHTML: string;
     outerText: string;
     spellcheck: boolean;
-    style: CSSStyleDeclaration;
+    readonly style: CSSStyleDeclaration;
     tabIndex: number;
     title: string;
     blur(): void;
@@ -4217,10 +4658,10 @@ interface HTMLElement extends Element {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -4228,9 +4669,9 @@ interface HTMLElement extends Element {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -4242,11 +4683,12 @@ interface HTMLElement extends Element {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -4262,8 +4704,8 @@ interface HTMLElement extends Element {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -4325,7 +4767,7 @@ interface HTMLEmbedElement extends HTMLElement, GetSVGDocument {
     /**
       * Gets the source associated with the media element for use by the PlayToManager.
       */
-    msPlayToSource: any;
+    readonly msPlayToSource: any;
     /**
       * Sets or retrieves the name of the object.
       */
@@ -4333,12 +4775,12 @@ interface HTMLEmbedElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves the palette used for the embedded document.
       */
-    palette: string;
+    readonly palette: string;
     /**
       * Retrieves the URL of the plug-in used to view an embedded document.
       */
-    pluginspage: string;
-    readyState: string;
+    readonly pluginspage: string;
+    readonly readyState: string;
     /**
       * Sets or retrieves a URL to be loaded by the object.
       */
@@ -4368,19 +4810,19 @@ interface HTMLFieldSetElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
       */
-    validationMessage: string;
+    readonly validationMessage: string;
     /**
       * Returns a  ValidityState object that represents the validity states of an element.
       */
-    validity: ValidityState;
+    readonly validity: ValidityState;
     /**
       * Returns whether an element will successfully validate based on forms validation rules and constraints.
       */
-    willValidate: boolean;
+    readonly willValidate: boolean;
     /**
       * Returns whether a form will validate when it is submitted, without having to submit it.
       */
@@ -4426,7 +4868,7 @@ interface HTMLFormElement extends HTMLElement {
     /**
       * Retrieves a collection, in source order, of all controls in a given form.
       */
-    elements: HTMLCollection;
+    readonly elements: HTMLCollection;
     /**
       * Sets or retrieves the MIME encoding for the form.
       */
@@ -4438,7 +4880,7 @@ interface HTMLFormElement extends HTMLElement {
     /**
       * Sets or retrieves the number of objects in a collection.
       */
-    length: number;
+    readonly length: number;
     /**
       * Sets or retrieves how to send the form data to the server.
       */
@@ -4497,11 +4939,11 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves the document object of the page or frame.
       */
-    contentDocument: Document;
+    readonly contentDocument: Document;
     /**
       * Retrieves the object of the specified.
       */
-    contentWindow: Window;
+    readonly contentWindow: Window;
     /**
       * Sets or retrieves whether to display a border for the frame.
       */
@@ -4542,10 +4984,6 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
       * Sets or retrieves whether the frame can be scrolled.
       */
     scrolling: string;
-    /**
-      * Sets the value indicating whether the source file of a frame or iframe has specific security restrictions applied.
-      */
-    security: any;
     /**
       * Sets or retrieves a URL to be loaded by the object.
       */
@@ -4577,10 +5015,10 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -4588,9 +5026,9 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -4602,11 +5040,12 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -4623,8 +5062,8 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -4734,10 +5173,10 @@ interface HTMLFrameSetElement extends HTMLElement {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeprint", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeunload", listener: (ev: BeforeUnloadEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
@@ -4748,9 +5187,9 @@ interface HTMLFrameSetElement extends HTMLElement {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -4762,7 +5201,7 @@ interface HTMLFrameSetElement extends HTMLElement {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
@@ -4770,6 +5209,7 @@ interface HTMLFrameSetElement extends HTMLElement {
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "hashchange", listener: (ev: HashChangeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -4787,13 +5227,13 @@ interface HTMLFrameSetElement extends HTMLElement {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "offline", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "online", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "orientationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "pagehide", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pageshow", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -4872,7 +5312,6 @@ interface HTMLHeadingElement extends HTMLElement {
       * Sets or retrieves a value that indicates the table alignment.
       */
     align: string;
-    clear: string;
 }
 
 declare var HTMLHeadingElement: {
@@ -4905,11 +5344,11 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves the document object of the page or frame.
       */
-    contentDocument: Document;
+    readonly contentDocument: Document;
     /**
       * Retrieves the object of the specified.
       */
-    contentWindow: Window;
+    readonly contentWindow: Window;
     /**
       * Sets or retrieves whether to display a border for the frame.
       */
@@ -4950,15 +5389,11 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
       * Raised when the object has been completely received from the server.
       */
     onload: (ev: Event) => any;
-    sandbox: DOMSettableTokenList;
+    readonly sandbox: DOMSettableTokenList;
     /**
       * Sets or retrieves whether the frame can be scrolled.
       */
     scrolling: string;
-    /**
-      * Sets the value indicating whether the source file of a frame or iframe has specific security restrictions applied.
-      */
-    security: any;
     /**
       * Sets or retrieves a URL to be loaded by the object.
       */
@@ -4994,10 +5429,10 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -5005,9 +5440,9 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -5019,11 +5454,12 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -5040,8 +5476,8 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -5098,9 +5534,9 @@ interface HTMLImageElement extends HTMLElement {
     /**
       * Retrieves whether the object is fully loaded.
       */
-    complete: boolean;
+    readonly complete: boolean;
     crossOrigin: string;
-    currentSrc: string;
+    readonly currentSrc: string;
     /**
       * Sets or retrieves the height of the object.
       */
@@ -5117,6 +5553,7 @@ interface HTMLImageElement extends HTMLElement {
       * Sets or retrieves a Uniform Resource Identifier (URI) to a long description of the object.
       */
     longDesc: string;
+    lowsrc: string;
     /**
       * Gets or sets whether the DLNA PlayTo device is available.
       */
@@ -5129,7 +5566,7 @@ interface HTMLImageElement extends HTMLElement {
     /**
       * Gets the source associated with the media element for use by the PlayToManager.
       */
-    msPlayToSource: any;
+    readonly msPlayToSource: any;
     /**
       * Sets or retrieves the name of the object.
       */
@@ -5137,11 +5574,12 @@ interface HTMLImageElement extends HTMLElement {
     /**
       * The original height of the image resource before sizing.
       */
-    naturalHeight: number;
+    readonly naturalHeight: number;
     /**
       * The original width of the image resource before sizing.
       */
-    naturalWidth: number;
+    readonly naturalWidth: number;
+    sizes: string;
     /**
       * The address or URL of the a media resource that is to be considered.
       */
@@ -5159,8 +5597,8 @@ interface HTMLImageElement extends HTMLElement {
       * Sets or retrieves the width of the object.
       */
     width: number;
-    x: number;
-    y: number;
+    readonly x: number;
+    readonly y: number;
     msGetAsCastingSource(): any;
 }
 
@@ -5202,7 +5640,7 @@ interface HTMLInputElement extends HTMLElement {
     /**
       * Retrieves whether the object is fully loaded.
       */
-    complete: boolean;
+    readonly complete: boolean;
     /**
       * Sets or retrieves the state of the check box or radio button.
       */
@@ -5215,11 +5653,11 @@ interface HTMLInputElement extends HTMLElement {
     /**
       * Returns a FileList object on a file type input object.
       */
-    files: FileList;
+    readonly files: FileList;
     /**
       * Retrieves a reference to the form that the object is embedded in. 
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Overrides the action attribute (where the data on a form is sent) on the parent form element.
       */
@@ -5252,7 +5690,7 @@ interface HTMLInputElement extends HTMLElement {
     /**
       * Specifies the ID of a pre-defined datalist of options for an input element.
       */
-    list: HTMLElement;
+    readonly list: HTMLElement;
     /**
       * Defines the maximum acceptable value for an input element with type="number".When used with the min and step attributes, lets you control the range and increment (such as only even numbers) that the user can enter into an input field.
       */
@@ -5286,6 +5724,7 @@ interface HTMLInputElement extends HTMLElement {
       * When present, marks an element that can't be submitted without a value.
       */
     required: boolean;
+    selectionDirection: string;
     /**
       * Gets or sets the end position or offset of a text selection.
       */
@@ -5315,11 +5754,11 @@ interface HTMLInputElement extends HTMLElement {
     /**
       * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
       */
-    validationMessage: string;
+    readonly validationMessage: string;
     /**
       * Returns a  ValidityState object that represents the validity states of an element.
       */
-    validity: ValidityState;
+    readonly validity: ValidityState;
     /**
       * Returns the value of the data at the cursor's current position.
       */
@@ -5333,6 +5772,7 @@ interface HTMLInputElement extends HTMLElement {
       * Sets or retrieves the vertical margin for the object.
       */
     vspace: number;
+    webkitdirectory: boolean;
     /**
       * Sets or retrieves the width of the object.
       */
@@ -5340,15 +5780,12 @@ interface HTMLInputElement extends HTMLElement {
     /**
       * Returns whether an element will successfully validate based on forms validation rules and constraints.
       */
-    willValidate: boolean;
+    readonly willValidate: boolean;
+    minLength: number;
     /**
       * Returns whether a form will validate when it is submitted, without having to submit it.
       */
     checkValidity(): boolean;
-    /**
-      * Creates a TextRange object for the element.
-      */
-    createTextRange(): TextRange;
     /**
       * Makes the selection equal to the current object.
       */
@@ -5363,7 +5800,7 @@ interface HTMLInputElement extends HTMLElement {
       * @param start The offset into the text field for the start of the selection.
       * @param end The offset into the text field for the end of the selection.
       */
-    setSelectionRange(start: number, end: number): void;
+    setSelectionRange(start?: number, end?: number, direction?: string): void;
     /**
       * Decrements a range input control's value by the value given by the Step attribute. If the optional parameter is used, it will decrement the input control's step value multiplied by the parameter's value.
       * @param n Value to decrement the value by.
@@ -5381,23 +5818,6 @@ declare var HTMLInputElement: {
     new(): HTMLInputElement;
 }
 
-interface HTMLIsIndexElement extends HTMLElement {
-    /**
-      * Sets or retrieves the URL to which the form content is sent for processing.
-      */
-    action: string;
-    /**
-      * Retrieves a reference to the form that the object is embedded in. 
-      */
-    form: HTMLFormElement;
-    prompt: string;
-}
-
-declare var HTMLIsIndexElement: {
-    prototype: HTMLIsIndexElement;
-    new(): HTMLIsIndexElement;
-}
-
 interface HTMLLIElement extends HTMLElement {
     type: string;
     /**
@@ -5415,7 +5835,7 @@ interface HTMLLabelElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the object to which the given label object is assigned.
       */
@@ -5435,7 +5855,7 @@ interface HTMLLegendElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
 }
 
 declare var HTMLLegendElement: {
@@ -5477,6 +5897,7 @@ interface HTMLLinkElement extends HTMLElement, LinkStyle {
       * Sets or retrieves the MIME type of the object.
       */
     type: string;
+    import?: Document;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5489,7 +5910,7 @@ interface HTMLMapElement extends HTMLElement {
     /**
       * Retrieves a collection of the area objects defined for the given map object.
       */
-    areas: HTMLAreasCollection;
+    readonly areas: HTMLAreasCollection;
     /**
       * Sets or retrieves the name of the object.
       */
@@ -5541,10 +5962,10 @@ interface HTMLMarqueeElement extends HTMLElement {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "bounce", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -5553,9 +5974,9 @@ interface HTMLMarqueeElement extends HTMLElement {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -5567,12 +5988,13 @@ interface HTMLMarqueeElement extends HTMLElement {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "finish", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -5588,8 +6010,8 @@ interface HTMLMarqueeElement extends HTMLElement {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -5635,7 +6057,7 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Returns an AudioTrackList object with the audio tracks for a given video element.
       */
-    audioTracks: AudioTrackList;
+    readonly audioTracks: AudioTrackList;
     /**
       * Gets or sets a value that indicates whether to start playing the media automatically.
       */
@@ -5643,15 +6065,16 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Gets a collection of buffered time ranges.
       */
-    buffered: TimeRanges;
+    readonly buffered: TimeRanges;
     /**
       * Gets or sets a flag that indicates whether the client provides a set of controls for the media (in case the developer does not include controls for the player).
       */
     controls: boolean;
+    crossOrigin: string;
     /**
       * Gets the address or URL of the current media resource that is selected by IHTMLMediaElement.
       */
-    currentSrc: string;
+    readonly currentSrc: string;
     /**
       * Gets or sets the current playback position, in seconds.
       */
@@ -5664,19 +6087,20 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Returns the duration in seconds of the current media resource. A NaN value is returned if duration is not available, or Infinity if the media resource is streaming.
       */
-    duration: number;
+    readonly duration: number;
     /**
       * Gets information about whether the playback has ended or not.
       */
-    ended: boolean;
+    readonly ended: boolean;
     /**
       * Returns an object representing the current error state of the audio or video element.
       */
-    error: MediaError;
+    readonly error: MediaError;
     /**
       * Gets or sets a flag to specify whether playback should restart after it completes.
       */
     loop: boolean;
+    readonly mediaKeys: MediaKeys;
     /**
       * Specifies the purpose of the audio or video media, such as background audio or alerts.
       */
@@ -5685,11 +6109,11 @@ interface HTMLMediaElement extends HTMLElement {
       * Specifies the output device id that the audio will be sent to.
       */
     msAudioDeviceType: string;
-    msGraphicsTrustStatus: MSGraphicsTrust;
+    readonly msGraphicsTrustStatus: MSGraphicsTrust;
     /**
       * Gets the MSMediaKeys object, which is used for decrypting media data, that is associated with this media element.
       */
-    msKeys: MSMediaKeys;
+    readonly msKeys: MSMediaKeys;
     /**
       * Gets or sets whether the DLNA PlayTo device is available.
       */
@@ -5705,7 +6129,7 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Gets the source associated with the media element for use by the PlayToManager.
       */
-    msPlayToSource: any;
+    readonly msPlayToSource: any;
     /**
       * Specifies whether or not to enable low-latency playback on the media element.
       */
@@ -5717,12 +6141,13 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Gets the current network activity for the element.
       */
-    networkState: number;
+    readonly networkState: number;
+    onencrypted: (ev: MediaEncryptedEvent) => any;
     onmsneedkey: (ev: MSMediaKeyNeededEvent) => any;
     /**
       * Gets a flag that specifies whether playback is paused.
       */
-    paused: boolean;
+    readonly paused: boolean;
     /**
       * Gets or sets the current rate of speed for the media resource to play. This speed is expressed as a multiple of the normal speed of the media resource.
       */
@@ -5730,7 +6155,7 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Gets TimeRanges for the current media resource that has been played.
       */
-    played: TimeRanges;
+    readonly played: TimeRanges;
     /**
       * Gets or sets the current playback position, in seconds.
       */
@@ -5739,17 +6164,18 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Returns a TimeRanges object that represents the ranges of the current media resource that can be seeked.
       */
-    seekable: TimeRanges;
+    readonly seekable: TimeRanges;
     /**
       * Gets a flag that indicates whether the the client is currently moving to a new playback position in the media resource.
       */
-    seeking: boolean;
+    readonly seeking: boolean;
     /**
       * The address or URL of the a media resource that is to be considered.
       */
     src: string;
-    textTracks: TextTrackList;
-    videoTracks: VideoTrackList;
+    srcObject: MediaStream;
+    readonly textTracks: TextTrackList;
+    readonly videoTracks: VideoTrackList;
     /**
       * Gets or sets the volume level for audio portions of the media element.
       */
@@ -5785,15 +6211,16 @@ interface HTMLMediaElement extends HTMLElement {
       * Loads and starts playback of a media resource.
       */
     play(): void;
-    HAVE_CURRENT_DATA: number;
-    HAVE_ENOUGH_DATA: number;
-    HAVE_FUTURE_DATA: number;
-    HAVE_METADATA: number;
-    HAVE_NOTHING: number;
-    NETWORK_EMPTY: number;
-    NETWORK_IDLE: number;
-    NETWORK_LOADING: number;
-    NETWORK_NO_SOURCE: number;
+    setMediaKeys(mediaKeys: MediaKeys): PromiseLike<void>;
+    readonly HAVE_CURRENT_DATA: number;
+    readonly HAVE_ENOUGH_DATA: number;
+    readonly HAVE_FUTURE_DATA: number;
+    readonly HAVE_METADATA: number;
+    readonly HAVE_NOTHING: number;
+    readonly NETWORK_EMPTY: number;
+    readonly NETWORK_IDLE: number;
+    readonly NETWORK_LOADING: number;
+    readonly NETWORK_NO_SOURCE: number;
     addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -5817,10 +6244,10 @@ interface HTMLMediaElement extends HTMLElement {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -5828,9 +6255,9 @@ interface HTMLMediaElement extends HTMLElement {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -5842,11 +6269,13 @@ interface HTMLMediaElement extends HTMLElement {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "encrypted", listener: (ev: MediaEncryptedEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -5862,9 +6291,9 @@ interface HTMLMediaElement extends HTMLElement {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "msneedkey", listener: (ev: MSMediaKeyNeededEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -5903,15 +6332,15 @@ interface HTMLMediaElement extends HTMLElement {
 declare var HTMLMediaElement: {
     prototype: HTMLMediaElement;
     new(): HTMLMediaElement;
-    HAVE_CURRENT_DATA: number;
-    HAVE_ENOUGH_DATA: number;
-    HAVE_FUTURE_DATA: number;
-    HAVE_METADATA: number;
-    HAVE_NOTHING: number;
-    NETWORK_EMPTY: number;
-    NETWORK_IDLE: number;
-    NETWORK_LOADING: number;
-    NETWORK_NO_SOURCE: number;
+    readonly HAVE_CURRENT_DATA: number;
+    readonly HAVE_ENOUGH_DATA: number;
+    readonly HAVE_FUTURE_DATA: number;
+    readonly HAVE_METADATA: number;
+    readonly HAVE_NOTHING: number;
+    readonly NETWORK_EMPTY: number;
+    readonly NETWORK_IDLE: number;
+    readonly NETWORK_LOADING: number;
+    readonly NETWORK_NO_SOURCE: number;
 }
 
 interface HTMLMenuElement extends HTMLElement {
@@ -5956,6 +6385,20 @@ declare var HTMLMetaElement: {
     new(): HTMLMetaElement;
 }
 
+interface HTMLMeterElement extends HTMLElement {
+    high: number;
+    low: number;
+    max: number;
+    min: number;
+    optimum: number;
+    value: number;
+}
+
+declare var HTMLMeterElement: {
+    prototype: HTMLMeterElement;
+    new(): HTMLMeterElement;
+}
+
 interface HTMLModElement extends HTMLElement {
     /**
       * Sets or retrieves reference information about the object.
@@ -5972,15 +6415,6 @@ declare var HTMLModElement: {
     new(): HTMLModElement;
 }
 
-interface HTMLNextIdElement extends HTMLElement {
-    n: string;
-}
-
-declare var HTMLNextIdElement: {
-    prototype: HTMLNextIdElement;
-    new(): HTMLNextIdElement;
-}
-
 interface HTMLOListElement extends HTMLElement {
     compact: boolean;
     /**
@@ -5999,7 +6433,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves a string of the URL where the object tag can be found. This is often the href of the document that the object is in, or the value set by a base element.
       */
-    BaseHref: string;
+    readonly BaseHref: string;
     align: string;
     /**
       * Sets or retrieves a text alternative to the graphic.
@@ -6029,7 +6463,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves the document object of the page or frame.
       */
-    contentDocument: Document;
+    readonly contentDocument: Document;
     /**
       * Sets or retrieves the URL that references the data of the object.
       */
@@ -6038,7 +6472,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the height of the object.
       */
@@ -6059,7 +6493,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Gets the source associated with the media element for use by the PlayToManager.
       */
-    msPlayToSource: any;
+    readonly msPlayToSource: any;
     /**
       * Sets or retrieves the name of the object.
       */
@@ -6067,8 +6501,8 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves the contained object.
       */
-    object: any;
-    readyState: number;
+    readonly object: any;
+    readonly readyState: number;
     /**
       * Sets or retrieves a message to be displayed while an object is loading.
       */
@@ -6084,11 +6518,11 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
       */
-    validationMessage: string;
+    readonly validationMessage: string;
     /**
       * Returns a  ValidityState object that represents the validity states of an element.
       */
-    validity: ValidityState;
+    readonly validity: ValidityState;
     vspace: number;
     /**
       * Sets or retrieves the width of the object.
@@ -6097,7 +6531,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Returns whether an element will successfully validate based on forms validation rules and constraints.
       */
-    willValidate: boolean;
+    readonly willValidate: boolean;
     /**
       * Returns whether a form will validate when it is submitted, without having to submit it.
       */
@@ -6124,11 +6558,11 @@ interface HTMLOptGroupElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the ordinal position of an option in a list box.
       */
-    index: number;
+    readonly index: number;
     /**
       * Sets or retrieves a value that you can use to implement your own label functionality for the object.
       */
@@ -6140,7 +6574,7 @@ interface HTMLOptGroupElement extends HTMLElement {
     /**
       * Sets or retrieves the text string specified by the option tag.
       */
-    text: string;
+    readonly text: string;
     /**
       * Sets or retrieves the value which is returned to the server when the form control is submitted.
       */
@@ -6161,11 +6595,11 @@ interface HTMLOptionElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the ordinal position of an option in a list box.
       */
-    index: number;
+    readonly index: number;
     /**
       * Sets or retrieves a value that you can use to implement your own label functionality for the object.
       */
@@ -6190,6 +6624,18 @@ declare var HTMLOptionElement: {
     create(): HTMLOptionElement;
 }
 
+interface HTMLOptionsCollection extends HTMLCollection {
+    length: number;
+    selectedIndex: number;
+    add(element: HTMLOptionElement | HTMLOptGroupElement, before?: HTMLElement | number): void;
+    remove(index: number): void;
+}
+
+declare var HTMLOptionsCollection: {
+    prototype: HTMLOptionsCollection;
+    new(): HTMLOptionsCollection;
+}
+
 interface HTMLParagraphElement extends HTMLElement {
     /**
       * Sets or retrieves how the object is aligned with adjacent text. 
@@ -6227,28 +6673,15 @@ declare var HTMLParamElement: {
     new(): HTMLParamElement;
 }
 
-interface HTMLPhraseElement extends HTMLElement {
-    /**
-      * Sets or retrieves reference information about the object.
-      */
-    cite: string;
-    /**
-      * Sets or retrieves the date and time of a modification to the object.
-      */
-    dateTime: string;
+interface HTMLPictureElement extends HTMLElement {
 }
 
-declare var HTMLPhraseElement: {
-    prototype: HTMLPhraseElement;
-    new(): HTMLPhraseElement;
+declare var HTMLPictureElement: {
+    prototype: HTMLPictureElement;
+    new(): HTMLPictureElement;
 }
 
 interface HTMLPreElement extends HTMLElement {
-    /**
-      * Indicates a citation by rendering text in italic type.
-      */
-    cite: string;
-    clear: string;
     /**
       * Sets or gets a value that you can use to implement your own width functionality for the object.
       */
@@ -6264,7 +6697,7 @@ interface HTMLProgressElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Defines the maximum, or "done" value for a progress element.
       */
@@ -6272,7 +6705,7 @@ interface HTMLProgressElement extends HTMLElement {
     /**
       * Returns the quotient of value/max when the value attribute is set (determinate progress bar), or -1 when the value attribute is missing (indeterminate progress bar).
       */
-    position: number;
+    readonly position: number;
     /**
       * Sets or gets the current value of a progress element. The value must be a non-negative number between 0 and the max value.
       */
@@ -6289,10 +6722,6 @@ interface HTMLQuoteElement extends HTMLElement {
       * Sets or retrieves reference information about the object.
       */
     cite: string;
-    /**
-      * Sets or retrieves the date and time of a modification to the object.
-      */
-    dateTime: string;
 }
 
 declare var HTMLQuoteElement: {
@@ -6346,7 +6775,7 @@ interface HTMLSelectElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in. 
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the number of objects in a collection.
       */
@@ -6359,7 +6788,7 @@ interface HTMLSelectElement extends HTMLElement {
       * Sets or retrieves the name of the object.
       */
     name: string;
-    options: HTMLCollection;
+    options: HTMLCollectionOf<HTMLOptionElement>;
     /**
       * When present, marks an element that can't be submitted without a value.
       */
@@ -6368,6 +6797,7 @@ interface HTMLSelectElement extends HTMLElement {
       * Sets or retrieves the index of the selected option in a select object.
       */
     selectedIndex: number;
+    selectedOptions: HTMLCollectionOf<HTMLOptionElement>;
     /**
       * Sets or retrieves the number of rows in the list box. 
       */
@@ -6375,15 +6805,15 @@ interface HTMLSelectElement extends HTMLElement {
     /**
       * Retrieves the type of select control based on the value of the MULTIPLE attribute.
       */
-    type: string;
+    readonly type: string;
     /**
       * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
       */
-    validationMessage: string;
+    readonly validationMessage: string;
     /**
       * Returns a  ValidityState object that represents the validity states of an element.
       */
-    validity: ValidityState;
+    readonly validity: ValidityState;
     /**
       * Sets or retrieves the value which is returned to the server when the form control is submitted.
       */
@@ -6391,8 +6821,7 @@ interface HTMLSelectElement extends HTMLElement {
     /**
       * Returns whether an element will successfully validate based on forms validation rules and constraints.
       */
-    willValidate: boolean;
-    selectedOptions: HTMLCollection;
+    readonly willValidate: boolean;
     /**
       * Adds an element to the areas, controlRange, or options collection.
       * @param element Variant of type Number that specifies the index position in the collection where the element is placed. If no value is given, the method places the element at the end of the collection.
@@ -6438,10 +6867,12 @@ interface HTMLSourceElement extends HTMLElement {
      */
     media: string;
     msKeySystem: string;
+    sizes: string;
     /**
       * The address or URL of the a media resource that is to be considered.
       */
     src: string;
+    srcset: string;
     /**
      * Gets or sets the MIME type of a media resource.
      */
@@ -6462,6 +6893,7 @@ declare var HTMLSpanElement: {
 }
 
 interface HTMLStyleElement extends HTMLElement, LinkStyle {
+    disabled: boolean;
     /**
       * Sets or retrieves the media type.
       */
@@ -6511,7 +6943,7 @@ interface HTMLTableCellElement extends HTMLElement, HTMLTableAlignment {
     /**
       * Retrieves the position of the object in the cells collection of a row.
       */
-    cellIndex: number;
+    readonly cellIndex: number;
     /**
       * Sets or retrieves the number columns in the table that the object should span.
       */
@@ -6618,7 +7050,7 @@ interface HTMLTableElement extends HTMLElement {
     /**
       * Sets or retrieves the number of horizontal rows contained in the object.
       */
-    rows: HTMLCollection;
+    rows: HTMLCollectionOf<HTMLTableRowElement>;
     /**
       * Sets or retrieves which dividing lines (inner borders) are displayed.
       */
@@ -6630,7 +7062,7 @@ interface HTMLTableElement extends HTMLElement {
     /**
       * Retrieves a collection of all tBody objects in the table. Objects in this collection are in source order.
       */
-    tBodies: HTMLCollection;
+    tBodies: HTMLCollectionOf<HTMLTableSectionElement>;
     /**
       * Retrieves the tFoot object of the table.
       */
@@ -6709,7 +7141,7 @@ interface HTMLTableRowElement extends HTMLElement, HTMLTableAlignment {
     /**
       * Retrieves a collection of all cells in the table row.
       */
-    cells: HTMLCollection;
+    cells: HTMLCollectionOf<HTMLTableDataCellElement | HTMLTableHeaderCellElement>;
     /**
       * Sets or retrieves the height of the object.
       */
@@ -6717,11 +7149,11 @@ interface HTMLTableRowElement extends HTMLElement, HTMLTableAlignment {
     /**
       * Retrieves the position of the object in the rows collection for the table.
       */
-    rowIndex: number;
+    readonly rowIndex: number;
     /**
       * Retrieves the position of the object in the collection.
       */
-    sectionRowIndex: number;
+    readonly sectionRowIndex: number;
     /**
       * Removes the specified cell from the table row, as well as from the cells collection.
       * @param index Number that specifies the zero-based position of the cell to remove from the table row. If no value is provided, the last cell in the cells collection is deleted.
@@ -6731,7 +7163,7 @@ interface HTMLTableRowElement extends HTMLElement, HTMLTableAlignment {
       * Creates a new cell in the table row, and adds the cell to the cells collection.
       * @param index Number that specifies where to insert the cell in the tr. The default value is -1, which appends the new cell to the end of the cells collection.
       */
-    insertCell(index?: number): HTMLTableCellElement;
+    insertCell(index?: number): HTMLTableDataCellElement;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6748,7 +7180,7 @@ interface HTMLTableSectionElement extends HTMLElement, HTMLTableAlignment {
     /**
       * Sets or retrieves the number of horizontal rows contained in the object.
       */
-    rows: HTMLCollection;
+    rows: HTMLCollectionOf<HTMLTableRowElement>;
     /**
       * Removes the specified row (tr) from the element and from the rows collection.
       * @param index Number that specifies the zero-based position in the rows collection of the row to remove.
@@ -6767,6 +7199,15 @@ declare var HTMLTableSectionElement: {
     new(): HTMLTableSectionElement;
 }
 
+interface HTMLTemplateElement extends HTMLElement {
+    readonly content: DocumentFragment;
+}
+
+declare var HTMLTemplateElement: {
+    prototype: HTMLTemplateElement;
+    new(): HTMLTemplateElement;
+}
+
 interface HTMLTextAreaElement extends HTMLElement {
     /**
       * Provides a way to direct a user to a specific field when a document loads. This can provide both direction and convenience for a user, reducing the need to click or tab to a field when a page opens. This attribute is true when present on an element, and false when missing.
@@ -6784,7 +7225,7 @@ interface HTMLTextAreaElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the maximum number of characters that the user can enter in a text control.
       */
@@ -6824,15 +7265,15 @@ interface HTMLTextAreaElement extends HTMLElement {
     /**
       * Retrieves the type of control.
       */
-    type: string;
+    readonly type: string;
     /**
       * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
       */
-    validationMessage: string;
+    readonly validationMessage: string;
     /**
       * Returns a  ValidityState object that represents the validity states of an element.
       */
-    validity: ValidityState;
+    readonly validity: ValidityState;
     /**
       * Retrieves or sets the text in the entry field of the textArea element.
       */
@@ -6840,19 +7281,16 @@ interface HTMLTextAreaElement extends HTMLElement {
     /**
       * Returns whether an element will successfully validate based on forms validation rules and constraints.
       */
-    willValidate: boolean;
+    readonly willValidate: boolean;
     /**
       * Sets or retrieves how to handle wordwrapping in the object.
       */
     wrap: string;
+    minLength: number;
     /**
       * Returns whether a form will validate when it is submitted, without having to submit it.
       */
     checkValidity(): boolean;
-    /**
-      * Creates a TextRange object for the element.
-      */
-    createTextRange(): TextRange;
     /**
       * Highlights the input area of a form element.
       */
@@ -6891,23 +7329,23 @@ interface HTMLTrackElement extends HTMLElement {
     default: boolean;
     kind: string;
     label: string;
-    readyState: number;
+    readonly readyState: number;
     src: string;
     srclang: string;
-    track: TextTrack;
-    ERROR: number;
-    LOADED: number;
-    LOADING: number;
-    NONE: number;
+    readonly track: TextTrack;
+    readonly ERROR: number;
+    readonly LOADED: number;
+    readonly LOADING: number;
+    readonly NONE: number;
 }
 
 declare var HTMLTrackElement: {
     prototype: HTMLTrackElement;
     new(): HTMLTrackElement;
-    ERROR: number;
-    LOADED: number;
-    LOADING: number;
-    NONE: number;
+    readonly ERROR: number;
+    readonly LOADED: number;
+    readonly LOADING: number;
+    readonly NONE: number;
 }
 
 interface HTMLUListElement extends HTMLElement {
@@ -6934,8 +7372,8 @@ interface HTMLVideoElement extends HTMLMediaElement {
       */
     height: number;
     msHorizontalMirror: boolean;
-    msIsLayoutOptimalForPlayback: boolean;
-    msIsStereo3D: boolean;
+    readonly msIsLayoutOptimalForPlayback: boolean;
+    readonly msIsStereo3D: boolean;
     msStereo3DPackingMode: string;
     msStereo3DRenderMode: string;
     msZoom: boolean;
@@ -6949,13 +7387,13 @@ interface HTMLVideoElement extends HTMLMediaElement {
     /**
       * Gets the intrinsic height of a video in CSS pixels, or zero if the dimensions are not known.
       */
-    videoHeight: number;
+    readonly videoHeight: number;
     /**
       * Gets the intrinsic width of a video in CSS pixels, or zero if the dimensions are not known.
       */
-    videoWidth: number;
-    webkitDisplayingFullscreen: boolean;
-    webkitSupportsFullscreen: boolean;
+    readonly videoWidth: number;
+    readonly webkitDisplayingFullscreen: boolean;
+    readonly webkitSupportsFullscreen: boolean;
     /**
       * Gets or sets the width of the video element.
       */
@@ -6994,10 +7432,10 @@ interface HTMLVideoElement extends HTMLMediaElement {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -7005,9 +7443,9 @@ interface HTMLVideoElement extends HTMLMediaElement {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -7019,11 +7457,13 @@ interface HTMLVideoElement extends HTMLMediaElement {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "encrypted", listener: (ev: MediaEncryptedEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -7039,9 +7479,9 @@ interface HTMLVideoElement extends HTMLMediaElement {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "msneedkey", listener: (ev: MSMediaKeyNeededEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -7083,8 +7523,8 @@ declare var HTMLVideoElement: {
 }
 
 interface HashChangeEvent extends Event {
-    newURL: string;
-    oldURL: string;
+    readonly newURL: string;
+    readonly oldURL: string;
 }
 
 declare var HashChangeEvent: {
@@ -7093,8 +7533,8 @@ declare var HashChangeEvent: {
 }
 
 interface History {
-    length: number;
-    state: any;
+    readonly length: number;
+    readonly state: any;
     back(distance?: any): void;
     forward(distance?: any): void;
     go(delta?: any): void;
@@ -7108,31 +7548,31 @@ declare var History: {
 }
 
 interface IDBCursor {
-    direction: string;
-    key: any;
-    primaryKey: any;
-    source: any;
+    readonly direction: string;
+    key: IDBKeyRange | IDBValidKey;
+    readonly primaryKey: any;
+    source: IDBObjectStore | IDBIndex;
     advance(count: number): void;
-    continue(key?: any): void;
+    continue(key?: IDBKeyRange | IDBValidKey): void;
     delete(): IDBRequest;
     update(value: any): IDBRequest;
-    NEXT: string;
-    NEXT_NO_DUPLICATE: string;
-    PREV: string;
-    PREV_NO_DUPLICATE: string;
+    readonly NEXT: string;
+    readonly NEXT_NO_DUPLICATE: string;
+    readonly PREV: string;
+    readonly PREV_NO_DUPLICATE: string;
 }
 
 declare var IDBCursor: {
     prototype: IDBCursor;
     new(): IDBCursor;
-    NEXT: string;
-    NEXT_NO_DUPLICATE: string;
-    PREV: string;
-    PREV_NO_DUPLICATE: string;
+    readonly NEXT: string;
+    readonly NEXT_NO_DUPLICATE: string;
+    readonly PREV: string;
+    readonly PREV_NO_DUPLICATE: string;
 }
 
 interface IDBCursorWithValue extends IDBCursor {
-    value: any;
+    readonly value: any;
 }
 
 declare var IDBCursorWithValue: {
@@ -7141,15 +7581,17 @@ declare var IDBCursorWithValue: {
 }
 
 interface IDBDatabase extends EventTarget {
-    name: string;
-    objectStoreNames: DOMStringList;
+    readonly name: string;
+    readonly objectStoreNames: DOMStringList;
     onabort: (ev: Event) => any;
     onerror: (ev: Event) => any;
     version: number;
+    onversionchange: (ev: IDBVersionChangeEvent) => any;
     close(): void;
     createObjectStore(name: string, optionalParameters?: IDBObjectStoreParameters): IDBObjectStore;
     deleteObjectStore(name: string): void;
-    transaction(storeNames: any, mode?: string): IDBTransaction;
+    transaction(storeNames: string | string[], mode?: string): IDBTransaction;
+    addEventListener(type: "versionchange", listener: (ev: IDBVersionChangeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -7173,15 +7615,15 @@ declare var IDBFactory: {
 
 interface IDBIndex {
     keyPath: string | string[];
-    name: string;
-    objectStore: IDBObjectStore;
-    unique: boolean;
+    readonly name: string;
+    readonly objectStore: IDBObjectStore;
+    readonly unique: boolean;
     multiEntry: boolean;
-    count(key?: any): IDBRequest;
-    get(key: any): IDBRequest;
-    getKey(key: any): IDBRequest;
-    openCursor(range?: IDBKeyRange, direction?: string): IDBRequest;
-    openKeyCursor(range?: IDBKeyRange, direction?: string): IDBRequest;
+    count(key?: IDBKeyRange | IDBValidKey): IDBRequest;
+    get(key: IDBKeyRange | IDBValidKey): IDBRequest;
+    getKey(key: IDBKeyRange | IDBValidKey): IDBRequest;
+    openCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest;
+    openKeyCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest;
 }
 
 declare var IDBIndex: {
@@ -7190,36 +7632,37 @@ declare var IDBIndex: {
 }
 
 interface IDBKeyRange {
-    lower: any;
-    lowerOpen: boolean;
-    upper: any;
-    upperOpen: boolean;
+    readonly lower: any;
+    readonly lowerOpen: boolean;
+    readonly upper: any;
+    readonly upperOpen: boolean;
 }
 
 declare var IDBKeyRange: {
     prototype: IDBKeyRange;
     new(): IDBKeyRange;
     bound(lower: any, upper: any, lowerOpen?: boolean, upperOpen?: boolean): IDBKeyRange;
-    lowerBound(bound: any, open?: boolean): IDBKeyRange;
+    lowerBound(lower: any, open?: boolean): IDBKeyRange;
     only(value: any): IDBKeyRange;
-    upperBound(bound: any, open?: boolean): IDBKeyRange;
+    upperBound(upper: any, open?: boolean): IDBKeyRange;
 }
 
 interface IDBObjectStore {
-    indexNames: DOMStringList;
-    keyPath: string;
-    name: string;
-    transaction: IDBTransaction;
-    add(value: any, key?: any): IDBRequest;
+    readonly indexNames: DOMStringList;
+    keyPath: string | string[];
+    readonly name: string;
+    readonly transaction: IDBTransaction;
+    autoIncrement: boolean;
+    add(value: any, key?: IDBKeyRange | IDBValidKey): IDBRequest;
     clear(): IDBRequest;
-    count(key?: any): IDBRequest;
+    count(key?: IDBKeyRange | IDBValidKey): IDBRequest;
     createIndex(name: string, keyPath: string | string[], optionalParameters?: IDBIndexParameters): IDBIndex;
-    delete(key: any): IDBRequest;
+    delete(key: IDBKeyRange | IDBValidKey): IDBRequest;
     deleteIndex(indexName: string): void;
     get(key: any): IDBRequest;
     index(name: string): IDBIndex;
-    openCursor(range?: any, direction?: string): IDBRequest;
-    put(value: any, key?: any): IDBRequest;
+    openCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest;
+    put(value: any, key?: IDBKeyRange | IDBValidKey): IDBRequest;
 }
 
 declare var IDBObjectStore: {
@@ -7243,13 +7686,13 @@ declare var IDBOpenDBRequest: {
 }
 
 interface IDBRequest extends EventTarget {
-    error: DOMError;
+    readonly error: DOMError;
     onerror: (ev: Event) => any;
     onsuccess: (ev: Event) => any;
-    readyState: string;
-    result: any;
-    source: any;
-    transaction: IDBTransaction;
+    readonly readyState: string;
+    readonly result: any;
+    source: IDBObjectStore | IDBIndex | IDBCursor;
+    readonly transaction: IDBTransaction;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "success", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -7261,17 +7704,17 @@ declare var IDBRequest: {
 }
 
 interface IDBTransaction extends EventTarget {
-    db: IDBDatabase;
-    error: DOMError;
-    mode: string;
+    readonly db: IDBDatabase;
+    readonly error: DOMError;
+    readonly mode: string;
     onabort: (ev: Event) => any;
     oncomplete: (ev: Event) => any;
     onerror: (ev: Event) => any;
     abort(): void;
     objectStore(name: string): IDBObjectStore;
-    READ_ONLY: string;
-    READ_WRITE: string;
-    VERSION_CHANGE: string;
+    readonly READ_ONLY: string;
+    readonly READ_WRITE: string;
+    readonly VERSION_CHANGE: string;
     addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
@@ -7281,14 +7724,14 @@ interface IDBTransaction extends EventTarget {
 declare var IDBTransaction: {
     prototype: IDBTransaction;
     new(): IDBTransaction;
-    READ_ONLY: string;
-    READ_WRITE: string;
-    VERSION_CHANGE: string;
+    readonly READ_ONLY: string;
+    readonly READ_WRITE: string;
+    readonly VERSION_CHANGE: string;
 }
 
 interface IDBVersionChangeEvent extends Event {
-    newVersion: number;
-    oldVersion: number;
+    readonly newVersion: number;
+    readonly oldVersion: number;
 }
 
 declare var IDBVersionChangeEvent: {
@@ -7298,8 +7741,8 @@ declare var IDBVersionChangeEvent: {
 
 interface ImageData {
     data: Uint8ClampedArray;
-    height: number;
-    width: number;
+    readonly height: number;
+    readonly width: number;
 }
 
 declare var ImageData: {
@@ -7309,37 +7752,47 @@ declare var ImageData: {
 }
 
 interface KeyboardEvent extends UIEvent {
-    altKey: boolean;
-    char: string;
-    charCode: number;
-    ctrlKey: boolean;
-    key: string;
-    keyCode: number;
-    locale: string;
-    location: number;
-    metaKey: boolean;
-    repeat: boolean;
-    shiftKey: boolean;
-    which: number;
+    readonly altKey: boolean;
+    readonly char: string;
+    readonly charCode: number;
+    readonly ctrlKey: boolean;
+    readonly key: string;
+    readonly keyCode: number;
+    readonly locale: string;
+    readonly location: number;
+    readonly metaKey: boolean;
+    readonly repeat: boolean;
+    readonly shiftKey: boolean;
+    readonly which: number;
     getModifierState(keyArg: string): boolean;
     initKeyboardEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, keyArg: string, locationArg: number, modifiersListArg: string, repeat: boolean, locale: string): void;
-    DOM_KEY_LOCATION_JOYSTICK: number;
-    DOM_KEY_LOCATION_LEFT: number;
-    DOM_KEY_LOCATION_MOBILE: number;
-    DOM_KEY_LOCATION_NUMPAD: number;
-    DOM_KEY_LOCATION_RIGHT: number;
-    DOM_KEY_LOCATION_STANDARD: number;
+    readonly DOM_KEY_LOCATION_JOYSTICK: number;
+    readonly DOM_KEY_LOCATION_LEFT: number;
+    readonly DOM_KEY_LOCATION_MOBILE: number;
+    readonly DOM_KEY_LOCATION_NUMPAD: number;
+    readonly DOM_KEY_LOCATION_RIGHT: number;
+    readonly DOM_KEY_LOCATION_STANDARD: number;
 }
 
 declare var KeyboardEvent: {
     prototype: KeyboardEvent;
     new(typeArg: string, eventInitDict?: KeyboardEventInit): KeyboardEvent;
-    DOM_KEY_LOCATION_JOYSTICK: number;
-    DOM_KEY_LOCATION_LEFT: number;
-    DOM_KEY_LOCATION_MOBILE: number;
-    DOM_KEY_LOCATION_NUMPAD: number;
-    DOM_KEY_LOCATION_RIGHT: number;
-    DOM_KEY_LOCATION_STANDARD: number;
+    readonly DOM_KEY_LOCATION_JOYSTICK: number;
+    readonly DOM_KEY_LOCATION_LEFT: number;
+    readonly DOM_KEY_LOCATION_MOBILE: number;
+    readonly DOM_KEY_LOCATION_NUMPAD: number;
+    readonly DOM_KEY_LOCATION_RIGHT: number;
+    readonly DOM_KEY_LOCATION_STANDARD: number;
+}
+
+interface ListeningStateChangedEvent extends Event {
+    readonly label: string;
+    readonly state: string;
+}
+
+declare var ListeningStateChangedEvent: {
+    prototype: ListeningStateChangedEvent;
+    new(): ListeningStateChangedEvent;
 }
 
 interface Location {
@@ -7347,7 +7800,7 @@ interface Location {
     host: string;
     hostname: string;
     href: string;
-    origin: string;
+    readonly origin: string;
     pathname: string;
     port: string;
     protocol: string;
@@ -7364,7 +7817,7 @@ declare var Location: {
 }
 
 interface LongRunningScriptDetectedEvent extends Event {
-    executionTime: number;
+    readonly executionTime: number;
     stopPageScriptExecution: boolean;
 }
 
@@ -7383,29 +7836,29 @@ interface MSApp {
     execAsyncAtPriority(asynchronousCallback: MSExecAtPriorityFunctionCallback, priority: string, ...args: any[]): void;
     execAtPriority(synchronousCallback: MSExecAtPriorityFunctionCallback, priority: string, ...args: any[]): any;
     getCurrentPriority(): string;
-    getHtmlPrintDocumentSourceAsync(htmlDoc: any): any;
+    getHtmlPrintDocumentSourceAsync(htmlDoc: any): PromiseLike<any>;
     getViewId(view: any): any;
     isTaskScheduledAtPriorityOrHigher(priority: string): boolean;
     pageHandlesAllApplicationActivations(enabled: boolean): void;
     suppressSubdownloadCredentialPrompts(suppress: boolean): void;
     terminateApp(exceptionObject: any): void;
-    CURRENT: string;
-    HIGH: string;
-    IDLE: string;
-    NORMAL: string;
+    readonly CURRENT: string;
+    readonly HIGH: string;
+    readonly IDLE: string;
+    readonly NORMAL: string;
 }
 declare var MSApp: MSApp;
 
 interface MSAppAsyncOperation extends EventTarget {
-    error: DOMError;
+    readonly error: DOMError;
     oncomplete: (ev: Event) => any;
     onerror: (ev: Event) => any;
-    readyState: number;
-    result: any;
+    readonly readyState: number;
+    readonly result: any;
     start(): void;
-    COMPLETED: number;
-    ERROR: number;
-    STARTED: number;
+    readonly COMPLETED: number;
+    readonly ERROR: number;
+    readonly STARTED: number;
     addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -7414,9 +7867,19 @@ interface MSAppAsyncOperation extends EventTarget {
 declare var MSAppAsyncOperation: {
     prototype: MSAppAsyncOperation;
     new(): MSAppAsyncOperation;
-    COMPLETED: number;
-    ERROR: number;
-    STARTED: number;
+    readonly COMPLETED: number;
+    readonly ERROR: number;
+    readonly STARTED: number;
+}
+
+interface MSAssertion {
+    readonly id: string;
+    readonly type: string;
+}
+
+declare var MSAssertion: {
+    prototype: MSAssertion;
+    new(): MSAssertion;
 }
 
 interface MSBlobBuilder {
@@ -7429,44 +7892,46 @@ declare var MSBlobBuilder: {
     new(): MSBlobBuilder;
 }
 
-interface MSCSSMatrix {
-    a: number;
-    b: number;
-    c: number;
-    d: number;
-    e: number;
-    f: number;
-    m11: number;
-    m12: number;
-    m13: number;
-    m14: number;
-    m21: number;
-    m22: number;
-    m23: number;
-    m24: number;
-    m31: number;
-    m32: number;
-    m33: number;
-    m34: number;
-    m41: number;
-    m42: number;
-    m43: number;
-    m44: number;
-    inverse(): MSCSSMatrix;
-    multiply(secondMatrix: MSCSSMatrix): MSCSSMatrix;
-    rotate(angleX: number, angleY?: number, angleZ?: number): MSCSSMatrix;
-    rotateAxisAngle(x: number, y: number, z: number, angle: number): MSCSSMatrix;
-    scale(scaleX: number, scaleY?: number, scaleZ?: number): MSCSSMatrix;
-    setMatrixValue(value: string): void;
-    skewX(angle: number): MSCSSMatrix;
-    skewY(angle: number): MSCSSMatrix;
-    toString(): string;
-    translate(x: number, y: number, z?: number): MSCSSMatrix;
+interface MSCredentials {
+    getAssertion(challenge: string, filter?: MSCredentialFilter, params?: MSSignatureParameters): PromiseLike<MSAssertion>;
+    makeCredential(accountInfo: MSAccountInfo, params: MSCredentialParameters[], challenge?: string): PromiseLike<MSAssertion>;
 }
 
-declare var MSCSSMatrix: {
-    prototype: MSCSSMatrix;
-    new(text?: string): MSCSSMatrix;
+declare var MSCredentials: {
+    prototype: MSCredentials;
+    new(): MSCredentials;
+}
+
+interface MSFIDOCredentialAssertion extends MSAssertion {
+    readonly algorithm: string | Algorithm;
+    readonly attestation: any;
+    readonly publicKey: string;
+    readonly transportHints: string[];
+}
+
+declare var MSFIDOCredentialAssertion: {
+    prototype: MSFIDOCredentialAssertion;
+    new(): MSFIDOCredentialAssertion;
+}
+
+interface MSFIDOSignature {
+    readonly authnrData: string;
+    readonly clientData: string;
+    readonly signature: string;
+}
+
+declare var MSFIDOSignature: {
+    prototype: MSFIDOSignature;
+    new(): MSFIDOSignature;
+}
+
+interface MSFIDOSignatureAssertion extends MSAssertion {
+    readonly signature: MSFIDOSignature;
+}
+
+declare var MSFIDOSignatureAssertion: {
+    prototype: MSFIDOSignatureAssertion;
+    new(): MSFIDOSignatureAssertion;
 }
 
 interface MSGesture {
@@ -7481,44 +7946,44 @@ declare var MSGesture: {
 }
 
 interface MSGestureEvent extends UIEvent {
-    clientX: number;
-    clientY: number;
-    expansion: number;
-    gestureObject: any;
-    hwTimestamp: number;
-    offsetX: number;
-    offsetY: number;
-    rotation: number;
-    scale: number;
-    screenX: number;
-    screenY: number;
-    translationX: number;
-    translationY: number;
-    velocityAngular: number;
-    velocityExpansion: number;
-    velocityX: number;
-    velocityY: number;
+    readonly clientX: number;
+    readonly clientY: number;
+    readonly expansion: number;
+    readonly gestureObject: any;
+    readonly hwTimestamp: number;
+    readonly offsetX: number;
+    readonly offsetY: number;
+    readonly rotation: number;
+    readonly scale: number;
+    readonly screenX: number;
+    readonly screenY: number;
+    readonly translationX: number;
+    readonly translationY: number;
+    readonly velocityAngular: number;
+    readonly velocityExpansion: number;
+    readonly velocityX: number;
+    readonly velocityY: number;
     initGestureEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, offsetXArg: number, offsetYArg: number, translationXArg: number, translationYArg: number, scaleArg: number, expansionArg: number, rotationArg: number, velocityXArg: number, velocityYArg: number, velocityExpansionArg: number, velocityAngularArg: number, hwTimestampArg: number): void;
-    MSGESTURE_FLAG_BEGIN: number;
-    MSGESTURE_FLAG_CANCEL: number;
-    MSGESTURE_FLAG_END: number;
-    MSGESTURE_FLAG_INERTIA: number;
-    MSGESTURE_FLAG_NONE: number;
+    readonly MSGESTURE_FLAG_BEGIN: number;
+    readonly MSGESTURE_FLAG_CANCEL: number;
+    readonly MSGESTURE_FLAG_END: number;
+    readonly MSGESTURE_FLAG_INERTIA: number;
+    readonly MSGESTURE_FLAG_NONE: number;
 }
 
 declare var MSGestureEvent: {
     prototype: MSGestureEvent;
     new(): MSGestureEvent;
-    MSGESTURE_FLAG_BEGIN: number;
-    MSGESTURE_FLAG_CANCEL: number;
-    MSGESTURE_FLAG_END: number;
-    MSGESTURE_FLAG_INERTIA: number;
-    MSGESTURE_FLAG_NONE: number;
+    readonly MSGESTURE_FLAG_BEGIN: number;
+    readonly MSGESTURE_FLAG_CANCEL: number;
+    readonly MSGESTURE_FLAG_END: number;
+    readonly MSGESTURE_FLAG_INERTIA: number;
+    readonly MSGESTURE_FLAG_NONE: number;
 }
 
 interface MSGraphicsTrust {
-    constrictionActive: boolean;
-    status: string;
+    readonly constrictionActive: boolean;
+    readonly status: string;
 }
 
 declare var MSGraphicsTrust: {
@@ -7527,12 +7992,12 @@ declare var MSGraphicsTrust: {
 }
 
 interface MSHTMLWebViewElement extends HTMLElement {
-    canGoBack: boolean;
-    canGoForward: boolean;
-    containsFullScreenElement: boolean;
-    documentTitle: string;
+    readonly canGoBack: boolean;
+    readonly canGoForward: boolean;
+    readonly containsFullScreenElement: boolean;
+    readonly documentTitle: string;
     height: number;
-    settings: MSWebViewSettings;
+    readonly settings: MSWebViewSettings;
     src: string;
     width: number;
     addWebAllowedObject(name: string, applicationObject: any): void;
@@ -7558,12 +8023,12 @@ declare var MSHTMLWebViewElement: {
 }
 
 interface MSInputMethodContext extends EventTarget {
-    compositionEndOffset: number;
-    compositionStartOffset: number;
+    readonly compositionEndOffset: number;
+    readonly compositionStartOffset: number;
     oncandidatewindowhide: (ev: Event) => any;
     oncandidatewindowshow: (ev: Event) => any;
     oncandidatewindowupdate: (ev: Event) => any;
-    target: HTMLElement;
+    readonly target: HTMLElement;
     getCandidateWindowClientRect(): ClientRect;
     getCompositionAlternatives(): string[];
     hasComposition(): boolean;
@@ -7580,59 +8045,59 @@ declare var MSInputMethodContext: {
 }
 
 interface MSManipulationEvent extends UIEvent {
-    currentState: number;
-    inertiaDestinationX: number;
-    inertiaDestinationY: number;
-    lastState: number;
+    readonly currentState: number;
+    readonly inertiaDestinationX: number;
+    readonly inertiaDestinationY: number;
+    readonly lastState: number;
     initMSManipulationEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, lastState: number, currentState: number): void;
-    MS_MANIPULATION_STATE_ACTIVE: number;
-    MS_MANIPULATION_STATE_CANCELLED: number;
-    MS_MANIPULATION_STATE_COMMITTED: number;
-    MS_MANIPULATION_STATE_DRAGGING: number;
-    MS_MANIPULATION_STATE_INERTIA: number;
-    MS_MANIPULATION_STATE_PRESELECT: number;
-    MS_MANIPULATION_STATE_SELECTING: number;
-    MS_MANIPULATION_STATE_STOPPED: number;
+    readonly MS_MANIPULATION_STATE_ACTIVE: number;
+    readonly MS_MANIPULATION_STATE_CANCELLED: number;
+    readonly MS_MANIPULATION_STATE_COMMITTED: number;
+    readonly MS_MANIPULATION_STATE_DRAGGING: number;
+    readonly MS_MANIPULATION_STATE_INERTIA: number;
+    readonly MS_MANIPULATION_STATE_PRESELECT: number;
+    readonly MS_MANIPULATION_STATE_SELECTING: number;
+    readonly MS_MANIPULATION_STATE_STOPPED: number;
 }
 
 declare var MSManipulationEvent: {
     prototype: MSManipulationEvent;
     new(): MSManipulationEvent;
-    MS_MANIPULATION_STATE_ACTIVE: number;
-    MS_MANIPULATION_STATE_CANCELLED: number;
-    MS_MANIPULATION_STATE_COMMITTED: number;
-    MS_MANIPULATION_STATE_DRAGGING: number;
-    MS_MANIPULATION_STATE_INERTIA: number;
-    MS_MANIPULATION_STATE_PRESELECT: number;
-    MS_MANIPULATION_STATE_SELECTING: number;
-    MS_MANIPULATION_STATE_STOPPED: number;
+    readonly MS_MANIPULATION_STATE_ACTIVE: number;
+    readonly MS_MANIPULATION_STATE_CANCELLED: number;
+    readonly MS_MANIPULATION_STATE_COMMITTED: number;
+    readonly MS_MANIPULATION_STATE_DRAGGING: number;
+    readonly MS_MANIPULATION_STATE_INERTIA: number;
+    readonly MS_MANIPULATION_STATE_PRESELECT: number;
+    readonly MS_MANIPULATION_STATE_SELECTING: number;
+    readonly MS_MANIPULATION_STATE_STOPPED: number;
 }
 
 interface MSMediaKeyError {
-    code: number;
-    systemCode: number;
-    MS_MEDIA_KEYERR_CLIENT: number;
-    MS_MEDIA_KEYERR_DOMAIN: number;
-    MS_MEDIA_KEYERR_HARDWARECHANGE: number;
-    MS_MEDIA_KEYERR_OUTPUT: number;
-    MS_MEDIA_KEYERR_SERVICE: number;
-    MS_MEDIA_KEYERR_UNKNOWN: number;
+    readonly code: number;
+    readonly systemCode: number;
+    readonly MS_MEDIA_KEYERR_CLIENT: number;
+    readonly MS_MEDIA_KEYERR_DOMAIN: number;
+    readonly MS_MEDIA_KEYERR_HARDWARECHANGE: number;
+    readonly MS_MEDIA_KEYERR_OUTPUT: number;
+    readonly MS_MEDIA_KEYERR_SERVICE: number;
+    readonly MS_MEDIA_KEYERR_UNKNOWN: number;
 }
 
 declare var MSMediaKeyError: {
     prototype: MSMediaKeyError;
     new(): MSMediaKeyError;
-    MS_MEDIA_KEYERR_CLIENT: number;
-    MS_MEDIA_KEYERR_DOMAIN: number;
-    MS_MEDIA_KEYERR_HARDWARECHANGE: number;
-    MS_MEDIA_KEYERR_OUTPUT: number;
-    MS_MEDIA_KEYERR_SERVICE: number;
-    MS_MEDIA_KEYERR_UNKNOWN: number;
+    readonly MS_MEDIA_KEYERR_CLIENT: number;
+    readonly MS_MEDIA_KEYERR_DOMAIN: number;
+    readonly MS_MEDIA_KEYERR_HARDWARECHANGE: number;
+    readonly MS_MEDIA_KEYERR_OUTPUT: number;
+    readonly MS_MEDIA_KEYERR_SERVICE: number;
+    readonly MS_MEDIA_KEYERR_UNKNOWN: number;
 }
 
 interface MSMediaKeyMessageEvent extends Event {
-    destinationURL: string;
-    message: Uint8Array;
+    readonly destinationURL: string;
+    readonly message: Uint8Array;
 }
 
 declare var MSMediaKeyMessageEvent: {
@@ -7641,7 +8106,7 @@ declare var MSMediaKeyMessageEvent: {
 }
 
 interface MSMediaKeyNeededEvent extends Event {
-    initData: Uint8Array;
+    readonly initData: Uint8Array;
 }
 
 declare var MSMediaKeyNeededEvent: {
@@ -7650,9 +8115,9 @@ declare var MSMediaKeyNeededEvent: {
 }
 
 interface MSMediaKeySession extends EventTarget {
-    error: MSMediaKeyError;
-    keySystem: string;
-    sessionId: string;
+    readonly error: MSMediaKeyError;
+    readonly keySystem: string;
+    readonly sessionId: string;
     close(): void;
     update(key: Uint8Array): void;
 }
@@ -7663,7 +8128,7 @@ declare var MSMediaKeySession: {
 }
 
 interface MSMediaKeys {
-    keySystem: string;
+    readonly keySystem: string;
     createSession(type: string, initData: Uint8Array, cdmData?: Uint8Array): MSMediaKeySession;
 }
 
@@ -7671,40 +8136,22 @@ declare var MSMediaKeys: {
     prototype: MSMediaKeys;
     new(keySystem: string): MSMediaKeys;
     isTypeSupported(keySystem: string, type?: string): boolean;
-}
-
-interface MSMimeTypesCollection {
-    length: number;
-}
-
-declare var MSMimeTypesCollection: {
-    prototype: MSMimeTypesCollection;
-    new(): MSMimeTypesCollection;
-}
-
-interface MSPluginsCollection {
-    length: number;
-    refresh(reload?: boolean): void;
-}
-
-declare var MSPluginsCollection: {
-    prototype: MSPluginsCollection;
-    new(): MSPluginsCollection;
+    isTypeSupportedWithFeatures(keySystem: string, type?: string): string;
 }
 
 interface MSPointerEvent extends MouseEvent {
-    currentPoint: any;
-    height: number;
-    hwTimestamp: number;
-    intermediatePoints: any;
-    isPrimary: boolean;
-    pointerId: number;
-    pointerType: any;
-    pressure: number;
-    rotation: number;
-    tiltX: number;
-    tiltY: number;
-    width: number;
+    readonly currentPoint: any;
+    readonly height: number;
+    readonly hwTimestamp: number;
+    readonly intermediatePoints: any;
+    readonly isPrimary: boolean;
+    readonly pointerId: number;
+    readonly pointerType: any;
+    readonly pressure: number;
+    readonly rotation: number;
+    readonly tiltX: number;
+    readonly tiltY: number;
+    readonly width: number;
     getCurrentPoint(element: Element): void;
     getIntermediatePoints(element: Element): void;
     initPointerEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget, offsetXArg: number, offsetYArg: number, widthArg: number, heightArg: number, pressure: number, rotation: number, tiltX: number, tiltY: number, pointerIdArg: number, pointerType: any, hwTimestampArg: number, isPrimary: boolean): void;
@@ -7716,7 +8163,7 @@ declare var MSPointerEvent: {
 }
 
 interface MSRangeCollection {
-    length: number;
+    readonly length: number;
     item(index: number): Range;
     [index: number]: Range;
 }
@@ -7727,8 +8174,8 @@ declare var MSRangeCollection: {
 }
 
 interface MSSiteModeEvent extends Event {
-    actionURL: string;
-    buttonID: number;
+    readonly actionURL: string;
+    readonly buttonID: number;
 }
 
 declare var MSSiteModeEvent: {
@@ -7737,7 +8184,7 @@ declare var MSSiteModeEvent: {
 }
 
 interface MSStream {
-    type: string;
+    readonly type: string;
     msClose(): void;
     msDetachStream(): any;
 }
@@ -7748,7 +8195,7 @@ declare var MSStream: {
 }
 
 interface MSStreamReader extends EventTarget, MSBaseReader {
-    error: DOMError;
+    readonly error: DOMError;
     readAsArrayBuffer(stream: MSStream, size?: number): void;
     readAsBinaryString(stream: MSStream, size?: number): void;
     readAsBlob(stream: MSStream, size?: number): void;
@@ -7763,20 +8210,20 @@ declare var MSStreamReader: {
 }
 
 interface MSWebViewAsyncOperation extends EventTarget {
-    error: DOMError;
+    readonly error: DOMError;
     oncomplete: (ev: Event) => any;
     onerror: (ev: Event) => any;
-    readyState: number;
-    result: any;
-    target: MSHTMLWebViewElement;
-    type: number;
+    readonly readyState: number;
+    readonly result: any;
+    readonly target: MSHTMLWebViewElement;
+    readonly type: number;
     start(): void;
-    COMPLETED: number;
-    ERROR: number;
-    STARTED: number;
-    TYPE_CAPTURE_PREVIEW_TO_RANDOM_ACCESS_STREAM: number;
-    TYPE_CREATE_DATA_PACKAGE_FROM_SELECTION: number;
-    TYPE_INVOKE_SCRIPT: number;
+    readonly COMPLETED: number;
+    readonly ERROR: number;
+    readonly STARTED: number;
+    readonly TYPE_CAPTURE_PREVIEW_TO_RANDOM_ACCESS_STREAM: number;
+    readonly TYPE_CREATE_DATA_PACKAGE_FROM_SELECTION: number;
+    readonly TYPE_INVOKE_SCRIPT: number;
     addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -7785,12 +8232,12 @@ interface MSWebViewAsyncOperation extends EventTarget {
 declare var MSWebViewAsyncOperation: {
     prototype: MSWebViewAsyncOperation;
     new(): MSWebViewAsyncOperation;
-    COMPLETED: number;
-    ERROR: number;
-    STARTED: number;
-    TYPE_CAPTURE_PREVIEW_TO_RANDOM_ACCESS_STREAM: number;
-    TYPE_CREATE_DATA_PACKAGE_FROM_SELECTION: number;
-    TYPE_INVOKE_SCRIPT: number;
+    readonly COMPLETED: number;
+    readonly ERROR: number;
+    readonly STARTED: number;
+    readonly TYPE_CAPTURE_PREVIEW_TO_RANDOM_ACCESS_STREAM: number;
+    readonly TYPE_CREATE_DATA_PACKAGE_FROM_SELECTION: number;
+    readonly TYPE_INVOKE_SCRIPT: number;
 }
 
 interface MSWebViewSettings {
@@ -7803,6 +8250,32 @@ declare var MSWebViewSettings: {
     new(): MSWebViewSettings;
 }
 
+interface MediaDeviceInfo {
+    readonly deviceId: string;
+    readonly groupId: string;
+    readonly kind: string;
+    readonly label: string;
+}
+
+declare var MediaDeviceInfo: {
+    prototype: MediaDeviceInfo;
+    new(): MediaDeviceInfo;
+}
+
+interface MediaDevices extends EventTarget {
+    ondevicechange: (ev: Event) => any;
+    enumerateDevices(): any;
+    getSupportedConstraints(): MediaTrackSupportedConstraints;
+    getUserMedia(constraints: MediaStreamConstraints): PromiseLike<MediaStream>;
+    addEventListener(type: "devicechange", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var MediaDevices: {
+    prototype: MediaDevices;
+    new(): MediaDevices;
+}
+
 interface MediaElementAudioSourceNode extends AudioNode {
 }
 
@@ -7811,28 +8284,98 @@ declare var MediaElementAudioSourceNode: {
     new(): MediaElementAudioSourceNode;
 }
 
+interface MediaEncryptedEvent extends Event {
+    readonly initData: ArrayBuffer;
+    readonly initDataType: string;
+}
+
+declare var MediaEncryptedEvent: {
+    prototype: MediaEncryptedEvent;
+    new(type: string, eventInitDict?: MediaEncryptedEventInit): MediaEncryptedEvent;
+}
+
 interface MediaError {
-    code: number;
-    msExtendedCode: number;
-    MEDIA_ERR_ABORTED: number;
-    MEDIA_ERR_DECODE: number;
-    MEDIA_ERR_NETWORK: number;
-    MEDIA_ERR_SRC_NOT_SUPPORTED: number;
-    MS_MEDIA_ERR_ENCRYPTED: number;
+    readonly code: number;
+    readonly msExtendedCode: number;
+    readonly MEDIA_ERR_ABORTED: number;
+    readonly MEDIA_ERR_DECODE: number;
+    readonly MEDIA_ERR_NETWORK: number;
+    readonly MEDIA_ERR_SRC_NOT_SUPPORTED: number;
+    readonly MS_MEDIA_ERR_ENCRYPTED: number;
 }
 
 declare var MediaError: {
     prototype: MediaError;
     new(): MediaError;
-    MEDIA_ERR_ABORTED: number;
-    MEDIA_ERR_DECODE: number;
-    MEDIA_ERR_NETWORK: number;
-    MEDIA_ERR_SRC_NOT_SUPPORTED: number;
-    MS_MEDIA_ERR_ENCRYPTED: number;
+    readonly MEDIA_ERR_ABORTED: number;
+    readonly MEDIA_ERR_DECODE: number;
+    readonly MEDIA_ERR_NETWORK: number;
+    readonly MEDIA_ERR_SRC_NOT_SUPPORTED: number;
+    readonly MS_MEDIA_ERR_ENCRYPTED: number;
+}
+
+interface MediaKeyMessageEvent extends Event {
+    readonly message: ArrayBuffer;
+    readonly messageType: string;
+}
+
+declare var MediaKeyMessageEvent: {
+    prototype: MediaKeyMessageEvent;
+    new(type: string, eventInitDict?: MediaKeyMessageEventInit): MediaKeyMessageEvent;
+}
+
+interface MediaKeySession extends EventTarget {
+    readonly closed: PromiseLike<void>;
+    readonly expiration: number;
+    readonly keyStatuses: MediaKeyStatusMap;
+    readonly sessionId: string;
+    close(): PromiseLike<void>;
+    generateRequest(initDataType: string, initData: any): PromiseLike<void>;
+    load(sessionId: string): PromiseLike<boolean>;
+    remove(): PromiseLike<void>;
+    update(response: any): PromiseLike<void>;
+}
+
+declare var MediaKeySession: {
+    prototype: MediaKeySession;
+    new(): MediaKeySession;
+}
+
+interface MediaKeyStatusMap {
+    readonly size: number;
+    forEach(callback: ForEachCallback): void;
+    get(keyId: any): string;
+    has(keyId: any): boolean;
+}
+
+declare var MediaKeyStatusMap: {
+    prototype: MediaKeyStatusMap;
+    new(): MediaKeyStatusMap;
+}
+
+interface MediaKeySystemAccess {
+    readonly keySystem: string;
+    createMediaKeys(): PromiseLike<MediaKeys>;
+    getConfiguration(): MediaKeySystemConfiguration;
+}
+
+declare var MediaKeySystemAccess: {
+    prototype: MediaKeySystemAccess;
+    new(): MediaKeySystemAccess;
+}
+
+interface MediaKeys {
+    createSession(sessionType?: string): MediaKeySession;
+    setServerCertificate(serverCertificate: any): PromiseLike<void>;
+}
+
+declare var MediaKeys: {
+    prototype: MediaKeys;
+    new(): MediaKeys;
 }
 
 interface MediaList {
-    length: number;
+    readonly length: number;
     mediaText: string;
     appendMedium(newMedium: string): void;
     deleteMedium(oldMedium: string): void;
@@ -7847,8 +8390,8 @@ declare var MediaList: {
 }
 
 interface MediaQueryList {
-    matches: boolean;
-    media: string;
+    readonly matches: boolean;
+    readonly media: string;
     addListener(listener: MediaQueryListListener): void;
     removeListener(listener: MediaQueryListListener): void;
 }
@@ -7859,10 +8402,10 @@ declare var MediaQueryList: {
 }
 
 interface MediaSource extends EventTarget {
-    activeSourceBuffers: SourceBufferList;
+    readonly activeSourceBuffers: SourceBufferList;
     duration: number;
-    readyState: string;
-    sourceBuffers: SourceBufferList;
+    readonly readyState: string;
+    readonly sourceBuffers: SourceBufferList;
     addSourceBuffer(type: string): SourceBuffer;
     endOfStream(error?: number): void;
     removeSourceBuffer(sourceBuffer: SourceBuffer): void;
@@ -7874,9 +8417,104 @@ declare var MediaSource: {
     isTypeSupported(type: string): boolean;
 }
 
+interface MediaStream extends EventTarget {
+    readonly active: boolean;
+    readonly id: string;
+    onactive: (ev: Event) => any;
+    onaddtrack: (ev: TrackEvent) => any;
+    oninactive: (ev: Event) => any;
+    onremovetrack: (ev: TrackEvent) => any;
+    addTrack(track: MediaStreamTrack): void;
+    clone(): MediaStream;
+    getAudioTracks(): MediaStreamTrack[];
+    getTrackById(trackId: string): MediaStreamTrack;
+    getTracks(): MediaStreamTrack[];
+    getVideoTracks(): MediaStreamTrack[];
+    removeTrack(track: MediaStreamTrack): void;
+    stop(): void;
+    addEventListener(type: "active", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "addtrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "inactive", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "removetrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var MediaStream: {
+    prototype: MediaStream;
+    new(streamOrTracks?: MediaStream | MediaStreamTrack[]): MediaStream;
+}
+
+interface MediaStreamAudioSourceNode extends AudioNode {
+}
+
+declare var MediaStreamAudioSourceNode: {
+    prototype: MediaStreamAudioSourceNode;
+    new(): MediaStreamAudioSourceNode;
+}
+
+interface MediaStreamError {
+    readonly constraintName: string;
+    readonly message: string;
+    readonly name: string;
+}
+
+declare var MediaStreamError: {
+    prototype: MediaStreamError;
+    new(): MediaStreamError;
+}
+
+interface MediaStreamErrorEvent extends Event {
+    readonly error: MediaStreamError;
+}
+
+declare var MediaStreamErrorEvent: {
+    prototype: MediaStreamErrorEvent;
+    new(type: string, eventInitDict?: MediaStreamErrorEventInit): MediaStreamErrorEvent;
+}
+
+interface MediaStreamTrack extends EventTarget {
+    enabled: boolean;
+    readonly id: string;
+    readonly kind: string;
+    readonly label: string;
+    readonly muted: boolean;
+    onended: (ev: MediaStreamErrorEvent) => any;
+    onmute: (ev: Event) => any;
+    onoverconstrained: (ev: MediaStreamErrorEvent) => any;
+    onunmute: (ev: Event) => any;
+    readonly readonly: boolean;
+    readonly readyState: string;
+    readonly remote: boolean;
+    applyConstraints(constraints: MediaTrackConstraints): PromiseLike<void>;
+    clone(): MediaStreamTrack;
+    getCapabilities(): MediaTrackCapabilities;
+    getConstraints(): MediaTrackConstraints;
+    getSettings(): MediaTrackSettings;
+    stop(): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mute", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "overconstrained", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "unmute", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var MediaStreamTrack: {
+    prototype: MediaStreamTrack;
+    new(): MediaStreamTrack;
+}
+
+interface MediaStreamTrackEvent extends Event {
+    readonly track: MediaStreamTrack;
+}
+
+declare var MediaStreamTrackEvent: {
+    prototype: MediaStreamTrackEvent;
+    new(type: string, eventInitDict?: MediaStreamTrackEventInit): MediaStreamTrackEvent;
+}
+
 interface MessageChannel {
-    port1: MessagePort;
-    port2: MessagePort;
+    readonly port1: MessagePort;
+    readonly port2: MessagePort;
 }
 
 declare var MessageChannel: {
@@ -7885,10 +8523,10 @@ declare var MessageChannel: {
 }
 
 interface MessageEvent extends Event {
-    data: any;
-    origin: string;
-    ports: any;
-    source: Window;
+    readonly data: any;
+    readonly origin: string;
+    readonly ports: any;
+    readonly source: Window;
     initMessageEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, dataArg: any, originArg: string, lastEventIdArg: string, sourceArg: Window): void;
 }
 
@@ -7912,10 +8550,10 @@ declare var MessagePort: {
 }
 
 interface MimeType {
-    description: string;
-    enabledPlugin: Plugin;
-    suffixes: string;
-    type: string;
+    readonly description: string;
+    readonly enabledPlugin: Plugin;
+    readonly suffixes: string;
+    readonly type: string;
 }
 
 declare var MimeType: {
@@ -7924,7 +8562,7 @@ declare var MimeType: {
 }
 
 interface MimeTypeArray {
-    length: number;
+    readonly length: number;
     item(index: number): Plugin;
     namedItem(type: string): Plugin;
     [index: number]: Plugin;
@@ -7936,30 +8574,30 @@ declare var MimeTypeArray: {
 }
 
 interface MouseEvent extends UIEvent {
-    altKey: boolean;
-    button: number;
-    buttons: number;
-    clientX: number;
-    clientY: number;
-    ctrlKey: boolean;
-    fromElement: Element;
-    layerX: number;
-    layerY: number;
-    metaKey: boolean;
-    movementX: number;
-    movementY: number;
-    offsetX: number;
-    offsetY: number;
-    pageX: number;
-    pageY: number;
-    relatedTarget: EventTarget;
-    screenX: number;
-    screenY: number;
-    shiftKey: boolean;
-    toElement: Element;
-    which: number;
-    x: number;
-    y: number;
+    readonly altKey: boolean;
+    readonly button: number;
+    readonly buttons: number;
+    readonly clientX: number;
+    readonly clientY: number;
+    readonly ctrlKey: boolean;
+    readonly fromElement: Element;
+    readonly layerX: number;
+    readonly layerY: number;
+    readonly metaKey: boolean;
+    readonly movementX: number;
+    readonly movementY: number;
+    readonly offsetX: number;
+    readonly offsetY: number;
+    readonly pageX: number;
+    readonly pageY: number;
+    readonly relatedTarget: EventTarget;
+    readonly screenX: number;
+    readonly screenY: number;
+    readonly shiftKey: boolean;
+    readonly toElement: Element;
+    readonly which: number;
+    readonly x: number;
+    readonly y: number;
     getModifierState(keyArg: string): boolean;
     initMouseEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget): void;
 }
@@ -7969,36 +8607,24 @@ declare var MouseEvent: {
     new(typeArg: string, eventInitDict?: MouseEventInit): MouseEvent;
 }
 
-interface MouseWheelEvent extends MouseEvent {
-    wheelDelta: number;
-    wheelDeltaX: number;
-    wheelDeltaY: number;
-    initMouseWheelEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, buttonArg: number, relatedTargetArg: EventTarget, modifiersListArg: string, wheelDeltaArg: number): void;
-}
-
-declare var MouseWheelEvent: {
-    prototype: MouseWheelEvent;
-    new(): MouseWheelEvent;
-}
-
 interface MutationEvent extends Event {
-    attrChange: number;
-    attrName: string;
-    newValue: string;
-    prevValue: string;
-    relatedNode: Node;
+    readonly attrChange: number;
+    readonly attrName: string;
+    readonly newValue: string;
+    readonly prevValue: string;
+    readonly relatedNode: Node;
     initMutationEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, relatedNodeArg: Node, prevValueArg: string, newValueArg: string, attrNameArg: string, attrChangeArg: number): void;
-    ADDITION: number;
-    MODIFICATION: number;
-    REMOVAL: number;
+    readonly ADDITION: number;
+    readonly MODIFICATION: number;
+    readonly REMOVAL: number;
 }
 
 declare var MutationEvent: {
     prototype: MutationEvent;
     new(): MutationEvent;
-    ADDITION: number;
-    MODIFICATION: number;
-    REMOVAL: number;
+    readonly ADDITION: number;
+    readonly MODIFICATION: number;
+    readonly REMOVAL: number;
 }
 
 interface MutationObserver {
@@ -8013,15 +8639,15 @@ declare var MutationObserver: {
 }
 
 interface MutationRecord {
-    addedNodes: NodeList;
-    attributeName: string;
-    attributeNamespace: string;
-    nextSibling: Node;
-    oldValue: string;
-    previousSibling: Node;
-    removedNodes: NodeList;
-    target: Node;
-    type: string;
+    readonly addedNodes: NodeList;
+    readonly attributeName: string;
+    readonly attributeNamespace: string;
+    readonly nextSibling: Node;
+    readonly oldValue: string;
+    readonly previousSibling: Node;
+    readonly removedNodes: NodeList;
+    readonly target: Node;
+    readonly type: string;
 }
 
 declare var MutationRecord: {
@@ -8030,7 +8656,7 @@ declare var MutationRecord: {
 }
 
 interface NamedNodeMap {
-    length: number;
+    readonly length: number;
     getNamedItem(name: string): Attr;
     getNamedItemNS(namespaceURI: string, localName: string): Attr;
     item(index: number): Attr;
@@ -8047,8 +8673,8 @@ declare var NamedNodeMap: {
 }
 
 interface NavigationCompletedEvent extends NavigationEvent {
-    isSuccess: boolean;
-    webErrorStatus: number;
+    readonly isSuccess: boolean;
+    readonly webErrorStatus: number;
 }
 
 declare var NavigationCompletedEvent: {
@@ -8057,7 +8683,7 @@ declare var NavigationCompletedEvent: {
 }
 
 interface NavigationEvent extends Event {
-    uri: string;
+    readonly uri: string;
 }
 
 declare var NavigationEvent: {
@@ -8066,7 +8692,7 @@ declare var NavigationEvent: {
 }
 
 interface NavigationEventWithReferrer extends NavigationEvent {
-    referer: string;
+    readonly referer: string;
 }
 
 declare var NavigationEventWithReferrer: {
@@ -8074,27 +8700,22 @@ declare var NavigationEventWithReferrer: {
     new(): NavigationEventWithReferrer;
 }
 
-interface Navigator extends Object, NavigatorID, NavigatorOnLine, NavigatorContentUtils, NavigatorStorageUtils, NavigatorGeolocation, MSNavigatorDoNotTrack, MSFileSaver {
-    appCodeName: string;
-    appMinorVersion: string;
-    browserLanguage: string;
-    connectionSpeed: number;
-    cookieEnabled: boolean;
-    cpuClass: string;
-    language: string;
-    maxTouchPoints: number;
-    mimeTypes: MSMimeTypesCollection;
-    msManipulationViewsEnabled: boolean;
-    msMaxTouchPoints: number;
-    msPointerEnabled: boolean;
-    plugins: MSPluginsCollection;
-    pointerEnabled: boolean;
-    systemLanguage: string;
-    userLanguage: string;
-    webdriver: boolean;
+interface Navigator extends Object, NavigatorID, NavigatorOnLine, NavigatorContentUtils, NavigatorStorageUtils, NavigatorGeolocation, MSNavigatorDoNotTrack, MSFileSaver, NavigatorUserMedia {
+    readonly appCodeName: string;
+    readonly cookieEnabled: boolean;
+    readonly language: string;
+    readonly maxTouchPoints: number;
+    readonly mimeTypes: MimeTypeArray;
+    readonly msManipulationViewsEnabled: boolean;
+    readonly msMaxTouchPoints: number;
+    readonly msPointerEnabled: boolean;
+    readonly plugins: PluginArray;
+    readonly pointerEnabled: boolean;
+    readonly webdriver: boolean;
     getGamepads(): Gamepad[];
     javaEnabled(): boolean;
     msLaunchUri(uri: string, successCallback?: MSLaunchUriCallback, noHandlerCallback?: MSLaunchUriCallback): void;
+    requestMediaKeySystemAccess(keySystem: string, supportedConfigurations: MediaKeySystemConfiguration[]): PromiseLike<MediaKeySystemAccess>;
     vibrate(pattern: number | number[]): boolean;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
@@ -8105,26 +8726,26 @@ declare var Navigator: {
 }
 
 interface Node extends EventTarget {
-    attributes: NamedNodeMap;
-    baseURI: string;
-    childNodes: NodeList;
-    firstChild: Node;
-    lastChild: Node;
-    localName: string;
-    namespaceURI: string;
-    nextSibling: Node;
-    nodeName: string;
-    nodeType: number;
+    readonly attributes: NamedNodeMap;
+    readonly baseURI: string;
+    readonly childNodes: NodeList;
+    readonly firstChild: Node;
+    readonly lastChild: Node;
+    readonly localName: string;
+    readonly namespaceURI: string;
+    readonly nextSibling: Node;
+    readonly nodeName: string;
+    readonly nodeType: number;
     nodeValue: string;
-    ownerDocument: Document;
-    parentElement: HTMLElement;
-    parentNode: Node;
-    prefix: string;
-    previousSibling: Node;
+    readonly ownerDocument: Document;
+    readonly parentElement: HTMLElement;
+    readonly parentNode: Node;
+    readonly previousSibling: Node;
     textContent: string;
     appendChild(newChild: Node): Node;
     cloneNode(deep?: boolean): Node;
     compareDocumentPosition(other: Node): number;
+    contains(child: Node): boolean;
     hasAttributes(): boolean;
     hasChildNodes(): boolean;
     insertBefore(newChild: Node, refChild?: Node): Node;
@@ -8137,47 +8758,47 @@ interface Node extends EventTarget {
     removeChild(oldChild: Node): Node;
     replaceChild(newChild: Node, oldChild: Node): Node;
     contains(node: Node): boolean;
-    ATTRIBUTE_NODE: number;
-    CDATA_SECTION_NODE: number;
-    COMMENT_NODE: number;
-    DOCUMENT_FRAGMENT_NODE: number;
-    DOCUMENT_NODE: number;
-    DOCUMENT_POSITION_CONTAINED_BY: number;
-    DOCUMENT_POSITION_CONTAINS: number;
-    DOCUMENT_POSITION_DISCONNECTED: number;
-    DOCUMENT_POSITION_FOLLOWING: number;
-    DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number;
-    DOCUMENT_POSITION_PRECEDING: number;
-    DOCUMENT_TYPE_NODE: number;
-    ELEMENT_NODE: number;
-    ENTITY_NODE: number;
-    ENTITY_REFERENCE_NODE: number;
-    NOTATION_NODE: number;
-    PROCESSING_INSTRUCTION_NODE: number;
-    TEXT_NODE: number;
+    readonly ATTRIBUTE_NODE: number;
+    readonly CDATA_SECTION_NODE: number;
+    readonly COMMENT_NODE: number;
+    readonly DOCUMENT_FRAGMENT_NODE: number;
+    readonly DOCUMENT_NODE: number;
+    readonly DOCUMENT_POSITION_CONTAINED_BY: number;
+    readonly DOCUMENT_POSITION_CONTAINS: number;
+    readonly DOCUMENT_POSITION_DISCONNECTED: number;
+    readonly DOCUMENT_POSITION_FOLLOWING: number;
+    readonly DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number;
+    readonly DOCUMENT_POSITION_PRECEDING: number;
+    readonly DOCUMENT_TYPE_NODE: number;
+    readonly ELEMENT_NODE: number;
+    readonly ENTITY_NODE: number;
+    readonly ENTITY_REFERENCE_NODE: number;
+    readonly NOTATION_NODE: number;
+    readonly PROCESSING_INSTRUCTION_NODE: number;
+    readonly TEXT_NODE: number;
 }
 
 declare var Node: {
     prototype: Node;
     new(): Node;
-    ATTRIBUTE_NODE: number;
-    CDATA_SECTION_NODE: number;
-    COMMENT_NODE: number;
-    DOCUMENT_FRAGMENT_NODE: number;
-    DOCUMENT_NODE: number;
-    DOCUMENT_POSITION_CONTAINED_BY: number;
-    DOCUMENT_POSITION_CONTAINS: number;
-    DOCUMENT_POSITION_DISCONNECTED: number;
-    DOCUMENT_POSITION_FOLLOWING: number;
-    DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number;
-    DOCUMENT_POSITION_PRECEDING: number;
-    DOCUMENT_TYPE_NODE: number;
-    ELEMENT_NODE: number;
-    ENTITY_NODE: number;
-    ENTITY_REFERENCE_NODE: number;
-    NOTATION_NODE: number;
-    PROCESSING_INSTRUCTION_NODE: number;
-    TEXT_NODE: number;
+    readonly ATTRIBUTE_NODE: number;
+    readonly CDATA_SECTION_NODE: number;
+    readonly COMMENT_NODE: number;
+    readonly DOCUMENT_FRAGMENT_NODE: number;
+    readonly DOCUMENT_NODE: number;
+    readonly DOCUMENT_POSITION_CONTAINED_BY: number;
+    readonly DOCUMENT_POSITION_CONTAINS: number;
+    readonly DOCUMENT_POSITION_DISCONNECTED: number;
+    readonly DOCUMENT_POSITION_FOLLOWING: number;
+    readonly DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number;
+    readonly DOCUMENT_POSITION_PRECEDING: number;
+    readonly DOCUMENT_TYPE_NODE: number;
+    readonly ELEMENT_NODE: number;
+    readonly ENTITY_NODE: number;
+    readonly ENTITY_REFERENCE_NODE: number;
+    readonly NOTATION_NODE: number;
+    readonly PROCESSING_INSTRUCTION_NODE: number;
+    readonly TEXT_NODE: number;
 }
 
 interface NodeFilter {
@@ -8185,29 +8806,29 @@ interface NodeFilter {
 }
 
 declare var NodeFilter: {
-    FILTER_ACCEPT: number;
-    FILTER_REJECT: number;
-    FILTER_SKIP: number;
-    SHOW_ALL: number;
-    SHOW_ATTRIBUTE: number;
-    SHOW_CDATA_SECTION: number;
-    SHOW_COMMENT: number;
-    SHOW_DOCUMENT: number;
-    SHOW_DOCUMENT_FRAGMENT: number;
-    SHOW_DOCUMENT_TYPE: number;
-    SHOW_ELEMENT: number;
-    SHOW_ENTITY: number;
-    SHOW_ENTITY_REFERENCE: number;
-    SHOW_NOTATION: number;
-    SHOW_PROCESSING_INSTRUCTION: number;
-    SHOW_TEXT: number;
+    readonly FILTER_ACCEPT: number;
+    readonly FILTER_REJECT: number;
+    readonly FILTER_SKIP: number;
+    readonly SHOW_ALL: number;
+    readonly SHOW_ATTRIBUTE: number;
+    readonly SHOW_CDATA_SECTION: number;
+    readonly SHOW_COMMENT: number;
+    readonly SHOW_DOCUMENT: number;
+    readonly SHOW_DOCUMENT_FRAGMENT: number;
+    readonly SHOW_DOCUMENT_TYPE: number;
+    readonly SHOW_ELEMENT: number;
+    readonly SHOW_ENTITY: number;
+    readonly SHOW_ENTITY_REFERENCE: number;
+    readonly SHOW_NOTATION: number;
+    readonly SHOW_PROCESSING_INSTRUCTION: number;
+    readonly SHOW_TEXT: number;
 }
 
 interface NodeIterator {
-    expandEntityReferences: boolean;
-    filter: NodeFilter;
-    root: Node;
-    whatToShow: number;
+    readonly expandEntityReferences: boolean;
+    readonly filter: NodeFilter;
+    readonly root: Node;
+    readonly whatToShow: number;
     detach(): void;
     nextNode(): Node;
     previousNode(): Node;
@@ -8219,7 +8840,7 @@ declare var NodeIterator: {
 }
 
 interface NodeList {
-    length: number;
+    readonly length: number;
     item(index: number): Node;
     [index: number]: Node;
 }
@@ -8238,13 +8859,13 @@ declare var OES_element_index_uint: {
 }
 
 interface OES_standard_derivatives {
-    FRAGMENT_SHADER_DERIVATIVE_HINT_OES: number;
+    readonly FRAGMENT_SHADER_DERIVATIVE_HINT_OES: number;
 }
 
 declare var OES_standard_derivatives: {
     prototype: OES_standard_derivatives;
     new(): OES_standard_derivatives;
-    FRAGMENT_SHADER_DERIVATIVE_HINT_OES: number;
+    readonly FRAGMENT_SHADER_DERIVATIVE_HINT_OES: number;
 }
 
 interface OES_texture_float {
@@ -8264,7 +8885,7 @@ declare var OES_texture_float_linear: {
 }
 
 interface OfflineAudioCompletionEvent extends Event {
-    renderedBuffer: AudioBuffer;
+    readonly renderedBuffer: AudioBuffer;
 }
 
 declare var OfflineAudioCompletionEvent: {
@@ -8274,7 +8895,7 @@ declare var OfflineAudioCompletionEvent: {
 
 interface OfflineAudioContext extends AudioContext {
     oncomplete: (ev: Event) => any;
-    startRendering(): void;
+    startRendering(): PromiseLike<AudioBuffer>;
     addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
@@ -8285,14 +8906,14 @@ declare var OfflineAudioContext: {
 }
 
 interface OscillatorNode extends AudioNode {
-    detune: AudioParam;
-    frequency: AudioParam;
-    onended: (ev: Event) => any;
+    readonly detune: AudioParam;
+    readonly frequency: AudioParam;
+    onended: (ev: MediaStreamErrorEvent) => any;
     type: string;
     setPeriodicWave(periodicWave: PeriodicWave): void;
     start(when?: number): void;
     stop(when?: number): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8301,8 +8922,25 @@ declare var OscillatorNode: {
     new(): OscillatorNode;
 }
 
+interface OverflowEvent extends UIEvent {
+    readonly horizontalOverflow: boolean;
+    readonly orient: number;
+    readonly verticalOverflow: boolean;
+    readonly BOTH: number;
+    readonly HORIZONTAL: number;
+    readonly VERTICAL: number;
+}
+
+declare var OverflowEvent: {
+    prototype: OverflowEvent;
+    new(): OverflowEvent;
+    readonly BOTH: number;
+    readonly HORIZONTAL: number;
+    readonly VERTICAL: number;
+}
+
 interface PageTransitionEvent extends Event {
-    persisted: boolean;
+    readonly persisted: boolean;
 }
 
 declare var PageTransitionEvent: {
@@ -8330,17 +8968,17 @@ declare var PannerNode: {
 }
 
 interface PerfWidgetExternal {
-    activeNetworkRequestCount: number;
-    averageFrameTime: number;
-    averagePaintTime: number;
-    extraInformationEnabled: boolean;
-    independentRenderingEnabled: boolean;
-    irDisablingContentString: string;
-    irStatusAvailable: boolean;
-    maxCpuSpeed: number;
-    paintRequestsPerSecond: number;
-    performanceCounter: number;
-    performanceCounterFrequency: number;
+    readonly activeNetworkRequestCount: number;
+    readonly averageFrameTime: number;
+    readonly averagePaintTime: number;
+    readonly extraInformationEnabled: boolean;
+    readonly independentRenderingEnabled: boolean;
+    readonly irDisablingContentString: string;
+    readonly irStatusAvailable: boolean;
+    readonly maxCpuSpeed: number;
+    readonly paintRequestsPerSecond: number;
+    readonly performanceCounter: number;
+    readonly performanceCounterFrequency: number;
     addEventListener(eventType: string, callback: Function): void;
     getMemoryUsage(): number;
     getProcessCpuUsage(): number;
@@ -8359,8 +8997,8 @@ declare var PerfWidgetExternal: {
 }
 
 interface Performance {
-    navigation: PerformanceNavigation;
-    timing: PerformanceTiming;
+    readonly navigation: PerformanceNavigation;
+    readonly timing: PerformanceTiming;
     clearMarks(markName?: string): void;
     clearMeasures(measureName?: string): void;
     clearResourceTimings(): void;
@@ -8382,10 +9020,10 @@ declare var Performance: {
 }
 
 interface PerformanceEntry {
-    duration: number;
-    entryType: string;
-    name: string;
-    startTime: number;
+    readonly duration: number;
+    readonly entryType: string;
+    readonly name: string;
+    readonly startTime: number;
 }
 
 declare var PerformanceEntry: {
@@ -8410,47 +9048,47 @@ declare var PerformanceMeasure: {
 }
 
 interface PerformanceNavigation {
-    redirectCount: number;
-    type: number;
+    readonly redirectCount: number;
+    readonly type: number;
     toJSON(): any;
-    TYPE_BACK_FORWARD: number;
-    TYPE_NAVIGATE: number;
-    TYPE_RELOAD: number;
-    TYPE_RESERVED: number;
+    readonly TYPE_BACK_FORWARD: number;
+    readonly TYPE_NAVIGATE: number;
+    readonly TYPE_RELOAD: number;
+    readonly TYPE_RESERVED: number;
 }
 
 declare var PerformanceNavigation: {
     prototype: PerformanceNavigation;
     new(): PerformanceNavigation;
-    TYPE_BACK_FORWARD: number;
-    TYPE_NAVIGATE: number;
-    TYPE_RELOAD: number;
-    TYPE_RESERVED: number;
+    readonly TYPE_BACK_FORWARD: number;
+    readonly TYPE_NAVIGATE: number;
+    readonly TYPE_RELOAD: number;
+    readonly TYPE_RESERVED: number;
 }
 
 interface PerformanceNavigationTiming extends PerformanceEntry {
-    connectEnd: number;
-    connectStart: number;
-    domComplete: number;
-    domContentLoadedEventEnd: number;
-    domContentLoadedEventStart: number;
-    domInteractive: number;
-    domLoading: number;
-    domainLookupEnd: number;
-    domainLookupStart: number;
-    fetchStart: number;
-    loadEventEnd: number;
-    loadEventStart: number;
-    navigationStart: number;
-    redirectCount: number;
-    redirectEnd: number;
-    redirectStart: number;
-    requestStart: number;
-    responseEnd: number;
-    responseStart: number;
-    type: string;
-    unloadEventEnd: number;
-    unloadEventStart: number;
+    readonly connectEnd: number;
+    readonly connectStart: number;
+    readonly domComplete: number;
+    readonly domContentLoadedEventEnd: number;
+    readonly domContentLoadedEventStart: number;
+    readonly domInteractive: number;
+    readonly domLoading: number;
+    readonly domainLookupEnd: number;
+    readonly domainLookupStart: number;
+    readonly fetchStart: number;
+    readonly loadEventEnd: number;
+    readonly loadEventStart: number;
+    readonly navigationStart: number;
+    readonly redirectCount: number;
+    readonly redirectEnd: number;
+    readonly redirectStart: number;
+    readonly requestStart: number;
+    readonly responseEnd: number;
+    readonly responseStart: number;
+    readonly type: string;
+    readonly unloadEventEnd: number;
+    readonly unloadEventStart: number;
 }
 
 declare var PerformanceNavigationTiming: {
@@ -8459,17 +9097,17 @@ declare var PerformanceNavigationTiming: {
 }
 
 interface PerformanceResourceTiming extends PerformanceEntry {
-    connectEnd: number;
-    connectStart: number;
-    domainLookupEnd: number;
-    domainLookupStart: number;
-    fetchStart: number;
-    initiatorType: string;
-    redirectEnd: number;
-    redirectStart: number;
-    requestStart: number;
-    responseEnd: number;
-    responseStart: number;
+    readonly connectEnd: number;
+    readonly connectStart: number;
+    readonly domainLookupEnd: number;
+    readonly domainLookupStart: number;
+    readonly fetchStart: number;
+    readonly initiatorType: string;
+    readonly redirectEnd: number;
+    readonly redirectStart: number;
+    readonly requestStart: number;
+    readonly responseEnd: number;
+    readonly responseStart: number;
 }
 
 declare var PerformanceResourceTiming: {
@@ -8478,27 +9116,27 @@ declare var PerformanceResourceTiming: {
 }
 
 interface PerformanceTiming {
-    connectEnd: number;
-    connectStart: number;
-    domComplete: number;
-    domContentLoadedEventEnd: number;
-    domContentLoadedEventStart: number;
-    domInteractive: number;
-    domLoading: number;
-    domainLookupEnd: number;
-    domainLookupStart: number;
-    fetchStart: number;
-    loadEventEnd: number;
-    loadEventStart: number;
-    msFirstPaint: number;
-    navigationStart: number;
-    redirectEnd: number;
-    redirectStart: number;
-    requestStart: number;
-    responseEnd: number;
-    responseStart: number;
-    unloadEventEnd: number;
-    unloadEventStart: number;
+    readonly connectEnd: number;
+    readonly connectStart: number;
+    readonly domComplete: number;
+    readonly domContentLoadedEventEnd: number;
+    readonly domContentLoadedEventStart: number;
+    readonly domInteractive: number;
+    readonly domLoading: number;
+    readonly domainLookupEnd: number;
+    readonly domainLookupStart: number;
+    readonly fetchStart: number;
+    readonly loadEventEnd: number;
+    readonly loadEventStart: number;
+    readonly msFirstPaint: number;
+    readonly navigationStart: number;
+    readonly redirectEnd: number;
+    readonly redirectStart: number;
+    readonly requestStart: number;
+    readonly responseEnd: number;
+    readonly responseStart: number;
+    readonly unloadEventEnd: number;
+    readonly unloadEventStart: number;
     toJSON(): any;
 }
 
@@ -8516,7 +9154,7 @@ declare var PeriodicWave: {
 }
 
 interface PermissionRequest extends DeferredPermissionRequest {
-    state: string;
+    readonly state: string;
     defer(): void;
 }
 
@@ -8526,7 +9164,7 @@ declare var PermissionRequest: {
 }
 
 interface PermissionRequestedEvent extends Event {
-    permissionRequest: PermissionRequest;
+    readonly permissionRequest: PermissionRequest;
 }
 
 declare var PermissionRequestedEvent: {
@@ -8535,11 +9173,11 @@ declare var PermissionRequestedEvent: {
 }
 
 interface Plugin {
-    description: string;
-    filename: string;
-    length: number;
-    name: string;
-    version: string;
+    readonly description: string;
+    readonly filename: string;
+    readonly length: number;
+    readonly name: string;
+    readonly version: string;
     item(index: number): MimeType;
     namedItem(type: string): MimeType;
     [index: number]: MimeType;
@@ -8551,7 +9189,7 @@ declare var Plugin: {
 }
 
 interface PluginArray {
-    length: number;
+    readonly length: number;
     item(index: number): Plugin;
     namedItem(name: string): Plugin;
     refresh(reload?: boolean): void;
@@ -8564,18 +9202,18 @@ declare var PluginArray: {
 }
 
 interface PointerEvent extends MouseEvent {
-    currentPoint: any;
-    height: number;
-    hwTimestamp: number;
-    intermediatePoints: any;
-    isPrimary: boolean;
-    pointerId: number;
-    pointerType: any;
-    pressure: number;
-    rotation: number;
-    tiltX: number;
-    tiltY: number;
-    width: number;
+    readonly currentPoint: any;
+    readonly height: number;
+    readonly hwTimestamp: number;
+    readonly intermediatePoints: any;
+    readonly isPrimary: boolean;
+    readonly pointerId: number;
+    readonly pointerType: any;
+    readonly pressure: number;
+    readonly rotation: number;
+    readonly tiltX: number;
+    readonly tiltY: number;
+    readonly width: number;
     getCurrentPoint(element: Element): void;
     getIntermediatePoints(element: Element): void;
     initPointerEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget, offsetXArg: number, offsetYArg: number, widthArg: number, heightArg: number, pressure: number, rotation: number, tiltX: number, tiltY: number, pointerIdArg: number, pointerType: any, hwTimestampArg: number, isPrimary: boolean): void;
@@ -8587,7 +9225,7 @@ declare var PointerEvent: {
 }
 
 interface PopStateEvent extends Event {
-    state: any;
+    readonly state: any;
     initPopStateEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, stateArg: any): void;
 }
 
@@ -8597,8 +9235,8 @@ declare var PopStateEvent: {
 }
 
 interface Position {
-    coords: Coordinates;
-    timestamp: number;
+    readonly coords: Coordinates;
+    readonly timestamp: number;
 }
 
 declare var Position: {
@@ -8607,24 +9245,24 @@ declare var Position: {
 }
 
 interface PositionError {
-    code: number;
-    message: string;
+    readonly code: number;
+    readonly message: string;
     toString(): string;
-    PERMISSION_DENIED: number;
-    POSITION_UNAVAILABLE: number;
-    TIMEOUT: number;
+    readonly PERMISSION_DENIED: number;
+    readonly POSITION_UNAVAILABLE: number;
+    readonly TIMEOUT: number;
 }
 
 declare var PositionError: {
     prototype: PositionError;
     new(): PositionError;
-    PERMISSION_DENIED: number;
-    POSITION_UNAVAILABLE: number;
-    TIMEOUT: number;
+    readonly PERMISSION_DENIED: number;
+    readonly POSITION_UNAVAILABLE: number;
+    readonly TIMEOUT: number;
 }
 
 interface ProcessingInstruction extends CharacterData {
-    target: string;
+    readonly target: string;
 }
 
 declare var ProcessingInstruction: {
@@ -8633,9 +9271,9 @@ declare var ProcessingInstruction: {
 }
 
 interface ProgressEvent extends Event {
-    lengthComputable: boolean;
-    loaded: number;
-    total: number;
+    readonly lengthComputable: boolean;
+    readonly loaded: number;
+    readonly total: number;
     initProgressEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, lengthComputableArg: boolean, loadedArg: number, totalArg: number): void;
 }
 
@@ -8644,13 +9282,210 @@ declare var ProgressEvent: {
     new(type: string, eventInitDict?: ProgressEventInit): ProgressEvent;
 }
 
+interface RTCDTMFToneChangeEvent extends Event {
+    readonly tone: string;
+}
+
+declare var RTCDTMFToneChangeEvent: {
+    prototype: RTCDTMFToneChangeEvent;
+    new(type: string, eventInitDict: RTCDTMFToneChangeEventInit): RTCDTMFToneChangeEvent;
+}
+
+interface RTCDtlsTransport extends RTCStatsProvider {
+    ondtlsstatechange: (ev: RTCDtlsTransportStateChangedEvent) => any;
+    onerror: (ev: Event) => any;
+    readonly state: string;
+    readonly transport: RTCIceTransport;
+    getLocalParameters(): RTCDtlsParameters;
+    getRemoteCertificates(): ArrayBuffer[];
+    getRemoteParameters(): RTCDtlsParameters;
+    start(remoteParameters: RTCDtlsParameters): void;
+    stop(): void;
+    addEventListener(type: "dtlsstatechange", listener: (ev: RTCDtlsTransportStateChangedEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCDtlsTransport: {
+    prototype: RTCDtlsTransport;
+    new(transport: RTCIceTransport): RTCDtlsTransport;
+}
+
+interface RTCDtlsTransportStateChangedEvent extends Event {
+    readonly state: string;
+}
+
+declare var RTCDtlsTransportStateChangedEvent: {
+    prototype: RTCDtlsTransportStateChangedEvent;
+    new(): RTCDtlsTransportStateChangedEvent;
+}
+
+interface RTCDtmfSender extends EventTarget {
+    readonly canInsertDTMF: boolean;
+    readonly duration: number;
+    readonly interToneGap: number;
+    ontonechange: (ev: RTCDTMFToneChangeEvent) => any;
+    readonly sender: RTCRtpSender;
+    readonly toneBuffer: string;
+    insertDTMF(tones: string, duration?: number, interToneGap?: number): void;
+    addEventListener(type: "tonechange", listener: (ev: RTCDTMFToneChangeEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCDtmfSender: {
+    prototype: RTCDtmfSender;
+    new(sender: RTCRtpSender): RTCDtmfSender;
+}
+
+interface RTCIceCandidatePairChangedEvent extends Event {
+    readonly pair: RTCIceCandidatePair;
+}
+
+declare var RTCIceCandidatePairChangedEvent: {
+    prototype: RTCIceCandidatePairChangedEvent;
+    new(): RTCIceCandidatePairChangedEvent;
+}
+
+interface RTCIceGatherer extends RTCStatsProvider {
+    readonly component: string;
+    onerror: (ev: Event) => any;
+    onlocalcandidate: (ev: RTCIceGathererEvent) => any;
+    createAssociatedGatherer(): RTCIceGatherer;
+    getLocalCandidates(): RTCIceCandidate[];
+    getLocalParameters(): RTCIceParameters;
+    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "localcandidate", listener: (ev: RTCIceGathererEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCIceGatherer: {
+    prototype: RTCIceGatherer;
+    new(options: RTCIceGatherOptions): RTCIceGatherer;
+}
+
+interface RTCIceGathererEvent extends Event {
+    readonly candidate: RTCIceCandidate | RTCIceCandidateComplete;
+}
+
+declare var RTCIceGathererEvent: {
+    prototype: RTCIceGathererEvent;
+    new(): RTCIceGathererEvent;
+}
+
+interface RTCIceTransport extends RTCStatsProvider {
+    readonly component: string;
+    readonly iceGatherer: RTCIceGatherer;
+    oncandidatepairchange: (ev: RTCIceCandidatePairChangedEvent) => any;
+    onicestatechange: (ev: RTCIceTransportStateChangedEvent) => any;
+    readonly role: string;
+    readonly state: string;
+    addRemoteCandidate(remoteCandidate: RTCIceCandidate | RTCIceCandidateComplete): void;
+    createAssociatedTransport(): RTCIceTransport;
+    getNominatedCandidatePair(): RTCIceCandidatePair;
+    getRemoteCandidates(): RTCIceCandidate[];
+    getRemoteParameters(): RTCIceParameters;
+    setRemoteCandidates(remoteCandidates: RTCIceCandidate[]): void;
+    start(gatherer: RTCIceGatherer, remoteParameters: RTCIceParameters, role?: string): void;
+    stop(): void;
+    addEventListener(type: "candidatepairchange", listener: (ev: RTCIceCandidatePairChangedEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "icestatechange", listener: (ev: RTCIceTransportStateChangedEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCIceTransport: {
+    prototype: RTCIceTransport;
+    new(): RTCIceTransport;
+}
+
+interface RTCIceTransportStateChangedEvent extends Event {
+    readonly state: string;
+}
+
+declare var RTCIceTransportStateChangedEvent: {
+    prototype: RTCIceTransportStateChangedEvent;
+    new(): RTCIceTransportStateChangedEvent;
+}
+
+interface RTCRtpReceiver extends RTCStatsProvider {
+    onerror: (ev: Event) => any;
+    readonly rtcpTransport: RTCDtlsTransport;
+    readonly track: MediaStreamTrack;
+    readonly transport: RTCDtlsTransport | RTCSrtpSdesTransport;
+    getContributingSources(): RTCRtpContributingSource[];
+    receive(parameters: RTCRtpParameters): void;
+    requestSendCSRC(csrc: number): void;
+    setTransport(transport: RTCDtlsTransport | RTCSrtpSdesTransport, rtcpTransport?: RTCDtlsTransport): void;
+    stop(): void;
+    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCRtpReceiver: {
+    prototype: RTCRtpReceiver;
+    new(transport: RTCDtlsTransport | RTCSrtpSdesTransport, kind: string, rtcpTransport?: RTCDtlsTransport): RTCRtpReceiver;
+    getCapabilities(kind?: string): RTCRtpCapabilities;
+}
+
+interface RTCRtpSender extends RTCStatsProvider {
+    onerror: (ev: Event) => any;
+    onssrcconflict: (ev: RTCSsrcConflictEvent) => any;
+    readonly rtcpTransport: RTCDtlsTransport;
+    readonly track: MediaStreamTrack;
+    readonly transport: RTCDtlsTransport | RTCSrtpSdesTransport;
+    send(parameters: RTCRtpParameters): void;
+    setTrack(track: MediaStreamTrack): void;
+    setTransport(transport: RTCDtlsTransport | RTCSrtpSdesTransport, rtcpTransport?: RTCDtlsTransport): void;
+    stop(): void;
+    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "ssrcconflict", listener: (ev: RTCSsrcConflictEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCRtpSender: {
+    prototype: RTCRtpSender;
+    new(track: MediaStreamTrack, transport: RTCDtlsTransport | RTCSrtpSdesTransport, rtcpTransport?: RTCDtlsTransport): RTCRtpSender;
+    getCapabilities(kind?: string): RTCRtpCapabilities;
+}
+
+interface RTCSrtpSdesTransport extends EventTarget {
+    onerror: (ev: Event) => any;
+    readonly transport: RTCIceTransport;
+    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCSrtpSdesTransport: {
+    prototype: RTCSrtpSdesTransport;
+    new(transport: RTCIceTransport, encryptParameters: RTCSrtpSdesParameters, decryptParameters: RTCSrtpSdesParameters): RTCSrtpSdesTransport;
+    getLocalParameters(): RTCSrtpSdesParameters[];
+}
+
+interface RTCSsrcConflictEvent extends Event {
+    readonly ssrc: number;
+}
+
+declare var RTCSsrcConflictEvent: {
+    prototype: RTCSsrcConflictEvent;
+    new(): RTCSsrcConflictEvent;
+}
+
+interface RTCStatsProvider extends EventTarget {
+    getStats(): PromiseLike<RTCStatsReport>;
+    msGetStats(): PromiseLike<RTCStatsReport>;
+}
+
+declare var RTCStatsProvider: {
+    prototype: RTCStatsProvider;
+    new(): RTCStatsProvider;
+}
+
 interface Range {
-    collapsed: boolean;
-    commonAncestorContainer: Node;
-    endContainer: Node;
-    endOffset: number;
-    startContainer: Node;
-    startOffset: number;
+    readonly collapsed: boolean;
+    readonly commonAncestorContainer: Node;
+    readonly endContainer: Node;
+    readonly endOffset: number;
+    readonly startContainer: Node;
+    readonly startOffset: number;
     cloneContents(): DocumentFragment;
     cloneRange(): Range;
     collapse(toStart: boolean): void;
@@ -8673,23 +9508,23 @@ interface Range {
     setStartBefore(refNode: Node): void;
     surroundContents(newParent: Node): void;
     toString(): string;
-    END_TO_END: number;
-    END_TO_START: number;
-    START_TO_END: number;
-    START_TO_START: number;
+    readonly END_TO_END: number;
+    readonly END_TO_START: number;
+    readonly START_TO_END: number;
+    readonly START_TO_START: number;
 }
 
 declare var Range: {
     prototype: Range;
     new(): Range;
-    END_TO_END: number;
-    END_TO_START: number;
-    START_TO_END: number;
-    START_TO_START: number;
+    readonly END_TO_END: number;
+    readonly END_TO_START: number;
+    readonly START_TO_END: number;
+    readonly START_TO_START: number;
 }
 
 interface SVGAElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference {
-    target: SVGAnimatedString;
+    readonly target: SVGAnimatedString;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8699,32 +9534,32 @@ declare var SVGAElement: {
 }
 
 interface SVGAngle {
-    unitType: number;
+    readonly unitType: number;
     value: number;
     valueAsString: string;
     valueInSpecifiedUnits: number;
     convertToSpecifiedUnits(unitType: number): void;
     newValueSpecifiedUnits(unitType: number, valueInSpecifiedUnits: number): void;
-    SVG_ANGLETYPE_DEG: number;
-    SVG_ANGLETYPE_GRAD: number;
-    SVG_ANGLETYPE_RAD: number;
-    SVG_ANGLETYPE_UNKNOWN: number;
-    SVG_ANGLETYPE_UNSPECIFIED: number;
+    readonly SVG_ANGLETYPE_DEG: number;
+    readonly SVG_ANGLETYPE_GRAD: number;
+    readonly SVG_ANGLETYPE_RAD: number;
+    readonly SVG_ANGLETYPE_UNKNOWN: number;
+    readonly SVG_ANGLETYPE_UNSPECIFIED: number;
 }
 
 declare var SVGAngle: {
     prototype: SVGAngle;
     new(): SVGAngle;
-    SVG_ANGLETYPE_DEG: number;
-    SVG_ANGLETYPE_GRAD: number;
-    SVG_ANGLETYPE_RAD: number;
-    SVG_ANGLETYPE_UNKNOWN: number;
-    SVG_ANGLETYPE_UNSPECIFIED: number;
+    readonly SVG_ANGLETYPE_DEG: number;
+    readonly SVG_ANGLETYPE_GRAD: number;
+    readonly SVG_ANGLETYPE_RAD: number;
+    readonly SVG_ANGLETYPE_UNKNOWN: number;
+    readonly SVG_ANGLETYPE_UNSPECIFIED: number;
 }
 
 interface SVGAnimatedAngle {
-    animVal: SVGAngle;
-    baseVal: SVGAngle;
+    readonly animVal: SVGAngle;
+    readonly baseVal: SVGAngle;
 }
 
 declare var SVGAnimatedAngle: {
@@ -8733,7 +9568,7 @@ declare var SVGAnimatedAngle: {
 }
 
 interface SVGAnimatedBoolean {
-    animVal: boolean;
+    readonly animVal: boolean;
     baseVal: boolean;
 }
 
@@ -8743,7 +9578,7 @@ declare var SVGAnimatedBoolean: {
 }
 
 interface SVGAnimatedEnumeration {
-    animVal: number;
+    readonly animVal: number;
     baseVal: number;
 }
 
@@ -8753,7 +9588,7 @@ declare var SVGAnimatedEnumeration: {
 }
 
 interface SVGAnimatedInteger {
-    animVal: number;
+    readonly animVal: number;
     baseVal: number;
 }
 
@@ -8763,8 +9598,8 @@ declare var SVGAnimatedInteger: {
 }
 
 interface SVGAnimatedLength {
-    animVal: SVGLength;
-    baseVal: SVGLength;
+    readonly animVal: SVGLength;
+    readonly baseVal: SVGLength;
 }
 
 declare var SVGAnimatedLength: {
@@ -8773,8 +9608,8 @@ declare var SVGAnimatedLength: {
 }
 
 interface SVGAnimatedLengthList {
-    animVal: SVGLengthList;
-    baseVal: SVGLengthList;
+    readonly animVal: SVGLengthList;
+    readonly baseVal: SVGLengthList;
 }
 
 declare var SVGAnimatedLengthList: {
@@ -8783,7 +9618,7 @@ declare var SVGAnimatedLengthList: {
 }
 
 interface SVGAnimatedNumber {
-    animVal: number;
+    readonly animVal: number;
     baseVal: number;
 }
 
@@ -8793,8 +9628,8 @@ declare var SVGAnimatedNumber: {
 }
 
 interface SVGAnimatedNumberList {
-    animVal: SVGNumberList;
-    baseVal: SVGNumberList;
+    readonly animVal: SVGNumberList;
+    readonly baseVal: SVGNumberList;
 }
 
 declare var SVGAnimatedNumberList: {
@@ -8803,8 +9638,8 @@ declare var SVGAnimatedNumberList: {
 }
 
 interface SVGAnimatedPreserveAspectRatio {
-    animVal: SVGPreserveAspectRatio;
-    baseVal: SVGPreserveAspectRatio;
+    readonly animVal: SVGPreserveAspectRatio;
+    readonly baseVal: SVGPreserveAspectRatio;
 }
 
 declare var SVGAnimatedPreserveAspectRatio: {
@@ -8813,8 +9648,8 @@ declare var SVGAnimatedPreserveAspectRatio: {
 }
 
 interface SVGAnimatedRect {
-    animVal: SVGRect;
-    baseVal: SVGRect;
+    readonly animVal: SVGRect;
+    readonly baseVal: SVGRect;
 }
 
 declare var SVGAnimatedRect: {
@@ -8823,7 +9658,7 @@ declare var SVGAnimatedRect: {
 }
 
 interface SVGAnimatedString {
-    animVal: string;
+    readonly animVal: string;
     baseVal: string;
 }
 
@@ -8833,8 +9668,8 @@ declare var SVGAnimatedString: {
 }
 
 interface SVGAnimatedTransformList {
-    animVal: SVGTransformList;
-    baseVal: SVGTransformList;
+    readonly animVal: SVGTransformList;
+    readonly baseVal: SVGTransformList;
 }
 
 declare var SVGAnimatedTransformList: {
@@ -8843,9 +9678,9 @@ declare var SVGAnimatedTransformList: {
 }
 
 interface SVGCircleElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    cx: SVGAnimatedLength;
-    cy: SVGAnimatedLength;
-    r: SVGAnimatedLength;
+    readonly cx: SVGAnimatedLength;
+    readonly cy: SVGAnimatedLength;
+    readonly r: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8855,7 +9690,7 @@ declare var SVGCircleElement: {
 }
 
 interface SVGClipPathElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGUnitTypes {
-    clipPathUnits: SVGAnimatedEnumeration;
+    readonly clipPathUnits: SVGAnimatedEnumeration;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8865,30 +9700,30 @@ declare var SVGClipPathElement: {
 }
 
 interface SVGComponentTransferFunctionElement extends SVGElement {
-    amplitude: SVGAnimatedNumber;
-    exponent: SVGAnimatedNumber;
-    intercept: SVGAnimatedNumber;
-    offset: SVGAnimatedNumber;
-    slope: SVGAnimatedNumber;
-    tableValues: SVGAnimatedNumberList;
-    type: SVGAnimatedEnumeration;
-    SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_GAMMA: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_LINEAR: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_TABLE: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number;
+    readonly amplitude: SVGAnimatedNumber;
+    readonly exponent: SVGAnimatedNumber;
+    readonly intercept: SVGAnimatedNumber;
+    readonly offset: SVGAnimatedNumber;
+    readonly slope: SVGAnimatedNumber;
+    readonly tableValues: SVGAnimatedNumberList;
+    readonly type: SVGAnimatedEnumeration;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_GAMMA: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_LINEAR: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_TABLE: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number;
 }
 
 declare var SVGComponentTransferFunctionElement: {
     prototype: SVGComponentTransferFunctionElement;
     new(): SVGComponentTransferFunctionElement;
-    SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_GAMMA: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_LINEAR: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_TABLE: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_GAMMA: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_LINEAR: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_TABLE: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number;
 }
 
 interface SVGDefsElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
@@ -8910,7 +9745,6 @@ declare var SVGDescElement: {
 }
 
 interface SVGElement extends Element {
-    id: string;
     onclick: (ev: MouseEvent) => any;
     ondblclick: (ev: MouseEvent) => any;
     onfocusin: (ev: FocusEvent) => any;
@@ -8921,8 +9755,8 @@ interface SVGElement extends Element {
     onmouseout: (ev: MouseEvent) => any;
     onmouseover: (ev: MouseEvent) => any;
     onmouseup: (ev: MouseEvent) => any;
-    ownerSVGElement: SVGSVGElement;
-    viewportElement: SVGElement;
+    readonly ownerSVGElement: SVGSVGElement;
+    readonly viewportElement: SVGElement;
     xmlbase: string;
     className: any;
     addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -8980,14 +9814,14 @@ declare var SVGElement: {
 }
 
 interface SVGElementInstance extends EventTarget {
-    childNodes: SVGElementInstanceList;
-    correspondingElement: SVGElement;
-    correspondingUseElement: SVGUseElement;
-    firstChild: SVGElementInstance;
-    lastChild: SVGElementInstance;
-    nextSibling: SVGElementInstance;
-    parentNode: SVGElementInstance;
-    previousSibling: SVGElementInstance;
+    readonly childNodes: SVGElementInstanceList;
+    readonly correspondingElement: SVGElement;
+    readonly correspondingUseElement: SVGUseElement;
+    readonly firstChild: SVGElementInstance;
+    readonly lastChild: SVGElementInstance;
+    readonly nextSibling: SVGElementInstance;
+    readonly parentNode: SVGElementInstance;
+    readonly previousSibling: SVGElementInstance;
 }
 
 declare var SVGElementInstance: {
@@ -8996,7 +9830,7 @@ declare var SVGElementInstance: {
 }
 
 interface SVGElementInstanceList {
-    length: number;
+    readonly length: number;
     item(index: number): SVGElementInstance;
 }
 
@@ -9006,10 +9840,10 @@ declare var SVGElementInstanceList: {
 }
 
 interface SVGEllipseElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    cx: SVGAnimatedLength;
-    cy: SVGAnimatedLength;
-    rx: SVGAnimatedLength;
-    ry: SVGAnimatedLength;
+    readonly cx: SVGAnimatedLength;
+    readonly cy: SVGAnimatedLength;
+    readonly rx: SVGAnimatedLength;
+    readonly ry: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9019,75 +9853,75 @@ declare var SVGEllipseElement: {
 }
 
 interface SVGFEBlendElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    in2: SVGAnimatedString;
-    mode: SVGAnimatedEnumeration;
-    SVG_FEBLEND_MODE_COLOR: number;
-    SVG_FEBLEND_MODE_COLOR_BURN: number;
-    SVG_FEBLEND_MODE_COLOR_DODGE: number;
-    SVG_FEBLEND_MODE_DARKEN: number;
-    SVG_FEBLEND_MODE_DIFFERENCE: number;
-    SVG_FEBLEND_MODE_EXCLUSION: number;
-    SVG_FEBLEND_MODE_HARD_LIGHT: number;
-    SVG_FEBLEND_MODE_HUE: number;
-    SVG_FEBLEND_MODE_LIGHTEN: number;
-    SVG_FEBLEND_MODE_LUMINOSITY: number;
-    SVG_FEBLEND_MODE_MULTIPLY: number;
-    SVG_FEBLEND_MODE_NORMAL: number;
-    SVG_FEBLEND_MODE_OVERLAY: number;
-    SVG_FEBLEND_MODE_SATURATION: number;
-    SVG_FEBLEND_MODE_SCREEN: number;
-    SVG_FEBLEND_MODE_SOFT_LIGHT: number;
-    SVG_FEBLEND_MODE_UNKNOWN: number;
+    readonly in1: SVGAnimatedString;
+    readonly in2: SVGAnimatedString;
+    readonly mode: SVGAnimatedEnumeration;
+    readonly SVG_FEBLEND_MODE_COLOR: number;
+    readonly SVG_FEBLEND_MODE_COLOR_BURN: number;
+    readonly SVG_FEBLEND_MODE_COLOR_DODGE: number;
+    readonly SVG_FEBLEND_MODE_DARKEN: number;
+    readonly SVG_FEBLEND_MODE_DIFFERENCE: number;
+    readonly SVG_FEBLEND_MODE_EXCLUSION: number;
+    readonly SVG_FEBLEND_MODE_HARD_LIGHT: number;
+    readonly SVG_FEBLEND_MODE_HUE: number;
+    readonly SVG_FEBLEND_MODE_LIGHTEN: number;
+    readonly SVG_FEBLEND_MODE_LUMINOSITY: number;
+    readonly SVG_FEBLEND_MODE_MULTIPLY: number;
+    readonly SVG_FEBLEND_MODE_NORMAL: number;
+    readonly SVG_FEBLEND_MODE_OVERLAY: number;
+    readonly SVG_FEBLEND_MODE_SATURATION: number;
+    readonly SVG_FEBLEND_MODE_SCREEN: number;
+    readonly SVG_FEBLEND_MODE_SOFT_LIGHT: number;
+    readonly SVG_FEBLEND_MODE_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEBlendElement: {
     prototype: SVGFEBlendElement;
     new(): SVGFEBlendElement;
-    SVG_FEBLEND_MODE_COLOR: number;
-    SVG_FEBLEND_MODE_COLOR_BURN: number;
-    SVG_FEBLEND_MODE_COLOR_DODGE: number;
-    SVG_FEBLEND_MODE_DARKEN: number;
-    SVG_FEBLEND_MODE_DIFFERENCE: number;
-    SVG_FEBLEND_MODE_EXCLUSION: number;
-    SVG_FEBLEND_MODE_HARD_LIGHT: number;
-    SVG_FEBLEND_MODE_HUE: number;
-    SVG_FEBLEND_MODE_LIGHTEN: number;
-    SVG_FEBLEND_MODE_LUMINOSITY: number;
-    SVG_FEBLEND_MODE_MULTIPLY: number;
-    SVG_FEBLEND_MODE_NORMAL: number;
-    SVG_FEBLEND_MODE_OVERLAY: number;
-    SVG_FEBLEND_MODE_SATURATION: number;
-    SVG_FEBLEND_MODE_SCREEN: number;
-    SVG_FEBLEND_MODE_SOFT_LIGHT: number;
-    SVG_FEBLEND_MODE_UNKNOWN: number;
+    readonly SVG_FEBLEND_MODE_COLOR: number;
+    readonly SVG_FEBLEND_MODE_COLOR_BURN: number;
+    readonly SVG_FEBLEND_MODE_COLOR_DODGE: number;
+    readonly SVG_FEBLEND_MODE_DARKEN: number;
+    readonly SVG_FEBLEND_MODE_DIFFERENCE: number;
+    readonly SVG_FEBLEND_MODE_EXCLUSION: number;
+    readonly SVG_FEBLEND_MODE_HARD_LIGHT: number;
+    readonly SVG_FEBLEND_MODE_HUE: number;
+    readonly SVG_FEBLEND_MODE_LIGHTEN: number;
+    readonly SVG_FEBLEND_MODE_LUMINOSITY: number;
+    readonly SVG_FEBLEND_MODE_MULTIPLY: number;
+    readonly SVG_FEBLEND_MODE_NORMAL: number;
+    readonly SVG_FEBLEND_MODE_OVERLAY: number;
+    readonly SVG_FEBLEND_MODE_SATURATION: number;
+    readonly SVG_FEBLEND_MODE_SCREEN: number;
+    readonly SVG_FEBLEND_MODE_SOFT_LIGHT: number;
+    readonly SVG_FEBLEND_MODE_UNKNOWN: number;
 }
 
 interface SVGFEColorMatrixElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    type: SVGAnimatedEnumeration;
-    values: SVGAnimatedNumberList;
-    SVG_FECOLORMATRIX_TYPE_HUEROTATE: number;
-    SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA: number;
-    SVG_FECOLORMATRIX_TYPE_MATRIX: number;
-    SVG_FECOLORMATRIX_TYPE_SATURATE: number;
-    SVG_FECOLORMATRIX_TYPE_UNKNOWN: number;
+    readonly in1: SVGAnimatedString;
+    readonly type: SVGAnimatedEnumeration;
+    readonly values: SVGAnimatedNumberList;
+    readonly SVG_FECOLORMATRIX_TYPE_HUEROTATE: number;
+    readonly SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA: number;
+    readonly SVG_FECOLORMATRIX_TYPE_MATRIX: number;
+    readonly SVG_FECOLORMATRIX_TYPE_SATURATE: number;
+    readonly SVG_FECOLORMATRIX_TYPE_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEColorMatrixElement: {
     prototype: SVGFEColorMatrixElement;
     new(): SVGFEColorMatrixElement;
-    SVG_FECOLORMATRIX_TYPE_HUEROTATE: number;
-    SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA: number;
-    SVG_FECOLORMATRIX_TYPE_MATRIX: number;
-    SVG_FECOLORMATRIX_TYPE_SATURATE: number;
-    SVG_FECOLORMATRIX_TYPE_UNKNOWN: number;
+    readonly SVG_FECOLORMATRIX_TYPE_HUEROTATE: number;
+    readonly SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA: number;
+    readonly SVG_FECOLORMATRIX_TYPE_MATRIX: number;
+    readonly SVG_FECOLORMATRIX_TYPE_SATURATE: number;
+    readonly SVG_FECOLORMATRIX_TYPE_UNKNOWN: number;
 }
 
 interface SVGFEComponentTransferElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
+    readonly in1: SVGAnimatedString;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9097,70 +9931,70 @@ declare var SVGFEComponentTransferElement: {
 }
 
 interface SVGFECompositeElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    in2: SVGAnimatedString;
-    k1: SVGAnimatedNumber;
-    k2: SVGAnimatedNumber;
-    k3: SVGAnimatedNumber;
-    k4: SVGAnimatedNumber;
-    operator: SVGAnimatedEnumeration;
-    SVG_FECOMPOSITE_OPERATOR_ARITHMETIC: number;
-    SVG_FECOMPOSITE_OPERATOR_ATOP: number;
-    SVG_FECOMPOSITE_OPERATOR_IN: number;
-    SVG_FECOMPOSITE_OPERATOR_OUT: number;
-    SVG_FECOMPOSITE_OPERATOR_OVER: number;
-    SVG_FECOMPOSITE_OPERATOR_UNKNOWN: number;
-    SVG_FECOMPOSITE_OPERATOR_XOR: number;
+    readonly in1: SVGAnimatedString;
+    readonly in2: SVGAnimatedString;
+    readonly k1: SVGAnimatedNumber;
+    readonly k2: SVGAnimatedNumber;
+    readonly k3: SVGAnimatedNumber;
+    readonly k4: SVGAnimatedNumber;
+    readonly operator: SVGAnimatedEnumeration;
+    readonly SVG_FECOMPOSITE_OPERATOR_ARITHMETIC: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_ATOP: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_IN: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_OUT: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_OVER: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_UNKNOWN: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_XOR: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFECompositeElement: {
     prototype: SVGFECompositeElement;
     new(): SVGFECompositeElement;
-    SVG_FECOMPOSITE_OPERATOR_ARITHMETIC: number;
-    SVG_FECOMPOSITE_OPERATOR_ATOP: number;
-    SVG_FECOMPOSITE_OPERATOR_IN: number;
-    SVG_FECOMPOSITE_OPERATOR_OUT: number;
-    SVG_FECOMPOSITE_OPERATOR_OVER: number;
-    SVG_FECOMPOSITE_OPERATOR_UNKNOWN: number;
-    SVG_FECOMPOSITE_OPERATOR_XOR: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_ARITHMETIC: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_ATOP: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_IN: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_OUT: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_OVER: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_UNKNOWN: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_XOR: number;
 }
 
 interface SVGFEConvolveMatrixElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    bias: SVGAnimatedNumber;
-    divisor: SVGAnimatedNumber;
-    edgeMode: SVGAnimatedEnumeration;
-    in1: SVGAnimatedString;
-    kernelMatrix: SVGAnimatedNumberList;
-    kernelUnitLengthX: SVGAnimatedNumber;
-    kernelUnitLengthY: SVGAnimatedNumber;
-    orderX: SVGAnimatedInteger;
-    orderY: SVGAnimatedInteger;
-    preserveAlpha: SVGAnimatedBoolean;
-    targetX: SVGAnimatedInteger;
-    targetY: SVGAnimatedInteger;
-    SVG_EDGEMODE_DUPLICATE: number;
-    SVG_EDGEMODE_NONE: number;
-    SVG_EDGEMODE_UNKNOWN: number;
-    SVG_EDGEMODE_WRAP: number;
+    readonly bias: SVGAnimatedNumber;
+    readonly divisor: SVGAnimatedNumber;
+    readonly edgeMode: SVGAnimatedEnumeration;
+    readonly in1: SVGAnimatedString;
+    readonly kernelMatrix: SVGAnimatedNumberList;
+    readonly kernelUnitLengthX: SVGAnimatedNumber;
+    readonly kernelUnitLengthY: SVGAnimatedNumber;
+    readonly orderX: SVGAnimatedInteger;
+    readonly orderY: SVGAnimatedInteger;
+    readonly preserveAlpha: SVGAnimatedBoolean;
+    readonly targetX: SVGAnimatedInteger;
+    readonly targetY: SVGAnimatedInteger;
+    readonly SVG_EDGEMODE_DUPLICATE: number;
+    readonly SVG_EDGEMODE_NONE: number;
+    readonly SVG_EDGEMODE_UNKNOWN: number;
+    readonly SVG_EDGEMODE_WRAP: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEConvolveMatrixElement: {
     prototype: SVGFEConvolveMatrixElement;
     new(): SVGFEConvolveMatrixElement;
-    SVG_EDGEMODE_DUPLICATE: number;
-    SVG_EDGEMODE_NONE: number;
-    SVG_EDGEMODE_UNKNOWN: number;
-    SVG_EDGEMODE_WRAP: number;
+    readonly SVG_EDGEMODE_DUPLICATE: number;
+    readonly SVG_EDGEMODE_NONE: number;
+    readonly SVG_EDGEMODE_UNKNOWN: number;
+    readonly SVG_EDGEMODE_WRAP: number;
 }
 
 interface SVGFEDiffuseLightingElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    diffuseConstant: SVGAnimatedNumber;
-    in1: SVGAnimatedString;
-    kernelUnitLengthX: SVGAnimatedNumber;
-    kernelUnitLengthY: SVGAnimatedNumber;
-    surfaceScale: SVGAnimatedNumber;
+    readonly diffuseConstant: SVGAnimatedNumber;
+    readonly in1: SVGAnimatedString;
+    readonly kernelUnitLengthX: SVGAnimatedNumber;
+    readonly kernelUnitLengthY: SVGAnimatedNumber;
+    readonly surfaceScale: SVGAnimatedNumber;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9170,32 +10004,32 @@ declare var SVGFEDiffuseLightingElement: {
 }
 
 interface SVGFEDisplacementMapElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    in2: SVGAnimatedString;
-    scale: SVGAnimatedNumber;
-    xChannelSelector: SVGAnimatedEnumeration;
-    yChannelSelector: SVGAnimatedEnumeration;
-    SVG_CHANNEL_A: number;
-    SVG_CHANNEL_B: number;
-    SVG_CHANNEL_G: number;
-    SVG_CHANNEL_R: number;
-    SVG_CHANNEL_UNKNOWN: number;
+    readonly in1: SVGAnimatedString;
+    readonly in2: SVGAnimatedString;
+    readonly scale: SVGAnimatedNumber;
+    readonly xChannelSelector: SVGAnimatedEnumeration;
+    readonly yChannelSelector: SVGAnimatedEnumeration;
+    readonly SVG_CHANNEL_A: number;
+    readonly SVG_CHANNEL_B: number;
+    readonly SVG_CHANNEL_G: number;
+    readonly SVG_CHANNEL_R: number;
+    readonly SVG_CHANNEL_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEDisplacementMapElement: {
     prototype: SVGFEDisplacementMapElement;
     new(): SVGFEDisplacementMapElement;
-    SVG_CHANNEL_A: number;
-    SVG_CHANNEL_B: number;
-    SVG_CHANNEL_G: number;
-    SVG_CHANNEL_R: number;
-    SVG_CHANNEL_UNKNOWN: number;
+    readonly SVG_CHANNEL_A: number;
+    readonly SVG_CHANNEL_B: number;
+    readonly SVG_CHANNEL_G: number;
+    readonly SVG_CHANNEL_R: number;
+    readonly SVG_CHANNEL_UNKNOWN: number;
 }
 
 interface SVGFEDistantLightElement extends SVGElement {
-    azimuth: SVGAnimatedNumber;
-    elevation: SVGAnimatedNumber;
+    readonly azimuth: SVGAnimatedNumber;
+    readonly elevation: SVGAnimatedNumber;
 }
 
 declare var SVGFEDistantLightElement: {
@@ -9245,9 +10079,9 @@ declare var SVGFEFuncRElement: {
 }
 
 interface SVGFEGaussianBlurElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    stdDeviationX: SVGAnimatedNumber;
-    stdDeviationY: SVGAnimatedNumber;
+    readonly in1: SVGAnimatedString;
+    readonly stdDeviationX: SVGAnimatedNumber;
+    readonly stdDeviationY: SVGAnimatedNumber;
     setStdDeviation(stdDeviationX: number, stdDeviationY: number): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
@@ -9258,7 +10092,7 @@ declare var SVGFEGaussianBlurElement: {
 }
 
 interface SVGFEImageElement extends SVGElement, SVGFilterPrimitiveStandardAttributes, SVGLangSpace, SVGURIReference, SVGExternalResourcesRequired {
-    preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
+    readonly preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9277,7 +10111,7 @@ declare var SVGFEMergeElement: {
 }
 
 interface SVGFEMergeNodeElement extends SVGElement {
-    in1: SVGAnimatedString;
+    readonly in1: SVGAnimatedString;
 }
 
 declare var SVGFEMergeNodeElement: {
@@ -9286,28 +10120,28 @@ declare var SVGFEMergeNodeElement: {
 }
 
 interface SVGFEMorphologyElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    operator: SVGAnimatedEnumeration;
-    radiusX: SVGAnimatedNumber;
-    radiusY: SVGAnimatedNumber;
-    SVG_MORPHOLOGY_OPERATOR_DILATE: number;
-    SVG_MORPHOLOGY_OPERATOR_ERODE: number;
-    SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number;
+    readonly in1: SVGAnimatedString;
+    readonly operator: SVGAnimatedEnumeration;
+    readonly radiusX: SVGAnimatedNumber;
+    readonly radiusY: SVGAnimatedNumber;
+    readonly SVG_MORPHOLOGY_OPERATOR_DILATE: number;
+    readonly SVG_MORPHOLOGY_OPERATOR_ERODE: number;
+    readonly SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEMorphologyElement: {
     prototype: SVGFEMorphologyElement;
     new(): SVGFEMorphologyElement;
-    SVG_MORPHOLOGY_OPERATOR_DILATE: number;
-    SVG_MORPHOLOGY_OPERATOR_ERODE: number;
-    SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number;
+    readonly SVG_MORPHOLOGY_OPERATOR_DILATE: number;
+    readonly SVG_MORPHOLOGY_OPERATOR_ERODE: number;
+    readonly SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number;
 }
 
 interface SVGFEOffsetElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    dx: SVGAnimatedNumber;
-    dy: SVGAnimatedNumber;
-    in1: SVGAnimatedString;
+    readonly dx: SVGAnimatedNumber;
+    readonly dy: SVGAnimatedNumber;
+    readonly in1: SVGAnimatedString;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9317,9 +10151,9 @@ declare var SVGFEOffsetElement: {
 }
 
 interface SVGFEPointLightElement extends SVGElement {
-    x: SVGAnimatedNumber;
-    y: SVGAnimatedNumber;
-    z: SVGAnimatedNumber;
+    readonly x: SVGAnimatedNumber;
+    readonly y: SVGAnimatedNumber;
+    readonly z: SVGAnimatedNumber;
 }
 
 declare var SVGFEPointLightElement: {
@@ -9328,12 +10162,12 @@ declare var SVGFEPointLightElement: {
 }
 
 interface SVGFESpecularLightingElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    kernelUnitLengthX: SVGAnimatedNumber;
-    kernelUnitLengthY: SVGAnimatedNumber;
-    specularConstant: SVGAnimatedNumber;
-    specularExponent: SVGAnimatedNumber;
-    surfaceScale: SVGAnimatedNumber;
+    readonly in1: SVGAnimatedString;
+    readonly kernelUnitLengthX: SVGAnimatedNumber;
+    readonly kernelUnitLengthY: SVGAnimatedNumber;
+    readonly specularConstant: SVGAnimatedNumber;
+    readonly specularExponent: SVGAnimatedNumber;
+    readonly surfaceScale: SVGAnimatedNumber;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9343,14 +10177,14 @@ declare var SVGFESpecularLightingElement: {
 }
 
 interface SVGFESpotLightElement extends SVGElement {
-    limitingConeAngle: SVGAnimatedNumber;
-    pointsAtX: SVGAnimatedNumber;
-    pointsAtY: SVGAnimatedNumber;
-    pointsAtZ: SVGAnimatedNumber;
-    specularExponent: SVGAnimatedNumber;
-    x: SVGAnimatedNumber;
-    y: SVGAnimatedNumber;
-    z: SVGAnimatedNumber;
+    readonly limitingConeAngle: SVGAnimatedNumber;
+    readonly pointsAtX: SVGAnimatedNumber;
+    readonly pointsAtY: SVGAnimatedNumber;
+    readonly pointsAtZ: SVGAnimatedNumber;
+    readonly specularExponent: SVGAnimatedNumber;
+    readonly x: SVGAnimatedNumber;
+    readonly y: SVGAnimatedNumber;
+    readonly z: SVGAnimatedNumber;
 }
 
 declare var SVGFESpotLightElement: {
@@ -9359,7 +10193,7 @@ declare var SVGFESpotLightElement: {
 }
 
 interface SVGFETileElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
+    readonly in1: SVGAnimatedString;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9369,41 +10203,41 @@ declare var SVGFETileElement: {
 }
 
 interface SVGFETurbulenceElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    baseFrequencyX: SVGAnimatedNumber;
-    baseFrequencyY: SVGAnimatedNumber;
-    numOctaves: SVGAnimatedInteger;
-    seed: SVGAnimatedNumber;
-    stitchTiles: SVGAnimatedEnumeration;
-    type: SVGAnimatedEnumeration;
-    SVG_STITCHTYPE_NOSTITCH: number;
-    SVG_STITCHTYPE_STITCH: number;
-    SVG_STITCHTYPE_UNKNOWN: number;
-    SVG_TURBULENCE_TYPE_FRACTALNOISE: number;
-    SVG_TURBULENCE_TYPE_TURBULENCE: number;
-    SVG_TURBULENCE_TYPE_UNKNOWN: number;
+    readonly baseFrequencyX: SVGAnimatedNumber;
+    readonly baseFrequencyY: SVGAnimatedNumber;
+    readonly numOctaves: SVGAnimatedInteger;
+    readonly seed: SVGAnimatedNumber;
+    readonly stitchTiles: SVGAnimatedEnumeration;
+    readonly type: SVGAnimatedEnumeration;
+    readonly SVG_STITCHTYPE_NOSTITCH: number;
+    readonly SVG_STITCHTYPE_STITCH: number;
+    readonly SVG_STITCHTYPE_UNKNOWN: number;
+    readonly SVG_TURBULENCE_TYPE_FRACTALNOISE: number;
+    readonly SVG_TURBULENCE_TYPE_TURBULENCE: number;
+    readonly SVG_TURBULENCE_TYPE_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFETurbulenceElement: {
     prototype: SVGFETurbulenceElement;
     new(): SVGFETurbulenceElement;
-    SVG_STITCHTYPE_NOSTITCH: number;
-    SVG_STITCHTYPE_STITCH: number;
-    SVG_STITCHTYPE_UNKNOWN: number;
-    SVG_TURBULENCE_TYPE_FRACTALNOISE: number;
-    SVG_TURBULENCE_TYPE_TURBULENCE: number;
-    SVG_TURBULENCE_TYPE_UNKNOWN: number;
+    readonly SVG_STITCHTYPE_NOSTITCH: number;
+    readonly SVG_STITCHTYPE_STITCH: number;
+    readonly SVG_STITCHTYPE_UNKNOWN: number;
+    readonly SVG_TURBULENCE_TYPE_FRACTALNOISE: number;
+    readonly SVG_TURBULENCE_TYPE_TURBULENCE: number;
+    readonly SVG_TURBULENCE_TYPE_UNKNOWN: number;
 }
 
 interface SVGFilterElement extends SVGElement, SVGUnitTypes, SVGStylable, SVGLangSpace, SVGURIReference, SVGExternalResourcesRequired {
-    filterResX: SVGAnimatedInteger;
-    filterResY: SVGAnimatedInteger;
-    filterUnits: SVGAnimatedEnumeration;
-    height: SVGAnimatedLength;
-    primitiveUnits: SVGAnimatedEnumeration;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly filterResX: SVGAnimatedInteger;
+    readonly filterResY: SVGAnimatedInteger;
+    readonly filterUnits: SVGAnimatedEnumeration;
+    readonly height: SVGAnimatedLength;
+    readonly primitiveUnits: SVGAnimatedEnumeration;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     setFilterRes(filterResX: number, filterResY: number): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
@@ -9414,10 +10248,10 @@ declare var SVGFilterElement: {
 }
 
 interface SVGForeignObjectElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    height: SVGAnimatedLength;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly height: SVGAnimatedLength;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9436,31 +10270,31 @@ declare var SVGGElement: {
 }
 
 interface SVGGradientElement extends SVGElement, SVGStylable, SVGExternalResourcesRequired, SVGURIReference, SVGUnitTypes {
-    gradientTransform: SVGAnimatedTransformList;
-    gradientUnits: SVGAnimatedEnumeration;
-    spreadMethod: SVGAnimatedEnumeration;
-    SVG_SPREADMETHOD_PAD: number;
-    SVG_SPREADMETHOD_REFLECT: number;
-    SVG_SPREADMETHOD_REPEAT: number;
-    SVG_SPREADMETHOD_UNKNOWN: number;
+    readonly gradientTransform: SVGAnimatedTransformList;
+    readonly gradientUnits: SVGAnimatedEnumeration;
+    readonly spreadMethod: SVGAnimatedEnumeration;
+    readonly SVG_SPREADMETHOD_PAD: number;
+    readonly SVG_SPREADMETHOD_REFLECT: number;
+    readonly SVG_SPREADMETHOD_REPEAT: number;
+    readonly SVG_SPREADMETHOD_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGGradientElement: {
     prototype: SVGGradientElement;
     new(): SVGGradientElement;
-    SVG_SPREADMETHOD_PAD: number;
-    SVG_SPREADMETHOD_REFLECT: number;
-    SVG_SPREADMETHOD_REPEAT: number;
-    SVG_SPREADMETHOD_UNKNOWN: number;
+    readonly SVG_SPREADMETHOD_PAD: number;
+    readonly SVG_SPREADMETHOD_REFLECT: number;
+    readonly SVG_SPREADMETHOD_REPEAT: number;
+    readonly SVG_SPREADMETHOD_UNKNOWN: number;
 }
 
 interface SVGImageElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference {
-    height: SVGAnimatedLength;
-    preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly height: SVGAnimatedLength;
+    readonly preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9470,43 +10304,43 @@ declare var SVGImageElement: {
 }
 
 interface SVGLength {
-    unitType: number;
+    readonly unitType: number;
     value: number;
     valueAsString: string;
     valueInSpecifiedUnits: number;
     convertToSpecifiedUnits(unitType: number): void;
     newValueSpecifiedUnits(unitType: number, valueInSpecifiedUnits: number): void;
-    SVG_LENGTHTYPE_CM: number;
-    SVG_LENGTHTYPE_EMS: number;
-    SVG_LENGTHTYPE_EXS: number;
-    SVG_LENGTHTYPE_IN: number;
-    SVG_LENGTHTYPE_MM: number;
-    SVG_LENGTHTYPE_NUMBER: number;
-    SVG_LENGTHTYPE_PC: number;
-    SVG_LENGTHTYPE_PERCENTAGE: number;
-    SVG_LENGTHTYPE_PT: number;
-    SVG_LENGTHTYPE_PX: number;
-    SVG_LENGTHTYPE_UNKNOWN: number;
+    readonly SVG_LENGTHTYPE_CM: number;
+    readonly SVG_LENGTHTYPE_EMS: number;
+    readonly SVG_LENGTHTYPE_EXS: number;
+    readonly SVG_LENGTHTYPE_IN: number;
+    readonly SVG_LENGTHTYPE_MM: number;
+    readonly SVG_LENGTHTYPE_NUMBER: number;
+    readonly SVG_LENGTHTYPE_PC: number;
+    readonly SVG_LENGTHTYPE_PERCENTAGE: number;
+    readonly SVG_LENGTHTYPE_PT: number;
+    readonly SVG_LENGTHTYPE_PX: number;
+    readonly SVG_LENGTHTYPE_UNKNOWN: number;
 }
 
 declare var SVGLength: {
     prototype: SVGLength;
     new(): SVGLength;
-    SVG_LENGTHTYPE_CM: number;
-    SVG_LENGTHTYPE_EMS: number;
-    SVG_LENGTHTYPE_EXS: number;
-    SVG_LENGTHTYPE_IN: number;
-    SVG_LENGTHTYPE_MM: number;
-    SVG_LENGTHTYPE_NUMBER: number;
-    SVG_LENGTHTYPE_PC: number;
-    SVG_LENGTHTYPE_PERCENTAGE: number;
-    SVG_LENGTHTYPE_PT: number;
-    SVG_LENGTHTYPE_PX: number;
-    SVG_LENGTHTYPE_UNKNOWN: number;
+    readonly SVG_LENGTHTYPE_CM: number;
+    readonly SVG_LENGTHTYPE_EMS: number;
+    readonly SVG_LENGTHTYPE_EXS: number;
+    readonly SVG_LENGTHTYPE_IN: number;
+    readonly SVG_LENGTHTYPE_MM: number;
+    readonly SVG_LENGTHTYPE_NUMBER: number;
+    readonly SVG_LENGTHTYPE_PC: number;
+    readonly SVG_LENGTHTYPE_PERCENTAGE: number;
+    readonly SVG_LENGTHTYPE_PT: number;
+    readonly SVG_LENGTHTYPE_PX: number;
+    readonly SVG_LENGTHTYPE_UNKNOWN: number;
 }
 
 interface SVGLengthList {
-    numberOfItems: number;
+    readonly numberOfItems: number;
     appendItem(newItem: SVGLength): SVGLength;
     clear(): void;
     getItem(index: number): SVGLength;
@@ -9522,10 +10356,10 @@ declare var SVGLengthList: {
 }
 
 interface SVGLineElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    x1: SVGAnimatedLength;
-    x2: SVGAnimatedLength;
-    y1: SVGAnimatedLength;
-    y2: SVGAnimatedLength;
+    readonly x1: SVGAnimatedLength;
+    readonly x2: SVGAnimatedLength;
+    readonly y1: SVGAnimatedLength;
+    readonly y2: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9535,10 +10369,10 @@ declare var SVGLineElement: {
 }
 
 interface SVGLinearGradientElement extends SVGGradientElement {
-    x1: SVGAnimatedLength;
-    x2: SVGAnimatedLength;
-    y1: SVGAnimatedLength;
-    y2: SVGAnimatedLength;
+    readonly x1: SVGAnimatedLength;
+    readonly x2: SVGAnimatedLength;
+    readonly y1: SVGAnimatedLength;
+    readonly y2: SVGAnimatedLength;
 }
 
 declare var SVGLinearGradientElement: {
@@ -9547,42 +10381,42 @@ declare var SVGLinearGradientElement: {
 }
 
 interface SVGMarkerElement extends SVGElement, SVGStylable, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox {
-    markerHeight: SVGAnimatedLength;
-    markerUnits: SVGAnimatedEnumeration;
-    markerWidth: SVGAnimatedLength;
-    orientAngle: SVGAnimatedAngle;
-    orientType: SVGAnimatedEnumeration;
-    refX: SVGAnimatedLength;
-    refY: SVGAnimatedLength;
+    readonly markerHeight: SVGAnimatedLength;
+    readonly markerUnits: SVGAnimatedEnumeration;
+    readonly markerWidth: SVGAnimatedLength;
+    readonly orientAngle: SVGAnimatedAngle;
+    readonly orientType: SVGAnimatedEnumeration;
+    readonly refX: SVGAnimatedLength;
+    readonly refY: SVGAnimatedLength;
     setOrientToAngle(angle: SVGAngle): void;
     setOrientToAuto(): void;
-    SVG_MARKERUNITS_STROKEWIDTH: number;
-    SVG_MARKERUNITS_UNKNOWN: number;
-    SVG_MARKERUNITS_USERSPACEONUSE: number;
-    SVG_MARKER_ORIENT_ANGLE: number;
-    SVG_MARKER_ORIENT_AUTO: number;
-    SVG_MARKER_ORIENT_UNKNOWN: number;
+    readonly SVG_MARKERUNITS_STROKEWIDTH: number;
+    readonly SVG_MARKERUNITS_UNKNOWN: number;
+    readonly SVG_MARKERUNITS_USERSPACEONUSE: number;
+    readonly SVG_MARKER_ORIENT_ANGLE: number;
+    readonly SVG_MARKER_ORIENT_AUTO: number;
+    readonly SVG_MARKER_ORIENT_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGMarkerElement: {
     prototype: SVGMarkerElement;
     new(): SVGMarkerElement;
-    SVG_MARKERUNITS_STROKEWIDTH: number;
-    SVG_MARKERUNITS_UNKNOWN: number;
-    SVG_MARKERUNITS_USERSPACEONUSE: number;
-    SVG_MARKER_ORIENT_ANGLE: number;
-    SVG_MARKER_ORIENT_AUTO: number;
-    SVG_MARKER_ORIENT_UNKNOWN: number;
+    readonly SVG_MARKERUNITS_STROKEWIDTH: number;
+    readonly SVG_MARKERUNITS_UNKNOWN: number;
+    readonly SVG_MARKERUNITS_USERSPACEONUSE: number;
+    readonly SVG_MARKER_ORIENT_ANGLE: number;
+    readonly SVG_MARKER_ORIENT_AUTO: number;
+    readonly SVG_MARKER_ORIENT_UNKNOWN: number;
 }
 
 interface SVGMaskElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGUnitTypes {
-    height: SVGAnimatedLength;
-    maskContentUnits: SVGAnimatedEnumeration;
-    maskUnits: SVGAnimatedEnumeration;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly height: SVGAnimatedLength;
+    readonly maskContentUnits: SVGAnimatedEnumeration;
+    readonly maskUnits: SVGAnimatedEnumeration;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9634,7 +10468,7 @@ declare var SVGNumber: {
 }
 
 interface SVGNumberList {
-    numberOfItems: number;
+    readonly numberOfItems: number;
     appendItem(newItem: SVGNumber): SVGNumber;
     clear(): void;
     getItem(index: number): SVGNumber;
@@ -9681,53 +10515,53 @@ declare var SVGPathElement: {
 }
 
 interface SVGPathSeg {
-    pathSegType: number;
-    pathSegTypeAsLetter: string;
-    PATHSEG_ARC_ABS: number;
-    PATHSEG_ARC_REL: number;
-    PATHSEG_CLOSEPATH: number;
-    PATHSEG_CURVETO_CUBIC_ABS: number;
-    PATHSEG_CURVETO_CUBIC_REL: number;
-    PATHSEG_CURVETO_CUBIC_SMOOTH_ABS: number;
-    PATHSEG_CURVETO_CUBIC_SMOOTH_REL: number;
-    PATHSEG_CURVETO_QUADRATIC_ABS: number;
-    PATHSEG_CURVETO_QUADRATIC_REL: number;
-    PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS: number;
-    PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL: number;
-    PATHSEG_LINETO_ABS: number;
-    PATHSEG_LINETO_HORIZONTAL_ABS: number;
-    PATHSEG_LINETO_HORIZONTAL_REL: number;
-    PATHSEG_LINETO_REL: number;
-    PATHSEG_LINETO_VERTICAL_ABS: number;
-    PATHSEG_LINETO_VERTICAL_REL: number;
-    PATHSEG_MOVETO_ABS: number;
-    PATHSEG_MOVETO_REL: number;
-    PATHSEG_UNKNOWN: number;
+    readonly pathSegType: number;
+    readonly pathSegTypeAsLetter: string;
+    readonly PATHSEG_ARC_ABS: number;
+    readonly PATHSEG_ARC_REL: number;
+    readonly PATHSEG_CLOSEPATH: number;
+    readonly PATHSEG_CURVETO_CUBIC_ABS: number;
+    readonly PATHSEG_CURVETO_CUBIC_REL: number;
+    readonly PATHSEG_CURVETO_CUBIC_SMOOTH_ABS: number;
+    readonly PATHSEG_CURVETO_CUBIC_SMOOTH_REL: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_ABS: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_REL: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL: number;
+    readonly PATHSEG_LINETO_ABS: number;
+    readonly PATHSEG_LINETO_HORIZONTAL_ABS: number;
+    readonly PATHSEG_LINETO_HORIZONTAL_REL: number;
+    readonly PATHSEG_LINETO_REL: number;
+    readonly PATHSEG_LINETO_VERTICAL_ABS: number;
+    readonly PATHSEG_LINETO_VERTICAL_REL: number;
+    readonly PATHSEG_MOVETO_ABS: number;
+    readonly PATHSEG_MOVETO_REL: number;
+    readonly PATHSEG_UNKNOWN: number;
 }
 
 declare var SVGPathSeg: {
     prototype: SVGPathSeg;
     new(): SVGPathSeg;
-    PATHSEG_ARC_ABS: number;
-    PATHSEG_ARC_REL: number;
-    PATHSEG_CLOSEPATH: number;
-    PATHSEG_CURVETO_CUBIC_ABS: number;
-    PATHSEG_CURVETO_CUBIC_REL: number;
-    PATHSEG_CURVETO_CUBIC_SMOOTH_ABS: number;
-    PATHSEG_CURVETO_CUBIC_SMOOTH_REL: number;
-    PATHSEG_CURVETO_QUADRATIC_ABS: number;
-    PATHSEG_CURVETO_QUADRATIC_REL: number;
-    PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS: number;
-    PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL: number;
-    PATHSEG_LINETO_ABS: number;
-    PATHSEG_LINETO_HORIZONTAL_ABS: number;
-    PATHSEG_LINETO_HORIZONTAL_REL: number;
-    PATHSEG_LINETO_REL: number;
-    PATHSEG_LINETO_VERTICAL_ABS: number;
-    PATHSEG_LINETO_VERTICAL_REL: number;
-    PATHSEG_MOVETO_ABS: number;
-    PATHSEG_MOVETO_REL: number;
-    PATHSEG_UNKNOWN: number;
+    readonly PATHSEG_ARC_ABS: number;
+    readonly PATHSEG_ARC_REL: number;
+    readonly PATHSEG_CLOSEPATH: number;
+    readonly PATHSEG_CURVETO_CUBIC_ABS: number;
+    readonly PATHSEG_CURVETO_CUBIC_REL: number;
+    readonly PATHSEG_CURVETO_CUBIC_SMOOTH_ABS: number;
+    readonly PATHSEG_CURVETO_CUBIC_SMOOTH_REL: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_ABS: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_REL: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL: number;
+    readonly PATHSEG_LINETO_ABS: number;
+    readonly PATHSEG_LINETO_HORIZONTAL_ABS: number;
+    readonly PATHSEG_LINETO_HORIZONTAL_REL: number;
+    readonly PATHSEG_LINETO_REL: number;
+    readonly PATHSEG_LINETO_VERTICAL_ABS: number;
+    readonly PATHSEG_LINETO_VERTICAL_REL: number;
+    readonly PATHSEG_MOVETO_ABS: number;
+    readonly PATHSEG_MOVETO_REL: number;
+    readonly PATHSEG_UNKNOWN: number;
 }
 
 interface SVGPathSegArcAbs extends SVGPathSeg {
@@ -9921,7 +10755,7 @@ declare var SVGPathSegLinetoVerticalRel: {
 }
 
 interface SVGPathSegList {
-    numberOfItems: number;
+    readonly numberOfItems: number;
     appendItem(newItem: SVGPathSeg): SVGPathSeg;
     clear(): void;
     getItem(index: number): SVGPathSeg;
@@ -9957,13 +10791,13 @@ declare var SVGPathSegMovetoRel: {
 }
 
 interface SVGPatternElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox, SVGURIReference, SVGUnitTypes {
-    height: SVGAnimatedLength;
-    patternContentUnits: SVGAnimatedEnumeration;
-    patternTransform: SVGAnimatedTransformList;
-    patternUnits: SVGAnimatedEnumeration;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly height: SVGAnimatedLength;
+    readonly patternContentUnits: SVGAnimatedEnumeration;
+    readonly patternTransform: SVGAnimatedTransformList;
+    readonly patternUnits: SVGAnimatedEnumeration;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9984,7 +10818,7 @@ declare var SVGPoint: {
 }
 
 interface SVGPointList {
-    numberOfItems: number;
+    readonly numberOfItems: number;
     appendItem(newItem: SVGPoint): SVGPoint;
     clear(): void;
     getItem(index: number): SVGPoint;
@@ -10020,47 +10854,47 @@ declare var SVGPolylineElement: {
 interface SVGPreserveAspectRatio {
     align: number;
     meetOrSlice: number;
-    SVG_MEETORSLICE_MEET: number;
-    SVG_MEETORSLICE_SLICE: number;
-    SVG_MEETORSLICE_UNKNOWN: number;
-    SVG_PRESERVEASPECTRATIO_NONE: number;
-    SVG_PRESERVEASPECTRATIO_UNKNOWN: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMIN: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMIN: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMIN: number;
+    readonly SVG_MEETORSLICE_MEET: number;
+    readonly SVG_MEETORSLICE_SLICE: number;
+    readonly SVG_MEETORSLICE_UNKNOWN: number;
+    readonly SVG_PRESERVEASPECTRATIO_NONE: number;
+    readonly SVG_PRESERVEASPECTRATIO_UNKNOWN: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMAXYMAX: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMAXYMID: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMAXYMIN: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMIDYMAX: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMIDYMID: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMIDYMIN: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMINYMAX: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMINYMID: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMINYMIN: number;
 }
 
 declare var SVGPreserveAspectRatio: {
     prototype: SVGPreserveAspectRatio;
     new(): SVGPreserveAspectRatio;
-    SVG_MEETORSLICE_MEET: number;
-    SVG_MEETORSLICE_SLICE: number;
-    SVG_MEETORSLICE_UNKNOWN: number;
-    SVG_PRESERVEASPECTRATIO_NONE: number;
-    SVG_PRESERVEASPECTRATIO_UNKNOWN: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMIN: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMIN: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMIN: number;
+    readonly SVG_MEETORSLICE_MEET: number;
+    readonly SVG_MEETORSLICE_SLICE: number;
+    readonly SVG_MEETORSLICE_UNKNOWN: number;
+    readonly SVG_PRESERVEASPECTRATIO_NONE: number;
+    readonly SVG_PRESERVEASPECTRATIO_UNKNOWN: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMAXYMAX: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMAXYMID: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMAXYMIN: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMIDYMAX: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMIDYMID: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMIDYMIN: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMINYMAX: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMINYMID: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMINYMIN: number;
 }
 
 interface SVGRadialGradientElement extends SVGGradientElement {
-    cx: SVGAnimatedLength;
-    cy: SVGAnimatedLength;
-    fx: SVGAnimatedLength;
-    fy: SVGAnimatedLength;
-    r: SVGAnimatedLength;
+    readonly cx: SVGAnimatedLength;
+    readonly cy: SVGAnimatedLength;
+    readonly fx: SVGAnimatedLength;
+    readonly fy: SVGAnimatedLength;
+    readonly r: SVGAnimatedLength;
 }
 
 declare var SVGRadialGradientElement: {
@@ -10081,12 +10915,12 @@ declare var SVGRect: {
 }
 
 interface SVGRectElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    height: SVGAnimatedLength;
-    rx: SVGAnimatedLength;
-    ry: SVGAnimatedLength;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly height: SVGAnimatedLength;
+    readonly rx: SVGAnimatedLength;
+    readonly ry: SVGAnimatedLength;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10099,22 +10933,22 @@ interface SVGSVGElement extends SVGElement, DocumentEvent, SVGLocatable, SVGTest
     contentScriptType: string;
     contentStyleType: string;
     currentScale: number;
-    currentTranslate: SVGPoint;
-    height: SVGAnimatedLength;
+    readonly currentTranslate: SVGPoint;
+    readonly height: SVGAnimatedLength;
     onabort: (ev: Event) => any;
     onerror: (ev: Event) => any;
     onresize: (ev: UIEvent) => any;
     onscroll: (ev: UIEvent) => any;
     onunload: (ev: Event) => any;
     onzoom: (ev: SVGZoomEvent) => any;
-    pixelUnitToMillimeterX: number;
-    pixelUnitToMillimeterY: number;
-    screenPixelToMillimeterX: number;
-    screenPixelToMillimeterY: number;
-    viewport: SVGRect;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly pixelUnitToMillimeterX: number;
+    readonly pixelUnitToMillimeterY: number;
+    readonly screenPixelToMillimeterX: number;
+    readonly screenPixelToMillimeterY: number;
+    readonly viewport: SVGRect;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     checkEnclosure(element: SVGElement, rect: SVGRect): boolean;
     checkIntersection(element: SVGElement, rect: SVGRect): boolean;
     createSVGAngle(): SVGAngle;
@@ -10130,8 +10964,8 @@ interface SVGSVGElement extends SVGElement, DocumentEvent, SVGLocatable, SVGTest
     getComputedStyle(elt: Element, pseudoElt?: string): CSSStyleDeclaration;
     getCurrentTime(): number;
     getElementById(elementId: string): Element;
-    getEnclosureList(rect: SVGRect, referenceElement: SVGElement): NodeList;
-    getIntersectionList(rect: SVGRect, referenceElement: SVGElement): NodeList;
+    getEnclosureList(rect: SVGRect, referenceElement: SVGElement): NodeListOf<SVGCircleElement | SVGEllipseElement | SVGImageElement | SVGLineElement | SVGPathElement | SVGPolygonElement | SVGPolylineElement | SVGRectElement | SVGTextElement | SVGUseElement>;
+    getIntersectionList(rect: SVGRect, referenceElement: SVGElement): NodeListOf<SVGCircleElement | SVGEllipseElement | SVGImageElement | SVGLineElement | SVGPathElement | SVGPolygonElement | SVGPolylineElement | SVGRectElement | SVGTextElement | SVGUseElement>;
     pauseAnimations(): void;
     setCurrentTime(seconds: number): void;
     suspendRedraw(maxWaitMilliseconds: number): number;
@@ -10209,7 +11043,7 @@ declare var SVGScriptElement: {
 }
 
 interface SVGStopElement extends SVGElement, SVGStylable {
-    offset: SVGAnimatedNumber;
+    readonly offset: SVGAnimatedNumber;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10219,7 +11053,7 @@ declare var SVGStopElement: {
 }
 
 interface SVGStringList {
-    numberOfItems: number;
+    readonly numberOfItems: number;
     appendItem(newItem: string): string;
     clear(): void;
     getItem(index: number): string;
@@ -10235,6 +11069,7 @@ declare var SVGStringList: {
 }
 
 interface SVGStyleElement extends SVGElement, SVGLangSpace {
+    disabled: boolean;
     media: string;
     title: string;
     type: string;
@@ -10273,8 +11108,8 @@ declare var SVGTSpanElement: {
 }
 
 interface SVGTextContentElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    lengthAdjust: SVGAnimatedEnumeration;
-    textLength: SVGAnimatedLength;
+    readonly lengthAdjust: SVGAnimatedEnumeration;
+    readonly textLength: SVGAnimatedLength;
     getCharNumAtPosition(point: SVGPoint): number;
     getComputedTextLength(): number;
     getEndPositionOfChar(charnum: number): SVGPoint;
@@ -10284,18 +11119,18 @@ interface SVGTextContentElement extends SVGElement, SVGStylable, SVGTests, SVGLa
     getStartPositionOfChar(charnum: number): SVGPoint;
     getSubStringLength(charnum: number, nchars: number): number;
     selectSubString(charnum: number, nchars: number): void;
-    LENGTHADJUST_SPACING: number;
-    LENGTHADJUST_SPACINGANDGLYPHS: number;
-    LENGTHADJUST_UNKNOWN: number;
+    readonly LENGTHADJUST_SPACING: number;
+    readonly LENGTHADJUST_SPACINGANDGLYPHS: number;
+    readonly LENGTHADJUST_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGTextContentElement: {
     prototype: SVGTextContentElement;
     new(): SVGTextContentElement;
-    LENGTHADJUST_SPACING: number;
-    LENGTHADJUST_SPACINGANDGLYPHS: number;
-    LENGTHADJUST_UNKNOWN: number;
+    readonly LENGTHADJUST_SPACING: number;
+    readonly LENGTHADJUST_SPACINGANDGLYPHS: number;
+    readonly LENGTHADJUST_UNKNOWN: number;
 }
 
 interface SVGTextElement extends SVGTextPositioningElement, SVGTransformable {
@@ -10308,35 +11143,35 @@ declare var SVGTextElement: {
 }
 
 interface SVGTextPathElement extends SVGTextContentElement, SVGURIReference {
-    method: SVGAnimatedEnumeration;
-    spacing: SVGAnimatedEnumeration;
-    startOffset: SVGAnimatedLength;
-    TEXTPATH_METHODTYPE_ALIGN: number;
-    TEXTPATH_METHODTYPE_STRETCH: number;
-    TEXTPATH_METHODTYPE_UNKNOWN: number;
-    TEXTPATH_SPACINGTYPE_AUTO: number;
-    TEXTPATH_SPACINGTYPE_EXACT: number;
-    TEXTPATH_SPACINGTYPE_UNKNOWN: number;
+    readonly method: SVGAnimatedEnumeration;
+    readonly spacing: SVGAnimatedEnumeration;
+    readonly startOffset: SVGAnimatedLength;
+    readonly TEXTPATH_METHODTYPE_ALIGN: number;
+    readonly TEXTPATH_METHODTYPE_STRETCH: number;
+    readonly TEXTPATH_METHODTYPE_UNKNOWN: number;
+    readonly TEXTPATH_SPACINGTYPE_AUTO: number;
+    readonly TEXTPATH_SPACINGTYPE_EXACT: number;
+    readonly TEXTPATH_SPACINGTYPE_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGTextPathElement: {
     prototype: SVGTextPathElement;
     new(): SVGTextPathElement;
-    TEXTPATH_METHODTYPE_ALIGN: number;
-    TEXTPATH_METHODTYPE_STRETCH: number;
-    TEXTPATH_METHODTYPE_UNKNOWN: number;
-    TEXTPATH_SPACINGTYPE_AUTO: number;
-    TEXTPATH_SPACINGTYPE_EXACT: number;
-    TEXTPATH_SPACINGTYPE_UNKNOWN: number;
+    readonly TEXTPATH_METHODTYPE_ALIGN: number;
+    readonly TEXTPATH_METHODTYPE_STRETCH: number;
+    readonly TEXTPATH_METHODTYPE_UNKNOWN: number;
+    readonly TEXTPATH_SPACINGTYPE_AUTO: number;
+    readonly TEXTPATH_SPACINGTYPE_EXACT: number;
+    readonly TEXTPATH_SPACINGTYPE_UNKNOWN: number;
 }
 
 interface SVGTextPositioningElement extends SVGTextContentElement {
-    dx: SVGAnimatedLengthList;
-    dy: SVGAnimatedLengthList;
-    rotate: SVGAnimatedNumberList;
-    x: SVGAnimatedLengthList;
-    y: SVGAnimatedLengthList;
+    readonly dx: SVGAnimatedLengthList;
+    readonly dy: SVGAnimatedLengthList;
+    readonly rotate: SVGAnimatedNumberList;
+    readonly x: SVGAnimatedLengthList;
+    readonly y: SVGAnimatedLengthList;
 }
 
 declare var SVGTextPositioningElement: {
@@ -10354,38 +11189,38 @@ declare var SVGTitleElement: {
 }
 
 interface SVGTransform {
-    angle: number;
-    matrix: SVGMatrix;
-    type: number;
+    readonly angle: number;
+    readonly matrix: SVGMatrix;
+    readonly type: number;
     setMatrix(matrix: SVGMatrix): void;
     setRotate(angle: number, cx: number, cy: number): void;
     setScale(sx: number, sy: number): void;
     setSkewX(angle: number): void;
     setSkewY(angle: number): void;
     setTranslate(tx: number, ty: number): void;
-    SVG_TRANSFORM_MATRIX: number;
-    SVG_TRANSFORM_ROTATE: number;
-    SVG_TRANSFORM_SCALE: number;
-    SVG_TRANSFORM_SKEWX: number;
-    SVG_TRANSFORM_SKEWY: number;
-    SVG_TRANSFORM_TRANSLATE: number;
-    SVG_TRANSFORM_UNKNOWN: number;
+    readonly SVG_TRANSFORM_MATRIX: number;
+    readonly SVG_TRANSFORM_ROTATE: number;
+    readonly SVG_TRANSFORM_SCALE: number;
+    readonly SVG_TRANSFORM_SKEWX: number;
+    readonly SVG_TRANSFORM_SKEWY: number;
+    readonly SVG_TRANSFORM_TRANSLATE: number;
+    readonly SVG_TRANSFORM_UNKNOWN: number;
 }
 
 declare var SVGTransform: {
     prototype: SVGTransform;
     new(): SVGTransform;
-    SVG_TRANSFORM_MATRIX: number;
-    SVG_TRANSFORM_ROTATE: number;
-    SVG_TRANSFORM_SCALE: number;
-    SVG_TRANSFORM_SKEWX: number;
-    SVG_TRANSFORM_SKEWY: number;
-    SVG_TRANSFORM_TRANSLATE: number;
-    SVG_TRANSFORM_UNKNOWN: number;
+    readonly SVG_TRANSFORM_MATRIX: number;
+    readonly SVG_TRANSFORM_ROTATE: number;
+    readonly SVG_TRANSFORM_SCALE: number;
+    readonly SVG_TRANSFORM_SKEWX: number;
+    readonly SVG_TRANSFORM_SKEWY: number;
+    readonly SVG_TRANSFORM_TRANSLATE: number;
+    readonly SVG_TRANSFORM_UNKNOWN: number;
 }
 
 interface SVGTransformList {
-    numberOfItems: number;
+    readonly numberOfItems: number;
     appendItem(newItem: SVGTransform): SVGTransform;
     clear(): void;
     consolidate(): SVGTransform;
@@ -10403,19 +11238,19 @@ declare var SVGTransformList: {
 }
 
 interface SVGUnitTypes {
-    SVG_UNIT_TYPE_OBJECTBOUNDINGBOX: number;
-    SVG_UNIT_TYPE_UNKNOWN: number;
-    SVG_UNIT_TYPE_USERSPACEONUSE: number;
+    readonly SVG_UNIT_TYPE_OBJECTBOUNDINGBOX: number;
+    readonly SVG_UNIT_TYPE_UNKNOWN: number;
+    readonly SVG_UNIT_TYPE_USERSPACEONUSE: number;
 }
 declare var SVGUnitTypes: SVGUnitTypes;
 
 interface SVGUseElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference {
-    animatedInstanceRoot: SVGElementInstance;
-    height: SVGAnimatedLength;
-    instanceRoot: SVGElementInstance;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly animatedInstanceRoot: SVGElementInstance;
+    readonly height: SVGAnimatedLength;
+    readonly instanceRoot: SVGElementInstance;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10425,7 +11260,7 @@ declare var SVGUseElement: {
 }
 
 interface SVGViewElement extends SVGElement, SVGExternalResourcesRequired, SVGFitToViewBox, SVGZoomAndPan {
-    viewTarget: SVGStringList;
+    readonly viewTarget: SVGStringList;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10435,18 +11270,21 @@ declare var SVGViewElement: {
 }
 
 interface SVGZoomAndPan {
-    SVG_ZOOMANDPAN_DISABLE: number;
-    SVG_ZOOMANDPAN_MAGNIFY: number;
-    SVG_ZOOMANDPAN_UNKNOWN: number;
+    readonly zoomAndPan: number;
+}
+
+declare var SVGZoomAndPan: {
+    readonly SVG_ZOOMANDPAN_DISABLE: number;
+    readonly SVG_ZOOMANDPAN_MAGNIFY: number;
+    readonly SVG_ZOOMANDPAN_UNKNOWN: number;
 }
-declare var SVGZoomAndPan: SVGZoomAndPan;
 
 interface SVGZoomEvent extends UIEvent {
-    newScale: number;
-    newTranslate: SVGPoint;
-    previousScale: number;
-    previousTranslate: SVGPoint;
-    zoomRectScreen: SVGRect;
+    readonly newScale: number;
+    readonly newTranslate: SVGPoint;
+    readonly previousScale: number;
+    readonly previousTranslate: SVGPoint;
+    readonly zoomRectScreen: SVGRect;
 }
 
 declare var SVGZoomEvent: {
@@ -10455,22 +11293,22 @@ declare var SVGZoomEvent: {
 }
 
 interface Screen extends EventTarget {
-    availHeight: number;
-    availWidth: number;
+    readonly availHeight: number;
+    readonly availWidth: number;
     bufferDepth: number;
-    colorDepth: number;
-    deviceXDPI: number;
-    deviceYDPI: number;
-    fontSmoothingEnabled: boolean;
-    height: number;
-    logicalXDPI: number;
-    logicalYDPI: number;
-    msOrientation: string;
+    readonly colorDepth: number;
+    readonly deviceXDPI: number;
+    readonly deviceYDPI: number;
+    readonly fontSmoothingEnabled: boolean;
+    readonly height: number;
+    readonly logicalXDPI: number;
+    readonly logicalYDPI: number;
+    readonly msOrientation: string;
     onmsorientationchange: (ev: Event) => any;
-    pixelDepth: number;
-    systemXDPI: number;
-    systemYDPI: number;
-    width: number;
+    readonly pixelDepth: number;
+    readonly systemXDPI: number;
+    readonly systemYDPI: number;
+    readonly width: number;
     msLockOrientation(orientations: string | string[]): boolean;
     msUnlockOrientation(): void;
     addEventListener(type: "MSOrientationChange", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -10483,8 +11321,8 @@ declare var Screen: {
 }
 
 interface ScriptNotifyEvent extends Event {
-    callingUri: string;
-    value: string;
+    readonly callingUri: string;
+    readonly value: string;
 }
 
 declare var ScriptNotifyEvent: {
@@ -10493,7 +11331,7 @@ declare var ScriptNotifyEvent: {
 }
 
 interface ScriptProcessorNode extends AudioNode {
-    bufferSize: number;
+    readonly bufferSize: number;
     onaudioprocess: (ev: AudioProcessingEvent) => any;
     addEventListener(type: "audioprocess", listener: (ev: AudioProcessingEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -10505,13 +11343,13 @@ declare var ScriptProcessorNode: {
 }
 
 interface Selection {
-    anchorNode: Node;
-    anchorOffset: number;
-    focusNode: Node;
-    focusOffset: number;
-    isCollapsed: boolean;
-    rangeCount: number;
-    type: string;
+    readonly anchorNode: Node;
+    readonly anchorOffset: number;
+    readonly focusNode: Node;
+    readonly focusOffset: number;
+    readonly isCollapsed: boolean;
+    readonly rangeCount: number;
+    readonly type: string;
     addRange(range: Range): void;
     collapse(parentNode: Node, offset: number): void;
     collapseToEnd(): void;
@@ -10536,12 +11374,12 @@ declare var Selection: {
 interface SourceBuffer extends EventTarget {
     appendWindowEnd: number;
     appendWindowStart: number;
-    audioTracks: AudioTrackList;
-    buffered: TimeRanges;
+    readonly audioTracks: AudioTrackList;
+    readonly buffered: TimeRanges;
     mode: string;
     timestampOffset: number;
-    updating: boolean;
-    videoTracks: VideoTrackList;
+    readonly updating: boolean;
+    readonly videoTracks: VideoTrackList;
     abort(): void;
     appendBuffer(data: ArrayBuffer | ArrayBufferView): void;
     appendStream(stream: MSStream, maxSize?: number): void;
@@ -10554,7 +11392,7 @@ declare var SourceBuffer: {
 }
 
 interface SourceBufferList extends EventTarget {
-    length: number;
+    readonly length: number;
     item(index: number): SourceBuffer;
     [index: number]: SourceBuffer;
 }
@@ -10565,7 +11403,7 @@ declare var SourceBufferList: {
 }
 
 interface StereoPannerNode extends AudioNode {
-    pan: AudioParam;
+    readonly pan: AudioParam;
 }
 
 declare var StereoPannerNode: {
@@ -10574,9 +11412,9 @@ declare var StereoPannerNode: {
 }
 
 interface Storage {
-    length: number;
+    readonly length: number;
     clear(): void;
-    getItem(key: string): any;
+    getItem(key: string): string;
     key(index: number): string;
     removeItem(key: string): void;
     setItem(key: string, data: string): void;
@@ -10590,7 +11428,7 @@ declare var Storage: {
 }
 
 interface StorageEvent extends Event {
-    url: string;
+    readonly url: string;
     key?: string;
     oldValue?: string;
     newValue?: string;
@@ -10603,7 +11441,7 @@ declare var StorageEvent: {
 }
 
 interface StyleMedia {
-    type: string;
+    readonly type: string;
     matchMedium(mediaquery: string): boolean;
 }
 
@@ -10614,12 +11452,12 @@ declare var StyleMedia: {
 
 interface StyleSheet {
     disabled: boolean;
-    href: string;
-    media: MediaList;
-    ownerNode: Node;
-    parentStyleSheet: StyleSheet;
-    title: string;
-    type: string;
+    readonly href: string;
+    readonly media: MediaList;
+    readonly ownerNode: Node;
+    readonly parentStyleSheet: StyleSheet;
+    readonly title: string;
+    readonly type: string;
 }
 
 declare var StyleSheet: {
@@ -10628,7 +11466,7 @@ declare var StyleSheet: {
 }
 
 interface StyleSheetList {
-    length: number;
+    readonly length: number;
     item(index?: number): StyleSheet;
     [index: number]: StyleSheet;
 }
@@ -10639,7 +11477,7 @@ declare var StyleSheetList: {
 }
 
 interface StyleSheetPageList {
-    length: number;
+    readonly length: number;
     item(index: number): CSSPageRule;
     [index: number]: CSSPageRule;
 }
@@ -10650,18 +11488,18 @@ declare var StyleSheetPageList: {
 }
 
 interface SubtleCrypto {
-    decrypt(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): any;
-    deriveBits(algorithm: string | Algorithm, baseKey: CryptoKey, length: number): any;
-    deriveKey(algorithm: string | Algorithm, baseKey: CryptoKey, derivedKeyType: string | Algorithm, extractable: boolean, keyUsages: string[]): any;
-    digest(algorithm: string | Algorithm, data: ArrayBufferView): any;
-    encrypt(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): any;
-    exportKey(format: string, key: CryptoKey): any;
-    generateKey(algorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): any;
-    importKey(format: string, keyData: ArrayBufferView, algorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): any;
-    sign(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): any;
-    unwrapKey(format: string, wrappedKey: ArrayBufferView, unwrappingKey: CryptoKey, unwrapAlgorithm: string | Algorithm, unwrappedKeyAlgorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): any;
-    verify(algorithm: string | Algorithm, key: CryptoKey, signature: ArrayBufferView, data: ArrayBufferView): any;
-    wrapKey(format: string, key: CryptoKey, wrappingKey: CryptoKey, wrapAlgorithm: string | Algorithm): any;
+    decrypt(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): PromiseLike<any>;
+    deriveBits(algorithm: string | Algorithm, baseKey: CryptoKey, length: number): PromiseLike<any>;
+    deriveKey(algorithm: string | Algorithm, baseKey: CryptoKey, derivedKeyType: string | Algorithm, extractable: boolean, keyUsages: string[]): PromiseLike<any>;
+    digest(algorithm: string | Algorithm, data: ArrayBufferView): PromiseLike<any>;
+    encrypt(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): PromiseLike<any>;
+    exportKey(format: string, key: CryptoKey): PromiseLike<any>;
+    generateKey(algorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): PromiseLike<any>;
+    importKey(format: string, keyData: ArrayBufferView, algorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): PromiseLike<any>;
+    sign(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): PromiseLike<any>;
+    unwrapKey(format: string, wrappedKey: ArrayBufferView, unwrappingKey: CryptoKey, unwrapAlgorithm: string | Algorithm, unwrappedKeyAlgorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): PromiseLike<any>;
+    verify(algorithm: string | Algorithm, key: CryptoKey, signature: ArrayBufferView, data: ArrayBufferView): PromiseLike<any>;
+    wrapKey(format: string, key: CryptoKey, wrappingKey: CryptoKey, wrapAlgorithm: string | Algorithm): PromiseLike<any>;
 }
 
 declare var SubtleCrypto: {
@@ -10670,8 +11508,7 @@ declare var SubtleCrypto: {
 }
 
 interface Text extends CharacterData {
-    wholeText: string;
-    replaceWholeText(content: string): Text;
+    readonly wholeText: string;
     splitText(offset: number): Text;
 }
 
@@ -10681,39 +11518,39 @@ declare var Text: {
 }
 
 interface TextEvent extends UIEvent {
-    data: string;
-    inputMethod: number;
-    locale: string;
+    readonly data: string;
+    readonly inputMethod: number;
+    readonly locale: string;
     initTextEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, dataArg: string, inputMethod: number, locale: string): void;
-    DOM_INPUT_METHOD_DROP: number;
-    DOM_INPUT_METHOD_HANDWRITING: number;
-    DOM_INPUT_METHOD_IME: number;
-    DOM_INPUT_METHOD_KEYBOARD: number;
-    DOM_INPUT_METHOD_MULTIMODAL: number;
-    DOM_INPUT_METHOD_OPTION: number;
-    DOM_INPUT_METHOD_PASTE: number;
-    DOM_INPUT_METHOD_SCRIPT: number;
-    DOM_INPUT_METHOD_UNKNOWN: number;
-    DOM_INPUT_METHOD_VOICE: number;
+    readonly DOM_INPUT_METHOD_DROP: number;
+    readonly DOM_INPUT_METHOD_HANDWRITING: number;
+    readonly DOM_INPUT_METHOD_IME: number;
+    readonly DOM_INPUT_METHOD_KEYBOARD: number;
+    readonly DOM_INPUT_METHOD_MULTIMODAL: number;
+    readonly DOM_INPUT_METHOD_OPTION: number;
+    readonly DOM_INPUT_METHOD_PASTE: number;
+    readonly DOM_INPUT_METHOD_SCRIPT: number;
+    readonly DOM_INPUT_METHOD_UNKNOWN: number;
+    readonly DOM_INPUT_METHOD_VOICE: number;
 }
 
 declare var TextEvent: {
     prototype: TextEvent;
     new(): TextEvent;
-    DOM_INPUT_METHOD_DROP: number;
-    DOM_INPUT_METHOD_HANDWRITING: number;
-    DOM_INPUT_METHOD_IME: number;
-    DOM_INPUT_METHOD_KEYBOARD: number;
-    DOM_INPUT_METHOD_MULTIMODAL: number;
-    DOM_INPUT_METHOD_OPTION: number;
-    DOM_INPUT_METHOD_PASTE: number;
-    DOM_INPUT_METHOD_SCRIPT: number;
-    DOM_INPUT_METHOD_UNKNOWN: number;
-    DOM_INPUT_METHOD_VOICE: number;
+    readonly DOM_INPUT_METHOD_DROP: number;
+    readonly DOM_INPUT_METHOD_HANDWRITING: number;
+    readonly DOM_INPUT_METHOD_IME: number;
+    readonly DOM_INPUT_METHOD_KEYBOARD: number;
+    readonly DOM_INPUT_METHOD_MULTIMODAL: number;
+    readonly DOM_INPUT_METHOD_OPTION: number;
+    readonly DOM_INPUT_METHOD_PASTE: number;
+    readonly DOM_INPUT_METHOD_SCRIPT: number;
+    readonly DOM_INPUT_METHOD_UNKNOWN: number;
+    readonly DOM_INPUT_METHOD_VOICE: number;
 }
 
 interface TextMetrics {
-    width: number;
+    readonly width: number;
 }
 
 declare var TextMetrics: {
@@ -10721,83 +11558,27 @@ declare var TextMetrics: {
     new(): TextMetrics;
 }
 
-interface TextRange {
-    boundingHeight: number;
-    boundingLeft: number;
-    boundingTop: number;
-    boundingWidth: number;
-    htmlText: string;
-    offsetLeft: number;
-    offsetTop: number;
-    text: string;
-    collapse(start?: boolean): void;
-    compareEndPoints(how: string, sourceRange: TextRange): number;
-    duplicate(): TextRange;
-    execCommand(cmdID: string, showUI?: boolean, value?: any): boolean;
-    execCommandShowHelp(cmdID: string): boolean;
-    expand(Unit: string): boolean;
-    findText(string: string, count?: number, flags?: number): boolean;
-    getBookmark(): string;
-    getBoundingClientRect(): ClientRect;
-    getClientRects(): ClientRectList;
-    inRange(range: TextRange): boolean;
-    isEqual(range: TextRange): boolean;
-    move(unit: string, count?: number): number;
-    moveEnd(unit: string, count?: number): number;
-    moveStart(unit: string, count?: number): number;
-    moveToBookmark(bookmark: string): boolean;
-    moveToElementText(element: Element): void;
-    moveToPoint(x: number, y: number): void;
-    parentElement(): Element;
-    pasteHTML(html: string): void;
-    queryCommandEnabled(cmdID: string): boolean;
-    queryCommandIndeterm(cmdID: string): boolean;
-    queryCommandState(cmdID: string): boolean;
-    queryCommandSupported(cmdID: string): boolean;
-    queryCommandText(cmdID: string): string;
-    queryCommandValue(cmdID: string): any;
-    scrollIntoView(fStart?: boolean): void;
-    select(): void;
-    setEndPoint(how: string, SourceRange: TextRange): void;
-}
-
-declare var TextRange: {
-    prototype: TextRange;
-    new(): TextRange;
-}
-
-interface TextRangeCollection {
-    length: number;
-    item(index: number): TextRange;
-    [index: number]: TextRange;
-}
-
-declare var TextRangeCollection: {
-    prototype: TextRangeCollection;
-    new(): TextRangeCollection;
-}
-
 interface TextTrack extends EventTarget {
-    activeCues: TextTrackCueList;
-    cues: TextTrackCueList;
-    inBandMetadataTrackDispatchType: string;
-    kind: string;
-    label: string;
-    language: string;
+    readonly activeCues: TextTrackCueList;
+    readonly cues: TextTrackCueList;
+    readonly inBandMetadataTrackDispatchType: string;
+    readonly kind: string;
+    readonly label: string;
+    readonly language: string;
     mode: any;
     oncuechange: (ev: Event) => any;
     onerror: (ev: Event) => any;
     onload: (ev: Event) => any;
-    readyState: number;
+    readonly readyState: number;
     addCue(cue: TextTrackCue): void;
     removeCue(cue: TextTrackCue): void;
-    DISABLED: number;
-    ERROR: number;
-    HIDDEN: number;
-    LOADED: number;
-    LOADING: number;
-    NONE: number;
-    SHOWING: number;
+    readonly DISABLED: number;
+    readonly ERROR: number;
+    readonly HIDDEN: number;
+    readonly LOADED: number;
+    readonly LOADING: number;
+    readonly NONE: number;
+    readonly SHOWING: number;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -10807,13 +11588,13 @@ interface TextTrack extends EventTarget {
 declare var TextTrack: {
     prototype: TextTrack;
     new(): TextTrack;
-    DISABLED: number;
-    ERROR: number;
-    HIDDEN: number;
-    LOADED: number;
-    LOADING: number;
-    NONE: number;
-    SHOWING: number;
+    readonly DISABLED: number;
+    readonly ERROR: number;
+    readonly HIDDEN: number;
+    readonly LOADED: number;
+    readonly LOADING: number;
+    readonly NONE: number;
+    readonly SHOWING: number;
 }
 
 interface TextTrackCue extends EventTarget {
@@ -10824,7 +11605,7 @@ interface TextTrackCue extends EventTarget {
     pauseOnExit: boolean;
     startTime: number;
     text: string;
-    track: TextTrack;
+    readonly track: TextTrack;
     getCueAsHTML(): DocumentFragment;
     addEventListener(type: "enter", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "exit", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -10837,7 +11618,7 @@ declare var TextTrackCue: {
 }
 
 interface TextTrackCueList {
-    length: number;
+    readonly length: number;
     getCueById(id: string): TextTrackCue;
     item(index: number): TextTrackCue;
     [index: number]: TextTrackCue;
@@ -10849,7 +11630,7 @@ declare var TextTrackCueList: {
 }
 
 interface TextTrackList extends EventTarget {
-    length: number;
+    readonly length: number;
     onaddtrack: (ev: TrackEvent) => any;
     item(index: number): TextTrack;
     addEventListener(type: "addtrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void;
@@ -10863,7 +11644,7 @@ declare var TextTrackList: {
 }
 
 interface TimeRanges {
-    length: number;
+    readonly length: number;
     end(index: number): number;
     start(index: number): number;
 }
@@ -10874,14 +11655,14 @@ declare var TimeRanges: {
 }
 
 interface Touch {
-    clientX: number;
-    clientY: number;
-    identifier: number;
-    pageX: number;
-    pageY: number;
-    screenX: number;
-    screenY: number;
-    target: EventTarget;
+    readonly clientX: number;
+    readonly clientY: number;
+    readonly identifier: number;
+    readonly pageX: number;
+    readonly pageY: number;
+    readonly screenX: number;
+    readonly screenY: number;
+    readonly target: EventTarget;
 }
 
 declare var Touch: {
@@ -10890,13 +11671,13 @@ declare var Touch: {
 }
 
 interface TouchEvent extends UIEvent {
-    altKey: boolean;
-    changedTouches: TouchList;
-    ctrlKey: boolean;
-    metaKey: boolean;
-    shiftKey: boolean;
-    targetTouches: TouchList;
-    touches: TouchList;
+    readonly altKey: boolean;
+    readonly changedTouches: TouchList;
+    readonly ctrlKey: boolean;
+    readonly metaKey: boolean;
+    readonly shiftKey: boolean;
+    readonly targetTouches: TouchList;
+    readonly touches: TouchList;
 }
 
 declare var TouchEvent: {
@@ -10905,7 +11686,7 @@ declare var TouchEvent: {
 }
 
 interface TouchList {
-    length: number;
+    readonly length: number;
     item(index: number): Touch;
     [index: number]: Touch;
 }
@@ -10916,7 +11697,7 @@ declare var TouchList: {
 }
 
 interface TrackEvent extends Event {
-    track: any;
+    readonly track: any;
 }
 
 declare var TrackEvent: {
@@ -10925,8 +11706,8 @@ declare var TrackEvent: {
 }
 
 interface TransitionEvent extends Event {
-    elapsedTime: number;
-    propertyName: string;
+    readonly elapsedTime: number;
+    readonly propertyName: string;
     initTransitionEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, propertyNameArg: string, elapsedTimeArg: number): void;
 }
 
@@ -10937,10 +11718,10 @@ declare var TransitionEvent: {
 
 interface TreeWalker {
     currentNode: Node;
-    expandEntityReferences: boolean;
-    filter: NodeFilter;
-    root: Node;
-    whatToShow: number;
+    readonly expandEntityReferences: boolean;
+    readonly filter: NodeFilter;
+    readonly root: Node;
+    readonly whatToShow: number;
     firstChild(): Node;
     lastChild(): Node;
     nextNode(): Node;
@@ -10956,8 +11737,8 @@ declare var TreeWalker: {
 }
 
 interface UIEvent extends Event {
-    detail: number;
-    view: Window;
+    readonly detail: number;
+    readonly view: Window;
     initUIEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number): void;
 }
 
@@ -10967,13 +11748,29 @@ declare var UIEvent: {
 }
 
 interface URL {
+    hash: string;
+    host: string;
+    hostname: string;
+    href: string;
+    readonly origin: string;
+    password: string;
+    pathname: string;
+    port: string;
+    protocol: string;
+    search: string;
+    username: string;
+    toString(): string;
+}
+
+declare var URL: {
+    prototype: URL;
+    new(url: string, base?: string): URL;
     createObjectURL(object: any, options?: ObjectURLOptions): string;
     revokeObjectURL(url: string): void;
 }
-declare var URL: URL;
 
 interface UnviewableContentIdentifiedEvent extends NavigationEventWithReferrer {
-    mediaType: string;
+    readonly mediaType: string;
 }
 
 declare var UnviewableContentIdentifiedEvent: {
@@ -10982,16 +11779,16 @@ declare var UnviewableContentIdentifiedEvent: {
 }
 
 interface ValidityState {
-    badInput: boolean;
-    customError: boolean;
-    patternMismatch: boolean;
-    rangeOverflow: boolean;
-    rangeUnderflow: boolean;
-    stepMismatch: boolean;
-    tooLong: boolean;
-    typeMismatch: boolean;
-    valid: boolean;
-    valueMissing: boolean;
+    readonly badInput: boolean;
+    readonly customError: boolean;
+    readonly patternMismatch: boolean;
+    readonly rangeOverflow: boolean;
+    readonly rangeUnderflow: boolean;
+    readonly stepMismatch: boolean;
+    readonly tooLong: boolean;
+    readonly typeMismatch: boolean;
+    readonly valid: boolean;
+    readonly valueMissing: boolean;
 }
 
 declare var ValidityState: {
@@ -11000,11 +11797,11 @@ declare var ValidityState: {
 }
 
 interface VideoPlaybackQuality {
-    corruptedVideoFrames: number;
-    creationTime: number;
-    droppedVideoFrames: number;
-    totalFrameDelay: number;
-    totalVideoFrames: number;
+    readonly corruptedVideoFrames: number;
+    readonly creationTime: number;
+    readonly droppedVideoFrames: number;
+    readonly totalFrameDelay: number;
+    readonly totalVideoFrames: number;
 }
 
 declare var VideoPlaybackQuality: {
@@ -11013,12 +11810,12 @@ declare var VideoPlaybackQuality: {
 }
 
 interface VideoTrack {
-    id: string;
+    readonly id: string;
     kind: string;
-    label: string;
+    readonly label: string;
     language: string;
     selected: boolean;
-    sourceBuffer: SourceBuffer;
+    readonly sourceBuffer: SourceBuffer;
 }
 
 declare var VideoTrack: {
@@ -11027,11 +11824,11 @@ declare var VideoTrack: {
 }
 
 interface VideoTrackList extends EventTarget {
-    length: number;
+    readonly length: number;
     onaddtrack: (ev: TrackEvent) => any;
     onchange: (ev: Event) => any;
     onremovetrack: (ev: TrackEvent) => any;
-    selectedIndex: number;
+    readonly selectedIndex: number;
     getTrackById(id: string): VideoTrack;
     item(index: number): VideoTrack;
     addEventListener(type: "addtrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void;
@@ -11047,41 +11844,41 @@ declare var VideoTrackList: {
 }
 
 interface WEBGL_compressed_texture_s3tc {
-    COMPRESSED_RGBA_S3TC_DXT1_EXT: number;
-    COMPRESSED_RGBA_S3TC_DXT3_EXT: number;
-    COMPRESSED_RGBA_S3TC_DXT5_EXT: number;
-    COMPRESSED_RGB_S3TC_DXT1_EXT: number;
+    readonly COMPRESSED_RGBA_S3TC_DXT1_EXT: number;
+    readonly COMPRESSED_RGBA_S3TC_DXT3_EXT: number;
+    readonly COMPRESSED_RGBA_S3TC_DXT5_EXT: number;
+    readonly COMPRESSED_RGB_S3TC_DXT1_EXT: number;
 }
 
 declare var WEBGL_compressed_texture_s3tc: {
     prototype: WEBGL_compressed_texture_s3tc;
     new(): WEBGL_compressed_texture_s3tc;
-    COMPRESSED_RGBA_S3TC_DXT1_EXT: number;
-    COMPRESSED_RGBA_S3TC_DXT3_EXT: number;
-    COMPRESSED_RGBA_S3TC_DXT5_EXT: number;
-    COMPRESSED_RGB_S3TC_DXT1_EXT: number;
+    readonly COMPRESSED_RGBA_S3TC_DXT1_EXT: number;
+    readonly COMPRESSED_RGBA_S3TC_DXT3_EXT: number;
+    readonly COMPRESSED_RGBA_S3TC_DXT5_EXT: number;
+    readonly COMPRESSED_RGB_S3TC_DXT1_EXT: number;
 }
 
 interface WEBGL_debug_renderer_info {
-    UNMASKED_RENDERER_WEBGL: number;
-    UNMASKED_VENDOR_WEBGL: number;
+    readonly UNMASKED_RENDERER_WEBGL: number;
+    readonly UNMASKED_VENDOR_WEBGL: number;
 }
 
 declare var WEBGL_debug_renderer_info: {
     prototype: WEBGL_debug_renderer_info;
     new(): WEBGL_debug_renderer_info;
-    UNMASKED_RENDERER_WEBGL: number;
-    UNMASKED_VENDOR_WEBGL: number;
+    readonly UNMASKED_RENDERER_WEBGL: number;
+    readonly UNMASKED_VENDOR_WEBGL: number;
 }
 
 interface WEBGL_depth_texture {
-    UNSIGNED_INT_24_8_WEBGL: number;
+    readonly UNSIGNED_INT_24_8_WEBGL: number;
 }
 
 declare var WEBGL_depth_texture: {
     prototype: WEBGL_depth_texture;
     new(): WEBGL_depth_texture;
-    UNSIGNED_INT_24_8_WEBGL: number;
+    readonly UNSIGNED_INT_24_8_WEBGL: number;
 }
 
 interface WaveShaperNode extends AudioNode {
@@ -11095,9 +11892,9 @@ declare var WaveShaperNode: {
 }
 
 interface WebGLActiveInfo {
-    name: string;
-    size: number;
-    type: number;
+    readonly name: string;
+    readonly size: number;
+    readonly type: number;
 }
 
 declare var WebGLActiveInfo: {
@@ -11114,12 +11911,12 @@ declare var WebGLBuffer: {
 }
 
 interface WebGLContextEvent extends Event {
-    statusMessage: string;
+    readonly statusMessage: string;
 }
 
 declare var WebGLContextEvent: {
     prototype: WebGLContextEvent;
-    new(): WebGLContextEvent;
+    new(type: string, eventInitDict?: WebGLContextEventInit): WebGLContextEvent;
 }
 
 interface WebGLFramebuffer extends WebGLObject {
@@ -11155,9 +11952,9 @@ declare var WebGLRenderbuffer: {
 }
 
 interface WebGLRenderingContext {
-    canvas: HTMLCanvasElement;
-    drawingBufferHeight: number;
-    drawingBufferWidth: number;
+    readonly canvas: HTMLCanvasElement;
+    readonly drawingBufferHeight: number;
+    readonly drawingBufferWidth: number;
     activeTexture(texture: number): void;
     attachShader(program: WebGLProgram, shader: WebGLShader): void;
     bindAttribLocation(program: WebGLProgram, index: number, name: string): void;
@@ -11272,635 +12069,635 @@ interface WebGLRenderingContext {
     texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, video: HTMLVideoElement): void;
     texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, pixels: ImageData): void;
     uniform1f(location: WebGLUniformLocation, x: number): void;
-    uniform1fv(location: WebGLUniformLocation, v: Float32Array): void;
+    uniform1fv(location: WebGLUniformLocation, v: Float32Array | number[]): void;
     uniform1i(location: WebGLUniformLocation, x: number): void;
-    uniform1iv(location: WebGLUniformLocation, v: Int32Array): void;
+    uniform1iv(location: WebGLUniformLocation, v: Int32Array | number[]): void;
     uniform2f(location: WebGLUniformLocation, x: number, y: number): void;
-    uniform2fv(location: WebGLUniformLocation, v: Float32Array): void;
+    uniform2fv(location: WebGLUniformLocation, v: Float32Array | number[]): void;
     uniform2i(location: WebGLUniformLocation, x: number, y: number): void;
-    uniform2iv(location: WebGLUniformLocation, v: Int32Array): void;
+    uniform2iv(location: WebGLUniformLocation, v: Int32Array | number[]): void;
     uniform3f(location: WebGLUniformLocation, x: number, y: number, z: number): void;
-    uniform3fv(location: WebGLUniformLocation, v: Float32Array): void;
+    uniform3fv(location: WebGLUniformLocation, v: Float32Array | number[]): void;
     uniform3i(location: WebGLUniformLocation, x: number, y: number, z: number): void;
-    uniform3iv(location: WebGLUniformLocation, v: Int32Array): void;
+    uniform3iv(location: WebGLUniformLocation, v: Int32Array | number[]): void;
     uniform4f(location: WebGLUniformLocation, x: number, y: number, z: number, w: number): void;
-    uniform4fv(location: WebGLUniformLocation, v: Float32Array): void;
+    uniform4fv(location: WebGLUniformLocation, v: Float32Array | number[]): void;
     uniform4i(location: WebGLUniformLocation, x: number, y: number, z: number, w: number): void;
-    uniform4iv(location: WebGLUniformLocation, v: Int32Array): void;
-    uniformMatrix2fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array): void;
-    uniformMatrix3fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array): void;
-    uniformMatrix4fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array): void;
+    uniform4iv(location: WebGLUniformLocation, v: Int32Array | number[]): void;
+    uniformMatrix2fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | number[]): void;
+    uniformMatrix3fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | number[]): void;
+    uniformMatrix4fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | number[]): void;
     useProgram(program: WebGLProgram): void;
     validateProgram(program: WebGLProgram): void;
     vertexAttrib1f(indx: number, x: number): void;
-    vertexAttrib1fv(indx: number, values: Float32Array): void;
+    vertexAttrib1fv(indx: number, values: Float32Array | number[]): void;
     vertexAttrib2f(indx: number, x: number, y: number): void;
-    vertexAttrib2fv(indx: number, values: Float32Array): void;
+    vertexAttrib2fv(indx: number, values: Float32Array | number[]): void;
     vertexAttrib3f(indx: number, x: number, y: number, z: number): void;
-    vertexAttrib3fv(indx: number, values: Float32Array): void;
+    vertexAttrib3fv(indx: number, values: Float32Array | number[]): void;
     vertexAttrib4f(indx: number, x: number, y: number, z: number, w: number): void;
-    vertexAttrib4fv(indx: number, values: Float32Array): void;
+    vertexAttrib4fv(indx: number, values: Float32Array | number[]): void;
     vertexAttribPointer(indx: number, size: number, type: number, normalized: boolean, stride: number, offset: number): void;
     viewport(x: number, y: number, width: number, height: number): void;
-    ACTIVE_ATTRIBUTES: number;
-    ACTIVE_TEXTURE: number;
-    ACTIVE_UNIFORMS: number;
-    ALIASED_LINE_WIDTH_RANGE: number;
-    ALIASED_POINT_SIZE_RANGE: number;
-    ALPHA: number;
-    ALPHA_BITS: number;
-    ALWAYS: number;
-    ARRAY_BUFFER: number;
-    ARRAY_BUFFER_BINDING: number;
-    ATTACHED_SHADERS: number;
-    BACK: number;
-    BLEND: number;
-    BLEND_COLOR: number;
-    BLEND_DST_ALPHA: number;
-    BLEND_DST_RGB: number;
-    BLEND_EQUATION: number;
-    BLEND_EQUATION_ALPHA: number;
-    BLEND_EQUATION_RGB: number;
-    BLEND_SRC_ALPHA: number;
-    BLEND_SRC_RGB: number;
-    BLUE_BITS: number;
-    BOOL: number;
-    BOOL_VEC2: number;
-    BOOL_VEC3: number;
-    BOOL_VEC4: number;
-    BROWSER_DEFAULT_WEBGL: number;
-    BUFFER_SIZE: number;
-    BUFFER_USAGE: number;
-    BYTE: number;
-    CCW: number;
-    CLAMP_TO_EDGE: number;
-    COLOR_ATTACHMENT0: number;
-    COLOR_BUFFER_BIT: number;
-    COLOR_CLEAR_VALUE: number;
-    COLOR_WRITEMASK: number;
-    COMPILE_STATUS: number;
-    COMPRESSED_TEXTURE_FORMATS: number;
-    CONSTANT_ALPHA: number;
-    CONSTANT_COLOR: number;
-    CONTEXT_LOST_WEBGL: number;
-    CULL_FACE: number;
-    CULL_FACE_MODE: number;
-    CURRENT_PROGRAM: number;
-    CURRENT_VERTEX_ATTRIB: number;
-    CW: number;
-    DECR: number;
-    DECR_WRAP: number;
-    DELETE_STATUS: number;
-    DEPTH_ATTACHMENT: number;
-    DEPTH_BITS: number;
-    DEPTH_BUFFER_BIT: number;
-    DEPTH_CLEAR_VALUE: number;
-    DEPTH_COMPONENT: number;
-    DEPTH_COMPONENT16: number;
-    DEPTH_FUNC: number;
-    DEPTH_RANGE: number;
-    DEPTH_STENCIL: number;
-    DEPTH_STENCIL_ATTACHMENT: number;
-    DEPTH_TEST: number;
-    DEPTH_WRITEMASK: number;
-    DITHER: number;
-    DONT_CARE: number;
-    DST_ALPHA: number;
-    DST_COLOR: number;
-    DYNAMIC_DRAW: number;
-    ELEMENT_ARRAY_BUFFER: number;
-    ELEMENT_ARRAY_BUFFER_BINDING: number;
-    EQUAL: number;
-    FASTEST: number;
-    FLOAT: number;
-    FLOAT_MAT2: number;
-    FLOAT_MAT3: number;
-    FLOAT_MAT4: number;
-    FLOAT_VEC2: number;
-    FLOAT_VEC3: number;
-    FLOAT_VEC4: number;
-    FRAGMENT_SHADER: number;
-    FRAMEBUFFER: number;
-    FRAMEBUFFER_ATTACHMENT_OBJECT_NAME: number;
-    FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE: number;
-    FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE: number;
-    FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL: number;
-    FRAMEBUFFER_BINDING: number;
-    FRAMEBUFFER_COMPLETE: number;
-    FRAMEBUFFER_INCOMPLETE_ATTACHMENT: number;
-    FRAMEBUFFER_INCOMPLETE_DIMENSIONS: number;
-    FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: number;
-    FRAMEBUFFER_UNSUPPORTED: number;
-    FRONT: number;
-    FRONT_AND_BACK: number;
-    FRONT_FACE: number;
-    FUNC_ADD: number;
-    FUNC_REVERSE_SUBTRACT: number;
-    FUNC_SUBTRACT: number;
-    GENERATE_MIPMAP_HINT: number;
-    GEQUAL: number;
-    GREATER: number;
-    GREEN_BITS: number;
-    HIGH_FLOAT: number;
-    HIGH_INT: number;
-    IMPLEMENTATION_COLOR_READ_FORMAT: number;
-    IMPLEMENTATION_COLOR_READ_TYPE: number;
-    INCR: number;
-    INCR_WRAP: number;
-    INT: number;
-    INT_VEC2: number;
-    INT_VEC3: number;
-    INT_VEC4: number;
-    INVALID_ENUM: number;
-    INVALID_FRAMEBUFFER_OPERATION: number;
-    INVALID_OPERATION: number;
-    INVALID_VALUE: number;
-    INVERT: number;
-    KEEP: number;
-    LEQUAL: number;
-    LESS: number;
-    LINEAR: number;
-    LINEAR_MIPMAP_LINEAR: number;
-    LINEAR_MIPMAP_NEAREST: number;
-    LINES: number;
-    LINE_LOOP: number;
-    LINE_STRIP: number;
-    LINE_WIDTH: number;
-    LINK_STATUS: number;
-    LOW_FLOAT: number;
-    LOW_INT: number;
-    LUMINANCE: number;
-    LUMINANCE_ALPHA: number;
-    MAX_COMBINED_TEXTURE_IMAGE_UNITS: number;
-    MAX_CUBE_MAP_TEXTURE_SIZE: number;
-    MAX_FRAGMENT_UNIFORM_VECTORS: number;
-    MAX_RENDERBUFFER_SIZE: number;
-    MAX_TEXTURE_IMAGE_UNITS: number;
-    MAX_TEXTURE_SIZE: number;
-    MAX_VARYING_VECTORS: number;
-    MAX_VERTEX_ATTRIBS: number;
-    MAX_VERTEX_TEXTURE_IMAGE_UNITS: number;
-    MAX_VERTEX_UNIFORM_VECTORS: number;
-    MAX_VIEWPORT_DIMS: number;
-    MEDIUM_FLOAT: number;
-    MEDIUM_INT: number;
-    MIRRORED_REPEAT: number;
-    NEAREST: number;
-    NEAREST_MIPMAP_LINEAR: number;
-    NEAREST_MIPMAP_NEAREST: number;
-    NEVER: number;
-    NICEST: number;
-    NONE: number;
-    NOTEQUAL: number;
-    NO_ERROR: number;
-    ONE: number;
-    ONE_MINUS_CONSTANT_ALPHA: number;
-    ONE_MINUS_CONSTANT_COLOR: number;
-    ONE_MINUS_DST_ALPHA: number;
-    ONE_MINUS_DST_COLOR: number;
-    ONE_MINUS_SRC_ALPHA: number;
-    ONE_MINUS_SRC_COLOR: number;
-    OUT_OF_MEMORY: number;
-    PACK_ALIGNMENT: number;
-    POINTS: number;
-    POLYGON_OFFSET_FACTOR: number;
-    POLYGON_OFFSET_FILL: number;
-    POLYGON_OFFSET_UNITS: number;
-    RED_BITS: number;
-    RENDERBUFFER: number;
-    RENDERBUFFER_ALPHA_SIZE: number;
-    RENDERBUFFER_BINDING: number;
-    RENDERBUFFER_BLUE_SIZE: number;
-    RENDERBUFFER_DEPTH_SIZE: number;
-    RENDERBUFFER_GREEN_SIZE: number;
-    RENDERBUFFER_HEIGHT: number;
-    RENDERBUFFER_INTERNAL_FORMAT: number;
-    RENDERBUFFER_RED_SIZE: number;
-    RENDERBUFFER_STENCIL_SIZE: number;
-    RENDERBUFFER_WIDTH: number;
-    RENDERER: number;
-    REPEAT: number;
-    REPLACE: number;
-    RGB: number;
-    RGB565: number;
-    RGB5_A1: number;
-    RGBA: number;
-    RGBA4: number;
-    SAMPLER_2D: number;
-    SAMPLER_CUBE: number;
-    SAMPLES: number;
-    SAMPLE_ALPHA_TO_COVERAGE: number;
-    SAMPLE_BUFFERS: number;
-    SAMPLE_COVERAGE: number;
-    SAMPLE_COVERAGE_INVERT: number;
-    SAMPLE_COVERAGE_VALUE: number;
-    SCISSOR_BOX: number;
-    SCISSOR_TEST: number;
-    SHADER_TYPE: number;
-    SHADING_LANGUAGE_VERSION: number;
-    SHORT: number;
-    SRC_ALPHA: number;
-    SRC_ALPHA_SATURATE: number;
-    SRC_COLOR: number;
-    STATIC_DRAW: number;
-    STENCIL_ATTACHMENT: number;
-    STENCIL_BACK_FAIL: number;
-    STENCIL_BACK_FUNC: number;
-    STENCIL_BACK_PASS_DEPTH_FAIL: number;
-    STENCIL_BACK_PASS_DEPTH_PASS: number;
-    STENCIL_BACK_REF: number;
-    STENCIL_BACK_VALUE_MASK: number;
-    STENCIL_BACK_WRITEMASK: number;
-    STENCIL_BITS: number;
-    STENCIL_BUFFER_BIT: number;
-    STENCIL_CLEAR_VALUE: number;
-    STENCIL_FAIL: number;
-    STENCIL_FUNC: number;
-    STENCIL_INDEX: number;
-    STENCIL_INDEX8: number;
-    STENCIL_PASS_DEPTH_FAIL: number;
-    STENCIL_PASS_DEPTH_PASS: number;
-    STENCIL_REF: number;
-    STENCIL_TEST: number;
-    STENCIL_VALUE_MASK: number;
-    STENCIL_WRITEMASK: number;
-    STREAM_DRAW: number;
-    SUBPIXEL_BITS: number;
-    TEXTURE: number;
-    TEXTURE0: number;
-    TEXTURE1: number;
-    TEXTURE10: number;
-    TEXTURE11: number;
-    TEXTURE12: number;
-    TEXTURE13: number;
-    TEXTURE14: number;
-    TEXTURE15: number;
-    TEXTURE16: number;
-    TEXTURE17: number;
-    TEXTURE18: number;
-    TEXTURE19: number;
-    TEXTURE2: number;
-    TEXTURE20: number;
-    TEXTURE21: number;
-    TEXTURE22: number;
-    TEXTURE23: number;
-    TEXTURE24: number;
-    TEXTURE25: number;
-    TEXTURE26: number;
-    TEXTURE27: number;
-    TEXTURE28: number;
-    TEXTURE29: number;
-    TEXTURE3: number;
-    TEXTURE30: number;
-    TEXTURE31: number;
-    TEXTURE4: number;
-    TEXTURE5: number;
-    TEXTURE6: number;
-    TEXTURE7: number;
-    TEXTURE8: number;
-    TEXTURE9: number;
-    TEXTURE_2D: number;
-    TEXTURE_BINDING_2D: number;
-    TEXTURE_BINDING_CUBE_MAP: number;
-    TEXTURE_CUBE_MAP: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_X: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_Y: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_Z: number;
-    TEXTURE_CUBE_MAP_POSITIVE_X: number;
-    TEXTURE_CUBE_MAP_POSITIVE_Y: number;
-    TEXTURE_CUBE_MAP_POSITIVE_Z: number;
-    TEXTURE_MAG_FILTER: number;
-    TEXTURE_MIN_FILTER: number;
-    TEXTURE_WRAP_S: number;
-    TEXTURE_WRAP_T: number;
-    TRIANGLES: number;
-    TRIANGLE_FAN: number;
-    TRIANGLE_STRIP: number;
-    UNPACK_ALIGNMENT: number;
-    UNPACK_COLORSPACE_CONVERSION_WEBGL: number;
-    UNPACK_FLIP_Y_WEBGL: number;
-    UNPACK_PREMULTIPLY_ALPHA_WEBGL: number;
-    UNSIGNED_BYTE: number;
-    UNSIGNED_INT: number;
-    UNSIGNED_SHORT: number;
-    UNSIGNED_SHORT_4_4_4_4: number;
-    UNSIGNED_SHORT_5_5_5_1: number;
-    UNSIGNED_SHORT_5_6_5: number;
-    VALIDATE_STATUS: number;
-    VENDOR: number;
-    VERSION: number;
-    VERTEX_ATTRIB_ARRAY_BUFFER_BINDING: number;
-    VERTEX_ATTRIB_ARRAY_ENABLED: number;
-    VERTEX_ATTRIB_ARRAY_NORMALIZED: number;
-    VERTEX_ATTRIB_ARRAY_POINTER: number;
-    VERTEX_ATTRIB_ARRAY_SIZE: number;
-    VERTEX_ATTRIB_ARRAY_STRIDE: number;
-    VERTEX_ATTRIB_ARRAY_TYPE: number;
-    VERTEX_SHADER: number;
-    VIEWPORT: number;
-    ZERO: number;
+    readonly ACTIVE_ATTRIBUTES: number;
+    readonly ACTIVE_TEXTURE: number;
+    readonly ACTIVE_UNIFORMS: number;
+    readonly ALIASED_LINE_WIDTH_RANGE: number;
+    readonly ALIASED_POINT_SIZE_RANGE: number;
+    readonly ALPHA: number;
+    readonly ALPHA_BITS: number;
+    readonly ALWAYS: number;
+    readonly ARRAY_BUFFER: number;
+    readonly ARRAY_BUFFER_BINDING: number;
+    readonly ATTACHED_SHADERS: number;
+    readonly BACK: number;
+    readonly BLEND: number;
+    readonly BLEND_COLOR: number;
+    readonly BLEND_DST_ALPHA: number;
+    readonly BLEND_DST_RGB: number;
+    readonly BLEND_EQUATION: number;
+    readonly BLEND_EQUATION_ALPHA: number;
+    readonly BLEND_EQUATION_RGB: number;
+    readonly BLEND_SRC_ALPHA: number;
+    readonly BLEND_SRC_RGB: number;
+    readonly BLUE_BITS: number;
+    readonly BOOL: number;
+    readonly BOOL_VEC2: number;
+    readonly BOOL_VEC3: number;
+    readonly BOOL_VEC4: number;
+    readonly BROWSER_DEFAULT_WEBGL: number;
+    readonly BUFFER_SIZE: number;
+    readonly BUFFER_USAGE: number;
+    readonly BYTE: number;
+    readonly CCW: number;
+    readonly CLAMP_TO_EDGE: number;
+    readonly COLOR_ATTACHMENT0: number;
+    readonly COLOR_BUFFER_BIT: number;
+    readonly COLOR_CLEAR_VALUE: number;
+    readonly COLOR_WRITEMASK: number;
+    readonly COMPILE_STATUS: number;
+    readonly COMPRESSED_TEXTURE_FORMATS: number;
+    readonly CONSTANT_ALPHA: number;
+    readonly CONSTANT_COLOR: number;
+    readonly CONTEXT_LOST_WEBGL: number;
+    readonly CULL_FACE: number;
+    readonly CULL_FACE_MODE: number;
+    readonly CURRENT_PROGRAM: number;
+    readonly CURRENT_VERTEX_ATTRIB: number;
+    readonly CW: number;
+    readonly DECR: number;
+    readonly DECR_WRAP: number;
+    readonly DELETE_STATUS: number;
+    readonly DEPTH_ATTACHMENT: number;
+    readonly DEPTH_BITS: number;
+    readonly DEPTH_BUFFER_BIT: number;
+    readonly DEPTH_CLEAR_VALUE: number;
+    readonly DEPTH_COMPONENT: number;
+    readonly DEPTH_COMPONENT16: number;
+    readonly DEPTH_FUNC: number;
+    readonly DEPTH_RANGE: number;
+    readonly DEPTH_STENCIL: number;
+    readonly DEPTH_STENCIL_ATTACHMENT: number;
+    readonly DEPTH_TEST: number;
+    readonly DEPTH_WRITEMASK: number;
+    readonly DITHER: number;
+    readonly DONT_CARE: number;
+    readonly DST_ALPHA: number;
+    readonly DST_COLOR: number;
+    readonly DYNAMIC_DRAW: number;
+    readonly ELEMENT_ARRAY_BUFFER: number;
+    readonly ELEMENT_ARRAY_BUFFER_BINDING: number;
+    readonly EQUAL: number;
+    readonly FASTEST: number;
+    readonly FLOAT: number;
+    readonly FLOAT_MAT2: number;
+    readonly FLOAT_MAT3: number;
+    readonly FLOAT_MAT4: number;
+    readonly FLOAT_VEC2: number;
+    readonly FLOAT_VEC3: number;
+    readonly FLOAT_VEC4: number;
+    readonly FRAGMENT_SHADER: number;
+    readonly FRAMEBUFFER: number;
+    readonly FRAMEBUFFER_ATTACHMENT_OBJECT_NAME: number;
+    readonly FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE: number;
+    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE: number;
+    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL: number;
+    readonly FRAMEBUFFER_BINDING: number;
+    readonly FRAMEBUFFER_COMPLETE: number;
+    readonly FRAMEBUFFER_INCOMPLETE_ATTACHMENT: number;
+    readonly FRAMEBUFFER_INCOMPLETE_DIMENSIONS: number;
+    readonly FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: number;
+    readonly FRAMEBUFFER_UNSUPPORTED: number;
+    readonly FRONT: number;
+    readonly FRONT_AND_BACK: number;
+    readonly FRONT_FACE: number;
+    readonly FUNC_ADD: number;
+    readonly FUNC_REVERSE_SUBTRACT: number;
+    readonly FUNC_SUBTRACT: number;
+    readonly GENERATE_MIPMAP_HINT: number;
+    readonly GEQUAL: number;
+    readonly GREATER: number;
+    readonly GREEN_BITS: number;
+    readonly HIGH_FLOAT: number;
+    readonly HIGH_INT: number;
+    readonly IMPLEMENTATION_COLOR_READ_FORMAT: number;
+    readonly IMPLEMENTATION_COLOR_READ_TYPE: number;
+    readonly INCR: number;
+    readonly INCR_WRAP: number;
+    readonly INT: number;
+    readonly INT_VEC2: number;
+    readonly INT_VEC3: number;
+    readonly INT_VEC4: number;
+    readonly INVALID_ENUM: number;
+    readonly INVALID_FRAMEBUFFER_OPERATION: number;
+    readonly INVALID_OPERATION: number;
+    readonly INVALID_VALUE: number;
+    readonly INVERT: number;
+    readonly KEEP: number;
+    readonly LEQUAL: number;
+    readonly LESS: number;
+    readonly LINEAR: number;
+    readonly LINEAR_MIPMAP_LINEAR: number;
+    readonly LINEAR_MIPMAP_NEAREST: number;
+    readonly LINES: number;
+    readonly LINE_LOOP: number;
+    readonly LINE_STRIP: number;
+    readonly LINE_WIDTH: number;
+    readonly LINK_STATUS: number;
+    readonly LOW_FLOAT: number;
+    readonly LOW_INT: number;
+    readonly LUMINANCE: number;
+    readonly LUMINANCE_ALPHA: number;
+    readonly MAX_COMBINED_TEXTURE_IMAGE_UNITS: number;
+    readonly MAX_CUBE_MAP_TEXTURE_SIZE: number;
+    readonly MAX_FRAGMENT_UNIFORM_VECTORS: number;
+    readonly MAX_RENDERBUFFER_SIZE: number;
+    readonly MAX_TEXTURE_IMAGE_UNITS: number;
+    readonly MAX_TEXTURE_SIZE: number;
+    readonly MAX_VARYING_VECTORS: number;
+    readonly MAX_VERTEX_ATTRIBS: number;
+    readonly MAX_VERTEX_TEXTURE_IMAGE_UNITS: number;
+    readonly MAX_VERTEX_UNIFORM_VECTORS: number;
+    readonly MAX_VIEWPORT_DIMS: number;
+    readonly MEDIUM_FLOAT: number;
+    readonly MEDIUM_INT: number;
+    readonly MIRRORED_REPEAT: number;
+    readonly NEAREST: number;
+    readonly NEAREST_MIPMAP_LINEAR: number;
+    readonly NEAREST_MIPMAP_NEAREST: number;
+    readonly NEVER: number;
+    readonly NICEST: number;
+    readonly NONE: number;
+    readonly NOTEQUAL: number;
+    readonly NO_ERROR: number;
+    readonly ONE: number;
+    readonly ONE_MINUS_CONSTANT_ALPHA: number;
+    readonly ONE_MINUS_CONSTANT_COLOR: number;
+    readonly ONE_MINUS_DST_ALPHA: number;
+    readonly ONE_MINUS_DST_COLOR: number;
+    readonly ONE_MINUS_SRC_ALPHA: number;
+    readonly ONE_MINUS_SRC_COLOR: number;
+    readonly OUT_OF_MEMORY: number;
+    readonly PACK_ALIGNMENT: number;
+    readonly POINTS: number;
+    readonly POLYGON_OFFSET_FACTOR: number;
+    readonly POLYGON_OFFSET_FILL: number;
+    readonly POLYGON_OFFSET_UNITS: number;
+    readonly RED_BITS: number;
+    readonly RENDERBUFFER: number;
+    readonly RENDERBUFFER_ALPHA_SIZE: number;
+    readonly RENDERBUFFER_BINDING: number;
+    readonly RENDERBUFFER_BLUE_SIZE: number;
+    readonly RENDERBUFFER_DEPTH_SIZE: number;
+    readonly RENDERBUFFER_GREEN_SIZE: number;
+    readonly RENDERBUFFER_HEIGHT: number;
+    readonly RENDERBUFFER_INTERNAL_FORMAT: number;
+    readonly RENDERBUFFER_RED_SIZE: number;
+    readonly RENDERBUFFER_STENCIL_SIZE: number;
+    readonly RENDERBUFFER_WIDTH: number;
+    readonly RENDERER: number;
+    readonly REPEAT: number;
+    readonly REPLACE: number;
+    readonly RGB: number;
+    readonly RGB565: number;
+    readonly RGB5_A1: number;
+    readonly RGBA: number;
+    readonly RGBA4: number;
+    readonly SAMPLER_2D: number;
+    readonly SAMPLER_CUBE: number;
+    readonly SAMPLES: number;
+    readonly SAMPLE_ALPHA_TO_COVERAGE: number;
+    readonly SAMPLE_BUFFERS: number;
+    readonly SAMPLE_COVERAGE: number;
+    readonly SAMPLE_COVERAGE_INVERT: number;
+    readonly SAMPLE_COVERAGE_VALUE: number;
+    readonly SCISSOR_BOX: number;
+    readonly SCISSOR_TEST: number;
+    readonly SHADER_TYPE: number;
+    readonly SHADING_LANGUAGE_VERSION: number;
+    readonly SHORT: number;
+    readonly SRC_ALPHA: number;
+    readonly SRC_ALPHA_SATURATE: number;
+    readonly SRC_COLOR: number;
+    readonly STATIC_DRAW: number;
+    readonly STENCIL_ATTACHMENT: number;
+    readonly STENCIL_BACK_FAIL: number;
+    readonly STENCIL_BACK_FUNC: number;
+    readonly STENCIL_BACK_PASS_DEPTH_FAIL: number;
+    readonly STENCIL_BACK_PASS_DEPTH_PASS: number;
+    readonly STENCIL_BACK_REF: number;
+    readonly STENCIL_BACK_VALUE_MASK: number;
+    readonly STENCIL_BACK_WRITEMASK: number;
+    readonly STENCIL_BITS: number;
+    readonly STENCIL_BUFFER_BIT: number;
+    readonly STENCIL_CLEAR_VALUE: number;
+    readonly STENCIL_FAIL: number;
+    readonly STENCIL_FUNC: number;
+    readonly STENCIL_INDEX: number;
+    readonly STENCIL_INDEX8: number;
+    readonly STENCIL_PASS_DEPTH_FAIL: number;
+    readonly STENCIL_PASS_DEPTH_PASS: number;
+    readonly STENCIL_REF: number;
+    readonly STENCIL_TEST: number;
+    readonly STENCIL_VALUE_MASK: number;
+    readonly STENCIL_WRITEMASK: number;
+    readonly STREAM_DRAW: number;
+    readonly SUBPIXEL_BITS: number;
+    readonly TEXTURE: number;
+    readonly TEXTURE0: number;
+    readonly TEXTURE1: number;
+    readonly TEXTURE10: number;
+    readonly TEXTURE11: number;
+    readonly TEXTURE12: number;
+    readonly TEXTURE13: number;
+    readonly TEXTURE14: number;
+    readonly TEXTURE15: number;
+    readonly TEXTURE16: number;
+    readonly TEXTURE17: number;
+    readonly TEXTURE18: number;
+    readonly TEXTURE19: number;
+    readonly TEXTURE2: number;
+    readonly TEXTURE20: number;
+    readonly TEXTURE21: number;
+    readonly TEXTURE22: number;
+    readonly TEXTURE23: number;
+    readonly TEXTURE24: number;
+    readonly TEXTURE25: number;
+    readonly TEXTURE26: number;
+    readonly TEXTURE27: number;
+    readonly TEXTURE28: number;
+    readonly TEXTURE29: number;
+    readonly TEXTURE3: number;
+    readonly TEXTURE30: number;
+    readonly TEXTURE31: number;
+    readonly TEXTURE4: number;
+    readonly TEXTURE5: number;
+    readonly TEXTURE6: number;
+    readonly TEXTURE7: number;
+    readonly TEXTURE8: number;
+    readonly TEXTURE9: number;
+    readonly TEXTURE_2D: number;
+    readonly TEXTURE_BINDING_2D: number;
+    readonly TEXTURE_BINDING_CUBE_MAP: number;
+    readonly TEXTURE_CUBE_MAP: number;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_X: number;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_Y: number;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_Z: number;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_X: number;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_Y: number;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_Z: number;
+    readonly TEXTURE_MAG_FILTER: number;
+    readonly TEXTURE_MIN_FILTER: number;
+    readonly TEXTURE_WRAP_S: number;
+    readonly TEXTURE_WRAP_T: number;
+    readonly TRIANGLES: number;
+    readonly TRIANGLE_FAN: number;
+    readonly TRIANGLE_STRIP: number;
+    readonly UNPACK_ALIGNMENT: number;
+    readonly UNPACK_COLORSPACE_CONVERSION_WEBGL: number;
+    readonly UNPACK_FLIP_Y_WEBGL: number;
+    readonly UNPACK_PREMULTIPLY_ALPHA_WEBGL: number;
+    readonly UNSIGNED_BYTE: number;
+    readonly UNSIGNED_INT: number;
+    readonly UNSIGNED_SHORT: number;
+    readonly UNSIGNED_SHORT_4_4_4_4: number;
+    readonly UNSIGNED_SHORT_5_5_5_1: number;
+    readonly UNSIGNED_SHORT_5_6_5: number;
+    readonly VALIDATE_STATUS: number;
+    readonly VENDOR: number;
+    readonly VERSION: number;
+    readonly VERTEX_ATTRIB_ARRAY_BUFFER_BINDING: number;
+    readonly VERTEX_ATTRIB_ARRAY_ENABLED: number;
+    readonly VERTEX_ATTRIB_ARRAY_NORMALIZED: number;
+    readonly VERTEX_ATTRIB_ARRAY_POINTER: number;
+    readonly VERTEX_ATTRIB_ARRAY_SIZE: number;
+    readonly VERTEX_ATTRIB_ARRAY_STRIDE: number;
+    readonly VERTEX_ATTRIB_ARRAY_TYPE: number;
+    readonly VERTEX_SHADER: number;
+    readonly VIEWPORT: number;
+    readonly ZERO: number;
 }
 
 declare var WebGLRenderingContext: {
     prototype: WebGLRenderingContext;
     new(): WebGLRenderingContext;
-    ACTIVE_ATTRIBUTES: number;
-    ACTIVE_TEXTURE: number;
-    ACTIVE_UNIFORMS: number;
-    ALIASED_LINE_WIDTH_RANGE: number;
-    ALIASED_POINT_SIZE_RANGE: number;
-    ALPHA: number;
-    ALPHA_BITS: number;
-    ALWAYS: number;
-    ARRAY_BUFFER: number;
-    ARRAY_BUFFER_BINDING: number;
-    ATTACHED_SHADERS: number;
-    BACK: number;
-    BLEND: number;
-    BLEND_COLOR: number;
-    BLEND_DST_ALPHA: number;
-    BLEND_DST_RGB: number;
-    BLEND_EQUATION: number;
-    BLEND_EQUATION_ALPHA: number;
-    BLEND_EQUATION_RGB: number;
-    BLEND_SRC_ALPHA: number;
-    BLEND_SRC_RGB: number;
-    BLUE_BITS: number;
-    BOOL: number;
-    BOOL_VEC2: number;
-    BOOL_VEC3: number;
-    BOOL_VEC4: number;
-    BROWSER_DEFAULT_WEBGL: number;
-    BUFFER_SIZE: number;
-    BUFFER_USAGE: number;
-    BYTE: number;
-    CCW: number;
-    CLAMP_TO_EDGE: number;
-    COLOR_ATTACHMENT0: number;
-    COLOR_BUFFER_BIT: number;
-    COLOR_CLEAR_VALUE: number;
-    COLOR_WRITEMASK: number;
-    COMPILE_STATUS: number;
-    COMPRESSED_TEXTURE_FORMATS: number;
-    CONSTANT_ALPHA: number;
-    CONSTANT_COLOR: number;
-    CONTEXT_LOST_WEBGL: number;
-    CULL_FACE: number;
-    CULL_FACE_MODE: number;
-    CURRENT_PROGRAM: number;
-    CURRENT_VERTEX_ATTRIB: number;
-    CW: number;
-    DECR: number;
-    DECR_WRAP: number;
-    DELETE_STATUS: number;
-    DEPTH_ATTACHMENT: number;
-    DEPTH_BITS: number;
-    DEPTH_BUFFER_BIT: number;
-    DEPTH_CLEAR_VALUE: number;
-    DEPTH_COMPONENT: number;
-    DEPTH_COMPONENT16: number;
-    DEPTH_FUNC: number;
-    DEPTH_RANGE: number;
-    DEPTH_STENCIL: number;
-    DEPTH_STENCIL_ATTACHMENT: number;
-    DEPTH_TEST: number;
-    DEPTH_WRITEMASK: number;
-    DITHER: number;
-    DONT_CARE: number;
-    DST_ALPHA: number;
-    DST_COLOR: number;
-    DYNAMIC_DRAW: number;
-    ELEMENT_ARRAY_BUFFER: number;
-    ELEMENT_ARRAY_BUFFER_BINDING: number;
-    EQUAL: number;
-    FASTEST: number;
-    FLOAT: number;
-    FLOAT_MAT2: number;
-    FLOAT_MAT3: number;
-    FLOAT_MAT4: number;
-    FLOAT_VEC2: number;
-    FLOAT_VEC3: number;
-    FLOAT_VEC4: number;
-    FRAGMENT_SHADER: number;
-    FRAMEBUFFER: number;
-    FRAMEBUFFER_ATTACHMENT_OBJECT_NAME: number;
-    FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE: number;
-    FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE: number;
-    FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL: number;
-    FRAMEBUFFER_BINDING: number;
-    FRAMEBUFFER_COMPLETE: number;
-    FRAMEBUFFER_INCOMPLETE_ATTACHMENT: number;
-    FRAMEBUFFER_INCOMPLETE_DIMENSIONS: number;
-    FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: number;
-    FRAMEBUFFER_UNSUPPORTED: number;
-    FRONT: number;
-    FRONT_AND_BACK: number;
-    FRONT_FACE: number;
-    FUNC_ADD: number;
-    FUNC_REVERSE_SUBTRACT: number;
-    FUNC_SUBTRACT: number;
-    GENERATE_MIPMAP_HINT: number;
-    GEQUAL: number;
-    GREATER: number;
-    GREEN_BITS: number;
-    HIGH_FLOAT: number;
-    HIGH_INT: number;
-    IMPLEMENTATION_COLOR_READ_FORMAT: number;
-    IMPLEMENTATION_COLOR_READ_TYPE: number;
-    INCR: number;
-    INCR_WRAP: number;
-    INT: number;
-    INT_VEC2: number;
-    INT_VEC3: number;
-    INT_VEC4: number;
-    INVALID_ENUM: number;
-    INVALID_FRAMEBUFFER_OPERATION: number;
-    INVALID_OPERATION: number;
-    INVALID_VALUE: number;
-    INVERT: number;
-    KEEP: number;
-    LEQUAL: number;
-    LESS: number;
-    LINEAR: number;
-    LINEAR_MIPMAP_LINEAR: number;
-    LINEAR_MIPMAP_NEAREST: number;
-    LINES: number;
-    LINE_LOOP: number;
-    LINE_STRIP: number;
-    LINE_WIDTH: number;
-    LINK_STATUS: number;
-    LOW_FLOAT: number;
-    LOW_INT: number;
-    LUMINANCE: number;
-    LUMINANCE_ALPHA: number;
-    MAX_COMBINED_TEXTURE_IMAGE_UNITS: number;
-    MAX_CUBE_MAP_TEXTURE_SIZE: number;
-    MAX_FRAGMENT_UNIFORM_VECTORS: number;
-    MAX_RENDERBUFFER_SIZE: number;
-    MAX_TEXTURE_IMAGE_UNITS: number;
-    MAX_TEXTURE_SIZE: number;
-    MAX_VARYING_VECTORS: number;
-    MAX_VERTEX_ATTRIBS: number;
-    MAX_VERTEX_TEXTURE_IMAGE_UNITS: number;
-    MAX_VERTEX_UNIFORM_VECTORS: number;
-    MAX_VIEWPORT_DIMS: number;
-    MEDIUM_FLOAT: number;
-    MEDIUM_INT: number;
-    MIRRORED_REPEAT: number;
-    NEAREST: number;
-    NEAREST_MIPMAP_LINEAR: number;
-    NEAREST_MIPMAP_NEAREST: number;
-    NEVER: number;
-    NICEST: number;
-    NONE: number;
-    NOTEQUAL: number;
-    NO_ERROR: number;
-    ONE: number;
-    ONE_MINUS_CONSTANT_ALPHA: number;
-    ONE_MINUS_CONSTANT_COLOR: number;
-    ONE_MINUS_DST_ALPHA: number;
-    ONE_MINUS_DST_COLOR: number;
-    ONE_MINUS_SRC_ALPHA: number;
-    ONE_MINUS_SRC_COLOR: number;
-    OUT_OF_MEMORY: number;
-    PACK_ALIGNMENT: number;
-    POINTS: number;
-    POLYGON_OFFSET_FACTOR: number;
-    POLYGON_OFFSET_FILL: number;
-    POLYGON_OFFSET_UNITS: number;
-    RED_BITS: number;
-    RENDERBUFFER: number;
-    RENDERBUFFER_ALPHA_SIZE: number;
-    RENDERBUFFER_BINDING: number;
-    RENDERBUFFER_BLUE_SIZE: number;
-    RENDERBUFFER_DEPTH_SIZE: number;
-    RENDERBUFFER_GREEN_SIZE: number;
-    RENDERBUFFER_HEIGHT: number;
-    RENDERBUFFER_INTERNAL_FORMAT: number;
-    RENDERBUFFER_RED_SIZE: number;
-    RENDERBUFFER_STENCIL_SIZE: number;
-    RENDERBUFFER_WIDTH: number;
-    RENDERER: number;
-    REPEAT: number;
-    REPLACE: number;
-    RGB: number;
-    RGB565: number;
-    RGB5_A1: number;
-    RGBA: number;
-    RGBA4: number;
-    SAMPLER_2D: number;
-    SAMPLER_CUBE: number;
-    SAMPLES: number;
-    SAMPLE_ALPHA_TO_COVERAGE: number;
-    SAMPLE_BUFFERS: number;
-    SAMPLE_COVERAGE: number;
-    SAMPLE_COVERAGE_INVERT: number;
-    SAMPLE_COVERAGE_VALUE: number;
-    SCISSOR_BOX: number;
-    SCISSOR_TEST: number;
-    SHADER_TYPE: number;
-    SHADING_LANGUAGE_VERSION: number;
-    SHORT: number;
-    SRC_ALPHA: number;
-    SRC_ALPHA_SATURATE: number;
-    SRC_COLOR: number;
-    STATIC_DRAW: number;
-    STENCIL_ATTACHMENT: number;
-    STENCIL_BACK_FAIL: number;
-    STENCIL_BACK_FUNC: number;
-    STENCIL_BACK_PASS_DEPTH_FAIL: number;
-    STENCIL_BACK_PASS_DEPTH_PASS: number;
-    STENCIL_BACK_REF: number;
-    STENCIL_BACK_VALUE_MASK: number;
-    STENCIL_BACK_WRITEMASK: number;
-    STENCIL_BITS: number;
-    STENCIL_BUFFER_BIT: number;
-    STENCIL_CLEAR_VALUE: number;
-    STENCIL_FAIL: number;
-    STENCIL_FUNC: number;
-    STENCIL_INDEX: number;
-    STENCIL_INDEX8: number;
-    STENCIL_PASS_DEPTH_FAIL: number;
-    STENCIL_PASS_DEPTH_PASS: number;
-    STENCIL_REF: number;
-    STENCIL_TEST: number;
-    STENCIL_VALUE_MASK: number;
-    STENCIL_WRITEMASK: number;
-    STREAM_DRAW: number;
-    SUBPIXEL_BITS: number;
-    TEXTURE: number;
-    TEXTURE0: number;
-    TEXTURE1: number;
-    TEXTURE10: number;
-    TEXTURE11: number;
-    TEXTURE12: number;
-    TEXTURE13: number;
-    TEXTURE14: number;
-    TEXTURE15: number;
-    TEXTURE16: number;
-    TEXTURE17: number;
-    TEXTURE18: number;
-    TEXTURE19: number;
-    TEXTURE2: number;
-    TEXTURE20: number;
-    TEXTURE21: number;
-    TEXTURE22: number;
-    TEXTURE23: number;
-    TEXTURE24: number;
-    TEXTURE25: number;
-    TEXTURE26: number;
-    TEXTURE27: number;
-    TEXTURE28: number;
-    TEXTURE29: number;
-    TEXTURE3: number;
-    TEXTURE30: number;
-    TEXTURE31: number;
-    TEXTURE4: number;
-    TEXTURE5: number;
-    TEXTURE6: number;
-    TEXTURE7: number;
-    TEXTURE8: number;
-    TEXTURE9: number;
-    TEXTURE_2D: number;
-    TEXTURE_BINDING_2D: number;
-    TEXTURE_BINDING_CUBE_MAP: number;
-    TEXTURE_CUBE_MAP: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_X: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_Y: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_Z: number;
-    TEXTURE_CUBE_MAP_POSITIVE_X: number;
-    TEXTURE_CUBE_MAP_POSITIVE_Y: number;
-    TEXTURE_CUBE_MAP_POSITIVE_Z: number;
-    TEXTURE_MAG_FILTER: number;
-    TEXTURE_MIN_FILTER: number;
-    TEXTURE_WRAP_S: number;
-    TEXTURE_WRAP_T: number;
-    TRIANGLES: number;
-    TRIANGLE_FAN: number;
-    TRIANGLE_STRIP: number;
-    UNPACK_ALIGNMENT: number;
-    UNPACK_COLORSPACE_CONVERSION_WEBGL: number;
-    UNPACK_FLIP_Y_WEBGL: number;
-    UNPACK_PREMULTIPLY_ALPHA_WEBGL: number;
-    UNSIGNED_BYTE: number;
-    UNSIGNED_INT: number;
-    UNSIGNED_SHORT: number;
-    UNSIGNED_SHORT_4_4_4_4: number;
-    UNSIGNED_SHORT_5_5_5_1: number;
-    UNSIGNED_SHORT_5_6_5: number;
-    VALIDATE_STATUS: number;
-    VENDOR: number;
-    VERSION: number;
-    VERTEX_ATTRIB_ARRAY_BUFFER_BINDING: number;
-    VERTEX_ATTRIB_ARRAY_ENABLED: number;
-    VERTEX_ATTRIB_ARRAY_NORMALIZED: number;
-    VERTEX_ATTRIB_ARRAY_POINTER: number;
-    VERTEX_ATTRIB_ARRAY_SIZE: number;
-    VERTEX_ATTRIB_ARRAY_STRIDE: number;
-    VERTEX_ATTRIB_ARRAY_TYPE: number;
-    VERTEX_SHADER: number;
-    VIEWPORT: number;
-    ZERO: number;
+    readonly ACTIVE_ATTRIBUTES: number;
+    readonly ACTIVE_TEXTURE: number;
+    readonly ACTIVE_UNIFORMS: number;
+    readonly ALIASED_LINE_WIDTH_RANGE: number;
+    readonly ALIASED_POINT_SIZE_RANGE: number;
+    readonly ALPHA: number;
+    readonly ALPHA_BITS: number;
+    readonly ALWAYS: number;
+    readonly ARRAY_BUFFER: number;
+    readonly ARRAY_BUFFER_BINDING: number;
+    readonly ATTACHED_SHADERS: number;
+    readonly BACK: number;
+    readonly BLEND: number;
+    readonly BLEND_COLOR: number;
+    readonly BLEND_DST_ALPHA: number;
+    readonly BLEND_DST_RGB: number;
+    readonly BLEND_EQUATION: number;
+    readonly BLEND_EQUATION_ALPHA: number;
+    readonly BLEND_EQUATION_RGB: number;
+    readonly BLEND_SRC_ALPHA: number;
+    readonly BLEND_SRC_RGB: number;
+    readonly BLUE_BITS: number;
+    readonly BOOL: number;
+    readonly BOOL_VEC2: number;
+    readonly BOOL_VEC3: number;
+    readonly BOOL_VEC4: number;
+    readonly BROWSER_DEFAULT_WEBGL: number;
+    readonly BUFFER_SIZE: number;
+    readonly BUFFER_USAGE: number;
+    readonly BYTE: number;
+    readonly CCW: number;
+    readonly CLAMP_TO_EDGE: number;
+    readonly COLOR_ATTACHMENT0: number;
+    readonly COLOR_BUFFER_BIT: number;
+    readonly COLOR_CLEAR_VALUE: number;
+    readonly COLOR_WRITEMASK: number;
+    readonly COMPILE_STATUS: number;
+    readonly COMPRESSED_TEXTURE_FORMATS: number;
+    readonly CONSTANT_ALPHA: number;
+    readonly CONSTANT_COLOR: number;
+    readonly CONTEXT_LOST_WEBGL: number;
+    readonly CULL_FACE: number;
+    readonly CULL_FACE_MODE: number;
+    readonly CURRENT_PROGRAM: number;
+    readonly CURRENT_VERTEX_ATTRIB: number;
+    readonly CW: number;
+    readonly DECR: number;
+    readonly DECR_WRAP: number;
+    readonly DELETE_STATUS: number;
+    readonly DEPTH_ATTACHMENT: number;
+    readonly DEPTH_BITS: number;
+    readonly DEPTH_BUFFER_BIT: number;
+    readonly DEPTH_CLEAR_VALUE: number;
+    readonly DEPTH_COMPONENT: number;
+    readonly DEPTH_COMPONENT16: number;
+    readonly DEPTH_FUNC: number;
+    readonly DEPTH_RANGE: number;
+    readonly DEPTH_STENCIL: number;
+    readonly DEPTH_STENCIL_ATTACHMENT: number;
+    readonly DEPTH_TEST: number;
+    readonly DEPTH_WRITEMASK: number;
+    readonly DITHER: number;
+    readonly DONT_CARE: number;
+    readonly DST_ALPHA: number;
+    readonly DST_COLOR: number;
+    readonly DYNAMIC_DRAW: number;
+    readonly ELEMENT_ARRAY_BUFFER: number;
+    readonly ELEMENT_ARRAY_BUFFER_BINDING: number;
+    readonly EQUAL: number;
+    readonly FASTEST: number;
+    readonly FLOAT: number;
+    readonly FLOAT_MAT2: number;
+    readonly FLOAT_MAT3: number;
+    readonly FLOAT_MAT4: number;
+    readonly FLOAT_VEC2: number;
+    readonly FLOAT_VEC3: number;
+    readonly FLOAT_VEC4: number;
+    readonly FRAGMENT_SHADER: number;
+    readonly FRAMEBUFFER: number;
+    readonly FRAMEBUFFER_ATTACHMENT_OBJECT_NAME: number;
+    readonly FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE: number;
+    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE: number;
+    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL: number;
+    readonly FRAMEBUFFER_BINDING: number;
+    readonly FRAMEBUFFER_COMPLETE: number;
+    readonly FRAMEBUFFER_INCOMPLETE_ATTACHMENT: number;
+    readonly FRAMEBUFFER_INCOMPLETE_DIMENSIONS: number;
+    readonly FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: number;
+    readonly FRAMEBUFFER_UNSUPPORTED: number;
+    readonly FRONT: number;
+    readonly FRONT_AND_BACK: number;
+    readonly FRONT_FACE: number;
+    readonly FUNC_ADD: number;
+    readonly FUNC_REVERSE_SUBTRACT: number;
+    readonly FUNC_SUBTRACT: number;
+    readonly GENERATE_MIPMAP_HINT: number;
+    readonly GEQUAL: number;
+    readonly GREATER: number;
+    readonly GREEN_BITS: number;
+    readonly HIGH_FLOAT: number;
+    readonly HIGH_INT: number;
+    readonly IMPLEMENTATION_COLOR_READ_FORMAT: number;
+    readonly IMPLEMENTATION_COLOR_READ_TYPE: number;
+    readonly INCR: number;
+    readonly INCR_WRAP: number;
+    readonly INT: number;
+    readonly INT_VEC2: number;
+    readonly INT_VEC3: number;
+    readonly INT_VEC4: number;
+    readonly INVALID_ENUM: number;
+    readonly INVALID_FRAMEBUFFER_OPERATION: number;
+    readonly INVALID_OPERATION: number;
+    readonly INVALID_VALUE: number;
+    readonly INVERT: number;
+    readonly KEEP: number;
+    readonly LEQUAL: number;
+    readonly LESS: number;
+    readonly LINEAR: number;
+    readonly LINEAR_MIPMAP_LINEAR: number;
+    readonly LINEAR_MIPMAP_NEAREST: number;
+    readonly LINES: number;
+    readonly LINE_LOOP: number;
+    readonly LINE_STRIP: number;
+    readonly LINE_WIDTH: number;
+    readonly LINK_STATUS: number;
+    readonly LOW_FLOAT: number;
+    readonly LOW_INT: number;
+    readonly LUMINANCE: number;
+    readonly LUMINANCE_ALPHA: number;
+    readonly MAX_COMBINED_TEXTURE_IMAGE_UNITS: number;
+    readonly MAX_CUBE_MAP_TEXTURE_SIZE: number;
+    readonly MAX_FRAGMENT_UNIFORM_VECTORS: number;
+    readonly MAX_RENDERBUFFER_SIZE: number;
+    readonly MAX_TEXTURE_IMAGE_UNITS: number;
+    readonly MAX_TEXTURE_SIZE: number;
+    readonly MAX_VARYING_VECTORS: number;
+    readonly MAX_VERTEX_ATTRIBS: number;
+    readonly MAX_VERTEX_TEXTURE_IMAGE_UNITS: number;
+    readonly MAX_VERTEX_UNIFORM_VECTORS: number;
+    readonly MAX_VIEWPORT_DIMS: number;
+    readonly MEDIUM_FLOAT: number;
+    readonly MEDIUM_INT: number;
+    readonly MIRRORED_REPEAT: number;
+    readonly NEAREST: number;
+    readonly NEAREST_MIPMAP_LINEAR: number;
+    readonly NEAREST_MIPMAP_NEAREST: number;
+    readonly NEVER: number;
+    readonly NICEST: number;
+    readonly NONE: number;
+    readonly NOTEQUAL: number;
+    readonly NO_ERROR: number;
+    readonly ONE: number;
+    readonly ONE_MINUS_CONSTANT_ALPHA: number;
+    readonly ONE_MINUS_CONSTANT_COLOR: number;
+    readonly ONE_MINUS_DST_ALPHA: number;
+    readonly ONE_MINUS_DST_COLOR: number;
+    readonly ONE_MINUS_SRC_ALPHA: number;
+    readonly ONE_MINUS_SRC_COLOR: number;
+    readonly OUT_OF_MEMORY: number;
+    readonly PACK_ALIGNMENT: number;
+    readonly POINTS: number;
+    readonly POLYGON_OFFSET_FACTOR: number;
+    readonly POLYGON_OFFSET_FILL: number;
+    readonly POLYGON_OFFSET_UNITS: number;
+    readonly RED_BITS: number;
+    readonly RENDERBUFFER: number;
+    readonly RENDERBUFFER_ALPHA_SIZE: number;
+    readonly RENDERBUFFER_BINDING: number;
+    readonly RENDERBUFFER_BLUE_SIZE: number;
+    readonly RENDERBUFFER_DEPTH_SIZE: number;
+    readonly RENDERBUFFER_GREEN_SIZE: number;
+    readonly RENDERBUFFER_HEIGHT: number;
+    readonly RENDERBUFFER_INTERNAL_FORMAT: number;
+    readonly RENDERBUFFER_RED_SIZE: number;
+    readonly RENDERBUFFER_STENCIL_SIZE: number;
+    readonly RENDERBUFFER_WIDTH: number;
+    readonly RENDERER: number;
+    readonly REPEAT: number;
+    readonly REPLACE: number;
+    readonly RGB: number;
+    readonly RGB565: number;
+    readonly RGB5_A1: number;
+    readonly RGBA: number;
+    readonly RGBA4: number;
+    readonly SAMPLER_2D: number;
+    readonly SAMPLER_CUBE: number;
+    readonly SAMPLES: number;
+    readonly SAMPLE_ALPHA_TO_COVERAGE: number;
+    readonly SAMPLE_BUFFERS: number;
+    readonly SAMPLE_COVERAGE: number;
+    readonly SAMPLE_COVERAGE_INVERT: number;
+    readonly SAMPLE_COVERAGE_VALUE: number;
+    readonly SCISSOR_BOX: number;
+    readonly SCISSOR_TEST: number;
+    readonly SHADER_TYPE: number;
+    readonly SHADING_LANGUAGE_VERSION: number;
+    readonly SHORT: number;
+    readonly SRC_ALPHA: number;
+    readonly SRC_ALPHA_SATURATE: number;
+    readonly SRC_COLOR: number;
+    readonly STATIC_DRAW: number;
+    readonly STENCIL_ATTACHMENT: number;
+    readonly STENCIL_BACK_FAIL: number;
+    readonly STENCIL_BACK_FUNC: number;
+    readonly STENCIL_BACK_PASS_DEPTH_FAIL: number;
+    readonly STENCIL_BACK_PASS_DEPTH_PASS: number;
+    readonly STENCIL_BACK_REF: number;
+    readonly STENCIL_BACK_VALUE_MASK: number;
+    readonly STENCIL_BACK_WRITEMASK: number;
+    readonly STENCIL_BITS: number;
+    readonly STENCIL_BUFFER_BIT: number;
+    readonly STENCIL_CLEAR_VALUE: number;
+    readonly STENCIL_FAIL: number;
+    readonly STENCIL_FUNC: number;
+    readonly STENCIL_INDEX: number;
+    readonly STENCIL_INDEX8: number;
+    readonly STENCIL_PASS_DEPTH_FAIL: number;
+    readonly STENCIL_PASS_DEPTH_PASS: number;
+    readonly STENCIL_REF: number;
+    readonly STENCIL_TEST: number;
+    readonly STENCIL_VALUE_MASK: number;
+    readonly STENCIL_WRITEMASK: number;
+    readonly STREAM_DRAW: number;
+    readonly SUBPIXEL_BITS: number;
+    readonly TEXTURE: number;
+    readonly TEXTURE0: number;
+    readonly TEXTURE1: number;
+    readonly TEXTURE10: number;
+    readonly TEXTURE11: number;
+    readonly TEXTURE12: number;
+    readonly TEXTURE13: number;
+    readonly TEXTURE14: number;
+    readonly TEXTURE15: number;
+    readonly TEXTURE16: number;
+    readonly TEXTURE17: number;
+    readonly TEXTURE18: number;
+    readonly TEXTURE19: number;
+    readonly TEXTURE2: number;
+    readonly TEXTURE20: number;
+    readonly TEXTURE21: number;
+    readonly TEXTURE22: number;
+    readonly TEXTURE23: number;
+    readonly TEXTURE24: number;
+    readonly TEXTURE25: number;
+    readonly TEXTURE26: number;
+    readonly TEXTURE27: number;
+    readonly TEXTURE28: number;
+    readonly TEXTURE29: number;
+    readonly TEXTURE3: number;
+    readonly TEXTURE30: number;
+    readonly TEXTURE31: number;
+    readonly TEXTURE4: number;
+    readonly TEXTURE5: number;
+    readonly TEXTURE6: number;
+    readonly TEXTURE7: number;
+    readonly TEXTURE8: number;
+    readonly TEXTURE9: number;
+    readonly TEXTURE_2D: number;
+    readonly TEXTURE_BINDING_2D: number;
+    readonly TEXTURE_BINDING_CUBE_MAP: number;
+    readonly TEXTURE_CUBE_MAP: number;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_X: number;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_Y: number;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_Z: number;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_X: number;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_Y: number;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_Z: number;
+    readonly TEXTURE_MAG_FILTER: number;
+    readonly TEXTURE_MIN_FILTER: number;
+    readonly TEXTURE_WRAP_S: number;
+    readonly TEXTURE_WRAP_T: number;
+    readonly TRIANGLES: number;
+    readonly TRIANGLE_FAN: number;
+    readonly TRIANGLE_STRIP: number;
+    readonly UNPACK_ALIGNMENT: number;
+    readonly UNPACK_COLORSPACE_CONVERSION_WEBGL: number;
+    readonly UNPACK_FLIP_Y_WEBGL: number;
+    readonly UNPACK_PREMULTIPLY_ALPHA_WEBGL: number;
+    readonly UNSIGNED_BYTE: number;
+    readonly UNSIGNED_INT: number;
+    readonly UNSIGNED_SHORT: number;
+    readonly UNSIGNED_SHORT_4_4_4_4: number;
+    readonly UNSIGNED_SHORT_5_5_5_1: number;
+    readonly UNSIGNED_SHORT_5_6_5: number;
+    readonly VALIDATE_STATUS: number;
+    readonly VENDOR: number;
+    readonly VERSION: number;
+    readonly VERTEX_ATTRIB_ARRAY_BUFFER_BINDING: number;
+    readonly VERTEX_ATTRIB_ARRAY_ENABLED: number;
+    readonly VERTEX_ATTRIB_ARRAY_NORMALIZED: number;
+    readonly VERTEX_ATTRIB_ARRAY_POINTER: number;
+    readonly VERTEX_ATTRIB_ARRAY_SIZE: number;
+    readonly VERTEX_ATTRIB_ARRAY_STRIDE: number;
+    readonly VERTEX_ATTRIB_ARRAY_TYPE: number;
+    readonly VERTEX_SHADER: number;
+    readonly VIEWPORT: number;
+    readonly ZERO: number;
 }
 
 interface WebGLShader extends WebGLObject {
@@ -11912,9 +12709,9 @@ declare var WebGLShader: {
 }
 
 interface WebGLShaderPrecisionFormat {
-    precision: number;
-    rangeMax: number;
-    rangeMin: number;
+    readonly precision: number;
+    readonly rangeMax: number;
+    readonly rangeMin: number;
 }
 
 declare var WebGLShaderPrecisionFormat: {
@@ -11990,21 +12787,21 @@ declare var WebKitPoint: {
 
 interface WebSocket extends EventTarget {
     binaryType: string;
-    bufferedAmount: number;
-    extensions: string;
+    readonly bufferedAmount: number;
+    readonly extensions: string;
     onclose: (ev: CloseEvent) => any;
     onerror: (ev: Event) => any;
     onmessage: (ev: MessageEvent) => any;
     onopen: (ev: Event) => any;
-    protocol: string;
-    readyState: number;
-    url: string;
+    readonly protocol: string;
+    readonly readyState: number;
+    readonly url: string;
     close(code?: number, reason?: string): void;
     send(data: any): void;
-    CLOSED: number;
-    CLOSING: number;
-    CONNECTING: number;
-    OPEN: number;
+    readonly CLOSED: number;
+    readonly CLOSING: number;
+    readonly CONNECTING: number;
+    readonly OPEN: number;
     addEventListener(type: "close", listener: (ev: CloseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "message", listener: (ev: MessageEvent) => any, useCapture?: boolean): void;
@@ -12015,56 +12812,58 @@ interface WebSocket extends EventTarget {
 declare var WebSocket: {
     prototype: WebSocket;
     new(url: string, protocols?: string | string[]): WebSocket;
-    CLOSED: number;
-    CLOSING: number;
-    CONNECTING: number;
-    OPEN: number;
+    readonly CLOSED: number;
+    readonly CLOSING: number;
+    readonly CONNECTING: number;
+    readonly OPEN: number;
 }
 
 interface WheelEvent extends MouseEvent {
-    deltaMode: number;
-    deltaX: number;
-    deltaY: number;
-    deltaZ: number;
+    readonly deltaMode: number;
+    readonly deltaX: number;
+    readonly deltaY: number;
+    readonly deltaZ: number;
+    readonly wheelDelta: number;
+    readonly wheelDeltaX: number;
+    readonly wheelDeltaY: number;
     getCurrentPoint(element: Element): void;
     initWheelEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, buttonArg: number, relatedTargetArg: EventTarget, modifiersListArg: string, deltaXArg: number, deltaYArg: number, deltaZArg: number, deltaMode: number): void;
-    DOM_DELTA_LINE: number;
-    DOM_DELTA_PAGE: number;
-    DOM_DELTA_PIXEL: number;
+    readonly DOM_DELTA_LINE: number;
+    readonly DOM_DELTA_PAGE: number;
+    readonly DOM_DELTA_PIXEL: number;
 }
 
 declare var WheelEvent: {
     prototype: WheelEvent;
     new(typeArg: string, eventInitDict?: WheelEventInit): WheelEvent;
-    DOM_DELTA_LINE: number;
-    DOM_DELTA_PAGE: number;
-    DOM_DELTA_PIXEL: number;
+    readonly DOM_DELTA_LINE: number;
+    readonly DOM_DELTA_PAGE: number;
+    readonly DOM_DELTA_PIXEL: number;
 }
 
 interface Window extends EventTarget, WindowTimers, WindowSessionStorage, WindowLocalStorage, WindowConsole, GlobalEventHandlers, IDBEnvironment, WindowBase64 {
-    animationStartTime: number;
-    applicationCache: ApplicationCache;
-    clientInformation: Navigator;
-    closed: boolean;
-    crypto: Crypto;
+    readonly applicationCache: ApplicationCache;
+    readonly clientInformation: Navigator;
+    readonly closed: boolean;
+    readonly crypto: Crypto;
     defaultStatus: string;
-    devicePixelRatio: number;
-    doNotTrack: string;
-    document: Document;
+    readonly devicePixelRatio: number;
+    readonly doNotTrack: string;
+    readonly document: Document;
     event: Event;
-    external: External;
-    frameElement: Element;
-    frames: Window;
-    history: History;
-    innerHeight: number;
-    innerWidth: number;
-    length: number;
-    location: Location;
-    locationbar: BarProp;
-    menubar: BarProp;
-    msAnimationStartTime: number;
+    readonly external: External;
+    readonly frameElement: Element;
+    readonly frames: Window;
+    readonly history: History;
+    readonly innerHeight: number;
+    readonly innerWidth: number;
+    readonly length: number;
+    readonly location: Location;
+    readonly locationbar: BarProp;
+    readonly menubar: BarProp;
+    readonly msCredentials: MSCredentials;
     name: string;
-    navigator: Navigator;
+    readonly navigator: Navigator;
     offscreenBuffering: string | boolean;
     onabort: (ev: Event) => any;
     onafterprint: (ev: Event) => any;
@@ -12078,6 +12877,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     oncompassneedscalibration: (ev: Event) => any;
     oncontextmenu: (ev: PointerEvent) => any;
     ondblclick: (ev: MouseEvent) => any;
+    ondevicelight: (ev: DeviceLightEvent) => any;
     ondevicemotion: (ev: DeviceMotionEvent) => any;
     ondeviceorientation: (ev: DeviceOrientationEvent) => any;
     ondrag: (ev: DragEvent) => any;
@@ -12089,11 +12889,12 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     ondrop: (ev: DragEvent) => any;
     ondurationchange: (ev: Event) => any;
     onemptied: (ev: Event) => any;
-    onended: (ev: Event) => any;
+    onended: (ev: MediaStreamErrorEvent) => any;
     onerror: ErrorEventHandler;
     onfocus: (ev: FocusEvent) => any;
     onhashchange: (ev: HashChangeEvent) => any;
     oninput: (ev: Event) => any;
+    oninvalid: (ev: Event) => any;
     onkeydown: (ev: KeyboardEvent) => any;
     onkeypress: (ev: KeyboardEvent) => any;
     onkeyup: (ev: KeyboardEvent) => any;
@@ -12109,7 +12910,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     onmouseout: (ev: MouseEvent) => any;
     onmouseover: (ev: MouseEvent) => any;
     onmouseup: (ev: MouseEvent) => any;
-    onmousewheel: (ev: MouseWheelEvent) => any;
+    onmousewheel: (ev: WheelEvent) => any;
     onmsgesturechange: (ev: MSGestureEvent) => any;
     onmsgesturedoubletap: (ev: MSGestureEvent) => any;
     onmsgestureend: (ev: MSGestureEvent) => any;
@@ -12148,38 +12949,38 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     onsubmit: (ev: Event) => any;
     onsuspend: (ev: Event) => any;
     ontimeupdate: (ev: Event) => any;
-    ontouchcancel: any;
-    ontouchend: any;
-    ontouchmove: any;
-    ontouchstart: any;
+    ontouchcancel: (ev: TouchEvent) => any;
+    ontouchend: (ev: TouchEvent) => any;
+    ontouchmove: (ev: TouchEvent) => any;
+    ontouchstart: (ev: TouchEvent) => any;
     onunload: (ev: Event) => any;
     onvolumechange: (ev: Event) => any;
     onwaiting: (ev: Event) => any;
-    opener: Window;
+    readonly opener: Window;
     orientation: string | number;
-    outerHeight: number;
-    outerWidth: number;
-    pageXOffset: number;
-    pageYOffset: number;
-    parent: Window;
-    performance: Performance;
-    personalbar: BarProp;
-    screen: Screen;
-    screenLeft: number;
-    screenTop: number;
-    screenX: number;
-    screenY: number;
-    scrollX: number;
-    scrollY: number;
-    scrollbars: BarProp;
-    self: Window;
+    readonly outerHeight: number;
+    readonly outerWidth: number;
+    readonly pageXOffset: number;
+    readonly pageYOffset: number;
+    readonly parent: Window;
+    readonly performance: Performance;
+    readonly personalbar: BarProp;
+    readonly screen: Screen;
+    readonly screenLeft: number;
+    readonly screenTop: number;
+    readonly screenX: number;
+    readonly screenY: number;
+    readonly scrollX: number;
+    readonly scrollY: number;
+    readonly scrollbars: BarProp;
+    readonly self: Window;
     status: string;
-    statusbar: BarProp;
-    styleMedia: StyleMedia;
-    toolbar: BarProp;
-    top: Window;
-    window: Window;
-    URL: URL;
+    readonly statusbar: BarProp;
+    readonly styleMedia: StyleMedia;
+    readonly toolbar: BarProp;
+    readonly top: Window;
+    readonly window: Window;
+    URL: typeof URL;
     alert(message?: any): void;
     blur(): void;
     cancelAnimationFrame(handle: number): void;
@@ -12193,12 +12994,9 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     matchMedia(mediaQuery: string): MediaQueryList;
     moveBy(x?: number, y?: number): void;
     moveTo(x?: number, y?: number): void;
-    msCancelRequestAnimationFrame(handle: number): void;
-    msMatchMedia(mediaQuery: string): MediaQueryList;
-    msRequestAnimationFrame(callback: FrameRequestCallback): number;
     msWriteProfilerMark(profilerMarkName: string): void;
     open(url?: string, target?: string, features?: string, replace?: boolean): Window;
-    postMessage(message: any, targetOrigin: string, ports?: any): void;
+    postMessage(message: any, targetOrigin: string, transfer?: any[]): void;
     print(): void;
     prompt(message?: string, _default?: string): string;
     releaseEvents(): void;
@@ -12208,8 +13006,10 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     scroll(x?: number, y?: number): void;
     scrollBy(x?: number, y?: number): void;
     scrollTo(x?: number, y?: number): void;
+    webkitCancelAnimationFrame(handle: number): void;
     webkitConvertPointFromNodeToPage(node: Node, pt: WebKitPoint): WebKitPoint;
     webkitConvertPointFromPageToNode(node: Node, pt: WebKitPoint): WebKitPoint;
+    webkitRequestAnimationFrame(callback: FrameRequestCallback): number;
     addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -12237,6 +13037,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     addEventListener(type: "compassneedscalibration", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "devicelight", listener: (ev: DeviceLightEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "devicemotion", listener: (ev: DeviceMotionEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deviceorientation", listener: (ev: DeviceOrientationEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -12248,10 +13049,11 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "hashchange", listener: (ev: HashChangeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -12267,7 +13069,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "offline", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "online", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "orientationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -12337,16 +13139,15 @@ declare var XMLDocument: {
 interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
     msCaching: string;
     onreadystatechange: (ev: ProgressEvent) => any;
-    readyState: number;
-    response: any;
-    responseBody: any;
-    responseText: string;
+    readonly readyState: number;
+    readonly response: any;
+    readonly responseText: string;
     responseType: string;
-    responseXML: any;
-    status: number;
-    statusText: string;
+    readonly responseXML: any;
+    readonly status: number;
+    readonly statusText: string;
     timeout: number;
-    upload: XMLHttpRequestUpload;
+    readonly upload: XMLHttpRequestUpload;
     withCredentials: boolean;
     abort(): void;
     getAllResponseHeaders(): string;
@@ -12358,11 +13159,11 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
     send(data?: string): void;
     send(data?: any): void;
     setRequestHeader(header: string, value: string): void;
-    DONE: number;
-    HEADERS_RECEIVED: number;
-    LOADING: number;
-    OPENED: number;
-    UNSENT: number;
+    readonly DONE: number;
+    readonly HEADERS_RECEIVED: number;
+    readonly LOADING: number;
+    readonly OPENED: number;
+    readonly UNSENT: number;
     addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -12377,11 +13178,11 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
 declare var XMLHttpRequest: {
     prototype: XMLHttpRequest;
     new(): XMLHttpRequest;
-    DONE: number;
-    HEADERS_RECEIVED: number;
-    LOADING: number;
-    OPENED: number;
-    UNSENT: number;
+    readonly DONE: number;
+    readonly HEADERS_RECEIVED: number;
+    readonly LOADING: number;
+    readonly OPENED: number;
+    readonly UNSENT: number;
     create(): XMLHttpRequest;
 }
 
@@ -12433,40 +13234,40 @@ declare var XPathNSResolver: {
 }
 
 interface XPathResult {
-    booleanValue: boolean;
-    invalidIteratorState: boolean;
-    numberValue: number;
-    resultType: number;
-    singleNodeValue: Node;
-    snapshotLength: number;
-    stringValue: string;
+    readonly booleanValue: boolean;
+    readonly invalidIteratorState: boolean;
+    readonly numberValue: number;
+    readonly resultType: number;
+    readonly singleNodeValue: Node;
+    readonly snapshotLength: number;
+    readonly stringValue: string;
     iterateNext(): Node;
     snapshotItem(index: number): Node;
-    ANY_TYPE: number;
-    ANY_UNORDERED_NODE_TYPE: number;
-    BOOLEAN_TYPE: number;
-    FIRST_ORDERED_NODE_TYPE: number;
-    NUMBER_TYPE: number;
-    ORDERED_NODE_ITERATOR_TYPE: number;
-    ORDERED_NODE_SNAPSHOT_TYPE: number;
-    STRING_TYPE: number;
-    UNORDERED_NODE_ITERATOR_TYPE: number;
-    UNORDERED_NODE_SNAPSHOT_TYPE: number;
+    readonly ANY_TYPE: number;
+    readonly ANY_UNORDERED_NODE_TYPE: number;
+    readonly BOOLEAN_TYPE: number;
+    readonly FIRST_ORDERED_NODE_TYPE: number;
+    readonly NUMBER_TYPE: number;
+    readonly ORDERED_NODE_ITERATOR_TYPE: number;
+    readonly ORDERED_NODE_SNAPSHOT_TYPE: number;
+    readonly STRING_TYPE: number;
+    readonly UNORDERED_NODE_ITERATOR_TYPE: number;
+    readonly UNORDERED_NODE_SNAPSHOT_TYPE: number;
 }
 
 declare var XPathResult: {
     prototype: XPathResult;
     new(): XPathResult;
-    ANY_TYPE: number;
-    ANY_UNORDERED_NODE_TYPE: number;
-    BOOLEAN_TYPE: number;
-    FIRST_ORDERED_NODE_TYPE: number;
-    NUMBER_TYPE: number;
-    ORDERED_NODE_ITERATOR_TYPE: number;
-    ORDERED_NODE_SNAPSHOT_TYPE: number;
-    STRING_TYPE: number;
-    UNORDERED_NODE_ITERATOR_TYPE: number;
-    UNORDERED_NODE_SNAPSHOT_TYPE: number;
+    readonly ANY_TYPE: number;
+    readonly ANY_UNORDERED_NODE_TYPE: number;
+    readonly BOOLEAN_TYPE: number;
+    readonly FIRST_ORDERED_NODE_TYPE: number;
+    readonly NUMBER_TYPE: number;
+    readonly ORDERED_NODE_ITERATOR_TYPE: number;
+    readonly ORDERED_NODE_SNAPSHOT_TYPE: number;
+    readonly STRING_TYPE: number;
+    readonly UNORDERED_NODE_ITERATOR_TYPE: number;
+    readonly UNORDERED_NODE_SNAPSHOT_TYPE: number;
 }
 
 interface XSLTProcessor {
@@ -12491,6 +13292,18 @@ interface AbstractWorker {
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
+interface CanvasPathMethods {
+    arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void;
+    arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void;
+    bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void;
+    closePath(): void;
+    ellipse(x: number, y: number, radiusX: number, radiusY: number, rotation: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void;
+    lineTo(x: number, y: number): void;
+    moveTo(x: number, y: number): void;
+    quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
+    rect(x: number, y: number, w: number, h: number): void;
+}
+
 interface ChildNode {
     remove(): void;
 }
@@ -12513,6 +13326,7 @@ interface DocumentEvent {
     createEvent(eventInterface:"CommandEvent"): CommandEvent;
     createEvent(eventInterface:"CompositionEvent"): CompositionEvent;
     createEvent(eventInterface:"CustomEvent"): CustomEvent;
+    createEvent(eventInterface:"DeviceLightEvent"): DeviceLightEvent;
     createEvent(eventInterface:"DeviceMotionEvent"): DeviceMotionEvent;
     createEvent(eventInterface:"DeviceOrientationEvent"): DeviceOrientationEvent;
     createEvent(eventInterface:"DragEvent"): DragEvent;
@@ -12524,6 +13338,7 @@ interface DocumentEvent {
     createEvent(eventInterface:"HashChangeEvent"): HashChangeEvent;
     createEvent(eventInterface:"IDBVersionChangeEvent"): IDBVersionChangeEvent;
     createEvent(eventInterface:"KeyboardEvent"): KeyboardEvent;
+    createEvent(eventInterface:"ListeningStateChangedEvent"): ListeningStateChangedEvent;
     createEvent(eventInterface:"LongRunningScriptDetectedEvent"): LongRunningScriptDetectedEvent;
     createEvent(eventInterface:"MSGestureEvent"): MSGestureEvent;
     createEvent(eventInterface:"MSManipulationEvent"): MSManipulationEvent;
@@ -12531,21 +13346,31 @@ interface DocumentEvent {
     createEvent(eventInterface:"MSMediaKeyNeededEvent"): MSMediaKeyNeededEvent;
     createEvent(eventInterface:"MSPointerEvent"): MSPointerEvent;
     createEvent(eventInterface:"MSSiteModeEvent"): MSSiteModeEvent;
+    createEvent(eventInterface:"MediaEncryptedEvent"): MediaEncryptedEvent;
+    createEvent(eventInterface:"MediaKeyMessageEvent"): MediaKeyMessageEvent;
+    createEvent(eventInterface:"MediaStreamErrorEvent"): MediaStreamErrorEvent;
+    createEvent(eventInterface:"MediaStreamTrackEvent"): MediaStreamTrackEvent;
     createEvent(eventInterface:"MessageEvent"): MessageEvent;
     createEvent(eventInterface:"MouseEvent"): MouseEvent;
     createEvent(eventInterface:"MouseEvents"): MouseEvent;
-    createEvent(eventInterface:"MouseWheelEvent"): MouseWheelEvent;
     createEvent(eventInterface:"MutationEvent"): MutationEvent;
     createEvent(eventInterface:"MutationEvents"): MutationEvent;
     createEvent(eventInterface:"NavigationCompletedEvent"): NavigationCompletedEvent;
     createEvent(eventInterface:"NavigationEvent"): NavigationEvent;
     createEvent(eventInterface:"NavigationEventWithReferrer"): NavigationEventWithReferrer;
     createEvent(eventInterface:"OfflineAudioCompletionEvent"): OfflineAudioCompletionEvent;
+    createEvent(eventInterface:"OverflowEvent"): OverflowEvent;
     createEvent(eventInterface:"PageTransitionEvent"): PageTransitionEvent;
     createEvent(eventInterface:"PermissionRequestedEvent"): PermissionRequestedEvent;
     createEvent(eventInterface:"PointerEvent"): PointerEvent;
     createEvent(eventInterface:"PopStateEvent"): PopStateEvent;
     createEvent(eventInterface:"ProgressEvent"): ProgressEvent;
+    createEvent(eventInterface:"RTCDTMFToneChangeEvent"): RTCDTMFToneChangeEvent;
+    createEvent(eventInterface:"RTCDtlsTransportStateChangedEvent"): RTCDtlsTransportStateChangedEvent;
+    createEvent(eventInterface:"RTCIceCandidatePairChangedEvent"): RTCIceCandidatePairChangedEvent;
+    createEvent(eventInterface:"RTCIceGathererEvent"): RTCIceGathererEvent;
+    createEvent(eventInterface:"RTCIceTransportStateChangedEvent"): RTCIceTransportStateChangedEvent;
+    createEvent(eventInterface:"RTCSsrcConflictEvent"): RTCSsrcConflictEvent;
     createEvent(eventInterface:"SVGZoomEvent"): SVGZoomEvent;
     createEvent(eventInterface:"SVGZoomEvents"): SVGZoomEvent;
     createEvent(eventInterface:"ScriptNotifyEvent"): ScriptNotifyEvent;
@@ -12563,11 +13388,11 @@ interface DocumentEvent {
 }
 
 interface ElementTraversal {
-    childElementCount: number;
-    firstElementChild: Element;
-    lastElementChild: Element;
-    nextElementSibling: Element;
-    previousElementSibling: Element;
+    readonly childElementCount: number;
+    readonly firstElementChild: Element;
+    readonly lastElementChild: Element;
+    readonly nextElementSibling: Element;
+    readonly previousElementSibling: Element;
 }
 
 interface GetSVGDocument {
@@ -12612,12 +13437,11 @@ interface HTMLTableAlignment {
 }
 
 interface IDBEnvironment {
-    indexedDB: IDBFactory;
-    msIndexedDB: IDBFactory;
+    readonly indexedDB: IDBFactory;
 }
 
 interface LinkStyle {
-    sheet: StyleSheet;
+    readonly sheet: StyleSheet;
 }
 
 interface MSBaseReader {
@@ -12627,12 +13451,12 @@ interface MSBaseReader {
     onloadend: (ev: ProgressEvent) => any;
     onloadstart: (ev: Event) => any;
     onprogress: (ev: ProgressEvent) => any;
-    readyState: number;
-    result: any;
+    readonly readyState: number;
+    readonly result: any;
     abort(): void;
-    DONE: number;
-    EMPTY: number;
-    LOADING: number;
+    readonly DONE: number;
+    readonly EMPTY: number;
+    readonly LOADING: number;
     addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -12660,27 +13484,32 @@ interface NavigatorContentUtils {
 }
 
 interface NavigatorGeolocation {
-    geolocation: Geolocation;
+    readonly geolocation: Geolocation;
 }
 
 interface NavigatorID {
-    appName: string;
-    appVersion: string;
-    platform: string;
-    product: string;
-    productSub: string;
-    userAgent: string;
-    vendor: string;
-    vendorSub: string;
+    readonly appName: string;
+    readonly appVersion: string;
+    readonly platform: string;
+    readonly product: string;
+    readonly productSub: string;
+    readonly userAgent: string;
+    readonly vendor: string;
+    readonly vendorSub: string;
 }
 
 interface NavigatorOnLine {
-    onLine: boolean;
+    readonly onLine: boolean;
 }
 
 interface NavigatorStorageUtils {
 }
 
+interface NavigatorUserMedia {
+    readonly mediaDevices: MediaDevices;
+    getUserMedia(constraints: MediaStreamConstraints, successCallback: NavigatorUserMediaSuccessCallback, errorCallback: NavigatorUserMediaErrorCallback): void;
+}
+
 interface NodeSelector {
     querySelector(selectors: string): Element;
     querySelectorAll(selectors: string): NodeListOf<Element>;
@@ -12691,29 +13520,29 @@ interface RandomSource {
 }
 
 interface SVGAnimatedPathData {
-    pathSegList: SVGPathSegList;
+    readonly pathSegList: SVGPathSegList;
 }
 
 interface SVGAnimatedPoints {
-    animatedPoints: SVGPointList;
-    points: SVGPointList;
+    readonly animatedPoints: SVGPointList;
+    readonly points: SVGPointList;
 }
 
 interface SVGExternalResourcesRequired {
-    externalResourcesRequired: SVGAnimatedBoolean;
+    readonly externalResourcesRequired: SVGAnimatedBoolean;
 }
 
 interface SVGFilterPrimitiveStandardAttributes extends SVGStylable {
-    height: SVGAnimatedLength;
-    result: SVGAnimatedString;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly height: SVGAnimatedLength;
+    readonly result: SVGAnimatedString;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
 }
 
 interface SVGFitToViewBox {
-    preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
-    viewBox: SVGAnimatedRect;
+    readonly preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
+    readonly viewBox: SVGAnimatedRect;
 }
 
 interface SVGLangSpace {
@@ -12722,8 +13551,8 @@ interface SVGLangSpace {
 }
 
 interface SVGLocatable {
-    farthestViewportElement: SVGElement;
-    nearestViewportElement: SVGElement;
+    readonly farthestViewportElement: SVGElement;
+    readonly nearestViewportElement: SVGElement;
     getBBox(): SVGRect;
     getCTM(): SVGMatrix;
     getScreenCTM(): SVGMatrix;
@@ -12732,22 +13561,22 @@ interface SVGLocatable {
 
 interface SVGStylable {
     className: any;
-    style: CSSStyleDeclaration;
+    readonly style: CSSStyleDeclaration;
 }
 
 interface SVGTests {
-    requiredExtensions: SVGStringList;
-    requiredFeatures: SVGStringList;
-    systemLanguage: SVGStringList;
+    readonly requiredExtensions: SVGStringList;
+    readonly requiredFeatures: SVGStringList;
+    readonly systemLanguage: SVGStringList;
     hasExtension(extension: string): boolean;
 }
 
 interface SVGTransformable extends SVGLocatable {
-    transform: SVGAnimatedTransformList;
+    readonly transform: SVGAnimatedTransformList;
 }
 
 interface SVGURIReference {
-    href: SVGAnimatedString;
+    readonly href: SVGAnimatedString;
 }
 
 interface WindowBase64 {
@@ -12756,15 +13585,15 @@ interface WindowBase64 {
 }
 
 interface WindowConsole {
-    console: Console;
+    readonly console: Console;
 }
 
 interface WindowLocalStorage {
-    localStorage: Storage;
+    readonly localStorage: Storage;
 }
 
 interface WindowSessionStorage {
-    sessionStorage: Storage;
+    readonly sessionStorage: Storage;
 }
 
 interface WindowTimers extends Object, WindowTimersExtension {
@@ -12776,8 +13605,6 @@ interface WindowTimers extends Object, WindowTimersExtension {
 
 interface WindowTimersExtension {
     clearImmediate(handle: number): void;
-    msClearImmediate(handle: number): void;
-    msSetImmediate(expression: any, ...args: any[]): number;
     setImmediate(expression: any, ...args: any[]): number;
 }
 
@@ -12807,22 +13634,18 @@ interface StorageEventInit extends EventInit {
     storageArea?: Storage;
 }
 
-interface IDBObjectStoreParameters {
-    keyPath?: string | string[];
-    autoIncrement?: boolean;
-}
-
-interface IDBIndexParameters {
-    unique?: boolean;
-    multiEntry?: boolean;
-}
-
 interface NodeListOf<TNode extends Node> extends NodeList {
     length: number;
     item(index: number): TNode;
     [index: number]: TNode;
 }
 
+interface HTMLCollectionOf<T extends Element> extends HTMLCollection {
+    item(index: number): T;
+    namedItem(name: string): T;
+    [index: number]: T;
+}
+
 interface BlobPropertyBag {
     type?: string;
     endings?: string;
@@ -12852,15 +13675,6 @@ interface ProgressEventInit extends EventInit {
     total?: number;
 }
 
-interface HTMLTemplateElement extends HTMLElement {
-    content: DocumentFragment;
-}
-
-declare var HTMLTemplateElement: {
-    prototype: HTMLTemplateElement;
-    new(): HTMLTemplateElement;
-}
-
 interface HTMLPictureElement extends HTMLElement {
 }
 
@@ -12869,6 +13683,14 @@ declare var HTMLPictureElement: {
     new(): HTMLPictureElement;
 }
 
+interface ClipboardEventInit extends EventInit {
+    data?: string;
+    dataType?: string;
+}
+
+interface IDBArrayKey extends Array<IDBValidKey> {
+}
+
 declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
 
 interface ErrorEventHandler {
@@ -12902,15 +13724,23 @@ interface DecodeSuccessCallback {
     (decodedData: AudioBuffer): void;
 }
 interface DecodeErrorCallback {
-    (): void;
+    (error: DOMException): void;
 }
 interface FunctionStringCallback {
     (data: string): void;
 }
+interface NavigatorUserMediaSuccessCallback {
+    (stream: MediaStream): void;
+}
+interface NavigatorUserMediaErrorCallback {
+    (error: MediaStreamError): void;
+}
+interface ForEachCallback {
+    (keyId: any, status: string): void;
+}
 declare var Audio: {new(src?: string): HTMLAudioElement; };
 declare var Image: {new(width?: number, height?: number): HTMLImageElement; };
 declare var Option: {new(text?: string, value?: string, defaultSelected?: boolean, selected?: boolean): HTMLOptionElement; };
-declare var animationStartTime: number;
 declare var applicationCache: ApplicationCache;
 declare var clientInformation: Navigator;
 declare var closed: boolean;
@@ -12930,7 +13760,7 @@ declare var length: number;
 declare var location: Location;
 declare var locationbar: BarProp;
 declare var menubar: BarProp;
-declare var msAnimationStartTime: number;
+declare var msCredentials: MSCredentials;
 declare var name: string;
 declare var navigator: Navigator;
 declare var offscreenBuffering: string | boolean;
@@ -12946,6 +13776,7 @@ declare var onclick: (ev: MouseEvent) => any;
 declare var oncompassneedscalibration: (ev: Event) => any;
 declare var oncontextmenu: (ev: PointerEvent) => any;
 declare var ondblclick: (ev: MouseEvent) => any;
+declare var ondevicelight: (ev: DeviceLightEvent) => any;
 declare var ondevicemotion: (ev: DeviceMotionEvent) => any;
 declare var ondeviceorientation: (ev: DeviceOrientationEvent) => any;
 declare var ondrag: (ev: DragEvent) => any;
@@ -12957,11 +13788,12 @@ declare var ondragstart: (ev: DragEvent) => any;
 declare var ondrop: (ev: DragEvent) => any;
 declare var ondurationchange: (ev: Event) => any;
 declare var onemptied: (ev: Event) => any;
-declare var onended: (ev: Event) => any;
+declare var onended: (ev: MediaStreamErrorEvent) => any;
 declare var onerror: ErrorEventHandler;
 declare var onfocus: (ev: FocusEvent) => any;
 declare var onhashchange: (ev: HashChangeEvent) => any;
 declare var oninput: (ev: Event) => any;
+declare var oninvalid: (ev: Event) => any;
 declare var onkeydown: (ev: KeyboardEvent) => any;
 declare var onkeypress: (ev: KeyboardEvent) => any;
 declare var onkeyup: (ev: KeyboardEvent) => any;
@@ -12977,7 +13809,7 @@ declare var onmousemove: (ev: MouseEvent) => any;
 declare var onmouseout: (ev: MouseEvent) => any;
 declare var onmouseover: (ev: MouseEvent) => any;
 declare var onmouseup: (ev: MouseEvent) => any;
-declare var onmousewheel: (ev: MouseWheelEvent) => any;
+declare var onmousewheel: (ev: WheelEvent) => any;
 declare var onmsgesturechange: (ev: MSGestureEvent) => any;
 declare var onmsgesturedoubletap: (ev: MSGestureEvent) => any;
 declare var onmsgestureend: (ev: MSGestureEvent) => any;
@@ -13016,10 +13848,10 @@ declare var onstorage: (ev: StorageEvent) => any;
 declare var onsubmit: (ev: Event) => any;
 declare var onsuspend: (ev: Event) => any;
 declare var ontimeupdate: (ev: Event) => any;
-declare var ontouchcancel: any;
-declare var ontouchend: any;
-declare var ontouchmove: any;
-declare var ontouchstart: any;
+declare var ontouchcancel: (ev: TouchEvent) => any;
+declare var ontouchend: (ev: TouchEvent) => any;
+declare var ontouchmove: (ev: TouchEvent) => any;
+declare var ontouchstart: (ev: TouchEvent) => any;
 declare var onunload: (ev: Event) => any;
 declare var onvolumechange: (ev: Event) => any;
 declare var onwaiting: (ev: Event) => any;
@@ -13047,7 +13879,6 @@ declare var styleMedia: StyleMedia;
 declare var toolbar: BarProp;
 declare var top: Window;
 declare var window: Window;
-declare var URL: URL;
 declare function alert(message?: any): void;
 declare function blur(): void;
 declare function cancelAnimationFrame(handle: number): void;
@@ -13061,12 +13892,9 @@ declare function getSelection(): Selection;
 declare function matchMedia(mediaQuery: string): MediaQueryList;
 declare function moveBy(x?: number, y?: number): void;
 declare function moveTo(x?: number, y?: number): void;
-declare function msCancelRequestAnimationFrame(handle: number): void;
-declare function msMatchMedia(mediaQuery: string): MediaQueryList;
-declare function msRequestAnimationFrame(callback: FrameRequestCallback): number;
 declare function msWriteProfilerMark(profilerMarkName: string): void;
 declare function open(url?: string, target?: string, features?: string, replace?: boolean): Window;
-declare function postMessage(message: any, targetOrigin: string, ports?: any): void;
+declare function postMessage(message: any, targetOrigin: string, transfer?: any[]): void;
 declare function print(): void;
 declare function prompt(message?: string, _default?: string): string;
 declare function releaseEvents(): void;
@@ -13076,19 +13904,19 @@ declare function resizeTo(x?: number, y?: number): void;
 declare function scroll(x?: number, y?: number): void;
 declare function scrollBy(x?: number, y?: number): void;
 declare function scrollTo(x?: number, y?: number): void;
+declare function webkitCancelAnimationFrame(handle: number): void;
 declare function webkitConvertPointFromNodeToPage(node: Node, pt: WebKitPoint): WebKitPoint;
 declare function webkitConvertPointFromPageToNode(node: Node, pt: WebKitPoint): WebKitPoint;
+declare function webkitRequestAnimationFrame(callback: FrameRequestCallback): number;
 declare function toString(): string;
-declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+declare function addEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 declare function dispatchEvent(evt: Event): boolean;
-declare function removeEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+declare function removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 declare function clearInterval(handle: number): void;
 declare function clearTimeout(handle: number): void;
 declare function setInterval(handler: any, timeout?: any, ...args: any[]): number;
 declare function setTimeout(handler: any, timeout?: any, ...args: any[]): number;
 declare function clearImmediate(handle: number): void;
-declare function msClearImmediate(handle: number): void;
-declare function msSetImmediate(expression: any, ...args: any[]): number;
 declare function setImmediate(expression: any, ...args: any[]): number;
 declare var sessionStorage: Storage;
 declare var localStorage: Storage;
@@ -13103,7 +13931,6 @@ declare var onpointerover: (ev: PointerEvent) => any;
 declare var onpointerup: (ev: PointerEvent) => any;
 declare var onwheel: (ev: WheelEvent) => any;
 declare var indexedDB: IDBFactory;
-declare var msIndexedDB: IDBFactory;
 declare function atob(encodedString: string): string;
 declare function btoa(rawString: string): string;
 declare function addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -13133,6 +13960,7 @@ declare function addEventListener(type: "click", listener: (ev: MouseEvent) => a
 declare function addEventListener(type: "compassneedscalibration", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
+declare function addEventListener(type: "devicelight", listener: (ev: DeviceLightEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "devicemotion", listener: (ev: DeviceMotionEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "deviceorientation", listener: (ev: DeviceOrientationEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -13144,10 +13972,11 @@ declare function addEventListener(type: "dragstart", listener: (ev: DragEvent) =
 declare function addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+declare function addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "hashchange", listener: (ev: HashChangeEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+declare function addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -13163,7 +13992,7 @@ declare function addEventListener(type: "mousemove", listener: (ev: MouseEvent)
 declare function addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+declare function addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "offline", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "online", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "orientationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -13199,4 +14028,36 @@ declare function addEventListener(type: "unload", listener: (ev: Event) => any,
 declare function addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
\ No newline at end of file
+declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+type AAGUID = string;
+type AlgorithmIdentifier = string | Algorithm;
+type ConstrainBoolean = boolean | ConstrainBooleanParameters;
+type ConstrainDOMString = string | string[] | ConstrainDOMStringParameters;
+type ConstrainDouble = number | ConstrainDoubleRange;
+type ConstrainLong = number | ConstrainLongRange;
+type CryptoOperationData = ArrayBufferView;
+type GLbitfield = number;
+type GLboolean = boolean;
+type GLbyte = number;
+type GLclampf = number;
+type GLenum = number;
+type GLfloat = number;
+type GLint = number;
+type GLintptr = number;
+type GLshort = number;
+type GLsizei = number;
+type GLsizeiptr = number;
+type GLubyte = number;
+type GLuint = number;
+type GLushort = number;
+type IDBKeyPath = string;
+type KeyFormat = string;
+type KeyType = string;
+type KeyUsage = string;
+type MSInboundPayload = MSVideoRecvPayload | MSAudioRecvPayload;
+type MSLocalClientEvent = MSLocalClientEventBase | MSAudioLocalClientEvent;
+type MSOutboundPayload = MSVideoSendPayload | MSAudioSendPayload;
+type RTCIceGatherCandidate = RTCIceCandidate | RTCIceCandidateComplete;
+type RTCTransport = RTCDtlsTransport | RTCSrtpSdesTransport;
+type payloadtype = number;
+type IDBValidKey = number | string | Date | IDBArrayKey;
\ No newline at end of file
diff --git a/lib/lib.dom.iterable.d.ts b/lib/lib.dom.iterable.d.ts
new file mode 100644
index 00000000000..e9cf451bf49
--- /dev/null
+++ b/lib/lib.dom.iterable.d.ts
@@ -0,0 +1,29 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0  
+ 
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
+MERCHANTABLITY OR NON-INFRINGEMENT. 
+ 
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+/// <reference path="lib.dom.generated.d.ts" />
+
+interface DOMTokenList {
+    [Symbol.iterator](): IterableIterator<string>;
+}
+
+interface NodeList {
+    [Symbol.iterator](): IterableIterator<Node>
+}
+
+interface NodeListOf<TNode extends Node> {
+    [Symbol.iterator](): IterableIterator<TNode>
+}
diff --git a/lib/lib.es2015.collection.d.ts b/lib/lib.es2015.collection.d.ts
new file mode 100644
index 00000000000..b1dbcac592d
--- /dev/null
+++ b/lib/lib.es2015.collection.d.ts
@@ -0,0 +1,86 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0  
+ 
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
+MERCHANTABLITY OR NON-INFRINGEMENT. 
+ 
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+interface Map<K, V> {
+    clear(): void;
+    delete(key: K): boolean;
+    forEach(callbackfn: (value: V, index: K, map: Map<K, V>) => void, thisArg?: any): void;
+    get(key: K): V | undefined;
+    has(key: K): boolean;
+    set(key: K, value?: V): Map<K, V>;
+    readonly size: number;
+}
+
+interface MapConstructor {
+    new (): Map<any, any>;
+    new <K, V>(): Map<K, V>;
+    readonly prototype: Map<any, any>;
+}
+declare var Map: MapConstructor;
+
+interface WeakMap<K, V> {
+    clear(): void;
+    delete(key: K): boolean;
+    get(key: K): V | undefined;
+    has(key: K): boolean;
+    set(key: K, value?: V): WeakMap<K, V>;
+
+}
+
+interface WeakMapConstructor {
+    new (): WeakMap<any, any>;
+    new <K, V>(): WeakMap<K, V>;
+    readonly prototype: WeakMap<any, any>;
+}
+declare var WeakMap: WeakMapConstructor;
+
+interface Set<T> {
+    add(value: T): Set<T>;
+    clear(): void;
+    delete(value: T): boolean;
+    entries(): IterableIterator<[T, T]>;
+    forEach(callbackfn: (value: T, index: T, set: Set<T>) => void, thisArg?: any): void;
+    has(value: T): boolean;
+    keys(): IterableIterator<T>;
+    readonly size: number;
+    values(): IterableIterator<T>;
+    [Symbol.iterator]():IterableIterator<T>;
+    readonly [Symbol.toStringTag]: "Set";
+}
+
+interface SetConstructor {
+    new (): Set<any>;
+    new <T>(): Set<T>;
+    new <T>(iterable: Iterable<T>): Set<T>;
+    readonly prototype: Set<any>;
+}
+declare var Set: SetConstructor;
+
+interface WeakSet<T> {
+    add(value: T): WeakSet<T>;
+    clear(): void;
+    delete(value: T): boolean;
+    has(value: T): boolean;
+    readonly [Symbol.toStringTag]: "WeakSet";
+}
+
+interface WeakSetConstructor {
+    new (): WeakSet<any>;
+    new <T>(): WeakSet<T>;
+    new <T>(iterable: Iterable<T>): WeakSet<T>;
+    readonly prototype: WeakSet<any>;
+}
+declare var WeakSet: WeakSetConstructor;
diff --git a/lib/lib.es2015.core.d.ts b/lib/lib.es2015.core.d.ts
new file mode 100644
index 00000000000..fb6b7b96df5
--- /dev/null
+++ b/lib/lib.es2015.core.d.ts
@@ -0,0 +1,499 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0  
+ 
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
+MERCHANTABLITY OR NON-INFRINGEMENT. 
+ 
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+declare type PropertyKey = string | number | symbol;
+
+interface Array<T> {
+    /** 
+      * Returns the value of the first element in the array where predicate is true, and undefined 
+      * otherwise.
+      * @param predicate find calls predicate once for each element of the array, in ascending 
+      * order, until it finds one where predicate returns true. If such an element is found, find 
+      * immediately returns that element value. Otherwise, find returns undefined.
+      * @param thisArg If provided, it will be used as the this value for each invocation of 
+      * predicate. If it is not provided, undefined is used instead.
+      */
+    find(predicate: (value: T, index: number, obj: Array<T>) => boolean, thisArg?: any): T | undefined;
+
+    /** 
+      * Returns the index of the first element in the array where predicate is true, and undefined 
+      * otherwise.
+      * @param predicate find calls predicate once for each element of the array, in ascending 
+      * order, until it finds one where predicate returns true. If such an element is found, find 
+      * immediately returns that element value. Otherwise, find returns undefined.
+      * @param thisArg If provided, it will be used as the this value for each invocation of 
+      * predicate. If it is not provided, undefined is used instead.
+      */
+    findIndex(predicate: (value: T) => boolean, thisArg?: any): number | undefined;
+
+    /**
+      * Returns the this object after filling the section identified by start and end with value
+      * @param value value to fill array section with
+      * @param start index to start filling the array at. If start is negative, it is treated as 
+      * length+start where length is the length of the array. 
+      * @param end index to stop filling the array at. If end is negative, it is treated as 
+      * length+end.
+      */
+    fill(value: T, start?: number, end?: number): T[];
+
+    /** 
+      * Returns the this object after copying a section of the array identified by start and end
+      * to the same array starting at position target
+      * @param target If target is negative, it is treated as length+target where length is the 
+      * length of the array. 
+      * @param start If start is negative, it is treated as length+start. If end is negative, it 
+      * is treated as length+end.
+      * @param end If not specified, length of the this object is used as its default value. 
+      */
+    copyWithin(target: number, start: number, end?: number): T[];
+}
+
+interface ArrayConstructor {
+    /**
+      * Creates an array from an array-like object.
+      * @param arrayLike An array-like object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from<T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): Array<U>;
+
+
+    /**
+      * Creates an array from an array-like object.
+      * @param arrayLike An array-like object to convert to an array.
+      */
+    from<T>(arrayLike: ArrayLike<T>): Array<T>;
+
+    /**
+      * Returns a new array from a set of elements.
+      * @param items A set of elements to include in the new array object.
+      */
+    of<T>(...items: T[]): Array<T>;
+}
+
+interface Function {
+    /**
+      * Returns the name of the function. Function names are read-only and can not be changed.
+      */
+    readonly name: string;
+}
+
+interface Math {
+    /**
+      * Returns the number of leading zero bits in the 32-bit binary representation of a number.
+      * @param x A numeric expression.
+      */
+    clz32(x: number): number;
+
+    /**
+      * Returns the result of 32-bit multiplication of two numbers.
+      * @param x First number
+      * @param y Second number
+      */
+    imul(x: number, y: number): number;
+
+    /**
+      * Returns the sign of the x, indicating whether x is positive, negative or zero.
+      * @param x The numeric expression to test
+      */
+    sign(x: number): number;
+
+    /**
+      * Returns the base 10 logarithm of a number.
+      * @param x A numeric expression.
+      */
+    log10(x: number): number;
+
+    /**
+      * Returns the base 2 logarithm of a number.
+      * @param x A numeric expression.
+      */
+    log2(x: number): number;
+
+    /**
+      * Returns the natural logarithm of 1 + x.
+      * @param x A numeric expression.
+      */
+    log1p(x: number): number;
+
+    /**
+      * Returns the result of (e^x - 1) of x (e raised to the power of x, where e is the base of 
+      * the natural logarithms).
+      * @param x A numeric expression.
+      */
+    expm1(x: number): number;
+
+    /**
+      * Returns the hyperbolic cosine of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    cosh(x: number): number;
+
+    /**
+      * Returns the hyperbolic sine of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    sinh(x: number): number;
+
+    /**
+      * Returns the hyperbolic tangent of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    tanh(x: number): number;
+
+    /**
+      * Returns the inverse hyperbolic cosine of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    acosh(x: number): number;
+
+    /**
+      * Returns the inverse hyperbolic sine of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    asinh(x: number): number;
+
+    /**
+      * Returns the inverse hyperbolic tangent of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    atanh(x: number): number;
+
+    /**
+      * Returns the square root of the sum of squares of its arguments.
+      * @param values Values to compute the square root for.
+      *     If no arguments are passed, the result is +0.
+      *     If there is only one argument, the result is the absolute value.
+      *     If any argument is +Infinity or -Infinity, the result is +Infinity.
+      *     If any argument is NaN, the result is NaN.
+      *     If all arguments are either +0 or −0, the result is +0.
+      */
+    hypot(...values: number[] ): number;
+
+    /**
+      * Returns the integral part of the a numeric expression, x, removing any fractional digits.
+      * If x is already an integer, the result is x.
+      * @param x A numeric expression.
+      */
+    trunc(x: number): number;
+
+    /**
+      * Returns the nearest single precision float representation of a number.
+      * @param x A numeric expression.
+      */
+    fround(x: number): number;
+
+    /**
+      * Returns an implementation-dependent approximation to the cube root of number.
+      * @param x A numeric expression.
+      */
+    cbrt(x: number): number;
+}
+
+interface NumberConstructor {
+    /**
+      * The value of Number.EPSILON is the difference between 1 and the smallest value greater than 1
+      * that is representable as a Number value, which is approximately: 
+      * 2.2204460492503130808472633361816 x 10‍−‍16.
+      */
+    readonly EPSILON: number;
+
+    /**
+      * Returns true if passed value is finite.
+      * Unlike the global isFininte, Number.isFinite doesn't forcibly convert the parameter to a 
+      * number. Only finite values of the type number, result in true.
+      * @param number A numeric value.
+      */
+    isFinite(number: number): boolean;
+
+    /**
+      * Returns true if the value passed is an integer, false otherwise.
+      * @param number A numeric value.
+      */
+    isInteger(number: number): boolean;
+
+    /**
+      * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a 
+      * number). Unlike the global isNaN(), Number.isNaN() doesn't forcefully convert the parameter
+      * to a number. Only values of the type number, that are also NaN, result in true.
+      * @param number A numeric value.
+      */
+    isNaN(number: number): boolean;
+
+    /**
+      * Returns true if the value passed is a safe integer.
+      * @param number A numeric value.
+      */
+    isSafeInteger(number: number): boolean;
+
+    /** 
+      * The value of the largest integer n such that n and n + 1 are both exactly representable as 
+      * a Number value. 
+      * The value of Number.MIN_SAFE_INTEGER is 9007199254740991 2^53 − 1.
+      */
+    readonly MAX_SAFE_INTEGER: number;
+
+    /** 
+      * The value of the smallest integer n such that n and n − 1 are both exactly representable as 
+      * a Number value. 
+      * The value of Number.MIN_SAFE_INTEGER is −9007199254740991 (−(2^53 − 1)).
+      */
+    readonly MIN_SAFE_INTEGER: number;
+
+    /**
+      * Converts a string to a floating-point number. 
+      * @param string A string that contains a floating-point number. 
+      */
+    parseFloat(string: string): number;
+
+    /**
+      * Converts A string to an integer.
+      * @param s A string to convert into a number.
+      * @param radix A value between 2 and 36 that specifies the base of the number in numString. 
+      * If this argument is not supplied, strings with a prefix of '0x' are considered hexadecimal.
+      * All other strings are considered decimal.
+      */
+    parseInt(string: string, radix?: number): number;
+}
+
+interface Object {
+    /**
+      * Determines whether an object has a property with the specified name. 
+      * @param v A property name.
+      */
+    hasOwnProperty(v: PropertyKey): boolean
+
+    /** 
+      * Determines whether a specified property is enumerable.
+      * @param v A property name.
+      */
+    propertyIsEnumerable(v: PropertyKey): boolean;
+}
+
+interface ObjectConstructor {
+    /**
+      * Copy the values of all of the enumerable own properties from one or more source objects to a 
+      * target object. Returns the target object.
+      * @param target The target object to copy to.
+      * @param source The source object from which to copy properties.
+      */
+    assign<T, U>(target: T, source: U): T & U;
+
+    /**
+      * Copy the values of all of the enumerable own properties from one or more source objects to a 
+      * target object. Returns the target object.
+      * @param target The target object to copy to.
+      * @param source1 The first source object from which to copy properties.
+      * @param source2 The second source object from which to copy properties.
+      */
+    assign<T, U, V>(target: T, source1: U, source2: V): T & U & V;
+
+    /**
+      * Copy the values of all of the enumerable own properties from one or more source objects to a 
+      * target object. Returns the target object.
+      * @param target The target object to copy to.
+      * @param source1 The first source object from which to copy properties.
+      * @param source2 The second source object from which to copy properties.
+      * @param source3 The third source object from which to copy properties.
+      */
+    assign<T, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W;
+
+    /**
+      * Copy the values of all of the enumerable own properties from one or more source objects to a 
+      * target object. Returns the target object.
+      * @param target The target object to copy to.
+      * @param sources One or more source objects from which to copy properties
+      */
+    assign(target: any, ...sources: any[]): any;
+
+    /**
+      * Returns an array of all symbol properties found directly on object o.
+      * @param o Object to retrieve the symbols from.
+      */
+    getOwnPropertySymbols(o: any): symbol[];
+
+    /**
+      * Returns true if the values are the same value, false otherwise.
+      * @param value1 The first value.
+      * @param value2 The second value.
+      */
+    is(value1: any, value2: any): boolean;
+
+    /**
+      * Sets the prototype of a specified object o to  object proto or null. Returns the object o.
+      * @param o The object to change its prototype.
+      * @param proto The value of the new prototype or null.
+      */
+    setPrototypeOf(o: any, proto: any): any;
+
+    /**
+      * Gets the own property descriptor of the specified object. 
+      * An own property descriptor is one that is defined directly on the object and is not 
+      * inherited from the object's prototype. 
+      * @param o Object that contains the property.
+      * @param p Name of the property.
+    */
+    getOwnPropertyDescriptor(o: any, propertyKey: PropertyKey): PropertyDescriptor;
+
+    /**
+      * Adds a property to an object, or modifies attributes of an existing property. 
+      * @param o Object on which to add or modify the property. This can be a native JavaScript 
+      * object (that is, a user-defined object or a built in object) or a DOM object.
+      * @param p The property name.
+      * @param attributes Descriptor for the property. It can be for a data property or an accessor
+      *  property.
+      */
+    defineProperty(o: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): any;
+}
+
+interface RegExp {
+    /**
+      * Returns a string indicating the flags of the regular expression in question. This field is read-only.
+      * The characters in this string are sequenced and concatenated in the following order:
+      *
+      *    - "g" for global
+      *    - "i" for ignoreCase
+      *    - "m" for multiline
+      *    - "u" for unicode
+      *    - "y" for sticky
+      *
+      * If no flags are set, the value is the empty string.
+      */
+    readonly flags: string;
+
+    /** 
+      * Returns a Boolean value indicating the state of the sticky flag (y) used with a regular 
+      * expression. Default is false. Read-only. 
+      */
+    readonly sticky: boolean;
+
+    /** 
+      * Returns a Boolean value indicating the state of the Unicode flag (u) used with a regular 
+      * expression. Default is false. Read-only. 
+      */
+    readonly unicode: boolean;
+}
+
+interface String {
+    /**
+      * Returns a nonnegative integer Number less than 1114112 (0x110000) that is the code point 
+      * value of the UTF-16 encoded code point starting at the string element at position pos in 
+      * the String resulting from converting this object to a String. 
+      * If there is no element at that position, the result is undefined. 
+      * If a valid UTF-16 surrogate pair does not begin at pos, the result is the code unit at pos.
+      */
+    codePointAt(pos: number): number | undefined;
+
+    /**
+      * Returns true if searchString appears as a substring of the result of converting this 
+      * object to a String, at one or more positions that are 
+      * greater than or equal to position; otherwise, returns false.
+      * @param searchString search string 
+      * @param position If position is undefined, 0 is assumed, so as to search all of the String.
+      */
+    includes(searchString: string, position?: number): boolean;
+
+    /**
+      * Returns true if the sequence of elements of searchString converted to a String is the 
+      * same as the corresponding elements of this object (converted to a String) starting at 
+      * endPosition – length(this). Otherwise returns false.
+      */
+    endsWith(searchString: string, endPosition?: number): boolean;
+
+    /**
+      * Returns the String value result of normalizing the string into the normalization form 
+      * named by form as specified in Unicode Standard Annex #15, Unicode Normalization Forms.
+      * @param form Applicable values: "NFC", "NFD", "NFKC", or "NFKD", If not specified default
+      * is "NFC"
+      */
+    normalize(form?: string): string;
+
+    /**
+      * Returns a String value that is made from count copies appended together. If count is 0, 
+      * T is the empty String is returned.
+      * @param count number of copies to append
+      */
+    repeat(count: number): string;
+
+    /**
+      * Returns true if the sequence of elements of searchString converted to a String is the 
+      * same as the corresponding elements of this object (converted to a String) starting at 
+      * position. Otherwise returns false.
+      */
+    startsWith(searchString: string, position?: number): boolean;
+
+    /**
+      * Returns an <a> HTML anchor element and sets the name attribute to the text value
+      * @param name
+      */
+    anchor(name: string): string;
+
+    /** Returns a <big> HTML element */
+    big(): string;
+
+    /** Returns a <blink> HTML element */
+    blink(): string;
+
+    /** Returns a <b> HTML element */
+    bold(): string;
+
+    /** Returns a <tt> HTML element */
+    fixed(): string
+
+    /** Returns a <font> HTML element and sets the color attribute value */
+    fontcolor(color: string): string
+
+    /** Returns a <font> HTML element and sets the size attribute value */
+    fontsize(size: number): string;
+
+    /** Returns a <font> HTML element and sets the size attribute value */
+    fontsize(size: string): string;
+
+    /** Returns an <i> HTML element */
+    italics(): string;
+
+    /** Returns an <a> HTML element and sets the href attribute value */
+    link(url: string): string;
+
+    /** Returns a <small> HTML element */
+    small(): string;
+
+    /** Returns a <strike> HTML element */
+    strike(): string;
+
+    /** Returns a <sub> HTML element */
+    sub(): string;
+
+    /** Returns a <sup> HTML element */
+    sup(): string;
+}
+
+interface StringConstructor {
+    /**
+      * Return the String value whose elements are, in order, the elements in the List elements.
+      * If length is 0, the empty string is returned.
+      */
+    fromCodePoint(...codePoints: number[]): string;
+
+    /**
+      * String.raw is intended for use as a tag function of a Tagged Template String. When called
+      * as such the first argument will be a well formed template call site object and the rest 
+      * parameter will contain the substitution values.
+      * @param template A well-formed template string call site representation.
+      * @param substitutions A set of substitution values.
+      */
+    raw(template: TemplateStringsArray, ...substitutions: any[]): string;
+}
\ No newline at end of file
diff --git a/lib/lib.es2015.d.ts b/lib/lib.es2015.d.ts
new file mode 100644
index 00000000000..973d5180989
--- /dev/null
+++ b/lib/lib.es2015.d.ts
@@ -0,0 +1,26 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0  
+ 
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
+MERCHANTABLITY OR NON-INFRINGEMENT. 
+ 
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+/// <reference path="lib.es2015.core.d.ts" />
+/// <reference path="lib.es2015.collection.d.ts" />
+/// <reference path="lib.es2015.generator.d.ts" />
+/// <reference path="lib.es2015.iterable.d.ts" />
+/// <reference path="lib.es2015.promise.d.ts" />
+/// <reference path="lib.es2015.proxy.d.ts" />
+/// <reference path="lib.es2015.reflect.d.ts" />
+/// <reference path="lib.es2015.symbol.d.ts" />
+/// <reference path="lib.es2015.symbol.wellknown.d.ts" />
+/// <reference path="lib.es5.d.ts" />
\ No newline at end of file
diff --git a/lib/lib.es2015.generator.d.ts b/lib/lib.es2015.generator.d.ts
new file mode 100644
index 00000000000..003f325e4e0
--- /dev/null
+++ b/lib/lib.es2015.generator.d.ts
@@ -0,0 +1,28 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0  
+ 
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
+MERCHANTABLITY OR NON-INFRINGEMENT. 
+ 
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+interface GeneratorFunction extends Function { }
+
+interface GeneratorFunctionConstructor {
+    /**
+      * Creates a new Generator function.
+      * @param args A list of arguments the function accepts.
+      */
+    new (...args: string[]): GeneratorFunction;
+    (...args: string[]): GeneratorFunction;
+    readonly prototype: GeneratorFunction;
+}
+declare var GeneratorFunction: GeneratorFunctionConstructor;
diff --git a/lib/lib.es2015.iterable.d.ts b/lib/lib.es2015.iterable.d.ts
new file mode 100644
index 00000000000..ef8b99309af
--- /dev/null
+++ b/lib/lib.es2015.iterable.d.ts
@@ -0,0 +1,389 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0  
+ 
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
+MERCHANTABLITY OR NON-INFRINGEMENT. 
+ 
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+/// <reference path="lib.es2015.symbol.d.ts" />
+
+interface IteratorResult<T> {
+    done: boolean;
+    value?: T;
+}
+
+interface Iterator<T> {
+    next(value?: any): IteratorResult<T>;
+    return?(value?: any): IteratorResult<T>;
+    throw?(e?: any): IteratorResult<T>;
+}
+
+interface Iterable<T> { }
+
+interface IterableIterator<T> extends Iterator<T> { }
+
+interface Array<T> {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, T]>;
+
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<T>;
+}
+
+interface ArrayConstructor {
+    /**
+      * Creates an array from an iterable object.
+      * @param iterable An iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from<T, U>(iterable: Iterable<T>, mapfn: (v: T, k: number) => U, thisArg?: any): Array<U>;
+    
+    /**
+      * Creates an array from an iterable object.
+      * @param iterable An iterable object to convert to an array.
+      */
+    from<T>(iterable: Iterable<T>): Array<T>;
+}
+
+interface Map<K, V> {
+    entries(): IterableIterator<[K, V]>;
+    keys(): IterableIterator<K>;
+    values(): IterableIterator<V>;
+}
+
+interface MapConstructor {
+    new <K, V>(iterable: Iterable<[K, V]>): Map<K, V>;
+}
+
+interface WeakMap<K, V> { }
+
+interface WeakMapConstructor {
+    new <K, V>(iterable: Iterable<[K, V]>): WeakMap<K, V>;
+}
+
+interface Promise<T> { }
+
+interface PromiseConstructor {
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises 
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<TAll>(values: Iterable<TAll | PromiseLike<TAll>>): Promise<TAll[]>;
+    
+    /**
+     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved 
+     * or rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    race<T>(values: Iterable<T | PromiseLike<T>>): Promise<T>;
+}
+
+declare namespace Reflect {
+    function enumerate(target: any): IterableIterator<any>;
+}
+
+/**
+  * A typed array of 8-bit integer values. The contents are initialized to 0. If the requested 
+  * number of bytes could not be allocated an exception is raised.
+  */
+interface Int8Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Int8ArrayConstructor {
+    new (elements: Iterable<number>): Int8Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int8Array;
+}
+
+/**
+  * A typed array of 8-bit unsigned integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint8Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Uint8ArrayConstructor {
+    new (elements: Iterable<number>): Uint8Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8Array;
+}
+
+/**
+  * A typed array of 8-bit unsigned integer (clamped) values. The contents are initialized to 0. 
+  * If the requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint8ClampedArray {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Uint8ClampedArrayConstructor {
+    new (elements: Iterable<number>): Uint8ClampedArray;
+
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8ClampedArray;
+}
+
+/**
+  * A typed array of 16-bit signed integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Int16Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Int16ArrayConstructor {
+    new (elements: Iterable<number>): Int16Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int16Array;
+}
+
+/**
+  * A typed array of 16-bit unsigned integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint16Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Uint16ArrayConstructor {
+    new (elements: Iterable<number>): Uint16Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint16Array;
+}
+
+/**
+  * A typed array of 32-bit signed integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Int32Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Int32ArrayConstructor {
+    new (elements: Iterable<number>): Int32Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int32Array;
+}
+
+/**
+  * A typed array of 32-bit unsigned integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint32Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Uint32ArrayConstructor {
+    new (elements: Iterable<number>): Uint32Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint32Array;
+}
+
+/**
+  * A typed array of 32-bit float values. The contents are initialized to 0. If the requested number
+  * of bytes could not be allocated an exception is raised.
+  */
+interface Float32Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Float32ArrayConstructor {
+    new (elements: Iterable<number>): Float32Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float32Array;
+}
+
+/**
+  * A typed array of 64-bit float values. The contents are initialized to 0. If the requested 
+  * number of bytes could not be allocated an exception is raised.
+  */
+interface Float64Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Float64ArrayConstructor {
+    new (elements: Iterable<number>): Float64Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float64Array;
+}
\ No newline at end of file
diff --git a/lib/lib.es2015.promise.d.ts b/lib/lib.es2015.promise.d.ts
new file mode 100644
index 00000000000..4817121154f
--- /dev/null
+++ b/lib/lib.es2015.promise.d.ts
@@ -0,0 +1,97 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0  
+ 
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
+MERCHANTABLITY OR NON-INFRINGEMENT. 
+ 
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+/**
+ * Represents the completion of an asynchronous operation
+ */
+interface Promise<T> {
+    /**
+    * Attaches callbacks for the resolution and/or rejection of the Promise.
+    * @param onfulfilled The callback to execute when the Promise is resolved.
+    * @param onrejected The callback to execute when the Promise is rejected.
+    * @returns A Promise for the completion of which ever callback is executed.
+    */
+    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>;
+    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): Promise<TResult>;
+
+    /**
+     * Attaches a callback for only the rejection of the Promise.
+     * @param onrejected The callback to execute when the Promise is rejected.
+     * @returns A Promise for the completion of the callback.
+     */
+    catch(onrejected?: (reason: any) => T | PromiseLike<T>): Promise<T>;
+    catch(onrejected?: (reason: any) => void): Promise<T>;
+}
+
+interface PromiseConstructor {
+    /** 
+      * A reference to the prototype. 
+      */
+    readonly prototype: Promise<any>;
+
+    /**
+     * Creates a new Promise.
+     * @param executor A callback used to initialize the promise. This callback is passed two arguments: 
+     * a resolve callback used resolve the promise with a value or the result of another promise, 
+     * and a reject callback used to reject the promise with a provided reason or error.
+     */
+    new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
+
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises 
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>, T10 | PromiseLike<T10>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>;
+    all<T1, T2, T3, T4, T5, T6, T7, T8, T9>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>;
+    all<T1, T2, T3, T4, T5, T6, T7, T8>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8]>;
+    all<T1, T2, T3, T4, T5, T6, T7>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>]): Promise<[T1, T2, T3, T4, T5, T6, T7]>;
+    all<T1, T2, T3, T4, T5, T6>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>]): Promise<[T1, T2, T3, T4, T5, T6]>;
+    all<T1, T2, T3, T4, T5>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>]): Promise<[T1, T2, T3, T4, T5]>;
+    all<T1, T2, T3, T4>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>]): Promise<[T1, T2, T3, T4]>;
+    all<T1, T2, T3>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>]): Promise<[T1, T2, T3]>;
+    all<T1, T2>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>]): Promise<[T1, T2]>;
+
+    /**
+     * Creates a new rejected promise for the provided reason.
+     * @param reason The reason the promise was rejected.
+     * @returns A new rejected Promise.
+     */
+    reject(reason: any): Promise<void>;
+
+    /**
+     * Creates a new rejected promise for the provided reason.
+     * @param reason The reason the promise was rejected.
+     * @returns A new rejected Promise.
+     */
+    reject<T>(reason: any): Promise<T>;
+
+    /**
+      * Creates a new resolved promise for the provided value.
+      * @param value A promise.
+      * @returns A promise whose internal state matches the provided promise.
+      */
+    resolve<T>(value: T | PromiseLike<T>): Promise<T>;
+
+    /**
+     * Creates a new resolved promise .
+     * @returns A resolved promise.
+     */
+    resolve(): Promise<void>;
+}
+
+declare var Promise: PromiseConstructor;
\ No newline at end of file
diff --git a/lib/lib.es2015.proxy.d.ts b/lib/lib.es2015.proxy.d.ts
new file mode 100644
index 00000000000..3908e97c17c
--- /dev/null
+++ b/lib/lib.es2015.proxy.d.ts
@@ -0,0 +1,38 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0  
+ 
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
+MERCHANTABLITY OR NON-INFRINGEMENT. 
+ 
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+interface ProxyHandler<T> {
+    getPrototypeOf? (target: T): any;
+    setPrototypeOf? (target: T, v: any): boolean;
+    isExtensible? (target: T): boolean;
+    preventExtensions? (target: T): boolean;
+    getOwnPropertyDescriptor? (target: T, p: PropertyKey): PropertyDescriptor;
+    has? (target: T, p: PropertyKey): boolean;
+    get? (target: T, p: PropertyKey, receiver: any): any;
+    set? (target: T, p: PropertyKey, value: any, receiver: any): boolean;
+    deleteProperty? (target: T, p: PropertyKey): boolean;
+    defineProperty? (target: T, p: PropertyKey, attributes: PropertyDescriptor): boolean;
+    enumerate? (target: T): PropertyKey[];
+    ownKeys? (target: T): PropertyKey[];
+    apply? (target: T, thisArg: any, argArray?: any): any;
+    construct? (target: T, thisArg: any, argArray?: any): any;
+}
+
+interface ProxyConstructor {
+    revocable<T>(target: T, handler: ProxyHandler<T>): { proxy: T; revoke: () => void; };
+    new <T>(target: T, handler: ProxyHandler<T>): T
+}
+declare var Proxy: ProxyConstructor;
\ No newline at end of file
diff --git a/lib/lib.es2015.reflect.d.ts b/lib/lib.es2015.reflect.d.ts
new file mode 100644
index 00000000000..c53cdaf88ac
--- /dev/null
+++ b/lib/lib.es2015.reflect.d.ts
@@ -0,0 +1,32 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0  
+ 
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
+MERCHANTABLITY OR NON-INFRINGEMENT. 
+ 
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+declare namespace Reflect {
+    function apply(target: Function, thisArgument: any, argumentsList: ArrayLike<any>): any;
+    function construct(target: Function, argumentsList: ArrayLike<any>, newTarget?: any): any;
+    function defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean;
+    function deleteProperty(target: any, propertyKey: PropertyKey): boolean;
+    function get(target: any, propertyKey: PropertyKey, receiver?: any): any;
+    function getOwnPropertyDescriptor(target: any, propertyKey: PropertyKey): PropertyDescriptor;
+    function getPrototypeOf(target: any): any;
+    function has(target: any, propertyKey: string): boolean;
+    function has(target: any, propertyKey: symbol): boolean;
+    function isExtensible(target: any): boolean;
+    function ownKeys(target: any): Array<PropertyKey>;
+    function preventExtensions(target: any): boolean;
+    function set(target: any, propertyKey: PropertyKey, value: any, receiver?: any): boolean;
+    function setPrototypeOf(target: any, proto: any): boolean;
+}
\ No newline at end of file
diff --git a/lib/lib.es2015.symbol.d.ts b/lib/lib.es2015.symbol.d.ts
new file mode 100644
index 00000000000..4ab7b4374f1
--- /dev/null
+++ b/lib/lib.es2015.symbol.d.ts
@@ -0,0 +1,52 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0  
+ 
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
+MERCHANTABLITY OR NON-INFRINGEMENT. 
+ 
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+interface Symbol {
+    /** Returns a string representation of an object. */
+    toString(): string;
+
+    /** Returns the primitive value of the specified object. */
+    valueOf(): Object;
+}
+
+interface SymbolConstructor {
+    /** 
+      * A reference to the prototype. 
+      */
+    readonly prototype: Symbol;
+
+    /**
+      * Returns a new unique Symbol value.
+      * @param  description Description of the new Symbol object.
+      */
+    (description?: string|number): symbol;
+
+    /**
+      * Returns a Symbol object from the global symbol registry matching the given key if found. 
+      * Otherwise, returns a new symbol with this key.
+      * @param key key to search for.
+      */
+    for(key: string): symbol;
+
+    /**
+      * Returns a key from the global symbol registry matching the given Symbol if found. 
+      * Otherwise, returns a undefined.
+      * @param sym Symbol to find the key for.
+      */
+    keyFor(sym: symbol): string | undefined;
+}
+
+declare var Symbol: SymbolConstructor;
\ No newline at end of file
diff --git a/lib/lib.es2015.symbol.wellknown.d.ts b/lib/lib.es2015.symbol.wellknown.d.ts
new file mode 100644
index 00000000000..f266301dc23
--- /dev/null
+++ b/lib/lib.es2015.symbol.wellknown.d.ts
@@ -0,0 +1,372 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0  
+ 
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
+MERCHANTABLITY OR NON-INFRINGEMENT. 
+ 
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+/// <reference path="lib.es2015.symbol.d.ts" />
+
+interface SymbolConstructor {
+    /** 
+      * A method that determines if a constructor object recognizes an object as one of the 
+      * constructor’s instances. Called by the semantics of the instanceof operator. 
+      */
+    readonly hasInstance: symbol;
+
+    /** 
+      * A Boolean value that if true indicates that an object should flatten to its array elements
+      * by Array.prototype.concat.
+      */
+    readonly isConcatSpreadable: symbol;
+
+    /** 
+      * A method that returns the default iterator for an object. Called by the semantics of the 
+      * for-of statement.
+      */
+    readonly iterator: symbol;
+
+    /**
+      * A regular expression method that matches the regular expression against a string. Called 
+      * by the String.prototype.match method. 
+      */
+    readonly match: symbol;
+
+    /** 
+      * A regular expression method that replaces matched substrings of a string. Called by the 
+      * String.prototype.replace method.
+      */
+    readonly replace: symbol;
+
+    /**
+      * A regular expression method that returns the index within a string that matches the 
+      * regular expression. Called by the String.prototype.search method.
+      */
+    readonly search: symbol;
+
+    /** 
+      * A function valued property that is the constructor function that is used to create 
+      * derived objects.
+      */
+    readonly species: symbol;
+
+    /**
+      * A regular expression method that splits a string at the indices that match the regular 
+      * expression. Called by the String.prototype.split method.
+      */
+    readonly split: symbol;
+
+    /** 
+      * A method that converts an object to a corresponding primitive value.
+      * Called by the ToPrimitive abstract operation.
+      */
+    readonly toPrimitive: symbol;
+
+    /** 
+      * A String value that is used in the creation of the default string description of an object.
+      * Called by the built-in method Object.prototype.toString.
+      */
+    readonly toStringTag: symbol;
+
+    /**
+      * An Object whose own property names are property names that are excluded from the 'with'
+      * environment bindings of the associated objects.
+      */
+    readonly unscopables: symbol;
+}
+
+interface Symbol {
+    readonly [Symbol.toStringTag]: "Symbol";
+}
+
+interface Array<T> {
+    /** Iterator */
+    [Symbol.iterator](): IterableIterator<T>;
+
+    /**
+     * Returns an object whose properties have the value 'true'
+     * when they will be absent when used in a 'with' statement.
+     */
+    [Symbol.unscopables](): {
+        copyWithin: boolean;
+        entries: boolean;
+        fill: boolean;
+        find: boolean;
+        findIndex: boolean;
+        keys: boolean;
+        values: boolean;
+    };
+}
+
+interface Date {
+    /**
+     * Converts a Date object to a string.
+     */
+    [Symbol.toPrimitive](hint: "default"): string;
+    /**
+     * Converts a Date object to a string.
+     */
+    [Symbol.toPrimitive](hint: "string"): string;
+    /**
+     * Converts a Date object to a number.
+     */
+    [Symbol.toPrimitive](hint: "number"): number;
+    /**
+     * Converts a Date object to a string or number.
+     *
+     * @param hint The strings "number", "string", or "default" to specify what primitive to return.
+     *
+     * @throws {TypeError} If 'hint' was given something other than "number", "string", or "default".
+     * @returns A number if 'hint' was "number", a string if 'hint' was "string" or "default".
+     */
+    [Symbol.toPrimitive](hint: string): string | number;
+}
+
+interface Map<K, V> {
+    [Symbol.iterator]():IterableIterator<[K,V]>;
+    readonly [Symbol.toStringTag]: "Map";
+}
+
+interface WeakMap<K, V>{
+    readonly [Symbol.toStringTag]: "WeakMap";
+}
+
+interface JSON {
+    readonly [Symbol.toStringTag]: "JSON";
+}
+
+interface Function {
+    /**
+     * Determines whether the given value inherits from this function if this function was used
+     * as a constructor function.
+     *
+     * A constructor function can control which objects are recognized as its instances by
+     * 'instanceof' by overriding this method.
+     */
+    [Symbol.hasInstance](value: any): boolean;
+}
+
+interface GeneratorFunction extends Function {
+    readonly [Symbol.toStringTag]: "GeneratorFunction";
+}
+
+interface IArguments {
+    /** Iterator */
+    [Symbol.iterator](): IterableIterator<any>;
+}
+
+interface Iterator<T> { }
+
+interface Iterable<T> {
+    [Symbol.iterator](): Iterator<T>;
+}
+
+interface IterableIterator<T> extends Iterator<T> {
+    [Symbol.iterator](): IterableIterator<T>;
+}
+
+interface Math {
+    readonly [Symbol.toStringTag]: "Math";
+}
+
+interface Promise<T> {
+    readonly [Symbol.toStringTag]: "Promise";
+}
+
+interface PromiseConstructor {
+    readonly [Symbol.species]: Function;
+}
+
+interface RegExp {
+        /**
+      * Matches a string with this regular expression, and returns an array containing the results of
+      * that search.
+      * @param string A string to search within.
+      */
+    [Symbol.match](string: string): RegExpMatchArray | null;
+
+    /**
+      * Replaces text in a string, using this regular expression.
+      * @param string A String object or string literal whose contents matching against
+      *               this regular expression will be replaced
+      * @param replaceValue A String object or string literal containing the text to replace for every 
+      *                     successful match of this regular expression.
+      */
+    [Symbol.replace](string: string, replaceValue: string): string;
+
+    /**
+      * Replaces text in a string, using this regular expression.
+      * @param string A String object or string literal whose contents matching against
+      *               this regular expression will be replaced
+      * @param replacer A function that returns the replacement text.
+      */
+    [Symbol.replace](string: string, replacer: (substring: string, ...args: any[]) => string): string;
+
+    /**
+      * Finds the position beginning first substring match in a regular expression search
+      * using this regular expression.
+      *
+      * @param string The string to search within.
+      */
+    [Symbol.search](string: string): number;
+
+    /**
+      * Returns an array of substrings that were delimited by strings in the original input that
+      * match against this regular expression.
+      *
+      * If the regular expression contains capturing parentheses, then each time this
+      * regular expression matches, the results (including any undefined results) of the
+      * capturing parentheses are spliced.
+      *
+      * @param string string value to split
+      * @param limit if not undefined, the output array is truncated so that it contains no more
+      * than 'limit' elements.
+      */
+    [Symbol.split](string: string, limit?: number): string[];
+}
+
+interface RegExpConstructor {
+    [Symbol.species](): RegExpConstructor;
+}
+
+interface String {
+    /** Iterator */
+    [Symbol.iterator](): IterableIterator<string>;
+   
+    /**
+      * Matches a string an object that supports being matched against, and returns an array containing the results of that search.
+      * @param matcher An object that supports being matched against.
+      */
+    match(matcher: { [Symbol.match](string: string): RegExpMatchArray | null; }): RegExpMatchArray | null;
+
+    /**
+      * Replaces text in a string, using an object that supports replacement within a string.
+      * @param searchValue A object can search for and replace matches within a string.
+      * @param replaceValue A string containing the text to replace for every successful match of searchValue in this string.
+      */
+    replace(searchValue: { [Symbol.replace](string: string, replaceValue: string): string; }, replaceValue: string): string;
+
+    /**
+      * Replaces text in a string, using an object that supports replacement within a string.
+      * @param searchValue A object can search for and replace matches within a string.
+      * @param replacer A function that returns the replacement text.
+      */
+    replace(searchValue: { [Symbol.replace](string: string, replacer: (substring: string, ...args: any[]) => string): string; }, replacer: (substring: string, ...args: any[]) => string): string;
+
+    /**
+      * Finds the first substring match in a regular expression search.
+      * @param searcher An object which supports searching within a string.
+      */
+    search(searcher: { [Symbol.search](string: string): number; }): number;
+
+    /**
+      * Split a string into substrings using the specified separator and return them as an array.
+      * @param splitter An object that can split a string.
+      * @param limit A value used to limit the number of elements returned in the array.
+      */
+    split(splitter: { [Symbol.split](string: string, limit?: number): string[]; }, limit?: number): string[];
+}
+
+/**
+  * Represents a raw buffer of binary data, which is used to store data for the 
+  * different typed arrays. ArrayBuffers cannot be read from or written to directly, 
+  * but can be passed to a typed array or DataView Object to interpret the raw 
+  * buffer as needed. 
+  */
+interface ArrayBuffer {
+    readonly [Symbol.toStringTag]: "ArrayBuffer";
+}
+
+interface DataView {
+    readonly [Symbol.toStringTag]: "DataView";
+}
+
+/**
+  * A typed array of 8-bit integer values. The contents are initialized to 0. If the requested 
+  * number of bytes could not be allocated an exception is raised.
+  */
+interface Int8Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "Int8Array";
+}
+
+/**
+  * A typed array of 8-bit unsigned integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint8Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "UInt8Array";
+}
+
+/**
+  * A typed array of 8-bit unsigned integer (clamped) values. The contents are initialized to 0. 
+  * If the requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint8ClampedArray {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "Uint8ClampedArray";
+}
+
+/**
+  * A typed array of 16-bit signed integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Int16Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "Int16Array";
+}
+
+/**
+  * A typed array of 16-bit unsigned integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint16Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "Uint16Array";
+}
+
+/**
+  * A typed array of 32-bit signed integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Int32Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "Int32Array";
+}
+
+/**
+  * A typed array of 32-bit unsigned integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint32Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "Uint32Array";
+}
+
+/**
+  * A typed array of 32-bit float values. The contents are initialized to 0. If the requested number
+  * of bytes could not be allocated an exception is raised.
+  */
+interface Float32Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "Float32Array";
+}
+
+/**
+  * A typed array of 64-bit float values. The contents are initialized to 0. If the requested 
+  * number of bytes could not be allocated an exception is raised.
+  */
+interface Float64Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "Float64Array";
+}
\ No newline at end of file
diff --git a/lib/lib.es2016.array.include.d.ts b/lib/lib.es2016.array.include.d.ts
new file mode 100644
index 00000000000..a4677e7cf1e
--- /dev/null
+++ b/lib/lib.es2016.array.include.d.ts
@@ -0,0 +1,105 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0  
+ 
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
+MERCHANTABLITY OR NON-INFRINGEMENT. 
+ 
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+interface Array<T> {
+    /**
+      * Determines whether an array includes a certain element, returning true or false as appropriate.
+      * @param searchElement The element to search for.
+      * @param fromIndex The position in this array at which to begin searching for searchElement.
+      */
+    includes(searchElement: T, fromIndex?: number): boolean;
+}
+
+interface Int8Array {
+    /**
+      * Determines whether an array includes a certain element, returning true or false as appropriate.
+      * @param searchElement The element to search for.
+      * @param fromIndex The position in this array at which to begin searching for searchElement.
+      */
+    includes(searchElement: number, fromIndex?: number): boolean;
+}
+
+interface Uint8Array {
+    /**
+      * Determines whether an array includes a certain element, returning true or false as appropriate.
+      * @param searchElement The element to search for.
+      * @param fromIndex The position in this array at which to begin searching for searchElement.
+      */
+    includes(searchElement: number, fromIndex?: number): boolean;
+}
+
+interface Uint8ClampedArray {
+    /**
+      * Determines whether an array includes a certain element, returning true or false as appropriate.
+      * @param searchElement The element to search for.
+      * @param fromIndex The position in this array at which to begin searching for searchElement.
+      */
+    includes(searchElement: number, fromIndex?: number): boolean;
+}
+
+interface Int16Array {
+    /**
+      * Determines whether an array includes a certain element, returning true or false as appropriate.
+      * @param searchElement The element to search for.
+      * @param fromIndex The position in this array at which to begin searching for searchElement.
+      */
+    includes(searchElement: number, fromIndex?: number): boolean;
+}
+
+interface Uint16Array {
+    /**
+      * Determines whether an array includes a certain element, returning true or false as appropriate.
+      * @param searchElement The element to search for.
+      * @param fromIndex The position in this array at which to begin searching for searchElement.
+      */
+    includes(searchElement: number, fromIndex?: number): boolean;
+}
+
+interface Int32Array {
+    /**
+      * Determines whether an array includes a certain element, returning true or false as appropriate.
+      * @param searchElement The element to search for.
+      * @param fromIndex The position in this array at which to begin searching for searchElement.
+      */
+    includes(searchElement: number, fromIndex?: number): boolean;
+}
+
+interface Uint32Array {
+    /**
+      * Determines whether an array includes a certain element, returning true or false as appropriate.
+      * @param searchElement The element to search for.
+      * @param fromIndex The position in this array at which to begin searching for searchElement.
+      */
+    includes(searchElement: number, fromIndex?: number): boolean;
+}
+
+interface Float32Array {
+    /**
+      * Determines whether an array includes a certain element, returning true or false as appropriate.
+      * @param searchElement The element to search for.
+      * @param fromIndex The position in this array at which to begin searching for searchElement.
+      */
+    includes(searchElement: number, fromIndex?: number): boolean;
+}
+
+interface Float64Array {
+    /**
+      * Determines whether an array includes a certain element, returning true or false as appropriate.
+      * @param searchElement The element to search for.
+      * @param fromIndex The position in this array at which to begin searching for searchElement.
+      */
+    includes(searchElement: number, fromIndex?: number): boolean;
+}
\ No newline at end of file
diff --git a/lib/lib.es2016.d.ts b/lib/lib.es2016.d.ts
new file mode 100644
index 00000000000..04a23379676
--- /dev/null
+++ b/lib/lib.es2016.d.ts
@@ -0,0 +1,18 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0  
+ 
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
+MERCHANTABLITY OR NON-INFRINGEMENT. 
+ 
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+/// <reference path="lib.es2015.d.ts" />
+/// <reference path="lib.es2016.array.include.d.ts" />
\ No newline at end of file
diff --git a/lib/lib.core.d.ts b/lib/lib.es5.d.ts
similarity index 86%
rename from lib/lib.core.d.ts
rename to lib/lib.es5.d.ts
index 145564d7044..8ea19d2b9ea 100644
--- a/lib/lib.core.d.ts
+++ b/lib/lib.es5.d.ts
@@ -18,8 +18,8 @@ and limitations under the License.
 /// ECMAScript APIs
 /////////////////////////////
 
-declare var NaN: number;
-declare var Infinity: number;
+declare const NaN: number;
+declare const Infinity: number;
 
 /**
   * Evaluates JavaScript code and executes it. 
@@ -129,7 +129,7 @@ interface ObjectConstructor {
     (value: any): any;
 
     /** A reference to the prototype for a class of objects. */
-    prototype: Object;
+    readonly prototype: Object;
 
     /** 
       * Returns the prototype of an object. 
@@ -220,7 +220,7 @@ interface ObjectConstructor {
 /**
   * Provides functionality common to all JavaScript objects.
   */
-declare var Object: ObjectConstructor;
+declare const Object: ObjectConstructor;
 
 /**
   * Creates a new function.
@@ -231,14 +231,16 @@ interface Function {
       * @param thisArg The object to be used as the this object.
       * @param argArray A set of arguments to be passed to the function.
       */
-    apply(thisArg: any, argArray?: any): any;
+    apply<T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U;
+    apply(this: Function, thisArg: any, argArray?: any): any;
 
     /**
       * Calls a method of an object, substituting another object for the current object.
       * @param thisArg The object to be used as the current object.
       * @param argArray A list of arguments to be passed to the method.
       */
-    call(thisArg: any, ...argArray: any[]): any;
+    call<T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): U;
+    call(this: Function, thisArg: any, ...argArray: any[]): any;
 
     /**
       * For a given function, creates a bound function that has the same body as the original function. 
@@ -246,10 +248,11 @@ interface Function {
       * @param thisArg An object to which the this keyword can refer inside the new function.
       * @param argArray A list of arguments to be passed to the new function.
       */
-    bind(thisArg: any, ...argArray: any[]): any;
+    bind<T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): (this: void, ...argArray: any[]) => U;
+    bind(this: Function, thisArg: any, ...argArray: any[]): any;
 
     prototype: any;
-    length: number;
+    readonly length: number;
 
     // Non-standard extensions
     arguments: any;
@@ -263,10 +266,10 @@ interface FunctionConstructor {
       */
     new (...args: string[]): Function;
     (...args: string[]): Function;
-    prototype: Function;
+    readonly prototype: Function;
 }
 
-declare var Function: FunctionConstructor;
+declare const Function: FunctionConstructor;
 
 interface IArguments {
     [index: number]: any;
@@ -320,13 +323,13 @@ interface String {
       * Matches a string with a regular expression, and returns an array containing the results of that search.
       * @param regexp A variable name or string literal containing the regular expression pattern and flags.
       */
-    match(regexp: string): RegExpMatchArray;
+    match(regexp: string): RegExpMatchArray | null;
 
     /** 
       * Matches a string with a regular expression, and returns an array containing the results of that search.
       * @param regexp A regular expression object that contains the regular expression pattern and applicable flags. 
       */
-    match(regexp: RegExp): RegExpMatchArray;
+    match(regexp: RegExp): RegExpMatchArray | null;
 
     /**
       * Replaces text in a string, using a regular expression or search string.
@@ -414,7 +417,7 @@ interface String {
     trim(): string;
 
     /** Returns the length of a String object. */
-    length: number;
+    readonly length: number;
 
     // IE extensions
     /**
@@ -427,20 +430,20 @@ interface String {
     /** Returns the primitive value of the specified object. */
     valueOf(): string;
 
-    [index: number]: string;
+    readonly [index: number]: string;
 }
 
 interface StringConstructor {
     new (value?: any): String;
     (value?: any): string;
-    prototype: String;
+    readonly prototype: String;
     fromCharCode(...codes: number[]): string;
 }
 
 /** 
   * Allows manipulation and formatting of text strings and determination and location of substrings within strings. 
   */
-declare var String: StringConstructor;
+declare const String: StringConstructor;
 
 interface Boolean {
     /** Returns the primitive value of the specified object. */
@@ -450,10 +453,10 @@ interface Boolean {
 interface BooleanConstructor {
     new (value?: any): Boolean;
     (value?: any): boolean;
-    prototype: Boolean;
+    readonly prototype: Boolean;
 }
 
-declare var Boolean: BooleanConstructor;
+declare const Boolean: BooleanConstructor;
 
 interface Number {
     /**
@@ -487,57 +490,57 @@ interface Number {
 interface NumberConstructor {
     new (value?: any): Number;
     (value?: any): number;
-    prototype: Number;
+    readonly prototype: Number;
 
     /** The largest number that can be represented in JavaScript. Equal to approximately 1.79E+308. */
-    MAX_VALUE: number;
+    readonly MAX_VALUE: number;
 
     /** The closest number to zero that can be represented in JavaScript. Equal to approximately 5.00E-324. */
-    MIN_VALUE: number;
+    readonly MIN_VALUE: number;
 
     /** 
       * A value that is not a number.
       * In equality comparisons, NaN does not equal any value, including itself. To test whether a value is equivalent to NaN, use the isNaN function.
       */
-    NaN: number;
+    readonly NaN: number;
 
     /** 
       * A value that is less than the largest negative number that can be represented in JavaScript.
       * JavaScript displays NEGATIVE_INFINITY values as -infinity. 
       */
-    NEGATIVE_INFINITY: number;
+    readonly NEGATIVE_INFINITY: number;
 
     /**
       * A value greater than the largest number that can be represented in JavaScript. 
       * JavaScript displays POSITIVE_INFINITY values as infinity. 
       */
-    POSITIVE_INFINITY: number;
+    readonly POSITIVE_INFINITY: number;
 }
 
 /** An object that represents a number of any kind. All JavaScript numbers are 64-bit floating-point numbers. */
-declare var Number: NumberConstructor;
+declare const Number: NumberConstructor;
 
 interface TemplateStringsArray extends Array<string> {
-    raw: string[];
+    readonly raw: string[];
 }
 
 interface Math {
     /** The mathematical constant e. This is Euler's number, the base of natural logarithms. */
-    E: number;
+    readonly E: number;
     /** The natural logarithm of 10. */
-    LN10: number;
+    readonly LN10: number;
     /** The natural logarithm of 2. */
-    LN2: number;
+    readonly LN2: number;
     /** The base-2 logarithm of e. */
-    LOG2E: number;
+    readonly LOG2E: number;
     /** The base-10 logarithm of e. */
-    LOG10E: number;
+    readonly LOG10E: number;
     /** Pi. This is the ratio of the circumference of a circle to its diameter. */
-    PI: number;
+    readonly PI: number;
     /** The square root of 0.5, or, equivalently, one divided by the square root of 2. */
-    SQRT1_2: number;
+    readonly SQRT1_2: number;
     /** The square root of 2. */
-    SQRT2: number;
+    readonly SQRT2: number;
     /**
       * Returns the absolute value of a number (the value without regard to whether it is positive or negative). 
       * For example, the absolute value of -5 is the same as the absolute value of 5.
@@ -630,7 +633,7 @@ interface Math {
     tan(x: number): number;
 }
 /** An intrinsic object that provides basic mathematics functionality and constants. */
-declare var Math: Math;
+declare const Math: Math;
 
 /** Enables basic storage and retrieval of dates and times. */
 interface Date {
@@ -792,7 +795,7 @@ interface DateConstructor {
     new (value: string): Date;
     new (year: number, month: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): Date;
     (): string;
-    prototype: Date;
+    readonly prototype: Date;
     /**
       * Parses a string containing a date, and returns the number of milliseconds between that date and midnight, January 1, 1970.
       * @param s A date string
@@ -812,7 +815,7 @@ interface DateConstructor {
     now(): number;
 }
 
-declare var Date: DateConstructor;
+declare const Date: DateConstructor;
 
 interface RegExpMatchArray extends Array<string> {
     index?: number;
@@ -829,7 +832,7 @@ interface RegExp {
       * Executes a search on a string using a regular expression pattern, and returns an array containing the results of that search.
       * @param string The String object or string literal on which to perform the search.
       */
-    exec(string: string): RegExpExecArray;
+    exec(string: string): RegExpExecArray | null;
 
     /** 
       * Returns a Boolean value that indicates whether or not a pattern exists in a searched string.
@@ -838,27 +841,27 @@ interface RegExp {
     test(string: string): boolean;
 
     /** Returns a copy of the text of the regular expression pattern. Read-only. The regExp argument is a Regular expression object. It can be a variable name or a literal. */
-    source: string;
+    readonly source: string;
 
     /** Returns a Boolean value indicating the state of the global flag (g) used with a regular expression. Default is false. Read-only. */
-    global: boolean;
+    readonly global: boolean;
 
     /** Returns a Boolean value indicating the state of the ignoreCase flag (i) used with a regular expression. Default is false. Read-only. */
-    ignoreCase: boolean;
+    readonly ignoreCase: boolean;
 
     /** Returns a Boolean value indicating the state of the multiline flag (m) used with a regular expression. Default is false. Read-only. */
-    multiline: boolean;
+    readonly multiline: boolean;
 
     lastIndex: number;
 
     // Non-standard extensions
-    compile(): RegExp;
+    compile(): this;
 }
 
 interface RegExpConstructor {
     new (pattern: string, flags?: string): RegExp;
     (pattern: string, flags?: string): RegExp;
-    prototype: RegExp;
+    readonly prototype: RegExp;
 
     // Non-standard extensions
     $1: string;
@@ -873,7 +876,7 @@ interface RegExpConstructor {
     lastMatch: string;
 }
 
-declare var RegExp: RegExpConstructor;
+declare const RegExp: RegExpConstructor;
 
 interface Error {
     name: string;
@@ -883,10 +886,10 @@ interface Error {
 interface ErrorConstructor {
     new (message?: string): Error;
     (message?: string): Error;
-    prototype: Error;
+    readonly prototype: Error;
 }
 
-declare var Error: ErrorConstructor;
+declare const Error: ErrorConstructor;
 
 interface EvalError extends Error {
 }
@@ -894,10 +897,10 @@ interface EvalError extends Error {
 interface EvalErrorConstructor {
     new (message?: string): EvalError;
     (message?: string): EvalError;
-    prototype: EvalError;
+    readonly prototype: EvalError;
 }
 
-declare var EvalError: EvalErrorConstructor;
+declare const EvalError: EvalErrorConstructor;
 
 interface RangeError extends Error {
 }
@@ -905,10 +908,10 @@ interface RangeError extends Error {
 interface RangeErrorConstructor {
     new (message?: string): RangeError;
     (message?: string): RangeError;
-    prototype: RangeError;
+    readonly prototype: RangeError;
 }
 
-declare var RangeError: RangeErrorConstructor;
+declare const RangeError: RangeErrorConstructor;
 
 interface ReferenceError extends Error {
 }
@@ -916,10 +919,10 @@ interface ReferenceError extends Error {
 interface ReferenceErrorConstructor {
     new (message?: string): ReferenceError;
     (message?: string): ReferenceError;
-    prototype: ReferenceError;
+    readonly prototype: ReferenceError;
 }
 
-declare var ReferenceError: ReferenceErrorConstructor;
+declare const ReferenceError: ReferenceErrorConstructor;
 
 interface SyntaxError extends Error {
 }
@@ -927,10 +930,10 @@ interface SyntaxError extends Error {
 interface SyntaxErrorConstructor {
     new (message?: string): SyntaxError;
     (message?: string): SyntaxError;
-    prototype: SyntaxError;
+    readonly prototype: SyntaxError;
 }
 
-declare var SyntaxError: SyntaxErrorConstructor;
+declare const SyntaxError: SyntaxErrorConstructor;
 
 interface TypeError extends Error {
 }
@@ -938,10 +941,10 @@ interface TypeError extends Error {
 interface TypeErrorConstructor {
     new (message?: string): TypeError;
     (message?: string): TypeError;
-    prototype: TypeError;
+    readonly prototype: TypeError;
 }
 
-declare var TypeError: TypeErrorConstructor;
+declare const TypeError: TypeErrorConstructor;
 
 interface URIError extends Error {
 }
@@ -949,10 +952,10 @@ interface URIError extends Error {
 interface URIErrorConstructor {
     new (message?: string): URIError;
     (message?: string): URIError;
-    prototype: URIError;
+    readonly prototype: URIError;
 }
 
-declare var URIError: URIErrorConstructor;
+declare const URIError: URIErrorConstructor;
 
 interface JSON {
     /**
@@ -997,13 +1000,115 @@ interface JSON {
 /**
   * An intrinsic object that provides functions to convert JavaScript values to and from the JavaScript Object Notation (JSON) format.
   */
-declare var JSON: JSON;
+declare const JSON: JSON;
 
 
 /////////////////////////////
 /// ECMAScript Array API (specially handled by compiler)
 /////////////////////////////
 
+interface ReadonlyArray<T> {
+    /**
+      * Gets the length of the array. This is a number one higher than the highest element defined in an array.
+      */
+    readonly length: number;
+    /**
+      * Returns a string representation of an array.
+      */
+    toString(): string;
+    toLocaleString(): string;
+    /**
+      * Combines two or more arrays.
+      * @param items Additional items to add to the end of array1.
+      */
+    concat<U extends ReadonlyArray<T>>(...items: U[]): T[];
+    /**
+      * Combines two or more arrays.
+      * @param items Additional items to add to the end of array1.
+      */
+    concat(...items: T[]): T[];
+    /**
+      * Adds all the elements of an array separated by the specified separator string.
+      * @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma.
+      */
+    join(separator?: string): string;
+    /**
+      * Returns a section of an array.
+      * @param start The beginning of the specified portion of the array.
+      * @param end The end of the specified portion of the array.
+      */
+    slice(start?: number, end?: number): T[];
+    /**
+      * Returns the index of the first occurrence of a value in an array.
+      * @param searchElement The value to locate in the array.
+      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at index 0.
+      */
+    indexOf(searchElement: T, fromIndex?: number): number;
+
+    /**
+      * Returns the index of the last occurrence of a specified value in an array.
+      * @param searchElement The value to locate in the array.
+      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at the last index in the array.
+      */
+    lastIndexOf(searchElement: T, fromIndex?: number): number;
+    /**
+      * Determines whether all the members of an array satisfy the specified test.
+      * @param callbackfn A function that accepts up to three arguments. The every method calls the callbackfn function for each element in array1 until the callbackfn returns false, or until the end of 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.
+      */
+    every(callbackfn: (value: T, index: number, array: ReadonlyArray<T>) => boolean, thisArg?: any): boolean;
+    /**
+      * Determines whether the specified callback function returns true for any element of an array.
+      * @param callbackfn A function that accepts up to three arguments. The some method calls the callbackfn function for each element in array1 until the callbackfn returns true, or until the end of 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.
+      */
+    some(callbackfn: (value: T, index: number, array: ReadonlyArray<T>) => boolean, thisArg?: any): boolean;
+    /**
+      * Performs the specified action for each element in an array.
+      * @param callbackfn  A function that accepts up to three arguments. forEach 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.
+      */
+    forEach(callbackfn: (value: T, index: number, array: ReadonlyArray<T>) => void, thisArg?: any): void;
+    /**
+      * Calls a defined callback function on each element of an array, and returns an array that contains the results.
+      * @param callbackfn A function that accepts up to three arguments. The map 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.
+      */
+    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(callbackfn: (value: T, index: number, array: ReadonlyArray<T>) => boolean, thisArg?: any): T[];
+    /**
+      * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
+      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array.
+      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
+      */
+    reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: ReadonlyArray<T>) => T, initialValue?: T): T;
+    /**
+      * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
+      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array.
+      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
+      */
+    reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: ReadonlyArray<T>) => U, initialValue: U): U;
+    /**
+      * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
+      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array. 
+      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
+      */
+    reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: ReadonlyArray<T>) => T, initialValue?: T): T;
+    /**
+      * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
+      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array. 
+      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
+      */
+    reduceRight<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: ReadonlyArray<T>) => U, initialValue: U): U;
+
+    readonly [n: number]: T;
+}
+
 interface Array<T> {
     /**
       * Gets or sets the length of the array. This is a number one higher than the highest element defined in an array.
@@ -1022,17 +1127,12 @@ interface Array<T> {
     /**
       * Removes the last element from an array and returns it.
       */
-    pop(): T;
+    pop(): T | undefined;
     /**
       * Combines two or more arrays.
       * @param items Additional items to add to the end of array1.
       */
-    concat<U extends T[]>(...items: U[]): T[];
-    /**
-      * Combines two or more arrays.
-      * @param items Additional items to add to the end of array1.
-      */
-    concat(...items: T[]): T[];
+    concat(...items: (T | T[])[]): T[];
     /**
       * Adds all the elements of an array separated by the specified separator string.
       * @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma.
@@ -1045,26 +1145,23 @@ interface Array<T> {
     /**
       * Removes the first element from an array and returns it.
       */
-    shift(): T;
+    shift(): T | undefined;
     /** 
       * Returns a section of an array.
       * @param start The beginning of the specified portion of the array.
       * @param end The end of the specified portion of the array.
       */
     slice(start?: number, end?: number): T[];
-
     /**
       * Sorts an array.
       * @param compareFn The name of the function used to determine the order of the elements. If omitted, the elements are sorted in ascending, ASCII character order.
       */
     sort(compareFn?: (a: T, b: T) => number): T[];
-
     /**
       * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements.
       * @param start The zero-based location in the array from which to start removing elements.
       */
     splice(start: number): T[];
-
     /**
       * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements.
       * @param start The zero-based location in the array from which to start removing elements.
@@ -1072,62 +1169,53 @@ interface Array<T> {
       * @param items Elements to insert into the array in place of the deleted elements.
       */
     splice(start: number, deleteCount: number, ...items: T[]): T[];
-
     /**
       * Inserts new elements at the start of an array.
       * @param items  Elements to insert at the start of the Array.
       */
     unshift(...items: T[]): number;
-
     /**
       * Returns the index of the first occurrence of a value in an array.
       * @param searchElement The value to locate in the array.
       * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at index 0.
       */
     indexOf(searchElement: T, fromIndex?: number): number;
-
     /**
       * Returns the index of the last occurrence of a specified value in an array.
       * @param searchElement The value to locate in the array.
       * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at the last index in the array.
       */
     lastIndexOf(searchElement: T, fromIndex?: number): number;
-
     /**
       * Determines whether all the members of an array satisfy the specified test.
       * @param callbackfn A function that accepts up to three arguments. The every method calls the callbackfn function for each element in array1 until the callbackfn returns false, or until the end of 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.
       */
     every(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
-
     /**
       * Determines whether the specified callback function returns true for any element of an array.
       * @param callbackfn A function that accepts up to three arguments. The some method calls the callbackfn function for each element in array1 until the callbackfn returns true, or until the end of 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.
       */
     some(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
-
     /**
       * Performs the specified action for each element in an array.
       * @param callbackfn  A function that accepts up to three arguments. forEach 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.
       */
     forEach(callbackfn: (value: T, index: number, array: T[]) => void, thisArg?: any): void;
-
     /**
       * Calls a defined callback function on each element of an array, and returns an array that contains the results.
       * @param callbackfn A function that accepts up to three arguments. The map 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.
       */
     map<U>(callbackfn: (value: T, index: number, array: 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(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): T[];
-
     /**
       * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
       * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array.
@@ -1140,7 +1228,6 @@ interface Array<T> {
       * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
       */
     reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
-
     /** 
       * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
       * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array. 
@@ -1165,10 +1252,10 @@ interface ArrayConstructor {
     <T>(arrayLength: number): T[];
     <T>(...items: T[]): T[];
     isArray(arg: any): arg is Array<any>;
-    prototype: Array<any>;
+    readonly prototype: Array<any>;
 }
 
-declare var Array: ArrayConstructor;
+declare const Array: ArrayConstructor;
 
 interface TypedPropertyDescriptor<T> {
     enumerable?: boolean;
@@ -1198,11 +1285,10 @@ interface PromiseLike<T> {
 }
 
 interface ArrayLike<T> {
-    length: number;
-    [n: number]: T;
+    readonly length: number;
+    readonly [n: number]: T;
 }
 
-
 /**
   * Represents a raw buffer of binary data, which is used to store data for the 
   * different typed arrays. ArrayBuffers cannot be read from or written to directly, 
@@ -1213,7 +1299,7 @@ interface ArrayBuffer {
     /**
       * Read-only. The length of the ArrayBuffer (in bytes).
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * Returns a section of an ArrayBuffer.
@@ -1222,11 +1308,11 @@ interface ArrayBuffer {
 }
 
 interface ArrayBufferConstructor {
-    prototype: ArrayBuffer;
+    readonly prototype: ArrayBuffer;
     new (byteLength: number): ArrayBuffer;
     isView(arg: any): arg is ArrayBufferView;
 }
-declare var ArrayBuffer: ArrayBufferConstructor;
+declare const ArrayBuffer: ArrayBufferConstructor;
 
 interface ArrayBufferView {
     /**
@@ -1246,9 +1332,9 @@ interface ArrayBufferView {
 }
 
 interface DataView {
-    buffer: ArrayBuffer;
-    byteLength: number;
-    byteOffset: number;
+    readonly buffer: ArrayBuffer;
+    readonly byteLength: number;
+    readonly byteOffset: number;
     /**
       * Gets the Float32 value at the specified byte offset from the start of the view. There is 
       * no alignment constraint; multi-byte values may be fetched from any offset. 
@@ -1376,7 +1462,7 @@ interface DataView {
 interface DataViewConstructor {
     new (buffer: ArrayBuffer, byteOffset?: number, byteLength?: number): DataView;
 }
-declare var DataView: DataViewConstructor;
+declare const DataView: DataViewConstructor;
 
 /**
   * A typed array of 8-bit integer values. The contents are initialized to 0. If the requested 
@@ -1386,22 +1472,22 @@ interface Int8Array {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -1452,7 +1538,7 @@ interface Int8Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -1463,7 +1549,7 @@ interface Int8Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -1500,7 +1586,7 @@ interface Int8Array {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -1624,7 +1710,7 @@ interface Int8Array {
     [index: number]: number;
 }
 interface Int8ArrayConstructor {
-    prototype: Int8Array;
+    readonly prototype: Int8Array;
     new (length: number): Int8Array;
     new (array: ArrayLike<number>): Int8Array;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Int8Array;
@@ -1632,7 +1718,7 @@ interface Int8ArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -1649,7 +1735,7 @@ interface Int8ArrayConstructor {
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int8Array;
 
 }
-declare var Int8Array: Int8ArrayConstructor;
+declare const Int8Array: Int8ArrayConstructor;
 
 /**
   * A typed array of 8-bit unsigned integer values. The contents are initialized to 0. If the 
@@ -1659,22 +1745,22 @@ interface Uint8Array {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -1725,7 +1811,7 @@ interface Uint8Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -1736,7 +1822,7 @@ interface Uint8Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -1773,7 +1859,7 @@ interface Uint8Array {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -1898,7 +1984,7 @@ interface Uint8Array {
 }
 
 interface Uint8ArrayConstructor {
-    prototype: Uint8Array;
+    readonly prototype: Uint8Array;
     new (length: number): Uint8Array;
     new (array: ArrayLike<number>): Uint8Array;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint8Array;
@@ -1906,7 +1992,7 @@ interface Uint8ArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -1923,7 +2009,7 @@ interface Uint8ArrayConstructor {
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8Array;
 
 }
-declare var Uint8Array: Uint8ArrayConstructor;
+declare const Uint8Array: Uint8ArrayConstructor;
 
 /**
   * A typed array of 8-bit unsigned integer (clamped) values. The contents are initialized to 0. 
@@ -1933,22 +2019,22 @@ interface Uint8ClampedArray {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -1999,7 +2085,7 @@ interface Uint8ClampedArray {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -2010,7 +2096,7 @@ interface Uint8ClampedArray {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -2047,7 +2133,7 @@ interface Uint8ClampedArray {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -2172,7 +2258,7 @@ interface Uint8ClampedArray {
 }
 
 interface Uint8ClampedArrayConstructor {
-    prototype: Uint8ClampedArray;
+    readonly prototype: Uint8ClampedArray;
     new (length: number): Uint8ClampedArray;
     new (array: ArrayLike<number>): Uint8ClampedArray;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint8ClampedArray;
@@ -2180,7 +2266,7 @@ interface Uint8ClampedArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -2196,7 +2282,7 @@ interface Uint8ClampedArrayConstructor {
       */
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8ClampedArray;
 }
-declare var Uint8ClampedArray: Uint8ClampedArrayConstructor;
+declare const Uint8ClampedArray: Uint8ClampedArrayConstructor;
 
 /**
   * A typed array of 16-bit signed integer values. The contents are initialized to 0. If the 
@@ -2206,22 +2292,22 @@ interface Int16Array {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -2272,7 +2358,7 @@ interface Int16Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -2283,7 +2369,7 @@ interface Int16Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -2320,7 +2406,7 @@ interface Int16Array {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -2445,7 +2531,7 @@ interface Int16Array {
 }
 
 interface Int16ArrayConstructor {
-    prototype: Int16Array;
+    readonly prototype: Int16Array;
     new (length: number): Int16Array;
     new (array: ArrayLike<number>): Int16Array;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Int16Array;
@@ -2453,7 +2539,7 @@ interface Int16ArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -2470,7 +2556,7 @@ interface Int16ArrayConstructor {
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int16Array;
 
 }
-declare var Int16Array: Int16ArrayConstructor;
+declare const Int16Array: Int16ArrayConstructor;
 
 /**
   * A typed array of 16-bit unsigned integer values. The contents are initialized to 0. If the 
@@ -2480,22 +2566,22 @@ interface Uint16Array {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -2546,7 +2632,7 @@ interface Uint16Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -2557,7 +2643,7 @@ interface Uint16Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -2594,7 +2680,7 @@ interface Uint16Array {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -2719,7 +2805,7 @@ interface Uint16Array {
 }
 
 interface Uint16ArrayConstructor {
-    prototype: Uint16Array;
+    readonly prototype: Uint16Array;
     new (length: number): Uint16Array;
     new (array: ArrayLike<number>): Uint16Array;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint16Array;
@@ -2727,7 +2813,7 @@ interface Uint16ArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -2744,7 +2830,7 @@ interface Uint16ArrayConstructor {
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint16Array;
 
 }
-declare var Uint16Array: Uint16ArrayConstructor;
+declare const Uint16Array: Uint16ArrayConstructor;
 /**
   * A typed array of 32-bit signed integer values. The contents are initialized to 0. If the 
   * requested number of bytes could not be allocated an exception is raised.
@@ -2753,22 +2839,22 @@ interface Int32Array {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -2819,7 +2905,7 @@ interface Int32Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -2830,7 +2916,7 @@ interface Int32Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -2867,7 +2953,7 @@ interface Int32Array {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -2992,7 +3078,7 @@ interface Int32Array {
 }
 
 interface Int32ArrayConstructor {
-    prototype: Int32Array;
+    readonly prototype: Int32Array;
     new (length: number): Int32Array;
     new (array: ArrayLike<number>): Int32Array;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Int32Array;
@@ -3000,7 +3086,7 @@ interface Int32ArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -3016,7 +3102,7 @@ interface Int32ArrayConstructor {
       */
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int32Array;
 }
-declare var Int32Array: Int32ArrayConstructor;
+declare const Int32Array: Int32ArrayConstructor;
 
 /**
   * A typed array of 32-bit unsigned integer values. The contents are initialized to 0. If the 
@@ -3026,22 +3112,22 @@ interface Uint32Array {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -3092,7 +3178,7 @@ interface Uint32Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -3103,7 +3189,7 @@ interface Uint32Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -3140,7 +3226,7 @@ interface Uint32Array {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -3265,7 +3351,7 @@ interface Uint32Array {
 }
 
 interface Uint32ArrayConstructor {
-    prototype: Uint32Array;
+    readonly prototype: Uint32Array;
     new (length: number): Uint32Array;
     new (array: ArrayLike<number>): Uint32Array;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint32Array;
@@ -3273,7 +3359,7 @@ interface Uint32ArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -3289,7 +3375,7 @@ interface Uint32ArrayConstructor {
       */
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint32Array;
 }
-declare var Uint32Array: Uint32ArrayConstructor;
+declare const Uint32Array: Uint32ArrayConstructor;
 
 /**
   * A typed array of 32-bit float values. The contents are initialized to 0. If the requested number
@@ -3299,22 +3385,22 @@ interface Float32Array {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -3365,7 +3451,7 @@ interface Float32Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -3376,7 +3462,7 @@ interface Float32Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -3413,7 +3499,7 @@ interface Float32Array {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -3538,7 +3624,7 @@ interface Float32Array {
 }
 
 interface Float32ArrayConstructor {
-    prototype: Float32Array;
+    readonly prototype: Float32Array;
     new (length: number): Float32Array;
     new (array: ArrayLike<number>): Float32Array;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Float32Array;
@@ -3546,7 +3632,7 @@ interface Float32ArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -3563,7 +3649,7 @@ interface Float32ArrayConstructor {
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float32Array;
 
 }
-declare var Float32Array: Float32ArrayConstructor;
+declare const Float32Array: Float32ArrayConstructor;
 
 /**
   * A typed array of 64-bit float values. The contents are initialized to 0. If the requested 
@@ -3573,22 +3659,22 @@ interface Float64Array {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -3639,7 +3725,7 @@ interface Float64Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -3650,7 +3736,7 @@ interface Float64Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -3687,7 +3773,7 @@ interface Float64Array {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -3812,7 +3898,7 @@ interface Float64Array {
 }
 
 interface Float64ArrayConstructor {
-    prototype: Float64Array;
+    readonly prototype: Float64Array;
     new (length: number): Float64Array;
     new (array: ArrayLike<number>): Float64Array;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Float64Array;
@@ -3820,7 +3906,7 @@ interface Float64ArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -3836,4 +3922,205 @@ interface Float64ArrayConstructor {
       */
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float64Array;
 }
-declare var Float64Array: Float64ArrayConstructor;
+declare const Float64Array: Float64ArrayConstructor;
+
+/////////////////////////////
+/// ECMAScript Internationalization API 
+/////////////////////////////
+
+declare module Intl {
+    interface CollatorOptions {
+        usage?: string;
+        localeMatcher?: string;
+        numeric?: boolean;
+        caseFirst?: string;
+        sensitivity?: string;
+        ignorePunctuation?: boolean;
+    }
+
+    interface ResolvedCollatorOptions {
+        locale: string;
+        usage: string;
+        sensitivity: string;
+        ignorePunctuation: boolean;
+        collation: string;
+        caseFirst: string;
+        numeric: boolean;
+    }
+
+    interface Collator {
+        compare(x: string, y: string): number;
+        resolvedOptions(): ResolvedCollatorOptions;
+    }
+    var Collator: {
+        new (locales?: string[], options?: CollatorOptions): Collator;
+        new (locale?: string, options?: CollatorOptions): Collator;
+        (locales?: string[], options?: CollatorOptions): Collator;
+        (locale?: string, options?: CollatorOptions): Collator;
+        supportedLocalesOf(locales: string[], options?: CollatorOptions): string[];
+        supportedLocalesOf(locale: string, options?: CollatorOptions): string[];
+    }
+
+    interface NumberFormatOptions {
+        localeMatcher?: string;
+        style?: string;
+        currency?: string;
+        currencyDisplay?: string;
+        useGrouping?: boolean;
+        minimumIntegerDigits?: number;
+        minimumFractionDigits?: number;
+        maximumFractionDigits?: number;
+        minimumSignificantDigits?: number;
+        maximumSignificantDigits?: number;
+    }
+
+    interface ResolvedNumberFormatOptions {
+        locale: string;
+        numberingSystem: string;
+        style: string;
+        currency?: string;
+        currencyDisplay?: string;
+        minimumIntegerDigits: number;
+        minimumFractionDigits: number;
+        maximumFractionDigits: number;
+        minimumSignificantDigits?: number;
+        maximumSignificantDigits?: number;
+        useGrouping: boolean;
+    }
+
+    interface NumberFormat {
+        format(value: number): string;
+        resolvedOptions(): ResolvedNumberFormatOptions;
+    }
+    var NumberFormat: {
+        new (locales?: string[], options?: NumberFormatOptions): NumberFormat;
+        new (locale?: string, options?: NumberFormatOptions): NumberFormat;
+        (locales?: string[], options?: NumberFormatOptions): NumberFormat;
+        (locale?: string, options?: NumberFormatOptions): NumberFormat;
+        supportedLocalesOf(locales: string[], options?: NumberFormatOptions): string[];
+        supportedLocalesOf(locale: string, options?: NumberFormatOptions): string[];
+    }
+
+    interface DateTimeFormatOptions {
+        localeMatcher?: string;
+        weekday?: string;
+        era?: string;
+        year?: string;
+        month?: string;
+        day?: string;
+        hour?: string;
+        minute?: string;
+        second?: string;
+        timeZoneName?: string;
+        formatMatcher?: string;
+        hour12?: boolean;
+        timeZone?: string;
+    }
+
+    interface ResolvedDateTimeFormatOptions {
+        locale: string;
+        calendar: string;
+        numberingSystem: string;
+        timeZone: string;
+        hour12?: boolean;
+        weekday?: string;
+        era?: string;
+        year?: string;
+        month?: string;
+        day?: string;
+        hour?: string;
+        minute?: string;
+        second?: string;
+        timeZoneName?: string;
+    }
+
+    interface DateTimeFormat {
+        format(date?: Date | number): string;
+        resolvedOptions(): ResolvedDateTimeFormatOptions;
+    }
+    var DateTimeFormat: {
+        new (locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
+        new (locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
+        (locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
+        (locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
+        supportedLocalesOf(locales: string[], options?: DateTimeFormatOptions): string[];
+        supportedLocalesOf(locale: string, options?: DateTimeFormatOptions): string[];
+    }
+}
+
+interface String {
+    /**
+      * Determines whether two strings are equivalent in the current locale.
+      * @param that String to compare to target string
+      * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used. This parameter must conform to BCP 47 standards; see the Intl.Collator object for details.
+      * @param options An object that contains one or more properties that specify comparison options. see the Intl.Collator object for details.
+      */
+    localeCompare(that: string, locales: string[], options?: Intl.CollatorOptions): number;
+
+    /**
+      * Determines whether two strings are equivalent in the current locale.
+      * @param that String to compare to target string
+      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used. This parameter must conform to BCP 47 standards; see the Intl.Collator object for details.
+      * @param options An object that contains one or more properties that specify comparison options. see the Intl.Collator object for details.
+      */
+    localeCompare(that: string, locale: string, options?: Intl.CollatorOptions): number;
+}
+
+interface Number {
+    /**
+      * Converts a number to a string by using the current or specified locale. 
+      * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used.
+      * @param options An object that contains one or more properties that specify comparison options.
+      */
+    toLocaleString(locales?: string[], options?: Intl.NumberFormatOptions): string;
+
+    /**
+      * Converts a number to a string by using the current or specified locale. 
+      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
+      * @param options An object that contains one or more properties that specify comparison options.
+      */
+    toLocaleString(locale?: string, options?: Intl.NumberFormatOptions): string;
+}
+
+interface Date {
+    /**
+      * Converts a date and time to a string by using the current or specified locale.  
+      * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used.
+      * @param options An object that contains one or more properties that specify comparison options.
+      */
+    toLocaleString(locales?: string[], options?: Intl.DateTimeFormatOptions): string;
+    /**
+      * Converts a date to a string by using the current or specified locale.  
+      * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used.
+      * @param options An object that contains one or more properties that specify comparison options.
+      */
+    toLocaleDateString(locales?: string[], options?: Intl.DateTimeFormatOptions): string;
+
+    /**
+      * Converts a time to a string by using the current or specified locale.  
+      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
+      * @param options An object that contains one or more properties that specify comparison options.
+      */
+    toLocaleTimeString(locale?: string[], options?: Intl.DateTimeFormatOptions): string;
+    
+    /**
+      * Converts a date and time to a string by using the current or specified locale.  
+      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
+      * @param options An object that contains one or more properties that specify comparison options.
+      */
+    toLocaleString(locale?: string, options?: Intl.DateTimeFormatOptions): string;
+    
+    /**
+      * Converts a date to a string by using the current or specified locale.  
+      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
+      * @param options An object that contains one or more properties that specify comparison options.
+      */
+    toLocaleDateString(locale?: string, options?: Intl.DateTimeFormatOptions): string;
+
+    /**
+      * Converts a time to a string by using the current or specified locale.  
+      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
+      * @param options An object that contains one or more properties that specify comparison options.
+      */
+    toLocaleTimeString(locale?: string, options?: Intl.DateTimeFormatOptions): string;
+}
diff --git a/lib/lib.es6.d.ts b/lib/lib.es6.d.ts
index 70f464ad48e..202d3d53d82 100644
--- a/lib/lib.es6.d.ts
+++ b/lib/lib.es6.d.ts
@@ -14,1345 +14,12 @@ and limitations under the License.
 ***************************************************************************** */
 
 /// <reference no-default-lib="true"/>
-declare type PropertyKey = string | number | symbol;
-
-interface Symbol {
-    /** Returns a string representation of an object. */
-    toString(): string;
-
-    /** Returns the primitive value of the specified object. */
-    valueOf(): Object;
-
-    [Symbol.toStringTag]: "Symbol";
-}
-
-interface SymbolConstructor {
-    /** 
-      * A reference to the prototype. 
-      */
-    prototype: Symbol;
-
-    /**
-      * Returns a new unique Symbol value.
-      * @param  description Description of the new Symbol object.
-      */
-    (description?: string|number): symbol;
-
-    /**
-      * Returns a Symbol object from the global symbol registry matching the given key if found. 
-      * Otherwise, returns a new symbol with this key.
-      * @param key key to search for.
-      */
-    for(key: string): symbol;
-
-    /**
-      * Returns a key from the global symbol registry matching the given Symbol if found. 
-      * Otherwise, returns a undefined.
-      * @param sym Symbol to find the key for.
-      */
-    keyFor(sym: symbol): string;
-
-    // Well-known Symbols
-
-    /** 
-      * A method that determines if a constructor object recognizes an object as one of the 
-      * constructor’s instances. Called by the semantics of the instanceof operator. 
-      */
-    hasInstance: symbol;
-
-    /** 
-      * A Boolean value that if true indicates that an object should flatten to its array elements
-      * by Array.prototype.concat.
-      */
-    isConcatSpreadable: symbol;
-
-    /** 
-      * A method that returns the default iterator for an object. Called by the semantics of the 
-      * for-of statement.
-      */
-    iterator: symbol;
-
-    /**
-      * A regular expression method that matches the regular expression against a string. Called 
-      * by the String.prototype.match method. 
-      */
-    match: symbol;
-
-    /** 
-      * A regular expression method that replaces matched substrings of a string. Called by the 
-      * String.prototype.replace method.
-      */
-    replace: symbol;
-
-    /**
-      * A regular expression method that returns the index within a string that matches the 
-      * regular expression. Called by the String.prototype.search method.
-      */
-    search: symbol;
-
-    /** 
-      * A function valued property that is the constructor function that is used to create 
-      * derived objects.
-      */
-    species: symbol;
-
-    /**
-      * A regular expression method that splits a string at the indices that match the regular 
-      * expression. Called by the String.prototype.split method.
-      */
-    split: symbol;
-
-    /** 
-      * A method that converts an object to a corresponding primitive value.
-      * Called by the ToPrimitive abstract operation.
-      */
-    toPrimitive: symbol;
-
-    /** 
-      * A String value that is used in the creation of the default string description of an object.
-      * Called by the built-in method Object.prototype.toString.
-      */
-    toStringTag: symbol;
-
-    /**
-      * An Object whose own property names are property names that are excluded from the 'with'
-      * environment bindings of the associated objects.
-      */
-    unscopables: symbol;
-}
-declare var Symbol: SymbolConstructor;
-
-interface Object {
-    /**
-      * Determines whether an object has a property with the specified name. 
-      * @param v A property name.
-      */
-    hasOwnProperty(v: PropertyKey): boolean;
-
-    /** 
-      * Determines whether a specified property is enumerable.
-      * @param v A property name.
-      */
-    propertyIsEnumerable(v: PropertyKey): boolean;
-}
-
-interface ObjectConstructor {
-    /**
-      * Copy the values of all of the enumerable own properties from one or more source objects to a 
-      * target object. Returns the target object.
-      * @param target The target object to copy to.
-      * @param source The source object from which to copy properties.
-      */
-    assign<T, U>(target: T, source: U): T & U;
-
-    /**
-      * Copy the values of all of the enumerable own properties from one or more source objects to a 
-      * target object. Returns the target object.
-      * @param target The target object to copy to.
-      * @param source1 The first source object from which to copy properties.
-      * @param source2 The second source object from which to copy properties.
-      */
-    assign<T, U, V>(target: T, source1: U, source2: V): T & U & V;
-
-    /**
-      * Copy the values of all of the enumerable own properties from one or more source objects to a 
-      * target object. Returns the target object.
-      * @param target The target object to copy to.
-      * @param source1 The first source object from which to copy properties.
-      * @param source2 The second source object from which to copy properties.
-      * @param source3 The third source object from which to copy properties.
-      */
-    assign<T, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W;
-
-    /**
-      * Copy the values of all of the enumerable own properties from one or more source objects to a 
-      * target object. Returns the target object.
-      * @param target The target object to copy to.
-      * @param sources One or more source objects from which to copy properties
-      */
-    assign(target: any, ...sources: any[]): any;
-
-    /**
-      * Returns an array of all symbol properties found directly on object o.
-      * @param o Object to retrieve the symbols from.
-      */
-    getOwnPropertySymbols(o: any): symbol[];
-
-    /**
-      * Returns true if the values are the same value, false otherwise.
-      * @param value1 The first value.
-      * @param value2 The second value.
-      */
-    is(value1: any, value2: any): boolean;
-
-    /**
-      * Sets the prototype of a specified object o to  object proto or null. Returns the object o.
-      * @param o The object to change its prototype.
-      * @param proto The value of the new prototype or null.
-      */
-    setPrototypeOf(o: any, proto: any): any;
-
-    /**
-      * Gets the own property descriptor of the specified object. 
-      * An own property descriptor is one that is defined directly on the object and is not 
-      * inherited from the object's prototype. 
-      * @param o Object that contains the property.
-      * @param p Name of the property.
-    */
-    getOwnPropertyDescriptor(o: any, propertyKey: PropertyKey): PropertyDescriptor;
-
-    /**
-      * Adds a property to an object, or modifies attributes of an existing property. 
-      * @param o Object on which to add or modify the property. This can be a native JavaScript 
-      * object (that is, a user-defined object or a built in object) or a DOM object.
-      * @param p The property name.
-      * @param attributes Descriptor for the property. It can be for a data property or an accessor
-      *  property.
-      */
-    defineProperty(o: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): any;
-}
-
-interface Function {
-    /**
-      * Returns the name of the function. Function names are read-only and can not be changed.
-      */
-    name: string;
-
-    /**
-     * Determines whether the given value inherits from this function if this function was used
-     * as a constructor function.
-     *
-     * A constructor function can control which objects are recognized as its instances by
-     * 'instanceof' by overriding this method.
-     */
-    [Symbol.hasInstance](value: any): boolean;
-}
-
-interface NumberConstructor {
-    /**
-      * The value of Number.EPSILON is the difference between 1 and the smallest value greater than 1
-      * that is representable as a Number value, which is approximately: 
-      * 2.2204460492503130808472633361816 x 10‍−‍16.
-      */
-    EPSILON: number;
-
-    /**
-      * Returns true if passed value is finite.
-      * Unlike the global isFininte, Number.isFinite doesn't forcibly convert the parameter to a 
-      * number. Only finite values of the type number, result in true.
-      * @param number A numeric value.
-      */
-    isFinite(number: number): boolean;
-
-    /**
-      * Returns true if the value passed is an integer, false otherwise.
-      * @param number A numeric value.
-      */
-    isInteger(number: number): boolean;
-
-    /**
-      * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a 
-      * number). Unlike the global isNaN(), Number.isNaN() doesn't forcefully convert the parameter
-      * to a number. Only values of the type number, that are also NaN, result in true.
-      * @param number A numeric value.
-      */
-    isNaN(number: number): boolean;
-
-    /**
-      * Returns true if the value passed is a safe integer.
-      * @param number A numeric value.
-      */
-    isSafeInteger(number: number): boolean;
-
-    /** 
-      * The value of the largest integer n such that n and n + 1 are both exactly representable as 
-      * a Number value. 
-      * The value of Number.MIN_SAFE_INTEGER is 9007199254740991 2^53 − 1.
-      */
-    MAX_SAFE_INTEGER: number;
-
-    /** 
-      * The value of the smallest integer n such that n and n − 1 are both exactly representable as 
-      * a Number value. 
-      * The value of Number.MIN_SAFE_INTEGER is −9007199254740991 (−(2^53 − 1)).
-      */
-    MIN_SAFE_INTEGER: number;
-
-    /**
-      * Converts a string to a floating-point number. 
-      * @param string A string that contains a floating-point number. 
-      */
-    parseFloat(string: string): number;
-
-    /**
-      * Converts A string to an integer.
-      * @param s A string to convert into a number.
-      * @param radix A value between 2 and 36 that specifies the base of the number in numString. 
-      * If this argument is not supplied, strings with a prefix of '0x' are considered hexadecimal.
-      * All other strings are considered decimal.
-      */
-    parseInt(string: string, radix?: number): number;
-}
-
-interface Array<T> {
-    /** Iterator */
-    [Symbol.iterator](): IterableIterator<T>;
-
-    /**
-     * Returns an object whose properties have the value 'true'
-     * when they will be absent when used in a 'with' statement.
-     */
-    [Symbol.unscopables](): {
-        copyWithin: boolean;
-        entries: boolean;
-        fill: boolean;
-        find: boolean;
-        findIndex: boolean;
-        keys: boolean;
-        values: boolean;
-    };
-
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, T]>;
-
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<T>;
-
-    /** 
-      * Returns the value of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    find(predicate: (value: T, index: number, obj: Array<T>) => boolean, thisArg?: any): T;
-
-    /** 
-      * Returns the index of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    findIndex(predicate: (value: T) => boolean, thisArg?: any): number;
-
-    /**
-      * Returns the this object after filling the section identified by start and end with value
-      * @param value value to fill array section with
-      * @param start index to start filling the array at. If start is negative, it is treated as 
-      * length+start where length is the length of the array. 
-      * @param end index to stop filling the array at. If end is negative, it is treated as 
-      * length+end.
-      */
-    fill(value: T, start?: number, end?: number): T[];
-
-    /** 
-      * Returns the this object after copying a section of the array identified by start and end
-      * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the 
-      * length of the array. 
-      * @param start If start is negative, it is treated as length+start. If end is negative, it 
-      * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value. 
-      */
-    copyWithin(target: number, start: number, end?: number): T[];
-}
-
-interface IArguments {
-    /** Iterator */
-    [Symbol.iterator](): IterableIterator<any>;
-}
-
-interface ArrayConstructor {
-    /**
-      * Creates an array from an array-like object.
-      * @param arrayLike An array-like object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from<T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): Array<U>;
-
-    /**
-      * Creates an array from an iterable object.
-      * @param iterable An iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from<T, U>(iterable: Iterable<T>, mapfn: (v: T, k: number) => U, thisArg?: any): Array<U>;
-
-    /**
-      * Creates an array from an array-like object.
-      * @param arrayLike An array-like object to convert to an array.
-      */
-    from<T>(arrayLike: ArrayLike<T>): Array<T>;
-
-    /**
-      * Creates an array from an iterable object.
-      * @param iterable An iterable object to convert to an array.
-      */
-    from<T>(iterable: Iterable<T>): Array<T>;
-
-    /**
-      * Returns a new array from a set of elements.
-      * @param items A set of elements to include in the new array object.
-      */
-    of<T>(...items: T[]): Array<T>;
-}
-
-interface String {
-    /** Iterator */
-    [Symbol.iterator](): IterableIterator<string>;
-
-    /**
-      * Returns a nonnegative integer Number less than 1114112 (0x110000) that is the code point 
-      * value of the UTF-16 encoded code point starting at the string element at position pos in 
-      * the String resulting from converting this object to a String. 
-      * If there is no element at that position, the result is undefined. 
-      * If a valid UTF-16 surrogate pair does not begin at pos, the result is the code unit at pos.
-      */
-    codePointAt(pos: number): number;
-
-    /**
-      * Returns true if searchString appears as a substring of the result of converting this 
-      * object to a String, at one or more positions that are 
-      * greater than or equal to position; otherwise, returns false.
-      * @param searchString search string 
-      * @param position If position is undefined, 0 is assumed, so as to search all of the String.
-      */
-    includes(searchString: string, position?: number): boolean;
-
-    /**
-      * Returns true if the sequence of elements of searchString converted to a String is the 
-      * same as the corresponding elements of this object (converted to a String) starting at 
-      * endPosition – length(this). Otherwise returns false.
-      */
-    endsWith(searchString: string, endPosition?: number): boolean;
-
-    /**
-      * Returns the String value result of normalizing the string into the normalization form 
-      * named by form as specified in Unicode Standard Annex #15, Unicode Normalization Forms.
-      * @param form Applicable values: "NFC", "NFD", "NFKC", or "NFKD", If not specified default
-      * is "NFC"
-      */
-    normalize(form?: string): string;
-
-    /**
-      * Returns a String value that is made from count copies appended together. If count is 0, 
-      * T is the empty String is returned.
-      * @param count number of copies to append
-      */
-    repeat(count: number): string;
-
-    /**
-      * Returns true if the sequence of elements of searchString converted to a String is the 
-      * same as the corresponding elements of this object (converted to a String) starting at 
-      * position. Otherwise returns false.
-      */
-    startsWith(searchString: string, position?: number): boolean;
-
-    // Overloads for objects with methods of well-known symbols.
-
-    /**
-      * Matches a string an object that supports being matched against, and returns an array containing the results of that search.
-      * @param matcher An object that supports being matched against.
-      */
-    match(matcher: { [Symbol.match](string: string): RegExpMatchArray; }): RegExpMatchArray;
-
-    /**
-      * Replaces text in a string, using an object that supports replacement within a string.
-      * @param searchValue A object can search for and replace matches within a string.
-      * @param replaceValue A string containing the text to replace for every successful match of searchValue in this string.
-      */
-    replace(searchValue: { [Symbol.replace](string: string, replaceValue: string): string; }, replaceValue: string): string;
-
-    /**
-      * Replaces text in a string, using an object that supports replacement within a string.
-      * @param searchValue A object can search for and replace matches within a string.
-      * @param replacer A function that returns the replacement text.
-      */
-    replace(searchValue: { [Symbol.replace](string: string, replacer: (substring: string, ...args: any[]) => string): string; }, replacer: (substring: string, ...args: any[]) => string): string;
-
-    /**
-      * Finds the first substring match in a regular expression search.
-      * @param searcher An object which supports searching within a string.
-      */
-    search(searcher: { [Symbol.search](string: string): number; }): number;
-
-    /**
-      * Split a string into substrings using the specified separator and return them as an array.
-      * @param splitter An object that can split a string.
-      * @param limit A value used to limit the number of elements returned in the array.
-      */
-    split(splitter: { [Symbol.split](string: string, limit?: number): string[]; }, limit?: number): string[];
-
-    /**
-      * Returns an <a> HTML anchor element and sets the name attribute to the text value
-      * @param name
-      */
-    anchor(name: string): string;
-
-    /** Returns a <big> HTML element */
-    big(): string;
-
-    /** Returns a <blink> HTML element */
-    blink(): string;
-
-    /** Returns a <b> HTML element */
-    bold(): string;
-
-    /** Returns a <tt> HTML element */
-    fixed(): string
-
-    /** Returns a <font> HTML element and sets the color attribute value */
-    fontcolor(color: string): string
-
-    /** Returns a <font> HTML element and sets the size attribute value */
-    fontsize(size: number): string;
-
-    /** Returns a <font> HTML element and sets the size attribute value */
-    fontsize(size: string): string;
-
-    /** Returns an <i> HTML element */
-    italics(): string;
-
-    /** Returns an <a> HTML element and sets the href attribute value */
-    link(url: string): string;
-
-    /** Returns a <small> HTML element */
-    small(): string;
-
-    /** Returns a <strike> HTML element */
-    strike(): string;
-
-    /** Returns a <sub> HTML element */
-    sub(): string;
-
-    /** Returns a <sup> HTML element */
-    sup(): string;
-}
-
-interface StringConstructor {
-    /**
-      * Return the String value whose elements are, in order, the elements in the List elements.
-      * If length is 0, the empty string is returned.
-      */
-    fromCodePoint(...codePoints: number[]): string;
-
-    /**
-      * String.raw is intended for use as a tag function of a Tagged Template String. When called
-      * as such the first argument will be a well formed template call site object and the rest 
-      * parameter will contain the substitution values.
-      * @param template A well-formed template string call site representation.
-      * @param substitutions A set of substitution values.
-      */
-    raw(template: TemplateStringsArray, ...substitutions: any[]): string;
-}
-
-interface IteratorResult<T> {
-    done: boolean;
-    value?: T;
-}
-
-interface Iterator<T> {
-    next(value?: any): IteratorResult<T>;
-    return?(value?: any): IteratorResult<T>;
-    throw?(e?: any): IteratorResult<T>;
-}
-
-interface Iterable<T> {
-    [Symbol.iterator](): Iterator<T>;
-}
-
-interface IterableIterator<T> extends Iterator<T> {
-    [Symbol.iterator](): IterableIterator<T>;
-}
-
-interface GeneratorFunction extends Function {
-    [Symbol.toStringTag]: "GeneratorFunction";
-}
-
-interface GeneratorFunctionConstructor {
-    /**
-      * Creates a new Generator function.
-      * @param args A list of arguments the function accepts.
-      */
-    new (...args: string[]): GeneratorFunction;
-    (...args: string[]): GeneratorFunction;
-    prototype: GeneratorFunction;
-}
-declare var GeneratorFunction: GeneratorFunctionConstructor;
-
-interface Math {
-    /**
-      * Returns the number of leading zero bits in the 32-bit binary representation of a number.
-      * @param x A numeric expression.
-      */
-    clz32(x: number): number;
-
-    /**
-      * Returns the result of 32-bit multiplication of two numbers.
-      * @param x First number
-      * @param y Second number
-      */
-    imul(x: number, y: number): number;
-
-    /**
-      * Returns the sign of the x, indicating whether x is positive, negative or zero.
-      * @param x The numeric expression to test
-      */
-    sign(x: number): number;
-
-    /**
-      * Returns the base 10 logarithm of a number.
-      * @param x A numeric expression.
-      */
-    log10(x: number): number;
-
-    /**
-      * Returns the base 2 logarithm of a number.
-      * @param x A numeric expression.
-      */
-    log2(x: number): number;
-
-    /**
-      * Returns the natural logarithm of 1 + x.
-      * @param x A numeric expression.
-      */
-    log1p(x: number): number;
-
-    /**
-      * Returns the result of (e^x - 1) of x (e raised to the power of x, where e is the base of 
-      * the natural logarithms).
-      * @param x A numeric expression.
-      */
-    expm1(x: number): number;
-
-    /**
-      * Returns the hyperbolic cosine of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    cosh(x: number): number;
-
-    /**
-      * Returns the hyperbolic sine of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    sinh(x: number): number;
-
-    /**
-      * Returns the hyperbolic tangent of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    tanh(x: number): number;
-
-    /**
-      * Returns the inverse hyperbolic cosine of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    acosh(x: number): number;
-
-    /**
-      * Returns the inverse hyperbolic sine of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    asinh(x: number): number;
-
-    /**
-      * Returns the inverse hyperbolic tangent of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    atanh(x: number): number;
-
-    /**
-      * Returns the square root of the sum of squares of its arguments.
-      * @param values Values to compute the square root for.
-      *     If no arguments are passed, the result is +0.
-      *     If there is only one argument, the result is the absolute value.
-      *     If any argument is +Infinity or -Infinity, the result is +Infinity.
-      *     If any argument is NaN, the result is NaN.
-      *     If all arguments are either +0 or −0, the result is +0.
-      */
-    hypot(...values: number[] ): number;
-
-    /**
-      * Returns the integral part of the a numeric expression, x, removing any fractional digits.
-      * If x is already an integer, the result is x.
-      * @param x A numeric expression.
-      */
-    trunc(x: number): number;
-
-    /**
-      * Returns the nearest single precision float representation of a number.
-      * @param x A numeric expression.
-      */
-    fround(x: number): number;
-
-    /**
-      * Returns an implementation-dependent approximation to the cube root of number.
-      * @param x A numeric expression.
-      */
-    cbrt(x: number): number;
-
-    [Symbol.toStringTag]: "Math";
-}
-
-interface Date {
-    /**
-     * Converts a Date object to a string.
-     */
-    [Symbol.toPrimitive](hint: "default"): string;
-    /**
-     * Converts a Date object to a string.
-     */
-    [Symbol.toPrimitive](hint: "string"): string;
-    /**
-     * Converts a Date object to a number.
-     */
-    [Symbol.toPrimitive](hint: "number"): number;
-    /**
-     * Converts a Date object to a string or number.
-     *
-     * @param hint The strings "number", "string", or "default" to specify what primitive to return.
-     *
-     * @throws {TypeError} If 'hint' was given something other than "number", "string", or "default".
-     * @returns A number if 'hint' was "number", a string if 'hint' was "string" or "default".
-     */
-    [Symbol.toPrimitive](hint: string): string | number;
-}
-
-interface RegExp {
-    /**
-      * Matches a string with this regular expression, and returns an array containing the results of
-      * that search.
-      * @param string A string to search within.
-      */
-    [Symbol.match](string: string): RegExpMatchArray;
-
-    /**
-      * Replaces text in a string, using this regular expression.
-      * @param string A String object or string literal whose contents matching against
-      *               this regular expression will be replaced
-      * @param replaceValue A String object or string literal containing the text to replace for every 
-      *                     successful match of this regular expression.
-      */
-    [Symbol.replace](string: string, replaceValue: string): string;
-
-    /**
-      * Replaces text in a string, using this regular expression.
-      * @param string A String object or string literal whose contents matching against
-      *               this regular expression will be replaced
-      * @param replacer A function that returns the replacement text.
-      */
-    [Symbol.replace](string: string, replacer: (substring: string, ...args: any[]) => string): string;
-
-    /**
-      * Finds the position beginning first substring match in a regular expression search
-      * using this regular expression.
-      *
-      * @param string The string to search within.
-      */
-    [Symbol.search](string: string): number;
-
-    /**
-      * Returns an array of substrings that were delimited by strings in the original input that
-      * match against this regular expression.
-      *
-      * If the regular expression contains capturing parentheses, then each time this
-      * regular expression matches, the results (including any undefined results) of the
-      * capturing parentheses are spliced.
-      *
-      * @param string string value to split
-      * @param limit if not undefined, the output array is truncated so that it contains no more
-      * than 'limit' elements.
-      */
-    [Symbol.split](string: string, limit?: number): string[];
-
-    /**
-      * Returns a string indicating the flags of the regular expression in question. This field is read-only.
-      * The characters in this string are sequenced and concatenated in the following order:
-      *
-      *    - "g" for global
-      *    - "i" for ignoreCase
-      *    - "m" for multiline
-      *    - "u" for unicode
-      *    - "y" for sticky
-      *
-      * If no flags are set, the value is the empty string.
-      */
-    flags: string;
-
-    /** 
-      * Returns a Boolean value indicating the state of the sticky flag (y) used with a regular 
-      * expression. Default is false. Read-only. 
-      */
-    sticky: boolean;
-
-    /** 
-      * Returns a Boolean value indicating the state of the Unicode flag (u) used with a regular 
-      * expression. Default is false. Read-only. 
-      */
-    unicode: boolean;
-}
-
-interface RegExpConstructor {
-    [Symbol.species](): RegExpConstructor;
-}
-
-interface Map<K, V> {
-    clear(): void;
-    delete(key: K): boolean;
-    entries(): IterableIterator<[K, V]>;
-    forEach(callbackfn: (value: V, index: K, map: Map<K, V>) => void, thisArg?: any): void;
-    get(key: K): V;
-    has(key: K): boolean;
-    keys(): IterableIterator<K>;
-    set(key: K, value?: V): Map<K, V>;
-    size: number;
-    values(): IterableIterator<V>;
-    [Symbol.iterator]():IterableIterator<[K,V]>;
-    [Symbol.toStringTag]: "Map";
-}
-
-interface MapConstructor {
-    new (): Map<any, any>;
-    new <K, V>(): Map<K, V>;
-    new <K, V>(iterable: Iterable<[K, V]>): Map<K, V>;
-    prototype: Map<any, any>;
-}
-declare var Map: MapConstructor;
-
-interface WeakMap<K, V> {
-    clear(): void;
-    delete(key: K): boolean;
-    get(key: K): V;
-    has(key: K): boolean;
-    set(key: K, value?: V): WeakMap<K, V>;
-    [Symbol.toStringTag]: "WeakMap";
-}
-
-interface WeakMapConstructor {
-    new (): WeakMap<any, any>;
-    new <K, V>(): WeakMap<K, V>;
-    new <K, V>(iterable: Iterable<[K, V]>): WeakMap<K, V>;
-    prototype: WeakMap<any, any>;
-}
-declare var WeakMap: WeakMapConstructor;
-
-interface Set<T> {
-    add(value: T): Set<T>;
-    clear(): void;
-    delete(value: T): boolean;
-    entries(): IterableIterator<[T, T]>;
-    forEach(callbackfn: (value: T, index: T, set: Set<T>) => void, thisArg?: any): void;
-    has(value: T): boolean;
-    keys(): IterableIterator<T>;
-    size: number;
-    values(): IterableIterator<T>;
-    [Symbol.iterator]():IterableIterator<T>;
-    [Symbol.toStringTag]: "Set";
-}
-
-interface SetConstructor {
-    new (): Set<any>;
-    new <T>(): Set<T>;
-    new <T>(iterable: Iterable<T>): Set<T>;
-    prototype: Set<any>;
-}
-declare var Set: SetConstructor;
-
-interface WeakSet<T> {
-    add(value: T): WeakSet<T>;
-    clear(): void;
-    delete(value: T): boolean;
-    has(value: T): boolean;
-    [Symbol.toStringTag]: "WeakSet";
-}
-
-interface WeakSetConstructor {
-    new (): WeakSet<any>;
-    new <T>(): WeakSet<T>;
-    new <T>(iterable: Iterable<T>): WeakSet<T>;
-    prototype: WeakSet<any>;
-}
-declare var WeakSet: WeakSetConstructor;
-
-interface JSON {
-    [Symbol.toStringTag]: "JSON";
-}
-
-/**
-  * Represents a raw buffer of binary data, which is used to store data for the 
-  * different typed arrays. ArrayBuffers cannot be read from or written to directly, 
-  * but can be passed to a typed array or DataView Object to interpret the raw 
-  * buffer as needed. 
-  */
-interface ArrayBuffer {
-    [Symbol.toStringTag]: "ArrayBuffer";
-}
-
-interface DataView {
-    [Symbol.toStringTag]: "DataView";
-}
-
-/**
-  * A typed array of 8-bit integer values. The contents are initialized to 0. If the requested 
-  * number of bytes could not be allocated an exception is raised.
-  */
-interface Int8Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-    [Symbol.toStringTag]: "Int8Array";
-}
-
-interface Int8ArrayConstructor {
-    new (elements: Iterable<number>): Int8Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int8Array;
-}
-
-/**
-  * A typed array of 8-bit unsigned integer values. The contents are initialized to 0. If the 
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Uint8Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-    [Symbol.toStringTag]: "UInt8Array";
-}
-
-interface Uint8ArrayConstructor {
-    new (elements: Iterable<number>): Uint8Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8Array;
-}
-
-/**
-  * A typed array of 8-bit unsigned integer (clamped) values. The contents are initialized to 0. 
-  * If the requested number of bytes could not be allocated an exception is raised.
-  */
-interface Uint8ClampedArray {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-
-    [Symbol.iterator](): IterableIterator<number>;
-    [Symbol.toStringTag]: "Uint8ClampedArray";
-}
-
-interface Uint8ClampedArrayConstructor {
-    new (elements: Iterable<number>): Uint8ClampedArray;
-
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8ClampedArray;
-}
-
-/**
-  * A typed array of 16-bit signed integer values. The contents are initialized to 0. If the 
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Int16Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-
-
-    [Symbol.iterator](): IterableIterator<number>;
-    [Symbol.toStringTag]: "Int16Array";
-}
-
-interface Int16ArrayConstructor {
-    new (elements: Iterable<number>): Int16Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int16Array;
-}
-
-/**
-  * A typed array of 16-bit unsigned integer values. The contents are initialized to 0. If the 
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Uint16Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-    [Symbol.toStringTag]: "Uint16Array";
-}
-
-interface Uint16ArrayConstructor {
-    new (elements: Iterable<number>): Uint16Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint16Array;
-}
-
-/**
-  * A typed array of 32-bit signed integer values. The contents are initialized to 0. If the 
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Int32Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-    [Symbol.toStringTag]: "Int32Array";
-}
-
-interface Int32ArrayConstructor {
-    new (elements: Iterable<number>): Int32Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int32Array;
-}
-
-/**
-  * A typed array of 32-bit unsigned integer values. The contents are initialized to 0. If the 
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Uint32Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-    [Symbol.toStringTag]: "Uint32Array";
-}
-
-interface Uint32ArrayConstructor {
-    new (elements: Iterable<number>): Uint32Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint32Array;
-}
-
-/**
-  * A typed array of 32-bit float values. The contents are initialized to 0. If the requested number
-  * of bytes could not be allocated an exception is raised.
-  */
-interface Float32Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-    [Symbol.toStringTag]: "Float32Array";
-}
-
-interface Float32ArrayConstructor {
-    new (elements: Iterable<number>): Float32Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float32Array;
-}
-
-/**
-  * A typed array of 64-bit float values. The contents are initialized to 0. If the requested 
-  * number of bytes could not be allocated an exception is raised.
-  */
-interface Float64Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-    [Symbol.toStringTag]: "Float64Array";
-}
-
-interface Float64ArrayConstructor {
-    new (elements: Iterable<number>): Float64Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float64Array;
-}
-
-interface ProxyHandler<T> {
-    getPrototypeOf? (target: T): any;
-    setPrototypeOf? (target: T, v: any): boolean;
-    isExtensible? (target: T): boolean;
-    preventExtensions? (target: T): boolean;
-    getOwnPropertyDescriptor? (target: T, p: PropertyKey): PropertyDescriptor;
-    has? (target: T, p: PropertyKey): boolean;
-    get? (target: T, p: PropertyKey, receiver: any): any;
-    set? (target: T, p: PropertyKey, value: any, receiver: any): boolean;
-    deleteProperty? (target: T, p: PropertyKey): boolean;
-    defineProperty? (target: T, p: PropertyKey, attributes: PropertyDescriptor): boolean;
-    enumerate? (target: T): PropertyKey[];
-    ownKeys? (target: T): PropertyKey[];
-    apply? (target: T, thisArg: any, argArray?: any): any;
-    construct? (target: T, thisArg: any, argArray?: any): any;
-}
-
-interface ProxyConstructor {
-    revocable<T>(target: T, handler: ProxyHandler<T>): { proxy: T; revoke: () => void; };
-    new <T>(target: T, handler: ProxyHandler<T>): T
-}
-declare var Proxy: ProxyConstructor;
-
-declare namespace Reflect {
-    function apply(target: Function, thisArgument: any, argumentsList: ArrayLike<any>): any;
-    function construct(target: Function, argumentsList: ArrayLike<any>, newTarget?: any): any;
-    function defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean;
-    function deleteProperty(target: any, propertyKey: PropertyKey): boolean;
-    function enumerate(target: any): IterableIterator<any>;
-    function get(target: any, propertyKey: PropertyKey, receiver?: any): any;
-    function getOwnPropertyDescriptor(target: any, propertyKey: PropertyKey): PropertyDescriptor;
-    function getPrototypeOf(target: any): any;
-    function has(target: any, propertyKey: string): boolean;
-    function has(target: any, propertyKey: symbol): boolean;
-    function isExtensible(target: any): boolean;
-    function ownKeys(target: any): Array<PropertyKey>;
-    function preventExtensions(target: any): boolean;
-    function set(target: any, propertyKey: PropertyKey, value: any, receiver?: any): boolean;
-    function setPrototypeOf(target: any, proto: any): boolean;
-}
-
-/**
- * Represents the completion of an asynchronous operation
- */
-interface Promise<T> {
-    /**
-    * Attaches callbacks for the resolution and/or rejection of the Promise.
-    * @param onfulfilled The callback to execute when the Promise is resolved.
-    * @param onrejected The callback to execute when the Promise is rejected.
-    * @returns A Promise for the completion of which ever callback is executed.
-    */
-    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>;
-    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): Promise<TResult>;
-
-    /**
-     * Attaches a callback for only the rejection of the Promise.
-     * @param onrejected The callback to execute when the Promise is rejected.
-     * @returns A Promise for the completion of the callback.
-     */
-    catch(onrejected?: (reason: any) => T | PromiseLike<T>): Promise<T>;
-    catch(onrejected?: (reason: any) => void): Promise<T>;
-
-    [Symbol.toStringTag]: "Promise";
-}
-
-interface PromiseConstructor {
-    /** 
-      * A reference to the prototype. 
-      */
-    prototype: Promise<any>;
-
-    /**
-     * Creates a new Promise.
-     * @param executor A callback used to initialize the promise. This callback is passed two arguments: 
-     * a resolve callback used resolve the promise with a value or the result of another promise, 
-     * and a reject callback used to reject the promise with a provided reason or error.
-     */
-    new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
-
-    /**
-     * Creates a Promise that is resolved with an array of results when all of the provided Promises 
-     * resolve, or rejected when any Promise is rejected.
-     * @param values An array of Promises.
-     * @returns A new Promise.
-     */
-    all<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>, T10 | PromiseLike<T10>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>;
-    all<T1, T2, T3, T4, T5, T6, T7, T8, T9>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>;
-    all<T1, T2, T3, T4, T5, T6, T7, T8>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8]>;
-    all<T1, T2, T3, T4, T5, T6, T7>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>]): Promise<[T1, T2, T3, T4, T5, T6, T7]>;
-    all<T1, T2, T3, T4, T5, T6>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>]): Promise<[T1, T2, T3, T4, T5, T6]>;
-    all<T1, T2, T3, T4, T5>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>]): Promise<[T1, T2, T3, T4, T5]>;
-    all<T1, T2, T3, T4>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>]): Promise<[T1, T2, T3, T4]>;
-    all<T1, T2, T3>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>]): Promise<[T1, T2, T3]>;
-    all<T1, T2>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>]): Promise<[T1, T2]>;
-    all<TAll>(values: Iterable<TAll | PromiseLike<TAll>>): Promise<TAll[]>;
-
-    /**
-     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved 
-     * or rejected.
-     * @param values An array of Promises.
-     * @returns A new Promise.
-     */
-    race<T>(values: Iterable<T | PromiseLike<T>>): Promise<T>;
-
-    /**
-     * Creates a new rejected promise for the provided reason.
-     * @param reason The reason the promise was rejected.
-     * @returns A new rejected Promise.
-     */
-    reject(reason: any): Promise<void>;
-
-    /**
-     * Creates a new rejected promise for the provided reason.
-     * @param reason The reason the promise was rejected.
-     * @returns A new rejected Promise.
-     */
-    reject<T>(reason: any): Promise<T>;
-
-    /**
-      * Creates a new resolved promise for the provided value.
-      * @param value A promise.
-      * @returns A promise whose internal state matches the provided promise.
-      */
-    resolve<T>(value: T | PromiseLike<T>): Promise<T>;
-
-    /**
-     * Creates a new resolved promise .
-     * @returns A resolved promise.
-     */
-    resolve(): Promise<void>;
-
-    [Symbol.species]: Function;
-}
-
-declare var Promise: PromiseConstructor;
 /////////////////////////////
 /// ECMAScript APIs
 /////////////////////////////
 
-declare var NaN: number;
-declare var Infinity: number;
+declare const NaN: number;
+declare const Infinity: number;
 
 /**
   * Evaluates JavaScript code and executes it. 
@@ -1462,7 +129,7 @@ interface ObjectConstructor {
     (value: any): any;
 
     /** A reference to the prototype for a class of objects. */
-    prototype: Object;
+    readonly prototype: Object;
 
     /** 
       * Returns the prototype of an object. 
@@ -1553,7 +220,7 @@ interface ObjectConstructor {
 /**
   * Provides functionality common to all JavaScript objects.
   */
-declare var Object: ObjectConstructor;
+declare const Object: ObjectConstructor;
 
 /**
   * Creates a new function.
@@ -1564,14 +231,16 @@ interface Function {
       * @param thisArg The object to be used as the this object.
       * @param argArray A set of arguments to be passed to the function.
       */
-    apply(thisArg: any, argArray?: any): any;
+    apply<T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U;
+    apply(this: Function, thisArg: any, argArray?: any): any;
 
     /**
       * Calls a method of an object, substituting another object for the current object.
       * @param thisArg The object to be used as the current object.
       * @param argArray A list of arguments to be passed to the method.
       */
-    call(thisArg: any, ...argArray: any[]): any;
+    call<T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): U;
+    call(this: Function, thisArg: any, ...argArray: any[]): any;
 
     /**
       * For a given function, creates a bound function that has the same body as the original function. 
@@ -1579,10 +248,11 @@ interface Function {
       * @param thisArg An object to which the this keyword can refer inside the new function.
       * @param argArray A list of arguments to be passed to the new function.
       */
-    bind(thisArg: any, ...argArray: any[]): any;
+    bind<T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): (this: void, ...argArray: any[]) => U;
+    bind(this: Function, thisArg: any, ...argArray: any[]): any;
 
     prototype: any;
-    length: number;
+    readonly length: number;
 
     // Non-standard extensions
     arguments: any;
@@ -1596,10 +266,10 @@ interface FunctionConstructor {
       */
     new (...args: string[]): Function;
     (...args: string[]): Function;
-    prototype: Function;
+    readonly prototype: Function;
 }
 
-declare var Function: FunctionConstructor;
+declare const Function: FunctionConstructor;
 
 interface IArguments {
     [index: number]: any;
@@ -1653,13 +323,13 @@ interface String {
       * Matches a string with a regular expression, and returns an array containing the results of that search.
       * @param regexp A variable name or string literal containing the regular expression pattern and flags.
       */
-    match(regexp: string): RegExpMatchArray;
+    match(regexp: string): RegExpMatchArray | null;
 
     /** 
       * Matches a string with a regular expression, and returns an array containing the results of that search.
       * @param regexp A regular expression object that contains the regular expression pattern and applicable flags. 
       */
-    match(regexp: RegExp): RegExpMatchArray;
+    match(regexp: RegExp): RegExpMatchArray | null;
 
     /**
       * Replaces text in a string, using a regular expression or search string.
@@ -1747,7 +417,7 @@ interface String {
     trim(): string;
 
     /** Returns the length of a String object. */
-    length: number;
+    readonly length: number;
 
     // IE extensions
     /**
@@ -1760,20 +430,20 @@ interface String {
     /** Returns the primitive value of the specified object. */
     valueOf(): string;
 
-    [index: number]: string;
+    readonly [index: number]: string;
 }
 
 interface StringConstructor {
     new (value?: any): String;
     (value?: any): string;
-    prototype: String;
+    readonly prototype: String;
     fromCharCode(...codes: number[]): string;
 }
 
 /** 
   * Allows manipulation and formatting of text strings and determination and location of substrings within strings. 
   */
-declare var String: StringConstructor;
+declare const String: StringConstructor;
 
 interface Boolean {
     /** Returns the primitive value of the specified object. */
@@ -1783,10 +453,10 @@ interface Boolean {
 interface BooleanConstructor {
     new (value?: any): Boolean;
     (value?: any): boolean;
-    prototype: Boolean;
+    readonly prototype: Boolean;
 }
 
-declare var Boolean: BooleanConstructor;
+declare const Boolean: BooleanConstructor;
 
 interface Number {
     /**
@@ -1820,57 +490,57 @@ interface Number {
 interface NumberConstructor {
     new (value?: any): Number;
     (value?: any): number;
-    prototype: Number;
+    readonly prototype: Number;
 
     /** The largest number that can be represented in JavaScript. Equal to approximately 1.79E+308. */
-    MAX_VALUE: number;
+    readonly MAX_VALUE: number;
 
     /** The closest number to zero that can be represented in JavaScript. Equal to approximately 5.00E-324. */
-    MIN_VALUE: number;
+    readonly MIN_VALUE: number;
 
     /** 
       * A value that is not a number.
       * In equality comparisons, NaN does not equal any value, including itself. To test whether a value is equivalent to NaN, use the isNaN function.
       */
-    NaN: number;
+    readonly NaN: number;
 
     /** 
       * A value that is less than the largest negative number that can be represented in JavaScript.
       * JavaScript displays NEGATIVE_INFINITY values as -infinity. 
       */
-    NEGATIVE_INFINITY: number;
+    readonly NEGATIVE_INFINITY: number;
 
     /**
       * A value greater than the largest number that can be represented in JavaScript. 
       * JavaScript displays POSITIVE_INFINITY values as infinity. 
       */
-    POSITIVE_INFINITY: number;
+    readonly POSITIVE_INFINITY: number;
 }
 
 /** An object that represents a number of any kind. All JavaScript numbers are 64-bit floating-point numbers. */
-declare var Number: NumberConstructor;
+declare const Number: NumberConstructor;
 
 interface TemplateStringsArray extends Array<string> {
-    raw: string[];
+    readonly raw: string[];
 }
 
 interface Math {
     /** The mathematical constant e. This is Euler's number, the base of natural logarithms. */
-    E: number;
+    readonly E: number;
     /** The natural logarithm of 10. */
-    LN10: number;
+    readonly LN10: number;
     /** The natural logarithm of 2. */
-    LN2: number;
+    readonly LN2: number;
     /** The base-2 logarithm of e. */
-    LOG2E: number;
+    readonly LOG2E: number;
     /** The base-10 logarithm of e. */
-    LOG10E: number;
+    readonly LOG10E: number;
     /** Pi. This is the ratio of the circumference of a circle to its diameter. */
-    PI: number;
+    readonly PI: number;
     /** The square root of 0.5, or, equivalently, one divided by the square root of 2. */
-    SQRT1_2: number;
+    readonly SQRT1_2: number;
     /** The square root of 2. */
-    SQRT2: number;
+    readonly SQRT2: number;
     /**
       * Returns the absolute value of a number (the value without regard to whether it is positive or negative). 
       * For example, the absolute value of -5 is the same as the absolute value of 5.
@@ -1963,7 +633,7 @@ interface Math {
     tan(x: number): number;
 }
 /** An intrinsic object that provides basic mathematics functionality and constants. */
-declare var Math: Math;
+declare const Math: Math;
 
 /** Enables basic storage and retrieval of dates and times. */
 interface Date {
@@ -2125,7 +795,7 @@ interface DateConstructor {
     new (value: string): Date;
     new (year: number, month: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): Date;
     (): string;
-    prototype: Date;
+    readonly prototype: Date;
     /**
       * Parses a string containing a date, and returns the number of milliseconds between that date and midnight, January 1, 1970.
       * @param s A date string
@@ -2145,7 +815,7 @@ interface DateConstructor {
     now(): number;
 }
 
-declare var Date: DateConstructor;
+declare const Date: DateConstructor;
 
 interface RegExpMatchArray extends Array<string> {
     index?: number;
@@ -2162,7 +832,7 @@ interface RegExp {
       * Executes a search on a string using a regular expression pattern, and returns an array containing the results of that search.
       * @param string The String object or string literal on which to perform the search.
       */
-    exec(string: string): RegExpExecArray;
+    exec(string: string): RegExpExecArray | null;
 
     /** 
       * Returns a Boolean value that indicates whether or not a pattern exists in a searched string.
@@ -2171,27 +841,27 @@ interface RegExp {
     test(string: string): boolean;
 
     /** Returns a copy of the text of the regular expression pattern. Read-only. The regExp argument is a Regular expression object. It can be a variable name or a literal. */
-    source: string;
+    readonly source: string;
 
     /** Returns a Boolean value indicating the state of the global flag (g) used with a regular expression. Default is false. Read-only. */
-    global: boolean;
+    readonly global: boolean;
 
     /** Returns a Boolean value indicating the state of the ignoreCase flag (i) used with a regular expression. Default is false. Read-only. */
-    ignoreCase: boolean;
+    readonly ignoreCase: boolean;
 
     /** Returns a Boolean value indicating the state of the multiline flag (m) used with a regular expression. Default is false. Read-only. */
-    multiline: boolean;
+    readonly multiline: boolean;
 
     lastIndex: number;
 
     // Non-standard extensions
-    compile(): RegExp;
+    compile(): this;
 }
 
 interface RegExpConstructor {
     new (pattern: string, flags?: string): RegExp;
     (pattern: string, flags?: string): RegExp;
-    prototype: RegExp;
+    readonly prototype: RegExp;
 
     // Non-standard extensions
     $1: string;
@@ -2206,7 +876,7 @@ interface RegExpConstructor {
     lastMatch: string;
 }
 
-declare var RegExp: RegExpConstructor;
+declare const RegExp: RegExpConstructor;
 
 interface Error {
     name: string;
@@ -2216,10 +886,10 @@ interface Error {
 interface ErrorConstructor {
     new (message?: string): Error;
     (message?: string): Error;
-    prototype: Error;
+    readonly prototype: Error;
 }
 
-declare var Error: ErrorConstructor;
+declare const Error: ErrorConstructor;
 
 interface EvalError extends Error {
 }
@@ -2227,10 +897,10 @@ interface EvalError extends Error {
 interface EvalErrorConstructor {
     new (message?: string): EvalError;
     (message?: string): EvalError;
-    prototype: EvalError;
+    readonly prototype: EvalError;
 }
 
-declare var EvalError: EvalErrorConstructor;
+declare const EvalError: EvalErrorConstructor;
 
 interface RangeError extends Error {
 }
@@ -2238,10 +908,10 @@ interface RangeError extends Error {
 interface RangeErrorConstructor {
     new (message?: string): RangeError;
     (message?: string): RangeError;
-    prototype: RangeError;
+    readonly prototype: RangeError;
 }
 
-declare var RangeError: RangeErrorConstructor;
+declare const RangeError: RangeErrorConstructor;
 
 interface ReferenceError extends Error {
 }
@@ -2249,10 +919,10 @@ interface ReferenceError extends Error {
 interface ReferenceErrorConstructor {
     new (message?: string): ReferenceError;
     (message?: string): ReferenceError;
-    prototype: ReferenceError;
+    readonly prototype: ReferenceError;
 }
 
-declare var ReferenceError: ReferenceErrorConstructor;
+declare const ReferenceError: ReferenceErrorConstructor;
 
 interface SyntaxError extends Error {
 }
@@ -2260,10 +930,10 @@ interface SyntaxError extends Error {
 interface SyntaxErrorConstructor {
     new (message?: string): SyntaxError;
     (message?: string): SyntaxError;
-    prototype: SyntaxError;
+    readonly prototype: SyntaxError;
 }
 
-declare var SyntaxError: SyntaxErrorConstructor;
+declare const SyntaxError: SyntaxErrorConstructor;
 
 interface TypeError extends Error {
 }
@@ -2271,10 +941,10 @@ interface TypeError extends Error {
 interface TypeErrorConstructor {
     new (message?: string): TypeError;
     (message?: string): TypeError;
-    prototype: TypeError;
+    readonly prototype: TypeError;
 }
 
-declare var TypeError: TypeErrorConstructor;
+declare const TypeError: TypeErrorConstructor;
 
 interface URIError extends Error {
 }
@@ -2282,10 +952,10 @@ interface URIError extends Error {
 interface URIErrorConstructor {
     new (message?: string): URIError;
     (message?: string): URIError;
-    prototype: URIError;
+    readonly prototype: URIError;
 }
 
-declare var URIError: URIErrorConstructor;
+declare const URIError: URIErrorConstructor;
 
 interface JSON {
     /**
@@ -2330,13 +1000,115 @@ interface JSON {
 /**
   * An intrinsic object that provides functions to convert JavaScript values to and from the JavaScript Object Notation (JSON) format.
   */
-declare var JSON: JSON;
+declare const JSON: JSON;
 
 
 /////////////////////////////
 /// ECMAScript Array API (specially handled by compiler)
 /////////////////////////////
 
+interface ReadonlyArray<T> {
+    /**
+      * Gets the length of the array. This is a number one higher than the highest element defined in an array.
+      */
+    readonly length: number;
+    /**
+      * Returns a string representation of an array.
+      */
+    toString(): string;
+    toLocaleString(): string;
+    /**
+      * Combines two or more arrays.
+      * @param items Additional items to add to the end of array1.
+      */
+    concat<U extends ReadonlyArray<T>>(...items: U[]): T[];
+    /**
+      * Combines two or more arrays.
+      * @param items Additional items to add to the end of array1.
+      */
+    concat(...items: T[]): T[];
+    /**
+      * Adds all the elements of an array separated by the specified separator string.
+      * @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma.
+      */
+    join(separator?: string): string;
+    /**
+      * Returns a section of an array.
+      * @param start The beginning of the specified portion of the array.
+      * @param end The end of the specified portion of the array.
+      */
+    slice(start?: number, end?: number): T[];
+    /**
+      * Returns the index of the first occurrence of a value in an array.
+      * @param searchElement The value to locate in the array.
+      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at index 0.
+      */
+    indexOf(searchElement: T, fromIndex?: number): number;
+
+    /**
+      * Returns the index of the last occurrence of a specified value in an array.
+      * @param searchElement The value to locate in the array.
+      * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at the last index in the array.
+      */
+    lastIndexOf(searchElement: T, fromIndex?: number): number;
+    /**
+      * Determines whether all the members of an array satisfy the specified test.
+      * @param callbackfn A function that accepts up to three arguments. The every method calls the callbackfn function for each element in array1 until the callbackfn returns false, or until the end of 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.
+      */
+    every(callbackfn: (value: T, index: number, array: ReadonlyArray<T>) => boolean, thisArg?: any): boolean;
+    /**
+      * Determines whether the specified callback function returns true for any element of an array.
+      * @param callbackfn A function that accepts up to three arguments. The some method calls the callbackfn function for each element in array1 until the callbackfn returns true, or until the end of 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.
+      */
+    some(callbackfn: (value: T, index: number, array: ReadonlyArray<T>) => boolean, thisArg?: any): boolean;
+    /**
+      * Performs the specified action for each element in an array.
+      * @param callbackfn  A function that accepts up to three arguments. forEach 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.
+      */
+    forEach(callbackfn: (value: T, index: number, array: ReadonlyArray<T>) => void, thisArg?: any): void;
+    /**
+      * Calls a defined callback function on each element of an array, and returns an array that contains the results.
+      * @param callbackfn A function that accepts up to three arguments. The map 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.
+      */
+    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(callbackfn: (value: T, index: number, array: ReadonlyArray<T>) => boolean, thisArg?: any): T[];
+    /**
+      * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
+      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array.
+      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
+      */
+    reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: ReadonlyArray<T>) => T, initialValue?: T): T;
+    /**
+      * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
+      * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array.
+      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
+      */
+    reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: ReadonlyArray<T>) => U, initialValue: U): U;
+    /**
+      * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
+      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array. 
+      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
+      */
+    reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: ReadonlyArray<T>) => T, initialValue?: T): T;
+    /**
+      * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
+      * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array. 
+      * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
+      */
+    reduceRight<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: ReadonlyArray<T>) => U, initialValue: U): U;
+
+    readonly [n: number]: T;
+}
+
 interface Array<T> {
     /**
       * Gets or sets the length of the array. This is a number one higher than the highest element defined in an array.
@@ -2355,17 +1127,12 @@ interface Array<T> {
     /**
       * Removes the last element from an array and returns it.
       */
-    pop(): T;
+    pop(): T | undefined;
     /**
       * Combines two or more arrays.
       * @param items Additional items to add to the end of array1.
       */
-    concat<U extends T[]>(...items: U[]): T[];
-    /**
-      * Combines two or more arrays.
-      * @param items Additional items to add to the end of array1.
-      */
-    concat(...items: T[]): T[];
+    concat(...items: (T | T[])[]): T[];
     /**
       * Adds all the elements of an array separated by the specified separator string.
       * @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma.
@@ -2378,26 +1145,23 @@ interface Array<T> {
     /**
       * Removes the first element from an array and returns it.
       */
-    shift(): T;
+    shift(): T | undefined;
     /** 
       * Returns a section of an array.
       * @param start The beginning of the specified portion of the array.
       * @param end The end of the specified portion of the array.
       */
     slice(start?: number, end?: number): T[];
-
     /**
       * Sorts an array.
       * @param compareFn The name of the function used to determine the order of the elements. If omitted, the elements are sorted in ascending, ASCII character order.
       */
     sort(compareFn?: (a: T, b: T) => number): T[];
-
     /**
       * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements.
       * @param start The zero-based location in the array from which to start removing elements.
       */
     splice(start: number): T[];
-
     /**
       * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements.
       * @param start The zero-based location in the array from which to start removing elements.
@@ -2405,62 +1169,53 @@ interface Array<T> {
       * @param items Elements to insert into the array in place of the deleted elements.
       */
     splice(start: number, deleteCount: number, ...items: T[]): T[];
-
     /**
       * Inserts new elements at the start of an array.
       * @param items  Elements to insert at the start of the Array.
       */
     unshift(...items: T[]): number;
-
     /**
       * Returns the index of the first occurrence of a value in an array.
       * @param searchElement The value to locate in the array.
       * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at index 0.
       */
     indexOf(searchElement: T, fromIndex?: number): number;
-
     /**
       * Returns the index of the last occurrence of a specified value in an array.
       * @param searchElement The value to locate in the array.
       * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at the last index in the array.
       */
     lastIndexOf(searchElement: T, fromIndex?: number): number;
-
     /**
       * Determines whether all the members of an array satisfy the specified test.
       * @param callbackfn A function that accepts up to three arguments. The every method calls the callbackfn function for each element in array1 until the callbackfn returns false, or until the end of 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.
       */
     every(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
-
     /**
       * Determines whether the specified callback function returns true for any element of an array.
       * @param callbackfn A function that accepts up to three arguments. The some method calls the callbackfn function for each element in array1 until the callbackfn returns true, or until the end of 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.
       */
     some(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
-
     /**
       * Performs the specified action for each element in an array.
       * @param callbackfn  A function that accepts up to three arguments. forEach 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.
       */
     forEach(callbackfn: (value: T, index: number, array: T[]) => void, thisArg?: any): void;
-
     /**
       * Calls a defined callback function on each element of an array, and returns an array that contains the results.
       * @param callbackfn A function that accepts up to three arguments. The map 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.
       */
     map<U>(callbackfn: (value: T, index: number, array: 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(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): T[];
-
     /**
       * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
       * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array.
@@ -2473,7 +1228,6 @@ interface Array<T> {
       * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
       */
     reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
-
     /** 
       * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
       * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array. 
@@ -2498,10 +1252,10 @@ interface ArrayConstructor {
     <T>(arrayLength: number): T[];
     <T>(...items: T[]): T[];
     isArray(arg: any): arg is Array<any>;
-    prototype: Array<any>;
+    readonly prototype: Array<any>;
 }
 
-declare var Array: ArrayConstructor;
+declare const Array: ArrayConstructor;
 
 interface TypedPropertyDescriptor<T> {
     enumerable?: boolean;
@@ -2531,11 +1285,10 @@ interface PromiseLike<T> {
 }
 
 interface ArrayLike<T> {
-    length: number;
-    [n: number]: T;
+    readonly length: number;
+    readonly [n: number]: T;
 }
 
-
 /**
   * Represents a raw buffer of binary data, which is used to store data for the 
   * different typed arrays. ArrayBuffers cannot be read from or written to directly, 
@@ -2546,7 +1299,7 @@ interface ArrayBuffer {
     /**
       * Read-only. The length of the ArrayBuffer (in bytes).
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * Returns a section of an ArrayBuffer.
@@ -2555,11 +1308,11 @@ interface ArrayBuffer {
 }
 
 interface ArrayBufferConstructor {
-    prototype: ArrayBuffer;
+    readonly prototype: ArrayBuffer;
     new (byteLength: number): ArrayBuffer;
     isView(arg: any): arg is ArrayBufferView;
 }
-declare var ArrayBuffer: ArrayBufferConstructor;
+declare const ArrayBuffer: ArrayBufferConstructor;
 
 interface ArrayBufferView {
     /**
@@ -2579,9 +1332,9 @@ interface ArrayBufferView {
 }
 
 interface DataView {
-    buffer: ArrayBuffer;
-    byteLength: number;
-    byteOffset: number;
+    readonly buffer: ArrayBuffer;
+    readonly byteLength: number;
+    readonly byteOffset: number;
     /**
       * Gets the Float32 value at the specified byte offset from the start of the view. There is 
       * no alignment constraint; multi-byte values may be fetched from any offset. 
@@ -2709,7 +1462,7 @@ interface DataView {
 interface DataViewConstructor {
     new (buffer: ArrayBuffer, byteOffset?: number, byteLength?: number): DataView;
 }
-declare var DataView: DataViewConstructor;
+declare const DataView: DataViewConstructor;
 
 /**
   * A typed array of 8-bit integer values. The contents are initialized to 0. If the requested 
@@ -2719,22 +1472,22 @@ interface Int8Array {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -2785,7 +1538,7 @@ interface Int8Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -2796,7 +1549,7 @@ interface Int8Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -2833,7 +1586,7 @@ interface Int8Array {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -2957,7 +1710,7 @@ interface Int8Array {
     [index: number]: number;
 }
 interface Int8ArrayConstructor {
-    prototype: Int8Array;
+    readonly prototype: Int8Array;
     new (length: number): Int8Array;
     new (array: ArrayLike<number>): Int8Array;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Int8Array;
@@ -2965,7 +1718,7 @@ interface Int8ArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -2982,7 +1735,7 @@ interface Int8ArrayConstructor {
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int8Array;
 
 }
-declare var Int8Array: Int8ArrayConstructor;
+declare const Int8Array: Int8ArrayConstructor;
 
 /**
   * A typed array of 8-bit unsigned integer values. The contents are initialized to 0. If the 
@@ -2992,22 +1745,22 @@ interface Uint8Array {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -3058,7 +1811,7 @@ interface Uint8Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -3069,7 +1822,7 @@ interface Uint8Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -3106,7 +1859,7 @@ interface Uint8Array {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -3231,7 +1984,7 @@ interface Uint8Array {
 }
 
 interface Uint8ArrayConstructor {
-    prototype: Uint8Array;
+    readonly prototype: Uint8Array;
     new (length: number): Uint8Array;
     new (array: ArrayLike<number>): Uint8Array;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint8Array;
@@ -3239,7 +1992,7 @@ interface Uint8ArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -3256,7 +2009,7 @@ interface Uint8ArrayConstructor {
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8Array;
 
 }
-declare var Uint8Array: Uint8ArrayConstructor;
+declare const Uint8Array: Uint8ArrayConstructor;
 
 /**
   * A typed array of 8-bit unsigned integer (clamped) values. The contents are initialized to 0. 
@@ -3266,22 +2019,22 @@ interface Uint8ClampedArray {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -3332,7 +2085,7 @@ interface Uint8ClampedArray {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -3343,7 +2096,7 @@ interface Uint8ClampedArray {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -3380,7 +2133,7 @@ interface Uint8ClampedArray {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -3505,7 +2258,7 @@ interface Uint8ClampedArray {
 }
 
 interface Uint8ClampedArrayConstructor {
-    prototype: Uint8ClampedArray;
+    readonly prototype: Uint8ClampedArray;
     new (length: number): Uint8ClampedArray;
     new (array: ArrayLike<number>): Uint8ClampedArray;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint8ClampedArray;
@@ -3513,7 +2266,7 @@ interface Uint8ClampedArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -3529,7 +2282,7 @@ interface Uint8ClampedArrayConstructor {
       */
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8ClampedArray;
 }
-declare var Uint8ClampedArray: Uint8ClampedArrayConstructor;
+declare const Uint8ClampedArray: Uint8ClampedArrayConstructor;
 
 /**
   * A typed array of 16-bit signed integer values. The contents are initialized to 0. If the 
@@ -3539,22 +2292,22 @@ interface Int16Array {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -3605,7 +2358,7 @@ interface Int16Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -3616,7 +2369,7 @@ interface Int16Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -3653,7 +2406,7 @@ interface Int16Array {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -3778,7 +2531,7 @@ interface Int16Array {
 }
 
 interface Int16ArrayConstructor {
-    prototype: Int16Array;
+    readonly prototype: Int16Array;
     new (length: number): Int16Array;
     new (array: ArrayLike<number>): Int16Array;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Int16Array;
@@ -3786,7 +2539,7 @@ interface Int16ArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -3803,7 +2556,7 @@ interface Int16ArrayConstructor {
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int16Array;
 
 }
-declare var Int16Array: Int16ArrayConstructor;
+declare const Int16Array: Int16ArrayConstructor;
 
 /**
   * A typed array of 16-bit unsigned integer values. The contents are initialized to 0. If the 
@@ -3813,22 +2566,22 @@ interface Uint16Array {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -3879,7 +2632,7 @@ interface Uint16Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -3890,7 +2643,7 @@ interface Uint16Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -3927,7 +2680,7 @@ interface Uint16Array {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -4052,7 +2805,7 @@ interface Uint16Array {
 }
 
 interface Uint16ArrayConstructor {
-    prototype: Uint16Array;
+    readonly prototype: Uint16Array;
     new (length: number): Uint16Array;
     new (array: ArrayLike<number>): Uint16Array;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint16Array;
@@ -4060,7 +2813,7 @@ interface Uint16ArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -4077,7 +2830,7 @@ interface Uint16ArrayConstructor {
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint16Array;
 
 }
-declare var Uint16Array: Uint16ArrayConstructor;
+declare const Uint16Array: Uint16ArrayConstructor;
 /**
   * A typed array of 32-bit signed integer values. The contents are initialized to 0. If the 
   * requested number of bytes could not be allocated an exception is raised.
@@ -4086,22 +2839,22 @@ interface Int32Array {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -4152,7 +2905,7 @@ interface Int32Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -4163,7 +2916,7 @@ interface Int32Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -4200,7 +2953,7 @@ interface Int32Array {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -4325,7 +3078,7 @@ interface Int32Array {
 }
 
 interface Int32ArrayConstructor {
-    prototype: Int32Array;
+    readonly prototype: Int32Array;
     new (length: number): Int32Array;
     new (array: ArrayLike<number>): Int32Array;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Int32Array;
@@ -4333,7 +3086,7 @@ interface Int32ArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -4349,7 +3102,7 @@ interface Int32ArrayConstructor {
       */
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int32Array;
 }
-declare var Int32Array: Int32ArrayConstructor;
+declare const Int32Array: Int32ArrayConstructor;
 
 /**
   * A typed array of 32-bit unsigned integer values. The contents are initialized to 0. If the 
@@ -4359,22 +3112,22 @@ interface Uint32Array {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -4425,7 +3178,7 @@ interface Uint32Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -4436,7 +3189,7 @@ interface Uint32Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -4473,7 +3226,7 @@ interface Uint32Array {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -4598,7 +3351,7 @@ interface Uint32Array {
 }
 
 interface Uint32ArrayConstructor {
-    prototype: Uint32Array;
+    readonly prototype: Uint32Array;
     new (length: number): Uint32Array;
     new (array: ArrayLike<number>): Uint32Array;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint32Array;
@@ -4606,7 +3359,7 @@ interface Uint32ArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -4622,7 +3375,7 @@ interface Uint32ArrayConstructor {
       */
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint32Array;
 }
-declare var Uint32Array: Uint32ArrayConstructor;
+declare const Uint32Array: Uint32ArrayConstructor;
 
 /**
   * A typed array of 32-bit float values. The contents are initialized to 0. If the requested number
@@ -4632,22 +3385,22 @@ interface Float32Array {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -4698,7 +3451,7 @@ interface Float32Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -4709,7 +3462,7 @@ interface Float32Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -4746,7 +3499,7 @@ interface Float32Array {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -4871,7 +3624,7 @@ interface Float32Array {
 }
 
 interface Float32ArrayConstructor {
-    prototype: Float32Array;
+    readonly prototype: Float32Array;
     new (length: number): Float32Array;
     new (array: ArrayLike<number>): Float32Array;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Float32Array;
@@ -4879,7 +3632,7 @@ interface Float32ArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -4896,7 +3649,7 @@ interface Float32ArrayConstructor {
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float32Array;
 
 }
-declare var Float32Array: Float32ArrayConstructor;
+declare const Float32Array: Float32ArrayConstructor;
 
 /**
   * A typed array of 64-bit float values. The contents are initialized to 0. If the requested 
@@ -4906,22 +3659,22 @@ interface Float64Array {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * The ArrayBuffer instance referenced by the array. 
       */
-    buffer: ArrayBuffer;
+    readonly buffer: ArrayBuffer;
 
     /**
       * The length in bytes of the array.
       */
-    byteLength: number;
+    readonly byteLength: number;
 
     /**
       * The offset in bytes of the array.
       */
-    byteOffset: number;
+    readonly byteOffset: number;
 
     /** 
       * Returns the this object after copying a section of the array identified by start and end
@@ -4972,7 +3725,7 @@ interface Float64Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -4983,7 +3736,7 @@ interface Float64Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -5020,7 +3773,7 @@ interface Float64Array {
     /**
       * The length of the array.
       */
-    length: number;
+    readonly length: number;
 
     /**
       * Calls a defined callback function on each element of an array, and returns an array that 
@@ -5145,7 +3898,7 @@ interface Float64Array {
 }
 
 interface Float64ArrayConstructor {
-    prototype: Float64Array;
+    readonly prototype: Float64Array;
     new (length: number): Float64Array;
     new (array: ArrayLike<number>): Float64Array;
     new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Float64Array;
@@ -5153,7 +3906,7 @@ interface Float64ArrayConstructor {
     /**
       * The size in bytes of each element in the array. 
       */
-    BYTES_PER_ELEMENT: number;
+    readonly BYTES_PER_ELEMENT: number;
 
     /**
       * Returns a new array from a set of elements.
@@ -5169,7 +3922,8 @@ interface Float64ArrayConstructor {
       */
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float64Array;
 }
-declare var Float64Array: Float64ArrayConstructor;
+declare const Float64Array: Float64ArrayConstructor;
+
 /////////////////////////////
 /// ECMAScript Internationalization API 
 /////////////////////////////
@@ -5370,9 +4124,1449 @@ interface Date {
       */
     toLocaleTimeString(locale?: string, options?: Intl.DateTimeFormatOptions): string;
 }
+declare type PropertyKey = string | number | symbol;
+
+interface Array<T> {
+    /** 
+      * Returns the value of the first element in the array where predicate is true, and undefined 
+      * otherwise.
+      * @param predicate find calls predicate once for each element of the array, in ascending 
+      * order, until it finds one where predicate returns true. If such an element is found, find 
+      * immediately returns that element value. Otherwise, find returns undefined.
+      * @param thisArg If provided, it will be used as the this value for each invocation of 
+      * predicate. If it is not provided, undefined is used instead.
+      */
+    find(predicate: (value: T, index: number, obj: Array<T>) => boolean, thisArg?: any): T | undefined;
+
+    /** 
+      * Returns the index of the first element in the array where predicate is true, and undefined 
+      * otherwise.
+      * @param predicate find calls predicate once for each element of the array, in ascending 
+      * order, until it finds one where predicate returns true. If such an element is found, find 
+      * immediately returns that element value. Otherwise, find returns undefined.
+      * @param thisArg If provided, it will be used as the this value for each invocation of 
+      * predicate. If it is not provided, undefined is used instead.
+      */
+    findIndex(predicate: (value: T) => boolean, thisArg?: any): number | undefined;
+
+    /**
+      * Returns the this object after filling the section identified by start and end with value
+      * @param value value to fill array section with
+      * @param start index to start filling the array at. If start is negative, it is treated as 
+      * length+start where length is the length of the array. 
+      * @param end index to stop filling the array at. If end is negative, it is treated as 
+      * length+end.
+      */
+    fill(value: T, start?: number, end?: number): T[];
+
+    /** 
+      * Returns the this object after copying a section of the array identified by start and end
+      * to the same array starting at position target
+      * @param target If target is negative, it is treated as length+target where length is the 
+      * length of the array. 
+      * @param start If start is negative, it is treated as length+start. If end is negative, it 
+      * is treated as length+end.
+      * @param end If not specified, length of the this object is used as its default value. 
+      */
+    copyWithin(target: number, start: number, end?: number): T[];
+}
+
+interface ArrayConstructor {
+    /**
+      * Creates an array from an array-like object.
+      * @param arrayLike An array-like object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from<T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): Array<U>;
 
 
-/////////////////////////////
+    /**
+      * Creates an array from an array-like object.
+      * @param arrayLike An array-like object to convert to an array.
+      */
+    from<T>(arrayLike: ArrayLike<T>): Array<T>;
+
+    /**
+      * Returns a new array from a set of elements.
+      * @param items A set of elements to include in the new array object.
+      */
+    of<T>(...items: T[]): Array<T>;
+}
+
+interface Function {
+    /**
+      * Returns the name of the function. Function names are read-only and can not be changed.
+      */
+    readonly name: string;
+}
+
+interface Math {
+    /**
+      * Returns the number of leading zero bits in the 32-bit binary representation of a number.
+      * @param x A numeric expression.
+      */
+    clz32(x: number): number;
+
+    /**
+      * Returns the result of 32-bit multiplication of two numbers.
+      * @param x First number
+      * @param y Second number
+      */
+    imul(x: number, y: number): number;
+
+    /**
+      * Returns the sign of the x, indicating whether x is positive, negative or zero.
+      * @param x The numeric expression to test
+      */
+    sign(x: number): number;
+
+    /**
+      * Returns the base 10 logarithm of a number.
+      * @param x A numeric expression.
+      */
+    log10(x: number): number;
+
+    /**
+      * Returns the base 2 logarithm of a number.
+      * @param x A numeric expression.
+      */
+    log2(x: number): number;
+
+    /**
+      * Returns the natural logarithm of 1 + x.
+      * @param x A numeric expression.
+      */
+    log1p(x: number): number;
+
+    /**
+      * Returns the result of (e^x - 1) of x (e raised to the power of x, where e is the base of 
+      * the natural logarithms).
+      * @param x A numeric expression.
+      */
+    expm1(x: number): number;
+
+    /**
+      * Returns the hyperbolic cosine of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    cosh(x: number): number;
+
+    /**
+      * Returns the hyperbolic sine of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    sinh(x: number): number;
+
+    /**
+      * Returns the hyperbolic tangent of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    tanh(x: number): number;
+
+    /**
+      * Returns the inverse hyperbolic cosine of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    acosh(x: number): number;
+
+    /**
+      * Returns the inverse hyperbolic sine of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    asinh(x: number): number;
+
+    /**
+      * Returns the inverse hyperbolic tangent of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    atanh(x: number): number;
+
+    /**
+      * Returns the square root of the sum of squares of its arguments.
+      * @param values Values to compute the square root for.
+      *     If no arguments are passed, the result is +0.
+      *     If there is only one argument, the result is the absolute value.
+      *     If any argument is +Infinity or -Infinity, the result is +Infinity.
+      *     If any argument is NaN, the result is NaN.
+      *     If all arguments are either +0 or −0, the result is +0.
+      */
+    hypot(...values: number[] ): number;
+
+    /**
+      * Returns the integral part of the a numeric expression, x, removing any fractional digits.
+      * If x is already an integer, the result is x.
+      * @param x A numeric expression.
+      */
+    trunc(x: number): number;
+
+    /**
+      * Returns the nearest single precision float representation of a number.
+      * @param x A numeric expression.
+      */
+    fround(x: number): number;
+
+    /**
+      * Returns an implementation-dependent approximation to the cube root of number.
+      * @param x A numeric expression.
+      */
+    cbrt(x: number): number;
+}
+
+interface NumberConstructor {
+    /**
+      * The value of Number.EPSILON is the difference between 1 and the smallest value greater than 1
+      * that is representable as a Number value, which is approximately: 
+      * 2.2204460492503130808472633361816 x 10‍−‍16.
+      */
+    readonly EPSILON: number;
+
+    /**
+      * Returns true if passed value is finite.
+      * Unlike the global isFininte, Number.isFinite doesn't forcibly convert the parameter to a 
+      * number. Only finite values of the type number, result in true.
+      * @param number A numeric value.
+      */
+    isFinite(number: number): boolean;
+
+    /**
+      * Returns true if the value passed is an integer, false otherwise.
+      * @param number A numeric value.
+      */
+    isInteger(number: number): boolean;
+
+    /**
+      * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a 
+      * number). Unlike the global isNaN(), Number.isNaN() doesn't forcefully convert the parameter
+      * to a number. Only values of the type number, that are also NaN, result in true.
+      * @param number A numeric value.
+      */
+    isNaN(number: number): boolean;
+
+    /**
+      * Returns true if the value passed is a safe integer.
+      * @param number A numeric value.
+      */
+    isSafeInteger(number: number): boolean;
+
+    /** 
+      * The value of the largest integer n such that n and n + 1 are both exactly representable as 
+      * a Number value. 
+      * The value of Number.MIN_SAFE_INTEGER is 9007199254740991 2^53 − 1.
+      */
+    readonly MAX_SAFE_INTEGER: number;
+
+    /** 
+      * The value of the smallest integer n such that n and n − 1 are both exactly representable as 
+      * a Number value. 
+      * The value of Number.MIN_SAFE_INTEGER is −9007199254740991 (−(2^53 − 1)).
+      */
+    readonly MIN_SAFE_INTEGER: number;
+
+    /**
+      * Converts a string to a floating-point number. 
+      * @param string A string that contains a floating-point number. 
+      */
+    parseFloat(string: string): number;
+
+    /**
+      * Converts A string to an integer.
+      * @param s A string to convert into a number.
+      * @param radix A value between 2 and 36 that specifies the base of the number in numString. 
+      * If this argument is not supplied, strings with a prefix of '0x' are considered hexadecimal.
+      * All other strings are considered decimal.
+      */
+    parseInt(string: string, radix?: number): number;
+}
+
+interface Object {
+    /**
+      * Determines whether an object has a property with the specified name. 
+      * @param v A property name.
+      */
+    hasOwnProperty(v: PropertyKey): boolean
+
+    /** 
+      * Determines whether a specified property is enumerable.
+      * @param v A property name.
+      */
+    propertyIsEnumerable(v: PropertyKey): boolean;
+}
+
+interface ObjectConstructor {
+    /**
+      * Copy the values of all of the enumerable own properties from one or more source objects to a 
+      * target object. Returns the target object.
+      * @param target The target object to copy to.
+      * @param source The source object from which to copy properties.
+      */
+    assign<T, U>(target: T, source: U): T & U;
+
+    /**
+      * Copy the values of all of the enumerable own properties from one or more source objects to a 
+      * target object. Returns the target object.
+      * @param target The target object to copy to.
+      * @param source1 The first source object from which to copy properties.
+      * @param source2 The second source object from which to copy properties.
+      */
+    assign<T, U, V>(target: T, source1: U, source2: V): T & U & V;
+
+    /**
+      * Copy the values of all of the enumerable own properties from one or more source objects to a 
+      * target object. Returns the target object.
+      * @param target The target object to copy to.
+      * @param source1 The first source object from which to copy properties.
+      * @param source2 The second source object from which to copy properties.
+      * @param source3 The third source object from which to copy properties.
+      */
+    assign<T, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W;
+
+    /**
+      * Copy the values of all of the enumerable own properties from one or more source objects to a 
+      * target object. Returns the target object.
+      * @param target The target object to copy to.
+      * @param sources One or more source objects from which to copy properties
+      */
+    assign(target: any, ...sources: any[]): any;
+
+    /**
+      * Returns an array of all symbol properties found directly on object o.
+      * @param o Object to retrieve the symbols from.
+      */
+    getOwnPropertySymbols(o: any): symbol[];
+
+    /**
+      * Returns true if the values are the same value, false otherwise.
+      * @param value1 The first value.
+      * @param value2 The second value.
+      */
+    is(value1: any, value2: any): boolean;
+
+    /**
+      * Sets the prototype of a specified object o to  object proto or null. Returns the object o.
+      * @param o The object to change its prototype.
+      * @param proto The value of the new prototype or null.
+      */
+    setPrototypeOf(o: any, proto: any): any;
+
+    /**
+      * Gets the own property descriptor of the specified object. 
+      * An own property descriptor is one that is defined directly on the object and is not 
+      * inherited from the object's prototype. 
+      * @param o Object that contains the property.
+      * @param p Name of the property.
+    */
+    getOwnPropertyDescriptor(o: any, propertyKey: PropertyKey): PropertyDescriptor;
+
+    /**
+      * Adds a property to an object, or modifies attributes of an existing property. 
+      * @param o Object on which to add or modify the property. This can be a native JavaScript 
+      * object (that is, a user-defined object or a built in object) or a DOM object.
+      * @param p The property name.
+      * @param attributes Descriptor for the property. It can be for a data property or an accessor
+      *  property.
+      */
+    defineProperty(o: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): any;
+}
+
+interface RegExp {
+    /**
+      * Returns a string indicating the flags of the regular expression in question. This field is read-only.
+      * The characters in this string are sequenced and concatenated in the following order:
+      *
+      *    - "g" for global
+      *    - "i" for ignoreCase
+      *    - "m" for multiline
+      *    - "u" for unicode
+      *    - "y" for sticky
+      *
+      * If no flags are set, the value is the empty string.
+      */
+    readonly flags: string;
+
+    /** 
+      * Returns a Boolean value indicating the state of the sticky flag (y) used with a regular 
+      * expression. Default is false. Read-only. 
+      */
+    readonly sticky: boolean;
+
+    /** 
+      * Returns a Boolean value indicating the state of the Unicode flag (u) used with a regular 
+      * expression. Default is false. Read-only. 
+      */
+    readonly unicode: boolean;
+}
+
+interface String {
+    /**
+      * Returns a nonnegative integer Number less than 1114112 (0x110000) that is the code point 
+      * value of the UTF-16 encoded code point starting at the string element at position pos in 
+      * the String resulting from converting this object to a String. 
+      * If there is no element at that position, the result is undefined. 
+      * If a valid UTF-16 surrogate pair does not begin at pos, the result is the code unit at pos.
+      */
+    codePointAt(pos: number): number | undefined;
+
+    /**
+      * Returns true if searchString appears as a substring of the result of converting this 
+      * object to a String, at one or more positions that are 
+      * greater than or equal to position; otherwise, returns false.
+      * @param searchString search string 
+      * @param position If position is undefined, 0 is assumed, so as to search all of the String.
+      */
+    includes(searchString: string, position?: number): boolean;
+
+    /**
+      * Returns true if the sequence of elements of searchString converted to a String is the 
+      * same as the corresponding elements of this object (converted to a String) starting at 
+      * endPosition – length(this). Otherwise returns false.
+      */
+    endsWith(searchString: string, endPosition?: number): boolean;
+
+    /**
+      * Returns the String value result of normalizing the string into the normalization form 
+      * named by form as specified in Unicode Standard Annex #15, Unicode Normalization Forms.
+      * @param form Applicable values: "NFC", "NFD", "NFKC", or "NFKD", If not specified default
+      * is "NFC"
+      */
+    normalize(form?: string): string;
+
+    /**
+      * Returns a String value that is made from count copies appended together. If count is 0, 
+      * T is the empty String is returned.
+      * @param count number of copies to append
+      */
+    repeat(count: number): string;
+
+    /**
+      * Returns true if the sequence of elements of searchString converted to a String is the 
+      * same as the corresponding elements of this object (converted to a String) starting at 
+      * position. Otherwise returns false.
+      */
+    startsWith(searchString: string, position?: number): boolean;
+
+    /**
+      * Returns an <a> HTML anchor element and sets the name attribute to the text value
+      * @param name
+      */
+    anchor(name: string): string;
+
+    /** Returns a <big> HTML element */
+    big(): string;
+
+    /** Returns a <blink> HTML element */
+    blink(): string;
+
+    /** Returns a <b> HTML element */
+    bold(): string;
+
+    /** Returns a <tt> HTML element */
+    fixed(): string
+
+    /** Returns a <font> HTML element and sets the color attribute value */
+    fontcolor(color: string): string
+
+    /** Returns a <font> HTML element and sets the size attribute value */
+    fontsize(size: number): string;
+
+    /** Returns a <font> HTML element and sets the size attribute value */
+    fontsize(size: string): string;
+
+    /** Returns an <i> HTML element */
+    italics(): string;
+
+    /** Returns an <a> HTML element and sets the href attribute value */
+    link(url: string): string;
+
+    /** Returns a <small> HTML element */
+    small(): string;
+
+    /** Returns a <strike> HTML element */
+    strike(): string;
+
+    /** Returns a <sub> HTML element */
+    sub(): string;
+
+    /** Returns a <sup> HTML element */
+    sup(): string;
+}
+
+interface StringConstructor {
+    /**
+      * Return the String value whose elements are, in order, the elements in the List elements.
+      * If length is 0, the empty string is returned.
+      */
+    fromCodePoint(...codePoints: number[]): string;
+
+    /**
+      * String.raw is intended for use as a tag function of a Tagged Template String. When called
+      * as such the first argument will be a well formed template call site object and the rest 
+      * parameter will contain the substitution values.
+      * @param template A well-formed template string call site representation.
+      * @param substitutions A set of substitution values.
+      */
+    raw(template: TemplateStringsArray, ...substitutions: any[]): string;
+}interface Map<K, V> {
+    clear(): void;
+    delete(key: K): boolean;
+    forEach(callbackfn: (value: V, index: K, map: Map<K, V>) => void, thisArg?: any): void;
+    get(key: K): V | undefined;
+    has(key: K): boolean;
+    set(key: K, value?: V): Map<K, V>;
+    readonly size: number;
+}
+
+interface MapConstructor {
+    new (): Map<any, any>;
+    new <K, V>(): Map<K, V>;
+    readonly prototype: Map<any, any>;
+}
+declare var Map: MapConstructor;
+
+interface WeakMap<K, V> {
+    clear(): void;
+    delete(key: K): boolean;
+    get(key: K): V | undefined;
+    has(key: K): boolean;
+    set(key: K, value?: V): WeakMap<K, V>;
+
+}
+
+interface WeakMapConstructor {
+    new (): WeakMap<any, any>;
+    new <K, V>(): WeakMap<K, V>;
+    readonly prototype: WeakMap<any, any>;
+}
+declare var WeakMap: WeakMapConstructor;
+
+interface Set<T> {
+    add(value: T): Set<T>;
+    clear(): void;
+    delete(value: T): boolean;
+    entries(): IterableIterator<[T, T]>;
+    forEach(callbackfn: (value: T, index: T, set: Set<T>) => void, thisArg?: any): void;
+    has(value: T): boolean;
+    keys(): IterableIterator<T>;
+    readonly size: number;
+    values(): IterableIterator<T>;
+    [Symbol.iterator]():IterableIterator<T>;
+    readonly [Symbol.toStringTag]: "Set";
+}
+
+interface SetConstructor {
+    new (): Set<any>;
+    new <T>(): Set<T>;
+    new <T>(iterable: Iterable<T>): Set<T>;
+    readonly prototype: Set<any>;
+}
+declare var Set: SetConstructor;
+
+interface WeakSet<T> {
+    add(value: T): WeakSet<T>;
+    clear(): void;
+    delete(value: T): boolean;
+    has(value: T): boolean;
+    readonly [Symbol.toStringTag]: "WeakSet";
+}
+
+interface WeakSetConstructor {
+    new (): WeakSet<any>;
+    new <T>(): WeakSet<T>;
+    new <T>(iterable: Iterable<T>): WeakSet<T>;
+    readonly prototype: WeakSet<any>;
+}
+declare var WeakSet: WeakSetConstructor;
+interface GeneratorFunction extends Function { }
+
+interface GeneratorFunctionConstructor {
+    /**
+      * Creates a new Generator function.
+      * @param args A list of arguments the function accepts.
+      */
+    new (...args: string[]): GeneratorFunction;
+    (...args: string[]): GeneratorFunction;
+    readonly prototype: GeneratorFunction;
+}
+declare var GeneratorFunction: GeneratorFunctionConstructor;
+/// <reference path="lib.es2015.symbol.d.ts" />
+
+interface IteratorResult<T> {
+    done: boolean;
+    value?: T;
+}
+
+interface Iterator<T> {
+    next(value?: any): IteratorResult<T>;
+    return?(value?: any): IteratorResult<T>;
+    throw?(e?: any): IteratorResult<T>;
+}
+
+interface Iterable<T> { }
+
+interface IterableIterator<T> extends Iterator<T> { }
+
+interface Array<T> {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, T]>;
+
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<T>;
+}
+
+interface ArrayConstructor {
+    /**
+      * Creates an array from an iterable object.
+      * @param iterable An iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from<T, U>(iterable: Iterable<T>, mapfn: (v: T, k: number) => U, thisArg?: any): Array<U>;
+    
+    /**
+      * Creates an array from an iterable object.
+      * @param iterable An iterable object to convert to an array.
+      */
+    from<T>(iterable: Iterable<T>): Array<T>;
+}
+
+interface Map<K, V> {
+    entries(): IterableIterator<[K, V]>;
+    keys(): IterableIterator<K>;
+    values(): IterableIterator<V>;
+}
+
+interface MapConstructor {
+    new <K, V>(iterable: Iterable<[K, V]>): Map<K, V>;
+}
+
+interface WeakMap<K, V> { }
+
+interface WeakMapConstructor {
+    new <K, V>(iterable: Iterable<[K, V]>): WeakMap<K, V>;
+}
+
+interface Promise<T> { }
+
+interface PromiseConstructor {
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises 
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<TAll>(values: Iterable<TAll | PromiseLike<TAll>>): Promise<TAll[]>;
+    
+    /**
+     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved 
+     * or rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    race<T>(values: Iterable<T | PromiseLike<T>>): Promise<T>;
+}
+
+declare namespace Reflect {
+    function enumerate(target: any): IterableIterator<any>;
+}
+
+/**
+  * A typed array of 8-bit integer values. The contents are initialized to 0. If the requested 
+  * number of bytes could not be allocated an exception is raised.
+  */
+interface Int8Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Int8ArrayConstructor {
+    new (elements: Iterable<number>): Int8Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int8Array;
+}
+
+/**
+  * A typed array of 8-bit unsigned integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint8Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Uint8ArrayConstructor {
+    new (elements: Iterable<number>): Uint8Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8Array;
+}
+
+/**
+  * A typed array of 8-bit unsigned integer (clamped) values. The contents are initialized to 0. 
+  * If the requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint8ClampedArray {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Uint8ClampedArrayConstructor {
+    new (elements: Iterable<number>): Uint8ClampedArray;
+
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8ClampedArray;
+}
+
+/**
+  * A typed array of 16-bit signed integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Int16Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Int16ArrayConstructor {
+    new (elements: Iterable<number>): Int16Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int16Array;
+}
+
+/**
+  * A typed array of 16-bit unsigned integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint16Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Uint16ArrayConstructor {
+    new (elements: Iterable<number>): Uint16Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint16Array;
+}
+
+/**
+  * A typed array of 32-bit signed integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Int32Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Int32ArrayConstructor {
+    new (elements: Iterable<number>): Int32Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int32Array;
+}
+
+/**
+  * A typed array of 32-bit unsigned integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint32Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Uint32ArrayConstructor {
+    new (elements: Iterable<number>): Uint32Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint32Array;
+}
+
+/**
+  * A typed array of 32-bit float values. The contents are initialized to 0. If the requested number
+  * of bytes could not be allocated an exception is raised.
+  */
+interface Float32Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Float32ArrayConstructor {
+    new (elements: Iterable<number>): Float32Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float32Array;
+}
+
+/**
+  * A typed array of 64-bit float values. The contents are initialized to 0. If the requested 
+  * number of bytes could not be allocated an exception is raised.
+  */
+interface Float64Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Float64ArrayConstructor {
+    new (elements: Iterable<number>): Float64Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float64Array;
+}/**
+ * Represents the completion of an asynchronous operation
+ */
+interface Promise<T> {
+    /**
+    * Attaches callbacks for the resolution and/or rejection of the Promise.
+    * @param onfulfilled The callback to execute when the Promise is resolved.
+    * @param onrejected The callback to execute when the Promise is rejected.
+    * @returns A Promise for the completion of which ever callback is executed.
+    */
+    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>;
+    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): Promise<TResult>;
+
+    /**
+     * Attaches a callback for only the rejection of the Promise.
+     * @param onrejected The callback to execute when the Promise is rejected.
+     * @returns A Promise for the completion of the callback.
+     */
+    catch(onrejected?: (reason: any) => T | PromiseLike<T>): Promise<T>;
+    catch(onrejected?: (reason: any) => void): Promise<T>;
+}
+
+interface PromiseConstructor {
+    /** 
+      * A reference to the prototype. 
+      */
+    readonly prototype: Promise<any>;
+
+    /**
+     * Creates a new Promise.
+     * @param executor A callback used to initialize the promise. This callback is passed two arguments: 
+     * a resolve callback used resolve the promise with a value or the result of another promise, 
+     * and a reject callback used to reject the promise with a provided reason or error.
+     */
+    new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
+
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises 
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>, T10 | PromiseLike<T10>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>;
+    all<T1, T2, T3, T4, T5, T6, T7, T8, T9>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>;
+    all<T1, T2, T3, T4, T5, T6, T7, T8>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8]>;
+    all<T1, T2, T3, T4, T5, T6, T7>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>]): Promise<[T1, T2, T3, T4, T5, T6, T7]>;
+    all<T1, T2, T3, T4, T5, T6>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>]): Promise<[T1, T2, T3, T4, T5, T6]>;
+    all<T1, T2, T3, T4, T5>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>]): Promise<[T1, T2, T3, T4, T5]>;
+    all<T1, T2, T3, T4>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>]): Promise<[T1, T2, T3, T4]>;
+    all<T1, T2, T3>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>]): Promise<[T1, T2, T3]>;
+    all<T1, T2>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>]): Promise<[T1, T2]>;
+
+    /**
+     * Creates a new rejected promise for the provided reason.
+     * @param reason The reason the promise was rejected.
+     * @returns A new rejected Promise.
+     */
+    reject(reason: any): Promise<void>;
+
+    /**
+     * Creates a new rejected promise for the provided reason.
+     * @param reason The reason the promise was rejected.
+     * @returns A new rejected Promise.
+     */
+    reject<T>(reason: any): Promise<T>;
+
+    /**
+      * Creates a new resolved promise for the provided value.
+      * @param value A promise.
+      * @returns A promise whose internal state matches the provided promise.
+      */
+    resolve<T>(value: T | PromiseLike<T>): Promise<T>;
+
+    /**
+     * Creates a new resolved promise .
+     * @returns A resolved promise.
+     */
+    resolve(): Promise<void>;
+}
+
+declare var Promise: PromiseConstructor;interface ProxyHandler<T> {
+    getPrototypeOf? (target: T): any;
+    setPrototypeOf? (target: T, v: any): boolean;
+    isExtensible? (target: T): boolean;
+    preventExtensions? (target: T): boolean;
+    getOwnPropertyDescriptor? (target: T, p: PropertyKey): PropertyDescriptor;
+    has? (target: T, p: PropertyKey): boolean;
+    get? (target: T, p: PropertyKey, receiver: any): any;
+    set? (target: T, p: PropertyKey, value: any, receiver: any): boolean;
+    deleteProperty? (target: T, p: PropertyKey): boolean;
+    defineProperty? (target: T, p: PropertyKey, attributes: PropertyDescriptor): boolean;
+    enumerate? (target: T): PropertyKey[];
+    ownKeys? (target: T): PropertyKey[];
+    apply? (target: T, thisArg: any, argArray?: any): any;
+    construct? (target: T, thisArg: any, argArray?: any): any;
+}
+
+interface ProxyConstructor {
+    revocable<T>(target: T, handler: ProxyHandler<T>): { proxy: T; revoke: () => void; };
+    new <T>(target: T, handler: ProxyHandler<T>): T
+}
+declare var Proxy: ProxyConstructor;declare namespace Reflect {
+    function apply(target: Function, thisArgument: any, argumentsList: ArrayLike<any>): any;
+    function construct(target: Function, argumentsList: ArrayLike<any>, newTarget?: any): any;
+    function defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean;
+    function deleteProperty(target: any, propertyKey: PropertyKey): boolean;
+    function get(target: any, propertyKey: PropertyKey, receiver?: any): any;
+    function getOwnPropertyDescriptor(target: any, propertyKey: PropertyKey): PropertyDescriptor;
+    function getPrototypeOf(target: any): any;
+    function has(target: any, propertyKey: string): boolean;
+    function has(target: any, propertyKey: symbol): boolean;
+    function isExtensible(target: any): boolean;
+    function ownKeys(target: any): Array<PropertyKey>;
+    function preventExtensions(target: any): boolean;
+    function set(target: any, propertyKey: PropertyKey, value: any, receiver?: any): boolean;
+    function setPrototypeOf(target: any, proto: any): boolean;
+}interface Symbol {
+    /** Returns a string representation of an object. */
+    toString(): string;
+
+    /** Returns the primitive value of the specified object. */
+    valueOf(): Object;
+}
+
+interface SymbolConstructor {
+    /** 
+      * A reference to the prototype. 
+      */
+    readonly prototype: Symbol;
+
+    /**
+      * Returns a new unique Symbol value.
+      * @param  description Description of the new Symbol object.
+      */
+    (description?: string|number): symbol;
+
+    /**
+      * Returns a Symbol object from the global symbol registry matching the given key if found. 
+      * Otherwise, returns a new symbol with this key.
+      * @param key key to search for.
+      */
+    for(key: string): symbol;
+
+    /**
+      * Returns a key from the global symbol registry matching the given Symbol if found. 
+      * Otherwise, returns a undefined.
+      * @param sym Symbol to find the key for.
+      */
+    keyFor(sym: symbol): string | undefined;
+}
+
+declare var Symbol: SymbolConstructor;/// <reference path="lib.es2015.symbol.d.ts" />
+
+interface SymbolConstructor {
+    /** 
+      * A method that determines if a constructor object recognizes an object as one of the 
+      * constructor’s instances. Called by the semantics of the instanceof operator. 
+      */
+    readonly hasInstance: symbol;
+
+    /** 
+      * A Boolean value that if true indicates that an object should flatten to its array elements
+      * by Array.prototype.concat.
+      */
+    readonly isConcatSpreadable: symbol;
+
+    /** 
+      * A method that returns the default iterator for an object. Called by the semantics of the 
+      * for-of statement.
+      */
+    readonly iterator: symbol;
+
+    /**
+      * A regular expression method that matches the regular expression against a string. Called 
+      * by the String.prototype.match method. 
+      */
+    readonly match: symbol;
+
+    /** 
+      * A regular expression method that replaces matched substrings of a string. Called by the 
+      * String.prototype.replace method.
+      */
+    readonly replace: symbol;
+
+    /**
+      * A regular expression method that returns the index within a string that matches the 
+      * regular expression. Called by the String.prototype.search method.
+      */
+    readonly search: symbol;
+
+    /** 
+      * A function valued property that is the constructor function that is used to create 
+      * derived objects.
+      */
+    readonly species: symbol;
+
+    /**
+      * A regular expression method that splits a string at the indices that match the regular 
+      * expression. Called by the String.prototype.split method.
+      */
+    readonly split: symbol;
+
+    /** 
+      * A method that converts an object to a corresponding primitive value.
+      * Called by the ToPrimitive abstract operation.
+      */
+    readonly toPrimitive: symbol;
+
+    /** 
+      * A String value that is used in the creation of the default string description of an object.
+      * Called by the built-in method Object.prototype.toString.
+      */
+    readonly toStringTag: symbol;
+
+    /**
+      * An Object whose own property names are property names that are excluded from the 'with'
+      * environment bindings of the associated objects.
+      */
+    readonly unscopables: symbol;
+}
+
+interface Symbol {
+    readonly [Symbol.toStringTag]: "Symbol";
+}
+
+interface Array<T> {
+    /** Iterator */
+    [Symbol.iterator](): IterableIterator<T>;
+
+    /**
+     * Returns an object whose properties have the value 'true'
+     * when they will be absent when used in a 'with' statement.
+     */
+    [Symbol.unscopables](): {
+        copyWithin: boolean;
+        entries: boolean;
+        fill: boolean;
+        find: boolean;
+        findIndex: boolean;
+        keys: boolean;
+        values: boolean;
+    };
+}
+
+interface Date {
+    /**
+     * Converts a Date object to a string.
+     */
+    [Symbol.toPrimitive](hint: "default"): string;
+    /**
+     * Converts a Date object to a string.
+     */
+    [Symbol.toPrimitive](hint: "string"): string;
+    /**
+     * Converts a Date object to a number.
+     */
+    [Symbol.toPrimitive](hint: "number"): number;
+    /**
+     * Converts a Date object to a string or number.
+     *
+     * @param hint The strings "number", "string", or "default" to specify what primitive to return.
+     *
+     * @throws {TypeError} If 'hint' was given something other than "number", "string", or "default".
+     * @returns A number if 'hint' was "number", a string if 'hint' was "string" or "default".
+     */
+    [Symbol.toPrimitive](hint: string): string | number;
+}
+
+interface Map<K, V> {
+    [Symbol.iterator]():IterableIterator<[K,V]>;
+    readonly [Symbol.toStringTag]: "Map";
+}
+
+interface WeakMap<K, V>{
+    readonly [Symbol.toStringTag]: "WeakMap";
+}
+
+interface JSON {
+    readonly [Symbol.toStringTag]: "JSON";
+}
+
+interface Function {
+    /**
+     * Determines whether the given value inherits from this function if this function was used
+     * as a constructor function.
+     *
+     * A constructor function can control which objects are recognized as its instances by
+     * 'instanceof' by overriding this method.
+     */
+    [Symbol.hasInstance](value: any): boolean;
+}
+
+interface GeneratorFunction extends Function {
+    readonly [Symbol.toStringTag]: "GeneratorFunction";
+}
+
+interface IArguments {
+    /** Iterator */
+    [Symbol.iterator](): IterableIterator<any>;
+}
+
+interface Iterator<T> { }
+
+interface Iterable<T> {
+    [Symbol.iterator](): Iterator<T>;
+}
+
+interface IterableIterator<T> extends Iterator<T> {
+    [Symbol.iterator](): IterableIterator<T>;
+}
+
+interface Math {
+    readonly [Symbol.toStringTag]: "Math";
+}
+
+interface Promise<T> {
+    readonly [Symbol.toStringTag]: "Promise";
+}
+
+interface PromiseConstructor {
+    readonly [Symbol.species]: Function;
+}
+
+interface RegExp {
+        /**
+      * Matches a string with this regular expression, and returns an array containing the results of
+      * that search.
+      * @param string A string to search within.
+      */
+    [Symbol.match](string: string): RegExpMatchArray | null;
+
+    /**
+      * Replaces text in a string, using this regular expression.
+      * @param string A String object or string literal whose contents matching against
+      *               this regular expression will be replaced
+      * @param replaceValue A String object or string literal containing the text to replace for every 
+      *                     successful match of this regular expression.
+      */
+    [Symbol.replace](string: string, replaceValue: string): string;
+
+    /**
+      * Replaces text in a string, using this regular expression.
+      * @param string A String object or string literal whose contents matching against
+      *               this regular expression will be replaced
+      * @param replacer A function that returns the replacement text.
+      */
+    [Symbol.replace](string: string, replacer: (substring: string, ...args: any[]) => string): string;
+
+    /**
+      * Finds the position beginning first substring match in a regular expression search
+      * using this regular expression.
+      *
+      * @param string The string to search within.
+      */
+    [Symbol.search](string: string): number;
+
+    /**
+      * Returns an array of substrings that were delimited by strings in the original input that
+      * match against this regular expression.
+      *
+      * If the regular expression contains capturing parentheses, then each time this
+      * regular expression matches, the results (including any undefined results) of the
+      * capturing parentheses are spliced.
+      *
+      * @param string string value to split
+      * @param limit if not undefined, the output array is truncated so that it contains no more
+      * than 'limit' elements.
+      */
+    [Symbol.split](string: string, limit?: number): string[];
+}
+
+interface RegExpConstructor {
+    [Symbol.species](): RegExpConstructor;
+}
+
+interface String {
+    /** Iterator */
+    [Symbol.iterator](): IterableIterator<string>;
+   
+    /**
+      * Matches a string an object that supports being matched against, and returns an array containing the results of that search.
+      * @param matcher An object that supports being matched against.
+      */
+    match(matcher: { [Symbol.match](string: string): RegExpMatchArray | null; }): RegExpMatchArray | null;
+
+    /**
+      * Replaces text in a string, using an object that supports replacement within a string.
+      * @param searchValue A object can search for and replace matches within a string.
+      * @param replaceValue A string containing the text to replace for every successful match of searchValue in this string.
+      */
+    replace(searchValue: { [Symbol.replace](string: string, replaceValue: string): string; }, replaceValue: string): string;
+
+    /**
+      * Replaces text in a string, using an object that supports replacement within a string.
+      * @param searchValue A object can search for and replace matches within a string.
+      * @param replacer A function that returns the replacement text.
+      */
+    replace(searchValue: { [Symbol.replace](string: string, replacer: (substring: string, ...args: any[]) => string): string; }, replacer: (substring: string, ...args: any[]) => string): string;
+
+    /**
+      * Finds the first substring match in a regular expression search.
+      * @param searcher An object which supports searching within a string.
+      */
+    search(searcher: { [Symbol.search](string: string): number; }): number;
+
+    /**
+      * Split a string into substrings using the specified separator and return them as an array.
+      * @param splitter An object that can split a string.
+      * @param limit A value used to limit the number of elements returned in the array.
+      */
+    split(splitter: { [Symbol.split](string: string, limit?: number): string[]; }, limit?: number): string[];
+}
+
+/**
+  * Represents a raw buffer of binary data, which is used to store data for the 
+  * different typed arrays. ArrayBuffers cannot be read from or written to directly, 
+  * but can be passed to a typed array or DataView Object to interpret the raw 
+  * buffer as needed. 
+  */
+interface ArrayBuffer {
+    readonly [Symbol.toStringTag]: "ArrayBuffer";
+}
+
+interface DataView {
+    readonly [Symbol.toStringTag]: "DataView";
+}
+
+/**
+  * A typed array of 8-bit integer values. The contents are initialized to 0. If the requested 
+  * number of bytes could not be allocated an exception is raised.
+  */
+interface Int8Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "Int8Array";
+}
+
+/**
+  * A typed array of 8-bit unsigned integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint8Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "UInt8Array";
+}
+
+/**
+  * A typed array of 8-bit unsigned integer (clamped) values. The contents are initialized to 0. 
+  * If the requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint8ClampedArray {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "Uint8ClampedArray";
+}
+
+/**
+  * A typed array of 16-bit signed integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Int16Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "Int16Array";
+}
+
+/**
+  * A typed array of 16-bit unsigned integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint16Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "Uint16Array";
+}
+
+/**
+  * A typed array of 32-bit signed integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Int32Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "Int32Array";
+}
+
+/**
+  * A typed array of 32-bit unsigned integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint32Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "Uint32Array";
+}
+
+/**
+  * A typed array of 32-bit float values. The contents are initialized to 0. If the requested number
+  * of bytes could not be allocated an exception is raised.
+  */
+interface Float32Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "Float32Array";
+}
+
+/**
+  * A typed array of 64-bit float values. The contents are initialized to 0. If the requested 
+  * number of bytes could not be allocated an exception is raised.
+  */
+interface Float64Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "Float64Array";
+}/////////////////////////////
 /// IE DOM APIs
 /////////////////////////////
 
@@ -5385,11 +5579,6 @@ interface AriaRequestEventInit extends EventInit {
     attributeValue?: string;
 }
 
-interface ClipboardEventInit extends EventInit {
-    data?: string;
-    dataType?: string;
-}
-
 interface CommandEventInit extends EventInit {
     commandName?: string;
     detail?: string;
@@ -5403,6 +5592,31 @@ interface ConfirmSiteSpecificExceptionsInformation extends ExceptionInformation
     arrayOfDomainStrings?: string[];
 }
 
+interface ConstrainBooleanParameters {
+    exact?: boolean;
+    ideal?: boolean;
+}
+
+interface ConstrainDOMStringParameters {
+    exact?: string | string[];
+    ideal?: string | string[];
+}
+
+interface ConstrainDoubleRange extends DoubleRange {
+    exact?: number;
+    ideal?: number;
+}
+
+interface ConstrainLongRange extends LongRange {
+    exact?: number;
+    ideal?: number;
+}
+
+interface ConstrainVideoFacingModeParameters {
+    exact?: string | string[];
+    ideal?: string | string[];
+}
+
 interface CustomEventInit extends EventInit {
     detail?: any;
 }
@@ -5413,17 +5627,44 @@ interface DeviceAccelerationDict {
     z?: number;
 }
 
+interface DeviceLightEventInit extends EventInit {
+    value?: number;
+}
+
 interface DeviceRotationRateDict {
     alpha?: number;
     beta?: number;
     gamma?: number;
 }
 
+interface DoubleRange {
+    max?: number;
+    min?: number;
+}
+
 interface EventInit {
     bubbles?: boolean;
     cancelable?: boolean;
 }
 
+interface EventModifierInit extends UIEventInit {
+    ctrlKey?: boolean;
+    shiftKey?: boolean;
+    altKey?: boolean;
+    metaKey?: boolean;
+    modifierAltGraph?: boolean;
+    modifierCapsLock?: boolean;
+    modifierFn?: boolean;
+    modifierFnLock?: boolean;
+    modifierHyper?: boolean;
+    modifierNumLock?: boolean;
+    modifierOS?: boolean;
+    modifierScrollLock?: boolean;
+    modifierSuper?: boolean;
+    modifierSymbol?: boolean;
+    modifierSymbolLock?: boolean;
+}
+
 interface ExceptionInformation {
     domain?: string;
 }
@@ -5437,17 +5678,415 @@ interface HashChangeEventInit extends EventInit {
     oldURL?: string;
 }
 
+interface IDBIndexParameters {
+    multiEntry?: boolean;
+    unique?: boolean;
+}
+
+interface IDBObjectStoreParameters {
+    autoIncrement?: boolean;
+    keyPath?: IDBKeyPath;
+}
+
 interface KeyAlgorithm {
     name?: string;
 }
 
-interface KeyboardEventInit extends SharedKeyboardAndMouseEventInit {
+interface KeyboardEventInit extends EventModifierInit {
     key?: string;
     location?: number;
     repeat?: boolean;
 }
 
-interface MouseEventInit extends SharedKeyboardAndMouseEventInit {
+interface LongRange {
+    max?: number;
+    min?: number;
+}
+
+interface MSAccountInfo {
+    rpDisplayName?: string;
+    userDisplayName?: string;
+    accountName?: string;
+    userId?: string;
+    accountImageUri?: string;
+}
+
+interface MSAudioLocalClientEvent extends MSLocalClientEventBase {
+    networkSendQualityEventRatio?: number;
+    networkDelayEventRatio?: number;
+    cpuInsufficientEventRatio?: number;
+    deviceHalfDuplexAECEventRatio?: number;
+    deviceRenderNotFunctioningEventRatio?: number;
+    deviceCaptureNotFunctioningEventRatio?: number;
+    deviceGlitchesEventRatio?: number;
+    deviceLowSNREventRatio?: number;
+    deviceLowSpeechLevelEventRatio?: number;
+    deviceClippingEventRatio?: number;
+    deviceEchoEventRatio?: number;
+    deviceNearEndToEchoRatioEventRatio?: number;
+    deviceRenderZeroVolumeEventRatio?: number;
+    deviceRenderMuteEventRatio?: number;
+    deviceMultipleEndpointsEventCount?: number;
+    deviceHowlingEventCount?: number;
+}
+
+interface MSAudioRecvPayload extends MSPayloadBase {
+    samplingRate?: number;
+    signal?: MSAudioRecvSignal;
+    packetReorderRatio?: number;
+    packetReorderDepthAvg?: number;
+    packetReorderDepthMax?: number;
+    burstLossLength1?: number;
+    burstLossLength2?: number;
+    burstLossLength3?: number;
+    burstLossLength4?: number;
+    burstLossLength5?: number;
+    burstLossLength6?: number;
+    burstLossLength7?: number;
+    burstLossLength8OrHigher?: number;
+    fecRecvDistance1?: number;
+    fecRecvDistance2?: number;
+    fecRecvDistance3?: number;
+    ratioConcealedSamplesAvg?: number;
+    ratioStretchedSamplesAvg?: number;
+    ratioCompressedSamplesAvg?: number;
+}
+
+interface MSAudioRecvSignal {
+    initialSignalLevelRMS?: number;
+    recvSignalLevelCh1?: number;
+    recvNoiseLevelCh1?: number;
+    renderSignalLevel?: number;
+    renderNoiseLevel?: number;
+    renderLoopbackSignalLevel?: number;
+}
+
+interface MSAudioSendPayload extends MSPayloadBase {
+    samplingRate?: number;
+    signal?: MSAudioSendSignal;
+    audioFECUsed?: boolean;
+    sendMutePercent?: number;
+}
+
+interface MSAudioSendSignal {
+    noiseLevel?: number;
+    sendSignalLevelCh1?: number;
+    sendNoiseLevelCh1?: number;
+}
+
+interface MSConnectivity {
+    iceType?: string;
+    iceWarningFlags?: MSIceWarningFlags;
+    relayAddress?: MSRelayAddress;
+}
+
+interface MSCredentialFilter {
+    accept?: MSCredentialSpec[];
+}
+
+interface MSCredentialParameters {
+    type?: string;
+}
+
+interface MSCredentialSpec {
+    type?: string;
+    id?: string;
+}
+
+interface MSDelay {
+    roundTrip?: number;
+    roundTripMax?: number;
+}
+
+interface MSDescription extends RTCStats {
+    connectivity?: MSConnectivity;
+    transport?: string;
+    networkconnectivity?: MSNetworkConnectivityInfo;
+    localAddr?: MSIPAddressInfo;
+    remoteAddr?: MSIPAddressInfo;
+    deviceDevName?: string;
+    reflexiveLocalIPAddr?: MSIPAddressInfo;
+}
+
+interface MSFIDOCredentialParameters extends MSCredentialParameters {
+    algorithm?: string | Algorithm;
+    authenticators?: AAGUID[];
+}
+
+interface MSIPAddressInfo {
+    ipAddr?: string;
+    port?: number;
+    manufacturerMacAddrMask?: string;
+}
+
+interface MSIceWarningFlags {
+    turnTcpTimedOut?: boolean;
+    turnUdpAllocateFailed?: boolean;
+    turnUdpSendFailed?: boolean;
+    turnTcpAllocateFailed?: boolean;
+    turnTcpSendFailed?: boolean;
+    udpLocalConnectivityFailed?: boolean;
+    udpNatConnectivityFailed?: boolean;
+    udpRelayConnectivityFailed?: boolean;
+    tcpNatConnectivityFailed?: boolean;
+    tcpRelayConnectivityFailed?: boolean;
+    connCheckMessageIntegrityFailed?: boolean;
+    allocationMessageIntegrityFailed?: boolean;
+    connCheckOtherError?: boolean;
+    turnAuthUnknownUsernameError?: boolean;
+    noRelayServersConfigured?: boolean;
+    multipleRelayServersAttempted?: boolean;
+    portRangeExhausted?: boolean;
+    alternateServerReceived?: boolean;
+    pseudoTLSFailure?: boolean;
+    turnTurnTcpConnectivityFailed?: boolean;
+    useCandidateChecksFailed?: boolean;
+    fipsAllocationFailure?: boolean;
+}
+
+interface MSJitter {
+    interArrival?: number;
+    interArrivalMax?: number;
+    interArrivalSD?: number;
+}
+
+interface MSLocalClientEventBase extends RTCStats {
+    networkReceiveQualityEventRatio?: number;
+    networkBandwidthLowEventRatio?: number;
+}
+
+interface MSNetwork extends RTCStats {
+    jitter?: MSJitter;
+    delay?: MSDelay;
+    packetLoss?: MSPacketLoss;
+    utilization?: MSUtilization;
+}
+
+interface MSNetworkConnectivityInfo {
+    vpn?: boolean;
+    linkspeed?: number;
+    networkConnectionDetails?: string;
+}
+
+interface MSNetworkInterfaceType {
+    interfaceTypeEthernet?: boolean;
+    interfaceTypeWireless?: boolean;
+    interfaceTypePPP?: boolean;
+    interfaceTypeTunnel?: boolean;
+    interfaceTypeWWAN?: boolean;
+}
+
+interface MSOutboundNetwork extends MSNetwork {
+    appliedBandwidthLimit?: number;
+}
+
+interface MSPacketLoss {
+    lossRate?: number;
+    lossRateMax?: number;
+}
+
+interface MSPayloadBase extends RTCStats {
+    payloadDescription?: string;
+}
+
+interface MSRelayAddress {
+    relayAddress?: string;
+    port?: number;
+}
+
+interface MSSignatureParameters {
+    userPrompt?: string;
+}
+
+interface MSTransportDiagnosticsStats extends RTCStats {
+    baseAddress?: string;
+    localAddress?: string;
+    localSite?: string;
+    networkName?: string;
+    remoteAddress?: string;
+    remoteSite?: string;
+    localMR?: string;
+    remoteMR?: string;
+    iceWarningFlags?: MSIceWarningFlags;
+    portRangeMin?: number;
+    portRangeMax?: number;
+    localMRTCPPort?: number;
+    remoteMRTCPPort?: number;
+    stunVer?: number;
+    numConsentReqSent?: number;
+    numConsentReqReceived?: number;
+    numConsentRespSent?: number;
+    numConsentRespReceived?: number;
+    interfaces?: MSNetworkInterfaceType;
+    baseInterface?: MSNetworkInterfaceType;
+    protocol?: string;
+    localInterface?: MSNetworkInterfaceType;
+    localAddrType?: string;
+    remoteAddrType?: string;
+    iceRole?: string;
+    rtpRtcpMux?: boolean;
+    allocationTimeInMs?: number;
+    msRtcEngineVersion?: string;
+}
+
+interface MSUtilization {
+    packets?: number;
+    bandwidthEstimation?: number;
+    bandwidthEstimationMin?: number;
+    bandwidthEstimationMax?: number;
+    bandwidthEstimationStdDev?: number;
+    bandwidthEstimationAvg?: number;
+}
+
+interface MSVideoPayload extends MSPayloadBase {
+    resoluton?: string;
+    videoBitRateAvg?: number;
+    videoBitRateMax?: number;
+    videoFrameRateAvg?: number;
+    videoPacketLossRate?: number;
+    durationSeconds?: number;
+}
+
+interface MSVideoRecvPayload extends MSVideoPayload {
+    videoFrameLossRate?: number;
+    recvCodecType?: string;
+    recvResolutionWidth?: number;
+    recvResolutionHeight?: number;
+    videoResolutions?: MSVideoResolutionDistribution;
+    recvFrameRateAverage?: number;
+    recvBitRateMaximum?: number;
+    recvBitRateAverage?: number;
+    recvVideoStreamsMax?: number;
+    recvVideoStreamsMin?: number;
+    recvVideoStreamsMode?: number;
+    videoPostFECPLR?: number;
+    lowBitRateCallPercent?: number;
+    lowFrameRateCallPercent?: number;
+    reorderBufferTotalPackets?: number;
+    recvReorderBufferReorderedPackets?: number;
+    recvReorderBufferPacketsDroppedDueToBufferExhaustion?: number;
+    recvReorderBufferMaxSuccessfullyOrderedExtent?: number;
+    recvReorderBufferMaxSuccessfullyOrderedLateTime?: number;
+    recvReorderBufferPacketsDroppedDueToTimeout?: number;
+    recvFpsHarmonicAverage?: number;
+    recvNumResSwitches?: number;
+}
+
+interface MSVideoResolutionDistribution {
+    cifQuality?: number;
+    vgaQuality?: number;
+    h720Quality?: number;
+    h1080Quality?: number;
+    h1440Quality?: number;
+    h2160Quality?: number;
+}
+
+interface MSVideoSendPayload extends MSVideoPayload {
+    sendFrameRateAverage?: number;
+    sendBitRateMaximum?: number;
+    sendBitRateAverage?: number;
+    sendVideoStreamsMax?: number;
+    sendResolutionWidth?: number;
+    sendResolutionHeight?: number;
+}
+
+interface MediaEncryptedEventInit extends EventInit {
+    initDataType?: string;
+    initData?: ArrayBuffer;
+}
+
+interface MediaKeyMessageEventInit extends EventInit {
+    messageType?: string;
+    message?: ArrayBuffer;
+}
+
+interface MediaKeySystemConfiguration {
+    initDataTypes?: string[];
+    audioCapabilities?: MediaKeySystemMediaCapability[];
+    videoCapabilities?: MediaKeySystemMediaCapability[];
+    distinctiveIdentifier?: string;
+    persistentState?: string;
+}
+
+interface MediaKeySystemMediaCapability {
+    contentType?: string;
+    robustness?: string;
+}
+
+interface MediaStreamConstraints {
+    video?: boolean | MediaTrackConstraints;
+    audio?: boolean | MediaTrackConstraints;
+}
+
+interface MediaStreamErrorEventInit extends EventInit {
+    error?: MediaStreamError;
+}
+
+interface MediaStreamTrackEventInit extends EventInit {
+    track?: MediaStreamTrack;
+}
+
+interface MediaTrackCapabilities {
+    width?: number | LongRange;
+    height?: number | LongRange;
+    aspectRatio?: number | DoubleRange;
+    frameRate?: number | DoubleRange;
+    facingMode?: string;
+    volume?: number | DoubleRange;
+    sampleRate?: number | LongRange;
+    sampleSize?: number | LongRange;
+    echoCancellation?: boolean[];
+    deviceId?: string;
+    groupId?: string;
+}
+
+interface MediaTrackConstraintSet {
+    width?: number | ConstrainLongRange;
+    height?: number | ConstrainLongRange;
+    aspectRatio?: number | ConstrainDoubleRange;
+    frameRate?: number | ConstrainDoubleRange;
+    facingMode?: string | string[] | ConstrainDOMStringParameters;
+    volume?: number | ConstrainDoubleRange;
+    sampleRate?: number | ConstrainLongRange;
+    sampleSize?: number | ConstrainLongRange;
+    echoCancelation?: boolean | ConstrainBooleanParameters;
+    deviceId?: string | string[] | ConstrainDOMStringParameters;
+    groupId?: string | string[] | ConstrainDOMStringParameters;
+}
+
+interface MediaTrackConstraints extends MediaTrackConstraintSet {
+    advanced?: MediaTrackConstraintSet[];
+}
+
+interface MediaTrackSettings {
+    width?: number;
+    height?: number;
+    aspectRatio?: number;
+    frameRate?: number;
+    facingMode?: string;
+    volume?: number;
+    sampleRate?: number;
+    sampleSize?: number;
+    echoCancellation?: boolean;
+    deviceId?: string;
+    groupId?: string;
+}
+
+interface MediaTrackSupportedConstraints {
+    width?: boolean;
+    height?: boolean;
+    aspectRatio?: boolean;
+    frameRate?: boolean;
+    facingMode?: boolean;
+    volume?: boolean;
+    sampleRate?: boolean;
+    sampleSize?: boolean;
+    echoCancellation?: boolean;
+    deviceId?: boolean;
+    groupId?: boolean;
+}
+
+interface MouseEventInit extends EventModifierInit {
     screenX?: number;
     screenY?: number;
     clientX?: number;
@@ -5480,6 +6119,10 @@ interface ObjectURLOptions {
     oneTimeOnly?: boolean;
 }
 
+interface PeriodicWaveConstraints {
+    disableNormalization?: boolean;
+}
+
 interface PointerEventInit extends MouseEventInit {
     pointerId?: number;
     width?: number;
@@ -5497,22 +6140,266 @@ interface PositionOptions {
     maximumAge?: number;
 }
 
-interface SharedKeyboardAndMouseEventInit extends UIEventInit {
-    ctrlKey?: boolean;
-    shiftKey?: boolean;
-    altKey?: boolean;
-    metaKey?: boolean;
-    keyModifierStateAltGraph?: boolean;
-    keyModifierStateCapsLock?: boolean;
-    keyModifierStateFn?: boolean;
-    keyModifierStateFnLock?: boolean;
-    keyModifierStateHyper?: boolean;
-    keyModifierStateNumLock?: boolean;
-    keyModifierStateOS?: boolean;
-    keyModifierStateScrollLock?: boolean;
-    keyModifierStateSuper?: boolean;
-    keyModifierStateSymbol?: boolean;
-    keyModifierStateSymbolLock?: boolean;
+interface RTCDTMFToneChangeEventInit extends EventInit {
+    tone?: string;
+}
+
+interface RTCDtlsFingerprint {
+    algorithm?: string;
+    value?: string;
+}
+
+interface RTCDtlsParameters {
+    role?: string;
+    fingerprints?: RTCDtlsFingerprint[];
+}
+
+interface RTCIceCandidate {
+    foundation?: string;
+    priority?: number;
+    ip?: string;
+    protocol?: string;
+    port?: number;
+    type?: string;
+    tcpType?: string;
+    relatedAddress?: string;
+    relatedPort?: number;
+}
+
+interface RTCIceCandidateAttributes extends RTCStats {
+    ipAddress?: string;
+    portNumber?: number;
+    transport?: string;
+    candidateType?: string;
+    priority?: number;
+    addressSourceUrl?: string;
+}
+
+interface RTCIceCandidateComplete {
+}
+
+interface RTCIceCandidatePair {
+    local?: RTCIceCandidate;
+    remote?: RTCIceCandidate;
+}
+
+interface RTCIceCandidatePairStats extends RTCStats {
+    transportId?: string;
+    localCandidateId?: string;
+    remoteCandidateId?: string;
+    state?: string;
+    priority?: number;
+    nominated?: boolean;
+    writable?: boolean;
+    readable?: boolean;
+    bytesSent?: number;
+    bytesReceived?: number;
+    roundTripTime?: number;
+    availableOutgoingBitrate?: number;
+    availableIncomingBitrate?: number;
+}
+
+interface RTCIceGatherOptions {
+    gatherPolicy?: string;
+    iceservers?: RTCIceServer[];
+}
+
+interface RTCIceParameters {
+    usernameFragment?: string;
+    password?: string;
+}
+
+interface RTCIceServer {
+    urls?: any;
+    username?: string;
+    credential?: string;
+}
+
+interface RTCInboundRTPStreamStats extends RTCRTPStreamStats {
+    packetsReceived?: number;
+    bytesReceived?: number;
+    packetsLost?: number;
+    jitter?: number;
+    fractionLost?: number;
+}
+
+interface RTCMediaStreamTrackStats extends RTCStats {
+    trackIdentifier?: string;
+    remoteSource?: boolean;
+    ssrcIds?: string[];
+    frameWidth?: number;
+    frameHeight?: number;
+    framesPerSecond?: number;
+    framesSent?: number;
+    framesReceived?: number;
+    framesDecoded?: number;
+    framesDropped?: number;
+    framesCorrupted?: number;
+    audioLevel?: number;
+    echoReturnLoss?: number;
+    echoReturnLossEnhancement?: number;
+}
+
+interface RTCOutboundRTPStreamStats extends RTCRTPStreamStats {
+    packetsSent?: number;
+    bytesSent?: number;
+    targetBitrate?: number;
+    roundTripTime?: number;
+}
+
+interface RTCRTPStreamStats extends RTCStats {
+    ssrc?: string;
+    associateStatsId?: string;
+    isRemote?: boolean;
+    mediaTrackId?: string;
+    transportId?: string;
+    codecId?: string;
+    firCount?: number;
+    pliCount?: number;
+    nackCount?: number;
+    sliCount?: number;
+}
+
+interface RTCRtcpFeedback {
+    type?: string;
+    parameter?: string;
+}
+
+interface RTCRtcpParameters {
+    ssrc?: number;
+    cname?: string;
+    reducedSize?: boolean;
+    mux?: boolean;
+}
+
+interface RTCRtpCapabilities {
+    codecs?: RTCRtpCodecCapability[];
+    headerExtensions?: RTCRtpHeaderExtension[];
+    fecMechanisms?: string[];
+}
+
+interface RTCRtpCodecCapability {
+    name?: string;
+    kind?: string;
+    clockRate?: number;
+    preferredPayloadType?: number;
+    maxptime?: number;
+    numChannels?: number;
+    rtcpFeedback?: RTCRtcpFeedback[];
+    parameters?: any;
+    options?: any;
+    maxTemporalLayers?: number;
+    maxSpatialLayers?: number;
+    svcMultiStreamSupport?: boolean;
+}
+
+interface RTCRtpCodecParameters {
+    name?: string;
+    payloadType?: any;
+    clockRate?: number;
+    maxptime?: number;
+    numChannels?: number;
+    rtcpFeedback?: RTCRtcpFeedback[];
+    parameters?: any;
+}
+
+interface RTCRtpContributingSource {
+    timestamp?: number;
+    csrc?: number;
+    audioLevel?: number;
+}
+
+interface RTCRtpEncodingParameters {
+    ssrc?: number;
+    codecPayloadType?: number;
+    fec?: RTCRtpFecParameters;
+    rtx?: RTCRtpRtxParameters;
+    priority?: number;
+    maxBitrate?: number;
+    minQuality?: number;
+    framerateBias?: number;
+    resolutionScale?: number;
+    framerateScale?: number;
+    active?: boolean;
+    encodingId?: string;
+    dependencyEncodingIds?: string[];
+    ssrcRange?: RTCSsrcRange;
+}
+
+interface RTCRtpFecParameters {
+    ssrc?: number;
+    mechanism?: string;
+}
+
+interface RTCRtpHeaderExtension {
+    kind?: string;
+    uri?: string;
+    preferredId?: number;
+    preferredEncrypt?: boolean;
+}
+
+interface RTCRtpHeaderExtensionParameters {
+    uri?: string;
+    id?: number;
+    encrypt?: boolean;
+}
+
+interface RTCRtpParameters {
+    muxId?: string;
+    codecs?: RTCRtpCodecParameters[];
+    headerExtensions?: RTCRtpHeaderExtensionParameters[];
+    encodings?: RTCRtpEncodingParameters[];
+    rtcp?: RTCRtcpParameters;
+}
+
+interface RTCRtpRtxParameters {
+    ssrc?: number;
+}
+
+interface RTCRtpUnhandled {
+    ssrc?: number;
+    payloadType?: number;
+    muxId?: string;
+}
+
+interface RTCSrtpKeyParam {
+    keyMethod?: string;
+    keySalt?: string;
+    lifetime?: string;
+    mkiValue?: number;
+    mkiLength?: number;
+}
+
+interface RTCSrtpSdesParameters {
+    tag?: number;
+    cryptoSuite?: string;
+    keyParams?: RTCSrtpKeyParam[];
+    sessionParams?: string[];
+}
+
+interface RTCSsrcRange {
+    min?: number;
+    max?: number;
+}
+
+interface RTCStats {
+    timestamp?: number;
+    type?: string;
+    id?: string;
+    msType?: string;
+}
+
+interface RTCStatsReport {
+}
+
+interface RTCTransportStats extends RTCStats {
+    bytesSent?: number;
+    bytesReceived?: number;
+    rtcpTransportStatsId?: string;
+    activeConnection?: boolean;
+    selectedCandidatePairId?: string;
+    localCertificateId?: string;
+    remoteCertificateId?: string;
 }
 
 interface StoreExceptionsInformation extends ExceptionInformation {
@@ -5558,18 +6445,18 @@ interface ANGLE_instanced_arrays {
     drawArraysInstancedANGLE(mode: number, first: number, count: number, primcount: number): void;
     drawElementsInstancedANGLE(mode: number, count: number, type: number, offset: number, primcount: number): void;
     vertexAttribDivisorANGLE(index: number, divisor: number): void;
-    VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE: number;
+    readonly VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE: number;
 }
 
 declare var ANGLE_instanced_arrays: {
     prototype: ANGLE_instanced_arrays;
     new(): ANGLE_instanced_arrays;
-    VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE: number;
+    readonly VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE: number;
 }
 
 interface AnalyserNode extends AudioNode {
     fftSize: number;
-    frequencyBinCount: number;
+    readonly frequencyBinCount: number;
     maxDecibels: number;
     minDecibels: number;
     smoothingTimeConstant: number;
@@ -5585,8 +6472,8 @@ declare var AnalyserNode: {
 }
 
 interface AnimationEvent extends Event {
-    animationName: string;
-    elapsedTime: number;
+    readonly animationName: string;
+    readonly elapsedTime: number;
     initAnimationEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, animationNameArg: string, elapsedTimeArg: number): void;
 }
 
@@ -5604,16 +6491,16 @@ interface ApplicationCache extends EventTarget {
     onobsolete: (ev: Event) => any;
     onprogress: (ev: ProgressEvent) => any;
     onupdateready: (ev: Event) => any;
-    status: number;
+    readonly status: number;
     abort(): void;
     swapCache(): void;
     update(): void;
-    CHECKING: number;
-    DOWNLOADING: number;
-    IDLE: number;
-    OBSOLETE: number;
-    UNCACHED: number;
-    UPDATEREADY: number;
+    readonly CHECKING: number;
+    readonly DOWNLOADING: number;
+    readonly IDLE: number;
+    readonly OBSOLETE: number;
+    readonly UNCACHED: number;
+    readonly UPDATEREADY: number;
     addEventListener(type: "cached", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "checking", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "downloading", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -5628,16 +6515,16 @@ interface ApplicationCache extends EventTarget {
 declare var ApplicationCache: {
     prototype: ApplicationCache;
     new(): ApplicationCache;
-    CHECKING: number;
-    DOWNLOADING: number;
-    IDLE: number;
-    OBSOLETE: number;
-    UNCACHED: number;
-    UPDATEREADY: number;
+    readonly CHECKING: number;
+    readonly DOWNLOADING: number;
+    readonly IDLE: number;
+    readonly OBSOLETE: number;
+    readonly UNCACHED: number;
+    readonly UPDATEREADY: number;
 }
 
 interface AriaRequestEvent extends Event {
-    attributeName: string;
+    readonly attributeName: string;
     attributeValue: string;
 }
 
@@ -5647,9 +6534,10 @@ declare var AriaRequestEvent: {
 }
 
 interface Attr extends Node {
-    name: string;
-    ownerElement: Element;
-    specified: boolean;
+    readonly name: string;
+    readonly ownerElement: Element;
+    readonly prefix: string;
+    readonly specified: boolean;
     value: string;
 }
 
@@ -5659,10 +6547,12 @@ declare var Attr: {
 }
 
 interface AudioBuffer {
-    duration: number;
-    length: number;
-    numberOfChannels: number;
-    sampleRate: number;
+    readonly duration: number;
+    readonly length: number;
+    readonly numberOfChannels: number;
+    readonly sampleRate: number;
+    copyFromChannel(destination: Float32Array, channelNumber: number, startInChannel?: number): void;
+    copyToChannel(source: Float32Array, channelNumber: number, startInChannel?: number): void;
     getChannelData(channel: number): Float32Array;
 }
 
@@ -5673,14 +6563,15 @@ declare var AudioBuffer: {
 
 interface AudioBufferSourceNode extends AudioNode {
     buffer: AudioBuffer;
+    readonly detune: AudioParam;
     loop: boolean;
     loopEnd: number;
     loopStart: number;
-    onended: (ev: Event) => any;
-    playbackRate: AudioParam;
+    onended: (ev: MediaStreamErrorEvent) => any;
+    readonly playbackRate: AudioParam;
     start(when?: number, offset?: number, duration?: number): void;
     stop(when?: number): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5690,10 +6581,10 @@ declare var AudioBufferSourceNode: {
 }
 
 interface AudioContext extends EventTarget {
-    currentTime: number;
-    destination: AudioDestinationNode;
-    listener: AudioListener;
-    sampleRate: number;
+    readonly currentTime: number;
+    readonly destination: AudioDestinationNode;
+    readonly listener: AudioListener;
+    readonly sampleRate: number;
     state: string;
     createAnalyser(): AnalyserNode;
     createBiquadFilter(): BiquadFilterNode;
@@ -5706,13 +6597,14 @@ interface AudioContext extends EventTarget {
     createDynamicsCompressor(): DynamicsCompressorNode;
     createGain(): GainNode;
     createMediaElementSource(mediaElement: HTMLMediaElement): MediaElementAudioSourceNode;
+    createMediaStreamSource(mediaStream: MediaStream): MediaStreamAudioSourceNode;
     createOscillator(): OscillatorNode;
     createPanner(): PannerNode;
-    createPeriodicWave(real: Float32Array, imag: Float32Array): PeriodicWave;
+    createPeriodicWave(real: Float32Array, imag: Float32Array, constraints?: PeriodicWaveConstraints): PeriodicWave;
     createScriptProcessor(bufferSize?: number, numberOfInputChannels?: number, numberOfOutputChannels?: number): ScriptProcessorNode;
     createStereoPanner(): StereoPannerNode;
     createWaveShaper(): WaveShaperNode;
-    decodeAudioData(audioData: ArrayBuffer, successCallback: DecodeSuccessCallback, errorCallback?: DecodeErrorCallback): void;
+    decodeAudioData(audioData: ArrayBuffer, successCallback?: DecodeSuccessCallback, errorCallback?: DecodeErrorCallback): PromiseLike<AudioBuffer>;
 }
 
 declare var AudioContext: {
@@ -5721,7 +6613,7 @@ declare var AudioContext: {
 }
 
 interface AudioDestinationNode extends AudioNode {
-    maxChannelCount: number;
+    readonly maxChannelCount: number;
 }
 
 declare var AudioDestinationNode: {
@@ -5746,11 +6638,13 @@ interface AudioNode extends EventTarget {
     channelCount: number;
     channelCountMode: string;
     channelInterpretation: string;
-    context: AudioContext;
-    numberOfInputs: number;
-    numberOfOutputs: number;
+    readonly context: AudioContext;
+    readonly numberOfInputs: number;
+    readonly numberOfOutputs: number;
     connect(destination: AudioNode, output?: number, input?: number): void;
     disconnect(output?: number): void;
+    disconnect(destination: AudioNode, output?: number, input?: number): void;
+    disconnect(destination: AudioParam, output?: number): void;
 }
 
 declare var AudioNode: {
@@ -5759,7 +6653,7 @@ declare var AudioNode: {
 }
 
 interface AudioParam {
-    defaultValue: number;
+    readonly defaultValue: number;
     value: number;
     cancelScheduledValues(startTime: number): void;
     exponentialRampToValueAtTime(value: number, endTime: number): void;
@@ -5775,9 +6669,9 @@ declare var AudioParam: {
 }
 
 interface AudioProcessingEvent extends Event {
-    inputBuffer: AudioBuffer;
-    outputBuffer: AudioBuffer;
-    playbackTime: number;
+    readonly inputBuffer: AudioBuffer;
+    readonly outputBuffer: AudioBuffer;
+    readonly playbackTime: number;
 }
 
 declare var AudioProcessingEvent: {
@@ -5787,11 +6681,11 @@ declare var AudioProcessingEvent: {
 
 interface AudioTrack {
     enabled: boolean;
-    id: string;
+    readonly id: string;
     kind: string;
-    label: string;
+    readonly label: string;
     language: string;
-    sourceBuffer: SourceBuffer;
+    readonly sourceBuffer: SourceBuffer;
 }
 
 declare var AudioTrack: {
@@ -5800,7 +6694,7 @@ declare var AudioTrack: {
 }
 
 interface AudioTrackList extends EventTarget {
-    length: number;
+    readonly length: number;
     onaddtrack: (ev: TrackEvent) => any;
     onchange: (ev: Event) => any;
     onremovetrack: (ev: TrackEvent) => any;
@@ -5819,7 +6713,7 @@ declare var AudioTrackList: {
 }
 
 interface BarProp {
-    visible: boolean;
+    readonly visible: boolean;
 }
 
 declare var BarProp: {
@@ -5837,10 +6731,10 @@ declare var BeforeUnloadEvent: {
 }
 
 interface BiquadFilterNode extends AudioNode {
-    Q: AudioParam;
-    detune: AudioParam;
-    frequency: AudioParam;
-    gain: AudioParam;
+    readonly Q: AudioParam;
+    readonly detune: AudioParam;
+    readonly frequency: AudioParam;
+    readonly gain: AudioParam;
     type: string;
     getFrequencyResponse(frequencyHz: Float32Array, magResponse: Float32Array, phaseResponse: Float32Array): void;
 }
@@ -5851,8 +6745,8 @@ declare var BiquadFilterNode: {
 }
 
 interface Blob {
-    size: number;
-    type: string;
+    readonly size: number;
+    readonly type: string;
     msClose(): void;
     msDetachStream(): any;
     slice(start?: number, end?: number, contentType?: string): Blob;
@@ -5886,7 +6780,7 @@ declare var CSSConditionRule: {
 }
 
 interface CSSFontFaceRule extends CSSRule {
-    style: CSSStyleDeclaration;
+    readonly style: CSSStyleDeclaration;
 }
 
 declare var CSSFontFaceRule: {
@@ -5895,9 +6789,9 @@ declare var CSSFontFaceRule: {
 }
 
 interface CSSGroupingRule extends CSSRule {
-    cssRules: CSSRuleList;
-    deleteRule(index?: number): void;
-    insertRule(rule: string, index?: number): number;
+    readonly cssRules: CSSRuleList;
+    deleteRule(index: number): void;
+    insertRule(rule: string, index: number): number;
 }
 
 declare var CSSGroupingRule: {
@@ -5906,9 +6800,9 @@ declare var CSSGroupingRule: {
 }
 
 interface CSSImportRule extends CSSRule {
-    href: string;
-    media: MediaList;
-    styleSheet: CSSStyleSheet;
+    readonly href: string;
+    readonly media: MediaList;
+    readonly styleSheet: CSSStyleSheet;
 }
 
 declare var CSSImportRule: {
@@ -5918,7 +6812,7 @@ declare var CSSImportRule: {
 
 interface CSSKeyframeRule extends CSSRule {
     keyText: string;
-    style: CSSStyleDeclaration;
+    readonly style: CSSStyleDeclaration;
 }
 
 declare var CSSKeyframeRule: {
@@ -5927,7 +6821,7 @@ declare var CSSKeyframeRule: {
 }
 
 interface CSSKeyframesRule extends CSSRule {
-    cssRules: CSSRuleList;
+    readonly cssRules: CSSRuleList;
     name: string;
     appendRule(rule: string): void;
     deleteRule(rule: string): void;
@@ -5940,7 +6834,7 @@ declare var CSSKeyframesRule: {
 }
 
 interface CSSMediaRule extends CSSConditionRule {
-    media: MediaList;
+    readonly media: MediaList;
 }
 
 declare var CSSMediaRule: {
@@ -5949,8 +6843,8 @@ declare var CSSMediaRule: {
 }
 
 interface CSSNamespaceRule extends CSSRule {
-    namespaceURI: string;
-    prefix: string;
+    readonly namespaceURI: string;
+    readonly prefix: string;
 }
 
 declare var CSSNamespaceRule: {
@@ -5959,10 +6853,10 @@ declare var CSSNamespaceRule: {
 }
 
 interface CSSPageRule extends CSSRule {
-    pseudoClass: string;
-    selector: string;
+    readonly pseudoClass: string;
+    readonly selector: string;
     selectorText: string;
-    style: CSSStyleDeclaration;
+    readonly style: CSSStyleDeclaration;
 }
 
 declare var CSSPageRule: {
@@ -5972,42 +6866,42 @@ declare var CSSPageRule: {
 
 interface CSSRule {
     cssText: string;
-    parentRule: CSSRule;
-    parentStyleSheet: CSSStyleSheet;
-    type: number;
-    CHARSET_RULE: number;
-    FONT_FACE_RULE: number;
-    IMPORT_RULE: number;
-    KEYFRAMES_RULE: number;
-    KEYFRAME_RULE: number;
-    MEDIA_RULE: number;
-    NAMESPACE_RULE: number;
-    PAGE_RULE: number;
-    STYLE_RULE: number;
-    SUPPORTS_RULE: number;
-    UNKNOWN_RULE: number;
-    VIEWPORT_RULE: number;
+    readonly parentRule: CSSRule;
+    readonly parentStyleSheet: CSSStyleSheet;
+    readonly type: number;
+    readonly CHARSET_RULE: number;
+    readonly FONT_FACE_RULE: number;
+    readonly IMPORT_RULE: number;
+    readonly KEYFRAMES_RULE: number;
+    readonly KEYFRAME_RULE: number;
+    readonly MEDIA_RULE: number;
+    readonly NAMESPACE_RULE: number;
+    readonly PAGE_RULE: number;
+    readonly STYLE_RULE: number;
+    readonly SUPPORTS_RULE: number;
+    readonly UNKNOWN_RULE: number;
+    readonly VIEWPORT_RULE: number;
 }
 
 declare var CSSRule: {
     prototype: CSSRule;
     new(): CSSRule;
-    CHARSET_RULE: number;
-    FONT_FACE_RULE: number;
-    IMPORT_RULE: number;
-    KEYFRAMES_RULE: number;
-    KEYFRAME_RULE: number;
-    MEDIA_RULE: number;
-    NAMESPACE_RULE: number;
-    PAGE_RULE: number;
-    STYLE_RULE: number;
-    SUPPORTS_RULE: number;
-    UNKNOWN_RULE: number;
-    VIEWPORT_RULE: number;
+    readonly CHARSET_RULE: number;
+    readonly FONT_FACE_RULE: number;
+    readonly IMPORT_RULE: number;
+    readonly KEYFRAMES_RULE: number;
+    readonly KEYFRAME_RULE: number;
+    readonly MEDIA_RULE: number;
+    readonly NAMESPACE_RULE: number;
+    readonly PAGE_RULE: number;
+    readonly STYLE_RULE: number;
+    readonly SUPPORTS_RULE: number;
+    readonly UNKNOWN_RULE: number;
+    readonly VIEWPORT_RULE: number;
 }
 
 interface CSSRuleList {
-    length: number;
+    readonly length: number;
     item(index: number): CSSRule;
     [index: number]: CSSRule;
 }
@@ -6140,7 +7034,7 @@ interface CSSStyleDeclaration {
     justifyContent: string;
     kerning: string;
     left: string;
-    length: number;
+    readonly length: number;
     letterSpacing: string;
     lightingColor: string;
     lineHeight: string;
@@ -6227,7 +7121,7 @@ interface CSSStyleDeclaration {
     pageBreakAfter: string;
     pageBreakBefore: string;
     pageBreakInside: string;
-    parentRule: CSSRule;
+    readonly parentRule: CSSRule;
     perspective: string;
     perspectiveOrigin: string;
     pointerEvents: string;
@@ -6252,7 +7146,6 @@ interface CSSStyleDeclaration {
     textAlignLast: string;
     textAnchor: string;
     textDecoration: string;
-    textFillColor: string;
     textIndent: string;
     textJustify: string;
     textKashida: string;
@@ -6288,25 +7181,12 @@ interface CSSStyleDeclaration {
     webkitAnimationTimingFunction: string;
     webkitAppearance: string;
     webkitBackfaceVisibility: string;
-    webkitBackground: string;
-    webkitBackgroundAttachment: string;
     webkitBackgroundClip: string;
-    webkitBackgroundColor: string;
-    webkitBackgroundImage: string;
     webkitBackgroundOrigin: string;
-    webkitBackgroundPosition: string;
-    webkitBackgroundPositionX: string;
-    webkitBackgroundPositionY: string;
-    webkitBackgroundRepeat: string;
     webkitBackgroundSize: string;
     webkitBorderBottomLeftRadius: string;
     webkitBorderBottomRightRadius: string;
     webkitBorderImage: string;
-    webkitBorderImageOutset: string;
-    webkitBorderImageRepeat: string;
-    webkitBorderImageSlice: string;
-    webkitBorderImageSource: string;
-    webkitBorderImageWidth: string;
     webkitBorderRadius: string;
     webkitBorderTopLeftRadius: string;
     webkitBorderTopRightRadius: string;
@@ -6352,6 +7232,7 @@ interface CSSStyleDeclaration {
     webkitTransitionDuration: string;
     webkitTransitionProperty: string;
     webkitTransitionTimingFunction: string;
+    webkitUserModify: string;
     webkitUserSelect: string;
     webkitWritingMode: string;
     whiteSpace: string;
@@ -6377,9 +7258,9 @@ declare var CSSStyleDeclaration: {
 }
 
 interface CSSStyleRule extends CSSRule {
-    readOnly: boolean;
+    readonly readOnly: boolean;
     selectorText: string;
-    style: CSSStyleDeclaration;
+    readonly style: CSSStyleDeclaration;
 }
 
 declare var CSSStyleRule: {
@@ -6388,18 +7269,18 @@ declare var CSSStyleRule: {
 }
 
 interface CSSStyleSheet extends StyleSheet {
-    cssRules: CSSRuleList;
+    readonly cssRules: CSSRuleList;
     cssText: string;
-    href: string;
-    id: string;
-    imports: StyleSheetList;
-    isAlternate: boolean;
-    isPrefAlternate: boolean;
-    ownerRule: CSSRule;
-    owningElement: Element;
-    pages: StyleSheetPageList;
-    readOnly: boolean;
-    rules: CSSRuleList;
+    readonly href: string;
+    readonly id: string;
+    readonly imports: StyleSheetList;
+    readonly isAlternate: boolean;
+    readonly isPrefAlternate: boolean;
+    readonly ownerRule: CSSRule;
+    readonly owningElement: Element;
+    readonly pages: StyleSheetPageList;
+    readonly readOnly: boolean;
+    readonly rules: CSSRuleList;
     addImport(bstrURL: string, lIndex?: number): number;
     addPageRule(bstrSelector: string, bstrStyle: string, lIndex?: number): number;
     addRule(bstrSelector: string, bstrStyle?: string, lIndex?: number): number;
@@ -6439,8 +7320,8 @@ declare var CanvasPattern: {
     new(): CanvasPattern;
 }
 
-interface CanvasRenderingContext2D {
-    canvas: HTMLCanvasElement;
+interface CanvasRenderingContext2D extends Object, CanvasPathMethods {
+    readonly canvas: HTMLCanvasElement;
     fillStyle: string | CanvasGradient | CanvasPattern;
     font: string;
     globalAlpha: number;
@@ -6459,13 +7340,9 @@ interface CanvasRenderingContext2D {
     strokeStyle: string | CanvasGradient | CanvasPattern;
     textAlign: string;
     textBaseline: string;
-    arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void;
-    arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void;
     beginPath(): void;
-    bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void;
     clearRect(x: number, y: number, w: number, h: number): void;
     clip(fillRule?: string): void;
-    closePath(): void;
     createImageData(imageDataOrSw: number | ImageData, sh?: number): ImageData;
     createLinearGradient(x0: number, y0: number, x1: number, y1: number): CanvasGradient;
     createPattern(image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, repetition: string): CanvasPattern;
@@ -6477,12 +7354,8 @@ interface CanvasRenderingContext2D {
     getImageData(sx: number, sy: number, sw: number, sh: number): ImageData;
     getLineDash(): number[];
     isPointInPath(x: number, y: number, fillRule?: string): boolean;
-    lineTo(x: number, y: number): void;
     measureText(text: string): TextMetrics;
-    moveTo(x: number, y: number): void;
     putImageData(imagedata: ImageData, dx: number, dy: number, dirtyX?: number, dirtyY?: number, dirtyWidth?: number, dirtyHeight?: number): void;
-    quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
-    rect(x: number, y: number, w: number, h: number): void;
     restore(): void;
     rotate(angle: number): void;
     save(): void;
@@ -6519,7 +7392,7 @@ declare var ChannelSplitterNode: {
 
 interface CharacterData extends Node, ChildNode {
     data: string;
-    length: number;
+    readonly length: number;
     appendData(arg: string): void;
     deleteData(offset: number, count: number): void;
     insertData(offset: number, arg: string): void;
@@ -6535,11 +7408,11 @@ declare var CharacterData: {
 
 interface ClientRect {
     bottom: number;
-    height: number;
+    readonly height: number;
     left: number;
     right: number;
     top: number;
-    width: number;
+    readonly width: number;
 }
 
 declare var ClientRect: {
@@ -6548,7 +7421,7 @@ declare var ClientRect: {
 }
 
 interface ClientRectList {
-    length: number;
+    readonly length: number;
     item(index: number): ClientRect;
     [index: number]: ClientRect;
 }
@@ -6559,7 +7432,7 @@ declare var ClientRectList: {
 }
 
 interface ClipboardEvent extends Event {
-    clipboardData: DataTransfer;
+    readonly clipboardData: DataTransfer;
 }
 
 declare var ClipboardEvent: {
@@ -6568,9 +7441,9 @@ declare var ClipboardEvent: {
 }
 
 interface CloseEvent extends Event {
-    code: number;
-    reason: string;
-    wasClean: boolean;
+    readonly code: number;
+    readonly reason: string;
+    readonly wasClean: boolean;
     initCloseEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, wasCleanArg: boolean, codeArg: number, reasonArg: string): void;
 }
 
@@ -6580,8 +7453,8 @@ declare var CloseEvent: {
 }
 
 interface CommandEvent extends Event {
-    commandName: string;
-    detail: string;
+    readonly commandName: string;
+    readonly detail: string;
 }
 
 declare var CommandEvent: {
@@ -6599,8 +7472,8 @@ declare var Comment: {
 }
 
 interface CompositionEvent extends UIEvent {
-    data: string;
-    locale: string;
+    readonly data: string;
+    readonly locale: string;
     initCompositionEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, dataArg: string, locale: string): void;
 }
 
@@ -6617,6 +7490,7 @@ interface Console {
     dir(value?: any, ...optionalParams: any[]): void;
     dirxml(value: any): void;
     error(message?: any, ...optionalParams: any[]): void;
+    exception(message?: string, ...optionalParams: any[]): void;
     group(groupTitle?: string): void;
     groupCollapsed(groupTitle?: string): void;
     groupEnd(): void;
@@ -6626,6 +7500,7 @@ interface Console {
     profile(reportName?: string): void;
     profileEnd(): void;
     select(element: Element): void;
+    table(...data: any[]): void;
     time(timerName?: string): void;
     timeEnd(timerName?: string): void;
     trace(message?: any, ...optionalParams: any[]): void;
@@ -6648,13 +7523,13 @@ declare var ConvolverNode: {
 }
 
 interface Coordinates {
-    accuracy: number;
-    altitude: number;
-    altitudeAccuracy: number;
-    heading: number;
-    latitude: number;
-    longitude: number;
-    speed: number;
+    readonly accuracy: number;
+    readonly altitude: number;
+    readonly altitudeAccuracy: number;
+    readonly heading: number;
+    readonly latitude: number;
+    readonly longitude: number;
+    readonly speed: number;
 }
 
 declare var Coordinates: {
@@ -6663,7 +7538,7 @@ declare var Coordinates: {
 }
 
 interface Crypto extends Object, RandomSource {
-    subtle: SubtleCrypto;
+    readonly subtle: SubtleCrypto;
 }
 
 declare var Crypto: {
@@ -6672,10 +7547,10 @@ declare var Crypto: {
 }
 
 interface CryptoKey {
-    algorithm: KeyAlgorithm;
-    extractable: boolean;
-    type: string;
-    usages: string[];
+    readonly algorithm: KeyAlgorithm;
+    readonly extractable: boolean;
+    readonly type: string;
+    readonly usages: string[];
 }
 
 declare var CryptoKey: {
@@ -6694,7 +7569,7 @@ declare var CryptoKeyPair: {
 }
 
 interface CustomEvent extends Event {
-    detail: any;
+    readonly detail: any;
     initCustomEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, detailArg: any): void;
 }
 
@@ -6704,7 +7579,7 @@ declare var CustomEvent: {
 }
 
 interface DOMError {
-    name: string;
+    readonly name: string;
     toString(): string;
 }
 
@@ -6714,69 +7589,69 @@ declare var DOMError: {
 }
 
 interface DOMException {
-    code: number;
-    message: string;
-    name: string;
+    readonly code: number;
+    readonly message: string;
+    readonly name: string;
     toString(): string;
-    ABORT_ERR: number;
-    DATA_CLONE_ERR: number;
-    DOMSTRING_SIZE_ERR: number;
-    HIERARCHY_REQUEST_ERR: number;
-    INDEX_SIZE_ERR: number;
-    INUSE_ATTRIBUTE_ERR: number;
-    INVALID_ACCESS_ERR: number;
-    INVALID_CHARACTER_ERR: number;
-    INVALID_MODIFICATION_ERR: number;
-    INVALID_NODE_TYPE_ERR: number;
-    INVALID_STATE_ERR: number;
-    NAMESPACE_ERR: number;
-    NETWORK_ERR: number;
-    NOT_FOUND_ERR: number;
-    NOT_SUPPORTED_ERR: number;
-    NO_DATA_ALLOWED_ERR: number;
-    NO_MODIFICATION_ALLOWED_ERR: number;
-    PARSE_ERR: number;
-    QUOTA_EXCEEDED_ERR: number;
-    SECURITY_ERR: number;
-    SERIALIZE_ERR: number;
-    SYNTAX_ERR: number;
-    TIMEOUT_ERR: number;
-    TYPE_MISMATCH_ERR: number;
-    URL_MISMATCH_ERR: number;
-    VALIDATION_ERR: number;
-    WRONG_DOCUMENT_ERR: number;
+    readonly ABORT_ERR: number;
+    readonly DATA_CLONE_ERR: number;
+    readonly DOMSTRING_SIZE_ERR: number;
+    readonly HIERARCHY_REQUEST_ERR: number;
+    readonly INDEX_SIZE_ERR: number;
+    readonly INUSE_ATTRIBUTE_ERR: number;
+    readonly INVALID_ACCESS_ERR: number;
+    readonly INVALID_CHARACTER_ERR: number;
+    readonly INVALID_MODIFICATION_ERR: number;
+    readonly INVALID_NODE_TYPE_ERR: number;
+    readonly INVALID_STATE_ERR: number;
+    readonly NAMESPACE_ERR: number;
+    readonly NETWORK_ERR: number;
+    readonly NOT_FOUND_ERR: number;
+    readonly NOT_SUPPORTED_ERR: number;
+    readonly NO_DATA_ALLOWED_ERR: number;
+    readonly NO_MODIFICATION_ALLOWED_ERR: number;
+    readonly PARSE_ERR: number;
+    readonly QUOTA_EXCEEDED_ERR: number;
+    readonly SECURITY_ERR: number;
+    readonly SERIALIZE_ERR: number;
+    readonly SYNTAX_ERR: number;
+    readonly TIMEOUT_ERR: number;
+    readonly TYPE_MISMATCH_ERR: number;
+    readonly URL_MISMATCH_ERR: number;
+    readonly VALIDATION_ERR: number;
+    readonly WRONG_DOCUMENT_ERR: number;
 }
 
 declare var DOMException: {
     prototype: DOMException;
     new(): DOMException;
-    ABORT_ERR: number;
-    DATA_CLONE_ERR: number;
-    DOMSTRING_SIZE_ERR: number;
-    HIERARCHY_REQUEST_ERR: number;
-    INDEX_SIZE_ERR: number;
-    INUSE_ATTRIBUTE_ERR: number;
-    INVALID_ACCESS_ERR: number;
-    INVALID_CHARACTER_ERR: number;
-    INVALID_MODIFICATION_ERR: number;
-    INVALID_NODE_TYPE_ERR: number;
-    INVALID_STATE_ERR: number;
-    NAMESPACE_ERR: number;
-    NETWORK_ERR: number;
-    NOT_FOUND_ERR: number;
-    NOT_SUPPORTED_ERR: number;
-    NO_DATA_ALLOWED_ERR: number;
-    NO_MODIFICATION_ALLOWED_ERR: number;
-    PARSE_ERR: number;
-    QUOTA_EXCEEDED_ERR: number;
-    SECURITY_ERR: number;
-    SERIALIZE_ERR: number;
-    SYNTAX_ERR: number;
-    TIMEOUT_ERR: number;
-    TYPE_MISMATCH_ERR: number;
-    URL_MISMATCH_ERR: number;
-    VALIDATION_ERR: number;
-    WRONG_DOCUMENT_ERR: number;
+    readonly ABORT_ERR: number;
+    readonly DATA_CLONE_ERR: number;
+    readonly DOMSTRING_SIZE_ERR: number;
+    readonly HIERARCHY_REQUEST_ERR: number;
+    readonly INDEX_SIZE_ERR: number;
+    readonly INUSE_ATTRIBUTE_ERR: number;
+    readonly INVALID_ACCESS_ERR: number;
+    readonly INVALID_CHARACTER_ERR: number;
+    readonly INVALID_MODIFICATION_ERR: number;
+    readonly INVALID_NODE_TYPE_ERR: number;
+    readonly INVALID_STATE_ERR: number;
+    readonly NAMESPACE_ERR: number;
+    readonly NETWORK_ERR: number;
+    readonly NOT_FOUND_ERR: number;
+    readonly NOT_SUPPORTED_ERR: number;
+    readonly NO_DATA_ALLOWED_ERR: number;
+    readonly NO_MODIFICATION_ALLOWED_ERR: number;
+    readonly PARSE_ERR: number;
+    readonly QUOTA_EXCEEDED_ERR: number;
+    readonly SECURITY_ERR: number;
+    readonly SERIALIZE_ERR: number;
+    readonly SYNTAX_ERR: number;
+    readonly TIMEOUT_ERR: number;
+    readonly TYPE_MISMATCH_ERR: number;
+    readonly URL_MISMATCH_ERR: number;
+    readonly VALIDATION_ERR: number;
+    readonly WRONG_DOCUMENT_ERR: number;
 }
 
 interface DOMImplementation {
@@ -6810,7 +7685,7 @@ declare var DOMSettableTokenList: {
 }
 
 interface DOMStringList {
-    length: number;
+    readonly length: number;
     contains(str: string): boolean;
     item(index: number): string;
     [index: number]: string;
@@ -6831,7 +7706,7 @@ declare var DOMStringMap: {
 }
 
 interface DOMTokenList {
-    length: number;
+    readonly length: number;
     add(...token: string[]): void;
     contains(token: string): boolean;
     item(index: number): string;
@@ -6858,9 +7733,9 @@ declare var DataCue: {
 interface DataTransfer {
     dropEffect: string;
     effectAllowed: string;
-    files: FileList;
-    items: DataTransferItemList;
-    types: DOMStringList;
+    readonly files: FileList;
+    readonly items: DataTransferItemList;
+    readonly types: DOMStringList;
     clearData(format?: string): boolean;
     getData(format: string): string;
     setData(format: string, data: string): boolean;
@@ -6872,8 +7747,8 @@ declare var DataTransfer: {
 }
 
 interface DataTransferItem {
-    kind: string;
-    type: string;
+    readonly kind: string;
+    readonly type: string;
     getAsFile(): File;
     getAsString(_callback: FunctionStringCallback): void;
 }
@@ -6884,7 +7759,7 @@ declare var DataTransferItem: {
 }
 
 interface DataTransferItemList {
-    length: number;
+    readonly length: number;
     add(data: File): DataTransferItem;
     clear(): void;
     item(index: number): DataTransferItem;
@@ -6898,9 +7773,9 @@ declare var DataTransferItemList: {
 }
 
 interface DeferredPermissionRequest {
-    id: number;
-    type: string;
-    uri: string;
+    readonly id: number;
+    readonly type: string;
+    readonly uri: string;
     allow(): void;
     deny(): void;
 }
@@ -6911,7 +7786,7 @@ declare var DeferredPermissionRequest: {
 }
 
 interface DelayNode extends AudioNode {
-    delayTime: AudioParam;
+    readonly delayTime: AudioParam;
 }
 
 declare var DelayNode: {
@@ -6920,9 +7795,9 @@ declare var DelayNode: {
 }
 
 interface DeviceAcceleration {
-    x: number;
-    y: number;
-    z: number;
+    readonly x: number;
+    readonly y: number;
+    readonly z: number;
 }
 
 declare var DeviceAcceleration: {
@@ -6930,11 +7805,20 @@ declare var DeviceAcceleration: {
     new(): DeviceAcceleration;
 }
 
+interface DeviceLightEvent extends Event {
+    readonly value: number;
+}
+
+declare var DeviceLightEvent: {
+    prototype: DeviceLightEvent;
+    new(type: string, eventInitDict?: DeviceLightEventInit): DeviceLightEvent;
+}
+
 interface DeviceMotionEvent extends Event {
-    acceleration: DeviceAcceleration;
-    accelerationIncludingGravity: DeviceAcceleration;
-    interval: number;
-    rotationRate: DeviceRotationRate;
+    readonly acceleration: DeviceAcceleration;
+    readonly accelerationIncludingGravity: DeviceAcceleration;
+    readonly interval: number;
+    readonly rotationRate: DeviceRotationRate;
     initDeviceMotionEvent(type: string, bubbles: boolean, cancelable: boolean, acceleration: DeviceAccelerationDict, accelerationIncludingGravity: DeviceAccelerationDict, rotationRate: DeviceRotationRateDict, interval: number): void;
 }
 
@@ -6944,10 +7828,10 @@ declare var DeviceMotionEvent: {
 }
 
 interface DeviceOrientationEvent extends Event {
-    absolute: boolean;
-    alpha: number;
-    beta: number;
-    gamma: number;
+    readonly absolute: boolean;
+    readonly alpha: number;
+    readonly beta: number;
+    readonly gamma: number;
     initDeviceOrientationEvent(type: string, bubbles: boolean, cancelable: boolean, alpha: number, beta: number, gamma: number, absolute: boolean): void;
 }
 
@@ -6957,9 +7841,9 @@ declare var DeviceOrientationEvent: {
 }
 
 interface DeviceRotationRate {
-    alpha: number;
-    beta: number;
-    gamma: number;
+    readonly alpha: number;
+    readonly beta: number;
+    readonly gamma: number;
 }
 
 declare var DeviceRotationRate: {
@@ -6971,15 +7855,15 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Sets or gets the URL for the current document. 
       */
-    URL: string;
+    readonly URL: string;
     /**
       * Gets the URL for the document, stripped of any character encoding.
       */
-    URLUnencoded: string;
+    readonly URLUnencoded: string;
     /**
       * Gets the object that has the focus when the parent document has focus.
       */
-    activeElement: Element;
+    readonly activeElement: Element;
     /**
       * Sets or gets the color of all active links in the document.
       */
@@ -6987,15 +7871,15 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Returns a reference to the collection of elements contained by the object.
       */
-    all: HTMLCollection;
+    readonly all: HTMLAllCollection;
     /**
       * Retrieves a collection of all a objects that have a name and/or id property. Objects in this collection are in HTML source order.
       */
-    anchors: HTMLCollection;
+    anchors: HTMLCollectionOf<HTMLAnchorElement>;
     /**
       * Retrieves a collection of all applet objects in the document.
       */
-    applets: HTMLCollection;
+    applets: HTMLCollectionOf<HTMLAppletElement>;
     /**
       * Deprecated. Sets or retrieves a value that indicates the background color behind the object. 
       */
@@ -7004,7 +7888,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Specifies the beginning and end of the document body.
       */
     body: HTMLElement;
-    characterSet: string;
+    readonly characterSet: string;
     /**
       * Gets or sets the character set used to encode the object.
       */
@@ -7012,13 +7896,14 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Gets a value that indicates whether standards-compliant mode is switched on for the object.
       */
-    compatMode: string;
+    readonly compatMode: string;
     cookie: string;
+    readonly currentScript: HTMLScriptElement | SVGScriptElement;
     /**
       * Gets the default character set from the current regional language settings.
       */
-    defaultCharset: string;
-    defaultView: Window;
+    readonly defaultCharset: string;
+    readonly defaultView: Window;
     /**
       * Sets or gets a value that indicates whether the document can be edited.
       */
@@ -7030,7 +7915,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Gets an object representing the document type declaration associated with the current document. 
       */
-    doctype: DocumentType;
+    readonly doctype: DocumentType;
     /**
       * Gets a reference to the root node of the document. 
       */
@@ -7042,7 +7927,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Retrieves a collection of all embed objects in the document.
       */
-    embeds: HTMLCollection;
+    embeds: HTMLCollectionOf<HTMLEmbedElement>;
     /**
       * Sets or gets the foreground (text) color of the document.
       */
@@ -7050,27 +7935,27 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Retrieves a collection, in source order, of all form objects in the document.
       */
-    forms: HTMLCollection;
-    fullscreenElement: Element;
-    fullscreenEnabled: boolean;
-    head: HTMLHeadElement;
-    hidden: boolean;
+    forms: HTMLCollectionOf<HTMLFormElement>;
+    readonly fullscreenElement: Element;
+    readonly fullscreenEnabled: boolean;
+    readonly head: HTMLHeadElement;
+    readonly hidden: boolean;
     /**
       * Retrieves a collection, in source order, of img objects in the document.
       */
-    images: HTMLCollection;
+    images: HTMLCollectionOf<HTMLImageElement>;
     /**
       * Gets the implementation object of the current document. 
       */
-    implementation: DOMImplementation;
+    readonly implementation: DOMImplementation;
     /**
       * Returns the character encoding used to create the webpage that is loaded into the document object.
       */
-    inputEncoding: string;
+    readonly inputEncoding: string;
     /**
       * Gets the date that the page was last modified, if the page supplies one. 
       */
-    lastModified: string;
+    readonly lastModified: string;
     /**
       * Sets or gets the color of the document links. 
       */
@@ -7078,16 +7963,13 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Retrieves a collection of all a objects that specify the href property and all area objects in the document.
       */
-    links: HTMLCollection;
+    links: HTMLCollectionOf<HTMLAnchorElement | HTMLAreaElement>;
     /**
       * Contains information about the current URL. 
       */
-    location: Location;
-    media: string;
+    readonly location: Location;
     msCSSOMElementFloatMetrics: boolean;
     msCapsLockWarningOff: boolean;
-    msHidden: boolean;
-    msVisibilityState: string;
     /**
       * Fires when the user aborts the download.
       * @param ev The event.
@@ -7189,7 +8071,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Occurs when the end of playback is reached. 
       * @param ev The event
       */
-    onended: (ev: Event) => any;
+    onended: (ev: MediaStreamErrorEvent) => any;
     /**
       * Fires when an error occurs during object loading.
       * @param ev The event.
@@ -7203,6 +8085,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     onfullscreenchange: (ev: Event) => any;
     onfullscreenerror: (ev: Event) => any;
     oninput: (ev: Event) => any;
+    oninvalid: (ev: Event) => any;
     /**
       * Fires when the user presses a key.
       * @param ev The keyboard event
@@ -7267,7 +8150,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Fires when the wheel button is rotated. 
       * @param ev The mouse event
       */
-    onmousewheel: (ev: MouseWheelEvent) => any;
+    onmousewheel: (ev: WheelEvent) => any;
     onmscontentzoom: (ev: UIEvent) => any;
     onmsgesturechange: (ev: MSGestureEvent) => any;
     onmsgesturedoubletap: (ev: MSGestureEvent) => any;
@@ -7352,6 +8235,11 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * @param ev The event.
       */
     onselect: (ev: UIEvent) => any;
+    /**
+      * Fires when the selection state of a document changes.
+      * @param ev The event.
+      */
+    onselectionchange: (ev: Event) => any;
     onselectstart: (ev: Event) => any;
     /**
       * Occurs when the download has stopped. 
@@ -7390,51 +8278,51 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     onwaiting: (ev: Event) => any;
     onwebkitfullscreenchange: (ev: Event) => any;
     onwebkitfullscreenerror: (ev: Event) => any;
-    plugins: HTMLCollection;
-    pointerLockElement: Element;
+    plugins: HTMLCollectionOf<HTMLEmbedElement>;
+    readonly pointerLockElement: Element;
     /**
       * Retrieves a value that indicates the current state of the object.
       */
-    readyState: string;
+    readonly readyState: string;
     /**
       * Gets the URL of the location that referred the user to the current page.
       */
-    referrer: string;
+    readonly referrer: string;
     /**
       * Gets the root svg element in the document hierarchy.
       */
-    rootElement: SVGSVGElement;
+    readonly rootElement: SVGSVGElement;
     /**
       * Retrieves a collection of all script objects in the document.
       */
-    scripts: HTMLCollection;
-    security: string;
+    scripts: HTMLCollectionOf<HTMLScriptElement>;
+    readonly scrollingElement: Element;
     /**
       * Retrieves a collection of styleSheet objects representing the style sheets that correspond to each instance of a link or style object in the document.
       */
-    styleSheets: StyleSheetList;
+    readonly styleSheets: StyleSheetList;
     /**
       * Contains the title of the document.
       */
     title: string;
-    visibilityState: string;
+    readonly visibilityState: string;
     /** 
       * Sets or gets the color of the links that the user has visited.
       */
     vlinkColor: string;
-    webkitCurrentFullScreenElement: Element;
-    webkitFullscreenElement: Element;
-    webkitFullscreenEnabled: boolean;
-    webkitIsFullScreen: boolean;
-    xmlEncoding: string;
+    readonly webkitCurrentFullScreenElement: Element;
+    readonly webkitFullscreenElement: Element;
+    readonly webkitFullscreenEnabled: boolean;
+    readonly webkitIsFullScreen: boolean;
+    readonly xmlEncoding: string;
     xmlStandalone: boolean;
     /**
       * Gets or sets the version attribute specified in the declaration of an XML document.
       */
     xmlVersion: string;
-    currentScript: HTMLScriptElement;
     adoptNode(source: Node): Node;
     captureEvents(): void;
+    caretRangeFromPoint(x: number, y: number): Range;
     clear(): void;
     /**
       * Closes an output stream and forces the sent data to display.
@@ -7461,37 +8349,24 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * @param tagName The name of an element.
       */
     createElement(tagName: "a"): HTMLAnchorElement;
-    createElement(tagName: "abbr"): HTMLPhraseElement;
-    createElement(tagName: "acronym"): HTMLPhraseElement;
-    createElement(tagName: "address"): HTMLBlockElement;
     createElement(tagName: "applet"): HTMLAppletElement;
     createElement(tagName: "area"): HTMLAreaElement;
     createElement(tagName: "audio"): HTMLAudioElement;
-    createElement(tagName: "b"): HTMLPhraseElement;
     createElement(tagName: "base"): HTMLBaseElement;
     createElement(tagName: "basefont"): HTMLBaseFontElement;
-    createElement(tagName: "bdo"): HTMLPhraseElement;
-    createElement(tagName: "big"): HTMLPhraseElement;
-    createElement(tagName: "blockquote"): HTMLBlockElement;
+    createElement(tagName: "blockquote"): HTMLQuoteElement;
     createElement(tagName: "body"): HTMLBodyElement;
     createElement(tagName: "br"): HTMLBRElement;
     createElement(tagName: "button"): HTMLButtonElement;
     createElement(tagName: "canvas"): HTMLCanvasElement;
     createElement(tagName: "caption"): HTMLTableCaptionElement;
-    createElement(tagName: "center"): HTMLBlockElement;
-    createElement(tagName: "cite"): HTMLPhraseElement;
-    createElement(tagName: "code"): HTMLPhraseElement;
     createElement(tagName: "col"): HTMLTableColElement;
     createElement(tagName: "colgroup"): HTMLTableColElement;
     createElement(tagName: "datalist"): HTMLDataListElement;
-    createElement(tagName: "dd"): HTMLDDElement;
     createElement(tagName: "del"): HTMLModElement;
-    createElement(tagName: "dfn"): HTMLPhraseElement;
     createElement(tagName: "dir"): HTMLDirectoryElement;
     createElement(tagName: "div"): HTMLDivElement;
     createElement(tagName: "dl"): HTMLDListElement;
-    createElement(tagName: "dt"): HTMLDTElement;
-    createElement(tagName: "em"): HTMLPhraseElement;
     createElement(tagName: "embed"): HTMLEmbedElement;
     createElement(tagName: "fieldset"): HTMLFieldSetElement;
     createElement(tagName: "font"): HTMLFontElement;
@@ -7507,52 +8382,41 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     createElement(tagName: "head"): HTMLHeadElement;
     createElement(tagName: "hr"): HTMLHRElement;
     createElement(tagName: "html"): HTMLHtmlElement;
-    createElement(tagName: "i"): HTMLPhraseElement;
     createElement(tagName: "iframe"): HTMLIFrameElement;
     createElement(tagName: "img"): HTMLImageElement;
     createElement(tagName: "input"): HTMLInputElement;
     createElement(tagName: "ins"): HTMLModElement;
-    createElement(tagName: "isindex"): HTMLIsIndexElement;
-    createElement(tagName: "kbd"): HTMLPhraseElement;
-    createElement(tagName: "keygen"): HTMLBlockElement;
+    createElement(tagName: "isindex"): HTMLUnknownElement;
     createElement(tagName: "label"): HTMLLabelElement;
     createElement(tagName: "legend"): HTMLLegendElement;
     createElement(tagName: "li"): HTMLLIElement;
     createElement(tagName: "link"): HTMLLinkElement;
-    createElement(tagName: "listing"): HTMLBlockElement;
+    createElement(tagName: "listing"): HTMLPreElement;
     createElement(tagName: "map"): HTMLMapElement;
     createElement(tagName: "marquee"): HTMLMarqueeElement;
     createElement(tagName: "menu"): HTMLMenuElement;
     createElement(tagName: "meta"): HTMLMetaElement;
-    createElement(tagName: "nextid"): HTMLNextIdElement;
-    createElement(tagName: "nobr"): HTMLPhraseElement;
+    createElement(tagName: "meter"): HTMLMeterElement;
+    createElement(tagName: "nextid"): HTMLUnknownElement;
     createElement(tagName: "object"): HTMLObjectElement;
     createElement(tagName: "ol"): HTMLOListElement;
     createElement(tagName: "optgroup"): HTMLOptGroupElement;
     createElement(tagName: "option"): HTMLOptionElement;
     createElement(tagName: "p"): HTMLParagraphElement;
     createElement(tagName: "param"): HTMLParamElement;
-    createElement(tagName: "plaintext"): HTMLBlockElement;
+    createElement(tagName: "picture"): HTMLPictureElement;
     createElement(tagName: "pre"): HTMLPreElement;
     createElement(tagName: "progress"): HTMLProgressElement;
     createElement(tagName: "q"): HTMLQuoteElement;
-    createElement(tagName: "rt"): HTMLPhraseElement;
-    createElement(tagName: "ruby"): HTMLPhraseElement;
-    createElement(tagName: "s"): HTMLPhraseElement;
-    createElement(tagName: "samp"): HTMLPhraseElement;
     createElement(tagName: "script"): HTMLScriptElement;
     createElement(tagName: "select"): HTMLSelectElement;
-    createElement(tagName: "small"): HTMLPhraseElement;
     createElement(tagName: "source"): HTMLSourceElement;
     createElement(tagName: "span"): HTMLSpanElement;
-    createElement(tagName: "strike"): HTMLPhraseElement;
-    createElement(tagName: "strong"): HTMLPhraseElement;
     createElement(tagName: "style"): HTMLStyleElement;
-    createElement(tagName: "sub"): HTMLPhraseElement;
-    createElement(tagName: "sup"): HTMLPhraseElement;
     createElement(tagName: "table"): HTMLTableElement;
     createElement(tagName: "tbody"): HTMLTableSectionElement;
     createElement(tagName: "td"): HTMLTableDataCellElement;
+    createElement(tagName: "template"): HTMLTemplateElement;
     createElement(tagName: "textarea"): HTMLTextAreaElement;
     createElement(tagName: "tfoot"): HTMLTableSectionElement;
     createElement(tagName: "th"): HTMLTableHeaderCellElement;
@@ -7560,13 +8424,10 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     createElement(tagName: "title"): HTMLTitleElement;
     createElement(tagName: "tr"): HTMLTableRowElement;
     createElement(tagName: "track"): HTMLTrackElement;
-    createElement(tagName: "tt"): HTMLPhraseElement;
-    createElement(tagName: "u"): HTMLPhraseElement;
     createElement(tagName: "ul"): HTMLUListElement;
-    createElement(tagName: "var"): HTMLPhraseElement;
     createElement(tagName: "video"): HTMLVideoElement;
     createElement(tagName: "x-ms-webview"): MSHTMLWebViewElement;
-    createElement(tagName: "xmp"): HTMLBlockElement;
+    createElement(tagName: "xmp"): HTMLPreElement;
     createElement(tagName: string): HTMLElement;
     createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "a"): SVGAElement
     createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "circle"): SVGCircleElement
@@ -7651,7 +8512,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * @param data String that specifies the nodeValue property of the text node.
       */
     createTextNode(data: string): Text;
-    createTouch(view: any, target: EventTarget, identifier: number, pageX: number, pageY: number, screenX: number, screenY: number): Touch;
+    createTouch(view: Window, target: EventTarget, identifier: number, pageX: number, pageY: number, screenX: number, screenY: number): Touch;
     createTouchList(...touches: Touch[]): TouchList;
     /**
       * Creates a TreeWalker object that you can use to traverse filtered lists of nodes or elements in a document.
@@ -7702,44 +8563,44 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * @param name Specifies the name of an element.
       */
     getElementsByTagName(tagname: "a"): NodeListOf<HTMLAnchorElement>;
-    getElementsByTagName(tagname: "abbr"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "acronym"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "address"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "abbr"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "acronym"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "address"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "applet"): NodeListOf<HTMLAppletElement>;
     getElementsByTagName(tagname: "area"): NodeListOf<HTMLAreaElement>;
     getElementsByTagName(tagname: "article"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "aside"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "audio"): NodeListOf<HTMLAudioElement>;
-    getElementsByTagName(tagname: "b"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "b"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "base"): NodeListOf<HTMLBaseElement>;
     getElementsByTagName(tagname: "basefont"): NodeListOf<HTMLBaseFontElement>;
-    getElementsByTagName(tagname: "bdo"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "big"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "blockquote"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "bdo"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "big"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "blockquote"): NodeListOf<HTMLQuoteElement>;
     getElementsByTagName(tagname: "body"): NodeListOf<HTMLBodyElement>;
     getElementsByTagName(tagname: "br"): NodeListOf<HTMLBRElement>;
     getElementsByTagName(tagname: "button"): NodeListOf<HTMLButtonElement>;
     getElementsByTagName(tagname: "canvas"): NodeListOf<HTMLCanvasElement>;
     getElementsByTagName(tagname: "caption"): NodeListOf<HTMLTableCaptionElement>;
-    getElementsByTagName(tagname: "center"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "center"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "circle"): NodeListOf<SVGCircleElement>;
-    getElementsByTagName(tagname: "cite"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "cite"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "clippath"): NodeListOf<SVGClipPathElement>;
-    getElementsByTagName(tagname: "code"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "code"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "col"): NodeListOf<HTMLTableColElement>;
     getElementsByTagName(tagname: "colgroup"): NodeListOf<HTMLTableColElement>;
     getElementsByTagName(tagname: "datalist"): NodeListOf<HTMLDataListElement>;
-    getElementsByTagName(tagname: "dd"): NodeListOf<HTMLDDElement>;
+    getElementsByTagName(tagname: "dd"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "defs"): NodeListOf<SVGDefsElement>;
     getElementsByTagName(tagname: "del"): NodeListOf<HTMLModElement>;
     getElementsByTagName(tagname: "desc"): NodeListOf<SVGDescElement>;
-    getElementsByTagName(tagname: "dfn"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "dfn"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "dir"): NodeListOf<HTMLDirectoryElement>;
     getElementsByTagName(tagname: "div"): NodeListOf<HTMLDivElement>;
     getElementsByTagName(tagname: "dl"): NodeListOf<HTMLDListElement>;
-    getElementsByTagName(tagname: "dt"): NodeListOf<HTMLDTElement>;
+    getElementsByTagName(tagname: "dt"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "ellipse"): NodeListOf<SVGEllipseElement>;
-    getElementsByTagName(tagname: "em"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "em"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "embed"): NodeListOf<HTMLEmbedElement>;
     getElementsByTagName(tagname: "feblend"): NodeListOf<SVGFEBlendElement>;
     getElementsByTagName(tagname: "fecolormatrix"): NodeListOf<SVGFEColorMatrixElement>;
@@ -7787,22 +8648,22 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     getElementsByTagName(tagname: "hgroup"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "hr"): NodeListOf<HTMLHRElement>;
     getElementsByTagName(tagname: "html"): NodeListOf<HTMLHtmlElement>;
-    getElementsByTagName(tagname: "i"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "i"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "iframe"): NodeListOf<HTMLIFrameElement>;
     getElementsByTagName(tagname: "image"): NodeListOf<SVGImageElement>;
     getElementsByTagName(tagname: "img"): NodeListOf<HTMLImageElement>;
     getElementsByTagName(tagname: "input"): NodeListOf<HTMLInputElement>;
     getElementsByTagName(tagname: "ins"): NodeListOf<HTMLModElement>;
-    getElementsByTagName(tagname: "isindex"): NodeListOf<HTMLIsIndexElement>;
-    getElementsByTagName(tagname: "kbd"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "keygen"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "isindex"): NodeListOf<HTMLUnknownElement>;
+    getElementsByTagName(tagname: "kbd"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "keygen"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "label"): NodeListOf<HTMLLabelElement>;
     getElementsByTagName(tagname: "legend"): NodeListOf<HTMLLegendElement>;
     getElementsByTagName(tagname: "li"): NodeListOf<HTMLLIElement>;
     getElementsByTagName(tagname: "line"): NodeListOf<SVGLineElement>;
     getElementsByTagName(tagname: "lineargradient"): NodeListOf<SVGLinearGradientElement>;
     getElementsByTagName(tagname: "link"): NodeListOf<HTMLLinkElement>;
-    getElementsByTagName(tagname: "listing"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "listing"): NodeListOf<HTMLPreElement>;
     getElementsByTagName(tagname: "map"): NodeListOf<HTMLMapElement>;
     getElementsByTagName(tagname: "mark"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "marker"): NodeListOf<SVGMarkerElement>;
@@ -7811,9 +8672,10 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     getElementsByTagName(tagname: "menu"): NodeListOf<HTMLMenuElement>;
     getElementsByTagName(tagname: "meta"): NodeListOf<HTMLMetaElement>;
     getElementsByTagName(tagname: "metadata"): NodeListOf<SVGMetadataElement>;
+    getElementsByTagName(tagname: "meter"): NodeListOf<HTMLMeterElement>;
     getElementsByTagName(tagname: "nav"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "nextid"): NodeListOf<HTMLNextIdElement>;
-    getElementsByTagName(tagname: "nobr"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "nextid"): NodeListOf<HTMLUnknownElement>;
+    getElementsByTagName(tagname: "nobr"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "noframes"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "noscript"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "object"): NodeListOf<HTMLObjectElement>;
@@ -7824,7 +8686,8 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     getElementsByTagName(tagname: "param"): NodeListOf<HTMLParamElement>;
     getElementsByTagName(tagname: "path"): NodeListOf<SVGPathElement>;
     getElementsByTagName(tagname: "pattern"): NodeListOf<SVGPatternElement>;
-    getElementsByTagName(tagname: "plaintext"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "picture"): NodeListOf<HTMLPictureElement>;
+    getElementsByTagName(tagname: "plaintext"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "polygon"): NodeListOf<SVGPolygonElement>;
     getElementsByTagName(tagname: "polyline"): NodeListOf<SVGPolylineElement>;
     getElementsByTagName(tagname: "pre"): NodeListOf<HTMLPreElement>;
@@ -7832,28 +8695,29 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     getElementsByTagName(tagname: "q"): NodeListOf<HTMLQuoteElement>;
     getElementsByTagName(tagname: "radialgradient"): NodeListOf<SVGRadialGradientElement>;
     getElementsByTagName(tagname: "rect"): NodeListOf<SVGRectElement>;
-    getElementsByTagName(tagname: "rt"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "ruby"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "s"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "samp"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "rt"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "ruby"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "s"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "samp"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "script"): NodeListOf<HTMLScriptElement>;
     getElementsByTagName(tagname: "section"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "select"): NodeListOf<HTMLSelectElement>;
-    getElementsByTagName(tagname: "small"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "small"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "source"): NodeListOf<HTMLSourceElement>;
     getElementsByTagName(tagname: "span"): NodeListOf<HTMLSpanElement>;
     getElementsByTagName(tagname: "stop"): NodeListOf<SVGStopElement>;
-    getElementsByTagName(tagname: "strike"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "strong"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "strike"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "strong"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "style"): NodeListOf<HTMLStyleElement>;
-    getElementsByTagName(tagname: "sub"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "sup"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "sub"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "sup"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "svg"): NodeListOf<SVGSVGElement>;
     getElementsByTagName(tagname: "switch"): NodeListOf<SVGSwitchElement>;
     getElementsByTagName(tagname: "symbol"): NodeListOf<SVGSymbolElement>;
     getElementsByTagName(tagname: "table"): NodeListOf<HTMLTableElement>;
     getElementsByTagName(tagname: "tbody"): NodeListOf<HTMLTableSectionElement>;
     getElementsByTagName(tagname: "td"): NodeListOf<HTMLTableDataCellElement>;
+    getElementsByTagName(tagname: "template"): NodeListOf<HTMLTemplateElement>;
     getElementsByTagName(tagname: "text"): NodeListOf<SVGTextElement>;
     getElementsByTagName(tagname: "textpath"): NodeListOf<SVGTextPathElement>;
     getElementsByTagName(tagname: "textarea"): NodeListOf<HTMLTextAreaElement>;
@@ -7864,16 +8728,16 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     getElementsByTagName(tagname: "tr"): NodeListOf<HTMLTableRowElement>;
     getElementsByTagName(tagname: "track"): NodeListOf<HTMLTrackElement>;
     getElementsByTagName(tagname: "tspan"): NodeListOf<SVGTSpanElement>;
-    getElementsByTagName(tagname: "tt"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "u"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "tt"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "u"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "ul"): NodeListOf<HTMLUListElement>;
     getElementsByTagName(tagname: "use"): NodeListOf<SVGUseElement>;
-    getElementsByTagName(tagname: "var"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "var"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "video"): NodeListOf<HTMLVideoElement>;
     getElementsByTagName(tagname: "view"): NodeListOf<SVGViewElement>;
     getElementsByTagName(tagname: "wbr"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "x-ms-webview"): NodeListOf<MSHTMLWebViewElement>;
-    getElementsByTagName(tagname: "xmp"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "xmp"): NodeListOf<HTMLPreElement>;
     getElementsByTagName(tagname: string): NodeListOf<Element>;
     getElementsByTagNameNS(namespaceURI: string, localName: string): NodeListOf<Element>;
     /**
@@ -7885,8 +8749,8 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       */
     hasFocus(): boolean;
     importNode(importedNode: Node, deep: boolean): Node;
-    msElementsFromPoint(x: number, y: number): NodeList;
-    msElementsFromRect(left: number, top: number, width: number, height: number): NodeList;
+    msElementsFromPoint(x: number, y: number): NodeListOf<Element>;
+    msElementsFromRect(left: number, top: number, width: number, height: number): NodeListOf<Element>;
     /**
       * Opens a new window and loads a document specified by a given URL. Also, opens a new window that uses the url parameter and the name parameter to collect the output of the write method and the writeln method.
       * @param url Specifies a MIME type for the document.
@@ -7982,12 +8846,13 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "fullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "fullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -8000,7 +8865,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mssitemodejumplistitemremoved", listener: (ev: MSSiteModeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "msthumbnailclick", listener: (ev: MSSiteModeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -8024,6 +8889,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "selectionchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "selectstart", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "stop", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -8057,12 +8923,12 @@ declare var DocumentFragment: {
 }
 
 interface DocumentType extends Node, ChildNode {
-    entities: NamedNodeMap;
-    internalSubset: string;
-    name: string;
-    notations: NamedNodeMap;
-    publicId: string;
-    systemId: string;
+    readonly entities: NamedNodeMap;
+    readonly internalSubset: string;
+    readonly name: string;
+    readonly notations: NamedNodeMap;
+    readonly publicId: string;
+    readonly systemId: string;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8072,7 +8938,7 @@ declare var DocumentType: {
 }
 
 interface DragEvent extends MouseEvent {
-    dataTransfer: DataTransfer;
+    readonly dataTransfer: DataTransfer;
     initDragEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget, dataTransferArg: DataTransfer): void;
     msConvertURL(file: File, targetType: string, targetURL?: string): void;
 }
@@ -8083,12 +8949,12 @@ declare var DragEvent: {
 }
 
 interface DynamicsCompressorNode extends AudioNode {
-    attack: AudioParam;
-    knee: AudioParam;
-    ratio: AudioParam;
-    reduction: AudioParam;
-    release: AudioParam;
-    threshold: AudioParam;
+    readonly attack: AudioParam;
+    readonly knee: AudioParam;
+    readonly ratio: AudioParam;
+    readonly reduction: AudioParam;
+    readonly release: AudioParam;
+    readonly threshold: AudioParam;
 }
 
 declare var DynamicsCompressorNode: {
@@ -8096,26 +8962,36 @@ declare var DynamicsCompressorNode: {
     new(): DynamicsCompressorNode;
 }
 
+interface EXT_frag_depth {
+}
+
+declare var EXT_frag_depth: {
+    prototype: EXT_frag_depth;
+    new(): EXT_frag_depth;
+}
+
 interface EXT_texture_filter_anisotropic {
-    MAX_TEXTURE_MAX_ANISOTROPY_EXT: number;
-    TEXTURE_MAX_ANISOTROPY_EXT: number;
+    readonly MAX_TEXTURE_MAX_ANISOTROPY_EXT: number;
+    readonly TEXTURE_MAX_ANISOTROPY_EXT: number;
 }
 
 declare var EXT_texture_filter_anisotropic: {
     prototype: EXT_texture_filter_anisotropic;
     new(): EXT_texture_filter_anisotropic;
-    MAX_TEXTURE_MAX_ANISOTROPY_EXT: number;
-    TEXTURE_MAX_ANISOTROPY_EXT: number;
+    readonly MAX_TEXTURE_MAX_ANISOTROPY_EXT: number;
+    readonly TEXTURE_MAX_ANISOTROPY_EXT: number;
 }
 
 interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelector, ChildNode {
-    classList: DOMTokenList;
-    clientHeight: number;
-    clientLeft: number;
-    clientTop: number;
-    clientWidth: number;
+    readonly classList: DOMTokenList;
+    className: string;
+    readonly clientHeight: number;
+    readonly clientLeft: number;
+    readonly clientTop: number;
+    readonly clientWidth: number;
+    id: string;
     msContentZoomFactor: number;
-    msRegionOverflow: string;
+    readonly msRegionOverflow: string;
     onariarequest: (ev: AriaRequestEvent) => any;
     oncommand: (ev: CommandEvent) => any;
     ongotpointercapture: (ev: PointerEvent) => any;
@@ -8143,13 +9019,12 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     ontouchstart: (ev: TouchEvent) => any;
     onwebkitfullscreenchange: (ev: Event) => any;
     onwebkitfullscreenerror: (ev: Event) => any;
-    scrollHeight: number;
+    readonly prefix: string;
+    readonly scrollHeight: number;
     scrollLeft: number;
     scrollTop: number;
-    scrollWidth: number;
-    tagName: string;
-    id: string;
-    className: string;
+    readonly scrollWidth: number;
+    readonly tagName: string;
     innerHTML: string;
     getAttribute(name?: string): string;
     getAttributeNS(namespaceURI: string, localName: string): string;
@@ -8158,44 +9033,44 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     getBoundingClientRect(): ClientRect;
     getClientRects(): ClientRectList;
     getElementsByTagName(name: "a"): NodeListOf<HTMLAnchorElement>;
-    getElementsByTagName(name: "abbr"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "acronym"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "address"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "abbr"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "acronym"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "address"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "applet"): NodeListOf<HTMLAppletElement>;
     getElementsByTagName(name: "area"): NodeListOf<HTMLAreaElement>;
     getElementsByTagName(name: "article"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "aside"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "audio"): NodeListOf<HTMLAudioElement>;
-    getElementsByTagName(name: "b"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "b"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "base"): NodeListOf<HTMLBaseElement>;
     getElementsByTagName(name: "basefont"): NodeListOf<HTMLBaseFontElement>;
-    getElementsByTagName(name: "bdo"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "big"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "blockquote"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "bdo"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "big"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "blockquote"): NodeListOf<HTMLQuoteElement>;
     getElementsByTagName(name: "body"): NodeListOf<HTMLBodyElement>;
     getElementsByTagName(name: "br"): NodeListOf<HTMLBRElement>;
     getElementsByTagName(name: "button"): NodeListOf<HTMLButtonElement>;
     getElementsByTagName(name: "canvas"): NodeListOf<HTMLCanvasElement>;
     getElementsByTagName(name: "caption"): NodeListOf<HTMLTableCaptionElement>;
-    getElementsByTagName(name: "center"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "center"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "circle"): NodeListOf<SVGCircleElement>;
-    getElementsByTagName(name: "cite"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "cite"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "clippath"): NodeListOf<SVGClipPathElement>;
-    getElementsByTagName(name: "code"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "code"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "col"): NodeListOf<HTMLTableColElement>;
     getElementsByTagName(name: "colgroup"): NodeListOf<HTMLTableColElement>;
     getElementsByTagName(name: "datalist"): NodeListOf<HTMLDataListElement>;
-    getElementsByTagName(name: "dd"): NodeListOf<HTMLDDElement>;
+    getElementsByTagName(name: "dd"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "defs"): NodeListOf<SVGDefsElement>;
     getElementsByTagName(name: "del"): NodeListOf<HTMLModElement>;
     getElementsByTagName(name: "desc"): NodeListOf<SVGDescElement>;
-    getElementsByTagName(name: "dfn"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "dfn"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "dir"): NodeListOf<HTMLDirectoryElement>;
     getElementsByTagName(name: "div"): NodeListOf<HTMLDivElement>;
     getElementsByTagName(name: "dl"): NodeListOf<HTMLDListElement>;
-    getElementsByTagName(name: "dt"): NodeListOf<HTMLDTElement>;
+    getElementsByTagName(name: "dt"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "ellipse"): NodeListOf<SVGEllipseElement>;
-    getElementsByTagName(name: "em"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "em"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "embed"): NodeListOf<HTMLEmbedElement>;
     getElementsByTagName(name: "feblend"): NodeListOf<SVGFEBlendElement>;
     getElementsByTagName(name: "fecolormatrix"): NodeListOf<SVGFEColorMatrixElement>;
@@ -8243,22 +9118,22 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     getElementsByTagName(name: "hgroup"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "hr"): NodeListOf<HTMLHRElement>;
     getElementsByTagName(name: "html"): NodeListOf<HTMLHtmlElement>;
-    getElementsByTagName(name: "i"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "i"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "iframe"): NodeListOf<HTMLIFrameElement>;
     getElementsByTagName(name: "image"): NodeListOf<SVGImageElement>;
     getElementsByTagName(name: "img"): NodeListOf<HTMLImageElement>;
     getElementsByTagName(name: "input"): NodeListOf<HTMLInputElement>;
     getElementsByTagName(name: "ins"): NodeListOf<HTMLModElement>;
-    getElementsByTagName(name: "isindex"): NodeListOf<HTMLIsIndexElement>;
-    getElementsByTagName(name: "kbd"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "keygen"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "isindex"): NodeListOf<HTMLUnknownElement>;
+    getElementsByTagName(name: "kbd"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "keygen"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "label"): NodeListOf<HTMLLabelElement>;
     getElementsByTagName(name: "legend"): NodeListOf<HTMLLegendElement>;
     getElementsByTagName(name: "li"): NodeListOf<HTMLLIElement>;
     getElementsByTagName(name: "line"): NodeListOf<SVGLineElement>;
     getElementsByTagName(name: "lineargradient"): NodeListOf<SVGLinearGradientElement>;
     getElementsByTagName(name: "link"): NodeListOf<HTMLLinkElement>;
-    getElementsByTagName(name: "listing"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "listing"): NodeListOf<HTMLPreElement>;
     getElementsByTagName(name: "map"): NodeListOf<HTMLMapElement>;
     getElementsByTagName(name: "mark"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "marker"): NodeListOf<SVGMarkerElement>;
@@ -8267,9 +9142,10 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     getElementsByTagName(name: "menu"): NodeListOf<HTMLMenuElement>;
     getElementsByTagName(name: "meta"): NodeListOf<HTMLMetaElement>;
     getElementsByTagName(name: "metadata"): NodeListOf<SVGMetadataElement>;
+    getElementsByTagName(name: "meter"): NodeListOf<HTMLMeterElement>;
     getElementsByTagName(name: "nav"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "nextid"): NodeListOf<HTMLNextIdElement>;
-    getElementsByTagName(name: "nobr"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "nextid"): NodeListOf<HTMLUnknownElement>;
+    getElementsByTagName(name: "nobr"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "noframes"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "noscript"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "object"): NodeListOf<HTMLObjectElement>;
@@ -8280,7 +9156,8 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     getElementsByTagName(name: "param"): NodeListOf<HTMLParamElement>;
     getElementsByTagName(name: "path"): NodeListOf<SVGPathElement>;
     getElementsByTagName(name: "pattern"): NodeListOf<SVGPatternElement>;
-    getElementsByTagName(name: "plaintext"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "picture"): NodeListOf<HTMLPictureElement>;
+    getElementsByTagName(name: "plaintext"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "polygon"): NodeListOf<SVGPolygonElement>;
     getElementsByTagName(name: "polyline"): NodeListOf<SVGPolylineElement>;
     getElementsByTagName(name: "pre"): NodeListOf<HTMLPreElement>;
@@ -8288,28 +9165,29 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     getElementsByTagName(name: "q"): NodeListOf<HTMLQuoteElement>;
     getElementsByTagName(name: "radialgradient"): NodeListOf<SVGRadialGradientElement>;
     getElementsByTagName(name: "rect"): NodeListOf<SVGRectElement>;
-    getElementsByTagName(name: "rt"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "ruby"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "s"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "samp"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "rt"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "ruby"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "s"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "samp"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "script"): NodeListOf<HTMLScriptElement>;
     getElementsByTagName(name: "section"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "select"): NodeListOf<HTMLSelectElement>;
-    getElementsByTagName(name: "small"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "small"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "source"): NodeListOf<HTMLSourceElement>;
     getElementsByTagName(name: "span"): NodeListOf<HTMLSpanElement>;
     getElementsByTagName(name: "stop"): NodeListOf<SVGStopElement>;
-    getElementsByTagName(name: "strike"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "strong"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "strike"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "strong"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "style"): NodeListOf<HTMLStyleElement>;
-    getElementsByTagName(name: "sub"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "sup"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "sub"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "sup"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "svg"): NodeListOf<SVGSVGElement>;
     getElementsByTagName(name: "switch"): NodeListOf<SVGSwitchElement>;
     getElementsByTagName(name: "symbol"): NodeListOf<SVGSymbolElement>;
     getElementsByTagName(name: "table"): NodeListOf<HTMLTableElement>;
     getElementsByTagName(name: "tbody"): NodeListOf<HTMLTableSectionElement>;
     getElementsByTagName(name: "td"): NodeListOf<HTMLTableDataCellElement>;
+    getElementsByTagName(name: "template"): NodeListOf<HTMLTemplateElement>;
     getElementsByTagName(name: "text"): NodeListOf<SVGTextElement>;
     getElementsByTagName(name: "textpath"): NodeListOf<SVGTextPathElement>;
     getElementsByTagName(name: "textarea"): NodeListOf<HTMLTextAreaElement>;
@@ -8320,16 +9198,16 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     getElementsByTagName(name: "tr"): NodeListOf<HTMLTableRowElement>;
     getElementsByTagName(name: "track"): NodeListOf<HTMLTrackElement>;
     getElementsByTagName(name: "tspan"): NodeListOf<SVGTSpanElement>;
-    getElementsByTagName(name: "tt"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "u"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "tt"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "u"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "ul"): NodeListOf<HTMLUListElement>;
     getElementsByTagName(name: "use"): NodeListOf<SVGUseElement>;
-    getElementsByTagName(name: "var"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "var"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "video"): NodeListOf<HTMLVideoElement>;
     getElementsByTagName(name: "view"): NodeListOf<SVGViewElement>;
     getElementsByTagName(name: "wbr"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "x-ms-webview"): NodeListOf<MSHTMLWebViewElement>;
-    getElementsByTagName(name: "xmp"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "xmp"): NodeListOf<HTMLPreElement>;
     getElementsByTagName(name: string): NodeListOf<Element>;
     getElementsByTagNameNS(namespaceURI: string, localName: string): NodeListOf<Element>;
     hasAttribute(name: string): boolean;
@@ -8402,11 +9280,11 @@ declare var Element: {
 }
 
 interface ErrorEvent extends Event {
-    colno: number;
-    error: any;
-    filename: string;
-    lineno: number;
-    message: string;
+    readonly colno: number;
+    readonly error: any;
+    readonly filename: string;
+    readonly lineno: number;
+    readonly message: string;
     initErrorEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, messageArg: string, filenameArg: string, linenoArg: number): void;
 }
 
@@ -8416,39 +9294,39 @@ declare var ErrorEvent: {
 }
 
 interface Event {
-    bubbles: boolean;
+    readonly bubbles: boolean;
     cancelBubble: boolean;
-    cancelable: boolean;
-    currentTarget: EventTarget;
-    defaultPrevented: boolean;
-    eventPhase: number;
-    isTrusted: boolean;
+    readonly cancelable: boolean;
+    readonly currentTarget: EventTarget;
+    readonly defaultPrevented: boolean;
+    readonly eventPhase: number;
+    readonly isTrusted: boolean;
     returnValue: boolean;
-    srcElement: Element;
-    target: EventTarget;
-    timeStamp: number;
-    type: string;
+    readonly srcElement: Element;
+    readonly target: EventTarget;
+    readonly timeStamp: number;
+    readonly type: string;
     initEvent(eventTypeArg: string, canBubbleArg: boolean, cancelableArg: boolean): void;
     preventDefault(): void;
     stopImmediatePropagation(): void;
     stopPropagation(): void;
-    AT_TARGET: number;
-    BUBBLING_PHASE: number;
-    CAPTURING_PHASE: number;
+    readonly AT_TARGET: number;
+    readonly BUBBLING_PHASE: number;
+    readonly CAPTURING_PHASE: number;
 }
 
 declare var Event: {
     prototype: Event;
     new(type: string, eventInitDict?: EventInit): Event;
-    AT_TARGET: number;
-    BUBBLING_PHASE: number;
-    CAPTURING_PHASE: number;
+    readonly AT_TARGET: number;
+    readonly BUBBLING_PHASE: number;
+    readonly CAPTURING_PHASE: number;
 }
 
 interface EventTarget {
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
     dispatchEvent(evt: Event): boolean;
-    removeEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var EventTarget: {
@@ -8465,8 +9343,9 @@ declare var External: {
 }
 
 interface File extends Blob {
-    lastModifiedDate: any;
-    name: string;
+    readonly lastModifiedDate: any;
+    readonly name: string;
+    readonly webkitRelativePath: string;
 }
 
 declare var File: {
@@ -8475,7 +9354,7 @@ declare var File: {
 }
 
 interface FileList {
-    length: number;
+    readonly length: number;
     item(index: number): File;
     [index: number]: File;
 }
@@ -8486,7 +9365,7 @@ declare var FileList: {
 }
 
 interface FileReader extends EventTarget, MSBaseReader {
-    error: DOMError;
+    readonly error: DOMError;
     readAsArrayBuffer(blob: Blob): void;
     readAsBinaryString(blob: Blob): void;
     readAsDataURL(blob: Blob): void;
@@ -8500,7 +9379,7 @@ declare var FileReader: {
 }
 
 interface FocusEvent extends UIEvent {
-    relatedTarget: EventTarget;
+    readonly relatedTarget: EventTarget;
     initFocusEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, relatedTargetArg: EventTarget): void;
 }
 
@@ -8519,7 +9398,7 @@ declare var FormData: {
 }
 
 interface GainNode extends AudioNode {
-    gain: AudioParam;
+    readonly gain: AudioParam;
 }
 
 declare var GainNode: {
@@ -8528,13 +9407,13 @@ declare var GainNode: {
 }
 
 interface Gamepad {
-    axes: number[];
-    buttons: GamepadButton[];
-    connected: boolean;
-    id: string;
-    index: number;
-    mapping: string;
-    timestamp: number;
+    readonly axes: number[];
+    readonly buttons: GamepadButton[];
+    readonly connected: boolean;
+    readonly id: string;
+    readonly index: number;
+    readonly mapping: string;
+    readonly timestamp: number;
 }
 
 declare var Gamepad: {
@@ -8543,8 +9422,8 @@ declare var Gamepad: {
 }
 
 interface GamepadButton {
-    pressed: boolean;
-    value: number;
+    readonly pressed: boolean;
+    readonly value: number;
 }
 
 declare var GamepadButton: {
@@ -8553,7 +9432,7 @@ declare var GamepadButton: {
 }
 
 interface GamepadEvent extends Event {
-    gamepad: Gamepad;
+    readonly gamepad: Gamepad;
 }
 
 declare var GamepadEvent: {
@@ -8591,6 +9470,7 @@ interface HTMLAnchorElement extends HTMLElement {
       * Sets or retrieves the coordinates of the object.
       */
     coords: string;
+    download: string;
     /**
       * Contains the anchor portion of the URL including the hash sign (#).
       */
@@ -8611,12 +9491,12 @@ interface HTMLAnchorElement extends HTMLElement {
       * Sets or retrieves the language code of the object.
       */
     hreflang: string;
-    mimeType: string;
+    readonly mimeType: string;
     /**
       * Sets or retrieves the shape of the object.
       */
     name: string;
-    nameProp: string;
+    readonly nameProp: string;
     /**
       * Contains the pathname of the URL.
       */
@@ -8629,7 +9509,7 @@ interface HTMLAnchorElement extends HTMLElement {
       * Contains the protocol of the URL.
       */
     protocol: string;
-    protocolLong: string;
+    readonly protocolLong: string;
     /**
       * Sets or retrieves the relationship between the object and the destination of the link.
       */
@@ -8671,7 +9551,7 @@ interface HTMLAppletElement extends HTMLElement {
     /**
       * Retrieves a string of the URL where the object tag can be found. This is often the href of the document that the object is in, or the value set by a base element.
       */
-    BaseHref: string;
+    readonly BaseHref: string;
     align: string;
     /**
       * Sets or retrieves a text alternative to the graphic.
@@ -8698,7 +9578,7 @@ interface HTMLAppletElement extends HTMLElement {
     /**
       * Address of a pointer to the document this page or frame contains. If there is no document, then null will be returned.
       */
-    contentDocument: Document;
+    readonly contentDocument: Document;
     /**
       * Sets or retrieves the URL that references the data of the object.
       */
@@ -8707,7 +9587,7 @@ interface HTMLAppletElement extends HTMLElement {
       * Sets or retrieves a character string that can be used to implement your own declare functionality for the object.
       */
     declare: boolean;
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the height of the object.
       */
@@ -8748,6 +9628,7 @@ interface HTMLAreaElement extends HTMLElement {
       * Sets or retrieves the coordinates of the object.
       */
     coords: string;
+    download: string;
     /**
       * Sets or retrieves the subsection of the href property that follows the number sign (#).
       */
@@ -8873,23 +9754,6 @@ declare var HTMLBaseFontElement: {
     new(): HTMLBaseFontElement;
 }
 
-interface HTMLBlockElement extends HTMLElement {
-    /**
-      * Sets or retrieves reference information about the object.
-      */
-    cite: string;
-    clear: string;
-    /**
-      * Sets or retrieves the width of the object.
-      */
-    width: number;
-}
-
-declare var HTMLBlockElement: {
-    prototype: HTMLBlockElement;
-    new(): HTMLBlockElement;
-}
-
 interface HTMLBodyElement extends HTMLElement {
     aLink: any;
     background: string;
@@ -8917,7 +9781,6 @@ interface HTMLBodyElement extends HTMLElement {
     onunload: (ev: Event) => any;
     text: any;
     vLink: any;
-    createTextRange(): TextRange;
     addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -8942,10 +9805,10 @@ interface HTMLBodyElement extends HTMLElement {
     addEventListener(type: "afterprint", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeprint", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeunload", listener: (ev: BeforeUnloadEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
@@ -8956,9 +9819,9 @@ interface HTMLBodyElement extends HTMLElement {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -8970,7 +9833,7 @@ interface HTMLBodyElement extends HTMLElement {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
@@ -8978,6 +9841,7 @@ interface HTMLBodyElement extends HTMLElement {
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "hashchange", listener: (ev: HashChangeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -8995,13 +9859,13 @@ interface HTMLBodyElement extends HTMLElement {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "offline", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "online", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "orientationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "pagehide", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pageshow", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -9055,7 +9919,7 @@ interface HTMLButtonElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Overrides the action attribute (where the data on a form is sent) on the parent form element.
       */
@@ -9088,11 +9952,11 @@ interface HTMLButtonElement extends HTMLElement {
     /**
       * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
       */
-    validationMessage: string;
+    readonly validationMessage: string;
     /**
       * Returns a  ValidityState object that represents the validity states of an element.
       */
-    validity: ValidityState;
+    readonly validity: ValidityState;
     /** 
       * Sets or retrieves the default or selected value of the control.
       */
@@ -9100,15 +9964,11 @@ interface HTMLButtonElement extends HTMLElement {
     /**
       * Returns whether an element will successfully validate based on forms validation rules and constraints.
       */
-    willValidate: boolean;
+    readonly willValidate: boolean;
     /**
       * Returns whether a form will validate when it is submitted, without having to submit it.
       */
     checkValidity(): boolean;
-    /**
-      * Creates a TextRange object for the element.
-      */
-    createTextRange(): TextRange;
     /**
       * Sets a custom error message that is displayed when a form is submitted.
       * @param error Sets a custom error message that is displayed when a form is submitted.
@@ -9158,11 +10018,11 @@ interface HTMLCollection {
     /**
       * Sets or retrieves the number of objects in a collection.
       */
-    length: number;
+    readonly length: number;
     /**
       * Retrieves an object from various collections.
       */
-    item(nameOrIndex?: any, optionalIndex?: any): Element;
+    item(index: number): Element;
     /**
       * Retrieves a select object or an object from an options collection.
       */
@@ -9175,18 +10035,6 @@ declare var HTMLCollection: {
     new(): HTMLCollection;
 }
 
-interface HTMLDDElement extends HTMLElement {
-    /**
-      * Sets or retrieves whether the browser automatically performs wordwrap.
-      */
-    noWrap: boolean;
-}
-
-declare var HTMLDDElement: {
-    prototype: HTMLDDElement;
-    new(): HTMLDDElement;
-}
-
 interface HTMLDListElement extends HTMLElement {
     compact: boolean;
 }
@@ -9196,20 +10044,8 @@ declare var HTMLDListElement: {
     new(): HTMLDListElement;
 }
 
-interface HTMLDTElement extends HTMLElement {
-    /**
-      * Sets or retrieves whether the browser automatically performs wordwrap.
-      */
-    noWrap: boolean;
-}
-
-declare var HTMLDTElement: {
-    prototype: HTMLDTElement;
-    new(): HTMLDTElement;
-}
-
 interface HTMLDataListElement extends HTMLElement {
-    options: HTMLCollection;
+    options: HTMLCollectionOf<HTMLOptionElement>;
 }
 
 declare var HTMLDataListElement: {
@@ -9252,38 +10088,38 @@ declare var HTMLDocument: {
 
 interface HTMLElement extends Element {
     accessKey: string;
-    children: HTMLCollection;
+    readonly children: HTMLCollection;
     contentEditable: string;
-    dataset: DOMStringMap;
+    readonly dataset: DOMStringMap;
     dir: string;
     draggable: boolean;
     hidden: boolean;
     hideFocus: boolean;
     innerHTML: string;
     innerText: string;
-    isContentEditable: boolean;
+    readonly isContentEditable: boolean;
     lang: string;
-    offsetHeight: number;
-    offsetLeft: number;
-    offsetParent: Element;
-    offsetTop: number;
-    offsetWidth: number;
+    readonly offsetHeight: number;
+    readonly offsetLeft: number;
+    readonly offsetParent: Element;
+    readonly offsetTop: number;
+    readonly offsetWidth: number;
     onabort: (ev: Event) => any;
     onactivate: (ev: UIEvent) => any;
     onbeforeactivate: (ev: UIEvent) => any;
-    onbeforecopy: (ev: DragEvent) => any;
-    onbeforecut: (ev: DragEvent) => any;
+    onbeforecopy: (ev: ClipboardEvent) => any;
+    onbeforecut: (ev: ClipboardEvent) => any;
     onbeforedeactivate: (ev: UIEvent) => any;
-    onbeforepaste: (ev: DragEvent) => any;
+    onbeforepaste: (ev: ClipboardEvent) => any;
     onblur: (ev: FocusEvent) => any;
     oncanplay: (ev: Event) => any;
     oncanplaythrough: (ev: Event) => any;
     onchange: (ev: Event) => any;
     onclick: (ev: MouseEvent) => any;
     oncontextmenu: (ev: PointerEvent) => any;
-    oncopy: (ev: DragEvent) => any;
+    oncopy: (ev: ClipboardEvent) => any;
     oncuechange: (ev: Event) => any;
-    oncut: (ev: DragEvent) => any;
+    oncut: (ev: ClipboardEvent) => any;
     ondblclick: (ev: MouseEvent) => any;
     ondeactivate: (ev: UIEvent) => any;
     ondrag: (ev: DragEvent) => any;
@@ -9295,10 +10131,11 @@ interface HTMLElement extends Element {
     ondrop: (ev: DragEvent) => any;
     ondurationchange: (ev: Event) => any;
     onemptied: (ev: Event) => any;
-    onended: (ev: Event) => any;
+    onended: (ev: MediaStreamErrorEvent) => any;
     onerror: (ev: Event) => any;
     onfocus: (ev: FocusEvent) => any;
     oninput: (ev: Event) => any;
+    oninvalid: (ev: Event) => any;
     onkeydown: (ev: KeyboardEvent) => any;
     onkeypress: (ev: KeyboardEvent) => any;
     onkeyup: (ev: KeyboardEvent) => any;
@@ -9313,10 +10150,10 @@ interface HTMLElement extends Element {
     onmouseout: (ev: MouseEvent) => any;
     onmouseover: (ev: MouseEvent) => any;
     onmouseup: (ev: MouseEvent) => any;
-    onmousewheel: (ev: MouseWheelEvent) => any;
+    onmousewheel: (ev: WheelEvent) => any;
     onmscontentzoom: (ev: UIEvent) => any;
     onmsmanipulationstatechanged: (ev: MSManipulationEvent) => any;
-    onpaste: (ev: DragEvent) => any;
+    onpaste: (ev: ClipboardEvent) => any;
     onpause: (ev: Event) => any;
     onplay: (ev: Event) => any;
     onplaying: (ev: Event) => any;
@@ -9337,7 +10174,7 @@ interface HTMLElement extends Element {
     outerHTML: string;
     outerText: string;
     spellcheck: boolean;
-    style: CSSStyleDeclaration;
+    readonly style: CSSStyleDeclaration;
     tabIndex: number;
     title: string;
     blur(): void;
@@ -9373,10 +10210,10 @@ interface HTMLElement extends Element {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -9384,9 +10221,9 @@ interface HTMLElement extends Element {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -9398,11 +10235,12 @@ interface HTMLElement extends Element {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -9418,8 +10256,8 @@ interface HTMLElement extends Element {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -9481,7 +10319,7 @@ interface HTMLEmbedElement extends HTMLElement, GetSVGDocument {
     /**
       * Gets the source associated with the media element for use by the PlayToManager.
       */
-    msPlayToSource: any;
+    readonly msPlayToSource: any;
     /**
       * Sets or retrieves the name of the object.
       */
@@ -9489,12 +10327,12 @@ interface HTMLEmbedElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves the palette used for the embedded document.
       */
-    palette: string;
+    readonly palette: string;
     /**
       * Retrieves the URL of the plug-in used to view an embedded document.
       */
-    pluginspage: string;
-    readyState: string;
+    readonly pluginspage: string;
+    readonly readyState: string;
     /**
       * Sets or retrieves a URL to be loaded by the object.
       */
@@ -9524,19 +10362,19 @@ interface HTMLFieldSetElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
       */
-    validationMessage: string;
+    readonly validationMessage: string;
     /**
       * Returns a  ValidityState object that represents the validity states of an element.
       */
-    validity: ValidityState;
+    readonly validity: ValidityState;
     /**
       * Returns whether an element will successfully validate based on forms validation rules and constraints.
       */
-    willValidate: boolean;
+    readonly willValidate: boolean;
     /**
       * Returns whether a form will validate when it is submitted, without having to submit it.
       */
@@ -9582,7 +10420,7 @@ interface HTMLFormElement extends HTMLElement {
     /**
       * Retrieves a collection, in source order, of all controls in a given form.
       */
-    elements: HTMLCollection;
+    readonly elements: HTMLCollection;
     /**
       * Sets or retrieves the MIME encoding for the form.
       */
@@ -9594,7 +10432,7 @@ interface HTMLFormElement extends HTMLElement {
     /**
       * Sets or retrieves the number of objects in a collection.
       */
-    length: number;
+    readonly length: number;
     /**
       * Sets or retrieves how to send the form data to the server.
       */
@@ -9653,11 +10491,11 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves the document object of the page or frame.
       */
-    contentDocument: Document;
+    readonly contentDocument: Document;
     /**
       * Retrieves the object of the specified.
       */
-    contentWindow: Window;
+    readonly contentWindow: Window;
     /**
       * Sets or retrieves whether to display a border for the frame.
       */
@@ -9698,10 +10536,6 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
       * Sets or retrieves whether the frame can be scrolled.
       */
     scrolling: string;
-    /**
-      * Sets the value indicating whether the source file of a frame or iframe has specific security restrictions applied.
-      */
-    security: any;
     /**
       * Sets or retrieves a URL to be loaded by the object.
       */
@@ -9733,10 +10567,10 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -9744,9 +10578,9 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -9758,11 +10592,12 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -9779,8 +10614,8 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -9890,10 +10725,10 @@ interface HTMLFrameSetElement extends HTMLElement {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeprint", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeunload", listener: (ev: BeforeUnloadEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
@@ -9904,9 +10739,9 @@ interface HTMLFrameSetElement extends HTMLElement {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -9918,7 +10753,7 @@ interface HTMLFrameSetElement extends HTMLElement {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
@@ -9926,6 +10761,7 @@ interface HTMLFrameSetElement extends HTMLElement {
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "hashchange", listener: (ev: HashChangeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -9943,13 +10779,13 @@ interface HTMLFrameSetElement extends HTMLElement {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "offline", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "online", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "orientationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "pagehide", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pageshow", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -10028,7 +10864,6 @@ interface HTMLHeadingElement extends HTMLElement {
       * Sets or retrieves a value that indicates the table alignment.
       */
     align: string;
-    clear: string;
 }
 
 declare var HTMLHeadingElement: {
@@ -10061,11 +10896,11 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves the document object of the page or frame.
       */
-    contentDocument: Document;
+    readonly contentDocument: Document;
     /**
       * Retrieves the object of the specified.
       */
-    contentWindow: Window;
+    readonly contentWindow: Window;
     /**
       * Sets or retrieves whether to display a border for the frame.
       */
@@ -10106,15 +10941,11 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
       * Raised when the object has been completely received from the server.
       */
     onload: (ev: Event) => any;
-    sandbox: DOMSettableTokenList;
+    readonly sandbox: DOMSettableTokenList;
     /**
       * Sets or retrieves whether the frame can be scrolled.
       */
     scrolling: string;
-    /**
-      * Sets the value indicating whether the source file of a frame or iframe has specific security restrictions applied.
-      */
-    security: any;
     /**
       * Sets or retrieves a URL to be loaded by the object.
       */
@@ -10150,10 +10981,10 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -10161,9 +10992,9 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -10175,11 +11006,12 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -10196,8 +11028,8 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -10254,9 +11086,9 @@ interface HTMLImageElement extends HTMLElement {
     /**
       * Retrieves whether the object is fully loaded.
       */
-    complete: boolean;
+    readonly complete: boolean;
     crossOrigin: string;
-    currentSrc: string;
+    readonly currentSrc: string;
     /**
       * Sets or retrieves the height of the object.
       */
@@ -10273,6 +11105,7 @@ interface HTMLImageElement extends HTMLElement {
       * Sets or retrieves a Uniform Resource Identifier (URI) to a long description of the object.
       */
     longDesc: string;
+    lowsrc: string;
     /**
       * Gets or sets whether the DLNA PlayTo device is available.
       */
@@ -10285,7 +11118,7 @@ interface HTMLImageElement extends HTMLElement {
     /**
       * Gets the source associated with the media element for use by the PlayToManager.
       */
-    msPlayToSource: any;
+    readonly msPlayToSource: any;
     /**
       * Sets or retrieves the name of the object.
       */
@@ -10293,11 +11126,12 @@ interface HTMLImageElement extends HTMLElement {
     /**
       * The original height of the image resource before sizing.
       */
-    naturalHeight: number;
+    readonly naturalHeight: number;
     /**
       * The original width of the image resource before sizing.
       */
-    naturalWidth: number;
+    readonly naturalWidth: number;
+    sizes: string;
     /**
       * The address or URL of the a media resource that is to be considered.
       */
@@ -10315,8 +11149,8 @@ interface HTMLImageElement extends HTMLElement {
       * Sets or retrieves the width of the object.
       */
     width: number;
-    x: number;
-    y: number;
+    readonly x: number;
+    readonly y: number;
     msGetAsCastingSource(): any;
 }
 
@@ -10358,7 +11192,7 @@ interface HTMLInputElement extends HTMLElement {
     /**
       * Retrieves whether the object is fully loaded.
       */
-    complete: boolean;
+    readonly complete: boolean;
     /**
       * Sets or retrieves the state of the check box or radio button.
       */
@@ -10371,11 +11205,11 @@ interface HTMLInputElement extends HTMLElement {
     /**
       * Returns a FileList object on a file type input object.
       */
-    files: FileList;
+    readonly files: FileList;
     /**
       * Retrieves a reference to the form that the object is embedded in. 
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Overrides the action attribute (where the data on a form is sent) on the parent form element.
       */
@@ -10408,7 +11242,7 @@ interface HTMLInputElement extends HTMLElement {
     /**
       * Specifies the ID of a pre-defined datalist of options for an input element.
       */
-    list: HTMLElement;
+    readonly list: HTMLElement;
     /**
       * Defines the maximum acceptable value for an input element with type="number".When used with the min and step attributes, lets you control the range and increment (such as only even numbers) that the user can enter into an input field.
       */
@@ -10442,6 +11276,7 @@ interface HTMLInputElement extends HTMLElement {
       * When present, marks an element that can't be submitted without a value.
       */
     required: boolean;
+    selectionDirection: string;
     /**
       * Gets or sets the end position or offset of a text selection.
       */
@@ -10471,11 +11306,11 @@ interface HTMLInputElement extends HTMLElement {
     /**
       * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
       */
-    validationMessage: string;
+    readonly validationMessage: string;
     /**
       * Returns a  ValidityState object that represents the validity states of an element.
       */
-    validity: ValidityState;
+    readonly validity: ValidityState;
     /**
       * Returns the value of the data at the cursor's current position.
       */
@@ -10489,6 +11324,7 @@ interface HTMLInputElement extends HTMLElement {
       * Sets or retrieves the vertical margin for the object.
       */
     vspace: number;
+    webkitdirectory: boolean;
     /**
       * Sets or retrieves the width of the object.
       */
@@ -10496,15 +11332,12 @@ interface HTMLInputElement extends HTMLElement {
     /**
       * Returns whether an element will successfully validate based on forms validation rules and constraints.
       */
-    willValidate: boolean;
+    readonly willValidate: boolean;
+    minLength: number;
     /**
       * Returns whether a form will validate when it is submitted, without having to submit it.
       */
     checkValidity(): boolean;
-    /**
-      * Creates a TextRange object for the element.
-      */
-    createTextRange(): TextRange;
     /**
       * Makes the selection equal to the current object.
       */
@@ -10519,7 +11352,7 @@ interface HTMLInputElement extends HTMLElement {
       * @param start The offset into the text field for the start of the selection.
       * @param end The offset into the text field for the end of the selection.
       */
-    setSelectionRange(start: number, end: number): void;
+    setSelectionRange(start?: number, end?: number, direction?: string): void;
     /**
       * Decrements a range input control's value by the value given by the Step attribute. If the optional parameter is used, it will decrement the input control's step value multiplied by the parameter's value.
       * @param n Value to decrement the value by.
@@ -10537,23 +11370,6 @@ declare var HTMLInputElement: {
     new(): HTMLInputElement;
 }
 
-interface HTMLIsIndexElement extends HTMLElement {
-    /**
-      * Sets or retrieves the URL to which the form content is sent for processing.
-      */
-    action: string;
-    /**
-      * Retrieves a reference to the form that the object is embedded in. 
-      */
-    form: HTMLFormElement;
-    prompt: string;
-}
-
-declare var HTMLIsIndexElement: {
-    prototype: HTMLIsIndexElement;
-    new(): HTMLIsIndexElement;
-}
-
 interface HTMLLIElement extends HTMLElement {
     type: string;
     /**
@@ -10571,7 +11387,7 @@ interface HTMLLabelElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the object to which the given label object is assigned.
       */
@@ -10591,7 +11407,7 @@ interface HTMLLegendElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
 }
 
 declare var HTMLLegendElement: {
@@ -10633,6 +11449,7 @@ interface HTMLLinkElement extends HTMLElement, LinkStyle {
       * Sets or retrieves the MIME type of the object.
       */
     type: string;
+    import?: Document;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10645,7 +11462,7 @@ interface HTMLMapElement extends HTMLElement {
     /**
       * Retrieves a collection of the area objects defined for the given map object.
       */
-    areas: HTMLAreasCollection;
+    readonly areas: HTMLAreasCollection;
     /**
       * Sets or retrieves the name of the object.
       */
@@ -10697,10 +11514,10 @@ interface HTMLMarqueeElement extends HTMLElement {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "bounce", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -10709,9 +11526,9 @@ interface HTMLMarqueeElement extends HTMLElement {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -10723,12 +11540,13 @@ interface HTMLMarqueeElement extends HTMLElement {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "finish", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -10744,8 +11562,8 @@ interface HTMLMarqueeElement extends HTMLElement {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -10791,7 +11609,7 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Returns an AudioTrackList object with the audio tracks for a given video element.
       */
-    audioTracks: AudioTrackList;
+    readonly audioTracks: AudioTrackList;
     /**
       * Gets or sets a value that indicates whether to start playing the media automatically.
       */
@@ -10799,15 +11617,16 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Gets a collection of buffered time ranges.
       */
-    buffered: TimeRanges;
+    readonly buffered: TimeRanges;
     /**
       * Gets or sets a flag that indicates whether the client provides a set of controls for the media (in case the developer does not include controls for the player).
       */
     controls: boolean;
+    crossOrigin: string;
     /**
       * Gets the address or URL of the current media resource that is selected by IHTMLMediaElement.
       */
-    currentSrc: string;
+    readonly currentSrc: string;
     /**
       * Gets or sets the current playback position, in seconds.
       */
@@ -10820,19 +11639,20 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Returns the duration in seconds of the current media resource. A NaN value is returned if duration is not available, or Infinity if the media resource is streaming.
       */
-    duration: number;
+    readonly duration: number;
     /**
       * Gets information about whether the playback has ended or not.
       */
-    ended: boolean;
+    readonly ended: boolean;
     /**
       * Returns an object representing the current error state of the audio or video element.
       */
-    error: MediaError;
+    readonly error: MediaError;
     /**
       * Gets or sets a flag to specify whether playback should restart after it completes.
       */
     loop: boolean;
+    readonly mediaKeys: MediaKeys;
     /**
       * Specifies the purpose of the audio or video media, such as background audio or alerts.
       */
@@ -10841,11 +11661,11 @@ interface HTMLMediaElement extends HTMLElement {
       * Specifies the output device id that the audio will be sent to.
       */
     msAudioDeviceType: string;
-    msGraphicsTrustStatus: MSGraphicsTrust;
+    readonly msGraphicsTrustStatus: MSGraphicsTrust;
     /**
       * Gets the MSMediaKeys object, which is used for decrypting media data, that is associated with this media element.
       */
-    msKeys: MSMediaKeys;
+    readonly msKeys: MSMediaKeys;
     /**
       * Gets or sets whether the DLNA PlayTo device is available.
       */
@@ -10861,7 +11681,7 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Gets the source associated with the media element for use by the PlayToManager.
       */
-    msPlayToSource: any;
+    readonly msPlayToSource: any;
     /**
       * Specifies whether or not to enable low-latency playback on the media element.
       */
@@ -10873,12 +11693,13 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Gets the current network activity for the element.
       */
-    networkState: number;
+    readonly networkState: number;
+    onencrypted: (ev: MediaEncryptedEvent) => any;
     onmsneedkey: (ev: MSMediaKeyNeededEvent) => any;
     /**
       * Gets a flag that specifies whether playback is paused.
       */
-    paused: boolean;
+    readonly paused: boolean;
     /**
       * Gets or sets the current rate of speed for the media resource to play. This speed is expressed as a multiple of the normal speed of the media resource.
       */
@@ -10886,7 +11707,7 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Gets TimeRanges for the current media resource that has been played.
       */
-    played: TimeRanges;
+    readonly played: TimeRanges;
     /**
       * Gets or sets the current playback position, in seconds.
       */
@@ -10895,17 +11716,18 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Returns a TimeRanges object that represents the ranges of the current media resource that can be seeked.
       */
-    seekable: TimeRanges;
+    readonly seekable: TimeRanges;
     /**
       * Gets a flag that indicates whether the the client is currently moving to a new playback position in the media resource.
       */
-    seeking: boolean;
+    readonly seeking: boolean;
     /**
       * The address or URL of the a media resource that is to be considered.
       */
     src: string;
-    textTracks: TextTrackList;
-    videoTracks: VideoTrackList;
+    srcObject: MediaStream;
+    readonly textTracks: TextTrackList;
+    readonly videoTracks: VideoTrackList;
     /**
       * Gets or sets the volume level for audio portions of the media element.
       */
@@ -10941,15 +11763,16 @@ interface HTMLMediaElement extends HTMLElement {
       * Loads and starts playback of a media resource.
       */
     play(): void;
-    HAVE_CURRENT_DATA: number;
-    HAVE_ENOUGH_DATA: number;
-    HAVE_FUTURE_DATA: number;
-    HAVE_METADATA: number;
-    HAVE_NOTHING: number;
-    NETWORK_EMPTY: number;
-    NETWORK_IDLE: number;
-    NETWORK_LOADING: number;
-    NETWORK_NO_SOURCE: number;
+    setMediaKeys(mediaKeys: MediaKeys): PromiseLike<void>;
+    readonly HAVE_CURRENT_DATA: number;
+    readonly HAVE_ENOUGH_DATA: number;
+    readonly HAVE_FUTURE_DATA: number;
+    readonly HAVE_METADATA: number;
+    readonly HAVE_NOTHING: number;
+    readonly NETWORK_EMPTY: number;
+    readonly NETWORK_IDLE: number;
+    readonly NETWORK_LOADING: number;
+    readonly NETWORK_NO_SOURCE: number;
     addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -10973,10 +11796,10 @@ interface HTMLMediaElement extends HTMLElement {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -10984,9 +11807,9 @@ interface HTMLMediaElement extends HTMLElement {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -10998,11 +11821,13 @@ interface HTMLMediaElement extends HTMLElement {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "encrypted", listener: (ev: MediaEncryptedEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -11018,9 +11843,9 @@ interface HTMLMediaElement extends HTMLElement {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "msneedkey", listener: (ev: MSMediaKeyNeededEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -11059,15 +11884,15 @@ interface HTMLMediaElement extends HTMLElement {
 declare var HTMLMediaElement: {
     prototype: HTMLMediaElement;
     new(): HTMLMediaElement;
-    HAVE_CURRENT_DATA: number;
-    HAVE_ENOUGH_DATA: number;
-    HAVE_FUTURE_DATA: number;
-    HAVE_METADATA: number;
-    HAVE_NOTHING: number;
-    NETWORK_EMPTY: number;
-    NETWORK_IDLE: number;
-    NETWORK_LOADING: number;
-    NETWORK_NO_SOURCE: number;
+    readonly HAVE_CURRENT_DATA: number;
+    readonly HAVE_ENOUGH_DATA: number;
+    readonly HAVE_FUTURE_DATA: number;
+    readonly HAVE_METADATA: number;
+    readonly HAVE_NOTHING: number;
+    readonly NETWORK_EMPTY: number;
+    readonly NETWORK_IDLE: number;
+    readonly NETWORK_LOADING: number;
+    readonly NETWORK_NO_SOURCE: number;
 }
 
 interface HTMLMenuElement extends HTMLElement {
@@ -11112,6 +11937,20 @@ declare var HTMLMetaElement: {
     new(): HTMLMetaElement;
 }
 
+interface HTMLMeterElement extends HTMLElement {
+    high: number;
+    low: number;
+    max: number;
+    min: number;
+    optimum: number;
+    value: number;
+}
+
+declare var HTMLMeterElement: {
+    prototype: HTMLMeterElement;
+    new(): HTMLMeterElement;
+}
+
 interface HTMLModElement extends HTMLElement {
     /**
       * Sets or retrieves reference information about the object.
@@ -11128,15 +11967,6 @@ declare var HTMLModElement: {
     new(): HTMLModElement;
 }
 
-interface HTMLNextIdElement extends HTMLElement {
-    n: string;
-}
-
-declare var HTMLNextIdElement: {
-    prototype: HTMLNextIdElement;
-    new(): HTMLNextIdElement;
-}
-
 interface HTMLOListElement extends HTMLElement {
     compact: boolean;
     /**
@@ -11155,7 +11985,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves a string of the URL where the object tag can be found. This is often the href of the document that the object is in, or the value set by a base element.
       */
-    BaseHref: string;
+    readonly BaseHref: string;
     align: string;
     /**
       * Sets or retrieves a text alternative to the graphic.
@@ -11185,7 +12015,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves the document object of the page or frame.
       */
-    contentDocument: Document;
+    readonly contentDocument: Document;
     /**
       * Sets or retrieves the URL that references the data of the object.
       */
@@ -11194,7 +12024,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the height of the object.
       */
@@ -11215,7 +12045,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Gets the source associated with the media element for use by the PlayToManager.
       */
-    msPlayToSource: any;
+    readonly msPlayToSource: any;
     /**
       * Sets or retrieves the name of the object.
       */
@@ -11223,8 +12053,8 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves the contained object.
       */
-    object: any;
-    readyState: number;
+    readonly object: any;
+    readonly readyState: number;
     /**
       * Sets or retrieves a message to be displayed while an object is loading.
       */
@@ -11240,11 +12070,11 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
       */
-    validationMessage: string;
+    readonly validationMessage: string;
     /**
       * Returns a  ValidityState object that represents the validity states of an element.
       */
-    validity: ValidityState;
+    readonly validity: ValidityState;
     vspace: number;
     /**
       * Sets or retrieves the width of the object.
@@ -11253,7 +12083,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Returns whether an element will successfully validate based on forms validation rules and constraints.
       */
-    willValidate: boolean;
+    readonly willValidate: boolean;
     /**
       * Returns whether a form will validate when it is submitted, without having to submit it.
       */
@@ -11280,11 +12110,11 @@ interface HTMLOptGroupElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the ordinal position of an option in a list box.
       */
-    index: number;
+    readonly index: number;
     /**
       * Sets or retrieves a value that you can use to implement your own label functionality for the object.
       */
@@ -11296,7 +12126,7 @@ interface HTMLOptGroupElement extends HTMLElement {
     /**
       * Sets or retrieves the text string specified by the option tag.
       */
-    text: string;
+    readonly text: string;
     /**
       * Sets or retrieves the value which is returned to the server when the form control is submitted.
       */
@@ -11317,11 +12147,11 @@ interface HTMLOptionElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the ordinal position of an option in a list box.
       */
-    index: number;
+    readonly index: number;
     /**
       * Sets or retrieves a value that you can use to implement your own label functionality for the object.
       */
@@ -11346,6 +12176,18 @@ declare var HTMLOptionElement: {
     create(): HTMLOptionElement;
 }
 
+interface HTMLOptionsCollection extends HTMLCollection {
+    length: number;
+    selectedIndex: number;
+    add(element: HTMLOptionElement | HTMLOptGroupElement, before?: HTMLElement | number): void;
+    remove(index: number): void;
+}
+
+declare var HTMLOptionsCollection: {
+    prototype: HTMLOptionsCollection;
+    new(): HTMLOptionsCollection;
+}
+
 interface HTMLParagraphElement extends HTMLElement {
     /**
       * Sets or retrieves how the object is aligned with adjacent text. 
@@ -11383,28 +12225,15 @@ declare var HTMLParamElement: {
     new(): HTMLParamElement;
 }
 
-interface HTMLPhraseElement extends HTMLElement {
-    /**
-      * Sets or retrieves reference information about the object.
-      */
-    cite: string;
-    /**
-      * Sets or retrieves the date and time of a modification to the object.
-      */
-    dateTime: string;
+interface HTMLPictureElement extends HTMLElement {
 }
 
-declare var HTMLPhraseElement: {
-    prototype: HTMLPhraseElement;
-    new(): HTMLPhraseElement;
+declare var HTMLPictureElement: {
+    prototype: HTMLPictureElement;
+    new(): HTMLPictureElement;
 }
 
 interface HTMLPreElement extends HTMLElement {
-    /**
-      * Indicates a citation by rendering text in italic type.
-      */
-    cite: string;
-    clear: string;
     /**
       * Sets or gets a value that you can use to implement your own width functionality for the object.
       */
@@ -11420,7 +12249,7 @@ interface HTMLProgressElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Defines the maximum, or "done" value for a progress element.
       */
@@ -11428,7 +12257,7 @@ interface HTMLProgressElement extends HTMLElement {
     /**
       * Returns the quotient of value/max when the value attribute is set (determinate progress bar), or -1 when the value attribute is missing (indeterminate progress bar).
       */
-    position: number;
+    readonly position: number;
     /**
       * Sets or gets the current value of a progress element. The value must be a non-negative number between 0 and the max value.
       */
@@ -11445,10 +12274,6 @@ interface HTMLQuoteElement extends HTMLElement {
       * Sets or retrieves reference information about the object.
       */
     cite: string;
-    /**
-      * Sets or retrieves the date and time of a modification to the object.
-      */
-    dateTime: string;
 }
 
 declare var HTMLQuoteElement: {
@@ -11502,7 +12327,7 @@ interface HTMLSelectElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in. 
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the number of objects in a collection.
       */
@@ -11515,7 +12340,7 @@ interface HTMLSelectElement extends HTMLElement {
       * Sets or retrieves the name of the object.
       */
     name: string;
-    options: HTMLCollection;
+    options: HTMLCollectionOf<HTMLOptionElement>;
     /**
       * When present, marks an element that can't be submitted without a value.
       */
@@ -11524,6 +12349,7 @@ interface HTMLSelectElement extends HTMLElement {
       * Sets or retrieves the index of the selected option in a select object.
       */
     selectedIndex: number;
+    selectedOptions: HTMLCollectionOf<HTMLOptionElement>;
     /**
       * Sets or retrieves the number of rows in the list box. 
       */
@@ -11531,15 +12357,15 @@ interface HTMLSelectElement extends HTMLElement {
     /**
       * Retrieves the type of select control based on the value of the MULTIPLE attribute.
       */
-    type: string;
+    readonly type: string;
     /**
       * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
       */
-    validationMessage: string;
+    readonly validationMessage: string;
     /**
       * Returns a  ValidityState object that represents the validity states of an element.
       */
-    validity: ValidityState;
+    readonly validity: ValidityState;
     /**
       * Sets or retrieves the value which is returned to the server when the form control is submitted.
       */
@@ -11547,8 +12373,7 @@ interface HTMLSelectElement extends HTMLElement {
     /**
       * Returns whether an element will successfully validate based on forms validation rules and constraints.
       */
-    willValidate: boolean;
-    selectedOptions: HTMLCollection;
+    readonly willValidate: boolean;
     /**
       * Adds an element to the areas, controlRange, or options collection.
       * @param element Variant of type Number that specifies the index position in the collection where the element is placed. If no value is given, the method places the element at the end of the collection.
@@ -11594,10 +12419,12 @@ interface HTMLSourceElement extends HTMLElement {
      */
     media: string;
     msKeySystem: string;
+    sizes: string;
     /**
       * The address or URL of the a media resource that is to be considered.
       */
     src: string;
+    srcset: string;
     /**
      * Gets or sets the MIME type of a media resource.
      */
@@ -11618,6 +12445,7 @@ declare var HTMLSpanElement: {
 }
 
 interface HTMLStyleElement extends HTMLElement, LinkStyle {
+    disabled: boolean;
     /**
       * Sets or retrieves the media type.
       */
@@ -11667,7 +12495,7 @@ interface HTMLTableCellElement extends HTMLElement, HTMLTableAlignment {
     /**
       * Retrieves the position of the object in the cells collection of a row.
       */
-    cellIndex: number;
+    readonly cellIndex: number;
     /**
       * Sets or retrieves the number columns in the table that the object should span.
       */
@@ -11774,7 +12602,7 @@ interface HTMLTableElement extends HTMLElement {
     /**
       * Sets or retrieves the number of horizontal rows contained in the object.
       */
-    rows: HTMLCollection;
+    rows: HTMLCollectionOf<HTMLTableRowElement>;
     /**
       * Sets or retrieves which dividing lines (inner borders) are displayed.
       */
@@ -11786,7 +12614,7 @@ interface HTMLTableElement extends HTMLElement {
     /**
       * Retrieves a collection of all tBody objects in the table. Objects in this collection are in source order.
       */
-    tBodies: HTMLCollection;
+    tBodies: HTMLCollectionOf<HTMLTableSectionElement>;
     /**
       * Retrieves the tFoot object of the table.
       */
@@ -11865,7 +12693,7 @@ interface HTMLTableRowElement extends HTMLElement, HTMLTableAlignment {
     /**
       * Retrieves a collection of all cells in the table row.
       */
-    cells: HTMLCollection;
+    cells: HTMLCollectionOf<HTMLTableDataCellElement | HTMLTableHeaderCellElement>;
     /**
       * Sets or retrieves the height of the object.
       */
@@ -11873,11 +12701,11 @@ interface HTMLTableRowElement extends HTMLElement, HTMLTableAlignment {
     /**
       * Retrieves the position of the object in the rows collection for the table.
       */
-    rowIndex: number;
+    readonly rowIndex: number;
     /**
       * Retrieves the position of the object in the collection.
       */
-    sectionRowIndex: number;
+    readonly sectionRowIndex: number;
     /**
       * Removes the specified cell from the table row, as well as from the cells collection.
       * @param index Number that specifies the zero-based position of the cell to remove from the table row. If no value is provided, the last cell in the cells collection is deleted.
@@ -11887,7 +12715,7 @@ interface HTMLTableRowElement extends HTMLElement, HTMLTableAlignment {
       * Creates a new cell in the table row, and adds the cell to the cells collection.
       * @param index Number that specifies where to insert the cell in the tr. The default value is -1, which appends the new cell to the end of the cells collection.
       */
-    insertCell(index?: number): HTMLTableCellElement;
+    insertCell(index?: number): HTMLTableDataCellElement;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11904,7 +12732,7 @@ interface HTMLTableSectionElement extends HTMLElement, HTMLTableAlignment {
     /**
       * Sets or retrieves the number of horizontal rows contained in the object.
       */
-    rows: HTMLCollection;
+    rows: HTMLCollectionOf<HTMLTableRowElement>;
     /**
       * Removes the specified row (tr) from the element and from the rows collection.
       * @param index Number that specifies the zero-based position in the rows collection of the row to remove.
@@ -11923,6 +12751,15 @@ declare var HTMLTableSectionElement: {
     new(): HTMLTableSectionElement;
 }
 
+interface HTMLTemplateElement extends HTMLElement {
+    readonly content: DocumentFragment;
+}
+
+declare var HTMLTemplateElement: {
+    prototype: HTMLTemplateElement;
+    new(): HTMLTemplateElement;
+}
+
 interface HTMLTextAreaElement extends HTMLElement {
     /**
       * Provides a way to direct a user to a specific field when a document loads. This can provide both direction and convenience for a user, reducing the need to click or tab to a field when a page opens. This attribute is true when present on an element, and false when missing.
@@ -11940,7 +12777,7 @@ interface HTMLTextAreaElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the maximum number of characters that the user can enter in a text control.
       */
@@ -11980,15 +12817,15 @@ interface HTMLTextAreaElement extends HTMLElement {
     /**
       * Retrieves the type of control.
       */
-    type: string;
+    readonly type: string;
     /**
       * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
       */
-    validationMessage: string;
+    readonly validationMessage: string;
     /**
       * Returns a  ValidityState object that represents the validity states of an element.
       */
-    validity: ValidityState;
+    readonly validity: ValidityState;
     /**
       * Retrieves or sets the text in the entry field of the textArea element.
       */
@@ -11996,19 +12833,16 @@ interface HTMLTextAreaElement extends HTMLElement {
     /**
       * Returns whether an element will successfully validate based on forms validation rules and constraints.
       */
-    willValidate: boolean;
+    readonly willValidate: boolean;
     /**
       * Sets or retrieves how to handle wordwrapping in the object.
       */
     wrap: string;
+    minLength: number;
     /**
       * Returns whether a form will validate when it is submitted, without having to submit it.
       */
     checkValidity(): boolean;
-    /**
-      * Creates a TextRange object for the element.
-      */
-    createTextRange(): TextRange;
     /**
       * Highlights the input area of a form element.
       */
@@ -12047,23 +12881,23 @@ interface HTMLTrackElement extends HTMLElement {
     default: boolean;
     kind: string;
     label: string;
-    readyState: number;
+    readonly readyState: number;
     src: string;
     srclang: string;
-    track: TextTrack;
-    ERROR: number;
-    LOADED: number;
-    LOADING: number;
-    NONE: number;
+    readonly track: TextTrack;
+    readonly ERROR: number;
+    readonly LOADED: number;
+    readonly LOADING: number;
+    readonly NONE: number;
 }
 
 declare var HTMLTrackElement: {
     prototype: HTMLTrackElement;
     new(): HTMLTrackElement;
-    ERROR: number;
-    LOADED: number;
-    LOADING: number;
-    NONE: number;
+    readonly ERROR: number;
+    readonly LOADED: number;
+    readonly LOADING: number;
+    readonly NONE: number;
 }
 
 interface HTMLUListElement extends HTMLElement {
@@ -12090,8 +12924,8 @@ interface HTMLVideoElement extends HTMLMediaElement {
       */
     height: number;
     msHorizontalMirror: boolean;
-    msIsLayoutOptimalForPlayback: boolean;
-    msIsStereo3D: boolean;
+    readonly msIsLayoutOptimalForPlayback: boolean;
+    readonly msIsStereo3D: boolean;
     msStereo3DPackingMode: string;
     msStereo3DRenderMode: string;
     msZoom: boolean;
@@ -12105,13 +12939,13 @@ interface HTMLVideoElement extends HTMLMediaElement {
     /**
       * Gets the intrinsic height of a video in CSS pixels, or zero if the dimensions are not known.
       */
-    videoHeight: number;
+    readonly videoHeight: number;
     /**
       * Gets the intrinsic width of a video in CSS pixels, or zero if the dimensions are not known.
       */
-    videoWidth: number;
-    webkitDisplayingFullscreen: boolean;
-    webkitSupportsFullscreen: boolean;
+    readonly videoWidth: number;
+    readonly webkitDisplayingFullscreen: boolean;
+    readonly webkitSupportsFullscreen: boolean;
     /**
       * Gets or sets the width of the video element.
       */
@@ -12150,10 +12984,10 @@ interface HTMLVideoElement extends HTMLMediaElement {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -12161,9 +12995,9 @@ interface HTMLVideoElement extends HTMLMediaElement {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -12175,11 +13009,13 @@ interface HTMLVideoElement extends HTMLMediaElement {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "encrypted", listener: (ev: MediaEncryptedEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -12195,9 +13031,9 @@ interface HTMLVideoElement extends HTMLMediaElement {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "msneedkey", listener: (ev: MSMediaKeyNeededEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -12239,8 +13075,8 @@ declare var HTMLVideoElement: {
 }
 
 interface HashChangeEvent extends Event {
-    newURL: string;
-    oldURL: string;
+    readonly newURL: string;
+    readonly oldURL: string;
 }
 
 declare var HashChangeEvent: {
@@ -12249,8 +13085,8 @@ declare var HashChangeEvent: {
 }
 
 interface History {
-    length: number;
-    state: any;
+    readonly length: number;
+    readonly state: any;
     back(distance?: any): void;
     forward(distance?: any): void;
     go(delta?: any): void;
@@ -12264,31 +13100,31 @@ declare var History: {
 }
 
 interface IDBCursor {
-    direction: string;
-    key: any;
-    primaryKey: any;
-    source: any;
+    readonly direction: string;
+    key: IDBKeyRange | IDBValidKey;
+    readonly primaryKey: any;
+    source: IDBObjectStore | IDBIndex;
     advance(count: number): void;
-    continue(key?: any): void;
+    continue(key?: IDBKeyRange | IDBValidKey): void;
     delete(): IDBRequest;
     update(value: any): IDBRequest;
-    NEXT: string;
-    NEXT_NO_DUPLICATE: string;
-    PREV: string;
-    PREV_NO_DUPLICATE: string;
+    readonly NEXT: string;
+    readonly NEXT_NO_DUPLICATE: string;
+    readonly PREV: string;
+    readonly PREV_NO_DUPLICATE: string;
 }
 
 declare var IDBCursor: {
     prototype: IDBCursor;
     new(): IDBCursor;
-    NEXT: string;
-    NEXT_NO_DUPLICATE: string;
-    PREV: string;
-    PREV_NO_DUPLICATE: string;
+    readonly NEXT: string;
+    readonly NEXT_NO_DUPLICATE: string;
+    readonly PREV: string;
+    readonly PREV_NO_DUPLICATE: string;
 }
 
 interface IDBCursorWithValue extends IDBCursor {
-    value: any;
+    readonly value: any;
 }
 
 declare var IDBCursorWithValue: {
@@ -12297,15 +13133,17 @@ declare var IDBCursorWithValue: {
 }
 
 interface IDBDatabase extends EventTarget {
-    name: string;
-    objectStoreNames: DOMStringList;
+    readonly name: string;
+    readonly objectStoreNames: DOMStringList;
     onabort: (ev: Event) => any;
     onerror: (ev: Event) => any;
     version: number;
+    onversionchange: (ev: IDBVersionChangeEvent) => any;
     close(): void;
     createObjectStore(name: string, optionalParameters?: IDBObjectStoreParameters): IDBObjectStore;
     deleteObjectStore(name: string): void;
-    transaction(storeNames: any, mode?: string): IDBTransaction;
+    transaction(storeNames: string | string[], mode?: string): IDBTransaction;
+    addEventListener(type: "versionchange", listener: (ev: IDBVersionChangeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -12329,15 +13167,15 @@ declare var IDBFactory: {
 
 interface IDBIndex {
     keyPath: string | string[];
-    name: string;
-    objectStore: IDBObjectStore;
-    unique: boolean;
+    readonly name: string;
+    readonly objectStore: IDBObjectStore;
+    readonly unique: boolean;
     multiEntry: boolean;
-    count(key?: any): IDBRequest;
-    get(key: any): IDBRequest;
-    getKey(key: any): IDBRequest;
-    openCursor(range?: IDBKeyRange, direction?: string): IDBRequest;
-    openKeyCursor(range?: IDBKeyRange, direction?: string): IDBRequest;
+    count(key?: IDBKeyRange | IDBValidKey): IDBRequest;
+    get(key: IDBKeyRange | IDBValidKey): IDBRequest;
+    getKey(key: IDBKeyRange | IDBValidKey): IDBRequest;
+    openCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest;
+    openKeyCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest;
 }
 
 declare var IDBIndex: {
@@ -12346,36 +13184,37 @@ declare var IDBIndex: {
 }
 
 interface IDBKeyRange {
-    lower: any;
-    lowerOpen: boolean;
-    upper: any;
-    upperOpen: boolean;
+    readonly lower: any;
+    readonly lowerOpen: boolean;
+    readonly upper: any;
+    readonly upperOpen: boolean;
 }
 
 declare var IDBKeyRange: {
     prototype: IDBKeyRange;
     new(): IDBKeyRange;
     bound(lower: any, upper: any, lowerOpen?: boolean, upperOpen?: boolean): IDBKeyRange;
-    lowerBound(bound: any, open?: boolean): IDBKeyRange;
+    lowerBound(lower: any, open?: boolean): IDBKeyRange;
     only(value: any): IDBKeyRange;
-    upperBound(bound: any, open?: boolean): IDBKeyRange;
+    upperBound(upper: any, open?: boolean): IDBKeyRange;
 }
 
 interface IDBObjectStore {
-    indexNames: DOMStringList;
-    keyPath: string;
-    name: string;
-    transaction: IDBTransaction;
-    add(value: any, key?: any): IDBRequest;
+    readonly indexNames: DOMStringList;
+    keyPath: string | string[];
+    readonly name: string;
+    readonly transaction: IDBTransaction;
+    autoIncrement: boolean;
+    add(value: any, key?: IDBKeyRange | IDBValidKey): IDBRequest;
     clear(): IDBRequest;
-    count(key?: any): IDBRequest;
+    count(key?: IDBKeyRange | IDBValidKey): IDBRequest;
     createIndex(name: string, keyPath: string | string[], optionalParameters?: IDBIndexParameters): IDBIndex;
-    delete(key: any): IDBRequest;
+    delete(key: IDBKeyRange | IDBValidKey): IDBRequest;
     deleteIndex(indexName: string): void;
     get(key: any): IDBRequest;
     index(name: string): IDBIndex;
-    openCursor(range?: any, direction?: string): IDBRequest;
-    put(value: any, key?: any): IDBRequest;
+    openCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest;
+    put(value: any, key?: IDBKeyRange | IDBValidKey): IDBRequest;
 }
 
 declare var IDBObjectStore: {
@@ -12399,13 +13238,13 @@ declare var IDBOpenDBRequest: {
 }
 
 interface IDBRequest extends EventTarget {
-    error: DOMError;
+    readonly error: DOMError;
     onerror: (ev: Event) => any;
     onsuccess: (ev: Event) => any;
-    readyState: string;
-    result: any;
-    source: any;
-    transaction: IDBTransaction;
+    readonly readyState: string;
+    readonly result: any;
+    source: IDBObjectStore | IDBIndex | IDBCursor;
+    readonly transaction: IDBTransaction;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "success", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -12417,17 +13256,17 @@ declare var IDBRequest: {
 }
 
 interface IDBTransaction extends EventTarget {
-    db: IDBDatabase;
-    error: DOMError;
-    mode: string;
+    readonly db: IDBDatabase;
+    readonly error: DOMError;
+    readonly mode: string;
     onabort: (ev: Event) => any;
     oncomplete: (ev: Event) => any;
     onerror: (ev: Event) => any;
     abort(): void;
     objectStore(name: string): IDBObjectStore;
-    READ_ONLY: string;
-    READ_WRITE: string;
-    VERSION_CHANGE: string;
+    readonly READ_ONLY: string;
+    readonly READ_WRITE: string;
+    readonly VERSION_CHANGE: string;
     addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
@@ -12437,14 +13276,14 @@ interface IDBTransaction extends EventTarget {
 declare var IDBTransaction: {
     prototype: IDBTransaction;
     new(): IDBTransaction;
-    READ_ONLY: string;
-    READ_WRITE: string;
-    VERSION_CHANGE: string;
+    readonly READ_ONLY: string;
+    readonly READ_WRITE: string;
+    readonly VERSION_CHANGE: string;
 }
 
 interface IDBVersionChangeEvent extends Event {
-    newVersion: number;
-    oldVersion: number;
+    readonly newVersion: number;
+    readonly oldVersion: number;
 }
 
 declare var IDBVersionChangeEvent: {
@@ -12454,8 +13293,8 @@ declare var IDBVersionChangeEvent: {
 
 interface ImageData {
     data: Uint8ClampedArray;
-    height: number;
-    width: number;
+    readonly height: number;
+    readonly width: number;
 }
 
 declare var ImageData: {
@@ -12465,37 +13304,47 @@ declare var ImageData: {
 }
 
 interface KeyboardEvent extends UIEvent {
-    altKey: boolean;
-    char: string;
-    charCode: number;
-    ctrlKey: boolean;
-    key: string;
-    keyCode: number;
-    locale: string;
-    location: number;
-    metaKey: boolean;
-    repeat: boolean;
-    shiftKey: boolean;
-    which: number;
+    readonly altKey: boolean;
+    readonly char: string;
+    readonly charCode: number;
+    readonly ctrlKey: boolean;
+    readonly key: string;
+    readonly keyCode: number;
+    readonly locale: string;
+    readonly location: number;
+    readonly metaKey: boolean;
+    readonly repeat: boolean;
+    readonly shiftKey: boolean;
+    readonly which: number;
     getModifierState(keyArg: string): boolean;
     initKeyboardEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, keyArg: string, locationArg: number, modifiersListArg: string, repeat: boolean, locale: string): void;
-    DOM_KEY_LOCATION_JOYSTICK: number;
-    DOM_KEY_LOCATION_LEFT: number;
-    DOM_KEY_LOCATION_MOBILE: number;
-    DOM_KEY_LOCATION_NUMPAD: number;
-    DOM_KEY_LOCATION_RIGHT: number;
-    DOM_KEY_LOCATION_STANDARD: number;
+    readonly DOM_KEY_LOCATION_JOYSTICK: number;
+    readonly DOM_KEY_LOCATION_LEFT: number;
+    readonly DOM_KEY_LOCATION_MOBILE: number;
+    readonly DOM_KEY_LOCATION_NUMPAD: number;
+    readonly DOM_KEY_LOCATION_RIGHT: number;
+    readonly DOM_KEY_LOCATION_STANDARD: number;
 }
 
 declare var KeyboardEvent: {
     prototype: KeyboardEvent;
     new(typeArg: string, eventInitDict?: KeyboardEventInit): KeyboardEvent;
-    DOM_KEY_LOCATION_JOYSTICK: number;
-    DOM_KEY_LOCATION_LEFT: number;
-    DOM_KEY_LOCATION_MOBILE: number;
-    DOM_KEY_LOCATION_NUMPAD: number;
-    DOM_KEY_LOCATION_RIGHT: number;
-    DOM_KEY_LOCATION_STANDARD: number;
+    readonly DOM_KEY_LOCATION_JOYSTICK: number;
+    readonly DOM_KEY_LOCATION_LEFT: number;
+    readonly DOM_KEY_LOCATION_MOBILE: number;
+    readonly DOM_KEY_LOCATION_NUMPAD: number;
+    readonly DOM_KEY_LOCATION_RIGHT: number;
+    readonly DOM_KEY_LOCATION_STANDARD: number;
+}
+
+interface ListeningStateChangedEvent extends Event {
+    readonly label: string;
+    readonly state: string;
+}
+
+declare var ListeningStateChangedEvent: {
+    prototype: ListeningStateChangedEvent;
+    new(): ListeningStateChangedEvent;
 }
 
 interface Location {
@@ -12503,7 +13352,7 @@ interface Location {
     host: string;
     hostname: string;
     href: string;
-    origin: string;
+    readonly origin: string;
     pathname: string;
     port: string;
     protocol: string;
@@ -12520,7 +13369,7 @@ declare var Location: {
 }
 
 interface LongRunningScriptDetectedEvent extends Event {
-    executionTime: number;
+    readonly executionTime: number;
     stopPageScriptExecution: boolean;
 }
 
@@ -12539,29 +13388,29 @@ interface MSApp {
     execAsyncAtPriority(asynchronousCallback: MSExecAtPriorityFunctionCallback, priority: string, ...args: any[]): void;
     execAtPriority(synchronousCallback: MSExecAtPriorityFunctionCallback, priority: string, ...args: any[]): any;
     getCurrentPriority(): string;
-    getHtmlPrintDocumentSourceAsync(htmlDoc: any): any;
+    getHtmlPrintDocumentSourceAsync(htmlDoc: any): PromiseLike<any>;
     getViewId(view: any): any;
     isTaskScheduledAtPriorityOrHigher(priority: string): boolean;
     pageHandlesAllApplicationActivations(enabled: boolean): void;
     suppressSubdownloadCredentialPrompts(suppress: boolean): void;
     terminateApp(exceptionObject: any): void;
-    CURRENT: string;
-    HIGH: string;
-    IDLE: string;
-    NORMAL: string;
+    readonly CURRENT: string;
+    readonly HIGH: string;
+    readonly IDLE: string;
+    readonly NORMAL: string;
 }
 declare var MSApp: MSApp;
 
 interface MSAppAsyncOperation extends EventTarget {
-    error: DOMError;
+    readonly error: DOMError;
     oncomplete: (ev: Event) => any;
     onerror: (ev: Event) => any;
-    readyState: number;
-    result: any;
+    readonly readyState: number;
+    readonly result: any;
     start(): void;
-    COMPLETED: number;
-    ERROR: number;
-    STARTED: number;
+    readonly COMPLETED: number;
+    readonly ERROR: number;
+    readonly STARTED: number;
     addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -12570,9 +13419,19 @@ interface MSAppAsyncOperation extends EventTarget {
 declare var MSAppAsyncOperation: {
     prototype: MSAppAsyncOperation;
     new(): MSAppAsyncOperation;
-    COMPLETED: number;
-    ERROR: number;
-    STARTED: number;
+    readonly COMPLETED: number;
+    readonly ERROR: number;
+    readonly STARTED: number;
+}
+
+interface MSAssertion {
+    readonly id: string;
+    readonly type: string;
+}
+
+declare var MSAssertion: {
+    prototype: MSAssertion;
+    new(): MSAssertion;
 }
 
 interface MSBlobBuilder {
@@ -12585,44 +13444,46 @@ declare var MSBlobBuilder: {
     new(): MSBlobBuilder;
 }
 
-interface MSCSSMatrix {
-    a: number;
-    b: number;
-    c: number;
-    d: number;
-    e: number;
-    f: number;
-    m11: number;
-    m12: number;
-    m13: number;
-    m14: number;
-    m21: number;
-    m22: number;
-    m23: number;
-    m24: number;
-    m31: number;
-    m32: number;
-    m33: number;
-    m34: number;
-    m41: number;
-    m42: number;
-    m43: number;
-    m44: number;
-    inverse(): MSCSSMatrix;
-    multiply(secondMatrix: MSCSSMatrix): MSCSSMatrix;
-    rotate(angleX: number, angleY?: number, angleZ?: number): MSCSSMatrix;
-    rotateAxisAngle(x: number, y: number, z: number, angle: number): MSCSSMatrix;
-    scale(scaleX: number, scaleY?: number, scaleZ?: number): MSCSSMatrix;
-    setMatrixValue(value: string): void;
-    skewX(angle: number): MSCSSMatrix;
-    skewY(angle: number): MSCSSMatrix;
-    toString(): string;
-    translate(x: number, y: number, z?: number): MSCSSMatrix;
+interface MSCredentials {
+    getAssertion(challenge: string, filter?: MSCredentialFilter, params?: MSSignatureParameters): PromiseLike<MSAssertion>;
+    makeCredential(accountInfo: MSAccountInfo, params: MSCredentialParameters[], challenge?: string): PromiseLike<MSAssertion>;
 }
 
-declare var MSCSSMatrix: {
-    prototype: MSCSSMatrix;
-    new(text?: string): MSCSSMatrix;
+declare var MSCredentials: {
+    prototype: MSCredentials;
+    new(): MSCredentials;
+}
+
+interface MSFIDOCredentialAssertion extends MSAssertion {
+    readonly algorithm: string | Algorithm;
+    readonly attestation: any;
+    readonly publicKey: string;
+    readonly transportHints: string[];
+}
+
+declare var MSFIDOCredentialAssertion: {
+    prototype: MSFIDOCredentialAssertion;
+    new(): MSFIDOCredentialAssertion;
+}
+
+interface MSFIDOSignature {
+    readonly authnrData: string;
+    readonly clientData: string;
+    readonly signature: string;
+}
+
+declare var MSFIDOSignature: {
+    prototype: MSFIDOSignature;
+    new(): MSFIDOSignature;
+}
+
+interface MSFIDOSignatureAssertion extends MSAssertion {
+    readonly signature: MSFIDOSignature;
+}
+
+declare var MSFIDOSignatureAssertion: {
+    prototype: MSFIDOSignatureAssertion;
+    new(): MSFIDOSignatureAssertion;
 }
 
 interface MSGesture {
@@ -12637,44 +13498,44 @@ declare var MSGesture: {
 }
 
 interface MSGestureEvent extends UIEvent {
-    clientX: number;
-    clientY: number;
-    expansion: number;
-    gestureObject: any;
-    hwTimestamp: number;
-    offsetX: number;
-    offsetY: number;
-    rotation: number;
-    scale: number;
-    screenX: number;
-    screenY: number;
-    translationX: number;
-    translationY: number;
-    velocityAngular: number;
-    velocityExpansion: number;
-    velocityX: number;
-    velocityY: number;
+    readonly clientX: number;
+    readonly clientY: number;
+    readonly expansion: number;
+    readonly gestureObject: any;
+    readonly hwTimestamp: number;
+    readonly offsetX: number;
+    readonly offsetY: number;
+    readonly rotation: number;
+    readonly scale: number;
+    readonly screenX: number;
+    readonly screenY: number;
+    readonly translationX: number;
+    readonly translationY: number;
+    readonly velocityAngular: number;
+    readonly velocityExpansion: number;
+    readonly velocityX: number;
+    readonly velocityY: number;
     initGestureEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, offsetXArg: number, offsetYArg: number, translationXArg: number, translationYArg: number, scaleArg: number, expansionArg: number, rotationArg: number, velocityXArg: number, velocityYArg: number, velocityExpansionArg: number, velocityAngularArg: number, hwTimestampArg: number): void;
-    MSGESTURE_FLAG_BEGIN: number;
-    MSGESTURE_FLAG_CANCEL: number;
-    MSGESTURE_FLAG_END: number;
-    MSGESTURE_FLAG_INERTIA: number;
-    MSGESTURE_FLAG_NONE: number;
+    readonly MSGESTURE_FLAG_BEGIN: number;
+    readonly MSGESTURE_FLAG_CANCEL: number;
+    readonly MSGESTURE_FLAG_END: number;
+    readonly MSGESTURE_FLAG_INERTIA: number;
+    readonly MSGESTURE_FLAG_NONE: number;
 }
 
 declare var MSGestureEvent: {
     prototype: MSGestureEvent;
     new(): MSGestureEvent;
-    MSGESTURE_FLAG_BEGIN: number;
-    MSGESTURE_FLAG_CANCEL: number;
-    MSGESTURE_FLAG_END: number;
-    MSGESTURE_FLAG_INERTIA: number;
-    MSGESTURE_FLAG_NONE: number;
+    readonly MSGESTURE_FLAG_BEGIN: number;
+    readonly MSGESTURE_FLAG_CANCEL: number;
+    readonly MSGESTURE_FLAG_END: number;
+    readonly MSGESTURE_FLAG_INERTIA: number;
+    readonly MSGESTURE_FLAG_NONE: number;
 }
 
 interface MSGraphicsTrust {
-    constrictionActive: boolean;
-    status: string;
+    readonly constrictionActive: boolean;
+    readonly status: string;
 }
 
 declare var MSGraphicsTrust: {
@@ -12683,12 +13544,12 @@ declare var MSGraphicsTrust: {
 }
 
 interface MSHTMLWebViewElement extends HTMLElement {
-    canGoBack: boolean;
-    canGoForward: boolean;
-    containsFullScreenElement: boolean;
-    documentTitle: string;
+    readonly canGoBack: boolean;
+    readonly canGoForward: boolean;
+    readonly containsFullScreenElement: boolean;
+    readonly documentTitle: string;
     height: number;
-    settings: MSWebViewSettings;
+    readonly settings: MSWebViewSettings;
     src: string;
     width: number;
     addWebAllowedObject(name: string, applicationObject: any): void;
@@ -12714,12 +13575,12 @@ declare var MSHTMLWebViewElement: {
 }
 
 interface MSInputMethodContext extends EventTarget {
-    compositionEndOffset: number;
-    compositionStartOffset: number;
+    readonly compositionEndOffset: number;
+    readonly compositionStartOffset: number;
     oncandidatewindowhide: (ev: Event) => any;
     oncandidatewindowshow: (ev: Event) => any;
     oncandidatewindowupdate: (ev: Event) => any;
-    target: HTMLElement;
+    readonly target: HTMLElement;
     getCandidateWindowClientRect(): ClientRect;
     getCompositionAlternatives(): string[];
     hasComposition(): boolean;
@@ -12736,59 +13597,59 @@ declare var MSInputMethodContext: {
 }
 
 interface MSManipulationEvent extends UIEvent {
-    currentState: number;
-    inertiaDestinationX: number;
-    inertiaDestinationY: number;
-    lastState: number;
+    readonly currentState: number;
+    readonly inertiaDestinationX: number;
+    readonly inertiaDestinationY: number;
+    readonly lastState: number;
     initMSManipulationEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, lastState: number, currentState: number): void;
-    MS_MANIPULATION_STATE_ACTIVE: number;
-    MS_MANIPULATION_STATE_CANCELLED: number;
-    MS_MANIPULATION_STATE_COMMITTED: number;
-    MS_MANIPULATION_STATE_DRAGGING: number;
-    MS_MANIPULATION_STATE_INERTIA: number;
-    MS_MANIPULATION_STATE_PRESELECT: number;
-    MS_MANIPULATION_STATE_SELECTING: number;
-    MS_MANIPULATION_STATE_STOPPED: number;
+    readonly MS_MANIPULATION_STATE_ACTIVE: number;
+    readonly MS_MANIPULATION_STATE_CANCELLED: number;
+    readonly MS_MANIPULATION_STATE_COMMITTED: number;
+    readonly MS_MANIPULATION_STATE_DRAGGING: number;
+    readonly MS_MANIPULATION_STATE_INERTIA: number;
+    readonly MS_MANIPULATION_STATE_PRESELECT: number;
+    readonly MS_MANIPULATION_STATE_SELECTING: number;
+    readonly MS_MANIPULATION_STATE_STOPPED: number;
 }
 
 declare var MSManipulationEvent: {
     prototype: MSManipulationEvent;
     new(): MSManipulationEvent;
-    MS_MANIPULATION_STATE_ACTIVE: number;
-    MS_MANIPULATION_STATE_CANCELLED: number;
-    MS_MANIPULATION_STATE_COMMITTED: number;
-    MS_MANIPULATION_STATE_DRAGGING: number;
-    MS_MANIPULATION_STATE_INERTIA: number;
-    MS_MANIPULATION_STATE_PRESELECT: number;
-    MS_MANIPULATION_STATE_SELECTING: number;
-    MS_MANIPULATION_STATE_STOPPED: number;
+    readonly MS_MANIPULATION_STATE_ACTIVE: number;
+    readonly MS_MANIPULATION_STATE_CANCELLED: number;
+    readonly MS_MANIPULATION_STATE_COMMITTED: number;
+    readonly MS_MANIPULATION_STATE_DRAGGING: number;
+    readonly MS_MANIPULATION_STATE_INERTIA: number;
+    readonly MS_MANIPULATION_STATE_PRESELECT: number;
+    readonly MS_MANIPULATION_STATE_SELECTING: number;
+    readonly MS_MANIPULATION_STATE_STOPPED: number;
 }
 
 interface MSMediaKeyError {
-    code: number;
-    systemCode: number;
-    MS_MEDIA_KEYERR_CLIENT: number;
-    MS_MEDIA_KEYERR_DOMAIN: number;
-    MS_MEDIA_KEYERR_HARDWARECHANGE: number;
-    MS_MEDIA_KEYERR_OUTPUT: number;
-    MS_MEDIA_KEYERR_SERVICE: number;
-    MS_MEDIA_KEYERR_UNKNOWN: number;
+    readonly code: number;
+    readonly systemCode: number;
+    readonly MS_MEDIA_KEYERR_CLIENT: number;
+    readonly MS_MEDIA_KEYERR_DOMAIN: number;
+    readonly MS_MEDIA_KEYERR_HARDWARECHANGE: number;
+    readonly MS_MEDIA_KEYERR_OUTPUT: number;
+    readonly MS_MEDIA_KEYERR_SERVICE: number;
+    readonly MS_MEDIA_KEYERR_UNKNOWN: number;
 }
 
 declare var MSMediaKeyError: {
     prototype: MSMediaKeyError;
     new(): MSMediaKeyError;
-    MS_MEDIA_KEYERR_CLIENT: number;
-    MS_MEDIA_KEYERR_DOMAIN: number;
-    MS_MEDIA_KEYERR_HARDWARECHANGE: number;
-    MS_MEDIA_KEYERR_OUTPUT: number;
-    MS_MEDIA_KEYERR_SERVICE: number;
-    MS_MEDIA_KEYERR_UNKNOWN: number;
+    readonly MS_MEDIA_KEYERR_CLIENT: number;
+    readonly MS_MEDIA_KEYERR_DOMAIN: number;
+    readonly MS_MEDIA_KEYERR_HARDWARECHANGE: number;
+    readonly MS_MEDIA_KEYERR_OUTPUT: number;
+    readonly MS_MEDIA_KEYERR_SERVICE: number;
+    readonly MS_MEDIA_KEYERR_UNKNOWN: number;
 }
 
 interface MSMediaKeyMessageEvent extends Event {
-    destinationURL: string;
-    message: Uint8Array;
+    readonly destinationURL: string;
+    readonly message: Uint8Array;
 }
 
 declare var MSMediaKeyMessageEvent: {
@@ -12797,7 +13658,7 @@ declare var MSMediaKeyMessageEvent: {
 }
 
 interface MSMediaKeyNeededEvent extends Event {
-    initData: Uint8Array;
+    readonly initData: Uint8Array;
 }
 
 declare var MSMediaKeyNeededEvent: {
@@ -12806,9 +13667,9 @@ declare var MSMediaKeyNeededEvent: {
 }
 
 interface MSMediaKeySession extends EventTarget {
-    error: MSMediaKeyError;
-    keySystem: string;
-    sessionId: string;
+    readonly error: MSMediaKeyError;
+    readonly keySystem: string;
+    readonly sessionId: string;
     close(): void;
     update(key: Uint8Array): void;
 }
@@ -12819,7 +13680,7 @@ declare var MSMediaKeySession: {
 }
 
 interface MSMediaKeys {
-    keySystem: string;
+    readonly keySystem: string;
     createSession(type: string, initData: Uint8Array, cdmData?: Uint8Array): MSMediaKeySession;
 }
 
@@ -12827,40 +13688,22 @@ declare var MSMediaKeys: {
     prototype: MSMediaKeys;
     new(keySystem: string): MSMediaKeys;
     isTypeSupported(keySystem: string, type?: string): boolean;
-}
-
-interface MSMimeTypesCollection {
-    length: number;
-}
-
-declare var MSMimeTypesCollection: {
-    prototype: MSMimeTypesCollection;
-    new(): MSMimeTypesCollection;
-}
-
-interface MSPluginsCollection {
-    length: number;
-    refresh(reload?: boolean): void;
-}
-
-declare var MSPluginsCollection: {
-    prototype: MSPluginsCollection;
-    new(): MSPluginsCollection;
+    isTypeSupportedWithFeatures(keySystem: string, type?: string): string;
 }
 
 interface MSPointerEvent extends MouseEvent {
-    currentPoint: any;
-    height: number;
-    hwTimestamp: number;
-    intermediatePoints: any;
-    isPrimary: boolean;
-    pointerId: number;
-    pointerType: any;
-    pressure: number;
-    rotation: number;
-    tiltX: number;
-    tiltY: number;
-    width: number;
+    readonly currentPoint: any;
+    readonly height: number;
+    readonly hwTimestamp: number;
+    readonly intermediatePoints: any;
+    readonly isPrimary: boolean;
+    readonly pointerId: number;
+    readonly pointerType: any;
+    readonly pressure: number;
+    readonly rotation: number;
+    readonly tiltX: number;
+    readonly tiltY: number;
+    readonly width: number;
     getCurrentPoint(element: Element): void;
     getIntermediatePoints(element: Element): void;
     initPointerEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget, offsetXArg: number, offsetYArg: number, widthArg: number, heightArg: number, pressure: number, rotation: number, tiltX: number, tiltY: number, pointerIdArg: number, pointerType: any, hwTimestampArg: number, isPrimary: boolean): void;
@@ -12872,7 +13715,7 @@ declare var MSPointerEvent: {
 }
 
 interface MSRangeCollection {
-    length: number;
+    readonly length: number;
     item(index: number): Range;
     [index: number]: Range;
 }
@@ -12883,8 +13726,8 @@ declare var MSRangeCollection: {
 }
 
 interface MSSiteModeEvent extends Event {
-    actionURL: string;
-    buttonID: number;
+    readonly actionURL: string;
+    readonly buttonID: number;
 }
 
 declare var MSSiteModeEvent: {
@@ -12893,7 +13736,7 @@ declare var MSSiteModeEvent: {
 }
 
 interface MSStream {
-    type: string;
+    readonly type: string;
     msClose(): void;
     msDetachStream(): any;
 }
@@ -12904,7 +13747,7 @@ declare var MSStream: {
 }
 
 interface MSStreamReader extends EventTarget, MSBaseReader {
-    error: DOMError;
+    readonly error: DOMError;
     readAsArrayBuffer(stream: MSStream, size?: number): void;
     readAsBinaryString(stream: MSStream, size?: number): void;
     readAsBlob(stream: MSStream, size?: number): void;
@@ -12919,20 +13762,20 @@ declare var MSStreamReader: {
 }
 
 interface MSWebViewAsyncOperation extends EventTarget {
-    error: DOMError;
+    readonly error: DOMError;
     oncomplete: (ev: Event) => any;
     onerror: (ev: Event) => any;
-    readyState: number;
-    result: any;
-    target: MSHTMLWebViewElement;
-    type: number;
+    readonly readyState: number;
+    readonly result: any;
+    readonly target: MSHTMLWebViewElement;
+    readonly type: number;
     start(): void;
-    COMPLETED: number;
-    ERROR: number;
-    STARTED: number;
-    TYPE_CAPTURE_PREVIEW_TO_RANDOM_ACCESS_STREAM: number;
-    TYPE_CREATE_DATA_PACKAGE_FROM_SELECTION: number;
-    TYPE_INVOKE_SCRIPT: number;
+    readonly COMPLETED: number;
+    readonly ERROR: number;
+    readonly STARTED: number;
+    readonly TYPE_CAPTURE_PREVIEW_TO_RANDOM_ACCESS_STREAM: number;
+    readonly TYPE_CREATE_DATA_PACKAGE_FROM_SELECTION: number;
+    readonly TYPE_INVOKE_SCRIPT: number;
     addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -12941,12 +13784,12 @@ interface MSWebViewAsyncOperation extends EventTarget {
 declare var MSWebViewAsyncOperation: {
     prototype: MSWebViewAsyncOperation;
     new(): MSWebViewAsyncOperation;
-    COMPLETED: number;
-    ERROR: number;
-    STARTED: number;
-    TYPE_CAPTURE_PREVIEW_TO_RANDOM_ACCESS_STREAM: number;
-    TYPE_CREATE_DATA_PACKAGE_FROM_SELECTION: number;
-    TYPE_INVOKE_SCRIPT: number;
+    readonly COMPLETED: number;
+    readonly ERROR: number;
+    readonly STARTED: number;
+    readonly TYPE_CAPTURE_PREVIEW_TO_RANDOM_ACCESS_STREAM: number;
+    readonly TYPE_CREATE_DATA_PACKAGE_FROM_SELECTION: number;
+    readonly TYPE_INVOKE_SCRIPT: number;
 }
 
 interface MSWebViewSettings {
@@ -12959,6 +13802,32 @@ declare var MSWebViewSettings: {
     new(): MSWebViewSettings;
 }
 
+interface MediaDeviceInfo {
+    readonly deviceId: string;
+    readonly groupId: string;
+    readonly kind: string;
+    readonly label: string;
+}
+
+declare var MediaDeviceInfo: {
+    prototype: MediaDeviceInfo;
+    new(): MediaDeviceInfo;
+}
+
+interface MediaDevices extends EventTarget {
+    ondevicechange: (ev: Event) => any;
+    enumerateDevices(): any;
+    getSupportedConstraints(): MediaTrackSupportedConstraints;
+    getUserMedia(constraints: MediaStreamConstraints): PromiseLike<MediaStream>;
+    addEventListener(type: "devicechange", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var MediaDevices: {
+    prototype: MediaDevices;
+    new(): MediaDevices;
+}
+
 interface MediaElementAudioSourceNode extends AudioNode {
 }
 
@@ -12967,28 +13836,98 @@ declare var MediaElementAudioSourceNode: {
     new(): MediaElementAudioSourceNode;
 }
 
+interface MediaEncryptedEvent extends Event {
+    readonly initData: ArrayBuffer;
+    readonly initDataType: string;
+}
+
+declare var MediaEncryptedEvent: {
+    prototype: MediaEncryptedEvent;
+    new(type: string, eventInitDict?: MediaEncryptedEventInit): MediaEncryptedEvent;
+}
+
 interface MediaError {
-    code: number;
-    msExtendedCode: number;
-    MEDIA_ERR_ABORTED: number;
-    MEDIA_ERR_DECODE: number;
-    MEDIA_ERR_NETWORK: number;
-    MEDIA_ERR_SRC_NOT_SUPPORTED: number;
-    MS_MEDIA_ERR_ENCRYPTED: number;
+    readonly code: number;
+    readonly msExtendedCode: number;
+    readonly MEDIA_ERR_ABORTED: number;
+    readonly MEDIA_ERR_DECODE: number;
+    readonly MEDIA_ERR_NETWORK: number;
+    readonly MEDIA_ERR_SRC_NOT_SUPPORTED: number;
+    readonly MS_MEDIA_ERR_ENCRYPTED: number;
 }
 
 declare var MediaError: {
     prototype: MediaError;
     new(): MediaError;
-    MEDIA_ERR_ABORTED: number;
-    MEDIA_ERR_DECODE: number;
-    MEDIA_ERR_NETWORK: number;
-    MEDIA_ERR_SRC_NOT_SUPPORTED: number;
-    MS_MEDIA_ERR_ENCRYPTED: number;
+    readonly MEDIA_ERR_ABORTED: number;
+    readonly MEDIA_ERR_DECODE: number;
+    readonly MEDIA_ERR_NETWORK: number;
+    readonly MEDIA_ERR_SRC_NOT_SUPPORTED: number;
+    readonly MS_MEDIA_ERR_ENCRYPTED: number;
+}
+
+interface MediaKeyMessageEvent extends Event {
+    readonly message: ArrayBuffer;
+    readonly messageType: string;
+}
+
+declare var MediaKeyMessageEvent: {
+    prototype: MediaKeyMessageEvent;
+    new(type: string, eventInitDict?: MediaKeyMessageEventInit): MediaKeyMessageEvent;
+}
+
+interface MediaKeySession extends EventTarget {
+    readonly closed: PromiseLike<void>;
+    readonly expiration: number;
+    readonly keyStatuses: MediaKeyStatusMap;
+    readonly sessionId: string;
+    close(): PromiseLike<void>;
+    generateRequest(initDataType: string, initData: any): PromiseLike<void>;
+    load(sessionId: string): PromiseLike<boolean>;
+    remove(): PromiseLike<void>;
+    update(response: any): PromiseLike<void>;
+}
+
+declare var MediaKeySession: {
+    prototype: MediaKeySession;
+    new(): MediaKeySession;
+}
+
+interface MediaKeyStatusMap {
+    readonly size: number;
+    forEach(callback: ForEachCallback): void;
+    get(keyId: any): string;
+    has(keyId: any): boolean;
+}
+
+declare var MediaKeyStatusMap: {
+    prototype: MediaKeyStatusMap;
+    new(): MediaKeyStatusMap;
+}
+
+interface MediaKeySystemAccess {
+    readonly keySystem: string;
+    createMediaKeys(): PromiseLike<MediaKeys>;
+    getConfiguration(): MediaKeySystemConfiguration;
+}
+
+declare var MediaKeySystemAccess: {
+    prototype: MediaKeySystemAccess;
+    new(): MediaKeySystemAccess;
+}
+
+interface MediaKeys {
+    createSession(sessionType?: string): MediaKeySession;
+    setServerCertificate(serverCertificate: any): PromiseLike<void>;
+}
+
+declare var MediaKeys: {
+    prototype: MediaKeys;
+    new(): MediaKeys;
 }
 
 interface MediaList {
-    length: number;
+    readonly length: number;
     mediaText: string;
     appendMedium(newMedium: string): void;
     deleteMedium(oldMedium: string): void;
@@ -13003,8 +13942,8 @@ declare var MediaList: {
 }
 
 interface MediaQueryList {
-    matches: boolean;
-    media: string;
+    readonly matches: boolean;
+    readonly media: string;
     addListener(listener: MediaQueryListListener): void;
     removeListener(listener: MediaQueryListListener): void;
 }
@@ -13015,10 +13954,10 @@ declare var MediaQueryList: {
 }
 
 interface MediaSource extends EventTarget {
-    activeSourceBuffers: SourceBufferList;
+    readonly activeSourceBuffers: SourceBufferList;
     duration: number;
-    readyState: string;
-    sourceBuffers: SourceBufferList;
+    readonly readyState: string;
+    readonly sourceBuffers: SourceBufferList;
     addSourceBuffer(type: string): SourceBuffer;
     endOfStream(error?: number): void;
     removeSourceBuffer(sourceBuffer: SourceBuffer): void;
@@ -13030,9 +13969,104 @@ declare var MediaSource: {
     isTypeSupported(type: string): boolean;
 }
 
+interface MediaStream extends EventTarget {
+    readonly active: boolean;
+    readonly id: string;
+    onactive: (ev: Event) => any;
+    onaddtrack: (ev: TrackEvent) => any;
+    oninactive: (ev: Event) => any;
+    onremovetrack: (ev: TrackEvent) => any;
+    addTrack(track: MediaStreamTrack): void;
+    clone(): MediaStream;
+    getAudioTracks(): MediaStreamTrack[];
+    getTrackById(trackId: string): MediaStreamTrack;
+    getTracks(): MediaStreamTrack[];
+    getVideoTracks(): MediaStreamTrack[];
+    removeTrack(track: MediaStreamTrack): void;
+    stop(): void;
+    addEventListener(type: "active", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "addtrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "inactive", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "removetrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var MediaStream: {
+    prototype: MediaStream;
+    new(streamOrTracks?: MediaStream | MediaStreamTrack[]): MediaStream;
+}
+
+interface MediaStreamAudioSourceNode extends AudioNode {
+}
+
+declare var MediaStreamAudioSourceNode: {
+    prototype: MediaStreamAudioSourceNode;
+    new(): MediaStreamAudioSourceNode;
+}
+
+interface MediaStreamError {
+    readonly constraintName: string;
+    readonly message: string;
+    readonly name: string;
+}
+
+declare var MediaStreamError: {
+    prototype: MediaStreamError;
+    new(): MediaStreamError;
+}
+
+interface MediaStreamErrorEvent extends Event {
+    readonly error: MediaStreamError;
+}
+
+declare var MediaStreamErrorEvent: {
+    prototype: MediaStreamErrorEvent;
+    new(type: string, eventInitDict?: MediaStreamErrorEventInit): MediaStreamErrorEvent;
+}
+
+interface MediaStreamTrack extends EventTarget {
+    enabled: boolean;
+    readonly id: string;
+    readonly kind: string;
+    readonly label: string;
+    readonly muted: boolean;
+    onended: (ev: MediaStreamErrorEvent) => any;
+    onmute: (ev: Event) => any;
+    onoverconstrained: (ev: MediaStreamErrorEvent) => any;
+    onunmute: (ev: Event) => any;
+    readonly readonly: boolean;
+    readonly readyState: string;
+    readonly remote: boolean;
+    applyConstraints(constraints: MediaTrackConstraints): PromiseLike<void>;
+    clone(): MediaStreamTrack;
+    getCapabilities(): MediaTrackCapabilities;
+    getConstraints(): MediaTrackConstraints;
+    getSettings(): MediaTrackSettings;
+    stop(): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mute", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "overconstrained", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "unmute", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var MediaStreamTrack: {
+    prototype: MediaStreamTrack;
+    new(): MediaStreamTrack;
+}
+
+interface MediaStreamTrackEvent extends Event {
+    readonly track: MediaStreamTrack;
+}
+
+declare var MediaStreamTrackEvent: {
+    prototype: MediaStreamTrackEvent;
+    new(type: string, eventInitDict?: MediaStreamTrackEventInit): MediaStreamTrackEvent;
+}
+
 interface MessageChannel {
-    port1: MessagePort;
-    port2: MessagePort;
+    readonly port1: MessagePort;
+    readonly port2: MessagePort;
 }
 
 declare var MessageChannel: {
@@ -13041,10 +14075,10 @@ declare var MessageChannel: {
 }
 
 interface MessageEvent extends Event {
-    data: any;
-    origin: string;
-    ports: any;
-    source: Window;
+    readonly data: any;
+    readonly origin: string;
+    readonly ports: any;
+    readonly source: Window;
     initMessageEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, dataArg: any, originArg: string, lastEventIdArg: string, sourceArg: Window): void;
 }
 
@@ -13068,10 +14102,10 @@ declare var MessagePort: {
 }
 
 interface MimeType {
-    description: string;
-    enabledPlugin: Plugin;
-    suffixes: string;
-    type: string;
+    readonly description: string;
+    readonly enabledPlugin: Plugin;
+    readonly suffixes: string;
+    readonly type: string;
 }
 
 declare var MimeType: {
@@ -13080,7 +14114,7 @@ declare var MimeType: {
 }
 
 interface MimeTypeArray {
-    length: number;
+    readonly length: number;
     item(index: number): Plugin;
     namedItem(type: string): Plugin;
     [index: number]: Plugin;
@@ -13092,30 +14126,30 @@ declare var MimeTypeArray: {
 }
 
 interface MouseEvent extends UIEvent {
-    altKey: boolean;
-    button: number;
-    buttons: number;
-    clientX: number;
-    clientY: number;
-    ctrlKey: boolean;
-    fromElement: Element;
-    layerX: number;
-    layerY: number;
-    metaKey: boolean;
-    movementX: number;
-    movementY: number;
-    offsetX: number;
-    offsetY: number;
-    pageX: number;
-    pageY: number;
-    relatedTarget: EventTarget;
-    screenX: number;
-    screenY: number;
-    shiftKey: boolean;
-    toElement: Element;
-    which: number;
-    x: number;
-    y: number;
+    readonly altKey: boolean;
+    readonly button: number;
+    readonly buttons: number;
+    readonly clientX: number;
+    readonly clientY: number;
+    readonly ctrlKey: boolean;
+    readonly fromElement: Element;
+    readonly layerX: number;
+    readonly layerY: number;
+    readonly metaKey: boolean;
+    readonly movementX: number;
+    readonly movementY: number;
+    readonly offsetX: number;
+    readonly offsetY: number;
+    readonly pageX: number;
+    readonly pageY: number;
+    readonly relatedTarget: EventTarget;
+    readonly screenX: number;
+    readonly screenY: number;
+    readonly shiftKey: boolean;
+    readonly toElement: Element;
+    readonly which: number;
+    readonly x: number;
+    readonly y: number;
     getModifierState(keyArg: string): boolean;
     initMouseEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget): void;
 }
@@ -13125,36 +14159,24 @@ declare var MouseEvent: {
     new(typeArg: string, eventInitDict?: MouseEventInit): MouseEvent;
 }
 
-interface MouseWheelEvent extends MouseEvent {
-    wheelDelta: number;
-    wheelDeltaX: number;
-    wheelDeltaY: number;
-    initMouseWheelEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, buttonArg: number, relatedTargetArg: EventTarget, modifiersListArg: string, wheelDeltaArg: number): void;
-}
-
-declare var MouseWheelEvent: {
-    prototype: MouseWheelEvent;
-    new(): MouseWheelEvent;
-}
-
 interface MutationEvent extends Event {
-    attrChange: number;
-    attrName: string;
-    newValue: string;
-    prevValue: string;
-    relatedNode: Node;
+    readonly attrChange: number;
+    readonly attrName: string;
+    readonly newValue: string;
+    readonly prevValue: string;
+    readonly relatedNode: Node;
     initMutationEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, relatedNodeArg: Node, prevValueArg: string, newValueArg: string, attrNameArg: string, attrChangeArg: number): void;
-    ADDITION: number;
-    MODIFICATION: number;
-    REMOVAL: number;
+    readonly ADDITION: number;
+    readonly MODIFICATION: number;
+    readonly REMOVAL: number;
 }
 
 declare var MutationEvent: {
     prototype: MutationEvent;
     new(): MutationEvent;
-    ADDITION: number;
-    MODIFICATION: number;
-    REMOVAL: number;
+    readonly ADDITION: number;
+    readonly MODIFICATION: number;
+    readonly REMOVAL: number;
 }
 
 interface MutationObserver {
@@ -13169,15 +14191,15 @@ declare var MutationObserver: {
 }
 
 interface MutationRecord {
-    addedNodes: NodeList;
-    attributeName: string;
-    attributeNamespace: string;
-    nextSibling: Node;
-    oldValue: string;
-    previousSibling: Node;
-    removedNodes: NodeList;
-    target: Node;
-    type: string;
+    readonly addedNodes: NodeList;
+    readonly attributeName: string;
+    readonly attributeNamespace: string;
+    readonly nextSibling: Node;
+    readonly oldValue: string;
+    readonly previousSibling: Node;
+    readonly removedNodes: NodeList;
+    readonly target: Node;
+    readonly type: string;
 }
 
 declare var MutationRecord: {
@@ -13186,7 +14208,7 @@ declare var MutationRecord: {
 }
 
 interface NamedNodeMap {
-    length: number;
+    readonly length: number;
     getNamedItem(name: string): Attr;
     getNamedItemNS(namespaceURI: string, localName: string): Attr;
     item(index: number): Attr;
@@ -13203,8 +14225,8 @@ declare var NamedNodeMap: {
 }
 
 interface NavigationCompletedEvent extends NavigationEvent {
-    isSuccess: boolean;
-    webErrorStatus: number;
+    readonly isSuccess: boolean;
+    readonly webErrorStatus: number;
 }
 
 declare var NavigationCompletedEvent: {
@@ -13213,7 +14235,7 @@ declare var NavigationCompletedEvent: {
 }
 
 interface NavigationEvent extends Event {
-    uri: string;
+    readonly uri: string;
 }
 
 declare var NavigationEvent: {
@@ -13222,7 +14244,7 @@ declare var NavigationEvent: {
 }
 
 interface NavigationEventWithReferrer extends NavigationEvent {
-    referer: string;
+    readonly referer: string;
 }
 
 declare var NavigationEventWithReferrer: {
@@ -13230,27 +14252,22 @@ declare var NavigationEventWithReferrer: {
     new(): NavigationEventWithReferrer;
 }
 
-interface Navigator extends Object, NavigatorID, NavigatorOnLine, NavigatorContentUtils, NavigatorStorageUtils, NavigatorGeolocation, MSNavigatorDoNotTrack, MSFileSaver {
-    appCodeName: string;
-    appMinorVersion: string;
-    browserLanguage: string;
-    connectionSpeed: number;
-    cookieEnabled: boolean;
-    cpuClass: string;
-    language: string;
-    maxTouchPoints: number;
-    mimeTypes: MSMimeTypesCollection;
-    msManipulationViewsEnabled: boolean;
-    msMaxTouchPoints: number;
-    msPointerEnabled: boolean;
-    plugins: MSPluginsCollection;
-    pointerEnabled: boolean;
-    systemLanguage: string;
-    userLanguage: string;
-    webdriver: boolean;
+interface Navigator extends Object, NavigatorID, NavigatorOnLine, NavigatorContentUtils, NavigatorStorageUtils, NavigatorGeolocation, MSNavigatorDoNotTrack, MSFileSaver, NavigatorUserMedia {
+    readonly appCodeName: string;
+    readonly cookieEnabled: boolean;
+    readonly language: string;
+    readonly maxTouchPoints: number;
+    readonly mimeTypes: MimeTypeArray;
+    readonly msManipulationViewsEnabled: boolean;
+    readonly msMaxTouchPoints: number;
+    readonly msPointerEnabled: boolean;
+    readonly plugins: PluginArray;
+    readonly pointerEnabled: boolean;
+    readonly webdriver: boolean;
     getGamepads(): Gamepad[];
     javaEnabled(): boolean;
     msLaunchUri(uri: string, successCallback?: MSLaunchUriCallback, noHandlerCallback?: MSLaunchUriCallback): void;
+    requestMediaKeySystemAccess(keySystem: string, supportedConfigurations: MediaKeySystemConfiguration[]): PromiseLike<MediaKeySystemAccess>;
     vibrate(pattern: number | number[]): boolean;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
@@ -13261,26 +14278,26 @@ declare var Navigator: {
 }
 
 interface Node extends EventTarget {
-    attributes: NamedNodeMap;
-    baseURI: string;
-    childNodes: NodeList;
-    firstChild: Node;
-    lastChild: Node;
-    localName: string;
-    namespaceURI: string;
-    nextSibling: Node;
-    nodeName: string;
-    nodeType: number;
+    readonly attributes: NamedNodeMap;
+    readonly baseURI: string;
+    readonly childNodes: NodeList;
+    readonly firstChild: Node;
+    readonly lastChild: Node;
+    readonly localName: string;
+    readonly namespaceURI: string;
+    readonly nextSibling: Node;
+    readonly nodeName: string;
+    readonly nodeType: number;
     nodeValue: string;
-    ownerDocument: Document;
-    parentElement: HTMLElement;
-    parentNode: Node;
-    prefix: string;
-    previousSibling: Node;
+    readonly ownerDocument: Document;
+    readonly parentElement: HTMLElement;
+    readonly parentNode: Node;
+    readonly previousSibling: Node;
     textContent: string;
     appendChild(newChild: Node): Node;
     cloneNode(deep?: boolean): Node;
     compareDocumentPosition(other: Node): number;
+    contains(child: Node): boolean;
     hasAttributes(): boolean;
     hasChildNodes(): boolean;
     insertBefore(newChild: Node, refChild?: Node): Node;
@@ -13293,47 +14310,47 @@ interface Node extends EventTarget {
     removeChild(oldChild: Node): Node;
     replaceChild(newChild: Node, oldChild: Node): Node;
     contains(node: Node): boolean;
-    ATTRIBUTE_NODE: number;
-    CDATA_SECTION_NODE: number;
-    COMMENT_NODE: number;
-    DOCUMENT_FRAGMENT_NODE: number;
-    DOCUMENT_NODE: number;
-    DOCUMENT_POSITION_CONTAINED_BY: number;
-    DOCUMENT_POSITION_CONTAINS: number;
-    DOCUMENT_POSITION_DISCONNECTED: number;
-    DOCUMENT_POSITION_FOLLOWING: number;
-    DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number;
-    DOCUMENT_POSITION_PRECEDING: number;
-    DOCUMENT_TYPE_NODE: number;
-    ELEMENT_NODE: number;
-    ENTITY_NODE: number;
-    ENTITY_REFERENCE_NODE: number;
-    NOTATION_NODE: number;
-    PROCESSING_INSTRUCTION_NODE: number;
-    TEXT_NODE: number;
+    readonly ATTRIBUTE_NODE: number;
+    readonly CDATA_SECTION_NODE: number;
+    readonly COMMENT_NODE: number;
+    readonly DOCUMENT_FRAGMENT_NODE: number;
+    readonly DOCUMENT_NODE: number;
+    readonly DOCUMENT_POSITION_CONTAINED_BY: number;
+    readonly DOCUMENT_POSITION_CONTAINS: number;
+    readonly DOCUMENT_POSITION_DISCONNECTED: number;
+    readonly DOCUMENT_POSITION_FOLLOWING: number;
+    readonly DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number;
+    readonly DOCUMENT_POSITION_PRECEDING: number;
+    readonly DOCUMENT_TYPE_NODE: number;
+    readonly ELEMENT_NODE: number;
+    readonly ENTITY_NODE: number;
+    readonly ENTITY_REFERENCE_NODE: number;
+    readonly NOTATION_NODE: number;
+    readonly PROCESSING_INSTRUCTION_NODE: number;
+    readonly TEXT_NODE: number;
 }
 
 declare var Node: {
     prototype: Node;
     new(): Node;
-    ATTRIBUTE_NODE: number;
-    CDATA_SECTION_NODE: number;
-    COMMENT_NODE: number;
-    DOCUMENT_FRAGMENT_NODE: number;
-    DOCUMENT_NODE: number;
-    DOCUMENT_POSITION_CONTAINED_BY: number;
-    DOCUMENT_POSITION_CONTAINS: number;
-    DOCUMENT_POSITION_DISCONNECTED: number;
-    DOCUMENT_POSITION_FOLLOWING: number;
-    DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number;
-    DOCUMENT_POSITION_PRECEDING: number;
-    DOCUMENT_TYPE_NODE: number;
-    ELEMENT_NODE: number;
-    ENTITY_NODE: number;
-    ENTITY_REFERENCE_NODE: number;
-    NOTATION_NODE: number;
-    PROCESSING_INSTRUCTION_NODE: number;
-    TEXT_NODE: number;
+    readonly ATTRIBUTE_NODE: number;
+    readonly CDATA_SECTION_NODE: number;
+    readonly COMMENT_NODE: number;
+    readonly DOCUMENT_FRAGMENT_NODE: number;
+    readonly DOCUMENT_NODE: number;
+    readonly DOCUMENT_POSITION_CONTAINED_BY: number;
+    readonly DOCUMENT_POSITION_CONTAINS: number;
+    readonly DOCUMENT_POSITION_DISCONNECTED: number;
+    readonly DOCUMENT_POSITION_FOLLOWING: number;
+    readonly DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number;
+    readonly DOCUMENT_POSITION_PRECEDING: number;
+    readonly DOCUMENT_TYPE_NODE: number;
+    readonly ELEMENT_NODE: number;
+    readonly ENTITY_NODE: number;
+    readonly ENTITY_REFERENCE_NODE: number;
+    readonly NOTATION_NODE: number;
+    readonly PROCESSING_INSTRUCTION_NODE: number;
+    readonly TEXT_NODE: number;
 }
 
 interface NodeFilter {
@@ -13341,29 +14358,29 @@ interface NodeFilter {
 }
 
 declare var NodeFilter: {
-    FILTER_ACCEPT: number;
-    FILTER_REJECT: number;
-    FILTER_SKIP: number;
-    SHOW_ALL: number;
-    SHOW_ATTRIBUTE: number;
-    SHOW_CDATA_SECTION: number;
-    SHOW_COMMENT: number;
-    SHOW_DOCUMENT: number;
-    SHOW_DOCUMENT_FRAGMENT: number;
-    SHOW_DOCUMENT_TYPE: number;
-    SHOW_ELEMENT: number;
-    SHOW_ENTITY: number;
-    SHOW_ENTITY_REFERENCE: number;
-    SHOW_NOTATION: number;
-    SHOW_PROCESSING_INSTRUCTION: number;
-    SHOW_TEXT: number;
+    readonly FILTER_ACCEPT: number;
+    readonly FILTER_REJECT: number;
+    readonly FILTER_SKIP: number;
+    readonly SHOW_ALL: number;
+    readonly SHOW_ATTRIBUTE: number;
+    readonly SHOW_CDATA_SECTION: number;
+    readonly SHOW_COMMENT: number;
+    readonly SHOW_DOCUMENT: number;
+    readonly SHOW_DOCUMENT_FRAGMENT: number;
+    readonly SHOW_DOCUMENT_TYPE: number;
+    readonly SHOW_ELEMENT: number;
+    readonly SHOW_ENTITY: number;
+    readonly SHOW_ENTITY_REFERENCE: number;
+    readonly SHOW_NOTATION: number;
+    readonly SHOW_PROCESSING_INSTRUCTION: number;
+    readonly SHOW_TEXT: number;
 }
 
 interface NodeIterator {
-    expandEntityReferences: boolean;
-    filter: NodeFilter;
-    root: Node;
-    whatToShow: number;
+    readonly expandEntityReferences: boolean;
+    readonly filter: NodeFilter;
+    readonly root: Node;
+    readonly whatToShow: number;
     detach(): void;
     nextNode(): Node;
     previousNode(): Node;
@@ -13375,7 +14392,7 @@ declare var NodeIterator: {
 }
 
 interface NodeList {
-    length: number;
+    readonly length: number;
     item(index: number): Node;
     [index: number]: Node;
 }
@@ -13394,13 +14411,13 @@ declare var OES_element_index_uint: {
 }
 
 interface OES_standard_derivatives {
-    FRAGMENT_SHADER_DERIVATIVE_HINT_OES: number;
+    readonly FRAGMENT_SHADER_DERIVATIVE_HINT_OES: number;
 }
 
 declare var OES_standard_derivatives: {
     prototype: OES_standard_derivatives;
     new(): OES_standard_derivatives;
-    FRAGMENT_SHADER_DERIVATIVE_HINT_OES: number;
+    readonly FRAGMENT_SHADER_DERIVATIVE_HINT_OES: number;
 }
 
 interface OES_texture_float {
@@ -13420,7 +14437,7 @@ declare var OES_texture_float_linear: {
 }
 
 interface OfflineAudioCompletionEvent extends Event {
-    renderedBuffer: AudioBuffer;
+    readonly renderedBuffer: AudioBuffer;
 }
 
 declare var OfflineAudioCompletionEvent: {
@@ -13430,7 +14447,7 @@ declare var OfflineAudioCompletionEvent: {
 
 interface OfflineAudioContext extends AudioContext {
     oncomplete: (ev: Event) => any;
-    startRendering(): void;
+    startRendering(): PromiseLike<AudioBuffer>;
     addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
@@ -13441,14 +14458,14 @@ declare var OfflineAudioContext: {
 }
 
 interface OscillatorNode extends AudioNode {
-    detune: AudioParam;
-    frequency: AudioParam;
-    onended: (ev: Event) => any;
+    readonly detune: AudioParam;
+    readonly frequency: AudioParam;
+    onended: (ev: MediaStreamErrorEvent) => any;
     type: string;
     setPeriodicWave(periodicWave: PeriodicWave): void;
     start(when?: number): void;
     stop(when?: number): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13457,8 +14474,25 @@ declare var OscillatorNode: {
     new(): OscillatorNode;
 }
 
+interface OverflowEvent extends UIEvent {
+    readonly horizontalOverflow: boolean;
+    readonly orient: number;
+    readonly verticalOverflow: boolean;
+    readonly BOTH: number;
+    readonly HORIZONTAL: number;
+    readonly VERTICAL: number;
+}
+
+declare var OverflowEvent: {
+    prototype: OverflowEvent;
+    new(): OverflowEvent;
+    readonly BOTH: number;
+    readonly HORIZONTAL: number;
+    readonly VERTICAL: number;
+}
+
 interface PageTransitionEvent extends Event {
-    persisted: boolean;
+    readonly persisted: boolean;
 }
 
 declare var PageTransitionEvent: {
@@ -13486,17 +14520,17 @@ declare var PannerNode: {
 }
 
 interface PerfWidgetExternal {
-    activeNetworkRequestCount: number;
-    averageFrameTime: number;
-    averagePaintTime: number;
-    extraInformationEnabled: boolean;
-    independentRenderingEnabled: boolean;
-    irDisablingContentString: string;
-    irStatusAvailable: boolean;
-    maxCpuSpeed: number;
-    paintRequestsPerSecond: number;
-    performanceCounter: number;
-    performanceCounterFrequency: number;
+    readonly activeNetworkRequestCount: number;
+    readonly averageFrameTime: number;
+    readonly averagePaintTime: number;
+    readonly extraInformationEnabled: boolean;
+    readonly independentRenderingEnabled: boolean;
+    readonly irDisablingContentString: string;
+    readonly irStatusAvailable: boolean;
+    readonly maxCpuSpeed: number;
+    readonly paintRequestsPerSecond: number;
+    readonly performanceCounter: number;
+    readonly performanceCounterFrequency: number;
     addEventListener(eventType: string, callback: Function): void;
     getMemoryUsage(): number;
     getProcessCpuUsage(): number;
@@ -13515,8 +14549,8 @@ declare var PerfWidgetExternal: {
 }
 
 interface Performance {
-    navigation: PerformanceNavigation;
-    timing: PerformanceTiming;
+    readonly navigation: PerformanceNavigation;
+    readonly timing: PerformanceTiming;
     clearMarks(markName?: string): void;
     clearMeasures(measureName?: string): void;
     clearResourceTimings(): void;
@@ -13538,10 +14572,10 @@ declare var Performance: {
 }
 
 interface PerformanceEntry {
-    duration: number;
-    entryType: string;
-    name: string;
-    startTime: number;
+    readonly duration: number;
+    readonly entryType: string;
+    readonly name: string;
+    readonly startTime: number;
 }
 
 declare var PerformanceEntry: {
@@ -13566,47 +14600,47 @@ declare var PerformanceMeasure: {
 }
 
 interface PerformanceNavigation {
-    redirectCount: number;
-    type: number;
+    readonly redirectCount: number;
+    readonly type: number;
     toJSON(): any;
-    TYPE_BACK_FORWARD: number;
-    TYPE_NAVIGATE: number;
-    TYPE_RELOAD: number;
-    TYPE_RESERVED: number;
+    readonly TYPE_BACK_FORWARD: number;
+    readonly TYPE_NAVIGATE: number;
+    readonly TYPE_RELOAD: number;
+    readonly TYPE_RESERVED: number;
 }
 
 declare var PerformanceNavigation: {
     prototype: PerformanceNavigation;
     new(): PerformanceNavigation;
-    TYPE_BACK_FORWARD: number;
-    TYPE_NAVIGATE: number;
-    TYPE_RELOAD: number;
-    TYPE_RESERVED: number;
+    readonly TYPE_BACK_FORWARD: number;
+    readonly TYPE_NAVIGATE: number;
+    readonly TYPE_RELOAD: number;
+    readonly TYPE_RESERVED: number;
 }
 
 interface PerformanceNavigationTiming extends PerformanceEntry {
-    connectEnd: number;
-    connectStart: number;
-    domComplete: number;
-    domContentLoadedEventEnd: number;
-    domContentLoadedEventStart: number;
-    domInteractive: number;
-    domLoading: number;
-    domainLookupEnd: number;
-    domainLookupStart: number;
-    fetchStart: number;
-    loadEventEnd: number;
-    loadEventStart: number;
-    navigationStart: number;
-    redirectCount: number;
-    redirectEnd: number;
-    redirectStart: number;
-    requestStart: number;
-    responseEnd: number;
-    responseStart: number;
-    type: string;
-    unloadEventEnd: number;
-    unloadEventStart: number;
+    readonly connectEnd: number;
+    readonly connectStart: number;
+    readonly domComplete: number;
+    readonly domContentLoadedEventEnd: number;
+    readonly domContentLoadedEventStart: number;
+    readonly domInteractive: number;
+    readonly domLoading: number;
+    readonly domainLookupEnd: number;
+    readonly domainLookupStart: number;
+    readonly fetchStart: number;
+    readonly loadEventEnd: number;
+    readonly loadEventStart: number;
+    readonly navigationStart: number;
+    readonly redirectCount: number;
+    readonly redirectEnd: number;
+    readonly redirectStart: number;
+    readonly requestStart: number;
+    readonly responseEnd: number;
+    readonly responseStart: number;
+    readonly type: string;
+    readonly unloadEventEnd: number;
+    readonly unloadEventStart: number;
 }
 
 declare var PerformanceNavigationTiming: {
@@ -13615,17 +14649,17 @@ declare var PerformanceNavigationTiming: {
 }
 
 interface PerformanceResourceTiming extends PerformanceEntry {
-    connectEnd: number;
-    connectStart: number;
-    domainLookupEnd: number;
-    domainLookupStart: number;
-    fetchStart: number;
-    initiatorType: string;
-    redirectEnd: number;
-    redirectStart: number;
-    requestStart: number;
-    responseEnd: number;
-    responseStart: number;
+    readonly connectEnd: number;
+    readonly connectStart: number;
+    readonly domainLookupEnd: number;
+    readonly domainLookupStart: number;
+    readonly fetchStart: number;
+    readonly initiatorType: string;
+    readonly redirectEnd: number;
+    readonly redirectStart: number;
+    readonly requestStart: number;
+    readonly responseEnd: number;
+    readonly responseStart: number;
 }
 
 declare var PerformanceResourceTiming: {
@@ -13634,27 +14668,27 @@ declare var PerformanceResourceTiming: {
 }
 
 interface PerformanceTiming {
-    connectEnd: number;
-    connectStart: number;
-    domComplete: number;
-    domContentLoadedEventEnd: number;
-    domContentLoadedEventStart: number;
-    domInteractive: number;
-    domLoading: number;
-    domainLookupEnd: number;
-    domainLookupStart: number;
-    fetchStart: number;
-    loadEventEnd: number;
-    loadEventStart: number;
-    msFirstPaint: number;
-    navigationStart: number;
-    redirectEnd: number;
-    redirectStart: number;
-    requestStart: number;
-    responseEnd: number;
-    responseStart: number;
-    unloadEventEnd: number;
-    unloadEventStart: number;
+    readonly connectEnd: number;
+    readonly connectStart: number;
+    readonly domComplete: number;
+    readonly domContentLoadedEventEnd: number;
+    readonly domContentLoadedEventStart: number;
+    readonly domInteractive: number;
+    readonly domLoading: number;
+    readonly domainLookupEnd: number;
+    readonly domainLookupStart: number;
+    readonly fetchStart: number;
+    readonly loadEventEnd: number;
+    readonly loadEventStart: number;
+    readonly msFirstPaint: number;
+    readonly navigationStart: number;
+    readonly redirectEnd: number;
+    readonly redirectStart: number;
+    readonly requestStart: number;
+    readonly responseEnd: number;
+    readonly responseStart: number;
+    readonly unloadEventEnd: number;
+    readonly unloadEventStart: number;
     toJSON(): any;
 }
 
@@ -13672,7 +14706,7 @@ declare var PeriodicWave: {
 }
 
 interface PermissionRequest extends DeferredPermissionRequest {
-    state: string;
+    readonly state: string;
     defer(): void;
 }
 
@@ -13682,7 +14716,7 @@ declare var PermissionRequest: {
 }
 
 interface PermissionRequestedEvent extends Event {
-    permissionRequest: PermissionRequest;
+    readonly permissionRequest: PermissionRequest;
 }
 
 declare var PermissionRequestedEvent: {
@@ -13691,11 +14725,11 @@ declare var PermissionRequestedEvent: {
 }
 
 interface Plugin {
-    description: string;
-    filename: string;
-    length: number;
-    name: string;
-    version: string;
+    readonly description: string;
+    readonly filename: string;
+    readonly length: number;
+    readonly name: string;
+    readonly version: string;
     item(index: number): MimeType;
     namedItem(type: string): MimeType;
     [index: number]: MimeType;
@@ -13707,7 +14741,7 @@ declare var Plugin: {
 }
 
 interface PluginArray {
-    length: number;
+    readonly length: number;
     item(index: number): Plugin;
     namedItem(name: string): Plugin;
     refresh(reload?: boolean): void;
@@ -13720,18 +14754,18 @@ declare var PluginArray: {
 }
 
 interface PointerEvent extends MouseEvent {
-    currentPoint: any;
-    height: number;
-    hwTimestamp: number;
-    intermediatePoints: any;
-    isPrimary: boolean;
-    pointerId: number;
-    pointerType: any;
-    pressure: number;
-    rotation: number;
-    tiltX: number;
-    tiltY: number;
-    width: number;
+    readonly currentPoint: any;
+    readonly height: number;
+    readonly hwTimestamp: number;
+    readonly intermediatePoints: any;
+    readonly isPrimary: boolean;
+    readonly pointerId: number;
+    readonly pointerType: any;
+    readonly pressure: number;
+    readonly rotation: number;
+    readonly tiltX: number;
+    readonly tiltY: number;
+    readonly width: number;
     getCurrentPoint(element: Element): void;
     getIntermediatePoints(element: Element): void;
     initPointerEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget, offsetXArg: number, offsetYArg: number, widthArg: number, heightArg: number, pressure: number, rotation: number, tiltX: number, tiltY: number, pointerIdArg: number, pointerType: any, hwTimestampArg: number, isPrimary: boolean): void;
@@ -13743,7 +14777,7 @@ declare var PointerEvent: {
 }
 
 interface PopStateEvent extends Event {
-    state: any;
+    readonly state: any;
     initPopStateEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, stateArg: any): void;
 }
 
@@ -13753,8 +14787,8 @@ declare var PopStateEvent: {
 }
 
 interface Position {
-    coords: Coordinates;
-    timestamp: number;
+    readonly coords: Coordinates;
+    readonly timestamp: number;
 }
 
 declare var Position: {
@@ -13763,24 +14797,24 @@ declare var Position: {
 }
 
 interface PositionError {
-    code: number;
-    message: string;
+    readonly code: number;
+    readonly message: string;
     toString(): string;
-    PERMISSION_DENIED: number;
-    POSITION_UNAVAILABLE: number;
-    TIMEOUT: number;
+    readonly PERMISSION_DENIED: number;
+    readonly POSITION_UNAVAILABLE: number;
+    readonly TIMEOUT: number;
 }
 
 declare var PositionError: {
     prototype: PositionError;
     new(): PositionError;
-    PERMISSION_DENIED: number;
-    POSITION_UNAVAILABLE: number;
-    TIMEOUT: number;
+    readonly PERMISSION_DENIED: number;
+    readonly POSITION_UNAVAILABLE: number;
+    readonly TIMEOUT: number;
 }
 
 interface ProcessingInstruction extends CharacterData {
-    target: string;
+    readonly target: string;
 }
 
 declare var ProcessingInstruction: {
@@ -13789,9 +14823,9 @@ declare var ProcessingInstruction: {
 }
 
 interface ProgressEvent extends Event {
-    lengthComputable: boolean;
-    loaded: number;
-    total: number;
+    readonly lengthComputable: boolean;
+    readonly loaded: number;
+    readonly total: number;
     initProgressEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, lengthComputableArg: boolean, loadedArg: number, totalArg: number): void;
 }
 
@@ -13800,13 +14834,210 @@ declare var ProgressEvent: {
     new(type: string, eventInitDict?: ProgressEventInit): ProgressEvent;
 }
 
+interface RTCDTMFToneChangeEvent extends Event {
+    readonly tone: string;
+}
+
+declare var RTCDTMFToneChangeEvent: {
+    prototype: RTCDTMFToneChangeEvent;
+    new(type: string, eventInitDict: RTCDTMFToneChangeEventInit): RTCDTMFToneChangeEvent;
+}
+
+interface RTCDtlsTransport extends RTCStatsProvider {
+    ondtlsstatechange: (ev: RTCDtlsTransportStateChangedEvent) => any;
+    onerror: (ev: Event) => any;
+    readonly state: string;
+    readonly transport: RTCIceTransport;
+    getLocalParameters(): RTCDtlsParameters;
+    getRemoteCertificates(): ArrayBuffer[];
+    getRemoteParameters(): RTCDtlsParameters;
+    start(remoteParameters: RTCDtlsParameters): void;
+    stop(): void;
+    addEventListener(type: "dtlsstatechange", listener: (ev: RTCDtlsTransportStateChangedEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCDtlsTransport: {
+    prototype: RTCDtlsTransport;
+    new(transport: RTCIceTransport): RTCDtlsTransport;
+}
+
+interface RTCDtlsTransportStateChangedEvent extends Event {
+    readonly state: string;
+}
+
+declare var RTCDtlsTransportStateChangedEvent: {
+    prototype: RTCDtlsTransportStateChangedEvent;
+    new(): RTCDtlsTransportStateChangedEvent;
+}
+
+interface RTCDtmfSender extends EventTarget {
+    readonly canInsertDTMF: boolean;
+    readonly duration: number;
+    readonly interToneGap: number;
+    ontonechange: (ev: RTCDTMFToneChangeEvent) => any;
+    readonly sender: RTCRtpSender;
+    readonly toneBuffer: string;
+    insertDTMF(tones: string, duration?: number, interToneGap?: number): void;
+    addEventListener(type: "tonechange", listener: (ev: RTCDTMFToneChangeEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCDtmfSender: {
+    prototype: RTCDtmfSender;
+    new(sender: RTCRtpSender): RTCDtmfSender;
+}
+
+interface RTCIceCandidatePairChangedEvent extends Event {
+    readonly pair: RTCIceCandidatePair;
+}
+
+declare var RTCIceCandidatePairChangedEvent: {
+    prototype: RTCIceCandidatePairChangedEvent;
+    new(): RTCIceCandidatePairChangedEvent;
+}
+
+interface RTCIceGatherer extends RTCStatsProvider {
+    readonly component: string;
+    onerror: (ev: Event) => any;
+    onlocalcandidate: (ev: RTCIceGathererEvent) => any;
+    createAssociatedGatherer(): RTCIceGatherer;
+    getLocalCandidates(): RTCIceCandidate[];
+    getLocalParameters(): RTCIceParameters;
+    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "localcandidate", listener: (ev: RTCIceGathererEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCIceGatherer: {
+    prototype: RTCIceGatherer;
+    new(options: RTCIceGatherOptions): RTCIceGatherer;
+}
+
+interface RTCIceGathererEvent extends Event {
+    readonly candidate: RTCIceCandidate | RTCIceCandidateComplete;
+}
+
+declare var RTCIceGathererEvent: {
+    prototype: RTCIceGathererEvent;
+    new(): RTCIceGathererEvent;
+}
+
+interface RTCIceTransport extends RTCStatsProvider {
+    readonly component: string;
+    readonly iceGatherer: RTCIceGatherer;
+    oncandidatepairchange: (ev: RTCIceCandidatePairChangedEvent) => any;
+    onicestatechange: (ev: RTCIceTransportStateChangedEvent) => any;
+    readonly role: string;
+    readonly state: string;
+    addRemoteCandidate(remoteCandidate: RTCIceCandidate | RTCIceCandidateComplete): void;
+    createAssociatedTransport(): RTCIceTransport;
+    getNominatedCandidatePair(): RTCIceCandidatePair;
+    getRemoteCandidates(): RTCIceCandidate[];
+    getRemoteParameters(): RTCIceParameters;
+    setRemoteCandidates(remoteCandidates: RTCIceCandidate[]): void;
+    start(gatherer: RTCIceGatherer, remoteParameters: RTCIceParameters, role?: string): void;
+    stop(): void;
+    addEventListener(type: "candidatepairchange", listener: (ev: RTCIceCandidatePairChangedEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "icestatechange", listener: (ev: RTCIceTransportStateChangedEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCIceTransport: {
+    prototype: RTCIceTransport;
+    new(): RTCIceTransport;
+}
+
+interface RTCIceTransportStateChangedEvent extends Event {
+    readonly state: string;
+}
+
+declare var RTCIceTransportStateChangedEvent: {
+    prototype: RTCIceTransportStateChangedEvent;
+    new(): RTCIceTransportStateChangedEvent;
+}
+
+interface RTCRtpReceiver extends RTCStatsProvider {
+    onerror: (ev: Event) => any;
+    readonly rtcpTransport: RTCDtlsTransport;
+    readonly track: MediaStreamTrack;
+    readonly transport: RTCDtlsTransport | RTCSrtpSdesTransport;
+    getContributingSources(): RTCRtpContributingSource[];
+    receive(parameters: RTCRtpParameters): void;
+    requestSendCSRC(csrc: number): void;
+    setTransport(transport: RTCDtlsTransport | RTCSrtpSdesTransport, rtcpTransport?: RTCDtlsTransport): void;
+    stop(): void;
+    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCRtpReceiver: {
+    prototype: RTCRtpReceiver;
+    new(transport: RTCDtlsTransport | RTCSrtpSdesTransport, kind: string, rtcpTransport?: RTCDtlsTransport): RTCRtpReceiver;
+    getCapabilities(kind?: string): RTCRtpCapabilities;
+}
+
+interface RTCRtpSender extends RTCStatsProvider {
+    onerror: (ev: Event) => any;
+    onssrcconflict: (ev: RTCSsrcConflictEvent) => any;
+    readonly rtcpTransport: RTCDtlsTransport;
+    readonly track: MediaStreamTrack;
+    readonly transport: RTCDtlsTransport | RTCSrtpSdesTransport;
+    send(parameters: RTCRtpParameters): void;
+    setTrack(track: MediaStreamTrack): void;
+    setTransport(transport: RTCDtlsTransport | RTCSrtpSdesTransport, rtcpTransport?: RTCDtlsTransport): void;
+    stop(): void;
+    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "ssrcconflict", listener: (ev: RTCSsrcConflictEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCRtpSender: {
+    prototype: RTCRtpSender;
+    new(track: MediaStreamTrack, transport: RTCDtlsTransport | RTCSrtpSdesTransport, rtcpTransport?: RTCDtlsTransport): RTCRtpSender;
+    getCapabilities(kind?: string): RTCRtpCapabilities;
+}
+
+interface RTCSrtpSdesTransport extends EventTarget {
+    onerror: (ev: Event) => any;
+    readonly transport: RTCIceTransport;
+    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCSrtpSdesTransport: {
+    prototype: RTCSrtpSdesTransport;
+    new(transport: RTCIceTransport, encryptParameters: RTCSrtpSdesParameters, decryptParameters: RTCSrtpSdesParameters): RTCSrtpSdesTransport;
+    getLocalParameters(): RTCSrtpSdesParameters[];
+}
+
+interface RTCSsrcConflictEvent extends Event {
+    readonly ssrc: number;
+}
+
+declare var RTCSsrcConflictEvent: {
+    prototype: RTCSsrcConflictEvent;
+    new(): RTCSsrcConflictEvent;
+}
+
+interface RTCStatsProvider extends EventTarget {
+    getStats(): PromiseLike<RTCStatsReport>;
+    msGetStats(): PromiseLike<RTCStatsReport>;
+}
+
+declare var RTCStatsProvider: {
+    prototype: RTCStatsProvider;
+    new(): RTCStatsProvider;
+}
+
 interface Range {
-    collapsed: boolean;
-    commonAncestorContainer: Node;
-    endContainer: Node;
-    endOffset: number;
-    startContainer: Node;
-    startOffset: number;
+    readonly collapsed: boolean;
+    readonly commonAncestorContainer: Node;
+    readonly endContainer: Node;
+    readonly endOffset: number;
+    readonly startContainer: Node;
+    readonly startOffset: number;
     cloneContents(): DocumentFragment;
     cloneRange(): Range;
     collapse(toStart: boolean): void;
@@ -13829,23 +15060,23 @@ interface Range {
     setStartBefore(refNode: Node): void;
     surroundContents(newParent: Node): void;
     toString(): string;
-    END_TO_END: number;
-    END_TO_START: number;
-    START_TO_END: number;
-    START_TO_START: number;
+    readonly END_TO_END: number;
+    readonly END_TO_START: number;
+    readonly START_TO_END: number;
+    readonly START_TO_START: number;
 }
 
 declare var Range: {
     prototype: Range;
     new(): Range;
-    END_TO_END: number;
-    END_TO_START: number;
-    START_TO_END: number;
-    START_TO_START: number;
+    readonly END_TO_END: number;
+    readonly END_TO_START: number;
+    readonly START_TO_END: number;
+    readonly START_TO_START: number;
 }
 
 interface SVGAElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference {
-    target: SVGAnimatedString;
+    readonly target: SVGAnimatedString;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13855,32 +15086,32 @@ declare var SVGAElement: {
 }
 
 interface SVGAngle {
-    unitType: number;
+    readonly unitType: number;
     value: number;
     valueAsString: string;
     valueInSpecifiedUnits: number;
     convertToSpecifiedUnits(unitType: number): void;
     newValueSpecifiedUnits(unitType: number, valueInSpecifiedUnits: number): void;
-    SVG_ANGLETYPE_DEG: number;
-    SVG_ANGLETYPE_GRAD: number;
-    SVG_ANGLETYPE_RAD: number;
-    SVG_ANGLETYPE_UNKNOWN: number;
-    SVG_ANGLETYPE_UNSPECIFIED: number;
+    readonly SVG_ANGLETYPE_DEG: number;
+    readonly SVG_ANGLETYPE_GRAD: number;
+    readonly SVG_ANGLETYPE_RAD: number;
+    readonly SVG_ANGLETYPE_UNKNOWN: number;
+    readonly SVG_ANGLETYPE_UNSPECIFIED: number;
 }
 
 declare var SVGAngle: {
     prototype: SVGAngle;
     new(): SVGAngle;
-    SVG_ANGLETYPE_DEG: number;
-    SVG_ANGLETYPE_GRAD: number;
-    SVG_ANGLETYPE_RAD: number;
-    SVG_ANGLETYPE_UNKNOWN: number;
-    SVG_ANGLETYPE_UNSPECIFIED: number;
+    readonly SVG_ANGLETYPE_DEG: number;
+    readonly SVG_ANGLETYPE_GRAD: number;
+    readonly SVG_ANGLETYPE_RAD: number;
+    readonly SVG_ANGLETYPE_UNKNOWN: number;
+    readonly SVG_ANGLETYPE_UNSPECIFIED: number;
 }
 
 interface SVGAnimatedAngle {
-    animVal: SVGAngle;
-    baseVal: SVGAngle;
+    readonly animVal: SVGAngle;
+    readonly baseVal: SVGAngle;
 }
 
 declare var SVGAnimatedAngle: {
@@ -13889,7 +15120,7 @@ declare var SVGAnimatedAngle: {
 }
 
 interface SVGAnimatedBoolean {
-    animVal: boolean;
+    readonly animVal: boolean;
     baseVal: boolean;
 }
 
@@ -13899,7 +15130,7 @@ declare var SVGAnimatedBoolean: {
 }
 
 interface SVGAnimatedEnumeration {
-    animVal: number;
+    readonly animVal: number;
     baseVal: number;
 }
 
@@ -13909,7 +15140,7 @@ declare var SVGAnimatedEnumeration: {
 }
 
 interface SVGAnimatedInteger {
-    animVal: number;
+    readonly animVal: number;
     baseVal: number;
 }
 
@@ -13919,8 +15150,8 @@ declare var SVGAnimatedInteger: {
 }
 
 interface SVGAnimatedLength {
-    animVal: SVGLength;
-    baseVal: SVGLength;
+    readonly animVal: SVGLength;
+    readonly baseVal: SVGLength;
 }
 
 declare var SVGAnimatedLength: {
@@ -13929,8 +15160,8 @@ declare var SVGAnimatedLength: {
 }
 
 interface SVGAnimatedLengthList {
-    animVal: SVGLengthList;
-    baseVal: SVGLengthList;
+    readonly animVal: SVGLengthList;
+    readonly baseVal: SVGLengthList;
 }
 
 declare var SVGAnimatedLengthList: {
@@ -13939,7 +15170,7 @@ declare var SVGAnimatedLengthList: {
 }
 
 interface SVGAnimatedNumber {
-    animVal: number;
+    readonly animVal: number;
     baseVal: number;
 }
 
@@ -13949,8 +15180,8 @@ declare var SVGAnimatedNumber: {
 }
 
 interface SVGAnimatedNumberList {
-    animVal: SVGNumberList;
-    baseVal: SVGNumberList;
+    readonly animVal: SVGNumberList;
+    readonly baseVal: SVGNumberList;
 }
 
 declare var SVGAnimatedNumberList: {
@@ -13959,8 +15190,8 @@ declare var SVGAnimatedNumberList: {
 }
 
 interface SVGAnimatedPreserveAspectRatio {
-    animVal: SVGPreserveAspectRatio;
-    baseVal: SVGPreserveAspectRatio;
+    readonly animVal: SVGPreserveAspectRatio;
+    readonly baseVal: SVGPreserveAspectRatio;
 }
 
 declare var SVGAnimatedPreserveAspectRatio: {
@@ -13969,8 +15200,8 @@ declare var SVGAnimatedPreserveAspectRatio: {
 }
 
 interface SVGAnimatedRect {
-    animVal: SVGRect;
-    baseVal: SVGRect;
+    readonly animVal: SVGRect;
+    readonly baseVal: SVGRect;
 }
 
 declare var SVGAnimatedRect: {
@@ -13979,7 +15210,7 @@ declare var SVGAnimatedRect: {
 }
 
 interface SVGAnimatedString {
-    animVal: string;
+    readonly animVal: string;
     baseVal: string;
 }
 
@@ -13989,8 +15220,8 @@ declare var SVGAnimatedString: {
 }
 
 interface SVGAnimatedTransformList {
-    animVal: SVGTransformList;
-    baseVal: SVGTransformList;
+    readonly animVal: SVGTransformList;
+    readonly baseVal: SVGTransformList;
 }
 
 declare var SVGAnimatedTransformList: {
@@ -13999,9 +15230,9 @@ declare var SVGAnimatedTransformList: {
 }
 
 interface SVGCircleElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    cx: SVGAnimatedLength;
-    cy: SVGAnimatedLength;
-    r: SVGAnimatedLength;
+    readonly cx: SVGAnimatedLength;
+    readonly cy: SVGAnimatedLength;
+    readonly r: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -14011,7 +15242,7 @@ declare var SVGCircleElement: {
 }
 
 interface SVGClipPathElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGUnitTypes {
-    clipPathUnits: SVGAnimatedEnumeration;
+    readonly clipPathUnits: SVGAnimatedEnumeration;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -14021,30 +15252,30 @@ declare var SVGClipPathElement: {
 }
 
 interface SVGComponentTransferFunctionElement extends SVGElement {
-    amplitude: SVGAnimatedNumber;
-    exponent: SVGAnimatedNumber;
-    intercept: SVGAnimatedNumber;
-    offset: SVGAnimatedNumber;
-    slope: SVGAnimatedNumber;
-    tableValues: SVGAnimatedNumberList;
-    type: SVGAnimatedEnumeration;
-    SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_GAMMA: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_LINEAR: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_TABLE: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number;
+    readonly amplitude: SVGAnimatedNumber;
+    readonly exponent: SVGAnimatedNumber;
+    readonly intercept: SVGAnimatedNumber;
+    readonly offset: SVGAnimatedNumber;
+    readonly slope: SVGAnimatedNumber;
+    readonly tableValues: SVGAnimatedNumberList;
+    readonly type: SVGAnimatedEnumeration;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_GAMMA: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_LINEAR: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_TABLE: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number;
 }
 
 declare var SVGComponentTransferFunctionElement: {
     prototype: SVGComponentTransferFunctionElement;
     new(): SVGComponentTransferFunctionElement;
-    SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_GAMMA: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_LINEAR: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_TABLE: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_GAMMA: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_LINEAR: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_TABLE: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number;
 }
 
 interface SVGDefsElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
@@ -14066,7 +15297,6 @@ declare var SVGDescElement: {
 }
 
 interface SVGElement extends Element {
-    id: string;
     onclick: (ev: MouseEvent) => any;
     ondblclick: (ev: MouseEvent) => any;
     onfocusin: (ev: FocusEvent) => any;
@@ -14077,8 +15307,8 @@ interface SVGElement extends Element {
     onmouseout: (ev: MouseEvent) => any;
     onmouseover: (ev: MouseEvent) => any;
     onmouseup: (ev: MouseEvent) => any;
-    ownerSVGElement: SVGSVGElement;
-    viewportElement: SVGElement;
+    readonly ownerSVGElement: SVGSVGElement;
+    readonly viewportElement: SVGElement;
     xmlbase: string;
     className: any;
     addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -14136,14 +15366,14 @@ declare var SVGElement: {
 }
 
 interface SVGElementInstance extends EventTarget {
-    childNodes: SVGElementInstanceList;
-    correspondingElement: SVGElement;
-    correspondingUseElement: SVGUseElement;
-    firstChild: SVGElementInstance;
-    lastChild: SVGElementInstance;
-    nextSibling: SVGElementInstance;
-    parentNode: SVGElementInstance;
-    previousSibling: SVGElementInstance;
+    readonly childNodes: SVGElementInstanceList;
+    readonly correspondingElement: SVGElement;
+    readonly correspondingUseElement: SVGUseElement;
+    readonly firstChild: SVGElementInstance;
+    readonly lastChild: SVGElementInstance;
+    readonly nextSibling: SVGElementInstance;
+    readonly parentNode: SVGElementInstance;
+    readonly previousSibling: SVGElementInstance;
 }
 
 declare var SVGElementInstance: {
@@ -14152,7 +15382,7 @@ declare var SVGElementInstance: {
 }
 
 interface SVGElementInstanceList {
-    length: number;
+    readonly length: number;
     item(index: number): SVGElementInstance;
 }
 
@@ -14162,10 +15392,10 @@ declare var SVGElementInstanceList: {
 }
 
 interface SVGEllipseElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    cx: SVGAnimatedLength;
-    cy: SVGAnimatedLength;
-    rx: SVGAnimatedLength;
-    ry: SVGAnimatedLength;
+    readonly cx: SVGAnimatedLength;
+    readonly cy: SVGAnimatedLength;
+    readonly rx: SVGAnimatedLength;
+    readonly ry: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -14175,75 +15405,75 @@ declare var SVGEllipseElement: {
 }
 
 interface SVGFEBlendElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    in2: SVGAnimatedString;
-    mode: SVGAnimatedEnumeration;
-    SVG_FEBLEND_MODE_COLOR: number;
-    SVG_FEBLEND_MODE_COLOR_BURN: number;
-    SVG_FEBLEND_MODE_COLOR_DODGE: number;
-    SVG_FEBLEND_MODE_DARKEN: number;
-    SVG_FEBLEND_MODE_DIFFERENCE: number;
-    SVG_FEBLEND_MODE_EXCLUSION: number;
-    SVG_FEBLEND_MODE_HARD_LIGHT: number;
-    SVG_FEBLEND_MODE_HUE: number;
-    SVG_FEBLEND_MODE_LIGHTEN: number;
-    SVG_FEBLEND_MODE_LUMINOSITY: number;
-    SVG_FEBLEND_MODE_MULTIPLY: number;
-    SVG_FEBLEND_MODE_NORMAL: number;
-    SVG_FEBLEND_MODE_OVERLAY: number;
-    SVG_FEBLEND_MODE_SATURATION: number;
-    SVG_FEBLEND_MODE_SCREEN: number;
-    SVG_FEBLEND_MODE_SOFT_LIGHT: number;
-    SVG_FEBLEND_MODE_UNKNOWN: number;
+    readonly in1: SVGAnimatedString;
+    readonly in2: SVGAnimatedString;
+    readonly mode: SVGAnimatedEnumeration;
+    readonly SVG_FEBLEND_MODE_COLOR: number;
+    readonly SVG_FEBLEND_MODE_COLOR_BURN: number;
+    readonly SVG_FEBLEND_MODE_COLOR_DODGE: number;
+    readonly SVG_FEBLEND_MODE_DARKEN: number;
+    readonly SVG_FEBLEND_MODE_DIFFERENCE: number;
+    readonly SVG_FEBLEND_MODE_EXCLUSION: number;
+    readonly SVG_FEBLEND_MODE_HARD_LIGHT: number;
+    readonly SVG_FEBLEND_MODE_HUE: number;
+    readonly SVG_FEBLEND_MODE_LIGHTEN: number;
+    readonly SVG_FEBLEND_MODE_LUMINOSITY: number;
+    readonly SVG_FEBLEND_MODE_MULTIPLY: number;
+    readonly SVG_FEBLEND_MODE_NORMAL: number;
+    readonly SVG_FEBLEND_MODE_OVERLAY: number;
+    readonly SVG_FEBLEND_MODE_SATURATION: number;
+    readonly SVG_FEBLEND_MODE_SCREEN: number;
+    readonly SVG_FEBLEND_MODE_SOFT_LIGHT: number;
+    readonly SVG_FEBLEND_MODE_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEBlendElement: {
     prototype: SVGFEBlendElement;
     new(): SVGFEBlendElement;
-    SVG_FEBLEND_MODE_COLOR: number;
-    SVG_FEBLEND_MODE_COLOR_BURN: number;
-    SVG_FEBLEND_MODE_COLOR_DODGE: number;
-    SVG_FEBLEND_MODE_DARKEN: number;
-    SVG_FEBLEND_MODE_DIFFERENCE: number;
-    SVG_FEBLEND_MODE_EXCLUSION: number;
-    SVG_FEBLEND_MODE_HARD_LIGHT: number;
-    SVG_FEBLEND_MODE_HUE: number;
-    SVG_FEBLEND_MODE_LIGHTEN: number;
-    SVG_FEBLEND_MODE_LUMINOSITY: number;
-    SVG_FEBLEND_MODE_MULTIPLY: number;
-    SVG_FEBLEND_MODE_NORMAL: number;
-    SVG_FEBLEND_MODE_OVERLAY: number;
-    SVG_FEBLEND_MODE_SATURATION: number;
-    SVG_FEBLEND_MODE_SCREEN: number;
-    SVG_FEBLEND_MODE_SOFT_LIGHT: number;
-    SVG_FEBLEND_MODE_UNKNOWN: number;
+    readonly SVG_FEBLEND_MODE_COLOR: number;
+    readonly SVG_FEBLEND_MODE_COLOR_BURN: number;
+    readonly SVG_FEBLEND_MODE_COLOR_DODGE: number;
+    readonly SVG_FEBLEND_MODE_DARKEN: number;
+    readonly SVG_FEBLEND_MODE_DIFFERENCE: number;
+    readonly SVG_FEBLEND_MODE_EXCLUSION: number;
+    readonly SVG_FEBLEND_MODE_HARD_LIGHT: number;
+    readonly SVG_FEBLEND_MODE_HUE: number;
+    readonly SVG_FEBLEND_MODE_LIGHTEN: number;
+    readonly SVG_FEBLEND_MODE_LUMINOSITY: number;
+    readonly SVG_FEBLEND_MODE_MULTIPLY: number;
+    readonly SVG_FEBLEND_MODE_NORMAL: number;
+    readonly SVG_FEBLEND_MODE_OVERLAY: number;
+    readonly SVG_FEBLEND_MODE_SATURATION: number;
+    readonly SVG_FEBLEND_MODE_SCREEN: number;
+    readonly SVG_FEBLEND_MODE_SOFT_LIGHT: number;
+    readonly SVG_FEBLEND_MODE_UNKNOWN: number;
 }
 
 interface SVGFEColorMatrixElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    type: SVGAnimatedEnumeration;
-    values: SVGAnimatedNumberList;
-    SVG_FECOLORMATRIX_TYPE_HUEROTATE: number;
-    SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA: number;
-    SVG_FECOLORMATRIX_TYPE_MATRIX: number;
-    SVG_FECOLORMATRIX_TYPE_SATURATE: number;
-    SVG_FECOLORMATRIX_TYPE_UNKNOWN: number;
+    readonly in1: SVGAnimatedString;
+    readonly type: SVGAnimatedEnumeration;
+    readonly values: SVGAnimatedNumberList;
+    readonly SVG_FECOLORMATRIX_TYPE_HUEROTATE: number;
+    readonly SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA: number;
+    readonly SVG_FECOLORMATRIX_TYPE_MATRIX: number;
+    readonly SVG_FECOLORMATRIX_TYPE_SATURATE: number;
+    readonly SVG_FECOLORMATRIX_TYPE_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEColorMatrixElement: {
     prototype: SVGFEColorMatrixElement;
     new(): SVGFEColorMatrixElement;
-    SVG_FECOLORMATRIX_TYPE_HUEROTATE: number;
-    SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA: number;
-    SVG_FECOLORMATRIX_TYPE_MATRIX: number;
-    SVG_FECOLORMATRIX_TYPE_SATURATE: number;
-    SVG_FECOLORMATRIX_TYPE_UNKNOWN: number;
+    readonly SVG_FECOLORMATRIX_TYPE_HUEROTATE: number;
+    readonly SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA: number;
+    readonly SVG_FECOLORMATRIX_TYPE_MATRIX: number;
+    readonly SVG_FECOLORMATRIX_TYPE_SATURATE: number;
+    readonly SVG_FECOLORMATRIX_TYPE_UNKNOWN: number;
 }
 
 interface SVGFEComponentTransferElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
+    readonly in1: SVGAnimatedString;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -14253,70 +15483,70 @@ declare var SVGFEComponentTransferElement: {
 }
 
 interface SVGFECompositeElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    in2: SVGAnimatedString;
-    k1: SVGAnimatedNumber;
-    k2: SVGAnimatedNumber;
-    k3: SVGAnimatedNumber;
-    k4: SVGAnimatedNumber;
-    operator: SVGAnimatedEnumeration;
-    SVG_FECOMPOSITE_OPERATOR_ARITHMETIC: number;
-    SVG_FECOMPOSITE_OPERATOR_ATOP: number;
-    SVG_FECOMPOSITE_OPERATOR_IN: number;
-    SVG_FECOMPOSITE_OPERATOR_OUT: number;
-    SVG_FECOMPOSITE_OPERATOR_OVER: number;
-    SVG_FECOMPOSITE_OPERATOR_UNKNOWN: number;
-    SVG_FECOMPOSITE_OPERATOR_XOR: number;
+    readonly in1: SVGAnimatedString;
+    readonly in2: SVGAnimatedString;
+    readonly k1: SVGAnimatedNumber;
+    readonly k2: SVGAnimatedNumber;
+    readonly k3: SVGAnimatedNumber;
+    readonly k4: SVGAnimatedNumber;
+    readonly operator: SVGAnimatedEnumeration;
+    readonly SVG_FECOMPOSITE_OPERATOR_ARITHMETIC: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_ATOP: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_IN: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_OUT: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_OVER: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_UNKNOWN: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_XOR: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFECompositeElement: {
     prototype: SVGFECompositeElement;
     new(): SVGFECompositeElement;
-    SVG_FECOMPOSITE_OPERATOR_ARITHMETIC: number;
-    SVG_FECOMPOSITE_OPERATOR_ATOP: number;
-    SVG_FECOMPOSITE_OPERATOR_IN: number;
-    SVG_FECOMPOSITE_OPERATOR_OUT: number;
-    SVG_FECOMPOSITE_OPERATOR_OVER: number;
-    SVG_FECOMPOSITE_OPERATOR_UNKNOWN: number;
-    SVG_FECOMPOSITE_OPERATOR_XOR: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_ARITHMETIC: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_ATOP: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_IN: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_OUT: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_OVER: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_UNKNOWN: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_XOR: number;
 }
 
 interface SVGFEConvolveMatrixElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    bias: SVGAnimatedNumber;
-    divisor: SVGAnimatedNumber;
-    edgeMode: SVGAnimatedEnumeration;
-    in1: SVGAnimatedString;
-    kernelMatrix: SVGAnimatedNumberList;
-    kernelUnitLengthX: SVGAnimatedNumber;
-    kernelUnitLengthY: SVGAnimatedNumber;
-    orderX: SVGAnimatedInteger;
-    orderY: SVGAnimatedInteger;
-    preserveAlpha: SVGAnimatedBoolean;
-    targetX: SVGAnimatedInteger;
-    targetY: SVGAnimatedInteger;
-    SVG_EDGEMODE_DUPLICATE: number;
-    SVG_EDGEMODE_NONE: number;
-    SVG_EDGEMODE_UNKNOWN: number;
-    SVG_EDGEMODE_WRAP: number;
+    readonly bias: SVGAnimatedNumber;
+    readonly divisor: SVGAnimatedNumber;
+    readonly edgeMode: SVGAnimatedEnumeration;
+    readonly in1: SVGAnimatedString;
+    readonly kernelMatrix: SVGAnimatedNumberList;
+    readonly kernelUnitLengthX: SVGAnimatedNumber;
+    readonly kernelUnitLengthY: SVGAnimatedNumber;
+    readonly orderX: SVGAnimatedInteger;
+    readonly orderY: SVGAnimatedInteger;
+    readonly preserveAlpha: SVGAnimatedBoolean;
+    readonly targetX: SVGAnimatedInteger;
+    readonly targetY: SVGAnimatedInteger;
+    readonly SVG_EDGEMODE_DUPLICATE: number;
+    readonly SVG_EDGEMODE_NONE: number;
+    readonly SVG_EDGEMODE_UNKNOWN: number;
+    readonly SVG_EDGEMODE_WRAP: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEConvolveMatrixElement: {
     prototype: SVGFEConvolveMatrixElement;
     new(): SVGFEConvolveMatrixElement;
-    SVG_EDGEMODE_DUPLICATE: number;
-    SVG_EDGEMODE_NONE: number;
-    SVG_EDGEMODE_UNKNOWN: number;
-    SVG_EDGEMODE_WRAP: number;
+    readonly SVG_EDGEMODE_DUPLICATE: number;
+    readonly SVG_EDGEMODE_NONE: number;
+    readonly SVG_EDGEMODE_UNKNOWN: number;
+    readonly SVG_EDGEMODE_WRAP: number;
 }
 
 interface SVGFEDiffuseLightingElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    diffuseConstant: SVGAnimatedNumber;
-    in1: SVGAnimatedString;
-    kernelUnitLengthX: SVGAnimatedNumber;
-    kernelUnitLengthY: SVGAnimatedNumber;
-    surfaceScale: SVGAnimatedNumber;
+    readonly diffuseConstant: SVGAnimatedNumber;
+    readonly in1: SVGAnimatedString;
+    readonly kernelUnitLengthX: SVGAnimatedNumber;
+    readonly kernelUnitLengthY: SVGAnimatedNumber;
+    readonly surfaceScale: SVGAnimatedNumber;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -14326,32 +15556,32 @@ declare var SVGFEDiffuseLightingElement: {
 }
 
 interface SVGFEDisplacementMapElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    in2: SVGAnimatedString;
-    scale: SVGAnimatedNumber;
-    xChannelSelector: SVGAnimatedEnumeration;
-    yChannelSelector: SVGAnimatedEnumeration;
-    SVG_CHANNEL_A: number;
-    SVG_CHANNEL_B: number;
-    SVG_CHANNEL_G: number;
-    SVG_CHANNEL_R: number;
-    SVG_CHANNEL_UNKNOWN: number;
+    readonly in1: SVGAnimatedString;
+    readonly in2: SVGAnimatedString;
+    readonly scale: SVGAnimatedNumber;
+    readonly xChannelSelector: SVGAnimatedEnumeration;
+    readonly yChannelSelector: SVGAnimatedEnumeration;
+    readonly SVG_CHANNEL_A: number;
+    readonly SVG_CHANNEL_B: number;
+    readonly SVG_CHANNEL_G: number;
+    readonly SVG_CHANNEL_R: number;
+    readonly SVG_CHANNEL_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEDisplacementMapElement: {
     prototype: SVGFEDisplacementMapElement;
     new(): SVGFEDisplacementMapElement;
-    SVG_CHANNEL_A: number;
-    SVG_CHANNEL_B: number;
-    SVG_CHANNEL_G: number;
-    SVG_CHANNEL_R: number;
-    SVG_CHANNEL_UNKNOWN: number;
+    readonly SVG_CHANNEL_A: number;
+    readonly SVG_CHANNEL_B: number;
+    readonly SVG_CHANNEL_G: number;
+    readonly SVG_CHANNEL_R: number;
+    readonly SVG_CHANNEL_UNKNOWN: number;
 }
 
 interface SVGFEDistantLightElement extends SVGElement {
-    azimuth: SVGAnimatedNumber;
-    elevation: SVGAnimatedNumber;
+    readonly azimuth: SVGAnimatedNumber;
+    readonly elevation: SVGAnimatedNumber;
 }
 
 declare var SVGFEDistantLightElement: {
@@ -14401,9 +15631,9 @@ declare var SVGFEFuncRElement: {
 }
 
 interface SVGFEGaussianBlurElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    stdDeviationX: SVGAnimatedNumber;
-    stdDeviationY: SVGAnimatedNumber;
+    readonly in1: SVGAnimatedString;
+    readonly stdDeviationX: SVGAnimatedNumber;
+    readonly stdDeviationY: SVGAnimatedNumber;
     setStdDeviation(stdDeviationX: number, stdDeviationY: number): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
@@ -14414,7 +15644,7 @@ declare var SVGFEGaussianBlurElement: {
 }
 
 interface SVGFEImageElement extends SVGElement, SVGFilterPrimitiveStandardAttributes, SVGLangSpace, SVGURIReference, SVGExternalResourcesRequired {
-    preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
+    readonly preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -14433,7 +15663,7 @@ declare var SVGFEMergeElement: {
 }
 
 interface SVGFEMergeNodeElement extends SVGElement {
-    in1: SVGAnimatedString;
+    readonly in1: SVGAnimatedString;
 }
 
 declare var SVGFEMergeNodeElement: {
@@ -14442,28 +15672,28 @@ declare var SVGFEMergeNodeElement: {
 }
 
 interface SVGFEMorphologyElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    operator: SVGAnimatedEnumeration;
-    radiusX: SVGAnimatedNumber;
-    radiusY: SVGAnimatedNumber;
-    SVG_MORPHOLOGY_OPERATOR_DILATE: number;
-    SVG_MORPHOLOGY_OPERATOR_ERODE: number;
-    SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number;
+    readonly in1: SVGAnimatedString;
+    readonly operator: SVGAnimatedEnumeration;
+    readonly radiusX: SVGAnimatedNumber;
+    readonly radiusY: SVGAnimatedNumber;
+    readonly SVG_MORPHOLOGY_OPERATOR_DILATE: number;
+    readonly SVG_MORPHOLOGY_OPERATOR_ERODE: number;
+    readonly SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEMorphologyElement: {
     prototype: SVGFEMorphologyElement;
     new(): SVGFEMorphologyElement;
-    SVG_MORPHOLOGY_OPERATOR_DILATE: number;
-    SVG_MORPHOLOGY_OPERATOR_ERODE: number;
-    SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number;
+    readonly SVG_MORPHOLOGY_OPERATOR_DILATE: number;
+    readonly SVG_MORPHOLOGY_OPERATOR_ERODE: number;
+    readonly SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number;
 }
 
 interface SVGFEOffsetElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    dx: SVGAnimatedNumber;
-    dy: SVGAnimatedNumber;
-    in1: SVGAnimatedString;
+    readonly dx: SVGAnimatedNumber;
+    readonly dy: SVGAnimatedNumber;
+    readonly in1: SVGAnimatedString;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -14473,9 +15703,9 @@ declare var SVGFEOffsetElement: {
 }
 
 interface SVGFEPointLightElement extends SVGElement {
-    x: SVGAnimatedNumber;
-    y: SVGAnimatedNumber;
-    z: SVGAnimatedNumber;
+    readonly x: SVGAnimatedNumber;
+    readonly y: SVGAnimatedNumber;
+    readonly z: SVGAnimatedNumber;
 }
 
 declare var SVGFEPointLightElement: {
@@ -14484,12 +15714,12 @@ declare var SVGFEPointLightElement: {
 }
 
 interface SVGFESpecularLightingElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    kernelUnitLengthX: SVGAnimatedNumber;
-    kernelUnitLengthY: SVGAnimatedNumber;
-    specularConstant: SVGAnimatedNumber;
-    specularExponent: SVGAnimatedNumber;
-    surfaceScale: SVGAnimatedNumber;
+    readonly in1: SVGAnimatedString;
+    readonly kernelUnitLengthX: SVGAnimatedNumber;
+    readonly kernelUnitLengthY: SVGAnimatedNumber;
+    readonly specularConstant: SVGAnimatedNumber;
+    readonly specularExponent: SVGAnimatedNumber;
+    readonly surfaceScale: SVGAnimatedNumber;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -14499,14 +15729,14 @@ declare var SVGFESpecularLightingElement: {
 }
 
 interface SVGFESpotLightElement extends SVGElement {
-    limitingConeAngle: SVGAnimatedNumber;
-    pointsAtX: SVGAnimatedNumber;
-    pointsAtY: SVGAnimatedNumber;
-    pointsAtZ: SVGAnimatedNumber;
-    specularExponent: SVGAnimatedNumber;
-    x: SVGAnimatedNumber;
-    y: SVGAnimatedNumber;
-    z: SVGAnimatedNumber;
+    readonly limitingConeAngle: SVGAnimatedNumber;
+    readonly pointsAtX: SVGAnimatedNumber;
+    readonly pointsAtY: SVGAnimatedNumber;
+    readonly pointsAtZ: SVGAnimatedNumber;
+    readonly specularExponent: SVGAnimatedNumber;
+    readonly x: SVGAnimatedNumber;
+    readonly y: SVGAnimatedNumber;
+    readonly z: SVGAnimatedNumber;
 }
 
 declare var SVGFESpotLightElement: {
@@ -14515,7 +15745,7 @@ declare var SVGFESpotLightElement: {
 }
 
 interface SVGFETileElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
+    readonly in1: SVGAnimatedString;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -14525,41 +15755,41 @@ declare var SVGFETileElement: {
 }
 
 interface SVGFETurbulenceElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    baseFrequencyX: SVGAnimatedNumber;
-    baseFrequencyY: SVGAnimatedNumber;
-    numOctaves: SVGAnimatedInteger;
-    seed: SVGAnimatedNumber;
-    stitchTiles: SVGAnimatedEnumeration;
-    type: SVGAnimatedEnumeration;
-    SVG_STITCHTYPE_NOSTITCH: number;
-    SVG_STITCHTYPE_STITCH: number;
-    SVG_STITCHTYPE_UNKNOWN: number;
-    SVG_TURBULENCE_TYPE_FRACTALNOISE: number;
-    SVG_TURBULENCE_TYPE_TURBULENCE: number;
-    SVG_TURBULENCE_TYPE_UNKNOWN: number;
+    readonly baseFrequencyX: SVGAnimatedNumber;
+    readonly baseFrequencyY: SVGAnimatedNumber;
+    readonly numOctaves: SVGAnimatedInteger;
+    readonly seed: SVGAnimatedNumber;
+    readonly stitchTiles: SVGAnimatedEnumeration;
+    readonly type: SVGAnimatedEnumeration;
+    readonly SVG_STITCHTYPE_NOSTITCH: number;
+    readonly SVG_STITCHTYPE_STITCH: number;
+    readonly SVG_STITCHTYPE_UNKNOWN: number;
+    readonly SVG_TURBULENCE_TYPE_FRACTALNOISE: number;
+    readonly SVG_TURBULENCE_TYPE_TURBULENCE: number;
+    readonly SVG_TURBULENCE_TYPE_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFETurbulenceElement: {
     prototype: SVGFETurbulenceElement;
     new(): SVGFETurbulenceElement;
-    SVG_STITCHTYPE_NOSTITCH: number;
-    SVG_STITCHTYPE_STITCH: number;
-    SVG_STITCHTYPE_UNKNOWN: number;
-    SVG_TURBULENCE_TYPE_FRACTALNOISE: number;
-    SVG_TURBULENCE_TYPE_TURBULENCE: number;
-    SVG_TURBULENCE_TYPE_UNKNOWN: number;
+    readonly SVG_STITCHTYPE_NOSTITCH: number;
+    readonly SVG_STITCHTYPE_STITCH: number;
+    readonly SVG_STITCHTYPE_UNKNOWN: number;
+    readonly SVG_TURBULENCE_TYPE_FRACTALNOISE: number;
+    readonly SVG_TURBULENCE_TYPE_TURBULENCE: number;
+    readonly SVG_TURBULENCE_TYPE_UNKNOWN: number;
 }
 
 interface SVGFilterElement extends SVGElement, SVGUnitTypes, SVGStylable, SVGLangSpace, SVGURIReference, SVGExternalResourcesRequired {
-    filterResX: SVGAnimatedInteger;
-    filterResY: SVGAnimatedInteger;
-    filterUnits: SVGAnimatedEnumeration;
-    height: SVGAnimatedLength;
-    primitiveUnits: SVGAnimatedEnumeration;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly filterResX: SVGAnimatedInteger;
+    readonly filterResY: SVGAnimatedInteger;
+    readonly filterUnits: SVGAnimatedEnumeration;
+    readonly height: SVGAnimatedLength;
+    readonly primitiveUnits: SVGAnimatedEnumeration;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     setFilterRes(filterResX: number, filterResY: number): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
@@ -14570,10 +15800,10 @@ declare var SVGFilterElement: {
 }
 
 interface SVGForeignObjectElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    height: SVGAnimatedLength;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly height: SVGAnimatedLength;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -14592,31 +15822,31 @@ declare var SVGGElement: {
 }
 
 interface SVGGradientElement extends SVGElement, SVGStylable, SVGExternalResourcesRequired, SVGURIReference, SVGUnitTypes {
-    gradientTransform: SVGAnimatedTransformList;
-    gradientUnits: SVGAnimatedEnumeration;
-    spreadMethod: SVGAnimatedEnumeration;
-    SVG_SPREADMETHOD_PAD: number;
-    SVG_SPREADMETHOD_REFLECT: number;
-    SVG_SPREADMETHOD_REPEAT: number;
-    SVG_SPREADMETHOD_UNKNOWN: number;
+    readonly gradientTransform: SVGAnimatedTransformList;
+    readonly gradientUnits: SVGAnimatedEnumeration;
+    readonly spreadMethod: SVGAnimatedEnumeration;
+    readonly SVG_SPREADMETHOD_PAD: number;
+    readonly SVG_SPREADMETHOD_REFLECT: number;
+    readonly SVG_SPREADMETHOD_REPEAT: number;
+    readonly SVG_SPREADMETHOD_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGGradientElement: {
     prototype: SVGGradientElement;
     new(): SVGGradientElement;
-    SVG_SPREADMETHOD_PAD: number;
-    SVG_SPREADMETHOD_REFLECT: number;
-    SVG_SPREADMETHOD_REPEAT: number;
-    SVG_SPREADMETHOD_UNKNOWN: number;
+    readonly SVG_SPREADMETHOD_PAD: number;
+    readonly SVG_SPREADMETHOD_REFLECT: number;
+    readonly SVG_SPREADMETHOD_REPEAT: number;
+    readonly SVG_SPREADMETHOD_UNKNOWN: number;
 }
 
 interface SVGImageElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference {
-    height: SVGAnimatedLength;
-    preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly height: SVGAnimatedLength;
+    readonly preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -14626,43 +15856,43 @@ declare var SVGImageElement: {
 }
 
 interface SVGLength {
-    unitType: number;
+    readonly unitType: number;
     value: number;
     valueAsString: string;
     valueInSpecifiedUnits: number;
     convertToSpecifiedUnits(unitType: number): void;
     newValueSpecifiedUnits(unitType: number, valueInSpecifiedUnits: number): void;
-    SVG_LENGTHTYPE_CM: number;
-    SVG_LENGTHTYPE_EMS: number;
-    SVG_LENGTHTYPE_EXS: number;
-    SVG_LENGTHTYPE_IN: number;
-    SVG_LENGTHTYPE_MM: number;
-    SVG_LENGTHTYPE_NUMBER: number;
-    SVG_LENGTHTYPE_PC: number;
-    SVG_LENGTHTYPE_PERCENTAGE: number;
-    SVG_LENGTHTYPE_PT: number;
-    SVG_LENGTHTYPE_PX: number;
-    SVG_LENGTHTYPE_UNKNOWN: number;
+    readonly SVG_LENGTHTYPE_CM: number;
+    readonly SVG_LENGTHTYPE_EMS: number;
+    readonly SVG_LENGTHTYPE_EXS: number;
+    readonly SVG_LENGTHTYPE_IN: number;
+    readonly SVG_LENGTHTYPE_MM: number;
+    readonly SVG_LENGTHTYPE_NUMBER: number;
+    readonly SVG_LENGTHTYPE_PC: number;
+    readonly SVG_LENGTHTYPE_PERCENTAGE: number;
+    readonly SVG_LENGTHTYPE_PT: number;
+    readonly SVG_LENGTHTYPE_PX: number;
+    readonly SVG_LENGTHTYPE_UNKNOWN: number;
 }
 
 declare var SVGLength: {
     prototype: SVGLength;
     new(): SVGLength;
-    SVG_LENGTHTYPE_CM: number;
-    SVG_LENGTHTYPE_EMS: number;
-    SVG_LENGTHTYPE_EXS: number;
-    SVG_LENGTHTYPE_IN: number;
-    SVG_LENGTHTYPE_MM: number;
-    SVG_LENGTHTYPE_NUMBER: number;
-    SVG_LENGTHTYPE_PC: number;
-    SVG_LENGTHTYPE_PERCENTAGE: number;
-    SVG_LENGTHTYPE_PT: number;
-    SVG_LENGTHTYPE_PX: number;
-    SVG_LENGTHTYPE_UNKNOWN: number;
+    readonly SVG_LENGTHTYPE_CM: number;
+    readonly SVG_LENGTHTYPE_EMS: number;
+    readonly SVG_LENGTHTYPE_EXS: number;
+    readonly SVG_LENGTHTYPE_IN: number;
+    readonly SVG_LENGTHTYPE_MM: number;
+    readonly SVG_LENGTHTYPE_NUMBER: number;
+    readonly SVG_LENGTHTYPE_PC: number;
+    readonly SVG_LENGTHTYPE_PERCENTAGE: number;
+    readonly SVG_LENGTHTYPE_PT: number;
+    readonly SVG_LENGTHTYPE_PX: number;
+    readonly SVG_LENGTHTYPE_UNKNOWN: number;
 }
 
 interface SVGLengthList {
-    numberOfItems: number;
+    readonly numberOfItems: number;
     appendItem(newItem: SVGLength): SVGLength;
     clear(): void;
     getItem(index: number): SVGLength;
@@ -14678,10 +15908,10 @@ declare var SVGLengthList: {
 }
 
 interface SVGLineElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    x1: SVGAnimatedLength;
-    x2: SVGAnimatedLength;
-    y1: SVGAnimatedLength;
-    y2: SVGAnimatedLength;
+    readonly x1: SVGAnimatedLength;
+    readonly x2: SVGAnimatedLength;
+    readonly y1: SVGAnimatedLength;
+    readonly y2: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -14691,10 +15921,10 @@ declare var SVGLineElement: {
 }
 
 interface SVGLinearGradientElement extends SVGGradientElement {
-    x1: SVGAnimatedLength;
-    x2: SVGAnimatedLength;
-    y1: SVGAnimatedLength;
-    y2: SVGAnimatedLength;
+    readonly x1: SVGAnimatedLength;
+    readonly x2: SVGAnimatedLength;
+    readonly y1: SVGAnimatedLength;
+    readonly y2: SVGAnimatedLength;
 }
 
 declare var SVGLinearGradientElement: {
@@ -14703,42 +15933,42 @@ declare var SVGLinearGradientElement: {
 }
 
 interface SVGMarkerElement extends SVGElement, SVGStylable, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox {
-    markerHeight: SVGAnimatedLength;
-    markerUnits: SVGAnimatedEnumeration;
-    markerWidth: SVGAnimatedLength;
-    orientAngle: SVGAnimatedAngle;
-    orientType: SVGAnimatedEnumeration;
-    refX: SVGAnimatedLength;
-    refY: SVGAnimatedLength;
+    readonly markerHeight: SVGAnimatedLength;
+    readonly markerUnits: SVGAnimatedEnumeration;
+    readonly markerWidth: SVGAnimatedLength;
+    readonly orientAngle: SVGAnimatedAngle;
+    readonly orientType: SVGAnimatedEnumeration;
+    readonly refX: SVGAnimatedLength;
+    readonly refY: SVGAnimatedLength;
     setOrientToAngle(angle: SVGAngle): void;
     setOrientToAuto(): void;
-    SVG_MARKERUNITS_STROKEWIDTH: number;
-    SVG_MARKERUNITS_UNKNOWN: number;
-    SVG_MARKERUNITS_USERSPACEONUSE: number;
-    SVG_MARKER_ORIENT_ANGLE: number;
-    SVG_MARKER_ORIENT_AUTO: number;
-    SVG_MARKER_ORIENT_UNKNOWN: number;
+    readonly SVG_MARKERUNITS_STROKEWIDTH: number;
+    readonly SVG_MARKERUNITS_UNKNOWN: number;
+    readonly SVG_MARKERUNITS_USERSPACEONUSE: number;
+    readonly SVG_MARKER_ORIENT_ANGLE: number;
+    readonly SVG_MARKER_ORIENT_AUTO: number;
+    readonly SVG_MARKER_ORIENT_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGMarkerElement: {
     prototype: SVGMarkerElement;
     new(): SVGMarkerElement;
-    SVG_MARKERUNITS_STROKEWIDTH: number;
-    SVG_MARKERUNITS_UNKNOWN: number;
-    SVG_MARKERUNITS_USERSPACEONUSE: number;
-    SVG_MARKER_ORIENT_ANGLE: number;
-    SVG_MARKER_ORIENT_AUTO: number;
-    SVG_MARKER_ORIENT_UNKNOWN: number;
+    readonly SVG_MARKERUNITS_STROKEWIDTH: number;
+    readonly SVG_MARKERUNITS_UNKNOWN: number;
+    readonly SVG_MARKERUNITS_USERSPACEONUSE: number;
+    readonly SVG_MARKER_ORIENT_ANGLE: number;
+    readonly SVG_MARKER_ORIENT_AUTO: number;
+    readonly SVG_MARKER_ORIENT_UNKNOWN: number;
 }
 
 interface SVGMaskElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGUnitTypes {
-    height: SVGAnimatedLength;
-    maskContentUnits: SVGAnimatedEnumeration;
-    maskUnits: SVGAnimatedEnumeration;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly height: SVGAnimatedLength;
+    readonly maskContentUnits: SVGAnimatedEnumeration;
+    readonly maskUnits: SVGAnimatedEnumeration;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -14790,7 +16020,7 @@ declare var SVGNumber: {
 }
 
 interface SVGNumberList {
-    numberOfItems: number;
+    readonly numberOfItems: number;
     appendItem(newItem: SVGNumber): SVGNumber;
     clear(): void;
     getItem(index: number): SVGNumber;
@@ -14837,53 +16067,53 @@ declare var SVGPathElement: {
 }
 
 interface SVGPathSeg {
-    pathSegType: number;
-    pathSegTypeAsLetter: string;
-    PATHSEG_ARC_ABS: number;
-    PATHSEG_ARC_REL: number;
-    PATHSEG_CLOSEPATH: number;
-    PATHSEG_CURVETO_CUBIC_ABS: number;
-    PATHSEG_CURVETO_CUBIC_REL: number;
-    PATHSEG_CURVETO_CUBIC_SMOOTH_ABS: number;
-    PATHSEG_CURVETO_CUBIC_SMOOTH_REL: number;
-    PATHSEG_CURVETO_QUADRATIC_ABS: number;
-    PATHSEG_CURVETO_QUADRATIC_REL: number;
-    PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS: number;
-    PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL: number;
-    PATHSEG_LINETO_ABS: number;
-    PATHSEG_LINETO_HORIZONTAL_ABS: number;
-    PATHSEG_LINETO_HORIZONTAL_REL: number;
-    PATHSEG_LINETO_REL: number;
-    PATHSEG_LINETO_VERTICAL_ABS: number;
-    PATHSEG_LINETO_VERTICAL_REL: number;
-    PATHSEG_MOVETO_ABS: number;
-    PATHSEG_MOVETO_REL: number;
-    PATHSEG_UNKNOWN: number;
+    readonly pathSegType: number;
+    readonly pathSegTypeAsLetter: string;
+    readonly PATHSEG_ARC_ABS: number;
+    readonly PATHSEG_ARC_REL: number;
+    readonly PATHSEG_CLOSEPATH: number;
+    readonly PATHSEG_CURVETO_CUBIC_ABS: number;
+    readonly PATHSEG_CURVETO_CUBIC_REL: number;
+    readonly PATHSEG_CURVETO_CUBIC_SMOOTH_ABS: number;
+    readonly PATHSEG_CURVETO_CUBIC_SMOOTH_REL: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_ABS: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_REL: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL: number;
+    readonly PATHSEG_LINETO_ABS: number;
+    readonly PATHSEG_LINETO_HORIZONTAL_ABS: number;
+    readonly PATHSEG_LINETO_HORIZONTAL_REL: number;
+    readonly PATHSEG_LINETO_REL: number;
+    readonly PATHSEG_LINETO_VERTICAL_ABS: number;
+    readonly PATHSEG_LINETO_VERTICAL_REL: number;
+    readonly PATHSEG_MOVETO_ABS: number;
+    readonly PATHSEG_MOVETO_REL: number;
+    readonly PATHSEG_UNKNOWN: number;
 }
 
 declare var SVGPathSeg: {
     prototype: SVGPathSeg;
     new(): SVGPathSeg;
-    PATHSEG_ARC_ABS: number;
-    PATHSEG_ARC_REL: number;
-    PATHSEG_CLOSEPATH: number;
-    PATHSEG_CURVETO_CUBIC_ABS: number;
-    PATHSEG_CURVETO_CUBIC_REL: number;
-    PATHSEG_CURVETO_CUBIC_SMOOTH_ABS: number;
-    PATHSEG_CURVETO_CUBIC_SMOOTH_REL: number;
-    PATHSEG_CURVETO_QUADRATIC_ABS: number;
-    PATHSEG_CURVETO_QUADRATIC_REL: number;
-    PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS: number;
-    PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL: number;
-    PATHSEG_LINETO_ABS: number;
-    PATHSEG_LINETO_HORIZONTAL_ABS: number;
-    PATHSEG_LINETO_HORIZONTAL_REL: number;
-    PATHSEG_LINETO_REL: number;
-    PATHSEG_LINETO_VERTICAL_ABS: number;
-    PATHSEG_LINETO_VERTICAL_REL: number;
-    PATHSEG_MOVETO_ABS: number;
-    PATHSEG_MOVETO_REL: number;
-    PATHSEG_UNKNOWN: number;
+    readonly PATHSEG_ARC_ABS: number;
+    readonly PATHSEG_ARC_REL: number;
+    readonly PATHSEG_CLOSEPATH: number;
+    readonly PATHSEG_CURVETO_CUBIC_ABS: number;
+    readonly PATHSEG_CURVETO_CUBIC_REL: number;
+    readonly PATHSEG_CURVETO_CUBIC_SMOOTH_ABS: number;
+    readonly PATHSEG_CURVETO_CUBIC_SMOOTH_REL: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_ABS: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_REL: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL: number;
+    readonly PATHSEG_LINETO_ABS: number;
+    readonly PATHSEG_LINETO_HORIZONTAL_ABS: number;
+    readonly PATHSEG_LINETO_HORIZONTAL_REL: number;
+    readonly PATHSEG_LINETO_REL: number;
+    readonly PATHSEG_LINETO_VERTICAL_ABS: number;
+    readonly PATHSEG_LINETO_VERTICAL_REL: number;
+    readonly PATHSEG_MOVETO_ABS: number;
+    readonly PATHSEG_MOVETO_REL: number;
+    readonly PATHSEG_UNKNOWN: number;
 }
 
 interface SVGPathSegArcAbs extends SVGPathSeg {
@@ -15077,7 +16307,7 @@ declare var SVGPathSegLinetoVerticalRel: {
 }
 
 interface SVGPathSegList {
-    numberOfItems: number;
+    readonly numberOfItems: number;
     appendItem(newItem: SVGPathSeg): SVGPathSeg;
     clear(): void;
     getItem(index: number): SVGPathSeg;
@@ -15113,13 +16343,13 @@ declare var SVGPathSegMovetoRel: {
 }
 
 interface SVGPatternElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox, SVGURIReference, SVGUnitTypes {
-    height: SVGAnimatedLength;
-    patternContentUnits: SVGAnimatedEnumeration;
-    patternTransform: SVGAnimatedTransformList;
-    patternUnits: SVGAnimatedEnumeration;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly height: SVGAnimatedLength;
+    readonly patternContentUnits: SVGAnimatedEnumeration;
+    readonly patternTransform: SVGAnimatedTransformList;
+    readonly patternUnits: SVGAnimatedEnumeration;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -15140,7 +16370,7 @@ declare var SVGPoint: {
 }
 
 interface SVGPointList {
-    numberOfItems: number;
+    readonly numberOfItems: number;
     appendItem(newItem: SVGPoint): SVGPoint;
     clear(): void;
     getItem(index: number): SVGPoint;
@@ -15176,47 +16406,47 @@ declare var SVGPolylineElement: {
 interface SVGPreserveAspectRatio {
     align: number;
     meetOrSlice: number;
-    SVG_MEETORSLICE_MEET: number;
-    SVG_MEETORSLICE_SLICE: number;
-    SVG_MEETORSLICE_UNKNOWN: number;
-    SVG_PRESERVEASPECTRATIO_NONE: number;
-    SVG_PRESERVEASPECTRATIO_UNKNOWN: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMIN: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMIN: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMIN: number;
+    readonly SVG_MEETORSLICE_MEET: number;
+    readonly SVG_MEETORSLICE_SLICE: number;
+    readonly SVG_MEETORSLICE_UNKNOWN: number;
+    readonly SVG_PRESERVEASPECTRATIO_NONE: number;
+    readonly SVG_PRESERVEASPECTRATIO_UNKNOWN: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMAXYMAX: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMAXYMID: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMAXYMIN: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMIDYMAX: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMIDYMID: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMIDYMIN: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMINYMAX: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMINYMID: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMINYMIN: number;
 }
 
 declare var SVGPreserveAspectRatio: {
     prototype: SVGPreserveAspectRatio;
     new(): SVGPreserveAspectRatio;
-    SVG_MEETORSLICE_MEET: number;
-    SVG_MEETORSLICE_SLICE: number;
-    SVG_MEETORSLICE_UNKNOWN: number;
-    SVG_PRESERVEASPECTRATIO_NONE: number;
-    SVG_PRESERVEASPECTRATIO_UNKNOWN: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMIN: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMIN: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMIN: number;
+    readonly SVG_MEETORSLICE_MEET: number;
+    readonly SVG_MEETORSLICE_SLICE: number;
+    readonly SVG_MEETORSLICE_UNKNOWN: number;
+    readonly SVG_PRESERVEASPECTRATIO_NONE: number;
+    readonly SVG_PRESERVEASPECTRATIO_UNKNOWN: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMAXYMAX: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMAXYMID: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMAXYMIN: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMIDYMAX: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMIDYMID: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMIDYMIN: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMINYMAX: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMINYMID: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMINYMIN: number;
 }
 
 interface SVGRadialGradientElement extends SVGGradientElement {
-    cx: SVGAnimatedLength;
-    cy: SVGAnimatedLength;
-    fx: SVGAnimatedLength;
-    fy: SVGAnimatedLength;
-    r: SVGAnimatedLength;
+    readonly cx: SVGAnimatedLength;
+    readonly cy: SVGAnimatedLength;
+    readonly fx: SVGAnimatedLength;
+    readonly fy: SVGAnimatedLength;
+    readonly r: SVGAnimatedLength;
 }
 
 declare var SVGRadialGradientElement: {
@@ -15237,12 +16467,12 @@ declare var SVGRect: {
 }
 
 interface SVGRectElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    height: SVGAnimatedLength;
-    rx: SVGAnimatedLength;
-    ry: SVGAnimatedLength;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly height: SVGAnimatedLength;
+    readonly rx: SVGAnimatedLength;
+    readonly ry: SVGAnimatedLength;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -15255,22 +16485,22 @@ interface SVGSVGElement extends SVGElement, DocumentEvent, SVGLocatable, SVGTest
     contentScriptType: string;
     contentStyleType: string;
     currentScale: number;
-    currentTranslate: SVGPoint;
-    height: SVGAnimatedLength;
+    readonly currentTranslate: SVGPoint;
+    readonly height: SVGAnimatedLength;
     onabort: (ev: Event) => any;
     onerror: (ev: Event) => any;
     onresize: (ev: UIEvent) => any;
     onscroll: (ev: UIEvent) => any;
     onunload: (ev: Event) => any;
     onzoom: (ev: SVGZoomEvent) => any;
-    pixelUnitToMillimeterX: number;
-    pixelUnitToMillimeterY: number;
-    screenPixelToMillimeterX: number;
-    screenPixelToMillimeterY: number;
-    viewport: SVGRect;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly pixelUnitToMillimeterX: number;
+    readonly pixelUnitToMillimeterY: number;
+    readonly screenPixelToMillimeterX: number;
+    readonly screenPixelToMillimeterY: number;
+    readonly viewport: SVGRect;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     checkEnclosure(element: SVGElement, rect: SVGRect): boolean;
     checkIntersection(element: SVGElement, rect: SVGRect): boolean;
     createSVGAngle(): SVGAngle;
@@ -15286,8 +16516,8 @@ interface SVGSVGElement extends SVGElement, DocumentEvent, SVGLocatable, SVGTest
     getComputedStyle(elt: Element, pseudoElt?: string): CSSStyleDeclaration;
     getCurrentTime(): number;
     getElementById(elementId: string): Element;
-    getEnclosureList(rect: SVGRect, referenceElement: SVGElement): NodeList;
-    getIntersectionList(rect: SVGRect, referenceElement: SVGElement): NodeList;
+    getEnclosureList(rect: SVGRect, referenceElement: SVGElement): NodeListOf<SVGCircleElement | SVGEllipseElement | SVGImageElement | SVGLineElement | SVGPathElement | SVGPolygonElement | SVGPolylineElement | SVGRectElement | SVGTextElement | SVGUseElement>;
+    getIntersectionList(rect: SVGRect, referenceElement: SVGElement): NodeListOf<SVGCircleElement | SVGEllipseElement | SVGImageElement | SVGLineElement | SVGPathElement | SVGPolygonElement | SVGPolylineElement | SVGRectElement | SVGTextElement | SVGUseElement>;
     pauseAnimations(): void;
     setCurrentTime(seconds: number): void;
     suspendRedraw(maxWaitMilliseconds: number): number;
@@ -15365,7 +16595,7 @@ declare var SVGScriptElement: {
 }
 
 interface SVGStopElement extends SVGElement, SVGStylable {
-    offset: SVGAnimatedNumber;
+    readonly offset: SVGAnimatedNumber;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -15375,7 +16605,7 @@ declare var SVGStopElement: {
 }
 
 interface SVGStringList {
-    numberOfItems: number;
+    readonly numberOfItems: number;
     appendItem(newItem: string): string;
     clear(): void;
     getItem(index: number): string;
@@ -15391,6 +16621,7 @@ declare var SVGStringList: {
 }
 
 interface SVGStyleElement extends SVGElement, SVGLangSpace {
+    disabled: boolean;
     media: string;
     title: string;
     type: string;
@@ -15429,8 +16660,8 @@ declare var SVGTSpanElement: {
 }
 
 interface SVGTextContentElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    lengthAdjust: SVGAnimatedEnumeration;
-    textLength: SVGAnimatedLength;
+    readonly lengthAdjust: SVGAnimatedEnumeration;
+    readonly textLength: SVGAnimatedLength;
     getCharNumAtPosition(point: SVGPoint): number;
     getComputedTextLength(): number;
     getEndPositionOfChar(charnum: number): SVGPoint;
@@ -15440,18 +16671,18 @@ interface SVGTextContentElement extends SVGElement, SVGStylable, SVGTests, SVGLa
     getStartPositionOfChar(charnum: number): SVGPoint;
     getSubStringLength(charnum: number, nchars: number): number;
     selectSubString(charnum: number, nchars: number): void;
-    LENGTHADJUST_SPACING: number;
-    LENGTHADJUST_SPACINGANDGLYPHS: number;
-    LENGTHADJUST_UNKNOWN: number;
+    readonly LENGTHADJUST_SPACING: number;
+    readonly LENGTHADJUST_SPACINGANDGLYPHS: number;
+    readonly LENGTHADJUST_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGTextContentElement: {
     prototype: SVGTextContentElement;
     new(): SVGTextContentElement;
-    LENGTHADJUST_SPACING: number;
-    LENGTHADJUST_SPACINGANDGLYPHS: number;
-    LENGTHADJUST_UNKNOWN: number;
+    readonly LENGTHADJUST_SPACING: number;
+    readonly LENGTHADJUST_SPACINGANDGLYPHS: number;
+    readonly LENGTHADJUST_UNKNOWN: number;
 }
 
 interface SVGTextElement extends SVGTextPositioningElement, SVGTransformable {
@@ -15464,35 +16695,35 @@ declare var SVGTextElement: {
 }
 
 interface SVGTextPathElement extends SVGTextContentElement, SVGURIReference {
-    method: SVGAnimatedEnumeration;
-    spacing: SVGAnimatedEnumeration;
-    startOffset: SVGAnimatedLength;
-    TEXTPATH_METHODTYPE_ALIGN: number;
-    TEXTPATH_METHODTYPE_STRETCH: number;
-    TEXTPATH_METHODTYPE_UNKNOWN: number;
-    TEXTPATH_SPACINGTYPE_AUTO: number;
-    TEXTPATH_SPACINGTYPE_EXACT: number;
-    TEXTPATH_SPACINGTYPE_UNKNOWN: number;
+    readonly method: SVGAnimatedEnumeration;
+    readonly spacing: SVGAnimatedEnumeration;
+    readonly startOffset: SVGAnimatedLength;
+    readonly TEXTPATH_METHODTYPE_ALIGN: number;
+    readonly TEXTPATH_METHODTYPE_STRETCH: number;
+    readonly TEXTPATH_METHODTYPE_UNKNOWN: number;
+    readonly TEXTPATH_SPACINGTYPE_AUTO: number;
+    readonly TEXTPATH_SPACINGTYPE_EXACT: number;
+    readonly TEXTPATH_SPACINGTYPE_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGTextPathElement: {
     prototype: SVGTextPathElement;
     new(): SVGTextPathElement;
-    TEXTPATH_METHODTYPE_ALIGN: number;
-    TEXTPATH_METHODTYPE_STRETCH: number;
-    TEXTPATH_METHODTYPE_UNKNOWN: number;
-    TEXTPATH_SPACINGTYPE_AUTO: number;
-    TEXTPATH_SPACINGTYPE_EXACT: number;
-    TEXTPATH_SPACINGTYPE_UNKNOWN: number;
+    readonly TEXTPATH_METHODTYPE_ALIGN: number;
+    readonly TEXTPATH_METHODTYPE_STRETCH: number;
+    readonly TEXTPATH_METHODTYPE_UNKNOWN: number;
+    readonly TEXTPATH_SPACINGTYPE_AUTO: number;
+    readonly TEXTPATH_SPACINGTYPE_EXACT: number;
+    readonly TEXTPATH_SPACINGTYPE_UNKNOWN: number;
 }
 
 interface SVGTextPositioningElement extends SVGTextContentElement {
-    dx: SVGAnimatedLengthList;
-    dy: SVGAnimatedLengthList;
-    rotate: SVGAnimatedNumberList;
-    x: SVGAnimatedLengthList;
-    y: SVGAnimatedLengthList;
+    readonly dx: SVGAnimatedLengthList;
+    readonly dy: SVGAnimatedLengthList;
+    readonly rotate: SVGAnimatedNumberList;
+    readonly x: SVGAnimatedLengthList;
+    readonly y: SVGAnimatedLengthList;
 }
 
 declare var SVGTextPositioningElement: {
@@ -15510,38 +16741,38 @@ declare var SVGTitleElement: {
 }
 
 interface SVGTransform {
-    angle: number;
-    matrix: SVGMatrix;
-    type: number;
+    readonly angle: number;
+    readonly matrix: SVGMatrix;
+    readonly type: number;
     setMatrix(matrix: SVGMatrix): void;
     setRotate(angle: number, cx: number, cy: number): void;
     setScale(sx: number, sy: number): void;
     setSkewX(angle: number): void;
     setSkewY(angle: number): void;
     setTranslate(tx: number, ty: number): void;
-    SVG_TRANSFORM_MATRIX: number;
-    SVG_TRANSFORM_ROTATE: number;
-    SVG_TRANSFORM_SCALE: number;
-    SVG_TRANSFORM_SKEWX: number;
-    SVG_TRANSFORM_SKEWY: number;
-    SVG_TRANSFORM_TRANSLATE: number;
-    SVG_TRANSFORM_UNKNOWN: number;
+    readonly SVG_TRANSFORM_MATRIX: number;
+    readonly SVG_TRANSFORM_ROTATE: number;
+    readonly SVG_TRANSFORM_SCALE: number;
+    readonly SVG_TRANSFORM_SKEWX: number;
+    readonly SVG_TRANSFORM_SKEWY: number;
+    readonly SVG_TRANSFORM_TRANSLATE: number;
+    readonly SVG_TRANSFORM_UNKNOWN: number;
 }
 
 declare var SVGTransform: {
     prototype: SVGTransform;
     new(): SVGTransform;
-    SVG_TRANSFORM_MATRIX: number;
-    SVG_TRANSFORM_ROTATE: number;
-    SVG_TRANSFORM_SCALE: number;
-    SVG_TRANSFORM_SKEWX: number;
-    SVG_TRANSFORM_SKEWY: number;
-    SVG_TRANSFORM_TRANSLATE: number;
-    SVG_TRANSFORM_UNKNOWN: number;
+    readonly SVG_TRANSFORM_MATRIX: number;
+    readonly SVG_TRANSFORM_ROTATE: number;
+    readonly SVG_TRANSFORM_SCALE: number;
+    readonly SVG_TRANSFORM_SKEWX: number;
+    readonly SVG_TRANSFORM_SKEWY: number;
+    readonly SVG_TRANSFORM_TRANSLATE: number;
+    readonly SVG_TRANSFORM_UNKNOWN: number;
 }
 
 interface SVGTransformList {
-    numberOfItems: number;
+    readonly numberOfItems: number;
     appendItem(newItem: SVGTransform): SVGTransform;
     clear(): void;
     consolidate(): SVGTransform;
@@ -15559,19 +16790,19 @@ declare var SVGTransformList: {
 }
 
 interface SVGUnitTypes {
-    SVG_UNIT_TYPE_OBJECTBOUNDINGBOX: number;
-    SVG_UNIT_TYPE_UNKNOWN: number;
-    SVG_UNIT_TYPE_USERSPACEONUSE: number;
+    readonly SVG_UNIT_TYPE_OBJECTBOUNDINGBOX: number;
+    readonly SVG_UNIT_TYPE_UNKNOWN: number;
+    readonly SVG_UNIT_TYPE_USERSPACEONUSE: number;
 }
 declare var SVGUnitTypes: SVGUnitTypes;
 
 interface SVGUseElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference {
-    animatedInstanceRoot: SVGElementInstance;
-    height: SVGAnimatedLength;
-    instanceRoot: SVGElementInstance;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly animatedInstanceRoot: SVGElementInstance;
+    readonly height: SVGAnimatedLength;
+    readonly instanceRoot: SVGElementInstance;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -15581,7 +16812,7 @@ declare var SVGUseElement: {
 }
 
 interface SVGViewElement extends SVGElement, SVGExternalResourcesRequired, SVGFitToViewBox, SVGZoomAndPan {
-    viewTarget: SVGStringList;
+    readonly viewTarget: SVGStringList;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -15591,18 +16822,21 @@ declare var SVGViewElement: {
 }
 
 interface SVGZoomAndPan {
-    SVG_ZOOMANDPAN_DISABLE: number;
-    SVG_ZOOMANDPAN_MAGNIFY: number;
-    SVG_ZOOMANDPAN_UNKNOWN: number;
+    readonly zoomAndPan: number;
+}
+
+declare var SVGZoomAndPan: {
+    readonly SVG_ZOOMANDPAN_DISABLE: number;
+    readonly SVG_ZOOMANDPAN_MAGNIFY: number;
+    readonly SVG_ZOOMANDPAN_UNKNOWN: number;
 }
-declare var SVGZoomAndPan: SVGZoomAndPan;
 
 interface SVGZoomEvent extends UIEvent {
-    newScale: number;
-    newTranslate: SVGPoint;
-    previousScale: number;
-    previousTranslate: SVGPoint;
-    zoomRectScreen: SVGRect;
+    readonly newScale: number;
+    readonly newTranslate: SVGPoint;
+    readonly previousScale: number;
+    readonly previousTranslate: SVGPoint;
+    readonly zoomRectScreen: SVGRect;
 }
 
 declare var SVGZoomEvent: {
@@ -15611,22 +16845,22 @@ declare var SVGZoomEvent: {
 }
 
 interface Screen extends EventTarget {
-    availHeight: number;
-    availWidth: number;
+    readonly availHeight: number;
+    readonly availWidth: number;
     bufferDepth: number;
-    colorDepth: number;
-    deviceXDPI: number;
-    deviceYDPI: number;
-    fontSmoothingEnabled: boolean;
-    height: number;
-    logicalXDPI: number;
-    logicalYDPI: number;
-    msOrientation: string;
+    readonly colorDepth: number;
+    readonly deviceXDPI: number;
+    readonly deviceYDPI: number;
+    readonly fontSmoothingEnabled: boolean;
+    readonly height: number;
+    readonly logicalXDPI: number;
+    readonly logicalYDPI: number;
+    readonly msOrientation: string;
     onmsorientationchange: (ev: Event) => any;
-    pixelDepth: number;
-    systemXDPI: number;
-    systemYDPI: number;
-    width: number;
+    readonly pixelDepth: number;
+    readonly systemXDPI: number;
+    readonly systemYDPI: number;
+    readonly width: number;
     msLockOrientation(orientations: string | string[]): boolean;
     msUnlockOrientation(): void;
     addEventListener(type: "MSOrientationChange", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -15639,8 +16873,8 @@ declare var Screen: {
 }
 
 interface ScriptNotifyEvent extends Event {
-    callingUri: string;
-    value: string;
+    readonly callingUri: string;
+    readonly value: string;
 }
 
 declare var ScriptNotifyEvent: {
@@ -15649,7 +16883,7 @@ declare var ScriptNotifyEvent: {
 }
 
 interface ScriptProcessorNode extends AudioNode {
-    bufferSize: number;
+    readonly bufferSize: number;
     onaudioprocess: (ev: AudioProcessingEvent) => any;
     addEventListener(type: "audioprocess", listener: (ev: AudioProcessingEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -15661,13 +16895,13 @@ declare var ScriptProcessorNode: {
 }
 
 interface Selection {
-    anchorNode: Node;
-    anchorOffset: number;
-    focusNode: Node;
-    focusOffset: number;
-    isCollapsed: boolean;
-    rangeCount: number;
-    type: string;
+    readonly anchorNode: Node;
+    readonly anchorOffset: number;
+    readonly focusNode: Node;
+    readonly focusOffset: number;
+    readonly isCollapsed: boolean;
+    readonly rangeCount: number;
+    readonly type: string;
     addRange(range: Range): void;
     collapse(parentNode: Node, offset: number): void;
     collapseToEnd(): void;
@@ -15692,12 +16926,12 @@ declare var Selection: {
 interface SourceBuffer extends EventTarget {
     appendWindowEnd: number;
     appendWindowStart: number;
-    audioTracks: AudioTrackList;
-    buffered: TimeRanges;
+    readonly audioTracks: AudioTrackList;
+    readonly buffered: TimeRanges;
     mode: string;
     timestampOffset: number;
-    updating: boolean;
-    videoTracks: VideoTrackList;
+    readonly updating: boolean;
+    readonly videoTracks: VideoTrackList;
     abort(): void;
     appendBuffer(data: ArrayBuffer | ArrayBufferView): void;
     appendStream(stream: MSStream, maxSize?: number): void;
@@ -15710,7 +16944,7 @@ declare var SourceBuffer: {
 }
 
 interface SourceBufferList extends EventTarget {
-    length: number;
+    readonly length: number;
     item(index: number): SourceBuffer;
     [index: number]: SourceBuffer;
 }
@@ -15721,7 +16955,7 @@ declare var SourceBufferList: {
 }
 
 interface StereoPannerNode extends AudioNode {
-    pan: AudioParam;
+    readonly pan: AudioParam;
 }
 
 declare var StereoPannerNode: {
@@ -15730,9 +16964,9 @@ declare var StereoPannerNode: {
 }
 
 interface Storage {
-    length: number;
+    readonly length: number;
     clear(): void;
-    getItem(key: string): any;
+    getItem(key: string): string;
     key(index: number): string;
     removeItem(key: string): void;
     setItem(key: string, data: string): void;
@@ -15746,7 +16980,7 @@ declare var Storage: {
 }
 
 interface StorageEvent extends Event {
-    url: string;
+    readonly url: string;
     key?: string;
     oldValue?: string;
     newValue?: string;
@@ -15759,7 +16993,7 @@ declare var StorageEvent: {
 }
 
 interface StyleMedia {
-    type: string;
+    readonly type: string;
     matchMedium(mediaquery: string): boolean;
 }
 
@@ -15770,12 +17004,12 @@ declare var StyleMedia: {
 
 interface StyleSheet {
     disabled: boolean;
-    href: string;
-    media: MediaList;
-    ownerNode: Node;
-    parentStyleSheet: StyleSheet;
-    title: string;
-    type: string;
+    readonly href: string;
+    readonly media: MediaList;
+    readonly ownerNode: Node;
+    readonly parentStyleSheet: StyleSheet;
+    readonly title: string;
+    readonly type: string;
 }
 
 declare var StyleSheet: {
@@ -15784,7 +17018,7 @@ declare var StyleSheet: {
 }
 
 interface StyleSheetList {
-    length: number;
+    readonly length: number;
     item(index?: number): StyleSheet;
     [index: number]: StyleSheet;
 }
@@ -15795,7 +17029,7 @@ declare var StyleSheetList: {
 }
 
 interface StyleSheetPageList {
-    length: number;
+    readonly length: number;
     item(index: number): CSSPageRule;
     [index: number]: CSSPageRule;
 }
@@ -15806,18 +17040,18 @@ declare var StyleSheetPageList: {
 }
 
 interface SubtleCrypto {
-    decrypt(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): any;
-    deriveBits(algorithm: string | Algorithm, baseKey: CryptoKey, length: number): any;
-    deriveKey(algorithm: string | Algorithm, baseKey: CryptoKey, derivedKeyType: string | Algorithm, extractable: boolean, keyUsages: string[]): any;
-    digest(algorithm: string | Algorithm, data: ArrayBufferView): any;
-    encrypt(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): any;
-    exportKey(format: string, key: CryptoKey): any;
-    generateKey(algorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): any;
-    importKey(format: string, keyData: ArrayBufferView, algorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): any;
-    sign(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): any;
-    unwrapKey(format: string, wrappedKey: ArrayBufferView, unwrappingKey: CryptoKey, unwrapAlgorithm: string | Algorithm, unwrappedKeyAlgorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): any;
-    verify(algorithm: string | Algorithm, key: CryptoKey, signature: ArrayBufferView, data: ArrayBufferView): any;
-    wrapKey(format: string, key: CryptoKey, wrappingKey: CryptoKey, wrapAlgorithm: string | Algorithm): any;
+    decrypt(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): PromiseLike<any>;
+    deriveBits(algorithm: string | Algorithm, baseKey: CryptoKey, length: number): PromiseLike<any>;
+    deriveKey(algorithm: string | Algorithm, baseKey: CryptoKey, derivedKeyType: string | Algorithm, extractable: boolean, keyUsages: string[]): PromiseLike<any>;
+    digest(algorithm: string | Algorithm, data: ArrayBufferView): PromiseLike<any>;
+    encrypt(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): PromiseLike<any>;
+    exportKey(format: string, key: CryptoKey): PromiseLike<any>;
+    generateKey(algorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): PromiseLike<any>;
+    importKey(format: string, keyData: ArrayBufferView, algorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): PromiseLike<any>;
+    sign(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): PromiseLike<any>;
+    unwrapKey(format: string, wrappedKey: ArrayBufferView, unwrappingKey: CryptoKey, unwrapAlgorithm: string | Algorithm, unwrappedKeyAlgorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): PromiseLike<any>;
+    verify(algorithm: string | Algorithm, key: CryptoKey, signature: ArrayBufferView, data: ArrayBufferView): PromiseLike<any>;
+    wrapKey(format: string, key: CryptoKey, wrappingKey: CryptoKey, wrapAlgorithm: string | Algorithm): PromiseLike<any>;
 }
 
 declare var SubtleCrypto: {
@@ -15826,8 +17060,7 @@ declare var SubtleCrypto: {
 }
 
 interface Text extends CharacterData {
-    wholeText: string;
-    replaceWholeText(content: string): Text;
+    readonly wholeText: string;
     splitText(offset: number): Text;
 }
 
@@ -15837,39 +17070,39 @@ declare var Text: {
 }
 
 interface TextEvent extends UIEvent {
-    data: string;
-    inputMethod: number;
-    locale: string;
+    readonly data: string;
+    readonly inputMethod: number;
+    readonly locale: string;
     initTextEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, dataArg: string, inputMethod: number, locale: string): void;
-    DOM_INPUT_METHOD_DROP: number;
-    DOM_INPUT_METHOD_HANDWRITING: number;
-    DOM_INPUT_METHOD_IME: number;
-    DOM_INPUT_METHOD_KEYBOARD: number;
-    DOM_INPUT_METHOD_MULTIMODAL: number;
-    DOM_INPUT_METHOD_OPTION: number;
-    DOM_INPUT_METHOD_PASTE: number;
-    DOM_INPUT_METHOD_SCRIPT: number;
-    DOM_INPUT_METHOD_UNKNOWN: number;
-    DOM_INPUT_METHOD_VOICE: number;
+    readonly DOM_INPUT_METHOD_DROP: number;
+    readonly DOM_INPUT_METHOD_HANDWRITING: number;
+    readonly DOM_INPUT_METHOD_IME: number;
+    readonly DOM_INPUT_METHOD_KEYBOARD: number;
+    readonly DOM_INPUT_METHOD_MULTIMODAL: number;
+    readonly DOM_INPUT_METHOD_OPTION: number;
+    readonly DOM_INPUT_METHOD_PASTE: number;
+    readonly DOM_INPUT_METHOD_SCRIPT: number;
+    readonly DOM_INPUT_METHOD_UNKNOWN: number;
+    readonly DOM_INPUT_METHOD_VOICE: number;
 }
 
 declare var TextEvent: {
     prototype: TextEvent;
     new(): TextEvent;
-    DOM_INPUT_METHOD_DROP: number;
-    DOM_INPUT_METHOD_HANDWRITING: number;
-    DOM_INPUT_METHOD_IME: number;
-    DOM_INPUT_METHOD_KEYBOARD: number;
-    DOM_INPUT_METHOD_MULTIMODAL: number;
-    DOM_INPUT_METHOD_OPTION: number;
-    DOM_INPUT_METHOD_PASTE: number;
-    DOM_INPUT_METHOD_SCRIPT: number;
-    DOM_INPUT_METHOD_UNKNOWN: number;
-    DOM_INPUT_METHOD_VOICE: number;
+    readonly DOM_INPUT_METHOD_DROP: number;
+    readonly DOM_INPUT_METHOD_HANDWRITING: number;
+    readonly DOM_INPUT_METHOD_IME: number;
+    readonly DOM_INPUT_METHOD_KEYBOARD: number;
+    readonly DOM_INPUT_METHOD_MULTIMODAL: number;
+    readonly DOM_INPUT_METHOD_OPTION: number;
+    readonly DOM_INPUT_METHOD_PASTE: number;
+    readonly DOM_INPUT_METHOD_SCRIPT: number;
+    readonly DOM_INPUT_METHOD_UNKNOWN: number;
+    readonly DOM_INPUT_METHOD_VOICE: number;
 }
 
 interface TextMetrics {
-    width: number;
+    readonly width: number;
 }
 
 declare var TextMetrics: {
@@ -15877,83 +17110,27 @@ declare var TextMetrics: {
     new(): TextMetrics;
 }
 
-interface TextRange {
-    boundingHeight: number;
-    boundingLeft: number;
-    boundingTop: number;
-    boundingWidth: number;
-    htmlText: string;
-    offsetLeft: number;
-    offsetTop: number;
-    text: string;
-    collapse(start?: boolean): void;
-    compareEndPoints(how: string, sourceRange: TextRange): number;
-    duplicate(): TextRange;
-    execCommand(cmdID: string, showUI?: boolean, value?: any): boolean;
-    execCommandShowHelp(cmdID: string): boolean;
-    expand(Unit: string): boolean;
-    findText(string: string, count?: number, flags?: number): boolean;
-    getBookmark(): string;
-    getBoundingClientRect(): ClientRect;
-    getClientRects(): ClientRectList;
-    inRange(range: TextRange): boolean;
-    isEqual(range: TextRange): boolean;
-    move(unit: string, count?: number): number;
-    moveEnd(unit: string, count?: number): number;
-    moveStart(unit: string, count?: number): number;
-    moveToBookmark(bookmark: string): boolean;
-    moveToElementText(element: Element): void;
-    moveToPoint(x: number, y: number): void;
-    parentElement(): Element;
-    pasteHTML(html: string): void;
-    queryCommandEnabled(cmdID: string): boolean;
-    queryCommandIndeterm(cmdID: string): boolean;
-    queryCommandState(cmdID: string): boolean;
-    queryCommandSupported(cmdID: string): boolean;
-    queryCommandText(cmdID: string): string;
-    queryCommandValue(cmdID: string): any;
-    scrollIntoView(fStart?: boolean): void;
-    select(): void;
-    setEndPoint(how: string, SourceRange: TextRange): void;
-}
-
-declare var TextRange: {
-    prototype: TextRange;
-    new(): TextRange;
-}
-
-interface TextRangeCollection {
-    length: number;
-    item(index: number): TextRange;
-    [index: number]: TextRange;
-}
-
-declare var TextRangeCollection: {
-    prototype: TextRangeCollection;
-    new(): TextRangeCollection;
-}
-
 interface TextTrack extends EventTarget {
-    activeCues: TextTrackCueList;
-    cues: TextTrackCueList;
-    inBandMetadataTrackDispatchType: string;
-    kind: string;
-    label: string;
-    language: string;
+    readonly activeCues: TextTrackCueList;
+    readonly cues: TextTrackCueList;
+    readonly inBandMetadataTrackDispatchType: string;
+    readonly kind: string;
+    readonly label: string;
+    readonly language: string;
     mode: any;
     oncuechange: (ev: Event) => any;
     onerror: (ev: Event) => any;
     onload: (ev: Event) => any;
-    readyState: number;
+    readonly readyState: number;
     addCue(cue: TextTrackCue): void;
     removeCue(cue: TextTrackCue): void;
-    DISABLED: number;
-    ERROR: number;
-    HIDDEN: number;
-    LOADED: number;
-    LOADING: number;
-    NONE: number;
-    SHOWING: number;
+    readonly DISABLED: number;
+    readonly ERROR: number;
+    readonly HIDDEN: number;
+    readonly LOADED: number;
+    readonly LOADING: number;
+    readonly NONE: number;
+    readonly SHOWING: number;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -15963,13 +17140,13 @@ interface TextTrack extends EventTarget {
 declare var TextTrack: {
     prototype: TextTrack;
     new(): TextTrack;
-    DISABLED: number;
-    ERROR: number;
-    HIDDEN: number;
-    LOADED: number;
-    LOADING: number;
-    NONE: number;
-    SHOWING: number;
+    readonly DISABLED: number;
+    readonly ERROR: number;
+    readonly HIDDEN: number;
+    readonly LOADED: number;
+    readonly LOADING: number;
+    readonly NONE: number;
+    readonly SHOWING: number;
 }
 
 interface TextTrackCue extends EventTarget {
@@ -15980,7 +17157,7 @@ interface TextTrackCue extends EventTarget {
     pauseOnExit: boolean;
     startTime: number;
     text: string;
-    track: TextTrack;
+    readonly track: TextTrack;
     getCueAsHTML(): DocumentFragment;
     addEventListener(type: "enter", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "exit", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -15993,7 +17170,7 @@ declare var TextTrackCue: {
 }
 
 interface TextTrackCueList {
-    length: number;
+    readonly length: number;
     getCueById(id: string): TextTrackCue;
     item(index: number): TextTrackCue;
     [index: number]: TextTrackCue;
@@ -16005,7 +17182,7 @@ declare var TextTrackCueList: {
 }
 
 interface TextTrackList extends EventTarget {
-    length: number;
+    readonly length: number;
     onaddtrack: (ev: TrackEvent) => any;
     item(index: number): TextTrack;
     addEventListener(type: "addtrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void;
@@ -16019,7 +17196,7 @@ declare var TextTrackList: {
 }
 
 interface TimeRanges {
-    length: number;
+    readonly length: number;
     end(index: number): number;
     start(index: number): number;
 }
@@ -16030,14 +17207,14 @@ declare var TimeRanges: {
 }
 
 interface Touch {
-    clientX: number;
-    clientY: number;
-    identifier: number;
-    pageX: number;
-    pageY: number;
-    screenX: number;
-    screenY: number;
-    target: EventTarget;
+    readonly clientX: number;
+    readonly clientY: number;
+    readonly identifier: number;
+    readonly pageX: number;
+    readonly pageY: number;
+    readonly screenX: number;
+    readonly screenY: number;
+    readonly target: EventTarget;
 }
 
 declare var Touch: {
@@ -16046,13 +17223,13 @@ declare var Touch: {
 }
 
 interface TouchEvent extends UIEvent {
-    altKey: boolean;
-    changedTouches: TouchList;
-    ctrlKey: boolean;
-    metaKey: boolean;
-    shiftKey: boolean;
-    targetTouches: TouchList;
-    touches: TouchList;
+    readonly altKey: boolean;
+    readonly changedTouches: TouchList;
+    readonly ctrlKey: boolean;
+    readonly metaKey: boolean;
+    readonly shiftKey: boolean;
+    readonly targetTouches: TouchList;
+    readonly touches: TouchList;
 }
 
 declare var TouchEvent: {
@@ -16061,7 +17238,7 @@ declare var TouchEvent: {
 }
 
 interface TouchList {
-    length: number;
+    readonly length: number;
     item(index: number): Touch;
     [index: number]: Touch;
 }
@@ -16072,7 +17249,7 @@ declare var TouchList: {
 }
 
 interface TrackEvent extends Event {
-    track: any;
+    readonly track: any;
 }
 
 declare var TrackEvent: {
@@ -16081,8 +17258,8 @@ declare var TrackEvent: {
 }
 
 interface TransitionEvent extends Event {
-    elapsedTime: number;
-    propertyName: string;
+    readonly elapsedTime: number;
+    readonly propertyName: string;
     initTransitionEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, propertyNameArg: string, elapsedTimeArg: number): void;
 }
 
@@ -16093,10 +17270,10 @@ declare var TransitionEvent: {
 
 interface TreeWalker {
     currentNode: Node;
-    expandEntityReferences: boolean;
-    filter: NodeFilter;
-    root: Node;
-    whatToShow: number;
+    readonly expandEntityReferences: boolean;
+    readonly filter: NodeFilter;
+    readonly root: Node;
+    readonly whatToShow: number;
     firstChild(): Node;
     lastChild(): Node;
     nextNode(): Node;
@@ -16112,8 +17289,8 @@ declare var TreeWalker: {
 }
 
 interface UIEvent extends Event {
-    detail: number;
-    view: Window;
+    readonly detail: number;
+    readonly view: Window;
     initUIEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number): void;
 }
 
@@ -16123,13 +17300,29 @@ declare var UIEvent: {
 }
 
 interface URL {
+    hash: string;
+    host: string;
+    hostname: string;
+    href: string;
+    readonly origin: string;
+    password: string;
+    pathname: string;
+    port: string;
+    protocol: string;
+    search: string;
+    username: string;
+    toString(): string;
+}
+
+declare var URL: {
+    prototype: URL;
+    new(url: string, base?: string): URL;
     createObjectURL(object: any, options?: ObjectURLOptions): string;
     revokeObjectURL(url: string): void;
 }
-declare var URL: URL;
 
 interface UnviewableContentIdentifiedEvent extends NavigationEventWithReferrer {
-    mediaType: string;
+    readonly mediaType: string;
 }
 
 declare var UnviewableContentIdentifiedEvent: {
@@ -16138,16 +17331,16 @@ declare var UnviewableContentIdentifiedEvent: {
 }
 
 interface ValidityState {
-    badInput: boolean;
-    customError: boolean;
-    patternMismatch: boolean;
-    rangeOverflow: boolean;
-    rangeUnderflow: boolean;
-    stepMismatch: boolean;
-    tooLong: boolean;
-    typeMismatch: boolean;
-    valid: boolean;
-    valueMissing: boolean;
+    readonly badInput: boolean;
+    readonly customError: boolean;
+    readonly patternMismatch: boolean;
+    readonly rangeOverflow: boolean;
+    readonly rangeUnderflow: boolean;
+    readonly stepMismatch: boolean;
+    readonly tooLong: boolean;
+    readonly typeMismatch: boolean;
+    readonly valid: boolean;
+    readonly valueMissing: boolean;
 }
 
 declare var ValidityState: {
@@ -16156,11 +17349,11 @@ declare var ValidityState: {
 }
 
 interface VideoPlaybackQuality {
-    corruptedVideoFrames: number;
-    creationTime: number;
-    droppedVideoFrames: number;
-    totalFrameDelay: number;
-    totalVideoFrames: number;
+    readonly corruptedVideoFrames: number;
+    readonly creationTime: number;
+    readonly droppedVideoFrames: number;
+    readonly totalFrameDelay: number;
+    readonly totalVideoFrames: number;
 }
 
 declare var VideoPlaybackQuality: {
@@ -16169,12 +17362,12 @@ declare var VideoPlaybackQuality: {
 }
 
 interface VideoTrack {
-    id: string;
+    readonly id: string;
     kind: string;
-    label: string;
+    readonly label: string;
     language: string;
     selected: boolean;
-    sourceBuffer: SourceBuffer;
+    readonly sourceBuffer: SourceBuffer;
 }
 
 declare var VideoTrack: {
@@ -16183,11 +17376,11 @@ declare var VideoTrack: {
 }
 
 interface VideoTrackList extends EventTarget {
-    length: number;
+    readonly length: number;
     onaddtrack: (ev: TrackEvent) => any;
     onchange: (ev: Event) => any;
     onremovetrack: (ev: TrackEvent) => any;
-    selectedIndex: number;
+    readonly selectedIndex: number;
     getTrackById(id: string): VideoTrack;
     item(index: number): VideoTrack;
     addEventListener(type: "addtrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void;
@@ -16203,41 +17396,41 @@ declare var VideoTrackList: {
 }
 
 interface WEBGL_compressed_texture_s3tc {
-    COMPRESSED_RGBA_S3TC_DXT1_EXT: number;
-    COMPRESSED_RGBA_S3TC_DXT3_EXT: number;
-    COMPRESSED_RGBA_S3TC_DXT5_EXT: number;
-    COMPRESSED_RGB_S3TC_DXT1_EXT: number;
+    readonly COMPRESSED_RGBA_S3TC_DXT1_EXT: number;
+    readonly COMPRESSED_RGBA_S3TC_DXT3_EXT: number;
+    readonly COMPRESSED_RGBA_S3TC_DXT5_EXT: number;
+    readonly COMPRESSED_RGB_S3TC_DXT1_EXT: number;
 }
 
 declare var WEBGL_compressed_texture_s3tc: {
     prototype: WEBGL_compressed_texture_s3tc;
     new(): WEBGL_compressed_texture_s3tc;
-    COMPRESSED_RGBA_S3TC_DXT1_EXT: number;
-    COMPRESSED_RGBA_S3TC_DXT3_EXT: number;
-    COMPRESSED_RGBA_S3TC_DXT5_EXT: number;
-    COMPRESSED_RGB_S3TC_DXT1_EXT: number;
+    readonly COMPRESSED_RGBA_S3TC_DXT1_EXT: number;
+    readonly COMPRESSED_RGBA_S3TC_DXT3_EXT: number;
+    readonly COMPRESSED_RGBA_S3TC_DXT5_EXT: number;
+    readonly COMPRESSED_RGB_S3TC_DXT1_EXT: number;
 }
 
 interface WEBGL_debug_renderer_info {
-    UNMASKED_RENDERER_WEBGL: number;
-    UNMASKED_VENDOR_WEBGL: number;
+    readonly UNMASKED_RENDERER_WEBGL: number;
+    readonly UNMASKED_VENDOR_WEBGL: number;
 }
 
 declare var WEBGL_debug_renderer_info: {
     prototype: WEBGL_debug_renderer_info;
     new(): WEBGL_debug_renderer_info;
-    UNMASKED_RENDERER_WEBGL: number;
-    UNMASKED_VENDOR_WEBGL: number;
+    readonly UNMASKED_RENDERER_WEBGL: number;
+    readonly UNMASKED_VENDOR_WEBGL: number;
 }
 
 interface WEBGL_depth_texture {
-    UNSIGNED_INT_24_8_WEBGL: number;
+    readonly UNSIGNED_INT_24_8_WEBGL: number;
 }
 
 declare var WEBGL_depth_texture: {
     prototype: WEBGL_depth_texture;
     new(): WEBGL_depth_texture;
-    UNSIGNED_INT_24_8_WEBGL: number;
+    readonly UNSIGNED_INT_24_8_WEBGL: number;
 }
 
 interface WaveShaperNode extends AudioNode {
@@ -16251,9 +17444,9 @@ declare var WaveShaperNode: {
 }
 
 interface WebGLActiveInfo {
-    name: string;
-    size: number;
-    type: number;
+    readonly name: string;
+    readonly size: number;
+    readonly type: number;
 }
 
 declare var WebGLActiveInfo: {
@@ -16270,12 +17463,12 @@ declare var WebGLBuffer: {
 }
 
 interface WebGLContextEvent extends Event {
-    statusMessage: string;
+    readonly statusMessage: string;
 }
 
 declare var WebGLContextEvent: {
     prototype: WebGLContextEvent;
-    new(): WebGLContextEvent;
+    new(type: string, eventInitDict?: WebGLContextEventInit): WebGLContextEvent;
 }
 
 interface WebGLFramebuffer extends WebGLObject {
@@ -16311,9 +17504,9 @@ declare var WebGLRenderbuffer: {
 }
 
 interface WebGLRenderingContext {
-    canvas: HTMLCanvasElement;
-    drawingBufferHeight: number;
-    drawingBufferWidth: number;
+    readonly canvas: HTMLCanvasElement;
+    readonly drawingBufferHeight: number;
+    readonly drawingBufferWidth: number;
     activeTexture(texture: number): void;
     attachShader(program: WebGLProgram, shader: WebGLShader): void;
     bindAttribLocation(program: WebGLProgram, index: number, name: string): void;
@@ -16428,635 +17621,635 @@ interface WebGLRenderingContext {
     texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, video: HTMLVideoElement): void;
     texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, pixels: ImageData): void;
     uniform1f(location: WebGLUniformLocation, x: number): void;
-    uniform1fv(location: WebGLUniformLocation, v: Float32Array): void;
+    uniform1fv(location: WebGLUniformLocation, v: Float32Array | number[]): void;
     uniform1i(location: WebGLUniformLocation, x: number): void;
-    uniform1iv(location: WebGLUniformLocation, v: Int32Array): void;
+    uniform1iv(location: WebGLUniformLocation, v: Int32Array | number[]): void;
     uniform2f(location: WebGLUniformLocation, x: number, y: number): void;
-    uniform2fv(location: WebGLUniformLocation, v: Float32Array): void;
+    uniform2fv(location: WebGLUniformLocation, v: Float32Array | number[]): void;
     uniform2i(location: WebGLUniformLocation, x: number, y: number): void;
-    uniform2iv(location: WebGLUniformLocation, v: Int32Array): void;
+    uniform2iv(location: WebGLUniformLocation, v: Int32Array | number[]): void;
     uniform3f(location: WebGLUniformLocation, x: number, y: number, z: number): void;
-    uniform3fv(location: WebGLUniformLocation, v: Float32Array): void;
+    uniform3fv(location: WebGLUniformLocation, v: Float32Array | number[]): void;
     uniform3i(location: WebGLUniformLocation, x: number, y: number, z: number): void;
-    uniform3iv(location: WebGLUniformLocation, v: Int32Array): void;
+    uniform3iv(location: WebGLUniformLocation, v: Int32Array | number[]): void;
     uniform4f(location: WebGLUniformLocation, x: number, y: number, z: number, w: number): void;
-    uniform4fv(location: WebGLUniformLocation, v: Float32Array): void;
+    uniform4fv(location: WebGLUniformLocation, v: Float32Array | number[]): void;
     uniform4i(location: WebGLUniformLocation, x: number, y: number, z: number, w: number): void;
-    uniform4iv(location: WebGLUniformLocation, v: Int32Array): void;
-    uniformMatrix2fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array): void;
-    uniformMatrix3fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array): void;
-    uniformMatrix4fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array): void;
+    uniform4iv(location: WebGLUniformLocation, v: Int32Array | number[]): void;
+    uniformMatrix2fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | number[]): void;
+    uniformMatrix3fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | number[]): void;
+    uniformMatrix4fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | number[]): void;
     useProgram(program: WebGLProgram): void;
     validateProgram(program: WebGLProgram): void;
     vertexAttrib1f(indx: number, x: number): void;
-    vertexAttrib1fv(indx: number, values: Float32Array): void;
+    vertexAttrib1fv(indx: number, values: Float32Array | number[]): void;
     vertexAttrib2f(indx: number, x: number, y: number): void;
-    vertexAttrib2fv(indx: number, values: Float32Array): void;
+    vertexAttrib2fv(indx: number, values: Float32Array | number[]): void;
     vertexAttrib3f(indx: number, x: number, y: number, z: number): void;
-    vertexAttrib3fv(indx: number, values: Float32Array): void;
+    vertexAttrib3fv(indx: number, values: Float32Array | number[]): void;
     vertexAttrib4f(indx: number, x: number, y: number, z: number, w: number): void;
-    vertexAttrib4fv(indx: number, values: Float32Array): void;
+    vertexAttrib4fv(indx: number, values: Float32Array | number[]): void;
     vertexAttribPointer(indx: number, size: number, type: number, normalized: boolean, stride: number, offset: number): void;
     viewport(x: number, y: number, width: number, height: number): void;
-    ACTIVE_ATTRIBUTES: number;
-    ACTIVE_TEXTURE: number;
-    ACTIVE_UNIFORMS: number;
-    ALIASED_LINE_WIDTH_RANGE: number;
-    ALIASED_POINT_SIZE_RANGE: number;
-    ALPHA: number;
-    ALPHA_BITS: number;
-    ALWAYS: number;
-    ARRAY_BUFFER: number;
-    ARRAY_BUFFER_BINDING: number;
-    ATTACHED_SHADERS: number;
-    BACK: number;
-    BLEND: number;
-    BLEND_COLOR: number;
-    BLEND_DST_ALPHA: number;
-    BLEND_DST_RGB: number;
-    BLEND_EQUATION: number;
-    BLEND_EQUATION_ALPHA: number;
-    BLEND_EQUATION_RGB: number;
-    BLEND_SRC_ALPHA: number;
-    BLEND_SRC_RGB: number;
-    BLUE_BITS: number;
-    BOOL: number;
-    BOOL_VEC2: number;
-    BOOL_VEC3: number;
-    BOOL_VEC4: number;
-    BROWSER_DEFAULT_WEBGL: number;
-    BUFFER_SIZE: number;
-    BUFFER_USAGE: number;
-    BYTE: number;
-    CCW: number;
-    CLAMP_TO_EDGE: number;
-    COLOR_ATTACHMENT0: number;
-    COLOR_BUFFER_BIT: number;
-    COLOR_CLEAR_VALUE: number;
-    COLOR_WRITEMASK: number;
-    COMPILE_STATUS: number;
-    COMPRESSED_TEXTURE_FORMATS: number;
-    CONSTANT_ALPHA: number;
-    CONSTANT_COLOR: number;
-    CONTEXT_LOST_WEBGL: number;
-    CULL_FACE: number;
-    CULL_FACE_MODE: number;
-    CURRENT_PROGRAM: number;
-    CURRENT_VERTEX_ATTRIB: number;
-    CW: number;
-    DECR: number;
-    DECR_WRAP: number;
-    DELETE_STATUS: number;
-    DEPTH_ATTACHMENT: number;
-    DEPTH_BITS: number;
-    DEPTH_BUFFER_BIT: number;
-    DEPTH_CLEAR_VALUE: number;
-    DEPTH_COMPONENT: number;
-    DEPTH_COMPONENT16: number;
-    DEPTH_FUNC: number;
-    DEPTH_RANGE: number;
-    DEPTH_STENCIL: number;
-    DEPTH_STENCIL_ATTACHMENT: number;
-    DEPTH_TEST: number;
-    DEPTH_WRITEMASK: number;
-    DITHER: number;
-    DONT_CARE: number;
-    DST_ALPHA: number;
-    DST_COLOR: number;
-    DYNAMIC_DRAW: number;
-    ELEMENT_ARRAY_BUFFER: number;
-    ELEMENT_ARRAY_BUFFER_BINDING: number;
-    EQUAL: number;
-    FASTEST: number;
-    FLOAT: number;
-    FLOAT_MAT2: number;
-    FLOAT_MAT3: number;
-    FLOAT_MAT4: number;
-    FLOAT_VEC2: number;
-    FLOAT_VEC3: number;
-    FLOAT_VEC4: number;
-    FRAGMENT_SHADER: number;
-    FRAMEBUFFER: number;
-    FRAMEBUFFER_ATTACHMENT_OBJECT_NAME: number;
-    FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE: number;
-    FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE: number;
-    FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL: number;
-    FRAMEBUFFER_BINDING: number;
-    FRAMEBUFFER_COMPLETE: number;
-    FRAMEBUFFER_INCOMPLETE_ATTACHMENT: number;
-    FRAMEBUFFER_INCOMPLETE_DIMENSIONS: number;
-    FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: number;
-    FRAMEBUFFER_UNSUPPORTED: number;
-    FRONT: number;
-    FRONT_AND_BACK: number;
-    FRONT_FACE: number;
-    FUNC_ADD: number;
-    FUNC_REVERSE_SUBTRACT: number;
-    FUNC_SUBTRACT: number;
-    GENERATE_MIPMAP_HINT: number;
-    GEQUAL: number;
-    GREATER: number;
-    GREEN_BITS: number;
-    HIGH_FLOAT: number;
-    HIGH_INT: number;
-    IMPLEMENTATION_COLOR_READ_FORMAT: number;
-    IMPLEMENTATION_COLOR_READ_TYPE: number;
-    INCR: number;
-    INCR_WRAP: number;
-    INT: number;
-    INT_VEC2: number;
-    INT_VEC3: number;
-    INT_VEC4: number;
-    INVALID_ENUM: number;
-    INVALID_FRAMEBUFFER_OPERATION: number;
-    INVALID_OPERATION: number;
-    INVALID_VALUE: number;
-    INVERT: number;
-    KEEP: number;
-    LEQUAL: number;
-    LESS: number;
-    LINEAR: number;
-    LINEAR_MIPMAP_LINEAR: number;
-    LINEAR_MIPMAP_NEAREST: number;
-    LINES: number;
-    LINE_LOOP: number;
-    LINE_STRIP: number;
-    LINE_WIDTH: number;
-    LINK_STATUS: number;
-    LOW_FLOAT: number;
-    LOW_INT: number;
-    LUMINANCE: number;
-    LUMINANCE_ALPHA: number;
-    MAX_COMBINED_TEXTURE_IMAGE_UNITS: number;
-    MAX_CUBE_MAP_TEXTURE_SIZE: number;
-    MAX_FRAGMENT_UNIFORM_VECTORS: number;
-    MAX_RENDERBUFFER_SIZE: number;
-    MAX_TEXTURE_IMAGE_UNITS: number;
-    MAX_TEXTURE_SIZE: number;
-    MAX_VARYING_VECTORS: number;
-    MAX_VERTEX_ATTRIBS: number;
-    MAX_VERTEX_TEXTURE_IMAGE_UNITS: number;
-    MAX_VERTEX_UNIFORM_VECTORS: number;
-    MAX_VIEWPORT_DIMS: number;
-    MEDIUM_FLOAT: number;
-    MEDIUM_INT: number;
-    MIRRORED_REPEAT: number;
-    NEAREST: number;
-    NEAREST_MIPMAP_LINEAR: number;
-    NEAREST_MIPMAP_NEAREST: number;
-    NEVER: number;
-    NICEST: number;
-    NONE: number;
-    NOTEQUAL: number;
-    NO_ERROR: number;
-    ONE: number;
-    ONE_MINUS_CONSTANT_ALPHA: number;
-    ONE_MINUS_CONSTANT_COLOR: number;
-    ONE_MINUS_DST_ALPHA: number;
-    ONE_MINUS_DST_COLOR: number;
-    ONE_MINUS_SRC_ALPHA: number;
-    ONE_MINUS_SRC_COLOR: number;
-    OUT_OF_MEMORY: number;
-    PACK_ALIGNMENT: number;
-    POINTS: number;
-    POLYGON_OFFSET_FACTOR: number;
-    POLYGON_OFFSET_FILL: number;
-    POLYGON_OFFSET_UNITS: number;
-    RED_BITS: number;
-    RENDERBUFFER: number;
-    RENDERBUFFER_ALPHA_SIZE: number;
-    RENDERBUFFER_BINDING: number;
-    RENDERBUFFER_BLUE_SIZE: number;
-    RENDERBUFFER_DEPTH_SIZE: number;
-    RENDERBUFFER_GREEN_SIZE: number;
-    RENDERBUFFER_HEIGHT: number;
-    RENDERBUFFER_INTERNAL_FORMAT: number;
-    RENDERBUFFER_RED_SIZE: number;
-    RENDERBUFFER_STENCIL_SIZE: number;
-    RENDERBUFFER_WIDTH: number;
-    RENDERER: number;
-    REPEAT: number;
-    REPLACE: number;
-    RGB: number;
-    RGB565: number;
-    RGB5_A1: number;
-    RGBA: number;
-    RGBA4: number;
-    SAMPLER_2D: number;
-    SAMPLER_CUBE: number;
-    SAMPLES: number;
-    SAMPLE_ALPHA_TO_COVERAGE: number;
-    SAMPLE_BUFFERS: number;
-    SAMPLE_COVERAGE: number;
-    SAMPLE_COVERAGE_INVERT: number;
-    SAMPLE_COVERAGE_VALUE: number;
-    SCISSOR_BOX: number;
-    SCISSOR_TEST: number;
-    SHADER_TYPE: number;
-    SHADING_LANGUAGE_VERSION: number;
-    SHORT: number;
-    SRC_ALPHA: number;
-    SRC_ALPHA_SATURATE: number;
-    SRC_COLOR: number;
-    STATIC_DRAW: number;
-    STENCIL_ATTACHMENT: number;
-    STENCIL_BACK_FAIL: number;
-    STENCIL_BACK_FUNC: number;
-    STENCIL_BACK_PASS_DEPTH_FAIL: number;
-    STENCIL_BACK_PASS_DEPTH_PASS: number;
-    STENCIL_BACK_REF: number;
-    STENCIL_BACK_VALUE_MASK: number;
-    STENCIL_BACK_WRITEMASK: number;
-    STENCIL_BITS: number;
-    STENCIL_BUFFER_BIT: number;
-    STENCIL_CLEAR_VALUE: number;
-    STENCIL_FAIL: number;
-    STENCIL_FUNC: number;
-    STENCIL_INDEX: number;
-    STENCIL_INDEX8: number;
-    STENCIL_PASS_DEPTH_FAIL: number;
-    STENCIL_PASS_DEPTH_PASS: number;
-    STENCIL_REF: number;
-    STENCIL_TEST: number;
-    STENCIL_VALUE_MASK: number;
-    STENCIL_WRITEMASK: number;
-    STREAM_DRAW: number;
-    SUBPIXEL_BITS: number;
-    TEXTURE: number;
-    TEXTURE0: number;
-    TEXTURE1: number;
-    TEXTURE10: number;
-    TEXTURE11: number;
-    TEXTURE12: number;
-    TEXTURE13: number;
-    TEXTURE14: number;
-    TEXTURE15: number;
-    TEXTURE16: number;
-    TEXTURE17: number;
-    TEXTURE18: number;
-    TEXTURE19: number;
-    TEXTURE2: number;
-    TEXTURE20: number;
-    TEXTURE21: number;
-    TEXTURE22: number;
-    TEXTURE23: number;
-    TEXTURE24: number;
-    TEXTURE25: number;
-    TEXTURE26: number;
-    TEXTURE27: number;
-    TEXTURE28: number;
-    TEXTURE29: number;
-    TEXTURE3: number;
-    TEXTURE30: number;
-    TEXTURE31: number;
-    TEXTURE4: number;
-    TEXTURE5: number;
-    TEXTURE6: number;
-    TEXTURE7: number;
-    TEXTURE8: number;
-    TEXTURE9: number;
-    TEXTURE_2D: number;
-    TEXTURE_BINDING_2D: number;
-    TEXTURE_BINDING_CUBE_MAP: number;
-    TEXTURE_CUBE_MAP: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_X: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_Y: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_Z: number;
-    TEXTURE_CUBE_MAP_POSITIVE_X: number;
-    TEXTURE_CUBE_MAP_POSITIVE_Y: number;
-    TEXTURE_CUBE_MAP_POSITIVE_Z: number;
-    TEXTURE_MAG_FILTER: number;
-    TEXTURE_MIN_FILTER: number;
-    TEXTURE_WRAP_S: number;
-    TEXTURE_WRAP_T: number;
-    TRIANGLES: number;
-    TRIANGLE_FAN: number;
-    TRIANGLE_STRIP: number;
-    UNPACK_ALIGNMENT: number;
-    UNPACK_COLORSPACE_CONVERSION_WEBGL: number;
-    UNPACK_FLIP_Y_WEBGL: number;
-    UNPACK_PREMULTIPLY_ALPHA_WEBGL: number;
-    UNSIGNED_BYTE: number;
-    UNSIGNED_INT: number;
-    UNSIGNED_SHORT: number;
-    UNSIGNED_SHORT_4_4_4_4: number;
-    UNSIGNED_SHORT_5_5_5_1: number;
-    UNSIGNED_SHORT_5_6_5: number;
-    VALIDATE_STATUS: number;
-    VENDOR: number;
-    VERSION: number;
-    VERTEX_ATTRIB_ARRAY_BUFFER_BINDING: number;
-    VERTEX_ATTRIB_ARRAY_ENABLED: number;
-    VERTEX_ATTRIB_ARRAY_NORMALIZED: number;
-    VERTEX_ATTRIB_ARRAY_POINTER: number;
-    VERTEX_ATTRIB_ARRAY_SIZE: number;
-    VERTEX_ATTRIB_ARRAY_STRIDE: number;
-    VERTEX_ATTRIB_ARRAY_TYPE: number;
-    VERTEX_SHADER: number;
-    VIEWPORT: number;
-    ZERO: number;
+    readonly ACTIVE_ATTRIBUTES: number;
+    readonly ACTIVE_TEXTURE: number;
+    readonly ACTIVE_UNIFORMS: number;
+    readonly ALIASED_LINE_WIDTH_RANGE: number;
+    readonly ALIASED_POINT_SIZE_RANGE: number;
+    readonly ALPHA: number;
+    readonly ALPHA_BITS: number;
+    readonly ALWAYS: number;
+    readonly ARRAY_BUFFER: number;
+    readonly ARRAY_BUFFER_BINDING: number;
+    readonly ATTACHED_SHADERS: number;
+    readonly BACK: number;
+    readonly BLEND: number;
+    readonly BLEND_COLOR: number;
+    readonly BLEND_DST_ALPHA: number;
+    readonly BLEND_DST_RGB: number;
+    readonly BLEND_EQUATION: number;
+    readonly BLEND_EQUATION_ALPHA: number;
+    readonly BLEND_EQUATION_RGB: number;
+    readonly BLEND_SRC_ALPHA: number;
+    readonly BLEND_SRC_RGB: number;
+    readonly BLUE_BITS: number;
+    readonly BOOL: number;
+    readonly BOOL_VEC2: number;
+    readonly BOOL_VEC3: number;
+    readonly BOOL_VEC4: number;
+    readonly BROWSER_DEFAULT_WEBGL: number;
+    readonly BUFFER_SIZE: number;
+    readonly BUFFER_USAGE: number;
+    readonly BYTE: number;
+    readonly CCW: number;
+    readonly CLAMP_TO_EDGE: number;
+    readonly COLOR_ATTACHMENT0: number;
+    readonly COLOR_BUFFER_BIT: number;
+    readonly COLOR_CLEAR_VALUE: number;
+    readonly COLOR_WRITEMASK: number;
+    readonly COMPILE_STATUS: number;
+    readonly COMPRESSED_TEXTURE_FORMATS: number;
+    readonly CONSTANT_ALPHA: number;
+    readonly CONSTANT_COLOR: number;
+    readonly CONTEXT_LOST_WEBGL: number;
+    readonly CULL_FACE: number;
+    readonly CULL_FACE_MODE: number;
+    readonly CURRENT_PROGRAM: number;
+    readonly CURRENT_VERTEX_ATTRIB: number;
+    readonly CW: number;
+    readonly DECR: number;
+    readonly DECR_WRAP: number;
+    readonly DELETE_STATUS: number;
+    readonly DEPTH_ATTACHMENT: number;
+    readonly DEPTH_BITS: number;
+    readonly DEPTH_BUFFER_BIT: number;
+    readonly DEPTH_CLEAR_VALUE: number;
+    readonly DEPTH_COMPONENT: number;
+    readonly DEPTH_COMPONENT16: number;
+    readonly DEPTH_FUNC: number;
+    readonly DEPTH_RANGE: number;
+    readonly DEPTH_STENCIL: number;
+    readonly DEPTH_STENCIL_ATTACHMENT: number;
+    readonly DEPTH_TEST: number;
+    readonly DEPTH_WRITEMASK: number;
+    readonly DITHER: number;
+    readonly DONT_CARE: number;
+    readonly DST_ALPHA: number;
+    readonly DST_COLOR: number;
+    readonly DYNAMIC_DRAW: number;
+    readonly ELEMENT_ARRAY_BUFFER: number;
+    readonly ELEMENT_ARRAY_BUFFER_BINDING: number;
+    readonly EQUAL: number;
+    readonly FASTEST: number;
+    readonly FLOAT: number;
+    readonly FLOAT_MAT2: number;
+    readonly FLOAT_MAT3: number;
+    readonly FLOAT_MAT4: number;
+    readonly FLOAT_VEC2: number;
+    readonly FLOAT_VEC3: number;
+    readonly FLOAT_VEC4: number;
+    readonly FRAGMENT_SHADER: number;
+    readonly FRAMEBUFFER: number;
+    readonly FRAMEBUFFER_ATTACHMENT_OBJECT_NAME: number;
+    readonly FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE: number;
+    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE: number;
+    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL: number;
+    readonly FRAMEBUFFER_BINDING: number;
+    readonly FRAMEBUFFER_COMPLETE: number;
+    readonly FRAMEBUFFER_INCOMPLETE_ATTACHMENT: number;
+    readonly FRAMEBUFFER_INCOMPLETE_DIMENSIONS: number;
+    readonly FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: number;
+    readonly FRAMEBUFFER_UNSUPPORTED: number;
+    readonly FRONT: number;
+    readonly FRONT_AND_BACK: number;
+    readonly FRONT_FACE: number;
+    readonly FUNC_ADD: number;
+    readonly FUNC_REVERSE_SUBTRACT: number;
+    readonly FUNC_SUBTRACT: number;
+    readonly GENERATE_MIPMAP_HINT: number;
+    readonly GEQUAL: number;
+    readonly GREATER: number;
+    readonly GREEN_BITS: number;
+    readonly HIGH_FLOAT: number;
+    readonly HIGH_INT: number;
+    readonly IMPLEMENTATION_COLOR_READ_FORMAT: number;
+    readonly IMPLEMENTATION_COLOR_READ_TYPE: number;
+    readonly INCR: number;
+    readonly INCR_WRAP: number;
+    readonly INT: number;
+    readonly INT_VEC2: number;
+    readonly INT_VEC3: number;
+    readonly INT_VEC4: number;
+    readonly INVALID_ENUM: number;
+    readonly INVALID_FRAMEBUFFER_OPERATION: number;
+    readonly INVALID_OPERATION: number;
+    readonly INVALID_VALUE: number;
+    readonly INVERT: number;
+    readonly KEEP: number;
+    readonly LEQUAL: number;
+    readonly LESS: number;
+    readonly LINEAR: number;
+    readonly LINEAR_MIPMAP_LINEAR: number;
+    readonly LINEAR_MIPMAP_NEAREST: number;
+    readonly LINES: number;
+    readonly LINE_LOOP: number;
+    readonly LINE_STRIP: number;
+    readonly LINE_WIDTH: number;
+    readonly LINK_STATUS: number;
+    readonly LOW_FLOAT: number;
+    readonly LOW_INT: number;
+    readonly LUMINANCE: number;
+    readonly LUMINANCE_ALPHA: number;
+    readonly MAX_COMBINED_TEXTURE_IMAGE_UNITS: number;
+    readonly MAX_CUBE_MAP_TEXTURE_SIZE: number;
+    readonly MAX_FRAGMENT_UNIFORM_VECTORS: number;
+    readonly MAX_RENDERBUFFER_SIZE: number;
+    readonly MAX_TEXTURE_IMAGE_UNITS: number;
+    readonly MAX_TEXTURE_SIZE: number;
+    readonly MAX_VARYING_VECTORS: number;
+    readonly MAX_VERTEX_ATTRIBS: number;
+    readonly MAX_VERTEX_TEXTURE_IMAGE_UNITS: number;
+    readonly MAX_VERTEX_UNIFORM_VECTORS: number;
+    readonly MAX_VIEWPORT_DIMS: number;
+    readonly MEDIUM_FLOAT: number;
+    readonly MEDIUM_INT: number;
+    readonly MIRRORED_REPEAT: number;
+    readonly NEAREST: number;
+    readonly NEAREST_MIPMAP_LINEAR: number;
+    readonly NEAREST_MIPMAP_NEAREST: number;
+    readonly NEVER: number;
+    readonly NICEST: number;
+    readonly NONE: number;
+    readonly NOTEQUAL: number;
+    readonly NO_ERROR: number;
+    readonly ONE: number;
+    readonly ONE_MINUS_CONSTANT_ALPHA: number;
+    readonly ONE_MINUS_CONSTANT_COLOR: number;
+    readonly ONE_MINUS_DST_ALPHA: number;
+    readonly ONE_MINUS_DST_COLOR: number;
+    readonly ONE_MINUS_SRC_ALPHA: number;
+    readonly ONE_MINUS_SRC_COLOR: number;
+    readonly OUT_OF_MEMORY: number;
+    readonly PACK_ALIGNMENT: number;
+    readonly POINTS: number;
+    readonly POLYGON_OFFSET_FACTOR: number;
+    readonly POLYGON_OFFSET_FILL: number;
+    readonly POLYGON_OFFSET_UNITS: number;
+    readonly RED_BITS: number;
+    readonly RENDERBUFFER: number;
+    readonly RENDERBUFFER_ALPHA_SIZE: number;
+    readonly RENDERBUFFER_BINDING: number;
+    readonly RENDERBUFFER_BLUE_SIZE: number;
+    readonly RENDERBUFFER_DEPTH_SIZE: number;
+    readonly RENDERBUFFER_GREEN_SIZE: number;
+    readonly RENDERBUFFER_HEIGHT: number;
+    readonly RENDERBUFFER_INTERNAL_FORMAT: number;
+    readonly RENDERBUFFER_RED_SIZE: number;
+    readonly RENDERBUFFER_STENCIL_SIZE: number;
+    readonly RENDERBUFFER_WIDTH: number;
+    readonly RENDERER: number;
+    readonly REPEAT: number;
+    readonly REPLACE: number;
+    readonly RGB: number;
+    readonly RGB565: number;
+    readonly RGB5_A1: number;
+    readonly RGBA: number;
+    readonly RGBA4: number;
+    readonly SAMPLER_2D: number;
+    readonly SAMPLER_CUBE: number;
+    readonly SAMPLES: number;
+    readonly SAMPLE_ALPHA_TO_COVERAGE: number;
+    readonly SAMPLE_BUFFERS: number;
+    readonly SAMPLE_COVERAGE: number;
+    readonly SAMPLE_COVERAGE_INVERT: number;
+    readonly SAMPLE_COVERAGE_VALUE: number;
+    readonly SCISSOR_BOX: number;
+    readonly SCISSOR_TEST: number;
+    readonly SHADER_TYPE: number;
+    readonly SHADING_LANGUAGE_VERSION: number;
+    readonly SHORT: number;
+    readonly SRC_ALPHA: number;
+    readonly SRC_ALPHA_SATURATE: number;
+    readonly SRC_COLOR: number;
+    readonly STATIC_DRAW: number;
+    readonly STENCIL_ATTACHMENT: number;
+    readonly STENCIL_BACK_FAIL: number;
+    readonly STENCIL_BACK_FUNC: number;
+    readonly STENCIL_BACK_PASS_DEPTH_FAIL: number;
+    readonly STENCIL_BACK_PASS_DEPTH_PASS: number;
+    readonly STENCIL_BACK_REF: number;
+    readonly STENCIL_BACK_VALUE_MASK: number;
+    readonly STENCIL_BACK_WRITEMASK: number;
+    readonly STENCIL_BITS: number;
+    readonly STENCIL_BUFFER_BIT: number;
+    readonly STENCIL_CLEAR_VALUE: number;
+    readonly STENCIL_FAIL: number;
+    readonly STENCIL_FUNC: number;
+    readonly STENCIL_INDEX: number;
+    readonly STENCIL_INDEX8: number;
+    readonly STENCIL_PASS_DEPTH_FAIL: number;
+    readonly STENCIL_PASS_DEPTH_PASS: number;
+    readonly STENCIL_REF: number;
+    readonly STENCIL_TEST: number;
+    readonly STENCIL_VALUE_MASK: number;
+    readonly STENCIL_WRITEMASK: number;
+    readonly STREAM_DRAW: number;
+    readonly SUBPIXEL_BITS: number;
+    readonly TEXTURE: number;
+    readonly TEXTURE0: number;
+    readonly TEXTURE1: number;
+    readonly TEXTURE10: number;
+    readonly TEXTURE11: number;
+    readonly TEXTURE12: number;
+    readonly TEXTURE13: number;
+    readonly TEXTURE14: number;
+    readonly TEXTURE15: number;
+    readonly TEXTURE16: number;
+    readonly TEXTURE17: number;
+    readonly TEXTURE18: number;
+    readonly TEXTURE19: number;
+    readonly TEXTURE2: number;
+    readonly TEXTURE20: number;
+    readonly TEXTURE21: number;
+    readonly TEXTURE22: number;
+    readonly TEXTURE23: number;
+    readonly TEXTURE24: number;
+    readonly TEXTURE25: number;
+    readonly TEXTURE26: number;
+    readonly TEXTURE27: number;
+    readonly TEXTURE28: number;
+    readonly TEXTURE29: number;
+    readonly TEXTURE3: number;
+    readonly TEXTURE30: number;
+    readonly TEXTURE31: number;
+    readonly TEXTURE4: number;
+    readonly TEXTURE5: number;
+    readonly TEXTURE6: number;
+    readonly TEXTURE7: number;
+    readonly TEXTURE8: number;
+    readonly TEXTURE9: number;
+    readonly TEXTURE_2D: number;
+    readonly TEXTURE_BINDING_2D: number;
+    readonly TEXTURE_BINDING_CUBE_MAP: number;
+    readonly TEXTURE_CUBE_MAP: number;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_X: number;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_Y: number;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_Z: number;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_X: number;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_Y: number;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_Z: number;
+    readonly TEXTURE_MAG_FILTER: number;
+    readonly TEXTURE_MIN_FILTER: number;
+    readonly TEXTURE_WRAP_S: number;
+    readonly TEXTURE_WRAP_T: number;
+    readonly TRIANGLES: number;
+    readonly TRIANGLE_FAN: number;
+    readonly TRIANGLE_STRIP: number;
+    readonly UNPACK_ALIGNMENT: number;
+    readonly UNPACK_COLORSPACE_CONVERSION_WEBGL: number;
+    readonly UNPACK_FLIP_Y_WEBGL: number;
+    readonly UNPACK_PREMULTIPLY_ALPHA_WEBGL: number;
+    readonly UNSIGNED_BYTE: number;
+    readonly UNSIGNED_INT: number;
+    readonly UNSIGNED_SHORT: number;
+    readonly UNSIGNED_SHORT_4_4_4_4: number;
+    readonly UNSIGNED_SHORT_5_5_5_1: number;
+    readonly UNSIGNED_SHORT_5_6_5: number;
+    readonly VALIDATE_STATUS: number;
+    readonly VENDOR: number;
+    readonly VERSION: number;
+    readonly VERTEX_ATTRIB_ARRAY_BUFFER_BINDING: number;
+    readonly VERTEX_ATTRIB_ARRAY_ENABLED: number;
+    readonly VERTEX_ATTRIB_ARRAY_NORMALIZED: number;
+    readonly VERTEX_ATTRIB_ARRAY_POINTER: number;
+    readonly VERTEX_ATTRIB_ARRAY_SIZE: number;
+    readonly VERTEX_ATTRIB_ARRAY_STRIDE: number;
+    readonly VERTEX_ATTRIB_ARRAY_TYPE: number;
+    readonly VERTEX_SHADER: number;
+    readonly VIEWPORT: number;
+    readonly ZERO: number;
 }
 
 declare var WebGLRenderingContext: {
     prototype: WebGLRenderingContext;
     new(): WebGLRenderingContext;
-    ACTIVE_ATTRIBUTES: number;
-    ACTIVE_TEXTURE: number;
-    ACTIVE_UNIFORMS: number;
-    ALIASED_LINE_WIDTH_RANGE: number;
-    ALIASED_POINT_SIZE_RANGE: number;
-    ALPHA: number;
-    ALPHA_BITS: number;
-    ALWAYS: number;
-    ARRAY_BUFFER: number;
-    ARRAY_BUFFER_BINDING: number;
-    ATTACHED_SHADERS: number;
-    BACK: number;
-    BLEND: number;
-    BLEND_COLOR: number;
-    BLEND_DST_ALPHA: number;
-    BLEND_DST_RGB: number;
-    BLEND_EQUATION: number;
-    BLEND_EQUATION_ALPHA: number;
-    BLEND_EQUATION_RGB: number;
-    BLEND_SRC_ALPHA: number;
-    BLEND_SRC_RGB: number;
-    BLUE_BITS: number;
-    BOOL: number;
-    BOOL_VEC2: number;
-    BOOL_VEC3: number;
-    BOOL_VEC4: number;
-    BROWSER_DEFAULT_WEBGL: number;
-    BUFFER_SIZE: number;
-    BUFFER_USAGE: number;
-    BYTE: number;
-    CCW: number;
-    CLAMP_TO_EDGE: number;
-    COLOR_ATTACHMENT0: number;
-    COLOR_BUFFER_BIT: number;
-    COLOR_CLEAR_VALUE: number;
-    COLOR_WRITEMASK: number;
-    COMPILE_STATUS: number;
-    COMPRESSED_TEXTURE_FORMATS: number;
-    CONSTANT_ALPHA: number;
-    CONSTANT_COLOR: number;
-    CONTEXT_LOST_WEBGL: number;
-    CULL_FACE: number;
-    CULL_FACE_MODE: number;
-    CURRENT_PROGRAM: number;
-    CURRENT_VERTEX_ATTRIB: number;
-    CW: number;
-    DECR: number;
-    DECR_WRAP: number;
-    DELETE_STATUS: number;
-    DEPTH_ATTACHMENT: number;
-    DEPTH_BITS: number;
-    DEPTH_BUFFER_BIT: number;
-    DEPTH_CLEAR_VALUE: number;
-    DEPTH_COMPONENT: number;
-    DEPTH_COMPONENT16: number;
-    DEPTH_FUNC: number;
-    DEPTH_RANGE: number;
-    DEPTH_STENCIL: number;
-    DEPTH_STENCIL_ATTACHMENT: number;
-    DEPTH_TEST: number;
-    DEPTH_WRITEMASK: number;
-    DITHER: number;
-    DONT_CARE: number;
-    DST_ALPHA: number;
-    DST_COLOR: number;
-    DYNAMIC_DRAW: number;
-    ELEMENT_ARRAY_BUFFER: number;
-    ELEMENT_ARRAY_BUFFER_BINDING: number;
-    EQUAL: number;
-    FASTEST: number;
-    FLOAT: number;
-    FLOAT_MAT2: number;
-    FLOAT_MAT3: number;
-    FLOAT_MAT4: number;
-    FLOAT_VEC2: number;
-    FLOAT_VEC3: number;
-    FLOAT_VEC4: number;
-    FRAGMENT_SHADER: number;
-    FRAMEBUFFER: number;
-    FRAMEBUFFER_ATTACHMENT_OBJECT_NAME: number;
-    FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE: number;
-    FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE: number;
-    FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL: number;
-    FRAMEBUFFER_BINDING: number;
-    FRAMEBUFFER_COMPLETE: number;
-    FRAMEBUFFER_INCOMPLETE_ATTACHMENT: number;
-    FRAMEBUFFER_INCOMPLETE_DIMENSIONS: number;
-    FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: number;
-    FRAMEBUFFER_UNSUPPORTED: number;
-    FRONT: number;
-    FRONT_AND_BACK: number;
-    FRONT_FACE: number;
-    FUNC_ADD: number;
-    FUNC_REVERSE_SUBTRACT: number;
-    FUNC_SUBTRACT: number;
-    GENERATE_MIPMAP_HINT: number;
-    GEQUAL: number;
-    GREATER: number;
-    GREEN_BITS: number;
-    HIGH_FLOAT: number;
-    HIGH_INT: number;
-    IMPLEMENTATION_COLOR_READ_FORMAT: number;
-    IMPLEMENTATION_COLOR_READ_TYPE: number;
-    INCR: number;
-    INCR_WRAP: number;
-    INT: number;
-    INT_VEC2: number;
-    INT_VEC3: number;
-    INT_VEC4: number;
-    INVALID_ENUM: number;
-    INVALID_FRAMEBUFFER_OPERATION: number;
-    INVALID_OPERATION: number;
-    INVALID_VALUE: number;
-    INVERT: number;
-    KEEP: number;
-    LEQUAL: number;
-    LESS: number;
-    LINEAR: number;
-    LINEAR_MIPMAP_LINEAR: number;
-    LINEAR_MIPMAP_NEAREST: number;
-    LINES: number;
-    LINE_LOOP: number;
-    LINE_STRIP: number;
-    LINE_WIDTH: number;
-    LINK_STATUS: number;
-    LOW_FLOAT: number;
-    LOW_INT: number;
-    LUMINANCE: number;
-    LUMINANCE_ALPHA: number;
-    MAX_COMBINED_TEXTURE_IMAGE_UNITS: number;
-    MAX_CUBE_MAP_TEXTURE_SIZE: number;
-    MAX_FRAGMENT_UNIFORM_VECTORS: number;
-    MAX_RENDERBUFFER_SIZE: number;
-    MAX_TEXTURE_IMAGE_UNITS: number;
-    MAX_TEXTURE_SIZE: number;
-    MAX_VARYING_VECTORS: number;
-    MAX_VERTEX_ATTRIBS: number;
-    MAX_VERTEX_TEXTURE_IMAGE_UNITS: number;
-    MAX_VERTEX_UNIFORM_VECTORS: number;
-    MAX_VIEWPORT_DIMS: number;
-    MEDIUM_FLOAT: number;
-    MEDIUM_INT: number;
-    MIRRORED_REPEAT: number;
-    NEAREST: number;
-    NEAREST_MIPMAP_LINEAR: number;
-    NEAREST_MIPMAP_NEAREST: number;
-    NEVER: number;
-    NICEST: number;
-    NONE: number;
-    NOTEQUAL: number;
-    NO_ERROR: number;
-    ONE: number;
-    ONE_MINUS_CONSTANT_ALPHA: number;
-    ONE_MINUS_CONSTANT_COLOR: number;
-    ONE_MINUS_DST_ALPHA: number;
-    ONE_MINUS_DST_COLOR: number;
-    ONE_MINUS_SRC_ALPHA: number;
-    ONE_MINUS_SRC_COLOR: number;
-    OUT_OF_MEMORY: number;
-    PACK_ALIGNMENT: number;
-    POINTS: number;
-    POLYGON_OFFSET_FACTOR: number;
-    POLYGON_OFFSET_FILL: number;
-    POLYGON_OFFSET_UNITS: number;
-    RED_BITS: number;
-    RENDERBUFFER: number;
-    RENDERBUFFER_ALPHA_SIZE: number;
-    RENDERBUFFER_BINDING: number;
-    RENDERBUFFER_BLUE_SIZE: number;
-    RENDERBUFFER_DEPTH_SIZE: number;
-    RENDERBUFFER_GREEN_SIZE: number;
-    RENDERBUFFER_HEIGHT: number;
-    RENDERBUFFER_INTERNAL_FORMAT: number;
-    RENDERBUFFER_RED_SIZE: number;
-    RENDERBUFFER_STENCIL_SIZE: number;
-    RENDERBUFFER_WIDTH: number;
-    RENDERER: number;
-    REPEAT: number;
-    REPLACE: number;
-    RGB: number;
-    RGB565: number;
-    RGB5_A1: number;
-    RGBA: number;
-    RGBA4: number;
-    SAMPLER_2D: number;
-    SAMPLER_CUBE: number;
-    SAMPLES: number;
-    SAMPLE_ALPHA_TO_COVERAGE: number;
-    SAMPLE_BUFFERS: number;
-    SAMPLE_COVERAGE: number;
-    SAMPLE_COVERAGE_INVERT: number;
-    SAMPLE_COVERAGE_VALUE: number;
-    SCISSOR_BOX: number;
-    SCISSOR_TEST: number;
-    SHADER_TYPE: number;
-    SHADING_LANGUAGE_VERSION: number;
-    SHORT: number;
-    SRC_ALPHA: number;
-    SRC_ALPHA_SATURATE: number;
-    SRC_COLOR: number;
-    STATIC_DRAW: number;
-    STENCIL_ATTACHMENT: number;
-    STENCIL_BACK_FAIL: number;
-    STENCIL_BACK_FUNC: number;
-    STENCIL_BACK_PASS_DEPTH_FAIL: number;
-    STENCIL_BACK_PASS_DEPTH_PASS: number;
-    STENCIL_BACK_REF: number;
-    STENCIL_BACK_VALUE_MASK: number;
-    STENCIL_BACK_WRITEMASK: number;
-    STENCIL_BITS: number;
-    STENCIL_BUFFER_BIT: number;
-    STENCIL_CLEAR_VALUE: number;
-    STENCIL_FAIL: number;
-    STENCIL_FUNC: number;
-    STENCIL_INDEX: number;
-    STENCIL_INDEX8: number;
-    STENCIL_PASS_DEPTH_FAIL: number;
-    STENCIL_PASS_DEPTH_PASS: number;
-    STENCIL_REF: number;
-    STENCIL_TEST: number;
-    STENCIL_VALUE_MASK: number;
-    STENCIL_WRITEMASK: number;
-    STREAM_DRAW: number;
-    SUBPIXEL_BITS: number;
-    TEXTURE: number;
-    TEXTURE0: number;
-    TEXTURE1: number;
-    TEXTURE10: number;
-    TEXTURE11: number;
-    TEXTURE12: number;
-    TEXTURE13: number;
-    TEXTURE14: number;
-    TEXTURE15: number;
-    TEXTURE16: number;
-    TEXTURE17: number;
-    TEXTURE18: number;
-    TEXTURE19: number;
-    TEXTURE2: number;
-    TEXTURE20: number;
-    TEXTURE21: number;
-    TEXTURE22: number;
-    TEXTURE23: number;
-    TEXTURE24: number;
-    TEXTURE25: number;
-    TEXTURE26: number;
-    TEXTURE27: number;
-    TEXTURE28: number;
-    TEXTURE29: number;
-    TEXTURE3: number;
-    TEXTURE30: number;
-    TEXTURE31: number;
-    TEXTURE4: number;
-    TEXTURE5: number;
-    TEXTURE6: number;
-    TEXTURE7: number;
-    TEXTURE8: number;
-    TEXTURE9: number;
-    TEXTURE_2D: number;
-    TEXTURE_BINDING_2D: number;
-    TEXTURE_BINDING_CUBE_MAP: number;
-    TEXTURE_CUBE_MAP: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_X: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_Y: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_Z: number;
-    TEXTURE_CUBE_MAP_POSITIVE_X: number;
-    TEXTURE_CUBE_MAP_POSITIVE_Y: number;
-    TEXTURE_CUBE_MAP_POSITIVE_Z: number;
-    TEXTURE_MAG_FILTER: number;
-    TEXTURE_MIN_FILTER: number;
-    TEXTURE_WRAP_S: number;
-    TEXTURE_WRAP_T: number;
-    TRIANGLES: number;
-    TRIANGLE_FAN: number;
-    TRIANGLE_STRIP: number;
-    UNPACK_ALIGNMENT: number;
-    UNPACK_COLORSPACE_CONVERSION_WEBGL: number;
-    UNPACK_FLIP_Y_WEBGL: number;
-    UNPACK_PREMULTIPLY_ALPHA_WEBGL: number;
-    UNSIGNED_BYTE: number;
-    UNSIGNED_INT: number;
-    UNSIGNED_SHORT: number;
-    UNSIGNED_SHORT_4_4_4_4: number;
-    UNSIGNED_SHORT_5_5_5_1: number;
-    UNSIGNED_SHORT_5_6_5: number;
-    VALIDATE_STATUS: number;
-    VENDOR: number;
-    VERSION: number;
-    VERTEX_ATTRIB_ARRAY_BUFFER_BINDING: number;
-    VERTEX_ATTRIB_ARRAY_ENABLED: number;
-    VERTEX_ATTRIB_ARRAY_NORMALIZED: number;
-    VERTEX_ATTRIB_ARRAY_POINTER: number;
-    VERTEX_ATTRIB_ARRAY_SIZE: number;
-    VERTEX_ATTRIB_ARRAY_STRIDE: number;
-    VERTEX_ATTRIB_ARRAY_TYPE: number;
-    VERTEX_SHADER: number;
-    VIEWPORT: number;
-    ZERO: number;
+    readonly ACTIVE_ATTRIBUTES: number;
+    readonly ACTIVE_TEXTURE: number;
+    readonly ACTIVE_UNIFORMS: number;
+    readonly ALIASED_LINE_WIDTH_RANGE: number;
+    readonly ALIASED_POINT_SIZE_RANGE: number;
+    readonly ALPHA: number;
+    readonly ALPHA_BITS: number;
+    readonly ALWAYS: number;
+    readonly ARRAY_BUFFER: number;
+    readonly ARRAY_BUFFER_BINDING: number;
+    readonly ATTACHED_SHADERS: number;
+    readonly BACK: number;
+    readonly BLEND: number;
+    readonly BLEND_COLOR: number;
+    readonly BLEND_DST_ALPHA: number;
+    readonly BLEND_DST_RGB: number;
+    readonly BLEND_EQUATION: number;
+    readonly BLEND_EQUATION_ALPHA: number;
+    readonly BLEND_EQUATION_RGB: number;
+    readonly BLEND_SRC_ALPHA: number;
+    readonly BLEND_SRC_RGB: number;
+    readonly BLUE_BITS: number;
+    readonly BOOL: number;
+    readonly BOOL_VEC2: number;
+    readonly BOOL_VEC3: number;
+    readonly BOOL_VEC4: number;
+    readonly BROWSER_DEFAULT_WEBGL: number;
+    readonly BUFFER_SIZE: number;
+    readonly BUFFER_USAGE: number;
+    readonly BYTE: number;
+    readonly CCW: number;
+    readonly CLAMP_TO_EDGE: number;
+    readonly COLOR_ATTACHMENT0: number;
+    readonly COLOR_BUFFER_BIT: number;
+    readonly COLOR_CLEAR_VALUE: number;
+    readonly COLOR_WRITEMASK: number;
+    readonly COMPILE_STATUS: number;
+    readonly COMPRESSED_TEXTURE_FORMATS: number;
+    readonly CONSTANT_ALPHA: number;
+    readonly CONSTANT_COLOR: number;
+    readonly CONTEXT_LOST_WEBGL: number;
+    readonly CULL_FACE: number;
+    readonly CULL_FACE_MODE: number;
+    readonly CURRENT_PROGRAM: number;
+    readonly CURRENT_VERTEX_ATTRIB: number;
+    readonly CW: number;
+    readonly DECR: number;
+    readonly DECR_WRAP: number;
+    readonly DELETE_STATUS: number;
+    readonly DEPTH_ATTACHMENT: number;
+    readonly DEPTH_BITS: number;
+    readonly DEPTH_BUFFER_BIT: number;
+    readonly DEPTH_CLEAR_VALUE: number;
+    readonly DEPTH_COMPONENT: number;
+    readonly DEPTH_COMPONENT16: number;
+    readonly DEPTH_FUNC: number;
+    readonly DEPTH_RANGE: number;
+    readonly DEPTH_STENCIL: number;
+    readonly DEPTH_STENCIL_ATTACHMENT: number;
+    readonly DEPTH_TEST: number;
+    readonly DEPTH_WRITEMASK: number;
+    readonly DITHER: number;
+    readonly DONT_CARE: number;
+    readonly DST_ALPHA: number;
+    readonly DST_COLOR: number;
+    readonly DYNAMIC_DRAW: number;
+    readonly ELEMENT_ARRAY_BUFFER: number;
+    readonly ELEMENT_ARRAY_BUFFER_BINDING: number;
+    readonly EQUAL: number;
+    readonly FASTEST: number;
+    readonly FLOAT: number;
+    readonly FLOAT_MAT2: number;
+    readonly FLOAT_MAT3: number;
+    readonly FLOAT_MAT4: number;
+    readonly FLOAT_VEC2: number;
+    readonly FLOAT_VEC3: number;
+    readonly FLOAT_VEC4: number;
+    readonly FRAGMENT_SHADER: number;
+    readonly FRAMEBUFFER: number;
+    readonly FRAMEBUFFER_ATTACHMENT_OBJECT_NAME: number;
+    readonly FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE: number;
+    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE: number;
+    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL: number;
+    readonly FRAMEBUFFER_BINDING: number;
+    readonly FRAMEBUFFER_COMPLETE: number;
+    readonly FRAMEBUFFER_INCOMPLETE_ATTACHMENT: number;
+    readonly FRAMEBUFFER_INCOMPLETE_DIMENSIONS: number;
+    readonly FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: number;
+    readonly FRAMEBUFFER_UNSUPPORTED: number;
+    readonly FRONT: number;
+    readonly FRONT_AND_BACK: number;
+    readonly FRONT_FACE: number;
+    readonly FUNC_ADD: number;
+    readonly FUNC_REVERSE_SUBTRACT: number;
+    readonly FUNC_SUBTRACT: number;
+    readonly GENERATE_MIPMAP_HINT: number;
+    readonly GEQUAL: number;
+    readonly GREATER: number;
+    readonly GREEN_BITS: number;
+    readonly HIGH_FLOAT: number;
+    readonly HIGH_INT: number;
+    readonly IMPLEMENTATION_COLOR_READ_FORMAT: number;
+    readonly IMPLEMENTATION_COLOR_READ_TYPE: number;
+    readonly INCR: number;
+    readonly INCR_WRAP: number;
+    readonly INT: number;
+    readonly INT_VEC2: number;
+    readonly INT_VEC3: number;
+    readonly INT_VEC4: number;
+    readonly INVALID_ENUM: number;
+    readonly INVALID_FRAMEBUFFER_OPERATION: number;
+    readonly INVALID_OPERATION: number;
+    readonly INVALID_VALUE: number;
+    readonly INVERT: number;
+    readonly KEEP: number;
+    readonly LEQUAL: number;
+    readonly LESS: number;
+    readonly LINEAR: number;
+    readonly LINEAR_MIPMAP_LINEAR: number;
+    readonly LINEAR_MIPMAP_NEAREST: number;
+    readonly LINES: number;
+    readonly LINE_LOOP: number;
+    readonly LINE_STRIP: number;
+    readonly LINE_WIDTH: number;
+    readonly LINK_STATUS: number;
+    readonly LOW_FLOAT: number;
+    readonly LOW_INT: number;
+    readonly LUMINANCE: number;
+    readonly LUMINANCE_ALPHA: number;
+    readonly MAX_COMBINED_TEXTURE_IMAGE_UNITS: number;
+    readonly MAX_CUBE_MAP_TEXTURE_SIZE: number;
+    readonly MAX_FRAGMENT_UNIFORM_VECTORS: number;
+    readonly MAX_RENDERBUFFER_SIZE: number;
+    readonly MAX_TEXTURE_IMAGE_UNITS: number;
+    readonly MAX_TEXTURE_SIZE: number;
+    readonly MAX_VARYING_VECTORS: number;
+    readonly MAX_VERTEX_ATTRIBS: number;
+    readonly MAX_VERTEX_TEXTURE_IMAGE_UNITS: number;
+    readonly MAX_VERTEX_UNIFORM_VECTORS: number;
+    readonly MAX_VIEWPORT_DIMS: number;
+    readonly MEDIUM_FLOAT: number;
+    readonly MEDIUM_INT: number;
+    readonly MIRRORED_REPEAT: number;
+    readonly NEAREST: number;
+    readonly NEAREST_MIPMAP_LINEAR: number;
+    readonly NEAREST_MIPMAP_NEAREST: number;
+    readonly NEVER: number;
+    readonly NICEST: number;
+    readonly NONE: number;
+    readonly NOTEQUAL: number;
+    readonly NO_ERROR: number;
+    readonly ONE: number;
+    readonly ONE_MINUS_CONSTANT_ALPHA: number;
+    readonly ONE_MINUS_CONSTANT_COLOR: number;
+    readonly ONE_MINUS_DST_ALPHA: number;
+    readonly ONE_MINUS_DST_COLOR: number;
+    readonly ONE_MINUS_SRC_ALPHA: number;
+    readonly ONE_MINUS_SRC_COLOR: number;
+    readonly OUT_OF_MEMORY: number;
+    readonly PACK_ALIGNMENT: number;
+    readonly POINTS: number;
+    readonly POLYGON_OFFSET_FACTOR: number;
+    readonly POLYGON_OFFSET_FILL: number;
+    readonly POLYGON_OFFSET_UNITS: number;
+    readonly RED_BITS: number;
+    readonly RENDERBUFFER: number;
+    readonly RENDERBUFFER_ALPHA_SIZE: number;
+    readonly RENDERBUFFER_BINDING: number;
+    readonly RENDERBUFFER_BLUE_SIZE: number;
+    readonly RENDERBUFFER_DEPTH_SIZE: number;
+    readonly RENDERBUFFER_GREEN_SIZE: number;
+    readonly RENDERBUFFER_HEIGHT: number;
+    readonly RENDERBUFFER_INTERNAL_FORMAT: number;
+    readonly RENDERBUFFER_RED_SIZE: number;
+    readonly RENDERBUFFER_STENCIL_SIZE: number;
+    readonly RENDERBUFFER_WIDTH: number;
+    readonly RENDERER: number;
+    readonly REPEAT: number;
+    readonly REPLACE: number;
+    readonly RGB: number;
+    readonly RGB565: number;
+    readonly RGB5_A1: number;
+    readonly RGBA: number;
+    readonly RGBA4: number;
+    readonly SAMPLER_2D: number;
+    readonly SAMPLER_CUBE: number;
+    readonly SAMPLES: number;
+    readonly SAMPLE_ALPHA_TO_COVERAGE: number;
+    readonly SAMPLE_BUFFERS: number;
+    readonly SAMPLE_COVERAGE: number;
+    readonly SAMPLE_COVERAGE_INVERT: number;
+    readonly SAMPLE_COVERAGE_VALUE: number;
+    readonly SCISSOR_BOX: number;
+    readonly SCISSOR_TEST: number;
+    readonly SHADER_TYPE: number;
+    readonly SHADING_LANGUAGE_VERSION: number;
+    readonly SHORT: number;
+    readonly SRC_ALPHA: number;
+    readonly SRC_ALPHA_SATURATE: number;
+    readonly SRC_COLOR: number;
+    readonly STATIC_DRAW: number;
+    readonly STENCIL_ATTACHMENT: number;
+    readonly STENCIL_BACK_FAIL: number;
+    readonly STENCIL_BACK_FUNC: number;
+    readonly STENCIL_BACK_PASS_DEPTH_FAIL: number;
+    readonly STENCIL_BACK_PASS_DEPTH_PASS: number;
+    readonly STENCIL_BACK_REF: number;
+    readonly STENCIL_BACK_VALUE_MASK: number;
+    readonly STENCIL_BACK_WRITEMASK: number;
+    readonly STENCIL_BITS: number;
+    readonly STENCIL_BUFFER_BIT: number;
+    readonly STENCIL_CLEAR_VALUE: number;
+    readonly STENCIL_FAIL: number;
+    readonly STENCIL_FUNC: number;
+    readonly STENCIL_INDEX: number;
+    readonly STENCIL_INDEX8: number;
+    readonly STENCIL_PASS_DEPTH_FAIL: number;
+    readonly STENCIL_PASS_DEPTH_PASS: number;
+    readonly STENCIL_REF: number;
+    readonly STENCIL_TEST: number;
+    readonly STENCIL_VALUE_MASK: number;
+    readonly STENCIL_WRITEMASK: number;
+    readonly STREAM_DRAW: number;
+    readonly SUBPIXEL_BITS: number;
+    readonly TEXTURE: number;
+    readonly TEXTURE0: number;
+    readonly TEXTURE1: number;
+    readonly TEXTURE10: number;
+    readonly TEXTURE11: number;
+    readonly TEXTURE12: number;
+    readonly TEXTURE13: number;
+    readonly TEXTURE14: number;
+    readonly TEXTURE15: number;
+    readonly TEXTURE16: number;
+    readonly TEXTURE17: number;
+    readonly TEXTURE18: number;
+    readonly TEXTURE19: number;
+    readonly TEXTURE2: number;
+    readonly TEXTURE20: number;
+    readonly TEXTURE21: number;
+    readonly TEXTURE22: number;
+    readonly TEXTURE23: number;
+    readonly TEXTURE24: number;
+    readonly TEXTURE25: number;
+    readonly TEXTURE26: number;
+    readonly TEXTURE27: number;
+    readonly TEXTURE28: number;
+    readonly TEXTURE29: number;
+    readonly TEXTURE3: number;
+    readonly TEXTURE30: number;
+    readonly TEXTURE31: number;
+    readonly TEXTURE4: number;
+    readonly TEXTURE5: number;
+    readonly TEXTURE6: number;
+    readonly TEXTURE7: number;
+    readonly TEXTURE8: number;
+    readonly TEXTURE9: number;
+    readonly TEXTURE_2D: number;
+    readonly TEXTURE_BINDING_2D: number;
+    readonly TEXTURE_BINDING_CUBE_MAP: number;
+    readonly TEXTURE_CUBE_MAP: number;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_X: number;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_Y: number;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_Z: number;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_X: number;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_Y: number;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_Z: number;
+    readonly TEXTURE_MAG_FILTER: number;
+    readonly TEXTURE_MIN_FILTER: number;
+    readonly TEXTURE_WRAP_S: number;
+    readonly TEXTURE_WRAP_T: number;
+    readonly TRIANGLES: number;
+    readonly TRIANGLE_FAN: number;
+    readonly TRIANGLE_STRIP: number;
+    readonly UNPACK_ALIGNMENT: number;
+    readonly UNPACK_COLORSPACE_CONVERSION_WEBGL: number;
+    readonly UNPACK_FLIP_Y_WEBGL: number;
+    readonly UNPACK_PREMULTIPLY_ALPHA_WEBGL: number;
+    readonly UNSIGNED_BYTE: number;
+    readonly UNSIGNED_INT: number;
+    readonly UNSIGNED_SHORT: number;
+    readonly UNSIGNED_SHORT_4_4_4_4: number;
+    readonly UNSIGNED_SHORT_5_5_5_1: number;
+    readonly UNSIGNED_SHORT_5_6_5: number;
+    readonly VALIDATE_STATUS: number;
+    readonly VENDOR: number;
+    readonly VERSION: number;
+    readonly VERTEX_ATTRIB_ARRAY_BUFFER_BINDING: number;
+    readonly VERTEX_ATTRIB_ARRAY_ENABLED: number;
+    readonly VERTEX_ATTRIB_ARRAY_NORMALIZED: number;
+    readonly VERTEX_ATTRIB_ARRAY_POINTER: number;
+    readonly VERTEX_ATTRIB_ARRAY_SIZE: number;
+    readonly VERTEX_ATTRIB_ARRAY_STRIDE: number;
+    readonly VERTEX_ATTRIB_ARRAY_TYPE: number;
+    readonly VERTEX_SHADER: number;
+    readonly VIEWPORT: number;
+    readonly ZERO: number;
 }
 
 interface WebGLShader extends WebGLObject {
@@ -17068,9 +18261,9 @@ declare var WebGLShader: {
 }
 
 interface WebGLShaderPrecisionFormat {
-    precision: number;
-    rangeMax: number;
-    rangeMin: number;
+    readonly precision: number;
+    readonly rangeMax: number;
+    readonly rangeMin: number;
 }
 
 declare var WebGLShaderPrecisionFormat: {
@@ -17146,21 +18339,21 @@ declare var WebKitPoint: {
 
 interface WebSocket extends EventTarget {
     binaryType: string;
-    bufferedAmount: number;
-    extensions: string;
+    readonly bufferedAmount: number;
+    readonly extensions: string;
     onclose: (ev: CloseEvent) => any;
     onerror: (ev: Event) => any;
     onmessage: (ev: MessageEvent) => any;
     onopen: (ev: Event) => any;
-    protocol: string;
-    readyState: number;
-    url: string;
+    readonly protocol: string;
+    readonly readyState: number;
+    readonly url: string;
     close(code?: number, reason?: string): void;
     send(data: any): void;
-    CLOSED: number;
-    CLOSING: number;
-    CONNECTING: number;
-    OPEN: number;
+    readonly CLOSED: number;
+    readonly CLOSING: number;
+    readonly CONNECTING: number;
+    readonly OPEN: number;
     addEventListener(type: "close", listener: (ev: CloseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "message", listener: (ev: MessageEvent) => any, useCapture?: boolean): void;
@@ -17171,56 +18364,58 @@ interface WebSocket extends EventTarget {
 declare var WebSocket: {
     prototype: WebSocket;
     new(url: string, protocols?: string | string[]): WebSocket;
-    CLOSED: number;
-    CLOSING: number;
-    CONNECTING: number;
-    OPEN: number;
+    readonly CLOSED: number;
+    readonly CLOSING: number;
+    readonly CONNECTING: number;
+    readonly OPEN: number;
 }
 
 interface WheelEvent extends MouseEvent {
-    deltaMode: number;
-    deltaX: number;
-    deltaY: number;
-    deltaZ: number;
+    readonly deltaMode: number;
+    readonly deltaX: number;
+    readonly deltaY: number;
+    readonly deltaZ: number;
+    readonly wheelDelta: number;
+    readonly wheelDeltaX: number;
+    readonly wheelDeltaY: number;
     getCurrentPoint(element: Element): void;
     initWheelEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, buttonArg: number, relatedTargetArg: EventTarget, modifiersListArg: string, deltaXArg: number, deltaYArg: number, deltaZArg: number, deltaMode: number): void;
-    DOM_DELTA_LINE: number;
-    DOM_DELTA_PAGE: number;
-    DOM_DELTA_PIXEL: number;
+    readonly DOM_DELTA_LINE: number;
+    readonly DOM_DELTA_PAGE: number;
+    readonly DOM_DELTA_PIXEL: number;
 }
 
 declare var WheelEvent: {
     prototype: WheelEvent;
     new(typeArg: string, eventInitDict?: WheelEventInit): WheelEvent;
-    DOM_DELTA_LINE: number;
-    DOM_DELTA_PAGE: number;
-    DOM_DELTA_PIXEL: number;
+    readonly DOM_DELTA_LINE: number;
+    readonly DOM_DELTA_PAGE: number;
+    readonly DOM_DELTA_PIXEL: number;
 }
 
 interface Window extends EventTarget, WindowTimers, WindowSessionStorage, WindowLocalStorage, WindowConsole, GlobalEventHandlers, IDBEnvironment, WindowBase64 {
-    animationStartTime: number;
-    applicationCache: ApplicationCache;
-    clientInformation: Navigator;
-    closed: boolean;
-    crypto: Crypto;
+    readonly applicationCache: ApplicationCache;
+    readonly clientInformation: Navigator;
+    readonly closed: boolean;
+    readonly crypto: Crypto;
     defaultStatus: string;
-    devicePixelRatio: number;
-    doNotTrack: string;
-    document: Document;
+    readonly devicePixelRatio: number;
+    readonly doNotTrack: string;
+    readonly document: Document;
     event: Event;
-    external: External;
-    frameElement: Element;
-    frames: Window;
-    history: History;
-    innerHeight: number;
-    innerWidth: number;
-    length: number;
-    location: Location;
-    locationbar: BarProp;
-    menubar: BarProp;
-    msAnimationStartTime: number;
+    readonly external: External;
+    readonly frameElement: Element;
+    readonly frames: Window;
+    readonly history: History;
+    readonly innerHeight: number;
+    readonly innerWidth: number;
+    readonly length: number;
+    readonly location: Location;
+    readonly locationbar: BarProp;
+    readonly menubar: BarProp;
+    readonly msCredentials: MSCredentials;
     name: string;
-    navigator: Navigator;
+    readonly navigator: Navigator;
     offscreenBuffering: string | boolean;
     onabort: (ev: Event) => any;
     onafterprint: (ev: Event) => any;
@@ -17234,6 +18429,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     oncompassneedscalibration: (ev: Event) => any;
     oncontextmenu: (ev: PointerEvent) => any;
     ondblclick: (ev: MouseEvent) => any;
+    ondevicelight: (ev: DeviceLightEvent) => any;
     ondevicemotion: (ev: DeviceMotionEvent) => any;
     ondeviceorientation: (ev: DeviceOrientationEvent) => any;
     ondrag: (ev: DragEvent) => any;
@@ -17245,11 +18441,12 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     ondrop: (ev: DragEvent) => any;
     ondurationchange: (ev: Event) => any;
     onemptied: (ev: Event) => any;
-    onended: (ev: Event) => any;
+    onended: (ev: MediaStreamErrorEvent) => any;
     onerror: ErrorEventHandler;
     onfocus: (ev: FocusEvent) => any;
     onhashchange: (ev: HashChangeEvent) => any;
     oninput: (ev: Event) => any;
+    oninvalid: (ev: Event) => any;
     onkeydown: (ev: KeyboardEvent) => any;
     onkeypress: (ev: KeyboardEvent) => any;
     onkeyup: (ev: KeyboardEvent) => any;
@@ -17265,7 +18462,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     onmouseout: (ev: MouseEvent) => any;
     onmouseover: (ev: MouseEvent) => any;
     onmouseup: (ev: MouseEvent) => any;
-    onmousewheel: (ev: MouseWheelEvent) => any;
+    onmousewheel: (ev: WheelEvent) => any;
     onmsgesturechange: (ev: MSGestureEvent) => any;
     onmsgesturedoubletap: (ev: MSGestureEvent) => any;
     onmsgestureend: (ev: MSGestureEvent) => any;
@@ -17304,38 +18501,38 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     onsubmit: (ev: Event) => any;
     onsuspend: (ev: Event) => any;
     ontimeupdate: (ev: Event) => any;
-    ontouchcancel: any;
-    ontouchend: any;
-    ontouchmove: any;
-    ontouchstart: any;
+    ontouchcancel: (ev: TouchEvent) => any;
+    ontouchend: (ev: TouchEvent) => any;
+    ontouchmove: (ev: TouchEvent) => any;
+    ontouchstart: (ev: TouchEvent) => any;
     onunload: (ev: Event) => any;
     onvolumechange: (ev: Event) => any;
     onwaiting: (ev: Event) => any;
-    opener: Window;
+    readonly opener: Window;
     orientation: string | number;
-    outerHeight: number;
-    outerWidth: number;
-    pageXOffset: number;
-    pageYOffset: number;
-    parent: Window;
-    performance: Performance;
-    personalbar: BarProp;
-    screen: Screen;
-    screenLeft: number;
-    screenTop: number;
-    screenX: number;
-    screenY: number;
-    scrollX: number;
-    scrollY: number;
-    scrollbars: BarProp;
-    self: Window;
+    readonly outerHeight: number;
+    readonly outerWidth: number;
+    readonly pageXOffset: number;
+    readonly pageYOffset: number;
+    readonly parent: Window;
+    readonly performance: Performance;
+    readonly personalbar: BarProp;
+    readonly screen: Screen;
+    readonly screenLeft: number;
+    readonly screenTop: number;
+    readonly screenX: number;
+    readonly screenY: number;
+    readonly scrollX: number;
+    readonly scrollY: number;
+    readonly scrollbars: BarProp;
+    readonly self: Window;
     status: string;
-    statusbar: BarProp;
-    styleMedia: StyleMedia;
-    toolbar: BarProp;
-    top: Window;
-    window: Window;
-    URL: URL;
+    readonly statusbar: BarProp;
+    readonly styleMedia: StyleMedia;
+    readonly toolbar: BarProp;
+    readonly top: Window;
+    readonly window: Window;
+    URL: typeof URL;
     alert(message?: any): void;
     blur(): void;
     cancelAnimationFrame(handle: number): void;
@@ -17349,12 +18546,9 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     matchMedia(mediaQuery: string): MediaQueryList;
     moveBy(x?: number, y?: number): void;
     moveTo(x?: number, y?: number): void;
-    msCancelRequestAnimationFrame(handle: number): void;
-    msMatchMedia(mediaQuery: string): MediaQueryList;
-    msRequestAnimationFrame(callback: FrameRequestCallback): number;
     msWriteProfilerMark(profilerMarkName: string): void;
     open(url?: string, target?: string, features?: string, replace?: boolean): Window;
-    postMessage(message: any, targetOrigin: string, ports?: any): void;
+    postMessage(message: any, targetOrigin: string, transfer?: any[]): void;
     print(): void;
     prompt(message?: string, _default?: string): string;
     releaseEvents(): void;
@@ -17364,8 +18558,10 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     scroll(x?: number, y?: number): void;
     scrollBy(x?: number, y?: number): void;
     scrollTo(x?: number, y?: number): void;
+    webkitCancelAnimationFrame(handle: number): void;
     webkitConvertPointFromNodeToPage(node: Node, pt: WebKitPoint): WebKitPoint;
     webkitConvertPointFromPageToNode(node: Node, pt: WebKitPoint): WebKitPoint;
+    webkitRequestAnimationFrame(callback: FrameRequestCallback): number;
     addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -17393,6 +18589,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     addEventListener(type: "compassneedscalibration", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "devicelight", listener: (ev: DeviceLightEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "devicemotion", listener: (ev: DeviceMotionEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deviceorientation", listener: (ev: DeviceOrientationEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -17404,10 +18601,11 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "hashchange", listener: (ev: HashChangeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -17423,7 +18621,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "offline", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "online", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "orientationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -17493,16 +18691,15 @@ declare var XMLDocument: {
 interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
     msCaching: string;
     onreadystatechange: (ev: ProgressEvent) => any;
-    readyState: number;
-    response: any;
-    responseBody: any;
-    responseText: string;
+    readonly readyState: number;
+    readonly response: any;
+    readonly responseText: string;
     responseType: string;
-    responseXML: any;
-    status: number;
-    statusText: string;
+    readonly responseXML: any;
+    readonly status: number;
+    readonly statusText: string;
     timeout: number;
-    upload: XMLHttpRequestUpload;
+    readonly upload: XMLHttpRequestUpload;
     withCredentials: boolean;
     abort(): void;
     getAllResponseHeaders(): string;
@@ -17514,11 +18711,11 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
     send(data?: string): void;
     send(data?: any): void;
     setRequestHeader(header: string, value: string): void;
-    DONE: number;
-    HEADERS_RECEIVED: number;
-    LOADING: number;
-    OPENED: number;
-    UNSENT: number;
+    readonly DONE: number;
+    readonly HEADERS_RECEIVED: number;
+    readonly LOADING: number;
+    readonly OPENED: number;
+    readonly UNSENT: number;
     addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -17533,11 +18730,11 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
 declare var XMLHttpRequest: {
     prototype: XMLHttpRequest;
     new(): XMLHttpRequest;
-    DONE: number;
-    HEADERS_RECEIVED: number;
-    LOADING: number;
-    OPENED: number;
-    UNSENT: number;
+    readonly DONE: number;
+    readonly HEADERS_RECEIVED: number;
+    readonly LOADING: number;
+    readonly OPENED: number;
+    readonly UNSENT: number;
     create(): XMLHttpRequest;
 }
 
@@ -17589,40 +18786,40 @@ declare var XPathNSResolver: {
 }
 
 interface XPathResult {
-    booleanValue: boolean;
-    invalidIteratorState: boolean;
-    numberValue: number;
-    resultType: number;
-    singleNodeValue: Node;
-    snapshotLength: number;
-    stringValue: string;
+    readonly booleanValue: boolean;
+    readonly invalidIteratorState: boolean;
+    readonly numberValue: number;
+    readonly resultType: number;
+    readonly singleNodeValue: Node;
+    readonly snapshotLength: number;
+    readonly stringValue: string;
     iterateNext(): Node;
     snapshotItem(index: number): Node;
-    ANY_TYPE: number;
-    ANY_UNORDERED_NODE_TYPE: number;
-    BOOLEAN_TYPE: number;
-    FIRST_ORDERED_NODE_TYPE: number;
-    NUMBER_TYPE: number;
-    ORDERED_NODE_ITERATOR_TYPE: number;
-    ORDERED_NODE_SNAPSHOT_TYPE: number;
-    STRING_TYPE: number;
-    UNORDERED_NODE_ITERATOR_TYPE: number;
-    UNORDERED_NODE_SNAPSHOT_TYPE: number;
+    readonly ANY_TYPE: number;
+    readonly ANY_UNORDERED_NODE_TYPE: number;
+    readonly BOOLEAN_TYPE: number;
+    readonly FIRST_ORDERED_NODE_TYPE: number;
+    readonly NUMBER_TYPE: number;
+    readonly ORDERED_NODE_ITERATOR_TYPE: number;
+    readonly ORDERED_NODE_SNAPSHOT_TYPE: number;
+    readonly STRING_TYPE: number;
+    readonly UNORDERED_NODE_ITERATOR_TYPE: number;
+    readonly UNORDERED_NODE_SNAPSHOT_TYPE: number;
 }
 
 declare var XPathResult: {
     prototype: XPathResult;
     new(): XPathResult;
-    ANY_TYPE: number;
-    ANY_UNORDERED_NODE_TYPE: number;
-    BOOLEAN_TYPE: number;
-    FIRST_ORDERED_NODE_TYPE: number;
-    NUMBER_TYPE: number;
-    ORDERED_NODE_ITERATOR_TYPE: number;
-    ORDERED_NODE_SNAPSHOT_TYPE: number;
-    STRING_TYPE: number;
-    UNORDERED_NODE_ITERATOR_TYPE: number;
-    UNORDERED_NODE_SNAPSHOT_TYPE: number;
+    readonly ANY_TYPE: number;
+    readonly ANY_UNORDERED_NODE_TYPE: number;
+    readonly BOOLEAN_TYPE: number;
+    readonly FIRST_ORDERED_NODE_TYPE: number;
+    readonly NUMBER_TYPE: number;
+    readonly ORDERED_NODE_ITERATOR_TYPE: number;
+    readonly ORDERED_NODE_SNAPSHOT_TYPE: number;
+    readonly STRING_TYPE: number;
+    readonly UNORDERED_NODE_ITERATOR_TYPE: number;
+    readonly UNORDERED_NODE_SNAPSHOT_TYPE: number;
 }
 
 interface XSLTProcessor {
@@ -17647,6 +18844,18 @@ interface AbstractWorker {
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
+interface CanvasPathMethods {
+    arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void;
+    arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void;
+    bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void;
+    closePath(): void;
+    ellipse(x: number, y: number, radiusX: number, radiusY: number, rotation: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void;
+    lineTo(x: number, y: number): void;
+    moveTo(x: number, y: number): void;
+    quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
+    rect(x: number, y: number, w: number, h: number): void;
+}
+
 interface ChildNode {
     remove(): void;
 }
@@ -17669,6 +18878,7 @@ interface DocumentEvent {
     createEvent(eventInterface:"CommandEvent"): CommandEvent;
     createEvent(eventInterface:"CompositionEvent"): CompositionEvent;
     createEvent(eventInterface:"CustomEvent"): CustomEvent;
+    createEvent(eventInterface:"DeviceLightEvent"): DeviceLightEvent;
     createEvent(eventInterface:"DeviceMotionEvent"): DeviceMotionEvent;
     createEvent(eventInterface:"DeviceOrientationEvent"): DeviceOrientationEvent;
     createEvent(eventInterface:"DragEvent"): DragEvent;
@@ -17680,6 +18890,7 @@ interface DocumentEvent {
     createEvent(eventInterface:"HashChangeEvent"): HashChangeEvent;
     createEvent(eventInterface:"IDBVersionChangeEvent"): IDBVersionChangeEvent;
     createEvent(eventInterface:"KeyboardEvent"): KeyboardEvent;
+    createEvent(eventInterface:"ListeningStateChangedEvent"): ListeningStateChangedEvent;
     createEvent(eventInterface:"LongRunningScriptDetectedEvent"): LongRunningScriptDetectedEvent;
     createEvent(eventInterface:"MSGestureEvent"): MSGestureEvent;
     createEvent(eventInterface:"MSManipulationEvent"): MSManipulationEvent;
@@ -17687,21 +18898,31 @@ interface DocumentEvent {
     createEvent(eventInterface:"MSMediaKeyNeededEvent"): MSMediaKeyNeededEvent;
     createEvent(eventInterface:"MSPointerEvent"): MSPointerEvent;
     createEvent(eventInterface:"MSSiteModeEvent"): MSSiteModeEvent;
+    createEvent(eventInterface:"MediaEncryptedEvent"): MediaEncryptedEvent;
+    createEvent(eventInterface:"MediaKeyMessageEvent"): MediaKeyMessageEvent;
+    createEvent(eventInterface:"MediaStreamErrorEvent"): MediaStreamErrorEvent;
+    createEvent(eventInterface:"MediaStreamTrackEvent"): MediaStreamTrackEvent;
     createEvent(eventInterface:"MessageEvent"): MessageEvent;
     createEvent(eventInterface:"MouseEvent"): MouseEvent;
     createEvent(eventInterface:"MouseEvents"): MouseEvent;
-    createEvent(eventInterface:"MouseWheelEvent"): MouseWheelEvent;
     createEvent(eventInterface:"MutationEvent"): MutationEvent;
     createEvent(eventInterface:"MutationEvents"): MutationEvent;
     createEvent(eventInterface:"NavigationCompletedEvent"): NavigationCompletedEvent;
     createEvent(eventInterface:"NavigationEvent"): NavigationEvent;
     createEvent(eventInterface:"NavigationEventWithReferrer"): NavigationEventWithReferrer;
     createEvent(eventInterface:"OfflineAudioCompletionEvent"): OfflineAudioCompletionEvent;
+    createEvent(eventInterface:"OverflowEvent"): OverflowEvent;
     createEvent(eventInterface:"PageTransitionEvent"): PageTransitionEvent;
     createEvent(eventInterface:"PermissionRequestedEvent"): PermissionRequestedEvent;
     createEvent(eventInterface:"PointerEvent"): PointerEvent;
     createEvent(eventInterface:"PopStateEvent"): PopStateEvent;
     createEvent(eventInterface:"ProgressEvent"): ProgressEvent;
+    createEvent(eventInterface:"RTCDTMFToneChangeEvent"): RTCDTMFToneChangeEvent;
+    createEvent(eventInterface:"RTCDtlsTransportStateChangedEvent"): RTCDtlsTransportStateChangedEvent;
+    createEvent(eventInterface:"RTCIceCandidatePairChangedEvent"): RTCIceCandidatePairChangedEvent;
+    createEvent(eventInterface:"RTCIceGathererEvent"): RTCIceGathererEvent;
+    createEvent(eventInterface:"RTCIceTransportStateChangedEvent"): RTCIceTransportStateChangedEvent;
+    createEvent(eventInterface:"RTCSsrcConflictEvent"): RTCSsrcConflictEvent;
     createEvent(eventInterface:"SVGZoomEvent"): SVGZoomEvent;
     createEvent(eventInterface:"SVGZoomEvents"): SVGZoomEvent;
     createEvent(eventInterface:"ScriptNotifyEvent"): ScriptNotifyEvent;
@@ -17719,11 +18940,11 @@ interface DocumentEvent {
 }
 
 interface ElementTraversal {
-    childElementCount: number;
-    firstElementChild: Element;
-    lastElementChild: Element;
-    nextElementSibling: Element;
-    previousElementSibling: Element;
+    readonly childElementCount: number;
+    readonly firstElementChild: Element;
+    readonly lastElementChild: Element;
+    readonly nextElementSibling: Element;
+    readonly previousElementSibling: Element;
 }
 
 interface GetSVGDocument {
@@ -17768,12 +18989,11 @@ interface HTMLTableAlignment {
 }
 
 interface IDBEnvironment {
-    indexedDB: IDBFactory;
-    msIndexedDB: IDBFactory;
+    readonly indexedDB: IDBFactory;
 }
 
 interface LinkStyle {
-    sheet: StyleSheet;
+    readonly sheet: StyleSheet;
 }
 
 interface MSBaseReader {
@@ -17783,12 +19003,12 @@ interface MSBaseReader {
     onloadend: (ev: ProgressEvent) => any;
     onloadstart: (ev: Event) => any;
     onprogress: (ev: ProgressEvent) => any;
-    readyState: number;
-    result: any;
+    readonly readyState: number;
+    readonly result: any;
     abort(): void;
-    DONE: number;
-    EMPTY: number;
-    LOADING: number;
+    readonly DONE: number;
+    readonly EMPTY: number;
+    readonly LOADING: number;
     addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -17816,27 +19036,32 @@ interface NavigatorContentUtils {
 }
 
 interface NavigatorGeolocation {
-    geolocation: Geolocation;
+    readonly geolocation: Geolocation;
 }
 
 interface NavigatorID {
-    appName: string;
-    appVersion: string;
-    platform: string;
-    product: string;
-    productSub: string;
-    userAgent: string;
-    vendor: string;
-    vendorSub: string;
+    readonly appName: string;
+    readonly appVersion: string;
+    readonly platform: string;
+    readonly product: string;
+    readonly productSub: string;
+    readonly userAgent: string;
+    readonly vendor: string;
+    readonly vendorSub: string;
 }
 
 interface NavigatorOnLine {
-    onLine: boolean;
+    readonly onLine: boolean;
 }
 
 interface NavigatorStorageUtils {
 }
 
+interface NavigatorUserMedia {
+    readonly mediaDevices: MediaDevices;
+    getUserMedia(constraints: MediaStreamConstraints, successCallback: NavigatorUserMediaSuccessCallback, errorCallback: NavigatorUserMediaErrorCallback): void;
+}
+
 interface NodeSelector {
     querySelector(selectors: string): Element;
     querySelectorAll(selectors: string): NodeListOf<Element>;
@@ -17847,29 +19072,29 @@ interface RandomSource {
 }
 
 interface SVGAnimatedPathData {
-    pathSegList: SVGPathSegList;
+    readonly pathSegList: SVGPathSegList;
 }
 
 interface SVGAnimatedPoints {
-    animatedPoints: SVGPointList;
-    points: SVGPointList;
+    readonly animatedPoints: SVGPointList;
+    readonly points: SVGPointList;
 }
 
 interface SVGExternalResourcesRequired {
-    externalResourcesRequired: SVGAnimatedBoolean;
+    readonly externalResourcesRequired: SVGAnimatedBoolean;
 }
 
 interface SVGFilterPrimitiveStandardAttributes extends SVGStylable {
-    height: SVGAnimatedLength;
-    result: SVGAnimatedString;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly height: SVGAnimatedLength;
+    readonly result: SVGAnimatedString;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
 }
 
 interface SVGFitToViewBox {
-    preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
-    viewBox: SVGAnimatedRect;
+    readonly preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
+    readonly viewBox: SVGAnimatedRect;
 }
 
 interface SVGLangSpace {
@@ -17878,8 +19103,8 @@ interface SVGLangSpace {
 }
 
 interface SVGLocatable {
-    farthestViewportElement: SVGElement;
-    nearestViewportElement: SVGElement;
+    readonly farthestViewportElement: SVGElement;
+    readonly nearestViewportElement: SVGElement;
     getBBox(): SVGRect;
     getCTM(): SVGMatrix;
     getScreenCTM(): SVGMatrix;
@@ -17888,22 +19113,22 @@ interface SVGLocatable {
 
 interface SVGStylable {
     className: any;
-    style: CSSStyleDeclaration;
+    readonly style: CSSStyleDeclaration;
 }
 
 interface SVGTests {
-    requiredExtensions: SVGStringList;
-    requiredFeatures: SVGStringList;
-    systemLanguage: SVGStringList;
+    readonly requiredExtensions: SVGStringList;
+    readonly requiredFeatures: SVGStringList;
+    readonly systemLanguage: SVGStringList;
     hasExtension(extension: string): boolean;
 }
 
 interface SVGTransformable extends SVGLocatable {
-    transform: SVGAnimatedTransformList;
+    readonly transform: SVGAnimatedTransformList;
 }
 
 interface SVGURIReference {
-    href: SVGAnimatedString;
+    readonly href: SVGAnimatedString;
 }
 
 interface WindowBase64 {
@@ -17912,15 +19137,15 @@ interface WindowBase64 {
 }
 
 interface WindowConsole {
-    console: Console;
+    readonly console: Console;
 }
 
 interface WindowLocalStorage {
-    localStorage: Storage;
+    readonly localStorage: Storage;
 }
 
 interface WindowSessionStorage {
-    sessionStorage: Storage;
+    readonly sessionStorage: Storage;
 }
 
 interface WindowTimers extends Object, WindowTimersExtension {
@@ -17932,8 +19157,6 @@ interface WindowTimers extends Object, WindowTimersExtension {
 
 interface WindowTimersExtension {
     clearImmediate(handle: number): void;
-    msClearImmediate(handle: number): void;
-    msSetImmediate(expression: any, ...args: any[]): number;
     setImmediate(expression: any, ...args: any[]): number;
 }
 
@@ -17963,22 +19186,18 @@ interface StorageEventInit extends EventInit {
     storageArea?: Storage;
 }
 
-interface IDBObjectStoreParameters {
-    keyPath?: string | string[];
-    autoIncrement?: boolean;
-}
-
-interface IDBIndexParameters {
-    unique?: boolean;
-    multiEntry?: boolean;
-}
-
 interface NodeListOf<TNode extends Node> extends NodeList {
     length: number;
     item(index: number): TNode;
     [index: number]: TNode;
 }
 
+interface HTMLCollectionOf<T extends Element> extends HTMLCollection {
+    item(index: number): T;
+    namedItem(name: string): T;
+    [index: number]: T;
+}
+
 interface BlobPropertyBag {
     type?: string;
     endings?: string;
@@ -18008,15 +19227,6 @@ interface ProgressEventInit extends EventInit {
     total?: number;
 }
 
-interface HTMLTemplateElement extends HTMLElement {
-    content: DocumentFragment;
-}
-
-declare var HTMLTemplateElement: {
-    prototype: HTMLTemplateElement;
-    new(): HTMLTemplateElement;
-}
-
 interface HTMLPictureElement extends HTMLElement {
 }
 
@@ -18025,6 +19235,14 @@ declare var HTMLPictureElement: {
     new(): HTMLPictureElement;
 }
 
+interface ClipboardEventInit extends EventInit {
+    data?: string;
+    dataType?: string;
+}
+
+interface IDBArrayKey extends Array<IDBValidKey> {
+}
+
 declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
 
 interface ErrorEventHandler {
@@ -18058,15 +19276,23 @@ interface DecodeSuccessCallback {
     (decodedData: AudioBuffer): void;
 }
 interface DecodeErrorCallback {
-    (): void;
+    (error: DOMException): void;
 }
 interface FunctionStringCallback {
     (data: string): void;
 }
+interface NavigatorUserMediaSuccessCallback {
+    (stream: MediaStream): void;
+}
+interface NavigatorUserMediaErrorCallback {
+    (error: MediaStreamError): void;
+}
+interface ForEachCallback {
+    (keyId: any, status: string): void;
+}
 declare var Audio: {new(src?: string): HTMLAudioElement; };
 declare var Image: {new(width?: number, height?: number): HTMLImageElement; };
 declare var Option: {new(text?: string, value?: string, defaultSelected?: boolean, selected?: boolean): HTMLOptionElement; };
-declare var animationStartTime: number;
 declare var applicationCache: ApplicationCache;
 declare var clientInformation: Navigator;
 declare var closed: boolean;
@@ -18086,7 +19312,7 @@ declare var length: number;
 declare var location: Location;
 declare var locationbar: BarProp;
 declare var menubar: BarProp;
-declare var msAnimationStartTime: number;
+declare var msCredentials: MSCredentials;
 declare var name: string;
 declare var navigator: Navigator;
 declare var offscreenBuffering: string | boolean;
@@ -18102,6 +19328,7 @@ declare var onclick: (ev: MouseEvent) => any;
 declare var oncompassneedscalibration: (ev: Event) => any;
 declare var oncontextmenu: (ev: PointerEvent) => any;
 declare var ondblclick: (ev: MouseEvent) => any;
+declare var ondevicelight: (ev: DeviceLightEvent) => any;
 declare var ondevicemotion: (ev: DeviceMotionEvent) => any;
 declare var ondeviceorientation: (ev: DeviceOrientationEvent) => any;
 declare var ondrag: (ev: DragEvent) => any;
@@ -18113,11 +19340,12 @@ declare var ondragstart: (ev: DragEvent) => any;
 declare var ondrop: (ev: DragEvent) => any;
 declare var ondurationchange: (ev: Event) => any;
 declare var onemptied: (ev: Event) => any;
-declare var onended: (ev: Event) => any;
+declare var onended: (ev: MediaStreamErrorEvent) => any;
 declare var onerror: ErrorEventHandler;
 declare var onfocus: (ev: FocusEvent) => any;
 declare var onhashchange: (ev: HashChangeEvent) => any;
 declare var oninput: (ev: Event) => any;
+declare var oninvalid: (ev: Event) => any;
 declare var onkeydown: (ev: KeyboardEvent) => any;
 declare var onkeypress: (ev: KeyboardEvent) => any;
 declare var onkeyup: (ev: KeyboardEvent) => any;
@@ -18133,7 +19361,7 @@ declare var onmousemove: (ev: MouseEvent) => any;
 declare var onmouseout: (ev: MouseEvent) => any;
 declare var onmouseover: (ev: MouseEvent) => any;
 declare var onmouseup: (ev: MouseEvent) => any;
-declare var onmousewheel: (ev: MouseWheelEvent) => any;
+declare var onmousewheel: (ev: WheelEvent) => any;
 declare var onmsgesturechange: (ev: MSGestureEvent) => any;
 declare var onmsgesturedoubletap: (ev: MSGestureEvent) => any;
 declare var onmsgestureend: (ev: MSGestureEvent) => any;
@@ -18172,10 +19400,10 @@ declare var onstorage: (ev: StorageEvent) => any;
 declare var onsubmit: (ev: Event) => any;
 declare var onsuspend: (ev: Event) => any;
 declare var ontimeupdate: (ev: Event) => any;
-declare var ontouchcancel: any;
-declare var ontouchend: any;
-declare var ontouchmove: any;
-declare var ontouchstart: any;
+declare var ontouchcancel: (ev: TouchEvent) => any;
+declare var ontouchend: (ev: TouchEvent) => any;
+declare var ontouchmove: (ev: TouchEvent) => any;
+declare var ontouchstart: (ev: TouchEvent) => any;
 declare var onunload: (ev: Event) => any;
 declare var onvolumechange: (ev: Event) => any;
 declare var onwaiting: (ev: Event) => any;
@@ -18203,7 +19431,6 @@ declare var styleMedia: StyleMedia;
 declare var toolbar: BarProp;
 declare var top: Window;
 declare var window: Window;
-declare var URL: URL;
 declare function alert(message?: any): void;
 declare function blur(): void;
 declare function cancelAnimationFrame(handle: number): void;
@@ -18217,12 +19444,9 @@ declare function getSelection(): Selection;
 declare function matchMedia(mediaQuery: string): MediaQueryList;
 declare function moveBy(x?: number, y?: number): void;
 declare function moveTo(x?: number, y?: number): void;
-declare function msCancelRequestAnimationFrame(handle: number): void;
-declare function msMatchMedia(mediaQuery: string): MediaQueryList;
-declare function msRequestAnimationFrame(callback: FrameRequestCallback): number;
 declare function msWriteProfilerMark(profilerMarkName: string): void;
 declare function open(url?: string, target?: string, features?: string, replace?: boolean): Window;
-declare function postMessage(message: any, targetOrigin: string, ports?: any): void;
+declare function postMessage(message: any, targetOrigin: string, transfer?: any[]): void;
 declare function print(): void;
 declare function prompt(message?: string, _default?: string): string;
 declare function releaseEvents(): void;
@@ -18232,19 +19456,19 @@ declare function resizeTo(x?: number, y?: number): void;
 declare function scroll(x?: number, y?: number): void;
 declare function scrollBy(x?: number, y?: number): void;
 declare function scrollTo(x?: number, y?: number): void;
+declare function webkitCancelAnimationFrame(handle: number): void;
 declare function webkitConvertPointFromNodeToPage(node: Node, pt: WebKitPoint): WebKitPoint;
 declare function webkitConvertPointFromPageToNode(node: Node, pt: WebKitPoint): WebKitPoint;
+declare function webkitRequestAnimationFrame(callback: FrameRequestCallback): number;
 declare function toString(): string;
-declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+declare function addEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 declare function dispatchEvent(evt: Event): boolean;
-declare function removeEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+declare function removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 declare function clearInterval(handle: number): void;
 declare function clearTimeout(handle: number): void;
 declare function setInterval(handler: any, timeout?: any, ...args: any[]): number;
 declare function setTimeout(handler: any, timeout?: any, ...args: any[]): number;
 declare function clearImmediate(handle: number): void;
-declare function msClearImmediate(handle: number): void;
-declare function msSetImmediate(expression: any, ...args: any[]): number;
 declare function setImmediate(expression: any, ...args: any[]): number;
 declare var sessionStorage: Storage;
 declare var localStorage: Storage;
@@ -18259,7 +19483,6 @@ declare var onpointerover: (ev: PointerEvent) => any;
 declare var onpointerup: (ev: PointerEvent) => any;
 declare var onwheel: (ev: WheelEvent) => any;
 declare var indexedDB: IDBFactory;
-declare var msIndexedDB: IDBFactory;
 declare function atob(encodedString: string): string;
 declare function btoa(rawString: string): string;
 declare function addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -18289,6 +19512,7 @@ declare function addEventListener(type: "click", listener: (ev: MouseEvent) => a
 declare function addEventListener(type: "compassneedscalibration", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
+declare function addEventListener(type: "devicelight", listener: (ev: DeviceLightEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "devicemotion", listener: (ev: DeviceMotionEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "deviceorientation", listener: (ev: DeviceOrientationEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -18300,10 +19524,11 @@ declare function addEventListener(type: "dragstart", listener: (ev: DragEvent) =
 declare function addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+declare function addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "hashchange", listener: (ev: HashChangeEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+declare function addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -18319,7 +19544,7 @@ declare function addEventListener(type: "mousemove", listener: (ev: MouseEvent)
 declare function addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+declare function addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "offline", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "online", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "orientationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -18355,18 +19580,39 @@ declare function addEventListener(type: "unload", listener: (ev: Event) => any,
 declare function addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;interface DOMTokenList {
-    [Symbol.iterator](): IterableIterator<string>;
-}
-
-interface NodeList {
-    [Symbol.iterator](): IterableIterator<Node>
-}
-
-interface NodeListOf<TNode extends Node> {
-    [Symbol.iterator](): IterableIterator<TNode>
-}
-
+declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+type AAGUID = string;
+type AlgorithmIdentifier = string | Algorithm;
+type ConstrainBoolean = boolean | ConstrainBooleanParameters;
+type ConstrainDOMString = string | string[] | ConstrainDOMStringParameters;
+type ConstrainDouble = number | ConstrainDoubleRange;
+type ConstrainLong = number | ConstrainLongRange;
+type CryptoOperationData = ArrayBufferView;
+type GLbitfield = number;
+type GLboolean = boolean;
+type GLbyte = number;
+type GLclampf = number;
+type GLenum = number;
+type GLfloat = number;
+type GLint = number;
+type GLintptr = number;
+type GLshort = number;
+type GLsizei = number;
+type GLsizeiptr = number;
+type GLubyte = number;
+type GLuint = number;
+type GLushort = number;
+type IDBKeyPath = string;
+type KeyFormat = string;
+type KeyType = string;
+type KeyUsage = string;
+type MSInboundPayload = MSVideoRecvPayload | MSAudioRecvPayload;
+type MSLocalClientEvent = MSLocalClientEventBase | MSAudioLocalClientEvent;
+type MSOutboundPayload = MSVideoSendPayload | MSAudioSendPayload;
+type RTCIceGatherCandidate = RTCIceCandidate | RTCIceCandidateComplete;
+type RTCTransport = RTCDtlsTransport | RTCSrtpSdesTransport;
+type payloadtype = number;
+type IDBValidKey = number | string | Date | IDBArrayKey;
 /////////////////////////////
 /// WorkerGlobalScope APIs 
 /////////////////////////////
diff --git a/lib/lib.scriptHost.d.ts b/lib/lib.scriptHost.d.ts
index 12e04fb4144..d4c6131fd93 100644
--- a/lib/lib.scriptHost.d.ts
+++ b/lib/lib.scriptHost.d.ts
@@ -13,7 +13,7 @@ See the Apache Version 2.0 License for specific language governing permissions
 and limitations under the License.
 ***************************************************************************** */
 
-/// <reference path="lib.core.d.ts" />
+/// <reference no-default-lib="true"/>
 
 
 /////////////////////////////
diff --git a/lib/lib.webworker.d.ts b/lib/lib.webworker.d.ts
index 33e0d0f9ded..9c54643a2ce 100644
--- a/lib/lib.webworker.d.ts
+++ b/lib/lib.webworker.d.ts
@@ -13,208 +13,7 @@ See the Apache Version 2.0 License for specific language governing permissions
 and limitations under the License.
 ***************************************************************************** */
 
-/// <reference path="lib.core.d.ts" />
-/////////////////////////////
-/// ECMAScript Internationalization API 
-/////////////////////////////
-
-declare module Intl {
-    interface CollatorOptions {
-        usage?: string;
-        localeMatcher?: string;
-        numeric?: boolean;
-        caseFirst?: string;
-        sensitivity?: string;
-        ignorePunctuation?: boolean;
-    }
-
-    interface ResolvedCollatorOptions {
-        locale: string;
-        usage: string;
-        sensitivity: string;
-        ignorePunctuation: boolean;
-        collation: string;
-        caseFirst: string;
-        numeric: boolean;
-    }
-
-    interface Collator {
-        compare(x: string, y: string): number;
-        resolvedOptions(): ResolvedCollatorOptions;
-    }
-    var Collator: {
-        new (locales?: string[], options?: CollatorOptions): Collator;
-        new (locale?: string, options?: CollatorOptions): Collator;
-        (locales?: string[], options?: CollatorOptions): Collator;
-        (locale?: string, options?: CollatorOptions): Collator;
-        supportedLocalesOf(locales: string[], options?: CollatorOptions): string[];
-        supportedLocalesOf(locale: string, options?: CollatorOptions): string[];
-    }
-
-    interface NumberFormatOptions {
-        localeMatcher?: string;
-        style?: string;
-        currency?: string;
-        currencyDisplay?: string;
-        useGrouping?: boolean;
-        minimumIntegerDigits?: number;
-        minimumFractionDigits?: number;
-        maximumFractionDigits?: number;
-        minimumSignificantDigits?: number;
-        maximumSignificantDigits?: number;
-    }
-
-    interface ResolvedNumberFormatOptions {
-        locale: string;
-        numberingSystem: string;
-        style: string;
-        currency?: string;
-        currencyDisplay?: string;
-        minimumIntegerDigits: number;
-        minimumFractionDigits: number;
-        maximumFractionDigits: number;
-        minimumSignificantDigits?: number;
-        maximumSignificantDigits?: number;
-        useGrouping: boolean;
-    }
-
-    interface NumberFormat {
-        format(value: number): string;
-        resolvedOptions(): ResolvedNumberFormatOptions;
-    }
-    var NumberFormat: {
-        new (locales?: string[], options?: NumberFormatOptions): NumberFormat;
-        new (locale?: string, options?: NumberFormatOptions): NumberFormat;
-        (locales?: string[], options?: NumberFormatOptions): NumberFormat;
-        (locale?: string, options?: NumberFormatOptions): NumberFormat;
-        supportedLocalesOf(locales: string[], options?: NumberFormatOptions): string[];
-        supportedLocalesOf(locale: string, options?: NumberFormatOptions): string[];
-    }
-
-    interface DateTimeFormatOptions {
-        localeMatcher?: string;
-        weekday?: string;
-        era?: string;
-        year?: string;
-        month?: string;
-        day?: string;
-        hour?: string;
-        minute?: string;
-        second?: string;
-        timeZoneName?: string;
-        formatMatcher?: string;
-        hour12?: boolean;
-        timeZone?: string;
-    }
-
-    interface ResolvedDateTimeFormatOptions {
-        locale: string;
-        calendar: string;
-        numberingSystem: string;
-        timeZone: string;
-        hour12?: boolean;
-        weekday?: string;
-        era?: string;
-        year?: string;
-        month?: string;
-        day?: string;
-        hour?: string;
-        minute?: string;
-        second?: string;
-        timeZoneName?: string;
-    }
-
-    interface DateTimeFormat {
-        format(date?: Date | number): string;
-        resolvedOptions(): ResolvedDateTimeFormatOptions;
-    }
-    var DateTimeFormat: {
-        new (locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
-        new (locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
-        (locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
-        (locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
-        supportedLocalesOf(locales: string[], options?: DateTimeFormatOptions): string[];
-        supportedLocalesOf(locale: string, options?: DateTimeFormatOptions): string[];
-    }
-}
-
-interface String {
-    /**
-      * Determines whether two strings are equivalent in the current locale.
-      * @param that String to compare to target string
-      * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used. This parameter must conform to BCP 47 standards; see the Intl.Collator object for details.
-      * @param options An object that contains one or more properties that specify comparison options. see the Intl.Collator object for details.
-      */
-    localeCompare(that: string, locales: string[], options?: Intl.CollatorOptions): number;
-
-    /**
-      * Determines whether two strings are equivalent in the current locale.
-      * @param that String to compare to target string
-      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used. This parameter must conform to BCP 47 standards; see the Intl.Collator object for details.
-      * @param options An object that contains one or more properties that specify comparison options. see the Intl.Collator object for details.
-      */
-    localeCompare(that: string, locale: string, options?: Intl.CollatorOptions): number;
-}
-
-interface Number {
-    /**
-      * Converts a number to a string by using the current or specified locale. 
-      * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleString(locales?: string[], options?: Intl.NumberFormatOptions): string;
-
-    /**
-      * Converts a number to a string by using the current or specified locale. 
-      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleString(locale?: string, options?: Intl.NumberFormatOptions): string;
-}
-
-interface Date {
-    /**
-      * Converts a date and time to a string by using the current or specified locale.  
-      * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleString(locales?: string[], options?: Intl.DateTimeFormatOptions): string;
-    /**
-      * Converts a date to a string by using the current or specified locale.  
-      * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleDateString(locales?: string[], options?: Intl.DateTimeFormatOptions): string;
-
-    /**
-      * Converts a time to a string by using the current or specified locale.  
-      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleTimeString(locale?: string[], options?: Intl.DateTimeFormatOptions): string;
-    
-    /**
-      * Converts a date and time to a string by using the current or specified locale.  
-      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleString(locale?: string, options?: Intl.DateTimeFormatOptions): string;
-    
-    /**
-      * Converts a date to a string by using the current or specified locale.  
-      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleDateString(locale?: string, options?: Intl.DateTimeFormatOptions): string;
-
-    /**
-      * Converts a time to a string by using the current or specified locale.  
-      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleTimeString(locale?: string, options?: Intl.DateTimeFormatOptions): string;
-}
-
+/// <reference no-default-lib="true"/>
 
 /////////////////////////////
 /// IE Worker APIs
@@ -230,10 +29,12 @@ interface EventListener {
 }
 
 interface AudioBuffer {
-    duration: number;
-    length: number;
-    numberOfChannels: number;
-    sampleRate: number;
+    readonly duration: number;
+    readonly length: number;
+    readonly numberOfChannels: number;
+    readonly sampleRate: number;
+    copyFromChannel(destination: Float32Array, channelNumber: number, startInChannel?: number): void;
+    copyToChannel(source: Float32Array, channelNumber: number, startInChannel?: number): void;
     getChannelData(channel: number): Float32Array;
 }
 
@@ -243,8 +44,8 @@ declare var AudioBuffer: {
 }
 
 interface Blob {
-    size: number;
-    type: string;
+    readonly size: number;
+    readonly type: string;
     msClose(): void;
     msDetachStream(): any;
     slice(start?: number, end?: number, contentType?: string): Blob;
@@ -256,9 +57,9 @@ declare var Blob: {
 }
 
 interface CloseEvent extends Event {
-    code: number;
-    reason: string;
-    wasClean: boolean;
+    readonly code: number;
+    readonly reason: string;
+    readonly wasClean: boolean;
     initCloseEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, wasCleanArg: boolean, codeArg: number, reasonArg: string): void;
 }
 
@@ -275,6 +76,7 @@ interface Console {
     dir(value?: any, ...optionalParams: any[]): void;
     dirxml(value: any): void;
     error(message?: any, ...optionalParams: any[]): void;
+    exception(message?: string, ...optionalParams: any[]): void;
     group(groupTitle?: string): void;
     groupCollapsed(groupTitle?: string): void;
     groupEnd(): void;
@@ -284,6 +86,7 @@ interface Console {
     profile(reportName?: string): void;
     profileEnd(): void;
     select(element: any): void;
+    table(...data: any[]): void;
     time(timerName?: string): void;
     timeEnd(timerName?: string): void;
     trace(message?: any, ...optionalParams: any[]): void;
@@ -296,13 +99,13 @@ declare var Console: {
 }
 
 interface Coordinates {
-    accuracy: number;
-    altitude: number;
-    altitudeAccuracy: number;
-    heading: number;
-    latitude: number;
-    longitude: number;
-    speed: number;
+    readonly accuracy: number;
+    readonly altitude: number;
+    readonly altitudeAccuracy: number;
+    readonly heading: number;
+    readonly latitude: number;
+    readonly longitude: number;
+    readonly speed: number;
 }
 
 declare var Coordinates: {
@@ -311,7 +114,7 @@ declare var Coordinates: {
 }
 
 interface DOMError {
-    name: string;
+    readonly name: string;
     toString(): string;
 }
 
@@ -321,73 +124,73 @@ declare var DOMError: {
 }
 
 interface DOMException {
-    code: number;
-    message: string;
-    name: string;
+    readonly code: number;
+    readonly message: string;
+    readonly name: string;
     toString(): string;
-    ABORT_ERR: number;
-    DATA_CLONE_ERR: number;
-    DOMSTRING_SIZE_ERR: number;
-    HIERARCHY_REQUEST_ERR: number;
-    INDEX_SIZE_ERR: number;
-    INUSE_ATTRIBUTE_ERR: number;
-    INVALID_ACCESS_ERR: number;
-    INVALID_CHARACTER_ERR: number;
-    INVALID_MODIFICATION_ERR: number;
-    INVALID_NODE_TYPE_ERR: number;
-    INVALID_STATE_ERR: number;
-    NAMESPACE_ERR: number;
-    NETWORK_ERR: number;
-    NOT_FOUND_ERR: number;
-    NOT_SUPPORTED_ERR: number;
-    NO_DATA_ALLOWED_ERR: number;
-    NO_MODIFICATION_ALLOWED_ERR: number;
-    PARSE_ERR: number;
-    QUOTA_EXCEEDED_ERR: number;
-    SECURITY_ERR: number;
-    SERIALIZE_ERR: number;
-    SYNTAX_ERR: number;
-    TIMEOUT_ERR: number;
-    TYPE_MISMATCH_ERR: number;
-    URL_MISMATCH_ERR: number;
-    VALIDATION_ERR: number;
-    WRONG_DOCUMENT_ERR: number;
+    readonly ABORT_ERR: number;
+    readonly DATA_CLONE_ERR: number;
+    readonly DOMSTRING_SIZE_ERR: number;
+    readonly HIERARCHY_REQUEST_ERR: number;
+    readonly INDEX_SIZE_ERR: number;
+    readonly INUSE_ATTRIBUTE_ERR: number;
+    readonly INVALID_ACCESS_ERR: number;
+    readonly INVALID_CHARACTER_ERR: number;
+    readonly INVALID_MODIFICATION_ERR: number;
+    readonly INVALID_NODE_TYPE_ERR: number;
+    readonly INVALID_STATE_ERR: number;
+    readonly NAMESPACE_ERR: number;
+    readonly NETWORK_ERR: number;
+    readonly NOT_FOUND_ERR: number;
+    readonly NOT_SUPPORTED_ERR: number;
+    readonly NO_DATA_ALLOWED_ERR: number;
+    readonly NO_MODIFICATION_ALLOWED_ERR: number;
+    readonly PARSE_ERR: number;
+    readonly QUOTA_EXCEEDED_ERR: number;
+    readonly SECURITY_ERR: number;
+    readonly SERIALIZE_ERR: number;
+    readonly SYNTAX_ERR: number;
+    readonly TIMEOUT_ERR: number;
+    readonly TYPE_MISMATCH_ERR: number;
+    readonly URL_MISMATCH_ERR: number;
+    readonly VALIDATION_ERR: number;
+    readonly WRONG_DOCUMENT_ERR: number;
 }
 
 declare var DOMException: {
     prototype: DOMException;
     new(): DOMException;
-    ABORT_ERR: number;
-    DATA_CLONE_ERR: number;
-    DOMSTRING_SIZE_ERR: number;
-    HIERARCHY_REQUEST_ERR: number;
-    INDEX_SIZE_ERR: number;
-    INUSE_ATTRIBUTE_ERR: number;
-    INVALID_ACCESS_ERR: number;
-    INVALID_CHARACTER_ERR: number;
-    INVALID_MODIFICATION_ERR: number;
-    INVALID_NODE_TYPE_ERR: number;
-    INVALID_STATE_ERR: number;
-    NAMESPACE_ERR: number;
-    NETWORK_ERR: number;
-    NOT_FOUND_ERR: number;
-    NOT_SUPPORTED_ERR: number;
-    NO_DATA_ALLOWED_ERR: number;
-    NO_MODIFICATION_ALLOWED_ERR: number;
-    PARSE_ERR: number;
-    QUOTA_EXCEEDED_ERR: number;
-    SECURITY_ERR: number;
-    SERIALIZE_ERR: number;
-    SYNTAX_ERR: number;
-    TIMEOUT_ERR: number;
-    TYPE_MISMATCH_ERR: number;
-    URL_MISMATCH_ERR: number;
-    VALIDATION_ERR: number;
-    WRONG_DOCUMENT_ERR: number;
+    readonly ABORT_ERR: number;
+    readonly DATA_CLONE_ERR: number;
+    readonly DOMSTRING_SIZE_ERR: number;
+    readonly HIERARCHY_REQUEST_ERR: number;
+    readonly INDEX_SIZE_ERR: number;
+    readonly INUSE_ATTRIBUTE_ERR: number;
+    readonly INVALID_ACCESS_ERR: number;
+    readonly INVALID_CHARACTER_ERR: number;
+    readonly INVALID_MODIFICATION_ERR: number;
+    readonly INVALID_NODE_TYPE_ERR: number;
+    readonly INVALID_STATE_ERR: number;
+    readonly NAMESPACE_ERR: number;
+    readonly NETWORK_ERR: number;
+    readonly NOT_FOUND_ERR: number;
+    readonly NOT_SUPPORTED_ERR: number;
+    readonly NO_DATA_ALLOWED_ERR: number;
+    readonly NO_MODIFICATION_ALLOWED_ERR: number;
+    readonly PARSE_ERR: number;
+    readonly QUOTA_EXCEEDED_ERR: number;
+    readonly SECURITY_ERR: number;
+    readonly SERIALIZE_ERR: number;
+    readonly SYNTAX_ERR: number;
+    readonly TIMEOUT_ERR: number;
+    readonly TYPE_MISMATCH_ERR: number;
+    readonly URL_MISMATCH_ERR: number;
+    readonly VALIDATION_ERR: number;
+    readonly WRONG_DOCUMENT_ERR: number;
 }
 
 interface DOMStringList {
-    length: number;
+    readonly length: number;
     contains(str: string): boolean;
     item(index: number): string;
     [index: number]: string;
@@ -399,11 +202,11 @@ declare var DOMStringList: {
 }
 
 interface ErrorEvent extends Event {
-    colno: number;
-    error: any;
-    filename: string;
-    lineno: number;
-    message: string;
+    readonly colno: number;
+    readonly error: any;
+    readonly filename: string;
+    readonly lineno: number;
+    readonly message: string;
     initErrorEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, messageArg: string, filenameArg: string, linenoArg: number): void;
 }
 
@@ -413,39 +216,39 @@ declare var ErrorEvent: {
 }
 
 interface Event {
-    bubbles: boolean;
+    readonly bubbles: boolean;
     cancelBubble: boolean;
-    cancelable: boolean;
-    currentTarget: EventTarget;
-    defaultPrevented: boolean;
-    eventPhase: number;
-    isTrusted: boolean;
+    readonly cancelable: boolean;
+    readonly currentTarget: EventTarget;
+    readonly defaultPrevented: boolean;
+    readonly eventPhase: number;
+    readonly isTrusted: boolean;
     returnValue: boolean;
-    srcElement: any;
-    target: EventTarget;
-    timeStamp: number;
-    type: string;
+    readonly srcElement: any;
+    readonly target: EventTarget;
+    readonly timeStamp: number;
+    readonly type: string;
     initEvent(eventTypeArg: string, canBubbleArg: boolean, cancelableArg: boolean): void;
     preventDefault(): void;
     stopImmediatePropagation(): void;
     stopPropagation(): void;
-    AT_TARGET: number;
-    BUBBLING_PHASE: number;
-    CAPTURING_PHASE: number;
+    readonly AT_TARGET: number;
+    readonly BUBBLING_PHASE: number;
+    readonly CAPTURING_PHASE: number;
 }
 
 declare var Event: {
     prototype: Event;
     new(type: string, eventInitDict?: EventInit): Event;
-    AT_TARGET: number;
-    BUBBLING_PHASE: number;
-    CAPTURING_PHASE: number;
+    readonly AT_TARGET: number;
+    readonly BUBBLING_PHASE: number;
+    readonly CAPTURING_PHASE: number;
 }
 
 interface EventTarget {
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
     dispatchEvent(evt: Event): boolean;
-    removeEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var EventTarget: {
@@ -454,8 +257,9 @@ declare var EventTarget: {
 }
 
 interface File extends Blob {
-    lastModifiedDate: any;
-    name: string;
+    readonly lastModifiedDate: any;
+    readonly name: string;
+    readonly webkitRelativePath: string;
 }
 
 declare var File: {
@@ -464,7 +268,7 @@ declare var File: {
 }
 
 interface FileList {
-    length: number;
+    readonly length: number;
     item(index: number): File;
     [index: number]: File;
 }
@@ -475,7 +279,7 @@ declare var FileList: {
 }
 
 interface FileReader extends EventTarget, MSBaseReader {
-    error: DOMError;
+    readonly error: DOMError;
     readAsArrayBuffer(blob: Blob): void;
     readAsBinaryString(blob: Blob): void;
     readAsDataURL(blob: Blob): void;
@@ -489,31 +293,31 @@ declare var FileReader: {
 }
 
 interface IDBCursor {
-    direction: string;
-    key: any;
-    primaryKey: any;
-    source: any;
+    readonly direction: string;
+    key: IDBKeyRange | IDBValidKey;
+    readonly primaryKey: any;
+    source: IDBObjectStore | IDBIndex;
     advance(count: number): void;
-    continue(key?: any): void;
+    continue(key?: IDBKeyRange | IDBValidKey): void;
     delete(): IDBRequest;
     update(value: any): IDBRequest;
-    NEXT: string;
-    NEXT_NO_DUPLICATE: string;
-    PREV: string;
-    PREV_NO_DUPLICATE: string;
+    readonly NEXT: string;
+    readonly NEXT_NO_DUPLICATE: string;
+    readonly PREV: string;
+    readonly PREV_NO_DUPLICATE: string;
 }
 
 declare var IDBCursor: {
     prototype: IDBCursor;
     new(): IDBCursor;
-    NEXT: string;
-    NEXT_NO_DUPLICATE: string;
-    PREV: string;
-    PREV_NO_DUPLICATE: string;
+    readonly NEXT: string;
+    readonly NEXT_NO_DUPLICATE: string;
+    readonly PREV: string;
+    readonly PREV_NO_DUPLICATE: string;
 }
 
 interface IDBCursorWithValue extends IDBCursor {
-    value: any;
+    readonly value: any;
 }
 
 declare var IDBCursorWithValue: {
@@ -522,15 +326,17 @@ declare var IDBCursorWithValue: {
 }
 
 interface IDBDatabase extends EventTarget {
-    name: string;
-    objectStoreNames: DOMStringList;
+    readonly name: string;
+    readonly objectStoreNames: DOMStringList;
     onabort: (ev: Event) => any;
     onerror: (ev: Event) => any;
     version: number;
+    onversionchange: (ev: IDBVersionChangeEvent) => any;
     close(): void;
     createObjectStore(name: string, optionalParameters?: IDBObjectStoreParameters): IDBObjectStore;
     deleteObjectStore(name: string): void;
-    transaction(storeNames: any, mode?: string): IDBTransaction;
+    transaction(storeNames: string | string[], mode?: string): IDBTransaction;
+    addEventListener(type: "versionchange", listener: (ev: IDBVersionChangeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -554,15 +360,15 @@ declare var IDBFactory: {
 
 interface IDBIndex {
     keyPath: string | string[];
-    name: string;
-    objectStore: IDBObjectStore;
-    unique: boolean;
+    readonly name: string;
+    readonly objectStore: IDBObjectStore;
+    readonly unique: boolean;
     multiEntry: boolean;
-    count(key?: any): IDBRequest;
-    get(key: any): IDBRequest;
-    getKey(key: any): IDBRequest;
-    openCursor(range?: IDBKeyRange, direction?: string): IDBRequest;
-    openKeyCursor(range?: IDBKeyRange, direction?: string): IDBRequest;
+    count(key?: IDBKeyRange | IDBValidKey): IDBRequest;
+    get(key: IDBKeyRange | IDBValidKey): IDBRequest;
+    getKey(key: IDBKeyRange | IDBValidKey): IDBRequest;
+    openCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest;
+    openKeyCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest;
 }
 
 declare var IDBIndex: {
@@ -571,36 +377,37 @@ declare var IDBIndex: {
 }
 
 interface IDBKeyRange {
-    lower: any;
-    lowerOpen: boolean;
-    upper: any;
-    upperOpen: boolean;
+    readonly lower: any;
+    readonly lowerOpen: boolean;
+    readonly upper: any;
+    readonly upperOpen: boolean;
 }
 
 declare var IDBKeyRange: {
     prototype: IDBKeyRange;
     new(): IDBKeyRange;
     bound(lower: any, upper: any, lowerOpen?: boolean, upperOpen?: boolean): IDBKeyRange;
-    lowerBound(bound: any, open?: boolean): IDBKeyRange;
+    lowerBound(lower: any, open?: boolean): IDBKeyRange;
     only(value: any): IDBKeyRange;
-    upperBound(bound: any, open?: boolean): IDBKeyRange;
+    upperBound(upper: any, open?: boolean): IDBKeyRange;
 }
 
 interface IDBObjectStore {
-    indexNames: DOMStringList;
-    keyPath: string;
-    name: string;
-    transaction: IDBTransaction;
-    add(value: any, key?: any): IDBRequest;
+    readonly indexNames: DOMStringList;
+    keyPath: string | string[];
+    readonly name: string;
+    readonly transaction: IDBTransaction;
+    autoIncrement: boolean;
+    add(value: any, key?: IDBKeyRange | IDBValidKey): IDBRequest;
     clear(): IDBRequest;
-    count(key?: any): IDBRequest;
+    count(key?: IDBKeyRange | IDBValidKey): IDBRequest;
     createIndex(name: string, keyPath: string | string[], optionalParameters?: IDBIndexParameters): IDBIndex;
-    delete(key: any): IDBRequest;
+    delete(key: IDBKeyRange | IDBValidKey): IDBRequest;
     deleteIndex(indexName: string): void;
     get(key: any): IDBRequest;
     index(name: string): IDBIndex;
-    openCursor(range?: any, direction?: string): IDBRequest;
-    put(value: any, key?: any): IDBRequest;
+    openCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest;
+    put(value: any, key?: IDBKeyRange | IDBValidKey): IDBRequest;
 }
 
 declare var IDBObjectStore: {
@@ -624,13 +431,13 @@ declare var IDBOpenDBRequest: {
 }
 
 interface IDBRequest extends EventTarget {
-    error: DOMError;
+    readonly error: DOMError;
     onerror: (ev: Event) => any;
     onsuccess: (ev: Event) => any;
-    readyState: string;
-    result: any;
-    source: any;
-    transaction: IDBTransaction;
+    readonly readyState: string;
+    readonly result: any;
+    source: IDBObjectStore | IDBIndex | IDBCursor;
+    readonly transaction: IDBTransaction;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "success", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -642,17 +449,17 @@ declare var IDBRequest: {
 }
 
 interface IDBTransaction extends EventTarget {
-    db: IDBDatabase;
-    error: DOMError;
-    mode: string;
+    readonly db: IDBDatabase;
+    readonly error: DOMError;
+    readonly mode: string;
     onabort: (ev: Event) => any;
     oncomplete: (ev: Event) => any;
     onerror: (ev: Event) => any;
     abort(): void;
     objectStore(name: string): IDBObjectStore;
-    READ_ONLY: string;
-    READ_WRITE: string;
-    VERSION_CHANGE: string;
+    readonly READ_ONLY: string;
+    readonly READ_WRITE: string;
+    readonly VERSION_CHANGE: string;
     addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
@@ -662,14 +469,14 @@ interface IDBTransaction extends EventTarget {
 declare var IDBTransaction: {
     prototype: IDBTransaction;
     new(): IDBTransaction;
-    READ_ONLY: string;
-    READ_WRITE: string;
-    VERSION_CHANGE: string;
+    readonly READ_ONLY: string;
+    readonly READ_WRITE: string;
+    readonly VERSION_CHANGE: string;
 }
 
 interface IDBVersionChangeEvent extends Event {
-    newVersion: number;
-    oldVersion: number;
+    readonly newVersion: number;
+    readonly oldVersion: number;
 }
 
 declare var IDBVersionChangeEvent: {
@@ -679,8 +486,8 @@ declare var IDBVersionChangeEvent: {
 
 interface ImageData {
     data: Uint8ClampedArray;
-    height: number;
-    width: number;
+    readonly height: number;
+    readonly width: number;
 }
 
 declare var ImageData: {
@@ -699,29 +506,29 @@ interface MSApp {
     execAsyncAtPriority(asynchronousCallback: MSExecAtPriorityFunctionCallback, priority: string, ...args: any[]): void;
     execAtPriority(synchronousCallback: MSExecAtPriorityFunctionCallback, priority: string, ...args: any[]): any;
     getCurrentPriority(): string;
-    getHtmlPrintDocumentSourceAsync(htmlDoc: any): any;
+    getHtmlPrintDocumentSourceAsync(htmlDoc: any): PromiseLike<any>;
     getViewId(view: any): any;
     isTaskScheduledAtPriorityOrHigher(priority: string): boolean;
     pageHandlesAllApplicationActivations(enabled: boolean): void;
     suppressSubdownloadCredentialPrompts(suppress: boolean): void;
     terminateApp(exceptionObject: any): void;
-    CURRENT: string;
-    HIGH: string;
-    IDLE: string;
-    NORMAL: string;
+    readonly CURRENT: string;
+    readonly HIGH: string;
+    readonly IDLE: string;
+    readonly NORMAL: string;
 }
 declare var MSApp: MSApp;
 
 interface MSAppAsyncOperation extends EventTarget {
-    error: DOMError;
+    readonly error: DOMError;
     oncomplete: (ev: Event) => any;
     onerror: (ev: Event) => any;
-    readyState: number;
-    result: any;
+    readonly readyState: number;
+    readonly result: any;
     start(): void;
-    COMPLETED: number;
-    ERROR: number;
-    STARTED: number;
+    readonly COMPLETED: number;
+    readonly ERROR: number;
+    readonly STARTED: number;
     addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -730,9 +537,9 @@ interface MSAppAsyncOperation extends EventTarget {
 declare var MSAppAsyncOperation: {
     prototype: MSAppAsyncOperation;
     new(): MSAppAsyncOperation;
-    COMPLETED: number;
-    ERROR: number;
-    STARTED: number;
+    readonly COMPLETED: number;
+    readonly ERROR: number;
+    readonly STARTED: number;
 }
 
 interface MSBlobBuilder {
@@ -746,7 +553,7 @@ declare var MSBlobBuilder: {
 }
 
 interface MSStream {
-    type: string;
+    readonly type: string;
     msClose(): void;
     msDetachStream(): any;
 }
@@ -757,7 +564,7 @@ declare var MSStream: {
 }
 
 interface MSStreamReader extends EventTarget, MSBaseReader {
-    error: DOMError;
+    readonly error: DOMError;
     readAsArrayBuffer(stream: MSStream, size?: number): void;
     readAsBinaryString(stream: MSStream, size?: number): void;
     readAsBlob(stream: MSStream, size?: number): void;
@@ -772,8 +579,8 @@ declare var MSStreamReader: {
 }
 
 interface MediaQueryList {
-    matches: boolean;
-    media: string;
+    readonly matches: boolean;
+    readonly media: string;
     addListener(listener: MediaQueryListListener): void;
     removeListener(listener: MediaQueryListListener): void;
 }
@@ -784,8 +591,8 @@ declare var MediaQueryList: {
 }
 
 interface MessageChannel {
-    port1: MessagePort;
-    port2: MessagePort;
+    readonly port1: MessagePort;
+    readonly port2: MessagePort;
 }
 
 declare var MessageChannel: {
@@ -794,10 +601,10 @@ declare var MessageChannel: {
 }
 
 interface MessageEvent extends Event {
-    data: any;
-    origin: string;
-    ports: any;
-    source: any;
+    readonly data: any;
+    readonly origin: string;
+    readonly ports: any;
+    readonly source: any;
     initMessageEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, dataArg: any, originArg: string, lastEventIdArg: string, sourceArg: any): void;
 }
 
@@ -821,8 +628,8 @@ declare var MessagePort: {
 }
 
 interface Position {
-    coords: Coordinates;
-    timestamp: number;
+    readonly coords: Coordinates;
+    readonly timestamp: number;
 }
 
 declare var Position: {
@@ -831,26 +638,26 @@ declare var Position: {
 }
 
 interface PositionError {
-    code: number;
-    message: string;
+    readonly code: number;
+    readonly message: string;
     toString(): string;
-    PERMISSION_DENIED: number;
-    POSITION_UNAVAILABLE: number;
-    TIMEOUT: number;
+    readonly PERMISSION_DENIED: number;
+    readonly POSITION_UNAVAILABLE: number;
+    readonly TIMEOUT: number;
 }
 
 declare var PositionError: {
     prototype: PositionError;
     new(): PositionError;
-    PERMISSION_DENIED: number;
-    POSITION_UNAVAILABLE: number;
-    TIMEOUT: number;
+    readonly PERMISSION_DENIED: number;
+    readonly POSITION_UNAVAILABLE: number;
+    readonly TIMEOUT: number;
 }
 
 interface ProgressEvent extends Event {
-    lengthComputable: boolean;
-    loaded: number;
-    total: number;
+    readonly lengthComputable: boolean;
+    readonly loaded: number;
+    readonly total: number;
     initProgressEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, lengthComputableArg: boolean, loadedArg: number, totalArg: number): void;
 }
 
@@ -861,21 +668,21 @@ declare var ProgressEvent: {
 
 interface WebSocket extends EventTarget {
     binaryType: string;
-    bufferedAmount: number;
-    extensions: string;
+    readonly bufferedAmount: number;
+    readonly extensions: string;
     onclose: (ev: CloseEvent) => any;
     onerror: (ev: Event) => any;
     onmessage: (ev: MessageEvent) => any;
     onopen: (ev: Event) => any;
-    protocol: string;
-    readyState: number;
-    url: string;
+    readonly protocol: string;
+    readonly readyState: number;
+    readonly url: string;
     close(code?: number, reason?: string): void;
     send(data: any): void;
-    CLOSED: number;
-    CLOSING: number;
-    CONNECTING: number;
-    OPEN: number;
+    readonly CLOSED: number;
+    readonly CLOSING: number;
+    readonly CONNECTING: number;
+    readonly OPEN: number;
     addEventListener(type: "close", listener: (ev: CloseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "message", listener: (ev: MessageEvent) => any, useCapture?: boolean): void;
@@ -886,10 +693,10 @@ interface WebSocket extends EventTarget {
 declare var WebSocket: {
     prototype: WebSocket;
     new(url: string, protocols?: string | string[]): WebSocket;
-    CLOSED: number;
-    CLOSING: number;
-    CONNECTING: number;
-    OPEN: number;
+    readonly CLOSED: number;
+    readonly CLOSING: number;
+    readonly CONNECTING: number;
+    readonly OPEN: number;
 }
 
 interface Worker extends EventTarget, AbstractWorker {
@@ -909,16 +716,15 @@ declare var Worker: {
 interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
     msCaching: string;
     onreadystatechange: (ev: ProgressEvent) => any;
-    readyState: number;
-    response: any;
-    responseBody: any;
-    responseText: string;
+    readonly readyState: number;
+    readonly response: any;
+    readonly responseText: string;
     responseType: string;
-    responseXML: any;
-    status: number;
-    statusText: string;
+    readonly responseXML: any;
+    readonly status: number;
+    readonly statusText: string;
     timeout: number;
-    upload: XMLHttpRequestUpload;
+    readonly upload: XMLHttpRequestUpload;
     withCredentials: boolean;
     abort(): void;
     getAllResponseHeaders(): string;
@@ -929,11 +735,11 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
     send(data?: string): void;
     send(data?: any): void;
     setRequestHeader(header: string, value: string): void;
-    DONE: number;
-    HEADERS_RECEIVED: number;
-    LOADING: number;
-    OPENED: number;
-    UNSENT: number;
+    readonly DONE: number;
+    readonly HEADERS_RECEIVED: number;
+    readonly LOADING: number;
+    readonly OPENED: number;
+    readonly UNSENT: number;
     addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -948,11 +754,11 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
 declare var XMLHttpRequest: {
     prototype: XMLHttpRequest;
     new(): XMLHttpRequest;
-    DONE: number;
-    HEADERS_RECEIVED: number;
-    LOADING: number;
-    OPENED: number;
-    UNSENT: number;
+    readonly DONE: number;
+    readonly HEADERS_RECEIVED: number;
+    readonly LOADING: number;
+    readonly OPENED: number;
+    readonly UNSENT: number;
     create(): XMLHttpRequest;
 }
 
@@ -978,12 +784,12 @@ interface MSBaseReader {
     onloadend: (ev: ProgressEvent) => any;
     onloadstart: (ev: Event) => any;
     onprogress: (ev: ProgressEvent) => any;
-    readyState: number;
-    result: any;
+    readonly readyState: number;
+    readonly result: any;
     abort(): void;
-    DONE: number;
-    EMPTY: number;
-    LOADING: number;
+    readonly DONE: number;
+    readonly EMPTY: number;
+    readonly LOADING: number;
     addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -994,18 +800,18 @@ interface MSBaseReader {
 }
 
 interface NavigatorID {
-    appName: string;
-    appVersion: string;
-    platform: string;
-    product: string;
-    productSub: string;
-    userAgent: string;
-    vendor: string;
-    vendorSub: string;
+    readonly appName: string;
+    readonly appVersion: string;
+    readonly platform: string;
+    readonly product: string;
+    readonly productSub: string;
+    readonly userAgent: string;
+    readonly vendor: string;
+    readonly vendorSub: string;
 }
 
 interface NavigatorOnLine {
-    onLine: boolean;
+    readonly onLine: boolean;
 }
 
 interface WindowBase64 {
@@ -1014,7 +820,7 @@ interface WindowBase64 {
 }
 
 interface WindowConsole {
-    console: Console;
+    readonly console: Console;
 }
 
 interface XMLHttpRequestEventTarget {
@@ -1048,9 +854,9 @@ declare var FileReaderSync: {
 }
 
 interface WorkerGlobalScope extends EventTarget, WorkerUtils, DedicatedWorkerGlobalScope, WindowConsole {
-    location: WorkerLocation;
+    readonly location: WorkerLocation;
     onerror: (ev: Event) => any;
-    self: WorkerGlobalScope;
+    readonly self: WorkerGlobalScope;
     close(): void;
     msWriteProfilerMark(profilerMarkName: string): void;
     toString(): string;
@@ -1065,14 +871,14 @@ declare var WorkerGlobalScope: {
 }
 
 interface WorkerLocation {
-    hash: string;
-    host: string;
-    hostname: string;
-    href: string;
-    pathname: string;
-    port: string;
-    protocol: string;
-    search: string;
+    readonly hash: string;
+    readonly host: string;
+    readonly hostname: string;
+    readonly href: string;
+    readonly pathname: string;
+    readonly port: string;
+    readonly protocol: string;
+    readonly search: string;
     toString(): string;
 }
 
@@ -1098,9 +904,9 @@ interface DedicatedWorkerGlobalScope {
 }
 
 interface WorkerUtils extends Object, WindowBase64 {
-    indexedDB: IDBFactory;
-    msIndexedDB: IDBFactory;
-    navigator: WorkerNavigator;
+    readonly indexedDB: IDBFactory;
+    readonly msIndexedDB: IDBFactory;
+    readonly navigator: WorkerNavigator;
     clearImmediate(handle: number): void;
     clearInterval(handle: number): void;
     clearTimeout(handle: number): void;
@@ -1110,16 +916,6 @@ interface WorkerUtils extends Object, WindowBase64 {
     setTimeout(handler: any, timeout?: any, ...args: any[]): number;
 }
 
-interface IDBObjectStoreParameters {
-    keyPath?: string | string[];
-    autoIncrement?: boolean;
-}
-
-interface IDBIndexParameters {
-    unique?: boolean;
-    multiEntry?: boolean;
-}
-
 interface BlobPropertyBag {
     type?: string;
     endings?: string;
@@ -1149,6 +945,9 @@ interface ProgressEventInit extends EventInit {
     total?: number;
 }
 
+interface IDBArrayKey extends Array<IDBValidKey> {
+}
+
 declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
 
 interface ErrorEventHandler {
@@ -1176,7 +975,7 @@ interface DecodeSuccessCallback {
     (decodedData: AudioBuffer): void;
 }
 interface DecodeErrorCallback {
-    (): void;
+    (error: DOMException): void;
 }
 interface FunctionStringCallback {
     (data: string): void;
@@ -1187,9 +986,9 @@ declare var self: WorkerGlobalScope;
 declare function close(): void;
 declare function msWriteProfilerMark(profilerMarkName: string): void;
 declare function toString(): string;
-declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+declare function addEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 declare function dispatchEvent(evt: Event): boolean;
-declare function removeEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+declare function removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 declare var indexedDB: IDBFactory;
 declare var msIndexedDB: IDBFactory;
 declare var navigator: WorkerNavigator;
@@ -1207,4 +1006,5 @@ declare function postMessage(data: any): void;
 declare var console: Console;
 declare function addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "message", listener: (ev: MessageEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
\ No newline at end of file
+declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+type IDBValidKey = number | string | Date | IDBArrayKey;
\ No newline at end of file
diff --git a/lib/tsc.js b/lib/tsc.js
index 2208201fef0..9e14712261a 100644
--- a/lib/tsc.js
+++ b/lib/tsc.js
@@ -46,6 +46,21 @@ var ts;
         DiagnosticCategory[DiagnosticCategory["Message"] = 2] = "Message";
     })(ts.DiagnosticCategory || (ts.DiagnosticCategory = {}));
     var DiagnosticCategory = ts.DiagnosticCategory;
+    (function (ModuleResolutionKind) {
+        ModuleResolutionKind[ModuleResolutionKind["Classic"] = 1] = "Classic";
+        ModuleResolutionKind[ModuleResolutionKind["NodeJs"] = 2] = "NodeJs";
+    })(ts.ModuleResolutionKind || (ts.ModuleResolutionKind = {}));
+    var ModuleResolutionKind = ts.ModuleResolutionKind;
+    (function (ModuleKind) {
+        ModuleKind[ModuleKind["None"] = 0] = "None";
+        ModuleKind[ModuleKind["CommonJS"] = 1] = "CommonJS";
+        ModuleKind[ModuleKind["AMD"] = 2] = "AMD";
+        ModuleKind[ModuleKind["UMD"] = 3] = "UMD";
+        ModuleKind[ModuleKind["System"] = 4] = "System";
+        ModuleKind[ModuleKind["ES6"] = 5] = "ES6";
+        ModuleKind[ModuleKind["ES2015"] = 5] = "ES2015";
+    })(ts.ModuleKind || (ts.ModuleKind = {}));
+    var ModuleKind = ts.ModuleKind;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -247,8 +262,14 @@ var ts;
             var count = array.length;
             if (count > 0) {
                 var pos = 0;
-                var result = arguments.length <= 2 ? array[pos] : initial;
-                pos++;
+                var result = void 0;
+                if (arguments.length <= 2) {
+                    result = array[pos];
+                    pos++;
+                }
+                else {
+                    result = initial;
+                }
                 while (pos < count) {
                     result = f(result, array[pos]);
                     pos++;
@@ -263,8 +284,14 @@ var ts;
         if (array) {
             var pos = array.length - 1;
             if (pos >= 0) {
-                var result = arguments.length <= 2 ? array[pos] : initial;
-                pos--;
+                var result = void 0;
+                if (arguments.length <= 2) {
+                    result = array[pos];
+                    pos--;
+                }
+                else {
+                    result = initial;
+                }
                 while (pos >= 0) {
                     result = f(result, array[pos]);
                     pos--;
@@ -280,6 +307,14 @@ var ts;
         return hasOwnProperty.call(map, key);
     }
     ts.hasProperty = hasProperty;
+    function getKeys(map) {
+        var keys = [];
+        for (var key in map) {
+            keys.push(key);
+        }
+        return keys;
+    }
+    ts.getKeys = getKeys;
     function getProperty(map, key) {
         return hasOwnProperty.call(map, key) ? map[key] : undefined;
     }
@@ -410,6 +445,14 @@ var ts;
         };
     }
     ts.createFileDiagnostic = createFileDiagnostic;
+    function formatMessage(dummy, message) {
+        var text = getLocaleSpecificMessage(message);
+        if (arguments.length > 2) {
+            text = formatStringFromArgs(text, arguments, 2);
+        }
+        return text;
+    }
+    ts.formatMessage = formatMessage;
     function createCompilerDiagnostic(message) {
         var text = getLocaleSpecificMessage(message);
         if (arguments.length > 1) {
@@ -685,6 +728,26 @@ var ts;
         return pathLen > extLen && path.substr(pathLen - extLen, extLen) === extension;
     }
     ts.fileExtensionIs = fileExtensionIs;
+    function ensureScriptKind(fileName, scriptKind) {
+        return (scriptKind || getScriptKindFromFileName(fileName)) || 3;
+    }
+    ts.ensureScriptKind = ensureScriptKind;
+    function getScriptKindFromFileName(fileName) {
+        var ext = fileName.substr(fileName.lastIndexOf("."));
+        switch (ext.toLowerCase()) {
+            case ".js":
+                return 1;
+            case ".jsx":
+                return 2;
+            case ".ts":
+                return 3;
+            case ".tsx":
+                return 4;
+            default:
+                return 0;
+        }
+    }
+    ts.getScriptKindFromFileName = getScriptKindFromFileName;
     ts.supportedTypeScriptExtensions = [".ts", ".tsx", ".d.ts"];
     ts.supportedJavascriptExtensions = [".js", ".jsx"];
     var allSupportedExtensions = ts.supportedTypeScriptExtensions.concat(ts.supportedJavascriptExtensions);
@@ -918,6 +981,7 @@ var ts;
             var _fs = require("fs");
             var _path = require("path");
             var _os = require("os");
+            var _crypto = require("crypto");
             function createPollingWatchedFileSet(interval, chunkSize) {
                 if (interval === void 0) { interval = 2500; }
                 if (chunkSize === void 0) { chunkSize = 30; }
@@ -932,13 +996,13 @@ var ts;
                     if (!watchedFile) {
                         return;
                     }
-                    _fs.stat(watchedFile.filePath, function (err, stats) {
+                    _fs.stat(watchedFile.fileName, function (err, stats) {
                         if (err) {
-                            watchedFile.callback(watchedFile.filePath);
+                            watchedFile.callback(watchedFile.fileName);
                         }
                         else if (watchedFile.mtime.getTime() !== stats.mtime.getTime()) {
-                            watchedFile.mtime = getModifiedTime(watchedFile.filePath);
-                            watchedFile.callback(watchedFile.filePath, watchedFile.mtime.getTime() === 0);
+                            watchedFile.mtime = getModifiedTime(watchedFile.fileName);
+                            watchedFile.callback(watchedFile.fileName, watchedFile.mtime.getTime() === 0);
                         }
                     });
                 }
@@ -961,11 +1025,11 @@ var ts;
                         nextFileToCheck = nextToCheck;
                     }, interval);
                 }
-                function addFile(filePath, callback) {
+                function addFile(fileName, callback) {
                     var file = {
-                        filePath: filePath,
+                        fileName: fileName,
                         callback: callback,
-                        mtime: getModifiedTime(filePath)
+                        mtime: getModifiedTime(fileName)
                     };
                     watchedFiles.push(file);
                     if (watchedFiles.length === 1) {
@@ -985,67 +1049,67 @@ var ts;
                 };
             }
             function createWatchedFileSet() {
-                var dirWatchers = ts.createFileMap();
-                var fileWatcherCallbacks = ts.createFileMap();
+                var dirWatchers = {};
+                var fileWatcherCallbacks = {};
                 return { addFile: addFile, removeFile: removeFile };
-                function reduceDirWatcherRefCountForFile(filePath) {
-                    var dirPath = ts.getDirectoryPath(filePath);
-                    if (dirWatchers.contains(dirPath)) {
-                        var watcher = dirWatchers.get(dirPath);
+                function reduceDirWatcherRefCountForFile(fileName) {
+                    var dirName = ts.getDirectoryPath(fileName);
+                    if (ts.hasProperty(dirWatchers, dirName)) {
+                        var watcher = dirWatchers[dirName];
                         watcher.referenceCount -= 1;
                         if (watcher.referenceCount <= 0) {
                             watcher.close();
-                            dirWatchers.remove(dirPath);
+                            delete dirWatchers[dirName];
                         }
                     }
                 }
                 function addDirWatcher(dirPath) {
-                    if (dirWatchers.contains(dirPath)) {
-                        var watcher_1 = dirWatchers.get(dirPath);
+                    if (ts.hasProperty(dirWatchers, dirPath)) {
+                        var watcher_1 = dirWatchers[dirPath];
                         watcher_1.referenceCount += 1;
                         return;
                     }
                     var watcher = _fs.watch(dirPath, { persistent: true }, function (eventName, relativeFileName) { return fileEventHandler(eventName, relativeFileName, dirPath); });
                     watcher.referenceCount = 1;
-                    dirWatchers.set(dirPath, watcher);
+                    dirWatchers[dirPath] = watcher;
                     return;
                 }
                 function addFileWatcherCallback(filePath, callback) {
-                    if (fileWatcherCallbacks.contains(filePath)) {
-                        fileWatcherCallbacks.get(filePath).push(callback);
+                    if (ts.hasProperty(fileWatcherCallbacks, filePath)) {
+                        fileWatcherCallbacks[filePath].push(callback);
                     }
                     else {
-                        fileWatcherCallbacks.set(filePath, [callback]);
+                        fileWatcherCallbacks[filePath] = [callback];
                     }
                 }
-                function addFile(filePath, callback) {
-                    addFileWatcherCallback(filePath, callback);
-                    addDirWatcher(ts.getDirectoryPath(filePath));
-                    return { filePath: filePath, callback: callback };
+                function addFile(fileName, callback) {
+                    addFileWatcherCallback(fileName, callback);
+                    addDirWatcher(ts.getDirectoryPath(fileName));
+                    return { fileName: fileName, callback: callback };
                 }
                 function removeFile(watchedFile) {
-                    removeFileWatcherCallback(watchedFile.filePath, watchedFile.callback);
-                    reduceDirWatcherRefCountForFile(watchedFile.filePath);
+                    removeFileWatcherCallback(watchedFile.fileName, watchedFile.callback);
+                    reduceDirWatcherRefCountForFile(watchedFile.fileName);
                 }
                 function removeFileWatcherCallback(filePath, callback) {
-                    if (fileWatcherCallbacks.contains(filePath)) {
-                        var newCallbacks = ts.copyListRemovingItem(callback, fileWatcherCallbacks.get(filePath));
+                    if (ts.hasProperty(fileWatcherCallbacks, filePath)) {
+                        var newCallbacks = ts.copyListRemovingItem(callback, fileWatcherCallbacks[filePath]);
                         if (newCallbacks.length === 0) {
-                            fileWatcherCallbacks.remove(filePath);
+                            delete fileWatcherCallbacks[filePath];
                         }
                         else {
-                            fileWatcherCallbacks.set(filePath, newCallbacks);
+                            fileWatcherCallbacks[filePath] = newCallbacks;
                         }
                     }
                 }
                 function fileEventHandler(eventName, relativeFileName, baseDirPath) {
-                    var filePath = typeof relativeFileName !== "string"
+                    var fileName = typeof relativeFileName !== "string"
                         ? undefined
-                        : ts.toPath(relativeFileName, baseDirPath, ts.createGetCanonicalFileName(ts.sys.useCaseSensitiveFileNames));
-                    if (eventName === "change" && fileWatcherCallbacks.contains(filePath)) {
-                        for (var _i = 0, _a = fileWatcherCallbacks.get(filePath); _i < _a.length; _i++) {
+                        : ts.getNormalizedAbsolutePath(relativeFileName, baseDirPath);
+                    if ((eventName === "change" || eventName === "rename") && ts.hasProperty(fileWatcherCallbacks, fileName)) {
+                        for (var _i = 0, _a = fileWatcherCallbacks[fileName]; _i < _a.length; _i++) {
                             var fileCallback = _a[_i];
-                            fileCallback(filePath);
+                            fileCallback(fileName);
                         }
                     }
                 }
@@ -1058,7 +1122,7 @@ var ts;
             var platform = _os.platform();
             var useCaseSensitiveFileNames = platform !== "win32" && platform !== "win64" && platform !== "darwin";
             function readFile(fileName, encoding) {
-                if (!_fs.existsSync(fileName)) {
+                if (!fileExists(fileName)) {
                     return undefined;
                 }
                 var buffer = _fs.readFileSync(fileName);
@@ -1098,6 +1162,24 @@ var ts;
             function getCanonicalPath(path) {
                 return useCaseSensitiveFileNames ? path : path.toLowerCase();
             }
+            function fileSystemEntryExists(path, entryKind) {
+                try {
+                    var stat = _fs.statSync(path);
+                    switch (entryKind) {
+                        case 0: return stat.isFile();
+                        case 1: return stat.isDirectory();
+                    }
+                }
+                catch (e) {
+                    return false;
+                }
+            }
+            function fileExists(path) {
+                return fileSystemEntryExists(path, 0);
+            }
+            function directoryExists(path) {
+                return fileSystemEntryExists(path, 1);
+            }
             function readDirectory(path, extension, exclude) {
                 var result = [];
                 exclude = ts.map(exclude, function (s) { return getCanonicalPath(ts.combinePaths(path, s)); });
@@ -1108,6 +1190,9 @@ var ts;
                     var directories = [];
                     for (var _i = 0, files_2 = files; _i < files_2.length; _i++) {
                         var current = files_2[_i];
+                        if (current === "." || current === "..") {
+                            continue;
+                        }
                         var name_3 = ts.combinePaths(path, current);
                         if (!ts.contains(exclude, getCanonicalPath(name_3))) {
                             var stat = _fs.statSync(name_3);
@@ -1136,14 +1221,14 @@ var ts;
                 },
                 readFile: readFile,
                 writeFile: writeFile,
-                watchFile: function (filePath, callback) {
+                watchFile: function (fileName, callback) {
                     var watchSet = isNode4OrLater() ? watchedFileSet : pollingWatchedFileSet;
-                    var watchedFile = watchSet.addFile(filePath, callback);
+                    var watchedFile = watchSet.addFile(fileName, callback);
                     return {
                         close: function () { return watchSet.removeFile(watchedFile); }
                     };
                 },
-                watchDirectory: function (path, callback, recursive) {
+                watchDirectory: function (directoryName, callback, recursive) {
                     var options;
                     if (isNode4OrLater() && (process.platform === "win32" || process.platform === "darwin")) {
                         options = { persistent: true, recursive: !!recursive };
@@ -1151,9 +1236,9 @@ var ts;
                     else {
                         options = { persistent: true };
                     }
-                    return _fs.watch(path, options, function (eventName, relativeFileName) {
+                    return _fs.watch(directoryName, options, function (eventName, relativeFileName) {
                         if (eventName === "rename") {
-                            callback(!relativeFileName ? relativeFileName : ts.normalizePath(ts.combinePaths(path, relativeFileName)));
+                            callback(!relativeFileName ? relativeFileName : ts.normalizePath(ts.combinePaths(directoryName, relativeFileName)));
                         }
                         ;
                     });
@@ -1161,12 +1246,8 @@ var ts;
                 resolvePath: function (path) {
                     return _path.resolve(path);
                 },
-                fileExists: function (path) {
-                    return _fs.existsSync(path);
-                },
-                directoryExists: function (path) {
-                    return _fs.existsSync(path) && _fs.statSync(path).isDirectory();
-                },
+                fileExists: fileExists,
+                directoryExists: directoryExists,
                 createDirectory: function (directoryName) {
                     if (!this.directoryExists(directoryName)) {
                         _fs.mkdirSync(directoryName);
@@ -1179,6 +1260,19 @@ var ts;
                     return process.cwd();
                 },
                 readDirectory: readDirectory,
+                getModifiedTime: function (path) {
+                    try {
+                        return _fs.statSync(path).mtime;
+                    }
+                    catch (e) {
+                        return undefined;
+                    }
+                },
+                createHash: function (data) {
+                    var hash = _crypto.createHash("md5");
+                    hash.update(data);
+                    return hash.digest("hex");
+                },
                 getMemoryUsage: function () {
                     if (global.gc) {
                         global.gc();
@@ -1249,6 +1343,7 @@ var ts;
         An_index_signature_must_have_a_type_annotation: { code: 1021, category: ts.DiagnosticCategory.Error, key: "An_index_signature_must_have_a_type_annotation_1021", message: "An index signature must have a type annotation." },
         An_index_signature_parameter_must_have_a_type_annotation: { code: 1022, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_must_have_a_type_annotation_1022", message: "An index signature parameter must have a type annotation." },
         An_index_signature_parameter_type_must_be_string_or_number: { code: 1023, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_type_must_be_string_or_number_1023", message: "An index signature parameter type must be 'string' or 'number'." },
+        readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature: { code: 1024, category: ts.DiagnosticCategory.Error, key: "readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature_1024", message: "'readonly' modifier can only appear on a property declaration or index signature." },
         Accessibility_modifier_already_seen: { code: 1028, category: ts.DiagnosticCategory.Error, key: "Accessibility_modifier_already_seen_1028", message: "Accessibility modifier already seen." },
         _0_modifier_must_precede_1_modifier: { code: 1029, category: ts.DiagnosticCategory.Error, key: "_0_modifier_must_precede_1_modifier_1029", message: "'{0}' modifier must precede '{1}' modifier." },
         _0_modifier_already_seen: { code: 1030, category: ts.DiagnosticCategory.Error, key: "_0_modifier_already_seen_1030", message: "'{0}' modifier already seen." },
@@ -1262,7 +1357,7 @@ var ts;
         _0_modifier_cannot_be_used_with_a_class_declaration: { code: 1041, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_with_a_class_declaration_1041", message: "'{0}' modifier cannot be used with a class declaration." },
         _0_modifier_cannot_be_used_here: { code: 1042, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_here_1042", message: "'{0}' modifier cannot be used here." },
         _0_modifier_cannot_appear_on_a_data_property: { code: 1043, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_data_property_1043", message: "'{0}' modifier cannot appear on a data property." },
-        _0_modifier_cannot_appear_on_a_module_element: { code: 1044, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_module_element_1044", message: "'{0}' modifier cannot appear on a module element." },
+        _0_modifier_cannot_appear_on_a_module_or_namespace_element: { code: 1044, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_module_or_namespace_element_1044", message: "'{0}' modifier cannot appear on a module or namespace element." },
         A_0_modifier_cannot_be_used_with_an_interface_declaration: { code: 1045, category: ts.DiagnosticCategory.Error, key: "A_0_modifier_cannot_be_used_with_an_interface_declaration_1045", message: "A '{0}' modifier cannot be used with an interface declaration." },
         A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: { code: 1046, category: ts.DiagnosticCategory.Error, key: "A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file_1046", message: "A 'declare' modifier is required for a top level declaration in a .d.ts file." },
         A_rest_parameter_cannot_be_optional: { code: 1047, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_cannot_be_optional_1047", message: "A rest parameter cannot be optional." },
@@ -1281,8 +1376,11 @@ var ts;
         Enum_member_must_have_initializer: { code: 1061, category: ts.DiagnosticCategory.Error, key: "Enum_member_must_have_initializer_1061", message: "Enum member must have initializer." },
         _0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method: { code: 1062, category: ts.DiagnosticCategory.Error, key: "_0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method_1062", message: "{0} is referenced directly or indirectly in the fulfillment callback of its own 'then' method." },
         An_export_assignment_cannot_be_used_in_a_namespace: { code: 1063, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_cannot_be_used_in_a_namespace_1063", message: "An export assignment cannot be used in a namespace." },
+        The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type: { code: 1064, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_1064", message: "The return type of an async function or method must be the global Promise<T> type." },
         In_ambient_enum_declarations_member_initializer_must_be_constant_expression: { code: 1066, category: ts.DiagnosticCategory.Error, key: "In_ambient_enum_declarations_member_initializer_must_be_constant_expression_1066", message: "In ambient enum declarations member initializer must be constant expression." },
         Unexpected_token_A_constructor_method_accessor_or_property_was_expected: { code: 1068, category: ts.DiagnosticCategory.Error, key: "Unexpected_token_A_constructor_method_accessor_or_property_was_expected_1068", message: "Unexpected token. A constructor, method, accessor, or property was expected." },
+        _0_modifier_cannot_appear_on_a_type_member: { code: 1070, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_type_member_1070", message: "'{0}' modifier cannot appear on a type member." },
+        _0_modifier_cannot_appear_on_an_index_signature: { code: 1071, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_an_index_signature_1071", message: "'{0}' modifier cannot appear on an index signature." },
         A_0_modifier_cannot_be_used_with_an_import_declaration: { code: 1079, category: ts.DiagnosticCategory.Error, key: "A_0_modifier_cannot_be_used_with_an_import_declaration_1079", message: "A '{0}' modifier cannot be used with an import declaration." },
         Invalid_reference_directive_syntax: { code: 1084, category: ts.DiagnosticCategory.Error, key: "Invalid_reference_directive_syntax_1084", message: "Invalid 'reference' directive syntax." },
         Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher: { code: 1085, category: ts.DiagnosticCategory.Error, key: "Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher_1085", message: "Octal literals are not available when targeting ECMAScript 5 and higher." },
@@ -1338,10 +1436,9 @@ var ts;
         String_literal_expected: { code: 1141, category: ts.DiagnosticCategory.Error, key: "String_literal_expected_1141", message: "String literal expected." },
         Line_break_not_permitted_here: { code: 1142, category: ts.DiagnosticCategory.Error, key: "Line_break_not_permitted_here_1142", message: "Line break not permitted here." },
         or_expected: { code: 1144, category: ts.DiagnosticCategory.Error, key: "or_expected_1144", message: "'{' or ';' expected." },
-        Modifiers_not_permitted_on_index_signature_members: { code: 1145, category: ts.DiagnosticCategory.Error, key: "Modifiers_not_permitted_on_index_signature_members_1145", message: "Modifiers not permitted on index signature members." },
         Declaration_expected: { code: 1146, category: ts.DiagnosticCategory.Error, key: "Declaration_expected_1146", message: "Declaration expected." },
         Import_declarations_in_a_namespace_cannot_reference_a_module: { code: 1147, category: ts.DiagnosticCategory.Error, key: "Import_declarations_in_a_namespace_cannot_reference_a_module_1147", message: "Import declarations in a namespace cannot reference a module." },
-        Cannot_compile_modules_unless_the_module_flag_is_provided_Consider_setting_the_module_compiler_option_in_a_tsconfig_json_file: { code: 1148, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_modules_unless_the_module_flag_is_provided_Consider_setting_the_module_compiler_optio_1148", message: "Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file." },
+        Cannot_compile_modules_unless_the_module_flag_is_provided_with_a_valid_module_type_Consider_setting_the_module_compiler_option_in_a_tsconfig_json_file: { code: 1148, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_modules_unless_the_module_flag_is_provided_with_a_valid_module_type_Consider_setting__1148", message: "Cannot compile modules unless the '--module' flag is provided with a valid module type. Consider setting the 'module' compiler option in a 'tsconfig.json' file." },
         File_name_0_differs_from_already_included_file_name_1_only_in_casing: { code: 1149, category: ts.DiagnosticCategory.Error, key: "File_name_0_differs_from_already_included_file_name_1_only_in_casing_1149", message: "File name '{0}' differs from already included file name '{1}' only in casing" },
         new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead: { code: 1150, category: ts.DiagnosticCategory.Error, key: "new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead_1150", message: "'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead." },
         const_declarations_must_be_initialized: { code: 1155, category: ts.DiagnosticCategory.Error, key: "const_declarations_must_be_initialized_1155", message: "'const' declarations must be initialized" },
@@ -1401,7 +1498,7 @@ var ts;
         Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode: { code: 1214, category: ts.DiagnosticCategory.Error, key: "Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode_1214", message: "Identifier expected. '{0}' is a reserved word in strict mode. Modules are automatically in strict mode." },
         Invalid_use_of_0_Modules_are_automatically_in_strict_mode: { code: 1215, category: ts.DiagnosticCategory.Error, key: "Invalid_use_of_0_Modules_are_automatically_in_strict_mode_1215", message: "Invalid use of '{0}'. Modules are automatically in strict mode." },
         Export_assignment_is_not_supported_when_module_flag_is_system: { code: 1218, category: ts.DiagnosticCategory.Error, key: "Export_assignment_is_not_supported_when_module_flag_is_system_1218", message: "Export assignment is not supported when '--module' flag is 'system'." },
-        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Specify_experimentalDecorators_to_remove_this_warning: { code: 1219, category: ts.DiagnosticCategory.Error, key: "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Speci_1219", message: "Experimental support for decorators is a feature that is subject to change in a future release. Specify '--experimentalDecorators' to remove this warning." },
+        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning: { code: 1219, category: ts.DiagnosticCategory.Error, key: "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_t_1219", message: "Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning." },
         Generators_are_only_available_when_targeting_ECMAScript_6_or_higher: { code: 1220, category: ts.DiagnosticCategory.Error, key: "Generators_are_only_available_when_targeting_ECMAScript_6_or_higher_1220", message: "Generators are only available when targeting ECMAScript 6 or higher." },
         Generators_are_not_allowed_in_an_ambient_context: { code: 1221, category: ts.DiagnosticCategory.Error, key: "Generators_are_not_allowed_in_an_ambient_context_1221", message: "Generators are not allowed in an ambient context." },
         An_overload_signature_cannot_be_declared_as_a_generator: { code: 1222, category: ts.DiagnosticCategory.Error, key: "An_overload_signature_cannot_be_declared_as_a_generator_1222", message: "An overload signature cannot be declared as a generator." },
@@ -1410,6 +1507,7 @@ var ts;
         Cannot_find_parameter_0: { code: 1225, category: ts.DiagnosticCategory.Error, key: "Cannot_find_parameter_0_1225", message: "Cannot find parameter '{0}'." },
         Type_predicate_0_is_not_assignable_to_1: { code: 1226, category: ts.DiagnosticCategory.Error, key: "Type_predicate_0_is_not_assignable_to_1_1226", message: "Type predicate '{0}' is not assignable to '{1}'." },
         Parameter_0_is_not_in_the_same_position_as_parameter_1: { code: 1227, category: ts.DiagnosticCategory.Error, key: "Parameter_0_is_not_in_the_same_position_as_parameter_1_1227", message: "Parameter '{0}' is not in the same position as parameter '{1}'." },
+        A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods: { code: 1228, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods_1228", message: "A type predicate is only allowed in return type position for functions and methods." },
         A_type_predicate_cannot_reference_a_rest_parameter: { code: 1229, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_cannot_reference_a_rest_parameter_1229", message: "A type predicate cannot reference a rest parameter." },
         A_type_predicate_cannot_reference_element_0_in_a_binding_pattern: { code: 1230, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_cannot_reference_element_0_in_a_binding_pattern_1230", message: "A type predicate cannot reference element '{0}' in a binding pattern." },
         An_export_assignment_can_only_be_used_in_a_module: { code: 1231, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_can_only_be_used_in_a_module_1231", message: "An export assignment can only be used in a module." },
@@ -1423,7 +1521,7 @@ var ts;
         Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression: { code: 1239, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression_1239", message: "Unable to resolve signature of parameter decorator when called as an expression." },
         Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression: { code: 1240, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression_1240", message: "Unable to resolve signature of property decorator when called as an expression." },
         Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression: { code: 1241, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression_1241", message: "Unable to resolve signature of method decorator when called as an expression." },
-        abstract_modifier_can_only_appear_on_a_class_or_method_declaration: { code: 1242, category: ts.DiagnosticCategory.Error, key: "abstract_modifier_can_only_appear_on_a_class_or_method_declaration_1242", message: "'abstract' modifier can only appear on a class or method declaration." },
+        abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration: { code: 1242, category: ts.DiagnosticCategory.Error, key: "abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration_1242", message: "'abstract' modifier can only appear on a class, method, or property declaration." },
         _0_modifier_cannot_be_used_with_1_modifier: { code: 1243, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_with_1_modifier_1243", message: "'{0}' modifier cannot be used with '{1}' modifier." },
         Abstract_methods_can_only_appear_within_an_abstract_class: { code: 1244, category: ts.DiagnosticCategory.Error, key: "Abstract_methods_can_only_appear_within_an_abstract_class_1244", message: "Abstract methods can only appear within an abstract class." },
         Method_0_cannot_have_an_implementation_because_it_is_marked_abstract: { code: 1245, category: ts.DiagnosticCategory.Error, key: "Method_0_cannot_have_an_implementation_because_it_is_marked_abstract_1245", message: "Method '{0}' cannot have an implementation because it is marked abstract." },
@@ -1436,6 +1534,9 @@ var ts;
         Async_functions_are_only_available_when_targeting_ECMAScript_6_and_higher: { code: 1311, category: ts.DiagnosticCategory.Error, key: "Async_functions_are_only_available_when_targeting_ECMAScript_6_and_higher_1311", message: "Async functions are only available when targeting ECMAScript 6 and higher." },
         can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment: { code: 1312, category: ts.DiagnosticCategory.Error, key: "can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment_1312", message: "'=' can only be used in an object literal property inside a destructuring assignment." },
         The_body_of_an_if_statement_cannot_be_the_empty_statement: { code: 1313, category: ts.DiagnosticCategory.Error, key: "The_body_of_an_if_statement_cannot_be_the_empty_statement_1313", message: "The body of an 'if' statement cannot be the empty statement." },
+        Global_module_exports_may_only_appear_in_module_files: { code: 1314, category: ts.DiagnosticCategory.Error, key: "Global_module_exports_may_only_appear_in_module_files_1314", message: "Global module exports may only appear in module files." },
+        Global_module_exports_may_only_appear_in_declaration_files: { code: 1315, category: ts.DiagnosticCategory.Error, key: "Global_module_exports_may_only_appear_in_declaration_files_1315", message: "Global module exports may only appear in declaration files." },
+        Global_module_exports_may_only_appear_at_top_level: { code: 1316, category: ts.DiagnosticCategory.Error, key: "Global_module_exports_may_only_appear_at_top_level_1316", message: "Global module exports may only appear at top level." },
         Duplicate_identifier_0: { code: 2300, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_0_2300", message: "Duplicate identifier '{0}'." },
         Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: ts.DiagnosticCategory.Error, key: "Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2301", message: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." },
         Static_members_cannot_reference_class_type_parameters: { code: 2302, category: ts.DiagnosticCategory.Error, key: "Static_members_cannot_reference_class_type_parameters_2302", message: "Static members cannot reference class type parameters." },
@@ -1487,7 +1588,7 @@ var ts;
         Cannot_invoke_an_expression_whose_type_lacks_a_call_signature: { code: 2349, category: ts.DiagnosticCategory.Error, key: "Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_2349", message: "Cannot invoke an expression whose type lacks a call signature." },
         Only_a_void_function_can_be_called_with_the_new_keyword: { code: 2350, category: ts.DiagnosticCategory.Error, key: "Only_a_void_function_can_be_called_with_the_new_keyword_2350", message: "Only a void function can be called with the 'new' keyword." },
         Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: { code: 2351, category: ts.DiagnosticCategory.Error, key: "Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature_2351", message: "Cannot use 'new' with an expression whose type lacks a call or construct signature." },
-        Neither_type_0_nor_type_1_is_assignable_to_the_other: { code: 2352, category: ts.DiagnosticCategory.Error, key: "Neither_type_0_nor_type_1_is_assignable_to_the_other_2352", message: "Neither type '{0}' nor type '{1}' is assignable to the other." },
+        Type_0_cannot_be_converted_to_type_1: { code: 2352, category: ts.DiagnosticCategory.Error, key: "Type_0_cannot_be_converted_to_type_1_2352", message: "Type '{0}' cannot be converted to type '{1}'." },
         Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: { code: 2353, category: ts.DiagnosticCategory.Error, key: "Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1_2353", message: "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'." },
         No_best_common_type_exists_among_return_expressions: { code: 2354, category: ts.DiagnosticCategory.Error, key: "No_best_common_type_exists_among_return_expressions_2354", message: "No best common type exists among return expressions." },
         A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value: { code: 2355, category: ts.DiagnosticCategory.Error, key: "A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_2355", message: "A function whose declared type is neither 'void' nor 'any' must return a value." },
@@ -1501,6 +1602,7 @@ var ts;
         The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2363, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2363", message: "The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
         Invalid_left_hand_side_of_assignment_expression: { code: 2364, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_of_assignment_expression_2364", message: "Invalid left-hand side of assignment expression." },
         Operator_0_cannot_be_applied_to_types_1_and_2: { code: 2365, category: ts.DiagnosticCategory.Error, key: "Operator_0_cannot_be_applied_to_types_1_and_2_2365", message: "Operator '{0}' cannot be applied to types '{1}' and '{2}'." },
+        Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined: { code: 2366, category: ts.DiagnosticCategory.Error, key: "Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined_2366", message: "Function lacks ending return statement and return type does not include 'undefined'." },
         Type_parameter_name_cannot_be_0: { code: 2368, category: ts.DiagnosticCategory.Error, key: "Type_parameter_name_cannot_be_0_2368", message: "Type parameter name cannot be '{0}'" },
         A_parameter_property_is_only_allowed_in_a_constructor_implementation: { code: 2369, category: ts.DiagnosticCategory.Error, key: "A_parameter_property_is_only_allowed_in_a_constructor_implementation_2369", message: "A parameter property is only allowed in a constructor implementation." },
         A_rest_parameter_must_be_of_an_array_type: { code: 2370, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_must_be_of_an_array_type_2370", message: "A rest parameter must be of an array type." },
@@ -1516,7 +1618,7 @@ var ts;
         get_and_set_accessor_must_have_the_same_type: { code: 2380, category: ts.DiagnosticCategory.Error, key: "get_and_set_accessor_must_have_the_same_type_2380", message: "'get' and 'set' accessor must have the same type." },
         A_signature_with_an_implementation_cannot_use_a_string_literal_type: { code: 2381, category: ts.DiagnosticCategory.Error, key: "A_signature_with_an_implementation_cannot_use_a_string_literal_type_2381", message: "A signature with an implementation cannot use a string literal type." },
         Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature: { code: 2382, category: ts.DiagnosticCategory.Error, key: "Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature_2382", message: "Specialized overload signature is not assignable to any non-specialized signature." },
-        Overload_signatures_must_all_be_exported_or_not_exported: { code: 2383, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_exported_or_not_exported_2383", message: "Overload signatures must all be exported or not exported." },
+        Overload_signatures_must_all_be_exported_or_non_exported: { code: 2383, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_exported_or_non_exported_2383", message: "Overload signatures must all be exported or non-exported." },
         Overload_signatures_must_all_be_ambient_or_non_ambient: { code: 2384, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_ambient_or_non_ambient_2384", message: "Overload signatures must all be ambient or non-ambient." },
         Overload_signatures_must_all_be_public_private_or_protected: { code: 2385, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_public_private_or_protected_2385", message: "Overload signatures must all be public, private or protected." },
         Overload_signatures_must_all_be_optional_or_required: { code: 2386, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_optional_or_required_2386", message: "Overload signatures must all be optional or required." },
@@ -1549,7 +1651,6 @@ var ts;
         Class_name_cannot_be_0: { code: 2414, category: ts.DiagnosticCategory.Error, key: "Class_name_cannot_be_0_2414", message: "Class name cannot be '{0}'" },
         Class_0_incorrectly_extends_base_class_1: { code: 2415, category: ts.DiagnosticCategory.Error, key: "Class_0_incorrectly_extends_base_class_1_2415", message: "Class '{0}' incorrectly extends base class '{1}'." },
         Class_static_side_0_incorrectly_extends_base_class_static_side_1: { code: 2417, category: ts.DiagnosticCategory.Error, key: "Class_static_side_0_incorrectly_extends_base_class_static_side_1_2417", message: "Class static side '{0}' incorrectly extends base class static side '{1}'." },
-        Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0: { code: 2419, category: ts.DiagnosticCategory.Error, key: "Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0_2419", message: "Type name '{0}' in extends clause does not reference constructor function for '{0}'." },
         Class_0_incorrectly_implements_interface_1: { code: 2420, category: ts.DiagnosticCategory.Error, key: "Class_0_incorrectly_implements_interface_1_2420", message: "Class '{0}' incorrectly implements interface '{1}'." },
         A_class_may_only_implement_another_class_or_interface: { code: 2422, category: ts.DiagnosticCategory.Error, key: "A_class_may_only_implement_another_class_or_interface_2422", message: "A class may only implement another class or interface." },
         Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor: { code: 2423, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_access_2423", message: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member accessor." },
@@ -1557,7 +1658,7 @@ var ts;
         Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2425, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_functi_2425", message: "Class '{0}' defines instance member property '{1}', but extended class '{2}' defines it as instance member function." },
         Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2426, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_functi_2426", message: "Class '{0}' defines instance member accessor '{1}', but extended class '{2}' defines it as instance member function." },
         Interface_name_cannot_be_0: { code: 2427, category: ts.DiagnosticCategory.Error, key: "Interface_name_cannot_be_0_2427", message: "Interface name cannot be '{0}'" },
-        All_declarations_of_an_interface_must_have_identical_type_parameters: { code: 2428, category: ts.DiagnosticCategory.Error, key: "All_declarations_of_an_interface_must_have_identical_type_parameters_2428", message: "All declarations of an interface must have identical type parameters." },
+        All_declarations_of_0_must_have_identical_type_parameters: { code: 2428, category: ts.DiagnosticCategory.Error, key: "All_declarations_of_0_must_have_identical_type_parameters_2428", message: "All declarations of '{0}' must have identical type parameters." },
         Interface_0_incorrectly_extends_interface_1: { code: 2430, category: ts.DiagnosticCategory.Error, key: "Interface_0_incorrectly_extends_interface_1_2430", message: "Interface '{0}' incorrectly extends interface '{1}'." },
         Enum_name_cannot_be_0: { code: 2431, category: ts.DiagnosticCategory.Error, key: "Enum_name_cannot_be_0_2431", message: "Enum name cannot be '{0}'" },
         In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element: { code: 2432, category: ts.DiagnosticCategory.Error, key: "In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enu_2432", message: "In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element." },
@@ -1577,11 +1678,12 @@ var ts;
         Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: { code: 2446, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1_2446", message: "Property '{0}' is protected and only accessible through an instance of class '{1}'." },
         The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: { code: 2447, category: ts.DiagnosticCategory.Error, key: "The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead_2447", message: "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead." },
         Block_scoped_variable_0_used_before_its_declaration: { code: 2448, category: ts.DiagnosticCategory.Error, key: "Block_scoped_variable_0_used_before_its_declaration_2448", message: "Block-scoped variable '{0}' used before its declaration." },
-        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant: { code: 2449, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_2449", message: "The operand of an increment or decrement operator cannot be a constant." },
-        Left_hand_side_of_assignment_expression_cannot_be_a_constant: { code: 2450, category: ts.DiagnosticCategory.Error, key: "Left_hand_side_of_assignment_expression_cannot_be_a_constant_2450", message: "Left-hand side of assignment expression cannot be a constant." },
+        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property: { code: 2449, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property_2449", message: "The operand of an increment or decrement operator cannot be a constant or a read-only property." },
+        Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property: { code: 2450, category: ts.DiagnosticCategory.Error, key: "Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property_2450", message: "Left-hand side of assignment expression cannot be a constant or a read-only property." },
         Cannot_redeclare_block_scoped_variable_0: { code: 2451, category: ts.DiagnosticCategory.Error, key: "Cannot_redeclare_block_scoped_variable_0_2451", message: "Cannot redeclare block-scoped variable '{0}'." },
         An_enum_member_cannot_have_a_numeric_name: { code: 2452, category: ts.DiagnosticCategory.Error, key: "An_enum_member_cannot_have_a_numeric_name_2452", message: "An enum member cannot have a numeric name." },
         The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: { code: 2453, category: ts.DiagnosticCategory.Error, key: "The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_typ_2453", message: "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly." },
+        Variable_0_is_used_before_being_assigned: { code: 2454, category: ts.DiagnosticCategory.Error, key: "Variable_0_is_used_before_being_assigned_2454", message: "Variable '{0}' is used before being assigned." },
         Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0: { code: 2455, category: ts.DiagnosticCategory.Error, key: "Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0_2455", message: "Type argument candidate '{1}' is not a valid type argument because it is not a supertype of candidate '{0}'." },
         Type_alias_0_circularly_references_itself: { code: 2456, category: ts.DiagnosticCategory.Error, key: "Type_alias_0_circularly_references_itself_2456", message: "Type alias '{0}' circularly references itself." },
         Type_alias_name_cannot_be_0: { code: 2457, category: ts.DiagnosticCategory.Error, key: "Type_alias_name_cannot_be_0_2457", message: "Type alias name cannot be '{0}'" },
@@ -1611,8 +1713,8 @@ var ts;
         Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: { code: 2481, category: ts.DiagnosticCategory.Error, key: "Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1_2481", message: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'." },
         The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation_2483", message: "The left-hand side of a 'for...of' statement cannot use a type annotation." },
         Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: ts.DiagnosticCategory.Error, key: "Export_declaration_conflicts_with_exported_declaration_of_0_2484", message: "Export declaration conflicts with exported declaration of '{0}'" },
-        The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant: { code: 2485, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant_2485", message: "The left-hand side of a 'for...of' statement cannot be a previously defined constant." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant: { code: 2486, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant_2486", message: "The left-hand side of a 'for...in' statement cannot be a previously defined constant." },
+        The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property: { code: 2485, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property_2485", message: "The left-hand side of a 'for...of' statement cannot be a constant or a read-only property." },
+        The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property: { code: 2486, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property_2486", message: "The left-hand side of a 'for...in' statement cannot be a constant or a read-only property." },
         Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_of_statement_2487", message: "Invalid left-hand side in 'for...of' statement." },
         Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: ts.DiagnosticCategory.Error, key: "Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator_2488", message: "Type must have a '[Symbol.iterator]()' method that returns an iterator." },
         An_iterator_must_have_a_next_method: { code: 2489, category: ts.DiagnosticCategory.Error, key: "An_iterator_must_have_a_next_method_2489", message: "An iterator must have a 'next()' method." },
@@ -1638,7 +1740,7 @@ var ts;
         Base_constructor_return_type_0_is_not_a_class_or_interface_type: { code: 2509, category: ts.DiagnosticCategory.Error, key: "Base_constructor_return_type_0_is_not_a_class_or_interface_type_2509", message: "Base constructor return type '{0}' is not a class or interface type." },
         Base_constructors_must_all_have_the_same_return_type: { code: 2510, category: ts.DiagnosticCategory.Error, key: "Base_constructors_must_all_have_the_same_return_type_2510", message: "Base constructors must all have the same return type." },
         Cannot_create_an_instance_of_the_abstract_class_0: { code: 2511, category: ts.DiagnosticCategory.Error, key: "Cannot_create_an_instance_of_the_abstract_class_0_2511", message: "Cannot create an instance of the abstract class '{0}'." },
-        Overload_signatures_must_all_be_abstract_or_not_abstract: { code: 2512, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_abstract_or_not_abstract_2512", message: "Overload signatures must all be abstract or not abstract." },
+        Overload_signatures_must_all_be_abstract_or_non_abstract: { code: 2512, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_abstract_or_non_abstract_2512", message: "Overload signatures must all be abstract or non-abstract." },
         Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression: { code: 2513, category: ts.DiagnosticCategory.Error, key: "Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression_2513", message: "Abstract method '{0}' in class '{1}' cannot be accessed via super expression." },
         Classes_containing_abstract_methods_must_be_marked_abstract: { code: 2514, category: ts.DiagnosticCategory.Error, key: "Classes_containing_abstract_methods_must_be_marked_abstract_2514", message: "Classes containing abstract methods must be marked abstract." },
         Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2: { code: 2515, category: ts.DiagnosticCategory.Error, key: "Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2_2515", message: "Non-abstract class '{0}' does not implement inherited abstract member '{1}' from class '{2}'." },
@@ -1654,6 +1756,9 @@ var ts;
         A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface: { code: 2526, category: ts.DiagnosticCategory.Error, key: "A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface_2526", message: "A 'this' type is available only in a non-static member of a class or interface." },
         The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary: { code: 2527, category: ts.DiagnosticCategory.Error, key: "The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary_2527", message: "The inferred type of '{0}' references an inaccessible 'this' type. A type annotation is necessary." },
         A_module_cannot_have_multiple_default_exports: { code: 2528, category: ts.DiagnosticCategory.Error, key: "A_module_cannot_have_multiple_default_exports_2528", message: "A module cannot have multiple default exports." },
+        Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_functions: { code: 2529, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_func_2529", message: "Duplicate identifier '{0}'. Compiler reserves name '{1}' in top level scope of a module containing async functions." },
+        Property_0_is_incompatible_with_index_signature: { code: 2530, category: ts.DiagnosticCategory.Error, key: "Property_0_is_incompatible_with_index_signature_2530", message: "Property '{0}' is incompatible with index signature." },
+        Object_is_possibly_null_or_undefined: { code: 2531, category: ts.DiagnosticCategory.Error, key: "Object_is_possibly_null_or_undefined_2531", message: "Object is possibly 'null' or 'undefined'." },
         JSX_element_attributes_type_0_may_not_be_a_union_type: { code: 2600, category: ts.DiagnosticCategory.Error, key: "JSX_element_attributes_type_0_may_not_be_a_union_type_2600", message: "JSX element attributes type '{0}' may not be a union type." },
         The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: { code: 2601, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_a_JSX_element_constructor_must_return_an_object_type_2601", message: "The return type of a JSX element constructor must return an object type." },
         JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist: { code: 2602, category: ts.DiagnosticCategory.Error, key: "JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist_2602", message: "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist." },
@@ -1683,6 +1788,21 @@ var ts;
         export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always_visible: { code: 2668, category: ts.DiagnosticCategory.Error, key: "export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always__2668", message: "'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible." },
         Augmentations_for_the_global_scope_can_only_be_directly_nested_in_external_modules_or_ambient_module_declarations: { code: 2669, category: ts.DiagnosticCategory.Error, key: "Augmentations_for_the_global_scope_can_only_be_directly_nested_in_external_modules_or_ambient_module_2669", message: "Augmentations for the global scope can only be directly nested in external modules or ambient module declarations." },
         Augmentations_for_the_global_scope_should_have_declare_modifier_unless_they_appear_in_already_ambient_context: { code: 2670, category: ts.DiagnosticCategory.Error, key: "Augmentations_for_the_global_scope_should_have_declare_modifier_unless_they_appear_in_already_ambien_2670", message: "Augmentations for the global scope should have 'declare' modifier unless they appear in already ambient context." },
+        Cannot_augment_module_0_because_it_resolves_to_a_non_module_entity: { code: 2671, category: ts.DiagnosticCategory.Error, key: "Cannot_augment_module_0_because_it_resolves_to_a_non_module_entity_2671", message: "Cannot augment module '{0}' because it resolves to a non-module entity." },
+        Cannot_assign_a_0_constructor_type_to_a_1_constructor_type: { code: 2672, category: ts.DiagnosticCategory.Error, key: "Cannot_assign_a_0_constructor_type_to_a_1_constructor_type_2672", message: "Cannot assign a '{0}' constructor type to a '{1}' constructor type." },
+        Constructor_of_class_0_is_private_and_only_accessible_within_the_class_declaration: { code: 2673, category: ts.DiagnosticCategory.Error, key: "Constructor_of_class_0_is_private_and_only_accessible_within_the_class_declaration_2673", message: "Constructor of class '{0}' is private and only accessible within the class declaration." },
+        Constructor_of_class_0_is_protected_and_only_accessible_within_the_class_declaration: { code: 2674, category: ts.DiagnosticCategory.Error, key: "Constructor_of_class_0_is_protected_and_only_accessible_within_the_class_declaration_2674", message: "Constructor of class '{0}' is protected and only accessible within the class declaration." },
+        Cannot_extend_a_class_0_Class_constructor_is_marked_as_private: { code: 2675, category: ts.DiagnosticCategory.Error, key: "Cannot_extend_a_class_0_Class_constructor_is_marked_as_private_2675", message: "Cannot extend a class '{0}'. Class constructor is marked as private." },
+        Accessors_must_both_be_abstract_or_non_abstract: { code: 2676, category: ts.DiagnosticCategory.Error, key: "Accessors_must_both_be_abstract_or_non_abstract_2676", message: "Accessors must both be abstract or non-abstract." },
+        A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type: { code: 2677, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type_2677", message: "A type predicate's type must be assignable to its parameter's type." },
+        Type_0_is_not_comparable_to_type_1: { code: 2678, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_comparable_to_type_1_2678", message: "Type '{0}' is not comparable to type '{1}'." },
+        A_function_that_is_called_with_the_new_keyword_cannot_have_a_this_type_that_is_void: { code: 2679, category: ts.DiagnosticCategory.Error, key: "A_function_that_is_called_with_the_new_keyword_cannot_have_a_this_type_that_is_void_2679", message: "A function that is called with the 'new' keyword cannot have a 'this' type that is 'void'." },
+        A_this_parameter_must_be_the_first_parameter: { code: 2680, category: ts.DiagnosticCategory.Error, key: "A_this_parameter_must_be_the_first_parameter_2680", message: "A 'this' parameter must be the first parameter." },
+        A_constructor_cannot_have_a_this_parameter: { code: 2681, category: ts.DiagnosticCategory.Error, key: "A_constructor_cannot_have_a_this_parameter_2681", message: "A constructor cannot have a 'this' parameter." },
+        A_setter_cannot_have_a_this_parameter: { code: 2682, category: ts.DiagnosticCategory.Error, key: "A_setter_cannot_have_a_this_parameter_2682", message: "A setter cannot have a 'this' parameter." },
+        this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation: { code: 2683, category: ts.DiagnosticCategory.Error, key: "this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_2683", message: "'this' implicitly has type 'any' because it does not have a type annotation." },
+        The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1: { code: 2684, category: ts.DiagnosticCategory.Error, key: "The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1_2684", message: "The 'this' context of type '{0}' is not assignable to method's 'this' of type '{1}'." },
+        The_this_types_of_each_signature_are_incompatible: { code: 2685, category: ts.DiagnosticCategory.Error, key: "The_this_types_of_each_signature_are_incompatible_2685", message: "The 'this' types of each signature are incompatible." },
         Import_declaration_0_is_using_private_name_1: { code: 4000, category: ts.DiagnosticCategory.Error, key: "Import_declaration_0_is_using_private_name_1_4000", message: "Import declaration '{0}' is using private name '{1}'." },
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", message: "Type parameter '{0}' of exported class has or is using private name '{1}'." },
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", message: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
@@ -1753,6 +1873,7 @@ var ts;
         Parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4078, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_exported_function_has_or_is_using_private_name_1_4078", message: "Parameter '{0}' of exported function has or is using private name '{1}'." },
         Exported_type_alias_0_has_or_is_using_private_name_1: { code: 4081, category: ts.DiagnosticCategory.Error, key: "Exported_type_alias_0_has_or_is_using_private_name_1_4081", message: "Exported type alias '{0}' has or is using private name '{1}'." },
         Default_export_of_the_module_has_or_is_using_private_name_0: { code: 4082, category: ts.DiagnosticCategory.Error, key: "Default_export_of_the_module_has_or_is_using_private_name_0_4082", message: "Default export of the module has or is using private name '{0}'." },
+        Conflicting_library_definitions_for_0_found_at_1_and_2_Copy_the_correct_file_to_the_typings_folder_to_resolve_this_conflict: { code: 4090, category: ts.DiagnosticCategory.Message, key: "Conflicting_library_definitions_for_0_found_at_1_and_2_Copy_the_correct_file_to_the_typings_folder_t_4090", message: "Conflicting library definitions for '{0}' found at '{1}' and '{2}'. Copy the correct file to the 'typings' folder to resolve this conflict." },
         The_current_host_does_not_support_the_0_option: { code: 5001, category: ts.DiagnosticCategory.Error, key: "The_current_host_does_not_support_the_0_option_5001", message: "The current host does not support the '{0}' option." },
         Cannot_find_the_common_subdirectory_path_for_the_input_files: { code: 5009, category: ts.DiagnosticCategory.Error, key: "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", message: "Cannot find the common subdirectory path for the input files." },
         Cannot_read_file_0_Colon_1: { code: 5012, category: ts.DiagnosticCategory.Error, key: "Cannot_read_file_0_Colon_1_5012", message: "Cannot read file '{0}': {1}" },
@@ -1771,11 +1892,14 @@ var ts;
         Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files: { code: 5056, category: ts.DiagnosticCategory.Error, key: "Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files_5056", message: "Cannot write file '{0}' because it would be overwritten by multiple input files." },
         Cannot_find_a_tsconfig_json_file_at_the_specified_directory_Colon_0: { code: 5057, category: ts.DiagnosticCategory.Error, key: "Cannot_find_a_tsconfig_json_file_at_the_specified_directory_Colon_0_5057", message: "Cannot find a tsconfig.json file at the specified directory: '{0}'" },
         The_specified_path_does_not_exist_Colon_0: { code: 5058, category: ts.DiagnosticCategory.Error, key: "The_specified_path_does_not_exist_Colon_0_5058", message: "The specified path does not exist: '{0}'" },
-        Invalide_value_for_reactNamespace_0_is_not_a_valid_identifier: { code: 5059, category: ts.DiagnosticCategory.Error, key: "Invalide_value_for_reactNamespace_0_is_not_a_valid_identifier_5059", message: "Invalide value for '--reactNamespace'. '{0}' is not a valid identifier." },
+        Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier: { code: 5059, category: ts.DiagnosticCategory.Error, key: "Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier_5059", message: "Invalid value for '--reactNamespace'. '{0}' is not a valid identifier." },
+        Option_paths_cannot_be_used_without_specifying_baseUrl_option: { code: 5060, category: ts.DiagnosticCategory.Error, key: "Option_paths_cannot_be_used_without_specifying_baseUrl_option_5060", message: "Option 'paths' cannot be used without specifying '--baseUrl' option." },
+        Pattern_0_can_have_at_most_one_Asterisk_character: { code: 5061, category: ts.DiagnosticCategory.Error, key: "Pattern_0_can_have_at_most_one_Asterisk_character_5061", message: "Pattern '{0}' can have at most one '*' character" },
+        Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character: { code: 5062, category: ts.DiagnosticCategory.Error, key: "Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character_5062", message: "Substitution '{0}' in pattern '{1}' in can have at most one '*' character" },
         Concatenate_and_emit_output_to_single_file: { code: 6001, category: ts.DiagnosticCategory.Message, key: "Concatenate_and_emit_output_to_single_file_6001", message: "Concatenate and emit output to single file." },
         Generates_corresponding_d_ts_file: { code: 6002, category: ts.DiagnosticCategory.Message, key: "Generates_corresponding_d_ts_file_6002", message: "Generates corresponding '.d.ts' file." },
-        Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: ts.DiagnosticCategory.Message, key: "Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations_6003", message: "Specifies the location where debugger should locate map files instead of generated locations." },
-        Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: { code: 6004, category: ts.DiagnosticCategory.Message, key: "Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations_6004", message: "Specifies the location where debugger should locate TypeScript files instead of source locations." },
+        Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: ts.DiagnosticCategory.Message, key: "Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations_6003", message: "Specify the location where debugger should locate map files instead of generated locations." },
+        Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: { code: 6004, category: ts.DiagnosticCategory.Message, key: "Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations_6004", message: "Specify the location where debugger should locate TypeScript files instead of source locations." },
         Watch_input_files: { code: 6005, category: ts.DiagnosticCategory.Message, key: "Watch_input_files_6005", message: "Watch input files." },
         Redirect_output_structure_to_the_directory: { code: 6006, category: ts.DiagnosticCategory.Message, key: "Redirect_output_structure_to_the_directory_6006", message: "Redirect output structure to the directory." },
         Do_not_erase_const_enum_declarations_in_generated_code: { code: 6007, category: ts.DiagnosticCategory.Message, key: "Do_not_erase_const_enum_declarations_in_generated_code_6007", message: "Do not erase const enum declarations in generated code." },
@@ -1783,7 +1907,7 @@ var ts;
         Do_not_emit_comments_to_output: { code: 6009, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_comments_to_output_6009", message: "Do not emit comments to output." },
         Do_not_emit_outputs: { code: 6010, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_outputs_6010", message: "Do not emit outputs." },
         Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking: { code: 6011, category: ts.DiagnosticCategory.Message, key: "Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typech_6011", message: "Allow default imports from modules with no default export. This does not affect code emit, just typechecking." },
-        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental: { code: 6015, category: ts.DiagnosticCategory.Message, key: "Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental_6015", message: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES2015' (experimental)" },
+        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015: { code: 6015, category: ts.DiagnosticCategory.Message, key: "Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_6015", message: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES2015'" },
         Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015: { code: 6016, category: ts.DiagnosticCategory.Message, key: "Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015_6016", message: "Specify module code generation: 'commonjs', 'amd', 'system', 'umd' or 'es2015'" },
         Print_this_message: { code: 6017, category: ts.DiagnosticCategory.Message, key: "Print_this_message_6017", message: "Print this message." },
         Print_the_compiler_s_version: { code: 6019, category: ts.DiagnosticCategory.Message, key: "Print_the_compiler_s_version_6019", message: "Print the compiler's version." },
@@ -1805,8 +1929,7 @@ var ts;
         Generates_corresponding_map_file: { code: 6043, category: ts.DiagnosticCategory.Message, key: "Generates_corresponding_map_file_6043", message: "Generates corresponding '.map' file." },
         Compiler_option_0_expects_an_argument: { code: 6044, category: ts.DiagnosticCategory.Error, key: "Compiler_option_0_expects_an_argument_6044", message: "Compiler option '{0}' expects an argument." },
         Unterminated_quoted_string_in_response_file_0: { code: 6045, category: ts.DiagnosticCategory.Error, key: "Unterminated_quoted_string_in_response_file_0_6045", message: "Unterminated quoted string in response file '{0}'." },
-        Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015: { code: 6046, category: ts.DiagnosticCategory.Error, key: "Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015_6046", message: "Argument for '--module' option must be 'commonjs', 'amd', 'system', 'umd', or 'es2015'." },
-        Argument_for_target_option_must_be_ES3_ES5_or_ES2015: { code: 6047, category: ts.DiagnosticCategory.Error, key: "Argument_for_target_option_must_be_ES3_ES5_or_ES2015_6047", message: "Argument for '--target' option must be 'ES3', 'ES5', or 'ES2015'." },
+        Argument_for_0_option_must_be_Colon_1: { code: 6046, category: ts.DiagnosticCategory.Error, key: "Argument_for_0_option_must_be_Colon_1_6046", message: "Argument for '{0}' option must be: {1}" },
         Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1: { code: 6048, category: ts.DiagnosticCategory.Error, key: "Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1_6048", message: "Locale must be of the form <language> or <language>-<territory>. For example '{0}' or '{1}'." },
         Unsupported_locale_0: { code: 6049, category: ts.DiagnosticCategory.Error, key: "Unsupported_locale_0_6049", message: "Unsupported locale '{0}'." },
         Unable_to_open_file_0: { code: 6050, category: ts.DiagnosticCategory.Error, key: "Unable_to_open_file_0_6050", message: "Unable to open file '{0}'." },
@@ -1816,16 +1939,15 @@ var ts;
         File_0_has_unsupported_extension_The_only_supported_extensions_are_1: { code: 6054, category: ts.DiagnosticCategory.Error, key: "File_0_has_unsupported_extension_The_only_supported_extensions_are_1_6054", message: "File '{0}' has unsupported extension. The only supported extensions are {1}." },
         Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures: { code: 6055, category: ts.DiagnosticCategory.Message, key: "Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures_6055", message: "Suppress noImplicitAny errors for indexing objects lacking index signatures." },
         Do_not_emit_declarations_for_code_that_has_an_internal_annotation: { code: 6056, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_declarations_for_code_that_has_an_internal_annotation_6056", message: "Do not emit declarations for code that has an '@internal' annotation." },
-        Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir: { code: 6058, category: ts.DiagnosticCategory.Message, key: "Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDi_6058", message: "Specifies the root directory of input files. Use to control the output directory structure with --outDir." },
+        Specify_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir: { code: 6058, category: ts.DiagnosticCategory.Message, key: "Specify_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir_6058", message: "Specify the root directory of input files. Use to control the output directory structure with --outDir." },
         File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files: { code: 6059, category: ts.DiagnosticCategory.Error, key: "File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files_6059", message: "File '{0}' is not under 'rootDir' '{1}'. 'rootDir' is expected to contain all source files." },
-        Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix: { code: 6060, category: ts.DiagnosticCategory.Message, key: "Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix_6060", message: "Specifies the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix)." },
+        Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix: { code: 6060, category: ts.DiagnosticCategory.Message, key: "Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix_6060", message: "Specify the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix)." },
         NEWLINE: { code: 6061, category: ts.DiagnosticCategory.Message, key: "NEWLINE_6061", message: "NEWLINE" },
-        Argument_for_newLine_option_must_be_CRLF_or_LF: { code: 6062, category: ts.DiagnosticCategory.Error, key: "Argument_for_newLine_option_must_be_CRLF_or_LF_6062", message: "Argument for '--newLine' option must be 'CRLF' or 'LF'." },
-        Argument_for_moduleResolution_option_must_be_node_or_classic: { code: 6063, category: ts.DiagnosticCategory.Error, key: "Argument_for_moduleResolution_option_must_be_node_or_classic_6063", message: "Argument for '--moduleResolution' option must be 'node' or 'classic'." },
+        Option_0_can_only_be_specified_in_tsconfig_json_file: { code: 6064, category: ts.DiagnosticCategory.Error, key: "Option_0_can_only_be_specified_in_tsconfig_json_file_6064", message: "Option '{0}' can only be specified in 'tsconfig.json' file." },
         Enables_experimental_support_for_ES7_decorators: { code: 6065, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_ES7_decorators_6065", message: "Enables experimental support for ES7 decorators." },
         Enables_experimental_support_for_emitting_type_metadata_for_decorators: { code: 6066, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_emitting_type_metadata_for_decorators_6066", message: "Enables experimental support for emitting type metadata for decorators." },
         Enables_experimental_support_for_ES7_async_functions: { code: 6068, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_ES7_async_functions_6068", message: "Enables experimental support for ES7 async functions." },
-        Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6: { code: 6069, category: ts.DiagnosticCategory.Message, key: "Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6_6069", message: "Specifies module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6)." },
+        Specify_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6: { code: 6069, category: ts.DiagnosticCategory.Message, key: "Specify_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6_6069", message: "Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6)." },
         Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file: { code: 6070, category: ts.DiagnosticCategory.Message, key: "Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file_6070", message: "Initializes a TypeScript project and creates a tsconfig.json file." },
         Successfully_created_a_tsconfig_json_file: { code: 6071, category: ts.DiagnosticCategory.Message, key: "Successfully_created_a_tsconfig_json_file_6071", message: "Successfully created a tsconfig.json file." },
         Suppress_excess_property_checks_for_object_literals: { code: 6072, category: ts.DiagnosticCategory.Message, key: "Suppress_excess_property_checks_for_object_literals_6072", message: "Suppress excess property checks for object literals." },
@@ -1835,11 +1957,55 @@ var ts;
         Report_errors_for_fallthrough_cases_in_switch_statement: { code: 6076, category: ts.DiagnosticCategory.Message, key: "Report_errors_for_fallthrough_cases_in_switch_statement_6076", message: "Report errors for fallthrough cases in switch statement." },
         Do_not_report_errors_on_unreachable_code: { code: 6077, category: ts.DiagnosticCategory.Message, key: "Do_not_report_errors_on_unreachable_code_6077", message: "Do not report errors on unreachable code." },
         Disallow_inconsistently_cased_references_to_the_same_file: { code: 6078, category: ts.DiagnosticCategory.Message, key: "Disallow_inconsistently_cased_references_to_the_same_file_6078", message: "Disallow inconsistently-cased references to the same file." },
+        Specify_library_files_to_be_included_in_the_compilation_Colon: { code: 6079, category: ts.DiagnosticCategory.Message, key: "Specify_library_files_to_be_included_in_the_compilation_Colon_6079", message: "Specify library files to be included in the compilation: " },
         Specify_JSX_code_generation_Colon_preserve_or_react: { code: 6080, category: ts.DiagnosticCategory.Message, key: "Specify_JSX_code_generation_Colon_preserve_or_react_6080", message: "Specify JSX code generation: 'preserve' or 'react'" },
-        Argument_for_jsx_must_be_preserve_or_react: { code: 6081, category: ts.DiagnosticCategory.Message, key: "Argument_for_jsx_must_be_preserve_or_react_6081", message: "Argument for '--jsx' must be 'preserve' or 'react'." },
         Only_amd_and_system_modules_are_supported_alongside_0: { code: 6082, category: ts.DiagnosticCategory.Error, key: "Only_amd_and_system_modules_are_supported_alongside_0_6082", message: "Only 'amd' and 'system' modules are supported alongside --{0}." },
-        Allow_javascript_files_to_be_compiled: { code: 6083, category: ts.DiagnosticCategory.Message, key: "Allow_javascript_files_to_be_compiled_6083", message: "Allow javascript files to be compiled." },
-        Specifies_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit: { code: 6084, category: ts.DiagnosticCategory.Message, key: "Specifies_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit_6084", message: "Specifies the object invoked for createElement and __spread when targeting 'react' JSX emit" },
+        Base_directory_to_resolve_non_absolute_module_names: { code: 6083, category: ts.DiagnosticCategory.Message, key: "Base_directory_to_resolve_non_absolute_module_names_6083", message: "Base directory to resolve non-absolute module names." },
+        Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit: { code: 6084, category: ts.DiagnosticCategory.Message, key: "Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit_6084", message: "Specify the object invoked for createElement and __spread when targeting 'react' JSX emit" },
+        Enable_tracing_of_the_name_resolution_process: { code: 6085, category: ts.DiagnosticCategory.Message, key: "Enable_tracing_of_the_name_resolution_process_6085", message: "Enable tracing of the name resolution process." },
+        Resolving_module_0_from_1: { code: 6086, category: ts.DiagnosticCategory.Message, key: "Resolving_module_0_from_1_6086", message: "======== Resolving module '{0}' from '{1}'. ========" },
+        Explicitly_specified_module_resolution_kind_Colon_0: { code: 6087, category: ts.DiagnosticCategory.Message, key: "Explicitly_specified_module_resolution_kind_Colon_0_6087", message: "Explicitly specified module resolution kind: '{0}'." },
+        Module_resolution_kind_is_not_specified_using_0: { code: 6088, category: ts.DiagnosticCategory.Message, key: "Module_resolution_kind_is_not_specified_using_0_6088", message: "Module resolution kind is not specified, using '{0}'." },
+        Module_name_0_was_successfully_resolved_to_1: { code: 6089, category: ts.DiagnosticCategory.Message, key: "Module_name_0_was_successfully_resolved_to_1_6089", message: "======== Module name '{0}' was successfully resolved to '{1}'. ========" },
+        Module_name_0_was_not_resolved: { code: 6090, category: ts.DiagnosticCategory.Message, key: "Module_name_0_was_not_resolved_6090", message: "======== Module name '{0}' was not resolved. ========" },
+        paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0: { code: 6091, category: ts.DiagnosticCategory.Message, key: "paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0_6091", message: "'paths' option is specified, looking for a pattern to match module name '{0}'." },
+        Module_name_0_matched_pattern_1: { code: 6092, category: ts.DiagnosticCategory.Message, key: "Module_name_0_matched_pattern_1_6092", message: "Module name '{0}', matched pattern '{1}'." },
+        Trying_substitution_0_candidate_module_location_Colon_1: { code: 6093, category: ts.DiagnosticCategory.Message, key: "Trying_substitution_0_candidate_module_location_Colon_1_6093", message: "Trying substitution '{0}', candidate module location: '{1}'." },
+        Resolving_module_name_0_relative_to_base_url_1_2: { code: 6094, category: ts.DiagnosticCategory.Message, key: "Resolving_module_name_0_relative_to_base_url_1_2_6094", message: "Resolving module name '{0}' relative to base url '{1}' - '{2}'." },
+        Loading_module_as_file_Slash_folder_candidate_module_location_0: { code: 6095, category: ts.DiagnosticCategory.Message, key: "Loading_module_as_file_Slash_folder_candidate_module_location_0_6095", message: "Loading module as file / folder, candidate module location '{0}'." },
+        File_0_does_not_exist: { code: 6096, category: ts.DiagnosticCategory.Message, key: "File_0_does_not_exist_6096", message: "File '{0}' does not exist." },
+        File_0_exist_use_it_as_a_name_resolution_result: { code: 6097, category: ts.DiagnosticCategory.Message, key: "File_0_exist_use_it_as_a_name_resolution_result_6097", message: "File '{0}' exist - use it as a name resolution result." },
+        Loading_module_0_from_node_modules_folder: { code: 6098, category: ts.DiagnosticCategory.Message, key: "Loading_module_0_from_node_modules_folder_6098", message: "Loading module '{0}' from 'node_modules' folder." },
+        Found_package_json_at_0: { code: 6099, category: ts.DiagnosticCategory.Message, key: "Found_package_json_at_0_6099", message: "Found 'package.json' at '{0}'." },
+        package_json_does_not_have_types_field: { code: 6100, category: ts.DiagnosticCategory.Message, key: "package_json_does_not_have_types_field_6100", message: "'package.json' does not have 'types' field." },
+        package_json_has_0_field_1_that_references_2: { code: 6101, category: ts.DiagnosticCategory.Message, key: "package_json_has_0_field_1_that_references_2_6101", message: "'package.json' has '{0}' field '{1}' that references '{2}'." },
+        Allow_javascript_files_to_be_compiled: { code: 6102, category: ts.DiagnosticCategory.Message, key: "Allow_javascript_files_to_be_compiled_6102", message: "Allow javascript files to be compiled." },
+        Option_0_should_have_array_of_strings_as_a_value: { code: 6103, category: ts.DiagnosticCategory.Error, key: "Option_0_should_have_array_of_strings_as_a_value_6103", message: "Option '{0}' should have array of strings as a value." },
+        Checking_if_0_is_the_longest_matching_prefix_for_1_2: { code: 6104, category: ts.DiagnosticCategory.Message, key: "Checking_if_0_is_the_longest_matching_prefix_for_1_2_6104", message: "Checking if '{0}' is the longest matching prefix for '{1}' - '{2}'." },
+        Expected_type_of_0_field_in_package_json_to_be_string_got_1: { code: 6105, category: ts.DiagnosticCategory.Message, key: "Expected_type_of_0_field_in_package_json_to_be_string_got_1_6105", message: "Expected type of '{0}' field in 'package.json' to be 'string', got '{1}'." },
+        baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1: { code: 6106, category: ts.DiagnosticCategory.Message, key: "baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1_6106", message: "'baseUrl' option is set to '{0}', using this value to resolve non-relative module name '{1}'" },
+        rootDirs_option_is_set_using_it_to_resolve_relative_module_name_0: { code: 6107, category: ts.DiagnosticCategory.Message, key: "rootDirs_option_is_set_using_it_to_resolve_relative_module_name_0_6107", message: "'rootDirs' option is set, using it to resolve relative module name '{0}'" },
+        Longest_matching_prefix_for_0_is_1: { code: 6108, category: ts.DiagnosticCategory.Message, key: "Longest_matching_prefix_for_0_is_1_6108", message: "Longest matching prefix for '{0}' is '{1}'" },
+        Loading_0_from_the_root_dir_1_candidate_location_2: { code: 6109, category: ts.DiagnosticCategory.Message, key: "Loading_0_from_the_root_dir_1_candidate_location_2_6109", message: "Loading '{0}' from the root dir '{1}', candidate location '{2}'" },
+        Trying_other_entries_in_rootDirs: { code: 6110, category: ts.DiagnosticCategory.Message, key: "Trying_other_entries_in_rootDirs_6110", message: "Trying other entries in 'rootDirs'" },
+        Module_resolution_using_rootDirs_has_failed: { code: 6111, category: ts.DiagnosticCategory.Message, key: "Module_resolution_using_rootDirs_has_failed_6111", message: "Module resolution using 'rootDirs' has failed" },
+        Do_not_emit_use_strict_directives_in_module_output: { code: 6112, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_use_strict_directives_in_module_output_6112", message: "Do not emit 'use strict' directives in module output." },
+        Enable_strict_null_checks: { code: 6113, category: ts.DiagnosticCategory.Message, key: "Enable_strict_null_checks_6113", message: "Enable strict null checks." },
+        Unknown_option_excludes_Did_you_mean_exclude: { code: 6114, category: ts.DiagnosticCategory.Error, key: "Unknown_option_excludes_Did_you_mean_exclude_6114", message: "Unknown option 'excludes'. Did you mean 'exclude'?" },
+        Raise_error_on_this_expressions_with_an_implied_any_type: { code: 6115, category: ts.DiagnosticCategory.Message, key: "Raise_error_on_this_expressions_with_an_implied_any_type_6115", message: "Raise error on 'this' expressions with an implied 'any' type." },
+        Resolving_type_reference_directive_0_containing_file_1_root_directory_2: { code: 6116, category: ts.DiagnosticCategory.Message, key: "Resolving_type_reference_directive_0_containing_file_1_root_directory_2_6116", message: "======== Resolving type reference directive '{0}', containing file '{1}', root directory '{2}'. ========" },
+        Resolving_using_primary_search_paths: { code: 6117, category: ts.DiagnosticCategory.Message, key: "Resolving_using_primary_search_paths_6117", message: "Resolving using primary search paths..." },
+        Resolving_from_node_modules_folder: { code: 6118, category: ts.DiagnosticCategory.Message, key: "Resolving_from_node_modules_folder_6118", message: "Resolving from node_modules folder..." },
+        Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2: { code: 6119, category: ts.DiagnosticCategory.Message, key: "Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2_6119", message: "======== Type reference directive '{0}' was successfully resolved to '{1}', primary: {2}. ========" },
+        Type_reference_directive_0_was_not_resolved: { code: 6120, category: ts.DiagnosticCategory.Message, key: "Type_reference_directive_0_was_not_resolved_6120", message: "======== Type reference directive '{0}' was not resolved. ========" },
+        Resolving_with_primary_search_path_0: { code: 6121, category: ts.DiagnosticCategory.Message, key: "Resolving_with_primary_search_path_0_6121", message: "Resolving with primary search path '{0}'" },
+        Root_directory_cannot_be_determined_skipping_primary_search_paths: { code: 6122, category: ts.DiagnosticCategory.Message, key: "Root_directory_cannot_be_determined_skipping_primary_search_paths_6122", message: "Root directory cannot be determined, skipping primary search paths." },
+        Resolving_type_reference_directive_0_containing_file_1_root_directory_not_set: { code: 6123, category: ts.DiagnosticCategory.Message, key: "Resolving_type_reference_directive_0_containing_file_1_root_directory_not_set_6123", message: "======== Resolving type reference directive '{0}', containing file '{1}', root directory not set. ========" },
+        Type_declaration_files_to_be_included_in_compilation: { code: 6124, category: ts.DiagnosticCategory.Message, key: "Type_declaration_files_to_be_included_in_compilation_6124", message: "Type declaration files to be included in compilation." },
+        Looking_up_in_node_modules_folder_initial_location_0: { code: 6125, category: ts.DiagnosticCategory.Message, key: "Looking_up_in_node_modules_folder_initial_location_0_6125", message: "Looking up in 'node_modules' folder, initial location '{0}'" },
+        Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder: { code: 6126, category: ts.DiagnosticCategory.Message, key: "Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_mod_6126", message: "Containing file is not specified and root directory cannot be determined, skipping lookup in 'node_modules' folder." },
+        Resolving_type_reference_directive_0_containing_file_not_set_root_directory_1: { code: 6127, category: ts.DiagnosticCategory.Message, key: "Resolving_type_reference_directive_0_containing_file_not_set_root_directory_1_6127", message: "======== Resolving type reference directive '{0}', containing file not set, root directory '{1}'. ========" },
+        Resolving_type_reference_directive_0_containing_file_not_set_root_directory_not_set: { code: 6128, category: ts.DiagnosticCategory.Message, key: "Resolving_type_reference_directive_0_containing_file_not_set_root_directory_not_set_6128", message: "======== Resolving type reference directive '{0}', containing file not set, root directory not set. ========" },
         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." },
         Parameter_0_implicitly_has_an_1_type: { code: 7006, category: ts.DiagnosticCategory.Error, key: "Parameter_0_implicitly_has_an_1_type_7006", message: "Parameter '{0}' implicitly has an '{1}' type." },
         Member_0_implicitly_has_an_1_type: { code: 7008, category: ts.DiagnosticCategory.Error, key: "Member_0_implicitly_has_an_1_type_7008", message: "Member '{0}' implicitly has an '{1}' type." },
@@ -1862,6 +2028,7 @@ var ts;
         Unused_label: { code: 7028, category: ts.DiagnosticCategory.Error, key: "Unused_label_7028", message: "Unused label." },
         Fallthrough_case_in_switch: { code: 7029, category: ts.DiagnosticCategory.Error, key: "Fallthrough_case_in_switch_7029", message: "Fallthrough case in switch." },
         Not_all_code_paths_return_a_value: { code: 7030, category: ts.DiagnosticCategory.Error, key: "Not_all_code_paths_return_a_value_7030", message: "Not all code paths return a value." },
+        Binding_element_0_implicitly_has_an_1_type: { code: 7031, category: ts.DiagnosticCategory.Error, key: "Binding_element_0_implicitly_has_an_1_type_7031", message: "Binding element '{0}' implicitly has an '{1}' type." },
         You_cannot_rename_this_element: { code: 8000, category: ts.DiagnosticCategory.Error, key: "You_cannot_rename_this_element_8000", message: "You cannot rename this element." },
         You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: { code: 8001, category: ts.DiagnosticCategory.Error, key: "You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library_8001", message: "You cannot rename elements that are defined in the standard TypeScript library." },
         import_can_only_be_used_in_a_ts_file: { code: 8002, category: ts.DiagnosticCategory.Error, key: "import_can_only_be_used_in_a_ts_file_8002", message: "'import ... =' can only be used in a .ts file." },
@@ -1878,7 +2045,6 @@ var ts;
         property_declarations_can_only_be_used_in_a_ts_file: { code: 8014, category: ts.DiagnosticCategory.Error, key: "property_declarations_can_only_be_used_in_a_ts_file_8014", message: "'property declarations' can only be used in a .ts file." },
         enum_declarations_can_only_be_used_in_a_ts_file: { code: 8015, category: ts.DiagnosticCategory.Error, key: "enum_declarations_can_only_be_used_in_a_ts_file_8015", message: "'enum declarations' can only be used in a .ts file." },
         type_assertion_expressions_can_only_be_used_in_a_ts_file: { code: 8016, category: ts.DiagnosticCategory.Error, key: "type_assertion_expressions_can_only_be_used_in_a_ts_file_8016", message: "'type assertion expressions' can only be used in a .ts file." },
-        decorators_can_only_be_used_in_a_ts_file: { code: 8017, category: ts.DiagnosticCategory.Error, key: "decorators_can_only_be_used_in_a_ts_file_8017", message: "'decorators' can only be used in a .ts file." },
         Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_class_extends_clauses: { code: 9002, category: ts.DiagnosticCategory.Error, key: "Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_clas_9002", message: "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses." },
         class_expressions_are_not_currently_supported: { code: 9003, category: ts.DiagnosticCategory.Error, key: "class_expressions_are_not_currently_supported_9003", message: "'class' expressions are not currently supported." },
         JSX_attributes_must_only_be_assigned_a_non_empty_expression: { code: 17000, category: ts.DiagnosticCategory.Error, key: "JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000", message: "JSX attributes must only be assigned a non-empty 'expression'." },
@@ -1889,7 +2055,9 @@ var ts;
         A_constructor_cannot_contain_a_super_call_when_its_class_extends_null: { code: 17005, category: ts.DiagnosticCategory.Error, key: "A_constructor_cannot_contain_a_super_call_when_its_class_extends_null_17005", message: "A constructor cannot contain a 'super' call when its class extends 'null'" },
         An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17006, category: ts.DiagnosticCategory.Error, key: "An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_ex_17006", message: "An unary expression with the '{0}' operator is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." },
         A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17007, category: ts.DiagnosticCategory.Error, key: "A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Con_17007", message: "A type assertion expression is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." },
-        JSX_element_0_has_no_corresponding_closing_tag: { code: 17008, category: ts.DiagnosticCategory.Error, key: "JSX_element_0_has_no_corresponding_closing_tag_17008", message: "JSX element '{0}' has no corresponding closing tag." }
+        JSX_element_0_has_no_corresponding_closing_tag: { code: 17008, category: ts.DiagnosticCategory.Error, key: "JSX_element_0_has_no_corresponding_closing_tag_17008", message: "JSX element '{0}' has no corresponding closing tag." },
+        super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class: { code: 17009, category: ts.DiagnosticCategory.Error, key: "super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class_17009", message: "'super' must be called before accessing 'this' in the constructor of a derived class." },
+        Unknown_typing_option_0: { code: 17010, category: ts.DiagnosticCategory.Error, key: "Unknown_typing_option_0_17010", message: "Unknown typing option '{0}'." }
     };
 })(ts || (ts = {}));
 var ts;
@@ -1922,7 +2090,7 @@ var ts;
         "false": 84,
         "finally": 85,
         "for": 86,
-        "from": 133,
+        "from": 135,
         "function": 87,
         "get": 123,
         "if": 88,
@@ -1937,26 +2105,28 @@ var ts;
         "namespace": 126,
         "new": 92,
         "null": 93,
-        "number": 128,
+        "number": 129,
         "package": 109,
         "private": 110,
         "protected": 111,
         "public": 112,
-        "require": 127,
-        "global": 134,
+        "readonly": 127,
+        "require": 128,
+        "global": 136,
         "return": 94,
-        "set": 129,
+        "set": 130,
         "static": 113,
-        "string": 130,
+        "string": 131,
         "super": 95,
         "switch": 96,
-        "symbol": 131,
+        "symbol": 132,
         "this": 97,
         "throw": 98,
         "true": 99,
         "try": 100,
-        "type": 132,
+        "type": 133,
         "typeof": 101,
+        "undefined": 134,
         "var": 102,
         "void": 103,
         "while": 104,
@@ -1964,7 +2134,7 @@ var ts;
         "yield": 114,
         "async": 118,
         "await": 119,
-        "of": 135,
+        "of": 137,
         "{": 15,
         "}": 16,
         "(": 17,
@@ -2446,6 +2616,7 @@ var ts;
             scanJsxIdentifier: scanJsxIdentifier,
             reScanJsxToken: reScanJsxToken,
             scanJsxToken: scanJsxToken,
+            scanJSDocToken: scanJSDocToken,
             scan: scan,
             setText: setText,
             setScriptTarget: setScriptTarget,
@@ -2453,7 +2624,8 @@ var ts;
             setOnError: setOnError,
             setTextPos: setTextPos,
             tryScan: tryScan,
-            lookAhead: lookAhead
+            lookAhead: lookAhead,
+            scanRange: scanRange
         };
         function error(message, length) {
             if (onError) {
@@ -3225,7 +3397,7 @@ var ts;
                     break;
                 }
             }
-            return token = 239;
+            return token = 243;
         }
         function scanJsxIdentifier() {
             if (tokenIsIdentifierOrKeyword(token)) {
@@ -3243,6 +3415,54 @@ var ts;
             }
             return token;
         }
+        function scanJSDocToken() {
+            if (pos >= end) {
+                return token = 1;
+            }
+            startPos = pos;
+            var ch = text.charCodeAt(pos);
+            while (pos < end) {
+                ch = text.charCodeAt(pos);
+                if (isWhiteSpace(ch)) {
+                    pos++;
+                }
+                else {
+                    break;
+                }
+            }
+            tokenPos = pos;
+            switch (ch) {
+                case 64:
+                    return pos += 1, token = 55;
+                case 10:
+                case 13:
+                    return pos += 1, token = 4;
+                case 42:
+                    return pos += 1, token = 37;
+                case 123:
+                    return pos += 1, token = 15;
+                case 125:
+                    return pos += 1, token = 16;
+                case 91:
+                    return pos += 1, token = 19;
+                case 93:
+                    return pos += 1, token = 20;
+                case 61:
+                    return pos += 1, token = 56;
+                case 44:
+                    return pos += 1, token = 24;
+            }
+            if (isIdentifierStart(ch, 2)) {
+                pos++;
+                while (isIdentifierPart(text.charCodeAt(pos), 2) && pos < end) {
+                    pos++;
+                }
+                return token = 69;
+            }
+            else {
+                return pos += 1, token = 0;
+            }
+        }
         function speculationHelper(callback, isLookahead) {
             var savePos = pos;
             var saveStartPos = startPos;
@@ -3261,6 +3481,29 @@ var ts;
             }
             return result;
         }
+        function scanRange(start, length, callback) {
+            var saveEnd = end;
+            var savePos = pos;
+            var saveStartPos = startPos;
+            var saveTokenPos = tokenPos;
+            var saveToken = token;
+            var savePrecedingLineBreak = precedingLineBreak;
+            var saveTokenValue = tokenValue;
+            var saveHasExtendedUnicodeEscape = hasExtendedUnicodeEscape;
+            var saveTokenIsUnterminated = tokenIsUnterminated;
+            setText(text, start, length);
+            var result = callback();
+            end = saveEnd;
+            pos = savePos;
+            startPos = saveStartPos;
+            tokenPos = saveTokenPos;
+            token = saveToken;
+            precedingLineBreak = savePrecedingLineBreak;
+            tokenValue = saveTokenValue;
+            hasExtendedUnicodeEscape = saveHasExtendedUnicodeEscape;
+            tokenIsUnterminated = saveTokenIsUnterminated;
+            return result;
+        }
         function lookAhead(callback) {
             return speculationHelper(callback, true);
         }
@@ -3313,10 +3556,10 @@ var ts;
     var stringWriters = [];
     function getSingleLineStringWriter() {
         if (stringWriters.length === 0) {
-            var str = "";
-            var writeText = function (text) { return str += text; };
+            var str_1 = "";
+            var writeText = function (text) { return str_1 += text; };
             return {
-                string: function () { return str; },
+                string: function () { return str_1; },
                 writeKeyword: writeText,
                 writeOperator: writeText,
                 writePunctuation: writeText,
@@ -3324,10 +3567,10 @@ var ts;
                 writeStringLiteral: writeText,
                 writeParameter: writeText,
                 writeSymbol: writeText,
-                writeLine: function () { return str += " "; },
+                writeLine: function () { return str_1 += " "; },
                 increaseIndent: function () { },
                 decreaseIndent: function () { },
-                clear: function () { return str = ""; },
+                clear: function () { return str_1 = ""; },
                 trackSymbol: function () { },
                 reportInaccessibleThisError: function () { }
             };
@@ -3375,28 +3618,72 @@ var ts;
         sourceFile.resolvedModules[moduleNameText] = resolvedModule;
     }
     ts.setResolvedModule = setResolvedModule;
+    function setResolvedTypeReferenceDirective(sourceFile, typeReferenceDirectiveName, resolvedTypeReferenceDirective) {
+        if (!sourceFile.resolvedTypeReferenceDirectiveNames) {
+            sourceFile.resolvedTypeReferenceDirectiveNames = {};
+        }
+        sourceFile.resolvedTypeReferenceDirectiveNames[typeReferenceDirectiveName] = resolvedTypeReferenceDirective;
+    }
+    ts.setResolvedTypeReferenceDirective = setResolvedTypeReferenceDirective;
+    function moduleResolutionIsEqualTo(oldResolution, newResolution) {
+        return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.isExternalLibraryImport === newResolution.isExternalLibraryImport;
+    }
+    ts.moduleResolutionIsEqualTo = moduleResolutionIsEqualTo;
+    function typeDirectiveIsEqualTo(oldResolution, newResolution) {
+        return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.primary === newResolution.primary;
+    }
+    ts.typeDirectiveIsEqualTo = typeDirectiveIsEqualTo;
+    function hasChangesInResolutions(names, newResolutions, oldResolutions, comparer) {
+        if (names.length !== newResolutions.length) {
+            return false;
+        }
+        for (var i = 0; i < names.length; i++) {
+            var newResolution = newResolutions[i];
+            var oldResolution = oldResolutions && ts.hasProperty(oldResolutions, names[i]) ? oldResolutions[names[i]] : undefined;
+            var changed = oldResolution
+                ? !newResolution || !comparer(oldResolution, newResolution)
+                : newResolution;
+            if (changed) {
+                return true;
+            }
+        }
+        return false;
+    }
+    ts.hasChangesInResolutions = hasChangesInResolutions;
     function containsParseError(node) {
         aggregateChildData(node);
-        return (node.parserContextFlags & 64) !== 0;
+        return (node.flags & 268435456) !== 0;
     }
     ts.containsParseError = containsParseError;
     function aggregateChildData(node) {
-        if (!(node.parserContextFlags & 128)) {
-            var thisNodeOrAnySubNodesHasError = ((node.parserContextFlags & 16) !== 0) ||
+        if (!(node.flags & 536870912)) {
+            var thisNodeOrAnySubNodesHasError = ((node.flags & 67108864) !== 0) ||
                 ts.forEachChild(node, containsParseError);
             if (thisNodeOrAnySubNodesHasError) {
-                node.parserContextFlags |= 64;
+                node.flags |= 268435456;
             }
-            node.parserContextFlags |= 128;
+            node.flags |= 536870912;
         }
     }
     function getSourceFileOfNode(node) {
-        while (node && node.kind !== 251) {
+        while (node && node.kind !== 255) {
             node = node.parent;
         }
         return node;
     }
     ts.getSourceFileOfNode = getSourceFileOfNode;
+    function isStatementWithLocals(node) {
+        switch (node.kind) {
+            case 198:
+            case 226:
+            case 205:
+            case 206:
+            case 207:
+                return true;
+        }
+        return false;
+    }
+    ts.isStatementWithLocals = isStatementWithLocals;
     function getStartPositionOfLine(line, sourceFile) {
         ts.Debug.assert(line >= 0);
         return ts.getLineStarts(sourceFile)[line];
@@ -3412,6 +3699,25 @@ var ts;
         return node.pos;
     }
     ts.getStartPosOfNode = getStartPosOfNode;
+    function getEndLinePosition(line, sourceFile) {
+        ts.Debug.assert(line >= 0);
+        var lineStarts = ts.getLineStarts(sourceFile);
+        var lineIndex = line;
+        var sourceText = sourceFile.text;
+        if (lineIndex + 1 === lineStarts.length) {
+            return sourceText.length - 1;
+        }
+        else {
+            var start = lineStarts[lineIndex];
+            var pos = lineStarts[lineIndex + 1] - 1;
+            ts.Debug.assert(ts.isLineBreak(sourceText.charCodeAt(pos)));
+            while (start <= pos && ts.isLineBreak(sourceText.charCodeAt(pos))) {
+                pos--;
+            }
+            return pos;
+        }
+    }
+    ts.getEndLinePosition = getEndLinePosition;
     function nodeIsMissing(node) {
         if (!node) {
             return true;
@@ -3471,17 +3777,24 @@ var ts;
     }
     ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName;
     function isBlockOrCatchScoped(declaration) {
-        return (getCombinedNodeFlags(declaration) & 24576) !== 0 ||
+        return (getCombinedNodeFlags(declaration) & 3072) !== 0 ||
             isCatchClauseVariableDeclaration(declaration);
     }
     ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
     function isAmbientModule(node) {
-        return node && node.kind === 221 &&
+        return node && node.kind === 224 &&
             (node.name.kind === 9 || isGlobalScopeAugmentation(node));
     }
     ts.isAmbientModule = isAmbientModule;
+    function isBlockScopedContainerTopLevel(node) {
+        return node.kind === 255 ||
+            node.kind === 224 ||
+            isFunctionLike(node) ||
+            isFunctionBlock(node);
+    }
+    ts.isBlockScopedContainerTopLevel = isBlockScopedContainerTopLevel;
     function isGlobalScopeAugmentation(module) {
-        return !!(module.flags & 2097152);
+        return !!(module.flags & 131072);
     }
     ts.isGlobalScopeAugmentation = isGlobalScopeAugmentation;
     function isExternalModuleAugmentation(node) {
@@ -3489,10 +3802,10 @@ var ts;
             return false;
         }
         switch (node.parent.kind) {
-            case 251:
-                return isExternalModule(node.parent);
-            case 222:
-                return isAmbientModule(node.parent.parent) && !isExternalModule(node.parent.parent.parent);
+            case 255:
+                return ts.isExternalModule(node.parent);
+            case 225:
+                return isAmbientModule(node.parent.parent) && !ts.isExternalModule(node.parent.parent.parent);
         }
         return false;
     }
@@ -3504,15 +3817,15 @@ var ts;
                 return current;
             }
             switch (current.kind) {
+                case 255:
+                case 226:
                 case 251:
-                case 223:
-                case 247:
-                case 221:
-                case 202:
-                case 203:
-                case 204:
+                case 224:
+                case 205:
+                case 206:
+                case 207:
                     return current;
-                case 195:
+                case 198:
                     if (!isFunctionLike(current.parent)) {
                         return current;
                     }
@@ -3523,9 +3836,9 @@ var ts;
     ts.getEnclosingBlockScopeContainer = getEnclosingBlockScopeContainer;
     function isCatchClauseVariableDeclaration(declaration) {
         return declaration &&
-            declaration.kind === 214 &&
+            declaration.kind === 217 &&
             declaration.parent &&
-            declaration.parent.kind === 247;
+            declaration.parent.kind === 251;
     }
     ts.isCatchClauseVariableDeclaration = isCatchClauseVariableDeclaration;
     function declarationNameToString(name) {
@@ -3558,29 +3871,44 @@ var ts;
         return ts.createTextSpanFromBounds(start, scanner.getTextPos());
     }
     ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition;
+    function getErrorSpanForArrowFunction(sourceFile, node) {
+        var pos = ts.skipTrivia(sourceFile.text, node.pos);
+        if (node.body && node.body.kind === 198) {
+            var startLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.pos).line;
+            var endLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.end).line;
+            if (startLine < endLine) {
+                return ts.createTextSpan(pos, getEndLinePosition(startLine, sourceFile) - pos + 1);
+            }
+        }
+        return ts.createTextSpanFromBounds(pos, node.end);
+    }
     function getErrorSpanForNode(sourceFile, node) {
         var errorNode = node;
         switch (node.kind) {
-            case 251:
+            case 255:
                 var pos_1 = ts.skipTrivia(sourceFile.text, 0, false);
                 if (pos_1 === sourceFile.text.length) {
                     return ts.createTextSpan(0, 0);
                 }
                 return getSpanOfTokenAtPosition(sourceFile, pos_1);
-            case 214:
-            case 166:
             case 217:
-            case 189:
-            case 218:
-            case 221:
+            case 168:
             case 220:
-            case 250:
-            case 216:
-            case 176:
-            case 144:
+            case 191:
+            case 221:
+            case 224:
+            case 223:
+            case 254:
             case 219:
+            case 178:
+            case 146:
+            case 148:
+            case 149:
+            case 222:
                 errorNode = node.name;
                 break;
+            case 179:
+                return getErrorSpanForArrowFunction(sourceFile, node);
         }
         if (errorNode === undefined) {
             return getSpanOfTokenAtPosition(sourceFile, node.pos);
@@ -3591,24 +3919,20 @@ var ts;
         return ts.createTextSpanFromBounds(pos, errorNode.end);
     }
     ts.getErrorSpanForNode = getErrorSpanForNode;
-    function isExternalModule(file) {
-        return file.externalModuleIndicator !== undefined;
-    }
-    ts.isExternalModule = isExternalModule;
     function isExternalOrCommonJsModule(file) {
         return (file.externalModuleIndicator || file.commonJsModuleIndicator) !== undefined;
     }
     ts.isExternalOrCommonJsModule = isExternalOrCommonJsModule;
     function isDeclarationFile(file) {
-        return (file.flags & 4096) !== 0;
+        return file.isDeclarationFile;
     }
     ts.isDeclarationFile = isDeclarationFile;
     function isConstEnumDeclaration(node) {
-        return node.kind === 220 && isConst(node);
+        return node.kind === 223 && isConst(node);
     }
     ts.isConstEnumDeclaration = isConstEnumDeclaration;
     function walkUpBindingElementsAndPatterns(node) {
-        while (node && (node.kind === 166 || isBindingPattern(node))) {
+        while (node && (node.kind === 168 || isBindingPattern(node))) {
             node = node.parent;
         }
         return node;
@@ -3616,29 +3940,33 @@ var ts;
     function getCombinedNodeFlags(node) {
         node = walkUpBindingElementsAndPatterns(node);
         var flags = node.flags;
-        if (node.kind === 214) {
+        if (node.kind === 217) {
             node = node.parent;
         }
-        if (node && node.kind === 215) {
+        if (node && node.kind === 218) {
             flags |= node.flags;
             node = node.parent;
         }
-        if (node && node.kind === 196) {
+        if (node && node.kind === 199) {
             flags |= node.flags;
         }
         return flags;
     }
     ts.getCombinedNodeFlags = getCombinedNodeFlags;
     function isConst(node) {
-        return !!(getCombinedNodeFlags(node) & 16384);
+        return !!(getCombinedNodeFlags(node) & 2048);
     }
     ts.isConst = isConst;
     function isLet(node) {
-        return !!(getCombinedNodeFlags(node) & 8192);
+        return !!(getCombinedNodeFlags(node) & 1024);
     }
     ts.isLet = isLet;
+    function isSuperCallExpression(n) {
+        return n.kind === 173 && n.expression.kind === 95;
+    }
+    ts.isSuperCallExpression = isSuperCallExpression;
     function isPrologueDirective(node) {
-        return node.kind === 198 && node.expression.kind === 9;
+        return node.kind === 201 && node.expression.kind === 9;
     }
     ts.isPrologueDirective = isPrologueDirective;
     function getLeadingCommentRangesOfNode(node, sourceFileOfNode) {
@@ -3654,7 +3982,7 @@ var ts;
     }
     ts.getJsDocComments = getJsDocComments;
     function getJsDocCommentsFromText(node, text) {
-        var commentRanges = (node.kind === 139 || node.kind === 138) ?
+        var commentRanges = (node.kind === 141 || node.kind === 140) ?
             ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
             getLeadingCommentRangesOfNodeFromText(node, text);
         return ts.filter(commentRanges, isJsDocComment);
@@ -3666,69 +3994,71 @@ var ts;
     }
     ts.getJsDocCommentsFromText = getJsDocCommentsFromText;
     ts.fullTripleSlashReferencePathRegEx = /^(\/\/\/\s*<reference\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
+    ts.fullTripleSlashReferenceTypeReferenceDirectiveRegEx = /^(\/\/\/\s*<reference\s+types\s*=\s*)('|")(.+?)\2.*?\/>/;
     ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
     function isTypeNode(node) {
-        if (151 <= node.kind && node.kind <= 163) {
+        if (153 <= node.kind && node.kind <= 165) {
             return true;
         }
         switch (node.kind) {
             case 117:
-            case 128:
-            case 130:
-            case 120:
+            case 129:
             case 131:
+            case 120:
+            case 132:
+            case 134:
                 return true;
             case 103:
-                return node.parent.kind !== 180;
-            case 191:
+                return node.parent.kind !== 182;
+            case 193:
                 return !isExpressionWithTypeArgumentsInClassExtendsClause(node);
             case 69:
-                if (node.parent.kind === 136 && node.parent.right === node) {
+                if (node.parent.kind === 138 && node.parent.right === node) {
                     node = node.parent;
                 }
-                else if (node.parent.kind === 169 && node.parent.name === node) {
+                else if (node.parent.kind === 171 && node.parent.name === node) {
                     node = node.parent;
                 }
-                ts.Debug.assert(node.kind === 69 || node.kind === 136 || node.kind === 169, "'node' was expected to be a qualified name, identifier or property access in 'isTypeNode'.");
-            case 136:
-            case 169:
+                ts.Debug.assert(node.kind === 69 || node.kind === 138 || node.kind === 171, "'node' was expected to be a qualified name, identifier or property access in 'isTypeNode'.");
+            case 138:
+            case 171:
             case 97:
                 var parent_1 = node.parent;
-                if (parent_1.kind === 155) {
+                if (parent_1.kind === 157) {
                     return false;
                 }
-                if (151 <= parent_1.kind && parent_1.kind <= 163) {
+                if (153 <= parent_1.kind && parent_1.kind <= 165) {
                     return true;
                 }
                 switch (parent_1.kind) {
-                    case 191:
+                    case 193:
                         return !isExpressionWithTypeArgumentsInClassExtendsClause(parent_1);
-                    case 138:
+                    case 140:
                         return node === parent_1.constraint;
-                    case 142:
-                    case 141:
-                    case 139:
-                    case 214:
-                        return node === parent_1.type;
-                    case 216:
-                    case 176:
-                    case 177:
-                    case 145:
                     case 144:
                     case 143:
-                    case 146:
-                    case 147:
+                    case 141:
+                    case 217:
                         return node === parent_1.type;
+                    case 219:
+                    case 178:
+                    case 179:
+                    case 147:
+                    case 146:
+                    case 145:
                     case 148:
                     case 149:
+                        return node === parent_1.type;
                     case 150:
+                    case 151:
+                    case 152:
                         return node === parent_1.type;
-                    case 174:
+                    case 176:
                         return node === parent_1.type;
-                    case 171:
-                    case 172:
-                        return parent_1.typeArguments && ts.indexOf(parent_1.typeArguments, node) >= 0;
                     case 173:
+                    case 174:
+                        return parent_1.typeArguments && ts.indexOf(parent_1.typeArguments, node) >= 0;
+                    case 175:
                         return false;
                 }
         }
@@ -3739,23 +4069,23 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 207:
+                case 210:
                     return visitor(node);
-                case 223:
-                case 195:
-                case 199:
-                case 200:
-                case 201:
+                case 226:
+                case 198:
                 case 202:
                 case 203:
                 case 204:
-                case 208:
-                case 209:
-                case 244:
-                case 245:
-                case 210:
+                case 205:
+                case 206:
+                case 207:
+                case 211:
                 case 212:
-                case 247:
+                case 248:
+                case 249:
+                case 213:
+                case 215:
+                case 251:
                     return ts.forEachChild(node, traverse);
             }
         }
@@ -3765,23 +4095,23 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 187:
+                case 189:
                     visitor(node);
                     var operand = node.expression;
                     if (operand) {
                         traverse(operand);
                     }
-                case 220:
-                case 218:
+                case 223:
                 case 221:
-                case 219:
-                case 217:
-                case 189:
+                case 224:
+                case 222:
+                case 220:
+                case 191:
                     return;
                 default:
                     if (isFunctionLike(node)) {
                         var name_5 = node.name;
-                        if (name_5 && name_5.kind === 137) {
+                        if (name_5 && name_5.kind === 139) {
                             traverse(name_5.expression);
                             return;
                         }
@@ -3796,14 +4126,14 @@ var ts;
     function isVariableLike(node) {
         if (node) {
             switch (node.kind) {
-                case 166:
-                case 250:
-                case 139:
-                case 248:
-                case 142:
+                case 168:
+                case 254:
                 case 141:
-                case 249:
-                case 214:
+                case 252:
+                case 144:
+                case 143:
+                case 253:
+                case 217:
                     return true;
             }
         }
@@ -3811,11 +4141,11 @@ var ts;
     }
     ts.isVariableLike = isVariableLike;
     function isAccessor(node) {
-        return node && (node.kind === 146 || node.kind === 147);
+        return node && (node.kind === 148 || node.kind === 149);
     }
     ts.isAccessor = isAccessor;
     function isClassLike(node) {
-        return node && (node.kind === 217 || node.kind === 189);
+        return node && (node.kind === 220 || node.kind === 191);
     }
     ts.isClassLike = isClassLike;
     function isFunctionLike(node) {
@@ -3824,32 +4154,32 @@ var ts;
     ts.isFunctionLike = isFunctionLike;
     function isFunctionLikeKind(kind) {
         switch (kind) {
-            case 145:
-            case 176:
-            case 216:
-            case 177:
-            case 144:
-            case 143:
-            case 146:
             case 147:
+            case 178:
+            case 219:
+            case 179:
+            case 146:
+            case 145:
             case 148:
             case 149:
             case 150:
-            case 153:
-            case 154:
+            case 151:
+            case 152:
+            case 155:
+            case 156:
                 return true;
         }
     }
     ts.isFunctionLikeKind = isFunctionLikeKind;
     function introducesArgumentsExoticObject(node) {
         switch (node.kind) {
-            case 144:
-            case 143:
-            case 145:
             case 146:
+            case 145:
             case 147:
-            case 216:
-            case 176:
+            case 148:
+            case 149:
+            case 219:
+            case 178:
                 return true;
         }
         return false;
@@ -3857,30 +4187,34 @@ var ts;
     ts.introducesArgumentsExoticObject = introducesArgumentsExoticObject;
     function isIterationStatement(node, lookInLabeledStatements) {
         switch (node.kind) {
-            case 202:
+            case 205:
+            case 206:
+            case 207:
             case 203:
             case 204:
-            case 200:
-            case 201:
                 return true;
-            case 210:
+            case 213:
                 return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
         }
         return false;
     }
     ts.isIterationStatement = isIterationStatement;
     function isFunctionBlock(node) {
-        return node && node.kind === 195 && isFunctionLike(node.parent);
+        return node && node.kind === 198 && isFunctionLike(node.parent);
     }
     ts.isFunctionBlock = isFunctionBlock;
     function isObjectLiteralMethod(node) {
-        return node && node.kind === 144 && node.parent.kind === 168;
+        return node && node.kind === 146 && node.parent.kind === 170;
     }
     ts.isObjectLiteralMethod = isObjectLiteralMethod;
     function isIdentifierTypePredicate(predicate) {
         return predicate && predicate.kind === 1;
     }
     ts.isIdentifierTypePredicate = isIdentifierTypePredicate;
+    function isThisTypePredicate(predicate) {
+        return predicate && predicate.kind === 0;
+    }
+    ts.isThisTypePredicate = isThisTypePredicate;
     function getContainingFunction(node) {
         while (true) {
             node = node.parent;
@@ -3906,39 +4240,39 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 137:
+                case 139:
                     if (isClassLike(node.parent.parent)) {
                         return node;
                     }
                     node = node.parent;
                     break;
-                case 140:
-                    if (node.parent.kind === 139 && isClassElement(node.parent.parent)) {
+                case 142:
+                    if (node.parent.kind === 141 && isClassElement(node.parent.parent)) {
                         node = node.parent.parent;
                     }
                     else if (isClassElement(node.parent)) {
                         node = node.parent;
                     }
                     break;
-                case 177:
+                case 179:
                     if (!includeArrowFunctions) {
                         continue;
                     }
-                case 216:
-                case 176:
-                case 221:
-                case 142:
-                case 141:
+                case 219:
+                case 178:
+                case 224:
                 case 144:
                 case 143:
-                case 145:
                 case 146:
+                case 145:
                 case 147:
                 case 148:
                 case 149:
                 case 150:
-                case 220:
-                case 251:
+                case 151:
+                case 152:
+                case 223:
+                case 255:
                     return node;
             }
         }
@@ -3951,25 +4285,25 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 137:
+                case 139:
                     node = node.parent;
                     break;
-                case 216:
-                case 176:
-                case 177:
+                case 219:
+                case 178:
+                case 179:
                     if (!stopOnFunctions) {
                         continue;
                     }
-                case 142:
-                case 141:
                 case 144:
                 case 143:
-                case 145:
                 case 146:
+                case 145:
                 case 147:
+                case 148:
+                case 149:
                     return node;
-                case 140:
-                    if (node.parent.kind === 139 && isClassElement(node.parent.parent)) {
+                case 142:
+                    if (node.parent.kind === 141 && isClassElement(node.parent.parent)) {
                         node = node.parent.parent;
                     }
                     else if (isClassElement(node.parent)) {
@@ -3980,15 +4314,21 @@ var ts;
         }
     }
     ts.getSuperContainer = getSuperContainer;
+    function isSuperPropertyOrElementAccess(node) {
+        return (node.kind === 171
+            || node.kind === 172)
+            && node.expression.kind === 95;
+    }
+    ts.isSuperPropertyOrElementAccess = isSuperPropertyOrElementAccess;
     function getEntityNameFromTypeNode(node) {
         if (node) {
             switch (node.kind) {
-                case 152:
+                case 154:
                     return node.typeName;
-                case 191:
+                case 193:
                     return node.expression;
                 case 69:
-                case 136:
+                case 138:
                     return node;
             }
         }
@@ -3996,7 +4336,7 @@ var ts;
     }
     ts.getEntityNameFromTypeNode = getEntityNameFromTypeNode;
     function getInvokedExpression(node) {
-        if (node.kind === 173) {
+        if (node.kind === 175) {
             return node.tag;
         }
         return node.expression;
@@ -4004,21 +4344,21 @@ var ts;
     ts.getInvokedExpression = getInvokedExpression;
     function nodeCanBeDecorated(node) {
         switch (node.kind) {
-            case 217:
+            case 220:
                 return true;
-            case 142:
-                return node.parent.kind === 217;
-            case 146:
-            case 147:
             case 144:
+                return node.parent.kind === 220;
+            case 148:
+            case 149:
+            case 146:
                 return node.body !== undefined
-                    && node.parent.kind === 217;
-            case 139:
+                    && node.parent.kind === 220;
+            case 141:
                 return node.parent.body !== undefined
-                    && (node.parent.kind === 145
-                        || node.parent.kind === 144
-                        || node.parent.kind === 147)
-                    && node.parent.parent.kind === 217;
+                    && (node.parent.kind === 147
+                        || node.parent.kind === 146
+                        || node.parent.kind === 149)
+                    && node.parent.parent.kind === 220;
         }
         return false;
     }
@@ -4029,13 +4369,23 @@ var ts;
     }
     ts.nodeIsDecorated = nodeIsDecorated;
     function isPropertyAccessExpression(node) {
-        return node.kind === 169;
+        return node.kind === 171;
     }
     ts.isPropertyAccessExpression = isPropertyAccessExpression;
     function isElementAccessExpression(node) {
-        return node.kind === 170;
+        return node.kind === 172;
     }
     ts.isElementAccessExpression = isElementAccessExpression;
+    function isJSXTagName(node) {
+        var parent = node.parent;
+        if (parent.kind === 242 ||
+            parent.kind === 241 ||
+            parent.kind === 244) {
+            return parent.tagName === node;
+        }
+        return false;
+    }
+    ts.isJSXTagName = isJSXTagName;
     function isExpression(node) {
         switch (node.kind) {
             case 95:
@@ -4043,42 +4393,43 @@ var ts;
             case 99:
             case 84:
             case 10:
-            case 167:
-            case 168:
             case 169:
             case 170:
             case 171:
             case 172:
             case 173:
-            case 192:
             case 174:
             case 175:
+            case 194:
             case 176:
-            case 189:
+            case 195:
             case 177:
-            case 180:
             case 178:
+            case 191:
             case 179:
             case 182:
-            case 183:
+            case 180:
+            case 181:
             case 184:
             case 185:
-            case 188:
             case 186:
-            case 11:
-            case 190:
-            case 236:
-            case 237:
             case 187:
-            case 181:
+            case 190:
+            case 188:
+            case 11:
+            case 192:
+            case 240:
+            case 241:
+            case 189:
+            case 183:
                 return true;
-            case 136:
-                while (node.parent.kind === 136) {
+            case 138:
+                while (node.parent.kind === 138) {
                     node = node.parent;
                 }
-                return node.parent.kind === 155;
+                return node.parent.kind === 157 || isJSXTagName(node);
             case 69:
-                if (node.parent.kind === 155) {
+                if (node.parent.kind === 157 || isJSXTagName(node)) {
                     return true;
                 }
             case 8:
@@ -4086,47 +4437,47 @@ var ts;
             case 97:
                 var parent_2 = node.parent;
                 switch (parent_2.kind) {
-                    case 214:
-                    case 139:
-                    case 142:
+                    case 217:
                     case 141:
-                    case 250:
-                    case 248:
-                    case 166:
+                    case 144:
+                    case 143:
+                    case 254:
+                    case 252:
+                    case 168:
                         return parent_2.initializer === node;
-                    case 198:
-                    case 199:
-                    case 200:
                     case 201:
-                    case 207:
-                    case 208:
-                    case 209:
-                    case 244:
-                    case 211:
-                    case 209:
-                        return parent_2.expression === node;
                     case 202:
-                        var forStatement = parent_2;
-                        return (forStatement.initializer === node && forStatement.initializer.kind !== 215) ||
-                            forStatement.condition === node ||
-                            forStatement.incrementor === node;
                     case 203:
                     case 204:
+                    case 210:
+                    case 211:
+                    case 212:
+                    case 248:
+                    case 214:
+                    case 212:
+                        return parent_2.expression === node;
+                    case 205:
+                        var forStatement = parent_2;
+                        return (forStatement.initializer === node && forStatement.initializer.kind !== 218) ||
+                            forStatement.condition === node ||
+                            forStatement.incrementor === node;
+                    case 206:
+                    case 207:
                         var forInStatement = parent_2;
-                        return (forInStatement.initializer === node && forInStatement.initializer.kind !== 215) ||
+                        return (forInStatement.initializer === node && forInStatement.initializer.kind !== 218) ||
                             forInStatement.expression === node;
-                    case 174:
-                    case 192:
+                    case 176:
+                    case 194:
                         return node === parent_2.expression;
-                    case 193:
+                    case 196:
                         return node === parent_2.expression;
-                    case 137:
+                    case 139:
                         return node === parent_2.expression;
-                    case 140:
-                    case 243:
-                    case 242:
+                    case 142:
+                    case 247:
+                    case 246:
                         return true;
-                    case 191:
+                    case 193:
                         return parent_2.expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent_2);
                     default:
                         if (isExpression(parent_2)) {
@@ -4148,7 +4499,7 @@ var ts;
     }
     ts.isInstantiatedModule = isInstantiatedModule;
     function isExternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 224 && node.moduleReference.kind === 235;
+        return node.kind === 228 && node.moduleReference.kind === 239;
     }
     ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
     function getExternalModuleImportEqualsDeclarationExpression(node) {
@@ -4157,7 +4508,7 @@ var ts;
     }
     ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
     function isInternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 224 && node.moduleReference.kind !== 235;
+        return node.kind === 228 && node.moduleReference.kind !== 239;
     }
     ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
     function isSourceFileJavaScript(file) {
@@ -4165,23 +4516,26 @@ var ts;
     }
     ts.isSourceFileJavaScript = isSourceFileJavaScript;
     function isInJavaScriptFile(node) {
-        return node && !!(node.parserContextFlags & 32);
+        return node && !!(node.flags & 134217728);
     }
     ts.isInJavaScriptFile = isInJavaScriptFile;
-    function isRequireCall(expression) {
-        return expression.kind === 171 &&
+    function isRequireCall(expression, checkArgumentIsStringLiteral) {
+        var isRequire = expression.kind === 173 &&
             expression.expression.kind === 69 &&
             expression.expression.text === "require" &&
-            expression.arguments.length === 1 &&
-            expression.arguments[0].kind === 9;
+            expression.arguments.length === 1;
+        return isRequire && (!checkArgumentIsStringLiteral || expression.arguments[0].kind === 9);
     }
     ts.isRequireCall = isRequireCall;
     function getSpecialPropertyAssignmentKind(expression) {
-        if (expression.kind !== 184) {
+        if (!isInJavaScriptFile(expression)) {
+            return 0;
+        }
+        if (expression.kind !== 186) {
             return 0;
         }
         var expr = expression;
-        if (expr.operatorToken.kind !== 56 || expr.left.kind !== 169) {
+        if (expr.operatorToken.kind !== 56 || expr.left.kind !== 171) {
             return 0;
         }
         var lhs = expr.left;
@@ -4197,7 +4551,7 @@ var ts;
         else if (lhs.expression.kind === 97) {
             return 4;
         }
-        else if (lhs.expression.kind === 169) {
+        else if (lhs.expression.kind === 171) {
             var innerPropertyAccess = lhs.expression;
             if (innerPropertyAccess.expression.kind === 69 && innerPropertyAccess.name.text === "prototype") {
                 return 3;
@@ -4207,19 +4561,19 @@ var ts;
     }
     ts.getSpecialPropertyAssignmentKind = getSpecialPropertyAssignmentKind;
     function getExternalModuleName(node) {
-        if (node.kind === 225) {
+        if (node.kind === 229) {
             return node.moduleSpecifier;
         }
-        if (node.kind === 224) {
+        if (node.kind === 228) {
             var reference = node.moduleReference;
-            if (reference.kind === 235) {
+            if (reference.kind === 239) {
                 return reference.expression;
             }
         }
-        if (node.kind === 231) {
+        if (node.kind === 235) {
             return node.moduleSpecifier;
         }
-        if (node.kind === 221 && node.name.kind === 9) {
+        if (node.kind === 224 && node.name.kind === 9) {
             return node.name;
         }
     }
@@ -4227,13 +4581,13 @@ var ts;
     function hasQuestionToken(node) {
         if (node) {
             switch (node.kind) {
-                case 139:
+                case 141:
+                case 146:
+                case 145:
+                case 253:
+                case 252:
                 case 144:
                 case 143:
-                case 249:
-                case 248:
-                case 142:
-                case 141:
                     return node.questionToken !== undefined;
             }
         }
@@ -4241,49 +4595,83 @@ var ts;
     }
     ts.hasQuestionToken = hasQuestionToken;
     function isJSDocConstructSignature(node) {
-        return node.kind === 264 &&
+        return node.kind === 268 &&
             node.parameters.length > 0 &&
-            node.parameters[0].type.kind === 266;
+            node.parameters[0].type.kind === 270;
     }
     ts.isJSDocConstructSignature = isJSDocConstructSignature;
-    function getJSDocTag(node, kind) {
-        if (node && node.jsDocComment) {
-            for (var _i = 0, _a = node.jsDocComment.tags; _i < _a.length; _i++) {
-                var tag = _a[_i];
-                if (tag.kind === kind) {
-                    return tag;
-                }
+    function getJSDocTag(node, kind, checkParentVariableStatement) {
+        if (!node) {
+            return undefined;
+        }
+        var jsDocComment = getJSDocComment(node, checkParentVariableStatement);
+        if (!jsDocComment) {
+            return undefined;
+        }
+        for (var _i = 0, _a = jsDocComment.tags; _i < _a.length; _i++) {
+            var tag = _a[_i];
+            if (tag.kind === kind) {
+                return tag;
             }
         }
     }
+    function getJSDocComment(node, checkParentVariableStatement) {
+        if (node.jsDocComment) {
+            return node.jsDocComment;
+        }
+        if (checkParentVariableStatement) {
+            var isInitializerOfVariableDeclarationInStatement = node.parent.kind === 217 &&
+                node.parent.initializer === node &&
+                node.parent.parent.parent.kind === 199;
+            var variableStatementNode = isInitializerOfVariableDeclarationInStatement ? node.parent.parent.parent : undefined;
+            if (variableStatementNode) {
+                return variableStatementNode.jsDocComment;
+            }
+            var parent_3 = node.parent;
+            var isSourceOfAssignmentExpressionStatement = parent_3 && parent_3.parent &&
+                parent_3.kind === 186 &&
+                parent_3.operatorToken.kind === 56 &&
+                parent_3.parent.kind === 201;
+            if (isSourceOfAssignmentExpressionStatement) {
+                return parent_3.parent.jsDocComment;
+            }
+            var isPropertyAssignmentExpression = parent_3 && parent_3.kind === 252;
+            if (isPropertyAssignmentExpression) {
+                return parent_3.jsDocComment;
+            }
+        }
+        return undefined;
+    }
     function getJSDocTypeTag(node) {
-        return getJSDocTag(node, 272);
+        return getJSDocTag(node, 276, false);
     }
     ts.getJSDocTypeTag = getJSDocTypeTag;
     function getJSDocReturnTag(node) {
-        return getJSDocTag(node, 271);
+        return getJSDocTag(node, 275, true);
     }
     ts.getJSDocReturnTag = getJSDocReturnTag;
     function getJSDocTemplateTag(node) {
-        return getJSDocTag(node, 273);
+        return getJSDocTag(node, 277, false);
     }
     ts.getJSDocTemplateTag = getJSDocTemplateTag;
     function getCorrespondingJSDocParameterTag(parameter) {
         if (parameter.name && parameter.name.kind === 69) {
             var parameterName = parameter.name.text;
-            var docComment = parameter.parent.jsDocComment;
-            if (docComment) {
-                return ts.forEach(docComment.tags, function (t) {
-                    if (t.kind === 270) {
-                        var parameterTag = t;
+            var jsDocComment = getJSDocComment(parameter.parent, true);
+            if (jsDocComment) {
+                for (var _i = 0, _a = jsDocComment.tags; _i < _a.length; _i++) {
+                    var tag = _a[_i];
+                    if (tag.kind === 274) {
+                        var parameterTag = tag;
                         var name_6 = parameterTag.preParameterName || parameterTag.postParameterName;
                         if (name_6.text === parameterName) {
-                            return t;
+                            return parameterTag;
                         }
                     }
-                });
+                }
             }
         }
+        return undefined;
     }
     ts.getCorrespondingJSDocParameterTag = getCorrespondingJSDocParameterTag;
     function hasRestParameter(s) {
@@ -4292,13 +4680,13 @@ var ts;
     ts.hasRestParameter = hasRestParameter;
     function isRestParameter(node) {
         if (node) {
-            if (node.parserContextFlags & 32) {
-                if (node.type && node.type.kind === 265) {
+            if (node.flags & 134217728) {
+                if (node.type && node.type.kind === 269) {
                     return true;
                 }
                 var paramTag = getCorrespondingJSDocParameterTag(node);
                 if (paramTag && paramTag.typeExpression) {
-                    return paramTag.typeExpression.type.kind === 265;
+                    return paramTag.typeExpression.type.kind === 269;
                 }
             }
             return node.dotDotDotToken !== undefined;
@@ -4319,7 +4707,7 @@ var ts;
     }
     ts.isTemplateLiteralKind = isTemplateLiteralKind;
     function isBindingPattern(node) {
-        return !!node && (node.kind === 165 || node.kind === 164);
+        return !!node && (node.kind === 167 || node.kind === 166);
     }
     ts.isBindingPattern = isBindingPattern;
     function isNodeDescendentOf(node, ancestor) {
@@ -4333,7 +4721,7 @@ var ts;
     ts.isNodeDescendentOf = isNodeDescendentOf;
     function isInAmbientContext(node) {
         while (node) {
-            if (node.flags & (4 | 4096)) {
+            if (node.flags & 2 || (node.kind === 255 && node.isDeclarationFile)) {
                 return true;
             }
             node = node.parent;
@@ -4343,34 +4731,34 @@ var ts;
     ts.isInAmbientContext = isInAmbientContext;
     function isDeclaration(node) {
         switch (node.kind) {
-            case 177:
-            case 166:
-            case 217:
-            case 189:
-            case 145:
+            case 179:
+            case 168:
             case 220:
-            case 250:
+            case 191:
+            case 147:
+            case 223:
+            case 254:
+            case 237:
+            case 219:
+            case 178:
+            case 148:
+            case 230:
+            case 228:
             case 233:
-            case 216:
-            case 176:
+            case 221:
             case 146:
-            case 226:
+            case 145:
             case 224:
-            case 229:
-            case 218:
+            case 231:
+            case 141:
+            case 252:
             case 144:
             case 143:
-            case 221:
-            case 227:
-            case 139:
-            case 248:
-            case 142:
-            case 141:
-            case 147:
-            case 249:
-            case 219:
-            case 138:
-            case 214:
+            case 149:
+            case 253:
+            case 222:
+            case 140:
+            case 217:
                 return true;
         }
         return false;
@@ -4378,25 +4766,25 @@ var ts;
     ts.isDeclaration = isDeclaration;
     function isStatement(n) {
         switch (n.kind) {
-            case 206:
-            case 205:
-            case 213:
-            case 200:
-            case 198:
-            case 197:
-            case 203:
-            case 204:
-            case 202:
-            case 199:
-            case 210:
-            case 207:
             case 209:
-            case 211:
-            case 212:
-            case 196:
-            case 201:
             case 208:
-            case 230:
+            case 216:
+            case 203:
+            case 201:
+            case 200:
+            case 206:
+            case 207:
+            case 205:
+            case 202:
+            case 213:
+            case 210:
+            case 212:
+            case 214:
+            case 215:
+            case 199:
+            case 204:
+            case 211:
+            case 234:
                 return true;
             default:
                 return false;
@@ -4405,13 +4793,13 @@ var ts;
     ts.isStatement = isStatement;
     function isClassElement(n) {
         switch (n.kind) {
-            case 145:
-            case 142:
+            case 147:
             case 144:
             case 146:
-            case 147:
-            case 143:
-            case 150:
+            case 148:
+            case 149:
+            case 145:
+            case 152:
                 return true;
             default:
                 return false;
@@ -4423,7 +4811,7 @@ var ts;
             return false;
         }
         var parent = name.parent;
-        if (parent.kind === 229 || parent.kind === 233) {
+        if (parent.kind === 233 || parent.kind === 237) {
             if (parent.propertyName) {
                 return true;
             }
@@ -4437,40 +4825,41 @@ var ts;
     function isIdentifierName(node) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 142:
-            case 141:
             case 144:
             case 143:
             case 146:
-            case 147:
-            case 250:
-            case 248:
-            case 169:
+            case 145:
+            case 148:
+            case 149:
+            case 254:
+            case 252:
+            case 171:
                 return parent.name === node;
-            case 136:
+            case 138:
                 if (parent.right === node) {
-                    while (parent.kind === 136) {
+                    while (parent.kind === 138) {
                         parent = parent.parent;
                     }
-                    return parent.kind === 155;
+                    return parent.kind === 157;
                 }
                 return false;
-            case 166:
-            case 229:
-                return parent.propertyName === node;
+            case 168:
             case 233:
+                return parent.propertyName === node;
+            case 237:
                 return true;
         }
         return false;
     }
     ts.isIdentifierName = isIdentifierName;
     function isAliasSymbolDeclaration(node) {
-        return node.kind === 224 ||
-            node.kind === 226 && !!node.name ||
+        return node.kind === 228 ||
             node.kind === 227 ||
-            node.kind === 229 ||
+            node.kind === 230 && !!node.name ||
+            node.kind === 231 ||
             node.kind === 233 ||
-            node.kind === 230 && node.expression.kind === 69;
+            node.kind === 237 ||
+            node.kind === 234 && node.expression.kind === 69;
     }
     ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
     function getClassExtendsHeritageClauseElement(node) {
@@ -4527,32 +4916,32 @@ var ts;
                 };
             }
             else {
-                var matchResult = ts.fullTripleSlashReferencePathRegEx.exec(comment);
-                if (matchResult) {
+                var refMatchResult = ts.fullTripleSlashReferencePathRegEx.exec(comment);
+                var refLibResult = !refMatchResult && ts.fullTripleSlashReferenceTypeReferenceDirectiveRegEx.exec(comment);
+                if (refMatchResult || refLibResult) {
                     var start = commentRange.pos;
                     var end = commentRange.end;
                     return {
                         fileReference: {
                             pos: start,
                             end: end,
-                            fileName: matchResult[3]
+                            fileName: (refMatchResult || refLibResult)[3]
                         },
-                        isNoDefaultLib: false
-                    };
-                }
-                else {
-                    return {
-                        diagnosticMessage: ts.Diagnostics.Invalid_reference_directive_syntax,
-                        isNoDefaultLib: false
+                        isNoDefaultLib: false,
+                        isTypeReferenceDirective: !!refLibResult
                     };
                 }
+                return {
+                    diagnosticMessage: ts.Diagnostics.Invalid_reference_directive_syntax,
+                    isNoDefaultLib: false
+                };
             }
         }
         return undefined;
     }
     ts.getFileReferenceFromReferencePath = getFileReferenceFromReferencePath;
     function isKeyword(token) {
-        return 70 <= token && token <= 135;
+        return 70 <= token && token <= 137;
     }
     ts.isKeyword = isKeyword;
     function isTrivia(token) {
@@ -4572,7 +4961,7 @@ var ts;
     }
     ts.hasDynamicName = hasDynamicName;
     function isDynamicName(name) {
-        return name.kind === 137 &&
+        return name.kind === 139 &&
             !isStringOrNumericLiteral(name.expression.kind) &&
             !isWellKnownSymbolSyntactically(name.expression);
     }
@@ -4585,7 +4974,7 @@ var ts;
         if (name.kind === 69 || name.kind === 9 || name.kind === 8) {
             return name.text;
         }
-        if (name.kind === 137) {
+        if (name.kind === 139) {
             var nameExpression = name.expression;
             if (isWellKnownSymbolSyntactically(nameExpression)) {
                 var rightHandSideName = nameExpression.name.text;
@@ -4614,6 +5003,7 @@ var ts;
             case 112:
             case 110:
             case 111:
+            case 127:
             case 113:
                 return true;
         }
@@ -4622,18 +5012,18 @@ var ts;
     ts.isModifierKind = isModifierKind;
     function isParameterDeclaration(node) {
         var root = getRootDeclaration(node);
-        return root.kind === 139;
+        return root.kind === 141;
     }
     ts.isParameterDeclaration = isParameterDeclaration;
     function getRootDeclaration(node) {
-        while (node.kind === 166) {
+        while (node.kind === 168) {
             node = node.parent.parent;
         }
         return node;
     }
     ts.getRootDeclaration = getRootDeclaration;
     function nodeStartsNewLexicalEnvironment(n) {
-        return isFunctionLike(n) || n.kind === 221 || n.kind === 251;
+        return isFunctionLike(n) || n.kind === 224 || n.kind === 255;
     }
     ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
     function cloneNode(node, location, flags, parent) {
@@ -4666,7 +5056,7 @@ var ts;
     }
     ts.cloneEntityName = cloneEntityName;
     function isQualifiedName(node) {
-        return node.kind === 136;
+        return node.kind === 138;
     }
     ts.isQualifiedName = isQualifiedName;
     function nodeIsSynthesized(node) {
@@ -4902,14 +5292,25 @@ var ts;
         return emitOutputFilePathWithoutExtension + extension;
     }
     ts.getOwnEmitOutputFilePath = getOwnEmitOutputFilePath;
+    function getDeclarationEmitOutputFilePath(sourceFile, host) {
+        var options = host.getCompilerOptions();
+        var outputDir = options.declarationDir || options.outDir;
+        if (options.declaration) {
+            var path = outputDir
+                ? getSourceFilePathInNewDir(sourceFile, host, outputDir)
+                : sourceFile.fileName;
+            return ts.removeFileExtension(path) + ".d.ts";
+        }
+    }
+    ts.getDeclarationEmitOutputFilePath = getDeclarationEmitOutputFilePath;
     function getEmitScriptTarget(compilerOptions) {
         return compilerOptions.target || 0;
     }
     ts.getEmitScriptTarget = getEmitScriptTarget;
     function getEmitModuleKind(compilerOptions) {
-        return compilerOptions.module ?
+        return typeof compilerOptions.module === "number" ?
             compilerOptions.module :
-            getEmitScriptTarget(compilerOptions) === 2 ? 5 : 0;
+            getEmitScriptTarget(compilerOptions) === 2 ? ts.ModuleKind.ES6 : ts.ModuleKind.CommonJS;
     }
     ts.getEmitModuleKind = getEmitModuleKind;
     function forEachExpectedEmitFile(host, action, targetSourceFile) {
@@ -4927,24 +5328,36 @@ var ts;
             }
         }
         function onSingleFileEmit(host, sourceFile) {
-            var jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, sourceFile.languageVariant === 1 && options.jsx === 1 ? ".jsx" : ".js");
+            var extension = ".js";
+            if (options.jsx === 1) {
+                if (isSourceFileJavaScript(sourceFile)) {
+                    if (ts.fileExtensionIs(sourceFile.fileName, ".jsx")) {
+                        extension = ".jsx";
+                    }
+                }
+                else if (sourceFile.languageVariant === 1) {
+                    extension = ".jsx";
+                }
+            }
+            var jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, extension);
             var emitFileNames = {
                 jsFilePath: jsFilePath,
                 sourceMapFilePath: getSourceMapFilePath(jsFilePath, options),
-                declarationFilePath: !isSourceFileJavaScript(sourceFile) ? getDeclarationEmitFilePath(jsFilePath, options) : undefined
+                declarationFilePath: !isSourceFileJavaScript(sourceFile) ? getDeclarationEmitOutputFilePath(sourceFile, host) : undefined
             };
             action(emitFileNames, [sourceFile], false);
         }
         function onBundledEmit(host) {
-            var bundledSources = ts.filter(host.getSourceFiles(), function (sourceFile) { return !isDeclarationFile(sourceFile) &&
-                (!isExternalModule(sourceFile) ||
-                    (getEmitModuleKind(options) && isExternalModule(sourceFile))); });
+            var bundledSources = ts.filter(host.getSourceFiles(), function (sourceFile) {
+                return !isDeclarationFile(sourceFile)
+                    && (!ts.isExternalModule(sourceFile) || !!getEmitModuleKind(options));
+            });
             if (bundledSources.length) {
                 var jsFilePath = options.outFile || options.out;
                 var emitFileNames = {
                     jsFilePath: jsFilePath,
                     sourceMapFilePath: getSourceMapFilePath(jsFilePath, options),
-                    declarationFilePath: getDeclarationEmitFilePath(jsFilePath, options)
+                    declarationFilePath: options.declaration ? ts.removeFileExtension(jsFilePath) + ".d.ts" : undefined
                 };
                 action(emitFileNames, bundledSources, true);
             }
@@ -4952,9 +5365,6 @@ var ts;
         function getSourceMapFilePath(jsFilePath, options) {
             return options.sourceMap ? jsFilePath + ".map" : undefined;
         }
-        function getDeclarationEmitFilePath(jsFilePath, options) {
-            return options.declaration ? ts.removeFileExtension(jsFilePath) + ".d.ts" : undefined;
-        }
     }
     ts.forEachExpectedEmitFile = forEachExpectedEmitFile;
     function getSourceFilePathInNewDir(sourceFile, host, newDirPath) {
@@ -4963,10 +5373,10 @@ var ts;
         return ts.combinePaths(newDirPath, sourceFilePath);
     }
     ts.getSourceFilePathInNewDir = getSourceFilePathInNewDir;
-    function writeFile(host, diagnostics, fileName, data, writeByteOrderMark) {
+    function writeFile(host, diagnostics, fileName, data, writeByteOrderMark, sourceFiles) {
         host.writeFile(fileName, data, writeByteOrderMark, function (hostErrorMessage) {
             diagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Could_not_write_file_0_Colon_1, fileName, hostErrorMessage));
-        });
+        }, sourceFiles);
     }
     ts.writeFile = writeFile;
     function getLineOfLocalPosition(currentSourceFile, pos) {
@@ -4979,7 +5389,7 @@ var ts;
     ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap;
     function getFirstConstructorWithBody(node) {
         return ts.forEach(node.members, function (member) {
-            if (member.kind === 145 && nodeIsPresent(member.body)) {
+            if (member.kind === 147 && nodeIsPresent(member.body)) {
                 return member;
             }
         });
@@ -4996,10 +5406,10 @@ var ts;
         var setAccessor;
         if (hasDynamicName(accessor)) {
             firstAccessor = accessor;
-            if (accessor.kind === 146) {
+            if (accessor.kind === 148) {
                 getAccessor = accessor;
             }
-            else if (accessor.kind === 147) {
+            else if (accessor.kind === 149) {
                 setAccessor = accessor;
             }
             else {
@@ -5008,8 +5418,8 @@ var ts;
         }
         else {
             ts.forEach(declarations, function (member) {
-                if ((member.kind === 146 || member.kind === 147)
-                    && (member.flags & 64) === (accessor.flags & 64)) {
+                if ((member.kind === 148 || member.kind === 149)
+                    && (member.flags & 32) === (accessor.flags & 32)) {
                     var memberName = getPropertyNameForPropertyNameNode(member.name);
                     var accessorName = getPropertyNameForPropertyNameNode(accessor.name);
                     if (memberName === accessorName) {
@@ -5019,10 +5429,10 @@ var ts;
                         else if (!secondAccessor) {
                             secondAccessor = member;
                         }
-                        if (member.kind === 146 && !getAccessor) {
+                        if (member.kind === 148 && !getAccessor) {
                             getAccessor = member;
                         }
-                        if (member.kind === 147 && !setAccessor) {
+                        if (member.kind === 149 && !setAccessor) {
                             setAccessor = member;
                         }
                     }
@@ -5077,7 +5487,7 @@ var ts;
         }
         if (leadingComments) {
             var detachedComments = [];
-            var lastComment;
+            var lastComment = void 0;
             for (var _i = 0, leadingComments_1 = leadingComments; _i < leadingComments_1.length; _i++) {
                 var comment = leadingComments_1[_i];
                 if (lastComment) {
@@ -5111,7 +5521,7 @@ var ts;
         if (text.charCodeAt(comment.pos + 1) === 42) {
             var firstCommentLineAndCharacter = ts.computeLineAndCharacterOfPosition(lineMap, comment.pos);
             var lineCount = lineMap.length;
-            var firstCommentLineIndent;
+            var firstCommentLineIndent = void 0;
             for (var pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) {
                 var nextLineStart = (currentLine + 1) === lineCount
                     ? text.length + 1
@@ -5171,16 +5581,17 @@ var ts;
     }
     function modifierToFlag(token) {
         switch (token) {
-            case 113: return 64;
-            case 112: return 8;
-            case 111: return 32;
-            case 110: return 16;
+            case 113: return 32;
+            case 112: return 4;
+            case 111: return 16;
+            case 110: return 8;
             case 115: return 128;
-            case 82: return 2;
-            case 122: return 4;
-            case 74: return 16384;
+            case 82: return 1;
+            case 122: return 2;
+            case 74: return 2048;
             case 77: return 512;
             case 118: return 256;
+            case 127: return 64;
         }
         return 0;
     }
@@ -5188,24 +5599,25 @@ var ts;
     function isLeftHandSideExpression(expr) {
         if (expr) {
             switch (expr.kind) {
-                case 169:
-                case 170:
-                case 172:
                 case 171:
-                case 236:
-                case 237:
+                case 172:
+                case 174:
                 case 173:
-                case 167:
+                case 195:
+                case 240:
+                case 241:
                 case 175:
-                case 168:
-                case 189:
-                case 176:
+                case 169:
+                case 177:
+                case 170:
+                case 191:
+                case 178:
                 case 69:
                 case 10:
                 case 8:
                 case 9:
                 case 11:
-                case 186:
+                case 188:
                 case 84:
                 case 93:
                 case 97:
@@ -5222,7 +5634,7 @@ var ts;
     }
     ts.isAssignmentOperator = isAssignmentOperator;
     function isExpressionWithTypeArgumentsInClassExtendsClause(node) {
-        return node.kind === 191 &&
+        return node.kind === 193 &&
             node.parent.token === 83 &&
             isClassLike(node.parent.parent);
     }
@@ -5243,16 +5655,16 @@ var ts;
         }
     }
     function isRightSideOfQualifiedNameOrPropertyAccess(node) {
-        return (node.parent.kind === 136 && node.parent.right === node) ||
-            (node.parent.kind === 169 && node.parent.name === node);
+        return (node.parent.kind === 138 && node.parent.right === node) ||
+            (node.parent.kind === 171 && node.parent.name === node);
     }
     ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess;
     function isEmptyObjectLiteralOrArrayLiteral(expression) {
         var kind = expression.kind;
-        if (kind === 168) {
+        if (kind === 170) {
             return expression.properties.length === 0;
         }
-        if (kind === 167) {
+        if (kind === 169) {
             return expression.elements.length === 0;
         }
         return false;
@@ -5373,6 +5785,10 @@ var ts;
         return carriageReturnLineFeed;
     }
     ts.getNewLineCharacter = getNewLineCharacter;
+    function isWatchSet(options) {
+        return options.watch && options.hasOwnProperty("watch");
+    }
+    ts.isWatchSet = isWatchSet;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -5496,9 +5912,9 @@ var ts;
     }
     ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
     function getTypeParameterOwner(d) {
-        if (d && d.kind === 138) {
+        if (d && d.kind === 140) {
             for (var current = d; current; current = current.parent) {
-                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 218) {
+                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 221) {
                     return current;
                 }
             }
@@ -5506,9 +5922,18 @@ var ts;
     }
     ts.getTypeParameterOwner = getTypeParameterOwner;
     function isParameterPropertyDeclaration(node) {
-        return node.flags & 56 && node.parent.kind === 145 && ts.isClassLike(node.parent.parent);
+        return node.flags & 28 && node.parent.kind === 147 && 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) {
@@ -5516,7 +5941,7 @@ var ts;
     var NodeConstructor;
     var SourceFileConstructor;
     function createNode(kind, pos, end) {
-        if (kind === 251) {
+        if (kind === 255) {
             return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
         }
         else {
@@ -5552,26 +5977,26 @@ var ts;
         var visitNodes = cbNodeArray ? visitNodeArray : visitEachNode;
         var cbNodes = cbNodeArray || cbNode;
         switch (node.kind) {
-            case 136:
+            case 138:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.right);
-            case 138:
+            case 140:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNode(cbNode, node.expression);
-            case 249:
+            case 253:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.equalsToken) ||
                     visitNode(cbNode, node.objectAssignmentInitializer);
-            case 139:
-            case 142:
             case 141:
-            case 248:
-            case 214:
-            case 166:
+            case 144:
+            case 143:
+            case 252:
+            case 217:
+            case 168:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.propertyName) ||
@@ -5580,24 +6005,24 @@ var ts;
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 153:
-            case 154:
-            case 148:
-            case 149:
+            case 155:
+            case 156:
             case 150:
+            case 151:
+            case 152:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNodes(cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 144:
-            case 143:
-            case 145:
             case 146:
+            case 145:
             case 147:
-            case 176:
-            case 216:
-            case 177:
+            case 148:
+            case 149:
+            case 178:
+            case 219:
+            case 179:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.asteriskToken) ||
@@ -5608,302 +6033,310 @@ var ts;
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.equalsGreaterThanToken) ||
                     visitNode(cbNode, node.body);
-            case 152:
+            case 154:
                 return visitNode(cbNode, node.typeName) ||
                     visitNodes(cbNodes, node.typeArguments);
-            case 151:
+            case 153:
                 return visitNode(cbNode, node.parameterName) ||
                     visitNode(cbNode, node.type);
-            case 155:
-                return visitNode(cbNode, node.exprName);
-            case 156:
-                return visitNodes(cbNodes, node.members);
             case 157:
-                return visitNode(cbNode, node.elementType);
+                return visitNode(cbNode, node.exprName);
             case 158:
-                return visitNodes(cbNodes, node.elementTypes);
+                return visitNodes(cbNodes, node.members);
             case 159:
+                return visitNode(cbNode, node.elementType);
             case 160:
-                return visitNodes(cbNodes, node.types);
+                return visitNodes(cbNodes, node.elementTypes);
             case 161:
+            case 162:
+                return visitNodes(cbNodes, node.types);
+            case 163:
                 return visitNode(cbNode, node.type);
-            case 164:
-            case 165:
-                return visitNodes(cbNodes, node.elements);
+            case 166:
             case 167:
                 return visitNodes(cbNodes, node.elements);
-            case 168:
-                return visitNodes(cbNodes, node.properties);
             case 169:
+                return visitNodes(cbNodes, node.elements);
+            case 170:
+                return visitNodes(cbNodes, node.properties);
+            case 171:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.dotToken) ||
                     visitNode(cbNode, node.name);
-            case 170:
+            case 172:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.argumentExpression);
-            case 171:
-            case 172:
+            case 173:
+            case 174:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNodes, node.typeArguments) ||
                     visitNodes(cbNodes, node.arguments);
-            case 173:
+            case 175:
                 return visitNode(cbNode, node.tag) ||
                     visitNode(cbNode, node.template);
-            case 174:
+            case 176:
                 return visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.expression);
-            case 175:
-                return visitNode(cbNode, node.expression);
-            case 178:
-                return visitNode(cbNode, node.expression);
-            case 179:
+            case 177:
                 return visitNode(cbNode, node.expression);
             case 180:
                 return visitNode(cbNode, node.expression);
-            case 182:
-                return visitNode(cbNode, node.operand);
-            case 187:
-                return visitNode(cbNode, node.asteriskToken) ||
-                    visitNode(cbNode, node.expression);
             case 181:
                 return visitNode(cbNode, node.expression);
-            case 183:
-                return visitNode(cbNode, node.operand);
+            case 182:
+                return visitNode(cbNode, node.expression);
             case 184:
+                return visitNode(cbNode, node.operand);
+            case 189:
+                return visitNode(cbNode, node.asteriskToken) ||
+                    visitNode(cbNode, node.expression);
+            case 183:
+                return visitNode(cbNode, node.expression);
+            case 185:
+                return visitNode(cbNode, node.operand);
+            case 186:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.operatorToken) ||
                     visitNode(cbNode, node.right);
-            case 192:
+            case 194:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.type);
-            case 185:
+            case 195:
+                return visitNode(cbNode, node.expression);
+            case 187:
                 return visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.whenTrue) ||
                     visitNode(cbNode, node.colonToken) ||
                     visitNode(cbNode, node.whenFalse);
-            case 188:
+            case 190:
                 return visitNode(cbNode, node.expression);
-            case 195:
-            case 222:
+            case 198:
+            case 225:
                 return visitNodes(cbNodes, node.statements);
-            case 251:
+            case 255:
                 return visitNodes(cbNodes, node.statements) ||
                     visitNode(cbNode, node.endOfFileToken);
-            case 196:
+            case 199:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.declarationList);
-            case 215:
+            case 218:
                 return visitNodes(cbNodes, node.declarations);
-            case 198:
+            case 201:
                 return visitNode(cbNode, node.expression);
-            case 199:
+            case 202:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.thenStatement) ||
                     visitNode(cbNode, node.elseStatement);
-            case 200:
+            case 203:
                 return visitNode(cbNode, node.statement) ||
                     visitNode(cbNode, node.expression);
-            case 201:
+            case 204:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 202:
+            case 205:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.incrementor) ||
                     visitNode(cbNode, node.statement);
-            case 203:
-                return visitNode(cbNode, node.initializer) ||
-                    visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
-            case 204:
-                return visitNode(cbNode, node.initializer) ||
-                    visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
-            case 205:
             case 206:
-                return visitNode(cbNode, node.label);
+                return visitNode(cbNode, node.initializer) ||
+                    visitNode(cbNode, node.expression) ||
+                    visitNode(cbNode, node.statement);
             case 207:
-                return visitNode(cbNode, node.expression);
+                return visitNode(cbNode, node.initializer) ||
+                    visitNode(cbNode, node.expression) ||
+                    visitNode(cbNode, node.statement);
             case 208:
+            case 209:
+                return visitNode(cbNode, node.label);
+            case 210:
+                return visitNode(cbNode, node.expression);
+            case 211:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 209:
+            case 212:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.caseBlock);
-            case 223:
+            case 226:
                 return visitNodes(cbNodes, node.clauses);
-            case 244:
+            case 248:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNodes, node.statements);
-            case 245:
+            case 249:
                 return visitNodes(cbNodes, node.statements);
-            case 210:
+            case 213:
                 return visitNode(cbNode, node.label) ||
                     visitNode(cbNode, node.statement);
-            case 211:
+            case 214:
                 return visitNode(cbNode, node.expression);
-            case 212:
+            case 215:
                 return visitNode(cbNode, node.tryBlock) ||
                     visitNode(cbNode, node.catchClause) ||
                     visitNode(cbNode, node.finallyBlock);
-            case 247:
+            case 251:
                 return visitNode(cbNode, node.variableDeclaration) ||
                     visitNode(cbNode, node.block);
-            case 140:
+            case 142:
                 return visitNode(cbNode, node.expression);
-            case 217:
-            case 189:
-                return visitNodes(cbNodes, node.decorators) ||
-                    visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNodes(cbNodes, node.typeParameters) ||
-                    visitNodes(cbNodes, node.heritageClauses) ||
-                    visitNodes(cbNodes, node.members);
-            case 218:
-                return visitNodes(cbNodes, node.decorators) ||
-                    visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNodes(cbNodes, node.typeParameters) ||
-                    visitNodes(cbNodes, node.heritageClauses) ||
-                    visitNodes(cbNodes, node.members);
-            case 219:
-                return visitNodes(cbNodes, node.decorators) ||
-                    visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNodes(cbNodes, node.typeParameters) ||
-                    visitNode(cbNode, node.type);
             case 220:
+            case 191:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
+                    visitNodes(cbNodes, node.typeParameters) ||
+                    visitNodes(cbNodes, node.heritageClauses) ||
                     visitNodes(cbNodes, node.members);
-            case 250:
-                return visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.initializer);
             case 221:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.body);
+                    visitNodes(cbNodes, node.typeParameters) ||
+                    visitNodes(cbNodes, node.heritageClauses) ||
+                    visitNodes(cbNodes, node.members);
+            case 222:
+                return visitNodes(cbNodes, node.decorators) ||
+                    visitNodes(cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.name) ||
+                    visitNodes(cbNodes, node.typeParameters) ||
+                    visitNode(cbNode, node.type);
+            case 223:
+                return visitNodes(cbNodes, node.decorators) ||
+                    visitNodes(cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.name) ||
+                    visitNodes(cbNodes, node.members);
+            case 254:
+                return visitNode(cbNode, node.name) ||
+                    visitNode(cbNode, node.initializer);
             case 224:
+                return visitNodes(cbNodes, node.decorators) ||
+                    visitNodes(cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.name) ||
+                    visitNode(cbNode, node.body);
+            case 228:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.moduleReference);
-            case 225:
+            case 229:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.importClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 226:
+            case 230:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.namedBindings);
             case 227:
                 return visitNode(cbNode, node.name);
-            case 228:
-            case 232:
-                return visitNodes(cbNodes, node.elements);
             case 231:
+                return visitNode(cbNode, node.name);
+            case 232:
+            case 236:
+                return visitNodes(cbNodes, node.elements);
+            case 235:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.exportClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 229:
             case 233:
+            case 237:
                 return visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name);
-            case 230:
+            case 234:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.expression);
-            case 186:
+            case 188:
                 return visitNode(cbNode, node.head) || visitNodes(cbNodes, node.templateSpans);
-            case 193:
+            case 196:
                 return visitNode(cbNode, node.expression) || visitNode(cbNode, node.literal);
-            case 137:
+            case 139:
                 return visitNode(cbNode, node.expression);
-            case 246:
+            case 250:
                 return visitNodes(cbNodes, node.types);
-            case 191:
+            case 193:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNodes, node.typeArguments);
-            case 235:
+            case 239:
                 return visitNode(cbNode, node.expression);
-            case 234:
+            case 238:
                 return visitNodes(cbNodes, node.decorators);
-            case 236:
+            case 240:
                 return visitNode(cbNode, node.openingElement) ||
                     visitNodes(cbNodes, node.children) ||
                     visitNode(cbNode, node.closingElement);
-            case 237:
-            case 238:
+            case 241:
+            case 242:
                 return visitNode(cbNode, node.tagName) ||
                     visitNodes(cbNodes, node.attributes);
-            case 241:
+            case 245:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 242:
+            case 246:
                 return visitNode(cbNode, node.expression);
-            case 243:
+            case 247:
                 return visitNode(cbNode, node.expression);
-            case 240:
+            case 244:
                 return visitNode(cbNode, node.tagName);
-            case 252:
-                return visitNode(cbNode, node.type);
             case 256:
-                return visitNodes(cbNodes, node.types);
-            case 257:
-                return visitNodes(cbNodes, node.types);
-            case 255:
-                return visitNode(cbNode, node.elementType);
-            case 259:
-                return visitNode(cbNode, node.type);
-            case 258:
                 return visitNode(cbNode, node.type);
             case 260:
-                return visitNodes(cbNodes, node.members);
-            case 262:
-                return visitNode(cbNode, node.name) ||
-                    visitNodes(cbNodes, node.typeArguments);
+                return visitNodes(cbNodes, node.types);
+            case 261:
+                return visitNodes(cbNodes, node.types);
+            case 259:
+                return visitNode(cbNode, node.elementType);
             case 263:
                 return visitNode(cbNode, node.type);
+            case 262:
+                return visitNode(cbNode, node.type);
             case 264:
-                return visitNodes(cbNodes, node.parameters) ||
-                    visitNode(cbNode, node.type);
-            case 265:
-                return visitNode(cbNode, node.type);
+                return visitNodes(cbNodes, node.members);
             case 266:
-                return visitNode(cbNode, node.type);
+                return visitNode(cbNode, node.name) ||
+                    visitNodes(cbNodes, node.typeArguments);
             case 267:
                 return visitNode(cbNode, node.type);
-            case 261:
+            case 268:
+                return visitNodes(cbNodes, node.parameters) ||
+                    visitNode(cbNode, node.type);
+            case 269:
+                return visitNode(cbNode, node.type);
+            case 270:
+                return visitNode(cbNode, node.type);
+            case 271:
+                return visitNode(cbNode, node.type);
+            case 265:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.type);
-            case 268:
+            case 272:
                 return visitNodes(cbNodes, node.tags);
-            case 270:
+            case 274:
                 return visitNode(cbNode, node.preParameterName) ||
                     visitNode(cbNode, node.typeExpression) ||
                     visitNode(cbNode, node.postParameterName);
-            case 271:
+            case 275:
                 return visitNode(cbNode, node.typeExpression);
-            case 272:
+            case 276:
                 return visitNode(cbNode, node.typeExpression);
-            case 273:
+            case 277:
                 return visitNodes(cbNodes, node.typeParameters);
         }
     }
     ts.forEachChild = forEachChild;
-    function createSourceFile(fileName, sourceText, languageVersion, setParentNodes) {
+    function createSourceFile(fileName, sourceText, languageVersion, setParentNodes, scriptKind) {
         if (setParentNodes === void 0) { setParentNodes = false; }
         var start = new Date().getTime();
-        var result = Parser.parseSourceFile(fileName, sourceText, languageVersion, undefined, setParentNodes);
+        var result = Parser.parseSourceFile(fileName, sourceText, languageVersion, undefined, setParentNodes, scriptKind);
         ts.parseTime += new Date().getTime() - start;
         return result;
     }
     ts.createSourceFile = createSourceFile;
+    function isExternalModule(file) {
+        return file.externalModuleIndicator !== undefined;
+    }
+    ts.isExternalModule = isExternalModule;
     function updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks) {
         return IncrementalParser.updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks);
     }
@@ -5919,7 +6352,7 @@ var ts;
     var Parser;
     (function (Parser) {
         var scanner = ts.createScanner(2, true);
-        var disallowInAndDecoratorContext = 1 | 4;
+        var disallowInAndDecoratorContext = 4194304 | 16777216;
         var NodeConstructor;
         var SourceFileConstructor;
         var sourceFile;
@@ -5933,18 +6366,18 @@ var ts;
         var parsingContext;
         var contextFlags;
         var parseErrorBeforeNextFinishedNode = false;
-        function parseSourceFile(fileName, _sourceText, languageVersion, _syntaxCursor, setParentNodes) {
-            var isJavaScriptFile = ts.hasJavaScriptFileExtension(fileName) || _sourceText.lastIndexOf("// @language=javascript", 0) === 0;
-            initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor);
-            var result = parseSourceFileWorker(fileName, languageVersion, setParentNodes);
+        function parseSourceFile(fileName, _sourceText, languageVersion, _syntaxCursor, setParentNodes, scriptKind) {
+            scriptKind = ts.ensureScriptKind(fileName, scriptKind);
+            initializeState(fileName, _sourceText, languageVersion, _syntaxCursor, scriptKind);
+            var result = parseSourceFileWorker(fileName, languageVersion, setParentNodes, scriptKind);
             clearState();
             return result;
         }
         Parser.parseSourceFile = parseSourceFile;
-        function getLanguageVariant(fileName) {
-            return ts.fileExtensionIs(fileName, ".tsx") || ts.fileExtensionIs(fileName, ".jsx") ? 1 : 0;
+        function getLanguageVariant(scriptKind) {
+            return scriptKind === 4 || scriptKind === 2 || scriptKind === 1 ? 1 : 0;
         }
-        function initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor) {
+        function initializeState(fileName, _sourceText, languageVersion, _syntaxCursor, scriptKind) {
             NodeConstructor = ts.objectAllocator.getNodeConstructor();
             SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor();
             sourceText = _sourceText;
@@ -5954,12 +6387,12 @@ var ts;
             identifiers = {};
             identifierCount = 0;
             nodeCount = 0;
-            contextFlags = isJavaScriptFile ? 32 : 0;
+            contextFlags = scriptKind === 1 || scriptKind === 2 ? 134217728 : 0;
             parseErrorBeforeNextFinishedNode = false;
             scanner.setText(sourceText);
             scanner.setOnError(scanError);
             scanner.setScriptTarget(languageVersion);
-            scanner.setLanguageVariant(getLanguageVariant(fileName));
+            scanner.setLanguageVariant(getLanguageVariant(scriptKind));
         }
         function clearState() {
             scanner.setText("");
@@ -5970,11 +6403,9 @@ var ts;
             syntaxCursor = undefined;
             sourceText = undefined;
         }
-        function parseSourceFileWorker(fileName, languageVersion, setParentNodes) {
-            sourceFile = createSourceFile(fileName, languageVersion);
-            if (contextFlags & 32) {
-                sourceFile.parserContextFlags = 32;
-            }
+        function parseSourceFileWorker(fileName, languageVersion, setParentNodes, scriptKind) {
+            sourceFile = createSourceFile(fileName, languageVersion, scriptKind);
+            sourceFile.flags = contextFlags;
             token = nextToken();
             processReferenceComments(sourceFile);
             sourceFile.statements = parseList(0, parseStatement);
@@ -5988,35 +6419,22 @@ var ts;
             if (setParentNodes) {
                 fixupParentReferences(sourceFile);
             }
-            if (ts.isSourceFileJavaScript(sourceFile)) {
-                addJSDocComments();
-            }
             return sourceFile;
         }
-        function addJSDocComments() {
-            forEachChild(sourceFile, visit);
-            return;
-            function visit(node) {
-                switch (node.kind) {
-                    case 196:
-                    case 216:
-                    case 139:
-                        addJSDocComment(node);
-                }
-                forEachChild(node, visit);
-            }
-        }
         function addJSDocComment(node) {
-            var comments = ts.getLeadingCommentRangesOfNode(node, sourceFile);
-            if (comments) {
-                for (var _i = 0, comments_1 = comments; _i < comments_1.length; _i++) {
-                    var comment = comments_1[_i];
-                    var jsDocComment = JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos);
-                    if (jsDocComment) {
-                        node.jsDocComment = jsDocComment;
+            if (contextFlags & 134217728) {
+                var comments = ts.getLeadingCommentRangesOfNode(node, sourceFile);
+                if (comments) {
+                    for (var _i = 0, comments_1 = comments; _i < comments_1.length; _i++) {
+                        var comment = comments_1[_i];
+                        var jsDocComment = JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos);
+                        if (jsDocComment) {
+                            node.jsDocComment = jsDocComment;
+                        }
                     }
                 }
             }
+            return node;
         }
         function fixupParentReferences(sourceFile) {
             var parent = sourceFile;
@@ -6033,15 +6451,16 @@ var ts;
             }
         }
         Parser.fixupParentReferences = fixupParentReferences;
-        function createSourceFile(fileName, languageVersion) {
-            var sourceFile = new SourceFileConstructor(251, 0, sourceText.length);
+        function createSourceFile(fileName, languageVersion, scriptKind) {
+            var sourceFile = new SourceFileConstructor(255, 0, sourceText.length);
             nodeCount++;
             sourceFile.text = sourceText;
             sourceFile.bindDiagnostics = [];
             sourceFile.languageVersion = languageVersion;
             sourceFile.fileName = ts.normalizePath(fileName);
-            sourceFile.flags = ts.fileExtensionIs(sourceFile.fileName, ".d.ts") ? 4096 : 0;
-            sourceFile.languageVariant = getLanguageVariant(sourceFile.fileName);
+            sourceFile.languageVariant = getLanguageVariant(scriptKind);
+            sourceFile.isDeclarationFile = ts.fileExtensionIs(sourceFile.fileName, ".d.ts");
+            sourceFile.scriptKind = scriptKind;
             return sourceFile;
         }
         function setContextFlag(val, flag) {
@@ -6053,16 +6472,16 @@ var ts;
             }
         }
         function setDisallowInContext(val) {
-            setContextFlag(val, 1);
+            setContextFlag(val, 4194304);
         }
         function setYieldContext(val) {
-            setContextFlag(val, 2);
+            setContextFlag(val, 8388608);
         }
         function setDecoratorContext(val) {
-            setContextFlag(val, 4);
+            setContextFlag(val, 16777216);
         }
         function setAwaitContext(val) {
-            setContextFlag(val, 8);
+            setContextFlag(val, 33554432);
         }
         function doOutsideOfContext(context, func) {
             var contextFlagsToClear = context & contextFlags;
@@ -6085,40 +6504,40 @@ var ts;
             return func();
         }
         function allowInAnd(func) {
-            return doOutsideOfContext(1, func);
+            return doOutsideOfContext(4194304, func);
         }
         function disallowInAnd(func) {
-            return doInsideOfContext(1, func);
+            return doInsideOfContext(4194304, func);
         }
         function doInYieldContext(func) {
-            return doInsideOfContext(2, func);
+            return doInsideOfContext(8388608, func);
         }
         function doInDecoratorContext(func) {
-            return doInsideOfContext(4, func);
+            return doInsideOfContext(16777216, func);
         }
         function doInAwaitContext(func) {
-            return doInsideOfContext(8, func);
+            return doInsideOfContext(33554432, func);
         }
         function doOutsideOfAwaitContext(func) {
-            return doOutsideOfContext(8, func);
+            return doOutsideOfContext(33554432, func);
         }
         function doInYieldAndAwaitContext(func) {
-            return doInsideOfContext(2 | 8, func);
+            return doInsideOfContext(8388608 | 33554432, func);
         }
         function inContext(flags) {
             return (contextFlags & flags) !== 0;
         }
         function inYieldContext() {
-            return inContext(2);
+            return inContext(8388608);
         }
         function inDisallowInContext() {
-            return inContext(1);
+            return inContext(4194304);
         }
         function inDecoratorContext() {
-            return inContext(4);
+            return inContext(16777216);
         }
         function inAwaitContext() {
-            return inContext(8);
+            return inContext(33554432);
         }
         function parseErrorAtCurrentToken(message, arg0) {
             var start = scanner.getTokenPos();
@@ -6259,11 +6678,11 @@ var ts;
         function finishNode(node, end) {
             node.end = end === undefined ? scanner.getStartPos() : end;
             if (contextFlags) {
-                node.parserContextFlags = contextFlags;
+                node.flags |= contextFlags;
             }
             if (parseErrorBeforeNextFinishedNode) {
                 parseErrorBeforeNextFinishedNode = false;
-                node.parserContextFlags |= 16;
+                node.flags |= 67108864;
             }
             return node;
         }
@@ -6325,7 +6744,7 @@ var ts;
             return token === 9 || token === 8 || ts.tokenIsIdentifierOrKeyword(token);
         }
         function parseComputedPropertyName() {
-            var node = createNode(137);
+            var node = createNode(139);
             parseExpected(19);
             node.expression = allowInAnd(parseExpression);
             parseExpected(20);
@@ -6350,7 +6769,7 @@ var ts;
                 if (token === 77) {
                     return lookAhead(nextTokenIsClassOrFunction);
                 }
-                return token !== 37 && token !== 15 && canFollowModifier();
+                return token !== 37 && token !== 116 && token !== 15 && canFollowModifier();
             }
             if (token === 77) {
                 return nextTokenIsClassOrFunction();
@@ -6387,7 +6806,7 @@ var ts;
                 case 2:
                     return token === 71 || token === 77;
                 case 4:
-                    return isStartOfTypeMember();
+                    return lookAhead(isTypeMemberStart);
                 case 5:
                     return lookAhead(isClassMemberStart) || (token === 23 && !inErrorRecovery);
                 case 6:
@@ -6577,7 +6996,7 @@ var ts;
             if (ts.containsParseError(node)) {
                 return undefined;
             }
-            var nodeContextFlags = node.parserContextFlags & 31;
+            var nodeContextFlags = node.flags & 197132288;
             if (nodeContextFlags !== contextFlags) {
                 return undefined;
             }
@@ -6624,14 +7043,14 @@ var ts;
         function isReusableClassMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 145:
-                    case 150:
-                    case 146:
                     case 147:
-                    case 142:
-                    case 194:
-                        return true;
+                    case 152:
+                    case 148:
+                    case 149:
                     case 144:
+                    case 197:
+                        return true;
+                    case 146:
                         var methodDeclaration = node;
                         var nameIsConstructor = methodDeclaration.name.kind === 69 &&
                             methodDeclaration.name.originalKeywordKind === 121;
@@ -6643,8 +7062,8 @@ var ts;
         function isReusableSwitchClause(node) {
             if (node) {
                 switch (node.kind) {
-                    case 244:
-                    case 245:
+                    case 248:
+                    case 249:
                         return true;
                 }
             }
@@ -6653,65 +7072,65 @@ var ts;
         function isReusableStatement(node) {
             if (node) {
                 switch (node.kind) {
-                    case 216:
-                    case 196:
-                    case 195:
+                    case 219:
                     case 199:
                     case 198:
-                    case 211:
-                    case 207:
-                    case 209:
-                    case 206:
-                    case 205:
-                    case 203:
-                    case 204:
                     case 202:
                     case 201:
-                    case 208:
-                    case 197:
-                    case 212:
+                    case 214:
                     case 210:
+                    case 212:
+                    case 209:
+                    case 208:
+                    case 206:
+                    case 207:
+                    case 205:
+                    case 204:
+                    case 211:
                     case 200:
+                    case 215:
                     case 213:
-                    case 225:
+                    case 203:
+                    case 216:
+                    case 229:
+                    case 228:
+                    case 235:
+                    case 234:
                     case 224:
-                    case 231:
-                    case 230:
-                    case 221:
-                    case 217:
-                    case 218:
                     case 220:
-                    case 219:
+                    case 221:
+                    case 223:
+                    case 222:
                         return true;
                 }
             }
             return false;
         }
         function isReusableEnumMember(node) {
-            return node.kind === 250;
+            return node.kind === 254;
         }
         function isReusableTypeMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 149:
+                    case 151:
+                    case 145:
+                    case 152:
                     case 143:
                     case 150:
-                    case 141:
-                    case 148:
                         return true;
                 }
             }
             return false;
         }
         function isReusableVariableDeclaration(node) {
-            if (node.kind !== 214) {
+            if (node.kind !== 217) {
                 return false;
             }
             var variableDeclarator = node;
             return variableDeclarator.initializer === undefined;
         }
         function isReusableParameter(node) {
-            if (node.kind !== 139) {
+            if (node.kind !== 141) {
                 return false;
             }
             var parameter = node;
@@ -6756,7 +7175,7 @@ var ts;
             }
         }
         ;
-        function parseDelimitedList(kind, parseElement, considerSemicolonAsDelimeter) {
+        function parseDelimitedList(kind, parseElement, considerSemicolonAsDelimiter) {
             var saveParsingContext = parsingContext;
             parsingContext |= 1 << kind;
             var result = [];
@@ -6774,7 +7193,7 @@ var ts;
                         break;
                     }
                     parseExpected(24);
-                    if (considerSemicolonAsDelimeter && token === 23 && !scanner.hasPrecedingLineBreak()) {
+                    if (considerSemicolonAsDelimiter && token === 23 && !scanner.hasPrecedingLineBreak()) {
                         nextToken();
                     }
                     continue;
@@ -6811,7 +7230,7 @@ var ts;
         function parseEntityName(allowReservedWords, diagnosticMessage) {
             var entity = parseIdentifier(diagnosticMessage);
             while (parseOptional(21)) {
-                var node = createNode(136, entity.pos);
+                var node = createNode(138, entity.pos);
                 node.left = entity;
                 node.right = parseRightSideOfDot(allowReservedWords);
                 entity = finishNode(node);
@@ -6828,7 +7247,7 @@ var ts;
             return allowIdentifierNames ? parseIdentifierName() : parseIdentifier();
         }
         function parseTemplateExpression() {
-            var template = createNode(186);
+            var template = createNode(188);
             template.head = parseTemplateLiteralFragment();
             ts.Debug.assert(template.head.kind === 12, "Template head has wrong token kind");
             var templateSpans = [];
@@ -6841,7 +7260,7 @@ var ts;
             return finishNode(template);
         }
         function parseTemplateSpan() {
-            var span = createNode(193);
+            var span = createNode(196);
             span.expression = allowInAnd(parseExpression);
             var literal;
             if (token === 16) {
@@ -6855,7 +7274,7 @@ var ts;
             return finishNode(span);
         }
         function parseStringLiteralTypeNode() {
-            return parseLiteralLikeNode(163, true);
+            return parseLiteralLikeNode(165, true);
         }
         function parseLiteralNode(internName) {
             return parseLiteralLikeNode(token, internName);
@@ -6879,39 +7298,39 @@ var ts;
             if (node.kind === 8
                 && sourceText.charCodeAt(tokenPos) === 48
                 && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) {
-                node.flags |= 32768;
+                node.isOctalLiteral = true;
             }
             return node;
         }
         function parseTypeReference() {
             var typeName = parseEntityName(false, ts.Diagnostics.Type_expected);
-            var node = createNode(152, typeName.pos);
+            var node = createNode(154, typeName.pos);
             node.typeName = typeName;
             if (!scanner.hasPrecedingLineBreak() && token === 25) {
                 node.typeArguments = parseBracketedList(18, parseType, 25, 27);
             }
             return finishNode(node);
         }
-        function parseTypePredicate(lhs) {
+        function parseThisTypePredicate(lhs) {
             nextToken();
-            var node = createNode(151, lhs.pos);
+            var node = createNode(153, lhs.pos);
             node.parameterName = lhs;
             node.type = parseType();
             return finishNode(node);
         }
         function parseThisTypeNode() {
-            var node = createNode(162);
+            var node = createNode(164);
             nextToken();
             return finishNode(node);
         }
         function parseTypeQuery() {
-            var node = createNode(155);
+            var node = createNode(157);
             parseExpected(101);
             node.exprName = parseEntityName(true);
             return finishNode(node);
         }
         function parseTypeParameter() {
-            var node = createNode(138);
+            var node = createNode(140);
             node.name = parseIdentifier();
             if (parseOptional(83)) {
                 if (isStartOfType() || !isStartOfExpression()) {
@@ -6935,7 +7354,7 @@ var ts;
             return undefined;
         }
         function isStartOfParameter() {
-            return token === 22 || isIdentifierOrPattern() || ts.isModifierKind(token) || token === 55;
+            return token === 22 || isIdentifierOrPattern() || ts.isModifierKind(token) || token === 55 || token === 97;
         }
         function setModifiers(node, modifiers) {
             if (modifiers) {
@@ -6944,7 +7363,12 @@ var ts;
             }
         }
         function parseParameter() {
-            var node = createNode(139);
+            var node = createNode(141);
+            if (token === 97) {
+                node.name = createIdentifier(true, undefined);
+                node.type = parseParameterType();
+                return finishNode(node);
+            }
             node.decorators = parseDecorators();
             setModifiers(node, parseModifiers());
             node.dotDotDotToken = parseOptionalToken(22);
@@ -6955,7 +7379,7 @@ var ts;
             node.questionToken = parseOptionalToken(53);
             node.type = parseParameterType();
             node.initializer = parseBindingElementInitializer(true);
-            return finishNode(node);
+            return addJSDocComment(finishNode(node));
         }
         function parseBindingElementInitializer(inParameter) {
             return inParameter ? parseParameterInitializer() : parseNonParameterInitializer();
@@ -6999,7 +7423,7 @@ var ts;
         }
         function parseSignatureMember(kind) {
             var node = createNode(kind);
-            if (kind === 149) {
+            if (kind === 151) {
                 parseExpected(92);
             }
             fillSignature(54, false, false, false, node);
@@ -7039,7 +7463,7 @@ var ts;
             return token === 54 || token === 24 || token === 20;
         }
         function parseIndexSignatureDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(150, fullStart);
+            var node = createNode(152, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             node.parameters = parseBracketedList(16, parseParameter, 19, 20);
@@ -7047,12 +7471,12 @@ var ts;
             parseTypeMemberSemicolon();
             return finishNode(node);
         }
-        function parsePropertyOrMethodSignature() {
-            var fullStart = scanner.getStartPos();
+        function parsePropertyOrMethodSignature(fullStart, modifiers) {
             var name = parsePropertyName();
             var questionToken = parseOptionalToken(53);
             if (token === 17 || token === 25) {
-                var method = createNode(143, fullStart);
+                var method = createNode(145, fullStart);
+                setModifiers(method, modifiers);
                 method.name = name;
                 method.questionToken = questionToken;
                 fillSignature(54, false, false, false, method);
@@ -7060,7 +7484,8 @@ var ts;
                 return finishNode(method);
             }
             else {
-                var property = createNode(141, fullStart);
+                var property = createNode(143, fullStart);
+                setModifiers(property, modifiers);
                 property.name = name;
                 property.questionToken = questionToken;
                 property.type = parseTypeAnnotation();
@@ -7071,78 +7496,51 @@ var ts;
                 return finishNode(property);
             }
         }
-        function isStartOfTypeMember() {
-            switch (token) {
-                case 17:
-                case 25:
-                case 19:
-                    return true;
-                default:
-                    if (ts.isModifierKind(token)) {
-                        var result = lookAhead(isStartOfIndexSignatureDeclaration);
-                        if (result) {
-                            return result;
-                        }
-                    }
-                    return isLiteralPropertyName() && lookAhead(isTypeMemberWithLiteralPropertyName);
+        function isTypeMemberStart() {
+            var idToken;
+            if (token === 17 || token === 25) {
+                return true;
             }
-        }
-        function isStartOfIndexSignatureDeclaration() {
             while (ts.isModifierKind(token)) {
+                idToken = token;
                 nextToken();
             }
-            return isIndexSignature();
-        }
-        function isTypeMemberWithLiteralPropertyName() {
-            nextToken();
-            return token === 17 ||
-                token === 25 ||
-                token === 53 ||
-                token === 54 ||
-                canParseSemicolon();
+            if (token === 19) {
+                return true;
+            }
+            if (isLiteralPropertyName()) {
+                idToken = token;
+                nextToken();
+            }
+            if (idToken) {
+                return token === 17 ||
+                    token === 25 ||
+                    token === 53 ||
+                    token === 54 ||
+                    canParseSemicolon();
+            }
+            return false;
         }
         function parseTypeMember() {
-            switch (token) {
-                case 17:
-                case 25:
-                    return parseSignatureMember(148);
-                case 19:
-                    return isIndexSignature()
-                        ? parseIndexSignatureDeclaration(scanner.getStartPos(), undefined, undefined)
-                        : parsePropertyOrMethodSignature();
-                case 92:
-                    if (lookAhead(isStartOfConstructSignature)) {
-                        return parseSignatureMember(149);
-                    }
-                case 9:
-                case 8:
-                    return parsePropertyOrMethodSignature();
-                default:
-                    if (ts.isModifierKind(token)) {
-                        var result = tryParse(parseIndexSignatureWithModifiers);
-                        if (result) {
-                            return result;
-                        }
-                    }
-                    if (ts.tokenIsIdentifierOrKeyword(token)) {
-                        return parsePropertyOrMethodSignature();
-                    }
+            if (token === 17 || token === 25) {
+                return parseSignatureMember(150);
             }
-        }
-        function parseIndexSignatureWithModifiers() {
-            var fullStart = scanner.getStartPos();
-            var decorators = parseDecorators();
+            if (token === 92 && lookAhead(isStartOfConstructSignature)) {
+                return parseSignatureMember(151);
+            }
+            var fullStart = getNodePos();
             var modifiers = parseModifiers();
-            return isIndexSignature()
-                ? parseIndexSignatureDeclaration(fullStart, decorators, modifiers)
-                : undefined;
+            if (isIndexSignature()) {
+                return parseIndexSignatureDeclaration(fullStart, undefined, modifiers);
+            }
+            return parsePropertyOrMethodSignature(fullStart, modifiers);
         }
         function isStartOfConstructSignature() {
             nextToken();
             return token === 17 || token === 25;
         }
         function parseTypeLiteral() {
-            var node = createNode(156);
+            var node = createNode(158);
             node.members = parseObjectTypeMembers();
             return finishNode(node);
         }
@@ -7158,12 +7556,12 @@ var ts;
             return members;
         }
         function parseTupleType() {
-            var node = createNode(158);
+            var node = createNode(160);
             node.elementTypes = parseBracketedList(19, parseType, 19, 20);
             return finishNode(node);
         }
         function parseParenthesizedType() {
-            var node = createNode(161);
+            var node = createNode(163);
             parseExpected(17);
             node.type = parseType();
             parseExpected(18);
@@ -7171,7 +7569,7 @@ var ts;
         }
         function parseFunctionOrConstructorType(kind) {
             var node = createNode(kind);
-            if (kind === 154) {
+            if (kind === 156) {
                 parseExpected(92);
             }
             fillSignature(34, false, false, false, node);
@@ -7184,20 +7582,22 @@ var ts;
         function parseNonArrayType() {
             switch (token) {
                 case 117:
-                case 130:
-                case 128:
-                case 120:
                 case 131:
+                case 129:
+                case 120:
+                case 132:
+                case 134:
                     var node = tryParse(parseKeywordAndNoDot);
                     return node || parseTypeReference();
                 case 9:
                     return parseStringLiteralTypeNode();
                 case 103:
+                case 93:
                     return parseTokenNode();
                 case 97: {
                     var thisKeyword = parseThisTypeNode();
                     if (token === 124 && !scanner.hasPrecedingLineBreak()) {
-                        return parseTypePredicate(thisKeyword);
+                        return parseThisTypePredicate(thisKeyword);
                     }
                     else {
                         return thisKeyword;
@@ -7218,11 +7618,13 @@ var ts;
         function isStartOfType() {
             switch (token) {
                 case 117:
-                case 130:
-                case 128:
-                case 120:
                 case 131:
+                case 129:
+                case 120:
+                case 132:
                 case 103:
+                case 134:
+                case 93:
                 case 97:
                 case 101:
                 case 15:
@@ -7245,7 +7647,7 @@ var ts;
             var type = parseNonArrayType();
             while (!scanner.hasPrecedingLineBreak() && parseOptional(19)) {
                 parseExpected(20);
-                var node = createNode(157, type.pos);
+                var node = createNode(159, type.pos);
                 node.elementType = type;
                 type = finishNode(node);
             }
@@ -7267,10 +7669,10 @@ var ts;
             return type;
         }
         function parseIntersectionTypeOrHigher() {
-            return parseUnionOrIntersectionType(160, parseArrayTypeOrHigher, 46);
+            return parseUnionOrIntersectionType(162, parseArrayTypeOrHigher, 46);
         }
         function parseUnionTypeOrHigher() {
-            return parseUnionOrIntersectionType(159, parseIntersectionTypeOrHigher, 47);
+            return parseUnionOrIntersectionType(161, parseIntersectionTypeOrHigher, 47);
         }
         function isStartOfFunctionType() {
             if (token === 25) {
@@ -7278,16 +7680,29 @@ var ts;
             }
             return token === 17 && lookAhead(isUnambiguouslyStartOfFunctionType);
         }
+        function skipParameterStart() {
+            if (ts.isModifierKind(token)) {
+                parseModifiers();
+            }
+            if (isIdentifier() || token === 97) {
+                nextToken();
+                return true;
+            }
+            if (token === 19 || token === 15) {
+                var previousErrorCount = parseDiagnostics.length;
+                parseIdentifierOrPattern();
+                return previousErrorCount === parseDiagnostics.length;
+            }
+            return false;
+        }
         function isUnambiguouslyStartOfFunctionType() {
             nextToken();
             if (token === 18 || token === 22) {
                 return true;
             }
-            if (isIdentifier() || ts.isModifierKind(token)) {
-                nextToken();
+            if (skipParameterStart()) {
                 if (token === 54 || token === 24 ||
-                    token === 53 || token === 56 ||
-                    isIdentifier() || ts.isModifierKind(token)) {
+                    token === 53 || token === 56) {
                     return true;
                 }
                 if (token === 18) {
@@ -7303,7 +7718,7 @@ var ts;
             var typePredicateVariable = isIdentifier() && tryParse(parseTypePredicatePrefix);
             var type = parseType();
             if (typePredicateVariable) {
-                var node = createNode(151, typePredicateVariable.pos);
+                var node = createNode(153, typePredicateVariable.pos);
                 node.parameterName = typePredicateVariable;
                 node.type = type;
                 return finishNode(node);
@@ -7320,14 +7735,14 @@ var ts;
             }
         }
         function parseType() {
-            return doOutsideOfContext(10, parseTypeWorker);
+            return doOutsideOfContext(41943040, parseTypeWorker);
         }
         function parseTypeWorker() {
             if (isStartOfFunctionType()) {
-                return parseFunctionOrConstructorType(153);
+                return parseFunctionOrConstructorType(155);
             }
             if (token === 92) {
-                return parseFunctionOrConstructorType(154);
+                return parseFunctionOrConstructorType(156);
             }
             return parseUnionTypeOrHigher();
         }
@@ -7446,7 +7861,7 @@ var ts;
             return !scanner.hasPrecedingLineBreak() && isIdentifier();
         }
         function parseYieldExpression() {
-            var node = createNode(187);
+            var node = createNode(189);
             nextToken();
             if (!scanner.hasPrecedingLineBreak() &&
                 (token === 37 || isStartOfExpression())) {
@@ -7460,8 +7875,8 @@ var ts;
         }
         function parseSimpleArrowFunctionExpression(identifier) {
             ts.Debug.assert(token === 34, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
-            var node = createNode(177, identifier.pos);
-            var parameter = createNode(139, identifier.pos);
+            var node = createNode(179, identifier.pos);
+            var parameter = createNode(141, identifier.pos);
             parameter.name = identifier;
             finishNode(parameter);
             node.parameters = [parameter];
@@ -7572,7 +7987,7 @@ var ts;
             return parseParenthesizedArrowFunctionExpressionHead(false);
         }
         function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity) {
-            var node = createNode(177);
+            var node = createNode(179);
             setModifiers(node, parseModifiersForArrowFunction());
             var isAsync = !!(node.flags & 256);
             fillSignature(54, false, isAsync, !allowAmbiguity, node);
@@ -7604,7 +8019,7 @@ var ts;
             if (!questionToken) {
                 return leftOperand;
             }
-            var node = createNode(185, leftOperand.pos);
+            var node = createNode(187, leftOperand.pos);
             node.condition = leftOperand;
             node.questionToken = questionToken;
             node.whenTrue = doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher);
@@ -7617,7 +8032,7 @@ var ts;
             return parseBinaryExpressionRest(precedence, leftOperand);
         }
         function isInOrOfKeyword(t) {
-            return t === 90 || t === 135;
+            return t === 90 || t === 137;
         }
         function parseBinaryExpressionRest(precedence, leftOperand) {
             while (true) {
@@ -7695,39 +8110,39 @@ var ts;
             return -1;
         }
         function makeBinaryExpression(left, operatorToken, right) {
-            var node = createNode(184, left.pos);
+            var node = createNode(186, left.pos);
             node.left = left;
             node.operatorToken = operatorToken;
             node.right = right;
             return finishNode(node);
         }
         function makeAsExpression(left, right) {
-            var node = createNode(192, left.pos);
+            var node = createNode(194, left.pos);
             node.expression = left;
             node.type = right;
             return finishNode(node);
         }
         function parsePrefixUnaryExpression() {
-            var node = createNode(182);
+            var node = createNode(184);
             node.operator = token;
             nextToken();
             node.operand = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseDeleteExpression() {
-            var node = createNode(178);
+            var node = createNode(180);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseTypeOfExpression() {
-            var node = createNode(179);
+            var node = createNode(181);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseVoidExpression() {
-            var node = createNode(180);
+            var node = createNode(182);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -7742,7 +8157,7 @@ var ts;
             return false;
         }
         function parseAwaitExpression() {
-            var node = createNode(181);
+            var node = createNode(183);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -7761,7 +8176,7 @@ var ts;
             var simpleUnaryExpression = parseSimpleUnaryExpression();
             if (token === 38) {
                 var start = ts.skipTrivia(sourceText, simpleUnaryExpression.pos);
-                if (simpleUnaryExpression.kind === 174) {
+                if (simpleUnaryExpression.kind === 176) {
                     parseErrorAtPosition(start, simpleUnaryExpression.end - start, ts.Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses);
                 }
                 else {
@@ -7809,7 +8224,7 @@ var ts;
         }
         function parseIncrementExpression() {
             if (token === 41 || token === 42) {
-                var node = createNode(182);
+                var node = createNode(184);
                 node.operator = token;
                 nextToken();
                 node.operand = parseLeftHandSideExpressionOrHigher();
@@ -7821,7 +8236,7 @@ var ts;
             var expression = parseLeftHandSideExpressionOrHigher();
             ts.Debug.assert(ts.isLeftHandSideExpression(expression));
             if ((token === 41 || token === 42) && !scanner.hasPrecedingLineBreak()) {
-                var node = createNode(183, expression.pos);
+                var node = createNode(185, expression.pos);
                 node.operand = expression;
                 node.operator = token;
                 nextToken();
@@ -7844,7 +8259,7 @@ var ts;
             if (token === 17 || token === 21 || token === 19) {
                 return expression;
             }
-            var node = createNode(169, expression.pos);
+            var node = createNode(171, expression.pos);
             node.expression = expression;
             node.dotToken = parseExpectedToken(21, false, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access);
             node.name = parseRightSideOfDot(true);
@@ -7863,8 +8278,8 @@ var ts;
         function parseJsxElementOrSelfClosingElement(inExpressionContext) {
             var opening = parseJsxOpeningOrSelfClosingElement(inExpressionContext);
             var result;
-            if (opening.kind === 238) {
-                var node = createNode(236, opening.pos);
+            if (opening.kind === 242) {
+                var node = createNode(240, opening.pos);
                 node.openingElement = opening;
                 node.children = parseJsxChildren(node.openingElement.tagName);
                 node.closingElement = parseJsxClosingElement(inExpressionContext);
@@ -7874,14 +8289,14 @@ var ts;
                 result = finishNode(node);
             }
             else {
-                ts.Debug.assert(opening.kind === 237);
+                ts.Debug.assert(opening.kind === 241);
                 result = opening;
             }
             if (inExpressionContext && token === 25) {
                 var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElement(true); });
                 if (invalidElement) {
                     parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element);
-                    var badNode = createNode(184, result.pos);
+                    var badNode = createNode(186, result.pos);
                     badNode.end = invalidElement.end;
                     badNode.left = result;
                     badNode.right = invalidElement;
@@ -7893,13 +8308,13 @@ var ts;
             return result;
         }
         function parseJsxText() {
-            var node = createNode(239, scanner.getStartPos());
+            var node = createNode(243, scanner.getStartPos());
             token = scanner.scanJsxToken();
             return finishNode(node);
         }
         function parseJsxChild() {
             switch (token) {
-                case 239:
+                case 243:
                     return parseJsxText();
                 case 15:
                     return parseJsxExpression(false);
@@ -7935,7 +8350,7 @@ var ts;
             var attributes = parseList(13, parseJsxAttribute);
             var node;
             if (token === 27) {
-                node = createNode(238, fullStart);
+                node = createNode(242, fullStart);
                 scanJsxText();
             }
             else {
@@ -7947,7 +8362,7 @@ var ts;
                     parseExpected(27, undefined, false);
                     scanJsxText();
                 }
-                node = createNode(237, fullStart);
+                node = createNode(241, fullStart);
             }
             node.tagName = tagName;
             node.attributes = attributes;
@@ -7958,7 +8373,7 @@ var ts;
             var elementName = parseIdentifierName();
             while (parseOptional(21)) {
                 scanJsxIdentifier();
-                var node = createNode(136, elementName.pos);
+                var node = createNode(138, elementName.pos);
                 node.left = elementName;
                 node.right = parseIdentifierName();
                 elementName = finishNode(node);
@@ -7966,7 +8381,7 @@ var ts;
             return elementName;
         }
         function parseJsxExpression(inExpressionContext) {
-            var node = createNode(243);
+            var node = createNode(247);
             parseExpected(15);
             if (token !== 16) {
                 node.expression = parseAssignmentExpressionOrHigher();
@@ -7985,7 +8400,7 @@ var ts;
                 return parseJsxSpreadAttribute();
             }
             scanJsxIdentifier();
-            var node = createNode(241);
+            var node = createNode(245);
             node.name = parseIdentifierName();
             if (parseOptional(56)) {
                 switch (token) {
@@ -8000,7 +8415,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxSpreadAttribute() {
-            var node = createNode(242);
+            var node = createNode(246);
             parseExpected(15);
             parseExpected(22);
             node.expression = parseExpression();
@@ -8008,7 +8423,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxClosingElement(inExpressionContext) {
-            var node = createNode(240);
+            var node = createNode(244);
             parseExpected(26);
             node.tagName = parseJsxElementName();
             if (inExpressionContext) {
@@ -8021,7 +8436,7 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAssertion() {
-            var node = createNode(174);
+            var node = createNode(176);
             parseExpected(25);
             node.type = parseType();
             parseExpected(27);
@@ -8032,15 +8447,22 @@ var ts;
             while (true) {
                 var dotToken = parseOptionalToken(21);
                 if (dotToken) {
-                    var propertyAccess = createNode(169, expression.pos);
+                    var propertyAccess = createNode(171, expression.pos);
                     propertyAccess.expression = expression;
                     propertyAccess.dotToken = dotToken;
                     propertyAccess.name = parseRightSideOfDot(true);
                     expression = finishNode(propertyAccess);
                     continue;
                 }
+                if (token === 49 && !scanner.hasPrecedingLineBreak()) {
+                    nextToken();
+                    var nonNullExpression = createNode(195, expression.pos);
+                    nonNullExpression.expression = expression;
+                    expression = finishNode(nonNullExpression);
+                    continue;
+                }
                 if (!inDecoratorContext() && parseOptional(19)) {
-                    var indexedAccess = createNode(170, expression.pos);
+                    var indexedAccess = createNode(172, expression.pos);
                     indexedAccess.expression = expression;
                     if (token !== 20) {
                         indexedAccess.argumentExpression = allowInAnd(parseExpression);
@@ -8054,7 +8476,7 @@ var ts;
                     continue;
                 }
                 if (token === 11 || token === 12) {
-                    var tagExpression = createNode(173, expression.pos);
+                    var tagExpression = createNode(175, expression.pos);
                     tagExpression.tag = expression;
                     tagExpression.template = token === 11
                         ? parseLiteralNode()
@@ -8073,7 +8495,7 @@ var ts;
                     if (!typeArguments) {
                         return expression;
                     }
-                    var callExpr = createNode(171, expression.pos);
+                    var callExpr = createNode(173, expression.pos);
                     callExpr.expression = expression;
                     callExpr.typeArguments = typeArguments;
                     callExpr.arguments = parseArgumentList();
@@ -8081,7 +8503,7 @@ var ts;
                     continue;
                 }
                 else if (token === 17) {
-                    var callExpr = createNode(171, expression.pos);
+                    var callExpr = createNode(173, expression.pos);
                     callExpr.expression = expression;
                     callExpr.arguments = parseArgumentList();
                     expression = finishNode(callExpr);
@@ -8176,41 +8598,42 @@ var ts;
             return parseIdentifier(ts.Diagnostics.Expression_expected);
         }
         function parseParenthesizedExpression() {
-            var node = createNode(175);
+            var node = createNode(177);
             parseExpected(17);
             node.expression = allowInAnd(parseExpression);
             parseExpected(18);
             return finishNode(node);
         }
         function parseSpreadElement() {
-            var node = createNode(188);
+            var node = createNode(190);
             parseExpected(22);
             node.expression = parseAssignmentExpressionOrHigher();
             return finishNode(node);
         }
         function parseArgumentOrArrayLiteralElement() {
             return token === 22 ? parseSpreadElement() :
-                token === 24 ? createNode(190) :
+                token === 24 ? createNode(192) :
                     parseAssignmentExpressionOrHigher();
         }
         function parseArgumentExpression() {
             return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement);
         }
         function parseArrayLiteralExpression() {
-            var node = createNode(167);
+            var node = createNode(169);
             parseExpected(19);
-            if (scanner.hasPrecedingLineBreak())
-                node.flags |= 1024;
+            if (scanner.hasPrecedingLineBreak()) {
+                node.multiLine = true;
+            }
             node.elements = parseDelimitedList(15, parseArgumentOrArrayLiteralElement);
             parseExpected(20);
             return finishNode(node);
         }
         function tryParseAccessorDeclaration(fullStart, decorators, modifiers) {
             if (parseContextualModifier(123)) {
-                return parseAccessorDeclaration(146, fullStart, decorators, modifiers);
+                return addJSDocComment(parseAccessorDeclaration(148, fullStart, decorators, modifiers));
             }
-            else if (parseContextualModifier(129)) {
-                return parseAccessorDeclaration(147, fullStart, decorators, modifiers);
+            else if (parseContextualModifier(130)) {
+                return parseAccessorDeclaration(149, fullStart, decorators, modifiers);
             }
             return undefined;
         }
@@ -8231,7 +8654,7 @@ var ts;
             }
             var isShorthandPropertyAssignment = tokenIsIdentifier && (token === 24 || token === 16 || token === 56);
             if (isShorthandPropertyAssignment) {
-                var shorthandDeclaration = createNode(249, fullStart);
+                var shorthandDeclaration = createNode(253, fullStart);
                 shorthandDeclaration.name = propertyName;
                 shorthandDeclaration.questionToken = questionToken;
                 var equalsToken = parseOptionalToken(56);
@@ -8239,23 +8662,23 @@ var ts;
                     shorthandDeclaration.equalsToken = equalsToken;
                     shorthandDeclaration.objectAssignmentInitializer = allowInAnd(parseAssignmentExpressionOrHigher);
                 }
-                return finishNode(shorthandDeclaration);
+                return addJSDocComment(finishNode(shorthandDeclaration));
             }
             else {
-                var propertyAssignment = createNode(248, fullStart);
+                var propertyAssignment = createNode(252, fullStart);
                 propertyAssignment.modifiers = modifiers;
                 propertyAssignment.name = propertyName;
                 propertyAssignment.questionToken = questionToken;
                 parseExpected(54);
                 propertyAssignment.initializer = allowInAnd(parseAssignmentExpressionOrHigher);
-                return finishNode(propertyAssignment);
+                return addJSDocComment(finishNode(propertyAssignment));
             }
         }
         function parseObjectLiteralExpression() {
-            var node = createNode(168);
+            var node = createNode(170);
             parseExpected(15);
             if (scanner.hasPrecedingLineBreak()) {
-                node.flags |= 1024;
+                node.multiLine = true;
             }
             node.properties = parseDelimitedList(12, parseObjectLiteralElement, true);
             parseExpected(16);
@@ -8266,7 +8689,7 @@ var ts;
             if (saveDecoratorContext) {
                 setDecoratorContext(false);
             }
-            var node = createNode(176);
+            var node = createNode(178);
             setModifiers(node, parseModifiers());
             parseExpected(87);
             node.asteriskToken = parseOptionalToken(37);
@@ -8282,13 +8705,13 @@ var ts;
             if (saveDecoratorContext) {
                 setDecoratorContext(true);
             }
-            return finishNode(node);
+            return addJSDocComment(finishNode(node));
         }
         function parseOptionalIdentifier() {
             return isIdentifier() ? parseIdentifier() : undefined;
         }
         function parseNewExpression() {
-            var node = createNode(172);
+            var node = createNode(174);
             parseExpected(92);
             node.expression = parseMemberExpressionOrHigher();
             node.typeArguments = tryParse(parseTypeArgumentsInExpression);
@@ -8298,7 +8721,7 @@ var ts;
             return finishNode(node);
         }
         function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) {
-            var node = createNode(195);
+            var node = createNode(198);
             if (parseExpected(15, diagnosticMessage) || ignoreMissingOpenBrace) {
                 node.statements = parseList(1, parseStatement);
                 parseExpected(16);
@@ -8326,12 +8749,12 @@ var ts;
             return block;
         }
         function parseEmptyStatement() {
-            var node = createNode(197);
+            var node = createNode(200);
             parseExpected(23);
             return finishNode(node);
         }
         function parseIfStatement() {
-            var node = createNode(199);
+            var node = createNode(202);
             parseExpected(88);
             parseExpected(17);
             node.expression = allowInAnd(parseExpression);
@@ -8341,7 +8764,7 @@ var ts;
             return finishNode(node);
         }
         function parseDoStatement() {
-            var node = createNode(200);
+            var node = createNode(203);
             parseExpected(79);
             node.statement = parseStatement();
             parseExpected(104);
@@ -8352,7 +8775,7 @@ var ts;
             return finishNode(node);
         }
         function parseWhileStatement() {
-            var node = createNode(201);
+            var node = createNode(204);
             parseExpected(104);
             parseExpected(17);
             node.expression = allowInAnd(parseExpression);
@@ -8375,21 +8798,21 @@ var ts;
             }
             var forOrForInOrForOfStatement;
             if (parseOptional(90)) {
-                var forInStatement = createNode(203, pos);
+                var forInStatement = createNode(206, pos);
                 forInStatement.initializer = initializer;
                 forInStatement.expression = allowInAnd(parseExpression);
                 parseExpected(18);
                 forOrForInOrForOfStatement = forInStatement;
             }
-            else if (parseOptional(135)) {
-                var forOfStatement = createNode(204, pos);
+            else if (parseOptional(137)) {
+                var forOfStatement = createNode(207, pos);
                 forOfStatement.initializer = initializer;
                 forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher);
                 parseExpected(18);
                 forOrForInOrForOfStatement = forOfStatement;
             }
             else {
-                var forStatement = createNode(202, pos);
+                var forStatement = createNode(205, pos);
                 forStatement.initializer = initializer;
                 parseExpected(23);
                 if (token !== 23 && token !== 18) {
@@ -8407,7 +8830,7 @@ var ts;
         }
         function parseBreakOrContinueStatement(kind) {
             var node = createNode(kind);
-            parseExpected(kind === 206 ? 70 : 75);
+            parseExpected(kind === 209 ? 70 : 75);
             if (!canParseSemicolon()) {
                 node.label = parseIdentifier();
             }
@@ -8415,7 +8838,7 @@ var ts;
             return finishNode(node);
         }
         function parseReturnStatement() {
-            var node = createNode(207);
+            var node = createNode(210);
             parseExpected(94);
             if (!canParseSemicolon()) {
                 node.expression = allowInAnd(parseExpression);
@@ -8424,7 +8847,7 @@ var ts;
             return finishNode(node);
         }
         function parseWithStatement() {
-            var node = createNode(208);
+            var node = createNode(211);
             parseExpected(105);
             parseExpected(17);
             node.expression = allowInAnd(parseExpression);
@@ -8433,7 +8856,7 @@ var ts;
             return finishNode(node);
         }
         function parseCaseClause() {
-            var node = createNode(244);
+            var node = createNode(248);
             parseExpected(71);
             node.expression = allowInAnd(parseExpression);
             parseExpected(54);
@@ -8441,7 +8864,7 @@ var ts;
             return finishNode(node);
         }
         function parseDefaultClause() {
-            var node = createNode(245);
+            var node = createNode(249);
             parseExpected(77);
             parseExpected(54);
             node.statements = parseList(3, parseStatement);
@@ -8451,12 +8874,12 @@ var ts;
             return token === 71 ? parseCaseClause() : parseDefaultClause();
         }
         function parseSwitchStatement() {
-            var node = createNode(209);
+            var node = createNode(212);
             parseExpected(96);
             parseExpected(17);
             node.expression = allowInAnd(parseExpression);
             parseExpected(18);
-            var caseBlock = createNode(223, scanner.getStartPos());
+            var caseBlock = createNode(226, scanner.getStartPos());
             parseExpected(15);
             caseBlock.clauses = parseList(2, parseCaseOrDefaultClause);
             parseExpected(16);
@@ -8464,14 +8887,14 @@ var ts;
             return finishNode(node);
         }
         function parseThrowStatement() {
-            var node = createNode(211);
+            var node = createNode(214);
             parseExpected(98);
             node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression);
             parseSemicolon();
             return finishNode(node);
         }
         function parseTryStatement() {
-            var node = createNode(212);
+            var node = createNode(215);
             parseExpected(100);
             node.tryBlock = parseBlock(false);
             node.catchClause = token === 72 ? parseCatchClause() : undefined;
@@ -8482,7 +8905,7 @@ var ts;
             return finishNode(node);
         }
         function parseCatchClause() {
-            var result = createNode(247);
+            var result = createNode(251);
             parseExpected(72);
             if (parseExpected(17)) {
                 result.variableDeclaration = parseVariableDeclaration();
@@ -8492,7 +8915,7 @@ var ts;
             return finishNode(result);
         }
         function parseDebuggerStatement() {
-            var node = createNode(213);
+            var node = createNode(216);
             parseExpected(76);
             parseSemicolon();
             return finishNode(node);
@@ -8501,16 +8924,16 @@ var ts;
             var fullStart = scanner.getStartPos();
             var expression = allowInAnd(parseExpression);
             if (expression.kind === 69 && parseOptional(54)) {
-                var labeledStatement = createNode(210, fullStart);
+                var labeledStatement = createNode(213, fullStart);
                 labeledStatement.label = expression;
                 labeledStatement.statement = parseStatement();
-                return finishNode(labeledStatement);
+                return addJSDocComment(finishNode(labeledStatement));
             }
             else {
-                var expressionStatement = createNode(198, fullStart);
+                var expressionStatement = createNode(201, fullStart);
                 expressionStatement.expression = expression;
                 parseSemicolon();
-                return finishNode(expressionStatement);
+                return addJSDocComment(finishNode(expressionStatement));
             }
         }
         function nextTokenIsIdentifierOrKeywordOnSameLine() {
@@ -8536,7 +8959,7 @@ var ts;
                     case 81:
                         return true;
                     case 107:
-                    case 132:
+                    case 133:
                         return nextTokenIsIdentifierOnSameLine();
                     case 125:
                     case 126:
@@ -8547,13 +8970,15 @@ var ts;
                     case 110:
                     case 111:
                     case 112:
+                    case 127:
                         nextToken();
                         if (scanner.hasPrecedingLineBreak()) {
                             return false;
                         }
                         continue;
-                    case 134:
-                        return nextToken() === 15;
+                    case 136:
+                        nextToken();
+                        return token === 15 || token === 69 || token === 82;
                     case 89:
                         nextToken();
                         return token === 9 || token === 37 ||
@@ -8561,7 +8986,8 @@ var ts;
                     case 82:
                         nextToken();
                         if (token === 56 || token === 37 ||
-                            token === 15 || token === 77) {
+                            token === 15 || token === 77 ||
+                            token === 116) {
                             return true;
                         }
                         continue;
@@ -8610,13 +9036,14 @@ var ts;
                 case 107:
                 case 125:
                 case 126:
-                case 132:
-                case 134:
+                case 133:
+                case 136:
                     return true;
                 case 112:
                 case 110:
                 case 111:
                 case 113:
+                case 127:
                     return isStartOfDeclaration() || !lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine);
                 default:
                     return isStartOfExpression();
@@ -8655,9 +9082,9 @@ var ts;
                 case 86:
                     return parseForOrForInOrForOfStatement();
                 case 75:
-                    return parseBreakOrContinueStatement(205);
+                    return parseBreakOrContinueStatement(208);
                 case 70:
-                    return parseBreakOrContinueStatement(206);
+                    return parseBreakOrContinueStatement(209);
                 case 94:
                     return parseReturnStatement();
                 case 105:
@@ -8676,7 +9103,7 @@ var ts;
                     return parseDeclaration();
                 case 118:
                 case 107:
-                case 132:
+                case 133:
                 case 125:
                 case 126:
                 case 122:
@@ -8689,7 +9116,8 @@ var ts;
                 case 112:
                 case 115:
                 case 113:
-                case 134:
+                case 127:
+                case 136:
                     if (isStartOfDeclaration()) {
                         return parseDeclaration();
                     }
@@ -8712,11 +9140,11 @@ var ts;
                     return parseClassDeclaration(fullStart, decorators, modifiers);
                 case 107:
                     return parseInterfaceDeclaration(fullStart, decorators, modifiers);
-                case 132:
+                case 133:
                     return parseTypeAliasDeclaration(fullStart, decorators, modifiers);
                 case 81:
                     return parseEnumDeclaration(fullStart, decorators, modifiers);
-                case 134:
+                case 136:
                 case 125:
                 case 126:
                     return parseModuleDeclaration(fullStart, decorators, modifiers);
@@ -8724,12 +9152,18 @@ var ts;
                     return parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers);
                 case 82:
                     nextToken();
-                    return token === 77 || token === 56 ?
-                        parseExportAssignment(fullStart, decorators, modifiers) :
-                        parseExportDeclaration(fullStart, decorators, modifiers);
+                    switch (token) {
+                        case 77:
+                        case 56:
+                            return parseExportAssignment(fullStart, decorators, modifiers);
+                        case 116:
+                            return parseGlobalModuleExportDeclaration(fullStart, decorators, modifiers);
+                        default:
+                            return parseExportDeclaration(fullStart, decorators, modifiers);
+                    }
                 default:
                     if (decorators || modifiers) {
-                        var node = createMissingNode(234, true, ts.Diagnostics.Declaration_expected);
+                        var node = createMissingNode(238, true, ts.Diagnostics.Declaration_expected);
                         node.pos = fullStart;
                         node.decorators = decorators;
                         setModifiers(node, modifiers);
@@ -8750,16 +9184,16 @@ var ts;
         }
         function parseArrayBindingElement() {
             if (token === 24) {
-                return createNode(190);
+                return createNode(192);
             }
-            var node = createNode(166);
+            var node = createNode(168);
             node.dotDotDotToken = parseOptionalToken(22);
             node.name = parseIdentifierOrPattern();
             node.initializer = parseBindingElementInitializer(false);
             return finishNode(node);
         }
         function parseObjectBindingElement() {
-            var node = createNode(166);
+            var node = createNode(168);
             var tokenIsIdentifier = isIdentifier();
             var propertyName = parsePropertyName();
             if (tokenIsIdentifier && token !== 54) {
@@ -8774,14 +9208,14 @@ var ts;
             return finishNode(node);
         }
         function parseObjectBindingPattern() {
-            var node = createNode(164);
+            var node = createNode(166);
             parseExpected(15);
             node.elements = parseDelimitedList(9, parseObjectBindingElement);
             parseExpected(16);
             return finishNode(node);
         }
         function parseArrayBindingPattern() {
-            var node = createNode(165);
+            var node = createNode(167);
             parseExpected(19);
             node.elements = parseDelimitedList(10, parseArrayBindingElement);
             parseExpected(20);
@@ -8800,7 +9234,7 @@ var ts;
             return parseIdentifier();
         }
         function parseVariableDeclaration() {
-            var node = createNode(214);
+            var node = createNode(217);
             node.name = parseIdentifierOrPattern();
             node.type = parseTypeAnnotation();
             if (!isInOrOfKeyword(token)) {
@@ -8809,21 +9243,21 @@ var ts;
             return finishNode(node);
         }
         function parseVariableDeclarationList(inForStatementInitializer) {
-            var node = createNode(215);
+            var node = createNode(218);
             switch (token) {
                 case 102:
                     break;
                 case 108:
-                    node.flags |= 8192;
+                    node.flags |= 1024;
                     break;
                 case 74:
-                    node.flags |= 16384;
+                    node.flags |= 2048;
                     break;
                 default:
                     ts.Debug.fail();
             }
             nextToken();
-            if (token === 135 && lookAhead(canFollowContextualOfKeyword)) {
+            if (token === 137 && lookAhead(canFollowContextualOfKeyword)) {
                 node.declarations = createMissingList();
             }
             else {
@@ -8838,15 +9272,15 @@ var ts;
             return nextTokenIsIdentifier() && nextToken() === 18;
         }
         function parseVariableStatement(fullStart, decorators, modifiers) {
-            var node = createNode(196, fullStart);
+            var node = createNode(199, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             node.declarationList = parseVariableDeclarationList(false);
             parseSemicolon();
-            return finishNode(node);
+            return addJSDocComment(finishNode(node));
         }
         function parseFunctionDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(216, fullStart);
+            var node = createNode(219, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(87);
@@ -8856,19 +9290,19 @@ var ts;
             var isAsync = !!(node.flags & 256);
             fillSignature(54, isGenerator, isAsync, false, node);
             node.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, ts.Diagnostics.or_expected);
-            return finishNode(node);
+            return addJSDocComment(finishNode(node));
         }
         function parseConstructorDeclaration(pos, decorators, modifiers) {
-            var node = createNode(145, pos);
+            var node = createNode(147, pos);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(121);
             fillSignature(54, false, false, false, node);
             node.body = parseFunctionBlockOrSemicolon(false, false, ts.Diagnostics.or_expected);
-            return finishNode(node);
+            return addJSDocComment(finishNode(node));
         }
         function parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, name, questionToken, diagnosticMessage) {
-            var method = createNode(144, fullStart);
+            var method = createNode(146, fullStart);
             method.decorators = decorators;
             setModifiers(method, modifiers);
             method.asteriskToken = asteriskToken;
@@ -8878,18 +9312,18 @@ var ts;
             var isAsync = !!(method.flags & 256);
             fillSignature(54, isGenerator, isAsync, false, method);
             method.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, diagnosticMessage);
-            return finishNode(method);
+            return addJSDocComment(finishNode(method));
         }
         function parsePropertyDeclaration(fullStart, decorators, modifiers, name, questionToken) {
-            var property = createNode(142, fullStart);
+            var property = createNode(144, fullStart);
             property.decorators = decorators;
             setModifiers(property, modifiers);
             property.name = name;
             property.questionToken = questionToken;
             property.type = parseTypeAnnotation();
-            property.initializer = modifiers && modifiers.flags & 64
+            property.initializer = modifiers && modifiers.flags & 32
                 ? allowInAnd(parseNonParameterInitializer)
-                : doOutsideOfContext(2 | 1, parseNonParameterInitializer);
+                : doOutsideOfContext(8388608 | 4194304, parseNonParameterInitializer);
             parseSemicolon();
             return finishNode(property);
         }
@@ -8922,6 +9356,7 @@ var ts;
                 case 110:
                 case 111:
                 case 113:
+                case 127:
                     return true;
                 default:
                     return false;
@@ -8950,7 +9385,7 @@ var ts;
                 return true;
             }
             if (idToken !== undefined) {
-                if (!ts.isKeyword(idToken) || idToken === 129 || idToken === 123) {
+                if (!ts.isKeyword(idToken) || idToken === 130 || idToken === 123) {
                     return true;
                 }
                 switch (token) {
@@ -8977,7 +9412,7 @@ var ts;
                     decorators = [];
                     decorators.pos = decoratorStart;
                 }
-                var decorator = createNode(140, decoratorStart);
+                var decorator = createNode(142, decoratorStart);
                 decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher);
                 decorators.push(finishNode(decorator));
             }
@@ -9033,7 +9468,7 @@ var ts;
         }
         function parseClassElement() {
             if (token === 23) {
-                var result = createNode(194);
+                var result = createNode(197);
                 nextToken();
                 return finishNode(result);
             }
@@ -9064,10 +9499,10 @@ var ts;
             ts.Debug.fail("Should not have attempted to parse class member declaration.");
         }
         function parseClassExpression() {
-            return parseClassDeclarationOrExpression(scanner.getStartPos(), undefined, undefined, 189);
+            return parseClassDeclarationOrExpression(scanner.getStartPos(), undefined, undefined, 191);
         }
         function parseClassDeclaration(fullStart, decorators, modifiers) {
-            return parseClassDeclarationOrExpression(fullStart, decorators, modifiers, 217);
+            return parseClassDeclarationOrExpression(fullStart, decorators, modifiers, 220);
         }
         function parseClassDeclarationOrExpression(fullStart, decorators, modifiers, kind) {
             var node = createNode(kind, fullStart);
@@ -9102,7 +9537,7 @@ var ts;
         }
         function parseHeritageClause() {
             if (token === 83 || token === 106) {
-                var node = createNode(246);
+                var node = createNode(250);
                 node.token = token;
                 nextToken();
                 node.types = parseDelimitedList(7, parseExpressionWithTypeArguments);
@@ -9111,7 +9546,7 @@ var ts;
             return undefined;
         }
         function parseExpressionWithTypeArguments() {
-            var node = createNode(191);
+            var node = createNode(193);
             node.expression = parseLeftHandSideExpressionOrHigher();
             if (token === 25) {
                 node.typeArguments = parseBracketedList(18, parseType, 25, 27);
@@ -9125,7 +9560,7 @@ var ts;
             return parseList(5, parseClassElement);
         }
         function parseInterfaceDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(218, fullStart);
+            var node = createNode(221, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(107);
@@ -9136,10 +9571,10 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAliasDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(219, fullStart);
+            var node = createNode(222, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
-            parseExpected(132);
+            parseExpected(133);
             node.name = parseIdentifier();
             node.typeParameters = parseTypeParameters();
             parseExpected(56);
@@ -9148,13 +9583,13 @@ var ts;
             return finishNode(node);
         }
         function parseEnumMember() {
-            var node = createNode(250, scanner.getStartPos());
+            var node = createNode(254, scanner.getStartPos());
             node.name = parsePropertyName();
             node.initializer = allowInAnd(parseNonParameterInitializer);
             return finishNode(node);
         }
         function parseEnumDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(220, fullStart);
+            var node = createNode(223, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(81);
@@ -9169,7 +9604,7 @@ var ts;
             return finishNode(node);
         }
         function parseModuleBlock() {
-            var node = createNode(222, scanner.getStartPos());
+            var node = createNode(225, scanner.getStartPos());
             if (parseExpected(15)) {
                 node.statements = parseList(1, parseStatement);
                 parseExpected(16);
@@ -9180,24 +9615,24 @@ var ts;
             return finishNode(node);
         }
         function parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags) {
-            var node = createNode(221, fullStart);
-            var namespaceFlag = flags & 65536;
+            var node = createNode(224, fullStart);
+            var namespaceFlag = flags & 4096;
             node.decorators = decorators;
             setModifiers(node, modifiers);
             node.flags |= flags;
             node.name = parseIdentifier();
             node.body = parseOptional(21)
-                ? parseModuleOrNamespaceDeclaration(getNodePos(), undefined, undefined, 2 | namespaceFlag)
+                ? parseModuleOrNamespaceDeclaration(getNodePos(), undefined, undefined, 1 | namespaceFlag)
                 : parseModuleBlock();
             return finishNode(node);
         }
         function parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(221, fullStart);
+            var node = createNode(224, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
-            if (token === 134) {
+            if (token === 136) {
                 node.name = parseIdentifier();
-                node.flags |= 2097152;
+                node.flags |= 131072;
             }
             else {
                 node.name = parseLiteralNode(true);
@@ -9207,11 +9642,11 @@ var ts;
         }
         function parseModuleDeclaration(fullStart, decorators, modifiers) {
             var flags = modifiers ? modifiers.flags : 0;
-            if (token === 134) {
+            if (token === 136) {
                 return parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers);
             }
             else if (parseOptional(126)) {
-                flags |= 65536;
+                flags |= 4096;
             }
             else {
                 parseExpected(125);
@@ -9222,7 +9657,7 @@ var ts;
             return parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags);
         }
         function isExternalModuleReference() {
-            return token === 127 &&
+            return token === 128 &&
                 lookAhead(nextTokenIsOpenParen);
         }
         function nextTokenIsOpenParen() {
@@ -9231,14 +9666,24 @@ var ts;
         function nextTokenIsSlash() {
             return nextToken() === 39;
         }
+        function parseGlobalModuleExportDeclaration(fullStart, decorators, modifiers) {
+            var exportDeclaration = createNode(227, fullStart);
+            exportDeclaration.decorators = decorators;
+            exportDeclaration.modifiers = modifiers;
+            parseExpected(116);
+            parseExpected(126);
+            exportDeclaration.name = parseIdentifier();
+            parseExpected(23);
+            return finishNode(exportDeclaration);
+        }
         function parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers) {
             parseExpected(89);
             var afterImportPos = scanner.getStartPos();
             var identifier;
             if (isIdentifier()) {
                 identifier = parseIdentifier();
-                if (token !== 24 && token !== 133) {
-                    var importEqualsDeclaration = createNode(224, fullStart);
+                if (token !== 24 && token !== 135) {
+                    var importEqualsDeclaration = createNode(228, fullStart);
                     importEqualsDeclaration.decorators = decorators;
                     setModifiers(importEqualsDeclaration, modifiers);
                     importEqualsDeclaration.name = identifier;
@@ -9248,27 +9693,27 @@ var ts;
                     return finishNode(importEqualsDeclaration);
                 }
             }
-            var importDeclaration = createNode(225, fullStart);
+            var importDeclaration = createNode(229, fullStart);
             importDeclaration.decorators = decorators;
             setModifiers(importDeclaration, modifiers);
             if (identifier ||
                 token === 37 ||
                 token === 15) {
                 importDeclaration.importClause = parseImportClause(identifier, afterImportPos);
-                parseExpected(133);
+                parseExpected(135);
             }
             importDeclaration.moduleSpecifier = parseModuleSpecifier();
             parseSemicolon();
             return finishNode(importDeclaration);
         }
         function parseImportClause(identifier, fullStart) {
-            var importClause = createNode(226, fullStart);
+            var importClause = createNode(230, fullStart);
             if (identifier) {
                 importClause.name = identifier;
             }
             if (!importClause.name ||
                 parseOptional(24)) {
-                importClause.namedBindings = token === 37 ? parseNamespaceImport() : parseNamedImportsOrExports(228);
+                importClause.namedBindings = token === 37 ? parseNamespaceImport() : parseNamedImportsOrExports(232);
             }
             return finishNode(importClause);
         }
@@ -9278,8 +9723,8 @@ var ts;
                 : parseEntityName(false);
         }
         function parseExternalModuleReference() {
-            var node = createNode(235);
-            parseExpected(127);
+            var node = createNode(239);
+            parseExpected(128);
             parseExpected(17);
             node.expression = parseModuleSpecifier();
             parseExpected(18);
@@ -9296,7 +9741,7 @@ var ts;
             }
         }
         function parseNamespaceImport() {
-            var namespaceImport = createNode(227);
+            var namespaceImport = createNode(231);
             parseExpected(37);
             parseExpected(116);
             namespaceImport.name = parseIdentifier();
@@ -9304,14 +9749,14 @@ var ts;
         }
         function parseNamedImportsOrExports(kind) {
             var node = createNode(kind);
-            node.elements = parseBracketedList(21, kind === 228 ? parseImportSpecifier : parseExportSpecifier, 15, 16);
+            node.elements = parseBracketedList(21, kind === 232 ? parseImportSpecifier : parseExportSpecifier, 15, 16);
             return finishNode(node);
         }
         function parseExportSpecifier() {
-            return parseImportOrExportSpecifier(233);
+            return parseImportOrExportSpecifier(237);
         }
         function parseImportSpecifier() {
-            return parseImportOrExportSpecifier(229);
+            return parseImportOrExportSpecifier(233);
         }
         function parseImportOrExportSpecifier(kind) {
             var node = createNode(kind);
@@ -9330,23 +9775,23 @@ var ts;
             else {
                 node.name = identifierName;
             }
-            if (kind === 229 && checkIdentifierIsKeyword) {
+            if (kind === 233 && checkIdentifierIsKeyword) {
                 parseErrorAtPosition(checkIdentifierStart, checkIdentifierEnd - checkIdentifierStart, ts.Diagnostics.Identifier_expected);
             }
             return finishNode(node);
         }
         function parseExportDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(231, fullStart);
+            var node = createNode(235, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             if (parseOptional(37)) {
-                parseExpected(133);
+                parseExpected(135);
                 node.moduleSpecifier = parseModuleSpecifier();
             }
             else {
-                node.exportClause = parseNamedImportsOrExports(232);
-                if (token === 133 || (token === 9 && !scanner.hasPrecedingLineBreak())) {
-                    parseExpected(133);
+                node.exportClause = parseNamedImportsOrExports(236);
+                if (token === 135 || (token === 9 && !scanner.hasPrecedingLineBreak())) {
+                    parseExpected(135);
                     node.moduleSpecifier = parseModuleSpecifier();
                 }
             }
@@ -9354,7 +9799,7 @@ var ts;
             return finishNode(node);
         }
         function parseExportAssignment(fullStart, decorators, modifiers) {
-            var node = createNode(230, fullStart);
+            var node = createNode(234, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             if (parseOptional(56)) {
@@ -9370,6 +9815,7 @@ var ts;
         function processReferenceComments(sourceFile) {
             var triviaScanner = ts.createScanner(sourceFile.languageVersion, false, 0, sourceText);
             var referencedFiles = [];
+            var typeReferenceDirectives = [];
             var amdDependencies = [];
             var amdModuleName;
             while (true) {
@@ -9390,7 +9836,12 @@ var ts;
                     sourceFile.hasNoDefaultLib = referencePathMatchResult.isNoDefaultLib;
                     var diagnosticMessage = referencePathMatchResult.diagnosticMessage;
                     if (fileReference) {
-                        referencedFiles.push(fileReference);
+                        if (referencePathMatchResult.isTypeReferenceDirective) {
+                            typeReferenceDirectives.push(fileReference);
+                        }
+                        else {
+                            referencedFiles.push(fileReference);
+                        }
                     }
                     if (diagnosticMessage) {
                         parseDiagnostics.push(ts.createFileDiagnostic(sourceFile, range.pos, range.end - range.pos, diagnosticMessage));
@@ -9420,16 +9871,17 @@ var ts;
                 }
             }
             sourceFile.referencedFiles = referencedFiles;
+            sourceFile.typeReferenceDirectives = typeReferenceDirectives;
             sourceFile.amdDependencies = amdDependencies;
             sourceFile.moduleName = amdModuleName;
         }
         function setExternalModuleIndicator(sourceFile) {
             sourceFile.externalModuleIndicator = ts.forEach(sourceFile.statements, function (node) {
-                return node.flags & 2
-                    || node.kind === 224 && node.moduleReference.kind === 235
-                    || node.kind === 225
-                    || node.kind === 230
-                    || node.kind === 231
+                return node.flags & 1
+                    || node.kind === 228 && node.moduleReference.kind === 239
+                    || node.kind === 229
+                    || node.kind === 234
+                    || node.kind === 235
                     ? node
                     : undefined;
             });
@@ -9454,17 +9906,17 @@ var ts;
             }
             JSDocParser.isJSDocType = isJSDocType;
             function parseJSDocTypeExpressionForTests(content, start, length) {
-                initializeState("file.js", content, 2, true, undefined);
-                var jsDocTypeExpression = parseJSDocTypeExpression(start, length);
+                initializeState("file.js", content, 2, undefined, 1);
+                scanner.setText(content, start, length);
+                token = scanner.scan();
+                var jsDocTypeExpression = parseJSDocTypeExpression();
                 var diagnostics = parseDiagnostics;
                 clearState();
                 return jsDocTypeExpression ? { jsDocTypeExpression: jsDocTypeExpression, diagnostics: diagnostics } : undefined;
             }
             JSDocParser.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
-            function parseJSDocTypeExpression(start, length) {
-                scanner.setText(sourceText, start, length);
-                token = nextToken();
-                var result = createNode(252);
+            function parseJSDocTypeExpression() {
+                var result = createNode(256, scanner.getTokenPos());
                 parseExpected(15);
                 result.type = parseJSDocTopLevelType();
                 parseExpected(16);
@@ -9475,12 +9927,12 @@ var ts;
             function parseJSDocTopLevelType() {
                 var type = parseJSDocType();
                 if (token === 47) {
-                    var unionType = createNode(256, type.pos);
+                    var unionType = createNode(260, type.pos);
                     unionType.types = parseJSDocTypeList(type);
                     type = finishNode(unionType);
                 }
                 if (token === 56) {
-                    var optionalType = createNode(263, type.pos);
+                    var optionalType = createNode(267, type.pos);
                     nextToken();
                     optionalType.type = type;
                     type = finishNode(optionalType);
@@ -9491,20 +9943,20 @@ var ts;
                 var type = parseBasicTypeExpression();
                 while (true) {
                     if (token === 19) {
-                        var arrayType = createNode(255, type.pos);
+                        var arrayType = createNode(259, type.pos);
                         arrayType.elementType = type;
                         nextToken();
                         parseExpected(20);
                         type = finishNode(arrayType);
                     }
                     else if (token === 53) {
-                        var nullableType = createNode(258, type.pos);
+                        var nullableType = createNode(262, type.pos);
                         nullableType.type = type;
                         nextToken();
                         type = finishNode(nullableType);
                     }
                     else if (token === 49) {
-                        var nonNullableType = createNode(259, type.pos);
+                        var nonNullableType = createNode(263, type.pos);
                         nonNullableType.type = type;
                         nextToken();
                         type = finishNode(nonNullableType);
@@ -9538,37 +9990,37 @@ var ts;
                     case 97:
                         return parseJSDocThisType();
                     case 117:
-                    case 130:
-                    case 128:
-                    case 120:
                     case 131:
+                    case 129:
+                    case 120:
+                    case 132:
                     case 103:
                         return parseTokenNode();
                 }
                 return parseJSDocTypeReference();
             }
             function parseJSDocThisType() {
-                var result = createNode(267);
+                var result = createNode(271);
                 nextToken();
                 parseExpected(54);
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocConstructorType() {
-                var result = createNode(266);
+                var result = createNode(270);
                 nextToken();
                 parseExpected(54);
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocVariadicType() {
-                var result = createNode(265);
+                var result = createNode(269);
                 nextToken();
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocFunctionType() {
-                var result = createNode(264);
+                var result = createNode(268);
                 nextToken();
                 parseExpected(17);
                 result.parameters = parseDelimitedList(22, parseJSDocParameter);
@@ -9581,20 +10033,28 @@ var ts;
                 return finishNode(result);
             }
             function parseJSDocParameter() {
-                var parameter = createNode(139);
+                var parameter = createNode(141);
                 parameter.type = parseJSDocType();
+                if (parseOptional(56)) {
+                    parameter.questionToken = createNode(56);
+                }
                 return finishNode(parameter);
             }
             function parseJSDocTypeReference() {
-                var result = createNode(262);
+                var result = createNode(266);
                 result.name = parseSimplePropertyName();
-                while (parseOptional(21)) {
-                    if (token === 25) {
-                        result.typeArguments = parseTypeArguments();
-                        break;
-                    }
-                    else {
-                        result.name = parseQualifiedName(result.name);
+                if (token === 25) {
+                    result.typeArguments = parseTypeArguments();
+                }
+                else {
+                    while (parseOptional(21)) {
+                        if (token === 25) {
+                            result.typeArguments = parseTypeArguments();
+                            break;
+                        }
+                        else {
+                            result.name = parseQualifiedName(result.name);
+                        }
                     }
                 }
                 return finishNode(result);
@@ -9615,13 +10075,13 @@ var ts;
                 }
             }
             function parseQualifiedName(left) {
-                var result = createNode(136, left.pos);
+                var result = createNode(138, left.pos);
                 result.left = left;
                 result.right = parseIdentifierName();
                 return finishNode(result);
             }
             function parseJSDocRecordType() {
-                var result = createNode(260);
+                var result = createNode(264);
                 nextToken();
                 result.members = parseDelimitedList(24, parseJSDocRecordMember);
                 checkForTrailingComma(result.members);
@@ -9629,7 +10089,7 @@ var ts;
                 return finishNode(result);
             }
             function parseJSDocRecordMember() {
-                var result = createNode(261);
+                var result = createNode(265);
                 result.name = parseSimplePropertyName();
                 if (token === 54) {
                     nextToken();
@@ -9638,13 +10098,13 @@ var ts;
                 return finishNode(result);
             }
             function parseJSDocNonNullableType() {
-                var result = createNode(259);
+                var result = createNode(263);
                 nextToken();
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocTupleType() {
-                var result = createNode(257);
+                var result = createNode(261);
                 nextToken();
                 result.types = parseDelimitedList(25, parseJSDocType);
                 checkForTrailingComma(result.types);
@@ -9658,7 +10118,7 @@ var ts;
                 }
             }
             function parseJSDocUnionType() {
-                var result = createNode(256);
+                var result = createNode(260);
                 nextToken();
                 result.types = parseJSDocTypeList(parseJSDocType());
                 parseExpected(18);
@@ -9676,7 +10136,7 @@ var ts;
                 return types;
             }
             function parseJSDocAllType() {
-                var result = createNode(253);
+                var result = createNode(257);
                 nextToken();
                 return finishNode(result);
             }
@@ -9689,29 +10149,35 @@ var ts;
                     token === 27 ||
                     token === 56 ||
                     token === 47) {
-                    var result = createNode(254, pos);
+                    var result = createNode(258, pos);
                     return finishNode(result);
                 }
                 else {
-                    var result = createNode(258, pos);
+                    var result = createNode(262, pos);
                     result.type = parseJSDocType();
                     return finishNode(result);
                 }
             }
             function parseIsolatedJSDocComment(content, start, length) {
-                initializeState("file.js", content, 2, true, undefined);
-                var jsDocComment = parseJSDocComment(undefined, start, length);
+                initializeState("file.js", content, 2, undefined, 1);
+                sourceFile = { languageVariant: 0, text: content };
+                var jsDocComment = parseJSDocCommentWorker(start, length);
                 var diagnostics = parseDiagnostics;
                 clearState();
                 return jsDocComment ? { jsDocComment: jsDocComment, diagnostics: diagnostics } : undefined;
             }
             JSDocParser.parseIsolatedJSDocComment = parseIsolatedJSDocComment;
             function parseJSDocComment(parent, start, length) {
+                var saveToken = token;
+                var saveParseDiagnosticsLength = parseDiagnostics.length;
+                var saveParseErrorBeforeNextFinishedNode = parseErrorBeforeNextFinishedNode;
                 var comment = parseJSDocCommentWorker(start, length);
                 if (comment) {
-                    fixupParentReferences(comment);
                     comment.parent = parent;
                 }
+                token = saveToken;
+                parseDiagnostics.length = saveParseDiagnosticsLength;
+                parseErrorBeforeNextFinishedNode = saveParseErrorBeforeNextFinishedNode;
                 return comment;
             }
             JSDocParser.parseJSDocComment = parseJSDocComment;
@@ -9724,60 +10190,64 @@ var ts;
                 ts.Debug.assert(start <= end);
                 ts.Debug.assert(end <= content.length);
                 var tags;
-                var pos;
-                if (length >= "/** */".length) {
-                    if (content.charCodeAt(start) === 47 &&
-                        content.charCodeAt(start + 1) === 42 &&
-                        content.charCodeAt(start + 2) === 42 &&
-                        content.charCodeAt(start + 3) !== 42) {
+                var result;
+                if (content.charCodeAt(start) === 47 &&
+                    content.charCodeAt(start + 1) === 42 &&
+                    content.charCodeAt(start + 2) === 42 &&
+                    content.charCodeAt(start + 3) !== 42) {
+                    scanner.scanRange(start + 3, length - 5, function () {
                         var canParseTag = true;
                         var seenAsterisk = true;
-                        for (pos = start + "/**".length; pos < end;) {
-                            var ch = content.charCodeAt(pos);
-                            pos++;
-                            if (ch === 64 && canParseTag) {
-                                parseTag();
-                                canParseTag = false;
-                                continue;
-                            }
-                            if (ts.isLineBreak(ch)) {
-                                canParseTag = true;
-                                seenAsterisk = false;
-                                continue;
-                            }
-                            if (ts.isWhiteSpace(ch)) {
-                                continue;
-                            }
-                            if (ch === 42) {
-                                if (seenAsterisk) {
+                        nextJSDocToken();
+                        while (token !== 1) {
+                            switch (token) {
+                                case 55:
+                                    if (canParseTag) {
+                                        parseTag();
+                                    }
+                                    seenAsterisk = false;
+                                    break;
+                                case 4:
+                                    canParseTag = true;
+                                    seenAsterisk = false;
+                                    break;
+                                case 37:
+                                    if (seenAsterisk) {
+                                        canParseTag = false;
+                                    }
+                                    seenAsterisk = true;
+                                    break;
+                                case 69:
                                     canParseTag = false;
-                                }
-                                seenAsterisk = true;
-                                continue;
+                                    break;
+                                case 1:
+                                    break;
                             }
-                            canParseTag = false;
+                            nextJSDocToken();
                         }
-                    }
+                        result = createJSDocComment();
+                    });
                 }
-                return createJSDocComment();
+                return result;
                 function createJSDocComment() {
                     if (!tags) {
                         return undefined;
                     }
-                    var result = createNode(268, start);
+                    var result = createNode(272, start);
                     result.tags = tags;
                     return finishNode(result, end);
                 }
                 function skipWhitespace() {
-                    while (pos < end && ts.isWhiteSpace(content.charCodeAt(pos))) {
-                        pos++;
+                    while (token === 5 || token === 4) {
+                        nextJSDocToken();
                     }
                 }
                 function parseTag() {
-                    ts.Debug.assert(content.charCodeAt(pos - 1) === 64);
-                    var atToken = createNode(55, pos - 1);
-                    atToken.end = pos;
-                    var tagName = scanIdentifier();
+                    ts.Debug.assert(token === 55);
+                    var atToken = createNode(55, scanner.getTokenPos());
+                    atToken.end = scanner.getTextPos();
+                    nextJSDocToken();
+                    var tagName = parseJSDocIdentifier();
                     if (!tagName) {
                         return;
                     }
@@ -9801,10 +10271,10 @@ var ts;
                     return undefined;
                 }
                 function handleUnknownTag(atToken, tagName) {
-                    var result = createNode(269, atToken.pos);
+                    var result = createNode(273, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
-                    return finishNode(result, pos);
+                    return finishNode(result);
                 }
                 function addTag(tag) {
                     if (tag) {
@@ -9817,12 +10287,10 @@ var ts;
                     }
                 }
                 function tryParseTypeExpression() {
-                    skipWhitespace();
-                    if (content.charCodeAt(pos) !== 123) {
+                    if (token !== 15) {
                         return undefined;
                     }
-                    var typeExpression = parseJSDocTypeExpression(pos, end - pos);
-                    pos = typeExpression.end;
+                    var typeExpression = parseJSDocTypeExpression();
                     return typeExpression;
                 }
                 function handleParamTag(atToken, tagName) {
@@ -9830,17 +10298,20 @@ var ts;
                     skipWhitespace();
                     var name;
                     var isBracketed;
-                    if (content.charCodeAt(pos) === 91) {
-                        pos++;
-                        skipWhitespace();
-                        name = scanIdentifier();
+                    if (parseOptionalToken(19)) {
+                        name = parseJSDocIdentifier();
                         isBracketed = true;
+                        if (parseOptionalToken(56)) {
+                            parseExpression();
+                        }
+                        parseExpected(20);
                     }
-                    else {
-                        name = scanIdentifier();
+                    else if (token === 69) {
+                        name = parseJSDocIdentifier();
                     }
                     if (!name) {
-                        parseErrorAtPosition(pos, 0, ts.Diagnostics.Identifier_expected);
+                        parseErrorAtPosition(scanner.getStartPos(), 0, ts.Diagnostics.Identifier_expected);
+                        return undefined;
                     }
                     var preName, postName;
                     if (typeExpression) {
@@ -9852,84 +10323,81 @@ var ts;
                     if (!typeExpression) {
                         typeExpression = tryParseTypeExpression();
                     }
-                    var result = createNode(270, atToken.pos);
+                    var result = createNode(274, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.preParameterName = preName;
                     result.typeExpression = typeExpression;
                     result.postParameterName = postName;
                     result.isBracketed = isBracketed;
-                    return finishNode(result, pos);
+                    return finishNode(result);
                 }
                 function handleReturnTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 271; })) {
-                        parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
+                    if (ts.forEach(tags, function (t) { return t.kind === 275; })) {
+                        parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
-                    var result = createNode(271, atToken.pos);
+                    var result = createNode(275, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
-                    return finishNode(result, pos);
+                    return finishNode(result);
                 }
                 function handleTypeTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 272; })) {
-                        parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
+                    if (ts.forEach(tags, function (t) { return t.kind === 276; })) {
+                        parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
-                    var result = createNode(272, atToken.pos);
+                    var result = createNode(276, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
-                    return finishNode(result, pos);
+                    return finishNode(result);
                 }
                 function handleTemplateTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 273; })) {
-                        parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
+                    if (ts.forEach(tags, function (t) { return t.kind === 277; })) {
+                        parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
                     var typeParameters = [];
-                    typeParameters.pos = pos;
+                    typeParameters.pos = scanner.getStartPos();
                     while (true) {
-                        skipWhitespace();
-                        var startPos = pos;
-                        var name_8 = scanIdentifier();
+                        var name_8 = parseJSDocIdentifier();
                         if (!name_8) {
-                            parseErrorAtPosition(startPos, 0, ts.Diagnostics.Identifier_expected);
+                            parseErrorAtPosition(scanner.getStartPos(), 0, ts.Diagnostics.Identifier_expected);
                             return undefined;
                         }
-                        var typeParameter = createNode(138, name_8.pos);
+                        var typeParameter = createNode(140, name_8.pos);
                         typeParameter.name = name_8;
-                        finishNode(typeParameter, pos);
+                        finishNode(typeParameter);
                         typeParameters.push(typeParameter);
-                        skipWhitespace();
-                        if (content.charCodeAt(pos) !== 44) {
+                        if (token === 24) {
+                            nextJSDocToken();
+                        }
+                        else {
                             break;
                         }
-                        pos++;
                     }
-                    typeParameters.end = pos;
-                    var result = createNode(273, atToken.pos);
+                    var result = createNode(277, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeParameters = typeParameters;
-                    return finishNode(result, pos);
+                    finishNode(result);
+                    typeParameters.end = result.end;
+                    return result;
                 }
-                function scanIdentifier() {
-                    var startPos = pos;
-                    for (; pos < end; pos++) {
-                        var ch = content.charCodeAt(pos);
-                        if (pos === startPos && ts.isIdentifierStart(ch, 2)) {
-                            continue;
-                        }
-                        else if (pos > startPos && ts.isIdentifierPart(ch, 2)) {
-                            continue;
-                        }
-                        break;
-                    }
-                    if (startPos === pos) {
+                function nextJSDocToken() {
+                    return token = scanner.scanJSDocToken();
+                }
+                function parseJSDocIdentifier() {
+                    if (token !== 69) {
+                        parseErrorAtCurrentToken(ts.Diagnostics.Identifier_expected);
                         return undefined;
                     }
-                    var result = createNode(69, startPos);
-                    result.text = content.substring(startPos, pos);
-                    return finishNode(result, pos);
+                    var pos = scanner.getTokenPos();
+                    var end = scanner.getTextPos();
+                    var result = createNode(69, pos);
+                    result.text = content.substring(pos, end);
+                    finishNode(result, end);
+                    nextJSDocToken();
+                    return result;
                 }
             }
             JSDocParser.parseJSDocCommentWorker = parseJSDocCommentWorker;
@@ -9944,7 +10412,7 @@ var ts;
                 return sourceFile;
             }
             if (sourceFile.statements.length === 0) {
-                return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, undefined, true);
+                return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, undefined, true, sourceFile.scriptKind);
             }
             var incrementalSourceFile = sourceFile;
             ts.Debug.assert(!incrementalSourceFile.hasBeenIncrementallyParsed);
@@ -9958,7 +10426,7 @@ var ts;
             ts.Debug.assert(ts.textSpanEnd(ts.textChangeRangeNewSpan(changeRange)) === ts.textSpanEnd(ts.textChangeRangeNewSpan(textChangeRange)));
             var delta = ts.textChangeRangeNewSpan(changeRange).length - changeRange.span.length;
             updateTokenPositionsAndMarkElements(incrementalSourceFile, changeRange.span.start, ts.textSpanEnd(changeRange.span), ts.textSpanEnd(ts.textChangeRangeNewSpan(changeRange)), delta, oldText, newText, aggressiveChecks);
-            var result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, true);
+            var result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, true, sourceFile.scriptKind);
             return result;
         }
         IncrementalParser.updateSourceFile = updateSourceFile;
@@ -10027,12 +10495,12 @@ var ts;
         }
         function checkNodePositions(node, aggressiveChecks) {
             if (aggressiveChecks) {
-                var pos = node.pos;
+                var pos_2 = node.pos;
                 forEachChild(node, function (child) {
-                    ts.Debug.assert(child.pos >= pos);
-                    pos = child.end;
+                    ts.Debug.assert(child.pos >= pos_2);
+                    pos_2 = child.end;
                 });
-                ts.Debug.assert(pos <= node.end);
+                ts.Debug.assert(pos_2 <= node.end);
             }
         }
         function updateTokenPositionsAndMarkElements(sourceFile, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta, oldText, newText, aggressiveChecks) {
@@ -10228,32 +10696,32 @@ var ts;
                 : 4;
     }
     function getModuleInstanceState(node) {
-        if (node.kind === 218 || node.kind === 219) {
+        if (node.kind === 221 || node.kind === 222) {
             return 0;
         }
         else if (ts.isConstEnumDeclaration(node)) {
             return 2;
         }
-        else if ((node.kind === 225 || node.kind === 224) && !(node.flags & 2)) {
+        else if ((node.kind === 229 || node.kind === 228) && !(node.flags & 1)) {
             return 0;
         }
-        else if (node.kind === 222) {
-            var state = 0;
+        else if (node.kind === 225) {
+            var state_1 = 0;
             ts.forEachChild(node, function (n) {
                 switch (getModuleInstanceState(n)) {
                     case 0:
                         return false;
                     case 2:
-                        state = 2;
+                        state_1 = 2;
                         return false;
                     case 1:
-                        state = 1;
+                        state_1 = 1;
                         return true;
                 }
             });
-            return state;
+            return state_1;
         }
-        else if (node.kind === 221) {
+        else if (node.kind === 224) {
             return getModuleInstanceState(node.body);
         }
         else {
@@ -10285,6 +10753,7 @@ var ts;
         var hasAsyncFunctions;
         var hasDecorators;
         var hasParameterDecorators;
+        var hasJsxSpreadAttribute;
         var inStrictMode;
         var symbolCount = 0;
         var Symbol;
@@ -10315,6 +10784,7 @@ var ts;
             hasAsyncFunctions = false;
             hasDecorators = false;
             hasParameterDecorators = false;
+            hasJsxSpreadAttribute = false;
         }
         return bindSourceFile;
         function createSymbol(flags, name) {
@@ -10337,7 +10807,7 @@ var ts;
             if (symbolFlags & 107455) {
                 var valueDeclaration = symbol.valueDeclaration;
                 if (!valueDeclaration ||
-                    (valueDeclaration.kind !== node.kind && valueDeclaration.kind === 221)) {
+                    (valueDeclaration.kind !== node.kind && valueDeclaration.kind === 224)) {
                     symbol.valueDeclaration = node;
                 }
             }
@@ -10347,7 +10817,7 @@ var ts;
                 if (ts.isAmbientModule(node)) {
                     return ts.isGlobalScopeAugmentation(node) ? "__global" : "\"" + node.name.text + "\"";
                 }
-                if (node.name.kind === 137) {
+                if (node.name.kind === 139) {
                     var nameExpression = node.name.expression;
                     if (ts.isStringOrNumericLiteral(nameExpression.kind)) {
                         return nameExpression.text;
@@ -10358,21 +10828,21 @@ var ts;
                 return node.name.text;
             }
             switch (node.kind) {
-                case 145:
+                case 147:
                     return "__constructor";
-                case 153:
-                case 148:
-                    return "__call";
-                case 154:
-                case 149:
-                    return "__new";
+                case 155:
                 case 150:
+                    return "__call";
+                case 156:
+                case 151:
+                    return "__new";
+                case 152:
                     return "__index";
-                case 231:
+                case 235:
                     return "__export";
-                case 230:
+                case 234:
                     return node.isExportEquals ? "export=" : "default";
-                case 184:
+                case 186:
                     switch (ts.getSpecialPropertyAssignmentKind(node)) {
                         case 2:
                             return "export=";
@@ -10384,9 +10854,16 @@ var ts;
                     }
                     ts.Debug.fail("Unknown binary declaration kind");
                     break;
-                case 216:
-                case 217:
+                case 219:
+                case 220:
                     return node.flags & 512 ? "default" : undefined;
+                case 268:
+                    return ts.isJSDocConstructSignature(node) ? "__new" : "__call";
+                case 141:
+                    ts.Debug.assert(node.parent.kind === 268);
+                    var functionType = node.parent;
+                    var index = ts.indexOf(functionType.parameters, node);
+                    return "p" + index;
             }
         }
         function getDisplayName(node) {
@@ -10408,18 +10885,18 @@ var ts;
                     if (node.name) {
                         node.name.parent = node;
                     }
-                    var message = symbol.flags & 2
+                    var message_1 = symbol.flags & 2
                         ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0
                         : ts.Diagnostics.Duplicate_identifier_0;
                     ts.forEach(symbol.declarations, function (declaration) {
                         if (declaration.flags & 512) {
-                            message = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
+                            message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                         }
                     });
                     ts.forEach(symbol.declarations, function (declaration) {
-                        file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message, getDisplayName(declaration)));
+                        file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message_1, getDisplayName(declaration)));
                     });
-                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name || node, message, getDisplayName(node)));
+                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name || node, message_1, getDisplayName(node)));
                     symbol = createSymbol(0, name);
                 }
             }
@@ -10431,9 +10908,9 @@ var ts;
             return symbol;
         }
         function declareModuleMember(node, symbolFlags, symbolExcludes) {
-            var hasExportModifier = ts.getCombinedNodeFlags(node) & 2;
+            var hasExportModifier = ts.getCombinedNodeFlags(node) & 1;
             if (symbolFlags & 8388608) {
-                if (node.kind === 233 || (node.kind === 224 && hasExportModifier)) {
+                if (node.kind === 237 || (node.kind === 228 && hasExportModifier)) {
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
                 }
                 else {
@@ -10441,7 +10918,7 @@ var ts;
                 }
             }
             else {
-                if (!ts.isAmbientModule(node) && (hasExportModifier || container.flags & 131072)) {
+                if (!ts.isAmbientModule(node) && (hasExportModifier || container.flags & 8192)) {
                     var exportKind = (symbolFlags & 107455 ? 1048576 : 0) |
                         (symbolFlags & 793056 ? 2097152 : 0) |
                         (symbolFlags & 1536 ? 4194304 : 0);
@@ -10479,12 +10956,12 @@ var ts;
             var savedHasExplicitReturn;
             var kind = node.kind;
             var flags = node.flags;
-            flags &= ~1572864;
-            flags &= ~62914560;
-            if (kind === 218) {
+            flags &= ~98304;
+            flags &= ~3932160;
+            if (kind === 221) {
                 seenThisKeyword = false;
             }
-            var saveState = kind === 251 || kind === 222 || ts.isFunctionLikeKind(kind);
+            var saveState = kind === 255 || kind === 225 || ts.isFunctionLikeKind(kind);
             if (saveState) {
                 savedReachabilityState = currentReachabilityState;
                 savedLabelStack = labelStack;
@@ -10495,28 +10972,34 @@ var ts;
                 hasExplicitReturn = false;
                 labelStack = labelIndexMap = implicitLabels = undefined;
             }
+            if (ts.isInJavaScriptFile(node) && node.jsDocComment) {
+                bind(node.jsDocComment);
+            }
             bindReachableStatement(node);
             if (currentReachabilityState === 2 && ts.isFunctionLikeKind(kind) && ts.nodeIsPresent(node.body)) {
-                flags |= 524288;
+                flags |= 32768;
                 if (hasExplicitReturn) {
-                    flags |= 1048576;
+                    flags |= 65536;
                 }
             }
-            if (kind === 218) {
-                flags = seenThisKeyword ? flags | 262144 : flags & ~262144;
+            if (kind === 221) {
+                flags = seenThisKeyword ? flags | 16384 : flags & ~16384;
             }
-            if (kind === 251) {
+            if (kind === 255) {
                 if (hasClassExtends) {
-                    flags |= 4194304;
+                    flags |= 262144;
                 }
                 if (hasDecorators) {
-                    flags |= 8388608;
+                    flags |= 524288;
                 }
                 if (hasParameterDecorators) {
-                    flags |= 16777216;
+                    flags |= 1048576;
                 }
                 if (hasAsyncFunctions) {
-                    flags |= 33554432;
+                    flags |= 2097152;
+                }
+                if (hasJsxSpreadAttribute) {
+                    flags |= 1073741824;
                 }
             }
             node.flags = flags;
@@ -10537,40 +11020,40 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 201:
+                case 204:
                     bindWhileStatement(node);
                     break;
-                case 200:
+                case 203:
                     bindDoStatement(node);
                     break;
-                case 202:
+                case 205:
                     bindForStatement(node);
                     break;
-                case 203:
-                case 204:
+                case 206:
+                case 207:
                     bindForInOrForOfStatement(node);
                     break;
-                case 199:
+                case 202:
                     bindIfStatement(node);
                     break;
-                case 207:
-                case 211:
+                case 210:
+                case 214:
                     bindReturnOrThrow(node);
                     break;
-                case 206:
-                case 205:
+                case 209:
+                case 208:
                     bindBreakOrContinueStatement(node);
                     break;
-                case 212:
+                case 215:
                     bindTryStatement(node);
                     break;
-                case 209:
+                case 212:
                     bindSwitchStatement(node);
                     break;
-                case 223:
+                case 226:
                     bindCaseBlock(node);
                     break;
-                case 210:
+                case 213:
                     bindLabeledStatement(node);
                     break;
                 default:
@@ -10632,14 +11115,14 @@ var ts;
         }
         function bindReturnOrThrow(n) {
             bind(n.expression);
-            if (n.kind === 207) {
+            if (n.kind === 210) {
                 hasExplicitReturn = true;
             }
             currentReachabilityState = 4;
         }
         function bindBreakOrContinueStatement(n) {
             bind(n.label);
-            var isValidJump = jumpToLabel(n.label, n.kind === 206 ? currentReachabilityState : 4);
+            var isValidJump = jumpToLabel(n.label, n.kind === 209 ? currentReachabilityState : 4);
             if (isValidJump) {
                 currentReachabilityState = 4;
             }
@@ -10653,24 +11136,27 @@ var ts;
             var postCatchState = currentReachabilityState;
             currentReachabilityState = preTryState;
             bind(n.finallyBlock);
-            currentReachabilityState = or(postTryState, postCatchState);
+            currentReachabilityState = n.catchClause ? or(postTryState, postCatchState) : postTryState;
         }
         function bindSwitchStatement(n) {
             var preSwitchState = currentReachabilityState;
             var postSwitchLabel = pushImplicitLabel();
             bind(n.expression);
             bind(n.caseBlock);
-            var hasDefault = ts.forEach(n.caseBlock.clauses, function (c) { return c.kind === 245; });
+            var hasDefault = ts.forEach(n.caseBlock.clauses, function (c) { return c.kind === 249; });
             var postSwitchState = hasDefault && currentReachabilityState !== 2 ? 4 : preSwitchState;
             popImplicitLabel(postSwitchLabel, postSwitchState);
         }
         function bindCaseBlock(n) {
             var startState = currentReachabilityState;
-            for (var _i = 0, _a = n.clauses; _i < _a.length; _i++) {
-                var clause = _a[_i];
+            for (var i = 0; i < n.clauses.length; i++) {
+                var clause = n.clauses[i];
                 currentReachabilityState = startState;
                 bind(clause);
-                if (clause.statements.length && currentReachabilityState === 2 && options.noFallthroughCasesInSwitch) {
+                if (clause.statements.length &&
+                    i !== n.clauses.length - 1 &&
+                    currentReachabilityState === 2 &&
+                    options.noFallthroughCasesInSwitch) {
                     errorOnFirstToken(clause, ts.Diagnostics.Fallthrough_case_in_switch);
                 }
             }
@@ -10685,37 +11171,39 @@ var ts;
         }
         function getContainerFlags(node) {
             switch (node.kind) {
-                case 189:
-                case 217:
-                case 218:
+                case 191:
                 case 220:
-                case 156:
-                case 168:
+                case 221:
+                case 223:
+                case 170:
+                case 158:
+                case 264:
                     return 1;
+                case 150:
+                case 151:
+                case 152:
+                case 146:
+                case 145:
+                case 219:
+                case 147:
                 case 148:
                 case 149:
-                case 150:
-                case 144:
-                case 143:
-                case 216:
-                case 145:
-                case 146:
-                case 147:
-                case 153:
-                case 154:
-                case 176:
-                case 177:
-                case 221:
-                case 251:
-                case 219:
+                case 155:
+                case 268:
+                case 156:
+                case 178:
+                case 179:
+                case 224:
+                case 255:
+                case 222:
                     return 5;
-                case 247:
-                case 202:
-                case 203:
-                case 204:
-                case 223:
+                case 251:
+                case 205:
+                case 206:
+                case 207:
+                case 226:
                     return 2;
-                case 195:
+                case 198:
                     return ts.isFunctionLike(node.parent) ? 0 : 2;
             }
             return 0;
@@ -10731,38 +11219,40 @@ var ts;
         }
         function declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes) {
             switch (container.kind) {
-                case 221:
+                case 224:
                     return declareModuleMember(node, symbolFlags, symbolExcludes);
-                case 251:
+                case 255:
                     return declareSourceFileMember(node, symbolFlags, symbolExcludes);
-                case 189:
-                case 217:
-                    return declareClassMember(node, symbolFlags, symbolExcludes);
+                case 191:
                 case 220:
+                    return declareClassMember(node, symbolFlags, symbolExcludes);
+                case 223:
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                case 156:
-                case 168:
-                case 218:
+                case 158:
+                case 170:
+                case 221:
+                case 264:
                     return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
-                case 153:
-                case 154:
+                case 155:
+                case 156:
+                case 150:
+                case 151:
+                case 152:
+                case 146:
+                case 145:
+                case 147:
                 case 148:
                 case 149:
-                case 150:
-                case 144:
-                case 143:
-                case 145:
-                case 146:
-                case 147:
-                case 216:
-                case 176:
-                case 177:
                 case 219:
+                case 178:
+                case 179:
+                case 268:
+                case 222:
                     return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
             }
         }
         function declareClassMember(node, symbolFlags, symbolExcludes) {
-            return node.flags & 64
+            return node.flags & 32
                 ? declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes)
                 : declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
         }
@@ -10772,11 +11262,11 @@ var ts;
                 : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes);
         }
         function hasExportDeclarations(node) {
-            var body = node.kind === 251 ? node : node.body;
-            if (body.kind === 251 || body.kind === 222) {
+            var body = node.kind === 255 ? node : node.body;
+            if (body.kind === 255 || body.kind === 225) {
                 for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
                     var stat = _a[_i];
-                    if (stat.kind === 231 || stat.kind === 230) {
+                    if (stat.kind === 235 || stat.kind === 234) {
                         return true;
                     }
                 }
@@ -10785,19 +11275,24 @@ var ts;
         }
         function setExportContextFlag(node) {
             if (ts.isInAmbientContext(node) && !hasExportDeclarations(node)) {
-                node.flags |= 131072;
+                node.flags |= 8192;
             }
             else {
-                node.flags &= ~131072;
+                node.flags &= ~8192;
             }
         }
         function bindModuleDeclaration(node) {
             setExportContextFlag(node);
             if (ts.isAmbientModule(node)) {
-                if (node.flags & 2) {
+                if (node.flags & 1) {
                     errorOnFirstToken(node, ts.Diagnostics.export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always_visible);
                 }
-                declareSymbolAndAddToSymbolTable(node, 512, 106639);
+                if (ts.isExternalModuleAugmentation(node)) {
+                    declareSymbolAndAddToSymbolTable(node, 1024, 0);
+                }
+                else {
+                    declareSymbolAndAddToSymbolTable(node, 512, 106639);
+                }
             }
             else {
                 var state = getModuleInstanceState(node);
@@ -10838,7 +11333,7 @@ var ts;
                         continue;
                     }
                     var identifier = prop.name;
-                    var currentKind = prop.kind === 248 || prop.kind === 249 || prop.kind === 144
+                    var currentKind = prop.kind === 252 || prop.kind === 253 || prop.kind === 146
                         ? 1
                         : 2;
                     var existingKind = seen[identifier.text];
@@ -10860,10 +11355,10 @@ var ts;
         }
         function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
             switch (blockScopeContainer.kind) {
-                case 221:
+                case 224:
                     declareModuleMember(node, symbolFlags, symbolExcludes);
                     break;
-                case 251:
+                case 255:
                     if (ts.isExternalModule(container)) {
                         declareModuleMember(node, symbolFlags, symbolExcludes);
                         break;
@@ -10942,7 +11437,7 @@ var ts;
             }
         }
         function checkStrictModeNumericLiteral(node) {
-            if (inStrictMode && node.flags & 32768) {
+            if (inStrictMode && node.isOctalLiteral) {
                 file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode));
             }
         }
@@ -10985,17 +11480,17 @@ var ts;
         }
         function updateStrictMode(node) {
             switch (node.kind) {
-                case 251:
-                case 222:
+                case 255:
+                case 225:
                     updateStrictModeStatementList(node.statements);
                     return;
-                case 195:
+                case 198:
                     if (ts.isFunctionLike(node.parent)) {
                         updateStrictModeStatementList(node.statements);
                     }
                     return;
-                case 217:
-                case 189:
+                case 220:
+                case 191:
                     inStrictMode = true;
                     return;
             }
@@ -11014,13 +11509,13 @@ var ts;
         }
         function isUseStrictPrologueDirective(node) {
             var nodeText = ts.getTextOfNodeFromSourceText(file.text, node.expression);
-            return nodeText === "\"use strict\"" || nodeText === "'use strict'";
+            return nodeText === '"use strict"' || nodeText === "'use strict'";
         }
         function bindWorker(node) {
             switch (node.kind) {
                 case 69:
                     return checkStrictModeIdentifier(node);
-                case 184:
+                case 186:
                     if (ts.isInJavaScriptFile(node)) {
                         var specialKind = ts.getSpecialPropertyAssignmentKind(node);
                         switch (specialKind) {
@@ -11043,91 +11538,99 @@ var ts;
                         }
                     }
                     return checkStrictModeBinaryExpression(node);
-                case 247:
+                case 251:
                     return checkStrictModeCatchClause(node);
-                case 178:
+                case 180:
                     return checkStrictModeDeleteExpression(node);
                 case 8:
                     return checkStrictModeNumericLiteral(node);
-                case 183:
+                case 185:
                     return checkStrictModePostfixUnaryExpression(node);
-                case 182:
+                case 184:
                     return checkStrictModePrefixUnaryExpression(node);
-                case 208:
+                case 211:
                     return checkStrictModeWithStatement(node);
-                case 162:
+                case 164:
                     seenThisKeyword = true;
                     return;
-                case 151:
+                case 153:
                     return checkTypePredicate(node);
-                case 138:
+                case 140:
                     return declareSymbolAndAddToSymbolTable(node, 262144, 530912);
-                case 139:
-                    return bindParameter(node);
-                case 214:
-                case 166:
-                    return bindVariableDeclarationOrBindingElement(node);
-                case 142:
                 case 141:
-                    return bindPropertyOrMethodOrAccessor(node, 4 | (node.questionToken ? 536870912 : 0), 107455);
-                case 248:
-                case 249:
-                    return bindPropertyOrMethodOrAccessor(node, 4, 107455);
-                case 250:
-                    return bindPropertyOrMethodOrAccessor(node, 8, 107455);
-                case 148:
-                case 149:
-                case 150:
-                    return declareSymbolAndAddToSymbolTable(node, 131072, 0);
+                    return bindParameter(node);
+                case 217:
+                case 168:
+                    return bindVariableDeclarationOrBindingElement(node);
                 case 144:
                 case 143:
-                    return bindPropertyOrMethodOrAccessor(node, 8192 | (node.questionToken ? 536870912 : 0), ts.isObjectLiteralMethod(node) ? 107455 : 99263);
-                case 216:
-                    return bindFunctionDeclaration(node);
-                case 145:
-                    return declareSymbolAndAddToSymbolTable(node, 16384, 0);
+                case 265:
+                    return bindPropertyOrMethodOrAccessor(node, 4 | (node.questionToken ? 536870912 : 0), 107455);
+                case 252:
+                case 253:
+                    return bindPropertyOrMethodOrAccessor(node, 4, 107455);
+                case 254:
+                    return bindPropertyOrMethodOrAccessor(node, 8, 107455);
+                case 246:
+                    hasJsxSpreadAttribute = true;
+                    return;
+                case 150:
+                case 151:
+                case 152:
+                    return declareSymbolAndAddToSymbolTable(node, 131072, 0);
                 case 146:
-                    return bindPropertyOrMethodOrAccessor(node, 32768, 41919);
+                case 145:
+                    return bindPropertyOrMethodOrAccessor(node, 8192 | (node.questionToken ? 536870912 : 0), ts.isObjectLiteralMethod(node) ? 107455 : 99263);
+                case 219:
+                    return bindFunctionDeclaration(node);
                 case 147:
+                    return declareSymbolAndAddToSymbolTable(node, 16384, 0);
+                case 148:
+                    return bindPropertyOrMethodOrAccessor(node, 32768, 41919);
+                case 149:
                     return bindPropertyOrMethodOrAccessor(node, 65536, 74687);
-                case 153:
-                case 154:
-                    return bindFunctionOrConstructorType(node);
+                case 155:
                 case 156:
+                case 268:
+                    return bindFunctionOrConstructorType(node);
+                case 158:
+                case 264:
                     return bindAnonymousDeclaration(node, 2048, "__type");
-                case 168:
+                case 170:
                     return bindObjectLiteralExpression(node);
-                case 176:
-                case 177:
+                case 178:
+                case 179:
                     return bindFunctionExpression(node);
-                case 171:
+                case 173:
                     if (ts.isInJavaScriptFile(node)) {
                         bindCallExpression(node);
                     }
                     break;
-                case 189:
-                case 217:
-                    return bindClassLikeDeclaration(node);
-                case 218:
-                    return bindBlockScopedDeclaration(node, 64, 792960);
-                case 219:
-                    return bindBlockScopedDeclaration(node, 524288, 793056);
+                case 191:
                 case 220:
-                    return bindEnumDeclaration(node);
+                    return bindClassLikeDeclaration(node);
                 case 221:
-                    return bindModuleDeclaration(node);
+                    return bindBlockScopedDeclaration(node, 64, 792960);
+                case 222:
+                    return bindBlockScopedDeclaration(node, 524288, 793056);
+                case 223:
+                    return bindEnumDeclaration(node);
                 case 224:
-                case 227:
-                case 229:
-                case 233:
-                    return declareSymbolAndAddToSymbolTable(node, 8388608, 8388608);
-                case 226:
-                    return bindImportClause(node);
+                    return bindModuleDeclaration(node);
+                case 228:
                 case 231:
-                    return bindExportDeclaration(node);
+                case 233:
+                case 237:
+                    return declareSymbolAndAddToSymbolTable(node, 8388608, 8388608);
+                case 227:
+                    return bindGlobalModuleExportDeclaration(node);
                 case 230:
+                    return bindImportClause(node);
+                case 235:
+                    return bindExportDeclaration(node);
+                case 234:
                     return bindExportAssignment(node);
-                case 251:
+                case 255:
                     return bindSourceFileIfExternalModule();
             }
         }
@@ -11136,7 +11639,7 @@ var ts;
             if (parameterName && parameterName.kind === 69) {
                 checkStrictModeIdentifier(parameterName);
             }
-            if (parameterName && parameterName.kind === 162) {
+            if (parameterName && parameterName.kind === 164) {
                 seenThisKeyword = true;
             }
             bind(type);
@@ -11151,17 +11654,39 @@ var ts;
             bindAnonymousDeclaration(file, 512, "\"" + ts.removeFileExtension(file.fileName) + "\"");
         }
         function bindExportAssignment(node) {
-            var boundExpression = node.kind === 230 ? node.expression : node.right;
+            var boundExpression = node.kind === 234 ? node.expression : node.right;
             if (!container.symbol || !container.symbol.exports) {
                 bindAnonymousDeclaration(node, 8388608, getDeclarationName(node));
             }
-            else if (boundExpression.kind === 69) {
+            else if (boundExpression.kind === 69 && node.kind === 234) {
                 declareSymbol(container.symbol.exports, container.symbol, node, 8388608, 107455 | 8388608);
             }
             else {
                 declareSymbol(container.symbol.exports, container.symbol, node, 4, 107455 | 8388608);
             }
         }
+        function bindGlobalModuleExportDeclaration(node) {
+            if (node.modifiers && node.modifiers.length) {
+                file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Modifiers_cannot_appear_here));
+            }
+            if (node.parent.kind !== 255) {
+                file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_at_top_level));
+                return;
+            }
+            else {
+                var parent_4 = node.parent;
+                if (!ts.isExternalModule(parent_4)) {
+                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_in_module_files));
+                    return;
+                }
+                if (!parent_4.isDeclarationFile) {
+                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_in_declaration_files));
+                    return;
+                }
+            }
+            file.symbol.globalExports = file.symbol.globalExports || {};
+            declareSymbol(file.symbol.globalExports, file.symbol, node, 8388608, 8388608);
+        }
         function bindExportDeclaration(node) {
             if (!container.symbol || !container.symbol.exports) {
                 bindAnonymousDeclaration(node, 1073741824, getDeclarationName(node));
@@ -11187,27 +11712,32 @@ var ts;
         }
         function bindModuleExportsAssignment(node) {
             setCommonJsModuleIndicator(node);
-            bindExportAssignment(node);
+            declareSymbol(file.symbol.exports, file.symbol, node, 4 | 7340032 | 512, 0);
         }
         function bindThisPropertyAssignment(node) {
-            if (container.kind === 176 || container.kind === 216) {
+            if (container.kind === 178 || container.kind === 219) {
                 container.symbol.members = container.symbol.members || {};
-                declareSymbol(container.symbol.members, container.symbol, node, 4, 107455);
+                declareSymbol(container.symbol.members, container.symbol, node, 4, 107455 & ~4);
             }
         }
         function bindPrototypePropertyAssignment(node) {
-            var classId = node.left.expression.expression;
-            var funcSymbol = container.locals[classId.text];
+            var leftSideOfAssignment = node.left;
+            var classPrototype = leftSideOfAssignment.expression;
+            var constructorFunction = classPrototype.expression;
+            leftSideOfAssignment.parent = node;
+            constructorFunction.parent = classPrototype;
+            classPrototype.parent = leftSideOfAssignment;
+            var funcSymbol = container.locals[constructorFunction.text];
             if (!funcSymbol || !(funcSymbol.flags & 16)) {
                 return;
             }
             if (!funcSymbol.members) {
                 funcSymbol.members = {};
             }
-            declareSymbol(funcSymbol.members, funcSymbol, node.left, 4, 107455);
+            declareSymbol(funcSymbol.members, funcSymbol, leftSideOfAssignment, 4, 107455);
         }
         function bindCallExpression(node) {
-            if (!file.commonJsModuleIndicator && ts.isRequireCall(node)) {
+            if (!file.commonJsModuleIndicator && ts.isRequireCall(node, false)) {
                 setCommonJsModuleIndicator(node);
             }
         }
@@ -11220,7 +11750,7 @@ var ts;
                     hasDecorators = true;
                 }
             }
-            if (node.kind === 217) {
+            if (node.kind === 220) {
                 bindBlockScopedDeclaration(node, 32, 899519);
             }
             else {
@@ -11370,16 +11900,16 @@ var ts;
         function checkUnreachable(node) {
             switch (currentReachabilityState) {
                 case 4:
-                    var reportError = (ts.isStatement(node) && node.kind !== 197) ||
-                        node.kind === 217 ||
-                        (node.kind === 221 && shouldReportErrorOnModuleDeclaration(node)) ||
-                        (node.kind === 220 && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums));
+                    var reportError = (ts.isStatement(node) && node.kind !== 200) ||
+                        node.kind === 220 ||
+                        (node.kind === 224 && shouldReportErrorOnModuleDeclaration(node)) ||
+                        (node.kind === 223 && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums));
                     if (reportError) {
                         currentReachabilityState = 8;
                         var reportUnreachableCode = !options.allowUnreachableCode &&
                             !ts.isInAmbientContext(node) &&
-                            (node.kind !== 196 ||
-                                ts.getCombinedNodeFlags(node.declarationList) & 24576 ||
+                            (node.kind !== 199 ||
+                                ts.getCombinedNodeFlags(node.declarationList) & 3072 ||
                                 ts.forEach(node.declarationList.declarations, function (d) { return d.initializer; }));
                         if (reportUnreachableCode) {
                             errorOnFirstToken(node, ts.Diagnostics.Unreachable_code_detected);
@@ -11439,8 +11969,9 @@ var ts;
         var emptySymbols = {};
         var compilerOptions = host.getCompilerOptions();
         var languageVersion = compilerOptions.target || 0;
-        var modulekind = compilerOptions.module ? compilerOptions.module : languageVersion === 2 ? 5 : 0;
-        var allowSyntheticDefaultImports = typeof compilerOptions.allowSyntheticDefaultImports !== "undefined" ? compilerOptions.allowSyntheticDefaultImports : modulekind === 4;
+        var modulekind = ts.getEmitModuleKind(compilerOptions);
+        var allowSyntheticDefaultImports = typeof compilerOptions.allowSyntheticDefaultImports !== "undefined" ? compilerOptions.allowSyntheticDefaultImports : modulekind === ts.ModuleKind.System;
+        var strictNullChecks = compilerOptions.strictNullChecks;
         var emitResolver = createResolver();
         var undefinedSymbol = createSymbol(4 | 67108864, "undefined");
         undefinedSymbol.declarations = [];
@@ -11455,7 +11986,7 @@ var ts;
             isUnknownSymbol: function (symbol) { return symbol === unknownSymbol; },
             getDiagnostics: getDiagnostics,
             getGlobalDiagnostics: getGlobalDiagnostics,
-            getTypeOfSymbolAtLocation: getNarrowedTypeOfSymbol,
+            getTypeOfSymbolAtLocation: getTypeOfSymbolAtLocation,
             getSymbolsOfParameterPropertyDeclaration: getSymbolsOfParameterPropertyDeclaration,
             getDeclaredTypeOfSymbol: getDeclaredTypeOfSymbol,
             getPropertiesOfType: getPropertiesOfType,
@@ -11490,14 +12021,16 @@ var ts;
         };
         var unknownSymbol = createSymbol(4 | 67108864, "unknown");
         var resolvingSymbol = createSymbol(67108864, "__resolving__");
+        var nullableWideningFlags = strictNullChecks ? 0 : 2097152;
         var anyType = createIntrinsicType(1, "any");
         var stringType = createIntrinsicType(2, "string");
         var numberType = createIntrinsicType(4, "number");
         var booleanType = createIntrinsicType(8, "boolean");
         var esSymbolType = createIntrinsicType(16777216, "symbol");
         var voidType = createIntrinsicType(16, "void");
-        var undefinedType = createIntrinsicType(32 | 2097152, "undefined");
-        var nullType = createIntrinsicType(64 | 2097152, "null");
+        var undefinedType = createIntrinsicType(32 | nullableWideningFlags, "undefined");
+        var nullType = createIntrinsicType(64 | nullableWideningFlags, "null");
+        var emptyArrayElementType = createIntrinsicType(32 | 2097152, "undefined");
         var unknownType = createIntrinsicType(1, "unknown");
         var emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         var emptyUnionType = emptyObjectType;
@@ -11506,24 +12039,27 @@ var ts;
         var anyFunctionType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         anyFunctionType.flags |= 8388608;
         var noConstraintType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
-        var anySignature = createSignature(undefined, undefined, emptyArray, anyType, 0, false, false);
-        var unknownSignature = createSignature(undefined, undefined, emptyArray, unknownType, 0, false, false);
+        var anySignature = createSignature(undefined, undefined, undefined, emptyArray, anyType, undefined, 0, false, false);
+        var unknownSignature = createSignature(undefined, undefined, undefined, emptyArray, unknownType, undefined, 0, false, false);
+        var enumNumberIndexInfo = createIndexInfo(stringType, true);
         var globals = {};
-        var globalESSymbolConstructorSymbol;
+        var getGlobalESSymbolConstructorSymbol;
         var getGlobalPromiseConstructorSymbol;
         var globalObjectType;
         var globalFunctionType;
         var globalArrayType;
+        var globalReadonlyArrayType;
         var globalStringType;
         var globalNumberType;
         var globalBooleanType;
         var globalRegExpType;
-        var globalTemplateStringsArrayType;
-        var globalESSymbolType;
-        var globalIterableType;
-        var globalIteratorType;
-        var globalIterableIteratorType;
         var anyArrayType;
+        var anyReadonlyArrayType;
+        var getGlobalTemplateStringsArrayType;
+        var getGlobalESSymbolType;
+        var getGlobalIterableType;
+        var getGlobalIteratorType;
+        var getGlobalIterableIteratorType;
         var getGlobalClassDecoratorType;
         var getGlobalParameterDecoratorType;
         var getGlobalPropertyDecoratorType;
@@ -11585,6 +12121,7 @@ var ts;
         };
         var subtypeRelation = {};
         var assignableRelation = {};
+        var comparableRelation = {};
         var identityRelation = {};
         var _displayBuilder;
         var builtinGlobals = (_a = {},
@@ -11673,7 +12210,7 @@ var ts;
                 target.flags |= source.flags;
                 if (source.valueDeclaration &&
                     (!target.valueDeclaration ||
-                        (target.valueDeclaration.kind === 221 && source.valueDeclaration.kind !== 221))) {
+                        (target.valueDeclaration.kind === 224 && source.valueDeclaration.kind !== 224))) {
                     target.valueDeclaration = source.valueDeclaration;
                 }
                 ts.forEach(source.declarations, function (node) {
@@ -11692,13 +12229,13 @@ var ts;
                 recordMergedSymbol(target, source);
             }
             else {
-                var message = target.flags & 2 || source.flags & 2
+                var message_2 = target.flags & 2 || source.flags & 2
                     ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0;
                 ts.forEach(source.declarations, function (node) {
-                    error(node.name ? node.name : node, message, symbolToString(source));
+                    error(node.name ? node.name : node, message_2, symbolToString(source));
                 });
                 ts.forEach(target.declarations, function (node) {
-                    error(node.name ? node.name : node, message, symbolToString(source));
+                    error(node.name ? node.name : node, message_2, symbolToString(source));
                 });
             }
         }
@@ -11729,7 +12266,7 @@ var ts;
         }
         function mergeModuleAugmentation(moduleName) {
             var moduleAugmentation = moduleName.parent;
-            if (moduleAugmentation.symbol.valueDeclaration !== moduleAugmentation) {
+            if (moduleAugmentation.symbol.declarations[0] !== moduleAugmentation) {
                 ts.Debug.assert(moduleAugmentation.symbol.declarations.length > 1);
                 return;
             }
@@ -11741,8 +12278,14 @@ var ts;
                 if (!mainModule) {
                     return;
                 }
-                mainModule = mainModule.flags & 33554432 ? mainModule : cloneSymbol(mainModule);
-                mergeSymbol(mainModule, moduleAugmentation.symbol);
+                mainModule = resolveExternalModuleSymbol(mainModule);
+                if (mainModule.flags & 1536) {
+                    mainModule = mainModule.flags & 33554432 ? mainModule : cloneSymbol(mainModule);
+                    mergeSymbol(mainModule, moduleAugmentation.symbol);
+                }
+                else {
+                    error(moduleName, ts.Diagnostics.Cannot_augment_module_0_because_it_resolves_to_a_non_module_entity, moduleName.text);
+                }
             }
         }
         function addToSymbolTable(target, source, message) {
@@ -11771,7 +12314,7 @@ var ts;
             return nodeLinks[nodeId] || (nodeLinks[nodeId] = {});
         }
         function isGlobalSourceFile(node) {
-            return node.kind === 251 && !ts.isExternalOrCommonJsModule(node);
+            return node.kind === 255 && !ts.isExternalOrCommonJsModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning && ts.hasProperty(symbols, name)) {
@@ -11789,9 +12332,9 @@ var ts;
             }
         }
         function getSymbolsOfParameterPropertyDeclaration(parameter, parameterName) {
-            var constructoDeclaration = parameter.parent;
+            var constructorDeclaration = parameter.parent;
             var classDeclaration = parameter.parent.parent;
-            var parameterSymbol = getSymbol(constructoDeclaration.locals, parameterName, 107455);
+            var parameterSymbol = getSymbol(constructorDeclaration.locals, parameterName, 107455);
             var propertySymbol = getSymbol(classDeclaration.symbol.members, parameterName, 107455);
             if (parameterSymbol && propertySymbol) {
                 return [parameterSymbol, propertySymbol];
@@ -11809,18 +12352,18 @@ var ts;
                 return ts.indexOf(sourceFiles, declarationFile) <= ts.indexOf(sourceFiles, useFile);
             }
             if (declaration.pos <= usage.pos) {
-                return declaration.kind !== 214 ||
+                return declaration.kind !== 217 ||
                     !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
             }
             return isUsedInFunctionOrNonStaticProperty(declaration, usage);
             function isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage) {
                 var container = ts.getEnclosingBlockScopeContainer(declaration);
-                if (declaration.parent.parent.kind === 196 ||
-                    declaration.parent.parent.kind === 202) {
+                if (declaration.parent.parent.kind === 199 ||
+                    declaration.parent.parent.kind === 205) {
                     return isSameScopeDescendentOf(usage, declaration, container);
                 }
-                else if (declaration.parent.parent.kind === 204 ||
-                    declaration.parent.parent.kind === 203) {
+                else if (declaration.parent.parent.kind === 207 ||
+                    declaration.parent.parent.kind === 206) {
                     var expression = declaration.parent.parent.expression;
                     return isSameScopeDescendentOf(usage, expression, container);
                 }
@@ -11836,8 +12379,8 @@ var ts;
                         return true;
                     }
                     var initializerOfNonStaticProperty = current.parent &&
-                        current.parent.kind === 142 &&
-                        (current.parent.flags & 64) === 0 &&
+                        current.parent.kind === 144 &&
+                        (current.parent.flags & 32) === 0 &&
                         current.parent.initializer === current;
                     if (initializerOfNonStaticProperty) {
                         return true;
@@ -11858,18 +12401,18 @@ var ts;
                     if (result = getSymbol(location.locals, name, meaning)) {
                         var useResult = true;
                         if (ts.isFunctionLike(location) && lastLocation && lastLocation !== location.body) {
-                            if (meaning & result.flags & 793056) {
+                            if (meaning & result.flags & 793056 && lastLocation.kind !== 272) {
                                 useResult = result.flags & 262144
                                     ? lastLocation === location.type ||
-                                        lastLocation.kind === 139 ||
-                                        lastLocation.kind === 138
+                                        lastLocation.kind === 141 ||
+                                        lastLocation.kind === 140
                                     : false;
                             }
                             if (meaning & 107455 && result.flags & 1) {
                                 useResult =
-                                    lastLocation.kind === 139 ||
+                                    lastLocation.kind === 141 ||
                                         (lastLocation === location.type &&
-                                            result.valueDeclaration.kind === 139);
+                                            result.valueDeclaration.kind === 141);
                             }
                         }
                         if (useResult) {
@@ -11881,12 +12424,12 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 251:
+                    case 255:
                         if (!ts.isExternalOrCommonJsModule(location))
                             break;
-                    case 221:
+                    case 224:
                         var moduleExports = getSymbolOfNode(location).exports;
-                        if (location.kind === 251 || ts.isAmbientModule(location)) {
+                        if (location.kind === 255 || ts.isAmbientModule(location)) {
                             if (result = moduleExports["default"]) {
                                 var localSymbol = ts.getLocalSymbolForExportDefault(result);
                                 if (localSymbol && (result.flags & meaning) && localSymbol.name === name) {
@@ -11896,7 +12439,7 @@ var ts;
                             }
                             if (ts.hasProperty(moduleExports, name) &&
                                 moduleExports[name].flags === 8388608 &&
-                                ts.getDeclarationOfKind(moduleExports[name], 233)) {
+                                ts.getDeclarationOfKind(moduleExports[name], 237)) {
                                 break;
                             }
                         }
@@ -11904,14 +12447,14 @@ var ts;
                             break loop;
                         }
                         break;
-                    case 220:
+                    case 223:
                         if (result = getSymbol(getSymbolOfNode(location).exports, name, meaning & 8)) {
                             break loop;
                         }
                         break;
-                    case 142:
-                    case 141:
-                        if (ts.isClassLike(location.parent) && !(location.flags & 64)) {
+                    case 144:
+                    case 143:
+                        if (ts.isClassLike(location.parent) && !(location.flags & 32)) {
                             var ctor = findConstructorDeclaration(location.parent);
                             if (ctor && ctor.locals) {
                                 if (getSymbol(ctor.locals, name, meaning & 107455)) {
@@ -11920,17 +12463,17 @@ var ts;
                             }
                         }
                         break;
-                    case 217:
-                    case 189:
-                    case 218:
+                    case 220:
+                    case 191:
+                    case 221:
                         if (result = getSymbol(getSymbolOfNode(location).members, name, meaning & 793056)) {
-                            if (lastLocation && lastLocation.flags & 64) {
+                            if (lastLocation && lastLocation.flags & 32) {
                                 error(errorLocation, ts.Diagnostics.Static_members_cannot_reference_class_type_parameters);
                                 return undefined;
                             }
                             break loop;
                         }
-                        if (location.kind === 189 && meaning & 32) {
+                        if (location.kind === 191 && meaning & 32) {
                             var className = location.name;
                             if (className && name === className.text) {
                                 result = location.symbol;
@@ -11938,28 +12481,28 @@ var ts;
                             }
                         }
                         break;
-                    case 137:
+                    case 139:
                         grandparent = location.parent.parent;
-                        if (ts.isClassLike(grandparent) || grandparent.kind === 218) {
+                        if (ts.isClassLike(grandparent) || grandparent.kind === 221) {
                             if (result = getSymbol(getSymbolOfNode(grandparent).members, name, meaning & 793056)) {
                                 error(errorLocation, ts.Diagnostics.A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type);
                                 return undefined;
                             }
                         }
                         break;
-                    case 144:
-                    case 143:
-                    case 145:
                     case 146:
+                    case 145:
                     case 147:
-                    case 216:
-                    case 177:
+                    case 148:
+                    case 149:
+                    case 219:
+                    case 179:
                         if (meaning & 3 && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
                         }
                         break;
-                    case 176:
+                    case 178:
                         if (meaning & 3 && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
@@ -11972,8 +12515,8 @@ var ts;
                             }
                         }
                         break;
-                    case 140:
-                        if (location.parent && location.parent.kind === 139) {
+                    case 142:
+                        if (location.parent && location.parent.kind === 141) {
                             location = location.parent;
                         }
                         if (location.parent && ts.isClassElement(location.parent)) {
@@ -12027,7 +12570,7 @@ var ts;
                         error(errorLocation, ts.Diagnostics.Cannot_find_name_0_Did_you_mean_the_static_member_1_0, typeof nameArg === "string" ? nameArg : ts.declarationNameToString(nameArg), symbolToString(classSymbol));
                         return true;
                     }
-                    if (location === container && !(location.flags & 64)) {
+                    if (location === container && !(location.flags & 32)) {
                         var instanceType = getDeclaredTypeOfSymbol(classSymbol).thisType;
                         if (getPropertyOfType(instanceType, name)) {
                             error(errorLocation, ts.Diagnostics.Cannot_find_name_0_Did_you_mean_the_instance_member_this_0, typeof nameArg === "string" ? nameArg : ts.declarationNameToString(nameArg));
@@ -12043,7 +12586,7 @@ var ts;
             ts.Debug.assert((result.flags & 2) !== 0);
             var declaration = ts.forEach(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) ? d : undefined; });
             ts.Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined");
-            if (!isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 214), errorLocation)) {
+            if (!isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 217), errorLocation)) {
                 error(errorLocation, ts.Diagnostics.Block_scoped_variable_0_used_before_its_declaration, ts.declarationNameToString(declaration.name));
             }
         }
@@ -12060,10 +12603,10 @@ var ts;
         }
         function getAnyImportSyntax(node) {
             if (ts.isAliasSymbolDeclaration(node)) {
-                if (node.kind === 224) {
+                if (node.kind === 228) {
                     return node;
                 }
-                while (node && node.kind !== 225) {
+                while (node && node.kind !== 229) {
                     node = node.parent;
                 }
                 return node;
@@ -12073,7 +12616,7 @@ var ts;
             return ts.forEach(symbol.declarations, function (d) { return ts.isAliasSymbolDeclaration(d) ? d : undefined; });
         }
         function getTargetOfImportEqualsDeclaration(node) {
-            if (node.moduleReference.kind === 235) {
+            if (node.moduleReference.kind === 239) {
                 return resolveExternalModuleSymbol(resolveExternalModuleName(node, ts.getExternalModuleImportEqualsDeclarationExpression(node)));
             }
             return getSymbolOfPartOfRightHandSideOfImportEquals(node.moduleReference, node);
@@ -12081,12 +12624,14 @@ var ts;
         function getTargetOfImportClause(node) {
             var moduleSymbol = resolveExternalModuleName(node, node.parent.moduleSpecifier);
             if (moduleSymbol) {
-                var exportDefaultSymbol = resolveSymbol(moduleSymbol.exports["default"]);
+                var exportDefaultSymbol = moduleSymbol.exports["export="] ?
+                    getPropertyOfType(getTypeOfSymbol(moduleSymbol.exports["export="]), "default") :
+                    resolveSymbol(moduleSymbol.exports["default"]);
                 if (!exportDefaultSymbol && !allowSyntheticDefaultImports) {
                     error(node.name, ts.Diagnostics.Module_0_has_no_default_export, symbolToString(moduleSymbol));
                 }
                 else if (!exportDefaultSymbol && allowSyntheticDefaultImports) {
-                    return resolveSymbol(moduleSymbol.exports["export="]) || resolveSymbol(moduleSymbol);
+                    return resolveExternalModuleSymbol(moduleSymbol) || resolveSymbol(moduleSymbol);
                 }
                 return exportDefaultSymbol;
             }
@@ -12132,8 +12677,14 @@ var ts;
             if (targetSymbol) {
                 var name_9 = specifier.propertyName || specifier.name;
                 if (name_9.text) {
+                    var symbolFromVariable = void 0;
+                    if (moduleSymbol && moduleSymbol.exports && moduleSymbol.exports["export="]) {
+                        symbolFromVariable = getPropertyOfType(getTypeOfSymbol(targetSymbol), name_9.text);
+                    }
+                    else {
+                        symbolFromVariable = getPropertyOfVariable(targetSymbol, name_9.text);
+                    }
                     var symbolFromModule = getExportOfModule(targetSymbol, name_9.text);
-                    var symbolFromVariable = getPropertyOfVariable(targetSymbol, name_9.text);
                     var symbol = symbolFromModule && symbolFromVariable ?
                         combineValueAndTypeSymbols(symbolFromVariable, symbolFromModule) :
                         symbolFromModule || symbolFromVariable;
@@ -12147,6 +12698,9 @@ var ts;
         function getTargetOfImportSpecifier(node) {
             return getExternalModuleMember(node.parent.parent.parent, node);
         }
+        function getTargetOfGlobalModuleExportDeclaration(node) {
+            return resolveExternalModuleSymbol(node.parent.symbol);
+        }
         function getTargetOfExportSpecifier(node) {
             return node.parent.parent.moduleSpecifier ?
                 getExternalModuleMember(node.parent.parent, node) :
@@ -12157,18 +12711,20 @@ var ts;
         }
         function getTargetOfAliasDeclaration(node) {
             switch (node.kind) {
-                case 224:
+                case 228:
                     return getTargetOfImportEqualsDeclaration(node);
-                case 226:
-                    return getTargetOfImportClause(node);
-                case 227:
-                    return getTargetOfNamespaceImport(node);
-                case 229:
-                    return getTargetOfImportSpecifier(node);
-                case 233:
-                    return getTargetOfExportSpecifier(node);
                 case 230:
+                    return getTargetOfImportClause(node);
+                case 231:
+                    return getTargetOfNamespaceImport(node);
+                case 233:
+                    return getTargetOfImportSpecifier(node);
+                case 237:
+                    return getTargetOfExportSpecifier(node);
+                case 234:
                     return getTargetOfExportAssignment(node);
+                case 227:
+                    return getTargetOfGlobalModuleExportDeclaration(node);
             }
         }
         function resolveSymbol(symbol) {
@@ -12209,10 +12765,10 @@ var ts;
             if (!links.referenced) {
                 links.referenced = true;
                 var node = getDeclarationOfAliasSymbol(symbol);
-                if (node.kind === 230) {
+                if (node.kind === 234) {
                     checkExpressionCached(node.expression);
                 }
-                else if (node.kind === 233) {
+                else if (node.kind === 237) {
                     checkExpressionCached(node.propertyName || node.name);
                 }
                 else if (ts.isInternalModuleImportEqualsDeclaration(node)) {
@@ -12222,17 +12778,17 @@ var ts;
         }
         function getSymbolOfPartOfRightHandSideOfImportEquals(entityName, importDeclaration) {
             if (!importDeclaration) {
-                importDeclaration = ts.getAncestor(entityName, 224);
+                importDeclaration = ts.getAncestor(entityName, 228);
                 ts.Debug.assert(importDeclaration !== undefined);
             }
             if (entityName.kind === 69 && ts.isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
                 entityName = entityName.parent;
             }
-            if (entityName.kind === 69 || entityName.parent.kind === 136) {
+            if (entityName.kind === 69 || entityName.parent.kind === 138) {
                 return resolveEntityName(entityName, 1536);
             }
             else {
-                ts.Debug.assert(entityName.parent.kind === 224);
+                ts.Debug.assert(entityName.parent.kind === 228);
                 return resolveEntityName(entityName, 107455 | 793056 | 1536);
             }
         }
@@ -12251,9 +12807,9 @@ var ts;
                     return undefined;
                 }
             }
-            else if (name.kind === 136 || name.kind === 169) {
-                var left = name.kind === 136 ? name.left : name.expression;
-                var right = name.kind === 136 ? name.right : name.name;
+            else if (name.kind === 138 || name.kind === 171) {
+                var left = name.kind === 138 ? name.left : name.expression;
+                var right = name.kind === 138 ? name.right : name.name;
                 var namespace = resolveEntityName(left, 1536, ignoreErrors);
                 if (!namespace || namespace === unknownSymbol || ts.nodeIsMissing(right)) {
                     return undefined;
@@ -12286,7 +12842,7 @@ var ts;
             }
             var isRelative = ts.isExternalModuleNameRelative(moduleName);
             if (!isRelative) {
-                var symbol = getSymbol(globals, "\"" + moduleName + "\"", 512);
+                var symbol = getSymbol(globals, '"' + moduleName + '"', 512);
                 if (symbol) {
                     return getMergedSymbol(symbol);
                 }
@@ -12308,7 +12864,7 @@ var ts;
             return undefined;
         }
         function resolveExternalModuleSymbol(moduleSymbol) {
-            return moduleSymbol && resolveSymbol(moduleSymbol.exports["export="]) || moduleSymbol;
+            return moduleSymbol && getMergedSymbol(resolveSymbol(moduleSymbol.exports["export="])) || moduleSymbol;
         }
         function resolveESModuleSymbol(moduleSymbol, moduleReferenceExpression) {
             var symbol = resolveExternalModuleSymbol(moduleSymbol);
@@ -12318,8 +12874,8 @@ var ts;
             }
             return symbol;
         }
-        function getExportAssignmentSymbol(moduleSymbol) {
-            return moduleSymbol.exports["export="];
+        function hasExportAssignmentSymbol(moduleSymbol) {
+            return moduleSymbol.exports["export="] !== undefined;
         }
         function getExportsOfModuleAsArray(moduleSymbol) {
             return symbolsToArray(getExportsOfModule(moduleSymbol));
@@ -12416,7 +12972,7 @@ var ts;
             var members = node.members;
             for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
                 var member = members_1[_i];
-                if (member.kind === 145 && ts.nodeIsPresent(member.body)) {
+                if (member.kind === 147 && ts.nodeIsPresent(member.body)) {
                     return member;
                 }
             }
@@ -12459,19 +13015,19 @@ var ts;
             }
             return result || emptyArray;
         }
-        function setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexType, numberIndexType) {
+        function setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
             type.members = members;
             type.properties = getNamedMembers(members);
             type.callSignatures = callSignatures;
             type.constructSignatures = constructSignatures;
-            if (stringIndexType)
-                type.stringIndexType = stringIndexType;
-            if (numberIndexType)
-                type.numberIndexType = numberIndexType;
+            if (stringIndexInfo)
+                type.stringIndexInfo = stringIndexInfo;
+            if (numberIndexInfo)
+                type.numberIndexInfo = numberIndexInfo;
             return type;
         }
-        function createAnonymousType(symbol, members, callSignatures, constructSignatures, stringIndexType, numberIndexType) {
-            return setObjectTypeMembers(createObjectType(65536, symbol), members, callSignatures, constructSignatures, stringIndexType, numberIndexType);
+        function createAnonymousType(symbol, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
+            return setObjectTypeMembers(createObjectType(65536, symbol), members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function forEachSymbolTableInScope(enclosingDeclaration, callback) {
             var result;
@@ -12482,21 +13038,15 @@ var ts;
                     }
                 }
                 switch (location_1.kind) {
-                    case 251:
+                    case 255:
                         if (!ts.isExternalOrCommonJsModule(location_1)) {
                             break;
                         }
-                    case 221:
+                    case 224:
                         if (result = callback(getSymbolOfNode(location_1).exports)) {
                             return result;
                         }
                         break;
-                    case 217:
-                    case 218:
-                        if (result = callback(getSymbolOfNode(location_1).members)) {
-                            return result;
-                        }
-                        break;
                 }
             }
             return callback(globals);
@@ -12525,7 +13075,7 @@ var ts;
                 return ts.forEachValue(symbols, function (symbolFromSymbolTable) {
                     if (symbolFromSymbolTable.flags & 8388608
                         && symbolFromSymbolTable.name !== "export="
-                        && !ts.getDeclarationOfKind(symbolFromSymbolTable, 233)) {
+                        && !ts.getDeclarationOfKind(symbolFromSymbolTable, 237)) {
                         if (!useOnlyExternalAliasing ||
                             ts.forEach(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration)) {
                             var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
@@ -12541,7 +13091,9 @@ var ts;
                 });
             }
             if (symbol) {
-                return forEachSymbolTableInScope(enclosingDeclaration, getAccessibleSymbolChainFromSymbolTable);
+                if (!(isPropertyOrMethodDeclarationSymbol(symbol))) {
+                    return forEachSymbolTableInScope(enclosingDeclaration, getAccessibleSymbolChainFromSymbolTable);
+                }
             }
         }
         function needsQualification(symbol, enclosingDeclaration, meaning) {
@@ -12554,7 +13106,7 @@ var ts;
                 if (symbolFromSymbolTable === symbol) {
                     return true;
                 }
-                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608 && !ts.getDeclarationOfKind(symbolFromSymbolTable, 233)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
+                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608 && !ts.getDeclarationOfKind(symbolFromSymbolTable, 237)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
                 if (symbolFromSymbolTable.flags & meaning) {
                     qualify = true;
                     return true;
@@ -12563,6 +13115,24 @@ var ts;
             });
             return qualify;
         }
+        function isPropertyOrMethodDeclarationSymbol(symbol) {
+            if (symbol.declarations && symbol.declarations.length) {
+                for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                    var declaration = _a[_i];
+                    switch (declaration.kind) {
+                        case 144:
+                        case 146:
+                        case 148:
+                        case 149:
+                            continue;
+                        default:
+                            return false;
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
         function isSymbolAccessible(symbol, enclosingDeclaration, meaning) {
             if (symbol && enclosingDeclaration && !(symbol.flags & 262144)) {
                 var initialSymbol = symbol;
@@ -12609,7 +13179,7 @@ var ts;
             }
         }
         function hasExternalModuleSymbol(declaration) {
-            return ts.isAmbientModule(declaration) || (declaration.kind === 251 && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isAmbientModule(declaration) || (declaration.kind === 255 && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasVisibleDeclarations(symbol) {
             var aliasesToMakeVisible;
@@ -12621,7 +13191,7 @@ var ts;
                 if (!isDeclarationVisible(declaration)) {
                     var anyImportSyntax = getAnyImportSyntax(declaration);
                     if (anyImportSyntax &&
-                        !(anyImportSyntax.flags & 2) &&
+                        !(anyImportSyntax.flags & 1) &&
                         isDeclarationVisible(anyImportSyntax.parent)) {
                         getNodeLinks(declaration).isVisible = true;
                         if (aliasesToMakeVisible) {
@@ -12641,11 +13211,11 @@ var ts;
         }
         function isEntityNameVisible(entityName, enclosingDeclaration) {
             var meaning;
-            if (entityName.parent.kind === 155) {
+            if (entityName.parent.kind === 157 || ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
                 meaning = 107455 | 1048576;
             }
-            else if (entityName.kind === 136 || entityName.kind === 169 ||
-                entityName.parent.kind === 224) {
+            else if (entityName.kind === 138 || entityName.kind === 171 ||
+                entityName.parent.kind === 228) {
                 meaning = 1536;
             }
             else {
@@ -12693,13 +13263,29 @@ var ts;
             }
             return result;
         }
+        function typePredicateToString(typePredicate, enclosingDeclaration, flags) {
+            var writer = ts.getSingleLineStringWriter();
+            getSymbolDisplayBuilder().buildTypePredicateDisplay(typePredicate, writer, enclosingDeclaration, flags);
+            var result = writer.string();
+            ts.releaseStringWriter(writer);
+            return result;
+        }
+        function visibilityToString(flags) {
+            if (flags === 8) {
+                return "private";
+            }
+            if (flags === 16) {
+                return "protected";
+            }
+            return "public";
+        }
         function getTypeAliasForTypeLiteral(type) {
             if (type.symbol && type.symbol.flags & 2048) {
                 var node = type.symbol.declarations[0].parent;
-                while (node.kind === 161) {
+                while (node.kind === 163) {
                     node = node.parent;
                 }
-                if (node.kind === 219) {
+                if (node.kind === 222) {
                     return getSymbolOfNode(node);
                 }
             }
@@ -12707,7 +13293,7 @@ var ts;
         }
         function isTopLevelInExternalModuleAugmentation(node) {
             return node && node.parent &&
-                node.parent.kind === 222 &&
+                node.parent.kind === 225 &&
                 ts.isExternalModuleAugmentation(node.parent.parent);
         }
         function getSymbolDisplayBuilder() {
@@ -12718,10 +13304,10 @@ var ts;
                         return ts.declarationNameToString(declaration.name);
                     }
                     switch (declaration.kind) {
-                        case 189:
+                        case 191:
                             return "(Anonymous class)";
-                        case 176:
-                        case 177:
+                        case 178:
+                        case 179:
                             return "(Anonymous function)";
                     }
                 }
@@ -12786,15 +13372,9 @@ var ts;
                 return writeType(type, globalFlags);
                 function writeType(type, flags) {
                     if (type.flags & 16777343) {
-                        if (type.flags & 134217728) {
-                            buildTypePredicateDisplay(writer, type.predicate);
-                            buildTypeDisplay(type.predicate.type, writer, enclosingDeclaration, flags, symbolStack);
-                        }
-                        else {
-                            writer.writeKeyword(!(globalFlags & 16) && isTypeAny(type)
-                                ? "any"
-                                : type.intrinsicName);
-                        }
+                        writer.writeKeyword(!(globalFlags & 16) && isTypeAny(type)
+                            ? "any"
+                            : type.intrinsicName);
                     }
                     else if (type.flags & 33554432) {
                         if (inObjectTypeLiteral) {
@@ -12871,12 +13451,12 @@ var ts;
                             var length_1 = outerTypeParameters.length;
                             while (i < length_1) {
                                 var start = i;
-                                var parent_3 = getParentSymbolOfTypeParameter(outerTypeParameters[i]);
+                                var parent_5 = getParentSymbolOfTypeParameter(outerTypeParameters[i]);
                                 do {
                                     i++;
-                                } while (i < length_1 && getParentSymbolOfTypeParameter(outerTypeParameters[i]) === parent_3);
+                                } while (i < length_1 && getParentSymbolOfTypeParameter(outerTypeParameters[i]) === parent_5);
                                 if (!ts.rangeEquals(outerTypeParameters, typeArguments, start, i)) {
-                                    writeSymbolTypeReference(parent_3, typeArguments, start, i, flags);
+                                    writeSymbolTypeReference(parent_5, typeArguments, start, i, flags);
                                     writePunctuation(writer, 21);
                                 }
                             }
@@ -12931,11 +13511,11 @@ var ts;
                     }
                     function shouldWriteTypeOfFunctionSymbol() {
                         var isStaticMethodSymbol = !!(symbol.flags & 8192 &&
-                            ts.forEach(symbol.declarations, function (declaration) { return declaration.flags & 64; }));
+                            ts.forEach(symbol.declarations, function (declaration) { return declaration.flags & 32; }));
                         var isNonLocalFunctionSymbol = !!(symbol.flags & 16) &&
                             (symbol.parent ||
                                 ts.forEach(symbol.declarations, function (declaration) {
-                                    return declaration.parent.kind === 251 || declaration.parent.kind === 222;
+                                    return declaration.parent.kind === 255 || declaration.parent.kind === 225;
                                 }));
                         if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
                             return !!(flags & 2) ||
@@ -12948,17 +13528,38 @@ var ts;
                     writeSpace(writer);
                     buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, 107455, 0, typeFormatFlags);
                 }
-                function getIndexerParameterName(type, indexKind, fallbackName) {
-                    var declaration = getIndexDeclarationOfSymbol(type.symbol, indexKind);
-                    if (!declaration) {
-                        return fallbackName;
+                function writeIndexSignature(info, keyword) {
+                    if (info) {
+                        if (info.isReadonly) {
+                            writeKeyword(writer, 127);
+                            writeSpace(writer);
+                        }
+                        writePunctuation(writer, 19);
+                        writer.writeParameter(info.declaration ? ts.declarationNameToString(info.declaration.parameters[0].name) : "x");
+                        writePunctuation(writer, 54);
+                        writeSpace(writer);
+                        writeKeyword(writer, keyword);
+                        writePunctuation(writer, 20);
+                        writePunctuation(writer, 54);
+                        writeSpace(writer);
+                        writeType(info.type, 0);
+                        writePunctuation(writer, 23);
+                        writer.writeLine();
+                    }
+                }
+                function writePropertyWithModifiers(prop) {
+                    if (isReadonlySymbol(prop)) {
+                        writeKeyword(writer, 127);
+                        writeSpace(writer);
+                    }
+                    buildSymbolDisplay(prop, writer);
+                    if (prop.flags & 536870912) {
+                        writePunctuation(writer, 53);
                     }
-                    ts.Debug.assert(declaration.parameters.length !== 0);
-                    return ts.declarationNameToString(declaration.parameters[0].name);
                 }
                 function writeLiteralType(type, flags) {
                     var resolved = resolveStructuredTypeMembers(type);
-                    if (!resolved.properties.length && !resolved.stringIndexType && !resolved.numberIndexType) {
+                    if (!resolved.properties.length && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
                         if (!resolved.callSignatures.length && !resolved.constructSignatures.length) {
                             writePunctuation(writer, 15);
                             writePunctuation(writer, 16);
@@ -13004,32 +13605,8 @@ var ts;
                         writePunctuation(writer, 23);
                         writer.writeLine();
                     }
-                    if (resolved.stringIndexType) {
-                        writePunctuation(writer, 19);
-                        writer.writeParameter(getIndexerParameterName(resolved, 0, "x"));
-                        writePunctuation(writer, 54);
-                        writeSpace(writer);
-                        writeKeyword(writer, 130);
-                        writePunctuation(writer, 20);
-                        writePunctuation(writer, 54);
-                        writeSpace(writer);
-                        writeType(resolved.stringIndexType, 0);
-                        writePunctuation(writer, 23);
-                        writer.writeLine();
-                    }
-                    if (resolved.numberIndexType) {
-                        writePunctuation(writer, 19);
-                        writer.writeParameter(getIndexerParameterName(resolved, 1, "x"));
-                        writePunctuation(writer, 54);
-                        writeSpace(writer);
-                        writeKeyword(writer, 128);
-                        writePunctuation(writer, 20);
-                        writePunctuation(writer, 54);
-                        writeSpace(writer);
-                        writeType(resolved.numberIndexType, 0);
-                        writePunctuation(writer, 23);
-                        writer.writeLine();
-                    }
+                    writeIndexSignature(resolved.stringIndexInfo, 131);
+                    writeIndexSignature(resolved.numberIndexInfo, 129);
                     for (var _d = 0, _e = resolved.properties; _d < _e.length; _d++) {
                         var p = _e[_d];
                         var t = getTypeOfSymbol(p);
@@ -13037,20 +13614,14 @@ var ts;
                             var signatures = getSignaturesOfType(t, 0);
                             for (var _f = 0, signatures_1 = signatures; _f < signatures_1.length; _f++) {
                                 var signature = signatures_1[_f];
-                                buildSymbolDisplay(p, writer);
-                                if (p.flags & 536870912) {
-                                    writePunctuation(writer, 53);
-                                }
+                                writePropertyWithModifiers(p);
                                 buildSignatureDisplay(signature, writer, enclosingDeclaration, globalFlagsToPass, undefined, symbolStack);
                                 writePunctuation(writer, 23);
                                 writer.writeLine();
                             }
                         }
                         else {
-                            buildSymbolDisplay(p, writer);
-                            if (p.flags & 536870912) {
-                                writePunctuation(writer, 53);
-                            }
+                            writePropertyWithModifiers(p);
                             writePunctuation(writer, 54);
                             writeSpace(writer);
                             writeType(t, 0);
@@ -13063,10 +13634,10 @@ var ts;
                     inObjectTypeLiteral = saveInObjectTypeLiteral;
                 }
             }
-            function buildTypeParameterDisplayFromSymbol(symbol, writer, enclosingDeclaraiton, flags) {
+            function buildTypeParameterDisplayFromSymbol(symbol, writer, enclosingDeclaration, flags) {
                 var targetSymbol = getTargetSymbol(symbol);
                 if (targetSymbol.flags & 32 || targetSymbol.flags & 64 || targetSymbol.flags & 524288) {
-                    buildDisplayForTypeParametersAndDelimiters(getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol), writer, enclosingDeclaraiton, flags);
+                    buildDisplayForTypeParametersAndDelimiters(getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol), writer, enclosingDeclaration, flags);
                 }
             }
             function buildTypeParameterDisplay(tp, writer, enclosingDeclaration, flags, symbolStack) {
@@ -13084,7 +13655,12 @@ var ts;
                 if (ts.isRestParameter(parameterNode)) {
                     writePunctuation(writer, 22);
                 }
-                appendSymbolNameOnly(p, writer);
+                if (ts.isBindingPattern(parameterNode.name)) {
+                    buildBindingPatternDisplay(parameterNode.name, writer, enclosingDeclaration, flags, symbolStack);
+                }
+                else {
+                    appendSymbolNameOnly(p, writer);
+                }
                 if (isOptionalParameter(parameterNode)) {
                     writePunctuation(writer, 53);
                 }
@@ -13092,19 +13668,58 @@ var ts;
                 writeSpace(writer);
                 buildTypeDisplay(getTypeOfSymbol(p), writer, enclosingDeclaration, flags, symbolStack);
             }
+            function buildBindingPatternDisplay(bindingPattern, writer, enclosingDeclaration, flags, symbolStack) {
+                if (bindingPattern.kind === 166) {
+                    writePunctuation(writer, 15);
+                    buildDisplayForCommaSeparatedList(bindingPattern.elements, writer, function (e) { return buildBindingElementDisplay(e, writer, enclosingDeclaration, flags, symbolStack); });
+                    writePunctuation(writer, 16);
+                }
+                else if (bindingPattern.kind === 167) {
+                    writePunctuation(writer, 19);
+                    var elements = bindingPattern.elements;
+                    buildDisplayForCommaSeparatedList(elements, writer, function (e) { return buildBindingElementDisplay(e, writer, enclosingDeclaration, flags, symbolStack); });
+                    if (elements && elements.hasTrailingComma) {
+                        writePunctuation(writer, 24);
+                    }
+                    writePunctuation(writer, 20);
+                }
+            }
+            function buildBindingElementDisplay(bindingElement, writer, enclosingDeclaration, flags, symbolStack) {
+                if (bindingElement.kind === 192) {
+                    return;
+                }
+                ts.Debug.assert(bindingElement.kind === 168);
+                if (bindingElement.propertyName) {
+                    writer.writeSymbol(ts.getTextOfNode(bindingElement.propertyName), bindingElement.symbol);
+                    writePunctuation(writer, 54);
+                    writeSpace(writer);
+                }
+                if (ts.isBindingPattern(bindingElement.name)) {
+                    buildBindingPatternDisplay(bindingElement.name, writer, enclosingDeclaration, flags, symbolStack);
+                }
+                else {
+                    if (bindingElement.dotDotDotToken) {
+                        writePunctuation(writer, 22);
+                    }
+                    appendSymbolNameOnly(bindingElement.symbol, writer);
+                }
+            }
             function buildDisplayForTypeParametersAndDelimiters(typeParameters, writer, enclosingDeclaration, flags, symbolStack) {
                 if (typeParameters && typeParameters.length) {
                     writePunctuation(writer, 25);
-                    for (var i = 0; i < typeParameters.length; i++) {
-                        if (i > 0) {
-                            writePunctuation(writer, 24);
-                            writeSpace(writer);
-                        }
-                        buildTypeParameterDisplay(typeParameters[i], writer, enclosingDeclaration, flags, symbolStack);
-                    }
+                    buildDisplayForCommaSeparatedList(typeParameters, writer, function (p) { return buildTypeParameterDisplay(p, writer, enclosingDeclaration, flags, symbolStack); });
                     writePunctuation(writer, 27);
                 }
             }
+            function buildDisplayForCommaSeparatedList(list, writer, action) {
+                for (var i = 0; i < list.length; i++) {
+                    if (i > 0) {
+                        writePunctuation(writer, 24);
+                        writeSpace(writer);
+                    }
+                    action(list[i]);
+                }
+            }
             function buildDisplayForTypeArgumentsAndDelimiters(typeParameters, mapper, writer, enclosingDeclaration, flags, symbolStack) {
                 if (typeParameters && typeParameters.length) {
                     writePunctuation(writer, 25);
@@ -13118,10 +13733,16 @@ var ts;
                     writePunctuation(writer, 27);
                 }
             }
-            function buildDisplayForParametersAndDelimiters(parameters, writer, enclosingDeclaration, flags, symbolStack) {
+            function buildDisplayForParametersAndDelimiters(thisType, parameters, writer, enclosingDeclaration, flags, symbolStack) {
                 writePunctuation(writer, 17);
+                if (thisType) {
+                    writeKeyword(writer, 97);
+                    writePunctuation(writer, 54);
+                    writeSpace(writer);
+                    buildTypeDisplay(thisType, writer, enclosingDeclaration, flags, symbolStack);
+                }
                 for (var i = 0; i < parameters.length; i++) {
-                    if (i > 0) {
+                    if (i > 0 || thisType) {
                         writePunctuation(writer, 24);
                         writeSpace(writer);
                     }
@@ -13129,7 +13750,7 @@ var ts;
                 }
                 writePunctuation(writer, 18);
             }
-            function buildTypePredicateDisplay(writer, predicate) {
+            function buildTypePredicateDisplay(predicate, writer, enclosingDeclaration, flags, symbolStack) {
                 if (ts.isIdentifierTypePredicate(predicate)) {
                     writer.writeParameter(predicate.parameterName);
                 }
@@ -13139,6 +13760,7 @@ var ts;
                 writeSpace(writer);
                 writeKeyword(writer, 124);
                 writeSpace(writer);
+                buildTypeDisplay(predicate.type, writer, enclosingDeclaration, flags, symbolStack);
             }
             function buildReturnTypeDisplay(signature, writer, enclosingDeclaration, flags, symbolStack) {
                 if (flags & 8) {
@@ -13149,8 +13771,13 @@ var ts;
                     writePunctuation(writer, 54);
                 }
                 writeSpace(writer);
-                var returnType = getReturnTypeOfSignature(signature);
-                buildTypeDisplay(returnType, writer, enclosingDeclaration, flags, symbolStack);
+                if (signature.typePredicate) {
+                    buildTypePredicateDisplay(signature.typePredicate, writer, enclosingDeclaration, flags, symbolStack);
+                }
+                else {
+                    var returnType = getReturnTypeOfSignature(signature);
+                    buildTypeDisplay(returnType, writer, enclosingDeclaration, flags, symbolStack);
+                }
             }
             function buildSignatureDisplay(signature, writer, enclosingDeclaration, flags, kind, symbolStack) {
                 if (kind === 1) {
@@ -13163,13 +13790,14 @@ var ts;
                 else {
                     buildDisplayForTypeParametersAndDelimiters(signature.typeParameters, writer, enclosingDeclaration, flags, symbolStack);
                 }
-                buildDisplayForParametersAndDelimiters(signature.parameters, writer, enclosingDeclaration, flags, symbolStack);
+                buildDisplayForParametersAndDelimiters(signature.thisType, signature.parameters, writer, enclosingDeclaration, flags, symbolStack);
                 buildReturnTypeDisplay(signature, writer, enclosingDeclaration, flags, symbolStack);
             }
             return _displayBuilder || (_displayBuilder = {
                 buildSymbolDisplay: buildSymbolDisplay,
                 buildTypeDisplay: buildTypeDisplay,
                 buildTypeParameterDisplay: buildTypeParameterDisplay,
+                buildTypePredicateDisplay: buildTypePredicateDisplay,
                 buildParameterDisplay: buildParameterDisplay,
                 buildDisplayForParametersAndDelimiters: buildDisplayForParametersAndDelimiters,
                 buildDisplayForTypeParametersAndDelimiters: buildDisplayForTypeParametersAndDelimiters,
@@ -13189,74 +13817,74 @@ var ts;
             return false;
             function determineIfDeclarationIsVisible() {
                 switch (node.kind) {
-                    case 166:
+                    case 168:
                         return isDeclarationVisible(node.parent.parent);
-                    case 214:
+                    case 217:
                         if (ts.isBindingPattern(node.name) &&
                             !node.name.elements.length) {
                             return false;
                         }
-                    case 221:
-                    case 217:
-                    case 218:
-                    case 219:
-                    case 216:
-                    case 220:
                     case 224:
+                    case 220:
+                    case 221:
+                    case 222:
+                    case 219:
+                    case 223:
+                    case 228:
                         if (ts.isExternalModuleAugmentation(node)) {
                             return true;
                         }
-                        var parent_4 = getDeclarationContainer(node);
-                        if (!(ts.getCombinedNodeFlags(node) & 2) &&
-                            !(node.kind !== 224 && parent_4.kind !== 251 && ts.isInAmbientContext(parent_4))) {
-                            return isGlobalSourceFile(parent_4);
+                        var parent_6 = getDeclarationContainer(node);
+                        if (!(ts.getCombinedNodeFlags(node) & 1) &&
+                            !(node.kind !== 228 && parent_6.kind !== 255 && ts.isInAmbientContext(parent_6))) {
+                            return isGlobalSourceFile(parent_6);
                         }
-                        return isDeclarationVisible(parent_4);
-                    case 142:
-                    case 141:
-                    case 146:
-                    case 147:
+                        return isDeclarationVisible(parent_6);
                     case 144:
                     case 143:
-                        if (node.flags & (16 | 32)) {
+                    case 148:
+                    case 149:
+                    case 146:
+                    case 145:
+                        if (node.flags & (8 | 16)) {
                             return false;
                         }
-                    case 145:
-                    case 149:
-                    case 148:
+                    case 147:
+                    case 151:
                     case 150:
-                    case 139:
-                    case 222:
-                    case 153:
-                    case 154:
-                    case 156:
                     case 152:
-                    case 157:
+                    case 141:
+                    case 225:
+                    case 155:
+                    case 156:
                     case 158:
+                    case 154:
                     case 159:
                     case 160:
                     case 161:
+                    case 162:
+                    case 163:
                         return isDeclarationVisible(node.parent);
-                    case 226:
-                    case 227:
-                    case 229:
-                        return false;
-                    case 138:
-                    case 251:
-                        return true;
                     case 230:
+                    case 231:
+                    case 233:
+                        return false;
+                    case 140:
+                    case 255:
+                        return true;
+                    case 234:
                         return false;
                     default:
-                        ts.Debug.fail("isDeclarationVisible unknown: SyntaxKind: " + node.kind);
+                        return false;
                 }
             }
         }
         function collectLinkedAliases(node) {
             var exportSymbol;
-            if (node.parent && node.parent.kind === 230) {
+            if (node.parent && node.parent.kind === 234) {
                 exportSymbol = resolveName(node.parent, node.text, 107455 | 793056 | 1536 | 8388608, ts.Diagnostics.Cannot_find_name_0, node);
             }
-            else if (node.parent.kind === 233) {
+            else if (node.parent.kind === 237) {
                 var exportSpecifier = node.parent;
                 exportSymbol = exportSpecifier.parent.parent.moduleSpecifier ?
                     getExternalModuleMember(exportSpecifier.parent.parent, exportSpecifier) :
@@ -13333,10 +13961,23 @@ var ts;
         }
         function getDeclarationContainer(node) {
             node = ts.getRootDeclaration(node);
-            return node.kind === 214 ? node.parent.parent.parent : node.parent;
+            while (node) {
+                switch (node.kind) {
+                    case 217:
+                    case 218:
+                    case 233:
+                    case 232:
+                    case 231:
+                    case 230:
+                        node = node.parent;
+                        break;
+                    default:
+                        return node.parent;
+                }
+            }
         }
         function getTypeOfPrototypeProperty(prototype) {
-            var classType = getDeclaredTypeOfSymbol(getMergedSymbol(prototype.parent));
+            var classType = getDeclaredTypeOfSymbol(getParentOfSymbol(prototype));
             return classType.typeParameters ? createTypeReference(classType, ts.map(classType.typeParameters, function (_) { return anyType; })) : classType;
         }
         function getTypeOfPropertyOfType(type, name) {
@@ -13357,7 +13998,7 @@ var ts;
                 case 9:
                 case 8:
                     return name.text;
-                case 137:
+                case 139:
                     if (ts.isStringOrNumericLiteral(name.expression.kind)) {
                         return name.expression.text;
                     }
@@ -13365,7 +14006,7 @@ var ts;
             return undefined;
         }
         function isComputedNonLiteralName(name) {
-            return name.kind === 137 && !ts.isStringOrNumericLiteral(name.expression.kind);
+            return name.kind === 139 && !ts.isStringOrNumericLiteral(name.expression.kind);
         }
         function getTypeForBindingElement(declaration) {
             var pattern = declaration.parent;
@@ -13380,11 +14021,14 @@ var ts;
                 return parentType;
             }
             var type;
-            if (pattern.kind === 164) {
+            if (pattern.kind === 166) {
                 var name_10 = declaration.propertyName || declaration.name;
                 if (isComputedNonLiteralName(name_10)) {
                     return anyType;
                 }
+                if (declaration.initializer) {
+                    getContextualType(declaration.initializer);
+                }
                 var text = getTextOfPropertyName(name_10);
                 type = getTypeOfPropertyOfType(parentType, text) ||
                     isNumericLiteralName(text) && getIndexTypeOfType(parentType, 1) ||
@@ -13415,38 +14059,77 @@ var ts;
                     type = createArrayType(elementType);
                 }
             }
+            if (strictNullChecks && declaration.initializer && !(getNullableKind(checkExpressionCached(declaration.initializer)) & 32)) {
+                type = removeNullableKind(type, 32);
+            }
             return type;
         }
+        function getTypeForVariableLikeDeclarationFromJSDocComment(declaration) {
+            var jsDocType = getJSDocTypeForVariableLikeDeclarationFromJSDocComment(declaration);
+            if (jsDocType) {
+                return getTypeFromTypeNode(jsDocType);
+            }
+        }
+        function getJSDocTypeForVariableLikeDeclarationFromJSDocComment(declaration) {
+            var typeTag = ts.getJSDocTypeTag(declaration);
+            if (typeTag && typeTag.typeExpression) {
+                return typeTag.typeExpression.type;
+            }
+            if (declaration.kind === 217 &&
+                declaration.parent.kind === 218 &&
+                declaration.parent.parent.kind === 199) {
+                var annotation = ts.getJSDocTypeTag(declaration.parent.parent);
+                if (annotation && annotation.typeExpression) {
+                    return annotation.typeExpression.type;
+                }
+            }
+            else if (declaration.kind === 141) {
+                var paramTag = ts.getCorrespondingJSDocParameterTag(declaration);
+                if (paramTag && paramTag.typeExpression) {
+                    return paramTag.typeExpression.type;
+                }
+            }
+            return undefined;
+        }
         function getTypeForVariableLikeDeclaration(declaration) {
-            if (declaration.parent.parent.kind === 203) {
+            if (declaration.flags & 134217728) {
+                var type = getTypeForVariableLikeDeclarationFromJSDocComment(declaration);
+                if (type && type !== unknownType) {
+                    return type;
+                }
+            }
+            if (declaration.parent.parent.kind === 206) {
                 return stringType;
             }
-            if (declaration.parent.parent.kind === 204) {
+            if (declaration.parent.parent.kind === 207) {
                 return checkRightHandSideOfForOf(declaration.parent.parent.expression) || anyType;
             }
             if (ts.isBindingPattern(declaration.parent)) {
                 return getTypeForBindingElement(declaration);
             }
             if (declaration.type) {
-                return getTypeFromTypeNode(declaration.type);
+                var type = getTypeFromTypeNode(declaration.type);
+                return strictNullChecks && declaration.questionToken ? addNullableKind(type, 32) : type;
             }
-            if (declaration.kind === 139) {
+            if (declaration.kind === 141) {
                 var func = declaration.parent;
-                if (func.kind === 147 && !ts.hasDynamicName(func)) {
-                    var getter = ts.getDeclarationOfKind(declaration.parent.symbol, 146);
+                if (func.kind === 149 && !ts.hasDynamicName(func)) {
+                    var getter = ts.getDeclarationOfKind(declaration.parent.symbol, 148);
                     if (getter) {
                         return getReturnTypeOfSignature(getSignatureFromDeclaration(getter));
                     }
                 }
-                var type = getContextuallyTypedParameterType(declaration);
+                var type = declaration.symbol.name === "this"
+                    ? getContextuallyTypedThisType(func)
+                    : getContextuallyTypedParameterType(declaration);
                 if (type) {
-                    return type;
+                    return strictNullChecks && declaration.questionToken ? addNullableKind(type, 32) : type;
                 }
             }
             if (declaration.initializer) {
                 return checkExpressionCached(declaration.initializer);
             }
-            if (declaration.kind === 249) {
+            if (declaration.kind === 253) {
                 return checkIdentifier(declaration.name);
             }
             if (ts.isBindingPattern(declaration.name)) {
@@ -13456,11 +14139,16 @@ var ts;
         }
         function getTypeFromBindingElement(element, includePatternInType) {
             if (element.initializer) {
-                return getWidenedType(checkExpressionCached(element.initializer));
+                var type = checkExpressionCached(element.initializer);
+                reportErrorsFromWidening(element, type);
+                return getWidenedType(type);
             }
             if (ts.isBindingPattern(element.name)) {
                 return getTypeFromBindingPattern(element.name, includePatternInType);
             }
+            if (compilerOptions.noImplicitAny) {
+                reportImplicitAnyError(element, anyType);
+            }
             return anyType;
         }
         function getTypeFromObjectBindingPattern(pattern, includePatternInType) {
@@ -13493,7 +14181,7 @@ var ts;
             if (elements.length === 0 || elements[elements.length - 1].dotDotDotToken) {
                 return languageVersion >= 2 ? createIterableType(anyType) : anyArrayType;
             }
-            var elementTypes = ts.map(elements, function (e) { return e.kind === 190 ? anyType : getTypeFromBindingElement(e, includePatternInType); });
+            var elementTypes = ts.map(elements, function (e) { return e.kind === 192 ? anyType : getTypeFromBindingElement(e, includePatternInType); });
             if (includePatternInType) {
                 var result = createNewTupleType(elementTypes);
                 result.pattern = pattern;
@@ -13502,7 +14190,7 @@ var ts;
             return createTupleType(elementTypes);
         }
         function getTypeFromBindingPattern(pattern, includePatternInType) {
-            return pattern.kind === 164
+            return pattern.kind === 166
                 ? getTypeFromObjectBindingPattern(pattern, includePatternInType)
                 : getTypeFromArrayBindingPattern(pattern, includePatternInType);
         }
@@ -13512,10 +14200,7 @@ var ts;
                 if (reportErrors) {
                     reportErrorsFromWidening(declaration, type);
                 }
-                if (declaration.kind === 248) {
-                    return type;
-                }
-                if (type.flags & 134217728 && (declaration.kind === 142 || declaration.kind === 141)) {
+                if (declaration.kind === 252) {
                     return type;
                 }
                 return getWidenedType(type);
@@ -13523,7 +14208,7 @@ var ts;
             type = declaration.dotDotDotToken ? anyArrayType : anyType;
             if (reportErrors && compilerOptions.noImplicitAny) {
                 var root = ts.getRootDeclaration(declaration);
-                if (!isPrivateWithinAmbient(root) && !(root.kind === 139 && isPrivateWithinAmbient(root.parent))) {
+                if (!isPrivateWithinAmbient(root) && !(root.kind === 141 && isPrivateWithinAmbient(root.parent))) {
                     reportImplicitAnyError(declaration, type);
                 }
             }
@@ -13536,17 +14221,17 @@ var ts;
                     return links.type = getTypeOfPrototypeProperty(symbol);
                 }
                 var declaration = symbol.valueDeclaration;
-                if (declaration.parent.kind === 247) {
+                if (declaration.parent.kind === 251) {
                     return links.type = anyType;
                 }
-                if (declaration.kind === 230) {
+                if (declaration.kind === 234) {
                     return links.type = checkExpression(declaration.expression);
                 }
-                if (declaration.kind === 184) {
-                    return links.type = checkExpression(declaration.right);
+                if (declaration.kind === 186) {
+                    return links.type = getUnionType(ts.map(symbol.declarations, function (decl) { return checkExpressionCached(decl.right); }));
                 }
-                if (declaration.kind === 169) {
-                    if (declaration.parent.kind === 184) {
+                if (declaration.kind === 171) {
+                    if (declaration.parent.kind === 186) {
                         return links.type = checkExpressionCached(declaration.parent.right);
                     }
                 }
@@ -13572,7 +14257,7 @@ var ts;
         }
         function getAnnotatedAccessorType(accessor) {
             if (accessor) {
-                if (accessor.kind === 146) {
+                if (accessor.kind === 148) {
                     return accessor.type && getTypeFromTypeNode(accessor.type);
                 }
                 else {
@@ -13585,12 +14270,18 @@ var ts;
         function getTypeOfAccessors(symbol) {
             var links = getSymbolLinks(symbol);
             if (!links.type) {
+                var getter = ts.getDeclarationOfKind(symbol, 148);
+                var setter = ts.getDeclarationOfKind(symbol, 149);
+                if (getter && getter.flags & 134217728) {
+                    var jsDocType = getTypeForVariableLikeDeclarationFromJSDocComment(getter);
+                    if (jsDocType) {
+                        return links.type = jsDocType;
+                    }
+                }
                 if (!pushTypeResolution(symbol, 0)) {
                     return unknownType;
                 }
-                var getter = ts.getDeclarationOfKind(symbol, 146);
-                var setter = ts.getDeclarationOfKind(symbol, 147);
-                var type;
+                var type = void 0;
                 var getterReturnType = getAnnotatedAccessorType(getter);
                 if (getterReturnType) {
                     type = getterReturnType;
@@ -13615,7 +14306,7 @@ var ts;
                 if (!popTypeResolution()) {
                     type = anyType;
                     if (compilerOptions.noImplicitAny) {
-                        var getter_1 = ts.getDeclarationOfKind(symbol, 146);
+                        var getter_1 = ts.getDeclarationOfKind(symbol, 148);
                         error(getter_1, ts.Diagnostics._0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions, symbolToString(symbol));
                     }
                 }
@@ -13704,9 +14395,9 @@ var ts;
                 if (!node) {
                     return typeParameters;
                 }
-                if (node.kind === 217 || node.kind === 189 ||
-                    node.kind === 216 || node.kind === 176 ||
-                    node.kind === 144 || node.kind === 177) {
+                if (node.kind === 220 || node.kind === 191 ||
+                    node.kind === 219 || node.kind === 178 ||
+                    node.kind === 146 || node.kind === 179) {
                     var declarations = node.typeParameters;
                     if (declarations) {
                         return appendTypeParameters(appendOuterTypeParameters(typeParameters, node), declarations);
@@ -13715,15 +14406,15 @@ var ts;
             }
         }
         function getOuterTypeParametersOfClassOrInterface(symbol) {
-            var declaration = symbol.flags & 32 ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 218);
+            var declaration = symbol.flags & 32 ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 221);
             return appendOuterTypeParameters(undefined, declaration);
         }
         function getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol) {
             var result;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var node = _a[_i];
-                if (node.kind === 218 || node.kind === 217 ||
-                    node.kind === 189 || node.kind === 219) {
+                if (node.kind === 221 || node.kind === 220 ||
+                    node.kind === 191 || node.kind === 222) {
                     var declaration = node;
                     if (declaration.typeParameters) {
                         result = appendTypeParameters(result, declaration.typeParameters);
@@ -13748,8 +14439,8 @@ var ts;
         function getInstantiatedConstructorsForTypeArguments(type, typeArgumentNodes) {
             var signatures = getConstructorsForTypeArguments(type, typeArgumentNodes);
             if (typeArgumentNodes) {
-                var typeArguments = ts.map(typeArgumentNodes, getTypeFromTypeNode);
-                signatures = ts.map(signatures, function (sig) { return getSignatureInstantiation(sig, typeArguments); });
+                var typeArguments_1 = ts.map(typeArgumentNodes, getTypeFromTypeNode);
+                signatures = ts.map(signatures, function (sig) { return getSignatureInstantiation(sig, typeArguments_1); });
             }
             return signatures;
         }
@@ -13846,7 +14537,7 @@ var ts;
             type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
             for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 218 && ts.getInterfaceBaseTypeNodes(declaration)) {
+                if (declaration.kind === 221 && ts.getInterfaceBaseTypeNodes(declaration)) {
                     for (var _b = 0, _c = ts.getInterfaceBaseTypeNodes(declaration); _b < _c.length; _b++) {
                         var node = _c[_b];
                         var baseType = getTypeFromTypeNode(node);
@@ -13875,8 +14566,8 @@ var ts;
         function isIndependentInterface(symbol) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 218) {
-                    if (declaration.flags & 262144) {
+                if (declaration.kind === 221) {
+                    if (declaration.flags & 16384) {
                         return false;
                     }
                     var baseTypeNodes = ts.getInterfaceBaseTypeNodes(declaration);
@@ -13924,7 +14615,7 @@ var ts;
                 if (!pushTypeResolution(symbol, 2)) {
                     return unknownType;
                 }
-                var declaration = ts.getDeclarationOfKind(symbol, 219);
+                var declaration = ts.getDeclarationOfKind(symbol, 222);
                 var type = getTypeFromTypeNode(declaration.type);
                 if (popTypeResolution()) {
                     links.typeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
@@ -13955,7 +14646,7 @@ var ts;
             if (!links.declaredType) {
                 var type = createType(512);
                 type.symbol = symbol;
-                if (!ts.getDeclarationOfKind(symbol, 138).constraint) {
+                if (!ts.getDeclarationOfKind(symbol, 140).constraint) {
                     type.constraint = noConstraintType;
                 }
                 links.declaredType = type;
@@ -14002,16 +14693,18 @@ var ts;
         function isIndependentType(node) {
             switch (node.kind) {
                 case 117:
-                case 130:
-                case 128:
-                case 120:
                 case 131:
+                case 129:
+                case 120:
+                case 132:
                 case 103:
-                case 163:
+                case 134:
+                case 93:
+                case 165:
                     return true;
-                case 157:
+                case 159:
                     return isIndependentType(node.elementType);
-                case 152:
+                case 154:
                     return isIndependentTypeReference(node);
             }
             return false;
@@ -14020,7 +14713,7 @@ var ts;
             return node.type && isIndependentType(node.type) || !node.type && !node.initializer;
         }
         function isIndependentFunctionLikeDeclaration(node) {
-            if (node.kind !== 145 && (!node.type || !isIndependentType(node.type))) {
+            if (node.kind !== 147 && (!node.type || !isIndependentType(node.type))) {
                 return false;
             }
             for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
@@ -14036,12 +14729,12 @@ var ts;
                 var declaration = symbol.declarations[0];
                 if (declaration) {
                     switch (declaration.kind) {
-                        case 142:
-                        case 141:
-                            return isIndependentVariableLikeDeclaration(declaration);
                         case 144:
                         case 143:
+                            return isIndependentVariableLikeDeclaration(declaration);
+                        case 146:
                         case 145:
+                        case 147:
                             return isIndependentFunctionLikeDeclaration(declaration);
                     }
                 }
@@ -14078,8 +14771,8 @@ var ts;
                 type.declaredProperties = getNamedMembers(symbol.members);
                 type.declaredCallSignatures = getSignaturesOfSymbol(symbol.members["__call"]);
                 type.declaredConstructSignatures = getSignaturesOfSymbol(symbol.members["__new"]);
-                type.declaredStringIndexType = getIndexTypeOfSymbol(symbol, 0);
-                type.declaredNumberIndexType = getIndexTypeOfSymbol(symbol, 1);
+                type.declaredStringIndexInfo = getIndexInfoOfSymbol(symbol, 0);
+                type.declaredNumberIndexInfo = getIndexInfoOfSymbol(symbol, 1);
             }
             return type;
         }
@@ -14094,15 +14787,15 @@ var ts;
             var members = source.symbol.members;
             var callSignatures = source.declaredCallSignatures;
             var constructSignatures = source.declaredConstructSignatures;
-            var stringIndexType = source.declaredStringIndexType;
-            var numberIndexType = source.declaredNumberIndexType;
+            var stringIndexInfo = source.declaredStringIndexInfo;
+            var numberIndexInfo = source.declaredNumberIndexInfo;
             if (!ts.rangeEquals(typeParameters, typeArguments, 0, typeParameters.length)) {
                 mapper = createTypeMapper(typeParameters, typeArguments);
                 members = createInstantiatedSymbolTable(source.declaredProperties, mapper, typeParameters.length === 1);
                 callSignatures = instantiateList(source.declaredCallSignatures, mapper, instantiateSignature);
                 constructSignatures = instantiateList(source.declaredConstructSignatures, mapper, instantiateSignature);
-                stringIndexType = instantiateType(source.declaredStringIndexType, mapper);
-                numberIndexType = instantiateType(source.declaredNumberIndexType, mapper);
+                stringIndexInfo = instantiateIndexInfo(source.declaredStringIndexInfo, mapper);
+                numberIndexInfo = instantiateIndexInfo(source.declaredNumberIndexInfo, mapper);
             }
             var baseTypes = getBaseTypes(source);
             if (baseTypes.length) {
@@ -14116,11 +14809,11 @@ var ts;
                     addInheritedMembers(members, getPropertiesOfObjectType(instantiatedBaseType));
                     callSignatures = ts.concatenate(callSignatures, getSignaturesOfType(instantiatedBaseType, 0));
                     constructSignatures = ts.concatenate(constructSignatures, getSignaturesOfType(instantiatedBaseType, 1));
-                    stringIndexType = stringIndexType || getIndexTypeOfType(instantiatedBaseType, 0);
-                    numberIndexType = numberIndexType || getIndexTypeOfType(instantiatedBaseType, 1);
+                    stringIndexInfo = stringIndexInfo || getIndexInfoOfType(instantiatedBaseType, 0);
+                    numberIndexInfo = numberIndexInfo || getIndexInfoOfType(instantiatedBaseType, 1);
                 }
             }
-            setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexType, numberIndexType);
+            setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function resolveClassOrInterfaceMembers(type) {
             resolveObjectTypeMembers(type, resolveDeclaredMembers(type), emptyArray, emptyArray);
@@ -14132,25 +14825,27 @@ var ts;
                 type.typeArguments : ts.concatenate(type.typeArguments, [type]);
             resolveObjectTypeMembers(type, source, typeParameters, typeArguments);
         }
-        function createSignature(declaration, typeParameters, parameters, resolvedReturnType, minArgumentCount, hasRestParameter, hasStringLiterals) {
+        function createSignature(declaration, typeParameters, thisType, parameters, resolvedReturnType, typePredicate, minArgumentCount, hasRestParameter, hasStringLiterals) {
             var sig = new Signature(checker);
             sig.declaration = declaration;
             sig.typeParameters = typeParameters;
             sig.parameters = parameters;
+            sig.thisType = thisType;
             sig.resolvedReturnType = resolvedReturnType;
+            sig.typePredicate = typePredicate;
             sig.minArgumentCount = minArgumentCount;
             sig.hasRestParameter = hasRestParameter;
             sig.hasStringLiterals = hasStringLiterals;
             return sig;
         }
         function cloneSignature(sig) {
-            return createSignature(sig.declaration, sig.typeParameters, sig.parameters, sig.resolvedReturnType, sig.minArgumentCount, sig.hasRestParameter, sig.hasStringLiterals);
+            return createSignature(sig.declaration, sig.typeParameters, sig.thisType, sig.parameters, sig.resolvedReturnType, sig.typePredicate, sig.minArgumentCount, sig.hasRestParameter, sig.hasStringLiterals);
         }
         function getDefaultConstructSignatures(classType) {
             var baseConstructorType = getBaseConstructorTypeOfClass(classType);
             var baseSignatures = getSignaturesOfType(baseConstructorType, 1);
             if (baseSignatures.length === 0) {
-                return [createSignature(undefined, classType.localTypeParameters, emptyArray, classType, 0, false, false)];
+                return [createSignature(undefined, classType.localTypeParameters, undefined, emptyArray, classType, undefined, 0, false, false)];
             }
             var baseTypeNode = getBaseTypeNodeOfClass(classType);
             var typeArguments = ts.map(baseTypeNode.typeArguments, getTypeFromTypeNode);
@@ -14182,12 +14877,12 @@ var ts;
             var arrayType = resolveStructuredTypeMembers(createTypeFromGenericGlobalType(globalArrayType, [arrayElementType, type]));
             var members = createTupleTypeMemberSymbols(type.elementTypes);
             addInheritedMembers(members, arrayType.properties);
-            setObjectTypeMembers(type, members, arrayType.callSignatures, arrayType.constructSignatures, arrayType.stringIndexType, arrayType.numberIndexType);
+            setObjectTypeMembers(type, members, arrayType.callSignatures, arrayType.constructSignatures, arrayType.stringIndexInfo, arrayType.numberIndexInfo);
         }
-        function findMatchingSignature(signatureList, signature, partialMatch, ignoreReturnTypes) {
+        function findMatchingSignature(signatureList, signature, partialMatch, ignoreThisTypes, ignoreReturnTypes) {
             for (var _i = 0, signatureList_1 = signatureList; _i < signatureList_1.length; _i++) {
                 var s = signatureList_1[_i];
-                if (compareSignaturesIdentical(s, signature, partialMatch, ignoreReturnTypes, compareTypesIdentical)) {
+                if (compareSignaturesIdentical(s, signature, partialMatch, ignoreThisTypes, ignoreReturnTypes, compareTypesIdentical)) {
                     return s;
                 }
             }
@@ -14198,7 +14893,7 @@ var ts;
                     return undefined;
                 }
                 for (var i = 1; i < signatureLists.length; i++) {
-                    if (!findMatchingSignature(signatureLists[i], signature, false, false)) {
+                    if (!findMatchingSignature(signatureLists[i], signature, false, false, false)) {
                         return undefined;
                     }
                 }
@@ -14206,7 +14901,7 @@ var ts;
             }
             var result = undefined;
             for (var i = 0; i < signatureLists.length; i++) {
-                var match = i === listIndex ? signature : findMatchingSignature(signatureLists[i], signature, true, true);
+                var match = i === listIndex ? signature : findMatchingSignature(signatureLists[i], signature, true, true, true);
                 if (!match) {
                     return undefined;
                 }
@@ -14222,12 +14917,15 @@ var ts;
             for (var i = 0; i < signatureLists.length; i++) {
                 for (var _i = 0, _a = signatureLists[i]; _i < _a.length; _i++) {
                     var signature = _a[_i];
-                    if (!result || !findMatchingSignature(result, signature, false, true)) {
+                    if (!result || !findMatchingSignature(result, signature, false, true, true)) {
                         var unionSignatures = findMatchingSignatures(signatureLists, signature, i);
                         if (unionSignatures) {
                             var s = signature;
                             if (unionSignatures.length > 1) {
                                 s = cloneSignature(signature);
+                                if (ts.forEach(unionSignatures, function (sig) { return sig.thisType; })) {
+                                    s.thisType = getUnionType(ts.map(unionSignatures, function (sig) { return sig.thisType || anyType; }));
+                                }
                                 s.resolvedReturnType = undefined;
                                 s.unionSignatures = unionSignatures;
                             }
@@ -14238,41 +14936,46 @@ var ts;
             }
             return result || emptyArray;
         }
-        function getUnionIndexType(types, kind) {
+        function getUnionIndexInfo(types, kind) {
             var indexTypes = [];
+            var isAnyReadonly = false;
             for (var _i = 0, types_1 = types; _i < types_1.length; _i++) {
                 var type = types_1[_i];
-                var indexType = getIndexTypeOfType(type, kind);
-                if (!indexType) {
+                var indexInfo = getIndexInfoOfType(type, kind);
+                if (!indexInfo) {
                     return undefined;
                 }
-                indexTypes.push(indexType);
+                indexTypes.push(indexInfo.type);
+                isAnyReadonly = isAnyReadonly || indexInfo.isReadonly;
             }
-            return getUnionType(indexTypes);
+            return createIndexInfo(getUnionType(indexTypes), isAnyReadonly);
         }
         function resolveUnionTypeMembers(type) {
             var callSignatures = getUnionSignatures(type.types, 0);
             var constructSignatures = getUnionSignatures(type.types, 1);
-            var stringIndexType = getUnionIndexType(type.types, 0);
-            var numberIndexType = getUnionIndexType(type.types, 1);
-            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexType, numberIndexType);
+            var stringIndexInfo = getUnionIndexInfo(type.types, 0);
+            var numberIndexInfo = getUnionIndexInfo(type.types, 1);
+            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function intersectTypes(type1, type2) {
             return !type1 ? type2 : !type2 ? type1 : getIntersectionType([type1, type2]);
         }
+        function intersectIndexInfos(info1, info2) {
+            return !info1 ? info2 : !info2 ? info1 : createIndexInfo(getIntersectionType([info1.type, info2.type]), info1.isReadonly && info2.isReadonly);
+        }
         function resolveIntersectionTypeMembers(type) {
             var callSignatures = emptyArray;
             var constructSignatures = emptyArray;
-            var stringIndexType = undefined;
-            var numberIndexType = undefined;
+            var stringIndexInfo = undefined;
+            var numberIndexInfo = undefined;
             for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                 var t = _a[_i];
                 callSignatures = ts.concatenate(callSignatures, getSignaturesOfType(t, 0));
                 constructSignatures = ts.concatenate(constructSignatures, getSignaturesOfType(t, 1));
-                stringIndexType = intersectTypes(stringIndexType, getIndexTypeOfType(t, 0));
-                numberIndexType = intersectTypes(numberIndexType, getIndexTypeOfType(t, 1));
+                stringIndexInfo = intersectIndexInfos(stringIndexInfo, getIndexInfoOfType(t, 0));
+                numberIndexInfo = intersectIndexInfos(numberIndexInfo, getIndexInfoOfType(t, 1));
             }
-            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexType, numberIndexType);
+            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function resolveAnonymousTypeMembers(type) {
             var symbol = type.symbol;
@@ -14280,17 +14983,17 @@ var ts;
                 var members = createInstantiatedSymbolTable(getPropertiesOfObjectType(type.target), type.mapper, false);
                 var callSignatures = instantiateList(getSignaturesOfType(type.target, 0), type.mapper, instantiateSignature);
                 var constructSignatures = instantiateList(getSignaturesOfType(type.target, 1), type.mapper, instantiateSignature);
-                var stringIndexType = instantiateType(getIndexTypeOfType(type.target, 0), type.mapper);
-                var numberIndexType = instantiateType(getIndexTypeOfType(type.target, 1), type.mapper);
-                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexType, numberIndexType);
+                var stringIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, 0), type.mapper);
+                var numberIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, 1), type.mapper);
+                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
             }
             else if (symbol.flags & 2048) {
                 var members = symbol.members;
                 var callSignatures = getSignaturesOfSymbol(members["__call"]);
                 var constructSignatures = getSignaturesOfSymbol(members["__new"]);
-                var stringIndexType = getIndexTypeOfSymbol(symbol, 0);
-                var numberIndexType = getIndexTypeOfSymbol(symbol, 1);
-                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexType, numberIndexType);
+                var stringIndexInfo = getIndexInfoOfSymbol(symbol, 0);
+                var numberIndexInfo = getIndexInfoOfSymbol(symbol, 1);
+                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
             }
             else {
                 var members = emptySymbols;
@@ -14310,8 +15013,8 @@ var ts;
                         addInheritedMembers(members, getPropertiesOfObjectType(baseConstructorType));
                     }
                 }
-                var numberIndexType = (symbol.flags & 384) ? stringType : undefined;
-                setObjectTypeMembers(type, members, emptyArray, constructSignatures, undefined, numberIndexType);
+                var numberIndexInfo = symbol.flags & 384 ? enumNumberIndexInfo : undefined;
+                setObjectTypeMembers(type, members, emptyArray, constructSignatures, undefined, numberIndexInfo);
                 if (symbol.flags & (16 | 8192)) {
                     type.callSignatures = getSignaturesOfSymbol(symbol);
                 }
@@ -14398,7 +15101,7 @@ var ts;
                 type = globalBooleanType;
             }
             else if (type.flags & 16777216) {
-                type = globalESSymbolType;
+                type = getGlobalESSymbolType();
             }
             return type;
         }
@@ -14411,7 +15114,7 @@ var ts;
                 var type = getApparentType(current);
                 if (type !== unknownType) {
                     var prop = getPropertyOfType(type, name);
-                    if (prop && !(getDeclarationFlagsFromSymbol(prop) & (16 | 32))) {
+                    if (prop && !(getDeclarationFlagsFromSymbol(prop) & (8 | 16))) {
                         commonFlags &= prop.flags;
                         if (!props) {
                             props = [prop];
@@ -14493,15 +15196,44 @@ var ts;
         function getSignaturesOfType(type, kind) {
             return getSignaturesOfStructuredType(getApparentType(type), kind);
         }
-        function getIndexTypeOfStructuredType(type, kind) {
+        function getIndexInfoOfStructuredType(type, kind) {
             if (type.flags & 130048) {
                 var resolved = resolveStructuredTypeMembers(type);
-                return kind === 0 ? resolved.stringIndexType : resolved.numberIndexType;
+                return kind === 0 ? resolved.stringIndexInfo : resolved.numberIndexInfo;
             }
         }
+        function getIndexTypeOfStructuredType(type, kind) {
+            var info = getIndexInfoOfStructuredType(type, kind);
+            return info && info.type;
+        }
+        function getIndexInfoOfType(type, kind) {
+            return getIndexInfoOfStructuredType(getApparentType(type), kind);
+        }
         function getIndexTypeOfType(type, kind) {
             return getIndexTypeOfStructuredType(getApparentType(type), kind);
         }
+        function getImplicitIndexTypeOfType(type, kind) {
+            if (isObjectLiteralType(type)) {
+                var propTypes = [];
+                for (var _i = 0, _a = getPropertiesOfType(type); _i < _a.length; _i++) {
+                    var prop = _a[_i];
+                    if (kind === 0 || isNumericLiteralName(prop.name)) {
+                        propTypes.push(getTypeOfSymbol(prop));
+                    }
+                }
+                return getUnionType(propTypes);
+            }
+            return undefined;
+        }
+        function getTypeParametersFromJSDocTemplate(declaration) {
+            if (declaration.flags & 134217728) {
+                var templateTag = ts.getJSDocTemplateTag(declaration);
+                if (templateTag) {
+                    return getTypeParametersFromDeclaration(templateTag.typeParameters);
+                }
+            }
+            return undefined;
+        }
         function getTypeParametersFromDeclaration(typeParameterDeclarations) {
             var result = [];
             ts.forEach(typeParameterDeclarations, function (node) {
@@ -14522,6 +15254,20 @@ var ts;
             return result;
         }
         function isOptionalParameter(node) {
+            if (node.flags & 134217728) {
+                if (node.type && node.type.kind === 267) {
+                    return true;
+                }
+                var paramTag = ts.getCorrespondingJSDocParameterTag(node);
+                if (paramTag) {
+                    if (paramTag.isBracketed) {
+                        return true;
+                    }
+                    if (paramTag.typeExpression) {
+                        return paramTag.typeExpression.type.kind === 267;
+                    }
+                }
+            }
             if (ts.hasQuestionToken(node)) {
                 return true;
             }
@@ -14554,28 +15300,40 @@ var ts;
         function getSignatureFromDeclaration(declaration) {
             var links = getNodeLinks(declaration);
             if (!links.resolvedSignature) {
-                var classType = declaration.kind === 145 ?
+                var classType = declaration.kind === 147 ?
                     getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol))
                     : undefined;
                 var typeParameters = classType ? classType.localTypeParameters :
-                    declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) : undefined;
+                    declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) :
+                        getTypeParametersFromJSDocTemplate(declaration);
                 var parameters = [];
                 var hasStringLiterals = false;
                 var minArgumentCount = -1;
-                for (var i = 0, n = declaration.parameters.length; i < n; i++) {
+                var thisType = undefined;
+                var hasThisParameter = void 0;
+                var isJSConstructSignature = ts.isJSDocConstructSignature(declaration);
+                var returnType = undefined;
+                var typePredicate = undefined;
+                for (var i = isJSConstructSignature ? 1 : 0, n = declaration.parameters.length; i < n; i++) {
                     var param = declaration.parameters[i];
                     var paramSymbol = param.symbol;
                     if (paramSymbol && !!(paramSymbol.flags & 4) && !ts.isBindingPattern(param.name)) {
                         var resolvedSymbol = resolveName(param, paramSymbol.name, 107455, undefined, undefined);
                         paramSymbol = resolvedSymbol;
                     }
-                    parameters.push(paramSymbol);
-                    if (param.type && param.type.kind === 163) {
+                    if (i === 0 && paramSymbol.name === "this") {
+                        hasThisParameter = true;
+                        thisType = param.type ? getTypeFromTypeNode(param.type) : unknownType;
+                    }
+                    else {
+                        parameters.push(paramSymbol);
+                    }
+                    if (param.type && param.type.kind === 165) {
                         hasStringLiterals = true;
                     }
                     if (param.initializer || param.questionToken || param.dotDotDotToken) {
                         if (minArgumentCount < 0) {
-                            minArgumentCount = i;
+                            minArgumentCount = i - (hasThisParameter ? 1 : 0);
                         }
                     }
                     else {
@@ -14583,25 +15341,37 @@ var ts;
                     }
                 }
                 if (minArgumentCount < 0) {
-                    minArgumentCount = declaration.parameters.length;
+                    minArgumentCount = declaration.parameters.length - (hasThisParameter ? 1 : 0);
                 }
-                var returnType;
-                if (classType) {
+                if (isJSConstructSignature) {
+                    minArgumentCount--;
+                    returnType = getTypeFromTypeNode(declaration.parameters[0].type);
+                }
+                else if (classType) {
                     returnType = classType;
                 }
                 else if (declaration.type) {
                     returnType = getTypeFromTypeNode(declaration.type);
+                    if (declaration.type.kind === 153) {
+                        typePredicate = createTypePredicateFromTypePredicateNode(declaration.type);
+                    }
                 }
                 else {
-                    if (declaration.kind === 146 && !ts.hasDynamicName(declaration)) {
-                        var setter = ts.getDeclarationOfKind(declaration.symbol, 147);
+                    if (declaration.flags & 134217728) {
+                        var type = getReturnTypeFromJSDocComment(declaration);
+                        if (type && type !== unknownType) {
+                            returnType = type;
+                        }
+                    }
+                    if (declaration.kind === 148 && !ts.hasDynamicName(declaration)) {
+                        var setter = ts.getDeclarationOfKind(declaration.symbol, 149);
                         returnType = getAnnotatedAccessorType(setter);
                     }
                     if (!returnType && ts.nodeIsMissing(declaration.body)) {
                         returnType = anyType;
                     }
                 }
-                links.resolvedSignature = createSignature(declaration, typeParameters, parameters, returnType, minArgumentCount, ts.hasRestParameter(declaration), hasStringLiterals);
+                links.resolvedSignature = createSignature(declaration, typeParameters, thisType, parameters, returnType, typePredicate, minArgumentCount, ts.hasRestParameter(declaration), hasStringLiterals);
             }
             return links.resolvedSignature;
         }
@@ -14612,19 +15382,20 @@ var ts;
             for (var i = 0, len = symbol.declarations.length; i < len; i++) {
                 var node = symbol.declarations[i];
                 switch (node.kind) {
-                    case 153:
-                    case 154:
-                    case 216:
-                    case 144:
-                    case 143:
+                    case 155:
+                    case 156:
+                    case 219:
+                    case 146:
                     case 145:
+                    case 147:
+                    case 150:
+                    case 151:
+                    case 152:
                     case 148:
                     case 149:
-                    case 150:
-                    case 146:
-                    case 147:
-                    case 176:
-                    case 177:
+                    case 178:
+                    case 179:
+                    case 268:
                         if (i > 0 && node.body) {
                             var previous = symbol.declarations[i - 1];
                             if (node.parent === previous.parent && node.kind === previous.kind && node.pos === previous.end) {
@@ -14651,7 +15422,7 @@ var ts;
                 if (!pushTypeResolution(signature, 3)) {
                     return unknownType;
                 }
-                var type;
+                var type = void 0;
                 if (signature.target) {
                     type = instantiateType(getReturnTypeOfSignature(signature.target), signature.mapper);
                 }
@@ -14704,7 +15475,7 @@ var ts;
         }
         function getOrCreateTypeFromSignature(signature) {
             if (!signature.isolatedSignatureType) {
-                var isConstructor = signature.declaration.kind === 145 || signature.declaration.kind === 149;
+                var isConstructor = signature.declaration.kind === 147 || signature.declaration.kind === 151;
                 var type = createObjectType(65536 | 262144);
                 type.members = emptySymbols;
                 type.properties = emptyArray;
@@ -14718,7 +15489,7 @@ var ts;
             return symbol.members["__index"];
         }
         function getIndexDeclarationOfSymbol(symbol, kind) {
-            var syntaxKind = kind === 1 ? 128 : 130;
+            var syntaxKind = kind === 1 ? 129 : 131;
             var indexSymbol = getIndexSymbol(symbol);
             if (indexSymbol) {
                 for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
@@ -14734,18 +15505,22 @@ var ts;
             }
             return undefined;
         }
-        function getIndexTypeOfSymbol(symbol, kind) {
+        function createIndexInfo(type, isReadonly, declaration) {
+            return { type: type, isReadonly: isReadonly, declaration: declaration };
+        }
+        function getIndexInfoOfSymbol(symbol, kind) {
             var declaration = getIndexDeclarationOfSymbol(symbol, kind);
-            return declaration
-                ? declaration.type ? getTypeFromTypeNode(declaration.type) : anyType
-                : undefined;
+            if (declaration) {
+                return createIndexInfo(declaration.type ? getTypeFromTypeNode(declaration.type) : anyType, (declaration.flags & 64) !== 0, declaration);
+            }
+            return undefined;
         }
         function getConstraintDeclaration(type) {
-            return ts.getDeclarationOfKind(type.symbol, 138).constraint;
+            return ts.getDeclarationOfKind(type.symbol, 140).constraint;
         }
         function hasConstraintReferenceTo(type, target) {
             var checked;
-            while (type && type.flags & 512 && !ts.contains(checked, type)) {
+            while (type && !(type.flags & 33554432) && type.flags & 512 && !ts.contains(checked, type)) {
                 if (type === target) {
                     return true;
                 }
@@ -14774,7 +15549,7 @@ var ts;
             return typeParameter.constraint === noConstraintType ? undefined : typeParameter.constraint;
         }
         function getParentSymbolOfTypeParameter(typeParameter) {
-            return getSymbolOfNode(ts.getDeclarationOfKind(typeParameter.symbol, 138).parent);
+            return getSymbolOfNode(ts.getDeclarationOfKind(typeParameter.symbol, 140).parent);
         }
         function getTypeListId(types) {
             if (types) {
@@ -14796,11 +15571,13 @@ var ts;
             }
             return "";
         }
-        function getPropagatingFlagsOfTypes(types) {
+        function getPropagatingFlagsOfTypes(types, excludeKinds) {
             var result = 0;
             for (var _i = 0, types_3 = types; _i < types_3.length; _i++) {
                 var type = types_3[_i];
-                result |= type.flags;
+                if (!(type.flags & excludeKinds)) {
+                    result |= type.flags;
+                }
             }
             return result & 14680064;
         }
@@ -14808,7 +15585,8 @@ var ts;
             var id = getTypeListId(typeArguments);
             var type = target.instantiations[id];
             if (!type) {
-                var flags = 4096 | (typeArguments ? getPropagatingFlagsOfTypes(typeArguments) : 0);
+                var propagatedFlags = typeArguments ? getPropagatingFlagsOfTypes(typeArguments, 0) : 0;
+                var flags = 4096 | propagatedFlags;
                 type = target.instantiations[id] = createObjectType(flags, target.symbol);
                 type.target = target;
                 type.typeArguments = typeArguments;
@@ -14816,7 +15594,7 @@ var ts;
             return type;
         }
         function getTypeFromClassOrInterfaceReference(node, symbol) {
-            var type = getDeclaredTypeOfSymbol(symbol);
+            var type = getDeclaredTypeOfSymbol(getMergedSymbol(symbol));
             var typeParameters = type.localTypeParameters;
             if (typeParameters) {
                 if (!node.typeArguments || node.typeArguments.length !== typeParameters.length) {
@@ -14857,17 +15635,62 @@ var ts;
             }
             return getDeclaredTypeOfSymbol(symbol);
         }
+        function getTypeReferenceName(node) {
+            switch (node.kind) {
+                case 154:
+                    return node.typeName;
+                case 266:
+                    return node.name;
+                case 193:
+                    if (ts.isSupportedExpressionWithTypeArguments(node)) {
+                        return node.expression;
+                    }
+            }
+            return undefined;
+        }
+        function resolveTypeReferenceName(node, typeReferenceName) {
+            if (!typeReferenceName) {
+                return unknownSymbol;
+            }
+            return resolveEntityName(typeReferenceName, 793056) || unknownSymbol;
+        }
+        function getTypeReferenceType(node, symbol) {
+            if (symbol === unknownSymbol) {
+                return unknownType;
+            }
+            if (symbol.flags & (32 | 64)) {
+                return getTypeFromClassOrInterfaceReference(node, symbol);
+            }
+            if (symbol.flags & 524288) {
+                return getTypeFromTypeAliasReference(node, symbol);
+            }
+            if (symbol.flags & 107455 && node.kind === 266) {
+                return getTypeOfSymbol(symbol);
+            }
+            return getTypeFromNonGenericTypeReference(node, symbol);
+        }
         function getTypeFromTypeReference(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                var typeNameOrExpression = node.kind === 152 ? node.typeName :
-                    ts.isSupportedExpressionWithTypeArguments(node) ? node.expression :
-                        undefined;
-                var symbol = typeNameOrExpression && resolveEntityName(typeNameOrExpression, 793056) || unknownSymbol;
-                var type = symbol === unknownSymbol ? unknownType :
-                    symbol.flags & (32 | 64) ? getTypeFromClassOrInterfaceReference(node, symbol) :
-                        symbol.flags & 524288 ? getTypeFromTypeAliasReference(node, symbol) :
-                            getTypeFromNonGenericTypeReference(node, symbol);
+                var symbol = void 0;
+                var type = void 0;
+                if (node.kind === 266) {
+                    var typeReferenceName = getTypeReferenceName(node);
+                    symbol = resolveTypeReferenceName(node, typeReferenceName);
+                    type = getTypeReferenceType(node, symbol);
+                    links.resolvedSymbol = symbol;
+                    links.resolvedType = type;
+                }
+                else {
+                    var typeNameOrExpression = node.kind === 154 ? node.typeName :
+                        ts.isSupportedExpressionWithTypeArguments(node) ? node.expression :
+                            undefined;
+                    symbol = typeNameOrExpression && resolveEntityName(typeNameOrExpression, 793056) || unknownSymbol;
+                    type = symbol === unknownSymbol ? unknownType :
+                        symbol.flags & (32 | 64) ? getTypeFromClassOrInterfaceReference(node, symbol) :
+                            symbol.flags & 524288 ? getTypeFromTypeAliasReference(node, symbol) :
+                                getTypeFromNonGenericTypeReference(node, symbol);
+                }
                 links.resolvedSymbol = symbol;
                 links.resolvedType = type;
             }
@@ -14886,9 +15709,9 @@ var ts;
                 for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
                     var declaration = declarations_3[_i];
                     switch (declaration.kind) {
-                        case 217:
-                        case 218:
                         case 220:
+                        case 221:
+                        case 223:
                             return declaration;
                     }
                 }
@@ -14925,9 +15748,6 @@ var ts;
             var typeSymbol = namespaceSymbol && getSymbol(namespaceSymbol.exports, name, 793056);
             return typeSymbol && getDeclaredTypeOfSymbol(typeSymbol);
         }
-        function getGlobalESSymbolConstructorSymbol() {
-            return globalESSymbolConstructorSymbol || (globalESSymbolConstructorSymbol = getGlobalValueSymbol("Symbol"));
-        }
         function createTypedPropertyDescriptorType(propertyType) {
             var globalTypedPropertyDescriptorType = getGlobalTypedPropertyDescriptorType();
             return globalTypedPropertyDescriptorType !== emptyGenericType
@@ -14938,10 +15758,10 @@ var ts;
             return genericGlobalType !== emptyGenericType ? createTypeReference(genericGlobalType, typeArguments) : emptyObjectType;
         }
         function createIterableType(elementType) {
-            return createTypeFromGenericGlobalType(globalIterableType, [elementType]);
+            return createTypeFromGenericGlobalType(getGlobalIterableType(), [elementType]);
         }
         function createIterableIteratorType(elementType) {
-            return createTypeFromGenericGlobalType(globalIterableIteratorType, [elementType]);
+            return createTypeFromGenericGlobalType(getGlobalIterableIteratorType(), [elementType]);
         }
         function createArrayType(elementType) {
             return createTypeFromGenericGlobalType(globalArrayType, [elementType]);
@@ -14958,7 +15778,8 @@ var ts;
             return tupleTypes[id] || (tupleTypes[id] = createNewTupleType(elementTypes));
         }
         function createNewTupleType(elementTypes) {
-            var type = createObjectType(8192 | getPropagatingFlagsOfTypes(elementTypes));
+            var propagatedFlags = getPropagatingFlagsOfTypes(elementTypes, 0);
+            var type = createObjectType(8192 | propagatedFlags);
             type.elementTypes = elementTypes;
             return type;
         }
@@ -14973,6 +15794,14 @@ var ts;
             if (type.flags & typeSetKind) {
                 addTypesToSet(typeSet, type.types, typeSetKind);
             }
+            else if (type.flags & (1 | 32 | 64)) {
+                if (type.flags & 1)
+                    typeSet.containsAny = true;
+                if (type.flags & 32)
+                    typeSet.containsUndefined = true;
+                if (type.flags & 64)
+                    typeSet.containsNull = true;
+            }
             else if (!ts.contains(typeSet, type)) {
                 typeSet.push(type);
             }
@@ -15000,47 +15829,35 @@ var ts;
                 }
             }
         }
-        function containsTypeAny(types) {
-            for (var _i = 0, types_5 = types; _i < types_5.length; _i++) {
-                var type = types_5[_i];
-                if (isTypeAny(type)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-        function removeAllButLast(types, typeToRemove) {
-            var i = types.length;
-            while (i > 0 && types.length > 1) {
-                i--;
-                if (types[i] === typeToRemove) {
-                    types.splice(i, 1);
-                }
-            }
-        }
         function getUnionType(types, noSubtypeReduction) {
             if (types.length === 0) {
                 return emptyUnionType;
             }
             var typeSet = [];
             addTypesToSet(typeSet, types, 16384);
-            if (containsTypeAny(typeSet)) {
+            if (typeSet.containsAny) {
                 return anyType;
             }
-            if (noSubtypeReduction) {
-                removeAllButLast(typeSet, undefinedType);
-                removeAllButLast(typeSet, nullType);
+            if (strictNullChecks) {
+                if (typeSet.containsNull)
+                    typeSet.push(nullType);
+                if (typeSet.containsUndefined)
+                    typeSet.push(undefinedType);
             }
-            else {
+            if (!noSubtypeReduction) {
                 removeSubtypes(typeSet);
             }
-            if (typeSet.length === 1) {
+            if (typeSet.length === 0) {
+                return typeSet.containsNull ? nullType : undefinedType;
+            }
+            else if (typeSet.length === 1) {
                 return typeSet[0];
             }
             var id = getTypeListId(typeSet);
             var type = unionTypes[id];
             if (!type) {
-                type = unionTypes[id] = createObjectType(16384 | getPropagatingFlagsOfTypes(typeSet));
+                var propagatedFlags = getPropagatingFlagsOfTypes(typeSet, 96);
+                type = unionTypes[id] = createObjectType(16384 | propagatedFlags);
                 type.types = typeSet;
             }
             return type;
@@ -15058,16 +15875,23 @@ var ts;
             }
             var typeSet = [];
             addTypesToSet(typeSet, types, 32768);
-            if (containsTypeAny(typeSet)) {
+            if (typeSet.containsAny) {
                 return anyType;
             }
+            if (strictNullChecks) {
+                if (typeSet.containsNull)
+                    typeSet.push(nullType);
+                if (typeSet.containsUndefined)
+                    typeSet.push(undefinedType);
+            }
             if (typeSet.length === 1) {
                 return typeSet[0];
             }
             var id = getTypeListId(typeSet);
             var type = intersectionTypes[id];
             if (!type) {
-                type = intersectionTypes[id] = createObjectType(32768 | getPropagatingFlagsOfTypes(typeSet));
+                var propagatedFlags = getPropagatingFlagsOfTypes(typeSet, 96);
+                type = intersectionTypes[id] = createObjectType(32768 | propagatedFlags);
                 type.types = typeSet;
             }
             return type;
@@ -15101,12 +15925,28 @@ var ts;
             }
             return links.resolvedType;
         }
+        function getTypeFromJSDocVariadicType(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                var type = getTypeFromTypeNode(node.type);
+                links.resolvedType = type ? createArrayType(type) : unknownType;
+            }
+            return links.resolvedType;
+        }
+        function getTypeFromJSDocTupleType(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                var types = ts.map(node.types, getTypeFromTypeNode);
+                links.resolvedType = createTupleType(types);
+            }
+            return links.resolvedType;
+        }
         function getThisType(node) {
             var container = ts.getThisContainer(node, false);
             var parent = container && container.parent;
-            if (parent && (ts.isClassLike(parent) || parent.kind === 218)) {
-                if (!(container.flags & 64) &&
-                    (container.kind !== 145 || ts.isNodeDescendentOf(node, container.body))) {
+            if (parent && (ts.isClassLike(parent) || parent.kind === 221)) {
+                if (!(container.flags & 32) &&
+                    (container.kind !== 147 || ts.isNodeDescendentOf(node, container.body))) {
                     return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
                 }
             }
@@ -15120,66 +15960,70 @@ var ts;
             }
             return links.resolvedType;
         }
-        function getPredicateType(node) {
-            return createPredicateType(getSymbolOfNode(node), createTypePredicateFromTypePredicateNode(node));
-        }
-        function createPredicateType(symbol, predicate) {
-            var type = createType(8 | 134217728);
-            type.symbol = symbol;
-            type.predicate = predicate;
-            return type;
-        }
-        function getTypeFromPredicateTypeNode(node) {
-            var links = getNodeLinks(node);
-            if (!links.resolvedType) {
-                links.resolvedType = getPredicateType(node);
-            }
-            return links.resolvedType;
-        }
         function getTypeFromTypeNode(node) {
             switch (node.kind) {
                 case 117:
+                case 257:
+                case 258:
                     return anyType;
-                case 130:
+                case 131:
                     return stringType;
-                case 128:
+                case 129:
                     return numberType;
                 case 120:
                     return booleanType;
-                case 131:
+                case 132:
                     return esSymbolType;
                 case 103:
                     return voidType;
-                case 162:
+                case 134:
+                    return undefinedType;
+                case 93:
+                    return nullType;
+                case 164:
                     return getTypeFromThisTypeNode(node);
-                case 163:
+                case 165:
                     return getTypeFromStringLiteralTypeNode(node);
-                case 152:
-                    return getTypeFromTypeReference(node);
-                case 151:
-                    return getTypeFromPredicateTypeNode(node);
-                case 191:
-                    return getTypeFromTypeReference(node);
-                case 155:
-                    return getTypeFromTypeQueryNode(node);
-                case 157:
-                    return getTypeFromArrayTypeNode(node);
-                case 158:
-                    return getTypeFromTupleTypeNode(node);
-                case 159:
-                    return getTypeFromUnionTypeNode(node);
-                case 160:
-                    return getTypeFromIntersectionTypeNode(node);
-                case 161:
-                    return getTypeFromTypeNode(node.type);
-                case 153:
                 case 154:
+                case 266:
+                    return getTypeFromTypeReference(node);
+                case 153:
+                    return booleanType;
+                case 193:
+                    return getTypeFromTypeReference(node);
+                case 157:
+                    return getTypeFromTypeQueryNode(node);
+                case 159:
+                case 259:
+                    return getTypeFromArrayTypeNode(node);
+                case 160:
+                    return getTypeFromTupleTypeNode(node);
+                case 161:
+                case 260:
+                    return getTypeFromUnionTypeNode(node);
+                case 162:
+                    return getTypeFromIntersectionTypeNode(node);
+                case 163:
+                case 262:
+                case 263:
+                case 270:
+                case 271:
+                case 267:
+                    return getTypeFromTypeNode(node.type);
+                case 155:
                 case 156:
+                case 158:
+                case 268:
+                case 264:
                     return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
                 case 69:
-                case 136:
+                case 138:
                     var symbol = getSymbolAtLocation(node);
                     return symbol && getDeclaredTypeOfSymbol(symbol);
+                case 261:
+                    return getTypeFromJSDocTupleType(node);
+                case 269:
+                    return getTypeFromJSDocVariadicType(node);
                 default:
                     return unknownType;
             }
@@ -15201,40 +16045,26 @@ var ts;
         function createBinaryTypeMapper(source1, target1, source2, target2) {
             return function (t) { return t === source1 ? target1 : t === source2 ? target2 : t; };
         }
-        function createTypeMapper(sources, targets) {
-            switch (sources.length) {
-                case 1: return createUnaryTypeMapper(sources[0], targets[0]);
-                case 2: return createBinaryTypeMapper(sources[0], targets[0], sources[1], targets[1]);
-            }
+        function createArrayTypeMapper(sources, targets) {
             return function (t) {
                 for (var i = 0; i < sources.length; i++) {
                     if (t === sources[i]) {
-                        return targets[i];
+                        return targets ? targets[i] : anyType;
                     }
                 }
                 return t;
             };
         }
-        function createUnaryTypeEraser(source) {
-            return function (t) { return t === source ? anyType : t; };
-        }
-        function createBinaryTypeEraser(source1, source2) {
-            return function (t) { return t === source1 || t === source2 ? anyType : t; };
+        function createTypeMapper(sources, targets) {
+            var count = sources.length;
+            var mapper = count == 1 ? createUnaryTypeMapper(sources[0], targets ? targets[0] : anyType) :
+                count == 2 ? createBinaryTypeMapper(sources[0], targets ? targets[0] : anyType, sources[1], targets ? targets[1] : anyType) :
+                    createArrayTypeMapper(sources, targets);
+            mapper.mappedTypes = sources;
+            return mapper;
         }
         function createTypeEraser(sources) {
-            switch (sources.length) {
-                case 1: return createUnaryTypeEraser(sources[0]);
-                case 2: return createBinaryTypeEraser(sources[0], sources[1]);
-            }
-            return function (t) {
-                for (var _i = 0, sources_1 = sources; _i < sources_1.length; _i++) {
-                    var source = sources_1[_i];
-                    if (t === source) {
-                        return anyType;
-                    }
-                }
-                return t;
-            };
+            return createTypeMapper(sources, undefined);
         }
         function getInferenceMapper(context) {
             if (!context.mapper) {
@@ -15248,6 +16078,7 @@ var ts;
                     }
                     return t;
                 };
+                mapper.mappedTypes = context.typeParameters;
                 mapper.context = context;
                 context.mapper = mapper;
             }
@@ -15257,7 +16088,9 @@ var ts;
             return type;
         }
         function combineTypeMappers(mapper1, mapper2) {
-            return function (t) { return instantiateType(mapper1(t), mapper2); };
+            var mapper = function (t) { return instantiateType(mapper1(t), mapper2); };
+            mapper.mappedTypes = mapper1.mappedTypes;
+            return mapper;
         }
         function cloneTypeParameter(typeParameter) {
             var result = createType(512);
@@ -15283,6 +16116,7 @@ var ts;
         }
         function instantiateSignature(signature, mapper, eraseTypeParameters) {
             var freshTypeParameters;
+            var freshTypePredicate;
             if (signature.typeParameters && !eraseTypeParameters) {
                 freshTypeParameters = ts.map(signature.typeParameters, cloneTypeParameter);
                 mapper = combineTypeMappers(createTypeMapper(signature.typeParameters, freshTypeParameters), mapper);
@@ -15291,7 +16125,10 @@ var ts;
                     tp.mapper = mapper;
                 }
             }
-            var result = createSignature(signature.declaration, freshTypeParameters, instantiateList(signature.parameters, mapper, instantiateSymbol), instantiateType(signature.resolvedReturnType, mapper), signature.minArgumentCount, signature.hasRestParameter, signature.hasStringLiterals);
+            if (signature.typePredicate) {
+                freshTypePredicate = cloneTypePredicate(signature.typePredicate, mapper);
+            }
+            var result = createSignature(signature.declaration, freshTypeParameters, signature.thisType && instantiateType(signature.thisType, mapper), instantiateList(signature.parameters, mapper, instantiateSymbol), instantiateType(signature.resolvedReturnType, mapper), freshTypePredicate, signature.minArgumentCount, signature.hasRestParameter, signature.hasStringLiterals);
             result.target = signature;
             result.mapper = mapper;
             return result;
@@ -15328,13 +16165,61 @@ var ts;
             mapper.instantiations[type.id] = result;
             return result;
         }
+        function isSymbolInScopeOfMappedTypeParameter(symbol, mapper) {
+            var mappedTypes = mapper.mappedTypes;
+            var node = symbol.declarations[0].parent;
+            while (node) {
+                switch (node.kind) {
+                    case 155:
+                    case 156:
+                    case 219:
+                    case 146:
+                    case 145:
+                    case 147:
+                    case 150:
+                    case 151:
+                    case 152:
+                    case 148:
+                    case 149:
+                    case 178:
+                    case 179:
+                    case 220:
+                    case 191:
+                    case 221:
+                    case 222:
+                        var declaration = node;
+                        if (declaration.typeParameters) {
+                            for (var _i = 0, _a = declaration.typeParameters; _i < _a.length; _i++) {
+                                var d = _a[_i];
+                                if (ts.contains(mappedTypes, getDeclaredTypeOfTypeParameter(d.symbol))) {
+                                    return true;
+                                }
+                            }
+                        }
+                        if (ts.isClassLike(node) || node.kind === 221) {
+                            var thisType = getDeclaredTypeOfClassOrInterface(getSymbolOfNode(node)).thisType;
+                            if (thisType && ts.contains(mappedTypes, thisType)) {
+                                return true;
+                            }
+                        }
+                        break;
+                    case 224:
+                    case 255:
+                        return false;
+                }
+                node = node.parent;
+            }
+            return false;
+        }
         function instantiateType(type, mapper) {
             if (type && mapper !== identityMapper) {
                 if (type.flags & 512) {
                     return mapper(type);
                 }
                 if (type.flags & 65536) {
-                    return type.symbol && type.symbol.flags & (16 | 8192 | 32 | 2048 | 4096) ?
+                    return type.symbol &&
+                        type.symbol.flags & (16 | 8192 | 32 | 2048 | 4096) &&
+                        (type.flags & 131072 || isSymbolInScopeOfMappedTypeParameter(type.symbol, mapper)) ?
                         instantiateAnonymousType(type, mapper) : type;
                 }
                 if (type.flags & 4096) {
@@ -15349,41 +16234,42 @@ var ts;
                 if (type.flags & 32768) {
                     return getIntersectionType(instantiateList(type.types, mapper, instantiateType));
                 }
-                if (type.flags & 134217728) {
-                    var predicate = type.predicate;
-                    return createPredicateType(type.symbol, cloneTypePredicate(predicate, mapper));
-                }
             }
             return type;
         }
+        function instantiateIndexInfo(info, mapper) {
+            return info && createIndexInfo(instantiateType(info.type, mapper), info.isReadonly, info.declaration);
+        }
         function isContextSensitive(node) {
-            ts.Debug.assert(node.kind !== 144 || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 146 || ts.isObjectLiteralMethod(node));
             switch (node.kind) {
-                case 176:
-                case 177:
+                case 178:
+                case 179:
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 168:
+                case 170:
                     return ts.forEach(node.properties, isContextSensitive);
-                case 167:
+                case 169:
                     return ts.forEach(node.elements, isContextSensitive);
-                case 185:
+                case 187:
                     return isContextSensitive(node.whenTrue) ||
                         isContextSensitive(node.whenFalse);
-                case 184:
+                case 186:
                     return node.operatorToken.kind === 52 &&
                         (isContextSensitive(node.left) || isContextSensitive(node.right));
-                case 248:
+                case 252:
                     return isContextSensitive(node.initializer);
-                case 144:
-                case 143:
+                case 146:
+                case 145:
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 175:
+                case 177:
                     return isContextSensitive(node.expression);
             }
             return false;
         }
         function isContextSensitiveFunctionLikeDeclaration(node) {
-            return !node.typeParameters && node.parameters.length && !ts.forEach(node.parameters, function (p) { return p.type; });
+            var areAllParametersUntyped = !ts.forEach(node.parameters, function (p) { return p.type; });
+            var isNullaryArrow = node.kind === 179 && !node.parameters.length;
+            return !node.typeParameters && areAllParametersUntyped && !isNullaryArrow;
         }
         function getTypeWithoutSignatures(type) {
             if (type.flags & 80896) {
@@ -15414,12 +16300,18 @@ var ts;
         function isTypeAssignableTo(source, target) {
             return checkTypeAssignableTo(source, target, undefined);
         }
+        function isTypeComparableTo(source, target) {
+            return checkTypeComparableTo(source, target, undefined);
+        }
         function checkTypeSubtypeOf(source, target, errorNode, headMessage, containingMessageChain) {
             return checkTypeRelatedTo(source, target, subtypeRelation, errorNode, headMessage, containingMessageChain);
         }
         function checkTypeAssignableTo(source, target, errorNode, headMessage, containingMessageChain) {
             return checkTypeRelatedTo(source, target, assignableRelation, errorNode, headMessage, containingMessageChain);
         }
+        function checkTypeComparableTo(source, target, errorNode, headMessage, containingMessageChain) {
+            return checkTypeRelatedTo(source, target, comparableRelation, errorNode, headMessage, containingMessageChain);
+        }
         function isSignatureAssignableTo(source, target, ignoreReturnTypes) {
             return compareSignaturesRelated(source, target, ignoreReturnTypes, false, undefined, compareTypesAssignable) !== 0;
         }
@@ -15433,15 +16325,26 @@ var ts;
             source = getErasedSignature(source);
             target = getErasedSignature(target);
             var result = -1;
+            if (source.thisType && target.thisType && source.thisType !== voidType) {
+                var related = compareTypes(source.thisType, target.thisType, false)
+                    || compareTypes(target.thisType, source.thisType, reportErrors);
+                if (!related) {
+                    if (reportErrors) {
+                        errorReporter(ts.Diagnostics.The_this_types_of_each_signature_are_incompatible);
+                    }
+                    return 0;
+                }
+                result &= related;
+            }
             var sourceMax = getNumNonRestParameters(source);
             var targetMax = getNumNonRestParameters(target);
             var checkCount = getNumParametersToCheckForSignatureRelatability(source, sourceMax, target, targetMax);
             var sourceParams = source.parameters;
             var targetParams = target.parameters;
             for (var i = 0; i < checkCount; i++) {
-                var s = i < sourceMax ? getTypeOfSymbol(sourceParams[i]) : getRestTypeOfSignature(source);
-                var t = i < targetMax ? getTypeOfSymbol(targetParams[i]) : getRestTypeOfSignature(target);
-                var related = compareTypes(t, s, false) || compareTypes(s, t, reportErrors);
+                var s = i < sourceMax ? getTypeOfParameter(sourceParams[i]) : getRestTypeOfSignature(source);
+                var t = i < targetMax ? getTypeOfParameter(targetParams[i]) : getRestTypeOfSignature(target);
+                var related = compareTypes(s, t, false) || compareTypes(t, s, reportErrors);
                 if (!related) {
                     if (reportErrors) {
                         errorReporter(ts.Diagnostics.Types_of_parameters_0_and_1_are_incompatible, sourceParams[i < sourceMax ? i : sourceMax].name, targetParams[i < targetMax ? i : targetMax].name);
@@ -15456,18 +16359,48 @@ var ts;
                     return result;
                 }
                 var sourceReturnType = getReturnTypeOfSignature(source);
-                if (targetReturnType.flags & 134217728 && targetReturnType.predicate.kind === 1) {
-                    if (!(sourceReturnType.flags & 134217728)) {
+                if (target.typePredicate) {
+                    if (source.typePredicate) {
+                        result &= compareTypePredicateRelatedTo(source.typePredicate, target.typePredicate, reportErrors, errorReporter, compareTypes);
+                    }
+                    else if (ts.isIdentifierTypePredicate(target.typePredicate)) {
                         if (reportErrors) {
                             errorReporter(ts.Diagnostics.Signature_0_must_have_a_type_predicate, signatureToString(source));
                         }
                         return 0;
                     }
                 }
-                result &= compareTypes(sourceReturnType, targetReturnType, reportErrors);
+                else {
+                    result &= compareTypes(sourceReturnType, targetReturnType, reportErrors);
+                }
             }
             return result;
         }
+        function compareTypePredicateRelatedTo(source, target, reportErrors, errorReporter, compareTypes) {
+            if (source.kind !== target.kind) {
+                if (reportErrors) {
+                    errorReporter(ts.Diagnostics.A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard);
+                    errorReporter(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
+                }
+                return 0;
+            }
+            if (source.kind === 1) {
+                var sourceIdentifierPredicate = source;
+                var targetIdentifierPredicate = target;
+                if (sourceIdentifierPredicate.parameterIndex !== targetIdentifierPredicate.parameterIndex) {
+                    if (reportErrors) {
+                        errorReporter(ts.Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, sourceIdentifierPredicate.parameterName, targetIdentifierPredicate.parameterName);
+                        errorReporter(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
+                    }
+                    return 0;
+                }
+            }
+            var related = compareTypes(source.type, target.type, reportErrors);
+            if (related === 0 && reportErrors) {
+                errorReporter(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
+            }
+            return related;
+        }
         function isImplementationCompatibleWithOverload(implementation, overload) {
             var erasedSource = getErasedSignature(implementation);
             var erasedTarget = getErasedSignature(overload);
@@ -15532,7 +16465,12 @@ var ts;
                     sourceType = typeToString(source, undefined, 128);
                     targetType = typeToString(target, undefined, 128);
                 }
-                reportError(message || ts.Diagnostics.Type_0_is_not_assignable_to_type_1, sourceType, targetType);
+                if (!message) {
+                    message = relation === comparableRelation ?
+                        ts.Diagnostics.Type_0_is_not_comparable_to_type_1 :
+                        ts.Diagnostics.Type_0_is_not_assignable_to_type_1;
+                }
+                reportError(message, sourceType, targetType);
             }
             function isRelatedTo(source, target, reportErrors, headMessage) {
                 var result;
@@ -15543,53 +16481,30 @@ var ts;
                 }
                 if (isTypeAny(target))
                     return -1;
-                if (source === undefinedType)
-                    return -1;
-                if (source === nullType && target !== undefinedType)
-                    return -1;
+                if (source.flags & 32) {
+                    if (!strictNullChecks || target.flags & (32 | 16) || source === emptyArrayElementType)
+                        return -1;
+                }
+                if (source.flags & 64) {
+                    if (!strictNullChecks || target.flags & 64)
+                        return -1;
+                }
                 if (source.flags & 128 && target === numberType)
                     return -1;
                 if (source.flags & 128 && target.flags & 128) {
-                    if (result = enumRelatedTo(source, target)) {
+                    if (result = enumRelatedTo(source, target, reportErrors)) {
                         return result;
                     }
                 }
                 if (source.flags & 256 && target === stringType)
                     return -1;
-                if (relation === assignableRelation) {
+                if (relation === assignableRelation || relation === comparableRelation) {
                     if (isTypeAny(source))
                         return -1;
                     if (source === numberType && target.flags & 128)
                         return -1;
                 }
                 if (source.flags & 8 && target.flags & 8) {
-                    if (source.flags & 134217728 && target.flags & 134217728) {
-                        var sourcePredicate = source;
-                        var targetPredicate = target;
-                        if (sourcePredicate.predicate.kind !== targetPredicate.predicate.kind) {
-                            if (reportErrors) {
-                                reportError(ts.Diagnostics.A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard);
-                                reportError(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typeToString(source), typeToString(target));
-                            }
-                            return 0;
-                        }
-                        if (sourcePredicate.predicate.kind === 1) {
-                            var sourceIdentifierPredicate = sourcePredicate.predicate;
-                            var targetIdentifierPredicate = targetPredicate.predicate;
-                            if (sourceIdentifierPredicate.parameterIndex !== targetIdentifierPredicate.parameterIndex) {
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, sourceIdentifierPredicate.parameterName, targetIdentifierPredicate.parameterName);
-                                    reportError(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typeToString(source), typeToString(target));
-                                }
-                                return 0;
-                            }
-                        }
-                        var related = isRelatedTo(sourcePredicate.predicate.type, targetPredicate.predicate.type, reportErrors, headMessage);
-                        if (related === 0 && reportErrors) {
-                            reportError(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typeToString(source), typeToString(target));
-                        }
-                        return related;
-                    }
                     return -1;
                 }
                 if (source.flags & 1048576) {
@@ -15605,23 +16520,30 @@ var ts;
                 }
                 var saveErrorInfo = errorInfo;
                 if (source.flags & 16384) {
-                    if (result = eachTypeRelatedToType(source, target, reportErrors)) {
+                    if (relation === comparableRelation) {
+                        result = someTypeRelatedToType(source, target, reportErrors);
+                    }
+                    else {
+                        result = eachTypeRelatedToType(source, target, reportErrors);
+                    }
+                    if (result) {
                         return result;
                     }
                 }
                 else if (target.flags & 32768) {
-                    if (result = typeRelatedToEachType(source, target, reportErrors)) {
+                    result = typeRelatedToEachType(source, target, reportErrors);
+                    if (result) {
                         return result;
                     }
                 }
                 else {
                     if (source.flags & 32768) {
-                        if (result = someTypeRelatedToType(source, target, reportErrors && !(target.flags & 16384))) {
+                        if (result = someTypeRelatedToType(source, target, false)) {
                             return result;
                         }
                     }
                     if (target.flags & 16384) {
-                        if (result = typeRelatedToSomeType(source, target, reportErrors)) {
+                        if (result = typeRelatedToSomeType(source, target, reportErrors && !(source.flags & 16777726))) {
                             return result;
                         }
                     }
@@ -15669,8 +16591,8 @@ var ts;
                 }
                 if (source.flags & 16384 && target.flags & 16384 ||
                     source.flags & 32768 && target.flags & 32768) {
-                    if (result = eachTypeRelatedToSomeType(source, target)) {
-                        if (result &= eachTypeRelatedToSomeType(target, source)) {
+                    if (result = eachTypeRelatedToSomeType(source, target, false)) {
+                        if (result &= eachTypeRelatedToSomeType(target, source, false)) {
                             return result;
                         }
                     }
@@ -15680,8 +16602,9 @@ var ts;
             function isKnownProperty(type, name) {
                 if (type.flags & 80896) {
                     var resolved = resolveStructuredTypeMembers(type);
-                    if (relation === assignableRelation && (type === globalObjectType || resolved.properties.length === 0) ||
-                        resolved.stringIndexType || resolved.numberIndexType || getPropertyOfType(type, name)) {
+                    if ((relation === assignableRelation || relation === comparableRelation) &&
+                        (type === globalObjectType || resolved.properties.length === 0) ||
+                        resolved.stringIndexInfo || resolved.numberIndexInfo || getPropertyOfType(type, name)) {
                         return true;
                     }
                 }
@@ -15696,7 +16619,7 @@ var ts;
                 return false;
             }
             function hasExcessProperties(source, target, reportErrors) {
-                if (!(target.flags & 67108864) && someConstituentTypeHasKind(target, 80896)) {
+                if (!(target.flags & 67108864) && maybeTypeOfKind(target, 80896)) {
                     for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
                         var prop = _a[_i];
                         if (!isKnownProperty(target, prop.name)) {
@@ -15711,7 +16634,7 @@ var ts;
                 }
                 return false;
             }
-            function eachTypeRelatedToSomeType(source, target) {
+            function eachTypeRelatedToSomeType(source, target, reportErrors) {
                 var result = -1;
                 var sourceTypes = source.types;
                 for (var _i = 0, sourceTypes_1 = sourceTypes; _i < sourceTypes_1.length; _i++) {
@@ -15726,7 +16649,15 @@ var ts;
             }
             function typeRelatedToSomeType(source, target, reportErrors) {
                 var targetTypes = target.types;
-                for (var i = 0, len = targetTypes.length; i < len; i++) {
+                var len = targetTypes.length;
+                while (len >= 2 && targetTypes[len - 1].flags & 96) {
+                    var related = isRelatedTo(source, targetTypes[len - 1], false);
+                    if (related) {
+                        return related;
+                    }
+                    len--;
+                }
+                for (var i = 0; i < len; i++) {
                     var related = isRelatedTo(source, targetTypes[i], reportErrors && i === len - 1);
                     if (related) {
                         return related;
@@ -15749,7 +16680,15 @@ var ts;
             }
             function someTypeRelatedToType(source, target, reportErrors) {
                 var sourceTypes = source.types;
-                for (var i = 0, len = sourceTypes.length; i < len; i++) {
+                var len = sourceTypes.length;
+                while (len >= 2 && sourceTypes[len - 1].flags & 96) {
+                    var related = isRelatedTo(sourceTypes[len - 1], target, false);
+                    if (related) {
+                        return related;
+                    }
+                    len--;
+                }
+                for (var i = 0; i < len; i++) {
                     var related = isRelatedTo(sourceTypes[i], target, reportErrors && i === len - 1);
                     if (related) {
                         return related;
@@ -15839,9 +16778,9 @@ var ts;
                         if (result) {
                             result &= signaturesRelatedTo(source, target, 1, reportErrors);
                             if (result) {
-                                result &= stringIndexTypesRelatedTo(source, originalSource, target, reportErrors);
+                                result &= indexTypesRelatedTo(source, originalSource, target, 0, reportErrors);
                                 if (result) {
-                                    result &= numberIndexTypesRelatedTo(source, originalSource, target, reportErrors);
+                                    result &= indexTypesRelatedTo(source, originalSource, target, 1, reportErrors);
                                 }
                             }
                         }
@@ -15881,23 +16820,23 @@ var ts;
                         else if (!(targetProp.flags & 134217728)) {
                             var sourcePropFlags = getDeclarationFlagsFromSymbol(sourceProp);
                             var targetPropFlags = getDeclarationFlagsFromSymbol(targetProp);
-                            if (sourcePropFlags & 16 || targetPropFlags & 16) {
+                            if (sourcePropFlags & 8 || targetPropFlags & 8) {
                                 if (sourceProp.valueDeclaration !== targetProp.valueDeclaration) {
                                     if (reportErrors) {
-                                        if (sourcePropFlags & 16 && targetPropFlags & 16) {
+                                        if (sourcePropFlags & 8 && targetPropFlags & 8) {
                                             reportError(ts.Diagnostics.Types_have_separate_declarations_of_a_private_property_0, symbolToString(targetProp));
                                         }
                                         else {
-                                            reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 16 ? source : target), typeToString(sourcePropFlags & 16 ? target : source));
+                                            reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 8 ? source : target), typeToString(sourcePropFlags & 8 ? target : source));
                                         }
                                     }
                                     return 0;
                                 }
                             }
-                            else if (targetPropFlags & 32) {
+                            else if (targetPropFlags & 16) {
                                 var sourceDeclaredInClass = sourceProp.parent && sourceProp.parent.flags & 32;
-                                var sourceClass = sourceDeclaredInClass ? getDeclaredTypeOfSymbol(sourceProp.parent) : undefined;
-                                var targetClass = getDeclaredTypeOfSymbol(targetProp.parent);
+                                var sourceClass = sourceDeclaredInClass ? getDeclaredTypeOfSymbol(getParentOfSymbol(sourceProp)) : undefined;
+                                var targetClass = getDeclaredTypeOfSymbol(getParentOfSymbol(targetProp));
                                 if (!sourceClass || !hasBaseType(sourceClass, targetClass)) {
                                     if (reportErrors) {
                                         reportError(ts.Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2, symbolToString(targetProp), typeToString(sourceClass || source), typeToString(targetClass));
@@ -15905,7 +16844,7 @@ var ts;
                                     return 0;
                                 }
                             }
-                            else if (sourcePropFlags & 32) {
+                            else if (sourcePropFlags & 16) {
                                 if (reportErrors) {
                                     reportError(ts.Diagnostics.Property_0_is_protected_in_type_1_but_public_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
                                 }
@@ -15963,36 +16902,36 @@ var ts;
                 }
                 var sourceSignatures = getSignaturesOfType(source, kind);
                 var targetSignatures = getSignaturesOfType(target, kind);
-                if (kind === 1 && sourceSignatures.length && targetSignatures.length &&
-                    isAbstractConstructorType(source) && !isAbstractConstructorType(target)) {
-                    if (reportErrors) {
-                        reportError(ts.Diagnostics.Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type);
+                if (kind === 1 && sourceSignatures.length && targetSignatures.length) {
+                    if (isAbstractConstructorType(source) && !isAbstractConstructorType(target)) {
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type);
+                        }
+                        return 0;
+                    }
+                    if (!constructorVisibilitiesAreCompatible(sourceSignatures[0], targetSignatures[0], reportErrors)) {
+                        return 0;
                     }
-                    return 0;
                 }
                 var result = -1;
                 var saveErrorInfo = errorInfo;
                 outer: for (var _i = 0, targetSignatures_1 = targetSignatures; _i < targetSignatures_1.length; _i++) {
                     var t = targetSignatures_1[_i];
-                    if (!t.hasStringLiterals || target.flags & 262144) {
-                        var shouldElaborateErrors = reportErrors;
-                        for (var _a = 0, sourceSignatures_1 = sourceSignatures; _a < sourceSignatures_1.length; _a++) {
-                            var s = sourceSignatures_1[_a];
-                            if (!s.hasStringLiterals || source.flags & 262144) {
-                                var related = signatureRelatedTo(s, t, shouldElaborateErrors);
-                                if (related) {
-                                    result &= related;
-                                    errorInfo = saveErrorInfo;
-                                    continue outer;
-                                }
-                                shouldElaborateErrors = false;
-                            }
+                    var shouldElaborateErrors = reportErrors;
+                    for (var _a = 0, sourceSignatures_1 = sourceSignatures; _a < sourceSignatures_1.length; _a++) {
+                        var s = sourceSignatures_1[_a];
+                        var related = signatureRelatedTo(s, t, shouldElaborateErrors);
+                        if (related) {
+                            result &= related;
+                            errorInfo = saveErrorInfo;
+                            continue outer;
                         }
-                        if (shouldElaborateErrors) {
-                            reportError(ts.Diagnostics.Type_0_provides_no_match_for_the_signature_1, typeToString(source), signatureToString(t, undefined, undefined, kind));
-                        }
-                        return 0;
+                        shouldElaborateErrors = false;
                     }
+                    if (shouldElaborateErrors) {
+                        reportError(ts.Diagnostics.Type_0_provides_no_match_for_the_signature_1, typeToString(source), signatureToString(t, undefined, undefined, kind));
+                    }
+                    return 0;
                 }
                 return result;
             }
@@ -16007,7 +16946,7 @@ var ts;
                 }
                 var result = -1;
                 for (var i = 0, len = sourceSignatures.length; i < len; i++) {
-                    var related = compareSignaturesIdentical(sourceSignatures[i], targetSignatures[i], false, false, isRelatedTo);
+                    var related = compareSignaturesIdentical(sourceSignatures[i], targetSignatures[i], false, false, false, isRelatedTo);
                     if (!related) {
                         return 0;
                     }
@@ -16015,79 +16954,73 @@ var ts;
                 }
                 return result;
             }
-            function stringIndexTypesRelatedTo(source, originalSource, target, reportErrors) {
-                if (relation === identityRelation) {
-                    return indexTypesIdenticalTo(0, source, target);
-                }
-                var targetType = getIndexTypeOfType(target, 0);
-                if (targetType) {
-                    if ((targetType.flags & 1) && !(originalSource.flags & 16777726)) {
-                        return -1;
-                    }
-                    var sourceType = getIndexTypeOfType(source, 0);
-                    if (!sourceType) {
-                        if (reportErrors) {
-                            reportError(ts.Diagnostics.Index_signature_is_missing_in_type_0, typeToString(source));
+            function eachPropertyRelatedTo(source, target, kind, reportErrors) {
+                var result = -1;
+                for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
+                    var prop = _a[_i];
+                    if (kind === 0 || isNumericLiteralName(prop.name)) {
+                        var related = isRelatedTo(getTypeOfSymbol(prop), target, reportErrors);
+                        if (!related) {
+                            if (reportErrors) {
+                                reportError(ts.Diagnostics.Property_0_is_incompatible_with_index_signature, symbolToString(prop));
+                            }
+                            return 0;
                         }
-                        return 0;
+                        result &= related;
                     }
-                    var related = isRelatedTo(sourceType, targetType, reportErrors);
-                    if (!related) {
-                        if (reportErrors) {
-                            reportError(ts.Diagnostics.Index_signatures_are_incompatible);
-                        }
-                        return 0;
-                    }
-                    return related;
                 }
-                return -1;
+                return result;
             }
-            function numberIndexTypesRelatedTo(source, originalSource, target, reportErrors) {
-                if (relation === identityRelation) {
-                    return indexTypesIdenticalTo(1, source, target);
+            function indexInfoRelatedTo(sourceInfo, targetInfo, reportErrors) {
+                var related = isRelatedTo(sourceInfo.type, targetInfo.type, reportErrors);
+                if (!related && reportErrors) {
+                    reportError(ts.Diagnostics.Index_signatures_are_incompatible);
                 }
-                var targetType = getIndexTypeOfType(target, 1);
-                if (targetType) {
-                    if ((targetType.flags & 1) && !(originalSource.flags & 16777726)) {
-                        return -1;
-                    }
-                    var sourceStringType = getIndexTypeOfType(source, 0);
-                    var sourceNumberType = getIndexTypeOfType(source, 1);
-                    if (!(sourceStringType || sourceNumberType)) {
-                        if (reportErrors) {
-                            reportError(ts.Diagnostics.Index_signature_is_missing_in_type_0, typeToString(source));
-                        }
-                        return 0;
-                    }
-                    var related;
-                    if (sourceStringType && sourceNumberType) {
-                        related = isRelatedTo(sourceStringType, targetType, false) || isRelatedTo(sourceNumberType, targetType, reportErrors);
-                    }
-                    else {
-                        related = isRelatedTo(sourceStringType || sourceNumberType, targetType, reportErrors);
-                    }
-                    if (!related) {
-                        if (reportErrors) {
-                            reportError(ts.Diagnostics.Index_signatures_are_incompatible);
-                        }
-                        return 0;
-                    }
-                    return related;
-                }
-                return -1;
+                return related;
             }
-            function indexTypesIdenticalTo(indexKind, source, target) {
-                var targetType = getIndexTypeOfType(target, indexKind);
-                var sourceType = getIndexTypeOfType(source, indexKind);
-                if (!sourceType && !targetType) {
+            function indexTypesRelatedTo(source, originalSource, target, kind, reportErrors) {
+                if (relation === identityRelation) {
+                    return indexTypesIdenticalTo(source, target, kind);
+                }
+                var targetInfo = getIndexInfoOfType(target, kind);
+                if (!targetInfo || ((targetInfo.type.flags & 1) && !(originalSource.flags & 16777726))) {
                     return -1;
                 }
-                if (sourceType && targetType) {
-                    return isRelatedTo(sourceType, targetType);
+                var sourceInfo = getIndexInfoOfType(source, kind) ||
+                    kind === 1 && getIndexInfoOfType(source, 0);
+                if (sourceInfo) {
+                    return indexInfoRelatedTo(sourceInfo, targetInfo, reportErrors);
+                }
+                if (isObjectLiteralType(source)) {
+                    var related = -1;
+                    if (kind === 0) {
+                        var sourceNumberInfo = getIndexInfoOfType(source, 1);
+                        if (sourceNumberInfo) {
+                            related = indexInfoRelatedTo(sourceNumberInfo, targetInfo, reportErrors);
+                        }
+                    }
+                    if (related) {
+                        related &= eachPropertyRelatedTo(source, targetInfo.type, kind, reportErrors);
+                    }
+                    return related;
+                }
+                if (reportErrors) {
+                    reportError(ts.Diagnostics.Index_signature_is_missing_in_type_0, typeToString(source));
                 }
                 return 0;
             }
-            function enumRelatedTo(source, target) {
+            function indexTypesIdenticalTo(source, target, indexKind) {
+                var targetInfo = getIndexInfoOfType(target, indexKind);
+                var sourceInfo = getIndexInfoOfType(source, indexKind);
+                if (!sourceInfo && !targetInfo) {
+                    return -1;
+                }
+                if (sourceInfo && targetInfo && sourceInfo.isReadonly === targetInfo.isReadonly) {
+                    return isRelatedTo(sourceInfo.type, targetInfo.type);
+                }
+                return 0;
+            }
+            function enumRelatedTo(source, target, reportErrors) {
                 if (source.symbol.name !== target.symbol.name ||
                     source.symbol.flags & 128 ||
                     target.symbol.flags & 128) {
@@ -16099,13 +17032,35 @@ var ts;
                     if (property.flags & 8) {
                         var targetProperty = getPropertyOfType(targetEnumType, property.name);
                         if (!targetProperty || !(targetProperty.flags & 8)) {
-                            reportError(ts.Diagnostics.Property_0_is_missing_in_type_1, property.name, typeToString(target, undefined, 128));
+                            if (reportErrors) {
+                                reportError(ts.Diagnostics.Property_0_is_missing_in_type_1, property.name, typeToString(target, undefined, 128));
+                            }
                             return 0;
                         }
                     }
                 }
                 return -1;
             }
+            function constructorVisibilitiesAreCompatible(sourceSignature, targetSignature, reportErrors) {
+                if (!sourceSignature.declaration || !targetSignature.declaration) {
+                    return true;
+                }
+                var sourceAccessibility = sourceSignature.declaration.flags & (8 | 16);
+                var targetAccessibility = targetSignature.declaration.flags & (8 | 16);
+                if (targetAccessibility === 8) {
+                    return true;
+                }
+                if (targetAccessibility === 16 && sourceAccessibility !== 8) {
+                    return true;
+                }
+                if (targetAccessibility !== 16 && !sourceAccessibility) {
+                    return true;
+                }
+                if (reportErrors) {
+                    reportError(ts.Diagnostics.Cannot_assign_a_0_constructor_type_to_a_1_constructor_type, visibilityToString(sourceAccessibility), visibilityToString(targetAccessibility));
+                }
+                return false;
+            }
         }
         function isAbstractConstructorType(type) {
             if (type.flags & 65536) {
@@ -16141,8 +17096,8 @@ var ts;
             if (sourceProp === targetProp) {
                 return -1;
             }
-            var sourcePropAccessibility = getDeclarationFlagsFromSymbol(sourceProp) & (16 | 32);
-            var targetPropAccessibility = getDeclarationFlagsFromSymbol(targetProp) & (16 | 32);
+            var sourcePropAccessibility = getDeclarationFlagsFromSymbol(sourceProp) & (8 | 16);
+            var targetPropAccessibility = getDeclarationFlagsFromSymbol(targetProp) & (8 | 16);
             if (sourcePropAccessibility !== targetPropAccessibility) {
                 return 0;
             }
@@ -16156,6 +17111,9 @@ var ts;
                     return 0;
                 }
             }
+            if (isReadonlySymbol(sourceProp) !== isReadonlySymbol(targetProp)) {
+                return 0;
+            }
             return compareTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
         }
         function isMatchingSignature(source, target, partialMatch) {
@@ -16170,7 +17128,7 @@ var ts;
             }
             return false;
         }
-        function compareSignaturesIdentical(source, target, partialMatch, ignoreReturnTypes, compareTypes) {
+        function compareSignaturesIdentical(source, target, partialMatch, ignoreThisTypes, ignoreReturnTypes, compareTypes) {
             if (source === target) {
                 return -1;
             }
@@ -16183,10 +17141,17 @@ var ts;
             source = getErasedSignature(source);
             target = getErasedSignature(target);
             var result = -1;
+            if (!ignoreThisTypes && source.thisType && target.thisType) {
+                var related = compareTypes(source.thisType, target.thisType);
+                if (!related) {
+                    return 0;
+                }
+                result &= related;
+            }
             var targetLen = target.parameters.length;
             for (var i = 0; i < targetLen; i++) {
-                var s = isRestParameterIndex(source, i) ? getRestTypeOfSignature(source) : getTypeOfSymbol(source.parameters[i]);
-                var t = isRestParameterIndex(target, i) ? getRestTypeOfSignature(target) : getTypeOfSymbol(target.parameters[i]);
+                var s = isRestParameterIndex(source, i) ? getRestTypeOfSignature(source) : getTypeOfParameter(source.parameters[i]);
+                var t = isRestParameterIndex(target, i) ? getRestTypeOfSignature(target) : getTypeOfParameter(target.parameters[i]);
                 var related = compareTypes(s, t);
                 if (!related) {
                     return 0;
@@ -16202,15 +17167,31 @@ var ts;
             return signature.hasRestParameter && parameterIndex >= signature.parameters.length - 1;
         }
         function isSupertypeOfEach(candidate, types) {
-            for (var _i = 0, types_6 = types; _i < types_6.length; _i++) {
-                var type = types_6[_i];
-                if (candidate !== type && !isTypeSubtypeOf(type, candidate))
+            for (var _i = 0, types_5 = types; _i < types_5.length; _i++) {
+                var t = types_5[_i];
+                if (candidate !== t && !isTypeSubtypeOf(t, candidate))
                     return false;
             }
             return true;
         }
+        function getCombinedFlagsOfTypes(types) {
+            var flags = 0;
+            for (var _i = 0, types_6 = types; _i < types_6.length; _i++) {
+                var t = types_6[_i];
+                flags |= t.flags;
+            }
+            return flags;
+        }
         function getCommonSupertype(types) {
-            return ts.forEach(types, function (t) { return isSupertypeOfEach(t, types) ? t : undefined; });
+            if (!strictNullChecks) {
+                return ts.forEach(types, function (t) { return isSupertypeOfEach(t, types) ? t : undefined; });
+            }
+            var primaryTypes = ts.filter(types, function (t) { return !(t.flags & 96); });
+            if (!primaryTypes.length) {
+                return getUnionType(types);
+            }
+            var supertype = ts.forEach(primaryTypes, function (t) { return isSupertypeOfEach(t, primaryTypes) ? t : undefined; });
+            return supertype && addNullableKind(supertype, getCombinedFlagsOfTypes(types) & 96);
         }
         function reportNoCommonSupertypeError(types, errorLocation, errorMessageChainHead) {
             var bestSupertype;
@@ -16243,7 +17224,8 @@ var ts;
             return type.flags & 4096 && type.target === globalArrayType;
         }
         function isArrayLikeType(type) {
-            return !(type.flags & (32 | 64)) && isTypeAssignableTo(type, anyArrayType);
+            return type.flags & 4096 && (type.target === globalArrayType || type.target === globalReadonlyArrayType) ||
+                !(type.flags & 96) && isTypeAssignableTo(type, anyReadonlyArrayType);
         }
         function isTupleLikeType(type) {
             return !!getPropertyOfType(type, "0");
@@ -16254,6 +17236,65 @@ var ts;
         function isTupleType(type) {
             return !!(type.flags & 8192);
         }
+        function getNullableKind(type) {
+            var flags = type.flags;
+            if (flags & 16384) {
+                for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                    var t = _a[_i];
+                    flags |= t.flags;
+                }
+            }
+            return flags & 96;
+        }
+        function getNullableTypeOfKind(kind) {
+            return kind & 64 ? kind & 32 ?
+                getUnionType([nullType, undefinedType]) : nullType : undefinedType;
+        }
+        function addNullableKind(type, kind) {
+            if ((getNullableKind(type) & kind) !== kind) {
+                var types = [type];
+                if (kind & 32) {
+                    types.push(undefinedType);
+                }
+                if (kind & 64) {
+                    types.push(nullType);
+                }
+                type = getUnionType(types);
+            }
+            return type;
+        }
+        function removeNullableKind(type, kind) {
+            if (type.flags & 16384 && getNullableKind(type) & kind) {
+                var firstType = void 0;
+                var types = void 0;
+                for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                    var t = _a[_i];
+                    if (!(t.flags & kind)) {
+                        if (!firstType) {
+                            firstType = t;
+                        }
+                        else {
+                            if (!types) {
+                                types = [firstType];
+                            }
+                            types.push(t);
+                        }
+                    }
+                }
+                if (firstType) {
+                    type = types ? getUnionType(types) : firstType;
+                }
+            }
+            return type;
+        }
+        function getNonNullableType(type) {
+            return strictNullChecks ? removeNullableKind(type, 96) : type;
+        }
+        function isObjectLiteralType(type) {
+            return type.symbol && (type.symbol.flags & (4096 | 2048)) !== 0 &&
+                getSignaturesOfType(type, 0).length === 0 &&
+                getSignaturesOfType(type, 1).length === 0;
+        }
         function getRegularTypeOfObjectLiteral(type) {
             if (type.flags & 1048576) {
                 var regularType = type.regularType;
@@ -16264,8 +17305,8 @@ var ts;
                     regularType.properties = type.properties;
                     regularType.callSignatures = type.callSignatures;
                     regularType.constructSignatures = type.constructSignatures;
-                    regularType.stringIndexType = type.stringIndexType;
-                    regularType.numberIndexType = type.numberIndexType;
+                    regularType.stringIndexInfo = type.stringIndexInfo;
+                    regularType.numberIndexInfo = type.numberIndexInfo;
                     type.regularType = regularType;
                 }
                 return regularType;
@@ -16290,27 +17331,23 @@ var ts;
                 }
                 members[p.name] = p;
             });
-            var stringIndexType = getIndexTypeOfType(type, 0);
-            var numberIndexType = getIndexTypeOfType(type, 1);
-            if (stringIndexType)
-                stringIndexType = getWidenedType(stringIndexType);
-            if (numberIndexType)
-                numberIndexType = getWidenedType(numberIndexType);
-            return createAnonymousType(type.symbol, members, emptyArray, emptyArray, stringIndexType, numberIndexType);
+            var stringIndexInfo = getIndexInfoOfType(type, 0);
+            var numberIndexInfo = getIndexInfoOfType(type, 1);
+            return createAnonymousType(type.symbol, members, emptyArray, emptyArray, stringIndexInfo && createIndexInfo(getWidenedType(stringIndexInfo.type), stringIndexInfo.isReadonly), numberIndexInfo && createIndexInfo(getWidenedType(numberIndexInfo.type), numberIndexInfo.isReadonly));
+        }
+        function getWidenedConstituentType(type) {
+            return type.flags & 96 ? type : getWidenedType(type);
         }
         function getWidenedType(type) {
-            if (type.flags & 140509184) {
-                if (type.flags & (32 | 64)) {
+            if (type.flags & 6291456) {
+                if (type.flags & 96) {
                     return anyType;
                 }
-                if (type.flags & 134217728) {
-                    return booleanType;
-                }
                 if (type.flags & 524288) {
                     return getWidenedTypeOfObjectLiteral(type);
                 }
                 if (type.flags & 16384) {
-                    return getUnionType(ts.map(type.types, getWidenedType), true);
+                    return getUnionType(ts.map(type.types, getWidenedConstituentType), true);
                 }
                 if (isArrayType(type)) {
                     return createArrayType(getWidenedType(type.typeArguments[0]));
@@ -16360,22 +17397,25 @@ var ts;
             var typeAsString = typeToString(getWidenedType(type));
             var diagnostic;
             switch (declaration.kind) {
-                case 142:
-                case 141:
+                case 144:
+                case 143:
                     diagnostic = ts.Diagnostics.Member_0_implicitly_has_an_1_type;
                     break;
-                case 139:
+                case 141:
                     diagnostic = declaration.dotDotDotToken ?
                         ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type :
                         ts.Diagnostics.Parameter_0_implicitly_has_an_1_type;
                     break;
-                case 216:
-                case 144:
-                case 143:
+                case 168:
+                    diagnostic = ts.Diagnostics.Binding_element_0_implicitly_has_an_1_type;
+                    break;
+                case 219:
                 case 146:
-                case 147:
-                case 176:
-                case 177:
+                case 145:
+                case 148:
+                case 149:
+                case 178:
+                case 179:
                     if (!declaration.name) {
                         error(declaration, ts.Diagnostics.Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
                         return;
@@ -16399,25 +17439,19 @@ var ts;
             var targetMax = target.parameters.length;
             var count;
             if (source.hasRestParameter && target.hasRestParameter) {
-                count = sourceMax > targetMax ? sourceMax : targetMax;
-                sourceMax--;
-                targetMax--;
+                count = Math.max(sourceMax, targetMax);
             }
             else if (source.hasRestParameter) {
-                sourceMax--;
                 count = targetMax;
             }
             else if (target.hasRestParameter) {
-                targetMax--;
                 count = sourceMax;
             }
             else {
-                count = sourceMax < targetMax ? sourceMax : targetMax;
+                count = Math.min(sourceMax, targetMax);
             }
             for (var i = 0; i < count; i++) {
-                var s = i < sourceMax ? getTypeOfSymbol(source.parameters[i]) : getRestTypeOfSignature(source);
-                var t = i < targetMax ? getTypeOfSymbol(target.parameters[i]) : getRestTypeOfSignature(target);
-                callback(s, t);
+                callback(getTypeAtPosition(source, i), getTypeAtPosition(target, i));
             }
         }
         function createInferenceContext(typeParameters, inferUnionTypes) {
@@ -16441,6 +17475,7 @@ var ts;
             var targetStack;
             var depth = 0;
             var inferiority = 0;
+            var visited = {};
             inferFromTypes(source, target);
             function isInProcess(source, target) {
                 for (var i = 0; i < depth; i++) {
@@ -16453,7 +17488,7 @@ var ts;
             function inferFromTypes(source, target) {
                 if (source.flags & 16384 && target.flags & 16384 ||
                     source.flags & 32768 && target.flags & 32768) {
-                    var matchingTypes;
+                    var matchingTypes = void 0;
                     for (var _i = 0, _a = target.types; _i < _a.length; _i++) {
                         var t = _a[_i];
                         if (typeIdenticalToSomeType(t, source.types)) {
@@ -16494,11 +17529,6 @@ var ts;
                         inferFromTypes(sourceTypes[i], targetTypes[i]);
                     }
                 }
-                else if (source.flags & 134217728 && target.flags & 134217728) {
-                    if (source.predicate.kind === target.predicate.kind) {
-                        inferFromTypes(source.predicate.type, target.predicate.type);
-                    }
-                }
                 else if (source.flags & 8192 && target.flags & 8192 && source.elementTypes.length === target.elementTypes.length) {
                     var sourceTypes = source.elementTypes;
                     var targetTypes = target.elementTypes;
@@ -16509,7 +17539,7 @@ var ts;
                 else if (target.flags & 49152) {
                     var targetTypes = target.types;
                     var typeParameterCount = 0;
-                    var typeParameter;
+                    var typeParameter = void 0;
                     for (var _b = 0, targetTypes_2 = targetTypes; _b < targetTypes_2.length; _b++) {
                         var t = targetTypes_2[_b];
                         if (t.flags & 512 && ts.contains(context.typeParameters, t)) {
@@ -16544,6 +17574,11 @@ var ts;
                         if (isDeeplyNestedGeneric(source, sourceStack, depth) && isDeeplyNestedGeneric(target, targetStack, depth)) {
                             return;
                         }
+                        var key = source.id + "," + target.id;
+                        if (ts.hasProperty(visited, key)) {
+                            return;
+                        }
+                        visited[key] = true;
                         if (depth === 0) {
                             sourceStack = [];
                             targetStack = [];
@@ -16554,9 +17589,7 @@ var ts;
                         inferFromProperties(source, target);
                         inferFromSignatures(source, target, 0);
                         inferFromSignatures(source, target, 1);
-                        inferFromIndexTypes(source, target, 0, 0);
-                        inferFromIndexTypes(source, target, 1, 1);
-                        inferFromIndexTypes(source, target, 0, 1);
+                        inferFromIndexTypes(source, target);
                         depth--;
                     }
                 }
@@ -16583,14 +17616,29 @@ var ts;
             }
             function inferFromSignature(source, target) {
                 forEachMatchingParameterType(source, target, inferFromTypes);
-                inferFromTypes(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
+                if (source.typePredicate && target.typePredicate && source.typePredicate.kind === target.typePredicate.kind) {
+                    inferFromTypes(source.typePredicate.type, target.typePredicate.type);
+                }
+                else {
+                    inferFromTypes(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
+                }
             }
-            function inferFromIndexTypes(source, target, sourceKind, targetKind) {
-                var targetIndexType = getIndexTypeOfType(target, targetKind);
-                if (targetIndexType) {
-                    var sourceIndexType = getIndexTypeOfType(source, sourceKind);
+            function inferFromIndexTypes(source, target) {
+                var targetStringIndexType = getIndexTypeOfType(target, 0);
+                if (targetStringIndexType) {
+                    var sourceIndexType = getIndexTypeOfType(source, 0) ||
+                        getImplicitIndexTypeOfType(source, 0);
                     if (sourceIndexType) {
-                        inferFromTypes(sourceIndexType, targetIndexType);
+                        inferFromTypes(sourceIndexType, targetStringIndexType);
+                    }
+                }
+                var targetNumberIndexType = getIndexTypeOfType(target, 1);
+                if (targetNumberIndexType) {
+                    var sourceIndexType = getIndexTypeOfType(source, 1) ||
+                        getIndexTypeOfType(source, 0) ||
+                        getImplicitIndexTypeOfType(source, 1);
+                    if (sourceIndexType) {
+                        inferFromTypes(sourceIndexType, targetNumberIndexType);
                     }
                 }
             }
@@ -16654,20 +17702,31 @@ var ts;
             }
             return context.inferredTypes;
         }
+        function createTransientIdentifier(symbol, location) {
+            var result = ts.createNode(69);
+            result.text = symbol.name;
+            result.resolvedSymbol = symbol;
+            result.parent = location;
+            result.id = -1;
+            return result;
+        }
         function getResolvedSymbol(node) {
+            if (node.id === -1) {
+                return node.resolvedSymbol;
+            }
             var links = getNodeLinks(node);
             if (!links.resolvedSymbol) {
-                links.resolvedSymbol = (!ts.nodeIsMissing(node) && resolveName(node, node.text, 107455 | 1048576, ts.Diagnostics.Cannot_find_name_0, node)) || unknownSymbol;
+                links.resolvedSymbol = !ts.nodeIsMissing(node) && resolveName(node, node.text, 107455 | 1048576, ts.Diagnostics.Cannot_find_name_0, node) || unknownSymbol;
             }
             return links.resolvedSymbol;
         }
         function isInTypeQuery(node) {
             while (node) {
                 switch (node.kind) {
-                    case 155:
+                    case 157:
                         return true;
                     case 69:
-                    case 136:
+                    case 138:
                         node = node.parent;
                         continue;
                     default:
@@ -16676,164 +17735,279 @@ var ts;
             }
             ts.Debug.fail("should not get here");
         }
+        function getAssignmentKey(node) {
+            if (node.kind === 69) {
+                var symbol = getResolvedSymbol(node);
+                return symbol !== unknownSymbol ? "" + getSymbolId(symbol) : undefined;
+            }
+            if (node.kind === 97) {
+                return "0";
+            }
+            if (node.kind === 171) {
+                var key = getAssignmentKey(node.expression);
+                return key && key + "." + node.name.text;
+            }
+            return undefined;
+        }
         function hasInitializer(node) {
             return !!(node.initializer || ts.isBindingPattern(node.parent) && hasInitializer(node.parent.parent));
         }
-        function isVariableAssignedWithin(symbol, node) {
-            var links = getNodeLinks(node);
-            if (links.assignmentChecks) {
-                var cachedResult = links.assignmentChecks[symbol.id];
-                if (cachedResult !== undefined) {
-                    return cachedResult;
-                }
-            }
-            else {
-                links.assignmentChecks = {};
-            }
-            return links.assignmentChecks[symbol.id] = isAssignedIn(node);
-            function isAssignedInBinaryExpression(node) {
-                if (node.operatorToken.kind >= 56 && node.operatorToken.kind <= 68) {
-                    var n = skipParenthesizedNodes(node.left);
-                    if (n.kind === 69 && getResolvedSymbol(n) === symbol) {
-                        return true;
+        function getAssignmentMap(node) {
+            var assignmentMap = {};
+            visit(node);
+            return assignmentMap;
+            function visitReference(node) {
+                if (isAssignmentTarget(node) || isCompoundAssignmentTarget(node)) {
+                    var key = getAssignmentKey(node);
+                    if (key) {
+                        assignmentMap[key] = true;
                     }
                 }
-                return ts.forEachChild(node, isAssignedIn);
+                ts.forEachChild(node, visit);
             }
-            function isAssignedInVariableDeclaration(node) {
-                if (!ts.isBindingPattern(node.name) && getSymbolOfNode(node) === symbol && hasInitializer(node)) {
-                    return true;
+            function visitVariableDeclaration(node) {
+                if (!ts.isBindingPattern(node.name) && hasInitializer(node)) {
+                    assignmentMap[getSymbolId(getSymbolOfNode(node))] = true;
                 }
-                return ts.forEachChild(node, isAssignedIn);
+                ts.forEachChild(node, visit);
             }
-            function isAssignedIn(node) {
+            function visit(node) {
                 switch (node.kind) {
-                    case 184:
-                        return isAssignedInBinaryExpression(node);
-                    case 214:
-                    case 166:
-                        return isAssignedInVariableDeclaration(node);
-                    case 164:
-                    case 165:
-                    case 167:
+                    case 69:
+                    case 171:
+                        visitReference(node);
+                        break;
+                    case 217:
                     case 168:
+                        visitVariableDeclaration(node);
+                        break;
+                    case 186:
+                    case 166:
+                    case 167:
                     case 169:
                     case 170:
-                    case 171:
                     case 172:
+                    case 173:
                     case 174:
-                    case 192:
-                    case 175:
-                    case 182:
-                    case 178:
-                    case 181:
-                    case 179:
+                    case 176:
+                    case 194:
+                    case 195:
+                    case 177:
+                    case 184:
                     case 180:
                     case 183:
-                    case 187:
+                    case 181:
+                    case 182:
                     case 185:
-                    case 188:
-                    case 195:
-                    case 196:
+                    case 189:
+                    case 187:
+                    case 190:
                     case 198:
                     case 199:
-                    case 200:
                     case 201:
                     case 202:
                     case 203:
                     case 204:
+                    case 205:
+                    case 206:
                     case 207:
-                    case 208:
-                    case 209:
-                    case 244:
-                    case 245:
                     case 210:
                     case 211:
                     case 212:
-                    case 247:
-                    case 236:
-                    case 237:
+                    case 226:
+                    case 248:
+                    case 249:
+                    case 213:
+                    case 214:
+                    case 215:
+                    case 251:
+                    case 240:
                     case 241:
+                    case 245:
+                    case 246:
                     case 242:
-                    case 238:
-                    case 243:
-                        return ts.forEachChild(node, isAssignedIn);
+                    case 247:
+                        ts.forEachChild(node, visit);
+                        break;
                 }
-                return false;
             }
         }
-        function getNarrowedTypeOfSymbol(symbol, node) {
-            var type = getTypeOfSymbol(symbol);
-            if (node && symbol.flags & 3) {
-                if (isTypeAny(type) || type.flags & (80896 | 16384 | 512)) {
-                    var declaration = ts.getDeclarationOfKind(symbol, 214);
-                    var top_1 = declaration && getDeclarationContainer(declaration);
-                    var originalType = type;
-                    var nodeStack = [];
-                    loop: while (node.parent) {
-                        var child = node;
-                        node = node.parent;
-                        switch (node.kind) {
-                            case 199:
-                            case 185:
-                            case 184:
-                                nodeStack.push({ node: node, child: child });
-                                break;
-                            case 251:
-                            case 221:
-                                break loop;
-                        }
-                        if (node === top_1) {
-                            break;
-                        }
-                    }
-                    var nodes;
-                    while (nodes = nodeStack.pop()) {
-                        var node_1 = nodes.node, child = nodes.child;
-                        switch (node_1.kind) {
-                            case 199:
-                                if (child !== node_1.expression) {
-                                    type = narrowType(type, node_1.expression, child === node_1.thenStatement);
-                                }
-                                break;
-                            case 185:
-                                if (child !== node_1.condition) {
-                                    type = narrowType(type, node_1.condition, child === node_1.whenTrue);
-                                }
-                                break;
-                            case 184:
-                                if (child === node_1.right) {
-                                    if (node_1.operatorToken.kind === 51) {
-                                        type = narrowType(type, node_1.left, true);
-                                    }
-                                    else if (node_1.operatorToken.kind === 52) {
-                                        type = narrowType(type, node_1.left, false);
-                                    }
-                                }
-                                break;
-                            default:
-                                ts.Debug.fail("Unreachable!");
-                        }
-                        if (type !== originalType && isVariableAssignedWithin(symbol, node_1)) {
-                            type = originalType;
-                        }
-                    }
-                    if (type === emptyUnionType) {
-                        type = originalType;
-                    }
+        function isReferenceAssignedWithin(reference, node) {
+            if (reference.kind !== 97) {
+                var key = getAssignmentKey(reference);
+                if (key) {
+                    var links = getNodeLinks(node);
+                    return (links.assignmentMap || (links.assignmentMap = getAssignmentMap(node)))[key];
                 }
             }
-            return type;
-            function narrowTypeByEquality(type, expr, assumeTrue) {
-                if (expr.left.kind !== 179 || expr.right.kind !== 9) {
+            return false;
+        }
+        function isAnyPartOfReferenceAssignedWithin(reference, node) {
+            while (true) {
+                if (isReferenceAssignedWithin(reference, node)) {
+                    return true;
+                }
+                if (reference.kind !== 171) {
+                    return false;
+                }
+                reference = reference.expression;
+            }
+        }
+        function isNullOrUndefinedLiteral(node) {
+            return node.kind === 93 ||
+                node.kind === 69 && getResolvedSymbol(node) === undefinedSymbol;
+        }
+        function getLeftmostIdentifierOrThis(node) {
+            switch (node.kind) {
+                case 69:
+                case 97:
+                    return node;
+                case 171:
+                    return getLeftmostIdentifierOrThis(node.expression);
+            }
+            return undefined;
+        }
+        function isMatchingReference(source, target) {
+            if (source.kind === target.kind) {
+                switch (source.kind) {
+                    case 69:
+                        return getResolvedSymbol(source) === getResolvedSymbol(target);
+                    case 97:
+                        return true;
+                    case 171:
+                        return source.name.text === target.name.text &&
+                            isMatchingReference(source.expression, target.expression);
+                }
+            }
+            return false;
+        }
+        function getNarrowedTypeOfReference(type, reference) {
+            if (!(type.flags & (1 | 80896 | 16384 | 512))) {
+                return type;
+            }
+            var leftmostNode = getLeftmostIdentifierOrThis(reference);
+            if (!leftmostNode) {
+                return type;
+            }
+            var top;
+            if (leftmostNode.kind === 69) {
+                var leftmostSymbol = getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(leftmostNode));
+                if (!leftmostSymbol) {
                     return type;
                 }
+                var declaration = leftmostSymbol.valueDeclaration;
+                if (!declaration || declaration.kind !== 217 && declaration.kind !== 141 && declaration.kind !== 168) {
+                    return type;
+                }
+                top = getDeclarationContainer(declaration);
+            }
+            var originalType = type;
+            var nodeStack = [];
+            var node = reference;
+            loop: while (node.parent) {
+                var child = node;
+                node = node.parent;
+                switch (node.kind) {
+                    case 202:
+                    case 187:
+                    case 186:
+                        nodeStack.push({ node: node, child: child });
+                        break;
+                    case 255:
+                    case 224:
+                        break loop;
+                    default:
+                        if (node === top || ts.isFunctionLikeKind(node.kind)) {
+                            break loop;
+                        }
+                        break;
+                }
+            }
+            var nodes;
+            while (nodes = nodeStack.pop()) {
+                var node_1 = nodes.node, child = nodes.child;
+                switch (node_1.kind) {
+                    case 202:
+                        if (child !== node_1.expression) {
+                            type = narrowType(type, node_1.expression, child === node_1.thenStatement);
+                        }
+                        break;
+                    case 187:
+                        if (child !== node_1.condition) {
+                            type = narrowType(type, node_1.condition, child === node_1.whenTrue);
+                        }
+                        break;
+                    case 186:
+                        if (child === node_1.right) {
+                            if (node_1.operatorToken.kind === 51) {
+                                type = narrowType(type, node_1.left, true);
+                            }
+                            else if (node_1.operatorToken.kind === 52) {
+                                type = narrowType(type, node_1.left, false);
+                            }
+                        }
+                        break;
+                    default:
+                        ts.Debug.fail("Unreachable!");
+                }
+                if (type !== originalType && isAnyPartOfReferenceAssignedWithin(reference, node_1)) {
+                    type = originalType;
+                }
+            }
+            if (type === emptyUnionType) {
+                type = originalType;
+            }
+            return type;
+            function narrowTypeByTruthiness(type, expr, assumeTrue) {
+                return strictNullChecks && assumeTrue && isMatchingReference(expr, reference) ? getNonNullableType(type) : type;
+            }
+            function narrowTypeByBinaryExpression(type, expr, assumeTrue) {
+                switch (expr.operatorToken.kind) {
+                    case 30:
+                    case 31:
+                    case 32:
+                    case 33:
+                        if (isNullOrUndefinedLiteral(expr.right)) {
+                            return narrowTypeByNullCheck(type, expr, assumeTrue);
+                        }
+                        if (expr.left.kind === 181 && expr.right.kind === 9) {
+                            return narrowTypeByTypeof(type, expr, assumeTrue);
+                        }
+                        break;
+                    case 51:
+                        return narrowTypeByAnd(type, expr, assumeTrue);
+                    case 52:
+                        return narrowTypeByOr(type, expr, assumeTrue);
+                    case 91:
+                        return narrowTypeByInstanceof(type, expr, assumeTrue);
+                }
+                return type;
+            }
+            function narrowTypeByNullCheck(type, expr, assumeTrue) {
+                var operator = expr.operatorToken.kind;
+                if (operator === 31 || operator === 33) {
+                    assumeTrue = !assumeTrue;
+                }
+                if (!strictNullChecks || !isMatchingReference(expr.left, reference)) {
+                    return type;
+                }
+                var doubleEquals = operator === 30 || operator === 31;
+                var exprNullableKind = doubleEquals ? 96 :
+                    expr.right.kind === 93 ? 64 : 32;
+                if (assumeTrue) {
+                    var nullableKind = getNullableKind(type) & exprNullableKind;
+                    return nullableKind ? getNullableTypeOfKind(nullableKind) : type;
+                }
+                return removeNullableKind(type, exprNullableKind);
+            }
+            function narrowTypeByTypeof(type, expr, assumeTrue) {
                 var left = expr.left;
                 var right = expr.right;
-                if (left.expression.kind !== 69 || getResolvedSymbol(left.expression) !== symbol) {
+                if (!isMatchingReference(left.expression, reference)) {
                     return type;
                 }
-                if (expr.operatorToken.kind === 33) {
+                if (expr.operatorToken.kind === 31 ||
+                    expr.operatorToken.kind === 33) {
                     assumeTrue = !assumeTrue;
                 }
                 var typeInfo = primitiveTypeInfo[right.text];
@@ -16882,7 +18056,7 @@ var ts;
                 }
             }
             function narrowTypeByInstanceof(type, expr, assumeTrue) {
-                if (isTypeAny(type) || expr.left.kind !== 69 || getResolvedSymbol(expr.left) !== symbol) {
+                if (isTypeAny(type) || !isMatchingReference(expr.left, reference)) {
                     return type;
                 }
                 var rightType = checkExpression(expr.right);
@@ -16898,7 +18072,7 @@ var ts;
                     }
                 }
                 if (!targetType) {
-                    var constructSignatures;
+                    var constructSignatures = void 0;
                     if (rightType.flags & 2048) {
                         constructSignatures = resolveDeclaredMembers(rightType).declaredConstructSignatures;
                     }
@@ -16927,123 +18101,209 @@ var ts;
                         return getUnionType(assignableConstituents);
                     }
                 }
-                if (isTypeAssignableTo(narrowedTypeCandidate, originalType)) {
+                var targetType = originalType.flags & 512 ? getApparentType(originalType) : originalType;
+                if (isTypeAssignableTo(narrowedTypeCandidate, targetType)) {
                     return narrowedTypeCandidate;
                 }
                 return originalType;
             }
-            function narrowTypeByTypePredicate(type, expr, assumeTrue) {
+            function narrowTypeByTypePredicate(type, callExpression, assumeTrue) {
                 if (type.flags & 1) {
                     return type;
                 }
-                var signature = getResolvedSignature(expr);
-                var predicateType = getReturnTypeOfSignature(signature);
-                if (!predicateType || !(predicateType.flags & 134217728)) {
+                var signature = getResolvedSignature(callExpression);
+                var predicate = signature.typePredicate;
+                if (!predicate) {
                     return type;
                 }
-                var predicate = predicateType.predicate;
                 if (ts.isIdentifierTypePredicate(predicate)) {
-                    var callExpression = expr;
-                    if (callExpression.arguments[predicate.parameterIndex] &&
-                        getSymbolAtTypePredicatePosition(callExpression.arguments[predicate.parameterIndex]) === symbol) {
+                    var predicateArgument = callExpression.arguments[predicate.parameterIndex];
+                    if (predicateArgument && isMatchingReference(predicateArgument, reference)) {
                         return getNarrowedType(type, predicate.type, assumeTrue);
                     }
                 }
                 else {
-                    var expression = skipParenthesizedNodes(expr.expression);
-                    return narrowTypeByThisTypePredicate(type, predicate, expression, assumeTrue);
-                }
-                return type;
-            }
-            function narrowTypeByTypePredicateMember(type, expr, assumeTrue) {
-                if (type.flags & 1) {
-                    return type;
-                }
-                var memberType = getTypeOfExpression(expr);
-                if (!(memberType.flags & 134217728)) {
-                    return type;
-                }
-                return narrowTypeByThisTypePredicate(type, memberType.predicate, expr, assumeTrue);
-            }
-            function narrowTypeByThisTypePredicate(type, predicate, expression, assumeTrue) {
-                if (expression.kind === 170 || expression.kind === 169) {
-                    var accessExpression = expression;
-                    var possibleIdentifier = skipParenthesizedNodes(accessExpression.expression);
-                    if (possibleIdentifier.kind === 69 && getSymbolAtTypePredicatePosition(possibleIdentifier) === symbol) {
-                        return getNarrowedType(type, predicate.type, assumeTrue);
+                    var invokedExpression = skipParenthesizedNodes(callExpression.expression);
+                    if (invokedExpression.kind === 172 || invokedExpression.kind === 171) {
+                        var accessExpression = invokedExpression;
+                        var possibleReference = skipParenthesizedNodes(accessExpression.expression);
+                        if (isMatchingReference(possibleReference, reference)) {
+                            return getNarrowedType(type, predicate.type, assumeTrue);
+                        }
                     }
                 }
                 return type;
             }
-            function getSymbolAtTypePredicatePosition(expr) {
-                expr = skipParenthesizedNodes(expr);
-                switch (expr.kind) {
-                    case 69:
-                    case 169:
-                    case 136:
-                        return getSymbolOfEntityNameOrPropertyAccessExpression(expr);
-                }
-            }
             function narrowType(type, expr, assumeTrue) {
                 switch (expr.kind) {
+                    case 69:
+                    case 97:
                     case 171:
+                        return narrowTypeByTruthiness(type, expr, assumeTrue);
+                    case 173:
                         return narrowTypeByTypePredicate(type, expr, assumeTrue);
-                    case 175:
+                    case 177:
                         return narrowType(type, expr.expression, assumeTrue);
+                    case 186:
+                        return narrowTypeByBinaryExpression(type, expr, assumeTrue);
                     case 184:
-                        var operator = expr.operatorToken.kind;
-                        if (operator === 32 || operator === 33) {
-                            return narrowTypeByEquality(type, expr, assumeTrue);
-                        }
-                        else if (operator === 51) {
-                            return narrowTypeByAnd(type, expr, assumeTrue);
-                        }
-                        else if (operator === 52) {
-                            return narrowTypeByOr(type, expr, assumeTrue);
-                        }
-                        else if (operator === 91) {
-                            return narrowTypeByInstanceof(type, expr, assumeTrue);
-                        }
-                        break;
-                    case 182:
                         if (expr.operator === 49) {
                             return narrowType(type, expr.operand, !assumeTrue);
                         }
                         break;
-                    case 170:
-                    case 169:
-                        return narrowTypeByTypePredicateMember(type, expr, assumeTrue);
                 }
                 return type;
             }
         }
+        function getTypeOfSymbolAtLocation(symbol, location) {
+            var type = getTypeOfSymbol(symbol);
+            if (location.kind === 69) {
+                if (ts.isRightSideOfQualifiedNameOrPropertyAccess(location)) {
+                    location = location.parent;
+                }
+                if (ts.isExpression(location)) {
+                    checkExpression(location);
+                    if (getNodeLinks(location).resolvedSymbol === symbol) {
+                        return getNarrowedTypeOfReference(type, location);
+                    }
+                }
+            }
+            return getNarrowedTypeOfReference(type, createTransientIdentifier(symbol, location));
+        }
         function skipParenthesizedNodes(expression) {
-            while (expression.kind === 175) {
+            while (expression.kind === 177) {
                 expression = expression.expression;
             }
             return expression;
         }
+        function findFirstAssignment(symbol, container) {
+            return visit(ts.isFunctionLike(container) ? container.body : container);
+            function visit(node) {
+                switch (node.kind) {
+                    case 69:
+                        var assignment = getAssignmentRoot(node);
+                        return assignment && getResolvedSymbol(node) === symbol ? assignment : undefined;
+                    case 186:
+                    case 217:
+                    case 168:
+                    case 166:
+                    case 167:
+                    case 169:
+                    case 170:
+                    case 171:
+                    case 172:
+                    case 173:
+                    case 174:
+                    case 176:
+                    case 194:
+                    case 195:
+                    case 177:
+                    case 184:
+                    case 180:
+                    case 183:
+                    case 181:
+                    case 182:
+                    case 185:
+                    case 189:
+                    case 187:
+                    case 190:
+                    case 199:
+                    case 201:
+                    case 202:
+                    case 203:
+                    case 204:
+                    case 205:
+                    case 206:
+                    case 207:
+                    case 210:
+                    case 211:
+                    case 212:
+                    case 226:
+                    case 248:
+                    case 249:
+                    case 213:
+                    case 214:
+                    case 215:
+                    case 251:
+                    case 240:
+                    case 241:
+                    case 245:
+                    case 246:
+                    case 242:
+                    case 247:
+                    case 198:
+                    case 255:
+                        return ts.forEachChild(node, visit);
+                }
+                return undefined;
+            }
+        }
+        function checkVariableAssignedBefore(symbol, reference) {
+            if (!(symbol.flags & 3)) {
+                return;
+            }
+            var declaration = symbol.valueDeclaration;
+            if (!declaration || declaration.kind !== 217 || declaration.initializer || ts.isInAmbientContext(declaration)) {
+                return;
+            }
+            var parentParentKind = declaration.parent.parent.kind;
+            if (parentParentKind === 207 || parentParentKind === 206) {
+                return;
+            }
+            var declarationContainer = ts.getContainingFunction(declaration) || ts.getSourceFileOfNode(declaration);
+            var referenceContainer = ts.getContainingFunction(reference) || ts.getSourceFileOfNode(reference);
+            if (declarationContainer !== referenceContainer) {
+                return;
+            }
+            var links = getSymbolLinks(symbol);
+            if (!links.firstAssignmentChecked) {
+                links.firstAssignmentChecked = true;
+                links.firstAssignment = findFirstAssignment(symbol, declarationContainer);
+            }
+            if (links.firstAssignment && links.firstAssignment.end <= reference.pos) {
+                return;
+            }
+            error(reference, ts.Diagnostics.Variable_0_is_used_before_being_assigned, symbolToString(symbol));
+        }
         function checkIdentifier(node) {
             var symbol = getResolvedSymbol(node);
             if (symbol === argumentsSymbol) {
                 var container = ts.getContainingFunction(node);
-                if (container.kind === 177) {
+                if (container.kind === 179) {
                     if (languageVersion < 2) {
                         error(node, ts.Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression);
                     }
                 }
-                if (node.parserContextFlags & 8) {
-                    getNodeLinks(container).flags |= 4096;
-                    getNodeLinks(node).flags |= 2048;
+                if (node.flags & 33554432) {
+                    getNodeLinks(container).flags |= 8192;
                 }
             }
             if (symbol.flags & 8388608 && !isInTypeQuery(node) && !isConstEnumOrConstEnumOnlyModule(resolveAlias(symbol))) {
                 markAliasSymbolAsReferenced(symbol);
             }
+            var localOrExportSymbol = getExportSymbolOfValueSymbolIfExported(symbol);
+            if (languageVersion === 2
+                && localOrExportSymbol.flags & 32
+                && localOrExportSymbol.valueDeclaration.kind === 220
+                && ts.nodeIsDecorated(localOrExportSymbol.valueDeclaration)) {
+                var container = ts.getContainingClass(node);
+                while (container !== undefined) {
+                    if (container === localOrExportSymbol.valueDeclaration && container.name !== node) {
+                        getNodeLinks(container).flags |= 524288;
+                        getNodeLinks(node).flags |= 1048576;
+                        break;
+                    }
+                    container = ts.getContainingClass(container);
+                }
+            }
             checkCollisionWithCapturedSuperVariable(node, node);
             checkCollisionWithCapturedThisVariable(node, node);
-            checkBlockScopedBindingCapturedInLoop(node, symbol);
-            return getNarrowedTypeOfSymbol(getExportSymbolOfValueSymbolIfExported(symbol), node);
+            checkNestedBlockScopedBinding(node, symbol);
+            var type = getTypeOfSymbol(localOrExportSymbol);
+            if (strictNullChecks && !isAssignmentTarget(node) && !(type.flags & 1) && !(getNullableKind(type) & 32)) {
+                checkVariableAssignedBefore(symbol, node);
+            }
+            return getNarrowedTypeOfReference(type, node);
         }
         function isInsideFunction(node, threshold) {
             var current = node;
@@ -17055,42 +18315,67 @@ var ts;
             }
             return false;
         }
-        function checkBlockScopedBindingCapturedInLoop(node, symbol) {
+        function checkNestedBlockScopedBinding(node, symbol) {
             if (languageVersion >= 2 ||
                 (symbol.flags & (2 | 32)) === 0 ||
-                symbol.valueDeclaration.parent.kind === 247) {
+                symbol.valueDeclaration.parent.kind === 251) {
                 return;
             }
-            var container;
-            if (symbol.flags & 32) {
-                container = getClassLikeDeclarationOfSymbol(symbol).parent;
-            }
-            else {
-                container = symbol.valueDeclaration;
-                while (container.kind !== 215) {
-                    container = container.parent;
-                }
-                container = container.parent;
-                if (container.kind === 196) {
-                    container = container.parent;
-                }
-            }
-            var inFunction = isInsideFunction(node.parent, container);
+            var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
+            var usedInFunction = isInsideFunction(node.parent, container);
             var current = container;
+            var containedInIterationStatement = false;
             while (current && !ts.nodeStartsNewLexicalEnvironment(current)) {
                 if (ts.isIterationStatement(current, false)) {
-                    if (inFunction) {
-                        getNodeLinks(current).flags |= 65536;
-                    }
-                    getNodeLinks(symbol.valueDeclaration).flags |= 16384;
+                    containedInIterationStatement = true;
                     break;
                 }
                 current = current.parent;
             }
+            if (containedInIterationStatement) {
+                if (usedInFunction) {
+                    getNodeLinks(current).flags |= 65536;
+                }
+                if (container.kind === 205 &&
+                    ts.getAncestor(symbol.valueDeclaration, 218).parent === container &&
+                    isAssignedInBodyOfForStatement(node, container)) {
+                    getNodeLinks(symbol.valueDeclaration).flags |= 2097152;
+                }
+                getNodeLinks(symbol.valueDeclaration).flags |= 262144;
+            }
+            if (usedInFunction) {
+                getNodeLinks(symbol.valueDeclaration).flags |= 131072;
+            }
+        }
+        function isAssignedInBodyOfForStatement(node, container) {
+            var current = node;
+            while (current.parent.kind === 177) {
+                current = current.parent;
+            }
+            var isAssigned = false;
+            if (isAssignmentTarget(current)) {
+                isAssigned = true;
+            }
+            else if ((current.parent.kind === 184 || current.parent.kind === 185)) {
+                var expr = current.parent;
+                isAssigned = expr.operator === 41 || expr.operator === 42;
+            }
+            if (!isAssigned) {
+                return false;
+            }
+            while (current !== container) {
+                if (current === container.statement) {
+                    return true;
+                }
+                else {
+                    current = current.parent;
+                }
+            }
+            return false;
         }
         function captureLexicalThis(node, container) {
             getNodeLinks(node).flags |= 2;
-            if (container.kind === 142 || container.kind === 145) {
+            if (container.kind === 144 || container.kind === 147) {
                 var classNode = container.parent;
                 getNodeLinks(classNode).flags |= 4;
             }
@@ -17098,70 +18383,138 @@ var ts;
                 getNodeLinks(container).flags |= 4;
             }
         }
+        function findFirstSuperCall(n) {
+            if (ts.isSuperCallExpression(n)) {
+                return n;
+            }
+            else if (ts.isFunctionLike(n)) {
+                return undefined;
+            }
+            return ts.forEachChild(n, findFirstSuperCall);
+        }
+        function getSuperCallInConstructor(constructor) {
+            var links = getNodeLinks(constructor);
+            if (links.hasSuperCall === undefined) {
+                links.superCall = findFirstSuperCall(constructor.body);
+                links.hasSuperCall = links.superCall ? true : false;
+            }
+            return links.superCall;
+        }
+        function classDeclarationExtendsNull(classDecl) {
+            var classSymbol = getSymbolOfNode(classDecl);
+            var classInstanceType = getDeclaredTypeOfSymbol(classSymbol);
+            var baseConstructorType = getBaseConstructorTypeOfClass(classInstanceType);
+            return baseConstructorType === nullType;
+        }
         function checkThisExpression(node) {
             var container = ts.getThisContainer(node, true);
             var needToCaptureLexicalThis = false;
-            if (container.kind === 177) {
+            if (container.kind === 147) {
+                var containingClassDecl = container.parent;
+                var baseTypeNode = ts.getClassExtendsHeritageClauseElement(containingClassDecl);
+                if (baseTypeNode && !classDeclarationExtendsNull(containingClassDecl)) {
+                    var superCall = getSuperCallInConstructor(container);
+                    if (!superCall || superCall.end > node.pos) {
+                        error(node, ts.Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class);
+                    }
+                }
+            }
+            if (container.kind === 179) {
                 container = ts.getThisContainer(container, false);
                 needToCaptureLexicalThis = (languageVersion < 2);
             }
             switch (container.kind) {
-                case 221:
+                case 224:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_module_or_namespace_body);
                     break;
-                case 220:
+                case 223:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
                     break;
-                case 145:
+                case 147:
                     if (isInConstructorArgumentInitializer(node, container)) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_constructor_arguments);
                     }
                     break;
-                case 142:
-                case 141:
-                    if (container.flags & 64) {
+                case 144:
+                case 143:
+                    if (container.flags & 32) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_static_property_initializer);
                     }
                     break;
-                case 137:
+                case 139:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_computed_property_name);
                     break;
             }
             if (needToCaptureLexicalThis) {
                 captureLexicalThis(node, container);
             }
-            if (ts.isClassLike(container.parent)) {
-                var symbol = getSymbolOfNode(container.parent);
-                return container.flags & 64 ? getTypeOfSymbol(symbol) : getDeclaredTypeOfSymbol(symbol).thisType;
-            }
-            if (ts.isInJavaScriptFile(node) && container.kind === 176) {
-                if (ts.getSpecialPropertyAssignmentKind(container.parent) === 3) {
-                    var className = container.parent
-                        .left
-                        .expression
-                        .expression;
-                    var classSymbol = checkExpression(className).symbol;
-                    if (classSymbol && classSymbol.members && (classSymbol.flags & 16)) {
-                        return getInferredClassType(classSymbol);
+            if (ts.isFunctionLike(container)) {
+                var type = getContextuallyTypedThisType(container);
+                if (type) {
+                    return type;
+                }
+                var signature = getSignatureFromDeclaration(container);
+                if (signature.thisType) {
+                    return signature.thisType;
+                }
+                if (container.parent && container.parent.kind === 170) {
+                    var type_1 = checkExpressionCached(container.parent);
+                    if (type_1) {
+                        return type_1;
                     }
                 }
             }
+            if (ts.isClassLike(container.parent)) {
+                var symbol = getSymbolOfNode(container.parent);
+                var type = container.flags & 32 ? getTypeOfSymbol(symbol) : getDeclaredTypeOfSymbol(symbol).thisType;
+                return getNarrowedTypeOfReference(type, node);
+            }
+            if (ts.isInJavaScriptFile(node)) {
+                var type = getTypeForThisExpressionFromJSDoc(container);
+                if (type && type !== unknownType) {
+                    return type;
+                }
+                if (container.kind === 178) {
+                    if (ts.getSpecialPropertyAssignmentKind(container.parent) === 3) {
+                        var className = container.parent
+                            .left
+                            .expression
+                            .expression;
+                        var classSymbol = checkExpression(className).symbol;
+                        if (classSymbol && classSymbol.members && (classSymbol.flags & 16)) {
+                            return getInferredClassType(classSymbol);
+                        }
+                    }
+                }
+            }
+            if (compilerOptions.noImplicitThis) {
+                error(node, ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation);
+            }
             return anyType;
         }
+        function getTypeForThisExpressionFromJSDoc(node) {
+            var typeTag = ts.getJSDocTypeTag(node);
+            if (typeTag && typeTag.typeExpression && typeTag.typeExpression.type && typeTag.typeExpression.type.kind === 268) {
+                var jsDocFunctionType = typeTag.typeExpression.type;
+                if (jsDocFunctionType.parameters.length > 0 && jsDocFunctionType.parameters[0].type.kind === 271) {
+                    return getTypeFromTypeNode(jsDocFunctionType.parameters[0].type);
+                }
+            }
+        }
         function isInConstructorArgumentInitializer(node, constructorDecl) {
             for (var n = node; n && n !== constructorDecl; n = n.parent) {
-                if (n.kind === 139) {
+                if (n.kind === 141) {
                     return true;
                 }
             }
             return false;
         }
         function checkSuperExpression(node) {
-            var isCallExpression = node.parent.kind === 171 && node.parent.expression === node;
+            var isCallExpression = node.parent.kind === 173 && node.parent.expression === node;
             var container = ts.getSuperContainer(node, true);
             var needToCaptureLexicalThis = false;
             if (!isCallExpression) {
-                while (container && container.kind === 177) {
+                while (container && container.kind === 179) {
                     container = ts.getSuperContainer(container, true);
                     needToCaptureLexicalThis = languageVersion < 2;
                 }
@@ -17170,16 +18523,16 @@ var ts;
             var nodeCheckFlag = 0;
             if (!canUseSuperExpression) {
                 var current = node;
-                while (current && current !== container && current.kind !== 137) {
+                while (current && current !== container && current.kind !== 139) {
                     current = current.parent;
                 }
-                if (current && current.kind === 137) {
+                if (current && current.kind === 139) {
                     error(node, ts.Diagnostics.super_cannot_be_referenced_in_a_computed_property_name);
                 }
                 else if (isCallExpression) {
                     error(node, ts.Diagnostics.Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors);
                 }
-                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 168)) {
+                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 170)) {
                     error(node, ts.Diagnostics.super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions);
                 }
                 else {
@@ -17187,17 +18540,25 @@ var ts;
                 }
                 return unknownType;
             }
-            if ((container.flags & 64) || isCallExpression) {
+            if ((container.flags & 32) || isCallExpression) {
                 nodeCheckFlag = 512;
             }
             else {
                 nodeCheckFlag = 256;
             }
             getNodeLinks(node).flags |= nodeCheckFlag;
+            if (container.kind === 146 && container.flags & 256) {
+                if (ts.isSuperPropertyOrElementAccess(node.parent) && isAssignmentTarget(node.parent)) {
+                    getNodeLinks(container).flags |= 4096;
+                }
+                else {
+                    getNodeLinks(container).flags |= 2048;
+                }
+            }
             if (needToCaptureLexicalThis) {
                 captureLexicalThis(node.parent, container);
             }
-            if (container.parent.kind === 168) {
+            if (container.parent.kind === 170) {
                 if (languageVersion < 2) {
                     error(node, ts.Diagnostics.super_is_only_allowed_in_members_of_object_literal_expressions_when_option_target_is_ES2015_or_higher);
                     return unknownType;
@@ -17215,7 +18576,7 @@ var ts;
                 }
                 return unknownType;
             }
-            if (container.kind === 145 && isInConstructorArgumentInitializer(node, container)) {
+            if (container.kind === 147 && isInConstructorArgumentInitializer(node, container)) {
                 error(node, ts.Diagnostics.super_cannot_be_referenced_in_constructor_arguments);
                 return unknownType;
             }
@@ -17227,30 +18588,41 @@ var ts;
                     return false;
                 }
                 if (isCallExpression) {
-                    return container.kind === 145;
+                    return container.kind === 147;
                 }
                 else {
-                    if (ts.isClassLike(container.parent) || container.parent.kind === 168) {
-                        if (container.flags & 64) {
-                            return container.kind === 144 ||
-                                container.kind === 143 ||
-                                container.kind === 146 ||
-                                container.kind === 147;
+                    if (ts.isClassLike(container.parent) || container.parent.kind === 170) {
+                        if (container.flags & 32) {
+                            return container.kind === 146 ||
+                                container.kind === 145 ||
+                                container.kind === 148 ||
+                                container.kind === 149;
                         }
                         else {
-                            return container.kind === 144 ||
+                            return container.kind === 146 ||
+                                container.kind === 145 ||
+                                container.kind === 148 ||
+                                container.kind === 149 ||
+                                container.kind === 144 ||
                                 container.kind === 143 ||
-                                container.kind === 146 ||
-                                container.kind === 147 ||
-                                container.kind === 142 ||
-                                container.kind === 141 ||
-                                container.kind === 145;
+                                container.kind === 147;
                         }
                     }
                 }
                 return false;
             }
         }
+        function getContextuallyTypedThisType(func) {
+            if ((isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) &&
+                isContextSensitive(func) &&
+                func.kind !== 179) {
+                var contextualSignature = getContextualSignature(func);
+                if (contextualSignature) {
+                    return contextualSignature.thisType;
+                }
+            }
+            return undefined;
+        }
         function getContextuallyTypedParameterType(parameter) {
             var func = parameter.parent;
             if (isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) {
@@ -17279,7 +18651,7 @@ var ts;
                 if (declaration.type) {
                     return getTypeFromTypeNode(declaration.type);
                 }
-                if (declaration.kind === 139) {
+                if (declaration.kind === 141) {
                     var type = getContextuallyTypedParameterType(declaration);
                     if (type) {
                         return type;
@@ -17288,6 +18660,18 @@ var ts;
                 if (ts.isBindingPattern(declaration.name)) {
                     return getTypeFromBindingPattern(declaration.name, true);
                 }
+                if (ts.isBindingPattern(declaration.parent)) {
+                    var parentDeclaration = declaration.parent.parent;
+                    var name_11 = declaration.propertyName || declaration.name;
+                    if (ts.isVariableLike(parentDeclaration) &&
+                        parentDeclaration.type &&
+                        !ts.isBindingPattern(name_11)) {
+                        var text = getTextOfPropertyName(name_11);
+                        if (text) {
+                            return getTypeOfPropertyOfType(getTypeFromTypeNode(parentDeclaration.type), text);
+                        }
+                    }
+                }
             }
             return undefined;
         }
@@ -17312,7 +18696,7 @@ var ts;
         }
         function isInParameterInitializerBeforeContainingFunction(node) {
             while (node.parent && !ts.isFunctionLike(node.parent)) {
-                if (node.parent.kind === 139 && node.parent.initializer === node) {
+                if (node.parent.kind === 141 && node.parent.initializer === node) {
                     return true;
                 }
                 node = node.parent;
@@ -17321,8 +18705,8 @@ var ts;
         }
         function getContextualReturnType(functionDecl) {
             if (functionDecl.type ||
-                functionDecl.kind === 145 ||
-                functionDecl.kind === 146 && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(functionDecl.symbol, 147))) {
+                functionDecl.kind === 147 ||
+                functionDecl.kind === 148 && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(functionDecl.symbol, 149))) {
                 return getReturnTypeOfSignature(getSignatureFromDeclaration(functionDecl));
             }
             var signature = getContextualSignatureForFunctionLikeDeclaration(functionDecl);
@@ -17341,7 +18725,7 @@ var ts;
             return undefined;
         }
         function getContextualTypeForSubstitutionExpression(template, substitutionExpression) {
-            if (template.parent.kind === 173) {
+            if (template.parent.kind === 175) {
                 return getContextualTypeForArgument(template.parent, substitutionExpression);
             }
             return undefined;
@@ -17407,9 +18791,6 @@ var ts;
         function contextualTypeIsTupleLikeType(type) {
             return !!(type.flags & 16384 ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type));
         }
-        function contextualTypeHasIndexSignature(type, kind) {
-            return !!(type.flags & 16384 ? ts.forEach(type.types, function (t) { return getIndexTypeOfStructuredType(t, kind); }) : getIndexTypeOfStructuredType(type, kind));
-        }
         function getContextualTypeForObjectLiteralMethod(node) {
             ts.Debug.assert(ts.isObjectLiteralMethod(node));
             if (isInsideWithStatementBody(node)) {
@@ -17452,13 +18833,13 @@ var ts;
             var kind = attribute.kind;
             var jsxElement = attribute.parent;
             var attrsType = getJsxElementAttributesType(jsxElement);
-            if (attribute.kind === 241) {
+            if (attribute.kind === 245) {
                 if (!attrsType || isTypeAny(attrsType)) {
                     return undefined;
                 }
                 return getTypeOfPropertyOfType(attrsType, attribute.name.text);
             }
-            else if (attribute.kind === 242) {
+            else if (attribute.kind === 246) {
                 return attrsType;
             }
             ts.Debug.fail("Expected JsxAttribute or JsxSpreadAttribute, got ts.SyntaxKind[" + kind + "]");
@@ -17476,40 +18857,40 @@ var ts;
             }
             var parent = node.parent;
             switch (parent.kind) {
-                case 214:
-                case 139:
-                case 142:
+                case 217:
                 case 141:
-                case 166:
+                case 144:
+                case 143:
+                case 168:
                     return getContextualTypeForInitializerExpression(node);
-                case 177:
-                case 207:
+                case 179:
+                case 210:
                     return getContextualTypeForReturnExpression(node);
-                case 187:
+                case 189:
                     return getContextualTypeForYieldOperand(parent);
-                case 171:
-                case 172:
-                    return getContextualTypeForArgument(parent, node);
+                case 173:
                 case 174:
-                case 192:
+                    return getContextualTypeForArgument(parent, node);
+                case 176:
+                case 194:
                     return getTypeFromTypeNode(parent.type);
-                case 184:
+                case 186:
                     return getContextualTypeForBinaryOperand(node);
-                case 248:
+                case 252:
                     return getContextualTypeForObjectLiteralElement(parent);
-                case 167:
+                case 169:
                     return getContextualTypeForElementExpression(node);
-                case 185:
+                case 187:
                     return getContextualTypeForConditionalOperand(node);
-                case 193:
-                    ts.Debug.assert(parent.parent.kind === 186);
+                case 196:
+                    ts.Debug.assert(parent.parent.kind === 188);
                     return getContextualTypeForSubstitutionExpression(parent.parent, node);
-                case 175:
+                case 177:
                     return getContextualType(parent);
-                case 243:
+                case 247:
                     return getContextualType(parent);
-                case 241:
-                case 242:
+                case 245:
+                case 246:
                     return getContextualTypeForJsxAttribute(parent);
             }
             return undefined;
@@ -17524,7 +18905,7 @@ var ts;
             }
         }
         function isFunctionExpressionOrArrowFunction(node) {
-            return node.kind === 176 || node.kind === 177;
+            return node.kind === 178 || node.kind === 179;
         }
         function getContextualSignatureForFunctionLikeDeclaration(node) {
             return isFunctionExpressionOrArrowFunction(node) || ts.isObjectLiteralMethod(node)
@@ -17532,7 +18913,7 @@ var ts;
                 : undefined;
         }
         function getContextualSignature(node) {
-            ts.Debug.assert(node.kind !== 144 || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 146 || ts.isObjectLiteralMethod(node));
             var type = ts.isObjectLiteralMethod(node)
                 ? getContextualTypeForObjectLiteralMethod(node)
                 : getApparentTypeOfContextualType(node);
@@ -17551,7 +18932,7 @@ var ts;
                     if (!signatureList) {
                         signatureList = [signature];
                     }
-                    else if (!compareSignaturesIdentical(signatureList[0], signature, false, true, compareTypesIdentical)) {
+                    else if (!compareSignaturesIdentical(signatureList[0], signature, false, true, true, compareTypesIdentical)) {
                         return undefined;
                     }
                     else {
@@ -17570,16 +18951,34 @@ var ts;
         function isInferentialContext(mapper) {
             return mapper && mapper.context;
         }
-        function isAssignmentTarget(node) {
+        function getAssignmentRoot(node) {
+            while (node.parent.kind === 177) {
+                node = node.parent;
+            }
+            while (true) {
+                if (node.parent.kind === 252) {
+                    node = node.parent.parent;
+                }
+                else if (node.parent.kind === 169) {
+                    node = node.parent;
+                }
+                else {
+                    break;
+                }
+            }
             var parent = node.parent;
-            if (parent.kind === 184 && parent.operatorToken.kind === 56 && parent.left === node) {
-                return true;
-            }
-            if (parent.kind === 248) {
-                return isAssignmentTarget(parent.parent);
-            }
-            if (parent.kind === 167) {
-                return isAssignmentTarget(parent);
+            return parent.kind === 186 &&
+                parent.operatorToken.kind === 56 &&
+                parent.left === node ? parent : undefined;
+        }
+        function isAssignmentTarget(node) {
+            return !!getAssignmentRoot(node);
+        }
+        function isCompoundAssignmentTarget(node) {
+            var parent = node.parent;
+            if (parent.kind === 186 && parent.left === node) {
+                var operator = parent.operatorToken.kind;
+                return operator >= 56 && operator <= 68;
             }
             return false;
         }
@@ -17588,8 +18987,8 @@ var ts;
             return checkIteratedTypeOrElementType(arrayOrIterableType, node.expression, false);
         }
         function hasDefaultValue(node) {
-            return (node.kind === 166 && !!node.initializer) ||
-                (node.kind === 184 && node.operatorToken.kind === 56);
+            return (node.kind === 168 && !!node.initializer) ||
+                (node.kind === 186 && node.operatorToken.kind === 56);
         }
         function checkArrayLiteral(node, contextualMapper) {
             var elements = node.elements;
@@ -17598,7 +18997,7 @@ var ts;
             var inDestructuringPattern = isAssignmentTarget(node);
             for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
                 var e = elements_1[_i];
-                if (inDestructuringPattern && e.kind === 188) {
+                if (inDestructuringPattern && e.kind === 190) {
                     var restArrayType = checkExpression(e.expression, contextualMapper);
                     var restElementType = getIndexTypeOfType(restArrayType, 1) ||
                         (languageVersion >= 2 ? getElementTypeOfIterable(restArrayType, undefined) : undefined);
@@ -17610,7 +19009,7 @@ var ts;
                     var type = checkExpression(e, contextualMapper);
                     elementTypes.push(type);
                 }
-                hasSpreadElement = hasSpreadElement || e.kind === 188;
+                hasSpreadElement = hasSpreadElement || e.kind === 190;
             }
             if (!hasSpreadElement) {
                 if (inDestructuringPattern && elementTypes.length) {
@@ -17621,7 +19020,7 @@ var ts;
                 var contextualType = getApparentTypeOfContextualType(node);
                 if (contextualType && contextualTypeIsTupleLikeType(contextualType)) {
                     var pattern = contextualType.pattern;
-                    if (pattern && (pattern.kind === 165 || pattern.kind === 167)) {
+                    if (pattern && (pattern.kind === 167 || pattern.kind === 169)) {
                         var patternElements = pattern.elements;
                         for (var i = elementTypes.length; i < patternElements.length; i++) {
                             var patternElement = patternElements[i];
@@ -17629,7 +19028,7 @@ var ts;
                                 elementTypes.push(contextualType.elementTypes[i]);
                             }
                             else {
-                                if (patternElement.kind !== 190) {
+                                if (patternElement.kind !== 192) {
                                     error(patternElement, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
                                 }
                                 elementTypes.push(unknownType);
@@ -17641,16 +19040,16 @@ var ts;
                     }
                 }
             }
-            return createArrayType(elementTypes.length ? getUnionType(elementTypes) : undefinedType);
+            return createArrayType(elementTypes.length ? getUnionType(elementTypes) : emptyArrayElementType);
         }
         function isNumericName(name) {
-            return name.kind === 137 ? isNumericComputedName(name) : isNumericLiteralName(name.text);
+            return name.kind === 139 ? isNumericComputedName(name) : isNumericLiteralName(name.text);
         }
         function isNumericComputedName(name) {
             return isTypeAnyOrAllConstituentTypesHaveKind(checkComputedPropertyName(name), 132);
         }
         function isTypeAnyOrAllConstituentTypesHaveKind(type, kind) {
-            return isTypeAny(type) || allConstituentTypesHaveKind(type, kind);
+            return isTypeAny(type) || isTypeOfKind(type, kind);
         }
         function isNumericLiteralName(name) {
             return (+name).toString() === name;
@@ -17668,6 +19067,16 @@ var ts;
             }
             return links.resolvedType;
         }
+        function getObjectLiteralIndexInfo(node, properties, kind) {
+            var propTypes = [];
+            for (var i = 0; i < properties.length; i++) {
+                if (kind === 0 || isNumericName(node.properties[i].name)) {
+                    propTypes.push(getTypeOfSymbol(properties[i]));
+                }
+            }
+            var unionType = propTypes.length ? getUnionType(propTypes) : undefinedType;
+            return createIndexInfo(unionType, false);
+        }
         function checkObjectLiteral(node, contextualMapper) {
             var inDestructuringPattern = isAssignmentTarget(node);
             checkGrammarObjectLiteralExpression(node, inDestructuringPattern);
@@ -17675,31 +19084,33 @@ var ts;
             var propertiesArray = [];
             var contextualType = getApparentTypeOfContextualType(node);
             var contextualTypeHasPattern = contextualType && contextualType.pattern &&
-                (contextualType.pattern.kind === 164 || contextualType.pattern.kind === 168);
+                (contextualType.pattern.kind === 166 || contextualType.pattern.kind === 170);
             var typeFlags = 0;
             var patternWithComputedProperties = false;
+            var hasComputedStringProperty = false;
+            var hasComputedNumberProperty = false;
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var memberDecl = _a[_i];
                 var member = memberDecl.symbol;
-                if (memberDecl.kind === 248 ||
-                    memberDecl.kind === 249 ||
+                if (memberDecl.kind === 252 ||
+                    memberDecl.kind === 253 ||
                     ts.isObjectLiteralMethod(memberDecl)) {
                     var type = void 0;
-                    if (memberDecl.kind === 248) {
+                    if (memberDecl.kind === 252) {
                         type = checkPropertyAssignment(memberDecl, contextualMapper);
                     }
-                    else if (memberDecl.kind === 144) {
+                    else if (memberDecl.kind === 146) {
                         type = checkObjectLiteralMethod(memberDecl, contextualMapper);
                     }
                     else {
-                        ts.Debug.assert(memberDecl.kind === 249);
+                        ts.Debug.assert(memberDecl.kind === 253);
                         type = checkExpression(memberDecl.name, contextualMapper);
                     }
                     typeFlags |= type.flags;
                     var prop = createSymbol(4 | 67108864 | member.flags, member.name);
                     if (inDestructuringPattern) {
-                        var isOptional = (memberDecl.kind === 248 && hasDefaultValue(memberDecl.initializer)) ||
-                            (memberDecl.kind === 249 && memberDecl.objectAssignmentInitializer);
+                        var isOptional = (memberDecl.kind === 252 && hasDefaultValue(memberDecl.initializer)) ||
+                            (memberDecl.kind === 253 && memberDecl.objectAssignmentInitializer);
                         if (isOptional) {
                             prop.flags |= 536870912;
                         }
@@ -17726,10 +19137,18 @@ var ts;
                     member = prop;
                 }
                 else {
-                    ts.Debug.assert(memberDecl.kind === 146 || memberDecl.kind === 147);
+                    ts.Debug.assert(memberDecl.kind === 148 || memberDecl.kind === 149);
                     checkAccessorDeclaration(memberDecl);
                 }
-                if (!ts.hasDynamicName(memberDecl)) {
+                if (ts.hasDynamicName(memberDecl)) {
+                    if (isNumericName(memberDecl.name)) {
+                        hasComputedNumberProperty = true;
+                    }
+                    else {
+                        hasComputedStringProperty = true;
+                    }
+                }
+                else {
                     propertiesTable[member.name] = member;
                 }
                 propertiesArray.push(member);
@@ -17746,33 +19165,15 @@ var ts;
                     }
                 }
             }
-            var stringIndexType = getIndexType(0);
-            var numberIndexType = getIndexType(1);
-            var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexType, numberIndexType);
+            var stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 0) : undefined;
+            var numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 1) : undefined;
+            var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
             var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 1048576;
             result.flags |= 524288 | 4194304 | freshObjectLiteralFlag | (typeFlags & 14680064) | (patternWithComputedProperties ? 67108864 : 0);
             if (inDestructuringPattern) {
                 result.pattern = node;
             }
             return result;
-            function getIndexType(kind) {
-                if (contextualType && contextualTypeHasIndexSignature(contextualType, kind)) {
-                    var propTypes = [];
-                    for (var i = 0; i < propertiesArray.length; i++) {
-                        var propertyDecl = node.properties[i];
-                        if (kind === 0 || isNumericName(propertyDecl.name)) {
-                            var type = getTypeOfSymbol(propertiesArray[i]);
-                            if (!ts.contains(propTypes, type)) {
-                                propTypes.push(type);
-                            }
-                        }
-                    }
-                    var result_1 = propTypes.length ? getUnionType(propTypes) : undefinedType;
-                    typeFlags |= result_1.flags;
-                    return result_1;
-                }
-                return undefined;
-            }
         }
         function checkJsxSelfClosingElement(node) {
             checkJsxOpeningLikeElement(node);
@@ -17780,17 +19181,22 @@ var ts;
         }
         function checkJsxElement(node) {
             checkJsxOpeningLikeElement(node.openingElement);
-            getJsxElementTagSymbol(node.closingElement);
+            if (isJsxIntrinsicIdentifier(node.closingElement.tagName)) {
+                getIntrinsicTagSymbol(node.closingElement);
+            }
+            else {
+                checkExpression(node.closingElement.tagName);
+            }
             for (var _i = 0, _a = node.children; _i < _a.length; _i++) {
                 var child = _a[_i];
                 switch (child.kind) {
-                    case 243:
+                    case 247:
                         checkJsxExpression(child);
                         break;
-                    case 236:
+                    case 240:
                         checkJsxElement(child);
                         break;
-                    case 237:
+                    case 241:
                         checkJsxSelfClosingElement(child);
                         break;
                 }
@@ -17801,7 +19207,7 @@ var ts;
             return name.indexOf("-") < 0;
         }
         function isJsxIntrinsicIdentifier(tagName) {
-            if (tagName.kind === 136) {
+            if (tagName.kind === 138) {
                 return false;
             }
             else {
@@ -17864,68 +19270,35 @@ var ts;
             }
             return jsxTypes[name];
         }
-        function getJsxElementTagSymbol(node) {
+        function getIntrinsicTagSymbol(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedSymbol) {
-                if (isJsxIntrinsicIdentifier(node.tagName)) {
-                    links.resolvedSymbol = lookupIntrinsicTag(node);
-                }
-                else {
-                    links.resolvedSymbol = lookupClassTag(node);
-                }
-            }
-            return links.resolvedSymbol;
-            function lookupIntrinsicTag(node) {
                 var intrinsicElementsType = getJsxType(JsxNames.IntrinsicElements);
                 if (intrinsicElementsType !== unknownType) {
                     var intrinsicProp = getPropertyOfType(intrinsicElementsType, node.tagName.text);
                     if (intrinsicProp) {
                         links.jsxFlags |= 1;
-                        return intrinsicProp;
+                        return links.resolvedSymbol = intrinsicProp;
                     }
                     var indexSignatureType = getIndexTypeOfType(intrinsicElementsType, 0);
                     if (indexSignatureType) {
                         links.jsxFlags |= 2;
-                        return intrinsicElementsType.symbol;
+                        return links.resolvedSymbol = intrinsicElementsType.symbol;
                     }
                     error(node, ts.Diagnostics.Property_0_does_not_exist_on_type_1, node.tagName.text, "JSX." + JsxNames.IntrinsicElements);
-                    return unknownSymbol;
+                    return links.resolvedSymbol = unknownSymbol;
                 }
                 else {
                     if (compilerOptions.noImplicitAny) {
                         error(node, ts.Diagnostics.JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists, JsxNames.IntrinsicElements);
                     }
-                    return unknownSymbol;
-                }
-            }
-            function lookupClassTag(node) {
-                var valueSymbol = resolveJsxTagName(node);
-                if (valueSymbol && valueSymbol !== unknownSymbol) {
-                    links.jsxFlags |= 4;
-                    if (valueSymbol.flags & 8388608) {
-                        markAliasSymbolAsReferenced(valueSymbol);
-                    }
-                }
-                return valueSymbol || unknownSymbol;
-            }
-            function resolveJsxTagName(node) {
-                if (node.tagName.kind === 69) {
-                    var tag = node.tagName;
-                    var sym = getResolvedSymbol(tag);
-                    return sym.exportSymbol || sym;
-                }
-                else {
-                    return checkQualifiedName(node.tagName).symbol;
+                    return links.resolvedSymbol = unknownSymbol;
                 }
             }
+            return links.resolvedSymbol;
         }
         function getJsxElementInstanceType(node) {
-            ts.Debug.assert(!!(getNodeLinks(node).jsxFlags & 4), "Should not call getJsxElementInstanceType on non-class Element");
-            var classSymbol = getJsxElementTagSymbol(node);
-            if (classSymbol === unknownSymbol) {
-                return anyType;
-            }
-            var valueType = getTypeOfSymbol(classSymbol);
+            var valueType = checkExpression(node.tagName);
             if (isTypeAny(valueType)) {
                 return anyType;
             }
@@ -17963,22 +19336,32 @@ var ts;
         function getJsxElementAttributesType(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedJsxType) {
-                var sym = getJsxElementTagSymbol(node);
-                if (links.jsxFlags & 4) {
+                if (isJsxIntrinsicIdentifier(node.tagName)) {
+                    var symbol = getIntrinsicTagSymbol(node);
+                    if (links.jsxFlags & 1) {
+                        return links.resolvedJsxType = getTypeOfSymbol(symbol);
+                    }
+                    else if (links.jsxFlags & 2) {
+                        return links.resolvedJsxType = getIndexInfoOfSymbol(symbol, 0).type;
+                    }
+                }
+                else {
                     var elemInstanceType = getJsxElementInstanceType(node);
                     var elemClassType = getJsxGlobalElementClassType();
                     if (!elemClassType || !isTypeAssignableTo(elemInstanceType, elemClassType)) {
-                        var elemType = getTypeOfSymbol(sym);
-                        var callSignatures = elemType && getSignaturesOfType(elemType, 0);
-                        var callSignature = callSignatures && callSignatures.length > 0 && callSignatures[0];
-                        var callReturnType = callSignature && getReturnTypeOfSignature(callSignature);
-                        var paramType = callReturnType && (callSignature.parameters.length === 0 ? emptyObjectType : getTypeOfSymbol(callSignature.parameters[0]));
-                        if (callReturnType && isTypeAssignableTo(callReturnType, jsxElementType)) {
-                            var intrinsicAttributes = getJsxType(JsxNames.IntrinsicAttributes);
-                            if (intrinsicAttributes !== unknownType) {
-                                paramType = intersectTypes(intrinsicAttributes, paramType);
+                        if (jsxElementType) {
+                            var elemType = checkExpression(node.tagName);
+                            var callSignatures = elemType && getSignaturesOfType(elemType, 0);
+                            var callSignature = callSignatures && callSignatures.length > 0 && callSignatures[0];
+                            var callReturnType = callSignature && getReturnTypeOfSignature(callSignature);
+                            var paramType = callReturnType && (callSignature.parameters.length === 0 ? emptyObjectType : getTypeOfSymbol(callSignature.parameters[0]));
+                            if (callReturnType && isTypeAssignableTo(callReturnType, jsxElementType)) {
+                                var intrinsicAttributes = getJsxType(JsxNames.IntrinsicAttributes);
+                                if (intrinsicAttributes !== unknownType) {
+                                    paramType = intersectTypes(intrinsicAttributes, paramType);
+                                }
+                                return links.resolvedJsxType = paramType;
                             }
-                            return links.resolvedJsxType = paramType;
                         }
                     }
                     if (elemClassType) {
@@ -18028,15 +19411,7 @@ var ts;
                         }
                     }
                 }
-                else if (links.jsxFlags & 1) {
-                    return links.resolvedJsxType = getTypeOfSymbol(sym);
-                }
-                else if (links.jsxFlags & 2) {
-                    return links.resolvedJsxType = getIndexTypeOfSymbol(sym, 0);
-                }
-                else {
-                    return links.resolvedJsxType = anyType;
-                }
+                return links.resolvedJsxType = unknownType;
             }
             return links.resolvedJsxType;
         }
@@ -18078,11 +19453,11 @@ var ts;
             var nameTable = {};
             var sawSpreadedAny = false;
             for (var i = node.attributes.length - 1; i >= 0; i--) {
-                if (node.attributes[i].kind === 241) {
+                if (node.attributes[i].kind === 245) {
                     checkJsxAttribute((node.attributes[i]), targetAttributesType, nameTable);
                 }
                 else {
-                    ts.Debug.assert(node.attributes[i].kind === 242);
+                    ts.Debug.assert(node.attributes[i].kind === 246);
                     var spreadType = checkJsxSpreadAttribute((node.attributes[i]), targetAttributesType, nameTable);
                     if (isTypeAny(spreadType)) {
                         sawSpreadedAny = true;
@@ -18108,19 +19483,19 @@ var ts;
             }
         }
         function getDeclarationKindFromSymbol(s) {
-            return s.valueDeclaration ? s.valueDeclaration.kind : 142;
+            return s.valueDeclaration ? s.valueDeclaration.kind : 144;
         }
         function getDeclarationFlagsFromSymbol(s) {
-            return s.valueDeclaration ? ts.getCombinedNodeFlags(s.valueDeclaration) : s.flags & 134217728 ? 8 | 64 : 0;
+            return s.valueDeclaration ? ts.getCombinedNodeFlags(s.valueDeclaration) : s.flags & 134217728 ? 4 | 32 : 0;
         }
         function checkClassPropertyAccess(node, left, type, prop) {
             var flags = getDeclarationFlagsFromSymbol(prop);
-            var declaringClass = getDeclaredTypeOfSymbol(prop.parent);
+            var declaringClass = getDeclaredTypeOfSymbol(getParentOfSymbol(prop));
+            var errorNode = node.kind === 171 || node.kind === 217 ?
+                node.name :
+                node.right;
             if (left.kind === 95) {
-                var errorNode = node.kind === 169 ?
-                    node.name :
-                    node.right;
-                if (languageVersion < 2 && getDeclarationKindFromSymbol(prop) !== 144) {
+                if (languageVersion < 2 && getDeclarationKindFromSymbol(prop) !== 146) {
                     error(errorNode, ts.Diagnostics.Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword);
                     return false;
                 }
@@ -18129,14 +19504,13 @@ var ts;
                     return false;
                 }
             }
-            if (!(flags & (16 | 32))) {
+            if (!(flags & (8 | 16))) {
                 return true;
             }
-            var enclosingClassDeclaration = ts.getContainingClass(node);
-            var enclosingClass = enclosingClassDeclaration ? getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingClassDeclaration)) : undefined;
-            if (flags & 16) {
-                if (declaringClass !== enclosingClass) {
-                    error(node, ts.Diagnostics.Property_0_is_private_and_only_accessible_within_class_1, symbolToString(prop), typeToString(declaringClass));
+            if (flags & 8) {
+                var declaringClassDeclaration = getClassLikeDeclarationOfSymbol(getParentOfSymbol(prop));
+                if (!isNodeWithinClass(node, declaringClassDeclaration)) {
+                    error(errorNode, ts.Diagnostics.Property_0_is_private_and_only_accessible_within_class_1, symbolToString(prop), typeToString(declaringClass));
                     return false;
                 }
                 return true;
@@ -18144,22 +19518,34 @@ var ts;
             if (left.kind === 95) {
                 return true;
             }
-            if (!enclosingClass || !hasBaseType(enclosingClass, declaringClass)) {
-                error(node, ts.Diagnostics.Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses, symbolToString(prop), typeToString(declaringClass));
+            var enclosingClass = forEachEnclosingClass(node, function (enclosingDeclaration) {
+                var enclosingClass = getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingDeclaration));
+                return hasBaseType(enclosingClass, declaringClass) ? enclosingClass : undefined;
+            });
+            if (!enclosingClass) {
+                error(errorNode, ts.Diagnostics.Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses, symbolToString(prop), typeToString(declaringClass));
                 return false;
             }
-            if (flags & 64) {
+            if (flags & 32) {
                 return true;
             }
             if (type.flags & 33554432) {
                 type = getConstraintOfTypeParameter(type);
             }
             if (!(getTargetType(type).flags & (1024 | 2048) && hasBaseType(type, enclosingClass))) {
-                error(node, ts.Diagnostics.Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1, symbolToString(prop), typeToString(enclosingClass));
+                error(errorNode, ts.Diagnostics.Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1, symbolToString(prop), typeToString(enclosingClass));
                 return false;
             }
             return true;
         }
+        function checkNonNullExpression(node) {
+            var type = checkExpression(node);
+            if (strictNullChecks && getNullableKind(type)) {
+                error(node, ts.Diagnostics.Object_is_possibly_null_or_undefined);
+                return getNonNullableType(type);
+            }
+            return type;
+        }
         function checkPropertyAccessExpression(node) {
             return checkPropertyAccessExpressionOrQualifiedName(node, node.expression, node.name);
         }
@@ -18167,7 +19553,7 @@ var ts;
             return checkPropertyAccessExpressionOrQualifiedName(node, node.left, node.right);
         }
         function checkPropertyAccessExpressionOrQualifiedName(node, left, right) {
-            var type = checkExpression(left);
+            var type = checkNonNullExpression(left);
             if (isTypeAny(type)) {
                 return type;
             }
@@ -18186,10 +19572,12 @@ var ts;
             if (prop.parent && prop.parent.flags & 32) {
                 checkClassPropertyAccess(node, left, apparentType, prop);
             }
-            return getTypeOfSymbol(prop);
+            var propType = getTypeOfSymbol(prop);
+            return node.kind === 171 && prop.flags & 4 ?
+                getNarrowedTypeOfReference(propType, node) : propType;
         }
         function isValidPropertyAccess(node, propertyName) {
-            var left = node.kind === 169
+            var left = node.kind === 171
                 ? node.expression
                 : node.left;
             var type = checkExpression(left);
@@ -18203,7 +19591,7 @@ var ts;
         }
         function getForInVariableSymbol(node) {
             var initializer = node.initializer;
-            if (initializer.kind === 215) {
+            if (initializer.kind === 218) {
                 var variable = initializer.declarations[0];
                 if (variable && !ts.isBindingPattern(variable.name)) {
                     return getSymbolOfNode(variable);
@@ -18225,7 +19613,7 @@ var ts;
                     var child = expr;
                     var node = expr.parent;
                     while (node) {
-                        if (node.kind === 203 &&
+                        if (node.kind === 206 &&
                             child === node.statement &&
                             getForInVariableSymbol(node) === symbol &&
                             hasNumericPropertyNames(checkExpression(node.expression))) {
@@ -18241,7 +19629,7 @@ var ts;
         function checkIndexedAccess(node) {
             if (!node.argumentExpression) {
                 var sourceFile = ts.getSourceFileOfNode(node);
-                if (node.parent.kind === 172 && node.parent.expression === node) {
+                if (node.parent.kind === 174 && node.parent.expression === node) {
                     var start = ts.skipTrivia(sourceFile.text, node.expression.end);
                     var end = node.end;
                     grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead);
@@ -18252,7 +19640,7 @@ var ts;
                     grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.Expression_expected);
                 }
             }
-            var objectType = getApparentType(checkExpression(node.expression));
+            var objectType = getApparentType(checkNonNullExpression(node.expression));
             var indexType = node.argumentExpression ? checkExpression(node.argumentExpression) : unknownType;
             if (objectType === unknownType) {
                 return unknownType;
@@ -18264,29 +19652,31 @@ var ts;
                 return unknownType;
             }
             if (node.argumentExpression) {
-                var name_11 = getPropertyNameForIndexedAccess(node.argumentExpression, indexType);
-                if (name_11 !== undefined) {
-                    var prop = getPropertyOfType(objectType, name_11);
+                var name_12 = getPropertyNameForIndexedAccess(node.argumentExpression, indexType);
+                if (name_12 !== undefined) {
+                    var prop = getPropertyOfType(objectType, name_12);
                     if (prop) {
                         getNodeLinks(node).resolvedSymbol = prop;
                         return getTypeOfSymbol(prop);
                     }
                     else if (isConstEnum) {
-                        error(node.argumentExpression, ts.Diagnostics.Property_0_does_not_exist_on_const_enum_1, name_11, symbolToString(objectType.symbol));
+                        error(node.argumentExpression, ts.Diagnostics.Property_0_does_not_exist_on_const_enum_1, name_12, symbolToString(objectType.symbol));
                         return unknownType;
                     }
                 }
             }
             if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, 258 | 132 | 16777216)) {
                 if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, 132) || isForInVariableForNumericPropertyNames(node.argumentExpression)) {
-                    var numberIndexType = getIndexTypeOfType(objectType, 1);
-                    if (numberIndexType) {
-                        return numberIndexType;
+                    var numberIndexInfo = getIndexInfoOfType(objectType, 1);
+                    if (numberIndexInfo) {
+                        getNodeLinks(node).resolvedIndexInfo = numberIndexInfo;
+                        return numberIndexInfo.type;
                     }
                 }
-                var stringIndexType = getIndexTypeOfType(objectType, 0);
-                if (stringIndexType) {
-                    return stringIndexType;
+                var stringIndexInfo = getIndexInfoOfType(objectType, 0);
+                if (stringIndexInfo) {
+                    getNodeLinks(node).resolvedIndexInfo = stringIndexInfo;
+                    return stringIndexInfo.type;
                 }
                 if (compilerOptions.noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors && !isTypeAny(objectType)) {
                     error(node, getIndexTypeOfType(objectType, 1) ?
@@ -18302,7 +19692,7 @@ var ts;
             if (indexArgumentExpression.kind === 9 || indexArgumentExpression.kind === 8) {
                 return indexArgumentExpression.text;
             }
-            if (indexArgumentExpression.kind === 170 || indexArgumentExpression.kind === 169) {
+            if (indexArgumentExpression.kind === 172 || indexArgumentExpression.kind === 171) {
                 var value = getConstantValue(indexArgumentExpression);
                 if (value !== undefined) {
                     return value.toString();
@@ -18345,10 +19735,10 @@ var ts;
             return true;
         }
         function resolveUntypedCall(node) {
-            if (node.kind === 173) {
+            if (node.kind === 175) {
                 checkExpression(node.template);
             }
-            else if (node.kind !== 140) {
+            else if (node.kind !== 142) {
                 ts.forEach(node.arguments, function (argument) {
                     checkExpression(argument);
                 });
@@ -18370,19 +19760,19 @@ var ts;
             for (var _i = 0, signatures_2 = signatures; _i < signatures_2.length; _i++) {
                 var signature = signatures_2[_i];
                 var symbol = signature.declaration && getSymbolOfNode(signature.declaration);
-                var parent_5 = signature.declaration && signature.declaration.parent;
+                var parent_7 = signature.declaration && signature.declaration.parent;
                 if (!lastSymbol || symbol === lastSymbol) {
-                    if (lastParent && parent_5 === lastParent) {
+                    if (lastParent && parent_7 === lastParent) {
                         index++;
                     }
                     else {
-                        lastParent = parent_5;
+                        lastParent = parent_7;
                         index = cutoffIndex;
                     }
                 }
                 else {
                     index = cutoffIndex = result.length;
-                    lastParent = parent_5;
+                    lastParent = parent_7;
                 }
                 lastSymbol = symbol;
                 if (signature.hasStringLiterals) {
@@ -18399,7 +19789,7 @@ var ts;
         function getSpreadArgumentIndex(args) {
             for (var i = 0; i < args.length; i++) {
                 var arg = args[i];
-                if (arg && arg.kind === 188) {
+                if (arg && arg.kind === 190) {
                     return i;
                 }
             }
@@ -18411,11 +19801,11 @@ var ts;
             var callIsIncomplete;
             var isDecorator;
             var spreadArgIndex = -1;
-            if (node.kind === 173) {
+            if (node.kind === 175) {
                 var tagExpression = node;
                 adjustedArgCount = args.length;
                 typeArguments = undefined;
-                if (tagExpression.template.kind === 186) {
+                if (tagExpression.template.kind === 188) {
                     var templateExpression = tagExpression.template;
                     var lastSpan = ts.lastOrUndefined(templateExpression.templateSpans);
                     ts.Debug.assert(lastSpan !== undefined);
@@ -18427,7 +19817,7 @@ var ts;
                     callIsIncomplete = !!templateLiteral.isUnterminated;
                 }
             }
-            else if (node.kind === 140) {
+            else if (node.kind === 142) {
                 isDecorator = true;
                 typeArguments = undefined;
                 adjustedArgCount = getEffectiveArgumentCount(node, undefined, signature);
@@ -18435,7 +19825,7 @@ var ts;
             else {
                 var callExpression = node;
                 if (!callExpression.arguments) {
-                    ts.Debug.assert(callExpression.kind === 172);
+                    ts.Debug.assert(callExpression.kind === 174);
                     return signature.minArgumentCount === 0;
                 }
                 adjustedArgCount = callExpression.arguments.hasTrailingComma ? args.length + 1 : args.length;
@@ -18461,7 +19851,7 @@ var ts;
             if (type.flags & 80896) {
                 var resolved = resolveStructuredTypeMembers(type);
                 if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 &&
-                    resolved.properties.length === 0 && !resolved.stringIndexType && !resolved.numberIndexType) {
+                    resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
                     return resolved.callSignatures[0];
                 }
             }
@@ -18485,10 +19875,15 @@ var ts;
             if (context.failedTypeParameterIndex !== undefined && !context.inferences[context.failedTypeParameterIndex].isFixed) {
                 context.failedTypeParameterIndex = undefined;
             }
+            if (signature.thisType) {
+                var thisArgumentNode = getThisArgumentOfCall(node);
+                var thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
+                inferTypes(context, thisArgumentType, signature.thisType);
+            }
             var argCount = getEffectiveArgumentCount(node, args, signature);
             for (var i = 0; i < argCount; i++) {
                 var arg = getEffectiveArgument(node, args, i);
-                if (arg === undefined || arg.kind !== 190) {
+                if (arg === undefined || arg.kind !== 192) {
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = getEffectiveArgumentType(node, i, arg);
                     if (argType === undefined) {
@@ -18534,10 +19929,20 @@ var ts;
             return typeArgumentsAreAssignable;
         }
         function checkApplicableSignature(node, args, signature, relation, excludeArgument, reportErrors) {
+            if (signature.thisType && signature.thisType !== voidType && node.kind !== 174) {
+                var thisArgumentNode = getThisArgumentOfCall(node);
+                var thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
+                var errorNode = reportErrors ? (thisArgumentNode || node) : undefined;
+                var headMessage_1 = ts.Diagnostics.The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1;
+                if (!checkTypeRelatedTo(thisArgumentType, signature.thisType, relation, errorNode, headMessage_1)) {
+                    return false;
+                }
+            }
+            var headMessage = ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1;
             var argCount = getEffectiveArgumentCount(node, args, signature);
             for (var i = 0; i < argCount; i++) {
                 var arg = getEffectiveArgument(node, args, i);
-                if (arg === undefined || arg.kind !== 190) {
+                if (arg === undefined || arg.kind !== 192) {
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = getEffectiveArgumentType(node, i, arg);
                     if (argType === undefined) {
@@ -18546,7 +19951,6 @@ var ts;
                             : checkExpressionWithContextualType(arg, paramType, excludeArgument && excludeArgument[i] ? identityMapper : undefined);
                     }
                     var errorNode = reportErrors ? getEffectiveArgumentErrorNode(node, i, arg) : undefined;
-                    var headMessage = ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1;
                     if (!checkTypeRelatedTo(argType, paramType, relation, errorNode, headMessage)) {
                         return false;
                     }
@@ -18554,18 +19958,29 @@ var ts;
             }
             return true;
         }
+        function getThisArgumentOfCall(node) {
+            if (node.kind === 173) {
+                var callee = node.expression;
+                if (callee.kind === 171) {
+                    return callee.expression;
+                }
+                else if (callee.kind === 172) {
+                    return callee.expression;
+                }
+            }
+        }
         function getEffectiveCallArguments(node) {
             var args;
-            if (node.kind === 173) {
+            if (node.kind === 175) {
                 var template = node.template;
                 args = [undefined];
-                if (template.kind === 186) {
+                if (template.kind === 188) {
                     ts.forEach(template.templateSpans, function (span) {
                         args.push(span.expression);
                     });
                 }
             }
-            else if (node.kind === 140) {
+            else if (node.kind === 142) {
                 return undefined;
             }
             else {
@@ -18574,21 +19989,21 @@ var ts;
             return args;
         }
         function getEffectiveArgumentCount(node, args, signature) {
-            if (node.kind === 140) {
+            if (node.kind === 142) {
                 switch (node.parent.kind) {
-                    case 217:
-                    case 189:
+                    case 220:
+                    case 191:
                         return 1;
-                    case 142:
-                        return 2;
                     case 144:
+                        return 2;
                     case 146:
-                    case 147:
+                    case 148:
+                    case 149:
                         if (languageVersion === 0) {
                             return 2;
                         }
                         return signature.parameters.length >= 3 ? 3 : 2;
-                    case 139:
+                    case 141:
                         return 3;
                 }
             }
@@ -18597,50 +20012,50 @@ var ts;
             }
         }
         function getEffectiveDecoratorFirstArgumentType(node) {
-            if (node.kind === 217) {
+            if (node.kind === 220) {
                 var classSymbol = getSymbolOfNode(node);
                 return getTypeOfSymbol(classSymbol);
             }
-            if (node.kind === 139) {
+            if (node.kind === 141) {
                 node = node.parent;
-                if (node.kind === 145) {
+                if (node.kind === 147) {
                     var classSymbol = getSymbolOfNode(node);
                     return getTypeOfSymbol(classSymbol);
                 }
             }
-            if (node.kind === 142 ||
-                node.kind === 144 ||
+            if (node.kind === 144 ||
                 node.kind === 146 ||
-                node.kind === 147) {
+                node.kind === 148 ||
+                node.kind === 149) {
                 return getParentTypeOfClassElement(node);
             }
             ts.Debug.fail("Unsupported decorator target.");
             return unknownType;
         }
         function getEffectiveDecoratorSecondArgumentType(node) {
-            if (node.kind === 217) {
+            if (node.kind === 220) {
                 ts.Debug.fail("Class decorators should not have a second synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 139) {
+            if (node.kind === 141) {
                 node = node.parent;
-                if (node.kind === 145) {
+                if (node.kind === 147) {
                     return anyType;
                 }
             }
-            if (node.kind === 142 ||
-                node.kind === 144 ||
+            if (node.kind === 144 ||
                 node.kind === 146 ||
-                node.kind === 147) {
+                node.kind === 148 ||
+                node.kind === 149) {
                 var element = node;
                 switch (element.name.kind) {
                     case 69:
                     case 8:
                     case 9:
                         return getStringLiteralTypeForText(element.name.text);
-                    case 137:
+                    case 139:
                         var nameType = checkComputedPropertyName(element.name);
-                        if (allConstituentTypesHaveKind(nameType, 16777216)) {
+                        if (isTypeOfKind(nameType, 16777216)) {
                             return nameType;
                         }
                         else {
@@ -18655,20 +20070,20 @@ var ts;
             return unknownType;
         }
         function getEffectiveDecoratorThirdArgumentType(node) {
-            if (node.kind === 217) {
+            if (node.kind === 220) {
                 ts.Debug.fail("Class decorators should not have a third synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 139) {
+            if (node.kind === 141) {
                 return numberType;
             }
-            if (node.kind === 142) {
+            if (node.kind === 144) {
                 ts.Debug.fail("Property decorators should not have a third synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 144 ||
-                node.kind === 146 ||
-                node.kind === 147) {
+            if (node.kind === 146 ||
+                node.kind === 148 ||
+                node.kind === 149) {
                 var propertyType = getTypeOfNode(node);
                 return createTypedPropertyDescriptorType(propertyType);
             }
@@ -18689,26 +20104,26 @@ var ts;
             return unknownType;
         }
         function getEffectiveArgumentType(node, argIndex, arg) {
-            if (node.kind === 140) {
+            if (node.kind === 142) {
                 return getEffectiveDecoratorArgumentType(node, argIndex);
             }
-            else if (argIndex === 0 && node.kind === 173) {
-                return globalTemplateStringsArrayType;
+            else if (argIndex === 0 && node.kind === 175) {
+                return getGlobalTemplateStringsArrayType();
             }
             return undefined;
         }
         function getEffectiveArgument(node, args, argIndex) {
-            if (node.kind === 140 ||
-                (argIndex === 0 && node.kind === 173)) {
+            if (node.kind === 142 ||
+                (argIndex === 0 && node.kind === 175)) {
                 return undefined;
             }
             return args[argIndex];
         }
         function getEffectiveArgumentErrorNode(node, argIndex, arg) {
-            if (node.kind === 140) {
+            if (node.kind === 142) {
                 return node.expression;
             }
-            else if (argIndex === 0 && node.kind === 173) {
+            else if (argIndex === 0 && node.kind === 175) {
                 return node.template;
             }
             else {
@@ -18716,8 +20131,8 @@ var ts;
             }
         }
         function resolveCall(node, signatures, candidatesOutArray, headMessage) {
-            var isTaggedTemplate = node.kind === 173;
-            var isDecorator = node.kind === 140;
+            var isTaggedTemplate = node.kind === 175;
+            var isDecorator = node.kind === 142;
             var typeArguments;
             if (!isTaggedTemplate && !isDecorator) {
                 typeArguments = node.typeArguments;
@@ -18764,8 +20179,8 @@ var ts;
             }
             else if (candidateForTypeArgumentError) {
                 if (!isTaggedTemplate && !isDecorator && typeArguments) {
-                    var typeArguments_1 = node.typeArguments;
-                    checkTypeArguments(candidateForTypeArgumentError, typeArguments_1, ts.map(typeArguments_1, getTypeFromTypeNode), true, headMessage);
+                    var typeArguments_2 = node.typeArguments;
+                    checkTypeArguments(candidateForTypeArgumentError, typeArguments_2, ts.map(typeArguments_2, getTypeFromTypeNode), true, headMessage);
                 }
                 else {
                     ts.Debug.assert(resultOfFailedInference.failedTypeParameterIndex >= 0);
@@ -18864,12 +20279,14 @@ var ts;
                 var superType = checkSuperExpression(node.expression);
                 if (superType !== unknownType) {
                     var baseTypeNode = ts.getClassExtendsHeritageClauseElement(ts.getContainingClass(node));
-                    var baseConstructors = getInstantiatedConstructorsForTypeArguments(superType, baseTypeNode.typeArguments);
-                    return resolveCall(node, baseConstructors, candidatesOutArray);
+                    if (baseTypeNode) {
+                        var baseConstructors = getInstantiatedConstructorsForTypeArguments(superType, baseTypeNode.typeArguments);
+                        return resolveCall(node, baseConstructors, candidatesOutArray);
+                    }
                 }
                 return resolveUntypedCall(node);
             }
-            var funcType = checkExpression(node.expression);
+            var funcType = checkNonNullExpression(node.expression);
             var apparentType = getApparentType(funcType);
             if (apparentType === unknownType) {
                 return resolveErrorCall(node);
@@ -18900,7 +20317,7 @@ var ts;
                     error(node.arguments[spreadIndex], ts.Diagnostics.Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_5_and_higher);
                 }
             }
-            var expressionType = checkExpression(node.expression);
+            var expressionType = checkNonNullExpression(node.expression);
             expressionType = getApparentType(expressionType);
             if (expressionType === unknownType) {
                 return resolveErrorCall(node);
@@ -18918,6 +20335,9 @@ var ts;
             }
             var constructSignatures = getSignaturesOfType(expressionType, 1);
             if (constructSignatures.length) {
+                if (!isConstructorAccessible(node, constructSignatures[0])) {
+                    return resolveErrorCall(node);
+                }
                 return resolveCall(node, constructSignatures, candidatesOutArray);
             }
             var callSignatures = getSignaturesOfType(expressionType, 0);
@@ -18926,11 +20346,36 @@ var ts;
                 if (getReturnTypeOfSignature(signature) !== voidType) {
                     error(node, ts.Diagnostics.Only_a_void_function_can_be_called_with_the_new_keyword);
                 }
+                if (signature.thisType === voidType) {
+                    error(node, ts.Diagnostics.A_function_that_is_called_with_the_new_keyword_cannot_have_a_this_type_that_is_void);
+                }
                 return signature;
             }
             error(node, ts.Diagnostics.Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature);
             return resolveErrorCall(node);
         }
+        function isConstructorAccessible(node, signature) {
+            if (!signature || !signature.declaration) {
+                return true;
+            }
+            var declaration = signature.declaration;
+            var flags = declaration.flags;
+            if (!(flags & (8 | 16))) {
+                return true;
+            }
+            var declaringClassDeclaration = getClassLikeDeclarationOfSymbol(declaration.parent.symbol);
+            var declaringClass = getDeclaredTypeOfSymbol(declaration.parent.symbol);
+            if (!isNodeWithinClass(node, declaringClassDeclaration)) {
+                if (flags & 8) {
+                    error(node, ts.Diagnostics.Constructor_of_class_0_is_private_and_only_accessible_within_the_class_declaration, typeToString(declaringClass));
+                }
+                if (flags & 16) {
+                    error(node, ts.Diagnostics.Constructor_of_class_0_is_protected_and_only_accessible_within_the_class_declaration, typeToString(declaringClass));
+                }
+                return false;
+            }
+            return true;
+        }
         function resolveTaggedTemplateExpression(node, candidatesOutArray) {
             var tagType = checkExpression(node.tag);
             var apparentType = getApparentType(tagType);
@@ -18949,16 +20394,16 @@ var ts;
         }
         function getDiagnosticHeadMessageForDecoratorResolution(node) {
             switch (node.parent.kind) {
-                case 217:
-                case 189:
+                case 220:
+                case 191:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression;
-                case 139:
+                case 141:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression;
-                case 142:
-                    return ts.Diagnostics.Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression;
                 case 144:
+                    return ts.Diagnostics.Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression;
                 case 146:
-                case 147:
+                case 148:
+                case 149:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression;
             }
         }
@@ -18974,7 +20419,7 @@ var ts;
             }
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             if (!callSignatures.length) {
-                var errorInfo;
+                var errorInfo = void 0;
                 errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature);
                 errorInfo = ts.chainDiagnosticMessages(errorInfo, headMessage);
                 diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(node, errorInfo));
@@ -18986,16 +20431,16 @@ var ts;
             var links = getNodeLinks(node);
             if (!links.resolvedSignature || candidatesOutArray) {
                 links.resolvedSignature = anySignature;
-                if (node.kind === 171) {
+                if (node.kind === 173) {
                     links.resolvedSignature = resolveCallExpression(node, candidatesOutArray);
                 }
-                else if (node.kind === 172) {
+                else if (node.kind === 174) {
                     links.resolvedSignature = resolveNewExpression(node, candidatesOutArray);
                 }
-                else if (node.kind === 173) {
+                else if (node.kind === 175) {
                     links.resolvedSignature = resolveTaggedTemplateExpression(node, candidatesOutArray);
                 }
-                else if (node.kind === 140) {
+                else if (node.kind === 142) {
                     links.resolvedSignature = resolveDecorator(node, candidatesOutArray);
                 }
                 else {
@@ -19017,12 +20462,13 @@ var ts;
             if (node.expression.kind === 95) {
                 return voidType;
             }
-            if (node.kind === 172) {
+            if (node.kind === 174) {
                 var declaration = signature.declaration;
                 if (declaration &&
-                    declaration.kind !== 145 &&
-                    declaration.kind !== 149 &&
-                    declaration.kind !== 154) {
+                    declaration.kind !== 147 &&
+                    declaration.kind !== 151 &&
+                    declaration.kind !== 156 &&
+                    !ts.isJSDocConstructSignature(declaration)) {
                     var funcSymbol = checkExpression(node.expression).symbol;
                     if (funcSymbol && funcSymbol.members && (funcSymbol.flags & 16)) {
                         return getInferredClassType(funcSymbol);
@@ -19033,7 +20479,7 @@ var ts;
                     return anyType;
                 }
             }
-            if (ts.isInJavaScriptFile(node) && ts.isRequireCall(node)) {
+            if (ts.isInJavaScriptFile(node) && ts.isRequireCall(node, true)) {
                 return resolveExternalModuleTypeByLiteral(node.arguments[0]);
             }
             return getReturnTypeOfSignature(signature);
@@ -19046,18 +20492,29 @@ var ts;
             var targetType = getTypeFromTypeNode(node.type);
             if (produceDiagnostics && targetType !== unknownType) {
                 var widenedType = getWidenedType(exprType);
-                var bothAreStringLike = someConstituentTypeHasKind(targetType, 258) &&
-                    someConstituentTypeHasKind(widenedType, 258);
-                if (!bothAreStringLike && !(isTypeAssignableTo(targetType, widenedType))) {
-                    checkTypeAssignableTo(exprType, targetType, node, ts.Diagnostics.Neither_type_0_nor_type_1_is_assignable_to_the_other);
+                if (!isTypeComparableTo(targetType, widenedType)) {
+                    checkTypeComparableTo(exprType, targetType, node, ts.Diagnostics.Type_0_cannot_be_converted_to_type_1);
                 }
             }
             return targetType;
         }
+        function checkNonNullAssertion(node) {
+            return getNonNullableType(checkExpression(node.expression));
+        }
+        function getTypeOfParameter(symbol) {
+            var type = getTypeOfSymbol(symbol);
+            if (strictNullChecks) {
+                var declaration = symbol.valueDeclaration;
+                if (declaration && declaration.initializer) {
+                    return addNullableKind(type, 32);
+                }
+            }
+            return type;
+        }
         function getTypeAtPosition(signature, pos) {
             return signature.hasRestParameter ?
-                pos < signature.parameters.length - 1 ? getTypeOfSymbol(signature.parameters[pos]) : getRestTypeOfSignature(signature) :
-                pos < signature.parameters.length ? getTypeOfSymbol(signature.parameters[pos]) : anyType;
+                pos < signature.parameters.length - 1 ? getTypeOfParameter(signature.parameters[pos]) : getRestTypeOfSignature(signature) :
+                pos < signature.parameters.length ? getTypeOfParameter(signature.parameters[pos]) : anyType;
         }
         function assignContextualParameterTypes(signature, context, mapper) {
             var len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0);
@@ -19076,7 +20533,7 @@ var ts;
             if (ts.isBindingPattern(node.name)) {
                 for (var _i = 0, _a = node.name.elements; _i < _a.length; _i++) {
                     var element = _a[_i];
-                    if (element.kind !== 190) {
+                    if (element.kind !== 192) {
                         if (element.name.kind === 69) {
                             getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
                         }
@@ -19095,6 +20552,13 @@ var ts;
                 inferTypes(mapper.context, links.type, instantiateType(contextualType, mapper));
             }
         }
+        function getReturnTypeFromJSDocComment(func) {
+            var returnTag = ts.getJSDocReturnTag(func);
+            if (returnTag && returnTag.typeExpression) {
+                return getTypeFromTypeNode(returnTag.typeExpression.type);
+            }
+            return undefined;
+        }
         function createPromiseType(promisedType) {
             var globalPromiseType = getGlobalPromiseType();
             if (globalPromiseType !== emptyGenericType) {
@@ -19110,14 +20574,14 @@ var ts;
             }
             var isAsync = ts.isAsyncFunctionLike(func);
             var type;
-            if (func.body.kind !== 195) {
+            if (func.body.kind !== 198) {
                 type = checkExpressionCached(func.body, contextualMapper);
                 if (isAsync) {
                     type = checkAwaitedType(type, func, ts.Diagnostics.Return_expression_in_async_function_does_not_have_a_valid_callable_then_member);
                 }
             }
             else {
-                var types;
+                var types = void 0;
                 var funcIsGenerator = !!func.asteriskToken;
                 if (funcIsGenerator) {
                     types = checkAndAggregateYieldOperandTypes(func.body, contextualMapper);
@@ -19130,7 +20594,8 @@ var ts;
                     }
                 }
                 else {
-                    types = checkAndAggregateReturnExpressionTypes(func.body, contextualMapper, isAsync);
+                    var hasImplicitReturn = !!(func.flags & 32768);
+                    types = checkAndAggregateReturnExpressionTypes(func.body, contextualMapper, isAsync, hasImplicitReturn);
                     if (types.length === 0) {
                         if (isAsync) {
                             var promiseType = createPromiseType(voidType);
@@ -19153,7 +20618,7 @@ var ts;
                     }
                     else {
                         error(func, ts.Diagnostics.No_best_common_type_exists_among_return_expressions);
-                        return unknownType;
+                        return getUnionType(types);
                     }
                 }
                 if (funcIsGenerator) {
@@ -19192,8 +20657,9 @@ var ts;
             });
             return aggregatedTypes;
         }
-        function checkAndAggregateReturnExpressionTypes(body, contextualMapper, isAsync) {
+        function checkAndAggregateReturnExpressionTypes(body, contextualMapper, isAsync, hasImplicitReturn) {
             var aggregatedTypes = [];
+            var hasOmittedExpressions = false;
             ts.forEachReturnStatement(body, function (returnStatement) {
                 var expr = returnStatement.expression;
                 if (expr) {
@@ -19205,29 +20671,41 @@ var ts;
                         aggregatedTypes.push(type);
                     }
                 }
+                else {
+                    hasOmittedExpressions = true;
+                }
             });
+            if (strictNullChecks && aggregatedTypes.length && (hasOmittedExpressions || hasImplicitReturn)) {
+                if (!ts.contains(aggregatedTypes, undefinedType)) {
+                    aggregatedTypes.push(undefinedType);
+                }
+            }
             return aggregatedTypes;
         }
         function checkAllCodePathsInNonVoidFunctionReturnOrThrow(func, returnType) {
             if (!produceDiagnostics) {
                 return;
             }
-            if (returnType === voidType || isTypeAny(returnType)) {
+            if (returnType && maybeTypeOfKind(returnType, 1 | 16)) {
                 return;
             }
-            if (ts.nodeIsMissing(func.body) || func.body.kind !== 195 || !(func.flags & 524288)) {
+            if (ts.nodeIsMissing(func.body) || func.body.kind !== 198 || !(func.flags & 32768)) {
                 return;
             }
-            var hasExplicitReturn = func.flags & 1048576;
+            var hasExplicitReturn = func.flags & 65536;
             if (returnType && !hasExplicitReturn) {
                 error(func.type, ts.Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value);
             }
+            else if (returnType && strictNullChecks && !isTypeAssignableTo(undefinedType, returnType)) {
+                error(func.type, ts.Diagnostics.Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined);
+            }
             else if (compilerOptions.noImplicitReturns) {
                 if (!returnType) {
-                    var inferredReturnType = hasExplicitReturn
-                        ? getReturnTypeOfSignature(getSignatureFromDeclaration(func))
-                        : voidType;
-                    if (inferredReturnType === voidType || isTypeAny(inferredReturnType)) {
+                    if (!hasExplicitReturn) {
+                        return;
+                    }
+                    var inferredReturnType = getReturnTypeOfSignature(getSignatureFromDeclaration(func));
+                    if (isUnwrappedReturnTypeVoidOrAny(func, inferredReturnType)) {
                         return;
                     }
                 }
@@ -19235,12 +20713,13 @@ var ts;
             }
         }
         function checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper) {
-            ts.Debug.assert(node.kind !== 144 || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 146 || ts.isObjectLiteralMethod(node));
             var hasGrammarError = checkGrammarFunctionLikeDeclaration(node);
-            if (!hasGrammarError && node.kind === 176) {
+            if (!hasGrammarError && node.kind === 178) {
                 checkGrammarForGenerator(node);
             }
             if (contextualMapper === identityMapper && isContextSensitive(node)) {
+                checkNodeDeferred(node);
                 return anyFunctionType;
             }
             var links = getNodeLinks(node);
@@ -19270,14 +20749,14 @@ var ts;
                     }
                 }
             }
-            if (produceDiagnostics && node.kind !== 144 && node.kind !== 143) {
+            if (produceDiagnostics && node.kind !== 146 && node.kind !== 145) {
                 checkCollisionWithCapturedSuperVariable(node, node.name);
                 checkCollisionWithCapturedThisVariable(node, node.name);
             }
             return type;
         }
         function checkFunctionExpressionOrObjectLiteralMethodDeferred(node) {
-            ts.Debug.assert(node.kind !== 144 || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 146 || ts.isObjectLiteralMethod(node));
             var isAsync = ts.isAsyncFunctionLike(node);
             var returnOrPromisedType = node.type && (isAsync ? checkAsyncFunctionReturnType(node) : getTypeFromTypeNode(node.type));
             if (!node.asteriskToken) {
@@ -19287,7 +20766,7 @@ var ts;
                 if (!node.type) {
                     getReturnTypeOfSignature(getSignatureFromDeclaration(node));
                 }
-                if (node.body.kind === 195) {
+                if (node.body.kind === 198) {
                     checkSourceElement(node.body);
                 }
                 else {
@@ -19311,59 +20790,62 @@ var ts;
             }
             return true;
         }
-        function checkReferenceExpression(n, invalidReferenceMessage, constantVariableMessage) {
-            function findSymbol(n) {
-                var symbol = getNodeLinks(n).resolvedSymbol;
-                return symbol && getExportSymbolOfValueSymbolIfExported(symbol);
+        function isReadonlySymbol(symbol) {
+            return symbol.flags & 4 && (getDeclarationFlagsFromSymbol(symbol) & 64) !== 0 ||
+                symbol.flags & 3 && (getDeclarationFlagsFromSymbol(symbol) & 2048) !== 0 ||
+                symbol.flags & 98304 && !(symbol.flags & 65536) ||
+                (symbol.flags & 8) !== 0;
+        }
+        function isReferenceToReadonlyEntity(expr, symbol) {
+            if (isReadonlySymbol(symbol)) {
+                if (symbol.flags & 4 &&
+                    (expr.kind === 171 || expr.kind === 172) &&
+                    expr.expression.kind === 97) {
+                    var func = ts.getContainingFunction(expr);
+                    return !(func && func.kind === 147 && func.parent === symbol.valueDeclaration.parent);
+                }
+                return true;
             }
-            function isReferenceOrErrorExpression(n) {
-                switch (n.kind) {
-                    case 69: {
-                        var symbol = findSymbol(n);
-                        return !symbol || symbol === unknownSymbol || symbol === argumentsSymbol || (symbol.flags & 3) !== 0;
+            return false;
+        }
+        function isReferenceThroughNamespaceImport(expr) {
+            if (expr.kind === 171 || expr.kind === 172) {
+                var node = skipParenthesizedNodes(expr.expression);
+                if (node.kind === 69) {
+                    var symbol = getNodeLinks(node).resolvedSymbol;
+                    if (symbol.flags & 8388608) {
+                        var declaration = getDeclarationOfAliasSymbol(symbol);
+                        return declaration && declaration.kind === 231;
                     }
-                    case 169: {
-                        var symbol = findSymbol(n);
-                        return !symbol || symbol === unknownSymbol || (symbol.flags & ~8) !== 0;
-                    }
-                    case 170:
-                        return true;
-                    case 175:
-                        return isReferenceOrErrorExpression(n.expression);
-                    default:
-                        return false;
                 }
             }
-            function isConstVariableReference(n) {
-                switch (n.kind) {
-                    case 69:
-                    case 169: {
-                        var symbol = findSymbol(n);
-                        return symbol && (symbol.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(symbol) & 16384) !== 0;
-                    }
-                    case 170: {
-                        var index = n.argumentExpression;
-                        var symbol = findSymbol(n.expression);
-                        if (symbol && index && index.kind === 9) {
-                            var name_12 = index.text;
-                            var prop = getPropertyOfType(getTypeOfSymbol(symbol), name_12);
-                            return prop && (prop.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(prop) & 16384) !== 0;
-                        }
+            return false;
+        }
+        function checkReferenceExpression(expr, invalidReferenceMessage, constantVariableMessage) {
+            var node = skipParenthesizedNodes(expr);
+            if (node.kind !== 69 && node.kind !== 171 && node.kind !== 172) {
+                error(expr, invalidReferenceMessage);
+                return false;
+            }
+            var links = getNodeLinks(node);
+            var symbol = getExportSymbolOfValueSymbolIfExported(links.resolvedSymbol);
+            if (symbol) {
+                if (symbol !== unknownSymbol && symbol !== argumentsSymbol) {
+                    if (node.kind === 69 && !(symbol.flags & 3)) {
+                        error(expr, invalidReferenceMessage);
                         return false;
                     }
-                    case 175:
-                        return isConstVariableReference(n.expression);
-                    default:
+                    if (isReferenceToReadonlyEntity(node, symbol) || isReferenceThroughNamespaceImport(node)) {
+                        error(expr, constantVariableMessage);
                         return false;
+                    }
                 }
             }
-            if (!isReferenceOrErrorExpression(n)) {
-                error(n, invalidReferenceMessage);
-                return false;
-            }
-            if (isConstVariableReference(n)) {
-                error(n, constantVariableMessage);
-                return false;
+            else if (node.kind === 172) {
+                if (links.resolvedIndexInfo && links.resolvedIndexInfo.isReadonly) {
+                    error(expr, constantVariableMessage);
+                    return false;
+                }
             }
             return true;
         }
@@ -19381,7 +20863,7 @@ var ts;
         }
         function checkAwaitExpression(node) {
             if (produceDiagnostics) {
-                if (!(node.parserContextFlags & 8)) {
+                if (!(node.flags & 33554432)) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function);
                 }
                 if (isInParameterInitializerBeforeContainingFunction(node)) {
@@ -19397,7 +20879,7 @@ var ts;
                 case 35:
                 case 36:
                 case 50:
-                    if (someConstituentTypeHasKind(operandType, 16777216)) {
+                    if (maybeTypeOfKind(operandType, 16777216)) {
                         error(node.operand, ts.Diagnostics.The_0_operator_cannot_be_applied_to_type_symbol, ts.tokenToString(node.operator));
                     }
                     return numberType;
@@ -19405,9 +20887,9 @@ var ts;
                     return booleanType;
                 case 41:
                 case 42:
-                    var ok = checkArithmeticOperandType(node.operand, operandType, ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
+                    var ok = checkArithmeticOperandType(node.operand, getNonNullableType(operandType), ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
                     if (ok) {
-                        checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant);
+                        checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property);
                     }
                     return numberType;
             }
@@ -19415,42 +20897,50 @@ var ts;
         }
         function checkPostfixUnaryExpression(node) {
             var operandType = checkExpression(node.operand);
-            var ok = checkArithmeticOperandType(node.operand, operandType, ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
+            var ok = checkArithmeticOperandType(node.operand, getNonNullableType(operandType), ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
             if (ok) {
-                checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant);
+                checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property);
             }
             return numberType;
         }
-        function someConstituentTypeHasKind(type, kind) {
+        function maybeTypeOfKind(type, kind) {
             if (type.flags & kind) {
                 return true;
             }
             if (type.flags & 49152) {
                 var types = type.types;
                 for (var _i = 0, types_10 = types; _i < types_10.length; _i++) {
-                    var current = types_10[_i];
-                    if (current.flags & kind) {
+                    var t = types_10[_i];
+                    if (maybeTypeOfKind(t, kind)) {
                         return true;
                     }
                 }
-                return false;
             }
             return false;
         }
-        function allConstituentTypesHaveKind(type, kind) {
+        function isTypeOfKind(type, kind) {
             if (type.flags & kind) {
                 return true;
             }
-            if (type.flags & 49152) {
+            if (type.flags & 16384) {
                 var types = type.types;
                 for (var _i = 0, types_11 = types; _i < types_11.length; _i++) {
-                    var current = types_11[_i];
-                    if (!(current.flags & kind)) {
+                    var t = types_11[_i];
+                    if (!isTypeOfKind(t, kind)) {
                         return false;
                     }
                 }
                 return true;
             }
+            if (type.flags & 32768) {
+                var types = type.types;
+                for (var _a = 0, types_12 = types; _a < types_12.length; _a++) {
+                    var t = types_12[_a];
+                    if (isTypeOfKind(t, kind)) {
+                        return true;
+                    }
+                }
+            }
             return false;
         }
         function isConstEnumObjectType(type) {
@@ -19460,7 +20950,7 @@ var ts;
             return (symbol.flags & 128) !== 0;
         }
         function checkInstanceOfExpression(left, right, leftType, rightType) {
-            if (allConstituentTypesHaveKind(leftType, 16777726)) {
+            if (isTypeOfKind(leftType, 16777726)) {
                 error(left, ts.Diagnostics.The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter);
             }
             if (!(isTypeAny(rightType) || isTypeSubtypeOf(rightType, globalFunctionType))) {
@@ -19481,9 +20971,9 @@ var ts;
             var properties = node.properties;
             for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
                 var p = properties_3[_i];
-                if (p.kind === 248 || p.kind === 249) {
+                if (p.kind === 252 || p.kind === 253) {
                     var name_13 = p.name;
-                    if (name_13.kind === 137) {
+                    if (name_13.kind === 139) {
                         checkComputedPropertyName(name_13);
                     }
                     if (isComputedNonLiteralName(name_13)) {
@@ -19496,7 +20986,7 @@ var ts;
                             isNumericLiteralName(text) && getIndexTypeOfType(sourceType, 1) ||
                             getIndexTypeOfType(sourceType, 0);
                     if (type) {
-                        if (p.kind === 249) {
+                        if (p.kind === 253) {
                             checkDestructuringAssignment(p, type);
                         }
                         else {
@@ -19518,8 +21008,8 @@ var ts;
             var elements = node.elements;
             for (var i = 0; i < elements.length; i++) {
                 var e = elements[i];
-                if (e.kind !== 190) {
-                    if (e.kind !== 188) {
+                if (e.kind !== 192) {
+                    if (e.kind !== 190) {
                         var propName = "" + i;
                         var type = isTypeAny(sourceType)
                             ? sourceType
@@ -19544,7 +21034,7 @@ var ts;
                         }
                         else {
                             var restExpression = e.expression;
-                            if (restExpression.kind === 184 && restExpression.operatorToken.kind === 56) {
+                            if (restExpression.kind === 186 && restExpression.operatorToken.kind === 56) {
                                 error(restExpression.operatorToken, ts.Diagnostics.A_rest_element_cannot_have_an_initializer);
                             }
                             else {
@@ -19558,7 +21048,7 @@ var ts;
         }
         function checkDestructuringAssignment(exprOrAssignment, sourceType, contextualMapper) {
             var target;
-            if (exprOrAssignment.kind === 249) {
+            if (exprOrAssignment.kind === 253) {
                 var prop = exprOrAssignment;
                 if (prop.objectAssignmentInitializer) {
                     checkBinaryLikeExpression(prop.name, prop.equalsToken, prop.objectAssignmentInitializer, contextualMapper);
@@ -19568,21 +21058,21 @@ var ts;
             else {
                 target = exprOrAssignment;
             }
-            if (target.kind === 184 && target.operatorToken.kind === 56) {
+            if (target.kind === 186 && target.operatorToken.kind === 56) {
                 checkBinaryExpression(target, contextualMapper);
                 target = target.left;
             }
-            if (target.kind === 168) {
+            if (target.kind === 170) {
                 return checkObjectLiteralAssignment(target, sourceType, contextualMapper);
             }
-            if (target.kind === 167) {
+            if (target.kind === 169) {
                 return checkArrayLiteralAssignment(target, sourceType, contextualMapper);
             }
             return checkReferenceAssignment(target, sourceType, contextualMapper);
         }
         function checkReferenceAssignment(target, sourceType, contextualMapper) {
             var targetType = checkExpression(target, contextualMapper);
-            if (checkReferenceExpression(target, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant)) {
+            if (checkReferenceExpression(target, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property)) {
                 checkTypeAssignableTo(sourceType, targetType, target, undefined);
             }
             return sourceType;
@@ -19592,7 +21082,7 @@ var ts;
         }
         function checkBinaryLikeExpression(left, operatorToken, right, contextualMapper, errorNode) {
             var operator = operatorToken.kind;
-            if (operator === 56 && (left.kind === 168 || left.kind === 167)) {
+            if (operator === 56 && (left.kind === 170 || left.kind === 169)) {
                 return checkDestructuringAssignment(left, checkExpression(right, contextualMapper), contextualMapper);
             }
             var leftType = checkExpression(left, contextualMapper);
@@ -19620,11 +21110,13 @@ var ts;
                 case 68:
                 case 46:
                 case 66:
-                    if (leftType.flags & (32 | 64))
+                    if (leftType.flags & 96)
                         leftType = rightType;
-                    if (rightType.flags & (32 | 64))
+                    if (rightType.flags & 96)
                         rightType = leftType;
-                    var suggestedOperator;
+                    leftType = getNonNullableType(leftType);
+                    rightType = getNonNullableType(rightType);
+                    var suggestedOperator = void 0;
                     if ((leftType.flags & 8) &&
                         (rightType.flags & 8) &&
                         (suggestedOperator = getSuggestedBooleanOperator(operatorToken.kind)) !== undefined) {
@@ -19640,16 +21132,18 @@ var ts;
                     return numberType;
                 case 35:
                 case 57:
-                    if (leftType.flags & (32 | 64))
+                    if (leftType.flags & 96)
                         leftType = rightType;
-                    if (rightType.flags & (32 | 64))
+                    if (rightType.flags & 96)
                         rightType = leftType;
-                    var resultType;
-                    if (allConstituentTypesHaveKind(leftType, 132) && allConstituentTypesHaveKind(rightType, 132)) {
+                    leftType = getNonNullableType(leftType);
+                    rightType = getNonNullableType(rightType);
+                    var resultType = void 0;
+                    if (isTypeOfKind(leftType, 132) && isTypeOfKind(rightType, 132)) {
                         resultType = numberType;
                     }
                     else {
-                        if (allConstituentTypesHaveKind(leftType, 258) || allConstituentTypesHaveKind(rightType, 258)) {
+                        if (isTypeOfKind(leftType, 258) || isTypeOfKind(rightType, 258)) {
                             resultType = stringType;
                         }
                         else if (isTypeAny(leftType) || isTypeAny(rightType)) {
@@ -19678,10 +21172,7 @@ var ts;
                 case 31:
                 case 32:
                 case 33:
-                    if (someConstituentTypeHasKind(leftType, 258) && someConstituentTypeHasKind(rightType, 258)) {
-                        return booleanType;
-                    }
-                    if (!isTypeAssignableTo(leftType, rightType) && !isTypeAssignableTo(rightType, leftType)) {
+                    if (!isTypeComparableTo(leftType, rightType) && !isTypeComparableTo(rightType, leftType)) {
                         reportOperatorError();
                     }
                     return booleanType;
@@ -19690,9 +21181,9 @@ var ts;
                 case 90:
                     return checkInExpression(left, right, leftType, rightType);
                 case 51:
-                    return rightType;
+                    return addNullableKind(rightType, getNullableKind(leftType));
                 case 52:
-                    return getUnionType([leftType, rightType]);
+                    return getUnionType([getNonNullableType(leftType), rightType]);
                 case 56:
                     checkAssignmentOperator(rightType);
                     return getRegularTypeOfObjectLiteral(rightType);
@@ -19700,8 +21191,8 @@ var ts;
                     return rightType;
             }
             function checkForDisallowedESSymbolOperand(operator) {
-                var offendingSymbolOperand = someConstituentTypeHasKind(leftType, 16777216) ? left :
-                    someConstituentTypeHasKind(rightType, 16777216) ? right :
+                var offendingSymbolOperand = maybeTypeOfKind(leftType, 16777216) ? left :
+                    maybeTypeOfKind(rightType, 16777216) ? right :
                         undefined;
                 if (offendingSymbolOperand) {
                     error(offendingSymbolOperand, ts.Diagnostics.The_0_operator_cannot_be_applied_to_type_symbol, ts.tokenToString(operator));
@@ -19726,7 +21217,7 @@ var ts;
             }
             function checkAssignmentOperator(valueType) {
                 if (produceDiagnostics && operator >= 56 && operator <= 68) {
-                    var ok = checkReferenceExpression(left, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant);
+                    var ok = checkReferenceExpression(left, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property);
                     if (ok) {
                         checkTypeAssignableTo(valueType, leftType, left, undefined);
                     }
@@ -19753,7 +21244,7 @@ var ts;
         }
         function checkYieldExpression(node) {
             if (produceDiagnostics) {
-                if (!(node.parserContextFlags & 2) || isYieldExpressionInClass(node)) {
+                if (!(node.flags & 8388608) || isYieldExpressionInClass(node)) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.A_yield_expression_is_only_allowed_in_a_generator_body);
                 }
                 if (isInParameterInitializerBeforeContainingFunction(node)) {
@@ -19764,7 +21255,7 @@ var ts;
                 var func = ts.getContainingFunction(node);
                 if (func && func.asteriskToken) {
                     var expressionType = checkExpressionCached(node.expression, undefined);
-                    var expressionElementType;
+                    var expressionElementType = void 0;
                     var nodeIsYieldStar = !!node.asteriskToken;
                     if (nodeIsYieldStar) {
                         expressionElementType = checkElementTypeOfIterable(expressionType, node.expression);
@@ -19816,14 +21307,14 @@ var ts;
             return links.resolvedType;
         }
         function checkPropertyAssignment(node, contextualMapper) {
-            if (node.name.kind === 137) {
+            if (node.name.kind === 139) {
                 checkComputedPropertyName(node.name);
             }
             return checkExpression(node.initializer, contextualMapper);
         }
         function checkObjectLiteralMethod(node, contextualMapper) {
             checkGrammarMethod(node);
-            if (node.name.kind === 137) {
+            if (node.name.kind === 139) {
                 checkComputedPropertyName(node.name);
             }
             var uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
@@ -19846,7 +21337,7 @@ var ts;
         }
         function checkExpression(node, contextualMapper) {
             var type;
-            if (node.kind === 136) {
+            if (node.kind === 138) {
                 type = checkQualifiedName(node);
             }
             else {
@@ -19854,9 +21345,9 @@ var ts;
                 type = instantiateTypeWithSingleGenericCallSignature(node, uninstantiatedType, contextualMapper);
             }
             if (isConstEnumObjectType(type)) {
-                var ok = (node.parent.kind === 169 && node.parent.expression === node) ||
-                    (node.parent.kind === 170 && node.parent.expression === node) ||
-                    ((node.kind === 69 || node.kind === 136) && isInRightSideOfImportOrExportAssignment(node));
+                var ok = (node.parent.kind === 171 && node.parent.expression === node) ||
+                    (node.parent.kind === 172 && node.parent.expression === node) ||
+                    ((node.kind === 69 || node.kind === 138) && isInRightSideOfImportOrExportAssignment(node));
                 if (!ok) {
                     error(node, ts.Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment);
                 }
@@ -19882,7 +21373,7 @@ var ts;
                     return booleanType;
                 case 8:
                     return checkNumericLiteral(node);
-                case 186:
+                case 188:
                     return checkTemplateExpression(node);
                 case 9:
                     return checkStringLiteralExpression(node);
@@ -19890,58 +21381,60 @@ var ts;
                     return stringType;
                 case 10:
                     return globalRegExpType;
-                case 167:
-                    return checkArrayLiteral(node, contextualMapper);
-                case 168:
-                    return checkObjectLiteral(node, contextualMapper);
                 case 169:
-                    return checkPropertyAccessExpression(node);
+                    return checkArrayLiteral(node, contextualMapper);
                 case 170:
-                    return checkIndexedAccess(node);
+                    return checkObjectLiteral(node, contextualMapper);
                 case 171:
+                    return checkPropertyAccessExpression(node);
                 case 172:
-                    return checkCallExpression(node);
+                    return checkIndexedAccess(node);
                 case 173:
-                    return checkTaggedTemplateExpression(node);
-                case 175:
-                    return checkExpression(node.expression, contextualMapper);
-                case 189:
-                    return checkClassExpression(node);
-                case 176:
-                case 177:
-                    return checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
-                case 179:
-                    return checkTypeOfExpression(node);
                 case 174:
-                case 192:
-                    return checkAssertion(node);
+                    return checkCallExpression(node);
+                case 175:
+                    return checkTaggedTemplateExpression(node);
+                case 177:
+                    return checkExpression(node.expression, contextualMapper);
+                case 191:
+                    return checkClassExpression(node);
                 case 178:
-                    return checkDeleteExpression(node);
-                case 180:
-                    return checkVoidExpression(node);
+                case 179:
+                    return checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
                 case 181:
-                    return checkAwaitExpression(node);
+                    return checkTypeOfExpression(node);
+                case 176:
+                case 194:
+                    return checkAssertion(node);
+                case 195:
+                    return checkNonNullAssertion(node);
+                case 180:
+                    return checkDeleteExpression(node);
                 case 182:
-                    return checkPrefixUnaryExpression(node);
+                    return checkVoidExpression(node);
                 case 183:
-                    return checkPostfixUnaryExpression(node);
+                    return checkAwaitExpression(node);
                 case 184:
-                    return checkBinaryExpression(node, contextualMapper);
+                    return checkPrefixUnaryExpression(node);
                 case 185:
-                    return checkConditionalExpression(node, contextualMapper);
-                case 188:
-                    return checkSpreadElementExpression(node, contextualMapper);
-                case 190:
-                    return undefinedType;
+                    return checkPostfixUnaryExpression(node);
+                case 186:
+                    return checkBinaryExpression(node, contextualMapper);
                 case 187:
+                    return checkConditionalExpression(node, contextualMapper);
+                case 190:
+                    return checkSpreadElementExpression(node, contextualMapper);
+                case 192:
+                    return undefinedType;
+                case 189:
                     return checkYieldExpression(node);
-                case 243:
+                case 247:
                     return checkJsxExpression(node);
-                case 236:
+                case 240:
                     return checkJsxElement(node);
-                case 237:
+                case 241:
                     return checkJsxSelfClosingElement(node);
-                case 238:
+                case 242:
                     ts.Debug.fail("Shouldn't ever directly check a JsxOpeningElement");
             }
             return unknownType;
@@ -19960,15 +21453,26 @@ var ts;
             checkGrammarDecorators(node) || checkGrammarModifiers(node);
             checkVariableLikeDeclaration(node);
             var func = ts.getContainingFunction(node);
-            if (node.flags & 56) {
+            if (node.flags & 28) {
                 func = ts.getContainingFunction(node);
-                if (!(func.kind === 145 && ts.nodeIsPresent(func.body))) {
+                if (!(func.kind === 147 && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                 }
             }
             if (node.questionToken && ts.isBindingPattern(node.name) && func.body) {
                 error(node, ts.Diagnostics.A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature);
             }
+            if (node.name.text === "this") {
+                if (ts.indexOf(func.parameters, node) !== 0) {
+                    error(node, ts.Diagnostics.A_this_parameter_must_be_the_first_parameter);
+                }
+                if (func.kind === 147 || func.kind === 151 || func.kind === 156) {
+                    error(node, ts.Diagnostics.A_constructor_cannot_have_a_this_parameter);
+                }
+                if (func.kind === 149) {
+                    error(node, ts.Diagnostics.A_setter_cannot_have_a_this_parameter);
+                }
+            }
             if (node.dotDotDotToken && !ts.isBindingPattern(node.name) && !isArrayType(getTypeOfSymbol(node.symbol))) {
                 error(node, ts.Diagnostics.A_rest_parameter_must_be_of_an_array_type);
             }
@@ -19977,9 +21481,9 @@ var ts;
             if (!node.asteriskToken || !node.body) {
                 return false;
             }
-            return node.kind === 144 ||
-                node.kind === 216 ||
-                node.kind === 176;
+            return node.kind === 146 ||
+                node.kind === 219 ||
+                node.kind === 178;
         }
         function getTypePredicateParameterIndex(parameterList, parameter) {
             if (parameterList) {
@@ -19996,32 +21500,32 @@ var ts;
         function checkTypePredicate(node) {
             var parent = getTypePredicateParent(node);
             if (!parent) {
+                error(node, ts.Diagnostics.A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods);
                 return;
             }
-            var returnType = getReturnTypeOfSignature(getSignatureFromDeclaration(parent));
-            if (!returnType || !(returnType.flags & 134217728)) {
+            var typePredicate = getSignatureFromDeclaration(parent).typePredicate;
+            if (!typePredicate) {
                 return;
             }
             var parameterName = node.parameterName;
-            if (parameterName.kind === 162) {
+            if (ts.isThisTypePredicate(typePredicate)) {
                 getTypeFromThisTypeNode(parameterName);
             }
             else {
-                var typePredicate = returnType.predicate;
                 if (typePredicate.parameterIndex >= 0) {
                     if (parent.parameters[typePredicate.parameterIndex].dotDotDotToken) {
                         error(parameterName, ts.Diagnostics.A_type_predicate_cannot_reference_a_rest_parameter);
                     }
                     else {
-                        checkTypeAssignableTo(typePredicate.type, getTypeOfNode(parent.parameters[typePredicate.parameterIndex]), node.type);
+                        var leadingError = ts.chainDiagnosticMessages(undefined, ts.Diagnostics.A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type);
+                        checkTypeAssignableTo(typePredicate.type, getTypeOfNode(parent.parameters[typePredicate.parameterIndex]), node.type, undefined, leadingError);
                     }
                 }
                 else if (parameterName) {
                     var hasReportedError = false;
                     for (var _i = 0, _a = parent.parameters; _i < _a.length; _i++) {
                         var name_14 = _a[_i].name;
-                        if ((name_14.kind === 164 ||
-                            name_14.kind === 165) &&
+                        if (ts.isBindingPattern(name_14) &&
                             checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_14, parameterName, typePredicate.parameterName)) {
                             hasReportedError = true;
                             break;
@@ -20035,16 +21539,16 @@ var ts;
         }
         function getTypePredicateParent(node) {
             switch (node.parent.kind) {
-                case 177:
-                case 148:
-                case 216:
-                case 176:
-                case 153:
-                case 144:
-                case 143:
-                    var parent_6 = node.parent;
-                    if (node === parent_6.type) {
-                        return parent_6;
+                case 179:
+                case 150:
+                case 219:
+                case 178:
+                case 155:
+                case 146:
+                case 145:
+                    var parent_8 = node.parent;
+                    if (node === parent_8.type) {
+                        return parent_8;
                     }
             }
         }
@@ -20056,8 +21560,8 @@ var ts;
                     error(predicateVariableNode, ts.Diagnostics.A_type_predicate_cannot_reference_element_0_in_a_binding_pattern, predicateVariableName);
                     return true;
                 }
-                else if (name_15.kind === 165 ||
-                    name_15.kind === 164) {
+                else if (name_15.kind === 167 ||
+                    name_15.kind === 166) {
                     if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_15, predicateVariableNode, predicateVariableName)) {
                         return true;
                     }
@@ -20065,25 +21569,27 @@ var ts;
             }
         }
         function checkSignatureDeclaration(node) {
-            if (node.kind === 150) {
+            if (node.kind === 152) {
                 checkGrammarIndexSignature(node);
             }
-            else if (node.kind === 153 || node.kind === 216 || node.kind === 154 ||
-                node.kind === 148 || node.kind === 145 ||
-                node.kind === 149) {
+            else if (node.kind === 155 || node.kind === 219 || node.kind === 156 ||
+                node.kind === 150 || node.kind === 147 ||
+                node.kind === 151) {
                 checkGrammarFunctionLikeDeclaration(node);
             }
             checkTypeParameters(node.typeParameters);
             ts.forEach(node.parameters, checkParameter);
-            checkSourceElement(node.type);
+            if (node.type) {
+                checkSourceElement(node.type);
+            }
             if (produceDiagnostics) {
                 checkCollisionWithArgumentsInGeneratedCode(node);
                 if (compilerOptions.noImplicitAny && !node.type) {
                     switch (node.kind) {
-                        case 149:
+                        case 151:
                             error(node, ts.Diagnostics.Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
-                        case 148:
+                        case 150:
                             error(node, ts.Diagnostics.Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
                     }
@@ -20100,12 +21606,14 @@ var ts;
                             checkTypeAssignableTo(iterableIteratorInstantiation, returnType, node.type);
                         }
                     }
+                    else if (ts.isAsyncFunctionLike(node)) {
+                        checkAsyncFunctionReturnType(node);
+                    }
                 }
             }
-            checkSpecializedSignatureDeclaration(node);
         }
         function checkTypeForDuplicateIndexSignatures(node) {
-            if (node.kind === 218) {
+            if (node.kind === 221) {
                 var nodeSymbol = getSymbolOfNode(node);
                 if (nodeSymbol.declarations.length > 0 && nodeSymbol.declarations[0] !== node) {
                     return;
@@ -20120,7 +21628,7 @@ var ts;
                     var declaration = decl;
                     if (declaration.parameters.length === 1 && declaration.parameters[0].type) {
                         switch (declaration.parameters[0].type.kind) {
-                            case 130:
+                            case 131:
                                 if (!seenStringIndexer) {
                                     seenStringIndexer = true;
                                 }
@@ -20128,7 +21636,7 @@ var ts;
                                     error(declaration, ts.Diagnostics.Duplicate_string_index_signature);
                                 }
                                 break;
-                            case 128:
+                            case 129:
                                 if (!seenNumericIndexer) {
                                     seenNumericIndexer = true;
                                 }
@@ -20167,14 +21675,11 @@ var ts;
             if (!produceDiagnostics) {
                 return;
             }
-            function isSuperCallExpression(n) {
-                return n.kind === 171 && n.expression.kind === 95;
-            }
             function containsSuperCallAsComputedPropertyName(n) {
                 return n.name && containsSuperCall(n.name);
             }
             function containsSuperCall(n) {
-                if (isSuperCallExpression(n)) {
+                if (ts.isSuperCallExpression(n)) {
                     return true;
                 }
                 else if (ts.isFunctionLike(n)) {
@@ -20189,32 +21694,31 @@ var ts;
                 if (n.kind === 97) {
                     error(n, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
                 }
-                else if (n.kind !== 176 && n.kind !== 216) {
+                else if (n.kind !== 178 && n.kind !== 219) {
                     ts.forEachChild(n, markThisReferencesAsErrors);
                 }
             }
             function isInstancePropertyWithInitializer(n) {
-                return n.kind === 142 &&
-                    !(n.flags & 64) &&
+                return n.kind === 144 &&
+                    !(n.flags & 32) &&
                     !!n.initializer;
             }
             var containingClassDecl = node.parent;
             if (ts.getClassExtendsHeritageClauseElement(containingClassDecl)) {
-                var containingClassSymbol = getSymbolOfNode(containingClassDecl);
-                var containingClassInstanceType = getDeclaredTypeOfSymbol(containingClassSymbol);
-                var baseConstructorType = getBaseConstructorTypeOfClass(containingClassInstanceType);
-                if (containsSuperCall(node.body)) {
-                    if (baseConstructorType === nullType) {
-                        error(node, ts.Diagnostics.A_constructor_cannot_contain_a_super_call_when_its_class_extends_null);
+                var classExtendsNull = classDeclarationExtendsNull(containingClassDecl);
+                var superCall = getSuperCallInConstructor(node);
+                if (superCall) {
+                    if (classExtendsNull) {
+                        error(superCall, ts.Diagnostics.A_constructor_cannot_contain_a_super_call_when_its_class_extends_null);
                     }
                     var superCallShouldBeFirst = ts.forEach(node.parent.members, isInstancePropertyWithInitializer) ||
-                        ts.forEach(node.parameters, function (p) { return p.flags & (8 | 16 | 32); });
+                        ts.forEach(node.parameters, function (p) { return p.flags & (4 | 8 | 16); });
                     if (superCallShouldBeFirst) {
                         var statements = node.body.statements;
-                        var superCallStatement;
+                        var superCallStatement = void 0;
                         for (var _i = 0, statements_2 = statements; _i < statements_2.length; _i++) {
                             var statement = statements_2[_i];
-                            if (statement.kind === 198 && isSuperCallExpression(statement.expression)) {
+                            if (statement.kind === 201 && ts.isSuperCallExpression(statement.expression)) {
                                 superCallStatement = statement;
                                 break;
                             }
@@ -20225,12 +21729,9 @@ var ts;
                         if (!superCallStatement) {
                             error(node, ts.Diagnostics.A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties);
                         }
-                        else {
-                            markThisReferencesAsErrors(superCallStatement.expression);
-                        }
                     }
                 }
-                else if (baseConstructorType !== nullType) {
+                else if (!classExtendsNull) {
                     error(node, ts.Diagnostics.Constructors_for_derived_classes_must_contain_a_super_call);
                 }
             }
@@ -20240,9 +21741,9 @@ var ts;
                 checkGrammarFunctionLikeDeclaration(node) || checkGrammarAccessor(node) || checkGrammarComputedPropertyName(node.name);
                 checkDecorators(node);
                 checkSignatureDeclaration(node);
-                if (node.kind === 146) {
-                    if (!ts.isInAmbientContext(node) && ts.nodeIsPresent(node.body) && (node.flags & 524288)) {
-                        if (node.flags & 1048576) {
+                if (node.kind === 148) {
+                    if (!ts.isInAmbientContext(node) && ts.nodeIsPresent(node.body) && (node.flags & 32768)) {
+                        if (node.flags & 65536) {
                             if (compilerOptions.noImplicitReturns) {
                                 error(node.name, ts.Diagnostics.Not_all_code_paths_return_a_value);
                             }
@@ -20252,16 +21753,19 @@ var ts;
                         }
                     }
                 }
-                if (node.name.kind === 137) {
+                if (node.name.kind === 139) {
                     checkComputedPropertyName(node.name);
                 }
                 if (!ts.hasDynamicName(node)) {
-                    var otherKind = node.kind === 146 ? 147 : 146;
+                    var otherKind = node.kind === 148 ? 149 : 148;
                     var otherAccessor = ts.getDeclarationOfKind(node.symbol, otherKind);
                     if (otherAccessor) {
-                        if (((node.flags & 56) !== (otherAccessor.flags & 56))) {
+                        if (((node.flags & 28) !== (otherAccessor.flags & 28))) {
                             error(node.name, ts.Diagnostics.Getter_and_setter_accessors_do_not_agree_in_visibility);
                         }
+                        if (((node.flags & 128) !== (otherAccessor.flags & 128))) {
+                            error(node.name, ts.Diagnostics.Accessors_must_both_be_abstract_or_non_abstract);
+                        }
                         var currentAccessorType = getAnnotatedAccessorType(node);
                         var otherAccessorType = getAnnotatedAccessorType(otherAccessor);
                         if (currentAccessorType && otherAccessorType) {
@@ -20273,7 +21777,7 @@ var ts;
                 }
                 getTypeOfAccessors(getSymbolOfNode(node));
             }
-            if (node.parent.kind !== 168) {
+            if (node.parent.kind !== 170) {
                 checkSourceElement(node.body);
             }
             else {
@@ -20340,49 +21844,18 @@ var ts;
             ts.forEach(node.types, checkSourceElement);
         }
         function isPrivateWithinAmbient(node) {
-            return (node.flags & 16) && ts.isInAmbientContext(node);
-        }
-        function checkSpecializedSignatureDeclaration(signatureDeclarationNode) {
-            if (!produceDiagnostics) {
-                return;
-            }
-            var signature = getSignatureFromDeclaration(signatureDeclarationNode);
-            if (!signature.hasStringLiterals) {
-                return;
-            }
-            if (ts.nodeIsPresent(signatureDeclarationNode.body)) {
-                error(signatureDeclarationNode, ts.Diagnostics.A_signature_with_an_implementation_cannot_use_a_string_literal_type);
-                return;
-            }
-            var signaturesToCheck;
-            if (!signatureDeclarationNode.name && signatureDeclarationNode.parent && signatureDeclarationNode.parent.kind === 218) {
-                ts.Debug.assert(signatureDeclarationNode.kind === 148 || signatureDeclarationNode.kind === 149);
-                var signatureKind = signatureDeclarationNode.kind === 148 ? 0 : 1;
-                var containingSymbol = getSymbolOfNode(signatureDeclarationNode.parent);
-                var containingType = getDeclaredTypeOfSymbol(containingSymbol);
-                signaturesToCheck = getSignaturesOfType(containingType, signatureKind);
-            }
-            else {
-                signaturesToCheck = getSignaturesOfSymbol(getSymbolOfNode(signatureDeclarationNode));
-            }
-            for (var _i = 0, signaturesToCheck_1 = signaturesToCheck; _i < signaturesToCheck_1.length; _i++) {
-                var otherSignature = signaturesToCheck_1[_i];
-                if (!otherSignature.hasStringLiterals && isSignatureAssignableTo(signature, otherSignature, false)) {
-                    return;
-                }
-            }
-            error(signatureDeclarationNode, ts.Diagnostics.Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature);
+            return (node.flags & 8) && ts.isInAmbientContext(node);
         }
         function getEffectiveDeclarationFlags(n, flagsToCheck) {
             var flags = ts.getCombinedNodeFlags(n);
-            if (n.parent.kind !== 218 &&
-                n.parent.kind !== 217 &&
-                n.parent.kind !== 189 &&
+            if (n.parent.kind !== 221 &&
+                n.parent.kind !== 220 &&
+                n.parent.kind !== 191 &&
                 ts.isInAmbientContext(n)) {
-                if (!(flags & 4)) {
-                    flags |= 2;
+                if (!(flags & 2)) {
+                    flags |= 1;
                 }
-                flags |= 4;
+                flags |= 2;
             }
             return flags & flagsToCheck;
         }
@@ -20397,36 +21870,36 @@ var ts;
             function checkFlagAgreementBetweenOverloads(overloads, implementation, flagsToCheck, someOverloadFlags, allOverloadFlags) {
                 var someButNotAllOverloadFlags = someOverloadFlags ^ allOverloadFlags;
                 if (someButNotAllOverloadFlags !== 0) {
-                    var canonicalFlags = getEffectiveDeclarationFlags(getCanonicalOverload(overloads, implementation), flagsToCheck);
+                    var canonicalFlags_1 = getEffectiveDeclarationFlags(getCanonicalOverload(overloads, implementation), flagsToCheck);
                     ts.forEach(overloads, function (o) {
-                        var deviation = getEffectiveDeclarationFlags(o, flagsToCheck) ^ canonicalFlags;
-                        if (deviation & 2) {
-                            error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_exported_or_not_exported);
+                        var deviation = getEffectiveDeclarationFlags(o, flagsToCheck) ^ canonicalFlags_1;
+                        if (deviation & 1) {
+                            error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_exported_or_non_exported);
                         }
-                        else if (deviation & 4) {
+                        else if (deviation & 2) {
                             error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_ambient_or_non_ambient);
                         }
-                        else if (deviation & (16 | 32)) {
-                            error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_public_private_or_protected);
+                        else if (deviation & (8 | 16)) {
+                            error(o.name || o, ts.Diagnostics.Overload_signatures_must_all_be_public_private_or_protected);
                         }
                         else if (deviation & 128) {
-                            error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_abstract_or_not_abstract);
+                            error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_abstract_or_non_abstract);
                         }
                     });
                 }
             }
             function checkQuestionTokenAgreementBetweenOverloads(overloads, implementation, someHaveQuestionToken, allHaveQuestionToken) {
                 if (someHaveQuestionToken !== allHaveQuestionToken) {
-                    var canonicalHasQuestionToken = ts.hasQuestionToken(getCanonicalOverload(overloads, implementation));
+                    var canonicalHasQuestionToken_1 = ts.hasQuestionToken(getCanonicalOverload(overloads, implementation));
                     ts.forEach(overloads, function (o) {
-                        var deviation = ts.hasQuestionToken(o) !== canonicalHasQuestionToken;
+                        var deviation = ts.hasQuestionToken(o) !== canonicalHasQuestionToken_1;
                         if (deviation) {
                             error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_optional_or_required);
                         }
                     });
                 }
             }
-            var flagsToCheck = 2 | 4 | 16 | 32 | 128;
+            var flagsToCheck = 1 | 2 | 8 | 16 | 128;
             var someNodeFlags = 0;
             var allNodeFlags = flagsToCheck;
             var someHaveQuestionToken = false;
@@ -20454,10 +21927,10 @@ var ts;
                     if (subsequentNode.kind === node.kind) {
                         var errorNode_1 = subsequentNode.name || subsequentNode;
                         if (node.name && subsequentNode.name && node.name.text === subsequentNode.name.text) {
-                            var reportError = (node.kind === 144 || node.kind === 143) &&
-                                (node.flags & 64) !== (subsequentNode.flags & 64);
+                            var reportError = (node.kind === 146 || node.kind === 145) &&
+                                (node.flags & 32) !== (subsequentNode.flags & 32);
                             if (reportError) {
-                                var diagnostic = node.flags & 64 ? ts.Diagnostics.Function_overload_must_be_static : ts.Diagnostics.Function_overload_must_not_be_static;
+                                var diagnostic = node.flags & 32 ? ts.Diagnostics.Function_overload_must_be_static : ts.Diagnostics.Function_overload_must_not_be_static;
                                 error(errorNode_1, diagnostic);
                             }
                             return;
@@ -20488,11 +21961,11 @@ var ts;
                 var current = declarations_4[_i];
                 var node = current;
                 var inAmbientContext = ts.isInAmbientContext(node);
-                var inAmbientContextOrInterface = node.parent.kind === 218 || node.parent.kind === 156 || inAmbientContext;
+                var inAmbientContextOrInterface = node.parent.kind === 221 || node.parent.kind === 158 || inAmbientContext;
                 if (inAmbientContextOrInterface) {
                     previousDeclaration = undefined;
                 }
-                if (node.kind === 216 || node.kind === 144 || node.kind === 143 || node.kind === 145) {
+                if (node.kind === 219 || node.kind === 146 || node.kind === 145 || node.kind === 147) {
                     var currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
                     someNodeFlags |= currentNodeFlags;
                     allNodeFlags &= currentNodeFlags;
@@ -20543,13 +22016,11 @@ var ts;
                 if (bodyDeclaration) {
                     var signatures = getSignaturesOfSymbol(symbol);
                     var bodySignature = getSignatureFromDeclaration(bodyDeclaration);
-                    if (!bodySignature.hasStringLiterals) {
-                        for (var _a = 0, signatures_3 = signatures; _a < signatures_3.length; _a++) {
-                            var signature = signatures_3[_a];
-                            if (!signature.hasStringLiterals && !isImplementationCompatibleWithOverload(bodySignature, signature)) {
-                                error(signature.declaration, ts.Diagnostics.Overload_signature_is_not_compatible_with_function_implementation);
-                                break;
-                            }
+                    for (var _a = 0, signatures_3 = signatures; _a < signatures_3.length; _a++) {
+                        var signature = signatures_3[_a];
+                        if (!isImplementationCompatibleWithOverload(bodySignature, signature)) {
+                            error(signature.declaration, ts.Diagnostics.Overload_signature_is_not_compatible_with_function_implementation);
+                            break;
                         }
                     }
                 }
@@ -20575,8 +22046,8 @@ var ts;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var d = _a[_i];
                 var declarationSpaces = getDeclarationSpaces(d);
-                var effectiveDeclarationFlags = getEffectiveDeclarationFlags(d, 2 | 512);
-                if (effectiveDeclarationFlags & 2) {
+                var effectiveDeclarationFlags = getEffectiveDeclarationFlags(d, 1 | 512);
+                if (effectiveDeclarationFlags & 1) {
                     if (effectiveDeclarationFlags & 512) {
                         defaultExportedDeclarationSpaces |= declarationSpaces;
                     }
@@ -20605,20 +22076,20 @@ var ts;
             }
             function getDeclarationSpaces(d) {
                 switch (d.kind) {
-                    case 218:
-                        return 2097152;
                     case 221:
+                        return 2097152;
+                    case 224:
                         return ts.isAmbientModule(d) || ts.getModuleInstanceState(d) !== 0
                             ? 4194304 | 1048576
                             : 4194304;
-                    case 217:
                     case 220:
+                    case 223:
                         return 2097152 | 1048576;
-                    case 224:
-                        var result = 0;
+                    case 228:
+                        var result_1 = 0;
                         var target = resolveAlias(getSymbolOfNode(d));
-                        ts.forEach(target.declarations, function (d) { result |= getDeclarationSpaces(d); });
-                        return result;
+                        ts.forEach(target.declarations, function (d) { result_1 |= getDeclarationSpaces(d); });
+                        return result_1;
                     default:
                         return 1048576;
                 }
@@ -20690,7 +22161,7 @@ var ts;
                         return checkNonThenableType(type, location, message);
                     }
                     else {
-                        if (type.id === promisedType.id || awaitedTypeStack.indexOf(promisedType.id) >= 0) {
+                        if (type.id === promisedType.id || ts.indexOf(awaitedTypeStack, promisedType.id) >= 0) {
                             if (location) {
                                 error(location, ts.Diagnostics._0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method, symbolToString(type.symbol));
                             }
@@ -20704,7 +22175,23 @@ var ts;
                 }
             }
         }
+        function checkCorrectPromiseType(returnType, location) {
+            if (returnType === unknownType) {
+                return unknownType;
+            }
+            var globalPromiseType = getGlobalPromiseType();
+            if (globalPromiseType === emptyGenericType
+                || globalPromiseType === getTargetType(returnType)) {
+                return checkAwaitedType(returnType, location, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
+            }
+            error(location, ts.Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type);
+            return unknownType;
+        }
         function checkAsyncFunctionReturnType(node) {
+            if (languageVersion >= 2) {
+                var returnType = getTypeFromTypeNode(node.type);
+                return checkCorrectPromiseType(returnType, node.type);
+            }
             var globalPromiseConstructorLikeType = getGlobalPromiseConstructorLikeType();
             if (globalPromiseConstructorLikeType === emptyObjectType) {
                 return unknownType;
@@ -20745,22 +22232,22 @@ var ts;
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             var errorInfo;
             switch (node.parent.kind) {
-                case 217:
+                case 220:
                     var classSymbol = getSymbolOfNode(node.parent);
                     var classConstructorType = getTypeOfSymbol(classSymbol);
                     expectedReturnType = getUnionType([classConstructorType, voidType]);
                     break;
-                case 139:
+                case 141:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any);
                     break;
-                case 142:
+                case 144:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.The_return_type_of_a_property_decorator_function_must_be_either_void_or_any);
                     break;
-                case 144:
                 case 146:
-                case 147:
+                case 148:
+                case 149:
                     var methodType = getTypeOfNode(node.parent);
                     var descriptorType = createTypedPropertyDescriptorType(methodType);
                     expectedReturnType = getUnionType([descriptorType, voidType]);
@@ -20769,9 +22256,9 @@ var ts;
             checkTypeAssignableTo(returnType, expectedReturnType, node, headMessage, errorInfo);
         }
         function checkTypeNodeAsExpression(node) {
-            if (node && node.kind === 152) {
+            if (node && node.kind === 154) {
                 var root = getFirstIdentifier(node.typeName);
-                var meaning = root.parent.kind === 152 ? 793056 : 1536;
+                var meaning = root.parent.kind === 154 ? 793056 : 1536;
                 var rootSymbol = resolveName(root, root.text, meaning | 8388608, undefined, undefined);
                 if (rootSymbol && rootSymbol.flags & 8388608) {
                     var aliasTarget = resolveAlias(rootSymbol);
@@ -20801,24 +22288,24 @@ var ts;
                 return;
             }
             if (!compilerOptions.experimentalDecorators) {
-                error(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Specify_experimentalDecorators_to_remove_this_warning);
+                error(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning);
             }
             if (compilerOptions.emitDecoratorMetadata) {
                 switch (node.kind) {
-                    case 217:
+                    case 220:
                         var constructor = ts.getFirstConstructorWithBody(node);
                         if (constructor) {
                             checkParameterTypeAnnotationsAsExpressions(constructor);
                         }
                         break;
-                    case 144:
                     case 146:
-                    case 147:
+                    case 148:
+                    case 149:
                         checkParameterTypeAnnotationsAsExpressions(node);
                         checkReturnTypeAnnotationAsExpression(node);
                         break;
-                    case 142:
-                    case 139:
+                    case 144:
+                    case 141:
                         checkTypeAnnotationAsExpression(node);
                         break;
                 }
@@ -20831,13 +22318,14 @@ var ts;
                 checkCollisionWithCapturedSuperVariable(node, node.name);
                 checkCollisionWithCapturedThisVariable(node, node.name);
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+                checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             }
         }
         function checkFunctionOrMethodDeclaration(node) {
             checkDecorators(node);
             checkSignatureDeclaration(node);
             var isAsync = ts.isAsyncFunctionLike(node);
-            if (node.name && node.name.kind === 137) {
+            if (node.name && node.name.kind === 139) {
                 checkComputedPropertyName(node.name);
             }
             if (!ts.hasDynamicName(node)) {
@@ -20869,7 +22357,7 @@ var ts;
             }
         }
         function checkBlock(node) {
-            if (node.kind === 195) {
+            if (node.kind === 198) {
                 checkGrammarStatementInAmbientContext(node);
             }
             ts.forEach(node.statements, checkSourceElement);
@@ -20888,19 +22376,19 @@ var ts;
             if (!(identifier && identifier.text === name)) {
                 return false;
             }
-            if (node.kind === 142 ||
-                node.kind === 141 ||
-                node.kind === 144 ||
+            if (node.kind === 144 ||
                 node.kind === 143 ||
                 node.kind === 146 ||
-                node.kind === 147) {
+                node.kind === 145 ||
+                node.kind === 148 ||
+                node.kind === 149) {
                 return false;
             }
             if (ts.isInAmbientContext(node)) {
                 return false;
             }
             var root = ts.getRootDeclaration(node);
-            if (root.kind === 139 && ts.nodeIsMissing(root.parent.body)) {
+            if (root.kind === 141 && ts.nodeIsMissing(root.parent.body)) {
                 return false;
             }
             return true;
@@ -20948,19 +22436,31 @@ var ts;
             if (!needCollisionCheckForIdentifier(node, name, "require") && !needCollisionCheckForIdentifier(node, name, "exports")) {
                 return;
             }
-            if (node.kind === 221 && ts.getModuleInstanceState(node) !== 1) {
+            if (node.kind === 224 && ts.getModuleInstanceState(node) !== 1) {
                 return;
             }
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 251 && ts.isExternalOrCommonJsModule(parent)) {
+            if (parent.kind === 255 && ts.isExternalOrCommonJsModule(parent)) {
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
         }
-        function checkVarDeclaredNamesNotShadowed(node) {
-            if ((ts.getCombinedNodeFlags(node) & 24576) !== 0 || ts.isParameterDeclaration(node)) {
+        function checkCollisionWithGlobalPromiseInGeneratedCode(node, name) {
+            if (!needCollisionCheckForIdentifier(node, name, "Promise")) {
                 return;
             }
-            if (node.kind === 214 && !node.initializer) {
+            if (node.kind === 224 && ts.getModuleInstanceState(node) !== 1) {
+                return;
+            }
+            var parent = getDeclarationContainer(node);
+            if (parent.kind === 255 && ts.isExternalOrCommonJsModule(parent) && parent.flags & 2097152) {
+                error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_functions, ts.declarationNameToString(name), ts.declarationNameToString(name));
+            }
+        }
+        function checkVarDeclaredNamesNotShadowed(node) {
+            if ((ts.getCombinedNodeFlags(node) & 3072) !== 0 || ts.isParameterDeclaration(node)) {
+                return;
+            }
+            if (node.kind === 217 && !node.initializer) {
                 return;
             }
             var symbol = getSymbolOfNode(node);
@@ -20969,16 +22469,16 @@ var ts;
                 if (localDeclarationSymbol &&
                     localDeclarationSymbol !== symbol &&
                     localDeclarationSymbol.flags & 2) {
-                    if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 24576) {
-                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 215);
-                        var container = varDeclList.parent.kind === 196 && varDeclList.parent.parent
+                    if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 3072) {
+                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 218);
+                        var container = varDeclList.parent.kind === 199 && varDeclList.parent.parent
                             ? varDeclList.parent.parent
                             : undefined;
                         var namesShareScope = container &&
-                            (container.kind === 195 && ts.isFunctionLike(container.parent) ||
-                                container.kind === 222 ||
-                                container.kind === 221 ||
-                                container.kind === 251);
+                            (container.kind === 198 && ts.isFunctionLike(container.parent) ||
+                                container.kind === 225 ||
+                                container.kind === 224 ||
+                                container.kind === 255);
                         if (!namesShareScope) {
                             var name_16 = symbolToString(localDeclarationSymbol);
                             error(node, ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name_16, name_16);
@@ -20988,7 +22488,7 @@ var ts;
             }
         }
         function checkParameterInitializer(node) {
-            if (ts.getRootDeclaration(node).kind !== 139) {
+            if (ts.getRootDeclaration(node).kind !== 141) {
                 return;
             }
             var func = ts.getContainingFunction(node);
@@ -20997,7 +22497,7 @@ var ts;
                 if (n.kind === 69) {
                     var referencedSymbol = getNodeLinks(n).resolvedSymbol;
                     if (referencedSymbol && referencedSymbol !== unknownSymbol && getSymbol(func.locals, referencedSymbol.name, 107455) === referencedSymbol) {
-                        if (referencedSymbol.valueDeclaration.kind === 139) {
+                        if (referencedSymbol.valueDeclaration.kind === 141) {
                             if (referencedSymbol.valueDeclaration === node) {
                                 error(n, ts.Diagnostics.Parameter_0_cannot_be_referenced_in_its_initializer, ts.declarationNameToString(node.name));
                                 return;
@@ -21017,26 +22517,33 @@ var ts;
         function checkVariableLikeDeclaration(node) {
             checkDecorators(node);
             checkSourceElement(node.type);
-            if (node.name.kind === 137) {
+            if (node.name.kind === 139) {
                 checkComputedPropertyName(node.name);
                 if (node.initializer) {
                     checkExpressionCached(node.initializer);
                 }
             }
-            if (node.kind === 166) {
-                if (node.propertyName && node.propertyName.kind === 137) {
+            if (node.kind === 168) {
+                if (node.propertyName && node.propertyName.kind === 139) {
                     checkComputedPropertyName(node.propertyName);
                 }
+                var parent_9 = node.parent.parent;
+                var parentType = getTypeForBindingElementParent(parent_9);
+                var name_17 = node.propertyName || node.name;
+                var property = getPropertyOfType(parentType, getTextOfPropertyName(name_17));
+                if (parent_9.initializer && property && getParentOfSymbol(property)) {
+                    checkClassPropertyAccess(parent_9, parent_9.initializer, parentType, property);
+                }
             }
             if (ts.isBindingPattern(node.name)) {
                 ts.forEach(node.name.elements, checkSourceElement);
             }
-            if (node.initializer && ts.getRootDeclaration(node).kind === 139 && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
+            if (node.initializer && ts.getRootDeclaration(node).kind === 141 && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
                 error(node, ts.Diagnostics.A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation);
                 return;
             }
             if (ts.isBindingPattern(node.name)) {
-                if (node.initializer && node.parent.parent.kind !== 203) {
+                if (node.initializer && node.parent.parent.kind !== 206) {
                     checkTypeAssignableTo(checkExpressionCached(node.initializer), getWidenedTypeForVariableLikeDeclaration(node), node, undefined);
                     checkParameterInitializer(node);
                 }
@@ -21045,7 +22552,7 @@ var ts;
             var symbol = getSymbolOfNode(node);
             var type = getTypeOfVariableOrParameterOrProperty(symbol);
             if (node === symbol.valueDeclaration) {
-                if (node.initializer && node.parent.parent.kind !== 203) {
+                if (node.initializer && node.parent.parent.kind !== 206) {
                     checkTypeAssignableTo(checkExpressionCached(node.initializer), type, node, undefined);
                     checkParameterInitializer(node);
                 }
@@ -21059,14 +22566,15 @@ var ts;
                     checkTypeAssignableTo(checkExpressionCached(node.initializer), declarationType, node, undefined);
                 }
             }
-            if (node.kind !== 142 && node.kind !== 141) {
+            if (node.kind !== 144 && node.kind !== 143) {
                 checkExportsOnMergedDeclarations(node);
-                if (node.kind === 214 || node.kind === 166) {
+                if (node.kind === 217 || node.kind === 168) {
                     checkVarDeclaredNamesNotShadowed(node);
                 }
                 checkCollisionWithCapturedSuperVariable(node, node.name);
                 checkCollisionWithCapturedThisVariable(node, node.name);
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+                checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             }
         }
         function checkVariableDeclaration(node) {
@@ -21082,7 +22590,7 @@ var ts;
             ts.forEach(node.declarationList.declarations, checkSourceElement);
         }
         function checkGrammarDisallowedModifiersOnObjectLiteralExpressionMethod(node) {
-            if (node.modifiers && node.parent.kind === 168) {
+            if (node.modifiers && node.parent.kind === 170) {
                 if (ts.isAsyncFunctionLike(node)) {
                     if (node.modifiers.length > 1) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
@@ -21101,7 +22609,7 @@ var ts;
             checkGrammarStatementInAmbientContext(node);
             checkExpression(node.expression);
             checkSourceElement(node.thenStatement);
-            if (node.thenStatement.kind === 197) {
+            if (node.thenStatement.kind === 200) {
                 error(node.thenStatement, ts.Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement);
             }
             checkSourceElement(node.elseStatement);
@@ -21118,12 +22626,12 @@ var ts;
         }
         function checkForStatement(node) {
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.initializer && node.initializer.kind === 215) {
+                if (node.initializer && node.initializer.kind === 218) {
                     checkGrammarVariableDeclarationList(node.initializer);
                 }
             }
             if (node.initializer) {
-                if (node.initializer.kind === 215) {
+                if (node.initializer.kind === 218) {
                     ts.forEach(node.initializer.declarations, checkVariableDeclaration);
                 }
                 else {
@@ -21138,18 +22646,18 @@ var ts;
         }
         function checkForOfStatement(node) {
             checkGrammarForInOrForOfStatement(node);
-            if (node.initializer.kind === 215) {
+            if (node.initializer.kind === 218) {
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
                 var varExpr = node.initializer;
                 var iteratedType = checkRightHandSideOfForOf(node.expression);
-                if (varExpr.kind === 167 || varExpr.kind === 168) {
+                if (varExpr.kind === 169 || varExpr.kind === 170) {
                     checkDestructuringAssignment(varExpr, iteratedType || unknownType);
                 }
                 else {
                     var leftType = checkExpression(varExpr);
-                    checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_of_statement, ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant);
+                    checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_of_statement, ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property);
                     if (iteratedType) {
                         checkTypeAssignableTo(iteratedType, leftType, varExpr, undefined);
                     }
@@ -21159,7 +22667,7 @@ var ts;
         }
         function checkForInStatement(node) {
             checkGrammarForInOrForOfStatement(node);
-            if (node.initializer.kind === 215) {
+            if (node.initializer.kind === 218) {
                 var variable = node.initializer.declarations[0];
                 if (variable && ts.isBindingPattern(variable.name)) {
                     error(variable.name, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
@@ -21169,17 +22677,17 @@ var ts;
             else {
                 var varExpr = node.initializer;
                 var leftType = checkExpression(varExpr);
-                if (varExpr.kind === 167 || varExpr.kind === 168) {
+                if (varExpr.kind === 169 || varExpr.kind === 170) {
                     error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
                 }
                 else if (!isTypeAnyOrAllConstituentTypesHaveKind(leftType, 258)) {
                     error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any);
                 }
                 else {
-                    checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_in_statement, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant);
+                    checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_in_statement, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property);
                 }
             }
-            var rightType = checkExpression(node.expression);
+            var rightType = checkNonNullExpression(node.expression);
             if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 80896 | 512)) {
                 error(node.expression, ts.Diagnostics.The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter);
             }
@@ -21193,7 +22701,7 @@ var ts;
             }
         }
         function checkRightHandSideOfForOf(rhsExpression) {
-            var expressionType = getTypeOfExpression(rhsExpression);
+            var expressionType = checkNonNullExpression(rhsExpression);
             return checkIteratedTypeOrElementType(expressionType, rhsExpression, true);
         }
         function checkIteratedTypeOrElementType(inputType, errorNode, allowStringInput) {
@@ -21228,7 +22736,7 @@ var ts;
             }
             var typeAsIterable = type;
             if (!typeAsIterable.iterableElementType) {
-                if ((type.flags & 4096) && type.target === globalIterableType) {
+                if ((type.flags & 4096) && type.target === getGlobalIterableType()) {
                     typeAsIterable.iterableElementType = type.typeArguments[0];
                 }
                 else {
@@ -21254,7 +22762,7 @@ var ts;
             }
             var typeAsIterator = type;
             if (!typeAsIterator.iteratorElementType) {
-                if ((type.flags & 4096) && type.target === globalIteratorType) {
+                if ((type.flags & 4096) && type.target === getGlobalIteratorType()) {
                     typeAsIterator.iteratorElementType = type.typeArguments[0];
                 }
                 else {
@@ -21289,7 +22797,7 @@ var ts;
             if (isTypeAny(type)) {
                 return undefined;
             }
-            if ((type.flags & 4096) && type.target === globalIterableIteratorType) {
+            if ((type.flags & 4096) && type.target === getGlobalIterableIteratorType()) {
                 return type.typeArguments[0];
             }
             return getElementTypeOfIterable(type, undefined) ||
@@ -21336,8 +22844,12 @@ var ts;
         function checkBreakOrContinueStatement(node) {
             checkGrammarStatementInAmbientContext(node) || checkGrammarBreakOrContinueStatement(node);
         }
-        function isGetAccessorWithAnnotatatedSetAccessor(node) {
-            return !!(node.kind === 146 && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(node.symbol, 147)));
+        function isGetAccessorWithAnnotatedSetAccessor(node) {
+            return !!(node.kind === 148 && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(node.symbol, 149)));
+        }
+        function isUnwrappedReturnTypeVoidOrAny(func, returnType) {
+            var unwrappedReturnType = ts.isAsyncFunctionLike(func) ? getPromisedType(returnType) : returnType;
+            return maybeTypeOfKind(unwrappedReturnType, 16 | 1);
         }
         function checkReturnStatement(node) {
             if (!checkGrammarStatementInAmbientContext(node)) {
@@ -21346,41 +22858,46 @@ var ts;
                     grammarErrorOnFirstToken(node, ts.Diagnostics.A_return_statement_can_only_be_used_within_a_function_body);
                 }
             }
-            if (node.expression) {
-                var func = ts.getContainingFunction(node);
-                if (func) {
-                    var signature = getSignatureFromDeclaration(func);
-                    var returnType = getReturnTypeOfSignature(signature);
-                    var exprType = checkExpressionCached(node.expression);
+            var func = ts.getContainingFunction(node);
+            if (func) {
+                var signature = getSignatureFromDeclaration(func);
+                var returnType = getReturnTypeOfSignature(signature);
+                if (strictNullChecks || node.expression) {
+                    var exprType = node.expression ? checkExpressionCached(node.expression) : undefinedType;
                     if (func.asteriskToken) {
                         return;
                     }
-                    if (func.kind === 147) {
-                        error(node.expression, ts.Diagnostics.Setters_cannot_return_a_value);
+                    if (func.kind === 149) {
+                        if (node.expression) {
+                            error(node.expression, ts.Diagnostics.Setters_cannot_return_a_value);
+                        }
                     }
-                    else if (func.kind === 145) {
-                        if (!checkTypeAssignableTo(exprType, returnType, node.expression)) {
+                    else if (func.kind === 147) {
+                        if (node.expression && !checkTypeAssignableTo(exprType, returnType, node.expression)) {
                             error(node.expression, ts.Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
                         }
                     }
-                    else if (func.type || isGetAccessorWithAnnotatatedSetAccessor(func) || returnType.flags & 134217728) {
+                    else if (func.type || isGetAccessorWithAnnotatedSetAccessor(func)) {
                         if (ts.isAsyncFunctionLike(func)) {
                             var promisedType = getPromisedType(returnType);
-                            var awaitedType = checkAwaitedType(exprType, node.expression, ts.Diagnostics.Return_expression_in_async_function_does_not_have_a_valid_callable_then_member);
+                            var awaitedType = checkAwaitedType(exprType, node.expression || node, ts.Diagnostics.Return_expression_in_async_function_does_not_have_a_valid_callable_then_member);
                             if (promisedType) {
-                                checkTypeAssignableTo(awaitedType, promisedType, node.expression);
+                                checkTypeAssignableTo(awaitedType, promisedType, node.expression || node);
                             }
                         }
                         else {
-                            checkTypeAssignableTo(exprType, returnType, node.expression);
+                            checkTypeAssignableTo(exprType, returnType, node.expression || node);
                         }
                     }
                 }
+                else if (func.kind !== 147 && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType)) {
+                    error(node, ts.Diagnostics.Not_all_code_paths_return_a_value);
+                }
             }
         }
         function checkWithStatement(node) {
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.parserContextFlags & 8) {
+                if (node.flags & 33554432) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_an_async_function_block);
                 }
             }
@@ -21392,9 +22909,8 @@ var ts;
             var firstDefaultClause;
             var hasDuplicateDefaultClause = false;
             var expressionType = checkExpression(node.expression);
-            var expressionTypeIsStringLike = someConstituentTypeHasKind(expressionType, 258);
             ts.forEach(node.caseBlock.clauses, function (clause) {
-                if (clause.kind === 245 && !hasDuplicateDefaultClause) {
+                if (clause.kind === 249 && !hasDuplicateDefaultClause) {
                     if (firstDefaultClause === undefined) {
                         firstDefaultClause = clause;
                     }
@@ -21406,13 +22922,11 @@ var ts;
                         hasDuplicateDefaultClause = true;
                     }
                 }
-                if (produceDiagnostics && clause.kind === 244) {
+                if (produceDiagnostics && clause.kind === 248) {
                     var caseClause = clause;
                     var caseType = checkExpression(caseClause.expression);
-                    var expressionTypeIsAssignableToCaseType = (expressionTypeIsStringLike && someConstituentTypeHasKind(caseType, 258)) ||
-                        isTypeAssignableTo(expressionType, caseType);
-                    if (!expressionTypeIsAssignableToCaseType) {
-                        checkTypeAssignableTo(caseType, expressionType, caseClause.expression, undefined);
+                    if (!isTypeComparableTo(expressionType, caseType)) {
+                        checkTypeComparableTo(caseType, expressionType, caseClause.expression, undefined);
                     }
                 }
                 ts.forEach(clause.statements, checkSourceElement);
@@ -21425,7 +22939,7 @@ var ts;
                     if (ts.isFunctionLike(current)) {
                         break;
                     }
-                    if (current.kind === 210 && current.label.text === node.label.text) {
+                    if (current.kind === 213 && current.label.text === node.label.text) {
                         var sourceFile = ts.getSourceFileOfNode(node);
                         grammarErrorOnNode(node.label, ts.Diagnostics.Duplicate_label_0, ts.getTextOfNodeFromSourceText(sourceFile.text, node.label));
                         break;
@@ -21492,7 +23006,7 @@ var ts;
                     var classDeclaration = type.symbol.valueDeclaration;
                     for (var _i = 0, _a = classDeclaration.members; _i < _a.length; _i++) {
                         var member = _a[_i];
-                        if (!(member.flags & 64) && ts.hasDynamicName(member)) {
+                        if (!(member.flags & 32) && ts.hasDynamicName(member)) {
                             var propType = getTypeOfSymbol(member.symbol);
                             checkIndexConstraintForProperty(member.symbol, propType, type, declaredStringIndexer, stringIndexType, 0);
                             checkIndexConstraintForProperty(member.symbol, propType, type, declaredNumberIndexer, numberIndexType, 1);
@@ -21519,7 +23033,7 @@ var ts;
                     return;
                 }
                 var errorNode;
-                if (prop.valueDeclaration.name.kind === 137 || prop.parent === containingType.symbol) {
+                if (prop.valueDeclaration.name.kind === 139 || prop.parent === containingType.symbol) {
                     errorNode = prop.valueDeclaration;
                 }
                 else if (indexDeclaration) {
@@ -21563,6 +23077,23 @@ var ts;
                 }
             }
         }
+        function checkTypeParameterListsIdentical(node, symbol) {
+            if (symbol.declarations.length === 1) {
+                return;
+            }
+            var firstDecl;
+            for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                var declaration = _a[_i];
+                if (declaration.kind === 220 || declaration.kind === 221) {
+                    if (!firstDecl) {
+                        firstDecl = declaration;
+                    }
+                    else if (!areTypeParametersIdentical(firstDecl.typeParameters, node.typeParameters)) {
+                        error(node.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_type_parameters, node.name.text);
+                    }
+                }
+            }
+        }
         function checkClassExpression(node) {
             checkClassLikeDeclaration(node);
             checkNodeDeferred(node);
@@ -21585,6 +23116,7 @@ var ts;
                 checkTypeNameIsReserved(node.name, ts.Diagnostics.Class_name_cannot_be_0);
                 checkCollisionWithCapturedThisVariable(node, node.name);
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+                checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             }
             checkTypeParameters(node.typeParameters);
             checkExportsOnMergedDeclarations(node);
@@ -21592,12 +23124,14 @@ var ts;
             var type = getDeclaredTypeOfSymbol(symbol);
             var typeWithThis = getTypeWithThisArgument(type);
             var staticType = getTypeOfSymbol(symbol);
+            checkTypeParameterListsIdentical(node, symbol);
             var baseTypeNode = ts.getClassExtendsHeritageClauseElement(node);
             if (baseTypeNode) {
                 var baseTypes = getBaseTypes(type);
                 if (baseTypes.length && produceDiagnostics) {
-                    var baseType = baseTypes[0];
+                    var baseType_1 = baseTypes[0];
                     var staticBaseType = getBaseConstructorTypeOfClass(type);
+                    checkBaseTypeAccessibility(staticBaseType, baseTypeNode);
                     checkSourceElement(baseTypeNode.expression);
                     if (baseTypeNode.typeArguments) {
                         ts.forEach(baseTypeNode.typeArguments, checkSourceElement);
@@ -21608,15 +23142,15 @@ var ts;
                             }
                         }
                     }
-                    checkTypeAssignableTo(typeWithThis, getTypeWithThisArgument(baseType, type.thisType), node.name || node, ts.Diagnostics.Class_0_incorrectly_extends_base_class_1);
+                    checkTypeAssignableTo(typeWithThis, getTypeWithThisArgument(baseType_1, type.thisType), node.name || node, ts.Diagnostics.Class_0_incorrectly_extends_base_class_1);
                     checkTypeAssignableTo(staticType, getTypeWithoutSignatures(staticBaseType), node.name || node, ts.Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1);
                     if (!(staticBaseType.symbol && staticBaseType.symbol.flags & 32)) {
                         var constructors = getInstantiatedConstructorsForTypeArguments(staticBaseType, baseTypeNode.typeArguments);
-                        if (ts.forEach(constructors, function (sig) { return getReturnTypeOfSignature(sig) !== baseType; })) {
+                        if (ts.forEach(constructors, function (sig) { return getReturnTypeOfSignature(sig) !== baseType_1; })) {
                             error(baseTypeNode.expression, ts.Diagnostics.Base_constructors_must_all_have_the_same_return_type);
                         }
                     }
-                    checkKindsOfPropertyMemberOverrides(type, baseType);
+                    checkKindsOfPropertyMemberOverrides(type, baseType_1);
                 }
             }
             var implementedTypeNodes = ts.getClassImplementsHeritageClauseElements(node);
@@ -21646,6 +23180,18 @@ var ts;
                 checkTypeForDuplicateIndexSignatures(node);
             }
         }
+        function checkBaseTypeAccessibility(type, node) {
+            var signatures = getSignaturesOfType(type, 1);
+            if (signatures.length) {
+                var declaration = signatures[0].declaration;
+                if (declaration && declaration.flags & 8) {
+                    var typeClassDeclaration = getClassLikeDeclarationOfSymbol(type.symbol);
+                    if (!isNodeWithinClass(node, typeClassDeclaration)) {
+                        error(node, ts.Diagnostics.Cannot_extend_a_class_0_Class_constructor_is_marked_as_private, node.expression.text);
+                    }
+                }
+            }
+        }
         function getTargetSymbol(s) {
             return s.flags & 16777216 ? getSymbolLinks(s).target : s;
         }
@@ -21667,7 +23213,7 @@ var ts;
                     if (derived === base) {
                         var derivedClassDecl = getClassLikeDeclarationOfSymbol(type.symbol);
                         if (baseDeclarationFlags & 128 && (!derivedClassDecl || !(derivedClassDecl.flags & 128))) {
-                            if (derivedClassDecl.kind === 189) {
+                            if (derivedClassDecl.kind === 191) {
                                 error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, symbolToString(baseProperty), typeToString(baseType));
                             }
                             else {
@@ -21677,10 +23223,10 @@ var ts;
                     }
                     else {
                         var derivedDeclarationFlags = getDeclarationFlagsFromSymbol(derived);
-                        if ((baseDeclarationFlags & 16) || (derivedDeclarationFlags & 16)) {
+                        if ((baseDeclarationFlags & 8) || (derivedDeclarationFlags & 8)) {
                             continue;
                         }
-                        if ((baseDeclarationFlags & 64) !== (derivedDeclarationFlags & 64)) {
+                        if ((baseDeclarationFlags & 32) !== (derivedDeclarationFlags & 32)) {
                             continue;
                         }
                         if ((base.flags & derived.flags & 8192) || ((base.flags & 98308) && (derived.flags & 98308))) {
@@ -21711,7 +23257,7 @@ var ts;
             }
         }
         function isAccessor(kind) {
-            return kind === 146 || kind === 147;
+            return kind === 148 || kind === 149;
         }
         function areTypeParametersIdentical(list1, list2) {
             if (!list1 && !list2) {
@@ -21777,12 +23323,8 @@ var ts;
                 checkTypeNameIsReserved(node.name, ts.Diagnostics.Interface_name_cannot_be_0);
                 checkExportsOnMergedDeclarations(node);
                 var symbol = getSymbolOfNode(node);
-                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 218);
-                if (symbol.declarations.length > 1) {
-                    if (node !== firstInterfaceDecl && !areTypeParametersIdentical(firstInterfaceDecl.typeParameters, node.typeParameters)) {
-                        error(node.name, ts.Diagnostics.All_declarations_of_an_interface_must_have_identical_type_parameters);
-                    }
-                }
+                checkTypeParameterListsIdentical(node, symbol);
+                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 221);
                 if (node === firstInterfaceDecl) {
                     var type = getDeclaredTypeOfSymbol(symbol);
                     var typeWithThis = getTypeWithThisArgument(type);
@@ -21813,7 +23355,7 @@ var ts;
         }
         function computeEnumMemberValues(node) {
             var nodeLinks = getNodeLinks(node);
-            if (!(nodeLinks.flags & 8192)) {
+            if (!(nodeLinks.flags & 16384)) {
                 var enumSymbol = getSymbolOfNode(node);
                 var enumType = getDeclaredTypeOfSymbol(enumSymbol);
                 var autoValue = 0;
@@ -21846,7 +23388,7 @@ var ts;
                         autoValue++;
                     }
                 }
-                nodeLinks.flags |= 8192;
+                nodeLinks.flags |= 16384;
             }
             function computeConstantValueForEnumMemberInitializer(initializer, enumType, enumIsConst, ambient) {
                 var reportError = true;
@@ -21875,7 +23417,7 @@ var ts;
                 return value;
                 function evalConstant(e) {
                     switch (e.kind) {
-                        case 182:
+                        case 184:
                             var value_1 = evalConstant(e.operand);
                             if (value_1 === undefined) {
                                 return undefined;
@@ -21886,7 +23428,7 @@ var ts;
                                 case 50: return ~value_1;
                             }
                             return undefined;
-                        case 184:
+                        case 186:
                             var left = evalConstant(e.left);
                             if (left === undefined) {
                                 return undefined;
@@ -21911,22 +23453,22 @@ var ts;
                             return undefined;
                         case 8:
                             return +e.text;
-                        case 175:
+                        case 177:
                             return evalConstant(e.expression);
                         case 69:
-                        case 170:
-                        case 169:
+                        case 172:
+                        case 171:
                             var member = initializer.parent;
                             var currentType = getTypeOfSymbol(getSymbolOfNode(member.parent));
                             var enumType_1;
-                            var propertyName;
+                            var propertyName = void 0;
                             if (e.kind === 69) {
                                 enumType_1 = currentType;
                                 propertyName = e.text;
                             }
                             else {
-                                var expression;
-                                if (e.kind === 170) {
+                                var expression = void 0;
+                                if (e.kind === 172) {
                                     if (e.argumentExpression === undefined ||
                                         e.argumentExpression.kind !== 9) {
                                         return undefined;
@@ -21943,7 +23485,7 @@ var ts;
                                     if (current.kind === 69) {
                                         break;
                                     }
-                                    else if (current.kind === 169) {
+                                    else if (current.kind === 171) {
                                         current = current.expression;
                                     }
                                     else {
@@ -21984,6 +23526,7 @@ var ts;
             checkTypeNameIsReserved(node.name, ts.Diagnostics.Enum_name_cannot_be_0);
             checkCollisionWithCapturedThisVariable(node, node.name);
             checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+            checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             checkExportsOnMergedDeclarations(node);
             computeEnumMemberValues(node);
             var enumIsConst = ts.isConst(node);
@@ -22000,9 +23543,9 @@ var ts;
                         }
                     });
                 }
-                var seenEnumMissingInitialInitializer = false;
+                var seenEnumMissingInitialInitializer_1 = false;
                 ts.forEach(enumSymbol.declarations, function (declaration) {
-                    if (declaration.kind !== 220) {
+                    if (declaration.kind !== 223) {
                         return false;
                     }
                     var enumDeclaration = declaration;
@@ -22011,11 +23554,11 @@ var ts;
                     }
                     var firstEnumMember = enumDeclaration.members[0];
                     if (!firstEnumMember.initializer) {
-                        if (seenEnumMissingInitialInitializer) {
+                        if (seenEnumMissingInitialInitializer_1) {
                             error(firstEnumMember.name, ts.Diagnostics.In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element);
                         }
                         else {
-                            seenEnumMissingInitialInitializer = true;
+                            seenEnumMissingInitialInitializer_1 = true;
                         }
                     }
                 });
@@ -22025,8 +23568,8 @@ var ts;
             var declarations = symbol.declarations;
             for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
                 var declaration = declarations_5[_i];
-                if ((declaration.kind === 217 ||
-                    (declaration.kind === 216 && ts.nodeIsPresent(declaration.body))) &&
+                if ((declaration.kind === 220 ||
+                    (declaration.kind === 219 && ts.nodeIsPresent(declaration.body))) &&
                     !ts.isInAmbientContext(declaration)) {
                     return declaration;
                 }
@@ -22067,6 +23610,7 @@ var ts;
                 }
                 checkCollisionWithCapturedThisVariable(node, node.name);
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+                checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
                 checkExportsOnMergedDeclarations(node);
                 var symbol = getSymbolOfNode(node);
                 if (symbol.flags & 512
@@ -22082,7 +23626,7 @@ var ts;
                             error(node.name, ts.Diagnostics.A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged);
                         }
                     }
-                    var mergedClass = ts.getDeclarationOfKind(symbol, 217);
+                    var mergedClass = ts.getDeclarationOfKind(symbol, 220);
                     if (mergedClass &&
                         inSameLexicalScope(node, mergedClass)) {
                         getNodeLinks(node).flags |= 32768;
@@ -22120,40 +23664,40 @@ var ts;
         }
         function checkModuleAugmentationElement(node, isGlobalAugmentation) {
             switch (node.kind) {
-                case 196:
+                case 199:
                     for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
                         checkModuleAugmentationElement(decl, isGlobalAugmentation);
                     }
                     break;
-                case 230:
-                case 231:
+                case 234:
+                case 235:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Exports_and_export_assignments_are_not_permitted_in_module_augmentations);
                     break;
-                case 224:
+                case 228:
                     if (node.moduleReference.kind !== 9) {
                         error(node.name, ts.Diagnostics.Module_augmentation_cannot_introduce_new_names_in_the_top_level_scope);
                         break;
                     }
-                case 225:
+                case 229:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module);
                     break;
-                case 166:
-                case 214:
-                    var name_17 = node.name;
-                    if (ts.isBindingPattern(name_17)) {
-                        for (var _b = 0, _c = name_17.elements; _b < _c.length; _b++) {
+                case 168:
+                case 217:
+                    var name_18 = node.name;
+                    if (ts.isBindingPattern(name_18)) {
+                        for (var _b = 0, _c = name_18.elements; _b < _c.length; _b++) {
                             var el = _c[_b];
                             checkModuleAugmentationElement(el, isGlobalAugmentation);
                         }
                         break;
                     }
-                case 217:
                 case 220:
-                case 216:
-                case 218:
-                case 221:
+                case 223:
                 case 219:
+                case 221:
+                case 224:
+                case 222:
                     var symbol = getSymbolOfNode(node);
                     if (symbol) {
                         var reportError = !(symbol.flags & 33554432);
@@ -22162,7 +23706,7 @@ var ts;
                                 reportError = symbol.parent !== undefined;
                             }
                             else {
-                                reportError = ts.isExternalModuleAugmentation(symbol.parent.valueDeclaration);
+                                reportError = ts.isExternalModuleAugmentation(symbol.parent.declarations[0]);
                             }
                         }
                         if (reportError) {
@@ -22174,10 +23718,10 @@ var ts;
         }
         function getFirstIdentifier(node) {
             while (true) {
-                if (node.kind === 136) {
+                if (node.kind === 138) {
                     node = node.left;
                 }
-                else if (node.kind === 169) {
+                else if (node.kind === 171) {
                     node = node.expression;
                 }
                 else {
@@ -22193,9 +23737,9 @@ var ts;
                 error(moduleName, ts.Diagnostics.String_literal_expected);
                 return false;
             }
-            var inAmbientExternalModule = node.parent.kind === 222 && ts.isAmbientModule(node.parent.parent);
-            if (node.parent.kind !== 251 && !inAmbientExternalModule) {
-                error(moduleName, node.kind === 231 ?
+            var inAmbientExternalModule = node.parent.kind === 225 && ts.isAmbientModule(node.parent.parent);
+            if (node.parent.kind !== 255 && !inAmbientExternalModule) {
+                error(moduleName, node.kind === 235 ?
                     ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace :
                     ts.Diagnostics.Import_declarations_in_a_namespace_cannot_reference_a_module);
                 return false;
@@ -22212,11 +23756,11 @@ var ts;
             var symbol = getSymbolOfNode(node);
             var target = resolveAlias(symbol);
             if (target !== unknownSymbol) {
-                var excludedMeanings = (symbol.flags & 107455 ? 107455 : 0) |
+                var excludedMeanings = (symbol.flags & (107455 | 1048576) ? 107455 : 0) |
                     (symbol.flags & 793056 ? 793056 : 0) |
                     (symbol.flags & 1536 ? 1536 : 0);
                 if (target.flags & excludedMeanings) {
-                    var message = node.kind === 233 ?
+                    var message = node.kind === 237 ?
                         ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 :
                         ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0;
                     error(node, message, symbolToString(symbol));
@@ -22226,13 +23770,14 @@ var ts;
         function checkImportBinding(node) {
             checkCollisionWithCapturedThisVariable(node, node.name);
             checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+            checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             checkAliasSymbol(node);
         }
         function checkImportDeclaration(node) {
             if (checkGrammarModuleElementContext(node, ts.Diagnostics.An_import_declaration_can_only_be_used_in_a_namespace_or_module)) {
                 return;
             }
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 1022)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 959)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_import_declaration_cannot_have_modifiers);
             }
             if (checkExternalImportOrExportDeclaration(node)) {
@@ -22242,7 +23787,7 @@ var ts;
                         checkImportBinding(importClause);
                     }
                     if (importClause.namedBindings) {
-                        if (importClause.namedBindings.kind === 227) {
+                        if (importClause.namedBindings.kind === 231) {
                             checkImportBinding(importClause.namedBindings);
                         }
                         else {
@@ -22259,7 +23804,7 @@ var ts;
             checkGrammarDecorators(node) || checkGrammarModifiers(node);
             if (ts.isInternalModuleImportEqualsDeclaration(node) || checkExternalImportOrExportDeclaration(node)) {
                 checkImportBinding(node);
-                if (node.flags & 2) {
+                if (node.flags & 1) {
                     markExportAsReferenced(node);
                 }
                 if (ts.isInternalModuleImportEqualsDeclaration(node)) {
@@ -22277,7 +23822,7 @@ var ts;
                     }
                 }
                 else {
-                    if (modulekind === 5 && !ts.isInAmbientContext(node)) {
+                    if (modulekind === ts.ModuleKind.ES6 && !ts.isInAmbientContext(node)) {
                         grammarErrorOnNode(node, ts.Diagnostics.Import_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_import_Asterisk_as_ns_from_mod_import_a_from_mod_import_d_from_mod_or_another_module_format_instead);
                     }
                 }
@@ -22287,27 +23832,27 @@ var ts;
             if (checkGrammarModuleElementContext(node, ts.Diagnostics.An_export_declaration_can_only_be_used_in_a_module)) {
                 return;
             }
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 1022)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 959)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_declaration_cannot_have_modifiers);
             }
             if (!node.moduleSpecifier || checkExternalImportOrExportDeclaration(node)) {
                 if (node.exportClause) {
                     ts.forEach(node.exportClause.elements, checkExportSpecifier);
-                    var inAmbientExternalModule = node.parent.kind === 222 && ts.isAmbientModule(node.parent.parent);
-                    if (node.parent.kind !== 251 && !inAmbientExternalModule) {
+                    var inAmbientExternalModule = node.parent.kind === 225 && ts.isAmbientModule(node.parent.parent);
+                    if (node.parent.kind !== 255 && !inAmbientExternalModule) {
                         error(node, ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace);
                     }
                 }
                 else {
                     var moduleSymbol = resolveExternalModuleName(node, node.moduleSpecifier);
-                    if (moduleSymbol && moduleSymbol.exports["export="]) {
+                    if (moduleSymbol && hasExportAssignmentSymbol(moduleSymbol)) {
                         error(node.moduleSpecifier, ts.Diagnostics.Module_0_uses_export_and_cannot_be_used_with_export_Asterisk, symbolToString(moduleSymbol));
                     }
                 }
             }
         }
         function checkGrammarModuleElementContext(node, errorMessage) {
-            if (node.parent.kind !== 251 && node.parent.kind !== 222 && node.parent.kind !== 221) {
+            if (node.parent.kind !== 255 && node.parent.kind !== 225 && node.parent.kind !== 224) {
                 return grammarErrorOnFirstToken(node, errorMessage);
             }
         }
@@ -22316,7 +23861,7 @@ var ts;
             if (!node.parent.parent.moduleSpecifier) {
                 var exportedName = node.propertyName || node.name;
                 var symbol = resolveName(exportedName, exportedName.text, 107455 | 793056 | 1536 | 8388608, undefined, undefined);
-                if (symbol && isGlobalSourceFile(getDeclarationContainer(symbol.declarations[0]))) {
+                if (symbol && (symbol === undefinedSymbol || isGlobalSourceFile(getDeclarationContainer(symbol.declarations[0])))) {
                     error(exportedName, ts.Diagnostics.Cannot_re_export_name_that_is_not_defined_in_the_module);
                 }
                 else {
@@ -22328,12 +23873,12 @@ var ts;
             if (checkGrammarModuleElementContext(node, ts.Diagnostics.An_export_assignment_can_only_be_used_in_a_module)) {
                 return;
             }
-            var container = node.parent.kind === 251 ? node.parent : node.parent.parent;
-            if (container.kind === 221 && !ts.isAmbientModule(container)) {
+            var container = node.parent.kind === 255 ? node.parent : node.parent.parent;
+            if (container.kind === 224 && !ts.isAmbientModule(container)) {
                 error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace);
                 return;
             }
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 1022)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 959)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_assignment_cannot_have_modifiers);
             }
             if (node.expression.kind === 69) {
@@ -22344,10 +23889,10 @@ var ts;
             }
             checkExternalModuleExports(container);
             if (node.isExportEquals && !ts.isInAmbientContext(node)) {
-                if (modulekind === 5) {
+                if (modulekind === ts.ModuleKind.ES6) {
                     grammarErrorOnNode(node, ts.Diagnostics.Export_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_export_default_or_another_module_format_instead);
                 }
-                else if (modulekind === 4) {
+                else if (modulekind === ts.ModuleKind.System) {
                     grammarErrorOnNode(node, ts.Diagnostics.Export_assignment_is_not_supported_when_module_flag_is_system);
                 }
             }
@@ -22377,11 +23922,17 @@ var ts;
                         continue;
                     }
                     var _a = exports[id], declarations = _a.declarations, flags = _a.flags;
-                    if (!(flags & (1536 | 64 | 384)) && (flags & 524288 ? declarations.length - 1 : declarations.length) > 1) {
-                        var exportedDeclarations = ts.filter(declarations, isNotOverload);
-                        if (exportedDeclarations.length > 1) {
-                            for (var _i = 0, exportedDeclarations_1 = exportedDeclarations; _i < exportedDeclarations_1.length; _i++) {
-                                var declaration = exportedDeclarations_1[_i];
+                    if (flags & (1536 | 64 | 384)) {
+                        continue;
+                    }
+                    var exportedDeclarationsCount = ts.countWhere(declarations, isNotOverload);
+                    if (flags & 524288 && exportedDeclarationsCount <= 2) {
+                        continue;
+                    }
+                    if (exportedDeclarationsCount > 1) {
+                        for (var _i = 0, declarations_6 = declarations; _i < declarations_6.length; _i++) {
+                            var declaration = declarations_6[_i];
+                            if (isNotOverload(declaration)) {
                                 diagnostics.add(ts.createDiagnosticForNode(declaration, ts.Diagnostics.Cannot_redeclare_exported_variable_0, id));
                             }
                         }
@@ -22390,7 +23941,7 @@ var ts;
                 links.exportsChecked = true;
             }
             function isNotOverload(declaration) {
-                return declaration.kind !== 216 || !!declaration.body;
+                return declaration.kind !== 219 || !!declaration.body;
             }
         }
         function checkSourceElement(node) {
@@ -22400,118 +23951,118 @@ var ts;
             var kind = node.kind;
             if (cancellationToken) {
                 switch (kind) {
+                    case 224:
+                    case 220:
                     case 221:
-                    case 217:
-                    case 218:
-                    case 216:
+                    case 219:
                         cancellationToken.throwIfCancellationRequested();
                 }
             }
             switch (kind) {
-                case 138:
+                case 140:
                     return checkTypeParameter(node);
-                case 139:
-                    return checkParameter(node);
-                case 142:
                 case 141:
-                    return checkPropertyDeclaration(node);
-                case 153:
-                case 154:
-                case 148:
-                case 149:
-                    return checkSignatureDeclaration(node);
-                case 150:
-                    return checkSignatureDeclaration(node);
+                    return checkParameter(node);
                 case 144:
                 case 143:
-                    return checkMethodDeclaration(node);
-                case 145:
-                    return checkConstructorDeclaration(node);
-                case 146:
-                case 147:
-                    return checkAccessorDeclaration(node);
-                case 152:
-                    return checkTypeReferenceNode(node);
-                case 151:
-                    return checkTypePredicate(node);
+                    return checkPropertyDeclaration(node);
                 case 155:
-                    return checkTypeQuery(node);
                 case 156:
-                    return checkTypeLiteral(node);
+                case 150:
+                case 151:
+                    return checkSignatureDeclaration(node);
+                case 152:
+                    return checkSignatureDeclaration(node);
+                case 146:
+                case 145:
+                    return checkMethodDeclaration(node);
+                case 147:
+                    return checkConstructorDeclaration(node);
+                case 148:
+                case 149:
+                    return checkAccessorDeclaration(node);
+                case 154:
+                    return checkTypeReferenceNode(node);
+                case 153:
+                    return checkTypePredicate(node);
                 case 157:
-                    return checkArrayType(node);
+                    return checkTypeQuery(node);
                 case 158:
-                    return checkTupleType(node);
+                    return checkTypeLiteral(node);
                 case 159:
+                    return checkArrayType(node);
                 case 160:
-                    return checkUnionOrIntersectionType(node);
+                    return checkTupleType(node);
                 case 161:
+                case 162:
+                    return checkUnionOrIntersectionType(node);
+                case 163:
                     return checkSourceElement(node.type);
-                case 216:
-                    return checkFunctionDeclaration(node);
-                case 195:
-                case 222:
-                    return checkBlock(node);
-                case 196:
-                    return checkVariableStatement(node);
-                case 198:
-                    return checkExpressionStatement(node);
-                case 199:
-                    return checkIfStatement(node);
-                case 200:
-                    return checkDoStatement(node);
-                case 201:
-                    return checkWhileStatement(node);
-                case 202:
-                    return checkForStatement(node);
-                case 203:
-                    return checkForInStatement(node);
-                case 204:
-                    return checkForOfStatement(node);
-                case 205:
-                case 206:
-                    return checkBreakOrContinueStatement(node);
-                case 207:
-                    return checkReturnStatement(node);
-                case 208:
-                    return checkWithStatement(node);
-                case 209:
-                    return checkSwitchStatement(node);
-                case 210:
-                    return checkLabeledStatement(node);
-                case 211:
-                    return checkThrowStatement(node);
-                case 212:
-                    return checkTryStatement(node);
-                case 214:
-                    return checkVariableDeclaration(node);
-                case 166:
-                    return checkBindingElement(node);
-                case 217:
-                    return checkClassDeclaration(node);
-                case 218:
-                    return checkInterfaceDeclaration(node);
                 case 219:
-                    return checkTypeAliasDeclaration(node);
-                case 220:
-                    return checkEnumDeclaration(node);
-                case 221:
-                    return checkModuleDeclaration(node);
+                    return checkFunctionDeclaration(node);
+                case 198:
                 case 225:
-                    return checkImportDeclaration(node);
-                case 224:
-                    return checkImportEqualsDeclaration(node);
-                case 231:
-                    return checkExportDeclaration(node);
-                case 230:
-                    return checkExportAssignment(node);
-                case 197:
-                    checkGrammarStatementInAmbientContext(node);
-                    return;
+                    return checkBlock(node);
+                case 199:
+                    return checkVariableStatement(node);
+                case 201:
+                    return checkExpressionStatement(node);
+                case 202:
+                    return checkIfStatement(node);
+                case 203:
+                    return checkDoStatement(node);
+                case 204:
+                    return checkWhileStatement(node);
+                case 205:
+                    return checkForStatement(node);
+                case 206:
+                    return checkForInStatement(node);
+                case 207:
+                    return checkForOfStatement(node);
+                case 208:
+                case 209:
+                    return checkBreakOrContinueStatement(node);
+                case 210:
+                    return checkReturnStatement(node);
+                case 211:
+                    return checkWithStatement(node);
+                case 212:
+                    return checkSwitchStatement(node);
                 case 213:
+                    return checkLabeledStatement(node);
+                case 214:
+                    return checkThrowStatement(node);
+                case 215:
+                    return checkTryStatement(node);
+                case 217:
+                    return checkVariableDeclaration(node);
+                case 168:
+                    return checkBindingElement(node);
+                case 220:
+                    return checkClassDeclaration(node);
+                case 221:
+                    return checkInterfaceDeclaration(node);
+                case 222:
+                    return checkTypeAliasDeclaration(node);
+                case 223:
+                    return checkEnumDeclaration(node);
+                case 224:
+                    return checkModuleDeclaration(node);
+                case 229:
+                    return checkImportDeclaration(node);
+                case 228:
+                    return checkImportEqualsDeclaration(node);
+                case 235:
+                    return checkExportDeclaration(node);
+                case 234:
+                    return checkExportAssignment(node);
+                case 200:
                     checkGrammarStatementInAmbientContext(node);
                     return;
-                case 234:
+                case 216:
+                    checkGrammarStatementInAmbientContext(node);
+                    return;
+                case 238:
                     return checkMissingDeclaration(node);
             }
         }
@@ -22524,17 +24075,17 @@ var ts;
             for (var _i = 0, deferredNodes_1 = deferredNodes; _i < deferredNodes_1.length; _i++) {
                 var node = deferredNodes_1[_i];
                 switch (node.kind) {
-                    case 176:
-                    case 177:
-                    case 144:
-                    case 143:
+                    case 178:
+                    case 179:
+                    case 146:
+                    case 145:
                         checkFunctionExpressionOrObjectLiteralMethodDeferred(node);
                         break;
-                    case 146:
-                    case 147:
+                    case 148:
+                    case 149:
                         checkAccessorDeferred(node);
                         break;
-                    case 189:
+                    case 191:
                         checkClassExpressionDeferred(node);
                         break;
                 }
@@ -22599,7 +24150,7 @@ var ts;
         function isInsideWithStatementBody(node) {
             if (node) {
                 while (node.parent) {
-                    if (node.parent.kind === 208 && node.parent.statement === node) {
+                    if (node.parent.kind === 211 && node.parent.statement === node) {
                         return true;
                     }
                     node = node.parent;
@@ -22621,28 +24172,28 @@ var ts;
                         copySymbols(location.locals, meaning);
                     }
                     switch (location.kind) {
-                        case 251:
+                        case 255:
                             if (!ts.isExternalOrCommonJsModule(location)) {
                                 break;
                             }
-                        case 221:
+                        case 224:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8914931);
                             break;
-                        case 220:
+                        case 223:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8);
                             break;
-                        case 189:
+                        case 191:
                             var className = location.name;
                             if (className) {
                                 copySymbol(location.symbol, meaning);
                             }
-                        case 217:
-                        case 218:
-                            if (!(memberFlags & 64)) {
+                        case 220:
+                        case 221:
+                            if (!(memberFlags & 32)) {
                                 copySymbols(getSymbolOfNode(location).members, meaning & 793056);
                             }
                             break;
-                        case 176:
+                        case 178:
                             var funcName = location.name;
                             if (funcName) {
                                 copySymbol(location.symbol, meaning);
@@ -22681,36 +24232,50 @@ var ts;
         }
         function isTypeDeclaration(node) {
             switch (node.kind) {
-                case 138:
-                case 217:
-                case 218:
-                case 219:
+                case 140:
                 case 220:
+                case 221:
+                case 222:
+                case 223:
                     return true;
             }
         }
         function isTypeReferenceIdentifier(entityName) {
             var node = entityName;
-            while (node.parent && node.parent.kind === 136) {
+            while (node.parent && node.parent.kind === 138) {
                 node = node.parent;
             }
-            return node.parent && node.parent.kind === 152;
+            return node.parent && node.parent.kind === 154;
         }
         function isHeritageClauseElementIdentifier(entityName) {
             var node = entityName;
-            while (node.parent && node.parent.kind === 169) {
+            while (node.parent && node.parent.kind === 171) {
                 node = node.parent;
             }
-            return node.parent && node.parent.kind === 191;
+            return node.parent && node.parent.kind === 193;
+        }
+        function forEachEnclosingClass(node, callback) {
+            var result;
+            while (true) {
+                node = ts.getContainingClass(node);
+                if (!node)
+                    break;
+                if (result = callback(node))
+                    break;
+            }
+            return result;
+        }
+        function isNodeWithinClass(node, classDeclaration) {
+            return !!forEachEnclosingClass(node, function (n) { return n === classDeclaration; });
         }
         function getLeftSideOfImportEqualsOrExportAssignment(nodeOnRightSide) {
-            while (nodeOnRightSide.parent.kind === 136) {
+            while (nodeOnRightSide.parent.kind === 138) {
                 nodeOnRightSide = nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 224) {
+            if (nodeOnRightSide.parent.kind === 228) {
                 return nodeOnRightSide.parent.moduleReference === nodeOnRightSide && nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 230) {
+            if (nodeOnRightSide.parent.kind === 234) {
                 return nodeOnRightSide.parent.expression === nodeOnRightSide && nodeOnRightSide.parent;
             }
             return undefined;
@@ -22722,10 +24287,22 @@ var ts;
             if (ts.isDeclarationName(entityName)) {
                 return getSymbolOfNode(entityName.parent);
             }
-            if (entityName.parent.kind === 230) {
+            if (ts.isInJavaScriptFile(entityName) && entityName.parent.kind === 171) {
+                var specialPropertyAssignmentKind = ts.getSpecialPropertyAssignmentKind(entityName.parent.parent);
+                switch (specialPropertyAssignmentKind) {
+                    case 1:
+                    case 3:
+                        return getSymbolOfNode(entityName.parent);
+                    case 4:
+                    case 2:
+                        return getSymbolOfNode(entityName.parent.parent);
+                    default:
+                }
+            }
+            if (entityName.parent.kind === 234) {
                 return resolveEntityName(entityName, 107455 | 793056 | 1536 | 8388608);
             }
-            if (entityName.kind !== 169) {
+            if (entityName.kind !== 171) {
                 if (isInRightSideOfImportOrExportAssignment(entityName)) {
                     return getSymbolOfPartOfRightHandSideOfImportEquals(entityName);
                 }
@@ -22735,7 +24312,7 @@ var ts;
             }
             if (isHeritageClauseElementIdentifier(entityName)) {
                 var meaning = 0;
-                if (entityName.parent.kind === 191) {
+                if (entityName.parent.kind === 193) {
                     meaning = 793056;
                     if (ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
                         meaning |= 107455;
@@ -22747,27 +24324,25 @@ var ts;
                 meaning |= 8388608;
                 return resolveEntityName(entityName, meaning);
             }
-            else if ((entityName.parent.kind === 238) ||
-                (entityName.parent.kind === 237) ||
-                (entityName.parent.kind === 240)) {
-                return getJsxElementTagSymbol(entityName.parent);
-            }
             else if (ts.isExpression(entityName)) {
                 if (ts.nodeIsMissing(entityName)) {
                     return undefined;
                 }
                 if (entityName.kind === 69) {
+                    if (ts.isJSXTagName(entityName) && isJsxIntrinsicIdentifier(entityName)) {
+                        return getIntrinsicTagSymbol(entityName.parent);
+                    }
                     var meaning = 107455 | 8388608;
                     return resolveEntityName(entityName, meaning);
                 }
-                else if (entityName.kind === 169) {
+                else if (entityName.kind === 171) {
                     var symbol = getNodeLinks(entityName).resolvedSymbol;
                     if (!symbol) {
                         checkPropertyAccessExpression(entityName);
                     }
                     return getNodeLinks(entityName).resolvedSymbol;
                 }
-                else if (entityName.kind === 136) {
+                else if (entityName.kind === 138) {
                     var symbol = getNodeLinks(entityName).resolvedSymbol;
                     if (!symbol) {
                         checkQualifiedName(entityName);
@@ -22776,14 +24351,14 @@ var ts;
                 }
             }
             else if (isTypeReferenceIdentifier(entityName)) {
-                var meaning = entityName.parent.kind === 152 ? 793056 : 1536;
+                var meaning = entityName.parent.kind === 154 ? 793056 : 1536;
                 meaning |= 8388608;
                 return resolveEntityName(entityName, meaning);
             }
-            else if (entityName.parent.kind === 241) {
+            else if (entityName.parent.kind === 245) {
                 return getJsxAttributePropertySymbol(entityName.parent);
             }
-            if (entityName.parent.kind === 151) {
+            if (entityName.parent.kind === 153) {
                 return resolveEntityName(entityName, 1);
             }
             return undefined;
@@ -22797,12 +24372,12 @@ var ts;
             }
             if (node.kind === 69) {
                 if (isInRightSideOfImportOrExportAssignment(node)) {
-                    return node.parent.kind === 230
+                    return node.parent.kind === 234
                         ? getSymbolOfEntityNameOrPropertyAccessExpression(node)
                         : getSymbolOfPartOfRightHandSideOfImportEquals(node);
                 }
-                else if (node.parent.kind === 166 &&
-                    node.parent.parent.kind === 164 &&
+                else if (node.parent.kind === 168 &&
+                    node.parent.parent.kind === 166 &&
                     node === node.parent.propertyName) {
                     var typeOfPattern = getTypeOfNode(node.parent.parent);
                     var propertyDeclaration = typeOfPattern && getPropertyOfType(typeOfPattern, node.text);
@@ -22813,30 +24388,30 @@ var ts;
             }
             switch (node.kind) {
                 case 69:
-                case 169:
-                case 136:
+                case 171:
+                case 138:
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
                 case 97:
                 case 95:
                     var type = ts.isExpression(node) ? checkExpression(node) : getTypeFromTypeNode(node);
                     return type.symbol;
-                case 162:
+                case 164:
                     return getTypeFromTypeNode(node).symbol;
                 case 121:
                     var constructorDeclaration = node.parent;
-                    if (constructorDeclaration && constructorDeclaration.kind === 145) {
+                    if (constructorDeclaration && constructorDeclaration.kind === 147) {
                         return constructorDeclaration.parent.symbol;
                     }
                     return undefined;
                 case 9:
                     if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) &&
                         ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) ||
-                        ((node.parent.kind === 225 || node.parent.kind === 231) &&
+                        ((node.parent.kind === 229 || node.parent.kind === 235) &&
                             node.parent.moduleSpecifier === node)) {
                         return resolveExternalModuleName(node, node);
                     }
                 case 8:
-                    if (node.parent.kind === 170 && node.parent.argumentExpression === node) {
+                    if (node.parent.kind === 172 && node.parent.argumentExpression === node) {
                         var objectType = checkExpression(node.parent.expression);
                         if (objectType === unknownType)
                             return undefined;
@@ -22850,7 +24425,7 @@ var ts;
             return undefined;
         }
         function getShorthandAssignmentValueSymbol(location) {
-            if (location && location.kind === 249) {
+            if (location && location.kind === 253) {
                 return resolveEntityName(location.name, 107455 | 8388608);
             }
             return undefined;
@@ -22907,7 +24482,7 @@ var ts;
         }
         function getParentTypeOfClassElement(node) {
             var classSymbol = getSymbolOfNode(node.parent);
-            return node.flags & 64
+            return node.flags & 32
                 ? getTypeOfSymbol(classSymbol)
                 : getDeclaredTypeOfSymbol(classSymbol);
         }
@@ -22925,15 +24500,15 @@ var ts;
         }
         function getRootSymbols(symbol) {
             if (symbol.flags & 268435456) {
-                var symbols = [];
-                var name_18 = symbol.name;
+                var symbols_3 = [];
+                var name_19 = symbol.name;
                 ts.forEach(getSymbolLinks(symbol).containingType.types, function (t) {
-                    var symbol = getPropertyOfType(t, name_18);
+                    var symbol = getPropertyOfType(t, name_19);
                     if (symbol) {
-                        symbols.push(symbol);
+                        symbols_3.push(symbol);
                     }
                 });
-                return symbols;
+                return symbols_3;
             }
             else if (symbol.flags & 67108864) {
                 var target = getSymbolLinks(symbol).target;
@@ -22951,7 +24526,7 @@ var ts;
             if (!moduleSymbol) {
                 return true;
             }
-            var hasExportAssignment = getExportAssignmentSymbol(moduleSymbol) !== undefined;
+            var hasExportAssignment = hasExportAssignmentSymbol(moduleSymbol);
             moduleSymbol = resolveExternalModuleSymbol(moduleSymbol);
             var symbolLinks = getSymbolLinks(moduleSymbol);
             if (symbolLinks.exportsSomeValue === undefined) {
@@ -22977,11 +24552,11 @@ var ts;
                 }
                 var parentSymbol = getParentOfSymbol(symbol);
                 if (parentSymbol) {
-                    if (parentSymbol.flags & 512 && parentSymbol.valueDeclaration.kind === 251) {
+                    if (parentSymbol.flags & 512 && parentSymbol.valueDeclaration.kind === 255) {
                         return parentSymbol.valueDeclaration;
                     }
                     for (var n = node.parent; n; n = n.parent) {
-                        if ((n.kind === 221 || n.kind === 220) && getSymbolOfNode(n) === parentSymbol) {
+                        if ((n.kind === 224 || n.kind === 223) && getSymbolOfNode(n) === parentSymbol) {
                             return n;
                         }
                     }
@@ -22992,54 +24567,56 @@ var ts;
             var symbol = getReferencedValueSymbol(node);
             return symbol && symbol.flags & 8388608 ? getDeclarationOfAliasSymbol(symbol) : undefined;
         }
-        function isStatementWithLocals(node) {
-            switch (node.kind) {
-                case 195:
-                case 223:
-                case 202:
-                case 203:
-                case 204:
-                    return true;
-            }
-            return false;
-        }
-        function isNestedRedeclarationSymbol(symbol) {
+        function isSymbolOfDeclarationWithCollidingName(symbol) {
             if (symbol.flags & 418) {
                 var links = getSymbolLinks(symbol);
-                if (links.isNestedRedeclaration === undefined) {
+                if (links.isDeclarationWithCollidingName === undefined) {
                     var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
-                    links.isNestedRedeclaration = isStatementWithLocals(container) &&
-                        !!resolveName(container.parent, symbol.name, 107455, undefined, undefined);
+                    if (ts.isStatementWithLocals(container)) {
+                        var nodeLinks_1 = getNodeLinks(symbol.valueDeclaration);
+                        if (!!resolveName(container.parent, symbol.name, 107455, undefined, undefined)) {
+                            links.isDeclarationWithCollidingName = true;
+                        }
+                        else if (nodeLinks_1.flags & 131072) {
+                            var isDeclaredInLoop = nodeLinks_1.flags & 262144;
+                            var inLoopInitializer = ts.isIterationStatement(container, false);
+                            var inLoopBodyBlock = container.kind === 198 && ts.isIterationStatement(container.parent, false);
+                            links.isDeclarationWithCollidingName = !ts.isBlockScopedContainerTopLevel(container) && (!isDeclaredInLoop || (!inLoopInitializer && !inLoopBodyBlock));
+                        }
+                        else {
+                            links.isDeclarationWithCollidingName = false;
+                        }
+                    }
                 }
-                return links.isNestedRedeclaration;
+                return links.isDeclarationWithCollidingName;
             }
             return false;
         }
-        function getReferencedNestedRedeclaration(node) {
+        function getReferencedDeclarationWithCollidingName(node) {
             var symbol = getReferencedValueSymbol(node);
-            return symbol && isNestedRedeclarationSymbol(symbol) ? symbol.valueDeclaration : undefined;
+            return symbol && isSymbolOfDeclarationWithCollidingName(symbol) ? symbol.valueDeclaration : undefined;
         }
-        function isNestedRedeclaration(node) {
-            return isNestedRedeclarationSymbol(getSymbolOfNode(node));
+        function isDeclarationWithCollidingName(node) {
+            return isSymbolOfDeclarationWithCollidingName(getSymbolOfNode(node));
         }
         function isValueAliasDeclaration(node) {
             switch (node.kind) {
-                case 224:
-                case 226:
-                case 227:
-                case 229:
-                case 233:
-                    return isAliasResolvedToValue(getSymbolOfNode(node));
+                case 228:
+                case 230:
                 case 231:
+                case 233:
+                case 237:
+                    return isAliasResolvedToValue(getSymbolOfNode(node));
+                case 235:
                     var exportClause = node.exportClause;
                     return exportClause && ts.forEach(exportClause.elements, isValueAliasDeclaration);
-                case 230:
+                case 234:
                     return node.expression && node.expression.kind === 69 ? isAliasResolvedToValue(getSymbolOfNode(node)) : true;
             }
             return false;
         }
         function isTopLevelValueImportEqualsWithEntityName(node) {
-            if (node.parent.kind !== 251 || !ts.isInternalModuleImportEqualsDeclaration(node)) {
+            if (node.parent.kind !== 255 || !ts.isInternalModuleImportEqualsDeclaration(node)) {
                 return false;
             }
             var isValue = isAliasResolvedToValue(getSymbolOfNode(node));
@@ -23087,7 +24664,7 @@ var ts;
             return getNodeLinks(node).enumMemberValue;
         }
         function getConstantValue(node) {
-            if (node.kind === 250) {
+            if (node.kind === 254) {
                 return getEnumMemberValue(node);
             }
             var symbol = getNodeLinks(node).resolvedSymbol;
@@ -23118,22 +24695,22 @@ var ts;
             else if (type.flags & 1) {
                 return ts.TypeReferenceSerializationKind.ObjectType;
             }
-            else if (allConstituentTypesHaveKind(type, 16)) {
+            else if (isTypeOfKind(type, 16)) {
                 return ts.TypeReferenceSerializationKind.VoidType;
             }
-            else if (allConstituentTypesHaveKind(type, 8)) {
+            else if (isTypeOfKind(type, 8)) {
                 return ts.TypeReferenceSerializationKind.BooleanType;
             }
-            else if (allConstituentTypesHaveKind(type, 132)) {
+            else if (isTypeOfKind(type, 132)) {
                 return ts.TypeReferenceSerializationKind.NumberLikeType;
             }
-            else if (allConstituentTypesHaveKind(type, 258)) {
+            else if (isTypeOfKind(type, 258)) {
                 return ts.TypeReferenceSerializationKind.StringLikeType;
             }
-            else if (allConstituentTypesHaveKind(type, 8192)) {
+            else if (isTypeOfKind(type, 8192)) {
                 return ts.TypeReferenceSerializationKind.ArrayLikeType;
             }
-            else if (allConstituentTypesHaveKind(type, 16777216)) {
+            else if (isTypeOfKind(type, 16777216)) {
                 return ts.TypeReferenceSerializationKind.ESSymbolType;
             }
             else if (isFunctionType(type)) {
@@ -23158,9 +24735,15 @@ var ts;
             getSymbolDisplayBuilder().buildTypeDisplay(getReturnTypeOfSignature(signature), writer, enclosingDeclaration, flags);
         }
         function writeTypeOfExpression(expr, enclosingDeclaration, flags, writer) {
-            var type = getTypeOfExpression(expr);
+            var type = getWidenedType(getTypeOfExpression(expr));
             getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags);
         }
+        function writeBaseConstructorTypeOfClass(node, enclosingDeclaration, flags, writer) {
+            var classType = getDeclaredTypeOfSymbol(getSymbolOfNode(node));
+            resolveBaseTypesOfClass(classType);
+            var baseType = classType.resolvedBaseTypes.length ? classType.resolvedBaseTypes[0] : unknownType;
+            getSymbolDisplayBuilder().buildTypeDisplay(baseType, writer, enclosingDeclaration, flags);
+        }
         function hasGlobalName(name) {
             return ts.hasProperty(globals, name);
         }
@@ -23177,8 +24760,8 @@ var ts;
             return {
                 getReferencedExportContainer: getReferencedExportContainer,
                 getReferencedImportDeclaration: getReferencedImportDeclaration,
-                getReferencedNestedRedeclaration: getReferencedNestedRedeclaration,
-                isNestedRedeclaration: isNestedRedeclaration,
+                getReferencedDeclarationWithCollidingName: getReferencedDeclarationWithCollidingName,
+                isDeclarationWithCollidingName: isDeclarationWithCollidingName,
                 isValueAliasDeclaration: isValueAliasDeclaration,
                 hasGlobalName: hasGlobalName,
                 isReferencedAliasDeclaration: isReferencedAliasDeclaration,
@@ -23189,6 +24772,7 @@ var ts;
                 writeTypeOfDeclaration: writeTypeOfDeclaration,
                 writeReturnTypeOfSignatureDeclaration: writeReturnTypeOfSignatureDeclaration,
                 writeTypeOfExpression: writeTypeOfExpression,
+                writeBaseConstructorTypeOfClass: writeBaseConstructorTypeOfClass,
                 isSymbolAccessible: isSymbolAccessible,
                 isEntityNameVisible: isEntityNameVisible,
                 getConstantValue: getConstantValue,
@@ -23207,7 +24791,7 @@ var ts;
             if (!moduleSymbol) {
                 return undefined;
             }
-            return ts.getDeclarationOfKind(moduleSymbol, 251);
+            return ts.getDeclarationOfKind(moduleSymbol, 255);
         }
         function initializeTypeChecker() {
             ts.forEach(host.getSourceFiles(), function (file) {
@@ -23218,9 +24802,12 @@ var ts;
                 if (!ts.isExternalOrCommonJsModule(file)) {
                     mergeSymbolTable(globals, file.locals);
                 }
-                if (file.moduleAugmentations) {
+                if (file.moduleAugmentations.length) {
                     (augmentations || (augmentations = [])).push(file.moduleAugmentations);
                 }
+                if (file.wasReferenced && file.symbol && file.symbol.globalExports) {
+                    mergeSymbolTable(globals, file.symbol.globalExports);
+                }
             });
             if (augmentations) {
                 for (var _i = 0, augmentations_1 = augmentations; _i < augmentations_1.length; _i++) {
@@ -23248,6 +24835,7 @@ var ts;
             getGlobalMethodDecoratorType = ts.memoize(function () { return getGlobalType("MethodDecorator"); });
             getGlobalParameterDecoratorType = ts.memoize(function () { return getGlobalType("ParameterDecorator"); });
             getGlobalTypedPropertyDescriptorType = ts.memoize(function () { return getGlobalType("TypedPropertyDescriptor", 1); });
+            getGlobalESSymbolConstructorSymbol = ts.memoize(function () { return getGlobalValueSymbol("Symbol"); });
             getGlobalPromiseType = ts.memoize(function () { return getGlobalType("Promise", 1); });
             tryGetGlobalPromiseType = ts.memoize(function () { return getGlobalSymbol("Promise", 793056, undefined) && getGlobalPromiseType(); });
             getGlobalPromiseLikeType = ts.memoize(function () { return getGlobalType("PromiseLike", 1); });
@@ -23255,23 +24843,23 @@ var ts;
             getGlobalPromiseConstructorSymbol = ts.memoize(function () { return getGlobalValueSymbol("Promise"); });
             getGlobalPromiseConstructorLikeType = ts.memoize(function () { return getGlobalType("PromiseConstructorLike"); });
             getGlobalThenableType = ts.memoize(createThenableType);
+            getGlobalTemplateStringsArrayType = ts.memoize(function () { return getGlobalType("TemplateStringsArray"); });
             if (languageVersion >= 2) {
-                globalTemplateStringsArrayType = getGlobalType("TemplateStringsArray");
-                globalESSymbolType = getGlobalType("Symbol");
-                globalESSymbolConstructorSymbol = getGlobalValueSymbol("Symbol");
-                globalIterableType = getGlobalType("Iterable", 1);
-                globalIteratorType = getGlobalType("Iterator", 1);
-                globalIterableIteratorType = getGlobalType("IterableIterator", 1);
+                getGlobalESSymbolType = ts.memoize(function () { return getGlobalType("Symbol"); });
+                getGlobalIterableType = ts.memoize(function () { return getGlobalType("Iterable", 1); });
+                getGlobalIteratorType = ts.memoize(function () { return getGlobalType("Iterator", 1); });
+                getGlobalIterableIteratorType = ts.memoize(function () { return getGlobalType("IterableIterator", 1); });
             }
             else {
-                globalTemplateStringsArrayType = unknownType;
-                globalESSymbolType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
-                globalESSymbolConstructorSymbol = undefined;
-                globalIterableType = emptyGenericType;
-                globalIteratorType = emptyGenericType;
-                globalIterableIteratorType = emptyGenericType;
+                getGlobalESSymbolType = ts.memoize(function () { return emptyObjectType; });
+                getGlobalIterableType = ts.memoize(function () { return emptyGenericType; });
+                getGlobalIteratorType = ts.memoize(function () { return emptyGenericType; });
+                getGlobalIterableIteratorType = ts.memoize(function () { return emptyGenericType; });
             }
             anyArrayType = createArrayType(anyType);
+            var symbol = getGlobalSymbol("ReadonlyArray", 793056, undefined);
+            globalReadonlyArrayType = symbol && getTypeOfGlobalSymbol(symbol, 1);
+            anyReadonlyArrayType = globalReadonlyArrayType ? createTypeFromGenericGlobalType(globalReadonlyArrayType, [anyType]) : anyArrayType;
         }
         function createInstantiatedPromiseLikeType() {
             var promiseLikeType = getGlobalPromiseLikeType();
@@ -23295,14 +24883,14 @@ var ts;
                 return false;
             }
             if (!ts.nodeCanBeDecorated(node)) {
-                if (node.kind === 144 && !ts.nodeIsPresent(node.body)) {
+                if (node.kind === 146 && !ts.nodeIsPresent(node.body)) {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.A_decorator_can_only_decorate_a_method_implementation_not_an_overload);
                 }
                 else {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_are_not_valid_here);
                 }
             }
-            else if (node.kind === 146 || node.kind === 147) {
+            else if (node.kind === 148 || node.kind === 149) {
                 var accessors = ts.getAllAccessorDeclarations(node.parent.members, node);
                 if (accessors.firstAccessor.decorators && node === accessors.secondAccessor) {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name);
@@ -23312,38 +24900,38 @@ var ts;
         }
         function checkGrammarModifiers(node) {
             switch (node.kind) {
-                case 146:
+                case 148:
+                case 149:
                 case 147:
-                case 145:
-                case 142:
-                case 141:
                 case 144:
                 case 143:
-                case 150:
-                case 221:
-                case 225:
+                case 146:
+                case 145:
+                case 152:
                 case 224:
-                case 231:
-                case 230:
-                case 139:
+                case 229:
+                case 228:
+                case 235:
+                case 234:
+                case 141:
                     break;
-                case 216:
-                    if (node.modifiers && (node.modifiers.length > 1 || node.modifiers[0].kind !== 118) &&
-                        node.parent.kind !== 222 && node.parent.kind !== 251) {
-                        return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
-                    }
-                    break;
-                case 217:
-                case 218:
-                case 196:
                 case 219:
-                    if (node.modifiers && node.parent.kind !== 222 && node.parent.kind !== 251) {
+                    if (node.modifiers && (node.modifiers.length > 1 || node.modifiers[0].kind !== 118) &&
+                        node.parent.kind !== 225 && node.parent.kind !== 255) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
                     }
                     break;
                 case 220:
+                case 221:
+                case 199:
+                case 222:
+                    if (node.modifiers && node.parent.kind !== 225 && node.parent.kind !== 255) {
+                        return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
+                    }
+                    break;
+                case 223:
                     if (node.modifiers && (node.modifiers.length > 1 || node.modifiers[0].kind !== 74) &&
-                        node.parent.kind !== 222 && node.parent.kind !== 251) {
+                        node.parent.kind !== 225 && node.parent.kind !== 255) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
                     }
                     break;
@@ -23353,42 +24941,48 @@ var ts;
             if (!node.modifiers) {
                 return;
             }
-            var lastStatic, lastPrivate, lastProtected, lastDeclare, lastAsync;
+            var lastStatic, lastPrivate, lastProtected, lastDeclare, lastAsync, lastReadonly;
             var flags = 0;
             for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
                 var modifier = _a[_i];
+                if (modifier.kind !== 127) {
+                    if (node.kind === 143 || node.kind === 145) {
+                        return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_type_member, ts.tokenToString(modifier.kind));
+                    }
+                    if (node.kind === 152) {
+                        return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_an_index_signature, ts.tokenToString(modifier.kind));
+                    }
+                }
                 switch (modifier.kind) {
                     case 74:
-                        if (node.kind !== 220 && node.parent.kind === 217) {
+                        if (node.kind !== 223 && node.parent.kind === 220) {
                             return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(74));
                         }
                         break;
                     case 112:
                     case 111:
                     case 110:
-                        var text = void 0;
-                        if (modifier.kind === 112) {
-                            text = "public";
-                        }
-                        else if (modifier.kind === 111) {
-                            text = "protected";
+                        var text = visibilityToString(ts.modifierToFlag(modifier.kind));
+                        if (modifier.kind === 111) {
                             lastProtected = modifier;
                         }
-                        else {
-                            text = "private";
+                        else if (modifier.kind === 110) {
                             lastPrivate = modifier;
                         }
-                        if (flags & 56) {
+                        if (flags & 28) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.Accessibility_modifier_already_seen);
                         }
-                        else if (flags & 64) {
+                        else if (flags & 32) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "static");
                         }
+                        else if (flags & 64) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "readonly");
+                        }
                         else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "async");
                         }
-                        else if (node.parent.kind === 222 || node.parent.kind === 251) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_element, text);
+                        else if (node.parent.kind === 225 || node.parent.kind === 255) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, text);
                         }
                         else if (flags & 128) {
                             if (modifier.kind === 110) {
@@ -23401,29 +24995,42 @@ var ts;
                         flags |= ts.modifierToFlag(modifier.kind);
                         break;
                     case 113:
-                        if (flags & 64) {
+                        if (flags & 32) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static");
                         }
+                        else if (flags & 64) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "readonly");
+                        }
                         else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "async");
                         }
-                        else if (node.parent.kind === 222 || node.parent.kind === 251) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_element, "static");
+                        else if (node.parent.kind === 225 || node.parent.kind === 255) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, "static");
                         }
-                        else if (node.kind === 139) {
+                        else if (node.kind === 141) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
                         }
                         else if (flags & 128) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "static", "abstract");
                         }
-                        flags |= 64;
+                        flags |= 32;
                         lastStatic = modifier;
                         break;
+                    case 127:
+                        if (flags & 64) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "readonly");
+                        }
+                        else if (node.kind !== 144 && node.kind !== 143 && node.kind !== 152) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics.readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature);
+                        }
+                        flags |= 64;
+                        lastReadonly = modifier;
+                        break;
                     case 82:
-                        if (flags & 2) {
+                        if (flags & 1) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "export");
                         }
-                        else if (flags & 4) {
+                        else if (flags & 2) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "declare");
                         }
                         else if (flags & 128) {
@@ -23432,48 +25039,51 @@ var ts;
                         else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "async");
                         }
-                        else if (node.parent.kind === 217) {
+                        else if (node.parent.kind === 220) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "export");
                         }
-                        else if (node.kind === 139) {
+                        else if (node.kind === 141) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");
                         }
-                        flags |= 2;
+                        flags |= 1;
                         break;
                     case 122:
-                        if (flags & 4) {
+                        if (flags & 2) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "declare");
                         }
                         else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.parent.kind === 217) {
+                        else if (node.parent.kind === 220) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "declare");
                         }
-                        else if (node.kind === 139) {
+                        else if (node.kind === 141) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "declare");
                         }
-                        else if (ts.isInAmbientContext(node.parent) && node.parent.kind === 222) {
+                        else if (ts.isInAmbientContext(node.parent) && node.parent.kind === 225) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
                         }
-                        flags |= 4;
+                        flags |= 2;
                         lastDeclare = modifier;
                         break;
                     case 115:
                         if (flags & 128) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "abstract");
                         }
-                        if (node.kind !== 217) {
-                            if (node.kind !== 144) {
-                                return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_or_method_declaration);
+                        if (node.kind !== 220) {
+                            if (node.kind !== 146 &&
+                                node.kind !== 144 &&
+                                node.kind !== 148 &&
+                                node.kind !== 149) {
+                                return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration);
                             }
-                            if (!(node.parent.kind === 217 && node.parent.flags & 128)) {
+                            if (!(node.parent.kind === 220 && node.parent.flags & 128)) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.Abstract_methods_can_only_appear_within_an_abstract_class);
                             }
-                            if (flags & 64) {
+                            if (flags & 32) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "static", "abstract");
                             }
-                            if (flags & 16) {
+                            if (flags & 8) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "private", "abstract");
                             }
                         }
@@ -23483,10 +25093,10 @@ var ts;
                         if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "async");
                         }
-                        else if (flags & 4 || ts.isInAmbientContext(node.parent)) {
+                        else if (flags & 2 || ts.isInAmbientContext(node.parent)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.kind === 139) {
+                        else if (node.kind === 141) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async");
                         }
                         flags |= 256;
@@ -23494,28 +25104,25 @@ var ts;
                         break;
                 }
             }
-            if (node.kind === 145) {
-                if (flags & 64) {
+            if (node.kind === 147) {
+                if (flags & 32) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
                 }
                 if (flags & 128) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "abstract");
                 }
-                else if (flags & 32) {
-                    return grammarErrorOnNode(lastProtected, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "protected");
-                }
-                else if (flags & 16) {
-                    return grammarErrorOnNode(lastPrivate, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "private");
-                }
                 else if (flags & 256) {
                     return grammarErrorOnNode(lastAsync, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "async");
                 }
+                else if (flags & 64) {
+                    return grammarErrorOnNode(lastReadonly, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "readonly");
+                }
                 return;
             }
-            else if ((node.kind === 225 || node.kind === 224) && flags & 4) {
+            else if ((node.kind === 229 || node.kind === 228) && flags & 2) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
-            else if (node.kind === 139 && (flags & 56) && ts.isBindingPattern(node.name)) {
+            else if (node.kind === 141 && (flags & 28) && ts.isBindingPattern(node.name)) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_may_not_be_a_binding_pattern);
             }
             if (flags & 256) {
@@ -23527,10 +25134,10 @@ var ts;
                 return grammarErrorOnNode(asyncModifier, ts.Diagnostics.Async_functions_are_only_available_when_targeting_ECMAScript_6_and_higher);
             }
             switch (node.kind) {
-                case 144:
-                case 216:
-                case 176:
-                case 177:
+                case 146:
+                case 219:
+                case 178:
+                case 179:
                     if (!node.asteriskToken) {
                         return false;
                     }
@@ -23595,7 +25202,7 @@ var ts;
                 checkGrammarParameterList(node.parameters) || checkGrammarArrowFunction(node, file);
         }
         function checkGrammarArrowFunction(node, file) {
-            if (node.kind === 177) {
+            if (node.kind === 179) {
                 var arrowFunction = node;
                 var startLine = ts.getLineAndCharacterOfPosition(file, arrowFunction.equalsGreaterThanToken.pos).line;
                 var endLine = ts.getLineAndCharacterOfPosition(file, arrowFunction.equalsGreaterThanToken.end).line;
@@ -23618,7 +25225,7 @@ var ts;
             if (parameter.dotDotDotToken) {
                 return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.An_index_signature_cannot_have_a_rest_parameter);
             }
-            if (parameter.flags & 1022) {
+            if (parameter.flags & 959) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_cannot_have_an_accessibility_modifier);
             }
             if (parameter.questionToken) {
@@ -23630,20 +25237,15 @@ var ts;
             if (!parameter.type) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_must_have_a_type_annotation);
             }
-            if (parameter.type.kind !== 130 && parameter.type.kind !== 128) {
+            if (parameter.type.kind !== 131 && parameter.type.kind !== 129) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_must_be_string_or_number);
             }
             if (!node.type) {
                 return grammarErrorOnNode(node, ts.Diagnostics.An_index_signature_must_have_a_type_annotation);
             }
         }
-        function checkGrammarForIndexSignatureModifier(node) {
-            if (node.flags & 1022) {
-                grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_not_permitted_on_index_signature_members);
-            }
-        }
         function checkGrammarIndexSignature(node) {
-            return checkGrammarDecorators(node) || checkGrammarModifiers(node) || checkGrammarIndexSignatureParameters(node) || checkGrammarForIndexSignatureModifier(node);
+            return checkGrammarDecorators(node) || checkGrammarModifiers(node) || checkGrammarIndexSignatureParameters(node);
         }
         function checkGrammarForAtLeastOneTypeArgument(node, typeArguments) {
             if (typeArguments && typeArguments.length === 0) {
@@ -23662,7 +25264,7 @@ var ts;
                 var sourceFile = ts.getSourceFileOfNode(node);
                 for (var _i = 0, args_1 = args; _i < args_1.length; _i++) {
                     var arg = args_1[_i];
-                    if (arg.kind === 190) {
+                    if (arg.kind === 192) {
                         return grammarErrorAtPos(sourceFile, arg.pos, 0, ts.Diagnostics.Argument_expression_expected);
                     }
                 }
@@ -23733,19 +25335,19 @@ var ts;
             return false;
         }
         function checkGrammarComputedPropertyName(node) {
-            if (node.kind !== 137) {
+            if (node.kind !== 139) {
                 return false;
             }
             var computedPropertyName = node;
-            if (computedPropertyName.expression.kind === 184 && computedPropertyName.expression.operatorToken.kind === 24) {
+            if (computedPropertyName.expression.kind === 186 && computedPropertyName.expression.operatorToken.kind === 24) {
                 return grammarErrorOnNode(computedPropertyName.expression, ts.Diagnostics.A_comma_expression_is_not_allowed_in_a_computed_property_name);
             }
         }
         function checkGrammarForGenerator(node) {
             if (node.asteriskToken) {
-                ts.Debug.assert(node.kind === 216 ||
-                    node.kind === 176 ||
-                    node.kind === 144);
+                ts.Debug.assert(node.kind === 219 ||
+                    node.kind === 178 ||
+                    node.kind === 146);
                 if (ts.isInAmbientContext(node)) {
                     return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
                 }
@@ -23766,88 +25368,87 @@ var ts;
             var seen = {};
             var Property = 1;
             var GetAccessor = 2;
-            var SetAccesor = 4;
-            var GetOrSetAccessor = GetAccessor | SetAccesor;
+            var SetAccessor = 4;
+            var GetOrSetAccessor = GetAccessor | SetAccessor;
             var _loop_1 = function(prop) {
-                var name_19 = prop.name;
-                if (prop.kind === 190 ||
-                    name_19.kind === 137) {
-                    checkGrammarComputedPropertyName(name_19);
+                var name_20 = prop.name;
+                if (prop.kind === 192 ||
+                    name_20.kind === 139) {
+                    checkGrammarComputedPropertyName(name_20);
                     return "continue";
                 }
-                if (prop.kind === 249 && !inDestructuring && prop.objectAssignmentInitializer) {
+                if (prop.kind === 253 && !inDestructuring && prop.objectAssignmentInitializer) {
                     return { value: grammarErrorOnNode(prop.equalsToken, ts.Diagnostics.can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment) };
                 }
                 ts.forEach(prop.modifiers, function (mod) {
-                    if (mod.kind !== 118 || prop.kind !== 144) {
+                    if (mod.kind !== 118 || prop.kind !== 146) {
                         grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod));
                     }
                 });
                 var currentKind = void 0;
-                if (prop.kind === 248 || prop.kind === 249) {
+                if (prop.kind === 252 || prop.kind === 253) {
                     checkGrammarForInvalidQuestionMark(prop, prop.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional);
-                    if (name_19.kind === 8) {
-                        checkGrammarNumericLiteral(name_19);
+                    if (name_20.kind === 8) {
+                        checkGrammarNumericLiteral(name_20);
                     }
                     currentKind = Property;
                 }
-                else if (prop.kind === 144) {
+                else if (prop.kind === 146) {
                     currentKind = Property;
                 }
-                else if (prop.kind === 146) {
+                else if (prop.kind === 148) {
                     currentKind = GetAccessor;
                 }
-                else if (prop.kind === 147) {
-                    currentKind = SetAccesor;
+                else if (prop.kind === 149) {
+                    currentKind = SetAccessor;
                 }
                 else {
                     ts.Debug.fail("Unexpected syntax kind:" + prop.kind);
                 }
-                if (!ts.hasProperty(seen, name_19.text)) {
-                    seen[name_19.text] = currentKind;
+                if (!ts.hasProperty(seen, name_20.text)) {
+                    seen[name_20.text] = currentKind;
                 }
                 else {
-                    var existingKind = seen[name_19.text];
+                    var existingKind = seen[name_20.text];
                     if (currentKind === Property && existingKind === Property) {
                         return "continue";
                     }
                     else if ((currentKind & GetOrSetAccessor) && (existingKind & GetOrSetAccessor)) {
                         if (existingKind !== GetOrSetAccessor && currentKind !== existingKind) {
-                            seen[name_19.text] = currentKind | existingKind;
+                            seen[name_20.text] = currentKind | existingKind;
                         }
                         else {
-                            return { value: grammarErrorOnNode(name_19, ts.Diagnostics.An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name) };
+                            return { value: grammarErrorOnNode(name_20, ts.Diagnostics.An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name) };
                         }
                     }
                     else {
-                        return { value: grammarErrorOnNode(name_19, ts.Diagnostics.An_object_literal_cannot_have_property_and_accessor_with_the_same_name) };
+                        return { value: grammarErrorOnNode(name_20, ts.Diagnostics.An_object_literal_cannot_have_property_and_accessor_with_the_same_name) };
                     }
                 }
             };
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var prop = _a[_i];
-                var state_1 = _loop_1(prop);
-                if (typeof state_1 === "object") return state_1.value
-                if (state_1 === "continue") continue;
+                var state_2 = _loop_1(prop);
+                if (typeof state_2 === "object") return state_2.value;
             }
         }
         function checkGrammarJsxElement(node) {
             var seen = {};
             for (var _i = 0, _a = node.attributes; _i < _a.length; _i++) {
                 var attr = _a[_i];
-                if (attr.kind === 242) {
+                if (attr.kind === 246) {
                     continue;
                 }
                 var jsxAttr = attr;
-                var name_20 = jsxAttr.name;
-                if (!ts.hasProperty(seen, name_20.text)) {
-                    seen[name_20.text] = true;
+                var name_21 = jsxAttr.name;
+                if (!ts.hasProperty(seen, name_21.text)) {
+                    seen[name_21.text] = true;
                 }
                 else {
-                    return grammarErrorOnNode(name_20, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
+                    return grammarErrorOnNode(name_21, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
                 }
                 var initializer = jsxAttr.initializer;
-                if (initializer && initializer.kind === 243 && !initializer.expression) {
+                if (initializer && initializer.kind === 247 && !initializer.expression) {
                     return grammarErrorOnNode(jsxAttr.initializer, ts.Diagnostics.JSX_attributes_must_only_be_assigned_a_non_empty_expression);
                 }
             }
@@ -23856,7 +25457,7 @@ var ts;
             if (checkGrammarStatementInAmbientContext(forInOrOfStatement)) {
                 return true;
             }
-            if (forInOrOfStatement.initializer.kind === 215) {
+            if (forInOrOfStatement.initializer.kind === 218) {
                 var variableList = forInOrOfStatement.initializer;
                 if (!checkGrammarVariableDeclarationList(variableList)) {
                     var declarations = variableList.declarations;
@@ -23864,20 +25465,20 @@ var ts;
                         return false;
                     }
                     if (declarations.length > 1) {
-                        var diagnostic = forInOrOfStatement.kind === 203
+                        var diagnostic = forInOrOfStatement.kind === 206
                             ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement
                             : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement;
                         return grammarErrorOnFirstToken(variableList.declarations[1], diagnostic);
                     }
                     var firstDeclaration = declarations[0];
                     if (firstDeclaration.initializer) {
-                        var diagnostic = forInOrOfStatement.kind === 203
+                        var diagnostic = forInOrOfStatement.kind === 206
                             ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer
                             : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer;
                         return grammarErrorOnNode(firstDeclaration.name, diagnostic);
                     }
                     if (firstDeclaration.type) {
-                        var diagnostic = forInOrOfStatement.kind === 203
+                        var diagnostic = forInOrOfStatement.kind === 206
                             ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation
                             : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation;
                         return grammarErrorOnNode(firstDeclaration, diagnostic);
@@ -23894,16 +25495,16 @@ var ts;
             else if (ts.isInAmbientContext(accessor)) {
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_be_declared_in_an_ambient_context);
             }
-            else if (accessor.body === undefined) {
+            else if (accessor.body === undefined && !(accessor.flags & 128)) {
                 return grammarErrorAtPos(ts.getSourceFileOfNode(accessor), accessor.end - 1, ";".length, ts.Diagnostics._0_expected, "{");
             }
             else if (accessor.typeParameters) {
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_have_type_parameters);
             }
-            else if (kind === 146 && accessor.parameters.length) {
+            else if (kind === 148 && accessor.parameters.length) {
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_get_accessor_cannot_have_parameters);
             }
-            else if (kind === 147) {
+            else if (kind === 149) {
                 if (accessor.type) {
                     return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_set_accessor_cannot_have_a_return_type_annotation);
                 }
@@ -23915,7 +25516,7 @@ var ts;
                     if (parameter.dotDotDotToken) {
                         return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.A_set_accessor_cannot_have_rest_parameter);
                     }
-                    else if (parameter.flags & 1022) {
+                    else if (parameter.flags & 959) {
                         return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                     }
                     else if (parameter.questionToken) {
@@ -23938,7 +25539,7 @@ var ts;
                 checkGrammarForGenerator(node)) {
                 return true;
             }
-            if (node.parent.kind === 168) {
+            if (node.parent.kind === 170) {
                 if (checkGrammarForInvalidQuestionMark(node, node.questionToken, ts.Diagnostics.A_class_member_cannot_be_declared_optional)) {
                     return true;
                 }
@@ -23957,10 +25558,10 @@ var ts;
                     return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol);
                 }
             }
-            else if (node.parent.kind === 218) {
+            else if (node.parent.kind === 221) {
                 return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol);
             }
-            else if (node.parent.kind === 156) {
+            else if (node.parent.kind === 158) {
                 return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol);
             }
         }
@@ -23971,9 +25572,9 @@ var ts;
                     return grammarErrorOnNode(node, ts.Diagnostics.Jump_target_cannot_cross_function_boundary);
                 }
                 switch (current.kind) {
-                    case 210:
+                    case 213:
                         if (node.label && current.label.text === node.label.text) {
-                            var isMisplacedContinueLabel = node.kind === 205
+                            var isMisplacedContinueLabel = node.kind === 208
                                 && !ts.isIterationStatement(current.statement, true);
                             if (isMisplacedContinueLabel) {
                                 return grammarErrorOnNode(node, ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement);
@@ -23981,8 +25582,8 @@ var ts;
                             return false;
                         }
                         break;
-                    case 209:
-                        if (node.kind === 206 && !node.label) {
+                    case 212:
+                        if (node.kind === 209 && !node.label) {
                             return false;
                         }
                         break;
@@ -23995,13 +25596,13 @@ var ts;
                 current = current.parent;
             }
             if (node.label) {
-                var message = node.kind === 206
+                var message = node.kind === 209
                     ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement
                     : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
             }
             else {
-                var message = node.kind === 206
+                var message = node.kind === 209
                     ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement
                     : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
@@ -24013,7 +25614,7 @@ var ts;
                 if (node !== ts.lastOrUndefined(elements)) {
                     return grammarErrorOnNode(node, ts.Diagnostics.A_rest_element_must_be_last_in_an_array_destructuring_pattern);
                 }
-                if (node.name.kind === 165 || node.name.kind === 164) {
+                if (node.name.kind === 167 || node.name.kind === 166) {
                     return grammarErrorOnNode(node.name, ts.Diagnostics.A_rest_element_cannot_contain_a_binding_pattern);
                 }
                 if (node.initializer) {
@@ -24022,7 +25623,7 @@ var ts;
             }
         }
         function checkGrammarVariableDeclaration(node) {
-            if (node.parent.parent.kind !== 203 && node.parent.parent.kind !== 204) {
+            if (node.parent.parent.kind !== 206 && node.parent.parent.kind !== 207) {
                 if (ts.isInAmbientContext(node)) {
                     if (node.initializer) {
                         var equalsTokenLength = "=".length;
@@ -24051,7 +25652,7 @@ var ts;
                 var elements = name.elements;
                 for (var _i = 0, elements_2 = elements; _i < elements_2.length; _i++) {
                     var element = elements_2[_i];
-                    if (element.kind !== 190) {
+                    if (element.kind !== 192) {
                         checkGrammarNameInLetOrConstDeclarations(element.name);
                     }
                 }
@@ -24068,15 +25669,15 @@ var ts;
         }
         function allowLetAndConstDeclarations(parent) {
             switch (parent.kind) {
-                case 199:
-                case 200:
-                case 201:
-                case 208:
                 case 202:
                 case 203:
                 case 204:
+                case 211:
+                case 205:
+                case 206:
+                case 207:
                     return false;
-                case 210:
+                case 213:
                     return allowLetAndConstDeclarations(parent.parent);
             }
             return true;
@@ -24132,7 +25733,7 @@ var ts;
                     return true;
                 }
             }
-            else if (node.parent.kind === 218) {
+            else if (node.parent.kind === 221) {
                 if (checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol)) {
                     return true;
                 }
@@ -24140,7 +25741,7 @@ var ts;
                     return grammarErrorOnNode(node.initializer, ts.Diagnostics.An_interface_property_cannot_have_an_initializer);
                 }
             }
-            else if (node.parent.kind === 156) {
+            else if (node.parent.kind === 158) {
                 if (checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol)) {
                     return true;
                 }
@@ -24153,14 +25754,14 @@ var ts;
             }
         }
         function checkGrammarTopLevelElementForRequiredDeclareModifier(node) {
-            if (node.kind === 218 ||
-                node.kind === 219 ||
-                node.kind === 225 ||
-                node.kind === 224 ||
-                node.kind === 231 ||
-                node.kind === 230 ||
-                (node.flags & 4) ||
-                (node.flags & (2 | 512))) {
+            if (node.kind === 221 ||
+                node.kind === 222 ||
+                node.kind === 229 ||
+                node.kind === 228 ||
+                node.kind === 235 ||
+                node.kind === 234 ||
+                (node.flags & 2) ||
+                (node.flags & (1 | 512))) {
                 return false;
             }
             return grammarErrorOnFirstToken(node, ts.Diagnostics.A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file);
@@ -24168,7 +25769,7 @@ var ts;
         function checkGrammarTopLevelElementsForRequiredDeclareModifier(file) {
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
                 var decl = _a[_i];
-                if (ts.isDeclaration(decl) || decl.kind === 196) {
+                if (ts.isDeclaration(decl) || decl.kind === 199) {
                     if (checkGrammarTopLevelElementForRequiredDeclareModifier(decl)) {
                         return true;
                     }
@@ -24187,7 +25788,7 @@ var ts;
                 if (!links.hasReportedStatementInAmbientContext && ts.isFunctionLike(node.parent)) {
                     return getNodeLinks(node).hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.An_implementation_cannot_be_declared_in_ambient_contexts);
                 }
-                if (node.parent.kind === 195 || node.parent.kind === 222 || node.parent.kind === 251) {
+                if (node.parent.kind === 198 || node.parent.kind === 225 || node.parent.kind === 255) {
                     var links_1 = getNodeLinks(node.parent);
                     if (!links_1.hasReportedStatementInAmbientContext) {
                         return links_1.hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.Statements_are_not_allowed_in_ambient_contexts);
@@ -24198,7 +25799,7 @@ var ts;
             }
         }
         function checkGrammarNumericLiteral(node) {
-            if (node.flags & 32768 && languageVersion >= 1) {
+            if (node.isOctalLiteral && languageVersion >= 1) {
                 return grammarErrorOnNode(node, ts.Diagnostics.Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher);
             }
         }
@@ -24217,6 +25818,13 @@ var ts;
 var ts;
 (function (ts) {
     var nullSourceMapWriter;
+    var defaultLastEncodedSourceMapSpan = {
+        emittedLine: 1,
+        emittedColumn: 1,
+        sourceLine: 1,
+        sourceColumn: 1,
+        sourceIndex: 0
+    };
     function getNullSourceMapWriter() {
         if (nullSourceMapWriter === undefined) {
             nullSourceMapWriter = {
@@ -24265,13 +25873,7 @@ var ts;
             currentSourceFile = undefined;
             sourceMapSourceIndex = -1;
             lastRecordedSourceMapSpan = undefined;
-            lastEncodedSourceMapSpan = {
-                emittedLine: 1,
-                emittedColumn: 1,
-                sourceLine: 1,
-                sourceColumn: 1,
-                sourceIndex: 0
-            };
+            lastEncodedSourceMapSpan = defaultLastEncodedSourceMapSpan;
             lastEncodedNameIndex = 0;
             sourceMapData = {
                 sourceMapFilePath: sourceMapFilePath,
@@ -24324,7 +25926,7 @@ var ts;
                 sourceMapData.sourceMapDecodedMappings.pop();
                 lastEncodedSourceMapSpan = sourceMapData.sourceMapDecodedMappings.length ?
                     sourceMapData.sourceMapDecodedMappings[sourceMapData.sourceMapDecodedMappings.length - 1] :
-                    undefined;
+                    defaultLastEncodedSourceMapSpan;
                 var sourceMapMappings = sourceMapData.sourceMapMappings;
                 var lenthToSet = sourceMapMappings.length - 1;
                 for (; lenthToSet >= 0; lenthToSet--) {
@@ -24482,7 +26084,7 @@ var ts;
     function getDeclarationDiagnostics(host, resolver, targetSourceFile) {
         var declarationDiagnostics = ts.createDiagnosticCollection();
         ts.forEachExpectedEmitFile(host, getDeclarationDiagnosticsFromFile, targetSourceFile);
-        return declarationDiagnostics.getDiagnostics(targetSourceFile.fileName);
+        return declarationDiagnostics.getDiagnostics(targetSourceFile ? targetSourceFile.fileName : undefined);
         function getDeclarationDiagnosticsFromFile(_a, sources, isBundledEmit) {
             var declarationFilePath = _a.declarationFilePath;
             emitDeclarations(host, resolver, declarationDiagnostics, declarationFilePath, sources, isBundledEmit);
@@ -24497,7 +26099,8 @@ var ts;
         var increaseIndent;
         var decreaseIndent;
         var writeTextOfNode;
-        var writer = createAndSetNewTextWriterWithSymbolWriter();
+        var writer;
+        createAndSetNewTextWriterWithSymbolWriter();
         var enclosingDeclaration;
         var resultHasExternalModuleIndicator;
         var currentText;
@@ -24549,7 +26152,7 @@ var ts;
                 var oldWriter = writer;
                 ts.forEach(moduleElementDeclarationEmitInfo, function (aliasEmitInfo) {
                     if (aliasEmitInfo.isVisible && !aliasEmitInfo.asynchronousOutput) {
-                        ts.Debug.assert(aliasEmitInfo.node.kind === 225);
+                        ts.Debug.assert(aliasEmitInfo.node.kind === 229);
                         createAndSetNewTextWriterWithSymbolWriter();
                         ts.Debug.assert(aliasEmitInfo.indent === 0 || (aliasEmitInfo.indent === 1 && isBundledEmit));
                         for (var i = 0; i < aliasEmitInfo.indent; i++) {
@@ -24602,7 +26205,6 @@ var ts;
             writer.writeParameter = writer.write;
             writer.writeSymbol = writer.write;
             setWriter(writer);
-            return writer;
         }
         function setWriter(newWriter) {
             writer = newWriter;
@@ -24616,10 +26218,10 @@ var ts;
             var oldWriter = writer;
             ts.forEach(nodes, function (declaration) {
                 var nodeToCheck;
-                if (declaration.kind === 214) {
+                if (declaration.kind === 217) {
                     nodeToCheck = declaration.parent.parent;
                 }
-                else if (declaration.kind === 228 || declaration.kind === 229 || declaration.kind === 226) {
+                else if (declaration.kind === 232 || declaration.kind === 233 || declaration.kind === 230) {
                     ts.Debug.fail("We should be getting ImportDeclaration instead to write");
                 }
                 else {
@@ -24630,7 +26232,7 @@ var ts;
                     moduleElementEmitInfo = ts.forEach(asynchronousSubModuleDeclarationEmitInfo, function (declEmitInfo) { return declEmitInfo.node === nodeToCheck ? declEmitInfo : undefined; });
                 }
                 if (moduleElementEmitInfo) {
-                    if (moduleElementEmitInfo.node.kind === 225) {
+                    if (moduleElementEmitInfo.node.kind === 229) {
                         moduleElementEmitInfo.isVisible = true;
                     }
                     else {
@@ -24638,12 +26240,12 @@ var ts;
                         for (var declarationIndent = moduleElementEmitInfo.indent; declarationIndent; declarationIndent--) {
                             increaseIndent();
                         }
-                        if (nodeToCheck.kind === 221) {
+                        if (nodeToCheck.kind === 224) {
                             ts.Debug.assert(asynchronousSubModuleDeclarationEmitInfo === undefined);
                             asynchronousSubModuleDeclarationEmitInfo = [];
                         }
                         writeModuleElement(nodeToCheck);
-                        if (nodeToCheck.kind === 221) {
+                        if (nodeToCheck.kind === 224) {
                             moduleElementEmitInfo.subModuleElementDeclarationEmitInfo = asynchronousSubModuleDeclarationEmitInfo;
                             asynchronousSubModuleDeclarationEmitInfo = undefined;
                         }
@@ -24653,21 +26255,21 @@ var ts;
             });
             setWriter(oldWriter);
         }
-        function handleSymbolAccessibilityError(symbolAccesibilityResult) {
-            if (symbolAccesibilityResult.accessibility === 0) {
-                if (symbolAccesibilityResult && symbolAccesibilityResult.aliasesToMakeVisible) {
-                    writeAsynchronousModuleElements(symbolAccesibilityResult.aliasesToMakeVisible);
+        function handleSymbolAccessibilityError(symbolAccessibilityResult) {
+            if (symbolAccessibilityResult.accessibility === 0) {
+                if (symbolAccessibilityResult && symbolAccessibilityResult.aliasesToMakeVisible) {
+                    writeAsynchronousModuleElements(symbolAccessibilityResult.aliasesToMakeVisible);
                 }
             }
             else {
                 reportedDeclarationError = true;
-                var errorInfo = writer.getSymbolAccessibilityDiagnostic(symbolAccesibilityResult);
+                var errorInfo = writer.getSymbolAccessibilityDiagnostic(symbolAccessibilityResult);
                 if (errorInfo) {
                     if (errorInfo.typeName) {
-                        emitterDiagnostics.add(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getTextOfNodeFromSourceText(currentText, errorInfo.typeName), symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName));
+                        emitterDiagnostics.add(ts.createDiagnosticForNode(symbolAccessibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getTextOfNodeFromSourceText(currentText, errorInfo.typeName), symbolAccessibilityResult.errorSymbolName, symbolAccessibilityResult.errorModuleName));
                     }
                     else {
-                        emitterDiagnostics.add(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName));
+                        emitterDiagnostics.add(ts.createDiagnosticForNode(symbolAccessibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, symbolAccessibilityResult.errorSymbolName, symbolAccessibilityResult.errorModuleName));
                     }
                 }
             }
@@ -24741,40 +26343,42 @@ var ts;
         function emitType(type) {
             switch (type.kind) {
                 case 117:
-                case 130:
-                case 128:
-                case 120:
                 case 131:
+                case 129:
+                case 120:
+                case 132:
                 case 103:
-                case 162:
-                case 163:
+                case 134:
+                case 93:
+                case 164:
+                case 165:
                     return writeTextOfNode(currentText, type);
-                case 191:
+                case 193:
                     return emitExpressionWithTypeArguments(type);
-                case 152:
-                    return emitTypeReference(type);
-                case 155:
-                    return emitTypeQuery(type);
-                case 157:
-                    return emitArrayType(type);
-                case 158:
-                    return emitTupleType(type);
-                case 159:
-                    return emitUnionType(type);
-                case 160:
-                    return emitIntersectionType(type);
-                case 161:
-                    return emitParenType(type);
-                case 153:
                 case 154:
-                    return emitSignatureDeclarationWithJsDocComments(type);
+                    return emitTypeReference(type);
+                case 157:
+                    return emitTypeQuery(type);
+                case 159:
+                    return emitArrayType(type);
+                case 160:
+                    return emitTupleType(type);
+                case 161:
+                    return emitUnionType(type);
+                case 162:
+                    return emitIntersectionType(type);
+                case 163:
+                    return emitParenType(type);
+                case 155:
                 case 156:
+                    return emitSignatureDeclarationWithJsDocComments(type);
+                case 158:
                     return emitTypeLiteral(type);
                 case 69:
                     return emitEntityName(type);
-                case 136:
+                case 138:
                     return emitEntityName(type);
-                case 151:
+                case 153:
                     return emitTypePredicate(type);
             }
             function writeEntityName(entityName) {
@@ -24782,21 +26386,21 @@ var ts;
                     writeTextOfNode(currentText, entityName);
                 }
                 else {
-                    var left = entityName.kind === 136 ? entityName.left : entityName.expression;
-                    var right = entityName.kind === 136 ? entityName.right : entityName.name;
+                    var left = entityName.kind === 138 ? entityName.left : entityName.expression;
+                    var right = entityName.kind === 138 ? entityName.right : entityName.name;
                     writeEntityName(left);
                     write(".");
                     writeTextOfNode(currentText, right);
                 }
             }
             function emitEntityName(entityName) {
-                var visibilityResult = resolver.isEntityNameVisible(entityName, entityName.parent.kind === 224 ? entityName.parent : enclosingDeclaration);
+                var visibilityResult = resolver.isEntityNameVisible(entityName, entityName.parent.kind === 228 ? entityName.parent : enclosingDeclaration);
                 handleSymbolAccessibilityError(visibilityResult);
                 writeEntityName(entityName);
             }
             function emitExpressionWithTypeArguments(node) {
                 if (ts.isSupportedExpressionWithTypeArguments(node)) {
-                    ts.Debug.assert(node.expression.kind === 69 || node.expression.kind === 169);
+                    ts.Debug.assert(node.expression.kind === 69 || node.expression.kind === 171);
                     emitEntityName(node.expression);
                     if (node.typeArguments) {
                         write("<");
@@ -24870,9 +26474,9 @@ var ts;
             var count = 0;
             while (true) {
                 count++;
-                var name_21 = baseName + "_" + count;
-                if (!ts.hasProperty(currentIdentifiers, name_21)) {
-                    return name_21;
+                var name_22 = baseName + "_" + count;
+                if (!ts.hasProperty(currentIdentifiers, name_22)) {
+                    return name_22;
                 }
             }
         }
@@ -24883,7 +26487,10 @@ var ts;
             }
             else {
                 var tempVarName = getExportDefaultTempVariableName();
-                write("declare var ");
+                if (!noDeclare) {
+                    write("declare ");
+                }
+                write("var ");
                 write(tempVarName);
                 write(": ");
                 writer.getSymbolAccessibilityDiagnostic = getDefaultExportAccessibilityDiagnostic;
@@ -24913,10 +26520,10 @@ var ts;
             if (isModuleElementVisible) {
                 writeModuleElement(node);
             }
-            else if (node.kind === 224 ||
-                (node.parent.kind === 251 && isCurrentFileExternalModule)) {
-                var isVisible;
-                if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 251) {
+            else if (node.kind === 228 ||
+                (node.parent.kind === 255 && isCurrentFileExternalModule)) {
+                var isVisible = void 0;
+                if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 255) {
                     asynchronousSubModuleDeclarationEmitInfo.push({
                         node: node,
                         outputPos: writer.getTextPos(),
@@ -24925,7 +26532,7 @@ var ts;
                     });
                 }
                 else {
-                    if (node.kind === 225) {
+                    if (node.kind === 229) {
                         var importDeclaration = node;
                         if (importDeclaration.importClause) {
                             isVisible = (importDeclaration.importClause.name && resolver.isDeclarationVisible(importDeclaration.importClause)) ||
@@ -24943,58 +26550,61 @@ var ts;
         }
         function writeModuleElement(node) {
             switch (node.kind) {
-                case 216:
-                    return writeFunctionDeclaration(node);
-                case 196:
-                    return writeVariableStatement(node);
-                case 218:
-                    return writeInterfaceDeclaration(node);
-                case 217:
-                    return writeClassDeclaration(node);
                 case 219:
-                    return writeTypeAliasDeclaration(node);
-                case 220:
-                    return writeEnumDeclaration(node);
+                    return writeFunctionDeclaration(node);
+                case 199:
+                    return writeVariableStatement(node);
                 case 221:
-                    return writeModuleDeclaration(node);
+                    return writeInterfaceDeclaration(node);
+                case 220:
+                    return writeClassDeclaration(node);
+                case 222:
+                    return writeTypeAliasDeclaration(node);
+                case 223:
+                    return writeEnumDeclaration(node);
                 case 224:
+                    return writeModuleDeclaration(node);
+                case 228:
                     return writeImportEqualsDeclaration(node);
-                case 225:
+                case 229:
                     return writeImportDeclaration(node);
                 default:
                     ts.Debug.fail("Unknown symbol kind");
             }
         }
         function emitModuleElementDeclarationFlags(node) {
-            if (node.parent.kind === 251) {
-                if (node.flags & 2) {
+            if (node.parent.kind === 255) {
+                if (node.flags & 1) {
                     write("export ");
                 }
                 if (node.flags & 512) {
                     write("default ");
                 }
-                else if (node.kind !== 218 && !noDeclare) {
+                else if (node.kind !== 221 && !noDeclare) {
                     write("declare ");
                 }
             }
         }
-        function emitClassMemberDeclarationFlags(node) {
-            if (node.flags & 16) {
+        function emitClassMemberDeclarationFlags(flags) {
+            if (flags & 8) {
                 write("private ");
             }
-            else if (node.flags & 32) {
+            else if (flags & 16) {
                 write("protected ");
             }
-            if (node.flags & 64) {
+            if (flags & 32) {
                 write("static ");
             }
-            if (node.flags & 128) {
+            if (flags & 64) {
+                write("readonly ");
+            }
+            if (flags & 128) {
                 write("abstract ");
             }
         }
         function writeImportEqualsDeclaration(node) {
             emitJsDocComments(node);
-            if (node.flags & 2) {
+            if (node.flags & 1) {
                 write("export ");
             }
             write("import ");
@@ -25010,7 +26620,7 @@ var ts;
                 write(");");
             }
             writer.writeLine();
-            function getImportEntityNameVisibilityError(symbolAccesibilityResult) {
+            function getImportEntityNameVisibilityError(symbolAccessibilityResult) {
                 return {
                     diagnosticMessage: ts.Diagnostics.Import_declaration_0_is_using_private_name_1,
                     errorNode: node,
@@ -25020,7 +26630,7 @@ var ts;
         }
         function isVisibleNamedBinding(namedBindings) {
             if (namedBindings) {
-                if (namedBindings.kind === 227) {
+                if (namedBindings.kind === 231) {
                     return resolver.isDeclarationVisible(namedBindings);
                 }
                 else {
@@ -25029,11 +26639,8 @@ var ts;
             }
         }
         function writeImportDeclaration(node) {
-            if (!node.importClause && !(node.flags & 2)) {
-                return;
-            }
             emitJsDocComments(node);
-            if (node.flags & 2) {
+            if (node.flags & 1) {
                 write("export ");
             }
             write("import ");
@@ -25046,7 +26653,7 @@ var ts;
                     if (currentWriterPos !== writer.getTextPos()) {
                         write(", ");
                     }
-                    if (node.importClause.namedBindings.kind === 227) {
+                    if (node.importClause.namedBindings.kind === 231) {
                         write("* as ");
                         writeTextOfNode(currentText, node.importClause.namedBindings.name);
                     }
@@ -25063,13 +26670,13 @@ var ts;
             writer.writeLine();
         }
         function emitExternalModuleSpecifier(parent) {
-            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || parent.kind !== 221;
+            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || parent.kind !== 224;
             var moduleSpecifier;
-            if (parent.kind === 224) {
+            if (parent.kind === 228) {
                 var node = parent;
                 moduleSpecifier = ts.getExternalModuleImportEqualsDeclarationExpression(node);
             }
-            else if (parent.kind === 221) {
+            else if (parent.kind === 224) {
                 moduleSpecifier = parent.name;
             }
             else {
@@ -25079,9 +26686,9 @@ var ts;
             if (moduleSpecifier.kind === 9 && isBundledEmit && (compilerOptions.out || compilerOptions.outFile)) {
                 var moduleName = ts.getExternalModuleNameFromDeclaration(host, resolver, parent);
                 if (moduleName) {
-                    write("\"");
+                    write('"');
                     write(moduleName);
-                    write("\"");
+                    write('"');
                     return;
                 }
             }
@@ -25124,7 +26731,7 @@ var ts;
                 write("global ");
             }
             else {
-                if (node.flags & 65536) {
+                if (node.flags & 4096) {
                     write("namespace ");
                 }
                 else {
@@ -25137,7 +26744,7 @@ var ts;
                     writeTextOfNode(currentText, node.name);
                 }
             }
-            while (node.body.kind !== 222) {
+            while (node.body.kind !== 225) {
                 node = node.body;
                 write(".");
                 writeTextOfNode(currentText, node.name);
@@ -25166,7 +26773,7 @@ var ts;
             write(";");
             writeLine();
             enclosingDeclaration = prevEnclosingDeclaration;
-            function getTypeAliasDeclarationVisibilityError(symbolAccesibilityResult) {
+            function getTypeAliasDeclarationVisibilityError(symbolAccessibilityResult) {
                 return {
                     diagnosticMessage: ts.Diagnostics.Exported_type_alias_0_has_or_is_using_private_name_1,
                     errorNode: node.type,
@@ -25202,7 +26809,7 @@ var ts;
             writeLine();
         }
         function isPrivateMethodTypeParameter(node) {
-            return node.parent.kind === 144 && (node.parent.flags & 16);
+            return node.parent.kind === 146 && (node.parent.flags & 8);
         }
         function emitTypeParameters(typeParameters) {
             function emitTypeParameter(node) {
@@ -25212,49 +26819,49 @@ var ts;
                 writeTextOfNode(currentText, node.name);
                 if (node.constraint && !isPrivateMethodTypeParameter(node)) {
                     write(" extends ");
-                    if (node.parent.kind === 153 ||
-                        node.parent.kind === 154 ||
-                        (node.parent.parent && node.parent.parent.kind === 156)) {
-                        ts.Debug.assert(node.parent.kind === 144 ||
-                            node.parent.kind === 143 ||
-                            node.parent.kind === 153 ||
-                            node.parent.kind === 154 ||
-                            node.parent.kind === 148 ||
-                            node.parent.kind === 149);
+                    if (node.parent.kind === 155 ||
+                        node.parent.kind === 156 ||
+                        (node.parent.parent && node.parent.parent.kind === 158)) {
+                        ts.Debug.assert(node.parent.kind === 146 ||
+                            node.parent.kind === 145 ||
+                            node.parent.kind === 155 ||
+                            node.parent.kind === 156 ||
+                            node.parent.kind === 150 ||
+                            node.parent.kind === 151);
                         emitType(node.constraint);
                     }
                     else {
                         emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.constraint, getTypeParameterConstraintVisibilityError);
                     }
                 }
-                function getTypeParameterConstraintVisibilityError(symbolAccesibilityResult) {
+                function getTypeParameterConstraintVisibilityError(symbolAccessibilityResult) {
                     var diagnosticMessage;
                     switch (node.parent.kind) {
-                        case 217:
+                        case 220:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_class_has_or_is_using_private_name_1;
                             break;
-                        case 218:
+                        case 221:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1;
                             break;
-                        case 149:
+                        case 151:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
                             break;
-                        case 148:
+                        case 150:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
                             break;
-                        case 144:
-                        case 143:
-                            if (node.parent.flags & 64) {
+                        case 146:
+                        case 145:
+                            if (node.parent.flags & 32) {
                                 diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                             }
-                            else if (node.parent.parent.kind === 217) {
+                            else if (node.parent.parent.kind === 220) {
                                 diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
                             }
                             else {
                                 diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                             }
                             break;
-                        case 216:
+                        case 219:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_function_has_or_is_using_private_name_1;
                             break;
                         default:
@@ -25285,9 +26892,13 @@ var ts;
                 else if (!isImplementsList && node.expression.kind === 93) {
                     write("null");
                 }
-                function getHeritageClauseVisibilityError(symbolAccesibilityResult) {
+                else {
+                    writer.getSymbolAccessibilityDiagnostic = getHeritageClauseVisibilityError;
+                    resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2, writer);
+                }
+                function getHeritageClauseVisibilityError(symbolAccessibilityResult) {
                     var diagnosticMessage;
-                    if (node.parent.parent.kind === 217) {
+                    if (node.parent.parent.kind === 220) {
                         diagnosticMessage = isImplementsList ?
                             ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 :
                             ts.Diagnostics.Extends_clause_of_exported_class_0_has_or_is_using_private_name_1;
@@ -25307,7 +26918,7 @@ var ts;
             function emitParameterProperties(constructorDeclaration) {
                 if (constructorDeclaration) {
                     ts.forEach(constructorDeclaration.parameters, function (param) {
-                        if (param.flags & 56) {
+                        if (param.flags & 28) {
                             emitPropertyDeclaration(param);
                         }
                     });
@@ -25361,61 +26972,61 @@ var ts;
                 return;
             }
             emitJsDocComments(node);
-            emitClassMemberDeclarationFlags(node);
+            emitClassMemberDeclarationFlags(node.flags);
             emitVariableDeclaration(node);
             write(";");
             writeLine();
         }
         function emitVariableDeclaration(node) {
-            if (node.kind !== 214 || resolver.isDeclarationVisible(node)) {
+            if (node.kind !== 217 || resolver.isDeclarationVisible(node)) {
                 if (ts.isBindingPattern(node.name)) {
                     emitBindingPattern(node.name);
                 }
                 else {
                     writeTextOfNode(currentText, node.name);
-                    if ((node.kind === 142 || node.kind === 141) && ts.hasQuestionToken(node)) {
+                    if ((node.kind === 144 || node.kind === 143) && ts.hasQuestionToken(node)) {
                         write("?");
                     }
-                    if ((node.kind === 142 || node.kind === 141) && node.parent.kind === 156) {
+                    if ((node.kind === 144 || node.kind === 143) && node.parent.kind === 158) {
                         emitTypeOfVariableDeclarationFromTypeLiteral(node);
                     }
-                    else if (!(node.flags & 16)) {
+                    else if (!(node.flags & 8)) {
                         writeTypeOfDeclaration(node, node.type, getVariableDeclarationTypeVisibilityError);
                     }
                 }
             }
-            function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult) {
-                if (node.kind === 214) {
-                    return symbolAccesibilityResult.errorModuleName ?
-                        symbolAccesibilityResult.accessibility === 2 ?
+            function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
+                if (node.kind === 217) {
+                    return symbolAccessibilityResult.errorModuleName ?
+                        symbolAccessibilityResult.accessibility === 2 ?
                             ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                             ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Exported_variable_0_has_or_is_using_private_name_1;
                 }
-                else if (node.kind === 142 || node.kind === 141) {
-                    if (node.flags & 64) {
-                        return symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
+                else if (node.kind === 144 || node.kind === 143) {
+                    if (node.flags & 32) {
+                        return symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 ?
                                 ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                 ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
                     }
-                    else if (node.parent.kind === 217) {
-                        return symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
+                    else if (node.parent.kind === 220) {
+                        return symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 ?
                                 ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                 ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_private_name_1;
                     }
                     else {
-                        return symbolAccesibilityResult.errorModuleName ?
+                        return symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_private_name_1;
                     }
                 }
             }
-            function getVariableDeclarationTypeVisibilityError(symbolAccesibilityResult) {
-                var diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult);
+            function getVariableDeclarationTypeVisibilityError(symbolAccessibilityResult) {
+                var diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult);
                 return diagnosticMessage !== undefined ? {
                     diagnosticMessage: diagnosticMessage,
                     errorNode: node,
@@ -25426,15 +27037,15 @@ var ts;
                 var elements = [];
                 for (var _i = 0, _a = bindingPattern.elements; _i < _a.length; _i++) {
                     var element = _a[_i];
-                    if (element.kind !== 190) {
+                    if (element.kind !== 192) {
                         elements.push(element);
                     }
                 }
                 emitCommaList(elements, emitBindingElement);
             }
             function emitBindingElement(bindingElement) {
-                function getBindingElementTypeVisibilityError(symbolAccesibilityResult) {
-                    var diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult);
+                function getBindingElementTypeVisibilityError(symbolAccessibilityResult) {
+                    var diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult);
                     return diagnosticMessage !== undefined ? {
                         diagnosticMessage: diagnosticMessage,
                         errorNode: bindingElement,
@@ -25486,13 +27097,13 @@ var ts;
             if (node === accessors.firstAccessor) {
                 emitJsDocComments(accessors.getAccessor);
                 emitJsDocComments(accessors.setAccessor);
-                emitClassMemberDeclarationFlags(node);
+                emitClassMemberDeclarationFlags(node.flags | (accessors.setAccessor ? 0 : 64));
                 writeTextOfNode(currentText, node.name);
-                if (!(node.flags & 16)) {
+                if (!(node.flags & 8)) {
                     accessorWithTypeAnnotation = node;
                     var type = getTypeAnnotationFromAccessor(node);
                     if (!type) {
-                        var anotherAccessor = node.kind === 146 ? accessors.setAccessor : accessors.getAccessor;
+                        var anotherAccessor = node.kind === 148 ? accessors.setAccessor : accessors.getAccessor;
                         type = getTypeAnnotationFromAccessor(anotherAccessor);
                         if (type) {
                             accessorWithTypeAnnotation = anotherAccessor;
@@ -25505,23 +27116,23 @@ var ts;
             }
             function getTypeAnnotationFromAccessor(accessor) {
                 if (accessor) {
-                    return accessor.kind === 146
+                    return accessor.kind === 148
                         ? accessor.type
                         : accessor.parameters.length > 0
                             ? accessor.parameters[0].type
                             : undefined;
                 }
             }
-            function getAccessorDeclarationTypeVisibilityError(symbolAccesibilityResult) {
+            function getAccessorDeclarationTypeVisibilityError(symbolAccessibilityResult) {
                 var diagnosticMessage;
-                if (accessorWithTypeAnnotation.kind === 147) {
-                    if (accessorWithTypeAnnotation.parent.flags & 64) {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                if (accessorWithTypeAnnotation.kind === 149) {
+                    if (accessorWithTypeAnnotation.parent.flags & 32) {
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1;
                     }
                     else {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1;
                     }
@@ -25532,16 +27143,16 @@ var ts;
                     };
                 }
                 else {
-                    if (accessorWithTypeAnnotation.flags & 64) {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
+                    if (accessorWithTypeAnnotation.flags & 32) {
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 ?
                                 ts.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 :
                                 ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0;
                     }
                     else {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 ?
                                 ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
                                 ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0;
@@ -25560,17 +27171,17 @@ var ts;
             }
             if (!resolver.isImplementationOfOverload(node)) {
                 emitJsDocComments(node);
-                if (node.kind === 216) {
+                if (node.kind === 219) {
                     emitModuleElementDeclarationFlags(node);
                 }
-                else if (node.kind === 144) {
-                    emitClassMemberDeclarationFlags(node);
+                else if (node.kind === 146 || node.kind === 147) {
+                    emitClassMemberDeclarationFlags(node.flags);
                 }
-                if (node.kind === 216) {
+                if (node.kind === 219) {
                     write("function ");
                     writeTextOfNode(currentText, node.name);
                 }
-                else if (node.kind === 145) {
+                else if (node.kind === 147) {
                     write("constructor");
                 }
                 else {
@@ -25589,31 +27200,32 @@ var ts;
         function emitSignatureDeclaration(node) {
             var prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
-            if (node.kind === 149 || node.kind === 154) {
-                write("new ");
-            }
-            emitTypeParameters(node.typeParameters);
-            if (node.kind === 150) {
+            if (node.kind === 152) {
+                emitClassMemberDeclarationFlags(node.flags);
                 write("[");
             }
             else {
+                if (node.kind === 151 || node.kind === 156) {
+                    write("new ");
+                }
+                emitTypeParameters(node.typeParameters);
                 write("(");
             }
             emitCommaList(node.parameters, emitParameterDeclaration);
-            if (node.kind === 150) {
+            if (node.kind === 152) {
                 write("]");
             }
             else {
                 write(")");
             }
-            var isFunctionTypeOrConstructorType = node.kind === 153 || node.kind === 154;
-            if (isFunctionTypeOrConstructorType || node.parent.kind === 156) {
+            var isFunctionTypeOrConstructorType = node.kind === 155 || node.kind === 156;
+            if (isFunctionTypeOrConstructorType || node.parent.kind === 158) {
                 if (node.type) {
                     write(isFunctionTypeOrConstructorType ? " => " : ": ");
                     emitType(node.type);
                 }
             }
-            else if (node.kind !== 145 && !(node.flags & 16)) {
+            else if (node.kind !== 147 && !(node.flags & 8)) {
                 writeReturnTypeAtSignature(node, getReturnTypeVisibilityError);
             }
             enclosingDeclaration = prevEnclosingDeclaration;
@@ -25621,49 +27233,49 @@ var ts;
                 write(";");
                 writeLine();
             }
-            function getReturnTypeVisibilityError(symbolAccesibilityResult) {
+            function getReturnTypeVisibilityError(symbolAccessibilityResult) {
                 var diagnosticMessage;
                 switch (node.kind) {
-                    case 149:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                    case 151:
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0;
                         break;
-                    case 148:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                    case 150:
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0;
                         break;
-                    case 150:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                    case 152:
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0;
                         break;
-                    case 144:
-                    case 143:
-                        if (node.flags & 64) {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 ?
+                    case 146:
+                    case 145:
+                        if (node.flags & 32) {
+                            diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                                symbolAccessibilityResult.accessibility === 2 ?
                                     ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
                                     ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                                 ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0;
                         }
-                        else if (node.parent.kind === 217) {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 ?
+                        else if (node.parent.kind === 220) {
+                            diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                                symbolAccessibilityResult.accessibility === 2 ?
                                     ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
                                     ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                                 ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0;
                         }
                         else {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                            diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                                 ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                                 ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
                         }
                         break;
-                    case 216:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
+                    case 219:
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 ?
                                 ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
                                 ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_private_name_0;
@@ -25693,62 +27305,62 @@ var ts;
                 write("?");
             }
             decreaseIndent();
-            if (node.parent.kind === 153 ||
-                node.parent.kind === 154 ||
-                node.parent.parent.kind === 156) {
+            if (node.parent.kind === 155 ||
+                node.parent.kind === 156 ||
+                node.parent.parent.kind === 158) {
                 emitTypeOfVariableDeclarationFromTypeLiteral(node);
             }
-            else if (!(node.parent.flags & 16)) {
+            else if (!(node.parent.flags & 8)) {
                 writeTypeOfDeclaration(node, node.type, getParameterDeclarationTypeVisibilityError);
             }
-            function getParameterDeclarationTypeVisibilityError(symbolAccesibilityResult) {
-                var diagnosticMessage = getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult);
+            function getParameterDeclarationTypeVisibilityError(symbolAccessibilityResult) {
+                var diagnosticMessage = getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult);
                 return diagnosticMessage !== undefined ? {
                     diagnosticMessage: diagnosticMessage,
                     errorNode: node,
                     typeName: node.name
                 } : undefined;
             }
-            function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult) {
+            function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
                 switch (node.parent.kind) {
-                    case 145:
-                        return symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
+                    case 147:
+                        return symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 ?
                                 ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                 ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1;
-                    case 149:
-                        return symbolAccesibilityResult.errorModuleName ?
+                    case 151:
+                        return symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
-                    case 148:
-                        return symbolAccesibilityResult.errorModuleName ?
+                    case 150:
+                        return symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
-                    case 144:
-                    case 143:
-                        if (node.parent.flags & 64) {
-                            return symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 ?
+                    case 146:
+                    case 145:
+                        if (node.parent.flags & 32) {
+                            return symbolAccessibilityResult.errorModuleName ?
+                                symbolAccessibilityResult.accessibility === 2 ?
                                     ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                     ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                                 ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                         }
-                        else if (node.parent.parent.kind === 217) {
-                            return symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 ?
+                        else if (node.parent.parent.kind === 220) {
+                            return symbolAccessibilityResult.errorModuleName ?
+                                symbolAccessibilityResult.accessibility === 2 ?
                                     ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                     ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                                 ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
                         }
                         else {
-                            return symbolAccesibilityResult.errorModuleName ?
+                            return symbolAccessibilityResult.errorModuleName ?
                                 ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                                 ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                         }
-                    case 216:
-                        return symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
+                    case 219:
+                        return symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 ?
                                 ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                 ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_private_name_1;
@@ -25757,12 +27369,12 @@ var ts;
                 }
             }
             function emitBindingPattern(bindingPattern) {
-                if (bindingPattern.kind === 164) {
+                if (bindingPattern.kind === 166) {
                     write("{");
                     emitCommaList(bindingPattern.elements, emitBindingElement);
                     write("}");
                 }
-                else if (bindingPattern.kind === 165) {
+                else if (bindingPattern.kind === 167) {
                     write("[");
                     var elements = bindingPattern.elements;
                     emitCommaList(elements, emitBindingElement);
@@ -25773,10 +27385,10 @@ var ts;
                 }
             }
             function emitBindingElement(bindingElement) {
-                if (bindingElement.kind === 190) {
+                if (bindingElement.kind === 192) {
                     write(" ");
                 }
-                else if (bindingElement.kind === 166) {
+                else if (bindingElement.kind === 168) {
                     if (bindingElement.propertyName) {
                         writeTextOfNode(currentText, bindingElement.propertyName);
                         write(": ");
@@ -25798,39 +27410,39 @@ var ts;
         }
         function emitNode(node) {
             switch (node.kind) {
-                case 216:
-                case 221:
-                case 224:
-                case 218:
-                case 217:
                 case 219:
+                case 224:
+                case 228:
+                case 221:
                 case 220:
+                case 222:
+                case 223:
                     return emitModuleElement(node, isModuleElementVisible(node));
-                case 196:
+                case 199:
                     return emitModuleElement(node, isVariableStatementVisible(node));
-                case 225:
+                case 229:
                     return emitModuleElement(node, !node.importClause);
-                case 231:
+                case 235:
                     return emitExportDeclaration(node);
+                case 147:
+                case 146:
                 case 145:
+                    return writeFunctionDeclaration(node);
+                case 151:
+                case 150:
+                case 152:
+                    return emitSignatureDeclarationWithJsDocComments(node);
+                case 148:
+                case 149:
+                    return emitAccessorDeclaration(node);
                 case 144:
                 case 143:
-                    return writeFunctionDeclaration(node);
-                case 149:
-                case 148:
-                case 150:
-                    return emitSignatureDeclarationWithJsDocComments(node);
-                case 146:
-                case 147:
-                    return emitAccessorDeclaration(node);
-                case 142:
-                case 141:
                     return emitPropertyDeclaration(node);
-                case 250:
+                case 254:
                     return emitEnumMemberDeclaration(node);
-                case 230:
+                case 234:
                     return emitExportAssignment(node);
-                case 251:
+                case 255:
                     return emitSourceFile(node);
             }
         }
@@ -25845,7 +27457,7 @@ var ts;
             }
             if (declFileName) {
                 declFileName = ts.getRelativePathToDirectoryOrUrl(ts.getDirectoryPath(ts.normalizeSlashes(declarationFilePath)), declFileName, host.getCurrentDirectory(), host.getCanonicalFileName, false);
-                referencePathsOutput += "/// <reference path=\"" + declFileName + "\" />" + newLine;
+                referencePathsOutput += '/// <reference path="' + declFileName + '" />' + newLine;
             }
             return addedBundledEmitReference;
             function getDeclFileName(emitFileNames, sourceFiles, isBundledEmit) {
@@ -26154,14 +27766,16 @@ var ts;
     };
     function emitFiles(resolver, host, targetSourceFile) {
         var extendsHelper = "\nvar __extends = (this && this.__extends) || function (d, b) {\n    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];\n    function __() { this.constructor = d; }\n    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());\n};";
+        var assignHelper = "\nvar __assign = (this && this.__assign) || Object.assign || function(t) {\n    for (var s, i = 1, n = arguments.length; i < n; i++) {\n        s = arguments[i];\n        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))\n            t[p] = s[p];\n    }\n    return t;\n};";
         var decorateHelper = "\nvar __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {\n    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;\n    if (typeof Reflect === \"object\" && typeof Reflect.decorate === \"function\") r = Reflect.decorate(decorators, target, key, desc);\n    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;\n    return c > 3 && r && Object.defineProperty(target, key, r), r;\n};";
         var metadataHelper = "\nvar __metadata = (this && this.__metadata) || function (k, v) {\n    if (typeof Reflect === \"object\" && typeof Reflect.metadata === \"function\") return Reflect.metadata(k, v);\n};";
         var paramHelper = "\nvar __param = (this && this.__param) || function (paramIndex, decorator) {\n    return function (target, key) { decorator(target, key, paramIndex); }\n};";
-        var awaiterHelper = "\nvar __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n    return new P(function (resolve, reject) {\n        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n        function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }\n        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }\n        step((generator = generator.call(thisArg, _arguments)).next());\n    });\n};";
+        var awaiterHelper = "\nvar __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n    return new (P || (P = Promise))(function (resolve, reject) {\n        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n        function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }\n        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }\n        step((generator = generator.apply(thisArg, _arguments)).next());\n    });\n};";
         var compilerOptions = host.getCompilerOptions();
         var languageVersion = ts.getEmitScriptTarget(compilerOptions);
         var modulekind = ts.getEmitModuleKind(compilerOptions);
         var sourceMapDataList = compilerOptions.sourceMap || compilerOptions.inlineSourceMap ? [] : undefined;
+        var emittedFilesList = compilerOptions.listEmittedFiles ? [] : undefined;
         var emitterDiagnostics = ts.createDiagnosticCollection();
         var emitSkipped = false;
         var newLine = host.getNewLine();
@@ -26170,6 +27784,7 @@ var ts;
         return {
             emitSkipped: emitSkipped,
             diagnostics: emitterDiagnostics.getDiagnostics(),
+            emittedFiles: emittedFilesList,
             sourceMaps: sourceMapDataList
         };
         function isUniqueLocalName(name, container) {
@@ -26226,11 +27841,14 @@ var ts;
             var isEs6Module;
             var isCurrentFileExternalModule;
             var exportFunctionForFile;
+            var contextObjectForFile;
             var generatedNameSet;
             var nodeToGeneratedName;
             var computedPropertyNamesToGeneratedNames;
+            var decoratedClassAliases;
             var convertedLoopState;
             var extendsEmitted;
+            var assignEmitted;
             var decorateEmitted;
             var paramEmitted;
             var awaiterEmitted;
@@ -26247,19 +27865,19 @@ var ts;
             var emitLeadingCommentsOfPosition = compilerOptions.removeComments ? function (pos) { } : emitLeadingCommentsOfPositionWorker;
             var setSourceMapWriterEmit = compilerOptions.sourceMap || compilerOptions.inlineSourceMap ? changeSourceMapEmit : function (writer) { };
             var moduleEmitDelegates = (_a = {},
-                _a[5] = emitES6Module,
-                _a[2] = emitAMDModule,
-                _a[4] = emitSystemModule,
-                _a[3] = emitUMDModule,
-                _a[1] = emitCommonJSModule,
+                _a[ts.ModuleKind.ES6] = emitES6Module,
+                _a[ts.ModuleKind.AMD] = emitAMDModule,
+                _a[ts.ModuleKind.System] = emitSystemModule,
+                _a[ts.ModuleKind.UMD] = emitUMDModule,
+                _a[ts.ModuleKind.CommonJS] = emitCommonJSModule,
                 _a
             );
             var bundleEmitDelegates = (_b = {},
-                _b[5] = function () { },
-                _b[2] = emitAMDModule,
-                _b[4] = emitSystemModule,
-                _b[3] = function () { },
-                _b[1] = function () { },
+                _b[ts.ModuleKind.ES6] = function () { },
+                _b[ts.ModuleKind.AMD] = emitAMDModule,
+                _b[ts.ModuleKind.System] = emitSystemModule,
+                _b[ts.ModuleKind.UMD] = function () { },
+                _b[ts.ModuleKind.CommonJS] = function () { },
                 _b
             );
             return doEmit;
@@ -26267,6 +27885,7 @@ var ts;
                 sourceMap.initialize(jsFilePath, sourceMapFilePath, sourceFiles, isBundledEmit);
                 generatedNameSet = {};
                 nodeToGeneratedName = [];
+                decoratedClassAliases = [];
                 isOwnFileEmit = !isBundledEmit;
                 if (isBundledEmit && modulekind) {
                     ts.forEach(sourceFiles, emitEmitHelpers);
@@ -26277,21 +27896,24 @@ var ts;
                 if (sourceMappingURL) {
                     write("//# sourceMappingURL=" + sourceMappingURL);
                 }
-                writeEmittedFiles(writer.getText(), jsFilePath, sourceMapFilePath, compilerOptions.emitBOM);
+                writeEmittedFiles(writer.getText(), jsFilePath, sourceMapFilePath, compilerOptions.emitBOM, sourceFiles);
                 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;
@@ -26310,6 +27932,7 @@ var ts;
                 currentText = sourceFile.text;
                 currentLineMap = ts.getLineStarts(sourceFile);
                 exportFunctionForFile = undefined;
+                contextObjectForFile = undefined;
                 isEs6Module = sourceFile.symbol && sourceFile.symbol.exports && !!sourceFile.symbol.exports["___esModule"];
                 renamedDependencies = sourceFile.renamedDependencies;
                 currentFileIdentifiers = sourceFile.identifiers;
@@ -26324,19 +27947,19 @@ var ts;
             }
             function makeTempVariableName(flags) {
                 if (flags && !(tempFlags & flags)) {
-                    var name_22 = flags === 268435456 ? "_i" : "_n";
-                    if (isUniqueName(name_22)) {
+                    var name_23 = flags === 268435456 ? "_i" : "_n";
+                    if (isUniqueName(name_23)) {
                         tempFlags |= flags;
-                        return name_22;
+                        return name_23;
                     }
                 }
                 while (true) {
                     var count = tempFlags & 268435455;
                     tempFlags++;
                     if (count !== 8 && count !== 13) {
-                        var name_23 = count < 26 ? "_" + String.fromCharCode(97 + count) : "_" + (count - 26);
-                        if (isUniqueName(name_23)) {
-                            return name_23;
+                        var name_24 = count < 26 ? "_" + String.fromCharCode(97 + count) : "_" + (count - 26);
+                        if (isUniqueName(name_24)) {
+                            return name_24;
                         }
                     }
                 }
@@ -26374,17 +27997,17 @@ var ts;
                 switch (node.kind) {
                     case 69:
                         return makeUniqueName(node.text);
-                    case 221:
-                    case 220:
+                    case 224:
+                    case 223:
                         return generateNameForModuleOrEnum(node);
-                    case 225:
-                    case 231:
+                    case 229:
+                    case 235:
                         return generateNameForImportOrExportDeclaration(node);
-                    case 216:
-                    case 217:
-                    case 230:
+                    case 219:
+                    case 220:
+                    case 234:
                         return generateNameForExportDefault();
-                    case 189:
+                    case 191:
                         return generateNameForClassExpression();
                 }
             }
@@ -26392,14 +28015,14 @@ var ts;
                 var id = ts.getNodeId(node);
                 return nodeToGeneratedName[id] || (nodeToGeneratedName[id] = ts.unescapeIdentifier(generateNameForNode(node)));
             }
-            function writeEmittedFiles(emitOutput, jsFilePath, sourceMapFilePath, writeByteOrderMark) {
+            function writeEmittedFiles(emitOutput, jsFilePath, sourceMapFilePath, writeByteOrderMark, sourceFiles) {
                 if (compilerOptions.sourceMap && !compilerOptions.inlineSourceMap) {
-                    ts.writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(), false);
+                    ts.writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(), false, sourceFiles);
                 }
                 if (sourceMapDataList) {
                     sourceMapDataList.push(sourceMap.getSourceMapData());
                 }
-                ts.writeFile(host, emitterDiagnostics, jsFilePath, emitOutput, writeByteOrderMark);
+                ts.writeFile(host, emitterDiagnostics, jsFilePath, emitOutput, writeByteOrderMark, sourceFiles);
             }
             function createTempVariable(flags) {
                 var result = ts.createSynthesizedNode(69);
@@ -26564,14 +28187,14 @@ var ts;
             }
             function getLiteralText(node) {
                 if (languageVersion < 2 && (ts.isTemplateLiteralKind(node.kind) || node.hasExtendedUnicodeEscape)) {
-                    return getQuotedEscapedLiteralText("\"", node.text, "\"");
+                    return getQuotedEscapedLiteralText('"', node.text, '"');
                 }
                 if (node.parent) {
                     return ts.getTextOfNodeFromSourceText(currentText, node);
                 }
                 switch (node.kind) {
                     case 9:
-                        return getQuotedEscapedLiteralText("\"", node.text, "\"");
+                        return getQuotedEscapedLiteralText('"', node.text, '"');
                     case 11:
                         return getQuotedEscapedLiteralText("`", node.text, "`");
                     case 12:
@@ -26624,10 +28247,10 @@ var ts;
                 emitParenthesizedIf(node.tag, needsParenthesisForPropertyAccessOrInvocation(node.tag));
                 write("(");
                 emit(tempVariable);
-                if (node.template.kind === 186) {
+                if (node.template.kind === 188) {
                     ts.forEach(node.template.templateSpans, function (templateSpan) {
                         write(", ");
-                        var needsParens = templateSpan.expression.kind === 184
+                        var needsParens = templateSpan.expression.kind === 186
                             && templateSpan.expression.operatorToken.kind === 24;
                         emitParenthesizedIf(templateSpan.expression, needsParens);
                     });
@@ -26651,7 +28274,7 @@ var ts;
                 }
                 for (var i = 0, n = node.templateSpans.length; i < n; i++) {
                     var templateSpan = node.templateSpans[i];
-                    var needsParens = templateSpan.expression.kind !== 175
+                    var needsParens = templateSpan.expression.kind !== 177
                         && comparePrecedenceToBinaryPlus(templateSpan.expression) !== 1;
                     if (i > 0 || headEmitted) {
                         write(" + ");
@@ -26671,11 +28294,11 @@ var ts;
                 }
                 function templateNeedsParens(template, parent) {
                     switch (parent.kind) {
-                        case 171:
-                        case 172:
-                            return parent.expression === template;
                         case 173:
+                        case 174:
+                            return parent.expression === template;
                         case 175:
+                        case 177:
                             return false;
                         default:
                             return comparePrecedenceToBinaryPlus(parent) !== -1;
@@ -26683,7 +28306,7 @@ var ts;
                 }
                 function comparePrecedenceToBinaryPlus(expression) {
                     switch (expression.kind) {
-                        case 184:
+                        case 186:
                             switch (expression.operatorToken.kind) {
                                 case 37:
                                 case 39:
@@ -26695,8 +28318,8 @@ var ts;
                                 default:
                                     return -1;
                             }
+                        case 189:
                         case 187:
-                        case 185:
                             return -1;
                         default:
                             return 1;
@@ -26710,9 +28333,9 @@ var ts;
             function jsxEmitReact(node) {
                 function emitTagName(name) {
                     if (name.kind === 69 && ts.isIntrinsicJsxName(name.text)) {
-                        write("\"");
+                        write('"');
                         emit(name);
-                        write("\"");
+                        write('"');
                     }
                     else {
                         emit(name);
@@ -26723,9 +28346,9 @@ var ts;
                         emit(name);
                     }
                     else {
-                        write("\"");
+                        write('"');
                         emit(name);
-                        write("\"");
+                        write('"');
                     }
                 }
                 function emitJsxAttribute(node) {
@@ -26752,12 +28375,11 @@ var ts;
                     }
                     else {
                         var attrs = openingNode.attributes;
-                        if (ts.forEach(attrs, function (attr) { return attr.kind === 242; })) {
-                            emitExpressionIdentifier(syntheticReactRef);
-                            write(".__spread(");
+                        if (ts.forEach(attrs, function (attr) { return attr.kind === 246; })) {
+                            write("__assign(");
                             var haveOpenedObjectLiteral = false;
                             for (var i = 0; i < attrs.length; i++) {
-                                if (attrs[i].kind === 242) {
+                                if (attrs[i].kind === 246) {
                                     if (i === 0) {
                                         write("{}, ");
                                     }
@@ -26771,7 +28393,7 @@ var ts;
                                     emit(attrs[i].expression);
                                 }
                                 else {
-                                    ts.Debug.assert(attrs[i].kind === 241);
+                                    ts.Debug.assert(attrs[i].kind === 245);
                                     if (haveOpenedObjectLiteral) {
                                         write(", ");
                                     }
@@ -26801,32 +28423,52 @@ var ts;
                         }
                     }
                     if (children) {
-                        for (var i = 0; i < children.length; i++) {
-                            if (children[i].kind === 243 && !(children[i].expression)) {
-                                continue;
-                            }
-                            if (children[i].kind === 239) {
-                                var text = getTextToEmit(children[i]);
-                                if (text !== undefined) {
-                                    write(", \"");
-                                    write(text);
-                                    write("\"");
+                        var firstChild = void 0;
+                        var multipleEmittableChildren = false;
+                        for (var i = 0, n = children.length; i < n; i++) {
+                            var jsxChild = children[i];
+                            if (isJsxChildEmittable(jsxChild)) {
+                                if (!firstChild) {
+                                    write(", ");
+                                    firstChild = jsxChild;
+                                }
+                                else {
+                                    if (!multipleEmittableChildren) {
+                                        multipleEmittableChildren = true;
+                                        increaseIndent();
+                                        writeLine();
+                                        emit(firstChild);
+                                    }
+                                    write(", ");
+                                    writeLine();
+                                    emit(jsxChild);
                                 }
                             }
+                        }
+                        if (multipleEmittableChildren) {
+                            decreaseIndent();
+                        }
+                        else if (firstChild) {
+                            if (firstChild.kind !== 240 && firstChild.kind !== 241) {
+                                emit(firstChild);
+                            }
                             else {
-                                write(", ");
-                                emit(children[i]);
+                                increaseIndent();
+                                writeLine();
+                                emit(firstChild);
+                                writeLine();
+                                decreaseIndent();
                             }
                         }
                     }
                     write(")");
                     emitTrailingComments(openingNode);
                 }
-                if (node.kind === 236) {
+                if (node.kind === 240) {
                     emitJsxElement(node.openingElement, node.children);
                 }
                 else {
-                    ts.Debug.assert(node.kind === 237);
+                    ts.Debug.assert(node.kind === 241);
                     emitJsxElement(node);
                 }
             }
@@ -26848,11 +28490,11 @@ var ts;
                         if (i > 0) {
                             write(" ");
                         }
-                        if (attribs[i].kind === 242) {
+                        if (attribs[i].kind === 246) {
                             emitJsxSpreadAttribute(attribs[i]);
                         }
                         else {
-                            ts.Debug.assert(attribs[i].kind === 241);
+                            ts.Debug.assert(attribs[i].kind === 245);
                             emitJsxAttribute(attribs[i]);
                         }
                     }
@@ -26860,11 +28502,11 @@ var ts;
                 function emitJsxOpeningOrSelfClosingElement(node) {
                     write("<");
                     emit(node.tagName);
-                    if (node.attributes.length > 0 || (node.kind === 237)) {
+                    if (node.attributes.length > 0 || (node.kind === 241)) {
                         write(" ");
                     }
                     emitAttributes(node.attributes);
-                    if (node.kind === 237) {
+                    if (node.kind === 241) {
                         write("/>");
                     }
                     else {
@@ -26883,20 +28525,20 @@ var ts;
                     }
                     emitJsxClosingElement(node.closingElement);
                 }
-                if (node.kind === 236) {
+                if (node.kind === 240) {
                     emitJsxElement(node);
                 }
                 else {
-                    ts.Debug.assert(node.kind === 237);
+                    ts.Debug.assert(node.kind === 241);
                     emitJsxOpeningOrSelfClosingElement(node);
                 }
             }
             function emitExpressionForPropertyName(node) {
-                ts.Debug.assert(node.kind !== 166);
+                ts.Debug.assert(node.kind !== 168);
                 if (node.kind === 9) {
                     emitLiteral(node);
                 }
-                else if (node.kind === 137) {
+                else if (node.kind === 139) {
                     if (ts.nodeIsDecorated(node.parent)) {
                         if (!computedPropertyNamesToGeneratedNames) {
                             computedPropertyNamesToGeneratedNames = [];
@@ -26914,88 +28556,85 @@ var ts;
                     emit(node.expression);
                 }
                 else {
-                    write("\"");
+                    write('"');
                     if (node.kind === 8) {
                         write(node.text);
                     }
                     else {
                         writeTextOfNode(currentText, node);
                     }
-                    write("\"");
+                    write('"');
                 }
             }
             function isExpressionIdentifier(node) {
                 var parent = node.parent;
                 switch (parent.kind) {
-                    case 167:
-                    case 192:
-                    case 184:
-                    case 171:
-                    case 244:
-                    case 137:
-                    case 185:
-                    case 140:
-                    case 178:
-                    case 200:
-                    case 170:
-                    case 230:
-                    case 198:
-                    case 191:
-                    case 202:
-                    case 203:
-                    case 204:
-                    case 199:
-                    case 240:
-                    case 237:
-                    case 238:
-                    case 242:
-                    case 243:
-                    case 172:
-                    case 175:
-                    case 183:
-                    case 182:
-                    case 207:
-                    case 249:
-                    case 188:
-                    case 209:
-                    case 173:
-                    case 193:
-                    case 211:
-                    case 174:
-                    case 179:
-                    case 180:
-                    case 201:
-                    case 208:
-                    case 187:
-                        return true;
-                    case 166:
-                    case 250:
-                    case 139:
-                    case 248:
-                    case 142:
-                    case 214:
-                        return parent.initializer === node;
                     case 169:
-                        return parent.expression === node;
+                    case 194:
+                    case 186:
+                    case 173:
+                    case 248:
+                    case 139:
+                    case 187:
+                    case 142:
+                    case 180:
+                    case 203:
+                    case 172:
+                    case 234:
+                    case 201:
+                    case 193:
+                    case 205:
+                    case 206:
+                    case 207:
+                    case 202:
+                    case 244:
+                    case 241:
+                    case 242:
+                    case 246:
+                    case 247:
+                    case 174:
+                    case 195:
                     case 177:
+                    case 185:
+                    case 184:
+                    case 210:
+                    case 253:
+                    case 190:
+                    case 212:
+                    case 175:
+                    case 196:
+                    case 214:
                     case 176:
+                    case 181:
+                    case 182:
+                    case 204:
+                    case 211:
+                    case 189:
+                        return true;
+                    case 168:
+                    case 254:
+                    case 141:
+                    case 252:
+                    case 144:
+                    case 217:
+                        return parent.initializer === node;
+                    case 171:
+                        return parent.expression === node;
+                    case 179:
+                    case 178:
                         return parent.body === node;
-                    case 224:
+                    case 228:
                         return parent.moduleReference === node;
-                    case 136:
+                    case 138:
                         return parent.left === node;
                 }
                 return false;
             }
             function emitExpressionIdentifier(node) {
-                if (resolver.getNodeCheckFlags(node) & 2048) {
-                    write("_arguments");
-                    return;
-                }
                 var container = resolver.getReferencedExportContainer(node);
                 if (container) {
-                    if (container.kind === 251) {
-                        if (modulekind !== 5 && modulekind !== 4) {
+                    if (container.kind === 255) {
+                        if (modulekind !== ts.ModuleKind.ES6 && modulekind !== ts.ModuleKind.System) {
                             write("exports.");
                         }
                     }
@@ -27005,20 +28644,20 @@ var ts;
                     }
                 }
                 else {
-                    if (modulekind !== 5) {
+                    if (modulekind !== ts.ModuleKind.ES6) {
                         var declaration = resolver.getReferencedImportDeclaration(node);
                         if (declaration) {
-                            if (declaration.kind === 226) {
+                            if (declaration.kind === 230) {
                                 write(getGeneratedNameForNode(declaration.parent));
-                                write(languageVersion === 0 ? "[\"default\"]" : ".default");
+                                write(languageVersion === 0 ? '["default"]' : ".default");
                                 return;
                             }
-                            else if (declaration.kind === 229) {
+                            else if (declaration.kind === 233) {
                                 write(getGeneratedNameForNode(declaration.parent.parent.parent));
-                                var name_24 = declaration.propertyName || declaration.name;
-                                var identifier = ts.getTextOfNodeFromSourceText(currentText, name_24);
+                                var name_25 = declaration.propertyName || declaration.name;
+                                var identifier = ts.getTextOfNodeFromSourceText(currentText, name_25);
                                 if (languageVersion === 0 && identifier === "default") {
-                                    write("[\"default\"]");
+                                    write('["default"]');
                                 }
                                 else {
                                     write(".");
@@ -27028,13 +28667,23 @@ var ts;
                             }
                         }
                     }
-                    if (languageVersion !== 2) {
-                        var declaration = resolver.getReferencedNestedRedeclaration(node);
+                    if (languageVersion < 2) {
+                        var declaration = resolver.getReferencedDeclarationWithCollidingName(node);
                         if (declaration) {
                             write(getGeneratedNameForNode(declaration.name));
                             return;
                         }
                     }
+                    else if (resolver.getNodeCheckFlags(node) & 1048576) {
+                        var declaration = resolver.getReferencedValueDeclaration(node);
+                        if (declaration) {
+                            var classAlias = decoratedClassAliases[ts.getNodeId(declaration)];
+                            if (classAlias !== undefined) {
+                                write(classAlias);
+                                return;
+                            }
+                        }
+                    }
                 }
                 if (ts.nodeIsSynthesized(node)) {
                     write(node.text);
@@ -27043,15 +28692,15 @@ var ts;
                     writeTextOfNode(currentText, node);
                 }
             }
-            function isNameOfNestedRedeclaration(node) {
+            function isNameOfNestedBlockScopedRedeclarationOrCapturedBinding(node) {
                 if (languageVersion < 2) {
-                    var parent_7 = node.parent;
-                    switch (parent_7.kind) {
-                        case 166:
-                        case 217:
+                    var parent_10 = node.parent;
+                    switch (parent_10.kind) {
+                        case 168:
                         case 220:
-                        case 214:
-                            return parent_7.name === node && resolver.isNestedRedeclaration(parent_7);
+                        case 223:
+                        case 217:
+                            return parent_10.name === node && resolver.isDeclarationWithCollidingName(parent_10);
                     }
                 }
                 return false;
@@ -27059,8 +28708,8 @@ var ts;
             function emitIdentifier(node) {
                 if (convertedLoopState) {
                     if (node.text == "arguments" && resolver.isArgumentsLocalBinding(node)) {
-                        var name_25 = convertedLoopState.argumentsName || (convertedLoopState.argumentsName = makeUniqueName("arguments"));
-                        write(name_25);
+                        var name_26 = convertedLoopState.argumentsName || (convertedLoopState.argumentsName = makeUniqueName("arguments"));
+                        write(name_26);
                         return;
                     }
                 }
@@ -27070,7 +28719,7 @@ var ts;
                 else if (isExpressionIdentifier(node)) {
                     emitExpressionIdentifier(node);
                 }
-                else if (isNameOfNestedRedeclaration(node)) {
+                else if (isNameOfNestedBlockScopedRedeclarationOrCapturedBinding(node)) {
                     write(getGeneratedNameForNode(node));
                 }
                 else if (ts.nodeIsSynthesized(node)) {
@@ -27160,10 +28809,10 @@ var ts;
                 }
             }
             function needsParenthesisForAwaitExpressionAsYield(node) {
-                if (node.parent.kind === 184 && !ts.isAssignmentOperator(node.parent.operatorToken.kind)) {
+                if (node.parent.kind === 186 && !ts.isAssignmentOperator(node.parent.operatorToken.kind)) {
                     return true;
                 }
-                else if (node.parent.kind === 185 && node.parent.condition === node) {
+                else if (node.parent.kind === 187 && node.parent.condition === node) {
                     return true;
                 }
                 return false;
@@ -27171,11 +28820,11 @@ var ts;
             function needsParenthesisForPropertyAccessOrInvocation(node) {
                 switch (node.kind) {
                     case 69:
-                    case 167:
                     case 169:
-                    case 170:
                     case 171:
-                    case 175:
+                    case 172:
+                    case 173:
+                    case 177:
                         return false;
                 }
                 return true;
@@ -27192,17 +28841,17 @@ var ts;
                         write(", ");
                     }
                     var e = elements[pos];
-                    if (e.kind === 188) {
+                    if (e.kind === 190) {
                         e = e.expression;
                         emitParenthesizedIf(e, group === 0 && needsParenthesisForPropertyAccessOrInvocation(e));
                         pos++;
-                        if (pos === length && group === 0 && needsUniqueCopy && e.kind !== 167) {
+                        if (pos === length && group === 0 && needsUniqueCopy && e.kind !== 169) {
                             write(".slice()");
                         }
                     }
                     else {
                         var i = pos;
-                        while (i < length && elements[i].kind !== 188) {
+                        while (i < length && elements[i].kind !== 190) {
                             i++;
                         }
                         write("[");
@@ -27225,7 +28874,7 @@ var ts;
                 }
             }
             function isSpreadElementExpression(node) {
-                return node.kind === 188;
+                return node.kind === 190;
             }
             function emitArrayLiteral(node) {
                 var elements = node.elements;
@@ -27238,7 +28887,7 @@ var ts;
                     write("]");
                 }
                 else {
-                    emitListWithSpread(elements, true, (node.flags & 1024) !== 0, elements.hasTrailingComma, true);
+                    emitListWithSpread(elements, true, node.multiLine, elements.hasTrailingComma, true);
                 }
             }
             function emitObjectLiteralBody(node, numElements) {
@@ -27253,7 +28902,7 @@ var ts;
                         emitLinePreservingList(node, properties, languageVersion >= 1, true);
                     }
                     else {
-                        var multiLine = (node.flags & 1024) !== 0;
+                        var multiLine = node.multiLine;
                         if (!multiLine) {
                             write(" ");
                         }
@@ -27272,7 +28921,7 @@ var ts;
                 write("}");
             }
             function emitDownlevelObjectLiteralWithComputedProperties(node, firstComputedPropertyIndex) {
-                var multiLine = (node.flags & 1024) !== 0;
+                var multiLine = node.multiLine;
                 var properties = node.properties;
                 write("(");
                 if (multiLine) {
@@ -27286,7 +28935,7 @@ var ts;
                     writeComma();
                     var property = properties[i];
                     emitStart(property);
-                    if (property.kind === 146 || property.kind === 147) {
+                    if (property.kind === 148 || property.kind === 149) {
                         var accessors = ts.getAllAccessorDeclarations(node.properties, property);
                         if (property !== accessors.firstAccessor) {
                             continue;
@@ -27337,13 +28986,13 @@ var ts;
                         emitMemberAccessForPropertyName(property.name);
                         emitEnd(property.name);
                         write(" = ");
-                        if (property.kind === 248) {
+                        if (property.kind === 252) {
                             emit(property.initializer);
                         }
-                        else if (property.kind === 249) {
+                        else if (property.kind === 253) {
                             emitExpressionIdentifier(property.name);
                         }
-                        else if (property.kind === 144) {
+                        else if (property.kind === 146) {
                             emitFunctionDeclaration(property);
                         }
                         else {
@@ -27375,7 +29024,7 @@ var ts;
                     var numProperties = properties.length;
                     var numInitialNonComputedProperties = numProperties;
                     for (var i = 0, n = properties.length; i < n; i++) {
-                        if (properties[i].name.kind === 137) {
+                        if (properties[i].name.kind === 139) {
                             numInitialNonComputedProperties = i;
                             break;
                         }
@@ -27389,35 +29038,37 @@ var ts;
                 emitObjectLiteralBody(node, properties.length);
             }
             function createBinaryExpression(left, operator, right, startsOnNewLine) {
-                var result = ts.createSynthesizedNode(184, startsOnNewLine);
+                var result = ts.createSynthesizedNode(186, startsOnNewLine);
                 result.operatorToken = ts.createSynthesizedNode(operator);
                 result.left = left;
                 result.right = right;
                 return result;
             }
             function createPropertyAccessExpression(expression, name) {
-                var result = ts.createSynthesizedNode(169);
+                var result = ts.createSynthesizedNode(171);
                 result.expression = parenthesizeForAccess(expression);
                 result.dotToken = ts.createSynthesizedNode(21);
                 result.name = name;
                 return result;
             }
             function createElementAccessExpression(expression, argumentExpression) {
-                var result = ts.createSynthesizedNode(170);
+                var result = ts.createSynthesizedNode(172);
                 result.expression = parenthesizeForAccess(expression);
                 result.argumentExpression = argumentExpression;
                 return result;
             }
             function parenthesizeForAccess(expr) {
-                while (expr.kind === 174 || expr.kind === 192) {
+                while (expr.kind === 176 ||
+                    expr.kind === 194 ||
+                    expr.kind === 195) {
                     expr = expr.expression;
                 }
                 if (ts.isLeftHandSideExpression(expr) &&
-                    expr.kind !== 172 &&
+                    expr.kind !== 174 &&
                     expr.kind !== 8) {
                     return expr;
                 }
-                var node = ts.createSynthesizedNode(175);
+                var node = ts.createSynthesizedNode(177);
                 node.expression = expr;
                 return node;
             }
@@ -27444,11 +29095,15 @@ var ts;
             }
             function isNamespaceExportReference(node) {
                 var container = resolver.getReferencedExportContainer(node);
-                return container && container.kind !== 251;
+                return container && container.kind !== 255;
+            }
+            function isImportedReference(node) {
+                var declaration = resolver.getReferencedImportDeclaration(node);
+                return declaration && (declaration.kind === 230 || declaration.kind === 233);
             }
             function emitShorthandPropertyAssignment(node) {
                 writeTextOfNode(currentText, node.name);
-                if (modulekind !== 5 || isNamespaceExportReference(node.name)) {
+                if (languageVersion < 2 || (modulekind !== ts.ModuleKind.ES6 && isImportedReference(node.name)) || isNamespaceExportReference(node.name)) {
                     write(": ");
                     emit(node.name);
                 }
@@ -27462,7 +29117,7 @@ var ts;
                 if (constantValue !== undefined) {
                     write(constantValue.toString());
                     if (!compilerOptions.removeComments) {
-                        var propertyName = node.kind === 169 ? ts.declarationNameToString(node.name) : ts.getTextOfNode(node.argumentExpression);
+                        var propertyName = node.kind === 171 ? ts.declarationNameToString(node.name) : ts.getTextOfNode(node.argumentExpression);
                         write(" /* " + propertyName + " */");
                     }
                     return true;
@@ -27473,7 +29128,7 @@ var ts;
                 if (compilerOptions.isolatedModules) {
                     return undefined;
                 }
-                return node.kind === 169 || node.kind === 170
+                return node.kind === 171 || node.kind === 172
                     ? resolver.getConstantValue(node)
                     : undefined;
             }
@@ -27496,6 +29151,14 @@ var ts;
                 if (tryEmitConstantValue(node)) {
                     return;
                 }
+                if (languageVersion === 2 &&
+                    node.expression.kind === 95 &&
+                    isInAsyncMethodWithSuperInES6(node)) {
+                    var name_27 = ts.createSynthesizedNode(9);
+                    name_27.text = node.name.text;
+                    emitSuperAccessInAsyncMethod(node.expression, name_27);
+                    return;
+                }
                 emit(node.expression);
                 var indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, node.dotToken);
                 var shouldEmitSpace = false;
@@ -27553,7 +29216,7 @@ var ts;
                         }
                         emitExpressionIdentifier(node);
                         break;
-                    case 136:
+                    case 138:
                         emitQualifiedNameAsExpression(node, useFallback);
                         break;
                     default:
@@ -27565,16 +29228,25 @@ var ts;
                 if (tryEmitConstantValue(node)) {
                     return;
                 }
+                if (languageVersion === 2 &&
+                    node.expression.kind === 95 &&
+                    isInAsyncMethodWithSuperInES6(node)) {
+                    emitSuperAccessInAsyncMethod(node.expression, node.argumentExpression);
+                    return;
+                }
                 emit(node.expression);
                 write("[");
                 emit(node.argumentExpression);
                 write("]");
             }
             function hasSpreadElement(elements) {
-                return ts.forEach(elements, function (e) { return e.kind === 188; });
+                return ts.forEach(elements, function (e) { return e.kind === 190; });
             }
             function skipParentheses(node) {
-                while (node.kind === 175 || node.kind === 174 || node.kind === 192) {
+                while (node.kind === 177 ||
+                    node.kind === 176 ||
+                    node.kind === 194 ||
+                    node.kind === 195) {
                     node = node.expression;
                 }
                 return node;
@@ -27595,12 +29267,12 @@ var ts;
             function emitCallWithSpread(node) {
                 var target;
                 var expr = skipParentheses(node.expression);
-                if (expr.kind === 169) {
+                if (expr.kind === 171) {
                     target = emitCallTarget(expr.expression);
                     write(".");
                     emit(expr.name);
                 }
-                else if (expr.kind === 170) {
+                else if (expr.kind === 172) {
                     target = emitCallTarget(expr.expression);
                     write("[");
                     emit(expr.argumentExpression);
@@ -27629,23 +29301,42 @@ var ts;
                 emitListWithSpread(node.arguments, false, false, false, true);
                 write(")");
             }
+            function isInAsyncMethodWithSuperInES6(node) {
+                if (languageVersion === 2) {
+                    var container = ts.getSuperContainer(node, false);
+                    if (container && resolver.getNodeCheckFlags(container) & (2048 | 4096)) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+            function emitSuperAccessInAsyncMethod(superNode, argumentExpression) {
+                var container = ts.getSuperContainer(superNode, false);
+                var isSuperBinding = resolver.getNodeCheckFlags(container) & 4096;
+                write("_super(");
+                emit(argumentExpression);
+                write(isSuperBinding ? ").value" : ")");
+            }
             function emitCallExpression(node) {
                 if (languageVersion < 2 && hasSpreadElement(node.arguments)) {
                     emitCallWithSpread(node);
                     return;
                 }
+                var expression = node.expression;
                 var superCall = false;
-                if (node.expression.kind === 95) {
-                    emitSuper(node.expression);
+                var isAsyncMethodWithSuper = false;
+                if (expression.kind === 95) {
+                    emitSuper(expression);
                     superCall = true;
                 }
                 else {
-                    emit(node.expression);
-                    superCall = node.expression.kind === 169 && node.expression.expression.kind === 95;
+                    superCall = ts.isSuperPropertyOrElementAccess(expression);
+                    isAsyncMethodWithSuper = superCall && isInAsyncMethodWithSuperInES6(node);
+                    emit(expression);
                 }
-                if (superCall && languageVersion < 2) {
+                if (superCall && (languageVersion < 2 || isAsyncMethodWithSuper)) {
                     write(".call(");
-                    emitThis(node.expression);
+                    emitThis(expression);
                     if (node.arguments.length) {
                         write(", ");
                         emitCommaList(node.arguments);
@@ -27692,21 +29383,25 @@ var ts;
                 }
             }
             function emitParenExpression(node) {
-                if (!ts.nodeIsSynthesized(node) && node.parent.kind !== 177) {
-                    if (node.expression.kind === 174 || node.expression.kind === 192) {
+                if (!ts.nodeIsSynthesized(node) && node.parent.kind !== 179) {
+                    if (node.expression.kind === 176 ||
+                        node.expression.kind === 194 ||
+                        node.expression.kind === 195) {
                         var operand = node.expression.expression;
-                        while (operand.kind === 174 || operand.kind === 192) {
+                        while (operand.kind === 176 ||
+                            operand.kind === 194 ||
+                            operand.kind === 195) {
                             operand = operand.expression;
                         }
-                        if (operand.kind !== 182 &&
+                        if (operand.kind !== 184 &&
+                            operand.kind !== 182 &&
+                            operand.kind !== 181 &&
                             operand.kind !== 180 &&
-                            operand.kind !== 179 &&
-                            operand.kind !== 178 &&
-                            operand.kind !== 183 &&
-                            operand.kind !== 172 &&
-                            !(operand.kind === 171 && node.parent.kind === 172) &&
-                            !(operand.kind === 176 && node.parent.kind === 171) &&
-                            !(operand.kind === 8 && node.parent.kind === 169)) {
+                            operand.kind !== 185 &&
+                            operand.kind !== 174 &&
+                            !(operand.kind === 173 && node.parent.kind === 174) &&
+                            !(operand.kind === 178 && node.parent.kind === 173) &&
+                            !(operand.kind === 8 && node.parent.kind === 171)) {
                             emit(operand);
                             return;
                         }
@@ -27735,7 +29430,7 @@ var ts;
                 if (!isCurrentFileSystemExternalModule() || node.kind !== 69 || ts.nodeIsSynthesized(node)) {
                     return false;
                 }
-                var isVariableDeclarationOrBindingElement = node.parent && (node.parent.kind === 214 || node.parent.kind === 166);
+                var isVariableDeclarationOrBindingElement = node.parent && (node.parent.kind === 217 || node.parent.kind === 168);
                 var targetDeclaration = isVariableDeclarationOrBindingElement
                     ? node.parent
                     : resolver.getReferencedValueDeclaration(node);
@@ -27750,7 +29445,7 @@ var ts;
                     write("\", ");
                 }
                 write(ts.tokenToString(node.operator));
-                if (node.operand.kind === 182) {
+                if (node.operand.kind === 184) {
                     var operand = node.operand;
                     if (node.operator === 35 && (operand.operator === 35 || operand.operator === 41)) {
                         write(" ");
@@ -27791,12 +29486,12 @@ var ts;
                 if (!node || !isCurrentFileSystemExternalModule()) {
                     return false;
                 }
-                var current = node;
+                var current = ts.getRootDeclaration(node).parent;
                 while (current) {
-                    if (current.kind === 251) {
-                        return !isExported || ((ts.getCombinedNodeFlags(node) & 2) !== 0);
+                    if (current.kind === 255) {
+                        return !isExported || ((ts.getCombinedNodeFlags(node) & 1) !== 0);
                     }
-                    else if (ts.isFunctionLike(current) || current.kind === 222) {
+                    else if (ts.isDeclaration(current)) {
                         return false;
                     }
                     else {
@@ -27807,12 +29502,12 @@ var ts;
             function emitExponentiationOperator(node) {
                 var leftHandSideExpression = node.left;
                 if (node.operatorToken.kind === 60) {
-                    var synthesizedLHS;
+                    var synthesizedLHS = void 0;
                     var shouldEmitParentheses = false;
                     if (ts.isElementAccessExpression(leftHandSideExpression)) {
                         shouldEmitParentheses = true;
                         write("(");
-                        synthesizedLHS = ts.createSynthesizedNode(170, false);
+                        synthesizedLHS = ts.createSynthesizedNode(172, false);
                         var identifier = emitTempVariableAssignment(leftHandSideExpression.expression, false, false);
                         synthesizedLHS.expression = identifier;
                         if (leftHandSideExpression.argumentExpression.kind !== 8 &&
@@ -27829,7 +29524,7 @@ var ts;
                     else if (ts.isPropertyAccessExpression(leftHandSideExpression)) {
                         shouldEmitParentheses = true;
                         write("(");
-                        synthesizedLHS = ts.createSynthesizedNode(169, false);
+                        synthesizedLHS = ts.createSynthesizedNode(171, false);
                         var identifier = emitTempVariableAssignment(leftHandSideExpression.expression, false, false);
                         synthesizedLHS.expression = identifier;
                         synthesizedLHS.dotToken = leftHandSideExpression.dotToken;
@@ -27857,8 +29552,8 @@ var ts;
             }
             function emitBinaryExpression(node) {
                 if (languageVersion < 2 && node.operatorToken.kind === 56 &&
-                    (node.left.kind === 168 || node.left.kind === 167)) {
-                    emitDestructuring(node, node.parent.kind === 198);
+                    (node.left.kind === 170 || node.left.kind === 169)) {
+                    emitDestructuring(node, node.parent.kind === 201);
                 }
                 else {
                     var exportChanged = node.operatorToken.kind >= 56 &&
@@ -27910,7 +29605,7 @@ var ts;
                 }
             }
             function isSingleLineEmptyBlock(node) {
-                if (node && node.kind === 195) {
+                if (node && node.kind === 198) {
                     var block = node;
                     return block.statements.length === 0 && nodeEndIsOnSameLineAsNodeStart(block, block);
                 }
@@ -27924,12 +29619,12 @@ var ts;
                 }
                 emitToken(15, node.pos);
                 increaseIndent();
-                if (node.kind === 222) {
-                    ts.Debug.assert(node.parent.kind === 221);
+                if (node.kind === 225) {
+                    ts.Debug.assert(node.parent.kind === 224);
                     emitCaptureThisForNodeIfNecessary(node.parent);
                 }
                 emitLines(node.statements);
-                if (node.kind === 222) {
+                if (node.kind === 225) {
                     emitTempDeclarations(true);
                 }
                 decreaseIndent();
@@ -27937,7 +29632,7 @@ var ts;
                 emitToken(16, node.statements.end);
             }
             function emitEmbeddedStatement(node) {
-                if (node.kind === 195) {
+                if (node.kind === 198) {
                     write(" ");
                     emit(node);
                 }
@@ -27949,7 +29644,7 @@ var ts;
                 }
             }
             function emitExpressionStatement(node) {
-                emitParenthesizedIf(node.expression, node.expression.kind === 177);
+                emitParenthesizedIf(node.expression, node.expression.kind === 179);
                 write(";");
             }
             function emitIfStatement(node) {
@@ -27962,7 +29657,7 @@ var ts;
                 if (node.elseStatement) {
                     writeLine();
                     emitToken(80, node.thenStatement.end);
-                    if (node.elseStatement.kind === 199) {
+                    if (node.elseStatement.kind === 202) {
                         write(" ");
                         emit(node.elseStatement);
                     }
@@ -27982,7 +29677,7 @@ var ts;
                 else {
                     emitNormalLoopBody(node, true);
                 }
-                if (node.statement.kind === 195) {
+                if (node.statement.kind === 198) {
                     write(" ");
                 }
                 else {
@@ -28010,7 +29705,7 @@ var ts;
                 if (shouldHoistVariable(decl, true)) {
                     return false;
                 }
-                if (convertedLoopState && (ts.getCombinedNodeFlags(decl) & 24576) === 0) {
+                if (convertedLoopState && (ts.getCombinedNodeFlags(decl) & 3072) === 0) {
                     for (var _a = 0, _b = decl.declarations; _a < _b.length; _a++) {
                         var varDecl = _b[_a];
                         hoistVariableDeclarationFromLoop(convertedLoopState, varDecl);
@@ -28062,7 +29757,7 @@ var ts;
                 }
                 else {
                     var loop = convertLoopBody(node);
-                    if (node.parent.kind === 210) {
+                    if (node.parent.kind === 213) {
                         emitLabelAndColon(node.parent);
                     }
                     loopEmitter(node, loop);
@@ -28072,34 +29767,30 @@ var ts;
                 var functionName = makeUniqueName("_loop");
                 var loopInitializer;
                 switch (node.kind) {
-                    case 202:
-                    case 203:
-                    case 204:
+                    case 205:
+                    case 206:
+                    case 207:
                         var initializer = node.initializer;
-                        if (initializer && initializer.kind === 215) {
+                        if (initializer && initializer.kind === 218) {
                             loopInitializer = node.initializer;
                         }
                         break;
                 }
                 var loopParameters;
-                if (loopInitializer && (ts.getCombinedNodeFlags(loopInitializer) & 24576)) {
+                var loopOutParameters;
+                if (loopInitializer && (ts.getCombinedNodeFlags(loopInitializer) & 3072)) {
                     loopParameters = [];
                     for (var _a = 0, _b = loopInitializer.declarations; _a < _b.length; _a++) {
                         var varDeclaration = _b[_a];
-                        collectNames(varDeclaration.name);
+                        processVariableDeclaration(varDeclaration.name);
                     }
                 }
-                var bodyIsBlock = node.statement.kind === 195;
+                var bodyIsBlock = node.statement.kind === 198;
                 var paramList = loopParameters ? loopParameters.join(", ") : "";
                 writeLine();
                 write("var " + functionName + " = function(" + paramList + ")");
-                if (!bodyIsBlock) {
-                    write(" {");
-                    writeLine();
-                    increaseIndent();
-                }
                 var convertedOuterLoopState = convertedLoopState;
-                convertedLoopState = {};
+                convertedLoopState = { loopOutParameters: loopOutParameters };
                 if (convertedOuterLoopState) {
                     if (convertedOuterLoopState.argumentsName) {
                         convertedLoopState.argumentsName = convertedOuterLoopState.argumentsName;
@@ -28111,14 +29802,32 @@ var ts;
                         convertedLoopState.hoistedLocalVariables = convertedOuterLoopState.hoistedLocalVariables;
                     }
                 }
-                emitEmbeddedStatement(node.statement);
-                if (!bodyIsBlock) {
-                    decreaseIndent();
-                    writeLine();
-                    write("}");
-                }
-                write(";");
+                write(" {");
                 writeLine();
+                increaseIndent();
+                if (bodyIsBlock) {
+                    emitLines(node.statement.statements);
+                }
+                else {
+                    emit(node.statement);
+                }
+                writeLine();
+                copyLoopOutParameters(convertedLoopState, 1, true);
+                decreaseIndent();
+                writeLine();
+                write("};");
+                writeLine();
+                if (loopOutParameters) {
+                    write("var ");
+                    for (var i = 0; i < loopOutParameters.length; i++) {
+                        if (i !== 0) {
+                            write(", ");
+                        }
+                        write(loopOutParameters[i].outParamName);
+                    }
+                    write(";");
+                    writeLine();
+                }
                 if (convertedLoopState.argumentsName) {
                     if (convertedOuterLoopState) {
                         convertedOuterLoopState.argumentsName = convertedLoopState.argumentsName;
@@ -28143,7 +29852,7 @@ var ts;
                     }
                     else {
                         write("var ");
-                        var seen;
+                        var seen = void 0;
                         for (var _c = 0, _d = convertedLoopState.hoistedLocalVariables; _c < _d.length; _c++) {
                             var id = _d[_c];
                             if (!seen) {
@@ -28164,15 +29873,21 @@ var ts;
                 var currentLoopState = convertedLoopState;
                 convertedLoopState = convertedOuterLoopState;
                 return { functionName: functionName, paramList: paramList, state: currentLoopState };
-                function collectNames(name) {
+                function processVariableDeclaration(name) {
                     if (name.kind === 69) {
-                        var nameText = isNameOfNestedRedeclaration(name) ? getGeneratedNameForNode(name) : name.text;
+                        var nameText = isNameOfNestedBlockScopedRedeclarationOrCapturedBinding(name)
+                            ? getGeneratedNameForNode(name)
+                            : name.text;
                         loopParameters.push(nameText);
+                        if (resolver.getNodeCheckFlags(name.parent) & 2097152) {
+                            var reassignedVariable = { originalName: name, outParamName: makeUniqueName("out_" + nameText) };
+                            (loopOutParameters || (loopOutParameters = [])).push(reassignedVariable);
+                        }
                     }
                     else {
                         for (var _a = 0, _b = name.elements; _a < _b.length; _a++) {
                             var element = _b[_a];
-                            collectNames(element.name);
+                            processVariableDeclaration(element.name);
                         }
                     }
                 }
@@ -28186,7 +29901,7 @@ var ts;
                 if (emitAsEmbeddedStatement) {
                     emitEmbeddedStatement(node.statement);
                 }
-                else if (node.statement.kind === 195) {
+                else if (node.statement.kind === 198) {
                     emitLines(node.statement.statements);
                 }
                 else {
@@ -28197,13 +29912,35 @@ var ts;
                     convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
                 }
             }
+            function copyLoopOutParameters(state, copyDirection, emitAsStatements) {
+                if (state.loopOutParameters) {
+                    for (var _a = 0, _b = state.loopOutParameters; _a < _b.length; _a++) {
+                        var outParam = _b[_a];
+                        if (copyDirection === 0) {
+                            emitIdentifier(outParam.originalName);
+                            write(" = " + outParam.outParamName);
+                        }
+                        else {
+                            write(outParam.outParamName + " = ");
+                            emitIdentifier(outParam.originalName);
+                        }
+                        if (emitAsStatements) {
+                            write(";");
+                            writeLine();
+                        }
+                        else {
+                            write(", ");
+                        }
+                    }
+                }
+            }
             function emitConvertedLoopCall(loop, emitAsBlock) {
                 if (emitAsBlock) {
                     write(" {");
                     writeLine();
                     increaseIndent();
                 }
-                var isSimpleLoop = !loop.state.nonLocalJumps &&
+                var isSimpleLoop = !(loop.state.nonLocalJumps & ~4) &&
                     !loop.state.labeledNonLocalBreaks &&
                     !loop.state.labeledNonLocalContinues;
                 var loopResult = makeUniqueName("state");
@@ -28211,6 +29948,8 @@ var ts;
                     write("var " + loopResult + " = ");
                 }
                 write(loop.functionName + "(" + loop.paramList + ");");
+                writeLine();
+                copyLoopOutParameters(loop.state, 0, true);
                 if (!isSimpleLoop) {
                     writeLine();
                     if (loop.state.nonLocalJumps & 8) {
@@ -28220,7 +29959,7 @@ var ts;
                             convertedLoopState.nonLocalJumps |= 8;
                         }
                         else {
-                            write("return " + loopResult + ".value");
+                            write("return " + loopResult + ".value;");
                         }
                         writeLine();
                     }
@@ -28228,10 +29967,6 @@ var ts;
                         write("if (" + loopResult + " === \"break\") break;");
                         writeLine();
                     }
-                    if (loop.state.nonLocalJumps & 4) {
-                        write("if (" + loopResult + " === \"continue\") continue;");
-                        writeLine();
-                    }
                     emitDispatchTableForLabeledJumps(loopResult, loop.state, convertedLoopState);
                 }
                 if (emitAsBlock) {
@@ -28282,7 +30017,7 @@ var ts;
                 var endPos = emitToken(86, node.pos);
                 write(" ");
                 endPos = emitToken(17, endPos);
-                if (node.initializer && node.initializer.kind === 215) {
+                if (node.initializer && node.initializer.kind === 218) {
                     var variableDeclarationList = node.initializer;
                     var startIsEmitted = tryEmitStartOfVariableDeclarationList(variableDeclarationList);
                     if (startIsEmitted) {
@@ -28308,7 +30043,7 @@ var ts;
                 }
             }
             function emitForInOrForOfStatement(node) {
-                if (languageVersion < 2 && node.kind === 204) {
+                if (languageVersion < 2 && node.kind === 207) {
                     emitLoop(node, emitDownLevelForOfStatementWorker);
                 }
                 else {
@@ -28319,7 +30054,7 @@ var ts;
                 var endPos = emitToken(86, node.pos);
                 write(" ");
                 endPos = emitToken(17, endPos);
-                if (node.initializer.kind === 215) {
+                if (node.initializer.kind === 218) {
                     var variableDeclarationList = node.initializer;
                     if (variableDeclarationList.declarations.length >= 1) {
                         tryEmitStartOfVariableDeclarationList(variableDeclarationList);
@@ -28329,7 +30064,7 @@ var ts;
                 else {
                     emit(node.initializer);
                 }
-                if (node.kind === 203) {
+                if (node.kind === 206) {
                     write(" in ");
                 }
                 else {
@@ -28382,7 +30117,7 @@ var ts;
                 increaseIndent();
                 var rhsIterationValue = createElementAccessExpression(rhsReference, counter);
                 emitStart(node.initializer);
-                if (node.initializer.kind === 215) {
+                if (node.initializer.kind === 218) {
                     write("var ");
                     var variableDeclarationList = node.initializer;
                     if (variableDeclarationList.declarations.length > 0) {
@@ -28404,7 +30139,7 @@ var ts;
                 }
                 else {
                     var assignmentExpression = createBinaryExpression(node.initializer, 56, rhsIterationValue, false);
-                    if (node.initializer.kind === 167 || node.initializer.kind === 168) {
+                    if (node.initializer.kind === 169 || node.initializer.kind === 170) {
                         emitDestructuring(assignmentExpression, true, undefined);
                     }
                     else {
@@ -28426,23 +30161,25 @@ var ts;
             }
             function emitBreakOrContinueStatement(node) {
                 if (convertedLoopState) {
-                    var jump = node.kind === 206 ? 2 : 4;
+                    var jump = node.kind === 209 ? 2 : 4;
                     var canUseBreakOrContinue = (node.label && convertedLoopState.labels && convertedLoopState.labels[node.label.text]) ||
                         (!node.label && (convertedLoopState.allowedNonLabeledJumps & jump));
                     if (!canUseBreakOrContinue) {
+                        write("return ");
+                        copyLoopOutParameters(convertedLoopState, 1, false);
                         if (!node.label) {
-                            if (node.kind === 206) {
+                            if (node.kind === 209) {
                                 convertedLoopState.nonLocalJumps |= 2;
-                                write("return \"break\";");
+                                write("\"break\";");
                             }
                             else {
                                 convertedLoopState.nonLocalJumps |= 4;
-                                write("return \"continue\";");
+                                write("\"continue\";");
                             }
                         }
                         else {
-                            var labelMarker;
-                            if (node.kind === 206) {
+                            var labelMarker = void 0;
+                            if (node.kind === 209) {
                                 labelMarker = "break-" + node.label.text;
                                 setLabeledJump(convertedLoopState, true, node.label.text, labelMarker);
                             }
@@ -28450,12 +30187,12 @@ var ts;
                                 labelMarker = "continue-" + node.label.text;
                                 setLabeledJump(convertedLoopState, false, node.label.text, labelMarker);
                             }
-                            write("return \"" + labelMarker + "\";");
+                            write("\"" + labelMarker + "\";");
                         }
                         return;
                     }
                 }
-                emitToken(node.kind === 206 ? 70 : 75, node.pos);
+                emitToken(node.kind === 209 ? 70 : 75, node.pos);
                 emitOptional(" ", node.label);
                 write(";");
             }
@@ -28520,7 +30257,7 @@ var ts;
                     ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node2.pos));
             }
             function emitCaseOrDefaultClause(node) {
-                if (node.kind === 244) {
+                if (node.kind === 248) {
                     write("case ");
                     emit(node.expression);
                     write(":");
@@ -28589,7 +30326,7 @@ var ts;
             function getContainingModule(node) {
                 do {
                     node = node.parent;
-                } while (node && node.kind !== 221);
+                } while (node && node.kind !== 224);
                 return node;
             }
             function emitContainingModuleName(node) {
@@ -28598,13 +30335,13 @@ var ts;
             }
             function emitModuleMemberName(node) {
                 emitStart(node.name);
-                if (ts.getCombinedNodeFlags(node) & 2) {
+                if (ts.getCombinedNodeFlags(node) & 1) {
                     var container = getContainingModule(node);
                     if (container) {
                         write(getGeneratedNameForNode(container));
                         write(".");
                     }
-                    else if (modulekind !== 5 && modulekind !== 4) {
+                    else if (modulekind !== ts.ModuleKind.ES6 && modulekind !== ts.ModuleKind.System) {
                         write("exports.");
                     }
                 }
@@ -28614,17 +30351,17 @@ var ts;
             function createVoidZero() {
                 var zero = ts.createSynthesizedNode(8);
                 zero.text = "0";
-                var result = ts.createSynthesizedNode(180);
+                var result = ts.createSynthesizedNode(182);
                 result.expression = zero;
                 return result;
             }
             function emitEs6ExportDefaultCompat(node) {
-                if (node.parent.kind === 251) {
-                    ts.Debug.assert(!!(node.flags & 512) || node.kind === 230);
-                    if (modulekind === 1 || modulekind === 2 || modulekind === 3) {
+                if (node.parent.kind === 255) {
+                    ts.Debug.assert(!!(node.flags & 512) || node.kind === 234);
+                    if (modulekind === ts.ModuleKind.CommonJS || modulekind === ts.ModuleKind.AMD || modulekind === ts.ModuleKind.UMD) {
                         if (!isEs6Module) {
                             if (languageVersion !== 0) {
-                                write("Object.defineProperty(exports, \"__esModule\", { value: true });");
+                                write('Object.defineProperty(exports, "__esModule", { value: true });');
                                 writeLine();
                             }
                             else {
@@ -28636,10 +30373,10 @@ var ts;
                 }
             }
             function emitExportMemberAssignment(node) {
-                if (node.flags & 2) {
+                if (node.flags & 1) {
                     writeLine();
                     emitStart(node);
-                    if (modulekind === 4 && node.parent === currentSourceFile) {
+                    if (modulekind === ts.ModuleKind.System && node.parent === currentSourceFile) {
                         write(exportFunctionForFile + "(\"");
                         if (node.flags & 512) {
                             write("default");
@@ -28655,7 +30392,7 @@ var ts;
                         if (node.flags & 512) {
                             emitEs6ExportDefaultCompat(node);
                             if (languageVersion === 0) {
-                                write("exports[\"default\"]");
+                                write('exports["default"]');
                             }
                             else {
                                 write("exports.default");
@@ -28672,7 +30409,7 @@ var ts;
                 }
             }
             function emitExportMemberAssignments(name) {
-                if (modulekind === 4) {
+                if (modulekind === ts.ModuleKind.System) {
                     return;
                 }
                 if (!exportEquals && exportSpecifiers && ts.hasProperty(exportSpecifiers, name.text)) {
@@ -28691,7 +30428,7 @@ var ts;
                 }
             }
             function emitExportSpecifierInSystemModule(specifier) {
-                ts.Debug.assert(modulekind === 4);
+                ts.Debug.assert(modulekind === ts.ModuleKind.System);
                 if (!resolver.getReferencedValueDeclaration(specifier.propertyName || specifier.name) && !resolver.isValueAliasDeclaration(specifier)) {
                     return;
                 }
@@ -28715,7 +30452,7 @@ var ts;
                     emitNodeWithCommentsAndWithoutSourcemap(name);
                     write("\", ");
                 }
-                var isVariableDeclarationOrBindingElement = name.parent && (name.parent.kind === 214 || name.parent.kind === 166);
+                var isVariableDeclarationOrBindingElement = name.parent && (name.parent.kind === 217 || name.parent.kind === 168);
                 emitStart(isFirstVariableDeclaration(nodeForSourceMap) ? nodeForSourceMap.parent : nodeForSourceMap);
                 withTemporaryNoSourceMap(function () {
                     if (isVariableDeclarationOrBindingElement) {
@@ -28741,22 +30478,22 @@ var ts;
                 return identifier;
             }
             function isFirstVariableDeclaration(root) {
-                return root.kind === 214 &&
-                    root.parent.kind === 215 &&
+                return root.kind === 217 &&
+                    root.parent.kind === 218 &&
                     root.parent.declarations[0] === root;
             }
             function emitDestructuring(root, isAssignmentExpressionStatement, value) {
                 var emitCount = 0;
                 var canDefineTempVariablesInPlace = false;
-                if (root.kind === 214) {
-                    var isExported = ts.getCombinedNodeFlags(root) & 2;
+                if (root.kind === 217) {
+                    var isExported = ts.getCombinedNodeFlags(root) & 1;
                     var isSourceLevelForSystemModuleKind = shouldHoistDeclarationInSystemJsModule(root);
                     canDefineTempVariablesInPlace = !isExported && !isSourceLevelForSystemModuleKind;
                 }
-                else if (root.kind === 139) {
+                else if (root.kind === 141) {
                     canDefineTempVariablesInPlace = true;
                 }
-                if (root.kind === 184) {
+                if (root.kind === 186) {
                     emitAssignmentExpression(root);
                 }
                 else {
@@ -28776,14 +30513,14 @@ var ts;
                 }
                 function createDefaultValueCheck(value, defaultValue, sourceMapNode) {
                     value = ensureIdentifier(value, true, sourceMapNode);
-                    var equals = ts.createSynthesizedNode(184);
+                    var equals = ts.createSynthesizedNode(186);
                     equals.left = value;
                     equals.operatorToken = ts.createSynthesizedNode(32);
                     equals.right = createVoidZero();
                     return createConditionalExpression(equals, defaultValue, value);
                 }
                 function createConditionalExpression(condition, whenTrue, whenFalse) {
-                    var cond = ts.createSynthesizedNode(185);
+                    var cond = ts.createSynthesizedNode(187);
                     cond.condition = condition;
                     cond.questionToken = ts.createSynthesizedNode(53);
                     cond.whenTrue = whenTrue;
@@ -28798,20 +30535,20 @@ var ts;
                 }
                 function createPropertyAccessForDestructuringProperty(object, propName) {
                     var index;
-                    var nameIsComputed = propName.kind === 137;
+                    var nameIsComputed = propName.kind === 139;
                     if (nameIsComputed) {
                         index = ensureIdentifier(propName.expression, false, propName);
                     }
                     else {
                         index = ts.createSynthesizedNode(propName.kind);
-                        index.text = propName.text;
+                        index.text = ts.unescapeIdentifier(propName.text);
                     }
                     return !nameIsComputed && index.kind === 69
                         ? createPropertyAccessExpression(object, index)
                         : createElementAccessExpression(object, index);
                 }
                 function createSliceCall(value, sliceIndex) {
-                    var call = ts.createSynthesizedNode(171);
+                    var call = ts.createSynthesizedNode(173);
                     var sliceIdentifier = ts.createSynthesizedNode(69);
                     sliceIdentifier.text = "slice";
                     call.expression = createPropertyAccessExpression(value, sliceIdentifier);
@@ -28826,9 +30563,9 @@ var ts;
                     }
                     for (var _a = 0, properties_5 = properties; _a < properties_5.length; _a++) {
                         var p = properties_5[_a];
-                        if (p.kind === 248 || p.kind === 249) {
+                        if (p.kind === 252 || p.kind === 253) {
                             var propName = p.name;
-                            var target_1 = p.kind === 249 ? p : p.initializer || propName;
+                            var target_1 = p.kind === 253 ? p : p.initializer || propName;
                             emitDestructuringAssignment(target_1, createPropertyAccessForDestructuringProperty(value, propName), p);
                         }
                     }
@@ -28840,8 +30577,8 @@ var ts;
                     }
                     for (var i = 0; i < elements.length; i++) {
                         var e = elements[i];
-                        if (e.kind !== 190) {
-                            if (e.kind !== 188) {
+                        if (e.kind !== 192) {
+                            if (e.kind !== 190) {
                                 emitDestructuringAssignment(e, createElementAccessExpression(value, createNumericLiteral(i)), e);
                             }
                             else if (i === elements.length - 1) {
@@ -28851,20 +30588,20 @@ var ts;
                     }
                 }
                 function emitDestructuringAssignment(target, value, sourceMapNode) {
-                    if (target.kind === 249) {
+                    if (target.kind === 253) {
                         if (target.objectAssignmentInitializer) {
                             value = createDefaultValueCheck(value, target.objectAssignmentInitializer, sourceMapNode);
                         }
                         target = target.name;
                     }
-                    else if (target.kind === 184 && target.operatorToken.kind === 56) {
+                    else if (target.kind === 186 && target.operatorToken.kind === 56) {
                         value = createDefaultValueCheck(value, target.right, sourceMapNode);
                         target = target.left;
                     }
-                    if (target.kind === 168) {
+                    if (target.kind === 170) {
                         emitObjectLiteralAssignment(target, value, sourceMapNode);
                     }
-                    else if (target.kind === 167) {
+                    else if (target.kind === 169) {
                         emitArrayLiteralAssignment(target, value, sourceMapNode);
                     }
                     else {
@@ -28882,14 +30619,14 @@ var ts;
                         emitDestructuringAssignment(target, value, ts.nodeIsSynthesized(root) ? target : root);
                     }
                     else {
-                        if (root.parent.kind !== 175) {
+                        if (root.parent.kind !== 177) {
                             write("(");
                         }
                         value = ensureIdentifier(value, true, root);
                         emitDestructuringAssignment(target, value, root);
                         write(", ");
                         emit(value);
-                        if (root.parent.kind !== 175) {
+                        if (root.parent.kind !== 177) {
                             write(")");
                         }
                     }
@@ -28910,11 +30647,11 @@ var ts;
                         }
                         for (var i = 0; i < numElements; i++) {
                             var element = elements[i];
-                            if (pattern.kind === 164) {
+                            if (pattern.kind === 166) {
                                 var propName = element.propertyName || element.name;
                                 emitBindingElement(element, createPropertyAccessForDestructuringProperty(value, propName));
                             }
-                            else if (element.kind !== 190) {
+                            else if (element.kind !== 192) {
                                 if (!element.dotDotDotToken) {
                                     emitBindingElement(element, createElementAccessExpression(value, createNumericLiteral(i)));
                                 }
@@ -28932,22 +30669,42 @@ var ts;
             }
             function emitVariableDeclaration(node) {
                 if (ts.isBindingPattern(node.name)) {
-                    if (languageVersion < 2) {
-                        emitDestructuring(node, false);
-                    }
-                    else {
+                    var isExported = ts.getCombinedNodeFlags(node) & 1;
+                    if (languageVersion >= 2 && (!isExported || modulekind === ts.ModuleKind.ES6)) {
+                        var isTopLevelDeclarationInSystemModule = modulekind === ts.ModuleKind.System &&
+                            shouldHoistVariable(node, true);
+                        if (isTopLevelDeclarationInSystemModule) {
+                            write("(");
+                        }
                         emit(node.name);
                         emitOptional(" = ", node.initializer);
+                        if (isTopLevelDeclarationInSystemModule) {
+                            write(")");
+                        }
+                    }
+                    else {
+                        emitDestructuring(node, false);
                     }
                 }
                 else {
                     var initializer = node.initializer;
-                    if (!initializer && languageVersion < 2) {
-                        var isLetDefinedInLoop = (resolver.getNodeCheckFlags(node) & 16384) &&
-                            (getCombinedFlagsForIdentifier(node.name) & 8192);
-                        if (isLetDefinedInLoop &&
-                            node.parent.parent.kind !== 203 &&
-                            node.parent.parent.kind !== 204) {
+                    if (!initializer &&
+                        languageVersion < 2 &&
+                        node.name.kind === 69) {
+                        var container = ts.getEnclosingBlockScopeContainer(node);
+                        var flags = resolver.getNodeCheckFlags(node);
+                        var isCapturedInFunction = flags & 131072;
+                        var isDeclaredInLoop = flags & 262144;
+                        var emittedAsTopLevel = ts.isBlockScopedContainerTopLevel(container) ||
+                            (isCapturedInFunction && isDeclaredInLoop && container.kind === 198 && ts.isIterationStatement(container.parent, false));
+                        var emittedAsNestedLetDeclaration = ts.getCombinedNodeFlags(node) & 1024 &&
+                            !emittedAsTopLevel;
+                        var emitExplicitInitializer = emittedAsNestedLetDeclaration &&
+                            container.kind !== 206 &&
+                            container.kind !== 207 &&
+                            (!resolver.isDeclarationWithCollidingName(node) ||
+                                (isDeclaredInLoop && !isCapturedInFunction && !ts.isIterationStatement(container, false)));
+                        if (emitExplicitInitializer) {
                             initializer = createVoidZero();
                         }
                     }
@@ -28965,7 +30722,7 @@ var ts;
                 }
             }
             function emitExportVariableAssignments(node) {
-                if (node.kind === 190) {
+                if (node.kind === 192) {
                     return;
                 }
                 var name = node.name;
@@ -28976,20 +30733,14 @@ var ts;
                     ts.forEach(name.elements, emitExportVariableAssignments);
                 }
             }
-            function getCombinedFlagsForIdentifier(node) {
-                if (!node.parent || (node.parent.kind !== 214 && node.parent.kind !== 166)) {
-                    return 0;
-                }
-                return ts.getCombinedNodeFlags(node.parent);
-            }
             function isES6ExportedDeclaration(node) {
-                return !!(node.flags & 2) &&
-                    modulekind === 5 &&
-                    node.parent.kind === 251;
+                return !!(node.flags & 1) &&
+                    modulekind === ts.ModuleKind.ES6 &&
+                    node.parent.kind === 255;
             }
             function emitVariableStatement(node) {
                 var startIsEmitted = false;
-                if (node.flags & 2) {
+                if (node.flags & 1) {
                     if (isES6ExportedDeclaration(node)) {
                         write("export ");
                         startIsEmitted = tryEmitStartOfVariableDeclarationList(node.declarationList);
@@ -29008,12 +30759,12 @@ var ts;
                         write(";");
                     }
                 }
-                if (modulekind !== 5 && node.parent === currentSourceFile) {
+                if (modulekind !== ts.ModuleKind.ES6 && node.parent === currentSourceFile) {
                     ts.forEach(node.declarationList.declarations, emitExportVariableAssignments);
                 }
             }
             function shouldEmitLeadingAndTrailingCommentsForVariableStatement(node) {
-                if (!(node.flags & 2)) {
+                if (!(node.flags & 1)) {
                     return true;
                 }
                 if (isES6ExportedDeclaration(node)) {
@@ -29030,12 +30781,12 @@ var ts;
             function emitParameter(node) {
                 if (languageVersion < 2) {
                     if (ts.isBindingPattern(node.name)) {
-                        var name_26 = createTempVariable(0);
+                        var name_28 = createTempVariable(0);
                         if (!tempParameters) {
                             tempParameters = [];
                         }
-                        tempParameters.push(name_26);
-                        emit(name_26);
+                        tempParameters.push(name_28);
+                        emit(name_28);
                     }
                     else {
                         emit(node.name);
@@ -29051,7 +30802,7 @@ var ts;
             }
             function emitDefaultValueAssignments(node) {
                 if (languageVersion < 2) {
-                    var tempIndex = 0;
+                    var tempIndex_1 = 0;
                     ts.forEach(node.parameters, function (parameter) {
                         if (parameter.dotDotDotToken) {
                             return;
@@ -29063,15 +30814,15 @@ var ts;
                                 writeLine();
                                 write("var ");
                                 if (hasBindingElements) {
-                                    emitDestructuring(parameter, false, tempParameters[tempIndex]);
+                                    emitDestructuring(parameter, false, tempParameters[tempIndex_1]);
                                 }
                                 else {
-                                    emit(tempParameters[tempIndex]);
+                                    emit(tempParameters[tempIndex_1]);
                                     write(" = ");
                                     emit(initializer);
                                 }
                                 write(";");
-                                tempIndex++;
+                                tempIndex_1++;
                             }
                         }
                         else if (initializer) {
@@ -29134,12 +30885,12 @@ var ts;
                 }
             }
             function emitAccessor(node) {
-                write(node.kind === 146 ? "get " : "set ");
+                write(node.kind === 148 ? "get " : "set ");
                 emit(node.name);
                 emitSignatureAndBody(node);
             }
             function shouldEmitAsArrowFunction(node) {
-                return node.kind === 177 && languageVersion >= 2;
+                return node.kind === 179 && languageVersion >= 2;
             }
             function emitDeclarationName(node) {
                 if (node.name) {
@@ -29150,11 +30901,11 @@ var ts;
                 }
             }
             function shouldEmitFunctionName(node) {
-                if (node.kind === 176) {
+                if (node.kind === 178) {
                     return !!node.name;
                 }
-                if (node.kind === 216) {
-                    return !!node.name || modulekind !== 5;
+                if (node.kind === 219) {
+                    return !!node.name || modulekind !== ts.ModuleKind.ES6;
                 }
             }
             function emitFunctionDeclaration(node) {
@@ -29162,12 +30913,12 @@ var ts;
                     return emitCommentsOnNotEmittedNode(node);
                 }
                 var kind = node.kind, parent = node.parent;
-                if (kind !== 144 &&
-                    kind !== 143 &&
+                if (kind !== 146 &&
+                    kind !== 145 &&
                     parent &&
-                    parent.kind !== 248 &&
-                    parent.kind !== 171 &&
-                    parent.kind !== 167) {
+                    parent.kind !== 252 &&
+                    parent.kind !== 173 &&
+                    parent.kind !== 169) {
                     emitLeadingComments(node);
                 }
                 emitStart(node);
@@ -29188,11 +30939,13 @@ var ts;
                     emitDeclarationName(node);
                 }
                 emitSignatureAndBody(node);
-                if (modulekind !== 5 && kind === 216 && parent === currentSourceFile && node.name) {
+                if (modulekind !== ts.ModuleKind.ES6 && kind === 219 && parent === currentSourceFile && node.name) {
                     emitExportMemberAssignments(node.name);
                 }
                 emitEnd(node);
-                if (kind !== 144 && kind !== 143) {
+                if (kind !== 146 &&
+                    kind !== 145 &&
+                    kind !== 179) {
                     emitTrailingComments(node);
                 }
             }
@@ -29209,8 +30962,9 @@ var ts;
                 write("(");
                 if (node) {
                     var parameters = node.parameters;
+                    var skipCount = node.parameters.length && node.parameters[0].name.text === "this" ? 1 : 0;
                     var omitCount = languageVersion < 2 && ts.hasRestParameter(node) ? 1 : 0;
-                    emitList(parameters, 0, parameters.length - omitCount, false, false);
+                    emitList(parameters, skipCount, parameters.length - omitCount - skipCount, false, false);
                 }
                 write(")");
                 decreaseIndent();
@@ -29224,12 +30978,20 @@ var ts;
             }
             function emitAsyncFunctionBodyForES6(node) {
                 var promiseConstructor = ts.getEntityNameFromTypeNode(node.type);
-                var isArrowFunction = node.kind === 177;
-                var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 4096) !== 0;
+                var isArrowFunction = node.kind === 179;
+                var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 8192) !== 0;
                 if (!isArrowFunction) {
                     write(" {");
                     increaseIndent();
                     writeLine();
+                    if (resolver.getNodeCheckFlags(node) & 4096) {
+                        writeLines("\nconst _super = (function (geti, seti) {\n    const cache = Object.create(null);\n    return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } });\n})(name => super[name], (name, value) => super[name] = value);");
+                        writeLine();
+                    }
+                    else if (resolver.getNodeCheckFlags(node) & 2048) {
+                        write("const _super = name => super[name];");
+                        writeLine();
+                    }
                     write("return");
                 }
                 write(" __awaiter(this");
@@ -29239,18 +31001,13 @@ var ts;
                 else {
                     write(", void 0, ");
                 }
-                if (promiseConstructor) {
+                if (languageVersion >= 2 || !promiseConstructor) {
+                    write("void 0");
+                }
+                else {
                     emitEntityNameAsExpression(promiseConstructor, false);
                 }
-                else {
-                    write("Promise");
-                }
-                if (hasLexicalArguments) {
-                    write(", function* (_arguments)");
-                }
-                else {
-                    write(", function* ()");
-                }
+                write(", function* ()");
                 emitFunctionBody(node);
                 write(")");
                 if (!isArrowFunction) {
@@ -29265,7 +31022,7 @@ var ts;
                     write(" { }");
                 }
                 else {
-                    if (node.body.kind === 195) {
+                    if (node.body.kind === 198) {
                         emitBlockFunctionBody(node, node.body);
                     }
                     else {
@@ -29317,10 +31074,10 @@ var ts;
                 }
                 write(" ");
                 var current = body;
-                while (current.kind === 174) {
+                while (current.kind === 176) {
                     current = current.expression;
                 }
-                emitParenthesizedIf(body, current.kind === 168);
+                emitParenthesizedIf(body, current.kind === 170);
             }
             function emitDownLevelExpressionFunctionBody(node, body) {
                 write(" {");
@@ -29387,23 +31144,22 @@ var ts;
                 }
                 emitToken(16, body.statements.end);
             }
-            function findInitialSuperCall(ctor) {
-                if (ctor.body) {
-                    var statement = ctor.body.statements[0];
-                    if (statement && statement.kind === 198) {
-                        var expr = statement.expression;
-                        if (expr && expr.kind === 171) {
-                            var func = expr.expression;
-                            if (func && func.kind === 95) {
-                                return statement;
-                            }
-                        }
-                    }
+            function getSuperCallAtGivenIndex(ctor, index) {
+                if (!ctor.body) {
+                    return undefined;
+                }
+                var statements = ctor.body.statements;
+                if (!statements || index >= statements.length) {
+                    return undefined;
+                }
+                var statement = statements[index];
+                if (statement.kind === 201) {
+                    return ts.isSuperCallExpression(statement.expression) ? statement : undefined;
                 }
             }
             function emitParameterPropertyAssignments(node) {
                 ts.forEach(node.parameters, function (param) {
-                    if (param.flags & 56) {
+                    if (param.flags & 28) {
                         writeLine();
                         emitStart(param);
                         emitStart(param.name);
@@ -29423,7 +31179,7 @@ var ts;
                     emitNodeWithCommentsAndWithoutSourcemap(memberName);
                     write("]");
                 }
-                else if (memberName.kind === 137) {
+                else if (memberName.kind === 139) {
                     emitComputedPropertyName(memberName);
                 }
                 else {
@@ -29435,7 +31191,7 @@ var ts;
                 var properties = [];
                 for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
                     var member = _b[_a];
-                    if (member.kind === 142 && isStatic === ((member.flags & 64) !== 0) && member.initializer) {
+                    if (member.kind === 144 && isStatic === ((member.flags & 32) !== 0) && member.initializer) {
                         properties.push(member);
                     }
                 }
@@ -29456,7 +31212,7 @@ var ts;
                     emit(receiver);
                 }
                 else {
-                    if (property.flags & 64) {
+                    if (property.flags & 32) {
                         emitDeclarationName(node);
                     }
                     else {
@@ -29475,11 +31231,11 @@ var ts;
             }
             function emitMemberFunctionsForES5AndLower(node) {
                 ts.forEach(node.members, function (member) {
-                    if (member.kind === 194) {
+                    if (member.kind === 197) {
                         writeLine();
                         write(";");
                     }
-                    else if (member.kind === 144 || node.kind === 143) {
+                    else if (member.kind === 146 || node.kind === 145) {
                         if (!member.body) {
                             return emitCommentsOnNotEmittedNode(member);
                         }
@@ -29496,7 +31252,7 @@ var ts;
                         write(";");
                         emitTrailingComments(member);
                     }
-                    else if (member.kind === 146 || member.kind === 147) {
+                    else if (member.kind === 148 || member.kind === 149) {
                         var accessors = ts.getAllAccessorDeclarations(node.members, member);
                         if (member === accessors.firstAccessor) {
                             writeLine();
@@ -29546,22 +31302,22 @@ var ts;
             function emitMemberFunctionsForES6AndHigher(node) {
                 for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
                     var member = _b[_a];
-                    if ((member.kind === 144 || node.kind === 143) && !member.body) {
+                    if ((member.kind === 146 || node.kind === 145) && !member.body) {
                         emitCommentsOnNotEmittedNode(member);
                     }
-                    else if (member.kind === 144 ||
-                        member.kind === 146 ||
-                        member.kind === 147) {
+                    else if (member.kind === 146 ||
+                        member.kind === 148 ||
+                        member.kind === 149) {
                         writeLine();
                         emitLeadingComments(member);
                         emitStart(member);
-                        if (member.flags & 64) {
+                        if (member.flags & 32) {
                             write("static ");
                         }
-                        if (member.kind === 146) {
+                        if (member.kind === 148) {
                             write("get ");
                         }
-                        else if (member.kind === 147) {
+                        else if (member.kind === 149) {
                             write("set ");
                         }
                         if (member.asteriskToken) {
@@ -29572,7 +31328,7 @@ var ts;
                         emitEnd(member);
                         emitTrailingComments(member);
                     }
-                    else if (member.kind === 194) {
+                    else if (member.kind === 197) {
                         writeLine();
                         write(";");
                     }
@@ -29597,10 +31353,10 @@ var ts;
             function emitConstructorWorker(node, baseTypeElement) {
                 var hasInstancePropertyWithInitializer = false;
                 ts.forEach(node.members, function (member) {
-                    if (member.kind === 145 && !member.body) {
+                    if (member.kind === 147 && !member.body) {
                         emitCommentsOnNotEmittedNode(member);
                     }
-                    if (member.kind === 142 && member.initializer && (member.flags & 64) === 0) {
+                    if (member.kind === 144 && member.initializer && (member.flags & 32) === 0) {
                         hasInstancePropertyWithInitializer = true;
                     }
                 });
@@ -29644,7 +31400,7 @@ var ts;
                     emitDefaultValueAssignments(ctor);
                     emitRestParameter(ctor);
                     if (baseTypeElement) {
-                        superCall = findInitialSuperCall(ctor);
+                        superCall = getSuperCallAtGivenIndex(ctor, startIndex);
                         if (superCall) {
                             writeLine();
                             emit(superCall);
@@ -29698,19 +31454,33 @@ var ts;
                 else {
                     emitClassLikeDeclarationForES6AndHigher(node);
                 }
-                if (modulekind !== 5 && node.parent === currentSourceFile && node.name) {
+                if (modulekind !== ts.ModuleKind.ES6 && node.parent === currentSourceFile && node.name) {
                     emitExportMemberAssignments(node.name);
                 }
             }
             function emitClassLikeDeclarationForES6AndHigher(node) {
-                var thisNodeIsDecorated = ts.nodeIsDecorated(node);
-                if (node.kind === 217) {
-                    if (thisNodeIsDecorated) {
+                var decoratedClassAlias;
+                var isHoistedDeclarationInSystemModule = shouldHoistDeclarationInSystemJsModule(node);
+                var isDecorated = ts.nodeIsDecorated(node);
+                var rewriteAsClassExpression = isDecorated || isHoistedDeclarationInSystemModule;
+                if (node.kind === 220) {
+                    if (rewriteAsClassExpression) {
+                        if (isDecorated && resolver.getNodeCheckFlags(node) & 524288) {
+                            decoratedClassAlias = ts.unescapeIdentifier(makeUniqueName(node.name ? node.name.text : "default"));
+                            decoratedClassAliases[ts.getNodeId(node)] = decoratedClassAlias;
+                            write("let " + decoratedClassAlias + ";");
+                            writeLine();
+                        }
                         if (isES6ExportedDeclaration(node) && !(node.flags & 512)) {
                             write("export ");
                         }
-                        write("let ");
+                        if (!isHoistedDeclarationInSystemModule) {
+                            write("let ");
+                        }
                         emitDeclarationName(node);
+                        if (decoratedClassAlias !== undefined) {
+                            write(" = " + decoratedClassAlias);
+                        }
                         write(" = ");
                     }
                     else if (isES6ExportedDeclaration(node)) {
@@ -29721,7 +31491,7 @@ var ts;
                     }
                 }
                 var staticProperties = getInitializedProperties(node, true);
-                var isClassExpressionWithStaticProperties = staticProperties.length > 0 && node.kind === 189;
+                var isClassExpressionWithStaticProperties = staticProperties.length > 0 && node.kind === 191;
                 var tempVariable;
                 if (isClassExpressionWithStaticProperties) {
                     tempVariable = createAndRecordTempVariable(0);
@@ -29731,7 +31501,7 @@ var ts;
                     write(" = ");
                 }
                 write("class");
-                if ((node.name || (node.flags & 512 && (staticProperties.length > 0 || modulekind !== 5))) && !thisNodeIsDecorated) {
+                if (node.name || (node.flags & 512 && (staticProperties.length > 0 || modulekind !== ts.ModuleKind.ES6) && !rewriteAsClassExpression)) {
                     write(" ");
                     emitDeclarationName(node);
                 }
@@ -29748,7 +31518,8 @@ var ts;
                 decreaseIndent();
                 writeLine();
                 emitToken(16, node.members.end);
-                if (thisNodeIsDecorated) {
+                if (rewriteAsClassExpression) {
+                    decoratedClassAliases[ts.getNodeId(node)] = undefined;
                     write(";");
                 }
                 if (isClassExpressionWithStaticProperties) {
@@ -29767,24 +31538,24 @@ var ts;
                 else {
                     writeLine();
                     emitPropertyDeclarations(node, staticProperties);
-                    emitDecoratorsOfClass(node);
+                    emitDecoratorsOfClass(node, decoratedClassAlias);
                 }
-                if (!(node.flags & 2)) {
+                if (!(node.flags & 1)) {
                     return;
                 }
-                if (modulekind !== 5) {
+                if (modulekind !== ts.ModuleKind.ES6) {
                     emitExportMemberAssignment(node);
                 }
                 else {
                     if (node.flags & 512) {
-                        if (thisNodeIsDecorated) {
+                        if (isDecorated) {
                             writeLine();
                             write("export default ");
                             emitDeclarationName(node);
                             write(";");
                         }
                     }
-                    else if (node.parent.kind !== 251) {
+                    else if (node.parent.kind !== 255) {
                         writeLine();
                         emitStart(node);
                         emitModuleMemberName(node);
@@ -29796,7 +31567,7 @@ var ts;
                 }
             }
             function emitClassLikeDeclarationBelowES6(node) {
-                if (node.kind === 217) {
+                if (node.kind === 220) {
                     if (!shouldHoistDeclarationInSystemJsModule(node)) {
                         write("var ");
                     }
@@ -29833,7 +31604,7 @@ var ts;
                 emitMemberFunctionsForES5AndLower(node);
                 emitPropertyDeclarations(node, getInitializedProperties(node, true));
                 writeLine();
-                emitDecoratorsOfClass(node);
+                emitDecoratorsOfClass(node, undefined);
                 writeLine();
                 emitToken(16, node.members.end, function () {
                     write("return ");
@@ -29856,26 +31627,26 @@ var ts;
                     emit(baseTypeNode.expression);
                 }
                 write("))");
-                if (node.kind === 217) {
+                if (node.kind === 220) {
                     write(";");
                 }
                 emitEnd(node);
-                if (node.kind === 217) {
+                if (node.kind === 220) {
                     emitExportMemberAssignment(node);
                 }
             }
             function emitClassMemberPrefix(node, member) {
                 emitDeclarationName(node);
-                if (!(member.flags & 64)) {
+                if (!(member.flags & 32)) {
                     write(".prototype");
                 }
             }
-            function emitDecoratorsOfClass(node) {
+            function emitDecoratorsOfClass(node, decoratedClassAlias) {
                 emitDecoratorsOfMembers(node, 0);
-                emitDecoratorsOfMembers(node, 64);
-                emitDecoratorsOfConstructor(node);
+                emitDecoratorsOfMembers(node, 32);
+                emitDecoratorsOfConstructor(node, decoratedClassAlias);
             }
-            function emitDecoratorsOfConstructor(node) {
+            function emitDecoratorsOfConstructor(node, decoratedClassAlias) {
                 var decorators = node.decorators;
                 var constructor = ts.getFirstConstructorWithBody(node);
                 var firstParameterDecorator = constructor && ts.forEach(constructor.parameters, function (parameter) { return parameter.decorators; });
@@ -29885,6 +31656,9 @@ var ts;
                 writeLine();
                 emitStart(node.decorators || firstParameterDecorator);
                 emitDeclarationName(node);
+                if (decoratedClassAlias !== undefined) {
+                    write(" = " + decoratedClassAlias);
+                }
                 write(" = __decorate([");
                 increaseIndent();
                 writeLine();
@@ -29906,7 +31680,7 @@ var ts;
             function emitDecoratorsOfMembers(node, staticFlag) {
                 for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
                     var member = _b[_a];
-                    if ((member.flags & 64) !== staticFlag) {
+                    if ((member.flags & 32) !== staticFlag) {
                         continue;
                     }
                     if (!ts.nodeCanBeDecorated(member)) {
@@ -29927,7 +31701,7 @@ var ts;
                     }
                     else {
                         decorators = member.decorators;
-                        if (member.kind === 144) {
+                        if (member.kind === 146) {
                             functionLikeMember = member;
                         }
                     }
@@ -29953,7 +31727,7 @@ var ts;
                     write(", ");
                     emitExpressionForPropertyName(member.name);
                     if (languageVersion > 0) {
-                        if (member.kind !== 142) {
+                        if (member.kind !== 144) {
                             write(", null");
                         }
                         else {
@@ -29969,64 +31743,64 @@ var ts;
             function emitDecoratorsOfParameters(node, leadingComma) {
                 var argumentsWritten = 0;
                 if (node) {
-                    var parameterIndex = 0;
+                    var parameterIndex_1 = 0;
                     for (var _a = 0, _b = node.parameters; _a < _b.length; _a++) {
                         var parameter = _b[_a];
                         if (ts.nodeIsDecorated(parameter)) {
                             var decorators = parameter.decorators;
                             argumentsWritten += emitList(decorators, 0, decorators.length, true, false, leadingComma, true, function (decorator) {
-                                write("__param(" + parameterIndex + ", ");
+                                write("__param(" + parameterIndex_1 + ", ");
                                 emit(decorator.expression);
                                 write(")");
                             });
                             leadingComma = true;
                         }
-                        parameterIndex++;
+                        parameterIndex_1++;
                     }
                 }
                 return argumentsWritten;
             }
             function shouldEmitTypeMetadata(node) {
                 switch (node.kind) {
-                    case 144:
                     case 146:
-                    case 147:
-                    case 142:
+                    case 148:
+                    case 149:
+                    case 144:
                         return true;
                 }
                 return false;
             }
             function shouldEmitReturnTypeMetadata(node) {
                 switch (node.kind) {
-                    case 144:
+                    case 146:
                         return true;
                 }
                 return false;
             }
             function shouldEmitParamTypesMetadata(node) {
                 switch (node.kind) {
-                    case 217:
-                    case 144:
-                    case 147:
+                    case 220:
+                    case 146:
+                    case 149:
                         return true;
                 }
                 return false;
             }
             function emitSerializedTypeOfNode(node) {
                 switch (node.kind) {
-                    case 217:
+                    case 220:
                         write("Function");
                         return;
-                    case 142:
+                    case 144:
                         emitSerializedTypeNode(node.type);
                         return;
-                    case 139:
+                    case 141:
                         emitSerializedTypeNode(node.type);
                         return;
-                    case 146:
+                    case 148:
                         emitSerializedTypeNode(node.type);
                         return;
-                    case 147:
+                    case 149:
                         emitSerializedTypeNode(ts.getSetAccessorTypeAnnotationNode(node));
                         return;
                 }
@@ -30042,40 +31816,40 @@ var ts;
                         case 103:
                             write("void 0");
                             return;
-                        case 161:
-                            emitSerializedTypeNode(node.type);
-                            return;
-                        case 153:
-                        case 154:
-                            write("Function");
-                            return;
-                        case 157:
-                        case 158:
-                            write("Array");
-                            return;
-                        case 151:
-                        case 120:
-                            write("Boolean");
-                            return;
-                        case 130:
                         case 163:
-                            write("String");
-                            return;
-                        case 128:
-                            write("Number");
-                            return;
-                        case 131:
-                            write("Symbol");
-                            return;
-                        case 152:
-                            emitSerializedTypeReferenceNode(node);
+                            emitSerializedTypeNode(node.type);
                             return;
                         case 155:
                         case 156:
+                            write("Function");
+                            return;
                         case 159:
                         case 160:
-                        case 117:
+                            write("Array");
+                            return;
+                        case 153:
+                        case 120:
+                            write("Boolean");
+                            return;
+                        case 131:
+                        case 165:
+                            write("String");
+                            return;
+                        case 129:
+                            write("Number");
+                            return;
+                        case 132:
+                            write("Symbol");
+                            return;
+                        case 154:
+                            emitSerializedTypeReferenceNode(node);
+                            return;
+                        case 157:
+                        case 158:
+                        case 161:
                         case 162:
+                        case 117:
+                        case 164:
                             break;
                         default:
                             ts.Debug.fail("Cannot serialize unexpected type node.");
@@ -30138,8 +31912,8 @@ var ts;
             }
             function emitSerializedParameterTypesOfNode(node) {
                 if (node) {
-                    var valueDeclaration;
-                    if (node.kind === 217) {
+                    var valueDeclaration = void 0;
+                    if (node.kind === 220) {
                         valueDeclaration = ts.getFirstConstructorWithBody(node);
                     }
                     else if (ts.isFunctionLike(node) && ts.nodeIsPresent(node.body)) {
@@ -30155,10 +31929,10 @@ var ts;
                                 }
                                 if (parameters[i].dotDotDotToken) {
                                     var parameterType = parameters[i].type;
-                                    if (parameterType.kind === 157) {
+                                    if (parameterType.kind === 159) {
                                         parameterType = parameterType.elementType;
                                     }
-                                    else if (parameterType.kind === 152 && parameterType.typeArguments && parameterType.typeArguments.length === 1) {
+                                    else if (parameterType.kind === 154 && parameterType.typeArguments && parameterType.typeArguments.length === 1) {
                                         parameterType = parameterType.typeArguments[0];
                                     }
                                     else {
@@ -30230,7 +32004,7 @@ var ts;
                 }
                 if (!shouldHoistDeclarationInSystemJsModule(node)) {
                     var isES6ExportedEnum = isES6ExportedDeclaration(node);
-                    if (!(node.flags & 2) || (isES6ExportedEnum && isFirstDeclarationOfKind(node, node.symbol && node.symbol.declarations, 220))) {
+                    if (!(node.flags & 1) || (isES6ExportedEnum && isFirstDeclarationOfKind(node, node.symbol && node.symbol.declarations, 223))) {
                         emitStart(node);
                         if (isES6ExportedEnum) {
                             write("export ");
@@ -30259,7 +32033,7 @@ var ts;
                 emitModuleMemberName(node);
                 write(" = {}));");
                 emitEnd(node);
-                if (!isES6ExportedDeclaration(node) && node.flags & 2 && !shouldHoistDeclarationInSystemJsModule(node)) {
+                if (!isES6ExportedDeclaration(node) && node.flags & 1 && !shouldHoistDeclarationInSystemJsModule(node)) {
                     writeLine();
                     emitStart(node);
                     write("var ");
@@ -30269,8 +32043,8 @@ var ts;
                     emitEnd(node);
                     write(";");
                 }
-                if (modulekind !== 5 && node.parent === currentSourceFile) {
-                    if (modulekind === 4 && (node.flags & 2)) {
+                if (modulekind !== ts.ModuleKind.ES6 && node.parent === currentSourceFile) {
+                    if (modulekind === ts.ModuleKind.System && (node.flags & 1)) {
                         writeLine();
                         write(exportFunctionForFile + "(\"");
                         emitDeclarationName(node);
@@ -30310,7 +32084,7 @@ var ts;
                 }
             }
             function getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration) {
-                if (moduleDeclaration.body.kind === 221) {
+                if (moduleDeclaration.body.kind === 224) {
                     var recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration.body);
                     return recursiveInnerModule || moduleDeclaration.body;
                 }
@@ -30333,7 +32107,7 @@ var ts;
                 var emitVarForModule = !hoistedInDeclarationScope && !isModuleMergedWithES6Class(node);
                 if (emitVarForModule) {
                     var isES6ExportedNamespace = isES6ExportedDeclaration(node);
-                    if (!isES6ExportedNamespace || isFirstDeclarationOfKind(node, node.symbol && node.symbol.declarations, 221)) {
+                    if (!isES6ExportedNamespace || isFirstDeclarationOfKind(node, node.symbol && node.symbol.declarations, 224)) {
                         emitStart(node);
                         if (isES6ExportedNamespace) {
                             write("export ");
@@ -30351,7 +32125,7 @@ var ts;
                 write(getGeneratedNameForNode(node));
                 emitEnd(node.name);
                 write(") ");
-                if (node.body.kind === 222) {
+                if (node.body.kind === 225) {
                     var saveConvertedLoopState = convertedLoopState;
                     var saveTempFlags = tempFlags;
                     var saveTempVariables = tempVariables;
@@ -30376,7 +32150,7 @@ var ts;
                     emitToken(16, moduleBlock.statements.end);
                 }
                 write(")(");
-                if ((node.flags & 2) && !isES6ExportedDeclaration(node)) {
+                if ((node.flags & 1) && !isES6ExportedDeclaration(node)) {
                     emit(node.name);
                     write(" = ");
                 }
@@ -30386,7 +32160,7 @@ var ts;
                 write(" = {}));");
                 emitEnd(node);
                 if (!isES6ExportedDeclaration(node) && node.name.kind === 69 && node.parent === currentSourceFile) {
-                    if (modulekind === 4 && (node.flags & 2)) {
+                    if (modulekind === ts.ModuleKind.System && (node.flags & 1)) {
                         writeLine();
                         write(exportFunctionForFile + "(\"");
                         emitDeclarationName(node);
@@ -30422,16 +32196,16 @@ var ts;
                 }
             }
             function getNamespaceDeclarationNode(node) {
-                if (node.kind === 224) {
+                if (node.kind === 228) {
                     return node;
                 }
                 var importClause = node.importClause;
-                if (importClause && importClause.namedBindings && importClause.namedBindings.kind === 227) {
+                if (importClause && importClause.namedBindings && importClause.namedBindings.kind === 231) {
                     return importClause.namedBindings;
                 }
             }
             function isDefaultImport(node) {
-                return node.kind === 225 && node.importClause && !!node.importClause.name;
+                return node.kind === 229 && node.importClause && !!node.importClause.name;
             }
             function emitExportImportAssignments(node) {
                 if (ts.isAliasSymbolDeclaration(node) && resolver.isValueAliasDeclaration(node)) {
@@ -30440,7 +32214,7 @@ var ts;
                 ts.forEachChild(node, emitExportImportAssignments);
             }
             function emitImportDeclaration(node) {
-                if (modulekind !== 5) {
+                if (modulekind !== ts.ModuleKind.ES6) {
                     return emitExternalImportDeclaration(node);
                 }
                 if (node.importClause) {
@@ -30458,7 +32232,7 @@ var ts;
                         if (shouldEmitNamedBindings) {
                             emitLeadingComments(node.importClause.namedBindings);
                             emitStart(node.importClause.namedBindings);
-                            if (node.importClause.namedBindings.kind === 227) {
+                            if (node.importClause.namedBindings.kind === 231) {
                                 write("* as ");
                                 emit(node.importClause.namedBindings.name);
                             }
@@ -30484,21 +32258,24 @@ var ts;
             }
             function emitExternalImportDeclaration(node) {
                 if (ts.contains(externalImports, node)) {
-                    var isExportedImport = node.kind === 224 && (node.flags & 2) !== 0;
+                    var isExportedImport = node.kind === 228 && (node.flags & 1) !== 0;
                     var namespaceDeclaration = getNamespaceDeclarationNode(node);
-                    if (modulekind !== 2) {
+                    var varOrConst = (languageVersion <= 1) ? "var " : "const ";
+                    if (modulekind !== ts.ModuleKind.AMD) {
                         emitLeadingComments(node);
                         emitStart(node);
                         if (namespaceDeclaration && !isDefaultImport(node)) {
-                            if (!isExportedImport)
-                                write("var ");
+                            if (!isExportedImport) {
+                                write(varOrConst);
+                            }
+                            ;
                             emitModuleMemberName(namespaceDeclaration);
                             write(" = ");
                         }
                         else {
-                            var isNakedImport = 225 && !node.importClause;
+                            var isNakedImport = 229 && !node.importClause;
                             if (!isNakedImport) {
-                                write("var ");
+                                write(varOrConst);
                                 write(getGeneratedNameForNode(node));
                                 write(" = ");
                             }
@@ -30523,7 +32300,7 @@ var ts;
                             write(";");
                         }
                         else if (namespaceDeclaration && isDefaultImport(node)) {
-                            write("var ");
+                            write(varOrConst);
                             emitModuleMemberName(namespaceDeclaration);
                             write(" = ");
                             write(getGeneratedNameForNode(node));
@@ -30550,7 +32327,7 @@ var ts;
                             write("export ");
                             write("var ");
                         }
-                        else if (!(node.flags & 2)) {
+                        else if (!(node.flags & 1)) {
                             write("var ");
                         }
                     }
@@ -30572,13 +32349,13 @@ var ts;
                 }
             }
             function emitExportDeclaration(node) {
-                ts.Debug.assert(modulekind !== 4);
-                if (modulekind !== 5) {
+                ts.Debug.assert(modulekind !== ts.ModuleKind.System);
+                if (modulekind !== ts.ModuleKind.ES6) {
                     if (node.moduleSpecifier && (!node.exportClause || resolver.isValueAliasDeclaration(node))) {
                         emitStart(node);
                         var generatedName = getGeneratedNameForNode(node);
                         if (node.exportClause) {
-                            if (modulekind !== 2) {
+                            if (modulekind !== ts.ModuleKind.AMD) {
                                 write("var ");
                                 write(generatedName);
                                 write(" = ");
@@ -30606,7 +32383,7 @@ var ts;
                             if (hasExportStarsToExportValues && resolver.moduleExportsSomeValue(node.moduleSpecifier)) {
                                 writeLine();
                                 write("__export(");
-                                if (modulekind !== 2) {
+                                if (modulekind !== ts.ModuleKind.AMD) {
                                     emitRequire(ts.getExternalModuleName(node));
                                 }
                                 else {
@@ -30638,7 +32415,7 @@ var ts;
                 }
             }
             function emitExportOrImportSpecifierList(specifiers, shouldEmit) {
-                ts.Debug.assert(modulekind === 5);
+                ts.Debug.assert(modulekind === ts.ModuleKind.ES6);
                 var needsComma = false;
                 for (var _a = 0, specifiers_1 = specifiers; _a < specifiers_1.length; _a++) {
                     var specifier = specifiers_1[_a];
@@ -30657,14 +32434,14 @@ var ts;
             }
             function emitExportAssignment(node) {
                 if (!node.isExportEquals && resolver.isValueAliasDeclaration(node)) {
-                    if (modulekind === 5) {
+                    if (modulekind === ts.ModuleKind.ES6) {
                         writeLine();
                         emitStart(node);
                         write("export default ");
                         var expression = node.expression;
                         emit(expression);
-                        if (expression.kind !== 216 &&
-                            expression.kind !== 217) {
+                        if (expression.kind !== 219 &&
+                            expression.kind !== 220) {
                             write(";");
                         }
                         emitEnd(node);
@@ -30672,7 +32449,7 @@ var ts;
                     else {
                         writeLine();
                         emitStart(node);
-                        if (modulekind === 4) {
+                        if (modulekind === ts.ModuleKind.System) {
                             write(exportFunctionForFile + "(\"default\",");
                             emit(node.expression);
                             write(")");
@@ -30681,7 +32458,7 @@ var ts;
                             emitEs6ExportDefaultCompat(node);
                             emitContainingModuleName(node);
                             if (languageVersion === 0) {
-                                write("[\"default\"] = ");
+                                write('["default"] = ');
                             }
                             else {
                                 write(".default = ");
@@ -30701,18 +32478,18 @@ var ts;
                 for (var _a = 0, _b = sourceFile.statements; _a < _b.length; _a++) {
                     var node = _b[_a];
                     switch (node.kind) {
-                        case 225:
+                        case 229:
                             if (!node.importClause ||
                                 resolver.isReferencedAliasDeclaration(node.importClause, true)) {
                                 externalImports.push(node);
                             }
                             break;
-                        case 224:
-                            if (node.moduleReference.kind === 235 && resolver.isReferencedAliasDeclaration(node)) {
+                        case 228:
+                            if (node.moduleReference.kind === 239 && resolver.isReferencedAliasDeclaration(node)) {
                                 externalImports.push(node);
                             }
                             break;
-                        case 231:
+                        case 235:
                             if (node.moduleSpecifier) {
                                 if (!node.exportClause) {
                                     if (resolver.moduleExportsSomeValue(node.moduleSpecifier)) {
@@ -30727,12 +32504,12 @@ var ts;
                             else {
                                 for (var _c = 0, _d = node.exportClause.elements; _c < _d.length; _c++) {
                                     var specifier = _d[_c];
-                                    var name_27 = (specifier.propertyName || specifier.name).text;
-                                    (exportSpecifiers[name_27] || (exportSpecifiers[name_27] = [])).push(specifier);
+                                    var name_29 = (specifier.propertyName || specifier.name).text;
+                                    (exportSpecifiers[name_29] || (exportSpecifiers[name_29] = [])).push(specifier);
                                 }
                             }
                             break;
-                        case 230:
+                        case 234:
                             if (node.isExportEquals && !exportEquals) {
                                 exportEquals = node;
                             }
@@ -30757,18 +32534,18 @@ var ts;
                 if (namespaceDeclaration && !isDefaultImport(node)) {
                     return ts.getTextOfNodeFromSourceText(currentText, namespaceDeclaration.name);
                 }
-                if (node.kind === 225 && node.importClause) {
+                if (node.kind === 229 && node.importClause) {
                     return getGeneratedNameForNode(node);
                 }
-                if (node.kind === 231 && node.moduleSpecifier) {
+                if (node.kind === 235 && node.moduleSpecifier) {
                     return getGeneratedNameForNode(node);
                 }
             }
             function getExternalModuleNameText(importNode, emitRelativePathAsModuleName) {
                 if (emitRelativePathAsModuleName) {
-                    var name_28 = getExternalModuleNameFromDeclaration(host, resolver, importNode);
-                    if (name_28) {
-                        return "\"" + name_28 + "\"";
+                    var name_30 = getExternalModuleNameFromDeclaration(host, resolver, importNode);
+                    if (name_30) {
+                        return "\"" + name_30 + "\"";
                     }
                 }
                 var moduleName = ts.getExternalModuleName(importNode);
@@ -30785,8 +32562,8 @@ var ts;
                 var started = false;
                 for (var _a = 0, externalImports_1 = externalImports; _a < externalImports_1.length; _a++) {
                     var importNode = externalImports_1[_a];
-                    var skipNode = importNode.kind === 231 ||
-                        (importNode.kind === 225 && !importNode.importClause);
+                    var skipNode = importNode.kind === 235 ||
+                        (importNode.kind === 229 && !importNode.importClause);
                     if (skipNode) {
                         continue;
                     }
@@ -30811,7 +32588,7 @@ var ts;
                     var hasExportDeclarationWithExportClause = false;
                     for (var _a = 0, externalImports_2 = externalImports; _a < externalImports_2.length; _a++) {
                         var externalImport = externalImports_2[_a];
-                        if (externalImport.kind === 231 && externalImport.exportClause) {
+                        if (externalImport.kind === 235 && externalImport.exportClause) {
                             hasExportDeclarationWithExportClause = true;
                             break;
                         }
@@ -30840,7 +32617,7 @@ var ts;
                 }
                 for (var _d = 0, externalImports_3 = externalImports; _d < externalImports_3.length; _d++) {
                     var externalImport = externalImports_3[_d];
-                    if (externalImport.kind !== 231) {
+                    if (externalImport.kind !== 235) {
                         continue;
                     }
                     var exportDecl = externalImport;
@@ -30914,11 +32691,11 @@ var ts;
                     var seen = {};
                     for (var i = 0; i < hoistedVars.length; i++) {
                         var local = hoistedVars[i];
-                        var name_29 = local.kind === 69
+                        var name_31 = local.kind === 69
                             ? local
                             : local.name;
-                        if (name_29) {
-                            var text = ts.unescapeIdentifier(name_29.text);
+                        if (name_31) {
+                            var text = ts.unescapeIdentifier(name_31.text);
                             if (ts.hasProperty(seen, text)) {
                                 continue;
                             }
@@ -30929,14 +32706,14 @@ var ts;
                         if (i !== 0) {
                             write(", ");
                         }
-                        if (local.kind === 217 || local.kind === 221 || local.kind === 220) {
+                        if (local.kind === 220 || local.kind === 224 || local.kind === 223) {
                             emitDeclarationName(local);
                         }
                         else {
                             emit(local);
                         }
                         var flags = ts.getCombinedNodeFlags(local.kind === 69 ? local.parent : local);
-                        if (flags & 2) {
+                        if (flags & 1) {
                             if (!exportedDeclarations) {
                                 exportedDeclarations = [];
                             }
@@ -30950,7 +32727,7 @@ var ts;
                         var f = hoistedFunctionDeclarations_1[_a];
                         writeLine();
                         emit(f);
-                        if (f.flags & 2) {
+                        if (f.flags & 1) {
                             if (!exportedDeclarations) {
                                 exportedDeclarations = [];
                             }
@@ -30960,24 +32737,24 @@ var ts;
                 }
                 return exportedDeclarations;
                 function visit(node) {
-                    if (node.flags & 4) {
+                    if (node.flags & 2) {
                         return;
                     }
-                    if (node.kind === 216) {
+                    if (node.kind === 219) {
                         if (!hoistedFunctionDeclarations) {
                             hoistedFunctionDeclarations = [];
                         }
                         hoistedFunctionDeclarations.push(node);
                         return;
                     }
-                    if (node.kind === 217) {
+                    if (node.kind === 220) {
                         if (!hoistedVars) {
                             hoistedVars = [];
                         }
                         hoistedVars.push(node);
                         return;
                     }
-                    if (node.kind === 220) {
+                    if (node.kind === 223) {
                         if (shouldEmitEnumDeclaration(node)) {
                             if (!hoistedVars) {
                                 hoistedVars = [];
@@ -30986,7 +32763,7 @@ var ts;
                         }
                         return;
                     }
-                    if (node.kind === 221) {
+                    if (node.kind === 224) {
                         if (shouldEmitModuleDeclaration(node)) {
                             if (!hoistedVars) {
                                 hoistedVars = [];
@@ -30995,17 +32772,17 @@ var ts;
                         }
                         return;
                     }
-                    if (node.kind === 214 || node.kind === 166) {
+                    if (node.kind === 217 || node.kind === 168) {
                         if (shouldHoistVariable(node, false)) {
-                            var name_30 = node.name;
-                            if (name_30.kind === 69) {
+                            var name_32 = node.name;
+                            if (name_32.kind === 69) {
                                 if (!hoistedVars) {
                                     hoistedVars = [];
                                 }
-                                hoistedVars.push(name_30);
+                                hoistedVars.push(name_32);
                             }
                             else {
-                                ts.forEachChild(name_30, visit);
+                                ts.forEachChild(name_32, visit);
                             }
                         }
                         return;
@@ -31030,11 +32807,11 @@ var ts;
                 if (checkIfSourceFileLevelDecl && !shouldHoistDeclarationInSystemJsModule(node)) {
                     return false;
                 }
-                return (ts.getCombinedNodeFlags(node) & 24576) === 0 ||
-                    ts.getEnclosingBlockScopeContainer(node).kind === 251;
+                return (ts.getCombinedNodeFlags(node) & 3072) === 0 ||
+                    ts.getEnclosingBlockScopeContainer(node).kind === 255;
             }
             function isCurrentFileSystemExternalModule() {
-                return modulekind === 4 && isCurrentFileExternalModule;
+                return modulekind === ts.ModuleKind.System && isCurrentFileExternalModule;
             }
             function emitSystemModuleBody(node, dependencyGroups, startIndex) {
                 emitVariableDeclarationsForImports();
@@ -31069,17 +32846,17 @@ var ts;
                         var entry = group_1[_a];
                         var importVariableName = getLocalNameForExternalImport(entry) || "";
                         switch (entry.kind) {
-                            case 225:
+                            case 229:
                                 if (!entry.importClause) {
                                     break;
                                 }
-                            case 224:
+                            case 228:
                                 ts.Debug.assert(importVariableName !== "");
                                 writeLine();
                                 write(importVariableName + " = " + parameterName + ";");
                                 writeLine();
                                 break;
-                            case 231:
+                            case 235:
                                 ts.Debug.assert(importVariableName !== "");
                                 if (entry.exportClause) {
                                     writeLine();
@@ -31123,10 +32900,10 @@ var ts;
                 for (var i = startIndex; i < node.statements.length; i++) {
                     var statement = node.statements[i];
                     switch (statement.kind) {
-                        case 216:
-                        case 225:
+                        case 219:
+                        case 229:
                             continue;
-                        case 231:
+                        case 235:
                             if (!statement.moduleSpecifier) {
                                 for (var _a = 0, _b = statement.exportClause.elements; _a < _b.length; _a++) {
                                     var element = _b[_a];
@@ -31134,7 +32911,7 @@ var ts;
                                 }
                             }
                             continue;
-                        case 224:
+                        case 228:
                             if (!ts.isInternalModuleImportEqualsDeclaration(statement)) {
                                 continue;
                             }
@@ -31157,6 +32934,7 @@ var ts;
                 collectExternalModuleInfo(node);
                 ts.Debug.assert(!exportFunctionForFile);
                 exportFunctionForFile = makeUniqueName("exports");
+                contextObjectForFile = makeUniqueName("context");
                 writeLine();
                 write("System.register(");
                 writeModuleName(node, emitRelativePathAsModuleName);
@@ -31165,13 +32943,17 @@ var ts;
                 var dependencyGroups = [];
                 for (var i = 0; i < externalImports.length; i++) {
                     var text = getExternalModuleNameText(externalImports[i], emitRelativePathAsModuleName);
-                    if (ts.hasProperty(groupIndices, text)) {
-                        var groupIndex = groupIndices[text];
+                    if (text === undefined) {
+                        continue;
+                    }
+                    var key = text.substr(1, text.length - 2);
+                    if (ts.hasProperty(groupIndices, key)) {
+                        var groupIndex = groupIndices[key];
                         dependencyGroups[groupIndex].push(externalImports[i]);
                         continue;
                     }
                     else {
-                        groupIndices[text] = dependencyGroups.length;
+                        groupIndices[key] = dependencyGroups.length;
                         dependencyGroups.push([externalImports[i]]);
                     }
                     if (i !== 0) {
@@ -31179,10 +32961,13 @@ var ts;
                     }
                     write(text);
                 }
-                write("], function(" + exportFunctionForFile + ") {");
+                write("], function(" + exportFunctionForFile + ", " + contextObjectForFile + ") {");
                 writeLine();
                 increaseIndent();
-                var startIndex = emitDirectivePrologues(node.statements, true, true);
+                var startIndex = emitDirectivePrologues(node.statements, true, !compilerOptions.noImplicitUseStrict);
+                writeLine();
+                write("var __moduleName = " + contextObjectForFile + " && " + contextObjectForFile + ".id;");
+                writeLine();
                 emitEmitHelpers(node);
                 emitCaptureThisForNodeIfNecessary(node);
                 emitSystemModuleBody(node, dependencyGroups, startIndex);
@@ -31197,11 +32982,11 @@ var ts;
                 for (var _a = 0, _b = node.amdDependencies; _a < _b.length; _a++) {
                     var amdDependency = _b[_a];
                     if (amdDependency.name) {
-                        aliasedModuleNames.push("\"" + amdDependency.path + "\"");
+                        aliasedModuleNames.push('"' + amdDependency.path + '"');
                         importAliasNames.push(amdDependency.name);
                     }
                     else {
-                        unaliasedModuleNames.push("\"" + amdDependency.path + "\"");
+                        unaliasedModuleNames.push('"' + amdDependency.path + '"');
                     }
                 }
                 for (var _c = 0, externalImports_4 = externalImports; _c < externalImports_4.length; _c++) {
@@ -31226,7 +33011,7 @@ var ts;
             }
             function emitAMDDependencyList(_a) {
                 var aliasedModuleNames = _a.aliasedModuleNames, unaliasedModuleNames = _a.unaliasedModuleNames;
-                write("[\"require\", \"exports\"");
+                write('["require", "exports"');
                 if (aliasedModuleNames.length) {
                     write(", ");
                     write(aliasedModuleNames.join(", "));
@@ -31254,25 +33039,25 @@ var ts;
                 writeModuleName(node, emitRelativePathAsModuleName);
                 emitAMDDependencies(node, true, emitRelativePathAsModuleName);
                 increaseIndent();
-                var startIndex = emitDirectivePrologues(node.statements, true, true);
+                var startIndex = emitDirectivePrologues(node.statements, true, !compilerOptions.noImplicitUseStrict);
                 emitExportStarHelper();
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
-                emitTempDeclarations(true);
                 emitExportEquals(true);
+                emitTempDeclarations(true);
                 decreaseIndent();
                 writeLine();
                 write("});");
             }
             function emitCommonJSModule(node) {
-                var startIndex = emitDirectivePrologues(node.statements, false, true);
+                var startIndex = emitDirectivePrologues(node.statements, false, !compilerOptions.noImplicitUseStrict);
                 emitEmitHelpers(node);
                 collectExternalModuleInfo(node);
                 emitExportStarHelper();
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
-                emitTempDeclarations(true);
                 emitExportEquals(false);
+                emitTempDeclarations(true);
             }
             function emitUMDModule(node) {
                 emitEmitHelpers(node);
@@ -31284,12 +33069,12 @@ var ts;
                 writeLines("    }\n})(");
                 emitAMDFactoryHeader(dependencyNames);
                 increaseIndent();
-                var startIndex = emitDirectivePrologues(node.statements, true, true);
+                var startIndex = emitDirectivePrologues(node.statements, true, !compilerOptions.noImplicitUseStrict);
                 emitExportStarHelper();
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
-                emitTempDeclarations(true);
                 emitExportEquals(true);
+                emitTempDeclarations(true);
                 decreaseIndent();
                 writeLine();
                 write("});");
@@ -31355,7 +33140,7 @@ var ts;
                     result = result.replace(/&(\w+);/g, function (s, m) {
                         if (entities[m] !== undefined) {
                             var ch = String.fromCharCode(entities[m]);
-                            return ch === "\"" ? "\\\"" : ch;
+                            return ch === '"' ? "\\\"" : ch;
                         }
                         else {
                             return s;
@@ -31364,6 +33149,16 @@ var ts;
                 }
                 return result;
             }
+            function isJsxChildEmittable(child) {
+                if (child.kind === 247) {
+                    return !!child.expression;
+                }
+                else if (child.kind === 243) {
+                    return !!getTextToEmit(child);
+                }
+                return true;
+            }
+            ;
             function getTextToEmit(node) {
                 switch (compilerOptions.jsx) {
                     case 2:
@@ -31382,9 +33177,9 @@ var ts;
             function emitJsxText(node) {
                 switch (compilerOptions.jsx) {
                     case 2:
-                        write("\"");
+                        write('"');
                         write(trimReactWhitespaceAndApplyEntities(node));
-                        write("\"");
+                        write('"');
                         break;
                     case 1:
                     default:
@@ -31408,7 +33203,7 @@ var ts;
                 }
             }
             function isUseStrictPrologue(node) {
-                return !!node.expression.text.match(/use strict/);
+                return node.expression.text === "use strict";
             }
             function ensureUseStrictPrologue(startWithNewLine, writeUseStrict) {
                 if (writeUseStrict) {
@@ -31450,22 +33245,26 @@ var ts;
             }
             function emitEmitHelpers(node) {
                 if (!compilerOptions.noEmitHelpers) {
-                    if ((languageVersion < 2) && (!extendsEmitted && node.flags & 4194304)) {
+                    if (languageVersion < 2 && !extendsEmitted && node.flags & 262144) {
                         writeLines(extendsHelper);
                         extendsEmitted = true;
                     }
-                    if (!decorateEmitted && node.flags & 8388608) {
+                    if (compilerOptions.jsx !== 1 && !assignEmitted && (node.flags & 1073741824)) {
+                        writeLines(assignHelper);
+                        assignEmitted = true;
+                    }
+                    if (!decorateEmitted && node.flags & 524288) {
                         writeLines(decorateHelper);
                         if (compilerOptions.emitDecoratorMetadata) {
                             writeLines(metadataHelper);
                         }
                         decorateEmitted = true;
                     }
-                    if (!paramEmitted && node.flags & 16777216) {
+                    if (!paramEmitted && node.flags & 1048576) {
                         writeLines(paramHelper);
                         paramEmitted = true;
                     }
-                    if (!awaiterEmitted && node.flags & 33554432) {
+                    if (!awaiterEmitted && node.flags & 2097152) {
                         writeLines(awaiterHelper);
                         awaiterEmitted = true;
                     }
@@ -31477,7 +33276,7 @@ var ts;
                 emitDetachedCommentsAndUpdateCommentsInfo(node);
                 if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
                     if (isOwnFileEmit || (!ts.isExternalModule(node) && compilerOptions.isolatedModules)) {
-                        var emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[1];
+                        var emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[ts.ModuleKind.CommonJS];
                         emitModule(node);
                     }
                     else {
@@ -31505,7 +33304,7 @@ var ts;
             }
             function emitNodeConsideringCommentsOption(node, emitNodeConsideringSourcemap) {
                 if (node) {
-                    if (node.flags & 4) {
+                    if (node.flags & 2) {
                         return emitCommentsOnNotEmittedNode(node);
                     }
                     if (isSpecializedCommentHandling(node)) {
@@ -31548,28 +33347,28 @@ var ts;
             }
             function isSpecializedCommentHandling(node) {
                 switch (node.kind) {
-                    case 218:
-                    case 216:
-                    case 225:
-                    case 224:
+                    case 221:
                     case 219:
-                    case 230:
+                    case 229:
+                    case 228:
+                    case 222:
+                    case 234:
                         return true;
                 }
             }
             function shouldEmitLeadingAndTrailingComments(node) {
                 switch (node.kind) {
-                    case 196:
+                    case 199:
                         return shouldEmitLeadingAndTrailingCommentsForVariableStatement(node);
-                    case 221:
+                    case 224:
                         return shouldEmitModuleDeclaration(node);
-                    case 220:
+                    case 223:
                         return shouldEmitEnumDeclaration(node);
                 }
                 ts.Debug.assert(!isSpecializedCommentHandling(node));
-                if (node.kind !== 195 &&
+                if (node.kind !== 198 &&
                     node.parent &&
-                    node.parent.kind === 177 &&
+                    node.parent.kind === 179 &&
                     node.parent.body === node &&
                     compilerOptions.target <= 1) {
                     return false;
@@ -31580,13 +33379,13 @@ var ts;
                 switch (node.kind) {
                     case 69:
                         return emitIdentifier(node);
-                    case 139:
+                    case 141:
                         return emitParameter(node);
-                    case 144:
-                    case 143:
-                        return emitMethod(node);
                     case 146:
-                    case 147:
+                    case 145:
+                        return emitMethod(node);
+                    case 148:
+                    case 149:
                         return emitAccessor(node);
                     case 97:
                         return emitThis(node);
@@ -31606,142 +33405,142 @@ var ts;
                     case 13:
                     case 14:
                         return emitLiteral(node);
-                    case 186:
-                        return emitTemplateExpression(node);
-                    case 193:
-                        return emitTemplateSpan(node);
-                    case 236:
-                    case 237:
-                        return emitJsxElement(node);
-                    case 239:
-                        return emitJsxText(node);
-                    case 243:
-                        return emitJsxExpression(node);
-                    case 136:
-                        return emitQualifiedName(node);
-                    case 164:
-                        return emitObjectBindingPattern(node);
-                    case 165:
-                        return emitArrayBindingPattern(node);
-                    case 166:
-                        return emitBindingElement(node);
-                    case 167:
-                        return emitArrayLiteral(node);
-                    case 168:
-                        return emitObjectLiteral(node);
-                    case 248:
-                        return emitPropertyAssignment(node);
-                    case 249:
-                        return emitShorthandPropertyAssignment(node);
-                    case 137:
-                        return emitComputedPropertyName(node);
-                    case 169:
-                        return emitPropertyAccess(node);
-                    case 170:
-                        return emitIndexedAccess(node);
-                    case 171:
-                        return emitCallExpression(node);
-                    case 172:
-                        return emitNewExpression(node);
-                    case 173:
-                        return emitTaggedTemplateExpression(node);
-                    case 174:
-                        return emit(node.expression);
-                    case 192:
-                        return emit(node.expression);
-                    case 175:
-                        return emitParenExpression(node);
-                    case 216:
-                    case 176:
-                    case 177:
-                        return emitFunctionDeclaration(node);
-                    case 178:
-                        return emitDeleteExpression(node);
-                    case 179:
-                        return emitTypeOfExpression(node);
-                    case 180:
-                        return emitVoidExpression(node);
-                    case 181:
-                        return emitAwaitExpression(node);
-                    case 182:
-                        return emitPrefixUnaryExpression(node);
-                    case 183:
-                        return emitPostfixUnaryExpression(node);
-                    case 184:
-                        return emitBinaryExpression(node);
-                    case 185:
-                        return emitConditionalExpression(node);
                     case 188:
-                        return emitSpreadElementExpression(node);
-                    case 187:
-                        return emitYieldExpression(node);
-                    case 190:
-                        return;
-                    case 195:
-                    case 222:
-                        return emitBlock(node);
+                        return emitTemplateExpression(node);
                     case 196:
-                        return emitVariableStatement(node);
-                    case 197:
-                        return write(";");
-                    case 198:
-                        return emitExpressionStatement(node);
-                    case 199:
-                        return emitIfStatement(node);
-                    case 200:
-                        return emitDoStatement(node);
-                    case 201:
-                        return emitWhileStatement(node);
-                    case 202:
-                        return emitForStatement(node);
-                    case 204:
-                    case 203:
-                        return emitForInOrForOfStatement(node);
-                    case 205:
-                    case 206:
-                        return emitBreakOrContinueStatement(node);
-                    case 207:
-                        return emitReturnStatement(node);
-                    case 208:
-                        return emitWithStatement(node);
-                    case 209:
-                        return emitSwitchStatement(node);
-                    case 244:
-                    case 245:
-                        return emitCaseOrDefaultClause(node);
-                    case 210:
-                        return emitLabeledStatement(node);
-                    case 211:
-                        return emitThrowStatement(node);
-                    case 212:
-                        return emitTryStatement(node);
+                        return emitTemplateSpan(node);
+                    case 240:
+                    case 241:
+                        return emitJsxElement(node);
+                    case 243:
+                        return emitJsxText(node);
                     case 247:
-                        return emitCatchClause(node);
-                    case 213:
-                        return emitDebuggerStatement(node);
-                    case 214:
-                        return emitVariableDeclaration(node);
+                        return emitJsxExpression(node);
+                    case 138:
+                        return emitQualifiedName(node);
+                    case 166:
+                        return emitObjectBindingPattern(node);
+                    case 167:
+                        return emitArrayBindingPattern(node);
+                    case 168:
+                        return emitBindingElement(node);
+                    case 169:
+                        return emitArrayLiteral(node);
+                    case 170:
+                        return emitObjectLiteral(node);
+                    case 252:
+                        return emitPropertyAssignment(node);
+                    case 253:
+                        return emitShorthandPropertyAssignment(node);
+                    case 139:
+                        return emitComputedPropertyName(node);
+                    case 171:
+                        return emitPropertyAccess(node);
+                    case 172:
+                        return emitIndexedAccess(node);
+                    case 173:
+                        return emitCallExpression(node);
+                    case 174:
+                        return emitNewExpression(node);
+                    case 175:
+                        return emitTaggedTemplateExpression(node);
+                    case 176:
+                    case 194:
+                    case 195:
+                        return emit(node.expression);
+                    case 177:
+                        return emitParenExpression(node);
+                    case 219:
+                    case 178:
+                    case 179:
+                        return emitFunctionDeclaration(node);
+                    case 180:
+                        return emitDeleteExpression(node);
+                    case 181:
+                        return emitTypeOfExpression(node);
+                    case 182:
+                        return emitVoidExpression(node);
+                    case 183:
+                        return emitAwaitExpression(node);
+                    case 184:
+                        return emitPrefixUnaryExpression(node);
+                    case 185:
+                        return emitPostfixUnaryExpression(node);
+                    case 186:
+                        return emitBinaryExpression(node);
+                    case 187:
+                        return emitConditionalExpression(node);
+                    case 190:
+                        return emitSpreadElementExpression(node);
                     case 189:
-                        return emitClassExpression(node);
-                    case 217:
-                        return emitClassDeclaration(node);
-                    case 218:
-                        return emitInterfaceDeclaration(node);
-                    case 220:
-                        return emitEnumDeclaration(node);
-                    case 250:
-                        return emitEnumMember(node);
-                    case 221:
-                        return emitModuleDeclaration(node);
+                        return emitYieldExpression(node);
+                    case 192:
+                        return;
+                    case 198:
                     case 225:
-                        return emitImportDeclaration(node);
-                    case 224:
-                        return emitImportEqualsDeclaration(node);
-                    case 231:
-                        return emitExportDeclaration(node);
-                    case 230:
-                        return emitExportAssignment(node);
+                        return emitBlock(node);
+                    case 199:
+                        return emitVariableStatement(node);
+                    case 200:
+                        return write(";");
+                    case 201:
+                        return emitExpressionStatement(node);
+                    case 202:
+                        return emitIfStatement(node);
+                    case 203:
+                        return emitDoStatement(node);
+                    case 204:
+                        return emitWhileStatement(node);
+                    case 205:
+                        return emitForStatement(node);
+                    case 207:
+                    case 206:
+                        return emitForInOrForOfStatement(node);
+                    case 208:
+                    case 209:
+                        return emitBreakOrContinueStatement(node);
+                    case 210:
+                        return emitReturnStatement(node);
+                    case 211:
+                        return emitWithStatement(node);
+                    case 212:
+                        return emitSwitchStatement(node);
+                    case 248:
+                    case 249:
+                        return emitCaseOrDefaultClause(node);
+                    case 213:
+                        return emitLabeledStatement(node);
+                    case 214:
+                        return emitThrowStatement(node);
+                    case 215:
+                        return emitTryStatement(node);
                     case 251:
+                        return emitCatchClause(node);
+                    case 216:
+                        return emitDebuggerStatement(node);
+                    case 217:
+                        return emitVariableDeclaration(node);
+                    case 191:
+                        return emitClassExpression(node);
+                    case 220:
+                        return emitClassDeclaration(node);
+                    case 221:
+                        return emitInterfaceDeclaration(node);
+                    case 223:
+                        return emitEnumDeclaration(node);
+                    case 254:
+                        return emitEnumMember(node);
+                    case 224:
+                        return emitModuleDeclaration(node);
+                    case 229:
+                        return emitImportDeclaration(node);
+                    case 228:
+                        return emitImportEqualsDeclaration(node);
+                    case 235:
+                        return emitExportDeclaration(node);
+                    case 234:
+                        return emitExportAssignment(node);
+                    case 255:
                         return emitSourceFileNode(node);
                 }
             }
@@ -31771,7 +33570,7 @@ var ts;
             }
             function getLeadingCommentsToEmit(node) {
                 if (node.parent) {
-                    if (node.parent.kind === 251 || node.pos !== node.parent.pos) {
+                    if (node.parent.kind === 255 || node.pos !== node.parent.pos) {
                         if (hasDetachedComments(node.pos)) {
                             return getLeadingCommentsWithoutDetachedComments();
                         }
@@ -31783,7 +33582,7 @@ var ts;
             }
             function getTrailingCommentsToEmit(node) {
                 if (node.parent) {
-                    if (node.parent.kind === 251 || node.end !== node.parent.end) {
+                    if (node.parent.kind === 255 || node.end !== node.parent.end) {
                         return ts.getTrailingCommentRanges(currentText, node.end);
                     }
                 }
@@ -31874,6 +33673,15 @@ var ts;
             if (declarationFilePath) {
                 emitSkipped = ts.writeDeclarationFile(declarationFilePath, sourceFiles, isBundledEmit, host, resolver, emitterDiagnostics) || emitSkipped;
             }
+            if (!emitSkipped && emittedFilesList) {
+                emittedFilesList.push(jsFilePath);
+                if (sourceMapFilePath) {
+                    emittedFilesList.push(sourceMapFilePath);
+                }
+                if (declarationFilePath) {
+                    emittedFilesList.push(declarationFilePath);
+                }
+            }
         }
     }
     ts.emitFiles = emitFiles;
@@ -31885,10 +33693,15 @@ var ts;
     ts.ioReadTime = 0;
     ts.ioWriteTime = 0;
     var emptyArray = [];
-    ts.version = "1.8.0";
+    var defaultLibrarySearchPaths = [
+        "types/",
+        "node_modules/",
+        "node_modules/@types/",
+    ];
+    ts.version = "1.9.0";
     function findConfigFile(searchPath, fileExists) {
-        var fileName = "tsconfig.json";
         while (true) {
+            var fileName = ts.combinePaths(searchPath, "tsconfig.json");
             if (fileExists(fileName)) {
                 return fileName;
             }
@@ -31897,7 +33710,6 @@ var ts;
                 break;
             }
             searchPath = parentPath;
-            fileName = "../" + fileName;
         }
         return undefined;
     }
@@ -31908,94 +33720,485 @@ var ts;
         return ts.normalizePath(referencedFileName);
     }
     ts.resolveTripleslashReference = resolveTripleslashReference;
-    function resolveModuleName(moduleName, containingFile, compilerOptions, host) {
-        var moduleResolution = compilerOptions.moduleResolution !== undefined
-            ? compilerOptions.moduleResolution
-            : compilerOptions.module === 1 ? 2 : 1;
-        switch (moduleResolution) {
-            case 2: return nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host);
-            case 1: return classicNameResolver(moduleName, containingFile, compilerOptions, host);
+    function computeCommonSourceDirectoryOfFilenames(fileNames, currentDirectory, getCanonicalFileName) {
+        var commonPathComponents;
+        var failed = ts.forEach(fileNames, function (sourceFile) {
+            var sourcePathComponents = ts.getNormalizedPathComponents(sourceFile, currentDirectory);
+            sourcePathComponents.pop();
+            if (!commonPathComponents) {
+                commonPathComponents = sourcePathComponents;
+                return;
+            }
+            for (var i = 0, n = Math.min(commonPathComponents.length, sourcePathComponents.length); i < n; i++) {
+                if (getCanonicalFileName(commonPathComponents[i]) !== getCanonicalFileName(sourcePathComponents[i])) {
+                    if (i === 0) {
+                        return true;
+                    }
+                    commonPathComponents.length = i;
+                    break;
+                }
+            }
+            if (sourcePathComponents.length < commonPathComponents.length) {
+                commonPathComponents.length = sourcePathComponents.length;
+            }
+        });
+        if (failed) {
+            return "";
         }
+        if (!commonPathComponents) {
+            return currentDirectory;
+        }
+        return ts.getNormalizedPathFromPathComponents(commonPathComponents);
+    }
+    ts.computeCommonSourceDirectoryOfFilenames = computeCommonSourceDirectoryOfFilenames;
+    function trace(host, message) {
+        host.trace(ts.formatMessage.apply(undefined, arguments));
+    }
+    function isTraceEnabled(compilerOptions, host) {
+        return compilerOptions.traceResolution && host.trace !== undefined;
+    }
+    function hasZeroOrOneAsteriskCharacter(str) {
+        var seenAsterisk = false;
+        for (var i = 0; i < str.length; i++) {
+            if (str.charCodeAt(i) === 42) {
+                if (!seenAsterisk) {
+                    seenAsterisk = true;
+                }
+                else {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+    function createResolvedModule(resolvedFileName, isExternalLibraryImport, failedLookupLocations) {
+        return { resolvedModule: resolvedFileName ? { resolvedFileName: resolvedFileName, isExternalLibraryImport: isExternalLibraryImport } : undefined, failedLookupLocations: failedLookupLocations };
+    }
+    function moduleHasNonRelativeName(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;
+        try {
+            var jsonText = state.host.readFile(packageJsonPath);
+            jsonContent = jsonText ? JSON.parse(jsonText) : {};
+        }
+        catch (e) {
+            jsonContent = {};
+        }
+        var typesFile;
+        var fieldName;
+        if (jsonContent.typings) {
+            if (typeof jsonContent.typings === "string") {
+                fieldName = "typings";
+                typesFile = jsonContent.typings;
+            }
+            else {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.Expected_type_of_0_field_in_package_json_to_be_string_got_1, "typings", typeof jsonContent.typings);
+                }
+            }
+        }
+        if (!typesFile && jsonContent.types) {
+            if (typeof jsonContent.types === "string") {
+                fieldName = "types";
+                typesFile = jsonContent.types;
+            }
+            else {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.Expected_type_of_0_field_in_package_json_to_be_string_got_1, "types", typeof jsonContent.types);
+                }
+            }
+        }
+        if (typesFile) {
+            var typesFilePath = ts.normalizePath(ts.combinePaths(baseDirectory, typesFile));
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, typesFile, typesFilePath);
+            }
+            return typesFilePath;
+        }
+        return undefined;
+    }
+    var typeReferenceExtensions = [".d.ts"];
+    function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host) {
+        var traceEnabled = isTraceEnabled(options, host);
+        var moduleResolutionState = {
+            compilerOptions: options,
+            host: host,
+            skipTsx: true,
+            traceEnabled: traceEnabled
+        };
+        var rootDir = options.typesRoot || (options.configFilePath ? ts.getDirectoryPath(options.configFilePath) : undefined);
+        if (traceEnabled) {
+            if (containingFile === undefined) {
+                if (rootDir === undefined) {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_not_set_root_directory_not_set, typeReferenceDirectiveName);
+                }
+                else {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_not_set_root_directory_1, typeReferenceDirectiveName, rootDir);
+                }
+            }
+            else {
+                if (rootDir === undefined) {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_1_root_directory_not_set, typeReferenceDirectiveName, containingFile);
+                }
+                else {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_1_root_directory_2, typeReferenceDirectiveName, containingFile, rootDir);
+                }
+            }
+        }
+        var failedLookupLocations = [];
+        if (rootDir !== undefined) {
+            var effectivePrimarySearchPaths = options.typesSearchPaths || defaultLibrarySearchPaths;
+            for (var _i = 0, effectivePrimarySearchPaths_1 = effectivePrimarySearchPaths; _i < effectivePrimarySearchPaths_1.length; _i++) {
+                var searchPath = effectivePrimarySearchPaths_1[_i];
+                var primaryPath = ts.combinePaths(rootDir, searchPath);
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Resolving_with_primary_search_path_0, primaryPath);
+                }
+                var candidate = ts.combinePaths(primaryPath, typeReferenceDirectiveName);
+                var candidateDirectory = ts.getDirectoryPath(candidate);
+                var resolvedFile_1 = loadNodeModuleFromDirectory(typeReferenceExtensions, candidate, failedLookupLocations, !directoryProbablyExists(candidateDirectory, host), moduleResolutionState);
+                if (resolvedFile_1) {
+                    if (traceEnabled) {
+                        trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile_1, true);
+                    }
+                    return {
+                        resolvedTypeReferenceDirective: { primary: true, resolvedFileName: resolvedFile_1 },
+                        failedLookupLocations: failedLookupLocations
+                    };
+                }
+            }
+        }
+        else {
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Root_directory_cannot_be_determined_skipping_primary_search_paths);
+            }
+        }
+        var resolvedFile;
+        var initialLocationForSecondaryLookup;
+        if (containingFile) {
+            initialLocationForSecondaryLookup = ts.getDirectoryPath(containingFile);
+        }
+        else {
+            initialLocationForSecondaryLookup = rootDir;
+        }
+        if (initialLocationForSecondaryLookup !== undefined) {
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
+            }
+            resolvedFile = loadModuleFromNodeModules(typeReferenceDirectiveName, initialLocationForSecondaryLookup, failedLookupLocations, moduleResolutionState);
+            if (traceEnabled) {
+                if (resolvedFile) {
+                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile, false);
+                }
+                else {
+                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_not_resolved, typeReferenceDirectiveName);
+                }
+            }
+        }
+        else {
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder);
+            }
+        }
+        return {
+            resolvedTypeReferenceDirective: resolvedFile
+                ? { primary: false, resolvedFileName: resolvedFile }
+                : undefined,
+            failedLookupLocations: failedLookupLocations
+        };
+    }
+    ts.resolveTypeReferenceDirective = resolveTypeReferenceDirective;
+    function resolveModuleName(moduleName, containingFile, compilerOptions, host) {
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        if (traceEnabled) {
+            trace(host, ts.Diagnostics.Resolving_module_0_from_1, moduleName, containingFile);
+        }
+        var moduleResolution = compilerOptions.moduleResolution;
+        if (moduleResolution === undefined) {
+            moduleResolution = ts.getEmitModuleKind(compilerOptions) === ts.ModuleKind.CommonJS ? ts.ModuleResolutionKind.NodeJs : ts.ModuleResolutionKind.Classic;
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Module_resolution_kind_is_not_specified_using_0, ts.ModuleResolutionKind[moduleResolution]);
+            }
+        }
+        else {
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Explicitly_specified_module_resolution_kind_Colon_0, ts.ModuleResolutionKind[moduleResolution]);
+            }
+        }
+        var result;
+        switch (moduleResolution) {
+            case ts.ModuleResolutionKind.NodeJs:
+                result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host);
+                break;
+            case ts.ModuleResolutionKind.Classic:
+                result = classicNameResolver(moduleName, containingFile, compilerOptions, host);
+                break;
+        }
+        if (traceEnabled) {
+            if (result.resolvedModule) {
+                trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1, moduleName, result.resolvedModule.resolvedFileName);
+            }
+            else {
+                trace(host, ts.Diagnostics.Module_name_0_was_not_resolved, moduleName);
+            }
+        }
+        return result;
     }
     ts.resolveModuleName = resolveModuleName;
+    function tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state) {
+        if (moduleHasNonRelativeName(moduleName)) {
+            return tryLoadModuleUsingBaseUrl(moduleName, loader, failedLookupLocations, supportedExtensions, state);
+        }
+        else {
+            return tryLoadModuleUsingRootDirs(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state);
+        }
+    }
+    function tryLoadModuleUsingRootDirs(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state) {
+        if (!state.compilerOptions.rootDirs) {
+            return undefined;
+        }
+        if (state.traceEnabled) {
+            trace(state.host, ts.Diagnostics.rootDirs_option_is_set_using_it_to_resolve_relative_module_name_0, moduleName);
+        }
+        var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+        var matchedRootDir;
+        var matchedNormalizedPrefix;
+        for (var _i = 0, _a = state.compilerOptions.rootDirs; _i < _a.length; _i++) {
+            var rootDir = _a[_i];
+            var normalizedRoot = ts.normalizePath(rootDir);
+            if (!ts.endsWith(normalizedRoot, ts.directorySeparator)) {
+                normalizedRoot += ts.directorySeparator;
+            }
+            var isLongestMatchingPrefix = ts.startsWith(candidate, normalizedRoot) &&
+                (matchedNormalizedPrefix === undefined || matchedNormalizedPrefix.length < normalizedRoot.length);
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Checking_if_0_is_the_longest_matching_prefix_for_1_2, normalizedRoot, candidate, isLongestMatchingPrefix);
+            }
+            if (isLongestMatchingPrefix) {
+                matchedNormalizedPrefix = normalizedRoot;
+                matchedRootDir = rootDir;
+            }
+        }
+        if (matchedNormalizedPrefix) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Longest_matching_prefix_for_0_is_1, candidate, matchedNormalizedPrefix);
+            }
+            var suffix = candidate.substr(matchedNormalizedPrefix.length);
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, matchedNormalizedPrefix, candidate);
+            }
+            var resolvedFileName = loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(containingDirectory, state.host), state);
+            if (resolvedFileName) {
+                return resolvedFileName;
+            }
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Trying_other_entries_in_rootDirs);
+            }
+            for (var _b = 0, _c = state.compilerOptions.rootDirs; _b < _c.length; _b++) {
+                var rootDir = _c[_b];
+                if (rootDir === matchedRootDir) {
+                    continue;
+                }
+                var candidate_1 = ts.combinePaths(ts.normalizePath(rootDir), suffix);
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, rootDir, candidate_1);
+                }
+                var baseDirectory = ts.getDirectoryPath(candidate_1);
+                var resolvedFileName_1 = loader(candidate_1, supportedExtensions, failedLookupLocations, !directoryProbablyExists(baseDirectory, state.host), state);
+                if (resolvedFileName_1) {
+                    return resolvedFileName_1;
+                }
+            }
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Module_resolution_using_rootDirs_has_failed);
+            }
+        }
+        return undefined;
+    }
+    function tryLoadModuleUsingBaseUrl(moduleName, loader, failedLookupLocations, supportedExtensions, state) {
+        if (!state.compilerOptions.baseUrl) {
+            return undefined;
+        }
+        if (state.traceEnabled) {
+            trace(state.host, ts.Diagnostics.baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1, state.compilerOptions.baseUrl, moduleName);
+        }
+        var longestMatchPrefixLength = -1;
+        var matchedPattern;
+        var matchedStar;
+        if (state.compilerOptions.paths) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0, moduleName);
+            }
+            for (var key in state.compilerOptions.paths) {
+                var pattern = key;
+                var indexOfStar = pattern.indexOf("*");
+                if (indexOfStar !== -1) {
+                    var prefix = pattern.substr(0, indexOfStar);
+                    var suffix = pattern.substr(indexOfStar + 1);
+                    if (moduleName.length >= prefix.length + suffix.length &&
+                        ts.startsWith(moduleName, prefix) &&
+                        ts.endsWith(moduleName, suffix)) {
+                        if (prefix.length > longestMatchPrefixLength) {
+                            longestMatchPrefixLength = prefix.length;
+                            matchedPattern = pattern;
+                            matchedStar = moduleName.substr(prefix.length, moduleName.length - suffix.length);
+                        }
+                    }
+                }
+                else if (pattern === moduleName) {
+                    matchedPattern = pattern;
+                    matchedStar = undefined;
+                    break;
+                }
+            }
+        }
+        if (matchedPattern) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Module_name_0_matched_pattern_1, moduleName, matchedPattern);
+            }
+            for (var _i = 0, _a = state.compilerOptions.paths[matchedPattern]; _i < _a.length; _i++) {
+                var subst = _a[_i];
+                var path = matchedStar ? subst.replace("\*", matchedStar) : subst;
+                var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, path));
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.Trying_substitution_0_candidate_module_location_Colon_1, subst, path);
+                }
+                var resolvedFileName = loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
+                if (resolvedFileName) {
+                    return resolvedFileName;
+                }
+            }
+            return undefined;
+        }
+        else {
+            var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, moduleName));
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Resolving_module_name_0_relative_to_base_url_1_2, moduleName, state.compilerOptions.baseUrl, candidate);
+            }
+            return loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
+        }
+    }
     function nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host) {
         var containingDirectory = ts.getDirectoryPath(containingFile);
         var supportedExtensions = ts.getSupportedExtensions(compilerOptions);
-        if (ts.getRootLength(moduleName) !== 0 || nameStartsWithDotSlashOrDotDotSlash(moduleName)) {
-            var failedLookupLocations = [];
-            var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-            var resolvedFileName = loadNodeModuleFromFile(supportedExtensions, candidate, failedLookupLocations, false, host);
-            if (resolvedFileName) {
-                return { resolvedModule: { resolvedFileName: resolvedFileName }, failedLookupLocations: failedLookupLocations };
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        var failedLookupLocations = [];
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, skipTsx: false };
+        var resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, nodeLoadModuleByRelativeName, failedLookupLocations, supportedExtensions, state);
+        if (resolvedFileName) {
+            return createResolvedModule(resolvedFileName, false, failedLookupLocations);
+        }
+        var isExternalLibraryImport = false;
+        if (moduleHasNonRelativeName(moduleName)) {
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Loading_module_0_from_node_modules_folder, moduleName);
             }
-            resolvedFileName = loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, false, host);
-            return resolvedFileName
-                ? { resolvedModule: { resolvedFileName: resolvedFileName }, failedLookupLocations: failedLookupLocations }
-                : { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
+            resolvedFileName = loadModuleFromNodeModules(moduleName, containingDirectory, failedLookupLocations, state);
+            isExternalLibraryImport = resolvedFileName !== undefined;
         }
         else {
-            return loadModuleFromNodeModules(moduleName, containingDirectory, host);
+            var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+            resolvedFileName = nodeLoadModuleByRelativeName(candidate, supportedExtensions, failedLookupLocations, false, state);
         }
+        return createResolvedModule(resolvedFileName, isExternalLibraryImport, failedLookupLocations);
     }
     ts.nodeModuleNameResolver = nodeModuleNameResolver;
+    function nodeLoadModuleByRelativeName(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state) {
+        if (state.traceEnabled) {
+            trace(state.host, ts.Diagnostics.Loading_module_as_file_Slash_folder_candidate_module_location_0, candidate);
+        }
+        var resolvedFileName = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state);
+        return resolvedFileName || loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, onlyRecordFailures, state);
+    }
     function directoryProbablyExists(directoryName, host) {
         return !host.directoryExists || host.directoryExists(directoryName);
     }
     ts.directoryProbablyExists = directoryProbablyExists;
-    function loadNodeModuleFromFile(extensions, candidate, failedLookupLocation, onlyRecordFailures, host) {
+    function loadModuleFromFile(candidate, extensions, failedLookupLocation, onlyRecordFailures, state) {
+        if (!onlyRecordFailures) {
+            var directory = ts.getDirectoryPath(candidate);
+            if (directory) {
+                onlyRecordFailures = !directoryProbablyExists(directory, state.host);
+            }
+        }
         return ts.forEach(extensions, tryLoad);
         function tryLoad(ext) {
+            if (ext === ".tsx" && state.skipTsx) {
+                return undefined;
+            }
             var fileName = ts.fileExtensionIs(candidate, ext) ? candidate : candidate + ext;
-            if (!onlyRecordFailures && host.fileExists(fileName)) {
+            if (!onlyRecordFailures && state.host.fileExists(fileName)) {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.File_0_exist_use_it_as_a_name_resolution_result, fileName);
+                }
                 return fileName;
             }
             else {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.File_0_does_not_exist, fileName);
+                }
                 failedLookupLocation.push(fileName);
                 return undefined;
             }
         }
     }
-    function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocation, onlyRecordFailures, host) {
+    function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocation, onlyRecordFailures, state) {
         var packageJsonPath = ts.combinePaths(candidate, "package.json");
-        var directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, host);
-        if (directoryExists && host.fileExists(packageJsonPath)) {
-            var jsonContent;
-            try {
-                var jsonText = host.readFile(packageJsonPath);
-                jsonContent = jsonText ? JSON.parse(jsonText) : { typings: undefined };
+        var directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, state.host);
+        if (directoryExists && state.host.fileExists(packageJsonPath)) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
             }
-            catch (e) {
-                jsonContent = { typings: undefined };
-            }
-            if (typeof jsonContent.typings === "string") {
-                var path = ts.normalizePath(ts.combinePaths(candidate, jsonContent.typings));
-                var result = loadNodeModuleFromFile(extensions, path, failedLookupLocation, !directoryProbablyExists(ts.getDirectoryPath(path), host), host);
+            var typesFile = tryReadTypesSection(packageJsonPath, candidate, state);
+            if (typesFile) {
+                var result = loadModuleFromFile(typesFile, extensions, failedLookupLocation, !directoryProbablyExists(ts.getDirectoryPath(typesFile), state.host), state);
                 if (result) {
                     return result;
                 }
             }
+            else {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.package_json_does_not_have_types_field);
+                }
+            }
         }
         else {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath);
+            }
             failedLookupLocation.push(packageJsonPath);
         }
-        return loadNodeModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocation, !directoryExists, host);
+        return loadModuleFromFile(ts.combinePaths(candidate, "index"), extensions, failedLookupLocation, !directoryExists, state);
     }
-    function loadModuleFromNodeModules(moduleName, directory, host) {
-        var failedLookupLocations = [];
+    function loadModuleFromNodeModulesFolder(moduleName, directory, failedLookupLocations, state) {
+        var nodeModulesFolder = ts.combinePaths(directory, "node_modules");
+        var nodeModulesFolderExists = directoryProbablyExists(nodeModulesFolder, state.host);
+        var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName));
+        var result = loadModuleFromFile(candidate, ts.supportedTypeScriptExtensions, failedLookupLocations, !nodeModulesFolderExists, state);
+        if (result) {
+            return result;
+        }
+        result = loadNodeModuleFromDirectory(ts.supportedTypeScriptExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state);
+        if (result) {
+            return result;
+        }
+    }
+    function loadModuleFromNodeModules(moduleName, directory, failedLookupLocations, state) {
         directory = ts.normalizeSlashes(directory);
         while (true) {
             var baseName = ts.getBaseFileName(directory);
             if (baseName !== "node_modules") {
-                var nodeModulesFolder = ts.combinePaths(directory, "node_modules");
-                var nodeModulesFolderExists = directoryProbablyExists(nodeModulesFolder, host);
-                var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName));
-                var result = loadNodeModuleFromFile(ts.supportedTypeScriptExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, host);
+                var result = loadModuleFromNodeModulesFolder(moduleName, directory, failedLookupLocations, state) ||
+                    loadModuleFromNodeModulesFolder(ts.combinePaths("@types", moduleName), directory, failedLookupLocations, state);
                 if (result) {
-                    return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations: failedLookupLocations };
-                }
-                result = loadNodeModuleFromDirectory(ts.supportedTypeScriptExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, host);
-                if (result) {
-                    return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations: failedLookupLocations };
+                    return result;
                 }
             }
             var parentPath = ts.getDirectoryPath(directory);
@@ -32004,43 +34207,36 @@ var ts;
             }
             directory = parentPath;
         }
-        return { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
-    }
-    function nameStartsWithDotSlashOrDotDotSlash(name) {
-        var i = name.lastIndexOf("./", 1);
-        return i === 0 || (i === 1 && name.charCodeAt(0) === 46);
+        return undefined;
     }
     function classicNameResolver(moduleName, containingFile, compilerOptions, host) {
-        if (moduleName.indexOf("!") != -1) {
-            return { resolvedModule: undefined, failedLookupLocations: [] };
-        }
-        var searchPath = ts.getDirectoryPath(containingFile);
-        var searchName;
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, skipTsx: !compilerOptions.jsx };
         var failedLookupLocations = [];
-        var referencedSourceFile;
         var supportedExtensions = ts.getSupportedExtensions(compilerOptions);
-        while (true) {
-            searchName = ts.normalizePath(ts.combinePaths(searchPath, moduleName));
-            referencedSourceFile = ts.forEach(supportedExtensions, function (extension) {
-                if (extension === ".tsx" && !compilerOptions.jsx) {
-                    return undefined;
+        var containingDirectory = ts.getDirectoryPath(containingFile);
+        var resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, loadModuleFromFile, failedLookupLocations, supportedExtensions, state);
+        if (resolvedFileName) {
+            return createResolvedModule(resolvedFileName, false, failedLookupLocations);
+        }
+        var referencedSourceFile;
+        if (moduleHasNonRelativeName(moduleName)) {
+            while (true) {
+                var searchName = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+                referencedSourceFile = loadModuleFromFile(searchName, supportedExtensions, failedLookupLocations, false, state);
+                if (referencedSourceFile) {
+                    break;
                 }
-                var candidate = searchName + extension;
-                if (host.fileExists(candidate)) {
-                    return candidate;
+                var parentPath = ts.getDirectoryPath(containingDirectory);
+                if (parentPath === containingDirectory) {
+                    break;
                 }
-                else {
-                    failedLookupLocations.push(candidate);
-                }
-            });
-            if (referencedSourceFile) {
-                break;
+                containingDirectory = parentPath;
             }
-            var parentPath = ts.getDirectoryPath(searchPath);
-            if (parentPath === searchPath) {
-                break;
-            }
-            searchPath = parentPath;
+        }
+        else {
+            var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+            referencedSourceFile = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, false, state);
         }
         return referencedSourceFile
             ? { resolvedModule: { resolvedFileName: referencedSourceFile }, failedLookupLocations: failedLookupLocations }
@@ -32048,7 +34244,7 @@ var ts;
     }
     ts.classicNameResolver = classicNameResolver;
     ts.defaultInitCompilerOptions = {
-        module: 1,
+        module: ts.ModuleKind.CommonJS,
         target: 1,
         noImplicitAny: false,
         sourceMap: false
@@ -32093,11 +34289,39 @@ var ts;
                 ts.sys.createDirectory(directoryPath);
             }
         }
+        var outputFingerprints;
+        function writeFileIfUpdated(fileName, data, writeByteOrderMark) {
+            if (!outputFingerprints) {
+                outputFingerprints = {};
+            }
+            var hash = ts.sys.createHash(data);
+            var mtimeBefore = ts.sys.getModifiedTime(fileName);
+            if (mtimeBefore && ts.hasProperty(outputFingerprints, fileName)) {
+                var fingerprint = outputFingerprints[fileName];
+                if (fingerprint.byteOrderMark === writeByteOrderMark &&
+                    fingerprint.hash === hash &&
+                    fingerprint.mtime.getTime() === mtimeBefore.getTime()) {
+                    return;
+                }
+            }
+            ts.sys.writeFile(fileName, data, writeByteOrderMark);
+            var mtimeAfter = ts.sys.getModifiedTime(fileName);
+            outputFingerprints[fileName] = {
+                hash: hash,
+                byteOrderMark: writeByteOrderMark,
+                mtime: mtimeAfter
+            };
+        }
         function writeFile(fileName, data, writeByteOrderMark, onError) {
             try {
                 var start = new Date().getTime();
                 ensureDirectoriesExist(ts.getDirectoryPath(ts.normalizePath(fileName)));
-                ts.sys.writeFile(fileName, data, writeByteOrderMark);
+                if (ts.isWatchSet(options) && ts.sys.createHash && ts.sys.getModifiedTime) {
+                    writeFileIfUpdated(fileName, data, writeByteOrderMark);
+                }
+                else {
+                    ts.sys.writeFile(fileName, data, writeByteOrderMark);
+                }
                 ts.ioWriteTime += new Date().getTime() - start;
             }
             catch (e) {
@@ -32106,10 +34330,14 @@ var ts;
                 }
             }
         }
+        function getDefaultLibLocation() {
+            return ts.getDirectoryPath(ts.normalizePath(ts.sys.getExecutingFilePath()));
+        }
         var newLine = ts.getNewLineCharacter(options);
         return {
             getSourceFile: getSourceFile,
-            getDefaultLibFileName: function (options) { return ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(ts.sys.getExecutingFilePath())), ts.getDefaultLibFileName(options)); },
+            getDefaultLibLocation: getDefaultLibLocation,
+            getDefaultLibFileName: function (options) { return ts.combinePaths(getDefaultLibLocation(), ts.getDefaultLibFileName(options)); },
             writeFile: writeFile,
             getCurrentDirectory: ts.memoize(function () { return ts.sys.getCurrentDirectory(); }),
             useCaseSensitiveFileNames: function () { return ts.sys.useCaseSensitiveFileNames; },
@@ -32117,6 +34345,7 @@ var ts;
             getNewLine: function () { return newLine; },
             fileExists: function (fileName) { return ts.sys.fileExists(fileName); },
             readFile: function (fileName) { return ts.sys.readFile(fileName); },
+            trace: function (s) { return ts.sys.write(s + newLine); },
             directoryExists: function (directoryName) { return ts.sys.directoryExists(directoryName); }
         };
     }
@@ -32152,57 +34381,78 @@ var ts;
         }
     }
     ts.flattenDiagnosticMessageText = flattenDiagnosticMessageText;
+    function loadWithLocalCache(names, containingFile, loader) {
+        if (names.length === 0) {
+            return [];
+        }
+        var resolutions = [];
+        var cache = {};
+        for (var _i = 0, names_1 = names; _i < names_1.length; _i++) {
+            var name_33 = names_1[_i];
+            var result = void 0;
+            if (ts.hasProperty(cache, name_33)) {
+                result = cache[name_33];
+            }
+            else {
+                result = loader(name_33, containingFile);
+                cache[name_33] = result;
+            }
+            resolutions.push(result);
+        }
+        return resolutions;
+    }
     function createProgram(rootNames, options, host, oldProgram) {
         var program;
         var files = [];
-        var fileProcessingDiagnostics = ts.createDiagnosticCollection();
-        var programDiagnostics = ts.createDiagnosticCollection();
         var commonSourceDirectory;
         var diagnosticsProducingTypeChecker;
         var noDiagnosticsTypeChecker;
         var classifiableNames;
-        var skipDefaultLib = options.noLib;
-        var supportedExtensions = ts.getSupportedExtensions(options);
+        var resolvedTypeReferenceDirectives = {};
+        var fileProcessingDiagnostics = ts.createDiagnosticCollection();
         var start = new Date().getTime();
         host = host || createCompilerHost(options);
-        var hasEmitBlockingDiagnostics = ts.createFileMap(getCanonicalFileName);
+        var skipDefaultLib = options.noLib;
+        var programDiagnostics = ts.createDiagnosticCollection();
         var currentDirectory = host.getCurrentDirectory();
-        var resolveModuleNamesWorker = host.resolveModuleNames
-            ? (function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile); })
-            : (function (moduleNames, containingFile) {
-                var resolvedModuleNames = [];
-                var lookup = {};
-                for (var _i = 0, moduleNames_1 = moduleNames; _i < moduleNames_1.length; _i++) {
-                    var moduleName = moduleNames_1[_i];
-                    var resolvedName = void 0;
-                    if (ts.hasProperty(lookup, moduleName)) {
-                        resolvedName = lookup[moduleName];
-                    }
-                    else {
-                        resolvedName = resolveModuleName(moduleName, containingFile, options, host).resolvedModule;
-                        lookup[moduleName] = resolvedName;
-                    }
-                    resolvedModuleNames.push(resolvedName);
-                }
-                return resolvedModuleNames;
-            });
+        var supportedExtensions = ts.getSupportedExtensions(options);
+        var hasEmitBlockingDiagnostics = ts.createFileMap(getCanonicalFileName);
+        var resolveModuleNamesWorker;
+        if (host.resolveModuleNames) {
+            resolveModuleNamesWorker = function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile); };
+        }
+        else {
+            var loader_1 = function (moduleName, containingFile) { return resolveModuleName(moduleName, containingFile, options, host).resolvedModule; };
+            resolveModuleNamesWorker = function (moduleNames, containingFile) { return loadWithLocalCache(moduleNames, containingFile, loader_1); };
+        }
+        var resolveTypeReferenceDirectiveNamesWorker;
+        if (host.resolveTypeReferenceDirectives) {
+            resolveTypeReferenceDirectiveNamesWorker = function (typeDirectiveNames, containingFile) { return host.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile); };
+        }
+        else {
+            var loader_2 = function (typesRef, containingFile) { return resolveTypeReferenceDirective(typesRef, containingFile, options, host).resolvedTypeReferenceDirective; };
+            resolveTypeReferenceDirectiveNamesWorker = function (typeReferenceDirectiveNames, containingFile) { return loadWithLocalCache(typeReferenceDirectiveNames, containingFile, loader_2); };
+        }
         var filesByName = ts.createFileMap();
         var filesByNameIgnoreCase = host.useCaseSensitiveFileNames() ? ts.createFileMap(function (fileName) { return fileName.toLowerCase(); }) : undefined;
-        if (oldProgram) {
-            var oldOptions = oldProgram.getCompilerOptions();
-            if ((oldOptions.module !== options.module) ||
-                (oldOptions.noResolve !== options.noResolve) ||
-                (oldOptions.target !== options.target) ||
-                (oldOptions.noLib !== options.noLib) ||
-                (oldOptions.jsx !== options.jsx) ||
-                (oldOptions.allowJs !== options.allowJs)) {
-                oldProgram = undefined;
-            }
-        }
         if (!tryReuseStructureFromOldProgram()) {
+            if (options.types && options.types.length) {
+                var resolutions = resolveTypeReferenceDirectiveNamesWorker(options.types, undefined);
+                for (var i = 0; i < options.types.length; i++) {
+                    processTypeReferenceDirective(options.types[i], resolutions[i]);
+                }
+            }
             ts.forEach(rootNames, function (name) { return processRootFile(name, false); });
             if (!skipDefaultLib) {
-                processRootFile(host.getDefaultLibFileName(options), true);
+                if (!options.lib) {
+                    processRootFile(host.getDefaultLibFileName(options), true);
+                }
+                else {
+                    var libDirectory_1 = host.getDefaultLibLocation ? host.getDefaultLibLocation() : ts.getDirectoryPath(host.getDefaultLibFileName(options));
+                    ts.forEach(options.lib, function (libFileName) {
+                        processRootFile(ts.combinePaths(libDirectory_1, libFileName), true);
+                    });
+                }
             }
         }
         oldProgram = undefined;
@@ -32226,7 +34476,8 @@ var ts;
             getIdentifierCount: function () { return getDiagnosticsProducingTypeChecker().getIdentifierCount(); },
             getSymbolCount: function () { return getDiagnosticsProducingTypeChecker().getSymbolCount(); },
             getTypeCount: function () { return getDiagnosticsProducingTypeChecker().getTypeCount(); },
-            getFileProcessingDiagnostics: function () { return fileProcessingDiagnostics; }
+            getFileProcessingDiagnostics: function () { return fileProcessingDiagnostics; },
+            resolvedTypeReferenceDirectives: resolvedTypeReferenceDirectives
         };
         verifyCompilerOptions();
         ts.programTime += new Date().getTime() - start;
@@ -32260,11 +34511,26 @@ var ts;
             if (!oldProgram) {
                 return false;
             }
+            var oldOptions = oldProgram.getCompilerOptions();
+            if ((oldOptions.module !== options.module) ||
+                (oldOptions.noResolve !== options.noResolve) ||
+                (oldOptions.target !== options.target) ||
+                (oldOptions.noLib !== options.noLib) ||
+                (oldOptions.jsx !== options.jsx) ||
+                (oldOptions.allowJs !== options.allowJs) ||
+                (oldOptions.rootDir !== options.rootDir) ||
+                (oldOptions.typesSearchPaths !== options.typesSearchPaths) ||
+                (oldOptions.configFilePath !== options.configFilePath)) {
+                return false;
+            }
             ts.Debug.assert(!oldProgram.structureIsReused);
             var oldRootNames = oldProgram.getRootFileNames();
             if (!ts.arrayIsEqualTo(oldRootNames, rootNames)) {
                 return false;
             }
+            if (!ts.arrayIsEqualTo(options.types, oldOptions.types)) {
+                return false;
+            }
             var newSourceFiles = [];
             var filePaths = [];
             var modifiedSourceFiles = [];
@@ -32290,23 +34556,28 @@ var ts;
                     if (!ts.arrayIsEqualTo(oldSourceFile.moduleAugmentations, newSourceFile.moduleAugmentations, moduleNameIsEqualTo)) {
                         return false;
                     }
+                    if (!ts.arrayIsEqualTo(oldSourceFile.typeReferenceDirectives, newSourceFile.typeReferenceDirectives, fileReferenceIsEqualTo)) {
+                        return false;
+                    }
+                    var newSourceFilePath = ts.getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory);
                     if (resolveModuleNamesWorker) {
                         var moduleNames = ts.map(ts.concatenate(newSourceFile.imports, newSourceFile.moduleAugmentations), getTextOfLiteral);
-                        var resolutions = resolveModuleNamesWorker(moduleNames, ts.getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory));
-                        for (var i = 0; i < moduleNames.length; i++) {
-                            var newResolution = resolutions[i];
-                            var oldResolution = ts.getResolvedModule(oldSourceFile, moduleNames[i]);
-                            var resolutionChanged = oldResolution
-                                ? !newResolution ||
-                                    oldResolution.resolvedFileName !== newResolution.resolvedFileName ||
-                                    !!oldResolution.isExternalLibraryImport !== !!newResolution.isExternalLibraryImport
-                                : newResolution;
-                            if (resolutionChanged) {
-                                return false;
-                            }
+                        var resolutions = resolveModuleNamesWorker(moduleNames, newSourceFilePath);
+                        var resolutionsChanged = ts.hasChangesInResolutions(moduleNames, resolutions, oldSourceFile.resolvedModules, ts.moduleResolutionIsEqualTo);
+                        if (resolutionsChanged) {
+                            return false;
+                        }
+                    }
+                    if (resolveTypeReferenceDirectiveNamesWorker) {
+                        var typesReferenceDirectives = ts.map(newSourceFile.typeReferenceDirectives, function (x) { return x.fileName; });
+                        var resolutions = resolveTypeReferenceDirectiveNamesWorker(typesReferenceDirectives, newSourceFilePath);
+                        var resolutionsChanged = ts.hasChangesInResolutions(typesReferenceDirectives, resolutions, oldSourceFile.resolvedTypeReferenceDirectiveNames, ts.typeDirectiveIsEqualTo);
+                        if (resolutionsChanged) {
+                            return false;
                         }
                     }
                     newSourceFile.resolvedModules = oldSourceFile.resolvedModules;
+                    newSourceFile.resolvedTypeReferenceDirectiveNames = oldSourceFile.resolvedTypeReferenceDirectiveNames;
                     modifiedSourceFiles.push(newSourceFile);
                 }
                 else {
@@ -32323,6 +34594,7 @@ var ts;
                 var modifiedFile = modifiedSourceFiles_1[_b];
                 fileProcessingDiagnostics.reattachFileDiagnostics(modifiedFile);
             }
+            resolvedTypeReferenceDirectives = oldProgram.resolvedTypeReferenceDirectives;
             oldProgram.structureIsReused = true;
             return true;
         }
@@ -32335,7 +34607,7 @@ var ts;
                 getNewLine: function () { return host.getNewLine(); },
                 getSourceFile: program.getSourceFile,
                 getSourceFiles: program.getSourceFiles,
-                writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError) { return host.writeFile(fileName, data, writeByteOrderMark, onError); }),
+                writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }),
                 isEmitBlocked: isEmitBlocked
             };
         }
@@ -32353,10 +34625,22 @@ var ts;
             return hasEmitBlockingDiagnostics.contains(ts.toPath(emitFileName, currentDirectory, getCanonicalFileName));
         }
         function emitWorker(program, sourceFile, writeFileCallback, cancellationToken) {
+            var declarationDiagnostics = [];
+            if (options.noEmit) {
+                return { diagnostics: declarationDiagnostics, sourceMaps: undefined, emittedFiles: undefined, emitSkipped: true };
+            }
             if (options.noEmitOnError) {
-                var preEmitDiagnostics = getPreEmitDiagnostics(program, undefined, cancellationToken);
-                if (preEmitDiagnostics.length > 0) {
-                    return { diagnostics: preEmitDiagnostics, sourceMaps: undefined, emitSkipped: true };
+                var diagnostics = program.getOptionsDiagnostics(cancellationToken).concat(program.getSyntacticDiagnostics(sourceFile, cancellationToken), program.getGlobalDiagnostics(cancellationToken), program.getSemanticDiagnostics(sourceFile, cancellationToken));
+                if (diagnostics.length === 0 && program.getCompilerOptions().declaration) {
+                    declarationDiagnostics = program.getDeclarationDiagnostics(undefined, cancellationToken);
+                }
+                if (diagnostics.length > 0 || declarationDiagnostics.length > 0) {
+                    return {
+                        diagnostics: ts.concatenate(diagnostics, declarationDiagnostics),
+                        sourceMaps: undefined,
+                        emittedFiles: undefined,
+                        emitSkipped: true
+                    };
                 }
             }
             var emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver((options.outFile || options.out) ? undefined : sourceFile);
@@ -32388,7 +34672,13 @@ var ts;
             return getDiagnosticsHelper(sourceFile, getSemanticDiagnosticsForFile, cancellationToken);
         }
         function getDeclarationDiagnostics(sourceFile, cancellationToken) {
-            return getDiagnosticsHelper(sourceFile, getDeclarationDiagnosticsForFile, cancellationToken);
+            var options = program.getCompilerOptions();
+            if (!sourceFile || options.out || options.outFile) {
+                return getDeclarationDiagnosticsWorker(sourceFile, cancellationToken);
+            }
+            else {
+                return getDiagnosticsHelper(sourceFile, getDeclarationDiagnosticsForFile, cancellationToken);
+            }
         }
         function getSyntacticDiagnosticsForFile(sourceFile, cancellationToken) {
             return sourceFile.parseDiagnostics;
@@ -32428,44 +34718,47 @@ var ts;
                         return false;
                     }
                     switch (node.kind) {
-                        case 224:
+                        case 228:
                             diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 230:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 217:
+                        case 234:
+                            if (node.isExportEquals) {
+                                diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
+                                return true;
+                            }
+                            break;
+                        case 220:
                             var classDeclaration = node;
                             if (checkModifiers(classDeclaration.modifiers) ||
                                 checkTypeParameters(classDeclaration.typeParameters)) {
                                 return true;
                             }
                             break;
-                        case 246:
+                        case 250:
                             var heritageClause = node;
                             if (heritageClause.token === 106) {
                                 diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file));
                                 return true;
                             }
                             break;
-                        case 218:
+                        case 221:
                             diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 221:
+                        case 224:
                             diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.module_declarations_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 219:
+                        case 222:
                             diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.type_aliases_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 144:
-                        case 143:
-                        case 145:
                         case 146:
+                        case 145:
                         case 147:
-                        case 176:
-                        case 216:
-                        case 177:
-                        case 216:
+                        case 148:
+                        case 149:
+                        case 178:
+                        case 219:
+                        case 179:
+                        case 219:
                             var functionDeclaration = node;
                             if (checkModifiers(functionDeclaration.modifiers) ||
                                 checkTypeParameters(functionDeclaration.typeParameters) ||
@@ -32473,20 +34766,20 @@ var ts;
                                 return true;
                             }
                             break;
-                        case 196:
+                        case 199:
                             var variableStatement = node;
                             if (checkModifiers(variableStatement.modifiers)) {
                                 return true;
                             }
                             break;
-                        case 214:
+                        case 217:
                             var variableDeclaration = node;
                             if (checkTypeAnnotation(variableDeclaration.type)) {
                                 return true;
                             }
                             break;
-                        case 171:
-                        case 172:
+                        case 173:
+                        case 174:
                             var expression = node;
                             if (expression.typeArguments && expression.typeArguments.length > 0) {
                                 var start_2 = expression.typeArguments.pos;
@@ -32494,7 +34787,7 @@ var ts;
                                 return true;
                             }
                             break;
-                        case 139:
+                        case 141:
                             var parameter = node;
                             if (parameter.modifiers) {
                                 var start_3 = parameter.modifiers.pos;
@@ -32510,18 +34803,20 @@ var ts;
                                 return true;
                             }
                             break;
-                        case 142:
+                        case 144:
                             diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.property_declarations_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 220:
+                        case 223:
                             diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 174:
+                        case 176:
                             var typeAssertionExpression = node;
                             diagnostics.push(ts.createDiagnosticForNode(typeAssertionExpression.type, ts.Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 140:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.decorators_can_only_be_used_in_a_ts_file));
+                        case 142:
+                            if (!options.experimentalDecorators) {
+                                diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning));
+                            }
                             return true;
                     }
                     return ts.forEachChild(node, walk);
@@ -32549,6 +34844,7 @@ var ts;
                                 case 112:
                                 case 110:
                                 case 111:
+                                case 127:
                                 case 122:
                                     diagnostics.push(ts.createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
                                     return true;
@@ -32564,15 +34860,16 @@ var ts;
                 }
             });
         }
-        function getDeclarationDiagnosticsForFile(sourceFile, cancellationToken) {
+        function getDeclarationDiagnosticsWorker(sourceFile, cancellationToken) {
             return runWithCancellationToken(function () {
-                if (!ts.isDeclarationFile(sourceFile)) {
-                    var resolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile, cancellationToken);
-                    var writeFile_1 = function () { };
-                    return ts.getDeclarationDiagnostics(getEmitHost(writeFile_1), resolver, sourceFile);
-                }
+                var resolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile, cancellationToken);
+                var writeFile = function () { };
+                return ts.getDeclarationDiagnostics(getEmitHost(writeFile), resolver, sourceFile);
             });
         }
+        function getDeclarationDiagnosticsForFile(sourceFile, cancellationToken) {
+            return ts.isDeclarationFile(sourceFile) ? [] : getDeclarationDiagnosticsWorker(sourceFile, cancellationToken);
+        }
         function getOptionsDiagnostics() {
             var allDiagnostics = [];
             ts.addRange(allDiagnostics, fileProcessingDiagnostics.getGlobalDiagnostics());
@@ -32588,7 +34885,7 @@ var ts;
             return ts.getBaseFileName(fileName).indexOf(".") >= 0;
         }
         function processRootFile(fileName, isDefaultLib) {
-            processSourceFile(ts.normalizePath(fileName), isDefaultLib);
+            processSourceFile(ts.normalizePath(fileName), isDefaultLib, true);
         }
         function fileReferenceIsEqualTo(a, b) {
             return a.fileName === b.fileName;
@@ -32619,9 +34916,9 @@ var ts;
             return;
             function collectModuleReferences(node, inAmbientModule) {
                 switch (node.kind) {
-                    case 225:
-                    case 224:
-                    case 231:
+                    case 229:
+                    case 228:
+                    case 235:
                         var moduleNameExpr = ts.getExternalModuleName(node);
                         if (!moduleNameExpr || moduleNameExpr.kind !== 9) {
                             break;
@@ -32633,8 +34930,8 @@ var ts;
                             (imports || (imports = [])).push(moduleNameExpr);
                         }
                         break;
-                    case 221:
-                        if (ts.isAmbientModule(node) && (inAmbientModule || node.flags & 4 || ts.isDeclarationFile(file))) {
+                    case 224:
+                        if (ts.isAmbientModule(node) && (inAmbientModule || node.flags & 2 || ts.isDeclarationFile(file))) {
                             var moduleName = node.name;
                             if (isExternalModuleFile || (inAmbientModule && !ts.isExternalModuleNameRelative(moduleName.text))) {
                                 (moduleAugmentations || (moduleAugmentations = [])).push(moduleName);
@@ -32649,7 +34946,7 @@ var ts;
                 }
             }
             function collectRequireCalls(node) {
-                if (ts.isRequireCall(node)) {
+                if (ts.isRequireCall(node, true)) {
                     (imports || (imports = [])).push(node.arguments[0]);
                 }
                 else {
@@ -32657,7 +34954,7 @@ var ts;
                 }
             }
         }
-        function processSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd) {
+        function processSourceFile(fileName, isDefaultLib, isReference, refFile, refPos, refEnd) {
             var diagnosticArgument;
             var diagnostic;
             if (hasExtension(fileName)) {
@@ -32665,7 +34962,7 @@ var ts;
                     diagnostic = ts.Diagnostics.File_0_has_unsupported_extension_The_only_supported_extensions_are_1;
                     diagnosticArgument = [fileName, "'" + supportedExtensions.join("', '") + "'"];
                 }
-                else if (!findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd)) {
+                else if (!findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, isReference, refFile, refPos, refEnd)) {
                     diagnostic = ts.Diagnostics.File_0_not_found;
                     diagnosticArgument = [fileName];
                 }
@@ -32675,13 +34972,13 @@ var ts;
                 }
             }
             else {
-                var nonTsFile = options.allowNonTsExtensions && findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd);
+                var nonTsFile = options.allowNonTsExtensions && findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, isReference, refFile, refPos, refEnd);
                 if (!nonTsFile) {
                     if (options.allowNonTsExtensions) {
                         diagnostic = ts.Diagnostics.File_0_not_found;
                         diagnosticArgument = [fileName];
                     }
-                    else if (!ts.forEach(supportedExtensions, function (extension) { return findSourceFile(fileName + extension, ts.toPath(fileName + extension, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd); })) {
+                    else if (!ts.forEach(supportedExtensions, function (extension) { return findSourceFile(fileName + extension, ts.toPath(fileName + extension, currentDirectory, getCanonicalFileName), isDefaultLib, isReference, refFile, refPos, refEnd); })) {
                         diagnostic = ts.Diagnostics.File_0_not_found;
                         fileName += ".ts";
                         diagnosticArgument = [fileName];
@@ -32705,12 +35002,15 @@ var ts;
                 fileProcessingDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, existingFileName));
             }
         }
-        function findSourceFile(fileName, path, isDefaultLib, refFile, refPos, refEnd) {
+        function findSourceFile(fileName, path, isDefaultLib, isReference, refFile, refPos, refEnd) {
             if (filesByName.contains(path)) {
                 var file_1 = filesByName.get(path);
                 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) {
+                    file_1.wasReferenced = file_1.wasReferenced || isReference;
+                }
                 return file_1;
             }
             var file = host.getSourceFile(fileName, options.target, function (hostErrorMessage) {
@@ -32723,6 +35023,7 @@ var ts;
             });
             filesByName.set(path, file);
             if (file) {
+                file.wasReferenced = file.wasReferenced || isReference;
                 file.path = path;
                 if (host.useCaseSensitiveFileNames()) {
                     var existingFile = filesByNameIgnoreCase.get(path);
@@ -32736,7 +35037,8 @@ var ts;
                 skipDefaultLib = skipDefaultLib || file.hasNoDefaultLib;
                 var basePath = ts.getDirectoryPath(fileName);
                 if (!options.noResolve) {
-                    processReferencedFiles(file, basePath);
+                    processReferencedFiles(file, basePath, isDefaultLib);
+                    processTypeReferenceDirectives(file);
                 }
                 processImportedModules(file, basePath);
                 if (isDefaultLib) {
@@ -32748,12 +35050,64 @@ var ts;
             }
             return file;
         }
-        function processReferencedFiles(file, basePath) {
+        function processReferencedFiles(file, basePath, isDefaultLib) {
             ts.forEach(file.referencedFiles, function (ref) {
                 var referencedFileName = resolveTripleslashReference(ref.fileName, file.fileName);
-                processSourceFile(referencedFileName, false, file, ref.pos, ref.end);
+                processSourceFile(referencedFileName, isDefaultLib, true, file, ref.pos, ref.end);
             });
         }
+        function processTypeReferenceDirectives(file) {
+            var typeDirectives = ts.map(file.typeReferenceDirectives, function (l) { return l.fileName; });
+            var resolutions = resolveTypeReferenceDirectiveNamesWorker(typeDirectives, file.fileName);
+            for (var i = 0; i < typeDirectives.length; i++) {
+                var ref = file.typeReferenceDirectives[i];
+                var resolvedTypeReferenceDirective = resolutions[i];
+                ts.setResolvedTypeReferenceDirective(file, ref.fileName, resolvedTypeReferenceDirective);
+                processTypeReferenceDirective(ref.fileName, resolvedTypeReferenceDirective, file, ref.pos, ref.end);
+            }
+        }
+        function processTypeReferenceDirective(typeReferenceDirective, resolvedTypeReferenceDirective, refFile, refPos, refEnd) {
+            var previousResolution = resolvedTypeReferenceDirectives[typeReferenceDirective];
+            if (previousResolution && previousResolution.primary) {
+                return;
+            }
+            var saveResolution = true;
+            if (resolvedTypeReferenceDirective) {
+                if (resolvedTypeReferenceDirective.primary) {
+                    processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, false, true, refFile, refPos, refEnd);
+                }
+                else {
+                    if (previousResolution) {
+                        var otherFileText = host.readFile(resolvedTypeReferenceDirective.resolvedFileName);
+                        if (otherFileText !== getSourceFile(previousResolution.resolvedFileName).text) {
+                            fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd, ts.Diagnostics.Conflicting_library_definitions_for_0_found_at_1_and_2_Copy_the_correct_file_to_the_typings_folder_to_resolve_this_conflict, typeReferenceDirective, resolvedTypeReferenceDirective.resolvedFileName, previousResolution.resolvedFileName));
+                        }
+                        saveResolution = false;
+                    }
+                    else {
+                        processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, false, true, refFile, refPos, refEnd);
+                    }
+                }
+            }
+            else {
+                fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd, ts.Diagnostics.Cannot_find_name_0, typeReferenceDirective));
+            }
+            if (saveResolution) {
+                resolvedTypeReferenceDirectives[typeReferenceDirective] = resolvedTypeReferenceDirective;
+            }
+        }
+        function createDiagnostic(refFile, refPos, refEnd, message) {
+            var args = [];
+            for (var _i = 4; _i < arguments.length; _i++) {
+                args[_i - 4] = arguments[_i];
+            }
+            if (refFile === undefined || refPos === undefined || refEnd === undefined) {
+                return ts.createCompilerDiagnostic.apply(void 0, [message].concat(args));
+            }
+            else {
+                return ts.createFileDiagnostic.apply(void 0, [refFile, refPos, refEnd - refPos, message].concat(args));
+            }
+        }
         function getCanonicalFileName(fileName) {
             return host.getCanonicalFileName(fileName);
         }
@@ -32770,9 +35124,9 @@ var ts;
                         !options.noResolve &&
                         i < file.imports.length;
                     if (shouldAddFile) {
-                        var importedFile = findSourceFile(resolution.resolvedFileName, ts.toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), false, file, ts.skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
+                        var importedFile = findSourceFile(resolution.resolvedFileName, ts.toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), false, false, file, ts.skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
                         if (importedFile && resolution.isExternalLibraryImport) {
-                            if (!ts.isExternalModule(importedFile)) {
+                            if (!ts.isExternalModule(importedFile) && importedFile.statements.length) {
                                 var start_5 = ts.getTokenPosOfNode(file.imports[i], file);
                                 fileProcessingDiagnostics.add(ts.createFileDiagnostic(file, start_5, file.imports[i].end - start_5, ts.Diagnostics.Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition, importedFile.fileName));
                             }
@@ -32790,44 +35144,21 @@ var ts;
             return;
         }
         function computeCommonSourceDirectory(sourceFiles) {
-            var commonPathComponents;
-            var failed = ts.forEach(files, function (sourceFile) {
-                if (ts.isDeclarationFile(sourceFile)) {
-                    return;
+            var fileNames = [];
+            for (var _i = 0, sourceFiles_2 = sourceFiles; _i < sourceFiles_2.length; _i++) {
+                var file = sourceFiles_2[_i];
+                if (!file.isDeclarationFile) {
+                    fileNames.push(file.fileName);
                 }
-                var sourcePathComponents = ts.getNormalizedPathComponents(sourceFile.fileName, currentDirectory);
-                sourcePathComponents.pop();
-                if (!commonPathComponents) {
-                    commonPathComponents = sourcePathComponents;
-                    return;
-                }
-                for (var i = 0, n = Math.min(commonPathComponents.length, sourcePathComponents.length); i < n; i++) {
-                    if (getCanonicalFileName(commonPathComponents[i]) !== getCanonicalFileName(sourcePathComponents[i])) {
-                        if (i === 0) {
-                            return true;
-                        }
-                        commonPathComponents.length = i;
-                        break;
-                    }
-                }
-                if (sourcePathComponents.length < commonPathComponents.length) {
-                    commonPathComponents.length = sourcePathComponents.length;
-                }
-            });
-            if (failed) {
-                return "";
             }
-            if (!commonPathComponents) {
-                return currentDirectory;
-            }
-            return ts.getNormalizedPathFromPathComponents(commonPathComponents);
+            return computeCommonSourceDirectoryOfFilenames(fileNames, currentDirectory, getCanonicalFileName);
         }
         function checkSourceFilesBelongToPath(sourceFiles, rootDirectory) {
             var allFilesBelongToPath = true;
             if (sourceFiles) {
                 var absoluteRootDirectoryPath = host.getCanonicalFileName(ts.getNormalizedAbsolutePath(rootDirectory, currentDirectory));
-                for (var _i = 0, sourceFiles_2 = sourceFiles; _i < sourceFiles_2.length; _i++) {
-                    var sourceFile = sourceFiles_2[_i];
+                for (var _i = 0, sourceFiles_3 = sourceFiles; _i < sourceFiles_3.length; _i++) {
+                    var sourceFile = sourceFiles_3[_i];
                     if (!ts.isDeclarationFile(sourceFile)) {
                         var absoluteSourceFilePath = host.getCanonicalFileName(ts.getNormalizedAbsolutePath(sourceFile.fileName, currentDirectory));
                         if (absoluteSourceFilePath.indexOf(absoluteRootDirectoryPath) !== 0) {
@@ -32862,6 +35193,25 @@ var ts;
                     programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "mapRoot", "inlineSourceMap"));
                 }
             }
+            if (options.paths && options.baseUrl === undefined) {
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_paths_cannot_be_used_without_specifying_baseUrl_option));
+            }
+            if (options.paths) {
+                for (var key in options.paths) {
+                    if (!ts.hasProperty(options.paths, key)) {
+                        continue;
+                    }
+                    if (!hasZeroOrOneAsteriskCharacter(key)) {
+                        programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Pattern_0_can_have_at_most_one_Asterisk_character, key));
+                    }
+                    for (var _i = 0, _a = options.paths[key]; _i < _a.length; _i++) {
+                        var subst = _a[_i];
+                        if (!hasZeroOrOneAsteriskCharacter(subst)) {
+                            programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character, subst, key));
+                        }
+                    }
+                }
+            }
             if (options.inlineSources) {
                 if (!options.sourceMap && !options.inlineSourceMap) {
                     programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_inlineSources_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_provided));
@@ -32881,11 +35231,22 @@ var ts;
                     programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "sourceRoot", "sourceMap"));
                 }
             }
+            if (options.declarationDir) {
+                if (!options.declaration) {
+                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "declarationDir", "declaration"));
+                }
+                if (options.out || options.outFile) {
+                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "declarationDir", options.out ? "out" : "outFile"));
+                }
+            }
+            if (options.lib && options.noLib) {
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "lib", "noLib"));
+            }
             var languageVersion = options.target || 0;
             var outFile = options.outFile || options.out;
             var firstExternalModuleSourceFile = ts.forEach(files, function (f) { return ts.isExternalModule(f) ? f : undefined; });
             if (options.isolatedModules) {
-                if (!options.module && languageVersion < 2) {
+                if (options.module === ts.ModuleKind.None && languageVersion < 2) {
                     programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher));
                 }
                 var firstNonExternalModuleSourceFile = ts.forEach(files, function (f) { return !ts.isExternalModule(f) && !ts.isDeclarationFile(f) ? f : undefined; });
@@ -32894,14 +35255,14 @@ var ts;
                     programDiagnostics.add(ts.createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided));
                 }
             }
-            else if (firstExternalModuleSourceFile && languageVersion < 2 && !options.module) {
+            else if (firstExternalModuleSourceFile && languageVersion < 2 && options.module === ts.ModuleKind.None) {
                 var span = ts.getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator);
-                programDiagnostics.add(ts.createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_modules_unless_the_module_flag_is_provided_Consider_setting_the_module_compiler_option_in_a_tsconfig_json_file));
+                programDiagnostics.add(ts.createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_modules_unless_the_module_flag_is_provided_with_a_valid_module_type_Consider_setting_the_module_compiler_option_in_a_tsconfig_json_file));
             }
-            if (options.module === 5 && languageVersion < 2) {
+            if (options.module === ts.ModuleKind.ES6 && languageVersion < 2) {
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_compile_modules_into_es2015_when_targeting_ES5_or_lower));
             }
-            if (outFile && options.module && !(options.module === 2 || options.module === 4)) {
+            if (outFile && options.module && !(options.module === ts.ModuleKind.AMD || options.module === ts.ModuleKind.System)) {
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Only_amd_and_system_modules_are_supported_alongside_0, options.out ? "out" : "outFile"));
             }
             if (options.outDir ||
@@ -32912,21 +35273,7 @@ var ts;
                     programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_find_the_common_subdirectory_path_for_the_input_files));
                 }
             }
-            if (options.noEmit) {
-                if (options.out) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "out"));
-                }
-                if (options.outFile) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "outFile"));
-                }
-                if (options.outDir) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "outDir"));
-                }
-                if (options.declaration) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "declaration"));
-                }
-            }
-            else if (options.allowJs && options.declaration) {
+            if (!options.noEmit && options.allowJs && options.declaration) {
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "allowJs", "declaration"));
             }
             if (options.emitDecoratorMetadata &&
@@ -32934,14 +35281,14 @@ var ts;
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "emitDecoratorMetadata", "experimentalDecorators"));
             }
             if (options.reactNamespace && !ts.isIdentifier(options.reactNamespace, languageVersion)) {
-                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Invalide_value_for_reactNamespace_0_is_not_a_valid_identifier, options.reactNamespace));
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier, options.reactNamespace));
             }
-            if (!options.noEmit) {
+            if (!options.noEmit && !options.suppressOutputPathCheck) {
                 var emitHost = getEmitHost();
-                var emitFilesSeen = ts.createFileMap(!host.useCaseSensitiveFileNames() ? function (key) { return key.toLocaleLowerCase(); } : undefined);
+                var emitFilesSeen_1 = ts.createFileMap(!host.useCaseSensitiveFileNames() ? function (key) { return key.toLocaleLowerCase(); } : undefined);
                 ts.forEachExpectedEmitFile(emitHost, function (emitFileNames, sourceFiles, isBundledEmit) {
-                    verifyEmitFilePath(emitFileNames.jsFilePath, emitFilesSeen);
-                    verifyEmitFilePath(emitFileNames.declarationFilePath, emitFilesSeen);
+                    verifyEmitFilePath(emitFileNames.jsFilePath, emitFilesSeen_1);
+                    verifyEmitFilePath(emitFileNames.declarationFilePath, emitFilesSeen_1);
                 });
             }
             function verifyEmitFilePath(emitFileName, emitFilesSeen) {
@@ -32979,6 +35326,12 @@ var ts;
             type: "boolean",
             description: ts.Diagnostics.Generates_corresponding_d_ts_file
         },
+        {
+            name: "declarationDir",
+            type: "string",
+            isFilePath: true,
+            paramType: ts.Diagnostics.DIRECTORY
+        },
         {
             name: "diagnostics",
             type: "boolean"
@@ -33013,13 +35366,12 @@ var ts;
                 "react": 2
             },
             paramType: ts.Diagnostics.KIND,
-            description: ts.Diagnostics.Specify_JSX_code_generation_Colon_preserve_or_react,
-            error: ts.Diagnostics.Argument_for_jsx_must_be_preserve_or_react
+            description: ts.Diagnostics.Specify_JSX_code_generation_Colon_preserve_or_react
         },
         {
             name: "reactNamespace",
             type: "string",
-            description: ts.Diagnostics.Specifies_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit
+            description: ts.Diagnostics.Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit
         },
         {
             name: "listFiles",
@@ -33033,23 +35385,23 @@ var ts;
             name: "mapRoot",
             type: "string",
             isFilePath: true,
-            description: ts.Diagnostics.Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations,
+            description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations,
             paramType: ts.Diagnostics.LOCATION
         },
         {
             name: "module",
             shortName: "m",
             type: {
-                "commonjs": 1,
-                "amd": 2,
-                "system": 4,
-                "umd": 3,
-                "es6": 5,
-                "es2015": 5
+                "none": ts.ModuleKind.None,
+                "commonjs": ts.ModuleKind.CommonJS,
+                "amd": ts.ModuleKind.AMD,
+                "system": ts.ModuleKind.System,
+                "umd": ts.ModuleKind.UMD,
+                "es6": ts.ModuleKind.ES6,
+                "es2015": ts.ModuleKind.ES2015
             },
             description: ts.Diagnostics.Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015,
-            paramType: ts.Diagnostics.KIND,
-            error: ts.Diagnostics.Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015
+            paramType: ts.Diagnostics.KIND
         },
         {
             name: "newLine",
@@ -33057,9 +35409,8 @@ var ts;
                 "crlf": 0,
                 "lf": 1
             },
-            description: ts.Diagnostics.Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix,
-            paramType: ts.Diagnostics.NEWLINE,
-            error: ts.Diagnostics.Argument_for_newLine_option_must_be_CRLF_or_LF
+            description: ts.Diagnostics.Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix,
+            paramType: ts.Diagnostics.NEWLINE
         },
         {
             name: "noEmit",
@@ -33080,6 +35431,11 @@ var ts;
             type: "boolean",
             description: ts.Diagnostics.Raise_error_on_expressions_and_declarations_with_an_implied_any_type
         },
+        {
+            name: "noImplicitThis",
+            type: "boolean",
+            description: ts.Diagnostics.Raise_error_on_this_expressions_with_an_implied_any_type
+        },
         {
             name: "noLib",
             type: "boolean"
@@ -33119,7 +35475,6 @@ var ts;
         },
         {
             name: "pretty",
-            paramType: ts.Diagnostics.KIND,
             description: ts.Diagnostics.Stylize_errors_and_messages_using_color_and_context_experimental,
             type: "boolean"
         },
@@ -33140,8 +35495,8 @@ var ts;
             name: "rootDir",
             type: "string",
             isFilePath: true,
-            description: ts.Diagnostics.Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir,
-            paramType: ts.Diagnostics.LOCATION
+            paramType: ts.Diagnostics.LOCATION,
+            description: ts.Diagnostics.Specify_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir
         },
         {
             name: "isolatedModules",
@@ -33156,7 +35511,7 @@ var ts;
             name: "sourceRoot",
             type: "string",
             isFilePath: true,
-            description: ts.Diagnostics.Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations,
+            description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations,
             paramType: ts.Diagnostics.LOCATION
         },
         {
@@ -33185,9 +35540,8 @@ var ts;
                 "es6": 2,
                 "es2015": 2
             },
-            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental,
-            paramType: ts.Diagnostics.VERSION,
-            error: ts.Diagnostics.Argument_for_target_option_must_be_ES3_ES5_or_ES2015
+            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015,
+            paramType: ts.Diagnostics.VERSION
         },
         {
             name: "version",
@@ -33215,11 +35569,10 @@ var ts;
         {
             name: "moduleResolution",
             type: {
-                "node": 2,
-                "classic": 1
+                "node": ts.ModuleResolutionKind.NodeJs,
+                "classic": ts.ModuleResolutionKind.Classic
             },
-            description: ts.Diagnostics.Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6,
-            error: ts.Diagnostics.Argument_for_moduleResolution_option_must_be_node_or_classic
+            description: ts.Diagnostics.Specify_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6
         },
         {
             name: "allowUnusedLabels",
@@ -33247,14 +35600,127 @@ var ts;
             description: ts.Diagnostics.Disallow_inconsistently_cased_references_to_the_same_file
         },
         {
-            name: "allowSyntheticDefaultImports",
+            name: "baseUrl",
+            type: "string",
+            isFilePath: true,
+            description: ts.Diagnostics.Base_directory_to_resolve_non_absolute_module_names
+        },
+        {
+            name: "paths",
+            type: "object",
+            isTSConfigOnly: true
+        },
+        {
+            name: "rootDirs",
+            type: "list",
+            isTSConfigOnly: true,
+            element: {
+                name: "rootDirs",
+                type: "string",
+                isFilePath: true
+            }
+        },
+        {
+            name: "typesSearchPaths",
+            type: "list",
+            isTSConfigOnly: true,
+            element: {
+                name: "typesSearchPaths",
+                type: "string",
+                isFilePath: true
+            }
+        },
+        {
+            name: "typesRoot",
+            type: "string"
+        },
+        {
+            name: "types",
+            type: "list",
+            element: {
+                name: "types",
+                type: "string"
+            },
+            description: ts.Diagnostics.Type_declaration_files_to_be_included_in_compilation
+        },
+        {
+            name: "traceResolution",
             type: "boolean",
-            description: ts.Diagnostics.Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking
+            description: ts.Diagnostics.Enable_tracing_of_the_name_resolution_process
         },
         {
             name: "allowJs",
             type: "boolean",
             description: ts.Diagnostics.Allow_javascript_files_to_be_compiled
+        },
+        {
+            name: "allowSyntheticDefaultImports",
+            type: "boolean",
+            description: ts.Diagnostics.Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking
+        },
+        {
+            name: "noImplicitUseStrict",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_emit_use_strict_directives_in_module_output
+        },
+        {
+            name: "listEmittedFiles",
+            type: "boolean"
+        },
+        {
+            name: "lib",
+            type: "list",
+            element: {
+                name: "lib",
+                type: {
+                    "es5": "lib.es5.d.ts",
+                    "es6": "lib.es2015.d.ts",
+                    "es2015": "lib.es2015.d.ts",
+                    "es7": "lib.es2016.d.ts",
+                    "es2016": "lib.es2016.d.ts",
+                    "dom": "lib.dom.d.ts",
+                    "webworker": "lib.webworker.d.ts",
+                    "scripthost": "lib.scripthost.d.ts",
+                    "es2015.core": "lib.es2015.core.d.ts",
+                    "es2015.collection": "lib.es2015.collection.d.ts",
+                    "es2015.generator": "lib.es2015.generator.d.ts",
+                    "es2015.iterable": "lib.es2015.iterable.d.ts",
+                    "es2015.promise": "lib.es2015.promise.d.ts",
+                    "es2015.proxy": "lib.es2015.proxy.d.ts",
+                    "es2015.reflect": "lib.es2015.reflect.d.ts",
+                    "es2015.symbol": "lib.es2015.symbol.d.ts",
+                    "es2015.symbol.wellknown": "lib.es2015.symbol.wellknown.d.ts",
+                    "es2016.array.include": "lib.es2016.array.include.d.ts"
+                }
+            },
+            description: ts.Diagnostics.Specify_library_files_to_be_included_in_the_compilation_Colon
+        },
+        {
+            name: "strictNullChecks",
+            type: "boolean",
+            description: ts.Diagnostics.Enable_strict_null_checks
+        }
+    ];
+    ts.typingOptionDeclarations = [
+        {
+            name: "enableAutoDiscovery",
+            type: "boolean"
+        },
+        {
+            name: "include",
+            type: "list",
+            element: {
+                name: "include",
+                type: "string"
+            }
+        },
+        {
+            name: "exclude",
+            type: "list",
+            element: {
+                name: "exclude",
+                type: "string"
+            }
         }
     ];
     var optionNameMapCache;
@@ -33274,6 +35740,37 @@ var ts;
         return optionNameMapCache;
     }
     ts.getOptionNameMap = getOptionNameMap;
+    function createCompilerDiagnosticForInvalidCustomType(opt) {
+        var namesOfType = [];
+        ts.forEachKey(opt.type, function (key) {
+            namesOfType.push(" '" + key + "'");
+        });
+        return ts.createCompilerDiagnostic(ts.Diagnostics.Argument_for_0_option_must_be_Colon_1, "--" + opt.name, namesOfType);
+    }
+    ts.createCompilerDiagnosticForInvalidCustomType = createCompilerDiagnosticForInvalidCustomType;
+    function parseCustomTypeOption(opt, value, errors) {
+        var key = (value || "").trim().toLowerCase();
+        var map = opt.type;
+        if (ts.hasProperty(map, key)) {
+            return map[key];
+        }
+        else {
+            errors.push(createCompilerDiagnosticForInvalidCustomType(opt));
+        }
+    }
+    ts.parseCustomTypeOption = parseCustomTypeOption;
+    function parseListTypeOption(opt, value, errors) {
+        var values = (value || "").trim().split(",");
+        switch (opt.element.type) {
+            case "number":
+                return ts.map(values, parseInt);
+            case "string":
+                return ts.map(values, function (v) { return v || ""; });
+            default:
+                return ts.filter(ts.map(values, function (v) { return parseCustomTypeOption(opt.element, v, errors); }), function (v) { return !!v; });
+        }
+    }
+    ts.parseListTypeOption = parseListTypeOption;
     function parseCommandLine(commandLine, readFile) {
         var options = {};
         var fileNames = [];
@@ -33300,31 +35797,34 @@ var ts;
                     }
                     if (ts.hasProperty(optionNameMap, s)) {
                         var opt = optionNameMap[s];
-                        if (!args[i] && opt.type !== "boolean") {
-                            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_expects_an_argument, opt.name));
+                        if (opt.isTSConfigOnly) {
+                            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_can_only_be_specified_in_tsconfig_json_file, opt.name));
                         }
-                        switch (opt.type) {
-                            case "number":
-                                options[opt.name] = parseInt(args[i]);
-                                i++;
-                                break;
-                            case "boolean":
-                                options[opt.name] = true;
-                                break;
-                            case "string":
-                                options[opt.name] = args[i] || "";
-                                i++;
-                                break;
-                            default:
-                                var map_1 = opt.type;
-                                var key = (args[i] || "").toLowerCase();
-                                i++;
-                                if (ts.hasProperty(map_1, key)) {
-                                    options[opt.name] = map_1[key];
-                                }
-                                else {
-                                    errors.push(ts.createCompilerDiagnostic(opt.error));
-                                }
+                        else {
+                            if (!args[i] && opt.type !== "boolean") {
+                                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_expects_an_argument, opt.name));
+                            }
+                            switch (opt.type) {
+                                case "number":
+                                    options[opt.name] = parseInt(args[i]);
+                                    i++;
+                                    break;
+                                case "boolean":
+                                    options[opt.name] = true;
+                                    break;
+                                case "string":
+                                    options[opt.name] = args[i] || "";
+                                    i++;
+                                    break;
+                                case "list":
+                                    options[opt.name] = parseListTypeOption(opt, args[i], errors);
+                                    i++;
+                                    break;
+                                default:
+                                    options[opt.name] = parseCustomTypeOption(opt, args[i], errors);
+                                    i++;
+                                    break;
+                            }
                         }
                     }
                     else {
@@ -33410,19 +35910,24 @@ var ts;
         }
         return output;
     }
-    function parseJsonConfigFileContent(json, host, basePath, existingOptions) {
+    function parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName) {
         if (existingOptions === void 0) { existingOptions = {}; }
-        var _a = convertCompilerOptionsFromJson(json["compilerOptions"], basePath), optionsFromJsonConfigFile = _a.options, errors = _a.errors;
-        var options = ts.extend(existingOptions, optionsFromJsonConfigFile);
+        var errors = [];
+        var compilerOptions = convertCompilerOptionsFromJsonWorker(json["compilerOptions"], basePath, errors, configFileName);
+        var options = ts.extend(existingOptions, compilerOptions);
+        var typingOptions = convertTypingOptionsFromJsonWorker(json["typingOptions"], basePath, errors, configFileName);
+        options.configFilePath = configFileName;
+        var fileNames = getFileNames(errors);
         return {
             options: options,
-            fileNames: getFileNames(),
+            fileNames: fileNames,
+            typingOptions: typingOptions,
             errors: errors
         };
-        function getFileNames() {
+        function getFileNames(errors) {
             var fileNames = [];
             if (ts.hasProperty(json, "files")) {
-                if (json["files"] instanceof Array) {
+                if (ts.isArray(json["files"])) {
                     fileNames = ts.map(json["files"], function (s) { return ts.combinePaths(basePath, s); });
                 }
                 else {
@@ -33431,7 +35936,18 @@ var ts;
             }
             else {
                 var filesSeen = {};
-                var exclude = json["exclude"] instanceof Array ? ts.map(json["exclude"], ts.normalizeSlashes) : undefined;
+                var exclude = [];
+                if (ts.isArray(json["exclude"])) {
+                    exclude = json["exclude"];
+                }
+                else {
+                    exclude = ["node_modules"];
+                    var outDir = json["compilerOptions"] && json["compilerOptions"]["outDir"];
+                    if (outDir) {
+                        exclude.push(outDir);
+                    }
+                }
+                exclude = ts.map(exclude, ts.normalizeSlashes);
                 var supportedExtensions = ts.getSupportedExtensions(options);
                 ts.Debug.assert(ts.indexOf(supportedExtensions, ".ts") < ts.indexOf(supportedExtensions, ".d.ts"), "Changed priority of extensions to pick");
                 for (var _i = 0, supportedExtensions_1 = supportedExtensions; _i < supportedExtensions_1.length; _i++) {
@@ -33442,6 +35958,9 @@ var ts;
                         if (extension === ".ts" && ts.fileExtensionIs(fileName, ".d.ts")) {
                             continue;
                         }
+                        if (/\.min\.js$/.test(fileName)) {
+                            continue;
+                        }
                         if (extension === ".d.ts" || (options.allowJs && ts.contains(ts.supportedJavascriptExtensions, extension))) {
                             var baseName = fileName.substr(0, fileName.length - extension.length);
                             if (ts.hasProperty(filesSeen, baseName + ".ts") || ts.hasProperty(filesSeen, baseName + ".tsx")) {
@@ -33453,53 +35972,88 @@ var ts;
                     }
                 }
             }
+            if (ts.hasProperty(json, "excludes") && !ts.hasProperty(json, "exclude")) {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_option_excludes_Did_you_mean_exclude));
+            }
             return fileNames;
         }
     }
     ts.parseJsonConfigFileContent = parseJsonConfigFileContent;
-    function convertCompilerOptionsFromJson(jsonOptions, basePath) {
-        var options = {};
+    function convertCompilerOptionsFromJson(jsonOptions, basePath, configFileName) {
         var errors = [];
-        if (!jsonOptions) {
-            return { options: options, errors: errors };
-        }
-        var optionNameMap = ts.arrayToMap(ts.optionDeclarations, function (opt) { return opt.name; });
-        for (var id in jsonOptions) {
-            if (ts.hasProperty(optionNameMap, id)) {
-                var opt = optionNameMap[id];
-                var optType = opt.type;
-                var value = jsonOptions[id];
-                var expectedType = typeof optType === "string" ? optType : "string";
-                if (typeof value === expectedType) {
-                    if (typeof optType !== "string") {
-                        var key = value.toLowerCase();
-                        if (ts.hasProperty(optType, key)) {
-                            value = optType[key];
-                        }
-                        else {
-                            errors.push(ts.createCompilerDiagnostic(opt.error));
-                            value = 0;
-                        }
-                    }
-                    if (opt.isFilePath) {
-                        value = ts.normalizePath(ts.combinePaths(basePath, value));
-                        if (value === "") {
-                            value = ".";
-                        }
-                    }
-                    options[opt.name] = value;
-                }
-                else {
-                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, id, expectedType));
-                }
-            }
-            else {
-                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_compiler_option_0, id));
-            }
-        }
+        var options = convertCompilerOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName);
         return { options: options, errors: errors };
     }
     ts.convertCompilerOptionsFromJson = convertCompilerOptionsFromJson;
+    function convertTypingOptionsFromJson(jsonOptions, basePath, configFileName) {
+        var errors = [];
+        var options = convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName);
+        return { options: options, errors: errors };
+    }
+    ts.convertTypingOptionsFromJson = convertTypingOptionsFromJson;
+    function convertCompilerOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName) {
+        var options = ts.getBaseFileName(configFileName) === "jsconfig.json" ? { allowJs: true } : {};
+        convertOptionsFromJson(ts.optionDeclarations, jsonOptions, basePath, options, ts.Diagnostics.Unknown_compiler_option_0, errors);
+        return options;
+    }
+    function convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName) {
+        var options = ts.getBaseFileName(configFileName) === "jsconfig.json"
+            ? { enableAutoDiscovery: true, include: [], exclude: [] }
+            : { enableAutoDiscovery: false, include: [], exclude: [] };
+        convertOptionsFromJson(ts.typingOptionDeclarations, jsonOptions, basePath, options, ts.Diagnostics.Unknown_typing_option_0, errors);
+        return options;
+    }
+    function convertOptionsFromJson(optionDeclarations, jsonOptions, basePath, defaultOptions, diagnosticMessage, errors) {
+        if (!jsonOptions) {
+            return;
+        }
+        var optionNameMap = ts.arrayToMap(optionDeclarations, function (opt) { return opt.name; });
+        for (var id in jsonOptions) {
+            if (ts.hasProperty(optionNameMap, id)) {
+                var opt = optionNameMap[id];
+                defaultOptions[opt.name] = convertJsonOption(opt, jsonOptions[id], basePath, errors);
+            }
+            else {
+                errors.push(ts.createCompilerDiagnostic(diagnosticMessage, id));
+            }
+        }
+    }
+    function convertJsonOption(opt, value, basePath, errors) {
+        var optType = opt.type;
+        var expectedType = typeof optType === "string" ? optType : "string";
+        if (optType === "list" && ts.isArray(value)) {
+            return convertJsonOptionOfListType(opt, value, basePath, errors);
+        }
+        else if (typeof value === expectedType) {
+            if (typeof optType !== "string") {
+                return convertJsonOptionOfCustomType(opt, value, errors);
+            }
+            else {
+                if (opt.isFilePath) {
+                    value = ts.normalizePath(ts.combinePaths(basePath, value));
+                    if (value === "") {
+                        value = ".";
+                    }
+                }
+            }
+            return value;
+        }
+        else {
+            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, opt.name, expectedType));
+        }
+    }
+    function convertJsonOptionOfCustomType(opt, value, errors) {
+        var key = value.toLowerCase();
+        if (ts.hasProperty(opt.type, key)) {
+            return opt.type[key];
+        }
+        else {
+            errors.push(createCompilerDiagnosticForInvalidCustomType(opt));
+        }
+    }
+    function convertJsonOptionOfListType(option, values, basePath, errors) {
+        return ts.filter(ts.map(values, function (v) { return convertJsonOption(option.element, v, basePath, errors); }), function (v) { return !!v; });
+    }
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -33510,6 +36064,17 @@ var ts;
             reportDiagnostic(diagnostic, host);
         }
     }
+    function reportEmittedFiles(files, host) {
+        if (!files || files.length == 0) {
+            return;
+        }
+        var currentDir = ts.sys.getCurrentDirectory();
+        for (var _i = 0, files_4 = files; _i < files_4.length; _i++) {
+            var file = files_4[_i];
+            var filepath = ts.getNormalizedAbsolutePath(file, currentDir);
+            ts.sys.write("TSFILE: " + filepath + ts.sys.newLine);
+        }
+    }
     function validateLocaleAndSetLanguage(locale, errors) {
         var matchResult = /^([a-z]+)([_\-]([a-z]+))?$/.exec(locale.toLowerCase());
         if (!matchResult) {
@@ -33588,7 +36153,7 @@ var ts;
     var gutterStyleSequence = "\u001b[100;30m";
     var gutterSeparator = " ";
     var resetEscapeSequence = "\u001b[0m";
-    var elipsis = "...";
+    var ellipsis = "...";
     var categoryFormatMap = (_a = {},
         _a[ts.DiagnosticCategory.Warning] = yellowForegroundEscapeSequence,
         _a[ts.DiagnosticCategory.Error] = redForegroundEscapeSequence,
@@ -33609,12 +36174,12 @@ var ts;
             var hasMoreThanFiveLines = (lastLine - firstLine) >= 4;
             var gutterWidth = (lastLine + 1 + "").length;
             if (hasMoreThanFiveLines) {
-                gutterWidth = Math.max(elipsis.length, gutterWidth);
+                gutterWidth = Math.max(ellipsis.length, gutterWidth);
             }
             output += ts.sys.newLine;
             for (var i = firstLine; i <= lastLine; i++) {
                 if (hasMoreThanFiveLines && firstLine + 1 < i && i < lastLine - 1) {
-                    output += formatAndReset(padLeft(elipsis, gutterWidth), gutterStyleSequence) + gutterSeparator + ts.sys.newLine;
+                    output += formatAndReset(padLeft(ellipsis, gutterWidth), gutterStyleSequence) + gutterSeparator + ts.sys.newLine;
                     i = lastLine - 1;
                 }
                 var lineStart = ts.getPositionOfLineAndCharacter(file, i, 0);
@@ -33755,14 +36320,13 @@ var ts;
             printHelp();
             return ts.sys.exit(ts.ExitStatus.Success);
         }
-        if (commandLine.options.watch && commandLine.options.hasOwnProperty("watch")) {
+        if (ts.isWatchSet(commandLine.options)) {
             if (!ts.sys.watchFile) {
                 reportDiagnostic(ts.createCompilerDiagnostic(ts.Diagnostics.The_current_host_does_not_support_the_0_option, "--watch"), undefined);
                 return ts.sys.exit(ts.ExitStatus.DiagnosticsPresent_OutputsSkipped);
             }
             if (configFileName) {
-                var configFilePath = ts.toPath(configFileName, ts.sys.getCurrentDirectory(), ts.createGetCanonicalFileName(ts.sys.useCaseSensitiveFileNames));
-                configFileWatcher = ts.sys.watchFile(configFilePath, configFileChanged);
+                configFileWatcher = ts.sys.watchFile(configFileName, configFileChanged);
             }
             if (ts.sys.watchDirectory && configFileName) {
                 var directory = ts.getDirectoryPath(configFileName);
@@ -33795,12 +36359,16 @@ var ts;
                 ts.sys.exit(ts.ExitStatus.DiagnosticsPresent_OutputsSkipped);
                 return;
             }
-            var configParseResult = ts.parseJsonConfigFileContent(configObject, ts.sys, ts.getDirectoryPath(configFileName), commandLine.options);
+            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);
                 return;
             }
+            if (ts.isWatchSet(configParseResult.options) && !ts.sys.watchFile) {
+                reportDiagnostic(ts.createCompilerDiagnostic(ts.Diagnostics.The_current_host_does_not_support_the_0_option, "--watch"), undefined);
+                ts.sys.exit(ts.ExitStatus.DiagnosticsPresent_OutputsSkipped);
+            }
             return configParseResult;
         }
         function performCompilation() {
@@ -33825,7 +36393,7 @@ var ts;
             }
             cachedExistingFiles = {};
             var compileResult = compile(rootFileNames, compilerOptions, compilerHost);
-            if (!compilerOptions.watch) {
+            if (!ts.isWatchSet(compilerOptions)) {
                 return ts.sys.exit(compileResult.exitStatus);
             }
             setCachedProgram(compileResult.program);
@@ -33845,17 +36413,16 @@ var ts;
                 }
             }
             var sourceFile = hostGetSourceFile(fileName, languageVersion, onError);
-            if (sourceFile && compilerOptions.watch) {
-                var filePath = ts.toPath(sourceFile.fileName, ts.sys.getCurrentDirectory(), ts.createGetCanonicalFileName(ts.sys.useCaseSensitiveFileNames));
-                sourceFile.fileWatcher = ts.sys.watchFile(filePath, function (fileName, removed) { return sourceFileChanged(sourceFile, removed); });
+            if (sourceFile && ts.isWatchSet(compilerOptions) && ts.sys.watchFile) {
+                sourceFile.fileWatcher = ts.sys.watchFile(sourceFile.fileName, function (fileName, removed) { return sourceFileChanged(sourceFile, removed); });
             }
             return sourceFile;
         }
         function setCachedProgram(program) {
             if (cachedProgram) {
-                var newSourceFiles = program ? program.getSourceFiles() : undefined;
+                var newSourceFiles_1 = program ? program.getSourceFiles() : undefined;
                 ts.forEach(cachedProgram.getSourceFiles(), function (sourceFile) {
-                    if (!(newSourceFiles && ts.contains(newSourceFiles, sourceFile))) {
+                    if (!(newSourceFiles_1 && ts.contains(newSourceFiles_1, sourceFile))) {
                         if (sourceFile.fileWatcher) {
                             sourceFile.fileWatcher.close();
                             sourceFile.fileWatcher = undefined;
@@ -33882,7 +36449,7 @@ var ts;
             startTimerForRecompilation();
         }
         function watchedDirectoryChanged(fileName) {
-            if (fileName && !ts.isSupportedSourceFileName(fileName, commandLine.options)) {
+            if (fileName && !ts.isSupportedSourceFileName(fileName, compilerOptions)) {
                 return;
             }
             startTimerForHandlingDirectoryChanges();
@@ -33958,18 +36525,14 @@ var ts;
                     diagnostics = program.getSemanticDiagnostics();
                 }
             }
-            reportDiagnostics(diagnostics, compilerHost);
-            if (compilerOptions.noEmit) {
-                return diagnostics.length
-                    ? ts.ExitStatus.DiagnosticsPresent_OutputsSkipped
-                    : ts.ExitStatus.Success;
-            }
             var emitOutput = program.emit();
-            reportDiagnostics(emitOutput.diagnostics, compilerHost);
-            if (emitOutput.emitSkipped) {
+            diagnostics = diagnostics.concat(emitOutput.diagnostics);
+            reportDiagnostics(ts.sortAndDeduplicateDiagnostics(diagnostics), compilerHost);
+            reportEmittedFiles(emitOutput.emittedFiles, compilerHost);
+            if (emitOutput.emitSkipped && diagnostics.length > 0) {
                 return ts.ExitStatus.DiagnosticsPresent_OutputsSkipped;
             }
-            if (diagnostics.length > 0 || emitOutput.diagnostics.length > 0) {
+            else if (diagnostics.length > 0) {
                 return ts.ExitStatus.DiagnosticsPresent_OutputsGenerated;
             }
             return ts.ExitStatus.Success;
@@ -33998,10 +36561,11 @@ var ts;
         marginLength = 0;
         var usageColumn = [];
         var descriptionColumn = [];
-        for (var i = 0; i < optsList.length; i++) {
+        var optionsDescriptionMap = {};
+        var _loop_2 = function(i) {
             var option = optsList[i];
             if (!option.description) {
-                continue;
+                return "continue";
             }
             var usageText_1 = " ";
             if (option.shortName) {
@@ -34012,8 +36576,24 @@ var ts;
             usageText_1 += "--" + option.name;
             usageText_1 += getParamType(option);
             usageColumn.push(usageText_1);
-            descriptionColumn.push(getDiagnosticText(option.description));
+            var description = void 0;
+            if (option.name === "lib") {
+                description = getDiagnosticText(option.description);
+                var options_1 = [];
+                var element = option.element;
+                ts.forEachKey(element.type, function (key) {
+                    options_1.push("'" + key + "'");
+                });
+                optionsDescriptionMap[description] = options_1;
+            }
+            else {
+                description = getDiagnosticText(option.description);
+            }
+            descriptionColumn.push(description);
             marginLength = Math.max(usageText_1.length, marginLength);
+        };
+        for (var i = 0; i < optsList.length; i++) {
+            _loop_2(i);
         }
         var usageText = " @<" + getDiagnosticText(ts.Diagnostics.file) + ">";
         usageColumn.push(usageText);
@@ -34022,7 +36602,16 @@ var ts;
         for (var i = 0; i < usageColumn.length; i++) {
             var usage = usageColumn[i];
             var description = descriptionColumn[i];
+            var kindsList = optionsDescriptionMap[description];
             output += usage + makePadding(marginLength - usage.length + 2) + description + ts.sys.newLine;
+            if (kindsList) {
+                output += makePadding(marginLength + 4);
+                for (var _i = 0, kindsList_1 = kindsList; _i < kindsList_1.length; _i++) {
+                    var kind = kindsList_1[_i];
+                    output += kind + " ";
+                }
+                output += ts.sys.newLine;
+            }
         }
         ts.sys.write(output);
         return;
@@ -34045,12 +36634,17 @@ var ts;
         else {
             var compilerOptions = ts.extend(options, ts.defaultInitCompilerOptions);
             var configurations = {
-                compilerOptions: serializeCompilerOptions(compilerOptions),
-                exclude: ["node_modules"]
+                compilerOptions: serializeCompilerOptions(compilerOptions)
             };
             if (fileNames && fileNames.length) {
                 configurations.files = fileNames;
             }
+            else {
+                configurations.exclude = ["node_modules"];
+                if (compilerOptions.outDir) {
+                    configurations.exclude.push(compilerOptions.outDir);
+                }
+            }
             ts.sys.writeFile(file, JSON.stringify(configurations, undefined, 4));
             reportDiagnostic(ts.createCompilerDiagnostic(ts.Diagnostics.Successfully_created_a_tsconfig_json_file), undefined);
         }
@@ -34058,10 +36652,10 @@ var ts;
         function serializeCompilerOptions(options) {
             var result = {};
             var optionsNameMap = ts.getOptionNameMap().optionNameMap;
-            for (var name_31 in options) {
-                if (ts.hasProperty(options, name_31)) {
-                    var value = options[name_31];
-                    switch (name_31) {
+            for (var name_34 in options) {
+                if (ts.hasProperty(options, name_34)) {
+                    var value = options[name_34];
+                    switch (name_34) {
                         case "init":
                         case "watch":
                         case "version":
@@ -34069,17 +36663,17 @@ var ts;
                         case "project":
                             break;
                         default:
-                            var optionDefinition = optionsNameMap[name_31.toLowerCase()];
+                            var optionDefinition = optionsNameMap[name_34.toLowerCase()];
                             if (optionDefinition) {
                                 if (typeof optionDefinition.type === "string") {
-                                    result[name_31] = value;
+                                    result[name_34] = value;
                                 }
                                 else {
                                     var typeMap = optionDefinition.type;
                                     for (var key in typeMap) {
                                         if (ts.hasProperty(typeMap, key)) {
                                             if (typeMap[key] === value)
-                                                result[name_31] = key;
+                                                result[name_34] = key;
                                         }
                                     }
                                 }
diff --git a/lib/tsserver.js b/lib/tsserver.js
index ba62ebe0dde..7b671727da5 100644
--- a/lib/tsserver.js
+++ b/lib/tsserver.js
@@ -13,6 +13,11 @@ See the Apache Version 2.0 License for specific language governing permissions
 and limitations under the License.
 ***************************************************************************** */
 
+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 ts;
 (function (ts) {
     var OperationCanceledException = (function () {
@@ -46,6 +51,21 @@ var ts;
         DiagnosticCategory[DiagnosticCategory["Message"] = 2] = "Message";
     })(ts.DiagnosticCategory || (ts.DiagnosticCategory = {}));
     var DiagnosticCategory = ts.DiagnosticCategory;
+    (function (ModuleResolutionKind) {
+        ModuleResolutionKind[ModuleResolutionKind["Classic"] = 1] = "Classic";
+        ModuleResolutionKind[ModuleResolutionKind["NodeJs"] = 2] = "NodeJs";
+    })(ts.ModuleResolutionKind || (ts.ModuleResolutionKind = {}));
+    var ModuleResolutionKind = ts.ModuleResolutionKind;
+    (function (ModuleKind) {
+        ModuleKind[ModuleKind["None"] = 0] = "None";
+        ModuleKind[ModuleKind["CommonJS"] = 1] = "CommonJS";
+        ModuleKind[ModuleKind["AMD"] = 2] = "AMD";
+        ModuleKind[ModuleKind["UMD"] = 3] = "UMD";
+        ModuleKind[ModuleKind["System"] = 4] = "System";
+        ModuleKind[ModuleKind["ES6"] = 5] = "ES6";
+        ModuleKind[ModuleKind["ES2015"] = 5] = "ES2015";
+    })(ts.ModuleKind || (ts.ModuleKind = {}));
+    var ModuleKind = ts.ModuleKind;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -247,8 +267,14 @@ var ts;
             var count = array.length;
             if (count > 0) {
                 var pos = 0;
-                var result = arguments.length <= 2 ? array[pos] : initial;
-                pos++;
+                var result = void 0;
+                if (arguments.length <= 2) {
+                    result = array[pos];
+                    pos++;
+                }
+                else {
+                    result = initial;
+                }
                 while (pos < count) {
                     result = f(result, array[pos]);
                     pos++;
@@ -263,8 +289,14 @@ var ts;
         if (array) {
             var pos = array.length - 1;
             if (pos >= 0) {
-                var result = arguments.length <= 2 ? array[pos] : initial;
-                pos--;
+                var result = void 0;
+                if (arguments.length <= 2) {
+                    result = array[pos];
+                    pos--;
+                }
+                else {
+                    result = initial;
+                }
                 while (pos >= 0) {
                     result = f(result, array[pos]);
                     pos--;
@@ -280,6 +312,14 @@ var ts;
         return hasOwnProperty.call(map, key);
     }
     ts.hasProperty = hasProperty;
+    function getKeys(map) {
+        var keys = [];
+        for (var key in map) {
+            keys.push(key);
+        }
+        return keys;
+    }
+    ts.getKeys = getKeys;
     function getProperty(map, key) {
         return hasOwnProperty.call(map, key) ? map[key] : undefined;
     }
@@ -410,6 +450,14 @@ var ts;
         };
     }
     ts.createFileDiagnostic = createFileDiagnostic;
+    function formatMessage(dummy, message) {
+        var text = getLocaleSpecificMessage(message);
+        if (arguments.length > 2) {
+            text = formatStringFromArgs(text, arguments, 2);
+        }
+        return text;
+    }
+    ts.formatMessage = formatMessage;
     function createCompilerDiagnostic(message) {
         var text = getLocaleSpecificMessage(message);
         if (arguments.length > 1) {
@@ -685,6 +733,26 @@ var ts;
         return pathLen > extLen && path.substr(pathLen - extLen, extLen) === extension;
     }
     ts.fileExtensionIs = fileExtensionIs;
+    function ensureScriptKind(fileName, scriptKind) {
+        return (scriptKind || getScriptKindFromFileName(fileName)) || 3;
+    }
+    ts.ensureScriptKind = ensureScriptKind;
+    function getScriptKindFromFileName(fileName) {
+        var ext = fileName.substr(fileName.lastIndexOf("."));
+        switch (ext.toLowerCase()) {
+            case ".js":
+                return 1;
+            case ".jsx":
+                return 2;
+            case ".ts":
+                return 3;
+            case ".tsx":
+                return 4;
+            default:
+                return 0;
+        }
+    }
+    ts.getScriptKindFromFileName = getScriptKindFromFileName;
     ts.supportedTypeScriptExtensions = [".ts", ".tsx", ".d.ts"];
     ts.supportedJavascriptExtensions = [".js", ".jsx"];
     var allSupportedExtensions = ts.supportedTypeScriptExtensions.concat(ts.supportedJavascriptExtensions);
@@ -918,6 +986,7 @@ var ts;
             var _fs = require("fs");
             var _path = require("path");
             var _os = require("os");
+            var _crypto = require("crypto");
             function createPollingWatchedFileSet(interval, chunkSize) {
                 if (interval === void 0) { interval = 2500; }
                 if (chunkSize === void 0) { chunkSize = 30; }
@@ -932,13 +1001,13 @@ var ts;
                     if (!watchedFile) {
                         return;
                     }
-                    _fs.stat(watchedFile.filePath, function (err, stats) {
+                    _fs.stat(watchedFile.fileName, function (err, stats) {
                         if (err) {
-                            watchedFile.callback(watchedFile.filePath);
+                            watchedFile.callback(watchedFile.fileName);
                         }
                         else if (watchedFile.mtime.getTime() !== stats.mtime.getTime()) {
-                            watchedFile.mtime = getModifiedTime(watchedFile.filePath);
-                            watchedFile.callback(watchedFile.filePath, watchedFile.mtime.getTime() === 0);
+                            watchedFile.mtime = getModifiedTime(watchedFile.fileName);
+                            watchedFile.callback(watchedFile.fileName, watchedFile.mtime.getTime() === 0);
                         }
                     });
                 }
@@ -961,11 +1030,11 @@ var ts;
                         nextFileToCheck = nextToCheck;
                     }, interval);
                 }
-                function addFile(filePath, callback) {
+                function addFile(fileName, callback) {
                     var file = {
-                        filePath: filePath,
+                        fileName: fileName,
                         callback: callback,
-                        mtime: getModifiedTime(filePath)
+                        mtime: getModifiedTime(fileName)
                     };
                     watchedFiles.push(file);
                     if (watchedFiles.length === 1) {
@@ -985,67 +1054,67 @@ var ts;
                 };
             }
             function createWatchedFileSet() {
-                var dirWatchers = ts.createFileMap();
-                var fileWatcherCallbacks = ts.createFileMap();
+                var dirWatchers = {};
+                var fileWatcherCallbacks = {};
                 return { addFile: addFile, removeFile: removeFile };
-                function reduceDirWatcherRefCountForFile(filePath) {
-                    var dirPath = ts.getDirectoryPath(filePath);
-                    if (dirWatchers.contains(dirPath)) {
-                        var watcher = dirWatchers.get(dirPath);
+                function reduceDirWatcherRefCountForFile(fileName) {
+                    var dirName = ts.getDirectoryPath(fileName);
+                    if (ts.hasProperty(dirWatchers, dirName)) {
+                        var watcher = dirWatchers[dirName];
                         watcher.referenceCount -= 1;
                         if (watcher.referenceCount <= 0) {
                             watcher.close();
-                            dirWatchers.remove(dirPath);
+                            delete dirWatchers[dirName];
                         }
                     }
                 }
                 function addDirWatcher(dirPath) {
-                    if (dirWatchers.contains(dirPath)) {
-                        var watcher_1 = dirWatchers.get(dirPath);
+                    if (ts.hasProperty(dirWatchers, dirPath)) {
+                        var watcher_1 = dirWatchers[dirPath];
                         watcher_1.referenceCount += 1;
                         return;
                     }
                     var watcher = _fs.watch(dirPath, { persistent: true }, function (eventName, relativeFileName) { return fileEventHandler(eventName, relativeFileName, dirPath); });
                     watcher.referenceCount = 1;
-                    dirWatchers.set(dirPath, watcher);
+                    dirWatchers[dirPath] = watcher;
                     return;
                 }
                 function addFileWatcherCallback(filePath, callback) {
-                    if (fileWatcherCallbacks.contains(filePath)) {
-                        fileWatcherCallbacks.get(filePath).push(callback);
+                    if (ts.hasProperty(fileWatcherCallbacks, filePath)) {
+                        fileWatcherCallbacks[filePath].push(callback);
                     }
                     else {
-                        fileWatcherCallbacks.set(filePath, [callback]);
+                        fileWatcherCallbacks[filePath] = [callback];
                     }
                 }
-                function addFile(filePath, callback) {
-                    addFileWatcherCallback(filePath, callback);
-                    addDirWatcher(ts.getDirectoryPath(filePath));
-                    return { filePath: filePath, callback: callback };
+                function addFile(fileName, callback) {
+                    addFileWatcherCallback(fileName, callback);
+                    addDirWatcher(ts.getDirectoryPath(fileName));
+                    return { fileName: fileName, callback: callback };
                 }
                 function removeFile(watchedFile) {
-                    removeFileWatcherCallback(watchedFile.filePath, watchedFile.callback);
-                    reduceDirWatcherRefCountForFile(watchedFile.filePath);
+                    removeFileWatcherCallback(watchedFile.fileName, watchedFile.callback);
+                    reduceDirWatcherRefCountForFile(watchedFile.fileName);
                 }
                 function removeFileWatcherCallback(filePath, callback) {
-                    if (fileWatcherCallbacks.contains(filePath)) {
-                        var newCallbacks = ts.copyListRemovingItem(callback, fileWatcherCallbacks.get(filePath));
+                    if (ts.hasProperty(fileWatcherCallbacks, filePath)) {
+                        var newCallbacks = ts.copyListRemovingItem(callback, fileWatcherCallbacks[filePath]);
                         if (newCallbacks.length === 0) {
-                            fileWatcherCallbacks.remove(filePath);
+                            delete fileWatcherCallbacks[filePath];
                         }
                         else {
-                            fileWatcherCallbacks.set(filePath, newCallbacks);
+                            fileWatcherCallbacks[filePath] = newCallbacks;
                         }
                     }
                 }
                 function fileEventHandler(eventName, relativeFileName, baseDirPath) {
-                    var filePath = typeof relativeFileName !== "string"
+                    var fileName = typeof relativeFileName !== "string"
                         ? undefined
-                        : ts.toPath(relativeFileName, baseDirPath, ts.createGetCanonicalFileName(ts.sys.useCaseSensitiveFileNames));
-                    if (eventName === "change" && fileWatcherCallbacks.contains(filePath)) {
-                        for (var _i = 0, _a = fileWatcherCallbacks.get(filePath); _i < _a.length; _i++) {
+                        : ts.getNormalizedAbsolutePath(relativeFileName, baseDirPath);
+                    if ((eventName === "change" || eventName === "rename") && ts.hasProperty(fileWatcherCallbacks, fileName)) {
+                        for (var _i = 0, _a = fileWatcherCallbacks[fileName]; _i < _a.length; _i++) {
                             var fileCallback = _a[_i];
-                            fileCallback(filePath);
+                            fileCallback(fileName);
                         }
                     }
                 }
@@ -1058,7 +1127,7 @@ var ts;
             var platform = _os.platform();
             var useCaseSensitiveFileNames = platform !== "win32" && platform !== "win64" && platform !== "darwin";
             function readFile(fileName, encoding) {
-                if (!_fs.existsSync(fileName)) {
+                if (!fileExists(fileName)) {
                     return undefined;
                 }
                 var buffer = _fs.readFileSync(fileName);
@@ -1098,6 +1167,24 @@ var ts;
             function getCanonicalPath(path) {
                 return useCaseSensitiveFileNames ? path : path.toLowerCase();
             }
+            function fileSystemEntryExists(path, entryKind) {
+                try {
+                    var stat = _fs.statSync(path);
+                    switch (entryKind) {
+                        case 0: return stat.isFile();
+                        case 1: return stat.isDirectory();
+                    }
+                }
+                catch (e) {
+                    return false;
+                }
+            }
+            function fileExists(path) {
+                return fileSystemEntryExists(path, 0);
+            }
+            function directoryExists(path) {
+                return fileSystemEntryExists(path, 1);
+            }
             function readDirectory(path, extension, exclude) {
                 var result = [];
                 exclude = ts.map(exclude, function (s) { return getCanonicalPath(ts.combinePaths(path, s)); });
@@ -1108,6 +1195,9 @@ var ts;
                     var directories = [];
                     for (var _i = 0, files_2 = files; _i < files_2.length; _i++) {
                         var current = files_2[_i];
+                        if (current === "." || current === "..") {
+                            continue;
+                        }
                         var name_3 = ts.combinePaths(path, current);
                         if (!ts.contains(exclude, getCanonicalPath(name_3))) {
                             var stat = _fs.statSync(name_3);
@@ -1136,14 +1226,14 @@ var ts;
                 },
                 readFile: readFile,
                 writeFile: writeFile,
-                watchFile: function (filePath, callback) {
+                watchFile: function (fileName, callback) {
                     var watchSet = isNode4OrLater() ? watchedFileSet : pollingWatchedFileSet;
-                    var watchedFile = watchSet.addFile(filePath, callback);
+                    var watchedFile = watchSet.addFile(fileName, callback);
                     return {
                         close: function () { return watchSet.removeFile(watchedFile); }
                     };
                 },
-                watchDirectory: function (path, callback, recursive) {
+                watchDirectory: function (directoryName, callback, recursive) {
                     var options;
                     if (isNode4OrLater() && (process.platform === "win32" || process.platform === "darwin")) {
                         options = { persistent: true, recursive: !!recursive };
@@ -1151,9 +1241,9 @@ var ts;
                     else {
                         options = { persistent: true };
                     }
-                    return _fs.watch(path, options, function (eventName, relativeFileName) {
+                    return _fs.watch(directoryName, options, function (eventName, relativeFileName) {
                         if (eventName === "rename") {
-                            callback(!relativeFileName ? relativeFileName : ts.normalizePath(ts.combinePaths(path, relativeFileName)));
+                            callback(!relativeFileName ? relativeFileName : ts.normalizePath(ts.combinePaths(directoryName, relativeFileName)));
                         }
                         ;
                     });
@@ -1161,12 +1251,8 @@ var ts;
                 resolvePath: function (path) {
                     return _path.resolve(path);
                 },
-                fileExists: function (path) {
-                    return _fs.existsSync(path);
-                },
-                directoryExists: function (path) {
-                    return _fs.existsSync(path) && _fs.statSync(path).isDirectory();
-                },
+                fileExists: fileExists,
+                directoryExists: directoryExists,
                 createDirectory: function (directoryName) {
                     if (!this.directoryExists(directoryName)) {
                         _fs.mkdirSync(directoryName);
@@ -1179,6 +1265,19 @@ var ts;
                     return process.cwd();
                 },
                 readDirectory: readDirectory,
+                getModifiedTime: function (path) {
+                    try {
+                        return _fs.statSync(path).mtime;
+                    }
+                    catch (e) {
+                        return undefined;
+                    }
+                },
+                createHash: function (data) {
+                    var hash = _crypto.createHash("md5");
+                    hash.update(data);
+                    return hash.digest("hex");
+                },
                 getMemoryUsage: function () {
                     if (global.gc) {
                         global.gc();
@@ -1249,6 +1348,7 @@ var ts;
         An_index_signature_must_have_a_type_annotation: { code: 1021, category: ts.DiagnosticCategory.Error, key: "An_index_signature_must_have_a_type_annotation_1021", message: "An index signature must have a type annotation." },
         An_index_signature_parameter_must_have_a_type_annotation: { code: 1022, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_must_have_a_type_annotation_1022", message: "An index signature parameter must have a type annotation." },
         An_index_signature_parameter_type_must_be_string_or_number: { code: 1023, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_type_must_be_string_or_number_1023", message: "An index signature parameter type must be 'string' or 'number'." },
+        readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature: { code: 1024, category: ts.DiagnosticCategory.Error, key: "readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature_1024", message: "'readonly' modifier can only appear on a property declaration or index signature." },
         Accessibility_modifier_already_seen: { code: 1028, category: ts.DiagnosticCategory.Error, key: "Accessibility_modifier_already_seen_1028", message: "Accessibility modifier already seen." },
         _0_modifier_must_precede_1_modifier: { code: 1029, category: ts.DiagnosticCategory.Error, key: "_0_modifier_must_precede_1_modifier_1029", message: "'{0}' modifier must precede '{1}' modifier." },
         _0_modifier_already_seen: { code: 1030, category: ts.DiagnosticCategory.Error, key: "_0_modifier_already_seen_1030", message: "'{0}' modifier already seen." },
@@ -1262,7 +1362,7 @@ var ts;
         _0_modifier_cannot_be_used_with_a_class_declaration: { code: 1041, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_with_a_class_declaration_1041", message: "'{0}' modifier cannot be used with a class declaration." },
         _0_modifier_cannot_be_used_here: { code: 1042, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_here_1042", message: "'{0}' modifier cannot be used here." },
         _0_modifier_cannot_appear_on_a_data_property: { code: 1043, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_data_property_1043", message: "'{0}' modifier cannot appear on a data property." },
-        _0_modifier_cannot_appear_on_a_module_element: { code: 1044, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_module_element_1044", message: "'{0}' modifier cannot appear on a module element." },
+        _0_modifier_cannot_appear_on_a_module_or_namespace_element: { code: 1044, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_module_or_namespace_element_1044", message: "'{0}' modifier cannot appear on a module or namespace element." },
         A_0_modifier_cannot_be_used_with_an_interface_declaration: { code: 1045, category: ts.DiagnosticCategory.Error, key: "A_0_modifier_cannot_be_used_with_an_interface_declaration_1045", message: "A '{0}' modifier cannot be used with an interface declaration." },
         A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: { code: 1046, category: ts.DiagnosticCategory.Error, key: "A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file_1046", message: "A 'declare' modifier is required for a top level declaration in a .d.ts file." },
         A_rest_parameter_cannot_be_optional: { code: 1047, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_cannot_be_optional_1047", message: "A rest parameter cannot be optional." },
@@ -1281,8 +1381,11 @@ var ts;
         Enum_member_must_have_initializer: { code: 1061, category: ts.DiagnosticCategory.Error, key: "Enum_member_must_have_initializer_1061", message: "Enum member must have initializer." },
         _0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method: { code: 1062, category: ts.DiagnosticCategory.Error, key: "_0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method_1062", message: "{0} is referenced directly or indirectly in the fulfillment callback of its own 'then' method." },
         An_export_assignment_cannot_be_used_in_a_namespace: { code: 1063, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_cannot_be_used_in_a_namespace_1063", message: "An export assignment cannot be used in a namespace." },
+        The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type: { code: 1064, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_1064", message: "The return type of an async function or method must be the global Promise<T> type." },
         In_ambient_enum_declarations_member_initializer_must_be_constant_expression: { code: 1066, category: ts.DiagnosticCategory.Error, key: "In_ambient_enum_declarations_member_initializer_must_be_constant_expression_1066", message: "In ambient enum declarations member initializer must be constant expression." },
         Unexpected_token_A_constructor_method_accessor_or_property_was_expected: { code: 1068, category: ts.DiagnosticCategory.Error, key: "Unexpected_token_A_constructor_method_accessor_or_property_was_expected_1068", message: "Unexpected token. A constructor, method, accessor, or property was expected." },
+        _0_modifier_cannot_appear_on_a_type_member: { code: 1070, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_type_member_1070", message: "'{0}' modifier cannot appear on a type member." },
+        _0_modifier_cannot_appear_on_an_index_signature: { code: 1071, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_an_index_signature_1071", message: "'{0}' modifier cannot appear on an index signature." },
         A_0_modifier_cannot_be_used_with_an_import_declaration: { code: 1079, category: ts.DiagnosticCategory.Error, key: "A_0_modifier_cannot_be_used_with_an_import_declaration_1079", message: "A '{0}' modifier cannot be used with an import declaration." },
         Invalid_reference_directive_syntax: { code: 1084, category: ts.DiagnosticCategory.Error, key: "Invalid_reference_directive_syntax_1084", message: "Invalid 'reference' directive syntax." },
         Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher: { code: 1085, category: ts.DiagnosticCategory.Error, key: "Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher_1085", message: "Octal literals are not available when targeting ECMAScript 5 and higher." },
@@ -1338,10 +1441,9 @@ var ts;
         String_literal_expected: { code: 1141, category: ts.DiagnosticCategory.Error, key: "String_literal_expected_1141", message: "String literal expected." },
         Line_break_not_permitted_here: { code: 1142, category: ts.DiagnosticCategory.Error, key: "Line_break_not_permitted_here_1142", message: "Line break not permitted here." },
         or_expected: { code: 1144, category: ts.DiagnosticCategory.Error, key: "or_expected_1144", message: "'{' or ';' expected." },
-        Modifiers_not_permitted_on_index_signature_members: { code: 1145, category: ts.DiagnosticCategory.Error, key: "Modifiers_not_permitted_on_index_signature_members_1145", message: "Modifiers not permitted on index signature members." },
         Declaration_expected: { code: 1146, category: ts.DiagnosticCategory.Error, key: "Declaration_expected_1146", message: "Declaration expected." },
         Import_declarations_in_a_namespace_cannot_reference_a_module: { code: 1147, category: ts.DiagnosticCategory.Error, key: "Import_declarations_in_a_namespace_cannot_reference_a_module_1147", message: "Import declarations in a namespace cannot reference a module." },
-        Cannot_compile_modules_unless_the_module_flag_is_provided_Consider_setting_the_module_compiler_option_in_a_tsconfig_json_file: { code: 1148, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_modules_unless_the_module_flag_is_provided_Consider_setting_the_module_compiler_optio_1148", message: "Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file." },
+        Cannot_compile_modules_unless_the_module_flag_is_provided_with_a_valid_module_type_Consider_setting_the_module_compiler_option_in_a_tsconfig_json_file: { code: 1148, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_modules_unless_the_module_flag_is_provided_with_a_valid_module_type_Consider_setting__1148", message: "Cannot compile modules unless the '--module' flag is provided with a valid module type. Consider setting the 'module' compiler option in a 'tsconfig.json' file." },
         File_name_0_differs_from_already_included_file_name_1_only_in_casing: { code: 1149, category: ts.DiagnosticCategory.Error, key: "File_name_0_differs_from_already_included_file_name_1_only_in_casing_1149", message: "File name '{0}' differs from already included file name '{1}' only in casing" },
         new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead: { code: 1150, category: ts.DiagnosticCategory.Error, key: "new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead_1150", message: "'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead." },
         const_declarations_must_be_initialized: { code: 1155, category: ts.DiagnosticCategory.Error, key: "const_declarations_must_be_initialized_1155", message: "'const' declarations must be initialized" },
@@ -1401,7 +1503,7 @@ var ts;
         Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode: { code: 1214, category: ts.DiagnosticCategory.Error, key: "Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode_1214", message: "Identifier expected. '{0}' is a reserved word in strict mode. Modules are automatically in strict mode." },
         Invalid_use_of_0_Modules_are_automatically_in_strict_mode: { code: 1215, category: ts.DiagnosticCategory.Error, key: "Invalid_use_of_0_Modules_are_automatically_in_strict_mode_1215", message: "Invalid use of '{0}'. Modules are automatically in strict mode." },
         Export_assignment_is_not_supported_when_module_flag_is_system: { code: 1218, category: ts.DiagnosticCategory.Error, key: "Export_assignment_is_not_supported_when_module_flag_is_system_1218", message: "Export assignment is not supported when '--module' flag is 'system'." },
-        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Specify_experimentalDecorators_to_remove_this_warning: { code: 1219, category: ts.DiagnosticCategory.Error, key: "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Speci_1219", message: "Experimental support for decorators is a feature that is subject to change in a future release. Specify '--experimentalDecorators' to remove this warning." },
+        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning: { code: 1219, category: ts.DiagnosticCategory.Error, key: "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_t_1219", message: "Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning." },
         Generators_are_only_available_when_targeting_ECMAScript_6_or_higher: { code: 1220, category: ts.DiagnosticCategory.Error, key: "Generators_are_only_available_when_targeting_ECMAScript_6_or_higher_1220", message: "Generators are only available when targeting ECMAScript 6 or higher." },
         Generators_are_not_allowed_in_an_ambient_context: { code: 1221, category: ts.DiagnosticCategory.Error, key: "Generators_are_not_allowed_in_an_ambient_context_1221", message: "Generators are not allowed in an ambient context." },
         An_overload_signature_cannot_be_declared_as_a_generator: { code: 1222, category: ts.DiagnosticCategory.Error, key: "An_overload_signature_cannot_be_declared_as_a_generator_1222", message: "An overload signature cannot be declared as a generator." },
@@ -1410,6 +1512,7 @@ var ts;
         Cannot_find_parameter_0: { code: 1225, category: ts.DiagnosticCategory.Error, key: "Cannot_find_parameter_0_1225", message: "Cannot find parameter '{0}'." },
         Type_predicate_0_is_not_assignable_to_1: { code: 1226, category: ts.DiagnosticCategory.Error, key: "Type_predicate_0_is_not_assignable_to_1_1226", message: "Type predicate '{0}' is not assignable to '{1}'." },
         Parameter_0_is_not_in_the_same_position_as_parameter_1: { code: 1227, category: ts.DiagnosticCategory.Error, key: "Parameter_0_is_not_in_the_same_position_as_parameter_1_1227", message: "Parameter '{0}' is not in the same position as parameter '{1}'." },
+        A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods: { code: 1228, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods_1228", message: "A type predicate is only allowed in return type position for functions and methods." },
         A_type_predicate_cannot_reference_a_rest_parameter: { code: 1229, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_cannot_reference_a_rest_parameter_1229", message: "A type predicate cannot reference a rest parameter." },
         A_type_predicate_cannot_reference_element_0_in_a_binding_pattern: { code: 1230, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_cannot_reference_element_0_in_a_binding_pattern_1230", message: "A type predicate cannot reference element '{0}' in a binding pattern." },
         An_export_assignment_can_only_be_used_in_a_module: { code: 1231, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_can_only_be_used_in_a_module_1231", message: "An export assignment can only be used in a module." },
@@ -1423,7 +1526,7 @@ var ts;
         Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression: { code: 1239, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression_1239", message: "Unable to resolve signature of parameter decorator when called as an expression." },
         Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression: { code: 1240, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression_1240", message: "Unable to resolve signature of property decorator when called as an expression." },
         Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression: { code: 1241, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression_1241", message: "Unable to resolve signature of method decorator when called as an expression." },
-        abstract_modifier_can_only_appear_on_a_class_or_method_declaration: { code: 1242, category: ts.DiagnosticCategory.Error, key: "abstract_modifier_can_only_appear_on_a_class_or_method_declaration_1242", message: "'abstract' modifier can only appear on a class or method declaration." },
+        abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration: { code: 1242, category: ts.DiagnosticCategory.Error, key: "abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration_1242", message: "'abstract' modifier can only appear on a class, method, or property declaration." },
         _0_modifier_cannot_be_used_with_1_modifier: { code: 1243, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_with_1_modifier_1243", message: "'{0}' modifier cannot be used with '{1}' modifier." },
         Abstract_methods_can_only_appear_within_an_abstract_class: { code: 1244, category: ts.DiagnosticCategory.Error, key: "Abstract_methods_can_only_appear_within_an_abstract_class_1244", message: "Abstract methods can only appear within an abstract class." },
         Method_0_cannot_have_an_implementation_because_it_is_marked_abstract: { code: 1245, category: ts.DiagnosticCategory.Error, key: "Method_0_cannot_have_an_implementation_because_it_is_marked_abstract_1245", message: "Method '{0}' cannot have an implementation because it is marked abstract." },
@@ -1436,6 +1539,9 @@ var ts;
         Async_functions_are_only_available_when_targeting_ECMAScript_6_and_higher: { code: 1311, category: ts.DiagnosticCategory.Error, key: "Async_functions_are_only_available_when_targeting_ECMAScript_6_and_higher_1311", message: "Async functions are only available when targeting ECMAScript 6 and higher." },
         can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment: { code: 1312, category: ts.DiagnosticCategory.Error, key: "can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment_1312", message: "'=' can only be used in an object literal property inside a destructuring assignment." },
         The_body_of_an_if_statement_cannot_be_the_empty_statement: { code: 1313, category: ts.DiagnosticCategory.Error, key: "The_body_of_an_if_statement_cannot_be_the_empty_statement_1313", message: "The body of an 'if' statement cannot be the empty statement." },
+        Global_module_exports_may_only_appear_in_module_files: { code: 1314, category: ts.DiagnosticCategory.Error, key: "Global_module_exports_may_only_appear_in_module_files_1314", message: "Global module exports may only appear in module files." },
+        Global_module_exports_may_only_appear_in_declaration_files: { code: 1315, category: ts.DiagnosticCategory.Error, key: "Global_module_exports_may_only_appear_in_declaration_files_1315", message: "Global module exports may only appear in declaration files." },
+        Global_module_exports_may_only_appear_at_top_level: { code: 1316, category: ts.DiagnosticCategory.Error, key: "Global_module_exports_may_only_appear_at_top_level_1316", message: "Global module exports may only appear at top level." },
         Duplicate_identifier_0: { code: 2300, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_0_2300", message: "Duplicate identifier '{0}'." },
         Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: ts.DiagnosticCategory.Error, key: "Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2301", message: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." },
         Static_members_cannot_reference_class_type_parameters: { code: 2302, category: ts.DiagnosticCategory.Error, key: "Static_members_cannot_reference_class_type_parameters_2302", message: "Static members cannot reference class type parameters." },
@@ -1487,7 +1593,7 @@ var ts;
         Cannot_invoke_an_expression_whose_type_lacks_a_call_signature: { code: 2349, category: ts.DiagnosticCategory.Error, key: "Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_2349", message: "Cannot invoke an expression whose type lacks a call signature." },
         Only_a_void_function_can_be_called_with_the_new_keyword: { code: 2350, category: ts.DiagnosticCategory.Error, key: "Only_a_void_function_can_be_called_with_the_new_keyword_2350", message: "Only a void function can be called with the 'new' keyword." },
         Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: { code: 2351, category: ts.DiagnosticCategory.Error, key: "Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature_2351", message: "Cannot use 'new' with an expression whose type lacks a call or construct signature." },
-        Neither_type_0_nor_type_1_is_assignable_to_the_other: { code: 2352, category: ts.DiagnosticCategory.Error, key: "Neither_type_0_nor_type_1_is_assignable_to_the_other_2352", message: "Neither type '{0}' nor type '{1}' is assignable to the other." },
+        Type_0_cannot_be_converted_to_type_1: { code: 2352, category: ts.DiagnosticCategory.Error, key: "Type_0_cannot_be_converted_to_type_1_2352", message: "Type '{0}' cannot be converted to type '{1}'." },
         Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: { code: 2353, category: ts.DiagnosticCategory.Error, key: "Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1_2353", message: "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'." },
         No_best_common_type_exists_among_return_expressions: { code: 2354, category: ts.DiagnosticCategory.Error, key: "No_best_common_type_exists_among_return_expressions_2354", message: "No best common type exists among return expressions." },
         A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value: { code: 2355, category: ts.DiagnosticCategory.Error, key: "A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_2355", message: "A function whose declared type is neither 'void' nor 'any' must return a value." },
@@ -1501,6 +1607,7 @@ var ts;
         The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2363, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2363", message: "The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
         Invalid_left_hand_side_of_assignment_expression: { code: 2364, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_of_assignment_expression_2364", message: "Invalid left-hand side of assignment expression." },
         Operator_0_cannot_be_applied_to_types_1_and_2: { code: 2365, category: ts.DiagnosticCategory.Error, key: "Operator_0_cannot_be_applied_to_types_1_and_2_2365", message: "Operator '{0}' cannot be applied to types '{1}' and '{2}'." },
+        Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined: { code: 2366, category: ts.DiagnosticCategory.Error, key: "Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined_2366", message: "Function lacks ending return statement and return type does not include 'undefined'." },
         Type_parameter_name_cannot_be_0: { code: 2368, category: ts.DiagnosticCategory.Error, key: "Type_parameter_name_cannot_be_0_2368", message: "Type parameter name cannot be '{0}'" },
         A_parameter_property_is_only_allowed_in_a_constructor_implementation: { code: 2369, category: ts.DiagnosticCategory.Error, key: "A_parameter_property_is_only_allowed_in_a_constructor_implementation_2369", message: "A parameter property is only allowed in a constructor implementation." },
         A_rest_parameter_must_be_of_an_array_type: { code: 2370, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_must_be_of_an_array_type_2370", message: "A rest parameter must be of an array type." },
@@ -1516,7 +1623,7 @@ var ts;
         get_and_set_accessor_must_have_the_same_type: { code: 2380, category: ts.DiagnosticCategory.Error, key: "get_and_set_accessor_must_have_the_same_type_2380", message: "'get' and 'set' accessor must have the same type." },
         A_signature_with_an_implementation_cannot_use_a_string_literal_type: { code: 2381, category: ts.DiagnosticCategory.Error, key: "A_signature_with_an_implementation_cannot_use_a_string_literal_type_2381", message: "A signature with an implementation cannot use a string literal type." },
         Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature: { code: 2382, category: ts.DiagnosticCategory.Error, key: "Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature_2382", message: "Specialized overload signature is not assignable to any non-specialized signature." },
-        Overload_signatures_must_all_be_exported_or_not_exported: { code: 2383, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_exported_or_not_exported_2383", message: "Overload signatures must all be exported or not exported." },
+        Overload_signatures_must_all_be_exported_or_non_exported: { code: 2383, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_exported_or_non_exported_2383", message: "Overload signatures must all be exported or non-exported." },
         Overload_signatures_must_all_be_ambient_or_non_ambient: { code: 2384, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_ambient_or_non_ambient_2384", message: "Overload signatures must all be ambient or non-ambient." },
         Overload_signatures_must_all_be_public_private_or_protected: { code: 2385, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_public_private_or_protected_2385", message: "Overload signatures must all be public, private or protected." },
         Overload_signatures_must_all_be_optional_or_required: { code: 2386, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_optional_or_required_2386", message: "Overload signatures must all be optional or required." },
@@ -1549,7 +1656,6 @@ var ts;
         Class_name_cannot_be_0: { code: 2414, category: ts.DiagnosticCategory.Error, key: "Class_name_cannot_be_0_2414", message: "Class name cannot be '{0}'" },
         Class_0_incorrectly_extends_base_class_1: { code: 2415, category: ts.DiagnosticCategory.Error, key: "Class_0_incorrectly_extends_base_class_1_2415", message: "Class '{0}' incorrectly extends base class '{1}'." },
         Class_static_side_0_incorrectly_extends_base_class_static_side_1: { code: 2417, category: ts.DiagnosticCategory.Error, key: "Class_static_side_0_incorrectly_extends_base_class_static_side_1_2417", message: "Class static side '{0}' incorrectly extends base class static side '{1}'." },
-        Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0: { code: 2419, category: ts.DiagnosticCategory.Error, key: "Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0_2419", message: "Type name '{0}' in extends clause does not reference constructor function for '{0}'." },
         Class_0_incorrectly_implements_interface_1: { code: 2420, category: ts.DiagnosticCategory.Error, key: "Class_0_incorrectly_implements_interface_1_2420", message: "Class '{0}' incorrectly implements interface '{1}'." },
         A_class_may_only_implement_another_class_or_interface: { code: 2422, category: ts.DiagnosticCategory.Error, key: "A_class_may_only_implement_another_class_or_interface_2422", message: "A class may only implement another class or interface." },
         Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor: { code: 2423, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_access_2423", message: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member accessor." },
@@ -1557,7 +1663,7 @@ var ts;
         Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2425, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_functi_2425", message: "Class '{0}' defines instance member property '{1}', but extended class '{2}' defines it as instance member function." },
         Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2426, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_functi_2426", message: "Class '{0}' defines instance member accessor '{1}', but extended class '{2}' defines it as instance member function." },
         Interface_name_cannot_be_0: { code: 2427, category: ts.DiagnosticCategory.Error, key: "Interface_name_cannot_be_0_2427", message: "Interface name cannot be '{0}'" },
-        All_declarations_of_an_interface_must_have_identical_type_parameters: { code: 2428, category: ts.DiagnosticCategory.Error, key: "All_declarations_of_an_interface_must_have_identical_type_parameters_2428", message: "All declarations of an interface must have identical type parameters." },
+        All_declarations_of_0_must_have_identical_type_parameters: { code: 2428, category: ts.DiagnosticCategory.Error, key: "All_declarations_of_0_must_have_identical_type_parameters_2428", message: "All declarations of '{0}' must have identical type parameters." },
         Interface_0_incorrectly_extends_interface_1: { code: 2430, category: ts.DiagnosticCategory.Error, key: "Interface_0_incorrectly_extends_interface_1_2430", message: "Interface '{0}' incorrectly extends interface '{1}'." },
         Enum_name_cannot_be_0: { code: 2431, category: ts.DiagnosticCategory.Error, key: "Enum_name_cannot_be_0_2431", message: "Enum name cannot be '{0}'" },
         In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element: { code: 2432, category: ts.DiagnosticCategory.Error, key: "In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enu_2432", message: "In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element." },
@@ -1577,11 +1683,12 @@ var ts;
         Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: { code: 2446, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1_2446", message: "Property '{0}' is protected and only accessible through an instance of class '{1}'." },
         The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: { code: 2447, category: ts.DiagnosticCategory.Error, key: "The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead_2447", message: "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead." },
         Block_scoped_variable_0_used_before_its_declaration: { code: 2448, category: ts.DiagnosticCategory.Error, key: "Block_scoped_variable_0_used_before_its_declaration_2448", message: "Block-scoped variable '{0}' used before its declaration." },
-        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant: { code: 2449, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_2449", message: "The operand of an increment or decrement operator cannot be a constant." },
-        Left_hand_side_of_assignment_expression_cannot_be_a_constant: { code: 2450, category: ts.DiagnosticCategory.Error, key: "Left_hand_side_of_assignment_expression_cannot_be_a_constant_2450", message: "Left-hand side of assignment expression cannot be a constant." },
+        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property: { code: 2449, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property_2449", message: "The operand of an increment or decrement operator cannot be a constant or a read-only property." },
+        Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property: { code: 2450, category: ts.DiagnosticCategory.Error, key: "Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property_2450", message: "Left-hand side of assignment expression cannot be a constant or a read-only property." },
         Cannot_redeclare_block_scoped_variable_0: { code: 2451, category: ts.DiagnosticCategory.Error, key: "Cannot_redeclare_block_scoped_variable_0_2451", message: "Cannot redeclare block-scoped variable '{0}'." },
         An_enum_member_cannot_have_a_numeric_name: { code: 2452, category: ts.DiagnosticCategory.Error, key: "An_enum_member_cannot_have_a_numeric_name_2452", message: "An enum member cannot have a numeric name." },
         The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: { code: 2453, category: ts.DiagnosticCategory.Error, key: "The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_typ_2453", message: "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly." },
+        Variable_0_is_used_before_being_assigned: { code: 2454, category: ts.DiagnosticCategory.Error, key: "Variable_0_is_used_before_being_assigned_2454", message: "Variable '{0}' is used before being assigned." },
         Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0: { code: 2455, category: ts.DiagnosticCategory.Error, key: "Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0_2455", message: "Type argument candidate '{1}' is not a valid type argument because it is not a supertype of candidate '{0}'." },
         Type_alias_0_circularly_references_itself: { code: 2456, category: ts.DiagnosticCategory.Error, key: "Type_alias_0_circularly_references_itself_2456", message: "Type alias '{0}' circularly references itself." },
         Type_alias_name_cannot_be_0: { code: 2457, category: ts.DiagnosticCategory.Error, key: "Type_alias_name_cannot_be_0_2457", message: "Type alias name cannot be '{0}'" },
@@ -1611,8 +1718,8 @@ var ts;
         Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: { code: 2481, category: ts.DiagnosticCategory.Error, key: "Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1_2481", message: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'." },
         The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation_2483", message: "The left-hand side of a 'for...of' statement cannot use a type annotation." },
         Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: ts.DiagnosticCategory.Error, key: "Export_declaration_conflicts_with_exported_declaration_of_0_2484", message: "Export declaration conflicts with exported declaration of '{0}'" },
-        The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant: { code: 2485, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant_2485", message: "The left-hand side of a 'for...of' statement cannot be a previously defined constant." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant: { code: 2486, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant_2486", message: "The left-hand side of a 'for...in' statement cannot be a previously defined constant." },
+        The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property: { code: 2485, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property_2485", message: "The left-hand side of a 'for...of' statement cannot be a constant or a read-only property." },
+        The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property: { code: 2486, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property_2486", message: "The left-hand side of a 'for...in' statement cannot be a constant or a read-only property." },
         Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_of_statement_2487", message: "Invalid left-hand side in 'for...of' statement." },
         Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: ts.DiagnosticCategory.Error, key: "Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator_2488", message: "Type must have a '[Symbol.iterator]()' method that returns an iterator." },
         An_iterator_must_have_a_next_method: { code: 2489, category: ts.DiagnosticCategory.Error, key: "An_iterator_must_have_a_next_method_2489", message: "An iterator must have a 'next()' method." },
@@ -1638,7 +1745,7 @@ var ts;
         Base_constructor_return_type_0_is_not_a_class_or_interface_type: { code: 2509, category: ts.DiagnosticCategory.Error, key: "Base_constructor_return_type_0_is_not_a_class_or_interface_type_2509", message: "Base constructor return type '{0}' is not a class or interface type." },
         Base_constructors_must_all_have_the_same_return_type: { code: 2510, category: ts.DiagnosticCategory.Error, key: "Base_constructors_must_all_have_the_same_return_type_2510", message: "Base constructors must all have the same return type." },
         Cannot_create_an_instance_of_the_abstract_class_0: { code: 2511, category: ts.DiagnosticCategory.Error, key: "Cannot_create_an_instance_of_the_abstract_class_0_2511", message: "Cannot create an instance of the abstract class '{0}'." },
-        Overload_signatures_must_all_be_abstract_or_not_abstract: { code: 2512, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_abstract_or_not_abstract_2512", message: "Overload signatures must all be abstract or not abstract." },
+        Overload_signatures_must_all_be_abstract_or_non_abstract: { code: 2512, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_abstract_or_non_abstract_2512", message: "Overload signatures must all be abstract or non-abstract." },
         Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression: { code: 2513, category: ts.DiagnosticCategory.Error, key: "Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression_2513", message: "Abstract method '{0}' in class '{1}' cannot be accessed via super expression." },
         Classes_containing_abstract_methods_must_be_marked_abstract: { code: 2514, category: ts.DiagnosticCategory.Error, key: "Classes_containing_abstract_methods_must_be_marked_abstract_2514", message: "Classes containing abstract methods must be marked abstract." },
         Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2: { code: 2515, category: ts.DiagnosticCategory.Error, key: "Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2_2515", message: "Non-abstract class '{0}' does not implement inherited abstract member '{1}' from class '{2}'." },
@@ -1654,6 +1761,9 @@ var ts;
         A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface: { code: 2526, category: ts.DiagnosticCategory.Error, key: "A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface_2526", message: "A 'this' type is available only in a non-static member of a class or interface." },
         The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary: { code: 2527, category: ts.DiagnosticCategory.Error, key: "The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary_2527", message: "The inferred type of '{0}' references an inaccessible 'this' type. A type annotation is necessary." },
         A_module_cannot_have_multiple_default_exports: { code: 2528, category: ts.DiagnosticCategory.Error, key: "A_module_cannot_have_multiple_default_exports_2528", message: "A module cannot have multiple default exports." },
+        Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_functions: { code: 2529, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_func_2529", message: "Duplicate identifier '{0}'. Compiler reserves name '{1}' in top level scope of a module containing async functions." },
+        Property_0_is_incompatible_with_index_signature: { code: 2530, category: ts.DiagnosticCategory.Error, key: "Property_0_is_incompatible_with_index_signature_2530", message: "Property '{0}' is incompatible with index signature." },
+        Object_is_possibly_null_or_undefined: { code: 2531, category: ts.DiagnosticCategory.Error, key: "Object_is_possibly_null_or_undefined_2531", message: "Object is possibly 'null' or 'undefined'." },
         JSX_element_attributes_type_0_may_not_be_a_union_type: { code: 2600, category: ts.DiagnosticCategory.Error, key: "JSX_element_attributes_type_0_may_not_be_a_union_type_2600", message: "JSX element attributes type '{0}' may not be a union type." },
         The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: { code: 2601, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_a_JSX_element_constructor_must_return_an_object_type_2601", message: "The return type of a JSX element constructor must return an object type." },
         JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist: { code: 2602, category: ts.DiagnosticCategory.Error, key: "JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist_2602", message: "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist." },
@@ -1683,6 +1793,21 @@ var ts;
         export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always_visible: { code: 2668, category: ts.DiagnosticCategory.Error, key: "export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always__2668", message: "'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible." },
         Augmentations_for_the_global_scope_can_only_be_directly_nested_in_external_modules_or_ambient_module_declarations: { code: 2669, category: ts.DiagnosticCategory.Error, key: "Augmentations_for_the_global_scope_can_only_be_directly_nested_in_external_modules_or_ambient_module_2669", message: "Augmentations for the global scope can only be directly nested in external modules or ambient module declarations." },
         Augmentations_for_the_global_scope_should_have_declare_modifier_unless_they_appear_in_already_ambient_context: { code: 2670, category: ts.DiagnosticCategory.Error, key: "Augmentations_for_the_global_scope_should_have_declare_modifier_unless_they_appear_in_already_ambien_2670", message: "Augmentations for the global scope should have 'declare' modifier unless they appear in already ambient context." },
+        Cannot_augment_module_0_because_it_resolves_to_a_non_module_entity: { code: 2671, category: ts.DiagnosticCategory.Error, key: "Cannot_augment_module_0_because_it_resolves_to_a_non_module_entity_2671", message: "Cannot augment module '{0}' because it resolves to a non-module entity." },
+        Cannot_assign_a_0_constructor_type_to_a_1_constructor_type: { code: 2672, category: ts.DiagnosticCategory.Error, key: "Cannot_assign_a_0_constructor_type_to_a_1_constructor_type_2672", message: "Cannot assign a '{0}' constructor type to a '{1}' constructor type." },
+        Constructor_of_class_0_is_private_and_only_accessible_within_the_class_declaration: { code: 2673, category: ts.DiagnosticCategory.Error, key: "Constructor_of_class_0_is_private_and_only_accessible_within_the_class_declaration_2673", message: "Constructor of class '{0}' is private and only accessible within the class declaration." },
+        Constructor_of_class_0_is_protected_and_only_accessible_within_the_class_declaration: { code: 2674, category: ts.DiagnosticCategory.Error, key: "Constructor_of_class_0_is_protected_and_only_accessible_within_the_class_declaration_2674", message: "Constructor of class '{0}' is protected and only accessible within the class declaration." },
+        Cannot_extend_a_class_0_Class_constructor_is_marked_as_private: { code: 2675, category: ts.DiagnosticCategory.Error, key: "Cannot_extend_a_class_0_Class_constructor_is_marked_as_private_2675", message: "Cannot extend a class '{0}'. Class constructor is marked as private." },
+        Accessors_must_both_be_abstract_or_non_abstract: { code: 2676, category: ts.DiagnosticCategory.Error, key: "Accessors_must_both_be_abstract_or_non_abstract_2676", message: "Accessors must both be abstract or non-abstract." },
+        A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type: { code: 2677, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type_2677", message: "A type predicate's type must be assignable to its parameter's type." },
+        Type_0_is_not_comparable_to_type_1: { code: 2678, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_comparable_to_type_1_2678", message: "Type '{0}' is not comparable to type '{1}'." },
+        A_function_that_is_called_with_the_new_keyword_cannot_have_a_this_type_that_is_void: { code: 2679, category: ts.DiagnosticCategory.Error, key: "A_function_that_is_called_with_the_new_keyword_cannot_have_a_this_type_that_is_void_2679", message: "A function that is called with the 'new' keyword cannot have a 'this' type that is 'void'." },
+        A_this_parameter_must_be_the_first_parameter: { code: 2680, category: ts.DiagnosticCategory.Error, key: "A_this_parameter_must_be_the_first_parameter_2680", message: "A 'this' parameter must be the first parameter." },
+        A_constructor_cannot_have_a_this_parameter: { code: 2681, category: ts.DiagnosticCategory.Error, key: "A_constructor_cannot_have_a_this_parameter_2681", message: "A constructor cannot have a 'this' parameter." },
+        A_setter_cannot_have_a_this_parameter: { code: 2682, category: ts.DiagnosticCategory.Error, key: "A_setter_cannot_have_a_this_parameter_2682", message: "A setter cannot have a 'this' parameter." },
+        this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation: { code: 2683, category: ts.DiagnosticCategory.Error, key: "this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_2683", message: "'this' implicitly has type 'any' because it does not have a type annotation." },
+        The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1: { code: 2684, category: ts.DiagnosticCategory.Error, key: "The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1_2684", message: "The 'this' context of type '{0}' is not assignable to method's 'this' of type '{1}'." },
+        The_this_types_of_each_signature_are_incompatible: { code: 2685, category: ts.DiagnosticCategory.Error, key: "The_this_types_of_each_signature_are_incompatible_2685", message: "The 'this' types of each signature are incompatible." },
         Import_declaration_0_is_using_private_name_1: { code: 4000, category: ts.DiagnosticCategory.Error, key: "Import_declaration_0_is_using_private_name_1_4000", message: "Import declaration '{0}' is using private name '{1}'." },
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", message: "Type parameter '{0}' of exported class has or is using private name '{1}'." },
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", message: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
@@ -1753,6 +1878,7 @@ var ts;
         Parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4078, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_exported_function_has_or_is_using_private_name_1_4078", message: "Parameter '{0}' of exported function has or is using private name '{1}'." },
         Exported_type_alias_0_has_or_is_using_private_name_1: { code: 4081, category: ts.DiagnosticCategory.Error, key: "Exported_type_alias_0_has_or_is_using_private_name_1_4081", message: "Exported type alias '{0}' has or is using private name '{1}'." },
         Default_export_of_the_module_has_or_is_using_private_name_0: { code: 4082, category: ts.DiagnosticCategory.Error, key: "Default_export_of_the_module_has_or_is_using_private_name_0_4082", message: "Default export of the module has or is using private name '{0}'." },
+        Conflicting_library_definitions_for_0_found_at_1_and_2_Copy_the_correct_file_to_the_typings_folder_to_resolve_this_conflict: { code: 4090, category: ts.DiagnosticCategory.Message, key: "Conflicting_library_definitions_for_0_found_at_1_and_2_Copy_the_correct_file_to_the_typings_folder_t_4090", message: "Conflicting library definitions for '{0}' found at '{1}' and '{2}'. Copy the correct file to the 'typings' folder to resolve this conflict." },
         The_current_host_does_not_support_the_0_option: { code: 5001, category: ts.DiagnosticCategory.Error, key: "The_current_host_does_not_support_the_0_option_5001", message: "The current host does not support the '{0}' option." },
         Cannot_find_the_common_subdirectory_path_for_the_input_files: { code: 5009, category: ts.DiagnosticCategory.Error, key: "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", message: "Cannot find the common subdirectory path for the input files." },
         Cannot_read_file_0_Colon_1: { code: 5012, category: ts.DiagnosticCategory.Error, key: "Cannot_read_file_0_Colon_1_5012", message: "Cannot read file '{0}': {1}" },
@@ -1771,11 +1897,14 @@ var ts;
         Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files: { code: 5056, category: ts.DiagnosticCategory.Error, key: "Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files_5056", message: "Cannot write file '{0}' because it would be overwritten by multiple input files." },
         Cannot_find_a_tsconfig_json_file_at_the_specified_directory_Colon_0: { code: 5057, category: ts.DiagnosticCategory.Error, key: "Cannot_find_a_tsconfig_json_file_at_the_specified_directory_Colon_0_5057", message: "Cannot find a tsconfig.json file at the specified directory: '{0}'" },
         The_specified_path_does_not_exist_Colon_0: { code: 5058, category: ts.DiagnosticCategory.Error, key: "The_specified_path_does_not_exist_Colon_0_5058", message: "The specified path does not exist: '{0}'" },
-        Invalide_value_for_reactNamespace_0_is_not_a_valid_identifier: { code: 5059, category: ts.DiagnosticCategory.Error, key: "Invalide_value_for_reactNamespace_0_is_not_a_valid_identifier_5059", message: "Invalide value for '--reactNamespace'. '{0}' is not a valid identifier." },
+        Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier: { code: 5059, category: ts.DiagnosticCategory.Error, key: "Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier_5059", message: "Invalid value for '--reactNamespace'. '{0}' is not a valid identifier." },
+        Option_paths_cannot_be_used_without_specifying_baseUrl_option: { code: 5060, category: ts.DiagnosticCategory.Error, key: "Option_paths_cannot_be_used_without_specifying_baseUrl_option_5060", message: "Option 'paths' cannot be used without specifying '--baseUrl' option." },
+        Pattern_0_can_have_at_most_one_Asterisk_character: { code: 5061, category: ts.DiagnosticCategory.Error, key: "Pattern_0_can_have_at_most_one_Asterisk_character_5061", message: "Pattern '{0}' can have at most one '*' character" },
+        Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character: { code: 5062, category: ts.DiagnosticCategory.Error, key: "Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character_5062", message: "Substitution '{0}' in pattern '{1}' in can have at most one '*' character" },
         Concatenate_and_emit_output_to_single_file: { code: 6001, category: ts.DiagnosticCategory.Message, key: "Concatenate_and_emit_output_to_single_file_6001", message: "Concatenate and emit output to single file." },
         Generates_corresponding_d_ts_file: { code: 6002, category: ts.DiagnosticCategory.Message, key: "Generates_corresponding_d_ts_file_6002", message: "Generates corresponding '.d.ts' file." },
-        Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: ts.DiagnosticCategory.Message, key: "Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations_6003", message: "Specifies the location where debugger should locate map files instead of generated locations." },
-        Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: { code: 6004, category: ts.DiagnosticCategory.Message, key: "Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations_6004", message: "Specifies the location where debugger should locate TypeScript files instead of source locations." },
+        Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: ts.DiagnosticCategory.Message, key: "Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations_6003", message: "Specify the location where debugger should locate map files instead of generated locations." },
+        Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: { code: 6004, category: ts.DiagnosticCategory.Message, key: "Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations_6004", message: "Specify the location where debugger should locate TypeScript files instead of source locations." },
         Watch_input_files: { code: 6005, category: ts.DiagnosticCategory.Message, key: "Watch_input_files_6005", message: "Watch input files." },
         Redirect_output_structure_to_the_directory: { code: 6006, category: ts.DiagnosticCategory.Message, key: "Redirect_output_structure_to_the_directory_6006", message: "Redirect output structure to the directory." },
         Do_not_erase_const_enum_declarations_in_generated_code: { code: 6007, category: ts.DiagnosticCategory.Message, key: "Do_not_erase_const_enum_declarations_in_generated_code_6007", message: "Do not erase const enum declarations in generated code." },
@@ -1783,7 +1912,7 @@ var ts;
         Do_not_emit_comments_to_output: { code: 6009, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_comments_to_output_6009", message: "Do not emit comments to output." },
         Do_not_emit_outputs: { code: 6010, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_outputs_6010", message: "Do not emit outputs." },
         Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking: { code: 6011, category: ts.DiagnosticCategory.Message, key: "Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typech_6011", message: "Allow default imports from modules with no default export. This does not affect code emit, just typechecking." },
-        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental: { code: 6015, category: ts.DiagnosticCategory.Message, key: "Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental_6015", message: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES2015' (experimental)" },
+        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015: { code: 6015, category: ts.DiagnosticCategory.Message, key: "Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_6015", message: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES2015'" },
         Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015: { code: 6016, category: ts.DiagnosticCategory.Message, key: "Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015_6016", message: "Specify module code generation: 'commonjs', 'amd', 'system', 'umd' or 'es2015'" },
         Print_this_message: { code: 6017, category: ts.DiagnosticCategory.Message, key: "Print_this_message_6017", message: "Print this message." },
         Print_the_compiler_s_version: { code: 6019, category: ts.DiagnosticCategory.Message, key: "Print_the_compiler_s_version_6019", message: "Print the compiler's version." },
@@ -1805,8 +1934,7 @@ var ts;
         Generates_corresponding_map_file: { code: 6043, category: ts.DiagnosticCategory.Message, key: "Generates_corresponding_map_file_6043", message: "Generates corresponding '.map' file." },
         Compiler_option_0_expects_an_argument: { code: 6044, category: ts.DiagnosticCategory.Error, key: "Compiler_option_0_expects_an_argument_6044", message: "Compiler option '{0}' expects an argument." },
         Unterminated_quoted_string_in_response_file_0: { code: 6045, category: ts.DiagnosticCategory.Error, key: "Unterminated_quoted_string_in_response_file_0_6045", message: "Unterminated quoted string in response file '{0}'." },
-        Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015: { code: 6046, category: ts.DiagnosticCategory.Error, key: "Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015_6046", message: "Argument for '--module' option must be 'commonjs', 'amd', 'system', 'umd', or 'es2015'." },
-        Argument_for_target_option_must_be_ES3_ES5_or_ES2015: { code: 6047, category: ts.DiagnosticCategory.Error, key: "Argument_for_target_option_must_be_ES3_ES5_or_ES2015_6047", message: "Argument for '--target' option must be 'ES3', 'ES5', or 'ES2015'." },
+        Argument_for_0_option_must_be_Colon_1: { code: 6046, category: ts.DiagnosticCategory.Error, key: "Argument_for_0_option_must_be_Colon_1_6046", message: "Argument for '{0}' option must be: {1}" },
         Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1: { code: 6048, category: ts.DiagnosticCategory.Error, key: "Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1_6048", message: "Locale must be of the form <language> or <language>-<territory>. For example '{0}' or '{1}'." },
         Unsupported_locale_0: { code: 6049, category: ts.DiagnosticCategory.Error, key: "Unsupported_locale_0_6049", message: "Unsupported locale '{0}'." },
         Unable_to_open_file_0: { code: 6050, category: ts.DiagnosticCategory.Error, key: "Unable_to_open_file_0_6050", message: "Unable to open file '{0}'." },
@@ -1816,16 +1944,15 @@ var ts;
         File_0_has_unsupported_extension_The_only_supported_extensions_are_1: { code: 6054, category: ts.DiagnosticCategory.Error, key: "File_0_has_unsupported_extension_The_only_supported_extensions_are_1_6054", message: "File '{0}' has unsupported extension. The only supported extensions are {1}." },
         Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures: { code: 6055, category: ts.DiagnosticCategory.Message, key: "Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures_6055", message: "Suppress noImplicitAny errors for indexing objects lacking index signatures." },
         Do_not_emit_declarations_for_code_that_has_an_internal_annotation: { code: 6056, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_declarations_for_code_that_has_an_internal_annotation_6056", message: "Do not emit declarations for code that has an '@internal' annotation." },
-        Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir: { code: 6058, category: ts.DiagnosticCategory.Message, key: "Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDi_6058", message: "Specifies the root directory of input files. Use to control the output directory structure with --outDir." },
+        Specify_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir: { code: 6058, category: ts.DiagnosticCategory.Message, key: "Specify_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir_6058", message: "Specify the root directory of input files. Use to control the output directory structure with --outDir." },
         File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files: { code: 6059, category: ts.DiagnosticCategory.Error, key: "File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files_6059", message: "File '{0}' is not under 'rootDir' '{1}'. 'rootDir' is expected to contain all source files." },
-        Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix: { code: 6060, category: ts.DiagnosticCategory.Message, key: "Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix_6060", message: "Specifies the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix)." },
+        Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix: { code: 6060, category: ts.DiagnosticCategory.Message, key: "Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix_6060", message: "Specify the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix)." },
         NEWLINE: { code: 6061, category: ts.DiagnosticCategory.Message, key: "NEWLINE_6061", message: "NEWLINE" },
-        Argument_for_newLine_option_must_be_CRLF_or_LF: { code: 6062, category: ts.DiagnosticCategory.Error, key: "Argument_for_newLine_option_must_be_CRLF_or_LF_6062", message: "Argument for '--newLine' option must be 'CRLF' or 'LF'." },
-        Argument_for_moduleResolution_option_must_be_node_or_classic: { code: 6063, category: ts.DiagnosticCategory.Error, key: "Argument_for_moduleResolution_option_must_be_node_or_classic_6063", message: "Argument for '--moduleResolution' option must be 'node' or 'classic'." },
+        Option_0_can_only_be_specified_in_tsconfig_json_file: { code: 6064, category: ts.DiagnosticCategory.Error, key: "Option_0_can_only_be_specified_in_tsconfig_json_file_6064", message: "Option '{0}' can only be specified in 'tsconfig.json' file." },
         Enables_experimental_support_for_ES7_decorators: { code: 6065, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_ES7_decorators_6065", message: "Enables experimental support for ES7 decorators." },
         Enables_experimental_support_for_emitting_type_metadata_for_decorators: { code: 6066, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_emitting_type_metadata_for_decorators_6066", message: "Enables experimental support for emitting type metadata for decorators." },
         Enables_experimental_support_for_ES7_async_functions: { code: 6068, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_ES7_async_functions_6068", message: "Enables experimental support for ES7 async functions." },
-        Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6: { code: 6069, category: ts.DiagnosticCategory.Message, key: "Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6_6069", message: "Specifies module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6)." },
+        Specify_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6: { code: 6069, category: ts.DiagnosticCategory.Message, key: "Specify_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6_6069", message: "Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6)." },
         Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file: { code: 6070, category: ts.DiagnosticCategory.Message, key: "Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file_6070", message: "Initializes a TypeScript project and creates a tsconfig.json file." },
         Successfully_created_a_tsconfig_json_file: { code: 6071, category: ts.DiagnosticCategory.Message, key: "Successfully_created_a_tsconfig_json_file_6071", message: "Successfully created a tsconfig.json file." },
         Suppress_excess_property_checks_for_object_literals: { code: 6072, category: ts.DiagnosticCategory.Message, key: "Suppress_excess_property_checks_for_object_literals_6072", message: "Suppress excess property checks for object literals." },
@@ -1835,11 +1962,55 @@ var ts;
         Report_errors_for_fallthrough_cases_in_switch_statement: { code: 6076, category: ts.DiagnosticCategory.Message, key: "Report_errors_for_fallthrough_cases_in_switch_statement_6076", message: "Report errors for fallthrough cases in switch statement." },
         Do_not_report_errors_on_unreachable_code: { code: 6077, category: ts.DiagnosticCategory.Message, key: "Do_not_report_errors_on_unreachable_code_6077", message: "Do not report errors on unreachable code." },
         Disallow_inconsistently_cased_references_to_the_same_file: { code: 6078, category: ts.DiagnosticCategory.Message, key: "Disallow_inconsistently_cased_references_to_the_same_file_6078", message: "Disallow inconsistently-cased references to the same file." },
+        Specify_library_files_to_be_included_in_the_compilation_Colon: { code: 6079, category: ts.DiagnosticCategory.Message, key: "Specify_library_files_to_be_included_in_the_compilation_Colon_6079", message: "Specify library files to be included in the compilation: " },
         Specify_JSX_code_generation_Colon_preserve_or_react: { code: 6080, category: ts.DiagnosticCategory.Message, key: "Specify_JSX_code_generation_Colon_preserve_or_react_6080", message: "Specify JSX code generation: 'preserve' or 'react'" },
-        Argument_for_jsx_must_be_preserve_or_react: { code: 6081, category: ts.DiagnosticCategory.Message, key: "Argument_for_jsx_must_be_preserve_or_react_6081", message: "Argument for '--jsx' must be 'preserve' or 'react'." },
         Only_amd_and_system_modules_are_supported_alongside_0: { code: 6082, category: ts.DiagnosticCategory.Error, key: "Only_amd_and_system_modules_are_supported_alongside_0_6082", message: "Only 'amd' and 'system' modules are supported alongside --{0}." },
-        Allow_javascript_files_to_be_compiled: { code: 6083, category: ts.DiagnosticCategory.Message, key: "Allow_javascript_files_to_be_compiled_6083", message: "Allow javascript files to be compiled." },
-        Specifies_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit: { code: 6084, category: ts.DiagnosticCategory.Message, key: "Specifies_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit_6084", message: "Specifies the object invoked for createElement and __spread when targeting 'react' JSX emit" },
+        Base_directory_to_resolve_non_absolute_module_names: { code: 6083, category: ts.DiagnosticCategory.Message, key: "Base_directory_to_resolve_non_absolute_module_names_6083", message: "Base directory to resolve non-absolute module names." },
+        Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit: { code: 6084, category: ts.DiagnosticCategory.Message, key: "Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit_6084", message: "Specify the object invoked for createElement and __spread when targeting 'react' JSX emit" },
+        Enable_tracing_of_the_name_resolution_process: { code: 6085, category: ts.DiagnosticCategory.Message, key: "Enable_tracing_of_the_name_resolution_process_6085", message: "Enable tracing of the name resolution process." },
+        Resolving_module_0_from_1: { code: 6086, category: ts.DiagnosticCategory.Message, key: "Resolving_module_0_from_1_6086", message: "======== Resolving module '{0}' from '{1}'. ========" },
+        Explicitly_specified_module_resolution_kind_Colon_0: { code: 6087, category: ts.DiagnosticCategory.Message, key: "Explicitly_specified_module_resolution_kind_Colon_0_6087", message: "Explicitly specified module resolution kind: '{0}'." },
+        Module_resolution_kind_is_not_specified_using_0: { code: 6088, category: ts.DiagnosticCategory.Message, key: "Module_resolution_kind_is_not_specified_using_0_6088", message: "Module resolution kind is not specified, using '{0}'." },
+        Module_name_0_was_successfully_resolved_to_1: { code: 6089, category: ts.DiagnosticCategory.Message, key: "Module_name_0_was_successfully_resolved_to_1_6089", message: "======== Module name '{0}' was successfully resolved to '{1}'. ========" },
+        Module_name_0_was_not_resolved: { code: 6090, category: ts.DiagnosticCategory.Message, key: "Module_name_0_was_not_resolved_6090", message: "======== Module name '{0}' was not resolved. ========" },
+        paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0: { code: 6091, category: ts.DiagnosticCategory.Message, key: "paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0_6091", message: "'paths' option is specified, looking for a pattern to match module name '{0}'." },
+        Module_name_0_matched_pattern_1: { code: 6092, category: ts.DiagnosticCategory.Message, key: "Module_name_0_matched_pattern_1_6092", message: "Module name '{0}', matched pattern '{1}'." },
+        Trying_substitution_0_candidate_module_location_Colon_1: { code: 6093, category: ts.DiagnosticCategory.Message, key: "Trying_substitution_0_candidate_module_location_Colon_1_6093", message: "Trying substitution '{0}', candidate module location: '{1}'." },
+        Resolving_module_name_0_relative_to_base_url_1_2: { code: 6094, category: ts.DiagnosticCategory.Message, key: "Resolving_module_name_0_relative_to_base_url_1_2_6094", message: "Resolving module name '{0}' relative to base url '{1}' - '{2}'." },
+        Loading_module_as_file_Slash_folder_candidate_module_location_0: { code: 6095, category: ts.DiagnosticCategory.Message, key: "Loading_module_as_file_Slash_folder_candidate_module_location_0_6095", message: "Loading module as file / folder, candidate module location '{0}'." },
+        File_0_does_not_exist: { code: 6096, category: ts.DiagnosticCategory.Message, key: "File_0_does_not_exist_6096", message: "File '{0}' does not exist." },
+        File_0_exist_use_it_as_a_name_resolution_result: { code: 6097, category: ts.DiagnosticCategory.Message, key: "File_0_exist_use_it_as_a_name_resolution_result_6097", message: "File '{0}' exist - use it as a name resolution result." },
+        Loading_module_0_from_node_modules_folder: { code: 6098, category: ts.DiagnosticCategory.Message, key: "Loading_module_0_from_node_modules_folder_6098", message: "Loading module '{0}' from 'node_modules' folder." },
+        Found_package_json_at_0: { code: 6099, category: ts.DiagnosticCategory.Message, key: "Found_package_json_at_0_6099", message: "Found 'package.json' at '{0}'." },
+        package_json_does_not_have_types_field: { code: 6100, category: ts.DiagnosticCategory.Message, key: "package_json_does_not_have_types_field_6100", message: "'package.json' does not have 'types' field." },
+        package_json_has_0_field_1_that_references_2: { code: 6101, category: ts.DiagnosticCategory.Message, key: "package_json_has_0_field_1_that_references_2_6101", message: "'package.json' has '{0}' field '{1}' that references '{2}'." },
+        Allow_javascript_files_to_be_compiled: { code: 6102, category: ts.DiagnosticCategory.Message, key: "Allow_javascript_files_to_be_compiled_6102", message: "Allow javascript files to be compiled." },
+        Option_0_should_have_array_of_strings_as_a_value: { code: 6103, category: ts.DiagnosticCategory.Error, key: "Option_0_should_have_array_of_strings_as_a_value_6103", message: "Option '{0}' should have array of strings as a value." },
+        Checking_if_0_is_the_longest_matching_prefix_for_1_2: { code: 6104, category: ts.DiagnosticCategory.Message, key: "Checking_if_0_is_the_longest_matching_prefix_for_1_2_6104", message: "Checking if '{0}' is the longest matching prefix for '{1}' - '{2}'." },
+        Expected_type_of_0_field_in_package_json_to_be_string_got_1: { code: 6105, category: ts.DiagnosticCategory.Message, key: "Expected_type_of_0_field_in_package_json_to_be_string_got_1_6105", message: "Expected type of '{0}' field in 'package.json' to be 'string', got '{1}'." },
+        baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1: { code: 6106, category: ts.DiagnosticCategory.Message, key: "baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1_6106", message: "'baseUrl' option is set to '{0}', using this value to resolve non-relative module name '{1}'" },
+        rootDirs_option_is_set_using_it_to_resolve_relative_module_name_0: { code: 6107, category: ts.DiagnosticCategory.Message, key: "rootDirs_option_is_set_using_it_to_resolve_relative_module_name_0_6107", message: "'rootDirs' option is set, using it to resolve relative module name '{0}'" },
+        Longest_matching_prefix_for_0_is_1: { code: 6108, category: ts.DiagnosticCategory.Message, key: "Longest_matching_prefix_for_0_is_1_6108", message: "Longest matching prefix for '{0}' is '{1}'" },
+        Loading_0_from_the_root_dir_1_candidate_location_2: { code: 6109, category: ts.DiagnosticCategory.Message, key: "Loading_0_from_the_root_dir_1_candidate_location_2_6109", message: "Loading '{0}' from the root dir '{1}', candidate location '{2}'" },
+        Trying_other_entries_in_rootDirs: { code: 6110, category: ts.DiagnosticCategory.Message, key: "Trying_other_entries_in_rootDirs_6110", message: "Trying other entries in 'rootDirs'" },
+        Module_resolution_using_rootDirs_has_failed: { code: 6111, category: ts.DiagnosticCategory.Message, key: "Module_resolution_using_rootDirs_has_failed_6111", message: "Module resolution using 'rootDirs' has failed" },
+        Do_not_emit_use_strict_directives_in_module_output: { code: 6112, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_use_strict_directives_in_module_output_6112", message: "Do not emit 'use strict' directives in module output." },
+        Enable_strict_null_checks: { code: 6113, category: ts.DiagnosticCategory.Message, key: "Enable_strict_null_checks_6113", message: "Enable strict null checks." },
+        Unknown_option_excludes_Did_you_mean_exclude: { code: 6114, category: ts.DiagnosticCategory.Error, key: "Unknown_option_excludes_Did_you_mean_exclude_6114", message: "Unknown option 'excludes'. Did you mean 'exclude'?" },
+        Raise_error_on_this_expressions_with_an_implied_any_type: { code: 6115, category: ts.DiagnosticCategory.Message, key: "Raise_error_on_this_expressions_with_an_implied_any_type_6115", message: "Raise error on 'this' expressions with an implied 'any' type." },
+        Resolving_type_reference_directive_0_containing_file_1_root_directory_2: { code: 6116, category: ts.DiagnosticCategory.Message, key: "Resolving_type_reference_directive_0_containing_file_1_root_directory_2_6116", message: "======== Resolving type reference directive '{0}', containing file '{1}', root directory '{2}'. ========" },
+        Resolving_using_primary_search_paths: { code: 6117, category: ts.DiagnosticCategory.Message, key: "Resolving_using_primary_search_paths_6117", message: "Resolving using primary search paths..." },
+        Resolving_from_node_modules_folder: { code: 6118, category: ts.DiagnosticCategory.Message, key: "Resolving_from_node_modules_folder_6118", message: "Resolving from node_modules folder..." },
+        Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2: { code: 6119, category: ts.DiagnosticCategory.Message, key: "Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2_6119", message: "======== Type reference directive '{0}' was successfully resolved to '{1}', primary: {2}. ========" },
+        Type_reference_directive_0_was_not_resolved: { code: 6120, category: ts.DiagnosticCategory.Message, key: "Type_reference_directive_0_was_not_resolved_6120", message: "======== Type reference directive '{0}' was not resolved. ========" },
+        Resolving_with_primary_search_path_0: { code: 6121, category: ts.DiagnosticCategory.Message, key: "Resolving_with_primary_search_path_0_6121", message: "Resolving with primary search path '{0}'" },
+        Root_directory_cannot_be_determined_skipping_primary_search_paths: { code: 6122, category: ts.DiagnosticCategory.Message, key: "Root_directory_cannot_be_determined_skipping_primary_search_paths_6122", message: "Root directory cannot be determined, skipping primary search paths." },
+        Resolving_type_reference_directive_0_containing_file_1_root_directory_not_set: { code: 6123, category: ts.DiagnosticCategory.Message, key: "Resolving_type_reference_directive_0_containing_file_1_root_directory_not_set_6123", message: "======== Resolving type reference directive '{0}', containing file '{1}', root directory not set. ========" },
+        Type_declaration_files_to_be_included_in_compilation: { code: 6124, category: ts.DiagnosticCategory.Message, key: "Type_declaration_files_to_be_included_in_compilation_6124", message: "Type declaration files to be included in compilation." },
+        Looking_up_in_node_modules_folder_initial_location_0: { code: 6125, category: ts.DiagnosticCategory.Message, key: "Looking_up_in_node_modules_folder_initial_location_0_6125", message: "Looking up in 'node_modules' folder, initial location '{0}'" },
+        Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder: { code: 6126, category: ts.DiagnosticCategory.Message, key: "Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_mod_6126", message: "Containing file is not specified and root directory cannot be determined, skipping lookup in 'node_modules' folder." },
+        Resolving_type_reference_directive_0_containing_file_not_set_root_directory_1: { code: 6127, category: ts.DiagnosticCategory.Message, key: "Resolving_type_reference_directive_0_containing_file_not_set_root_directory_1_6127", message: "======== Resolving type reference directive '{0}', containing file not set, root directory '{1}'. ========" },
+        Resolving_type_reference_directive_0_containing_file_not_set_root_directory_not_set: { code: 6128, category: ts.DiagnosticCategory.Message, key: "Resolving_type_reference_directive_0_containing_file_not_set_root_directory_not_set_6128", message: "======== Resolving type reference directive '{0}', containing file not set, root directory not set. ========" },
         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." },
         Parameter_0_implicitly_has_an_1_type: { code: 7006, category: ts.DiagnosticCategory.Error, key: "Parameter_0_implicitly_has_an_1_type_7006", message: "Parameter '{0}' implicitly has an '{1}' type." },
         Member_0_implicitly_has_an_1_type: { code: 7008, category: ts.DiagnosticCategory.Error, key: "Member_0_implicitly_has_an_1_type_7008", message: "Member '{0}' implicitly has an '{1}' type." },
@@ -1862,6 +2033,7 @@ var ts;
         Unused_label: { code: 7028, category: ts.DiagnosticCategory.Error, key: "Unused_label_7028", message: "Unused label." },
         Fallthrough_case_in_switch: { code: 7029, category: ts.DiagnosticCategory.Error, key: "Fallthrough_case_in_switch_7029", message: "Fallthrough case in switch." },
         Not_all_code_paths_return_a_value: { code: 7030, category: ts.DiagnosticCategory.Error, key: "Not_all_code_paths_return_a_value_7030", message: "Not all code paths return a value." },
+        Binding_element_0_implicitly_has_an_1_type: { code: 7031, category: ts.DiagnosticCategory.Error, key: "Binding_element_0_implicitly_has_an_1_type_7031", message: "Binding element '{0}' implicitly has an '{1}' type." },
         You_cannot_rename_this_element: { code: 8000, category: ts.DiagnosticCategory.Error, key: "You_cannot_rename_this_element_8000", message: "You cannot rename this element." },
         You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: { code: 8001, category: ts.DiagnosticCategory.Error, key: "You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library_8001", message: "You cannot rename elements that are defined in the standard TypeScript library." },
         import_can_only_be_used_in_a_ts_file: { code: 8002, category: ts.DiagnosticCategory.Error, key: "import_can_only_be_used_in_a_ts_file_8002", message: "'import ... =' can only be used in a .ts file." },
@@ -1878,7 +2050,6 @@ var ts;
         property_declarations_can_only_be_used_in_a_ts_file: { code: 8014, category: ts.DiagnosticCategory.Error, key: "property_declarations_can_only_be_used_in_a_ts_file_8014", message: "'property declarations' can only be used in a .ts file." },
         enum_declarations_can_only_be_used_in_a_ts_file: { code: 8015, category: ts.DiagnosticCategory.Error, key: "enum_declarations_can_only_be_used_in_a_ts_file_8015", message: "'enum declarations' can only be used in a .ts file." },
         type_assertion_expressions_can_only_be_used_in_a_ts_file: { code: 8016, category: ts.DiagnosticCategory.Error, key: "type_assertion_expressions_can_only_be_used_in_a_ts_file_8016", message: "'type assertion expressions' can only be used in a .ts file." },
-        decorators_can_only_be_used_in_a_ts_file: { code: 8017, category: ts.DiagnosticCategory.Error, key: "decorators_can_only_be_used_in_a_ts_file_8017", message: "'decorators' can only be used in a .ts file." },
         Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_class_extends_clauses: { code: 9002, category: ts.DiagnosticCategory.Error, key: "Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_clas_9002", message: "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses." },
         class_expressions_are_not_currently_supported: { code: 9003, category: ts.DiagnosticCategory.Error, key: "class_expressions_are_not_currently_supported_9003", message: "'class' expressions are not currently supported." },
         JSX_attributes_must_only_be_assigned_a_non_empty_expression: { code: 17000, category: ts.DiagnosticCategory.Error, key: "JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000", message: "JSX attributes must only be assigned a non-empty 'expression'." },
@@ -1889,7 +2060,9 @@ var ts;
         A_constructor_cannot_contain_a_super_call_when_its_class_extends_null: { code: 17005, category: ts.DiagnosticCategory.Error, key: "A_constructor_cannot_contain_a_super_call_when_its_class_extends_null_17005", message: "A constructor cannot contain a 'super' call when its class extends 'null'" },
         An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17006, category: ts.DiagnosticCategory.Error, key: "An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_ex_17006", message: "An unary expression with the '{0}' operator is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." },
         A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17007, category: ts.DiagnosticCategory.Error, key: "A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Con_17007", message: "A type assertion expression is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." },
-        JSX_element_0_has_no_corresponding_closing_tag: { code: 17008, category: ts.DiagnosticCategory.Error, key: "JSX_element_0_has_no_corresponding_closing_tag_17008", message: "JSX element '{0}' has no corresponding closing tag." }
+        JSX_element_0_has_no_corresponding_closing_tag: { code: 17008, category: ts.DiagnosticCategory.Error, key: "JSX_element_0_has_no_corresponding_closing_tag_17008", message: "JSX element '{0}' has no corresponding closing tag." },
+        super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class: { code: 17009, category: ts.DiagnosticCategory.Error, key: "super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class_17009", message: "'super' must be called before accessing 'this' in the constructor of a derived class." },
+        Unknown_typing_option_0: { code: 17010, category: ts.DiagnosticCategory.Error, key: "Unknown_typing_option_0_17010", message: "Unknown typing option '{0}'." }
     };
 })(ts || (ts = {}));
 var ts;
@@ -1922,7 +2095,7 @@ var ts;
         "false": 84,
         "finally": 85,
         "for": 86,
-        "from": 133,
+        "from": 135,
         "function": 87,
         "get": 123,
         "if": 88,
@@ -1937,26 +2110,28 @@ var ts;
         "namespace": 126,
         "new": 92,
         "null": 93,
-        "number": 128,
+        "number": 129,
         "package": 109,
         "private": 110,
         "protected": 111,
         "public": 112,
-        "require": 127,
-        "global": 134,
+        "readonly": 127,
+        "require": 128,
+        "global": 136,
         "return": 94,
-        "set": 129,
+        "set": 130,
         "static": 113,
-        "string": 130,
+        "string": 131,
         "super": 95,
         "switch": 96,
-        "symbol": 131,
+        "symbol": 132,
         "this": 97,
         "throw": 98,
         "true": 99,
         "try": 100,
-        "type": 132,
+        "type": 133,
         "typeof": 101,
+        "undefined": 134,
         "var": 102,
         "void": 103,
         "while": 104,
@@ -1964,7 +2139,7 @@ var ts;
         "yield": 114,
         "async": 118,
         "await": 119,
-        "of": 135,
+        "of": 137,
         "{": 15,
         "}": 16,
         "(": 17,
@@ -2446,6 +2621,7 @@ var ts;
             scanJsxIdentifier: scanJsxIdentifier,
             reScanJsxToken: reScanJsxToken,
             scanJsxToken: scanJsxToken,
+            scanJSDocToken: scanJSDocToken,
             scan: scan,
             setText: setText,
             setScriptTarget: setScriptTarget,
@@ -2453,7 +2629,8 @@ var ts;
             setOnError: setOnError,
             setTextPos: setTextPos,
             tryScan: tryScan,
-            lookAhead: lookAhead
+            lookAhead: lookAhead,
+            scanRange: scanRange
         };
         function error(message, length) {
             if (onError) {
@@ -3225,7 +3402,7 @@ var ts;
                     break;
                 }
             }
-            return token = 239;
+            return token = 243;
         }
         function scanJsxIdentifier() {
             if (tokenIsIdentifierOrKeyword(token)) {
@@ -3243,6 +3420,54 @@ var ts;
             }
             return token;
         }
+        function scanJSDocToken() {
+            if (pos >= end) {
+                return token = 1;
+            }
+            startPos = pos;
+            var ch = text.charCodeAt(pos);
+            while (pos < end) {
+                ch = text.charCodeAt(pos);
+                if (isWhiteSpace(ch)) {
+                    pos++;
+                }
+                else {
+                    break;
+                }
+            }
+            tokenPos = pos;
+            switch (ch) {
+                case 64:
+                    return pos += 1, token = 55;
+                case 10:
+                case 13:
+                    return pos += 1, token = 4;
+                case 42:
+                    return pos += 1, token = 37;
+                case 123:
+                    return pos += 1, token = 15;
+                case 125:
+                    return pos += 1, token = 16;
+                case 91:
+                    return pos += 1, token = 19;
+                case 93:
+                    return pos += 1, token = 20;
+                case 61:
+                    return pos += 1, token = 56;
+                case 44:
+                    return pos += 1, token = 24;
+            }
+            if (isIdentifierStart(ch, 2)) {
+                pos++;
+                while (isIdentifierPart(text.charCodeAt(pos), 2) && pos < end) {
+                    pos++;
+                }
+                return token = 69;
+            }
+            else {
+                return pos += 1, token = 0;
+            }
+        }
         function speculationHelper(callback, isLookahead) {
             var savePos = pos;
             var saveStartPos = startPos;
@@ -3261,6 +3486,29 @@ var ts;
             }
             return result;
         }
+        function scanRange(start, length, callback) {
+            var saveEnd = end;
+            var savePos = pos;
+            var saveStartPos = startPos;
+            var saveTokenPos = tokenPos;
+            var saveToken = token;
+            var savePrecedingLineBreak = precedingLineBreak;
+            var saveTokenValue = tokenValue;
+            var saveHasExtendedUnicodeEscape = hasExtendedUnicodeEscape;
+            var saveTokenIsUnterminated = tokenIsUnterminated;
+            setText(text, start, length);
+            var result = callback();
+            end = saveEnd;
+            pos = savePos;
+            startPos = saveStartPos;
+            tokenPos = saveTokenPos;
+            token = saveToken;
+            precedingLineBreak = savePrecedingLineBreak;
+            tokenValue = saveTokenValue;
+            hasExtendedUnicodeEscape = saveHasExtendedUnicodeEscape;
+            tokenIsUnterminated = saveTokenIsUnterminated;
+            return result;
+        }
         function lookAhead(callback) {
             return speculationHelper(callback, true);
         }
@@ -3308,6 +3556,12 @@ var ts;
             type: "boolean",
             description: ts.Diagnostics.Generates_corresponding_d_ts_file
         },
+        {
+            name: "declarationDir",
+            type: "string",
+            isFilePath: true,
+            paramType: ts.Diagnostics.DIRECTORY
+        },
         {
             name: "diagnostics",
             type: "boolean"
@@ -3342,13 +3596,12 @@ var ts;
                 "react": 2
             },
             paramType: ts.Diagnostics.KIND,
-            description: ts.Diagnostics.Specify_JSX_code_generation_Colon_preserve_or_react,
-            error: ts.Diagnostics.Argument_for_jsx_must_be_preserve_or_react
+            description: ts.Diagnostics.Specify_JSX_code_generation_Colon_preserve_or_react
         },
         {
             name: "reactNamespace",
             type: "string",
-            description: ts.Diagnostics.Specifies_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit
+            description: ts.Diagnostics.Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit
         },
         {
             name: "listFiles",
@@ -3362,23 +3615,23 @@ var ts;
             name: "mapRoot",
             type: "string",
             isFilePath: true,
-            description: ts.Diagnostics.Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations,
+            description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations,
             paramType: ts.Diagnostics.LOCATION
         },
         {
             name: "module",
             shortName: "m",
             type: {
-                "commonjs": 1,
-                "amd": 2,
-                "system": 4,
-                "umd": 3,
-                "es6": 5,
-                "es2015": 5
+                "none": ts.ModuleKind.None,
+                "commonjs": ts.ModuleKind.CommonJS,
+                "amd": ts.ModuleKind.AMD,
+                "system": ts.ModuleKind.System,
+                "umd": ts.ModuleKind.UMD,
+                "es6": ts.ModuleKind.ES6,
+                "es2015": ts.ModuleKind.ES2015
             },
             description: ts.Diagnostics.Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015,
-            paramType: ts.Diagnostics.KIND,
-            error: ts.Diagnostics.Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015
+            paramType: ts.Diagnostics.KIND
         },
         {
             name: "newLine",
@@ -3386,9 +3639,8 @@ var ts;
                 "crlf": 0,
                 "lf": 1
             },
-            description: ts.Diagnostics.Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix,
-            paramType: ts.Diagnostics.NEWLINE,
-            error: ts.Diagnostics.Argument_for_newLine_option_must_be_CRLF_or_LF
+            description: ts.Diagnostics.Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix,
+            paramType: ts.Diagnostics.NEWLINE
         },
         {
             name: "noEmit",
@@ -3409,6 +3661,11 @@ var ts;
             type: "boolean",
             description: ts.Diagnostics.Raise_error_on_expressions_and_declarations_with_an_implied_any_type
         },
+        {
+            name: "noImplicitThis",
+            type: "boolean",
+            description: ts.Diagnostics.Raise_error_on_this_expressions_with_an_implied_any_type
+        },
         {
             name: "noLib",
             type: "boolean"
@@ -3448,7 +3705,6 @@ var ts;
         },
         {
             name: "pretty",
-            paramType: ts.Diagnostics.KIND,
             description: ts.Diagnostics.Stylize_errors_and_messages_using_color_and_context_experimental,
             type: "boolean"
         },
@@ -3469,8 +3725,8 @@ var ts;
             name: "rootDir",
             type: "string",
             isFilePath: true,
-            description: ts.Diagnostics.Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir,
-            paramType: ts.Diagnostics.LOCATION
+            paramType: ts.Diagnostics.LOCATION,
+            description: ts.Diagnostics.Specify_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir
         },
         {
             name: "isolatedModules",
@@ -3485,7 +3741,7 @@ var ts;
             name: "sourceRoot",
             type: "string",
             isFilePath: true,
-            description: ts.Diagnostics.Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations,
+            description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations,
             paramType: ts.Diagnostics.LOCATION
         },
         {
@@ -3514,9 +3770,8 @@ var ts;
                 "es6": 2,
                 "es2015": 2
             },
-            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental,
-            paramType: ts.Diagnostics.VERSION,
-            error: ts.Diagnostics.Argument_for_target_option_must_be_ES3_ES5_or_ES2015
+            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015,
+            paramType: ts.Diagnostics.VERSION
         },
         {
             name: "version",
@@ -3544,11 +3799,10 @@ var ts;
         {
             name: "moduleResolution",
             type: {
-                "node": 2,
-                "classic": 1
+                "node": ts.ModuleResolutionKind.NodeJs,
+                "classic": ts.ModuleResolutionKind.Classic
             },
-            description: ts.Diagnostics.Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6,
-            error: ts.Diagnostics.Argument_for_moduleResolution_option_must_be_node_or_classic
+            description: ts.Diagnostics.Specify_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6
         },
         {
             name: "allowUnusedLabels",
@@ -3576,14 +3830,127 @@ var ts;
             description: ts.Diagnostics.Disallow_inconsistently_cased_references_to_the_same_file
         },
         {
-            name: "allowSyntheticDefaultImports",
+            name: "baseUrl",
+            type: "string",
+            isFilePath: true,
+            description: ts.Diagnostics.Base_directory_to_resolve_non_absolute_module_names
+        },
+        {
+            name: "paths",
+            type: "object",
+            isTSConfigOnly: true
+        },
+        {
+            name: "rootDirs",
+            type: "list",
+            isTSConfigOnly: true,
+            element: {
+                name: "rootDirs",
+                type: "string",
+                isFilePath: true
+            }
+        },
+        {
+            name: "typesSearchPaths",
+            type: "list",
+            isTSConfigOnly: true,
+            element: {
+                name: "typesSearchPaths",
+                type: "string",
+                isFilePath: true
+            }
+        },
+        {
+            name: "typesRoot",
+            type: "string"
+        },
+        {
+            name: "types",
+            type: "list",
+            element: {
+                name: "types",
+                type: "string"
+            },
+            description: ts.Diagnostics.Type_declaration_files_to_be_included_in_compilation
+        },
+        {
+            name: "traceResolution",
             type: "boolean",
-            description: ts.Diagnostics.Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking
+            description: ts.Diagnostics.Enable_tracing_of_the_name_resolution_process
         },
         {
             name: "allowJs",
             type: "boolean",
             description: ts.Diagnostics.Allow_javascript_files_to_be_compiled
+        },
+        {
+            name: "allowSyntheticDefaultImports",
+            type: "boolean",
+            description: ts.Diagnostics.Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking
+        },
+        {
+            name: "noImplicitUseStrict",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_emit_use_strict_directives_in_module_output
+        },
+        {
+            name: "listEmittedFiles",
+            type: "boolean"
+        },
+        {
+            name: "lib",
+            type: "list",
+            element: {
+                name: "lib",
+                type: {
+                    "es5": "lib.es5.d.ts",
+                    "es6": "lib.es2015.d.ts",
+                    "es2015": "lib.es2015.d.ts",
+                    "es7": "lib.es2016.d.ts",
+                    "es2016": "lib.es2016.d.ts",
+                    "dom": "lib.dom.d.ts",
+                    "webworker": "lib.webworker.d.ts",
+                    "scripthost": "lib.scripthost.d.ts",
+                    "es2015.core": "lib.es2015.core.d.ts",
+                    "es2015.collection": "lib.es2015.collection.d.ts",
+                    "es2015.generator": "lib.es2015.generator.d.ts",
+                    "es2015.iterable": "lib.es2015.iterable.d.ts",
+                    "es2015.promise": "lib.es2015.promise.d.ts",
+                    "es2015.proxy": "lib.es2015.proxy.d.ts",
+                    "es2015.reflect": "lib.es2015.reflect.d.ts",
+                    "es2015.symbol": "lib.es2015.symbol.d.ts",
+                    "es2015.symbol.wellknown": "lib.es2015.symbol.wellknown.d.ts",
+                    "es2016.array.include": "lib.es2016.array.include.d.ts"
+                }
+            },
+            description: ts.Diagnostics.Specify_library_files_to_be_included_in_the_compilation_Colon
+        },
+        {
+            name: "strictNullChecks",
+            type: "boolean",
+            description: ts.Diagnostics.Enable_strict_null_checks
+        }
+    ];
+    ts.typingOptionDeclarations = [
+        {
+            name: "enableAutoDiscovery",
+            type: "boolean"
+        },
+        {
+            name: "include",
+            type: "list",
+            element: {
+                name: "include",
+                type: "string"
+            }
+        },
+        {
+            name: "exclude",
+            type: "list",
+            element: {
+                name: "exclude",
+                type: "string"
+            }
         }
     ];
     var optionNameMapCache;
@@ -3603,6 +3970,37 @@ var ts;
         return optionNameMapCache;
     }
     ts.getOptionNameMap = getOptionNameMap;
+    function createCompilerDiagnosticForInvalidCustomType(opt) {
+        var namesOfType = [];
+        ts.forEachKey(opt.type, function (key) {
+            namesOfType.push(" '" + key + "'");
+        });
+        return ts.createCompilerDiagnostic(ts.Diagnostics.Argument_for_0_option_must_be_Colon_1, "--" + opt.name, namesOfType);
+    }
+    ts.createCompilerDiagnosticForInvalidCustomType = createCompilerDiagnosticForInvalidCustomType;
+    function parseCustomTypeOption(opt, value, errors) {
+        var key = (value || "").trim().toLowerCase();
+        var map = opt.type;
+        if (ts.hasProperty(map, key)) {
+            return map[key];
+        }
+        else {
+            errors.push(createCompilerDiagnosticForInvalidCustomType(opt));
+        }
+    }
+    ts.parseCustomTypeOption = parseCustomTypeOption;
+    function parseListTypeOption(opt, value, errors) {
+        var values = (value || "").trim().split(",");
+        switch (opt.element.type) {
+            case "number":
+                return ts.map(values, parseInt);
+            case "string":
+                return ts.map(values, function (v) { return v || ""; });
+            default:
+                return ts.filter(ts.map(values, function (v) { return parseCustomTypeOption(opt.element, v, errors); }), function (v) { return !!v; });
+        }
+    }
+    ts.parseListTypeOption = parseListTypeOption;
     function parseCommandLine(commandLine, readFile) {
         var options = {};
         var fileNames = [];
@@ -3629,31 +4027,34 @@ var ts;
                     }
                     if (ts.hasProperty(optionNameMap, s)) {
                         var opt = optionNameMap[s];
-                        if (!args[i] && opt.type !== "boolean") {
-                            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_expects_an_argument, opt.name));
+                        if (opt.isTSConfigOnly) {
+                            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_can_only_be_specified_in_tsconfig_json_file, opt.name));
                         }
-                        switch (opt.type) {
-                            case "number":
-                                options[opt.name] = parseInt(args[i]);
-                                i++;
-                                break;
-                            case "boolean":
-                                options[opt.name] = true;
-                                break;
-                            case "string":
-                                options[opt.name] = args[i] || "";
-                                i++;
-                                break;
-                            default:
-                                var map_1 = opt.type;
-                                var key = (args[i] || "").toLowerCase();
-                                i++;
-                                if (ts.hasProperty(map_1, key)) {
-                                    options[opt.name] = map_1[key];
-                                }
-                                else {
-                                    errors.push(ts.createCompilerDiagnostic(opt.error));
-                                }
+                        else {
+                            if (!args[i] && opt.type !== "boolean") {
+                                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_expects_an_argument, opt.name));
+                            }
+                            switch (opt.type) {
+                                case "number":
+                                    options[opt.name] = parseInt(args[i]);
+                                    i++;
+                                    break;
+                                case "boolean":
+                                    options[opt.name] = true;
+                                    break;
+                                case "string":
+                                    options[opt.name] = args[i] || "";
+                                    i++;
+                                    break;
+                                case "list":
+                                    options[opt.name] = parseListTypeOption(opt, args[i], errors);
+                                    i++;
+                                    break;
+                                default:
+                                    options[opt.name] = parseCustomTypeOption(opt, args[i], errors);
+                                    i++;
+                                    break;
+                            }
                         }
                     }
                     else {
@@ -3739,19 +4140,24 @@ var ts;
         }
         return output;
     }
-    function parseJsonConfigFileContent(json, host, basePath, existingOptions) {
+    function parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName) {
         if (existingOptions === void 0) { existingOptions = {}; }
-        var _a = convertCompilerOptionsFromJson(json["compilerOptions"], basePath), optionsFromJsonConfigFile = _a.options, errors = _a.errors;
-        var options = ts.extend(existingOptions, optionsFromJsonConfigFile);
+        var errors = [];
+        var compilerOptions = convertCompilerOptionsFromJsonWorker(json["compilerOptions"], basePath, errors, configFileName);
+        var options = ts.extend(existingOptions, compilerOptions);
+        var typingOptions = convertTypingOptionsFromJsonWorker(json["typingOptions"], basePath, errors, configFileName);
+        options.configFilePath = configFileName;
+        var fileNames = getFileNames(errors);
         return {
             options: options,
-            fileNames: getFileNames(),
+            fileNames: fileNames,
+            typingOptions: typingOptions,
             errors: errors
         };
-        function getFileNames() {
+        function getFileNames(errors) {
             var fileNames = [];
             if (ts.hasProperty(json, "files")) {
-                if (json["files"] instanceof Array) {
+                if (ts.isArray(json["files"])) {
                     fileNames = ts.map(json["files"], function (s) { return ts.combinePaths(basePath, s); });
                 }
                 else {
@@ -3760,7 +4166,18 @@ var ts;
             }
             else {
                 var filesSeen = {};
-                var exclude = json["exclude"] instanceof Array ? ts.map(json["exclude"], ts.normalizeSlashes) : undefined;
+                var exclude = [];
+                if (ts.isArray(json["exclude"])) {
+                    exclude = json["exclude"];
+                }
+                else {
+                    exclude = ["node_modules"];
+                    var outDir = json["compilerOptions"] && json["compilerOptions"]["outDir"];
+                    if (outDir) {
+                        exclude.push(outDir);
+                    }
+                }
+                exclude = ts.map(exclude, ts.normalizeSlashes);
                 var supportedExtensions = ts.getSupportedExtensions(options);
                 ts.Debug.assert(ts.indexOf(supportedExtensions, ".ts") < ts.indexOf(supportedExtensions, ".d.ts"), "Changed priority of extensions to pick");
                 for (var _i = 0, supportedExtensions_1 = supportedExtensions; _i < supportedExtensions_1.length; _i++) {
@@ -3771,6 +4188,9 @@ var ts;
                         if (extension === ".ts" && ts.fileExtensionIs(fileName, ".d.ts")) {
                             continue;
                         }
+                        if (/\.min\.js$/.test(fileName)) {
+                            continue;
+                        }
                         if (extension === ".d.ts" || (options.allowJs && ts.contains(ts.supportedJavascriptExtensions, extension))) {
                             var baseName = fileName.substr(0, fileName.length - extension.length);
                             if (ts.hasProperty(filesSeen, baseName + ".ts") || ts.hasProperty(filesSeen, baseName + ".tsx")) {
@@ -3782,53 +4202,88 @@ var ts;
                     }
                 }
             }
+            if (ts.hasProperty(json, "excludes") && !ts.hasProperty(json, "exclude")) {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_option_excludes_Did_you_mean_exclude));
+            }
             return fileNames;
         }
     }
     ts.parseJsonConfigFileContent = parseJsonConfigFileContent;
-    function convertCompilerOptionsFromJson(jsonOptions, basePath) {
-        var options = {};
+    function convertCompilerOptionsFromJson(jsonOptions, basePath, configFileName) {
         var errors = [];
-        if (!jsonOptions) {
-            return { options: options, errors: errors };
-        }
-        var optionNameMap = ts.arrayToMap(ts.optionDeclarations, function (opt) { return opt.name; });
-        for (var id in jsonOptions) {
-            if (ts.hasProperty(optionNameMap, id)) {
-                var opt = optionNameMap[id];
-                var optType = opt.type;
-                var value = jsonOptions[id];
-                var expectedType = typeof optType === "string" ? optType : "string";
-                if (typeof value === expectedType) {
-                    if (typeof optType !== "string") {
-                        var key = value.toLowerCase();
-                        if (ts.hasProperty(optType, key)) {
-                            value = optType[key];
-                        }
-                        else {
-                            errors.push(ts.createCompilerDiagnostic(opt.error));
-                            value = 0;
-                        }
-                    }
-                    if (opt.isFilePath) {
-                        value = ts.normalizePath(ts.combinePaths(basePath, value));
-                        if (value === "") {
-                            value = ".";
-                        }
-                    }
-                    options[opt.name] = value;
-                }
-                else {
-                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, id, expectedType));
-                }
-            }
-            else {
-                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_compiler_option_0, id));
-            }
-        }
+        var options = convertCompilerOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName);
         return { options: options, errors: errors };
     }
     ts.convertCompilerOptionsFromJson = convertCompilerOptionsFromJson;
+    function convertTypingOptionsFromJson(jsonOptions, basePath, configFileName) {
+        var errors = [];
+        var options = convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName);
+        return { options: options, errors: errors };
+    }
+    ts.convertTypingOptionsFromJson = convertTypingOptionsFromJson;
+    function convertCompilerOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName) {
+        var options = ts.getBaseFileName(configFileName) === "jsconfig.json" ? { allowJs: true } : {};
+        convertOptionsFromJson(ts.optionDeclarations, jsonOptions, basePath, options, ts.Diagnostics.Unknown_compiler_option_0, errors);
+        return options;
+    }
+    function convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName) {
+        var options = ts.getBaseFileName(configFileName) === "jsconfig.json"
+            ? { enableAutoDiscovery: true, include: [], exclude: [] }
+            : { enableAutoDiscovery: false, include: [], exclude: [] };
+        convertOptionsFromJson(ts.typingOptionDeclarations, jsonOptions, basePath, options, ts.Diagnostics.Unknown_typing_option_0, errors);
+        return options;
+    }
+    function convertOptionsFromJson(optionDeclarations, jsonOptions, basePath, defaultOptions, diagnosticMessage, errors) {
+        if (!jsonOptions) {
+            return;
+        }
+        var optionNameMap = ts.arrayToMap(optionDeclarations, function (opt) { return opt.name; });
+        for (var id in jsonOptions) {
+            if (ts.hasProperty(optionNameMap, id)) {
+                var opt = optionNameMap[id];
+                defaultOptions[opt.name] = convertJsonOption(opt, jsonOptions[id], basePath, errors);
+            }
+            else {
+                errors.push(ts.createCompilerDiagnostic(diagnosticMessage, id));
+            }
+        }
+    }
+    function convertJsonOption(opt, value, basePath, errors) {
+        var optType = opt.type;
+        var expectedType = typeof optType === "string" ? optType : "string";
+        if (optType === "list" && ts.isArray(value)) {
+            return convertJsonOptionOfListType(opt, value, basePath, errors);
+        }
+        else if (typeof value === expectedType) {
+            if (typeof optType !== "string") {
+                return convertJsonOptionOfCustomType(opt, value, errors);
+            }
+            else {
+                if (opt.isFilePath) {
+                    value = ts.normalizePath(ts.combinePaths(basePath, value));
+                    if (value === "") {
+                        value = ".";
+                    }
+                }
+            }
+            return value;
+        }
+        else {
+            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, opt.name, expectedType));
+        }
+    }
+    function convertJsonOptionOfCustomType(opt, value, errors) {
+        var key = value.toLowerCase();
+        if (ts.hasProperty(opt.type, key)) {
+            return opt.type[key];
+        }
+        else {
+            errors.push(createCompilerDiagnosticForInvalidCustomType(opt));
+        }
+    }
+    function convertJsonOptionOfListType(option, values, basePath, errors) {
+        return ts.filter(ts.map(values, function (v) { return convertJsonOption(option.element, v, basePath, errors); }), function (v) { return !!v; });
+    }
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -3848,10 +4303,10 @@ var ts;
     var stringWriters = [];
     function getSingleLineStringWriter() {
         if (stringWriters.length === 0) {
-            var str = "";
-            var writeText = function (text) { return str += text; };
+            var str_1 = "";
+            var writeText = function (text) { return str_1 += text; };
             return {
-                string: function () { return str; },
+                string: function () { return str_1; },
                 writeKeyword: writeText,
                 writeOperator: writeText,
                 writePunctuation: writeText,
@@ -3859,10 +4314,10 @@ var ts;
                 writeStringLiteral: writeText,
                 writeParameter: writeText,
                 writeSymbol: writeText,
-                writeLine: function () { return str += " "; },
+                writeLine: function () { return str_1 += " "; },
                 increaseIndent: function () { },
                 decreaseIndent: function () { },
-                clear: function () { return str = ""; },
+                clear: function () { return str_1 = ""; },
                 trackSymbol: function () { },
                 reportInaccessibleThisError: function () { }
             };
@@ -3910,28 +4365,72 @@ var ts;
         sourceFile.resolvedModules[moduleNameText] = resolvedModule;
     }
     ts.setResolvedModule = setResolvedModule;
+    function setResolvedTypeReferenceDirective(sourceFile, typeReferenceDirectiveName, resolvedTypeReferenceDirective) {
+        if (!sourceFile.resolvedTypeReferenceDirectiveNames) {
+            sourceFile.resolvedTypeReferenceDirectiveNames = {};
+        }
+        sourceFile.resolvedTypeReferenceDirectiveNames[typeReferenceDirectiveName] = resolvedTypeReferenceDirective;
+    }
+    ts.setResolvedTypeReferenceDirective = setResolvedTypeReferenceDirective;
+    function moduleResolutionIsEqualTo(oldResolution, newResolution) {
+        return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.isExternalLibraryImport === newResolution.isExternalLibraryImport;
+    }
+    ts.moduleResolutionIsEqualTo = moduleResolutionIsEqualTo;
+    function typeDirectiveIsEqualTo(oldResolution, newResolution) {
+        return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.primary === newResolution.primary;
+    }
+    ts.typeDirectiveIsEqualTo = typeDirectiveIsEqualTo;
+    function hasChangesInResolutions(names, newResolutions, oldResolutions, comparer) {
+        if (names.length !== newResolutions.length) {
+            return false;
+        }
+        for (var i = 0; i < names.length; i++) {
+            var newResolution = newResolutions[i];
+            var oldResolution = oldResolutions && ts.hasProperty(oldResolutions, names[i]) ? oldResolutions[names[i]] : undefined;
+            var changed = oldResolution
+                ? !newResolution || !comparer(oldResolution, newResolution)
+                : newResolution;
+            if (changed) {
+                return true;
+            }
+        }
+        return false;
+    }
+    ts.hasChangesInResolutions = hasChangesInResolutions;
     function containsParseError(node) {
         aggregateChildData(node);
-        return (node.parserContextFlags & 64) !== 0;
+        return (node.flags & 268435456) !== 0;
     }
     ts.containsParseError = containsParseError;
     function aggregateChildData(node) {
-        if (!(node.parserContextFlags & 128)) {
-            var thisNodeOrAnySubNodesHasError = ((node.parserContextFlags & 16) !== 0) ||
+        if (!(node.flags & 536870912)) {
+            var thisNodeOrAnySubNodesHasError = ((node.flags & 67108864) !== 0) ||
                 ts.forEachChild(node, containsParseError);
             if (thisNodeOrAnySubNodesHasError) {
-                node.parserContextFlags |= 64;
+                node.flags |= 268435456;
             }
-            node.parserContextFlags |= 128;
+            node.flags |= 536870912;
         }
     }
     function getSourceFileOfNode(node) {
-        while (node && node.kind !== 251) {
+        while (node && node.kind !== 255) {
             node = node.parent;
         }
         return node;
     }
     ts.getSourceFileOfNode = getSourceFileOfNode;
+    function isStatementWithLocals(node) {
+        switch (node.kind) {
+            case 198:
+            case 226:
+            case 205:
+            case 206:
+            case 207:
+                return true;
+        }
+        return false;
+    }
+    ts.isStatementWithLocals = isStatementWithLocals;
     function getStartPositionOfLine(line, sourceFile) {
         ts.Debug.assert(line >= 0);
         return ts.getLineStarts(sourceFile)[line];
@@ -3947,6 +4446,25 @@ var ts;
         return node.pos;
     }
     ts.getStartPosOfNode = getStartPosOfNode;
+    function getEndLinePosition(line, sourceFile) {
+        ts.Debug.assert(line >= 0);
+        var lineStarts = ts.getLineStarts(sourceFile);
+        var lineIndex = line;
+        var sourceText = sourceFile.text;
+        if (lineIndex + 1 === lineStarts.length) {
+            return sourceText.length - 1;
+        }
+        else {
+            var start = lineStarts[lineIndex];
+            var pos = lineStarts[lineIndex + 1] - 1;
+            ts.Debug.assert(ts.isLineBreak(sourceText.charCodeAt(pos)));
+            while (start <= pos && ts.isLineBreak(sourceText.charCodeAt(pos))) {
+                pos--;
+            }
+            return pos;
+        }
+    }
+    ts.getEndLinePosition = getEndLinePosition;
     function nodeIsMissing(node) {
         if (!node) {
             return true;
@@ -4006,17 +4524,24 @@ var ts;
     }
     ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName;
     function isBlockOrCatchScoped(declaration) {
-        return (getCombinedNodeFlags(declaration) & 24576) !== 0 ||
+        return (getCombinedNodeFlags(declaration) & 3072) !== 0 ||
             isCatchClauseVariableDeclaration(declaration);
     }
     ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
     function isAmbientModule(node) {
-        return node && node.kind === 221 &&
+        return node && node.kind === 224 &&
             (node.name.kind === 9 || isGlobalScopeAugmentation(node));
     }
     ts.isAmbientModule = isAmbientModule;
+    function isBlockScopedContainerTopLevel(node) {
+        return node.kind === 255 ||
+            node.kind === 224 ||
+            isFunctionLike(node) ||
+            isFunctionBlock(node);
+    }
+    ts.isBlockScopedContainerTopLevel = isBlockScopedContainerTopLevel;
     function isGlobalScopeAugmentation(module) {
-        return !!(module.flags & 2097152);
+        return !!(module.flags & 131072);
     }
     ts.isGlobalScopeAugmentation = isGlobalScopeAugmentation;
     function isExternalModuleAugmentation(node) {
@@ -4024,10 +4549,10 @@ var ts;
             return false;
         }
         switch (node.parent.kind) {
-            case 251:
-                return isExternalModule(node.parent);
-            case 222:
-                return isAmbientModule(node.parent.parent) && !isExternalModule(node.parent.parent.parent);
+            case 255:
+                return ts.isExternalModule(node.parent);
+            case 225:
+                return isAmbientModule(node.parent.parent) && !ts.isExternalModule(node.parent.parent.parent);
         }
         return false;
     }
@@ -4039,15 +4564,15 @@ var ts;
                 return current;
             }
             switch (current.kind) {
+                case 255:
+                case 226:
                 case 251:
-                case 223:
-                case 247:
-                case 221:
-                case 202:
-                case 203:
-                case 204:
+                case 224:
+                case 205:
+                case 206:
+                case 207:
                     return current;
-                case 195:
+                case 198:
                     if (!isFunctionLike(current.parent)) {
                         return current;
                     }
@@ -4058,9 +4583,9 @@ var ts;
     ts.getEnclosingBlockScopeContainer = getEnclosingBlockScopeContainer;
     function isCatchClauseVariableDeclaration(declaration) {
         return declaration &&
-            declaration.kind === 214 &&
+            declaration.kind === 217 &&
             declaration.parent &&
-            declaration.parent.kind === 247;
+            declaration.parent.kind === 251;
     }
     ts.isCatchClauseVariableDeclaration = isCatchClauseVariableDeclaration;
     function declarationNameToString(name) {
@@ -4093,29 +4618,44 @@ var ts;
         return ts.createTextSpanFromBounds(start, scanner.getTextPos());
     }
     ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition;
+    function getErrorSpanForArrowFunction(sourceFile, node) {
+        var pos = ts.skipTrivia(sourceFile.text, node.pos);
+        if (node.body && node.body.kind === 198) {
+            var startLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.pos).line;
+            var endLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.end).line;
+            if (startLine < endLine) {
+                return ts.createTextSpan(pos, getEndLinePosition(startLine, sourceFile) - pos + 1);
+            }
+        }
+        return ts.createTextSpanFromBounds(pos, node.end);
+    }
     function getErrorSpanForNode(sourceFile, node) {
         var errorNode = node;
         switch (node.kind) {
-            case 251:
+            case 255:
                 var pos_1 = ts.skipTrivia(sourceFile.text, 0, false);
                 if (pos_1 === sourceFile.text.length) {
                     return ts.createTextSpan(0, 0);
                 }
                 return getSpanOfTokenAtPosition(sourceFile, pos_1);
-            case 214:
-            case 166:
             case 217:
-            case 189:
-            case 218:
-            case 221:
+            case 168:
             case 220:
-            case 250:
-            case 216:
-            case 176:
-            case 144:
+            case 191:
+            case 221:
+            case 224:
+            case 223:
+            case 254:
             case 219:
+            case 178:
+            case 146:
+            case 148:
+            case 149:
+            case 222:
                 errorNode = node.name;
                 break;
+            case 179:
+                return getErrorSpanForArrowFunction(sourceFile, node);
         }
         if (errorNode === undefined) {
             return getSpanOfTokenAtPosition(sourceFile, node.pos);
@@ -4126,24 +4666,20 @@ var ts;
         return ts.createTextSpanFromBounds(pos, errorNode.end);
     }
     ts.getErrorSpanForNode = getErrorSpanForNode;
-    function isExternalModule(file) {
-        return file.externalModuleIndicator !== undefined;
-    }
-    ts.isExternalModule = isExternalModule;
     function isExternalOrCommonJsModule(file) {
         return (file.externalModuleIndicator || file.commonJsModuleIndicator) !== undefined;
     }
     ts.isExternalOrCommonJsModule = isExternalOrCommonJsModule;
     function isDeclarationFile(file) {
-        return (file.flags & 4096) !== 0;
+        return file.isDeclarationFile;
     }
     ts.isDeclarationFile = isDeclarationFile;
     function isConstEnumDeclaration(node) {
-        return node.kind === 220 && isConst(node);
+        return node.kind === 223 && isConst(node);
     }
     ts.isConstEnumDeclaration = isConstEnumDeclaration;
     function walkUpBindingElementsAndPatterns(node) {
-        while (node && (node.kind === 166 || isBindingPattern(node))) {
+        while (node && (node.kind === 168 || isBindingPattern(node))) {
             node = node.parent;
         }
         return node;
@@ -4151,29 +4687,33 @@ var ts;
     function getCombinedNodeFlags(node) {
         node = walkUpBindingElementsAndPatterns(node);
         var flags = node.flags;
-        if (node.kind === 214) {
+        if (node.kind === 217) {
             node = node.parent;
         }
-        if (node && node.kind === 215) {
+        if (node && node.kind === 218) {
             flags |= node.flags;
             node = node.parent;
         }
-        if (node && node.kind === 196) {
+        if (node && node.kind === 199) {
             flags |= node.flags;
         }
         return flags;
     }
     ts.getCombinedNodeFlags = getCombinedNodeFlags;
     function isConst(node) {
-        return !!(getCombinedNodeFlags(node) & 16384);
+        return !!(getCombinedNodeFlags(node) & 2048);
     }
     ts.isConst = isConst;
     function isLet(node) {
-        return !!(getCombinedNodeFlags(node) & 8192);
+        return !!(getCombinedNodeFlags(node) & 1024);
     }
     ts.isLet = isLet;
+    function isSuperCallExpression(n) {
+        return n.kind === 173 && n.expression.kind === 95;
+    }
+    ts.isSuperCallExpression = isSuperCallExpression;
     function isPrologueDirective(node) {
-        return node.kind === 198 && node.expression.kind === 9;
+        return node.kind === 201 && node.expression.kind === 9;
     }
     ts.isPrologueDirective = isPrologueDirective;
     function getLeadingCommentRangesOfNode(node, sourceFileOfNode) {
@@ -4189,7 +4729,7 @@ var ts;
     }
     ts.getJsDocComments = getJsDocComments;
     function getJsDocCommentsFromText(node, text) {
-        var commentRanges = (node.kind === 139 || node.kind === 138) ?
+        var commentRanges = (node.kind === 141 || node.kind === 140) ?
             ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
             getLeadingCommentRangesOfNodeFromText(node, text);
         return ts.filter(commentRanges, isJsDocComment);
@@ -4201,69 +4741,71 @@ var ts;
     }
     ts.getJsDocCommentsFromText = getJsDocCommentsFromText;
     ts.fullTripleSlashReferencePathRegEx = /^(\/\/\/\s*<reference\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
+    ts.fullTripleSlashReferenceTypeReferenceDirectiveRegEx = /^(\/\/\/\s*<reference\s+types\s*=\s*)('|")(.+?)\2.*?\/>/;
     ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
     function isTypeNode(node) {
-        if (151 <= node.kind && node.kind <= 163) {
+        if (153 <= node.kind && node.kind <= 165) {
             return true;
         }
         switch (node.kind) {
             case 117:
-            case 128:
-            case 130:
-            case 120:
+            case 129:
             case 131:
+            case 120:
+            case 132:
+            case 134:
                 return true;
             case 103:
-                return node.parent.kind !== 180;
-            case 191:
+                return node.parent.kind !== 182;
+            case 193:
                 return !isExpressionWithTypeArgumentsInClassExtendsClause(node);
             case 69:
-                if (node.parent.kind === 136 && node.parent.right === node) {
+                if (node.parent.kind === 138 && node.parent.right === node) {
                     node = node.parent;
                 }
-                else if (node.parent.kind === 169 && node.parent.name === node) {
+                else if (node.parent.kind === 171 && node.parent.name === node) {
                     node = node.parent;
                 }
-                ts.Debug.assert(node.kind === 69 || node.kind === 136 || node.kind === 169, "'node' was expected to be a qualified name, identifier or property access in 'isTypeNode'.");
-            case 136:
-            case 169:
+                ts.Debug.assert(node.kind === 69 || node.kind === 138 || node.kind === 171, "'node' was expected to be a qualified name, identifier or property access in 'isTypeNode'.");
+            case 138:
+            case 171:
             case 97:
                 var parent_1 = node.parent;
-                if (parent_1.kind === 155) {
+                if (parent_1.kind === 157) {
                     return false;
                 }
-                if (151 <= parent_1.kind && parent_1.kind <= 163) {
+                if (153 <= parent_1.kind && parent_1.kind <= 165) {
                     return true;
                 }
                 switch (parent_1.kind) {
-                    case 191:
+                    case 193:
                         return !isExpressionWithTypeArgumentsInClassExtendsClause(parent_1);
-                    case 138:
+                    case 140:
                         return node === parent_1.constraint;
-                    case 142:
-                    case 141:
-                    case 139:
-                    case 214:
-                        return node === parent_1.type;
-                    case 216:
-                    case 176:
-                    case 177:
-                    case 145:
                     case 144:
                     case 143:
-                    case 146:
-                    case 147:
+                    case 141:
+                    case 217:
                         return node === parent_1.type;
+                    case 219:
+                    case 178:
+                    case 179:
+                    case 147:
+                    case 146:
+                    case 145:
                     case 148:
                     case 149:
+                        return node === parent_1.type;
                     case 150:
+                    case 151:
+                    case 152:
                         return node === parent_1.type;
-                    case 174:
+                    case 176:
                         return node === parent_1.type;
-                    case 171:
-                    case 172:
-                        return parent_1.typeArguments && ts.indexOf(parent_1.typeArguments, node) >= 0;
                     case 173:
+                    case 174:
+                        return parent_1.typeArguments && ts.indexOf(parent_1.typeArguments, node) >= 0;
+                    case 175:
                         return false;
                 }
         }
@@ -4274,23 +4816,23 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 207:
+                case 210:
                     return visitor(node);
-                case 223:
-                case 195:
-                case 199:
-                case 200:
-                case 201:
+                case 226:
+                case 198:
                 case 202:
                 case 203:
                 case 204:
-                case 208:
-                case 209:
-                case 244:
-                case 245:
-                case 210:
+                case 205:
+                case 206:
+                case 207:
+                case 211:
                 case 212:
-                case 247:
+                case 248:
+                case 249:
+                case 213:
+                case 215:
+                case 251:
                     return ts.forEachChild(node, traverse);
             }
         }
@@ -4300,23 +4842,23 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 187:
+                case 189:
                     visitor(node);
                     var operand = node.expression;
                     if (operand) {
                         traverse(operand);
                     }
-                case 220:
-                case 218:
+                case 223:
                 case 221:
-                case 219:
-                case 217:
-                case 189:
+                case 224:
+                case 222:
+                case 220:
+                case 191:
                     return;
                 default:
                     if (isFunctionLike(node)) {
                         var name_5 = node.name;
-                        if (name_5 && name_5.kind === 137) {
+                        if (name_5 && name_5.kind === 139) {
                             traverse(name_5.expression);
                             return;
                         }
@@ -4331,14 +4873,14 @@ var ts;
     function isVariableLike(node) {
         if (node) {
             switch (node.kind) {
-                case 166:
-                case 250:
-                case 139:
-                case 248:
-                case 142:
+                case 168:
+                case 254:
                 case 141:
-                case 249:
-                case 214:
+                case 252:
+                case 144:
+                case 143:
+                case 253:
+                case 217:
                     return true;
             }
         }
@@ -4346,11 +4888,11 @@ var ts;
     }
     ts.isVariableLike = isVariableLike;
     function isAccessor(node) {
-        return node && (node.kind === 146 || node.kind === 147);
+        return node && (node.kind === 148 || node.kind === 149);
     }
     ts.isAccessor = isAccessor;
     function isClassLike(node) {
-        return node && (node.kind === 217 || node.kind === 189);
+        return node && (node.kind === 220 || node.kind === 191);
     }
     ts.isClassLike = isClassLike;
     function isFunctionLike(node) {
@@ -4359,32 +4901,32 @@ var ts;
     ts.isFunctionLike = isFunctionLike;
     function isFunctionLikeKind(kind) {
         switch (kind) {
-            case 145:
-            case 176:
-            case 216:
-            case 177:
-            case 144:
-            case 143:
-            case 146:
             case 147:
+            case 178:
+            case 219:
+            case 179:
+            case 146:
+            case 145:
             case 148:
             case 149:
             case 150:
-            case 153:
-            case 154:
+            case 151:
+            case 152:
+            case 155:
+            case 156:
                 return true;
         }
     }
     ts.isFunctionLikeKind = isFunctionLikeKind;
     function introducesArgumentsExoticObject(node) {
         switch (node.kind) {
-            case 144:
-            case 143:
-            case 145:
             case 146:
+            case 145:
             case 147:
-            case 216:
-            case 176:
+            case 148:
+            case 149:
+            case 219:
+            case 178:
                 return true;
         }
         return false;
@@ -4392,30 +4934,34 @@ var ts;
     ts.introducesArgumentsExoticObject = introducesArgumentsExoticObject;
     function isIterationStatement(node, lookInLabeledStatements) {
         switch (node.kind) {
-            case 202:
+            case 205:
+            case 206:
+            case 207:
             case 203:
             case 204:
-            case 200:
-            case 201:
                 return true;
-            case 210:
+            case 213:
                 return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
         }
         return false;
     }
     ts.isIterationStatement = isIterationStatement;
     function isFunctionBlock(node) {
-        return node && node.kind === 195 && isFunctionLike(node.parent);
+        return node && node.kind === 198 && isFunctionLike(node.parent);
     }
     ts.isFunctionBlock = isFunctionBlock;
     function isObjectLiteralMethod(node) {
-        return node && node.kind === 144 && node.parent.kind === 168;
+        return node && node.kind === 146 && node.parent.kind === 170;
     }
     ts.isObjectLiteralMethod = isObjectLiteralMethod;
     function isIdentifierTypePredicate(predicate) {
         return predicate && predicate.kind === 1;
     }
     ts.isIdentifierTypePredicate = isIdentifierTypePredicate;
+    function isThisTypePredicate(predicate) {
+        return predicate && predicate.kind === 0;
+    }
+    ts.isThisTypePredicate = isThisTypePredicate;
     function getContainingFunction(node) {
         while (true) {
             node = node.parent;
@@ -4441,39 +4987,39 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 137:
+                case 139:
                     if (isClassLike(node.parent.parent)) {
                         return node;
                     }
                     node = node.parent;
                     break;
-                case 140:
-                    if (node.parent.kind === 139 && isClassElement(node.parent.parent)) {
+                case 142:
+                    if (node.parent.kind === 141 && isClassElement(node.parent.parent)) {
                         node = node.parent.parent;
                     }
                     else if (isClassElement(node.parent)) {
                         node = node.parent;
                     }
                     break;
-                case 177:
+                case 179:
                     if (!includeArrowFunctions) {
                         continue;
                     }
-                case 216:
-                case 176:
-                case 221:
-                case 142:
-                case 141:
+                case 219:
+                case 178:
+                case 224:
                 case 144:
                 case 143:
-                case 145:
                 case 146:
+                case 145:
                 case 147:
                 case 148:
                 case 149:
                 case 150:
-                case 220:
-                case 251:
+                case 151:
+                case 152:
+                case 223:
+                case 255:
                     return node;
             }
         }
@@ -4486,25 +5032,25 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 137:
+                case 139:
                     node = node.parent;
                     break;
-                case 216:
-                case 176:
-                case 177:
+                case 219:
+                case 178:
+                case 179:
                     if (!stopOnFunctions) {
                         continue;
                     }
-                case 142:
-                case 141:
                 case 144:
                 case 143:
-                case 145:
                 case 146:
+                case 145:
                 case 147:
+                case 148:
+                case 149:
                     return node;
-                case 140:
-                    if (node.parent.kind === 139 && isClassElement(node.parent.parent)) {
+                case 142:
+                    if (node.parent.kind === 141 && isClassElement(node.parent.parent)) {
                         node = node.parent.parent;
                     }
                     else if (isClassElement(node.parent)) {
@@ -4515,15 +5061,21 @@ var ts;
         }
     }
     ts.getSuperContainer = getSuperContainer;
+    function isSuperPropertyOrElementAccess(node) {
+        return (node.kind === 171
+            || node.kind === 172)
+            && node.expression.kind === 95;
+    }
+    ts.isSuperPropertyOrElementAccess = isSuperPropertyOrElementAccess;
     function getEntityNameFromTypeNode(node) {
         if (node) {
             switch (node.kind) {
-                case 152:
+                case 154:
                     return node.typeName;
-                case 191:
+                case 193:
                     return node.expression;
                 case 69:
-                case 136:
+                case 138:
                     return node;
             }
         }
@@ -4531,7 +5083,7 @@ var ts;
     }
     ts.getEntityNameFromTypeNode = getEntityNameFromTypeNode;
     function getInvokedExpression(node) {
-        if (node.kind === 173) {
+        if (node.kind === 175) {
             return node.tag;
         }
         return node.expression;
@@ -4539,21 +5091,21 @@ var ts;
     ts.getInvokedExpression = getInvokedExpression;
     function nodeCanBeDecorated(node) {
         switch (node.kind) {
-            case 217:
+            case 220:
                 return true;
-            case 142:
-                return node.parent.kind === 217;
-            case 146:
-            case 147:
             case 144:
+                return node.parent.kind === 220;
+            case 148:
+            case 149:
+            case 146:
                 return node.body !== undefined
-                    && node.parent.kind === 217;
-            case 139:
+                    && node.parent.kind === 220;
+            case 141:
                 return node.parent.body !== undefined
-                    && (node.parent.kind === 145
-                        || node.parent.kind === 144
-                        || node.parent.kind === 147)
-                    && node.parent.parent.kind === 217;
+                    && (node.parent.kind === 147
+                        || node.parent.kind === 146
+                        || node.parent.kind === 149)
+                    && node.parent.parent.kind === 220;
         }
         return false;
     }
@@ -4564,13 +5116,23 @@ var ts;
     }
     ts.nodeIsDecorated = nodeIsDecorated;
     function isPropertyAccessExpression(node) {
-        return node.kind === 169;
+        return node.kind === 171;
     }
     ts.isPropertyAccessExpression = isPropertyAccessExpression;
     function isElementAccessExpression(node) {
-        return node.kind === 170;
+        return node.kind === 172;
     }
     ts.isElementAccessExpression = isElementAccessExpression;
+    function isJSXTagName(node) {
+        var parent = node.parent;
+        if (parent.kind === 242 ||
+            parent.kind === 241 ||
+            parent.kind === 244) {
+            return parent.tagName === node;
+        }
+        return false;
+    }
+    ts.isJSXTagName = isJSXTagName;
     function isExpression(node) {
         switch (node.kind) {
             case 95:
@@ -4578,42 +5140,43 @@ var ts;
             case 99:
             case 84:
             case 10:
-            case 167:
-            case 168:
             case 169:
             case 170:
             case 171:
             case 172:
             case 173:
-            case 192:
             case 174:
             case 175:
+            case 194:
             case 176:
-            case 189:
+            case 195:
             case 177:
-            case 180:
             case 178:
+            case 191:
             case 179:
             case 182:
-            case 183:
+            case 180:
+            case 181:
             case 184:
             case 185:
-            case 188:
             case 186:
-            case 11:
-            case 190:
-            case 236:
-            case 237:
             case 187:
-            case 181:
+            case 190:
+            case 188:
+            case 11:
+            case 192:
+            case 240:
+            case 241:
+            case 189:
+            case 183:
                 return true;
-            case 136:
-                while (node.parent.kind === 136) {
+            case 138:
+                while (node.parent.kind === 138) {
                     node = node.parent;
                 }
-                return node.parent.kind === 155;
+                return node.parent.kind === 157 || isJSXTagName(node);
             case 69:
-                if (node.parent.kind === 155) {
+                if (node.parent.kind === 157 || isJSXTagName(node)) {
                     return true;
                 }
             case 8:
@@ -4621,47 +5184,47 @@ var ts;
             case 97:
                 var parent_2 = node.parent;
                 switch (parent_2.kind) {
-                    case 214:
-                    case 139:
-                    case 142:
+                    case 217:
                     case 141:
-                    case 250:
-                    case 248:
-                    case 166:
+                    case 144:
+                    case 143:
+                    case 254:
+                    case 252:
+                    case 168:
                         return parent_2.initializer === node;
-                    case 198:
-                    case 199:
-                    case 200:
                     case 201:
-                    case 207:
-                    case 208:
-                    case 209:
-                    case 244:
-                    case 211:
-                    case 209:
-                        return parent_2.expression === node;
                     case 202:
-                        var forStatement = parent_2;
-                        return (forStatement.initializer === node && forStatement.initializer.kind !== 215) ||
-                            forStatement.condition === node ||
-                            forStatement.incrementor === node;
                     case 203:
                     case 204:
+                    case 210:
+                    case 211:
+                    case 212:
+                    case 248:
+                    case 214:
+                    case 212:
+                        return parent_2.expression === node;
+                    case 205:
+                        var forStatement = parent_2;
+                        return (forStatement.initializer === node && forStatement.initializer.kind !== 218) ||
+                            forStatement.condition === node ||
+                            forStatement.incrementor === node;
+                    case 206:
+                    case 207:
                         var forInStatement = parent_2;
-                        return (forInStatement.initializer === node && forInStatement.initializer.kind !== 215) ||
+                        return (forInStatement.initializer === node && forInStatement.initializer.kind !== 218) ||
                             forInStatement.expression === node;
-                    case 174:
-                    case 192:
+                    case 176:
+                    case 194:
                         return node === parent_2.expression;
-                    case 193:
+                    case 196:
                         return node === parent_2.expression;
-                    case 137:
+                    case 139:
                         return node === parent_2.expression;
-                    case 140:
-                    case 243:
-                    case 242:
+                    case 142:
+                    case 247:
+                    case 246:
                         return true;
-                    case 191:
+                    case 193:
                         return parent_2.expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent_2);
                     default:
                         if (isExpression(parent_2)) {
@@ -4683,7 +5246,7 @@ var ts;
     }
     ts.isInstantiatedModule = isInstantiatedModule;
     function isExternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 224 && node.moduleReference.kind === 235;
+        return node.kind === 228 && node.moduleReference.kind === 239;
     }
     ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
     function getExternalModuleImportEqualsDeclarationExpression(node) {
@@ -4692,7 +5255,7 @@ var ts;
     }
     ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
     function isInternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 224 && node.moduleReference.kind !== 235;
+        return node.kind === 228 && node.moduleReference.kind !== 239;
     }
     ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
     function isSourceFileJavaScript(file) {
@@ -4700,23 +5263,26 @@ var ts;
     }
     ts.isSourceFileJavaScript = isSourceFileJavaScript;
     function isInJavaScriptFile(node) {
-        return node && !!(node.parserContextFlags & 32);
+        return node && !!(node.flags & 134217728);
     }
     ts.isInJavaScriptFile = isInJavaScriptFile;
-    function isRequireCall(expression) {
-        return expression.kind === 171 &&
+    function isRequireCall(expression, checkArgumentIsStringLiteral) {
+        var isRequire = expression.kind === 173 &&
             expression.expression.kind === 69 &&
             expression.expression.text === "require" &&
-            expression.arguments.length === 1 &&
-            expression.arguments[0].kind === 9;
+            expression.arguments.length === 1;
+        return isRequire && (!checkArgumentIsStringLiteral || expression.arguments[0].kind === 9);
     }
     ts.isRequireCall = isRequireCall;
     function getSpecialPropertyAssignmentKind(expression) {
-        if (expression.kind !== 184) {
+        if (!isInJavaScriptFile(expression)) {
+            return 0;
+        }
+        if (expression.kind !== 186) {
             return 0;
         }
         var expr = expression;
-        if (expr.operatorToken.kind !== 56 || expr.left.kind !== 169) {
+        if (expr.operatorToken.kind !== 56 || expr.left.kind !== 171) {
             return 0;
         }
         var lhs = expr.left;
@@ -4732,7 +5298,7 @@ var ts;
         else if (lhs.expression.kind === 97) {
             return 4;
         }
-        else if (lhs.expression.kind === 169) {
+        else if (lhs.expression.kind === 171) {
             var innerPropertyAccess = lhs.expression;
             if (innerPropertyAccess.expression.kind === 69 && innerPropertyAccess.name.text === "prototype") {
                 return 3;
@@ -4742,19 +5308,19 @@ var ts;
     }
     ts.getSpecialPropertyAssignmentKind = getSpecialPropertyAssignmentKind;
     function getExternalModuleName(node) {
-        if (node.kind === 225) {
+        if (node.kind === 229) {
             return node.moduleSpecifier;
         }
-        if (node.kind === 224) {
+        if (node.kind === 228) {
             var reference = node.moduleReference;
-            if (reference.kind === 235) {
+            if (reference.kind === 239) {
                 return reference.expression;
             }
         }
-        if (node.kind === 231) {
+        if (node.kind === 235) {
             return node.moduleSpecifier;
         }
-        if (node.kind === 221 && node.name.kind === 9) {
+        if (node.kind === 224 && node.name.kind === 9) {
             return node.name;
         }
     }
@@ -4762,13 +5328,13 @@ var ts;
     function hasQuestionToken(node) {
         if (node) {
             switch (node.kind) {
-                case 139:
+                case 141:
+                case 146:
+                case 145:
+                case 253:
+                case 252:
                 case 144:
                 case 143:
-                case 249:
-                case 248:
-                case 142:
-                case 141:
                     return node.questionToken !== undefined;
             }
         }
@@ -4776,49 +5342,83 @@ var ts;
     }
     ts.hasQuestionToken = hasQuestionToken;
     function isJSDocConstructSignature(node) {
-        return node.kind === 264 &&
+        return node.kind === 268 &&
             node.parameters.length > 0 &&
-            node.parameters[0].type.kind === 266;
+            node.parameters[0].type.kind === 270;
     }
     ts.isJSDocConstructSignature = isJSDocConstructSignature;
-    function getJSDocTag(node, kind) {
-        if (node && node.jsDocComment) {
-            for (var _i = 0, _a = node.jsDocComment.tags; _i < _a.length; _i++) {
-                var tag = _a[_i];
-                if (tag.kind === kind) {
-                    return tag;
-                }
+    function getJSDocTag(node, kind, checkParentVariableStatement) {
+        if (!node) {
+            return undefined;
+        }
+        var jsDocComment = getJSDocComment(node, checkParentVariableStatement);
+        if (!jsDocComment) {
+            return undefined;
+        }
+        for (var _i = 0, _a = jsDocComment.tags; _i < _a.length; _i++) {
+            var tag = _a[_i];
+            if (tag.kind === kind) {
+                return tag;
             }
         }
     }
+    function getJSDocComment(node, checkParentVariableStatement) {
+        if (node.jsDocComment) {
+            return node.jsDocComment;
+        }
+        if (checkParentVariableStatement) {
+            var isInitializerOfVariableDeclarationInStatement = node.parent.kind === 217 &&
+                node.parent.initializer === node &&
+                node.parent.parent.parent.kind === 199;
+            var variableStatementNode = isInitializerOfVariableDeclarationInStatement ? node.parent.parent.parent : undefined;
+            if (variableStatementNode) {
+                return variableStatementNode.jsDocComment;
+            }
+            var parent_3 = node.parent;
+            var isSourceOfAssignmentExpressionStatement = parent_3 && parent_3.parent &&
+                parent_3.kind === 186 &&
+                parent_3.operatorToken.kind === 56 &&
+                parent_3.parent.kind === 201;
+            if (isSourceOfAssignmentExpressionStatement) {
+                return parent_3.parent.jsDocComment;
+            }
+            var isPropertyAssignmentExpression = parent_3 && parent_3.kind === 252;
+            if (isPropertyAssignmentExpression) {
+                return parent_3.jsDocComment;
+            }
+        }
+        return undefined;
+    }
     function getJSDocTypeTag(node) {
-        return getJSDocTag(node, 272);
+        return getJSDocTag(node, 276, false);
     }
     ts.getJSDocTypeTag = getJSDocTypeTag;
     function getJSDocReturnTag(node) {
-        return getJSDocTag(node, 271);
+        return getJSDocTag(node, 275, true);
     }
     ts.getJSDocReturnTag = getJSDocReturnTag;
     function getJSDocTemplateTag(node) {
-        return getJSDocTag(node, 273);
+        return getJSDocTag(node, 277, false);
     }
     ts.getJSDocTemplateTag = getJSDocTemplateTag;
     function getCorrespondingJSDocParameterTag(parameter) {
         if (parameter.name && parameter.name.kind === 69) {
             var parameterName = parameter.name.text;
-            var docComment = parameter.parent.jsDocComment;
-            if (docComment) {
-                return ts.forEach(docComment.tags, function (t) {
-                    if (t.kind === 270) {
-                        var parameterTag = t;
+            var jsDocComment = getJSDocComment(parameter.parent, true);
+            if (jsDocComment) {
+                for (var _i = 0, _a = jsDocComment.tags; _i < _a.length; _i++) {
+                    var tag = _a[_i];
+                    if (tag.kind === 274) {
+                        var parameterTag = tag;
                         var name_6 = parameterTag.preParameterName || parameterTag.postParameterName;
                         if (name_6.text === parameterName) {
-                            return t;
+                            return parameterTag;
                         }
                     }
-                });
+                }
             }
         }
+        return undefined;
     }
     ts.getCorrespondingJSDocParameterTag = getCorrespondingJSDocParameterTag;
     function hasRestParameter(s) {
@@ -4827,13 +5427,13 @@ var ts;
     ts.hasRestParameter = hasRestParameter;
     function isRestParameter(node) {
         if (node) {
-            if (node.parserContextFlags & 32) {
-                if (node.type && node.type.kind === 265) {
+            if (node.flags & 134217728) {
+                if (node.type && node.type.kind === 269) {
                     return true;
                 }
                 var paramTag = getCorrespondingJSDocParameterTag(node);
                 if (paramTag && paramTag.typeExpression) {
-                    return paramTag.typeExpression.type.kind === 265;
+                    return paramTag.typeExpression.type.kind === 269;
                 }
             }
             return node.dotDotDotToken !== undefined;
@@ -4854,7 +5454,7 @@ var ts;
     }
     ts.isTemplateLiteralKind = isTemplateLiteralKind;
     function isBindingPattern(node) {
-        return !!node && (node.kind === 165 || node.kind === 164);
+        return !!node && (node.kind === 167 || node.kind === 166);
     }
     ts.isBindingPattern = isBindingPattern;
     function isNodeDescendentOf(node, ancestor) {
@@ -4868,7 +5468,7 @@ var ts;
     ts.isNodeDescendentOf = isNodeDescendentOf;
     function isInAmbientContext(node) {
         while (node) {
-            if (node.flags & (4 | 4096)) {
+            if (node.flags & 2 || (node.kind === 255 && node.isDeclarationFile)) {
                 return true;
             }
             node = node.parent;
@@ -4878,34 +5478,34 @@ var ts;
     ts.isInAmbientContext = isInAmbientContext;
     function isDeclaration(node) {
         switch (node.kind) {
-            case 177:
-            case 166:
-            case 217:
-            case 189:
-            case 145:
+            case 179:
+            case 168:
             case 220:
-            case 250:
+            case 191:
+            case 147:
+            case 223:
+            case 254:
+            case 237:
+            case 219:
+            case 178:
+            case 148:
+            case 230:
+            case 228:
             case 233:
-            case 216:
-            case 176:
+            case 221:
             case 146:
-            case 226:
+            case 145:
             case 224:
-            case 229:
-            case 218:
+            case 231:
+            case 141:
+            case 252:
             case 144:
             case 143:
-            case 221:
-            case 227:
-            case 139:
-            case 248:
-            case 142:
-            case 141:
-            case 147:
-            case 249:
-            case 219:
-            case 138:
-            case 214:
+            case 149:
+            case 253:
+            case 222:
+            case 140:
+            case 217:
                 return true;
         }
         return false;
@@ -4913,25 +5513,25 @@ var ts;
     ts.isDeclaration = isDeclaration;
     function isStatement(n) {
         switch (n.kind) {
-            case 206:
-            case 205:
-            case 213:
-            case 200:
-            case 198:
-            case 197:
-            case 203:
-            case 204:
-            case 202:
-            case 199:
-            case 210:
-            case 207:
             case 209:
-            case 211:
-            case 212:
-            case 196:
-            case 201:
             case 208:
-            case 230:
+            case 216:
+            case 203:
+            case 201:
+            case 200:
+            case 206:
+            case 207:
+            case 205:
+            case 202:
+            case 213:
+            case 210:
+            case 212:
+            case 214:
+            case 215:
+            case 199:
+            case 204:
+            case 211:
+            case 234:
                 return true;
             default:
                 return false;
@@ -4940,13 +5540,13 @@ var ts;
     ts.isStatement = isStatement;
     function isClassElement(n) {
         switch (n.kind) {
-            case 145:
-            case 142:
+            case 147:
             case 144:
             case 146:
-            case 147:
-            case 143:
-            case 150:
+            case 148:
+            case 149:
+            case 145:
+            case 152:
                 return true;
             default:
                 return false;
@@ -4958,7 +5558,7 @@ var ts;
             return false;
         }
         var parent = name.parent;
-        if (parent.kind === 229 || parent.kind === 233) {
+        if (parent.kind === 233 || parent.kind === 237) {
             if (parent.propertyName) {
                 return true;
             }
@@ -4972,40 +5572,41 @@ var ts;
     function isIdentifierName(node) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 142:
-            case 141:
             case 144:
             case 143:
             case 146:
-            case 147:
-            case 250:
-            case 248:
-            case 169:
+            case 145:
+            case 148:
+            case 149:
+            case 254:
+            case 252:
+            case 171:
                 return parent.name === node;
-            case 136:
+            case 138:
                 if (parent.right === node) {
-                    while (parent.kind === 136) {
+                    while (parent.kind === 138) {
                         parent = parent.parent;
                     }
-                    return parent.kind === 155;
+                    return parent.kind === 157;
                 }
                 return false;
-            case 166:
-            case 229:
-                return parent.propertyName === node;
+            case 168:
             case 233:
+                return parent.propertyName === node;
+            case 237:
                 return true;
         }
         return false;
     }
     ts.isIdentifierName = isIdentifierName;
     function isAliasSymbolDeclaration(node) {
-        return node.kind === 224 ||
-            node.kind === 226 && !!node.name ||
+        return node.kind === 228 ||
             node.kind === 227 ||
-            node.kind === 229 ||
+            node.kind === 230 && !!node.name ||
+            node.kind === 231 ||
             node.kind === 233 ||
-            node.kind === 230 && node.expression.kind === 69;
+            node.kind === 237 ||
+            node.kind === 234 && node.expression.kind === 69;
     }
     ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
     function getClassExtendsHeritageClauseElement(node) {
@@ -5062,32 +5663,32 @@ var ts;
                 };
             }
             else {
-                var matchResult = ts.fullTripleSlashReferencePathRegEx.exec(comment);
-                if (matchResult) {
+                var refMatchResult = ts.fullTripleSlashReferencePathRegEx.exec(comment);
+                var refLibResult = !refMatchResult && ts.fullTripleSlashReferenceTypeReferenceDirectiveRegEx.exec(comment);
+                if (refMatchResult || refLibResult) {
                     var start = commentRange.pos;
                     var end = commentRange.end;
                     return {
                         fileReference: {
                             pos: start,
                             end: end,
-                            fileName: matchResult[3]
+                            fileName: (refMatchResult || refLibResult)[3]
                         },
-                        isNoDefaultLib: false
-                    };
-                }
-                else {
-                    return {
-                        diagnosticMessage: ts.Diagnostics.Invalid_reference_directive_syntax,
-                        isNoDefaultLib: false
+                        isNoDefaultLib: false,
+                        isTypeReferenceDirective: !!refLibResult
                     };
                 }
+                return {
+                    diagnosticMessage: ts.Diagnostics.Invalid_reference_directive_syntax,
+                    isNoDefaultLib: false
+                };
             }
         }
         return undefined;
     }
     ts.getFileReferenceFromReferencePath = getFileReferenceFromReferencePath;
     function isKeyword(token) {
-        return 70 <= token && token <= 135;
+        return 70 <= token && token <= 137;
     }
     ts.isKeyword = isKeyword;
     function isTrivia(token) {
@@ -5107,7 +5708,7 @@ var ts;
     }
     ts.hasDynamicName = hasDynamicName;
     function isDynamicName(name) {
-        return name.kind === 137 &&
+        return name.kind === 139 &&
             !isStringOrNumericLiteral(name.expression.kind) &&
             !isWellKnownSymbolSyntactically(name.expression);
     }
@@ -5120,7 +5721,7 @@ var ts;
         if (name.kind === 69 || name.kind === 9 || name.kind === 8) {
             return name.text;
         }
-        if (name.kind === 137) {
+        if (name.kind === 139) {
             var nameExpression = name.expression;
             if (isWellKnownSymbolSyntactically(nameExpression)) {
                 var rightHandSideName = nameExpression.name.text;
@@ -5149,6 +5750,7 @@ var ts;
             case 112:
             case 110:
             case 111:
+            case 127:
             case 113:
                 return true;
         }
@@ -5157,18 +5759,18 @@ var ts;
     ts.isModifierKind = isModifierKind;
     function isParameterDeclaration(node) {
         var root = getRootDeclaration(node);
-        return root.kind === 139;
+        return root.kind === 141;
     }
     ts.isParameterDeclaration = isParameterDeclaration;
     function getRootDeclaration(node) {
-        while (node.kind === 166) {
+        while (node.kind === 168) {
             node = node.parent.parent;
         }
         return node;
     }
     ts.getRootDeclaration = getRootDeclaration;
     function nodeStartsNewLexicalEnvironment(n) {
-        return isFunctionLike(n) || n.kind === 221 || n.kind === 251;
+        return isFunctionLike(n) || n.kind === 224 || n.kind === 255;
     }
     ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
     function cloneNode(node, location, flags, parent) {
@@ -5201,7 +5803,7 @@ var ts;
     }
     ts.cloneEntityName = cloneEntityName;
     function isQualifiedName(node) {
-        return node.kind === 136;
+        return node.kind === 138;
     }
     ts.isQualifiedName = isQualifiedName;
     function nodeIsSynthesized(node) {
@@ -5437,14 +6039,25 @@ var ts;
         return emitOutputFilePathWithoutExtension + extension;
     }
     ts.getOwnEmitOutputFilePath = getOwnEmitOutputFilePath;
+    function getDeclarationEmitOutputFilePath(sourceFile, host) {
+        var options = host.getCompilerOptions();
+        var outputDir = options.declarationDir || options.outDir;
+        if (options.declaration) {
+            var path = outputDir
+                ? getSourceFilePathInNewDir(sourceFile, host, outputDir)
+                : sourceFile.fileName;
+            return ts.removeFileExtension(path) + ".d.ts";
+        }
+    }
+    ts.getDeclarationEmitOutputFilePath = getDeclarationEmitOutputFilePath;
     function getEmitScriptTarget(compilerOptions) {
         return compilerOptions.target || 0;
     }
     ts.getEmitScriptTarget = getEmitScriptTarget;
     function getEmitModuleKind(compilerOptions) {
-        return compilerOptions.module ?
+        return typeof compilerOptions.module === "number" ?
             compilerOptions.module :
-            getEmitScriptTarget(compilerOptions) === 2 ? 5 : 0;
+            getEmitScriptTarget(compilerOptions) === 2 ? ts.ModuleKind.ES6 : ts.ModuleKind.CommonJS;
     }
     ts.getEmitModuleKind = getEmitModuleKind;
     function forEachExpectedEmitFile(host, action, targetSourceFile) {
@@ -5462,24 +6075,36 @@ var ts;
             }
         }
         function onSingleFileEmit(host, sourceFile) {
-            var jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, sourceFile.languageVariant === 1 && options.jsx === 1 ? ".jsx" : ".js");
+            var extension = ".js";
+            if (options.jsx === 1) {
+                if (isSourceFileJavaScript(sourceFile)) {
+                    if (ts.fileExtensionIs(sourceFile.fileName, ".jsx")) {
+                        extension = ".jsx";
+                    }
+                }
+                else if (sourceFile.languageVariant === 1) {
+                    extension = ".jsx";
+                }
+            }
+            var jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, extension);
             var emitFileNames = {
                 jsFilePath: jsFilePath,
                 sourceMapFilePath: getSourceMapFilePath(jsFilePath, options),
-                declarationFilePath: !isSourceFileJavaScript(sourceFile) ? getDeclarationEmitFilePath(jsFilePath, options) : undefined
+                declarationFilePath: !isSourceFileJavaScript(sourceFile) ? getDeclarationEmitOutputFilePath(sourceFile, host) : undefined
             };
             action(emitFileNames, [sourceFile], false);
         }
         function onBundledEmit(host) {
-            var bundledSources = ts.filter(host.getSourceFiles(), function (sourceFile) { return !isDeclarationFile(sourceFile) &&
-                (!isExternalModule(sourceFile) ||
-                    (getEmitModuleKind(options) && isExternalModule(sourceFile))); });
+            var bundledSources = ts.filter(host.getSourceFiles(), function (sourceFile) {
+                return !isDeclarationFile(sourceFile)
+                    && (!ts.isExternalModule(sourceFile) || !!getEmitModuleKind(options));
+            });
             if (bundledSources.length) {
                 var jsFilePath = options.outFile || options.out;
                 var emitFileNames = {
                     jsFilePath: jsFilePath,
                     sourceMapFilePath: getSourceMapFilePath(jsFilePath, options),
-                    declarationFilePath: getDeclarationEmitFilePath(jsFilePath, options)
+                    declarationFilePath: options.declaration ? ts.removeFileExtension(jsFilePath) + ".d.ts" : undefined
                 };
                 action(emitFileNames, bundledSources, true);
             }
@@ -5487,9 +6112,6 @@ var ts;
         function getSourceMapFilePath(jsFilePath, options) {
             return options.sourceMap ? jsFilePath + ".map" : undefined;
         }
-        function getDeclarationEmitFilePath(jsFilePath, options) {
-            return options.declaration ? ts.removeFileExtension(jsFilePath) + ".d.ts" : undefined;
-        }
     }
     ts.forEachExpectedEmitFile = forEachExpectedEmitFile;
     function getSourceFilePathInNewDir(sourceFile, host, newDirPath) {
@@ -5498,10 +6120,10 @@ var ts;
         return ts.combinePaths(newDirPath, sourceFilePath);
     }
     ts.getSourceFilePathInNewDir = getSourceFilePathInNewDir;
-    function writeFile(host, diagnostics, fileName, data, writeByteOrderMark) {
+    function writeFile(host, diagnostics, fileName, data, writeByteOrderMark, sourceFiles) {
         host.writeFile(fileName, data, writeByteOrderMark, function (hostErrorMessage) {
             diagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Could_not_write_file_0_Colon_1, fileName, hostErrorMessage));
-        });
+        }, sourceFiles);
     }
     ts.writeFile = writeFile;
     function getLineOfLocalPosition(currentSourceFile, pos) {
@@ -5514,7 +6136,7 @@ var ts;
     ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap;
     function getFirstConstructorWithBody(node) {
         return ts.forEach(node.members, function (member) {
-            if (member.kind === 145 && nodeIsPresent(member.body)) {
+            if (member.kind === 147 && nodeIsPresent(member.body)) {
                 return member;
             }
         });
@@ -5531,10 +6153,10 @@ var ts;
         var setAccessor;
         if (hasDynamicName(accessor)) {
             firstAccessor = accessor;
-            if (accessor.kind === 146) {
+            if (accessor.kind === 148) {
                 getAccessor = accessor;
             }
-            else if (accessor.kind === 147) {
+            else if (accessor.kind === 149) {
                 setAccessor = accessor;
             }
             else {
@@ -5543,8 +6165,8 @@ var ts;
         }
         else {
             ts.forEach(declarations, function (member) {
-                if ((member.kind === 146 || member.kind === 147)
-                    && (member.flags & 64) === (accessor.flags & 64)) {
+                if ((member.kind === 148 || member.kind === 149)
+                    && (member.flags & 32) === (accessor.flags & 32)) {
                     var memberName = getPropertyNameForPropertyNameNode(member.name);
                     var accessorName = getPropertyNameForPropertyNameNode(accessor.name);
                     if (memberName === accessorName) {
@@ -5554,10 +6176,10 @@ var ts;
                         else if (!secondAccessor) {
                             secondAccessor = member;
                         }
-                        if (member.kind === 146 && !getAccessor) {
+                        if (member.kind === 148 && !getAccessor) {
                             getAccessor = member;
                         }
-                        if (member.kind === 147 && !setAccessor) {
+                        if (member.kind === 149 && !setAccessor) {
                             setAccessor = member;
                         }
                     }
@@ -5612,7 +6234,7 @@ var ts;
         }
         if (leadingComments) {
             var detachedComments = [];
-            var lastComment;
+            var lastComment = void 0;
             for (var _i = 0, leadingComments_1 = leadingComments; _i < leadingComments_1.length; _i++) {
                 var comment = leadingComments_1[_i];
                 if (lastComment) {
@@ -5646,7 +6268,7 @@ var ts;
         if (text.charCodeAt(comment.pos + 1) === 42) {
             var firstCommentLineAndCharacter = ts.computeLineAndCharacterOfPosition(lineMap, comment.pos);
             var lineCount = lineMap.length;
-            var firstCommentLineIndent;
+            var firstCommentLineIndent = void 0;
             for (var pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) {
                 var nextLineStart = (currentLine + 1) === lineCount
                     ? text.length + 1
@@ -5706,16 +6328,17 @@ var ts;
     }
     function modifierToFlag(token) {
         switch (token) {
-            case 113: return 64;
-            case 112: return 8;
-            case 111: return 32;
-            case 110: return 16;
+            case 113: return 32;
+            case 112: return 4;
+            case 111: return 16;
+            case 110: return 8;
             case 115: return 128;
-            case 82: return 2;
-            case 122: return 4;
-            case 74: return 16384;
+            case 82: return 1;
+            case 122: return 2;
+            case 74: return 2048;
             case 77: return 512;
             case 118: return 256;
+            case 127: return 64;
         }
         return 0;
     }
@@ -5723,24 +6346,25 @@ var ts;
     function isLeftHandSideExpression(expr) {
         if (expr) {
             switch (expr.kind) {
-                case 169:
-                case 170:
-                case 172:
                 case 171:
-                case 236:
-                case 237:
+                case 172:
+                case 174:
                 case 173:
-                case 167:
+                case 195:
+                case 240:
+                case 241:
                 case 175:
-                case 168:
-                case 189:
-                case 176:
+                case 169:
+                case 177:
+                case 170:
+                case 191:
+                case 178:
                 case 69:
                 case 10:
                 case 8:
                 case 9:
                 case 11:
-                case 186:
+                case 188:
                 case 84:
                 case 93:
                 case 97:
@@ -5757,7 +6381,7 @@ var ts;
     }
     ts.isAssignmentOperator = isAssignmentOperator;
     function isExpressionWithTypeArgumentsInClassExtendsClause(node) {
-        return node.kind === 191 &&
+        return node.kind === 193 &&
             node.parent.token === 83 &&
             isClassLike(node.parent.parent);
     }
@@ -5778,16 +6402,16 @@ var ts;
         }
     }
     function isRightSideOfQualifiedNameOrPropertyAccess(node) {
-        return (node.parent.kind === 136 && node.parent.right === node) ||
-            (node.parent.kind === 169 && node.parent.name === node);
+        return (node.parent.kind === 138 && node.parent.right === node) ||
+            (node.parent.kind === 171 && node.parent.name === node);
     }
     ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess;
     function isEmptyObjectLiteralOrArrayLiteral(expression) {
         var kind = expression.kind;
-        if (kind === 168) {
+        if (kind === 170) {
             return expression.properties.length === 0;
         }
-        if (kind === 167) {
+        if (kind === 169) {
             return expression.elements.length === 0;
         }
         return false;
@@ -5908,6 +6532,10 @@ var ts;
         return carriageReturnLineFeed;
     }
     ts.getNewLineCharacter = getNewLineCharacter;
+    function isWatchSet(options) {
+        return options.watch && options.hasOwnProperty("watch");
+    }
+    ts.isWatchSet = isWatchSet;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -6031,9 +6659,9 @@ var ts;
     }
     ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
     function getTypeParameterOwner(d) {
-        if (d && d.kind === 138) {
+        if (d && d.kind === 140) {
             for (var current = d; current; current = current.parent) {
-                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 218) {
+                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 221) {
                     return current;
                 }
             }
@@ -6041,9 +6669,18 @@ var ts;
     }
     ts.getTypeParameterOwner = getTypeParameterOwner;
     function isParameterPropertyDeclaration(node) {
-        return node.flags & 56 && node.parent.kind === 145 && ts.isClassLike(node.parent.parent);
+        return node.flags & 28 && node.parent.kind === 147 && 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) {
@@ -6051,7 +6688,7 @@ var ts;
     var NodeConstructor;
     var SourceFileConstructor;
     function createNode(kind, pos, end) {
-        if (kind === 251) {
+        if (kind === 255) {
             return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
         }
         else {
@@ -6087,26 +6724,26 @@ var ts;
         var visitNodes = cbNodeArray ? visitNodeArray : visitEachNode;
         var cbNodes = cbNodeArray || cbNode;
         switch (node.kind) {
-            case 136:
+            case 138:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.right);
-            case 138:
+            case 140:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNode(cbNode, node.expression);
-            case 249:
+            case 253:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.equalsToken) ||
                     visitNode(cbNode, node.objectAssignmentInitializer);
-            case 139:
-            case 142:
             case 141:
-            case 248:
-            case 214:
-            case 166:
+            case 144:
+            case 143:
+            case 252:
+            case 217:
+            case 168:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.propertyName) ||
@@ -6115,24 +6752,24 @@ var ts;
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 153:
-            case 154:
-            case 148:
-            case 149:
+            case 155:
+            case 156:
             case 150:
+            case 151:
+            case 152:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNodes(cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 144:
-            case 143:
-            case 145:
             case 146:
+            case 145:
             case 147:
-            case 176:
-            case 216:
-            case 177:
+            case 148:
+            case 149:
+            case 178:
+            case 219:
+            case 179:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.asteriskToken) ||
@@ -6143,302 +6780,310 @@ var ts;
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.equalsGreaterThanToken) ||
                     visitNode(cbNode, node.body);
-            case 152:
+            case 154:
                 return visitNode(cbNode, node.typeName) ||
                     visitNodes(cbNodes, node.typeArguments);
-            case 151:
+            case 153:
                 return visitNode(cbNode, node.parameterName) ||
                     visitNode(cbNode, node.type);
-            case 155:
-                return visitNode(cbNode, node.exprName);
-            case 156:
-                return visitNodes(cbNodes, node.members);
             case 157:
-                return visitNode(cbNode, node.elementType);
+                return visitNode(cbNode, node.exprName);
             case 158:
-                return visitNodes(cbNodes, node.elementTypes);
+                return visitNodes(cbNodes, node.members);
             case 159:
+                return visitNode(cbNode, node.elementType);
             case 160:
-                return visitNodes(cbNodes, node.types);
+                return visitNodes(cbNodes, node.elementTypes);
             case 161:
+            case 162:
+                return visitNodes(cbNodes, node.types);
+            case 163:
                 return visitNode(cbNode, node.type);
-            case 164:
-            case 165:
-                return visitNodes(cbNodes, node.elements);
+            case 166:
             case 167:
                 return visitNodes(cbNodes, node.elements);
-            case 168:
-                return visitNodes(cbNodes, node.properties);
             case 169:
+                return visitNodes(cbNodes, node.elements);
+            case 170:
+                return visitNodes(cbNodes, node.properties);
+            case 171:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.dotToken) ||
                     visitNode(cbNode, node.name);
-            case 170:
+            case 172:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.argumentExpression);
-            case 171:
-            case 172:
+            case 173:
+            case 174:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNodes, node.typeArguments) ||
                     visitNodes(cbNodes, node.arguments);
-            case 173:
+            case 175:
                 return visitNode(cbNode, node.tag) ||
                     visitNode(cbNode, node.template);
-            case 174:
+            case 176:
                 return visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.expression);
-            case 175:
-                return visitNode(cbNode, node.expression);
-            case 178:
-                return visitNode(cbNode, node.expression);
-            case 179:
+            case 177:
                 return visitNode(cbNode, node.expression);
             case 180:
                 return visitNode(cbNode, node.expression);
-            case 182:
-                return visitNode(cbNode, node.operand);
-            case 187:
-                return visitNode(cbNode, node.asteriskToken) ||
-                    visitNode(cbNode, node.expression);
             case 181:
                 return visitNode(cbNode, node.expression);
-            case 183:
-                return visitNode(cbNode, node.operand);
+            case 182:
+                return visitNode(cbNode, node.expression);
             case 184:
+                return visitNode(cbNode, node.operand);
+            case 189:
+                return visitNode(cbNode, node.asteriskToken) ||
+                    visitNode(cbNode, node.expression);
+            case 183:
+                return visitNode(cbNode, node.expression);
+            case 185:
+                return visitNode(cbNode, node.operand);
+            case 186:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.operatorToken) ||
                     visitNode(cbNode, node.right);
-            case 192:
+            case 194:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.type);
-            case 185:
+            case 195:
+                return visitNode(cbNode, node.expression);
+            case 187:
                 return visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.whenTrue) ||
                     visitNode(cbNode, node.colonToken) ||
                     visitNode(cbNode, node.whenFalse);
-            case 188:
+            case 190:
                 return visitNode(cbNode, node.expression);
-            case 195:
-            case 222:
+            case 198:
+            case 225:
                 return visitNodes(cbNodes, node.statements);
-            case 251:
+            case 255:
                 return visitNodes(cbNodes, node.statements) ||
                     visitNode(cbNode, node.endOfFileToken);
-            case 196:
+            case 199:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.declarationList);
-            case 215:
+            case 218:
                 return visitNodes(cbNodes, node.declarations);
-            case 198:
+            case 201:
                 return visitNode(cbNode, node.expression);
-            case 199:
+            case 202:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.thenStatement) ||
                     visitNode(cbNode, node.elseStatement);
-            case 200:
+            case 203:
                 return visitNode(cbNode, node.statement) ||
                     visitNode(cbNode, node.expression);
-            case 201:
+            case 204:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 202:
+            case 205:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.incrementor) ||
                     visitNode(cbNode, node.statement);
-            case 203:
-                return visitNode(cbNode, node.initializer) ||
-                    visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
-            case 204:
-                return visitNode(cbNode, node.initializer) ||
-                    visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
-            case 205:
             case 206:
-                return visitNode(cbNode, node.label);
+                return visitNode(cbNode, node.initializer) ||
+                    visitNode(cbNode, node.expression) ||
+                    visitNode(cbNode, node.statement);
             case 207:
-                return visitNode(cbNode, node.expression);
+                return visitNode(cbNode, node.initializer) ||
+                    visitNode(cbNode, node.expression) ||
+                    visitNode(cbNode, node.statement);
             case 208:
+            case 209:
+                return visitNode(cbNode, node.label);
+            case 210:
+                return visitNode(cbNode, node.expression);
+            case 211:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 209:
+            case 212:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.caseBlock);
-            case 223:
+            case 226:
                 return visitNodes(cbNodes, node.clauses);
-            case 244:
+            case 248:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNodes, node.statements);
-            case 245:
+            case 249:
                 return visitNodes(cbNodes, node.statements);
-            case 210:
+            case 213:
                 return visitNode(cbNode, node.label) ||
                     visitNode(cbNode, node.statement);
-            case 211:
+            case 214:
                 return visitNode(cbNode, node.expression);
-            case 212:
+            case 215:
                 return visitNode(cbNode, node.tryBlock) ||
                     visitNode(cbNode, node.catchClause) ||
                     visitNode(cbNode, node.finallyBlock);
-            case 247:
+            case 251:
                 return visitNode(cbNode, node.variableDeclaration) ||
                     visitNode(cbNode, node.block);
-            case 140:
+            case 142:
                 return visitNode(cbNode, node.expression);
-            case 217:
-            case 189:
-                return visitNodes(cbNodes, node.decorators) ||
-                    visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNodes(cbNodes, node.typeParameters) ||
-                    visitNodes(cbNodes, node.heritageClauses) ||
-                    visitNodes(cbNodes, node.members);
-            case 218:
-                return visitNodes(cbNodes, node.decorators) ||
-                    visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNodes(cbNodes, node.typeParameters) ||
-                    visitNodes(cbNodes, node.heritageClauses) ||
-                    visitNodes(cbNodes, node.members);
-            case 219:
-                return visitNodes(cbNodes, node.decorators) ||
-                    visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNodes(cbNodes, node.typeParameters) ||
-                    visitNode(cbNode, node.type);
             case 220:
+            case 191:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
+                    visitNodes(cbNodes, node.typeParameters) ||
+                    visitNodes(cbNodes, node.heritageClauses) ||
                     visitNodes(cbNodes, node.members);
-            case 250:
-                return visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.initializer);
             case 221:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.body);
+                    visitNodes(cbNodes, node.typeParameters) ||
+                    visitNodes(cbNodes, node.heritageClauses) ||
+                    visitNodes(cbNodes, node.members);
+            case 222:
+                return visitNodes(cbNodes, node.decorators) ||
+                    visitNodes(cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.name) ||
+                    visitNodes(cbNodes, node.typeParameters) ||
+                    visitNode(cbNode, node.type);
+            case 223:
+                return visitNodes(cbNodes, node.decorators) ||
+                    visitNodes(cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.name) ||
+                    visitNodes(cbNodes, node.members);
+            case 254:
+                return visitNode(cbNode, node.name) ||
+                    visitNode(cbNode, node.initializer);
             case 224:
+                return visitNodes(cbNodes, node.decorators) ||
+                    visitNodes(cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.name) ||
+                    visitNode(cbNode, node.body);
+            case 228:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.moduleReference);
-            case 225:
+            case 229:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.importClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 226:
+            case 230:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.namedBindings);
             case 227:
                 return visitNode(cbNode, node.name);
-            case 228:
-            case 232:
-                return visitNodes(cbNodes, node.elements);
             case 231:
+                return visitNode(cbNode, node.name);
+            case 232:
+            case 236:
+                return visitNodes(cbNodes, node.elements);
+            case 235:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.exportClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 229:
             case 233:
+            case 237:
                 return visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name);
-            case 230:
+            case 234:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.expression);
-            case 186:
+            case 188:
                 return visitNode(cbNode, node.head) || visitNodes(cbNodes, node.templateSpans);
-            case 193:
+            case 196:
                 return visitNode(cbNode, node.expression) || visitNode(cbNode, node.literal);
-            case 137:
+            case 139:
                 return visitNode(cbNode, node.expression);
-            case 246:
+            case 250:
                 return visitNodes(cbNodes, node.types);
-            case 191:
+            case 193:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNodes, node.typeArguments);
-            case 235:
+            case 239:
                 return visitNode(cbNode, node.expression);
-            case 234:
+            case 238:
                 return visitNodes(cbNodes, node.decorators);
-            case 236:
+            case 240:
                 return visitNode(cbNode, node.openingElement) ||
                     visitNodes(cbNodes, node.children) ||
                     visitNode(cbNode, node.closingElement);
-            case 237:
-            case 238:
+            case 241:
+            case 242:
                 return visitNode(cbNode, node.tagName) ||
                     visitNodes(cbNodes, node.attributes);
-            case 241:
+            case 245:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 242:
+            case 246:
                 return visitNode(cbNode, node.expression);
-            case 243:
+            case 247:
                 return visitNode(cbNode, node.expression);
-            case 240:
+            case 244:
                 return visitNode(cbNode, node.tagName);
-            case 252:
-                return visitNode(cbNode, node.type);
             case 256:
-                return visitNodes(cbNodes, node.types);
-            case 257:
-                return visitNodes(cbNodes, node.types);
-            case 255:
-                return visitNode(cbNode, node.elementType);
-            case 259:
-                return visitNode(cbNode, node.type);
-            case 258:
                 return visitNode(cbNode, node.type);
             case 260:
-                return visitNodes(cbNodes, node.members);
-            case 262:
-                return visitNode(cbNode, node.name) ||
-                    visitNodes(cbNodes, node.typeArguments);
+                return visitNodes(cbNodes, node.types);
+            case 261:
+                return visitNodes(cbNodes, node.types);
+            case 259:
+                return visitNode(cbNode, node.elementType);
             case 263:
                 return visitNode(cbNode, node.type);
+            case 262:
+                return visitNode(cbNode, node.type);
             case 264:
-                return visitNodes(cbNodes, node.parameters) ||
-                    visitNode(cbNode, node.type);
-            case 265:
-                return visitNode(cbNode, node.type);
+                return visitNodes(cbNodes, node.members);
             case 266:
-                return visitNode(cbNode, node.type);
+                return visitNode(cbNode, node.name) ||
+                    visitNodes(cbNodes, node.typeArguments);
             case 267:
                 return visitNode(cbNode, node.type);
-            case 261:
+            case 268:
+                return visitNodes(cbNodes, node.parameters) ||
+                    visitNode(cbNode, node.type);
+            case 269:
+                return visitNode(cbNode, node.type);
+            case 270:
+                return visitNode(cbNode, node.type);
+            case 271:
+                return visitNode(cbNode, node.type);
+            case 265:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.type);
-            case 268:
+            case 272:
                 return visitNodes(cbNodes, node.tags);
-            case 270:
+            case 274:
                 return visitNode(cbNode, node.preParameterName) ||
                     visitNode(cbNode, node.typeExpression) ||
                     visitNode(cbNode, node.postParameterName);
-            case 271:
+            case 275:
                 return visitNode(cbNode, node.typeExpression);
-            case 272:
+            case 276:
                 return visitNode(cbNode, node.typeExpression);
-            case 273:
+            case 277:
                 return visitNodes(cbNodes, node.typeParameters);
         }
     }
     ts.forEachChild = forEachChild;
-    function createSourceFile(fileName, sourceText, languageVersion, setParentNodes) {
+    function createSourceFile(fileName, sourceText, languageVersion, setParentNodes, scriptKind) {
         if (setParentNodes === void 0) { setParentNodes = false; }
         var start = new Date().getTime();
-        var result = Parser.parseSourceFile(fileName, sourceText, languageVersion, undefined, setParentNodes);
+        var result = Parser.parseSourceFile(fileName, sourceText, languageVersion, undefined, setParentNodes, scriptKind);
         ts.parseTime += new Date().getTime() - start;
         return result;
     }
     ts.createSourceFile = createSourceFile;
+    function isExternalModule(file) {
+        return file.externalModuleIndicator !== undefined;
+    }
+    ts.isExternalModule = isExternalModule;
     function updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks) {
         return IncrementalParser.updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks);
     }
@@ -6454,7 +7099,7 @@ var ts;
     var Parser;
     (function (Parser) {
         var scanner = ts.createScanner(2, true);
-        var disallowInAndDecoratorContext = 1 | 4;
+        var disallowInAndDecoratorContext = 4194304 | 16777216;
         var NodeConstructor;
         var SourceFileConstructor;
         var sourceFile;
@@ -6468,18 +7113,18 @@ var ts;
         var parsingContext;
         var contextFlags;
         var parseErrorBeforeNextFinishedNode = false;
-        function parseSourceFile(fileName, _sourceText, languageVersion, _syntaxCursor, setParentNodes) {
-            var isJavaScriptFile = ts.hasJavaScriptFileExtension(fileName) || _sourceText.lastIndexOf("// @language=javascript", 0) === 0;
-            initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor);
-            var result = parseSourceFileWorker(fileName, languageVersion, setParentNodes);
+        function parseSourceFile(fileName, _sourceText, languageVersion, _syntaxCursor, setParentNodes, scriptKind) {
+            scriptKind = ts.ensureScriptKind(fileName, scriptKind);
+            initializeState(fileName, _sourceText, languageVersion, _syntaxCursor, scriptKind);
+            var result = parseSourceFileWorker(fileName, languageVersion, setParentNodes, scriptKind);
             clearState();
             return result;
         }
         Parser.parseSourceFile = parseSourceFile;
-        function getLanguageVariant(fileName) {
-            return ts.fileExtensionIs(fileName, ".tsx") || ts.fileExtensionIs(fileName, ".jsx") ? 1 : 0;
+        function getLanguageVariant(scriptKind) {
+            return scriptKind === 4 || scriptKind === 2 || scriptKind === 1 ? 1 : 0;
         }
-        function initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor) {
+        function initializeState(fileName, _sourceText, languageVersion, _syntaxCursor, scriptKind) {
             NodeConstructor = ts.objectAllocator.getNodeConstructor();
             SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor();
             sourceText = _sourceText;
@@ -6489,12 +7134,12 @@ var ts;
             identifiers = {};
             identifierCount = 0;
             nodeCount = 0;
-            contextFlags = isJavaScriptFile ? 32 : 0;
+            contextFlags = scriptKind === 1 || scriptKind === 2 ? 134217728 : 0;
             parseErrorBeforeNextFinishedNode = false;
             scanner.setText(sourceText);
             scanner.setOnError(scanError);
             scanner.setScriptTarget(languageVersion);
-            scanner.setLanguageVariant(getLanguageVariant(fileName));
+            scanner.setLanguageVariant(getLanguageVariant(scriptKind));
         }
         function clearState() {
             scanner.setText("");
@@ -6505,11 +7150,9 @@ var ts;
             syntaxCursor = undefined;
             sourceText = undefined;
         }
-        function parseSourceFileWorker(fileName, languageVersion, setParentNodes) {
-            sourceFile = createSourceFile(fileName, languageVersion);
-            if (contextFlags & 32) {
-                sourceFile.parserContextFlags = 32;
-            }
+        function parseSourceFileWorker(fileName, languageVersion, setParentNodes, scriptKind) {
+            sourceFile = createSourceFile(fileName, languageVersion, scriptKind);
+            sourceFile.flags = contextFlags;
             token = nextToken();
             processReferenceComments(sourceFile);
             sourceFile.statements = parseList(0, parseStatement);
@@ -6523,35 +7166,22 @@ var ts;
             if (setParentNodes) {
                 fixupParentReferences(sourceFile);
             }
-            if (ts.isSourceFileJavaScript(sourceFile)) {
-                addJSDocComments();
-            }
             return sourceFile;
         }
-        function addJSDocComments() {
-            forEachChild(sourceFile, visit);
-            return;
-            function visit(node) {
-                switch (node.kind) {
-                    case 196:
-                    case 216:
-                    case 139:
-                        addJSDocComment(node);
-                }
-                forEachChild(node, visit);
-            }
-        }
         function addJSDocComment(node) {
-            var comments = ts.getLeadingCommentRangesOfNode(node, sourceFile);
-            if (comments) {
-                for (var _i = 0, comments_1 = comments; _i < comments_1.length; _i++) {
-                    var comment = comments_1[_i];
-                    var jsDocComment = JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos);
-                    if (jsDocComment) {
-                        node.jsDocComment = jsDocComment;
+            if (contextFlags & 134217728) {
+                var comments = ts.getLeadingCommentRangesOfNode(node, sourceFile);
+                if (comments) {
+                    for (var _i = 0, comments_1 = comments; _i < comments_1.length; _i++) {
+                        var comment = comments_1[_i];
+                        var jsDocComment = JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos);
+                        if (jsDocComment) {
+                            node.jsDocComment = jsDocComment;
+                        }
                     }
                 }
             }
+            return node;
         }
         function fixupParentReferences(sourceFile) {
             var parent = sourceFile;
@@ -6568,15 +7198,16 @@ var ts;
             }
         }
         Parser.fixupParentReferences = fixupParentReferences;
-        function createSourceFile(fileName, languageVersion) {
-            var sourceFile = new SourceFileConstructor(251, 0, sourceText.length);
+        function createSourceFile(fileName, languageVersion, scriptKind) {
+            var sourceFile = new SourceFileConstructor(255, 0, sourceText.length);
             nodeCount++;
             sourceFile.text = sourceText;
             sourceFile.bindDiagnostics = [];
             sourceFile.languageVersion = languageVersion;
             sourceFile.fileName = ts.normalizePath(fileName);
-            sourceFile.flags = ts.fileExtensionIs(sourceFile.fileName, ".d.ts") ? 4096 : 0;
-            sourceFile.languageVariant = getLanguageVariant(sourceFile.fileName);
+            sourceFile.languageVariant = getLanguageVariant(scriptKind);
+            sourceFile.isDeclarationFile = ts.fileExtensionIs(sourceFile.fileName, ".d.ts");
+            sourceFile.scriptKind = scriptKind;
             return sourceFile;
         }
         function setContextFlag(val, flag) {
@@ -6588,16 +7219,16 @@ var ts;
             }
         }
         function setDisallowInContext(val) {
-            setContextFlag(val, 1);
+            setContextFlag(val, 4194304);
         }
         function setYieldContext(val) {
-            setContextFlag(val, 2);
+            setContextFlag(val, 8388608);
         }
         function setDecoratorContext(val) {
-            setContextFlag(val, 4);
+            setContextFlag(val, 16777216);
         }
         function setAwaitContext(val) {
-            setContextFlag(val, 8);
+            setContextFlag(val, 33554432);
         }
         function doOutsideOfContext(context, func) {
             var contextFlagsToClear = context & contextFlags;
@@ -6620,40 +7251,40 @@ var ts;
             return func();
         }
         function allowInAnd(func) {
-            return doOutsideOfContext(1, func);
+            return doOutsideOfContext(4194304, func);
         }
         function disallowInAnd(func) {
-            return doInsideOfContext(1, func);
+            return doInsideOfContext(4194304, func);
         }
         function doInYieldContext(func) {
-            return doInsideOfContext(2, func);
+            return doInsideOfContext(8388608, func);
         }
         function doInDecoratorContext(func) {
-            return doInsideOfContext(4, func);
+            return doInsideOfContext(16777216, func);
         }
         function doInAwaitContext(func) {
-            return doInsideOfContext(8, func);
+            return doInsideOfContext(33554432, func);
         }
         function doOutsideOfAwaitContext(func) {
-            return doOutsideOfContext(8, func);
+            return doOutsideOfContext(33554432, func);
         }
         function doInYieldAndAwaitContext(func) {
-            return doInsideOfContext(2 | 8, func);
+            return doInsideOfContext(8388608 | 33554432, func);
         }
         function inContext(flags) {
             return (contextFlags & flags) !== 0;
         }
         function inYieldContext() {
-            return inContext(2);
+            return inContext(8388608);
         }
         function inDisallowInContext() {
-            return inContext(1);
+            return inContext(4194304);
         }
         function inDecoratorContext() {
-            return inContext(4);
+            return inContext(16777216);
         }
         function inAwaitContext() {
-            return inContext(8);
+            return inContext(33554432);
         }
         function parseErrorAtCurrentToken(message, arg0) {
             var start = scanner.getTokenPos();
@@ -6794,11 +7425,11 @@ var ts;
         function finishNode(node, end) {
             node.end = end === undefined ? scanner.getStartPos() : end;
             if (contextFlags) {
-                node.parserContextFlags = contextFlags;
+                node.flags |= contextFlags;
             }
             if (parseErrorBeforeNextFinishedNode) {
                 parseErrorBeforeNextFinishedNode = false;
-                node.parserContextFlags |= 16;
+                node.flags |= 67108864;
             }
             return node;
         }
@@ -6860,7 +7491,7 @@ var ts;
             return token === 9 || token === 8 || ts.tokenIsIdentifierOrKeyword(token);
         }
         function parseComputedPropertyName() {
-            var node = createNode(137);
+            var node = createNode(139);
             parseExpected(19);
             node.expression = allowInAnd(parseExpression);
             parseExpected(20);
@@ -6885,7 +7516,7 @@ var ts;
                 if (token === 77) {
                     return lookAhead(nextTokenIsClassOrFunction);
                 }
-                return token !== 37 && token !== 15 && canFollowModifier();
+                return token !== 37 && token !== 116 && token !== 15 && canFollowModifier();
             }
             if (token === 77) {
                 return nextTokenIsClassOrFunction();
@@ -6922,7 +7553,7 @@ var ts;
                 case 2:
                     return token === 71 || token === 77;
                 case 4:
-                    return isStartOfTypeMember();
+                    return lookAhead(isTypeMemberStart);
                 case 5:
                     return lookAhead(isClassMemberStart) || (token === 23 && !inErrorRecovery);
                 case 6:
@@ -7112,7 +7743,7 @@ var ts;
             if (ts.containsParseError(node)) {
                 return undefined;
             }
-            var nodeContextFlags = node.parserContextFlags & 31;
+            var nodeContextFlags = node.flags & 197132288;
             if (nodeContextFlags !== contextFlags) {
                 return undefined;
             }
@@ -7159,14 +7790,14 @@ var ts;
         function isReusableClassMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 145:
-                    case 150:
-                    case 146:
                     case 147:
-                    case 142:
-                    case 194:
-                        return true;
+                    case 152:
+                    case 148:
+                    case 149:
                     case 144:
+                    case 197:
+                        return true;
+                    case 146:
                         var methodDeclaration = node;
                         var nameIsConstructor = methodDeclaration.name.kind === 69 &&
                             methodDeclaration.name.originalKeywordKind === 121;
@@ -7178,8 +7809,8 @@ var ts;
         function isReusableSwitchClause(node) {
             if (node) {
                 switch (node.kind) {
-                    case 244:
-                    case 245:
+                    case 248:
+                    case 249:
                         return true;
                 }
             }
@@ -7188,65 +7819,65 @@ var ts;
         function isReusableStatement(node) {
             if (node) {
                 switch (node.kind) {
-                    case 216:
-                    case 196:
-                    case 195:
+                    case 219:
                     case 199:
                     case 198:
-                    case 211:
-                    case 207:
-                    case 209:
-                    case 206:
-                    case 205:
-                    case 203:
-                    case 204:
                     case 202:
                     case 201:
-                    case 208:
-                    case 197:
-                    case 212:
+                    case 214:
                     case 210:
+                    case 212:
+                    case 209:
+                    case 208:
+                    case 206:
+                    case 207:
+                    case 205:
+                    case 204:
+                    case 211:
                     case 200:
+                    case 215:
                     case 213:
-                    case 225:
+                    case 203:
+                    case 216:
+                    case 229:
+                    case 228:
+                    case 235:
+                    case 234:
                     case 224:
-                    case 231:
-                    case 230:
-                    case 221:
-                    case 217:
-                    case 218:
                     case 220:
-                    case 219:
+                    case 221:
+                    case 223:
+                    case 222:
                         return true;
                 }
             }
             return false;
         }
         function isReusableEnumMember(node) {
-            return node.kind === 250;
+            return node.kind === 254;
         }
         function isReusableTypeMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 149:
+                    case 151:
+                    case 145:
+                    case 152:
                     case 143:
                     case 150:
-                    case 141:
-                    case 148:
                         return true;
                 }
             }
             return false;
         }
         function isReusableVariableDeclaration(node) {
-            if (node.kind !== 214) {
+            if (node.kind !== 217) {
                 return false;
             }
             var variableDeclarator = node;
             return variableDeclarator.initializer === undefined;
         }
         function isReusableParameter(node) {
-            if (node.kind !== 139) {
+            if (node.kind !== 141) {
                 return false;
             }
             var parameter = node;
@@ -7291,7 +7922,7 @@ var ts;
             }
         }
         ;
-        function parseDelimitedList(kind, parseElement, considerSemicolonAsDelimeter) {
+        function parseDelimitedList(kind, parseElement, considerSemicolonAsDelimiter) {
             var saveParsingContext = parsingContext;
             parsingContext |= 1 << kind;
             var result = [];
@@ -7309,7 +7940,7 @@ var ts;
                         break;
                     }
                     parseExpected(24);
-                    if (considerSemicolonAsDelimeter && token === 23 && !scanner.hasPrecedingLineBreak()) {
+                    if (considerSemicolonAsDelimiter && token === 23 && !scanner.hasPrecedingLineBreak()) {
                         nextToken();
                     }
                     continue;
@@ -7346,7 +7977,7 @@ var ts;
         function parseEntityName(allowReservedWords, diagnosticMessage) {
             var entity = parseIdentifier(diagnosticMessage);
             while (parseOptional(21)) {
-                var node = createNode(136, entity.pos);
+                var node = createNode(138, entity.pos);
                 node.left = entity;
                 node.right = parseRightSideOfDot(allowReservedWords);
                 entity = finishNode(node);
@@ -7363,7 +7994,7 @@ var ts;
             return allowIdentifierNames ? parseIdentifierName() : parseIdentifier();
         }
         function parseTemplateExpression() {
-            var template = createNode(186);
+            var template = createNode(188);
             template.head = parseTemplateLiteralFragment();
             ts.Debug.assert(template.head.kind === 12, "Template head has wrong token kind");
             var templateSpans = [];
@@ -7376,7 +8007,7 @@ var ts;
             return finishNode(template);
         }
         function parseTemplateSpan() {
-            var span = createNode(193);
+            var span = createNode(196);
             span.expression = allowInAnd(parseExpression);
             var literal;
             if (token === 16) {
@@ -7390,7 +8021,7 @@ var ts;
             return finishNode(span);
         }
         function parseStringLiteralTypeNode() {
-            return parseLiteralLikeNode(163, true);
+            return parseLiteralLikeNode(165, true);
         }
         function parseLiteralNode(internName) {
             return parseLiteralLikeNode(token, internName);
@@ -7414,39 +8045,39 @@ var ts;
             if (node.kind === 8
                 && sourceText.charCodeAt(tokenPos) === 48
                 && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) {
-                node.flags |= 32768;
+                node.isOctalLiteral = true;
             }
             return node;
         }
         function parseTypeReference() {
             var typeName = parseEntityName(false, ts.Diagnostics.Type_expected);
-            var node = createNode(152, typeName.pos);
+            var node = createNode(154, typeName.pos);
             node.typeName = typeName;
             if (!scanner.hasPrecedingLineBreak() && token === 25) {
                 node.typeArguments = parseBracketedList(18, parseType, 25, 27);
             }
             return finishNode(node);
         }
-        function parseTypePredicate(lhs) {
+        function parseThisTypePredicate(lhs) {
             nextToken();
-            var node = createNode(151, lhs.pos);
+            var node = createNode(153, lhs.pos);
             node.parameterName = lhs;
             node.type = parseType();
             return finishNode(node);
         }
         function parseThisTypeNode() {
-            var node = createNode(162);
+            var node = createNode(164);
             nextToken();
             return finishNode(node);
         }
         function parseTypeQuery() {
-            var node = createNode(155);
+            var node = createNode(157);
             parseExpected(101);
             node.exprName = parseEntityName(true);
             return finishNode(node);
         }
         function parseTypeParameter() {
-            var node = createNode(138);
+            var node = createNode(140);
             node.name = parseIdentifier();
             if (parseOptional(83)) {
                 if (isStartOfType() || !isStartOfExpression()) {
@@ -7470,7 +8101,7 @@ var ts;
             return undefined;
         }
         function isStartOfParameter() {
-            return token === 22 || isIdentifierOrPattern() || ts.isModifierKind(token) || token === 55;
+            return token === 22 || isIdentifierOrPattern() || ts.isModifierKind(token) || token === 55 || token === 97;
         }
         function setModifiers(node, modifiers) {
             if (modifiers) {
@@ -7479,7 +8110,12 @@ var ts;
             }
         }
         function parseParameter() {
-            var node = createNode(139);
+            var node = createNode(141);
+            if (token === 97) {
+                node.name = createIdentifier(true, undefined);
+                node.type = parseParameterType();
+                return finishNode(node);
+            }
             node.decorators = parseDecorators();
             setModifiers(node, parseModifiers());
             node.dotDotDotToken = parseOptionalToken(22);
@@ -7490,7 +8126,7 @@ var ts;
             node.questionToken = parseOptionalToken(53);
             node.type = parseParameterType();
             node.initializer = parseBindingElementInitializer(true);
-            return finishNode(node);
+            return addJSDocComment(finishNode(node));
         }
         function parseBindingElementInitializer(inParameter) {
             return inParameter ? parseParameterInitializer() : parseNonParameterInitializer();
@@ -7534,7 +8170,7 @@ var ts;
         }
         function parseSignatureMember(kind) {
             var node = createNode(kind);
-            if (kind === 149) {
+            if (kind === 151) {
                 parseExpected(92);
             }
             fillSignature(54, false, false, false, node);
@@ -7574,7 +8210,7 @@ var ts;
             return token === 54 || token === 24 || token === 20;
         }
         function parseIndexSignatureDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(150, fullStart);
+            var node = createNode(152, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             node.parameters = parseBracketedList(16, parseParameter, 19, 20);
@@ -7582,12 +8218,12 @@ var ts;
             parseTypeMemberSemicolon();
             return finishNode(node);
         }
-        function parsePropertyOrMethodSignature() {
-            var fullStart = scanner.getStartPos();
+        function parsePropertyOrMethodSignature(fullStart, modifiers) {
             var name = parsePropertyName();
             var questionToken = parseOptionalToken(53);
             if (token === 17 || token === 25) {
-                var method = createNode(143, fullStart);
+                var method = createNode(145, fullStart);
+                setModifiers(method, modifiers);
                 method.name = name;
                 method.questionToken = questionToken;
                 fillSignature(54, false, false, false, method);
@@ -7595,7 +8231,8 @@ var ts;
                 return finishNode(method);
             }
             else {
-                var property = createNode(141, fullStart);
+                var property = createNode(143, fullStart);
+                setModifiers(property, modifiers);
                 property.name = name;
                 property.questionToken = questionToken;
                 property.type = parseTypeAnnotation();
@@ -7606,78 +8243,51 @@ var ts;
                 return finishNode(property);
             }
         }
-        function isStartOfTypeMember() {
-            switch (token) {
-                case 17:
-                case 25:
-                case 19:
-                    return true;
-                default:
-                    if (ts.isModifierKind(token)) {
-                        var result = lookAhead(isStartOfIndexSignatureDeclaration);
-                        if (result) {
-                            return result;
-                        }
-                    }
-                    return isLiteralPropertyName() && lookAhead(isTypeMemberWithLiteralPropertyName);
+        function isTypeMemberStart() {
+            var idToken;
+            if (token === 17 || token === 25) {
+                return true;
             }
-        }
-        function isStartOfIndexSignatureDeclaration() {
             while (ts.isModifierKind(token)) {
+                idToken = token;
                 nextToken();
             }
-            return isIndexSignature();
-        }
-        function isTypeMemberWithLiteralPropertyName() {
-            nextToken();
-            return token === 17 ||
-                token === 25 ||
-                token === 53 ||
-                token === 54 ||
-                canParseSemicolon();
+            if (token === 19) {
+                return true;
+            }
+            if (isLiteralPropertyName()) {
+                idToken = token;
+                nextToken();
+            }
+            if (idToken) {
+                return token === 17 ||
+                    token === 25 ||
+                    token === 53 ||
+                    token === 54 ||
+                    canParseSemicolon();
+            }
+            return false;
         }
         function parseTypeMember() {
-            switch (token) {
-                case 17:
-                case 25:
-                    return parseSignatureMember(148);
-                case 19:
-                    return isIndexSignature()
-                        ? parseIndexSignatureDeclaration(scanner.getStartPos(), undefined, undefined)
-                        : parsePropertyOrMethodSignature();
-                case 92:
-                    if (lookAhead(isStartOfConstructSignature)) {
-                        return parseSignatureMember(149);
-                    }
-                case 9:
-                case 8:
-                    return parsePropertyOrMethodSignature();
-                default:
-                    if (ts.isModifierKind(token)) {
-                        var result = tryParse(parseIndexSignatureWithModifiers);
-                        if (result) {
-                            return result;
-                        }
-                    }
-                    if (ts.tokenIsIdentifierOrKeyword(token)) {
-                        return parsePropertyOrMethodSignature();
-                    }
+            if (token === 17 || token === 25) {
+                return parseSignatureMember(150);
             }
-        }
-        function parseIndexSignatureWithModifiers() {
-            var fullStart = scanner.getStartPos();
-            var decorators = parseDecorators();
+            if (token === 92 && lookAhead(isStartOfConstructSignature)) {
+                return parseSignatureMember(151);
+            }
+            var fullStart = getNodePos();
             var modifiers = parseModifiers();
-            return isIndexSignature()
-                ? parseIndexSignatureDeclaration(fullStart, decorators, modifiers)
-                : undefined;
+            if (isIndexSignature()) {
+                return parseIndexSignatureDeclaration(fullStart, undefined, modifiers);
+            }
+            return parsePropertyOrMethodSignature(fullStart, modifiers);
         }
         function isStartOfConstructSignature() {
             nextToken();
             return token === 17 || token === 25;
         }
         function parseTypeLiteral() {
-            var node = createNode(156);
+            var node = createNode(158);
             node.members = parseObjectTypeMembers();
             return finishNode(node);
         }
@@ -7693,12 +8303,12 @@ var ts;
             return members;
         }
         function parseTupleType() {
-            var node = createNode(158);
+            var node = createNode(160);
             node.elementTypes = parseBracketedList(19, parseType, 19, 20);
             return finishNode(node);
         }
         function parseParenthesizedType() {
-            var node = createNode(161);
+            var node = createNode(163);
             parseExpected(17);
             node.type = parseType();
             parseExpected(18);
@@ -7706,7 +8316,7 @@ var ts;
         }
         function parseFunctionOrConstructorType(kind) {
             var node = createNode(kind);
-            if (kind === 154) {
+            if (kind === 156) {
                 parseExpected(92);
             }
             fillSignature(34, false, false, false, node);
@@ -7719,20 +8329,22 @@ var ts;
         function parseNonArrayType() {
             switch (token) {
                 case 117:
-                case 130:
-                case 128:
-                case 120:
                 case 131:
+                case 129:
+                case 120:
+                case 132:
+                case 134:
                     var node = tryParse(parseKeywordAndNoDot);
                     return node || parseTypeReference();
                 case 9:
                     return parseStringLiteralTypeNode();
                 case 103:
+                case 93:
                     return parseTokenNode();
                 case 97: {
                     var thisKeyword = parseThisTypeNode();
                     if (token === 124 && !scanner.hasPrecedingLineBreak()) {
-                        return parseTypePredicate(thisKeyword);
+                        return parseThisTypePredicate(thisKeyword);
                     }
                     else {
                         return thisKeyword;
@@ -7753,11 +8365,13 @@ var ts;
         function isStartOfType() {
             switch (token) {
                 case 117:
-                case 130:
-                case 128:
-                case 120:
                 case 131:
+                case 129:
+                case 120:
+                case 132:
                 case 103:
+                case 134:
+                case 93:
                 case 97:
                 case 101:
                 case 15:
@@ -7780,7 +8394,7 @@ var ts;
             var type = parseNonArrayType();
             while (!scanner.hasPrecedingLineBreak() && parseOptional(19)) {
                 parseExpected(20);
-                var node = createNode(157, type.pos);
+                var node = createNode(159, type.pos);
                 node.elementType = type;
                 type = finishNode(node);
             }
@@ -7802,10 +8416,10 @@ var ts;
             return type;
         }
         function parseIntersectionTypeOrHigher() {
-            return parseUnionOrIntersectionType(160, parseArrayTypeOrHigher, 46);
+            return parseUnionOrIntersectionType(162, parseArrayTypeOrHigher, 46);
         }
         function parseUnionTypeOrHigher() {
-            return parseUnionOrIntersectionType(159, parseIntersectionTypeOrHigher, 47);
+            return parseUnionOrIntersectionType(161, parseIntersectionTypeOrHigher, 47);
         }
         function isStartOfFunctionType() {
             if (token === 25) {
@@ -7813,16 +8427,29 @@ var ts;
             }
             return token === 17 && lookAhead(isUnambiguouslyStartOfFunctionType);
         }
+        function skipParameterStart() {
+            if (ts.isModifierKind(token)) {
+                parseModifiers();
+            }
+            if (isIdentifier() || token === 97) {
+                nextToken();
+                return true;
+            }
+            if (token === 19 || token === 15) {
+                var previousErrorCount = parseDiagnostics.length;
+                parseIdentifierOrPattern();
+                return previousErrorCount === parseDiagnostics.length;
+            }
+            return false;
+        }
         function isUnambiguouslyStartOfFunctionType() {
             nextToken();
             if (token === 18 || token === 22) {
                 return true;
             }
-            if (isIdentifier() || ts.isModifierKind(token)) {
-                nextToken();
+            if (skipParameterStart()) {
                 if (token === 54 || token === 24 ||
-                    token === 53 || token === 56 ||
-                    isIdentifier() || ts.isModifierKind(token)) {
+                    token === 53 || token === 56) {
                     return true;
                 }
                 if (token === 18) {
@@ -7838,7 +8465,7 @@ var ts;
             var typePredicateVariable = isIdentifier() && tryParse(parseTypePredicatePrefix);
             var type = parseType();
             if (typePredicateVariable) {
-                var node = createNode(151, typePredicateVariable.pos);
+                var node = createNode(153, typePredicateVariable.pos);
                 node.parameterName = typePredicateVariable;
                 node.type = type;
                 return finishNode(node);
@@ -7855,14 +8482,14 @@ var ts;
             }
         }
         function parseType() {
-            return doOutsideOfContext(10, parseTypeWorker);
+            return doOutsideOfContext(41943040, parseTypeWorker);
         }
         function parseTypeWorker() {
             if (isStartOfFunctionType()) {
-                return parseFunctionOrConstructorType(153);
+                return parseFunctionOrConstructorType(155);
             }
             if (token === 92) {
-                return parseFunctionOrConstructorType(154);
+                return parseFunctionOrConstructorType(156);
             }
             return parseUnionTypeOrHigher();
         }
@@ -7981,7 +8608,7 @@ var ts;
             return !scanner.hasPrecedingLineBreak() && isIdentifier();
         }
         function parseYieldExpression() {
-            var node = createNode(187);
+            var node = createNode(189);
             nextToken();
             if (!scanner.hasPrecedingLineBreak() &&
                 (token === 37 || isStartOfExpression())) {
@@ -7995,8 +8622,8 @@ var ts;
         }
         function parseSimpleArrowFunctionExpression(identifier) {
             ts.Debug.assert(token === 34, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
-            var node = createNode(177, identifier.pos);
-            var parameter = createNode(139, identifier.pos);
+            var node = createNode(179, identifier.pos);
+            var parameter = createNode(141, identifier.pos);
             parameter.name = identifier;
             finishNode(parameter);
             node.parameters = [parameter];
@@ -8107,7 +8734,7 @@ var ts;
             return parseParenthesizedArrowFunctionExpressionHead(false);
         }
         function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity) {
-            var node = createNode(177);
+            var node = createNode(179);
             setModifiers(node, parseModifiersForArrowFunction());
             var isAsync = !!(node.flags & 256);
             fillSignature(54, false, isAsync, !allowAmbiguity, node);
@@ -8139,7 +8766,7 @@ var ts;
             if (!questionToken) {
                 return leftOperand;
             }
-            var node = createNode(185, leftOperand.pos);
+            var node = createNode(187, leftOperand.pos);
             node.condition = leftOperand;
             node.questionToken = questionToken;
             node.whenTrue = doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher);
@@ -8152,7 +8779,7 @@ var ts;
             return parseBinaryExpressionRest(precedence, leftOperand);
         }
         function isInOrOfKeyword(t) {
-            return t === 90 || t === 135;
+            return t === 90 || t === 137;
         }
         function parseBinaryExpressionRest(precedence, leftOperand) {
             while (true) {
@@ -8230,39 +8857,39 @@ var ts;
             return -1;
         }
         function makeBinaryExpression(left, operatorToken, right) {
-            var node = createNode(184, left.pos);
+            var node = createNode(186, left.pos);
             node.left = left;
             node.operatorToken = operatorToken;
             node.right = right;
             return finishNode(node);
         }
         function makeAsExpression(left, right) {
-            var node = createNode(192, left.pos);
+            var node = createNode(194, left.pos);
             node.expression = left;
             node.type = right;
             return finishNode(node);
         }
         function parsePrefixUnaryExpression() {
-            var node = createNode(182);
+            var node = createNode(184);
             node.operator = token;
             nextToken();
             node.operand = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseDeleteExpression() {
-            var node = createNode(178);
+            var node = createNode(180);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseTypeOfExpression() {
-            var node = createNode(179);
+            var node = createNode(181);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseVoidExpression() {
-            var node = createNode(180);
+            var node = createNode(182);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -8277,7 +8904,7 @@ var ts;
             return false;
         }
         function parseAwaitExpression() {
-            var node = createNode(181);
+            var node = createNode(183);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -8296,7 +8923,7 @@ var ts;
             var simpleUnaryExpression = parseSimpleUnaryExpression();
             if (token === 38) {
                 var start = ts.skipTrivia(sourceText, simpleUnaryExpression.pos);
-                if (simpleUnaryExpression.kind === 174) {
+                if (simpleUnaryExpression.kind === 176) {
                     parseErrorAtPosition(start, simpleUnaryExpression.end - start, ts.Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses);
                 }
                 else {
@@ -8344,7 +8971,7 @@ var ts;
         }
         function parseIncrementExpression() {
             if (token === 41 || token === 42) {
-                var node = createNode(182);
+                var node = createNode(184);
                 node.operator = token;
                 nextToken();
                 node.operand = parseLeftHandSideExpressionOrHigher();
@@ -8356,7 +8983,7 @@ var ts;
             var expression = parseLeftHandSideExpressionOrHigher();
             ts.Debug.assert(ts.isLeftHandSideExpression(expression));
             if ((token === 41 || token === 42) && !scanner.hasPrecedingLineBreak()) {
-                var node = createNode(183, expression.pos);
+                var node = createNode(185, expression.pos);
                 node.operand = expression;
                 node.operator = token;
                 nextToken();
@@ -8379,7 +9006,7 @@ var ts;
             if (token === 17 || token === 21 || token === 19) {
                 return expression;
             }
-            var node = createNode(169, expression.pos);
+            var node = createNode(171, expression.pos);
             node.expression = expression;
             node.dotToken = parseExpectedToken(21, false, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access);
             node.name = parseRightSideOfDot(true);
@@ -8398,8 +9025,8 @@ var ts;
         function parseJsxElementOrSelfClosingElement(inExpressionContext) {
             var opening = parseJsxOpeningOrSelfClosingElement(inExpressionContext);
             var result;
-            if (opening.kind === 238) {
-                var node = createNode(236, opening.pos);
+            if (opening.kind === 242) {
+                var node = createNode(240, opening.pos);
                 node.openingElement = opening;
                 node.children = parseJsxChildren(node.openingElement.tagName);
                 node.closingElement = parseJsxClosingElement(inExpressionContext);
@@ -8409,14 +9036,14 @@ var ts;
                 result = finishNode(node);
             }
             else {
-                ts.Debug.assert(opening.kind === 237);
+                ts.Debug.assert(opening.kind === 241);
                 result = opening;
             }
             if (inExpressionContext && token === 25) {
                 var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElement(true); });
                 if (invalidElement) {
                     parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element);
-                    var badNode = createNode(184, result.pos);
+                    var badNode = createNode(186, result.pos);
                     badNode.end = invalidElement.end;
                     badNode.left = result;
                     badNode.right = invalidElement;
@@ -8428,13 +9055,13 @@ var ts;
             return result;
         }
         function parseJsxText() {
-            var node = createNode(239, scanner.getStartPos());
+            var node = createNode(243, scanner.getStartPos());
             token = scanner.scanJsxToken();
             return finishNode(node);
         }
         function parseJsxChild() {
             switch (token) {
-                case 239:
+                case 243:
                     return parseJsxText();
                 case 15:
                     return parseJsxExpression(false);
@@ -8470,7 +9097,7 @@ var ts;
             var attributes = parseList(13, parseJsxAttribute);
             var node;
             if (token === 27) {
-                node = createNode(238, fullStart);
+                node = createNode(242, fullStart);
                 scanJsxText();
             }
             else {
@@ -8482,7 +9109,7 @@ var ts;
                     parseExpected(27, undefined, false);
                     scanJsxText();
                 }
-                node = createNode(237, fullStart);
+                node = createNode(241, fullStart);
             }
             node.tagName = tagName;
             node.attributes = attributes;
@@ -8493,7 +9120,7 @@ var ts;
             var elementName = parseIdentifierName();
             while (parseOptional(21)) {
                 scanJsxIdentifier();
-                var node = createNode(136, elementName.pos);
+                var node = createNode(138, elementName.pos);
                 node.left = elementName;
                 node.right = parseIdentifierName();
                 elementName = finishNode(node);
@@ -8501,7 +9128,7 @@ var ts;
             return elementName;
         }
         function parseJsxExpression(inExpressionContext) {
-            var node = createNode(243);
+            var node = createNode(247);
             parseExpected(15);
             if (token !== 16) {
                 node.expression = parseAssignmentExpressionOrHigher();
@@ -8520,7 +9147,7 @@ var ts;
                 return parseJsxSpreadAttribute();
             }
             scanJsxIdentifier();
-            var node = createNode(241);
+            var node = createNode(245);
             node.name = parseIdentifierName();
             if (parseOptional(56)) {
                 switch (token) {
@@ -8535,7 +9162,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxSpreadAttribute() {
-            var node = createNode(242);
+            var node = createNode(246);
             parseExpected(15);
             parseExpected(22);
             node.expression = parseExpression();
@@ -8543,7 +9170,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxClosingElement(inExpressionContext) {
-            var node = createNode(240);
+            var node = createNode(244);
             parseExpected(26);
             node.tagName = parseJsxElementName();
             if (inExpressionContext) {
@@ -8556,7 +9183,7 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAssertion() {
-            var node = createNode(174);
+            var node = createNode(176);
             parseExpected(25);
             node.type = parseType();
             parseExpected(27);
@@ -8567,15 +9194,22 @@ var ts;
             while (true) {
                 var dotToken = parseOptionalToken(21);
                 if (dotToken) {
-                    var propertyAccess = createNode(169, expression.pos);
+                    var propertyAccess = createNode(171, expression.pos);
                     propertyAccess.expression = expression;
                     propertyAccess.dotToken = dotToken;
                     propertyAccess.name = parseRightSideOfDot(true);
                     expression = finishNode(propertyAccess);
                     continue;
                 }
+                if (token === 49 && !scanner.hasPrecedingLineBreak()) {
+                    nextToken();
+                    var nonNullExpression = createNode(195, expression.pos);
+                    nonNullExpression.expression = expression;
+                    expression = finishNode(nonNullExpression);
+                    continue;
+                }
                 if (!inDecoratorContext() && parseOptional(19)) {
-                    var indexedAccess = createNode(170, expression.pos);
+                    var indexedAccess = createNode(172, expression.pos);
                     indexedAccess.expression = expression;
                     if (token !== 20) {
                         indexedAccess.argumentExpression = allowInAnd(parseExpression);
@@ -8589,7 +9223,7 @@ var ts;
                     continue;
                 }
                 if (token === 11 || token === 12) {
-                    var tagExpression = createNode(173, expression.pos);
+                    var tagExpression = createNode(175, expression.pos);
                     tagExpression.tag = expression;
                     tagExpression.template = token === 11
                         ? parseLiteralNode()
@@ -8608,7 +9242,7 @@ var ts;
                     if (!typeArguments) {
                         return expression;
                     }
-                    var callExpr = createNode(171, expression.pos);
+                    var callExpr = createNode(173, expression.pos);
                     callExpr.expression = expression;
                     callExpr.typeArguments = typeArguments;
                     callExpr.arguments = parseArgumentList();
@@ -8616,7 +9250,7 @@ var ts;
                     continue;
                 }
                 else if (token === 17) {
-                    var callExpr = createNode(171, expression.pos);
+                    var callExpr = createNode(173, expression.pos);
                     callExpr.expression = expression;
                     callExpr.arguments = parseArgumentList();
                     expression = finishNode(callExpr);
@@ -8711,41 +9345,42 @@ var ts;
             return parseIdentifier(ts.Diagnostics.Expression_expected);
         }
         function parseParenthesizedExpression() {
-            var node = createNode(175);
+            var node = createNode(177);
             parseExpected(17);
             node.expression = allowInAnd(parseExpression);
             parseExpected(18);
             return finishNode(node);
         }
         function parseSpreadElement() {
-            var node = createNode(188);
+            var node = createNode(190);
             parseExpected(22);
             node.expression = parseAssignmentExpressionOrHigher();
             return finishNode(node);
         }
         function parseArgumentOrArrayLiteralElement() {
             return token === 22 ? parseSpreadElement() :
-                token === 24 ? createNode(190) :
+                token === 24 ? createNode(192) :
                     parseAssignmentExpressionOrHigher();
         }
         function parseArgumentExpression() {
             return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement);
         }
         function parseArrayLiteralExpression() {
-            var node = createNode(167);
+            var node = createNode(169);
             parseExpected(19);
-            if (scanner.hasPrecedingLineBreak())
-                node.flags |= 1024;
+            if (scanner.hasPrecedingLineBreak()) {
+                node.multiLine = true;
+            }
             node.elements = parseDelimitedList(15, parseArgumentOrArrayLiteralElement);
             parseExpected(20);
             return finishNode(node);
         }
         function tryParseAccessorDeclaration(fullStart, decorators, modifiers) {
             if (parseContextualModifier(123)) {
-                return parseAccessorDeclaration(146, fullStart, decorators, modifiers);
+                return addJSDocComment(parseAccessorDeclaration(148, fullStart, decorators, modifiers));
             }
-            else if (parseContextualModifier(129)) {
-                return parseAccessorDeclaration(147, fullStart, decorators, modifiers);
+            else if (parseContextualModifier(130)) {
+                return parseAccessorDeclaration(149, fullStart, decorators, modifiers);
             }
             return undefined;
         }
@@ -8766,7 +9401,7 @@ var ts;
             }
             var isShorthandPropertyAssignment = tokenIsIdentifier && (token === 24 || token === 16 || token === 56);
             if (isShorthandPropertyAssignment) {
-                var shorthandDeclaration = createNode(249, fullStart);
+                var shorthandDeclaration = createNode(253, fullStart);
                 shorthandDeclaration.name = propertyName;
                 shorthandDeclaration.questionToken = questionToken;
                 var equalsToken = parseOptionalToken(56);
@@ -8774,23 +9409,23 @@ var ts;
                     shorthandDeclaration.equalsToken = equalsToken;
                     shorthandDeclaration.objectAssignmentInitializer = allowInAnd(parseAssignmentExpressionOrHigher);
                 }
-                return finishNode(shorthandDeclaration);
+                return addJSDocComment(finishNode(shorthandDeclaration));
             }
             else {
-                var propertyAssignment = createNode(248, fullStart);
+                var propertyAssignment = createNode(252, fullStart);
                 propertyAssignment.modifiers = modifiers;
                 propertyAssignment.name = propertyName;
                 propertyAssignment.questionToken = questionToken;
                 parseExpected(54);
                 propertyAssignment.initializer = allowInAnd(parseAssignmentExpressionOrHigher);
-                return finishNode(propertyAssignment);
+                return addJSDocComment(finishNode(propertyAssignment));
             }
         }
         function parseObjectLiteralExpression() {
-            var node = createNode(168);
+            var node = createNode(170);
             parseExpected(15);
             if (scanner.hasPrecedingLineBreak()) {
-                node.flags |= 1024;
+                node.multiLine = true;
             }
             node.properties = parseDelimitedList(12, parseObjectLiteralElement, true);
             parseExpected(16);
@@ -8801,7 +9436,7 @@ var ts;
             if (saveDecoratorContext) {
                 setDecoratorContext(false);
             }
-            var node = createNode(176);
+            var node = createNode(178);
             setModifiers(node, parseModifiers());
             parseExpected(87);
             node.asteriskToken = parseOptionalToken(37);
@@ -8817,13 +9452,13 @@ var ts;
             if (saveDecoratorContext) {
                 setDecoratorContext(true);
             }
-            return finishNode(node);
+            return addJSDocComment(finishNode(node));
         }
         function parseOptionalIdentifier() {
             return isIdentifier() ? parseIdentifier() : undefined;
         }
         function parseNewExpression() {
-            var node = createNode(172);
+            var node = createNode(174);
             parseExpected(92);
             node.expression = parseMemberExpressionOrHigher();
             node.typeArguments = tryParse(parseTypeArgumentsInExpression);
@@ -8833,7 +9468,7 @@ var ts;
             return finishNode(node);
         }
         function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) {
-            var node = createNode(195);
+            var node = createNode(198);
             if (parseExpected(15, diagnosticMessage) || ignoreMissingOpenBrace) {
                 node.statements = parseList(1, parseStatement);
                 parseExpected(16);
@@ -8861,12 +9496,12 @@ var ts;
             return block;
         }
         function parseEmptyStatement() {
-            var node = createNode(197);
+            var node = createNode(200);
             parseExpected(23);
             return finishNode(node);
         }
         function parseIfStatement() {
-            var node = createNode(199);
+            var node = createNode(202);
             parseExpected(88);
             parseExpected(17);
             node.expression = allowInAnd(parseExpression);
@@ -8876,7 +9511,7 @@ var ts;
             return finishNode(node);
         }
         function parseDoStatement() {
-            var node = createNode(200);
+            var node = createNode(203);
             parseExpected(79);
             node.statement = parseStatement();
             parseExpected(104);
@@ -8887,7 +9522,7 @@ var ts;
             return finishNode(node);
         }
         function parseWhileStatement() {
-            var node = createNode(201);
+            var node = createNode(204);
             parseExpected(104);
             parseExpected(17);
             node.expression = allowInAnd(parseExpression);
@@ -8910,21 +9545,21 @@ var ts;
             }
             var forOrForInOrForOfStatement;
             if (parseOptional(90)) {
-                var forInStatement = createNode(203, pos);
+                var forInStatement = createNode(206, pos);
                 forInStatement.initializer = initializer;
                 forInStatement.expression = allowInAnd(parseExpression);
                 parseExpected(18);
                 forOrForInOrForOfStatement = forInStatement;
             }
-            else if (parseOptional(135)) {
-                var forOfStatement = createNode(204, pos);
+            else if (parseOptional(137)) {
+                var forOfStatement = createNode(207, pos);
                 forOfStatement.initializer = initializer;
                 forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher);
                 parseExpected(18);
                 forOrForInOrForOfStatement = forOfStatement;
             }
             else {
-                var forStatement = createNode(202, pos);
+                var forStatement = createNode(205, pos);
                 forStatement.initializer = initializer;
                 parseExpected(23);
                 if (token !== 23 && token !== 18) {
@@ -8942,7 +9577,7 @@ var ts;
         }
         function parseBreakOrContinueStatement(kind) {
             var node = createNode(kind);
-            parseExpected(kind === 206 ? 70 : 75);
+            parseExpected(kind === 209 ? 70 : 75);
             if (!canParseSemicolon()) {
                 node.label = parseIdentifier();
             }
@@ -8950,7 +9585,7 @@ var ts;
             return finishNode(node);
         }
         function parseReturnStatement() {
-            var node = createNode(207);
+            var node = createNode(210);
             parseExpected(94);
             if (!canParseSemicolon()) {
                 node.expression = allowInAnd(parseExpression);
@@ -8959,7 +9594,7 @@ var ts;
             return finishNode(node);
         }
         function parseWithStatement() {
-            var node = createNode(208);
+            var node = createNode(211);
             parseExpected(105);
             parseExpected(17);
             node.expression = allowInAnd(parseExpression);
@@ -8968,7 +9603,7 @@ var ts;
             return finishNode(node);
         }
         function parseCaseClause() {
-            var node = createNode(244);
+            var node = createNode(248);
             parseExpected(71);
             node.expression = allowInAnd(parseExpression);
             parseExpected(54);
@@ -8976,7 +9611,7 @@ var ts;
             return finishNode(node);
         }
         function parseDefaultClause() {
-            var node = createNode(245);
+            var node = createNode(249);
             parseExpected(77);
             parseExpected(54);
             node.statements = parseList(3, parseStatement);
@@ -8986,12 +9621,12 @@ var ts;
             return token === 71 ? parseCaseClause() : parseDefaultClause();
         }
         function parseSwitchStatement() {
-            var node = createNode(209);
+            var node = createNode(212);
             parseExpected(96);
             parseExpected(17);
             node.expression = allowInAnd(parseExpression);
             parseExpected(18);
-            var caseBlock = createNode(223, scanner.getStartPos());
+            var caseBlock = createNode(226, scanner.getStartPos());
             parseExpected(15);
             caseBlock.clauses = parseList(2, parseCaseOrDefaultClause);
             parseExpected(16);
@@ -8999,14 +9634,14 @@ var ts;
             return finishNode(node);
         }
         function parseThrowStatement() {
-            var node = createNode(211);
+            var node = createNode(214);
             parseExpected(98);
             node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression);
             parseSemicolon();
             return finishNode(node);
         }
         function parseTryStatement() {
-            var node = createNode(212);
+            var node = createNode(215);
             parseExpected(100);
             node.tryBlock = parseBlock(false);
             node.catchClause = token === 72 ? parseCatchClause() : undefined;
@@ -9017,7 +9652,7 @@ var ts;
             return finishNode(node);
         }
         function parseCatchClause() {
-            var result = createNode(247);
+            var result = createNode(251);
             parseExpected(72);
             if (parseExpected(17)) {
                 result.variableDeclaration = parseVariableDeclaration();
@@ -9027,7 +9662,7 @@ var ts;
             return finishNode(result);
         }
         function parseDebuggerStatement() {
-            var node = createNode(213);
+            var node = createNode(216);
             parseExpected(76);
             parseSemicolon();
             return finishNode(node);
@@ -9036,16 +9671,16 @@ var ts;
             var fullStart = scanner.getStartPos();
             var expression = allowInAnd(parseExpression);
             if (expression.kind === 69 && parseOptional(54)) {
-                var labeledStatement = createNode(210, fullStart);
+                var labeledStatement = createNode(213, fullStart);
                 labeledStatement.label = expression;
                 labeledStatement.statement = parseStatement();
-                return finishNode(labeledStatement);
+                return addJSDocComment(finishNode(labeledStatement));
             }
             else {
-                var expressionStatement = createNode(198, fullStart);
+                var expressionStatement = createNode(201, fullStart);
                 expressionStatement.expression = expression;
                 parseSemicolon();
-                return finishNode(expressionStatement);
+                return addJSDocComment(finishNode(expressionStatement));
             }
         }
         function nextTokenIsIdentifierOrKeywordOnSameLine() {
@@ -9071,7 +9706,7 @@ var ts;
                     case 81:
                         return true;
                     case 107:
-                    case 132:
+                    case 133:
                         return nextTokenIsIdentifierOnSameLine();
                     case 125:
                     case 126:
@@ -9082,13 +9717,15 @@ var ts;
                     case 110:
                     case 111:
                     case 112:
+                    case 127:
                         nextToken();
                         if (scanner.hasPrecedingLineBreak()) {
                             return false;
                         }
                         continue;
-                    case 134:
-                        return nextToken() === 15;
+                    case 136:
+                        nextToken();
+                        return token === 15 || token === 69 || token === 82;
                     case 89:
                         nextToken();
                         return token === 9 || token === 37 ||
@@ -9096,7 +9733,8 @@ var ts;
                     case 82:
                         nextToken();
                         if (token === 56 || token === 37 ||
-                            token === 15 || token === 77) {
+                            token === 15 || token === 77 ||
+                            token === 116) {
                             return true;
                         }
                         continue;
@@ -9145,13 +9783,14 @@ var ts;
                 case 107:
                 case 125:
                 case 126:
-                case 132:
-                case 134:
+                case 133:
+                case 136:
                     return true;
                 case 112:
                 case 110:
                 case 111:
                 case 113:
+                case 127:
                     return isStartOfDeclaration() || !lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine);
                 default:
                     return isStartOfExpression();
@@ -9190,9 +9829,9 @@ var ts;
                 case 86:
                     return parseForOrForInOrForOfStatement();
                 case 75:
-                    return parseBreakOrContinueStatement(205);
+                    return parseBreakOrContinueStatement(208);
                 case 70:
-                    return parseBreakOrContinueStatement(206);
+                    return parseBreakOrContinueStatement(209);
                 case 94:
                     return parseReturnStatement();
                 case 105:
@@ -9211,7 +9850,7 @@ var ts;
                     return parseDeclaration();
                 case 118:
                 case 107:
-                case 132:
+                case 133:
                 case 125:
                 case 126:
                 case 122:
@@ -9224,7 +9863,8 @@ var ts;
                 case 112:
                 case 115:
                 case 113:
-                case 134:
+                case 127:
+                case 136:
                     if (isStartOfDeclaration()) {
                         return parseDeclaration();
                     }
@@ -9247,11 +9887,11 @@ var ts;
                     return parseClassDeclaration(fullStart, decorators, modifiers);
                 case 107:
                     return parseInterfaceDeclaration(fullStart, decorators, modifiers);
-                case 132:
+                case 133:
                     return parseTypeAliasDeclaration(fullStart, decorators, modifiers);
                 case 81:
                     return parseEnumDeclaration(fullStart, decorators, modifiers);
-                case 134:
+                case 136:
                 case 125:
                 case 126:
                     return parseModuleDeclaration(fullStart, decorators, modifiers);
@@ -9259,12 +9899,18 @@ var ts;
                     return parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers);
                 case 82:
                     nextToken();
-                    return token === 77 || token === 56 ?
-                        parseExportAssignment(fullStart, decorators, modifiers) :
-                        parseExportDeclaration(fullStart, decorators, modifiers);
+                    switch (token) {
+                        case 77:
+                        case 56:
+                            return parseExportAssignment(fullStart, decorators, modifiers);
+                        case 116:
+                            return parseGlobalModuleExportDeclaration(fullStart, decorators, modifiers);
+                        default:
+                            return parseExportDeclaration(fullStart, decorators, modifiers);
+                    }
                 default:
                     if (decorators || modifiers) {
-                        var node = createMissingNode(234, true, ts.Diagnostics.Declaration_expected);
+                        var node = createMissingNode(238, true, ts.Diagnostics.Declaration_expected);
                         node.pos = fullStart;
                         node.decorators = decorators;
                         setModifiers(node, modifiers);
@@ -9285,16 +9931,16 @@ var ts;
         }
         function parseArrayBindingElement() {
             if (token === 24) {
-                return createNode(190);
+                return createNode(192);
             }
-            var node = createNode(166);
+            var node = createNode(168);
             node.dotDotDotToken = parseOptionalToken(22);
             node.name = parseIdentifierOrPattern();
             node.initializer = parseBindingElementInitializer(false);
             return finishNode(node);
         }
         function parseObjectBindingElement() {
-            var node = createNode(166);
+            var node = createNode(168);
             var tokenIsIdentifier = isIdentifier();
             var propertyName = parsePropertyName();
             if (tokenIsIdentifier && token !== 54) {
@@ -9309,14 +9955,14 @@ var ts;
             return finishNode(node);
         }
         function parseObjectBindingPattern() {
-            var node = createNode(164);
+            var node = createNode(166);
             parseExpected(15);
             node.elements = parseDelimitedList(9, parseObjectBindingElement);
             parseExpected(16);
             return finishNode(node);
         }
         function parseArrayBindingPattern() {
-            var node = createNode(165);
+            var node = createNode(167);
             parseExpected(19);
             node.elements = parseDelimitedList(10, parseArrayBindingElement);
             parseExpected(20);
@@ -9335,7 +9981,7 @@ var ts;
             return parseIdentifier();
         }
         function parseVariableDeclaration() {
-            var node = createNode(214);
+            var node = createNode(217);
             node.name = parseIdentifierOrPattern();
             node.type = parseTypeAnnotation();
             if (!isInOrOfKeyword(token)) {
@@ -9344,21 +9990,21 @@ var ts;
             return finishNode(node);
         }
         function parseVariableDeclarationList(inForStatementInitializer) {
-            var node = createNode(215);
+            var node = createNode(218);
             switch (token) {
                 case 102:
                     break;
                 case 108:
-                    node.flags |= 8192;
+                    node.flags |= 1024;
                     break;
                 case 74:
-                    node.flags |= 16384;
+                    node.flags |= 2048;
                     break;
                 default:
                     ts.Debug.fail();
             }
             nextToken();
-            if (token === 135 && lookAhead(canFollowContextualOfKeyword)) {
+            if (token === 137 && lookAhead(canFollowContextualOfKeyword)) {
                 node.declarations = createMissingList();
             }
             else {
@@ -9373,15 +10019,15 @@ var ts;
             return nextTokenIsIdentifier() && nextToken() === 18;
         }
         function parseVariableStatement(fullStart, decorators, modifiers) {
-            var node = createNode(196, fullStart);
+            var node = createNode(199, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             node.declarationList = parseVariableDeclarationList(false);
             parseSemicolon();
-            return finishNode(node);
+            return addJSDocComment(finishNode(node));
         }
         function parseFunctionDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(216, fullStart);
+            var node = createNode(219, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(87);
@@ -9391,19 +10037,19 @@ var ts;
             var isAsync = !!(node.flags & 256);
             fillSignature(54, isGenerator, isAsync, false, node);
             node.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, ts.Diagnostics.or_expected);
-            return finishNode(node);
+            return addJSDocComment(finishNode(node));
         }
         function parseConstructorDeclaration(pos, decorators, modifiers) {
-            var node = createNode(145, pos);
+            var node = createNode(147, pos);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(121);
             fillSignature(54, false, false, false, node);
             node.body = parseFunctionBlockOrSemicolon(false, false, ts.Diagnostics.or_expected);
-            return finishNode(node);
+            return addJSDocComment(finishNode(node));
         }
         function parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, name, questionToken, diagnosticMessage) {
-            var method = createNode(144, fullStart);
+            var method = createNode(146, fullStart);
             method.decorators = decorators;
             setModifiers(method, modifiers);
             method.asteriskToken = asteriskToken;
@@ -9413,18 +10059,18 @@ var ts;
             var isAsync = !!(method.flags & 256);
             fillSignature(54, isGenerator, isAsync, false, method);
             method.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, diagnosticMessage);
-            return finishNode(method);
+            return addJSDocComment(finishNode(method));
         }
         function parsePropertyDeclaration(fullStart, decorators, modifiers, name, questionToken) {
-            var property = createNode(142, fullStart);
+            var property = createNode(144, fullStart);
             property.decorators = decorators;
             setModifiers(property, modifiers);
             property.name = name;
             property.questionToken = questionToken;
             property.type = parseTypeAnnotation();
-            property.initializer = modifiers && modifiers.flags & 64
+            property.initializer = modifiers && modifiers.flags & 32
                 ? allowInAnd(parseNonParameterInitializer)
-                : doOutsideOfContext(2 | 1, parseNonParameterInitializer);
+                : doOutsideOfContext(8388608 | 4194304, parseNonParameterInitializer);
             parseSemicolon();
             return finishNode(property);
         }
@@ -9457,6 +10103,7 @@ var ts;
                 case 110:
                 case 111:
                 case 113:
+                case 127:
                     return true;
                 default:
                     return false;
@@ -9485,7 +10132,7 @@ var ts;
                 return true;
             }
             if (idToken !== undefined) {
-                if (!ts.isKeyword(idToken) || idToken === 129 || idToken === 123) {
+                if (!ts.isKeyword(idToken) || idToken === 130 || idToken === 123) {
                     return true;
                 }
                 switch (token) {
@@ -9512,7 +10159,7 @@ var ts;
                     decorators = [];
                     decorators.pos = decoratorStart;
                 }
-                var decorator = createNode(140, decoratorStart);
+                var decorator = createNode(142, decoratorStart);
                 decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher);
                 decorators.push(finishNode(decorator));
             }
@@ -9568,7 +10215,7 @@ var ts;
         }
         function parseClassElement() {
             if (token === 23) {
-                var result = createNode(194);
+                var result = createNode(197);
                 nextToken();
                 return finishNode(result);
             }
@@ -9599,10 +10246,10 @@ var ts;
             ts.Debug.fail("Should not have attempted to parse class member declaration.");
         }
         function parseClassExpression() {
-            return parseClassDeclarationOrExpression(scanner.getStartPos(), undefined, undefined, 189);
+            return parseClassDeclarationOrExpression(scanner.getStartPos(), undefined, undefined, 191);
         }
         function parseClassDeclaration(fullStart, decorators, modifiers) {
-            return parseClassDeclarationOrExpression(fullStart, decorators, modifiers, 217);
+            return parseClassDeclarationOrExpression(fullStart, decorators, modifiers, 220);
         }
         function parseClassDeclarationOrExpression(fullStart, decorators, modifiers, kind) {
             var node = createNode(kind, fullStart);
@@ -9637,7 +10284,7 @@ var ts;
         }
         function parseHeritageClause() {
             if (token === 83 || token === 106) {
-                var node = createNode(246);
+                var node = createNode(250);
                 node.token = token;
                 nextToken();
                 node.types = parseDelimitedList(7, parseExpressionWithTypeArguments);
@@ -9646,7 +10293,7 @@ var ts;
             return undefined;
         }
         function parseExpressionWithTypeArguments() {
-            var node = createNode(191);
+            var node = createNode(193);
             node.expression = parseLeftHandSideExpressionOrHigher();
             if (token === 25) {
                 node.typeArguments = parseBracketedList(18, parseType, 25, 27);
@@ -9660,7 +10307,7 @@ var ts;
             return parseList(5, parseClassElement);
         }
         function parseInterfaceDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(218, fullStart);
+            var node = createNode(221, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(107);
@@ -9671,10 +10318,10 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAliasDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(219, fullStart);
+            var node = createNode(222, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
-            parseExpected(132);
+            parseExpected(133);
             node.name = parseIdentifier();
             node.typeParameters = parseTypeParameters();
             parseExpected(56);
@@ -9683,13 +10330,13 @@ var ts;
             return finishNode(node);
         }
         function parseEnumMember() {
-            var node = createNode(250, scanner.getStartPos());
+            var node = createNode(254, scanner.getStartPos());
             node.name = parsePropertyName();
             node.initializer = allowInAnd(parseNonParameterInitializer);
             return finishNode(node);
         }
         function parseEnumDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(220, fullStart);
+            var node = createNode(223, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(81);
@@ -9704,7 +10351,7 @@ var ts;
             return finishNode(node);
         }
         function parseModuleBlock() {
-            var node = createNode(222, scanner.getStartPos());
+            var node = createNode(225, scanner.getStartPos());
             if (parseExpected(15)) {
                 node.statements = parseList(1, parseStatement);
                 parseExpected(16);
@@ -9715,24 +10362,24 @@ var ts;
             return finishNode(node);
         }
         function parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags) {
-            var node = createNode(221, fullStart);
-            var namespaceFlag = flags & 65536;
+            var node = createNode(224, fullStart);
+            var namespaceFlag = flags & 4096;
             node.decorators = decorators;
             setModifiers(node, modifiers);
             node.flags |= flags;
             node.name = parseIdentifier();
             node.body = parseOptional(21)
-                ? parseModuleOrNamespaceDeclaration(getNodePos(), undefined, undefined, 2 | namespaceFlag)
+                ? parseModuleOrNamespaceDeclaration(getNodePos(), undefined, undefined, 1 | namespaceFlag)
                 : parseModuleBlock();
             return finishNode(node);
         }
         function parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(221, fullStart);
+            var node = createNode(224, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
-            if (token === 134) {
+            if (token === 136) {
                 node.name = parseIdentifier();
-                node.flags |= 2097152;
+                node.flags |= 131072;
             }
             else {
                 node.name = parseLiteralNode(true);
@@ -9742,11 +10389,11 @@ var ts;
         }
         function parseModuleDeclaration(fullStart, decorators, modifiers) {
             var flags = modifiers ? modifiers.flags : 0;
-            if (token === 134) {
+            if (token === 136) {
                 return parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers);
             }
             else if (parseOptional(126)) {
-                flags |= 65536;
+                flags |= 4096;
             }
             else {
                 parseExpected(125);
@@ -9757,7 +10404,7 @@ var ts;
             return parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags);
         }
         function isExternalModuleReference() {
-            return token === 127 &&
+            return token === 128 &&
                 lookAhead(nextTokenIsOpenParen);
         }
         function nextTokenIsOpenParen() {
@@ -9766,14 +10413,24 @@ var ts;
         function nextTokenIsSlash() {
             return nextToken() === 39;
         }
+        function parseGlobalModuleExportDeclaration(fullStart, decorators, modifiers) {
+            var exportDeclaration = createNode(227, fullStart);
+            exportDeclaration.decorators = decorators;
+            exportDeclaration.modifiers = modifiers;
+            parseExpected(116);
+            parseExpected(126);
+            exportDeclaration.name = parseIdentifier();
+            parseExpected(23);
+            return finishNode(exportDeclaration);
+        }
         function parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers) {
             parseExpected(89);
             var afterImportPos = scanner.getStartPos();
             var identifier;
             if (isIdentifier()) {
                 identifier = parseIdentifier();
-                if (token !== 24 && token !== 133) {
-                    var importEqualsDeclaration = createNode(224, fullStart);
+                if (token !== 24 && token !== 135) {
+                    var importEqualsDeclaration = createNode(228, fullStart);
                     importEqualsDeclaration.decorators = decorators;
                     setModifiers(importEqualsDeclaration, modifiers);
                     importEqualsDeclaration.name = identifier;
@@ -9783,27 +10440,27 @@ var ts;
                     return finishNode(importEqualsDeclaration);
                 }
             }
-            var importDeclaration = createNode(225, fullStart);
+            var importDeclaration = createNode(229, fullStart);
             importDeclaration.decorators = decorators;
             setModifiers(importDeclaration, modifiers);
             if (identifier ||
                 token === 37 ||
                 token === 15) {
                 importDeclaration.importClause = parseImportClause(identifier, afterImportPos);
-                parseExpected(133);
+                parseExpected(135);
             }
             importDeclaration.moduleSpecifier = parseModuleSpecifier();
             parseSemicolon();
             return finishNode(importDeclaration);
         }
         function parseImportClause(identifier, fullStart) {
-            var importClause = createNode(226, fullStart);
+            var importClause = createNode(230, fullStart);
             if (identifier) {
                 importClause.name = identifier;
             }
             if (!importClause.name ||
                 parseOptional(24)) {
-                importClause.namedBindings = token === 37 ? parseNamespaceImport() : parseNamedImportsOrExports(228);
+                importClause.namedBindings = token === 37 ? parseNamespaceImport() : parseNamedImportsOrExports(232);
             }
             return finishNode(importClause);
         }
@@ -9813,8 +10470,8 @@ var ts;
                 : parseEntityName(false);
         }
         function parseExternalModuleReference() {
-            var node = createNode(235);
-            parseExpected(127);
+            var node = createNode(239);
+            parseExpected(128);
             parseExpected(17);
             node.expression = parseModuleSpecifier();
             parseExpected(18);
@@ -9831,7 +10488,7 @@ var ts;
             }
         }
         function parseNamespaceImport() {
-            var namespaceImport = createNode(227);
+            var namespaceImport = createNode(231);
             parseExpected(37);
             parseExpected(116);
             namespaceImport.name = parseIdentifier();
@@ -9839,14 +10496,14 @@ var ts;
         }
         function parseNamedImportsOrExports(kind) {
             var node = createNode(kind);
-            node.elements = parseBracketedList(21, kind === 228 ? parseImportSpecifier : parseExportSpecifier, 15, 16);
+            node.elements = parseBracketedList(21, kind === 232 ? parseImportSpecifier : parseExportSpecifier, 15, 16);
             return finishNode(node);
         }
         function parseExportSpecifier() {
-            return parseImportOrExportSpecifier(233);
+            return parseImportOrExportSpecifier(237);
         }
         function parseImportSpecifier() {
-            return parseImportOrExportSpecifier(229);
+            return parseImportOrExportSpecifier(233);
         }
         function parseImportOrExportSpecifier(kind) {
             var node = createNode(kind);
@@ -9865,23 +10522,23 @@ var ts;
             else {
                 node.name = identifierName;
             }
-            if (kind === 229 && checkIdentifierIsKeyword) {
+            if (kind === 233 && checkIdentifierIsKeyword) {
                 parseErrorAtPosition(checkIdentifierStart, checkIdentifierEnd - checkIdentifierStart, ts.Diagnostics.Identifier_expected);
             }
             return finishNode(node);
         }
         function parseExportDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(231, fullStart);
+            var node = createNode(235, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             if (parseOptional(37)) {
-                parseExpected(133);
+                parseExpected(135);
                 node.moduleSpecifier = parseModuleSpecifier();
             }
             else {
-                node.exportClause = parseNamedImportsOrExports(232);
-                if (token === 133 || (token === 9 && !scanner.hasPrecedingLineBreak())) {
-                    parseExpected(133);
+                node.exportClause = parseNamedImportsOrExports(236);
+                if (token === 135 || (token === 9 && !scanner.hasPrecedingLineBreak())) {
+                    parseExpected(135);
                     node.moduleSpecifier = parseModuleSpecifier();
                 }
             }
@@ -9889,7 +10546,7 @@ var ts;
             return finishNode(node);
         }
         function parseExportAssignment(fullStart, decorators, modifiers) {
-            var node = createNode(230, fullStart);
+            var node = createNode(234, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             if (parseOptional(56)) {
@@ -9905,6 +10562,7 @@ var ts;
         function processReferenceComments(sourceFile) {
             var triviaScanner = ts.createScanner(sourceFile.languageVersion, false, 0, sourceText);
             var referencedFiles = [];
+            var typeReferenceDirectives = [];
             var amdDependencies = [];
             var amdModuleName;
             while (true) {
@@ -9925,7 +10583,12 @@ var ts;
                     sourceFile.hasNoDefaultLib = referencePathMatchResult.isNoDefaultLib;
                     var diagnosticMessage = referencePathMatchResult.diagnosticMessage;
                     if (fileReference) {
-                        referencedFiles.push(fileReference);
+                        if (referencePathMatchResult.isTypeReferenceDirective) {
+                            typeReferenceDirectives.push(fileReference);
+                        }
+                        else {
+                            referencedFiles.push(fileReference);
+                        }
                     }
                     if (diagnosticMessage) {
                         parseDiagnostics.push(ts.createFileDiagnostic(sourceFile, range.pos, range.end - range.pos, diagnosticMessage));
@@ -9955,16 +10618,17 @@ var ts;
                 }
             }
             sourceFile.referencedFiles = referencedFiles;
+            sourceFile.typeReferenceDirectives = typeReferenceDirectives;
             sourceFile.amdDependencies = amdDependencies;
             sourceFile.moduleName = amdModuleName;
         }
         function setExternalModuleIndicator(sourceFile) {
             sourceFile.externalModuleIndicator = ts.forEach(sourceFile.statements, function (node) {
-                return node.flags & 2
-                    || node.kind === 224 && node.moduleReference.kind === 235
-                    || node.kind === 225
-                    || node.kind === 230
-                    || node.kind === 231
+                return node.flags & 1
+                    || node.kind === 228 && node.moduleReference.kind === 239
+                    || node.kind === 229
+                    || node.kind === 234
+                    || node.kind === 235
                     ? node
                     : undefined;
             });
@@ -9989,17 +10653,17 @@ var ts;
             }
             JSDocParser.isJSDocType = isJSDocType;
             function parseJSDocTypeExpressionForTests(content, start, length) {
-                initializeState("file.js", content, 2, true, undefined);
-                var jsDocTypeExpression = parseJSDocTypeExpression(start, length);
+                initializeState("file.js", content, 2, undefined, 1);
+                scanner.setText(content, start, length);
+                token = scanner.scan();
+                var jsDocTypeExpression = parseJSDocTypeExpression();
                 var diagnostics = parseDiagnostics;
                 clearState();
                 return jsDocTypeExpression ? { jsDocTypeExpression: jsDocTypeExpression, diagnostics: diagnostics } : undefined;
             }
             JSDocParser.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
-            function parseJSDocTypeExpression(start, length) {
-                scanner.setText(sourceText, start, length);
-                token = nextToken();
-                var result = createNode(252);
+            function parseJSDocTypeExpression() {
+                var result = createNode(256, scanner.getTokenPos());
                 parseExpected(15);
                 result.type = parseJSDocTopLevelType();
                 parseExpected(16);
@@ -10010,12 +10674,12 @@ var ts;
             function parseJSDocTopLevelType() {
                 var type = parseJSDocType();
                 if (token === 47) {
-                    var unionType = createNode(256, type.pos);
+                    var unionType = createNode(260, type.pos);
                     unionType.types = parseJSDocTypeList(type);
                     type = finishNode(unionType);
                 }
                 if (token === 56) {
-                    var optionalType = createNode(263, type.pos);
+                    var optionalType = createNode(267, type.pos);
                     nextToken();
                     optionalType.type = type;
                     type = finishNode(optionalType);
@@ -10026,20 +10690,20 @@ var ts;
                 var type = parseBasicTypeExpression();
                 while (true) {
                     if (token === 19) {
-                        var arrayType = createNode(255, type.pos);
+                        var arrayType = createNode(259, type.pos);
                         arrayType.elementType = type;
                         nextToken();
                         parseExpected(20);
                         type = finishNode(arrayType);
                     }
                     else if (token === 53) {
-                        var nullableType = createNode(258, type.pos);
+                        var nullableType = createNode(262, type.pos);
                         nullableType.type = type;
                         nextToken();
                         type = finishNode(nullableType);
                     }
                     else if (token === 49) {
-                        var nonNullableType = createNode(259, type.pos);
+                        var nonNullableType = createNode(263, type.pos);
                         nonNullableType.type = type;
                         nextToken();
                         type = finishNode(nonNullableType);
@@ -10073,37 +10737,37 @@ var ts;
                     case 97:
                         return parseJSDocThisType();
                     case 117:
-                    case 130:
-                    case 128:
-                    case 120:
                     case 131:
+                    case 129:
+                    case 120:
+                    case 132:
                     case 103:
                         return parseTokenNode();
                 }
                 return parseJSDocTypeReference();
             }
             function parseJSDocThisType() {
-                var result = createNode(267);
+                var result = createNode(271);
                 nextToken();
                 parseExpected(54);
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocConstructorType() {
-                var result = createNode(266);
+                var result = createNode(270);
                 nextToken();
                 parseExpected(54);
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocVariadicType() {
-                var result = createNode(265);
+                var result = createNode(269);
                 nextToken();
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocFunctionType() {
-                var result = createNode(264);
+                var result = createNode(268);
                 nextToken();
                 parseExpected(17);
                 result.parameters = parseDelimitedList(22, parseJSDocParameter);
@@ -10116,20 +10780,28 @@ var ts;
                 return finishNode(result);
             }
             function parseJSDocParameter() {
-                var parameter = createNode(139);
+                var parameter = createNode(141);
                 parameter.type = parseJSDocType();
+                if (parseOptional(56)) {
+                    parameter.questionToken = createNode(56);
+                }
                 return finishNode(parameter);
             }
             function parseJSDocTypeReference() {
-                var result = createNode(262);
+                var result = createNode(266);
                 result.name = parseSimplePropertyName();
-                while (parseOptional(21)) {
-                    if (token === 25) {
-                        result.typeArguments = parseTypeArguments();
-                        break;
-                    }
-                    else {
-                        result.name = parseQualifiedName(result.name);
+                if (token === 25) {
+                    result.typeArguments = parseTypeArguments();
+                }
+                else {
+                    while (parseOptional(21)) {
+                        if (token === 25) {
+                            result.typeArguments = parseTypeArguments();
+                            break;
+                        }
+                        else {
+                            result.name = parseQualifiedName(result.name);
+                        }
                     }
                 }
                 return finishNode(result);
@@ -10150,13 +10822,13 @@ var ts;
                 }
             }
             function parseQualifiedName(left) {
-                var result = createNode(136, left.pos);
+                var result = createNode(138, left.pos);
                 result.left = left;
                 result.right = parseIdentifierName();
                 return finishNode(result);
             }
             function parseJSDocRecordType() {
-                var result = createNode(260);
+                var result = createNode(264);
                 nextToken();
                 result.members = parseDelimitedList(24, parseJSDocRecordMember);
                 checkForTrailingComma(result.members);
@@ -10164,7 +10836,7 @@ var ts;
                 return finishNode(result);
             }
             function parseJSDocRecordMember() {
-                var result = createNode(261);
+                var result = createNode(265);
                 result.name = parseSimplePropertyName();
                 if (token === 54) {
                     nextToken();
@@ -10173,13 +10845,13 @@ var ts;
                 return finishNode(result);
             }
             function parseJSDocNonNullableType() {
-                var result = createNode(259);
+                var result = createNode(263);
                 nextToken();
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocTupleType() {
-                var result = createNode(257);
+                var result = createNode(261);
                 nextToken();
                 result.types = parseDelimitedList(25, parseJSDocType);
                 checkForTrailingComma(result.types);
@@ -10193,7 +10865,7 @@ var ts;
                 }
             }
             function parseJSDocUnionType() {
-                var result = createNode(256);
+                var result = createNode(260);
                 nextToken();
                 result.types = parseJSDocTypeList(parseJSDocType());
                 parseExpected(18);
@@ -10211,7 +10883,7 @@ var ts;
                 return types;
             }
             function parseJSDocAllType() {
-                var result = createNode(253);
+                var result = createNode(257);
                 nextToken();
                 return finishNode(result);
             }
@@ -10224,29 +10896,35 @@ var ts;
                     token === 27 ||
                     token === 56 ||
                     token === 47) {
-                    var result = createNode(254, pos);
+                    var result = createNode(258, pos);
                     return finishNode(result);
                 }
                 else {
-                    var result = createNode(258, pos);
+                    var result = createNode(262, pos);
                     result.type = parseJSDocType();
                     return finishNode(result);
                 }
             }
             function parseIsolatedJSDocComment(content, start, length) {
-                initializeState("file.js", content, 2, true, undefined);
-                var jsDocComment = parseJSDocComment(undefined, start, length);
+                initializeState("file.js", content, 2, undefined, 1);
+                sourceFile = { languageVariant: 0, text: content };
+                var jsDocComment = parseJSDocCommentWorker(start, length);
                 var diagnostics = parseDiagnostics;
                 clearState();
                 return jsDocComment ? { jsDocComment: jsDocComment, diagnostics: diagnostics } : undefined;
             }
             JSDocParser.parseIsolatedJSDocComment = parseIsolatedJSDocComment;
             function parseJSDocComment(parent, start, length) {
+                var saveToken = token;
+                var saveParseDiagnosticsLength = parseDiagnostics.length;
+                var saveParseErrorBeforeNextFinishedNode = parseErrorBeforeNextFinishedNode;
                 var comment = parseJSDocCommentWorker(start, length);
                 if (comment) {
-                    fixupParentReferences(comment);
                     comment.parent = parent;
                 }
+                token = saveToken;
+                parseDiagnostics.length = saveParseDiagnosticsLength;
+                parseErrorBeforeNextFinishedNode = saveParseErrorBeforeNextFinishedNode;
                 return comment;
             }
             JSDocParser.parseJSDocComment = parseJSDocComment;
@@ -10259,60 +10937,64 @@ var ts;
                 ts.Debug.assert(start <= end);
                 ts.Debug.assert(end <= content.length);
                 var tags;
-                var pos;
-                if (length >= "/** */".length) {
-                    if (content.charCodeAt(start) === 47 &&
-                        content.charCodeAt(start + 1) === 42 &&
-                        content.charCodeAt(start + 2) === 42 &&
-                        content.charCodeAt(start + 3) !== 42) {
+                var result;
+                if (content.charCodeAt(start) === 47 &&
+                    content.charCodeAt(start + 1) === 42 &&
+                    content.charCodeAt(start + 2) === 42 &&
+                    content.charCodeAt(start + 3) !== 42) {
+                    scanner.scanRange(start + 3, length - 5, function () {
                         var canParseTag = true;
                         var seenAsterisk = true;
-                        for (pos = start + "/**".length; pos < end;) {
-                            var ch = content.charCodeAt(pos);
-                            pos++;
-                            if (ch === 64 && canParseTag) {
-                                parseTag();
-                                canParseTag = false;
-                                continue;
-                            }
-                            if (ts.isLineBreak(ch)) {
-                                canParseTag = true;
-                                seenAsterisk = false;
-                                continue;
-                            }
-                            if (ts.isWhiteSpace(ch)) {
-                                continue;
-                            }
-                            if (ch === 42) {
-                                if (seenAsterisk) {
+                        nextJSDocToken();
+                        while (token !== 1) {
+                            switch (token) {
+                                case 55:
+                                    if (canParseTag) {
+                                        parseTag();
+                                    }
+                                    seenAsterisk = false;
+                                    break;
+                                case 4:
+                                    canParseTag = true;
+                                    seenAsterisk = false;
+                                    break;
+                                case 37:
+                                    if (seenAsterisk) {
+                                        canParseTag = false;
+                                    }
+                                    seenAsterisk = true;
+                                    break;
+                                case 69:
                                     canParseTag = false;
-                                }
-                                seenAsterisk = true;
-                                continue;
+                                    break;
+                                case 1:
+                                    break;
                             }
-                            canParseTag = false;
+                            nextJSDocToken();
                         }
-                    }
+                        result = createJSDocComment();
+                    });
                 }
-                return createJSDocComment();
+                return result;
                 function createJSDocComment() {
                     if (!tags) {
                         return undefined;
                     }
-                    var result = createNode(268, start);
+                    var result = createNode(272, start);
                     result.tags = tags;
                     return finishNode(result, end);
                 }
                 function skipWhitespace() {
-                    while (pos < end && ts.isWhiteSpace(content.charCodeAt(pos))) {
-                        pos++;
+                    while (token === 5 || token === 4) {
+                        nextJSDocToken();
                     }
                 }
                 function parseTag() {
-                    ts.Debug.assert(content.charCodeAt(pos - 1) === 64);
-                    var atToken = createNode(55, pos - 1);
-                    atToken.end = pos;
-                    var tagName = scanIdentifier();
+                    ts.Debug.assert(token === 55);
+                    var atToken = createNode(55, scanner.getTokenPos());
+                    atToken.end = scanner.getTextPos();
+                    nextJSDocToken();
+                    var tagName = parseJSDocIdentifier();
                     if (!tagName) {
                         return;
                     }
@@ -10336,10 +11018,10 @@ var ts;
                     return undefined;
                 }
                 function handleUnknownTag(atToken, tagName) {
-                    var result = createNode(269, atToken.pos);
+                    var result = createNode(273, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
-                    return finishNode(result, pos);
+                    return finishNode(result);
                 }
                 function addTag(tag) {
                     if (tag) {
@@ -10352,12 +11034,10 @@ var ts;
                     }
                 }
                 function tryParseTypeExpression() {
-                    skipWhitespace();
-                    if (content.charCodeAt(pos) !== 123) {
+                    if (token !== 15) {
                         return undefined;
                     }
-                    var typeExpression = parseJSDocTypeExpression(pos, end - pos);
-                    pos = typeExpression.end;
+                    var typeExpression = parseJSDocTypeExpression();
                     return typeExpression;
                 }
                 function handleParamTag(atToken, tagName) {
@@ -10365,17 +11045,20 @@ var ts;
                     skipWhitespace();
                     var name;
                     var isBracketed;
-                    if (content.charCodeAt(pos) === 91) {
-                        pos++;
-                        skipWhitespace();
-                        name = scanIdentifier();
+                    if (parseOptionalToken(19)) {
+                        name = parseJSDocIdentifier();
                         isBracketed = true;
+                        if (parseOptionalToken(56)) {
+                            parseExpression();
+                        }
+                        parseExpected(20);
                     }
-                    else {
-                        name = scanIdentifier();
+                    else if (token === 69) {
+                        name = parseJSDocIdentifier();
                     }
                     if (!name) {
-                        parseErrorAtPosition(pos, 0, ts.Diagnostics.Identifier_expected);
+                        parseErrorAtPosition(scanner.getStartPos(), 0, ts.Diagnostics.Identifier_expected);
+                        return undefined;
                     }
                     var preName, postName;
                     if (typeExpression) {
@@ -10387,84 +11070,81 @@ var ts;
                     if (!typeExpression) {
                         typeExpression = tryParseTypeExpression();
                     }
-                    var result = createNode(270, atToken.pos);
+                    var result = createNode(274, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.preParameterName = preName;
                     result.typeExpression = typeExpression;
                     result.postParameterName = postName;
                     result.isBracketed = isBracketed;
-                    return finishNode(result, pos);
+                    return finishNode(result);
                 }
                 function handleReturnTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 271; })) {
-                        parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
+                    if (ts.forEach(tags, function (t) { return t.kind === 275; })) {
+                        parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
-                    var result = createNode(271, atToken.pos);
+                    var result = createNode(275, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
-                    return finishNode(result, pos);
+                    return finishNode(result);
                 }
                 function handleTypeTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 272; })) {
-                        parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
+                    if (ts.forEach(tags, function (t) { return t.kind === 276; })) {
+                        parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
-                    var result = createNode(272, atToken.pos);
+                    var result = createNode(276, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
-                    return finishNode(result, pos);
+                    return finishNode(result);
                 }
                 function handleTemplateTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 273; })) {
-                        parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
+                    if (ts.forEach(tags, function (t) { return t.kind === 277; })) {
+                        parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
                     var typeParameters = [];
-                    typeParameters.pos = pos;
+                    typeParameters.pos = scanner.getStartPos();
                     while (true) {
-                        skipWhitespace();
-                        var startPos = pos;
-                        var name_8 = scanIdentifier();
+                        var name_8 = parseJSDocIdentifier();
                         if (!name_8) {
-                            parseErrorAtPosition(startPos, 0, ts.Diagnostics.Identifier_expected);
+                            parseErrorAtPosition(scanner.getStartPos(), 0, ts.Diagnostics.Identifier_expected);
                             return undefined;
                         }
-                        var typeParameter = createNode(138, name_8.pos);
+                        var typeParameter = createNode(140, name_8.pos);
                         typeParameter.name = name_8;
-                        finishNode(typeParameter, pos);
+                        finishNode(typeParameter);
                         typeParameters.push(typeParameter);
-                        skipWhitespace();
-                        if (content.charCodeAt(pos) !== 44) {
+                        if (token === 24) {
+                            nextJSDocToken();
+                        }
+                        else {
                             break;
                         }
-                        pos++;
                     }
-                    typeParameters.end = pos;
-                    var result = createNode(273, atToken.pos);
+                    var result = createNode(277, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeParameters = typeParameters;
-                    return finishNode(result, pos);
+                    finishNode(result);
+                    typeParameters.end = result.end;
+                    return result;
                 }
-                function scanIdentifier() {
-                    var startPos = pos;
-                    for (; pos < end; pos++) {
-                        var ch = content.charCodeAt(pos);
-                        if (pos === startPos && ts.isIdentifierStart(ch, 2)) {
-                            continue;
-                        }
-                        else if (pos > startPos && ts.isIdentifierPart(ch, 2)) {
-                            continue;
-                        }
-                        break;
-                    }
-                    if (startPos === pos) {
+                function nextJSDocToken() {
+                    return token = scanner.scanJSDocToken();
+                }
+                function parseJSDocIdentifier() {
+                    if (token !== 69) {
+                        parseErrorAtCurrentToken(ts.Diagnostics.Identifier_expected);
                         return undefined;
                     }
-                    var result = createNode(69, startPos);
-                    result.text = content.substring(startPos, pos);
-                    return finishNode(result, pos);
+                    var pos = scanner.getTokenPos();
+                    var end = scanner.getTextPos();
+                    var result = createNode(69, pos);
+                    result.text = content.substring(pos, end);
+                    finishNode(result, end);
+                    nextJSDocToken();
+                    return result;
                 }
             }
             JSDocParser.parseJSDocCommentWorker = parseJSDocCommentWorker;
@@ -10479,7 +11159,7 @@ var ts;
                 return sourceFile;
             }
             if (sourceFile.statements.length === 0) {
-                return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, undefined, true);
+                return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, undefined, true, sourceFile.scriptKind);
             }
             var incrementalSourceFile = sourceFile;
             ts.Debug.assert(!incrementalSourceFile.hasBeenIncrementallyParsed);
@@ -10493,7 +11173,7 @@ var ts;
             ts.Debug.assert(ts.textSpanEnd(ts.textChangeRangeNewSpan(changeRange)) === ts.textSpanEnd(ts.textChangeRangeNewSpan(textChangeRange)));
             var delta = ts.textChangeRangeNewSpan(changeRange).length - changeRange.span.length;
             updateTokenPositionsAndMarkElements(incrementalSourceFile, changeRange.span.start, ts.textSpanEnd(changeRange.span), ts.textSpanEnd(ts.textChangeRangeNewSpan(changeRange)), delta, oldText, newText, aggressiveChecks);
-            var result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, true);
+            var result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, true, sourceFile.scriptKind);
             return result;
         }
         IncrementalParser.updateSourceFile = updateSourceFile;
@@ -10562,12 +11242,12 @@ var ts;
         }
         function checkNodePositions(node, aggressiveChecks) {
             if (aggressiveChecks) {
-                var pos = node.pos;
+                var pos_2 = node.pos;
                 forEachChild(node, function (child) {
-                    ts.Debug.assert(child.pos >= pos);
-                    pos = child.end;
+                    ts.Debug.assert(child.pos >= pos_2);
+                    pos_2 = child.end;
                 });
-                ts.Debug.assert(pos <= node.end);
+                ts.Debug.assert(pos_2 <= node.end);
             }
         }
         function updateTokenPositionsAndMarkElements(sourceFile, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta, oldText, newText, aggressiveChecks) {
@@ -10763,32 +11443,32 @@ var ts;
                 : 4;
     }
     function getModuleInstanceState(node) {
-        if (node.kind === 218 || node.kind === 219) {
+        if (node.kind === 221 || node.kind === 222) {
             return 0;
         }
         else if (ts.isConstEnumDeclaration(node)) {
             return 2;
         }
-        else if ((node.kind === 225 || node.kind === 224) && !(node.flags & 2)) {
+        else if ((node.kind === 229 || node.kind === 228) && !(node.flags & 1)) {
             return 0;
         }
-        else if (node.kind === 222) {
-            var state = 0;
+        else if (node.kind === 225) {
+            var state_1 = 0;
             ts.forEachChild(node, function (n) {
                 switch (getModuleInstanceState(n)) {
                     case 0:
                         return false;
                     case 2:
-                        state = 2;
+                        state_1 = 2;
                         return false;
                     case 1:
-                        state = 1;
+                        state_1 = 1;
                         return true;
                 }
             });
-            return state;
+            return state_1;
         }
-        else if (node.kind === 221) {
+        else if (node.kind === 224) {
             return getModuleInstanceState(node.body);
         }
         else {
@@ -10820,6 +11500,7 @@ var ts;
         var hasAsyncFunctions;
         var hasDecorators;
         var hasParameterDecorators;
+        var hasJsxSpreadAttribute;
         var inStrictMode;
         var symbolCount = 0;
         var Symbol;
@@ -10850,6 +11531,7 @@ var ts;
             hasAsyncFunctions = false;
             hasDecorators = false;
             hasParameterDecorators = false;
+            hasJsxSpreadAttribute = false;
         }
         return bindSourceFile;
         function createSymbol(flags, name) {
@@ -10872,7 +11554,7 @@ var ts;
             if (symbolFlags & 107455) {
                 var valueDeclaration = symbol.valueDeclaration;
                 if (!valueDeclaration ||
-                    (valueDeclaration.kind !== node.kind && valueDeclaration.kind === 221)) {
+                    (valueDeclaration.kind !== node.kind && valueDeclaration.kind === 224)) {
                     symbol.valueDeclaration = node;
                 }
             }
@@ -10882,7 +11564,7 @@ var ts;
                 if (ts.isAmbientModule(node)) {
                     return ts.isGlobalScopeAugmentation(node) ? "__global" : "\"" + node.name.text + "\"";
                 }
-                if (node.name.kind === 137) {
+                if (node.name.kind === 139) {
                     var nameExpression = node.name.expression;
                     if (ts.isStringOrNumericLiteral(nameExpression.kind)) {
                         return nameExpression.text;
@@ -10893,21 +11575,21 @@ var ts;
                 return node.name.text;
             }
             switch (node.kind) {
-                case 145:
+                case 147:
                     return "__constructor";
-                case 153:
-                case 148:
-                    return "__call";
-                case 154:
-                case 149:
-                    return "__new";
+                case 155:
                 case 150:
+                    return "__call";
+                case 156:
+                case 151:
+                    return "__new";
+                case 152:
                     return "__index";
-                case 231:
+                case 235:
                     return "__export";
-                case 230:
+                case 234:
                     return node.isExportEquals ? "export=" : "default";
-                case 184:
+                case 186:
                     switch (ts.getSpecialPropertyAssignmentKind(node)) {
                         case 2:
                             return "export=";
@@ -10919,9 +11601,16 @@ var ts;
                     }
                     ts.Debug.fail("Unknown binary declaration kind");
                     break;
-                case 216:
-                case 217:
+                case 219:
+                case 220:
                     return node.flags & 512 ? "default" : undefined;
+                case 268:
+                    return ts.isJSDocConstructSignature(node) ? "__new" : "__call";
+                case 141:
+                    ts.Debug.assert(node.parent.kind === 268);
+                    var functionType = node.parent;
+                    var index = ts.indexOf(functionType.parameters, node);
+                    return "p" + index;
             }
         }
         function getDisplayName(node) {
@@ -10943,18 +11632,18 @@ var ts;
                     if (node.name) {
                         node.name.parent = node;
                     }
-                    var message = symbol.flags & 2
+                    var message_1 = symbol.flags & 2
                         ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0
                         : ts.Diagnostics.Duplicate_identifier_0;
                     ts.forEach(symbol.declarations, function (declaration) {
                         if (declaration.flags & 512) {
-                            message = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
+                            message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                         }
                     });
                     ts.forEach(symbol.declarations, function (declaration) {
-                        file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message, getDisplayName(declaration)));
+                        file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message_1, getDisplayName(declaration)));
                     });
-                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name || node, message, getDisplayName(node)));
+                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name || node, message_1, getDisplayName(node)));
                     symbol = createSymbol(0, name);
                 }
             }
@@ -10966,9 +11655,9 @@ var ts;
             return symbol;
         }
         function declareModuleMember(node, symbolFlags, symbolExcludes) {
-            var hasExportModifier = ts.getCombinedNodeFlags(node) & 2;
+            var hasExportModifier = ts.getCombinedNodeFlags(node) & 1;
             if (symbolFlags & 8388608) {
-                if (node.kind === 233 || (node.kind === 224 && hasExportModifier)) {
+                if (node.kind === 237 || (node.kind === 228 && hasExportModifier)) {
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
                 }
                 else {
@@ -10976,7 +11665,7 @@ var ts;
                 }
             }
             else {
-                if (!ts.isAmbientModule(node) && (hasExportModifier || container.flags & 131072)) {
+                if (!ts.isAmbientModule(node) && (hasExportModifier || container.flags & 8192)) {
                     var exportKind = (symbolFlags & 107455 ? 1048576 : 0) |
                         (symbolFlags & 793056 ? 2097152 : 0) |
                         (symbolFlags & 1536 ? 4194304 : 0);
@@ -11014,12 +11703,12 @@ var ts;
             var savedHasExplicitReturn;
             var kind = node.kind;
             var flags = node.flags;
-            flags &= ~1572864;
-            flags &= ~62914560;
-            if (kind === 218) {
+            flags &= ~98304;
+            flags &= ~3932160;
+            if (kind === 221) {
                 seenThisKeyword = false;
             }
-            var saveState = kind === 251 || kind === 222 || ts.isFunctionLikeKind(kind);
+            var saveState = kind === 255 || kind === 225 || ts.isFunctionLikeKind(kind);
             if (saveState) {
                 savedReachabilityState = currentReachabilityState;
                 savedLabelStack = labelStack;
@@ -11030,28 +11719,34 @@ var ts;
                 hasExplicitReturn = false;
                 labelStack = labelIndexMap = implicitLabels = undefined;
             }
+            if (ts.isInJavaScriptFile(node) && node.jsDocComment) {
+                bind(node.jsDocComment);
+            }
             bindReachableStatement(node);
             if (currentReachabilityState === 2 && ts.isFunctionLikeKind(kind) && ts.nodeIsPresent(node.body)) {
-                flags |= 524288;
+                flags |= 32768;
                 if (hasExplicitReturn) {
-                    flags |= 1048576;
+                    flags |= 65536;
                 }
             }
-            if (kind === 218) {
-                flags = seenThisKeyword ? flags | 262144 : flags & ~262144;
+            if (kind === 221) {
+                flags = seenThisKeyword ? flags | 16384 : flags & ~16384;
             }
-            if (kind === 251) {
+            if (kind === 255) {
                 if (hasClassExtends) {
-                    flags |= 4194304;
+                    flags |= 262144;
                 }
                 if (hasDecorators) {
-                    flags |= 8388608;
+                    flags |= 524288;
                 }
                 if (hasParameterDecorators) {
-                    flags |= 16777216;
+                    flags |= 1048576;
                 }
                 if (hasAsyncFunctions) {
-                    flags |= 33554432;
+                    flags |= 2097152;
+                }
+                if (hasJsxSpreadAttribute) {
+                    flags |= 1073741824;
                 }
             }
             node.flags = flags;
@@ -11072,40 +11767,40 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 201:
+                case 204:
                     bindWhileStatement(node);
                     break;
-                case 200:
+                case 203:
                     bindDoStatement(node);
                     break;
-                case 202:
+                case 205:
                     bindForStatement(node);
                     break;
-                case 203:
-                case 204:
+                case 206:
+                case 207:
                     bindForInOrForOfStatement(node);
                     break;
-                case 199:
+                case 202:
                     bindIfStatement(node);
                     break;
-                case 207:
-                case 211:
+                case 210:
+                case 214:
                     bindReturnOrThrow(node);
                     break;
-                case 206:
-                case 205:
+                case 209:
+                case 208:
                     bindBreakOrContinueStatement(node);
                     break;
-                case 212:
+                case 215:
                     bindTryStatement(node);
                     break;
-                case 209:
+                case 212:
                     bindSwitchStatement(node);
                     break;
-                case 223:
+                case 226:
                     bindCaseBlock(node);
                     break;
-                case 210:
+                case 213:
                     bindLabeledStatement(node);
                     break;
                 default:
@@ -11167,14 +11862,14 @@ var ts;
         }
         function bindReturnOrThrow(n) {
             bind(n.expression);
-            if (n.kind === 207) {
+            if (n.kind === 210) {
                 hasExplicitReturn = true;
             }
             currentReachabilityState = 4;
         }
         function bindBreakOrContinueStatement(n) {
             bind(n.label);
-            var isValidJump = jumpToLabel(n.label, n.kind === 206 ? currentReachabilityState : 4);
+            var isValidJump = jumpToLabel(n.label, n.kind === 209 ? currentReachabilityState : 4);
             if (isValidJump) {
                 currentReachabilityState = 4;
             }
@@ -11188,24 +11883,27 @@ var ts;
             var postCatchState = currentReachabilityState;
             currentReachabilityState = preTryState;
             bind(n.finallyBlock);
-            currentReachabilityState = or(postTryState, postCatchState);
+            currentReachabilityState = n.catchClause ? or(postTryState, postCatchState) : postTryState;
         }
         function bindSwitchStatement(n) {
             var preSwitchState = currentReachabilityState;
             var postSwitchLabel = pushImplicitLabel();
             bind(n.expression);
             bind(n.caseBlock);
-            var hasDefault = ts.forEach(n.caseBlock.clauses, function (c) { return c.kind === 245; });
+            var hasDefault = ts.forEach(n.caseBlock.clauses, function (c) { return c.kind === 249; });
             var postSwitchState = hasDefault && currentReachabilityState !== 2 ? 4 : preSwitchState;
             popImplicitLabel(postSwitchLabel, postSwitchState);
         }
         function bindCaseBlock(n) {
             var startState = currentReachabilityState;
-            for (var _i = 0, _a = n.clauses; _i < _a.length; _i++) {
-                var clause = _a[_i];
+            for (var i = 0; i < n.clauses.length; i++) {
+                var clause = n.clauses[i];
                 currentReachabilityState = startState;
                 bind(clause);
-                if (clause.statements.length && currentReachabilityState === 2 && options.noFallthroughCasesInSwitch) {
+                if (clause.statements.length &&
+                    i !== n.clauses.length - 1 &&
+                    currentReachabilityState === 2 &&
+                    options.noFallthroughCasesInSwitch) {
                     errorOnFirstToken(clause, ts.Diagnostics.Fallthrough_case_in_switch);
                 }
             }
@@ -11220,37 +11918,39 @@ var ts;
         }
         function getContainerFlags(node) {
             switch (node.kind) {
-                case 189:
-                case 217:
-                case 218:
+                case 191:
                 case 220:
-                case 156:
-                case 168:
+                case 221:
+                case 223:
+                case 170:
+                case 158:
+                case 264:
                     return 1;
+                case 150:
+                case 151:
+                case 152:
+                case 146:
+                case 145:
+                case 219:
+                case 147:
                 case 148:
                 case 149:
-                case 150:
-                case 144:
-                case 143:
-                case 216:
-                case 145:
-                case 146:
-                case 147:
-                case 153:
-                case 154:
-                case 176:
-                case 177:
-                case 221:
-                case 251:
-                case 219:
+                case 155:
+                case 268:
+                case 156:
+                case 178:
+                case 179:
+                case 224:
+                case 255:
+                case 222:
                     return 5;
-                case 247:
-                case 202:
-                case 203:
-                case 204:
-                case 223:
+                case 251:
+                case 205:
+                case 206:
+                case 207:
+                case 226:
                     return 2;
-                case 195:
+                case 198:
                     return ts.isFunctionLike(node.parent) ? 0 : 2;
             }
             return 0;
@@ -11266,38 +11966,40 @@ var ts;
         }
         function declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes) {
             switch (container.kind) {
-                case 221:
+                case 224:
                     return declareModuleMember(node, symbolFlags, symbolExcludes);
-                case 251:
+                case 255:
                     return declareSourceFileMember(node, symbolFlags, symbolExcludes);
-                case 189:
-                case 217:
-                    return declareClassMember(node, symbolFlags, symbolExcludes);
+                case 191:
                 case 220:
+                    return declareClassMember(node, symbolFlags, symbolExcludes);
+                case 223:
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                case 156:
-                case 168:
-                case 218:
+                case 158:
+                case 170:
+                case 221:
+                case 264:
                     return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
-                case 153:
-                case 154:
+                case 155:
+                case 156:
+                case 150:
+                case 151:
+                case 152:
+                case 146:
+                case 145:
+                case 147:
                 case 148:
                 case 149:
-                case 150:
-                case 144:
-                case 143:
-                case 145:
-                case 146:
-                case 147:
-                case 216:
-                case 176:
-                case 177:
                 case 219:
+                case 178:
+                case 179:
+                case 268:
+                case 222:
                     return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
             }
         }
         function declareClassMember(node, symbolFlags, symbolExcludes) {
-            return node.flags & 64
+            return node.flags & 32
                 ? declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes)
                 : declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
         }
@@ -11307,11 +12009,11 @@ var ts;
                 : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes);
         }
         function hasExportDeclarations(node) {
-            var body = node.kind === 251 ? node : node.body;
-            if (body.kind === 251 || body.kind === 222) {
+            var body = node.kind === 255 ? node : node.body;
+            if (body.kind === 255 || body.kind === 225) {
                 for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
                     var stat = _a[_i];
-                    if (stat.kind === 231 || stat.kind === 230) {
+                    if (stat.kind === 235 || stat.kind === 234) {
                         return true;
                     }
                 }
@@ -11320,19 +12022,24 @@ var ts;
         }
         function setExportContextFlag(node) {
             if (ts.isInAmbientContext(node) && !hasExportDeclarations(node)) {
-                node.flags |= 131072;
+                node.flags |= 8192;
             }
             else {
-                node.flags &= ~131072;
+                node.flags &= ~8192;
             }
         }
         function bindModuleDeclaration(node) {
             setExportContextFlag(node);
             if (ts.isAmbientModule(node)) {
-                if (node.flags & 2) {
+                if (node.flags & 1) {
                     errorOnFirstToken(node, ts.Diagnostics.export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always_visible);
                 }
-                declareSymbolAndAddToSymbolTable(node, 512, 106639);
+                if (ts.isExternalModuleAugmentation(node)) {
+                    declareSymbolAndAddToSymbolTable(node, 1024, 0);
+                }
+                else {
+                    declareSymbolAndAddToSymbolTable(node, 512, 106639);
+                }
             }
             else {
                 var state = getModuleInstanceState(node);
@@ -11373,7 +12080,7 @@ var ts;
                         continue;
                     }
                     var identifier = prop.name;
-                    var currentKind = prop.kind === 248 || prop.kind === 249 || prop.kind === 144
+                    var currentKind = prop.kind === 252 || prop.kind === 253 || prop.kind === 146
                         ? 1
                         : 2;
                     var existingKind = seen[identifier.text];
@@ -11395,10 +12102,10 @@ var ts;
         }
         function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
             switch (blockScopeContainer.kind) {
-                case 221:
+                case 224:
                     declareModuleMember(node, symbolFlags, symbolExcludes);
                     break;
-                case 251:
+                case 255:
                     if (ts.isExternalModule(container)) {
                         declareModuleMember(node, symbolFlags, symbolExcludes);
                         break;
@@ -11477,7 +12184,7 @@ var ts;
             }
         }
         function checkStrictModeNumericLiteral(node) {
-            if (inStrictMode && node.flags & 32768) {
+            if (inStrictMode && node.isOctalLiteral) {
                 file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode));
             }
         }
@@ -11520,17 +12227,17 @@ var ts;
         }
         function updateStrictMode(node) {
             switch (node.kind) {
-                case 251:
-                case 222:
+                case 255:
+                case 225:
                     updateStrictModeStatementList(node.statements);
                     return;
-                case 195:
+                case 198:
                     if (ts.isFunctionLike(node.parent)) {
                         updateStrictModeStatementList(node.statements);
                     }
                     return;
-                case 217:
-                case 189:
+                case 220:
+                case 191:
                     inStrictMode = true;
                     return;
             }
@@ -11549,13 +12256,13 @@ var ts;
         }
         function isUseStrictPrologueDirective(node) {
             var nodeText = ts.getTextOfNodeFromSourceText(file.text, node.expression);
-            return nodeText === "\"use strict\"" || nodeText === "'use strict'";
+            return nodeText === '"use strict"' || nodeText === "'use strict'";
         }
         function bindWorker(node) {
             switch (node.kind) {
                 case 69:
                     return checkStrictModeIdentifier(node);
-                case 184:
+                case 186:
                     if (ts.isInJavaScriptFile(node)) {
                         var specialKind = ts.getSpecialPropertyAssignmentKind(node);
                         switch (specialKind) {
@@ -11578,91 +12285,99 @@ var ts;
                         }
                     }
                     return checkStrictModeBinaryExpression(node);
-                case 247:
+                case 251:
                     return checkStrictModeCatchClause(node);
-                case 178:
+                case 180:
                     return checkStrictModeDeleteExpression(node);
                 case 8:
                     return checkStrictModeNumericLiteral(node);
-                case 183:
+                case 185:
                     return checkStrictModePostfixUnaryExpression(node);
-                case 182:
+                case 184:
                     return checkStrictModePrefixUnaryExpression(node);
-                case 208:
+                case 211:
                     return checkStrictModeWithStatement(node);
-                case 162:
+                case 164:
                     seenThisKeyword = true;
                     return;
-                case 151:
+                case 153:
                     return checkTypePredicate(node);
-                case 138:
+                case 140:
                     return declareSymbolAndAddToSymbolTable(node, 262144, 530912);
-                case 139:
-                    return bindParameter(node);
-                case 214:
-                case 166:
-                    return bindVariableDeclarationOrBindingElement(node);
-                case 142:
                 case 141:
-                    return bindPropertyOrMethodOrAccessor(node, 4 | (node.questionToken ? 536870912 : 0), 107455);
-                case 248:
-                case 249:
-                    return bindPropertyOrMethodOrAccessor(node, 4, 107455);
-                case 250:
-                    return bindPropertyOrMethodOrAccessor(node, 8, 107455);
-                case 148:
-                case 149:
-                case 150:
-                    return declareSymbolAndAddToSymbolTable(node, 131072, 0);
+                    return bindParameter(node);
+                case 217:
+                case 168:
+                    return bindVariableDeclarationOrBindingElement(node);
                 case 144:
                 case 143:
-                    return bindPropertyOrMethodOrAccessor(node, 8192 | (node.questionToken ? 536870912 : 0), ts.isObjectLiteralMethod(node) ? 107455 : 99263);
-                case 216:
-                    return bindFunctionDeclaration(node);
-                case 145:
-                    return declareSymbolAndAddToSymbolTable(node, 16384, 0);
+                case 265:
+                    return bindPropertyOrMethodOrAccessor(node, 4 | (node.questionToken ? 536870912 : 0), 107455);
+                case 252:
+                case 253:
+                    return bindPropertyOrMethodOrAccessor(node, 4, 107455);
+                case 254:
+                    return bindPropertyOrMethodOrAccessor(node, 8, 107455);
+                case 246:
+                    hasJsxSpreadAttribute = true;
+                    return;
+                case 150:
+                case 151:
+                case 152:
+                    return declareSymbolAndAddToSymbolTable(node, 131072, 0);
                 case 146:
-                    return bindPropertyOrMethodOrAccessor(node, 32768, 41919);
+                case 145:
+                    return bindPropertyOrMethodOrAccessor(node, 8192 | (node.questionToken ? 536870912 : 0), ts.isObjectLiteralMethod(node) ? 107455 : 99263);
+                case 219:
+                    return bindFunctionDeclaration(node);
                 case 147:
+                    return declareSymbolAndAddToSymbolTable(node, 16384, 0);
+                case 148:
+                    return bindPropertyOrMethodOrAccessor(node, 32768, 41919);
+                case 149:
                     return bindPropertyOrMethodOrAccessor(node, 65536, 74687);
-                case 153:
-                case 154:
-                    return bindFunctionOrConstructorType(node);
+                case 155:
                 case 156:
+                case 268:
+                    return bindFunctionOrConstructorType(node);
+                case 158:
+                case 264:
                     return bindAnonymousDeclaration(node, 2048, "__type");
-                case 168:
+                case 170:
                     return bindObjectLiteralExpression(node);
-                case 176:
-                case 177:
+                case 178:
+                case 179:
                     return bindFunctionExpression(node);
-                case 171:
+                case 173:
                     if (ts.isInJavaScriptFile(node)) {
                         bindCallExpression(node);
                     }
                     break;
-                case 189:
-                case 217:
-                    return bindClassLikeDeclaration(node);
-                case 218:
-                    return bindBlockScopedDeclaration(node, 64, 792960);
-                case 219:
-                    return bindBlockScopedDeclaration(node, 524288, 793056);
+                case 191:
                 case 220:
-                    return bindEnumDeclaration(node);
+                    return bindClassLikeDeclaration(node);
                 case 221:
-                    return bindModuleDeclaration(node);
+                    return bindBlockScopedDeclaration(node, 64, 792960);
+                case 222:
+                    return bindBlockScopedDeclaration(node, 524288, 793056);
+                case 223:
+                    return bindEnumDeclaration(node);
                 case 224:
-                case 227:
-                case 229:
-                case 233:
-                    return declareSymbolAndAddToSymbolTable(node, 8388608, 8388608);
-                case 226:
-                    return bindImportClause(node);
+                    return bindModuleDeclaration(node);
+                case 228:
                 case 231:
-                    return bindExportDeclaration(node);
+                case 233:
+                case 237:
+                    return declareSymbolAndAddToSymbolTable(node, 8388608, 8388608);
+                case 227:
+                    return bindGlobalModuleExportDeclaration(node);
                 case 230:
+                    return bindImportClause(node);
+                case 235:
+                    return bindExportDeclaration(node);
+                case 234:
                     return bindExportAssignment(node);
-                case 251:
+                case 255:
                     return bindSourceFileIfExternalModule();
             }
         }
@@ -11671,7 +12386,7 @@ var ts;
             if (parameterName && parameterName.kind === 69) {
                 checkStrictModeIdentifier(parameterName);
             }
-            if (parameterName && parameterName.kind === 162) {
+            if (parameterName && parameterName.kind === 164) {
                 seenThisKeyword = true;
             }
             bind(type);
@@ -11686,17 +12401,39 @@ var ts;
             bindAnonymousDeclaration(file, 512, "\"" + ts.removeFileExtension(file.fileName) + "\"");
         }
         function bindExportAssignment(node) {
-            var boundExpression = node.kind === 230 ? node.expression : node.right;
+            var boundExpression = node.kind === 234 ? node.expression : node.right;
             if (!container.symbol || !container.symbol.exports) {
                 bindAnonymousDeclaration(node, 8388608, getDeclarationName(node));
             }
-            else if (boundExpression.kind === 69) {
+            else if (boundExpression.kind === 69 && node.kind === 234) {
                 declareSymbol(container.symbol.exports, container.symbol, node, 8388608, 107455 | 8388608);
             }
             else {
                 declareSymbol(container.symbol.exports, container.symbol, node, 4, 107455 | 8388608);
             }
         }
+        function bindGlobalModuleExportDeclaration(node) {
+            if (node.modifiers && node.modifiers.length) {
+                file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Modifiers_cannot_appear_here));
+            }
+            if (node.parent.kind !== 255) {
+                file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_at_top_level));
+                return;
+            }
+            else {
+                var parent_4 = node.parent;
+                if (!ts.isExternalModule(parent_4)) {
+                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_in_module_files));
+                    return;
+                }
+                if (!parent_4.isDeclarationFile) {
+                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_in_declaration_files));
+                    return;
+                }
+            }
+            file.symbol.globalExports = file.symbol.globalExports || {};
+            declareSymbol(file.symbol.globalExports, file.symbol, node, 8388608, 8388608);
+        }
         function bindExportDeclaration(node) {
             if (!container.symbol || !container.symbol.exports) {
                 bindAnonymousDeclaration(node, 1073741824, getDeclarationName(node));
@@ -11722,27 +12459,32 @@ var ts;
         }
         function bindModuleExportsAssignment(node) {
             setCommonJsModuleIndicator(node);
-            bindExportAssignment(node);
+            declareSymbol(file.symbol.exports, file.symbol, node, 4 | 7340032 | 512, 0);
         }
         function bindThisPropertyAssignment(node) {
-            if (container.kind === 176 || container.kind === 216) {
+            if (container.kind === 178 || container.kind === 219) {
                 container.symbol.members = container.symbol.members || {};
-                declareSymbol(container.symbol.members, container.symbol, node, 4, 107455);
+                declareSymbol(container.symbol.members, container.symbol, node, 4, 107455 & ~4);
             }
         }
         function bindPrototypePropertyAssignment(node) {
-            var classId = node.left.expression.expression;
-            var funcSymbol = container.locals[classId.text];
+            var leftSideOfAssignment = node.left;
+            var classPrototype = leftSideOfAssignment.expression;
+            var constructorFunction = classPrototype.expression;
+            leftSideOfAssignment.parent = node;
+            constructorFunction.parent = classPrototype;
+            classPrototype.parent = leftSideOfAssignment;
+            var funcSymbol = container.locals[constructorFunction.text];
             if (!funcSymbol || !(funcSymbol.flags & 16)) {
                 return;
             }
             if (!funcSymbol.members) {
                 funcSymbol.members = {};
             }
-            declareSymbol(funcSymbol.members, funcSymbol, node.left, 4, 107455);
+            declareSymbol(funcSymbol.members, funcSymbol, leftSideOfAssignment, 4, 107455);
         }
         function bindCallExpression(node) {
-            if (!file.commonJsModuleIndicator && ts.isRequireCall(node)) {
+            if (!file.commonJsModuleIndicator && ts.isRequireCall(node, false)) {
                 setCommonJsModuleIndicator(node);
             }
         }
@@ -11755,7 +12497,7 @@ var ts;
                     hasDecorators = true;
                 }
             }
-            if (node.kind === 217) {
+            if (node.kind === 220) {
                 bindBlockScopedDeclaration(node, 32, 899519);
             }
             else {
@@ -11905,16 +12647,16 @@ var ts;
         function checkUnreachable(node) {
             switch (currentReachabilityState) {
                 case 4:
-                    var reportError = (ts.isStatement(node) && node.kind !== 197) ||
-                        node.kind === 217 ||
-                        (node.kind === 221 && shouldReportErrorOnModuleDeclaration(node)) ||
-                        (node.kind === 220 && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums));
+                    var reportError = (ts.isStatement(node) && node.kind !== 200) ||
+                        node.kind === 220 ||
+                        (node.kind === 224 && shouldReportErrorOnModuleDeclaration(node)) ||
+                        (node.kind === 223 && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums));
                     if (reportError) {
                         currentReachabilityState = 8;
                         var reportUnreachableCode = !options.allowUnreachableCode &&
                             !ts.isInAmbientContext(node) &&
-                            (node.kind !== 196 ||
-                                ts.getCombinedNodeFlags(node.declarationList) & 24576 ||
+                            (node.kind !== 199 ||
+                                ts.getCombinedNodeFlags(node.declarationList) & 3072 ||
                                 ts.forEach(node.declarationList.declarations, function (d) { return d.initializer; }));
                         if (reportUnreachableCode) {
                             errorOnFirstToken(node, ts.Diagnostics.Unreachable_code_detected);
@@ -11974,8 +12716,9 @@ var ts;
         var emptySymbols = {};
         var compilerOptions = host.getCompilerOptions();
         var languageVersion = compilerOptions.target || 0;
-        var modulekind = compilerOptions.module ? compilerOptions.module : languageVersion === 2 ? 5 : 0;
-        var allowSyntheticDefaultImports = typeof compilerOptions.allowSyntheticDefaultImports !== "undefined" ? compilerOptions.allowSyntheticDefaultImports : modulekind === 4;
+        var modulekind = ts.getEmitModuleKind(compilerOptions);
+        var allowSyntheticDefaultImports = typeof compilerOptions.allowSyntheticDefaultImports !== "undefined" ? compilerOptions.allowSyntheticDefaultImports : modulekind === ts.ModuleKind.System;
+        var strictNullChecks = compilerOptions.strictNullChecks;
         var emitResolver = createResolver();
         var undefinedSymbol = createSymbol(4 | 67108864, "undefined");
         undefinedSymbol.declarations = [];
@@ -11990,7 +12733,7 @@ var ts;
             isUnknownSymbol: function (symbol) { return symbol === unknownSymbol; },
             getDiagnostics: getDiagnostics,
             getGlobalDiagnostics: getGlobalDiagnostics,
-            getTypeOfSymbolAtLocation: getNarrowedTypeOfSymbol,
+            getTypeOfSymbolAtLocation: getTypeOfSymbolAtLocation,
             getSymbolsOfParameterPropertyDeclaration: getSymbolsOfParameterPropertyDeclaration,
             getDeclaredTypeOfSymbol: getDeclaredTypeOfSymbol,
             getPropertiesOfType: getPropertiesOfType,
@@ -12025,14 +12768,16 @@ var ts;
         };
         var unknownSymbol = createSymbol(4 | 67108864, "unknown");
         var resolvingSymbol = createSymbol(67108864, "__resolving__");
+        var nullableWideningFlags = strictNullChecks ? 0 : 2097152;
         var anyType = createIntrinsicType(1, "any");
         var stringType = createIntrinsicType(2, "string");
         var numberType = createIntrinsicType(4, "number");
         var booleanType = createIntrinsicType(8, "boolean");
         var esSymbolType = createIntrinsicType(16777216, "symbol");
         var voidType = createIntrinsicType(16, "void");
-        var undefinedType = createIntrinsicType(32 | 2097152, "undefined");
-        var nullType = createIntrinsicType(64 | 2097152, "null");
+        var undefinedType = createIntrinsicType(32 | nullableWideningFlags, "undefined");
+        var nullType = createIntrinsicType(64 | nullableWideningFlags, "null");
+        var emptyArrayElementType = createIntrinsicType(32 | 2097152, "undefined");
         var unknownType = createIntrinsicType(1, "unknown");
         var emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         var emptyUnionType = emptyObjectType;
@@ -12041,24 +12786,27 @@ var ts;
         var anyFunctionType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         anyFunctionType.flags |= 8388608;
         var noConstraintType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
-        var anySignature = createSignature(undefined, undefined, emptyArray, anyType, 0, false, false);
-        var unknownSignature = createSignature(undefined, undefined, emptyArray, unknownType, 0, false, false);
+        var anySignature = createSignature(undefined, undefined, undefined, emptyArray, anyType, undefined, 0, false, false);
+        var unknownSignature = createSignature(undefined, undefined, undefined, emptyArray, unknownType, undefined, 0, false, false);
+        var enumNumberIndexInfo = createIndexInfo(stringType, true);
         var globals = {};
-        var globalESSymbolConstructorSymbol;
+        var getGlobalESSymbolConstructorSymbol;
         var getGlobalPromiseConstructorSymbol;
         var globalObjectType;
         var globalFunctionType;
         var globalArrayType;
+        var globalReadonlyArrayType;
         var globalStringType;
         var globalNumberType;
         var globalBooleanType;
         var globalRegExpType;
-        var globalTemplateStringsArrayType;
-        var globalESSymbolType;
-        var globalIterableType;
-        var globalIteratorType;
-        var globalIterableIteratorType;
         var anyArrayType;
+        var anyReadonlyArrayType;
+        var getGlobalTemplateStringsArrayType;
+        var getGlobalESSymbolType;
+        var getGlobalIterableType;
+        var getGlobalIteratorType;
+        var getGlobalIterableIteratorType;
         var getGlobalClassDecoratorType;
         var getGlobalParameterDecoratorType;
         var getGlobalPropertyDecoratorType;
@@ -12120,6 +12868,7 @@ var ts;
         };
         var subtypeRelation = {};
         var assignableRelation = {};
+        var comparableRelation = {};
         var identityRelation = {};
         var _displayBuilder;
         var builtinGlobals = (_a = {},
@@ -12208,7 +12957,7 @@ var ts;
                 target.flags |= source.flags;
                 if (source.valueDeclaration &&
                     (!target.valueDeclaration ||
-                        (target.valueDeclaration.kind === 221 && source.valueDeclaration.kind !== 221))) {
+                        (target.valueDeclaration.kind === 224 && source.valueDeclaration.kind !== 224))) {
                     target.valueDeclaration = source.valueDeclaration;
                 }
                 ts.forEach(source.declarations, function (node) {
@@ -12227,13 +12976,13 @@ var ts;
                 recordMergedSymbol(target, source);
             }
             else {
-                var message = target.flags & 2 || source.flags & 2
+                var message_2 = target.flags & 2 || source.flags & 2
                     ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0;
                 ts.forEach(source.declarations, function (node) {
-                    error(node.name ? node.name : node, message, symbolToString(source));
+                    error(node.name ? node.name : node, message_2, symbolToString(source));
                 });
                 ts.forEach(target.declarations, function (node) {
-                    error(node.name ? node.name : node, message, symbolToString(source));
+                    error(node.name ? node.name : node, message_2, symbolToString(source));
                 });
             }
         }
@@ -12264,7 +13013,7 @@ var ts;
         }
         function mergeModuleAugmentation(moduleName) {
             var moduleAugmentation = moduleName.parent;
-            if (moduleAugmentation.symbol.valueDeclaration !== moduleAugmentation) {
+            if (moduleAugmentation.symbol.declarations[0] !== moduleAugmentation) {
                 ts.Debug.assert(moduleAugmentation.symbol.declarations.length > 1);
                 return;
             }
@@ -12276,8 +13025,14 @@ var ts;
                 if (!mainModule) {
                     return;
                 }
-                mainModule = mainModule.flags & 33554432 ? mainModule : cloneSymbol(mainModule);
-                mergeSymbol(mainModule, moduleAugmentation.symbol);
+                mainModule = resolveExternalModuleSymbol(mainModule);
+                if (mainModule.flags & 1536) {
+                    mainModule = mainModule.flags & 33554432 ? mainModule : cloneSymbol(mainModule);
+                    mergeSymbol(mainModule, moduleAugmentation.symbol);
+                }
+                else {
+                    error(moduleName, ts.Diagnostics.Cannot_augment_module_0_because_it_resolves_to_a_non_module_entity, moduleName.text);
+                }
             }
         }
         function addToSymbolTable(target, source, message) {
@@ -12306,7 +13061,7 @@ var ts;
             return nodeLinks[nodeId] || (nodeLinks[nodeId] = {});
         }
         function isGlobalSourceFile(node) {
-            return node.kind === 251 && !ts.isExternalOrCommonJsModule(node);
+            return node.kind === 255 && !ts.isExternalOrCommonJsModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning && ts.hasProperty(symbols, name)) {
@@ -12324,9 +13079,9 @@ var ts;
             }
         }
         function getSymbolsOfParameterPropertyDeclaration(parameter, parameterName) {
-            var constructoDeclaration = parameter.parent;
+            var constructorDeclaration = parameter.parent;
             var classDeclaration = parameter.parent.parent;
-            var parameterSymbol = getSymbol(constructoDeclaration.locals, parameterName, 107455);
+            var parameterSymbol = getSymbol(constructorDeclaration.locals, parameterName, 107455);
             var propertySymbol = getSymbol(classDeclaration.symbol.members, parameterName, 107455);
             if (parameterSymbol && propertySymbol) {
                 return [parameterSymbol, propertySymbol];
@@ -12344,18 +13099,18 @@ var ts;
                 return ts.indexOf(sourceFiles, declarationFile) <= ts.indexOf(sourceFiles, useFile);
             }
             if (declaration.pos <= usage.pos) {
-                return declaration.kind !== 214 ||
+                return declaration.kind !== 217 ||
                     !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
             }
             return isUsedInFunctionOrNonStaticProperty(declaration, usage);
             function isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage) {
                 var container = ts.getEnclosingBlockScopeContainer(declaration);
-                if (declaration.parent.parent.kind === 196 ||
-                    declaration.parent.parent.kind === 202) {
+                if (declaration.parent.parent.kind === 199 ||
+                    declaration.parent.parent.kind === 205) {
                     return isSameScopeDescendentOf(usage, declaration, container);
                 }
-                else if (declaration.parent.parent.kind === 204 ||
-                    declaration.parent.parent.kind === 203) {
+                else if (declaration.parent.parent.kind === 207 ||
+                    declaration.parent.parent.kind === 206) {
                     var expression = declaration.parent.parent.expression;
                     return isSameScopeDescendentOf(usage, expression, container);
                 }
@@ -12371,8 +13126,8 @@ var ts;
                         return true;
                     }
                     var initializerOfNonStaticProperty = current.parent &&
-                        current.parent.kind === 142 &&
-                        (current.parent.flags & 64) === 0 &&
+                        current.parent.kind === 144 &&
+                        (current.parent.flags & 32) === 0 &&
                         current.parent.initializer === current;
                     if (initializerOfNonStaticProperty) {
                         return true;
@@ -12393,18 +13148,18 @@ var ts;
                     if (result = getSymbol(location.locals, name, meaning)) {
                         var useResult = true;
                         if (ts.isFunctionLike(location) && lastLocation && lastLocation !== location.body) {
-                            if (meaning & result.flags & 793056) {
+                            if (meaning & result.flags & 793056 && lastLocation.kind !== 272) {
                                 useResult = result.flags & 262144
                                     ? lastLocation === location.type ||
-                                        lastLocation.kind === 139 ||
-                                        lastLocation.kind === 138
+                                        lastLocation.kind === 141 ||
+                                        lastLocation.kind === 140
                                     : false;
                             }
                             if (meaning & 107455 && result.flags & 1) {
                                 useResult =
-                                    lastLocation.kind === 139 ||
+                                    lastLocation.kind === 141 ||
                                         (lastLocation === location.type &&
-                                            result.valueDeclaration.kind === 139);
+                                            result.valueDeclaration.kind === 141);
                             }
                         }
                         if (useResult) {
@@ -12416,12 +13171,12 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 251:
+                    case 255:
                         if (!ts.isExternalOrCommonJsModule(location))
                             break;
-                    case 221:
+                    case 224:
                         var moduleExports = getSymbolOfNode(location).exports;
-                        if (location.kind === 251 || ts.isAmbientModule(location)) {
+                        if (location.kind === 255 || ts.isAmbientModule(location)) {
                             if (result = moduleExports["default"]) {
                                 var localSymbol = ts.getLocalSymbolForExportDefault(result);
                                 if (localSymbol && (result.flags & meaning) && localSymbol.name === name) {
@@ -12431,7 +13186,7 @@ var ts;
                             }
                             if (ts.hasProperty(moduleExports, name) &&
                                 moduleExports[name].flags === 8388608 &&
-                                ts.getDeclarationOfKind(moduleExports[name], 233)) {
+                                ts.getDeclarationOfKind(moduleExports[name], 237)) {
                                 break;
                             }
                         }
@@ -12439,14 +13194,14 @@ var ts;
                             break loop;
                         }
                         break;
-                    case 220:
+                    case 223:
                         if (result = getSymbol(getSymbolOfNode(location).exports, name, meaning & 8)) {
                             break loop;
                         }
                         break;
-                    case 142:
-                    case 141:
-                        if (ts.isClassLike(location.parent) && !(location.flags & 64)) {
+                    case 144:
+                    case 143:
+                        if (ts.isClassLike(location.parent) && !(location.flags & 32)) {
                             var ctor = findConstructorDeclaration(location.parent);
                             if (ctor && ctor.locals) {
                                 if (getSymbol(ctor.locals, name, meaning & 107455)) {
@@ -12455,17 +13210,17 @@ var ts;
                             }
                         }
                         break;
-                    case 217:
-                    case 189:
-                    case 218:
+                    case 220:
+                    case 191:
+                    case 221:
                         if (result = getSymbol(getSymbolOfNode(location).members, name, meaning & 793056)) {
-                            if (lastLocation && lastLocation.flags & 64) {
+                            if (lastLocation && lastLocation.flags & 32) {
                                 error(errorLocation, ts.Diagnostics.Static_members_cannot_reference_class_type_parameters);
                                 return undefined;
                             }
                             break loop;
                         }
-                        if (location.kind === 189 && meaning & 32) {
+                        if (location.kind === 191 && meaning & 32) {
                             var className = location.name;
                             if (className && name === className.text) {
                                 result = location.symbol;
@@ -12473,28 +13228,28 @@ var ts;
                             }
                         }
                         break;
-                    case 137:
+                    case 139:
                         grandparent = location.parent.parent;
-                        if (ts.isClassLike(grandparent) || grandparent.kind === 218) {
+                        if (ts.isClassLike(grandparent) || grandparent.kind === 221) {
                             if (result = getSymbol(getSymbolOfNode(grandparent).members, name, meaning & 793056)) {
                                 error(errorLocation, ts.Diagnostics.A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type);
                                 return undefined;
                             }
                         }
                         break;
-                    case 144:
-                    case 143:
-                    case 145:
                     case 146:
+                    case 145:
                     case 147:
-                    case 216:
-                    case 177:
+                    case 148:
+                    case 149:
+                    case 219:
+                    case 179:
                         if (meaning & 3 && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
                         }
                         break;
-                    case 176:
+                    case 178:
                         if (meaning & 3 && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
@@ -12507,8 +13262,8 @@ var ts;
                             }
                         }
                         break;
-                    case 140:
-                        if (location.parent && location.parent.kind === 139) {
+                    case 142:
+                        if (location.parent && location.parent.kind === 141) {
                             location = location.parent;
                         }
                         if (location.parent && ts.isClassElement(location.parent)) {
@@ -12562,7 +13317,7 @@ var ts;
                         error(errorLocation, ts.Diagnostics.Cannot_find_name_0_Did_you_mean_the_static_member_1_0, typeof nameArg === "string" ? nameArg : ts.declarationNameToString(nameArg), symbolToString(classSymbol));
                         return true;
                     }
-                    if (location === container && !(location.flags & 64)) {
+                    if (location === container && !(location.flags & 32)) {
                         var instanceType = getDeclaredTypeOfSymbol(classSymbol).thisType;
                         if (getPropertyOfType(instanceType, name)) {
                             error(errorLocation, ts.Diagnostics.Cannot_find_name_0_Did_you_mean_the_instance_member_this_0, typeof nameArg === "string" ? nameArg : ts.declarationNameToString(nameArg));
@@ -12578,7 +13333,7 @@ var ts;
             ts.Debug.assert((result.flags & 2) !== 0);
             var declaration = ts.forEach(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) ? d : undefined; });
             ts.Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined");
-            if (!isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 214), errorLocation)) {
+            if (!isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 217), errorLocation)) {
                 error(errorLocation, ts.Diagnostics.Block_scoped_variable_0_used_before_its_declaration, ts.declarationNameToString(declaration.name));
             }
         }
@@ -12595,10 +13350,10 @@ var ts;
         }
         function getAnyImportSyntax(node) {
             if (ts.isAliasSymbolDeclaration(node)) {
-                if (node.kind === 224) {
+                if (node.kind === 228) {
                     return node;
                 }
-                while (node && node.kind !== 225) {
+                while (node && node.kind !== 229) {
                     node = node.parent;
                 }
                 return node;
@@ -12608,7 +13363,7 @@ var ts;
             return ts.forEach(symbol.declarations, function (d) { return ts.isAliasSymbolDeclaration(d) ? d : undefined; });
         }
         function getTargetOfImportEqualsDeclaration(node) {
-            if (node.moduleReference.kind === 235) {
+            if (node.moduleReference.kind === 239) {
                 return resolveExternalModuleSymbol(resolveExternalModuleName(node, ts.getExternalModuleImportEqualsDeclarationExpression(node)));
             }
             return getSymbolOfPartOfRightHandSideOfImportEquals(node.moduleReference, node);
@@ -12616,12 +13371,14 @@ var ts;
         function getTargetOfImportClause(node) {
             var moduleSymbol = resolveExternalModuleName(node, node.parent.moduleSpecifier);
             if (moduleSymbol) {
-                var exportDefaultSymbol = resolveSymbol(moduleSymbol.exports["default"]);
+                var exportDefaultSymbol = moduleSymbol.exports["export="] ?
+                    getPropertyOfType(getTypeOfSymbol(moduleSymbol.exports["export="]), "default") :
+                    resolveSymbol(moduleSymbol.exports["default"]);
                 if (!exportDefaultSymbol && !allowSyntheticDefaultImports) {
                     error(node.name, ts.Diagnostics.Module_0_has_no_default_export, symbolToString(moduleSymbol));
                 }
                 else if (!exportDefaultSymbol && allowSyntheticDefaultImports) {
-                    return resolveSymbol(moduleSymbol.exports["export="]) || resolveSymbol(moduleSymbol);
+                    return resolveExternalModuleSymbol(moduleSymbol) || resolveSymbol(moduleSymbol);
                 }
                 return exportDefaultSymbol;
             }
@@ -12667,8 +13424,14 @@ var ts;
             if (targetSymbol) {
                 var name_9 = specifier.propertyName || specifier.name;
                 if (name_9.text) {
+                    var symbolFromVariable = void 0;
+                    if (moduleSymbol && moduleSymbol.exports && moduleSymbol.exports["export="]) {
+                        symbolFromVariable = getPropertyOfType(getTypeOfSymbol(targetSymbol), name_9.text);
+                    }
+                    else {
+                        symbolFromVariable = getPropertyOfVariable(targetSymbol, name_9.text);
+                    }
                     var symbolFromModule = getExportOfModule(targetSymbol, name_9.text);
-                    var symbolFromVariable = getPropertyOfVariable(targetSymbol, name_9.text);
                     var symbol = symbolFromModule && symbolFromVariable ?
                         combineValueAndTypeSymbols(symbolFromVariable, symbolFromModule) :
                         symbolFromModule || symbolFromVariable;
@@ -12682,6 +13445,9 @@ var ts;
         function getTargetOfImportSpecifier(node) {
             return getExternalModuleMember(node.parent.parent.parent, node);
         }
+        function getTargetOfGlobalModuleExportDeclaration(node) {
+            return resolveExternalModuleSymbol(node.parent.symbol);
+        }
         function getTargetOfExportSpecifier(node) {
             return node.parent.parent.moduleSpecifier ?
                 getExternalModuleMember(node.parent.parent, node) :
@@ -12692,18 +13458,20 @@ var ts;
         }
         function getTargetOfAliasDeclaration(node) {
             switch (node.kind) {
-                case 224:
+                case 228:
                     return getTargetOfImportEqualsDeclaration(node);
-                case 226:
-                    return getTargetOfImportClause(node);
-                case 227:
-                    return getTargetOfNamespaceImport(node);
-                case 229:
-                    return getTargetOfImportSpecifier(node);
-                case 233:
-                    return getTargetOfExportSpecifier(node);
                 case 230:
+                    return getTargetOfImportClause(node);
+                case 231:
+                    return getTargetOfNamespaceImport(node);
+                case 233:
+                    return getTargetOfImportSpecifier(node);
+                case 237:
+                    return getTargetOfExportSpecifier(node);
+                case 234:
                     return getTargetOfExportAssignment(node);
+                case 227:
+                    return getTargetOfGlobalModuleExportDeclaration(node);
             }
         }
         function resolveSymbol(symbol) {
@@ -12744,10 +13512,10 @@ var ts;
             if (!links.referenced) {
                 links.referenced = true;
                 var node = getDeclarationOfAliasSymbol(symbol);
-                if (node.kind === 230) {
+                if (node.kind === 234) {
                     checkExpressionCached(node.expression);
                 }
-                else if (node.kind === 233) {
+                else if (node.kind === 237) {
                     checkExpressionCached(node.propertyName || node.name);
                 }
                 else if (ts.isInternalModuleImportEqualsDeclaration(node)) {
@@ -12757,17 +13525,17 @@ var ts;
         }
         function getSymbolOfPartOfRightHandSideOfImportEquals(entityName, importDeclaration) {
             if (!importDeclaration) {
-                importDeclaration = ts.getAncestor(entityName, 224);
+                importDeclaration = ts.getAncestor(entityName, 228);
                 ts.Debug.assert(importDeclaration !== undefined);
             }
             if (entityName.kind === 69 && ts.isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
                 entityName = entityName.parent;
             }
-            if (entityName.kind === 69 || entityName.parent.kind === 136) {
+            if (entityName.kind === 69 || entityName.parent.kind === 138) {
                 return resolveEntityName(entityName, 1536);
             }
             else {
-                ts.Debug.assert(entityName.parent.kind === 224);
+                ts.Debug.assert(entityName.parent.kind === 228);
                 return resolveEntityName(entityName, 107455 | 793056 | 1536);
             }
         }
@@ -12786,9 +13554,9 @@ var ts;
                     return undefined;
                 }
             }
-            else if (name.kind === 136 || name.kind === 169) {
-                var left = name.kind === 136 ? name.left : name.expression;
-                var right = name.kind === 136 ? name.right : name.name;
+            else if (name.kind === 138 || name.kind === 171) {
+                var left = name.kind === 138 ? name.left : name.expression;
+                var right = name.kind === 138 ? name.right : name.name;
                 var namespace = resolveEntityName(left, 1536, ignoreErrors);
                 if (!namespace || namespace === unknownSymbol || ts.nodeIsMissing(right)) {
                     return undefined;
@@ -12821,7 +13589,7 @@ var ts;
             }
             var isRelative = ts.isExternalModuleNameRelative(moduleName);
             if (!isRelative) {
-                var symbol = getSymbol(globals, "\"" + moduleName + "\"", 512);
+                var symbol = getSymbol(globals, '"' + moduleName + '"', 512);
                 if (symbol) {
                     return getMergedSymbol(symbol);
                 }
@@ -12843,7 +13611,7 @@ var ts;
             return undefined;
         }
         function resolveExternalModuleSymbol(moduleSymbol) {
-            return moduleSymbol && resolveSymbol(moduleSymbol.exports["export="]) || moduleSymbol;
+            return moduleSymbol && getMergedSymbol(resolveSymbol(moduleSymbol.exports["export="])) || moduleSymbol;
         }
         function resolveESModuleSymbol(moduleSymbol, moduleReferenceExpression) {
             var symbol = resolveExternalModuleSymbol(moduleSymbol);
@@ -12853,8 +13621,8 @@ var ts;
             }
             return symbol;
         }
-        function getExportAssignmentSymbol(moduleSymbol) {
-            return moduleSymbol.exports["export="];
+        function hasExportAssignmentSymbol(moduleSymbol) {
+            return moduleSymbol.exports["export="] !== undefined;
         }
         function getExportsOfModuleAsArray(moduleSymbol) {
             return symbolsToArray(getExportsOfModule(moduleSymbol));
@@ -12951,7 +13719,7 @@ var ts;
             var members = node.members;
             for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
                 var member = members_1[_i];
-                if (member.kind === 145 && ts.nodeIsPresent(member.body)) {
+                if (member.kind === 147 && ts.nodeIsPresent(member.body)) {
                     return member;
                 }
             }
@@ -12994,19 +13762,19 @@ var ts;
             }
             return result || emptyArray;
         }
-        function setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexType, numberIndexType) {
+        function setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
             type.members = members;
             type.properties = getNamedMembers(members);
             type.callSignatures = callSignatures;
             type.constructSignatures = constructSignatures;
-            if (stringIndexType)
-                type.stringIndexType = stringIndexType;
-            if (numberIndexType)
-                type.numberIndexType = numberIndexType;
+            if (stringIndexInfo)
+                type.stringIndexInfo = stringIndexInfo;
+            if (numberIndexInfo)
+                type.numberIndexInfo = numberIndexInfo;
             return type;
         }
-        function createAnonymousType(symbol, members, callSignatures, constructSignatures, stringIndexType, numberIndexType) {
-            return setObjectTypeMembers(createObjectType(65536, symbol), members, callSignatures, constructSignatures, stringIndexType, numberIndexType);
+        function createAnonymousType(symbol, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
+            return setObjectTypeMembers(createObjectType(65536, symbol), members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function forEachSymbolTableInScope(enclosingDeclaration, callback) {
             var result;
@@ -13017,21 +13785,15 @@ var ts;
                     }
                 }
                 switch (location_1.kind) {
-                    case 251:
+                    case 255:
                         if (!ts.isExternalOrCommonJsModule(location_1)) {
                             break;
                         }
-                    case 221:
+                    case 224:
                         if (result = callback(getSymbolOfNode(location_1).exports)) {
                             return result;
                         }
                         break;
-                    case 217:
-                    case 218:
-                        if (result = callback(getSymbolOfNode(location_1).members)) {
-                            return result;
-                        }
-                        break;
                 }
             }
             return callback(globals);
@@ -13060,7 +13822,7 @@ var ts;
                 return ts.forEachValue(symbols, function (symbolFromSymbolTable) {
                     if (symbolFromSymbolTable.flags & 8388608
                         && symbolFromSymbolTable.name !== "export="
-                        && !ts.getDeclarationOfKind(symbolFromSymbolTable, 233)) {
+                        && !ts.getDeclarationOfKind(symbolFromSymbolTable, 237)) {
                         if (!useOnlyExternalAliasing ||
                             ts.forEach(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration)) {
                             var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
@@ -13076,7 +13838,9 @@ var ts;
                 });
             }
             if (symbol) {
-                return forEachSymbolTableInScope(enclosingDeclaration, getAccessibleSymbolChainFromSymbolTable);
+                if (!(isPropertyOrMethodDeclarationSymbol(symbol))) {
+                    return forEachSymbolTableInScope(enclosingDeclaration, getAccessibleSymbolChainFromSymbolTable);
+                }
             }
         }
         function needsQualification(symbol, enclosingDeclaration, meaning) {
@@ -13089,7 +13853,7 @@ var ts;
                 if (symbolFromSymbolTable === symbol) {
                     return true;
                 }
-                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608 && !ts.getDeclarationOfKind(symbolFromSymbolTable, 233)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
+                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608 && !ts.getDeclarationOfKind(symbolFromSymbolTable, 237)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
                 if (symbolFromSymbolTable.flags & meaning) {
                     qualify = true;
                     return true;
@@ -13098,6 +13862,24 @@ var ts;
             });
             return qualify;
         }
+        function isPropertyOrMethodDeclarationSymbol(symbol) {
+            if (symbol.declarations && symbol.declarations.length) {
+                for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                    var declaration = _a[_i];
+                    switch (declaration.kind) {
+                        case 144:
+                        case 146:
+                        case 148:
+                        case 149:
+                            continue;
+                        default:
+                            return false;
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
         function isSymbolAccessible(symbol, enclosingDeclaration, meaning) {
             if (symbol && enclosingDeclaration && !(symbol.flags & 262144)) {
                 var initialSymbol = symbol;
@@ -13144,7 +13926,7 @@ var ts;
             }
         }
         function hasExternalModuleSymbol(declaration) {
-            return ts.isAmbientModule(declaration) || (declaration.kind === 251 && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isAmbientModule(declaration) || (declaration.kind === 255 && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasVisibleDeclarations(symbol) {
             var aliasesToMakeVisible;
@@ -13156,7 +13938,7 @@ var ts;
                 if (!isDeclarationVisible(declaration)) {
                     var anyImportSyntax = getAnyImportSyntax(declaration);
                     if (anyImportSyntax &&
-                        !(anyImportSyntax.flags & 2) &&
+                        !(anyImportSyntax.flags & 1) &&
                         isDeclarationVisible(anyImportSyntax.parent)) {
                         getNodeLinks(declaration).isVisible = true;
                         if (aliasesToMakeVisible) {
@@ -13176,11 +13958,11 @@ var ts;
         }
         function isEntityNameVisible(entityName, enclosingDeclaration) {
             var meaning;
-            if (entityName.parent.kind === 155) {
+            if (entityName.parent.kind === 157 || ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
                 meaning = 107455 | 1048576;
             }
-            else if (entityName.kind === 136 || entityName.kind === 169 ||
-                entityName.parent.kind === 224) {
+            else if (entityName.kind === 138 || entityName.kind === 171 ||
+                entityName.parent.kind === 228) {
                 meaning = 1536;
             }
             else {
@@ -13228,13 +14010,29 @@ var ts;
             }
             return result;
         }
+        function typePredicateToString(typePredicate, enclosingDeclaration, flags) {
+            var writer = ts.getSingleLineStringWriter();
+            getSymbolDisplayBuilder().buildTypePredicateDisplay(typePredicate, writer, enclosingDeclaration, flags);
+            var result = writer.string();
+            ts.releaseStringWriter(writer);
+            return result;
+        }
+        function visibilityToString(flags) {
+            if (flags === 8) {
+                return "private";
+            }
+            if (flags === 16) {
+                return "protected";
+            }
+            return "public";
+        }
         function getTypeAliasForTypeLiteral(type) {
             if (type.symbol && type.symbol.flags & 2048) {
                 var node = type.symbol.declarations[0].parent;
-                while (node.kind === 161) {
+                while (node.kind === 163) {
                     node = node.parent;
                 }
-                if (node.kind === 219) {
+                if (node.kind === 222) {
                     return getSymbolOfNode(node);
                 }
             }
@@ -13242,7 +14040,7 @@ var ts;
         }
         function isTopLevelInExternalModuleAugmentation(node) {
             return node && node.parent &&
-                node.parent.kind === 222 &&
+                node.parent.kind === 225 &&
                 ts.isExternalModuleAugmentation(node.parent.parent);
         }
         function getSymbolDisplayBuilder() {
@@ -13253,10 +14051,10 @@ var ts;
                         return ts.declarationNameToString(declaration.name);
                     }
                     switch (declaration.kind) {
-                        case 189:
+                        case 191:
                             return "(Anonymous class)";
-                        case 176:
-                        case 177:
+                        case 178:
+                        case 179:
                             return "(Anonymous function)";
                     }
                 }
@@ -13321,15 +14119,9 @@ var ts;
                 return writeType(type, globalFlags);
                 function writeType(type, flags) {
                     if (type.flags & 16777343) {
-                        if (type.flags & 134217728) {
-                            buildTypePredicateDisplay(writer, type.predicate);
-                            buildTypeDisplay(type.predicate.type, writer, enclosingDeclaration, flags, symbolStack);
-                        }
-                        else {
-                            writer.writeKeyword(!(globalFlags & 16) && isTypeAny(type)
-                                ? "any"
-                                : type.intrinsicName);
-                        }
+                        writer.writeKeyword(!(globalFlags & 16) && isTypeAny(type)
+                            ? "any"
+                            : type.intrinsicName);
                     }
                     else if (type.flags & 33554432) {
                         if (inObjectTypeLiteral) {
@@ -13406,12 +14198,12 @@ var ts;
                             var length_1 = outerTypeParameters.length;
                             while (i < length_1) {
                                 var start = i;
-                                var parent_3 = getParentSymbolOfTypeParameter(outerTypeParameters[i]);
+                                var parent_5 = getParentSymbolOfTypeParameter(outerTypeParameters[i]);
                                 do {
                                     i++;
-                                } while (i < length_1 && getParentSymbolOfTypeParameter(outerTypeParameters[i]) === parent_3);
+                                } while (i < length_1 && getParentSymbolOfTypeParameter(outerTypeParameters[i]) === parent_5);
                                 if (!ts.rangeEquals(outerTypeParameters, typeArguments, start, i)) {
-                                    writeSymbolTypeReference(parent_3, typeArguments, start, i, flags);
+                                    writeSymbolTypeReference(parent_5, typeArguments, start, i, flags);
                                     writePunctuation(writer, 21);
                                 }
                             }
@@ -13466,11 +14258,11 @@ var ts;
                     }
                     function shouldWriteTypeOfFunctionSymbol() {
                         var isStaticMethodSymbol = !!(symbol.flags & 8192 &&
-                            ts.forEach(symbol.declarations, function (declaration) { return declaration.flags & 64; }));
+                            ts.forEach(symbol.declarations, function (declaration) { return declaration.flags & 32; }));
                         var isNonLocalFunctionSymbol = !!(symbol.flags & 16) &&
                             (symbol.parent ||
                                 ts.forEach(symbol.declarations, function (declaration) {
-                                    return declaration.parent.kind === 251 || declaration.parent.kind === 222;
+                                    return declaration.parent.kind === 255 || declaration.parent.kind === 225;
                                 }));
                         if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
                             return !!(flags & 2) ||
@@ -13483,17 +14275,38 @@ var ts;
                     writeSpace(writer);
                     buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, 107455, 0, typeFormatFlags);
                 }
-                function getIndexerParameterName(type, indexKind, fallbackName) {
-                    var declaration = getIndexDeclarationOfSymbol(type.symbol, indexKind);
-                    if (!declaration) {
-                        return fallbackName;
+                function writeIndexSignature(info, keyword) {
+                    if (info) {
+                        if (info.isReadonly) {
+                            writeKeyword(writer, 127);
+                            writeSpace(writer);
+                        }
+                        writePunctuation(writer, 19);
+                        writer.writeParameter(info.declaration ? ts.declarationNameToString(info.declaration.parameters[0].name) : "x");
+                        writePunctuation(writer, 54);
+                        writeSpace(writer);
+                        writeKeyword(writer, keyword);
+                        writePunctuation(writer, 20);
+                        writePunctuation(writer, 54);
+                        writeSpace(writer);
+                        writeType(info.type, 0);
+                        writePunctuation(writer, 23);
+                        writer.writeLine();
+                    }
+                }
+                function writePropertyWithModifiers(prop) {
+                    if (isReadonlySymbol(prop)) {
+                        writeKeyword(writer, 127);
+                        writeSpace(writer);
+                    }
+                    buildSymbolDisplay(prop, writer);
+                    if (prop.flags & 536870912) {
+                        writePunctuation(writer, 53);
                     }
-                    ts.Debug.assert(declaration.parameters.length !== 0);
-                    return ts.declarationNameToString(declaration.parameters[0].name);
                 }
                 function writeLiteralType(type, flags) {
                     var resolved = resolveStructuredTypeMembers(type);
-                    if (!resolved.properties.length && !resolved.stringIndexType && !resolved.numberIndexType) {
+                    if (!resolved.properties.length && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
                         if (!resolved.callSignatures.length && !resolved.constructSignatures.length) {
                             writePunctuation(writer, 15);
                             writePunctuation(writer, 16);
@@ -13539,32 +14352,8 @@ var ts;
                         writePunctuation(writer, 23);
                         writer.writeLine();
                     }
-                    if (resolved.stringIndexType) {
-                        writePunctuation(writer, 19);
-                        writer.writeParameter(getIndexerParameterName(resolved, 0, "x"));
-                        writePunctuation(writer, 54);
-                        writeSpace(writer);
-                        writeKeyword(writer, 130);
-                        writePunctuation(writer, 20);
-                        writePunctuation(writer, 54);
-                        writeSpace(writer);
-                        writeType(resolved.stringIndexType, 0);
-                        writePunctuation(writer, 23);
-                        writer.writeLine();
-                    }
-                    if (resolved.numberIndexType) {
-                        writePunctuation(writer, 19);
-                        writer.writeParameter(getIndexerParameterName(resolved, 1, "x"));
-                        writePunctuation(writer, 54);
-                        writeSpace(writer);
-                        writeKeyword(writer, 128);
-                        writePunctuation(writer, 20);
-                        writePunctuation(writer, 54);
-                        writeSpace(writer);
-                        writeType(resolved.numberIndexType, 0);
-                        writePunctuation(writer, 23);
-                        writer.writeLine();
-                    }
+                    writeIndexSignature(resolved.stringIndexInfo, 131);
+                    writeIndexSignature(resolved.numberIndexInfo, 129);
                     for (var _d = 0, _e = resolved.properties; _d < _e.length; _d++) {
                         var p = _e[_d];
                         var t = getTypeOfSymbol(p);
@@ -13572,20 +14361,14 @@ var ts;
                             var signatures = getSignaturesOfType(t, 0);
                             for (var _f = 0, signatures_1 = signatures; _f < signatures_1.length; _f++) {
                                 var signature = signatures_1[_f];
-                                buildSymbolDisplay(p, writer);
-                                if (p.flags & 536870912) {
-                                    writePunctuation(writer, 53);
-                                }
+                                writePropertyWithModifiers(p);
                                 buildSignatureDisplay(signature, writer, enclosingDeclaration, globalFlagsToPass, undefined, symbolStack);
                                 writePunctuation(writer, 23);
                                 writer.writeLine();
                             }
                         }
                         else {
-                            buildSymbolDisplay(p, writer);
-                            if (p.flags & 536870912) {
-                                writePunctuation(writer, 53);
-                            }
+                            writePropertyWithModifiers(p);
                             writePunctuation(writer, 54);
                             writeSpace(writer);
                             writeType(t, 0);
@@ -13598,10 +14381,10 @@ var ts;
                     inObjectTypeLiteral = saveInObjectTypeLiteral;
                 }
             }
-            function buildTypeParameterDisplayFromSymbol(symbol, writer, enclosingDeclaraiton, flags) {
+            function buildTypeParameterDisplayFromSymbol(symbol, writer, enclosingDeclaration, flags) {
                 var targetSymbol = getTargetSymbol(symbol);
                 if (targetSymbol.flags & 32 || targetSymbol.flags & 64 || targetSymbol.flags & 524288) {
-                    buildDisplayForTypeParametersAndDelimiters(getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol), writer, enclosingDeclaraiton, flags);
+                    buildDisplayForTypeParametersAndDelimiters(getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol), writer, enclosingDeclaration, flags);
                 }
             }
             function buildTypeParameterDisplay(tp, writer, enclosingDeclaration, flags, symbolStack) {
@@ -13619,7 +14402,12 @@ var ts;
                 if (ts.isRestParameter(parameterNode)) {
                     writePunctuation(writer, 22);
                 }
-                appendSymbolNameOnly(p, writer);
+                if (ts.isBindingPattern(parameterNode.name)) {
+                    buildBindingPatternDisplay(parameterNode.name, writer, enclosingDeclaration, flags, symbolStack);
+                }
+                else {
+                    appendSymbolNameOnly(p, writer);
+                }
                 if (isOptionalParameter(parameterNode)) {
                     writePunctuation(writer, 53);
                 }
@@ -13627,19 +14415,58 @@ var ts;
                 writeSpace(writer);
                 buildTypeDisplay(getTypeOfSymbol(p), writer, enclosingDeclaration, flags, symbolStack);
             }
+            function buildBindingPatternDisplay(bindingPattern, writer, enclosingDeclaration, flags, symbolStack) {
+                if (bindingPattern.kind === 166) {
+                    writePunctuation(writer, 15);
+                    buildDisplayForCommaSeparatedList(bindingPattern.elements, writer, function (e) { return buildBindingElementDisplay(e, writer, enclosingDeclaration, flags, symbolStack); });
+                    writePunctuation(writer, 16);
+                }
+                else if (bindingPattern.kind === 167) {
+                    writePunctuation(writer, 19);
+                    var elements = bindingPattern.elements;
+                    buildDisplayForCommaSeparatedList(elements, writer, function (e) { return buildBindingElementDisplay(e, writer, enclosingDeclaration, flags, symbolStack); });
+                    if (elements && elements.hasTrailingComma) {
+                        writePunctuation(writer, 24);
+                    }
+                    writePunctuation(writer, 20);
+                }
+            }
+            function buildBindingElementDisplay(bindingElement, writer, enclosingDeclaration, flags, symbolStack) {
+                if (bindingElement.kind === 192) {
+                    return;
+                }
+                ts.Debug.assert(bindingElement.kind === 168);
+                if (bindingElement.propertyName) {
+                    writer.writeSymbol(ts.getTextOfNode(bindingElement.propertyName), bindingElement.symbol);
+                    writePunctuation(writer, 54);
+                    writeSpace(writer);
+                }
+                if (ts.isBindingPattern(bindingElement.name)) {
+                    buildBindingPatternDisplay(bindingElement.name, writer, enclosingDeclaration, flags, symbolStack);
+                }
+                else {
+                    if (bindingElement.dotDotDotToken) {
+                        writePunctuation(writer, 22);
+                    }
+                    appendSymbolNameOnly(bindingElement.symbol, writer);
+                }
+            }
             function buildDisplayForTypeParametersAndDelimiters(typeParameters, writer, enclosingDeclaration, flags, symbolStack) {
                 if (typeParameters && typeParameters.length) {
                     writePunctuation(writer, 25);
-                    for (var i = 0; i < typeParameters.length; i++) {
-                        if (i > 0) {
-                            writePunctuation(writer, 24);
-                            writeSpace(writer);
-                        }
-                        buildTypeParameterDisplay(typeParameters[i], writer, enclosingDeclaration, flags, symbolStack);
-                    }
+                    buildDisplayForCommaSeparatedList(typeParameters, writer, function (p) { return buildTypeParameterDisplay(p, writer, enclosingDeclaration, flags, symbolStack); });
                     writePunctuation(writer, 27);
                 }
             }
+            function buildDisplayForCommaSeparatedList(list, writer, action) {
+                for (var i = 0; i < list.length; i++) {
+                    if (i > 0) {
+                        writePunctuation(writer, 24);
+                        writeSpace(writer);
+                    }
+                    action(list[i]);
+                }
+            }
             function buildDisplayForTypeArgumentsAndDelimiters(typeParameters, mapper, writer, enclosingDeclaration, flags, symbolStack) {
                 if (typeParameters && typeParameters.length) {
                     writePunctuation(writer, 25);
@@ -13653,10 +14480,16 @@ var ts;
                     writePunctuation(writer, 27);
                 }
             }
-            function buildDisplayForParametersAndDelimiters(parameters, writer, enclosingDeclaration, flags, symbolStack) {
+            function buildDisplayForParametersAndDelimiters(thisType, parameters, writer, enclosingDeclaration, flags, symbolStack) {
                 writePunctuation(writer, 17);
+                if (thisType) {
+                    writeKeyword(writer, 97);
+                    writePunctuation(writer, 54);
+                    writeSpace(writer);
+                    buildTypeDisplay(thisType, writer, enclosingDeclaration, flags, symbolStack);
+                }
                 for (var i = 0; i < parameters.length; i++) {
-                    if (i > 0) {
+                    if (i > 0 || thisType) {
                         writePunctuation(writer, 24);
                         writeSpace(writer);
                     }
@@ -13664,7 +14497,7 @@ var ts;
                 }
                 writePunctuation(writer, 18);
             }
-            function buildTypePredicateDisplay(writer, predicate) {
+            function buildTypePredicateDisplay(predicate, writer, enclosingDeclaration, flags, symbolStack) {
                 if (ts.isIdentifierTypePredicate(predicate)) {
                     writer.writeParameter(predicate.parameterName);
                 }
@@ -13674,6 +14507,7 @@ var ts;
                 writeSpace(writer);
                 writeKeyword(writer, 124);
                 writeSpace(writer);
+                buildTypeDisplay(predicate.type, writer, enclosingDeclaration, flags, symbolStack);
             }
             function buildReturnTypeDisplay(signature, writer, enclosingDeclaration, flags, symbolStack) {
                 if (flags & 8) {
@@ -13684,8 +14518,13 @@ var ts;
                     writePunctuation(writer, 54);
                 }
                 writeSpace(writer);
-                var returnType = getReturnTypeOfSignature(signature);
-                buildTypeDisplay(returnType, writer, enclosingDeclaration, flags, symbolStack);
+                if (signature.typePredicate) {
+                    buildTypePredicateDisplay(signature.typePredicate, writer, enclosingDeclaration, flags, symbolStack);
+                }
+                else {
+                    var returnType = getReturnTypeOfSignature(signature);
+                    buildTypeDisplay(returnType, writer, enclosingDeclaration, flags, symbolStack);
+                }
             }
             function buildSignatureDisplay(signature, writer, enclosingDeclaration, flags, kind, symbolStack) {
                 if (kind === 1) {
@@ -13698,13 +14537,14 @@ var ts;
                 else {
                     buildDisplayForTypeParametersAndDelimiters(signature.typeParameters, writer, enclosingDeclaration, flags, symbolStack);
                 }
-                buildDisplayForParametersAndDelimiters(signature.parameters, writer, enclosingDeclaration, flags, symbolStack);
+                buildDisplayForParametersAndDelimiters(signature.thisType, signature.parameters, writer, enclosingDeclaration, flags, symbolStack);
                 buildReturnTypeDisplay(signature, writer, enclosingDeclaration, flags, symbolStack);
             }
             return _displayBuilder || (_displayBuilder = {
                 buildSymbolDisplay: buildSymbolDisplay,
                 buildTypeDisplay: buildTypeDisplay,
                 buildTypeParameterDisplay: buildTypeParameterDisplay,
+                buildTypePredicateDisplay: buildTypePredicateDisplay,
                 buildParameterDisplay: buildParameterDisplay,
                 buildDisplayForParametersAndDelimiters: buildDisplayForParametersAndDelimiters,
                 buildDisplayForTypeParametersAndDelimiters: buildDisplayForTypeParametersAndDelimiters,
@@ -13724,74 +14564,74 @@ var ts;
             return false;
             function determineIfDeclarationIsVisible() {
                 switch (node.kind) {
-                    case 166:
+                    case 168:
                         return isDeclarationVisible(node.parent.parent);
-                    case 214:
+                    case 217:
                         if (ts.isBindingPattern(node.name) &&
                             !node.name.elements.length) {
                             return false;
                         }
-                    case 221:
-                    case 217:
-                    case 218:
-                    case 219:
-                    case 216:
-                    case 220:
                     case 224:
+                    case 220:
+                    case 221:
+                    case 222:
+                    case 219:
+                    case 223:
+                    case 228:
                         if (ts.isExternalModuleAugmentation(node)) {
                             return true;
                         }
-                        var parent_4 = getDeclarationContainer(node);
-                        if (!(ts.getCombinedNodeFlags(node) & 2) &&
-                            !(node.kind !== 224 && parent_4.kind !== 251 && ts.isInAmbientContext(parent_4))) {
-                            return isGlobalSourceFile(parent_4);
+                        var parent_6 = getDeclarationContainer(node);
+                        if (!(ts.getCombinedNodeFlags(node) & 1) &&
+                            !(node.kind !== 228 && parent_6.kind !== 255 && ts.isInAmbientContext(parent_6))) {
+                            return isGlobalSourceFile(parent_6);
                         }
-                        return isDeclarationVisible(parent_4);
-                    case 142:
-                    case 141:
-                    case 146:
-                    case 147:
+                        return isDeclarationVisible(parent_6);
                     case 144:
                     case 143:
-                        if (node.flags & (16 | 32)) {
+                    case 148:
+                    case 149:
+                    case 146:
+                    case 145:
+                        if (node.flags & (8 | 16)) {
                             return false;
                         }
-                    case 145:
-                    case 149:
-                    case 148:
+                    case 147:
+                    case 151:
                     case 150:
-                    case 139:
-                    case 222:
-                    case 153:
-                    case 154:
-                    case 156:
                     case 152:
-                    case 157:
+                    case 141:
+                    case 225:
+                    case 155:
+                    case 156:
                     case 158:
+                    case 154:
                     case 159:
                     case 160:
                     case 161:
+                    case 162:
+                    case 163:
                         return isDeclarationVisible(node.parent);
-                    case 226:
-                    case 227:
-                    case 229:
-                        return false;
-                    case 138:
-                    case 251:
-                        return true;
                     case 230:
+                    case 231:
+                    case 233:
+                        return false;
+                    case 140:
+                    case 255:
+                        return true;
+                    case 234:
                         return false;
                     default:
-                        ts.Debug.fail("isDeclarationVisible unknown: SyntaxKind: " + node.kind);
+                        return false;
                 }
             }
         }
         function collectLinkedAliases(node) {
             var exportSymbol;
-            if (node.parent && node.parent.kind === 230) {
+            if (node.parent && node.parent.kind === 234) {
                 exportSymbol = resolveName(node.parent, node.text, 107455 | 793056 | 1536 | 8388608, ts.Diagnostics.Cannot_find_name_0, node);
             }
-            else if (node.parent.kind === 233) {
+            else if (node.parent.kind === 237) {
                 var exportSpecifier = node.parent;
                 exportSymbol = exportSpecifier.parent.parent.moduleSpecifier ?
                     getExternalModuleMember(exportSpecifier.parent.parent, exportSpecifier) :
@@ -13868,10 +14708,23 @@ var ts;
         }
         function getDeclarationContainer(node) {
             node = ts.getRootDeclaration(node);
-            return node.kind === 214 ? node.parent.parent.parent : node.parent;
+            while (node) {
+                switch (node.kind) {
+                    case 217:
+                    case 218:
+                    case 233:
+                    case 232:
+                    case 231:
+                    case 230:
+                        node = node.parent;
+                        break;
+                    default:
+                        return node.parent;
+                }
+            }
         }
         function getTypeOfPrototypeProperty(prototype) {
-            var classType = getDeclaredTypeOfSymbol(getMergedSymbol(prototype.parent));
+            var classType = getDeclaredTypeOfSymbol(getParentOfSymbol(prototype));
             return classType.typeParameters ? createTypeReference(classType, ts.map(classType.typeParameters, function (_) { return anyType; })) : classType;
         }
         function getTypeOfPropertyOfType(type, name) {
@@ -13892,7 +14745,7 @@ var ts;
                 case 9:
                 case 8:
                     return name.text;
-                case 137:
+                case 139:
                     if (ts.isStringOrNumericLiteral(name.expression.kind)) {
                         return name.expression.text;
                     }
@@ -13900,7 +14753,7 @@ var ts;
             return undefined;
         }
         function isComputedNonLiteralName(name) {
-            return name.kind === 137 && !ts.isStringOrNumericLiteral(name.expression.kind);
+            return name.kind === 139 && !ts.isStringOrNumericLiteral(name.expression.kind);
         }
         function getTypeForBindingElement(declaration) {
             var pattern = declaration.parent;
@@ -13915,11 +14768,14 @@ var ts;
                 return parentType;
             }
             var type;
-            if (pattern.kind === 164) {
+            if (pattern.kind === 166) {
                 var name_10 = declaration.propertyName || declaration.name;
                 if (isComputedNonLiteralName(name_10)) {
                     return anyType;
                 }
+                if (declaration.initializer) {
+                    getContextualType(declaration.initializer);
+                }
                 var text = getTextOfPropertyName(name_10);
                 type = getTypeOfPropertyOfType(parentType, text) ||
                     isNumericLiteralName(text) && getIndexTypeOfType(parentType, 1) ||
@@ -13950,38 +14806,77 @@ var ts;
                     type = createArrayType(elementType);
                 }
             }
+            if (strictNullChecks && declaration.initializer && !(getNullableKind(checkExpressionCached(declaration.initializer)) & 32)) {
+                type = removeNullableKind(type, 32);
+            }
             return type;
         }
+        function getTypeForVariableLikeDeclarationFromJSDocComment(declaration) {
+            var jsDocType = getJSDocTypeForVariableLikeDeclarationFromJSDocComment(declaration);
+            if (jsDocType) {
+                return getTypeFromTypeNode(jsDocType);
+            }
+        }
+        function getJSDocTypeForVariableLikeDeclarationFromJSDocComment(declaration) {
+            var typeTag = ts.getJSDocTypeTag(declaration);
+            if (typeTag && typeTag.typeExpression) {
+                return typeTag.typeExpression.type;
+            }
+            if (declaration.kind === 217 &&
+                declaration.parent.kind === 218 &&
+                declaration.parent.parent.kind === 199) {
+                var annotation = ts.getJSDocTypeTag(declaration.parent.parent);
+                if (annotation && annotation.typeExpression) {
+                    return annotation.typeExpression.type;
+                }
+            }
+            else if (declaration.kind === 141) {
+                var paramTag = ts.getCorrespondingJSDocParameterTag(declaration);
+                if (paramTag && paramTag.typeExpression) {
+                    return paramTag.typeExpression.type;
+                }
+            }
+            return undefined;
+        }
         function getTypeForVariableLikeDeclaration(declaration) {
-            if (declaration.parent.parent.kind === 203) {
+            if (declaration.flags & 134217728) {
+                var type = getTypeForVariableLikeDeclarationFromJSDocComment(declaration);
+                if (type && type !== unknownType) {
+                    return type;
+                }
+            }
+            if (declaration.parent.parent.kind === 206) {
                 return stringType;
             }
-            if (declaration.parent.parent.kind === 204) {
+            if (declaration.parent.parent.kind === 207) {
                 return checkRightHandSideOfForOf(declaration.parent.parent.expression) || anyType;
             }
             if (ts.isBindingPattern(declaration.parent)) {
                 return getTypeForBindingElement(declaration);
             }
             if (declaration.type) {
-                return getTypeFromTypeNode(declaration.type);
+                var type = getTypeFromTypeNode(declaration.type);
+                return strictNullChecks && declaration.questionToken ? addNullableKind(type, 32) : type;
             }
-            if (declaration.kind === 139) {
+            if (declaration.kind === 141) {
                 var func = declaration.parent;
-                if (func.kind === 147 && !ts.hasDynamicName(func)) {
-                    var getter = ts.getDeclarationOfKind(declaration.parent.symbol, 146);
+                if (func.kind === 149 && !ts.hasDynamicName(func)) {
+                    var getter = ts.getDeclarationOfKind(declaration.parent.symbol, 148);
                     if (getter) {
                         return getReturnTypeOfSignature(getSignatureFromDeclaration(getter));
                     }
                 }
-                var type = getContextuallyTypedParameterType(declaration);
+                var type = declaration.symbol.name === "this"
+                    ? getContextuallyTypedThisType(func)
+                    : getContextuallyTypedParameterType(declaration);
                 if (type) {
-                    return type;
+                    return strictNullChecks && declaration.questionToken ? addNullableKind(type, 32) : type;
                 }
             }
             if (declaration.initializer) {
                 return checkExpressionCached(declaration.initializer);
             }
-            if (declaration.kind === 249) {
+            if (declaration.kind === 253) {
                 return checkIdentifier(declaration.name);
             }
             if (ts.isBindingPattern(declaration.name)) {
@@ -13991,11 +14886,16 @@ var ts;
         }
         function getTypeFromBindingElement(element, includePatternInType) {
             if (element.initializer) {
-                return getWidenedType(checkExpressionCached(element.initializer));
+                var type = checkExpressionCached(element.initializer);
+                reportErrorsFromWidening(element, type);
+                return getWidenedType(type);
             }
             if (ts.isBindingPattern(element.name)) {
                 return getTypeFromBindingPattern(element.name, includePatternInType);
             }
+            if (compilerOptions.noImplicitAny) {
+                reportImplicitAnyError(element, anyType);
+            }
             return anyType;
         }
         function getTypeFromObjectBindingPattern(pattern, includePatternInType) {
@@ -14028,7 +14928,7 @@ var ts;
             if (elements.length === 0 || elements[elements.length - 1].dotDotDotToken) {
                 return languageVersion >= 2 ? createIterableType(anyType) : anyArrayType;
             }
-            var elementTypes = ts.map(elements, function (e) { return e.kind === 190 ? anyType : getTypeFromBindingElement(e, includePatternInType); });
+            var elementTypes = ts.map(elements, function (e) { return e.kind === 192 ? anyType : getTypeFromBindingElement(e, includePatternInType); });
             if (includePatternInType) {
                 var result = createNewTupleType(elementTypes);
                 result.pattern = pattern;
@@ -14037,7 +14937,7 @@ var ts;
             return createTupleType(elementTypes);
         }
         function getTypeFromBindingPattern(pattern, includePatternInType) {
-            return pattern.kind === 164
+            return pattern.kind === 166
                 ? getTypeFromObjectBindingPattern(pattern, includePatternInType)
                 : getTypeFromArrayBindingPattern(pattern, includePatternInType);
         }
@@ -14047,10 +14947,7 @@ var ts;
                 if (reportErrors) {
                     reportErrorsFromWidening(declaration, type);
                 }
-                if (declaration.kind === 248) {
-                    return type;
-                }
-                if (type.flags & 134217728 && (declaration.kind === 142 || declaration.kind === 141)) {
+                if (declaration.kind === 252) {
                     return type;
                 }
                 return getWidenedType(type);
@@ -14058,7 +14955,7 @@ var ts;
             type = declaration.dotDotDotToken ? anyArrayType : anyType;
             if (reportErrors && compilerOptions.noImplicitAny) {
                 var root = ts.getRootDeclaration(declaration);
-                if (!isPrivateWithinAmbient(root) && !(root.kind === 139 && isPrivateWithinAmbient(root.parent))) {
+                if (!isPrivateWithinAmbient(root) && !(root.kind === 141 && isPrivateWithinAmbient(root.parent))) {
                     reportImplicitAnyError(declaration, type);
                 }
             }
@@ -14071,17 +14968,17 @@ var ts;
                     return links.type = getTypeOfPrototypeProperty(symbol);
                 }
                 var declaration = symbol.valueDeclaration;
-                if (declaration.parent.kind === 247) {
+                if (declaration.parent.kind === 251) {
                     return links.type = anyType;
                 }
-                if (declaration.kind === 230) {
+                if (declaration.kind === 234) {
                     return links.type = checkExpression(declaration.expression);
                 }
-                if (declaration.kind === 184) {
-                    return links.type = checkExpression(declaration.right);
+                if (declaration.kind === 186) {
+                    return links.type = getUnionType(ts.map(symbol.declarations, function (decl) { return checkExpressionCached(decl.right); }));
                 }
-                if (declaration.kind === 169) {
-                    if (declaration.parent.kind === 184) {
+                if (declaration.kind === 171) {
+                    if (declaration.parent.kind === 186) {
                         return links.type = checkExpressionCached(declaration.parent.right);
                     }
                 }
@@ -14107,7 +15004,7 @@ var ts;
         }
         function getAnnotatedAccessorType(accessor) {
             if (accessor) {
-                if (accessor.kind === 146) {
+                if (accessor.kind === 148) {
                     return accessor.type && getTypeFromTypeNode(accessor.type);
                 }
                 else {
@@ -14120,12 +15017,18 @@ var ts;
         function getTypeOfAccessors(symbol) {
             var links = getSymbolLinks(symbol);
             if (!links.type) {
+                var getter = ts.getDeclarationOfKind(symbol, 148);
+                var setter = ts.getDeclarationOfKind(symbol, 149);
+                if (getter && getter.flags & 134217728) {
+                    var jsDocType = getTypeForVariableLikeDeclarationFromJSDocComment(getter);
+                    if (jsDocType) {
+                        return links.type = jsDocType;
+                    }
+                }
                 if (!pushTypeResolution(symbol, 0)) {
                     return unknownType;
                 }
-                var getter = ts.getDeclarationOfKind(symbol, 146);
-                var setter = ts.getDeclarationOfKind(symbol, 147);
-                var type;
+                var type = void 0;
                 var getterReturnType = getAnnotatedAccessorType(getter);
                 if (getterReturnType) {
                     type = getterReturnType;
@@ -14150,7 +15053,7 @@ var ts;
                 if (!popTypeResolution()) {
                     type = anyType;
                     if (compilerOptions.noImplicitAny) {
-                        var getter_1 = ts.getDeclarationOfKind(symbol, 146);
+                        var getter_1 = ts.getDeclarationOfKind(symbol, 148);
                         error(getter_1, ts.Diagnostics._0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions, symbolToString(symbol));
                     }
                 }
@@ -14239,9 +15142,9 @@ var ts;
                 if (!node) {
                     return typeParameters;
                 }
-                if (node.kind === 217 || node.kind === 189 ||
-                    node.kind === 216 || node.kind === 176 ||
-                    node.kind === 144 || node.kind === 177) {
+                if (node.kind === 220 || node.kind === 191 ||
+                    node.kind === 219 || node.kind === 178 ||
+                    node.kind === 146 || node.kind === 179) {
                     var declarations = node.typeParameters;
                     if (declarations) {
                         return appendTypeParameters(appendOuterTypeParameters(typeParameters, node), declarations);
@@ -14250,15 +15153,15 @@ var ts;
             }
         }
         function getOuterTypeParametersOfClassOrInterface(symbol) {
-            var declaration = symbol.flags & 32 ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 218);
+            var declaration = symbol.flags & 32 ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 221);
             return appendOuterTypeParameters(undefined, declaration);
         }
         function getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol) {
             var result;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var node = _a[_i];
-                if (node.kind === 218 || node.kind === 217 ||
-                    node.kind === 189 || node.kind === 219) {
+                if (node.kind === 221 || node.kind === 220 ||
+                    node.kind === 191 || node.kind === 222) {
                     var declaration = node;
                     if (declaration.typeParameters) {
                         result = appendTypeParameters(result, declaration.typeParameters);
@@ -14283,8 +15186,8 @@ var ts;
         function getInstantiatedConstructorsForTypeArguments(type, typeArgumentNodes) {
             var signatures = getConstructorsForTypeArguments(type, typeArgumentNodes);
             if (typeArgumentNodes) {
-                var typeArguments = ts.map(typeArgumentNodes, getTypeFromTypeNode);
-                signatures = ts.map(signatures, function (sig) { return getSignatureInstantiation(sig, typeArguments); });
+                var typeArguments_1 = ts.map(typeArgumentNodes, getTypeFromTypeNode);
+                signatures = ts.map(signatures, function (sig) { return getSignatureInstantiation(sig, typeArguments_1); });
             }
             return signatures;
         }
@@ -14381,7 +15284,7 @@ var ts;
             type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
             for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 218 && ts.getInterfaceBaseTypeNodes(declaration)) {
+                if (declaration.kind === 221 && ts.getInterfaceBaseTypeNodes(declaration)) {
                     for (var _b = 0, _c = ts.getInterfaceBaseTypeNodes(declaration); _b < _c.length; _b++) {
                         var node = _c[_b];
                         var baseType = getTypeFromTypeNode(node);
@@ -14410,8 +15313,8 @@ var ts;
         function isIndependentInterface(symbol) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 218) {
-                    if (declaration.flags & 262144) {
+                if (declaration.kind === 221) {
+                    if (declaration.flags & 16384) {
                         return false;
                     }
                     var baseTypeNodes = ts.getInterfaceBaseTypeNodes(declaration);
@@ -14459,7 +15362,7 @@ var ts;
                 if (!pushTypeResolution(symbol, 2)) {
                     return unknownType;
                 }
-                var declaration = ts.getDeclarationOfKind(symbol, 219);
+                var declaration = ts.getDeclarationOfKind(symbol, 222);
                 var type = getTypeFromTypeNode(declaration.type);
                 if (popTypeResolution()) {
                     links.typeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
@@ -14490,7 +15393,7 @@ var ts;
             if (!links.declaredType) {
                 var type = createType(512);
                 type.symbol = symbol;
-                if (!ts.getDeclarationOfKind(symbol, 138).constraint) {
+                if (!ts.getDeclarationOfKind(symbol, 140).constraint) {
                     type.constraint = noConstraintType;
                 }
                 links.declaredType = type;
@@ -14537,16 +15440,18 @@ var ts;
         function isIndependentType(node) {
             switch (node.kind) {
                 case 117:
-                case 130:
-                case 128:
-                case 120:
                 case 131:
+                case 129:
+                case 120:
+                case 132:
                 case 103:
-                case 163:
+                case 134:
+                case 93:
+                case 165:
                     return true;
-                case 157:
+                case 159:
                     return isIndependentType(node.elementType);
-                case 152:
+                case 154:
                     return isIndependentTypeReference(node);
             }
             return false;
@@ -14555,7 +15460,7 @@ var ts;
             return node.type && isIndependentType(node.type) || !node.type && !node.initializer;
         }
         function isIndependentFunctionLikeDeclaration(node) {
-            if (node.kind !== 145 && (!node.type || !isIndependentType(node.type))) {
+            if (node.kind !== 147 && (!node.type || !isIndependentType(node.type))) {
                 return false;
             }
             for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
@@ -14571,12 +15476,12 @@ var ts;
                 var declaration = symbol.declarations[0];
                 if (declaration) {
                     switch (declaration.kind) {
-                        case 142:
-                        case 141:
-                            return isIndependentVariableLikeDeclaration(declaration);
                         case 144:
                         case 143:
+                            return isIndependentVariableLikeDeclaration(declaration);
+                        case 146:
                         case 145:
+                        case 147:
                             return isIndependentFunctionLikeDeclaration(declaration);
                     }
                 }
@@ -14613,8 +15518,8 @@ var ts;
                 type.declaredProperties = getNamedMembers(symbol.members);
                 type.declaredCallSignatures = getSignaturesOfSymbol(symbol.members["__call"]);
                 type.declaredConstructSignatures = getSignaturesOfSymbol(symbol.members["__new"]);
-                type.declaredStringIndexType = getIndexTypeOfSymbol(symbol, 0);
-                type.declaredNumberIndexType = getIndexTypeOfSymbol(symbol, 1);
+                type.declaredStringIndexInfo = getIndexInfoOfSymbol(symbol, 0);
+                type.declaredNumberIndexInfo = getIndexInfoOfSymbol(symbol, 1);
             }
             return type;
         }
@@ -14629,15 +15534,15 @@ var ts;
             var members = source.symbol.members;
             var callSignatures = source.declaredCallSignatures;
             var constructSignatures = source.declaredConstructSignatures;
-            var stringIndexType = source.declaredStringIndexType;
-            var numberIndexType = source.declaredNumberIndexType;
+            var stringIndexInfo = source.declaredStringIndexInfo;
+            var numberIndexInfo = source.declaredNumberIndexInfo;
             if (!ts.rangeEquals(typeParameters, typeArguments, 0, typeParameters.length)) {
                 mapper = createTypeMapper(typeParameters, typeArguments);
                 members = createInstantiatedSymbolTable(source.declaredProperties, mapper, typeParameters.length === 1);
                 callSignatures = instantiateList(source.declaredCallSignatures, mapper, instantiateSignature);
                 constructSignatures = instantiateList(source.declaredConstructSignatures, mapper, instantiateSignature);
-                stringIndexType = instantiateType(source.declaredStringIndexType, mapper);
-                numberIndexType = instantiateType(source.declaredNumberIndexType, mapper);
+                stringIndexInfo = instantiateIndexInfo(source.declaredStringIndexInfo, mapper);
+                numberIndexInfo = instantiateIndexInfo(source.declaredNumberIndexInfo, mapper);
             }
             var baseTypes = getBaseTypes(source);
             if (baseTypes.length) {
@@ -14651,11 +15556,11 @@ var ts;
                     addInheritedMembers(members, getPropertiesOfObjectType(instantiatedBaseType));
                     callSignatures = ts.concatenate(callSignatures, getSignaturesOfType(instantiatedBaseType, 0));
                     constructSignatures = ts.concatenate(constructSignatures, getSignaturesOfType(instantiatedBaseType, 1));
-                    stringIndexType = stringIndexType || getIndexTypeOfType(instantiatedBaseType, 0);
-                    numberIndexType = numberIndexType || getIndexTypeOfType(instantiatedBaseType, 1);
+                    stringIndexInfo = stringIndexInfo || getIndexInfoOfType(instantiatedBaseType, 0);
+                    numberIndexInfo = numberIndexInfo || getIndexInfoOfType(instantiatedBaseType, 1);
                 }
             }
-            setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexType, numberIndexType);
+            setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function resolveClassOrInterfaceMembers(type) {
             resolveObjectTypeMembers(type, resolveDeclaredMembers(type), emptyArray, emptyArray);
@@ -14667,25 +15572,27 @@ var ts;
                 type.typeArguments : ts.concatenate(type.typeArguments, [type]);
             resolveObjectTypeMembers(type, source, typeParameters, typeArguments);
         }
-        function createSignature(declaration, typeParameters, parameters, resolvedReturnType, minArgumentCount, hasRestParameter, hasStringLiterals) {
+        function createSignature(declaration, typeParameters, thisType, parameters, resolvedReturnType, typePredicate, minArgumentCount, hasRestParameter, hasStringLiterals) {
             var sig = new Signature(checker);
             sig.declaration = declaration;
             sig.typeParameters = typeParameters;
             sig.parameters = parameters;
+            sig.thisType = thisType;
             sig.resolvedReturnType = resolvedReturnType;
+            sig.typePredicate = typePredicate;
             sig.minArgumentCount = minArgumentCount;
             sig.hasRestParameter = hasRestParameter;
             sig.hasStringLiterals = hasStringLiterals;
             return sig;
         }
         function cloneSignature(sig) {
-            return createSignature(sig.declaration, sig.typeParameters, sig.parameters, sig.resolvedReturnType, sig.minArgumentCount, sig.hasRestParameter, sig.hasStringLiterals);
+            return createSignature(sig.declaration, sig.typeParameters, sig.thisType, sig.parameters, sig.resolvedReturnType, sig.typePredicate, sig.minArgumentCount, sig.hasRestParameter, sig.hasStringLiterals);
         }
         function getDefaultConstructSignatures(classType) {
             var baseConstructorType = getBaseConstructorTypeOfClass(classType);
             var baseSignatures = getSignaturesOfType(baseConstructorType, 1);
             if (baseSignatures.length === 0) {
-                return [createSignature(undefined, classType.localTypeParameters, emptyArray, classType, 0, false, false)];
+                return [createSignature(undefined, classType.localTypeParameters, undefined, emptyArray, classType, undefined, 0, false, false)];
             }
             var baseTypeNode = getBaseTypeNodeOfClass(classType);
             var typeArguments = ts.map(baseTypeNode.typeArguments, getTypeFromTypeNode);
@@ -14717,12 +15624,12 @@ var ts;
             var arrayType = resolveStructuredTypeMembers(createTypeFromGenericGlobalType(globalArrayType, [arrayElementType, type]));
             var members = createTupleTypeMemberSymbols(type.elementTypes);
             addInheritedMembers(members, arrayType.properties);
-            setObjectTypeMembers(type, members, arrayType.callSignatures, arrayType.constructSignatures, arrayType.stringIndexType, arrayType.numberIndexType);
+            setObjectTypeMembers(type, members, arrayType.callSignatures, arrayType.constructSignatures, arrayType.stringIndexInfo, arrayType.numberIndexInfo);
         }
-        function findMatchingSignature(signatureList, signature, partialMatch, ignoreReturnTypes) {
+        function findMatchingSignature(signatureList, signature, partialMatch, ignoreThisTypes, ignoreReturnTypes) {
             for (var _i = 0, signatureList_1 = signatureList; _i < signatureList_1.length; _i++) {
                 var s = signatureList_1[_i];
-                if (compareSignaturesIdentical(s, signature, partialMatch, ignoreReturnTypes, compareTypesIdentical)) {
+                if (compareSignaturesIdentical(s, signature, partialMatch, ignoreThisTypes, ignoreReturnTypes, compareTypesIdentical)) {
                     return s;
                 }
             }
@@ -14733,7 +15640,7 @@ var ts;
                     return undefined;
                 }
                 for (var i = 1; i < signatureLists.length; i++) {
-                    if (!findMatchingSignature(signatureLists[i], signature, false, false)) {
+                    if (!findMatchingSignature(signatureLists[i], signature, false, false, false)) {
                         return undefined;
                     }
                 }
@@ -14741,7 +15648,7 @@ var ts;
             }
             var result = undefined;
             for (var i = 0; i < signatureLists.length; i++) {
-                var match = i === listIndex ? signature : findMatchingSignature(signatureLists[i], signature, true, true);
+                var match = i === listIndex ? signature : findMatchingSignature(signatureLists[i], signature, true, true, true);
                 if (!match) {
                     return undefined;
                 }
@@ -14757,12 +15664,15 @@ var ts;
             for (var i = 0; i < signatureLists.length; i++) {
                 for (var _i = 0, _a = signatureLists[i]; _i < _a.length; _i++) {
                     var signature = _a[_i];
-                    if (!result || !findMatchingSignature(result, signature, false, true)) {
+                    if (!result || !findMatchingSignature(result, signature, false, true, true)) {
                         var unionSignatures = findMatchingSignatures(signatureLists, signature, i);
                         if (unionSignatures) {
                             var s = signature;
                             if (unionSignatures.length > 1) {
                                 s = cloneSignature(signature);
+                                if (ts.forEach(unionSignatures, function (sig) { return sig.thisType; })) {
+                                    s.thisType = getUnionType(ts.map(unionSignatures, function (sig) { return sig.thisType || anyType; }));
+                                }
                                 s.resolvedReturnType = undefined;
                                 s.unionSignatures = unionSignatures;
                             }
@@ -14773,41 +15683,46 @@ var ts;
             }
             return result || emptyArray;
         }
-        function getUnionIndexType(types, kind) {
+        function getUnionIndexInfo(types, kind) {
             var indexTypes = [];
+            var isAnyReadonly = false;
             for (var _i = 0, types_1 = types; _i < types_1.length; _i++) {
                 var type = types_1[_i];
-                var indexType = getIndexTypeOfType(type, kind);
-                if (!indexType) {
+                var indexInfo = getIndexInfoOfType(type, kind);
+                if (!indexInfo) {
                     return undefined;
                 }
-                indexTypes.push(indexType);
+                indexTypes.push(indexInfo.type);
+                isAnyReadonly = isAnyReadonly || indexInfo.isReadonly;
             }
-            return getUnionType(indexTypes);
+            return createIndexInfo(getUnionType(indexTypes), isAnyReadonly);
         }
         function resolveUnionTypeMembers(type) {
             var callSignatures = getUnionSignatures(type.types, 0);
             var constructSignatures = getUnionSignatures(type.types, 1);
-            var stringIndexType = getUnionIndexType(type.types, 0);
-            var numberIndexType = getUnionIndexType(type.types, 1);
-            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexType, numberIndexType);
+            var stringIndexInfo = getUnionIndexInfo(type.types, 0);
+            var numberIndexInfo = getUnionIndexInfo(type.types, 1);
+            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function intersectTypes(type1, type2) {
             return !type1 ? type2 : !type2 ? type1 : getIntersectionType([type1, type2]);
         }
+        function intersectIndexInfos(info1, info2) {
+            return !info1 ? info2 : !info2 ? info1 : createIndexInfo(getIntersectionType([info1.type, info2.type]), info1.isReadonly && info2.isReadonly);
+        }
         function resolveIntersectionTypeMembers(type) {
             var callSignatures = emptyArray;
             var constructSignatures = emptyArray;
-            var stringIndexType = undefined;
-            var numberIndexType = undefined;
+            var stringIndexInfo = undefined;
+            var numberIndexInfo = undefined;
             for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                 var t = _a[_i];
                 callSignatures = ts.concatenate(callSignatures, getSignaturesOfType(t, 0));
                 constructSignatures = ts.concatenate(constructSignatures, getSignaturesOfType(t, 1));
-                stringIndexType = intersectTypes(stringIndexType, getIndexTypeOfType(t, 0));
-                numberIndexType = intersectTypes(numberIndexType, getIndexTypeOfType(t, 1));
+                stringIndexInfo = intersectIndexInfos(stringIndexInfo, getIndexInfoOfType(t, 0));
+                numberIndexInfo = intersectIndexInfos(numberIndexInfo, getIndexInfoOfType(t, 1));
             }
-            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexType, numberIndexType);
+            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function resolveAnonymousTypeMembers(type) {
             var symbol = type.symbol;
@@ -14815,17 +15730,17 @@ var ts;
                 var members = createInstantiatedSymbolTable(getPropertiesOfObjectType(type.target), type.mapper, false);
                 var callSignatures = instantiateList(getSignaturesOfType(type.target, 0), type.mapper, instantiateSignature);
                 var constructSignatures = instantiateList(getSignaturesOfType(type.target, 1), type.mapper, instantiateSignature);
-                var stringIndexType = instantiateType(getIndexTypeOfType(type.target, 0), type.mapper);
-                var numberIndexType = instantiateType(getIndexTypeOfType(type.target, 1), type.mapper);
-                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexType, numberIndexType);
+                var stringIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, 0), type.mapper);
+                var numberIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, 1), type.mapper);
+                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
             }
             else if (symbol.flags & 2048) {
                 var members = symbol.members;
                 var callSignatures = getSignaturesOfSymbol(members["__call"]);
                 var constructSignatures = getSignaturesOfSymbol(members["__new"]);
-                var stringIndexType = getIndexTypeOfSymbol(symbol, 0);
-                var numberIndexType = getIndexTypeOfSymbol(symbol, 1);
-                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexType, numberIndexType);
+                var stringIndexInfo = getIndexInfoOfSymbol(symbol, 0);
+                var numberIndexInfo = getIndexInfoOfSymbol(symbol, 1);
+                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
             }
             else {
                 var members = emptySymbols;
@@ -14845,8 +15760,8 @@ var ts;
                         addInheritedMembers(members, getPropertiesOfObjectType(baseConstructorType));
                     }
                 }
-                var numberIndexType = (symbol.flags & 384) ? stringType : undefined;
-                setObjectTypeMembers(type, members, emptyArray, constructSignatures, undefined, numberIndexType);
+                var numberIndexInfo = symbol.flags & 384 ? enumNumberIndexInfo : undefined;
+                setObjectTypeMembers(type, members, emptyArray, constructSignatures, undefined, numberIndexInfo);
                 if (symbol.flags & (16 | 8192)) {
                     type.callSignatures = getSignaturesOfSymbol(symbol);
                 }
@@ -14933,7 +15848,7 @@ var ts;
                 type = globalBooleanType;
             }
             else if (type.flags & 16777216) {
-                type = globalESSymbolType;
+                type = getGlobalESSymbolType();
             }
             return type;
         }
@@ -14946,7 +15861,7 @@ var ts;
                 var type = getApparentType(current);
                 if (type !== unknownType) {
                     var prop = getPropertyOfType(type, name);
-                    if (prop && !(getDeclarationFlagsFromSymbol(prop) & (16 | 32))) {
+                    if (prop && !(getDeclarationFlagsFromSymbol(prop) & (8 | 16))) {
                         commonFlags &= prop.flags;
                         if (!props) {
                             props = [prop];
@@ -15028,15 +15943,44 @@ var ts;
         function getSignaturesOfType(type, kind) {
             return getSignaturesOfStructuredType(getApparentType(type), kind);
         }
-        function getIndexTypeOfStructuredType(type, kind) {
+        function getIndexInfoOfStructuredType(type, kind) {
             if (type.flags & 130048) {
                 var resolved = resolveStructuredTypeMembers(type);
-                return kind === 0 ? resolved.stringIndexType : resolved.numberIndexType;
+                return kind === 0 ? resolved.stringIndexInfo : resolved.numberIndexInfo;
             }
         }
+        function getIndexTypeOfStructuredType(type, kind) {
+            var info = getIndexInfoOfStructuredType(type, kind);
+            return info && info.type;
+        }
+        function getIndexInfoOfType(type, kind) {
+            return getIndexInfoOfStructuredType(getApparentType(type), kind);
+        }
         function getIndexTypeOfType(type, kind) {
             return getIndexTypeOfStructuredType(getApparentType(type), kind);
         }
+        function getImplicitIndexTypeOfType(type, kind) {
+            if (isObjectLiteralType(type)) {
+                var propTypes = [];
+                for (var _i = 0, _a = getPropertiesOfType(type); _i < _a.length; _i++) {
+                    var prop = _a[_i];
+                    if (kind === 0 || isNumericLiteralName(prop.name)) {
+                        propTypes.push(getTypeOfSymbol(prop));
+                    }
+                }
+                return getUnionType(propTypes);
+            }
+            return undefined;
+        }
+        function getTypeParametersFromJSDocTemplate(declaration) {
+            if (declaration.flags & 134217728) {
+                var templateTag = ts.getJSDocTemplateTag(declaration);
+                if (templateTag) {
+                    return getTypeParametersFromDeclaration(templateTag.typeParameters);
+                }
+            }
+            return undefined;
+        }
         function getTypeParametersFromDeclaration(typeParameterDeclarations) {
             var result = [];
             ts.forEach(typeParameterDeclarations, function (node) {
@@ -15057,6 +16001,20 @@ var ts;
             return result;
         }
         function isOptionalParameter(node) {
+            if (node.flags & 134217728) {
+                if (node.type && node.type.kind === 267) {
+                    return true;
+                }
+                var paramTag = ts.getCorrespondingJSDocParameterTag(node);
+                if (paramTag) {
+                    if (paramTag.isBracketed) {
+                        return true;
+                    }
+                    if (paramTag.typeExpression) {
+                        return paramTag.typeExpression.type.kind === 267;
+                    }
+                }
+            }
             if (ts.hasQuestionToken(node)) {
                 return true;
             }
@@ -15089,28 +16047,40 @@ var ts;
         function getSignatureFromDeclaration(declaration) {
             var links = getNodeLinks(declaration);
             if (!links.resolvedSignature) {
-                var classType = declaration.kind === 145 ?
+                var classType = declaration.kind === 147 ?
                     getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol))
                     : undefined;
                 var typeParameters = classType ? classType.localTypeParameters :
-                    declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) : undefined;
+                    declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) :
+                        getTypeParametersFromJSDocTemplate(declaration);
                 var parameters = [];
                 var hasStringLiterals = false;
                 var minArgumentCount = -1;
-                for (var i = 0, n = declaration.parameters.length; i < n; i++) {
+                var thisType = undefined;
+                var hasThisParameter = void 0;
+                var isJSConstructSignature = ts.isJSDocConstructSignature(declaration);
+                var returnType = undefined;
+                var typePredicate = undefined;
+                for (var i = isJSConstructSignature ? 1 : 0, n = declaration.parameters.length; i < n; i++) {
                     var param = declaration.parameters[i];
                     var paramSymbol = param.symbol;
                     if (paramSymbol && !!(paramSymbol.flags & 4) && !ts.isBindingPattern(param.name)) {
                         var resolvedSymbol = resolveName(param, paramSymbol.name, 107455, undefined, undefined);
                         paramSymbol = resolvedSymbol;
                     }
-                    parameters.push(paramSymbol);
-                    if (param.type && param.type.kind === 163) {
+                    if (i === 0 && paramSymbol.name === "this") {
+                        hasThisParameter = true;
+                        thisType = param.type ? getTypeFromTypeNode(param.type) : unknownType;
+                    }
+                    else {
+                        parameters.push(paramSymbol);
+                    }
+                    if (param.type && param.type.kind === 165) {
                         hasStringLiterals = true;
                     }
                     if (param.initializer || param.questionToken || param.dotDotDotToken) {
                         if (minArgumentCount < 0) {
-                            minArgumentCount = i;
+                            minArgumentCount = i - (hasThisParameter ? 1 : 0);
                         }
                     }
                     else {
@@ -15118,25 +16088,37 @@ var ts;
                     }
                 }
                 if (minArgumentCount < 0) {
-                    minArgumentCount = declaration.parameters.length;
+                    minArgumentCount = declaration.parameters.length - (hasThisParameter ? 1 : 0);
                 }
-                var returnType;
-                if (classType) {
+                if (isJSConstructSignature) {
+                    minArgumentCount--;
+                    returnType = getTypeFromTypeNode(declaration.parameters[0].type);
+                }
+                else if (classType) {
                     returnType = classType;
                 }
                 else if (declaration.type) {
                     returnType = getTypeFromTypeNode(declaration.type);
+                    if (declaration.type.kind === 153) {
+                        typePredicate = createTypePredicateFromTypePredicateNode(declaration.type);
+                    }
                 }
                 else {
-                    if (declaration.kind === 146 && !ts.hasDynamicName(declaration)) {
-                        var setter = ts.getDeclarationOfKind(declaration.symbol, 147);
+                    if (declaration.flags & 134217728) {
+                        var type = getReturnTypeFromJSDocComment(declaration);
+                        if (type && type !== unknownType) {
+                            returnType = type;
+                        }
+                    }
+                    if (declaration.kind === 148 && !ts.hasDynamicName(declaration)) {
+                        var setter = ts.getDeclarationOfKind(declaration.symbol, 149);
                         returnType = getAnnotatedAccessorType(setter);
                     }
                     if (!returnType && ts.nodeIsMissing(declaration.body)) {
                         returnType = anyType;
                     }
                 }
-                links.resolvedSignature = createSignature(declaration, typeParameters, parameters, returnType, minArgumentCount, ts.hasRestParameter(declaration), hasStringLiterals);
+                links.resolvedSignature = createSignature(declaration, typeParameters, thisType, parameters, returnType, typePredicate, minArgumentCount, ts.hasRestParameter(declaration), hasStringLiterals);
             }
             return links.resolvedSignature;
         }
@@ -15147,19 +16129,20 @@ var ts;
             for (var i = 0, len = symbol.declarations.length; i < len; i++) {
                 var node = symbol.declarations[i];
                 switch (node.kind) {
-                    case 153:
-                    case 154:
-                    case 216:
-                    case 144:
-                    case 143:
+                    case 155:
+                    case 156:
+                    case 219:
+                    case 146:
                     case 145:
+                    case 147:
+                    case 150:
+                    case 151:
+                    case 152:
                     case 148:
                     case 149:
-                    case 150:
-                    case 146:
-                    case 147:
-                    case 176:
-                    case 177:
+                    case 178:
+                    case 179:
+                    case 268:
                         if (i > 0 && node.body) {
                             var previous = symbol.declarations[i - 1];
                             if (node.parent === previous.parent && node.kind === previous.kind && node.pos === previous.end) {
@@ -15186,7 +16169,7 @@ var ts;
                 if (!pushTypeResolution(signature, 3)) {
                     return unknownType;
                 }
-                var type;
+                var type = void 0;
                 if (signature.target) {
                     type = instantiateType(getReturnTypeOfSignature(signature.target), signature.mapper);
                 }
@@ -15239,7 +16222,7 @@ var ts;
         }
         function getOrCreateTypeFromSignature(signature) {
             if (!signature.isolatedSignatureType) {
-                var isConstructor = signature.declaration.kind === 145 || signature.declaration.kind === 149;
+                var isConstructor = signature.declaration.kind === 147 || signature.declaration.kind === 151;
                 var type = createObjectType(65536 | 262144);
                 type.members = emptySymbols;
                 type.properties = emptyArray;
@@ -15253,7 +16236,7 @@ var ts;
             return symbol.members["__index"];
         }
         function getIndexDeclarationOfSymbol(symbol, kind) {
-            var syntaxKind = kind === 1 ? 128 : 130;
+            var syntaxKind = kind === 1 ? 129 : 131;
             var indexSymbol = getIndexSymbol(symbol);
             if (indexSymbol) {
                 for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
@@ -15269,18 +16252,22 @@ var ts;
             }
             return undefined;
         }
-        function getIndexTypeOfSymbol(symbol, kind) {
+        function createIndexInfo(type, isReadonly, declaration) {
+            return { type: type, isReadonly: isReadonly, declaration: declaration };
+        }
+        function getIndexInfoOfSymbol(symbol, kind) {
             var declaration = getIndexDeclarationOfSymbol(symbol, kind);
-            return declaration
-                ? declaration.type ? getTypeFromTypeNode(declaration.type) : anyType
-                : undefined;
+            if (declaration) {
+                return createIndexInfo(declaration.type ? getTypeFromTypeNode(declaration.type) : anyType, (declaration.flags & 64) !== 0, declaration);
+            }
+            return undefined;
         }
         function getConstraintDeclaration(type) {
-            return ts.getDeclarationOfKind(type.symbol, 138).constraint;
+            return ts.getDeclarationOfKind(type.symbol, 140).constraint;
         }
         function hasConstraintReferenceTo(type, target) {
             var checked;
-            while (type && type.flags & 512 && !ts.contains(checked, type)) {
+            while (type && !(type.flags & 33554432) && type.flags & 512 && !ts.contains(checked, type)) {
                 if (type === target) {
                     return true;
                 }
@@ -15309,7 +16296,7 @@ var ts;
             return typeParameter.constraint === noConstraintType ? undefined : typeParameter.constraint;
         }
         function getParentSymbolOfTypeParameter(typeParameter) {
-            return getSymbolOfNode(ts.getDeclarationOfKind(typeParameter.symbol, 138).parent);
+            return getSymbolOfNode(ts.getDeclarationOfKind(typeParameter.symbol, 140).parent);
         }
         function getTypeListId(types) {
             if (types) {
@@ -15331,11 +16318,13 @@ var ts;
             }
             return "";
         }
-        function getPropagatingFlagsOfTypes(types) {
+        function getPropagatingFlagsOfTypes(types, excludeKinds) {
             var result = 0;
             for (var _i = 0, types_3 = types; _i < types_3.length; _i++) {
                 var type = types_3[_i];
-                result |= type.flags;
+                if (!(type.flags & excludeKinds)) {
+                    result |= type.flags;
+                }
             }
             return result & 14680064;
         }
@@ -15343,7 +16332,8 @@ var ts;
             var id = getTypeListId(typeArguments);
             var type = target.instantiations[id];
             if (!type) {
-                var flags = 4096 | (typeArguments ? getPropagatingFlagsOfTypes(typeArguments) : 0);
+                var propagatedFlags = typeArguments ? getPropagatingFlagsOfTypes(typeArguments, 0) : 0;
+                var flags = 4096 | propagatedFlags;
                 type = target.instantiations[id] = createObjectType(flags, target.symbol);
                 type.target = target;
                 type.typeArguments = typeArguments;
@@ -15351,7 +16341,7 @@ var ts;
             return type;
         }
         function getTypeFromClassOrInterfaceReference(node, symbol) {
-            var type = getDeclaredTypeOfSymbol(symbol);
+            var type = getDeclaredTypeOfSymbol(getMergedSymbol(symbol));
             var typeParameters = type.localTypeParameters;
             if (typeParameters) {
                 if (!node.typeArguments || node.typeArguments.length !== typeParameters.length) {
@@ -15392,17 +16382,62 @@ var ts;
             }
             return getDeclaredTypeOfSymbol(symbol);
         }
+        function getTypeReferenceName(node) {
+            switch (node.kind) {
+                case 154:
+                    return node.typeName;
+                case 266:
+                    return node.name;
+                case 193:
+                    if (ts.isSupportedExpressionWithTypeArguments(node)) {
+                        return node.expression;
+                    }
+            }
+            return undefined;
+        }
+        function resolveTypeReferenceName(node, typeReferenceName) {
+            if (!typeReferenceName) {
+                return unknownSymbol;
+            }
+            return resolveEntityName(typeReferenceName, 793056) || unknownSymbol;
+        }
+        function getTypeReferenceType(node, symbol) {
+            if (symbol === unknownSymbol) {
+                return unknownType;
+            }
+            if (symbol.flags & (32 | 64)) {
+                return getTypeFromClassOrInterfaceReference(node, symbol);
+            }
+            if (symbol.flags & 524288) {
+                return getTypeFromTypeAliasReference(node, symbol);
+            }
+            if (symbol.flags & 107455 && node.kind === 266) {
+                return getTypeOfSymbol(symbol);
+            }
+            return getTypeFromNonGenericTypeReference(node, symbol);
+        }
         function getTypeFromTypeReference(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                var typeNameOrExpression = node.kind === 152 ? node.typeName :
-                    ts.isSupportedExpressionWithTypeArguments(node) ? node.expression :
-                        undefined;
-                var symbol = typeNameOrExpression && resolveEntityName(typeNameOrExpression, 793056) || unknownSymbol;
-                var type = symbol === unknownSymbol ? unknownType :
-                    symbol.flags & (32 | 64) ? getTypeFromClassOrInterfaceReference(node, symbol) :
-                        symbol.flags & 524288 ? getTypeFromTypeAliasReference(node, symbol) :
-                            getTypeFromNonGenericTypeReference(node, symbol);
+                var symbol = void 0;
+                var type = void 0;
+                if (node.kind === 266) {
+                    var typeReferenceName = getTypeReferenceName(node);
+                    symbol = resolveTypeReferenceName(node, typeReferenceName);
+                    type = getTypeReferenceType(node, symbol);
+                    links.resolvedSymbol = symbol;
+                    links.resolvedType = type;
+                }
+                else {
+                    var typeNameOrExpression = node.kind === 154 ? node.typeName :
+                        ts.isSupportedExpressionWithTypeArguments(node) ? node.expression :
+                            undefined;
+                    symbol = typeNameOrExpression && resolveEntityName(typeNameOrExpression, 793056) || unknownSymbol;
+                    type = symbol === unknownSymbol ? unknownType :
+                        symbol.flags & (32 | 64) ? getTypeFromClassOrInterfaceReference(node, symbol) :
+                            symbol.flags & 524288 ? getTypeFromTypeAliasReference(node, symbol) :
+                                getTypeFromNonGenericTypeReference(node, symbol);
+                }
                 links.resolvedSymbol = symbol;
                 links.resolvedType = type;
             }
@@ -15421,9 +16456,9 @@ var ts;
                 for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
                     var declaration = declarations_3[_i];
                     switch (declaration.kind) {
-                        case 217:
-                        case 218:
                         case 220:
+                        case 221:
+                        case 223:
                             return declaration;
                     }
                 }
@@ -15460,9 +16495,6 @@ var ts;
             var typeSymbol = namespaceSymbol && getSymbol(namespaceSymbol.exports, name, 793056);
             return typeSymbol && getDeclaredTypeOfSymbol(typeSymbol);
         }
-        function getGlobalESSymbolConstructorSymbol() {
-            return globalESSymbolConstructorSymbol || (globalESSymbolConstructorSymbol = getGlobalValueSymbol("Symbol"));
-        }
         function createTypedPropertyDescriptorType(propertyType) {
             var globalTypedPropertyDescriptorType = getGlobalTypedPropertyDescriptorType();
             return globalTypedPropertyDescriptorType !== emptyGenericType
@@ -15473,10 +16505,10 @@ var ts;
             return genericGlobalType !== emptyGenericType ? createTypeReference(genericGlobalType, typeArguments) : emptyObjectType;
         }
         function createIterableType(elementType) {
-            return createTypeFromGenericGlobalType(globalIterableType, [elementType]);
+            return createTypeFromGenericGlobalType(getGlobalIterableType(), [elementType]);
         }
         function createIterableIteratorType(elementType) {
-            return createTypeFromGenericGlobalType(globalIterableIteratorType, [elementType]);
+            return createTypeFromGenericGlobalType(getGlobalIterableIteratorType(), [elementType]);
         }
         function createArrayType(elementType) {
             return createTypeFromGenericGlobalType(globalArrayType, [elementType]);
@@ -15493,7 +16525,8 @@ var ts;
             return tupleTypes[id] || (tupleTypes[id] = createNewTupleType(elementTypes));
         }
         function createNewTupleType(elementTypes) {
-            var type = createObjectType(8192 | getPropagatingFlagsOfTypes(elementTypes));
+            var propagatedFlags = getPropagatingFlagsOfTypes(elementTypes, 0);
+            var type = createObjectType(8192 | propagatedFlags);
             type.elementTypes = elementTypes;
             return type;
         }
@@ -15508,6 +16541,14 @@ var ts;
             if (type.flags & typeSetKind) {
                 addTypesToSet(typeSet, type.types, typeSetKind);
             }
+            else if (type.flags & (1 | 32 | 64)) {
+                if (type.flags & 1)
+                    typeSet.containsAny = true;
+                if (type.flags & 32)
+                    typeSet.containsUndefined = true;
+                if (type.flags & 64)
+                    typeSet.containsNull = true;
+            }
             else if (!ts.contains(typeSet, type)) {
                 typeSet.push(type);
             }
@@ -15535,47 +16576,35 @@ var ts;
                 }
             }
         }
-        function containsTypeAny(types) {
-            for (var _i = 0, types_5 = types; _i < types_5.length; _i++) {
-                var type = types_5[_i];
-                if (isTypeAny(type)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-        function removeAllButLast(types, typeToRemove) {
-            var i = types.length;
-            while (i > 0 && types.length > 1) {
-                i--;
-                if (types[i] === typeToRemove) {
-                    types.splice(i, 1);
-                }
-            }
-        }
         function getUnionType(types, noSubtypeReduction) {
             if (types.length === 0) {
                 return emptyUnionType;
             }
             var typeSet = [];
             addTypesToSet(typeSet, types, 16384);
-            if (containsTypeAny(typeSet)) {
+            if (typeSet.containsAny) {
                 return anyType;
             }
-            if (noSubtypeReduction) {
-                removeAllButLast(typeSet, undefinedType);
-                removeAllButLast(typeSet, nullType);
+            if (strictNullChecks) {
+                if (typeSet.containsNull)
+                    typeSet.push(nullType);
+                if (typeSet.containsUndefined)
+                    typeSet.push(undefinedType);
             }
-            else {
+            if (!noSubtypeReduction) {
                 removeSubtypes(typeSet);
             }
-            if (typeSet.length === 1) {
+            if (typeSet.length === 0) {
+                return typeSet.containsNull ? nullType : undefinedType;
+            }
+            else if (typeSet.length === 1) {
                 return typeSet[0];
             }
             var id = getTypeListId(typeSet);
             var type = unionTypes[id];
             if (!type) {
-                type = unionTypes[id] = createObjectType(16384 | getPropagatingFlagsOfTypes(typeSet));
+                var propagatedFlags = getPropagatingFlagsOfTypes(typeSet, 96);
+                type = unionTypes[id] = createObjectType(16384 | propagatedFlags);
                 type.types = typeSet;
             }
             return type;
@@ -15593,16 +16622,23 @@ var ts;
             }
             var typeSet = [];
             addTypesToSet(typeSet, types, 32768);
-            if (containsTypeAny(typeSet)) {
+            if (typeSet.containsAny) {
                 return anyType;
             }
+            if (strictNullChecks) {
+                if (typeSet.containsNull)
+                    typeSet.push(nullType);
+                if (typeSet.containsUndefined)
+                    typeSet.push(undefinedType);
+            }
             if (typeSet.length === 1) {
                 return typeSet[0];
             }
             var id = getTypeListId(typeSet);
             var type = intersectionTypes[id];
             if (!type) {
-                type = intersectionTypes[id] = createObjectType(32768 | getPropagatingFlagsOfTypes(typeSet));
+                var propagatedFlags = getPropagatingFlagsOfTypes(typeSet, 96);
+                type = intersectionTypes[id] = createObjectType(32768 | propagatedFlags);
                 type.types = typeSet;
             }
             return type;
@@ -15636,12 +16672,28 @@ var ts;
             }
             return links.resolvedType;
         }
+        function getTypeFromJSDocVariadicType(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                var type = getTypeFromTypeNode(node.type);
+                links.resolvedType = type ? createArrayType(type) : unknownType;
+            }
+            return links.resolvedType;
+        }
+        function getTypeFromJSDocTupleType(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                var types = ts.map(node.types, getTypeFromTypeNode);
+                links.resolvedType = createTupleType(types);
+            }
+            return links.resolvedType;
+        }
         function getThisType(node) {
             var container = ts.getThisContainer(node, false);
             var parent = container && container.parent;
-            if (parent && (ts.isClassLike(parent) || parent.kind === 218)) {
-                if (!(container.flags & 64) &&
-                    (container.kind !== 145 || ts.isNodeDescendentOf(node, container.body))) {
+            if (parent && (ts.isClassLike(parent) || parent.kind === 221)) {
+                if (!(container.flags & 32) &&
+                    (container.kind !== 147 || ts.isNodeDescendentOf(node, container.body))) {
                     return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
                 }
             }
@@ -15655,66 +16707,70 @@ var ts;
             }
             return links.resolvedType;
         }
-        function getPredicateType(node) {
-            return createPredicateType(getSymbolOfNode(node), createTypePredicateFromTypePredicateNode(node));
-        }
-        function createPredicateType(symbol, predicate) {
-            var type = createType(8 | 134217728);
-            type.symbol = symbol;
-            type.predicate = predicate;
-            return type;
-        }
-        function getTypeFromPredicateTypeNode(node) {
-            var links = getNodeLinks(node);
-            if (!links.resolvedType) {
-                links.resolvedType = getPredicateType(node);
-            }
-            return links.resolvedType;
-        }
         function getTypeFromTypeNode(node) {
             switch (node.kind) {
                 case 117:
+                case 257:
+                case 258:
                     return anyType;
-                case 130:
+                case 131:
                     return stringType;
-                case 128:
+                case 129:
                     return numberType;
                 case 120:
                     return booleanType;
-                case 131:
+                case 132:
                     return esSymbolType;
                 case 103:
                     return voidType;
-                case 162:
+                case 134:
+                    return undefinedType;
+                case 93:
+                    return nullType;
+                case 164:
                     return getTypeFromThisTypeNode(node);
-                case 163:
+                case 165:
                     return getTypeFromStringLiteralTypeNode(node);
-                case 152:
-                    return getTypeFromTypeReference(node);
-                case 151:
-                    return getTypeFromPredicateTypeNode(node);
-                case 191:
-                    return getTypeFromTypeReference(node);
-                case 155:
-                    return getTypeFromTypeQueryNode(node);
-                case 157:
-                    return getTypeFromArrayTypeNode(node);
-                case 158:
-                    return getTypeFromTupleTypeNode(node);
-                case 159:
-                    return getTypeFromUnionTypeNode(node);
-                case 160:
-                    return getTypeFromIntersectionTypeNode(node);
-                case 161:
-                    return getTypeFromTypeNode(node.type);
-                case 153:
                 case 154:
+                case 266:
+                    return getTypeFromTypeReference(node);
+                case 153:
+                    return booleanType;
+                case 193:
+                    return getTypeFromTypeReference(node);
+                case 157:
+                    return getTypeFromTypeQueryNode(node);
+                case 159:
+                case 259:
+                    return getTypeFromArrayTypeNode(node);
+                case 160:
+                    return getTypeFromTupleTypeNode(node);
+                case 161:
+                case 260:
+                    return getTypeFromUnionTypeNode(node);
+                case 162:
+                    return getTypeFromIntersectionTypeNode(node);
+                case 163:
+                case 262:
+                case 263:
+                case 270:
+                case 271:
+                case 267:
+                    return getTypeFromTypeNode(node.type);
+                case 155:
                 case 156:
+                case 158:
+                case 268:
+                case 264:
                     return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
                 case 69:
-                case 136:
+                case 138:
                     var symbol = getSymbolAtLocation(node);
                     return symbol && getDeclaredTypeOfSymbol(symbol);
+                case 261:
+                    return getTypeFromJSDocTupleType(node);
+                case 269:
+                    return getTypeFromJSDocVariadicType(node);
                 default:
                     return unknownType;
             }
@@ -15736,40 +16792,26 @@ var ts;
         function createBinaryTypeMapper(source1, target1, source2, target2) {
             return function (t) { return t === source1 ? target1 : t === source2 ? target2 : t; };
         }
-        function createTypeMapper(sources, targets) {
-            switch (sources.length) {
-                case 1: return createUnaryTypeMapper(sources[0], targets[0]);
-                case 2: return createBinaryTypeMapper(sources[0], targets[0], sources[1], targets[1]);
-            }
+        function createArrayTypeMapper(sources, targets) {
             return function (t) {
                 for (var i = 0; i < sources.length; i++) {
                     if (t === sources[i]) {
-                        return targets[i];
+                        return targets ? targets[i] : anyType;
                     }
                 }
                 return t;
             };
         }
-        function createUnaryTypeEraser(source) {
-            return function (t) { return t === source ? anyType : t; };
-        }
-        function createBinaryTypeEraser(source1, source2) {
-            return function (t) { return t === source1 || t === source2 ? anyType : t; };
+        function createTypeMapper(sources, targets) {
+            var count = sources.length;
+            var mapper = count == 1 ? createUnaryTypeMapper(sources[0], targets ? targets[0] : anyType) :
+                count == 2 ? createBinaryTypeMapper(sources[0], targets ? targets[0] : anyType, sources[1], targets ? targets[1] : anyType) :
+                    createArrayTypeMapper(sources, targets);
+            mapper.mappedTypes = sources;
+            return mapper;
         }
         function createTypeEraser(sources) {
-            switch (sources.length) {
-                case 1: return createUnaryTypeEraser(sources[0]);
-                case 2: return createBinaryTypeEraser(sources[0], sources[1]);
-            }
-            return function (t) {
-                for (var _i = 0, sources_1 = sources; _i < sources_1.length; _i++) {
-                    var source = sources_1[_i];
-                    if (t === source) {
-                        return anyType;
-                    }
-                }
-                return t;
-            };
+            return createTypeMapper(sources, undefined);
         }
         function getInferenceMapper(context) {
             if (!context.mapper) {
@@ -15783,6 +16825,7 @@ var ts;
                     }
                     return t;
                 };
+                mapper.mappedTypes = context.typeParameters;
                 mapper.context = context;
                 context.mapper = mapper;
             }
@@ -15792,7 +16835,9 @@ var ts;
             return type;
         }
         function combineTypeMappers(mapper1, mapper2) {
-            return function (t) { return instantiateType(mapper1(t), mapper2); };
+            var mapper = function (t) { return instantiateType(mapper1(t), mapper2); };
+            mapper.mappedTypes = mapper1.mappedTypes;
+            return mapper;
         }
         function cloneTypeParameter(typeParameter) {
             var result = createType(512);
@@ -15818,6 +16863,7 @@ var ts;
         }
         function instantiateSignature(signature, mapper, eraseTypeParameters) {
             var freshTypeParameters;
+            var freshTypePredicate;
             if (signature.typeParameters && !eraseTypeParameters) {
                 freshTypeParameters = ts.map(signature.typeParameters, cloneTypeParameter);
                 mapper = combineTypeMappers(createTypeMapper(signature.typeParameters, freshTypeParameters), mapper);
@@ -15826,7 +16872,10 @@ var ts;
                     tp.mapper = mapper;
                 }
             }
-            var result = createSignature(signature.declaration, freshTypeParameters, instantiateList(signature.parameters, mapper, instantiateSymbol), instantiateType(signature.resolvedReturnType, mapper), signature.minArgumentCount, signature.hasRestParameter, signature.hasStringLiterals);
+            if (signature.typePredicate) {
+                freshTypePredicate = cloneTypePredicate(signature.typePredicate, mapper);
+            }
+            var result = createSignature(signature.declaration, freshTypeParameters, signature.thisType && instantiateType(signature.thisType, mapper), instantiateList(signature.parameters, mapper, instantiateSymbol), instantiateType(signature.resolvedReturnType, mapper), freshTypePredicate, signature.minArgumentCount, signature.hasRestParameter, signature.hasStringLiterals);
             result.target = signature;
             result.mapper = mapper;
             return result;
@@ -15863,13 +16912,61 @@ var ts;
             mapper.instantiations[type.id] = result;
             return result;
         }
+        function isSymbolInScopeOfMappedTypeParameter(symbol, mapper) {
+            var mappedTypes = mapper.mappedTypes;
+            var node = symbol.declarations[0].parent;
+            while (node) {
+                switch (node.kind) {
+                    case 155:
+                    case 156:
+                    case 219:
+                    case 146:
+                    case 145:
+                    case 147:
+                    case 150:
+                    case 151:
+                    case 152:
+                    case 148:
+                    case 149:
+                    case 178:
+                    case 179:
+                    case 220:
+                    case 191:
+                    case 221:
+                    case 222:
+                        var declaration = node;
+                        if (declaration.typeParameters) {
+                            for (var _i = 0, _a = declaration.typeParameters; _i < _a.length; _i++) {
+                                var d = _a[_i];
+                                if (ts.contains(mappedTypes, getDeclaredTypeOfTypeParameter(d.symbol))) {
+                                    return true;
+                                }
+                            }
+                        }
+                        if (ts.isClassLike(node) || node.kind === 221) {
+                            var thisType = getDeclaredTypeOfClassOrInterface(getSymbolOfNode(node)).thisType;
+                            if (thisType && ts.contains(mappedTypes, thisType)) {
+                                return true;
+                            }
+                        }
+                        break;
+                    case 224:
+                    case 255:
+                        return false;
+                }
+                node = node.parent;
+            }
+            return false;
+        }
         function instantiateType(type, mapper) {
             if (type && mapper !== identityMapper) {
                 if (type.flags & 512) {
                     return mapper(type);
                 }
                 if (type.flags & 65536) {
-                    return type.symbol && type.symbol.flags & (16 | 8192 | 32 | 2048 | 4096) ?
+                    return type.symbol &&
+                        type.symbol.flags & (16 | 8192 | 32 | 2048 | 4096) &&
+                        (type.flags & 131072 || isSymbolInScopeOfMappedTypeParameter(type.symbol, mapper)) ?
                         instantiateAnonymousType(type, mapper) : type;
                 }
                 if (type.flags & 4096) {
@@ -15884,41 +16981,42 @@ var ts;
                 if (type.flags & 32768) {
                     return getIntersectionType(instantiateList(type.types, mapper, instantiateType));
                 }
-                if (type.flags & 134217728) {
-                    var predicate = type.predicate;
-                    return createPredicateType(type.symbol, cloneTypePredicate(predicate, mapper));
-                }
             }
             return type;
         }
+        function instantiateIndexInfo(info, mapper) {
+            return info && createIndexInfo(instantiateType(info.type, mapper), info.isReadonly, info.declaration);
+        }
         function isContextSensitive(node) {
-            ts.Debug.assert(node.kind !== 144 || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 146 || ts.isObjectLiteralMethod(node));
             switch (node.kind) {
-                case 176:
-                case 177:
+                case 178:
+                case 179:
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 168:
+                case 170:
                     return ts.forEach(node.properties, isContextSensitive);
-                case 167:
+                case 169:
                     return ts.forEach(node.elements, isContextSensitive);
-                case 185:
+                case 187:
                     return isContextSensitive(node.whenTrue) ||
                         isContextSensitive(node.whenFalse);
-                case 184:
+                case 186:
                     return node.operatorToken.kind === 52 &&
                         (isContextSensitive(node.left) || isContextSensitive(node.right));
-                case 248:
+                case 252:
                     return isContextSensitive(node.initializer);
-                case 144:
-                case 143:
+                case 146:
+                case 145:
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 175:
+                case 177:
                     return isContextSensitive(node.expression);
             }
             return false;
         }
         function isContextSensitiveFunctionLikeDeclaration(node) {
-            return !node.typeParameters && node.parameters.length && !ts.forEach(node.parameters, function (p) { return p.type; });
+            var areAllParametersUntyped = !ts.forEach(node.parameters, function (p) { return p.type; });
+            var isNullaryArrow = node.kind === 179 && !node.parameters.length;
+            return !node.typeParameters && areAllParametersUntyped && !isNullaryArrow;
         }
         function getTypeWithoutSignatures(type) {
             if (type.flags & 80896) {
@@ -15949,12 +17047,18 @@ var ts;
         function isTypeAssignableTo(source, target) {
             return checkTypeAssignableTo(source, target, undefined);
         }
+        function isTypeComparableTo(source, target) {
+            return checkTypeComparableTo(source, target, undefined);
+        }
         function checkTypeSubtypeOf(source, target, errorNode, headMessage, containingMessageChain) {
             return checkTypeRelatedTo(source, target, subtypeRelation, errorNode, headMessage, containingMessageChain);
         }
         function checkTypeAssignableTo(source, target, errorNode, headMessage, containingMessageChain) {
             return checkTypeRelatedTo(source, target, assignableRelation, errorNode, headMessage, containingMessageChain);
         }
+        function checkTypeComparableTo(source, target, errorNode, headMessage, containingMessageChain) {
+            return checkTypeRelatedTo(source, target, comparableRelation, errorNode, headMessage, containingMessageChain);
+        }
         function isSignatureAssignableTo(source, target, ignoreReturnTypes) {
             return compareSignaturesRelated(source, target, ignoreReturnTypes, false, undefined, compareTypesAssignable) !== 0;
         }
@@ -15968,15 +17072,26 @@ var ts;
             source = getErasedSignature(source);
             target = getErasedSignature(target);
             var result = -1;
+            if (source.thisType && target.thisType && source.thisType !== voidType) {
+                var related = compareTypes(source.thisType, target.thisType, false)
+                    || compareTypes(target.thisType, source.thisType, reportErrors);
+                if (!related) {
+                    if (reportErrors) {
+                        errorReporter(ts.Diagnostics.The_this_types_of_each_signature_are_incompatible);
+                    }
+                    return 0;
+                }
+                result &= related;
+            }
             var sourceMax = getNumNonRestParameters(source);
             var targetMax = getNumNonRestParameters(target);
             var checkCount = getNumParametersToCheckForSignatureRelatability(source, sourceMax, target, targetMax);
             var sourceParams = source.parameters;
             var targetParams = target.parameters;
             for (var i = 0; i < checkCount; i++) {
-                var s = i < sourceMax ? getTypeOfSymbol(sourceParams[i]) : getRestTypeOfSignature(source);
-                var t = i < targetMax ? getTypeOfSymbol(targetParams[i]) : getRestTypeOfSignature(target);
-                var related = compareTypes(t, s, false) || compareTypes(s, t, reportErrors);
+                var s = i < sourceMax ? getTypeOfParameter(sourceParams[i]) : getRestTypeOfSignature(source);
+                var t = i < targetMax ? getTypeOfParameter(targetParams[i]) : getRestTypeOfSignature(target);
+                var related = compareTypes(s, t, false) || compareTypes(t, s, reportErrors);
                 if (!related) {
                     if (reportErrors) {
                         errorReporter(ts.Diagnostics.Types_of_parameters_0_and_1_are_incompatible, sourceParams[i < sourceMax ? i : sourceMax].name, targetParams[i < targetMax ? i : targetMax].name);
@@ -15991,18 +17106,48 @@ var ts;
                     return result;
                 }
                 var sourceReturnType = getReturnTypeOfSignature(source);
-                if (targetReturnType.flags & 134217728 && targetReturnType.predicate.kind === 1) {
-                    if (!(sourceReturnType.flags & 134217728)) {
+                if (target.typePredicate) {
+                    if (source.typePredicate) {
+                        result &= compareTypePredicateRelatedTo(source.typePredicate, target.typePredicate, reportErrors, errorReporter, compareTypes);
+                    }
+                    else if (ts.isIdentifierTypePredicate(target.typePredicate)) {
                         if (reportErrors) {
                             errorReporter(ts.Diagnostics.Signature_0_must_have_a_type_predicate, signatureToString(source));
                         }
                         return 0;
                     }
                 }
-                result &= compareTypes(sourceReturnType, targetReturnType, reportErrors);
+                else {
+                    result &= compareTypes(sourceReturnType, targetReturnType, reportErrors);
+                }
             }
             return result;
         }
+        function compareTypePredicateRelatedTo(source, target, reportErrors, errorReporter, compareTypes) {
+            if (source.kind !== target.kind) {
+                if (reportErrors) {
+                    errorReporter(ts.Diagnostics.A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard);
+                    errorReporter(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
+                }
+                return 0;
+            }
+            if (source.kind === 1) {
+                var sourceIdentifierPredicate = source;
+                var targetIdentifierPredicate = target;
+                if (sourceIdentifierPredicate.parameterIndex !== targetIdentifierPredicate.parameterIndex) {
+                    if (reportErrors) {
+                        errorReporter(ts.Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, sourceIdentifierPredicate.parameterName, targetIdentifierPredicate.parameterName);
+                        errorReporter(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
+                    }
+                    return 0;
+                }
+            }
+            var related = compareTypes(source.type, target.type, reportErrors);
+            if (related === 0 && reportErrors) {
+                errorReporter(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
+            }
+            return related;
+        }
         function isImplementationCompatibleWithOverload(implementation, overload) {
             var erasedSource = getErasedSignature(implementation);
             var erasedTarget = getErasedSignature(overload);
@@ -16067,7 +17212,12 @@ var ts;
                     sourceType = typeToString(source, undefined, 128);
                     targetType = typeToString(target, undefined, 128);
                 }
-                reportError(message || ts.Diagnostics.Type_0_is_not_assignable_to_type_1, sourceType, targetType);
+                if (!message) {
+                    message = relation === comparableRelation ?
+                        ts.Diagnostics.Type_0_is_not_comparable_to_type_1 :
+                        ts.Diagnostics.Type_0_is_not_assignable_to_type_1;
+                }
+                reportError(message, sourceType, targetType);
             }
             function isRelatedTo(source, target, reportErrors, headMessage) {
                 var result;
@@ -16078,53 +17228,30 @@ var ts;
                 }
                 if (isTypeAny(target))
                     return -1;
-                if (source === undefinedType)
-                    return -1;
-                if (source === nullType && target !== undefinedType)
-                    return -1;
+                if (source.flags & 32) {
+                    if (!strictNullChecks || target.flags & (32 | 16) || source === emptyArrayElementType)
+                        return -1;
+                }
+                if (source.flags & 64) {
+                    if (!strictNullChecks || target.flags & 64)
+                        return -1;
+                }
                 if (source.flags & 128 && target === numberType)
                     return -1;
                 if (source.flags & 128 && target.flags & 128) {
-                    if (result = enumRelatedTo(source, target)) {
+                    if (result = enumRelatedTo(source, target, reportErrors)) {
                         return result;
                     }
                 }
                 if (source.flags & 256 && target === stringType)
                     return -1;
-                if (relation === assignableRelation) {
+                if (relation === assignableRelation || relation === comparableRelation) {
                     if (isTypeAny(source))
                         return -1;
                     if (source === numberType && target.flags & 128)
                         return -1;
                 }
                 if (source.flags & 8 && target.flags & 8) {
-                    if (source.flags & 134217728 && target.flags & 134217728) {
-                        var sourcePredicate = source;
-                        var targetPredicate = target;
-                        if (sourcePredicate.predicate.kind !== targetPredicate.predicate.kind) {
-                            if (reportErrors) {
-                                reportError(ts.Diagnostics.A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard);
-                                reportError(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typeToString(source), typeToString(target));
-                            }
-                            return 0;
-                        }
-                        if (sourcePredicate.predicate.kind === 1) {
-                            var sourceIdentifierPredicate = sourcePredicate.predicate;
-                            var targetIdentifierPredicate = targetPredicate.predicate;
-                            if (sourceIdentifierPredicate.parameterIndex !== targetIdentifierPredicate.parameterIndex) {
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, sourceIdentifierPredicate.parameterName, targetIdentifierPredicate.parameterName);
-                                    reportError(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typeToString(source), typeToString(target));
-                                }
-                                return 0;
-                            }
-                        }
-                        var related = isRelatedTo(sourcePredicate.predicate.type, targetPredicate.predicate.type, reportErrors, headMessage);
-                        if (related === 0 && reportErrors) {
-                            reportError(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typeToString(source), typeToString(target));
-                        }
-                        return related;
-                    }
                     return -1;
                 }
                 if (source.flags & 1048576) {
@@ -16140,23 +17267,30 @@ var ts;
                 }
                 var saveErrorInfo = errorInfo;
                 if (source.flags & 16384) {
-                    if (result = eachTypeRelatedToType(source, target, reportErrors)) {
+                    if (relation === comparableRelation) {
+                        result = someTypeRelatedToType(source, target, reportErrors);
+                    }
+                    else {
+                        result = eachTypeRelatedToType(source, target, reportErrors);
+                    }
+                    if (result) {
                         return result;
                     }
                 }
                 else if (target.flags & 32768) {
-                    if (result = typeRelatedToEachType(source, target, reportErrors)) {
+                    result = typeRelatedToEachType(source, target, reportErrors);
+                    if (result) {
                         return result;
                     }
                 }
                 else {
                     if (source.flags & 32768) {
-                        if (result = someTypeRelatedToType(source, target, reportErrors && !(target.flags & 16384))) {
+                        if (result = someTypeRelatedToType(source, target, false)) {
                             return result;
                         }
                     }
                     if (target.flags & 16384) {
-                        if (result = typeRelatedToSomeType(source, target, reportErrors)) {
+                        if (result = typeRelatedToSomeType(source, target, reportErrors && !(source.flags & 16777726))) {
                             return result;
                         }
                     }
@@ -16204,8 +17338,8 @@ var ts;
                 }
                 if (source.flags & 16384 && target.flags & 16384 ||
                     source.flags & 32768 && target.flags & 32768) {
-                    if (result = eachTypeRelatedToSomeType(source, target)) {
-                        if (result &= eachTypeRelatedToSomeType(target, source)) {
+                    if (result = eachTypeRelatedToSomeType(source, target, false)) {
+                        if (result &= eachTypeRelatedToSomeType(target, source, false)) {
                             return result;
                         }
                     }
@@ -16215,8 +17349,9 @@ var ts;
             function isKnownProperty(type, name) {
                 if (type.flags & 80896) {
                     var resolved = resolveStructuredTypeMembers(type);
-                    if (relation === assignableRelation && (type === globalObjectType || resolved.properties.length === 0) ||
-                        resolved.stringIndexType || resolved.numberIndexType || getPropertyOfType(type, name)) {
+                    if ((relation === assignableRelation || relation === comparableRelation) &&
+                        (type === globalObjectType || resolved.properties.length === 0) ||
+                        resolved.stringIndexInfo || resolved.numberIndexInfo || getPropertyOfType(type, name)) {
                         return true;
                     }
                 }
@@ -16231,7 +17366,7 @@ var ts;
                 return false;
             }
             function hasExcessProperties(source, target, reportErrors) {
-                if (!(target.flags & 67108864) && someConstituentTypeHasKind(target, 80896)) {
+                if (!(target.flags & 67108864) && maybeTypeOfKind(target, 80896)) {
                     for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
                         var prop = _a[_i];
                         if (!isKnownProperty(target, prop.name)) {
@@ -16246,7 +17381,7 @@ var ts;
                 }
                 return false;
             }
-            function eachTypeRelatedToSomeType(source, target) {
+            function eachTypeRelatedToSomeType(source, target, reportErrors) {
                 var result = -1;
                 var sourceTypes = source.types;
                 for (var _i = 0, sourceTypes_1 = sourceTypes; _i < sourceTypes_1.length; _i++) {
@@ -16261,7 +17396,15 @@ var ts;
             }
             function typeRelatedToSomeType(source, target, reportErrors) {
                 var targetTypes = target.types;
-                for (var i = 0, len = targetTypes.length; i < len; i++) {
+                var len = targetTypes.length;
+                while (len >= 2 && targetTypes[len - 1].flags & 96) {
+                    var related = isRelatedTo(source, targetTypes[len - 1], false);
+                    if (related) {
+                        return related;
+                    }
+                    len--;
+                }
+                for (var i = 0; i < len; i++) {
                     var related = isRelatedTo(source, targetTypes[i], reportErrors && i === len - 1);
                     if (related) {
                         return related;
@@ -16284,7 +17427,15 @@ var ts;
             }
             function someTypeRelatedToType(source, target, reportErrors) {
                 var sourceTypes = source.types;
-                for (var i = 0, len = sourceTypes.length; i < len; i++) {
+                var len = sourceTypes.length;
+                while (len >= 2 && sourceTypes[len - 1].flags & 96) {
+                    var related = isRelatedTo(sourceTypes[len - 1], target, false);
+                    if (related) {
+                        return related;
+                    }
+                    len--;
+                }
+                for (var i = 0; i < len; i++) {
                     var related = isRelatedTo(sourceTypes[i], target, reportErrors && i === len - 1);
                     if (related) {
                         return related;
@@ -16374,9 +17525,9 @@ var ts;
                         if (result) {
                             result &= signaturesRelatedTo(source, target, 1, reportErrors);
                             if (result) {
-                                result &= stringIndexTypesRelatedTo(source, originalSource, target, reportErrors);
+                                result &= indexTypesRelatedTo(source, originalSource, target, 0, reportErrors);
                                 if (result) {
-                                    result &= numberIndexTypesRelatedTo(source, originalSource, target, reportErrors);
+                                    result &= indexTypesRelatedTo(source, originalSource, target, 1, reportErrors);
                                 }
                             }
                         }
@@ -16416,23 +17567,23 @@ var ts;
                         else if (!(targetProp.flags & 134217728)) {
                             var sourcePropFlags = getDeclarationFlagsFromSymbol(sourceProp);
                             var targetPropFlags = getDeclarationFlagsFromSymbol(targetProp);
-                            if (sourcePropFlags & 16 || targetPropFlags & 16) {
+                            if (sourcePropFlags & 8 || targetPropFlags & 8) {
                                 if (sourceProp.valueDeclaration !== targetProp.valueDeclaration) {
                                     if (reportErrors) {
-                                        if (sourcePropFlags & 16 && targetPropFlags & 16) {
+                                        if (sourcePropFlags & 8 && targetPropFlags & 8) {
                                             reportError(ts.Diagnostics.Types_have_separate_declarations_of_a_private_property_0, symbolToString(targetProp));
                                         }
                                         else {
-                                            reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 16 ? source : target), typeToString(sourcePropFlags & 16 ? target : source));
+                                            reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 8 ? source : target), typeToString(sourcePropFlags & 8 ? target : source));
                                         }
                                     }
                                     return 0;
                                 }
                             }
-                            else if (targetPropFlags & 32) {
+                            else if (targetPropFlags & 16) {
                                 var sourceDeclaredInClass = sourceProp.parent && sourceProp.parent.flags & 32;
-                                var sourceClass = sourceDeclaredInClass ? getDeclaredTypeOfSymbol(sourceProp.parent) : undefined;
-                                var targetClass = getDeclaredTypeOfSymbol(targetProp.parent);
+                                var sourceClass = sourceDeclaredInClass ? getDeclaredTypeOfSymbol(getParentOfSymbol(sourceProp)) : undefined;
+                                var targetClass = getDeclaredTypeOfSymbol(getParentOfSymbol(targetProp));
                                 if (!sourceClass || !hasBaseType(sourceClass, targetClass)) {
                                     if (reportErrors) {
                                         reportError(ts.Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2, symbolToString(targetProp), typeToString(sourceClass || source), typeToString(targetClass));
@@ -16440,7 +17591,7 @@ var ts;
                                     return 0;
                                 }
                             }
-                            else if (sourcePropFlags & 32) {
+                            else if (sourcePropFlags & 16) {
                                 if (reportErrors) {
                                     reportError(ts.Diagnostics.Property_0_is_protected_in_type_1_but_public_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
                                 }
@@ -16498,36 +17649,36 @@ var ts;
                 }
                 var sourceSignatures = getSignaturesOfType(source, kind);
                 var targetSignatures = getSignaturesOfType(target, kind);
-                if (kind === 1 && sourceSignatures.length && targetSignatures.length &&
-                    isAbstractConstructorType(source) && !isAbstractConstructorType(target)) {
-                    if (reportErrors) {
-                        reportError(ts.Diagnostics.Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type);
+                if (kind === 1 && sourceSignatures.length && targetSignatures.length) {
+                    if (isAbstractConstructorType(source) && !isAbstractConstructorType(target)) {
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type);
+                        }
+                        return 0;
+                    }
+                    if (!constructorVisibilitiesAreCompatible(sourceSignatures[0], targetSignatures[0], reportErrors)) {
+                        return 0;
                     }
-                    return 0;
                 }
                 var result = -1;
                 var saveErrorInfo = errorInfo;
                 outer: for (var _i = 0, targetSignatures_1 = targetSignatures; _i < targetSignatures_1.length; _i++) {
                     var t = targetSignatures_1[_i];
-                    if (!t.hasStringLiterals || target.flags & 262144) {
-                        var shouldElaborateErrors = reportErrors;
-                        for (var _a = 0, sourceSignatures_1 = sourceSignatures; _a < sourceSignatures_1.length; _a++) {
-                            var s = sourceSignatures_1[_a];
-                            if (!s.hasStringLiterals || source.flags & 262144) {
-                                var related = signatureRelatedTo(s, t, shouldElaborateErrors);
-                                if (related) {
-                                    result &= related;
-                                    errorInfo = saveErrorInfo;
-                                    continue outer;
-                                }
-                                shouldElaborateErrors = false;
-                            }
+                    var shouldElaborateErrors = reportErrors;
+                    for (var _a = 0, sourceSignatures_1 = sourceSignatures; _a < sourceSignatures_1.length; _a++) {
+                        var s = sourceSignatures_1[_a];
+                        var related = signatureRelatedTo(s, t, shouldElaborateErrors);
+                        if (related) {
+                            result &= related;
+                            errorInfo = saveErrorInfo;
+                            continue outer;
                         }
-                        if (shouldElaborateErrors) {
-                            reportError(ts.Diagnostics.Type_0_provides_no_match_for_the_signature_1, typeToString(source), signatureToString(t, undefined, undefined, kind));
-                        }
-                        return 0;
+                        shouldElaborateErrors = false;
                     }
+                    if (shouldElaborateErrors) {
+                        reportError(ts.Diagnostics.Type_0_provides_no_match_for_the_signature_1, typeToString(source), signatureToString(t, undefined, undefined, kind));
+                    }
+                    return 0;
                 }
                 return result;
             }
@@ -16542,7 +17693,7 @@ var ts;
                 }
                 var result = -1;
                 for (var i = 0, len = sourceSignatures.length; i < len; i++) {
-                    var related = compareSignaturesIdentical(sourceSignatures[i], targetSignatures[i], false, false, isRelatedTo);
+                    var related = compareSignaturesIdentical(sourceSignatures[i], targetSignatures[i], false, false, false, isRelatedTo);
                     if (!related) {
                         return 0;
                     }
@@ -16550,79 +17701,73 @@ var ts;
                 }
                 return result;
             }
-            function stringIndexTypesRelatedTo(source, originalSource, target, reportErrors) {
-                if (relation === identityRelation) {
-                    return indexTypesIdenticalTo(0, source, target);
-                }
-                var targetType = getIndexTypeOfType(target, 0);
-                if (targetType) {
-                    if ((targetType.flags & 1) && !(originalSource.flags & 16777726)) {
-                        return -1;
-                    }
-                    var sourceType = getIndexTypeOfType(source, 0);
-                    if (!sourceType) {
-                        if (reportErrors) {
-                            reportError(ts.Diagnostics.Index_signature_is_missing_in_type_0, typeToString(source));
+            function eachPropertyRelatedTo(source, target, kind, reportErrors) {
+                var result = -1;
+                for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
+                    var prop = _a[_i];
+                    if (kind === 0 || isNumericLiteralName(prop.name)) {
+                        var related = isRelatedTo(getTypeOfSymbol(prop), target, reportErrors);
+                        if (!related) {
+                            if (reportErrors) {
+                                reportError(ts.Diagnostics.Property_0_is_incompatible_with_index_signature, symbolToString(prop));
+                            }
+                            return 0;
                         }
-                        return 0;
+                        result &= related;
                     }
-                    var related = isRelatedTo(sourceType, targetType, reportErrors);
-                    if (!related) {
-                        if (reportErrors) {
-                            reportError(ts.Diagnostics.Index_signatures_are_incompatible);
-                        }
-                        return 0;
-                    }
-                    return related;
                 }
-                return -1;
+                return result;
             }
-            function numberIndexTypesRelatedTo(source, originalSource, target, reportErrors) {
-                if (relation === identityRelation) {
-                    return indexTypesIdenticalTo(1, source, target);
+            function indexInfoRelatedTo(sourceInfo, targetInfo, reportErrors) {
+                var related = isRelatedTo(sourceInfo.type, targetInfo.type, reportErrors);
+                if (!related && reportErrors) {
+                    reportError(ts.Diagnostics.Index_signatures_are_incompatible);
                 }
-                var targetType = getIndexTypeOfType(target, 1);
-                if (targetType) {
-                    if ((targetType.flags & 1) && !(originalSource.flags & 16777726)) {
-                        return -1;
-                    }
-                    var sourceStringType = getIndexTypeOfType(source, 0);
-                    var sourceNumberType = getIndexTypeOfType(source, 1);
-                    if (!(sourceStringType || sourceNumberType)) {
-                        if (reportErrors) {
-                            reportError(ts.Diagnostics.Index_signature_is_missing_in_type_0, typeToString(source));
-                        }
-                        return 0;
-                    }
-                    var related;
-                    if (sourceStringType && sourceNumberType) {
-                        related = isRelatedTo(sourceStringType, targetType, false) || isRelatedTo(sourceNumberType, targetType, reportErrors);
-                    }
-                    else {
-                        related = isRelatedTo(sourceStringType || sourceNumberType, targetType, reportErrors);
-                    }
-                    if (!related) {
-                        if (reportErrors) {
-                            reportError(ts.Diagnostics.Index_signatures_are_incompatible);
-                        }
-                        return 0;
-                    }
-                    return related;
-                }
-                return -1;
+                return related;
             }
-            function indexTypesIdenticalTo(indexKind, source, target) {
-                var targetType = getIndexTypeOfType(target, indexKind);
-                var sourceType = getIndexTypeOfType(source, indexKind);
-                if (!sourceType && !targetType) {
+            function indexTypesRelatedTo(source, originalSource, target, kind, reportErrors) {
+                if (relation === identityRelation) {
+                    return indexTypesIdenticalTo(source, target, kind);
+                }
+                var targetInfo = getIndexInfoOfType(target, kind);
+                if (!targetInfo || ((targetInfo.type.flags & 1) && !(originalSource.flags & 16777726))) {
                     return -1;
                 }
-                if (sourceType && targetType) {
-                    return isRelatedTo(sourceType, targetType);
+                var sourceInfo = getIndexInfoOfType(source, kind) ||
+                    kind === 1 && getIndexInfoOfType(source, 0);
+                if (sourceInfo) {
+                    return indexInfoRelatedTo(sourceInfo, targetInfo, reportErrors);
+                }
+                if (isObjectLiteralType(source)) {
+                    var related = -1;
+                    if (kind === 0) {
+                        var sourceNumberInfo = getIndexInfoOfType(source, 1);
+                        if (sourceNumberInfo) {
+                            related = indexInfoRelatedTo(sourceNumberInfo, targetInfo, reportErrors);
+                        }
+                    }
+                    if (related) {
+                        related &= eachPropertyRelatedTo(source, targetInfo.type, kind, reportErrors);
+                    }
+                    return related;
+                }
+                if (reportErrors) {
+                    reportError(ts.Diagnostics.Index_signature_is_missing_in_type_0, typeToString(source));
                 }
                 return 0;
             }
-            function enumRelatedTo(source, target) {
+            function indexTypesIdenticalTo(source, target, indexKind) {
+                var targetInfo = getIndexInfoOfType(target, indexKind);
+                var sourceInfo = getIndexInfoOfType(source, indexKind);
+                if (!sourceInfo && !targetInfo) {
+                    return -1;
+                }
+                if (sourceInfo && targetInfo && sourceInfo.isReadonly === targetInfo.isReadonly) {
+                    return isRelatedTo(sourceInfo.type, targetInfo.type);
+                }
+                return 0;
+            }
+            function enumRelatedTo(source, target, reportErrors) {
                 if (source.symbol.name !== target.symbol.name ||
                     source.symbol.flags & 128 ||
                     target.symbol.flags & 128) {
@@ -16634,13 +17779,35 @@ var ts;
                     if (property.flags & 8) {
                         var targetProperty = getPropertyOfType(targetEnumType, property.name);
                         if (!targetProperty || !(targetProperty.flags & 8)) {
-                            reportError(ts.Diagnostics.Property_0_is_missing_in_type_1, property.name, typeToString(target, undefined, 128));
+                            if (reportErrors) {
+                                reportError(ts.Diagnostics.Property_0_is_missing_in_type_1, property.name, typeToString(target, undefined, 128));
+                            }
                             return 0;
                         }
                     }
                 }
                 return -1;
             }
+            function constructorVisibilitiesAreCompatible(sourceSignature, targetSignature, reportErrors) {
+                if (!sourceSignature.declaration || !targetSignature.declaration) {
+                    return true;
+                }
+                var sourceAccessibility = sourceSignature.declaration.flags & (8 | 16);
+                var targetAccessibility = targetSignature.declaration.flags & (8 | 16);
+                if (targetAccessibility === 8) {
+                    return true;
+                }
+                if (targetAccessibility === 16 && sourceAccessibility !== 8) {
+                    return true;
+                }
+                if (targetAccessibility !== 16 && !sourceAccessibility) {
+                    return true;
+                }
+                if (reportErrors) {
+                    reportError(ts.Diagnostics.Cannot_assign_a_0_constructor_type_to_a_1_constructor_type, visibilityToString(sourceAccessibility), visibilityToString(targetAccessibility));
+                }
+                return false;
+            }
         }
         function isAbstractConstructorType(type) {
             if (type.flags & 65536) {
@@ -16676,8 +17843,8 @@ var ts;
             if (sourceProp === targetProp) {
                 return -1;
             }
-            var sourcePropAccessibility = getDeclarationFlagsFromSymbol(sourceProp) & (16 | 32);
-            var targetPropAccessibility = getDeclarationFlagsFromSymbol(targetProp) & (16 | 32);
+            var sourcePropAccessibility = getDeclarationFlagsFromSymbol(sourceProp) & (8 | 16);
+            var targetPropAccessibility = getDeclarationFlagsFromSymbol(targetProp) & (8 | 16);
             if (sourcePropAccessibility !== targetPropAccessibility) {
                 return 0;
             }
@@ -16691,6 +17858,9 @@ var ts;
                     return 0;
                 }
             }
+            if (isReadonlySymbol(sourceProp) !== isReadonlySymbol(targetProp)) {
+                return 0;
+            }
             return compareTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
         }
         function isMatchingSignature(source, target, partialMatch) {
@@ -16705,7 +17875,7 @@ var ts;
             }
             return false;
         }
-        function compareSignaturesIdentical(source, target, partialMatch, ignoreReturnTypes, compareTypes) {
+        function compareSignaturesIdentical(source, target, partialMatch, ignoreThisTypes, ignoreReturnTypes, compareTypes) {
             if (source === target) {
                 return -1;
             }
@@ -16718,10 +17888,17 @@ var ts;
             source = getErasedSignature(source);
             target = getErasedSignature(target);
             var result = -1;
+            if (!ignoreThisTypes && source.thisType && target.thisType) {
+                var related = compareTypes(source.thisType, target.thisType);
+                if (!related) {
+                    return 0;
+                }
+                result &= related;
+            }
             var targetLen = target.parameters.length;
             for (var i = 0; i < targetLen; i++) {
-                var s = isRestParameterIndex(source, i) ? getRestTypeOfSignature(source) : getTypeOfSymbol(source.parameters[i]);
-                var t = isRestParameterIndex(target, i) ? getRestTypeOfSignature(target) : getTypeOfSymbol(target.parameters[i]);
+                var s = isRestParameterIndex(source, i) ? getRestTypeOfSignature(source) : getTypeOfParameter(source.parameters[i]);
+                var t = isRestParameterIndex(target, i) ? getRestTypeOfSignature(target) : getTypeOfParameter(target.parameters[i]);
                 var related = compareTypes(s, t);
                 if (!related) {
                     return 0;
@@ -16737,15 +17914,31 @@ var ts;
             return signature.hasRestParameter && parameterIndex >= signature.parameters.length - 1;
         }
         function isSupertypeOfEach(candidate, types) {
-            for (var _i = 0, types_6 = types; _i < types_6.length; _i++) {
-                var type = types_6[_i];
-                if (candidate !== type && !isTypeSubtypeOf(type, candidate))
+            for (var _i = 0, types_5 = types; _i < types_5.length; _i++) {
+                var t = types_5[_i];
+                if (candidate !== t && !isTypeSubtypeOf(t, candidate))
                     return false;
             }
             return true;
         }
+        function getCombinedFlagsOfTypes(types) {
+            var flags = 0;
+            for (var _i = 0, types_6 = types; _i < types_6.length; _i++) {
+                var t = types_6[_i];
+                flags |= t.flags;
+            }
+            return flags;
+        }
         function getCommonSupertype(types) {
-            return ts.forEach(types, function (t) { return isSupertypeOfEach(t, types) ? t : undefined; });
+            if (!strictNullChecks) {
+                return ts.forEach(types, function (t) { return isSupertypeOfEach(t, types) ? t : undefined; });
+            }
+            var primaryTypes = ts.filter(types, function (t) { return !(t.flags & 96); });
+            if (!primaryTypes.length) {
+                return getUnionType(types);
+            }
+            var supertype = ts.forEach(primaryTypes, function (t) { return isSupertypeOfEach(t, primaryTypes) ? t : undefined; });
+            return supertype && addNullableKind(supertype, getCombinedFlagsOfTypes(types) & 96);
         }
         function reportNoCommonSupertypeError(types, errorLocation, errorMessageChainHead) {
             var bestSupertype;
@@ -16778,7 +17971,8 @@ var ts;
             return type.flags & 4096 && type.target === globalArrayType;
         }
         function isArrayLikeType(type) {
-            return !(type.flags & (32 | 64)) && isTypeAssignableTo(type, anyArrayType);
+            return type.flags & 4096 && (type.target === globalArrayType || type.target === globalReadonlyArrayType) ||
+                !(type.flags & 96) && isTypeAssignableTo(type, anyReadonlyArrayType);
         }
         function isTupleLikeType(type) {
             return !!getPropertyOfType(type, "0");
@@ -16789,6 +17983,65 @@ var ts;
         function isTupleType(type) {
             return !!(type.flags & 8192);
         }
+        function getNullableKind(type) {
+            var flags = type.flags;
+            if (flags & 16384) {
+                for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                    var t = _a[_i];
+                    flags |= t.flags;
+                }
+            }
+            return flags & 96;
+        }
+        function getNullableTypeOfKind(kind) {
+            return kind & 64 ? kind & 32 ?
+                getUnionType([nullType, undefinedType]) : nullType : undefinedType;
+        }
+        function addNullableKind(type, kind) {
+            if ((getNullableKind(type) & kind) !== kind) {
+                var types = [type];
+                if (kind & 32) {
+                    types.push(undefinedType);
+                }
+                if (kind & 64) {
+                    types.push(nullType);
+                }
+                type = getUnionType(types);
+            }
+            return type;
+        }
+        function removeNullableKind(type, kind) {
+            if (type.flags & 16384 && getNullableKind(type) & kind) {
+                var firstType = void 0;
+                var types = void 0;
+                for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                    var t = _a[_i];
+                    if (!(t.flags & kind)) {
+                        if (!firstType) {
+                            firstType = t;
+                        }
+                        else {
+                            if (!types) {
+                                types = [firstType];
+                            }
+                            types.push(t);
+                        }
+                    }
+                }
+                if (firstType) {
+                    type = types ? getUnionType(types) : firstType;
+                }
+            }
+            return type;
+        }
+        function getNonNullableType(type) {
+            return strictNullChecks ? removeNullableKind(type, 96) : type;
+        }
+        function isObjectLiteralType(type) {
+            return type.symbol && (type.symbol.flags & (4096 | 2048)) !== 0 &&
+                getSignaturesOfType(type, 0).length === 0 &&
+                getSignaturesOfType(type, 1).length === 0;
+        }
         function getRegularTypeOfObjectLiteral(type) {
             if (type.flags & 1048576) {
                 var regularType = type.regularType;
@@ -16799,8 +18052,8 @@ var ts;
                     regularType.properties = type.properties;
                     regularType.callSignatures = type.callSignatures;
                     regularType.constructSignatures = type.constructSignatures;
-                    regularType.stringIndexType = type.stringIndexType;
-                    regularType.numberIndexType = type.numberIndexType;
+                    regularType.stringIndexInfo = type.stringIndexInfo;
+                    regularType.numberIndexInfo = type.numberIndexInfo;
                     type.regularType = regularType;
                 }
                 return regularType;
@@ -16825,27 +18078,23 @@ var ts;
                 }
                 members[p.name] = p;
             });
-            var stringIndexType = getIndexTypeOfType(type, 0);
-            var numberIndexType = getIndexTypeOfType(type, 1);
-            if (stringIndexType)
-                stringIndexType = getWidenedType(stringIndexType);
-            if (numberIndexType)
-                numberIndexType = getWidenedType(numberIndexType);
-            return createAnonymousType(type.symbol, members, emptyArray, emptyArray, stringIndexType, numberIndexType);
+            var stringIndexInfo = getIndexInfoOfType(type, 0);
+            var numberIndexInfo = getIndexInfoOfType(type, 1);
+            return createAnonymousType(type.symbol, members, emptyArray, emptyArray, stringIndexInfo && createIndexInfo(getWidenedType(stringIndexInfo.type), stringIndexInfo.isReadonly), numberIndexInfo && createIndexInfo(getWidenedType(numberIndexInfo.type), numberIndexInfo.isReadonly));
+        }
+        function getWidenedConstituentType(type) {
+            return type.flags & 96 ? type : getWidenedType(type);
         }
         function getWidenedType(type) {
-            if (type.flags & 140509184) {
-                if (type.flags & (32 | 64)) {
+            if (type.flags & 6291456) {
+                if (type.flags & 96) {
                     return anyType;
                 }
-                if (type.flags & 134217728) {
-                    return booleanType;
-                }
                 if (type.flags & 524288) {
                     return getWidenedTypeOfObjectLiteral(type);
                 }
                 if (type.flags & 16384) {
-                    return getUnionType(ts.map(type.types, getWidenedType), true);
+                    return getUnionType(ts.map(type.types, getWidenedConstituentType), true);
                 }
                 if (isArrayType(type)) {
                     return createArrayType(getWidenedType(type.typeArguments[0]));
@@ -16895,22 +18144,25 @@ var ts;
             var typeAsString = typeToString(getWidenedType(type));
             var diagnostic;
             switch (declaration.kind) {
-                case 142:
-                case 141:
+                case 144:
+                case 143:
                     diagnostic = ts.Diagnostics.Member_0_implicitly_has_an_1_type;
                     break;
-                case 139:
+                case 141:
                     diagnostic = declaration.dotDotDotToken ?
                         ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type :
                         ts.Diagnostics.Parameter_0_implicitly_has_an_1_type;
                     break;
-                case 216:
-                case 144:
-                case 143:
+                case 168:
+                    diagnostic = ts.Diagnostics.Binding_element_0_implicitly_has_an_1_type;
+                    break;
+                case 219:
                 case 146:
-                case 147:
-                case 176:
-                case 177:
+                case 145:
+                case 148:
+                case 149:
+                case 178:
+                case 179:
                     if (!declaration.name) {
                         error(declaration, ts.Diagnostics.Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
                         return;
@@ -16934,25 +18186,19 @@ var ts;
             var targetMax = target.parameters.length;
             var count;
             if (source.hasRestParameter && target.hasRestParameter) {
-                count = sourceMax > targetMax ? sourceMax : targetMax;
-                sourceMax--;
-                targetMax--;
+                count = Math.max(sourceMax, targetMax);
             }
             else if (source.hasRestParameter) {
-                sourceMax--;
                 count = targetMax;
             }
             else if (target.hasRestParameter) {
-                targetMax--;
                 count = sourceMax;
             }
             else {
-                count = sourceMax < targetMax ? sourceMax : targetMax;
+                count = Math.min(sourceMax, targetMax);
             }
             for (var i = 0; i < count; i++) {
-                var s = i < sourceMax ? getTypeOfSymbol(source.parameters[i]) : getRestTypeOfSignature(source);
-                var t = i < targetMax ? getTypeOfSymbol(target.parameters[i]) : getRestTypeOfSignature(target);
-                callback(s, t);
+                callback(getTypeAtPosition(source, i), getTypeAtPosition(target, i));
             }
         }
         function createInferenceContext(typeParameters, inferUnionTypes) {
@@ -16976,6 +18222,7 @@ var ts;
             var targetStack;
             var depth = 0;
             var inferiority = 0;
+            var visited = {};
             inferFromTypes(source, target);
             function isInProcess(source, target) {
                 for (var i = 0; i < depth; i++) {
@@ -16988,7 +18235,7 @@ var ts;
             function inferFromTypes(source, target) {
                 if (source.flags & 16384 && target.flags & 16384 ||
                     source.flags & 32768 && target.flags & 32768) {
-                    var matchingTypes;
+                    var matchingTypes = void 0;
                     for (var _i = 0, _a = target.types; _i < _a.length; _i++) {
                         var t = _a[_i];
                         if (typeIdenticalToSomeType(t, source.types)) {
@@ -17029,11 +18276,6 @@ var ts;
                         inferFromTypes(sourceTypes[i], targetTypes[i]);
                     }
                 }
-                else if (source.flags & 134217728 && target.flags & 134217728) {
-                    if (source.predicate.kind === target.predicate.kind) {
-                        inferFromTypes(source.predicate.type, target.predicate.type);
-                    }
-                }
                 else if (source.flags & 8192 && target.flags & 8192 && source.elementTypes.length === target.elementTypes.length) {
                     var sourceTypes = source.elementTypes;
                     var targetTypes = target.elementTypes;
@@ -17044,7 +18286,7 @@ var ts;
                 else if (target.flags & 49152) {
                     var targetTypes = target.types;
                     var typeParameterCount = 0;
-                    var typeParameter;
+                    var typeParameter = void 0;
                     for (var _b = 0, targetTypes_2 = targetTypes; _b < targetTypes_2.length; _b++) {
                         var t = targetTypes_2[_b];
                         if (t.flags & 512 && ts.contains(context.typeParameters, t)) {
@@ -17079,6 +18321,11 @@ var ts;
                         if (isDeeplyNestedGeneric(source, sourceStack, depth) && isDeeplyNestedGeneric(target, targetStack, depth)) {
                             return;
                         }
+                        var key = source.id + "," + target.id;
+                        if (ts.hasProperty(visited, key)) {
+                            return;
+                        }
+                        visited[key] = true;
                         if (depth === 0) {
                             sourceStack = [];
                             targetStack = [];
@@ -17089,9 +18336,7 @@ var ts;
                         inferFromProperties(source, target);
                         inferFromSignatures(source, target, 0);
                         inferFromSignatures(source, target, 1);
-                        inferFromIndexTypes(source, target, 0, 0);
-                        inferFromIndexTypes(source, target, 1, 1);
-                        inferFromIndexTypes(source, target, 0, 1);
+                        inferFromIndexTypes(source, target);
                         depth--;
                     }
                 }
@@ -17118,14 +18363,29 @@ var ts;
             }
             function inferFromSignature(source, target) {
                 forEachMatchingParameterType(source, target, inferFromTypes);
-                inferFromTypes(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
+                if (source.typePredicate && target.typePredicate && source.typePredicate.kind === target.typePredicate.kind) {
+                    inferFromTypes(source.typePredicate.type, target.typePredicate.type);
+                }
+                else {
+                    inferFromTypes(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
+                }
             }
-            function inferFromIndexTypes(source, target, sourceKind, targetKind) {
-                var targetIndexType = getIndexTypeOfType(target, targetKind);
-                if (targetIndexType) {
-                    var sourceIndexType = getIndexTypeOfType(source, sourceKind);
+            function inferFromIndexTypes(source, target) {
+                var targetStringIndexType = getIndexTypeOfType(target, 0);
+                if (targetStringIndexType) {
+                    var sourceIndexType = getIndexTypeOfType(source, 0) ||
+                        getImplicitIndexTypeOfType(source, 0);
                     if (sourceIndexType) {
-                        inferFromTypes(sourceIndexType, targetIndexType);
+                        inferFromTypes(sourceIndexType, targetStringIndexType);
+                    }
+                }
+                var targetNumberIndexType = getIndexTypeOfType(target, 1);
+                if (targetNumberIndexType) {
+                    var sourceIndexType = getIndexTypeOfType(source, 1) ||
+                        getIndexTypeOfType(source, 0) ||
+                        getImplicitIndexTypeOfType(source, 1);
+                    if (sourceIndexType) {
+                        inferFromTypes(sourceIndexType, targetNumberIndexType);
                     }
                 }
             }
@@ -17189,20 +18449,31 @@ var ts;
             }
             return context.inferredTypes;
         }
+        function createTransientIdentifier(symbol, location) {
+            var result = ts.createNode(69);
+            result.text = symbol.name;
+            result.resolvedSymbol = symbol;
+            result.parent = location;
+            result.id = -1;
+            return result;
+        }
         function getResolvedSymbol(node) {
+            if (node.id === -1) {
+                return node.resolvedSymbol;
+            }
             var links = getNodeLinks(node);
             if (!links.resolvedSymbol) {
-                links.resolvedSymbol = (!ts.nodeIsMissing(node) && resolveName(node, node.text, 107455 | 1048576, ts.Diagnostics.Cannot_find_name_0, node)) || unknownSymbol;
+                links.resolvedSymbol = !ts.nodeIsMissing(node) && resolveName(node, node.text, 107455 | 1048576, ts.Diagnostics.Cannot_find_name_0, node) || unknownSymbol;
             }
             return links.resolvedSymbol;
         }
         function isInTypeQuery(node) {
             while (node) {
                 switch (node.kind) {
-                    case 155:
+                    case 157:
                         return true;
                     case 69:
-                    case 136:
+                    case 138:
                         node = node.parent;
                         continue;
                     default:
@@ -17211,164 +18482,279 @@ var ts;
             }
             ts.Debug.fail("should not get here");
         }
+        function getAssignmentKey(node) {
+            if (node.kind === 69) {
+                var symbol = getResolvedSymbol(node);
+                return symbol !== unknownSymbol ? "" + getSymbolId(symbol) : undefined;
+            }
+            if (node.kind === 97) {
+                return "0";
+            }
+            if (node.kind === 171) {
+                var key = getAssignmentKey(node.expression);
+                return key && key + "." + node.name.text;
+            }
+            return undefined;
+        }
         function hasInitializer(node) {
             return !!(node.initializer || ts.isBindingPattern(node.parent) && hasInitializer(node.parent.parent));
         }
-        function isVariableAssignedWithin(symbol, node) {
-            var links = getNodeLinks(node);
-            if (links.assignmentChecks) {
-                var cachedResult = links.assignmentChecks[symbol.id];
-                if (cachedResult !== undefined) {
-                    return cachedResult;
-                }
-            }
-            else {
-                links.assignmentChecks = {};
-            }
-            return links.assignmentChecks[symbol.id] = isAssignedIn(node);
-            function isAssignedInBinaryExpression(node) {
-                if (node.operatorToken.kind >= 56 && node.operatorToken.kind <= 68) {
-                    var n = skipParenthesizedNodes(node.left);
-                    if (n.kind === 69 && getResolvedSymbol(n) === symbol) {
-                        return true;
+        function getAssignmentMap(node) {
+            var assignmentMap = {};
+            visit(node);
+            return assignmentMap;
+            function visitReference(node) {
+                if (isAssignmentTarget(node) || isCompoundAssignmentTarget(node)) {
+                    var key = getAssignmentKey(node);
+                    if (key) {
+                        assignmentMap[key] = true;
                     }
                 }
-                return ts.forEachChild(node, isAssignedIn);
+                ts.forEachChild(node, visit);
             }
-            function isAssignedInVariableDeclaration(node) {
-                if (!ts.isBindingPattern(node.name) && getSymbolOfNode(node) === symbol && hasInitializer(node)) {
-                    return true;
+            function visitVariableDeclaration(node) {
+                if (!ts.isBindingPattern(node.name) && hasInitializer(node)) {
+                    assignmentMap[getSymbolId(getSymbolOfNode(node))] = true;
                 }
-                return ts.forEachChild(node, isAssignedIn);
+                ts.forEachChild(node, visit);
             }
-            function isAssignedIn(node) {
+            function visit(node) {
                 switch (node.kind) {
-                    case 184:
-                        return isAssignedInBinaryExpression(node);
-                    case 214:
-                    case 166:
-                        return isAssignedInVariableDeclaration(node);
-                    case 164:
-                    case 165:
-                    case 167:
+                    case 69:
+                    case 171:
+                        visitReference(node);
+                        break;
+                    case 217:
                     case 168:
+                        visitVariableDeclaration(node);
+                        break;
+                    case 186:
+                    case 166:
+                    case 167:
                     case 169:
                     case 170:
-                    case 171:
                     case 172:
+                    case 173:
                     case 174:
-                    case 192:
-                    case 175:
-                    case 182:
-                    case 178:
-                    case 181:
-                    case 179:
+                    case 176:
+                    case 194:
+                    case 195:
+                    case 177:
+                    case 184:
                     case 180:
                     case 183:
-                    case 187:
+                    case 181:
+                    case 182:
                     case 185:
-                    case 188:
-                    case 195:
-                    case 196:
+                    case 189:
+                    case 187:
+                    case 190:
                     case 198:
                     case 199:
-                    case 200:
                     case 201:
                     case 202:
                     case 203:
                     case 204:
+                    case 205:
+                    case 206:
                     case 207:
-                    case 208:
-                    case 209:
-                    case 244:
-                    case 245:
                     case 210:
                     case 211:
                     case 212:
-                    case 247:
-                    case 236:
-                    case 237:
+                    case 226:
+                    case 248:
+                    case 249:
+                    case 213:
+                    case 214:
+                    case 215:
+                    case 251:
+                    case 240:
                     case 241:
+                    case 245:
+                    case 246:
                     case 242:
-                    case 238:
-                    case 243:
-                        return ts.forEachChild(node, isAssignedIn);
+                    case 247:
+                        ts.forEachChild(node, visit);
+                        break;
                 }
-                return false;
             }
         }
-        function getNarrowedTypeOfSymbol(symbol, node) {
-            var type = getTypeOfSymbol(symbol);
-            if (node && symbol.flags & 3) {
-                if (isTypeAny(type) || type.flags & (80896 | 16384 | 512)) {
-                    var declaration = ts.getDeclarationOfKind(symbol, 214);
-                    var top_1 = declaration && getDeclarationContainer(declaration);
-                    var originalType = type;
-                    var nodeStack = [];
-                    loop: while (node.parent) {
-                        var child = node;
-                        node = node.parent;
-                        switch (node.kind) {
-                            case 199:
-                            case 185:
-                            case 184:
-                                nodeStack.push({ node: node, child: child });
-                                break;
-                            case 251:
-                            case 221:
-                                break loop;
-                        }
-                        if (node === top_1) {
-                            break;
-                        }
-                    }
-                    var nodes;
-                    while (nodes = nodeStack.pop()) {
-                        var node_1 = nodes.node, child = nodes.child;
-                        switch (node_1.kind) {
-                            case 199:
-                                if (child !== node_1.expression) {
-                                    type = narrowType(type, node_1.expression, child === node_1.thenStatement);
-                                }
-                                break;
-                            case 185:
-                                if (child !== node_1.condition) {
-                                    type = narrowType(type, node_1.condition, child === node_1.whenTrue);
-                                }
-                                break;
-                            case 184:
-                                if (child === node_1.right) {
-                                    if (node_1.operatorToken.kind === 51) {
-                                        type = narrowType(type, node_1.left, true);
-                                    }
-                                    else if (node_1.operatorToken.kind === 52) {
-                                        type = narrowType(type, node_1.left, false);
-                                    }
-                                }
-                                break;
-                            default:
-                                ts.Debug.fail("Unreachable!");
-                        }
-                        if (type !== originalType && isVariableAssignedWithin(symbol, node_1)) {
-                            type = originalType;
-                        }
-                    }
-                    if (type === emptyUnionType) {
-                        type = originalType;
-                    }
+        function isReferenceAssignedWithin(reference, node) {
+            if (reference.kind !== 97) {
+                var key = getAssignmentKey(reference);
+                if (key) {
+                    var links = getNodeLinks(node);
+                    return (links.assignmentMap || (links.assignmentMap = getAssignmentMap(node)))[key];
                 }
             }
-            return type;
-            function narrowTypeByEquality(type, expr, assumeTrue) {
-                if (expr.left.kind !== 179 || expr.right.kind !== 9) {
+            return false;
+        }
+        function isAnyPartOfReferenceAssignedWithin(reference, node) {
+            while (true) {
+                if (isReferenceAssignedWithin(reference, node)) {
+                    return true;
+                }
+                if (reference.kind !== 171) {
+                    return false;
+                }
+                reference = reference.expression;
+            }
+        }
+        function isNullOrUndefinedLiteral(node) {
+            return node.kind === 93 ||
+                node.kind === 69 && getResolvedSymbol(node) === undefinedSymbol;
+        }
+        function getLeftmostIdentifierOrThis(node) {
+            switch (node.kind) {
+                case 69:
+                case 97:
+                    return node;
+                case 171:
+                    return getLeftmostIdentifierOrThis(node.expression);
+            }
+            return undefined;
+        }
+        function isMatchingReference(source, target) {
+            if (source.kind === target.kind) {
+                switch (source.kind) {
+                    case 69:
+                        return getResolvedSymbol(source) === getResolvedSymbol(target);
+                    case 97:
+                        return true;
+                    case 171:
+                        return source.name.text === target.name.text &&
+                            isMatchingReference(source.expression, target.expression);
+                }
+            }
+            return false;
+        }
+        function getNarrowedTypeOfReference(type, reference) {
+            if (!(type.flags & (1 | 80896 | 16384 | 512))) {
+                return type;
+            }
+            var leftmostNode = getLeftmostIdentifierOrThis(reference);
+            if (!leftmostNode) {
+                return type;
+            }
+            var top;
+            if (leftmostNode.kind === 69) {
+                var leftmostSymbol = getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(leftmostNode));
+                if (!leftmostSymbol) {
                     return type;
                 }
+                var declaration = leftmostSymbol.valueDeclaration;
+                if (!declaration || declaration.kind !== 217 && declaration.kind !== 141 && declaration.kind !== 168) {
+                    return type;
+                }
+                top = getDeclarationContainer(declaration);
+            }
+            var originalType = type;
+            var nodeStack = [];
+            var node = reference;
+            loop: while (node.parent) {
+                var child = node;
+                node = node.parent;
+                switch (node.kind) {
+                    case 202:
+                    case 187:
+                    case 186:
+                        nodeStack.push({ node: node, child: child });
+                        break;
+                    case 255:
+                    case 224:
+                        break loop;
+                    default:
+                        if (node === top || ts.isFunctionLikeKind(node.kind)) {
+                            break loop;
+                        }
+                        break;
+                }
+            }
+            var nodes;
+            while (nodes = nodeStack.pop()) {
+                var node_1 = nodes.node, child = nodes.child;
+                switch (node_1.kind) {
+                    case 202:
+                        if (child !== node_1.expression) {
+                            type = narrowType(type, node_1.expression, child === node_1.thenStatement);
+                        }
+                        break;
+                    case 187:
+                        if (child !== node_1.condition) {
+                            type = narrowType(type, node_1.condition, child === node_1.whenTrue);
+                        }
+                        break;
+                    case 186:
+                        if (child === node_1.right) {
+                            if (node_1.operatorToken.kind === 51) {
+                                type = narrowType(type, node_1.left, true);
+                            }
+                            else if (node_1.operatorToken.kind === 52) {
+                                type = narrowType(type, node_1.left, false);
+                            }
+                        }
+                        break;
+                    default:
+                        ts.Debug.fail("Unreachable!");
+                }
+                if (type !== originalType && isAnyPartOfReferenceAssignedWithin(reference, node_1)) {
+                    type = originalType;
+                }
+            }
+            if (type === emptyUnionType) {
+                type = originalType;
+            }
+            return type;
+            function narrowTypeByTruthiness(type, expr, assumeTrue) {
+                return strictNullChecks && assumeTrue && isMatchingReference(expr, reference) ? getNonNullableType(type) : type;
+            }
+            function narrowTypeByBinaryExpression(type, expr, assumeTrue) {
+                switch (expr.operatorToken.kind) {
+                    case 30:
+                    case 31:
+                    case 32:
+                    case 33:
+                        if (isNullOrUndefinedLiteral(expr.right)) {
+                            return narrowTypeByNullCheck(type, expr, assumeTrue);
+                        }
+                        if (expr.left.kind === 181 && expr.right.kind === 9) {
+                            return narrowTypeByTypeof(type, expr, assumeTrue);
+                        }
+                        break;
+                    case 51:
+                        return narrowTypeByAnd(type, expr, assumeTrue);
+                    case 52:
+                        return narrowTypeByOr(type, expr, assumeTrue);
+                    case 91:
+                        return narrowTypeByInstanceof(type, expr, assumeTrue);
+                }
+                return type;
+            }
+            function narrowTypeByNullCheck(type, expr, assumeTrue) {
+                var operator = expr.operatorToken.kind;
+                if (operator === 31 || operator === 33) {
+                    assumeTrue = !assumeTrue;
+                }
+                if (!strictNullChecks || !isMatchingReference(expr.left, reference)) {
+                    return type;
+                }
+                var doubleEquals = operator === 30 || operator === 31;
+                var exprNullableKind = doubleEquals ? 96 :
+                    expr.right.kind === 93 ? 64 : 32;
+                if (assumeTrue) {
+                    var nullableKind = getNullableKind(type) & exprNullableKind;
+                    return nullableKind ? getNullableTypeOfKind(nullableKind) : type;
+                }
+                return removeNullableKind(type, exprNullableKind);
+            }
+            function narrowTypeByTypeof(type, expr, assumeTrue) {
                 var left = expr.left;
                 var right = expr.right;
-                if (left.expression.kind !== 69 || getResolvedSymbol(left.expression) !== symbol) {
+                if (!isMatchingReference(left.expression, reference)) {
                     return type;
                 }
-                if (expr.operatorToken.kind === 33) {
+                if (expr.operatorToken.kind === 31 ||
+                    expr.operatorToken.kind === 33) {
                     assumeTrue = !assumeTrue;
                 }
                 var typeInfo = primitiveTypeInfo[right.text];
@@ -17417,7 +18803,7 @@ var ts;
                 }
             }
             function narrowTypeByInstanceof(type, expr, assumeTrue) {
-                if (isTypeAny(type) || expr.left.kind !== 69 || getResolvedSymbol(expr.left) !== symbol) {
+                if (isTypeAny(type) || !isMatchingReference(expr.left, reference)) {
                     return type;
                 }
                 var rightType = checkExpression(expr.right);
@@ -17433,7 +18819,7 @@ var ts;
                     }
                 }
                 if (!targetType) {
-                    var constructSignatures;
+                    var constructSignatures = void 0;
                     if (rightType.flags & 2048) {
                         constructSignatures = resolveDeclaredMembers(rightType).declaredConstructSignatures;
                     }
@@ -17462,123 +18848,209 @@ var ts;
                         return getUnionType(assignableConstituents);
                     }
                 }
-                if (isTypeAssignableTo(narrowedTypeCandidate, originalType)) {
+                var targetType = originalType.flags & 512 ? getApparentType(originalType) : originalType;
+                if (isTypeAssignableTo(narrowedTypeCandidate, targetType)) {
                     return narrowedTypeCandidate;
                 }
                 return originalType;
             }
-            function narrowTypeByTypePredicate(type, expr, assumeTrue) {
+            function narrowTypeByTypePredicate(type, callExpression, assumeTrue) {
                 if (type.flags & 1) {
                     return type;
                 }
-                var signature = getResolvedSignature(expr);
-                var predicateType = getReturnTypeOfSignature(signature);
-                if (!predicateType || !(predicateType.flags & 134217728)) {
+                var signature = getResolvedSignature(callExpression);
+                var predicate = signature.typePredicate;
+                if (!predicate) {
                     return type;
                 }
-                var predicate = predicateType.predicate;
                 if (ts.isIdentifierTypePredicate(predicate)) {
-                    var callExpression = expr;
-                    if (callExpression.arguments[predicate.parameterIndex] &&
-                        getSymbolAtTypePredicatePosition(callExpression.arguments[predicate.parameterIndex]) === symbol) {
+                    var predicateArgument = callExpression.arguments[predicate.parameterIndex];
+                    if (predicateArgument && isMatchingReference(predicateArgument, reference)) {
                         return getNarrowedType(type, predicate.type, assumeTrue);
                     }
                 }
                 else {
-                    var expression = skipParenthesizedNodes(expr.expression);
-                    return narrowTypeByThisTypePredicate(type, predicate, expression, assumeTrue);
-                }
-                return type;
-            }
-            function narrowTypeByTypePredicateMember(type, expr, assumeTrue) {
-                if (type.flags & 1) {
-                    return type;
-                }
-                var memberType = getTypeOfExpression(expr);
-                if (!(memberType.flags & 134217728)) {
-                    return type;
-                }
-                return narrowTypeByThisTypePredicate(type, memberType.predicate, expr, assumeTrue);
-            }
-            function narrowTypeByThisTypePredicate(type, predicate, expression, assumeTrue) {
-                if (expression.kind === 170 || expression.kind === 169) {
-                    var accessExpression = expression;
-                    var possibleIdentifier = skipParenthesizedNodes(accessExpression.expression);
-                    if (possibleIdentifier.kind === 69 && getSymbolAtTypePredicatePosition(possibleIdentifier) === symbol) {
-                        return getNarrowedType(type, predicate.type, assumeTrue);
+                    var invokedExpression = skipParenthesizedNodes(callExpression.expression);
+                    if (invokedExpression.kind === 172 || invokedExpression.kind === 171) {
+                        var accessExpression = invokedExpression;
+                        var possibleReference = skipParenthesizedNodes(accessExpression.expression);
+                        if (isMatchingReference(possibleReference, reference)) {
+                            return getNarrowedType(type, predicate.type, assumeTrue);
+                        }
                     }
                 }
                 return type;
             }
-            function getSymbolAtTypePredicatePosition(expr) {
-                expr = skipParenthesizedNodes(expr);
-                switch (expr.kind) {
-                    case 69:
-                    case 169:
-                    case 136:
-                        return getSymbolOfEntityNameOrPropertyAccessExpression(expr);
-                }
-            }
             function narrowType(type, expr, assumeTrue) {
                 switch (expr.kind) {
+                    case 69:
+                    case 97:
                     case 171:
+                        return narrowTypeByTruthiness(type, expr, assumeTrue);
+                    case 173:
                         return narrowTypeByTypePredicate(type, expr, assumeTrue);
-                    case 175:
+                    case 177:
                         return narrowType(type, expr.expression, assumeTrue);
+                    case 186:
+                        return narrowTypeByBinaryExpression(type, expr, assumeTrue);
                     case 184:
-                        var operator = expr.operatorToken.kind;
-                        if (operator === 32 || operator === 33) {
-                            return narrowTypeByEquality(type, expr, assumeTrue);
-                        }
-                        else if (operator === 51) {
-                            return narrowTypeByAnd(type, expr, assumeTrue);
-                        }
-                        else if (operator === 52) {
-                            return narrowTypeByOr(type, expr, assumeTrue);
-                        }
-                        else if (operator === 91) {
-                            return narrowTypeByInstanceof(type, expr, assumeTrue);
-                        }
-                        break;
-                    case 182:
                         if (expr.operator === 49) {
                             return narrowType(type, expr.operand, !assumeTrue);
                         }
                         break;
-                    case 170:
-                    case 169:
-                        return narrowTypeByTypePredicateMember(type, expr, assumeTrue);
                 }
                 return type;
             }
         }
+        function getTypeOfSymbolAtLocation(symbol, location) {
+            var type = getTypeOfSymbol(symbol);
+            if (location.kind === 69) {
+                if (ts.isRightSideOfQualifiedNameOrPropertyAccess(location)) {
+                    location = location.parent;
+                }
+                if (ts.isExpression(location)) {
+                    checkExpression(location);
+                    if (getNodeLinks(location).resolvedSymbol === symbol) {
+                        return getNarrowedTypeOfReference(type, location);
+                    }
+                }
+            }
+            return getNarrowedTypeOfReference(type, createTransientIdentifier(symbol, location));
+        }
         function skipParenthesizedNodes(expression) {
-            while (expression.kind === 175) {
+            while (expression.kind === 177) {
                 expression = expression.expression;
             }
             return expression;
         }
+        function findFirstAssignment(symbol, container) {
+            return visit(ts.isFunctionLike(container) ? container.body : container);
+            function visit(node) {
+                switch (node.kind) {
+                    case 69:
+                        var assignment = getAssignmentRoot(node);
+                        return assignment && getResolvedSymbol(node) === symbol ? assignment : undefined;
+                    case 186:
+                    case 217:
+                    case 168:
+                    case 166:
+                    case 167:
+                    case 169:
+                    case 170:
+                    case 171:
+                    case 172:
+                    case 173:
+                    case 174:
+                    case 176:
+                    case 194:
+                    case 195:
+                    case 177:
+                    case 184:
+                    case 180:
+                    case 183:
+                    case 181:
+                    case 182:
+                    case 185:
+                    case 189:
+                    case 187:
+                    case 190:
+                    case 199:
+                    case 201:
+                    case 202:
+                    case 203:
+                    case 204:
+                    case 205:
+                    case 206:
+                    case 207:
+                    case 210:
+                    case 211:
+                    case 212:
+                    case 226:
+                    case 248:
+                    case 249:
+                    case 213:
+                    case 214:
+                    case 215:
+                    case 251:
+                    case 240:
+                    case 241:
+                    case 245:
+                    case 246:
+                    case 242:
+                    case 247:
+                    case 198:
+                    case 255:
+                        return ts.forEachChild(node, visit);
+                }
+                return undefined;
+            }
+        }
+        function checkVariableAssignedBefore(symbol, reference) {
+            if (!(symbol.flags & 3)) {
+                return;
+            }
+            var declaration = symbol.valueDeclaration;
+            if (!declaration || declaration.kind !== 217 || declaration.initializer || ts.isInAmbientContext(declaration)) {
+                return;
+            }
+            var parentParentKind = declaration.parent.parent.kind;
+            if (parentParentKind === 207 || parentParentKind === 206) {
+                return;
+            }
+            var declarationContainer = ts.getContainingFunction(declaration) || ts.getSourceFileOfNode(declaration);
+            var referenceContainer = ts.getContainingFunction(reference) || ts.getSourceFileOfNode(reference);
+            if (declarationContainer !== referenceContainer) {
+                return;
+            }
+            var links = getSymbolLinks(symbol);
+            if (!links.firstAssignmentChecked) {
+                links.firstAssignmentChecked = true;
+                links.firstAssignment = findFirstAssignment(symbol, declarationContainer);
+            }
+            if (links.firstAssignment && links.firstAssignment.end <= reference.pos) {
+                return;
+            }
+            error(reference, ts.Diagnostics.Variable_0_is_used_before_being_assigned, symbolToString(symbol));
+        }
         function checkIdentifier(node) {
             var symbol = getResolvedSymbol(node);
             if (symbol === argumentsSymbol) {
                 var container = ts.getContainingFunction(node);
-                if (container.kind === 177) {
+                if (container.kind === 179) {
                     if (languageVersion < 2) {
                         error(node, ts.Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression);
                     }
                 }
-                if (node.parserContextFlags & 8) {
-                    getNodeLinks(container).flags |= 4096;
-                    getNodeLinks(node).flags |= 2048;
+                if (node.flags & 33554432) {
+                    getNodeLinks(container).flags |= 8192;
                 }
             }
             if (symbol.flags & 8388608 && !isInTypeQuery(node) && !isConstEnumOrConstEnumOnlyModule(resolveAlias(symbol))) {
                 markAliasSymbolAsReferenced(symbol);
             }
+            var localOrExportSymbol = getExportSymbolOfValueSymbolIfExported(symbol);
+            if (languageVersion === 2
+                && localOrExportSymbol.flags & 32
+                && localOrExportSymbol.valueDeclaration.kind === 220
+                && ts.nodeIsDecorated(localOrExportSymbol.valueDeclaration)) {
+                var container = ts.getContainingClass(node);
+                while (container !== undefined) {
+                    if (container === localOrExportSymbol.valueDeclaration && container.name !== node) {
+                        getNodeLinks(container).flags |= 524288;
+                        getNodeLinks(node).flags |= 1048576;
+                        break;
+                    }
+                    container = ts.getContainingClass(container);
+                }
+            }
             checkCollisionWithCapturedSuperVariable(node, node);
             checkCollisionWithCapturedThisVariable(node, node);
-            checkBlockScopedBindingCapturedInLoop(node, symbol);
-            return getNarrowedTypeOfSymbol(getExportSymbolOfValueSymbolIfExported(symbol), node);
+            checkNestedBlockScopedBinding(node, symbol);
+            var type = getTypeOfSymbol(localOrExportSymbol);
+            if (strictNullChecks && !isAssignmentTarget(node) && !(type.flags & 1) && !(getNullableKind(type) & 32)) {
+                checkVariableAssignedBefore(symbol, node);
+            }
+            return getNarrowedTypeOfReference(type, node);
         }
         function isInsideFunction(node, threshold) {
             var current = node;
@@ -17590,42 +19062,67 @@ var ts;
             }
             return false;
         }
-        function checkBlockScopedBindingCapturedInLoop(node, symbol) {
+        function checkNestedBlockScopedBinding(node, symbol) {
             if (languageVersion >= 2 ||
                 (symbol.flags & (2 | 32)) === 0 ||
-                symbol.valueDeclaration.parent.kind === 247) {
+                symbol.valueDeclaration.parent.kind === 251) {
                 return;
             }
-            var container;
-            if (symbol.flags & 32) {
-                container = getClassLikeDeclarationOfSymbol(symbol).parent;
-            }
-            else {
-                container = symbol.valueDeclaration;
-                while (container.kind !== 215) {
-                    container = container.parent;
-                }
-                container = container.parent;
-                if (container.kind === 196) {
-                    container = container.parent;
-                }
-            }
-            var inFunction = isInsideFunction(node.parent, container);
+            var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
+            var usedInFunction = isInsideFunction(node.parent, container);
             var current = container;
+            var containedInIterationStatement = false;
             while (current && !ts.nodeStartsNewLexicalEnvironment(current)) {
                 if (ts.isIterationStatement(current, false)) {
-                    if (inFunction) {
-                        getNodeLinks(current).flags |= 65536;
-                    }
-                    getNodeLinks(symbol.valueDeclaration).flags |= 16384;
+                    containedInIterationStatement = true;
                     break;
                 }
                 current = current.parent;
             }
+            if (containedInIterationStatement) {
+                if (usedInFunction) {
+                    getNodeLinks(current).flags |= 65536;
+                }
+                if (container.kind === 205 &&
+                    ts.getAncestor(symbol.valueDeclaration, 218).parent === container &&
+                    isAssignedInBodyOfForStatement(node, container)) {
+                    getNodeLinks(symbol.valueDeclaration).flags |= 2097152;
+                }
+                getNodeLinks(symbol.valueDeclaration).flags |= 262144;
+            }
+            if (usedInFunction) {
+                getNodeLinks(symbol.valueDeclaration).flags |= 131072;
+            }
+        }
+        function isAssignedInBodyOfForStatement(node, container) {
+            var current = node;
+            while (current.parent.kind === 177) {
+                current = current.parent;
+            }
+            var isAssigned = false;
+            if (isAssignmentTarget(current)) {
+                isAssigned = true;
+            }
+            else if ((current.parent.kind === 184 || current.parent.kind === 185)) {
+                var expr = current.parent;
+                isAssigned = expr.operator === 41 || expr.operator === 42;
+            }
+            if (!isAssigned) {
+                return false;
+            }
+            while (current !== container) {
+                if (current === container.statement) {
+                    return true;
+                }
+                else {
+                    current = current.parent;
+                }
+            }
+            return false;
         }
         function captureLexicalThis(node, container) {
             getNodeLinks(node).flags |= 2;
-            if (container.kind === 142 || container.kind === 145) {
+            if (container.kind === 144 || container.kind === 147) {
                 var classNode = container.parent;
                 getNodeLinks(classNode).flags |= 4;
             }
@@ -17633,70 +19130,138 @@ var ts;
                 getNodeLinks(container).flags |= 4;
             }
         }
+        function findFirstSuperCall(n) {
+            if (ts.isSuperCallExpression(n)) {
+                return n;
+            }
+            else if (ts.isFunctionLike(n)) {
+                return undefined;
+            }
+            return ts.forEachChild(n, findFirstSuperCall);
+        }
+        function getSuperCallInConstructor(constructor) {
+            var links = getNodeLinks(constructor);
+            if (links.hasSuperCall === undefined) {
+                links.superCall = findFirstSuperCall(constructor.body);
+                links.hasSuperCall = links.superCall ? true : false;
+            }
+            return links.superCall;
+        }
+        function classDeclarationExtendsNull(classDecl) {
+            var classSymbol = getSymbolOfNode(classDecl);
+            var classInstanceType = getDeclaredTypeOfSymbol(classSymbol);
+            var baseConstructorType = getBaseConstructorTypeOfClass(classInstanceType);
+            return baseConstructorType === nullType;
+        }
         function checkThisExpression(node) {
             var container = ts.getThisContainer(node, true);
             var needToCaptureLexicalThis = false;
-            if (container.kind === 177) {
+            if (container.kind === 147) {
+                var containingClassDecl = container.parent;
+                var baseTypeNode = ts.getClassExtendsHeritageClauseElement(containingClassDecl);
+                if (baseTypeNode && !classDeclarationExtendsNull(containingClassDecl)) {
+                    var superCall = getSuperCallInConstructor(container);
+                    if (!superCall || superCall.end > node.pos) {
+                        error(node, ts.Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class);
+                    }
+                }
+            }
+            if (container.kind === 179) {
                 container = ts.getThisContainer(container, false);
                 needToCaptureLexicalThis = (languageVersion < 2);
             }
             switch (container.kind) {
-                case 221:
+                case 224:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_module_or_namespace_body);
                     break;
-                case 220:
+                case 223:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
                     break;
-                case 145:
+                case 147:
                     if (isInConstructorArgumentInitializer(node, container)) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_constructor_arguments);
                     }
                     break;
-                case 142:
-                case 141:
-                    if (container.flags & 64) {
+                case 144:
+                case 143:
+                    if (container.flags & 32) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_static_property_initializer);
                     }
                     break;
-                case 137:
+                case 139:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_computed_property_name);
                     break;
             }
             if (needToCaptureLexicalThis) {
                 captureLexicalThis(node, container);
             }
-            if (ts.isClassLike(container.parent)) {
-                var symbol = getSymbolOfNode(container.parent);
-                return container.flags & 64 ? getTypeOfSymbol(symbol) : getDeclaredTypeOfSymbol(symbol).thisType;
-            }
-            if (ts.isInJavaScriptFile(node) && container.kind === 176) {
-                if (ts.getSpecialPropertyAssignmentKind(container.parent) === 3) {
-                    var className = container.parent
-                        .left
-                        .expression
-                        .expression;
-                    var classSymbol = checkExpression(className).symbol;
-                    if (classSymbol && classSymbol.members && (classSymbol.flags & 16)) {
-                        return getInferredClassType(classSymbol);
+            if (ts.isFunctionLike(container)) {
+                var type = getContextuallyTypedThisType(container);
+                if (type) {
+                    return type;
+                }
+                var signature = getSignatureFromDeclaration(container);
+                if (signature.thisType) {
+                    return signature.thisType;
+                }
+                if (container.parent && container.parent.kind === 170) {
+                    var type_1 = checkExpressionCached(container.parent);
+                    if (type_1) {
+                        return type_1;
                     }
                 }
             }
+            if (ts.isClassLike(container.parent)) {
+                var symbol = getSymbolOfNode(container.parent);
+                var type = container.flags & 32 ? getTypeOfSymbol(symbol) : getDeclaredTypeOfSymbol(symbol).thisType;
+                return getNarrowedTypeOfReference(type, node);
+            }
+            if (ts.isInJavaScriptFile(node)) {
+                var type = getTypeForThisExpressionFromJSDoc(container);
+                if (type && type !== unknownType) {
+                    return type;
+                }
+                if (container.kind === 178) {
+                    if (ts.getSpecialPropertyAssignmentKind(container.parent) === 3) {
+                        var className = container.parent
+                            .left
+                            .expression
+                            .expression;
+                        var classSymbol = checkExpression(className).symbol;
+                        if (classSymbol && classSymbol.members && (classSymbol.flags & 16)) {
+                            return getInferredClassType(classSymbol);
+                        }
+                    }
+                }
+            }
+            if (compilerOptions.noImplicitThis) {
+                error(node, ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation);
+            }
             return anyType;
         }
+        function getTypeForThisExpressionFromJSDoc(node) {
+            var typeTag = ts.getJSDocTypeTag(node);
+            if (typeTag && typeTag.typeExpression && typeTag.typeExpression.type && typeTag.typeExpression.type.kind === 268) {
+                var jsDocFunctionType = typeTag.typeExpression.type;
+                if (jsDocFunctionType.parameters.length > 0 && jsDocFunctionType.parameters[0].type.kind === 271) {
+                    return getTypeFromTypeNode(jsDocFunctionType.parameters[0].type);
+                }
+            }
+        }
         function isInConstructorArgumentInitializer(node, constructorDecl) {
             for (var n = node; n && n !== constructorDecl; n = n.parent) {
-                if (n.kind === 139) {
+                if (n.kind === 141) {
                     return true;
                 }
             }
             return false;
         }
         function checkSuperExpression(node) {
-            var isCallExpression = node.parent.kind === 171 && node.parent.expression === node;
+            var isCallExpression = node.parent.kind === 173 && node.parent.expression === node;
             var container = ts.getSuperContainer(node, true);
             var needToCaptureLexicalThis = false;
             if (!isCallExpression) {
-                while (container && container.kind === 177) {
+                while (container && container.kind === 179) {
                     container = ts.getSuperContainer(container, true);
                     needToCaptureLexicalThis = languageVersion < 2;
                 }
@@ -17705,16 +19270,16 @@ var ts;
             var nodeCheckFlag = 0;
             if (!canUseSuperExpression) {
                 var current = node;
-                while (current && current !== container && current.kind !== 137) {
+                while (current && current !== container && current.kind !== 139) {
                     current = current.parent;
                 }
-                if (current && current.kind === 137) {
+                if (current && current.kind === 139) {
                     error(node, ts.Diagnostics.super_cannot_be_referenced_in_a_computed_property_name);
                 }
                 else if (isCallExpression) {
                     error(node, ts.Diagnostics.Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors);
                 }
-                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 168)) {
+                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 170)) {
                     error(node, ts.Diagnostics.super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions);
                 }
                 else {
@@ -17722,17 +19287,25 @@ var ts;
                 }
                 return unknownType;
             }
-            if ((container.flags & 64) || isCallExpression) {
+            if ((container.flags & 32) || isCallExpression) {
                 nodeCheckFlag = 512;
             }
             else {
                 nodeCheckFlag = 256;
             }
             getNodeLinks(node).flags |= nodeCheckFlag;
+            if (container.kind === 146 && container.flags & 256) {
+                if (ts.isSuperPropertyOrElementAccess(node.parent) && isAssignmentTarget(node.parent)) {
+                    getNodeLinks(container).flags |= 4096;
+                }
+                else {
+                    getNodeLinks(container).flags |= 2048;
+                }
+            }
             if (needToCaptureLexicalThis) {
                 captureLexicalThis(node.parent, container);
             }
-            if (container.parent.kind === 168) {
+            if (container.parent.kind === 170) {
                 if (languageVersion < 2) {
                     error(node, ts.Diagnostics.super_is_only_allowed_in_members_of_object_literal_expressions_when_option_target_is_ES2015_or_higher);
                     return unknownType;
@@ -17750,7 +19323,7 @@ var ts;
                 }
                 return unknownType;
             }
-            if (container.kind === 145 && isInConstructorArgumentInitializer(node, container)) {
+            if (container.kind === 147 && isInConstructorArgumentInitializer(node, container)) {
                 error(node, ts.Diagnostics.super_cannot_be_referenced_in_constructor_arguments);
                 return unknownType;
             }
@@ -17762,30 +19335,41 @@ var ts;
                     return false;
                 }
                 if (isCallExpression) {
-                    return container.kind === 145;
+                    return container.kind === 147;
                 }
                 else {
-                    if (ts.isClassLike(container.parent) || container.parent.kind === 168) {
-                        if (container.flags & 64) {
-                            return container.kind === 144 ||
-                                container.kind === 143 ||
-                                container.kind === 146 ||
-                                container.kind === 147;
+                    if (ts.isClassLike(container.parent) || container.parent.kind === 170) {
+                        if (container.flags & 32) {
+                            return container.kind === 146 ||
+                                container.kind === 145 ||
+                                container.kind === 148 ||
+                                container.kind === 149;
                         }
                         else {
-                            return container.kind === 144 ||
+                            return container.kind === 146 ||
+                                container.kind === 145 ||
+                                container.kind === 148 ||
+                                container.kind === 149 ||
+                                container.kind === 144 ||
                                 container.kind === 143 ||
-                                container.kind === 146 ||
-                                container.kind === 147 ||
-                                container.kind === 142 ||
-                                container.kind === 141 ||
-                                container.kind === 145;
+                                container.kind === 147;
                         }
                     }
                 }
                 return false;
             }
         }
+        function getContextuallyTypedThisType(func) {
+            if ((isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) &&
+                isContextSensitive(func) &&
+                func.kind !== 179) {
+                var contextualSignature = getContextualSignature(func);
+                if (contextualSignature) {
+                    return contextualSignature.thisType;
+                }
+            }
+            return undefined;
+        }
         function getContextuallyTypedParameterType(parameter) {
             var func = parameter.parent;
             if (isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) {
@@ -17814,7 +19398,7 @@ var ts;
                 if (declaration.type) {
                     return getTypeFromTypeNode(declaration.type);
                 }
-                if (declaration.kind === 139) {
+                if (declaration.kind === 141) {
                     var type = getContextuallyTypedParameterType(declaration);
                     if (type) {
                         return type;
@@ -17823,6 +19407,18 @@ var ts;
                 if (ts.isBindingPattern(declaration.name)) {
                     return getTypeFromBindingPattern(declaration.name, true);
                 }
+                if (ts.isBindingPattern(declaration.parent)) {
+                    var parentDeclaration = declaration.parent.parent;
+                    var name_11 = declaration.propertyName || declaration.name;
+                    if (ts.isVariableLike(parentDeclaration) &&
+                        parentDeclaration.type &&
+                        !ts.isBindingPattern(name_11)) {
+                        var text = getTextOfPropertyName(name_11);
+                        if (text) {
+                            return getTypeOfPropertyOfType(getTypeFromTypeNode(parentDeclaration.type), text);
+                        }
+                    }
+                }
             }
             return undefined;
         }
@@ -17847,7 +19443,7 @@ var ts;
         }
         function isInParameterInitializerBeforeContainingFunction(node) {
             while (node.parent && !ts.isFunctionLike(node.parent)) {
-                if (node.parent.kind === 139 && node.parent.initializer === node) {
+                if (node.parent.kind === 141 && node.parent.initializer === node) {
                     return true;
                 }
                 node = node.parent;
@@ -17856,8 +19452,8 @@ var ts;
         }
         function getContextualReturnType(functionDecl) {
             if (functionDecl.type ||
-                functionDecl.kind === 145 ||
-                functionDecl.kind === 146 && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(functionDecl.symbol, 147))) {
+                functionDecl.kind === 147 ||
+                functionDecl.kind === 148 && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(functionDecl.symbol, 149))) {
                 return getReturnTypeOfSignature(getSignatureFromDeclaration(functionDecl));
             }
             var signature = getContextualSignatureForFunctionLikeDeclaration(functionDecl);
@@ -17876,7 +19472,7 @@ var ts;
             return undefined;
         }
         function getContextualTypeForSubstitutionExpression(template, substitutionExpression) {
-            if (template.parent.kind === 173) {
+            if (template.parent.kind === 175) {
                 return getContextualTypeForArgument(template.parent, substitutionExpression);
             }
             return undefined;
@@ -17942,9 +19538,6 @@ var ts;
         function contextualTypeIsTupleLikeType(type) {
             return !!(type.flags & 16384 ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type));
         }
-        function contextualTypeHasIndexSignature(type, kind) {
-            return !!(type.flags & 16384 ? ts.forEach(type.types, function (t) { return getIndexTypeOfStructuredType(t, kind); }) : getIndexTypeOfStructuredType(type, kind));
-        }
         function getContextualTypeForObjectLiteralMethod(node) {
             ts.Debug.assert(ts.isObjectLiteralMethod(node));
             if (isInsideWithStatementBody(node)) {
@@ -17987,13 +19580,13 @@ var ts;
             var kind = attribute.kind;
             var jsxElement = attribute.parent;
             var attrsType = getJsxElementAttributesType(jsxElement);
-            if (attribute.kind === 241) {
+            if (attribute.kind === 245) {
                 if (!attrsType || isTypeAny(attrsType)) {
                     return undefined;
                 }
                 return getTypeOfPropertyOfType(attrsType, attribute.name.text);
             }
-            else if (attribute.kind === 242) {
+            else if (attribute.kind === 246) {
                 return attrsType;
             }
             ts.Debug.fail("Expected JsxAttribute or JsxSpreadAttribute, got ts.SyntaxKind[" + kind + "]");
@@ -18011,40 +19604,40 @@ var ts;
             }
             var parent = node.parent;
             switch (parent.kind) {
-                case 214:
-                case 139:
-                case 142:
+                case 217:
                 case 141:
-                case 166:
+                case 144:
+                case 143:
+                case 168:
                     return getContextualTypeForInitializerExpression(node);
-                case 177:
-                case 207:
+                case 179:
+                case 210:
                     return getContextualTypeForReturnExpression(node);
-                case 187:
+                case 189:
                     return getContextualTypeForYieldOperand(parent);
-                case 171:
-                case 172:
-                    return getContextualTypeForArgument(parent, node);
+                case 173:
                 case 174:
-                case 192:
+                    return getContextualTypeForArgument(parent, node);
+                case 176:
+                case 194:
                     return getTypeFromTypeNode(parent.type);
-                case 184:
+                case 186:
                     return getContextualTypeForBinaryOperand(node);
-                case 248:
+                case 252:
                     return getContextualTypeForObjectLiteralElement(parent);
-                case 167:
+                case 169:
                     return getContextualTypeForElementExpression(node);
-                case 185:
+                case 187:
                     return getContextualTypeForConditionalOperand(node);
-                case 193:
-                    ts.Debug.assert(parent.parent.kind === 186);
+                case 196:
+                    ts.Debug.assert(parent.parent.kind === 188);
                     return getContextualTypeForSubstitutionExpression(parent.parent, node);
-                case 175:
+                case 177:
                     return getContextualType(parent);
-                case 243:
+                case 247:
                     return getContextualType(parent);
-                case 241:
-                case 242:
+                case 245:
+                case 246:
                     return getContextualTypeForJsxAttribute(parent);
             }
             return undefined;
@@ -18059,7 +19652,7 @@ var ts;
             }
         }
         function isFunctionExpressionOrArrowFunction(node) {
-            return node.kind === 176 || node.kind === 177;
+            return node.kind === 178 || node.kind === 179;
         }
         function getContextualSignatureForFunctionLikeDeclaration(node) {
             return isFunctionExpressionOrArrowFunction(node) || ts.isObjectLiteralMethod(node)
@@ -18067,7 +19660,7 @@ var ts;
                 : undefined;
         }
         function getContextualSignature(node) {
-            ts.Debug.assert(node.kind !== 144 || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 146 || ts.isObjectLiteralMethod(node));
             var type = ts.isObjectLiteralMethod(node)
                 ? getContextualTypeForObjectLiteralMethod(node)
                 : getApparentTypeOfContextualType(node);
@@ -18086,7 +19679,7 @@ var ts;
                     if (!signatureList) {
                         signatureList = [signature];
                     }
-                    else if (!compareSignaturesIdentical(signatureList[0], signature, false, true, compareTypesIdentical)) {
+                    else if (!compareSignaturesIdentical(signatureList[0], signature, false, true, true, compareTypesIdentical)) {
                         return undefined;
                     }
                     else {
@@ -18105,16 +19698,34 @@ var ts;
         function isInferentialContext(mapper) {
             return mapper && mapper.context;
         }
-        function isAssignmentTarget(node) {
+        function getAssignmentRoot(node) {
+            while (node.parent.kind === 177) {
+                node = node.parent;
+            }
+            while (true) {
+                if (node.parent.kind === 252) {
+                    node = node.parent.parent;
+                }
+                else if (node.parent.kind === 169) {
+                    node = node.parent;
+                }
+                else {
+                    break;
+                }
+            }
             var parent = node.parent;
-            if (parent.kind === 184 && parent.operatorToken.kind === 56 && parent.left === node) {
-                return true;
-            }
-            if (parent.kind === 248) {
-                return isAssignmentTarget(parent.parent);
-            }
-            if (parent.kind === 167) {
-                return isAssignmentTarget(parent);
+            return parent.kind === 186 &&
+                parent.operatorToken.kind === 56 &&
+                parent.left === node ? parent : undefined;
+        }
+        function isAssignmentTarget(node) {
+            return !!getAssignmentRoot(node);
+        }
+        function isCompoundAssignmentTarget(node) {
+            var parent = node.parent;
+            if (parent.kind === 186 && parent.left === node) {
+                var operator = parent.operatorToken.kind;
+                return operator >= 56 && operator <= 68;
             }
             return false;
         }
@@ -18123,8 +19734,8 @@ var ts;
             return checkIteratedTypeOrElementType(arrayOrIterableType, node.expression, false);
         }
         function hasDefaultValue(node) {
-            return (node.kind === 166 && !!node.initializer) ||
-                (node.kind === 184 && node.operatorToken.kind === 56);
+            return (node.kind === 168 && !!node.initializer) ||
+                (node.kind === 186 && node.operatorToken.kind === 56);
         }
         function checkArrayLiteral(node, contextualMapper) {
             var elements = node.elements;
@@ -18133,7 +19744,7 @@ var ts;
             var inDestructuringPattern = isAssignmentTarget(node);
             for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
                 var e = elements_1[_i];
-                if (inDestructuringPattern && e.kind === 188) {
+                if (inDestructuringPattern && e.kind === 190) {
                     var restArrayType = checkExpression(e.expression, contextualMapper);
                     var restElementType = getIndexTypeOfType(restArrayType, 1) ||
                         (languageVersion >= 2 ? getElementTypeOfIterable(restArrayType, undefined) : undefined);
@@ -18145,7 +19756,7 @@ var ts;
                     var type = checkExpression(e, contextualMapper);
                     elementTypes.push(type);
                 }
-                hasSpreadElement = hasSpreadElement || e.kind === 188;
+                hasSpreadElement = hasSpreadElement || e.kind === 190;
             }
             if (!hasSpreadElement) {
                 if (inDestructuringPattern && elementTypes.length) {
@@ -18156,7 +19767,7 @@ var ts;
                 var contextualType = getApparentTypeOfContextualType(node);
                 if (contextualType && contextualTypeIsTupleLikeType(contextualType)) {
                     var pattern = contextualType.pattern;
-                    if (pattern && (pattern.kind === 165 || pattern.kind === 167)) {
+                    if (pattern && (pattern.kind === 167 || pattern.kind === 169)) {
                         var patternElements = pattern.elements;
                         for (var i = elementTypes.length; i < patternElements.length; i++) {
                             var patternElement = patternElements[i];
@@ -18164,7 +19775,7 @@ var ts;
                                 elementTypes.push(contextualType.elementTypes[i]);
                             }
                             else {
-                                if (patternElement.kind !== 190) {
+                                if (patternElement.kind !== 192) {
                                     error(patternElement, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
                                 }
                                 elementTypes.push(unknownType);
@@ -18176,16 +19787,16 @@ var ts;
                     }
                 }
             }
-            return createArrayType(elementTypes.length ? getUnionType(elementTypes) : undefinedType);
+            return createArrayType(elementTypes.length ? getUnionType(elementTypes) : emptyArrayElementType);
         }
         function isNumericName(name) {
-            return name.kind === 137 ? isNumericComputedName(name) : isNumericLiteralName(name.text);
+            return name.kind === 139 ? isNumericComputedName(name) : isNumericLiteralName(name.text);
         }
         function isNumericComputedName(name) {
             return isTypeAnyOrAllConstituentTypesHaveKind(checkComputedPropertyName(name), 132);
         }
         function isTypeAnyOrAllConstituentTypesHaveKind(type, kind) {
-            return isTypeAny(type) || allConstituentTypesHaveKind(type, kind);
+            return isTypeAny(type) || isTypeOfKind(type, kind);
         }
         function isNumericLiteralName(name) {
             return (+name).toString() === name;
@@ -18203,6 +19814,16 @@ var ts;
             }
             return links.resolvedType;
         }
+        function getObjectLiteralIndexInfo(node, properties, kind) {
+            var propTypes = [];
+            for (var i = 0; i < properties.length; i++) {
+                if (kind === 0 || isNumericName(node.properties[i].name)) {
+                    propTypes.push(getTypeOfSymbol(properties[i]));
+                }
+            }
+            var unionType = propTypes.length ? getUnionType(propTypes) : undefinedType;
+            return createIndexInfo(unionType, false);
+        }
         function checkObjectLiteral(node, contextualMapper) {
             var inDestructuringPattern = isAssignmentTarget(node);
             checkGrammarObjectLiteralExpression(node, inDestructuringPattern);
@@ -18210,31 +19831,33 @@ var ts;
             var propertiesArray = [];
             var contextualType = getApparentTypeOfContextualType(node);
             var contextualTypeHasPattern = contextualType && contextualType.pattern &&
-                (contextualType.pattern.kind === 164 || contextualType.pattern.kind === 168);
+                (contextualType.pattern.kind === 166 || contextualType.pattern.kind === 170);
             var typeFlags = 0;
             var patternWithComputedProperties = false;
+            var hasComputedStringProperty = false;
+            var hasComputedNumberProperty = false;
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var memberDecl = _a[_i];
                 var member = memberDecl.symbol;
-                if (memberDecl.kind === 248 ||
-                    memberDecl.kind === 249 ||
+                if (memberDecl.kind === 252 ||
+                    memberDecl.kind === 253 ||
                     ts.isObjectLiteralMethod(memberDecl)) {
                     var type = void 0;
-                    if (memberDecl.kind === 248) {
+                    if (memberDecl.kind === 252) {
                         type = checkPropertyAssignment(memberDecl, contextualMapper);
                     }
-                    else if (memberDecl.kind === 144) {
+                    else if (memberDecl.kind === 146) {
                         type = checkObjectLiteralMethod(memberDecl, contextualMapper);
                     }
                     else {
-                        ts.Debug.assert(memberDecl.kind === 249);
+                        ts.Debug.assert(memberDecl.kind === 253);
                         type = checkExpression(memberDecl.name, contextualMapper);
                     }
                     typeFlags |= type.flags;
                     var prop = createSymbol(4 | 67108864 | member.flags, member.name);
                     if (inDestructuringPattern) {
-                        var isOptional = (memberDecl.kind === 248 && hasDefaultValue(memberDecl.initializer)) ||
-                            (memberDecl.kind === 249 && memberDecl.objectAssignmentInitializer);
+                        var isOptional = (memberDecl.kind === 252 && hasDefaultValue(memberDecl.initializer)) ||
+                            (memberDecl.kind === 253 && memberDecl.objectAssignmentInitializer);
                         if (isOptional) {
                             prop.flags |= 536870912;
                         }
@@ -18261,10 +19884,18 @@ var ts;
                     member = prop;
                 }
                 else {
-                    ts.Debug.assert(memberDecl.kind === 146 || memberDecl.kind === 147);
+                    ts.Debug.assert(memberDecl.kind === 148 || memberDecl.kind === 149);
                     checkAccessorDeclaration(memberDecl);
                 }
-                if (!ts.hasDynamicName(memberDecl)) {
+                if (ts.hasDynamicName(memberDecl)) {
+                    if (isNumericName(memberDecl.name)) {
+                        hasComputedNumberProperty = true;
+                    }
+                    else {
+                        hasComputedStringProperty = true;
+                    }
+                }
+                else {
                     propertiesTable[member.name] = member;
                 }
                 propertiesArray.push(member);
@@ -18281,33 +19912,15 @@ var ts;
                     }
                 }
             }
-            var stringIndexType = getIndexType(0);
-            var numberIndexType = getIndexType(1);
-            var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexType, numberIndexType);
+            var stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 0) : undefined;
+            var numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 1) : undefined;
+            var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
             var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 1048576;
             result.flags |= 524288 | 4194304 | freshObjectLiteralFlag | (typeFlags & 14680064) | (patternWithComputedProperties ? 67108864 : 0);
             if (inDestructuringPattern) {
                 result.pattern = node;
             }
             return result;
-            function getIndexType(kind) {
-                if (contextualType && contextualTypeHasIndexSignature(contextualType, kind)) {
-                    var propTypes = [];
-                    for (var i = 0; i < propertiesArray.length; i++) {
-                        var propertyDecl = node.properties[i];
-                        if (kind === 0 || isNumericName(propertyDecl.name)) {
-                            var type = getTypeOfSymbol(propertiesArray[i]);
-                            if (!ts.contains(propTypes, type)) {
-                                propTypes.push(type);
-                            }
-                        }
-                    }
-                    var result_1 = propTypes.length ? getUnionType(propTypes) : undefinedType;
-                    typeFlags |= result_1.flags;
-                    return result_1;
-                }
-                return undefined;
-            }
         }
         function checkJsxSelfClosingElement(node) {
             checkJsxOpeningLikeElement(node);
@@ -18315,17 +19928,22 @@ var ts;
         }
         function checkJsxElement(node) {
             checkJsxOpeningLikeElement(node.openingElement);
-            getJsxElementTagSymbol(node.closingElement);
+            if (isJsxIntrinsicIdentifier(node.closingElement.tagName)) {
+                getIntrinsicTagSymbol(node.closingElement);
+            }
+            else {
+                checkExpression(node.closingElement.tagName);
+            }
             for (var _i = 0, _a = node.children; _i < _a.length; _i++) {
                 var child = _a[_i];
                 switch (child.kind) {
-                    case 243:
+                    case 247:
                         checkJsxExpression(child);
                         break;
-                    case 236:
+                    case 240:
                         checkJsxElement(child);
                         break;
-                    case 237:
+                    case 241:
                         checkJsxSelfClosingElement(child);
                         break;
                 }
@@ -18336,7 +19954,7 @@ var ts;
             return name.indexOf("-") < 0;
         }
         function isJsxIntrinsicIdentifier(tagName) {
-            if (tagName.kind === 136) {
+            if (tagName.kind === 138) {
                 return false;
             }
             else {
@@ -18399,68 +20017,35 @@ var ts;
             }
             return jsxTypes[name];
         }
-        function getJsxElementTagSymbol(node) {
+        function getIntrinsicTagSymbol(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedSymbol) {
-                if (isJsxIntrinsicIdentifier(node.tagName)) {
-                    links.resolvedSymbol = lookupIntrinsicTag(node);
-                }
-                else {
-                    links.resolvedSymbol = lookupClassTag(node);
-                }
-            }
-            return links.resolvedSymbol;
-            function lookupIntrinsicTag(node) {
                 var intrinsicElementsType = getJsxType(JsxNames.IntrinsicElements);
                 if (intrinsicElementsType !== unknownType) {
                     var intrinsicProp = getPropertyOfType(intrinsicElementsType, node.tagName.text);
                     if (intrinsicProp) {
                         links.jsxFlags |= 1;
-                        return intrinsicProp;
+                        return links.resolvedSymbol = intrinsicProp;
                     }
                     var indexSignatureType = getIndexTypeOfType(intrinsicElementsType, 0);
                     if (indexSignatureType) {
                         links.jsxFlags |= 2;
-                        return intrinsicElementsType.symbol;
+                        return links.resolvedSymbol = intrinsicElementsType.symbol;
                     }
                     error(node, ts.Diagnostics.Property_0_does_not_exist_on_type_1, node.tagName.text, "JSX." + JsxNames.IntrinsicElements);
-                    return unknownSymbol;
+                    return links.resolvedSymbol = unknownSymbol;
                 }
                 else {
                     if (compilerOptions.noImplicitAny) {
                         error(node, ts.Diagnostics.JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists, JsxNames.IntrinsicElements);
                     }
-                    return unknownSymbol;
-                }
-            }
-            function lookupClassTag(node) {
-                var valueSymbol = resolveJsxTagName(node);
-                if (valueSymbol && valueSymbol !== unknownSymbol) {
-                    links.jsxFlags |= 4;
-                    if (valueSymbol.flags & 8388608) {
-                        markAliasSymbolAsReferenced(valueSymbol);
-                    }
-                }
-                return valueSymbol || unknownSymbol;
-            }
-            function resolveJsxTagName(node) {
-                if (node.tagName.kind === 69) {
-                    var tag = node.tagName;
-                    var sym = getResolvedSymbol(tag);
-                    return sym.exportSymbol || sym;
-                }
-                else {
-                    return checkQualifiedName(node.tagName).symbol;
+                    return links.resolvedSymbol = unknownSymbol;
                 }
             }
+            return links.resolvedSymbol;
         }
         function getJsxElementInstanceType(node) {
-            ts.Debug.assert(!!(getNodeLinks(node).jsxFlags & 4), "Should not call getJsxElementInstanceType on non-class Element");
-            var classSymbol = getJsxElementTagSymbol(node);
-            if (classSymbol === unknownSymbol) {
-                return anyType;
-            }
-            var valueType = getTypeOfSymbol(classSymbol);
+            var valueType = checkExpression(node.tagName);
             if (isTypeAny(valueType)) {
                 return anyType;
             }
@@ -18498,22 +20083,32 @@ var ts;
         function getJsxElementAttributesType(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedJsxType) {
-                var sym = getJsxElementTagSymbol(node);
-                if (links.jsxFlags & 4) {
+                if (isJsxIntrinsicIdentifier(node.tagName)) {
+                    var symbol = getIntrinsicTagSymbol(node);
+                    if (links.jsxFlags & 1) {
+                        return links.resolvedJsxType = getTypeOfSymbol(symbol);
+                    }
+                    else if (links.jsxFlags & 2) {
+                        return links.resolvedJsxType = getIndexInfoOfSymbol(symbol, 0).type;
+                    }
+                }
+                else {
                     var elemInstanceType = getJsxElementInstanceType(node);
                     var elemClassType = getJsxGlobalElementClassType();
                     if (!elemClassType || !isTypeAssignableTo(elemInstanceType, elemClassType)) {
-                        var elemType = getTypeOfSymbol(sym);
-                        var callSignatures = elemType && getSignaturesOfType(elemType, 0);
-                        var callSignature = callSignatures && callSignatures.length > 0 && callSignatures[0];
-                        var callReturnType = callSignature && getReturnTypeOfSignature(callSignature);
-                        var paramType = callReturnType && (callSignature.parameters.length === 0 ? emptyObjectType : getTypeOfSymbol(callSignature.parameters[0]));
-                        if (callReturnType && isTypeAssignableTo(callReturnType, jsxElementType)) {
-                            var intrinsicAttributes = getJsxType(JsxNames.IntrinsicAttributes);
-                            if (intrinsicAttributes !== unknownType) {
-                                paramType = intersectTypes(intrinsicAttributes, paramType);
+                        if (jsxElementType) {
+                            var elemType = checkExpression(node.tagName);
+                            var callSignatures = elemType && getSignaturesOfType(elemType, 0);
+                            var callSignature = callSignatures && callSignatures.length > 0 && callSignatures[0];
+                            var callReturnType = callSignature && getReturnTypeOfSignature(callSignature);
+                            var paramType = callReturnType && (callSignature.parameters.length === 0 ? emptyObjectType : getTypeOfSymbol(callSignature.parameters[0]));
+                            if (callReturnType && isTypeAssignableTo(callReturnType, jsxElementType)) {
+                                var intrinsicAttributes = getJsxType(JsxNames.IntrinsicAttributes);
+                                if (intrinsicAttributes !== unknownType) {
+                                    paramType = intersectTypes(intrinsicAttributes, paramType);
+                                }
+                                return links.resolvedJsxType = paramType;
                             }
-                            return links.resolvedJsxType = paramType;
                         }
                     }
                     if (elemClassType) {
@@ -18563,15 +20158,7 @@ var ts;
                         }
                     }
                 }
-                else if (links.jsxFlags & 1) {
-                    return links.resolvedJsxType = getTypeOfSymbol(sym);
-                }
-                else if (links.jsxFlags & 2) {
-                    return links.resolvedJsxType = getIndexTypeOfSymbol(sym, 0);
-                }
-                else {
-                    return links.resolvedJsxType = anyType;
-                }
+                return links.resolvedJsxType = unknownType;
             }
             return links.resolvedJsxType;
         }
@@ -18613,11 +20200,11 @@ var ts;
             var nameTable = {};
             var sawSpreadedAny = false;
             for (var i = node.attributes.length - 1; i >= 0; i--) {
-                if (node.attributes[i].kind === 241) {
+                if (node.attributes[i].kind === 245) {
                     checkJsxAttribute((node.attributes[i]), targetAttributesType, nameTable);
                 }
                 else {
-                    ts.Debug.assert(node.attributes[i].kind === 242);
+                    ts.Debug.assert(node.attributes[i].kind === 246);
                     var spreadType = checkJsxSpreadAttribute((node.attributes[i]), targetAttributesType, nameTable);
                     if (isTypeAny(spreadType)) {
                         sawSpreadedAny = true;
@@ -18643,19 +20230,19 @@ var ts;
             }
         }
         function getDeclarationKindFromSymbol(s) {
-            return s.valueDeclaration ? s.valueDeclaration.kind : 142;
+            return s.valueDeclaration ? s.valueDeclaration.kind : 144;
         }
         function getDeclarationFlagsFromSymbol(s) {
-            return s.valueDeclaration ? ts.getCombinedNodeFlags(s.valueDeclaration) : s.flags & 134217728 ? 8 | 64 : 0;
+            return s.valueDeclaration ? ts.getCombinedNodeFlags(s.valueDeclaration) : s.flags & 134217728 ? 4 | 32 : 0;
         }
         function checkClassPropertyAccess(node, left, type, prop) {
             var flags = getDeclarationFlagsFromSymbol(prop);
-            var declaringClass = getDeclaredTypeOfSymbol(prop.parent);
+            var declaringClass = getDeclaredTypeOfSymbol(getParentOfSymbol(prop));
+            var errorNode = node.kind === 171 || node.kind === 217 ?
+                node.name :
+                node.right;
             if (left.kind === 95) {
-                var errorNode = node.kind === 169 ?
-                    node.name :
-                    node.right;
-                if (languageVersion < 2 && getDeclarationKindFromSymbol(prop) !== 144) {
+                if (languageVersion < 2 && getDeclarationKindFromSymbol(prop) !== 146) {
                     error(errorNode, ts.Diagnostics.Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword);
                     return false;
                 }
@@ -18664,14 +20251,13 @@ var ts;
                     return false;
                 }
             }
-            if (!(flags & (16 | 32))) {
+            if (!(flags & (8 | 16))) {
                 return true;
             }
-            var enclosingClassDeclaration = ts.getContainingClass(node);
-            var enclosingClass = enclosingClassDeclaration ? getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingClassDeclaration)) : undefined;
-            if (flags & 16) {
-                if (declaringClass !== enclosingClass) {
-                    error(node, ts.Diagnostics.Property_0_is_private_and_only_accessible_within_class_1, symbolToString(prop), typeToString(declaringClass));
+            if (flags & 8) {
+                var declaringClassDeclaration = getClassLikeDeclarationOfSymbol(getParentOfSymbol(prop));
+                if (!isNodeWithinClass(node, declaringClassDeclaration)) {
+                    error(errorNode, ts.Diagnostics.Property_0_is_private_and_only_accessible_within_class_1, symbolToString(prop), typeToString(declaringClass));
                     return false;
                 }
                 return true;
@@ -18679,22 +20265,34 @@ var ts;
             if (left.kind === 95) {
                 return true;
             }
-            if (!enclosingClass || !hasBaseType(enclosingClass, declaringClass)) {
-                error(node, ts.Diagnostics.Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses, symbolToString(prop), typeToString(declaringClass));
+            var enclosingClass = forEachEnclosingClass(node, function (enclosingDeclaration) {
+                var enclosingClass = getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingDeclaration));
+                return hasBaseType(enclosingClass, declaringClass) ? enclosingClass : undefined;
+            });
+            if (!enclosingClass) {
+                error(errorNode, ts.Diagnostics.Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses, symbolToString(prop), typeToString(declaringClass));
                 return false;
             }
-            if (flags & 64) {
+            if (flags & 32) {
                 return true;
             }
             if (type.flags & 33554432) {
                 type = getConstraintOfTypeParameter(type);
             }
             if (!(getTargetType(type).flags & (1024 | 2048) && hasBaseType(type, enclosingClass))) {
-                error(node, ts.Diagnostics.Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1, symbolToString(prop), typeToString(enclosingClass));
+                error(errorNode, ts.Diagnostics.Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1, symbolToString(prop), typeToString(enclosingClass));
                 return false;
             }
             return true;
         }
+        function checkNonNullExpression(node) {
+            var type = checkExpression(node);
+            if (strictNullChecks && getNullableKind(type)) {
+                error(node, ts.Diagnostics.Object_is_possibly_null_or_undefined);
+                return getNonNullableType(type);
+            }
+            return type;
+        }
         function checkPropertyAccessExpression(node) {
             return checkPropertyAccessExpressionOrQualifiedName(node, node.expression, node.name);
         }
@@ -18702,7 +20300,7 @@ var ts;
             return checkPropertyAccessExpressionOrQualifiedName(node, node.left, node.right);
         }
         function checkPropertyAccessExpressionOrQualifiedName(node, left, right) {
-            var type = checkExpression(left);
+            var type = checkNonNullExpression(left);
             if (isTypeAny(type)) {
                 return type;
             }
@@ -18721,10 +20319,12 @@ var ts;
             if (prop.parent && prop.parent.flags & 32) {
                 checkClassPropertyAccess(node, left, apparentType, prop);
             }
-            return getTypeOfSymbol(prop);
+            var propType = getTypeOfSymbol(prop);
+            return node.kind === 171 && prop.flags & 4 ?
+                getNarrowedTypeOfReference(propType, node) : propType;
         }
         function isValidPropertyAccess(node, propertyName) {
-            var left = node.kind === 169
+            var left = node.kind === 171
                 ? node.expression
                 : node.left;
             var type = checkExpression(left);
@@ -18738,7 +20338,7 @@ var ts;
         }
         function getForInVariableSymbol(node) {
             var initializer = node.initializer;
-            if (initializer.kind === 215) {
+            if (initializer.kind === 218) {
                 var variable = initializer.declarations[0];
                 if (variable && !ts.isBindingPattern(variable.name)) {
                     return getSymbolOfNode(variable);
@@ -18760,7 +20360,7 @@ var ts;
                     var child = expr;
                     var node = expr.parent;
                     while (node) {
-                        if (node.kind === 203 &&
+                        if (node.kind === 206 &&
                             child === node.statement &&
                             getForInVariableSymbol(node) === symbol &&
                             hasNumericPropertyNames(checkExpression(node.expression))) {
@@ -18776,7 +20376,7 @@ var ts;
         function checkIndexedAccess(node) {
             if (!node.argumentExpression) {
                 var sourceFile = ts.getSourceFileOfNode(node);
-                if (node.parent.kind === 172 && node.parent.expression === node) {
+                if (node.parent.kind === 174 && node.parent.expression === node) {
                     var start = ts.skipTrivia(sourceFile.text, node.expression.end);
                     var end = node.end;
                     grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead);
@@ -18787,7 +20387,7 @@ var ts;
                     grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.Expression_expected);
                 }
             }
-            var objectType = getApparentType(checkExpression(node.expression));
+            var objectType = getApparentType(checkNonNullExpression(node.expression));
             var indexType = node.argumentExpression ? checkExpression(node.argumentExpression) : unknownType;
             if (objectType === unknownType) {
                 return unknownType;
@@ -18799,29 +20399,31 @@ var ts;
                 return unknownType;
             }
             if (node.argumentExpression) {
-                var name_11 = getPropertyNameForIndexedAccess(node.argumentExpression, indexType);
-                if (name_11 !== undefined) {
-                    var prop = getPropertyOfType(objectType, name_11);
+                var name_12 = getPropertyNameForIndexedAccess(node.argumentExpression, indexType);
+                if (name_12 !== undefined) {
+                    var prop = getPropertyOfType(objectType, name_12);
                     if (prop) {
                         getNodeLinks(node).resolvedSymbol = prop;
                         return getTypeOfSymbol(prop);
                     }
                     else if (isConstEnum) {
-                        error(node.argumentExpression, ts.Diagnostics.Property_0_does_not_exist_on_const_enum_1, name_11, symbolToString(objectType.symbol));
+                        error(node.argumentExpression, ts.Diagnostics.Property_0_does_not_exist_on_const_enum_1, name_12, symbolToString(objectType.symbol));
                         return unknownType;
                     }
                 }
             }
             if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, 258 | 132 | 16777216)) {
                 if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, 132) || isForInVariableForNumericPropertyNames(node.argumentExpression)) {
-                    var numberIndexType = getIndexTypeOfType(objectType, 1);
-                    if (numberIndexType) {
-                        return numberIndexType;
+                    var numberIndexInfo = getIndexInfoOfType(objectType, 1);
+                    if (numberIndexInfo) {
+                        getNodeLinks(node).resolvedIndexInfo = numberIndexInfo;
+                        return numberIndexInfo.type;
                     }
                 }
-                var stringIndexType = getIndexTypeOfType(objectType, 0);
-                if (stringIndexType) {
-                    return stringIndexType;
+                var stringIndexInfo = getIndexInfoOfType(objectType, 0);
+                if (stringIndexInfo) {
+                    getNodeLinks(node).resolvedIndexInfo = stringIndexInfo;
+                    return stringIndexInfo.type;
                 }
                 if (compilerOptions.noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors && !isTypeAny(objectType)) {
                     error(node, getIndexTypeOfType(objectType, 1) ?
@@ -18837,7 +20439,7 @@ var ts;
             if (indexArgumentExpression.kind === 9 || indexArgumentExpression.kind === 8) {
                 return indexArgumentExpression.text;
             }
-            if (indexArgumentExpression.kind === 170 || indexArgumentExpression.kind === 169) {
+            if (indexArgumentExpression.kind === 172 || indexArgumentExpression.kind === 171) {
                 var value = getConstantValue(indexArgumentExpression);
                 if (value !== undefined) {
                     return value.toString();
@@ -18880,10 +20482,10 @@ var ts;
             return true;
         }
         function resolveUntypedCall(node) {
-            if (node.kind === 173) {
+            if (node.kind === 175) {
                 checkExpression(node.template);
             }
-            else if (node.kind !== 140) {
+            else if (node.kind !== 142) {
                 ts.forEach(node.arguments, function (argument) {
                     checkExpression(argument);
                 });
@@ -18905,19 +20507,19 @@ var ts;
             for (var _i = 0, signatures_2 = signatures; _i < signatures_2.length; _i++) {
                 var signature = signatures_2[_i];
                 var symbol = signature.declaration && getSymbolOfNode(signature.declaration);
-                var parent_5 = signature.declaration && signature.declaration.parent;
+                var parent_7 = signature.declaration && signature.declaration.parent;
                 if (!lastSymbol || symbol === lastSymbol) {
-                    if (lastParent && parent_5 === lastParent) {
+                    if (lastParent && parent_7 === lastParent) {
                         index++;
                     }
                     else {
-                        lastParent = parent_5;
+                        lastParent = parent_7;
                         index = cutoffIndex;
                     }
                 }
                 else {
                     index = cutoffIndex = result.length;
-                    lastParent = parent_5;
+                    lastParent = parent_7;
                 }
                 lastSymbol = symbol;
                 if (signature.hasStringLiterals) {
@@ -18934,7 +20536,7 @@ var ts;
         function getSpreadArgumentIndex(args) {
             for (var i = 0; i < args.length; i++) {
                 var arg = args[i];
-                if (arg && arg.kind === 188) {
+                if (arg && arg.kind === 190) {
                     return i;
                 }
             }
@@ -18946,11 +20548,11 @@ var ts;
             var callIsIncomplete;
             var isDecorator;
             var spreadArgIndex = -1;
-            if (node.kind === 173) {
+            if (node.kind === 175) {
                 var tagExpression = node;
                 adjustedArgCount = args.length;
                 typeArguments = undefined;
-                if (tagExpression.template.kind === 186) {
+                if (tagExpression.template.kind === 188) {
                     var templateExpression = tagExpression.template;
                     var lastSpan = ts.lastOrUndefined(templateExpression.templateSpans);
                     ts.Debug.assert(lastSpan !== undefined);
@@ -18962,7 +20564,7 @@ var ts;
                     callIsIncomplete = !!templateLiteral.isUnterminated;
                 }
             }
-            else if (node.kind === 140) {
+            else if (node.kind === 142) {
                 isDecorator = true;
                 typeArguments = undefined;
                 adjustedArgCount = getEffectiveArgumentCount(node, undefined, signature);
@@ -18970,7 +20572,7 @@ var ts;
             else {
                 var callExpression = node;
                 if (!callExpression.arguments) {
-                    ts.Debug.assert(callExpression.kind === 172);
+                    ts.Debug.assert(callExpression.kind === 174);
                     return signature.minArgumentCount === 0;
                 }
                 adjustedArgCount = callExpression.arguments.hasTrailingComma ? args.length + 1 : args.length;
@@ -18996,7 +20598,7 @@ var ts;
             if (type.flags & 80896) {
                 var resolved = resolveStructuredTypeMembers(type);
                 if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 &&
-                    resolved.properties.length === 0 && !resolved.stringIndexType && !resolved.numberIndexType) {
+                    resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
                     return resolved.callSignatures[0];
                 }
             }
@@ -19020,10 +20622,15 @@ var ts;
             if (context.failedTypeParameterIndex !== undefined && !context.inferences[context.failedTypeParameterIndex].isFixed) {
                 context.failedTypeParameterIndex = undefined;
             }
+            if (signature.thisType) {
+                var thisArgumentNode = getThisArgumentOfCall(node);
+                var thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
+                inferTypes(context, thisArgumentType, signature.thisType);
+            }
             var argCount = getEffectiveArgumentCount(node, args, signature);
             for (var i = 0; i < argCount; i++) {
                 var arg = getEffectiveArgument(node, args, i);
-                if (arg === undefined || arg.kind !== 190) {
+                if (arg === undefined || arg.kind !== 192) {
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = getEffectiveArgumentType(node, i, arg);
                     if (argType === undefined) {
@@ -19069,10 +20676,20 @@ var ts;
             return typeArgumentsAreAssignable;
         }
         function checkApplicableSignature(node, args, signature, relation, excludeArgument, reportErrors) {
+            if (signature.thisType && signature.thisType !== voidType && node.kind !== 174) {
+                var thisArgumentNode = getThisArgumentOfCall(node);
+                var thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
+                var errorNode = reportErrors ? (thisArgumentNode || node) : undefined;
+                var headMessage_1 = ts.Diagnostics.The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1;
+                if (!checkTypeRelatedTo(thisArgumentType, signature.thisType, relation, errorNode, headMessage_1)) {
+                    return false;
+                }
+            }
+            var headMessage = ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1;
             var argCount = getEffectiveArgumentCount(node, args, signature);
             for (var i = 0; i < argCount; i++) {
                 var arg = getEffectiveArgument(node, args, i);
-                if (arg === undefined || arg.kind !== 190) {
+                if (arg === undefined || arg.kind !== 192) {
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = getEffectiveArgumentType(node, i, arg);
                     if (argType === undefined) {
@@ -19081,7 +20698,6 @@ var ts;
                             : checkExpressionWithContextualType(arg, paramType, excludeArgument && excludeArgument[i] ? identityMapper : undefined);
                     }
                     var errorNode = reportErrors ? getEffectiveArgumentErrorNode(node, i, arg) : undefined;
-                    var headMessage = ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1;
                     if (!checkTypeRelatedTo(argType, paramType, relation, errorNode, headMessage)) {
                         return false;
                     }
@@ -19089,18 +20705,29 @@ var ts;
             }
             return true;
         }
+        function getThisArgumentOfCall(node) {
+            if (node.kind === 173) {
+                var callee = node.expression;
+                if (callee.kind === 171) {
+                    return callee.expression;
+                }
+                else if (callee.kind === 172) {
+                    return callee.expression;
+                }
+            }
+        }
         function getEffectiveCallArguments(node) {
             var args;
-            if (node.kind === 173) {
+            if (node.kind === 175) {
                 var template = node.template;
                 args = [undefined];
-                if (template.kind === 186) {
+                if (template.kind === 188) {
                     ts.forEach(template.templateSpans, function (span) {
                         args.push(span.expression);
                     });
                 }
             }
-            else if (node.kind === 140) {
+            else if (node.kind === 142) {
                 return undefined;
             }
             else {
@@ -19109,21 +20736,21 @@ var ts;
             return args;
         }
         function getEffectiveArgumentCount(node, args, signature) {
-            if (node.kind === 140) {
+            if (node.kind === 142) {
                 switch (node.parent.kind) {
-                    case 217:
-                    case 189:
+                    case 220:
+                    case 191:
                         return 1;
-                    case 142:
-                        return 2;
                     case 144:
+                        return 2;
                     case 146:
-                    case 147:
+                    case 148:
+                    case 149:
                         if (languageVersion === 0) {
                             return 2;
                         }
                         return signature.parameters.length >= 3 ? 3 : 2;
-                    case 139:
+                    case 141:
                         return 3;
                 }
             }
@@ -19132,50 +20759,50 @@ var ts;
             }
         }
         function getEffectiveDecoratorFirstArgumentType(node) {
-            if (node.kind === 217) {
+            if (node.kind === 220) {
                 var classSymbol = getSymbolOfNode(node);
                 return getTypeOfSymbol(classSymbol);
             }
-            if (node.kind === 139) {
+            if (node.kind === 141) {
                 node = node.parent;
-                if (node.kind === 145) {
+                if (node.kind === 147) {
                     var classSymbol = getSymbolOfNode(node);
                     return getTypeOfSymbol(classSymbol);
                 }
             }
-            if (node.kind === 142 ||
-                node.kind === 144 ||
+            if (node.kind === 144 ||
                 node.kind === 146 ||
-                node.kind === 147) {
+                node.kind === 148 ||
+                node.kind === 149) {
                 return getParentTypeOfClassElement(node);
             }
             ts.Debug.fail("Unsupported decorator target.");
             return unknownType;
         }
         function getEffectiveDecoratorSecondArgumentType(node) {
-            if (node.kind === 217) {
+            if (node.kind === 220) {
                 ts.Debug.fail("Class decorators should not have a second synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 139) {
+            if (node.kind === 141) {
                 node = node.parent;
-                if (node.kind === 145) {
+                if (node.kind === 147) {
                     return anyType;
                 }
             }
-            if (node.kind === 142 ||
-                node.kind === 144 ||
+            if (node.kind === 144 ||
                 node.kind === 146 ||
-                node.kind === 147) {
+                node.kind === 148 ||
+                node.kind === 149) {
                 var element = node;
                 switch (element.name.kind) {
                     case 69:
                     case 8:
                     case 9:
                         return getStringLiteralTypeForText(element.name.text);
-                    case 137:
+                    case 139:
                         var nameType = checkComputedPropertyName(element.name);
-                        if (allConstituentTypesHaveKind(nameType, 16777216)) {
+                        if (isTypeOfKind(nameType, 16777216)) {
                             return nameType;
                         }
                         else {
@@ -19190,20 +20817,20 @@ var ts;
             return unknownType;
         }
         function getEffectiveDecoratorThirdArgumentType(node) {
-            if (node.kind === 217) {
+            if (node.kind === 220) {
                 ts.Debug.fail("Class decorators should not have a third synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 139) {
+            if (node.kind === 141) {
                 return numberType;
             }
-            if (node.kind === 142) {
+            if (node.kind === 144) {
                 ts.Debug.fail("Property decorators should not have a third synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 144 ||
-                node.kind === 146 ||
-                node.kind === 147) {
+            if (node.kind === 146 ||
+                node.kind === 148 ||
+                node.kind === 149) {
                 var propertyType = getTypeOfNode(node);
                 return createTypedPropertyDescriptorType(propertyType);
             }
@@ -19224,26 +20851,26 @@ var ts;
             return unknownType;
         }
         function getEffectiveArgumentType(node, argIndex, arg) {
-            if (node.kind === 140) {
+            if (node.kind === 142) {
                 return getEffectiveDecoratorArgumentType(node, argIndex);
             }
-            else if (argIndex === 0 && node.kind === 173) {
-                return globalTemplateStringsArrayType;
+            else if (argIndex === 0 && node.kind === 175) {
+                return getGlobalTemplateStringsArrayType();
             }
             return undefined;
         }
         function getEffectiveArgument(node, args, argIndex) {
-            if (node.kind === 140 ||
-                (argIndex === 0 && node.kind === 173)) {
+            if (node.kind === 142 ||
+                (argIndex === 0 && node.kind === 175)) {
                 return undefined;
             }
             return args[argIndex];
         }
         function getEffectiveArgumentErrorNode(node, argIndex, arg) {
-            if (node.kind === 140) {
+            if (node.kind === 142) {
                 return node.expression;
             }
-            else if (argIndex === 0 && node.kind === 173) {
+            else if (argIndex === 0 && node.kind === 175) {
                 return node.template;
             }
             else {
@@ -19251,8 +20878,8 @@ var ts;
             }
         }
         function resolveCall(node, signatures, candidatesOutArray, headMessage) {
-            var isTaggedTemplate = node.kind === 173;
-            var isDecorator = node.kind === 140;
+            var isTaggedTemplate = node.kind === 175;
+            var isDecorator = node.kind === 142;
             var typeArguments;
             if (!isTaggedTemplate && !isDecorator) {
                 typeArguments = node.typeArguments;
@@ -19299,8 +20926,8 @@ var ts;
             }
             else if (candidateForTypeArgumentError) {
                 if (!isTaggedTemplate && !isDecorator && typeArguments) {
-                    var typeArguments_1 = node.typeArguments;
-                    checkTypeArguments(candidateForTypeArgumentError, typeArguments_1, ts.map(typeArguments_1, getTypeFromTypeNode), true, headMessage);
+                    var typeArguments_2 = node.typeArguments;
+                    checkTypeArguments(candidateForTypeArgumentError, typeArguments_2, ts.map(typeArguments_2, getTypeFromTypeNode), true, headMessage);
                 }
                 else {
                     ts.Debug.assert(resultOfFailedInference.failedTypeParameterIndex >= 0);
@@ -19399,12 +21026,14 @@ var ts;
                 var superType = checkSuperExpression(node.expression);
                 if (superType !== unknownType) {
                     var baseTypeNode = ts.getClassExtendsHeritageClauseElement(ts.getContainingClass(node));
-                    var baseConstructors = getInstantiatedConstructorsForTypeArguments(superType, baseTypeNode.typeArguments);
-                    return resolveCall(node, baseConstructors, candidatesOutArray);
+                    if (baseTypeNode) {
+                        var baseConstructors = getInstantiatedConstructorsForTypeArguments(superType, baseTypeNode.typeArguments);
+                        return resolveCall(node, baseConstructors, candidatesOutArray);
+                    }
                 }
                 return resolveUntypedCall(node);
             }
-            var funcType = checkExpression(node.expression);
+            var funcType = checkNonNullExpression(node.expression);
             var apparentType = getApparentType(funcType);
             if (apparentType === unknownType) {
                 return resolveErrorCall(node);
@@ -19435,7 +21064,7 @@ var ts;
                     error(node.arguments[spreadIndex], ts.Diagnostics.Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_5_and_higher);
                 }
             }
-            var expressionType = checkExpression(node.expression);
+            var expressionType = checkNonNullExpression(node.expression);
             expressionType = getApparentType(expressionType);
             if (expressionType === unknownType) {
                 return resolveErrorCall(node);
@@ -19453,6 +21082,9 @@ var ts;
             }
             var constructSignatures = getSignaturesOfType(expressionType, 1);
             if (constructSignatures.length) {
+                if (!isConstructorAccessible(node, constructSignatures[0])) {
+                    return resolveErrorCall(node);
+                }
                 return resolveCall(node, constructSignatures, candidatesOutArray);
             }
             var callSignatures = getSignaturesOfType(expressionType, 0);
@@ -19461,11 +21093,36 @@ var ts;
                 if (getReturnTypeOfSignature(signature) !== voidType) {
                     error(node, ts.Diagnostics.Only_a_void_function_can_be_called_with_the_new_keyword);
                 }
+                if (signature.thisType === voidType) {
+                    error(node, ts.Diagnostics.A_function_that_is_called_with_the_new_keyword_cannot_have_a_this_type_that_is_void);
+                }
                 return signature;
             }
             error(node, ts.Diagnostics.Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature);
             return resolveErrorCall(node);
         }
+        function isConstructorAccessible(node, signature) {
+            if (!signature || !signature.declaration) {
+                return true;
+            }
+            var declaration = signature.declaration;
+            var flags = declaration.flags;
+            if (!(flags & (8 | 16))) {
+                return true;
+            }
+            var declaringClassDeclaration = getClassLikeDeclarationOfSymbol(declaration.parent.symbol);
+            var declaringClass = getDeclaredTypeOfSymbol(declaration.parent.symbol);
+            if (!isNodeWithinClass(node, declaringClassDeclaration)) {
+                if (flags & 8) {
+                    error(node, ts.Diagnostics.Constructor_of_class_0_is_private_and_only_accessible_within_the_class_declaration, typeToString(declaringClass));
+                }
+                if (flags & 16) {
+                    error(node, ts.Diagnostics.Constructor_of_class_0_is_protected_and_only_accessible_within_the_class_declaration, typeToString(declaringClass));
+                }
+                return false;
+            }
+            return true;
+        }
         function resolveTaggedTemplateExpression(node, candidatesOutArray) {
             var tagType = checkExpression(node.tag);
             var apparentType = getApparentType(tagType);
@@ -19484,16 +21141,16 @@ var ts;
         }
         function getDiagnosticHeadMessageForDecoratorResolution(node) {
             switch (node.parent.kind) {
-                case 217:
-                case 189:
+                case 220:
+                case 191:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression;
-                case 139:
+                case 141:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression;
-                case 142:
-                    return ts.Diagnostics.Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression;
                 case 144:
+                    return ts.Diagnostics.Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression;
                 case 146:
-                case 147:
+                case 148:
+                case 149:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression;
             }
         }
@@ -19509,7 +21166,7 @@ var ts;
             }
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             if (!callSignatures.length) {
-                var errorInfo;
+                var errorInfo = void 0;
                 errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature);
                 errorInfo = ts.chainDiagnosticMessages(errorInfo, headMessage);
                 diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(node, errorInfo));
@@ -19521,16 +21178,16 @@ var ts;
             var links = getNodeLinks(node);
             if (!links.resolvedSignature || candidatesOutArray) {
                 links.resolvedSignature = anySignature;
-                if (node.kind === 171) {
+                if (node.kind === 173) {
                     links.resolvedSignature = resolveCallExpression(node, candidatesOutArray);
                 }
-                else if (node.kind === 172) {
+                else if (node.kind === 174) {
                     links.resolvedSignature = resolveNewExpression(node, candidatesOutArray);
                 }
-                else if (node.kind === 173) {
+                else if (node.kind === 175) {
                     links.resolvedSignature = resolveTaggedTemplateExpression(node, candidatesOutArray);
                 }
-                else if (node.kind === 140) {
+                else if (node.kind === 142) {
                     links.resolvedSignature = resolveDecorator(node, candidatesOutArray);
                 }
                 else {
@@ -19552,12 +21209,13 @@ var ts;
             if (node.expression.kind === 95) {
                 return voidType;
             }
-            if (node.kind === 172) {
+            if (node.kind === 174) {
                 var declaration = signature.declaration;
                 if (declaration &&
-                    declaration.kind !== 145 &&
-                    declaration.kind !== 149 &&
-                    declaration.kind !== 154) {
+                    declaration.kind !== 147 &&
+                    declaration.kind !== 151 &&
+                    declaration.kind !== 156 &&
+                    !ts.isJSDocConstructSignature(declaration)) {
                     var funcSymbol = checkExpression(node.expression).symbol;
                     if (funcSymbol && funcSymbol.members && (funcSymbol.flags & 16)) {
                         return getInferredClassType(funcSymbol);
@@ -19568,7 +21226,7 @@ var ts;
                     return anyType;
                 }
             }
-            if (ts.isInJavaScriptFile(node) && ts.isRequireCall(node)) {
+            if (ts.isInJavaScriptFile(node) && ts.isRequireCall(node, true)) {
                 return resolveExternalModuleTypeByLiteral(node.arguments[0]);
             }
             return getReturnTypeOfSignature(signature);
@@ -19581,18 +21239,29 @@ var ts;
             var targetType = getTypeFromTypeNode(node.type);
             if (produceDiagnostics && targetType !== unknownType) {
                 var widenedType = getWidenedType(exprType);
-                var bothAreStringLike = someConstituentTypeHasKind(targetType, 258) &&
-                    someConstituentTypeHasKind(widenedType, 258);
-                if (!bothAreStringLike && !(isTypeAssignableTo(targetType, widenedType))) {
-                    checkTypeAssignableTo(exprType, targetType, node, ts.Diagnostics.Neither_type_0_nor_type_1_is_assignable_to_the_other);
+                if (!isTypeComparableTo(targetType, widenedType)) {
+                    checkTypeComparableTo(exprType, targetType, node, ts.Diagnostics.Type_0_cannot_be_converted_to_type_1);
                 }
             }
             return targetType;
         }
+        function checkNonNullAssertion(node) {
+            return getNonNullableType(checkExpression(node.expression));
+        }
+        function getTypeOfParameter(symbol) {
+            var type = getTypeOfSymbol(symbol);
+            if (strictNullChecks) {
+                var declaration = symbol.valueDeclaration;
+                if (declaration && declaration.initializer) {
+                    return addNullableKind(type, 32);
+                }
+            }
+            return type;
+        }
         function getTypeAtPosition(signature, pos) {
             return signature.hasRestParameter ?
-                pos < signature.parameters.length - 1 ? getTypeOfSymbol(signature.parameters[pos]) : getRestTypeOfSignature(signature) :
-                pos < signature.parameters.length ? getTypeOfSymbol(signature.parameters[pos]) : anyType;
+                pos < signature.parameters.length - 1 ? getTypeOfParameter(signature.parameters[pos]) : getRestTypeOfSignature(signature) :
+                pos < signature.parameters.length ? getTypeOfParameter(signature.parameters[pos]) : anyType;
         }
         function assignContextualParameterTypes(signature, context, mapper) {
             var len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0);
@@ -19611,7 +21280,7 @@ var ts;
             if (ts.isBindingPattern(node.name)) {
                 for (var _i = 0, _a = node.name.elements; _i < _a.length; _i++) {
                     var element = _a[_i];
-                    if (element.kind !== 190) {
+                    if (element.kind !== 192) {
                         if (element.name.kind === 69) {
                             getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
                         }
@@ -19630,6 +21299,13 @@ var ts;
                 inferTypes(mapper.context, links.type, instantiateType(contextualType, mapper));
             }
         }
+        function getReturnTypeFromJSDocComment(func) {
+            var returnTag = ts.getJSDocReturnTag(func);
+            if (returnTag && returnTag.typeExpression) {
+                return getTypeFromTypeNode(returnTag.typeExpression.type);
+            }
+            return undefined;
+        }
         function createPromiseType(promisedType) {
             var globalPromiseType = getGlobalPromiseType();
             if (globalPromiseType !== emptyGenericType) {
@@ -19645,14 +21321,14 @@ var ts;
             }
             var isAsync = ts.isAsyncFunctionLike(func);
             var type;
-            if (func.body.kind !== 195) {
+            if (func.body.kind !== 198) {
                 type = checkExpressionCached(func.body, contextualMapper);
                 if (isAsync) {
                     type = checkAwaitedType(type, func, ts.Diagnostics.Return_expression_in_async_function_does_not_have_a_valid_callable_then_member);
                 }
             }
             else {
-                var types;
+                var types = void 0;
                 var funcIsGenerator = !!func.asteriskToken;
                 if (funcIsGenerator) {
                     types = checkAndAggregateYieldOperandTypes(func.body, contextualMapper);
@@ -19665,7 +21341,8 @@ var ts;
                     }
                 }
                 else {
-                    types = checkAndAggregateReturnExpressionTypes(func.body, contextualMapper, isAsync);
+                    var hasImplicitReturn = !!(func.flags & 32768);
+                    types = checkAndAggregateReturnExpressionTypes(func.body, contextualMapper, isAsync, hasImplicitReturn);
                     if (types.length === 0) {
                         if (isAsync) {
                             var promiseType = createPromiseType(voidType);
@@ -19688,7 +21365,7 @@ var ts;
                     }
                     else {
                         error(func, ts.Diagnostics.No_best_common_type_exists_among_return_expressions);
-                        return unknownType;
+                        return getUnionType(types);
                     }
                 }
                 if (funcIsGenerator) {
@@ -19727,8 +21404,9 @@ var ts;
             });
             return aggregatedTypes;
         }
-        function checkAndAggregateReturnExpressionTypes(body, contextualMapper, isAsync) {
+        function checkAndAggregateReturnExpressionTypes(body, contextualMapper, isAsync, hasImplicitReturn) {
             var aggregatedTypes = [];
+            var hasOmittedExpressions = false;
             ts.forEachReturnStatement(body, function (returnStatement) {
                 var expr = returnStatement.expression;
                 if (expr) {
@@ -19740,29 +21418,41 @@ var ts;
                         aggregatedTypes.push(type);
                     }
                 }
+                else {
+                    hasOmittedExpressions = true;
+                }
             });
+            if (strictNullChecks && aggregatedTypes.length && (hasOmittedExpressions || hasImplicitReturn)) {
+                if (!ts.contains(aggregatedTypes, undefinedType)) {
+                    aggregatedTypes.push(undefinedType);
+                }
+            }
             return aggregatedTypes;
         }
         function checkAllCodePathsInNonVoidFunctionReturnOrThrow(func, returnType) {
             if (!produceDiagnostics) {
                 return;
             }
-            if (returnType === voidType || isTypeAny(returnType)) {
+            if (returnType && maybeTypeOfKind(returnType, 1 | 16)) {
                 return;
             }
-            if (ts.nodeIsMissing(func.body) || func.body.kind !== 195 || !(func.flags & 524288)) {
+            if (ts.nodeIsMissing(func.body) || func.body.kind !== 198 || !(func.flags & 32768)) {
                 return;
             }
-            var hasExplicitReturn = func.flags & 1048576;
+            var hasExplicitReturn = func.flags & 65536;
             if (returnType && !hasExplicitReturn) {
                 error(func.type, ts.Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value);
             }
+            else if (returnType && strictNullChecks && !isTypeAssignableTo(undefinedType, returnType)) {
+                error(func.type, ts.Diagnostics.Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined);
+            }
             else if (compilerOptions.noImplicitReturns) {
                 if (!returnType) {
-                    var inferredReturnType = hasExplicitReturn
-                        ? getReturnTypeOfSignature(getSignatureFromDeclaration(func))
-                        : voidType;
-                    if (inferredReturnType === voidType || isTypeAny(inferredReturnType)) {
+                    if (!hasExplicitReturn) {
+                        return;
+                    }
+                    var inferredReturnType = getReturnTypeOfSignature(getSignatureFromDeclaration(func));
+                    if (isUnwrappedReturnTypeVoidOrAny(func, inferredReturnType)) {
                         return;
                     }
                 }
@@ -19770,12 +21460,13 @@ var ts;
             }
         }
         function checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper) {
-            ts.Debug.assert(node.kind !== 144 || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 146 || ts.isObjectLiteralMethod(node));
             var hasGrammarError = checkGrammarFunctionLikeDeclaration(node);
-            if (!hasGrammarError && node.kind === 176) {
+            if (!hasGrammarError && node.kind === 178) {
                 checkGrammarForGenerator(node);
             }
             if (contextualMapper === identityMapper && isContextSensitive(node)) {
+                checkNodeDeferred(node);
                 return anyFunctionType;
             }
             var links = getNodeLinks(node);
@@ -19805,14 +21496,14 @@ var ts;
                     }
                 }
             }
-            if (produceDiagnostics && node.kind !== 144 && node.kind !== 143) {
+            if (produceDiagnostics && node.kind !== 146 && node.kind !== 145) {
                 checkCollisionWithCapturedSuperVariable(node, node.name);
                 checkCollisionWithCapturedThisVariable(node, node.name);
             }
             return type;
         }
         function checkFunctionExpressionOrObjectLiteralMethodDeferred(node) {
-            ts.Debug.assert(node.kind !== 144 || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 146 || ts.isObjectLiteralMethod(node));
             var isAsync = ts.isAsyncFunctionLike(node);
             var returnOrPromisedType = node.type && (isAsync ? checkAsyncFunctionReturnType(node) : getTypeFromTypeNode(node.type));
             if (!node.asteriskToken) {
@@ -19822,7 +21513,7 @@ var ts;
                 if (!node.type) {
                     getReturnTypeOfSignature(getSignatureFromDeclaration(node));
                 }
-                if (node.body.kind === 195) {
+                if (node.body.kind === 198) {
                     checkSourceElement(node.body);
                 }
                 else {
@@ -19846,59 +21537,62 @@ var ts;
             }
             return true;
         }
-        function checkReferenceExpression(n, invalidReferenceMessage, constantVariableMessage) {
-            function findSymbol(n) {
-                var symbol = getNodeLinks(n).resolvedSymbol;
-                return symbol && getExportSymbolOfValueSymbolIfExported(symbol);
+        function isReadonlySymbol(symbol) {
+            return symbol.flags & 4 && (getDeclarationFlagsFromSymbol(symbol) & 64) !== 0 ||
+                symbol.flags & 3 && (getDeclarationFlagsFromSymbol(symbol) & 2048) !== 0 ||
+                symbol.flags & 98304 && !(symbol.flags & 65536) ||
+                (symbol.flags & 8) !== 0;
+        }
+        function isReferenceToReadonlyEntity(expr, symbol) {
+            if (isReadonlySymbol(symbol)) {
+                if (symbol.flags & 4 &&
+                    (expr.kind === 171 || expr.kind === 172) &&
+                    expr.expression.kind === 97) {
+                    var func = ts.getContainingFunction(expr);
+                    return !(func && func.kind === 147 && func.parent === symbol.valueDeclaration.parent);
+                }
+                return true;
             }
-            function isReferenceOrErrorExpression(n) {
-                switch (n.kind) {
-                    case 69: {
-                        var symbol = findSymbol(n);
-                        return !symbol || symbol === unknownSymbol || symbol === argumentsSymbol || (symbol.flags & 3) !== 0;
+            return false;
+        }
+        function isReferenceThroughNamespaceImport(expr) {
+            if (expr.kind === 171 || expr.kind === 172) {
+                var node = skipParenthesizedNodes(expr.expression);
+                if (node.kind === 69) {
+                    var symbol = getNodeLinks(node).resolvedSymbol;
+                    if (symbol.flags & 8388608) {
+                        var declaration = getDeclarationOfAliasSymbol(symbol);
+                        return declaration && declaration.kind === 231;
                     }
-                    case 169: {
-                        var symbol = findSymbol(n);
-                        return !symbol || symbol === unknownSymbol || (symbol.flags & ~8) !== 0;
-                    }
-                    case 170:
-                        return true;
-                    case 175:
-                        return isReferenceOrErrorExpression(n.expression);
-                    default:
-                        return false;
                 }
             }
-            function isConstVariableReference(n) {
-                switch (n.kind) {
-                    case 69:
-                    case 169: {
-                        var symbol = findSymbol(n);
-                        return symbol && (symbol.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(symbol) & 16384) !== 0;
-                    }
-                    case 170: {
-                        var index = n.argumentExpression;
-                        var symbol = findSymbol(n.expression);
-                        if (symbol && index && index.kind === 9) {
-                            var name_12 = index.text;
-                            var prop = getPropertyOfType(getTypeOfSymbol(symbol), name_12);
-                            return prop && (prop.flags & 3) !== 0 && (getDeclarationFlagsFromSymbol(prop) & 16384) !== 0;
-                        }
+            return false;
+        }
+        function checkReferenceExpression(expr, invalidReferenceMessage, constantVariableMessage) {
+            var node = skipParenthesizedNodes(expr);
+            if (node.kind !== 69 && node.kind !== 171 && node.kind !== 172) {
+                error(expr, invalidReferenceMessage);
+                return false;
+            }
+            var links = getNodeLinks(node);
+            var symbol = getExportSymbolOfValueSymbolIfExported(links.resolvedSymbol);
+            if (symbol) {
+                if (symbol !== unknownSymbol && symbol !== argumentsSymbol) {
+                    if (node.kind === 69 && !(symbol.flags & 3)) {
+                        error(expr, invalidReferenceMessage);
                         return false;
                     }
-                    case 175:
-                        return isConstVariableReference(n.expression);
-                    default:
+                    if (isReferenceToReadonlyEntity(node, symbol) || isReferenceThroughNamespaceImport(node)) {
+                        error(expr, constantVariableMessage);
                         return false;
+                    }
                 }
             }
-            if (!isReferenceOrErrorExpression(n)) {
-                error(n, invalidReferenceMessage);
-                return false;
-            }
-            if (isConstVariableReference(n)) {
-                error(n, constantVariableMessage);
-                return false;
+            else if (node.kind === 172) {
+                if (links.resolvedIndexInfo && links.resolvedIndexInfo.isReadonly) {
+                    error(expr, constantVariableMessage);
+                    return false;
+                }
             }
             return true;
         }
@@ -19916,7 +21610,7 @@ var ts;
         }
         function checkAwaitExpression(node) {
             if (produceDiagnostics) {
-                if (!(node.parserContextFlags & 8)) {
+                if (!(node.flags & 33554432)) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function);
                 }
                 if (isInParameterInitializerBeforeContainingFunction(node)) {
@@ -19932,7 +21626,7 @@ var ts;
                 case 35:
                 case 36:
                 case 50:
-                    if (someConstituentTypeHasKind(operandType, 16777216)) {
+                    if (maybeTypeOfKind(operandType, 16777216)) {
                         error(node.operand, ts.Diagnostics.The_0_operator_cannot_be_applied_to_type_symbol, ts.tokenToString(node.operator));
                     }
                     return numberType;
@@ -19940,9 +21634,9 @@ var ts;
                     return booleanType;
                 case 41:
                 case 42:
-                    var ok = checkArithmeticOperandType(node.operand, operandType, ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
+                    var ok = checkArithmeticOperandType(node.operand, getNonNullableType(operandType), ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
                     if (ok) {
-                        checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant);
+                        checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property);
                     }
                     return numberType;
             }
@@ -19950,42 +21644,50 @@ var ts;
         }
         function checkPostfixUnaryExpression(node) {
             var operandType = checkExpression(node.operand);
-            var ok = checkArithmeticOperandType(node.operand, operandType, ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
+            var ok = checkArithmeticOperandType(node.operand, getNonNullableType(operandType), ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
             if (ok) {
-                checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant);
+                checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property);
             }
             return numberType;
         }
-        function someConstituentTypeHasKind(type, kind) {
+        function maybeTypeOfKind(type, kind) {
             if (type.flags & kind) {
                 return true;
             }
             if (type.flags & 49152) {
                 var types = type.types;
                 for (var _i = 0, types_10 = types; _i < types_10.length; _i++) {
-                    var current = types_10[_i];
-                    if (current.flags & kind) {
+                    var t = types_10[_i];
+                    if (maybeTypeOfKind(t, kind)) {
                         return true;
                     }
                 }
-                return false;
             }
             return false;
         }
-        function allConstituentTypesHaveKind(type, kind) {
+        function isTypeOfKind(type, kind) {
             if (type.flags & kind) {
                 return true;
             }
-            if (type.flags & 49152) {
+            if (type.flags & 16384) {
                 var types = type.types;
                 for (var _i = 0, types_11 = types; _i < types_11.length; _i++) {
-                    var current = types_11[_i];
-                    if (!(current.flags & kind)) {
+                    var t = types_11[_i];
+                    if (!isTypeOfKind(t, kind)) {
                         return false;
                     }
                 }
                 return true;
             }
+            if (type.flags & 32768) {
+                var types = type.types;
+                for (var _a = 0, types_12 = types; _a < types_12.length; _a++) {
+                    var t = types_12[_a];
+                    if (isTypeOfKind(t, kind)) {
+                        return true;
+                    }
+                }
+            }
             return false;
         }
         function isConstEnumObjectType(type) {
@@ -19995,7 +21697,7 @@ var ts;
             return (symbol.flags & 128) !== 0;
         }
         function checkInstanceOfExpression(left, right, leftType, rightType) {
-            if (allConstituentTypesHaveKind(leftType, 16777726)) {
+            if (isTypeOfKind(leftType, 16777726)) {
                 error(left, ts.Diagnostics.The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter);
             }
             if (!(isTypeAny(rightType) || isTypeSubtypeOf(rightType, globalFunctionType))) {
@@ -20016,9 +21718,9 @@ var ts;
             var properties = node.properties;
             for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
                 var p = properties_3[_i];
-                if (p.kind === 248 || p.kind === 249) {
+                if (p.kind === 252 || p.kind === 253) {
                     var name_13 = p.name;
-                    if (name_13.kind === 137) {
+                    if (name_13.kind === 139) {
                         checkComputedPropertyName(name_13);
                     }
                     if (isComputedNonLiteralName(name_13)) {
@@ -20031,7 +21733,7 @@ var ts;
                             isNumericLiteralName(text) && getIndexTypeOfType(sourceType, 1) ||
                             getIndexTypeOfType(sourceType, 0);
                     if (type) {
-                        if (p.kind === 249) {
+                        if (p.kind === 253) {
                             checkDestructuringAssignment(p, type);
                         }
                         else {
@@ -20053,8 +21755,8 @@ var ts;
             var elements = node.elements;
             for (var i = 0; i < elements.length; i++) {
                 var e = elements[i];
-                if (e.kind !== 190) {
-                    if (e.kind !== 188) {
+                if (e.kind !== 192) {
+                    if (e.kind !== 190) {
                         var propName = "" + i;
                         var type = isTypeAny(sourceType)
                             ? sourceType
@@ -20079,7 +21781,7 @@ var ts;
                         }
                         else {
                             var restExpression = e.expression;
-                            if (restExpression.kind === 184 && restExpression.operatorToken.kind === 56) {
+                            if (restExpression.kind === 186 && restExpression.operatorToken.kind === 56) {
                                 error(restExpression.operatorToken, ts.Diagnostics.A_rest_element_cannot_have_an_initializer);
                             }
                             else {
@@ -20093,7 +21795,7 @@ var ts;
         }
         function checkDestructuringAssignment(exprOrAssignment, sourceType, contextualMapper) {
             var target;
-            if (exprOrAssignment.kind === 249) {
+            if (exprOrAssignment.kind === 253) {
                 var prop = exprOrAssignment;
                 if (prop.objectAssignmentInitializer) {
                     checkBinaryLikeExpression(prop.name, prop.equalsToken, prop.objectAssignmentInitializer, contextualMapper);
@@ -20103,21 +21805,21 @@ var ts;
             else {
                 target = exprOrAssignment;
             }
-            if (target.kind === 184 && target.operatorToken.kind === 56) {
+            if (target.kind === 186 && target.operatorToken.kind === 56) {
                 checkBinaryExpression(target, contextualMapper);
                 target = target.left;
             }
-            if (target.kind === 168) {
+            if (target.kind === 170) {
                 return checkObjectLiteralAssignment(target, sourceType, contextualMapper);
             }
-            if (target.kind === 167) {
+            if (target.kind === 169) {
                 return checkArrayLiteralAssignment(target, sourceType, contextualMapper);
             }
             return checkReferenceAssignment(target, sourceType, contextualMapper);
         }
         function checkReferenceAssignment(target, sourceType, contextualMapper) {
             var targetType = checkExpression(target, contextualMapper);
-            if (checkReferenceExpression(target, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant)) {
+            if (checkReferenceExpression(target, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property)) {
                 checkTypeAssignableTo(sourceType, targetType, target, undefined);
             }
             return sourceType;
@@ -20127,7 +21829,7 @@ var ts;
         }
         function checkBinaryLikeExpression(left, operatorToken, right, contextualMapper, errorNode) {
             var operator = operatorToken.kind;
-            if (operator === 56 && (left.kind === 168 || left.kind === 167)) {
+            if (operator === 56 && (left.kind === 170 || left.kind === 169)) {
                 return checkDestructuringAssignment(left, checkExpression(right, contextualMapper), contextualMapper);
             }
             var leftType = checkExpression(left, contextualMapper);
@@ -20155,11 +21857,13 @@ var ts;
                 case 68:
                 case 46:
                 case 66:
-                    if (leftType.flags & (32 | 64))
+                    if (leftType.flags & 96)
                         leftType = rightType;
-                    if (rightType.flags & (32 | 64))
+                    if (rightType.flags & 96)
                         rightType = leftType;
-                    var suggestedOperator;
+                    leftType = getNonNullableType(leftType);
+                    rightType = getNonNullableType(rightType);
+                    var suggestedOperator = void 0;
                     if ((leftType.flags & 8) &&
                         (rightType.flags & 8) &&
                         (suggestedOperator = getSuggestedBooleanOperator(operatorToken.kind)) !== undefined) {
@@ -20175,16 +21879,18 @@ var ts;
                     return numberType;
                 case 35:
                 case 57:
-                    if (leftType.flags & (32 | 64))
+                    if (leftType.flags & 96)
                         leftType = rightType;
-                    if (rightType.flags & (32 | 64))
+                    if (rightType.flags & 96)
                         rightType = leftType;
-                    var resultType;
-                    if (allConstituentTypesHaveKind(leftType, 132) && allConstituentTypesHaveKind(rightType, 132)) {
+                    leftType = getNonNullableType(leftType);
+                    rightType = getNonNullableType(rightType);
+                    var resultType = void 0;
+                    if (isTypeOfKind(leftType, 132) && isTypeOfKind(rightType, 132)) {
                         resultType = numberType;
                     }
                     else {
-                        if (allConstituentTypesHaveKind(leftType, 258) || allConstituentTypesHaveKind(rightType, 258)) {
+                        if (isTypeOfKind(leftType, 258) || isTypeOfKind(rightType, 258)) {
                             resultType = stringType;
                         }
                         else if (isTypeAny(leftType) || isTypeAny(rightType)) {
@@ -20213,10 +21919,7 @@ var ts;
                 case 31:
                 case 32:
                 case 33:
-                    if (someConstituentTypeHasKind(leftType, 258) && someConstituentTypeHasKind(rightType, 258)) {
-                        return booleanType;
-                    }
-                    if (!isTypeAssignableTo(leftType, rightType) && !isTypeAssignableTo(rightType, leftType)) {
+                    if (!isTypeComparableTo(leftType, rightType) && !isTypeComparableTo(rightType, leftType)) {
                         reportOperatorError();
                     }
                     return booleanType;
@@ -20225,9 +21928,9 @@ var ts;
                 case 90:
                     return checkInExpression(left, right, leftType, rightType);
                 case 51:
-                    return rightType;
+                    return addNullableKind(rightType, getNullableKind(leftType));
                 case 52:
-                    return getUnionType([leftType, rightType]);
+                    return getUnionType([getNonNullableType(leftType), rightType]);
                 case 56:
                     checkAssignmentOperator(rightType);
                     return getRegularTypeOfObjectLiteral(rightType);
@@ -20235,8 +21938,8 @@ var ts;
                     return rightType;
             }
             function checkForDisallowedESSymbolOperand(operator) {
-                var offendingSymbolOperand = someConstituentTypeHasKind(leftType, 16777216) ? left :
-                    someConstituentTypeHasKind(rightType, 16777216) ? right :
+                var offendingSymbolOperand = maybeTypeOfKind(leftType, 16777216) ? left :
+                    maybeTypeOfKind(rightType, 16777216) ? right :
                         undefined;
                 if (offendingSymbolOperand) {
                     error(offendingSymbolOperand, ts.Diagnostics.The_0_operator_cannot_be_applied_to_type_symbol, ts.tokenToString(operator));
@@ -20261,7 +21964,7 @@ var ts;
             }
             function checkAssignmentOperator(valueType) {
                 if (produceDiagnostics && operator >= 56 && operator <= 68) {
-                    var ok = checkReferenceExpression(left, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant);
+                    var ok = checkReferenceExpression(left, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property);
                     if (ok) {
                         checkTypeAssignableTo(valueType, leftType, left, undefined);
                     }
@@ -20288,7 +21991,7 @@ var ts;
         }
         function checkYieldExpression(node) {
             if (produceDiagnostics) {
-                if (!(node.parserContextFlags & 2) || isYieldExpressionInClass(node)) {
+                if (!(node.flags & 8388608) || isYieldExpressionInClass(node)) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.A_yield_expression_is_only_allowed_in_a_generator_body);
                 }
                 if (isInParameterInitializerBeforeContainingFunction(node)) {
@@ -20299,7 +22002,7 @@ var ts;
                 var func = ts.getContainingFunction(node);
                 if (func && func.asteriskToken) {
                     var expressionType = checkExpressionCached(node.expression, undefined);
-                    var expressionElementType;
+                    var expressionElementType = void 0;
                     var nodeIsYieldStar = !!node.asteriskToken;
                     if (nodeIsYieldStar) {
                         expressionElementType = checkElementTypeOfIterable(expressionType, node.expression);
@@ -20351,14 +22054,14 @@ var ts;
             return links.resolvedType;
         }
         function checkPropertyAssignment(node, contextualMapper) {
-            if (node.name.kind === 137) {
+            if (node.name.kind === 139) {
                 checkComputedPropertyName(node.name);
             }
             return checkExpression(node.initializer, contextualMapper);
         }
         function checkObjectLiteralMethod(node, contextualMapper) {
             checkGrammarMethod(node);
-            if (node.name.kind === 137) {
+            if (node.name.kind === 139) {
                 checkComputedPropertyName(node.name);
             }
             var uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
@@ -20381,7 +22084,7 @@ var ts;
         }
         function checkExpression(node, contextualMapper) {
             var type;
-            if (node.kind === 136) {
+            if (node.kind === 138) {
                 type = checkQualifiedName(node);
             }
             else {
@@ -20389,9 +22092,9 @@ var ts;
                 type = instantiateTypeWithSingleGenericCallSignature(node, uninstantiatedType, contextualMapper);
             }
             if (isConstEnumObjectType(type)) {
-                var ok = (node.parent.kind === 169 && node.parent.expression === node) ||
-                    (node.parent.kind === 170 && node.parent.expression === node) ||
-                    ((node.kind === 69 || node.kind === 136) && isInRightSideOfImportOrExportAssignment(node));
+                var ok = (node.parent.kind === 171 && node.parent.expression === node) ||
+                    (node.parent.kind === 172 && node.parent.expression === node) ||
+                    ((node.kind === 69 || node.kind === 138) && isInRightSideOfImportOrExportAssignment(node));
                 if (!ok) {
                     error(node, ts.Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment);
                 }
@@ -20417,7 +22120,7 @@ var ts;
                     return booleanType;
                 case 8:
                     return checkNumericLiteral(node);
-                case 186:
+                case 188:
                     return checkTemplateExpression(node);
                 case 9:
                     return checkStringLiteralExpression(node);
@@ -20425,58 +22128,60 @@ var ts;
                     return stringType;
                 case 10:
                     return globalRegExpType;
-                case 167:
-                    return checkArrayLiteral(node, contextualMapper);
-                case 168:
-                    return checkObjectLiteral(node, contextualMapper);
                 case 169:
-                    return checkPropertyAccessExpression(node);
+                    return checkArrayLiteral(node, contextualMapper);
                 case 170:
-                    return checkIndexedAccess(node);
+                    return checkObjectLiteral(node, contextualMapper);
                 case 171:
+                    return checkPropertyAccessExpression(node);
                 case 172:
-                    return checkCallExpression(node);
+                    return checkIndexedAccess(node);
                 case 173:
-                    return checkTaggedTemplateExpression(node);
-                case 175:
-                    return checkExpression(node.expression, contextualMapper);
-                case 189:
-                    return checkClassExpression(node);
-                case 176:
-                case 177:
-                    return checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
-                case 179:
-                    return checkTypeOfExpression(node);
                 case 174:
-                case 192:
-                    return checkAssertion(node);
+                    return checkCallExpression(node);
+                case 175:
+                    return checkTaggedTemplateExpression(node);
+                case 177:
+                    return checkExpression(node.expression, contextualMapper);
+                case 191:
+                    return checkClassExpression(node);
                 case 178:
-                    return checkDeleteExpression(node);
-                case 180:
-                    return checkVoidExpression(node);
+                case 179:
+                    return checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
                 case 181:
-                    return checkAwaitExpression(node);
+                    return checkTypeOfExpression(node);
+                case 176:
+                case 194:
+                    return checkAssertion(node);
+                case 195:
+                    return checkNonNullAssertion(node);
+                case 180:
+                    return checkDeleteExpression(node);
                 case 182:
-                    return checkPrefixUnaryExpression(node);
+                    return checkVoidExpression(node);
                 case 183:
-                    return checkPostfixUnaryExpression(node);
+                    return checkAwaitExpression(node);
                 case 184:
-                    return checkBinaryExpression(node, contextualMapper);
+                    return checkPrefixUnaryExpression(node);
                 case 185:
-                    return checkConditionalExpression(node, contextualMapper);
-                case 188:
-                    return checkSpreadElementExpression(node, contextualMapper);
-                case 190:
-                    return undefinedType;
+                    return checkPostfixUnaryExpression(node);
+                case 186:
+                    return checkBinaryExpression(node, contextualMapper);
                 case 187:
+                    return checkConditionalExpression(node, contextualMapper);
+                case 190:
+                    return checkSpreadElementExpression(node, contextualMapper);
+                case 192:
+                    return undefinedType;
+                case 189:
                     return checkYieldExpression(node);
-                case 243:
+                case 247:
                     return checkJsxExpression(node);
-                case 236:
+                case 240:
                     return checkJsxElement(node);
-                case 237:
+                case 241:
                     return checkJsxSelfClosingElement(node);
-                case 238:
+                case 242:
                     ts.Debug.fail("Shouldn't ever directly check a JsxOpeningElement");
             }
             return unknownType;
@@ -20495,15 +22200,26 @@ var ts;
             checkGrammarDecorators(node) || checkGrammarModifiers(node);
             checkVariableLikeDeclaration(node);
             var func = ts.getContainingFunction(node);
-            if (node.flags & 56) {
+            if (node.flags & 28) {
                 func = ts.getContainingFunction(node);
-                if (!(func.kind === 145 && ts.nodeIsPresent(func.body))) {
+                if (!(func.kind === 147 && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                 }
             }
             if (node.questionToken && ts.isBindingPattern(node.name) && func.body) {
                 error(node, ts.Diagnostics.A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature);
             }
+            if (node.name.text === "this") {
+                if (ts.indexOf(func.parameters, node) !== 0) {
+                    error(node, ts.Diagnostics.A_this_parameter_must_be_the_first_parameter);
+                }
+                if (func.kind === 147 || func.kind === 151 || func.kind === 156) {
+                    error(node, ts.Diagnostics.A_constructor_cannot_have_a_this_parameter);
+                }
+                if (func.kind === 149) {
+                    error(node, ts.Diagnostics.A_setter_cannot_have_a_this_parameter);
+                }
+            }
             if (node.dotDotDotToken && !ts.isBindingPattern(node.name) && !isArrayType(getTypeOfSymbol(node.symbol))) {
                 error(node, ts.Diagnostics.A_rest_parameter_must_be_of_an_array_type);
             }
@@ -20512,9 +22228,9 @@ var ts;
             if (!node.asteriskToken || !node.body) {
                 return false;
             }
-            return node.kind === 144 ||
-                node.kind === 216 ||
-                node.kind === 176;
+            return node.kind === 146 ||
+                node.kind === 219 ||
+                node.kind === 178;
         }
         function getTypePredicateParameterIndex(parameterList, parameter) {
             if (parameterList) {
@@ -20531,32 +22247,32 @@ var ts;
         function checkTypePredicate(node) {
             var parent = getTypePredicateParent(node);
             if (!parent) {
+                error(node, ts.Diagnostics.A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods);
                 return;
             }
-            var returnType = getReturnTypeOfSignature(getSignatureFromDeclaration(parent));
-            if (!returnType || !(returnType.flags & 134217728)) {
+            var typePredicate = getSignatureFromDeclaration(parent).typePredicate;
+            if (!typePredicate) {
                 return;
             }
             var parameterName = node.parameterName;
-            if (parameterName.kind === 162) {
+            if (ts.isThisTypePredicate(typePredicate)) {
                 getTypeFromThisTypeNode(parameterName);
             }
             else {
-                var typePredicate = returnType.predicate;
                 if (typePredicate.parameterIndex >= 0) {
                     if (parent.parameters[typePredicate.parameterIndex].dotDotDotToken) {
                         error(parameterName, ts.Diagnostics.A_type_predicate_cannot_reference_a_rest_parameter);
                     }
                     else {
-                        checkTypeAssignableTo(typePredicate.type, getTypeOfNode(parent.parameters[typePredicate.parameterIndex]), node.type);
+                        var leadingError = ts.chainDiagnosticMessages(undefined, ts.Diagnostics.A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type);
+                        checkTypeAssignableTo(typePredicate.type, getTypeOfNode(parent.parameters[typePredicate.parameterIndex]), node.type, undefined, leadingError);
                     }
                 }
                 else if (parameterName) {
                     var hasReportedError = false;
                     for (var _i = 0, _a = parent.parameters; _i < _a.length; _i++) {
                         var name_14 = _a[_i].name;
-                        if ((name_14.kind === 164 ||
-                            name_14.kind === 165) &&
+                        if (ts.isBindingPattern(name_14) &&
                             checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_14, parameterName, typePredicate.parameterName)) {
                             hasReportedError = true;
                             break;
@@ -20570,16 +22286,16 @@ var ts;
         }
         function getTypePredicateParent(node) {
             switch (node.parent.kind) {
-                case 177:
-                case 148:
-                case 216:
-                case 176:
-                case 153:
-                case 144:
-                case 143:
-                    var parent_6 = node.parent;
-                    if (node === parent_6.type) {
-                        return parent_6;
+                case 179:
+                case 150:
+                case 219:
+                case 178:
+                case 155:
+                case 146:
+                case 145:
+                    var parent_8 = node.parent;
+                    if (node === parent_8.type) {
+                        return parent_8;
                     }
             }
         }
@@ -20591,8 +22307,8 @@ var ts;
                     error(predicateVariableNode, ts.Diagnostics.A_type_predicate_cannot_reference_element_0_in_a_binding_pattern, predicateVariableName);
                     return true;
                 }
-                else if (name_15.kind === 165 ||
-                    name_15.kind === 164) {
+                else if (name_15.kind === 167 ||
+                    name_15.kind === 166) {
                     if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_15, predicateVariableNode, predicateVariableName)) {
                         return true;
                     }
@@ -20600,25 +22316,27 @@ var ts;
             }
         }
         function checkSignatureDeclaration(node) {
-            if (node.kind === 150) {
+            if (node.kind === 152) {
                 checkGrammarIndexSignature(node);
             }
-            else if (node.kind === 153 || node.kind === 216 || node.kind === 154 ||
-                node.kind === 148 || node.kind === 145 ||
-                node.kind === 149) {
+            else if (node.kind === 155 || node.kind === 219 || node.kind === 156 ||
+                node.kind === 150 || node.kind === 147 ||
+                node.kind === 151) {
                 checkGrammarFunctionLikeDeclaration(node);
             }
             checkTypeParameters(node.typeParameters);
             ts.forEach(node.parameters, checkParameter);
-            checkSourceElement(node.type);
+            if (node.type) {
+                checkSourceElement(node.type);
+            }
             if (produceDiagnostics) {
                 checkCollisionWithArgumentsInGeneratedCode(node);
                 if (compilerOptions.noImplicitAny && !node.type) {
                     switch (node.kind) {
-                        case 149:
+                        case 151:
                             error(node, ts.Diagnostics.Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
-                        case 148:
+                        case 150:
                             error(node, ts.Diagnostics.Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
                     }
@@ -20635,12 +22353,14 @@ var ts;
                             checkTypeAssignableTo(iterableIteratorInstantiation, returnType, node.type);
                         }
                     }
+                    else if (ts.isAsyncFunctionLike(node)) {
+                        checkAsyncFunctionReturnType(node);
+                    }
                 }
             }
-            checkSpecializedSignatureDeclaration(node);
         }
         function checkTypeForDuplicateIndexSignatures(node) {
-            if (node.kind === 218) {
+            if (node.kind === 221) {
                 var nodeSymbol = getSymbolOfNode(node);
                 if (nodeSymbol.declarations.length > 0 && nodeSymbol.declarations[0] !== node) {
                     return;
@@ -20655,7 +22375,7 @@ var ts;
                     var declaration = decl;
                     if (declaration.parameters.length === 1 && declaration.parameters[0].type) {
                         switch (declaration.parameters[0].type.kind) {
-                            case 130:
+                            case 131:
                                 if (!seenStringIndexer) {
                                     seenStringIndexer = true;
                                 }
@@ -20663,7 +22383,7 @@ var ts;
                                     error(declaration, ts.Diagnostics.Duplicate_string_index_signature);
                                 }
                                 break;
-                            case 128:
+                            case 129:
                                 if (!seenNumericIndexer) {
                                     seenNumericIndexer = true;
                                 }
@@ -20702,14 +22422,11 @@ var ts;
             if (!produceDiagnostics) {
                 return;
             }
-            function isSuperCallExpression(n) {
-                return n.kind === 171 && n.expression.kind === 95;
-            }
             function containsSuperCallAsComputedPropertyName(n) {
                 return n.name && containsSuperCall(n.name);
             }
             function containsSuperCall(n) {
-                if (isSuperCallExpression(n)) {
+                if (ts.isSuperCallExpression(n)) {
                     return true;
                 }
                 else if (ts.isFunctionLike(n)) {
@@ -20724,32 +22441,31 @@ var ts;
                 if (n.kind === 97) {
                     error(n, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
                 }
-                else if (n.kind !== 176 && n.kind !== 216) {
+                else if (n.kind !== 178 && n.kind !== 219) {
                     ts.forEachChild(n, markThisReferencesAsErrors);
                 }
             }
             function isInstancePropertyWithInitializer(n) {
-                return n.kind === 142 &&
-                    !(n.flags & 64) &&
+                return n.kind === 144 &&
+                    !(n.flags & 32) &&
                     !!n.initializer;
             }
             var containingClassDecl = node.parent;
             if (ts.getClassExtendsHeritageClauseElement(containingClassDecl)) {
-                var containingClassSymbol = getSymbolOfNode(containingClassDecl);
-                var containingClassInstanceType = getDeclaredTypeOfSymbol(containingClassSymbol);
-                var baseConstructorType = getBaseConstructorTypeOfClass(containingClassInstanceType);
-                if (containsSuperCall(node.body)) {
-                    if (baseConstructorType === nullType) {
-                        error(node, ts.Diagnostics.A_constructor_cannot_contain_a_super_call_when_its_class_extends_null);
+                var classExtendsNull = classDeclarationExtendsNull(containingClassDecl);
+                var superCall = getSuperCallInConstructor(node);
+                if (superCall) {
+                    if (classExtendsNull) {
+                        error(superCall, ts.Diagnostics.A_constructor_cannot_contain_a_super_call_when_its_class_extends_null);
                     }
                     var superCallShouldBeFirst = ts.forEach(node.parent.members, isInstancePropertyWithInitializer) ||
-                        ts.forEach(node.parameters, function (p) { return p.flags & (8 | 16 | 32); });
+                        ts.forEach(node.parameters, function (p) { return p.flags & (4 | 8 | 16); });
                     if (superCallShouldBeFirst) {
                         var statements = node.body.statements;
-                        var superCallStatement;
+                        var superCallStatement = void 0;
                         for (var _i = 0, statements_2 = statements; _i < statements_2.length; _i++) {
                             var statement = statements_2[_i];
-                            if (statement.kind === 198 && isSuperCallExpression(statement.expression)) {
+                            if (statement.kind === 201 && ts.isSuperCallExpression(statement.expression)) {
                                 superCallStatement = statement;
                                 break;
                             }
@@ -20760,12 +22476,9 @@ var ts;
                         if (!superCallStatement) {
                             error(node, ts.Diagnostics.A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties);
                         }
-                        else {
-                            markThisReferencesAsErrors(superCallStatement.expression);
-                        }
                     }
                 }
-                else if (baseConstructorType !== nullType) {
+                else if (!classExtendsNull) {
                     error(node, ts.Diagnostics.Constructors_for_derived_classes_must_contain_a_super_call);
                 }
             }
@@ -20775,9 +22488,9 @@ var ts;
                 checkGrammarFunctionLikeDeclaration(node) || checkGrammarAccessor(node) || checkGrammarComputedPropertyName(node.name);
                 checkDecorators(node);
                 checkSignatureDeclaration(node);
-                if (node.kind === 146) {
-                    if (!ts.isInAmbientContext(node) && ts.nodeIsPresent(node.body) && (node.flags & 524288)) {
-                        if (node.flags & 1048576) {
+                if (node.kind === 148) {
+                    if (!ts.isInAmbientContext(node) && ts.nodeIsPresent(node.body) && (node.flags & 32768)) {
+                        if (node.flags & 65536) {
                             if (compilerOptions.noImplicitReturns) {
                                 error(node.name, ts.Diagnostics.Not_all_code_paths_return_a_value);
                             }
@@ -20787,16 +22500,19 @@ var ts;
                         }
                     }
                 }
-                if (node.name.kind === 137) {
+                if (node.name.kind === 139) {
                     checkComputedPropertyName(node.name);
                 }
                 if (!ts.hasDynamicName(node)) {
-                    var otherKind = node.kind === 146 ? 147 : 146;
+                    var otherKind = node.kind === 148 ? 149 : 148;
                     var otherAccessor = ts.getDeclarationOfKind(node.symbol, otherKind);
                     if (otherAccessor) {
-                        if (((node.flags & 56) !== (otherAccessor.flags & 56))) {
+                        if (((node.flags & 28) !== (otherAccessor.flags & 28))) {
                             error(node.name, ts.Diagnostics.Getter_and_setter_accessors_do_not_agree_in_visibility);
                         }
+                        if (((node.flags & 128) !== (otherAccessor.flags & 128))) {
+                            error(node.name, ts.Diagnostics.Accessors_must_both_be_abstract_or_non_abstract);
+                        }
                         var currentAccessorType = getAnnotatedAccessorType(node);
                         var otherAccessorType = getAnnotatedAccessorType(otherAccessor);
                         if (currentAccessorType && otherAccessorType) {
@@ -20808,7 +22524,7 @@ var ts;
                 }
                 getTypeOfAccessors(getSymbolOfNode(node));
             }
-            if (node.parent.kind !== 168) {
+            if (node.parent.kind !== 170) {
                 checkSourceElement(node.body);
             }
             else {
@@ -20875,49 +22591,18 @@ var ts;
             ts.forEach(node.types, checkSourceElement);
         }
         function isPrivateWithinAmbient(node) {
-            return (node.flags & 16) && ts.isInAmbientContext(node);
-        }
-        function checkSpecializedSignatureDeclaration(signatureDeclarationNode) {
-            if (!produceDiagnostics) {
-                return;
-            }
-            var signature = getSignatureFromDeclaration(signatureDeclarationNode);
-            if (!signature.hasStringLiterals) {
-                return;
-            }
-            if (ts.nodeIsPresent(signatureDeclarationNode.body)) {
-                error(signatureDeclarationNode, ts.Diagnostics.A_signature_with_an_implementation_cannot_use_a_string_literal_type);
-                return;
-            }
-            var signaturesToCheck;
-            if (!signatureDeclarationNode.name && signatureDeclarationNode.parent && signatureDeclarationNode.parent.kind === 218) {
-                ts.Debug.assert(signatureDeclarationNode.kind === 148 || signatureDeclarationNode.kind === 149);
-                var signatureKind = signatureDeclarationNode.kind === 148 ? 0 : 1;
-                var containingSymbol = getSymbolOfNode(signatureDeclarationNode.parent);
-                var containingType = getDeclaredTypeOfSymbol(containingSymbol);
-                signaturesToCheck = getSignaturesOfType(containingType, signatureKind);
-            }
-            else {
-                signaturesToCheck = getSignaturesOfSymbol(getSymbolOfNode(signatureDeclarationNode));
-            }
-            for (var _i = 0, signaturesToCheck_1 = signaturesToCheck; _i < signaturesToCheck_1.length; _i++) {
-                var otherSignature = signaturesToCheck_1[_i];
-                if (!otherSignature.hasStringLiterals && isSignatureAssignableTo(signature, otherSignature, false)) {
-                    return;
-                }
-            }
-            error(signatureDeclarationNode, ts.Diagnostics.Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature);
+            return (node.flags & 8) && ts.isInAmbientContext(node);
         }
         function getEffectiveDeclarationFlags(n, flagsToCheck) {
             var flags = ts.getCombinedNodeFlags(n);
-            if (n.parent.kind !== 218 &&
-                n.parent.kind !== 217 &&
-                n.parent.kind !== 189 &&
+            if (n.parent.kind !== 221 &&
+                n.parent.kind !== 220 &&
+                n.parent.kind !== 191 &&
                 ts.isInAmbientContext(n)) {
-                if (!(flags & 4)) {
-                    flags |= 2;
+                if (!(flags & 2)) {
+                    flags |= 1;
                 }
-                flags |= 4;
+                flags |= 2;
             }
             return flags & flagsToCheck;
         }
@@ -20932,36 +22617,36 @@ var ts;
             function checkFlagAgreementBetweenOverloads(overloads, implementation, flagsToCheck, someOverloadFlags, allOverloadFlags) {
                 var someButNotAllOverloadFlags = someOverloadFlags ^ allOverloadFlags;
                 if (someButNotAllOverloadFlags !== 0) {
-                    var canonicalFlags = getEffectiveDeclarationFlags(getCanonicalOverload(overloads, implementation), flagsToCheck);
+                    var canonicalFlags_1 = getEffectiveDeclarationFlags(getCanonicalOverload(overloads, implementation), flagsToCheck);
                     ts.forEach(overloads, function (o) {
-                        var deviation = getEffectiveDeclarationFlags(o, flagsToCheck) ^ canonicalFlags;
-                        if (deviation & 2) {
-                            error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_exported_or_not_exported);
+                        var deviation = getEffectiveDeclarationFlags(o, flagsToCheck) ^ canonicalFlags_1;
+                        if (deviation & 1) {
+                            error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_exported_or_non_exported);
                         }
-                        else if (deviation & 4) {
+                        else if (deviation & 2) {
                             error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_ambient_or_non_ambient);
                         }
-                        else if (deviation & (16 | 32)) {
-                            error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_public_private_or_protected);
+                        else if (deviation & (8 | 16)) {
+                            error(o.name || o, ts.Diagnostics.Overload_signatures_must_all_be_public_private_or_protected);
                         }
                         else if (deviation & 128) {
-                            error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_abstract_or_not_abstract);
+                            error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_abstract_or_non_abstract);
                         }
                     });
                 }
             }
             function checkQuestionTokenAgreementBetweenOverloads(overloads, implementation, someHaveQuestionToken, allHaveQuestionToken) {
                 if (someHaveQuestionToken !== allHaveQuestionToken) {
-                    var canonicalHasQuestionToken = ts.hasQuestionToken(getCanonicalOverload(overloads, implementation));
+                    var canonicalHasQuestionToken_1 = ts.hasQuestionToken(getCanonicalOverload(overloads, implementation));
                     ts.forEach(overloads, function (o) {
-                        var deviation = ts.hasQuestionToken(o) !== canonicalHasQuestionToken;
+                        var deviation = ts.hasQuestionToken(o) !== canonicalHasQuestionToken_1;
                         if (deviation) {
                             error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_optional_or_required);
                         }
                     });
                 }
             }
-            var flagsToCheck = 2 | 4 | 16 | 32 | 128;
+            var flagsToCheck = 1 | 2 | 8 | 16 | 128;
             var someNodeFlags = 0;
             var allNodeFlags = flagsToCheck;
             var someHaveQuestionToken = false;
@@ -20989,10 +22674,10 @@ var ts;
                     if (subsequentNode.kind === node.kind) {
                         var errorNode_1 = subsequentNode.name || subsequentNode;
                         if (node.name && subsequentNode.name && node.name.text === subsequentNode.name.text) {
-                            var reportError = (node.kind === 144 || node.kind === 143) &&
-                                (node.flags & 64) !== (subsequentNode.flags & 64);
+                            var reportError = (node.kind === 146 || node.kind === 145) &&
+                                (node.flags & 32) !== (subsequentNode.flags & 32);
                             if (reportError) {
-                                var diagnostic = node.flags & 64 ? ts.Diagnostics.Function_overload_must_be_static : ts.Diagnostics.Function_overload_must_not_be_static;
+                                var diagnostic = node.flags & 32 ? ts.Diagnostics.Function_overload_must_be_static : ts.Diagnostics.Function_overload_must_not_be_static;
                                 error(errorNode_1, diagnostic);
                             }
                             return;
@@ -21023,11 +22708,11 @@ var ts;
                 var current = declarations_4[_i];
                 var node = current;
                 var inAmbientContext = ts.isInAmbientContext(node);
-                var inAmbientContextOrInterface = node.parent.kind === 218 || node.parent.kind === 156 || inAmbientContext;
+                var inAmbientContextOrInterface = node.parent.kind === 221 || node.parent.kind === 158 || inAmbientContext;
                 if (inAmbientContextOrInterface) {
                     previousDeclaration = undefined;
                 }
-                if (node.kind === 216 || node.kind === 144 || node.kind === 143 || node.kind === 145) {
+                if (node.kind === 219 || node.kind === 146 || node.kind === 145 || node.kind === 147) {
                     var currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
                     someNodeFlags |= currentNodeFlags;
                     allNodeFlags &= currentNodeFlags;
@@ -21078,13 +22763,11 @@ var ts;
                 if (bodyDeclaration) {
                     var signatures = getSignaturesOfSymbol(symbol);
                     var bodySignature = getSignatureFromDeclaration(bodyDeclaration);
-                    if (!bodySignature.hasStringLiterals) {
-                        for (var _a = 0, signatures_3 = signatures; _a < signatures_3.length; _a++) {
-                            var signature = signatures_3[_a];
-                            if (!signature.hasStringLiterals && !isImplementationCompatibleWithOverload(bodySignature, signature)) {
-                                error(signature.declaration, ts.Diagnostics.Overload_signature_is_not_compatible_with_function_implementation);
-                                break;
-                            }
+                    for (var _a = 0, signatures_3 = signatures; _a < signatures_3.length; _a++) {
+                        var signature = signatures_3[_a];
+                        if (!isImplementationCompatibleWithOverload(bodySignature, signature)) {
+                            error(signature.declaration, ts.Diagnostics.Overload_signature_is_not_compatible_with_function_implementation);
+                            break;
                         }
                     }
                 }
@@ -21110,8 +22793,8 @@ var ts;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var d = _a[_i];
                 var declarationSpaces = getDeclarationSpaces(d);
-                var effectiveDeclarationFlags = getEffectiveDeclarationFlags(d, 2 | 512);
-                if (effectiveDeclarationFlags & 2) {
+                var effectiveDeclarationFlags = getEffectiveDeclarationFlags(d, 1 | 512);
+                if (effectiveDeclarationFlags & 1) {
                     if (effectiveDeclarationFlags & 512) {
                         defaultExportedDeclarationSpaces |= declarationSpaces;
                     }
@@ -21140,20 +22823,20 @@ var ts;
             }
             function getDeclarationSpaces(d) {
                 switch (d.kind) {
-                    case 218:
-                        return 2097152;
                     case 221:
+                        return 2097152;
+                    case 224:
                         return ts.isAmbientModule(d) || ts.getModuleInstanceState(d) !== 0
                             ? 4194304 | 1048576
                             : 4194304;
-                    case 217:
                     case 220:
+                    case 223:
                         return 2097152 | 1048576;
-                    case 224:
-                        var result = 0;
+                    case 228:
+                        var result_1 = 0;
                         var target = resolveAlias(getSymbolOfNode(d));
-                        ts.forEach(target.declarations, function (d) { result |= getDeclarationSpaces(d); });
-                        return result;
+                        ts.forEach(target.declarations, function (d) { result_1 |= getDeclarationSpaces(d); });
+                        return result_1;
                     default:
                         return 1048576;
                 }
@@ -21225,7 +22908,7 @@ var ts;
                         return checkNonThenableType(type, location, message);
                     }
                     else {
-                        if (type.id === promisedType.id || awaitedTypeStack.indexOf(promisedType.id) >= 0) {
+                        if (type.id === promisedType.id || ts.indexOf(awaitedTypeStack, promisedType.id) >= 0) {
                             if (location) {
                                 error(location, ts.Diagnostics._0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method, symbolToString(type.symbol));
                             }
@@ -21239,7 +22922,23 @@ var ts;
                 }
             }
         }
+        function checkCorrectPromiseType(returnType, location) {
+            if (returnType === unknownType) {
+                return unknownType;
+            }
+            var globalPromiseType = getGlobalPromiseType();
+            if (globalPromiseType === emptyGenericType
+                || globalPromiseType === getTargetType(returnType)) {
+                return checkAwaitedType(returnType, location, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
+            }
+            error(location, ts.Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type);
+            return unknownType;
+        }
         function checkAsyncFunctionReturnType(node) {
+            if (languageVersion >= 2) {
+                var returnType = getTypeFromTypeNode(node.type);
+                return checkCorrectPromiseType(returnType, node.type);
+            }
             var globalPromiseConstructorLikeType = getGlobalPromiseConstructorLikeType();
             if (globalPromiseConstructorLikeType === emptyObjectType) {
                 return unknownType;
@@ -21280,22 +22979,22 @@ var ts;
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             var errorInfo;
             switch (node.parent.kind) {
-                case 217:
+                case 220:
                     var classSymbol = getSymbolOfNode(node.parent);
                     var classConstructorType = getTypeOfSymbol(classSymbol);
                     expectedReturnType = getUnionType([classConstructorType, voidType]);
                     break;
-                case 139:
+                case 141:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any);
                     break;
-                case 142:
+                case 144:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.The_return_type_of_a_property_decorator_function_must_be_either_void_or_any);
                     break;
-                case 144:
                 case 146:
-                case 147:
+                case 148:
+                case 149:
                     var methodType = getTypeOfNode(node.parent);
                     var descriptorType = createTypedPropertyDescriptorType(methodType);
                     expectedReturnType = getUnionType([descriptorType, voidType]);
@@ -21304,9 +23003,9 @@ var ts;
             checkTypeAssignableTo(returnType, expectedReturnType, node, headMessage, errorInfo);
         }
         function checkTypeNodeAsExpression(node) {
-            if (node && node.kind === 152) {
+            if (node && node.kind === 154) {
                 var root = getFirstIdentifier(node.typeName);
-                var meaning = root.parent.kind === 152 ? 793056 : 1536;
+                var meaning = root.parent.kind === 154 ? 793056 : 1536;
                 var rootSymbol = resolveName(root, root.text, meaning | 8388608, undefined, undefined);
                 if (rootSymbol && rootSymbol.flags & 8388608) {
                     var aliasTarget = resolveAlias(rootSymbol);
@@ -21336,24 +23035,24 @@ var ts;
                 return;
             }
             if (!compilerOptions.experimentalDecorators) {
-                error(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Specify_experimentalDecorators_to_remove_this_warning);
+                error(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning);
             }
             if (compilerOptions.emitDecoratorMetadata) {
                 switch (node.kind) {
-                    case 217:
+                    case 220:
                         var constructor = ts.getFirstConstructorWithBody(node);
                         if (constructor) {
                             checkParameterTypeAnnotationsAsExpressions(constructor);
                         }
                         break;
-                    case 144:
                     case 146:
-                    case 147:
+                    case 148:
+                    case 149:
                         checkParameterTypeAnnotationsAsExpressions(node);
                         checkReturnTypeAnnotationAsExpression(node);
                         break;
-                    case 142:
-                    case 139:
+                    case 144:
+                    case 141:
                         checkTypeAnnotationAsExpression(node);
                         break;
                 }
@@ -21366,13 +23065,14 @@ var ts;
                 checkCollisionWithCapturedSuperVariable(node, node.name);
                 checkCollisionWithCapturedThisVariable(node, node.name);
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+                checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             }
         }
         function checkFunctionOrMethodDeclaration(node) {
             checkDecorators(node);
             checkSignatureDeclaration(node);
             var isAsync = ts.isAsyncFunctionLike(node);
-            if (node.name && node.name.kind === 137) {
+            if (node.name && node.name.kind === 139) {
                 checkComputedPropertyName(node.name);
             }
             if (!ts.hasDynamicName(node)) {
@@ -21404,7 +23104,7 @@ var ts;
             }
         }
         function checkBlock(node) {
-            if (node.kind === 195) {
+            if (node.kind === 198) {
                 checkGrammarStatementInAmbientContext(node);
             }
             ts.forEach(node.statements, checkSourceElement);
@@ -21423,19 +23123,19 @@ var ts;
             if (!(identifier && identifier.text === name)) {
                 return false;
             }
-            if (node.kind === 142 ||
-                node.kind === 141 ||
-                node.kind === 144 ||
+            if (node.kind === 144 ||
                 node.kind === 143 ||
                 node.kind === 146 ||
-                node.kind === 147) {
+                node.kind === 145 ||
+                node.kind === 148 ||
+                node.kind === 149) {
                 return false;
             }
             if (ts.isInAmbientContext(node)) {
                 return false;
             }
             var root = ts.getRootDeclaration(node);
-            if (root.kind === 139 && ts.nodeIsMissing(root.parent.body)) {
+            if (root.kind === 141 && ts.nodeIsMissing(root.parent.body)) {
                 return false;
             }
             return true;
@@ -21483,19 +23183,31 @@ var ts;
             if (!needCollisionCheckForIdentifier(node, name, "require") && !needCollisionCheckForIdentifier(node, name, "exports")) {
                 return;
             }
-            if (node.kind === 221 && ts.getModuleInstanceState(node) !== 1) {
+            if (node.kind === 224 && ts.getModuleInstanceState(node) !== 1) {
                 return;
             }
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 251 && ts.isExternalOrCommonJsModule(parent)) {
+            if (parent.kind === 255 && ts.isExternalOrCommonJsModule(parent)) {
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
         }
-        function checkVarDeclaredNamesNotShadowed(node) {
-            if ((ts.getCombinedNodeFlags(node) & 24576) !== 0 || ts.isParameterDeclaration(node)) {
+        function checkCollisionWithGlobalPromiseInGeneratedCode(node, name) {
+            if (!needCollisionCheckForIdentifier(node, name, "Promise")) {
                 return;
             }
-            if (node.kind === 214 && !node.initializer) {
+            if (node.kind === 224 && ts.getModuleInstanceState(node) !== 1) {
+                return;
+            }
+            var parent = getDeclarationContainer(node);
+            if (parent.kind === 255 && ts.isExternalOrCommonJsModule(parent) && parent.flags & 2097152) {
+                error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_functions, ts.declarationNameToString(name), ts.declarationNameToString(name));
+            }
+        }
+        function checkVarDeclaredNamesNotShadowed(node) {
+            if ((ts.getCombinedNodeFlags(node) & 3072) !== 0 || ts.isParameterDeclaration(node)) {
+                return;
+            }
+            if (node.kind === 217 && !node.initializer) {
                 return;
             }
             var symbol = getSymbolOfNode(node);
@@ -21504,16 +23216,16 @@ var ts;
                 if (localDeclarationSymbol &&
                     localDeclarationSymbol !== symbol &&
                     localDeclarationSymbol.flags & 2) {
-                    if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 24576) {
-                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 215);
-                        var container = varDeclList.parent.kind === 196 && varDeclList.parent.parent
+                    if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 3072) {
+                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 218);
+                        var container = varDeclList.parent.kind === 199 && varDeclList.parent.parent
                             ? varDeclList.parent.parent
                             : undefined;
                         var namesShareScope = container &&
-                            (container.kind === 195 && ts.isFunctionLike(container.parent) ||
-                                container.kind === 222 ||
-                                container.kind === 221 ||
-                                container.kind === 251);
+                            (container.kind === 198 && ts.isFunctionLike(container.parent) ||
+                                container.kind === 225 ||
+                                container.kind === 224 ||
+                                container.kind === 255);
                         if (!namesShareScope) {
                             var name_16 = symbolToString(localDeclarationSymbol);
                             error(node, ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name_16, name_16);
@@ -21523,7 +23235,7 @@ var ts;
             }
         }
         function checkParameterInitializer(node) {
-            if (ts.getRootDeclaration(node).kind !== 139) {
+            if (ts.getRootDeclaration(node).kind !== 141) {
                 return;
             }
             var func = ts.getContainingFunction(node);
@@ -21532,7 +23244,7 @@ var ts;
                 if (n.kind === 69) {
                     var referencedSymbol = getNodeLinks(n).resolvedSymbol;
                     if (referencedSymbol && referencedSymbol !== unknownSymbol && getSymbol(func.locals, referencedSymbol.name, 107455) === referencedSymbol) {
-                        if (referencedSymbol.valueDeclaration.kind === 139) {
+                        if (referencedSymbol.valueDeclaration.kind === 141) {
                             if (referencedSymbol.valueDeclaration === node) {
                                 error(n, ts.Diagnostics.Parameter_0_cannot_be_referenced_in_its_initializer, ts.declarationNameToString(node.name));
                                 return;
@@ -21552,26 +23264,33 @@ var ts;
         function checkVariableLikeDeclaration(node) {
             checkDecorators(node);
             checkSourceElement(node.type);
-            if (node.name.kind === 137) {
+            if (node.name.kind === 139) {
                 checkComputedPropertyName(node.name);
                 if (node.initializer) {
                     checkExpressionCached(node.initializer);
                 }
             }
-            if (node.kind === 166) {
-                if (node.propertyName && node.propertyName.kind === 137) {
+            if (node.kind === 168) {
+                if (node.propertyName && node.propertyName.kind === 139) {
                     checkComputedPropertyName(node.propertyName);
                 }
+                var parent_9 = node.parent.parent;
+                var parentType = getTypeForBindingElementParent(parent_9);
+                var name_17 = node.propertyName || node.name;
+                var property = getPropertyOfType(parentType, getTextOfPropertyName(name_17));
+                if (parent_9.initializer && property && getParentOfSymbol(property)) {
+                    checkClassPropertyAccess(parent_9, parent_9.initializer, parentType, property);
+                }
             }
             if (ts.isBindingPattern(node.name)) {
                 ts.forEach(node.name.elements, checkSourceElement);
             }
-            if (node.initializer && ts.getRootDeclaration(node).kind === 139 && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
+            if (node.initializer && ts.getRootDeclaration(node).kind === 141 && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
                 error(node, ts.Diagnostics.A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation);
                 return;
             }
             if (ts.isBindingPattern(node.name)) {
-                if (node.initializer && node.parent.parent.kind !== 203) {
+                if (node.initializer && node.parent.parent.kind !== 206) {
                     checkTypeAssignableTo(checkExpressionCached(node.initializer), getWidenedTypeForVariableLikeDeclaration(node), node, undefined);
                     checkParameterInitializer(node);
                 }
@@ -21580,7 +23299,7 @@ var ts;
             var symbol = getSymbolOfNode(node);
             var type = getTypeOfVariableOrParameterOrProperty(symbol);
             if (node === symbol.valueDeclaration) {
-                if (node.initializer && node.parent.parent.kind !== 203) {
+                if (node.initializer && node.parent.parent.kind !== 206) {
                     checkTypeAssignableTo(checkExpressionCached(node.initializer), type, node, undefined);
                     checkParameterInitializer(node);
                 }
@@ -21594,14 +23313,15 @@ var ts;
                     checkTypeAssignableTo(checkExpressionCached(node.initializer), declarationType, node, undefined);
                 }
             }
-            if (node.kind !== 142 && node.kind !== 141) {
+            if (node.kind !== 144 && node.kind !== 143) {
                 checkExportsOnMergedDeclarations(node);
-                if (node.kind === 214 || node.kind === 166) {
+                if (node.kind === 217 || node.kind === 168) {
                     checkVarDeclaredNamesNotShadowed(node);
                 }
                 checkCollisionWithCapturedSuperVariable(node, node.name);
                 checkCollisionWithCapturedThisVariable(node, node.name);
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+                checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             }
         }
         function checkVariableDeclaration(node) {
@@ -21617,7 +23337,7 @@ var ts;
             ts.forEach(node.declarationList.declarations, checkSourceElement);
         }
         function checkGrammarDisallowedModifiersOnObjectLiteralExpressionMethod(node) {
-            if (node.modifiers && node.parent.kind === 168) {
+            if (node.modifiers && node.parent.kind === 170) {
                 if (ts.isAsyncFunctionLike(node)) {
                     if (node.modifiers.length > 1) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
@@ -21636,7 +23356,7 @@ var ts;
             checkGrammarStatementInAmbientContext(node);
             checkExpression(node.expression);
             checkSourceElement(node.thenStatement);
-            if (node.thenStatement.kind === 197) {
+            if (node.thenStatement.kind === 200) {
                 error(node.thenStatement, ts.Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement);
             }
             checkSourceElement(node.elseStatement);
@@ -21653,12 +23373,12 @@ var ts;
         }
         function checkForStatement(node) {
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.initializer && node.initializer.kind === 215) {
+                if (node.initializer && node.initializer.kind === 218) {
                     checkGrammarVariableDeclarationList(node.initializer);
                 }
             }
             if (node.initializer) {
-                if (node.initializer.kind === 215) {
+                if (node.initializer.kind === 218) {
                     ts.forEach(node.initializer.declarations, checkVariableDeclaration);
                 }
                 else {
@@ -21673,18 +23393,18 @@ var ts;
         }
         function checkForOfStatement(node) {
             checkGrammarForInOrForOfStatement(node);
-            if (node.initializer.kind === 215) {
+            if (node.initializer.kind === 218) {
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
                 var varExpr = node.initializer;
                 var iteratedType = checkRightHandSideOfForOf(node.expression);
-                if (varExpr.kind === 167 || varExpr.kind === 168) {
+                if (varExpr.kind === 169 || varExpr.kind === 170) {
                     checkDestructuringAssignment(varExpr, iteratedType || unknownType);
                 }
                 else {
                     var leftType = checkExpression(varExpr);
-                    checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_of_statement, ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant);
+                    checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_of_statement, ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property);
                     if (iteratedType) {
                         checkTypeAssignableTo(iteratedType, leftType, varExpr, undefined);
                     }
@@ -21694,7 +23414,7 @@ var ts;
         }
         function checkForInStatement(node) {
             checkGrammarForInOrForOfStatement(node);
-            if (node.initializer.kind === 215) {
+            if (node.initializer.kind === 218) {
                 var variable = node.initializer.declarations[0];
                 if (variable && ts.isBindingPattern(variable.name)) {
                     error(variable.name, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
@@ -21704,17 +23424,17 @@ var ts;
             else {
                 var varExpr = node.initializer;
                 var leftType = checkExpression(varExpr);
-                if (varExpr.kind === 167 || varExpr.kind === 168) {
+                if (varExpr.kind === 169 || varExpr.kind === 170) {
                     error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
                 }
                 else if (!isTypeAnyOrAllConstituentTypesHaveKind(leftType, 258)) {
                     error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any);
                 }
                 else {
-                    checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_in_statement, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant);
+                    checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_in_statement, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property);
                 }
             }
-            var rightType = checkExpression(node.expression);
+            var rightType = checkNonNullExpression(node.expression);
             if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 80896 | 512)) {
                 error(node.expression, ts.Diagnostics.The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter);
             }
@@ -21728,7 +23448,7 @@ var ts;
             }
         }
         function checkRightHandSideOfForOf(rhsExpression) {
-            var expressionType = getTypeOfExpression(rhsExpression);
+            var expressionType = checkNonNullExpression(rhsExpression);
             return checkIteratedTypeOrElementType(expressionType, rhsExpression, true);
         }
         function checkIteratedTypeOrElementType(inputType, errorNode, allowStringInput) {
@@ -21763,7 +23483,7 @@ var ts;
             }
             var typeAsIterable = type;
             if (!typeAsIterable.iterableElementType) {
-                if ((type.flags & 4096) && type.target === globalIterableType) {
+                if ((type.flags & 4096) && type.target === getGlobalIterableType()) {
                     typeAsIterable.iterableElementType = type.typeArguments[0];
                 }
                 else {
@@ -21789,7 +23509,7 @@ var ts;
             }
             var typeAsIterator = type;
             if (!typeAsIterator.iteratorElementType) {
-                if ((type.flags & 4096) && type.target === globalIteratorType) {
+                if ((type.flags & 4096) && type.target === getGlobalIteratorType()) {
                     typeAsIterator.iteratorElementType = type.typeArguments[0];
                 }
                 else {
@@ -21824,7 +23544,7 @@ var ts;
             if (isTypeAny(type)) {
                 return undefined;
             }
-            if ((type.flags & 4096) && type.target === globalIterableIteratorType) {
+            if ((type.flags & 4096) && type.target === getGlobalIterableIteratorType()) {
                 return type.typeArguments[0];
             }
             return getElementTypeOfIterable(type, undefined) ||
@@ -21871,8 +23591,12 @@ var ts;
         function checkBreakOrContinueStatement(node) {
             checkGrammarStatementInAmbientContext(node) || checkGrammarBreakOrContinueStatement(node);
         }
-        function isGetAccessorWithAnnotatatedSetAccessor(node) {
-            return !!(node.kind === 146 && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(node.symbol, 147)));
+        function isGetAccessorWithAnnotatedSetAccessor(node) {
+            return !!(node.kind === 148 && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(node.symbol, 149)));
+        }
+        function isUnwrappedReturnTypeVoidOrAny(func, returnType) {
+            var unwrappedReturnType = ts.isAsyncFunctionLike(func) ? getPromisedType(returnType) : returnType;
+            return maybeTypeOfKind(unwrappedReturnType, 16 | 1);
         }
         function checkReturnStatement(node) {
             if (!checkGrammarStatementInAmbientContext(node)) {
@@ -21881,41 +23605,46 @@ var ts;
                     grammarErrorOnFirstToken(node, ts.Diagnostics.A_return_statement_can_only_be_used_within_a_function_body);
                 }
             }
-            if (node.expression) {
-                var func = ts.getContainingFunction(node);
-                if (func) {
-                    var signature = getSignatureFromDeclaration(func);
-                    var returnType = getReturnTypeOfSignature(signature);
-                    var exprType = checkExpressionCached(node.expression);
+            var func = ts.getContainingFunction(node);
+            if (func) {
+                var signature = getSignatureFromDeclaration(func);
+                var returnType = getReturnTypeOfSignature(signature);
+                if (strictNullChecks || node.expression) {
+                    var exprType = node.expression ? checkExpressionCached(node.expression) : undefinedType;
                     if (func.asteriskToken) {
                         return;
                     }
-                    if (func.kind === 147) {
-                        error(node.expression, ts.Diagnostics.Setters_cannot_return_a_value);
+                    if (func.kind === 149) {
+                        if (node.expression) {
+                            error(node.expression, ts.Diagnostics.Setters_cannot_return_a_value);
+                        }
                     }
-                    else if (func.kind === 145) {
-                        if (!checkTypeAssignableTo(exprType, returnType, node.expression)) {
+                    else if (func.kind === 147) {
+                        if (node.expression && !checkTypeAssignableTo(exprType, returnType, node.expression)) {
                             error(node.expression, ts.Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
                         }
                     }
-                    else if (func.type || isGetAccessorWithAnnotatatedSetAccessor(func) || returnType.flags & 134217728) {
+                    else if (func.type || isGetAccessorWithAnnotatedSetAccessor(func)) {
                         if (ts.isAsyncFunctionLike(func)) {
                             var promisedType = getPromisedType(returnType);
-                            var awaitedType = checkAwaitedType(exprType, node.expression, ts.Diagnostics.Return_expression_in_async_function_does_not_have_a_valid_callable_then_member);
+                            var awaitedType = checkAwaitedType(exprType, node.expression || node, ts.Diagnostics.Return_expression_in_async_function_does_not_have_a_valid_callable_then_member);
                             if (promisedType) {
-                                checkTypeAssignableTo(awaitedType, promisedType, node.expression);
+                                checkTypeAssignableTo(awaitedType, promisedType, node.expression || node);
                             }
                         }
                         else {
-                            checkTypeAssignableTo(exprType, returnType, node.expression);
+                            checkTypeAssignableTo(exprType, returnType, node.expression || node);
                         }
                     }
                 }
+                else if (func.kind !== 147 && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType)) {
+                    error(node, ts.Diagnostics.Not_all_code_paths_return_a_value);
+                }
             }
         }
         function checkWithStatement(node) {
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.parserContextFlags & 8) {
+                if (node.flags & 33554432) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_an_async_function_block);
                 }
             }
@@ -21927,9 +23656,8 @@ var ts;
             var firstDefaultClause;
             var hasDuplicateDefaultClause = false;
             var expressionType = checkExpression(node.expression);
-            var expressionTypeIsStringLike = someConstituentTypeHasKind(expressionType, 258);
             ts.forEach(node.caseBlock.clauses, function (clause) {
-                if (clause.kind === 245 && !hasDuplicateDefaultClause) {
+                if (clause.kind === 249 && !hasDuplicateDefaultClause) {
                     if (firstDefaultClause === undefined) {
                         firstDefaultClause = clause;
                     }
@@ -21941,13 +23669,11 @@ var ts;
                         hasDuplicateDefaultClause = true;
                     }
                 }
-                if (produceDiagnostics && clause.kind === 244) {
+                if (produceDiagnostics && clause.kind === 248) {
                     var caseClause = clause;
                     var caseType = checkExpression(caseClause.expression);
-                    var expressionTypeIsAssignableToCaseType = (expressionTypeIsStringLike && someConstituentTypeHasKind(caseType, 258)) ||
-                        isTypeAssignableTo(expressionType, caseType);
-                    if (!expressionTypeIsAssignableToCaseType) {
-                        checkTypeAssignableTo(caseType, expressionType, caseClause.expression, undefined);
+                    if (!isTypeComparableTo(expressionType, caseType)) {
+                        checkTypeComparableTo(caseType, expressionType, caseClause.expression, undefined);
                     }
                 }
                 ts.forEach(clause.statements, checkSourceElement);
@@ -21960,7 +23686,7 @@ var ts;
                     if (ts.isFunctionLike(current)) {
                         break;
                     }
-                    if (current.kind === 210 && current.label.text === node.label.text) {
+                    if (current.kind === 213 && current.label.text === node.label.text) {
                         var sourceFile = ts.getSourceFileOfNode(node);
                         grammarErrorOnNode(node.label, ts.Diagnostics.Duplicate_label_0, ts.getTextOfNodeFromSourceText(sourceFile.text, node.label));
                         break;
@@ -22027,7 +23753,7 @@ var ts;
                     var classDeclaration = type.symbol.valueDeclaration;
                     for (var _i = 0, _a = classDeclaration.members; _i < _a.length; _i++) {
                         var member = _a[_i];
-                        if (!(member.flags & 64) && ts.hasDynamicName(member)) {
+                        if (!(member.flags & 32) && ts.hasDynamicName(member)) {
                             var propType = getTypeOfSymbol(member.symbol);
                             checkIndexConstraintForProperty(member.symbol, propType, type, declaredStringIndexer, stringIndexType, 0);
                             checkIndexConstraintForProperty(member.symbol, propType, type, declaredNumberIndexer, numberIndexType, 1);
@@ -22054,7 +23780,7 @@ var ts;
                     return;
                 }
                 var errorNode;
-                if (prop.valueDeclaration.name.kind === 137 || prop.parent === containingType.symbol) {
+                if (prop.valueDeclaration.name.kind === 139 || prop.parent === containingType.symbol) {
                     errorNode = prop.valueDeclaration;
                 }
                 else if (indexDeclaration) {
@@ -22098,6 +23824,23 @@ var ts;
                 }
             }
         }
+        function checkTypeParameterListsIdentical(node, symbol) {
+            if (symbol.declarations.length === 1) {
+                return;
+            }
+            var firstDecl;
+            for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                var declaration = _a[_i];
+                if (declaration.kind === 220 || declaration.kind === 221) {
+                    if (!firstDecl) {
+                        firstDecl = declaration;
+                    }
+                    else if (!areTypeParametersIdentical(firstDecl.typeParameters, node.typeParameters)) {
+                        error(node.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_type_parameters, node.name.text);
+                    }
+                }
+            }
+        }
         function checkClassExpression(node) {
             checkClassLikeDeclaration(node);
             checkNodeDeferred(node);
@@ -22120,6 +23863,7 @@ var ts;
                 checkTypeNameIsReserved(node.name, ts.Diagnostics.Class_name_cannot_be_0);
                 checkCollisionWithCapturedThisVariable(node, node.name);
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+                checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             }
             checkTypeParameters(node.typeParameters);
             checkExportsOnMergedDeclarations(node);
@@ -22127,12 +23871,14 @@ var ts;
             var type = getDeclaredTypeOfSymbol(symbol);
             var typeWithThis = getTypeWithThisArgument(type);
             var staticType = getTypeOfSymbol(symbol);
+            checkTypeParameterListsIdentical(node, symbol);
             var baseTypeNode = ts.getClassExtendsHeritageClauseElement(node);
             if (baseTypeNode) {
                 var baseTypes = getBaseTypes(type);
                 if (baseTypes.length && produceDiagnostics) {
-                    var baseType = baseTypes[0];
+                    var baseType_1 = baseTypes[0];
                     var staticBaseType = getBaseConstructorTypeOfClass(type);
+                    checkBaseTypeAccessibility(staticBaseType, baseTypeNode);
                     checkSourceElement(baseTypeNode.expression);
                     if (baseTypeNode.typeArguments) {
                         ts.forEach(baseTypeNode.typeArguments, checkSourceElement);
@@ -22143,15 +23889,15 @@ var ts;
                             }
                         }
                     }
-                    checkTypeAssignableTo(typeWithThis, getTypeWithThisArgument(baseType, type.thisType), node.name || node, ts.Diagnostics.Class_0_incorrectly_extends_base_class_1);
+                    checkTypeAssignableTo(typeWithThis, getTypeWithThisArgument(baseType_1, type.thisType), node.name || node, ts.Diagnostics.Class_0_incorrectly_extends_base_class_1);
                     checkTypeAssignableTo(staticType, getTypeWithoutSignatures(staticBaseType), node.name || node, ts.Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1);
                     if (!(staticBaseType.symbol && staticBaseType.symbol.flags & 32)) {
                         var constructors = getInstantiatedConstructorsForTypeArguments(staticBaseType, baseTypeNode.typeArguments);
-                        if (ts.forEach(constructors, function (sig) { return getReturnTypeOfSignature(sig) !== baseType; })) {
+                        if (ts.forEach(constructors, function (sig) { return getReturnTypeOfSignature(sig) !== baseType_1; })) {
                             error(baseTypeNode.expression, ts.Diagnostics.Base_constructors_must_all_have_the_same_return_type);
                         }
                     }
-                    checkKindsOfPropertyMemberOverrides(type, baseType);
+                    checkKindsOfPropertyMemberOverrides(type, baseType_1);
                 }
             }
             var implementedTypeNodes = ts.getClassImplementsHeritageClauseElements(node);
@@ -22181,6 +23927,18 @@ var ts;
                 checkTypeForDuplicateIndexSignatures(node);
             }
         }
+        function checkBaseTypeAccessibility(type, node) {
+            var signatures = getSignaturesOfType(type, 1);
+            if (signatures.length) {
+                var declaration = signatures[0].declaration;
+                if (declaration && declaration.flags & 8) {
+                    var typeClassDeclaration = getClassLikeDeclarationOfSymbol(type.symbol);
+                    if (!isNodeWithinClass(node, typeClassDeclaration)) {
+                        error(node, ts.Diagnostics.Cannot_extend_a_class_0_Class_constructor_is_marked_as_private, node.expression.text);
+                    }
+                }
+            }
+        }
         function getTargetSymbol(s) {
             return s.flags & 16777216 ? getSymbolLinks(s).target : s;
         }
@@ -22202,7 +23960,7 @@ var ts;
                     if (derived === base) {
                         var derivedClassDecl = getClassLikeDeclarationOfSymbol(type.symbol);
                         if (baseDeclarationFlags & 128 && (!derivedClassDecl || !(derivedClassDecl.flags & 128))) {
-                            if (derivedClassDecl.kind === 189) {
+                            if (derivedClassDecl.kind === 191) {
                                 error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, symbolToString(baseProperty), typeToString(baseType));
                             }
                             else {
@@ -22212,10 +23970,10 @@ var ts;
                     }
                     else {
                         var derivedDeclarationFlags = getDeclarationFlagsFromSymbol(derived);
-                        if ((baseDeclarationFlags & 16) || (derivedDeclarationFlags & 16)) {
+                        if ((baseDeclarationFlags & 8) || (derivedDeclarationFlags & 8)) {
                             continue;
                         }
-                        if ((baseDeclarationFlags & 64) !== (derivedDeclarationFlags & 64)) {
+                        if ((baseDeclarationFlags & 32) !== (derivedDeclarationFlags & 32)) {
                             continue;
                         }
                         if ((base.flags & derived.flags & 8192) || ((base.flags & 98308) && (derived.flags & 98308))) {
@@ -22246,7 +24004,7 @@ var ts;
             }
         }
         function isAccessor(kind) {
-            return kind === 146 || kind === 147;
+            return kind === 148 || kind === 149;
         }
         function areTypeParametersIdentical(list1, list2) {
             if (!list1 && !list2) {
@@ -22312,12 +24070,8 @@ var ts;
                 checkTypeNameIsReserved(node.name, ts.Diagnostics.Interface_name_cannot_be_0);
                 checkExportsOnMergedDeclarations(node);
                 var symbol = getSymbolOfNode(node);
-                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 218);
-                if (symbol.declarations.length > 1) {
-                    if (node !== firstInterfaceDecl && !areTypeParametersIdentical(firstInterfaceDecl.typeParameters, node.typeParameters)) {
-                        error(node.name, ts.Diagnostics.All_declarations_of_an_interface_must_have_identical_type_parameters);
-                    }
-                }
+                checkTypeParameterListsIdentical(node, symbol);
+                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 221);
                 if (node === firstInterfaceDecl) {
                     var type = getDeclaredTypeOfSymbol(symbol);
                     var typeWithThis = getTypeWithThisArgument(type);
@@ -22348,7 +24102,7 @@ var ts;
         }
         function computeEnumMemberValues(node) {
             var nodeLinks = getNodeLinks(node);
-            if (!(nodeLinks.flags & 8192)) {
+            if (!(nodeLinks.flags & 16384)) {
                 var enumSymbol = getSymbolOfNode(node);
                 var enumType = getDeclaredTypeOfSymbol(enumSymbol);
                 var autoValue = 0;
@@ -22381,7 +24135,7 @@ var ts;
                         autoValue++;
                     }
                 }
-                nodeLinks.flags |= 8192;
+                nodeLinks.flags |= 16384;
             }
             function computeConstantValueForEnumMemberInitializer(initializer, enumType, enumIsConst, ambient) {
                 var reportError = true;
@@ -22410,7 +24164,7 @@ var ts;
                 return value;
                 function evalConstant(e) {
                     switch (e.kind) {
-                        case 182:
+                        case 184:
                             var value_1 = evalConstant(e.operand);
                             if (value_1 === undefined) {
                                 return undefined;
@@ -22421,7 +24175,7 @@ var ts;
                                 case 50: return ~value_1;
                             }
                             return undefined;
-                        case 184:
+                        case 186:
                             var left = evalConstant(e.left);
                             if (left === undefined) {
                                 return undefined;
@@ -22446,22 +24200,22 @@ var ts;
                             return undefined;
                         case 8:
                             return +e.text;
-                        case 175:
+                        case 177:
                             return evalConstant(e.expression);
                         case 69:
-                        case 170:
-                        case 169:
+                        case 172:
+                        case 171:
                             var member = initializer.parent;
                             var currentType = getTypeOfSymbol(getSymbolOfNode(member.parent));
                             var enumType_1;
-                            var propertyName;
+                            var propertyName = void 0;
                             if (e.kind === 69) {
                                 enumType_1 = currentType;
                                 propertyName = e.text;
                             }
                             else {
-                                var expression;
-                                if (e.kind === 170) {
+                                var expression = void 0;
+                                if (e.kind === 172) {
                                     if (e.argumentExpression === undefined ||
                                         e.argumentExpression.kind !== 9) {
                                         return undefined;
@@ -22478,7 +24232,7 @@ var ts;
                                     if (current.kind === 69) {
                                         break;
                                     }
-                                    else if (current.kind === 169) {
+                                    else if (current.kind === 171) {
                                         current = current.expression;
                                     }
                                     else {
@@ -22519,6 +24273,7 @@ var ts;
             checkTypeNameIsReserved(node.name, ts.Diagnostics.Enum_name_cannot_be_0);
             checkCollisionWithCapturedThisVariable(node, node.name);
             checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+            checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             checkExportsOnMergedDeclarations(node);
             computeEnumMemberValues(node);
             var enumIsConst = ts.isConst(node);
@@ -22535,9 +24290,9 @@ var ts;
                         }
                     });
                 }
-                var seenEnumMissingInitialInitializer = false;
+                var seenEnumMissingInitialInitializer_1 = false;
                 ts.forEach(enumSymbol.declarations, function (declaration) {
-                    if (declaration.kind !== 220) {
+                    if (declaration.kind !== 223) {
                         return false;
                     }
                     var enumDeclaration = declaration;
@@ -22546,11 +24301,11 @@ var ts;
                     }
                     var firstEnumMember = enumDeclaration.members[0];
                     if (!firstEnumMember.initializer) {
-                        if (seenEnumMissingInitialInitializer) {
+                        if (seenEnumMissingInitialInitializer_1) {
                             error(firstEnumMember.name, ts.Diagnostics.In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element);
                         }
                         else {
-                            seenEnumMissingInitialInitializer = true;
+                            seenEnumMissingInitialInitializer_1 = true;
                         }
                     }
                 });
@@ -22560,8 +24315,8 @@ var ts;
             var declarations = symbol.declarations;
             for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
                 var declaration = declarations_5[_i];
-                if ((declaration.kind === 217 ||
-                    (declaration.kind === 216 && ts.nodeIsPresent(declaration.body))) &&
+                if ((declaration.kind === 220 ||
+                    (declaration.kind === 219 && ts.nodeIsPresent(declaration.body))) &&
                     !ts.isInAmbientContext(declaration)) {
                     return declaration;
                 }
@@ -22602,6 +24357,7 @@ var ts;
                 }
                 checkCollisionWithCapturedThisVariable(node, node.name);
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+                checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
                 checkExportsOnMergedDeclarations(node);
                 var symbol = getSymbolOfNode(node);
                 if (symbol.flags & 512
@@ -22617,7 +24373,7 @@ var ts;
                             error(node.name, ts.Diagnostics.A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged);
                         }
                     }
-                    var mergedClass = ts.getDeclarationOfKind(symbol, 217);
+                    var mergedClass = ts.getDeclarationOfKind(symbol, 220);
                     if (mergedClass &&
                         inSameLexicalScope(node, mergedClass)) {
                         getNodeLinks(node).flags |= 32768;
@@ -22655,40 +24411,40 @@ var ts;
         }
         function checkModuleAugmentationElement(node, isGlobalAugmentation) {
             switch (node.kind) {
-                case 196:
+                case 199:
                     for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
                         checkModuleAugmentationElement(decl, isGlobalAugmentation);
                     }
                     break;
-                case 230:
-                case 231:
+                case 234:
+                case 235:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Exports_and_export_assignments_are_not_permitted_in_module_augmentations);
                     break;
-                case 224:
+                case 228:
                     if (node.moduleReference.kind !== 9) {
                         error(node.name, ts.Diagnostics.Module_augmentation_cannot_introduce_new_names_in_the_top_level_scope);
                         break;
                     }
-                case 225:
+                case 229:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module);
                     break;
-                case 166:
-                case 214:
-                    var name_17 = node.name;
-                    if (ts.isBindingPattern(name_17)) {
-                        for (var _b = 0, _c = name_17.elements; _b < _c.length; _b++) {
+                case 168:
+                case 217:
+                    var name_18 = node.name;
+                    if (ts.isBindingPattern(name_18)) {
+                        for (var _b = 0, _c = name_18.elements; _b < _c.length; _b++) {
                             var el = _c[_b];
                             checkModuleAugmentationElement(el, isGlobalAugmentation);
                         }
                         break;
                     }
-                case 217:
                 case 220:
-                case 216:
-                case 218:
-                case 221:
+                case 223:
                 case 219:
+                case 221:
+                case 224:
+                case 222:
                     var symbol = getSymbolOfNode(node);
                     if (symbol) {
                         var reportError = !(symbol.flags & 33554432);
@@ -22697,7 +24453,7 @@ var ts;
                                 reportError = symbol.parent !== undefined;
                             }
                             else {
-                                reportError = ts.isExternalModuleAugmentation(symbol.parent.valueDeclaration);
+                                reportError = ts.isExternalModuleAugmentation(symbol.parent.declarations[0]);
                             }
                         }
                         if (reportError) {
@@ -22709,10 +24465,10 @@ var ts;
         }
         function getFirstIdentifier(node) {
             while (true) {
-                if (node.kind === 136) {
+                if (node.kind === 138) {
                     node = node.left;
                 }
-                else if (node.kind === 169) {
+                else if (node.kind === 171) {
                     node = node.expression;
                 }
                 else {
@@ -22728,9 +24484,9 @@ var ts;
                 error(moduleName, ts.Diagnostics.String_literal_expected);
                 return false;
             }
-            var inAmbientExternalModule = node.parent.kind === 222 && ts.isAmbientModule(node.parent.parent);
-            if (node.parent.kind !== 251 && !inAmbientExternalModule) {
-                error(moduleName, node.kind === 231 ?
+            var inAmbientExternalModule = node.parent.kind === 225 && ts.isAmbientModule(node.parent.parent);
+            if (node.parent.kind !== 255 && !inAmbientExternalModule) {
+                error(moduleName, node.kind === 235 ?
                     ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace :
                     ts.Diagnostics.Import_declarations_in_a_namespace_cannot_reference_a_module);
                 return false;
@@ -22747,11 +24503,11 @@ var ts;
             var symbol = getSymbolOfNode(node);
             var target = resolveAlias(symbol);
             if (target !== unknownSymbol) {
-                var excludedMeanings = (symbol.flags & 107455 ? 107455 : 0) |
+                var excludedMeanings = (symbol.flags & (107455 | 1048576) ? 107455 : 0) |
                     (symbol.flags & 793056 ? 793056 : 0) |
                     (symbol.flags & 1536 ? 1536 : 0);
                 if (target.flags & excludedMeanings) {
-                    var message = node.kind === 233 ?
+                    var message = node.kind === 237 ?
                         ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 :
                         ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0;
                     error(node, message, symbolToString(symbol));
@@ -22761,13 +24517,14 @@ var ts;
         function checkImportBinding(node) {
             checkCollisionWithCapturedThisVariable(node, node.name);
             checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+            checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             checkAliasSymbol(node);
         }
         function checkImportDeclaration(node) {
             if (checkGrammarModuleElementContext(node, ts.Diagnostics.An_import_declaration_can_only_be_used_in_a_namespace_or_module)) {
                 return;
             }
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 1022)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 959)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_import_declaration_cannot_have_modifiers);
             }
             if (checkExternalImportOrExportDeclaration(node)) {
@@ -22777,7 +24534,7 @@ var ts;
                         checkImportBinding(importClause);
                     }
                     if (importClause.namedBindings) {
-                        if (importClause.namedBindings.kind === 227) {
+                        if (importClause.namedBindings.kind === 231) {
                             checkImportBinding(importClause.namedBindings);
                         }
                         else {
@@ -22794,7 +24551,7 @@ var ts;
             checkGrammarDecorators(node) || checkGrammarModifiers(node);
             if (ts.isInternalModuleImportEqualsDeclaration(node) || checkExternalImportOrExportDeclaration(node)) {
                 checkImportBinding(node);
-                if (node.flags & 2) {
+                if (node.flags & 1) {
                     markExportAsReferenced(node);
                 }
                 if (ts.isInternalModuleImportEqualsDeclaration(node)) {
@@ -22812,7 +24569,7 @@ var ts;
                     }
                 }
                 else {
-                    if (modulekind === 5 && !ts.isInAmbientContext(node)) {
+                    if (modulekind === ts.ModuleKind.ES6 && !ts.isInAmbientContext(node)) {
                         grammarErrorOnNode(node, ts.Diagnostics.Import_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_import_Asterisk_as_ns_from_mod_import_a_from_mod_import_d_from_mod_or_another_module_format_instead);
                     }
                 }
@@ -22822,27 +24579,27 @@ var ts;
             if (checkGrammarModuleElementContext(node, ts.Diagnostics.An_export_declaration_can_only_be_used_in_a_module)) {
                 return;
             }
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 1022)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 959)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_declaration_cannot_have_modifiers);
             }
             if (!node.moduleSpecifier || checkExternalImportOrExportDeclaration(node)) {
                 if (node.exportClause) {
                     ts.forEach(node.exportClause.elements, checkExportSpecifier);
-                    var inAmbientExternalModule = node.parent.kind === 222 && ts.isAmbientModule(node.parent.parent);
-                    if (node.parent.kind !== 251 && !inAmbientExternalModule) {
+                    var inAmbientExternalModule = node.parent.kind === 225 && ts.isAmbientModule(node.parent.parent);
+                    if (node.parent.kind !== 255 && !inAmbientExternalModule) {
                         error(node, ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace);
                     }
                 }
                 else {
                     var moduleSymbol = resolveExternalModuleName(node, node.moduleSpecifier);
-                    if (moduleSymbol && moduleSymbol.exports["export="]) {
+                    if (moduleSymbol && hasExportAssignmentSymbol(moduleSymbol)) {
                         error(node.moduleSpecifier, ts.Diagnostics.Module_0_uses_export_and_cannot_be_used_with_export_Asterisk, symbolToString(moduleSymbol));
                     }
                 }
             }
         }
         function checkGrammarModuleElementContext(node, errorMessage) {
-            if (node.parent.kind !== 251 && node.parent.kind !== 222 && node.parent.kind !== 221) {
+            if (node.parent.kind !== 255 && node.parent.kind !== 225 && node.parent.kind !== 224) {
                 return grammarErrorOnFirstToken(node, errorMessage);
             }
         }
@@ -22851,7 +24608,7 @@ var ts;
             if (!node.parent.parent.moduleSpecifier) {
                 var exportedName = node.propertyName || node.name;
                 var symbol = resolveName(exportedName, exportedName.text, 107455 | 793056 | 1536 | 8388608, undefined, undefined);
-                if (symbol && isGlobalSourceFile(getDeclarationContainer(symbol.declarations[0]))) {
+                if (symbol && (symbol === undefinedSymbol || isGlobalSourceFile(getDeclarationContainer(symbol.declarations[0])))) {
                     error(exportedName, ts.Diagnostics.Cannot_re_export_name_that_is_not_defined_in_the_module);
                 }
                 else {
@@ -22863,12 +24620,12 @@ var ts;
             if (checkGrammarModuleElementContext(node, ts.Diagnostics.An_export_assignment_can_only_be_used_in_a_module)) {
                 return;
             }
-            var container = node.parent.kind === 251 ? node.parent : node.parent.parent;
-            if (container.kind === 221 && !ts.isAmbientModule(container)) {
+            var container = node.parent.kind === 255 ? node.parent : node.parent.parent;
+            if (container.kind === 224 && !ts.isAmbientModule(container)) {
                 error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace);
                 return;
             }
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 1022)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 959)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_assignment_cannot_have_modifiers);
             }
             if (node.expression.kind === 69) {
@@ -22879,10 +24636,10 @@ var ts;
             }
             checkExternalModuleExports(container);
             if (node.isExportEquals && !ts.isInAmbientContext(node)) {
-                if (modulekind === 5) {
+                if (modulekind === ts.ModuleKind.ES6) {
                     grammarErrorOnNode(node, ts.Diagnostics.Export_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_export_default_or_another_module_format_instead);
                 }
-                else if (modulekind === 4) {
+                else if (modulekind === ts.ModuleKind.System) {
                     grammarErrorOnNode(node, ts.Diagnostics.Export_assignment_is_not_supported_when_module_flag_is_system);
                 }
             }
@@ -22912,11 +24669,17 @@ var ts;
                         continue;
                     }
                     var _a = exports_2[id], declarations = _a.declarations, flags = _a.flags;
-                    if (!(flags & (1536 | 64 | 384)) && (flags & 524288 ? declarations.length - 1 : declarations.length) > 1) {
-                        var exportedDeclarations = ts.filter(declarations, isNotOverload);
-                        if (exportedDeclarations.length > 1) {
-                            for (var _i = 0, exportedDeclarations_1 = exportedDeclarations; _i < exportedDeclarations_1.length; _i++) {
-                                var declaration = exportedDeclarations_1[_i];
+                    if (flags & (1536 | 64 | 384)) {
+                        continue;
+                    }
+                    var exportedDeclarationsCount = ts.countWhere(declarations, isNotOverload);
+                    if (flags & 524288 && exportedDeclarationsCount <= 2) {
+                        continue;
+                    }
+                    if (exportedDeclarationsCount > 1) {
+                        for (var _i = 0, declarations_6 = declarations; _i < declarations_6.length; _i++) {
+                            var declaration = declarations_6[_i];
+                            if (isNotOverload(declaration)) {
                                 diagnostics.add(ts.createDiagnosticForNode(declaration, ts.Diagnostics.Cannot_redeclare_exported_variable_0, id));
                             }
                         }
@@ -22925,7 +24688,7 @@ var ts;
                 links.exportsChecked = true;
             }
             function isNotOverload(declaration) {
-                return declaration.kind !== 216 || !!declaration.body;
+                return declaration.kind !== 219 || !!declaration.body;
             }
         }
         function checkSourceElement(node) {
@@ -22935,118 +24698,118 @@ var ts;
             var kind = node.kind;
             if (cancellationToken) {
                 switch (kind) {
+                    case 224:
+                    case 220:
                     case 221:
-                    case 217:
-                    case 218:
-                    case 216:
+                    case 219:
                         cancellationToken.throwIfCancellationRequested();
                 }
             }
             switch (kind) {
-                case 138:
+                case 140:
                     return checkTypeParameter(node);
-                case 139:
-                    return checkParameter(node);
-                case 142:
                 case 141:
-                    return checkPropertyDeclaration(node);
-                case 153:
-                case 154:
-                case 148:
-                case 149:
-                    return checkSignatureDeclaration(node);
-                case 150:
-                    return checkSignatureDeclaration(node);
+                    return checkParameter(node);
                 case 144:
                 case 143:
-                    return checkMethodDeclaration(node);
-                case 145:
-                    return checkConstructorDeclaration(node);
-                case 146:
-                case 147:
-                    return checkAccessorDeclaration(node);
-                case 152:
-                    return checkTypeReferenceNode(node);
-                case 151:
-                    return checkTypePredicate(node);
+                    return checkPropertyDeclaration(node);
                 case 155:
-                    return checkTypeQuery(node);
                 case 156:
-                    return checkTypeLiteral(node);
+                case 150:
+                case 151:
+                    return checkSignatureDeclaration(node);
+                case 152:
+                    return checkSignatureDeclaration(node);
+                case 146:
+                case 145:
+                    return checkMethodDeclaration(node);
+                case 147:
+                    return checkConstructorDeclaration(node);
+                case 148:
+                case 149:
+                    return checkAccessorDeclaration(node);
+                case 154:
+                    return checkTypeReferenceNode(node);
+                case 153:
+                    return checkTypePredicate(node);
                 case 157:
-                    return checkArrayType(node);
+                    return checkTypeQuery(node);
                 case 158:
-                    return checkTupleType(node);
+                    return checkTypeLiteral(node);
                 case 159:
+                    return checkArrayType(node);
                 case 160:
-                    return checkUnionOrIntersectionType(node);
+                    return checkTupleType(node);
                 case 161:
+                case 162:
+                    return checkUnionOrIntersectionType(node);
+                case 163:
                     return checkSourceElement(node.type);
-                case 216:
-                    return checkFunctionDeclaration(node);
-                case 195:
-                case 222:
-                    return checkBlock(node);
-                case 196:
-                    return checkVariableStatement(node);
-                case 198:
-                    return checkExpressionStatement(node);
-                case 199:
-                    return checkIfStatement(node);
-                case 200:
-                    return checkDoStatement(node);
-                case 201:
-                    return checkWhileStatement(node);
-                case 202:
-                    return checkForStatement(node);
-                case 203:
-                    return checkForInStatement(node);
-                case 204:
-                    return checkForOfStatement(node);
-                case 205:
-                case 206:
-                    return checkBreakOrContinueStatement(node);
-                case 207:
-                    return checkReturnStatement(node);
-                case 208:
-                    return checkWithStatement(node);
-                case 209:
-                    return checkSwitchStatement(node);
-                case 210:
-                    return checkLabeledStatement(node);
-                case 211:
-                    return checkThrowStatement(node);
-                case 212:
-                    return checkTryStatement(node);
-                case 214:
-                    return checkVariableDeclaration(node);
-                case 166:
-                    return checkBindingElement(node);
-                case 217:
-                    return checkClassDeclaration(node);
-                case 218:
-                    return checkInterfaceDeclaration(node);
                 case 219:
-                    return checkTypeAliasDeclaration(node);
-                case 220:
-                    return checkEnumDeclaration(node);
-                case 221:
-                    return checkModuleDeclaration(node);
+                    return checkFunctionDeclaration(node);
+                case 198:
                 case 225:
-                    return checkImportDeclaration(node);
-                case 224:
-                    return checkImportEqualsDeclaration(node);
-                case 231:
-                    return checkExportDeclaration(node);
-                case 230:
-                    return checkExportAssignment(node);
-                case 197:
-                    checkGrammarStatementInAmbientContext(node);
-                    return;
+                    return checkBlock(node);
+                case 199:
+                    return checkVariableStatement(node);
+                case 201:
+                    return checkExpressionStatement(node);
+                case 202:
+                    return checkIfStatement(node);
+                case 203:
+                    return checkDoStatement(node);
+                case 204:
+                    return checkWhileStatement(node);
+                case 205:
+                    return checkForStatement(node);
+                case 206:
+                    return checkForInStatement(node);
+                case 207:
+                    return checkForOfStatement(node);
+                case 208:
+                case 209:
+                    return checkBreakOrContinueStatement(node);
+                case 210:
+                    return checkReturnStatement(node);
+                case 211:
+                    return checkWithStatement(node);
+                case 212:
+                    return checkSwitchStatement(node);
                 case 213:
+                    return checkLabeledStatement(node);
+                case 214:
+                    return checkThrowStatement(node);
+                case 215:
+                    return checkTryStatement(node);
+                case 217:
+                    return checkVariableDeclaration(node);
+                case 168:
+                    return checkBindingElement(node);
+                case 220:
+                    return checkClassDeclaration(node);
+                case 221:
+                    return checkInterfaceDeclaration(node);
+                case 222:
+                    return checkTypeAliasDeclaration(node);
+                case 223:
+                    return checkEnumDeclaration(node);
+                case 224:
+                    return checkModuleDeclaration(node);
+                case 229:
+                    return checkImportDeclaration(node);
+                case 228:
+                    return checkImportEqualsDeclaration(node);
+                case 235:
+                    return checkExportDeclaration(node);
+                case 234:
+                    return checkExportAssignment(node);
+                case 200:
                     checkGrammarStatementInAmbientContext(node);
                     return;
-                case 234:
+                case 216:
+                    checkGrammarStatementInAmbientContext(node);
+                    return;
+                case 238:
                     return checkMissingDeclaration(node);
             }
         }
@@ -23059,17 +24822,17 @@ var ts;
             for (var _i = 0, deferredNodes_1 = deferredNodes; _i < deferredNodes_1.length; _i++) {
                 var node = deferredNodes_1[_i];
                 switch (node.kind) {
-                    case 176:
-                    case 177:
-                    case 144:
-                    case 143:
+                    case 178:
+                    case 179:
+                    case 146:
+                    case 145:
                         checkFunctionExpressionOrObjectLiteralMethodDeferred(node);
                         break;
-                    case 146:
-                    case 147:
+                    case 148:
+                    case 149:
                         checkAccessorDeferred(node);
                         break;
-                    case 189:
+                    case 191:
                         checkClassExpressionDeferred(node);
                         break;
                 }
@@ -23134,7 +24897,7 @@ var ts;
         function isInsideWithStatementBody(node) {
             if (node) {
                 while (node.parent) {
-                    if (node.parent.kind === 208 && node.parent.statement === node) {
+                    if (node.parent.kind === 211 && node.parent.statement === node) {
                         return true;
                     }
                     node = node.parent;
@@ -23156,28 +24919,28 @@ var ts;
                         copySymbols(location.locals, meaning);
                     }
                     switch (location.kind) {
-                        case 251:
+                        case 255:
                             if (!ts.isExternalOrCommonJsModule(location)) {
                                 break;
                             }
-                        case 221:
+                        case 224:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8914931);
                             break;
-                        case 220:
+                        case 223:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8);
                             break;
-                        case 189:
+                        case 191:
                             var className = location.name;
                             if (className) {
                                 copySymbol(location.symbol, meaning);
                             }
-                        case 217:
-                        case 218:
-                            if (!(memberFlags & 64)) {
+                        case 220:
+                        case 221:
+                            if (!(memberFlags & 32)) {
                                 copySymbols(getSymbolOfNode(location).members, meaning & 793056);
                             }
                             break;
-                        case 176:
+                        case 178:
                             var funcName = location.name;
                             if (funcName) {
                                 copySymbol(location.symbol, meaning);
@@ -23216,36 +24979,50 @@ var ts;
         }
         function isTypeDeclaration(node) {
             switch (node.kind) {
-                case 138:
-                case 217:
-                case 218:
-                case 219:
+                case 140:
                 case 220:
+                case 221:
+                case 222:
+                case 223:
                     return true;
             }
         }
         function isTypeReferenceIdentifier(entityName) {
             var node = entityName;
-            while (node.parent && node.parent.kind === 136) {
+            while (node.parent && node.parent.kind === 138) {
                 node = node.parent;
             }
-            return node.parent && node.parent.kind === 152;
+            return node.parent && node.parent.kind === 154;
         }
         function isHeritageClauseElementIdentifier(entityName) {
             var node = entityName;
-            while (node.parent && node.parent.kind === 169) {
+            while (node.parent && node.parent.kind === 171) {
                 node = node.parent;
             }
-            return node.parent && node.parent.kind === 191;
+            return node.parent && node.parent.kind === 193;
+        }
+        function forEachEnclosingClass(node, callback) {
+            var result;
+            while (true) {
+                node = ts.getContainingClass(node);
+                if (!node)
+                    break;
+                if (result = callback(node))
+                    break;
+            }
+            return result;
+        }
+        function isNodeWithinClass(node, classDeclaration) {
+            return !!forEachEnclosingClass(node, function (n) { return n === classDeclaration; });
         }
         function getLeftSideOfImportEqualsOrExportAssignment(nodeOnRightSide) {
-            while (nodeOnRightSide.parent.kind === 136) {
+            while (nodeOnRightSide.parent.kind === 138) {
                 nodeOnRightSide = nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 224) {
+            if (nodeOnRightSide.parent.kind === 228) {
                 return nodeOnRightSide.parent.moduleReference === nodeOnRightSide && nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 230) {
+            if (nodeOnRightSide.parent.kind === 234) {
                 return nodeOnRightSide.parent.expression === nodeOnRightSide && nodeOnRightSide.parent;
             }
             return undefined;
@@ -23257,10 +25034,22 @@ var ts;
             if (ts.isDeclarationName(entityName)) {
                 return getSymbolOfNode(entityName.parent);
             }
-            if (entityName.parent.kind === 230) {
+            if (ts.isInJavaScriptFile(entityName) && entityName.parent.kind === 171) {
+                var specialPropertyAssignmentKind = ts.getSpecialPropertyAssignmentKind(entityName.parent.parent);
+                switch (specialPropertyAssignmentKind) {
+                    case 1:
+                    case 3:
+                        return getSymbolOfNode(entityName.parent);
+                    case 4:
+                    case 2:
+                        return getSymbolOfNode(entityName.parent.parent);
+                    default:
+                }
+            }
+            if (entityName.parent.kind === 234) {
                 return resolveEntityName(entityName, 107455 | 793056 | 1536 | 8388608);
             }
-            if (entityName.kind !== 169) {
+            if (entityName.kind !== 171) {
                 if (isInRightSideOfImportOrExportAssignment(entityName)) {
                     return getSymbolOfPartOfRightHandSideOfImportEquals(entityName);
                 }
@@ -23270,7 +25059,7 @@ var ts;
             }
             if (isHeritageClauseElementIdentifier(entityName)) {
                 var meaning = 0;
-                if (entityName.parent.kind === 191) {
+                if (entityName.parent.kind === 193) {
                     meaning = 793056;
                     if (ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
                         meaning |= 107455;
@@ -23282,27 +25071,25 @@ var ts;
                 meaning |= 8388608;
                 return resolveEntityName(entityName, meaning);
             }
-            else if ((entityName.parent.kind === 238) ||
-                (entityName.parent.kind === 237) ||
-                (entityName.parent.kind === 240)) {
-                return getJsxElementTagSymbol(entityName.parent);
-            }
             else if (ts.isExpression(entityName)) {
                 if (ts.nodeIsMissing(entityName)) {
                     return undefined;
                 }
                 if (entityName.kind === 69) {
+                    if (ts.isJSXTagName(entityName) && isJsxIntrinsicIdentifier(entityName)) {
+                        return getIntrinsicTagSymbol(entityName.parent);
+                    }
                     var meaning = 107455 | 8388608;
                     return resolveEntityName(entityName, meaning);
                 }
-                else if (entityName.kind === 169) {
+                else if (entityName.kind === 171) {
                     var symbol = getNodeLinks(entityName).resolvedSymbol;
                     if (!symbol) {
                         checkPropertyAccessExpression(entityName);
                     }
                     return getNodeLinks(entityName).resolvedSymbol;
                 }
-                else if (entityName.kind === 136) {
+                else if (entityName.kind === 138) {
                     var symbol = getNodeLinks(entityName).resolvedSymbol;
                     if (!symbol) {
                         checkQualifiedName(entityName);
@@ -23311,14 +25098,14 @@ var ts;
                 }
             }
             else if (isTypeReferenceIdentifier(entityName)) {
-                var meaning = entityName.parent.kind === 152 ? 793056 : 1536;
+                var meaning = entityName.parent.kind === 154 ? 793056 : 1536;
                 meaning |= 8388608;
                 return resolveEntityName(entityName, meaning);
             }
-            else if (entityName.parent.kind === 241) {
+            else if (entityName.parent.kind === 245) {
                 return getJsxAttributePropertySymbol(entityName.parent);
             }
-            if (entityName.parent.kind === 151) {
+            if (entityName.parent.kind === 153) {
                 return resolveEntityName(entityName, 1);
             }
             return undefined;
@@ -23332,12 +25119,12 @@ var ts;
             }
             if (node.kind === 69) {
                 if (isInRightSideOfImportOrExportAssignment(node)) {
-                    return node.parent.kind === 230
+                    return node.parent.kind === 234
                         ? getSymbolOfEntityNameOrPropertyAccessExpression(node)
                         : getSymbolOfPartOfRightHandSideOfImportEquals(node);
                 }
-                else if (node.parent.kind === 166 &&
-                    node.parent.parent.kind === 164 &&
+                else if (node.parent.kind === 168 &&
+                    node.parent.parent.kind === 166 &&
                     node === node.parent.propertyName) {
                     var typeOfPattern = getTypeOfNode(node.parent.parent);
                     var propertyDeclaration = typeOfPattern && getPropertyOfType(typeOfPattern, node.text);
@@ -23348,30 +25135,30 @@ var ts;
             }
             switch (node.kind) {
                 case 69:
-                case 169:
-                case 136:
+                case 171:
+                case 138:
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
                 case 97:
                 case 95:
                     var type = ts.isExpression(node) ? checkExpression(node) : getTypeFromTypeNode(node);
                     return type.symbol;
-                case 162:
+                case 164:
                     return getTypeFromTypeNode(node).symbol;
                 case 121:
                     var constructorDeclaration = node.parent;
-                    if (constructorDeclaration && constructorDeclaration.kind === 145) {
+                    if (constructorDeclaration && constructorDeclaration.kind === 147) {
                         return constructorDeclaration.parent.symbol;
                     }
                     return undefined;
                 case 9:
                     if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) &&
                         ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) ||
-                        ((node.parent.kind === 225 || node.parent.kind === 231) &&
+                        ((node.parent.kind === 229 || node.parent.kind === 235) &&
                             node.parent.moduleSpecifier === node)) {
                         return resolveExternalModuleName(node, node);
                     }
                 case 8:
-                    if (node.parent.kind === 170 && node.parent.argumentExpression === node) {
+                    if (node.parent.kind === 172 && node.parent.argumentExpression === node) {
                         var objectType = checkExpression(node.parent.expression);
                         if (objectType === unknownType)
                             return undefined;
@@ -23385,7 +25172,7 @@ var ts;
             return undefined;
         }
         function getShorthandAssignmentValueSymbol(location) {
-            if (location && location.kind === 249) {
+            if (location && location.kind === 253) {
                 return resolveEntityName(location.name, 107455 | 8388608);
             }
             return undefined;
@@ -23442,7 +25229,7 @@ var ts;
         }
         function getParentTypeOfClassElement(node) {
             var classSymbol = getSymbolOfNode(node.parent);
-            return node.flags & 64
+            return node.flags & 32
                 ? getTypeOfSymbol(classSymbol)
                 : getDeclaredTypeOfSymbol(classSymbol);
         }
@@ -23460,15 +25247,15 @@ var ts;
         }
         function getRootSymbols(symbol) {
             if (symbol.flags & 268435456) {
-                var symbols = [];
-                var name_18 = symbol.name;
+                var symbols_3 = [];
+                var name_19 = symbol.name;
                 ts.forEach(getSymbolLinks(symbol).containingType.types, function (t) {
-                    var symbol = getPropertyOfType(t, name_18);
+                    var symbol = getPropertyOfType(t, name_19);
                     if (symbol) {
-                        symbols.push(symbol);
+                        symbols_3.push(symbol);
                     }
                 });
-                return symbols;
+                return symbols_3;
             }
             else if (symbol.flags & 67108864) {
                 var target = getSymbolLinks(symbol).target;
@@ -23486,7 +25273,7 @@ var ts;
             if (!moduleSymbol) {
                 return true;
             }
-            var hasExportAssignment = getExportAssignmentSymbol(moduleSymbol) !== undefined;
+            var hasExportAssignment = hasExportAssignmentSymbol(moduleSymbol);
             moduleSymbol = resolveExternalModuleSymbol(moduleSymbol);
             var symbolLinks = getSymbolLinks(moduleSymbol);
             if (symbolLinks.exportsSomeValue === undefined) {
@@ -23512,11 +25299,11 @@ var ts;
                 }
                 var parentSymbol = getParentOfSymbol(symbol);
                 if (parentSymbol) {
-                    if (parentSymbol.flags & 512 && parentSymbol.valueDeclaration.kind === 251) {
+                    if (parentSymbol.flags & 512 && parentSymbol.valueDeclaration.kind === 255) {
                         return parentSymbol.valueDeclaration;
                     }
                     for (var n = node.parent; n; n = n.parent) {
-                        if ((n.kind === 221 || n.kind === 220) && getSymbolOfNode(n) === parentSymbol) {
+                        if ((n.kind === 224 || n.kind === 223) && getSymbolOfNode(n) === parentSymbol) {
                             return n;
                         }
                     }
@@ -23527,54 +25314,56 @@ var ts;
             var symbol = getReferencedValueSymbol(node);
             return symbol && symbol.flags & 8388608 ? getDeclarationOfAliasSymbol(symbol) : undefined;
         }
-        function isStatementWithLocals(node) {
-            switch (node.kind) {
-                case 195:
-                case 223:
-                case 202:
-                case 203:
-                case 204:
-                    return true;
-            }
-            return false;
-        }
-        function isNestedRedeclarationSymbol(symbol) {
+        function isSymbolOfDeclarationWithCollidingName(symbol) {
             if (symbol.flags & 418) {
                 var links = getSymbolLinks(symbol);
-                if (links.isNestedRedeclaration === undefined) {
+                if (links.isDeclarationWithCollidingName === undefined) {
                     var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
-                    links.isNestedRedeclaration = isStatementWithLocals(container) &&
-                        !!resolveName(container.parent, symbol.name, 107455, undefined, undefined);
+                    if (ts.isStatementWithLocals(container)) {
+                        var nodeLinks_1 = getNodeLinks(symbol.valueDeclaration);
+                        if (!!resolveName(container.parent, symbol.name, 107455, undefined, undefined)) {
+                            links.isDeclarationWithCollidingName = true;
+                        }
+                        else if (nodeLinks_1.flags & 131072) {
+                            var isDeclaredInLoop = nodeLinks_1.flags & 262144;
+                            var inLoopInitializer = ts.isIterationStatement(container, false);
+                            var inLoopBodyBlock = container.kind === 198 && ts.isIterationStatement(container.parent, false);
+                            links.isDeclarationWithCollidingName = !ts.isBlockScopedContainerTopLevel(container) && (!isDeclaredInLoop || (!inLoopInitializer && !inLoopBodyBlock));
+                        }
+                        else {
+                            links.isDeclarationWithCollidingName = false;
+                        }
+                    }
                 }
-                return links.isNestedRedeclaration;
+                return links.isDeclarationWithCollidingName;
             }
             return false;
         }
-        function getReferencedNestedRedeclaration(node) {
+        function getReferencedDeclarationWithCollidingName(node) {
             var symbol = getReferencedValueSymbol(node);
-            return symbol && isNestedRedeclarationSymbol(symbol) ? symbol.valueDeclaration : undefined;
+            return symbol && isSymbolOfDeclarationWithCollidingName(symbol) ? symbol.valueDeclaration : undefined;
         }
-        function isNestedRedeclaration(node) {
-            return isNestedRedeclarationSymbol(getSymbolOfNode(node));
+        function isDeclarationWithCollidingName(node) {
+            return isSymbolOfDeclarationWithCollidingName(getSymbolOfNode(node));
         }
         function isValueAliasDeclaration(node) {
             switch (node.kind) {
-                case 224:
-                case 226:
-                case 227:
-                case 229:
-                case 233:
-                    return isAliasResolvedToValue(getSymbolOfNode(node));
+                case 228:
+                case 230:
                 case 231:
+                case 233:
+                case 237:
+                    return isAliasResolvedToValue(getSymbolOfNode(node));
+                case 235:
                     var exportClause = node.exportClause;
                     return exportClause && ts.forEach(exportClause.elements, isValueAliasDeclaration);
-                case 230:
+                case 234:
                     return node.expression && node.expression.kind === 69 ? isAliasResolvedToValue(getSymbolOfNode(node)) : true;
             }
             return false;
         }
         function isTopLevelValueImportEqualsWithEntityName(node) {
-            if (node.parent.kind !== 251 || !ts.isInternalModuleImportEqualsDeclaration(node)) {
+            if (node.parent.kind !== 255 || !ts.isInternalModuleImportEqualsDeclaration(node)) {
                 return false;
             }
             var isValue = isAliasResolvedToValue(getSymbolOfNode(node));
@@ -23622,7 +25411,7 @@ var ts;
             return getNodeLinks(node).enumMemberValue;
         }
         function getConstantValue(node) {
-            if (node.kind === 250) {
+            if (node.kind === 254) {
                 return getEnumMemberValue(node);
             }
             var symbol = getNodeLinks(node).resolvedSymbol;
@@ -23653,22 +25442,22 @@ var ts;
             else if (type.flags & 1) {
                 return ts.TypeReferenceSerializationKind.ObjectType;
             }
-            else if (allConstituentTypesHaveKind(type, 16)) {
+            else if (isTypeOfKind(type, 16)) {
                 return ts.TypeReferenceSerializationKind.VoidType;
             }
-            else if (allConstituentTypesHaveKind(type, 8)) {
+            else if (isTypeOfKind(type, 8)) {
                 return ts.TypeReferenceSerializationKind.BooleanType;
             }
-            else if (allConstituentTypesHaveKind(type, 132)) {
+            else if (isTypeOfKind(type, 132)) {
                 return ts.TypeReferenceSerializationKind.NumberLikeType;
             }
-            else if (allConstituentTypesHaveKind(type, 258)) {
+            else if (isTypeOfKind(type, 258)) {
                 return ts.TypeReferenceSerializationKind.StringLikeType;
             }
-            else if (allConstituentTypesHaveKind(type, 8192)) {
+            else if (isTypeOfKind(type, 8192)) {
                 return ts.TypeReferenceSerializationKind.ArrayLikeType;
             }
-            else if (allConstituentTypesHaveKind(type, 16777216)) {
+            else if (isTypeOfKind(type, 16777216)) {
                 return ts.TypeReferenceSerializationKind.ESSymbolType;
             }
             else if (isFunctionType(type)) {
@@ -23693,9 +25482,15 @@ var ts;
             getSymbolDisplayBuilder().buildTypeDisplay(getReturnTypeOfSignature(signature), writer, enclosingDeclaration, flags);
         }
         function writeTypeOfExpression(expr, enclosingDeclaration, flags, writer) {
-            var type = getTypeOfExpression(expr);
+            var type = getWidenedType(getTypeOfExpression(expr));
             getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags);
         }
+        function writeBaseConstructorTypeOfClass(node, enclosingDeclaration, flags, writer) {
+            var classType = getDeclaredTypeOfSymbol(getSymbolOfNode(node));
+            resolveBaseTypesOfClass(classType);
+            var baseType = classType.resolvedBaseTypes.length ? classType.resolvedBaseTypes[0] : unknownType;
+            getSymbolDisplayBuilder().buildTypeDisplay(baseType, writer, enclosingDeclaration, flags);
+        }
         function hasGlobalName(name) {
             return ts.hasProperty(globals, name);
         }
@@ -23712,8 +25507,8 @@ var ts;
             return {
                 getReferencedExportContainer: getReferencedExportContainer,
                 getReferencedImportDeclaration: getReferencedImportDeclaration,
-                getReferencedNestedRedeclaration: getReferencedNestedRedeclaration,
-                isNestedRedeclaration: isNestedRedeclaration,
+                getReferencedDeclarationWithCollidingName: getReferencedDeclarationWithCollidingName,
+                isDeclarationWithCollidingName: isDeclarationWithCollidingName,
                 isValueAliasDeclaration: isValueAliasDeclaration,
                 hasGlobalName: hasGlobalName,
                 isReferencedAliasDeclaration: isReferencedAliasDeclaration,
@@ -23724,6 +25519,7 @@ var ts;
                 writeTypeOfDeclaration: writeTypeOfDeclaration,
                 writeReturnTypeOfSignatureDeclaration: writeReturnTypeOfSignatureDeclaration,
                 writeTypeOfExpression: writeTypeOfExpression,
+                writeBaseConstructorTypeOfClass: writeBaseConstructorTypeOfClass,
                 isSymbolAccessible: isSymbolAccessible,
                 isEntityNameVisible: isEntityNameVisible,
                 getConstantValue: getConstantValue,
@@ -23742,7 +25538,7 @@ var ts;
             if (!moduleSymbol) {
                 return undefined;
             }
-            return ts.getDeclarationOfKind(moduleSymbol, 251);
+            return ts.getDeclarationOfKind(moduleSymbol, 255);
         }
         function initializeTypeChecker() {
             ts.forEach(host.getSourceFiles(), function (file) {
@@ -23753,9 +25549,12 @@ var ts;
                 if (!ts.isExternalOrCommonJsModule(file)) {
                     mergeSymbolTable(globals, file.locals);
                 }
-                if (file.moduleAugmentations) {
+                if (file.moduleAugmentations.length) {
                     (augmentations || (augmentations = [])).push(file.moduleAugmentations);
                 }
+                if (file.wasReferenced && file.symbol && file.symbol.globalExports) {
+                    mergeSymbolTable(globals, file.symbol.globalExports);
+                }
             });
             if (augmentations) {
                 for (var _i = 0, augmentations_1 = augmentations; _i < augmentations_1.length; _i++) {
@@ -23783,6 +25582,7 @@ var ts;
             getGlobalMethodDecoratorType = ts.memoize(function () { return getGlobalType("MethodDecorator"); });
             getGlobalParameterDecoratorType = ts.memoize(function () { return getGlobalType("ParameterDecorator"); });
             getGlobalTypedPropertyDescriptorType = ts.memoize(function () { return getGlobalType("TypedPropertyDescriptor", 1); });
+            getGlobalESSymbolConstructorSymbol = ts.memoize(function () { return getGlobalValueSymbol("Symbol"); });
             getGlobalPromiseType = ts.memoize(function () { return getGlobalType("Promise", 1); });
             tryGetGlobalPromiseType = ts.memoize(function () { return getGlobalSymbol("Promise", 793056, undefined) && getGlobalPromiseType(); });
             getGlobalPromiseLikeType = ts.memoize(function () { return getGlobalType("PromiseLike", 1); });
@@ -23790,23 +25590,23 @@ var ts;
             getGlobalPromiseConstructorSymbol = ts.memoize(function () { return getGlobalValueSymbol("Promise"); });
             getGlobalPromiseConstructorLikeType = ts.memoize(function () { return getGlobalType("PromiseConstructorLike"); });
             getGlobalThenableType = ts.memoize(createThenableType);
+            getGlobalTemplateStringsArrayType = ts.memoize(function () { return getGlobalType("TemplateStringsArray"); });
             if (languageVersion >= 2) {
-                globalTemplateStringsArrayType = getGlobalType("TemplateStringsArray");
-                globalESSymbolType = getGlobalType("Symbol");
-                globalESSymbolConstructorSymbol = getGlobalValueSymbol("Symbol");
-                globalIterableType = getGlobalType("Iterable", 1);
-                globalIteratorType = getGlobalType("Iterator", 1);
-                globalIterableIteratorType = getGlobalType("IterableIterator", 1);
+                getGlobalESSymbolType = ts.memoize(function () { return getGlobalType("Symbol"); });
+                getGlobalIterableType = ts.memoize(function () { return getGlobalType("Iterable", 1); });
+                getGlobalIteratorType = ts.memoize(function () { return getGlobalType("Iterator", 1); });
+                getGlobalIterableIteratorType = ts.memoize(function () { return getGlobalType("IterableIterator", 1); });
             }
             else {
-                globalTemplateStringsArrayType = unknownType;
-                globalESSymbolType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
-                globalESSymbolConstructorSymbol = undefined;
-                globalIterableType = emptyGenericType;
-                globalIteratorType = emptyGenericType;
-                globalIterableIteratorType = emptyGenericType;
+                getGlobalESSymbolType = ts.memoize(function () { return emptyObjectType; });
+                getGlobalIterableType = ts.memoize(function () { return emptyGenericType; });
+                getGlobalIteratorType = ts.memoize(function () { return emptyGenericType; });
+                getGlobalIterableIteratorType = ts.memoize(function () { return emptyGenericType; });
             }
             anyArrayType = createArrayType(anyType);
+            var symbol = getGlobalSymbol("ReadonlyArray", 793056, undefined);
+            globalReadonlyArrayType = symbol && getTypeOfGlobalSymbol(symbol, 1);
+            anyReadonlyArrayType = globalReadonlyArrayType ? createTypeFromGenericGlobalType(globalReadonlyArrayType, [anyType]) : anyArrayType;
         }
         function createInstantiatedPromiseLikeType() {
             var promiseLikeType = getGlobalPromiseLikeType();
@@ -23830,14 +25630,14 @@ var ts;
                 return false;
             }
             if (!ts.nodeCanBeDecorated(node)) {
-                if (node.kind === 144 && !ts.nodeIsPresent(node.body)) {
+                if (node.kind === 146 && !ts.nodeIsPresent(node.body)) {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.A_decorator_can_only_decorate_a_method_implementation_not_an_overload);
                 }
                 else {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_are_not_valid_here);
                 }
             }
-            else if (node.kind === 146 || node.kind === 147) {
+            else if (node.kind === 148 || node.kind === 149) {
                 var accessors = ts.getAllAccessorDeclarations(node.parent.members, node);
                 if (accessors.firstAccessor.decorators && node === accessors.secondAccessor) {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name);
@@ -23847,38 +25647,38 @@ var ts;
         }
         function checkGrammarModifiers(node) {
             switch (node.kind) {
-                case 146:
+                case 148:
+                case 149:
                 case 147:
-                case 145:
-                case 142:
-                case 141:
                 case 144:
                 case 143:
-                case 150:
-                case 221:
-                case 225:
+                case 146:
+                case 145:
+                case 152:
                 case 224:
-                case 231:
-                case 230:
-                case 139:
+                case 229:
+                case 228:
+                case 235:
+                case 234:
+                case 141:
                     break;
-                case 216:
-                    if (node.modifiers && (node.modifiers.length > 1 || node.modifiers[0].kind !== 118) &&
-                        node.parent.kind !== 222 && node.parent.kind !== 251) {
-                        return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
-                    }
-                    break;
-                case 217:
-                case 218:
-                case 196:
                 case 219:
-                    if (node.modifiers && node.parent.kind !== 222 && node.parent.kind !== 251) {
+                    if (node.modifiers && (node.modifiers.length > 1 || node.modifiers[0].kind !== 118) &&
+                        node.parent.kind !== 225 && node.parent.kind !== 255) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
                     }
                     break;
                 case 220:
+                case 221:
+                case 199:
+                case 222:
+                    if (node.modifiers && node.parent.kind !== 225 && node.parent.kind !== 255) {
+                        return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
+                    }
+                    break;
+                case 223:
                     if (node.modifiers && (node.modifiers.length > 1 || node.modifiers[0].kind !== 74) &&
-                        node.parent.kind !== 222 && node.parent.kind !== 251) {
+                        node.parent.kind !== 225 && node.parent.kind !== 255) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
                     }
                     break;
@@ -23888,42 +25688,48 @@ var ts;
             if (!node.modifiers) {
                 return;
             }
-            var lastStatic, lastPrivate, lastProtected, lastDeclare, lastAsync;
+            var lastStatic, lastPrivate, lastProtected, lastDeclare, lastAsync, lastReadonly;
             var flags = 0;
             for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
                 var modifier = _a[_i];
+                if (modifier.kind !== 127) {
+                    if (node.kind === 143 || node.kind === 145) {
+                        return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_type_member, ts.tokenToString(modifier.kind));
+                    }
+                    if (node.kind === 152) {
+                        return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_an_index_signature, ts.tokenToString(modifier.kind));
+                    }
+                }
                 switch (modifier.kind) {
                     case 74:
-                        if (node.kind !== 220 && node.parent.kind === 217) {
+                        if (node.kind !== 223 && node.parent.kind === 220) {
                             return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(74));
                         }
                         break;
                     case 112:
                     case 111:
                     case 110:
-                        var text = void 0;
-                        if (modifier.kind === 112) {
-                            text = "public";
-                        }
-                        else if (modifier.kind === 111) {
-                            text = "protected";
+                        var text = visibilityToString(ts.modifierToFlag(modifier.kind));
+                        if (modifier.kind === 111) {
                             lastProtected = modifier;
                         }
-                        else {
-                            text = "private";
+                        else if (modifier.kind === 110) {
                             lastPrivate = modifier;
                         }
-                        if (flags & 56) {
+                        if (flags & 28) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.Accessibility_modifier_already_seen);
                         }
-                        else if (flags & 64) {
+                        else if (flags & 32) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "static");
                         }
+                        else if (flags & 64) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "readonly");
+                        }
                         else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "async");
                         }
-                        else if (node.parent.kind === 222 || node.parent.kind === 251) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_element, text);
+                        else if (node.parent.kind === 225 || node.parent.kind === 255) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, text);
                         }
                         else if (flags & 128) {
                             if (modifier.kind === 110) {
@@ -23936,29 +25742,42 @@ var ts;
                         flags |= ts.modifierToFlag(modifier.kind);
                         break;
                     case 113:
-                        if (flags & 64) {
+                        if (flags & 32) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static");
                         }
+                        else if (flags & 64) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "readonly");
+                        }
                         else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "async");
                         }
-                        else if (node.parent.kind === 222 || node.parent.kind === 251) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_element, "static");
+                        else if (node.parent.kind === 225 || node.parent.kind === 255) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, "static");
                         }
-                        else if (node.kind === 139) {
+                        else if (node.kind === 141) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
                         }
                         else if (flags & 128) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "static", "abstract");
                         }
-                        flags |= 64;
+                        flags |= 32;
                         lastStatic = modifier;
                         break;
+                    case 127:
+                        if (flags & 64) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "readonly");
+                        }
+                        else if (node.kind !== 144 && node.kind !== 143 && node.kind !== 152) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics.readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature);
+                        }
+                        flags |= 64;
+                        lastReadonly = modifier;
+                        break;
                     case 82:
-                        if (flags & 2) {
+                        if (flags & 1) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "export");
                         }
-                        else if (flags & 4) {
+                        else if (flags & 2) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "declare");
                         }
                         else if (flags & 128) {
@@ -23967,48 +25786,51 @@ var ts;
                         else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "async");
                         }
-                        else if (node.parent.kind === 217) {
+                        else if (node.parent.kind === 220) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "export");
                         }
-                        else if (node.kind === 139) {
+                        else if (node.kind === 141) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");
                         }
-                        flags |= 2;
+                        flags |= 1;
                         break;
                     case 122:
-                        if (flags & 4) {
+                        if (flags & 2) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "declare");
                         }
                         else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.parent.kind === 217) {
+                        else if (node.parent.kind === 220) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "declare");
                         }
-                        else if (node.kind === 139) {
+                        else if (node.kind === 141) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "declare");
                         }
-                        else if (ts.isInAmbientContext(node.parent) && node.parent.kind === 222) {
+                        else if (ts.isInAmbientContext(node.parent) && node.parent.kind === 225) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
                         }
-                        flags |= 4;
+                        flags |= 2;
                         lastDeclare = modifier;
                         break;
                     case 115:
                         if (flags & 128) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "abstract");
                         }
-                        if (node.kind !== 217) {
-                            if (node.kind !== 144) {
-                                return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_or_method_declaration);
+                        if (node.kind !== 220) {
+                            if (node.kind !== 146 &&
+                                node.kind !== 144 &&
+                                node.kind !== 148 &&
+                                node.kind !== 149) {
+                                return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration);
                             }
-                            if (!(node.parent.kind === 217 && node.parent.flags & 128)) {
+                            if (!(node.parent.kind === 220 && node.parent.flags & 128)) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.Abstract_methods_can_only_appear_within_an_abstract_class);
                             }
-                            if (flags & 64) {
+                            if (flags & 32) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "static", "abstract");
                             }
-                            if (flags & 16) {
+                            if (flags & 8) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "private", "abstract");
                             }
                         }
@@ -24018,10 +25840,10 @@ var ts;
                         if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "async");
                         }
-                        else if (flags & 4 || ts.isInAmbientContext(node.parent)) {
+                        else if (flags & 2 || ts.isInAmbientContext(node.parent)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.kind === 139) {
+                        else if (node.kind === 141) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async");
                         }
                         flags |= 256;
@@ -24029,28 +25851,25 @@ var ts;
                         break;
                 }
             }
-            if (node.kind === 145) {
-                if (flags & 64) {
+            if (node.kind === 147) {
+                if (flags & 32) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
                 }
                 if (flags & 128) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "abstract");
                 }
-                else if (flags & 32) {
-                    return grammarErrorOnNode(lastProtected, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "protected");
-                }
-                else if (flags & 16) {
-                    return grammarErrorOnNode(lastPrivate, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "private");
-                }
                 else if (flags & 256) {
                     return grammarErrorOnNode(lastAsync, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "async");
                 }
+                else if (flags & 64) {
+                    return grammarErrorOnNode(lastReadonly, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "readonly");
+                }
                 return;
             }
-            else if ((node.kind === 225 || node.kind === 224) && flags & 4) {
+            else if ((node.kind === 229 || node.kind === 228) && flags & 2) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
-            else if (node.kind === 139 && (flags & 56) && ts.isBindingPattern(node.name)) {
+            else if (node.kind === 141 && (flags & 28) && ts.isBindingPattern(node.name)) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_may_not_be_a_binding_pattern);
             }
             if (flags & 256) {
@@ -24062,10 +25881,10 @@ var ts;
                 return grammarErrorOnNode(asyncModifier, ts.Diagnostics.Async_functions_are_only_available_when_targeting_ECMAScript_6_and_higher);
             }
             switch (node.kind) {
-                case 144:
-                case 216:
-                case 176:
-                case 177:
+                case 146:
+                case 219:
+                case 178:
+                case 179:
                     if (!node.asteriskToken) {
                         return false;
                     }
@@ -24130,7 +25949,7 @@ var ts;
                 checkGrammarParameterList(node.parameters) || checkGrammarArrowFunction(node, file);
         }
         function checkGrammarArrowFunction(node, file) {
-            if (node.kind === 177) {
+            if (node.kind === 179) {
                 var arrowFunction = node;
                 var startLine = ts.getLineAndCharacterOfPosition(file, arrowFunction.equalsGreaterThanToken.pos).line;
                 var endLine = ts.getLineAndCharacterOfPosition(file, arrowFunction.equalsGreaterThanToken.end).line;
@@ -24153,7 +25972,7 @@ var ts;
             if (parameter.dotDotDotToken) {
                 return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.An_index_signature_cannot_have_a_rest_parameter);
             }
-            if (parameter.flags & 1022) {
+            if (parameter.flags & 959) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_cannot_have_an_accessibility_modifier);
             }
             if (parameter.questionToken) {
@@ -24165,20 +25984,15 @@ var ts;
             if (!parameter.type) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_must_have_a_type_annotation);
             }
-            if (parameter.type.kind !== 130 && parameter.type.kind !== 128) {
+            if (parameter.type.kind !== 131 && parameter.type.kind !== 129) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_must_be_string_or_number);
             }
             if (!node.type) {
                 return grammarErrorOnNode(node, ts.Diagnostics.An_index_signature_must_have_a_type_annotation);
             }
         }
-        function checkGrammarForIndexSignatureModifier(node) {
-            if (node.flags & 1022) {
-                grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_not_permitted_on_index_signature_members);
-            }
-        }
         function checkGrammarIndexSignature(node) {
-            return checkGrammarDecorators(node) || checkGrammarModifiers(node) || checkGrammarIndexSignatureParameters(node) || checkGrammarForIndexSignatureModifier(node);
+            return checkGrammarDecorators(node) || checkGrammarModifiers(node) || checkGrammarIndexSignatureParameters(node);
         }
         function checkGrammarForAtLeastOneTypeArgument(node, typeArguments) {
             if (typeArguments && typeArguments.length === 0) {
@@ -24197,7 +26011,7 @@ var ts;
                 var sourceFile = ts.getSourceFileOfNode(node);
                 for (var _i = 0, args_1 = args; _i < args_1.length; _i++) {
                     var arg = args_1[_i];
-                    if (arg.kind === 190) {
+                    if (arg.kind === 192) {
                         return grammarErrorAtPos(sourceFile, arg.pos, 0, ts.Diagnostics.Argument_expression_expected);
                     }
                 }
@@ -24268,19 +26082,19 @@ var ts;
             return false;
         }
         function checkGrammarComputedPropertyName(node) {
-            if (node.kind !== 137) {
+            if (node.kind !== 139) {
                 return false;
             }
             var computedPropertyName = node;
-            if (computedPropertyName.expression.kind === 184 && computedPropertyName.expression.operatorToken.kind === 24) {
+            if (computedPropertyName.expression.kind === 186 && computedPropertyName.expression.operatorToken.kind === 24) {
                 return grammarErrorOnNode(computedPropertyName.expression, ts.Diagnostics.A_comma_expression_is_not_allowed_in_a_computed_property_name);
             }
         }
         function checkGrammarForGenerator(node) {
             if (node.asteriskToken) {
-                ts.Debug.assert(node.kind === 216 ||
-                    node.kind === 176 ||
-                    node.kind === 144);
+                ts.Debug.assert(node.kind === 219 ||
+                    node.kind === 178 ||
+                    node.kind === 146);
                 if (ts.isInAmbientContext(node)) {
                     return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
                 }
@@ -24301,88 +26115,87 @@ var ts;
             var seen = {};
             var Property = 1;
             var GetAccessor = 2;
-            var SetAccesor = 4;
-            var GetOrSetAccessor = GetAccessor | SetAccesor;
+            var SetAccessor = 4;
+            var GetOrSetAccessor = GetAccessor | SetAccessor;
             var _loop_1 = function(prop) {
-                var name_19 = prop.name;
-                if (prop.kind === 190 ||
-                    name_19.kind === 137) {
-                    checkGrammarComputedPropertyName(name_19);
+                var name_20 = prop.name;
+                if (prop.kind === 192 ||
+                    name_20.kind === 139) {
+                    checkGrammarComputedPropertyName(name_20);
                     return "continue";
                 }
-                if (prop.kind === 249 && !inDestructuring && prop.objectAssignmentInitializer) {
+                if (prop.kind === 253 && !inDestructuring && prop.objectAssignmentInitializer) {
                     return { value: grammarErrorOnNode(prop.equalsToken, ts.Diagnostics.can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment) };
                 }
                 ts.forEach(prop.modifiers, function (mod) {
-                    if (mod.kind !== 118 || prop.kind !== 144) {
+                    if (mod.kind !== 118 || prop.kind !== 146) {
                         grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod));
                     }
                 });
                 var currentKind = void 0;
-                if (prop.kind === 248 || prop.kind === 249) {
+                if (prop.kind === 252 || prop.kind === 253) {
                     checkGrammarForInvalidQuestionMark(prop, prop.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional);
-                    if (name_19.kind === 8) {
-                        checkGrammarNumericLiteral(name_19);
+                    if (name_20.kind === 8) {
+                        checkGrammarNumericLiteral(name_20);
                     }
                     currentKind = Property;
                 }
-                else if (prop.kind === 144) {
+                else if (prop.kind === 146) {
                     currentKind = Property;
                 }
-                else if (prop.kind === 146) {
+                else if (prop.kind === 148) {
                     currentKind = GetAccessor;
                 }
-                else if (prop.kind === 147) {
-                    currentKind = SetAccesor;
+                else if (prop.kind === 149) {
+                    currentKind = SetAccessor;
                 }
                 else {
                     ts.Debug.fail("Unexpected syntax kind:" + prop.kind);
                 }
-                if (!ts.hasProperty(seen, name_19.text)) {
-                    seen[name_19.text] = currentKind;
+                if (!ts.hasProperty(seen, name_20.text)) {
+                    seen[name_20.text] = currentKind;
                 }
                 else {
-                    var existingKind = seen[name_19.text];
+                    var existingKind = seen[name_20.text];
                     if (currentKind === Property && existingKind === Property) {
                         return "continue";
                     }
                     else if ((currentKind & GetOrSetAccessor) && (existingKind & GetOrSetAccessor)) {
                         if (existingKind !== GetOrSetAccessor && currentKind !== existingKind) {
-                            seen[name_19.text] = currentKind | existingKind;
+                            seen[name_20.text] = currentKind | existingKind;
                         }
                         else {
-                            return { value: grammarErrorOnNode(name_19, ts.Diagnostics.An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name) };
+                            return { value: grammarErrorOnNode(name_20, ts.Diagnostics.An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name) };
                         }
                     }
                     else {
-                        return { value: grammarErrorOnNode(name_19, ts.Diagnostics.An_object_literal_cannot_have_property_and_accessor_with_the_same_name) };
+                        return { value: grammarErrorOnNode(name_20, ts.Diagnostics.An_object_literal_cannot_have_property_and_accessor_with_the_same_name) };
                     }
                 }
             };
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var prop = _a[_i];
-                var state_1 = _loop_1(prop);
-                if (typeof state_1 === "object") return state_1.value
-                if (state_1 === "continue") continue;
+                var state_2 = _loop_1(prop);
+                if (typeof state_2 === "object") return state_2.value;
             }
         }
         function checkGrammarJsxElement(node) {
             var seen = {};
             for (var _i = 0, _a = node.attributes; _i < _a.length; _i++) {
                 var attr = _a[_i];
-                if (attr.kind === 242) {
+                if (attr.kind === 246) {
                     continue;
                 }
                 var jsxAttr = attr;
-                var name_20 = jsxAttr.name;
-                if (!ts.hasProperty(seen, name_20.text)) {
-                    seen[name_20.text] = true;
+                var name_21 = jsxAttr.name;
+                if (!ts.hasProperty(seen, name_21.text)) {
+                    seen[name_21.text] = true;
                 }
                 else {
-                    return grammarErrorOnNode(name_20, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
+                    return grammarErrorOnNode(name_21, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
                 }
                 var initializer = jsxAttr.initializer;
-                if (initializer && initializer.kind === 243 && !initializer.expression) {
+                if (initializer && initializer.kind === 247 && !initializer.expression) {
                     return grammarErrorOnNode(jsxAttr.initializer, ts.Diagnostics.JSX_attributes_must_only_be_assigned_a_non_empty_expression);
                 }
             }
@@ -24391,7 +26204,7 @@ var ts;
             if (checkGrammarStatementInAmbientContext(forInOrOfStatement)) {
                 return true;
             }
-            if (forInOrOfStatement.initializer.kind === 215) {
+            if (forInOrOfStatement.initializer.kind === 218) {
                 var variableList = forInOrOfStatement.initializer;
                 if (!checkGrammarVariableDeclarationList(variableList)) {
                     var declarations = variableList.declarations;
@@ -24399,20 +26212,20 @@ var ts;
                         return false;
                     }
                     if (declarations.length > 1) {
-                        var diagnostic = forInOrOfStatement.kind === 203
+                        var diagnostic = forInOrOfStatement.kind === 206
                             ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement
                             : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement;
                         return grammarErrorOnFirstToken(variableList.declarations[1], diagnostic);
                     }
                     var firstDeclaration = declarations[0];
                     if (firstDeclaration.initializer) {
-                        var diagnostic = forInOrOfStatement.kind === 203
+                        var diagnostic = forInOrOfStatement.kind === 206
                             ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer
                             : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer;
                         return grammarErrorOnNode(firstDeclaration.name, diagnostic);
                     }
                     if (firstDeclaration.type) {
-                        var diagnostic = forInOrOfStatement.kind === 203
+                        var diagnostic = forInOrOfStatement.kind === 206
                             ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation
                             : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation;
                         return grammarErrorOnNode(firstDeclaration, diagnostic);
@@ -24429,16 +26242,16 @@ var ts;
             else if (ts.isInAmbientContext(accessor)) {
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_be_declared_in_an_ambient_context);
             }
-            else if (accessor.body === undefined) {
+            else if (accessor.body === undefined && !(accessor.flags & 128)) {
                 return grammarErrorAtPos(ts.getSourceFileOfNode(accessor), accessor.end - 1, ";".length, ts.Diagnostics._0_expected, "{");
             }
             else if (accessor.typeParameters) {
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_have_type_parameters);
             }
-            else if (kind === 146 && accessor.parameters.length) {
+            else if (kind === 148 && accessor.parameters.length) {
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_get_accessor_cannot_have_parameters);
             }
-            else if (kind === 147) {
+            else if (kind === 149) {
                 if (accessor.type) {
                     return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_set_accessor_cannot_have_a_return_type_annotation);
                 }
@@ -24450,7 +26263,7 @@ var ts;
                     if (parameter.dotDotDotToken) {
                         return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.A_set_accessor_cannot_have_rest_parameter);
                     }
-                    else if (parameter.flags & 1022) {
+                    else if (parameter.flags & 959) {
                         return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                     }
                     else if (parameter.questionToken) {
@@ -24473,7 +26286,7 @@ var ts;
                 checkGrammarForGenerator(node)) {
                 return true;
             }
-            if (node.parent.kind === 168) {
+            if (node.parent.kind === 170) {
                 if (checkGrammarForInvalidQuestionMark(node, node.questionToken, ts.Diagnostics.A_class_member_cannot_be_declared_optional)) {
                     return true;
                 }
@@ -24492,10 +26305,10 @@ var ts;
                     return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol);
                 }
             }
-            else if (node.parent.kind === 218) {
+            else if (node.parent.kind === 221) {
                 return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol);
             }
-            else if (node.parent.kind === 156) {
+            else if (node.parent.kind === 158) {
                 return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol);
             }
         }
@@ -24506,9 +26319,9 @@ var ts;
                     return grammarErrorOnNode(node, ts.Diagnostics.Jump_target_cannot_cross_function_boundary);
                 }
                 switch (current.kind) {
-                    case 210:
+                    case 213:
                         if (node.label && current.label.text === node.label.text) {
-                            var isMisplacedContinueLabel = node.kind === 205
+                            var isMisplacedContinueLabel = node.kind === 208
                                 && !ts.isIterationStatement(current.statement, true);
                             if (isMisplacedContinueLabel) {
                                 return grammarErrorOnNode(node, ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement);
@@ -24516,8 +26329,8 @@ var ts;
                             return false;
                         }
                         break;
-                    case 209:
-                        if (node.kind === 206 && !node.label) {
+                    case 212:
+                        if (node.kind === 209 && !node.label) {
                             return false;
                         }
                         break;
@@ -24530,13 +26343,13 @@ var ts;
                 current = current.parent;
             }
             if (node.label) {
-                var message = node.kind === 206
+                var message = node.kind === 209
                     ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement
                     : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
             }
             else {
-                var message = node.kind === 206
+                var message = node.kind === 209
                     ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement
                     : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
@@ -24548,7 +26361,7 @@ var ts;
                 if (node !== ts.lastOrUndefined(elements)) {
                     return grammarErrorOnNode(node, ts.Diagnostics.A_rest_element_must_be_last_in_an_array_destructuring_pattern);
                 }
-                if (node.name.kind === 165 || node.name.kind === 164) {
+                if (node.name.kind === 167 || node.name.kind === 166) {
                     return grammarErrorOnNode(node.name, ts.Diagnostics.A_rest_element_cannot_contain_a_binding_pattern);
                 }
                 if (node.initializer) {
@@ -24557,7 +26370,7 @@ var ts;
             }
         }
         function checkGrammarVariableDeclaration(node) {
-            if (node.parent.parent.kind !== 203 && node.parent.parent.kind !== 204) {
+            if (node.parent.parent.kind !== 206 && node.parent.parent.kind !== 207) {
                 if (ts.isInAmbientContext(node)) {
                     if (node.initializer) {
                         var equalsTokenLength = "=".length;
@@ -24586,7 +26399,7 @@ var ts;
                 var elements = name.elements;
                 for (var _i = 0, elements_2 = elements; _i < elements_2.length; _i++) {
                     var element = elements_2[_i];
-                    if (element.kind !== 190) {
+                    if (element.kind !== 192) {
                         checkGrammarNameInLetOrConstDeclarations(element.name);
                     }
                 }
@@ -24603,15 +26416,15 @@ var ts;
         }
         function allowLetAndConstDeclarations(parent) {
             switch (parent.kind) {
-                case 199:
-                case 200:
-                case 201:
-                case 208:
                 case 202:
                 case 203:
                 case 204:
+                case 211:
+                case 205:
+                case 206:
+                case 207:
                     return false;
-                case 210:
+                case 213:
                     return allowLetAndConstDeclarations(parent.parent);
             }
             return true;
@@ -24667,7 +26480,7 @@ var ts;
                     return true;
                 }
             }
-            else if (node.parent.kind === 218) {
+            else if (node.parent.kind === 221) {
                 if (checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol)) {
                     return true;
                 }
@@ -24675,7 +26488,7 @@ var ts;
                     return grammarErrorOnNode(node.initializer, ts.Diagnostics.An_interface_property_cannot_have_an_initializer);
                 }
             }
-            else if (node.parent.kind === 156) {
+            else if (node.parent.kind === 158) {
                 if (checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol)) {
                     return true;
                 }
@@ -24688,14 +26501,14 @@ var ts;
             }
         }
         function checkGrammarTopLevelElementForRequiredDeclareModifier(node) {
-            if (node.kind === 218 ||
-                node.kind === 219 ||
-                node.kind === 225 ||
-                node.kind === 224 ||
-                node.kind === 231 ||
-                node.kind === 230 ||
-                (node.flags & 4) ||
-                (node.flags & (2 | 512))) {
+            if (node.kind === 221 ||
+                node.kind === 222 ||
+                node.kind === 229 ||
+                node.kind === 228 ||
+                node.kind === 235 ||
+                node.kind === 234 ||
+                (node.flags & 2) ||
+                (node.flags & (1 | 512))) {
                 return false;
             }
             return grammarErrorOnFirstToken(node, ts.Diagnostics.A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file);
@@ -24703,7 +26516,7 @@ var ts;
         function checkGrammarTopLevelElementsForRequiredDeclareModifier(file) {
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
                 var decl = _a[_i];
-                if (ts.isDeclaration(decl) || decl.kind === 196) {
+                if (ts.isDeclaration(decl) || decl.kind === 199) {
                     if (checkGrammarTopLevelElementForRequiredDeclareModifier(decl)) {
                         return true;
                     }
@@ -24722,7 +26535,7 @@ var ts;
                 if (!links.hasReportedStatementInAmbientContext && ts.isFunctionLike(node.parent)) {
                     return getNodeLinks(node).hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.An_implementation_cannot_be_declared_in_ambient_contexts);
                 }
-                if (node.parent.kind === 195 || node.parent.kind === 222 || node.parent.kind === 251) {
+                if (node.parent.kind === 198 || node.parent.kind === 225 || node.parent.kind === 255) {
                     var links_1 = getNodeLinks(node.parent);
                     if (!links_1.hasReportedStatementInAmbientContext) {
                         return links_1.hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.Statements_are_not_allowed_in_ambient_contexts);
@@ -24733,7 +26546,7 @@ var ts;
             }
         }
         function checkGrammarNumericLiteral(node) {
-            if (node.flags & 32768 && languageVersion >= 1) {
+            if (node.isOctalLiteral && languageVersion >= 1) {
                 return grammarErrorOnNode(node, ts.Diagnostics.Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher);
             }
         }
@@ -24752,6 +26565,13 @@ var ts;
 var ts;
 (function (ts) {
     var nullSourceMapWriter;
+    var defaultLastEncodedSourceMapSpan = {
+        emittedLine: 1,
+        emittedColumn: 1,
+        sourceLine: 1,
+        sourceColumn: 1,
+        sourceIndex: 0
+    };
     function getNullSourceMapWriter() {
         if (nullSourceMapWriter === undefined) {
             nullSourceMapWriter = {
@@ -24800,13 +26620,7 @@ var ts;
             currentSourceFile = undefined;
             sourceMapSourceIndex = -1;
             lastRecordedSourceMapSpan = undefined;
-            lastEncodedSourceMapSpan = {
-                emittedLine: 1,
-                emittedColumn: 1,
-                sourceLine: 1,
-                sourceColumn: 1,
-                sourceIndex: 0
-            };
+            lastEncodedSourceMapSpan = defaultLastEncodedSourceMapSpan;
             lastEncodedNameIndex = 0;
             sourceMapData = {
                 sourceMapFilePath: sourceMapFilePath,
@@ -24859,7 +26673,7 @@ var ts;
                 sourceMapData.sourceMapDecodedMappings.pop();
                 lastEncodedSourceMapSpan = sourceMapData.sourceMapDecodedMappings.length ?
                     sourceMapData.sourceMapDecodedMappings[sourceMapData.sourceMapDecodedMappings.length - 1] :
-                    undefined;
+                    defaultLastEncodedSourceMapSpan;
                 var sourceMapMappings = sourceMapData.sourceMapMappings;
                 var lenthToSet = sourceMapMappings.length - 1;
                 for (; lenthToSet >= 0; lenthToSet--) {
@@ -25017,7 +26831,7 @@ var ts;
     function getDeclarationDiagnostics(host, resolver, targetSourceFile) {
         var declarationDiagnostics = ts.createDiagnosticCollection();
         ts.forEachExpectedEmitFile(host, getDeclarationDiagnosticsFromFile, targetSourceFile);
-        return declarationDiagnostics.getDiagnostics(targetSourceFile.fileName);
+        return declarationDiagnostics.getDiagnostics(targetSourceFile ? targetSourceFile.fileName : undefined);
         function getDeclarationDiagnosticsFromFile(_a, sources, isBundledEmit) {
             var declarationFilePath = _a.declarationFilePath;
             emitDeclarations(host, resolver, declarationDiagnostics, declarationFilePath, sources, isBundledEmit);
@@ -25032,7 +26846,8 @@ var ts;
         var increaseIndent;
         var decreaseIndent;
         var writeTextOfNode;
-        var writer = createAndSetNewTextWriterWithSymbolWriter();
+        var writer;
+        createAndSetNewTextWriterWithSymbolWriter();
         var enclosingDeclaration;
         var resultHasExternalModuleIndicator;
         var currentText;
@@ -25084,7 +26899,7 @@ var ts;
                 var oldWriter = writer;
                 ts.forEach(moduleElementDeclarationEmitInfo, function (aliasEmitInfo) {
                     if (aliasEmitInfo.isVisible && !aliasEmitInfo.asynchronousOutput) {
-                        ts.Debug.assert(aliasEmitInfo.node.kind === 225);
+                        ts.Debug.assert(aliasEmitInfo.node.kind === 229);
                         createAndSetNewTextWriterWithSymbolWriter();
                         ts.Debug.assert(aliasEmitInfo.indent === 0 || (aliasEmitInfo.indent === 1 && isBundledEmit));
                         for (var i = 0; i < aliasEmitInfo.indent; i++) {
@@ -25137,7 +26952,6 @@ var ts;
             writer.writeParameter = writer.write;
             writer.writeSymbol = writer.write;
             setWriter(writer);
-            return writer;
         }
         function setWriter(newWriter) {
             writer = newWriter;
@@ -25151,10 +26965,10 @@ var ts;
             var oldWriter = writer;
             ts.forEach(nodes, function (declaration) {
                 var nodeToCheck;
-                if (declaration.kind === 214) {
+                if (declaration.kind === 217) {
                     nodeToCheck = declaration.parent.parent;
                 }
-                else if (declaration.kind === 228 || declaration.kind === 229 || declaration.kind === 226) {
+                else if (declaration.kind === 232 || declaration.kind === 233 || declaration.kind === 230) {
                     ts.Debug.fail("We should be getting ImportDeclaration instead to write");
                 }
                 else {
@@ -25165,7 +26979,7 @@ var ts;
                     moduleElementEmitInfo = ts.forEach(asynchronousSubModuleDeclarationEmitInfo, function (declEmitInfo) { return declEmitInfo.node === nodeToCheck ? declEmitInfo : undefined; });
                 }
                 if (moduleElementEmitInfo) {
-                    if (moduleElementEmitInfo.node.kind === 225) {
+                    if (moduleElementEmitInfo.node.kind === 229) {
                         moduleElementEmitInfo.isVisible = true;
                     }
                     else {
@@ -25173,12 +26987,12 @@ var ts;
                         for (var declarationIndent = moduleElementEmitInfo.indent; declarationIndent; declarationIndent--) {
                             increaseIndent();
                         }
-                        if (nodeToCheck.kind === 221) {
+                        if (nodeToCheck.kind === 224) {
                             ts.Debug.assert(asynchronousSubModuleDeclarationEmitInfo === undefined);
                             asynchronousSubModuleDeclarationEmitInfo = [];
                         }
                         writeModuleElement(nodeToCheck);
-                        if (nodeToCheck.kind === 221) {
+                        if (nodeToCheck.kind === 224) {
                             moduleElementEmitInfo.subModuleElementDeclarationEmitInfo = asynchronousSubModuleDeclarationEmitInfo;
                             asynchronousSubModuleDeclarationEmitInfo = undefined;
                         }
@@ -25188,21 +27002,21 @@ var ts;
             });
             setWriter(oldWriter);
         }
-        function handleSymbolAccessibilityError(symbolAccesibilityResult) {
-            if (symbolAccesibilityResult.accessibility === 0) {
-                if (symbolAccesibilityResult && symbolAccesibilityResult.aliasesToMakeVisible) {
-                    writeAsynchronousModuleElements(symbolAccesibilityResult.aliasesToMakeVisible);
+        function handleSymbolAccessibilityError(symbolAccessibilityResult) {
+            if (symbolAccessibilityResult.accessibility === 0) {
+                if (symbolAccessibilityResult && symbolAccessibilityResult.aliasesToMakeVisible) {
+                    writeAsynchronousModuleElements(symbolAccessibilityResult.aliasesToMakeVisible);
                 }
             }
             else {
                 reportedDeclarationError = true;
-                var errorInfo = writer.getSymbolAccessibilityDiagnostic(symbolAccesibilityResult);
+                var errorInfo = writer.getSymbolAccessibilityDiagnostic(symbolAccessibilityResult);
                 if (errorInfo) {
                     if (errorInfo.typeName) {
-                        emitterDiagnostics.add(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getTextOfNodeFromSourceText(currentText, errorInfo.typeName), symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName));
+                        emitterDiagnostics.add(ts.createDiagnosticForNode(symbolAccessibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getTextOfNodeFromSourceText(currentText, errorInfo.typeName), symbolAccessibilityResult.errorSymbolName, symbolAccessibilityResult.errorModuleName));
                     }
                     else {
-                        emitterDiagnostics.add(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName));
+                        emitterDiagnostics.add(ts.createDiagnosticForNode(symbolAccessibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, symbolAccessibilityResult.errorSymbolName, symbolAccessibilityResult.errorModuleName));
                     }
                 }
             }
@@ -25276,40 +27090,42 @@ var ts;
         function emitType(type) {
             switch (type.kind) {
                 case 117:
-                case 130:
-                case 128:
-                case 120:
                 case 131:
+                case 129:
+                case 120:
+                case 132:
                 case 103:
-                case 162:
-                case 163:
+                case 134:
+                case 93:
+                case 164:
+                case 165:
                     return writeTextOfNode(currentText, type);
-                case 191:
+                case 193:
                     return emitExpressionWithTypeArguments(type);
-                case 152:
-                    return emitTypeReference(type);
-                case 155:
-                    return emitTypeQuery(type);
-                case 157:
-                    return emitArrayType(type);
-                case 158:
-                    return emitTupleType(type);
-                case 159:
-                    return emitUnionType(type);
-                case 160:
-                    return emitIntersectionType(type);
-                case 161:
-                    return emitParenType(type);
-                case 153:
                 case 154:
-                    return emitSignatureDeclarationWithJsDocComments(type);
+                    return emitTypeReference(type);
+                case 157:
+                    return emitTypeQuery(type);
+                case 159:
+                    return emitArrayType(type);
+                case 160:
+                    return emitTupleType(type);
+                case 161:
+                    return emitUnionType(type);
+                case 162:
+                    return emitIntersectionType(type);
+                case 163:
+                    return emitParenType(type);
+                case 155:
                 case 156:
+                    return emitSignatureDeclarationWithJsDocComments(type);
+                case 158:
                     return emitTypeLiteral(type);
                 case 69:
                     return emitEntityName(type);
-                case 136:
+                case 138:
                     return emitEntityName(type);
-                case 151:
+                case 153:
                     return emitTypePredicate(type);
             }
             function writeEntityName(entityName) {
@@ -25317,21 +27133,21 @@ var ts;
                     writeTextOfNode(currentText, entityName);
                 }
                 else {
-                    var left = entityName.kind === 136 ? entityName.left : entityName.expression;
-                    var right = entityName.kind === 136 ? entityName.right : entityName.name;
+                    var left = entityName.kind === 138 ? entityName.left : entityName.expression;
+                    var right = entityName.kind === 138 ? entityName.right : entityName.name;
                     writeEntityName(left);
                     write(".");
                     writeTextOfNode(currentText, right);
                 }
             }
             function emitEntityName(entityName) {
-                var visibilityResult = resolver.isEntityNameVisible(entityName, entityName.parent.kind === 224 ? entityName.parent : enclosingDeclaration);
+                var visibilityResult = resolver.isEntityNameVisible(entityName, entityName.parent.kind === 228 ? entityName.parent : enclosingDeclaration);
                 handleSymbolAccessibilityError(visibilityResult);
                 writeEntityName(entityName);
             }
             function emitExpressionWithTypeArguments(node) {
                 if (ts.isSupportedExpressionWithTypeArguments(node)) {
-                    ts.Debug.assert(node.expression.kind === 69 || node.expression.kind === 169);
+                    ts.Debug.assert(node.expression.kind === 69 || node.expression.kind === 171);
                     emitEntityName(node.expression);
                     if (node.typeArguments) {
                         write("<");
@@ -25405,9 +27221,9 @@ var ts;
             var count = 0;
             while (true) {
                 count++;
-                var name_21 = baseName + "_" + count;
-                if (!ts.hasProperty(currentIdentifiers, name_21)) {
-                    return name_21;
+                var name_22 = baseName + "_" + count;
+                if (!ts.hasProperty(currentIdentifiers, name_22)) {
+                    return name_22;
                 }
             }
         }
@@ -25418,7 +27234,10 @@ var ts;
             }
             else {
                 var tempVarName = getExportDefaultTempVariableName();
-                write("declare var ");
+                if (!noDeclare) {
+                    write("declare ");
+                }
+                write("var ");
                 write(tempVarName);
                 write(": ");
                 writer.getSymbolAccessibilityDiagnostic = getDefaultExportAccessibilityDiagnostic;
@@ -25448,10 +27267,10 @@ var ts;
             if (isModuleElementVisible) {
                 writeModuleElement(node);
             }
-            else if (node.kind === 224 ||
-                (node.parent.kind === 251 && isCurrentFileExternalModule)) {
-                var isVisible;
-                if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 251) {
+            else if (node.kind === 228 ||
+                (node.parent.kind === 255 && isCurrentFileExternalModule)) {
+                var isVisible = void 0;
+                if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 255) {
                     asynchronousSubModuleDeclarationEmitInfo.push({
                         node: node,
                         outputPos: writer.getTextPos(),
@@ -25460,7 +27279,7 @@ var ts;
                     });
                 }
                 else {
-                    if (node.kind === 225) {
+                    if (node.kind === 229) {
                         var importDeclaration = node;
                         if (importDeclaration.importClause) {
                             isVisible = (importDeclaration.importClause.name && resolver.isDeclarationVisible(importDeclaration.importClause)) ||
@@ -25478,58 +27297,61 @@ var ts;
         }
         function writeModuleElement(node) {
             switch (node.kind) {
-                case 216:
-                    return writeFunctionDeclaration(node);
-                case 196:
-                    return writeVariableStatement(node);
-                case 218:
-                    return writeInterfaceDeclaration(node);
-                case 217:
-                    return writeClassDeclaration(node);
                 case 219:
-                    return writeTypeAliasDeclaration(node);
-                case 220:
-                    return writeEnumDeclaration(node);
+                    return writeFunctionDeclaration(node);
+                case 199:
+                    return writeVariableStatement(node);
                 case 221:
-                    return writeModuleDeclaration(node);
+                    return writeInterfaceDeclaration(node);
+                case 220:
+                    return writeClassDeclaration(node);
+                case 222:
+                    return writeTypeAliasDeclaration(node);
+                case 223:
+                    return writeEnumDeclaration(node);
                 case 224:
+                    return writeModuleDeclaration(node);
+                case 228:
                     return writeImportEqualsDeclaration(node);
-                case 225:
+                case 229:
                     return writeImportDeclaration(node);
                 default:
                     ts.Debug.fail("Unknown symbol kind");
             }
         }
         function emitModuleElementDeclarationFlags(node) {
-            if (node.parent.kind === 251) {
-                if (node.flags & 2) {
+            if (node.parent.kind === 255) {
+                if (node.flags & 1) {
                     write("export ");
                 }
                 if (node.flags & 512) {
                     write("default ");
                 }
-                else if (node.kind !== 218 && !noDeclare) {
+                else if (node.kind !== 221 && !noDeclare) {
                     write("declare ");
                 }
             }
         }
-        function emitClassMemberDeclarationFlags(node) {
-            if (node.flags & 16) {
+        function emitClassMemberDeclarationFlags(flags) {
+            if (flags & 8) {
                 write("private ");
             }
-            else if (node.flags & 32) {
+            else if (flags & 16) {
                 write("protected ");
             }
-            if (node.flags & 64) {
+            if (flags & 32) {
                 write("static ");
             }
-            if (node.flags & 128) {
+            if (flags & 64) {
+                write("readonly ");
+            }
+            if (flags & 128) {
                 write("abstract ");
             }
         }
         function writeImportEqualsDeclaration(node) {
             emitJsDocComments(node);
-            if (node.flags & 2) {
+            if (node.flags & 1) {
                 write("export ");
             }
             write("import ");
@@ -25545,7 +27367,7 @@ var ts;
                 write(");");
             }
             writer.writeLine();
-            function getImportEntityNameVisibilityError(symbolAccesibilityResult) {
+            function getImportEntityNameVisibilityError(symbolAccessibilityResult) {
                 return {
                     diagnosticMessage: ts.Diagnostics.Import_declaration_0_is_using_private_name_1,
                     errorNode: node,
@@ -25555,7 +27377,7 @@ var ts;
         }
         function isVisibleNamedBinding(namedBindings) {
             if (namedBindings) {
-                if (namedBindings.kind === 227) {
+                if (namedBindings.kind === 231) {
                     return resolver.isDeclarationVisible(namedBindings);
                 }
                 else {
@@ -25564,11 +27386,8 @@ var ts;
             }
         }
         function writeImportDeclaration(node) {
-            if (!node.importClause && !(node.flags & 2)) {
-                return;
-            }
             emitJsDocComments(node);
-            if (node.flags & 2) {
+            if (node.flags & 1) {
                 write("export ");
             }
             write("import ");
@@ -25581,7 +27400,7 @@ var ts;
                     if (currentWriterPos !== writer.getTextPos()) {
                         write(", ");
                     }
-                    if (node.importClause.namedBindings.kind === 227) {
+                    if (node.importClause.namedBindings.kind === 231) {
                         write("* as ");
                         writeTextOfNode(currentText, node.importClause.namedBindings.name);
                     }
@@ -25598,13 +27417,13 @@ var ts;
             writer.writeLine();
         }
         function emitExternalModuleSpecifier(parent) {
-            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || parent.kind !== 221;
+            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || parent.kind !== 224;
             var moduleSpecifier;
-            if (parent.kind === 224) {
+            if (parent.kind === 228) {
                 var node = parent;
                 moduleSpecifier = ts.getExternalModuleImportEqualsDeclarationExpression(node);
             }
-            else if (parent.kind === 221) {
+            else if (parent.kind === 224) {
                 moduleSpecifier = parent.name;
             }
             else {
@@ -25614,9 +27433,9 @@ var ts;
             if (moduleSpecifier.kind === 9 && isBundledEmit && (compilerOptions.out || compilerOptions.outFile)) {
                 var moduleName = ts.getExternalModuleNameFromDeclaration(host, resolver, parent);
                 if (moduleName) {
-                    write("\"");
+                    write('"');
                     write(moduleName);
-                    write("\"");
+                    write('"');
                     return;
                 }
             }
@@ -25659,7 +27478,7 @@ var ts;
                 write("global ");
             }
             else {
-                if (node.flags & 65536) {
+                if (node.flags & 4096) {
                     write("namespace ");
                 }
                 else {
@@ -25672,7 +27491,7 @@ var ts;
                     writeTextOfNode(currentText, node.name);
                 }
             }
-            while (node.body.kind !== 222) {
+            while (node.body.kind !== 225) {
                 node = node.body;
                 write(".");
                 writeTextOfNode(currentText, node.name);
@@ -25701,7 +27520,7 @@ var ts;
             write(";");
             writeLine();
             enclosingDeclaration = prevEnclosingDeclaration;
-            function getTypeAliasDeclarationVisibilityError(symbolAccesibilityResult) {
+            function getTypeAliasDeclarationVisibilityError(symbolAccessibilityResult) {
                 return {
                     diagnosticMessage: ts.Diagnostics.Exported_type_alias_0_has_or_is_using_private_name_1,
                     errorNode: node.type,
@@ -25737,7 +27556,7 @@ var ts;
             writeLine();
         }
         function isPrivateMethodTypeParameter(node) {
-            return node.parent.kind === 144 && (node.parent.flags & 16);
+            return node.parent.kind === 146 && (node.parent.flags & 8);
         }
         function emitTypeParameters(typeParameters) {
             function emitTypeParameter(node) {
@@ -25747,49 +27566,49 @@ var ts;
                 writeTextOfNode(currentText, node.name);
                 if (node.constraint && !isPrivateMethodTypeParameter(node)) {
                     write(" extends ");
-                    if (node.parent.kind === 153 ||
-                        node.parent.kind === 154 ||
-                        (node.parent.parent && node.parent.parent.kind === 156)) {
-                        ts.Debug.assert(node.parent.kind === 144 ||
-                            node.parent.kind === 143 ||
-                            node.parent.kind === 153 ||
-                            node.parent.kind === 154 ||
-                            node.parent.kind === 148 ||
-                            node.parent.kind === 149);
+                    if (node.parent.kind === 155 ||
+                        node.parent.kind === 156 ||
+                        (node.parent.parent && node.parent.parent.kind === 158)) {
+                        ts.Debug.assert(node.parent.kind === 146 ||
+                            node.parent.kind === 145 ||
+                            node.parent.kind === 155 ||
+                            node.parent.kind === 156 ||
+                            node.parent.kind === 150 ||
+                            node.parent.kind === 151);
                         emitType(node.constraint);
                     }
                     else {
                         emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.constraint, getTypeParameterConstraintVisibilityError);
                     }
                 }
-                function getTypeParameterConstraintVisibilityError(symbolAccesibilityResult) {
+                function getTypeParameterConstraintVisibilityError(symbolAccessibilityResult) {
                     var diagnosticMessage;
                     switch (node.parent.kind) {
-                        case 217:
+                        case 220:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_class_has_or_is_using_private_name_1;
                             break;
-                        case 218:
+                        case 221:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1;
                             break;
-                        case 149:
+                        case 151:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
                             break;
-                        case 148:
+                        case 150:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
                             break;
-                        case 144:
-                        case 143:
-                            if (node.parent.flags & 64) {
+                        case 146:
+                        case 145:
+                            if (node.parent.flags & 32) {
                                 diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                             }
-                            else if (node.parent.parent.kind === 217) {
+                            else if (node.parent.parent.kind === 220) {
                                 diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
                             }
                             else {
                                 diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                             }
                             break;
-                        case 216:
+                        case 219:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_function_has_or_is_using_private_name_1;
                             break;
                         default:
@@ -25820,9 +27639,13 @@ var ts;
                 else if (!isImplementsList && node.expression.kind === 93) {
                     write("null");
                 }
-                function getHeritageClauseVisibilityError(symbolAccesibilityResult) {
+                else {
+                    writer.getSymbolAccessibilityDiagnostic = getHeritageClauseVisibilityError;
+                    resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2, writer);
+                }
+                function getHeritageClauseVisibilityError(symbolAccessibilityResult) {
                     var diagnosticMessage;
-                    if (node.parent.parent.kind === 217) {
+                    if (node.parent.parent.kind === 220) {
                         diagnosticMessage = isImplementsList ?
                             ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 :
                             ts.Diagnostics.Extends_clause_of_exported_class_0_has_or_is_using_private_name_1;
@@ -25842,7 +27665,7 @@ var ts;
             function emitParameterProperties(constructorDeclaration) {
                 if (constructorDeclaration) {
                     ts.forEach(constructorDeclaration.parameters, function (param) {
-                        if (param.flags & 56) {
+                        if (param.flags & 28) {
                             emitPropertyDeclaration(param);
                         }
                     });
@@ -25896,61 +27719,61 @@ var ts;
                 return;
             }
             emitJsDocComments(node);
-            emitClassMemberDeclarationFlags(node);
+            emitClassMemberDeclarationFlags(node.flags);
             emitVariableDeclaration(node);
             write(";");
             writeLine();
         }
         function emitVariableDeclaration(node) {
-            if (node.kind !== 214 || resolver.isDeclarationVisible(node)) {
+            if (node.kind !== 217 || resolver.isDeclarationVisible(node)) {
                 if (ts.isBindingPattern(node.name)) {
                     emitBindingPattern(node.name);
                 }
                 else {
                     writeTextOfNode(currentText, node.name);
-                    if ((node.kind === 142 || node.kind === 141) && ts.hasQuestionToken(node)) {
+                    if ((node.kind === 144 || node.kind === 143) && ts.hasQuestionToken(node)) {
                         write("?");
                     }
-                    if ((node.kind === 142 || node.kind === 141) && node.parent.kind === 156) {
+                    if ((node.kind === 144 || node.kind === 143) && node.parent.kind === 158) {
                         emitTypeOfVariableDeclarationFromTypeLiteral(node);
                     }
-                    else if (!(node.flags & 16)) {
+                    else if (!(node.flags & 8)) {
                         writeTypeOfDeclaration(node, node.type, getVariableDeclarationTypeVisibilityError);
                     }
                 }
             }
-            function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult) {
-                if (node.kind === 214) {
-                    return symbolAccesibilityResult.errorModuleName ?
-                        symbolAccesibilityResult.accessibility === 2 ?
+            function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
+                if (node.kind === 217) {
+                    return symbolAccessibilityResult.errorModuleName ?
+                        symbolAccessibilityResult.accessibility === 2 ?
                             ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                             ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Exported_variable_0_has_or_is_using_private_name_1;
                 }
-                else if (node.kind === 142 || node.kind === 141) {
-                    if (node.flags & 64) {
-                        return symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
+                else if (node.kind === 144 || node.kind === 143) {
+                    if (node.flags & 32) {
+                        return symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 ?
                                 ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                 ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
                     }
-                    else if (node.parent.kind === 217) {
-                        return symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
+                    else if (node.parent.kind === 220) {
+                        return symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 ?
                                 ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                 ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_private_name_1;
                     }
                     else {
-                        return symbolAccesibilityResult.errorModuleName ?
+                        return symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_private_name_1;
                     }
                 }
             }
-            function getVariableDeclarationTypeVisibilityError(symbolAccesibilityResult) {
-                var diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult);
+            function getVariableDeclarationTypeVisibilityError(symbolAccessibilityResult) {
+                var diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult);
                 return diagnosticMessage !== undefined ? {
                     diagnosticMessage: diagnosticMessage,
                     errorNode: node,
@@ -25961,15 +27784,15 @@ var ts;
                 var elements = [];
                 for (var _i = 0, _a = bindingPattern.elements; _i < _a.length; _i++) {
                     var element = _a[_i];
-                    if (element.kind !== 190) {
+                    if (element.kind !== 192) {
                         elements.push(element);
                     }
                 }
                 emitCommaList(elements, emitBindingElement);
             }
             function emitBindingElement(bindingElement) {
-                function getBindingElementTypeVisibilityError(symbolAccesibilityResult) {
-                    var diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult);
+                function getBindingElementTypeVisibilityError(symbolAccessibilityResult) {
+                    var diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult);
                     return diagnosticMessage !== undefined ? {
                         diagnosticMessage: diagnosticMessage,
                         errorNode: bindingElement,
@@ -26021,13 +27844,13 @@ var ts;
             if (node === accessors.firstAccessor) {
                 emitJsDocComments(accessors.getAccessor);
                 emitJsDocComments(accessors.setAccessor);
-                emitClassMemberDeclarationFlags(node);
+                emitClassMemberDeclarationFlags(node.flags | (accessors.setAccessor ? 0 : 64));
                 writeTextOfNode(currentText, node.name);
-                if (!(node.flags & 16)) {
+                if (!(node.flags & 8)) {
                     accessorWithTypeAnnotation = node;
                     var type = getTypeAnnotationFromAccessor(node);
                     if (!type) {
-                        var anotherAccessor = node.kind === 146 ? accessors.setAccessor : accessors.getAccessor;
+                        var anotherAccessor = node.kind === 148 ? accessors.setAccessor : accessors.getAccessor;
                         type = getTypeAnnotationFromAccessor(anotherAccessor);
                         if (type) {
                             accessorWithTypeAnnotation = anotherAccessor;
@@ -26040,23 +27863,23 @@ var ts;
             }
             function getTypeAnnotationFromAccessor(accessor) {
                 if (accessor) {
-                    return accessor.kind === 146
+                    return accessor.kind === 148
                         ? accessor.type
                         : accessor.parameters.length > 0
                             ? accessor.parameters[0].type
                             : undefined;
                 }
             }
-            function getAccessorDeclarationTypeVisibilityError(symbolAccesibilityResult) {
+            function getAccessorDeclarationTypeVisibilityError(symbolAccessibilityResult) {
                 var diagnosticMessage;
-                if (accessorWithTypeAnnotation.kind === 147) {
-                    if (accessorWithTypeAnnotation.parent.flags & 64) {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                if (accessorWithTypeAnnotation.kind === 149) {
+                    if (accessorWithTypeAnnotation.parent.flags & 32) {
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1;
                     }
                     else {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1;
                     }
@@ -26067,16 +27890,16 @@ var ts;
                     };
                 }
                 else {
-                    if (accessorWithTypeAnnotation.flags & 64) {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
+                    if (accessorWithTypeAnnotation.flags & 32) {
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 ?
                                 ts.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 :
                                 ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0;
                     }
                     else {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 ?
                                 ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
                                 ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0;
@@ -26095,17 +27918,17 @@ var ts;
             }
             if (!resolver.isImplementationOfOverload(node)) {
                 emitJsDocComments(node);
-                if (node.kind === 216) {
+                if (node.kind === 219) {
                     emitModuleElementDeclarationFlags(node);
                 }
-                else if (node.kind === 144) {
-                    emitClassMemberDeclarationFlags(node);
+                else if (node.kind === 146 || node.kind === 147) {
+                    emitClassMemberDeclarationFlags(node.flags);
                 }
-                if (node.kind === 216) {
+                if (node.kind === 219) {
                     write("function ");
                     writeTextOfNode(currentText, node.name);
                 }
-                else if (node.kind === 145) {
+                else if (node.kind === 147) {
                     write("constructor");
                 }
                 else {
@@ -26124,31 +27947,32 @@ var ts;
         function emitSignatureDeclaration(node) {
             var prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
-            if (node.kind === 149 || node.kind === 154) {
-                write("new ");
-            }
-            emitTypeParameters(node.typeParameters);
-            if (node.kind === 150) {
+            if (node.kind === 152) {
+                emitClassMemberDeclarationFlags(node.flags);
                 write("[");
             }
             else {
+                if (node.kind === 151 || node.kind === 156) {
+                    write("new ");
+                }
+                emitTypeParameters(node.typeParameters);
                 write("(");
             }
             emitCommaList(node.parameters, emitParameterDeclaration);
-            if (node.kind === 150) {
+            if (node.kind === 152) {
                 write("]");
             }
             else {
                 write(")");
             }
-            var isFunctionTypeOrConstructorType = node.kind === 153 || node.kind === 154;
-            if (isFunctionTypeOrConstructorType || node.parent.kind === 156) {
+            var isFunctionTypeOrConstructorType = node.kind === 155 || node.kind === 156;
+            if (isFunctionTypeOrConstructorType || node.parent.kind === 158) {
                 if (node.type) {
                     write(isFunctionTypeOrConstructorType ? " => " : ": ");
                     emitType(node.type);
                 }
             }
-            else if (node.kind !== 145 && !(node.flags & 16)) {
+            else if (node.kind !== 147 && !(node.flags & 8)) {
                 writeReturnTypeAtSignature(node, getReturnTypeVisibilityError);
             }
             enclosingDeclaration = prevEnclosingDeclaration;
@@ -26156,49 +27980,49 @@ var ts;
                 write(";");
                 writeLine();
             }
-            function getReturnTypeVisibilityError(symbolAccesibilityResult) {
+            function getReturnTypeVisibilityError(symbolAccessibilityResult) {
                 var diagnosticMessage;
                 switch (node.kind) {
-                    case 149:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                    case 151:
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0;
                         break;
-                    case 148:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                    case 150:
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0;
                         break;
-                    case 150:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                    case 152:
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0;
                         break;
-                    case 144:
-                    case 143:
-                        if (node.flags & 64) {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 ?
+                    case 146:
+                    case 145:
+                        if (node.flags & 32) {
+                            diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                                symbolAccessibilityResult.accessibility === 2 ?
                                     ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
                                     ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                                 ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0;
                         }
-                        else if (node.parent.kind === 217) {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 ?
+                        else if (node.parent.kind === 220) {
+                            diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                                symbolAccessibilityResult.accessibility === 2 ?
                                     ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
                                     ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                                 ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0;
                         }
                         else {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                            diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                                 ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                                 ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
                         }
                         break;
-                    case 216:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
+                    case 219:
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 ?
                                 ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
                                 ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_private_name_0;
@@ -26228,62 +28052,62 @@ var ts;
                 write("?");
             }
             decreaseIndent();
-            if (node.parent.kind === 153 ||
-                node.parent.kind === 154 ||
-                node.parent.parent.kind === 156) {
+            if (node.parent.kind === 155 ||
+                node.parent.kind === 156 ||
+                node.parent.parent.kind === 158) {
                 emitTypeOfVariableDeclarationFromTypeLiteral(node);
             }
-            else if (!(node.parent.flags & 16)) {
+            else if (!(node.parent.flags & 8)) {
                 writeTypeOfDeclaration(node, node.type, getParameterDeclarationTypeVisibilityError);
             }
-            function getParameterDeclarationTypeVisibilityError(symbolAccesibilityResult) {
-                var diagnosticMessage = getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult);
+            function getParameterDeclarationTypeVisibilityError(symbolAccessibilityResult) {
+                var diagnosticMessage = getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult);
                 return diagnosticMessage !== undefined ? {
                     diagnosticMessage: diagnosticMessage,
                     errorNode: node,
                     typeName: node.name
                 } : undefined;
             }
-            function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult) {
+            function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
                 switch (node.parent.kind) {
-                    case 145:
-                        return symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
+                    case 147:
+                        return symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 ?
                                 ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                 ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1;
-                    case 149:
-                        return symbolAccesibilityResult.errorModuleName ?
+                    case 151:
+                        return symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
-                    case 148:
-                        return symbolAccesibilityResult.errorModuleName ?
+                    case 150:
+                        return symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
-                    case 144:
-                    case 143:
-                        if (node.parent.flags & 64) {
-                            return symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 ?
+                    case 146:
+                    case 145:
+                        if (node.parent.flags & 32) {
+                            return symbolAccessibilityResult.errorModuleName ?
+                                symbolAccessibilityResult.accessibility === 2 ?
                                     ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                     ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                                 ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                         }
-                        else if (node.parent.parent.kind === 217) {
-                            return symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 ?
+                        else if (node.parent.parent.kind === 220) {
+                            return symbolAccessibilityResult.errorModuleName ?
+                                symbolAccessibilityResult.accessibility === 2 ?
                                     ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                     ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                                 ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
                         }
                         else {
-                            return symbolAccesibilityResult.errorModuleName ?
+                            return symbolAccessibilityResult.errorModuleName ?
                                 ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                                 ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                         }
-                    case 216:
-                        return symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 ?
+                    case 219:
+                        return symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 ?
                                 ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                 ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_private_name_1;
@@ -26292,12 +28116,12 @@ var ts;
                 }
             }
             function emitBindingPattern(bindingPattern) {
-                if (bindingPattern.kind === 164) {
+                if (bindingPattern.kind === 166) {
                     write("{");
                     emitCommaList(bindingPattern.elements, emitBindingElement);
                     write("}");
                 }
-                else if (bindingPattern.kind === 165) {
+                else if (bindingPattern.kind === 167) {
                     write("[");
                     var elements = bindingPattern.elements;
                     emitCommaList(elements, emitBindingElement);
@@ -26308,10 +28132,10 @@ var ts;
                 }
             }
             function emitBindingElement(bindingElement) {
-                if (bindingElement.kind === 190) {
+                if (bindingElement.kind === 192) {
                     write(" ");
                 }
-                else if (bindingElement.kind === 166) {
+                else if (bindingElement.kind === 168) {
                     if (bindingElement.propertyName) {
                         writeTextOfNode(currentText, bindingElement.propertyName);
                         write(": ");
@@ -26333,39 +28157,39 @@ var ts;
         }
         function emitNode(node) {
             switch (node.kind) {
-                case 216:
-                case 221:
-                case 224:
-                case 218:
-                case 217:
                 case 219:
+                case 224:
+                case 228:
+                case 221:
                 case 220:
+                case 222:
+                case 223:
                     return emitModuleElement(node, isModuleElementVisible(node));
-                case 196:
+                case 199:
                     return emitModuleElement(node, isVariableStatementVisible(node));
-                case 225:
+                case 229:
                     return emitModuleElement(node, !node.importClause);
-                case 231:
+                case 235:
                     return emitExportDeclaration(node);
+                case 147:
+                case 146:
                 case 145:
+                    return writeFunctionDeclaration(node);
+                case 151:
+                case 150:
+                case 152:
+                    return emitSignatureDeclarationWithJsDocComments(node);
+                case 148:
+                case 149:
+                    return emitAccessorDeclaration(node);
                 case 144:
                 case 143:
-                    return writeFunctionDeclaration(node);
-                case 149:
-                case 148:
-                case 150:
-                    return emitSignatureDeclarationWithJsDocComments(node);
-                case 146:
-                case 147:
-                    return emitAccessorDeclaration(node);
-                case 142:
-                case 141:
                     return emitPropertyDeclaration(node);
-                case 250:
+                case 254:
                     return emitEnumMemberDeclaration(node);
-                case 230:
+                case 234:
                     return emitExportAssignment(node);
-                case 251:
+                case 255:
                     return emitSourceFile(node);
             }
         }
@@ -26380,7 +28204,7 @@ var ts;
             }
             if (declFileName) {
                 declFileName = ts.getRelativePathToDirectoryOrUrl(ts.getDirectoryPath(ts.normalizeSlashes(declarationFilePath)), declFileName, host.getCurrentDirectory(), host.getCanonicalFileName, false);
-                referencePathsOutput += "/// <reference path=\"" + declFileName + "\" />" + newLine;
+                referencePathsOutput += '/// <reference path="' + declFileName + '" />' + newLine;
             }
             return addedBundledEmitReference;
             function getDeclFileName(emitFileNames, sourceFiles, isBundledEmit) {
@@ -26689,14 +28513,16 @@ var ts;
     };
     function emitFiles(resolver, host, targetSourceFile) {
         var extendsHelper = "\nvar __extends = (this && this.__extends) || function (d, b) {\n    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];\n    function __() { this.constructor = d; }\n    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());\n};";
+        var assignHelper = "\nvar __assign = (this && this.__assign) || Object.assign || function(t) {\n    for (var s, i = 1, n = arguments.length; i < n; i++) {\n        s = arguments[i];\n        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))\n            t[p] = s[p];\n    }\n    return t;\n};";
         var decorateHelper = "\nvar __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {\n    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;\n    if (typeof Reflect === \"object\" && typeof Reflect.decorate === \"function\") r = Reflect.decorate(decorators, target, key, desc);\n    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;\n    return c > 3 && r && Object.defineProperty(target, key, r), r;\n};";
         var metadataHelper = "\nvar __metadata = (this && this.__metadata) || function (k, v) {\n    if (typeof Reflect === \"object\" && typeof Reflect.metadata === \"function\") return Reflect.metadata(k, v);\n};";
         var paramHelper = "\nvar __param = (this && this.__param) || function (paramIndex, decorator) {\n    return function (target, key) { decorator(target, key, paramIndex); }\n};";
-        var awaiterHelper = "\nvar __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n    return new P(function (resolve, reject) {\n        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n        function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }\n        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }\n        step((generator = generator.call(thisArg, _arguments)).next());\n    });\n};";
+        var awaiterHelper = "\nvar __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n    return new (P || (P = Promise))(function (resolve, reject) {\n        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n        function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }\n        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }\n        step((generator = generator.apply(thisArg, _arguments)).next());\n    });\n};";
         var compilerOptions = host.getCompilerOptions();
         var languageVersion = ts.getEmitScriptTarget(compilerOptions);
         var modulekind = ts.getEmitModuleKind(compilerOptions);
         var sourceMapDataList = compilerOptions.sourceMap || compilerOptions.inlineSourceMap ? [] : undefined;
+        var emittedFilesList = compilerOptions.listEmittedFiles ? [] : undefined;
         var emitterDiagnostics = ts.createDiagnosticCollection();
         var emitSkipped = false;
         var newLine = host.getNewLine();
@@ -26705,6 +28531,7 @@ var ts;
         return {
             emitSkipped: emitSkipped,
             diagnostics: emitterDiagnostics.getDiagnostics(),
+            emittedFiles: emittedFilesList,
             sourceMaps: sourceMapDataList
         };
         function isUniqueLocalName(name, container) {
@@ -26761,11 +28588,14 @@ var ts;
             var isEs6Module;
             var isCurrentFileExternalModule;
             var exportFunctionForFile;
+            var contextObjectForFile;
             var generatedNameSet;
             var nodeToGeneratedName;
             var computedPropertyNamesToGeneratedNames;
+            var decoratedClassAliases;
             var convertedLoopState;
             var extendsEmitted;
+            var assignEmitted;
             var decorateEmitted;
             var paramEmitted;
             var awaiterEmitted;
@@ -26782,19 +28612,19 @@ var ts;
             var emitLeadingCommentsOfPosition = compilerOptions.removeComments ? function (pos) { } : emitLeadingCommentsOfPositionWorker;
             var setSourceMapWriterEmit = compilerOptions.sourceMap || compilerOptions.inlineSourceMap ? changeSourceMapEmit : function (writer) { };
             var moduleEmitDelegates = (_a = {},
-                _a[5] = emitES6Module,
-                _a[2] = emitAMDModule,
-                _a[4] = emitSystemModule,
-                _a[3] = emitUMDModule,
-                _a[1] = emitCommonJSModule,
+                _a[ts.ModuleKind.ES6] = emitES6Module,
+                _a[ts.ModuleKind.AMD] = emitAMDModule,
+                _a[ts.ModuleKind.System] = emitSystemModule,
+                _a[ts.ModuleKind.UMD] = emitUMDModule,
+                _a[ts.ModuleKind.CommonJS] = emitCommonJSModule,
                 _a
             );
             var bundleEmitDelegates = (_b = {},
-                _b[5] = function () { },
-                _b[2] = emitAMDModule,
-                _b[4] = emitSystemModule,
-                _b[3] = function () { },
-                _b[1] = function () { },
+                _b[ts.ModuleKind.ES6] = function () { },
+                _b[ts.ModuleKind.AMD] = emitAMDModule,
+                _b[ts.ModuleKind.System] = emitSystemModule,
+                _b[ts.ModuleKind.UMD] = function () { },
+                _b[ts.ModuleKind.CommonJS] = function () { },
                 _b
             );
             return doEmit;
@@ -26802,6 +28632,7 @@ var ts;
                 sourceMap.initialize(jsFilePath, sourceMapFilePath, sourceFiles, isBundledEmit);
                 generatedNameSet = {};
                 nodeToGeneratedName = [];
+                decoratedClassAliases = [];
                 isOwnFileEmit = !isBundledEmit;
                 if (isBundledEmit && modulekind) {
                     ts.forEach(sourceFiles, emitEmitHelpers);
@@ -26812,21 +28643,24 @@ var ts;
                 if (sourceMappingURL) {
                     write("//# sourceMappingURL=" + sourceMappingURL);
                 }
-                writeEmittedFiles(writer.getText(), jsFilePath, sourceMapFilePath, compilerOptions.emitBOM);
+                writeEmittedFiles(writer.getText(), jsFilePath, sourceMapFilePath, compilerOptions.emitBOM, sourceFiles);
                 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;
@@ -26845,6 +28679,7 @@ var ts;
                 currentText = sourceFile.text;
                 currentLineMap = ts.getLineStarts(sourceFile);
                 exportFunctionForFile = undefined;
+                contextObjectForFile = undefined;
                 isEs6Module = sourceFile.symbol && sourceFile.symbol.exports && !!sourceFile.symbol.exports["___esModule"];
                 renamedDependencies = sourceFile.renamedDependencies;
                 currentFileIdentifiers = sourceFile.identifiers;
@@ -26859,19 +28694,19 @@ var ts;
             }
             function makeTempVariableName(flags) {
                 if (flags && !(tempFlags & flags)) {
-                    var name_22 = flags === 268435456 ? "_i" : "_n";
-                    if (isUniqueName(name_22)) {
+                    var name_23 = flags === 268435456 ? "_i" : "_n";
+                    if (isUniqueName(name_23)) {
                         tempFlags |= flags;
-                        return name_22;
+                        return name_23;
                     }
                 }
                 while (true) {
                     var count = tempFlags & 268435455;
                     tempFlags++;
                     if (count !== 8 && count !== 13) {
-                        var name_23 = count < 26 ? "_" + String.fromCharCode(97 + count) : "_" + (count - 26);
-                        if (isUniqueName(name_23)) {
-                            return name_23;
+                        var name_24 = count < 26 ? "_" + String.fromCharCode(97 + count) : "_" + (count - 26);
+                        if (isUniqueName(name_24)) {
+                            return name_24;
                         }
                     }
                 }
@@ -26909,17 +28744,17 @@ var ts;
                 switch (node.kind) {
                     case 69:
                         return makeUniqueName(node.text);
-                    case 221:
-                    case 220:
+                    case 224:
+                    case 223:
                         return generateNameForModuleOrEnum(node);
-                    case 225:
-                    case 231:
+                    case 229:
+                    case 235:
                         return generateNameForImportOrExportDeclaration(node);
-                    case 216:
-                    case 217:
-                    case 230:
+                    case 219:
+                    case 220:
+                    case 234:
                         return generateNameForExportDefault();
-                    case 189:
+                    case 191:
                         return generateNameForClassExpression();
                 }
             }
@@ -26927,14 +28762,14 @@ var ts;
                 var id = ts.getNodeId(node);
                 return nodeToGeneratedName[id] || (nodeToGeneratedName[id] = ts.unescapeIdentifier(generateNameForNode(node)));
             }
-            function writeEmittedFiles(emitOutput, jsFilePath, sourceMapFilePath, writeByteOrderMark) {
+            function writeEmittedFiles(emitOutput, jsFilePath, sourceMapFilePath, writeByteOrderMark, sourceFiles) {
                 if (compilerOptions.sourceMap && !compilerOptions.inlineSourceMap) {
-                    ts.writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(), false);
+                    ts.writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(), false, sourceFiles);
                 }
                 if (sourceMapDataList) {
                     sourceMapDataList.push(sourceMap.getSourceMapData());
                 }
-                ts.writeFile(host, emitterDiagnostics, jsFilePath, emitOutput, writeByteOrderMark);
+                ts.writeFile(host, emitterDiagnostics, jsFilePath, emitOutput, writeByteOrderMark, sourceFiles);
             }
             function createTempVariable(flags) {
                 var result = ts.createSynthesizedNode(69);
@@ -27099,14 +28934,14 @@ var ts;
             }
             function getLiteralText(node) {
                 if (languageVersion < 2 && (ts.isTemplateLiteralKind(node.kind) || node.hasExtendedUnicodeEscape)) {
-                    return getQuotedEscapedLiteralText("\"", node.text, "\"");
+                    return getQuotedEscapedLiteralText('"', node.text, '"');
                 }
                 if (node.parent) {
                     return ts.getTextOfNodeFromSourceText(currentText, node);
                 }
                 switch (node.kind) {
                     case 9:
-                        return getQuotedEscapedLiteralText("\"", node.text, "\"");
+                        return getQuotedEscapedLiteralText('"', node.text, '"');
                     case 11:
                         return getQuotedEscapedLiteralText("`", node.text, "`");
                     case 12:
@@ -27159,10 +28994,10 @@ var ts;
                 emitParenthesizedIf(node.tag, needsParenthesisForPropertyAccessOrInvocation(node.tag));
                 write("(");
                 emit(tempVariable);
-                if (node.template.kind === 186) {
+                if (node.template.kind === 188) {
                     ts.forEach(node.template.templateSpans, function (templateSpan) {
                         write(", ");
-                        var needsParens = templateSpan.expression.kind === 184
+                        var needsParens = templateSpan.expression.kind === 186
                             && templateSpan.expression.operatorToken.kind === 24;
                         emitParenthesizedIf(templateSpan.expression, needsParens);
                     });
@@ -27186,7 +29021,7 @@ var ts;
                 }
                 for (var i = 0, n = node.templateSpans.length; i < n; i++) {
                     var templateSpan = node.templateSpans[i];
-                    var needsParens = templateSpan.expression.kind !== 175
+                    var needsParens = templateSpan.expression.kind !== 177
                         && comparePrecedenceToBinaryPlus(templateSpan.expression) !== 1;
                     if (i > 0 || headEmitted) {
                         write(" + ");
@@ -27206,11 +29041,11 @@ var ts;
                 }
                 function templateNeedsParens(template, parent) {
                     switch (parent.kind) {
-                        case 171:
-                        case 172:
-                            return parent.expression === template;
                         case 173:
+                        case 174:
+                            return parent.expression === template;
                         case 175:
+                        case 177:
                             return false;
                         default:
                             return comparePrecedenceToBinaryPlus(parent) !== -1;
@@ -27218,7 +29053,7 @@ var ts;
                 }
                 function comparePrecedenceToBinaryPlus(expression) {
                     switch (expression.kind) {
-                        case 184:
+                        case 186:
                             switch (expression.operatorToken.kind) {
                                 case 37:
                                 case 39:
@@ -27230,8 +29065,8 @@ var ts;
                                 default:
                                     return -1;
                             }
+                        case 189:
                         case 187:
-                        case 185:
                             return -1;
                         default:
                             return 1;
@@ -27245,9 +29080,9 @@ var ts;
             function jsxEmitReact(node) {
                 function emitTagName(name) {
                     if (name.kind === 69 && ts.isIntrinsicJsxName(name.text)) {
-                        write("\"");
+                        write('"');
                         emit(name);
-                        write("\"");
+                        write('"');
                     }
                     else {
                         emit(name);
@@ -27258,9 +29093,9 @@ var ts;
                         emit(name);
                     }
                     else {
-                        write("\"");
+                        write('"');
                         emit(name);
-                        write("\"");
+                        write('"');
                     }
                 }
                 function emitJsxAttribute(node) {
@@ -27287,12 +29122,11 @@ var ts;
                     }
                     else {
                         var attrs = openingNode.attributes;
-                        if (ts.forEach(attrs, function (attr) { return attr.kind === 242; })) {
-                            emitExpressionIdentifier(syntheticReactRef);
-                            write(".__spread(");
+                        if (ts.forEach(attrs, function (attr) { return attr.kind === 246; })) {
+                            write("__assign(");
                             var haveOpenedObjectLiteral = false;
                             for (var i = 0; i < attrs.length; i++) {
-                                if (attrs[i].kind === 242) {
+                                if (attrs[i].kind === 246) {
                                     if (i === 0) {
                                         write("{}, ");
                                     }
@@ -27306,7 +29140,7 @@ var ts;
                                     emit(attrs[i].expression);
                                 }
                                 else {
-                                    ts.Debug.assert(attrs[i].kind === 241);
+                                    ts.Debug.assert(attrs[i].kind === 245);
                                     if (haveOpenedObjectLiteral) {
                                         write(", ");
                                     }
@@ -27336,32 +29170,52 @@ var ts;
                         }
                     }
                     if (children) {
-                        for (var i = 0; i < children.length; i++) {
-                            if (children[i].kind === 243 && !(children[i].expression)) {
-                                continue;
-                            }
-                            if (children[i].kind === 239) {
-                                var text = getTextToEmit(children[i]);
-                                if (text !== undefined) {
-                                    write(", \"");
-                                    write(text);
-                                    write("\"");
+                        var firstChild = void 0;
+                        var multipleEmittableChildren = false;
+                        for (var i = 0, n = children.length; i < n; i++) {
+                            var jsxChild = children[i];
+                            if (isJsxChildEmittable(jsxChild)) {
+                                if (!firstChild) {
+                                    write(", ");
+                                    firstChild = jsxChild;
+                                }
+                                else {
+                                    if (!multipleEmittableChildren) {
+                                        multipleEmittableChildren = true;
+                                        increaseIndent();
+                                        writeLine();
+                                        emit(firstChild);
+                                    }
+                                    write(", ");
+                                    writeLine();
+                                    emit(jsxChild);
                                 }
                             }
+                        }
+                        if (multipleEmittableChildren) {
+                            decreaseIndent();
+                        }
+                        else if (firstChild) {
+                            if (firstChild.kind !== 240 && firstChild.kind !== 241) {
+                                emit(firstChild);
+                            }
                             else {
-                                write(", ");
-                                emit(children[i]);
+                                increaseIndent();
+                                writeLine();
+                                emit(firstChild);
+                                writeLine();
+                                decreaseIndent();
                             }
                         }
                     }
                     write(")");
                     emitTrailingComments(openingNode);
                 }
-                if (node.kind === 236) {
+                if (node.kind === 240) {
                     emitJsxElement(node.openingElement, node.children);
                 }
                 else {
-                    ts.Debug.assert(node.kind === 237);
+                    ts.Debug.assert(node.kind === 241);
                     emitJsxElement(node);
                 }
             }
@@ -27383,11 +29237,11 @@ var ts;
                         if (i > 0) {
                             write(" ");
                         }
-                        if (attribs[i].kind === 242) {
+                        if (attribs[i].kind === 246) {
                             emitJsxSpreadAttribute(attribs[i]);
                         }
                         else {
-                            ts.Debug.assert(attribs[i].kind === 241);
+                            ts.Debug.assert(attribs[i].kind === 245);
                             emitJsxAttribute(attribs[i]);
                         }
                     }
@@ -27395,11 +29249,11 @@ var ts;
                 function emitJsxOpeningOrSelfClosingElement(node) {
                     write("<");
                     emit(node.tagName);
-                    if (node.attributes.length > 0 || (node.kind === 237)) {
+                    if (node.attributes.length > 0 || (node.kind === 241)) {
                         write(" ");
                     }
                     emitAttributes(node.attributes);
-                    if (node.kind === 237) {
+                    if (node.kind === 241) {
                         write("/>");
                     }
                     else {
@@ -27418,20 +29272,20 @@ var ts;
                     }
                     emitJsxClosingElement(node.closingElement);
                 }
-                if (node.kind === 236) {
+                if (node.kind === 240) {
                     emitJsxElement(node);
                 }
                 else {
-                    ts.Debug.assert(node.kind === 237);
+                    ts.Debug.assert(node.kind === 241);
                     emitJsxOpeningOrSelfClosingElement(node);
                 }
             }
             function emitExpressionForPropertyName(node) {
-                ts.Debug.assert(node.kind !== 166);
+                ts.Debug.assert(node.kind !== 168);
                 if (node.kind === 9) {
                     emitLiteral(node);
                 }
-                else if (node.kind === 137) {
+                else if (node.kind === 139) {
                     if (ts.nodeIsDecorated(node.parent)) {
                         if (!computedPropertyNamesToGeneratedNames) {
                             computedPropertyNamesToGeneratedNames = [];
@@ -27449,88 +29303,85 @@ var ts;
                     emit(node.expression);
                 }
                 else {
-                    write("\"");
+                    write('"');
                     if (node.kind === 8) {
                         write(node.text);
                     }
                     else {
                         writeTextOfNode(currentText, node);
                     }
-                    write("\"");
+                    write('"');
                 }
             }
             function isExpressionIdentifier(node) {
                 var parent = node.parent;
                 switch (parent.kind) {
-                    case 167:
-                    case 192:
-                    case 184:
-                    case 171:
-                    case 244:
-                    case 137:
-                    case 185:
-                    case 140:
-                    case 178:
-                    case 200:
-                    case 170:
-                    case 230:
-                    case 198:
-                    case 191:
-                    case 202:
-                    case 203:
-                    case 204:
-                    case 199:
-                    case 240:
-                    case 237:
-                    case 238:
-                    case 242:
-                    case 243:
-                    case 172:
-                    case 175:
-                    case 183:
-                    case 182:
-                    case 207:
-                    case 249:
-                    case 188:
-                    case 209:
-                    case 173:
-                    case 193:
-                    case 211:
-                    case 174:
-                    case 179:
-                    case 180:
-                    case 201:
-                    case 208:
-                    case 187:
-                        return true;
-                    case 166:
-                    case 250:
-                    case 139:
-                    case 248:
-                    case 142:
-                    case 214:
-                        return parent.initializer === node;
                     case 169:
-                        return parent.expression === node;
+                    case 194:
+                    case 186:
+                    case 173:
+                    case 248:
+                    case 139:
+                    case 187:
+                    case 142:
+                    case 180:
+                    case 203:
+                    case 172:
+                    case 234:
+                    case 201:
+                    case 193:
+                    case 205:
+                    case 206:
+                    case 207:
+                    case 202:
+                    case 244:
+                    case 241:
+                    case 242:
+                    case 246:
+                    case 247:
+                    case 174:
+                    case 195:
                     case 177:
+                    case 185:
+                    case 184:
+                    case 210:
+                    case 253:
+                    case 190:
+                    case 212:
+                    case 175:
+                    case 196:
+                    case 214:
                     case 176:
+                    case 181:
+                    case 182:
+                    case 204:
+                    case 211:
+                    case 189:
+                        return true;
+                    case 168:
+                    case 254:
+                    case 141:
+                    case 252:
+                    case 144:
+                    case 217:
+                        return parent.initializer === node;
+                    case 171:
+                        return parent.expression === node;
+                    case 179:
+                    case 178:
                         return parent.body === node;
-                    case 224:
+                    case 228:
                         return parent.moduleReference === node;
-                    case 136:
+                    case 138:
                         return parent.left === node;
                 }
                 return false;
             }
             function emitExpressionIdentifier(node) {
-                if (resolver.getNodeCheckFlags(node) & 2048) {
-                    write("_arguments");
-                    return;
-                }
                 var container = resolver.getReferencedExportContainer(node);
                 if (container) {
-                    if (container.kind === 251) {
-                        if (modulekind !== 5 && modulekind !== 4) {
+                    if (container.kind === 255) {
+                        if (modulekind !== ts.ModuleKind.ES6 && modulekind !== ts.ModuleKind.System) {
                             write("exports.");
                         }
                     }
@@ -27540,20 +29391,20 @@ var ts;
                     }
                 }
                 else {
-                    if (modulekind !== 5) {
+                    if (modulekind !== ts.ModuleKind.ES6) {
                         var declaration = resolver.getReferencedImportDeclaration(node);
                         if (declaration) {
-                            if (declaration.kind === 226) {
+                            if (declaration.kind === 230) {
                                 write(getGeneratedNameForNode(declaration.parent));
-                                write(languageVersion === 0 ? "[\"default\"]" : ".default");
+                                write(languageVersion === 0 ? '["default"]' : ".default");
                                 return;
                             }
-                            else if (declaration.kind === 229) {
+                            else if (declaration.kind === 233) {
                                 write(getGeneratedNameForNode(declaration.parent.parent.parent));
-                                var name_24 = declaration.propertyName || declaration.name;
-                                var identifier = ts.getTextOfNodeFromSourceText(currentText, name_24);
+                                var name_25 = declaration.propertyName || declaration.name;
+                                var identifier = ts.getTextOfNodeFromSourceText(currentText, name_25);
                                 if (languageVersion === 0 && identifier === "default") {
-                                    write("[\"default\"]");
+                                    write('["default"]');
                                 }
                                 else {
                                     write(".");
@@ -27563,13 +29414,23 @@ var ts;
                             }
                         }
                     }
-                    if (languageVersion !== 2) {
-                        var declaration = resolver.getReferencedNestedRedeclaration(node);
+                    if (languageVersion < 2) {
+                        var declaration = resolver.getReferencedDeclarationWithCollidingName(node);
                         if (declaration) {
                             write(getGeneratedNameForNode(declaration.name));
                             return;
                         }
                     }
+                    else if (resolver.getNodeCheckFlags(node) & 1048576) {
+                        var declaration = resolver.getReferencedValueDeclaration(node);
+                        if (declaration) {
+                            var classAlias = decoratedClassAliases[ts.getNodeId(declaration)];
+                            if (classAlias !== undefined) {
+                                write(classAlias);
+                                return;
+                            }
+                        }
+                    }
                 }
                 if (ts.nodeIsSynthesized(node)) {
                     write(node.text);
@@ -27578,15 +29439,15 @@ var ts;
                     writeTextOfNode(currentText, node);
                 }
             }
-            function isNameOfNestedRedeclaration(node) {
+            function isNameOfNestedBlockScopedRedeclarationOrCapturedBinding(node) {
                 if (languageVersion < 2) {
-                    var parent_7 = node.parent;
-                    switch (parent_7.kind) {
-                        case 166:
-                        case 217:
+                    var parent_10 = node.parent;
+                    switch (parent_10.kind) {
+                        case 168:
                         case 220:
-                        case 214:
-                            return parent_7.name === node && resolver.isNestedRedeclaration(parent_7);
+                        case 223:
+                        case 217:
+                            return parent_10.name === node && resolver.isDeclarationWithCollidingName(parent_10);
                     }
                 }
                 return false;
@@ -27594,8 +29455,8 @@ var ts;
             function emitIdentifier(node) {
                 if (convertedLoopState) {
                     if (node.text == "arguments" && resolver.isArgumentsLocalBinding(node)) {
-                        var name_25 = convertedLoopState.argumentsName || (convertedLoopState.argumentsName = makeUniqueName("arguments"));
-                        write(name_25);
+                        var name_26 = convertedLoopState.argumentsName || (convertedLoopState.argumentsName = makeUniqueName("arguments"));
+                        write(name_26);
                         return;
                     }
                 }
@@ -27605,7 +29466,7 @@ var ts;
                 else if (isExpressionIdentifier(node)) {
                     emitExpressionIdentifier(node);
                 }
-                else if (isNameOfNestedRedeclaration(node)) {
+                else if (isNameOfNestedBlockScopedRedeclarationOrCapturedBinding(node)) {
                     write(getGeneratedNameForNode(node));
                 }
                 else if (ts.nodeIsSynthesized(node)) {
@@ -27695,10 +29556,10 @@ var ts;
                 }
             }
             function needsParenthesisForAwaitExpressionAsYield(node) {
-                if (node.parent.kind === 184 && !ts.isAssignmentOperator(node.parent.operatorToken.kind)) {
+                if (node.parent.kind === 186 && !ts.isAssignmentOperator(node.parent.operatorToken.kind)) {
                     return true;
                 }
-                else if (node.parent.kind === 185 && node.parent.condition === node) {
+                else if (node.parent.kind === 187 && node.parent.condition === node) {
                     return true;
                 }
                 return false;
@@ -27706,11 +29567,11 @@ var ts;
             function needsParenthesisForPropertyAccessOrInvocation(node) {
                 switch (node.kind) {
                     case 69:
-                    case 167:
                     case 169:
-                    case 170:
                     case 171:
-                    case 175:
+                    case 172:
+                    case 173:
+                    case 177:
                         return false;
                 }
                 return true;
@@ -27727,17 +29588,17 @@ var ts;
                         write(", ");
                     }
                     var e = elements[pos];
-                    if (e.kind === 188) {
+                    if (e.kind === 190) {
                         e = e.expression;
                         emitParenthesizedIf(e, group === 0 && needsParenthesisForPropertyAccessOrInvocation(e));
                         pos++;
-                        if (pos === length && group === 0 && needsUniqueCopy && e.kind !== 167) {
+                        if (pos === length && group === 0 && needsUniqueCopy && e.kind !== 169) {
                             write(".slice()");
                         }
                     }
                     else {
                         var i = pos;
-                        while (i < length && elements[i].kind !== 188) {
+                        while (i < length && elements[i].kind !== 190) {
                             i++;
                         }
                         write("[");
@@ -27760,7 +29621,7 @@ var ts;
                 }
             }
             function isSpreadElementExpression(node) {
-                return node.kind === 188;
+                return node.kind === 190;
             }
             function emitArrayLiteral(node) {
                 var elements = node.elements;
@@ -27773,7 +29634,7 @@ var ts;
                     write("]");
                 }
                 else {
-                    emitListWithSpread(elements, true, (node.flags & 1024) !== 0, elements.hasTrailingComma, true);
+                    emitListWithSpread(elements, true, node.multiLine, elements.hasTrailingComma, true);
                 }
             }
             function emitObjectLiteralBody(node, numElements) {
@@ -27788,7 +29649,7 @@ var ts;
                         emitLinePreservingList(node, properties, languageVersion >= 1, true);
                     }
                     else {
-                        var multiLine = (node.flags & 1024) !== 0;
+                        var multiLine = node.multiLine;
                         if (!multiLine) {
                             write(" ");
                         }
@@ -27807,7 +29668,7 @@ var ts;
                 write("}");
             }
             function emitDownlevelObjectLiteralWithComputedProperties(node, firstComputedPropertyIndex) {
-                var multiLine = (node.flags & 1024) !== 0;
+                var multiLine = node.multiLine;
                 var properties = node.properties;
                 write("(");
                 if (multiLine) {
@@ -27821,7 +29682,7 @@ var ts;
                     writeComma();
                     var property = properties[i];
                     emitStart(property);
-                    if (property.kind === 146 || property.kind === 147) {
+                    if (property.kind === 148 || property.kind === 149) {
                         var accessors = ts.getAllAccessorDeclarations(node.properties, property);
                         if (property !== accessors.firstAccessor) {
                             continue;
@@ -27872,13 +29733,13 @@ var ts;
                         emitMemberAccessForPropertyName(property.name);
                         emitEnd(property.name);
                         write(" = ");
-                        if (property.kind === 248) {
+                        if (property.kind === 252) {
                             emit(property.initializer);
                         }
-                        else if (property.kind === 249) {
+                        else if (property.kind === 253) {
                             emitExpressionIdentifier(property.name);
                         }
-                        else if (property.kind === 144) {
+                        else if (property.kind === 146) {
                             emitFunctionDeclaration(property);
                         }
                         else {
@@ -27910,7 +29771,7 @@ var ts;
                     var numProperties = properties.length;
                     var numInitialNonComputedProperties = numProperties;
                     for (var i = 0, n = properties.length; i < n; i++) {
-                        if (properties[i].name.kind === 137) {
+                        if (properties[i].name.kind === 139) {
                             numInitialNonComputedProperties = i;
                             break;
                         }
@@ -27924,35 +29785,37 @@ var ts;
                 emitObjectLiteralBody(node, properties.length);
             }
             function createBinaryExpression(left, operator, right, startsOnNewLine) {
-                var result = ts.createSynthesizedNode(184, startsOnNewLine);
+                var result = ts.createSynthesizedNode(186, startsOnNewLine);
                 result.operatorToken = ts.createSynthesizedNode(operator);
                 result.left = left;
                 result.right = right;
                 return result;
             }
             function createPropertyAccessExpression(expression, name) {
-                var result = ts.createSynthesizedNode(169);
+                var result = ts.createSynthesizedNode(171);
                 result.expression = parenthesizeForAccess(expression);
                 result.dotToken = ts.createSynthesizedNode(21);
                 result.name = name;
                 return result;
             }
             function createElementAccessExpression(expression, argumentExpression) {
-                var result = ts.createSynthesizedNode(170);
+                var result = ts.createSynthesizedNode(172);
                 result.expression = parenthesizeForAccess(expression);
                 result.argumentExpression = argumentExpression;
                 return result;
             }
             function parenthesizeForAccess(expr) {
-                while (expr.kind === 174 || expr.kind === 192) {
+                while (expr.kind === 176 ||
+                    expr.kind === 194 ||
+                    expr.kind === 195) {
                     expr = expr.expression;
                 }
                 if (ts.isLeftHandSideExpression(expr) &&
-                    expr.kind !== 172 &&
+                    expr.kind !== 174 &&
                     expr.kind !== 8) {
                     return expr;
                 }
-                var node = ts.createSynthesizedNode(175);
+                var node = ts.createSynthesizedNode(177);
                 node.expression = expr;
                 return node;
             }
@@ -27979,11 +29842,15 @@ var ts;
             }
             function isNamespaceExportReference(node) {
                 var container = resolver.getReferencedExportContainer(node);
-                return container && container.kind !== 251;
+                return container && container.kind !== 255;
+            }
+            function isImportedReference(node) {
+                var declaration = resolver.getReferencedImportDeclaration(node);
+                return declaration && (declaration.kind === 230 || declaration.kind === 233);
             }
             function emitShorthandPropertyAssignment(node) {
                 writeTextOfNode(currentText, node.name);
-                if (modulekind !== 5 || isNamespaceExportReference(node.name)) {
+                if (languageVersion < 2 || (modulekind !== ts.ModuleKind.ES6 && isImportedReference(node.name)) || isNamespaceExportReference(node.name)) {
                     write(": ");
                     emit(node.name);
                 }
@@ -27997,7 +29864,7 @@ var ts;
                 if (constantValue !== undefined) {
                     write(constantValue.toString());
                     if (!compilerOptions.removeComments) {
-                        var propertyName = node.kind === 169 ? ts.declarationNameToString(node.name) : ts.getTextOfNode(node.argumentExpression);
+                        var propertyName = node.kind === 171 ? ts.declarationNameToString(node.name) : ts.getTextOfNode(node.argumentExpression);
                         write(" /* " + propertyName + " */");
                     }
                     return true;
@@ -28008,7 +29875,7 @@ var ts;
                 if (compilerOptions.isolatedModules) {
                     return undefined;
                 }
-                return node.kind === 169 || node.kind === 170
+                return node.kind === 171 || node.kind === 172
                     ? resolver.getConstantValue(node)
                     : undefined;
             }
@@ -28031,6 +29898,14 @@ var ts;
                 if (tryEmitConstantValue(node)) {
                     return;
                 }
+                if (languageVersion === 2 &&
+                    node.expression.kind === 95 &&
+                    isInAsyncMethodWithSuperInES6(node)) {
+                    var name_27 = ts.createSynthesizedNode(9);
+                    name_27.text = node.name.text;
+                    emitSuperAccessInAsyncMethod(node.expression, name_27);
+                    return;
+                }
                 emit(node.expression);
                 var indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, node.dotToken);
                 var shouldEmitSpace = false;
@@ -28088,7 +29963,7 @@ var ts;
                         }
                         emitExpressionIdentifier(node);
                         break;
-                    case 136:
+                    case 138:
                         emitQualifiedNameAsExpression(node, useFallback);
                         break;
                     default:
@@ -28100,16 +29975,25 @@ var ts;
                 if (tryEmitConstantValue(node)) {
                     return;
                 }
+                if (languageVersion === 2 &&
+                    node.expression.kind === 95 &&
+                    isInAsyncMethodWithSuperInES6(node)) {
+                    emitSuperAccessInAsyncMethod(node.expression, node.argumentExpression);
+                    return;
+                }
                 emit(node.expression);
                 write("[");
                 emit(node.argumentExpression);
                 write("]");
             }
             function hasSpreadElement(elements) {
-                return ts.forEach(elements, function (e) { return e.kind === 188; });
+                return ts.forEach(elements, function (e) { return e.kind === 190; });
             }
             function skipParentheses(node) {
-                while (node.kind === 175 || node.kind === 174 || node.kind === 192) {
+                while (node.kind === 177 ||
+                    node.kind === 176 ||
+                    node.kind === 194 ||
+                    node.kind === 195) {
                     node = node.expression;
                 }
                 return node;
@@ -28130,12 +30014,12 @@ var ts;
             function emitCallWithSpread(node) {
                 var target;
                 var expr = skipParentheses(node.expression);
-                if (expr.kind === 169) {
+                if (expr.kind === 171) {
                     target = emitCallTarget(expr.expression);
                     write(".");
                     emit(expr.name);
                 }
-                else if (expr.kind === 170) {
+                else if (expr.kind === 172) {
                     target = emitCallTarget(expr.expression);
                     write("[");
                     emit(expr.argumentExpression);
@@ -28164,23 +30048,42 @@ var ts;
                 emitListWithSpread(node.arguments, false, false, false, true);
                 write(")");
             }
+            function isInAsyncMethodWithSuperInES6(node) {
+                if (languageVersion === 2) {
+                    var container = ts.getSuperContainer(node, false);
+                    if (container && resolver.getNodeCheckFlags(container) & (2048 | 4096)) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+            function emitSuperAccessInAsyncMethod(superNode, argumentExpression) {
+                var container = ts.getSuperContainer(superNode, false);
+                var isSuperBinding = resolver.getNodeCheckFlags(container) & 4096;
+                write("_super(");
+                emit(argumentExpression);
+                write(isSuperBinding ? ").value" : ")");
+            }
             function emitCallExpression(node) {
                 if (languageVersion < 2 && hasSpreadElement(node.arguments)) {
                     emitCallWithSpread(node);
                     return;
                 }
+                var expression = node.expression;
                 var superCall = false;
-                if (node.expression.kind === 95) {
-                    emitSuper(node.expression);
+                var isAsyncMethodWithSuper = false;
+                if (expression.kind === 95) {
+                    emitSuper(expression);
                     superCall = true;
                 }
                 else {
-                    emit(node.expression);
-                    superCall = node.expression.kind === 169 && node.expression.expression.kind === 95;
+                    superCall = ts.isSuperPropertyOrElementAccess(expression);
+                    isAsyncMethodWithSuper = superCall && isInAsyncMethodWithSuperInES6(node);
+                    emit(expression);
                 }
-                if (superCall && languageVersion < 2) {
+                if (superCall && (languageVersion < 2 || isAsyncMethodWithSuper)) {
                     write(".call(");
-                    emitThis(node.expression);
+                    emitThis(expression);
                     if (node.arguments.length) {
                         write(", ");
                         emitCommaList(node.arguments);
@@ -28227,21 +30130,25 @@ var ts;
                 }
             }
             function emitParenExpression(node) {
-                if (!ts.nodeIsSynthesized(node) && node.parent.kind !== 177) {
-                    if (node.expression.kind === 174 || node.expression.kind === 192) {
+                if (!ts.nodeIsSynthesized(node) && node.parent.kind !== 179) {
+                    if (node.expression.kind === 176 ||
+                        node.expression.kind === 194 ||
+                        node.expression.kind === 195) {
                         var operand = node.expression.expression;
-                        while (operand.kind === 174 || operand.kind === 192) {
+                        while (operand.kind === 176 ||
+                            operand.kind === 194 ||
+                            operand.kind === 195) {
                             operand = operand.expression;
                         }
-                        if (operand.kind !== 182 &&
+                        if (operand.kind !== 184 &&
+                            operand.kind !== 182 &&
+                            operand.kind !== 181 &&
                             operand.kind !== 180 &&
-                            operand.kind !== 179 &&
-                            operand.kind !== 178 &&
-                            operand.kind !== 183 &&
-                            operand.kind !== 172 &&
-                            !(operand.kind === 171 && node.parent.kind === 172) &&
-                            !(operand.kind === 176 && node.parent.kind === 171) &&
-                            !(operand.kind === 8 && node.parent.kind === 169)) {
+                            operand.kind !== 185 &&
+                            operand.kind !== 174 &&
+                            !(operand.kind === 173 && node.parent.kind === 174) &&
+                            !(operand.kind === 178 && node.parent.kind === 173) &&
+                            !(operand.kind === 8 && node.parent.kind === 171)) {
                             emit(operand);
                             return;
                         }
@@ -28270,7 +30177,7 @@ var ts;
                 if (!isCurrentFileSystemExternalModule() || node.kind !== 69 || ts.nodeIsSynthesized(node)) {
                     return false;
                 }
-                var isVariableDeclarationOrBindingElement = node.parent && (node.parent.kind === 214 || node.parent.kind === 166);
+                var isVariableDeclarationOrBindingElement = node.parent && (node.parent.kind === 217 || node.parent.kind === 168);
                 var targetDeclaration = isVariableDeclarationOrBindingElement
                     ? node.parent
                     : resolver.getReferencedValueDeclaration(node);
@@ -28285,7 +30192,7 @@ var ts;
                     write("\", ");
                 }
                 write(ts.tokenToString(node.operator));
-                if (node.operand.kind === 182) {
+                if (node.operand.kind === 184) {
                     var operand = node.operand;
                     if (node.operator === 35 && (operand.operator === 35 || operand.operator === 41)) {
                         write(" ");
@@ -28326,12 +30233,12 @@ var ts;
                 if (!node || !isCurrentFileSystemExternalModule()) {
                     return false;
                 }
-                var current = node;
+                var current = ts.getRootDeclaration(node).parent;
                 while (current) {
-                    if (current.kind === 251) {
-                        return !isExported || ((ts.getCombinedNodeFlags(node) & 2) !== 0);
+                    if (current.kind === 255) {
+                        return !isExported || ((ts.getCombinedNodeFlags(node) & 1) !== 0);
                     }
-                    else if (ts.isFunctionLike(current) || current.kind === 222) {
+                    else if (ts.isDeclaration(current)) {
                         return false;
                     }
                     else {
@@ -28342,12 +30249,12 @@ var ts;
             function emitExponentiationOperator(node) {
                 var leftHandSideExpression = node.left;
                 if (node.operatorToken.kind === 60) {
-                    var synthesizedLHS;
+                    var synthesizedLHS = void 0;
                     var shouldEmitParentheses = false;
                     if (ts.isElementAccessExpression(leftHandSideExpression)) {
                         shouldEmitParentheses = true;
                         write("(");
-                        synthesizedLHS = ts.createSynthesizedNode(170, false);
+                        synthesizedLHS = ts.createSynthesizedNode(172, false);
                         var identifier = emitTempVariableAssignment(leftHandSideExpression.expression, false, false);
                         synthesizedLHS.expression = identifier;
                         if (leftHandSideExpression.argumentExpression.kind !== 8 &&
@@ -28364,7 +30271,7 @@ var ts;
                     else if (ts.isPropertyAccessExpression(leftHandSideExpression)) {
                         shouldEmitParentheses = true;
                         write("(");
-                        synthesizedLHS = ts.createSynthesizedNode(169, false);
+                        synthesizedLHS = ts.createSynthesizedNode(171, false);
                         var identifier = emitTempVariableAssignment(leftHandSideExpression.expression, false, false);
                         synthesizedLHS.expression = identifier;
                         synthesizedLHS.dotToken = leftHandSideExpression.dotToken;
@@ -28392,8 +30299,8 @@ var ts;
             }
             function emitBinaryExpression(node) {
                 if (languageVersion < 2 && node.operatorToken.kind === 56 &&
-                    (node.left.kind === 168 || node.left.kind === 167)) {
-                    emitDestructuring(node, node.parent.kind === 198);
+                    (node.left.kind === 170 || node.left.kind === 169)) {
+                    emitDestructuring(node, node.parent.kind === 201);
                 }
                 else {
                     var exportChanged = node.operatorToken.kind >= 56 &&
@@ -28445,7 +30352,7 @@ var ts;
                 }
             }
             function isSingleLineEmptyBlock(node) {
-                if (node && node.kind === 195) {
+                if (node && node.kind === 198) {
                     var block = node;
                     return block.statements.length === 0 && nodeEndIsOnSameLineAsNodeStart(block, block);
                 }
@@ -28459,12 +30366,12 @@ var ts;
                 }
                 emitToken(15, node.pos);
                 increaseIndent();
-                if (node.kind === 222) {
-                    ts.Debug.assert(node.parent.kind === 221);
+                if (node.kind === 225) {
+                    ts.Debug.assert(node.parent.kind === 224);
                     emitCaptureThisForNodeIfNecessary(node.parent);
                 }
                 emitLines(node.statements);
-                if (node.kind === 222) {
+                if (node.kind === 225) {
                     emitTempDeclarations(true);
                 }
                 decreaseIndent();
@@ -28472,7 +30379,7 @@ var ts;
                 emitToken(16, node.statements.end);
             }
             function emitEmbeddedStatement(node) {
-                if (node.kind === 195) {
+                if (node.kind === 198) {
                     write(" ");
                     emit(node);
                 }
@@ -28484,7 +30391,7 @@ var ts;
                 }
             }
             function emitExpressionStatement(node) {
-                emitParenthesizedIf(node.expression, node.expression.kind === 177);
+                emitParenthesizedIf(node.expression, node.expression.kind === 179);
                 write(";");
             }
             function emitIfStatement(node) {
@@ -28497,7 +30404,7 @@ var ts;
                 if (node.elseStatement) {
                     writeLine();
                     emitToken(80, node.thenStatement.end);
-                    if (node.elseStatement.kind === 199) {
+                    if (node.elseStatement.kind === 202) {
                         write(" ");
                         emit(node.elseStatement);
                     }
@@ -28517,7 +30424,7 @@ var ts;
                 else {
                     emitNormalLoopBody(node, true);
                 }
-                if (node.statement.kind === 195) {
+                if (node.statement.kind === 198) {
                     write(" ");
                 }
                 else {
@@ -28545,7 +30452,7 @@ var ts;
                 if (shouldHoistVariable(decl, true)) {
                     return false;
                 }
-                if (convertedLoopState && (ts.getCombinedNodeFlags(decl) & 24576) === 0) {
+                if (convertedLoopState && (ts.getCombinedNodeFlags(decl) & 3072) === 0) {
                     for (var _a = 0, _b = decl.declarations; _a < _b.length; _a++) {
                         var varDecl = _b[_a];
                         hoistVariableDeclarationFromLoop(convertedLoopState, varDecl);
@@ -28597,7 +30504,7 @@ var ts;
                 }
                 else {
                     var loop = convertLoopBody(node);
-                    if (node.parent.kind === 210) {
+                    if (node.parent.kind === 213) {
                         emitLabelAndColon(node.parent);
                     }
                     loopEmitter(node, loop);
@@ -28607,34 +30514,30 @@ var ts;
                 var functionName = makeUniqueName("_loop");
                 var loopInitializer;
                 switch (node.kind) {
-                    case 202:
-                    case 203:
-                    case 204:
+                    case 205:
+                    case 206:
+                    case 207:
                         var initializer = node.initializer;
-                        if (initializer && initializer.kind === 215) {
+                        if (initializer && initializer.kind === 218) {
                             loopInitializer = node.initializer;
                         }
                         break;
                 }
                 var loopParameters;
-                if (loopInitializer && (ts.getCombinedNodeFlags(loopInitializer) & 24576)) {
+                var loopOutParameters;
+                if (loopInitializer && (ts.getCombinedNodeFlags(loopInitializer) & 3072)) {
                     loopParameters = [];
                     for (var _a = 0, _b = loopInitializer.declarations; _a < _b.length; _a++) {
                         var varDeclaration = _b[_a];
-                        collectNames(varDeclaration.name);
+                        processVariableDeclaration(varDeclaration.name);
                     }
                 }
-                var bodyIsBlock = node.statement.kind === 195;
+                var bodyIsBlock = node.statement.kind === 198;
                 var paramList = loopParameters ? loopParameters.join(", ") : "";
                 writeLine();
                 write("var " + functionName + " = function(" + paramList + ")");
-                if (!bodyIsBlock) {
-                    write(" {");
-                    writeLine();
-                    increaseIndent();
-                }
                 var convertedOuterLoopState = convertedLoopState;
-                convertedLoopState = {};
+                convertedLoopState = { loopOutParameters: loopOutParameters };
                 if (convertedOuterLoopState) {
                     if (convertedOuterLoopState.argumentsName) {
                         convertedLoopState.argumentsName = convertedOuterLoopState.argumentsName;
@@ -28646,14 +30549,32 @@ var ts;
                         convertedLoopState.hoistedLocalVariables = convertedOuterLoopState.hoistedLocalVariables;
                     }
                 }
-                emitEmbeddedStatement(node.statement);
-                if (!bodyIsBlock) {
-                    decreaseIndent();
-                    writeLine();
-                    write("}");
-                }
-                write(";");
+                write(" {");
                 writeLine();
+                increaseIndent();
+                if (bodyIsBlock) {
+                    emitLines(node.statement.statements);
+                }
+                else {
+                    emit(node.statement);
+                }
+                writeLine();
+                copyLoopOutParameters(convertedLoopState, 1, true);
+                decreaseIndent();
+                writeLine();
+                write("};");
+                writeLine();
+                if (loopOutParameters) {
+                    write("var ");
+                    for (var i = 0; i < loopOutParameters.length; i++) {
+                        if (i !== 0) {
+                            write(", ");
+                        }
+                        write(loopOutParameters[i].outParamName);
+                    }
+                    write(";");
+                    writeLine();
+                }
                 if (convertedLoopState.argumentsName) {
                     if (convertedOuterLoopState) {
                         convertedOuterLoopState.argumentsName = convertedLoopState.argumentsName;
@@ -28678,7 +30599,7 @@ var ts;
                     }
                     else {
                         write("var ");
-                        var seen;
+                        var seen = void 0;
                         for (var _c = 0, _d = convertedLoopState.hoistedLocalVariables; _c < _d.length; _c++) {
                             var id = _d[_c];
                             if (!seen) {
@@ -28699,15 +30620,21 @@ var ts;
                 var currentLoopState = convertedLoopState;
                 convertedLoopState = convertedOuterLoopState;
                 return { functionName: functionName, paramList: paramList, state: currentLoopState };
-                function collectNames(name) {
+                function processVariableDeclaration(name) {
                     if (name.kind === 69) {
-                        var nameText = isNameOfNestedRedeclaration(name) ? getGeneratedNameForNode(name) : name.text;
+                        var nameText = isNameOfNestedBlockScopedRedeclarationOrCapturedBinding(name)
+                            ? getGeneratedNameForNode(name)
+                            : name.text;
                         loopParameters.push(nameText);
+                        if (resolver.getNodeCheckFlags(name.parent) & 2097152) {
+                            var reassignedVariable = { originalName: name, outParamName: makeUniqueName("out_" + nameText) };
+                            (loopOutParameters || (loopOutParameters = [])).push(reassignedVariable);
+                        }
                     }
                     else {
                         for (var _a = 0, _b = name.elements; _a < _b.length; _a++) {
                             var element = _b[_a];
-                            collectNames(element.name);
+                            processVariableDeclaration(element.name);
                         }
                     }
                 }
@@ -28721,7 +30648,7 @@ var ts;
                 if (emitAsEmbeddedStatement) {
                     emitEmbeddedStatement(node.statement);
                 }
-                else if (node.statement.kind === 195) {
+                else if (node.statement.kind === 198) {
                     emitLines(node.statement.statements);
                 }
                 else {
@@ -28732,13 +30659,35 @@ var ts;
                     convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
                 }
             }
+            function copyLoopOutParameters(state, copyDirection, emitAsStatements) {
+                if (state.loopOutParameters) {
+                    for (var _a = 0, _b = state.loopOutParameters; _a < _b.length; _a++) {
+                        var outParam = _b[_a];
+                        if (copyDirection === 0) {
+                            emitIdentifier(outParam.originalName);
+                            write(" = " + outParam.outParamName);
+                        }
+                        else {
+                            write(outParam.outParamName + " = ");
+                            emitIdentifier(outParam.originalName);
+                        }
+                        if (emitAsStatements) {
+                            write(";");
+                            writeLine();
+                        }
+                        else {
+                            write(", ");
+                        }
+                    }
+                }
+            }
             function emitConvertedLoopCall(loop, emitAsBlock) {
                 if (emitAsBlock) {
                     write(" {");
                     writeLine();
                     increaseIndent();
                 }
-                var isSimpleLoop = !loop.state.nonLocalJumps &&
+                var isSimpleLoop = !(loop.state.nonLocalJumps & ~4) &&
                     !loop.state.labeledNonLocalBreaks &&
                     !loop.state.labeledNonLocalContinues;
                 var loopResult = makeUniqueName("state");
@@ -28746,6 +30695,8 @@ var ts;
                     write("var " + loopResult + " = ");
                 }
                 write(loop.functionName + "(" + loop.paramList + ");");
+                writeLine();
+                copyLoopOutParameters(loop.state, 0, true);
                 if (!isSimpleLoop) {
                     writeLine();
                     if (loop.state.nonLocalJumps & 8) {
@@ -28755,7 +30706,7 @@ var ts;
                             convertedLoopState.nonLocalJumps |= 8;
                         }
                         else {
-                            write("return " + loopResult + ".value");
+                            write("return " + loopResult + ".value;");
                         }
                         writeLine();
                     }
@@ -28763,10 +30714,6 @@ var ts;
                         write("if (" + loopResult + " === \"break\") break;");
                         writeLine();
                     }
-                    if (loop.state.nonLocalJumps & 4) {
-                        write("if (" + loopResult + " === \"continue\") continue;");
-                        writeLine();
-                    }
                     emitDispatchTableForLabeledJumps(loopResult, loop.state, convertedLoopState);
                 }
                 if (emitAsBlock) {
@@ -28817,7 +30764,7 @@ var ts;
                 var endPos = emitToken(86, node.pos);
                 write(" ");
                 endPos = emitToken(17, endPos);
-                if (node.initializer && node.initializer.kind === 215) {
+                if (node.initializer && node.initializer.kind === 218) {
                     var variableDeclarationList = node.initializer;
                     var startIsEmitted = tryEmitStartOfVariableDeclarationList(variableDeclarationList);
                     if (startIsEmitted) {
@@ -28843,7 +30790,7 @@ var ts;
                 }
             }
             function emitForInOrForOfStatement(node) {
-                if (languageVersion < 2 && node.kind === 204) {
+                if (languageVersion < 2 && node.kind === 207) {
                     emitLoop(node, emitDownLevelForOfStatementWorker);
                 }
                 else {
@@ -28854,7 +30801,7 @@ var ts;
                 var endPos = emitToken(86, node.pos);
                 write(" ");
                 endPos = emitToken(17, endPos);
-                if (node.initializer.kind === 215) {
+                if (node.initializer.kind === 218) {
                     var variableDeclarationList = node.initializer;
                     if (variableDeclarationList.declarations.length >= 1) {
                         tryEmitStartOfVariableDeclarationList(variableDeclarationList);
@@ -28864,7 +30811,7 @@ var ts;
                 else {
                     emit(node.initializer);
                 }
-                if (node.kind === 203) {
+                if (node.kind === 206) {
                     write(" in ");
                 }
                 else {
@@ -28917,7 +30864,7 @@ var ts;
                 increaseIndent();
                 var rhsIterationValue = createElementAccessExpression(rhsReference, counter);
                 emitStart(node.initializer);
-                if (node.initializer.kind === 215) {
+                if (node.initializer.kind === 218) {
                     write("var ");
                     var variableDeclarationList = node.initializer;
                     if (variableDeclarationList.declarations.length > 0) {
@@ -28939,7 +30886,7 @@ var ts;
                 }
                 else {
                     var assignmentExpression = createBinaryExpression(node.initializer, 56, rhsIterationValue, false);
-                    if (node.initializer.kind === 167 || node.initializer.kind === 168) {
+                    if (node.initializer.kind === 169 || node.initializer.kind === 170) {
                         emitDestructuring(assignmentExpression, true, undefined);
                     }
                     else {
@@ -28961,23 +30908,25 @@ var ts;
             }
             function emitBreakOrContinueStatement(node) {
                 if (convertedLoopState) {
-                    var jump = node.kind === 206 ? 2 : 4;
+                    var jump = node.kind === 209 ? 2 : 4;
                     var canUseBreakOrContinue = (node.label && convertedLoopState.labels && convertedLoopState.labels[node.label.text]) ||
                         (!node.label && (convertedLoopState.allowedNonLabeledJumps & jump));
                     if (!canUseBreakOrContinue) {
+                        write("return ");
+                        copyLoopOutParameters(convertedLoopState, 1, false);
                         if (!node.label) {
-                            if (node.kind === 206) {
+                            if (node.kind === 209) {
                                 convertedLoopState.nonLocalJumps |= 2;
-                                write("return \"break\";");
+                                write("\"break\";");
                             }
                             else {
                                 convertedLoopState.nonLocalJumps |= 4;
-                                write("return \"continue\";");
+                                write("\"continue\";");
                             }
                         }
                         else {
-                            var labelMarker;
-                            if (node.kind === 206) {
+                            var labelMarker = void 0;
+                            if (node.kind === 209) {
                                 labelMarker = "break-" + node.label.text;
                                 setLabeledJump(convertedLoopState, true, node.label.text, labelMarker);
                             }
@@ -28985,12 +30934,12 @@ var ts;
                                 labelMarker = "continue-" + node.label.text;
                                 setLabeledJump(convertedLoopState, false, node.label.text, labelMarker);
                             }
-                            write("return \"" + labelMarker + "\";");
+                            write("\"" + labelMarker + "\";");
                         }
                         return;
                     }
                 }
-                emitToken(node.kind === 206 ? 70 : 75, node.pos);
+                emitToken(node.kind === 209 ? 70 : 75, node.pos);
                 emitOptional(" ", node.label);
                 write(";");
             }
@@ -29055,7 +31004,7 @@ var ts;
                     ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node2.pos));
             }
             function emitCaseOrDefaultClause(node) {
-                if (node.kind === 244) {
+                if (node.kind === 248) {
                     write("case ");
                     emit(node.expression);
                     write(":");
@@ -29124,7 +31073,7 @@ var ts;
             function getContainingModule(node) {
                 do {
                     node = node.parent;
-                } while (node && node.kind !== 221);
+                } while (node && node.kind !== 224);
                 return node;
             }
             function emitContainingModuleName(node) {
@@ -29133,13 +31082,13 @@ var ts;
             }
             function emitModuleMemberName(node) {
                 emitStart(node.name);
-                if (ts.getCombinedNodeFlags(node) & 2) {
+                if (ts.getCombinedNodeFlags(node) & 1) {
                     var container = getContainingModule(node);
                     if (container) {
                         write(getGeneratedNameForNode(container));
                         write(".");
                     }
-                    else if (modulekind !== 5 && modulekind !== 4) {
+                    else if (modulekind !== ts.ModuleKind.ES6 && modulekind !== ts.ModuleKind.System) {
                         write("exports.");
                     }
                 }
@@ -29149,17 +31098,17 @@ var ts;
             function createVoidZero() {
                 var zero = ts.createSynthesizedNode(8);
                 zero.text = "0";
-                var result = ts.createSynthesizedNode(180);
+                var result = ts.createSynthesizedNode(182);
                 result.expression = zero;
                 return result;
             }
             function emitEs6ExportDefaultCompat(node) {
-                if (node.parent.kind === 251) {
-                    ts.Debug.assert(!!(node.flags & 512) || node.kind === 230);
-                    if (modulekind === 1 || modulekind === 2 || modulekind === 3) {
+                if (node.parent.kind === 255) {
+                    ts.Debug.assert(!!(node.flags & 512) || node.kind === 234);
+                    if (modulekind === ts.ModuleKind.CommonJS || modulekind === ts.ModuleKind.AMD || modulekind === ts.ModuleKind.UMD) {
                         if (!isEs6Module) {
                             if (languageVersion !== 0) {
-                                write("Object.defineProperty(exports, \"__esModule\", { value: true });");
+                                write('Object.defineProperty(exports, "__esModule", { value: true });');
                                 writeLine();
                             }
                             else {
@@ -29171,10 +31120,10 @@ var ts;
                 }
             }
             function emitExportMemberAssignment(node) {
-                if (node.flags & 2) {
+                if (node.flags & 1) {
                     writeLine();
                     emitStart(node);
-                    if (modulekind === 4 && node.parent === currentSourceFile) {
+                    if (modulekind === ts.ModuleKind.System && node.parent === currentSourceFile) {
                         write(exportFunctionForFile + "(\"");
                         if (node.flags & 512) {
                             write("default");
@@ -29190,7 +31139,7 @@ var ts;
                         if (node.flags & 512) {
                             emitEs6ExportDefaultCompat(node);
                             if (languageVersion === 0) {
-                                write("exports[\"default\"]");
+                                write('exports["default"]');
                             }
                             else {
                                 write("exports.default");
@@ -29207,7 +31156,7 @@ var ts;
                 }
             }
             function emitExportMemberAssignments(name) {
-                if (modulekind === 4) {
+                if (modulekind === ts.ModuleKind.System) {
                     return;
                 }
                 if (!exportEquals && exportSpecifiers && ts.hasProperty(exportSpecifiers, name.text)) {
@@ -29226,7 +31175,7 @@ var ts;
                 }
             }
             function emitExportSpecifierInSystemModule(specifier) {
-                ts.Debug.assert(modulekind === 4);
+                ts.Debug.assert(modulekind === ts.ModuleKind.System);
                 if (!resolver.getReferencedValueDeclaration(specifier.propertyName || specifier.name) && !resolver.isValueAliasDeclaration(specifier)) {
                     return;
                 }
@@ -29250,7 +31199,7 @@ var ts;
                     emitNodeWithCommentsAndWithoutSourcemap(name);
                     write("\", ");
                 }
-                var isVariableDeclarationOrBindingElement = name.parent && (name.parent.kind === 214 || name.parent.kind === 166);
+                var isVariableDeclarationOrBindingElement = name.parent && (name.parent.kind === 217 || name.parent.kind === 168);
                 emitStart(isFirstVariableDeclaration(nodeForSourceMap) ? nodeForSourceMap.parent : nodeForSourceMap);
                 withTemporaryNoSourceMap(function () {
                     if (isVariableDeclarationOrBindingElement) {
@@ -29276,22 +31225,22 @@ var ts;
                 return identifier;
             }
             function isFirstVariableDeclaration(root) {
-                return root.kind === 214 &&
-                    root.parent.kind === 215 &&
+                return root.kind === 217 &&
+                    root.parent.kind === 218 &&
                     root.parent.declarations[0] === root;
             }
             function emitDestructuring(root, isAssignmentExpressionStatement, value) {
                 var emitCount = 0;
                 var canDefineTempVariablesInPlace = false;
-                if (root.kind === 214) {
-                    var isExported = ts.getCombinedNodeFlags(root) & 2;
+                if (root.kind === 217) {
+                    var isExported = ts.getCombinedNodeFlags(root) & 1;
                     var isSourceLevelForSystemModuleKind = shouldHoistDeclarationInSystemJsModule(root);
                     canDefineTempVariablesInPlace = !isExported && !isSourceLevelForSystemModuleKind;
                 }
-                else if (root.kind === 139) {
+                else if (root.kind === 141) {
                     canDefineTempVariablesInPlace = true;
                 }
-                if (root.kind === 184) {
+                if (root.kind === 186) {
                     emitAssignmentExpression(root);
                 }
                 else {
@@ -29311,14 +31260,14 @@ var ts;
                 }
                 function createDefaultValueCheck(value, defaultValue, sourceMapNode) {
                     value = ensureIdentifier(value, true, sourceMapNode);
-                    var equals = ts.createSynthesizedNode(184);
+                    var equals = ts.createSynthesizedNode(186);
                     equals.left = value;
                     equals.operatorToken = ts.createSynthesizedNode(32);
                     equals.right = createVoidZero();
                     return createConditionalExpression(equals, defaultValue, value);
                 }
                 function createConditionalExpression(condition, whenTrue, whenFalse) {
-                    var cond = ts.createSynthesizedNode(185);
+                    var cond = ts.createSynthesizedNode(187);
                     cond.condition = condition;
                     cond.questionToken = ts.createSynthesizedNode(53);
                     cond.whenTrue = whenTrue;
@@ -29333,20 +31282,20 @@ var ts;
                 }
                 function createPropertyAccessForDestructuringProperty(object, propName) {
                     var index;
-                    var nameIsComputed = propName.kind === 137;
+                    var nameIsComputed = propName.kind === 139;
                     if (nameIsComputed) {
                         index = ensureIdentifier(propName.expression, false, propName);
                     }
                     else {
                         index = ts.createSynthesizedNode(propName.kind);
-                        index.text = propName.text;
+                        index.text = ts.unescapeIdentifier(propName.text);
                     }
                     return !nameIsComputed && index.kind === 69
                         ? createPropertyAccessExpression(object, index)
                         : createElementAccessExpression(object, index);
                 }
                 function createSliceCall(value, sliceIndex) {
-                    var call = ts.createSynthesizedNode(171);
+                    var call = ts.createSynthesizedNode(173);
                     var sliceIdentifier = ts.createSynthesizedNode(69);
                     sliceIdentifier.text = "slice";
                     call.expression = createPropertyAccessExpression(value, sliceIdentifier);
@@ -29361,9 +31310,9 @@ var ts;
                     }
                     for (var _a = 0, properties_5 = properties; _a < properties_5.length; _a++) {
                         var p = properties_5[_a];
-                        if (p.kind === 248 || p.kind === 249) {
+                        if (p.kind === 252 || p.kind === 253) {
                             var propName = p.name;
-                            var target_1 = p.kind === 249 ? p : p.initializer || propName;
+                            var target_1 = p.kind === 253 ? p : p.initializer || propName;
                             emitDestructuringAssignment(target_1, createPropertyAccessForDestructuringProperty(value, propName), p);
                         }
                     }
@@ -29375,8 +31324,8 @@ var ts;
                     }
                     for (var i = 0; i < elements.length; i++) {
                         var e = elements[i];
-                        if (e.kind !== 190) {
-                            if (e.kind !== 188) {
+                        if (e.kind !== 192) {
+                            if (e.kind !== 190) {
                                 emitDestructuringAssignment(e, createElementAccessExpression(value, createNumericLiteral(i)), e);
                             }
                             else if (i === elements.length - 1) {
@@ -29386,20 +31335,20 @@ var ts;
                     }
                 }
                 function emitDestructuringAssignment(target, value, sourceMapNode) {
-                    if (target.kind === 249) {
+                    if (target.kind === 253) {
                         if (target.objectAssignmentInitializer) {
                             value = createDefaultValueCheck(value, target.objectAssignmentInitializer, sourceMapNode);
                         }
                         target = target.name;
                     }
-                    else if (target.kind === 184 && target.operatorToken.kind === 56) {
+                    else if (target.kind === 186 && target.operatorToken.kind === 56) {
                         value = createDefaultValueCheck(value, target.right, sourceMapNode);
                         target = target.left;
                     }
-                    if (target.kind === 168) {
+                    if (target.kind === 170) {
                         emitObjectLiteralAssignment(target, value, sourceMapNode);
                     }
-                    else if (target.kind === 167) {
+                    else if (target.kind === 169) {
                         emitArrayLiteralAssignment(target, value, sourceMapNode);
                     }
                     else {
@@ -29417,14 +31366,14 @@ var ts;
                         emitDestructuringAssignment(target, value, ts.nodeIsSynthesized(root) ? target : root);
                     }
                     else {
-                        if (root.parent.kind !== 175) {
+                        if (root.parent.kind !== 177) {
                             write("(");
                         }
                         value = ensureIdentifier(value, true, root);
                         emitDestructuringAssignment(target, value, root);
                         write(", ");
                         emit(value);
-                        if (root.parent.kind !== 175) {
+                        if (root.parent.kind !== 177) {
                             write(")");
                         }
                     }
@@ -29445,11 +31394,11 @@ var ts;
                         }
                         for (var i = 0; i < numElements; i++) {
                             var element = elements[i];
-                            if (pattern.kind === 164) {
+                            if (pattern.kind === 166) {
                                 var propName = element.propertyName || element.name;
                                 emitBindingElement(element, createPropertyAccessForDestructuringProperty(value, propName));
                             }
-                            else if (element.kind !== 190) {
+                            else if (element.kind !== 192) {
                                 if (!element.dotDotDotToken) {
                                     emitBindingElement(element, createElementAccessExpression(value, createNumericLiteral(i)));
                                 }
@@ -29467,22 +31416,42 @@ var ts;
             }
             function emitVariableDeclaration(node) {
                 if (ts.isBindingPattern(node.name)) {
-                    if (languageVersion < 2) {
-                        emitDestructuring(node, false);
-                    }
-                    else {
+                    var isExported = ts.getCombinedNodeFlags(node) & 1;
+                    if (languageVersion >= 2 && (!isExported || modulekind === ts.ModuleKind.ES6)) {
+                        var isTopLevelDeclarationInSystemModule = modulekind === ts.ModuleKind.System &&
+                            shouldHoistVariable(node, true);
+                        if (isTopLevelDeclarationInSystemModule) {
+                            write("(");
+                        }
                         emit(node.name);
                         emitOptional(" = ", node.initializer);
+                        if (isTopLevelDeclarationInSystemModule) {
+                            write(")");
+                        }
+                    }
+                    else {
+                        emitDestructuring(node, false);
                     }
                 }
                 else {
                     var initializer = node.initializer;
-                    if (!initializer && languageVersion < 2) {
-                        var isLetDefinedInLoop = (resolver.getNodeCheckFlags(node) & 16384) &&
-                            (getCombinedFlagsForIdentifier(node.name) & 8192);
-                        if (isLetDefinedInLoop &&
-                            node.parent.parent.kind !== 203 &&
-                            node.parent.parent.kind !== 204) {
+                    if (!initializer &&
+                        languageVersion < 2 &&
+                        node.name.kind === 69) {
+                        var container = ts.getEnclosingBlockScopeContainer(node);
+                        var flags = resolver.getNodeCheckFlags(node);
+                        var isCapturedInFunction = flags & 131072;
+                        var isDeclaredInLoop = flags & 262144;
+                        var emittedAsTopLevel = ts.isBlockScopedContainerTopLevel(container) ||
+                            (isCapturedInFunction && isDeclaredInLoop && container.kind === 198 && ts.isIterationStatement(container.parent, false));
+                        var emittedAsNestedLetDeclaration = ts.getCombinedNodeFlags(node) & 1024 &&
+                            !emittedAsTopLevel;
+                        var emitExplicitInitializer = emittedAsNestedLetDeclaration &&
+                            container.kind !== 206 &&
+                            container.kind !== 207 &&
+                            (!resolver.isDeclarationWithCollidingName(node) ||
+                                (isDeclaredInLoop && !isCapturedInFunction && !ts.isIterationStatement(container, false)));
+                        if (emitExplicitInitializer) {
                             initializer = createVoidZero();
                         }
                     }
@@ -29500,7 +31469,7 @@ var ts;
                 }
             }
             function emitExportVariableAssignments(node) {
-                if (node.kind === 190) {
+                if (node.kind === 192) {
                     return;
                 }
                 var name = node.name;
@@ -29511,20 +31480,14 @@ var ts;
                     ts.forEach(name.elements, emitExportVariableAssignments);
                 }
             }
-            function getCombinedFlagsForIdentifier(node) {
-                if (!node.parent || (node.parent.kind !== 214 && node.parent.kind !== 166)) {
-                    return 0;
-                }
-                return ts.getCombinedNodeFlags(node.parent);
-            }
             function isES6ExportedDeclaration(node) {
-                return !!(node.flags & 2) &&
-                    modulekind === 5 &&
-                    node.parent.kind === 251;
+                return !!(node.flags & 1) &&
+                    modulekind === ts.ModuleKind.ES6 &&
+                    node.parent.kind === 255;
             }
             function emitVariableStatement(node) {
                 var startIsEmitted = false;
-                if (node.flags & 2) {
+                if (node.flags & 1) {
                     if (isES6ExportedDeclaration(node)) {
                         write("export ");
                         startIsEmitted = tryEmitStartOfVariableDeclarationList(node.declarationList);
@@ -29543,12 +31506,12 @@ var ts;
                         write(";");
                     }
                 }
-                if (modulekind !== 5 && node.parent === currentSourceFile) {
+                if (modulekind !== ts.ModuleKind.ES6 && node.parent === currentSourceFile) {
                     ts.forEach(node.declarationList.declarations, emitExportVariableAssignments);
                 }
             }
             function shouldEmitLeadingAndTrailingCommentsForVariableStatement(node) {
-                if (!(node.flags & 2)) {
+                if (!(node.flags & 1)) {
                     return true;
                 }
                 if (isES6ExportedDeclaration(node)) {
@@ -29565,12 +31528,12 @@ var ts;
             function emitParameter(node) {
                 if (languageVersion < 2) {
                     if (ts.isBindingPattern(node.name)) {
-                        var name_26 = createTempVariable(0);
+                        var name_28 = createTempVariable(0);
                         if (!tempParameters) {
                             tempParameters = [];
                         }
-                        tempParameters.push(name_26);
-                        emit(name_26);
+                        tempParameters.push(name_28);
+                        emit(name_28);
                     }
                     else {
                         emit(node.name);
@@ -29586,7 +31549,7 @@ var ts;
             }
             function emitDefaultValueAssignments(node) {
                 if (languageVersion < 2) {
-                    var tempIndex = 0;
+                    var tempIndex_1 = 0;
                     ts.forEach(node.parameters, function (parameter) {
                         if (parameter.dotDotDotToken) {
                             return;
@@ -29598,15 +31561,15 @@ var ts;
                                 writeLine();
                                 write("var ");
                                 if (hasBindingElements) {
-                                    emitDestructuring(parameter, false, tempParameters[tempIndex]);
+                                    emitDestructuring(parameter, false, tempParameters[tempIndex_1]);
                                 }
                                 else {
-                                    emit(tempParameters[tempIndex]);
+                                    emit(tempParameters[tempIndex_1]);
                                     write(" = ");
                                     emit(initializer);
                                 }
                                 write(";");
-                                tempIndex++;
+                                tempIndex_1++;
                             }
                         }
                         else if (initializer) {
@@ -29669,12 +31632,12 @@ var ts;
                 }
             }
             function emitAccessor(node) {
-                write(node.kind === 146 ? "get " : "set ");
+                write(node.kind === 148 ? "get " : "set ");
                 emit(node.name);
                 emitSignatureAndBody(node);
             }
             function shouldEmitAsArrowFunction(node) {
-                return node.kind === 177 && languageVersion >= 2;
+                return node.kind === 179 && languageVersion >= 2;
             }
             function emitDeclarationName(node) {
                 if (node.name) {
@@ -29685,11 +31648,11 @@ var ts;
                 }
             }
             function shouldEmitFunctionName(node) {
-                if (node.kind === 176) {
+                if (node.kind === 178) {
                     return !!node.name;
                 }
-                if (node.kind === 216) {
-                    return !!node.name || modulekind !== 5;
+                if (node.kind === 219) {
+                    return !!node.name || modulekind !== ts.ModuleKind.ES6;
                 }
             }
             function emitFunctionDeclaration(node) {
@@ -29697,12 +31660,12 @@ var ts;
                     return emitCommentsOnNotEmittedNode(node);
                 }
                 var kind = node.kind, parent = node.parent;
-                if (kind !== 144 &&
-                    kind !== 143 &&
+                if (kind !== 146 &&
+                    kind !== 145 &&
                     parent &&
-                    parent.kind !== 248 &&
-                    parent.kind !== 171 &&
-                    parent.kind !== 167) {
+                    parent.kind !== 252 &&
+                    parent.kind !== 173 &&
+                    parent.kind !== 169) {
                     emitLeadingComments(node);
                 }
                 emitStart(node);
@@ -29723,11 +31686,13 @@ var ts;
                     emitDeclarationName(node);
                 }
                 emitSignatureAndBody(node);
-                if (modulekind !== 5 && kind === 216 && parent === currentSourceFile && node.name) {
+                if (modulekind !== ts.ModuleKind.ES6 && kind === 219 && parent === currentSourceFile && node.name) {
                     emitExportMemberAssignments(node.name);
                 }
                 emitEnd(node);
-                if (kind !== 144 && kind !== 143) {
+                if (kind !== 146 &&
+                    kind !== 145 &&
+                    kind !== 179) {
                     emitTrailingComments(node);
                 }
             }
@@ -29744,8 +31709,9 @@ var ts;
                 write("(");
                 if (node) {
                     var parameters = node.parameters;
+                    var skipCount = node.parameters.length && node.parameters[0].name.text === "this" ? 1 : 0;
                     var omitCount = languageVersion < 2 && ts.hasRestParameter(node) ? 1 : 0;
-                    emitList(parameters, 0, parameters.length - omitCount, false, false);
+                    emitList(parameters, skipCount, parameters.length - omitCount - skipCount, false, false);
                 }
                 write(")");
                 decreaseIndent();
@@ -29759,12 +31725,20 @@ var ts;
             }
             function emitAsyncFunctionBodyForES6(node) {
                 var promiseConstructor = ts.getEntityNameFromTypeNode(node.type);
-                var isArrowFunction = node.kind === 177;
-                var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 4096) !== 0;
+                var isArrowFunction = node.kind === 179;
+                var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 8192) !== 0;
                 if (!isArrowFunction) {
                     write(" {");
                     increaseIndent();
                     writeLine();
+                    if (resolver.getNodeCheckFlags(node) & 4096) {
+                        writeLines("\nconst _super = (function (geti, seti) {\n    const cache = Object.create(null);\n    return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } });\n})(name => super[name], (name, value) => super[name] = value);");
+                        writeLine();
+                    }
+                    else if (resolver.getNodeCheckFlags(node) & 2048) {
+                        write("const _super = name => super[name];");
+                        writeLine();
+                    }
                     write("return");
                 }
                 write(" __awaiter(this");
@@ -29774,18 +31748,13 @@ var ts;
                 else {
                     write(", void 0, ");
                 }
-                if (promiseConstructor) {
+                if (languageVersion >= 2 || !promiseConstructor) {
+                    write("void 0");
+                }
+                else {
                     emitEntityNameAsExpression(promiseConstructor, false);
                 }
-                else {
-                    write("Promise");
-                }
-                if (hasLexicalArguments) {
-                    write(", function* (_arguments)");
-                }
-                else {
-                    write(", function* ()");
-                }
+                write(", function* ()");
                 emitFunctionBody(node);
                 write(")");
                 if (!isArrowFunction) {
@@ -29800,7 +31769,7 @@ var ts;
                     write(" { }");
                 }
                 else {
-                    if (node.body.kind === 195) {
+                    if (node.body.kind === 198) {
                         emitBlockFunctionBody(node, node.body);
                     }
                     else {
@@ -29852,10 +31821,10 @@ var ts;
                 }
                 write(" ");
                 var current = body;
-                while (current.kind === 174) {
+                while (current.kind === 176) {
                     current = current.expression;
                 }
-                emitParenthesizedIf(body, current.kind === 168);
+                emitParenthesizedIf(body, current.kind === 170);
             }
             function emitDownLevelExpressionFunctionBody(node, body) {
                 write(" {");
@@ -29922,23 +31891,22 @@ var ts;
                 }
                 emitToken(16, body.statements.end);
             }
-            function findInitialSuperCall(ctor) {
-                if (ctor.body) {
-                    var statement = ctor.body.statements[0];
-                    if (statement && statement.kind === 198) {
-                        var expr = statement.expression;
-                        if (expr && expr.kind === 171) {
-                            var func = expr.expression;
-                            if (func && func.kind === 95) {
-                                return statement;
-                            }
-                        }
-                    }
+            function getSuperCallAtGivenIndex(ctor, index) {
+                if (!ctor.body) {
+                    return undefined;
+                }
+                var statements = ctor.body.statements;
+                if (!statements || index >= statements.length) {
+                    return undefined;
+                }
+                var statement = statements[index];
+                if (statement.kind === 201) {
+                    return ts.isSuperCallExpression(statement.expression) ? statement : undefined;
                 }
             }
             function emitParameterPropertyAssignments(node) {
                 ts.forEach(node.parameters, function (param) {
-                    if (param.flags & 56) {
+                    if (param.flags & 28) {
                         writeLine();
                         emitStart(param);
                         emitStart(param.name);
@@ -29958,7 +31926,7 @@ var ts;
                     emitNodeWithCommentsAndWithoutSourcemap(memberName);
                     write("]");
                 }
-                else if (memberName.kind === 137) {
+                else if (memberName.kind === 139) {
                     emitComputedPropertyName(memberName);
                 }
                 else {
@@ -29970,7 +31938,7 @@ var ts;
                 var properties = [];
                 for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
                     var member = _b[_a];
-                    if (member.kind === 142 && isStatic === ((member.flags & 64) !== 0) && member.initializer) {
+                    if (member.kind === 144 && isStatic === ((member.flags & 32) !== 0) && member.initializer) {
                         properties.push(member);
                     }
                 }
@@ -29991,7 +31959,7 @@ var ts;
                     emit(receiver);
                 }
                 else {
-                    if (property.flags & 64) {
+                    if (property.flags & 32) {
                         emitDeclarationName(node);
                     }
                     else {
@@ -30010,11 +31978,11 @@ var ts;
             }
             function emitMemberFunctionsForES5AndLower(node) {
                 ts.forEach(node.members, function (member) {
-                    if (member.kind === 194) {
+                    if (member.kind === 197) {
                         writeLine();
                         write(";");
                     }
-                    else if (member.kind === 144 || node.kind === 143) {
+                    else if (member.kind === 146 || node.kind === 145) {
                         if (!member.body) {
                             return emitCommentsOnNotEmittedNode(member);
                         }
@@ -30031,7 +31999,7 @@ var ts;
                         write(";");
                         emitTrailingComments(member);
                     }
-                    else if (member.kind === 146 || member.kind === 147) {
+                    else if (member.kind === 148 || member.kind === 149) {
                         var accessors = ts.getAllAccessorDeclarations(node.members, member);
                         if (member === accessors.firstAccessor) {
                             writeLine();
@@ -30081,22 +32049,22 @@ var ts;
             function emitMemberFunctionsForES6AndHigher(node) {
                 for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
                     var member = _b[_a];
-                    if ((member.kind === 144 || node.kind === 143) && !member.body) {
+                    if ((member.kind === 146 || node.kind === 145) && !member.body) {
                         emitCommentsOnNotEmittedNode(member);
                     }
-                    else if (member.kind === 144 ||
-                        member.kind === 146 ||
-                        member.kind === 147) {
+                    else if (member.kind === 146 ||
+                        member.kind === 148 ||
+                        member.kind === 149) {
                         writeLine();
                         emitLeadingComments(member);
                         emitStart(member);
-                        if (member.flags & 64) {
+                        if (member.flags & 32) {
                             write("static ");
                         }
-                        if (member.kind === 146) {
+                        if (member.kind === 148) {
                             write("get ");
                         }
-                        else if (member.kind === 147) {
+                        else if (member.kind === 149) {
                             write("set ");
                         }
                         if (member.asteriskToken) {
@@ -30107,7 +32075,7 @@ var ts;
                         emitEnd(member);
                         emitTrailingComments(member);
                     }
-                    else if (member.kind === 194) {
+                    else if (member.kind === 197) {
                         writeLine();
                         write(";");
                     }
@@ -30132,10 +32100,10 @@ var ts;
             function emitConstructorWorker(node, baseTypeElement) {
                 var hasInstancePropertyWithInitializer = false;
                 ts.forEach(node.members, function (member) {
-                    if (member.kind === 145 && !member.body) {
+                    if (member.kind === 147 && !member.body) {
                         emitCommentsOnNotEmittedNode(member);
                     }
-                    if (member.kind === 142 && member.initializer && (member.flags & 64) === 0) {
+                    if (member.kind === 144 && member.initializer && (member.flags & 32) === 0) {
                         hasInstancePropertyWithInitializer = true;
                     }
                 });
@@ -30179,7 +32147,7 @@ var ts;
                     emitDefaultValueAssignments(ctor);
                     emitRestParameter(ctor);
                     if (baseTypeElement) {
-                        superCall = findInitialSuperCall(ctor);
+                        superCall = getSuperCallAtGivenIndex(ctor, startIndex);
                         if (superCall) {
                             writeLine();
                             emit(superCall);
@@ -30233,19 +32201,33 @@ var ts;
                 else {
                     emitClassLikeDeclarationForES6AndHigher(node);
                 }
-                if (modulekind !== 5 && node.parent === currentSourceFile && node.name) {
+                if (modulekind !== ts.ModuleKind.ES6 && node.parent === currentSourceFile && node.name) {
                     emitExportMemberAssignments(node.name);
                 }
             }
             function emitClassLikeDeclarationForES6AndHigher(node) {
-                var thisNodeIsDecorated = ts.nodeIsDecorated(node);
-                if (node.kind === 217) {
-                    if (thisNodeIsDecorated) {
+                var decoratedClassAlias;
+                var isHoistedDeclarationInSystemModule = shouldHoistDeclarationInSystemJsModule(node);
+                var isDecorated = ts.nodeIsDecorated(node);
+                var rewriteAsClassExpression = isDecorated || isHoistedDeclarationInSystemModule;
+                if (node.kind === 220) {
+                    if (rewriteAsClassExpression) {
+                        if (isDecorated && resolver.getNodeCheckFlags(node) & 524288) {
+                            decoratedClassAlias = ts.unescapeIdentifier(makeUniqueName(node.name ? node.name.text : "default"));
+                            decoratedClassAliases[ts.getNodeId(node)] = decoratedClassAlias;
+                            write("let " + decoratedClassAlias + ";");
+                            writeLine();
+                        }
                         if (isES6ExportedDeclaration(node) && !(node.flags & 512)) {
                             write("export ");
                         }
-                        write("let ");
+                        if (!isHoistedDeclarationInSystemModule) {
+                            write("let ");
+                        }
                         emitDeclarationName(node);
+                        if (decoratedClassAlias !== undefined) {
+                            write(" = " + decoratedClassAlias);
+                        }
                         write(" = ");
                     }
                     else if (isES6ExportedDeclaration(node)) {
@@ -30256,7 +32238,7 @@ var ts;
                     }
                 }
                 var staticProperties = getInitializedProperties(node, true);
-                var isClassExpressionWithStaticProperties = staticProperties.length > 0 && node.kind === 189;
+                var isClassExpressionWithStaticProperties = staticProperties.length > 0 && node.kind === 191;
                 var tempVariable;
                 if (isClassExpressionWithStaticProperties) {
                     tempVariable = createAndRecordTempVariable(0);
@@ -30266,7 +32248,7 @@ var ts;
                     write(" = ");
                 }
                 write("class");
-                if ((node.name || (node.flags & 512 && (staticProperties.length > 0 || modulekind !== 5))) && !thisNodeIsDecorated) {
+                if (node.name || (node.flags & 512 && (staticProperties.length > 0 || modulekind !== ts.ModuleKind.ES6) && !rewriteAsClassExpression)) {
                     write(" ");
                     emitDeclarationName(node);
                 }
@@ -30283,7 +32265,8 @@ var ts;
                 decreaseIndent();
                 writeLine();
                 emitToken(16, node.members.end);
-                if (thisNodeIsDecorated) {
+                if (rewriteAsClassExpression) {
+                    decoratedClassAliases[ts.getNodeId(node)] = undefined;
                     write(";");
                 }
                 if (isClassExpressionWithStaticProperties) {
@@ -30302,24 +32285,24 @@ var ts;
                 else {
                     writeLine();
                     emitPropertyDeclarations(node, staticProperties);
-                    emitDecoratorsOfClass(node);
+                    emitDecoratorsOfClass(node, decoratedClassAlias);
                 }
-                if (!(node.flags & 2)) {
+                if (!(node.flags & 1)) {
                     return;
                 }
-                if (modulekind !== 5) {
+                if (modulekind !== ts.ModuleKind.ES6) {
                     emitExportMemberAssignment(node);
                 }
                 else {
                     if (node.flags & 512) {
-                        if (thisNodeIsDecorated) {
+                        if (isDecorated) {
                             writeLine();
                             write("export default ");
                             emitDeclarationName(node);
                             write(";");
                         }
                     }
-                    else if (node.parent.kind !== 251) {
+                    else if (node.parent.kind !== 255) {
                         writeLine();
                         emitStart(node);
                         emitModuleMemberName(node);
@@ -30331,7 +32314,7 @@ var ts;
                 }
             }
             function emitClassLikeDeclarationBelowES6(node) {
-                if (node.kind === 217) {
+                if (node.kind === 220) {
                     if (!shouldHoistDeclarationInSystemJsModule(node)) {
                         write("var ");
                     }
@@ -30368,7 +32351,7 @@ var ts;
                 emitMemberFunctionsForES5AndLower(node);
                 emitPropertyDeclarations(node, getInitializedProperties(node, true));
                 writeLine();
-                emitDecoratorsOfClass(node);
+                emitDecoratorsOfClass(node, undefined);
                 writeLine();
                 emitToken(16, node.members.end, function () {
                     write("return ");
@@ -30391,26 +32374,26 @@ var ts;
                     emit(baseTypeNode.expression);
                 }
                 write("))");
-                if (node.kind === 217) {
+                if (node.kind === 220) {
                     write(";");
                 }
                 emitEnd(node);
-                if (node.kind === 217) {
+                if (node.kind === 220) {
                     emitExportMemberAssignment(node);
                 }
             }
             function emitClassMemberPrefix(node, member) {
                 emitDeclarationName(node);
-                if (!(member.flags & 64)) {
+                if (!(member.flags & 32)) {
                     write(".prototype");
                 }
             }
-            function emitDecoratorsOfClass(node) {
+            function emitDecoratorsOfClass(node, decoratedClassAlias) {
                 emitDecoratorsOfMembers(node, 0);
-                emitDecoratorsOfMembers(node, 64);
-                emitDecoratorsOfConstructor(node);
+                emitDecoratorsOfMembers(node, 32);
+                emitDecoratorsOfConstructor(node, decoratedClassAlias);
             }
-            function emitDecoratorsOfConstructor(node) {
+            function emitDecoratorsOfConstructor(node, decoratedClassAlias) {
                 var decorators = node.decorators;
                 var constructor = ts.getFirstConstructorWithBody(node);
                 var firstParameterDecorator = constructor && ts.forEach(constructor.parameters, function (parameter) { return parameter.decorators; });
@@ -30420,6 +32403,9 @@ var ts;
                 writeLine();
                 emitStart(node.decorators || firstParameterDecorator);
                 emitDeclarationName(node);
+                if (decoratedClassAlias !== undefined) {
+                    write(" = " + decoratedClassAlias);
+                }
                 write(" = __decorate([");
                 increaseIndent();
                 writeLine();
@@ -30441,7 +32427,7 @@ var ts;
             function emitDecoratorsOfMembers(node, staticFlag) {
                 for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
                     var member = _b[_a];
-                    if ((member.flags & 64) !== staticFlag) {
+                    if ((member.flags & 32) !== staticFlag) {
                         continue;
                     }
                     if (!ts.nodeCanBeDecorated(member)) {
@@ -30462,7 +32448,7 @@ var ts;
                     }
                     else {
                         decorators = member.decorators;
-                        if (member.kind === 144) {
+                        if (member.kind === 146) {
                             functionLikeMember = member;
                         }
                     }
@@ -30488,7 +32474,7 @@ var ts;
                     write(", ");
                     emitExpressionForPropertyName(member.name);
                     if (languageVersion > 0) {
-                        if (member.kind !== 142) {
+                        if (member.kind !== 144) {
                             write(", null");
                         }
                         else {
@@ -30504,64 +32490,64 @@ var ts;
             function emitDecoratorsOfParameters(node, leadingComma) {
                 var argumentsWritten = 0;
                 if (node) {
-                    var parameterIndex = 0;
+                    var parameterIndex_1 = 0;
                     for (var _a = 0, _b = node.parameters; _a < _b.length; _a++) {
                         var parameter = _b[_a];
                         if (ts.nodeIsDecorated(parameter)) {
                             var decorators = parameter.decorators;
                             argumentsWritten += emitList(decorators, 0, decorators.length, true, false, leadingComma, true, function (decorator) {
-                                write("__param(" + parameterIndex + ", ");
+                                write("__param(" + parameterIndex_1 + ", ");
                                 emit(decorator.expression);
                                 write(")");
                             });
                             leadingComma = true;
                         }
-                        parameterIndex++;
+                        parameterIndex_1++;
                     }
                 }
                 return argumentsWritten;
             }
             function shouldEmitTypeMetadata(node) {
                 switch (node.kind) {
-                    case 144:
                     case 146:
-                    case 147:
-                    case 142:
+                    case 148:
+                    case 149:
+                    case 144:
                         return true;
                 }
                 return false;
             }
             function shouldEmitReturnTypeMetadata(node) {
                 switch (node.kind) {
-                    case 144:
+                    case 146:
                         return true;
                 }
                 return false;
             }
             function shouldEmitParamTypesMetadata(node) {
                 switch (node.kind) {
-                    case 217:
-                    case 144:
-                    case 147:
+                    case 220:
+                    case 146:
+                    case 149:
                         return true;
                 }
                 return false;
             }
             function emitSerializedTypeOfNode(node) {
                 switch (node.kind) {
-                    case 217:
+                    case 220:
                         write("Function");
                         return;
-                    case 142:
+                    case 144:
                         emitSerializedTypeNode(node.type);
                         return;
-                    case 139:
+                    case 141:
                         emitSerializedTypeNode(node.type);
                         return;
-                    case 146:
+                    case 148:
                         emitSerializedTypeNode(node.type);
                         return;
-                    case 147:
+                    case 149:
                         emitSerializedTypeNode(ts.getSetAccessorTypeAnnotationNode(node));
                         return;
                 }
@@ -30577,40 +32563,40 @@ var ts;
                         case 103:
                             write("void 0");
                             return;
-                        case 161:
-                            emitSerializedTypeNode(node.type);
-                            return;
-                        case 153:
-                        case 154:
-                            write("Function");
-                            return;
-                        case 157:
-                        case 158:
-                            write("Array");
-                            return;
-                        case 151:
-                        case 120:
-                            write("Boolean");
-                            return;
-                        case 130:
                         case 163:
-                            write("String");
-                            return;
-                        case 128:
-                            write("Number");
-                            return;
-                        case 131:
-                            write("Symbol");
-                            return;
-                        case 152:
-                            emitSerializedTypeReferenceNode(node);
+                            emitSerializedTypeNode(node.type);
                             return;
                         case 155:
                         case 156:
+                            write("Function");
+                            return;
                         case 159:
                         case 160:
-                        case 117:
+                            write("Array");
+                            return;
+                        case 153:
+                        case 120:
+                            write("Boolean");
+                            return;
+                        case 131:
+                        case 165:
+                            write("String");
+                            return;
+                        case 129:
+                            write("Number");
+                            return;
+                        case 132:
+                            write("Symbol");
+                            return;
+                        case 154:
+                            emitSerializedTypeReferenceNode(node);
+                            return;
+                        case 157:
+                        case 158:
+                        case 161:
                         case 162:
+                        case 117:
+                        case 164:
                             break;
                         default:
                             ts.Debug.fail("Cannot serialize unexpected type node.");
@@ -30673,8 +32659,8 @@ var ts;
             }
             function emitSerializedParameterTypesOfNode(node) {
                 if (node) {
-                    var valueDeclaration;
-                    if (node.kind === 217) {
+                    var valueDeclaration = void 0;
+                    if (node.kind === 220) {
                         valueDeclaration = ts.getFirstConstructorWithBody(node);
                     }
                     else if (ts.isFunctionLike(node) && ts.nodeIsPresent(node.body)) {
@@ -30690,10 +32676,10 @@ var ts;
                                 }
                                 if (parameters[i].dotDotDotToken) {
                                     var parameterType = parameters[i].type;
-                                    if (parameterType.kind === 157) {
+                                    if (parameterType.kind === 159) {
                                         parameterType = parameterType.elementType;
                                     }
-                                    else if (parameterType.kind === 152 && parameterType.typeArguments && parameterType.typeArguments.length === 1) {
+                                    else if (parameterType.kind === 154 && parameterType.typeArguments && parameterType.typeArguments.length === 1) {
                                         parameterType = parameterType.typeArguments[0];
                                     }
                                     else {
@@ -30765,7 +32751,7 @@ var ts;
                 }
                 if (!shouldHoistDeclarationInSystemJsModule(node)) {
                     var isES6ExportedEnum = isES6ExportedDeclaration(node);
-                    if (!(node.flags & 2) || (isES6ExportedEnum && isFirstDeclarationOfKind(node, node.symbol && node.symbol.declarations, 220))) {
+                    if (!(node.flags & 1) || (isES6ExportedEnum && isFirstDeclarationOfKind(node, node.symbol && node.symbol.declarations, 223))) {
                         emitStart(node);
                         if (isES6ExportedEnum) {
                             write("export ");
@@ -30794,7 +32780,7 @@ var ts;
                 emitModuleMemberName(node);
                 write(" = {}));");
                 emitEnd(node);
-                if (!isES6ExportedDeclaration(node) && node.flags & 2 && !shouldHoistDeclarationInSystemJsModule(node)) {
+                if (!isES6ExportedDeclaration(node) && node.flags & 1 && !shouldHoistDeclarationInSystemJsModule(node)) {
                     writeLine();
                     emitStart(node);
                     write("var ");
@@ -30804,8 +32790,8 @@ var ts;
                     emitEnd(node);
                     write(";");
                 }
-                if (modulekind !== 5 && node.parent === currentSourceFile) {
-                    if (modulekind === 4 && (node.flags & 2)) {
+                if (modulekind !== ts.ModuleKind.ES6 && node.parent === currentSourceFile) {
+                    if (modulekind === ts.ModuleKind.System && (node.flags & 1)) {
                         writeLine();
                         write(exportFunctionForFile + "(\"");
                         emitDeclarationName(node);
@@ -30845,7 +32831,7 @@ var ts;
                 }
             }
             function getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration) {
-                if (moduleDeclaration.body.kind === 221) {
+                if (moduleDeclaration.body.kind === 224) {
                     var recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration.body);
                     return recursiveInnerModule || moduleDeclaration.body;
                 }
@@ -30868,7 +32854,7 @@ var ts;
                 var emitVarForModule = !hoistedInDeclarationScope && !isModuleMergedWithES6Class(node);
                 if (emitVarForModule) {
                     var isES6ExportedNamespace = isES6ExportedDeclaration(node);
-                    if (!isES6ExportedNamespace || isFirstDeclarationOfKind(node, node.symbol && node.symbol.declarations, 221)) {
+                    if (!isES6ExportedNamespace || isFirstDeclarationOfKind(node, node.symbol && node.symbol.declarations, 224)) {
                         emitStart(node);
                         if (isES6ExportedNamespace) {
                             write("export ");
@@ -30886,7 +32872,7 @@ var ts;
                 write(getGeneratedNameForNode(node));
                 emitEnd(node.name);
                 write(") ");
-                if (node.body.kind === 222) {
+                if (node.body.kind === 225) {
                     var saveConvertedLoopState = convertedLoopState;
                     var saveTempFlags = tempFlags;
                     var saveTempVariables = tempVariables;
@@ -30911,7 +32897,7 @@ var ts;
                     emitToken(16, moduleBlock.statements.end);
                 }
                 write(")(");
-                if ((node.flags & 2) && !isES6ExportedDeclaration(node)) {
+                if ((node.flags & 1) && !isES6ExportedDeclaration(node)) {
                     emit(node.name);
                     write(" = ");
                 }
@@ -30921,7 +32907,7 @@ var ts;
                 write(" = {}));");
                 emitEnd(node);
                 if (!isES6ExportedDeclaration(node) && node.name.kind === 69 && node.parent === currentSourceFile) {
-                    if (modulekind === 4 && (node.flags & 2)) {
+                    if (modulekind === ts.ModuleKind.System && (node.flags & 1)) {
                         writeLine();
                         write(exportFunctionForFile + "(\"");
                         emitDeclarationName(node);
@@ -30957,16 +32943,16 @@ var ts;
                 }
             }
             function getNamespaceDeclarationNode(node) {
-                if (node.kind === 224) {
+                if (node.kind === 228) {
                     return node;
                 }
                 var importClause = node.importClause;
-                if (importClause && importClause.namedBindings && importClause.namedBindings.kind === 227) {
+                if (importClause && importClause.namedBindings && importClause.namedBindings.kind === 231) {
                     return importClause.namedBindings;
                 }
             }
             function isDefaultImport(node) {
-                return node.kind === 225 && node.importClause && !!node.importClause.name;
+                return node.kind === 229 && node.importClause && !!node.importClause.name;
             }
             function emitExportImportAssignments(node) {
                 if (ts.isAliasSymbolDeclaration(node) && resolver.isValueAliasDeclaration(node)) {
@@ -30975,7 +32961,7 @@ var ts;
                 ts.forEachChild(node, emitExportImportAssignments);
             }
             function emitImportDeclaration(node) {
-                if (modulekind !== 5) {
+                if (modulekind !== ts.ModuleKind.ES6) {
                     return emitExternalImportDeclaration(node);
                 }
                 if (node.importClause) {
@@ -30993,7 +32979,7 @@ var ts;
                         if (shouldEmitNamedBindings) {
                             emitLeadingComments(node.importClause.namedBindings);
                             emitStart(node.importClause.namedBindings);
-                            if (node.importClause.namedBindings.kind === 227) {
+                            if (node.importClause.namedBindings.kind === 231) {
                                 write("* as ");
                                 emit(node.importClause.namedBindings.name);
                             }
@@ -31019,21 +33005,24 @@ var ts;
             }
             function emitExternalImportDeclaration(node) {
                 if (ts.contains(externalImports, node)) {
-                    var isExportedImport = node.kind === 224 && (node.flags & 2) !== 0;
+                    var isExportedImport = node.kind === 228 && (node.flags & 1) !== 0;
                     var namespaceDeclaration = getNamespaceDeclarationNode(node);
-                    if (modulekind !== 2) {
+                    var varOrConst = (languageVersion <= 1) ? "var " : "const ";
+                    if (modulekind !== ts.ModuleKind.AMD) {
                         emitLeadingComments(node);
                         emitStart(node);
                         if (namespaceDeclaration && !isDefaultImport(node)) {
-                            if (!isExportedImport)
-                                write("var ");
+                            if (!isExportedImport) {
+                                write(varOrConst);
+                            }
+                            ;
                             emitModuleMemberName(namespaceDeclaration);
                             write(" = ");
                         }
                         else {
-                            var isNakedImport = 225 && !node.importClause;
+                            var isNakedImport = 229 && !node.importClause;
                             if (!isNakedImport) {
-                                write("var ");
+                                write(varOrConst);
                                 write(getGeneratedNameForNode(node));
                                 write(" = ");
                             }
@@ -31058,7 +33047,7 @@ var ts;
                             write(";");
                         }
                         else if (namespaceDeclaration && isDefaultImport(node)) {
-                            write("var ");
+                            write(varOrConst);
                             emitModuleMemberName(namespaceDeclaration);
                             write(" = ");
                             write(getGeneratedNameForNode(node));
@@ -31085,7 +33074,7 @@ var ts;
                             write("export ");
                             write("var ");
                         }
-                        else if (!(node.flags & 2)) {
+                        else if (!(node.flags & 1)) {
                             write("var ");
                         }
                     }
@@ -31107,13 +33096,13 @@ var ts;
                 }
             }
             function emitExportDeclaration(node) {
-                ts.Debug.assert(modulekind !== 4);
-                if (modulekind !== 5) {
+                ts.Debug.assert(modulekind !== ts.ModuleKind.System);
+                if (modulekind !== ts.ModuleKind.ES6) {
                     if (node.moduleSpecifier && (!node.exportClause || resolver.isValueAliasDeclaration(node))) {
                         emitStart(node);
                         var generatedName = getGeneratedNameForNode(node);
                         if (node.exportClause) {
-                            if (modulekind !== 2) {
+                            if (modulekind !== ts.ModuleKind.AMD) {
                                 write("var ");
                                 write(generatedName);
                                 write(" = ");
@@ -31141,7 +33130,7 @@ var ts;
                             if (hasExportStarsToExportValues && resolver.moduleExportsSomeValue(node.moduleSpecifier)) {
                                 writeLine();
                                 write("__export(");
-                                if (modulekind !== 2) {
+                                if (modulekind !== ts.ModuleKind.AMD) {
                                     emitRequire(ts.getExternalModuleName(node));
                                 }
                                 else {
@@ -31173,7 +33162,7 @@ var ts;
                 }
             }
             function emitExportOrImportSpecifierList(specifiers, shouldEmit) {
-                ts.Debug.assert(modulekind === 5);
+                ts.Debug.assert(modulekind === ts.ModuleKind.ES6);
                 var needsComma = false;
                 for (var _a = 0, specifiers_1 = specifiers; _a < specifiers_1.length; _a++) {
                     var specifier = specifiers_1[_a];
@@ -31192,14 +33181,14 @@ var ts;
             }
             function emitExportAssignment(node) {
                 if (!node.isExportEquals && resolver.isValueAliasDeclaration(node)) {
-                    if (modulekind === 5) {
+                    if (modulekind === ts.ModuleKind.ES6) {
                         writeLine();
                         emitStart(node);
                         write("export default ");
                         var expression = node.expression;
                         emit(expression);
-                        if (expression.kind !== 216 &&
-                            expression.kind !== 217) {
+                        if (expression.kind !== 219 &&
+                            expression.kind !== 220) {
                             write(";");
                         }
                         emitEnd(node);
@@ -31207,7 +33196,7 @@ var ts;
                     else {
                         writeLine();
                         emitStart(node);
-                        if (modulekind === 4) {
+                        if (modulekind === ts.ModuleKind.System) {
                             write(exportFunctionForFile + "(\"default\",");
                             emit(node.expression);
                             write(")");
@@ -31216,7 +33205,7 @@ var ts;
                             emitEs6ExportDefaultCompat(node);
                             emitContainingModuleName(node);
                             if (languageVersion === 0) {
-                                write("[\"default\"] = ");
+                                write('["default"] = ');
                             }
                             else {
                                 write(".default = ");
@@ -31236,18 +33225,18 @@ var ts;
                 for (var _a = 0, _b = sourceFile.statements; _a < _b.length; _a++) {
                     var node = _b[_a];
                     switch (node.kind) {
-                        case 225:
+                        case 229:
                             if (!node.importClause ||
                                 resolver.isReferencedAliasDeclaration(node.importClause, true)) {
                                 externalImports.push(node);
                             }
                             break;
-                        case 224:
-                            if (node.moduleReference.kind === 235 && resolver.isReferencedAliasDeclaration(node)) {
+                        case 228:
+                            if (node.moduleReference.kind === 239 && resolver.isReferencedAliasDeclaration(node)) {
                                 externalImports.push(node);
                             }
                             break;
-                        case 231:
+                        case 235:
                             if (node.moduleSpecifier) {
                                 if (!node.exportClause) {
                                     if (resolver.moduleExportsSomeValue(node.moduleSpecifier)) {
@@ -31262,12 +33251,12 @@ var ts;
                             else {
                                 for (var _c = 0, _d = node.exportClause.elements; _c < _d.length; _c++) {
                                     var specifier = _d[_c];
-                                    var name_27 = (specifier.propertyName || specifier.name).text;
-                                    (exportSpecifiers[name_27] || (exportSpecifiers[name_27] = [])).push(specifier);
+                                    var name_29 = (specifier.propertyName || specifier.name).text;
+                                    (exportSpecifiers[name_29] || (exportSpecifiers[name_29] = [])).push(specifier);
                                 }
                             }
                             break;
-                        case 230:
+                        case 234:
                             if (node.isExportEquals && !exportEquals) {
                                 exportEquals = node;
                             }
@@ -31292,18 +33281,18 @@ var ts;
                 if (namespaceDeclaration && !isDefaultImport(node)) {
                     return ts.getTextOfNodeFromSourceText(currentText, namespaceDeclaration.name);
                 }
-                if (node.kind === 225 && node.importClause) {
+                if (node.kind === 229 && node.importClause) {
                     return getGeneratedNameForNode(node);
                 }
-                if (node.kind === 231 && node.moduleSpecifier) {
+                if (node.kind === 235 && node.moduleSpecifier) {
                     return getGeneratedNameForNode(node);
                 }
             }
             function getExternalModuleNameText(importNode, emitRelativePathAsModuleName) {
                 if (emitRelativePathAsModuleName) {
-                    var name_28 = getExternalModuleNameFromDeclaration(host, resolver, importNode);
-                    if (name_28) {
-                        return "\"" + name_28 + "\"";
+                    var name_30 = getExternalModuleNameFromDeclaration(host, resolver, importNode);
+                    if (name_30) {
+                        return "\"" + name_30 + "\"";
                     }
                 }
                 var moduleName = ts.getExternalModuleName(importNode);
@@ -31320,8 +33309,8 @@ var ts;
                 var started = false;
                 for (var _a = 0, externalImports_1 = externalImports; _a < externalImports_1.length; _a++) {
                     var importNode = externalImports_1[_a];
-                    var skipNode = importNode.kind === 231 ||
-                        (importNode.kind === 225 && !importNode.importClause);
+                    var skipNode = importNode.kind === 235 ||
+                        (importNode.kind === 229 && !importNode.importClause);
                     if (skipNode) {
                         continue;
                     }
@@ -31346,7 +33335,7 @@ var ts;
                     var hasExportDeclarationWithExportClause = false;
                     for (var _a = 0, externalImports_2 = externalImports; _a < externalImports_2.length; _a++) {
                         var externalImport = externalImports_2[_a];
-                        if (externalImport.kind === 231 && externalImport.exportClause) {
+                        if (externalImport.kind === 235 && externalImport.exportClause) {
                             hasExportDeclarationWithExportClause = true;
                             break;
                         }
@@ -31375,7 +33364,7 @@ var ts;
                 }
                 for (var _d = 0, externalImports_3 = externalImports; _d < externalImports_3.length; _d++) {
                     var externalImport = externalImports_3[_d];
-                    if (externalImport.kind !== 231) {
+                    if (externalImport.kind !== 235) {
                         continue;
                     }
                     var exportDecl = externalImport;
@@ -31449,11 +33438,11 @@ var ts;
                     var seen = {};
                     for (var i = 0; i < hoistedVars.length; i++) {
                         var local = hoistedVars[i];
-                        var name_29 = local.kind === 69
+                        var name_31 = local.kind === 69
                             ? local
                             : local.name;
-                        if (name_29) {
-                            var text = ts.unescapeIdentifier(name_29.text);
+                        if (name_31) {
+                            var text = ts.unescapeIdentifier(name_31.text);
                             if (ts.hasProperty(seen, text)) {
                                 continue;
                             }
@@ -31464,14 +33453,14 @@ var ts;
                         if (i !== 0) {
                             write(", ");
                         }
-                        if (local.kind === 217 || local.kind === 221 || local.kind === 220) {
+                        if (local.kind === 220 || local.kind === 224 || local.kind === 223) {
                             emitDeclarationName(local);
                         }
                         else {
                             emit(local);
                         }
                         var flags = ts.getCombinedNodeFlags(local.kind === 69 ? local.parent : local);
-                        if (flags & 2) {
+                        if (flags & 1) {
                             if (!exportedDeclarations) {
                                 exportedDeclarations = [];
                             }
@@ -31485,7 +33474,7 @@ var ts;
                         var f = hoistedFunctionDeclarations_1[_a];
                         writeLine();
                         emit(f);
-                        if (f.flags & 2) {
+                        if (f.flags & 1) {
                             if (!exportedDeclarations) {
                                 exportedDeclarations = [];
                             }
@@ -31495,24 +33484,24 @@ var ts;
                 }
                 return exportedDeclarations;
                 function visit(node) {
-                    if (node.flags & 4) {
+                    if (node.flags & 2) {
                         return;
                     }
-                    if (node.kind === 216) {
+                    if (node.kind === 219) {
                         if (!hoistedFunctionDeclarations) {
                             hoistedFunctionDeclarations = [];
                         }
                         hoistedFunctionDeclarations.push(node);
                         return;
                     }
-                    if (node.kind === 217) {
+                    if (node.kind === 220) {
                         if (!hoistedVars) {
                             hoistedVars = [];
                         }
                         hoistedVars.push(node);
                         return;
                     }
-                    if (node.kind === 220) {
+                    if (node.kind === 223) {
                         if (shouldEmitEnumDeclaration(node)) {
                             if (!hoistedVars) {
                                 hoistedVars = [];
@@ -31521,7 +33510,7 @@ var ts;
                         }
                         return;
                     }
-                    if (node.kind === 221) {
+                    if (node.kind === 224) {
                         if (shouldEmitModuleDeclaration(node)) {
                             if (!hoistedVars) {
                                 hoistedVars = [];
@@ -31530,17 +33519,17 @@ var ts;
                         }
                         return;
                     }
-                    if (node.kind === 214 || node.kind === 166) {
+                    if (node.kind === 217 || node.kind === 168) {
                         if (shouldHoistVariable(node, false)) {
-                            var name_30 = node.name;
-                            if (name_30.kind === 69) {
+                            var name_32 = node.name;
+                            if (name_32.kind === 69) {
                                 if (!hoistedVars) {
                                     hoistedVars = [];
                                 }
-                                hoistedVars.push(name_30);
+                                hoistedVars.push(name_32);
                             }
                             else {
-                                ts.forEachChild(name_30, visit);
+                                ts.forEachChild(name_32, visit);
                             }
                         }
                         return;
@@ -31565,11 +33554,11 @@ var ts;
                 if (checkIfSourceFileLevelDecl && !shouldHoistDeclarationInSystemJsModule(node)) {
                     return false;
                 }
-                return (ts.getCombinedNodeFlags(node) & 24576) === 0 ||
-                    ts.getEnclosingBlockScopeContainer(node).kind === 251;
+                return (ts.getCombinedNodeFlags(node) & 3072) === 0 ||
+                    ts.getEnclosingBlockScopeContainer(node).kind === 255;
             }
             function isCurrentFileSystemExternalModule() {
-                return modulekind === 4 && isCurrentFileExternalModule;
+                return modulekind === ts.ModuleKind.System && isCurrentFileExternalModule;
             }
             function emitSystemModuleBody(node, dependencyGroups, startIndex) {
                 emitVariableDeclarationsForImports();
@@ -31604,17 +33593,17 @@ var ts;
                         var entry = group_1[_a];
                         var importVariableName = getLocalNameForExternalImport(entry) || "";
                         switch (entry.kind) {
-                            case 225:
+                            case 229:
                                 if (!entry.importClause) {
                                     break;
                                 }
-                            case 224:
+                            case 228:
                                 ts.Debug.assert(importVariableName !== "");
                                 writeLine();
                                 write(importVariableName + " = " + parameterName + ";");
                                 writeLine();
                                 break;
-                            case 231:
+                            case 235:
                                 ts.Debug.assert(importVariableName !== "");
                                 if (entry.exportClause) {
                                     writeLine();
@@ -31658,10 +33647,10 @@ var ts;
                 for (var i = startIndex; i < node.statements.length; i++) {
                     var statement = node.statements[i];
                     switch (statement.kind) {
-                        case 216:
-                        case 225:
+                        case 219:
+                        case 229:
                             continue;
-                        case 231:
+                        case 235:
                             if (!statement.moduleSpecifier) {
                                 for (var _a = 0, _b = statement.exportClause.elements; _a < _b.length; _a++) {
                                     var element = _b[_a];
@@ -31669,7 +33658,7 @@ var ts;
                                 }
                             }
                             continue;
-                        case 224:
+                        case 228:
                             if (!ts.isInternalModuleImportEqualsDeclaration(statement)) {
                                 continue;
                             }
@@ -31692,6 +33681,7 @@ var ts;
                 collectExternalModuleInfo(node);
                 ts.Debug.assert(!exportFunctionForFile);
                 exportFunctionForFile = makeUniqueName("exports");
+                contextObjectForFile = makeUniqueName("context");
                 writeLine();
                 write("System.register(");
                 writeModuleName(node, emitRelativePathAsModuleName);
@@ -31700,13 +33690,17 @@ var ts;
                 var dependencyGroups = [];
                 for (var i = 0; i < externalImports.length; i++) {
                     var text = getExternalModuleNameText(externalImports[i], emitRelativePathAsModuleName);
-                    if (ts.hasProperty(groupIndices, text)) {
-                        var groupIndex = groupIndices[text];
+                    if (text === undefined) {
+                        continue;
+                    }
+                    var key = text.substr(1, text.length - 2);
+                    if (ts.hasProperty(groupIndices, key)) {
+                        var groupIndex = groupIndices[key];
                         dependencyGroups[groupIndex].push(externalImports[i]);
                         continue;
                     }
                     else {
-                        groupIndices[text] = dependencyGroups.length;
+                        groupIndices[key] = dependencyGroups.length;
                         dependencyGroups.push([externalImports[i]]);
                     }
                     if (i !== 0) {
@@ -31714,10 +33708,13 @@ var ts;
                     }
                     write(text);
                 }
-                write("], function(" + exportFunctionForFile + ") {");
+                write("], function(" + exportFunctionForFile + ", " + contextObjectForFile + ") {");
                 writeLine();
                 increaseIndent();
-                var startIndex = emitDirectivePrologues(node.statements, true, true);
+                var startIndex = emitDirectivePrologues(node.statements, true, !compilerOptions.noImplicitUseStrict);
+                writeLine();
+                write("var __moduleName = " + contextObjectForFile + " && " + contextObjectForFile + ".id;");
+                writeLine();
                 emitEmitHelpers(node);
                 emitCaptureThisForNodeIfNecessary(node);
                 emitSystemModuleBody(node, dependencyGroups, startIndex);
@@ -31732,11 +33729,11 @@ var ts;
                 for (var _a = 0, _b = node.amdDependencies; _a < _b.length; _a++) {
                     var amdDependency = _b[_a];
                     if (amdDependency.name) {
-                        aliasedModuleNames.push("\"" + amdDependency.path + "\"");
+                        aliasedModuleNames.push('"' + amdDependency.path + '"');
                         importAliasNames.push(amdDependency.name);
                     }
                     else {
-                        unaliasedModuleNames.push("\"" + amdDependency.path + "\"");
+                        unaliasedModuleNames.push('"' + amdDependency.path + '"');
                     }
                 }
                 for (var _c = 0, externalImports_4 = externalImports; _c < externalImports_4.length; _c++) {
@@ -31761,7 +33758,7 @@ var ts;
             }
             function emitAMDDependencyList(_a) {
                 var aliasedModuleNames = _a.aliasedModuleNames, unaliasedModuleNames = _a.unaliasedModuleNames;
-                write("[\"require\", \"exports\"");
+                write('["require", "exports"');
                 if (aliasedModuleNames.length) {
                     write(", ");
                     write(aliasedModuleNames.join(", "));
@@ -31789,25 +33786,25 @@ var ts;
                 writeModuleName(node, emitRelativePathAsModuleName);
                 emitAMDDependencies(node, true, emitRelativePathAsModuleName);
                 increaseIndent();
-                var startIndex = emitDirectivePrologues(node.statements, true, true);
+                var startIndex = emitDirectivePrologues(node.statements, true, !compilerOptions.noImplicitUseStrict);
                 emitExportStarHelper();
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
-                emitTempDeclarations(true);
                 emitExportEquals(true);
+                emitTempDeclarations(true);
                 decreaseIndent();
                 writeLine();
                 write("});");
             }
             function emitCommonJSModule(node) {
-                var startIndex = emitDirectivePrologues(node.statements, false, true);
+                var startIndex = emitDirectivePrologues(node.statements, false, !compilerOptions.noImplicitUseStrict);
                 emitEmitHelpers(node);
                 collectExternalModuleInfo(node);
                 emitExportStarHelper();
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
-                emitTempDeclarations(true);
                 emitExportEquals(false);
+                emitTempDeclarations(true);
             }
             function emitUMDModule(node) {
                 emitEmitHelpers(node);
@@ -31819,12 +33816,12 @@ var ts;
                 writeLines("    }\n})(");
                 emitAMDFactoryHeader(dependencyNames);
                 increaseIndent();
-                var startIndex = emitDirectivePrologues(node.statements, true, true);
+                var startIndex = emitDirectivePrologues(node.statements, true, !compilerOptions.noImplicitUseStrict);
                 emitExportStarHelper();
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
-                emitTempDeclarations(true);
                 emitExportEquals(true);
+                emitTempDeclarations(true);
                 decreaseIndent();
                 writeLine();
                 write("});");
@@ -31890,7 +33887,7 @@ var ts;
                     result = result.replace(/&(\w+);/g, function (s, m) {
                         if (entities[m] !== undefined) {
                             var ch = String.fromCharCode(entities[m]);
-                            return ch === "\"" ? "\\\"" : ch;
+                            return ch === '"' ? "\\\"" : ch;
                         }
                         else {
                             return s;
@@ -31899,6 +33896,16 @@ var ts;
                 }
                 return result;
             }
+            function isJsxChildEmittable(child) {
+                if (child.kind === 247) {
+                    return !!child.expression;
+                }
+                else if (child.kind === 243) {
+                    return !!getTextToEmit(child);
+                }
+                return true;
+            }
+            ;
             function getTextToEmit(node) {
                 switch (compilerOptions.jsx) {
                     case 2:
@@ -31917,9 +33924,9 @@ var ts;
             function emitJsxText(node) {
                 switch (compilerOptions.jsx) {
                     case 2:
-                        write("\"");
+                        write('"');
                         write(trimReactWhitespaceAndApplyEntities(node));
-                        write("\"");
+                        write('"');
                         break;
                     case 1:
                     default:
@@ -31943,7 +33950,7 @@ var ts;
                 }
             }
             function isUseStrictPrologue(node) {
-                return !!node.expression.text.match(/use strict/);
+                return node.expression.text === "use strict";
             }
             function ensureUseStrictPrologue(startWithNewLine, writeUseStrict) {
                 if (writeUseStrict) {
@@ -31985,22 +33992,26 @@ var ts;
             }
             function emitEmitHelpers(node) {
                 if (!compilerOptions.noEmitHelpers) {
-                    if ((languageVersion < 2) && (!extendsEmitted && node.flags & 4194304)) {
+                    if (languageVersion < 2 && !extendsEmitted && node.flags & 262144) {
                         writeLines(extendsHelper);
                         extendsEmitted = true;
                     }
-                    if (!decorateEmitted && node.flags & 8388608) {
+                    if (compilerOptions.jsx !== 1 && !assignEmitted && (node.flags & 1073741824)) {
+                        writeLines(assignHelper);
+                        assignEmitted = true;
+                    }
+                    if (!decorateEmitted && node.flags & 524288) {
                         writeLines(decorateHelper);
                         if (compilerOptions.emitDecoratorMetadata) {
                             writeLines(metadataHelper);
                         }
                         decorateEmitted = true;
                     }
-                    if (!paramEmitted && node.flags & 16777216) {
+                    if (!paramEmitted && node.flags & 1048576) {
                         writeLines(paramHelper);
                         paramEmitted = true;
                     }
-                    if (!awaiterEmitted && node.flags & 33554432) {
+                    if (!awaiterEmitted && node.flags & 2097152) {
                         writeLines(awaiterHelper);
                         awaiterEmitted = true;
                     }
@@ -32012,7 +34023,7 @@ var ts;
                 emitDetachedCommentsAndUpdateCommentsInfo(node);
                 if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
                     if (isOwnFileEmit || (!ts.isExternalModule(node) && compilerOptions.isolatedModules)) {
-                        var emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[1];
+                        var emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[ts.ModuleKind.CommonJS];
                         emitModule(node);
                     }
                     else {
@@ -32040,7 +34051,7 @@ var ts;
             }
             function emitNodeConsideringCommentsOption(node, emitNodeConsideringSourcemap) {
                 if (node) {
-                    if (node.flags & 4) {
+                    if (node.flags & 2) {
                         return emitCommentsOnNotEmittedNode(node);
                     }
                     if (isSpecializedCommentHandling(node)) {
@@ -32083,28 +34094,28 @@ var ts;
             }
             function isSpecializedCommentHandling(node) {
                 switch (node.kind) {
-                    case 218:
-                    case 216:
-                    case 225:
-                    case 224:
+                    case 221:
                     case 219:
-                    case 230:
+                    case 229:
+                    case 228:
+                    case 222:
+                    case 234:
                         return true;
                 }
             }
             function shouldEmitLeadingAndTrailingComments(node) {
                 switch (node.kind) {
-                    case 196:
+                    case 199:
                         return shouldEmitLeadingAndTrailingCommentsForVariableStatement(node);
-                    case 221:
+                    case 224:
                         return shouldEmitModuleDeclaration(node);
-                    case 220:
+                    case 223:
                         return shouldEmitEnumDeclaration(node);
                 }
                 ts.Debug.assert(!isSpecializedCommentHandling(node));
-                if (node.kind !== 195 &&
+                if (node.kind !== 198 &&
                     node.parent &&
-                    node.parent.kind === 177 &&
+                    node.parent.kind === 179 &&
                     node.parent.body === node &&
                     compilerOptions.target <= 1) {
                     return false;
@@ -32115,13 +34126,13 @@ var ts;
                 switch (node.kind) {
                     case 69:
                         return emitIdentifier(node);
-                    case 139:
+                    case 141:
                         return emitParameter(node);
-                    case 144:
-                    case 143:
-                        return emitMethod(node);
                     case 146:
-                    case 147:
+                    case 145:
+                        return emitMethod(node);
+                    case 148:
+                    case 149:
                         return emitAccessor(node);
                     case 97:
                         return emitThis(node);
@@ -32141,142 +34152,142 @@ var ts;
                     case 13:
                     case 14:
                         return emitLiteral(node);
-                    case 186:
-                        return emitTemplateExpression(node);
-                    case 193:
-                        return emitTemplateSpan(node);
-                    case 236:
-                    case 237:
-                        return emitJsxElement(node);
-                    case 239:
-                        return emitJsxText(node);
-                    case 243:
-                        return emitJsxExpression(node);
-                    case 136:
-                        return emitQualifiedName(node);
-                    case 164:
-                        return emitObjectBindingPattern(node);
-                    case 165:
-                        return emitArrayBindingPattern(node);
-                    case 166:
-                        return emitBindingElement(node);
-                    case 167:
-                        return emitArrayLiteral(node);
-                    case 168:
-                        return emitObjectLiteral(node);
-                    case 248:
-                        return emitPropertyAssignment(node);
-                    case 249:
-                        return emitShorthandPropertyAssignment(node);
-                    case 137:
-                        return emitComputedPropertyName(node);
-                    case 169:
-                        return emitPropertyAccess(node);
-                    case 170:
-                        return emitIndexedAccess(node);
-                    case 171:
-                        return emitCallExpression(node);
-                    case 172:
-                        return emitNewExpression(node);
-                    case 173:
-                        return emitTaggedTemplateExpression(node);
-                    case 174:
-                        return emit(node.expression);
-                    case 192:
-                        return emit(node.expression);
-                    case 175:
-                        return emitParenExpression(node);
-                    case 216:
-                    case 176:
-                    case 177:
-                        return emitFunctionDeclaration(node);
-                    case 178:
-                        return emitDeleteExpression(node);
-                    case 179:
-                        return emitTypeOfExpression(node);
-                    case 180:
-                        return emitVoidExpression(node);
-                    case 181:
-                        return emitAwaitExpression(node);
-                    case 182:
-                        return emitPrefixUnaryExpression(node);
-                    case 183:
-                        return emitPostfixUnaryExpression(node);
-                    case 184:
-                        return emitBinaryExpression(node);
-                    case 185:
-                        return emitConditionalExpression(node);
                     case 188:
-                        return emitSpreadElementExpression(node);
-                    case 187:
-                        return emitYieldExpression(node);
-                    case 190:
-                        return;
-                    case 195:
-                    case 222:
-                        return emitBlock(node);
+                        return emitTemplateExpression(node);
                     case 196:
-                        return emitVariableStatement(node);
-                    case 197:
-                        return write(";");
-                    case 198:
-                        return emitExpressionStatement(node);
-                    case 199:
-                        return emitIfStatement(node);
-                    case 200:
-                        return emitDoStatement(node);
-                    case 201:
-                        return emitWhileStatement(node);
-                    case 202:
-                        return emitForStatement(node);
-                    case 204:
-                    case 203:
-                        return emitForInOrForOfStatement(node);
-                    case 205:
-                    case 206:
-                        return emitBreakOrContinueStatement(node);
-                    case 207:
-                        return emitReturnStatement(node);
-                    case 208:
-                        return emitWithStatement(node);
-                    case 209:
-                        return emitSwitchStatement(node);
-                    case 244:
-                    case 245:
-                        return emitCaseOrDefaultClause(node);
-                    case 210:
-                        return emitLabeledStatement(node);
-                    case 211:
-                        return emitThrowStatement(node);
-                    case 212:
-                        return emitTryStatement(node);
+                        return emitTemplateSpan(node);
+                    case 240:
+                    case 241:
+                        return emitJsxElement(node);
+                    case 243:
+                        return emitJsxText(node);
                     case 247:
-                        return emitCatchClause(node);
-                    case 213:
-                        return emitDebuggerStatement(node);
-                    case 214:
-                        return emitVariableDeclaration(node);
+                        return emitJsxExpression(node);
+                    case 138:
+                        return emitQualifiedName(node);
+                    case 166:
+                        return emitObjectBindingPattern(node);
+                    case 167:
+                        return emitArrayBindingPattern(node);
+                    case 168:
+                        return emitBindingElement(node);
+                    case 169:
+                        return emitArrayLiteral(node);
+                    case 170:
+                        return emitObjectLiteral(node);
+                    case 252:
+                        return emitPropertyAssignment(node);
+                    case 253:
+                        return emitShorthandPropertyAssignment(node);
+                    case 139:
+                        return emitComputedPropertyName(node);
+                    case 171:
+                        return emitPropertyAccess(node);
+                    case 172:
+                        return emitIndexedAccess(node);
+                    case 173:
+                        return emitCallExpression(node);
+                    case 174:
+                        return emitNewExpression(node);
+                    case 175:
+                        return emitTaggedTemplateExpression(node);
+                    case 176:
+                    case 194:
+                    case 195:
+                        return emit(node.expression);
+                    case 177:
+                        return emitParenExpression(node);
+                    case 219:
+                    case 178:
+                    case 179:
+                        return emitFunctionDeclaration(node);
+                    case 180:
+                        return emitDeleteExpression(node);
+                    case 181:
+                        return emitTypeOfExpression(node);
+                    case 182:
+                        return emitVoidExpression(node);
+                    case 183:
+                        return emitAwaitExpression(node);
+                    case 184:
+                        return emitPrefixUnaryExpression(node);
+                    case 185:
+                        return emitPostfixUnaryExpression(node);
+                    case 186:
+                        return emitBinaryExpression(node);
+                    case 187:
+                        return emitConditionalExpression(node);
+                    case 190:
+                        return emitSpreadElementExpression(node);
                     case 189:
-                        return emitClassExpression(node);
-                    case 217:
-                        return emitClassDeclaration(node);
-                    case 218:
-                        return emitInterfaceDeclaration(node);
-                    case 220:
-                        return emitEnumDeclaration(node);
-                    case 250:
-                        return emitEnumMember(node);
-                    case 221:
-                        return emitModuleDeclaration(node);
+                        return emitYieldExpression(node);
+                    case 192:
+                        return;
+                    case 198:
                     case 225:
-                        return emitImportDeclaration(node);
-                    case 224:
-                        return emitImportEqualsDeclaration(node);
-                    case 231:
-                        return emitExportDeclaration(node);
-                    case 230:
-                        return emitExportAssignment(node);
+                        return emitBlock(node);
+                    case 199:
+                        return emitVariableStatement(node);
+                    case 200:
+                        return write(";");
+                    case 201:
+                        return emitExpressionStatement(node);
+                    case 202:
+                        return emitIfStatement(node);
+                    case 203:
+                        return emitDoStatement(node);
+                    case 204:
+                        return emitWhileStatement(node);
+                    case 205:
+                        return emitForStatement(node);
+                    case 207:
+                    case 206:
+                        return emitForInOrForOfStatement(node);
+                    case 208:
+                    case 209:
+                        return emitBreakOrContinueStatement(node);
+                    case 210:
+                        return emitReturnStatement(node);
+                    case 211:
+                        return emitWithStatement(node);
+                    case 212:
+                        return emitSwitchStatement(node);
+                    case 248:
+                    case 249:
+                        return emitCaseOrDefaultClause(node);
+                    case 213:
+                        return emitLabeledStatement(node);
+                    case 214:
+                        return emitThrowStatement(node);
+                    case 215:
+                        return emitTryStatement(node);
                     case 251:
+                        return emitCatchClause(node);
+                    case 216:
+                        return emitDebuggerStatement(node);
+                    case 217:
+                        return emitVariableDeclaration(node);
+                    case 191:
+                        return emitClassExpression(node);
+                    case 220:
+                        return emitClassDeclaration(node);
+                    case 221:
+                        return emitInterfaceDeclaration(node);
+                    case 223:
+                        return emitEnumDeclaration(node);
+                    case 254:
+                        return emitEnumMember(node);
+                    case 224:
+                        return emitModuleDeclaration(node);
+                    case 229:
+                        return emitImportDeclaration(node);
+                    case 228:
+                        return emitImportEqualsDeclaration(node);
+                    case 235:
+                        return emitExportDeclaration(node);
+                    case 234:
+                        return emitExportAssignment(node);
+                    case 255:
                         return emitSourceFileNode(node);
                 }
             }
@@ -32306,7 +34317,7 @@ var ts;
             }
             function getLeadingCommentsToEmit(node) {
                 if (node.parent) {
-                    if (node.parent.kind === 251 || node.pos !== node.parent.pos) {
+                    if (node.parent.kind === 255 || node.pos !== node.parent.pos) {
                         if (hasDetachedComments(node.pos)) {
                             return getLeadingCommentsWithoutDetachedComments();
                         }
@@ -32318,7 +34329,7 @@ var ts;
             }
             function getTrailingCommentsToEmit(node) {
                 if (node.parent) {
-                    if (node.parent.kind === 251 || node.end !== node.parent.end) {
+                    if (node.parent.kind === 255 || node.end !== node.parent.end) {
                         return ts.getTrailingCommentRanges(currentText, node.end);
                     }
                 }
@@ -32409,6 +34420,15 @@ var ts;
             if (declarationFilePath) {
                 emitSkipped = ts.writeDeclarationFile(declarationFilePath, sourceFiles, isBundledEmit, host, resolver, emitterDiagnostics) || emitSkipped;
             }
+            if (!emitSkipped && emittedFilesList) {
+                emittedFilesList.push(jsFilePath);
+                if (sourceMapFilePath) {
+                    emittedFilesList.push(sourceMapFilePath);
+                }
+                if (declarationFilePath) {
+                    emittedFilesList.push(declarationFilePath);
+                }
+            }
         }
     }
     ts.emitFiles = emitFiles;
@@ -32420,10 +34440,15 @@ var ts;
     ts.ioReadTime = 0;
     ts.ioWriteTime = 0;
     var emptyArray = [];
-    ts.version = "1.8.0";
+    var defaultLibrarySearchPaths = [
+        "types/",
+        "node_modules/",
+        "node_modules/@types/",
+    ];
+    ts.version = "1.9.0";
     function findConfigFile(searchPath, fileExists) {
-        var fileName = "tsconfig.json";
         while (true) {
+            var fileName = ts.combinePaths(searchPath, "tsconfig.json");
             if (fileExists(fileName)) {
                 return fileName;
             }
@@ -32432,7 +34457,6 @@ var ts;
                 break;
             }
             searchPath = parentPath;
-            fileName = "../" + fileName;
         }
         return undefined;
     }
@@ -32443,94 +34467,485 @@ var ts;
         return ts.normalizePath(referencedFileName);
     }
     ts.resolveTripleslashReference = resolveTripleslashReference;
-    function resolveModuleName(moduleName, containingFile, compilerOptions, host) {
-        var moduleResolution = compilerOptions.moduleResolution !== undefined
-            ? compilerOptions.moduleResolution
-            : compilerOptions.module === 1 ? 2 : 1;
-        switch (moduleResolution) {
-            case 2: return nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host);
-            case 1: return classicNameResolver(moduleName, containingFile, compilerOptions, host);
+    function computeCommonSourceDirectoryOfFilenames(fileNames, currentDirectory, getCanonicalFileName) {
+        var commonPathComponents;
+        var failed = ts.forEach(fileNames, function (sourceFile) {
+            var sourcePathComponents = ts.getNormalizedPathComponents(sourceFile, currentDirectory);
+            sourcePathComponents.pop();
+            if (!commonPathComponents) {
+                commonPathComponents = sourcePathComponents;
+                return;
+            }
+            for (var i = 0, n = Math.min(commonPathComponents.length, sourcePathComponents.length); i < n; i++) {
+                if (getCanonicalFileName(commonPathComponents[i]) !== getCanonicalFileName(sourcePathComponents[i])) {
+                    if (i === 0) {
+                        return true;
+                    }
+                    commonPathComponents.length = i;
+                    break;
+                }
+            }
+            if (sourcePathComponents.length < commonPathComponents.length) {
+                commonPathComponents.length = sourcePathComponents.length;
+            }
+        });
+        if (failed) {
+            return "";
         }
+        if (!commonPathComponents) {
+            return currentDirectory;
+        }
+        return ts.getNormalizedPathFromPathComponents(commonPathComponents);
+    }
+    ts.computeCommonSourceDirectoryOfFilenames = computeCommonSourceDirectoryOfFilenames;
+    function trace(host, message) {
+        host.trace(ts.formatMessage.apply(undefined, arguments));
+    }
+    function isTraceEnabled(compilerOptions, host) {
+        return compilerOptions.traceResolution && host.trace !== undefined;
+    }
+    function hasZeroOrOneAsteriskCharacter(str) {
+        var seenAsterisk = false;
+        for (var i = 0; i < str.length; i++) {
+            if (str.charCodeAt(i) === 42) {
+                if (!seenAsterisk) {
+                    seenAsterisk = true;
+                }
+                else {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+    function createResolvedModule(resolvedFileName, isExternalLibraryImport, failedLookupLocations) {
+        return { resolvedModule: resolvedFileName ? { resolvedFileName: resolvedFileName, isExternalLibraryImport: isExternalLibraryImport } : undefined, failedLookupLocations: failedLookupLocations };
+    }
+    function moduleHasNonRelativeName(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;
+        try {
+            var jsonText = state.host.readFile(packageJsonPath);
+            jsonContent = jsonText ? JSON.parse(jsonText) : {};
+        }
+        catch (e) {
+            jsonContent = {};
+        }
+        var typesFile;
+        var fieldName;
+        if (jsonContent.typings) {
+            if (typeof jsonContent.typings === "string") {
+                fieldName = "typings";
+                typesFile = jsonContent.typings;
+            }
+            else {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.Expected_type_of_0_field_in_package_json_to_be_string_got_1, "typings", typeof jsonContent.typings);
+                }
+            }
+        }
+        if (!typesFile && jsonContent.types) {
+            if (typeof jsonContent.types === "string") {
+                fieldName = "types";
+                typesFile = jsonContent.types;
+            }
+            else {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.Expected_type_of_0_field_in_package_json_to_be_string_got_1, "types", typeof jsonContent.types);
+                }
+            }
+        }
+        if (typesFile) {
+            var typesFilePath = ts.normalizePath(ts.combinePaths(baseDirectory, typesFile));
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, typesFile, typesFilePath);
+            }
+            return typesFilePath;
+        }
+        return undefined;
+    }
+    var typeReferenceExtensions = [".d.ts"];
+    function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host) {
+        var traceEnabled = isTraceEnabled(options, host);
+        var moduleResolutionState = {
+            compilerOptions: options,
+            host: host,
+            skipTsx: true,
+            traceEnabled: traceEnabled
+        };
+        var rootDir = options.typesRoot || (options.configFilePath ? ts.getDirectoryPath(options.configFilePath) : undefined);
+        if (traceEnabled) {
+            if (containingFile === undefined) {
+                if (rootDir === undefined) {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_not_set_root_directory_not_set, typeReferenceDirectiveName);
+                }
+                else {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_not_set_root_directory_1, typeReferenceDirectiveName, rootDir);
+                }
+            }
+            else {
+                if (rootDir === undefined) {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_1_root_directory_not_set, typeReferenceDirectiveName, containingFile);
+                }
+                else {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_1_root_directory_2, typeReferenceDirectiveName, containingFile, rootDir);
+                }
+            }
+        }
+        var failedLookupLocations = [];
+        if (rootDir !== undefined) {
+            var effectivePrimarySearchPaths = options.typesSearchPaths || defaultLibrarySearchPaths;
+            for (var _i = 0, effectivePrimarySearchPaths_1 = effectivePrimarySearchPaths; _i < effectivePrimarySearchPaths_1.length; _i++) {
+                var searchPath = effectivePrimarySearchPaths_1[_i];
+                var primaryPath = ts.combinePaths(rootDir, searchPath);
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Resolving_with_primary_search_path_0, primaryPath);
+                }
+                var candidate = ts.combinePaths(primaryPath, typeReferenceDirectiveName);
+                var candidateDirectory = ts.getDirectoryPath(candidate);
+                var resolvedFile_1 = loadNodeModuleFromDirectory(typeReferenceExtensions, candidate, failedLookupLocations, !directoryProbablyExists(candidateDirectory, host), moduleResolutionState);
+                if (resolvedFile_1) {
+                    if (traceEnabled) {
+                        trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile_1, true);
+                    }
+                    return {
+                        resolvedTypeReferenceDirective: { primary: true, resolvedFileName: resolvedFile_1 },
+                        failedLookupLocations: failedLookupLocations
+                    };
+                }
+            }
+        }
+        else {
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Root_directory_cannot_be_determined_skipping_primary_search_paths);
+            }
+        }
+        var resolvedFile;
+        var initialLocationForSecondaryLookup;
+        if (containingFile) {
+            initialLocationForSecondaryLookup = ts.getDirectoryPath(containingFile);
+        }
+        else {
+            initialLocationForSecondaryLookup = rootDir;
+        }
+        if (initialLocationForSecondaryLookup !== undefined) {
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
+            }
+            resolvedFile = loadModuleFromNodeModules(typeReferenceDirectiveName, initialLocationForSecondaryLookup, failedLookupLocations, moduleResolutionState);
+            if (traceEnabled) {
+                if (resolvedFile) {
+                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile, false);
+                }
+                else {
+                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_not_resolved, typeReferenceDirectiveName);
+                }
+            }
+        }
+        else {
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder);
+            }
+        }
+        return {
+            resolvedTypeReferenceDirective: resolvedFile
+                ? { primary: false, resolvedFileName: resolvedFile }
+                : undefined,
+            failedLookupLocations: failedLookupLocations
+        };
+    }
+    ts.resolveTypeReferenceDirective = resolveTypeReferenceDirective;
+    function resolveModuleName(moduleName, containingFile, compilerOptions, host) {
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        if (traceEnabled) {
+            trace(host, ts.Diagnostics.Resolving_module_0_from_1, moduleName, containingFile);
+        }
+        var moduleResolution = compilerOptions.moduleResolution;
+        if (moduleResolution === undefined) {
+            moduleResolution = ts.getEmitModuleKind(compilerOptions) === ts.ModuleKind.CommonJS ? ts.ModuleResolutionKind.NodeJs : ts.ModuleResolutionKind.Classic;
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Module_resolution_kind_is_not_specified_using_0, ts.ModuleResolutionKind[moduleResolution]);
+            }
+        }
+        else {
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Explicitly_specified_module_resolution_kind_Colon_0, ts.ModuleResolutionKind[moduleResolution]);
+            }
+        }
+        var result;
+        switch (moduleResolution) {
+            case ts.ModuleResolutionKind.NodeJs:
+                result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host);
+                break;
+            case ts.ModuleResolutionKind.Classic:
+                result = classicNameResolver(moduleName, containingFile, compilerOptions, host);
+                break;
+        }
+        if (traceEnabled) {
+            if (result.resolvedModule) {
+                trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1, moduleName, result.resolvedModule.resolvedFileName);
+            }
+            else {
+                trace(host, ts.Diagnostics.Module_name_0_was_not_resolved, moduleName);
+            }
+        }
+        return result;
     }
     ts.resolveModuleName = resolveModuleName;
+    function tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state) {
+        if (moduleHasNonRelativeName(moduleName)) {
+            return tryLoadModuleUsingBaseUrl(moduleName, loader, failedLookupLocations, supportedExtensions, state);
+        }
+        else {
+            return tryLoadModuleUsingRootDirs(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state);
+        }
+    }
+    function tryLoadModuleUsingRootDirs(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state) {
+        if (!state.compilerOptions.rootDirs) {
+            return undefined;
+        }
+        if (state.traceEnabled) {
+            trace(state.host, ts.Diagnostics.rootDirs_option_is_set_using_it_to_resolve_relative_module_name_0, moduleName);
+        }
+        var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+        var matchedRootDir;
+        var matchedNormalizedPrefix;
+        for (var _i = 0, _a = state.compilerOptions.rootDirs; _i < _a.length; _i++) {
+            var rootDir = _a[_i];
+            var normalizedRoot = ts.normalizePath(rootDir);
+            if (!ts.endsWith(normalizedRoot, ts.directorySeparator)) {
+                normalizedRoot += ts.directorySeparator;
+            }
+            var isLongestMatchingPrefix = ts.startsWith(candidate, normalizedRoot) &&
+                (matchedNormalizedPrefix === undefined || matchedNormalizedPrefix.length < normalizedRoot.length);
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Checking_if_0_is_the_longest_matching_prefix_for_1_2, normalizedRoot, candidate, isLongestMatchingPrefix);
+            }
+            if (isLongestMatchingPrefix) {
+                matchedNormalizedPrefix = normalizedRoot;
+                matchedRootDir = rootDir;
+            }
+        }
+        if (matchedNormalizedPrefix) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Longest_matching_prefix_for_0_is_1, candidate, matchedNormalizedPrefix);
+            }
+            var suffix = candidate.substr(matchedNormalizedPrefix.length);
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, matchedNormalizedPrefix, candidate);
+            }
+            var resolvedFileName = loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(containingDirectory, state.host), state);
+            if (resolvedFileName) {
+                return resolvedFileName;
+            }
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Trying_other_entries_in_rootDirs);
+            }
+            for (var _b = 0, _c = state.compilerOptions.rootDirs; _b < _c.length; _b++) {
+                var rootDir = _c[_b];
+                if (rootDir === matchedRootDir) {
+                    continue;
+                }
+                var candidate_1 = ts.combinePaths(ts.normalizePath(rootDir), suffix);
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, rootDir, candidate_1);
+                }
+                var baseDirectory = ts.getDirectoryPath(candidate_1);
+                var resolvedFileName_1 = loader(candidate_1, supportedExtensions, failedLookupLocations, !directoryProbablyExists(baseDirectory, state.host), state);
+                if (resolvedFileName_1) {
+                    return resolvedFileName_1;
+                }
+            }
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Module_resolution_using_rootDirs_has_failed);
+            }
+        }
+        return undefined;
+    }
+    function tryLoadModuleUsingBaseUrl(moduleName, loader, failedLookupLocations, supportedExtensions, state) {
+        if (!state.compilerOptions.baseUrl) {
+            return undefined;
+        }
+        if (state.traceEnabled) {
+            trace(state.host, ts.Diagnostics.baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1, state.compilerOptions.baseUrl, moduleName);
+        }
+        var longestMatchPrefixLength = -1;
+        var matchedPattern;
+        var matchedStar;
+        if (state.compilerOptions.paths) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0, moduleName);
+            }
+            for (var key in state.compilerOptions.paths) {
+                var pattern = key;
+                var indexOfStar = pattern.indexOf("*");
+                if (indexOfStar !== -1) {
+                    var prefix = pattern.substr(0, indexOfStar);
+                    var suffix = pattern.substr(indexOfStar + 1);
+                    if (moduleName.length >= prefix.length + suffix.length &&
+                        ts.startsWith(moduleName, prefix) &&
+                        ts.endsWith(moduleName, suffix)) {
+                        if (prefix.length > longestMatchPrefixLength) {
+                            longestMatchPrefixLength = prefix.length;
+                            matchedPattern = pattern;
+                            matchedStar = moduleName.substr(prefix.length, moduleName.length - suffix.length);
+                        }
+                    }
+                }
+                else if (pattern === moduleName) {
+                    matchedPattern = pattern;
+                    matchedStar = undefined;
+                    break;
+                }
+            }
+        }
+        if (matchedPattern) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Module_name_0_matched_pattern_1, moduleName, matchedPattern);
+            }
+            for (var _i = 0, _a = state.compilerOptions.paths[matchedPattern]; _i < _a.length; _i++) {
+                var subst = _a[_i];
+                var path = matchedStar ? subst.replace("\*", matchedStar) : subst;
+                var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, path));
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.Trying_substitution_0_candidate_module_location_Colon_1, subst, path);
+                }
+                var resolvedFileName = loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
+                if (resolvedFileName) {
+                    return resolvedFileName;
+                }
+            }
+            return undefined;
+        }
+        else {
+            var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, moduleName));
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Resolving_module_name_0_relative_to_base_url_1_2, moduleName, state.compilerOptions.baseUrl, candidate);
+            }
+            return loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
+        }
+    }
     function nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host) {
         var containingDirectory = ts.getDirectoryPath(containingFile);
         var supportedExtensions = ts.getSupportedExtensions(compilerOptions);
-        if (ts.getRootLength(moduleName) !== 0 || nameStartsWithDotSlashOrDotDotSlash(moduleName)) {
-            var failedLookupLocations = [];
-            var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-            var resolvedFileName = loadNodeModuleFromFile(supportedExtensions, candidate, failedLookupLocations, false, host);
-            if (resolvedFileName) {
-                return { resolvedModule: { resolvedFileName: resolvedFileName }, failedLookupLocations: failedLookupLocations };
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        var failedLookupLocations = [];
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, skipTsx: false };
+        var resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, nodeLoadModuleByRelativeName, failedLookupLocations, supportedExtensions, state);
+        if (resolvedFileName) {
+            return createResolvedModule(resolvedFileName, false, failedLookupLocations);
+        }
+        var isExternalLibraryImport = false;
+        if (moduleHasNonRelativeName(moduleName)) {
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Loading_module_0_from_node_modules_folder, moduleName);
             }
-            resolvedFileName = loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, false, host);
-            return resolvedFileName
-                ? { resolvedModule: { resolvedFileName: resolvedFileName }, failedLookupLocations: failedLookupLocations }
-                : { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
+            resolvedFileName = loadModuleFromNodeModules(moduleName, containingDirectory, failedLookupLocations, state);
+            isExternalLibraryImport = resolvedFileName !== undefined;
         }
         else {
-            return loadModuleFromNodeModules(moduleName, containingDirectory, host);
+            var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+            resolvedFileName = nodeLoadModuleByRelativeName(candidate, supportedExtensions, failedLookupLocations, false, state);
         }
+        return createResolvedModule(resolvedFileName, isExternalLibraryImport, failedLookupLocations);
     }
     ts.nodeModuleNameResolver = nodeModuleNameResolver;
+    function nodeLoadModuleByRelativeName(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state) {
+        if (state.traceEnabled) {
+            trace(state.host, ts.Diagnostics.Loading_module_as_file_Slash_folder_candidate_module_location_0, candidate);
+        }
+        var resolvedFileName = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state);
+        return resolvedFileName || loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, onlyRecordFailures, state);
+    }
     function directoryProbablyExists(directoryName, host) {
         return !host.directoryExists || host.directoryExists(directoryName);
     }
     ts.directoryProbablyExists = directoryProbablyExists;
-    function loadNodeModuleFromFile(extensions, candidate, failedLookupLocation, onlyRecordFailures, host) {
+    function loadModuleFromFile(candidate, extensions, failedLookupLocation, onlyRecordFailures, state) {
+        if (!onlyRecordFailures) {
+            var directory = ts.getDirectoryPath(candidate);
+            if (directory) {
+                onlyRecordFailures = !directoryProbablyExists(directory, state.host);
+            }
+        }
         return ts.forEach(extensions, tryLoad);
         function tryLoad(ext) {
+            if (ext === ".tsx" && state.skipTsx) {
+                return undefined;
+            }
             var fileName = ts.fileExtensionIs(candidate, ext) ? candidate : candidate + ext;
-            if (!onlyRecordFailures && host.fileExists(fileName)) {
+            if (!onlyRecordFailures && state.host.fileExists(fileName)) {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.File_0_exist_use_it_as_a_name_resolution_result, fileName);
+                }
                 return fileName;
             }
             else {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.File_0_does_not_exist, fileName);
+                }
                 failedLookupLocation.push(fileName);
                 return undefined;
             }
         }
     }
-    function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocation, onlyRecordFailures, host) {
+    function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocation, onlyRecordFailures, state) {
         var packageJsonPath = ts.combinePaths(candidate, "package.json");
-        var directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, host);
-        if (directoryExists && host.fileExists(packageJsonPath)) {
-            var jsonContent;
-            try {
-                var jsonText = host.readFile(packageJsonPath);
-                jsonContent = jsonText ? JSON.parse(jsonText) : { typings: undefined };
+        var directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, state.host);
+        if (directoryExists && state.host.fileExists(packageJsonPath)) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
             }
-            catch (e) {
-                jsonContent = { typings: undefined };
-            }
-            if (typeof jsonContent.typings === "string") {
-                var path = ts.normalizePath(ts.combinePaths(candidate, jsonContent.typings));
-                var result = loadNodeModuleFromFile(extensions, path, failedLookupLocation, !directoryProbablyExists(ts.getDirectoryPath(path), host), host);
+            var typesFile = tryReadTypesSection(packageJsonPath, candidate, state);
+            if (typesFile) {
+                var result = loadModuleFromFile(typesFile, extensions, failedLookupLocation, !directoryProbablyExists(ts.getDirectoryPath(typesFile), state.host), state);
                 if (result) {
                     return result;
                 }
             }
+            else {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.package_json_does_not_have_types_field);
+                }
+            }
         }
         else {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath);
+            }
             failedLookupLocation.push(packageJsonPath);
         }
-        return loadNodeModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocation, !directoryExists, host);
+        return loadModuleFromFile(ts.combinePaths(candidate, "index"), extensions, failedLookupLocation, !directoryExists, state);
     }
-    function loadModuleFromNodeModules(moduleName, directory, host) {
-        var failedLookupLocations = [];
+    function loadModuleFromNodeModulesFolder(moduleName, directory, failedLookupLocations, state) {
+        var nodeModulesFolder = ts.combinePaths(directory, "node_modules");
+        var nodeModulesFolderExists = directoryProbablyExists(nodeModulesFolder, state.host);
+        var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName));
+        var result = loadModuleFromFile(candidate, ts.supportedTypeScriptExtensions, failedLookupLocations, !nodeModulesFolderExists, state);
+        if (result) {
+            return result;
+        }
+        result = loadNodeModuleFromDirectory(ts.supportedTypeScriptExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state);
+        if (result) {
+            return result;
+        }
+    }
+    function loadModuleFromNodeModules(moduleName, directory, failedLookupLocations, state) {
         directory = ts.normalizeSlashes(directory);
         while (true) {
             var baseName = ts.getBaseFileName(directory);
             if (baseName !== "node_modules") {
-                var nodeModulesFolder = ts.combinePaths(directory, "node_modules");
-                var nodeModulesFolderExists = directoryProbablyExists(nodeModulesFolder, host);
-                var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName));
-                var result = loadNodeModuleFromFile(ts.supportedTypeScriptExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, host);
+                var result = loadModuleFromNodeModulesFolder(moduleName, directory, failedLookupLocations, state) ||
+                    loadModuleFromNodeModulesFolder(ts.combinePaths("@types", moduleName), directory, failedLookupLocations, state);
                 if (result) {
-                    return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations: failedLookupLocations };
-                }
-                result = loadNodeModuleFromDirectory(ts.supportedTypeScriptExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, host);
-                if (result) {
-                    return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations: failedLookupLocations };
+                    return result;
                 }
             }
             var parentPath = ts.getDirectoryPath(directory);
@@ -32539,43 +34954,36 @@ var ts;
             }
             directory = parentPath;
         }
-        return { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
-    }
-    function nameStartsWithDotSlashOrDotDotSlash(name) {
-        var i = name.lastIndexOf("./", 1);
-        return i === 0 || (i === 1 && name.charCodeAt(0) === 46);
+        return undefined;
     }
     function classicNameResolver(moduleName, containingFile, compilerOptions, host) {
-        if (moduleName.indexOf("!") != -1) {
-            return { resolvedModule: undefined, failedLookupLocations: [] };
-        }
-        var searchPath = ts.getDirectoryPath(containingFile);
-        var searchName;
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, skipTsx: !compilerOptions.jsx };
         var failedLookupLocations = [];
-        var referencedSourceFile;
         var supportedExtensions = ts.getSupportedExtensions(compilerOptions);
-        while (true) {
-            searchName = ts.normalizePath(ts.combinePaths(searchPath, moduleName));
-            referencedSourceFile = ts.forEach(supportedExtensions, function (extension) {
-                if (extension === ".tsx" && !compilerOptions.jsx) {
-                    return undefined;
+        var containingDirectory = ts.getDirectoryPath(containingFile);
+        var resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, loadModuleFromFile, failedLookupLocations, supportedExtensions, state);
+        if (resolvedFileName) {
+            return createResolvedModule(resolvedFileName, false, failedLookupLocations);
+        }
+        var referencedSourceFile;
+        if (moduleHasNonRelativeName(moduleName)) {
+            while (true) {
+                var searchName = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+                referencedSourceFile = loadModuleFromFile(searchName, supportedExtensions, failedLookupLocations, false, state);
+                if (referencedSourceFile) {
+                    break;
                 }
-                var candidate = searchName + extension;
-                if (host.fileExists(candidate)) {
-                    return candidate;
+                var parentPath = ts.getDirectoryPath(containingDirectory);
+                if (parentPath === containingDirectory) {
+                    break;
                 }
-                else {
-                    failedLookupLocations.push(candidate);
-                }
-            });
-            if (referencedSourceFile) {
-                break;
+                containingDirectory = parentPath;
             }
-            var parentPath = ts.getDirectoryPath(searchPath);
-            if (parentPath === searchPath) {
-                break;
-            }
-            searchPath = parentPath;
+        }
+        else {
+            var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+            referencedSourceFile = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, false, state);
         }
         return referencedSourceFile
             ? { resolvedModule: { resolvedFileName: referencedSourceFile }, failedLookupLocations: failedLookupLocations }
@@ -32583,7 +34991,7 @@ var ts;
     }
     ts.classicNameResolver = classicNameResolver;
     ts.defaultInitCompilerOptions = {
-        module: 1,
+        module: ts.ModuleKind.CommonJS,
         target: 1,
         noImplicitAny: false,
         sourceMap: false
@@ -32628,11 +35036,39 @@ var ts;
                 ts.sys.createDirectory(directoryPath);
             }
         }
+        var outputFingerprints;
+        function writeFileIfUpdated(fileName, data, writeByteOrderMark) {
+            if (!outputFingerprints) {
+                outputFingerprints = {};
+            }
+            var hash = ts.sys.createHash(data);
+            var mtimeBefore = ts.sys.getModifiedTime(fileName);
+            if (mtimeBefore && ts.hasProperty(outputFingerprints, fileName)) {
+                var fingerprint = outputFingerprints[fileName];
+                if (fingerprint.byteOrderMark === writeByteOrderMark &&
+                    fingerprint.hash === hash &&
+                    fingerprint.mtime.getTime() === mtimeBefore.getTime()) {
+                    return;
+                }
+            }
+            ts.sys.writeFile(fileName, data, writeByteOrderMark);
+            var mtimeAfter = ts.sys.getModifiedTime(fileName);
+            outputFingerprints[fileName] = {
+                hash: hash,
+                byteOrderMark: writeByteOrderMark,
+                mtime: mtimeAfter
+            };
+        }
         function writeFile(fileName, data, writeByteOrderMark, onError) {
             try {
                 var start = new Date().getTime();
                 ensureDirectoriesExist(ts.getDirectoryPath(ts.normalizePath(fileName)));
-                ts.sys.writeFile(fileName, data, writeByteOrderMark);
+                if (ts.isWatchSet(options) && ts.sys.createHash && ts.sys.getModifiedTime) {
+                    writeFileIfUpdated(fileName, data, writeByteOrderMark);
+                }
+                else {
+                    ts.sys.writeFile(fileName, data, writeByteOrderMark);
+                }
                 ts.ioWriteTime += new Date().getTime() - start;
             }
             catch (e) {
@@ -32641,10 +35077,14 @@ var ts;
                 }
             }
         }
+        function getDefaultLibLocation() {
+            return ts.getDirectoryPath(ts.normalizePath(ts.sys.getExecutingFilePath()));
+        }
         var newLine = ts.getNewLineCharacter(options);
         return {
             getSourceFile: getSourceFile,
-            getDefaultLibFileName: function (options) { return ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(ts.sys.getExecutingFilePath())), ts.getDefaultLibFileName(options)); },
+            getDefaultLibLocation: getDefaultLibLocation,
+            getDefaultLibFileName: function (options) { return ts.combinePaths(getDefaultLibLocation(), ts.getDefaultLibFileName(options)); },
             writeFile: writeFile,
             getCurrentDirectory: ts.memoize(function () { return ts.sys.getCurrentDirectory(); }),
             useCaseSensitiveFileNames: function () { return ts.sys.useCaseSensitiveFileNames; },
@@ -32652,6 +35092,7 @@ var ts;
             getNewLine: function () { return newLine; },
             fileExists: function (fileName) { return ts.sys.fileExists(fileName); },
             readFile: function (fileName) { return ts.sys.readFile(fileName); },
+            trace: function (s) { return ts.sys.write(s + newLine); },
             directoryExists: function (directoryName) { return ts.sys.directoryExists(directoryName); }
         };
     }
@@ -32687,57 +35128,78 @@ var ts;
         }
     }
     ts.flattenDiagnosticMessageText = flattenDiagnosticMessageText;
+    function loadWithLocalCache(names, containingFile, loader) {
+        if (names.length === 0) {
+            return [];
+        }
+        var resolutions = [];
+        var cache = {};
+        for (var _i = 0, names_1 = names; _i < names_1.length; _i++) {
+            var name_33 = names_1[_i];
+            var result = void 0;
+            if (ts.hasProperty(cache, name_33)) {
+                result = cache[name_33];
+            }
+            else {
+                result = loader(name_33, containingFile);
+                cache[name_33] = result;
+            }
+            resolutions.push(result);
+        }
+        return resolutions;
+    }
     function createProgram(rootNames, options, host, oldProgram) {
         var program;
         var files = [];
-        var fileProcessingDiagnostics = ts.createDiagnosticCollection();
-        var programDiagnostics = ts.createDiagnosticCollection();
         var commonSourceDirectory;
         var diagnosticsProducingTypeChecker;
         var noDiagnosticsTypeChecker;
         var classifiableNames;
-        var skipDefaultLib = options.noLib;
-        var supportedExtensions = ts.getSupportedExtensions(options);
+        var resolvedTypeReferenceDirectives = {};
+        var fileProcessingDiagnostics = ts.createDiagnosticCollection();
         var start = new Date().getTime();
         host = host || createCompilerHost(options);
-        var hasEmitBlockingDiagnostics = ts.createFileMap(getCanonicalFileName);
+        var skipDefaultLib = options.noLib;
+        var programDiagnostics = ts.createDiagnosticCollection();
         var currentDirectory = host.getCurrentDirectory();
-        var resolveModuleNamesWorker = host.resolveModuleNames
-            ? (function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile); })
-            : (function (moduleNames, containingFile) {
-                var resolvedModuleNames = [];
-                var lookup = {};
-                for (var _i = 0, moduleNames_1 = moduleNames; _i < moduleNames_1.length; _i++) {
-                    var moduleName = moduleNames_1[_i];
-                    var resolvedName = void 0;
-                    if (ts.hasProperty(lookup, moduleName)) {
-                        resolvedName = lookup[moduleName];
-                    }
-                    else {
-                        resolvedName = resolveModuleName(moduleName, containingFile, options, host).resolvedModule;
-                        lookup[moduleName] = resolvedName;
-                    }
-                    resolvedModuleNames.push(resolvedName);
-                }
-                return resolvedModuleNames;
-            });
+        var supportedExtensions = ts.getSupportedExtensions(options);
+        var hasEmitBlockingDiagnostics = ts.createFileMap(getCanonicalFileName);
+        var resolveModuleNamesWorker;
+        if (host.resolveModuleNames) {
+            resolveModuleNamesWorker = function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile); };
+        }
+        else {
+            var loader_1 = function (moduleName, containingFile) { return resolveModuleName(moduleName, containingFile, options, host).resolvedModule; };
+            resolveModuleNamesWorker = function (moduleNames, containingFile) { return loadWithLocalCache(moduleNames, containingFile, loader_1); };
+        }
+        var resolveTypeReferenceDirectiveNamesWorker;
+        if (host.resolveTypeReferenceDirectives) {
+            resolveTypeReferenceDirectiveNamesWorker = function (typeDirectiveNames, containingFile) { return host.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile); };
+        }
+        else {
+            var loader_2 = function (typesRef, containingFile) { return resolveTypeReferenceDirective(typesRef, containingFile, options, host).resolvedTypeReferenceDirective; };
+            resolveTypeReferenceDirectiveNamesWorker = function (typeReferenceDirectiveNames, containingFile) { return loadWithLocalCache(typeReferenceDirectiveNames, containingFile, loader_2); };
+        }
         var filesByName = ts.createFileMap();
         var filesByNameIgnoreCase = host.useCaseSensitiveFileNames() ? ts.createFileMap(function (fileName) { return fileName.toLowerCase(); }) : undefined;
-        if (oldProgram) {
-            var oldOptions = oldProgram.getCompilerOptions();
-            if ((oldOptions.module !== options.module) ||
-                (oldOptions.noResolve !== options.noResolve) ||
-                (oldOptions.target !== options.target) ||
-                (oldOptions.noLib !== options.noLib) ||
-                (oldOptions.jsx !== options.jsx) ||
-                (oldOptions.allowJs !== options.allowJs)) {
-                oldProgram = undefined;
-            }
-        }
         if (!tryReuseStructureFromOldProgram()) {
+            if (options.types && options.types.length) {
+                var resolutions = resolveTypeReferenceDirectiveNamesWorker(options.types, undefined);
+                for (var i = 0; i < options.types.length; i++) {
+                    processTypeReferenceDirective(options.types[i], resolutions[i]);
+                }
+            }
             ts.forEach(rootNames, function (name) { return processRootFile(name, false); });
             if (!skipDefaultLib) {
-                processRootFile(host.getDefaultLibFileName(options), true);
+                if (!options.lib) {
+                    processRootFile(host.getDefaultLibFileName(options), true);
+                }
+                else {
+                    var libDirectory_1 = host.getDefaultLibLocation ? host.getDefaultLibLocation() : ts.getDirectoryPath(host.getDefaultLibFileName(options));
+                    ts.forEach(options.lib, function (libFileName) {
+                        processRootFile(ts.combinePaths(libDirectory_1, libFileName), true);
+                    });
+                }
             }
         }
         oldProgram = undefined;
@@ -32761,7 +35223,8 @@ var ts;
             getIdentifierCount: function () { return getDiagnosticsProducingTypeChecker().getIdentifierCount(); },
             getSymbolCount: function () { return getDiagnosticsProducingTypeChecker().getSymbolCount(); },
             getTypeCount: function () { return getDiagnosticsProducingTypeChecker().getTypeCount(); },
-            getFileProcessingDiagnostics: function () { return fileProcessingDiagnostics; }
+            getFileProcessingDiagnostics: function () { return fileProcessingDiagnostics; },
+            resolvedTypeReferenceDirectives: resolvedTypeReferenceDirectives
         };
         verifyCompilerOptions();
         ts.programTime += new Date().getTime() - start;
@@ -32795,11 +35258,26 @@ var ts;
             if (!oldProgram) {
                 return false;
             }
+            var oldOptions = oldProgram.getCompilerOptions();
+            if ((oldOptions.module !== options.module) ||
+                (oldOptions.noResolve !== options.noResolve) ||
+                (oldOptions.target !== options.target) ||
+                (oldOptions.noLib !== options.noLib) ||
+                (oldOptions.jsx !== options.jsx) ||
+                (oldOptions.allowJs !== options.allowJs) ||
+                (oldOptions.rootDir !== options.rootDir) ||
+                (oldOptions.typesSearchPaths !== options.typesSearchPaths) ||
+                (oldOptions.configFilePath !== options.configFilePath)) {
+                return false;
+            }
             ts.Debug.assert(!oldProgram.structureIsReused);
             var oldRootNames = oldProgram.getRootFileNames();
             if (!ts.arrayIsEqualTo(oldRootNames, rootNames)) {
                 return false;
             }
+            if (!ts.arrayIsEqualTo(options.types, oldOptions.types)) {
+                return false;
+            }
             var newSourceFiles = [];
             var filePaths = [];
             var modifiedSourceFiles = [];
@@ -32825,23 +35303,28 @@ var ts;
                     if (!ts.arrayIsEqualTo(oldSourceFile.moduleAugmentations, newSourceFile.moduleAugmentations, moduleNameIsEqualTo)) {
                         return false;
                     }
+                    if (!ts.arrayIsEqualTo(oldSourceFile.typeReferenceDirectives, newSourceFile.typeReferenceDirectives, fileReferenceIsEqualTo)) {
+                        return false;
+                    }
+                    var newSourceFilePath = ts.getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory);
                     if (resolveModuleNamesWorker) {
                         var moduleNames = ts.map(ts.concatenate(newSourceFile.imports, newSourceFile.moduleAugmentations), getTextOfLiteral);
-                        var resolutions = resolveModuleNamesWorker(moduleNames, ts.getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory));
-                        for (var i = 0; i < moduleNames.length; i++) {
-                            var newResolution = resolutions[i];
-                            var oldResolution = ts.getResolvedModule(oldSourceFile, moduleNames[i]);
-                            var resolutionChanged = oldResolution
-                                ? !newResolution ||
-                                    oldResolution.resolvedFileName !== newResolution.resolvedFileName ||
-                                    !!oldResolution.isExternalLibraryImport !== !!newResolution.isExternalLibraryImport
-                                : newResolution;
-                            if (resolutionChanged) {
-                                return false;
-                            }
+                        var resolutions = resolveModuleNamesWorker(moduleNames, newSourceFilePath);
+                        var resolutionsChanged = ts.hasChangesInResolutions(moduleNames, resolutions, oldSourceFile.resolvedModules, ts.moduleResolutionIsEqualTo);
+                        if (resolutionsChanged) {
+                            return false;
+                        }
+                    }
+                    if (resolveTypeReferenceDirectiveNamesWorker) {
+                        var typesReferenceDirectives = ts.map(newSourceFile.typeReferenceDirectives, function (x) { return x.fileName; });
+                        var resolutions = resolveTypeReferenceDirectiveNamesWorker(typesReferenceDirectives, newSourceFilePath);
+                        var resolutionsChanged = ts.hasChangesInResolutions(typesReferenceDirectives, resolutions, oldSourceFile.resolvedTypeReferenceDirectiveNames, ts.typeDirectiveIsEqualTo);
+                        if (resolutionsChanged) {
+                            return false;
                         }
                     }
                     newSourceFile.resolvedModules = oldSourceFile.resolvedModules;
+                    newSourceFile.resolvedTypeReferenceDirectiveNames = oldSourceFile.resolvedTypeReferenceDirectiveNames;
                     modifiedSourceFiles.push(newSourceFile);
                 }
                 else {
@@ -32858,6 +35341,7 @@ var ts;
                 var modifiedFile = modifiedSourceFiles_1[_b];
                 fileProcessingDiagnostics.reattachFileDiagnostics(modifiedFile);
             }
+            resolvedTypeReferenceDirectives = oldProgram.resolvedTypeReferenceDirectives;
             oldProgram.structureIsReused = true;
             return true;
         }
@@ -32870,7 +35354,7 @@ var ts;
                 getNewLine: function () { return host.getNewLine(); },
                 getSourceFile: program.getSourceFile,
                 getSourceFiles: program.getSourceFiles,
-                writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError) { return host.writeFile(fileName, data, writeByteOrderMark, onError); }),
+                writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }),
                 isEmitBlocked: isEmitBlocked
             };
         }
@@ -32888,10 +35372,22 @@ var ts;
             return hasEmitBlockingDiagnostics.contains(ts.toPath(emitFileName, currentDirectory, getCanonicalFileName));
         }
         function emitWorker(program, sourceFile, writeFileCallback, cancellationToken) {
+            var declarationDiagnostics = [];
+            if (options.noEmit) {
+                return { diagnostics: declarationDiagnostics, sourceMaps: undefined, emittedFiles: undefined, emitSkipped: true };
+            }
             if (options.noEmitOnError) {
-                var preEmitDiagnostics = getPreEmitDiagnostics(program, undefined, cancellationToken);
-                if (preEmitDiagnostics.length > 0) {
-                    return { diagnostics: preEmitDiagnostics, sourceMaps: undefined, emitSkipped: true };
+                var diagnostics = program.getOptionsDiagnostics(cancellationToken).concat(program.getSyntacticDiagnostics(sourceFile, cancellationToken), program.getGlobalDiagnostics(cancellationToken), program.getSemanticDiagnostics(sourceFile, cancellationToken));
+                if (diagnostics.length === 0 && program.getCompilerOptions().declaration) {
+                    declarationDiagnostics = program.getDeclarationDiagnostics(undefined, cancellationToken);
+                }
+                if (diagnostics.length > 0 || declarationDiagnostics.length > 0) {
+                    return {
+                        diagnostics: ts.concatenate(diagnostics, declarationDiagnostics),
+                        sourceMaps: undefined,
+                        emittedFiles: undefined,
+                        emitSkipped: true
+                    };
                 }
             }
             var emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver((options.outFile || options.out) ? undefined : sourceFile);
@@ -32923,7 +35419,13 @@ var ts;
             return getDiagnosticsHelper(sourceFile, getSemanticDiagnosticsForFile, cancellationToken);
         }
         function getDeclarationDiagnostics(sourceFile, cancellationToken) {
-            return getDiagnosticsHelper(sourceFile, getDeclarationDiagnosticsForFile, cancellationToken);
+            var options = program.getCompilerOptions();
+            if (!sourceFile || options.out || options.outFile) {
+                return getDeclarationDiagnosticsWorker(sourceFile, cancellationToken);
+            }
+            else {
+                return getDiagnosticsHelper(sourceFile, getDeclarationDiagnosticsForFile, cancellationToken);
+            }
         }
         function getSyntacticDiagnosticsForFile(sourceFile, cancellationToken) {
             return sourceFile.parseDiagnostics;
@@ -32963,44 +35465,47 @@ var ts;
                         return false;
                     }
                     switch (node.kind) {
-                        case 224:
+                        case 228:
                             diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 230:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 217:
+                        case 234:
+                            if (node.isExportEquals) {
+                                diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
+                                return true;
+                            }
+                            break;
+                        case 220:
                             var classDeclaration = node;
                             if (checkModifiers(classDeclaration.modifiers) ||
                                 checkTypeParameters(classDeclaration.typeParameters)) {
                                 return true;
                             }
                             break;
-                        case 246:
+                        case 250:
                             var heritageClause = node;
                             if (heritageClause.token === 106) {
                                 diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file));
                                 return true;
                             }
                             break;
-                        case 218:
+                        case 221:
                             diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 221:
+                        case 224:
                             diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.module_declarations_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 219:
+                        case 222:
                             diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.type_aliases_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 144:
-                        case 143:
-                        case 145:
                         case 146:
+                        case 145:
                         case 147:
-                        case 176:
-                        case 216:
-                        case 177:
-                        case 216:
+                        case 148:
+                        case 149:
+                        case 178:
+                        case 219:
+                        case 179:
+                        case 219:
                             var functionDeclaration = node;
                             if (checkModifiers(functionDeclaration.modifiers) ||
                                 checkTypeParameters(functionDeclaration.typeParameters) ||
@@ -33008,20 +35513,20 @@ var ts;
                                 return true;
                             }
                             break;
-                        case 196:
+                        case 199:
                             var variableStatement = node;
                             if (checkModifiers(variableStatement.modifiers)) {
                                 return true;
                             }
                             break;
-                        case 214:
+                        case 217:
                             var variableDeclaration = node;
                             if (checkTypeAnnotation(variableDeclaration.type)) {
                                 return true;
                             }
                             break;
-                        case 171:
-                        case 172:
+                        case 173:
+                        case 174:
                             var expression = node;
                             if (expression.typeArguments && expression.typeArguments.length > 0) {
                                 var start_2 = expression.typeArguments.pos;
@@ -33029,7 +35534,7 @@ var ts;
                                 return true;
                             }
                             break;
-                        case 139:
+                        case 141:
                             var parameter = node;
                             if (parameter.modifiers) {
                                 var start_3 = parameter.modifiers.pos;
@@ -33045,18 +35550,20 @@ var ts;
                                 return true;
                             }
                             break;
-                        case 142:
+                        case 144:
                             diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.property_declarations_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 220:
+                        case 223:
                             diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 174:
+                        case 176:
                             var typeAssertionExpression = node;
                             diagnostics.push(ts.createDiagnosticForNode(typeAssertionExpression.type, ts.Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 140:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.decorators_can_only_be_used_in_a_ts_file));
+                        case 142:
+                            if (!options.experimentalDecorators) {
+                                diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning));
+                            }
                             return true;
                     }
                     return ts.forEachChild(node, walk);
@@ -33084,6 +35591,7 @@ var ts;
                                 case 112:
                                 case 110:
                                 case 111:
+                                case 127:
                                 case 122:
                                     diagnostics.push(ts.createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
                                     return true;
@@ -33099,15 +35607,16 @@ var ts;
                 }
             });
         }
-        function getDeclarationDiagnosticsForFile(sourceFile, cancellationToken) {
+        function getDeclarationDiagnosticsWorker(sourceFile, cancellationToken) {
             return runWithCancellationToken(function () {
-                if (!ts.isDeclarationFile(sourceFile)) {
-                    var resolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile, cancellationToken);
-                    var writeFile_1 = function () { };
-                    return ts.getDeclarationDiagnostics(getEmitHost(writeFile_1), resolver, sourceFile);
-                }
+                var resolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile, cancellationToken);
+                var writeFile = function () { };
+                return ts.getDeclarationDiagnostics(getEmitHost(writeFile), resolver, sourceFile);
             });
         }
+        function getDeclarationDiagnosticsForFile(sourceFile, cancellationToken) {
+            return ts.isDeclarationFile(sourceFile) ? [] : getDeclarationDiagnosticsWorker(sourceFile, cancellationToken);
+        }
         function getOptionsDiagnostics() {
             var allDiagnostics = [];
             ts.addRange(allDiagnostics, fileProcessingDiagnostics.getGlobalDiagnostics());
@@ -33123,7 +35632,7 @@ var ts;
             return ts.getBaseFileName(fileName).indexOf(".") >= 0;
         }
         function processRootFile(fileName, isDefaultLib) {
-            processSourceFile(ts.normalizePath(fileName), isDefaultLib);
+            processSourceFile(ts.normalizePath(fileName), isDefaultLib, true);
         }
         function fileReferenceIsEqualTo(a, b) {
             return a.fileName === b.fileName;
@@ -33154,9 +35663,9 @@ var ts;
             return;
             function collectModuleReferences(node, inAmbientModule) {
                 switch (node.kind) {
-                    case 225:
-                    case 224:
-                    case 231:
+                    case 229:
+                    case 228:
+                    case 235:
                         var moduleNameExpr = ts.getExternalModuleName(node);
                         if (!moduleNameExpr || moduleNameExpr.kind !== 9) {
                             break;
@@ -33168,8 +35677,8 @@ var ts;
                             (imports || (imports = [])).push(moduleNameExpr);
                         }
                         break;
-                    case 221:
-                        if (ts.isAmbientModule(node) && (inAmbientModule || node.flags & 4 || ts.isDeclarationFile(file))) {
+                    case 224:
+                        if (ts.isAmbientModule(node) && (inAmbientModule || node.flags & 2 || ts.isDeclarationFile(file))) {
                             var moduleName = node.name;
                             if (isExternalModuleFile || (inAmbientModule && !ts.isExternalModuleNameRelative(moduleName.text))) {
                                 (moduleAugmentations || (moduleAugmentations = [])).push(moduleName);
@@ -33184,7 +35693,7 @@ var ts;
                 }
             }
             function collectRequireCalls(node) {
-                if (ts.isRequireCall(node)) {
+                if (ts.isRequireCall(node, true)) {
                     (imports || (imports = [])).push(node.arguments[0]);
                 }
                 else {
@@ -33192,7 +35701,7 @@ var ts;
                 }
             }
         }
-        function processSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd) {
+        function processSourceFile(fileName, isDefaultLib, isReference, refFile, refPos, refEnd) {
             var diagnosticArgument;
             var diagnostic;
             if (hasExtension(fileName)) {
@@ -33200,7 +35709,7 @@ var ts;
                     diagnostic = ts.Diagnostics.File_0_has_unsupported_extension_The_only_supported_extensions_are_1;
                     diagnosticArgument = [fileName, "'" + supportedExtensions.join("', '") + "'"];
                 }
-                else if (!findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd)) {
+                else if (!findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, isReference, refFile, refPos, refEnd)) {
                     diagnostic = ts.Diagnostics.File_0_not_found;
                     diagnosticArgument = [fileName];
                 }
@@ -33210,13 +35719,13 @@ var ts;
                 }
             }
             else {
-                var nonTsFile = options.allowNonTsExtensions && findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd);
+                var nonTsFile = options.allowNonTsExtensions && findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, isReference, refFile, refPos, refEnd);
                 if (!nonTsFile) {
                     if (options.allowNonTsExtensions) {
                         diagnostic = ts.Diagnostics.File_0_not_found;
                         diagnosticArgument = [fileName];
                     }
-                    else if (!ts.forEach(supportedExtensions, function (extension) { return findSourceFile(fileName + extension, ts.toPath(fileName + extension, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd); })) {
+                    else if (!ts.forEach(supportedExtensions, function (extension) { return findSourceFile(fileName + extension, ts.toPath(fileName + extension, currentDirectory, getCanonicalFileName), isDefaultLib, isReference, refFile, refPos, refEnd); })) {
                         diagnostic = ts.Diagnostics.File_0_not_found;
                         fileName += ".ts";
                         diagnosticArgument = [fileName];
@@ -33240,12 +35749,15 @@ var ts;
                 fileProcessingDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, existingFileName));
             }
         }
-        function findSourceFile(fileName, path, isDefaultLib, refFile, refPos, refEnd) {
+        function findSourceFile(fileName, path, isDefaultLib, isReference, refFile, refPos, refEnd) {
             if (filesByName.contains(path)) {
                 var file_1 = filesByName.get(path);
                 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) {
+                    file_1.wasReferenced = file_1.wasReferenced || isReference;
+                }
                 return file_1;
             }
             var file = host.getSourceFile(fileName, options.target, function (hostErrorMessage) {
@@ -33258,6 +35770,7 @@ var ts;
             });
             filesByName.set(path, file);
             if (file) {
+                file.wasReferenced = file.wasReferenced || isReference;
                 file.path = path;
                 if (host.useCaseSensitiveFileNames()) {
                     var existingFile = filesByNameIgnoreCase.get(path);
@@ -33271,7 +35784,8 @@ var ts;
                 skipDefaultLib = skipDefaultLib || file.hasNoDefaultLib;
                 var basePath = ts.getDirectoryPath(fileName);
                 if (!options.noResolve) {
-                    processReferencedFiles(file, basePath);
+                    processReferencedFiles(file, basePath, isDefaultLib);
+                    processTypeReferenceDirectives(file);
                 }
                 processImportedModules(file, basePath);
                 if (isDefaultLib) {
@@ -33283,12 +35797,64 @@ var ts;
             }
             return file;
         }
-        function processReferencedFiles(file, basePath) {
+        function processReferencedFiles(file, basePath, isDefaultLib) {
             ts.forEach(file.referencedFiles, function (ref) {
                 var referencedFileName = resolveTripleslashReference(ref.fileName, file.fileName);
-                processSourceFile(referencedFileName, false, file, ref.pos, ref.end);
+                processSourceFile(referencedFileName, isDefaultLib, true, file, ref.pos, ref.end);
             });
         }
+        function processTypeReferenceDirectives(file) {
+            var typeDirectives = ts.map(file.typeReferenceDirectives, function (l) { return l.fileName; });
+            var resolutions = resolveTypeReferenceDirectiveNamesWorker(typeDirectives, file.fileName);
+            for (var i = 0; i < typeDirectives.length; i++) {
+                var ref = file.typeReferenceDirectives[i];
+                var resolvedTypeReferenceDirective = resolutions[i];
+                ts.setResolvedTypeReferenceDirective(file, ref.fileName, resolvedTypeReferenceDirective);
+                processTypeReferenceDirective(ref.fileName, resolvedTypeReferenceDirective, file, ref.pos, ref.end);
+            }
+        }
+        function processTypeReferenceDirective(typeReferenceDirective, resolvedTypeReferenceDirective, refFile, refPos, refEnd) {
+            var previousResolution = resolvedTypeReferenceDirectives[typeReferenceDirective];
+            if (previousResolution && previousResolution.primary) {
+                return;
+            }
+            var saveResolution = true;
+            if (resolvedTypeReferenceDirective) {
+                if (resolvedTypeReferenceDirective.primary) {
+                    processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, false, true, refFile, refPos, refEnd);
+                }
+                else {
+                    if (previousResolution) {
+                        var otherFileText = host.readFile(resolvedTypeReferenceDirective.resolvedFileName);
+                        if (otherFileText !== getSourceFile(previousResolution.resolvedFileName).text) {
+                            fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd, ts.Diagnostics.Conflicting_library_definitions_for_0_found_at_1_and_2_Copy_the_correct_file_to_the_typings_folder_to_resolve_this_conflict, typeReferenceDirective, resolvedTypeReferenceDirective.resolvedFileName, previousResolution.resolvedFileName));
+                        }
+                        saveResolution = false;
+                    }
+                    else {
+                        processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, false, true, refFile, refPos, refEnd);
+                    }
+                }
+            }
+            else {
+                fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd, ts.Diagnostics.Cannot_find_name_0, typeReferenceDirective));
+            }
+            if (saveResolution) {
+                resolvedTypeReferenceDirectives[typeReferenceDirective] = resolvedTypeReferenceDirective;
+            }
+        }
+        function createDiagnostic(refFile, refPos, refEnd, message) {
+            var args = [];
+            for (var _i = 4; _i < arguments.length; _i++) {
+                args[_i - 4] = arguments[_i];
+            }
+            if (refFile === undefined || refPos === undefined || refEnd === undefined) {
+                return ts.createCompilerDiagnostic.apply(void 0, [message].concat(args));
+            }
+            else {
+                return ts.createFileDiagnostic.apply(void 0, [refFile, refPos, refEnd - refPos, message].concat(args));
+            }
+        }
         function getCanonicalFileName(fileName) {
             return host.getCanonicalFileName(fileName);
         }
@@ -33305,9 +35871,9 @@ var ts;
                         !options.noResolve &&
                         i < file.imports.length;
                     if (shouldAddFile) {
-                        var importedFile = findSourceFile(resolution.resolvedFileName, ts.toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), false, file, ts.skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
+                        var importedFile = findSourceFile(resolution.resolvedFileName, ts.toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), false, false, file, ts.skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
                         if (importedFile && resolution.isExternalLibraryImport) {
-                            if (!ts.isExternalModule(importedFile)) {
+                            if (!ts.isExternalModule(importedFile) && importedFile.statements.length) {
                                 var start_5 = ts.getTokenPosOfNode(file.imports[i], file);
                                 fileProcessingDiagnostics.add(ts.createFileDiagnostic(file, start_5, file.imports[i].end - start_5, ts.Diagnostics.Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition, importedFile.fileName));
                             }
@@ -33325,44 +35891,21 @@ var ts;
             return;
         }
         function computeCommonSourceDirectory(sourceFiles) {
-            var commonPathComponents;
-            var failed = ts.forEach(files, function (sourceFile) {
-                if (ts.isDeclarationFile(sourceFile)) {
-                    return;
+            var fileNames = [];
+            for (var _i = 0, sourceFiles_2 = sourceFiles; _i < sourceFiles_2.length; _i++) {
+                var file = sourceFiles_2[_i];
+                if (!file.isDeclarationFile) {
+                    fileNames.push(file.fileName);
                 }
-                var sourcePathComponents = ts.getNormalizedPathComponents(sourceFile.fileName, currentDirectory);
-                sourcePathComponents.pop();
-                if (!commonPathComponents) {
-                    commonPathComponents = sourcePathComponents;
-                    return;
-                }
-                for (var i = 0, n = Math.min(commonPathComponents.length, sourcePathComponents.length); i < n; i++) {
-                    if (getCanonicalFileName(commonPathComponents[i]) !== getCanonicalFileName(sourcePathComponents[i])) {
-                        if (i === 0) {
-                            return true;
-                        }
-                        commonPathComponents.length = i;
-                        break;
-                    }
-                }
-                if (sourcePathComponents.length < commonPathComponents.length) {
-                    commonPathComponents.length = sourcePathComponents.length;
-                }
-            });
-            if (failed) {
-                return "";
             }
-            if (!commonPathComponents) {
-                return currentDirectory;
-            }
-            return ts.getNormalizedPathFromPathComponents(commonPathComponents);
+            return computeCommonSourceDirectoryOfFilenames(fileNames, currentDirectory, getCanonicalFileName);
         }
         function checkSourceFilesBelongToPath(sourceFiles, rootDirectory) {
             var allFilesBelongToPath = true;
             if (sourceFiles) {
                 var absoluteRootDirectoryPath = host.getCanonicalFileName(ts.getNormalizedAbsolutePath(rootDirectory, currentDirectory));
-                for (var _i = 0, sourceFiles_2 = sourceFiles; _i < sourceFiles_2.length; _i++) {
-                    var sourceFile = sourceFiles_2[_i];
+                for (var _i = 0, sourceFiles_3 = sourceFiles; _i < sourceFiles_3.length; _i++) {
+                    var sourceFile = sourceFiles_3[_i];
                     if (!ts.isDeclarationFile(sourceFile)) {
                         var absoluteSourceFilePath = host.getCanonicalFileName(ts.getNormalizedAbsolutePath(sourceFile.fileName, currentDirectory));
                         if (absoluteSourceFilePath.indexOf(absoluteRootDirectoryPath) !== 0) {
@@ -33397,6 +35940,25 @@ var ts;
                     programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "mapRoot", "inlineSourceMap"));
                 }
             }
+            if (options.paths && options.baseUrl === undefined) {
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_paths_cannot_be_used_without_specifying_baseUrl_option));
+            }
+            if (options.paths) {
+                for (var key in options.paths) {
+                    if (!ts.hasProperty(options.paths, key)) {
+                        continue;
+                    }
+                    if (!hasZeroOrOneAsteriskCharacter(key)) {
+                        programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Pattern_0_can_have_at_most_one_Asterisk_character, key));
+                    }
+                    for (var _i = 0, _a = options.paths[key]; _i < _a.length; _i++) {
+                        var subst = _a[_i];
+                        if (!hasZeroOrOneAsteriskCharacter(subst)) {
+                            programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character, subst, key));
+                        }
+                    }
+                }
+            }
             if (options.inlineSources) {
                 if (!options.sourceMap && !options.inlineSourceMap) {
                     programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_inlineSources_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_provided));
@@ -33416,11 +35978,22 @@ var ts;
                     programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "sourceRoot", "sourceMap"));
                 }
             }
+            if (options.declarationDir) {
+                if (!options.declaration) {
+                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "declarationDir", "declaration"));
+                }
+                if (options.out || options.outFile) {
+                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "declarationDir", options.out ? "out" : "outFile"));
+                }
+            }
+            if (options.lib && options.noLib) {
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "lib", "noLib"));
+            }
             var languageVersion = options.target || 0;
             var outFile = options.outFile || options.out;
             var firstExternalModuleSourceFile = ts.forEach(files, function (f) { return ts.isExternalModule(f) ? f : undefined; });
             if (options.isolatedModules) {
-                if (!options.module && languageVersion < 2) {
+                if (options.module === ts.ModuleKind.None && languageVersion < 2) {
                     programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher));
                 }
                 var firstNonExternalModuleSourceFile = ts.forEach(files, function (f) { return !ts.isExternalModule(f) && !ts.isDeclarationFile(f) ? f : undefined; });
@@ -33429,14 +36002,14 @@ var ts;
                     programDiagnostics.add(ts.createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided));
                 }
             }
-            else if (firstExternalModuleSourceFile && languageVersion < 2 && !options.module) {
+            else if (firstExternalModuleSourceFile && languageVersion < 2 && options.module === ts.ModuleKind.None) {
                 var span = ts.getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator);
-                programDiagnostics.add(ts.createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_modules_unless_the_module_flag_is_provided_Consider_setting_the_module_compiler_option_in_a_tsconfig_json_file));
+                programDiagnostics.add(ts.createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_modules_unless_the_module_flag_is_provided_with_a_valid_module_type_Consider_setting_the_module_compiler_option_in_a_tsconfig_json_file));
             }
-            if (options.module === 5 && languageVersion < 2) {
+            if (options.module === ts.ModuleKind.ES6 && languageVersion < 2) {
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_compile_modules_into_es2015_when_targeting_ES5_or_lower));
             }
-            if (outFile && options.module && !(options.module === 2 || options.module === 4)) {
+            if (outFile && options.module && !(options.module === ts.ModuleKind.AMD || options.module === ts.ModuleKind.System)) {
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Only_amd_and_system_modules_are_supported_alongside_0, options.out ? "out" : "outFile"));
             }
             if (options.outDir ||
@@ -33447,21 +36020,7 @@ var ts;
                     programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_find_the_common_subdirectory_path_for_the_input_files));
                 }
             }
-            if (options.noEmit) {
-                if (options.out) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "out"));
-                }
-                if (options.outFile) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "outFile"));
-                }
-                if (options.outDir) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "outDir"));
-                }
-                if (options.declaration) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "declaration"));
-                }
-            }
-            else if (options.allowJs && options.declaration) {
+            if (!options.noEmit && options.allowJs && options.declaration) {
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "allowJs", "declaration"));
             }
             if (options.emitDecoratorMetadata &&
@@ -33469,14 +36028,14 @@ var ts;
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "emitDecoratorMetadata", "experimentalDecorators"));
             }
             if (options.reactNamespace && !ts.isIdentifier(options.reactNamespace, languageVersion)) {
-                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Invalide_value_for_reactNamespace_0_is_not_a_valid_identifier, options.reactNamespace));
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier, options.reactNamespace));
             }
-            if (!options.noEmit) {
+            if (!options.noEmit && !options.suppressOutputPathCheck) {
                 var emitHost = getEmitHost();
-                var emitFilesSeen = ts.createFileMap(!host.useCaseSensitiveFileNames() ? function (key) { return key.toLocaleLowerCase(); } : undefined);
+                var emitFilesSeen_1 = ts.createFileMap(!host.useCaseSensitiveFileNames() ? function (key) { return key.toLocaleLowerCase(); } : undefined);
                 ts.forEachExpectedEmitFile(emitHost, function (emitFileNames, sourceFiles, isBundledEmit) {
-                    verifyEmitFilePath(emitFileNames.jsFilePath, emitFilesSeen);
-                    verifyEmitFilePath(emitFileNames.declarationFilePath, emitFilesSeen);
+                    verifyEmitFilePath(emitFileNames.jsFilePath, emitFilesSeen_1);
+                    verifyEmitFilePath(emitFileNames.declarationFilePath, emitFilesSeen_1);
                 });
             }
             function verifyEmitFilePath(emitFileName, emitFilesSeen) {
@@ -33506,7 +36065,7 @@ var ts;
     var BreakpointResolver;
     (function (BreakpointResolver) {
         function spanInSourceFileAtLocation(sourceFile, position) {
-            if (sourceFile.flags & 4096) {
+            if (sourceFile.isDeclarationFile) {
                 return undefined;
             }
             var tokenAtLocation = ts.getTokenAtPosition(sourceFile, position);
@@ -33548,89 +36107,89 @@ var ts;
             function spanInNode(node) {
                 if (node) {
                     switch (node.kind) {
-                        case 196:
+                        case 199:
                             return spanInVariableDeclaration(node.declarationList.declarations[0]);
-                        case 214:
-                        case 142:
-                        case 141:
-                            return spanInVariableDeclaration(node);
-                        case 139:
-                            return spanInParameterDeclaration(node);
-                        case 216:
+                        case 217:
                         case 144:
                         case 143:
+                            return spanInVariableDeclaration(node);
+                        case 141:
+                            return spanInParameterDeclaration(node);
+                        case 219:
                         case 146:
-                        case 147:
                         case 145:
-                        case 176:
-                        case 177:
+                        case 148:
+                        case 149:
+                        case 147:
+                        case 178:
+                        case 179:
                             return spanInFunctionDeclaration(node);
-                        case 195:
+                        case 198:
                             if (ts.isFunctionBlock(node)) {
                                 return spanInFunctionBlock(node);
                             }
-                        case 222:
-                            return spanInBlock(node);
-                        case 247:
-                            return spanInBlock(node.block);
-                        case 198:
-                            return textSpan(node.expression);
-                        case 207:
-                            return textSpan(node.getChildAt(0), node.expression);
-                        case 201:
-                            return textSpanEndingAtNextToken(node, node.expression);
-                        case 200:
-                            return spanInNode(node.statement);
-                        case 213:
-                            return textSpan(node.getChildAt(0));
-                        case 199:
-                            return textSpanEndingAtNextToken(node, node.expression);
-                        case 210:
-                            return spanInNode(node.statement);
-                        case 206:
-                        case 205:
-                            return textSpan(node.getChildAt(0), node.label);
-                        case 202:
-                            return spanInForStatement(node);
-                        case 203:
-                            return textSpanEndingAtNextToken(node, node.expression);
-                        case 204:
-                            return spanInInitializerOfForLike(node);
-                        case 209:
-                            return textSpanEndingAtNextToken(node, node.expression);
-                        case 244:
-                        case 245:
-                            return spanInNode(node.statements[0]);
-                        case 212:
-                            return spanInBlock(node.tryBlock);
-                        case 211:
-                            return textSpan(node, node.expression);
-                        case 230:
-                            return textSpan(node, node.expression);
-                        case 224:
-                            return textSpan(node, node.moduleReference);
                         case 225:
+                            return spanInBlock(node);
+                        case 251:
+                            return spanInBlock(node.block);
+                        case 201:
+                            return textSpan(node.expression);
+                        case 210:
+                            return textSpan(node.getChildAt(0), node.expression);
+                        case 204:
+                            return textSpanEndingAtNextToken(node, node.expression);
+                        case 203:
+                            return spanInNode(node.statement);
+                        case 216:
+                            return textSpan(node.getChildAt(0));
+                        case 202:
+                            return textSpanEndingAtNextToken(node, node.expression);
+                        case 213:
+                            return spanInNode(node.statement);
+                        case 209:
+                        case 208:
+                            return textSpan(node.getChildAt(0), node.label);
+                        case 205:
+                            return spanInForStatement(node);
+                        case 206:
+                            return textSpanEndingAtNextToken(node, node.expression);
+                        case 207:
+                            return spanInInitializerOfForLike(node);
+                        case 212:
+                            return textSpanEndingAtNextToken(node, node.expression);
+                        case 248:
+                        case 249:
+                            return spanInNode(node.statements[0]);
+                        case 215:
+                            return spanInBlock(node.tryBlock);
+                        case 214:
+                            return textSpan(node, node.expression);
+                        case 234:
+                            return textSpan(node, node.expression);
+                        case 228:
+                            return textSpan(node, node.moduleReference);
+                        case 229:
                             return textSpan(node, node.moduleSpecifier);
-                        case 231:
+                        case 235:
                             return textSpan(node, node.moduleSpecifier);
-                        case 221:
+                        case 224:
                             if (ts.getModuleInstanceState(node) !== 1) {
                                 return undefined;
                             }
-                        case 217:
                         case 220:
-                        case 250:
-                        case 166:
+                        case 223:
+                        case 254:
+                        case 168:
                             return textSpan(node);
-                        case 208:
+                        case 211:
                             return spanInNode(node.statement);
-                        case 140:
+                        case 142:
                             return spanInNodeArray(node.parent.decorators);
-                        case 164:
-                        case 165:
+                        case 166:
+                        case 167:
                             return spanInBindingPattern(node);
-                        case 218:
-                        case 219:
+                        case 221:
+                        case 222:
                             return undefined;
                         case 23:
                         case 1:
@@ -33658,20 +36217,20 @@ var ts;
                         case 72:
                         case 85:
                             return spanInNextNode(node);
-                        case 135:
+                        case 137:
                             return spanInOfKeyword(node);
                         default:
                             if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node)) {
                                 return spanInArrayLiteralOrObjectLiteralDestructuringPattern(node);
                             }
                             if ((node.kind === 69 ||
-                                node.kind == 188 ||
-                                node.kind === 248 ||
-                                node.kind === 249) &&
+                                node.kind == 190 ||
+                                node.kind === 252 ||
+                                node.kind === 253) &&
                                 ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent)) {
                                 return textSpan(node);
                             }
-                            if (node.kind === 184) {
+                            if (node.kind === 186) {
                                 var binaryExpression = node;
                                 if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(binaryExpression.left)) {
                                     return spanInArrayLiteralOrObjectLiteralDestructuringPattern(binaryExpression.left);
@@ -33686,38 +36245,38 @@ var ts;
                             }
                             if (ts.isExpression(node)) {
                                 switch (node.parent.kind) {
-                                    case 200:
+                                    case 203:
                                         return spanInPreviousNode(node);
-                                    case 140:
+                                    case 142:
                                         return spanInNode(node.parent);
-                                    case 202:
-                                    case 204:
+                                    case 205:
+                                    case 207:
                                         return textSpan(node);
-                                    case 184:
+                                    case 186:
                                         if (node.parent.operatorToken.kind === 24) {
                                             return textSpan(node);
                                         }
                                         break;
-                                    case 177:
+                                    case 179:
                                         if (node.parent.body === node) {
                                             return textSpan(node);
                                         }
                                         break;
                                 }
                             }
-                            if (node.parent.kind === 248 &&
+                            if (node.parent.kind === 252 &&
                                 node.parent.name === node &&
                                 !ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.parent)) {
                                 return spanInNode(node.parent.initializer);
                             }
-                            if (node.parent.kind === 174 && node.parent.type === node) {
+                            if (node.parent.kind === 176 && node.parent.type === node) {
                                 return spanInNextNode(node.parent.type);
                             }
                             if (ts.isFunctionLike(node.parent) && node.parent.type === node) {
                                 return spanInPreviousNode(node);
                             }
-                            if ((node.parent.kind === 214 ||
-                                node.parent.kind === 139)) {
+                            if ((node.parent.kind === 217 ||
+                                node.parent.kind === 141)) {
                                 var paramOrVarDecl = node.parent;
                                 if (paramOrVarDecl.initializer === node ||
                                     paramOrVarDecl.type === node ||
@@ -33725,7 +36284,7 @@ var ts;
                                     return spanInPreviousNode(node);
                                 }
                             }
-                            if (node.parent.kind === 184) {
+                            if (node.parent.kind === 186) {
                                 var binaryExpression = node.parent;
                                 if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(binaryExpression.left) &&
                                     (binaryExpression.right === node ||
@@ -33746,15 +36305,15 @@ var ts;
                     }
                 }
                 function spanInVariableDeclaration(variableDeclaration) {
-                    if (variableDeclaration.parent.parent.kind === 203) {
+                    if (variableDeclaration.parent.parent.kind === 206) {
                         return spanInNode(variableDeclaration.parent.parent);
                     }
                     if (ts.isBindingPattern(variableDeclaration.name)) {
                         return spanInBindingPattern(variableDeclaration.name);
                     }
                     if (variableDeclaration.initializer ||
-                        (variableDeclaration.flags & 2) ||
-                        variableDeclaration.parent.parent.kind === 204) {
+                        (variableDeclaration.flags & 1) ||
+                        variableDeclaration.parent.parent.kind === 207) {
                         return textSpanFromVariableDeclaration(variableDeclaration);
                     }
                     var declarations = variableDeclaration.parent.declarations;
@@ -33764,7 +36323,7 @@ var ts;
                 }
                 function canHaveSpanInParameterDeclaration(parameter) {
                     return !!parameter.initializer || parameter.dotDotDotToken !== undefined ||
-                        !!(parameter.flags & 8) || !!(parameter.flags & 16);
+                        !!(parameter.flags & 4) || !!(parameter.flags & 8);
                 }
                 function spanInParameterDeclaration(parameter) {
                     if (ts.isBindingPattern(parameter.name)) {
@@ -33785,8 +36344,8 @@ var ts;
                     }
                 }
                 function canFunctionHaveSpanInWholeDeclaration(functionDeclaration) {
-                    return !!(functionDeclaration.flags & 2) ||
-                        (functionDeclaration.parent.kind === 217 && functionDeclaration.kind !== 145);
+                    return !!(functionDeclaration.flags & 1) ||
+                        (functionDeclaration.parent.kind === 220 && functionDeclaration.kind !== 147);
                 }
                 function spanInFunctionDeclaration(functionDeclaration) {
                     if (!functionDeclaration.body) {
@@ -33806,29 +36365,29 @@ var ts;
                 }
                 function spanInBlock(block) {
                     switch (block.parent.kind) {
-                        case 221:
+                        case 224:
                             if (ts.getModuleInstanceState(block.parent) !== 1) {
                                 return undefined;
                             }
-                        case 201:
-                        case 199:
-                        case 203:
-                            return spanInNodeIfStartsOnSameLine(block.parent, block.statements[0]);
-                        case 202:
                         case 204:
+                        case 202:
+                        case 206:
+                            return spanInNodeIfStartsOnSameLine(block.parent, block.statements[0]);
+                        case 205:
+                        case 207:
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(block.pos, sourceFile, block.parent), block.statements[0]);
                     }
                     return spanInNode(block.statements[0]);
                 }
-                function spanInInitializerOfForLike(forLikeStaement) {
-                    if (forLikeStaement.initializer.kind === 215) {
-                        var variableDeclarationList = forLikeStaement.initializer;
+                function spanInInitializerOfForLike(forLikeStatement) {
+                    if (forLikeStatement.initializer.kind === 218) {
+                        var variableDeclarationList = forLikeStatement.initializer;
                         if (variableDeclarationList.declarations.length > 0) {
                             return spanInNode(variableDeclarationList.declarations[0]);
                         }
                     }
                     else {
-                        return spanInNode(forLikeStaement.initializer);
+                        return spanInNode(forLikeStatement.initializer);
                     }
                 }
                 function spanInForStatement(forStatement) {
@@ -33843,62 +36402,62 @@ var ts;
                     }
                 }
                 function spanInBindingPattern(bindingPattern) {
-                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 190 ? element : undefined; });
+                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 192 ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
-                    if (bindingPattern.parent.kind === 166) {
+                    if (bindingPattern.parent.kind === 168) {
                         return textSpan(bindingPattern.parent);
                     }
                     return textSpanFromVariableDeclaration(bindingPattern.parent);
                 }
                 function spanInArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-                    ts.Debug.assert(node.kind !== 165 && node.kind !== 164);
-                    var elements = node.kind === 167 ?
+                    ts.Debug.assert(node.kind !== 167 && node.kind !== 166);
+                    var elements = node.kind === 169 ?
                         node.elements :
                         node.properties;
-                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 190 ? element : undefined; });
+                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 192 ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
-                    return textSpan(node.parent.kind === 184 ? node.parent : node);
+                    return textSpan(node.parent.kind === 186 ? node.parent : node);
                 }
                 function spanInOpenBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 220:
+                        case 223:
                             var enumDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), enumDeclaration.members.length ? enumDeclaration.members[0] : enumDeclaration.getLastToken(sourceFile));
-                        case 217:
+                        case 220:
                             var classDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), classDeclaration.members.length ? classDeclaration.members[0] : classDeclaration.getLastToken(sourceFile));
-                        case 223:
+                        case 226:
                             return spanInNodeIfStartsOnSameLine(node.parent.parent, node.parent.clauses[0]);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInCloseBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 222:
+                        case 225:
                             if (ts.getModuleInstanceState(node.parent.parent) !== 1) {
                                 return undefined;
                             }
+                        case 223:
                         case 220:
-                        case 217:
                             return textSpan(node);
-                        case 195:
+                        case 198:
                             if (ts.isFunctionBlock(node.parent)) {
                                 return textSpan(node);
                             }
-                        case 247:
+                        case 251:
                             return spanInNode(ts.lastOrUndefined(node.parent.statements));
-                        case 223:
+                        case 226:
                             var caseBlock = node.parent;
                             var lastClause = ts.lastOrUndefined(caseBlock.clauses);
                             if (lastClause) {
                                 return spanInNode(ts.lastOrUndefined(lastClause.statements));
                             }
                             return undefined;
-                        case 164:
+                        case 166:
                             var bindingPattern = node.parent;
                             return spanInNode(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern);
                         default:
@@ -33911,7 +36470,7 @@ var ts;
                 }
                 function spanInCloseBracketToken(node) {
                     switch (node.parent.kind) {
-                        case 165:
+                        case 167:
                             var bindingPattern = node.parent;
                             return textSpan(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern);
                         default:
@@ -33923,33 +36482,33 @@ var ts;
                     }
                 }
                 function spanInOpenParenToken(node) {
-                    if (node.parent.kind === 200 ||
-                        node.parent.kind === 171 ||
-                        node.parent.kind === 172) {
+                    if (node.parent.kind === 203 ||
+                        node.parent.kind === 173 ||
+                        node.parent.kind === 174) {
                         return spanInPreviousNode(node);
                     }
-                    if (node.parent.kind === 175) {
+                    if (node.parent.kind === 177) {
                         return spanInNextNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInCloseParenToken(node) {
                     switch (node.parent.kind) {
-                        case 176:
-                        case 216:
-                        case 177:
-                        case 144:
-                        case 143:
+                        case 178:
+                        case 219:
+                        case 179:
                         case 146:
-                        case 147:
                         case 145:
-                        case 201:
-                        case 200:
-                        case 202:
+                        case 148:
+                        case 149:
+                        case 147:
                         case 204:
-                        case 171:
-                        case 172:
-                        case 175:
+                        case 203:
+                        case 205:
+                        case 207:
+                        case 173:
+                        case 174:
+                        case 177:
                             return spanInPreviousNode(node);
                         default:
                             return spanInNode(node.parent);
@@ -33957,26 +36516,26 @@ var ts;
                 }
                 function spanInColonToken(node) {
                     if (ts.isFunctionLike(node.parent) ||
-                        node.parent.kind === 248 ||
-                        node.parent.kind === 139) {
+                        node.parent.kind === 252 ||
+                        node.parent.kind === 141) {
                         return spanInPreviousNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInGreaterThanOrLessThanToken(node) {
-                    if (node.parent.kind === 174) {
+                    if (node.parent.kind === 176) {
                         return spanInNextNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInWhileKeyword(node) {
-                    if (node.parent.kind === 200) {
+                    if (node.parent.kind === 203) {
                         return textSpanEndingAtNextToken(node, node.parent.expression);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInOfKeyword(node) {
-                    if (node.parent.kind === 204) {
+                    if (node.parent.kind === 207) {
                         return spanInNextNode(node);
                     }
                     return spanInNode(node.parent);
@@ -34054,7 +36613,7 @@ var ts;
                 }
             }
             function autoCollapse(node) {
-                return ts.isFunctionBlock(node) && node.parent.kind !== 177;
+                return ts.isFunctionBlock(node) && node.parent.kind !== 179;
             }
             var depth = 0;
             var maxDepth = 20;
@@ -34066,26 +36625,26 @@ var ts;
                     addOutliningForLeadingCommentsForNode(n);
                 }
                 switch (n.kind) {
-                    case 195:
+                    case 198:
                         if (!ts.isFunctionBlock(n)) {
-                            var parent_8 = n.parent;
+                            var parent_11 = n.parent;
                             var openBrace = ts.findChildOfKind(n, 15, sourceFile);
                             var closeBrace = ts.findChildOfKind(n, 16, sourceFile);
-                            if (parent_8.kind === 200 ||
-                                parent_8.kind === 203 ||
-                                parent_8.kind === 204 ||
-                                parent_8.kind === 202 ||
-                                parent_8.kind === 199 ||
-                                parent_8.kind === 201 ||
-                                parent_8.kind === 208 ||
-                                parent_8.kind === 247) {
-                                addOutliningSpan(parent_8, openBrace, closeBrace, autoCollapse(n));
+                            if (parent_11.kind === 203 ||
+                                parent_11.kind === 206 ||
+                                parent_11.kind === 207 ||
+                                parent_11.kind === 205 ||
+                                parent_11.kind === 202 ||
+                                parent_11.kind === 204 ||
+                                parent_11.kind === 211 ||
+                                parent_11.kind === 251) {
+                                addOutliningSpan(parent_11, openBrace, closeBrace, autoCollapse(n));
                                 break;
                             }
-                            if (parent_8.kind === 212) {
-                                var tryStatement = parent_8;
+                            if (parent_11.kind === 215) {
+                                var tryStatement = parent_11;
                                 if (tryStatement.tryBlock === n) {
-                                    addOutliningSpan(parent_8, openBrace, closeBrace, autoCollapse(n));
+                                    addOutliningSpan(parent_11, openBrace, closeBrace, autoCollapse(n));
                                     break;
                                 }
                                 else if (tryStatement.finallyBlock === n) {
@@ -34105,23 +36664,23 @@ var ts;
                             });
                             break;
                         }
-                    case 222: {
+                    case 225: {
                         var openBrace = ts.findChildOfKind(n, 15, sourceFile);
                         var closeBrace = ts.findChildOfKind(n, 16, sourceFile);
                         addOutliningSpan(n.parent, openBrace, closeBrace, autoCollapse(n));
                         break;
                     }
-                    case 217:
-                    case 218:
                     case 220:
-                    case 168:
-                    case 223: {
+                    case 221:
+                    case 223:
+                    case 170:
+                    case 226: {
                         var openBrace = ts.findChildOfKind(n, 15, sourceFile);
                         var closeBrace = ts.findChildOfKind(n, 16, sourceFile);
                         addOutliningSpan(n, openBrace, closeBrace, autoCollapse(n));
                         break;
                     }
-                    case 167:
+                    case 169:
                         var openBracket = ts.findChildOfKind(n, 19, sourceFile);
                         var closeBracket = ts.findChildOfKind(n, 20, sourceFile);
                         addOutliningSpan(n, openBracket, closeBracket, autoCollapse(n));
@@ -34148,28 +36707,28 @@ var ts;
             ts.forEach(program.getSourceFiles(), function (sourceFile) {
                 cancellationToken.throwIfCancellationRequested();
                 var nameToDeclarations = sourceFile.getNamedDeclarations();
-                for (var name_31 in nameToDeclarations) {
-                    var declarations = ts.getProperty(nameToDeclarations, name_31);
+                for (var name_34 in nameToDeclarations) {
+                    var declarations = ts.getProperty(nameToDeclarations, name_34);
                     if (declarations) {
-                        var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_31);
+                        var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_34);
                         if (!matches) {
                             continue;
                         }
-                        for (var _i = 0, declarations_6 = declarations; _i < declarations_6.length; _i++) {
-                            var declaration = declarations_6[_i];
+                        for (var _i = 0, declarations_7 = declarations; _i < declarations_7.length; _i++) {
+                            var declaration = declarations_7[_i];
                             if (patternMatcher.patternContainsDots) {
                                 var containers = getContainers(declaration);
                                 if (!containers) {
                                     return undefined;
                                 }
-                                matches = patternMatcher.getMatches(containers, name_31);
+                                matches = patternMatcher.getMatches(containers, name_34);
                                 if (!matches) {
                                     continue;
                                 }
                             }
                             var fileName = sourceFile.fileName;
                             var matchKind = bestMatchKind(matches);
-                            rawItems.push({ name: name_31, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration });
+                            rawItems.push({ name: name_34, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration });
                         }
                     }
                 }
@@ -34206,7 +36765,7 @@ var ts;
                     if (text !== undefined) {
                         containers.unshift(text);
                     }
-                    else if (declaration.name.kind === 137) {
+                    else if (declaration.name.kind === 139) {
                         return tryAddComputedPropertyName(declaration.name.expression, containers, true);
                     }
                     else {
@@ -34223,7 +36782,7 @@ var ts;
                     }
                     return true;
                 }
-                if (expression.kind === 169) {
+                if (expression.kind === 171) {
                     var propertyAccess = expression;
                     if (includeLastPortion) {
                         containers.unshift(propertyAccess.name.text);
@@ -34234,7 +36793,7 @@ var ts;
             }
             function getContainers(declaration) {
                 var containers = [];
-                if (declaration.name.kind === 137) {
+                if (declaration.name.kind === 139) {
                     if (!tryAddComputedPropertyName(declaration.name.expression, containers, false)) {
                         return undefined;
                     }
@@ -34289,6 +36848,9 @@ var ts;
     var NavigationBar;
     (function (NavigationBar) {
         function getNavigationBarItems(sourceFile, compilerOptions) {
+            if (ts.isSourceFileJavaScript(sourceFile)) {
+                return getJsNavigationBarItems(sourceFile, compilerOptions);
+            }
             var hasGlobalNode = false;
             return getItemsWorker(getTopLevelNodes(sourceFile), createTopLevelItem);
             function getIndent(node) {
@@ -34296,14 +36858,14 @@ var ts;
                 var current = node.parent;
                 while (current) {
                     switch (current.kind) {
-                        case 221:
+                        case 224:
                             do {
                                 current = current.parent;
-                            } while (current.kind === 221);
-                        case 217:
+                            } while (current.kind === 224);
                         case 220:
-                        case 218:
-                        case 216:
+                        case 223:
+                        case 221:
+                        case 219:
                             indent++;
                     }
                     current = current.parent;
@@ -34314,26 +36876,26 @@ var ts;
                 var childNodes = [];
                 function visit(node) {
                     switch (node.kind) {
-                        case 196:
+                        case 199:
                             ts.forEach(node.declarationList.declarations, visit);
                             break;
-                        case 164:
-                        case 165:
+                        case 166:
+                        case 167:
                             ts.forEach(node.elements, visit);
                             break;
-                        case 231:
+                        case 235:
                             if (node.exportClause) {
                                 ts.forEach(node.exportClause.elements, visit);
                             }
                             break;
-                        case 225:
+                        case 229:
                             var importClause = node.importClause;
                             if (importClause) {
                                 if (importClause.name) {
                                     childNodes.push(importClause);
                                 }
                                 if (importClause.namedBindings) {
-                                    if (importClause.namedBindings.kind === 227) {
+                                    if (importClause.namedBindings.kind === 231) {
                                         childNodes.push(importClause.namedBindings);
                                     }
                                     else {
@@ -34342,20 +36904,20 @@ var ts;
                                 }
                             }
                             break;
-                        case 166:
-                        case 214:
+                        case 168:
+                        case 217:
                             if (ts.isBindingPattern(node.name)) {
                                 visit(node.name);
                                 break;
                             }
-                        case 217:
                         case 220:
-                        case 218:
+                        case 223:
                         case 221:
-                        case 216:
                         case 224:
-                        case 229:
+                        case 219:
+                        case 228:
                         case 233:
+                        case 237:
                             childNodes.push(node);
                             break;
                     }
@@ -34390,17 +36952,30 @@ var ts;
                 for (var _i = 0, nodes_4 = nodes; _i < nodes_4.length; _i++) {
                     var node = nodes_4[_i];
                     switch (node.kind) {
-                        case 217:
                         case 220:
-                        case 218:
+                            topLevelNodes.push(node);
+                            for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
+                                var member = _b[_a];
+                                if (member.kind === 146 || member.kind === 147) {
+                                    if (member.body) {
+                                        if (hasNamedFunctionDeclarations(member.body.statements)) {
+                                            topLevelNodes.push(member);
+                                        }
+                                        addTopLevelNodes(member.body.statements, topLevelNodes);
+                                    }
+                                }
+                            }
+                            break;
+                        case 223:
+                        case 221:
                             topLevelNodes.push(node);
                             break;
-                        case 221:
+                        case 224:
                             var moduleDeclaration = node;
                             topLevelNodes.push(node);
                             addTopLevelNodes(getInnermostModule(moduleDeclaration).body.statements, topLevelNodes);
                             break;
-                        case 216:
+                        case 219:
                             var functionDeclaration = node;
                             if (isTopLevelFunctionDeclaration(functionDeclaration)) {
                                 topLevelNodes.push(node);
@@ -34410,15 +36985,31 @@ var ts;
                     }
                 }
             }
+            function hasNamedFunctionDeclarations(nodes) {
+                for (var _i = 0, nodes_5 = nodes; _i < nodes_5.length; _i++) {
+                    var s = nodes_5[_i];
+                    if (s.kind === 219 && !isEmpty(s.name.text)) {
+                        return true;
+                    }
+                }
+                return false;
+            }
             function isTopLevelFunctionDeclaration(functionDeclaration) {
-                if (functionDeclaration.kind === 216) {
-                    if (functionDeclaration.body && functionDeclaration.body.kind === 195) {
-                        if (ts.forEach(functionDeclaration.body.statements, function (s) { return s.kind === 216 && !isEmpty(s.name.text); })) {
+                if (functionDeclaration.kind === 219) {
+                    if (functionDeclaration.body && functionDeclaration.body.kind === 198) {
+                        if (hasNamedFunctionDeclarations(functionDeclaration.body.statements)) {
                             return true;
                         }
                         if (!ts.isFunctionBlock(functionDeclaration.parent)) {
                             return true;
                         }
+                        else {
+                            var grandParentKind = functionDeclaration.parent.parent.kind;
+                            if (grandParentKind === 146 ||
+                                grandParentKind === 147) {
+                                return true;
+                            }
+                        }
                     }
                 }
                 return false;
@@ -34426,8 +37017,8 @@ var ts;
             function getItemsWorker(nodes, createItem) {
                 var items = [];
                 var keyToItem = {};
-                for (var _i = 0, nodes_5 = nodes; _i < nodes_5.length; _i++) {
-                    var child = nodes_5[_i];
+                for (var _i = 0, nodes_6 = nodes; _i < nodes_6.length; _i++) {
+                    var child = nodes_6[_i];
                     var item = createItem(child);
                     if (item !== undefined) {
                         if (item.text.length > 0) {
@@ -34466,42 +37057,42 @@ var ts;
             }
             function createChildItem(node) {
                 switch (node.kind) {
-                    case 139:
+                    case 141:
                         if (ts.isBindingPattern(node.name)) {
                             break;
                         }
-                        if ((node.flags & 1022) === 0) {
+                        if ((node.flags & 959) === 0) {
                             return undefined;
                         }
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberVariableElement);
+                    case 146:
+                    case 145:
+                        return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberFunctionElement);
+                    case 148:
+                        return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberGetAccessorElement);
+                    case 149:
+                        return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberSetAccessorElement);
+                    case 152:
+                        return createItem(node, "[]", ts.ScriptElementKind.indexSignatureElement);
+                    case 254:
+                        return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberVariableElement);
+                    case 150:
+                        return createItem(node, "()", ts.ScriptElementKind.callSignatureElement);
+                    case 151:
+                        return createItem(node, "new()", ts.ScriptElementKind.constructSignatureElement);
                     case 144:
                     case 143:
-                        return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberFunctionElement);
-                    case 146:
-                        return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberGetAccessorElement);
-                    case 147:
-                        return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberSetAccessorElement);
-                    case 150:
-                        return createItem(node, "[]", ts.ScriptElementKind.indexSignatureElement);
-                    case 250:
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberVariableElement);
-                    case 148:
-                        return createItem(node, "()", ts.ScriptElementKind.callSignatureElement);
-                    case 149:
-                        return createItem(node, "new()", ts.ScriptElementKind.constructSignatureElement);
-                    case 142:
-                    case 141:
-                        return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberVariableElement);
-                    case 216:
+                    case 219:
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.functionElement);
-                    case 214:
-                    case 166:
-                        var variableDeclarationNode;
-                        var name_32;
-                        if (node.kind === 166) {
-                            name_32 = node.name;
+                    case 217:
+                    case 168:
+                        var variableDeclarationNode = void 0;
+                        var name_35;
+                        if (node.kind === 168) {
+                            name_35 = node.name;
                             variableDeclarationNode = node;
-                            while (variableDeclarationNode && variableDeclarationNode.kind !== 214) {
+                            while (variableDeclarationNode && variableDeclarationNode.kind !== 217) {
                                 variableDeclarationNode = variableDeclarationNode.parent;
                             }
                             ts.Debug.assert(variableDeclarationNode !== undefined);
@@ -34509,24 +37100,24 @@ var ts;
                         else {
                             ts.Debug.assert(!ts.isBindingPattern(node.name));
                             variableDeclarationNode = node;
-                            name_32 = node.name;
+                            name_35 = node.name;
                         }
                         if (ts.isConst(variableDeclarationNode)) {
-                            return createItem(node, getTextOfNode(name_32), ts.ScriptElementKind.constElement);
+                            return createItem(node, getTextOfNode(name_35), ts.ScriptElementKind.constElement);
                         }
                         else if (ts.isLet(variableDeclarationNode)) {
-                            return createItem(node, getTextOfNode(name_32), ts.ScriptElementKind.letElement);
+                            return createItem(node, getTextOfNode(name_35), ts.ScriptElementKind.letElement);
                         }
                         else {
-                            return createItem(node, getTextOfNode(name_32), ts.ScriptElementKind.variableElement);
+                            return createItem(node, getTextOfNode(name_35), ts.ScriptElementKind.variableElement);
                         }
-                    case 145:
+                    case 147:
                         return createItem(node, "constructor", ts.ScriptElementKind.constructorImplementationElement);
+                    case 237:
                     case 233:
-                    case 229:
-                    case 224:
-                    case 226:
-                    case 227:
+                    case 228:
+                    case 230:
+                    case 231:
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.alias);
                 }
                 return undefined;
@@ -34556,17 +37147,20 @@ var ts;
             }
             function createTopLevelItem(node) {
                 switch (node.kind) {
-                    case 251:
+                    case 255:
                         return createSourceFileItem(node);
-                    case 217:
-                        return createClassItem(node);
                     case 220:
+                        return createClassItem(node);
+                    case 146:
+                    case 147:
+                        return createMemberFunctionLikeItem(node);
+                    case 223:
                         return createEnumItem(node);
-                    case 218:
-                        return createIterfaceItem(node);
                     case 221:
+                        return createInterfaceItem(node);
+                    case 224:
                         return createModuleItem(node);
-                    case 216:
+                    case 219:
                         return createFunctionItem(node);
                 }
                 return undefined;
@@ -34576,7 +37170,7 @@ var ts;
                     }
                     var result = [];
                     result.push(moduleDeclaration.name.text);
-                    while (moduleDeclaration.body && moduleDeclaration.body.kind === 221) {
+                    while (moduleDeclaration.body && moduleDeclaration.body.kind === 224) {
                         moduleDeclaration = moduleDeclaration.body;
                         result.push(moduleDeclaration.name.text);
                     }
@@ -34588,12 +37182,29 @@ var ts;
                     return getNavigationBarItem(moduleName, ts.ScriptElementKind.moduleElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
                 }
                 function createFunctionItem(node) {
-                    if (node.body && node.body.kind === 195) {
+                    if (node.body && node.body.kind === 198) {
                         var childItems = getItemsWorker(sortNodes(node.body.statements), createChildItem);
                         return getNavigationBarItem(!node.name ? "default" : node.name.text, ts.ScriptElementKind.functionElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
                     }
                     return undefined;
                 }
+                function createMemberFunctionLikeItem(node) {
+                    if (node.body && node.body.kind === 198) {
+                        var childItems = getItemsWorker(sortNodes(node.body.statements), createChildItem);
+                        var scriptElementKind = void 0;
+                        var memberFunctionName = void 0;
+                        if (node.kind === 146) {
+                            memberFunctionName = ts.getPropertyNameForPropertyNameNode(node.name);
+                            scriptElementKind = ts.ScriptElementKind.memberFunctionElement;
+                        }
+                        else {
+                            memberFunctionName = "constructor";
+                            scriptElementKind = ts.ScriptElementKind.constructorImplementationElement;
+                        }
+                        return getNavigationBarItem(memberFunctionName, scriptElementKind, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
+                    }
+                    return undefined;
+                }
                 function createSourceFileItem(node) {
                     var childItems = getItemsWorker(getChildNodes(node.statements), createChildItem);
                     if (childItems === undefined || childItems.length === 0) {
@@ -34609,7 +37220,7 @@ var ts;
                     var childItems;
                     if (node.members) {
                         var constructor = ts.forEach(node.members, function (member) {
-                            return member.kind === 145 && member;
+                            return member.kind === 147 && member;
                         });
                         var nodes = removeDynamicallyNamedProperties(node);
                         if (constructor) {
@@ -34624,25 +37235,25 @@ var ts;
                     var childItems = getItemsWorker(sortNodes(removeComputedProperties(node)), createChildItem);
                     return getNavigationBarItem(node.name.text, ts.ScriptElementKind.enumElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
                 }
-                function createIterfaceItem(node) {
+                function createInterfaceItem(node) {
                     var childItems = getItemsWorker(sortNodes(removeDynamicallyNamedProperties(node)), createChildItem);
                     return getNavigationBarItem(node.name.text, ts.ScriptElementKind.interfaceElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
                 }
             }
             function removeComputedProperties(node) {
-                return ts.filter(node.members, function (member) { return member.name === undefined || member.name.kind !== 137; });
+                return ts.filter(node.members, function (member) { return member.name === undefined || member.name.kind !== 139; });
             }
             function removeDynamicallyNamedProperties(node) {
                 return ts.filter(node.members, function (member) { return !ts.hasDynamicName(member); });
             }
             function getInnermostModule(node) {
-                while (node.body.kind === 221) {
+                while (node.body.kind === 224) {
                     node = node.body;
                 }
                 return node;
             }
             function getNodeSpan(node) {
-                return node.kind === 251
+                return node.kind === 255
                     ? ts.createTextSpanFromBounds(node.getFullStart(), node.getEnd())
                     : ts.createTextSpanFromBounds(node.getStart(), node.getEnd());
             }
@@ -34651,6 +37262,171 @@ var ts;
             }
         }
         NavigationBar.getNavigationBarItems = getNavigationBarItems;
+        function getJsNavigationBarItems(sourceFile, compilerOptions) {
+            var anonFnText = "<function>";
+            var anonClassText = "<class>";
+            var indent = 0;
+            var rootName = ts.isExternalModule(sourceFile) ?
+                "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(sourceFile.fileName)))) + "\""
+                : "<global>";
+            var sourceFileItem = getNavBarItem(rootName, ts.ScriptElementKind.moduleElement, [getNodeSpan(sourceFile)]);
+            var topItem = sourceFileItem;
+            ts.forEachChild(sourceFile, visitNode);
+            function visitNode(node) {
+                var newItem = createNavBarItem(node);
+                if (newItem) {
+                    topItem.childItems.push(newItem);
+                }
+                if (newItem && (ts.isFunctionLike(node) || ts.isClassLike(node))) {
+                    var lastTop = topItem;
+                    indent++;
+                    topItem = newItem;
+                    ts.forEachChild(node, visitNode);
+                    topItem = lastTop;
+                    indent--;
+                    if (newItem && newItem.text === anonFnText && newItem.childItems.length === 0) {
+                        topItem.childItems.pop();
+                    }
+                }
+                else {
+                    ts.forEachChild(node, visitNode);
+                }
+            }
+            function createNavBarItem(node) {
+                switch (node.kind) {
+                    case 217:
+                        if (node.parent.parent
+                            .parent.kind !== 255) {
+                            return undefined;
+                        }
+                        var varDecl = node;
+                        if (varDecl.initializer && (varDecl.initializer.kind === 178 ||
+                            varDecl.initializer.kind === 179 ||
+                            varDecl.initializer.kind === 191)) {
+                            return undefined;
+                        }
+                    case 219:
+                    case 220:
+                    case 147:
+                    case 148:
+                    case 149:
+                        var name_36 = node.flags && (node.flags & 512) && !node.name ? "default" :
+                            node.kind === 147 ? "constructor" :
+                                ts.declarationNameToString(node.name);
+                        return getNavBarItem(name_36, getScriptKindForElementKind(node.kind), [getNodeSpan(node)]);
+                    case 178:
+                    case 179:
+                    case 191:
+                        return getDefineModuleItem(node) || getFunctionOrClassExpressionItem(node);
+                    case 146:
+                        var methodDecl = node;
+                        return getNavBarItem(ts.declarationNameToString(methodDecl.name), ts.ScriptElementKind.memberFunctionElement, [getNodeSpan(node)]);
+                    case 234:
+                        return getNavBarItem("default", ts.ScriptElementKind.variableElement, [getNodeSpan(node)]);
+                    case 230:
+                        if (!node.name) {
+                            return undefined;
+                        }
+                    case 233:
+                    case 231:
+                    case 237:
+                        if (node.kind === 237) {
+                            if (!node.parent.parent.moduleSpecifier && !node.propertyName) {
+                                return undefined;
+                            }
+                        }
+                        var decl = node;
+                        if (!decl.name) {
+                            return undefined;
+                        }
+                        var declName = ts.declarationNameToString(decl.name);
+                        return getNavBarItem(declName, ts.ScriptElementKind.constElement, [getNodeSpan(node)]);
+                    default:
+                        return undefined;
+                }
+            }
+            function getNavBarItem(text, kind, spans, kindModifiers) {
+                if (kindModifiers === void 0) { kindModifiers = ts.ScriptElementKindModifier.none; }
+                return {
+                    text: text, kind: kind, kindModifiers: kindModifiers, spans: spans, childItems: [], indent: indent, bolded: false, grayed: false
+                };
+            }
+            function getDefineModuleItem(node) {
+                if (node.kind !== 178 && node.kind !== 179) {
+                    return undefined;
+                }
+                if (node.parent.kind !== 173) {
+                    return undefined;
+                }
+                var callExpr = node.parent;
+                if (callExpr.expression.kind !== 69 || callExpr.expression.getText() !== 'define') {
+                    return undefined;
+                }
+                var defaultName = node.getSourceFile().fileName;
+                if (callExpr.arguments[0].kind === 9) {
+                    defaultName = (callExpr.arguments[0]).text;
+                }
+                return getNavBarItem(defaultName, ts.ScriptElementKind.moduleElement, [getNodeSpan(node.parent)]);
+            }
+            function getFunctionOrClassExpressionItem(node) {
+                if (node.kind !== 178 &&
+                    node.kind !== 179 &&
+                    node.kind !== 191) {
+                    return undefined;
+                }
+                var fnExpr = node;
+                var fnName;
+                if (fnExpr.name && ts.getFullWidth(fnExpr.name) > 0) {
+                    fnName = ts.declarationNameToString(fnExpr.name);
+                }
+                else {
+                    if (fnExpr.parent.kind === 217) {
+                        fnName = ts.declarationNameToString(fnExpr.parent.name);
+                    }
+                    else if (fnExpr.parent.kind === 186 &&
+                        fnExpr.parent.operatorToken.kind === 56) {
+                        fnName = fnExpr.parent.left.getText();
+                        if (fnName.length > 20) {
+                            fnName = fnName.substring(0, 17) + "...";
+                        }
+                    }
+                    else if (fnExpr.parent.kind === 252 &&
+                        fnExpr.parent.name) {
+                        fnName = fnExpr.parent.name.getText();
+                    }
+                    else {
+                        fnName = node.kind === 191 ? anonClassText : anonFnText;
+                    }
+                }
+                var scriptKind = node.kind === 191 ? ts.ScriptElementKind.classElement : ts.ScriptElementKind.functionElement;
+                return getNavBarItem(fnName, scriptKind, [getNodeSpan(node)]);
+            }
+            function getNodeSpan(node) {
+                return node.kind === 255
+                    ? ts.createTextSpanFromBounds(node.getFullStart(), node.getEnd())
+                    : ts.createTextSpanFromBounds(node.getStart(), node.getEnd());
+            }
+            function getScriptKindForElementKind(kind) {
+                switch (kind) {
+                    case 217:
+                        return ts.ScriptElementKind.variableElement;
+                    case 219:
+                        return ts.ScriptElementKind.functionElement;
+                    case 220:
+                        return ts.ScriptElementKind.classElement;
+                    case 147:
+                        return ts.ScriptElementKind.constructorImplementationElement;
+                    case 148:
+                        return ts.ScriptElementKind.memberGetAccessorElement;
+                    case 149:
+                        return ts.ScriptElementKind.memberSetAccessorElement;
+                    default:
+                        return "unknown";
+                }
+            }
+            return sourceFileItem.childItems;
+        }
+        NavigationBar.getJsNavigationBarItems = getJsNavigationBarItems;
     })(NavigationBar = ts.NavigationBar || (ts.NavigationBar = {}));
 })(ts || (ts = {}));
 var ts;
@@ -35097,14 +37873,14 @@ var ts;
             }
             return createSignatureHelpItems(candidates, resolvedSignature, argumentInfo);
             function createJavaScriptSignatureHelpItems(argumentInfo) {
-                if (argumentInfo.invocation.kind !== 171) {
+                if (argumentInfo.invocation.kind !== 173) {
                     return undefined;
                 }
                 var callExpression = argumentInfo.invocation;
                 var expression = callExpression.expression;
                 var name = expression.kind === 69
                     ? expression
-                    : expression.kind === 169
+                    : expression.kind === 171
                         ? expression.name
                         : undefined;
                 if (!name || !name.text) {
@@ -35116,8 +37892,8 @@ var ts;
                     var nameToDeclarations = sourceFile_1.getNamedDeclarations();
                     var declarations = ts.getProperty(nameToDeclarations, name.text);
                     if (declarations) {
-                        for (var _b = 0, declarations_7 = declarations; _b < declarations_7.length; _b++) {
-                            var declaration = declarations_7[_b];
+                        for (var _b = 0, declarations_8 = declarations; _b < declarations_8.length; _b++) {
+                            var declaration = declarations_8[_b];
                             var symbol = declaration.symbol;
                             if (symbol) {
                                 var type = typeChecker.getTypeOfSymbolAtLocation(symbol, declaration);
@@ -35133,7 +37909,7 @@ var ts;
                 }
             }
             function getImmediatelyContainingArgumentInfo(node) {
-                if (node.parent.kind === 171 || node.parent.kind === 172) {
+                if (node.parent.kind === 173 || node.parent.kind === 174) {
                     var callExpression = node.parent;
                     if (node.kind === 25 ||
                         node.kind === 17) {
@@ -35164,23 +37940,23 @@ var ts;
                         };
                     }
                 }
-                else if (node.kind === 11 && node.parent.kind === 173) {
+                else if (node.kind === 11 && node.parent.kind === 175) {
                     if (ts.isInsideTemplateLiteral(node, position)) {
                         return getArgumentListInfoForTemplate(node.parent, 0);
                     }
                 }
-                else if (node.kind === 12 && node.parent.parent.kind === 173) {
+                else if (node.kind === 12 && node.parent.parent.kind === 175) {
                     var templateExpression = node.parent;
                     var tagExpression = templateExpression.parent;
-                    ts.Debug.assert(templateExpression.kind === 186);
+                    ts.Debug.assert(templateExpression.kind === 188);
                     var argumentIndex = ts.isInsideTemplateLiteral(node, position) ? 0 : 1;
                     return getArgumentListInfoForTemplate(tagExpression, argumentIndex);
                 }
-                else if (node.parent.kind === 193 && node.parent.parent.parent.kind === 173) {
+                else if (node.parent.kind === 196 && node.parent.parent.parent.kind === 175) {
                     var templateSpan = node.parent;
                     var templateExpression = templateSpan.parent;
                     var tagExpression = templateExpression.parent;
-                    ts.Debug.assert(templateExpression.kind === 186);
+                    ts.Debug.assert(templateExpression.kind === 188);
                     if (node.kind === 14 && !ts.isInsideTemplateLiteral(node, position)) {
                         return undefined;
                     }
@@ -35244,7 +38020,7 @@ var ts;
                 var template = taggedTemplate.template;
                 var applicableSpanStart = template.getStart();
                 var applicableSpanEnd = template.getEnd();
-                if (template.kind === 186) {
+                if (template.kind === 188) {
                     var lastSpan = ts.lastOrUndefined(template.templateSpans);
                     if (lastSpan.literal.getFullWidth() === 0) {
                         applicableSpanEnd = ts.skipTrivia(sourceFile.text, applicableSpanEnd, false);
@@ -35253,7 +38029,7 @@ var ts;
                 return ts.createTextSpan(applicableSpanStart, applicableSpanEnd - applicableSpanStart);
             }
             function getContainingArgumentInfo(node) {
-                for (var n = node; n.kind !== 251; n = n.parent) {
+                for (var n = node; n.kind !== 255; n = n.parent) {
                     if (ts.isFunctionBlock(n)) {
                         return undefined;
                     }
@@ -35308,7 +38084,7 @@ var ts;
                         signatureHelpParameters = typeParameters && typeParameters.length > 0 ? ts.map(typeParameters, createSignatureHelpParameterForTypeParameter) : emptyArray;
                         suffixDisplayParts.push(ts.punctuationPart(27));
                         var parameterParts = ts.mapToDisplayParts(function (writer) {
-                            return typeChecker.getSymbolDisplayBuilder().buildDisplayForParametersAndDelimiters(candidateSignature.parameters, writer, invocation);
+                            return typeChecker.getSymbolDisplayBuilder().buildDisplayForParametersAndDelimiters(candidateSignature.thisType, candidateSignature.parameters, writer, invocation);
                         });
                         ts.addRange(suffixDisplayParts, parameterParts);
                     }
@@ -35378,24 +38154,6 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    function getEndLinePosition(line, sourceFile) {
-        ts.Debug.assert(line >= 0);
-        var lineStarts = sourceFile.getLineStarts();
-        var lineIndex = line;
-        if (lineIndex + 1 === lineStarts.length) {
-            return sourceFile.text.length - 1;
-        }
-        else {
-            var start = lineStarts[lineIndex];
-            var pos = lineStarts[lineIndex + 1] - 1;
-            ts.Debug.assert(ts.isLineBreak(sourceFile.text.charCodeAt(pos)));
-            while (start <= pos && ts.isLineBreak(sourceFile.text.charCodeAt(pos))) {
-                pos--;
-            }
-            return pos;
-        }
-    }
-    ts.getEndLinePosition = getEndLinePosition;
     function getLineStartPositionForPosition(position, sourceFile) {
         var lineStarts = sourceFile.getLineStarts();
         var line = sourceFile.getLineAndCharacterOfPosition(position).line;
@@ -35433,39 +38191,39 @@ var ts;
             return false;
         }
         switch (n.kind) {
-            case 217:
-            case 218:
             case 220:
-            case 168:
-            case 164:
-            case 156:
-            case 195:
-            case 222:
+            case 221:
             case 223:
+            case 170:
+            case 166:
+            case 158:
+            case 198:
+            case 225:
+            case 226:
                 return nodeEndsWith(n, 16, sourceFile);
-            case 247:
+            case 251:
                 return isCompletedNode(n.block, sourceFile);
-            case 172:
+            case 174:
                 if (!n.arguments) {
                     return true;
                 }
-            case 171:
-            case 175:
-            case 161:
-                return nodeEndsWith(n, 18, sourceFile);
-            case 153:
-            case 154:
-                return isCompletedNode(n.type, sourceFile);
-            case 145:
-            case 146:
-            case 147:
-            case 216:
-            case 176:
-            case 144:
-            case 143:
-            case 149:
-            case 148:
+            case 173:
             case 177:
+            case 163:
+                return nodeEndsWith(n, 18, sourceFile);
+            case 155:
+            case 156:
+                return isCompletedNode(n.type, sourceFile);
+            case 147:
+            case 148:
+            case 149:
+            case 219:
+            case 178:
+            case 146:
+            case 145:
+            case 151:
+            case 150:
+            case 179:
                 if (n.body) {
                     return isCompletedNode(n.body, sourceFile);
                 }
@@ -35473,62 +38231,62 @@ var ts;
                     return isCompletedNode(n.type, sourceFile);
                 }
                 return hasChildOfKind(n, 18, sourceFile);
-            case 221:
+            case 224:
                 return n.body && isCompletedNode(n.body, sourceFile);
-            case 199:
+            case 202:
                 if (n.elseStatement) {
                     return isCompletedNode(n.elseStatement, sourceFile);
                 }
                 return isCompletedNode(n.thenStatement, sourceFile);
-            case 198:
+            case 201:
                 return isCompletedNode(n.expression, sourceFile) ||
                     hasChildOfKind(n, 23);
+            case 169:
             case 167:
-            case 165:
-            case 170:
-            case 137:
-            case 158:
+            case 172:
+            case 139:
+            case 160:
                 return nodeEndsWith(n, 20, sourceFile);
-            case 150:
+            case 152:
                 if (n.type) {
                     return isCompletedNode(n.type, sourceFile);
                 }
                 return hasChildOfKind(n, 20, sourceFile);
-            case 244:
-            case 245:
+            case 248:
+            case 249:
                 return false;
-            case 202:
-            case 203:
+            case 205:
+            case 206:
+            case 207:
             case 204:
-            case 201:
                 return isCompletedNode(n.statement, sourceFile);
-            case 200:
+            case 203:
                 var hasWhileKeyword = findChildOfKind(n, 104, sourceFile);
                 if (hasWhileKeyword) {
                     return nodeEndsWith(n, 18, sourceFile);
                 }
                 return isCompletedNode(n.statement, sourceFile);
-            case 155:
+            case 157:
                 return isCompletedNode(n.exprName, sourceFile);
-            case 179:
-            case 178:
+            case 181:
             case 180:
-            case 187:
-            case 188:
+            case 182:
+            case 189:
+            case 190:
                 var unaryWordExpression = n;
                 return isCompletedNode(unaryWordExpression.expression, sourceFile);
-            case 173:
+            case 175:
                 return isCompletedNode(n.template, sourceFile);
-            case 186:
+            case 188:
                 var lastSpan = ts.lastOrUndefined(n.templateSpans);
                 return isCompletedNode(lastSpan, sourceFile);
-            case 193:
+            case 196:
                 return ts.nodeIsPresent(n.literal);
-            case 182:
-                return isCompletedNode(n.operand, sourceFile);
             case 184:
+                return isCompletedNode(n.operand, sourceFile);
+            case 186:
                 return isCompletedNode(n.right, sourceFile);
-            case 185:
+            case 187:
                 return isCompletedNode(n.whenFalse, sourceFile);
             default:
                 return true;
@@ -35571,7 +38329,7 @@ var ts;
     ts.findChildOfKind = findChildOfKind;
     function findContainingList(node) {
         var syntaxList = ts.forEach(node.parent.getChildren(), function (c) {
-            if (c.kind === 274 && c.pos <= node.pos && c.end >= node.end) {
+            if (c.kind === 278 && c.pos <= node.pos && c.end >= node.end) {
                 return c;
             }
         });
@@ -35651,7 +38409,7 @@ var ts;
     function findPrecedingToken(position, sourceFile, startNode) {
         return find(startNode || sourceFile);
         function findRightmostToken(n) {
-            if (isToken(n) || n.kind === 239) {
+            if (isToken(n) || n.kind === 243) {
                 return n;
             }
             var children = n.getChildren();
@@ -35659,16 +38417,16 @@ var ts;
             return candidate && findRightmostToken(candidate);
         }
         function find(n) {
-            if (isToken(n) || n.kind === 239) {
+            if (isToken(n) || n.kind === 243) {
                 return n;
             }
             var children = n.getChildren();
             for (var i = 0, len = children.length; i < len; i++) {
                 var child = children[i];
-                if (position < child.end && (nodeHasTokens(child) || child.kind === 239)) {
+                if (position < child.end && (nodeHasTokens(child) || child.kind === 243)) {
                     var start = child.getStart(sourceFile);
                     var lookInPreviousChild = (start >= position) ||
-                        (child.kind === 239 && start === child.end);
+                        (child.kind === 243 && start === child.end);
                     if (lookInPreviousChild) {
                         var candidate = findRightmostChildNodeWithTokens(children, i);
                         return candidate && findRightmostToken(candidate);
@@ -35678,7 +38436,7 @@ var ts;
                     }
                 }
             }
-            ts.Debug.assert(startNode !== undefined || n.kind === 251);
+            ts.Debug.assert(startNode !== undefined || n.kind === 255);
             if (children.length) {
                 var candidate = findRightmostChildNodeWithTokens(children, children.length);
                 return candidate && findRightmostToken(candidate);
@@ -35695,7 +38453,7 @@ var ts;
     ts.findPrecedingToken = findPrecedingToken;
     function isInString(sourceFile, position) {
         var token = getTokenAtPosition(sourceFile, position);
-        return token && (token.kind === 9 || token.kind === 163) && position > token.getStart();
+        return token && (token.kind === 9 || token.kind === 165) && position > token.getStart();
     }
     ts.isInString = isInString;
     function isInComment(sourceFile, position) {
@@ -35760,17 +38518,17 @@ var ts;
     function getNodeModifiers(node) {
         var flags = ts.getCombinedNodeFlags(node);
         var result = [];
-        if (flags & 16)
-            result.push(ts.ScriptElementKindModifier.privateMemberModifier);
-        if (flags & 32)
-            result.push(ts.ScriptElementKindModifier.protectedMemberModifier);
         if (flags & 8)
+            result.push(ts.ScriptElementKindModifier.privateMemberModifier);
+        if (flags & 16)
+            result.push(ts.ScriptElementKindModifier.protectedMemberModifier);
+        if (flags & 4)
             result.push(ts.ScriptElementKindModifier.publicMemberModifier);
-        if (flags & 64)
+        if (flags & 32)
             result.push(ts.ScriptElementKindModifier.staticModifier);
         if (flags & 128)
             result.push(ts.ScriptElementKindModifier.abstractModifier);
-        if (flags & 2)
+        if (flags & 1)
             result.push(ts.ScriptElementKindModifier.exportedModifier);
         if (ts.isInAmbientContext(node))
             result.push(ts.ScriptElementKindModifier.ambientModifier);
@@ -35778,17 +38536,17 @@ var ts;
     }
     ts.getNodeModifiers = getNodeModifiers;
     function getTypeArgumentOrTypeParameterList(node) {
-        if (node.kind === 152 || node.kind === 171) {
+        if (node.kind === 154 || node.kind === 173) {
             return node.typeArguments;
         }
-        if (ts.isFunctionLike(node) || node.kind === 217 || node.kind === 218) {
+        if (ts.isFunctionLike(node) || node.kind === 220 || node.kind === 221) {
             return node.typeParameters;
         }
         return undefined;
     }
     ts.getTypeArgumentOrTypeParameterList = getTypeArgumentOrTypeParameterList;
     function isToken(n) {
-        return n.kind >= 0 && n.kind <= 135;
+        return n.kind >= 0 && n.kind <= 137;
     }
     ts.isToken = isToken;
     function isWord(kind) {
@@ -35804,7 +38562,7 @@ var ts;
     ts.isComment = isComment;
     function isStringOrRegularExpressionOrTemplateLiteral(kind) {
         if (kind === 9
-            || kind === 163
+            || kind === 165
             || kind === 10
             || ts.isTemplateLiteralKind(kind)) {
             return true;
@@ -35848,18 +38606,18 @@ var ts;
     }
     ts.compareDataObjects = compareDataObjects;
     function isArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-        if (node.kind === 167 ||
-            node.kind === 168) {
-            if (node.parent.kind === 184 &&
+        if (node.kind === 169 ||
+            node.kind === 170) {
+            if (node.parent.kind === 186 &&
                 node.parent.left === node &&
                 node.parent.operatorToken.kind === 56) {
                 return true;
             }
-            if (node.parent.kind === 204 &&
+            if (node.parent.kind === 207 &&
                 node.parent.initializer === node) {
                 return true;
             }
-            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 248 ? node.parent.parent : node.parent)) {
+            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 252 ? node.parent.parent : node.parent)) {
                 return true;
             }
         }
@@ -35870,7 +38628,7 @@ var ts;
 var ts;
 (function (ts) {
     function isFirstDeclarationOfSymbolParameter(symbol) {
-        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 139;
+        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 141;
     }
     ts.isFirstDeclarationOfSymbolParameter = isFirstDeclarationOfSymbolParameter;
     var displayPartWriter = getDisplayPartWriter();
@@ -36051,7 +38809,7 @@ var ts;
     ts.getDeclaredName = getDeclaredName;
     function isImportOrExportSpecifierName(location) {
         return location.parent &&
-            (location.parent.kind === 229 || location.parent.kind === 233) &&
+            (location.parent.kind === 233 || location.parent.kind === 237) &&
             location.parent.propertyName === location;
     }
     ts.isImportOrExportSpecifierName = isImportOrExportSpecifierName;
@@ -36066,6 +38824,169 @@ var ts;
         return name;
     }
     ts.stripQuotes = stripQuotes;
+    function scriptKindIs(fileName, host) {
+        var scriptKinds = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            scriptKinds[_i - 2] = arguments[_i];
+        }
+        var scriptKind = getScriptKind(fileName, host);
+        return ts.forEach(scriptKinds, function (k) { return k === scriptKind; });
+    }
+    ts.scriptKindIs = scriptKindIs;
+    function getScriptKind(fileName, host) {
+        var scriptKind = ts.getScriptKindFromFileName(fileName);
+        if (scriptKind === 0 && host && host.getScriptKind) {
+            scriptKind = host.getScriptKind(fileName);
+        }
+        return ts.ensureScriptKind(fileName, scriptKind);
+    }
+    ts.getScriptKind = getScriptKind;
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    var JsTyping;
+    (function (JsTyping) {
+        ;
+        ;
+        var safeList;
+        function discoverTypings(host, fileNames, projectRootPath, safeListPath, packageNameToTypingLocation, typingOptions, compilerOptions) {
+            var inferredTypings = {};
+            if (!typingOptions || !typingOptions.enableAutoDiscovery) {
+                return { cachedTypingPaths: [], newTypingNames: [], filesToWatch: [] };
+            }
+            fileNames = ts.filter(ts.map(fileNames, ts.normalizePath), function (f) { return ts.scriptKindIs(f, undefined, 1, 2); });
+            if (!safeList) {
+                var result = ts.readConfigFile(safeListPath, function (path) { return host.readFile(path); });
+                if (result.config) {
+                    safeList = result.config;
+                }
+                else {
+                    safeList = {};
+                }
+                ;
+            }
+            var filesToWatch = [];
+            var searchDirs = [];
+            var exclude = [];
+            mergeTypings(typingOptions.include);
+            exclude = typingOptions.exclude || [];
+            var possibleSearchDirs = ts.map(fileNames, ts.getDirectoryPath);
+            if (projectRootPath !== undefined) {
+                possibleSearchDirs.push(projectRootPath);
+            }
+            searchDirs = ts.deduplicate(possibleSearchDirs);
+            for (var _i = 0, searchDirs_1 = searchDirs; _i < searchDirs_1.length; _i++) {
+                var searchDir = searchDirs_1[_i];
+                var packageJsonPath = ts.combinePaths(searchDir, "package.json");
+                getTypingNamesFromJson(packageJsonPath, filesToWatch);
+                var bowerJsonPath = ts.combinePaths(searchDir, "bower.json");
+                getTypingNamesFromJson(bowerJsonPath, filesToWatch);
+                var nodeModulesPath = ts.combinePaths(searchDir, "node_modules");
+                getTypingNamesFromNodeModuleFolder(nodeModulesPath);
+            }
+            getTypingNamesFromSourceFileNames(fileNames);
+            for (var name_37 in packageNameToTypingLocation) {
+                if (ts.hasProperty(inferredTypings, name_37) && !inferredTypings[name_37]) {
+                    inferredTypings[name_37] = packageNameToTypingLocation[name_37];
+                }
+            }
+            for (var _a = 0, exclude_1 = exclude; _a < exclude_1.length; _a++) {
+                var excludeTypingName = exclude_1[_a];
+                delete inferredTypings[excludeTypingName];
+            }
+            var newTypingNames = [];
+            var cachedTypingPaths = [];
+            for (var typing in inferredTypings) {
+                if (inferredTypings[typing] !== undefined) {
+                    cachedTypingPaths.push(inferredTypings[typing]);
+                }
+                else {
+                    newTypingNames.push(typing);
+                }
+            }
+            return { cachedTypingPaths: cachedTypingPaths, newTypingNames: newTypingNames, filesToWatch: filesToWatch };
+            function mergeTypings(typingNames) {
+                if (!typingNames) {
+                    return;
+                }
+                for (var _i = 0, typingNames_1 = typingNames; _i < typingNames_1.length; _i++) {
+                    var typing = typingNames_1[_i];
+                    if (!ts.hasProperty(inferredTypings, typing)) {
+                        inferredTypings[typing] = undefined;
+                    }
+                }
+            }
+            function getTypingNamesFromJson(jsonPath, filesToWatch) {
+                var result = ts.readConfigFile(jsonPath, function (path) { return host.readFile(path); });
+                if (result.config) {
+                    var jsonConfig = result.config;
+                    filesToWatch.push(jsonPath);
+                    if (jsonConfig.dependencies) {
+                        mergeTypings(ts.getKeys(jsonConfig.dependencies));
+                    }
+                    if (jsonConfig.devDependencies) {
+                        mergeTypings(ts.getKeys(jsonConfig.devDependencies));
+                    }
+                    if (jsonConfig.optionalDependencies) {
+                        mergeTypings(ts.getKeys(jsonConfig.optionalDependencies));
+                    }
+                    if (jsonConfig.peerDependencies) {
+                        mergeTypings(ts.getKeys(jsonConfig.peerDependencies));
+                    }
+                }
+            }
+            function getTypingNamesFromSourceFileNames(fileNames) {
+                var jsFileNames = ts.filter(fileNames, ts.hasJavaScriptFileExtension);
+                var inferredTypingNames = ts.map(jsFileNames, function (f) { return ts.removeFileExtension(ts.getBaseFileName(f.toLowerCase())); });
+                var cleanedTypingNames = ts.map(inferredTypingNames, function (f) { return f.replace(/((?:\.|-)min(?=\.|$))|((?:-|\.)\d+)/g, ""); });
+                if (safeList === undefined) {
+                    mergeTypings(cleanedTypingNames);
+                }
+                else {
+                    mergeTypings(ts.filter(cleanedTypingNames, function (f) { return ts.hasProperty(safeList, f); }));
+                }
+                var hasJsxFile = ts.forEach(fileNames, function (f) { return ts.scriptKindIs(f, undefined, 2); });
+                if (hasJsxFile) {
+                    mergeTypings(["react"]);
+                }
+            }
+            function getTypingNamesFromNodeModuleFolder(nodeModulesPath) {
+                if (!host.directoryExists(nodeModulesPath)) {
+                    return;
+                }
+                var typingNames = [];
+                var fileNames = host.readDirectory(nodeModulesPath, "*.json", undefined, 2);
+                for (var _i = 0, fileNames_1 = fileNames; _i < fileNames_1.length; _i++) {
+                    var fileName = fileNames_1[_i];
+                    var normalizedFileName = ts.normalizePath(fileName);
+                    if (ts.getBaseFileName(normalizedFileName) !== "package.json") {
+                        continue;
+                    }
+                    var result = ts.readConfigFile(normalizedFileName, function (path) { return host.readFile(path); });
+                    if (!result.config) {
+                        continue;
+                    }
+                    var packageJson = result.config;
+                    if (packageJson._requiredBy &&
+                        ts.filter(packageJson._requiredBy, function (r) { return r[0] === "#" || r === "/"; }).length === 0) {
+                        continue;
+                    }
+                    if (!packageJson.name) {
+                        continue;
+                    }
+                    if (packageJson.typings) {
+                        var absolutePath = ts.getNormalizedAbsolutePath(packageJson.typings, ts.getDirectoryPath(normalizedFileName));
+                        inferredTypings[packageJson.name] = absolutePath;
+                    }
+                    else {
+                        typingNames.push(packageJson.name);
+                    }
+                }
+                mergeTypings(typingNames);
+            }
+        }
+        JsTyping.discoverTypings = discoverTypings;
+    })(JsTyping = ts.JsTyping || (ts.JsTyping = {}));
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -36153,10 +39074,10 @@ var ts;
             function shouldRescanJsxIdentifier(node) {
                 if (node.parent) {
                     switch (node.parent.kind) {
+                        case 245:
+                        case 242:
+                        case 244:
                         case 241:
-                        case 238:
-                        case 240:
-                        case 237:
                             return node.kind === 69;
                     }
                 }
@@ -36467,21 +39388,21 @@ var ts;
             function Rules() {
                 this.IgnoreBeforeComment = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.Comments), formatting.RuleOperation.create1(1));
                 this.IgnoreAfterLineComment = new formatting.Rule(formatting.RuleDescriptor.create3(2, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create1(1));
-                this.NoSpaceBeforeSemicolon = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 23), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.NoSpaceBeforeColon = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 54), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), 8));
-                this.NoSpaceBeforeQuestionMark = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 53), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), 8));
-                this.SpaceAfterColon = new formatting.Rule(formatting.RuleDescriptor.create3(54, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), 2));
-                this.SpaceAfterQuestionMarkInConditionalOperator = new formatting.Rule(formatting.RuleDescriptor.create3(53, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsConditionalOperatorContext), 2));
-                this.NoSpaceAfterQuestionMark = new formatting.Rule(formatting.RuleDescriptor.create3(53, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.SpaceAfterSemicolon = new formatting.Rule(formatting.RuleDescriptor.create3(23, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.SpaceAfterCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create3(16, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsAfterCodeBlockContext), 2));
-                this.SpaceBetweenCloseBraceAndElse = new formatting.Rule(formatting.RuleDescriptor.create1(16, 80), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.SpaceBetweenCloseBraceAndWhile = new formatting.Rule(formatting.RuleDescriptor.create1(16, 104), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.NoSpaceAfterCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create3(16, formatting.Shared.TokenRange.FromTokens([18, 20, 24, 23])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.NoSpaceBeforeDot = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 21), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.NoSpaceAfterDot = new formatting.Rule(formatting.RuleDescriptor.create3(21, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.NoSpaceBeforeOpenBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 19), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.NoSpaceAfterCloseBracket = new formatting.Rule(formatting.RuleDescriptor.create3(20, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBeforeBlockInFunctionDeclarationContext), 8));
+                this.NoSpaceBeforeSemicolon = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 23), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.NoSpaceBeforeColon = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 54), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBinaryOpContext), 8));
+                this.NoSpaceBeforeQuestionMark = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 53), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBinaryOpContext), 8));
+                this.SpaceAfterColon = new formatting.Rule(formatting.RuleDescriptor.create3(54, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBinaryOpContext), 2));
+                this.SpaceAfterQuestionMarkInConditionalOperator = new formatting.Rule(formatting.RuleDescriptor.create3(53, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsConditionalOperatorContext), 2));
+                this.NoSpaceAfterQuestionMark = new formatting.Rule(formatting.RuleDescriptor.create3(53, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.SpaceAfterSemicolon = new formatting.Rule(formatting.RuleDescriptor.create3(23, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
+                this.SpaceAfterCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create3(16, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsAfterCodeBlockContext), 2));
+                this.SpaceBetweenCloseBraceAndElse = new formatting.Rule(formatting.RuleDescriptor.create1(16, 80), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
+                this.SpaceBetweenCloseBraceAndWhile = new formatting.Rule(formatting.RuleDescriptor.create1(16, 104), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
+                this.NoSpaceAfterCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create3(16, formatting.Shared.TokenRange.FromTokens([18, 20, 24, 23])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.NoSpaceBeforeDot = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 21), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.NoSpaceAfterDot = new formatting.Rule(formatting.RuleDescriptor.create3(21, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.NoSpaceBeforeOpenBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 19), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.NoSpaceAfterCloseBracket = new formatting.Rule(formatting.RuleDescriptor.create3(20, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBeforeBlockInFunctionDeclarationContext), 8));
                 this.FunctionOpenBraceLeftTokenRange = formatting.Shared.TokenRange.AnyIncludingMultilineComments;
                 this.SpaceBeforeOpenBraceInFunction = new formatting.Rule(formatting.RuleDescriptor.create2(this.FunctionOpenBraceLeftTokenRange, 15), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext, Rules.IsBeforeBlockContext, Rules.IsNotFormatOnEnter, Rules.IsSameLineTokenOrBeforeMultilineBlockContext), 2), 1);
                 this.TypeScriptOpenBraceLeftTokenRange = formatting.Shared.TokenRange.FromTokens([69, 3, 73]);
@@ -36490,59 +39411,59 @@ var ts;
                 this.SpaceBeforeOpenBraceInControl = new formatting.Rule(formatting.RuleDescriptor.create2(this.ControlOpenBraceLeftTokenRange, 15), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsControlDeclContext, Rules.IsNotFormatOnEnter, Rules.IsSameLineTokenOrBeforeMultilineBlockContext), 2), 1);
                 this.SpaceAfterOpenBrace = new formatting.Rule(formatting.RuleDescriptor.create3(15, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSingleLineBlockContext), 2));
                 this.SpaceBeforeCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSingleLineBlockContext), 2));
-                this.NoSpaceBetweenEmptyBraceBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(15, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsObjectContext), 8));
+                this.NoSpaceBetweenEmptyBraceBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(15, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsObjectContext), 8));
                 this.NewLineAfterOpenBraceInBlockContext = new formatting.Rule(formatting.RuleDescriptor.create3(15, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsMultilineBlockContext), 4));
                 this.NewLineBeforeCloseBraceInBlockContext = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.AnyIncludingMultilineComments, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsMultilineBlockContext), 4));
-                this.NoSpaceAfterUnaryPrefixOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.UnaryPrefixOperators, formatting.Shared.TokenRange.UnaryPrefixExpressions), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), 8));
-                this.NoSpaceAfterUnaryPreincrementOperator = new formatting.Rule(formatting.RuleDescriptor.create3(41, formatting.Shared.TokenRange.UnaryPreincrementExpressions), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.NoSpaceAfterUnaryPredecrementOperator = new formatting.Rule(formatting.RuleDescriptor.create3(42, formatting.Shared.TokenRange.UnaryPredecrementExpressions), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.NoSpaceBeforeUnaryPostincrementOperator = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.UnaryPostincrementExpressions, 41), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.NoSpaceBeforeUnaryPostdecrementOperator = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.UnaryPostdecrementExpressions, 42), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.SpaceAfterPostincrementWhenFollowedByAdd = new formatting.Rule(formatting.RuleDescriptor.create1(41, 35), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2));
-                this.SpaceAfterAddWhenFollowedByUnaryPlus = new formatting.Rule(formatting.RuleDescriptor.create1(35, 35), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2));
-                this.SpaceAfterAddWhenFollowedByPreincrement = new formatting.Rule(formatting.RuleDescriptor.create1(35, 41), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2));
-                this.SpaceAfterPostdecrementWhenFollowedBySubtract = new formatting.Rule(formatting.RuleDescriptor.create1(42, 36), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2));
-                this.SpaceAfterSubtractWhenFollowedByUnaryMinus = new formatting.Rule(formatting.RuleDescriptor.create1(36, 36), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2));
-                this.SpaceAfterSubtractWhenFollowedByPredecrement = new formatting.Rule(formatting.RuleDescriptor.create1(36, 42), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2));
-                this.NoSpaceBeforeComma = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 24), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.SpaceAfterCertainKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([102, 98, 92, 78, 94, 101, 119]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.SpaceAfterLetConstInVariableDeclaration = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([108, 74]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsStartOfVariableDeclarationList), 2));
-                this.NoSpaceBeforeOpenParenInFuncCall = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 17), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsFunctionCallOrNewContext, Rules.IsPreviousTokenNotComma), 8));
+                this.NoSpaceAfterUnaryPrefixOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.UnaryPrefixOperators, formatting.Shared.TokenRange.UnaryPrefixExpressions), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBinaryOpContext), 8));
+                this.NoSpaceAfterUnaryPreincrementOperator = new formatting.Rule(formatting.RuleDescriptor.create3(41, formatting.Shared.TokenRange.UnaryPreincrementExpressions), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.NoSpaceAfterUnaryPredecrementOperator = new formatting.Rule(formatting.RuleDescriptor.create3(42, formatting.Shared.TokenRange.UnaryPredecrementExpressions), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.NoSpaceBeforeUnaryPostincrementOperator = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.UnaryPostincrementExpressions, 41), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.NoSpaceBeforeUnaryPostdecrementOperator = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.UnaryPostdecrementExpressions, 42), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.SpaceAfterPostincrementWhenFollowedByAdd = new formatting.Rule(formatting.RuleDescriptor.create1(41, 35), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2));
+                this.SpaceAfterAddWhenFollowedByUnaryPlus = new formatting.Rule(formatting.RuleDescriptor.create1(35, 35), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2));
+                this.SpaceAfterAddWhenFollowedByPreincrement = new formatting.Rule(formatting.RuleDescriptor.create1(35, 41), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2));
+                this.SpaceAfterPostdecrementWhenFollowedBySubtract = new formatting.Rule(formatting.RuleDescriptor.create1(42, 36), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2));
+                this.SpaceAfterSubtractWhenFollowedByUnaryMinus = new formatting.Rule(formatting.RuleDescriptor.create1(36, 36), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2));
+                this.SpaceAfterSubtractWhenFollowedByPredecrement = new formatting.Rule(formatting.RuleDescriptor.create1(36, 42), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2));
+                this.NoSpaceBeforeComma = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 24), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.SpaceAfterCertainKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([102, 98, 92, 78, 94, 101, 119]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
+                this.SpaceAfterLetConstInVariableDeclaration = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([108, 74]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsStartOfVariableDeclarationList), 2));
+                this.NoSpaceBeforeOpenParenInFuncCall = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 17), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsFunctionCallOrNewContext, Rules.IsPreviousTokenNotComma), 8));
                 this.SpaceAfterFunctionInFuncDecl = new formatting.Rule(formatting.RuleDescriptor.create3(87, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2));
-                this.NoSpaceBeforeOpenParenInFuncDecl = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 17), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsFunctionDeclContext), 8));
-                this.SpaceAfterVoidOperator = new formatting.Rule(formatting.RuleDescriptor.create3(103, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsVoidOpContext), 2));
-                this.NoSpaceBetweenReturnAndSemicolon = new formatting.Rule(formatting.RuleDescriptor.create1(94, 23), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.SpaceBetweenStatements = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([18, 79, 80, 71]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotForContext), 2));
-                this.SpaceAfterTryFinally = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([100, 85]), 15), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([123, 129]), 69), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2));
-                this.SpaceBeforeBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryKeywordOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2));
-                this.SpaceAfterBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryKeywordOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2));
-                this.NoSpaceAfterConstructor = new formatting.Rule(formatting.RuleDescriptor.create1(121, 17), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([125, 127]), 17), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([115, 73, 122, 77, 81, 82, 83, 123, 106, 89, 107, 125, 126, 110, 112, 111, 129, 113, 132]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([83, 106])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
+                this.NoSpaceBeforeOpenParenInFuncDecl = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 17), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsFunctionDeclContext), 8));
+                this.SpaceAfterVoidOperator = new formatting.Rule(formatting.RuleDescriptor.create3(103, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsVoidOpContext), 2));
+                this.NoSpaceBetweenReturnAndSemicolon = new formatting.Rule(formatting.RuleDescriptor.create1(94, 23), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.SpaceBetweenStatements = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([18, 79, 80, 71]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotForContext), 2));
+                this.SpaceAfterTryFinally = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([100, 85]), 15), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
+                this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([123, 130]), 69), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2));
+                this.SpaceBeforeBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryKeywordOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2));
+                this.SpaceAfterBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryKeywordOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2));
+                this.NoSpaceAfterConstructor = new formatting.Rule(formatting.RuleDescriptor.create1(121, 17), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([125, 128]), 17), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([115, 73, 122, 77, 81, 82, 83, 123, 106, 89, 107, 125, 126, 110, 112, 111, 130, 113, 133]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
+                this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([83, 106])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
                 this.SpaceAfterModuleName = new formatting.Rule(formatting.RuleDescriptor.create1(9, 15), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsModuleDeclContext), 2));
-                this.SpaceBeforeArrow = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 34), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.SpaceAfterArrow = new formatting.Rule(formatting.RuleDescriptor.create3(34, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.NoSpaceAfterEllipsis = new formatting.Rule(formatting.RuleDescriptor.create1(22, 69), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.NoSpaceAfterOptionalParameters = new formatting.Rule(formatting.RuleDescriptor.create3(53, formatting.Shared.TokenRange.FromTokens([18, 24])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), 8));
-                this.NoSpaceBeforeOpenAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.TypeNames, 25), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8));
-                this.NoSpaceBetweenCloseParenAndAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create1(18, 25), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8));
-                this.NoSpaceAfterOpenAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(25, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8));
-                this.NoSpaceBeforeCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 27), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8));
-                this.NoSpaceAfterCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(27, formatting.Shared.TokenRange.FromTokens([17, 19, 27, 24])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8));
-                this.NoSpaceAfterTypeAssertion = new formatting.Rule(formatting.RuleDescriptor.create3(27, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeAssertionContext), 8));
-                this.NoSpaceBetweenEmptyInterfaceBraceBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(15, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsObjectTypeContext), 8));
-                this.SpaceBeforeAt = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 55), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.NoSpaceAfterAt = new formatting.Rule(formatting.RuleDescriptor.create3(55, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.SpaceAfterDecorator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([115, 69, 82, 77, 73, 113, 112, 110, 111, 123, 129, 19, 37])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsEndOfDecoratorContextOnSameLine), 2));
+                this.SpaceBeforeArrow = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 34), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
+                this.SpaceAfterArrow = new formatting.Rule(formatting.RuleDescriptor.create3(34, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
+                this.NoSpaceAfterEllipsis = new formatting.Rule(formatting.RuleDescriptor.create1(22, 69), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.NoSpaceAfterOptionalParameters = new formatting.Rule(formatting.RuleDescriptor.create3(53, formatting.Shared.TokenRange.FromTokens([18, 24])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBinaryOpContext), 8));
+                this.NoSpaceBeforeOpenAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.TypeNames, 25), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8));
+                this.NoSpaceBetweenCloseParenAndAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create1(18, 25), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8));
+                this.NoSpaceAfterOpenAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(25, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8));
+                this.NoSpaceBeforeCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 27), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8));
+                this.NoSpaceAfterCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(27, formatting.Shared.TokenRange.FromTokens([17, 19, 27, 24])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8));
+                this.NoSpaceAfterTypeAssertion = new formatting.Rule(formatting.RuleDescriptor.create3(27, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeAssertionContext), 8));
+                this.NoSpaceBetweenEmptyInterfaceBraceBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(15, 16), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsObjectTypeContext), 8));
+                this.SpaceBeforeAt = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 55), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
+                this.NoSpaceAfterAt = new formatting.Rule(formatting.RuleDescriptor.create3(55, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.SpaceAfterDecorator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([115, 69, 82, 77, 73, 113, 112, 110, 111, 123, 130, 19, 37])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsEndOfDecoratorContextOnSameLine), 2));
                 this.NoSpaceBetweenFunctionKeywordAndStar = new formatting.Rule(formatting.RuleDescriptor.create1(87, 37), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclarationOrFunctionExpressionContext), 8));
                 this.SpaceAfterStarInGeneratorDeclaration = new formatting.Rule(formatting.RuleDescriptor.create3(37, formatting.Shared.TokenRange.FromTokens([69, 17])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclarationOrFunctionExpressionContext), 2));
-                this.NoSpaceBetweenYieldKeywordAndStar = new formatting.Rule(formatting.RuleDescriptor.create1(114, 37), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsYieldOrYieldStarWithOperand), 8));
-                this.SpaceBetweenYieldOrYieldStarAndOperand = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([114, 37]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsYieldOrYieldStarWithOperand), 2));
-                this.SpaceBetweenAsyncAndOpenParen = new formatting.Rule(formatting.RuleDescriptor.create1(118, 17), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsArrowFunctionContext, Rules.IsSameLineTokenContext), 2));
-                this.SpaceBetweenAsyncAndFunctionKeyword = new formatting.Rule(formatting.RuleDescriptor.create1(118, 87), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.NoSpaceBetweenTagAndTemplateString = new formatting.Rule(formatting.RuleDescriptor.create3(69, formatting.Shared.TokenRange.FromTokens([11, 12])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
+                this.NoSpaceBetweenYieldKeywordAndStar = new formatting.Rule(formatting.RuleDescriptor.create1(114, 37), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsYieldOrYieldStarWithOperand), 8));
+                this.SpaceBetweenYieldOrYieldStarAndOperand = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([114, 37]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsYieldOrYieldStarWithOperand), 2));
+                this.SpaceBetweenAsyncAndOpenParen = new formatting.Rule(formatting.RuleDescriptor.create1(118, 17), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsArrowFunctionContext, Rules.IsNonJsxSameLineTokenContext), 2));
+                this.SpaceBetweenAsyncAndFunctionKeyword = new formatting.Rule(formatting.RuleDescriptor.create1(118, 87), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
+                this.NoSpaceBetweenTagAndTemplateString = new formatting.Rule(formatting.RuleDescriptor.create3(69, formatting.Shared.TokenRange.FromTokens([11, 12])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
                 this.HighPriorityCommonRules = [
                     this.IgnoreBeforeComment, this.IgnoreAfterLineComment,
                     this.NoSpaceBeforeColon, this.SpaceAfterColon, this.NoSpaceBeforeQuestionMark, this.SpaceAfterQuestionMarkInConditionalOperator,
@@ -36596,73 +39517,73 @@ var ts;
                     this.NoSpaceBeforeOpenParenInFuncDecl,
                     this.SpaceBetweenStatements, this.SpaceAfterTryFinally
                 ];
-                this.SpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(24, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNextTokenNotCloseBracket), 2));
-                this.NoSpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(24, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.SpaceBeforeBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2));
-                this.SpaceAfterBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2));
-                this.NoSpaceBeforeBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 8));
-                this.NoSpaceAfterBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 8));
+                this.SpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(24, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNextTokenNotCloseBracket), 2));
+                this.NoSpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(24, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.SpaceBeforeBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2));
+                this.SpaceAfterBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2));
+                this.NoSpaceBeforeBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 8));
+                this.NoSpaceAfterBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 8));
                 this.SpaceAfterKeywordInControl = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Keywords, 17), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsControlDeclContext), 2));
                 this.NoSpaceAfterKeywordInControl = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Keywords, 17), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsControlDeclContext), 8));
                 this.NewLineBeforeOpenBraceInFunction = new formatting.Rule(formatting.RuleDescriptor.create2(this.FunctionOpenBraceLeftTokenRange, 15), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext, Rules.IsBeforeMultilineBlockContext), 4), 1);
                 this.NewLineBeforeOpenBraceInTypeScriptDeclWithBlock = new formatting.Rule(formatting.RuleDescriptor.create2(this.TypeScriptOpenBraceLeftTokenRange, 15), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsTypeScriptDeclWithBlockContext, Rules.IsBeforeMultilineBlockContext), 4), 1);
                 this.NewLineBeforeOpenBraceInControl = new formatting.Rule(formatting.RuleDescriptor.create2(this.ControlOpenBraceLeftTokenRange, 15), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsControlDeclContext, Rules.IsBeforeMultilineBlockContext), 4), 1);
-                this.SpaceAfterSemicolonInFor = new formatting.Rule(formatting.RuleDescriptor.create3(23, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsForContext), 2));
-                this.NoSpaceAfterSemicolonInFor = new formatting.Rule(formatting.RuleDescriptor.create3(23, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsForContext), 8));
-                this.SpaceAfterOpenParen = new formatting.Rule(formatting.RuleDescriptor.create3(17, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.SpaceBeforeCloseParen = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 18), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.NoSpaceBetweenParens = new formatting.Rule(formatting.RuleDescriptor.create1(17, 18), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.NoSpaceAfterOpenParen = new formatting.Rule(formatting.RuleDescriptor.create3(17, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.NoSpaceBeforeCloseParen = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 18), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.SpaceAfterOpenBracket = new formatting.Rule(formatting.RuleDescriptor.create3(19, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.SpaceBeforeCloseBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 20), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.NoSpaceBetweenBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(19, 20), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.NoSpaceAfterOpenBracket = new formatting.Rule(formatting.RuleDescriptor.create3(19, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.NoSpaceBeforeCloseBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 20), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.NoSpaceAfterTemplateHeadAndMiddle = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([12, 13]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.SpaceAfterTemplateHeadAndMiddle = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([12, 13]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
-                this.NoSpaceBeforeTemplateMiddleAndTail = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([13, 14])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8));
-                this.SpaceBeforeTemplateMiddleAndTail = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([13, 14])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2));
+                this.SpaceAfterSemicolonInFor = new formatting.Rule(formatting.RuleDescriptor.create3(23, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsForContext), 2));
+                this.NoSpaceAfterSemicolonInFor = new formatting.Rule(formatting.RuleDescriptor.create3(23, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsForContext), 8));
+                this.SpaceAfterOpenParen = new formatting.Rule(formatting.RuleDescriptor.create3(17, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
+                this.SpaceBeforeCloseParen = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 18), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
+                this.NoSpaceBetweenParens = new formatting.Rule(formatting.RuleDescriptor.create1(17, 18), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.NoSpaceAfterOpenParen = new formatting.Rule(formatting.RuleDescriptor.create3(17, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.NoSpaceBeforeCloseParen = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 18), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.SpaceAfterOpenBracket = new formatting.Rule(formatting.RuleDescriptor.create3(19, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
+                this.SpaceBeforeCloseBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 20), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
+                this.NoSpaceBetweenBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(19, 20), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.NoSpaceAfterOpenBracket = new formatting.Rule(formatting.RuleDescriptor.create3(19, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.NoSpaceBeforeCloseBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 20), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.NoSpaceAfterTemplateHeadAndMiddle = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([12, 13]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.SpaceAfterTemplateHeadAndMiddle = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([12, 13]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
+                this.NoSpaceBeforeTemplateMiddleAndTail = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([13, 14])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8));
+                this.SpaceBeforeTemplateMiddleAndTail = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([13, 14])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2));
                 this.SpaceAfterAnonymousFunctionKeyword = new formatting.Rule(formatting.RuleDescriptor.create1(87, 17), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2));
                 this.NoSpaceAfterAnonymousFunctionKeyword = new formatting.Rule(formatting.RuleDescriptor.create1(87, 17), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 8));
             }
             Rules.prototype.getRuleName = function (rule) {
                 var o = this;
-                for (var name_33 in o) {
-                    if (o[name_33] === rule) {
-                        return name_33;
+                for (var name_38 in o) {
+                    if (o[name_38] === rule) {
+                        return name_38;
                     }
                 }
                 throw new Error("Unknown rule");
             };
             Rules.IsForContext = function (context) {
-                return context.contextNode.kind === 202;
+                return context.contextNode.kind === 205;
             };
             Rules.IsNotForContext = function (context) {
                 return !Rules.IsForContext(context);
             };
             Rules.IsBinaryOpContext = function (context) {
                 switch (context.contextNode.kind) {
-                    case 184:
-                    case 185:
-                    case 192:
-                    case 151:
-                    case 159:
-                    case 160:
+                    case 186:
+                    case 187:
+                    case 194:
+                    case 153:
+                    case 161:
+                    case 162:
                         return true;
-                    case 166:
-                    case 219:
-                    case 224:
-                    case 214:
-                    case 139:
-                    case 250:
-                    case 142:
+                    case 168:
+                    case 222:
+                    case 228:
+                    case 217:
                     case 141:
+                    case 254:
+                    case 144:
+                    case 143:
                         return context.currentTokenSpan.kind === 56 || context.nextTokenSpan.kind === 56;
-                    case 203:
+                    case 206:
                         return context.currentTokenSpan.kind === 90 || context.nextTokenSpan.kind === 90;
-                    case 204:
-                        return context.currentTokenSpan.kind === 135 || context.nextTokenSpan.kind === 135;
+                    case 207:
+                        return context.currentTokenSpan.kind === 137 || context.nextTokenSpan.kind === 137;
                 }
                 return false;
             };
@@ -36670,7 +39591,7 @@ var ts;
                 return !Rules.IsBinaryOpContext(context);
             };
             Rules.IsConditionalOperatorContext = function (context) {
-                return context.contextNode.kind === 185;
+                return context.contextNode.kind === 187;
             };
             Rules.IsSameLineTokenOrBeforeMultilineBlockContext = function (context) {
                 return context.TokensAreOnSameLine() || Rules.IsBeforeMultilineBlockContext(context);
@@ -36695,86 +39616,86 @@ var ts;
                     return true;
                 }
                 switch (node.kind) {
-                    case 195:
-                    case 223:
-                    case 168:
-                    case 222:
+                    case 198:
+                    case 226:
+                    case 170:
+                    case 225:
                         return true;
                 }
                 return false;
             };
             Rules.IsFunctionDeclContext = function (context) {
                 switch (context.contextNode.kind) {
-                    case 216:
-                    case 144:
-                    case 143:
+                    case 219:
                     case 146:
-                    case 147:
-                    case 148:
-                    case 176:
                     case 145:
-                    case 177:
-                    case 218:
+                    case 148:
+                    case 149:
+                    case 150:
+                    case 178:
+                    case 147:
+                    case 179:
+                    case 221:
                         return true;
                 }
                 return false;
             };
             Rules.IsFunctionDeclarationOrFunctionExpressionContext = function (context) {
-                return context.contextNode.kind === 216 || context.contextNode.kind === 176;
+                return context.contextNode.kind === 219 || context.contextNode.kind === 178;
             };
             Rules.IsTypeScriptDeclWithBlockContext = function (context) {
                 return Rules.NodeIsTypeScriptDeclWithBlockContext(context.contextNode);
             };
             Rules.NodeIsTypeScriptDeclWithBlockContext = function (node) {
                 switch (node.kind) {
-                    case 217:
-                    case 189:
-                    case 218:
                     case 220:
-                    case 156:
+                    case 191:
                     case 221:
+                    case 223:
+                    case 158:
+                    case 224:
                         return true;
                 }
                 return false;
             };
             Rules.IsAfterCodeBlockContext = function (context) {
                 switch (context.currentTokenParent.kind) {
-                    case 217:
-                    case 221:
                     case 220:
-                    case 195:
-                    case 247:
-                    case 222:
-                    case 209:
+                    case 224:
+                    case 223:
+                    case 198:
+                    case 251:
+                    case 225:
+                    case 212:
                         return true;
                 }
                 return false;
             };
             Rules.IsControlDeclContext = function (context) {
                 switch (context.contextNode.kind) {
-                    case 199:
-                    case 209:
                     case 202:
-                    case 203:
-                    case 204:
-                    case 201:
                     case 212:
-                    case 200:
-                    case 208:
-                    case 247:
+                    case 205:
+                    case 206:
+                    case 207:
+                    case 204:
+                    case 215:
+                    case 203:
+                    case 211:
+                    case 251:
                         return true;
                     default:
                         return false;
                 }
             };
             Rules.IsObjectContext = function (context) {
-                return context.contextNode.kind === 168;
+                return context.contextNode.kind === 170;
             };
             Rules.IsFunctionCallContext = function (context) {
-                return context.contextNode.kind === 171;
+                return context.contextNode.kind === 173;
             };
             Rules.IsNewContext = function (context) {
-                return context.contextNode.kind === 172;
+                return context.contextNode.kind === 174;
             };
             Rules.IsFunctionCallOrNewContext = function (context) {
                 return Rules.IsFunctionCallContext(context) || Rules.IsNewContext(context);
@@ -36786,10 +39707,10 @@ var ts;
                 return context.nextTokenSpan.kind !== 20;
             };
             Rules.IsArrowFunctionContext = function (context) {
-                return context.contextNode.kind === 177;
+                return context.contextNode.kind === 179;
             };
-            Rules.IsSameLineTokenContext = function (context) {
-                return context.TokensAreOnSameLine();
+            Rules.IsNonJsxSameLineTokenContext = function (context) {
+                return context.TokensAreOnSameLine() && context.contextNode.kind !== 243;
             };
             Rules.IsNotBeforeBlockInFunctionDeclarationContext = function (context) {
                 return !Rules.IsFunctionDeclContext(context) && !Rules.IsBeforeBlockContext(context);
@@ -36804,41 +39725,41 @@ var ts;
                 while (ts.isExpression(node)) {
                     node = node.parent;
                 }
-                return node.kind === 140;
+                return node.kind === 142;
             };
             Rules.IsStartOfVariableDeclarationList = function (context) {
-                return context.currentTokenParent.kind === 215 &&
+                return context.currentTokenParent.kind === 218 &&
                     context.currentTokenParent.getStart(context.sourceFile) === context.currentTokenSpan.pos;
             };
             Rules.IsNotFormatOnEnter = function (context) {
                 return context.formattingRequestKind !== 2;
             };
             Rules.IsModuleDeclContext = function (context) {
-                return context.contextNode.kind === 221;
+                return context.contextNode.kind === 224;
             };
             Rules.IsObjectTypeContext = function (context) {
-                return context.contextNode.kind === 156;
+                return context.contextNode.kind === 158;
             };
             Rules.IsTypeArgumentOrParameterOrAssertion = function (token, parent) {
                 if (token.kind !== 25 && token.kind !== 27) {
                     return false;
                 }
                 switch (parent.kind) {
-                    case 152:
-                    case 174:
-                    case 217:
-                    case 189:
-                    case 218:
-                    case 216:
+                    case 154:
                     case 176:
-                    case 177:
-                    case 144:
-                    case 143:
-                    case 148:
-                    case 149:
-                    case 171:
-                    case 172:
+                    case 220:
                     case 191:
+                    case 221:
+                    case 219:
+                    case 178:
+                    case 179:
+                    case 146:
+                    case 145:
+                    case 150:
+                    case 151:
+                    case 173:
+                    case 174:
+                    case 193:
                         return true;
                     default:
                         return false;
@@ -36849,13 +39770,13 @@ var ts;
                     Rules.IsTypeArgumentOrParameterOrAssertion(context.nextTokenSpan, context.nextTokenParent);
             };
             Rules.IsTypeAssertionContext = function (context) {
-                return context.contextNode.kind === 174;
+                return context.contextNode.kind === 176;
             };
             Rules.IsVoidOpContext = function (context) {
-                return context.currentTokenSpan.kind === 103 && context.currentTokenParent.kind === 180;
+                return context.currentTokenSpan.kind === 103 && context.currentTokenParent.kind === 182;
             };
             Rules.IsYieldOrYieldStarWithOperand = function (context) {
-                return context.contextNode.kind === 187 && context.contextNode.expression !== undefined;
+                return context.contextNode.kind === 189 && context.contextNode.expression !== undefined;
             };
             return Rules;
         }());
@@ -36877,7 +39798,7 @@ var ts;
                 return result;
             };
             RulesMap.prototype.Initialize = function (rules) {
-                this.mapRowLength = 135 + 1;
+                this.mapRowLength = 137 + 1;
                 this.map = new Array(this.mapRowLength * this.mapRowLength);
                 var rulesBucketConstructionStateList = new Array(this.map.length);
                 this.FillRules(rules, rulesBucketConstructionStateList);
@@ -37053,7 +39974,7 @@ var ts;
                 }
                 TokenAllAccess.prototype.GetTokens = function () {
                     var result = [];
-                    for (var token = 0; token <= 135; token++) {
+                    for (var token = 0; token <= 137; token++) {
                         result.push(token);
                     }
                     return result;
@@ -37095,9 +40016,9 @@ var ts;
                 };
                 TokenRange.Any = TokenRange.AllTokens();
                 TokenRange.AnyIncludingMultilineComments = TokenRange.FromTokens(TokenRange.Any.GetTokens().concat([3]));
-                TokenRange.Keywords = TokenRange.FromRange(70, 135);
+                TokenRange.Keywords = TokenRange.FromRange(70, 137);
                 TokenRange.BinaryOperators = TokenRange.FromRange(25, 68);
-                TokenRange.BinaryKeywordOperators = TokenRange.FromTokens([90, 91, 135, 116, 124]);
+                TokenRange.BinaryKeywordOperators = TokenRange.FromTokens([90, 91, 137, 116, 124]);
                 TokenRange.UnaryPrefixOperators = TokenRange.FromTokens([41, 42, 50, 49]);
                 TokenRange.UnaryPrefixExpressions = TokenRange.FromTokens([8, 69, 17, 19, 15, 97, 92]);
                 TokenRange.UnaryPreincrementExpressions = TokenRange.FromTokens([69, 17, 97, 92]);
@@ -37105,7 +40026,7 @@ var ts;
                 TokenRange.UnaryPredecrementExpressions = TokenRange.FromTokens([69, 17, 97, 92]);
                 TokenRange.UnaryPostdecrementExpressions = TokenRange.FromTokens([69, 18, 20, 92]);
                 TokenRange.Comments = TokenRange.FromTokens([2, 3]);
-                TokenRange.TypeNames = TokenRange.FromTokens([69, 128, 130, 120, 131, 103, 117]);
+                TokenRange.TypeNames = TokenRange.FromTokens([69, 129, 131, 120, 132, 103, 117]);
                 return TokenRange;
             }());
             Shared.TokenRange = TokenRange;
@@ -37224,9 +40145,13 @@ var ts;
             if (line === 0) {
                 return [];
             }
+            var endOfFormatSpan = ts.getEndLinePosition(line, sourceFile);
+            while (ts.isWhiteSpace(sourceFile.text.charCodeAt(endOfFormatSpan)) && !ts.isLineBreak(sourceFile.text.charCodeAt(endOfFormatSpan))) {
+                endOfFormatSpan--;
+            }
             var span = {
                 pos: ts.getStartPositionOfLine(line - 1, sourceFile),
-                end: ts.getEndLinePosition(line, sourceFile) + 1
+                end: endOfFormatSpan + 1
             };
             return formatSpan(span, sourceFile, options, rulesProvider, 2);
         }
@@ -37284,17 +40209,17 @@ var ts;
         }
         function isListElement(parent, node) {
             switch (parent.kind) {
-                case 217:
-                case 218:
-                    return ts.rangeContainsRange(parent.members, node);
+                case 220:
                 case 221:
+                    return ts.rangeContainsRange(parent.members, node);
+                case 224:
                     var body = parent.body;
-                    return body && body.kind === 195 && ts.rangeContainsRange(body.statements, node);
-                case 251:
-                case 195:
-                case 222:
+                    return body && body.kind === 198 && ts.rangeContainsRange(body.statements, node);
+                case 255:
+                case 198:
+                case 225:
                     return ts.rangeContainsRange(parent.statements, node);
-                case 247:
+                case 251:
                     return ts.rangeContainsRange(parent.block.statements, node);
             }
             return false;
@@ -37449,18 +40374,18 @@ var ts;
                     return node.modifiers[0].kind;
                 }
                 switch (node.kind) {
-                    case 217: return 73;
-                    case 218: return 107;
-                    case 216: return 87;
-                    case 220: return 220;
-                    case 146: return 123;
-                    case 147: return 129;
-                    case 144:
+                    case 220: return 73;
+                    case 221: return 107;
+                    case 219: return 87;
+                    case 223: return 223;
+                    case 148: return 123;
+                    case 149: return 130;
+                    case 146:
                         if (node.asteriskToken) {
                             return 37;
                         }
-                    case 142:
-                    case 139:
+                    case 144:
+                    case 141:
                         return node.name.kind;
                 }
             }
@@ -37573,7 +40498,7 @@ var ts;
                         consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation, child);
                         return inheritedIndentation;
                     }
-                    var effectiveParentStartLine = child.kind === 140 ? childStartLine : undecoratedParentStartLine;
+                    var effectiveParentStartLine = child.kind === 142 ? childStartLine : undecoratedParentStartLine;
                     var childIndentation = computeIndentation(child, childStartLine, childIndentationAmount, node, parentDynamicIndentation, effectiveParentStartLine);
                     processNode(child, childContextNode, childStartLine, undecoratedChildStartLine, childIndentation.indentation, childIndentation.delta);
                     childContextNode = node;
@@ -37602,8 +40527,8 @@ var ts;
                         }
                     }
                     var inheritedIndentation = -1;
-                    for (var _i = 0, nodes_6 = nodes; _i < nodes_6.length; _i++) {
-                        var child = nodes_6[_i];
+                    for (var _i = 0, nodes_7 = nodes; _i < nodes_7.length; _i++) {
+                        var child = nodes_7[_i];
                         inheritedIndentation = processChildNode(child, inheritedIndentation, node, listDynamicIndentation, startLine, startLine, true);
                     }
                     if (listEndToken !== 0) {
@@ -37876,20 +40801,20 @@ var ts;
         }
         function isSomeBlock(kind) {
             switch (kind) {
-                case 195:
-                case 222:
+                case 198:
+                case 225:
                     return true;
             }
             return false;
         }
         function getOpenTokenForList(node, list) {
             switch (node.kind) {
+                case 147:
+                case 219:
+                case 178:
+                case 146:
                 case 145:
-                case 216:
-                case 176:
-                case 144:
-                case 143:
-                case 177:
+                case 179:
                     if (node.typeParameters === list) {
                         return 25;
                     }
@@ -37897,8 +40822,8 @@ var ts;
                         return 17;
                     }
                     break;
-                case 171:
-                case 172:
+                case 173:
+                case 174:
                     if (node.typeArguments === list) {
                         return 25;
                     }
@@ -37906,7 +40831,7 @@ var ts;
                         return 17;
                     }
                     break;
-                case 152:
+                case 154:
                     if (node.typeArguments === list) {
                         return 25;
                     }
@@ -37934,7 +40859,7 @@ var ts;
             if (!options.ConvertTabsToSpaces) {
                 var tabs = Math.floor(indentation / options.TabSize);
                 var spaces = indentation - tabs * options.TabSize;
-                var tabString;
+                var tabString = void 0;
                 if (!internedTabsIndentation) {
                     internedTabsIndentation = [];
                 }
@@ -37947,7 +40872,7 @@ var ts;
                 return spaces ? tabString + repeat(" ", spaces) : tabString;
             }
             else {
-                var spacesString;
+                var spacesString = void 0;
                 var quotient = Math.floor(indentation / options.IndentSize);
                 var remainder = indentation % options.IndentSize;
                 if (!internedSpacesIndentation) {
@@ -38007,7 +40932,7 @@ var ts;
                     var lineStart = ts.getLineStartPositionForPosition(current_1, sourceFile);
                     return SmartIndenter.findFirstNonWhitespaceColumn(lineStart, current_1, sourceFile, options);
                 }
-                if (precedingToken.kind === 24 && precedingToken.parent.kind !== 184) {
+                if (precedingToken.kind === 24 && precedingToken.parent.kind !== 186) {
                     var actualIndentation = getActualIndentationForListItemBeforeComma(precedingToken, sourceFile, options);
                     if (actualIndentation !== -1) {
                         return actualIndentation;
@@ -38105,7 +41030,7 @@ var ts;
             }
             function getActualIndentationForNode(current, parent, currentLineAndChar, parentAndChildShareLine, sourceFile, options) {
                 var useActualIndentation = (ts.isDeclaration(current) || ts.isStatement(current)) &&
-                    (parent.kind === 251 || !parentAndChildShareLine);
+                    (parent.kind === 255 || !parentAndChildShareLine);
                 if (!useActualIndentation) {
                     return -1;
                 }
@@ -38129,7 +41054,7 @@ var ts;
                 return sourceFile.getLineAndCharacterOfPosition(n.getStart(sourceFile));
             }
             function childStartsOnTheSameLineWithElseInIfStatement(parent, child, childStartLine, sourceFile) {
-                if (parent.kind === 199 && parent.elseStatement === child) {
+                if (parent.kind === 202 && parent.elseStatement === child) {
                     var elseKeyword = ts.findChildOfKind(parent, 80, sourceFile);
                     ts.Debug.assert(elseKeyword !== undefined);
                     var elseKeywordStartLine = getStartLineAndCharacterForNode(elseKeyword, sourceFile).line;
@@ -38141,23 +41066,23 @@ var ts;
             function getContainingList(node, sourceFile) {
                 if (node.parent) {
                     switch (node.parent.kind) {
-                        case 152:
+                        case 154:
                             if (node.parent.typeArguments &&
                                 ts.rangeContainsStartEnd(node.parent.typeArguments, node.getStart(sourceFile), node.getEnd())) {
                                 return node.parent.typeArguments;
                             }
                             break;
-                        case 168:
+                        case 170:
                             return node.parent.properties;
-                        case 167:
+                        case 169:
                             return node.parent.elements;
-                        case 216:
-                        case 176:
-                        case 177:
-                        case 144:
-                        case 143:
-                        case 148:
-                        case 149: {
+                        case 219:
+                        case 178:
+                        case 179:
+                        case 146:
+                        case 145:
+                        case 150:
+                        case 151: {
                             var start = node.getStart(sourceFile);
                             if (node.parent.typeParameters &&
                                 ts.rangeContainsStartEnd(node.parent.typeParameters, start, node.getEnd())) {
@@ -38168,8 +41093,8 @@ var ts;
                             }
                             break;
                         }
-                        case 172:
-                        case 171: {
+                        case 174:
+                        case 173: {
                             var start = node.getStart(sourceFile);
                             if (node.parent.typeArguments &&
                                 ts.rangeContainsStartEnd(node.parent.typeArguments, start, node.getEnd())) {
@@ -38197,8 +41122,8 @@ var ts;
                 if (node.kind === 18) {
                     return -1;
                 }
-                if (node.parent && (node.parent.kind === 171 ||
-                    node.parent.kind === 172) &&
+                if (node.parent && (node.parent.kind === 173 ||
+                    node.parent.kind === 174) &&
                     node.parent.expression !== node) {
                     var fullCallOrNewExpression = node.parent.expression;
                     var startingExpression = getStartingExpression(fullCallOrNewExpression);
@@ -38216,10 +41141,10 @@ var ts;
                 function getStartingExpression(node) {
                     while (true) {
                         switch (node.kind) {
+                            case 173:
+                            case 174:
                             case 171:
                             case 172:
-                            case 169:
-                            case 170:
                                 node = node.expression;
                                 break;
                             default:
@@ -38273,45 +41198,45 @@ var ts;
             SmartIndenter.findFirstNonWhitespaceColumn = findFirstNonWhitespaceColumn;
             function nodeContentIsAlwaysIndented(kind) {
                 switch (kind) {
-                    case 198:
-                    case 217:
-                    case 189:
-                    case 218:
+                    case 201:
                     case 220:
-                    case 219:
-                    case 167:
-                    case 195:
-                    case 222:
-                    case 168:
-                    case 156:
-                    case 158:
+                    case 191:
+                    case 221:
                     case 223:
-                    case 245:
-                    case 244:
-                    case 175:
+                    case 222:
                     case 169:
+                    case 198:
+                    case 225:
+                    case 170:
+                    case 158:
+                    case 160:
+                    case 226:
+                    case 249:
+                    case 248:
+                    case 177:
                     case 171:
-                    case 172:
-                    case 196:
-                    case 214:
-                    case 230:
-                    case 207:
-                    case 185:
-                    case 165:
-                    case 164:
-                    case 238:
-                    case 237:
-                    case 243:
-                    case 143:
-                    case 148:
-                    case 149:
-                    case 139:
-                    case 153:
-                    case 154:
-                    case 161:
                     case 173:
-                    case 181:
-                    case 228:
+                    case 174:
+                    case 199:
+                    case 217:
+                    case 234:
+                    case 210:
+                    case 187:
+                    case 167:
+                    case 166:
+                    case 242:
+                    case 241:
+                    case 247:
+                    case 145:
+                    case 150:
+                    case 151:
+                    case 141:
+                    case 155:
+                    case 156:
+                    case 163:
+                    case 175:
+                    case 183:
+                    case 232:
                         return true;
                 }
                 return false;
@@ -38319,22 +41244,22 @@ var ts;
             function nodeWillIndentChild(parent, child, indentByDefault) {
                 var childKind = child ? child.kind : 0;
                 switch (parent.kind) {
-                    case 200:
-                    case 201:
                     case 203:
                     case 204:
+                    case 206:
+                    case 207:
+                    case 205:
                     case 202:
-                    case 199:
-                    case 216:
-                    case 176:
-                    case 144:
-                    case 177:
-                    case 145:
+                    case 219:
+                    case 178:
                     case 146:
+                    case 179:
                     case 147:
-                        return childKind !== 195;
-                    case 236:
-                        return childKind !== 240;
+                    case 148:
+                    case 149:
+                        return childKind !== 198;
+                    case 240:
+                        return childKind !== 244;
                 }
                 return indentByDefault;
             }
@@ -38346,11 +41271,6 @@ var ts;
         })(SmartIndenter = formatting.SmartIndenter || (formatting.SmartIndenter = {}));
     })(formatting = ts.formatting || (ts.formatting = {}));
 })(ts || (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 __());
-};
 var ts;
 (function (ts) {
     ts.servicesVersion = "0.4";
@@ -38463,17 +41383,17 @@ var ts;
             while (pos < end) {
                 var token = scanner.scan();
                 var textPos = scanner.getTextPos();
-                nodes.push(createNode(token, pos, textPos, 2048, this));
+                nodes.push(createNode(token, pos, textPos, 0, this));
                 pos = textPos;
             }
             return pos;
         };
         NodeObject.prototype.createSyntaxList = function (nodes) {
-            var list = createNode(274, nodes.pos, nodes.end, 2048, this);
+            var list = createNode(278, nodes.pos, nodes.end, 0, this);
             list._children = [];
             var pos = nodes.pos;
-            for (var _i = 0, nodes_7 = nodes; _i < nodes_7.length; _i++) {
-                var node = nodes_7[_i];
+            for (var _i = 0, nodes_8 = nodes; _i < nodes_8.length; _i++) {
+                var node = nodes_8[_i];
                 if (pos < node.pos) {
                     pos = this.addSyntheticNodes(list._children, pos, node.pos);
                 }
@@ -38488,27 +41408,27 @@ var ts;
         NodeObject.prototype.createChildren = function (sourceFile) {
             var _this = this;
             var children;
-            if (this.kind >= 136) {
+            if (this.kind >= 138) {
                 scanner.setText((sourceFile || this.getSourceFile()).text);
                 children = [];
-                var pos = this.pos;
+                var pos_3 = this.pos;
                 var processNode = function (node) {
-                    if (pos < node.pos) {
-                        pos = _this.addSyntheticNodes(children, pos, node.pos);
+                    if (pos_3 < node.pos) {
+                        pos_3 = _this.addSyntheticNodes(children, pos_3, node.pos);
                     }
                     children.push(node);
-                    pos = node.end;
+                    pos_3 = node.end;
                 };
                 var processNodes = function (nodes) {
-                    if (pos < nodes.pos) {
-                        pos = _this.addSyntheticNodes(children, pos, nodes.pos);
+                    if (pos_3 < nodes.pos) {
+                        pos_3 = _this.addSyntheticNodes(children, pos_3, nodes.pos);
                     }
                     children.push(_this.createSyntaxList(nodes));
-                    pos = nodes.end;
+                    pos_3 = nodes.end;
                 };
                 ts.forEachChild(this, processNode, processNodes);
-                if (pos < this.end) {
-                    this.addSyntheticNodes(children, pos, this.end);
+                if (pos_3 < this.end) {
+                    this.addSyntheticNodes(children, pos_3, this.end);
                 }
                 scanner.setText(undefined);
             }
@@ -38535,7 +41455,7 @@ var ts;
                 return undefined;
             }
             var child = children[0];
-            return child.kind < 136 ? child : child.getFirstToken(sourceFile);
+            return child.kind < 138 ? child : child.getFirstToken(sourceFile);
         };
         NodeObject.prototype.getLastToken = function (sourceFile) {
             var children = this.getChildren(sourceFile);
@@ -38543,7 +41463,7 @@ var ts;
             if (!child) {
                 return undefined;
             }
-            return child.kind < 136 ? child : child.getLastToken(sourceFile);
+            return child.kind < 138 ? child : child.getLastToken(sourceFile);
         };
         return NodeObject;
     }());
@@ -38584,23 +41504,23 @@ var ts;
             var jsDocCommentParts = [];
             ts.forEach(declarations, function (declaration, indexOfDeclaration) {
                 if (ts.indexOf(declarations, declaration) === indexOfDeclaration) {
-                    var sourceFileOfDeclaration = ts.getSourceFileOfNode(declaration);
-                    if (canUseParsedParamTagComments && declaration.kind === 139) {
-                        ts.forEach(getJsDocCommentTextRange(declaration.parent, sourceFileOfDeclaration), function (jsDocCommentTextRange) {
-                            var cleanedParamJsDocComment = getCleanedParamJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration);
+                    var sourceFileOfDeclaration_1 = ts.getSourceFileOfNode(declaration);
+                    if (canUseParsedParamTagComments && declaration.kind === 141) {
+                        ts.forEach(getJsDocCommentTextRange(declaration.parent, sourceFileOfDeclaration_1), function (jsDocCommentTextRange) {
+                            var cleanedParamJsDocComment = getCleanedParamJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration_1);
                             if (cleanedParamJsDocComment) {
                                 ts.addRange(jsDocCommentParts, cleanedParamJsDocComment);
                             }
                         });
                     }
-                    if (declaration.kind === 221 && declaration.body.kind === 221) {
+                    if (declaration.kind === 224 && declaration.body.kind === 224) {
                         return;
                     }
-                    while (declaration.kind === 221 && declaration.parent.kind === 221) {
+                    while (declaration.kind === 224 && declaration.parent.kind === 224) {
                         declaration = declaration.parent;
                     }
-                    ts.forEach(getJsDocCommentTextRange(declaration.kind === 214 ? declaration.parent.parent : declaration, sourceFileOfDeclaration), function (jsDocCommentTextRange) {
-                        var cleanedJsDocComment = getCleanedJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration);
+                    ts.forEach(getJsDocCommentTextRange(declaration.kind === 217 ? declaration.parent.parent : declaration, sourceFileOfDeclaration_1), function (jsDocCommentTextRange) {
+                        var cleanedJsDocComment = getCleanedJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration_1);
                         if (cleanedJsDocComment) {
                             ts.addRange(jsDocCommentParts, cleanedJsDocComment);
                         }
@@ -38910,9 +41830,9 @@ var ts;
                     if (result_2 !== undefined) {
                         return result_2;
                     }
-                    if (declaration.name.kind === 137) {
+                    if (declaration.name.kind === 139) {
                         var expr = declaration.name.expression;
-                        if (expr.kind === 169) {
+                        if (expr.kind === 171) {
                             return expr.name.text;
                         }
                         return getTextOfIdentifierOrLiteral(expr);
@@ -38932,9 +41852,9 @@ var ts;
             }
             function visit(node) {
                 switch (node.kind) {
-                    case 216:
-                    case 144:
-                    case 143:
+                    case 219:
+                    case 146:
+                    case 145:
                         var functionDeclaration = node;
                         var declarationName = getDeclarationName(functionDeclaration);
                         if (declarationName) {
@@ -38951,62 +41871,62 @@ var ts;
                             ts.forEachChild(node, visit);
                         }
                         break;
-                    case 217:
-                    case 218:
-                    case 219:
                     case 220:
                     case 221:
-                    case 224:
-                    case 233:
-                    case 229:
-                    case 224:
-                    case 226:
-                    case 227:
-                    case 146:
-                    case 147:
-                    case 156:
-                        addDeclaration(node);
-                    case 145:
-                    case 196:
-                    case 215:
-                    case 164:
-                    case 165:
                     case 222:
+                    case 223:
+                    case 224:
+                    case 228:
+                    case 237:
+                    case 233:
+                    case 228:
+                    case 230:
+                    case 231:
+                    case 148:
+                    case 149:
+                    case 158:
+                        addDeclaration(node);
+                    case 147:
+                    case 199:
+                    case 218:
+                    case 166:
+                    case 167:
+                    case 225:
                         ts.forEachChild(node, visit);
                         break;
-                    case 195:
+                    case 198:
                         if (ts.isFunctionBlock(node)) {
                             ts.forEachChild(node, visit);
                         }
                         break;
-                    case 139:
-                        if (!(node.flags & 56)) {
+                    case 141:
+                        if (!(node.flags & 28)) {
                             break;
                         }
-                    case 214:
-                    case 166:
+                    case 217:
+                    case 168:
                         if (ts.isBindingPattern(node.name)) {
                             ts.forEachChild(node.name, visit);
                             break;
                         }
-                    case 250:
-                    case 142:
-                    case 141:
+                    case 254:
+                    case 144:
+                    case 143:
                         addDeclaration(node);
                         break;
-                    case 231:
+                    case 235:
                         if (node.exportClause) {
                             ts.forEach(node.exportClause.elements, visit);
                         }
                         break;
-                    case 225:
+                    case 229:
                         var importClause = node.importClause;
                         if (importClause) {
                             if (importClause.name) {
                                 addDeclaration(importClause);
                             }
                             if (importClause.namedBindings) {
-                                if (importClause.namedBindings.kind === 227) {
+                                if (importClause.namedBindings.kind === 231) {
                                     addDeclaration(importClause.namedBindings);
                                 }
                                 else {
@@ -39160,14 +42080,14 @@ var ts;
             return false;
         }
         return ts.forEach(symbol.declarations, function (declaration) {
-            if (declaration.kind === 176) {
+            if (declaration.kind === 178) {
                 return true;
             }
-            if (declaration.kind !== 214 && declaration.kind !== 216) {
+            if (declaration.kind !== 217 && declaration.kind !== 219) {
                 return false;
             }
-            for (var parent_9 = declaration.parent; !ts.isFunctionBlock(parent_9); parent_9 = parent_9.parent) {
-                if (parent_9.kind === 251 || parent_9.kind === 222) {
+            for (var parent_12 = declaration.parent; !ts.isFunctionBlock(parent_12); parent_12 = parent_12.parent) {
+                if (parent_12.kind === 255 || parent_12.kind === 225) {
                     return false;
                 }
             }
@@ -39177,7 +42097,6 @@ var ts;
     function getDefaultCompilerOptions() {
         return {
             target: 1,
-            module: 0,
             jsx: 1
         };
     }
@@ -39205,7 +42124,8 @@ var ts;
                 entry = {
                     hostFileName: fileName,
                     version: this.host.getScriptVersion(fileName),
-                    scriptSnapshot: scriptSnapshot
+                    scriptSnapshot: scriptSnapshot,
+                    scriptKind: ts.getScriptKind(fileName, this.host)
                 };
             }
             this.fileNameToEntry.set(path, entry);
@@ -39252,10 +42172,11 @@ var ts;
             if (!scriptSnapshot) {
                 throw new Error("Could not find file: '" + fileName + "'.");
             }
+            var scriptKind = ts.getScriptKind(fileName, this.host);
             var version = this.host.getScriptVersion(fileName);
             var sourceFile;
             if (this.currentFileName !== fileName) {
-                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 2, version, true);
+                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 2, version, true, scriptKind);
             }
             else if (this.currentFileVersion !== version) {
                 var editRange = scriptSnapshot.getChangeRange(this.currentFileScriptSnapshot);
@@ -39278,6 +42199,7 @@ var ts;
     function transpileModule(input, transpileOptions) {
         var options = transpileOptions.compilerOptions ? ts.clone(transpileOptions.compilerOptions) : getDefaultCompilerOptions();
         options.isolatedModules = true;
+        options.suppressOutputPathCheck = true;
         options.allowNonTsExtensions = true;
         options.noLib = true;
         options.noResolve = true;
@@ -39329,11 +42251,10 @@ var ts;
         return output.outputText;
     }
     ts.transpile = transpile;
-    function createLanguageServiceSourceFile(fileName, scriptSnapshot, scriptTarget, version, setNodeParents) {
+    function createLanguageServiceSourceFile(fileName, scriptSnapshot, scriptTarget, version, setNodeParents, scriptKind) {
         var text = scriptSnapshot.getText(0, scriptSnapshot.getLength());
-        var sourceFile = ts.createSourceFile(fileName, text, scriptTarget, setNodeParents);
+        var sourceFile = ts.createSourceFile(fileName, text, scriptTarget, setNodeParents, scriptKind);
         setSourceFileFields(sourceFile, scriptSnapshot, version);
-        sourceFile.nameTable = sourceFile.identifiers;
         return sourceFile;
     }
     ts.createLanguageServiceSourceFile = createLanguageServiceSourceFile;
@@ -39342,7 +42263,7 @@ var ts;
         if (textChangeRange) {
             if (version !== sourceFile.version) {
                 if (!ts.disableIncrementalParsing) {
-                    var newText;
+                    var newText = void 0;
                     var prefix = textChangeRange.span.start !== 0
                         ? sourceFile.text.substr(0, textChangeRange.span.start)
                         : "";
@@ -39373,7 +42294,7 @@ var ts;
                 }
             }
         }
-        return createLanguageServiceSourceFile(sourceFile.fileName, scriptSnapshot, sourceFile.languageVersion, version, true);
+        return createLanguageServiceSourceFile(sourceFile.fileName, scriptSnapshot, sourceFile.languageVersion, version, true, sourceFile.scriptKind);
     }
     ts.updateLanguageServiceSourceFile = updateLanguageServiceSourceFile;
     function createDocumentRegistry(useCaseSensitiveFileNames, currentDirectory) {
@@ -39410,19 +42331,19 @@ var ts;
             });
             return JSON.stringify(bucketInfoArray, undefined, 2);
         }
-        function acquireDocument(fileName, compilationSettings, scriptSnapshot, version) {
-            return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, true);
+        function acquireDocument(fileName, compilationSettings, scriptSnapshot, version, scriptKind) {
+            return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, true, scriptKind);
         }
-        function updateDocument(fileName, compilationSettings, scriptSnapshot, version) {
-            return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, false);
+        function updateDocument(fileName, compilationSettings, scriptSnapshot, version, scriptKind) {
+            return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, false, scriptKind);
         }
-        function acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, acquiring) {
+        function acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, acquiring, scriptKind) {
             var bucket = getBucketForCompilationSettings(compilationSettings, true);
             var path = ts.toPath(fileName, currentDirectory, getCanonicalFileName);
             var entry = bucket.get(path);
             if (!entry) {
                 ts.Debug.assert(acquiring, "How could we be trying to update a document that the registry doesn't have?");
-                var sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, compilationSettings.target, version, false);
+                var sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, compilationSettings.target, version, false, scriptKind);
                 entry = {
                     sourceFile: sourceFile,
                     languageServiceRefCount: 0,
@@ -39463,9 +42384,22 @@ var ts;
         if (readImportFiles === void 0) { readImportFiles = true; }
         if (detectJavaScriptImports === void 0) { detectJavaScriptImports = false; }
         var referencedFiles = [];
+        var typeReferenceDirectives = [];
         var importedFiles = [];
         var ambientExternalModules;
         var isNoDefaultLib = false;
+        var braceNesting = 0;
+        var externalModule = false;
+        function nextToken() {
+            var token = scanner.scan();
+            if (token === 15) {
+                braceNesting++;
+            }
+            else if (token === 16) {
+                braceNesting--;
+            }
+            return token;
+        }
         function processTripleSlashDirectives() {
             var commentRanges = ts.getLeadingCommentRanges(sourceText, 0);
             ts.forEach(commentRanges, function (commentRange) {
@@ -39475,32 +42409,44 @@ var ts;
                     isNoDefaultLib = referencePathMatchResult.isNoDefaultLib;
                     var fileReference = referencePathMatchResult.fileReference;
                     if (fileReference) {
-                        referencedFiles.push(fileReference);
+                        var collection = referencePathMatchResult.isTypeReferenceDirective
+                            ? typeReferenceDirectives
+                            : referencedFiles;
+                        collection.push(fileReference);
                     }
                 }
             });
         }
+        function getFileReference() {
+            var file = scanner.getTokenValue();
+            var pos = scanner.getTokenPos();
+            return {
+                fileName: file,
+                pos: pos,
+                end: pos + file.length
+            };
+        }
         function recordAmbientExternalModule() {
             if (!ambientExternalModules) {
                 ambientExternalModules = [];
             }
-            ambientExternalModules.push(scanner.getTokenValue());
+            ambientExternalModules.push({ ref: getFileReference(), depth: braceNesting });
         }
         function recordModuleName() {
-            var importPath = scanner.getTokenValue();
-            var pos = scanner.getTokenPos();
-            importedFiles.push({
-                fileName: importPath,
-                pos: pos,
-                end: pos + importPath.length
-            });
+            importedFiles.push(getFileReference());
+            markAsExternalModuleIfTopLevel();
+        }
+        function markAsExternalModuleIfTopLevel() {
+            if (braceNesting === 0) {
+                externalModule = true;
+            }
         }
         function tryConsumeDeclare() {
             var token = scanner.getToken();
             if (token === 122) {
-                token = scanner.scan();
+                token = nextToken();
                 if (token === 125) {
-                    token = scanner.scan();
+                    token = nextToken();
                     if (token === 9) {
                         recordAmbientExternalModule();
                     }
@@ -39512,16 +42458,16 @@ var ts;
         function tryConsumeImport() {
             var token = scanner.getToken();
             if (token === 89) {
-                token = scanner.scan();
+                token = nextToken();
                 if (token === 9) {
                     recordModuleName();
                     return true;
                 }
                 else {
                     if (token === 69 || ts.isKeyword(token)) {
-                        token = scanner.scan();
-                        if (token === 133) {
-                            token = scanner.scan();
+                        token = nextToken();
+                        if (token === 135) {
+                            token = nextToken();
                             if (token === 9) {
                                 recordModuleName();
                                 return true;
@@ -39533,21 +42479,21 @@ var ts;
                             }
                         }
                         else if (token === 24) {
-                            token = scanner.scan();
+                            token = nextToken();
                         }
                         else {
                             return true;
                         }
                     }
                     if (token === 15) {
-                        token = scanner.scan();
+                        token = nextToken();
                         while (token !== 16 && token !== 1) {
-                            token = scanner.scan();
+                            token = nextToken();
                         }
                         if (token === 16) {
-                            token = scanner.scan();
-                            if (token === 133) {
-                                token = scanner.scan();
+                            token = nextToken();
+                            if (token === 135) {
+                                token = nextToken();
                                 if (token === 9) {
                                     recordModuleName();
                                 }
@@ -39555,13 +42501,13 @@ var ts;
                         }
                     }
                     else if (token === 37) {
-                        token = scanner.scan();
+                        token = nextToken();
                         if (token === 116) {
-                            token = scanner.scan();
+                            token = nextToken();
                             if (token === 69 || ts.isKeyword(token)) {
-                                token = scanner.scan();
-                                if (token === 133) {
-                                    token = scanner.scan();
+                                token = nextToken();
+                                if (token === 135) {
+                                    token = nextToken();
                                     if (token === 9) {
                                         recordModuleName();
                                     }
@@ -39577,16 +42523,17 @@ var ts;
         function tryConsumeExport() {
             var token = scanner.getToken();
             if (token === 82) {
-                token = scanner.scan();
+                markAsExternalModuleIfTopLevel();
+                token = nextToken();
                 if (token === 15) {
-                    token = scanner.scan();
+                    token = nextToken();
                     while (token !== 16 && token !== 1) {
-                        token = scanner.scan();
+                        token = nextToken();
                     }
                     if (token === 16) {
-                        token = scanner.scan();
-                        if (token === 133) {
-                            token = scanner.scan();
+                        token = nextToken();
+                        if (token === 135) {
+                            token = nextToken();
                             if (token === 9) {
                                 recordModuleName();
                             }
@@ -39594,18 +42541,18 @@ var ts;
                     }
                 }
                 else if (token === 37) {
-                    token = scanner.scan();
-                    if (token === 133) {
-                        token = scanner.scan();
+                    token = nextToken();
+                    if (token === 135) {
+                        token = nextToken();
                         if (token === 9) {
                             recordModuleName();
                         }
                     }
                 }
                 else if (token === 89) {
-                    token = scanner.scan();
+                    token = nextToken();
                     if (token === 69 || ts.isKeyword(token)) {
-                        token = scanner.scan();
+                        token = nextToken();
                         if (token === 56) {
                             if (tryConsumeRequireCall(true)) {
                                 return true;
@@ -39618,11 +42565,11 @@ var ts;
             return false;
         }
         function tryConsumeRequireCall(skipCurrentToken) {
-            var token = skipCurrentToken ? scanner.scan() : scanner.getToken();
-            if (token === 127) {
-                token = scanner.scan();
+            var token = skipCurrentToken ? nextToken() : scanner.getToken();
+            if (token === 128) {
+                token = nextToken();
                 if (token === 17) {
-                    token = scanner.scan();
+                    token = nextToken();
                     if (token === 9) {
                         recordModuleName();
                     }
@@ -39634,15 +42581,15 @@ var ts;
         function tryConsumeDefine() {
             var token = scanner.getToken();
             if (token === 69 && scanner.getTokenValue() === "define") {
-                token = scanner.scan();
+                token = nextToken();
                 if (token !== 17) {
                     return true;
                 }
-                token = scanner.scan();
+                token = nextToken();
                 if (token === 9) {
-                    token = scanner.scan();
+                    token = nextToken();
                     if (token === 24) {
-                        token = scanner.scan();
+                        token = nextToken();
                     }
                     else {
                         return true;
@@ -39651,14 +42598,14 @@ var ts;
                 if (token !== 19) {
                     return true;
                 }
-                token = scanner.scan();
+                token = nextToken();
                 var i = 0;
                 while (token !== 20 && token !== 1) {
                     if (token === 9) {
                         recordModuleName();
                         i++;
                     }
-                    token = scanner.scan();
+                    token = nextToken();
                 }
                 return true;
             }
@@ -39666,7 +42613,7 @@ var ts;
         }
         function processImports() {
             scanner.setText(sourceText);
-            scanner.scan();
+            nextToken();
             while (true) {
                 if (scanner.getToken() === 1) {
                     break;
@@ -39678,7 +42625,7 @@ var ts;
                     continue;
                 }
                 else {
-                    scanner.scan();
+                    nextToken();
                 }
             }
             scanner.setText(undefined);
@@ -39687,12 +42634,38 @@ var ts;
             processImports();
         }
         processTripleSlashDirectives();
-        return { referencedFiles: referencedFiles, importedFiles: importedFiles, isLibFile: isNoDefaultLib, ambientExternalModules: ambientExternalModules };
+        if (externalModule) {
+            if (ambientExternalModules) {
+                for (var _i = 0, ambientExternalModules_1 = ambientExternalModules; _i < ambientExternalModules_1.length; _i++) {
+                    var decl = ambientExternalModules_1[_i];
+                    importedFiles.push(decl.ref);
+                }
+            }
+            return { referencedFiles: referencedFiles, typeReferenceDirectives: typeReferenceDirectives, importedFiles: importedFiles, isLibFile: isNoDefaultLib, ambientExternalModules: undefined };
+        }
+        else {
+            var ambientModuleNames = void 0;
+            if (ambientExternalModules) {
+                for (var _a = 0, ambientExternalModules_2 = ambientExternalModules; _a < ambientExternalModules_2.length; _a++) {
+                    var decl = ambientExternalModules_2[_a];
+                    if (decl.depth === 0) {
+                        if (!ambientModuleNames) {
+                            ambientModuleNames = [];
+                        }
+                        ambientModuleNames.push(decl.ref.fileName);
+                    }
+                    else {
+                        importedFiles.push(decl.ref);
+                    }
+                }
+            }
+            return { referencedFiles: referencedFiles, typeReferenceDirectives: typeReferenceDirectives, importedFiles: importedFiles, isLibFile: isNoDefaultLib, ambientExternalModules: ambientModuleNames };
+        }
     }
     ts.preProcessFile = preProcessFile;
     function getTargetLabel(referenceNode, labelName) {
         while (referenceNode) {
-            if (referenceNode.kind === 210 && referenceNode.label.text === labelName) {
+            if (referenceNode.kind === 213 && referenceNode.label.text === labelName) {
                 return referenceNode.label;
             }
             referenceNode = referenceNode.parent;
@@ -39701,16 +42674,16 @@ var ts;
     }
     function isJumpStatementTarget(node) {
         return node.kind === 69 &&
-            (node.parent.kind === 206 || node.parent.kind === 205) &&
+            (node.parent.kind === 209 || node.parent.kind === 208) &&
             node.parent.label === node;
     }
     function isLabelOfLabeledStatement(node) {
         return node.kind === 69 &&
-            node.parent.kind === 210 &&
+            node.parent.kind === 213 &&
             node.parent.label === node;
     }
     function isLabeledBy(node, labelName) {
-        for (var owner = node.parent; owner.kind === 210; owner = owner.parent) {
+        for (var owner = node.parent; owner.kind === 213; owner = owner.parent) {
             if (owner.label.text === labelName) {
                 return true;
             }
@@ -39721,25 +42694,25 @@ var ts;
         return isLabelOfLabeledStatement(node) || isJumpStatementTarget(node);
     }
     function isRightSideOfQualifiedName(node) {
-        return node.parent.kind === 136 && node.parent.right === node;
+        return node.parent.kind === 138 && node.parent.right === node;
     }
     function isRightSideOfPropertyAccess(node) {
-        return node && node.parent && node.parent.kind === 169 && node.parent.name === node;
+        return node && node.parent && node.parent.kind === 171 && node.parent.name === node;
     }
     function isCallExpressionTarget(node) {
         if (isRightSideOfPropertyAccess(node)) {
             node = node.parent;
         }
-        return node && node.parent && node.parent.kind === 171 && node.parent.expression === node;
+        return node && node.parent && node.parent.kind === 173 && node.parent.expression === node;
     }
     function isNewExpressionTarget(node) {
         if (isRightSideOfPropertyAccess(node)) {
             node = node.parent;
         }
-        return node && node.parent && node.parent.kind === 172 && node.parent.expression === node;
+        return node && node.parent && node.parent.kind === 174 && node.parent.expression === node;
     }
     function isNameOfModuleDeclaration(node) {
-        return node.parent.kind === 221 && node.parent.name === node;
+        return node.parent.kind === 224 && node.parent.name === node;
     }
     function isNameOfFunctionDeclaration(node) {
         return node.kind === 69 &&
@@ -39747,22 +42720,22 @@ var ts;
     }
     function isNameOfPropertyAssignment(node) {
         return (node.kind === 69 || node.kind === 9 || node.kind === 8) &&
-            (node.parent.kind === 248 || node.parent.kind === 249) && node.parent.name === node;
+            (node.parent.kind === 252 || node.parent.kind === 253) && node.parent.name === node;
     }
     function isLiteralNameOfPropertyDeclarationOrIndexAccess(node) {
         if (node.kind === 9 || node.kind === 8) {
             switch (node.parent.kind) {
-                case 142:
-                case 141:
-                case 248:
-                case 250:
                 case 144:
                 case 143:
+                case 252:
+                case 254:
                 case 146:
-                case 147:
-                case 221:
+                case 145:
+                case 148:
+                case 149:
+                case 224:
                     return node.parent.name === node;
-                case 170:
+                case 172:
                     return node.parent.argumentExpression === node;
             }
         }
@@ -39800,7 +42773,7 @@ var ts;
         }
     }
     var keywordCompletions = [];
-    for (var i = 70; i <= 135; i++) {
+    for (var i = 70; i <= 137; i++) {
         keywordCompletions.push({
             name: ts.tokenToString(i),
             kind: ScriptElementKind.keyword,
@@ -39815,17 +42788,17 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 251:
-                case 144:
-                case 143:
-                case 216:
-                case 176:
+                case 255:
                 case 146:
-                case 147:
-                case 217:
-                case 218:
+                case 145:
+                case 219:
+                case 178:
+                case 148:
+                case 149:
                 case 220:
                 case 221:
+                case 223:
+                case 224:
                     return node;
             }
         }
@@ -39833,38 +42806,38 @@ var ts;
     ts.getContainerNode = getContainerNode;
     function getNodeKind(node) {
         switch (node.kind) {
-            case 221: return ScriptElementKind.moduleElement;
-            case 217: return ScriptElementKind.classElement;
-            case 218: return ScriptElementKind.interfaceElement;
-            case 219: return ScriptElementKind.typeElement;
-            case 220: return ScriptElementKind.enumElement;
-            case 214:
+            case 224: return ScriptElementKind.moduleElement;
+            case 220: return ScriptElementKind.classElement;
+            case 221: return ScriptElementKind.interfaceElement;
+            case 222: return ScriptElementKind.typeElement;
+            case 223: return ScriptElementKind.enumElement;
+            case 217:
                 return ts.isConst(node)
                     ? ScriptElementKind.constElement
                     : ts.isLet(node)
                         ? ScriptElementKind.letElement
                         : ScriptElementKind.variableElement;
-            case 216: return ScriptElementKind.functionElement;
-            case 146: return ScriptElementKind.memberGetAccessorElement;
-            case 147: return ScriptElementKind.memberSetAccessorElement;
+            case 219: return ScriptElementKind.functionElement;
+            case 148: return ScriptElementKind.memberGetAccessorElement;
+            case 149: return ScriptElementKind.memberSetAccessorElement;
+            case 146:
+            case 145:
+                return ScriptElementKind.memberFunctionElement;
             case 144:
             case 143:
-                return ScriptElementKind.memberFunctionElement;
-            case 142:
-            case 141:
                 return ScriptElementKind.memberVariableElement;
-            case 150: return ScriptElementKind.indexSignatureElement;
-            case 149: return ScriptElementKind.constructSignatureElement;
-            case 148: return ScriptElementKind.callSignatureElement;
-            case 145: return ScriptElementKind.constructorImplementationElement;
-            case 138: return ScriptElementKind.typeParameterElement;
-            case 250: return ScriptElementKind.variableElement;
-            case 139: return (node.flags & 56) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement;
-            case 224:
-            case 229:
-            case 226:
+            case 152: return ScriptElementKind.indexSignatureElement;
+            case 151: return ScriptElementKind.constructSignatureElement;
+            case 150: return ScriptElementKind.callSignatureElement;
+            case 147: return ScriptElementKind.constructorImplementationElement;
+            case 140: return ScriptElementKind.typeParameterElement;
+            case 254: return ScriptElementKind.variableElement;
+            case 141: return (node.flags & 28) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement;
+            case 228:
             case 233:
-            case 227:
+            case 230:
+            case 237:
+            case 231:
                 return ScriptElementKind.alias;
         }
         return ScriptElementKind.unknown;
@@ -39948,7 +42921,7 @@ var ts;
                 writeFile: function (fileName, data, writeByteOrderMark) { },
                 getCurrentDirectory: function () { return currentDirectory; },
                 fileExists: function (fileName) {
-                    ts.Debug.assert(!host.resolveModuleNames);
+                    ts.Debug.assert(!host.resolveModuleNames || !host.resolveTypeReferenceDirectives);
                     return hostCache.getOrCreateEntry(fileName) !== undefined;
                 },
                 readFile: function (fileName) {
@@ -39956,13 +42929,21 @@ var ts;
                     return entry && entry.scriptSnapshot.getText(0, entry.scriptSnapshot.getLength());
                 },
                 directoryExists: function (directoryName) {
-                    ts.Debug.assert(!host.resolveModuleNames);
+                    ts.Debug.assert(!host.resolveModuleNames || !host.resolveTypeReferenceDirectives);
                     return ts.directoryProbablyExists(directoryName, host);
                 }
             };
+            if (host.trace) {
+                compilerHost.trace = function (message) { return host.trace(message); };
+            }
             if (host.resolveModuleNames) {
                 compilerHost.resolveModuleNames = function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile); };
             }
+            if (host.resolveTypeReferenceDirectives) {
+                compilerHost.resolveTypeReferenceDirectives = function (typeReferenceDirectiveNames, containingFile) {
+                    return host.resolveTypeReferenceDirectives(typeReferenceDirectiveNames, containingFile);
+                };
+            }
             var newProgram = ts.createProgram(hostCache.getRootFileNames(), newSettings, compilerHost, program);
             if (program) {
                 var oldSourceFiles = program.getSourceFiles();
@@ -39986,10 +42967,11 @@ var ts;
                 if (!changesInCompilationSettingsAffectSyntax) {
                     var oldSourceFile = program && program.getSourceFile(fileName);
                     if (oldSourceFile) {
-                        return documentRegistry.updateDocument(fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version);
+                        ts.Debug.assert(hostFileInformation.scriptKind === oldSourceFile.scriptKind, "Registered script kind (" + oldSourceFile.scriptKind + ") should match new script kind (" + hostFileInformation.scriptKind + ") for file: " + fileName);
+                        return documentRegistry.updateDocument(fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version, hostFileInformation.scriptKind);
                     }
                 }
-                return documentRegistry.acquireDocument(fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version);
+                return documentRegistry.acquireDocument(fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version, hostFileInformation.scriptKind);
             }
             function sourceFileUpToDate(sourceFile) {
                 if (!sourceFile) {
@@ -40093,9 +43075,9 @@ var ts;
                         isJsDocTagName = true;
                     }
                     switch (tag.kind) {
-                        case 272:
-                        case 270:
-                        case 271:
+                        case 276:
+                        case 274:
+                        case 275:
                             var tagWithExpression = tag;
                             if (tagWithExpression.typeExpression) {
                                 insideJsDocTagExpression = tagWithExpression.typeExpression.pos < position && position < tagWithExpression.typeExpression.end;
@@ -40130,13 +43112,13 @@ var ts;
                     log("Returning an empty list because completion was requested in an invalid position.");
                     return undefined;
                 }
-                var parent_10 = contextToken.parent, kind = contextToken.kind;
+                var parent_13 = contextToken.parent, kind = contextToken.kind;
                 if (kind === 21) {
-                    if (parent_10.kind === 169) {
+                    if (parent_13.kind === 171) {
                         node = contextToken.parent.expression;
                         isRightOfDot = true;
                     }
-                    else if (parent_10.kind === 136) {
+                    else if (parent_13.kind === 138) {
                         node = contextToken.parent.left;
                         isRightOfDot = true;
                     }
@@ -40149,7 +43131,7 @@ var ts;
                         isRightOfOpenTag = true;
                         location = contextToken;
                     }
-                    else if (kind === 39 && contextToken.parent.kind === 240) {
+                    else if (kind === 39 && contextToken.parent.kind === 244) {
                         isStartingCloseTag = true;
                         location = contextToken;
                     }
@@ -40165,7 +43147,7 @@ var ts;
             else if (isRightOfOpenTag) {
                 var tagSymbols = typeChecker.getJsxIntrinsicTagNames();
                 if (tryGetGlobalSymbols()) {
-                    symbols = tagSymbols.concat(symbols.filter(function (s) { return !!(s.flags & 107455); }));
+                    symbols = tagSymbols.concat(symbols.filter(function (s) { return !!(s.flags & (107455 | 8388608)); }));
                 }
                 else {
                     symbols = tagSymbols;
@@ -40192,7 +43174,7 @@ var ts;
             function getTypeScriptMemberSymbols() {
                 isMemberCompletion = true;
                 isNewIdentifierLocation = false;
-                if (node.kind === 69 || node.kind === 136 || node.kind === 169) {
+                if (node.kind === 69 || node.kind === 138 || node.kind === 171) {
                     var symbol = typeChecker.getSymbolAtLocation(node);
                     if (symbol && symbol.flags & 8388608) {
                         symbol = typeChecker.getAliasedSymbol(symbol);
@@ -40237,8 +43219,8 @@ var ts;
                     return tryGetImportOrExportClauseCompletionSymbols(namedImportsOrExports);
                 }
                 if (jsxContainer = tryGetContainingJsxElement(contextToken)) {
-                    var attrsType;
-                    if ((jsxContainer.kind === 237) || (jsxContainer.kind === 238)) {
+                    var attrsType = void 0;
+                    if ((jsxContainer.kind === 241) || (jsxContainer.kind === 242)) {
                         attrsType = typeChecker.getJsxElementAttributesType(jsxContainer);
                         if (attrsType) {
                             symbols = filterJsxAttributes(typeChecker.getPropertiesOfType(attrsType), jsxContainer.attributes);
@@ -40278,15 +43260,15 @@ var ts;
                 return result;
             }
             function isInJsxText(contextToken) {
-                if (contextToken.kind === 239) {
+                if (contextToken.kind === 243) {
                     return true;
                 }
                 if (contextToken.kind === 27 && contextToken.parent) {
-                    if (contextToken.parent.kind === 238) {
+                    if (contextToken.parent.kind === 242) {
                         return true;
                     }
-                    if (contextToken.parent.kind === 240 || contextToken.parent.kind === 237) {
-                        return contextToken.parent.parent && contextToken.parent.parent.kind === 236;
+                    if (contextToken.parent.kind === 244 || contextToken.parent.kind === 241) {
+                        return contextToken.parent.parent && contextToken.parent.parent.kind === 240;
                     }
                 }
                 return false;
@@ -40296,40 +43278,40 @@ var ts;
                     var containingNodeKind = previousToken.parent.kind;
                     switch (previousToken.kind) {
                         case 24:
-                            return containingNodeKind === 171
-                                || containingNodeKind === 145
-                                || containingNodeKind === 172
-                                || containingNodeKind === 167
-                                || containingNodeKind === 184
-                                || containingNodeKind === 153;
+                            return containingNodeKind === 173
+                                || containingNodeKind === 147
+                                || containingNodeKind === 174
+                                || containingNodeKind === 169
+                                || containingNodeKind === 186
+                                || containingNodeKind === 155;
                         case 17:
-                            return containingNodeKind === 171
-                                || containingNodeKind === 145
-                                || containingNodeKind === 172
-                                || containingNodeKind === 175
-                                || containingNodeKind === 161;
+                            return containingNodeKind === 173
+                                || containingNodeKind === 147
+                                || containingNodeKind === 174
+                                || containingNodeKind === 177
+                                || containingNodeKind === 163;
                         case 19:
-                            return containingNodeKind === 167
-                                || containingNodeKind === 150
-                                || containingNodeKind === 137;
+                            return containingNodeKind === 169
+                                || containingNodeKind === 152
+                                || containingNodeKind === 139;
                         case 125:
                         case 126:
                             return true;
                         case 21:
-                            return containingNodeKind === 221;
+                            return containingNodeKind === 224;
                         case 15:
-                            return containingNodeKind === 217;
+                            return containingNodeKind === 220;
                         case 56:
-                            return containingNodeKind === 214
-                                || containingNodeKind === 184;
+                            return containingNodeKind === 217
+                                || containingNodeKind === 186;
                         case 12:
-                            return containingNodeKind === 186;
+                            return containingNodeKind === 188;
                         case 13:
-                            return containingNodeKind === 193;
+                            return containingNodeKind === 196;
                         case 112:
                         case 110:
                         case 111:
-                            return containingNodeKind === 142;
+                            return containingNodeKind === 144;
                     }
                     switch (previousToken.getText()) {
                         case "public":
@@ -40342,7 +43324,7 @@ var ts;
             }
             function isInStringOrRegularExpressionOrTemplateLiteral(contextToken) {
                 if (contextToken.kind === 9
-                    || contextToken.kind === 163
+                    || contextToken.kind === 165
                     || contextToken.kind === 10
                     || ts.isTemplateLiteralKind(contextToken.kind)) {
                     var start_7 = contextToken.getStart();
@@ -40361,16 +43343,25 @@ var ts;
                 isMemberCompletion = true;
                 var typeForObject;
                 var existingMembers;
-                if (objectLikeContainer.kind === 168) {
+                if (objectLikeContainer.kind === 170) {
                     isNewIdentifierLocation = true;
                     typeForObject = typeChecker.getContextualType(objectLikeContainer);
                     existingMembers = objectLikeContainer.properties;
                 }
-                else if (objectLikeContainer.kind === 164) {
+                else if (objectLikeContainer.kind === 166) {
                     isNewIdentifierLocation = false;
                     var rootDeclaration = ts.getRootDeclaration(objectLikeContainer.parent);
                     if (ts.isVariableLike(rootDeclaration)) {
-                        if (rootDeclaration.initializer || rootDeclaration.type) {
+                        var canGetType = !!(rootDeclaration.initializer || rootDeclaration.type);
+                        if (!canGetType && rootDeclaration.kind === 141) {
+                            if (ts.isExpression(rootDeclaration.parent)) {
+                                canGetType = !!typeChecker.getContextualType(rootDeclaration.parent);
+                            }
+                            else if (rootDeclaration.parent.kind === 146 || rootDeclaration.parent.kind === 149) {
+                                canGetType = ts.isExpression(rootDeclaration.parent.parent) && !!typeChecker.getContextualType(rootDeclaration.parent.parent);
+                            }
+                        }
+                        if (canGetType) {
                             typeForObject = typeChecker.getTypeAtLocation(objectLikeContainer);
                             existingMembers = objectLikeContainer.elements;
                         }
@@ -40392,9 +43383,9 @@ var ts;
                 return true;
             }
             function tryGetImportOrExportClauseCompletionSymbols(namedImportsOrExports) {
-                var declarationKind = namedImportsOrExports.kind === 228 ?
-                    225 :
-                    231;
+                var declarationKind = namedImportsOrExports.kind === 232 ?
+                    229 :
+                    235;
                 var importOrExportDeclaration = ts.getAncestor(namedImportsOrExports, declarationKind);
                 var moduleSpecifier = importOrExportDeclaration.moduleSpecifier;
                 if (!moduleSpecifier) {
@@ -40415,9 +43406,9 @@ var ts;
                     switch (contextToken.kind) {
                         case 15:
                         case 24:
-                            var parent_11 = contextToken.parent;
-                            if (parent_11 && (parent_11.kind === 168 || parent_11.kind === 164)) {
-                                return parent_11;
+                            var parent_14 = contextToken.parent;
+                            if (parent_14 && (parent_14.kind === 170 || parent_14.kind === 166)) {
+                                return parent_14;
                             }
                             break;
                     }
@@ -40430,8 +43421,8 @@ var ts;
                         case 15:
                         case 24:
                             switch (contextToken.parent.kind) {
-                                case 228:
                                 case 232:
+                                case 236:
                                     return contextToken.parent;
                             }
                     }
@@ -40440,34 +43431,34 @@ var ts;
             }
             function tryGetContainingJsxElement(contextToken) {
                 if (contextToken) {
-                    var parent_12 = contextToken.parent;
+                    var parent_15 = contextToken.parent;
                     switch (contextToken.kind) {
                         case 26:
                         case 39:
                         case 69:
-                        case 241:
-                        case 242:
-                            if (parent_12 && (parent_12.kind === 237 || parent_12.kind === 238)) {
-                                return parent_12;
+                        case 245:
+                        case 246:
+                            if (parent_15 && (parent_15.kind === 241 || parent_15.kind === 242)) {
+                                return parent_15;
                             }
-                            else if (parent_12.kind === 241) {
-                                return parent_12.parent;
+                            else if (parent_15.kind === 245) {
+                                return parent_15.parent;
                             }
                             break;
                         case 9:
-                            if (parent_12 && ((parent_12.kind === 241) || (parent_12.kind === 242))) {
-                                return parent_12.parent;
+                            if (parent_15 && ((parent_15.kind === 245) || (parent_15.kind === 246))) {
+                                return parent_15.parent;
                             }
                             break;
                         case 16:
-                            if (parent_12 &&
-                                parent_12.kind === 243 &&
-                                parent_12.parent &&
-                                (parent_12.parent.kind === 241)) {
-                                return parent_12.parent.parent;
+                            if (parent_15 &&
+                                parent_15.kind === 247 &&
+                                parent_15.parent &&
+                                (parent_15.parent.kind === 245)) {
+                                return parent_15.parent.parent;
                             }
-                            if (parent_12 && parent_12.kind === 242) {
-                                return parent_12.parent;
+                            if (parent_15 && parent_15.kind === 246) {
+                                return parent_15.parent;
                             }
                             break;
                     }
@@ -40476,16 +43467,16 @@ var ts;
             }
             function isFunction(kind) {
                 switch (kind) {
-                    case 176:
-                    case 177:
-                    case 216:
-                    case 144:
-                    case 143:
+                    case 178:
+                    case 179:
+                    case 219:
                     case 146:
-                    case 147:
+                    case 145:
                     case 148:
                     case 149:
                     case 150:
+                    case 151:
+                    case 152:
                         return true;
                 }
                 return false;
@@ -40494,66 +43485,66 @@ var ts;
                 var containingNodeKind = contextToken.parent.kind;
                 switch (contextToken.kind) {
                     case 24:
-                        return containingNodeKind === 214 ||
-                            containingNodeKind === 215 ||
-                            containingNodeKind === 196 ||
-                            containingNodeKind === 220 ||
-                            isFunction(containingNodeKind) ||
-                            containingNodeKind === 217 ||
-                            containingNodeKind === 189 ||
+                        return containingNodeKind === 217 ||
                             containingNodeKind === 218 ||
-                            containingNodeKind === 165 ||
-                            containingNodeKind === 219;
+                            containingNodeKind === 199 ||
+                            containingNodeKind === 223 ||
+                            isFunction(containingNodeKind) ||
+                            containingNodeKind === 220 ||
+                            containingNodeKind === 191 ||
+                            containingNodeKind === 221 ||
+                            containingNodeKind === 167 ||
+                            containingNodeKind === 222;
                     case 21:
-                        return containingNodeKind === 165;
+                        return containingNodeKind === 167;
                     case 54:
-                        return containingNodeKind === 166;
+                        return containingNodeKind === 168;
                     case 19:
-                        return containingNodeKind === 165;
+                        return containingNodeKind === 167;
                     case 17:
-                        return containingNodeKind === 247 ||
+                        return containingNodeKind === 251 ||
                             isFunction(containingNodeKind);
                     case 15:
-                        return containingNodeKind === 220 ||
-                            containingNodeKind === 218 ||
-                            containingNodeKind === 156;
+                        return containingNodeKind === 223 ||
+                            containingNodeKind === 221 ||
+                            containingNodeKind === 158;
                     case 23:
-                        return containingNodeKind === 141 &&
+                        return containingNodeKind === 143 &&
                             contextToken.parent && contextToken.parent.parent &&
-                            (contextToken.parent.parent.kind === 218 ||
-                                contextToken.parent.parent.kind === 156);
+                            (contextToken.parent.parent.kind === 221 ||
+                                contextToken.parent.parent.kind === 158);
                     case 25:
-                        return containingNodeKind === 217 ||
-                            containingNodeKind === 189 ||
-                            containingNodeKind === 218 ||
-                            containingNodeKind === 219 ||
+                        return containingNodeKind === 220 ||
+                            containingNodeKind === 191 ||
+                            containingNodeKind === 221 ||
+                            containingNodeKind === 222 ||
                             isFunction(containingNodeKind);
                     case 113:
-                        return containingNodeKind === 142;
+                        return containingNodeKind === 144;
                     case 22:
-                        return containingNodeKind === 139 ||
+                        return containingNodeKind === 141 ||
                             (contextToken.parent && contextToken.parent.parent &&
-                                contextToken.parent.parent.kind === 165);
+                                contextToken.parent.parent.kind === 167);
                     case 112:
                     case 110:
                     case 111:
-                        return containingNodeKind === 139;
+                        return containingNodeKind === 141;
                     case 116:
-                        return containingNodeKind === 229 ||
-                            containingNodeKind === 233 ||
-                            containingNodeKind === 227;
+                        return containingNodeKind === 233 ||
+                            containingNodeKind === 237 ||
+                            containingNodeKind === 231;
                     case 73:
                     case 81:
                     case 107:
                     case 87:
                     case 102:
                     case 123:
-                    case 129:
+                    case 130:
                     case 89:
                     case 108:
                     case 74:
                     case 114:
-                    case 132:
+                    case 133:
                         return true;
                 }
                 switch (contextToken.getText()) {
@@ -40584,19 +43575,19 @@ var ts;
                 return false;
             }
             function filterNamedImportOrExportCompletionItems(exportsOfModule, namedImportsOrExports) {
-                var exisingImportsOrExports = {};
+                var existingImportsOrExports = {};
                 for (var _i = 0, namedImportsOrExports_1 = namedImportsOrExports; _i < namedImportsOrExports_1.length; _i++) {
                     var element = namedImportsOrExports_1[_i];
                     if (element.getStart() <= position && position <= element.getEnd()) {
                         continue;
                     }
-                    var name_34 = element.propertyName || element.name;
-                    exisingImportsOrExports[name_34.text] = true;
+                    var name_39 = element.propertyName || element.name;
+                    existingImportsOrExports[name_39.text] = true;
                 }
-                if (ts.isEmpty(exisingImportsOrExports)) {
+                if (ts.isEmpty(existingImportsOrExports)) {
                     return exportsOfModule;
                 }
-                return ts.filter(exportsOfModule, function (e) { return !ts.lookUp(exisingImportsOrExports, e.name); });
+                return ts.filter(exportsOfModule, function (e) { return !ts.lookUp(existingImportsOrExports, e.name); });
             }
             function filterObjectMembersList(contextualMemberSymbols, existingMembers) {
                 if (!existingMembers || existingMembers.length === 0) {
@@ -40605,17 +43596,17 @@ var ts;
                 var existingMemberNames = {};
                 for (var _i = 0, existingMembers_1 = existingMembers; _i < existingMembers_1.length; _i++) {
                     var m = existingMembers_1[_i];
-                    if (m.kind !== 248 &&
-                        m.kind !== 249 &&
-                        m.kind !== 166 &&
-                        m.kind !== 144) {
+                    if (m.kind !== 252 &&
+                        m.kind !== 253 &&
+                        m.kind !== 168 &&
+                        m.kind !== 146) {
                         continue;
                     }
                     if (m.getStart() <= position && position <= m.getEnd()) {
                         continue;
                     }
                     var existingName = void 0;
-                    if (m.kind === 166 && m.propertyName) {
+                    if (m.kind === 168 && m.propertyName) {
                         if (m.propertyName.kind === 69) {
                             existingName = m.propertyName.text;
                         }
@@ -40634,7 +43625,7 @@ var ts;
                     if (attr.getStart() <= position && position <= attr.getEnd()) {
                         continue;
                     }
-                    if (attr.kind === 241) {
+                    if (attr.kind === 245) {
                         seenNames[attr.name.text] = true;
                     }
                 }
@@ -40647,20 +43638,20 @@ var ts;
             if (!completionData) {
                 return undefined;
             }
-            var symbols = completionData.symbols, isMemberCompletion = completionData.isMemberCompletion, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, isRightOfDot = completionData.isRightOfDot, isJsDocTagName = completionData.isJsDocTagName;
+            var symbols = completionData.symbols, isMemberCompletion = completionData.isMemberCompletion, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, isJsDocTagName = completionData.isJsDocTagName;
             if (isJsDocTagName) {
                 return { isMemberCompletion: false, isNewIdentifierLocation: false, entries: getAllJsDocCompletionEntries() };
             }
             var sourceFile = getValidSourceFile(fileName);
             var entries = [];
-            if (isRightOfDot && ts.isSourceFileJavaScript(sourceFile)) {
+            if (ts.isSourceFileJavaScript(sourceFile)) {
                 var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries);
-                ts.addRange(entries, getJavaScriptCompletionEntries(sourceFile, uniqueNames));
+                ts.addRange(entries, getJavaScriptCompletionEntries(sourceFile, location.pos, uniqueNames));
             }
             else {
                 if (!symbols || symbols.length === 0) {
                     if (sourceFile.languageVariant === 1 &&
-                        location.parent && location.parent.kind === 240) {
+                        location.parent && location.parent.kind === 244) {
                         var tagName = location.parent.parent.openingElement.tagName;
                         entries.push({
                             name: tagName.text,
@@ -40679,14 +43670,17 @@ var ts;
                 ts.addRange(entries, keywordCompletions);
             }
             return { isMemberCompletion: isMemberCompletion, isNewIdentifierLocation: isNewIdentifierLocation, entries: entries };
-            function getJavaScriptCompletionEntries(sourceFile, uniqueNames) {
+            function getJavaScriptCompletionEntries(sourceFile, position, uniqueNames) {
                 var entries = [];
                 var target = program.getCompilerOptions().target;
                 var nameTable = getNameTable(sourceFile);
-                for (var name_35 in nameTable) {
-                    if (!uniqueNames[name_35]) {
-                        uniqueNames[name_35] = name_35;
-                        var displayName = getCompletionEntryDisplayName(name_35, target, true);
+                for (var name_40 in nameTable) {
+                    if (nameTable[name_40] === position) {
+                        continue;
+                    }
+                    if (!uniqueNames[name_40]) {
+                        uniqueNames[name_40] = name_40;
+                        var displayName = getCompletionEntryDisplayName(name_40, target, true);
                         if (displayName) {
                             var entry = {
                                 name: displayName,
@@ -40726,8 +43720,8 @@ var ts;
                 var start = new Date().getTime();
                 var uniqueNames = {};
                 if (symbols) {
-                    for (var _i = 0, symbols_3 = symbols; _i < symbols_3.length; _i++) {
-                        var symbol = symbols_3[_i];
+                    for (var _i = 0, symbols_4 = symbols; _i < symbols_4.length; _i++) {
+                        var symbol = symbols_4[_i];
                         var entry = createCompletionEntry(symbol, location);
                         if (entry) {
                             var id = ts.escapeIdentifier(entry.name);
@@ -40747,8 +43741,8 @@ var ts;
             var completionData = getCompletionData(fileName, position);
             if (completionData) {
                 var symbols = completionData.symbols, location_2 = completionData.location;
-                var target = program.getCompilerOptions().target;
-                var symbol = ts.forEach(symbols, function (s) { return getCompletionEntryDisplayNameForSymbol(s, target, false, location_2) === entryName ? s : undefined; });
+                var target_2 = program.getCompilerOptions().target;
+                var symbol = ts.forEach(symbols, function (s) { return getCompletionEntryDisplayNameForSymbol(s, target_2, false, location_2) === entryName ? s : undefined; });
                 if (symbol) {
                     var _a = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, getValidSourceFile(fileName), location_2, location_2, 7), displayParts = _a.displayParts, documentation = _a.documentation, symbolKind = _a.symbolKind;
                     return {
@@ -40775,7 +43769,7 @@ var ts;
         function getSymbolKind(symbol, location) {
             var flags = symbol.getFlags();
             if (flags & 32)
-                return ts.getDeclarationOfKind(symbol, 189) ?
+                return ts.getDeclarationOfKind(symbol, 191) ?
                     ScriptElementKind.localClassElement : ScriptElementKind.classElement;
             if (flags & 384)
                 return ScriptElementKind.enumElement;
@@ -40806,6 +43800,9 @@ var ts;
             if (typeChecker.isArgumentsSymbol(symbol)) {
                 return ScriptElementKind.localVariableElement;
             }
+            if (location.kind === 97 && ts.isExpression(location)) {
+                return ScriptElementKind.parameterElement;
+            }
             if (flags & 3) {
                 if (ts.isFirstDeclarationOfSymbolParameter(symbol)) {
                     return ScriptElementKind.parameterElement;
@@ -40863,22 +43860,23 @@ var ts;
             var symbolFlags = symbol.flags;
             var symbolKind = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, symbolFlags, location);
             var hasAddedSymbolInfo;
+            var isThisExpression = location.kind === 97 && ts.isExpression(location);
             var type;
             if (symbolKind !== ScriptElementKind.unknown || symbolFlags & 32 || symbolFlags & 8388608) {
                 if (symbolKind === ScriptElementKind.memberGetAccessorElement || symbolKind === ScriptElementKind.memberSetAccessorElement) {
                     symbolKind = ScriptElementKind.memberVariableElement;
                 }
-                var signature;
-                type = typeChecker.getTypeOfSymbolAtLocation(symbol, location);
+                var signature = void 0;
+                type = isThisExpression ? typeChecker.getTypeAtLocation(location) : typeChecker.getTypeOfSymbolAtLocation(symbol, location);
                 if (type) {
-                    if (location.parent && location.parent.kind === 169) {
+                    if (location.parent && location.parent.kind === 171) {
                         var right = location.parent.name;
                         if (right === location || (right && right.getFullWidth() === 0)) {
                             location = location.parent;
                         }
                     }
-                    var callExpression;
-                    if (location.kind === 171 || location.kind === 172) {
+                    var callExpression = void 0;
+                    if (location.kind === 173 || location.kind === 174) {
                         callExpression = location;
                     }
                     else if (isCallExpressionTarget(location) || isNewExpressionTarget(location)) {
@@ -40890,7 +43888,7 @@ var ts;
                         if (!signature && candidateSignatures.length) {
                             signature = candidateSignatures[0];
                         }
-                        var useConstructSignatures = callExpression.kind === 172 || callExpression.expression.kind === 95;
+                        var useConstructSignatures = callExpression.kind === 174 || callExpression.expression.kind === 95;
                         var allSignatures = useConstructSignatures ? type.getConstructSignatures() : type.getCallSignatures();
                         if (!ts.contains(allSignatures, signature.target) && !ts.contains(allSignatures, signature)) {
                             signature = allSignatures.length ? allSignatures[0] : undefined;
@@ -40938,21 +43936,21 @@ var ts;
                         }
                     }
                     else if ((isNameOfFunctionDeclaration(location) && !(symbol.flags & 98304)) ||
-                        (location.kind === 121 && location.parent.kind === 145)) {
+                        (location.kind === 121 && location.parent.kind === 147)) {
                         var functionDeclaration = location.parent;
-                        var allSignatures = functionDeclaration.kind === 145 ? type.getConstructSignatures() : type.getCallSignatures();
+                        var allSignatures = functionDeclaration.kind === 147 ? type.getConstructSignatures() : type.getCallSignatures();
                         if (!typeChecker.isImplementationOfOverload(functionDeclaration)) {
                             signature = typeChecker.getSignatureFromDeclaration(functionDeclaration);
                         }
                         else {
                             signature = allSignatures[0];
                         }
-                        if (functionDeclaration.kind === 145) {
+                        if (functionDeclaration.kind === 147) {
                             symbolKind = ScriptElementKind.constructorImplementationElement;
                             addPrefixForAnyFunctionOrVar(type.symbol, symbolKind);
                         }
                         else {
-                            addPrefixForAnyFunctionOrVar(functionDeclaration.kind === 148 &&
+                            addPrefixForAnyFunctionOrVar(functionDeclaration.kind === 150 &&
                                 !(type.symbol.flags & 2048 || type.symbol.flags & 4096) ? type.symbol : symbol, symbolKind);
                         }
                         addSignatureDisplayParts(signature, allSignatures);
@@ -40960,8 +43958,8 @@ var ts;
                     }
                 }
             }
-            if (symbolFlags & 32 && !hasAddedSymbolInfo) {
-                if (ts.getDeclarationOfKind(symbol, 189)) {
+            if (symbolFlags & 32 && !hasAddedSymbolInfo && !isThisExpression) {
+                if (ts.getDeclarationOfKind(symbol, 191)) {
                     pushTypePart(ScriptElementKind.localClassElement);
                 }
                 else {
@@ -40980,7 +43978,7 @@ var ts;
             }
             if (symbolFlags & 524288) {
                 addNewLineIfDisplayPartsExist();
-                displayParts.push(ts.keywordPart(132));
+                displayParts.push(ts.keywordPart(133));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 writeTypeParametersOfSymbol(symbol, sourceFile);
@@ -41001,7 +43999,7 @@ var ts;
             }
             if (symbolFlags & 1536) {
                 addNewLineIfDisplayPartsExist();
-                var declaration = ts.getDeclarationOfKind(symbol, 221);
+                var declaration = ts.getDeclarationOfKind(symbol, 224);
                 var isNamespace = declaration && declaration.name && declaration.name.kind === 69;
                 displayParts.push(ts.keywordPart(isNamespace ? 126 : 125));
                 displayParts.push(ts.spacePart());
@@ -41022,23 +44020,23 @@ var ts;
                     writeTypeParametersOfSymbol(symbol.parent, enclosingDeclaration);
                 }
                 else {
-                    var declaration = ts.getDeclarationOfKind(symbol, 138);
+                    var declaration = ts.getDeclarationOfKind(symbol, 140);
                     ts.Debug.assert(declaration !== undefined);
                     declaration = declaration.parent;
                     if (declaration) {
                         if (ts.isFunctionLikeKind(declaration.kind)) {
                             var signature = typeChecker.getSignatureFromDeclaration(declaration);
-                            if (declaration.kind === 149) {
+                            if (declaration.kind === 151) {
                                 displayParts.push(ts.keywordPart(92));
                                 displayParts.push(ts.spacePart());
                             }
-                            else if (declaration.kind !== 148 && declaration.name) {
+                            else if (declaration.kind !== 150 && declaration.name) {
                                 addFullSymbolName(declaration.symbol);
                             }
                             ts.addRange(displayParts, ts.signatureToDisplayParts(typeChecker, signature, sourceFile, 32));
                         }
                         else {
-                            displayParts.push(ts.keywordPart(132));
+                            displayParts.push(ts.keywordPart(133));
                             displayParts.push(ts.spacePart());
                             addFullSymbolName(declaration.symbol);
                             writeTypeParametersOfSymbol(declaration.symbol, sourceFile);
@@ -41049,7 +44047,7 @@ var ts;
             if (symbolFlags & 8) {
                 addPrefixForAnyFunctionOrVar(symbol, "enum member");
                 var declaration = symbol.declarations[0];
-                if (declaration.kind === 250) {
+                if (declaration.kind === 254) {
                     var constantValue = typeChecker.getConstantValue(declaration);
                     if (constantValue !== undefined) {
                         displayParts.push(ts.spacePart());
@@ -41065,13 +44063,13 @@ var ts;
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 ts.forEach(symbol.declarations, function (declaration) {
-                    if (declaration.kind === 224) {
+                    if (declaration.kind === 228) {
                         var importEqualsDeclaration = declaration;
                         if (ts.isExternalModuleImportEqualsDeclaration(importEqualsDeclaration)) {
                             displayParts.push(ts.spacePart());
                             displayParts.push(ts.operatorPart(56));
                             displayParts.push(ts.spacePart());
-                            displayParts.push(ts.keywordPart(127));
+                            displayParts.push(ts.keywordPart(128));
                             displayParts.push(ts.punctuationPart(17));
                             displayParts.push(ts.displayPart(ts.getTextOfNode(ts.getExternalModuleImportEqualsDeclarationExpression(importEqualsDeclaration)), SymbolDisplayPartKind.stringLiteral));
                             displayParts.push(ts.punctuationPart(18));
@@ -41092,10 +44090,17 @@ var ts;
             if (!hasAddedSymbolInfo) {
                 if (symbolKind !== ScriptElementKind.unknown) {
                     if (type) {
-                        addPrefixForAnyFunctionOrVar(symbol, symbolKind);
+                        if (isThisExpression) {
+                            addNewLineIfDisplayPartsExist();
+                            displayParts.push(ts.keywordPart(97));
+                        }
+                        else {
+                            addPrefixForAnyFunctionOrVar(symbol, symbolKind);
+                        }
                         if (symbolKind === ScriptElementKind.memberVariableElement ||
                             symbolFlags & 3 ||
-                            symbolKind === ScriptElementKind.localVariableElement) {
+                            symbolKind === ScriptElementKind.localVariableElement ||
+                            isThisExpression) {
                             displayParts.push(ts.punctuationPart(54));
                             displayParts.push(ts.spacePart());
                             if (type.symbol && type.symbol.flags & 262144) {
@@ -41195,10 +44200,10 @@ var ts;
             if (!symbol || typeChecker.isUnknownSymbol(symbol)) {
                 switch (node.kind) {
                     case 69:
-                    case 169:
-                    case 136:
+                    case 171:
+                    case 138:
                     case 97:
-                    case 162:
+                    case 164:
                     case 95:
                         var type = typeChecker.getTypeAtLocation(node);
                         if (type) {
@@ -41271,8 +44276,8 @@ var ts;
                 var declarations = [];
                 var definition;
                 ts.forEach(signatureDeclarations, function (d) {
-                    if ((selectConstructors && d.kind === 145) ||
-                        (!selectConstructors && (d.kind === 216 || d.kind === 144 || d.kind === 143))) {
+                    if ((selectConstructors && d.kind === 147) ||
+                        (!selectConstructors && (d.kind === 219 || d.kind === 146 || d.kind === 145))) {
                         declarations.push(d);
                         if (d.body)
                             definition = d;
@@ -41289,6 +44294,25 @@ var ts;
                 return false;
             }
         }
+        function findReferenceInPosition(refs, pos) {
+            for (var _i = 0, refs_1 = refs; _i < refs_1.length; _i++) {
+                var ref = refs_1[_i];
+                if (ref.pos <= pos && pos < ref.end) {
+                    return ref;
+                }
+            }
+            return undefined;
+        }
+        function getDefinitionInfoForFileReference(name, targetFileName) {
+            return {
+                fileName: targetFileName,
+                textSpan: ts.createTextSpanFromBounds(0, 0),
+                kind: ScriptElementKind.scriptElement,
+                name: name,
+                containerName: undefined,
+                containerKind: undefined
+            };
+        }
         function getDefinitionAtPosition(fileName, position) {
             synchronizeHostData();
             var sourceFile = getValidSourceFile(fileName);
@@ -41301,18 +44325,19 @@ var ts;
                 var label = getTargetLabel(node.parent, node.text);
                 return label ? [createDefinitionInfo(label, ScriptElementKind.label, labelName, undefined)] : undefined;
             }
-            var comment = ts.forEach(sourceFile.referencedFiles, function (r) { return (r.pos <= position && position < r.end) ? r : undefined; });
+            var comment = findReferenceInPosition(sourceFile.referencedFiles, position);
             if (comment) {
                 var referenceFile = ts.tryResolveScriptReference(program, sourceFile, comment);
                 if (referenceFile) {
-                    return [{
-                            fileName: referenceFile.fileName,
-                            textSpan: ts.createTextSpanFromBounds(0, 0),
-                            kind: ScriptElementKind.scriptElement,
-                            name: comment.fileName,
-                            containerName: undefined,
-                            containerKind: undefined
-                        }];
+                    return [getDefinitionInfoForFileReference(comment.fileName, referenceFile.fileName)];
+                }
+                return undefined;
+            }
+            var typeReferenceDirective = findReferenceInPosition(sourceFile.typeReferenceDirectives, position);
+            if (typeReferenceDirective) {
+                var referenceFile = ts.lookUp(program.resolvedTypeReferenceDirectives, typeReferenceDirective.fileName);
+                if (referenceFile && referenceFile.resolvedFileName) {
+                    return [getDefinitionInfoForFileReference(typeReferenceDirective.fileName, referenceFile.resolvedFileName)];
                 }
                 return undefined;
             }
@@ -41323,20 +44348,22 @@ var ts;
             }
             if (symbol.flags & 8388608) {
                 var declaration = symbol.declarations[0];
-                if (node.kind === 69 && node.parent === declaration) {
+                if (node.kind === 69 &&
+                    (node.parent === declaration ||
+                        (declaration.kind === 233 && declaration.parent && declaration.parent.kind === 232))) {
                     symbol = typeChecker.getAliasedSymbol(symbol);
                 }
             }
-            if (node.parent.kind === 249) {
+            if (node.parent.kind === 253) {
                 var shorthandSymbol = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
                 if (!shorthandSymbol) {
                     return [];
                 }
                 var shorthandDeclarations = shorthandSymbol.getDeclarations();
-                var shorthandSymbolKind = getSymbolKind(shorthandSymbol, node);
-                var shorthandSymbolName = typeChecker.symbolToString(shorthandSymbol);
-                var shorthandContainerName = typeChecker.symbolToString(symbol.parent, node);
-                return ts.map(shorthandDeclarations, function (declaration) { return createDefinitionInfo(declaration, shorthandSymbolKind, shorthandSymbolName, shorthandContainerName); });
+                var shorthandSymbolKind_1 = getSymbolKind(shorthandSymbol, node);
+                var shorthandSymbolName_1 = typeChecker.symbolToString(shorthandSymbol);
+                var shorthandContainerName_1 = typeChecker.symbolToString(symbol.parent, node);
+                return ts.map(shorthandDeclarations, function (declaration) { return createDefinitionInfo(declaration, shorthandSymbolKind_1, shorthandSymbolName_1, shorthandContainerName_1); });
             }
             return getDefinitionFromSymbol(symbol, node);
         }
@@ -41357,13 +44384,13 @@ var ts;
                 return undefined;
             }
             if (type.flags & 16384) {
-                var result = [];
+                var result_3 = [];
                 ts.forEach(type.types, function (t) {
                     if (t.symbol) {
-                        ts.addRange(result, getDefinitionFromSymbol(t.symbol, node));
+                        ts.addRange(result_3, getDefinitionFromSymbol(t.symbol, node));
                     }
                 });
-                return result;
+                return result_3;
             }
             if (!type.symbol) {
                 return undefined;
@@ -41373,8 +44400,8 @@ var ts;
         function getOccurrencesAtPosition(fileName, position) {
             var results = getOccurrencesAtPositionCore(fileName, position);
             if (results) {
-                var sourceFile = getCanonicalFileName(ts.normalizeSlashes(fileName));
-                results = ts.filter(results, function (r) { return getCanonicalFileName(ts.normalizeSlashes(r.fileName)) === sourceFile; });
+                var sourceFile_2 = getCanonicalFileName(ts.normalizeSlashes(fileName));
+                results = ts.filter(results, function (r) { return getCanonicalFileName(ts.normalizeSlashes(r.fileName)) === sourceFile_2; });
             }
             return results;
         }
@@ -41400,7 +44427,7 @@ var ts;
             function getSemanticDocumentHighlights(node) {
                 if (node.kind === 69 ||
                     node.kind === 97 ||
-                    node.kind === 162 ||
+                    node.kind === 164 ||
                     node.kind === 95 ||
                     isLiteralNameOfPropertyDeclarationOrIndexAccess(node) ||
                     isNameOfExternalModuleImportOrDeclaration(node)) {
@@ -41452,75 +44479,75 @@ var ts;
                         switch (node.kind) {
                             case 88:
                             case 80:
-                                if (hasKind(node.parent, 199)) {
+                                if (hasKind(node.parent, 202)) {
                                     return getIfElseOccurrences(node.parent);
                                 }
                                 break;
                             case 94:
-                                if (hasKind(node.parent, 207)) {
+                                if (hasKind(node.parent, 210)) {
                                     return getReturnOccurrences(node.parent);
                                 }
                                 break;
                             case 98:
-                                if (hasKind(node.parent, 211)) {
+                                if (hasKind(node.parent, 214)) {
                                     return getThrowOccurrences(node.parent);
                                 }
                                 break;
                             case 72:
-                                if (hasKind(parent(parent(node)), 212)) {
+                                if (hasKind(parent(parent(node)), 215)) {
                                     return getTryCatchFinallyOccurrences(node.parent.parent);
                                 }
                                 break;
                             case 100:
                             case 85:
-                                if (hasKind(parent(node), 212)) {
+                                if (hasKind(parent(node), 215)) {
                                     return getTryCatchFinallyOccurrences(node.parent);
                                 }
                                 break;
                             case 96:
-                                if (hasKind(node.parent, 209)) {
+                                if (hasKind(node.parent, 212)) {
                                     return getSwitchCaseDefaultOccurrences(node.parent);
                                 }
                                 break;
                             case 71:
                             case 77:
-                                if (hasKind(parent(parent(parent(node))), 209)) {
+                                if (hasKind(parent(parent(parent(node))), 212)) {
                                     return getSwitchCaseDefaultOccurrences(node.parent.parent.parent);
                                 }
                                 break;
                             case 70:
                             case 75:
-                                if (hasKind(node.parent, 206) || hasKind(node.parent, 205)) {
+                                if (hasKind(node.parent, 209) || hasKind(node.parent, 208)) {
                                     return getBreakOrContinueStatementOccurrences(node.parent);
                                 }
                                 break;
                             case 86:
-                                if (hasKind(node.parent, 202) ||
-                                    hasKind(node.parent, 203) ||
-                                    hasKind(node.parent, 204)) {
+                                if (hasKind(node.parent, 205) ||
+                                    hasKind(node.parent, 206) ||
+                                    hasKind(node.parent, 207)) {
                                     return getLoopBreakContinueOccurrences(node.parent);
                                 }
                                 break;
                             case 104:
                             case 79:
-                                if (hasKind(node.parent, 201) || hasKind(node.parent, 200)) {
+                                if (hasKind(node.parent, 204) || hasKind(node.parent, 203)) {
                                     return getLoopBreakContinueOccurrences(node.parent);
                                 }
                                 break;
                             case 121:
-                                if (hasKind(node.parent, 145)) {
+                                if (hasKind(node.parent, 147)) {
                                     return getConstructorOccurrences(node.parent);
                                 }
                                 break;
                             case 123:
-                            case 129:
-                                if (hasKind(node.parent, 146) || hasKind(node.parent, 147)) {
+                            case 130:
+                                if (hasKind(node.parent, 148) || hasKind(node.parent, 149)) {
                                     return getGetAndSetOccurrences(node.parent);
                                 }
                                 break;
                             default:
                                 if (ts.isModifierKind(node.kind) && node.parent &&
-                                    (ts.isDeclaration(node.parent) || node.parent.kind === 196)) {
+                                    (ts.isDeclaration(node.parent) || node.parent.kind === 199)) {
                                     return getModifierOccurrences(node.kind, node.parent);
                                 }
                         }
@@ -41532,10 +44559,10 @@ var ts;
                     aggregate(node);
                     return statementAccumulator;
                     function aggregate(node) {
-                        if (node.kind === 211) {
+                        if (node.kind === 214) {
                             statementAccumulator.push(node);
                         }
-                        else if (node.kind === 212) {
+                        else if (node.kind === 215) {
                             var tryStatement = node;
                             if (tryStatement.catchClause) {
                                 aggregate(tryStatement.catchClause);
@@ -41555,17 +44582,17 @@ var ts;
                 function getThrowStatementOwner(throwStatement) {
                     var child = throwStatement;
                     while (child.parent) {
-                        var parent_13 = child.parent;
-                        if (ts.isFunctionBlock(parent_13) || parent_13.kind === 251) {
-                            return parent_13;
+                        var parent_16 = child.parent;
+                        if (ts.isFunctionBlock(parent_16) || parent_16.kind === 255) {
+                            return parent_16;
                         }
-                        if (parent_13.kind === 212) {
-                            var tryStatement = parent_13;
+                        if (parent_16.kind === 215) {
+                            var tryStatement = parent_16;
                             if (tryStatement.tryBlock === child && tryStatement.catchClause) {
                                 return child;
                             }
                         }
-                        child = parent_13;
+                        child = parent_16;
                     }
                     return undefined;
                 }
@@ -41574,7 +44601,7 @@ var ts;
                     aggregate(node);
                     return statementAccumulator;
                     function aggregate(node) {
-                        if (node.kind === 206 || node.kind === 205) {
+                        if (node.kind === 209 || node.kind === 208) {
                             statementAccumulator.push(node);
                         }
                         else if (!ts.isFunctionLike(node)) {
@@ -41589,15 +44616,15 @@ var ts;
                 function getBreakOrContinueOwner(statement) {
                     for (var node_2 = statement.parent; node_2; node_2 = node_2.parent) {
                         switch (node_2.kind) {
-                            case 209:
-                                if (statement.kind === 205) {
+                            case 212:
+                                if (statement.kind === 208) {
                                     continue;
                                 }
-                            case 202:
-                            case 203:
+                            case 205:
+                            case 206:
+                            case 207:
                             case 204:
-                            case 201:
-                            case 200:
+                            case 203:
                                 if (!statement.label || isLabeledBy(node_2, statement.label.text)) {
                                     return node_2;
                                 }
@@ -41614,24 +44641,24 @@ var ts;
                 function getModifierOccurrences(modifier, declaration) {
                     var container = declaration.parent;
                     if (ts.isAccessibilityModifier(modifier)) {
-                        if (!(container.kind === 217 ||
-                            container.kind === 189 ||
-                            (declaration.kind === 139 && hasKind(container, 145)))) {
+                        if (!(container.kind === 220 ||
+                            container.kind === 191 ||
+                            (declaration.kind === 141 && hasKind(container, 147)))) {
                             return undefined;
                         }
                     }
                     else if (modifier === 113) {
-                        if (!(container.kind === 217 || container.kind === 189)) {
+                        if (!(container.kind === 220 || container.kind === 191)) {
                             return undefined;
                         }
                     }
                     else if (modifier === 82 || modifier === 122) {
-                        if (!(container.kind === 222 || container.kind === 251)) {
+                        if (!(container.kind === 225 || container.kind === 255)) {
                             return undefined;
                         }
                     }
                     else if (modifier === 115) {
-                        if (!(container.kind === 217 || declaration.kind === 217)) {
+                        if (!(container.kind === 220 || declaration.kind === 220)) {
                             return undefined;
                         }
                     }
@@ -41642,8 +44669,8 @@ var ts;
                     var modifierFlag = getFlagFromModifier(modifier);
                     var nodes;
                     switch (container.kind) {
-                        case 222:
-                        case 251:
+                        case 225:
+                        case 255:
                             if (modifierFlag & 128) {
                                 nodes = declaration.members.concat(declaration);
                             }
@@ -41651,15 +44678,15 @@ var ts;
                                 nodes = container.statements;
                             }
                             break;
-                        case 145:
+                        case 147:
                             nodes = container.parameters.concat(container.parent.members);
                             break;
-                        case 217:
-                        case 189:
+                        case 220:
+                        case 191:
                             nodes = container.members;
-                            if (modifierFlag & 56) {
+                            if (modifierFlag & 28) {
                                 var constructor = ts.forEach(container.members, function (member) {
-                                    return member.kind === 145 && member;
+                                    return member.kind === 147 && member;
                                 });
                                 if (constructor) {
                                     nodes = nodes.concat(constructor.parameters);
@@ -41681,17 +44708,17 @@ var ts;
                     function getFlagFromModifier(modifier) {
                         switch (modifier) {
                             case 112:
-                                return 8;
-                            case 110:
-                                return 16;
-                            case 111:
-                                return 32;
-                            case 113:
-                                return 64;
-                            case 82:
-                                return 2;
-                            case 122:
                                 return 4;
+                            case 110:
+                                return 8;
+                            case 111:
+                                return 16;
+                            case 113:
+                                return 32;
+                            case 82:
+                                return 1;
+                            case 122:
+                                return 2;
                             case 115:
                                 return 128;
                             default:
@@ -41712,13 +44739,13 @@ var ts;
                 }
                 function getGetAndSetOccurrences(accessorDeclaration) {
                     var keywords = [];
-                    tryPushAccessorKeyword(accessorDeclaration.symbol, 146);
-                    tryPushAccessorKeyword(accessorDeclaration.symbol, 147);
+                    tryPushAccessorKeyword(accessorDeclaration.symbol, 148);
+                    tryPushAccessorKeyword(accessorDeclaration.symbol, 149);
                     return ts.map(keywords, getHighlightSpanForNode);
                     function tryPushAccessorKeyword(accessorSymbol, accessorKind) {
                         var accessor = ts.getDeclarationOfKind(accessorSymbol, accessorKind);
                         if (accessor) {
-                            ts.forEach(accessor.getChildren(), function (child) { return pushKeywordIf(keywords, child, 123, 129); });
+                            ts.forEach(accessor.getChildren(), function (child) { return pushKeywordIf(keywords, child, 123, 130); });
                         }
                     }
                 }
@@ -41735,7 +44762,7 @@ var ts;
                 function getLoopBreakContinueOccurrences(loopNode) {
                     var keywords = [];
                     if (pushKeywordIf(keywords, loopNode.getFirstToken(), 86, 104, 79)) {
-                        if (loopNode.kind === 200) {
+                        if (loopNode.kind === 203) {
                             var loopTokens = loopNode.getChildren();
                             for (var i = loopTokens.length - 1; i >= 0; i--) {
                                 if (pushKeywordIf(keywords, loopTokens[i], 104)) {
@@ -41756,13 +44783,13 @@ var ts;
                     var owner = getBreakOrContinueOwner(breakOrContinueStatement);
                     if (owner) {
                         switch (owner.kind) {
-                            case 202:
+                            case 205:
+                            case 206:
+                            case 207:
                             case 203:
                             case 204:
-                            case 200:
-                            case 201:
                                 return getLoopBreakContinueOccurrences(owner);
-                            case 209:
+                            case 212:
                                 return getSwitchCaseDefaultOccurrences(owner);
                         }
                     }
@@ -41812,7 +44839,7 @@ var ts;
                 }
                 function getReturnOccurrences(returnStatement) {
                     var func = ts.getContainingFunction(returnStatement);
-                    if (!(func && hasKind(func.body, 195))) {
+                    if (!(func && hasKind(func.body, 198))) {
                         return undefined;
                     }
                     var keywords = [];
@@ -41826,7 +44853,7 @@ var ts;
                 }
                 function getIfElseOccurrences(ifStatement) {
                     var keywords = [];
-                    while (hasKind(ifStatement.parent, 199) && ifStatement.parent.elseStatement === ifStatement) {
+                    while (hasKind(ifStatement.parent, 202) && ifStatement.parent.elseStatement === ifStatement) {
                         ifStatement = ifStatement.parent;
                     }
                     while (ifStatement) {
@@ -41837,7 +44864,7 @@ var ts;
                                 break;
                             }
                         }
-                        if (!hasKind(ifStatement.elseStatement, 199)) {
+                        if (!hasKind(ifStatement.elseStatement, 202)) {
                             break;
                         }
                         ifStatement = ifStatement.elseStatement;
@@ -41941,7 +44968,7 @@ var ts;
                     return getLabelReferencesInNode(node.parent, node);
                 }
             }
-            if (node.kind === 97 || node.kind === 162) {
+            if (node.kind === 97 || node.kind === 164) {
                 return getReferencesForThisKeyword(node, sourceFiles);
             }
             if (node.kind === 95) {
@@ -41966,11 +44993,11 @@ var ts;
             }
             else {
                 var internedName = getInternedName(symbol, node, declarations);
-                for (var _i = 0, sourceFiles_3 = sourceFiles; _i < sourceFiles_3.length; _i++) {
-                    var sourceFile = sourceFiles_3[_i];
+                for (var _i = 0, sourceFiles_4 = sourceFiles; _i < sourceFiles_4.length; _i++) {
+                    var sourceFile = sourceFiles_4[_i];
                     cancellationToken.throwIfCancellationRequested();
                     var nameTable = getNameTable(sourceFile);
-                    if (ts.lookUp(nameTable, internedName)) {
+                    if (ts.lookUp(nameTable, internedName) !== undefined) {
                         result = result || [];
                         getReferencesInNode(sourceFile, symbol, declaredName, node, searchMeaning, findInStrings, findInComments, result, symbolToIndex);
                     }
@@ -41994,7 +45021,7 @@ var ts;
                 };
             }
             function isImportSpecifierSymbol(symbol) {
-                return (symbol.flags & 8388608) && !!ts.getDeclarationOfKind(symbol, 229);
+                return (symbol.flags & 8388608) && !!ts.getDeclarationOfKind(symbol, 233);
             }
             function getInternedName(symbol, location, declarations) {
                 if (ts.isImportOrExportSpecifierName(location)) {
@@ -42006,13 +45033,13 @@ var ts;
             }
             function getSymbolScope(symbol) {
                 var valueDeclaration = symbol.valueDeclaration;
-                if (valueDeclaration && (valueDeclaration.kind === 176 || valueDeclaration.kind === 189)) {
+                if (valueDeclaration && (valueDeclaration.kind === 178 || valueDeclaration.kind === 191)) {
                     return valueDeclaration;
                 }
                 if (symbol.flags & (4 | 8192)) {
-                    var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) { return (d.flags & 16) ? d : undefined; });
+                    var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) { return (d.flags & 8) ? d : undefined; });
                     if (privateDeclaration) {
-                        return ts.getAncestor(privateDeclaration, 217);
+                        return ts.getAncestor(privateDeclaration, 220);
                     }
                 }
                 if (symbol.flags & 8388608) {
@@ -42024,8 +45051,8 @@ var ts;
                 var scope;
                 var declarations = symbol.getDeclarations();
                 if (declarations) {
-                    for (var _i = 0, declarations_8 = declarations; _i < declarations_8.length; _i++) {
-                        var declaration = declarations_8[_i];
+                    for (var _i = 0, declarations_9 = declarations; _i < declarations_9.length; _i++) {
+                        var declaration = declarations_9[_i];
                         var container = getContainerNode(declaration);
                         if (!container) {
                             return undefined;
@@ -42033,7 +45060,7 @@ var ts;
                         if (scope && scope !== container) {
                             return undefined;
                         }
-                        if (container.kind === 251 && !ts.isExternalModule(container)) {
+                        if (container.kind === 255 && !ts.isExternalModule(container)) {
                             return undefined;
                         }
                         scope = container;
@@ -42114,7 +45141,7 @@ var ts;
                 var tripleSlashDirectivePrefixRegex = /^\/\/\/\s*</;
                 var possiblePositions = getPossibleSymbolReferencePositions(sourceFile, searchText, container.getStart(), container.getEnd());
                 if (possiblePositions.length) {
-                    var searchSymbols = populateSearchSymbolSet(searchSymbol, searchLocation);
+                    var searchSymbols_1 = populateSearchSymbolSet(searchSymbol, searchLocation);
                     ts.forEach(possiblePositions, function (position) {
                         cancellationToken.throwIfCancellationRequested();
                         var referenceLocation = ts.getTouchingPropertyName(sourceFile, position);
@@ -42139,12 +45166,12 @@ var ts;
                         if (referenceSymbol) {
                             var referenceSymbolDeclaration = referenceSymbol.valueDeclaration;
                             var shorthandValueSymbol = typeChecker.getShorthandAssignmentValueSymbol(referenceSymbolDeclaration);
-                            var relatedSymbol = getRelatedSymbol(searchSymbols, referenceSymbol, referenceLocation);
+                            var relatedSymbol = getRelatedSymbol(searchSymbols_1, referenceSymbol, referenceLocation);
                             if (relatedSymbol) {
                                 var referencedSymbol = getReferencedSymbol(relatedSymbol);
                                 referencedSymbol.references.push(getReferenceEntryFromNode(referenceLocation));
                             }
-                            else if (!(referenceSymbol.flags & 67108864) && searchSymbols.indexOf(shorthandValueSymbol) >= 0) {
+                            else if (!(referenceSymbol.flags & 67108864) && searchSymbols_1.indexOf(shorthandValueSymbol) >= 0) {
                                 var referencedSymbol = getReferencedSymbol(shorthandValueSymbol);
                                 referencedSymbol.references.push(getReferenceEntryFromNode(referenceSymbolDeclaration.name));
                             }
@@ -42178,15 +45205,15 @@ var ts;
                 if (!searchSpaceNode) {
                     return undefined;
                 }
-                var staticFlag = 64;
+                var staticFlag = 32;
                 switch (searchSpaceNode.kind) {
-                    case 142:
-                    case 141:
                     case 144:
                     case 143:
-                    case 145:
                     case 146:
+                    case 145:
                     case 147:
+                    case 148:
+                    case 149:
                         staticFlag &= searchSpaceNode.flags;
                         searchSpaceNode = searchSpaceNode.parent;
                         break;
@@ -42203,7 +45230,7 @@ var ts;
                         return;
                     }
                     var container = ts.getSuperContainer(node, false);
-                    if (container && (64 & container.flags) === staticFlag && container.parent.symbol === searchSpaceNode.symbol) {
+                    if (container && (32 & container.flags) === staticFlag && container.parent.symbol === searchSpaceNode.symbol) {
                         references.push(getReferenceEntryFromNode(node));
                     }
                 });
@@ -42212,34 +45239,34 @@ var ts;
             }
             function getReferencesForThisKeyword(thisOrSuperKeyword, sourceFiles) {
                 var searchSpaceNode = ts.getThisContainer(thisOrSuperKeyword, false);
-                var staticFlag = 64;
+                var staticFlag = 32;
                 switch (searchSpaceNode.kind) {
-                    case 144:
-                    case 143:
+                    case 146:
+                    case 145:
                         if (ts.isObjectLiteralMethod(searchSpaceNode)) {
                             break;
                         }
-                    case 142:
-                    case 141:
-                    case 145:
-                    case 146:
+                    case 144:
+                    case 143:
                     case 147:
+                    case 148:
+                    case 149:
                         staticFlag &= searchSpaceNode.flags;
                         searchSpaceNode = searchSpaceNode.parent;
                         break;
-                    case 251:
+                    case 255:
                         if (ts.isExternalModule(searchSpaceNode)) {
                             return undefined;
                         }
-                    case 216:
-                    case 176:
+                    case 219:
+                    case 178:
                         break;
                     default:
                         return undefined;
                 }
                 var references = [];
                 var possiblePositions;
-                if (searchSpaceNode.kind === 251) {
+                if (searchSpaceNode.kind === 255) {
                     ts.forEach(sourceFiles, function (sourceFile) {
                         possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "this", sourceFile.getStart(), sourceFile.getEnd());
                         getThisReferencesInFile(sourceFile, sourceFile, possiblePositions, references);
@@ -42265,31 +45292,31 @@ var ts;
                     ts.forEach(possiblePositions, function (position) {
                         cancellationToken.throwIfCancellationRequested();
                         var node = ts.getTouchingWord(sourceFile, position);
-                        if (!node || (node.kind !== 97 && node.kind !== 162)) {
+                        if (!node || (node.kind !== 97 && node.kind !== 164)) {
                             return;
                         }
                         var container = ts.getThisContainer(node, false);
                         switch (searchSpaceNode.kind) {
-                            case 176:
-                            case 216:
+                            case 178:
+                            case 219:
                                 if (searchSpaceNode.symbol === container.symbol) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
-                            case 144:
-                            case 143:
+                            case 146:
+                            case 145:
                                 if (ts.isObjectLiteralMethod(searchSpaceNode) && searchSpaceNode.symbol === container.symbol) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
-                            case 189:
-                            case 217:
-                                if (container.parent && searchSpaceNode.symbol === container.parent.symbol && (container.flags & 64) === staticFlag) {
+                            case 191:
+                            case 220:
+                                if (container.parent && searchSpaceNode.symbol === container.parent.symbol && (container.flags & 32) === staticFlag) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
-                            case 251:
-                                if (container.kind === 251 && !ts.isExternalModule(container)) {
+                            case 255:
+                                if (container.kind === 255 && !ts.isExternalModule(container)) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
@@ -42302,7 +45329,7 @@ var ts;
                 if (isImportSpecifierSymbol(symbol)) {
                     result.push(typeChecker.getAliasedSymbol(symbol));
                 }
-                if (location.parent.kind === 233) {
+                if (location.parent.kind === 237) {
                     result.push(typeChecker.getExportSpecifierLocalTargetSymbol(location.parent));
                 }
                 if (isNameOfPropertyAssignment(location)) {
@@ -42314,7 +45341,7 @@ var ts;
                         result.push(shorthandValueSymbol);
                     }
                 }
-                if (symbol.valueDeclaration && symbol.valueDeclaration.kind === 139 &&
+                if (symbol.valueDeclaration && symbol.valueDeclaration.kind === 141 &&
                     ts.isParameterPropertyDeclaration(symbol.valueDeclaration)) {
                     result = result.concat(typeChecker.getSymbolsOfParameterPropertyDeclaration(symbol.valueDeclaration, symbol.name));
                 }
@@ -42337,11 +45364,11 @@ var ts;
                 }
                 if (symbol.flags & (32 | 64)) {
                     ts.forEach(symbol.getDeclarations(), function (declaration) {
-                        if (declaration.kind === 217) {
+                        if (declaration.kind === 220) {
                             getPropertySymbolFromTypeReference(ts.getClassExtendsHeritageClauseElement(declaration));
                             ts.forEach(ts.getClassImplementsHeritageClauseElements(declaration), getPropertySymbolFromTypeReference);
                         }
-                        else if (declaration.kind === 218) {
+                        else if (declaration.kind === 221) {
                             ts.forEach(ts.getInterfaceBaseTypeNodes(declaration), getPropertySymbolFromTypeReference);
                         }
                     });
@@ -42371,7 +45398,7 @@ var ts;
                         return aliasedSymbol;
                     }
                 }
-                if (referenceLocation.parent.kind === 233) {
+                if (referenceLocation.parent.kind === 237) {
                     var aliasedSymbol = typeChecker.getExportSpecifierLocalTargetSymbol(referenceLocation.parent);
                     if (searchSymbols.indexOf(aliasedSymbol) >= 0) {
                         return aliasedSymbol;
@@ -42387,9 +45414,9 @@ var ts;
                         return rootSymbol;
                     }
                     if (rootSymbol.parent && rootSymbol.parent.flags & (32 | 64)) {
-                        var result_3 = [];
-                        getPropertySymbolsFromBaseTypes(rootSymbol.parent, rootSymbol.getName(), result_3, {});
-                        return ts.forEach(result_3, function (s) { return searchSymbols.indexOf(s) >= 0 ? s : undefined; });
+                        var result_4 = [];
+                        getPropertySymbolsFromBaseTypes(rootSymbol.parent, rootSymbol.getName(), result_4, {});
+                        return ts.forEach(result_4, function (s) { return searchSymbols.indexOf(s) >= 0 ? s : undefined; });
                     }
                     return undefined;
                 });
@@ -42398,26 +45425,26 @@ var ts;
                 if (isNameOfPropertyAssignment(node)) {
                     var objectLiteral = node.parent.parent;
                     var contextualType = typeChecker.getContextualType(objectLiteral);
-                    var name_36 = node.text;
+                    var name_41 = node.text;
                     if (contextualType) {
                         if (contextualType.flags & 16384) {
-                            var unionProperty = contextualType.getProperty(name_36);
+                            var unionProperty = contextualType.getProperty(name_41);
                             if (unionProperty) {
                                 return [unionProperty];
                             }
                             else {
-                                var result_4 = [];
+                                var result_5 = [];
                                 ts.forEach(contextualType.types, function (t) {
-                                    var symbol = t.getProperty(name_36);
+                                    var symbol = t.getProperty(name_41);
                                     if (symbol) {
-                                        result_4.push(symbol);
+                                        result_5.push(symbol);
                                     }
                                 });
-                                return result_4;
+                                return result_5;
                             }
                         }
                         else {
-                            var symbol_1 = contextualType.getProperty(name_36);
+                            var symbol_1 = contextualType.getProperty(name_41);
                             if (symbol_1) {
                                 return [symbol_1];
                             }
@@ -42428,11 +45455,11 @@ var ts;
             }
             function getIntersectingMeaningFromDeclarations(meaning, declarations) {
                 if (declarations) {
-                    var lastIterationMeaning;
+                    var lastIterationMeaning = void 0;
                     do {
                         lastIterationMeaning = meaning;
-                        for (var _i = 0, declarations_9 = declarations; _i < declarations_9.length; _i++) {
-                            var declaration = declarations_9[_i];
+                        for (var _i = 0, declarations_10 = declarations; _i < declarations_10.length; _i++) {
+                            var declaration = declarations_10[_i];
                             var declarationMeaning = getMeaningFromDeclaration(declaration);
                             if (declarationMeaning & meaning) {
                                 meaning |= declarationMeaning;
@@ -42462,10 +45489,10 @@ var ts;
             }
             var parent = node.parent;
             if (parent) {
-                if (parent.kind === 183 || parent.kind === 182) {
+                if (parent.kind === 185 || parent.kind === 184) {
                     return true;
                 }
-                else if (parent.kind === 184 && parent.left === node) {
+                else if (parent.kind === 186 && parent.left === node) {
                     var operator = parent.operatorToken.kind;
                     return 56 <= operator && operator <= 68;
                 }
@@ -42495,33 +45522,33 @@ var ts;
         }
         function getMeaningFromDeclaration(node) {
             switch (node.kind) {
-                case 139:
-                case 214:
-                case 166:
-                case 142:
                 case 141:
-                case 248:
-                case 249:
-                case 250:
+                case 217:
+                case 168:
                 case 144:
                 case 143:
-                case 145:
+                case 252:
+                case 253:
+                case 254:
                 case 146:
+                case 145:
                 case 147:
-                case 216:
-                case 176:
-                case 177:
-                case 247:
-                    return 1;
-                case 138:
-                case 218:
+                case 148:
+                case 149:
                 case 219:
-                case 156:
-                    return 2;
-                case 217:
-                case 220:
-                    return 1 | 2;
+                case 178:
+                case 179:
+                case 251:
+                    return 1;
+                case 140:
                 case 221:
+                case 222:
+                case 158:
+                    return 2;
+                case 220:
+                case 223:
+                    return 1 | 2;
+                case 224:
                     if (ts.isAmbientModule(node)) {
                         return 4 | 1;
                     }
@@ -42531,14 +45558,14 @@ var ts;
                     else {
                         return 4;
                     }
+                case 232:
+                case 233:
                 case 228:
                 case 229:
-                case 224:
-                case 225:
-                case 230:
-                case 231:
+                case 234:
+                case 235:
                     return 1 | 2 | 4;
-                case 251:
+                case 255:
                     return 4 | 1;
             }
             return 1 | 2 | 4;
@@ -42547,10 +45574,10 @@ var ts;
             if (ts.isRightSideOfQualifiedNameOrPropertyAccess(node)) {
                 node = node.parent;
             }
-            return node.parent.kind === 152 ||
-                (node.parent.kind === 191 && !ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent)) ||
+            return node.parent.kind === 154 ||
+                (node.parent.kind === 193 && !ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent)) ||
                 (node.kind === 97 && !ts.isExpression(node)) ||
-                node.kind === 162;
+                node.kind === 164;
         }
         function isNamespaceReference(node) {
             return isQualifiedNameNamespaceReference(node) || isPropertyAccessNamespaceReference(node);
@@ -42558,47 +45585,47 @@ var ts;
         function isPropertyAccessNamespaceReference(node) {
             var root = node;
             var isLastClause = true;
-            if (root.parent.kind === 169) {
-                while (root.parent && root.parent.kind === 169) {
+            if (root.parent.kind === 171) {
+                while (root.parent && root.parent.kind === 171) {
                     root = root.parent;
                 }
                 isLastClause = root.name === node;
             }
-            if (!isLastClause && root.parent.kind === 191 && root.parent.parent.kind === 246) {
+            if (!isLastClause && root.parent.kind === 193 && root.parent.parent.kind === 250) {
                 var decl = root.parent.parent.parent;
-                return (decl.kind === 217 && root.parent.parent.token === 106) ||
-                    (decl.kind === 218 && root.parent.parent.token === 83);
+                return (decl.kind === 220 && root.parent.parent.token === 106) ||
+                    (decl.kind === 221 && root.parent.parent.token === 83);
             }
             return false;
         }
         function isQualifiedNameNamespaceReference(node) {
             var root = node;
             var isLastClause = true;
-            if (root.parent.kind === 136) {
-                while (root.parent && root.parent.kind === 136) {
+            if (root.parent.kind === 138) {
+                while (root.parent && root.parent.kind === 138) {
                     root = root.parent;
                 }
                 isLastClause = root.right === node;
             }
-            return root.parent.kind === 152 && !isLastClause;
+            return root.parent.kind === 154 && !isLastClause;
         }
         function isInRightSideOfImport(node) {
-            while (node.parent.kind === 136) {
+            while (node.parent.kind === 138) {
                 node = node.parent;
             }
             return ts.isInternalModuleImportEqualsDeclaration(node.parent) && node.parent.moduleReference === node;
         }
         function getMeaningFromRightHandSideOfImportEquals(node) {
             ts.Debug.assert(node.kind === 69);
-            if (node.parent.kind === 136 &&
+            if (node.parent.kind === 138 &&
                 node.parent.right === node &&
-                node.parent.parent.kind === 224) {
+                node.parent.parent.kind === 228) {
                 return 1 | 2 | 4;
             }
             return 4;
         }
         function getMeaningFromLocation(node) {
-            if (node.parent.kind === 230) {
+            if (node.parent.kind === 234) {
                 return 1 | 2 | 4;
             }
             else if (isInRightSideOfImport(node)) {
@@ -42622,7 +45649,7 @@ var ts;
             var sourceFile = getValidSourceFile(fileName);
             return ts.SignatureHelp.getSignatureHelpItems(program, sourceFile, position, cancellationToken);
         }
-        function getSourceFile(fileName) {
+        function getNonBoundSourceFile(fileName) {
             return syntaxTreeCache.getCurrentSourceFile(fileName);
         }
         function getNameOrDottedNameSpan(fileName, startPos, endPos) {
@@ -42632,16 +45659,16 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 169:
-                case 136:
+                case 171:
+                case 138:
                 case 9:
-                case 163:
+                case 165:
                 case 84:
                 case 99:
                 case 93:
                 case 95:
                 case 97:
-                case 162:
+                case 164:
                 case 69:
                     break;
                 default:
@@ -42653,7 +45680,7 @@ var ts;
                     nodeForStartPos = nodeForStartPos.parent;
                 }
                 else if (isNameOfModuleDeclaration(nodeForStartPos)) {
-                    if (nodeForStartPos.parent.parent.kind === 221 &&
+                    if (nodeForStartPos.parent.parent.kind === 224 &&
                         nodeForStartPos.parent.parent.body === nodeForStartPos.parent) {
                         nodeForStartPos = nodeForStartPos.parent.parent.name;
                     }
@@ -42680,10 +45707,10 @@ var ts;
         }
         function checkForClassificationCancellation(kind) {
             switch (kind) {
+                case 224:
+                case 220:
                 case 221:
-                case 217:
-                case 218:
-                case 216:
+                case 219:
                     cancellationToken.throwIfCancellationRequested();
             }
         }
@@ -42731,7 +45758,7 @@ var ts;
                 return undefined;
                 function hasValueSideModule(symbol) {
                     return ts.forEach(symbol.declarations, function (declaration) {
-                        return declaration.kind === 221 &&
+                        return declaration.kind === 224 &&
                             ts.getModuleInstanceState(declaration) === 1;
                     });
                 }
@@ -42870,16 +45897,16 @@ var ts;
                     pushClassification(tag.tagName.pos, tag.tagName.end - tag.tagName.pos, 18);
                     pos = tag.tagName.end;
                     switch (tag.kind) {
-                        case 270:
+                        case 274:
                             processJSDocParameterTag(tag);
                             break;
-                        case 273:
+                        case 277:
                             processJSDocTemplateTag(tag);
                             break;
-                        case 272:
+                        case 276:
                             processElement(tag.typeExpression);
                             break;
-                        case 271:
+                        case 275:
                             processElement(tag.typeExpression);
                             break;
                     }
@@ -42935,19 +45962,49 @@ var ts;
                     pushClassification(start, end - start, type);
                 }
             }
-            function classifyTokenOrJsxText(token) {
-                if (ts.nodeIsMissing(token)) {
-                    return;
+            function tryClassifyNode(node) {
+                if (ts.nodeIsMissing(node)) {
+                    return true;
                 }
-                var tokenStart = token.kind === 239 ? token.pos : classifyLeadingTriviaAndGetTokenStart(token);
-                var tokenWidth = token.end - tokenStart;
+                var classifiedElementName = tryClassifyJsxElementName(node);
+                if (!ts.isToken(node) && node.kind !== 243 && classifiedElementName === undefined) {
+                    return false;
+                }
+                var tokenStart = node.kind === 243 ? node.pos : classifyLeadingTriviaAndGetTokenStart(node);
+                var tokenWidth = node.end - tokenStart;
                 ts.Debug.assert(tokenWidth >= 0);
                 if (tokenWidth > 0) {
-                    var type = classifyTokenType(token.kind, token);
+                    var type = classifiedElementName || classifyTokenType(node.kind, node);
                     if (type) {
                         pushClassification(tokenStart, tokenWidth, type);
                     }
                 }
+                return true;
+            }
+            function tryClassifyJsxElementName(token) {
+                switch (token.parent && token.parent.kind) {
+                    case 242:
+                        if (token.parent.tagName === token) {
+                            return 19;
+                        }
+                        break;
+                    case 244:
+                        if (token.parent.tagName === token) {
+                            return 20;
+                        }
+                        break;
+                    case 241:
+                        if (token.parent.tagName === token) {
+                            return 21;
+                        }
+                        break;
+                    case 245:
+                        if (token.parent.name === token) {
+                            return 22;
+                        }
+                        break;
+                }
+                return undefined;
             }
             function classifyTokenType(tokenKind, token) {
                 if (ts.isKeyword(tokenKind)) {
@@ -42961,17 +46018,17 @@ var ts;
                 if (ts.isPunctuation(tokenKind)) {
                     if (token) {
                         if (tokenKind === 56) {
-                            if (token.parent.kind === 214 ||
-                                token.parent.kind === 142 ||
-                                token.parent.kind === 139 ||
-                                token.parent.kind === 241) {
+                            if (token.parent.kind === 217 ||
+                                token.parent.kind === 144 ||
+                                token.parent.kind === 141 ||
+                                token.parent.kind === 245) {
                                 return 5;
                             }
                         }
-                        if (token.parent.kind === 184 ||
-                            token.parent.kind === 182 ||
-                            token.parent.kind === 183 ||
-                            token.parent.kind === 185) {
+                        if (token.parent.kind === 186 ||
+                            token.parent.kind === 184 ||
+                            token.parent.kind === 185 ||
+                            token.parent.kind === 187) {
                             return 5;
                         }
                     }
@@ -42980,8 +46037,8 @@ var ts;
                 else if (tokenKind === 8) {
                     return 4;
                 }
-                else if (tokenKind === 9 || tokenKind === 163) {
-                    return token.parent.kind === 241 ? 24 : 6;
+                else if (tokenKind === 9 || tokenKind === 165) {
+                    return token.parent.kind === 245 ? 24 : 6;
                 }
                 else if (tokenKind === 10) {
                     return 6;
@@ -42989,61 +46046,42 @@ var ts;
                 else if (ts.isTemplateLiteralKind(tokenKind)) {
                     return 6;
                 }
-                else if (tokenKind === 239) {
+                else if (tokenKind === 243) {
                     return 23;
                 }
                 else if (tokenKind === 69) {
                     if (token) {
                         switch (token.parent.kind) {
-                            case 217:
+                            case 220:
                                 if (token.parent.name === token) {
                                     return 11;
                                 }
                                 return;
-                            case 138:
+                            case 140:
                                 if (token.parent.name === token) {
                                     return 15;
                                 }
                                 return;
-                            case 218:
+                            case 221:
                                 if (token.parent.name === token) {
                                     return 13;
                                 }
                                 return;
-                            case 220:
+                            case 223:
                                 if (token.parent.name === token) {
                                     return 12;
                                 }
                                 return;
-                            case 221:
+                            case 224:
                                 if (token.parent.name === token) {
                                     return 14;
                                 }
                                 return;
-                            case 139:
+                            case 141:
                                 if (token.parent.name === token) {
                                     return 17;
                                 }
                                 return;
-                            case 238:
-                                if (token.parent.tagName === token) {
-                                    return 19;
-                                }
-                                return;
-                            case 240:
-                                if (token.parent.tagName === token) {
-                                    return 20;
-                                }
-                                return;
-                            case 237:
-                                if (token.parent.tagName === token) {
-                                    return 21;
-                                }
-                                return;
-                            case 241:
-                                if (token.parent.name === token) {
-                                    return 22;
-                                }
                         }
                     }
                     return 2;
@@ -43058,10 +46096,7 @@ var ts;
                     var children = element.getChildren(sourceFile);
                     for (var i = 0, n = children.length; i < n; i++) {
                         var child = children[i];
-                        if (ts.isToken(child) || child.kind === 239) {
-                            classifyTokenOrJsxText(child);
-                        }
-                        else {
+                        if (!tryClassifyNode(child)) {
                             processElement(child);
                         }
                     }
@@ -43155,16 +46190,16 @@ var ts;
             var commentOwner;
             findOwner: for (commentOwner = tokenAtPos; commentOwner; commentOwner = commentOwner.parent) {
                 switch (commentOwner.kind) {
-                    case 216:
-                    case 144:
-                    case 145:
-                    case 217:
-                    case 196:
+                    case 219:
+                    case 146:
+                    case 147:
+                    case 220:
+                    case 199:
                         break findOwner;
-                    case 251:
+                    case 255:
                         return undefined;
-                    case 221:
-                        if (commentOwner.parent.kind === 221) {
+                    case 224:
+                        if (commentOwner.parent.kind === 224) {
                             return undefined;
                         }
                         break findOwner;
@@ -43177,7 +46212,7 @@ var ts;
             var posLineAndChar = sourceFile.getLineAndCharacterOfPosition(position);
             var lineStart = sourceFile.getLineStarts()[posLineAndChar.line];
             var indentationStr = sourceFile.text.substr(lineStart, posLineAndChar.character);
-            var newLine = host.getNewLine ? host.getNewLine() : "\r\n";
+            var newLine = ts.getNewLineOrDefaultFromHost(host);
             var docParams = "";
             for (var i = 0, numParams = parameters.length; i < numParams; i++) {
                 var currentName = parameters[i].name;
@@ -43198,7 +46233,7 @@ var ts;
             if (ts.isFunctionLike(commentOwner)) {
                 return commentOwner.parameters;
             }
-            if (commentOwner.kind === 196) {
+            if (commentOwner.kind === 199) {
                 var varStatement = commentOwner;
                 var varDeclarations = varStatement.declarationList.declarations;
                 if (varDeclarations.length === 1 && varDeclarations[0].initializer) {
@@ -43208,17 +46243,17 @@ var ts;
             return emptyArray;
         }
         function getParametersFromRightHandSideOfAssignment(rightHandSide) {
-            while (rightHandSide.kind === 175) {
+            while (rightHandSide.kind === 177) {
                 rightHandSide = rightHandSide.expression;
             }
             switch (rightHandSide.kind) {
-                case 176:
-                case 177:
+                case 178:
+                case 179:
                     return rightHandSide.parameters;
-                case 189:
+                case 191:
                     for (var _i = 0, _a = rightHandSide.members; _i < _a.length; _i++) {
                         var member = _a[_i];
-                        if (member.kind === 145) {
+                        if (member.kind === 147) {
                             return member.parameters;
                         }
                     }
@@ -43234,7 +46269,7 @@ var ts;
             var result = [];
             if (descriptors.length > 0) {
                 var regExp = getTodoCommentsRegExp();
-                var matchArray;
+                var matchArray = void 0;
                 while (matchArray = regExp.exec(fileContents)) {
                     cancellationToken.throwIfCancellationRequested();
                     var firstDescriptorCaptureIndex = 3;
@@ -43270,8 +46305,8 @@ var ts;
             function getTodoCommentsRegExp() {
                 var singleLineCommentStart = /(?:\/\/+\s*)/.source;
                 var multiLineCommentStart = /(?:\/\*+\s*)/.source;
-                var anyNumberOfSpacesAndAsterixesAtStartOfLine = /(?:^(?:\s|\*)*)/.source;
-                var preamble = "(" + anyNumberOfSpacesAndAsterixesAtStartOfLine + "|" + singleLineCommentStart + "|" + multiLineCommentStart + ")";
+                var anyNumberOfSpacesAndAsterisksAtStartOfLine = /(?:^(?:\s|\*)*)/.source;
+                var preamble = "(" + anyNumberOfSpacesAndAsterisksAtStartOfLine + "|" + singleLineCommentStart + "|" + multiLineCommentStart + ")";
                 var literals = "(?:" + ts.map(descriptors, function (d) { return "(" + escapeRegExp(d.text) + ")"; }).join("|") + ")";
                 var endOfLineOrEndOfComment = /(?:$|\*\/)/.source;
                 var messageRemainder = /(?:.*?)/.source;
@@ -43298,13 +46333,13 @@ var ts;
                         var defaultLibFileName = host.getDefaultLibFileName(host.getCompilationSettings());
                         var canonicalDefaultLibName = getCanonicalFileName(ts.normalizePath(defaultLibFileName));
                         if (defaultLibFileName) {
-                            for (var _i = 0, declarations_10 = declarations; _i < declarations_10.length; _i++) {
-                                var current = declarations_10[_i];
-                                var sourceFile_2 = current.getSourceFile();
-                                if (!sourceFile_2) {
+                            for (var _i = 0, declarations_11 = declarations; _i < declarations_11.length; _i++) {
+                                var current = declarations_11[_i];
+                                var sourceFile_3 = current.getSourceFile();
+                                if (!sourceFile_3) {
                                     continue;
                                 }
-                                var canonicalName = getCanonicalFileName(ts.normalizePath(sourceFile_2.fileName));
+                                var canonicalName = getCanonicalFileName(ts.normalizePath(sourceFile_3.fileName));
                                 if (canonicalName === canonicalDefaultLibName) {
                                     return getRenameInfoError(ts.getLocaleSpecificMessage(ts.Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library));
                                 }
@@ -43374,7 +46409,7 @@ var ts;
             getFormattingEditsAfterKeystroke: getFormattingEditsAfterKeystroke,
             getDocCommentTemplateAtPosition: getDocCommentTemplateAtPosition,
             getEmitOutput: getEmitOutput,
-            getSourceFile: getSourceFile,
+            getNonBoundSourceFile: getNonBoundSourceFile,
             getProgram: getProgram
         };
     }
@@ -43393,14 +46428,14 @@ var ts;
         function walk(node) {
             switch (node.kind) {
                 case 69:
-                    nameTable[node.text] = node.text;
+                    nameTable[node.text] = nameTable[node.text] === undefined ? node.pos : -1;
                     break;
                 case 9:
                 case 8:
                     if (ts.isDeclarationName(node) ||
-                        node.parent.kind === 235 ||
+                        node.parent.kind === 239 ||
                         isArgumentOfElementAccessExpression(node)) {
-                        nameTable[node.text] = node.text;
+                        nameTable[node.text] = nameTable[node.text] === undefined ? node.pos : -1;
                     }
                     break;
                 default:
@@ -43411,7 +46446,7 @@ var ts;
     function isArgumentOfElementAccessExpression(node) {
         return node &&
             node.parent &&
-            node.parent.kind === 170 &&
+            node.parent.kind === 172 &&
             node.parent.argumentExpression === node;
     }
     function createClassifier() {
@@ -43433,7 +46468,7 @@ var ts;
         function canFollow(keyword1, keyword2) {
             if (ts.isAccessibilityModifier(keyword1)) {
                 if (keyword2 === 123 ||
-                    keyword2 === 129 ||
+                    keyword2 === 130 ||
                     keyword2 === 121 ||
                     keyword2 === 113) {
                     return true;
@@ -43549,10 +46584,10 @@ var ts;
                         angleBracketStack--;
                     }
                     else if (token === 117 ||
-                        token === 130 ||
-                        token === 128 ||
+                        token === 131 ||
+                        token === 129 ||
                         token === 120 ||
-                        token === 131) {
+                        token === 132) {
                         if (angleBracketStack > 0 && !syntacticClassifierAbsent) {
                             token = 69;
                         }
@@ -43593,7 +46628,7 @@ var ts;
                 var end = scanner.getTextPos();
                 addResult(start, end, classFromKind(token));
                 if (end >= text.length) {
-                    if (token === 9 || token === 163) {
+                    if (token === 9 || token === 165) {
                         var tokenText = scanner.getTokenText();
                         if (scanner.isUnterminated()) {
                             var lastCharIndex = tokenText.length - 1;
@@ -43707,7 +46742,7 @@ var ts;
             }
         }
         function isKeyword(token) {
-            return token >= 70 && token <= 135;
+            return token >= 70 && token <= 137;
         }
         function classFromKind(token) {
             if (isKeyword(token)) {
@@ -43723,7 +46758,7 @@ var ts;
                 case 8:
                     return 4;
                 case 9:
-                case 163:
+                case 165:
                     return 6;
                 case 10:
                     return 7;
@@ -44114,12 +47149,12 @@ var ts;
                 var index = 0;
                 var checkOne = function () {
                     if (matchSeq(seq)) {
-                        var checkSpec = checkList[index];
+                        var checkSpec_1 = checkList[index];
                         index++;
-                        if (checkSpec.project.getSourceFileFromName(checkSpec.fileName, requireOpen)) {
-                            _this.syntacticCheck(checkSpec.fileName, checkSpec.project);
+                        if (checkSpec_1.project.getSourceFileFromName(checkSpec_1.fileName, requireOpen)) {
+                            _this.syntacticCheck(checkSpec_1.fileName, checkSpec_1.project);
                             _this.immediateId = setImmediate(function () {
-                                _this.semanticCheck(checkSpec.fileName, checkSpec.project);
+                                _this.semanticCheck(checkSpec_1.fileName, checkSpec_1.project);
                                 _this.immediateId = undefined;
                                 if (checkList.length > index) {
                                     _this.errorTimer = setTimeout(checkOne, followMs);
@@ -44408,7 +47443,7 @@ var ts;
                                 };
                                 var preferredIndent = compilerService.languageService.getIndentationAtPosition(file, position, editorOptions);
                                 var hasIndent = 0;
-                                var i, len;
+                                var i = void 0, len = void 0;
                                 for (i = 0, len = lineText.length; i < len; i++) {
                                     if (lineText.charAt(i) == " ") {
                                         hasIndent++;
@@ -44811,6 +47846,7 @@ var ts;
                 this.roots = [];
                 this.getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames);
                 this.resolvedModuleNames = ts.createFileMap();
+                this.resolvedTypeReferenceDirectives = ts.createFileMap();
                 this.filenameToScript = ts.createFileMap();
                 this.moduleResolutionHost = {
                     fileExists: function (fileName) { return _this.fileExists(fileName); },
@@ -44818,41 +47854,47 @@ var ts;
                     directoryExists: function (directoryName) { return _this.host.directoryExists(directoryName); }
                 };
             }
-            LSHost.prototype.resolveModuleNames = function (moduleNames, containingFile) {
+            LSHost.prototype.resolveNamesWithLocalCache = function (names, containingFile, cache, loader, getResult) {
                 var path = ts.toPath(containingFile, this.host.getCurrentDirectory(), this.getCanonicalFileName);
-                var currentResolutionsInFile = this.resolvedModuleNames.get(path);
+                var currentResolutionsInFile = cache.get(path);
                 var newResolutions = {};
                 var resolvedModules = [];
                 var compilerOptions = this.getCompilationSettings();
-                for (var _i = 0, moduleNames_2 = moduleNames; _i < moduleNames_2.length; _i++) {
-                    var moduleName = moduleNames_2[_i];
-                    var resolution = ts.lookUp(newResolutions, moduleName);
+                for (var _i = 0, names_2 = names; _i < names_2.length; _i++) {
+                    var name_42 = names_2[_i];
+                    var resolution = ts.lookUp(newResolutions, name_42);
                     if (!resolution) {
-                        var existingResolution = currentResolutionsInFile && ts.lookUp(currentResolutionsInFile, moduleName);
+                        var existingResolution = currentResolutionsInFile && ts.lookUp(currentResolutionsInFile, name_42);
                         if (moduleResolutionIsValid(existingResolution)) {
                             resolution = existingResolution;
                         }
                         else {
-                            resolution = ts.resolveModuleName(moduleName, containingFile, compilerOptions, this.moduleResolutionHost);
+                            resolution = loader(name_42, containingFile, compilerOptions, this.moduleResolutionHost);
                             resolution.lastCheckTime = Date.now();
-                            newResolutions[moduleName] = resolution;
+                            newResolutions[name_42] = resolution;
                         }
                     }
                     ts.Debug.assert(resolution !== undefined);
-                    resolvedModules.push(resolution.resolvedModule);
+                    resolvedModules.push(getResult(resolution));
                 }
-                this.resolvedModuleNames.set(path, newResolutions);
+                cache.set(path, newResolutions);
                 return resolvedModules;
                 function moduleResolutionIsValid(resolution) {
                     if (!resolution) {
                         return false;
                     }
-                    if (resolution.resolvedModule) {
+                    if (getResult(resolution)) {
                         return true;
                     }
                     return resolution.failedLookupLocations.length === 0;
                 }
             };
+            LSHost.prototype.resolveTypeReferenceDirectives = function (typeDirectiveNames, containingFile) {
+                return this.resolveNamesWithLocalCache(typeDirectiveNames, containingFile, this.resolvedTypeReferenceDirectives, ts.resolveTypeReferenceDirective, function (m) { return m.resolvedTypeReferenceDirective; });
+            };
+            LSHost.prototype.resolveModuleNames = function (moduleNames, containingFile) {
+                return this.resolveNamesWithLocalCache(moduleNames, containingFile, this.resolvedModuleNames, ts.resolveModuleName, function (m) { return m.resolvedModule; });
+            };
             LSHost.prototype.getDefaultLibFileName = function () {
                 var nodeModuleBinDir = ts.getDirectoryPath(ts.normalizePath(this.host.getExecutingFilePath()));
                 return ts.combinePaths(nodeModuleBinDir, ts.getDefaultLibFileName(this.compilationSettings));
@@ -44866,6 +47908,7 @@ var ts;
             LSHost.prototype.setCompilationSettings = function (opt) {
                 this.compilationSettings = opt;
                 this.resolvedModuleNames.clear();
+                this.resolvedTypeReferenceDirectives.clear();
             };
             LSHost.prototype.lineAffectsRefs = function (filename, line) {
                 var info = this.getScriptInfo(filename);
@@ -44881,6 +47924,9 @@ var ts;
             LSHost.prototype.getScriptFileNames = function () {
                 return this.roots.map(function (root) { return root.fileName; });
             };
+            LSHost.prototype.getScriptKind = function () {
+                return 0;
+            };
             LSHost.prototype.getScriptVersion = function (filename) {
                 return this.getScriptInfo(filename).svc.latestVersion().toString();
             };
@@ -44894,6 +47940,7 @@ var ts;
                 if (!info.isOpen) {
                     this.filenameToScript.remove(info.path);
                     this.resolvedModuleNames.remove(info.path);
+                    this.resolvedTypeReferenceDirectives.remove(info.path);
                 }
             };
             LSHost.prototype.getScriptInfo = function (filename) {
@@ -44918,6 +47965,7 @@ var ts;
                     this.filenameToScript.remove(info.path);
                     this.roots = copyListRemovingItem(info, this.roots);
                     this.resolvedModuleNames.remove(info.path);
+                    this.resolvedTypeReferenceDirectives.remove(info.path);
                 }
             };
             LSHost.prototype.saveTo = function (filename, tmpfilename) {
@@ -45286,8 +48334,8 @@ var ts;
                     this.inferredProjects = copyListRemovingItem(project, this.inferredProjects);
                 }
                 var fileNames = project.getFileNames();
-                for (var _b = 0, fileNames_1 = fileNames; _b < fileNames_1.length; _b++) {
-                    var fileName = fileNames_1[_b];
+                for (var _b = 0, fileNames_2 = fileNames; _b < fileNames_2.length; _b++) {
+                    var fileName = fileNames_2[_b];
                     var info = this.getScriptInfo(fileName);
                     if (info.defaultProject == project) {
                         info.defaultProject = undefined;
@@ -45482,7 +48530,7 @@ var ts;
                 fileName = ts.normalizePath(fileName);
                 var info = ts.lookUp(this.filenameToScriptInfo, fileName);
                 if (!info) {
-                    var content;
+                    var content = void 0;
                     if (this.host.fileExists(fileName)) {
                         content = fileContent || this.host.readFile(fileName);
                     }
@@ -45496,7 +48544,7 @@ var ts;
                         info.setFormatOptions(this.getFormatCodeOptions());
                         this.filenameToScriptInfo[fileName] = info;
                         if (!info.isOpen) {
-                            info.fileWatcher = this.host.watchFile(ts.toPath(fileName, fileName, ts.createGetCanonicalFileName(ts.sys.useCaseSensitiveFileNames)), function (_) { _this.watchedFileChanged(fileName); });
+                            info.fileWatcher = this.host.watchFile(fileName, function (_) { _this.watchedFileChanged(fileName); });
                         }
                     }
                 }
@@ -45512,9 +48560,13 @@ var ts;
             };
             ProjectService.prototype.findConfigFile = function (searchPath) {
                 while (true) {
-                    var fileName = ts.combinePaths(searchPath, "tsconfig.json");
-                    if (this.host.fileExists(fileName)) {
-                        return fileName;
+                    var tsconfigFileName = ts.combinePaths(searchPath, "tsconfig.json");
+                    if (this.host.fileExists(tsconfigFileName)) {
+                        return tsconfigFileName;
+                    }
+                    var jsconfigFileName = ts.combinePaths(searchPath, "jsconfig.json");
+                    if (this.host.fileExists(jsconfigFileName)) {
+                        return jsconfigFileName;
                     }
                     var parentPath = ts.getDirectoryPath(searchPath);
                     if (parentPath === searchPath) {
@@ -45642,7 +48694,7 @@ var ts;
                     return { succeeded: false, error: rawConfig.error };
                 }
                 else {
-                    var parsedCommandLine = ts.parseJsonConfigFileContent(rawConfig.config, this.host, dirPath);
+                    var parsedCommandLine = ts.parseJsonConfigFileContent(rawConfig.config, this.host, dirPath, {}, configFilename);
                     ts.Debug.assert(!!parsedCommandLine.fileNames);
                     if (parsedCommandLine.errors && (parsedCommandLine.errors.length > 0)) {
                         return { succeeded: false, error: { errorMsg: "tsconfig option errors" } };
@@ -45666,22 +48718,22 @@ var ts;
                     return error;
                 }
                 else {
-                    var project = this.createProject(configFilename, projectOptions);
+                    var project_1 = this.createProject(configFilename, projectOptions);
                     for (var _i = 0, _b = projectOptions.files; _i < _b.length; _i++) {
                         var rootFilename = _b[_i];
                         if (this.host.fileExists(rootFilename)) {
                             var info = this.openFile(rootFilename, clientFileName == rootFilename);
-                            project.addRoot(info);
+                            project_1.addRoot(info);
                         }
                         else {
                             return { errorMsg: "specified file " + rootFilename + " not found" };
                         }
                     }
-                    project.finishGraph();
-                    project.projectFileWatcher = this.host.watchFile(ts.toPath(configFilename, configFilename, ts.createGetCanonicalFileName(ts.sys.useCaseSensitiveFileNames)), function (_) { return _this.watchedProjectConfigFileChanged(project); });
+                    project_1.finishGraph();
+                    project_1.projectFileWatcher = this.host.watchFile(configFilename, function (_) { return _this.watchedProjectConfigFileChanged(project_1); });
                     this.log("Add recursive watcher for: " + ts.getDirectoryPath(configFilename));
-                    project.directoryWatcher = this.host.watchDirectory(ts.getDirectoryPath(configFilename), function (path) { return _this.directoryWatchedForSourceFilesChanged(project, path); }, true);
-                    return { success: true, project: project };
+                    project_1.directoryWatcher = this.host.watchDirectory(ts.getDirectoryPath(configFilename), function (path) { return _this.directoryWatchedForSourceFilesChanged(project_1, path); }, true);
+                    return { success: true, project: project_1 };
                 }
             };
             ProjectService.prototype.updateConfiguredProject = function (project) {
@@ -45695,10 +48747,10 @@ var ts;
                         return error;
                     }
                     else {
-                        var oldFileNames = project.compilerService.host.roots.map(function (info) { return info.fileName; });
-                        var newFileNames = projectOptions.files;
-                        var fileNamesToRemove = oldFileNames.filter(function (f) { return newFileNames.indexOf(f) < 0; });
-                        var fileNamesToAdd = newFileNames.filter(function (f) { return oldFileNames.indexOf(f) < 0; });
+                        var oldFileNames_1 = project.compilerService.host.roots.map(function (info) { return info.fileName; });
+                        var newFileNames_1 = projectOptions.files;
+                        var fileNamesToRemove = oldFileNames_1.filter(function (f) { return newFileNames_1.indexOf(f) < 0; });
+                        var fileNamesToAdd = newFileNames_1.filter(function (f) { return oldFileNames_1.indexOf(f) < 0; });
                         for (var _i = 0, fileNamesToRemove_1 = fileNamesToRemove; _i < fileNamesToRemove_1.length; _i++) {
                             var fileName = fileNamesToRemove_1[_i];
                             var info = this.getScriptInfo(fileName);
@@ -45753,6 +48805,7 @@ var ts;
                 else {
                     var defaultOpts = ts.getDefaultCompilerOptions();
                     defaultOpts.allowNonTsExtensions = true;
+                    defaultOpts.allowJs = true;
                     this.setCompilerOptions(defaultOpts);
                 }
                 this.languageService = ts.createLanguageService(this.host, this.documentRegistry);
@@ -45763,7 +48816,7 @@ var ts;
                 this.host.setCompilationSettings(opt);
             };
             CompilerService.prototype.isExternalModule = function (filename) {
-                var sourceFile = this.languageService.getSourceFile(filename);
+                var sourceFile = this.languageService.getNonBoundSourceFile(filename);
                 return ts.isExternalModule(sourceFile);
             };
             CompilerService.defaultFormatCodeOptions = {
@@ -46229,7 +49282,7 @@ var ts;
                     }
                 }
                 else {
-                    var checkText;
+                    var checkText = void 0;
                     if (this.checkEdits) {
                         checkText = editFlat(this.getText(0, this.root.charCount()), pos, deleteLength, newText);
                     }
@@ -46836,6 +49889,12 @@ var ts;
             if ("directoryExists" in this.shimHost) {
                 this.directoryExists = function (directoryName) { return _this.shimHost.directoryExists(directoryName); };
             }
+            if ("getTypeReferenceDirectiveResolutionsForFile" in this.shimHost) {
+                this.resolveTypeReferenceDirectives = function (typeDirectiveNames, containingFile) {
+                    var typeDirectivesForFile = JSON.parse(_this.shimHost.getTypeReferenceDirectiveResolutionsForFile(containingFile));
+                    return ts.map(typeDirectiveNames, function (name) { return ts.lookUp(typeDirectivesForFile, name); });
+                };
+            }
         }
         LanguageServiceShimHostAdapter.prototype.log = function (s) {
             if (this.loggingEnabled) {
@@ -46874,6 +49933,14 @@ var ts;
             var scriptSnapshot = this.shimHost.getScriptSnapshot(fileName);
             return scriptSnapshot && new ScriptSnapshotShimAdapter(scriptSnapshot);
         };
+        LanguageServiceShimHostAdapter.prototype.getScriptKind = function (fileName) {
+            if ("getScriptKind" in this.shimHost) {
+                return this.shimHost.getScriptKind(fileName);
+            }
+            else {
+                return 0;
+            }
+        };
         LanguageServiceShimHostAdapter.prototype.getScriptVersion = function (fileName) {
             return this.shimHost.getScriptVersion(fileName);
         };
@@ -46927,8 +49994,14 @@ var ts;
                 this.directoryExists = function (directoryName) { return _this.shimHost.directoryExists(directoryName); };
             }
         }
-        CoreServicesShimHostAdapter.prototype.readDirectory = function (rootDir, extension, exclude) {
-            var encoded = this.shimHost.readDirectory(rootDir, extension, JSON.stringify(exclude));
+        CoreServicesShimHostAdapter.prototype.readDirectory = function (rootDir, extension, exclude, depth) {
+            var encoded;
+            try {
+                encoded = this.shimHost.readDirectory(rootDir, extension, JSON.stringify(exclude), depth);
+            }
+            catch (e) {
+                encoded = this.shimHost.readDirectory(rootDir, extension, JSON.stringify(exclude));
+            }
             return JSON.parse(encoded);
         };
         CoreServicesShimHostAdapter.prototype.fileExists = function (fileName) {
@@ -47239,32 +50312,46 @@ var ts;
                 };
             });
         };
+        CoreServicesShimObject.prototype.resolveTypeReferenceDirective = function (fileName, typeReferenceDirective, compilerOptionsJson) {
+            var _this = this;
+            return this.forwardJSONCall("resolveTypeReferenceDirective(" + fileName + ")", function () {
+                var compilerOptions = JSON.parse(compilerOptionsJson);
+                var result = ts.resolveTypeReferenceDirective(typeReferenceDirective, ts.normalizeSlashes(fileName), compilerOptions, _this.host);
+                return {
+                    resolvedFileName: result.resolvedTypeReferenceDirective ? result.resolvedTypeReferenceDirective.resolvedFileName : undefined,
+                    primary: result.resolvedTypeReferenceDirective ? result.resolvedTypeReferenceDirective.primary : true,
+                    failedLookupLocations: result.failedLookupLocations
+                };
+            });
+        };
         CoreServicesShimObject.prototype.getPreProcessedFileInfo = function (fileName, sourceTextSnapshot) {
+            var _this = this;
             return this.forwardJSONCall("getPreProcessedFileInfo('" + fileName + "')", function () {
                 var result = ts.preProcessFile(sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength()), true, true);
-                var convertResult = {
-                    referencedFiles: [],
-                    importedFiles: [],
+                return {
+                    referencedFiles: _this.convertFileReferences(result.referencedFiles),
+                    importedFiles: _this.convertFileReferences(result.importedFiles),
                     ambientExternalModules: result.ambientExternalModules,
-                    isLibFile: result.isLibFile
+                    isLibFile: result.isLibFile,
+                    typeReferenceDirectives: _this.convertFileReferences(result.typeReferenceDirectives)
                 };
-                ts.forEach(result.referencedFiles, function (refFile) {
-                    convertResult.referencedFiles.push({
-                        path: ts.normalizePath(refFile.fileName),
-                        position: refFile.pos,
-                        length: refFile.end - refFile.pos
-                    });
-                });
-                ts.forEach(result.importedFiles, function (importedFile) {
-                    convertResult.importedFiles.push({
-                        path: ts.normalizeSlashes(importedFile.fileName),
-                        position: importedFile.pos,
-                        length: importedFile.end - importedFile.pos
-                    });
-                });
-                return convertResult;
             });
         };
+        CoreServicesShimObject.prototype.convertFileReferences = function (refs) {
+            if (!refs) {
+                return undefined;
+            }
+            var result = [];
+            for (var _i = 0, refs_2 = refs; _i < refs_2.length; _i++) {
+                var ref = refs_2[_i];
+                result.push({
+                    path: ts.normalizeSlashes(ref.fileName),
+                    position: ref.pos,
+                    length: ref.end - ref.pos
+                });
+            }
+            return result;
+        };
         CoreServicesShimObject.prototype.getTSConfigFileInfo = function (fileName, sourceTextSnapshot) {
             var _this = this;
             return this.forwardJSONCall("getTSConfigFileInfo('" + fileName + "')", function () {
@@ -47273,13 +50360,16 @@ var ts;
                 if (result.error) {
                     return {
                         options: {},
+                        typingOptions: {},
                         files: [],
                         errors: [realizeDiagnostic(result.error, "\r\n")]
                     };
                 }
-                var configFile = ts.parseJsonConfigFileContent(result.config, _this.host, ts.getDirectoryPath(ts.normalizeSlashes(fileName)));
+                var normalizedFileName = ts.normalizeSlashes(fileName);
+                var configFile = ts.parseJsonConfigFileContent(result.config, _this.host, ts.getDirectoryPath(normalizedFileName), {}, normalizedFileName);
                 return {
                     options: configFile.options,
+                    typingOptions: configFile.typingOptions,
                     files: configFile.fileNames,
                     errors: realizeDiagnostics(configFile.errors, "\r\n")
                 };
@@ -47288,6 +50378,14 @@ var ts;
         CoreServicesShimObject.prototype.getDefaultCompilationSettings = function () {
             return this.forwardJSONCall("getDefaultCompilationSettings()", function () { return ts.getDefaultCompilerOptions(); });
         };
+        CoreServicesShimObject.prototype.discoverTypings = function (discoverTypingsJson) {
+            var _this = this;
+            var getCanonicalFileName = ts.createGetCanonicalFileName(false);
+            return this.forwardJSONCall("discoverTypings()", function () {
+                var info = JSON.parse(discoverTypingsJson);
+                return ts.JsTyping.discoverTypings(_this.host, info.fileNames, ts.toPath(info.projectRootPath, info.projectRootPath, getCanonicalFileName), ts.toPath(info.safeListPath, info.safeListPath, getCanonicalFileName), info.packageNameToTypingLocation, info.typingOptions, info.compilerOptions);
+            });
+        };
         return CoreServicesShimObject;
     }(ShimBase));
     var TypeScriptServicesFactory = (function () {
@@ -47360,4 +50458,4 @@ var TypeScript;
         Services.TypeScriptServicesFactory = ts.TypeScriptServicesFactory;
     })(Services = TypeScript.Services || (TypeScript.Services = {}));
 })(TypeScript || (TypeScript = {}));
-var toolsVersion = "1.8";
+var toolsVersion = "1.9";
diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts
index 412f4e793b0..e9917c7cc6b 100644
--- a/lib/typescript.d.ts
+++ b/lib/typescript.d.ts
@@ -160,169 +160,173 @@ declare namespace ts {
         IsKeyword = 124,
         ModuleKeyword = 125,
         NamespaceKeyword = 126,
-        RequireKeyword = 127,
-        NumberKeyword = 128,
-        SetKeyword = 129,
-        StringKeyword = 130,
-        SymbolKeyword = 131,
-        TypeKeyword = 132,
-        FromKeyword = 133,
-        GlobalKeyword = 134,
-        OfKeyword = 135,
-        QualifiedName = 136,
-        ComputedPropertyName = 137,
-        TypeParameter = 138,
-        Parameter = 139,
-        Decorator = 140,
-        PropertySignature = 141,
-        PropertyDeclaration = 142,
-        MethodSignature = 143,
-        MethodDeclaration = 144,
-        Constructor = 145,
-        GetAccessor = 146,
-        SetAccessor = 147,
-        CallSignature = 148,
-        ConstructSignature = 149,
-        IndexSignature = 150,
-        TypePredicate = 151,
-        TypeReference = 152,
-        FunctionType = 153,
-        ConstructorType = 154,
-        TypeQuery = 155,
-        TypeLiteral = 156,
-        ArrayType = 157,
-        TupleType = 158,
-        UnionType = 159,
-        IntersectionType = 160,
-        ParenthesizedType = 161,
-        ThisType = 162,
-        StringLiteralType = 163,
-        ObjectBindingPattern = 164,
-        ArrayBindingPattern = 165,
-        BindingElement = 166,
-        ArrayLiteralExpression = 167,
-        ObjectLiteralExpression = 168,
-        PropertyAccessExpression = 169,
-        ElementAccessExpression = 170,
-        CallExpression = 171,
-        NewExpression = 172,
-        TaggedTemplateExpression = 173,
-        TypeAssertionExpression = 174,
-        ParenthesizedExpression = 175,
-        FunctionExpression = 176,
-        ArrowFunction = 177,
-        DeleteExpression = 178,
-        TypeOfExpression = 179,
-        VoidExpression = 180,
-        AwaitExpression = 181,
-        PrefixUnaryExpression = 182,
-        PostfixUnaryExpression = 183,
-        BinaryExpression = 184,
-        ConditionalExpression = 185,
-        TemplateExpression = 186,
-        YieldExpression = 187,
-        SpreadElementExpression = 188,
-        ClassExpression = 189,
-        OmittedExpression = 190,
-        ExpressionWithTypeArguments = 191,
-        AsExpression = 192,
-        TemplateSpan = 193,
-        SemicolonClassElement = 194,
-        Block = 195,
-        VariableStatement = 196,
-        EmptyStatement = 197,
-        ExpressionStatement = 198,
-        IfStatement = 199,
-        DoStatement = 200,
-        WhileStatement = 201,
-        ForStatement = 202,
-        ForInStatement = 203,
-        ForOfStatement = 204,
-        ContinueStatement = 205,
-        BreakStatement = 206,
-        ReturnStatement = 207,
-        WithStatement = 208,
-        SwitchStatement = 209,
-        LabeledStatement = 210,
-        ThrowStatement = 211,
-        TryStatement = 212,
-        DebuggerStatement = 213,
-        VariableDeclaration = 214,
-        VariableDeclarationList = 215,
-        FunctionDeclaration = 216,
-        ClassDeclaration = 217,
-        InterfaceDeclaration = 218,
-        TypeAliasDeclaration = 219,
-        EnumDeclaration = 220,
-        ModuleDeclaration = 221,
-        ModuleBlock = 222,
-        CaseBlock = 223,
-        ImportEqualsDeclaration = 224,
-        ImportDeclaration = 225,
-        ImportClause = 226,
-        NamespaceImport = 227,
-        NamedImports = 228,
-        ImportSpecifier = 229,
-        ExportAssignment = 230,
-        ExportDeclaration = 231,
-        NamedExports = 232,
-        ExportSpecifier = 233,
-        MissingDeclaration = 234,
-        ExternalModuleReference = 235,
-        JsxElement = 236,
-        JsxSelfClosingElement = 237,
-        JsxOpeningElement = 238,
-        JsxText = 239,
-        JsxClosingElement = 240,
-        JsxAttribute = 241,
-        JsxSpreadAttribute = 242,
-        JsxExpression = 243,
-        CaseClause = 244,
-        DefaultClause = 245,
-        HeritageClause = 246,
-        CatchClause = 247,
-        PropertyAssignment = 248,
-        ShorthandPropertyAssignment = 249,
-        EnumMember = 250,
-        SourceFile = 251,
-        JSDocTypeExpression = 252,
-        JSDocAllType = 253,
-        JSDocUnknownType = 254,
-        JSDocArrayType = 255,
-        JSDocUnionType = 256,
-        JSDocTupleType = 257,
-        JSDocNullableType = 258,
-        JSDocNonNullableType = 259,
-        JSDocRecordType = 260,
-        JSDocRecordMember = 261,
-        JSDocTypeReference = 262,
-        JSDocOptionalType = 263,
-        JSDocFunctionType = 264,
-        JSDocVariadicType = 265,
-        JSDocConstructorType = 266,
-        JSDocThisType = 267,
-        JSDocComment = 268,
-        JSDocTag = 269,
-        JSDocParameterTag = 270,
-        JSDocReturnTag = 271,
-        JSDocTypeTag = 272,
-        JSDocTemplateTag = 273,
-        SyntaxList = 274,
-        Count = 275,
+        ReadonlyKeyword = 127,
+        RequireKeyword = 128,
+        NumberKeyword = 129,
+        SetKeyword = 130,
+        StringKeyword = 131,
+        SymbolKeyword = 132,
+        TypeKeyword = 133,
+        UndefinedKeyword = 134,
+        FromKeyword = 135,
+        GlobalKeyword = 136,
+        OfKeyword = 137,
+        QualifiedName = 138,
+        ComputedPropertyName = 139,
+        TypeParameter = 140,
+        Parameter = 141,
+        Decorator = 142,
+        PropertySignature = 143,
+        PropertyDeclaration = 144,
+        MethodSignature = 145,
+        MethodDeclaration = 146,
+        Constructor = 147,
+        GetAccessor = 148,
+        SetAccessor = 149,
+        CallSignature = 150,
+        ConstructSignature = 151,
+        IndexSignature = 152,
+        TypePredicate = 153,
+        TypeReference = 154,
+        FunctionType = 155,
+        ConstructorType = 156,
+        TypeQuery = 157,
+        TypeLiteral = 158,
+        ArrayType = 159,
+        TupleType = 160,
+        UnionType = 161,
+        IntersectionType = 162,
+        ParenthesizedType = 163,
+        ThisType = 164,
+        StringLiteralType = 165,
+        ObjectBindingPattern = 166,
+        ArrayBindingPattern = 167,
+        BindingElement = 168,
+        ArrayLiteralExpression = 169,
+        ObjectLiteralExpression = 170,
+        PropertyAccessExpression = 171,
+        ElementAccessExpression = 172,
+        CallExpression = 173,
+        NewExpression = 174,
+        TaggedTemplateExpression = 175,
+        TypeAssertionExpression = 176,
+        ParenthesizedExpression = 177,
+        FunctionExpression = 178,
+        ArrowFunction = 179,
+        DeleteExpression = 180,
+        TypeOfExpression = 181,
+        VoidExpression = 182,
+        AwaitExpression = 183,
+        PrefixUnaryExpression = 184,
+        PostfixUnaryExpression = 185,
+        BinaryExpression = 186,
+        ConditionalExpression = 187,
+        TemplateExpression = 188,
+        YieldExpression = 189,
+        SpreadElementExpression = 190,
+        ClassExpression = 191,
+        OmittedExpression = 192,
+        ExpressionWithTypeArguments = 193,
+        AsExpression = 194,
+        NonNullExpression = 195,
+        TemplateSpan = 196,
+        SemicolonClassElement = 197,
+        Block = 198,
+        VariableStatement = 199,
+        EmptyStatement = 200,
+        ExpressionStatement = 201,
+        IfStatement = 202,
+        DoStatement = 203,
+        WhileStatement = 204,
+        ForStatement = 205,
+        ForInStatement = 206,
+        ForOfStatement = 207,
+        ContinueStatement = 208,
+        BreakStatement = 209,
+        ReturnStatement = 210,
+        WithStatement = 211,
+        SwitchStatement = 212,
+        LabeledStatement = 213,
+        ThrowStatement = 214,
+        TryStatement = 215,
+        DebuggerStatement = 216,
+        VariableDeclaration = 217,
+        VariableDeclarationList = 218,
+        FunctionDeclaration = 219,
+        ClassDeclaration = 220,
+        InterfaceDeclaration = 221,
+        TypeAliasDeclaration = 222,
+        EnumDeclaration = 223,
+        ModuleDeclaration = 224,
+        ModuleBlock = 225,
+        CaseBlock = 226,
+        GlobalModuleExportDeclaration = 227,
+        ImportEqualsDeclaration = 228,
+        ImportDeclaration = 229,
+        ImportClause = 230,
+        NamespaceImport = 231,
+        NamedImports = 232,
+        ImportSpecifier = 233,
+        ExportAssignment = 234,
+        ExportDeclaration = 235,
+        NamedExports = 236,
+        ExportSpecifier = 237,
+        MissingDeclaration = 238,
+        ExternalModuleReference = 239,
+        JsxElement = 240,
+        JsxSelfClosingElement = 241,
+        JsxOpeningElement = 242,
+        JsxText = 243,
+        JsxClosingElement = 244,
+        JsxAttribute = 245,
+        JsxSpreadAttribute = 246,
+        JsxExpression = 247,
+        CaseClause = 248,
+        DefaultClause = 249,
+        HeritageClause = 250,
+        CatchClause = 251,
+        PropertyAssignment = 252,
+        ShorthandPropertyAssignment = 253,
+        EnumMember = 254,
+        SourceFile = 255,
+        JSDocTypeExpression = 256,
+        JSDocAllType = 257,
+        JSDocUnknownType = 258,
+        JSDocArrayType = 259,
+        JSDocUnionType = 260,
+        JSDocTupleType = 261,
+        JSDocNullableType = 262,
+        JSDocNonNullableType = 263,
+        JSDocRecordType = 264,
+        JSDocRecordMember = 265,
+        JSDocTypeReference = 266,
+        JSDocOptionalType = 267,
+        JSDocFunctionType = 268,
+        JSDocVariadicType = 269,
+        JSDocConstructorType = 270,
+        JSDocThisType = 271,
+        JSDocComment = 272,
+        JSDocTag = 273,
+        JSDocParameterTag = 274,
+        JSDocReturnTag = 275,
+        JSDocTypeTag = 276,
+        JSDocTemplateTag = 277,
+        SyntaxList = 278,
+        Count = 279,
         FirstAssignment = 56,
         LastAssignment = 68,
         FirstReservedWord = 70,
         LastReservedWord = 105,
         FirstKeyword = 70,
-        LastKeyword = 135,
+        LastKeyword = 137,
         FirstFutureReservedWord = 106,
         LastFutureReservedWord = 114,
-        FirstTypeNode = 151,
-        LastTypeNode = 163,
+        FirstTypeNode = 153,
+        LastTypeNode = 165,
         FirstPunctuation = 15,
         LastPunctuation = 68,
         FirstToken = 0,
-        LastToken = 135,
+        LastToken = 137,
         FirstTriviaToken = 2,
         LastTriviaToken = 7,
         FirstLiteralToken = 8,
@@ -331,40 +335,48 @@ declare namespace ts {
         LastTemplateToken = 14,
         FirstBinaryOperator = 25,
         LastBinaryOperator = 68,
-        FirstNode = 136,
+        FirstNode = 138,
     }
     enum NodeFlags {
         None = 0,
-        Export = 2,
-        Ambient = 4,
-        Public = 8,
-        Private = 16,
-        Protected = 32,
-        Static = 64,
+        Export = 1,
+        Ambient = 2,
+        Public = 4,
+        Private = 8,
+        Protected = 16,
+        Static = 32,
+        Readonly = 64,
         Abstract = 128,
         Async = 256,
         Default = 512,
-        MultiLine = 1024,
-        Synthetic = 2048,
-        DeclarationFile = 4096,
-        Let = 8192,
-        Const = 16384,
-        OctalLiteral = 32768,
-        Namespace = 65536,
-        ExportContext = 131072,
-        ContainsThis = 262144,
-        HasImplicitReturn = 524288,
-        HasExplicitReturn = 1048576,
-        GlobalAugmentation = 2097152,
-        HasClassExtends = 4194304,
-        HasDecorators = 8388608,
-        HasParamDecorators = 16777216,
-        HasAsyncFunctions = 33554432,
-        Modifier = 1022,
-        AccessibilityModifier = 56,
-        BlockScoped = 24576,
-        ReachabilityCheckFlags = 1572864,
-        EmitHelperFlags = 62914560,
+        Let = 1024,
+        Const = 2048,
+        Namespace = 4096,
+        ExportContext = 8192,
+        ContainsThis = 16384,
+        HasImplicitReturn = 32768,
+        HasExplicitReturn = 65536,
+        GlobalAugmentation = 131072,
+        HasClassExtends = 262144,
+        HasDecorators = 524288,
+        HasParamDecorators = 1048576,
+        HasAsyncFunctions = 2097152,
+        DisallowInContext = 4194304,
+        YieldContext = 8388608,
+        DecoratorContext = 16777216,
+        AwaitContext = 33554432,
+        ThisNodeHasError = 67108864,
+        JavaScriptFile = 134217728,
+        ThisNodeOrAnySubNodesHasError = 268435456,
+        HasAggregatedChildData = 536870912,
+        HasJsxSpreadAttribute = 1073741824,
+        Modifier = 959,
+        AccessibilityModifier = 28,
+        BlockScoped = 3072,
+        ReachabilityCheckFlags = 98304,
+        EmitHelperFlags = 3932160,
+        ContextFlags = 197132288,
+        TypeExcludesFlags = 41943040,
     }
     enum JsxFlags {
         None = 0,
@@ -372,10 +384,6 @@ declare namespace ts {
         IntrinsicNamedElement = 1,
         /** An element inferred from the string index signature of the JSX.IntrinsicElements interface */
         IntrinsicIndexedElement = 2,
-        /** An element backed by a class, class-like, or function value */
-        ValueElement = 4,
-        /** Element resolution failed */
-        UnknownElement = 16,
         IntrinsicElement = 3,
     }
     interface Node extends TextRange {
@@ -397,6 +405,9 @@ declare namespace ts {
         text: string;
         originalKeywordKind?: SyntaxKind;
     }
+    interface TransientIdentifier extends Identifier {
+        resolvedSymbol: Symbol;
+    }
     interface QualifiedName extends Node {
         left: EntityName;
         right: Identifier;
@@ -698,11 +709,12 @@ declare namespace ts {
         dotToken: Node;
         name: Identifier;
     }
+    type IdentifierOrPropertyAccess = Identifier | PropertyAccessExpression;
     interface ElementAccessExpression extends MemberExpression {
         expression: LeftHandSideExpression;
         argumentExpression?: Expression;
     }
-    interface CallExpression extends LeftHandSideExpression {
+    interface CallExpression extends LeftHandSideExpression, Declaration {
         expression: LeftHandSideExpression;
         typeArguments?: NodeArray<TypeNode>;
         arguments: NodeArray<Expression>;
@@ -727,6 +739,9 @@ declare namespace ts {
         expression: UnaryExpression;
     }
     type AssertionExpression = TypeAssertion | AsExpression;
+    interface NonNullExpression extends LeftHandSideExpression {
+        expression: Expression;
+    }
     interface JsxElement extends PrimaryExpression {
         openingElement: JsxOpeningElement;
         children: NodeArray<JsxChild>;
@@ -850,6 +865,7 @@ declare namespace ts {
         variableDeclaration: VariableDeclaration;
         block: Block;
     }
+    type DeclarationWithTypeParameters = SignatureDeclaration | ClassLikeDeclaration | InterfaceDeclaration | TypeAliasDeclaration;
     interface ClassLikeDeclaration extends Declaration {
         name?: Identifier;
         typeParameters?: NodeArray<TypeParameterDeclaration>;
@@ -919,6 +935,10 @@ declare namespace ts {
     interface NamespaceImport extends Declaration {
         name: Identifier;
     }
+    interface GlobalModuleExportDeclaration extends DeclarationStatement {
+        name: Identifier;
+        moduleReference: LiteralLikeNode;
+    }
     interface ExportDeclaration extends DeclarationStatement {
         exportClause?: NamedExports;
         moduleSpecifier?: Expression;
@@ -1000,6 +1020,7 @@ declare namespace ts {
     interface JSDocThisType extends JSDocType {
         type: JSDocType;
     }
+    type JSDocTypeReferencingNode = JSDocThisType | JSDocConstructorType | JSDocVariadicType | JSDocOptionalType | JSDocNullableType | JSDocNonNullableType;
     interface JSDocRecordMember extends PropertySignature {
         name: Identifier | LiteralExpression;
         type?: JSDocType;
@@ -1039,7 +1060,9 @@ declare namespace ts {
         amdDependencies: AmdDependency[];
         moduleName: string;
         referencedFiles: FileReference[];
+        typeReferenceDirectives: FileReference[];
         languageVariant: LanguageVariant;
+        isDeclarationFile: boolean;
         /**
          * lib.d.ts should have a reference comment like
          *
@@ -1060,7 +1083,7 @@ declare namespace ts {
         readDirectory(rootDir: string, extension: string, exclude: string[]): string[];
     }
     interface WriteFileCallback {
-        (fileName: string, data: string, writeByteOrderMark: boolean, onError?: (message: string) => void): void;
+        (fileName: string, data: string, writeByteOrderMark: boolean, onError?: (message: string) => void, sourceFiles?: SourceFile[]): void;
     }
     class OperationCanceledException {
     }
@@ -1133,7 +1156,9 @@ declare namespace ts {
     }
     interface EmitResult {
         emitSkipped: boolean;
+        /** Contains declaration emit diagnostics */
         diagnostics: Diagnostic[];
+        emittedFiles: string[];
     }
     interface TypeChecker {
         getTypeOfSymbolAtLocation(symbol: Symbol, node: Node): Type;
@@ -1177,8 +1202,9 @@ declare namespace ts {
         buildSignatureDisplay(signatures: Signature, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags, kind?: SignatureKind): void;
         buildParameterDisplay(parameter: Symbol, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
         buildTypeParameterDisplay(tp: TypeParameter, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
-        buildTypeParameterDisplayFromSymbol(symbol: Symbol, writer: SymbolWriter, enclosingDeclaraiton?: Node, flags?: TypeFormatFlags): void;
-        buildDisplayForParametersAndDelimiters(parameters: Symbol[], writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
+        buildTypePredicateDisplay(predicate: TypePredicate, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
+        buildTypeParameterDisplayFromSymbol(symbol: Symbol, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
+        buildDisplayForParametersAndDelimiters(thisType: Type, parameters: Symbol[], writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
         buildDisplayForTypeParametersAndDelimiters(typeParameters: TypeParameter[], writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
         buildReturnTypeDisplay(signature: Signature, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
     }
@@ -1217,17 +1243,18 @@ declare namespace ts {
         This = 0,
         Identifier = 1,
     }
-    interface TypePredicate {
+    interface TypePredicateBase {
         kind: TypePredicateKind;
         type: Type;
     }
-    interface ThisTypePredicate extends TypePredicate {
+    interface ThisTypePredicate extends TypePredicateBase {
         _thisTypePredicateBrand: any;
     }
-    interface IdentifierTypePredicate extends TypePredicate {
+    interface IdentifierTypePredicate extends TypePredicateBase {
         parameterName: string;
         parameterIndex: number;
     }
+    type TypePredicate = IdentifierTypePredicate | ThisTypePredicate;
     enum SymbolFlags {
         None = 0,
         FunctionScopedVariable = 1,
@@ -1301,6 +1328,7 @@ declare namespace ts {
         valueDeclaration?: Declaration;
         members?: SymbolTable;
         exports?: SymbolTable;
+        globalExports?: SymbolTable;
     }
     interface SymbolTable {
         [index: string]: Symbol;
@@ -1328,7 +1356,6 @@ declare namespace ts {
         ESSymbol = 16777216,
         ThisType = 33554432,
         ObjectLiteralPatternWithComputedProperties = 67108864,
-        PredicateType = 134217728,
         StringLike = 258,
         NumberLike = 132,
         ObjectType = 80896,
@@ -1341,9 +1368,6 @@ declare namespace ts {
         symbol?: Symbol;
         pattern?: DestructuringPattern;
     }
-    interface PredicateType extends Type {
-        predicate: ThisTypePredicate | IdentifierTypePredicate;
-    }
     interface StringLiteralType extends Type {
         text: string;
     }
@@ -1359,8 +1383,8 @@ declare namespace ts {
         declaredProperties: Symbol[];
         declaredCallSignatures: Signature[];
         declaredConstructSignatures: Signature[];
-        declaredStringIndexType: Type;
-        declaredNumberIndexType: Type;
+        declaredStringIndexInfo: IndexInfo;
+        declaredNumberIndexInfo: IndexInfo;
     }
     interface TypeReference extends ObjectType {
         target: GenericType;
@@ -1389,11 +1413,17 @@ declare namespace ts {
         declaration: SignatureDeclaration;
         typeParameters: TypeParameter[];
         parameters: Symbol[];
+        thisType?: Type;
     }
     enum IndexKind {
         String = 0,
         Number = 1,
     }
+    interface IndexInfo {
+        type: Type;
+        isReadonly: boolean;
+        declaration?: SignatureDeclaration;
+    }
     interface DiagnosticMessage {
         key: string;
         category: DiagnosticCategory;
@@ -1429,10 +1459,15 @@ declare namespace ts {
         Classic = 1,
         NodeJs = 2,
     }
+    type RootPaths = string[];
+    type PathSubstitutions = Map<string[]>;
+    type TsConfigOnlyOptions = RootPaths | PathSubstitutions;
+    type CompilerOptionsValue = string | number | boolean | (string | number)[] | TsConfigOnlyOptions;
     interface CompilerOptions {
         allowNonTsExtensions?: boolean;
         charset?: string;
         declaration?: boolean;
+        declarationDir?: string;
         diagnostics?: boolean;
         emitBOM?: boolean;
         help?: boolean;
@@ -1442,6 +1477,7 @@ declare namespace ts {
         jsx?: JsxEmit;
         reactNamespace?: string;
         listFiles?: boolean;
+        typesSearchPaths?: string[];
         locale?: string;
         mapRoot?: string;
         module?: ModuleKind;
@@ -1451,6 +1487,7 @@ declare namespace ts {
         noEmitOnError?: boolean;
         noErrorTruncation?: boolean;
         noImplicitAny?: boolean;
+        noImplicitThis?: boolean;
         noLib?: boolean;
         noResolve?: boolean;
         out?: string;
@@ -1476,9 +1513,33 @@ declare namespace ts {
         noImplicitReturns?: boolean;
         noFallthroughCasesInSwitch?: boolean;
         forceConsistentCasingInFileNames?: boolean;
+        baseUrl?: string;
+        paths?: PathSubstitutions;
+        rootDirs?: RootPaths;
+        traceResolution?: boolean;
         allowSyntheticDefaultImports?: boolean;
         allowJs?: boolean;
-        [option: string]: string | number | boolean;
+        noImplicitUseStrict?: boolean;
+        strictNullChecks?: boolean;
+        listEmittedFiles?: boolean;
+        lib?: string[];
+        types?: string[];
+        list?: string[];
+        [option: string]: CompilerOptionsValue;
+    }
+    interface TypingOptions {
+        enableAutoDiscovery?: boolean;
+        include?: string[];
+        exclude?: string[];
+        [option: string]: string[] | boolean;
+    }
+    interface DiscoverTypingsInfo {
+        fileNames: string[];
+        projectRootPath: string;
+        safeListPath: string;
+        packageNameToTypingLocation: Map<string>;
+        typingOptions: TypingOptions;
+        compilerOptions: CompilerOptions;
     }
     enum ModuleKind {
         None = 0,
@@ -1502,6 +1563,13 @@ declare namespace ts {
         line: number;
         character: number;
     }
+    enum ScriptKind {
+        Unknown = 0,
+        JS = 1,
+        JSX = 2,
+        TS = 3,
+        TSX = 4,
+    }
     enum ScriptTarget {
         ES3 = 0,
         ES5 = 1,
@@ -1515,12 +1583,14 @@ declare namespace ts {
     }
     interface ParsedCommandLine {
         options: CompilerOptions;
+        typingOptions?: TypingOptions;
         fileNames: string[];
         errors: Diagnostic[];
     }
     interface ModuleResolutionHost {
         fileExists(fileName: string): boolean;
         readFile(fileName: string): string;
+        trace?(s: string): void;
         directoryExists?(directoryName: string): boolean;
     }
     interface ResolvedModule {
@@ -1531,16 +1601,29 @@ declare namespace ts {
         resolvedModule: ResolvedModule;
         failedLookupLocations: string[];
     }
+    interface ResolvedTypeReferenceDirective {
+        primary: boolean;
+        resolvedFileName?: string;
+    }
+    interface ResolvedTypeReferenceDirectiveWithFailedLookupLocations {
+        resolvedTypeReferenceDirective: ResolvedTypeReferenceDirective;
+        failedLookupLocations: string[];
+    }
     interface CompilerHost extends ModuleResolutionHost {
         getSourceFile(fileName: string, languageVersion: ScriptTarget, onError?: (message: string) => void): SourceFile;
         getCancellationToken?(): CancellationToken;
         getDefaultLibFileName(options: CompilerOptions): string;
+        getDefaultLibLocation?(): string;
         writeFile: WriteFileCallback;
         getCurrentDirectory(): string;
         getCanonicalFileName(fileName: string): string;
         useCaseSensitiveFileNames(): boolean;
         getNewLine(): string;
         resolveModuleNames?(moduleNames: string[], containingFile: string): ResolvedModule[];
+        /**
+         * 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[];
     }
     interface TextSpan {
         start: number;
@@ -1552,8 +1635,8 @@ declare namespace ts {
     }
 }
 declare namespace ts {
-    type FileWatcherCallback = (path: string, removed?: boolean) => void;
-    type DirectoryWatcherCallback = (path: string) => void;
+    type FileWatcherCallback = (fileName: string, removed?: boolean) => void;
+    type DirectoryWatcherCallback = (directoryName: string) => void;
     interface System {
         args: string[];
         newLine: string;
@@ -1561,7 +1644,7 @@ declare namespace ts {
         write(s: string): void;
         readFile(path: string, encoding?: string): string;
         writeFile(path: string, data: string, writeByteOrderMark?: boolean): void;
-        watchFile?(path: Path, callback: FileWatcherCallback): FileWatcher;
+        watchFile?(path: string, callback: FileWatcherCallback): FileWatcher;
         watchDirectory?(path: string, callback: DirectoryWatcherCallback, recursive?: boolean): FileWatcher;
         resolvePath(path: string): string;
         fileExists(path: string): boolean;
@@ -1570,6 +1653,8 @@ declare namespace ts {
         getExecutingFilePath(): string;
         getCurrentDirectory(): string;
         readDirectory(path: string, extension?: string, exclude?: string[]): string[];
+        getModifiedTime?(path: string): Date;
+        createHash?(data: string): string;
         getMemoryUsage?(): number;
         exit(exitCode?: number): void;
     }
@@ -1577,7 +1662,7 @@ declare namespace ts {
         close(): void;
     }
     interface DirectoryWatcher extends FileWatcher {
-        directoryPath: Path;
+        directoryName: string;
         referenceCount: number;
     }
     var sys: System;
@@ -1604,6 +1689,7 @@ declare namespace ts {
         scanJsxIdentifier(): SyntaxKind;
         reScanJsxToken(): SyntaxKind;
         scanJsxToken(): SyntaxKind;
+        scanJSDocToken(): SyntaxKind;
         scan(): SyntaxKind;
         setText(text: string, start?: number, length?: number): void;
         setOnError(onError: ErrorCallback): void;
@@ -1611,6 +1697,7 @@ declare namespace ts {
         setLanguageVariant(variant: LanguageVariant): void;
         setTextPos(textPos: number): void;
         lookAhead<T>(callback: () => T): T;
+        scanRange<T>(start: number, length: number, callback: () => T): T;
         tryScan<T>(callback: () => T): T;
     }
     function tokenToString(t: SyntaxKind): string;
@@ -1657,17 +1744,26 @@ 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;
     function forEachChild<T>(node: Node, cbNode: (node: Node) => T, cbNodeArray?: (nodes: Node[]) => T): T;
-    function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes?: boolean): SourceFile;
+    function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes?: boolean, scriptKind?: ScriptKind): SourceFile;
+    function isExternalModule(file: SourceFile): boolean;
     function updateSourceFile(sourceFile: SourceFile, newText: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
 }
 declare namespace ts {
     const version: string;
     function findConfigFile(searchPath: string, fileExists: (fileName: string) => boolean): string;
     function resolveTripleslashReference(moduleName: string, containingFile: string): string;
+    /**
+     * @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
+     * is assumed to be the same as root directory of the project.
+     */
+    function resolveTypeReferenceDirective(typeReferenceDirectiveName: string, containingFile: string, options: CompilerOptions, host: ModuleResolutionHost): ResolvedTypeReferenceDirectiveWithFailedLookupLocations;
     function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations;
     function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations;
     function classicNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations;
@@ -1677,7 +1773,6 @@ declare namespace ts {
     function createProgram(rootNames: string[], options: CompilerOptions, host?: CompilerHost, oldProgram?: Program): Program;
 }
 declare namespace ts {
-    function parseCommandLine(commandLine: string[], readFile?: (path: string) => string): ParsedCommandLine;
     /**
       * Read tsconfig.json file
       * @param fileName The path to the config file
@@ -1702,8 +1797,12 @@ declare namespace ts {
       * @param basePath A root directory to resolve relative path entries in the config
       *    file to. e.g. outDir
       */
-    function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions): ParsedCommandLine;
-    function convertCompilerOptionsFromJson(jsonOptions: any, basePath: string): {
+    function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string): ParsedCommandLine;
+    function convertCompilerOptionsFromJson(jsonOptions: any, basePath: string, configFileName?: string): {
+        options: CompilerOptions;
+        errors: Diagnostic[];
+    };
+    function convertTypingOptionsFromJson(jsonOptions: any, basePath: string, configFileName?: string): {
         options: CompilerOptions;
         errors: Diagnostic[];
     };
@@ -1784,6 +1883,7 @@ declare namespace ts {
     }
     interface PreProcessedFileInfo {
         referencedFiles: FileReference[];
+        typeReferenceDirectives: FileReference[];
         importedFiles: FileReference[];
         ambientExternalModules: string[];
         isLibFile: boolean;
@@ -1796,6 +1896,7 @@ declare namespace ts {
         getNewLine?(): string;
         getProjectVersion?(): string;
         getScriptFileNames(): string[];
+        getScriptKind?(fileName: string): ScriptKind;
         getScriptVersion(fileName: string): string;
         getScriptSnapshot(fileName: string): IScriptSnapshot;
         getLocalizedDiagnosticMessages?(): any;
@@ -1807,6 +1908,7 @@ declare namespace ts {
         error?(s: string): void;
         useCaseSensitiveFileNames?(): boolean;
         resolveModuleNames?(moduleNames: string[], containingFile: string): ResolvedModule[];
+        resolveTypeReferenceDirectives?(typeDirectiveNames: string[], containingFile: string): ResolvedTypeReferenceDirective[];
         directoryExists?(directoryName: string): boolean;
     }
     interface LanguageService {
@@ -1851,7 +1953,6 @@ declare namespace ts {
         getDocCommentTemplateAtPosition(fileName: string, position: number): TextInsertion;
         getEmitOutput(fileName: string): EmitOutput;
         getProgram(): Program;
-        getSourceFile(fileName: string): SourceFile;
         dispose(): void;
     }
     interface Classifications {
@@ -2164,7 +2265,7 @@ declare namespace ts {
           * @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): SourceFile;
+        acquireDocument(fileName: string, compilationSettings: CompilerOptions, 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
@@ -2177,7 +2278,7 @@ declare namespace ts {
           * @param scriptSnapshot Text of the file.
           * @param version Current version of the file.
           */
-        updateDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string): SourceFile;
+        updateDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string, scriptKind?: ScriptKind): SourceFile;
         /**
           * Informs the DocumentRegistry that a file is not needed any longer.
           *
@@ -2301,7 +2402,7 @@ declare namespace ts {
     }
     function transpileModule(input: string, transpileOptions: TranspileOptions): TranspileOutput;
     function transpile(input: string, compilerOptions?: CompilerOptions, fileName?: string, diagnostics?: Diagnostic[], moduleName?: string): string;
-    function createLanguageServiceSourceFile(fileName: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, setNodeParents: boolean): SourceFile;
+    function createLanguageServiceSourceFile(fileName: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, setNodeParents: boolean, scriptKind?: ScriptKind): SourceFile;
     let disableIncrementalParsing: boolean;
     function updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
     function createDocumentRegistry(useCaseSensitiveFileNames?: boolean, currentDirectory?: string): DocumentRegistry;
diff --git a/lib/typescript.js b/lib/typescript.js
index bbe9a4b07e3..f8b128defd8 100644
--- a/lib/typescript.js
+++ b/lib/typescript.js
@@ -13,6 +13,11 @@ See the Apache Version 2.0 License for specific language governing permissions
 and limitations under the License.
 ***************************************************************************** */
 
+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 ts;
 (function (ts) {
     // token > SyntaxKind.Identifer => token is a keyword
@@ -156,190 +161,194 @@ var ts;
         SyntaxKind[SyntaxKind["IsKeyword"] = 124] = "IsKeyword";
         SyntaxKind[SyntaxKind["ModuleKeyword"] = 125] = "ModuleKeyword";
         SyntaxKind[SyntaxKind["NamespaceKeyword"] = 126] = "NamespaceKeyword";
-        SyntaxKind[SyntaxKind["RequireKeyword"] = 127] = "RequireKeyword";
-        SyntaxKind[SyntaxKind["NumberKeyword"] = 128] = "NumberKeyword";
-        SyntaxKind[SyntaxKind["SetKeyword"] = 129] = "SetKeyword";
-        SyntaxKind[SyntaxKind["StringKeyword"] = 130] = "StringKeyword";
-        SyntaxKind[SyntaxKind["SymbolKeyword"] = 131] = "SymbolKeyword";
-        SyntaxKind[SyntaxKind["TypeKeyword"] = 132] = "TypeKeyword";
-        SyntaxKind[SyntaxKind["FromKeyword"] = 133] = "FromKeyword";
-        SyntaxKind[SyntaxKind["GlobalKeyword"] = 134] = "GlobalKeyword";
-        SyntaxKind[SyntaxKind["OfKeyword"] = 135] = "OfKeyword";
+        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 127] = "ReadonlyKeyword";
+        SyntaxKind[SyntaxKind["RequireKeyword"] = 128] = "RequireKeyword";
+        SyntaxKind[SyntaxKind["NumberKeyword"] = 129] = "NumberKeyword";
+        SyntaxKind[SyntaxKind["SetKeyword"] = 130] = "SetKeyword";
+        SyntaxKind[SyntaxKind["StringKeyword"] = 131] = "StringKeyword";
+        SyntaxKind[SyntaxKind["SymbolKeyword"] = 132] = "SymbolKeyword";
+        SyntaxKind[SyntaxKind["TypeKeyword"] = 133] = "TypeKeyword";
+        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 134] = "UndefinedKeyword";
+        SyntaxKind[SyntaxKind["FromKeyword"] = 135] = "FromKeyword";
+        SyntaxKind[SyntaxKind["GlobalKeyword"] = 136] = "GlobalKeyword";
+        SyntaxKind[SyntaxKind["OfKeyword"] = 137] = "OfKeyword";
         // Parse tree nodes
         // Names
-        SyntaxKind[SyntaxKind["QualifiedName"] = 136] = "QualifiedName";
-        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 137] = "ComputedPropertyName";
+        SyntaxKind[SyntaxKind["QualifiedName"] = 138] = "QualifiedName";
+        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 139] = "ComputedPropertyName";
         // Signature elements
-        SyntaxKind[SyntaxKind["TypeParameter"] = 138] = "TypeParameter";
-        SyntaxKind[SyntaxKind["Parameter"] = 139] = "Parameter";
-        SyntaxKind[SyntaxKind["Decorator"] = 140] = "Decorator";
+        SyntaxKind[SyntaxKind["TypeParameter"] = 140] = "TypeParameter";
+        SyntaxKind[SyntaxKind["Parameter"] = 141] = "Parameter";
+        SyntaxKind[SyntaxKind["Decorator"] = 142] = "Decorator";
         // TypeMember
-        SyntaxKind[SyntaxKind["PropertySignature"] = 141] = "PropertySignature";
-        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 142] = "PropertyDeclaration";
-        SyntaxKind[SyntaxKind["MethodSignature"] = 143] = "MethodSignature";
-        SyntaxKind[SyntaxKind["MethodDeclaration"] = 144] = "MethodDeclaration";
-        SyntaxKind[SyntaxKind["Constructor"] = 145] = "Constructor";
-        SyntaxKind[SyntaxKind["GetAccessor"] = 146] = "GetAccessor";
-        SyntaxKind[SyntaxKind["SetAccessor"] = 147] = "SetAccessor";
-        SyntaxKind[SyntaxKind["CallSignature"] = 148] = "CallSignature";
-        SyntaxKind[SyntaxKind["ConstructSignature"] = 149] = "ConstructSignature";
-        SyntaxKind[SyntaxKind["IndexSignature"] = 150] = "IndexSignature";
+        SyntaxKind[SyntaxKind["PropertySignature"] = 143] = "PropertySignature";
+        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 144] = "PropertyDeclaration";
+        SyntaxKind[SyntaxKind["MethodSignature"] = 145] = "MethodSignature";
+        SyntaxKind[SyntaxKind["MethodDeclaration"] = 146] = "MethodDeclaration";
+        SyntaxKind[SyntaxKind["Constructor"] = 147] = "Constructor";
+        SyntaxKind[SyntaxKind["GetAccessor"] = 148] = "GetAccessor";
+        SyntaxKind[SyntaxKind["SetAccessor"] = 149] = "SetAccessor";
+        SyntaxKind[SyntaxKind["CallSignature"] = 150] = "CallSignature";
+        SyntaxKind[SyntaxKind["ConstructSignature"] = 151] = "ConstructSignature";
+        SyntaxKind[SyntaxKind["IndexSignature"] = 152] = "IndexSignature";
         // Type
-        SyntaxKind[SyntaxKind["TypePredicate"] = 151] = "TypePredicate";
-        SyntaxKind[SyntaxKind["TypeReference"] = 152] = "TypeReference";
-        SyntaxKind[SyntaxKind["FunctionType"] = 153] = "FunctionType";
-        SyntaxKind[SyntaxKind["ConstructorType"] = 154] = "ConstructorType";
-        SyntaxKind[SyntaxKind["TypeQuery"] = 155] = "TypeQuery";
-        SyntaxKind[SyntaxKind["TypeLiteral"] = 156] = "TypeLiteral";
-        SyntaxKind[SyntaxKind["ArrayType"] = 157] = "ArrayType";
-        SyntaxKind[SyntaxKind["TupleType"] = 158] = "TupleType";
-        SyntaxKind[SyntaxKind["UnionType"] = 159] = "UnionType";
-        SyntaxKind[SyntaxKind["IntersectionType"] = 160] = "IntersectionType";
-        SyntaxKind[SyntaxKind["ParenthesizedType"] = 161] = "ParenthesizedType";
-        SyntaxKind[SyntaxKind["ThisType"] = 162] = "ThisType";
-        SyntaxKind[SyntaxKind["StringLiteralType"] = 163] = "StringLiteralType";
+        SyntaxKind[SyntaxKind["TypePredicate"] = 153] = "TypePredicate";
+        SyntaxKind[SyntaxKind["TypeReference"] = 154] = "TypeReference";
+        SyntaxKind[SyntaxKind["FunctionType"] = 155] = "FunctionType";
+        SyntaxKind[SyntaxKind["ConstructorType"] = 156] = "ConstructorType";
+        SyntaxKind[SyntaxKind["TypeQuery"] = 157] = "TypeQuery";
+        SyntaxKind[SyntaxKind["TypeLiteral"] = 158] = "TypeLiteral";
+        SyntaxKind[SyntaxKind["ArrayType"] = 159] = "ArrayType";
+        SyntaxKind[SyntaxKind["TupleType"] = 160] = "TupleType";
+        SyntaxKind[SyntaxKind["UnionType"] = 161] = "UnionType";
+        SyntaxKind[SyntaxKind["IntersectionType"] = 162] = "IntersectionType";
+        SyntaxKind[SyntaxKind["ParenthesizedType"] = 163] = "ParenthesizedType";
+        SyntaxKind[SyntaxKind["ThisType"] = 164] = "ThisType";
+        SyntaxKind[SyntaxKind["StringLiteralType"] = 165] = "StringLiteralType";
         // Binding patterns
-        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 164] = "ObjectBindingPattern";
-        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 165] = "ArrayBindingPattern";
-        SyntaxKind[SyntaxKind["BindingElement"] = 166] = "BindingElement";
+        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 166] = "ObjectBindingPattern";
+        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 167] = "ArrayBindingPattern";
+        SyntaxKind[SyntaxKind["BindingElement"] = 168] = "BindingElement";
         // Expression
-        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 167] = "ArrayLiteralExpression";
-        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 168] = "ObjectLiteralExpression";
-        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 169] = "PropertyAccessExpression";
-        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 170] = "ElementAccessExpression";
-        SyntaxKind[SyntaxKind["CallExpression"] = 171] = "CallExpression";
-        SyntaxKind[SyntaxKind["NewExpression"] = 172] = "NewExpression";
-        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 173] = "TaggedTemplateExpression";
-        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 174] = "TypeAssertionExpression";
-        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 175] = "ParenthesizedExpression";
-        SyntaxKind[SyntaxKind["FunctionExpression"] = 176] = "FunctionExpression";
-        SyntaxKind[SyntaxKind["ArrowFunction"] = 177] = "ArrowFunction";
-        SyntaxKind[SyntaxKind["DeleteExpression"] = 178] = "DeleteExpression";
-        SyntaxKind[SyntaxKind["TypeOfExpression"] = 179] = "TypeOfExpression";
-        SyntaxKind[SyntaxKind["VoidExpression"] = 180] = "VoidExpression";
-        SyntaxKind[SyntaxKind["AwaitExpression"] = 181] = "AwaitExpression";
-        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 182] = "PrefixUnaryExpression";
-        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 183] = "PostfixUnaryExpression";
-        SyntaxKind[SyntaxKind["BinaryExpression"] = 184] = "BinaryExpression";
-        SyntaxKind[SyntaxKind["ConditionalExpression"] = 185] = "ConditionalExpression";
-        SyntaxKind[SyntaxKind["TemplateExpression"] = 186] = "TemplateExpression";
-        SyntaxKind[SyntaxKind["YieldExpression"] = 187] = "YieldExpression";
-        SyntaxKind[SyntaxKind["SpreadElementExpression"] = 188] = "SpreadElementExpression";
-        SyntaxKind[SyntaxKind["ClassExpression"] = 189] = "ClassExpression";
-        SyntaxKind[SyntaxKind["OmittedExpression"] = 190] = "OmittedExpression";
-        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 191] = "ExpressionWithTypeArguments";
-        SyntaxKind[SyntaxKind["AsExpression"] = 192] = "AsExpression";
+        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 169] = "ArrayLiteralExpression";
+        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 170] = "ObjectLiteralExpression";
+        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 171] = "PropertyAccessExpression";
+        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 172] = "ElementAccessExpression";
+        SyntaxKind[SyntaxKind["CallExpression"] = 173] = "CallExpression";
+        SyntaxKind[SyntaxKind["NewExpression"] = 174] = "NewExpression";
+        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 175] = "TaggedTemplateExpression";
+        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 176] = "TypeAssertionExpression";
+        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 177] = "ParenthesizedExpression";
+        SyntaxKind[SyntaxKind["FunctionExpression"] = 178] = "FunctionExpression";
+        SyntaxKind[SyntaxKind["ArrowFunction"] = 179] = "ArrowFunction";
+        SyntaxKind[SyntaxKind["DeleteExpression"] = 180] = "DeleteExpression";
+        SyntaxKind[SyntaxKind["TypeOfExpression"] = 181] = "TypeOfExpression";
+        SyntaxKind[SyntaxKind["VoidExpression"] = 182] = "VoidExpression";
+        SyntaxKind[SyntaxKind["AwaitExpression"] = 183] = "AwaitExpression";
+        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 184] = "PrefixUnaryExpression";
+        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 185] = "PostfixUnaryExpression";
+        SyntaxKind[SyntaxKind["BinaryExpression"] = 186] = "BinaryExpression";
+        SyntaxKind[SyntaxKind["ConditionalExpression"] = 187] = "ConditionalExpression";
+        SyntaxKind[SyntaxKind["TemplateExpression"] = 188] = "TemplateExpression";
+        SyntaxKind[SyntaxKind["YieldExpression"] = 189] = "YieldExpression";
+        SyntaxKind[SyntaxKind["SpreadElementExpression"] = 190] = "SpreadElementExpression";
+        SyntaxKind[SyntaxKind["ClassExpression"] = 191] = "ClassExpression";
+        SyntaxKind[SyntaxKind["OmittedExpression"] = 192] = "OmittedExpression";
+        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 193] = "ExpressionWithTypeArguments";
+        SyntaxKind[SyntaxKind["AsExpression"] = 194] = "AsExpression";
+        SyntaxKind[SyntaxKind["NonNullExpression"] = 195] = "NonNullExpression";
         // Misc
-        SyntaxKind[SyntaxKind["TemplateSpan"] = 193] = "TemplateSpan";
-        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 194] = "SemicolonClassElement";
+        SyntaxKind[SyntaxKind["TemplateSpan"] = 196] = "TemplateSpan";
+        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 197] = "SemicolonClassElement";
         // Element
-        SyntaxKind[SyntaxKind["Block"] = 195] = "Block";
-        SyntaxKind[SyntaxKind["VariableStatement"] = 196] = "VariableStatement";
-        SyntaxKind[SyntaxKind["EmptyStatement"] = 197] = "EmptyStatement";
-        SyntaxKind[SyntaxKind["ExpressionStatement"] = 198] = "ExpressionStatement";
-        SyntaxKind[SyntaxKind["IfStatement"] = 199] = "IfStatement";
-        SyntaxKind[SyntaxKind["DoStatement"] = 200] = "DoStatement";
-        SyntaxKind[SyntaxKind["WhileStatement"] = 201] = "WhileStatement";
-        SyntaxKind[SyntaxKind["ForStatement"] = 202] = "ForStatement";
-        SyntaxKind[SyntaxKind["ForInStatement"] = 203] = "ForInStatement";
-        SyntaxKind[SyntaxKind["ForOfStatement"] = 204] = "ForOfStatement";
-        SyntaxKind[SyntaxKind["ContinueStatement"] = 205] = "ContinueStatement";
-        SyntaxKind[SyntaxKind["BreakStatement"] = 206] = "BreakStatement";
-        SyntaxKind[SyntaxKind["ReturnStatement"] = 207] = "ReturnStatement";
-        SyntaxKind[SyntaxKind["WithStatement"] = 208] = "WithStatement";
-        SyntaxKind[SyntaxKind["SwitchStatement"] = 209] = "SwitchStatement";
-        SyntaxKind[SyntaxKind["LabeledStatement"] = 210] = "LabeledStatement";
-        SyntaxKind[SyntaxKind["ThrowStatement"] = 211] = "ThrowStatement";
-        SyntaxKind[SyntaxKind["TryStatement"] = 212] = "TryStatement";
-        SyntaxKind[SyntaxKind["DebuggerStatement"] = 213] = "DebuggerStatement";
-        SyntaxKind[SyntaxKind["VariableDeclaration"] = 214] = "VariableDeclaration";
-        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 215] = "VariableDeclarationList";
-        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 216] = "FunctionDeclaration";
-        SyntaxKind[SyntaxKind["ClassDeclaration"] = 217] = "ClassDeclaration";
-        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 218] = "InterfaceDeclaration";
-        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 219] = "TypeAliasDeclaration";
-        SyntaxKind[SyntaxKind["EnumDeclaration"] = 220] = "EnumDeclaration";
-        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 221] = "ModuleDeclaration";
-        SyntaxKind[SyntaxKind["ModuleBlock"] = 222] = "ModuleBlock";
-        SyntaxKind[SyntaxKind["CaseBlock"] = 223] = "CaseBlock";
-        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 224] = "ImportEqualsDeclaration";
-        SyntaxKind[SyntaxKind["ImportDeclaration"] = 225] = "ImportDeclaration";
-        SyntaxKind[SyntaxKind["ImportClause"] = 226] = "ImportClause";
-        SyntaxKind[SyntaxKind["NamespaceImport"] = 227] = "NamespaceImport";
-        SyntaxKind[SyntaxKind["NamedImports"] = 228] = "NamedImports";
-        SyntaxKind[SyntaxKind["ImportSpecifier"] = 229] = "ImportSpecifier";
-        SyntaxKind[SyntaxKind["ExportAssignment"] = 230] = "ExportAssignment";
-        SyntaxKind[SyntaxKind["ExportDeclaration"] = 231] = "ExportDeclaration";
-        SyntaxKind[SyntaxKind["NamedExports"] = 232] = "NamedExports";
-        SyntaxKind[SyntaxKind["ExportSpecifier"] = 233] = "ExportSpecifier";
-        SyntaxKind[SyntaxKind["MissingDeclaration"] = 234] = "MissingDeclaration";
+        SyntaxKind[SyntaxKind["Block"] = 198] = "Block";
+        SyntaxKind[SyntaxKind["VariableStatement"] = 199] = "VariableStatement";
+        SyntaxKind[SyntaxKind["EmptyStatement"] = 200] = "EmptyStatement";
+        SyntaxKind[SyntaxKind["ExpressionStatement"] = 201] = "ExpressionStatement";
+        SyntaxKind[SyntaxKind["IfStatement"] = 202] = "IfStatement";
+        SyntaxKind[SyntaxKind["DoStatement"] = 203] = "DoStatement";
+        SyntaxKind[SyntaxKind["WhileStatement"] = 204] = "WhileStatement";
+        SyntaxKind[SyntaxKind["ForStatement"] = 205] = "ForStatement";
+        SyntaxKind[SyntaxKind["ForInStatement"] = 206] = "ForInStatement";
+        SyntaxKind[SyntaxKind["ForOfStatement"] = 207] = "ForOfStatement";
+        SyntaxKind[SyntaxKind["ContinueStatement"] = 208] = "ContinueStatement";
+        SyntaxKind[SyntaxKind["BreakStatement"] = 209] = "BreakStatement";
+        SyntaxKind[SyntaxKind["ReturnStatement"] = 210] = "ReturnStatement";
+        SyntaxKind[SyntaxKind["WithStatement"] = 211] = "WithStatement";
+        SyntaxKind[SyntaxKind["SwitchStatement"] = 212] = "SwitchStatement";
+        SyntaxKind[SyntaxKind["LabeledStatement"] = 213] = "LabeledStatement";
+        SyntaxKind[SyntaxKind["ThrowStatement"] = 214] = "ThrowStatement";
+        SyntaxKind[SyntaxKind["TryStatement"] = 215] = "TryStatement";
+        SyntaxKind[SyntaxKind["DebuggerStatement"] = 216] = "DebuggerStatement";
+        SyntaxKind[SyntaxKind["VariableDeclaration"] = 217] = "VariableDeclaration";
+        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 218] = "VariableDeclarationList";
+        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 219] = "FunctionDeclaration";
+        SyntaxKind[SyntaxKind["ClassDeclaration"] = 220] = "ClassDeclaration";
+        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 221] = "InterfaceDeclaration";
+        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 222] = "TypeAliasDeclaration";
+        SyntaxKind[SyntaxKind["EnumDeclaration"] = 223] = "EnumDeclaration";
+        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 224] = "ModuleDeclaration";
+        SyntaxKind[SyntaxKind["ModuleBlock"] = 225] = "ModuleBlock";
+        SyntaxKind[SyntaxKind["CaseBlock"] = 226] = "CaseBlock";
+        SyntaxKind[SyntaxKind["GlobalModuleExportDeclaration"] = 227] = "GlobalModuleExportDeclaration";
+        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 228] = "ImportEqualsDeclaration";
+        SyntaxKind[SyntaxKind["ImportDeclaration"] = 229] = "ImportDeclaration";
+        SyntaxKind[SyntaxKind["ImportClause"] = 230] = "ImportClause";
+        SyntaxKind[SyntaxKind["NamespaceImport"] = 231] = "NamespaceImport";
+        SyntaxKind[SyntaxKind["NamedImports"] = 232] = "NamedImports";
+        SyntaxKind[SyntaxKind["ImportSpecifier"] = 233] = "ImportSpecifier";
+        SyntaxKind[SyntaxKind["ExportAssignment"] = 234] = "ExportAssignment";
+        SyntaxKind[SyntaxKind["ExportDeclaration"] = 235] = "ExportDeclaration";
+        SyntaxKind[SyntaxKind["NamedExports"] = 236] = "NamedExports";
+        SyntaxKind[SyntaxKind["ExportSpecifier"] = 237] = "ExportSpecifier";
+        SyntaxKind[SyntaxKind["MissingDeclaration"] = 238] = "MissingDeclaration";
         // Module references
-        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 235] = "ExternalModuleReference";
+        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 239] = "ExternalModuleReference";
         // JSX
-        SyntaxKind[SyntaxKind["JsxElement"] = 236] = "JsxElement";
-        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 237] = "JsxSelfClosingElement";
-        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 238] = "JsxOpeningElement";
-        SyntaxKind[SyntaxKind["JsxText"] = 239] = "JsxText";
-        SyntaxKind[SyntaxKind["JsxClosingElement"] = 240] = "JsxClosingElement";
-        SyntaxKind[SyntaxKind["JsxAttribute"] = 241] = "JsxAttribute";
-        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 242] = "JsxSpreadAttribute";
-        SyntaxKind[SyntaxKind["JsxExpression"] = 243] = "JsxExpression";
+        SyntaxKind[SyntaxKind["JsxElement"] = 240] = "JsxElement";
+        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 241] = "JsxSelfClosingElement";
+        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 242] = "JsxOpeningElement";
+        SyntaxKind[SyntaxKind["JsxText"] = 243] = "JsxText";
+        SyntaxKind[SyntaxKind["JsxClosingElement"] = 244] = "JsxClosingElement";
+        SyntaxKind[SyntaxKind["JsxAttribute"] = 245] = "JsxAttribute";
+        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 246] = "JsxSpreadAttribute";
+        SyntaxKind[SyntaxKind["JsxExpression"] = 247] = "JsxExpression";
         // Clauses
-        SyntaxKind[SyntaxKind["CaseClause"] = 244] = "CaseClause";
-        SyntaxKind[SyntaxKind["DefaultClause"] = 245] = "DefaultClause";
-        SyntaxKind[SyntaxKind["HeritageClause"] = 246] = "HeritageClause";
-        SyntaxKind[SyntaxKind["CatchClause"] = 247] = "CatchClause";
+        SyntaxKind[SyntaxKind["CaseClause"] = 248] = "CaseClause";
+        SyntaxKind[SyntaxKind["DefaultClause"] = 249] = "DefaultClause";
+        SyntaxKind[SyntaxKind["HeritageClause"] = 250] = "HeritageClause";
+        SyntaxKind[SyntaxKind["CatchClause"] = 251] = "CatchClause";
         // Property assignments
-        SyntaxKind[SyntaxKind["PropertyAssignment"] = 248] = "PropertyAssignment";
-        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 249] = "ShorthandPropertyAssignment";
+        SyntaxKind[SyntaxKind["PropertyAssignment"] = 252] = "PropertyAssignment";
+        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 253] = "ShorthandPropertyAssignment";
         // Enum
-        SyntaxKind[SyntaxKind["EnumMember"] = 250] = "EnumMember";
+        SyntaxKind[SyntaxKind["EnumMember"] = 254] = "EnumMember";
         // Top-level nodes
-        SyntaxKind[SyntaxKind["SourceFile"] = 251] = "SourceFile";
-        // JSDoc nodes.
-        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 252] = "JSDocTypeExpression";
-        // The * type.
-        SyntaxKind[SyntaxKind["JSDocAllType"] = 253] = "JSDocAllType";
-        // The ? type.
-        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 254] = "JSDocUnknownType";
-        SyntaxKind[SyntaxKind["JSDocArrayType"] = 255] = "JSDocArrayType";
-        SyntaxKind[SyntaxKind["JSDocUnionType"] = 256] = "JSDocUnionType";
-        SyntaxKind[SyntaxKind["JSDocTupleType"] = 257] = "JSDocTupleType";
-        SyntaxKind[SyntaxKind["JSDocNullableType"] = 258] = "JSDocNullableType";
-        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 259] = "JSDocNonNullableType";
-        SyntaxKind[SyntaxKind["JSDocRecordType"] = 260] = "JSDocRecordType";
-        SyntaxKind[SyntaxKind["JSDocRecordMember"] = 261] = "JSDocRecordMember";
-        SyntaxKind[SyntaxKind["JSDocTypeReference"] = 262] = "JSDocTypeReference";
-        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 263] = "JSDocOptionalType";
-        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 264] = "JSDocFunctionType";
-        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 265] = "JSDocVariadicType";
-        SyntaxKind[SyntaxKind["JSDocConstructorType"] = 266] = "JSDocConstructorType";
-        SyntaxKind[SyntaxKind["JSDocThisType"] = 267] = "JSDocThisType";
-        SyntaxKind[SyntaxKind["JSDocComment"] = 268] = "JSDocComment";
-        SyntaxKind[SyntaxKind["JSDocTag"] = 269] = "JSDocTag";
-        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 270] = "JSDocParameterTag";
-        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 271] = "JSDocReturnTag";
-        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 272] = "JSDocTypeTag";
-        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 273] = "JSDocTemplateTag";
+        SyntaxKind[SyntaxKind["SourceFile"] = 255] = "SourceFile";
+        // JSDoc nodes
+        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 256] = "JSDocTypeExpression";
+        // The * type
+        SyntaxKind[SyntaxKind["JSDocAllType"] = 257] = "JSDocAllType";
+        // The ? type
+        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 258] = "JSDocUnknownType";
+        SyntaxKind[SyntaxKind["JSDocArrayType"] = 259] = "JSDocArrayType";
+        SyntaxKind[SyntaxKind["JSDocUnionType"] = 260] = "JSDocUnionType";
+        SyntaxKind[SyntaxKind["JSDocTupleType"] = 261] = "JSDocTupleType";
+        SyntaxKind[SyntaxKind["JSDocNullableType"] = 262] = "JSDocNullableType";
+        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 263] = "JSDocNonNullableType";
+        SyntaxKind[SyntaxKind["JSDocRecordType"] = 264] = "JSDocRecordType";
+        SyntaxKind[SyntaxKind["JSDocRecordMember"] = 265] = "JSDocRecordMember";
+        SyntaxKind[SyntaxKind["JSDocTypeReference"] = 266] = "JSDocTypeReference";
+        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 267] = "JSDocOptionalType";
+        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 268] = "JSDocFunctionType";
+        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 269] = "JSDocVariadicType";
+        SyntaxKind[SyntaxKind["JSDocConstructorType"] = 270] = "JSDocConstructorType";
+        SyntaxKind[SyntaxKind["JSDocThisType"] = 271] = "JSDocThisType";
+        SyntaxKind[SyntaxKind["JSDocComment"] = 272] = "JSDocComment";
+        SyntaxKind[SyntaxKind["JSDocTag"] = 273] = "JSDocTag";
+        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 274] = "JSDocParameterTag";
+        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 275] = "JSDocReturnTag";
+        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 276] = "JSDocTypeTag";
+        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 277] = "JSDocTemplateTag";
         // Synthesized list
-        SyntaxKind[SyntaxKind["SyntaxList"] = 274] = "SyntaxList";
+        SyntaxKind[SyntaxKind["SyntaxList"] = 278] = "SyntaxList";
         // Enum value count
-        SyntaxKind[SyntaxKind["Count"] = 275] = "Count";
+        SyntaxKind[SyntaxKind["Count"] = 279] = "Count";
         // Markers
         SyntaxKind[SyntaxKind["FirstAssignment"] = 56] = "FirstAssignment";
         SyntaxKind[SyntaxKind["LastAssignment"] = 68] = "LastAssignment";
         SyntaxKind[SyntaxKind["FirstReservedWord"] = 70] = "FirstReservedWord";
         SyntaxKind[SyntaxKind["LastReservedWord"] = 105] = "LastReservedWord";
         SyntaxKind[SyntaxKind["FirstKeyword"] = 70] = "FirstKeyword";
-        SyntaxKind[SyntaxKind["LastKeyword"] = 135] = "LastKeyword";
+        SyntaxKind[SyntaxKind["LastKeyword"] = 137] = "LastKeyword";
         SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 106] = "FirstFutureReservedWord";
         SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 114] = "LastFutureReservedWord";
-        SyntaxKind[SyntaxKind["FirstTypeNode"] = 151] = "FirstTypeNode";
-        SyntaxKind[SyntaxKind["LastTypeNode"] = 163] = "LastTypeNode";
+        SyntaxKind[SyntaxKind["FirstTypeNode"] = 153] = "FirstTypeNode";
+        SyntaxKind[SyntaxKind["LastTypeNode"] = 165] = "LastTypeNode";
         SyntaxKind[SyntaxKind["FirstPunctuation"] = 15] = "FirstPunctuation";
         SyntaxKind[SyntaxKind["LastPunctuation"] = 68] = "LastPunctuation";
         SyntaxKind[SyntaxKind["FirstToken"] = 0] = "FirstToken";
-        SyntaxKind[SyntaxKind["LastToken"] = 135] = "LastToken";
+        SyntaxKind[SyntaxKind["LastToken"] = 137] = "LastToken";
         SyntaxKind[SyntaxKind["FirstTriviaToken"] = 2] = "FirstTriviaToken";
         SyntaxKind[SyntaxKind["LastTriviaToken"] = 7] = "LastTriviaToken";
         SyntaxKind[SyntaxKind["FirstLiteralToken"] = 8] = "FirstLiteralToken";
@@ -348,83 +357,59 @@ var ts;
         SyntaxKind[SyntaxKind["LastTemplateToken"] = 14] = "LastTemplateToken";
         SyntaxKind[SyntaxKind["FirstBinaryOperator"] = 25] = "FirstBinaryOperator";
         SyntaxKind[SyntaxKind["LastBinaryOperator"] = 68] = "LastBinaryOperator";
-        SyntaxKind[SyntaxKind["FirstNode"] = 136] = "FirstNode";
+        SyntaxKind[SyntaxKind["FirstNode"] = 138] = "FirstNode";
     })(ts.SyntaxKind || (ts.SyntaxKind = {}));
     var SyntaxKind = ts.SyntaxKind;
     (function (NodeFlags) {
         NodeFlags[NodeFlags["None"] = 0] = "None";
-        NodeFlags[NodeFlags["Export"] = 2] = "Export";
-        NodeFlags[NodeFlags["Ambient"] = 4] = "Ambient";
-        NodeFlags[NodeFlags["Public"] = 8] = "Public";
-        NodeFlags[NodeFlags["Private"] = 16] = "Private";
-        NodeFlags[NodeFlags["Protected"] = 32] = "Protected";
-        NodeFlags[NodeFlags["Static"] = 64] = "Static";
+        NodeFlags[NodeFlags["Export"] = 1] = "Export";
+        NodeFlags[NodeFlags["Ambient"] = 2] = "Ambient";
+        NodeFlags[NodeFlags["Public"] = 4] = "Public";
+        NodeFlags[NodeFlags["Private"] = 8] = "Private";
+        NodeFlags[NodeFlags["Protected"] = 16] = "Protected";
+        NodeFlags[NodeFlags["Static"] = 32] = "Static";
+        NodeFlags[NodeFlags["Readonly"] = 64] = "Readonly";
         NodeFlags[NodeFlags["Abstract"] = 128] = "Abstract";
         NodeFlags[NodeFlags["Async"] = 256] = "Async";
         NodeFlags[NodeFlags["Default"] = 512] = "Default";
-        NodeFlags[NodeFlags["MultiLine"] = 1024] = "MultiLine";
-        NodeFlags[NodeFlags["Synthetic"] = 2048] = "Synthetic";
-        NodeFlags[NodeFlags["DeclarationFile"] = 4096] = "DeclarationFile";
-        NodeFlags[NodeFlags["Let"] = 8192] = "Let";
-        NodeFlags[NodeFlags["Const"] = 16384] = "Const";
-        NodeFlags[NodeFlags["OctalLiteral"] = 32768] = "OctalLiteral";
-        NodeFlags[NodeFlags["Namespace"] = 65536] = "Namespace";
-        NodeFlags[NodeFlags["ExportContext"] = 131072] = "ExportContext";
-        NodeFlags[NodeFlags["ContainsThis"] = 262144] = "ContainsThis";
-        NodeFlags[NodeFlags["HasImplicitReturn"] = 524288] = "HasImplicitReturn";
-        NodeFlags[NodeFlags["HasExplicitReturn"] = 1048576] = "HasExplicitReturn";
-        NodeFlags[NodeFlags["GlobalAugmentation"] = 2097152] = "GlobalAugmentation";
-        NodeFlags[NodeFlags["HasClassExtends"] = 4194304] = "HasClassExtends";
-        NodeFlags[NodeFlags["HasDecorators"] = 8388608] = "HasDecorators";
-        NodeFlags[NodeFlags["HasParamDecorators"] = 16777216] = "HasParamDecorators";
-        NodeFlags[NodeFlags["HasAsyncFunctions"] = 33554432] = "HasAsyncFunctions";
-        NodeFlags[NodeFlags["Modifier"] = 1022] = "Modifier";
-        NodeFlags[NodeFlags["AccessibilityModifier"] = 56] = "AccessibilityModifier";
-        NodeFlags[NodeFlags["BlockScoped"] = 24576] = "BlockScoped";
-        NodeFlags[NodeFlags["ReachabilityCheckFlags"] = 1572864] = "ReachabilityCheckFlags";
-        NodeFlags[NodeFlags["EmitHelperFlags"] = 62914560] = "EmitHelperFlags";
+        NodeFlags[NodeFlags["Let"] = 1024] = "Let";
+        NodeFlags[NodeFlags["Const"] = 2048] = "Const";
+        NodeFlags[NodeFlags["Namespace"] = 4096] = "Namespace";
+        NodeFlags[NodeFlags["ExportContext"] = 8192] = "ExportContext";
+        NodeFlags[NodeFlags["ContainsThis"] = 16384] = "ContainsThis";
+        NodeFlags[NodeFlags["HasImplicitReturn"] = 32768] = "HasImplicitReturn";
+        NodeFlags[NodeFlags["HasExplicitReturn"] = 65536] = "HasExplicitReturn";
+        NodeFlags[NodeFlags["GlobalAugmentation"] = 131072] = "GlobalAugmentation";
+        NodeFlags[NodeFlags["HasClassExtends"] = 262144] = "HasClassExtends";
+        NodeFlags[NodeFlags["HasDecorators"] = 524288] = "HasDecorators";
+        NodeFlags[NodeFlags["HasParamDecorators"] = 1048576] = "HasParamDecorators";
+        NodeFlags[NodeFlags["HasAsyncFunctions"] = 2097152] = "HasAsyncFunctions";
+        NodeFlags[NodeFlags["DisallowInContext"] = 4194304] = "DisallowInContext";
+        NodeFlags[NodeFlags["YieldContext"] = 8388608] = "YieldContext";
+        NodeFlags[NodeFlags["DecoratorContext"] = 16777216] = "DecoratorContext";
+        NodeFlags[NodeFlags["AwaitContext"] = 33554432] = "AwaitContext";
+        NodeFlags[NodeFlags["ThisNodeHasError"] = 67108864] = "ThisNodeHasError";
+        NodeFlags[NodeFlags["JavaScriptFile"] = 134217728] = "JavaScriptFile";
+        NodeFlags[NodeFlags["ThisNodeOrAnySubNodesHasError"] = 268435456] = "ThisNodeOrAnySubNodesHasError";
+        NodeFlags[NodeFlags["HasAggregatedChildData"] = 536870912] = "HasAggregatedChildData";
+        NodeFlags[NodeFlags["HasJsxSpreadAttribute"] = 1073741824] = "HasJsxSpreadAttribute";
+        NodeFlags[NodeFlags["Modifier"] = 959] = "Modifier";
+        NodeFlags[NodeFlags["AccessibilityModifier"] = 28] = "AccessibilityModifier";
+        NodeFlags[NodeFlags["BlockScoped"] = 3072] = "BlockScoped";
+        NodeFlags[NodeFlags["ReachabilityCheckFlags"] = 98304] = "ReachabilityCheckFlags";
+        NodeFlags[NodeFlags["EmitHelperFlags"] = 3932160] = "EmitHelperFlags";
+        // Parsing context flags
+        NodeFlags[NodeFlags["ContextFlags"] = 197132288] = "ContextFlags";
+        // Exclude these flags when parsing a Type
+        NodeFlags[NodeFlags["TypeExcludesFlags"] = 41943040] = "TypeExcludesFlags";
     })(ts.NodeFlags || (ts.NodeFlags = {}));
     var NodeFlags = ts.NodeFlags;
-    /* @internal */
-    (function (ParserContextFlags) {
-        ParserContextFlags[ParserContextFlags["None"] = 0] = "None";
-        // If this node was parsed in a context where 'in-expressions' are not allowed.
-        ParserContextFlags[ParserContextFlags["DisallowIn"] = 1] = "DisallowIn";
-        // If this node was parsed in the 'yield' context created when parsing a generator.
-        ParserContextFlags[ParserContextFlags["Yield"] = 2] = "Yield";
-        // If this node was parsed as part of a decorator
-        ParserContextFlags[ParserContextFlags["Decorator"] = 4] = "Decorator";
-        // If this node was parsed in the 'await' context created when parsing an async function.
-        ParserContextFlags[ParserContextFlags["Await"] = 8] = "Await";
-        // If the parser encountered an error when parsing the code that created this node.  Note
-        // the parser only sets this directly on the node it creates right after encountering the
-        // error.
-        ParserContextFlags[ParserContextFlags["ThisNodeHasError"] = 16] = "ThisNodeHasError";
-        // This node was parsed in a JavaScript file and can be processed differently.  For example
-        // its type can be specified usign a JSDoc comment.
-        ParserContextFlags[ParserContextFlags["JavaScriptFile"] = 32] = "JavaScriptFile";
-        // Context flags set directly by the parser.
-        ParserContextFlags[ParserContextFlags["ParserGeneratedFlags"] = 31] = "ParserGeneratedFlags";
-        // Exclude these flags when parsing a Type
-        ParserContextFlags[ParserContextFlags["TypeExcludesFlags"] = 10] = "TypeExcludesFlags";
-        // Context flags computed by aggregating child flags upwards.
-        // Used during incremental parsing to determine if this node or any of its children had an
-        // error.  Computed only once and then cached.
-        ParserContextFlags[ParserContextFlags["ThisNodeOrAnySubNodesHasError"] = 64] = "ThisNodeOrAnySubNodesHasError";
-        // Used to know if we've computed data from children and cached it in this node.
-        ParserContextFlags[ParserContextFlags["HasAggregatedChildData"] = 128] = "HasAggregatedChildData";
-    })(ts.ParserContextFlags || (ts.ParserContextFlags = {}));
-    var ParserContextFlags = ts.ParserContextFlags;
     (function (JsxFlags) {
         JsxFlags[JsxFlags["None"] = 0] = "None";
         /** An element from a named property of the JSX.IntrinsicElements interface */
         JsxFlags[JsxFlags["IntrinsicNamedElement"] = 1] = "IntrinsicNamedElement";
         /** An element inferred from the string index signature of the JSX.IntrinsicElements interface */
         JsxFlags[JsxFlags["IntrinsicIndexedElement"] = 2] = "IntrinsicIndexedElement";
-        /** An element backed by a class, class-like, or function value */
-        JsxFlags[JsxFlags["ValueElement"] = 4] = "ValueElement";
-        /** Element resolution failed */
-        JsxFlags[JsxFlags["UnknownElement"] = 16] = "UnknownElement";
         JsxFlags[JsxFlags["IntrinsicElement"] = 3] = "IntrinsicElement";
     })(ts.JsxFlags || (ts.JsxFlags = {}));
     var JsxFlags = ts.JsxFlags;
@@ -594,13 +579,17 @@ var ts;
         NodeCheckFlags[NodeCheckFlags["SuperInstance"] = 256] = "SuperInstance";
         NodeCheckFlags[NodeCheckFlags["SuperStatic"] = 512] = "SuperStatic";
         NodeCheckFlags[NodeCheckFlags["ContextChecked"] = 1024] = "ContextChecked";
-        NodeCheckFlags[NodeCheckFlags["LexicalArguments"] = 2048] = "LexicalArguments";
-        NodeCheckFlags[NodeCheckFlags["CaptureArguments"] = 4096] = "CaptureArguments";
-        // Values for enum members have been computed, and any errors have been reported for them.
-        NodeCheckFlags[NodeCheckFlags["EnumValuesComputed"] = 8192] = "EnumValuesComputed";
-        NodeCheckFlags[NodeCheckFlags["BlockScopedBindingInLoop"] = 16384] = "BlockScopedBindingInLoop";
+        NodeCheckFlags[NodeCheckFlags["AsyncMethodWithSuper"] = 2048] = "AsyncMethodWithSuper";
+        NodeCheckFlags[NodeCheckFlags["AsyncMethodWithSuperBinding"] = 4096] = "AsyncMethodWithSuperBinding";
+        NodeCheckFlags[NodeCheckFlags["CaptureArguments"] = 8192] = "CaptureArguments";
+        NodeCheckFlags[NodeCheckFlags["EnumValuesComputed"] = 16384] = "EnumValuesComputed";
         NodeCheckFlags[NodeCheckFlags["LexicalModuleMergesWithClass"] = 32768] = "LexicalModuleMergesWithClass";
-        NodeCheckFlags[NodeCheckFlags["LoopWithBlockScopedBindingCapturedInFunction"] = 65536] = "LoopWithBlockScopedBindingCapturedInFunction";
+        NodeCheckFlags[NodeCheckFlags["LoopWithCapturedBlockScopedBinding"] = 65536] = "LoopWithCapturedBlockScopedBinding";
+        NodeCheckFlags[NodeCheckFlags["CapturedBlockScopedBinding"] = 131072] = "CapturedBlockScopedBinding";
+        NodeCheckFlags[NodeCheckFlags["BlockScopedBindingInLoop"] = 262144] = "BlockScopedBindingInLoop";
+        NodeCheckFlags[NodeCheckFlags["ClassWithBodyScopedClassBinding"] = 524288] = "ClassWithBodyScopedClassBinding";
+        NodeCheckFlags[NodeCheckFlags["BodyScopedClassBinding"] = 1048576] = "BodyScopedClassBinding";
+        NodeCheckFlags[NodeCheckFlags["NeedsLoopOutParameter"] = 2097152] = "NeedsLoopOutParameter";
     })(ts.NodeCheckFlags || (ts.NodeCheckFlags = {}));
     var NodeCheckFlags = ts.NodeCheckFlags;
     (function (TypeFlags) {
@@ -636,7 +625,8 @@ var ts;
         TypeFlags[TypeFlags["ESSymbol"] = 16777216] = "ESSymbol";
         TypeFlags[TypeFlags["ThisType"] = 33554432] = "ThisType";
         TypeFlags[TypeFlags["ObjectLiteralPatternWithComputedProperties"] = 67108864] = "ObjectLiteralPatternWithComputedProperties";
-        TypeFlags[TypeFlags["PredicateType"] = 134217728] = "PredicateType";
+        /* @internal */
+        TypeFlags[TypeFlags["Nullable"] = 96] = "Nullable";
         /* @internal */
         TypeFlags[TypeFlags["Intrinsic"] = 16777343] = "Intrinsic";
         /* @internal */
@@ -647,7 +637,7 @@ var ts;
         TypeFlags[TypeFlags["UnionOrIntersection"] = 49152] = "UnionOrIntersection";
         TypeFlags[TypeFlags["StructuredType"] = 130048] = "StructuredType";
         /* @internal */
-        TypeFlags[TypeFlags["RequiresWidening"] = 140509184] = "RequiresWidening";
+        TypeFlags[TypeFlags["RequiresWidening"] = 6291456] = "RequiresWidening";
         /* @internal */
         TypeFlags[TypeFlags["PropagatingFlags"] = 14680064] = "PropagatingFlags";
     })(ts.TypeFlags || (ts.TypeFlags = {}));
@@ -707,6 +697,14 @@ var ts;
         NewLineKind[NewLineKind["LineFeed"] = 1] = "LineFeed";
     })(ts.NewLineKind || (ts.NewLineKind = {}));
     var NewLineKind = ts.NewLineKind;
+    (function (ScriptKind) {
+        ScriptKind[ScriptKind["Unknown"] = 0] = "Unknown";
+        ScriptKind[ScriptKind["JS"] = 1] = "JS";
+        ScriptKind[ScriptKind["JSX"] = 2] = "JSX";
+        ScriptKind[ScriptKind["TS"] = 3] = "TS";
+        ScriptKind[ScriptKind["TSX"] = 4] = "TSX";
+    })(ts.ScriptKind || (ts.ScriptKind = {}));
+    var ScriptKind = ts.ScriptKind;
     (function (ScriptTarget) {
         ScriptTarget[ScriptTarget["ES3"] = 0] = "ES3";
         ScriptTarget[ScriptTarget["ES5"] = 1] = "ES5";
@@ -1095,8 +1093,14 @@ var ts;
             var count = array.length;
             if (count > 0) {
                 var pos = 0;
-                var result = arguments.length <= 2 ? array[pos] : initial;
-                pos++;
+                var result = void 0;
+                if (arguments.length <= 2) {
+                    result = array[pos];
+                    pos++;
+                }
+                else {
+                    result = initial;
+                }
                 while (pos < count) {
                     result = f(result, array[pos]);
                     pos++;
@@ -1111,8 +1115,14 @@ var ts;
         if (array) {
             var pos = array.length - 1;
             if (pos >= 0) {
-                var result = arguments.length <= 2 ? array[pos] : initial;
-                pos--;
+                var result = void 0;
+                if (arguments.length <= 2) {
+                    result = array[pos];
+                    pos--;
+                }
+                else {
+                    result = initial;
+                }
                 while (pos >= 0) {
                     result = f(result, array[pos]);
                     pos--;
@@ -1128,6 +1138,14 @@ var ts;
         return hasOwnProperty.call(map, key);
     }
     ts.hasProperty = hasProperty;
+    function getKeys(map) {
+        var keys = [];
+        for (var key in map) {
+            keys.push(key);
+        }
+        return keys;
+    }
+    ts.getKeys = getKeys;
     function getProperty(map, key) {
         return hasOwnProperty.call(map, key) ? map[key] : undefined;
     }
@@ -1278,6 +1296,15 @@ var ts;
         };
     }
     ts.createFileDiagnostic = createFileDiagnostic;
+    /* internal */
+    function formatMessage(dummy, message) {
+        var text = getLocaleSpecificMessage(message);
+        if (arguments.length > 2) {
+            text = formatStringFromArgs(text, arguments, 2);
+        }
+        return text;
+    }
+    ts.formatMessage = formatMessage;
     function createCompilerDiagnostic(message) {
         var text = getLocaleSpecificMessage(message);
         if (arguments.length > 1) {
@@ -1480,7 +1507,7 @@ var ts;
     }
     ts.getNormalizedPathFromPathComponents = getNormalizedPathFromPathComponents;
     function getNormalizedPathComponentsOfUrl(url) {
-        // Get root length of http://www.website.com/folder1/foler2/
+        // Get root length of http://www.website.com/folder1/folder2/
         // In this example the root is:  http://www.website.com/
         // normalized path components should be ["http://www.website.com/", "folder1", "folder2"]
         var urlLength = url.length;
@@ -1505,7 +1532,7 @@ var ts;
         var indexOfNextSlash = url.indexOf(ts.directorySeparator, rootLength);
         if (indexOfNextSlash !== -1) {
             // Found the "/" after the website.com so the root is length of http://www.website.com/
-            // and get components afetr the root normally like any other folder components
+            // and get components after the root normally like any other folder components
             rootLength = indexOfNextSlash + 1;
             return normalizedPathComponents(url, rootLength);
         }
@@ -1585,6 +1612,32 @@ var ts;
         return pathLen > extLen && path.substr(pathLen - extLen, extLen) === extension;
     }
     ts.fileExtensionIs = fileExtensionIs;
+    function ensureScriptKind(fileName, scriptKind) {
+        // Using scriptKind as a condition handles both:
+        // - 'scriptKind' is unspecified and thus it is `undefined`
+        // - 'scriptKind' is set and it is `Unknown` (0)
+        // If the 'scriptKind' is 'undefined' or 'Unknown' then we attempt
+        // to get the ScriptKind from the file name. If it cannot be resolved
+        // from the file name then the default 'TS' script kind is returned.
+        return (scriptKind || getScriptKindFromFileName(fileName)) || 3 /* TS */;
+    }
+    ts.ensureScriptKind = ensureScriptKind;
+    function getScriptKindFromFileName(fileName) {
+        var ext = fileName.substr(fileName.lastIndexOf("."));
+        switch (ext.toLowerCase()) {
+            case ".js":
+                return 1 /* JS */;
+            case ".jsx":
+                return 2 /* JSX */;
+            case ".ts":
+                return 3 /* TS */;
+            case ".tsx":
+                return 4 /* TSX */;
+            default:
+                return 0 /* Unknown */;
+        }
+    }
+    ts.getScriptKindFromFileName = getScriptKindFromFileName;
     /**
      *  List of supported extensions in order of file resolution precedence.
      */
@@ -1836,6 +1889,7 @@ var ts;
             var _fs = require("fs");
             var _path = require("path");
             var _os = require("os");
+            var _crypto = require("crypto");
             // average async stat takes about 30 microseconds
             // set chunk size to do 30 files in < 1 millisecond
             function createPollingWatchedFileSet(interval, chunkSize) {
@@ -1852,13 +1906,13 @@ var ts;
                     if (!watchedFile) {
                         return;
                     }
-                    _fs.stat(watchedFile.filePath, function (err, stats) {
+                    _fs.stat(watchedFile.fileName, function (err, stats) {
                         if (err) {
-                            watchedFile.callback(watchedFile.filePath);
+                            watchedFile.callback(watchedFile.fileName);
                         }
                         else if (watchedFile.mtime.getTime() !== stats.mtime.getTime()) {
-                            watchedFile.mtime = getModifiedTime(watchedFile.filePath);
-                            watchedFile.callback(watchedFile.filePath, watchedFile.mtime.getTime() === 0);
+                            watchedFile.mtime = getModifiedTime(watchedFile.fileName);
+                            watchedFile.callback(watchedFile.fileName, watchedFile.mtime.getTime() === 0);
                         }
                     });
                 }
@@ -1884,11 +1938,11 @@ var ts;
                         nextFileToCheck = nextToCheck;
                     }, interval);
                 }
-                function addFile(filePath, callback) {
+                function addFile(fileName, callback) {
                     var file = {
-                        filePath: filePath,
+                        fileName: fileName,
                         callback: callback,
-                        mtime: getModifiedTime(filePath)
+                        mtime: getModifiedTime(fileName)
                     };
                     watchedFiles.push(file);
                     if (watchedFiles.length === 1) {
@@ -1908,72 +1962,70 @@ var ts;
                 };
             }
             function createWatchedFileSet() {
-                var dirWatchers = ts.createFileMap();
+                var dirWatchers = {};
                 // One file can have multiple watchers
-                var fileWatcherCallbacks = ts.createFileMap();
+                var fileWatcherCallbacks = {};
                 return { addFile: addFile, removeFile: removeFile };
-                function reduceDirWatcherRefCountForFile(filePath) {
-                    var dirPath = ts.getDirectoryPath(filePath);
-                    if (dirWatchers.contains(dirPath)) {
-                        var watcher = dirWatchers.get(dirPath);
+                function reduceDirWatcherRefCountForFile(fileName) {
+                    var dirName = ts.getDirectoryPath(fileName);
+                    if (ts.hasProperty(dirWatchers, dirName)) {
+                        var watcher = dirWatchers[dirName];
                         watcher.referenceCount -= 1;
                         if (watcher.referenceCount <= 0) {
                             watcher.close();
-                            dirWatchers.remove(dirPath);
+                            delete dirWatchers[dirName];
                         }
                     }
                 }
                 function addDirWatcher(dirPath) {
-                    if (dirWatchers.contains(dirPath)) {
-                        var watcher_1 = dirWatchers.get(dirPath);
+                    if (ts.hasProperty(dirWatchers, dirPath)) {
+                        var watcher_1 = dirWatchers[dirPath];
                         watcher_1.referenceCount += 1;
                         return;
                     }
                     var watcher = _fs.watch(dirPath, { persistent: true }, function (eventName, relativeFileName) { return fileEventHandler(eventName, relativeFileName, dirPath); });
                     watcher.referenceCount = 1;
-                    dirWatchers.set(dirPath, watcher);
+                    dirWatchers[dirPath] = watcher;
                     return;
                 }
                 function addFileWatcherCallback(filePath, callback) {
-                    if (fileWatcherCallbacks.contains(filePath)) {
-                        fileWatcherCallbacks.get(filePath).push(callback);
+                    if (ts.hasProperty(fileWatcherCallbacks, filePath)) {
+                        fileWatcherCallbacks[filePath].push(callback);
                     }
                     else {
-                        fileWatcherCallbacks.set(filePath, [callback]);
+                        fileWatcherCallbacks[filePath] = [callback];
                     }
                 }
-                function addFile(filePath, callback) {
-                    addFileWatcherCallback(filePath, callback);
-                    addDirWatcher(ts.getDirectoryPath(filePath));
-                    return { filePath: filePath, callback: callback };
+                function addFile(fileName, callback) {
+                    addFileWatcherCallback(fileName, callback);
+                    addDirWatcher(ts.getDirectoryPath(fileName));
+                    return { fileName: fileName, callback: callback };
                 }
                 function removeFile(watchedFile) {
-                    removeFileWatcherCallback(watchedFile.filePath, watchedFile.callback);
-                    reduceDirWatcherRefCountForFile(watchedFile.filePath);
+                    removeFileWatcherCallback(watchedFile.fileName, watchedFile.callback);
+                    reduceDirWatcherRefCountForFile(watchedFile.fileName);
                 }
                 function removeFileWatcherCallback(filePath, callback) {
-                    if (fileWatcherCallbacks.contains(filePath)) {
-                        var newCallbacks = ts.copyListRemovingItem(callback, fileWatcherCallbacks.get(filePath));
+                    if (ts.hasProperty(fileWatcherCallbacks, filePath)) {
+                        var newCallbacks = ts.copyListRemovingItem(callback, fileWatcherCallbacks[filePath]);
                         if (newCallbacks.length === 0) {
-                            fileWatcherCallbacks.remove(filePath);
+                            delete fileWatcherCallbacks[filePath];
                         }
                         else {
-                            fileWatcherCallbacks.set(filePath, newCallbacks);
+                            fileWatcherCallbacks[filePath] = newCallbacks;
                         }
                     }
                 }
-                /**
-                 * @param watcherPath is the path from which the watcher is triggered.
-                 */
                 function fileEventHandler(eventName, relativeFileName, baseDirPath) {
                     // When files are deleted from disk, the triggered "rename" event would have a relativefileName of "undefined"
-                    var filePath = typeof relativeFileName !== "string"
+                    var fileName = typeof relativeFileName !== "string"
                         ? undefined
-                        : ts.toPath(relativeFileName, baseDirPath, ts.createGetCanonicalFileName(ts.sys.useCaseSensitiveFileNames));
-                    if (eventName === "change" && fileWatcherCallbacks.contains(filePath)) {
-                        for (var _i = 0, _a = fileWatcherCallbacks.get(filePath); _i < _a.length; _i++) {
+                        : ts.getNormalizedAbsolutePath(relativeFileName, baseDirPath);
+                    // Some applications save a working file via rename operations
+                    if ((eventName === "change" || eventName === "rename") && ts.hasProperty(fileWatcherCallbacks, fileName)) {
+                        for (var _i = 0, _a = fileWatcherCallbacks[fileName]; _i < _a.length; _i++) {
                             var fileCallback = _a[_i];
-                            fileCallback(filePath);
+                            fileCallback(fileName);
                         }
                     }
                 }
@@ -2000,7 +2052,7 @@ var ts;
             // win32\win64 are case insensitive platforms, MacOS (darwin) by default is also case insensitive
             var useCaseSensitiveFileNames = platform !== "win32" && platform !== "win64" && platform !== "darwin";
             function readFile(fileName, encoding) {
-                if (!_fs.existsSync(fileName)) {
+                if (!fileExists(fileName)) {
                     return undefined;
                 }
                 var buffer = _fs.readFileSync(fileName);
@@ -2046,6 +2098,29 @@ var ts;
             function getCanonicalPath(path) {
                 return useCaseSensitiveFileNames ? path : path.toLowerCase();
             }
+            var FileSystemEntryKind;
+            (function (FileSystemEntryKind) {
+                FileSystemEntryKind[FileSystemEntryKind["File"] = 0] = "File";
+                FileSystemEntryKind[FileSystemEntryKind["Directory"] = 1] = "Directory";
+            })(FileSystemEntryKind || (FileSystemEntryKind = {}));
+            function fileSystemEntryExists(path, entryKind) {
+                try {
+                    var stat = _fs.statSync(path);
+                    switch (entryKind) {
+                        case 0 /* File */: return stat.isFile();
+                        case 1 /* Directory */: return stat.isDirectory();
+                    }
+                }
+                catch (e) {
+                    return false;
+                }
+            }
+            function fileExists(path) {
+                return fileSystemEntryExists(path, 0 /* File */);
+            }
+            function directoryExists(path) {
+                return fileSystemEntryExists(path, 1 /* Directory */);
+            }
             function readDirectory(path, extension, exclude) {
                 var result = [];
                 exclude = ts.map(exclude, function (s) { return getCanonicalPath(ts.combinePaths(path, s)); });
@@ -2056,6 +2131,11 @@ var ts;
                     var directories = [];
                     for (var _i = 0, files_2 = files; _i < files_2.length; _i++) {
                         var current = files_2[_i];
+                        // This is necessary because on some file system node fails to exclude 
+                        // "." and "..". See https://github.com/nodejs/node/issues/4002
+                        if (current === "." || current === "..") {
+                            continue;
+                        }
                         var name_3 = ts.combinePaths(path, current);
                         if (!ts.contains(exclude, getCanonicalPath(name_3))) {
                             var stat = _fs.statSync(name_3);
@@ -2084,18 +2164,18 @@ var ts;
                 },
                 readFile: readFile,
                 writeFile: writeFile,
-                watchFile: function (filePath, callback) {
-                    // Node 4.0 stablized the `fs.watch` function on Windows which avoids polling
+                watchFile: function (fileName, callback) {
+                    // Node 4.0 stabilized the `fs.watch` function on Windows which avoids polling
                     // and is more efficient than `fs.watchFile` (ref: https://github.com/nodejs/node/pull/2649
                     // and https://github.com/Microsoft/TypeScript/issues/4643), therefore
                     // if the current node.js version is newer than 4, use `fs.watch` instead.
                     var watchSet = isNode4OrLater() ? watchedFileSet : pollingWatchedFileSet;
-                    var watchedFile = watchSet.addFile(filePath, callback);
+                    var watchedFile = watchSet.addFile(fileName, callback);
                     return {
                         close: function () { return watchSet.removeFile(watchedFile); }
                     };
                 },
-                watchDirectory: function (path, callback, recursive) {
+                watchDirectory: function (directoryName, callback, recursive) {
                     // Node 4.0 `fs.watch` function supports the "recursive" option on both OSX and Windows
                     // (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
                     var options;
@@ -2105,13 +2185,13 @@ var ts;
                     else {
                         options = { persistent: true };
                     }
-                    return _fs.watch(path, options, function (eventName, relativeFileName) {
+                    return _fs.watch(directoryName, options, function (eventName, relativeFileName) {
                         // In watchDirectory we only care about adding and removing files (when event name is
                         // "rename"); changes made within files are handled by corresponding fileWatchers (when
                         // event name is "change")
                         if (eventName === "rename") {
                             // When deleting a file, the passed baseFileName is null
-                            callback(!relativeFileName ? relativeFileName : ts.normalizePath(ts.combinePaths(path, relativeFileName)));
+                            callback(!relativeFileName ? relativeFileName : ts.normalizePath(ts.combinePaths(directoryName, relativeFileName)));
                         }
                         ;
                     });
@@ -2119,12 +2199,8 @@ var ts;
                 resolvePath: function (path) {
                     return _path.resolve(path);
                 },
-                fileExists: function (path) {
-                    return _fs.existsSync(path);
-                },
-                directoryExists: function (path) {
-                    return _fs.existsSync(path) && _fs.statSync(path).isDirectory();
-                },
+                fileExists: fileExists,
+                directoryExists: directoryExists,
                 createDirectory: function (directoryName) {
                     if (!this.directoryExists(directoryName)) {
                         _fs.mkdirSync(directoryName);
@@ -2137,6 +2213,19 @@ var ts;
                     return process.cwd();
                 },
                 readDirectory: readDirectory,
+                getModifiedTime: function (path) {
+                    try {
+                        return _fs.statSync(path).mtime;
+                    }
+                    catch (e) {
+                        return undefined;
+                    }
+                },
+                createHash: function (data) {
+                    var hash = _crypto.createHash("md5");
+                    hash.update(data);
+                    return hash.digest("hex");
+                },
                 getMemoryUsage: function () {
                     if (global.gc) {
                         global.gc();
@@ -2214,6 +2303,7 @@ var ts;
         An_index_signature_must_have_a_type_annotation: { code: 1021, category: ts.DiagnosticCategory.Error, key: "An_index_signature_must_have_a_type_annotation_1021", message: "An index signature must have a type annotation." },
         An_index_signature_parameter_must_have_a_type_annotation: { code: 1022, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_must_have_a_type_annotation_1022", message: "An index signature parameter must have a type annotation." },
         An_index_signature_parameter_type_must_be_string_or_number: { code: 1023, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_type_must_be_string_or_number_1023", message: "An index signature parameter type must be 'string' or 'number'." },
+        readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature: { code: 1024, category: ts.DiagnosticCategory.Error, key: "readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature_1024", message: "'readonly' modifier can only appear on a property declaration or index signature." },
         Accessibility_modifier_already_seen: { code: 1028, category: ts.DiagnosticCategory.Error, key: "Accessibility_modifier_already_seen_1028", message: "Accessibility modifier already seen." },
         _0_modifier_must_precede_1_modifier: { code: 1029, category: ts.DiagnosticCategory.Error, key: "_0_modifier_must_precede_1_modifier_1029", message: "'{0}' modifier must precede '{1}' modifier." },
         _0_modifier_already_seen: { code: 1030, category: ts.DiagnosticCategory.Error, key: "_0_modifier_already_seen_1030", message: "'{0}' modifier already seen." },
@@ -2227,7 +2317,7 @@ var ts;
         _0_modifier_cannot_be_used_with_a_class_declaration: { code: 1041, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_with_a_class_declaration_1041", message: "'{0}' modifier cannot be used with a class declaration." },
         _0_modifier_cannot_be_used_here: { code: 1042, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_here_1042", message: "'{0}' modifier cannot be used here." },
         _0_modifier_cannot_appear_on_a_data_property: { code: 1043, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_data_property_1043", message: "'{0}' modifier cannot appear on a data property." },
-        _0_modifier_cannot_appear_on_a_module_element: { code: 1044, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_module_element_1044", message: "'{0}' modifier cannot appear on a module element." },
+        _0_modifier_cannot_appear_on_a_module_or_namespace_element: { code: 1044, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_module_or_namespace_element_1044", message: "'{0}' modifier cannot appear on a module or namespace element." },
         A_0_modifier_cannot_be_used_with_an_interface_declaration: { code: 1045, category: ts.DiagnosticCategory.Error, key: "A_0_modifier_cannot_be_used_with_an_interface_declaration_1045", message: "A '{0}' modifier cannot be used with an interface declaration." },
         A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: { code: 1046, category: ts.DiagnosticCategory.Error, key: "A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file_1046", message: "A 'declare' modifier is required for a top level declaration in a .d.ts file." },
         A_rest_parameter_cannot_be_optional: { code: 1047, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_cannot_be_optional_1047", message: "A rest parameter cannot be optional." },
@@ -2246,8 +2336,11 @@ var ts;
         Enum_member_must_have_initializer: { code: 1061, category: ts.DiagnosticCategory.Error, key: "Enum_member_must_have_initializer_1061", message: "Enum member must have initializer." },
         _0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method: { code: 1062, category: ts.DiagnosticCategory.Error, key: "_0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method_1062", message: "{0} is referenced directly or indirectly in the fulfillment callback of its own 'then' method." },
         An_export_assignment_cannot_be_used_in_a_namespace: { code: 1063, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_cannot_be_used_in_a_namespace_1063", message: "An export assignment cannot be used in a namespace." },
+        The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type: { code: 1064, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_1064", message: "The return type of an async function or method must be the global Promise<T> type." },
         In_ambient_enum_declarations_member_initializer_must_be_constant_expression: { code: 1066, category: ts.DiagnosticCategory.Error, key: "In_ambient_enum_declarations_member_initializer_must_be_constant_expression_1066", message: "In ambient enum declarations member initializer must be constant expression." },
         Unexpected_token_A_constructor_method_accessor_or_property_was_expected: { code: 1068, category: ts.DiagnosticCategory.Error, key: "Unexpected_token_A_constructor_method_accessor_or_property_was_expected_1068", message: "Unexpected token. A constructor, method, accessor, or property was expected." },
+        _0_modifier_cannot_appear_on_a_type_member: { code: 1070, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_type_member_1070", message: "'{0}' modifier cannot appear on a type member." },
+        _0_modifier_cannot_appear_on_an_index_signature: { code: 1071, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_an_index_signature_1071", message: "'{0}' modifier cannot appear on an index signature." },
         A_0_modifier_cannot_be_used_with_an_import_declaration: { code: 1079, category: ts.DiagnosticCategory.Error, key: "A_0_modifier_cannot_be_used_with_an_import_declaration_1079", message: "A '{0}' modifier cannot be used with an import declaration." },
         Invalid_reference_directive_syntax: { code: 1084, category: ts.DiagnosticCategory.Error, key: "Invalid_reference_directive_syntax_1084", message: "Invalid 'reference' directive syntax." },
         Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher: { code: 1085, category: ts.DiagnosticCategory.Error, key: "Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher_1085", message: "Octal literals are not available when targeting ECMAScript 5 and higher." },
@@ -2303,10 +2396,9 @@ var ts;
         String_literal_expected: { code: 1141, category: ts.DiagnosticCategory.Error, key: "String_literal_expected_1141", message: "String literal expected." },
         Line_break_not_permitted_here: { code: 1142, category: ts.DiagnosticCategory.Error, key: "Line_break_not_permitted_here_1142", message: "Line break not permitted here." },
         or_expected: { code: 1144, category: ts.DiagnosticCategory.Error, key: "or_expected_1144", message: "'{' or ';' expected." },
-        Modifiers_not_permitted_on_index_signature_members: { code: 1145, category: ts.DiagnosticCategory.Error, key: "Modifiers_not_permitted_on_index_signature_members_1145", message: "Modifiers not permitted on index signature members." },
         Declaration_expected: { code: 1146, category: ts.DiagnosticCategory.Error, key: "Declaration_expected_1146", message: "Declaration expected." },
         Import_declarations_in_a_namespace_cannot_reference_a_module: { code: 1147, category: ts.DiagnosticCategory.Error, key: "Import_declarations_in_a_namespace_cannot_reference_a_module_1147", message: "Import declarations in a namespace cannot reference a module." },
-        Cannot_compile_modules_unless_the_module_flag_is_provided_Consider_setting_the_module_compiler_option_in_a_tsconfig_json_file: { code: 1148, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_modules_unless_the_module_flag_is_provided_Consider_setting_the_module_compiler_optio_1148", message: "Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file." },
+        Cannot_compile_modules_unless_the_module_flag_is_provided_with_a_valid_module_type_Consider_setting_the_module_compiler_option_in_a_tsconfig_json_file: { code: 1148, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_modules_unless_the_module_flag_is_provided_with_a_valid_module_type_Consider_setting__1148", message: "Cannot compile modules unless the '--module' flag is provided with a valid module type. Consider setting the 'module' compiler option in a 'tsconfig.json' file." },
         File_name_0_differs_from_already_included_file_name_1_only_in_casing: { code: 1149, category: ts.DiagnosticCategory.Error, key: "File_name_0_differs_from_already_included_file_name_1_only_in_casing_1149", message: "File name '{0}' differs from already included file name '{1}' only in casing" },
         new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead: { code: 1150, category: ts.DiagnosticCategory.Error, key: "new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead_1150", message: "'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead." },
         const_declarations_must_be_initialized: { code: 1155, category: ts.DiagnosticCategory.Error, key: "const_declarations_must_be_initialized_1155", message: "'const' declarations must be initialized" },
@@ -2366,7 +2458,7 @@ var ts;
         Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode: { code: 1214, category: ts.DiagnosticCategory.Error, key: "Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode_1214", message: "Identifier expected. '{0}' is a reserved word in strict mode. Modules are automatically in strict mode." },
         Invalid_use_of_0_Modules_are_automatically_in_strict_mode: { code: 1215, category: ts.DiagnosticCategory.Error, key: "Invalid_use_of_0_Modules_are_automatically_in_strict_mode_1215", message: "Invalid use of '{0}'. Modules are automatically in strict mode." },
         Export_assignment_is_not_supported_when_module_flag_is_system: { code: 1218, category: ts.DiagnosticCategory.Error, key: "Export_assignment_is_not_supported_when_module_flag_is_system_1218", message: "Export assignment is not supported when '--module' flag is 'system'." },
-        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Specify_experimentalDecorators_to_remove_this_warning: { code: 1219, category: ts.DiagnosticCategory.Error, key: "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Speci_1219", message: "Experimental support for decorators is a feature that is subject to change in a future release. Specify '--experimentalDecorators' to remove this warning." },
+        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning: { code: 1219, category: ts.DiagnosticCategory.Error, key: "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_t_1219", message: "Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning." },
         Generators_are_only_available_when_targeting_ECMAScript_6_or_higher: { code: 1220, category: ts.DiagnosticCategory.Error, key: "Generators_are_only_available_when_targeting_ECMAScript_6_or_higher_1220", message: "Generators are only available when targeting ECMAScript 6 or higher." },
         Generators_are_not_allowed_in_an_ambient_context: { code: 1221, category: ts.DiagnosticCategory.Error, key: "Generators_are_not_allowed_in_an_ambient_context_1221", message: "Generators are not allowed in an ambient context." },
         An_overload_signature_cannot_be_declared_as_a_generator: { code: 1222, category: ts.DiagnosticCategory.Error, key: "An_overload_signature_cannot_be_declared_as_a_generator_1222", message: "An overload signature cannot be declared as a generator." },
@@ -2375,6 +2467,7 @@ var ts;
         Cannot_find_parameter_0: { code: 1225, category: ts.DiagnosticCategory.Error, key: "Cannot_find_parameter_0_1225", message: "Cannot find parameter '{0}'." },
         Type_predicate_0_is_not_assignable_to_1: { code: 1226, category: ts.DiagnosticCategory.Error, key: "Type_predicate_0_is_not_assignable_to_1_1226", message: "Type predicate '{0}' is not assignable to '{1}'." },
         Parameter_0_is_not_in_the_same_position_as_parameter_1: { code: 1227, category: ts.DiagnosticCategory.Error, key: "Parameter_0_is_not_in_the_same_position_as_parameter_1_1227", message: "Parameter '{0}' is not in the same position as parameter '{1}'." },
+        A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods: { code: 1228, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods_1228", message: "A type predicate is only allowed in return type position for functions and methods." },
         A_type_predicate_cannot_reference_a_rest_parameter: { code: 1229, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_cannot_reference_a_rest_parameter_1229", message: "A type predicate cannot reference a rest parameter." },
         A_type_predicate_cannot_reference_element_0_in_a_binding_pattern: { code: 1230, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_cannot_reference_element_0_in_a_binding_pattern_1230", message: "A type predicate cannot reference element '{0}' in a binding pattern." },
         An_export_assignment_can_only_be_used_in_a_module: { code: 1231, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_can_only_be_used_in_a_module_1231", message: "An export assignment can only be used in a module." },
@@ -2388,7 +2481,7 @@ var ts;
         Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression: { code: 1239, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression_1239", message: "Unable to resolve signature of parameter decorator when called as an expression." },
         Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression: { code: 1240, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression_1240", message: "Unable to resolve signature of property decorator when called as an expression." },
         Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression: { code: 1241, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression_1241", message: "Unable to resolve signature of method decorator when called as an expression." },
-        abstract_modifier_can_only_appear_on_a_class_or_method_declaration: { code: 1242, category: ts.DiagnosticCategory.Error, key: "abstract_modifier_can_only_appear_on_a_class_or_method_declaration_1242", message: "'abstract' modifier can only appear on a class or method declaration." },
+        abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration: { code: 1242, category: ts.DiagnosticCategory.Error, key: "abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration_1242", message: "'abstract' modifier can only appear on a class, method, or property declaration." },
         _0_modifier_cannot_be_used_with_1_modifier: { code: 1243, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_with_1_modifier_1243", message: "'{0}' modifier cannot be used with '{1}' modifier." },
         Abstract_methods_can_only_appear_within_an_abstract_class: { code: 1244, category: ts.DiagnosticCategory.Error, key: "Abstract_methods_can_only_appear_within_an_abstract_class_1244", message: "Abstract methods can only appear within an abstract class." },
         Method_0_cannot_have_an_implementation_because_it_is_marked_abstract: { code: 1245, category: ts.DiagnosticCategory.Error, key: "Method_0_cannot_have_an_implementation_because_it_is_marked_abstract_1245", message: "Method '{0}' cannot have an implementation because it is marked abstract." },
@@ -2401,6 +2494,9 @@ var ts;
         Async_functions_are_only_available_when_targeting_ECMAScript_6_and_higher: { code: 1311, category: ts.DiagnosticCategory.Error, key: "Async_functions_are_only_available_when_targeting_ECMAScript_6_and_higher_1311", message: "Async functions are only available when targeting ECMAScript 6 and higher." },
         can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment: { code: 1312, category: ts.DiagnosticCategory.Error, key: "can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment_1312", message: "'=' can only be used in an object literal property inside a destructuring assignment." },
         The_body_of_an_if_statement_cannot_be_the_empty_statement: { code: 1313, category: ts.DiagnosticCategory.Error, key: "The_body_of_an_if_statement_cannot_be_the_empty_statement_1313", message: "The body of an 'if' statement cannot be the empty statement." },
+        Global_module_exports_may_only_appear_in_module_files: { code: 1314, category: ts.DiagnosticCategory.Error, key: "Global_module_exports_may_only_appear_in_module_files_1314", message: "Global module exports may only appear in module files." },
+        Global_module_exports_may_only_appear_in_declaration_files: { code: 1315, category: ts.DiagnosticCategory.Error, key: "Global_module_exports_may_only_appear_in_declaration_files_1315", message: "Global module exports may only appear in declaration files." },
+        Global_module_exports_may_only_appear_at_top_level: { code: 1316, category: ts.DiagnosticCategory.Error, key: "Global_module_exports_may_only_appear_at_top_level_1316", message: "Global module exports may only appear at top level." },
         Duplicate_identifier_0: { code: 2300, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_0_2300", message: "Duplicate identifier '{0}'." },
         Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: ts.DiagnosticCategory.Error, key: "Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2301", message: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." },
         Static_members_cannot_reference_class_type_parameters: { code: 2302, category: ts.DiagnosticCategory.Error, key: "Static_members_cannot_reference_class_type_parameters_2302", message: "Static members cannot reference class type parameters." },
@@ -2452,7 +2548,7 @@ var ts;
         Cannot_invoke_an_expression_whose_type_lacks_a_call_signature: { code: 2349, category: ts.DiagnosticCategory.Error, key: "Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_2349", message: "Cannot invoke an expression whose type lacks a call signature." },
         Only_a_void_function_can_be_called_with_the_new_keyword: { code: 2350, category: ts.DiagnosticCategory.Error, key: "Only_a_void_function_can_be_called_with_the_new_keyword_2350", message: "Only a void function can be called with the 'new' keyword." },
         Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: { code: 2351, category: ts.DiagnosticCategory.Error, key: "Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature_2351", message: "Cannot use 'new' with an expression whose type lacks a call or construct signature." },
-        Neither_type_0_nor_type_1_is_assignable_to_the_other: { code: 2352, category: ts.DiagnosticCategory.Error, key: "Neither_type_0_nor_type_1_is_assignable_to_the_other_2352", message: "Neither type '{0}' nor type '{1}' is assignable to the other." },
+        Type_0_cannot_be_converted_to_type_1: { code: 2352, category: ts.DiagnosticCategory.Error, key: "Type_0_cannot_be_converted_to_type_1_2352", message: "Type '{0}' cannot be converted to type '{1}'." },
         Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: { code: 2353, category: ts.DiagnosticCategory.Error, key: "Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1_2353", message: "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'." },
         No_best_common_type_exists_among_return_expressions: { code: 2354, category: ts.DiagnosticCategory.Error, key: "No_best_common_type_exists_among_return_expressions_2354", message: "No best common type exists among return expressions." },
         A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value: { code: 2355, category: ts.DiagnosticCategory.Error, key: "A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_2355", message: "A function whose declared type is neither 'void' nor 'any' must return a value." },
@@ -2466,6 +2562,7 @@ var ts;
         The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2363, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2363", message: "The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
         Invalid_left_hand_side_of_assignment_expression: { code: 2364, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_of_assignment_expression_2364", message: "Invalid left-hand side of assignment expression." },
         Operator_0_cannot_be_applied_to_types_1_and_2: { code: 2365, category: ts.DiagnosticCategory.Error, key: "Operator_0_cannot_be_applied_to_types_1_and_2_2365", message: "Operator '{0}' cannot be applied to types '{1}' and '{2}'." },
+        Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined: { code: 2366, category: ts.DiagnosticCategory.Error, key: "Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined_2366", message: "Function lacks ending return statement and return type does not include 'undefined'." },
         Type_parameter_name_cannot_be_0: { code: 2368, category: ts.DiagnosticCategory.Error, key: "Type_parameter_name_cannot_be_0_2368", message: "Type parameter name cannot be '{0}'" },
         A_parameter_property_is_only_allowed_in_a_constructor_implementation: { code: 2369, category: ts.DiagnosticCategory.Error, key: "A_parameter_property_is_only_allowed_in_a_constructor_implementation_2369", message: "A parameter property is only allowed in a constructor implementation." },
         A_rest_parameter_must_be_of_an_array_type: { code: 2370, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_must_be_of_an_array_type_2370", message: "A rest parameter must be of an array type." },
@@ -2481,7 +2578,7 @@ var ts;
         get_and_set_accessor_must_have_the_same_type: { code: 2380, category: ts.DiagnosticCategory.Error, key: "get_and_set_accessor_must_have_the_same_type_2380", message: "'get' and 'set' accessor must have the same type." },
         A_signature_with_an_implementation_cannot_use_a_string_literal_type: { code: 2381, category: ts.DiagnosticCategory.Error, key: "A_signature_with_an_implementation_cannot_use_a_string_literal_type_2381", message: "A signature with an implementation cannot use a string literal type." },
         Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature: { code: 2382, category: ts.DiagnosticCategory.Error, key: "Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature_2382", message: "Specialized overload signature is not assignable to any non-specialized signature." },
-        Overload_signatures_must_all_be_exported_or_not_exported: { code: 2383, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_exported_or_not_exported_2383", message: "Overload signatures must all be exported or not exported." },
+        Overload_signatures_must_all_be_exported_or_non_exported: { code: 2383, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_exported_or_non_exported_2383", message: "Overload signatures must all be exported or non-exported." },
         Overload_signatures_must_all_be_ambient_or_non_ambient: { code: 2384, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_ambient_or_non_ambient_2384", message: "Overload signatures must all be ambient or non-ambient." },
         Overload_signatures_must_all_be_public_private_or_protected: { code: 2385, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_public_private_or_protected_2385", message: "Overload signatures must all be public, private or protected." },
         Overload_signatures_must_all_be_optional_or_required: { code: 2386, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_optional_or_required_2386", message: "Overload signatures must all be optional or required." },
@@ -2514,7 +2611,6 @@ var ts;
         Class_name_cannot_be_0: { code: 2414, category: ts.DiagnosticCategory.Error, key: "Class_name_cannot_be_0_2414", message: "Class name cannot be '{0}'" },
         Class_0_incorrectly_extends_base_class_1: { code: 2415, category: ts.DiagnosticCategory.Error, key: "Class_0_incorrectly_extends_base_class_1_2415", message: "Class '{0}' incorrectly extends base class '{1}'." },
         Class_static_side_0_incorrectly_extends_base_class_static_side_1: { code: 2417, category: ts.DiagnosticCategory.Error, key: "Class_static_side_0_incorrectly_extends_base_class_static_side_1_2417", message: "Class static side '{0}' incorrectly extends base class static side '{1}'." },
-        Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0: { code: 2419, category: ts.DiagnosticCategory.Error, key: "Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0_2419", message: "Type name '{0}' in extends clause does not reference constructor function for '{0}'." },
         Class_0_incorrectly_implements_interface_1: { code: 2420, category: ts.DiagnosticCategory.Error, key: "Class_0_incorrectly_implements_interface_1_2420", message: "Class '{0}' incorrectly implements interface '{1}'." },
         A_class_may_only_implement_another_class_or_interface: { code: 2422, category: ts.DiagnosticCategory.Error, key: "A_class_may_only_implement_another_class_or_interface_2422", message: "A class may only implement another class or interface." },
         Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor: { code: 2423, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_access_2423", message: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member accessor." },
@@ -2522,7 +2618,7 @@ var ts;
         Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2425, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_functi_2425", message: "Class '{0}' defines instance member property '{1}', but extended class '{2}' defines it as instance member function." },
         Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2426, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_functi_2426", message: "Class '{0}' defines instance member accessor '{1}', but extended class '{2}' defines it as instance member function." },
         Interface_name_cannot_be_0: { code: 2427, category: ts.DiagnosticCategory.Error, key: "Interface_name_cannot_be_0_2427", message: "Interface name cannot be '{0}'" },
-        All_declarations_of_an_interface_must_have_identical_type_parameters: { code: 2428, category: ts.DiagnosticCategory.Error, key: "All_declarations_of_an_interface_must_have_identical_type_parameters_2428", message: "All declarations of an interface must have identical type parameters." },
+        All_declarations_of_0_must_have_identical_type_parameters: { code: 2428, category: ts.DiagnosticCategory.Error, key: "All_declarations_of_0_must_have_identical_type_parameters_2428", message: "All declarations of '{0}' must have identical type parameters." },
         Interface_0_incorrectly_extends_interface_1: { code: 2430, category: ts.DiagnosticCategory.Error, key: "Interface_0_incorrectly_extends_interface_1_2430", message: "Interface '{0}' incorrectly extends interface '{1}'." },
         Enum_name_cannot_be_0: { code: 2431, category: ts.DiagnosticCategory.Error, key: "Enum_name_cannot_be_0_2431", message: "Enum name cannot be '{0}'" },
         In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element: { code: 2432, category: ts.DiagnosticCategory.Error, key: "In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enu_2432", message: "In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element." },
@@ -2542,11 +2638,12 @@ var ts;
         Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: { code: 2446, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1_2446", message: "Property '{0}' is protected and only accessible through an instance of class '{1}'." },
         The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: { code: 2447, category: ts.DiagnosticCategory.Error, key: "The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead_2447", message: "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead." },
         Block_scoped_variable_0_used_before_its_declaration: { code: 2448, category: ts.DiagnosticCategory.Error, key: "Block_scoped_variable_0_used_before_its_declaration_2448", message: "Block-scoped variable '{0}' used before its declaration." },
-        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant: { code: 2449, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_2449", message: "The operand of an increment or decrement operator cannot be a constant." },
-        Left_hand_side_of_assignment_expression_cannot_be_a_constant: { code: 2450, category: ts.DiagnosticCategory.Error, key: "Left_hand_side_of_assignment_expression_cannot_be_a_constant_2450", message: "Left-hand side of assignment expression cannot be a constant." },
+        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property: { code: 2449, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property_2449", message: "The operand of an increment or decrement operator cannot be a constant or a read-only property." },
+        Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property: { code: 2450, category: ts.DiagnosticCategory.Error, key: "Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property_2450", message: "Left-hand side of assignment expression cannot be a constant or a read-only property." },
         Cannot_redeclare_block_scoped_variable_0: { code: 2451, category: ts.DiagnosticCategory.Error, key: "Cannot_redeclare_block_scoped_variable_0_2451", message: "Cannot redeclare block-scoped variable '{0}'." },
         An_enum_member_cannot_have_a_numeric_name: { code: 2452, category: ts.DiagnosticCategory.Error, key: "An_enum_member_cannot_have_a_numeric_name_2452", message: "An enum member cannot have a numeric name." },
         The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: { code: 2453, category: ts.DiagnosticCategory.Error, key: "The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_typ_2453", message: "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly." },
+        Variable_0_is_used_before_being_assigned: { code: 2454, category: ts.DiagnosticCategory.Error, key: "Variable_0_is_used_before_being_assigned_2454", message: "Variable '{0}' is used before being assigned." },
         Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0: { code: 2455, category: ts.DiagnosticCategory.Error, key: "Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0_2455", message: "Type argument candidate '{1}' is not a valid type argument because it is not a supertype of candidate '{0}'." },
         Type_alias_0_circularly_references_itself: { code: 2456, category: ts.DiagnosticCategory.Error, key: "Type_alias_0_circularly_references_itself_2456", message: "Type alias '{0}' circularly references itself." },
         Type_alias_name_cannot_be_0: { code: 2457, category: ts.DiagnosticCategory.Error, key: "Type_alias_name_cannot_be_0_2457", message: "Type alias name cannot be '{0}'" },
@@ -2576,8 +2673,8 @@ var ts;
         Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: { code: 2481, category: ts.DiagnosticCategory.Error, key: "Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1_2481", message: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'." },
         The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation_2483", message: "The left-hand side of a 'for...of' statement cannot use a type annotation." },
         Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: ts.DiagnosticCategory.Error, key: "Export_declaration_conflicts_with_exported_declaration_of_0_2484", message: "Export declaration conflicts with exported declaration of '{0}'" },
-        The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant: { code: 2485, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant_2485", message: "The left-hand side of a 'for...of' statement cannot be a previously defined constant." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant: { code: 2486, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant_2486", message: "The left-hand side of a 'for...in' statement cannot be a previously defined constant." },
+        The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property: { code: 2485, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property_2485", message: "The left-hand side of a 'for...of' statement cannot be a constant or a read-only property." },
+        The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property: { code: 2486, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property_2486", message: "The left-hand side of a 'for...in' statement cannot be a constant or a read-only property." },
         Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_of_statement_2487", message: "Invalid left-hand side in 'for...of' statement." },
         Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: ts.DiagnosticCategory.Error, key: "Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator_2488", message: "Type must have a '[Symbol.iterator]()' method that returns an iterator." },
         An_iterator_must_have_a_next_method: { code: 2489, category: ts.DiagnosticCategory.Error, key: "An_iterator_must_have_a_next_method_2489", message: "An iterator must have a 'next()' method." },
@@ -2603,7 +2700,7 @@ var ts;
         Base_constructor_return_type_0_is_not_a_class_or_interface_type: { code: 2509, category: ts.DiagnosticCategory.Error, key: "Base_constructor_return_type_0_is_not_a_class_or_interface_type_2509", message: "Base constructor return type '{0}' is not a class or interface type." },
         Base_constructors_must_all_have_the_same_return_type: { code: 2510, category: ts.DiagnosticCategory.Error, key: "Base_constructors_must_all_have_the_same_return_type_2510", message: "Base constructors must all have the same return type." },
         Cannot_create_an_instance_of_the_abstract_class_0: { code: 2511, category: ts.DiagnosticCategory.Error, key: "Cannot_create_an_instance_of_the_abstract_class_0_2511", message: "Cannot create an instance of the abstract class '{0}'." },
-        Overload_signatures_must_all_be_abstract_or_not_abstract: { code: 2512, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_abstract_or_not_abstract_2512", message: "Overload signatures must all be abstract or not abstract." },
+        Overload_signatures_must_all_be_abstract_or_non_abstract: { code: 2512, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_abstract_or_non_abstract_2512", message: "Overload signatures must all be abstract or non-abstract." },
         Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression: { code: 2513, category: ts.DiagnosticCategory.Error, key: "Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression_2513", message: "Abstract method '{0}' in class '{1}' cannot be accessed via super expression." },
         Classes_containing_abstract_methods_must_be_marked_abstract: { code: 2514, category: ts.DiagnosticCategory.Error, key: "Classes_containing_abstract_methods_must_be_marked_abstract_2514", message: "Classes containing abstract methods must be marked abstract." },
         Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2: { code: 2515, category: ts.DiagnosticCategory.Error, key: "Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2_2515", message: "Non-abstract class '{0}' does not implement inherited abstract member '{1}' from class '{2}'." },
@@ -2619,6 +2716,9 @@ var ts;
         A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface: { code: 2526, category: ts.DiagnosticCategory.Error, key: "A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface_2526", message: "A 'this' type is available only in a non-static member of a class or interface." },
         The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary: { code: 2527, category: ts.DiagnosticCategory.Error, key: "The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary_2527", message: "The inferred type of '{0}' references an inaccessible 'this' type. A type annotation is necessary." },
         A_module_cannot_have_multiple_default_exports: { code: 2528, category: ts.DiagnosticCategory.Error, key: "A_module_cannot_have_multiple_default_exports_2528", message: "A module cannot have multiple default exports." },
+        Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_functions: { code: 2529, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_func_2529", message: "Duplicate identifier '{0}'. Compiler reserves name '{1}' in top level scope of a module containing async functions." },
+        Property_0_is_incompatible_with_index_signature: { code: 2530, category: ts.DiagnosticCategory.Error, key: "Property_0_is_incompatible_with_index_signature_2530", message: "Property '{0}' is incompatible with index signature." },
+        Object_is_possibly_null_or_undefined: { code: 2531, category: ts.DiagnosticCategory.Error, key: "Object_is_possibly_null_or_undefined_2531", message: "Object is possibly 'null' or 'undefined'." },
         JSX_element_attributes_type_0_may_not_be_a_union_type: { code: 2600, category: ts.DiagnosticCategory.Error, key: "JSX_element_attributes_type_0_may_not_be_a_union_type_2600", message: "JSX element attributes type '{0}' may not be a union type." },
         The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: { code: 2601, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_a_JSX_element_constructor_must_return_an_object_type_2601", message: "The return type of a JSX element constructor must return an object type." },
         JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist: { code: 2602, category: ts.DiagnosticCategory.Error, key: "JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist_2602", message: "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist." },
@@ -2648,6 +2748,21 @@ var ts;
         export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always_visible: { code: 2668, category: ts.DiagnosticCategory.Error, key: "export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always__2668", message: "'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible." },
         Augmentations_for_the_global_scope_can_only_be_directly_nested_in_external_modules_or_ambient_module_declarations: { code: 2669, category: ts.DiagnosticCategory.Error, key: "Augmentations_for_the_global_scope_can_only_be_directly_nested_in_external_modules_or_ambient_module_2669", message: "Augmentations for the global scope can only be directly nested in external modules or ambient module declarations." },
         Augmentations_for_the_global_scope_should_have_declare_modifier_unless_they_appear_in_already_ambient_context: { code: 2670, category: ts.DiagnosticCategory.Error, key: "Augmentations_for_the_global_scope_should_have_declare_modifier_unless_they_appear_in_already_ambien_2670", message: "Augmentations for the global scope should have 'declare' modifier unless they appear in already ambient context." },
+        Cannot_augment_module_0_because_it_resolves_to_a_non_module_entity: { code: 2671, category: ts.DiagnosticCategory.Error, key: "Cannot_augment_module_0_because_it_resolves_to_a_non_module_entity_2671", message: "Cannot augment module '{0}' because it resolves to a non-module entity." },
+        Cannot_assign_a_0_constructor_type_to_a_1_constructor_type: { code: 2672, category: ts.DiagnosticCategory.Error, key: "Cannot_assign_a_0_constructor_type_to_a_1_constructor_type_2672", message: "Cannot assign a '{0}' constructor type to a '{1}' constructor type." },
+        Constructor_of_class_0_is_private_and_only_accessible_within_the_class_declaration: { code: 2673, category: ts.DiagnosticCategory.Error, key: "Constructor_of_class_0_is_private_and_only_accessible_within_the_class_declaration_2673", message: "Constructor of class '{0}' is private and only accessible within the class declaration." },
+        Constructor_of_class_0_is_protected_and_only_accessible_within_the_class_declaration: { code: 2674, category: ts.DiagnosticCategory.Error, key: "Constructor_of_class_0_is_protected_and_only_accessible_within_the_class_declaration_2674", message: "Constructor of class '{0}' is protected and only accessible within the class declaration." },
+        Cannot_extend_a_class_0_Class_constructor_is_marked_as_private: { code: 2675, category: ts.DiagnosticCategory.Error, key: "Cannot_extend_a_class_0_Class_constructor_is_marked_as_private_2675", message: "Cannot extend a class '{0}'. Class constructor is marked as private." },
+        Accessors_must_both_be_abstract_or_non_abstract: { code: 2676, category: ts.DiagnosticCategory.Error, key: "Accessors_must_both_be_abstract_or_non_abstract_2676", message: "Accessors must both be abstract or non-abstract." },
+        A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type: { code: 2677, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type_2677", message: "A type predicate's type must be assignable to its parameter's type." },
+        Type_0_is_not_comparable_to_type_1: { code: 2678, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_comparable_to_type_1_2678", message: "Type '{0}' is not comparable to type '{1}'." },
+        A_function_that_is_called_with_the_new_keyword_cannot_have_a_this_type_that_is_void: { code: 2679, category: ts.DiagnosticCategory.Error, key: "A_function_that_is_called_with_the_new_keyword_cannot_have_a_this_type_that_is_void_2679", message: "A function that is called with the 'new' keyword cannot have a 'this' type that is 'void'." },
+        A_this_parameter_must_be_the_first_parameter: { code: 2680, category: ts.DiagnosticCategory.Error, key: "A_this_parameter_must_be_the_first_parameter_2680", message: "A 'this' parameter must be the first parameter." },
+        A_constructor_cannot_have_a_this_parameter: { code: 2681, category: ts.DiagnosticCategory.Error, key: "A_constructor_cannot_have_a_this_parameter_2681", message: "A constructor cannot have a 'this' parameter." },
+        A_setter_cannot_have_a_this_parameter: { code: 2682, category: ts.DiagnosticCategory.Error, key: "A_setter_cannot_have_a_this_parameter_2682", message: "A setter cannot have a 'this' parameter." },
+        this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation: { code: 2683, category: ts.DiagnosticCategory.Error, key: "this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_2683", message: "'this' implicitly has type 'any' because it does not have a type annotation." },
+        The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1: { code: 2684, category: ts.DiagnosticCategory.Error, key: "The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1_2684", message: "The 'this' context of type '{0}' is not assignable to method's 'this' of type '{1}'." },
+        The_this_types_of_each_signature_are_incompatible: { code: 2685, category: ts.DiagnosticCategory.Error, key: "The_this_types_of_each_signature_are_incompatible_2685", message: "The 'this' types of each signature are incompatible." },
         Import_declaration_0_is_using_private_name_1: { code: 4000, category: ts.DiagnosticCategory.Error, key: "Import_declaration_0_is_using_private_name_1_4000", message: "Import declaration '{0}' is using private name '{1}'." },
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", message: "Type parameter '{0}' of exported class has or is using private name '{1}'." },
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", message: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
@@ -2718,6 +2833,7 @@ var ts;
         Parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4078, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_exported_function_has_or_is_using_private_name_1_4078", message: "Parameter '{0}' of exported function has or is using private name '{1}'." },
         Exported_type_alias_0_has_or_is_using_private_name_1: { code: 4081, category: ts.DiagnosticCategory.Error, key: "Exported_type_alias_0_has_or_is_using_private_name_1_4081", message: "Exported type alias '{0}' has or is using private name '{1}'." },
         Default_export_of_the_module_has_or_is_using_private_name_0: { code: 4082, category: ts.DiagnosticCategory.Error, key: "Default_export_of_the_module_has_or_is_using_private_name_0_4082", message: "Default export of the module has or is using private name '{0}'." },
+        Conflicting_library_definitions_for_0_found_at_1_and_2_Copy_the_correct_file_to_the_typings_folder_to_resolve_this_conflict: { code: 4090, category: ts.DiagnosticCategory.Message, key: "Conflicting_library_definitions_for_0_found_at_1_and_2_Copy_the_correct_file_to_the_typings_folder_t_4090", message: "Conflicting library definitions for '{0}' found at '{1}' and '{2}'. Copy the correct file to the 'typings' folder to resolve this conflict." },
         The_current_host_does_not_support_the_0_option: { code: 5001, category: ts.DiagnosticCategory.Error, key: "The_current_host_does_not_support_the_0_option_5001", message: "The current host does not support the '{0}' option." },
         Cannot_find_the_common_subdirectory_path_for_the_input_files: { code: 5009, category: ts.DiagnosticCategory.Error, key: "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", message: "Cannot find the common subdirectory path for the input files." },
         Cannot_read_file_0_Colon_1: { code: 5012, category: ts.DiagnosticCategory.Error, key: "Cannot_read_file_0_Colon_1_5012", message: "Cannot read file '{0}': {1}" },
@@ -2736,11 +2852,14 @@ var ts;
         Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files: { code: 5056, category: ts.DiagnosticCategory.Error, key: "Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files_5056", message: "Cannot write file '{0}' because it would be overwritten by multiple input files." },
         Cannot_find_a_tsconfig_json_file_at_the_specified_directory_Colon_0: { code: 5057, category: ts.DiagnosticCategory.Error, key: "Cannot_find_a_tsconfig_json_file_at_the_specified_directory_Colon_0_5057", message: "Cannot find a tsconfig.json file at the specified directory: '{0}'" },
         The_specified_path_does_not_exist_Colon_0: { code: 5058, category: ts.DiagnosticCategory.Error, key: "The_specified_path_does_not_exist_Colon_0_5058", message: "The specified path does not exist: '{0}'" },
-        Invalide_value_for_reactNamespace_0_is_not_a_valid_identifier: { code: 5059, category: ts.DiagnosticCategory.Error, key: "Invalide_value_for_reactNamespace_0_is_not_a_valid_identifier_5059", message: "Invalide value for '--reactNamespace'. '{0}' is not a valid identifier." },
+        Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier: { code: 5059, category: ts.DiagnosticCategory.Error, key: "Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier_5059", message: "Invalid value for '--reactNamespace'. '{0}' is not a valid identifier." },
+        Option_paths_cannot_be_used_without_specifying_baseUrl_option: { code: 5060, category: ts.DiagnosticCategory.Error, key: "Option_paths_cannot_be_used_without_specifying_baseUrl_option_5060", message: "Option 'paths' cannot be used without specifying '--baseUrl' option." },
+        Pattern_0_can_have_at_most_one_Asterisk_character: { code: 5061, category: ts.DiagnosticCategory.Error, key: "Pattern_0_can_have_at_most_one_Asterisk_character_5061", message: "Pattern '{0}' can have at most one '*' character" },
+        Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character: { code: 5062, category: ts.DiagnosticCategory.Error, key: "Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character_5062", message: "Substitution '{0}' in pattern '{1}' in can have at most one '*' character" },
         Concatenate_and_emit_output_to_single_file: { code: 6001, category: ts.DiagnosticCategory.Message, key: "Concatenate_and_emit_output_to_single_file_6001", message: "Concatenate and emit output to single file." },
         Generates_corresponding_d_ts_file: { code: 6002, category: ts.DiagnosticCategory.Message, key: "Generates_corresponding_d_ts_file_6002", message: "Generates corresponding '.d.ts' file." },
-        Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: ts.DiagnosticCategory.Message, key: "Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations_6003", message: "Specifies the location where debugger should locate map files instead of generated locations." },
-        Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: { code: 6004, category: ts.DiagnosticCategory.Message, key: "Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations_6004", message: "Specifies the location where debugger should locate TypeScript files instead of source locations." },
+        Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: ts.DiagnosticCategory.Message, key: "Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations_6003", message: "Specify the location where debugger should locate map files instead of generated locations." },
+        Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: { code: 6004, category: ts.DiagnosticCategory.Message, key: "Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations_6004", message: "Specify the location where debugger should locate TypeScript files instead of source locations." },
         Watch_input_files: { code: 6005, category: ts.DiagnosticCategory.Message, key: "Watch_input_files_6005", message: "Watch input files." },
         Redirect_output_structure_to_the_directory: { code: 6006, category: ts.DiagnosticCategory.Message, key: "Redirect_output_structure_to_the_directory_6006", message: "Redirect output structure to the directory." },
         Do_not_erase_const_enum_declarations_in_generated_code: { code: 6007, category: ts.DiagnosticCategory.Message, key: "Do_not_erase_const_enum_declarations_in_generated_code_6007", message: "Do not erase const enum declarations in generated code." },
@@ -2748,7 +2867,7 @@ var ts;
         Do_not_emit_comments_to_output: { code: 6009, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_comments_to_output_6009", message: "Do not emit comments to output." },
         Do_not_emit_outputs: { code: 6010, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_outputs_6010", message: "Do not emit outputs." },
         Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking: { code: 6011, category: ts.DiagnosticCategory.Message, key: "Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typech_6011", message: "Allow default imports from modules with no default export. This does not affect code emit, just typechecking." },
-        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental: { code: 6015, category: ts.DiagnosticCategory.Message, key: "Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental_6015", message: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES2015' (experimental)" },
+        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015: { code: 6015, category: ts.DiagnosticCategory.Message, key: "Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_6015", message: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES2015'" },
         Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015: { code: 6016, category: ts.DiagnosticCategory.Message, key: "Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015_6016", message: "Specify module code generation: 'commonjs', 'amd', 'system', 'umd' or 'es2015'" },
         Print_this_message: { code: 6017, category: ts.DiagnosticCategory.Message, key: "Print_this_message_6017", message: "Print this message." },
         Print_the_compiler_s_version: { code: 6019, category: ts.DiagnosticCategory.Message, key: "Print_the_compiler_s_version_6019", message: "Print the compiler's version." },
@@ -2770,8 +2889,7 @@ var ts;
         Generates_corresponding_map_file: { code: 6043, category: ts.DiagnosticCategory.Message, key: "Generates_corresponding_map_file_6043", message: "Generates corresponding '.map' file." },
         Compiler_option_0_expects_an_argument: { code: 6044, category: ts.DiagnosticCategory.Error, key: "Compiler_option_0_expects_an_argument_6044", message: "Compiler option '{0}' expects an argument." },
         Unterminated_quoted_string_in_response_file_0: { code: 6045, category: ts.DiagnosticCategory.Error, key: "Unterminated_quoted_string_in_response_file_0_6045", message: "Unterminated quoted string in response file '{0}'." },
-        Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015: { code: 6046, category: ts.DiagnosticCategory.Error, key: "Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015_6046", message: "Argument for '--module' option must be 'commonjs', 'amd', 'system', 'umd', or 'es2015'." },
-        Argument_for_target_option_must_be_ES3_ES5_or_ES2015: { code: 6047, category: ts.DiagnosticCategory.Error, key: "Argument_for_target_option_must_be_ES3_ES5_or_ES2015_6047", message: "Argument for '--target' option must be 'ES3', 'ES5', or 'ES2015'." },
+        Argument_for_0_option_must_be_Colon_1: { code: 6046, category: ts.DiagnosticCategory.Error, key: "Argument_for_0_option_must_be_Colon_1_6046", message: "Argument for '{0}' option must be: {1}" },
         Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1: { code: 6048, category: ts.DiagnosticCategory.Error, key: "Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1_6048", message: "Locale must be of the form <language> or <language>-<territory>. For example '{0}' or '{1}'." },
         Unsupported_locale_0: { code: 6049, category: ts.DiagnosticCategory.Error, key: "Unsupported_locale_0_6049", message: "Unsupported locale '{0}'." },
         Unable_to_open_file_0: { code: 6050, category: ts.DiagnosticCategory.Error, key: "Unable_to_open_file_0_6050", message: "Unable to open file '{0}'." },
@@ -2781,16 +2899,15 @@ var ts;
         File_0_has_unsupported_extension_The_only_supported_extensions_are_1: { code: 6054, category: ts.DiagnosticCategory.Error, key: "File_0_has_unsupported_extension_The_only_supported_extensions_are_1_6054", message: "File '{0}' has unsupported extension. The only supported extensions are {1}." },
         Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures: { code: 6055, category: ts.DiagnosticCategory.Message, key: "Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures_6055", message: "Suppress noImplicitAny errors for indexing objects lacking index signatures." },
         Do_not_emit_declarations_for_code_that_has_an_internal_annotation: { code: 6056, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_declarations_for_code_that_has_an_internal_annotation_6056", message: "Do not emit declarations for code that has an '@internal' annotation." },
-        Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir: { code: 6058, category: ts.DiagnosticCategory.Message, key: "Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDi_6058", message: "Specifies the root directory of input files. Use to control the output directory structure with --outDir." },
+        Specify_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir: { code: 6058, category: ts.DiagnosticCategory.Message, key: "Specify_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir_6058", message: "Specify the root directory of input files. Use to control the output directory structure with --outDir." },
         File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files: { code: 6059, category: ts.DiagnosticCategory.Error, key: "File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files_6059", message: "File '{0}' is not under 'rootDir' '{1}'. 'rootDir' is expected to contain all source files." },
-        Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix: { code: 6060, category: ts.DiagnosticCategory.Message, key: "Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix_6060", message: "Specifies the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix)." },
+        Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix: { code: 6060, category: ts.DiagnosticCategory.Message, key: "Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix_6060", message: "Specify the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix)." },
         NEWLINE: { code: 6061, category: ts.DiagnosticCategory.Message, key: "NEWLINE_6061", message: "NEWLINE" },
-        Argument_for_newLine_option_must_be_CRLF_or_LF: { code: 6062, category: ts.DiagnosticCategory.Error, key: "Argument_for_newLine_option_must_be_CRLF_or_LF_6062", message: "Argument for '--newLine' option must be 'CRLF' or 'LF'." },
-        Argument_for_moduleResolution_option_must_be_node_or_classic: { code: 6063, category: ts.DiagnosticCategory.Error, key: "Argument_for_moduleResolution_option_must_be_node_or_classic_6063", message: "Argument for '--moduleResolution' option must be 'node' or 'classic'." },
+        Option_0_can_only_be_specified_in_tsconfig_json_file: { code: 6064, category: ts.DiagnosticCategory.Error, key: "Option_0_can_only_be_specified_in_tsconfig_json_file_6064", message: "Option '{0}' can only be specified in 'tsconfig.json' file." },
         Enables_experimental_support_for_ES7_decorators: { code: 6065, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_ES7_decorators_6065", message: "Enables experimental support for ES7 decorators." },
         Enables_experimental_support_for_emitting_type_metadata_for_decorators: { code: 6066, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_emitting_type_metadata_for_decorators_6066", message: "Enables experimental support for emitting type metadata for decorators." },
         Enables_experimental_support_for_ES7_async_functions: { code: 6068, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_ES7_async_functions_6068", message: "Enables experimental support for ES7 async functions." },
-        Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6: { code: 6069, category: ts.DiagnosticCategory.Message, key: "Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6_6069", message: "Specifies module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6)." },
+        Specify_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6: { code: 6069, category: ts.DiagnosticCategory.Message, key: "Specify_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6_6069", message: "Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6)." },
         Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file: { code: 6070, category: ts.DiagnosticCategory.Message, key: "Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file_6070", message: "Initializes a TypeScript project and creates a tsconfig.json file." },
         Successfully_created_a_tsconfig_json_file: { code: 6071, category: ts.DiagnosticCategory.Message, key: "Successfully_created_a_tsconfig_json_file_6071", message: "Successfully created a tsconfig.json file." },
         Suppress_excess_property_checks_for_object_literals: { code: 6072, category: ts.DiagnosticCategory.Message, key: "Suppress_excess_property_checks_for_object_literals_6072", message: "Suppress excess property checks for object literals." },
@@ -2800,11 +2917,55 @@ var ts;
         Report_errors_for_fallthrough_cases_in_switch_statement: { code: 6076, category: ts.DiagnosticCategory.Message, key: "Report_errors_for_fallthrough_cases_in_switch_statement_6076", message: "Report errors for fallthrough cases in switch statement." },
         Do_not_report_errors_on_unreachable_code: { code: 6077, category: ts.DiagnosticCategory.Message, key: "Do_not_report_errors_on_unreachable_code_6077", message: "Do not report errors on unreachable code." },
         Disallow_inconsistently_cased_references_to_the_same_file: { code: 6078, category: ts.DiagnosticCategory.Message, key: "Disallow_inconsistently_cased_references_to_the_same_file_6078", message: "Disallow inconsistently-cased references to the same file." },
+        Specify_library_files_to_be_included_in_the_compilation_Colon: { code: 6079, category: ts.DiagnosticCategory.Message, key: "Specify_library_files_to_be_included_in_the_compilation_Colon_6079", message: "Specify library files to be included in the compilation: " },
         Specify_JSX_code_generation_Colon_preserve_or_react: { code: 6080, category: ts.DiagnosticCategory.Message, key: "Specify_JSX_code_generation_Colon_preserve_or_react_6080", message: "Specify JSX code generation: 'preserve' or 'react'" },
-        Argument_for_jsx_must_be_preserve_or_react: { code: 6081, category: ts.DiagnosticCategory.Message, key: "Argument_for_jsx_must_be_preserve_or_react_6081", message: "Argument for '--jsx' must be 'preserve' or 'react'." },
         Only_amd_and_system_modules_are_supported_alongside_0: { code: 6082, category: ts.DiagnosticCategory.Error, key: "Only_amd_and_system_modules_are_supported_alongside_0_6082", message: "Only 'amd' and 'system' modules are supported alongside --{0}." },
-        Allow_javascript_files_to_be_compiled: { code: 6083, category: ts.DiagnosticCategory.Message, key: "Allow_javascript_files_to_be_compiled_6083", message: "Allow javascript files to be compiled." },
-        Specifies_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit: { code: 6084, category: ts.DiagnosticCategory.Message, key: "Specifies_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit_6084", message: "Specifies the object invoked for createElement and __spread when targeting 'react' JSX emit" },
+        Base_directory_to_resolve_non_absolute_module_names: { code: 6083, category: ts.DiagnosticCategory.Message, key: "Base_directory_to_resolve_non_absolute_module_names_6083", message: "Base directory to resolve non-absolute module names." },
+        Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit: { code: 6084, category: ts.DiagnosticCategory.Message, key: "Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit_6084", message: "Specify the object invoked for createElement and __spread when targeting 'react' JSX emit" },
+        Enable_tracing_of_the_name_resolution_process: { code: 6085, category: ts.DiagnosticCategory.Message, key: "Enable_tracing_of_the_name_resolution_process_6085", message: "Enable tracing of the name resolution process." },
+        Resolving_module_0_from_1: { code: 6086, category: ts.DiagnosticCategory.Message, key: "Resolving_module_0_from_1_6086", message: "======== Resolving module '{0}' from '{1}'. ========" },
+        Explicitly_specified_module_resolution_kind_Colon_0: { code: 6087, category: ts.DiagnosticCategory.Message, key: "Explicitly_specified_module_resolution_kind_Colon_0_6087", message: "Explicitly specified module resolution kind: '{0}'." },
+        Module_resolution_kind_is_not_specified_using_0: { code: 6088, category: ts.DiagnosticCategory.Message, key: "Module_resolution_kind_is_not_specified_using_0_6088", message: "Module resolution kind is not specified, using '{0}'." },
+        Module_name_0_was_successfully_resolved_to_1: { code: 6089, category: ts.DiagnosticCategory.Message, key: "Module_name_0_was_successfully_resolved_to_1_6089", message: "======== Module name '{0}' was successfully resolved to '{1}'. ========" },
+        Module_name_0_was_not_resolved: { code: 6090, category: ts.DiagnosticCategory.Message, key: "Module_name_0_was_not_resolved_6090", message: "======== Module name '{0}' was not resolved. ========" },
+        paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0: { code: 6091, category: ts.DiagnosticCategory.Message, key: "paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0_6091", message: "'paths' option is specified, looking for a pattern to match module name '{0}'." },
+        Module_name_0_matched_pattern_1: { code: 6092, category: ts.DiagnosticCategory.Message, key: "Module_name_0_matched_pattern_1_6092", message: "Module name '{0}', matched pattern '{1}'." },
+        Trying_substitution_0_candidate_module_location_Colon_1: { code: 6093, category: ts.DiagnosticCategory.Message, key: "Trying_substitution_0_candidate_module_location_Colon_1_6093", message: "Trying substitution '{0}', candidate module location: '{1}'." },
+        Resolving_module_name_0_relative_to_base_url_1_2: { code: 6094, category: ts.DiagnosticCategory.Message, key: "Resolving_module_name_0_relative_to_base_url_1_2_6094", message: "Resolving module name '{0}' relative to base url '{1}' - '{2}'." },
+        Loading_module_as_file_Slash_folder_candidate_module_location_0: { code: 6095, category: ts.DiagnosticCategory.Message, key: "Loading_module_as_file_Slash_folder_candidate_module_location_0_6095", message: "Loading module as file / folder, candidate module location '{0}'." },
+        File_0_does_not_exist: { code: 6096, category: ts.DiagnosticCategory.Message, key: "File_0_does_not_exist_6096", message: "File '{0}' does not exist." },
+        File_0_exist_use_it_as_a_name_resolution_result: { code: 6097, category: ts.DiagnosticCategory.Message, key: "File_0_exist_use_it_as_a_name_resolution_result_6097", message: "File '{0}' exist - use it as a name resolution result." },
+        Loading_module_0_from_node_modules_folder: { code: 6098, category: ts.DiagnosticCategory.Message, key: "Loading_module_0_from_node_modules_folder_6098", message: "Loading module '{0}' from 'node_modules' folder." },
+        Found_package_json_at_0: { code: 6099, category: ts.DiagnosticCategory.Message, key: "Found_package_json_at_0_6099", message: "Found 'package.json' at '{0}'." },
+        package_json_does_not_have_types_field: { code: 6100, category: ts.DiagnosticCategory.Message, key: "package_json_does_not_have_types_field_6100", message: "'package.json' does not have 'types' field." },
+        package_json_has_0_field_1_that_references_2: { code: 6101, category: ts.DiagnosticCategory.Message, key: "package_json_has_0_field_1_that_references_2_6101", message: "'package.json' has '{0}' field '{1}' that references '{2}'." },
+        Allow_javascript_files_to_be_compiled: { code: 6102, category: ts.DiagnosticCategory.Message, key: "Allow_javascript_files_to_be_compiled_6102", message: "Allow javascript files to be compiled." },
+        Option_0_should_have_array_of_strings_as_a_value: { code: 6103, category: ts.DiagnosticCategory.Error, key: "Option_0_should_have_array_of_strings_as_a_value_6103", message: "Option '{0}' should have array of strings as a value." },
+        Checking_if_0_is_the_longest_matching_prefix_for_1_2: { code: 6104, category: ts.DiagnosticCategory.Message, key: "Checking_if_0_is_the_longest_matching_prefix_for_1_2_6104", message: "Checking if '{0}' is the longest matching prefix for '{1}' - '{2}'." },
+        Expected_type_of_0_field_in_package_json_to_be_string_got_1: { code: 6105, category: ts.DiagnosticCategory.Message, key: "Expected_type_of_0_field_in_package_json_to_be_string_got_1_6105", message: "Expected type of '{0}' field in 'package.json' to be 'string', got '{1}'." },
+        baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1: { code: 6106, category: ts.DiagnosticCategory.Message, key: "baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1_6106", message: "'baseUrl' option is set to '{0}', using this value to resolve non-relative module name '{1}'" },
+        rootDirs_option_is_set_using_it_to_resolve_relative_module_name_0: { code: 6107, category: ts.DiagnosticCategory.Message, key: "rootDirs_option_is_set_using_it_to_resolve_relative_module_name_0_6107", message: "'rootDirs' option is set, using it to resolve relative module name '{0}'" },
+        Longest_matching_prefix_for_0_is_1: { code: 6108, category: ts.DiagnosticCategory.Message, key: "Longest_matching_prefix_for_0_is_1_6108", message: "Longest matching prefix for '{0}' is '{1}'" },
+        Loading_0_from_the_root_dir_1_candidate_location_2: { code: 6109, category: ts.DiagnosticCategory.Message, key: "Loading_0_from_the_root_dir_1_candidate_location_2_6109", message: "Loading '{0}' from the root dir '{1}', candidate location '{2}'" },
+        Trying_other_entries_in_rootDirs: { code: 6110, category: ts.DiagnosticCategory.Message, key: "Trying_other_entries_in_rootDirs_6110", message: "Trying other entries in 'rootDirs'" },
+        Module_resolution_using_rootDirs_has_failed: { code: 6111, category: ts.DiagnosticCategory.Message, key: "Module_resolution_using_rootDirs_has_failed_6111", message: "Module resolution using 'rootDirs' has failed" },
+        Do_not_emit_use_strict_directives_in_module_output: { code: 6112, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_use_strict_directives_in_module_output_6112", message: "Do not emit 'use strict' directives in module output." },
+        Enable_strict_null_checks: { code: 6113, category: ts.DiagnosticCategory.Message, key: "Enable_strict_null_checks_6113", message: "Enable strict null checks." },
+        Unknown_option_excludes_Did_you_mean_exclude: { code: 6114, category: ts.DiagnosticCategory.Error, key: "Unknown_option_excludes_Did_you_mean_exclude_6114", message: "Unknown option 'excludes'. Did you mean 'exclude'?" },
+        Raise_error_on_this_expressions_with_an_implied_any_type: { code: 6115, category: ts.DiagnosticCategory.Message, key: "Raise_error_on_this_expressions_with_an_implied_any_type_6115", message: "Raise error on 'this' expressions with an implied 'any' type." },
+        Resolving_type_reference_directive_0_containing_file_1_root_directory_2: { code: 6116, category: ts.DiagnosticCategory.Message, key: "Resolving_type_reference_directive_0_containing_file_1_root_directory_2_6116", message: "======== Resolving type reference directive '{0}', containing file '{1}', root directory '{2}'. ========" },
+        Resolving_using_primary_search_paths: { code: 6117, category: ts.DiagnosticCategory.Message, key: "Resolving_using_primary_search_paths_6117", message: "Resolving using primary search paths..." },
+        Resolving_from_node_modules_folder: { code: 6118, category: ts.DiagnosticCategory.Message, key: "Resolving_from_node_modules_folder_6118", message: "Resolving from node_modules folder..." },
+        Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2: { code: 6119, category: ts.DiagnosticCategory.Message, key: "Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2_6119", message: "======== Type reference directive '{0}' was successfully resolved to '{1}', primary: {2}. ========" },
+        Type_reference_directive_0_was_not_resolved: { code: 6120, category: ts.DiagnosticCategory.Message, key: "Type_reference_directive_0_was_not_resolved_6120", message: "======== Type reference directive '{0}' was not resolved. ========" },
+        Resolving_with_primary_search_path_0: { code: 6121, category: ts.DiagnosticCategory.Message, key: "Resolving_with_primary_search_path_0_6121", message: "Resolving with primary search path '{0}'" },
+        Root_directory_cannot_be_determined_skipping_primary_search_paths: { code: 6122, category: ts.DiagnosticCategory.Message, key: "Root_directory_cannot_be_determined_skipping_primary_search_paths_6122", message: "Root directory cannot be determined, skipping primary search paths." },
+        Resolving_type_reference_directive_0_containing_file_1_root_directory_not_set: { code: 6123, category: ts.DiagnosticCategory.Message, key: "Resolving_type_reference_directive_0_containing_file_1_root_directory_not_set_6123", message: "======== Resolving type reference directive '{0}', containing file '{1}', root directory not set. ========" },
+        Type_declaration_files_to_be_included_in_compilation: { code: 6124, category: ts.DiagnosticCategory.Message, key: "Type_declaration_files_to_be_included_in_compilation_6124", message: "Type declaration files to be included in compilation." },
+        Looking_up_in_node_modules_folder_initial_location_0: { code: 6125, category: ts.DiagnosticCategory.Message, key: "Looking_up_in_node_modules_folder_initial_location_0_6125", message: "Looking up in 'node_modules' folder, initial location '{0}'" },
+        Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder: { code: 6126, category: ts.DiagnosticCategory.Message, key: "Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_mod_6126", message: "Containing file is not specified and root directory cannot be determined, skipping lookup in 'node_modules' folder." },
+        Resolving_type_reference_directive_0_containing_file_not_set_root_directory_1: { code: 6127, category: ts.DiagnosticCategory.Message, key: "Resolving_type_reference_directive_0_containing_file_not_set_root_directory_1_6127", message: "======== Resolving type reference directive '{0}', containing file not set, root directory '{1}'. ========" },
+        Resolving_type_reference_directive_0_containing_file_not_set_root_directory_not_set: { code: 6128, category: ts.DiagnosticCategory.Message, key: "Resolving_type_reference_directive_0_containing_file_not_set_root_directory_not_set_6128", message: "======== Resolving type reference directive '{0}', containing file not set, root directory not set. ========" },
         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." },
         Parameter_0_implicitly_has_an_1_type: { code: 7006, category: ts.DiagnosticCategory.Error, key: "Parameter_0_implicitly_has_an_1_type_7006", message: "Parameter '{0}' implicitly has an '{1}' type." },
         Member_0_implicitly_has_an_1_type: { code: 7008, category: ts.DiagnosticCategory.Error, key: "Member_0_implicitly_has_an_1_type_7008", message: "Member '{0}' implicitly has an '{1}' type." },
@@ -2827,6 +2988,7 @@ var ts;
         Unused_label: { code: 7028, category: ts.DiagnosticCategory.Error, key: "Unused_label_7028", message: "Unused label." },
         Fallthrough_case_in_switch: { code: 7029, category: ts.DiagnosticCategory.Error, key: "Fallthrough_case_in_switch_7029", message: "Fallthrough case in switch." },
         Not_all_code_paths_return_a_value: { code: 7030, category: ts.DiagnosticCategory.Error, key: "Not_all_code_paths_return_a_value_7030", message: "Not all code paths return a value." },
+        Binding_element_0_implicitly_has_an_1_type: { code: 7031, category: ts.DiagnosticCategory.Error, key: "Binding_element_0_implicitly_has_an_1_type_7031", message: "Binding element '{0}' implicitly has an '{1}' type." },
         You_cannot_rename_this_element: { code: 8000, category: ts.DiagnosticCategory.Error, key: "You_cannot_rename_this_element_8000", message: "You cannot rename this element." },
         You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: { code: 8001, category: ts.DiagnosticCategory.Error, key: "You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library_8001", message: "You cannot rename elements that are defined in the standard TypeScript library." },
         import_can_only_be_used_in_a_ts_file: { code: 8002, category: ts.DiagnosticCategory.Error, key: "import_can_only_be_used_in_a_ts_file_8002", message: "'import ... =' can only be used in a .ts file." },
@@ -2843,7 +3005,6 @@ var ts;
         property_declarations_can_only_be_used_in_a_ts_file: { code: 8014, category: ts.DiagnosticCategory.Error, key: "property_declarations_can_only_be_used_in_a_ts_file_8014", message: "'property declarations' can only be used in a .ts file." },
         enum_declarations_can_only_be_used_in_a_ts_file: { code: 8015, category: ts.DiagnosticCategory.Error, key: "enum_declarations_can_only_be_used_in_a_ts_file_8015", message: "'enum declarations' can only be used in a .ts file." },
         type_assertion_expressions_can_only_be_used_in_a_ts_file: { code: 8016, category: ts.DiagnosticCategory.Error, key: "type_assertion_expressions_can_only_be_used_in_a_ts_file_8016", message: "'type assertion expressions' can only be used in a .ts file." },
-        decorators_can_only_be_used_in_a_ts_file: { code: 8017, category: ts.DiagnosticCategory.Error, key: "decorators_can_only_be_used_in_a_ts_file_8017", message: "'decorators' can only be used in a .ts file." },
         Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_class_extends_clauses: { code: 9002, category: ts.DiagnosticCategory.Error, key: "Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_clas_9002", message: "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses." },
         class_expressions_are_not_currently_supported: { code: 9003, category: ts.DiagnosticCategory.Error, key: "class_expressions_are_not_currently_supported_9003", message: "'class' expressions are not currently supported." },
         JSX_attributes_must_only_be_assigned_a_non_empty_expression: { code: 17000, category: ts.DiagnosticCategory.Error, key: "JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000", message: "JSX attributes must only be assigned a non-empty 'expression'." },
@@ -2854,7 +3015,9 @@ var ts;
         A_constructor_cannot_contain_a_super_call_when_its_class_extends_null: { code: 17005, category: ts.DiagnosticCategory.Error, key: "A_constructor_cannot_contain_a_super_call_when_its_class_extends_null_17005", message: "A constructor cannot contain a 'super' call when its class extends 'null'" },
         An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17006, category: ts.DiagnosticCategory.Error, key: "An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_ex_17006", message: "An unary expression with the '{0}' operator is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." },
         A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17007, category: ts.DiagnosticCategory.Error, key: "A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Con_17007", message: "A type assertion expression is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." },
-        JSX_element_0_has_no_corresponding_closing_tag: { code: 17008, category: ts.DiagnosticCategory.Error, key: "JSX_element_0_has_no_corresponding_closing_tag_17008", message: "JSX element '{0}' has no corresponding closing tag." }
+        JSX_element_0_has_no_corresponding_closing_tag: { code: 17008, category: ts.DiagnosticCategory.Error, key: "JSX_element_0_has_no_corresponding_closing_tag_17008", message: "JSX element '{0}' has no corresponding closing tag." },
+        super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class: { code: 17009, category: ts.DiagnosticCategory.Error, key: "super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class_17009", message: "'super' must be called before accessing 'this' in the constructor of a derived class." },
+        Unknown_typing_option_0: { code: 17010, category: ts.DiagnosticCategory.Error, key: "Unknown_typing_option_0_17010", message: "Unknown typing option '{0}'." }
     };
 })(ts || (ts = {}));
 /// <reference path="core.ts"/>
@@ -2890,7 +3053,7 @@ var ts;
         "false": 84 /* FalseKeyword */,
         "finally": 85 /* FinallyKeyword */,
         "for": 86 /* ForKeyword */,
-        "from": 133 /* FromKeyword */,
+        "from": 135 /* FromKeyword */,
         "function": 87 /* FunctionKeyword */,
         "get": 123 /* GetKeyword */,
         "if": 88 /* IfKeyword */,
@@ -2905,26 +3068,28 @@ var ts;
         "namespace": 126 /* NamespaceKeyword */,
         "new": 92 /* NewKeyword */,
         "null": 93 /* NullKeyword */,
-        "number": 128 /* NumberKeyword */,
+        "number": 129 /* NumberKeyword */,
         "package": 109 /* PackageKeyword */,
         "private": 110 /* PrivateKeyword */,
         "protected": 111 /* ProtectedKeyword */,
         "public": 112 /* PublicKeyword */,
-        "require": 127 /* RequireKeyword */,
-        "global": 134 /* GlobalKeyword */,
+        "readonly": 127 /* ReadonlyKeyword */,
+        "require": 128 /* RequireKeyword */,
+        "global": 136 /* GlobalKeyword */,
         "return": 94 /* ReturnKeyword */,
-        "set": 129 /* SetKeyword */,
+        "set": 130 /* SetKeyword */,
         "static": 113 /* StaticKeyword */,
-        "string": 130 /* StringKeyword */,
+        "string": 131 /* StringKeyword */,
         "super": 95 /* SuperKeyword */,
         "switch": 96 /* SwitchKeyword */,
-        "symbol": 131 /* SymbolKeyword */,
+        "symbol": 132 /* SymbolKeyword */,
         "this": 97 /* ThisKeyword */,
         "throw": 98 /* ThrowKeyword */,
         "true": 99 /* TrueKeyword */,
         "try": 100 /* TryKeyword */,
-        "type": 132 /* TypeKeyword */,
+        "type": 133 /* TypeKeyword */,
         "typeof": 101 /* TypeOfKeyword */,
+        "undefined": 134 /* UndefinedKeyword */,
         "var": 102 /* VarKeyword */,
         "void": 103 /* VoidKeyword */,
         "while": 104 /* WhileKeyword */,
@@ -2932,7 +3097,7 @@ var ts;
         "yield": 114 /* YieldKeyword */,
         "async": 118 /* AsyncKeyword */,
         "await": 119 /* AwaitKeyword */,
-        "of": 135 /* OfKeyword */,
+        "of": 137 /* OfKeyword */,
         "{": 15 /* OpenBraceToken */,
         "}": 16 /* CloseBraceToken */,
         "(": 17 /* OpenParenToken */,
@@ -3304,7 +3469,7 @@ var ts;
     }
     ts.skipTrivia = skipTrivia;
     // All conflict markers consist of the same character repeated seven times.  If it is
-    // a <<<<<<< or >>>>>>> marker then it is also followd by a space.
+    // a <<<<<<< or >>>>>>> marker then it is also followed by a space.
     var mergeConflictMarkerLength = "<<<<<<<".length;
     function isConflictMarkerTrivia(text, pos) {
         ts.Debug.assert(pos >= 0);
@@ -3336,7 +3501,7 @@ var ts;
         }
         else {
             ts.Debug.assert(ch === 61 /* equals */);
-            // Consume everything from the start of the mid-conlict marker to the start of the next
+            // Consume everything from the start of the mid-conflict marker to the start of the next
             // end-conflict marker.
             while (pos < len) {
                 var ch_1 = text.charCodeAt(pos);
@@ -3519,6 +3684,7 @@ var ts;
             scanJsxIdentifier: scanJsxIdentifier,
             reScanJsxToken: reScanJsxToken,
             scanJsxToken: scanJsxToken,
+            scanJSDocToken: scanJSDocToken,
             scan: scan,
             setText: setText,
             setScriptTarget: setScriptTarget,
@@ -3526,7 +3692,8 @@ var ts;
             setOnError: setOnError,
             setTextPos: setTextPos,
             tryScan: tryScan,
-            lookAhead: lookAhead
+            lookAhead: lookAhead,
+            scanRange: scanRange
         };
         function error(message, length) {
             if (onError) {
@@ -4348,7 +4515,7 @@ var ts;
                     break;
                 }
             }
-            return token = 239 /* JsxText */;
+            return token = 243 /* JsxText */;
         }
         // Scans a JSX identifier; these differ from normal identifiers in that
         // they allow dashes
@@ -4368,6 +4535,55 @@ var ts;
             }
             return token;
         }
+        function scanJSDocToken() {
+            if (pos >= end) {
+                return token = 1 /* EndOfFileToken */;
+            }
+            startPos = pos;
+            // Eat leading whitespace
+            var ch = text.charCodeAt(pos);
+            while (pos < end) {
+                ch = text.charCodeAt(pos);
+                if (isWhiteSpace(ch)) {
+                    pos++;
+                }
+                else {
+                    break;
+                }
+            }
+            tokenPos = pos;
+            switch (ch) {
+                case 64 /* at */:
+                    return pos += 1, token = 55 /* AtToken */;
+                case 10 /* lineFeed */:
+                case 13 /* carriageReturn */:
+                    return pos += 1, token = 4 /* NewLineTrivia */;
+                case 42 /* asterisk */:
+                    return pos += 1, token = 37 /* AsteriskToken */;
+                case 123 /* openBrace */:
+                    return pos += 1, token = 15 /* OpenBraceToken */;
+                case 125 /* closeBrace */:
+                    return pos += 1, token = 16 /* CloseBraceToken */;
+                case 91 /* openBracket */:
+                    return pos += 1, token = 19 /* OpenBracketToken */;
+                case 93 /* closeBracket */:
+                    return pos += 1, token = 20 /* CloseBracketToken */;
+                case 61 /* equals */:
+                    return pos += 1, token = 56 /* EqualsToken */;
+                case 44 /* comma */:
+                    return pos += 1, token = 24 /* CommaToken */;
+            }
+            if (isIdentifierStart(ch, 2 /* Latest */)) {
+                pos++;
+                while (isIdentifierPart(text.charCodeAt(pos), 2 /* Latest */) && pos < end) {
+                    pos++;
+                }
+                return token = 69 /* Identifier */;
+            }
+            else {
+                return pos += 1, token = 0 /* Unknown */;
+            }
+        }
         function speculationHelper(callback, isLookahead) {
             var savePos = pos;
             var saveStartPos = startPos;
@@ -4388,6 +4604,29 @@ var ts;
             }
             return result;
         }
+        function scanRange(start, length, callback) {
+            var saveEnd = end;
+            var savePos = pos;
+            var saveStartPos = startPos;
+            var saveTokenPos = tokenPos;
+            var saveToken = token;
+            var savePrecedingLineBreak = precedingLineBreak;
+            var saveTokenValue = tokenValue;
+            var saveHasExtendedUnicodeEscape = hasExtendedUnicodeEscape;
+            var saveTokenIsUnterminated = tokenIsUnterminated;
+            setText(text, start, length);
+            var result = callback();
+            end = saveEnd;
+            pos = savePos;
+            startPos = saveStartPos;
+            tokenPos = saveTokenPos;
+            token = saveToken;
+            precedingLineBreak = savePrecedingLineBreak;
+            tokenValue = saveTokenValue;
+            hasExtendedUnicodeEscape = saveHasExtendedUnicodeEscape;
+            tokenIsUnterminated = saveTokenIsUnterminated;
+            return result;
+        }
         function lookAhead(callback) {
             return speculationHelper(callback, /*isLookahead*/ true);
         }
@@ -4443,10 +4682,10 @@ var ts;
     var stringWriters = [];
     function getSingleLineStringWriter() {
         if (stringWriters.length === 0) {
-            var str = "";
-            var writeText = function (text) { return str += text; };
+            var str_1 = "";
+            var writeText = function (text) { return str_1 += text; };
             return {
-                string: function () { return str; },
+                string: function () { return str_1; },
                 writeKeyword: writeText,
                 writeOperator: writeText,
                 writePunctuation: writeText,
@@ -4456,10 +4695,10 @@ var ts;
                 writeSymbol: writeText,
                 // Completely ignore indentation for string writers.  And map newlines to
                 // a single space.
-                writeLine: function () { return str += " "; },
+                writeLine: function () { return str_1 += " "; },
                 increaseIndent: function () { },
                 decreaseIndent: function () { },
-                clear: function () { return str = ""; },
+                clear: function () { return str_1 = ""; },
                 trackSymbol: function () { },
                 reportInaccessibleThisError: function () { }
             };
@@ -4507,36 +4746,83 @@ var ts;
         sourceFile.resolvedModules[moduleNameText] = resolvedModule;
     }
     ts.setResolvedModule = setResolvedModule;
+    function setResolvedTypeReferenceDirective(sourceFile, typeReferenceDirectiveName, resolvedTypeReferenceDirective) {
+        if (!sourceFile.resolvedTypeReferenceDirectiveNames) {
+            sourceFile.resolvedTypeReferenceDirectiveNames = {};
+        }
+        sourceFile.resolvedTypeReferenceDirectiveNames[typeReferenceDirectiveName] = resolvedTypeReferenceDirective;
+    }
+    ts.setResolvedTypeReferenceDirective = setResolvedTypeReferenceDirective;
+    /* @internal */
+    function moduleResolutionIsEqualTo(oldResolution, newResolution) {
+        return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.isExternalLibraryImport === newResolution.isExternalLibraryImport;
+    }
+    ts.moduleResolutionIsEqualTo = moduleResolutionIsEqualTo;
+    /* @internal */
+    function typeDirectiveIsEqualTo(oldResolution, newResolution) {
+        return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.primary === newResolution.primary;
+    }
+    ts.typeDirectiveIsEqualTo = typeDirectiveIsEqualTo;
+    /* @internal */
+    function hasChangesInResolutions(names, newResolutions, oldResolutions, comparer) {
+        if (names.length !== newResolutions.length) {
+            return false;
+        }
+        for (var i = 0; i < names.length; i++) {
+            var newResolution = newResolutions[i];
+            var oldResolution = oldResolutions && ts.hasProperty(oldResolutions, names[i]) ? oldResolutions[names[i]] : undefined;
+            var changed = oldResolution
+                ? !newResolution || !comparer(oldResolution, newResolution)
+                : newResolution;
+            if (changed) {
+                return true;
+            }
+        }
+        return false;
+    }
+    ts.hasChangesInResolutions = hasChangesInResolutions;
     // Returns true if this node contains a parse error anywhere underneath it.
     function containsParseError(node) {
         aggregateChildData(node);
-        return (node.parserContextFlags & 64 /* ThisNodeOrAnySubNodesHasError */) !== 0;
+        return (node.flags & 268435456 /* ThisNodeOrAnySubNodesHasError */) !== 0;
     }
     ts.containsParseError = containsParseError;
     function aggregateChildData(node) {
-        if (!(node.parserContextFlags & 128 /* HasAggregatedChildData */)) {
+        if (!(node.flags & 536870912 /* HasAggregatedChildData */)) {
             // A node is considered to contain a parse error if:
             //  a) the parser explicitly marked that it had an error
             //  b) any of it's children reported that it had an error.
-            var thisNodeOrAnySubNodesHasError = ((node.parserContextFlags & 16 /* ThisNodeHasError */) !== 0) ||
+            var thisNodeOrAnySubNodesHasError = ((node.flags & 67108864 /* ThisNodeHasError */) !== 0) ||
                 ts.forEachChild(node, containsParseError);
             // If so, mark ourselves accordingly.
             if (thisNodeOrAnySubNodesHasError) {
-                node.parserContextFlags |= 64 /* ThisNodeOrAnySubNodesHasError */;
+                node.flags |= 268435456 /* ThisNodeOrAnySubNodesHasError */;
             }
-            // Also mark that we've propogated the child information to this node.  This way we can
+            // Also mark that we've propagated the child information to this node.  This way we can
             // always consult the bit directly on this node without needing to check its children
             // again.
-            node.parserContextFlags |= 128 /* HasAggregatedChildData */;
+            node.flags |= 536870912 /* HasAggregatedChildData */;
         }
     }
     function getSourceFileOfNode(node) {
-        while (node && node.kind !== 251 /* SourceFile */) {
+        while (node && node.kind !== 255 /* SourceFile */) {
             node = node.parent;
         }
         return node;
     }
     ts.getSourceFileOfNode = getSourceFileOfNode;
+    function isStatementWithLocals(node) {
+        switch (node.kind) {
+            case 198 /* Block */:
+            case 226 /* CaseBlock */:
+            case 205 /* ForStatement */:
+            case 206 /* ForInStatement */:
+            case 207 /* ForOfStatement */:
+                return true;
+        }
+        return false;
+    }
+    ts.isStatementWithLocals = isStatementWithLocals;
     function getStartPositionOfLine(line, sourceFile) {
         ts.Debug.assert(line >= 0);
         return ts.getLineStarts(sourceFile)[line];
@@ -4553,6 +4839,32 @@ var ts;
         return node.pos;
     }
     ts.getStartPosOfNode = getStartPosOfNode;
+    function getEndLinePosition(line, sourceFile) {
+        ts.Debug.assert(line >= 0);
+        var lineStarts = ts.getLineStarts(sourceFile);
+        var lineIndex = line;
+        var sourceText = sourceFile.text;
+        if (lineIndex + 1 === lineStarts.length) {
+            // last line - return EOF
+            return sourceText.length - 1;
+        }
+        else {
+            // current line start
+            var start = lineStarts[lineIndex];
+            // take the start position of the next line - 1 = it should be some line break
+            var pos = lineStarts[lineIndex + 1] - 1;
+            ts.Debug.assert(ts.isLineBreak(sourceText.charCodeAt(pos)));
+            // walk backwards skipping line breaks, stop the the beginning of current line.
+            // i.e:
+            // <some text>
+            // $ <- end of line for this position should match the start position
+            while (start <= pos && ts.isLineBreak(sourceText.charCodeAt(pos))) {
+                pos--;
+            }
+            return pos;
+        }
+    }
+    ts.getEndLinePosition = getEndLinePosition;
     // Returns true if this node is missing from the actual source code. A 'missing' node is different
     // from 'undefined/defined'. When a node is undefined (which can happen for optional nodes
     // in the tree), it is definitely missing. However, a node may be defined, but still be
@@ -4630,17 +4942,24 @@ var ts;
     }
     ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName;
     function isBlockOrCatchScoped(declaration) {
-        return (getCombinedNodeFlags(declaration) & 24576 /* BlockScoped */) !== 0 ||
+        return (getCombinedNodeFlags(declaration) & 3072 /* BlockScoped */) !== 0 ||
             isCatchClauseVariableDeclaration(declaration);
     }
     ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
     function isAmbientModule(node) {
-        return node && node.kind === 221 /* ModuleDeclaration */ &&
+        return node && node.kind === 224 /* ModuleDeclaration */ &&
             (node.name.kind === 9 /* StringLiteral */ || isGlobalScopeAugmentation(node));
     }
     ts.isAmbientModule = isAmbientModule;
+    function isBlockScopedContainerTopLevel(node) {
+        return node.kind === 255 /* SourceFile */ ||
+            node.kind === 224 /* ModuleDeclaration */ ||
+            isFunctionLike(node) ||
+            isFunctionBlock(node);
+    }
+    ts.isBlockScopedContainerTopLevel = isBlockScopedContainerTopLevel;
     function isGlobalScopeAugmentation(module) {
-        return !!(module.flags & 2097152 /* GlobalAugmentation */);
+        return !!(module.flags & 131072 /* GlobalAugmentation */);
     }
     ts.isGlobalScopeAugmentation = isGlobalScopeAugmentation;
     function isExternalModuleAugmentation(node) {
@@ -4651,10 +4970,10 @@ var ts;
             return false;
         }
         switch (node.parent.kind) {
-            case 251 /* SourceFile */:
-                return isExternalModule(node.parent);
-            case 222 /* ModuleBlock */:
-                return isAmbientModule(node.parent.parent) && !isExternalModule(node.parent.parent.parent);
+            case 255 /* SourceFile */:
+                return ts.isExternalModule(node.parent);
+            case 225 /* ModuleBlock */:
+                return isAmbientModule(node.parent.parent) && !ts.isExternalModule(node.parent.parent.parent);
         }
         return false;
     }
@@ -4668,15 +4987,15 @@ var ts;
                 return current;
             }
             switch (current.kind) {
-                case 251 /* SourceFile */:
-                case 223 /* CaseBlock */:
-                case 247 /* CatchClause */:
-                case 221 /* ModuleDeclaration */:
-                case 202 /* ForStatement */:
-                case 203 /* ForInStatement */:
-                case 204 /* ForOfStatement */:
+                case 255 /* SourceFile */:
+                case 226 /* CaseBlock */:
+                case 251 /* CatchClause */:
+                case 224 /* ModuleDeclaration */:
+                case 205 /* ForStatement */:
+                case 206 /* ForInStatement */:
+                case 207 /* ForOfStatement */:
                     return current;
-                case 195 /* Block */:
+                case 198 /* Block */:
                     // function block is not considered block-scope container
                     // see comment in binder.ts: bind(...), case for SyntaxKind.Block
                     if (!isFunctionLike(current.parent)) {
@@ -4689,9 +5008,9 @@ var ts;
     ts.getEnclosingBlockScopeContainer = getEnclosingBlockScopeContainer;
     function isCatchClauseVariableDeclaration(declaration) {
         return declaration &&
-            declaration.kind === 214 /* VariableDeclaration */ &&
+            declaration.kind === 217 /* VariableDeclaration */ &&
             declaration.parent &&
-            declaration.parent.kind === 247 /* CatchClause */;
+            declaration.parent.kind === 251 /* CatchClause */;
     }
     ts.isCatchClauseVariableDeclaration = isCatchClauseVariableDeclaration;
     // Return display name of an identifier
@@ -4727,10 +5046,23 @@ var ts;
         return ts.createTextSpanFromBounds(start, scanner.getTextPos());
     }
     ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition;
+    function getErrorSpanForArrowFunction(sourceFile, node) {
+        var pos = ts.skipTrivia(sourceFile.text, node.pos);
+        if (node.body && node.body.kind === 198 /* Block */) {
+            var startLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.pos).line;
+            var endLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.end).line;
+            if (startLine < endLine) {
+                // The arrow function spans multiple lines, 
+                // make the error span be the first line, inclusive.
+                return ts.createTextSpan(pos, getEndLinePosition(startLine, sourceFile) - pos + 1);
+            }
+        }
+        return ts.createTextSpanFromBounds(pos, node.end);
+    }
     function getErrorSpanForNode(sourceFile, node) {
         var errorNode = node;
         switch (node.kind) {
-            case 251 /* SourceFile */:
+            case 255 /* SourceFile */:
                 var pos_1 = ts.skipTrivia(sourceFile.text, 0, /*stopAfterLineBreak*/ false);
                 if (pos_1 === sourceFile.text.length) {
                     // file is empty - return span for the beginning of the file
@@ -4739,20 +5071,24 @@ var ts;
                 return getSpanOfTokenAtPosition(sourceFile, pos_1);
             // This list is a work in progress. Add missing node kinds to improve their error
             // spans.
-            case 214 /* VariableDeclaration */:
-            case 166 /* BindingElement */:
-            case 217 /* ClassDeclaration */:
-            case 189 /* ClassExpression */:
-            case 218 /* InterfaceDeclaration */:
-            case 221 /* ModuleDeclaration */:
-            case 220 /* EnumDeclaration */:
-            case 250 /* EnumMember */:
-            case 216 /* FunctionDeclaration */:
-            case 176 /* FunctionExpression */:
-            case 144 /* MethodDeclaration */:
-            case 219 /* TypeAliasDeclaration */:
+            case 217 /* VariableDeclaration */:
+            case 168 /* BindingElement */:
+            case 220 /* ClassDeclaration */:
+            case 191 /* ClassExpression */:
+            case 221 /* InterfaceDeclaration */:
+            case 224 /* ModuleDeclaration */:
+            case 223 /* EnumDeclaration */:
+            case 254 /* EnumMember */:
+            case 219 /* FunctionDeclaration */:
+            case 178 /* FunctionExpression */:
+            case 146 /* MethodDeclaration */:
+            case 148 /* GetAccessor */:
+            case 149 /* SetAccessor */:
+            case 222 /* TypeAliasDeclaration */:
                 errorNode = node.name;
                 break;
+            case 179 /* ArrowFunction */:
+                return getErrorSpanForArrowFunction(sourceFile, node);
         }
         if (errorNode === undefined) {
             // If we don't have a better node, then just set the error on the first token of
@@ -4765,24 +5101,20 @@ var ts;
         return ts.createTextSpanFromBounds(pos, errorNode.end);
     }
     ts.getErrorSpanForNode = getErrorSpanForNode;
-    function isExternalModule(file) {
-        return file.externalModuleIndicator !== undefined;
-    }
-    ts.isExternalModule = isExternalModule;
     function isExternalOrCommonJsModule(file) {
         return (file.externalModuleIndicator || file.commonJsModuleIndicator) !== undefined;
     }
     ts.isExternalOrCommonJsModule = isExternalOrCommonJsModule;
     function isDeclarationFile(file) {
-        return (file.flags & 4096 /* DeclarationFile */) !== 0;
+        return file.isDeclarationFile;
     }
     ts.isDeclarationFile = isDeclarationFile;
     function isConstEnumDeclaration(node) {
-        return node.kind === 220 /* EnumDeclaration */ && isConst(node);
+        return node.kind === 223 /* EnumDeclaration */ && isConst(node);
     }
     ts.isConstEnumDeclaration = isConstEnumDeclaration;
     function walkUpBindingElementsAndPatterns(node) {
-        while (node && (node.kind === 166 /* BindingElement */ || isBindingPattern(node))) {
+        while (node && (node.kind === 168 /* BindingElement */ || isBindingPattern(node))) {
             node = node.parent;
         }
         return node;
@@ -4797,29 +5129,33 @@ var ts;
     function getCombinedNodeFlags(node) {
         node = walkUpBindingElementsAndPatterns(node);
         var flags = node.flags;
-        if (node.kind === 214 /* VariableDeclaration */) {
+        if (node.kind === 217 /* VariableDeclaration */) {
             node = node.parent;
         }
-        if (node && node.kind === 215 /* VariableDeclarationList */) {
+        if (node && node.kind === 218 /* VariableDeclarationList */) {
             flags |= node.flags;
             node = node.parent;
         }
-        if (node && node.kind === 196 /* VariableStatement */) {
+        if (node && node.kind === 199 /* VariableStatement */) {
             flags |= node.flags;
         }
         return flags;
     }
     ts.getCombinedNodeFlags = getCombinedNodeFlags;
     function isConst(node) {
-        return !!(getCombinedNodeFlags(node) & 16384 /* Const */);
+        return !!(getCombinedNodeFlags(node) & 2048 /* Const */);
     }
     ts.isConst = isConst;
     function isLet(node) {
-        return !!(getCombinedNodeFlags(node) & 8192 /* Let */);
+        return !!(getCombinedNodeFlags(node) & 1024 /* Let */);
     }
     ts.isLet = isLet;
+    function isSuperCallExpression(n) {
+        return n.kind === 173 /* CallExpression */ && n.expression.kind === 95 /* SuperKeyword */;
+    }
+    ts.isSuperCallExpression = isSuperCallExpression;
     function isPrologueDirective(node) {
-        return node.kind === 198 /* ExpressionStatement */ && node.expression.kind === 9 /* StringLiteral */;
+        return node.kind === 201 /* ExpressionStatement */ && node.expression.kind === 9 /* StringLiteral */;
     }
     ts.isPrologueDirective = isPrologueDirective;
     function getLeadingCommentRangesOfNode(node, sourceFileOfNode) {
@@ -4835,7 +5171,7 @@ var ts;
     }
     ts.getJsDocComments = getJsDocComments;
     function getJsDocCommentsFromText(node, text) {
-        var commentRanges = (node.kind === 139 /* Parameter */ || node.kind === 138 /* TypeParameter */) ?
+        var commentRanges = (node.kind === 141 /* Parameter */ || node.kind === 140 /* TypeParameter */) ?
             ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
             getLeadingCommentRangesOfNodeFromText(node, text);
         return ts.filter(commentRanges, isJsDocComment);
@@ -4848,39 +5184,41 @@ var ts;
     }
     ts.getJsDocCommentsFromText = getJsDocCommentsFromText;
     ts.fullTripleSlashReferencePathRegEx = /^(\/\/\/\s*<reference\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
+    ts.fullTripleSlashReferenceTypeReferenceDirectiveRegEx = /^(\/\/\/\s*<reference\s+types\s*=\s*)('|")(.+?)\2.*?\/>/;
     ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
     function isTypeNode(node) {
-        if (151 /* FirstTypeNode */ <= node.kind && node.kind <= 163 /* LastTypeNode */) {
+        if (153 /* FirstTypeNode */ <= node.kind && node.kind <= 165 /* LastTypeNode */) {
             return true;
         }
         switch (node.kind) {
             case 117 /* AnyKeyword */:
-            case 128 /* NumberKeyword */:
-            case 130 /* StringKeyword */:
+            case 129 /* NumberKeyword */:
+            case 131 /* StringKeyword */:
             case 120 /* BooleanKeyword */:
-            case 131 /* SymbolKeyword */:
+            case 132 /* SymbolKeyword */:
+            case 134 /* UndefinedKeyword */:
                 return true;
             case 103 /* VoidKeyword */:
-                return node.parent.kind !== 180 /* VoidExpression */;
-            case 191 /* ExpressionWithTypeArguments */:
+                return node.parent.kind !== 182 /* VoidExpression */;
+            case 193 /* ExpressionWithTypeArguments */:
                 return !isExpressionWithTypeArgumentsInClassExtendsClause(node);
             // Identifiers and qualified names may be type nodes, depending on their context. Climb
             // above them to find the lowest container
             case 69 /* Identifier */:
                 // If the identifier is the RHS of a qualified name, then it's a type iff its parent is.
-                if (node.parent.kind === 136 /* QualifiedName */ && node.parent.right === node) {
+                if (node.parent.kind === 138 /* QualifiedName */ && node.parent.right === node) {
                     node = node.parent;
                 }
-                else if (node.parent.kind === 169 /* PropertyAccessExpression */ && node.parent.name === node) {
+                else if (node.parent.kind === 171 /* PropertyAccessExpression */ && node.parent.name === node) {
                     node = node.parent;
                 }
                 // At this point, node is either a qualified name or an identifier
-                ts.Debug.assert(node.kind === 69 /* Identifier */ || node.kind === 136 /* QualifiedName */ || node.kind === 169 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isTypeNode'.");
-            case 136 /* QualifiedName */:
-            case 169 /* PropertyAccessExpression */:
+                ts.Debug.assert(node.kind === 69 /* Identifier */ || node.kind === 138 /* QualifiedName */ || node.kind === 171 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isTypeNode'.");
+            case 138 /* QualifiedName */:
+            case 171 /* PropertyAccessExpression */:
             case 97 /* ThisKeyword */:
                 var parent_1 = node.parent;
-                if (parent_1.kind === 155 /* TypeQuery */) {
+                if (parent_1.kind === 157 /* TypeQuery */) {
                     return false;
                 }
                 // Do not recursively call isTypeNode on the parent. In the example:
@@ -4889,38 +5227,38 @@ var ts;
                 //
                 // Calling isTypeNode would consider the qualified name A.B a type node. Only C or
                 // A.B.C is a type node.
-                if (151 /* FirstTypeNode */ <= parent_1.kind && parent_1.kind <= 163 /* LastTypeNode */) {
+                if (153 /* FirstTypeNode */ <= parent_1.kind && parent_1.kind <= 165 /* LastTypeNode */) {
                     return true;
                 }
                 switch (parent_1.kind) {
-                    case 191 /* ExpressionWithTypeArguments */:
+                    case 193 /* ExpressionWithTypeArguments */:
                         return !isExpressionWithTypeArgumentsInClassExtendsClause(parent_1);
-                    case 138 /* TypeParameter */:
+                    case 140 /* TypeParameter */:
                         return node === parent_1.constraint;
-                    case 142 /* PropertyDeclaration */:
-                    case 141 /* PropertySignature */:
-                    case 139 /* Parameter */:
-                    case 214 /* VariableDeclaration */:
+                    case 144 /* PropertyDeclaration */:
+                    case 143 /* PropertySignature */:
+                    case 141 /* Parameter */:
+                    case 217 /* VariableDeclaration */:
                         return node === parent_1.type;
-                    case 216 /* FunctionDeclaration */:
-                    case 176 /* FunctionExpression */:
-                    case 177 /* ArrowFunction */:
-                    case 145 /* Constructor */:
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
+                    case 219 /* FunctionDeclaration */:
+                    case 178 /* FunctionExpression */:
+                    case 179 /* ArrowFunction */:
+                    case 147 /* Constructor */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
                         return node === parent_1.type;
-                    case 148 /* CallSignature */:
-                    case 149 /* ConstructSignature */:
-                    case 150 /* IndexSignature */:
+                    case 150 /* CallSignature */:
+                    case 151 /* ConstructSignature */:
+                    case 152 /* IndexSignature */:
                         return node === parent_1.type;
-                    case 174 /* TypeAssertionExpression */:
+                    case 176 /* TypeAssertionExpression */:
                         return node === parent_1.type;
-                    case 171 /* CallExpression */:
-                    case 172 /* NewExpression */:
+                    case 173 /* CallExpression */:
+                    case 174 /* NewExpression */:
                         return parent_1.typeArguments && ts.indexOf(parent_1.typeArguments, node) >= 0;
-                    case 173 /* TaggedTemplateExpression */:
+                    case 175 /* TaggedTemplateExpression */:
                         // TODO (drosen): TaggedTemplateExpressions may eventually support type arguments.
                         return false;
                 }
@@ -4934,23 +5272,23 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 207 /* ReturnStatement */:
+                case 210 /* ReturnStatement */:
                     return visitor(node);
-                case 223 /* CaseBlock */:
-                case 195 /* Block */:
-                case 199 /* IfStatement */:
-                case 200 /* DoStatement */:
-                case 201 /* WhileStatement */:
-                case 202 /* ForStatement */:
-                case 203 /* ForInStatement */:
-                case 204 /* ForOfStatement */:
-                case 208 /* WithStatement */:
-                case 209 /* SwitchStatement */:
-                case 244 /* CaseClause */:
-                case 245 /* DefaultClause */:
-                case 210 /* LabeledStatement */:
-                case 212 /* TryStatement */:
-                case 247 /* CatchClause */:
+                case 226 /* CaseBlock */:
+                case 198 /* Block */:
+                case 202 /* IfStatement */:
+                case 203 /* DoStatement */:
+                case 204 /* WhileStatement */:
+                case 205 /* ForStatement */:
+                case 206 /* ForInStatement */:
+                case 207 /* ForOfStatement */:
+                case 211 /* WithStatement */:
+                case 212 /* SwitchStatement */:
+                case 248 /* CaseClause */:
+                case 249 /* DefaultClause */:
+                case 213 /* LabeledStatement */:
+                case 215 /* TryStatement */:
+                case 251 /* CatchClause */:
                     return ts.forEachChild(node, traverse);
             }
         }
@@ -4960,18 +5298,18 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 187 /* YieldExpression */:
+                case 189 /* YieldExpression */:
                     visitor(node);
                     var operand = node.expression;
                     if (operand) {
                         traverse(operand);
                     }
-                case 220 /* EnumDeclaration */:
-                case 218 /* InterfaceDeclaration */:
-                case 221 /* ModuleDeclaration */:
-                case 219 /* TypeAliasDeclaration */:
-                case 217 /* ClassDeclaration */:
-                case 189 /* ClassExpression */:
+                case 223 /* EnumDeclaration */:
+                case 221 /* InterfaceDeclaration */:
+                case 224 /* ModuleDeclaration */:
+                case 222 /* TypeAliasDeclaration */:
+                case 220 /* ClassDeclaration */:
+                case 191 /* ClassExpression */:
                     // These are not allowed inside a generator now, but eventually they may be allowed
                     // as local types. Regardless, any yield statements contained within them should be
                     // skipped in this traversal.
@@ -4979,7 +5317,7 @@ var ts;
                 default:
                     if (isFunctionLike(node)) {
                         var name_5 = node.name;
-                        if (name_5 && name_5.kind === 137 /* ComputedPropertyName */) {
+                        if (name_5 && name_5.kind === 139 /* ComputedPropertyName */) {
                             // Note that we will not include methods/accessors of a class because they would require
                             // first descending into the class. This is by design.
                             traverse(name_5.expression);
@@ -4998,14 +5336,14 @@ var ts;
     function isVariableLike(node) {
         if (node) {
             switch (node.kind) {
-                case 166 /* BindingElement */:
-                case 250 /* EnumMember */:
-                case 139 /* Parameter */:
-                case 248 /* PropertyAssignment */:
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
-                case 249 /* ShorthandPropertyAssignment */:
-                case 214 /* VariableDeclaration */:
+                case 168 /* BindingElement */:
+                case 254 /* EnumMember */:
+                case 141 /* Parameter */:
+                case 252 /* PropertyAssignment */:
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
+                case 253 /* ShorthandPropertyAssignment */:
+                case 217 /* VariableDeclaration */:
                     return true;
             }
         }
@@ -5013,11 +5351,11 @@ var ts;
     }
     ts.isVariableLike = isVariableLike;
     function isAccessor(node) {
-        return node && (node.kind === 146 /* GetAccessor */ || node.kind === 147 /* SetAccessor */);
+        return node && (node.kind === 148 /* GetAccessor */ || node.kind === 149 /* SetAccessor */);
     }
     ts.isAccessor = isAccessor;
     function isClassLike(node) {
-        return node && (node.kind === 217 /* ClassDeclaration */ || node.kind === 189 /* ClassExpression */);
+        return node && (node.kind === 220 /* ClassDeclaration */ || node.kind === 191 /* ClassExpression */);
     }
     ts.isClassLike = isClassLike;
     function isFunctionLike(node) {
@@ -5026,32 +5364,32 @@ var ts;
     ts.isFunctionLike = isFunctionLike;
     function isFunctionLikeKind(kind) {
         switch (kind) {
-            case 145 /* Constructor */:
-            case 176 /* FunctionExpression */:
-            case 216 /* FunctionDeclaration */:
-            case 177 /* ArrowFunction */:
-            case 144 /* MethodDeclaration */:
-            case 143 /* MethodSignature */:
-            case 146 /* GetAccessor */:
-            case 147 /* SetAccessor */:
-            case 148 /* CallSignature */:
-            case 149 /* ConstructSignature */:
-            case 150 /* IndexSignature */:
-            case 153 /* FunctionType */:
-            case 154 /* ConstructorType */:
+            case 147 /* Constructor */:
+            case 178 /* FunctionExpression */:
+            case 219 /* FunctionDeclaration */:
+            case 179 /* ArrowFunction */:
+            case 146 /* MethodDeclaration */:
+            case 145 /* MethodSignature */:
+            case 148 /* GetAccessor */:
+            case 149 /* SetAccessor */:
+            case 150 /* CallSignature */:
+            case 151 /* ConstructSignature */:
+            case 152 /* IndexSignature */:
+            case 155 /* FunctionType */:
+            case 156 /* ConstructorType */:
                 return true;
         }
     }
     ts.isFunctionLikeKind = isFunctionLikeKind;
     function introducesArgumentsExoticObject(node) {
         switch (node.kind) {
-            case 144 /* MethodDeclaration */:
-            case 143 /* MethodSignature */:
-            case 145 /* Constructor */:
-            case 146 /* GetAccessor */:
-            case 147 /* SetAccessor */:
-            case 216 /* FunctionDeclaration */:
-            case 176 /* FunctionExpression */:
+            case 146 /* MethodDeclaration */:
+            case 145 /* MethodSignature */:
+            case 147 /* Constructor */:
+            case 148 /* GetAccessor */:
+            case 149 /* SetAccessor */:
+            case 219 /* FunctionDeclaration */:
+            case 178 /* FunctionExpression */:
                 return true;
         }
         return false;
@@ -5059,30 +5397,34 @@ var ts;
     ts.introducesArgumentsExoticObject = introducesArgumentsExoticObject;
     function isIterationStatement(node, lookInLabeledStatements) {
         switch (node.kind) {
-            case 202 /* ForStatement */:
-            case 203 /* ForInStatement */:
-            case 204 /* ForOfStatement */:
-            case 200 /* DoStatement */:
-            case 201 /* WhileStatement */:
+            case 205 /* ForStatement */:
+            case 206 /* ForInStatement */:
+            case 207 /* ForOfStatement */:
+            case 203 /* DoStatement */:
+            case 204 /* WhileStatement */:
                 return true;
-            case 210 /* LabeledStatement */:
+            case 213 /* LabeledStatement */:
                 return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
         }
         return false;
     }
     ts.isIterationStatement = isIterationStatement;
     function isFunctionBlock(node) {
-        return node && node.kind === 195 /* Block */ && isFunctionLike(node.parent);
+        return node && node.kind === 198 /* Block */ && isFunctionLike(node.parent);
     }
     ts.isFunctionBlock = isFunctionBlock;
     function isObjectLiteralMethod(node) {
-        return node && node.kind === 144 /* MethodDeclaration */ && node.parent.kind === 168 /* ObjectLiteralExpression */;
+        return node && node.kind === 146 /* MethodDeclaration */ && node.parent.kind === 170 /* ObjectLiteralExpression */;
     }
     ts.isObjectLiteralMethod = isObjectLiteralMethod;
     function isIdentifierTypePredicate(predicate) {
         return predicate && predicate.kind === 1 /* Identifier */;
     }
     ts.isIdentifierTypePredicate = isIdentifierTypePredicate;
+    function isThisTypePredicate(predicate) {
+        return predicate && predicate.kind === 0 /* This */;
+    }
+    ts.isThisTypePredicate = isThisTypePredicate;
     function getContainingFunction(node) {
         while (true) {
             node = node.parent;
@@ -5108,7 +5450,7 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 137 /* ComputedPropertyName */:
+                case 139 /* ComputedPropertyName */:
                     // If the grandparent node is an object literal (as opposed to a class),
                     // then the computed property is not a 'this' container.
                     // A computed property name in a class needs to be a this container
@@ -5123,9 +5465,9 @@ var ts;
                     // the *body* of the container.
                     node = node.parent;
                     break;
-                case 140 /* Decorator */:
+                case 142 /* Decorator */:
                     // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 139 /* Parameter */ && isClassElement(node.parent.parent)) {
+                    if (node.parent.kind === 141 /* Parameter */ && isClassElement(node.parent.parent)) {
                         // If the decorator's parent is a Parameter, we resolve the this container from
                         // the grandparent class declaration.
                         node = node.parent.parent;
@@ -5136,26 +5478,26 @@ var ts;
                         node = node.parent;
                     }
                     break;
-                case 177 /* ArrowFunction */:
+                case 179 /* ArrowFunction */:
                     if (!includeArrowFunctions) {
                         continue;
                     }
                 // Fall through
-                case 216 /* FunctionDeclaration */:
-                case 176 /* FunctionExpression */:
-                case 221 /* ModuleDeclaration */:
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
-                case 145 /* Constructor */:
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
-                case 148 /* CallSignature */:
-                case 149 /* ConstructSignature */:
-                case 150 /* IndexSignature */:
-                case 220 /* EnumDeclaration */:
-                case 251 /* SourceFile */:
+                case 219 /* FunctionDeclaration */:
+                case 178 /* FunctionExpression */:
+                case 224 /* ModuleDeclaration */:
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
+                case 147 /* Constructor */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
+                case 150 /* CallSignature */:
+                case 151 /* ConstructSignature */:
+                case 152 /* IndexSignature */:
+                case 223 /* EnumDeclaration */:
+                case 255 /* SourceFile */:
                     return node;
             }
         }
@@ -5176,26 +5518,26 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 137 /* ComputedPropertyName */:
+                case 139 /* ComputedPropertyName */:
                     node = node.parent;
                     break;
-                case 216 /* FunctionDeclaration */:
-                case 176 /* FunctionExpression */:
-                case 177 /* ArrowFunction */:
+                case 219 /* FunctionDeclaration */:
+                case 178 /* FunctionExpression */:
+                case 179 /* ArrowFunction */:
                     if (!stopOnFunctions) {
                         continue;
                     }
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
-                case 145 /* Constructor */:
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
+                case 147 /* Constructor */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
                     return node;
-                case 140 /* Decorator */:
+                case 142 /* Decorator */:
                     // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 139 /* Parameter */ && isClassElement(node.parent.parent)) {
+                    if (node.parent.kind === 141 /* Parameter */ && isClassElement(node.parent.parent)) {
                         // If the decorator's parent is a Parameter, we resolve the this container from
                         // the grandparent class declaration.
                         node = node.parent.parent;
@@ -5210,15 +5552,24 @@ var ts;
         }
     }
     ts.getSuperContainer = getSuperContainer;
+    /**
+     * Determines whether a node is a property or element access expression for super.
+     */
+    function isSuperPropertyOrElementAccess(node) {
+        return (node.kind === 171 /* PropertyAccessExpression */
+            || node.kind === 172 /* ElementAccessExpression */)
+            && node.expression.kind === 95 /* SuperKeyword */;
+    }
+    ts.isSuperPropertyOrElementAccess = isSuperPropertyOrElementAccess;
     function getEntityNameFromTypeNode(node) {
         if (node) {
             switch (node.kind) {
-                case 152 /* TypeReference */:
+                case 154 /* TypeReference */:
                     return node.typeName;
-                case 191 /* ExpressionWithTypeArguments */:
+                case 193 /* ExpressionWithTypeArguments */:
                     return node.expression;
                 case 69 /* Identifier */:
-                case 136 /* QualifiedName */:
+                case 138 /* QualifiedName */:
                     return node;
             }
         }
@@ -5226,7 +5577,7 @@ var ts;
     }
     ts.getEntityNameFromTypeNode = getEntityNameFromTypeNode;
     function getInvokedExpression(node) {
-        if (node.kind === 173 /* TaggedTemplateExpression */) {
+        if (node.kind === 175 /* TaggedTemplateExpression */) {
             return node.tag;
         }
         // Will either be a CallExpression, NewExpression, or Decorator.
@@ -5235,25 +5586,25 @@ var ts;
     ts.getInvokedExpression = getInvokedExpression;
     function nodeCanBeDecorated(node) {
         switch (node.kind) {
-            case 217 /* ClassDeclaration */:
+            case 220 /* ClassDeclaration */:
                 // classes are valid targets
                 return true;
-            case 142 /* PropertyDeclaration */:
+            case 144 /* PropertyDeclaration */:
                 // property declarations are valid if their parent is a class declaration.
-                return node.parent.kind === 217 /* ClassDeclaration */;
-            case 146 /* GetAccessor */:
-            case 147 /* SetAccessor */:
-            case 144 /* MethodDeclaration */:
+                return node.parent.kind === 220 /* ClassDeclaration */;
+            case 148 /* GetAccessor */:
+            case 149 /* SetAccessor */:
+            case 146 /* MethodDeclaration */:
                 // if this method has a body and its parent is a class declaration, this is a valid target.
                 return node.body !== undefined
-                    && node.parent.kind === 217 /* ClassDeclaration */;
-            case 139 /* Parameter */:
+                    && node.parent.kind === 220 /* ClassDeclaration */;
+            case 141 /* Parameter */:
                 // if the parameter's parent has a body and its grandparent is a class declaration, this is a valid target;
                 return node.parent.body !== undefined
-                    && (node.parent.kind === 145 /* Constructor */
-                        || node.parent.kind === 144 /* MethodDeclaration */
-                        || node.parent.kind === 147 /* SetAccessor */)
-                    && node.parent.parent.kind === 217 /* ClassDeclaration */;
+                    && (node.parent.kind === 147 /* Constructor */
+                        || node.parent.kind === 146 /* MethodDeclaration */
+                        || node.parent.kind === 149 /* SetAccessor */)
+                    && node.parent.parent.kind === 220 /* ClassDeclaration */;
         }
         return false;
     }
@@ -5264,13 +5615,23 @@ var ts;
     }
     ts.nodeIsDecorated = nodeIsDecorated;
     function isPropertyAccessExpression(node) {
-        return node.kind === 169 /* PropertyAccessExpression */;
+        return node.kind === 171 /* PropertyAccessExpression */;
     }
     ts.isPropertyAccessExpression = isPropertyAccessExpression;
     function isElementAccessExpression(node) {
-        return node.kind === 170 /* ElementAccessExpression */;
+        return node.kind === 172 /* ElementAccessExpression */;
     }
     ts.isElementAccessExpression = isElementAccessExpression;
+    function isJSXTagName(node) {
+        var parent = node.parent;
+        if (parent.kind === 242 /* JsxOpeningElement */ ||
+            parent.kind === 241 /* JsxSelfClosingElement */ ||
+            parent.kind === 244 /* JsxClosingElement */) {
+            return parent.tagName === node;
+        }
+        return false;
+    }
+    ts.isJSXTagName = isJSXTagName;
     function isExpression(node) {
         switch (node.kind) {
             case 95 /* SuperKeyword */:
@@ -5278,42 +5639,43 @@ var ts;
             case 99 /* TrueKeyword */:
             case 84 /* FalseKeyword */:
             case 10 /* RegularExpressionLiteral */:
-            case 167 /* ArrayLiteralExpression */:
-            case 168 /* ObjectLiteralExpression */:
-            case 169 /* PropertyAccessExpression */:
-            case 170 /* ElementAccessExpression */:
-            case 171 /* CallExpression */:
-            case 172 /* NewExpression */:
-            case 173 /* TaggedTemplateExpression */:
-            case 192 /* AsExpression */:
-            case 174 /* TypeAssertionExpression */:
-            case 175 /* ParenthesizedExpression */:
-            case 176 /* FunctionExpression */:
-            case 189 /* ClassExpression */:
-            case 177 /* ArrowFunction */:
-            case 180 /* VoidExpression */:
-            case 178 /* DeleteExpression */:
-            case 179 /* TypeOfExpression */:
-            case 182 /* PrefixUnaryExpression */:
-            case 183 /* PostfixUnaryExpression */:
-            case 184 /* BinaryExpression */:
-            case 185 /* ConditionalExpression */:
-            case 188 /* SpreadElementExpression */:
-            case 186 /* TemplateExpression */:
+            case 169 /* ArrayLiteralExpression */:
+            case 170 /* ObjectLiteralExpression */:
+            case 171 /* PropertyAccessExpression */:
+            case 172 /* ElementAccessExpression */:
+            case 173 /* CallExpression */:
+            case 174 /* NewExpression */:
+            case 175 /* TaggedTemplateExpression */:
+            case 194 /* AsExpression */:
+            case 176 /* TypeAssertionExpression */:
+            case 195 /* NonNullExpression */:
+            case 177 /* ParenthesizedExpression */:
+            case 178 /* FunctionExpression */:
+            case 191 /* ClassExpression */:
+            case 179 /* ArrowFunction */:
+            case 182 /* VoidExpression */:
+            case 180 /* DeleteExpression */:
+            case 181 /* TypeOfExpression */:
+            case 184 /* PrefixUnaryExpression */:
+            case 185 /* PostfixUnaryExpression */:
+            case 186 /* BinaryExpression */:
+            case 187 /* ConditionalExpression */:
+            case 190 /* SpreadElementExpression */:
+            case 188 /* TemplateExpression */:
             case 11 /* NoSubstitutionTemplateLiteral */:
-            case 190 /* OmittedExpression */:
-            case 236 /* JsxElement */:
-            case 237 /* JsxSelfClosingElement */:
-            case 187 /* YieldExpression */:
-            case 181 /* AwaitExpression */:
+            case 192 /* OmittedExpression */:
+            case 240 /* JsxElement */:
+            case 241 /* JsxSelfClosingElement */:
+            case 189 /* YieldExpression */:
+            case 183 /* AwaitExpression */:
                 return true;
-            case 136 /* QualifiedName */:
-                while (node.parent.kind === 136 /* QualifiedName */) {
+            case 138 /* QualifiedName */:
+                while (node.parent.kind === 138 /* QualifiedName */) {
                     node = node.parent;
                 }
-                return node.parent.kind === 155 /* TypeQuery */;
+                return node.parent.kind === 157 /* TypeQuery */ || isJSXTagName(node);
             case 69 /* Identifier */:
-                if (node.parent.kind === 155 /* TypeQuery */) {
+                if (node.parent.kind === 157 /* TypeQuery */ || isJSXTagName(node)) {
                     return true;
                 }
             // fall through
@@ -5322,47 +5684,47 @@ var ts;
             case 97 /* ThisKeyword */:
                 var parent_2 = node.parent;
                 switch (parent_2.kind) {
-                    case 214 /* VariableDeclaration */:
-                    case 139 /* Parameter */:
-                    case 142 /* PropertyDeclaration */:
-                    case 141 /* PropertySignature */:
-                    case 250 /* EnumMember */:
-                    case 248 /* PropertyAssignment */:
-                    case 166 /* BindingElement */:
+                    case 217 /* VariableDeclaration */:
+                    case 141 /* Parameter */:
+                    case 144 /* PropertyDeclaration */:
+                    case 143 /* PropertySignature */:
+                    case 254 /* EnumMember */:
+                    case 252 /* PropertyAssignment */:
+                    case 168 /* BindingElement */:
                         return parent_2.initializer === node;
-                    case 198 /* ExpressionStatement */:
-                    case 199 /* IfStatement */:
-                    case 200 /* DoStatement */:
-                    case 201 /* WhileStatement */:
-                    case 207 /* ReturnStatement */:
-                    case 208 /* WithStatement */:
-                    case 209 /* SwitchStatement */:
-                    case 244 /* CaseClause */:
-                    case 211 /* ThrowStatement */:
-                    case 209 /* SwitchStatement */:
+                    case 201 /* ExpressionStatement */:
+                    case 202 /* IfStatement */:
+                    case 203 /* DoStatement */:
+                    case 204 /* WhileStatement */:
+                    case 210 /* ReturnStatement */:
+                    case 211 /* WithStatement */:
+                    case 212 /* SwitchStatement */:
+                    case 248 /* CaseClause */:
+                    case 214 /* ThrowStatement */:
+                    case 212 /* SwitchStatement */:
                         return parent_2.expression === node;
-                    case 202 /* ForStatement */:
+                    case 205 /* ForStatement */:
                         var forStatement = parent_2;
-                        return (forStatement.initializer === node && forStatement.initializer.kind !== 215 /* VariableDeclarationList */) ||
+                        return (forStatement.initializer === node && forStatement.initializer.kind !== 218 /* VariableDeclarationList */) ||
                             forStatement.condition === node ||
                             forStatement.incrementor === node;
-                    case 203 /* ForInStatement */:
-                    case 204 /* ForOfStatement */:
+                    case 206 /* ForInStatement */:
+                    case 207 /* ForOfStatement */:
                         var forInStatement = parent_2;
-                        return (forInStatement.initializer === node && forInStatement.initializer.kind !== 215 /* VariableDeclarationList */) ||
+                        return (forInStatement.initializer === node && forInStatement.initializer.kind !== 218 /* VariableDeclarationList */) ||
                             forInStatement.expression === node;
-                    case 174 /* TypeAssertionExpression */:
-                    case 192 /* AsExpression */:
+                    case 176 /* TypeAssertionExpression */:
+                    case 194 /* AsExpression */:
                         return node === parent_2.expression;
-                    case 193 /* TemplateSpan */:
+                    case 196 /* TemplateSpan */:
                         return node === parent_2.expression;
-                    case 137 /* ComputedPropertyName */:
+                    case 139 /* ComputedPropertyName */:
                         return node === parent_2.expression;
-                    case 140 /* Decorator */:
-                    case 243 /* JsxExpression */:
-                    case 242 /* JsxSpreadAttribute */:
+                    case 142 /* Decorator */:
+                    case 247 /* JsxExpression */:
+                    case 246 /* JsxSpreadAttribute */:
                         return true;
-                    case 191 /* ExpressionWithTypeArguments */:
+                    case 193 /* ExpressionWithTypeArguments */:
                         return parent_2.expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent_2);
                     default:
                         if (isExpression(parent_2)) {
@@ -5386,7 +5748,7 @@ var ts;
     }
     ts.isInstantiatedModule = isInstantiatedModule;
     function isExternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 224 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 235 /* ExternalModuleReference */;
+        return node.kind === 228 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 239 /* ExternalModuleReference */;
     }
     ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
     function getExternalModuleImportEqualsDeclarationExpression(node) {
@@ -5395,7 +5757,7 @@ var ts;
     }
     ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
     function isInternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 224 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 235 /* ExternalModuleReference */;
+        return node.kind === 228 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 239 /* ExternalModuleReference */;
     }
     ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
     function isSourceFileJavaScript(file) {
@@ -5403,31 +5765,34 @@ var ts;
     }
     ts.isSourceFileJavaScript = isSourceFileJavaScript;
     function isInJavaScriptFile(node) {
-        return node && !!(node.parserContextFlags & 32 /* JavaScriptFile */);
+        return node && !!(node.flags & 134217728 /* JavaScriptFile */);
     }
     ts.isInJavaScriptFile = isInJavaScriptFile;
     /**
      * Returns true if the node is a CallExpression to the identifier 'require' with
-     * exactly one string literal argument.
+     * exactly one argument.
      * This function does not test if the node is in a JavaScript file or not.
     */
-    function isRequireCall(expression) {
+    function isRequireCall(expression, checkArgumentIsStringLiteral) {
         // of the form 'require("name")'
-        return expression.kind === 171 /* CallExpression */ &&
+        var isRequire = expression.kind === 173 /* CallExpression */ &&
             expression.expression.kind === 69 /* Identifier */ &&
             expression.expression.text === "require" &&
-            expression.arguments.length === 1 &&
-            expression.arguments[0].kind === 9 /* StringLiteral */;
+            expression.arguments.length === 1;
+        return isRequire && (!checkArgumentIsStringLiteral || expression.arguments[0].kind === 9 /* StringLiteral */);
     }
     ts.isRequireCall = isRequireCall;
     /// Given a BinaryExpression, returns SpecialPropertyAssignmentKind for the various kinds of property
     /// assignments we treat as special in the binder
     function getSpecialPropertyAssignmentKind(expression) {
-        if (expression.kind !== 184 /* BinaryExpression */) {
+        if (!isInJavaScriptFile(expression)) {
+            return 0 /* None */;
+        }
+        if (expression.kind !== 186 /* BinaryExpression */) {
             return 0 /* None */;
         }
         var expr = expression;
-        if (expr.operatorToken.kind !== 56 /* EqualsToken */ || expr.left.kind !== 169 /* PropertyAccessExpression */) {
+        if (expr.operatorToken.kind !== 56 /* EqualsToken */ || expr.left.kind !== 171 /* PropertyAccessExpression */) {
             return 0 /* None */;
         }
         var lhs = expr.left;
@@ -5445,7 +5810,7 @@ var ts;
         else if (lhs.expression.kind === 97 /* ThisKeyword */) {
             return 4 /* ThisProperty */;
         }
-        else if (lhs.expression.kind === 169 /* PropertyAccessExpression */) {
+        else if (lhs.expression.kind === 171 /* PropertyAccessExpression */) {
             // chained dot, e.g. x.y.z = expr; this var is the 'x.y' part
             var innerPropertyAccess = lhs.expression;
             if (innerPropertyAccess.expression.kind === 69 /* Identifier */ && innerPropertyAccess.name.text === "prototype") {
@@ -5456,19 +5821,19 @@ var ts;
     }
     ts.getSpecialPropertyAssignmentKind = getSpecialPropertyAssignmentKind;
     function getExternalModuleName(node) {
-        if (node.kind === 225 /* ImportDeclaration */) {
+        if (node.kind === 229 /* ImportDeclaration */) {
             return node.moduleSpecifier;
         }
-        if (node.kind === 224 /* ImportEqualsDeclaration */) {
+        if (node.kind === 228 /* ImportEqualsDeclaration */) {
             var reference = node.moduleReference;
-            if (reference.kind === 235 /* ExternalModuleReference */) {
+            if (reference.kind === 239 /* ExternalModuleReference */) {
                 return reference.expression;
             }
         }
-        if (node.kind === 231 /* ExportDeclaration */) {
+        if (node.kind === 235 /* ExportDeclaration */) {
             return node.moduleSpecifier;
         }
-        if (node.kind === 221 /* ModuleDeclaration */ && node.name.kind === 9 /* StringLiteral */) {
+        if (node.kind === 224 /* ModuleDeclaration */ && node.name.kind === 9 /* StringLiteral */) {
             return node.name;
         }
     }
@@ -5476,13 +5841,13 @@ var ts;
     function hasQuestionToken(node) {
         if (node) {
             switch (node.kind) {
-                case 139 /* Parameter */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
-                case 249 /* ShorthandPropertyAssignment */:
-                case 248 /* PropertyAssignment */:
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
+                case 141 /* Parameter */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
+                case 253 /* ShorthandPropertyAssignment */:
+                case 252 /* PropertyAssignment */:
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
                     return node.questionToken !== undefined;
             }
         }
@@ -5490,31 +5855,70 @@ var ts;
     }
     ts.hasQuestionToken = hasQuestionToken;
     function isJSDocConstructSignature(node) {
-        return node.kind === 264 /* JSDocFunctionType */ &&
+        return node.kind === 268 /* JSDocFunctionType */ &&
             node.parameters.length > 0 &&
-            node.parameters[0].type.kind === 266 /* JSDocConstructorType */;
+            node.parameters[0].type.kind === 270 /* JSDocConstructorType */;
     }
     ts.isJSDocConstructSignature = isJSDocConstructSignature;
-    function getJSDocTag(node, kind) {
-        if (node && node.jsDocComment) {
-            for (var _i = 0, _a = node.jsDocComment.tags; _i < _a.length; _i++) {
-                var tag = _a[_i];
-                if (tag.kind === kind) {
-                    return tag;
-                }
+    function getJSDocTag(node, kind, checkParentVariableStatement) {
+        if (!node) {
+            return undefined;
+        }
+        var jsDocComment = getJSDocComment(node, checkParentVariableStatement);
+        if (!jsDocComment) {
+            return undefined;
+        }
+        for (var _i = 0, _a = jsDocComment.tags; _i < _a.length; _i++) {
+            var tag = _a[_i];
+            if (tag.kind === kind) {
+                return tag;
             }
         }
     }
+    function getJSDocComment(node, checkParentVariableStatement) {
+        if (node.jsDocComment) {
+            return node.jsDocComment;
+        }
+        // Try to recognize this pattern when node is initializer of variable declaration and JSDoc comments are on containing variable statement. 
+        // /** 
+        //   * @param {number} name
+        //   * @returns {number} 
+        //   */
+        // var x = function(name) { return name.length; }
+        if (checkParentVariableStatement) {
+            var isInitializerOfVariableDeclarationInStatement = node.parent.kind === 217 /* VariableDeclaration */ &&
+                node.parent.initializer === node &&
+                node.parent.parent.parent.kind === 199 /* VariableStatement */;
+            var variableStatementNode = isInitializerOfVariableDeclarationInStatement ? node.parent.parent.parent : undefined;
+            if (variableStatementNode) {
+                return variableStatementNode.jsDocComment;
+            }
+            // Also recognize when the node is the RHS of an assignment expression
+            var parent_3 = node.parent;
+            var isSourceOfAssignmentExpressionStatement = parent_3 && parent_3.parent &&
+                parent_3.kind === 186 /* BinaryExpression */ &&
+                parent_3.operatorToken.kind === 56 /* EqualsToken */ &&
+                parent_3.parent.kind === 201 /* ExpressionStatement */;
+            if (isSourceOfAssignmentExpressionStatement) {
+                return parent_3.parent.jsDocComment;
+            }
+            var isPropertyAssignmentExpression = parent_3 && parent_3.kind === 252 /* PropertyAssignment */;
+            if (isPropertyAssignmentExpression) {
+                return parent_3.jsDocComment;
+            }
+        }
+        return undefined;
+    }
     function getJSDocTypeTag(node) {
-        return getJSDocTag(node, 272 /* JSDocTypeTag */);
+        return getJSDocTag(node, 276 /* JSDocTypeTag */, /*checkParentVariableStatement*/ false);
     }
     ts.getJSDocTypeTag = getJSDocTypeTag;
     function getJSDocReturnTag(node) {
-        return getJSDocTag(node, 271 /* JSDocReturnTag */);
+        return getJSDocTag(node, 275 /* JSDocReturnTag */, /*checkParentVariableStatement*/ true);
     }
     ts.getJSDocReturnTag = getJSDocReturnTag;
     function getJSDocTemplateTag(node) {
-        return getJSDocTag(node, 273 /* JSDocTemplateTag */);
+        return getJSDocTag(node, 277 /* JSDocTemplateTag */, /*checkParentVariableStatement*/ false);
     }
     ts.getJSDocTemplateTag = getJSDocTemplateTag;
     function getCorrespondingJSDocParameterTag(parameter) {
@@ -5522,19 +5926,21 @@ var ts;
             // If it's a parameter, see if the parent has a jsdoc comment with an @param
             // annotation.
             var parameterName = parameter.name.text;
-            var docComment = parameter.parent.jsDocComment;
-            if (docComment) {
-                return ts.forEach(docComment.tags, function (t) {
-                    if (t.kind === 270 /* JSDocParameterTag */) {
-                        var parameterTag = t;
+            var jsDocComment = getJSDocComment(parameter.parent, /*checkParentVariableStatement*/ true);
+            if (jsDocComment) {
+                for (var _i = 0, _a = jsDocComment.tags; _i < _a.length; _i++) {
+                    var tag = _a[_i];
+                    if (tag.kind === 274 /* JSDocParameterTag */) {
+                        var parameterTag = tag;
                         var name_6 = parameterTag.preParameterName || parameterTag.postParameterName;
                         if (name_6.text === parameterName) {
-                            return t;
+                            return parameterTag;
                         }
                     }
-                });
+                }
             }
         }
+        return undefined;
     }
     ts.getCorrespondingJSDocParameterTag = getCorrespondingJSDocParameterTag;
     function hasRestParameter(s) {
@@ -5543,13 +5949,13 @@ var ts;
     ts.hasRestParameter = hasRestParameter;
     function isRestParameter(node) {
         if (node) {
-            if (node.parserContextFlags & 32 /* JavaScriptFile */) {
-                if (node.type && node.type.kind === 265 /* JSDocVariadicType */) {
+            if (node.flags & 134217728 /* JavaScriptFile */) {
+                if (node.type && node.type.kind === 269 /* JSDocVariadicType */) {
                     return true;
                 }
                 var paramTag = getCorrespondingJSDocParameterTag(node);
                 if (paramTag && paramTag.typeExpression) {
-                    return paramTag.typeExpression.type.kind === 265 /* JSDocVariadicType */;
+                    return paramTag.typeExpression.type.kind === 269 /* JSDocVariadicType */;
                 }
             }
             return node.dotDotDotToken !== undefined;
@@ -5570,7 +5976,7 @@ var ts;
     }
     ts.isTemplateLiteralKind = isTemplateLiteralKind;
     function isBindingPattern(node) {
-        return !!node && (node.kind === 165 /* ArrayBindingPattern */ || node.kind === 164 /* ObjectBindingPattern */);
+        return !!node && (node.kind === 167 /* ArrayBindingPattern */ || node.kind === 166 /* ObjectBindingPattern */);
     }
     ts.isBindingPattern = isBindingPattern;
     function isNodeDescendentOf(node, ancestor) {
@@ -5584,7 +5990,7 @@ var ts;
     ts.isNodeDescendentOf = isNodeDescendentOf;
     function isInAmbientContext(node) {
         while (node) {
-            if (node.flags & (4 /* Ambient */ | 4096 /* DeclarationFile */)) {
+            if (node.flags & 2 /* Ambient */ || (node.kind === 255 /* SourceFile */ && node.isDeclarationFile)) {
                 return true;
             }
             node = node.parent;
@@ -5594,34 +6000,34 @@ var ts;
     ts.isInAmbientContext = isInAmbientContext;
     function isDeclaration(node) {
         switch (node.kind) {
-            case 177 /* ArrowFunction */:
-            case 166 /* BindingElement */:
-            case 217 /* ClassDeclaration */:
-            case 189 /* ClassExpression */:
-            case 145 /* Constructor */:
-            case 220 /* EnumDeclaration */:
-            case 250 /* EnumMember */:
-            case 233 /* ExportSpecifier */:
-            case 216 /* FunctionDeclaration */:
-            case 176 /* FunctionExpression */:
-            case 146 /* GetAccessor */:
-            case 226 /* ImportClause */:
-            case 224 /* ImportEqualsDeclaration */:
-            case 229 /* ImportSpecifier */:
-            case 218 /* InterfaceDeclaration */:
-            case 144 /* MethodDeclaration */:
-            case 143 /* MethodSignature */:
-            case 221 /* ModuleDeclaration */:
-            case 227 /* NamespaceImport */:
-            case 139 /* Parameter */:
-            case 248 /* PropertyAssignment */:
-            case 142 /* PropertyDeclaration */:
-            case 141 /* PropertySignature */:
-            case 147 /* SetAccessor */:
-            case 249 /* ShorthandPropertyAssignment */:
-            case 219 /* TypeAliasDeclaration */:
-            case 138 /* TypeParameter */:
-            case 214 /* VariableDeclaration */:
+            case 179 /* ArrowFunction */:
+            case 168 /* BindingElement */:
+            case 220 /* ClassDeclaration */:
+            case 191 /* ClassExpression */:
+            case 147 /* Constructor */:
+            case 223 /* EnumDeclaration */:
+            case 254 /* EnumMember */:
+            case 237 /* ExportSpecifier */:
+            case 219 /* FunctionDeclaration */:
+            case 178 /* FunctionExpression */:
+            case 148 /* GetAccessor */:
+            case 230 /* ImportClause */:
+            case 228 /* ImportEqualsDeclaration */:
+            case 233 /* ImportSpecifier */:
+            case 221 /* InterfaceDeclaration */:
+            case 146 /* MethodDeclaration */:
+            case 145 /* MethodSignature */:
+            case 224 /* ModuleDeclaration */:
+            case 231 /* NamespaceImport */:
+            case 141 /* Parameter */:
+            case 252 /* PropertyAssignment */:
+            case 144 /* PropertyDeclaration */:
+            case 143 /* PropertySignature */:
+            case 149 /* SetAccessor */:
+            case 253 /* ShorthandPropertyAssignment */:
+            case 222 /* TypeAliasDeclaration */:
+            case 140 /* TypeParameter */:
+            case 217 /* VariableDeclaration */:
                 return true;
         }
         return false;
@@ -5629,25 +6035,25 @@ var ts;
     ts.isDeclaration = isDeclaration;
     function isStatement(n) {
         switch (n.kind) {
-            case 206 /* BreakStatement */:
-            case 205 /* ContinueStatement */:
-            case 213 /* DebuggerStatement */:
-            case 200 /* DoStatement */:
-            case 198 /* ExpressionStatement */:
-            case 197 /* EmptyStatement */:
-            case 203 /* ForInStatement */:
-            case 204 /* ForOfStatement */:
-            case 202 /* ForStatement */:
-            case 199 /* IfStatement */:
-            case 210 /* LabeledStatement */:
-            case 207 /* ReturnStatement */:
-            case 209 /* SwitchStatement */:
-            case 211 /* ThrowStatement */:
-            case 212 /* TryStatement */:
-            case 196 /* VariableStatement */:
-            case 201 /* WhileStatement */:
-            case 208 /* WithStatement */:
-            case 230 /* ExportAssignment */:
+            case 209 /* BreakStatement */:
+            case 208 /* ContinueStatement */:
+            case 216 /* DebuggerStatement */:
+            case 203 /* DoStatement */:
+            case 201 /* ExpressionStatement */:
+            case 200 /* EmptyStatement */:
+            case 206 /* ForInStatement */:
+            case 207 /* ForOfStatement */:
+            case 205 /* ForStatement */:
+            case 202 /* IfStatement */:
+            case 213 /* LabeledStatement */:
+            case 210 /* ReturnStatement */:
+            case 212 /* SwitchStatement */:
+            case 214 /* ThrowStatement */:
+            case 215 /* TryStatement */:
+            case 199 /* VariableStatement */:
+            case 204 /* WhileStatement */:
+            case 211 /* WithStatement */:
+            case 234 /* ExportAssignment */:
                 return true;
             default:
                 return false;
@@ -5656,13 +6062,13 @@ var ts;
     ts.isStatement = isStatement;
     function isClassElement(n) {
         switch (n.kind) {
-            case 145 /* Constructor */:
-            case 142 /* PropertyDeclaration */:
-            case 144 /* MethodDeclaration */:
-            case 146 /* GetAccessor */:
-            case 147 /* SetAccessor */:
-            case 143 /* MethodSignature */:
-            case 150 /* IndexSignature */:
+            case 147 /* Constructor */:
+            case 144 /* PropertyDeclaration */:
+            case 146 /* MethodDeclaration */:
+            case 148 /* GetAccessor */:
+            case 149 /* SetAccessor */:
+            case 145 /* MethodSignature */:
+            case 152 /* IndexSignature */:
                 return true;
             default:
                 return false;
@@ -5675,7 +6081,7 @@ var ts;
             return false;
         }
         var parent = name.parent;
-        if (parent.kind === 229 /* ImportSpecifier */ || parent.kind === 233 /* ExportSpecifier */) {
+        if (parent.kind === 233 /* ImportSpecifier */ || parent.kind === 237 /* ExportSpecifier */) {
             if (parent.propertyName) {
                 return true;
             }
@@ -5690,31 +6096,31 @@ var ts;
     function isIdentifierName(node) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 142 /* PropertyDeclaration */:
-            case 141 /* PropertySignature */:
-            case 144 /* MethodDeclaration */:
-            case 143 /* MethodSignature */:
-            case 146 /* GetAccessor */:
-            case 147 /* SetAccessor */:
-            case 250 /* EnumMember */:
-            case 248 /* PropertyAssignment */:
-            case 169 /* PropertyAccessExpression */:
+            case 144 /* PropertyDeclaration */:
+            case 143 /* PropertySignature */:
+            case 146 /* MethodDeclaration */:
+            case 145 /* MethodSignature */:
+            case 148 /* GetAccessor */:
+            case 149 /* SetAccessor */:
+            case 254 /* EnumMember */:
+            case 252 /* PropertyAssignment */:
+            case 171 /* PropertyAccessExpression */:
                 // Name in member declaration or property name in property access
                 return parent.name === node;
-            case 136 /* QualifiedName */:
+            case 138 /* QualifiedName */:
                 // Name on right hand side of dot in a type query
                 if (parent.right === node) {
-                    while (parent.kind === 136 /* QualifiedName */) {
+                    while (parent.kind === 138 /* QualifiedName */) {
                         parent = parent.parent;
                     }
-                    return parent.kind === 155 /* TypeQuery */;
+                    return parent.kind === 157 /* TypeQuery */;
                 }
                 return false;
-            case 166 /* BindingElement */:
-            case 229 /* ImportSpecifier */:
+            case 168 /* BindingElement */:
+            case 233 /* ImportSpecifier */:
                 // Property name in binding element or import specifier
                 return parent.propertyName === node;
-            case 233 /* ExportSpecifier */:
+            case 237 /* ExportSpecifier */:
                 // Any name in an export specifier
                 return true;
         }
@@ -5730,12 +6136,13 @@ var ts;
     // export = ...
     // export default ...
     function isAliasSymbolDeclaration(node) {
-        return node.kind === 224 /* ImportEqualsDeclaration */ ||
-            node.kind === 226 /* ImportClause */ && !!node.name ||
-            node.kind === 227 /* NamespaceImport */ ||
-            node.kind === 229 /* ImportSpecifier */ ||
-            node.kind === 233 /* ExportSpecifier */ ||
-            node.kind === 230 /* ExportAssignment */ && node.expression.kind === 69 /* Identifier */;
+        return node.kind === 228 /* ImportEqualsDeclaration */ ||
+            node.kind === 227 /* GlobalModuleExportDeclaration */ ||
+            node.kind === 230 /* ImportClause */ && !!node.name ||
+            node.kind === 231 /* NamespaceImport */ ||
+            node.kind === 233 /* ImportSpecifier */ ||
+            node.kind === 237 /* ExportSpecifier */ ||
+            node.kind === 234 /* ExportAssignment */ && node.expression.kind === 69 /* Identifier */;
     }
     ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
     function getClassExtendsHeritageClauseElement(node) {
@@ -5792,32 +6199,32 @@ var ts;
                 };
             }
             else {
-                var matchResult = ts.fullTripleSlashReferencePathRegEx.exec(comment);
-                if (matchResult) {
+                var refMatchResult = ts.fullTripleSlashReferencePathRegEx.exec(comment);
+                var refLibResult = !refMatchResult && ts.fullTripleSlashReferenceTypeReferenceDirectiveRegEx.exec(comment);
+                if (refMatchResult || refLibResult) {
                     var start = commentRange.pos;
                     var end = commentRange.end;
                     return {
                         fileReference: {
                             pos: start,
                             end: end,
-                            fileName: matchResult[3]
+                            fileName: (refMatchResult || refLibResult)[3]
                         },
-                        isNoDefaultLib: false
-                    };
-                }
-                else {
-                    return {
-                        diagnosticMessage: ts.Diagnostics.Invalid_reference_directive_syntax,
-                        isNoDefaultLib: false
+                        isNoDefaultLib: false,
+                        isTypeReferenceDirective: !!refLibResult
                     };
                 }
+                return {
+                    diagnosticMessage: ts.Diagnostics.Invalid_reference_directive_syntax,
+                    isNoDefaultLib: false
+                };
             }
         }
         return undefined;
     }
     ts.getFileReferenceFromReferencePath = getFileReferenceFromReferencePath;
     function isKeyword(token) {
-        return 70 /* FirstKeyword */ <= token && token <= 135 /* LastKeyword */;
+        return 70 /* FirstKeyword */ <= token && token <= 137 /* LastKeyword */;
     }
     ts.isKeyword = isKeyword;
     function isTrivia(token) {
@@ -5844,7 +6251,7 @@ var ts;
     }
     ts.hasDynamicName = hasDynamicName;
     function isDynamicName(name) {
-        return name.kind === 137 /* ComputedPropertyName */ &&
+        return name.kind === 139 /* ComputedPropertyName */ &&
             !isStringOrNumericLiteral(name.expression.kind) &&
             !isWellKnownSymbolSyntactically(name.expression);
     }
@@ -5862,7 +6269,7 @@ var ts;
         if (name.kind === 69 /* Identifier */ || name.kind === 9 /* StringLiteral */ || name.kind === 8 /* NumericLiteral */) {
             return name.text;
         }
-        if (name.kind === 137 /* ComputedPropertyName */) {
+        if (name.kind === 139 /* ComputedPropertyName */) {
             var nameExpression = name.expression;
             if (isWellKnownSymbolSyntactically(nameExpression)) {
                 var rightHandSideName = nameExpression.name.text;
@@ -5894,6 +6301,7 @@ var ts;
             case 112 /* PublicKeyword */:
             case 110 /* PrivateKeyword */:
             case 111 /* ProtectedKeyword */:
+            case 127 /* ReadonlyKeyword */:
             case 113 /* StaticKeyword */:
                 return true;
         }
@@ -5902,18 +6310,18 @@ var ts;
     ts.isModifierKind = isModifierKind;
     function isParameterDeclaration(node) {
         var root = getRootDeclaration(node);
-        return root.kind === 139 /* Parameter */;
+        return root.kind === 141 /* Parameter */;
     }
     ts.isParameterDeclaration = isParameterDeclaration;
     function getRootDeclaration(node) {
-        while (node.kind === 166 /* BindingElement */) {
+        while (node.kind === 168 /* BindingElement */) {
             node = node.parent.parent;
         }
         return node;
     }
     ts.getRootDeclaration = getRootDeclaration;
     function nodeStartsNewLexicalEnvironment(n) {
-        return isFunctionLike(n) || n.kind === 221 /* ModuleDeclaration */ || n.kind === 251 /* SourceFile */;
+        return isFunctionLike(n) || n.kind === 224 /* ModuleDeclaration */ || n.kind === 255 /* SourceFile */;
     }
     ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
     /**
@@ -5963,7 +6371,7 @@ var ts;
     }
     ts.cloneEntityName = cloneEntityName;
     function isQualifiedName(node) {
-        return node.kind === 136 /* QualifiedName */;
+        return node.kind === 138 /* QualifiedName */;
     }
     ts.isQualifiedName = isQualifiedName;
     function nodeIsSynthesized(node) {
@@ -6214,14 +6622,25 @@ var ts;
         return emitOutputFilePathWithoutExtension + extension;
     }
     ts.getOwnEmitOutputFilePath = getOwnEmitOutputFilePath;
+    function getDeclarationEmitOutputFilePath(sourceFile, host) {
+        var options = host.getCompilerOptions();
+        var outputDir = options.declarationDir || options.outDir; // Prefer declaration folder if specified
+        if (options.declaration) {
+            var path = outputDir
+                ? getSourceFilePathInNewDir(sourceFile, host, outputDir)
+                : sourceFile.fileName;
+            return ts.removeFileExtension(path) + ".d.ts";
+        }
+    }
+    ts.getDeclarationEmitOutputFilePath = getDeclarationEmitOutputFilePath;
     function getEmitScriptTarget(compilerOptions) {
         return compilerOptions.target || 0 /* ES3 */;
     }
     ts.getEmitScriptTarget = getEmitScriptTarget;
     function getEmitModuleKind(compilerOptions) {
-        return compilerOptions.module ?
+        return typeof compilerOptions.module === "number" ?
             compilerOptions.module :
-            getEmitScriptTarget(compilerOptions) === 2 /* ES6 */ ? 5 /* ES6 */ : 0 /* None */;
+            getEmitScriptTarget(compilerOptions) === 2 /* ES6 */ ? ts.ModuleKind.ES6 : ts.ModuleKind.CommonJS;
     }
     ts.getEmitModuleKind = getEmitModuleKind;
     function forEachExpectedEmitFile(host, action, targetSourceFile) {
@@ -6240,25 +6659,41 @@ var ts;
             }
         }
         function onSingleFileEmit(host, sourceFile) {
-            var jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, sourceFile.languageVariant === 1 /* JSX */ && options.jsx === 1 /* Preserve */ ? ".jsx" : ".js");
+            // 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
+            var extension = ".js";
+            if (options.jsx === 1 /* Preserve */) {
+                if (isSourceFileJavaScript(sourceFile)) {
+                    if (ts.fileExtensionIs(sourceFile.fileName, ".jsx")) {
+                        extension = ".jsx";
+                    }
+                }
+                else if (sourceFile.languageVariant === 1 /* JSX */) {
+                    // TypeScript source file preserving JSX syntax
+                    extension = ".jsx";
+                }
+            }
+            var jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, extension);
             var emitFileNames = {
                 jsFilePath: jsFilePath,
                 sourceMapFilePath: getSourceMapFilePath(jsFilePath, options),
-                declarationFilePath: !isSourceFileJavaScript(sourceFile) ? getDeclarationEmitFilePath(jsFilePath, options) : undefined
+                declarationFilePath: !isSourceFileJavaScript(sourceFile) ? getDeclarationEmitOutputFilePath(sourceFile, host) : undefined
             };
             action(emitFileNames, [sourceFile], /*isBundledEmit*/ false);
         }
         function onBundledEmit(host) {
             // Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified
-            var bundledSources = ts.filter(host.getSourceFiles(), function (sourceFile) { return !isDeclarationFile(sourceFile) &&
-                (!isExternalModule(sourceFile) ||
-                    (getEmitModuleKind(options) && isExternalModule(sourceFile))); }); // module that can emit - note falsy value from getEmitModuleKind means the module kind that shouldn't be emitted
+            var bundledSources = ts.filter(host.getSourceFiles(), function (sourceFile) {
+                return !isDeclarationFile(sourceFile) // Not a declaration file
+                    && (!ts.isExternalModule(sourceFile) || !!getEmitModuleKind(options));
+            }); // and not a module, unless module emit enabled
             if (bundledSources.length) {
                 var jsFilePath = options.outFile || options.out;
                 var emitFileNames = {
                     jsFilePath: jsFilePath,
                     sourceMapFilePath: getSourceMapFilePath(jsFilePath, options),
-                    declarationFilePath: getDeclarationEmitFilePath(jsFilePath, options)
+                    declarationFilePath: options.declaration ? ts.removeFileExtension(jsFilePath) + ".d.ts" : undefined
                 };
                 action(emitFileNames, bundledSources, /*isBundledEmit*/ true);
             }
@@ -6266,9 +6701,6 @@ var ts;
         function getSourceMapFilePath(jsFilePath, options) {
             return options.sourceMap ? jsFilePath + ".map" : undefined;
         }
-        function getDeclarationEmitFilePath(jsFilePath, options) {
-            return options.declaration ? ts.removeFileExtension(jsFilePath) + ".d.ts" : undefined;
-        }
     }
     ts.forEachExpectedEmitFile = forEachExpectedEmitFile;
     function getSourceFilePathInNewDir(sourceFile, host, newDirPath) {
@@ -6277,10 +6709,10 @@ var ts;
         return ts.combinePaths(newDirPath, sourceFilePath);
     }
     ts.getSourceFilePathInNewDir = getSourceFilePathInNewDir;
-    function writeFile(host, diagnostics, fileName, data, writeByteOrderMark) {
+    function writeFile(host, diagnostics, fileName, data, writeByteOrderMark, sourceFiles) {
         host.writeFile(fileName, data, writeByteOrderMark, function (hostErrorMessage) {
             diagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Could_not_write_file_0_Colon_1, fileName, hostErrorMessage));
-        });
+        }, sourceFiles);
     }
     ts.writeFile = writeFile;
     function getLineOfLocalPosition(currentSourceFile, pos) {
@@ -6293,7 +6725,7 @@ var ts;
     ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap;
     function getFirstConstructorWithBody(node) {
         return ts.forEach(node.members, function (member) {
-            if (member.kind === 145 /* Constructor */ && nodeIsPresent(member.body)) {
+            if (member.kind === 147 /* Constructor */ && nodeIsPresent(member.body)) {
                 return member;
             }
         });
@@ -6310,10 +6742,10 @@ var ts;
         var setAccessor;
         if (hasDynamicName(accessor)) {
             firstAccessor = accessor;
-            if (accessor.kind === 146 /* GetAccessor */) {
+            if (accessor.kind === 148 /* GetAccessor */) {
                 getAccessor = accessor;
             }
-            else if (accessor.kind === 147 /* SetAccessor */) {
+            else if (accessor.kind === 149 /* SetAccessor */) {
                 setAccessor = accessor;
             }
             else {
@@ -6322,8 +6754,8 @@ var ts;
         }
         else {
             ts.forEach(declarations, function (member) {
-                if ((member.kind === 146 /* GetAccessor */ || member.kind === 147 /* SetAccessor */)
-                    && (member.flags & 64 /* Static */) === (accessor.flags & 64 /* Static */)) {
+                if ((member.kind === 148 /* GetAccessor */ || member.kind === 149 /* SetAccessor */)
+                    && (member.flags & 32 /* Static */) === (accessor.flags & 32 /* Static */)) {
                     var memberName = getPropertyNameForPropertyNameNode(member.name);
                     var accessorName = getPropertyNameForPropertyNameNode(accessor.name);
                     if (memberName === accessorName) {
@@ -6333,10 +6765,10 @@ var ts;
                         else if (!secondAccessor) {
                             secondAccessor = member;
                         }
-                        if (member.kind === 146 /* GetAccessor */ && !getAccessor) {
+                        if (member.kind === 148 /* GetAccessor */ && !getAccessor) {
                             getAccessor = member;
                         }
-                        if (member.kind === 147 /* SetAccessor */ && !setAccessor) {
+                        if (member.kind === 149 /* SetAccessor */ && !setAccessor) {
                             setAccessor = member;
                         }
                     }
@@ -6403,7 +6835,7 @@ var ts;
         }
         if (leadingComments) {
             var detachedComments = [];
-            var lastComment;
+            var lastComment = void 0;
             for (var _i = 0, leadingComments_1 = leadingComments; _i < leadingComments_1.length; _i++) {
                 var comment = leadingComments_1[_i];
                 if (lastComment) {
@@ -6444,7 +6876,7 @@ var ts;
         if (text.charCodeAt(comment.pos + 1) === 42 /* asterisk */) {
             var firstCommentLineAndCharacter = ts.computeLineAndCharacterOfPosition(lineMap, comment.pos);
             var lineCount = lineMap.length;
-            var firstCommentLineIndent;
+            var firstCommentLineIndent = void 0;
             for (var pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) {
                 var nextLineStart = (currentLine + 1) === lineCount
                     ? text.length + 1
@@ -6529,16 +6961,17 @@ var ts;
     }
     function modifierToFlag(token) {
         switch (token) {
-            case 113 /* StaticKeyword */: return 64 /* Static */;
-            case 112 /* PublicKeyword */: return 8 /* Public */;
-            case 111 /* ProtectedKeyword */: return 32 /* Protected */;
-            case 110 /* PrivateKeyword */: return 16 /* Private */;
+            case 113 /* StaticKeyword */: return 32 /* Static */;
+            case 112 /* PublicKeyword */: return 4 /* Public */;
+            case 111 /* ProtectedKeyword */: return 16 /* Protected */;
+            case 110 /* PrivateKeyword */: return 8 /* Private */;
             case 115 /* AbstractKeyword */: return 128 /* Abstract */;
-            case 82 /* ExportKeyword */: return 2 /* Export */;
-            case 122 /* DeclareKeyword */: return 4 /* Ambient */;
-            case 74 /* ConstKeyword */: return 16384 /* Const */;
+            case 82 /* ExportKeyword */: return 1 /* Export */;
+            case 122 /* DeclareKeyword */: return 2 /* Ambient */;
+            case 74 /* ConstKeyword */: return 2048 /* Const */;
             case 77 /* DefaultKeyword */: return 512 /* Default */;
             case 118 /* AsyncKeyword */: return 256 /* Async */;
+            case 127 /* ReadonlyKeyword */: return 64 /* Readonly */;
         }
         return 0;
     }
@@ -6546,24 +6979,25 @@ var ts;
     function isLeftHandSideExpression(expr) {
         if (expr) {
             switch (expr.kind) {
-                case 169 /* PropertyAccessExpression */:
-                case 170 /* ElementAccessExpression */:
-                case 172 /* NewExpression */:
-                case 171 /* CallExpression */:
-                case 236 /* JsxElement */:
-                case 237 /* JsxSelfClosingElement */:
-                case 173 /* TaggedTemplateExpression */:
-                case 167 /* ArrayLiteralExpression */:
-                case 175 /* ParenthesizedExpression */:
-                case 168 /* ObjectLiteralExpression */:
-                case 189 /* ClassExpression */:
-                case 176 /* FunctionExpression */:
+                case 171 /* PropertyAccessExpression */:
+                case 172 /* ElementAccessExpression */:
+                case 174 /* NewExpression */:
+                case 173 /* CallExpression */:
+                case 195 /* NonNullExpression */:
+                case 240 /* JsxElement */:
+                case 241 /* JsxSelfClosingElement */:
+                case 175 /* TaggedTemplateExpression */:
+                case 169 /* ArrayLiteralExpression */:
+                case 177 /* ParenthesizedExpression */:
+                case 170 /* ObjectLiteralExpression */:
+                case 191 /* ClassExpression */:
+                case 178 /* FunctionExpression */:
                 case 69 /* Identifier */:
                 case 10 /* RegularExpressionLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* StringLiteral */:
                 case 11 /* NoSubstitutionTemplateLiteral */:
-                case 186 /* TemplateExpression */:
+                case 188 /* TemplateExpression */:
                 case 84 /* FalseKeyword */:
                 case 93 /* NullKeyword */:
                 case 97 /* ThisKeyword */:
@@ -6580,7 +7014,7 @@ var ts;
     }
     ts.isAssignmentOperator = isAssignmentOperator;
     function isExpressionWithTypeArgumentsInClassExtendsClause(node) {
-        return node.kind === 191 /* ExpressionWithTypeArguments */ &&
+        return node.kind === 193 /* ExpressionWithTypeArguments */ &&
             node.parent.token === 83 /* ExtendsKeyword */ &&
             isClassLike(node.parent.parent);
     }
@@ -6603,16 +7037,16 @@ var ts;
         }
     }
     function isRightSideOfQualifiedNameOrPropertyAccess(node) {
-        return (node.parent.kind === 136 /* QualifiedName */ && node.parent.right === node) ||
-            (node.parent.kind === 169 /* PropertyAccessExpression */ && node.parent.name === node);
+        return (node.parent.kind === 138 /* QualifiedName */ && node.parent.right === node) ||
+            (node.parent.kind === 171 /* PropertyAccessExpression */ && node.parent.name === node);
     }
     ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess;
     function isEmptyObjectLiteralOrArrayLiteral(expression) {
         var kind = expression.kind;
-        if (kind === 168 /* ObjectLiteralExpression */) {
+        if (kind === 170 /* ObjectLiteralExpression */) {
             return expression.properties.length === 0;
         }
-        if (kind === 167 /* ArrayLiteralExpression */) {
+        if (kind === 169 /* ArrayLiteralExpression */) {
             return expression.elements.length === 0;
         }
         return false;
@@ -6726,7 +7160,7 @@ var ts;
             else if (i + 2 >= length) {
                 byte4 = 64;
             }
-            // Write to the ouput
+            // Write to the output
             result += base64Digits.charAt(byte1) + base64Digits.charAt(byte2) + base64Digits.charAt(byte3) + base64Digits.charAt(byte4);
             i += 3;
         }
@@ -6754,6 +7188,11 @@ var ts;
         return carriageReturnLineFeed;
     }
     ts.getNewLineCharacter = getNewLineCharacter;
+    function isWatchSet(options) {
+        // Firefox has Object.prototype.watch
+        return options.watch && options.hasOwnProperty("watch");
+    }
+    ts.isWatchSet = isWatchSet;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -6912,9 +7351,9 @@ var ts;
             //                .                    |                                      \
             //      ----------------------------------------------------------------------*--------------------------------
             //
-            // (Note the dots represent the newly inferrred start.
+            // (Note the dots represent the newly inferred start.
             // Determining the new and old end is also pretty simple.  Basically it boils down to paying attention to the
-            // absolute positions at the asterixes, and the relative change between the dollar signs. Basically, we see
+            // absolute positions at the asterisks, and the relative change between the dollar signs. Basically, we see
             // which if the two $'s precedes the other, and we move that one forward until they line up.  in this case that
             // means:
             //
@@ -6937,8 +7376,8 @@ var ts;
             // ended with a delta of 20 characters (60 - 40).  Thus, if we go back in time to where the first edit started
             // that's the same as if we started at char 80 instead of 60.
             //
-            // As it so happens, the same logic applies if the second edit precedes the first edit.  In that case rahter
-            // than pusing the first edit forward to match the second, we'll push the second edit forward to match the
+            // As it so happens, the same logic applies if the second edit precedes the first edit.  In that case rather
+            // than pushing the first edit forward to match the second, we'll push the second edit forward to match the
             // first.
             //
             // In this case that means we have { oldStart: 10, oldEnd: 80, newEnd: 70 } or, in TextChangeRange
@@ -6967,9 +7406,9 @@ var ts;
     }
     ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
     function getTypeParameterOwner(d) {
-        if (d && d.kind === 138 /* TypeParameter */) {
+        if (d && d.kind === 140 /* TypeParameter */) {
             for (var current = d; current; current = current.parent) {
-                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 218 /* InterfaceDeclaration */) {
+                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 221 /* InterfaceDeclaration */) {
                     return current;
                 }
             }
@@ -6977,9 +7416,18 @@ var ts;
     }
     ts.getTypeParameterOwner = getTypeParameterOwner;
     function isParameterPropertyDeclaration(node) {
-        return node.flags & 56 /* AccessibilityModifier */ && node.parent.kind === 145 /* Constructor */ && ts.isClassLike(node.parent.parent);
+        return node.flags & 28 /* AccessibilityModifier */ && node.parent.kind === 147 /* 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"/>
@@ -6989,7 +7437,7 @@ var ts;
     var NodeConstructor;
     var SourceFileConstructor;
     function createNode(kind, pos, end) {
-        if (kind === 251 /* SourceFile */) {
+        if (kind === 255 /* SourceFile */) {
             return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
         }
         else {
@@ -7032,26 +7480,26 @@ var ts;
         var visitNodes = cbNodeArray ? visitNodeArray : visitEachNode;
         var cbNodes = cbNodeArray || cbNode;
         switch (node.kind) {
-            case 136 /* QualifiedName */:
+            case 138 /* QualifiedName */:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.right);
-            case 138 /* TypeParameter */:
+            case 140 /* TypeParameter */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNode(cbNode, node.expression);
-            case 249 /* ShorthandPropertyAssignment */:
+            case 253 /* ShorthandPropertyAssignment */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.equalsToken) ||
                     visitNode(cbNode, node.objectAssignmentInitializer);
-            case 139 /* Parameter */:
-            case 142 /* PropertyDeclaration */:
-            case 141 /* PropertySignature */:
-            case 248 /* PropertyAssignment */:
-            case 214 /* VariableDeclaration */:
-            case 166 /* BindingElement */:
+            case 141 /* Parameter */:
+            case 144 /* PropertyDeclaration */:
+            case 143 /* PropertySignature */:
+            case 252 /* PropertyAssignment */:
+            case 217 /* VariableDeclaration */:
+            case 168 /* BindingElement */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.propertyName) ||
@@ -7060,24 +7508,24 @@ var ts;
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 153 /* FunctionType */:
-            case 154 /* ConstructorType */:
-            case 148 /* CallSignature */:
-            case 149 /* ConstructSignature */:
-            case 150 /* IndexSignature */:
+            case 155 /* FunctionType */:
+            case 156 /* ConstructorType */:
+            case 150 /* CallSignature */:
+            case 151 /* ConstructSignature */:
+            case 152 /* IndexSignature */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNodes(cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 144 /* MethodDeclaration */:
-            case 143 /* MethodSignature */:
-            case 145 /* Constructor */:
-            case 146 /* GetAccessor */:
-            case 147 /* SetAccessor */:
-            case 176 /* FunctionExpression */:
-            case 216 /* FunctionDeclaration */:
-            case 177 /* ArrowFunction */:
+            case 146 /* MethodDeclaration */:
+            case 145 /* MethodSignature */:
+            case 147 /* Constructor */:
+            case 148 /* GetAccessor */:
+            case 149 /* SetAccessor */:
+            case 178 /* FunctionExpression */:
+            case 219 /* FunctionDeclaration */:
+            case 179 /* ArrowFunction */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.asteriskToken) ||
@@ -7088,302 +7536,310 @@ var ts;
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.equalsGreaterThanToken) ||
                     visitNode(cbNode, node.body);
-            case 152 /* TypeReference */:
+            case 154 /* TypeReference */:
                 return visitNode(cbNode, node.typeName) ||
                     visitNodes(cbNodes, node.typeArguments);
-            case 151 /* TypePredicate */:
+            case 153 /* TypePredicate */:
                 return visitNode(cbNode, node.parameterName) ||
                     visitNode(cbNode, node.type);
-            case 155 /* TypeQuery */:
+            case 157 /* TypeQuery */:
                 return visitNode(cbNode, node.exprName);
-            case 156 /* TypeLiteral */:
+            case 158 /* TypeLiteral */:
                 return visitNodes(cbNodes, node.members);
-            case 157 /* ArrayType */:
+            case 159 /* ArrayType */:
                 return visitNode(cbNode, node.elementType);
-            case 158 /* TupleType */:
+            case 160 /* TupleType */:
                 return visitNodes(cbNodes, node.elementTypes);
-            case 159 /* UnionType */:
-            case 160 /* IntersectionType */:
+            case 161 /* UnionType */:
+            case 162 /* IntersectionType */:
                 return visitNodes(cbNodes, node.types);
-            case 161 /* ParenthesizedType */:
+            case 163 /* ParenthesizedType */:
                 return visitNode(cbNode, node.type);
-            case 164 /* ObjectBindingPattern */:
-            case 165 /* ArrayBindingPattern */:
+            case 166 /* ObjectBindingPattern */:
+            case 167 /* ArrayBindingPattern */:
                 return visitNodes(cbNodes, node.elements);
-            case 167 /* ArrayLiteralExpression */:
+            case 169 /* ArrayLiteralExpression */:
                 return visitNodes(cbNodes, node.elements);
-            case 168 /* ObjectLiteralExpression */:
+            case 170 /* ObjectLiteralExpression */:
                 return visitNodes(cbNodes, node.properties);
-            case 169 /* PropertyAccessExpression */:
+            case 171 /* PropertyAccessExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.dotToken) ||
                     visitNode(cbNode, node.name);
-            case 170 /* ElementAccessExpression */:
+            case 172 /* ElementAccessExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.argumentExpression);
-            case 171 /* CallExpression */:
-            case 172 /* NewExpression */:
+            case 173 /* CallExpression */:
+            case 174 /* NewExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNodes, node.typeArguments) ||
                     visitNodes(cbNodes, node.arguments);
-            case 173 /* TaggedTemplateExpression */:
+            case 175 /* TaggedTemplateExpression */:
                 return visitNode(cbNode, node.tag) ||
                     visitNode(cbNode, node.template);
-            case 174 /* TypeAssertionExpression */:
+            case 176 /* TypeAssertionExpression */:
                 return visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.expression);
-            case 175 /* ParenthesizedExpression */:
+            case 177 /* ParenthesizedExpression */:
                 return visitNode(cbNode, node.expression);
-            case 178 /* DeleteExpression */:
+            case 180 /* DeleteExpression */:
                 return visitNode(cbNode, node.expression);
-            case 179 /* TypeOfExpression */:
+            case 181 /* TypeOfExpression */:
                 return visitNode(cbNode, node.expression);
-            case 180 /* VoidExpression */:
+            case 182 /* VoidExpression */:
                 return visitNode(cbNode, node.expression);
-            case 182 /* PrefixUnaryExpression */:
+            case 184 /* PrefixUnaryExpression */:
                 return visitNode(cbNode, node.operand);
-            case 187 /* YieldExpression */:
+            case 189 /* YieldExpression */:
                 return visitNode(cbNode, node.asteriskToken) ||
                     visitNode(cbNode, node.expression);
-            case 181 /* AwaitExpression */:
+            case 183 /* AwaitExpression */:
                 return visitNode(cbNode, node.expression);
-            case 183 /* PostfixUnaryExpression */:
+            case 185 /* PostfixUnaryExpression */:
                 return visitNode(cbNode, node.operand);
-            case 184 /* BinaryExpression */:
+            case 186 /* BinaryExpression */:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.operatorToken) ||
                     visitNode(cbNode, node.right);
-            case 192 /* AsExpression */:
+            case 194 /* AsExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.type);
-            case 185 /* ConditionalExpression */:
+            case 195 /* NonNullExpression */:
+                return visitNode(cbNode, node.expression);
+            case 187 /* ConditionalExpression */:
                 return visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.whenTrue) ||
                     visitNode(cbNode, node.colonToken) ||
                     visitNode(cbNode, node.whenFalse);
-            case 188 /* SpreadElementExpression */:
+            case 190 /* SpreadElementExpression */:
                 return visitNode(cbNode, node.expression);
-            case 195 /* Block */:
-            case 222 /* ModuleBlock */:
+            case 198 /* Block */:
+            case 225 /* ModuleBlock */:
                 return visitNodes(cbNodes, node.statements);
-            case 251 /* SourceFile */:
+            case 255 /* SourceFile */:
                 return visitNodes(cbNodes, node.statements) ||
                     visitNode(cbNode, node.endOfFileToken);
-            case 196 /* VariableStatement */:
+            case 199 /* VariableStatement */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.declarationList);
-            case 215 /* VariableDeclarationList */:
+            case 218 /* VariableDeclarationList */:
                 return visitNodes(cbNodes, node.declarations);
-            case 198 /* ExpressionStatement */:
+            case 201 /* ExpressionStatement */:
                 return visitNode(cbNode, node.expression);
-            case 199 /* IfStatement */:
+            case 202 /* IfStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.thenStatement) ||
                     visitNode(cbNode, node.elseStatement);
-            case 200 /* DoStatement */:
+            case 203 /* DoStatement */:
                 return visitNode(cbNode, node.statement) ||
                     visitNode(cbNode, node.expression);
-            case 201 /* WhileStatement */:
+            case 204 /* WhileStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 202 /* ForStatement */:
+            case 205 /* ForStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.incrementor) ||
                     visitNode(cbNode, node.statement);
-            case 203 /* ForInStatement */:
+            case 206 /* ForInStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 204 /* ForOfStatement */:
+            case 207 /* ForOfStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 205 /* ContinueStatement */:
-            case 206 /* BreakStatement */:
+            case 208 /* ContinueStatement */:
+            case 209 /* BreakStatement */:
                 return visitNode(cbNode, node.label);
-            case 207 /* ReturnStatement */:
+            case 210 /* ReturnStatement */:
                 return visitNode(cbNode, node.expression);
-            case 208 /* WithStatement */:
+            case 211 /* WithStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 209 /* SwitchStatement */:
+            case 212 /* SwitchStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.caseBlock);
-            case 223 /* CaseBlock */:
+            case 226 /* CaseBlock */:
                 return visitNodes(cbNodes, node.clauses);
-            case 244 /* CaseClause */:
+            case 248 /* CaseClause */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNodes, node.statements);
-            case 245 /* DefaultClause */:
+            case 249 /* DefaultClause */:
                 return visitNodes(cbNodes, node.statements);
-            case 210 /* LabeledStatement */:
+            case 213 /* LabeledStatement */:
                 return visitNode(cbNode, node.label) ||
                     visitNode(cbNode, node.statement);
-            case 211 /* ThrowStatement */:
+            case 214 /* ThrowStatement */:
                 return visitNode(cbNode, node.expression);
-            case 212 /* TryStatement */:
+            case 215 /* TryStatement */:
                 return visitNode(cbNode, node.tryBlock) ||
                     visitNode(cbNode, node.catchClause) ||
                     visitNode(cbNode, node.finallyBlock);
-            case 247 /* CatchClause */:
+            case 251 /* CatchClause */:
                 return visitNode(cbNode, node.variableDeclaration) ||
                     visitNode(cbNode, node.block);
-            case 140 /* Decorator */:
+            case 142 /* Decorator */:
                 return visitNode(cbNode, node.expression);
-            case 217 /* ClassDeclaration */:
-            case 189 /* ClassExpression */:
+            case 220 /* ClassDeclaration */:
+            case 191 /* ClassExpression */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNodes(cbNodes, node.heritageClauses) ||
                     visitNodes(cbNodes, node.members);
-            case 218 /* InterfaceDeclaration */:
+            case 221 /* InterfaceDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNodes(cbNodes, node.heritageClauses) ||
                     visitNodes(cbNodes, node.members);
-            case 219 /* TypeAliasDeclaration */:
+            case 222 /* TypeAliasDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNode(cbNode, node.type);
-            case 220 /* EnumDeclaration */:
+            case 223 /* EnumDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.members);
-            case 250 /* EnumMember */:
+            case 254 /* EnumMember */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 221 /* ModuleDeclaration */:
+            case 224 /* ModuleDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.body);
-            case 224 /* ImportEqualsDeclaration */:
+            case 228 /* ImportEqualsDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.moduleReference);
-            case 225 /* ImportDeclaration */:
+            case 229 /* ImportDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.importClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 226 /* ImportClause */:
+            case 230 /* ImportClause */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.namedBindings);
-            case 227 /* NamespaceImport */:
+            case 227 /* GlobalModuleExportDeclaration */:
                 return visitNode(cbNode, node.name);
-            case 228 /* NamedImports */:
-            case 232 /* NamedExports */:
+            case 231 /* NamespaceImport */:
+                return visitNode(cbNode, node.name);
+            case 232 /* NamedImports */:
+            case 236 /* NamedExports */:
                 return visitNodes(cbNodes, node.elements);
-            case 231 /* ExportDeclaration */:
+            case 235 /* ExportDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.exportClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 229 /* ImportSpecifier */:
-            case 233 /* ExportSpecifier */:
+            case 233 /* ImportSpecifier */:
+            case 237 /* ExportSpecifier */:
                 return visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name);
-            case 230 /* ExportAssignment */:
+            case 234 /* ExportAssignment */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.expression);
-            case 186 /* TemplateExpression */:
+            case 188 /* TemplateExpression */:
                 return visitNode(cbNode, node.head) || visitNodes(cbNodes, node.templateSpans);
-            case 193 /* TemplateSpan */:
+            case 196 /* TemplateSpan */:
                 return visitNode(cbNode, node.expression) || visitNode(cbNode, node.literal);
-            case 137 /* ComputedPropertyName */:
+            case 139 /* ComputedPropertyName */:
                 return visitNode(cbNode, node.expression);
-            case 246 /* HeritageClause */:
+            case 250 /* HeritageClause */:
                 return visitNodes(cbNodes, node.types);
-            case 191 /* ExpressionWithTypeArguments */:
+            case 193 /* ExpressionWithTypeArguments */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNodes, node.typeArguments);
-            case 235 /* ExternalModuleReference */:
+            case 239 /* ExternalModuleReference */:
                 return visitNode(cbNode, node.expression);
-            case 234 /* MissingDeclaration */:
+            case 238 /* MissingDeclaration */:
                 return visitNodes(cbNodes, node.decorators);
-            case 236 /* JsxElement */:
+            case 240 /* JsxElement */:
                 return visitNode(cbNode, node.openingElement) ||
                     visitNodes(cbNodes, node.children) ||
                     visitNode(cbNode, node.closingElement);
-            case 237 /* JsxSelfClosingElement */:
-            case 238 /* JsxOpeningElement */:
+            case 241 /* JsxSelfClosingElement */:
+            case 242 /* JsxOpeningElement */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNodes(cbNodes, node.attributes);
-            case 241 /* JsxAttribute */:
+            case 245 /* JsxAttribute */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 242 /* JsxSpreadAttribute */:
+            case 246 /* JsxSpreadAttribute */:
                 return visitNode(cbNode, node.expression);
-            case 243 /* JsxExpression */:
+            case 247 /* JsxExpression */:
                 return visitNode(cbNode, node.expression);
-            case 240 /* JsxClosingElement */:
+            case 244 /* JsxClosingElement */:
                 return visitNode(cbNode, node.tagName);
-            case 252 /* JSDocTypeExpression */:
+            case 256 /* JSDocTypeExpression */:
                 return visitNode(cbNode, node.type);
-            case 256 /* JSDocUnionType */:
+            case 260 /* JSDocUnionType */:
                 return visitNodes(cbNodes, node.types);
-            case 257 /* JSDocTupleType */:
+            case 261 /* JSDocTupleType */:
                 return visitNodes(cbNodes, node.types);
-            case 255 /* JSDocArrayType */:
+            case 259 /* JSDocArrayType */:
                 return visitNode(cbNode, node.elementType);
-            case 259 /* JSDocNonNullableType */:
+            case 263 /* JSDocNonNullableType */:
                 return visitNode(cbNode, node.type);
-            case 258 /* JSDocNullableType */:
+            case 262 /* JSDocNullableType */:
                 return visitNode(cbNode, node.type);
-            case 260 /* JSDocRecordType */:
+            case 264 /* JSDocRecordType */:
                 return visitNodes(cbNodes, node.members);
-            case 262 /* JSDocTypeReference */:
+            case 266 /* JSDocTypeReference */:
                 return visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.typeArguments);
-            case 263 /* JSDocOptionalType */:
+            case 267 /* JSDocOptionalType */:
                 return visitNode(cbNode, node.type);
-            case 264 /* JSDocFunctionType */:
+            case 268 /* JSDocFunctionType */:
                 return visitNodes(cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 265 /* JSDocVariadicType */:
+            case 269 /* JSDocVariadicType */:
                 return visitNode(cbNode, node.type);
-            case 266 /* JSDocConstructorType */:
+            case 270 /* JSDocConstructorType */:
                 return visitNode(cbNode, node.type);
-            case 267 /* JSDocThisType */:
+            case 271 /* JSDocThisType */:
                 return visitNode(cbNode, node.type);
-            case 261 /* JSDocRecordMember */:
+            case 265 /* JSDocRecordMember */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.type);
-            case 268 /* JSDocComment */:
+            case 272 /* JSDocComment */:
                 return visitNodes(cbNodes, node.tags);
-            case 270 /* JSDocParameterTag */:
+            case 274 /* JSDocParameterTag */:
                 return visitNode(cbNode, node.preParameterName) ||
                     visitNode(cbNode, node.typeExpression) ||
                     visitNode(cbNode, node.postParameterName);
-            case 271 /* JSDocReturnTag */:
+            case 275 /* JSDocReturnTag */:
                 return visitNode(cbNode, node.typeExpression);
-            case 272 /* JSDocTypeTag */:
+            case 276 /* JSDocTypeTag */:
                 return visitNode(cbNode, node.typeExpression);
-            case 273 /* JSDocTemplateTag */:
+            case 277 /* JSDocTemplateTag */:
                 return visitNodes(cbNodes, node.typeParameters);
         }
     }
     ts.forEachChild = forEachChild;
-    function createSourceFile(fileName, sourceText, languageVersion, setParentNodes) {
+    function createSourceFile(fileName, sourceText, languageVersion, setParentNodes, scriptKind) {
         if (setParentNodes === void 0) { setParentNodes = false; }
         var start = new Date().getTime();
-        var result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes);
+        var result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes, scriptKind);
         ts.parseTime += new Date().getTime() - start;
         return result;
     }
     ts.createSourceFile = createSourceFile;
+    function isExternalModule(file) {
+        return file.externalModuleIndicator !== undefined;
+    }
+    ts.isExternalModule = isExternalModule;
     // Produces a new SourceFile for the 'newText' provided. The 'textChangeRange' parameter
     // indicates what changed between the 'text' that this SourceFile has and the 'newText'.
     // The SourceFile will be created with the compiler attempting to reuse as many nodes from
@@ -7416,7 +7872,7 @@ var ts;
         // Share a single scanner across all calls to parse a source file.  This helps speed things
         // up by avoiding the cost of creating/compiling scanners over and over again.
         var scanner = ts.createScanner(2 /* Latest */, /*skipTrivia*/ true);
-        var disallowInAndDecoratorContext = 1 /* DisallowIn */ | 4 /* Decorator */;
+        var disallowInAndDecoratorContext = 4194304 /* DisallowInContext */ | 16777216 /* DecoratorContext */;
         // capture constructors in 'initializeState' to avoid null checks
         var NodeConstructor;
         var SourceFileConstructor;
@@ -7504,19 +7960,19 @@ var ts;
         // Note: any errors at the end of the file that do not precede a regular node, should get
         // attached to the EOF token.
         var parseErrorBeforeNextFinishedNode = false;
-        function parseSourceFile(fileName, _sourceText, languageVersion, _syntaxCursor, setParentNodes) {
-            var isJavaScriptFile = ts.hasJavaScriptFileExtension(fileName) || _sourceText.lastIndexOf("// @language=javascript", 0) === 0;
-            initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor);
-            var result = parseSourceFileWorker(fileName, languageVersion, setParentNodes);
+        function parseSourceFile(fileName, _sourceText, languageVersion, _syntaxCursor, setParentNodes, scriptKind) {
+            scriptKind = ts.ensureScriptKind(fileName, scriptKind);
+            initializeState(fileName, _sourceText, languageVersion, _syntaxCursor, scriptKind);
+            var result = parseSourceFileWorker(fileName, languageVersion, setParentNodes, scriptKind);
             clearState();
             return result;
         }
         Parser.parseSourceFile = parseSourceFile;
-        function getLanguageVariant(fileName) {
+        function getLanguageVariant(scriptKind) {
             // .tsx and .jsx files are treated as jsx language variant.
-            return ts.fileExtensionIs(fileName, ".tsx") || ts.fileExtensionIs(fileName, ".jsx") ? 1 /* JSX */ : 0 /* Standard */;
+            return scriptKind === 4 /* TSX */ || scriptKind === 2 /* JSX */ || scriptKind === 1 /* JS */ ? 1 /* JSX */ : 0 /* Standard */;
         }
-        function initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor) {
+        function initializeState(fileName, _sourceText, languageVersion, _syntaxCursor, scriptKind) {
             NodeConstructor = ts.objectAllocator.getNodeConstructor();
             SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor();
             sourceText = _sourceText;
@@ -7526,30 +7982,28 @@ var ts;
             identifiers = {};
             identifierCount = 0;
             nodeCount = 0;
-            contextFlags = isJavaScriptFile ? 32 /* JavaScriptFile */ : 0 /* None */;
+            contextFlags = scriptKind === 1 /* JS */ || scriptKind === 2 /* JSX */ ? 134217728 /* JavaScriptFile */ : 0 /* None */;
             parseErrorBeforeNextFinishedNode = false;
             // Initialize and prime the scanner before parsing the source elements.
             scanner.setText(sourceText);
             scanner.setOnError(scanError);
             scanner.setScriptTarget(languageVersion);
-            scanner.setLanguageVariant(getLanguageVariant(fileName));
+            scanner.setLanguageVariant(getLanguageVariant(scriptKind));
         }
         function clearState() {
             // Clear out the text the scanner is pointing at, so it doesn't keep anything alive unnecessarily.
             scanner.setText("");
             scanner.setOnError(undefined);
-            // Clear any data.  We don't want to accidently hold onto it for too long.
+            // Clear any data.  We don't want to accidentally hold onto it for too long.
             parseDiagnostics = undefined;
             sourceFile = undefined;
             identifiers = undefined;
             syntaxCursor = undefined;
             sourceText = undefined;
         }
-        function parseSourceFileWorker(fileName, languageVersion, setParentNodes) {
-            sourceFile = createSourceFile(fileName, languageVersion);
-            if (contextFlags & 32 /* JavaScriptFile */) {
-                sourceFile.parserContextFlags = 32 /* JavaScriptFile */;
-            }
+        function parseSourceFileWorker(fileName, languageVersion, setParentNodes, scriptKind) {
+            sourceFile = createSourceFile(fileName, languageVersion, scriptKind);
+            sourceFile.flags = contextFlags;
             // Prime the scanner.
             token = nextToken();
             processReferenceComments(sourceFile);
@@ -7564,40 +8018,22 @@ var ts;
             if (setParentNodes) {
                 fixupParentReferences(sourceFile);
             }
-            // If this is a javascript file, proactively see if we can get JSDoc comments for
-            // relevant nodes in the file.  We'll use these to provide typing informaion if they're
-            // available.
-            if (ts.isSourceFileJavaScript(sourceFile)) {
-                addJSDocComments();
-            }
             return sourceFile;
         }
-        function addJSDocComments() {
-            forEachChild(sourceFile, visit);
-            return;
-            function visit(node) {
-                // Add additional cases as necessary depending on how we see JSDoc comments used
-                // in the wild.
-                switch (node.kind) {
-                    case 196 /* VariableStatement */:
-                    case 216 /* FunctionDeclaration */:
-                    case 139 /* Parameter */:
-                        addJSDocComment(node);
-                }
-                forEachChild(node, visit);
-            }
-        }
         function addJSDocComment(node) {
-            var comments = ts.getLeadingCommentRangesOfNode(node, sourceFile);
-            if (comments) {
-                for (var _i = 0, comments_1 = comments; _i < comments_1.length; _i++) {
-                    var comment = comments_1[_i];
-                    var jsDocComment = JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos);
-                    if (jsDocComment) {
-                        node.jsDocComment = jsDocComment;
+            if (contextFlags & 134217728 /* JavaScriptFile */) {
+                var comments = ts.getLeadingCommentRangesOfNode(node, sourceFile);
+                if (comments) {
+                    for (var _i = 0, comments_1 = comments; _i < comments_1.length; _i++) {
+                        var comment = comments_1[_i];
+                        var jsDocComment = JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos);
+                        if (jsDocComment) {
+                            node.jsDocComment = jsDocComment;
+                        }
                     }
                 }
             }
+            return node;
         }
         function fixupParentReferences(sourceFile) {
             // normally parent references are set during binding. However, for clients that only need
@@ -7621,17 +8057,18 @@ var ts;
             }
         }
         Parser.fixupParentReferences = fixupParentReferences;
-        function createSourceFile(fileName, languageVersion) {
+        function createSourceFile(fileName, languageVersion, scriptKind) {
             // code from createNode is inlined here so createNode won't have to deal with special case of creating source files
             // this is quite rare comparing to other nodes and createNode should be as fast as possible
-            var sourceFile = new SourceFileConstructor(251 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
+            var sourceFile = new SourceFileConstructor(255 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
             nodeCount++;
             sourceFile.text = sourceText;
             sourceFile.bindDiagnostics = [];
             sourceFile.languageVersion = languageVersion;
             sourceFile.fileName = ts.normalizePath(fileName);
-            sourceFile.flags = ts.fileExtensionIs(sourceFile.fileName, ".d.ts") ? 4096 /* DeclarationFile */ : 0;
-            sourceFile.languageVariant = getLanguageVariant(sourceFile.fileName);
+            sourceFile.languageVariant = getLanguageVariant(scriptKind);
+            sourceFile.isDeclarationFile = ts.fileExtensionIs(sourceFile.fileName, ".d.ts");
+            sourceFile.scriptKind = scriptKind;
             return sourceFile;
         }
         function setContextFlag(val, flag) {
@@ -7643,16 +8080,16 @@ var ts;
             }
         }
         function setDisallowInContext(val) {
-            setContextFlag(val, 1 /* DisallowIn */);
+            setContextFlag(val, 4194304 /* DisallowInContext */);
         }
         function setYieldContext(val) {
-            setContextFlag(val, 2 /* Yield */);
+            setContextFlag(val, 8388608 /* YieldContext */);
         }
         function setDecoratorContext(val) {
-            setContextFlag(val, 4 /* Decorator */);
+            setContextFlag(val, 16777216 /* DecoratorContext */);
         }
         function setAwaitContext(val) {
-            setContextFlag(val, 8 /* Await */);
+            setContextFlag(val, 33554432 /* AwaitContext */);
         }
         function doOutsideOfContext(context, func) {
             // contextFlagsToClear will contain only the context flags that are
@@ -7693,40 +8130,40 @@ var ts;
             return func();
         }
         function allowInAnd(func) {
-            return doOutsideOfContext(1 /* DisallowIn */, func);
+            return doOutsideOfContext(4194304 /* DisallowInContext */, func);
         }
         function disallowInAnd(func) {
-            return doInsideOfContext(1 /* DisallowIn */, func);
+            return doInsideOfContext(4194304 /* DisallowInContext */, func);
         }
         function doInYieldContext(func) {
-            return doInsideOfContext(2 /* Yield */, func);
+            return doInsideOfContext(8388608 /* YieldContext */, func);
         }
         function doInDecoratorContext(func) {
-            return doInsideOfContext(4 /* Decorator */, func);
+            return doInsideOfContext(16777216 /* DecoratorContext */, func);
         }
         function doInAwaitContext(func) {
-            return doInsideOfContext(8 /* Await */, func);
+            return doInsideOfContext(33554432 /* AwaitContext */, func);
         }
         function doOutsideOfAwaitContext(func) {
-            return doOutsideOfContext(8 /* Await */, func);
+            return doOutsideOfContext(33554432 /* AwaitContext */, func);
         }
         function doInYieldAndAwaitContext(func) {
-            return doInsideOfContext(2 /* Yield */ | 8 /* Await */, func);
+            return doInsideOfContext(8388608 /* YieldContext */ | 33554432 /* AwaitContext */, func);
         }
         function inContext(flags) {
             return (contextFlags & flags) !== 0;
         }
         function inYieldContext() {
-            return inContext(2 /* Yield */);
+            return inContext(8388608 /* YieldContext */);
         }
         function inDisallowInContext() {
-            return inContext(1 /* DisallowIn */);
+            return inContext(4194304 /* DisallowInContext */);
         }
         function inDecoratorContext() {
-            return inContext(4 /* Decorator */);
+            return inContext(16777216 /* DecoratorContext */);
         }
         function inAwaitContext() {
-            return inContext(8 /* Await */);
+            return inContext(33554432 /* AwaitContext */);
         }
         function parseErrorAtCurrentToken(message, arg0) {
             var start = scanner.getTokenPos();
@@ -7900,14 +8337,14 @@ var ts;
         function finishNode(node, end) {
             node.end = end === undefined ? scanner.getStartPos() : end;
             if (contextFlags) {
-                node.parserContextFlags = contextFlags;
+                node.flags |= contextFlags;
             }
             // Keep track on the node if we encountered an error while parsing it.  If we did, then
             // we cannot reuse the node incrementally.  Once we've marked this node, clear out the
             // flag so that we don't mark any subsequent nodes.
             if (parseErrorBeforeNextFinishedNode) {
                 parseErrorBeforeNextFinishedNode = false;
-                node.parserContextFlags |= 16 /* ThisNodeHasError */;
+                node.flags |= 67108864 /* ThisNodeHasError */;
             }
             return node;
         }
@@ -7976,7 +8413,7 @@ var ts;
             // PropertyName [Yield]:
             //      LiteralPropertyName
             //      ComputedPropertyName[?Yield]
-            var node = createNode(137 /* ComputedPropertyName */);
+            var node = createNode(139 /* ComputedPropertyName */);
             parseExpected(19 /* OpenBracketToken */);
             // We parse any expression (including a comma expression). But the grammar
             // says that only an assignment expression is allowed, so the grammar checker
@@ -8005,7 +8442,7 @@ var ts;
                 if (token === 77 /* DefaultKeyword */) {
                     return lookAhead(nextTokenIsClassOrFunction);
                 }
-                return token !== 37 /* AsteriskToken */ && token !== 15 /* OpenBraceToken */ && canFollowModifier();
+                return token !== 37 /* AsteriskToken */ && token !== 116 /* AsKeyword */ && token !== 15 /* OpenBraceToken */ && canFollowModifier();
             }
             if (token === 77 /* DefaultKeyword */) {
                 return nextTokenIsClassOrFunction();
@@ -8049,7 +8486,7 @@ var ts;
                 case 2 /* SwitchClauses */:
                     return token === 71 /* CaseKeyword */ || token === 77 /* DefaultKeyword */;
                 case 4 /* TypeMembers */:
-                    return isStartOfTypeMember();
+                    return lookAhead(isTypeMemberStart);
                 case 5 /* ClassMembers */:
                     // We allow semicolons as class elements (as specified by ES6) as long as we're
                     // not in error recovery.  If we're in error recovery, we don't want an errant
@@ -8289,20 +8726,20 @@ var ts;
             // We can only reuse a node if it was parsed under the same strict mode that we're
             // currently in.  i.e. if we originally parsed a node in non-strict mode, but then
             // the user added 'using strict' at the top of the file, then we can't use that node
-            // again as the presense of strict mode may cause us to parse the tokens in the file
-            // differetly.
+            // again as the presence of strict mode may cause us to parse the tokens in the file
+            // differently.
             //
             // Note: we *can* reuse tokens when the strict mode changes.  That's because tokens
             // are unaffected by strict mode.  It's just the parser will decide what to do with it
             // differently depending on what mode it is in.
             //
             // This also applies to all our other context flags as well.
-            var nodeContextFlags = node.parserContextFlags & 31 /* ParserGeneratedFlags */;
+            var nodeContextFlags = node.flags & 197132288 /* ContextFlags */;
             if (nodeContextFlags !== contextFlags) {
                 return undefined;
             }
             // Ok, we have a node that looks like it could be reused.  Now verify that it is valid
-            // in the currest list parsing context that we're currently at.
+            // in the current list parsing context that we're currently at.
             if (!canReuseNode(node, parsingContext)) {
                 return undefined;
             }
@@ -8377,14 +8814,14 @@ var ts;
         function isReusableClassMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 145 /* Constructor */:
-                    case 150 /* IndexSignature */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
-                    case 142 /* PropertyDeclaration */:
-                    case 194 /* SemicolonClassElement */:
+                    case 147 /* Constructor */:
+                    case 152 /* IndexSignature */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
+                    case 144 /* PropertyDeclaration */:
+                    case 197 /* SemicolonClassElement */:
                         return true;
-                    case 144 /* MethodDeclaration */:
+                    case 146 /* MethodDeclaration */:
                         // Method declarations are not necessarily reusable.  An object-literal
                         // may have a method calls "constructor(...)" and we must reparse that
                         // into an actual .ConstructorDeclaration.
@@ -8399,8 +8836,8 @@ var ts;
         function isReusableSwitchClause(node) {
             if (node) {
                 switch (node.kind) {
-                    case 244 /* CaseClause */:
-                    case 245 /* DefaultClause */:
+                    case 248 /* CaseClause */:
+                    case 249 /* DefaultClause */:
                         return true;
                 }
             }
@@ -8409,58 +8846,58 @@ var ts;
         function isReusableStatement(node) {
             if (node) {
                 switch (node.kind) {
-                    case 216 /* FunctionDeclaration */:
-                    case 196 /* VariableStatement */:
-                    case 195 /* Block */:
-                    case 199 /* IfStatement */:
-                    case 198 /* ExpressionStatement */:
-                    case 211 /* ThrowStatement */:
-                    case 207 /* ReturnStatement */:
-                    case 209 /* SwitchStatement */:
-                    case 206 /* BreakStatement */:
-                    case 205 /* ContinueStatement */:
-                    case 203 /* ForInStatement */:
-                    case 204 /* ForOfStatement */:
-                    case 202 /* ForStatement */:
-                    case 201 /* WhileStatement */:
-                    case 208 /* WithStatement */:
-                    case 197 /* EmptyStatement */:
-                    case 212 /* TryStatement */:
-                    case 210 /* LabeledStatement */:
-                    case 200 /* DoStatement */:
-                    case 213 /* DebuggerStatement */:
-                    case 225 /* ImportDeclaration */:
-                    case 224 /* ImportEqualsDeclaration */:
-                    case 231 /* ExportDeclaration */:
-                    case 230 /* ExportAssignment */:
-                    case 221 /* ModuleDeclaration */:
-                    case 217 /* ClassDeclaration */:
-                    case 218 /* InterfaceDeclaration */:
-                    case 220 /* EnumDeclaration */:
-                    case 219 /* TypeAliasDeclaration */:
+                    case 219 /* FunctionDeclaration */:
+                    case 199 /* VariableStatement */:
+                    case 198 /* Block */:
+                    case 202 /* IfStatement */:
+                    case 201 /* ExpressionStatement */:
+                    case 214 /* ThrowStatement */:
+                    case 210 /* ReturnStatement */:
+                    case 212 /* SwitchStatement */:
+                    case 209 /* BreakStatement */:
+                    case 208 /* ContinueStatement */:
+                    case 206 /* ForInStatement */:
+                    case 207 /* ForOfStatement */:
+                    case 205 /* ForStatement */:
+                    case 204 /* WhileStatement */:
+                    case 211 /* WithStatement */:
+                    case 200 /* EmptyStatement */:
+                    case 215 /* TryStatement */:
+                    case 213 /* LabeledStatement */:
+                    case 203 /* DoStatement */:
+                    case 216 /* DebuggerStatement */:
+                    case 229 /* ImportDeclaration */:
+                    case 228 /* ImportEqualsDeclaration */:
+                    case 235 /* ExportDeclaration */:
+                    case 234 /* ExportAssignment */:
+                    case 224 /* ModuleDeclaration */:
+                    case 220 /* ClassDeclaration */:
+                    case 221 /* InterfaceDeclaration */:
+                    case 223 /* EnumDeclaration */:
+                    case 222 /* TypeAliasDeclaration */:
                         return true;
                 }
             }
             return false;
         }
         function isReusableEnumMember(node) {
-            return node.kind === 250 /* EnumMember */;
+            return node.kind === 254 /* EnumMember */;
         }
         function isReusableTypeMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 149 /* ConstructSignature */:
-                    case 143 /* MethodSignature */:
-                    case 150 /* IndexSignature */:
-                    case 141 /* PropertySignature */:
-                    case 148 /* CallSignature */:
+                    case 151 /* ConstructSignature */:
+                    case 145 /* MethodSignature */:
+                    case 152 /* IndexSignature */:
+                    case 143 /* PropertySignature */:
+                    case 150 /* CallSignature */:
                         return true;
                 }
             }
             return false;
         }
         function isReusableVariableDeclaration(node) {
-            if (node.kind !== 214 /* VariableDeclaration */) {
+            if (node.kind !== 217 /* VariableDeclaration */) {
                 return false;
             }
             // Very subtle incremental parsing bug.  Consider the following code:
@@ -8481,7 +8918,7 @@ var ts;
             return variableDeclarator.initializer === undefined;
         }
         function isReusableParameter(node) {
-            if (node.kind !== 139 /* Parameter */) {
+            if (node.kind !== 141 /* Parameter */) {
                 return false;
             }
             // See the comment in isReusableVariableDeclaration for why we do this.
@@ -8529,7 +8966,7 @@ var ts;
         }
         ;
         // Parses a comma-delimited list of elements
-        function parseDelimitedList(kind, parseElement, considerSemicolonAsDelimeter) {
+        function parseDelimitedList(kind, parseElement, considerSemicolonAsDelimiter) {
             var saveParsingContext = parsingContext;
             parsingContext |= 1 << kind;
             var result = [];
@@ -8554,7 +8991,7 @@ var ts;
                     // parse errors.  For example, this can happen when people do things like use
                     // a semicolon to delimit object literal members.   Note: we'll have already
                     // reported an error when we called parseExpected above.
-                    if (considerSemicolonAsDelimeter && token === 23 /* SemicolonToken */ && !scanner.hasPrecedingLineBreak()) {
+                    if (considerSemicolonAsDelimiter && token === 23 /* SemicolonToken */ && !scanner.hasPrecedingLineBreak()) {
                         nextToken();
                     }
                     continue;
@@ -8598,7 +9035,7 @@ var ts;
         function parseEntityName(allowReservedWords, diagnosticMessage) {
             var entity = parseIdentifier(diagnosticMessage);
             while (parseOptional(21 /* DotToken */)) {
-                var node = createNode(136 /* QualifiedName */, entity.pos);
+                var node = createNode(138 /* QualifiedName */, entity.pos);
                 node.left = entity;
                 node.right = parseRightSideOfDot(allowReservedWords);
                 entity = finishNode(node);
@@ -8637,7 +9074,7 @@ var ts;
             return allowIdentifierNames ? parseIdentifierName() : parseIdentifier();
         }
         function parseTemplateExpression() {
-            var template = createNode(186 /* TemplateExpression */);
+            var template = createNode(188 /* TemplateExpression */);
             template.head = parseTemplateLiteralFragment();
             ts.Debug.assert(template.head.kind === 12 /* TemplateHead */, "Template head has wrong token kind");
             var templateSpans = [];
@@ -8650,7 +9087,7 @@ var ts;
             return finishNode(template);
         }
         function parseTemplateSpan() {
-            var span = createNode(193 /* TemplateSpan */);
+            var span = createNode(196 /* TemplateSpan */);
             span.expression = allowInAnd(parseExpression);
             var literal;
             if (token === 16 /* CloseBraceToken */) {
@@ -8664,7 +9101,7 @@ var ts;
             return finishNode(span);
         }
         function parseStringLiteralTypeNode() {
-            return parseLiteralLikeNode(163 /* StringLiteralType */, /*internName*/ true);
+            return parseLiteralLikeNode(165 /* StringLiteralType */, /*internName*/ true);
         }
         function parseLiteralNode(internName) {
             return parseLiteralLikeNode(token, internName);
@@ -8694,40 +9131,40 @@ var ts;
             if (node.kind === 8 /* NumericLiteral */
                 && sourceText.charCodeAt(tokenPos) === 48 /* _0 */
                 && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) {
-                node.flags |= 32768 /* OctalLiteral */;
+                node.isOctalLiteral = true;
             }
             return node;
         }
         // TYPES
         function parseTypeReference() {
             var typeName = parseEntityName(/*allowReservedWords*/ false, ts.Diagnostics.Type_expected);
-            var node = createNode(152 /* TypeReference */, typeName.pos);
+            var node = createNode(154 /* TypeReference */, typeName.pos);
             node.typeName = typeName;
             if (!scanner.hasPrecedingLineBreak() && token === 25 /* LessThanToken */) {
                 node.typeArguments = parseBracketedList(18 /* TypeArguments */, parseType, 25 /* LessThanToken */, 27 /* GreaterThanToken */);
             }
             return finishNode(node);
         }
-        function parseTypePredicate(lhs) {
+        function parseThisTypePredicate(lhs) {
             nextToken();
-            var node = createNode(151 /* TypePredicate */, lhs.pos);
+            var node = createNode(153 /* TypePredicate */, lhs.pos);
             node.parameterName = lhs;
             node.type = parseType();
             return finishNode(node);
         }
         function parseThisTypeNode() {
-            var node = createNode(162 /* ThisType */);
+            var node = createNode(164 /* ThisType */);
             nextToken();
             return finishNode(node);
         }
         function parseTypeQuery() {
-            var node = createNode(155 /* TypeQuery */);
+            var node = createNode(157 /* TypeQuery */);
             parseExpected(101 /* TypeOfKeyword */);
             node.exprName = parseEntityName(/*allowReservedWords*/ true);
             return finishNode(node);
         }
         function parseTypeParameter() {
-            var node = createNode(138 /* TypeParameter */);
+            var node = createNode(140 /* TypeParameter */);
             node.name = parseIdentifier();
             if (parseOptional(83 /* ExtendsKeyword */)) {
                 // It's not uncommon for people to write improper constraints to a generic.  If the
@@ -8762,7 +9199,7 @@ var ts;
             return undefined;
         }
         function isStartOfParameter() {
-            return token === 22 /* DotDotDotToken */ || isIdentifierOrPattern() || ts.isModifierKind(token) || token === 55 /* AtToken */;
+            return token === 22 /* DotDotDotToken */ || isIdentifierOrPattern() || ts.isModifierKind(token) || token === 55 /* AtToken */ || token === 97 /* ThisKeyword */;
         }
         function setModifiers(node, modifiers) {
             if (modifiers) {
@@ -8771,7 +9208,12 @@ var ts;
             }
         }
         function parseParameter() {
-            var node = createNode(139 /* Parameter */);
+            var node = createNode(141 /* Parameter */);
+            if (token === 97 /* ThisKeyword */) {
+                node.name = createIdentifier(/*isIdentifier*/ true, undefined);
+                node.type = parseParameterType();
+                return finishNode(node);
+            }
             node.decorators = parseDecorators();
             setModifiers(node, parseModifiers());
             node.dotDotDotToken = parseOptionalToken(22 /* DotDotDotToken */);
@@ -8800,7 +9242,7 @@ var ts;
             // contexts. In addition, parameter initializers are semantically disallowed in
             // overload signatures. So parameter initializers are transitively disallowed in
             // ambient contexts.
-            return finishNode(node);
+            return addJSDocComment(finishNode(node));
         }
         function parseBindingElementInitializer(inParameter) {
             return inParameter ? parseParameterInitializer() : parseNonParameterInitializer();
@@ -8865,7 +9307,7 @@ var ts;
         }
         function parseSignatureMember(kind) {
             var node = createNode(kind);
-            if (kind === 149 /* ConstructSignature */) {
+            if (kind === 151 /* ConstructSignature */) {
                 parseExpected(92 /* NewKeyword */);
             }
             fillSignature(54 /* ColonToken */, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node);
@@ -8929,7 +9371,7 @@ var ts;
             return token === 54 /* ColonToken */ || token === 24 /* CommaToken */ || token === 20 /* CloseBracketToken */;
         }
         function parseIndexSignatureDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(150 /* IndexSignature */, fullStart);
+            var node = createNode(152 /* IndexSignature */, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             node.parameters = parseBracketedList(16 /* Parameters */, parseParameter, 19 /* OpenBracketToken */, 20 /* CloseBracketToken */);
@@ -8937,22 +9379,23 @@ var ts;
             parseTypeMemberSemicolon();
             return finishNode(node);
         }
-        function parsePropertyOrMethodSignature() {
-            var fullStart = scanner.getStartPos();
+        function parsePropertyOrMethodSignature(fullStart, modifiers) {
             var name = parsePropertyName();
             var questionToken = parseOptionalToken(53 /* QuestionToken */);
             if (token === 17 /* OpenParenToken */ || token === 25 /* LessThanToken */) {
-                var method = createNode(143 /* MethodSignature */, fullStart);
+                var method = createNode(145 /* MethodSignature */, fullStart);
+                setModifiers(method, modifiers);
                 method.name = name;
                 method.questionToken = questionToken;
-                // Method signatues don't exist in expression contexts.  So they have neither
+                // Method signatures don't exist in expression contexts.  So they have neither
                 // [Yield] nor [Await]
                 fillSignature(54 /* ColonToken */, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, method);
                 parseTypeMemberSemicolon();
                 return finishNode(method);
             }
             else {
-                var property = createNode(141 /* PropertySignature */, fullStart);
+                var property = createNode(143 /* PropertySignature */, fullStart);
+                setModifiers(property, modifiers);
                 property.name = name;
                 property.questionToken = questionToken;
                 property.type = parseTypeAnnotation();
@@ -8966,86 +9409,57 @@ var ts;
                 return finishNode(property);
             }
         }
-        function isStartOfTypeMember() {
-            switch (token) {
-                case 17 /* OpenParenToken */:
-                case 25 /* LessThanToken */:
-                case 19 /* OpenBracketToken */:
-                    return true;
-                default:
-                    if (ts.isModifierKind(token)) {
-                        var result = lookAhead(isStartOfIndexSignatureDeclaration);
-                        if (result) {
-                            return result;
-                        }
-                    }
-                    return isLiteralPropertyName() && lookAhead(isTypeMemberWithLiteralPropertyName);
+        function isTypeMemberStart() {
+            var idToken;
+            // Return true if we have the start of a signature member
+            if (token === 17 /* OpenParenToken */ || token === 25 /* LessThanToken */) {
+                return true;
             }
-        }
-        function isStartOfIndexSignatureDeclaration() {
+            // Eat up all modifiers, but hold on to the last one in case it is actually an identifier
             while (ts.isModifierKind(token)) {
+                idToken = token;
                 nextToken();
             }
-            return isIndexSignature();
-        }
-        function isTypeMemberWithLiteralPropertyName() {
-            nextToken();
-            return token === 17 /* OpenParenToken */ ||
-                token === 25 /* LessThanToken */ ||
-                token === 53 /* QuestionToken */ ||
-                token === 54 /* ColonToken */ ||
-                canParseSemicolon();
+            // Index signatures and computed property names are type members
+            if (token === 19 /* OpenBracketToken */) {
+                return true;
+            }
+            // Try to get the first property-like token following all modifiers
+            if (isLiteralPropertyName()) {
+                idToken = token;
+                nextToken();
+            }
+            // If we were able to get any potential identifier, check that it is
+            // the start of a member declaration
+            if (idToken) {
+                return token === 17 /* OpenParenToken */ ||
+                    token === 25 /* LessThanToken */ ||
+                    token === 53 /* QuestionToken */ ||
+                    token === 54 /* ColonToken */ ||
+                    canParseSemicolon();
+            }
+            return false;
         }
         function parseTypeMember() {
-            switch (token) {
-                case 17 /* OpenParenToken */:
-                case 25 /* LessThanToken */:
-                    return parseSignatureMember(148 /* CallSignature */);
-                case 19 /* OpenBracketToken */:
-                    // Indexer or computed property
-                    return isIndexSignature()
-                        ? parseIndexSignatureDeclaration(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers*/ undefined)
-                        : parsePropertyOrMethodSignature();
-                case 92 /* NewKeyword */:
-                    if (lookAhead(isStartOfConstructSignature)) {
-                        return parseSignatureMember(149 /* ConstructSignature */);
-                    }
-                // fall through.
-                case 9 /* StringLiteral */:
-                case 8 /* NumericLiteral */:
-                    return parsePropertyOrMethodSignature();
-                default:
-                    // Index declaration as allowed as a type member.  But as per the grammar,
-                    // they also allow modifiers. So we have to check for an index declaration
-                    // that might be following modifiers. This ensures that things work properly
-                    // when incrementally parsing as the parser will produce the Index declaration
-                    // if it has the same text regardless of whether it is inside a class or an
-                    // object type.
-                    if (ts.isModifierKind(token)) {
-                        var result = tryParse(parseIndexSignatureWithModifiers);
-                        if (result) {
-                            return result;
-                        }
-                    }
-                    if (ts.tokenIsIdentifierOrKeyword(token)) {
-                        return parsePropertyOrMethodSignature();
-                    }
+            if (token === 17 /* OpenParenToken */ || token === 25 /* LessThanToken */) {
+                return parseSignatureMember(150 /* CallSignature */);
             }
-        }
-        function parseIndexSignatureWithModifiers() {
-            var fullStart = scanner.getStartPos();
-            var decorators = parseDecorators();
+            if (token === 92 /* NewKeyword */ && lookAhead(isStartOfConstructSignature)) {
+                return parseSignatureMember(151 /* ConstructSignature */);
+            }
+            var fullStart = getNodePos();
             var modifiers = parseModifiers();
-            return isIndexSignature()
-                ? parseIndexSignatureDeclaration(fullStart, decorators, modifiers)
-                : undefined;
+            if (isIndexSignature()) {
+                return parseIndexSignatureDeclaration(fullStart, /*decorators*/ undefined, modifiers);
+            }
+            return parsePropertyOrMethodSignature(fullStart, modifiers);
         }
         function isStartOfConstructSignature() {
             nextToken();
             return token === 17 /* OpenParenToken */ || token === 25 /* LessThanToken */;
         }
         function parseTypeLiteral() {
-            var node = createNode(156 /* TypeLiteral */);
+            var node = createNode(158 /* TypeLiteral */);
             node.members = parseObjectTypeMembers();
             return finishNode(node);
         }
@@ -9061,12 +9475,12 @@ var ts;
             return members;
         }
         function parseTupleType() {
-            var node = createNode(158 /* TupleType */);
+            var node = createNode(160 /* TupleType */);
             node.elementTypes = parseBracketedList(19 /* TupleElementTypes */, parseType, 19 /* OpenBracketToken */, 20 /* CloseBracketToken */);
             return finishNode(node);
         }
         function parseParenthesizedType() {
-            var node = createNode(161 /* ParenthesizedType */);
+            var node = createNode(163 /* ParenthesizedType */);
             parseExpected(17 /* OpenParenToken */);
             node.type = parseType();
             parseExpected(18 /* CloseParenToken */);
@@ -9074,7 +9488,7 @@ var ts;
         }
         function parseFunctionOrConstructorType(kind) {
             var node = createNode(kind);
-            if (kind === 154 /* ConstructorType */) {
+            if (kind === 156 /* ConstructorType */) {
                 parseExpected(92 /* NewKeyword */);
             }
             fillSignature(34 /* EqualsGreaterThanToken */, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node);
@@ -9087,21 +9501,23 @@ var ts;
         function parseNonArrayType() {
             switch (token) {
                 case 117 /* AnyKeyword */:
-                case 130 /* StringKeyword */:
-                case 128 /* NumberKeyword */:
+                case 131 /* StringKeyword */:
+                case 129 /* NumberKeyword */:
                 case 120 /* BooleanKeyword */:
-                case 131 /* SymbolKeyword */:
+                case 132 /* SymbolKeyword */:
+                case 134 /* UndefinedKeyword */:
                     // If these are followed by a dot, then parse these out as a dotted type reference instead.
                     var node = tryParse(parseKeywordAndNoDot);
                     return node || parseTypeReference();
                 case 9 /* StringLiteral */:
                     return parseStringLiteralTypeNode();
                 case 103 /* VoidKeyword */:
+                case 93 /* NullKeyword */:
                     return parseTokenNode();
                 case 97 /* ThisKeyword */: {
                     var thisKeyword = parseThisTypeNode();
                     if (token === 124 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
-                        return parseTypePredicate(thisKeyword);
+                        return parseThisTypePredicate(thisKeyword);
                     }
                     else {
                         return thisKeyword;
@@ -9122,11 +9538,13 @@ var ts;
         function isStartOfType() {
             switch (token) {
                 case 117 /* AnyKeyword */:
-                case 130 /* StringKeyword */:
-                case 128 /* NumberKeyword */:
+                case 131 /* StringKeyword */:
+                case 129 /* NumberKeyword */:
                 case 120 /* BooleanKeyword */:
-                case 131 /* SymbolKeyword */:
+                case 132 /* SymbolKeyword */:
                 case 103 /* VoidKeyword */:
+                case 134 /* UndefinedKeyword */:
+                case 93 /* NullKeyword */:
                 case 97 /* ThisKeyword */:
                 case 101 /* TypeOfKeyword */:
                 case 15 /* OpenBraceToken */:
@@ -9151,7 +9569,7 @@ var ts;
             var type = parseNonArrayType();
             while (!scanner.hasPrecedingLineBreak() && parseOptional(19 /* OpenBracketToken */)) {
                 parseExpected(20 /* CloseBracketToken */);
-                var node = createNode(157 /* ArrayType */, type.pos);
+                var node = createNode(159 /* ArrayType */, type.pos);
                 node.elementType = type;
                 type = finishNode(node);
             }
@@ -9173,10 +9591,10 @@ var ts;
             return type;
         }
         function parseIntersectionTypeOrHigher() {
-            return parseUnionOrIntersectionType(160 /* IntersectionType */, parseArrayTypeOrHigher, 46 /* AmpersandToken */);
+            return parseUnionOrIntersectionType(162 /* IntersectionType */, parseArrayTypeOrHigher, 46 /* AmpersandToken */);
         }
         function parseUnionTypeOrHigher() {
-            return parseUnionOrIntersectionType(159 /* UnionType */, parseIntersectionTypeOrHigher, 47 /* BarToken */);
+            return parseUnionOrIntersectionType(161 /* UnionType */, parseIntersectionTypeOrHigher, 47 /* BarToken */);
         }
         function isStartOfFunctionType() {
             if (token === 25 /* LessThanToken */) {
@@ -9184,6 +9602,23 @@ var ts;
             }
             return token === 17 /* OpenParenToken */ && lookAhead(isUnambiguouslyStartOfFunctionType);
         }
+        function skipParameterStart() {
+            if (ts.isModifierKind(token)) {
+                // Skip modifiers
+                parseModifiers();
+            }
+            if (isIdentifier() || token === 97 /* ThisKeyword */) {
+                nextToken();
+                return true;
+            }
+            if (token === 19 /* OpenBracketToken */ || token === 15 /* OpenBraceToken */) {
+                // Return true if we can parse an array or object binding pattern with no errors
+                var previousErrorCount = parseDiagnostics.length;
+                parseIdentifierOrPattern();
+                return previousErrorCount === parseDiagnostics.length;
+            }
+            return false;
+        }
         function isUnambiguouslyStartOfFunctionType() {
             nextToken();
             if (token === 18 /* CloseParenToken */ || token === 22 /* DotDotDotToken */) {
@@ -9191,22 +9626,21 @@ var ts;
                 // ( ...
                 return true;
             }
-            if (isIdentifier() || ts.isModifierKind(token)) {
-                nextToken();
+            if (skipParameterStart()) {
+                // We successfully skipped modifiers (if any) and an identifier or binding pattern,
+                // now see if we have something that indicates a parameter declaration
                 if (token === 54 /* ColonToken */ || token === 24 /* CommaToken */ ||
-                    token === 53 /* QuestionToken */ || token === 56 /* EqualsToken */ ||
-                    isIdentifier() || ts.isModifierKind(token)) {
-                    // ( id :
-                    // ( id ,
-                    // ( id ?
-                    // ( id =
-                    // ( modifier id
+                    token === 53 /* QuestionToken */ || token === 56 /* EqualsToken */) {
+                    // ( xxx :
+                    // ( xxx ,
+                    // ( xxx ?
+                    // ( xxx =
                     return true;
                 }
                 if (token === 18 /* CloseParenToken */) {
                     nextToken();
                     if (token === 34 /* EqualsGreaterThanToken */) {
-                        // ( id ) =>
+                        // ( xxx ) =>
                         return true;
                     }
                 }
@@ -9217,7 +9651,7 @@ var ts;
             var typePredicateVariable = isIdentifier() && tryParse(parseTypePredicatePrefix);
             var type = parseType();
             if (typePredicateVariable) {
-                var node = createNode(151 /* TypePredicate */, typePredicateVariable.pos);
+                var node = createNode(153 /* TypePredicate */, typePredicateVariable.pos);
                 node.parameterName = typePredicateVariable;
                 node.type = type;
                 return finishNode(node);
@@ -9236,14 +9670,14 @@ var ts;
         function parseType() {
             // The rules about 'yield' only apply to actual code/expression contexts.  They don't
             // apply to 'type' contexts.  So we disable these parameters here before moving on.
-            return doOutsideOfContext(10 /* TypeExcludesFlags */, parseTypeWorker);
+            return doOutsideOfContext(41943040 /* TypeExcludesFlags */, parseTypeWorker);
         }
         function parseTypeWorker() {
             if (isStartOfFunctionType()) {
-                return parseFunctionOrConstructorType(153 /* FunctionType */);
+                return parseFunctionOrConstructorType(155 /* FunctionType */);
             }
             if (token === 92 /* NewKeyword */) {
-                return parseFunctionOrConstructorType(154 /* ConstructorType */);
+                return parseFunctionOrConstructorType(156 /* ConstructorType */);
             }
             return parseUnionTypeOrHigher();
         }
@@ -9408,7 +9842,7 @@ var ts;
         }
         function isYieldExpression() {
             if (token === 114 /* YieldKeyword */) {
-                // If we have a 'yield' keyword, and htis is a context where yield expressions are
+                // If we have a 'yield' keyword, and this is a context where yield expressions are
                 // allowed, then definitely parse out a yield expression.
                 if (inYieldContext()) {
                     return true;
@@ -9426,7 +9860,7 @@ var ts;
                 //
                 // for now we just check if the next token is an identifier.  More heuristics
                 // can be added here later as necessary.  We just need to make sure that we
-                // don't accidently consume something legal.
+                // don't accidentally consume something legal.
                 return lookAhead(nextTokenIsIdentifierOrKeywordOrNumberOnSameLine);
             }
             return false;
@@ -9436,7 +9870,7 @@ var ts;
             return !scanner.hasPrecedingLineBreak() && isIdentifier();
         }
         function parseYieldExpression() {
-            var node = createNode(187 /* YieldExpression */);
+            var node = createNode(189 /* YieldExpression */);
             // YieldExpression[In] :
             //      yield
             //      yield [no LineTerminator here] [Lexical goal InputElementRegExp]AssignmentExpression[?In, Yield]
@@ -9450,14 +9884,14 @@ var ts;
             }
             else {
                 // if the next token is not on the same line as yield.  or we don't have an '*' or
-                // the start of an expressin, then this is just a simple "yield" expression.
+                // the start of an expression, then this is just a simple "yield" expression.
                 return finishNode(node);
             }
         }
         function parseSimpleArrowFunctionExpression(identifier) {
             ts.Debug.assert(token === 34 /* EqualsGreaterThanToken */, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
-            var node = createNode(177 /* ArrowFunction */, identifier.pos);
-            var parameter = createNode(139 /* Parameter */, identifier.pos);
+            var node = createNode(179 /* ArrowFunction */, identifier.pos);
+            var parameter = createNode(141 /* Parameter */, identifier.pos);
             parameter.name = identifier;
             finishNode(parameter);
             node.parameters = [parameter];
@@ -9609,7 +10043,7 @@ var ts;
             return parseParenthesizedArrowFunctionExpressionHead(/*allowAmbiguity*/ false);
         }
         function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity) {
-            var node = createNode(177 /* ArrowFunction */);
+            var node = createNode(179 /* ArrowFunction */);
             setModifiers(node, parseModifiersForArrowFunction());
             var isAsync = !!(node.flags & 256 /* Async */);
             // Arrow functions are never generators.
@@ -9675,7 +10109,7 @@ var ts;
             }
             // Note: we explicitly 'allowIn' in the whenTrue part of the condition expression, and
             // we do not that for the 'whenFalse' part.
-            var node = createNode(185 /* ConditionalExpression */, leftOperand.pos);
+            var node = createNode(187 /* ConditionalExpression */, leftOperand.pos);
             node.condition = leftOperand;
             node.questionToken = questionToken;
             node.whenTrue = doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher);
@@ -9688,7 +10122,7 @@ var ts;
             return parseBinaryExpressionRest(precedence, leftOperand);
         }
         function isInOrOfKeyword(t) {
-            return t === 90 /* InKeyword */ || t === 135 /* OfKeyword */;
+            return t === 90 /* InKeyword */ || t === 137 /* OfKeyword */;
         }
         function parseBinaryExpressionRest(precedence, leftOperand) {
             while (true) {
@@ -9699,7 +10133,7 @@ var ts;
                 // Check the precedence to see if we should "take" this operator
                 // - For left associative operator (all operator but **), consume the operator,
                 //   recursively call the function below, and parse binaryExpression as a rightOperand
-                //   of the caller if the new precendence of the operator is greater then or equal to the current precendence.
+                //   of the caller if the new precedence of the operator is greater then or equal to the current precedence.
                 //   For example:
                 //      a - b - c;
                 //            ^token; leftOperand = b. Return b to the caller as a rightOperand
@@ -9708,8 +10142,8 @@ var ts;
                 //      a - b * c;
                 //            ^token; leftOperand = b. Return b * c to the caller as a rightOperand
                 // - For right associative operator (**), consume the operator, recursively call the function
-                //   and parse binaryExpression as a rightOperand of the caller if the new precendence of
-                //   the operator is strictly grater than the current precendence
+                //   and parse binaryExpression as a rightOperand of the caller if the new precedence of
+                //   the operator is strictly grater than the current precedence
                 //   For example:
                 //      a ** b ** c;
                 //             ^^token; leftOperand = b. Return b ** c to the caller as a rightOperand
@@ -9796,39 +10230,39 @@ var ts;
             return -1;
         }
         function makeBinaryExpression(left, operatorToken, right) {
-            var node = createNode(184 /* BinaryExpression */, left.pos);
+            var node = createNode(186 /* BinaryExpression */, left.pos);
             node.left = left;
             node.operatorToken = operatorToken;
             node.right = right;
             return finishNode(node);
         }
         function makeAsExpression(left, right) {
-            var node = createNode(192 /* AsExpression */, left.pos);
+            var node = createNode(194 /* AsExpression */, left.pos);
             node.expression = left;
             node.type = right;
             return finishNode(node);
         }
         function parsePrefixUnaryExpression() {
-            var node = createNode(182 /* PrefixUnaryExpression */);
+            var node = createNode(184 /* PrefixUnaryExpression */);
             node.operator = token;
             nextToken();
             node.operand = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseDeleteExpression() {
-            var node = createNode(178 /* DeleteExpression */);
+            var node = createNode(180 /* DeleteExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseTypeOfExpression() {
-            var node = createNode(179 /* TypeOfExpression */);
+            var node = createNode(181 /* TypeOfExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseVoidExpression() {
-            var node = createNode(180 /* VoidExpression */);
+            var node = createNode(182 /* VoidExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -9844,7 +10278,7 @@ var ts;
             return false;
         }
         function parseAwaitExpression() {
-            var node = createNode(181 /* AwaitExpression */);
+            var node = createNode(183 /* AwaitExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -9870,7 +10304,7 @@ var ts;
             var simpleUnaryExpression = parseSimpleUnaryExpression();
             if (token === 38 /* AsteriskAsteriskToken */) {
                 var start = ts.skipTrivia(sourceText, simpleUnaryExpression.pos);
-                if (simpleUnaryExpression.kind === 174 /* TypeAssertionExpression */) {
+                if (simpleUnaryExpression.kind === 176 /* TypeAssertionExpression */) {
                     parseErrorAtPosition(start, simpleUnaryExpression.end - start, ts.Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses);
                 }
                 else {
@@ -9926,7 +10360,7 @@ var ts;
          */
         function isIncrementExpression() {
             // This function is called inside parseUnaryExpression to decide
-            // whether to call parseSimpleUnaryExpression or call parseIncrmentExpression directly
+            // whether to call parseSimpleUnaryExpression or call parseIncrementExpression directly
             switch (token) {
                 case 35 /* PlusToken */:
                 case 36 /* MinusToken */:
@@ -9960,7 +10394,7 @@ var ts;
          */
         function parseIncrementExpression() {
             if (token === 41 /* PlusPlusToken */ || token === 42 /* MinusMinusToken */) {
-                var node = createNode(182 /* PrefixUnaryExpression */);
+                var node = createNode(184 /* PrefixUnaryExpression */);
                 node.operator = token;
                 nextToken();
                 node.operand = parseLeftHandSideExpressionOrHigher();
@@ -9973,7 +10407,7 @@ var ts;
             var expression = parseLeftHandSideExpressionOrHigher();
             ts.Debug.assert(ts.isLeftHandSideExpression(expression));
             if ((token === 41 /* PlusPlusToken */ || token === 42 /* MinusMinusToken */) && !scanner.hasPrecedingLineBreak()) {
-                var node = createNode(183 /* PostfixUnaryExpression */, expression.pos);
+                var node = createNode(185 /* PostfixUnaryExpression */, expression.pos);
                 node.operand = expression;
                 node.operator = token;
                 nextToken();
@@ -10077,7 +10511,7 @@ var ts;
             }
             // If we have seen "super" it must be followed by '(' or '.'.
             // If it wasn't then just try to parse out a '.' and report an error.
-            var node = createNode(169 /* PropertyAccessExpression */, expression.pos);
+            var node = createNode(171 /* PropertyAccessExpression */, expression.pos);
             node.expression = expression;
             node.dotToken = parseExpectedToken(21 /* DotToken */, /*reportAtCurrentPosition*/ false, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access);
             node.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
@@ -10096,8 +10530,8 @@ var ts;
         function parseJsxElementOrSelfClosingElement(inExpressionContext) {
             var opening = parseJsxOpeningOrSelfClosingElement(inExpressionContext);
             var result;
-            if (opening.kind === 238 /* JsxOpeningElement */) {
-                var node = createNode(236 /* JsxElement */, opening.pos);
+            if (opening.kind === 242 /* JsxOpeningElement */) {
+                var node = createNode(240 /* JsxElement */, opening.pos);
                 node.openingElement = opening;
                 node.children = parseJsxChildren(node.openingElement.tagName);
                 node.closingElement = parseJsxClosingElement(inExpressionContext);
@@ -10107,7 +10541,7 @@ var ts;
                 result = finishNode(node);
             }
             else {
-                ts.Debug.assert(opening.kind === 237 /* JsxSelfClosingElement */);
+                ts.Debug.assert(opening.kind === 241 /* JsxSelfClosingElement */);
                 // Nothing else to do for self-closing elements
                 result = opening;
             }
@@ -10122,7 +10556,7 @@ var ts;
                 var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElement(/*inExpressionContext*/ true); });
                 if (invalidElement) {
                     parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element);
-                    var badNode = createNode(184 /* BinaryExpression */, result.pos);
+                    var badNode = createNode(186 /* BinaryExpression */, result.pos);
                     badNode.end = invalidElement.end;
                     badNode.left = result;
                     badNode.right = invalidElement;
@@ -10134,13 +10568,13 @@ var ts;
             return result;
         }
         function parseJsxText() {
-            var node = createNode(239 /* JsxText */, scanner.getStartPos());
+            var node = createNode(243 /* JsxText */, scanner.getStartPos());
             token = scanner.scanJsxToken();
             return finishNode(node);
         }
         function parseJsxChild() {
             switch (token) {
-                case 239 /* JsxText */:
+                case 243 /* JsxText */:
                     return parseJsxText();
                 case 15 /* OpenBraceToken */:
                     return parseJsxExpression(/*inExpressionContext*/ false);
@@ -10182,7 +10616,7 @@ var ts;
                 // Closing tag, so scan the immediately-following text with the JSX scanning instead
                 // of regular scanning to avoid treating illegal characters (e.g. '#') as immediate
                 // scanning errors
-                node = createNode(238 /* JsxOpeningElement */, fullStart);
+                node = createNode(242 /* JsxOpeningElement */, fullStart);
                 scanJsxText();
             }
             else {
@@ -10194,7 +10628,7 @@ var ts;
                     parseExpected(27 /* GreaterThanToken */, /*diagnostic*/ undefined, /*shouldAdvance*/ false);
                     scanJsxText();
                 }
-                node = createNode(237 /* JsxSelfClosingElement */, fullStart);
+                node = createNode(241 /* JsxSelfClosingElement */, fullStart);
             }
             node.tagName = tagName;
             node.attributes = attributes;
@@ -10205,7 +10639,7 @@ var ts;
             var elementName = parseIdentifierName();
             while (parseOptional(21 /* DotToken */)) {
                 scanJsxIdentifier();
-                var node = createNode(136 /* QualifiedName */, elementName.pos);
+                var node = createNode(138 /* QualifiedName */, elementName.pos);
                 node.left = elementName;
                 node.right = parseIdentifierName();
                 elementName = finishNode(node);
@@ -10213,7 +10647,7 @@ var ts;
             return elementName;
         }
         function parseJsxExpression(inExpressionContext) {
-            var node = createNode(243 /* JsxExpression */);
+            var node = createNode(247 /* JsxExpression */);
             parseExpected(15 /* OpenBraceToken */);
             if (token !== 16 /* CloseBraceToken */) {
                 node.expression = parseAssignmentExpressionOrHigher();
@@ -10232,7 +10666,7 @@ var ts;
                 return parseJsxSpreadAttribute();
             }
             scanJsxIdentifier();
-            var node = createNode(241 /* JsxAttribute */);
+            var node = createNode(245 /* JsxAttribute */);
             node.name = parseIdentifierName();
             if (parseOptional(56 /* EqualsToken */)) {
                 switch (token) {
@@ -10247,7 +10681,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxSpreadAttribute() {
-            var node = createNode(242 /* JsxSpreadAttribute */);
+            var node = createNode(246 /* JsxSpreadAttribute */);
             parseExpected(15 /* OpenBraceToken */);
             parseExpected(22 /* DotDotDotToken */);
             node.expression = parseExpression();
@@ -10255,7 +10689,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxClosingElement(inExpressionContext) {
-            var node = createNode(240 /* JsxClosingElement */);
+            var node = createNode(244 /* JsxClosingElement */);
             parseExpected(26 /* LessThanSlashToken */);
             node.tagName = parseJsxElementName();
             if (inExpressionContext) {
@@ -10268,7 +10702,7 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAssertion() {
-            var node = createNode(174 /* TypeAssertionExpression */);
+            var node = createNode(176 /* TypeAssertionExpression */);
             parseExpected(25 /* LessThanToken */);
             node.type = parseType();
             parseExpected(27 /* GreaterThanToken */);
@@ -10279,16 +10713,23 @@ var ts;
             while (true) {
                 var dotToken = parseOptionalToken(21 /* DotToken */);
                 if (dotToken) {
-                    var propertyAccess = createNode(169 /* PropertyAccessExpression */, expression.pos);
+                    var propertyAccess = createNode(171 /* PropertyAccessExpression */, expression.pos);
                     propertyAccess.expression = expression;
                     propertyAccess.dotToken = dotToken;
                     propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
                     expression = finishNode(propertyAccess);
                     continue;
                 }
+                if (token === 49 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
+                    nextToken();
+                    var nonNullExpression = createNode(195 /* NonNullExpression */, expression.pos);
+                    nonNullExpression.expression = expression;
+                    expression = finishNode(nonNullExpression);
+                    continue;
+                }
                 // when in the [Decorator] context, we do not parse ElementAccess as it could be part of a ComputedPropertyName
                 if (!inDecoratorContext() && parseOptional(19 /* OpenBracketToken */)) {
-                    var indexedAccess = createNode(170 /* ElementAccessExpression */, expression.pos);
+                    var indexedAccess = createNode(172 /* ElementAccessExpression */, expression.pos);
                     indexedAccess.expression = expression;
                     // It's not uncommon for a user to write: "new Type[]".
                     // Check for that common pattern and report a better error message.
@@ -10304,7 +10745,7 @@ var ts;
                     continue;
                 }
                 if (token === 11 /* NoSubstitutionTemplateLiteral */ || token === 12 /* TemplateHead */) {
-                    var tagExpression = createNode(173 /* TaggedTemplateExpression */, expression.pos);
+                    var tagExpression = createNode(175 /* TaggedTemplateExpression */, expression.pos);
                     tagExpression.tag = expression;
                     tagExpression.template = token === 11 /* NoSubstitutionTemplateLiteral */
                         ? parseLiteralNode()
@@ -10327,7 +10768,7 @@ var ts;
                     if (!typeArguments) {
                         return expression;
                     }
-                    var callExpr = createNode(171 /* CallExpression */, expression.pos);
+                    var callExpr = createNode(173 /* CallExpression */, expression.pos);
                     callExpr.expression = expression;
                     callExpr.typeArguments = typeArguments;
                     callExpr.arguments = parseArgumentList();
@@ -10335,7 +10776,7 @@ var ts;
                     continue;
                 }
                 else if (token === 17 /* OpenParenToken */) {
-                    var callExpr = createNode(171 /* CallExpression */, expression.pos);
+                    var callExpr = createNode(173 /* CallExpression */, expression.pos);
                     callExpr.expression = expression;
                     callExpr.arguments = parseArgumentList();
                     expression = finishNode(callExpr);
@@ -10359,7 +10800,7 @@ var ts;
                 // If it doesn't have the closing >  then it's definitely not an type argument list.
                 return undefined;
             }
-            // If we have a '<', then only parse this as a arugment list if the type arguments
+            // If we have a '<', then only parse this as a argument list if the type arguments
             // are complete and we have an open paren.  if we don't, rewind and return nothing.
             return typeArguments && canFollowTypeArgumentsInExpression()
                 ? typeArguments
@@ -10445,41 +10886,42 @@ var ts;
             return parseIdentifier(ts.Diagnostics.Expression_expected);
         }
         function parseParenthesizedExpression() {
-            var node = createNode(175 /* ParenthesizedExpression */);
+            var node = createNode(177 /* ParenthesizedExpression */);
             parseExpected(17 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(18 /* CloseParenToken */);
             return finishNode(node);
         }
         function parseSpreadElement() {
-            var node = createNode(188 /* SpreadElementExpression */);
+            var node = createNode(190 /* SpreadElementExpression */);
             parseExpected(22 /* DotDotDotToken */);
             node.expression = parseAssignmentExpressionOrHigher();
             return finishNode(node);
         }
         function parseArgumentOrArrayLiteralElement() {
             return token === 22 /* DotDotDotToken */ ? parseSpreadElement() :
-                token === 24 /* CommaToken */ ? createNode(190 /* OmittedExpression */) :
+                token === 24 /* CommaToken */ ? createNode(192 /* OmittedExpression */) :
                     parseAssignmentExpressionOrHigher();
         }
         function parseArgumentExpression() {
             return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement);
         }
         function parseArrayLiteralExpression() {
-            var node = createNode(167 /* ArrayLiteralExpression */);
+            var node = createNode(169 /* ArrayLiteralExpression */);
             parseExpected(19 /* OpenBracketToken */);
-            if (scanner.hasPrecedingLineBreak())
-                node.flags |= 1024 /* MultiLine */;
+            if (scanner.hasPrecedingLineBreak()) {
+                node.multiLine = true;
+            }
             node.elements = parseDelimitedList(15 /* ArrayLiteralMembers */, parseArgumentOrArrayLiteralElement);
             parseExpected(20 /* CloseBracketToken */);
             return finishNode(node);
         }
         function tryParseAccessorDeclaration(fullStart, decorators, modifiers) {
             if (parseContextualModifier(123 /* GetKeyword */)) {
-                return parseAccessorDeclaration(146 /* GetAccessor */, fullStart, decorators, modifiers);
+                return addJSDocComment(parseAccessorDeclaration(148 /* GetAccessor */, fullStart, decorators, modifiers));
             }
-            else if (parseContextualModifier(129 /* SetKeyword */)) {
-                return parseAccessorDeclaration(147 /* SetAccessor */, fullStart, decorators, modifiers);
+            else if (parseContextualModifier(130 /* SetKeyword */)) {
+                return parseAccessorDeclaration(149 /* SetAccessor */, fullStart, decorators, modifiers);
             }
             return undefined;
         }
@@ -10506,7 +10948,7 @@ var ts;
             // this is necessary because ObjectLiteral productions are also used to cover grammar for ObjectAssignmentPattern
             var isShorthandPropertyAssignment = tokenIsIdentifier && (token === 24 /* CommaToken */ || token === 16 /* CloseBraceToken */ || token === 56 /* EqualsToken */);
             if (isShorthandPropertyAssignment) {
-                var shorthandDeclaration = createNode(249 /* ShorthandPropertyAssignment */, fullStart);
+                var shorthandDeclaration = createNode(253 /* ShorthandPropertyAssignment */, fullStart);
                 shorthandDeclaration.name = propertyName;
                 shorthandDeclaration.questionToken = questionToken;
                 var equalsToken = parseOptionalToken(56 /* EqualsToken */);
@@ -10514,25 +10956,25 @@ var ts;
                     shorthandDeclaration.equalsToken = equalsToken;
                     shorthandDeclaration.objectAssignmentInitializer = allowInAnd(parseAssignmentExpressionOrHigher);
                 }
-                return finishNode(shorthandDeclaration);
+                return addJSDocComment(finishNode(shorthandDeclaration));
             }
             else {
-                var propertyAssignment = createNode(248 /* PropertyAssignment */, fullStart);
+                var propertyAssignment = createNode(252 /* PropertyAssignment */, fullStart);
                 propertyAssignment.modifiers = modifiers;
                 propertyAssignment.name = propertyName;
                 propertyAssignment.questionToken = questionToken;
                 parseExpected(54 /* ColonToken */);
                 propertyAssignment.initializer = allowInAnd(parseAssignmentExpressionOrHigher);
-                return finishNode(propertyAssignment);
+                return addJSDocComment(finishNode(propertyAssignment));
             }
         }
         function parseObjectLiteralExpression() {
-            var node = createNode(168 /* ObjectLiteralExpression */);
+            var node = createNode(170 /* ObjectLiteralExpression */);
             parseExpected(15 /* OpenBraceToken */);
             if (scanner.hasPrecedingLineBreak()) {
-                node.flags |= 1024 /* MultiLine */;
+                node.multiLine = true;
             }
-            node.properties = parseDelimitedList(12 /* ObjectLiteralMembers */, parseObjectLiteralElement, /*considerSemicolonAsDelimeter*/ true);
+            node.properties = parseDelimitedList(12 /* ObjectLiteralMembers */, parseObjectLiteralElement, /*considerSemicolonAsDelimiter*/ true);
             parseExpected(16 /* CloseBraceToken */);
             return finishNode(node);
         }
@@ -10546,7 +10988,7 @@ var ts;
             if (saveDecoratorContext) {
                 setDecoratorContext(/*val*/ false);
             }
-            var node = createNode(176 /* FunctionExpression */);
+            var node = createNode(178 /* FunctionExpression */);
             setModifiers(node, parseModifiers());
             parseExpected(87 /* FunctionKeyword */);
             node.asteriskToken = parseOptionalToken(37 /* AsteriskToken */);
@@ -10562,13 +11004,13 @@ var ts;
             if (saveDecoratorContext) {
                 setDecoratorContext(/*val*/ true);
             }
-            return finishNode(node);
+            return addJSDocComment(finishNode(node));
         }
         function parseOptionalIdentifier() {
             return isIdentifier() ? parseIdentifier() : undefined;
         }
         function parseNewExpression() {
-            var node = createNode(172 /* NewExpression */);
+            var node = createNode(174 /* NewExpression */);
             parseExpected(92 /* NewKeyword */);
             node.expression = parseMemberExpressionOrHigher();
             node.typeArguments = tryParse(parseTypeArgumentsInExpression);
@@ -10579,7 +11021,7 @@ var ts;
         }
         // STATEMENTS
         function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) {
-            var node = createNode(195 /* Block */);
+            var node = createNode(198 /* Block */);
             if (parseExpected(15 /* OpenBraceToken */, diagnosticMessage) || ignoreMissingOpenBrace) {
                 node.statements = parseList(1 /* BlockStatements */, parseStatement);
                 parseExpected(16 /* CloseBraceToken */);
@@ -10609,12 +11051,12 @@ var ts;
             return block;
         }
         function parseEmptyStatement() {
-            var node = createNode(197 /* EmptyStatement */);
+            var node = createNode(200 /* EmptyStatement */);
             parseExpected(23 /* SemicolonToken */);
             return finishNode(node);
         }
         function parseIfStatement() {
-            var node = createNode(199 /* IfStatement */);
+            var node = createNode(202 /* IfStatement */);
             parseExpected(88 /* IfKeyword */);
             parseExpected(17 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
@@ -10624,7 +11066,7 @@ var ts;
             return finishNode(node);
         }
         function parseDoStatement() {
-            var node = createNode(200 /* DoStatement */);
+            var node = createNode(203 /* DoStatement */);
             parseExpected(79 /* DoKeyword */);
             node.statement = parseStatement();
             parseExpected(104 /* WhileKeyword */);
@@ -10639,7 +11081,7 @@ var ts;
             return finishNode(node);
         }
         function parseWhileStatement() {
-            var node = createNode(201 /* WhileStatement */);
+            var node = createNode(204 /* WhileStatement */);
             parseExpected(104 /* WhileKeyword */);
             parseExpected(17 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
@@ -10662,21 +11104,21 @@ var ts;
             }
             var forOrForInOrForOfStatement;
             if (parseOptional(90 /* InKeyword */)) {
-                var forInStatement = createNode(203 /* ForInStatement */, pos);
+                var forInStatement = createNode(206 /* ForInStatement */, pos);
                 forInStatement.initializer = initializer;
                 forInStatement.expression = allowInAnd(parseExpression);
                 parseExpected(18 /* CloseParenToken */);
                 forOrForInOrForOfStatement = forInStatement;
             }
-            else if (parseOptional(135 /* OfKeyword */)) {
-                var forOfStatement = createNode(204 /* ForOfStatement */, pos);
+            else if (parseOptional(137 /* OfKeyword */)) {
+                var forOfStatement = createNode(207 /* ForOfStatement */, pos);
                 forOfStatement.initializer = initializer;
                 forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher);
                 parseExpected(18 /* CloseParenToken */);
                 forOrForInOrForOfStatement = forOfStatement;
             }
             else {
-                var forStatement = createNode(202 /* ForStatement */, pos);
+                var forStatement = createNode(205 /* ForStatement */, pos);
                 forStatement.initializer = initializer;
                 parseExpected(23 /* SemicolonToken */);
                 if (token !== 23 /* SemicolonToken */ && token !== 18 /* CloseParenToken */) {
@@ -10694,7 +11136,7 @@ var ts;
         }
         function parseBreakOrContinueStatement(kind) {
             var node = createNode(kind);
-            parseExpected(kind === 206 /* BreakStatement */ ? 70 /* BreakKeyword */ : 75 /* ContinueKeyword */);
+            parseExpected(kind === 209 /* BreakStatement */ ? 70 /* BreakKeyword */ : 75 /* ContinueKeyword */);
             if (!canParseSemicolon()) {
                 node.label = parseIdentifier();
             }
@@ -10702,7 +11144,7 @@ var ts;
             return finishNode(node);
         }
         function parseReturnStatement() {
-            var node = createNode(207 /* ReturnStatement */);
+            var node = createNode(210 /* ReturnStatement */);
             parseExpected(94 /* ReturnKeyword */);
             if (!canParseSemicolon()) {
                 node.expression = allowInAnd(parseExpression);
@@ -10711,7 +11153,7 @@ var ts;
             return finishNode(node);
         }
         function parseWithStatement() {
-            var node = createNode(208 /* WithStatement */);
+            var node = createNode(211 /* WithStatement */);
             parseExpected(105 /* WithKeyword */);
             parseExpected(17 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
@@ -10720,7 +11162,7 @@ var ts;
             return finishNode(node);
         }
         function parseCaseClause() {
-            var node = createNode(244 /* CaseClause */);
+            var node = createNode(248 /* CaseClause */);
             parseExpected(71 /* CaseKeyword */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(54 /* ColonToken */);
@@ -10728,7 +11170,7 @@ var ts;
             return finishNode(node);
         }
         function parseDefaultClause() {
-            var node = createNode(245 /* DefaultClause */);
+            var node = createNode(249 /* DefaultClause */);
             parseExpected(77 /* DefaultKeyword */);
             parseExpected(54 /* ColonToken */);
             node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement);
@@ -10738,12 +11180,12 @@ var ts;
             return token === 71 /* CaseKeyword */ ? parseCaseClause() : parseDefaultClause();
         }
         function parseSwitchStatement() {
-            var node = createNode(209 /* SwitchStatement */);
+            var node = createNode(212 /* SwitchStatement */);
             parseExpected(96 /* SwitchKeyword */);
             parseExpected(17 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(18 /* CloseParenToken */);
-            var caseBlock = createNode(223 /* CaseBlock */, scanner.getStartPos());
+            var caseBlock = createNode(226 /* CaseBlock */, scanner.getStartPos());
             parseExpected(15 /* OpenBraceToken */);
             caseBlock.clauses = parseList(2 /* SwitchClauses */, parseCaseOrDefaultClause);
             parseExpected(16 /* CloseBraceToken */);
@@ -10758,7 +11200,7 @@ var ts;
             // directly as that might consume an expression on the following line.
             // We just return 'undefined' in that case.  The actual error will be reported in the
             // grammar walker.
-            var node = createNode(211 /* ThrowStatement */);
+            var node = createNode(214 /* ThrowStatement */);
             parseExpected(98 /* ThrowKeyword */);
             node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression);
             parseSemicolon();
@@ -10766,7 +11208,7 @@ var ts;
         }
         // TODO: Review for error recovery
         function parseTryStatement() {
-            var node = createNode(212 /* TryStatement */);
+            var node = createNode(215 /* TryStatement */);
             parseExpected(100 /* TryKeyword */);
             node.tryBlock = parseBlock(/*ignoreMissingOpenBrace*/ false);
             node.catchClause = token === 72 /* CatchKeyword */ ? parseCatchClause() : undefined;
@@ -10779,7 +11221,7 @@ var ts;
             return finishNode(node);
         }
         function parseCatchClause() {
-            var result = createNode(247 /* CatchClause */);
+            var result = createNode(251 /* CatchClause */);
             parseExpected(72 /* CatchKeyword */);
             if (parseExpected(17 /* OpenParenToken */)) {
                 result.variableDeclaration = parseVariableDeclaration();
@@ -10789,7 +11231,7 @@ var ts;
             return finishNode(result);
         }
         function parseDebuggerStatement() {
-            var node = createNode(213 /* DebuggerStatement */);
+            var node = createNode(216 /* DebuggerStatement */);
             parseExpected(76 /* DebuggerKeyword */);
             parseSemicolon();
             return finishNode(node);
@@ -10801,16 +11243,16 @@ var ts;
             var fullStart = scanner.getStartPos();
             var expression = allowInAnd(parseExpression);
             if (expression.kind === 69 /* Identifier */ && parseOptional(54 /* ColonToken */)) {
-                var labeledStatement = createNode(210 /* LabeledStatement */, fullStart);
+                var labeledStatement = createNode(213 /* LabeledStatement */, fullStart);
                 labeledStatement.label = expression;
                 labeledStatement.statement = parseStatement();
-                return finishNode(labeledStatement);
+                return addJSDocComment(finishNode(labeledStatement));
             }
             else {
-                var expressionStatement = createNode(198 /* ExpressionStatement */, fullStart);
+                var expressionStatement = createNode(201 /* ExpressionStatement */, fullStart);
                 expressionStatement.expression = expression;
                 parseSemicolon();
-                return finishNode(expressionStatement);
+                return addJSDocComment(finishNode(expressionStatement));
             }
         }
         function nextTokenIsIdentifierOrKeywordOnSameLine() {
@@ -10857,7 +11299,7 @@ var ts;
                     //
                     // could be legal, it would add complexity for very little gain.
                     case 107 /* InterfaceKeyword */:
-                    case 132 /* TypeKeyword */:
+                    case 133 /* TypeKeyword */:
                         return nextTokenIsIdentifierOnSameLine();
                     case 125 /* ModuleKeyword */:
                     case 126 /* NamespaceKeyword */:
@@ -10868,14 +11310,16 @@ var ts;
                     case 110 /* PrivateKeyword */:
                     case 111 /* ProtectedKeyword */:
                     case 112 /* PublicKeyword */:
+                    case 127 /* ReadonlyKeyword */:
                         nextToken();
                         // ASI takes effect for this modifier.
                         if (scanner.hasPrecedingLineBreak()) {
                             return false;
                         }
                         continue;
-                    case 134 /* GlobalKeyword */:
-                        return nextToken() === 15 /* OpenBraceToken */;
+                    case 136 /* GlobalKeyword */:
+                        nextToken();
+                        return token === 15 /* OpenBraceToken */ || token === 69 /* Identifier */ || token === 82 /* ExportKeyword */;
                     case 89 /* ImportKeyword */:
                         nextToken();
                         return token === 9 /* StringLiteral */ || token === 37 /* AsteriskToken */ ||
@@ -10883,7 +11327,8 @@ var ts;
                     case 82 /* ExportKeyword */:
                         nextToken();
                         if (token === 56 /* EqualsToken */ || token === 37 /* AsteriskToken */ ||
-                            token === 15 /* OpenBraceToken */ || token === 77 /* DefaultKeyword */) {
+                            token === 15 /* OpenBraceToken */ || token === 77 /* DefaultKeyword */ ||
+                            token === 116 /* AsKeyword */) {
                             return true;
                         }
                         continue;
@@ -10934,14 +11379,15 @@ var ts;
                 case 107 /* InterfaceKeyword */:
                 case 125 /* ModuleKeyword */:
                 case 126 /* NamespaceKeyword */:
-                case 132 /* TypeKeyword */:
-                case 134 /* GlobalKeyword */:
+                case 133 /* TypeKeyword */:
+                case 136 /* GlobalKeyword */:
                     // When these don't start a declaration, they're an identifier in an expression statement
                     return true;
                 case 112 /* PublicKeyword */:
                 case 110 /* PrivateKeyword */:
                 case 111 /* ProtectedKeyword */:
                 case 113 /* StaticKeyword */:
+                case 127 /* ReadonlyKeyword */:
                     // When these don't start a declaration, they may be the start of a class member if an identifier
                     // immediately follows. Otherwise they're an identifier in an expression statement.
                     return isStartOfDeclaration() || !lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine);
@@ -10984,9 +11430,9 @@ var ts;
                 case 86 /* ForKeyword */:
                     return parseForOrForInOrForOfStatement();
                 case 75 /* ContinueKeyword */:
-                    return parseBreakOrContinueStatement(205 /* ContinueStatement */);
+                    return parseBreakOrContinueStatement(208 /* ContinueStatement */);
                 case 70 /* BreakKeyword */:
-                    return parseBreakOrContinueStatement(206 /* BreakStatement */);
+                    return parseBreakOrContinueStatement(209 /* BreakStatement */);
                 case 94 /* ReturnKeyword */:
                     return parseReturnStatement();
                 case 105 /* WithKeyword */:
@@ -11006,7 +11452,7 @@ var ts;
                     return parseDeclaration();
                 case 118 /* AsyncKeyword */:
                 case 107 /* InterfaceKeyword */:
-                case 132 /* TypeKeyword */:
+                case 133 /* TypeKeyword */:
                 case 125 /* ModuleKeyword */:
                 case 126 /* NamespaceKeyword */:
                 case 122 /* DeclareKeyword */:
@@ -11019,7 +11465,8 @@ var ts;
                 case 112 /* PublicKeyword */:
                 case 115 /* AbstractKeyword */:
                 case 113 /* StaticKeyword */:
-                case 134 /* GlobalKeyword */:
+                case 127 /* ReadonlyKeyword */:
+                case 136 /* GlobalKeyword */:
                     if (isStartOfDeclaration()) {
                         return parseDeclaration();
                     }
@@ -11042,11 +11489,11 @@ var ts;
                     return parseClassDeclaration(fullStart, decorators, modifiers);
                 case 107 /* InterfaceKeyword */:
                     return parseInterfaceDeclaration(fullStart, decorators, modifiers);
-                case 132 /* TypeKeyword */:
+                case 133 /* TypeKeyword */:
                     return parseTypeAliasDeclaration(fullStart, decorators, modifiers);
                 case 81 /* EnumKeyword */:
                     return parseEnumDeclaration(fullStart, decorators, modifiers);
-                case 134 /* GlobalKeyword */:
+                case 136 /* GlobalKeyword */:
                 case 125 /* ModuleKeyword */:
                 case 126 /* NamespaceKeyword */:
                     return parseModuleDeclaration(fullStart, decorators, modifiers);
@@ -11054,14 +11501,20 @@ var ts;
                     return parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers);
                 case 82 /* ExportKeyword */:
                     nextToken();
-                    return token === 77 /* DefaultKeyword */ || token === 56 /* EqualsToken */ ?
-                        parseExportAssignment(fullStart, decorators, modifiers) :
-                        parseExportDeclaration(fullStart, decorators, modifiers);
+                    switch (token) {
+                        case 77 /* DefaultKeyword */:
+                        case 56 /* EqualsToken */:
+                            return parseExportAssignment(fullStart, decorators, modifiers);
+                        case 116 /* AsKeyword */:
+                            return parseGlobalModuleExportDeclaration(fullStart, decorators, modifiers);
+                        default:
+                            return parseExportDeclaration(fullStart, decorators, modifiers);
+                    }
                 default:
                     if (decorators || modifiers) {
                         // We reached this point because we encountered decorators and/or modifiers and assumed a declaration
                         // would follow. For recovery and error reporting purposes, return an incomplete declaration.
-                        var node = createMissingNode(234 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
+                        var node = createMissingNode(238 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
                         node.pos = fullStart;
                         node.decorators = decorators;
                         setModifiers(node, modifiers);
@@ -11083,16 +11536,16 @@ var ts;
         // DECLARATIONS
         function parseArrayBindingElement() {
             if (token === 24 /* CommaToken */) {
-                return createNode(190 /* OmittedExpression */);
+                return createNode(192 /* OmittedExpression */);
             }
-            var node = createNode(166 /* BindingElement */);
+            var node = createNode(168 /* BindingElement */);
             node.dotDotDotToken = parseOptionalToken(22 /* DotDotDotToken */);
             node.name = parseIdentifierOrPattern();
             node.initializer = parseBindingElementInitializer(/*inParameter*/ false);
             return finishNode(node);
         }
         function parseObjectBindingElement() {
-            var node = createNode(166 /* BindingElement */);
+            var node = createNode(168 /* BindingElement */);
             var tokenIsIdentifier = isIdentifier();
             var propertyName = parsePropertyName();
             if (tokenIsIdentifier && token !== 54 /* ColonToken */) {
@@ -11107,14 +11560,14 @@ var ts;
             return finishNode(node);
         }
         function parseObjectBindingPattern() {
-            var node = createNode(164 /* ObjectBindingPattern */);
+            var node = createNode(166 /* ObjectBindingPattern */);
             parseExpected(15 /* OpenBraceToken */);
             node.elements = parseDelimitedList(9 /* ObjectBindingElements */, parseObjectBindingElement);
             parseExpected(16 /* CloseBraceToken */);
             return finishNode(node);
         }
         function parseArrayBindingPattern() {
-            var node = createNode(165 /* ArrayBindingPattern */);
+            var node = createNode(167 /* ArrayBindingPattern */);
             parseExpected(19 /* OpenBracketToken */);
             node.elements = parseDelimitedList(10 /* ArrayBindingElements */, parseArrayBindingElement);
             parseExpected(20 /* CloseBracketToken */);
@@ -11133,7 +11586,7 @@ var ts;
             return parseIdentifier();
         }
         function parseVariableDeclaration() {
-            var node = createNode(214 /* VariableDeclaration */);
+            var node = createNode(217 /* VariableDeclaration */);
             node.name = parseIdentifierOrPattern();
             node.type = parseTypeAnnotation();
             if (!isInOrOfKeyword(token)) {
@@ -11142,15 +11595,15 @@ var ts;
             return finishNode(node);
         }
         function parseVariableDeclarationList(inForStatementInitializer) {
-            var node = createNode(215 /* VariableDeclarationList */);
+            var node = createNode(218 /* VariableDeclarationList */);
             switch (token) {
                 case 102 /* VarKeyword */:
                     break;
                 case 108 /* LetKeyword */:
-                    node.flags |= 8192 /* Let */;
+                    node.flags |= 1024 /* Let */;
                     break;
                 case 74 /* ConstKeyword */:
-                    node.flags |= 16384 /* Const */;
+                    node.flags |= 2048 /* Const */;
                     break;
                 default:
                     ts.Debug.fail();
@@ -11165,7 +11618,7 @@ var ts;
             // So we need to look ahead to determine if 'of' should be treated as a keyword in
             // this context.
             // The checker will then give an error that there is an empty declaration list.
-            if (token === 135 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
+            if (token === 137 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
                 node.declarations = createMissingList();
             }
             else {
@@ -11180,15 +11633,15 @@ var ts;
             return nextTokenIsIdentifier() && nextToken() === 18 /* CloseParenToken */;
         }
         function parseVariableStatement(fullStart, decorators, modifiers) {
-            var node = createNode(196 /* VariableStatement */, fullStart);
+            var node = createNode(199 /* VariableStatement */, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             node.declarationList = parseVariableDeclarationList(/*inForStatementInitializer*/ false);
             parseSemicolon();
-            return finishNode(node);
+            return addJSDocComment(finishNode(node));
         }
         function parseFunctionDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(216 /* FunctionDeclaration */, fullStart);
+            var node = createNode(219 /* FunctionDeclaration */, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(87 /* FunctionKeyword */);
@@ -11198,19 +11651,19 @@ var ts;
             var isAsync = !!(node.flags & 256 /* Async */);
             fillSignature(54 /* ColonToken */, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, node);
             node.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, ts.Diagnostics.or_expected);
-            return finishNode(node);
+            return addJSDocComment(finishNode(node));
         }
         function parseConstructorDeclaration(pos, decorators, modifiers) {
-            var node = createNode(145 /* Constructor */, pos);
+            var node = createNode(147 /* Constructor */, pos);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(121 /* ConstructorKeyword */);
             fillSignature(54 /* ColonToken */, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node);
             node.body = parseFunctionBlockOrSemicolon(/*isGenerator*/ false, /*isAsync*/ false, ts.Diagnostics.or_expected);
-            return finishNode(node);
+            return addJSDocComment(finishNode(node));
         }
         function parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, name, questionToken, diagnosticMessage) {
-            var method = createNode(144 /* MethodDeclaration */, fullStart);
+            var method = createNode(146 /* MethodDeclaration */, fullStart);
             method.decorators = decorators;
             setModifiers(method, modifiers);
             method.asteriskToken = asteriskToken;
@@ -11220,10 +11673,10 @@ var ts;
             var isAsync = !!(method.flags & 256 /* Async */);
             fillSignature(54 /* ColonToken */, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, method);
             method.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, diagnosticMessage);
-            return finishNode(method);
+            return addJSDocComment(finishNode(method));
         }
         function parsePropertyDeclaration(fullStart, decorators, modifiers, name, questionToken) {
-            var property = createNode(142 /* PropertyDeclaration */, fullStart);
+            var property = createNode(144 /* PropertyDeclaration */, fullStart);
             property.decorators = decorators;
             setModifiers(property, modifiers);
             property.name = name;
@@ -11234,13 +11687,13 @@ var ts;
             // off. The grammar would look something like this:
             //
             //    MemberVariableDeclaration[Yield]:
-            //        AccessibilityModifier_opt   PropertyName   TypeAnnotation_opt   Initialiser_opt[In];
-            //        AccessibilityModifier_opt  static_opt  PropertyName   TypeAnnotation_opt   Initialiser_opt[In, ?Yield];
+            //        AccessibilityModifier_opt   PropertyName   TypeAnnotation_opt   Initializer_opt[In];
+            //        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 & 64 /* Static */
+            property.initializer = modifiers && modifiers.flags & 32 /* Static */
                 ? allowInAnd(parseNonParameterInitializer)
-                : doOutsideOfContext(2 /* Yield */ | 1 /* DisallowIn */, parseNonParameterInitializer);
+                : doOutsideOfContext(8388608 /* YieldContext */ | 4194304 /* DisallowInContext */, parseNonParameterInitializer);
             parseSemicolon();
             return finishNode(property);
         }
@@ -11275,6 +11728,7 @@ var ts;
                 case 110 /* PrivateKeyword */:
                 case 111 /* ProtectedKeyword */:
                 case 113 /* StaticKeyword */:
+                case 127 /* ReadonlyKeyword */:
                     return true;
                 default:
                     return false;
@@ -11315,7 +11769,7 @@ var ts;
             // If we were able to get any potential identifier...
             if (idToken !== undefined) {
                 // If we have a non-keyword identifier, or if we have an accessor, then it's safe to parse.
-                if (!ts.isKeyword(idToken) || idToken === 129 /* SetKeyword */ || idToken === 123 /* GetKeyword */) {
+                if (!ts.isKeyword(idToken) || idToken === 130 /* SetKeyword */ || idToken === 123 /* GetKeyword */) {
                     return true;
                 }
                 // If it *is* a keyword, but not an accessor, check a little farther along
@@ -11349,7 +11803,7 @@ var ts;
                     decorators = [];
                     decorators.pos = decoratorStart;
                 }
-                var decorator = createNode(140 /* Decorator */, decoratorStart);
+                var decorator = createNode(142 /* Decorator */, decoratorStart);
                 decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher);
                 decorators.push(finishNode(decorator));
             }
@@ -11414,7 +11868,7 @@ var ts;
         }
         function parseClassElement() {
             if (token === 23 /* SemicolonToken */) {
-                var result = createNode(194 /* SemicolonClassElement */);
+                var result = createNode(197 /* SemicolonClassElement */);
                 nextToken();
                 return finishNode(result);
             }
@@ -11452,10 +11906,10 @@ var ts;
             return parseClassDeclarationOrExpression(
             /*fullStart*/ scanner.getStartPos(), 
             /*decorators*/ undefined, 
-            /*modifiers*/ undefined, 189 /* ClassExpression */);
+            /*modifiers*/ undefined, 191 /* ClassExpression */);
         }
         function parseClassDeclaration(fullStart, decorators, modifiers) {
-            return parseClassDeclarationOrExpression(fullStart, decorators, modifiers, 217 /* ClassDeclaration */);
+            return parseClassDeclarationOrExpression(fullStart, decorators, modifiers, 220 /* ClassDeclaration */);
         }
         function parseClassDeclarationOrExpression(fullStart, decorators, modifiers, kind) {
             var node = createNode(kind, fullStart);
@@ -11499,7 +11953,7 @@ var ts;
         }
         function parseHeritageClause() {
             if (token === 83 /* ExtendsKeyword */ || token === 106 /* ImplementsKeyword */) {
-                var node = createNode(246 /* HeritageClause */);
+                var node = createNode(250 /* HeritageClause */);
                 node.token = token;
                 nextToken();
                 node.types = parseDelimitedList(7 /* HeritageClauseElement */, parseExpressionWithTypeArguments);
@@ -11508,7 +11962,7 @@ var ts;
             return undefined;
         }
         function parseExpressionWithTypeArguments() {
-            var node = createNode(191 /* ExpressionWithTypeArguments */);
+            var node = createNode(193 /* ExpressionWithTypeArguments */);
             node.expression = parseLeftHandSideExpressionOrHigher();
             if (token === 25 /* LessThanToken */) {
                 node.typeArguments = parseBracketedList(18 /* TypeArguments */, parseType, 25 /* LessThanToken */, 27 /* GreaterThanToken */);
@@ -11522,7 +11976,7 @@ var ts;
             return parseList(5 /* ClassMembers */, parseClassElement);
         }
         function parseInterfaceDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(218 /* InterfaceDeclaration */, fullStart);
+            var node = createNode(221 /* InterfaceDeclaration */, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(107 /* InterfaceKeyword */);
@@ -11533,10 +11987,10 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAliasDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(219 /* TypeAliasDeclaration */, fullStart);
+            var node = createNode(222 /* TypeAliasDeclaration */, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
-            parseExpected(132 /* TypeKeyword */);
+            parseExpected(133 /* TypeKeyword */);
             node.name = parseIdentifier();
             node.typeParameters = parseTypeParameters();
             parseExpected(56 /* EqualsToken */);
@@ -11549,13 +12003,13 @@ var ts;
         // ConstantEnumMemberSection, which starts at the beginning of an enum declaration
         // or any time an integer literal initializer is encountered.
         function parseEnumMember() {
-            var node = createNode(250 /* EnumMember */, scanner.getStartPos());
+            var node = createNode(254 /* EnumMember */, scanner.getStartPos());
             node.name = parsePropertyName();
             node.initializer = allowInAnd(parseNonParameterInitializer);
             return finishNode(node);
         }
         function parseEnumDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(220 /* EnumDeclaration */, fullStart);
+            var node = createNode(223 /* EnumDeclaration */, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(81 /* EnumKeyword */);
@@ -11570,7 +12024,7 @@ var ts;
             return finishNode(node);
         }
         function parseModuleBlock() {
-            var node = createNode(222 /* ModuleBlock */, scanner.getStartPos());
+            var node = createNode(225 /* ModuleBlock */, scanner.getStartPos());
             if (parseExpected(15 /* OpenBraceToken */)) {
                 node.statements = parseList(1 /* BlockStatements */, parseStatement);
                 parseExpected(16 /* CloseBraceToken */);
@@ -11581,27 +12035,27 @@ var ts;
             return finishNode(node);
         }
         function parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags) {
-            var node = createNode(221 /* ModuleDeclaration */, fullStart);
+            var node = createNode(224 /* ModuleDeclaration */, fullStart);
             // If we are parsing a dotted namespace name, we want to
             // propagate the 'Namespace' flag across the names if set.
-            var namespaceFlag = flags & 65536 /* Namespace */;
+            var namespaceFlag = flags & 4096 /* Namespace */;
             node.decorators = decorators;
             setModifiers(node, modifiers);
             node.flags |= flags;
             node.name = parseIdentifier();
             node.body = parseOptional(21 /* DotToken */)
-                ? parseModuleOrNamespaceDeclaration(getNodePos(), /*decorators*/ undefined, /*modifiers*/ undefined, 2 /* Export */ | namespaceFlag)
+                ? parseModuleOrNamespaceDeclaration(getNodePos(), /*decorators*/ undefined, /*modifiers*/ undefined, 1 /* Export */ | namespaceFlag)
                 : parseModuleBlock();
             return finishNode(node);
         }
         function parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(221 /* ModuleDeclaration */, fullStart);
+            var node = createNode(224 /* ModuleDeclaration */, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
-            if (token === 134 /* GlobalKeyword */) {
+            if (token === 136 /* GlobalKeyword */) {
                 // parse 'global' as name of global scope augmentation 
                 node.name = parseIdentifier();
-                node.flags |= 2097152 /* GlobalAugmentation */;
+                node.flags |= 131072 /* GlobalAugmentation */;
             }
             else {
                 node.name = parseLiteralNode(/*internName*/ true);
@@ -11611,12 +12065,12 @@ var ts;
         }
         function parseModuleDeclaration(fullStart, decorators, modifiers) {
             var flags = modifiers ? modifiers.flags : 0;
-            if (token === 134 /* GlobalKeyword */) {
+            if (token === 136 /* GlobalKeyword */) {
                 // global augmentation
                 return parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers);
             }
             else if (parseOptional(126 /* NamespaceKeyword */)) {
-                flags |= 65536 /* Namespace */;
+                flags |= 4096 /* Namespace */;
             }
             else {
                 parseExpected(125 /* ModuleKeyword */);
@@ -11627,7 +12081,7 @@ var ts;
             return parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags);
         }
         function isExternalModuleReference() {
-            return token === 127 /* RequireKeyword */ &&
+            return token === 128 /* RequireKeyword */ &&
                 lookAhead(nextTokenIsOpenParen);
         }
         function nextTokenIsOpenParen() {
@@ -11636,17 +12090,27 @@ var ts;
         function nextTokenIsSlash() {
             return nextToken() === 39 /* SlashToken */;
         }
+        function parseGlobalModuleExportDeclaration(fullStart, decorators, modifiers) {
+            var exportDeclaration = createNode(227 /* GlobalModuleExportDeclaration */, fullStart);
+            exportDeclaration.decorators = decorators;
+            exportDeclaration.modifiers = modifiers;
+            parseExpected(116 /* AsKeyword */);
+            parseExpected(126 /* NamespaceKeyword */);
+            exportDeclaration.name = parseIdentifier();
+            parseExpected(23 /* SemicolonToken */);
+            return finishNode(exportDeclaration);
+        }
         function parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers) {
             parseExpected(89 /* ImportKeyword */);
             var afterImportPos = scanner.getStartPos();
             var identifier;
             if (isIdentifier()) {
                 identifier = parseIdentifier();
-                if (token !== 24 /* CommaToken */ && token !== 133 /* FromKeyword */) {
+                if (token !== 24 /* CommaToken */ && token !== 135 /* FromKeyword */) {
                     // ImportEquals declaration of type:
                     // import x = require("mod"); or
                     // import x = M.x;
-                    var importEqualsDeclaration = createNode(224 /* ImportEqualsDeclaration */, fullStart);
+                    var importEqualsDeclaration = createNode(228 /* ImportEqualsDeclaration */, fullStart);
                     importEqualsDeclaration.decorators = decorators;
                     setModifiers(importEqualsDeclaration, modifiers);
                     importEqualsDeclaration.name = identifier;
@@ -11657,7 +12121,7 @@ var ts;
                 }
             }
             // Import statement
-            var importDeclaration = createNode(225 /* ImportDeclaration */, fullStart);
+            var importDeclaration = createNode(229 /* ImportDeclaration */, fullStart);
             importDeclaration.decorators = decorators;
             setModifiers(importDeclaration, modifiers);
             // ImportDeclaration:
@@ -11667,7 +12131,7 @@ var ts;
                 token === 37 /* AsteriskToken */ ||
                 token === 15 /* OpenBraceToken */) {
                 importDeclaration.importClause = parseImportClause(identifier, afterImportPos);
-                parseExpected(133 /* FromKeyword */);
+                parseExpected(135 /* FromKeyword */);
             }
             importDeclaration.moduleSpecifier = parseModuleSpecifier();
             parseSemicolon();
@@ -11680,7 +12144,7 @@ var ts;
             //  NamedImports
             //  ImportedDefaultBinding, NameSpaceImport
             //  ImportedDefaultBinding, NamedImports
-            var importClause = createNode(226 /* ImportClause */, fullStart);
+            var importClause = createNode(230 /* ImportClause */, fullStart);
             if (identifier) {
                 // ImportedDefaultBinding:
                 //  ImportedBinding
@@ -11690,7 +12154,7 @@ var ts;
             // parse namespace or named imports
             if (!importClause.name ||
                 parseOptional(24 /* CommaToken */)) {
-                importClause.namedBindings = token === 37 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(228 /* NamedImports */);
+                importClause.namedBindings = token === 37 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(232 /* NamedImports */);
             }
             return finishNode(importClause);
         }
@@ -11700,8 +12164,8 @@ var ts;
                 : parseEntityName(/*allowReservedWords*/ false);
         }
         function parseExternalModuleReference() {
-            var node = createNode(235 /* ExternalModuleReference */);
-            parseExpected(127 /* RequireKeyword */);
+            var node = createNode(239 /* ExternalModuleReference */);
+            parseExpected(128 /* RequireKeyword */);
             parseExpected(17 /* OpenParenToken */);
             node.expression = parseModuleSpecifier();
             parseExpected(18 /* CloseParenToken */);
@@ -11723,7 +12187,7 @@ var ts;
         function parseNamespaceImport() {
             // NameSpaceImport:
             //  * as ImportedBinding
-            var namespaceImport = createNode(227 /* NamespaceImport */);
+            var namespaceImport = createNode(231 /* NamespaceImport */);
             parseExpected(37 /* AsteriskToken */);
             parseExpected(116 /* AsKeyword */);
             namespaceImport.name = parseIdentifier();
@@ -11738,21 +12202,21 @@ var ts;
             // ImportsList:
             //  ImportSpecifier
             //  ImportsList, ImportSpecifier
-            node.elements = parseBracketedList(21 /* ImportOrExportSpecifiers */, kind === 228 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 15 /* OpenBraceToken */, 16 /* CloseBraceToken */);
+            node.elements = parseBracketedList(21 /* ImportOrExportSpecifiers */, kind === 232 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 15 /* OpenBraceToken */, 16 /* CloseBraceToken */);
             return finishNode(node);
         }
         function parseExportSpecifier() {
-            return parseImportOrExportSpecifier(233 /* ExportSpecifier */);
+            return parseImportOrExportSpecifier(237 /* ExportSpecifier */);
         }
         function parseImportSpecifier() {
-            return parseImportOrExportSpecifier(229 /* ImportSpecifier */);
+            return parseImportOrExportSpecifier(233 /* ImportSpecifier */);
         }
         function parseImportOrExportSpecifier(kind) {
             var node = createNode(kind);
             // ImportSpecifier:
             //   BindingIdentifier
             //   IdentifierName as BindingIdentifier
-            // ExportSpecififer:
+            // ExportSpecifier:
             //   IdentifierName
             //   IdentifierName as IdentifierName
             var checkIdentifierIsKeyword = ts.isKeyword(token) && !isIdentifier();
@@ -11770,27 +12234,27 @@ var ts;
             else {
                 node.name = identifierName;
             }
-            if (kind === 229 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
+            if (kind === 233 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
                 // Report error identifier expected
                 parseErrorAtPosition(checkIdentifierStart, checkIdentifierEnd - checkIdentifierStart, ts.Diagnostics.Identifier_expected);
             }
             return finishNode(node);
         }
         function parseExportDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(231 /* ExportDeclaration */, fullStart);
+            var node = createNode(235 /* ExportDeclaration */, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             if (parseOptional(37 /* AsteriskToken */)) {
-                parseExpected(133 /* FromKeyword */);
+                parseExpected(135 /* FromKeyword */);
                 node.moduleSpecifier = parseModuleSpecifier();
             }
             else {
-                node.exportClause = parseNamedImportsOrExports(232 /* NamedExports */);
+                node.exportClause = parseNamedImportsOrExports(236 /* NamedExports */);
                 // It is not uncommon to accidentally omit the 'from' keyword. Additionally, in editing scenarios,
                 // the 'from' keyword can be parsed as a named export when the export clause is unterminated (i.e. `export { from "moduleName";`)
                 // If we don't have a 'from' keyword, see if we have a string literal such that ASI won't take effect.
-                if (token === 133 /* FromKeyword */ || (token === 9 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) {
-                    parseExpected(133 /* FromKeyword */);
+                if (token === 135 /* FromKeyword */ || (token === 9 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) {
+                    parseExpected(135 /* FromKeyword */);
                     node.moduleSpecifier = parseModuleSpecifier();
                 }
             }
@@ -11798,7 +12262,7 @@ var ts;
             return finishNode(node);
         }
         function parseExportAssignment(fullStart, decorators, modifiers) {
-            var node = createNode(230 /* ExportAssignment */, fullStart);
+            var node = createNode(234 /* ExportAssignment */, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             if (parseOptional(56 /* EqualsToken */)) {
@@ -11814,6 +12278,7 @@ var ts;
         function processReferenceComments(sourceFile) {
             var triviaScanner = ts.createScanner(sourceFile.languageVersion, /*skipTrivia*/ false, 0 /* Standard */, sourceText);
             var referencedFiles = [];
+            var typeReferenceDirectives = [];
             var amdDependencies = [];
             var amdModuleName;
             // Keep scanning all the leading trivia in the file until we get to something that
@@ -11837,7 +12302,12 @@ var ts;
                     sourceFile.hasNoDefaultLib = referencePathMatchResult.isNoDefaultLib;
                     var diagnosticMessage = referencePathMatchResult.diagnosticMessage;
                     if (fileReference) {
-                        referencedFiles.push(fileReference);
+                        if (referencePathMatchResult.isTypeReferenceDirective) {
+                            typeReferenceDirectives.push(fileReference);
+                        }
+                        else {
+                            referencedFiles.push(fileReference);
+                        }
                     }
                     if (diagnosticMessage) {
                         parseDiagnostics.push(ts.createFileDiagnostic(sourceFile, range.pos, range.end - range.pos, diagnosticMessage));
@@ -11867,16 +12337,17 @@ var ts;
                 }
             }
             sourceFile.referencedFiles = referencedFiles;
+            sourceFile.typeReferenceDirectives = typeReferenceDirectives;
             sourceFile.amdDependencies = amdDependencies;
             sourceFile.moduleName = amdModuleName;
         }
         function setExternalModuleIndicator(sourceFile) {
             sourceFile.externalModuleIndicator = ts.forEach(sourceFile.statements, function (node) {
-                return node.flags & 2 /* Export */
-                    || node.kind === 224 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 235 /* ExternalModuleReference */
-                    || node.kind === 225 /* ImportDeclaration */
-                    || node.kind === 230 /* ExportAssignment */
-                    || node.kind === 231 /* ExportDeclaration */
+                return node.flags & 1 /* Export */
+                    || node.kind === 228 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 239 /* ExternalModuleReference */
+                    || node.kind === 229 /* ImportDeclaration */
+                    || node.kind === 234 /* ExportAssignment */
+                    || node.kind === 235 /* ExportDeclaration */
                     ? node
                     : undefined;
             });
@@ -11937,21 +12408,19 @@ var ts;
             }
             JSDocParser.isJSDocType = isJSDocType;
             function parseJSDocTypeExpressionForTests(content, start, length) {
-                initializeState("file.js", content, 2 /* Latest */, /*isJavaScriptFile*/ true, /*_syntaxCursor:*/ undefined);
-                var jsDocTypeExpression = parseJSDocTypeExpression(start, length);
+                initializeState("file.js", content, 2 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
+                scanner.setText(content, start, length);
+                token = scanner.scan();
+                var jsDocTypeExpression = parseJSDocTypeExpression();
                 var diagnostics = parseDiagnostics;
                 clearState();
                 return jsDocTypeExpression ? { jsDocTypeExpression: jsDocTypeExpression, diagnostics: diagnostics } : undefined;
             }
             JSDocParser.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
-            // Parses out a JSDoc type expression.  The starting position should be right at the open
-            // curly in the type expression.  Returns 'undefined' if it encounters any errors while parsing.
+            // Parses out a JSDoc type expression.
             /* @internal */
-            function parseJSDocTypeExpression(start, length) {
-                scanner.setText(sourceText, start, length);
-                // Prime the first token for us to start processing.
-                token = nextToken();
-                var result = createNode(252 /* JSDocTypeExpression */);
+            function parseJSDocTypeExpression() {
+                var result = createNode(256 /* JSDocTypeExpression */, scanner.getTokenPos());
                 parseExpected(15 /* OpenBraceToken */);
                 result.type = parseJSDocTopLevelType();
                 parseExpected(16 /* CloseBraceToken */);
@@ -11962,12 +12431,12 @@ var ts;
             function parseJSDocTopLevelType() {
                 var type = parseJSDocType();
                 if (token === 47 /* BarToken */) {
-                    var unionType = createNode(256 /* JSDocUnionType */, type.pos);
+                    var unionType = createNode(260 /* JSDocUnionType */, type.pos);
                     unionType.types = parseJSDocTypeList(type);
                     type = finishNode(unionType);
                 }
                 if (token === 56 /* EqualsToken */) {
-                    var optionalType = createNode(263 /* JSDocOptionalType */, type.pos);
+                    var optionalType = createNode(267 /* JSDocOptionalType */, type.pos);
                     nextToken();
                     optionalType.type = type;
                     type = finishNode(optionalType);
@@ -11978,20 +12447,20 @@ var ts;
                 var type = parseBasicTypeExpression();
                 while (true) {
                     if (token === 19 /* OpenBracketToken */) {
-                        var arrayType = createNode(255 /* JSDocArrayType */, type.pos);
+                        var arrayType = createNode(259 /* JSDocArrayType */, type.pos);
                         arrayType.elementType = type;
                         nextToken();
                         parseExpected(20 /* CloseBracketToken */);
                         type = finishNode(arrayType);
                     }
                     else if (token === 53 /* QuestionToken */) {
-                        var nullableType = createNode(258 /* JSDocNullableType */, type.pos);
+                        var nullableType = createNode(262 /* JSDocNullableType */, type.pos);
                         nullableType.type = type;
                         nextToken();
                         type = finishNode(nullableType);
                     }
                     else if (token === 49 /* ExclamationToken */) {
-                        var nonNullableType = createNode(259 /* JSDocNonNullableType */, type.pos);
+                        var nonNullableType = createNode(263 /* JSDocNonNullableType */, type.pos);
                         nonNullableType.type = type;
                         nextToken();
                         type = finishNode(nonNullableType);
@@ -12025,10 +12494,10 @@ var ts;
                     case 97 /* ThisKeyword */:
                         return parseJSDocThisType();
                     case 117 /* AnyKeyword */:
-                    case 130 /* StringKeyword */:
-                    case 128 /* NumberKeyword */:
+                    case 131 /* StringKeyword */:
+                    case 129 /* NumberKeyword */:
                     case 120 /* BooleanKeyword */:
-                    case 131 /* SymbolKeyword */:
+                    case 132 /* SymbolKeyword */:
                     case 103 /* VoidKeyword */:
                         return parseTokenNode();
                 }
@@ -12036,27 +12505,27 @@ var ts;
                 return parseJSDocTypeReference();
             }
             function parseJSDocThisType() {
-                var result = createNode(267 /* JSDocThisType */);
+                var result = createNode(271 /* JSDocThisType */);
                 nextToken();
                 parseExpected(54 /* ColonToken */);
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocConstructorType() {
-                var result = createNode(266 /* JSDocConstructorType */);
+                var result = createNode(270 /* JSDocConstructorType */);
                 nextToken();
                 parseExpected(54 /* ColonToken */);
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocVariadicType() {
-                var result = createNode(265 /* JSDocVariadicType */);
+                var result = createNode(269 /* JSDocVariadicType */);
                 nextToken();
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocFunctionType() {
-                var result = createNode(264 /* JSDocFunctionType */);
+                var result = createNode(268 /* JSDocFunctionType */);
                 nextToken();
                 parseExpected(17 /* OpenParenToken */);
                 result.parameters = parseDelimitedList(22 /* JSDocFunctionParameters */, parseJSDocParameter);
@@ -12069,20 +12538,28 @@ var ts;
                 return finishNode(result);
             }
             function parseJSDocParameter() {
-                var parameter = createNode(139 /* Parameter */);
+                var parameter = createNode(141 /* Parameter */);
                 parameter.type = parseJSDocType();
+                if (parseOptional(56 /* EqualsToken */)) {
+                    parameter.questionToken = createNode(56 /* EqualsToken */);
+                }
                 return finishNode(parameter);
             }
             function parseJSDocTypeReference() {
-                var result = createNode(262 /* JSDocTypeReference */);
+                var result = createNode(266 /* JSDocTypeReference */);
                 result.name = parseSimplePropertyName();
-                while (parseOptional(21 /* DotToken */)) {
-                    if (token === 25 /* LessThanToken */) {
-                        result.typeArguments = parseTypeArguments();
-                        break;
-                    }
-                    else {
-                        result.name = parseQualifiedName(result.name);
+                if (token === 25 /* LessThanToken */) {
+                    result.typeArguments = parseTypeArguments();
+                }
+                else {
+                    while (parseOptional(21 /* DotToken */)) {
+                        if (token === 25 /* LessThanToken */) {
+                            result.typeArguments = parseTypeArguments();
+                            break;
+                        }
+                        else {
+                            result.name = parseQualifiedName(result.name);
+                        }
                     }
                 }
                 return finishNode(result);
@@ -12104,13 +12581,13 @@ var ts;
                 }
             }
             function parseQualifiedName(left) {
-                var result = createNode(136 /* QualifiedName */, left.pos);
+                var result = createNode(138 /* QualifiedName */, left.pos);
                 result.left = left;
                 result.right = parseIdentifierName();
                 return finishNode(result);
             }
             function parseJSDocRecordType() {
-                var result = createNode(260 /* JSDocRecordType */);
+                var result = createNode(264 /* JSDocRecordType */);
                 nextToken();
                 result.members = parseDelimitedList(24 /* JSDocRecordMembers */, parseJSDocRecordMember);
                 checkForTrailingComma(result.members);
@@ -12118,7 +12595,7 @@ var ts;
                 return finishNode(result);
             }
             function parseJSDocRecordMember() {
-                var result = createNode(261 /* JSDocRecordMember */);
+                var result = createNode(265 /* JSDocRecordMember */);
                 result.name = parseSimplePropertyName();
                 if (token === 54 /* ColonToken */) {
                     nextToken();
@@ -12127,13 +12604,13 @@ var ts;
                 return finishNode(result);
             }
             function parseJSDocNonNullableType() {
-                var result = createNode(259 /* JSDocNonNullableType */);
+                var result = createNode(263 /* JSDocNonNullableType */);
                 nextToken();
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocTupleType() {
-                var result = createNode(257 /* JSDocTupleType */);
+                var result = createNode(261 /* JSDocTupleType */);
                 nextToken();
                 result.types = parseDelimitedList(25 /* JSDocTupleTypes */, parseJSDocType);
                 checkForTrailingComma(result.types);
@@ -12147,7 +12624,7 @@ var ts;
                 }
             }
             function parseJSDocUnionType() {
-                var result = createNode(256 /* JSDocUnionType */);
+                var result = createNode(260 /* JSDocUnionType */);
                 nextToken();
                 result.types = parseJSDocTypeList(parseJSDocType());
                 parseExpected(18 /* CloseParenToken */);
@@ -12165,7 +12642,7 @@ var ts;
                 return types;
             }
             function parseJSDocAllType() {
-                var result = createNode(253 /* JSDocAllType */);
+                var result = createNode(257 /* JSDocAllType */);
                 nextToken();
                 return finishNode(result);
             }
@@ -12188,29 +12665,35 @@ var ts;
                     token === 27 /* GreaterThanToken */ ||
                     token === 56 /* EqualsToken */ ||
                     token === 47 /* BarToken */) {
-                    var result = createNode(254 /* JSDocUnknownType */, pos);
+                    var result = createNode(258 /* JSDocUnknownType */, pos);
                     return finishNode(result);
                 }
                 else {
-                    var result = createNode(258 /* JSDocNullableType */, pos);
+                    var result = createNode(262 /* JSDocNullableType */, pos);
                     result.type = parseJSDocType();
                     return finishNode(result);
                 }
             }
             function parseIsolatedJSDocComment(content, start, length) {
-                initializeState("file.js", content, 2 /* Latest */, /*isJavaScriptFile*/ true, /*_syntaxCursor:*/ undefined);
-                var jsDocComment = parseJSDocComment(/*parent:*/ undefined, start, length);
+                initializeState("file.js", content, 2 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
+                sourceFile = { languageVariant: 0 /* Standard */, text: content };
+                var jsDocComment = parseJSDocCommentWorker(start, length);
                 var diagnostics = parseDiagnostics;
                 clearState();
                 return jsDocComment ? { jsDocComment: jsDocComment, diagnostics: diagnostics } : undefined;
             }
             JSDocParser.parseIsolatedJSDocComment = parseIsolatedJSDocComment;
             function parseJSDocComment(parent, start, length) {
+                var saveToken = token;
+                var saveParseDiagnosticsLength = parseDiagnostics.length;
+                var saveParseErrorBeforeNextFinishedNode = parseErrorBeforeNextFinishedNode;
                 var comment = parseJSDocCommentWorker(start, length);
                 if (comment) {
-                    fixupParentReferences(comment);
                     comment.parent = parent;
                 }
+                token = saveToken;
+                parseDiagnostics.length = saveParseDiagnosticsLength;
+                parseErrorBeforeNextFinishedNode = saveParseErrorBeforeNextFinishedNode;
                 return comment;
             }
             JSDocParser.parseJSDocComment = parseJSDocComment;
@@ -12223,77 +12706,75 @@ var ts;
                 ts.Debug.assert(start <= end);
                 ts.Debug.assert(end <= content.length);
                 var tags;
-                var pos;
-                // NOTE(cyrusn): This is essentially a handwritten scanner for JSDocComments. I
-                // considered using an actual Scanner, but this would complicate things.  The
-                // scanner would need to know it was in a Doc Comment.  Otherwise, it would then
-                // produce comments *inside* the doc comment.  In the end it was just easier to
-                // write a simple scanner rather than go that route.
-                if (length >= "/** */".length) {
-                    if (content.charCodeAt(start) === 47 /* slash */ &&
-                        content.charCodeAt(start + 1) === 42 /* asterisk */ &&
-                        content.charCodeAt(start + 2) === 42 /* asterisk */ &&
-                        content.charCodeAt(start + 3) !== 42 /* asterisk */) {
+                var result;
+                // Check for /** (JSDoc opening part)
+                if (content.charCodeAt(start) === 47 /* slash */ &&
+                    content.charCodeAt(start + 1) === 42 /* asterisk */ &&
+                    content.charCodeAt(start + 2) === 42 /* asterisk */ &&
+                    content.charCodeAt(start + 3) !== 42 /* asterisk */) {
+                    // + 3 for leading /**, - 5 in total for /** */
+                    scanner.scanRange(start + 3, length - 5, function () {
                         // Initially we can parse out a tag.  We also have seen a starting asterisk.
                         // This is so that /** * @type */ doesn't parse.
                         var canParseTag = true;
                         var seenAsterisk = true;
-                        for (pos = start + "/**".length; pos < end;) {
-                            var ch = content.charCodeAt(pos);
-                            pos++;
-                            if (ch === 64 /* at */ && canParseTag) {
-                                parseTag();
-                                // Once we parse out a tag, we cannot keep parsing out tags on this line.
-                                canParseTag = false;
-                                continue;
-                            }
-                            if (ts.isLineBreak(ch)) {
-                                // After a line break, we can parse a tag, and we haven't seen as asterisk
-                                // on the next line yet.
-                                canParseTag = true;
-                                seenAsterisk = false;
-                                continue;
-                            }
-                            if (ts.isWhiteSpace(ch)) {
-                                // Whitespace doesn't affect any of our parsing.
-                                continue;
-                            }
-                            // Ignore the first asterisk on a line.
-                            if (ch === 42 /* asterisk */) {
-                                if (seenAsterisk) {
-                                    // If we've already seen an asterisk, then we can no longer parse a tag
-                                    // on this line.
+                        nextJSDocToken();
+                        while (token !== 1 /* EndOfFileToken */) {
+                            switch (token) {
+                                case 55 /* AtToken */:
+                                    if (canParseTag) {
+                                        parseTag();
+                                    }
+                                    // This will take us to the end of the line, so it's OK to parse a tag on the next pass through the loop
+                                    seenAsterisk = false;
+                                    break;
+                                case 4 /* NewLineTrivia */:
+                                    // After a line break, we can parse a tag, and we haven't seen an asterisk on the next line yet
+                                    canParseTag = true;
+                                    seenAsterisk = false;
+                                    break;
+                                case 37 /* AsteriskToken */:
+                                    if (seenAsterisk) {
+                                        // If we've already seen an asterisk, then we can no longer parse a tag on this line
+                                        canParseTag = false;
+                                    }
+                                    // Ignore the first asterisk on a line
+                                    seenAsterisk = true;
+                                    break;
+                                case 69 /* Identifier */:
+                                    // Anything else is doc comment text.  We can't do anything with it.  Because it
+                                    // wasn't a tag, we can no longer parse a tag on this line until we hit the next
+                                    // line break.
                                     canParseTag = false;
-                                }
-                                seenAsterisk = true;
-                                continue;
+                                    break;
+                                case 1 /* EndOfFileToken */:
+                                    break;
                             }
-                            // Anything else is doc comment text.  We can't do anything with it.  Because it
-                            // wasn't a tag, we can no longer parse a tag on this line until we hit the next
-                            // line break.
-                            canParseTag = false;
+                            nextJSDocToken();
                         }
-                    }
+                        result = createJSDocComment();
+                    });
                 }
-                return createJSDocComment();
+                return result;
                 function createJSDocComment() {
                     if (!tags) {
                         return undefined;
                     }
-                    var result = createNode(268 /* JSDocComment */, start);
+                    var result = createNode(272 /* JSDocComment */, start);
                     result.tags = tags;
                     return finishNode(result, end);
                 }
                 function skipWhitespace() {
-                    while (pos < end && ts.isWhiteSpace(content.charCodeAt(pos))) {
-                        pos++;
+                    while (token === 5 /* WhitespaceTrivia */ || token === 4 /* NewLineTrivia */) {
+                        nextJSDocToken();
                     }
                 }
                 function parseTag() {
-                    ts.Debug.assert(content.charCodeAt(pos - 1) === 64 /* at */);
-                    var atToken = createNode(55 /* AtToken */, pos - 1);
-                    atToken.end = pos;
-                    var tagName = scanIdentifier();
+                    ts.Debug.assert(token === 55 /* AtToken */);
+                    var atToken = createNode(55 /* AtToken */, scanner.getTokenPos());
+                    atToken.end = scanner.getTextPos();
+                    nextJSDocToken();
+                    var tagName = parseJSDocIdentifier();
                     if (!tagName) {
                         return;
                     }
@@ -12317,10 +12798,10 @@ var ts;
                     return undefined;
                 }
                 function handleUnknownTag(atToken, tagName) {
-                    var result = createNode(269 /* JSDocTag */, atToken.pos);
+                    var result = createNode(273 /* JSDocTag */, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
-                    return finishNode(result, pos);
+                    return finishNode(result);
                 }
                 function addTag(tag) {
                     if (tag) {
@@ -12333,12 +12814,10 @@ var ts;
                     }
                 }
                 function tryParseTypeExpression() {
-                    skipWhitespace();
-                    if (content.charCodeAt(pos) !== 123 /* openBrace */) {
+                    if (token !== 15 /* OpenBraceToken */) {
                         return undefined;
                     }
-                    var typeExpression = parseJSDocTypeExpression(pos, end - pos);
-                    pos = typeExpression.end;
+                    var typeExpression = parseJSDocTypeExpression();
                     return typeExpression;
                 }
                 function handleParamTag(atToken, tagName) {
@@ -12346,17 +12825,22 @@ var ts;
                     skipWhitespace();
                     var name;
                     var isBracketed;
-                    if (content.charCodeAt(pos) === 91 /* openBracket */) {
-                        pos++;
-                        skipWhitespace();
-                        name = scanIdentifier();
+                    // Looking for something like '[foo]' or 'foo'
+                    if (parseOptionalToken(19 /* OpenBracketToken */)) {
+                        name = parseJSDocIdentifier();
                         isBracketed = true;
+                        // May have an optional default, e.g. '[foo = 42]'
+                        if (parseOptionalToken(56 /* EqualsToken */)) {
+                            parseExpression();
+                        }
+                        parseExpected(20 /* CloseBracketToken */);
                     }
-                    else {
-                        name = scanIdentifier();
+                    else if (token === 69 /* Identifier */) {
+                        name = parseJSDocIdentifier();
                     }
                     if (!name) {
-                        parseErrorAtPosition(pos, 0, ts.Diagnostics.Identifier_expected);
+                        parseErrorAtPosition(scanner.getStartPos(), 0, ts.Diagnostics.Identifier_expected);
+                        return undefined;
                     }
                     var preName, postName;
                     if (typeExpression) {
@@ -12368,84 +12852,82 @@ var ts;
                     if (!typeExpression) {
                         typeExpression = tryParseTypeExpression();
                     }
-                    var result = createNode(270 /* JSDocParameterTag */, atToken.pos);
+                    var result = createNode(274 /* JSDocParameterTag */, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.preParameterName = preName;
                     result.typeExpression = typeExpression;
                     result.postParameterName = postName;
                     result.isBracketed = isBracketed;
-                    return finishNode(result, pos);
+                    return finishNode(result);
                 }
                 function handleReturnTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 271 /* JSDocReturnTag */; })) {
-                        parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
+                    if (ts.forEach(tags, function (t) { return t.kind === 275 /* JSDocReturnTag */; })) {
+                        parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
-                    var result = createNode(271 /* JSDocReturnTag */, atToken.pos);
+                    var result = createNode(275 /* JSDocReturnTag */, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
-                    return finishNode(result, pos);
+                    return finishNode(result);
                 }
                 function handleTypeTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 272 /* JSDocTypeTag */; })) {
-                        parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
+                    if (ts.forEach(tags, function (t) { return t.kind === 276 /* JSDocTypeTag */; })) {
+                        parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
-                    var result = createNode(272 /* JSDocTypeTag */, atToken.pos);
+                    var result = createNode(276 /* JSDocTypeTag */, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
-                    return finishNode(result, pos);
+                    return finishNode(result);
                 }
                 function handleTemplateTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 273 /* JSDocTemplateTag */; })) {
-                        parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
+                    if (ts.forEach(tags, function (t) { return t.kind === 277 /* JSDocTemplateTag */; })) {
+                        parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
+                    // Type parameter list looks like '@template T,U,V'
                     var typeParameters = [];
-                    typeParameters.pos = pos;
+                    typeParameters.pos = scanner.getStartPos();
                     while (true) {
-                        skipWhitespace();
-                        var startPos = pos;
-                        var name_8 = scanIdentifier();
+                        var name_8 = parseJSDocIdentifier();
                         if (!name_8) {
-                            parseErrorAtPosition(startPos, 0, ts.Diagnostics.Identifier_expected);
+                            parseErrorAtPosition(scanner.getStartPos(), 0, ts.Diagnostics.Identifier_expected);
                             return undefined;
                         }
-                        var typeParameter = createNode(138 /* TypeParameter */, name_8.pos);
+                        var typeParameter = createNode(140 /* TypeParameter */, name_8.pos);
                         typeParameter.name = name_8;
-                        finishNode(typeParameter, pos);
+                        finishNode(typeParameter);
                         typeParameters.push(typeParameter);
-                        skipWhitespace();
-                        if (content.charCodeAt(pos) !== 44 /* comma */) {
+                        if (token === 24 /* CommaToken */) {
+                            nextJSDocToken();
+                        }
+                        else {
                             break;
                         }
-                        pos++;
                     }
-                    typeParameters.end = pos;
-                    var result = createNode(273 /* JSDocTemplateTag */, atToken.pos);
+                    var result = createNode(277 /* JSDocTemplateTag */, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeParameters = typeParameters;
-                    return finishNode(result, pos);
+                    finishNode(result);
+                    typeParameters.end = result.end;
+                    return result;
                 }
-                function scanIdentifier() {
-                    var startPos = pos;
-                    for (; pos < end; pos++) {
-                        var ch = content.charCodeAt(pos);
-                        if (pos === startPos && ts.isIdentifierStart(ch, 2 /* Latest */)) {
-                            continue;
-                        }
-                        else if (pos > startPos && ts.isIdentifierPart(ch, 2 /* Latest */)) {
-                            continue;
-                        }
-                        break;
-                    }
-                    if (startPos === pos) {
+                function nextJSDocToken() {
+                    return token = scanner.scanJSDocToken();
+                }
+                function parseJSDocIdentifier() {
+                    if (token !== 69 /* Identifier */) {
+                        parseErrorAtCurrentToken(ts.Diagnostics.Identifier_expected);
                         return undefined;
                     }
-                    var result = createNode(69 /* Identifier */, startPos);
-                    result.text = content.substring(startPos, pos);
-                    return finishNode(result, pos);
+                    var pos = scanner.getTokenPos();
+                    var end = scanner.getTextPos();
+                    var result = createNode(69 /* Identifier */, pos);
+                    result.text = content.substring(pos, end);
+                    finishNode(result, end);
+                    nextJSDocToken();
+                    return result;
                 }
             }
             JSDocParser.parseJSDocCommentWorker = parseJSDocCommentWorker;
@@ -12463,10 +12945,10 @@ var ts;
             if (sourceFile.statements.length === 0) {
                 // If we don't have any statements in the current source file, then there's no real
                 // way to incrementally parse.  So just do a full parse instead.
-                return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, /*syntaxCursor*/ undefined, /*setParentNodes*/ true);
+                return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, /*syntaxCursor*/ undefined, /*setParentNodes*/ true, sourceFile.scriptKind);
             }
             // Make sure we're not trying to incrementally update a source file more than once.  Once
-            // we do an update the original source file is considered unusbale from that point onwards.
+            // we do an update the original source file is considered unusable from that point onwards.
             //
             // This is because we do incremental parsing in-place.  i.e. we take nodes from the old
             // tree and give them new positions and parents.  From that point on, trusting the old
@@ -12519,7 +13001,7 @@ var ts;
             // inconsistent tree.  Setting the parents on the new tree should be very fast.  We
             // will immediately bail out of walking any subtrees when we can see that their parents
             // are already correct.
-            var result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, /*setParentNodes*/ true);
+            var result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, /*setParentNodes*/ true, sourceFile.scriptKind);
             return result;
         }
         IncrementalParser.updateSourceFile = updateSourceFile;
@@ -12578,7 +13060,7 @@ var ts;
             // We have an element that intersects the change range in some way.  It may have its
             // start, or its end (or both) in the changed range.  We want to adjust any part
             // that intersects such that the final tree is in a consistent state.  i.e. all
-            // chlidren have spans within the span of their parent, and all siblings are ordered
+            // children have spans within the span of their parent, and all siblings are ordered
             // properly.
             // We may need to update both the 'pos' and the 'end' of the element.
             // If the 'pos' is before the start of the change, then we don't need to touch it.
@@ -12598,7 +13080,7 @@ var ts;
             //  -------------------ZZZ-----------------
             //
             // In this case, any element that started in the 'X' range will keep its position.
-            // However any element htat started after that will have their pos adjusted to be
+            // However any element that started after that will have their pos adjusted to be
             // at the end of the new range.  i.e. any node that started in the 'Y' range will
             // be adjusted to have their start at the end of the 'Z' range.
             //
@@ -12622,7 +13104,7 @@ var ts;
             //  -------------------ZZZ-----------------
             //
             // In this case, any element that ended in the 'X' range will keep its position.
-            // However any element htat ended after that will have their pos adjusted to be
+            // However any element that ended after that will have their pos adjusted to be
             // at the end of the new range.  i.e. any node that ended in the 'Y' range will
             // be adjusted to have their end at the end of the 'Z' range.
             if (element.end >= changeRangeOldEnd) {
@@ -12642,12 +13124,12 @@ var ts;
         }
         function checkNodePositions(node, aggressiveChecks) {
             if (aggressiveChecks) {
-                var pos = node.pos;
+                var pos_2 = node.pos;
                 forEachChild(node, function (child) {
-                    ts.Debug.assert(child.pos >= pos);
-                    pos = child.end;
+                    ts.Debug.assert(child.pos >= pos_2);
+                    pos_2 = child.end;
                 });
-                ts.Debug.assert(pos <= node.end);
+                ts.Debug.assert(pos_2 <= node.end);
             }
         }
         function updateTokenPositionsAndMarkElements(sourceFile, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta, oldText, newText, aggressiveChecks) {
@@ -12881,7 +13363,7 @@ var ts;
                     if (position >= node.pos && position < node.end) {
                         // Position was within this node.  Keep searching deeper to find the node.
                         forEachChild(node, visitNode, visitArray);
-                        // don't procede any futher in the search.
+                        // don't proceed any further in the search.
                         return true;
                     }
                     // position wasn't in this node, have to keep searching.
@@ -12937,7 +13419,7 @@ var ts;
     var ModuleInstanceState = ts.ModuleInstanceState;
     var Reachability;
     (function (Reachability) {
-        Reachability[Reachability["Unintialized"] = 1] = "Unintialized";
+        Reachability[Reachability["Uninitialized"] = 1] = "Uninitialized";
         Reachability[Reachability["Reachable"] = 2] = "Reachable";
         Reachability[Reachability["Unreachable"] = 4] = "Unreachable";
         Reachability[Reachability["ReportedUnreachable"] = 8] = "ReportedUnreachable";
@@ -12952,17 +13434,17 @@ var ts;
     function getModuleInstanceState(node) {
         // A module is uninstantiated if it contains only
         // 1. interface declarations, type alias declarations
-        if (node.kind === 218 /* InterfaceDeclaration */ || node.kind === 219 /* TypeAliasDeclaration */) {
+        if (node.kind === 221 /* InterfaceDeclaration */ || node.kind === 222 /* TypeAliasDeclaration */) {
             return 0 /* NonInstantiated */;
         }
         else if (ts.isConstEnumDeclaration(node)) {
             return 2 /* ConstEnumOnly */;
         }
-        else if ((node.kind === 225 /* ImportDeclaration */ || node.kind === 224 /* ImportEqualsDeclaration */) && !(node.flags & 2 /* Export */)) {
+        else if ((node.kind === 229 /* ImportDeclaration */ || node.kind === 228 /* ImportEqualsDeclaration */) && !(node.flags & 1 /* Export */)) {
             return 0 /* NonInstantiated */;
         }
-        else if (node.kind === 222 /* ModuleBlock */) {
-            var state = 0 /* NonInstantiated */;
+        else if (node.kind === 225 /* ModuleBlock */) {
+            var state_1 = 0 /* NonInstantiated */;
             ts.forEachChild(node, function (n) {
                 switch (getModuleInstanceState(n)) {
                     case 0 /* NonInstantiated */:
@@ -12970,17 +13452,17 @@ var ts;
                         return false;
                     case 2 /* ConstEnumOnly */:
                         // child is const enum only - record state and continue searching
-                        state = 2 /* ConstEnumOnly */;
+                        state_1 = 2 /* ConstEnumOnly */;
                         return false;
                     case 1 /* Instantiated */:
                         // child is instantiated - record state and stop
-                        state = 1 /* Instantiated */;
+                        state_1 = 1 /* Instantiated */;
                         return true;
                 }
             });
-            return state;
+            return state_1;
         }
-        else if (node.kind === 221 /* ModuleDeclaration */) {
+        else if (node.kind === 224 /* ModuleDeclaration */) {
             return getModuleInstanceState(node.body);
         }
         else {
@@ -13035,6 +13517,7 @@ var ts;
         var hasAsyncFunctions;
         var hasDecorators;
         var hasParameterDecorators;
+        var hasJsxSpreadAttribute;
         // If this file is an external module, then it is automatically in strict-mode according to
         // ES6.  If it is not an external module, then we'll determine if it is in strict mode or
         // not depending on if we see "use strict" in certain places (or if we hit a class/namespace).
@@ -13068,6 +13551,7 @@ var ts;
             hasAsyncFunctions = false;
             hasDecorators = false;
             hasParameterDecorators = false;
+            hasJsxSpreadAttribute = false;
         }
         return bindSourceFile;
         function createSymbol(flags, name) {
@@ -13090,7 +13574,7 @@ var ts;
             if (symbolFlags & 107455 /* Value */) {
                 var valueDeclaration = symbol.valueDeclaration;
                 if (!valueDeclaration ||
-                    (valueDeclaration.kind !== node.kind && valueDeclaration.kind === 221 /* ModuleDeclaration */)) {
+                    (valueDeclaration.kind !== node.kind && valueDeclaration.kind === 224 /* ModuleDeclaration */)) {
                     // other kinds of value declarations take precedence over modules
                     symbol.valueDeclaration = node;
                 }
@@ -13103,7 +13587,7 @@ var ts;
                 if (ts.isAmbientModule(node)) {
                     return ts.isGlobalScopeAugmentation(node) ? "__global" : "\"" + node.name.text + "\"";
                 }
-                if (node.name.kind === 137 /* ComputedPropertyName */) {
+                if (node.name.kind === 139 /* ComputedPropertyName */) {
                     var nameExpression = node.name.expression;
                     // treat computed property names where expression is string/numeric literal as just string/numeric literal
                     if (ts.isStringOrNumericLiteral(nameExpression.kind)) {
@@ -13115,21 +13599,21 @@ var ts;
                 return node.name.text;
             }
             switch (node.kind) {
-                case 145 /* Constructor */:
+                case 147 /* Constructor */:
                     return "__constructor";
-                case 153 /* FunctionType */:
-                case 148 /* CallSignature */:
+                case 155 /* FunctionType */:
+                case 150 /* CallSignature */:
                     return "__call";
-                case 154 /* ConstructorType */:
-                case 149 /* ConstructSignature */:
+                case 156 /* ConstructorType */:
+                case 151 /* ConstructSignature */:
                     return "__new";
-                case 150 /* IndexSignature */:
+                case 152 /* IndexSignature */:
                     return "__index";
-                case 231 /* ExportDeclaration */:
+                case 235 /* ExportDeclaration */:
                     return "__export";
-                case 230 /* ExportAssignment */:
+                case 234 /* ExportAssignment */:
                     return node.isExportEquals ? "export=" : "default";
-                case 184 /* BinaryExpression */:
+                case 186 /* BinaryExpression */:
                     switch (ts.getSpecialPropertyAssignmentKind(node)) {
                         case 2 /* ModuleExports */:
                             // module.exports = ...
@@ -13144,9 +13628,18 @@ var ts;
                     }
                     ts.Debug.fail("Unknown binary declaration kind");
                     break;
-                case 216 /* FunctionDeclaration */:
-                case 217 /* ClassDeclaration */:
+                case 219 /* FunctionDeclaration */:
+                case 220 /* ClassDeclaration */:
                     return node.flags & 512 /* Default */ ? "default" : undefined;
+                case 268 /* JSDocFunctionType */:
+                    return ts.isJSDocConstructSignature(node) ? "__new" : "__call";
+                case 141 /* Parameter */:
+                    // Parameters with names are handled at the top of this function.  Parameters
+                    // without names can only come from JSDocFunctionTypes.
+                    ts.Debug.assert(node.parent.kind === 268 /* JSDocFunctionType */);
+                    var functionType = node.parent;
+                    var index = ts.indexOf(functionType.parameters, node);
+                    return "p" + index;
             }
         }
         function getDisplayName(node) {
@@ -13197,18 +13690,18 @@ var ts;
                     }
                     // Report errors every position with duplicate declaration
                     // Report errors on previous encountered declarations
-                    var message = symbol.flags & 2 /* BlockScopedVariable */
+                    var message_1 = symbol.flags & 2 /* BlockScopedVariable */
                         ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0
                         : ts.Diagnostics.Duplicate_identifier_0;
                     ts.forEach(symbol.declarations, function (declaration) {
                         if (declaration.flags & 512 /* Default */) {
-                            message = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
+                            message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                         }
                     });
                     ts.forEach(symbol.declarations, function (declaration) {
-                        file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message, getDisplayName(declaration)));
+                        file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message_1, getDisplayName(declaration)));
                     });
-                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name || node, message, getDisplayName(node)));
+                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name || node, message_1, getDisplayName(node)));
                     symbol = createSymbol(0 /* None */, name);
                 }
             }
@@ -13220,9 +13713,9 @@ var ts;
             return symbol;
         }
         function declareModuleMember(node, symbolFlags, symbolExcludes) {
-            var hasExportModifier = ts.getCombinedNodeFlags(node) & 2 /* Export */;
+            var hasExportModifier = ts.getCombinedNodeFlags(node) & 1 /* Export */;
             if (symbolFlags & 8388608 /* Alias */) {
-                if (node.kind === 233 /* ExportSpecifier */ || (node.kind === 224 /* ImportEqualsDeclaration */ && hasExportModifier)) {
+                if (node.kind === 237 /* ExportSpecifier */ || (node.kind === 228 /* ImportEqualsDeclaration */ && hasExportModifier)) {
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
                 }
                 else {
@@ -13245,7 +13738,7 @@ var ts;
                 //       during global merging in the checker. Why? The only case when ambient module is permitted inside another module is module augmentation
                 //       and this case is specially handled. Module augmentations should only be merged with original module definition
                 //       and should never be merged directly with other augmentation, and the latter case would be possible if automatic merge is allowed.
-                if (!ts.isAmbientModule(node) && (hasExportModifier || container.flags & 131072 /* ExportContext */)) {
+                if (!ts.isAmbientModule(node) && (hasExportModifier || container.flags & 8192 /* ExportContext */)) {
                     var exportKind = (symbolFlags & 107455 /* Value */ ? 1048576 /* ExportValue */ : 0) |
                         (symbolFlags & 793056 /* Type */ ? 2097152 /* ExportType */ : 0) |
                         (symbolFlags & 1536 /* Namespace */ ? 4194304 /* ExportNamespace */ : 0);
@@ -13263,7 +13756,7 @@ var ts;
         // the getLocalNameOfContainer function in the type checker to validate that the local name
         // used for a container is unique.
         function bindChildren(node) {
-            // Before we recurse into a node's chilren, we first save the existing parent, container
+            // Before we recurse into a node's children, we first save the existing parent, container
             // and block-container.  Then after we pop out of processing the children, we restore
             // these saved values.
             var saveParent = parent;
@@ -13286,7 +13779,7 @@ var ts;
             // Finally, if this is a block-container, then we clear out any existing .locals object
             // it may contain within it.  This happens in incremental scenarios.  Because we can be
             // reusing a node from a previous compilation, that node may have had 'locals' created
-            // for it.  We must clear this so we don't accidently move any stale data forward from
+            // for it.  We must clear this so we don't accidentally move any stale data forward from
             // a previous compilation.
             var containerFlags = getContainerFlags(node);
             if (containerFlags & 1 /* IsContainer */) {
@@ -13308,13 +13801,13 @@ var ts;
             var kind = node.kind;
             var flags = node.flags;
             // reset all reachability check related flags on node (for incremental scenarios)
-            flags &= ~1572864 /* ReachabilityCheckFlags */;
+            flags &= ~98304 /* ReachabilityCheckFlags */;
             // reset all emit helper flags on node (for incremental scenarios)
-            flags &= ~62914560 /* EmitHelperFlags */;
-            if (kind === 218 /* InterfaceDeclaration */) {
+            flags &= ~3932160 /* EmitHelperFlags */;
+            if (kind === 221 /* InterfaceDeclaration */) {
                 seenThisKeyword = false;
             }
-            var saveState = kind === 251 /* SourceFile */ || kind === 222 /* ModuleBlock */ || ts.isFunctionLikeKind(kind);
+            var saveState = kind === 255 /* SourceFile */ || kind === 225 /* ModuleBlock */ || ts.isFunctionLikeKind(kind);
             if (saveState) {
                 savedReachabilityState = currentReachabilityState;
                 savedLabelStack = labelStack;
@@ -13325,28 +13818,34 @@ var ts;
                 hasExplicitReturn = false;
                 labelStack = labelIndexMap = implicitLabels = undefined;
             }
+            if (ts.isInJavaScriptFile(node) && node.jsDocComment) {
+                bind(node.jsDocComment);
+            }
             bindReachableStatement(node);
             if (currentReachabilityState === 2 /* Reachable */ && ts.isFunctionLikeKind(kind) && ts.nodeIsPresent(node.body)) {
-                flags |= 524288 /* HasImplicitReturn */;
+                flags |= 32768 /* HasImplicitReturn */;
                 if (hasExplicitReturn) {
-                    flags |= 1048576 /* HasExplicitReturn */;
+                    flags |= 65536 /* HasExplicitReturn */;
                 }
             }
-            if (kind === 218 /* InterfaceDeclaration */) {
-                flags = seenThisKeyword ? flags | 262144 /* ContainsThis */ : flags & ~262144 /* ContainsThis */;
+            if (kind === 221 /* InterfaceDeclaration */) {
+                flags = seenThisKeyword ? flags | 16384 /* ContainsThis */ : flags & ~16384 /* ContainsThis */;
             }
-            if (kind === 251 /* SourceFile */) {
+            if (kind === 255 /* SourceFile */) {
                 if (hasClassExtends) {
-                    flags |= 4194304 /* HasClassExtends */;
+                    flags |= 262144 /* HasClassExtends */;
                 }
                 if (hasDecorators) {
-                    flags |= 8388608 /* HasDecorators */;
+                    flags |= 524288 /* HasDecorators */;
                 }
                 if (hasParameterDecorators) {
-                    flags |= 16777216 /* HasParamDecorators */;
+                    flags |= 1048576 /* HasParamDecorators */;
                 }
                 if (hasAsyncFunctions) {
-                    flags |= 33554432 /* HasAsyncFunctions */;
+                    flags |= 2097152 /* HasAsyncFunctions */;
+                }
+                if (hasJsxSpreadAttribute) {
+                    flags |= 1073741824 /* HasJsxSpreadAttribute */;
                 }
             }
             node.flags = flags;
@@ -13371,40 +13870,40 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 201 /* WhileStatement */:
+                case 204 /* WhileStatement */:
                     bindWhileStatement(node);
                     break;
-                case 200 /* DoStatement */:
+                case 203 /* DoStatement */:
                     bindDoStatement(node);
                     break;
-                case 202 /* ForStatement */:
+                case 205 /* ForStatement */:
                     bindForStatement(node);
                     break;
-                case 203 /* ForInStatement */:
-                case 204 /* ForOfStatement */:
+                case 206 /* ForInStatement */:
+                case 207 /* ForOfStatement */:
                     bindForInOrForOfStatement(node);
                     break;
-                case 199 /* IfStatement */:
+                case 202 /* IfStatement */:
                     bindIfStatement(node);
                     break;
-                case 207 /* ReturnStatement */:
-                case 211 /* ThrowStatement */:
+                case 210 /* ReturnStatement */:
+                case 214 /* ThrowStatement */:
                     bindReturnOrThrow(node);
                     break;
-                case 206 /* BreakStatement */:
-                case 205 /* ContinueStatement */:
+                case 209 /* BreakStatement */:
+                case 208 /* ContinueStatement */:
                     bindBreakOrContinueStatement(node);
                     break;
-                case 212 /* TryStatement */:
+                case 215 /* TryStatement */:
                     bindTryStatement(node);
                     break;
-                case 209 /* SwitchStatement */:
+                case 212 /* SwitchStatement */:
                     bindSwitchStatement(node);
                     break;
-                case 223 /* CaseBlock */:
+                case 226 /* CaseBlock */:
                     bindCaseBlock(node);
                     break;
-                case 210 /* LabeledStatement */:
+                case 213 /* LabeledStatement */:
                     bindLabeledStatement(node);
                     break;
                 default:
@@ -13479,7 +13978,7 @@ var ts;
         function bindReturnOrThrow(n) {
             // bind expression (don't affect reachability)
             bind(n.expression);
-            if (n.kind === 207 /* ReturnStatement */) {
+            if (n.kind === 210 /* ReturnStatement */) {
                 hasExplicitReturn = true;
             }
             currentReachabilityState = 4 /* Unreachable */;
@@ -13488,7 +13987,7 @@ var ts;
             // call bind on label (don't affect reachability)
             bind(n.label);
             // for continue case touch label so it will be marked a used
-            var isValidJump = jumpToLabel(n.label, n.kind === 206 /* BreakStatement */ ? currentReachabilityState : 4 /* Unreachable */);
+            var isValidJump = jumpToLabel(n.label, n.kind === 209 /* BreakStatement */ ? currentReachabilityState : 4 /* Unreachable */);
             if (isValidJump) {
                 currentReachabilityState = 4 /* Unreachable */;
             }
@@ -13506,7 +14005,7 @@ var ts;
             // post catch/finally state is reachable if
             // - post try state is reachable - control flow can fall out of try block
             // - post catch state is reachable - control flow can fall out of catch block
-            currentReachabilityState = or(postTryState, postCatchState);
+            currentReachabilityState = n.catchClause ? or(postTryState, postCatchState) : postTryState;
         }
         function bindSwitchStatement(n) {
             var preSwitchState = currentReachabilityState;
@@ -13514,18 +14013,21 @@ var ts;
             // bind expression (don't affect reachability)
             bind(n.expression);
             bind(n.caseBlock);
-            var hasDefault = ts.forEach(n.caseBlock.clauses, function (c) { return c.kind === 245 /* DefaultClause */; });
-            // post switch state is unreachable if switch is exaustive (has a default case ) and does not have fallthrough from the last case
+            var hasDefault = ts.forEach(n.caseBlock.clauses, function (c) { return c.kind === 249 /* DefaultClause */; });
+            // post switch state is unreachable if switch is exhaustive (has a default case ) and does not have fallthrough from the last case
             var postSwitchState = hasDefault && currentReachabilityState !== 2 /* Reachable */ ? 4 /* Unreachable */ : preSwitchState;
             popImplicitLabel(postSwitchLabel, postSwitchState);
         }
         function bindCaseBlock(n) {
             var startState = currentReachabilityState;
-            for (var _i = 0, _a = n.clauses; _i < _a.length; _i++) {
-                var clause = _a[_i];
+            for (var i = 0; i < n.clauses.length; i++) {
+                var clause = n.clauses[i];
                 currentReachabilityState = startState;
                 bind(clause);
-                if (clause.statements.length && currentReachabilityState === 2 /* Reachable */ && options.noFallthroughCasesInSwitch) {
+                if (clause.statements.length &&
+                    i !== n.clauses.length - 1 &&
+                    currentReachabilityState === 2 /* Reachable */ &&
+                    options.noFallthroughCasesInSwitch) {
                     errorOnFirstToken(clause, ts.Diagnostics.Fallthrough_case_in_switch);
                 }
             }
@@ -13541,39 +14043,41 @@ var ts;
         }
         function getContainerFlags(node) {
             switch (node.kind) {
-                case 189 /* ClassExpression */:
-                case 217 /* ClassDeclaration */:
-                case 218 /* InterfaceDeclaration */:
-                case 220 /* EnumDeclaration */:
-                case 156 /* TypeLiteral */:
-                case 168 /* ObjectLiteralExpression */:
+                case 191 /* ClassExpression */:
+                case 220 /* ClassDeclaration */:
+                case 221 /* InterfaceDeclaration */:
+                case 223 /* EnumDeclaration */:
+                case 170 /* ObjectLiteralExpression */:
+                case 158 /* TypeLiteral */:
+                case 264 /* JSDocRecordType */:
                     return 1 /* IsContainer */;
-                case 148 /* CallSignature */:
-                case 149 /* ConstructSignature */:
-                case 150 /* IndexSignature */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
-                case 216 /* FunctionDeclaration */:
-                case 145 /* Constructor */:
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
-                case 153 /* FunctionType */:
-                case 154 /* ConstructorType */:
-                case 176 /* FunctionExpression */:
-                case 177 /* ArrowFunction */:
-                case 221 /* ModuleDeclaration */:
-                case 251 /* SourceFile */:
-                case 219 /* TypeAliasDeclaration */:
+                case 150 /* CallSignature */:
+                case 151 /* ConstructSignature */:
+                case 152 /* IndexSignature */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
+                case 219 /* FunctionDeclaration */:
+                case 147 /* Constructor */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
+                case 155 /* FunctionType */:
+                case 268 /* JSDocFunctionType */:
+                case 156 /* ConstructorType */:
+                case 178 /* FunctionExpression */:
+                case 179 /* ArrowFunction */:
+                case 224 /* ModuleDeclaration */:
+                case 255 /* SourceFile */:
+                case 222 /* TypeAliasDeclaration */:
                     return 5 /* IsContainerWithLocals */;
-                case 247 /* CatchClause */:
-                case 202 /* ForStatement */:
-                case 203 /* ForInStatement */:
-                case 204 /* ForOfStatement */:
-                case 223 /* CaseBlock */:
+                case 251 /* CatchClause */:
+                case 205 /* ForStatement */:
+                case 206 /* ForInStatement */:
+                case 207 /* ForOfStatement */:
+                case 226 /* CaseBlock */:
                     return 2 /* IsBlockScopedContainer */;
-                case 195 /* Block */:
+                case 198 /* Block */:
                     // do not treat blocks directly inside a function as a block-scoped-container.
-                    // Locals that reside in this block should go to the function locals. Othewise 'x'
+                    // Locals that reside in this block should go to the function locals. Otherwise 'x'
                     // would not appear to be a redeclaration of a block scoped local in the following
                     // example:
                     //
@@ -13608,38 +14112,40 @@ var ts;
                 // members are declared (for example, a member of a class will go into a specific
                 // symbol table depending on if it is static or not). We defer to specialized
                 // handlers to take care of declaring these child members.
-                case 221 /* ModuleDeclaration */:
+                case 224 /* ModuleDeclaration */:
                     return declareModuleMember(node, symbolFlags, symbolExcludes);
-                case 251 /* SourceFile */:
+                case 255 /* SourceFile */:
                     return declareSourceFileMember(node, symbolFlags, symbolExcludes);
-                case 189 /* ClassExpression */:
-                case 217 /* ClassDeclaration */:
+                case 191 /* ClassExpression */:
+                case 220 /* ClassDeclaration */:
                     return declareClassMember(node, symbolFlags, symbolExcludes);
-                case 220 /* EnumDeclaration */:
+                case 223 /* EnumDeclaration */:
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                case 156 /* TypeLiteral */:
-                case 168 /* ObjectLiteralExpression */:
-                case 218 /* InterfaceDeclaration */:
+                case 158 /* TypeLiteral */:
+                case 170 /* ObjectLiteralExpression */:
+                case 221 /* InterfaceDeclaration */:
+                case 264 /* JSDocRecordType */:
                     // Interface/Object-types always have their children added to the 'members' of
                     // their container. They are only accessible through an instance of their
                     // container, and are never in scope otherwise (even inside the body of the
                     // object / type / interface declaring them). An exception is type parameters,
                     // which are in scope without qualification (similar to 'locals').
                     return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
-                case 153 /* FunctionType */:
-                case 154 /* ConstructorType */:
-                case 148 /* CallSignature */:
-                case 149 /* ConstructSignature */:
-                case 150 /* IndexSignature */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
-                case 145 /* Constructor */:
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
-                case 216 /* FunctionDeclaration */:
-                case 176 /* FunctionExpression */:
-                case 177 /* ArrowFunction */:
-                case 219 /* TypeAliasDeclaration */:
+                case 155 /* FunctionType */:
+                case 156 /* ConstructorType */:
+                case 150 /* CallSignature */:
+                case 151 /* ConstructSignature */:
+                case 152 /* IndexSignature */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
+                case 147 /* Constructor */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
+                case 219 /* FunctionDeclaration */:
+                case 178 /* FunctionExpression */:
+                case 179 /* ArrowFunction */:
+                case 268 /* JSDocFunctionType */:
+                case 222 /* TypeAliasDeclaration */:
                     // All the children of these container types are never visible through another
                     // symbol (i.e. through another symbol's 'exports' or 'members').  Instead,
                     // they're only accessed 'lexically' (i.e. from code that exists underneath
@@ -13650,7 +14156,7 @@ var ts;
             }
         }
         function declareClassMember(node, symbolFlags, symbolExcludes) {
-            return node.flags & 64 /* Static */
+            return node.flags & 32 /* Static */
                 ? declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes)
                 : declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
         }
@@ -13660,11 +14166,11 @@ var ts;
                 : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes);
         }
         function hasExportDeclarations(node) {
-            var body = node.kind === 251 /* SourceFile */ ? node : node.body;
-            if (body.kind === 251 /* SourceFile */ || body.kind === 222 /* ModuleBlock */) {
+            var body = node.kind === 255 /* SourceFile */ ? node : node.body;
+            if (body.kind === 255 /* SourceFile */ || body.kind === 225 /* ModuleBlock */) {
                 for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
                     var stat = _a[_i];
-                    if (stat.kind === 231 /* ExportDeclaration */ || stat.kind === 230 /* ExportAssignment */) {
+                    if (stat.kind === 235 /* ExportDeclaration */ || stat.kind === 234 /* ExportAssignment */) {
                         return true;
                     }
                 }
@@ -13675,19 +14181,24 @@ var ts;
             // A declaration source file or ambient module declaration that contains no export declarations (but possibly regular
             // declarations with export modifiers) is an export context in which declarations are implicitly exported.
             if (ts.isInAmbientContext(node) && !hasExportDeclarations(node)) {
-                node.flags |= 131072 /* ExportContext */;
+                node.flags |= 8192 /* ExportContext */;
             }
             else {
-                node.flags &= ~131072 /* ExportContext */;
+                node.flags &= ~8192 /* ExportContext */;
             }
         }
         function bindModuleDeclaration(node) {
             setExportContextFlag(node);
             if (ts.isAmbientModule(node)) {
-                if (node.flags & 2 /* Export */) {
+                if (node.flags & 1 /* Export */) {
                     errorOnFirstToken(node, ts.Diagnostics.export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always_visible);
                 }
-                declareSymbolAndAddToSymbolTable(node, 512 /* ValueModule */, 106639 /* ValueModuleExcludes */);
+                if (ts.isExternalModuleAugmentation(node)) {
+                    declareSymbolAndAddToSymbolTable(node, 1024 /* NamespaceModule */, 0 /* NamespaceModuleExcludes */);
+                }
+                else {
+                    declareSymbolAndAddToSymbolTable(node, 512 /* ValueModule */, 106639 /* ValueModuleExcludes */);
+                }
             }
             else {
                 var state = getModuleInstanceState(node);
@@ -13743,7 +14254,7 @@ var ts;
                         continue;
                     }
                     var identifier = prop.name;
-                    // ECMA-262 11.1.5 Object Initialiser
+                    // 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
                     // a.This production is contained in strict code and IsDataDescriptor(previous) is true and
                     // IsDataDescriptor(propId.descriptor) is true.
@@ -13751,7 +14262,7 @@ var ts;
                     //    c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true.
                     //    d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true
                     // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
-                    var currentKind = prop.kind === 248 /* PropertyAssignment */ || prop.kind === 249 /* ShorthandPropertyAssignment */ || prop.kind === 144 /* MethodDeclaration */
+                    var currentKind = prop.kind === 252 /* PropertyAssignment */ || prop.kind === 253 /* ShorthandPropertyAssignment */ || prop.kind === 146 /* MethodDeclaration */
                         ? 1 /* Property */
                         : 2 /* Accessor */;
                     var existingKind = seen[identifier.text];
@@ -13773,10 +14284,10 @@ var ts;
         }
         function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
             switch (blockScopeContainer.kind) {
-                case 221 /* ModuleDeclaration */:
+                case 224 /* ModuleDeclaration */:
                     declareModuleMember(node, symbolFlags, symbolExcludes);
                     break;
-                case 251 /* SourceFile */:
+                case 255 /* SourceFile */:
                     if (ts.isExternalModule(container)) {
                         declareModuleMember(node, symbolFlags, symbolExcludes);
                         break;
@@ -13873,7 +14384,7 @@ var ts;
             }
         }
         function checkStrictModeNumericLiteral(node) {
-            if (inStrictMode && node.flags & 32768 /* OctalLiteral */) {
+            if (inStrictMode && node.isOctalLiteral) {
                 file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode));
             }
         }
@@ -13936,17 +14447,17 @@ var ts;
         }
         function updateStrictMode(node) {
             switch (node.kind) {
-                case 251 /* SourceFile */:
-                case 222 /* ModuleBlock */:
+                case 255 /* SourceFile */:
+                case 225 /* ModuleBlock */:
                     updateStrictModeStatementList(node.statements);
                     return;
-                case 195 /* Block */:
+                case 198 /* Block */:
                     if (ts.isFunctionLike(node.parent)) {
                         updateStrictModeStatementList(node.statements);
                     }
                     return;
-                case 217 /* ClassDeclaration */:
-                case 189 /* ClassExpression */:
+                case 220 /* ClassDeclaration */:
+                case 191 /* ClassExpression */:
                     // All classes are automatically in strict mode in ES6.
                     inStrictMode = true;
                     return;
@@ -13969,14 +14480,14 @@ var ts;
             var nodeText = ts.getTextOfNodeFromSourceText(file.text, node.expression);
             // Note: the node text must be exactly "use strict" or 'use strict'.  It is not ok for the
             // string to contain unicode escapes (as per ES5).
-            return nodeText === "\"use strict\"" || nodeText === "'use strict'";
+            return nodeText === '"use strict"' || nodeText === "'use strict'";
         }
         function bindWorker(node) {
             switch (node.kind) {
                 /* Strict mode checks */
                 case 69 /* Identifier */:
                     return checkStrictModeIdentifier(node);
-                case 184 /* BinaryExpression */:
+                case 186 /* BinaryExpression */:
                     if (ts.isInJavaScriptFile(node)) {
                         var specialKind = ts.getSpecialPropertyAssignmentKind(node);
                         switch (specialKind) {
@@ -14000,97 +14511,105 @@ var ts;
                         }
                     }
                     return checkStrictModeBinaryExpression(node);
-                case 247 /* CatchClause */:
+                case 251 /* CatchClause */:
                     return checkStrictModeCatchClause(node);
-                case 178 /* DeleteExpression */:
+                case 180 /* DeleteExpression */:
                     return checkStrictModeDeleteExpression(node);
                 case 8 /* NumericLiteral */:
                     return checkStrictModeNumericLiteral(node);
-                case 183 /* PostfixUnaryExpression */:
+                case 185 /* PostfixUnaryExpression */:
                     return checkStrictModePostfixUnaryExpression(node);
-                case 182 /* PrefixUnaryExpression */:
+                case 184 /* PrefixUnaryExpression */:
                     return checkStrictModePrefixUnaryExpression(node);
-                case 208 /* WithStatement */:
+                case 211 /* WithStatement */:
                     return checkStrictModeWithStatement(node);
-                case 162 /* ThisType */:
+                case 164 /* ThisType */:
                     seenThisKeyword = true;
                     return;
-                case 151 /* TypePredicate */:
+                case 153 /* TypePredicate */:
                     return checkTypePredicate(node);
-                case 138 /* TypeParameter */:
+                case 140 /* TypeParameter */:
                     return declareSymbolAndAddToSymbolTable(node, 262144 /* TypeParameter */, 530912 /* TypeParameterExcludes */);
-                case 139 /* Parameter */:
+                case 141 /* Parameter */:
                     return bindParameter(node);
-                case 214 /* VariableDeclaration */:
-                case 166 /* BindingElement */:
+                case 217 /* VariableDeclaration */:
+                case 168 /* BindingElement */:
                     return bindVariableDeclarationOrBindingElement(node);
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
+                case 265 /* JSDocRecordMember */:
                     return bindPropertyOrMethodOrAccessor(node, 4 /* Property */ | (node.questionToken ? 536870912 /* Optional */ : 0 /* None */), 107455 /* PropertyExcludes */);
-                case 248 /* PropertyAssignment */:
-                case 249 /* ShorthandPropertyAssignment */:
+                case 252 /* PropertyAssignment */:
+                case 253 /* ShorthandPropertyAssignment */:
                     return bindPropertyOrMethodOrAccessor(node, 4 /* Property */, 107455 /* PropertyExcludes */);
-                case 250 /* EnumMember */:
+                case 254 /* EnumMember */:
                     return bindPropertyOrMethodOrAccessor(node, 8 /* EnumMember */, 107455 /* EnumMemberExcludes */);
-                case 148 /* CallSignature */:
-                case 149 /* ConstructSignature */:
-                case 150 /* IndexSignature */:
+                case 246 /* JsxSpreadAttribute */:
+                    hasJsxSpreadAttribute = true;
+                    return;
+                case 150 /* CallSignature */:
+                case 151 /* ConstructSignature */:
+                case 152 /* IndexSignature */:
                     return declareSymbolAndAddToSymbolTable(node, 131072 /* Signature */, 0 /* None */);
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
                     // If this is an ObjectLiteralExpression method, then it sits in the same space
                     // as other properties in the object literal.  So we use SymbolFlags.PropertyExcludes
                     // so that it will conflict with any other object literal members with the same
                     // name.
                     return bindPropertyOrMethodOrAccessor(node, 8192 /* Method */ | (node.questionToken ? 536870912 /* Optional */ : 0 /* None */), ts.isObjectLiteralMethod(node) ? 107455 /* PropertyExcludes */ : 99263 /* MethodExcludes */);
-                case 216 /* FunctionDeclaration */:
+                case 219 /* FunctionDeclaration */:
                     return bindFunctionDeclaration(node);
-                case 145 /* Constructor */:
+                case 147 /* Constructor */:
                     return declareSymbolAndAddToSymbolTable(node, 16384 /* Constructor */, /*symbolExcludes:*/ 0 /* None */);
-                case 146 /* GetAccessor */:
+                case 148 /* GetAccessor */:
                     return bindPropertyOrMethodOrAccessor(node, 32768 /* GetAccessor */, 41919 /* GetAccessorExcludes */);
-                case 147 /* SetAccessor */:
+                case 149 /* SetAccessor */:
                     return bindPropertyOrMethodOrAccessor(node, 65536 /* SetAccessor */, 74687 /* SetAccessorExcludes */);
-                case 153 /* FunctionType */:
-                case 154 /* ConstructorType */:
+                case 155 /* FunctionType */:
+                case 156 /* ConstructorType */:
+                case 268 /* JSDocFunctionType */:
                     return bindFunctionOrConstructorType(node);
-                case 156 /* TypeLiteral */:
+                case 158 /* TypeLiteral */:
+                case 264 /* JSDocRecordType */:
                     return bindAnonymousDeclaration(node, 2048 /* TypeLiteral */, "__type");
-                case 168 /* ObjectLiteralExpression */:
+                case 170 /* ObjectLiteralExpression */:
                     return bindObjectLiteralExpression(node);
-                case 176 /* FunctionExpression */:
-                case 177 /* ArrowFunction */:
+                case 178 /* FunctionExpression */:
+                case 179 /* ArrowFunction */:
                     return bindFunctionExpression(node);
-                case 171 /* CallExpression */:
+                case 173 /* CallExpression */:
                     if (ts.isInJavaScriptFile(node)) {
                         bindCallExpression(node);
                     }
                     break;
                 // Members of classes, interfaces, and modules
-                case 189 /* ClassExpression */:
-                case 217 /* ClassDeclaration */:
+                case 191 /* ClassExpression */:
+                case 220 /* ClassDeclaration */:
                     return bindClassLikeDeclaration(node);
-                case 218 /* InterfaceDeclaration */:
+                case 221 /* InterfaceDeclaration */:
                     return bindBlockScopedDeclaration(node, 64 /* Interface */, 792960 /* InterfaceExcludes */);
-                case 219 /* TypeAliasDeclaration */:
+                case 222 /* TypeAliasDeclaration */:
                     return bindBlockScopedDeclaration(node, 524288 /* TypeAlias */, 793056 /* TypeAliasExcludes */);
-                case 220 /* EnumDeclaration */:
+                case 223 /* EnumDeclaration */:
                     return bindEnumDeclaration(node);
-                case 221 /* ModuleDeclaration */:
+                case 224 /* ModuleDeclaration */:
                     return bindModuleDeclaration(node);
                 // Imports and exports
-                case 224 /* ImportEqualsDeclaration */:
-                case 227 /* NamespaceImport */:
-                case 229 /* ImportSpecifier */:
-                case 233 /* ExportSpecifier */:
+                case 228 /* ImportEqualsDeclaration */:
+                case 231 /* NamespaceImport */:
+                case 233 /* ImportSpecifier */:
+                case 237 /* ExportSpecifier */:
                     return declareSymbolAndAddToSymbolTable(node, 8388608 /* Alias */, 8388608 /* AliasExcludes */);
-                case 226 /* ImportClause */:
+                case 227 /* GlobalModuleExportDeclaration */:
+                    return bindGlobalModuleExportDeclaration(node);
+                case 230 /* ImportClause */:
                     return bindImportClause(node);
-                case 231 /* ExportDeclaration */:
+                case 235 /* ExportDeclaration */:
                     return bindExportDeclaration(node);
-                case 230 /* ExportAssignment */:
+                case 234 /* ExportAssignment */:
                     return bindExportAssignment(node);
-                case 251 /* SourceFile */:
+                case 255 /* SourceFile */:
                     return bindSourceFileIfExternalModule();
             }
         }
@@ -14099,7 +14618,7 @@ var ts;
             if (parameterName && parameterName.kind === 69 /* Identifier */) {
                 checkStrictModeIdentifier(parameterName);
             }
-            if (parameterName && parameterName.kind === 162 /* ThisType */) {
+            if (parameterName && parameterName.kind === 164 /* ThisType */) {
                 seenThisKeyword = true;
             }
             bind(type);
@@ -14114,12 +14633,12 @@ var ts;
             bindAnonymousDeclaration(file, 512 /* ValueModule */, "\"" + ts.removeFileExtension(file.fileName) + "\"");
         }
         function bindExportAssignment(node) {
-            var boundExpression = node.kind === 230 /* ExportAssignment */ ? node.expression : node.right;
+            var boundExpression = node.kind === 234 /* ExportAssignment */ ? node.expression : node.right;
             if (!container.symbol || !container.symbol.exports) {
                 // Export assignment in some sort of block construct
                 bindAnonymousDeclaration(node, 8388608 /* Alias */, getDeclarationName(node));
             }
-            else if (boundExpression.kind === 69 /* Identifier */) {
+            else if (boundExpression.kind === 69 /* Identifier */ && node.kind === 234 /* ExportAssignment */) {
                 // An export default clause with an identifier exports all meanings of that identifier
                 declareSymbol(container.symbol.exports, container.symbol, node, 8388608 /* Alias */, 107455 /* PropertyExcludes */ | 8388608 /* AliasExcludes */);
             }
@@ -14128,6 +14647,28 @@ var ts;
                 declareSymbol(container.symbol.exports, container.symbol, node, 4 /* Property */, 107455 /* PropertyExcludes */ | 8388608 /* AliasExcludes */);
             }
         }
+        function bindGlobalModuleExportDeclaration(node) {
+            if (node.modifiers && node.modifiers.length) {
+                file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Modifiers_cannot_appear_here));
+            }
+            if (node.parent.kind !== 255 /* SourceFile */) {
+                file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_at_top_level));
+                return;
+            }
+            else {
+                var parent_4 = node.parent;
+                if (!ts.isExternalModule(parent_4)) {
+                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_in_module_files));
+                    return;
+                }
+                if (!parent_4.isDeclarationFile) {
+                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_in_declaration_files));
+                    return;
+                }
+            }
+            file.symbol.globalExports = file.symbol.globalExports || {};
+            declareSymbol(file.symbol.globalExports, file.symbol, node, 8388608 /* Alias */, 8388608 /* AliasExcludes */);
+        }
         function bindExportDeclaration(node) {
             if (!container.symbol || !container.symbol.exports) {
                 // Export * in some sort of block construct
@@ -14158,21 +14699,28 @@ var ts;
         function bindModuleExportsAssignment(node) {
             // 'module.exports = expr' assignment
             setCommonJsModuleIndicator(node);
-            bindExportAssignment(node);
+            declareSymbol(file.symbol.exports, file.symbol, node, 4 /* Property */ | 7340032 /* Export */ | 512 /* ValueModule */, 0 /* None */);
         }
         function bindThisPropertyAssignment(node) {
             // Declare a 'member' in case it turns out the container was an ES5 class
-            if (container.kind === 176 /* FunctionExpression */ || container.kind === 216 /* FunctionDeclaration */) {
+            if (container.kind === 178 /* FunctionExpression */ || container.kind === 219 /* FunctionDeclaration */) {
                 container.symbol.members = container.symbol.members || {};
-                declareSymbol(container.symbol.members, container.symbol, node, 4 /* Property */, 107455 /* PropertyExcludes */);
+                // It's acceptable for multiple 'this' assignments of the same identifier to occur
+                declareSymbol(container.symbol.members, container.symbol, node, 4 /* Property */, 107455 /* PropertyExcludes */ & ~4 /* Property */);
             }
         }
         function bindPrototypePropertyAssignment(node) {
             // We saw a node of the form 'x.prototype.y = z'. Declare a 'member' y on x if x was a function.
             // Look up the function in the local scope, since prototype assignments should
             // follow the function declaration
-            var classId = node.left.expression.expression;
-            var funcSymbol = container.locals[classId.text];
+            var leftSideOfAssignment = node.left;
+            var classPrototype = leftSideOfAssignment.expression;
+            var constructorFunction = classPrototype.expression;
+            // Fix up parent pointers since we're going to use these nodes before we bind into them
+            leftSideOfAssignment.parent = node;
+            constructorFunction.parent = classPrototype;
+            classPrototype.parent = leftSideOfAssignment;
+            var funcSymbol = container.locals[constructorFunction.text];
             if (!funcSymbol || !(funcSymbol.flags & 16 /* Function */)) {
                 return;
             }
@@ -14181,12 +14729,12 @@ var ts;
                 funcSymbol.members = {};
             }
             // Declare the method/property
-            declareSymbol(funcSymbol.members, funcSymbol, node.left, 4 /* Property */, 107455 /* PropertyExcludes */);
+            declareSymbol(funcSymbol.members, funcSymbol, leftSideOfAssignment, 4 /* Property */, 107455 /* PropertyExcludes */);
         }
         function bindCallExpression(node) {
             // We're only inspecting call expressions to detect CommonJS modules, so we can skip
             // this check if we've already seen the module indicator
-            if (!file.commonJsModuleIndicator && ts.isRequireCall(node)) {
+            if (!file.commonJsModuleIndicator && ts.isRequireCall(node, /*checkArgumentIsStringLiteral*/ false)) {
                 setCommonJsModuleIndicator(node);
             }
         }
@@ -14199,7 +14747,7 @@ var ts;
                     hasDecorators = true;
                 }
             }
-            if (node.kind === 217 /* ClassDeclaration */) {
+            if (node.kind === 220 /* ClassDeclaration */) {
                 bindBlockScopedDeclaration(node, 32 /* Class */, 899519 /* ClassExcludes */);
             }
             else {
@@ -14323,12 +14871,12 @@ var ts;
             if (ts.hasProperty(labelIndexMap, name.text)) {
                 return false;
             }
-            labelIndexMap[name.text] = labelStack.push(1 /* Unintialized */) - 1;
+            labelIndexMap[name.text] = labelStack.push(1 /* Uninitialized */) - 1;
             return true;
         }
         function pushImplicitLabel() {
             initializeReachabilityStateIfNecessary();
-            var index = labelStack.push(1 /* Unintialized */) - 1;
+            var index = labelStack.push(1 /* Uninitialized */) - 1;
             implicitLabels.push(index);
             return index;
         }
@@ -14350,7 +14898,7 @@ var ts;
             setCurrentStateAtLabel(labelStack.pop(), outerState, /*name*/ undefined);
         }
         function setCurrentStateAtLabel(innerMergedState, outerState, label) {
-            if (innerMergedState === 1 /* Unintialized */) {
+            if (innerMergedState === 1 /* Uninitialized */) {
                 if (label && !options.allowUnusedLabels) {
                     file.bindDiagnostics.push(ts.createDiagnosticForNode(label, ts.Diagnostics.Unused_label));
                 }
@@ -14369,7 +14917,7 @@ var ts;
                 return false;
             }
             var stateAtLabel = labelStack[index];
-            labelStack[index] = stateAtLabel === 1 /* Unintialized */ ? outerState : or(stateAtLabel, outerState);
+            labelStack[index] = stateAtLabel === 1 /* Uninitialized */ ? outerState : or(stateAtLabel, outerState);
             return true;
         }
         function checkUnreachable(node) {
@@ -14377,13 +14925,13 @@ var ts;
                 case 4 /* Unreachable */:
                     var reportError = 
                     // report error on all statements except empty ones
-                    (ts.isStatement(node) && node.kind !== 197 /* EmptyStatement */) ||
+                    (ts.isStatement(node) && node.kind !== 200 /* EmptyStatement */) ||
                         // report error on class declarations
-                        node.kind === 217 /* ClassDeclaration */ ||
+                        node.kind === 220 /* ClassDeclaration */ ||
                         // report error on instantiated modules or const-enums only modules if preserveConstEnums is set
-                        (node.kind === 221 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node)) ||
+                        (node.kind === 224 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node)) ||
                         // report error on regular enums and const enums if preserveConstEnums is set
-                        (node.kind === 220 /* EnumDeclaration */ && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums));
+                        (node.kind === 223 /* EnumDeclaration */ && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums));
                     if (reportError) {
                         currentReachabilityState = 8 /* ReportedUnreachable */;
                         // unreachable code is reported if
@@ -14397,8 +14945,8 @@ var ts;
                         //   On the other side we do want to report errors on non-initialized 'lets' because of TDZ
                         var reportUnreachableCode = !options.allowUnreachableCode &&
                             !ts.isInAmbientContext(node) &&
-                            (node.kind !== 196 /* VariableStatement */ ||
-                                ts.getCombinedNodeFlags(node.declarationList) & 24576 /* BlockScoped */ ||
+                            (node.kind !== 199 /* VariableStatement */ ||
+                                ts.getCombinedNodeFlags(node.declarationList) & 3072 /* BlockScoped */ ||
                                 ts.forEach(node.declarationList.declarations, function (d) { return d.initializer; }));
                         if (reportUnreachableCode) {
                             errorOnFirstToken(node, ts.Diagnostics.Unreachable_code_detected);
@@ -14469,8 +15017,9 @@ var ts;
         var emptySymbols = {};
         var compilerOptions = host.getCompilerOptions();
         var languageVersion = compilerOptions.target || 0 /* ES3 */;
-        var modulekind = compilerOptions.module ? compilerOptions.module : languageVersion === 2 /* ES6 */ ? 5 /* ES6 */ : 0 /* None */;
-        var allowSyntheticDefaultImports = typeof compilerOptions.allowSyntheticDefaultImports !== "undefined" ? compilerOptions.allowSyntheticDefaultImports : modulekind === 4 /* System */;
+        var modulekind = ts.getEmitModuleKind(compilerOptions);
+        var allowSyntheticDefaultImports = typeof compilerOptions.allowSyntheticDefaultImports !== "undefined" ? compilerOptions.allowSyntheticDefaultImports : modulekind === ts.ModuleKind.System;
+        var strictNullChecks = compilerOptions.strictNullChecks;
         var emitResolver = createResolver();
         var undefinedSymbol = createSymbol(4 /* Property */ | 67108864 /* Transient */, "undefined");
         undefinedSymbol.declarations = [];
@@ -14485,9 +15034,7 @@ var ts;
             isUnknownSymbol: function (symbol) { return symbol === unknownSymbol; },
             getDiagnostics: getDiagnostics,
             getGlobalDiagnostics: getGlobalDiagnostics,
-            // The language service will always care about the narrowed type of a symbol, because that is
-            // the type the language says the symbol should have.
-            getTypeOfSymbolAtLocation: getNarrowedTypeOfSymbol,
+            getTypeOfSymbolAtLocation: getTypeOfSymbolAtLocation,
             getSymbolsOfParameterPropertyDeclaration: getSymbolsOfParameterPropertyDeclaration,
             getDeclaredTypeOfSymbol: getDeclaredTypeOfSymbol,
             getPropertiesOfType: getPropertiesOfType,
@@ -14522,14 +15069,16 @@ var ts;
         };
         var unknownSymbol = createSymbol(4 /* Property */ | 67108864 /* Transient */, "unknown");
         var resolvingSymbol = createSymbol(67108864 /* Transient */, "__resolving__");
+        var nullableWideningFlags = strictNullChecks ? 0 : 2097152 /* ContainsUndefinedOrNull */;
         var anyType = createIntrinsicType(1 /* Any */, "any");
         var stringType = createIntrinsicType(2 /* String */, "string");
         var numberType = createIntrinsicType(4 /* Number */, "number");
         var booleanType = createIntrinsicType(8 /* Boolean */, "boolean");
         var esSymbolType = createIntrinsicType(16777216 /* ESSymbol */, "symbol");
         var voidType = createIntrinsicType(16 /* Void */, "void");
-        var undefinedType = createIntrinsicType(32 /* Undefined */ | 2097152 /* ContainsUndefinedOrNull */, "undefined");
-        var nullType = createIntrinsicType(64 /* Null */ | 2097152 /* ContainsUndefinedOrNull */, "null");
+        var undefinedType = createIntrinsicType(32 /* Undefined */ | nullableWideningFlags, "undefined");
+        var nullType = createIntrinsicType(64 /* Null */ | nullableWideningFlags, "null");
+        var emptyArrayElementType = createIntrinsicType(32 /* Undefined */ | 2097152 /* ContainsUndefinedOrNull */, "undefined");
         var unknownType = createIntrinsicType(1 /* Any */, "unknown");
         var emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         var emptyUnionType = emptyObjectType;
@@ -14540,24 +15089,30 @@ var ts;
         // in getPropagatingFlagsOfTypes, and it is checked in inferFromTypes.
         anyFunctionType.flags |= 8388608 /* ContainsAnyFunctionType */;
         var noConstraintType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
-        var anySignature = createSignature(undefined, undefined, emptyArray, anyType, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false);
-        var unknownSignature = createSignature(undefined, undefined, emptyArray, unknownType, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false);
+        var anySignature = createSignature(undefined, undefined, undefined, emptyArray, anyType, /*typePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false);
+        var unknownSignature = createSignature(undefined, undefined, undefined, emptyArray, unknownType, /*typePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false);
+        var enumNumberIndexInfo = createIndexInfo(stringType, /*isReadonly*/ true);
         var globals = {};
-        var globalESSymbolConstructorSymbol;
+        var getGlobalESSymbolConstructorSymbol;
         var getGlobalPromiseConstructorSymbol;
         var globalObjectType;
         var globalFunctionType;
         var globalArrayType;
+        var globalReadonlyArrayType;
         var globalStringType;
         var globalNumberType;
         var globalBooleanType;
         var globalRegExpType;
-        var globalTemplateStringsArrayType;
-        var globalESSymbolType;
-        var globalIterableType;
-        var globalIteratorType;
-        var globalIterableIteratorType;
         var anyArrayType;
+        var anyReadonlyArrayType;
+        // The library files are only loaded when the feature is used.
+        // This allows users to just specify library files they want to used through --lib
+        // and they will not get an error from not having unrelated library files
+        var getGlobalTemplateStringsArrayType;
+        var getGlobalESSymbolType;
+        var getGlobalIterableType;
+        var getGlobalIteratorType;
+        var getGlobalIterableIteratorType;
         var getGlobalClassDecoratorType;
         var getGlobalParameterDecoratorType;
         var getGlobalPropertyDecoratorType;
@@ -14620,6 +15175,7 @@ var ts;
         };
         var subtypeRelation = {};
         var assignableRelation = {};
+        var comparableRelation = {};
         var identityRelation = {};
         // This is for caching the result of getSymbolDisplayBuilder. Do not access directly.
         var _displayBuilder;
@@ -14719,7 +15275,7 @@ var ts;
                 target.flags |= source.flags;
                 if (source.valueDeclaration &&
                     (!target.valueDeclaration ||
-                        (target.valueDeclaration.kind === 221 /* ModuleDeclaration */ && source.valueDeclaration.kind !== 221 /* ModuleDeclaration */))) {
+                        (target.valueDeclaration.kind === 224 /* ModuleDeclaration */ && source.valueDeclaration.kind !== 224 /* ModuleDeclaration */))) {
                     // other kinds of value declarations take precedence over modules
                     target.valueDeclaration = source.valueDeclaration;
                 }
@@ -14739,13 +15295,13 @@ var ts;
                 recordMergedSymbol(target, source);
             }
             else {
-                var message = target.flags & 2 /* BlockScopedVariable */ || source.flags & 2 /* BlockScopedVariable */
+                var message_2 = target.flags & 2 /* BlockScopedVariable */ || source.flags & 2 /* BlockScopedVariable */
                     ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0;
                 ts.forEach(source.declarations, function (node) {
-                    error(node.name ? node.name : node, message, symbolToString(source));
+                    error(node.name ? node.name : node, message_2, symbolToString(source));
                 });
                 ts.forEach(target.declarations, function (node) {
-                    error(node.name ? node.name : node, message, symbolToString(source));
+                    error(node.name ? node.name : node, message_2, symbolToString(source));
                 });
             }
         }
@@ -14776,10 +15332,10 @@ var ts;
         }
         function mergeModuleAugmentation(moduleName) {
             var moduleAugmentation = moduleName.parent;
-            if (moduleAugmentation.symbol.valueDeclaration !== moduleAugmentation) {
+            if (moduleAugmentation.symbol.declarations[0] !== moduleAugmentation) {
                 // this is a combined symbol for multiple augmentations within the same file.
-                // its symbol already has accumulated information for all declarations 
-                // so we need to add it just once - do the work only for first declaration 
+                // its symbol already has accumulated information for all declarations
+                // so we need to add it just once - do the work only for first declaration
                 ts.Debug.assert(moduleAugmentation.symbol.declarations.length > 1);
                 return;
             }
@@ -14787,15 +15343,22 @@ var ts;
                 mergeSymbolTable(globals, moduleAugmentation.symbol.exports);
             }
             else {
-                // find a module that about to be augmented 
+                // find a module that about to be augmented
                 var mainModule = resolveExternalModuleNameWorker(moduleName, moduleName, ts.Diagnostics.Invalid_module_name_in_augmentation_module_0_cannot_be_found);
                 if (!mainModule) {
                     return;
                 }
-                // if module symbol has already been merged - it is safe to use it.
-                // otherwise clone it
-                mainModule = mainModule.flags & 33554432 /* Merged */ ? mainModule : cloneSymbol(mainModule);
-                mergeSymbol(mainModule, moduleAugmentation.symbol);
+                // obtain item referenced by 'export='
+                mainModule = resolveExternalModuleSymbol(mainModule);
+                if (mainModule.flags & 1536 /* Namespace */) {
+                    // if module symbol has already been merged - it is safe to use it.
+                    // otherwise clone it
+                    mainModule = mainModule.flags & 33554432 /* Merged */ ? mainModule : cloneSymbol(mainModule);
+                    mergeSymbol(mainModule, moduleAugmentation.symbol);
+                }
+                else {
+                    error(moduleName, ts.Diagnostics.Cannot_augment_module_0_because_it_resolves_to_a_non_module_entity, moduleName.text);
+                }
             }
         }
         function addToSymbolTable(target, source, message) {
@@ -14825,7 +15388,7 @@ var ts;
             return nodeLinks[nodeId] || (nodeLinks[nodeId] = {});
         }
         function isGlobalSourceFile(node) {
-            return node.kind === 251 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
+            return node.kind === 255 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning && ts.hasProperty(symbols, name)) {
@@ -14851,9 +15414,9 @@ var ts;
          * @return a tuple of two symbols
          */
         function getSymbolsOfParameterPropertyDeclaration(parameter, parameterName) {
-            var constructoDeclaration = parameter.parent;
+            var constructorDeclaration = parameter.parent;
             var classDeclaration = parameter.parent.parent;
-            var parameterSymbol = getSymbol(constructoDeclaration.locals, parameterName, 107455 /* Value */);
+            var parameterSymbol = getSymbol(constructorDeclaration.locals, parameterName, 107455 /* Value */);
             var propertySymbol = getSymbol(classDeclaration.symbol.members, parameterName, 107455 /* Value */);
             if (parameterSymbol && propertySymbol) {
                 return [parameterSymbol, propertySymbol];
@@ -14874,7 +15437,7 @@ var ts;
             if (declaration.pos <= usage.pos) {
                 // declaration is before usage
                 // still might be illegal if usage is in the initializer of the variable declaration
-                return declaration.kind !== 214 /* VariableDeclaration */ ||
+                return declaration.kind !== 217 /* VariableDeclaration */ ||
                     !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
             }
             // declaration is after usage
@@ -14882,14 +15445,14 @@ var ts;
             return isUsedInFunctionOrNonStaticProperty(declaration, usage);
             function isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage) {
                 var container = ts.getEnclosingBlockScopeContainer(declaration);
-                if (declaration.parent.parent.kind === 196 /* VariableStatement */ ||
-                    declaration.parent.parent.kind === 202 /* ForStatement */) {
+                if (declaration.parent.parent.kind === 199 /* VariableStatement */ ||
+                    declaration.parent.parent.kind === 205 /* ForStatement */) {
                     // variable statement/for statement case,
                     // use site should not be inside variable declaration (initializer of declaration or binding element)
                     return isSameScopeDescendentOf(usage, declaration, container);
                 }
-                else if (declaration.parent.parent.kind === 204 /* ForOfStatement */ ||
-                    declaration.parent.parent.kind === 203 /* ForInStatement */) {
+                else if (declaration.parent.parent.kind === 207 /* ForOfStatement */ ||
+                    declaration.parent.parent.kind === 206 /* ForInStatement */) {
                     // ForIn/ForOf case - use site should not be used in expression part
                     var expression = declaration.parent.parent.expression;
                     return isSameScopeDescendentOf(usage, expression, container);
@@ -14906,8 +15469,8 @@ var ts;
                         return true;
                     }
                     var initializerOfNonStaticProperty = current.parent &&
-                        current.parent.kind === 142 /* PropertyDeclaration */ &&
-                        (current.parent.flags & 64 /* Static */) === 0 &&
+                        current.parent.kind === 144 /* PropertyDeclaration */ &&
+                        (current.parent.flags & 32 /* Static */) === 0 &&
                         current.parent.initializer === current;
                     if (initializerOfNonStaticProperty) {
                         return true;
@@ -14936,11 +15499,13 @@ var ts;
                             // - Type parameters of a function are in scope in the entire function declaration, including the parameter
                             //   list and return type. However, local types are only in scope in the function body.
                             // - parameters are only in the scope of function body
-                            if (meaning & result.flags & 793056 /* Type */) {
+                            // This restriction does not apply to JSDoc comment types because they are parented
+                            // at a higher level than type parameters would normally be
+                            if (meaning & result.flags & 793056 /* Type */ && lastLocation.kind !== 272 /* JSDocComment */) {
                                 useResult = result.flags & 262144 /* TypeParameter */
                                     ? lastLocation === location.type ||
-                                        lastLocation.kind === 139 /* Parameter */ ||
-                                        lastLocation.kind === 138 /* TypeParameter */
+                                        lastLocation.kind === 141 /* Parameter */ ||
+                                        lastLocation.kind === 140 /* TypeParameter */
                                     : false;
                             }
                             if (meaning & 107455 /* Value */ && result.flags & 1 /* FunctionScopedVariable */) {
@@ -14949,9 +15514,9 @@ var ts;
                                 // however it is detected separately when checking initializers of parameters
                                 // to make sure that they reference no variables declared after them.
                                 useResult =
-                                    lastLocation.kind === 139 /* Parameter */ ||
+                                    lastLocation.kind === 141 /* Parameter */ ||
                                         (lastLocation === location.type &&
-                                            result.valueDeclaration.kind === 139 /* Parameter */);
+                                            result.valueDeclaration.kind === 141 /* Parameter */);
                             }
                         }
                         if (useResult) {
@@ -14963,12 +15528,12 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 251 /* SourceFile */:
+                    case 255 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location))
                             break;
-                    case 221 /* ModuleDeclaration */:
+                    case 224 /* ModuleDeclaration */:
                         var moduleExports = getSymbolOfNode(location).exports;
-                        if (location.kind === 251 /* SourceFile */ || ts.isAmbientModule(location)) {
+                        if (location.kind === 255 /* SourceFile */ || ts.isAmbientModule(location)) {
                             // It's an external module. First see if the module has an export default and if the local
                             // name of that export default matches.
                             if (result = moduleExports["default"]) {
@@ -14991,7 +15556,7 @@ var ts;
                             //        which is not the desired behavior.
                             if (ts.hasProperty(moduleExports, name) &&
                                 moduleExports[name].flags === 8388608 /* Alias */ &&
-                                ts.getDeclarationOfKind(moduleExports[name], 233 /* ExportSpecifier */)) {
+                                ts.getDeclarationOfKind(moduleExports[name], 237 /* ExportSpecifier */)) {
                                 break;
                             }
                         }
@@ -14999,20 +15564,20 @@ var ts;
                             break loop;
                         }
                         break;
-                    case 220 /* EnumDeclaration */:
+                    case 223 /* EnumDeclaration */:
                         if (result = getSymbol(getSymbolOfNode(location).exports, name, meaning & 8 /* EnumMember */)) {
                             break loop;
                         }
                         break;
-                    case 142 /* PropertyDeclaration */:
-                    case 141 /* PropertySignature */:
+                    case 144 /* PropertyDeclaration */:
+                    case 143 /* PropertySignature */:
                         // TypeScript 1.0 spec (April 2014): 8.4.1
                         // Initializer expressions for instance member variables are evaluated in the scope
                         // of the class constructor body but are not permitted to reference parameters or
                         // 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 (ts.isClassLike(location.parent) && !(location.flags & 64 /* Static */)) {
+                        if (ts.isClassLike(location.parent) && !(location.flags & 32 /* Static */)) {
                             var ctor = findConstructorDeclaration(location.parent);
                             if (ctor && ctor.locals) {
                                 if (getSymbol(ctor.locals, name, meaning & 107455 /* Value */)) {
@@ -15022,11 +15587,11 @@ var ts;
                             }
                         }
                         break;
-                    case 217 /* ClassDeclaration */:
-                    case 189 /* ClassExpression */:
-                    case 218 /* InterfaceDeclaration */:
+                    case 220 /* ClassDeclaration */:
+                    case 191 /* ClassExpression */:
+                    case 221 /* InterfaceDeclaration */:
                         if (result = getSymbol(getSymbolOfNode(location).members, name, meaning & 793056 /* Type */)) {
-                            if (lastLocation && lastLocation.flags & 64 /* Static */) {
+                            if (lastLocation && lastLocation.flags & 32 /* 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.
@@ -15035,7 +15600,7 @@ var ts;
                             }
                             break loop;
                         }
-                        if (location.kind === 189 /* ClassExpression */ && meaning & 32 /* Class */) {
+                        if (location.kind === 191 /* ClassExpression */ && meaning & 32 /* Class */) {
                             var className = location.name;
                             if (className && name === className.text) {
                                 result = location.symbol;
@@ -15051,9 +15616,9 @@ var ts;
                     //       [foo<T>()]() { } // <-- Reference to T from class's own computed property
                     //   }
                     //
-                    case 137 /* ComputedPropertyName */:
+                    case 139 /* ComputedPropertyName */:
                         grandparent = location.parent.parent;
-                        if (ts.isClassLike(grandparent) || grandparent.kind === 218 /* InterfaceDeclaration */) {
+                        if (ts.isClassLike(grandparent) || grandparent.kind === 221 /* InterfaceDeclaration */) {
                             // A reference to this grandparent's type parameters would be an error
                             if (result = getSymbol(getSymbolOfNode(grandparent).members, name, meaning & 793056 /* Type */)) {
                                 error(errorLocation, ts.Diagnostics.A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type);
@@ -15061,19 +15626,19 @@ var ts;
                             }
                         }
                         break;
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
-                    case 145 /* Constructor */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
-                    case 216 /* FunctionDeclaration */:
-                    case 177 /* ArrowFunction */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
+                    case 147 /* Constructor */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
+                    case 219 /* FunctionDeclaration */:
+                    case 179 /* ArrowFunction */:
                         if (meaning & 3 /* Variable */ && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
                         }
                         break;
-                    case 176 /* FunctionExpression */:
+                    case 178 /* FunctionExpression */:
                         if (meaning & 3 /* Variable */ && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
@@ -15086,7 +15651,7 @@ var ts;
                             }
                         }
                         break;
-                    case 140 /* Decorator */:
+                    case 142 /* Decorator */:
                         // Decorators are resolved at the class declaration. Resolving at the parameter
                         // or member would result in looking up locals in the method.
                         //
@@ -15095,7 +15660,7 @@ var ts;
                         //       method(@y x, y) {} // <-- decorator y should be resolved at the class declaration, not the parameter.
                         //   }
                         //
-                        if (location.parent && location.parent.kind === 139 /* Parameter */) {
+                        if (location.parent && location.parent.kind === 141 /* Parameter */) {
                             location = location.parent;
                         }
                         //
@@ -15171,8 +15736,8 @@ var ts;
                         return true;
                     }
                     // 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 & 64 /* Static */)) {
+                    // Check if we're in an instance method and look for a relevant instance member.
+                    if (location === container && !(location.flags & 32 /* Static */)) {
                         var instanceType = getDeclaredTypeOfSymbol(classSymbol).thisType;
                         if (getPropertyOfType(instanceType, name)) {
                             error(errorLocation, ts.Diagnostics.Cannot_find_name_0_Did_you_mean_the_instance_member_this_0, typeof nameArg === "string" ? nameArg : ts.declarationNameToString(nameArg));
@@ -15189,7 +15754,7 @@ var ts;
             // Block-scoped variables cannot be used before their definition
             var declaration = ts.forEach(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) ? d : undefined; });
             ts.Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined");
-            if (!isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 214 /* VariableDeclaration */), errorLocation)) {
+            if (!isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 217 /* VariableDeclaration */), errorLocation)) {
                 error(errorLocation, ts.Diagnostics.Block_scoped_variable_0_used_before_its_declaration, ts.declarationNameToString(declaration.name));
             }
         }
@@ -15210,10 +15775,10 @@ var ts;
         }
         function getAnyImportSyntax(node) {
             if (ts.isAliasSymbolDeclaration(node)) {
-                if (node.kind === 224 /* ImportEqualsDeclaration */) {
+                if (node.kind === 228 /* ImportEqualsDeclaration */) {
                     return node;
                 }
-                while (node && node.kind !== 225 /* ImportDeclaration */) {
+                while (node && node.kind !== 229 /* ImportDeclaration */) {
                     node = node.parent;
                 }
                 return node;
@@ -15223,7 +15788,7 @@ var ts;
             return ts.forEach(symbol.declarations, function (d) { return ts.isAliasSymbolDeclaration(d) ? d : undefined; });
         }
         function getTargetOfImportEqualsDeclaration(node) {
-            if (node.moduleReference.kind === 235 /* ExternalModuleReference */) {
+            if (node.moduleReference.kind === 239 /* ExternalModuleReference */) {
                 return resolveExternalModuleSymbol(resolveExternalModuleName(node, ts.getExternalModuleImportEqualsDeclarationExpression(node)));
             }
             return getSymbolOfPartOfRightHandSideOfImportEquals(node.moduleReference, node);
@@ -15231,12 +15796,14 @@ var ts;
         function getTargetOfImportClause(node) {
             var moduleSymbol = resolveExternalModuleName(node, node.parent.moduleSpecifier);
             if (moduleSymbol) {
-                var exportDefaultSymbol = resolveSymbol(moduleSymbol.exports["default"]);
+                var exportDefaultSymbol = moduleSymbol.exports["export="] ?
+                    getPropertyOfType(getTypeOfSymbol(moduleSymbol.exports["export="]), "default") :
+                    resolveSymbol(moduleSymbol.exports["default"]);
                 if (!exportDefaultSymbol && !allowSyntheticDefaultImports) {
                     error(node.name, ts.Diagnostics.Module_0_has_no_default_export, symbolToString(moduleSymbol));
                 }
                 else if (!exportDefaultSymbol && allowSyntheticDefaultImports) {
-                    return resolveSymbol(moduleSymbol.exports["export="]) || resolveSymbol(moduleSymbol);
+                    return resolveExternalModuleSymbol(moduleSymbol) || resolveSymbol(moduleSymbol);
                 }
                 return exportDefaultSymbol;
             }
@@ -15300,8 +15867,15 @@ var ts;
             if (targetSymbol) {
                 var name_9 = specifier.propertyName || specifier.name;
                 if (name_9.text) {
+                    var symbolFromVariable = void 0;
+                    // First check if module was specified with "export=". If so, get the member from the resolved type
+                    if (moduleSymbol && moduleSymbol.exports && moduleSymbol.exports["export="]) {
+                        symbolFromVariable = getPropertyOfType(getTypeOfSymbol(targetSymbol), name_9.text);
+                    }
+                    else {
+                        symbolFromVariable = getPropertyOfVariable(targetSymbol, name_9.text);
+                    }
                     var symbolFromModule = getExportOfModule(targetSymbol, name_9.text);
-                    var symbolFromVariable = getPropertyOfVariable(targetSymbol, name_9.text);
                     var symbol = symbolFromModule && symbolFromVariable ?
                         combineValueAndTypeSymbols(symbolFromVariable, symbolFromModule) :
                         symbolFromModule || symbolFromVariable;
@@ -15315,6 +15889,9 @@ var ts;
         function getTargetOfImportSpecifier(node) {
             return getExternalModuleMember(node.parent.parent.parent, node);
         }
+        function getTargetOfGlobalModuleExportDeclaration(node) {
+            return resolveExternalModuleSymbol(node.parent.symbol);
+        }
         function getTargetOfExportSpecifier(node) {
             return node.parent.parent.moduleSpecifier ?
                 getExternalModuleMember(node.parent.parent, node) :
@@ -15325,18 +15902,20 @@ var ts;
         }
         function getTargetOfAliasDeclaration(node) {
             switch (node.kind) {
-                case 224 /* ImportEqualsDeclaration */:
+                case 228 /* ImportEqualsDeclaration */:
                     return getTargetOfImportEqualsDeclaration(node);
-                case 226 /* ImportClause */:
+                case 230 /* ImportClause */:
                     return getTargetOfImportClause(node);
-                case 227 /* NamespaceImport */:
+                case 231 /* NamespaceImport */:
                     return getTargetOfNamespaceImport(node);
-                case 229 /* ImportSpecifier */:
+                case 233 /* ImportSpecifier */:
                     return getTargetOfImportSpecifier(node);
-                case 233 /* ExportSpecifier */:
+                case 237 /* ExportSpecifier */:
                     return getTargetOfExportSpecifier(node);
-                case 230 /* ExportAssignment */:
+                case 234 /* ExportAssignment */:
                     return getTargetOfExportAssignment(node);
+                case 227 /* GlobalModuleExportDeclaration */:
+                    return getTargetOfGlobalModuleExportDeclaration(node);
             }
         }
         function resolveSymbol(symbol) {
@@ -15380,11 +15959,11 @@ var ts;
             if (!links.referenced) {
                 links.referenced = true;
                 var node = getDeclarationOfAliasSymbol(symbol);
-                if (node.kind === 230 /* ExportAssignment */) {
+                if (node.kind === 234 /* ExportAssignment */) {
                     // export default <symbol>
                     checkExpressionCached(node.expression);
                 }
-                else if (node.kind === 233 /* ExportSpecifier */) {
+                else if (node.kind === 237 /* ExportSpecifier */) {
                     // export { <symbol> } or export { <symbol> as foo }
                     checkExpressionCached(node.propertyName || node.name);
                 }
@@ -15397,7 +15976,7 @@ var ts;
         // This function is only for imports with entity names
         function getSymbolOfPartOfRightHandSideOfImportEquals(entityName, importDeclaration) {
             if (!importDeclaration) {
-                importDeclaration = ts.getAncestor(entityName, 224 /* ImportEqualsDeclaration */);
+                importDeclaration = ts.getAncestor(entityName, 228 /* ImportEqualsDeclaration */);
                 ts.Debug.assert(importDeclaration !== undefined);
             }
             // There are three things we might try to look for. In the following examples,
@@ -15410,13 +15989,13 @@ var ts;
                 entityName = entityName.parent;
             }
             // Check for case 1 and 3 in the above example
-            if (entityName.kind === 69 /* Identifier */ || entityName.parent.kind === 136 /* QualifiedName */) {
+            if (entityName.kind === 69 /* Identifier */ || entityName.parent.kind === 138 /* QualifiedName */) {
                 return resolveEntityName(entityName, 1536 /* Namespace */);
             }
             else {
                 // Case 2 in above example
                 // entityName.kind could be a QualifiedName or a Missing identifier
-                ts.Debug.assert(entityName.parent.kind === 224 /* ImportEqualsDeclaration */);
+                ts.Debug.assert(entityName.parent.kind === 228 /* ImportEqualsDeclaration */);
                 return resolveEntityName(entityName, 107455 /* Value */ | 793056 /* Type */ | 1536 /* Namespace */);
             }
         }
@@ -15436,9 +16015,9 @@ var ts;
                     return undefined;
                 }
             }
-            else if (name.kind === 136 /* QualifiedName */ || name.kind === 169 /* PropertyAccessExpression */) {
-                var left = name.kind === 136 /* QualifiedName */ ? name.left : name.expression;
-                var right = name.kind === 136 /* QualifiedName */ ? name.right : name.name;
+            else if (name.kind === 138 /* QualifiedName */ || name.kind === 171 /* PropertyAccessExpression */) {
+                var left = name.kind === 138 /* QualifiedName */ ? name.left : name.expression;
+                var right = name.kind === 138 /* QualifiedName */ ? name.right : name.name;
                 var namespace = resolveEntityName(left, 1536 /* Namespace */, ignoreErrors);
                 if (!namespace || namespace === unknownSymbol || ts.nodeIsMissing(right)) {
                     return undefined;
@@ -15473,7 +16052,7 @@ var ts;
             }
             var isRelative = ts.isExternalModuleNameRelative(moduleName);
             if (!isRelative) {
-                var symbol = getSymbol(globals, "\"" + moduleName + "\"", 512 /* ValueModule */);
+                var symbol = getSymbol(globals, '"' + moduleName + '"', 512 /* ValueModule */);
                 if (symbol) {
                     // merged symbol is module declaration symbol combined with all augmentations
                     return getMergedSymbol(symbol);
@@ -15487,7 +16066,7 @@ var ts;
                     return getMergedSymbol(sourceFile.symbol);
                 }
                 if (moduleNotFoundError) {
-                    // report errors only if it was requested 
+                    // report errors only if it was requested
                     error(moduleReferenceLiteral, ts.Diagnostics.File_0_is_not_a_module, sourceFile.fileName);
                 }
                 return undefined;
@@ -15501,7 +16080,7 @@ var ts;
         // An external module with an 'export =' declaration resolves to the target of the 'export =' declaration,
         // and an external module with no 'export =' declaration resolves to the module itself.
         function resolveExternalModuleSymbol(moduleSymbol) {
-            return moduleSymbol && resolveSymbol(moduleSymbol.exports["export="]) || moduleSymbol;
+            return moduleSymbol && getMergedSymbol(resolveSymbol(moduleSymbol.exports["export="])) || moduleSymbol;
         }
         // An external module with an 'export =' declaration may be referenced as an ES6 module provided the 'export ='
         // references a symbol that is at least declared as a module or a variable. The target of the 'export =' may
@@ -15514,8 +16093,8 @@ var ts;
             }
             return symbol;
         }
-        function getExportAssignmentSymbol(moduleSymbol) {
-            return moduleSymbol.exports["export="];
+        function hasExportAssignmentSymbol(moduleSymbol) {
+            return moduleSymbol.exports["export="] !== undefined;
         }
         function getExportsOfModuleAsArray(moduleSymbol) {
             return symbolsToArray(getExportsOfModule(moduleSymbol));
@@ -15624,7 +16203,7 @@ var ts;
             var members = node.members;
             for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
                 var member = members_1[_i];
-                if (member.kind === 145 /* Constructor */ && ts.nodeIsPresent(member.body)) {
+                if (member.kind === 147 /* Constructor */ && ts.nodeIsPresent(member.body)) {
                     return member;
                 }
             }
@@ -15671,19 +16250,19 @@ var ts;
             }
             return result || emptyArray;
         }
-        function setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexType, numberIndexType) {
+        function setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
             type.members = members;
             type.properties = getNamedMembers(members);
             type.callSignatures = callSignatures;
             type.constructSignatures = constructSignatures;
-            if (stringIndexType)
-                type.stringIndexType = stringIndexType;
-            if (numberIndexType)
-                type.numberIndexType = numberIndexType;
+            if (stringIndexInfo)
+                type.stringIndexInfo = stringIndexInfo;
+            if (numberIndexInfo)
+                type.numberIndexInfo = numberIndexInfo;
             return type;
         }
-        function createAnonymousType(symbol, members, callSignatures, constructSignatures, stringIndexType, numberIndexType) {
-            return setObjectTypeMembers(createObjectType(65536 /* Anonymous */, symbol), members, callSignatures, constructSignatures, stringIndexType, numberIndexType);
+        function createAnonymousType(symbol, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
+            return setObjectTypeMembers(createObjectType(65536 /* Anonymous */, symbol), members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function forEachSymbolTableInScope(enclosingDeclaration, callback) {
             var result;
@@ -15695,21 +16274,15 @@ var ts;
                     }
                 }
                 switch (location_1.kind) {
-                    case 251 /* SourceFile */:
+                    case 255 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location_1)) {
                             break;
                         }
-                    case 221 /* ModuleDeclaration */:
+                    case 224 /* ModuleDeclaration */:
                         if (result = callback(getSymbolOfNode(location_1).exports)) {
                             return result;
                         }
                         break;
-                    case 217 /* ClassDeclaration */:
-                    case 218 /* InterfaceDeclaration */:
-                        if (result = callback(getSymbolOfNode(location_1).members)) {
-                            return result;
-                        }
-                        break;
                 }
             }
             return callback(globals);
@@ -15732,7 +16305,7 @@ var ts;
                 function isAccessible(symbolFromSymbolTable, resolvedAliasSymbol) {
                     if (symbol === (resolvedAliasSymbol || symbolFromSymbolTable)) {
                         // if the symbolFromSymbolTable is not external module (it could be if it was determined as ambient external module and would be in globals table)
-                        // and if symbolfrom symbolTable or alias resolution matches the symbol,
+                        // and if symbolFromSymbolTable or alias resolution matches the symbol,
                         // check the symbol can be qualified, it is only then this symbol is accessible
                         return !ts.forEach(symbolFromSymbolTable.declarations, hasExternalModuleSymbol) &&
                             canQualifySymbol(symbolFromSymbolTable, meaning);
@@ -15746,7 +16319,7 @@ var ts;
                 return ts.forEachValue(symbols, function (symbolFromSymbolTable) {
                     if (symbolFromSymbolTable.flags & 8388608 /* Alias */
                         && symbolFromSymbolTable.name !== "export="
-                        && !ts.getDeclarationOfKind(symbolFromSymbolTable, 233 /* ExportSpecifier */)) {
+                        && !ts.getDeclarationOfKind(symbolFromSymbolTable, 237 /* ExportSpecifier */)) {
                         if (!useOnlyExternalAliasing ||
                             // Is this external alias, then use it to name
                             ts.forEach(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration)) {
@@ -15765,7 +16338,9 @@ var ts;
                 });
             }
             if (symbol) {
-                return forEachSymbolTableInScope(enclosingDeclaration, getAccessibleSymbolChainFromSymbolTable);
+                if (!(isPropertyOrMethodDeclarationSymbol(symbol))) {
+                    return forEachSymbolTableInScope(enclosingDeclaration, getAccessibleSymbolChainFromSymbolTable);
+                }
             }
         }
         function needsQualification(symbol, enclosingDeclaration, meaning) {
@@ -15783,7 +16358,7 @@ var ts;
                     return true;
                 }
                 // Qualify if the symbol from symbol table has same meaning as expected
-                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 233 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
+                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 237 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
                 if (symbolFromSymbolTable.flags & meaning) {
                     qualify = true;
                     return true;
@@ -15793,6 +16368,24 @@ var ts;
             });
             return qualify;
         }
+        function isPropertyOrMethodDeclarationSymbol(symbol) {
+            if (symbol.declarations && symbol.declarations.length) {
+                for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                    var declaration = _a[_i];
+                    switch (declaration.kind) {
+                        case 144 /* PropertyDeclaration */:
+                        case 146 /* MethodDeclaration */:
+                        case 148 /* GetAccessor */:
+                        case 149 /* SetAccessor */:
+                            continue;
+                        default:
+                            return false;
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
         function isSymbolAccessible(symbol, enclosingDeclaration, meaning) {
             if (symbol && enclosingDeclaration && !(symbol.flags & 262144 /* TypeParameter */)) {
                 var initialSymbol = symbol;
@@ -15856,7 +16449,7 @@ var ts;
             }
         }
         function hasExternalModuleSymbol(declaration) {
-            return ts.isAmbientModule(declaration) || (declaration.kind === 251 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isAmbientModule(declaration) || (declaration.kind === 255 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasVisibleDeclarations(symbol) {
             var aliasesToMakeVisible;
@@ -15870,7 +16463,7 @@ var ts;
                     // because these kind of aliases can be used to name types in declaration file
                     var anyImportSyntax = getAnyImportSyntax(declaration);
                     if (anyImportSyntax &&
-                        !(anyImportSyntax.flags & 2 /* Export */) &&
+                        !(anyImportSyntax.flags & 1 /* Export */) &&
                         isDeclarationVisible(anyImportSyntax.parent)) {
                         getNodeLinks(declaration).isVisible = true;
                         if (aliasesToMakeVisible) {
@@ -15892,12 +16485,12 @@ var ts;
         function isEntityNameVisible(entityName, enclosingDeclaration) {
             // get symbol of the first identifier of the entityName
             var meaning;
-            if (entityName.parent.kind === 155 /* TypeQuery */) {
+            if (entityName.parent.kind === 157 /* TypeQuery */ || ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
                 // Typeof value
                 meaning = 107455 /* Value */ | 1048576 /* ExportValue */;
             }
-            else if (entityName.kind === 136 /* QualifiedName */ || entityName.kind === 169 /* PropertyAccessExpression */ ||
-                entityName.parent.kind === 224 /* ImportEqualsDeclaration */) {
+            else if (entityName.kind === 138 /* QualifiedName */ || entityName.kind === 171 /* PropertyAccessExpression */ ||
+                entityName.parent.kind === 228 /* ImportEqualsDeclaration */) {
                 // Left identifier from type reference or TypeAlias
                 // Entity name of the import declaration
                 meaning = 1536 /* Namespace */;
@@ -15949,13 +16542,29 @@ var ts;
             }
             return result;
         }
+        function typePredicateToString(typePredicate, enclosingDeclaration, flags) {
+            var writer = ts.getSingleLineStringWriter();
+            getSymbolDisplayBuilder().buildTypePredicateDisplay(typePredicate, writer, enclosingDeclaration, flags);
+            var result = writer.string();
+            ts.releaseStringWriter(writer);
+            return result;
+        }
+        function visibilityToString(flags) {
+            if (flags === 8 /* Private */) {
+                return "private";
+            }
+            if (flags === 16 /* Protected */) {
+                return "protected";
+            }
+            return "public";
+        }
         function getTypeAliasForTypeLiteral(type) {
             if (type.symbol && type.symbol.flags & 2048 /* TypeLiteral */) {
                 var node = type.symbol.declarations[0].parent;
-                while (node.kind === 161 /* ParenthesizedType */) {
+                while (node.kind === 163 /* ParenthesizedType */) {
                     node = node.parent;
                 }
-                if (node.kind === 219 /* TypeAliasDeclaration */) {
+                if (node.kind === 222 /* TypeAliasDeclaration */) {
                     return getSymbolOfNode(node);
                 }
             }
@@ -15963,7 +16572,7 @@ var ts;
         }
         function isTopLevelInExternalModuleAugmentation(node) {
             return node && node.parent &&
-                node.parent.kind === 222 /* ModuleBlock */ &&
+                node.parent.kind === 225 /* ModuleBlock */ &&
                 ts.isExternalModuleAugmentation(node.parent.parent);
         }
         function getSymbolDisplayBuilder() {
@@ -15974,10 +16583,10 @@ var ts;
                         return ts.declarationNameToString(declaration.name);
                     }
                     switch (declaration.kind) {
-                        case 189 /* ClassExpression */:
+                        case 191 /* ClassExpression */:
                             return "(Anonymous class)";
-                        case 176 /* FunctionExpression */:
-                        case 177 /* ArrowFunction */:
+                        case 178 /* FunctionExpression */:
+                        case 179 /* ArrowFunction */:
                             return "(Anonymous function)";
                     }
                 }
@@ -16065,16 +16674,10 @@ var ts;
                 function writeType(type, flags) {
                     // Write undefined/null type as any
                     if (type.flags & 16777343 /* Intrinsic */) {
-                        if (type.flags & 134217728 /* PredicateType */) {
-                            buildTypePredicateDisplay(writer, type.predicate);
-                            buildTypeDisplay(type.predicate.type, writer, enclosingDeclaration, flags, symbolStack);
-                        }
-                        else {
-                            // Special handling for unknown / resolving types, they should show up as any and not unknown or __resolving
-                            writer.writeKeyword(!(globalFlags & 16 /* WriteOwnNameForAnyLike */) && isTypeAny(type)
-                                ? "any"
-                                : type.intrinsicName);
-                        }
+                        // Special handling for unknown / resolving types, they should show up as any and not unknown or __resolving
+                        writer.writeKeyword(!(globalFlags & 16 /* WriteOwnNameForAnyLike */) && isTypeAny(type)
+                            ? "any"
+                            : type.intrinsicName);
                     }
                     else if (type.flags & 33554432 /* ThisType */) {
                         if (inObjectTypeLiteral) {
@@ -16159,14 +16762,14 @@ var ts;
                             while (i < length_1) {
                                 // Find group of type arguments for type parameters with the same declaring container.
                                 var start = i;
-                                var parent_3 = getParentSymbolOfTypeParameter(outerTypeParameters[i]);
+                                var parent_5 = getParentSymbolOfTypeParameter(outerTypeParameters[i]);
                                 do {
                                     i++;
-                                } while (i < length_1 && getParentSymbolOfTypeParameter(outerTypeParameters[i]) === parent_3);
+                                } while (i < length_1 && getParentSymbolOfTypeParameter(outerTypeParameters[i]) === parent_5);
                                 // When type parameters are their own type arguments for the whole group (i.e. we have
                                 // the default outer type arguments), we don't show the group.
                                 if (!ts.rangeEquals(outerTypeParameters, typeArguments, start, i)) {
-                                    writeSymbolTypeReference(parent_3, typeArguments, start, i, flags);
+                                    writeSymbolTypeReference(parent_5, typeArguments, start, i, flags);
                                     writePunctuation(writer, 21 /* DotToken */);
                                 }
                             }
@@ -16228,11 +16831,11 @@ var ts;
                     }
                     function shouldWriteTypeOfFunctionSymbol() {
                         var isStaticMethodSymbol = !!(symbol.flags & 8192 /* Method */ &&
-                            ts.forEach(symbol.declarations, function (declaration) { return declaration.flags & 64 /* Static */; }));
+                            ts.forEach(symbol.declarations, function (declaration) { return declaration.flags & 32 /* Static */; }));
                         var isNonLocalFunctionSymbol = !!(symbol.flags & 16 /* Function */) &&
                             (symbol.parent ||
                                 ts.forEach(symbol.declarations, function (declaration) {
-                                    return declaration.parent.kind === 251 /* SourceFile */ || declaration.parent.kind === 222 /* ModuleBlock */;
+                                    return declaration.parent.kind === 255 /* SourceFile */ || declaration.parent.kind === 225 /* ModuleBlock */;
                                 }));
                         if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
                             // typeof is allowed only for static/non local functions
@@ -16246,19 +16849,38 @@ var ts;
                     writeSpace(writer);
                     buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, 107455 /* Value */, 0 /* None */, typeFormatFlags);
                 }
-                function getIndexerParameterName(type, indexKind, fallbackName) {
-                    var declaration = getIndexDeclarationOfSymbol(type.symbol, indexKind);
-                    if (!declaration) {
-                        // declaration might not be found if indexer was added from the contextual type.
-                        // in this case use fallback name
-                        return fallbackName;
+                function writeIndexSignature(info, keyword) {
+                    if (info) {
+                        if (info.isReadonly) {
+                            writeKeyword(writer, 127 /* ReadonlyKeyword */);
+                            writeSpace(writer);
+                        }
+                        writePunctuation(writer, 19 /* OpenBracketToken */);
+                        writer.writeParameter(info.declaration ? ts.declarationNameToString(info.declaration.parameters[0].name) : "x");
+                        writePunctuation(writer, 54 /* ColonToken */);
+                        writeSpace(writer);
+                        writeKeyword(writer, keyword);
+                        writePunctuation(writer, 20 /* CloseBracketToken */);
+                        writePunctuation(writer, 54 /* ColonToken */);
+                        writeSpace(writer);
+                        writeType(info.type, 0 /* None */);
+                        writePunctuation(writer, 23 /* SemicolonToken */);
+                        writer.writeLine();
+                    }
+                }
+                function writePropertyWithModifiers(prop) {
+                    if (isReadonlySymbol(prop)) {
+                        writeKeyword(writer, 127 /* ReadonlyKeyword */);
+                        writeSpace(writer);
+                    }
+                    buildSymbolDisplay(prop, writer);
+                    if (prop.flags & 536870912 /* Optional */) {
+                        writePunctuation(writer, 53 /* QuestionToken */);
                     }
-                    ts.Debug.assert(declaration.parameters.length !== 0);
-                    return ts.declarationNameToString(declaration.parameters[0].name);
                 }
                 function writeLiteralType(type, flags) {
                     var resolved = resolveStructuredTypeMembers(type);
-                    if (!resolved.properties.length && !resolved.stringIndexType && !resolved.numberIndexType) {
+                    if (!resolved.properties.length && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
                         if (!resolved.callSignatures.length && !resolved.constructSignatures.length) {
                             writePunctuation(writer, 15 /* OpenBraceToken */);
                             writePunctuation(writer, 16 /* CloseBraceToken */);
@@ -16304,34 +16926,8 @@ var ts;
                         writePunctuation(writer, 23 /* SemicolonToken */);
                         writer.writeLine();
                     }
-                    if (resolved.stringIndexType) {
-                        // [x: string]:
-                        writePunctuation(writer, 19 /* OpenBracketToken */);
-                        writer.writeParameter(getIndexerParameterName(resolved, 0 /* String */, /*fallbackName*/ "x"));
-                        writePunctuation(writer, 54 /* ColonToken */);
-                        writeSpace(writer);
-                        writeKeyword(writer, 130 /* StringKeyword */);
-                        writePunctuation(writer, 20 /* CloseBracketToken */);
-                        writePunctuation(writer, 54 /* ColonToken */);
-                        writeSpace(writer);
-                        writeType(resolved.stringIndexType, 0 /* None */);
-                        writePunctuation(writer, 23 /* SemicolonToken */);
-                        writer.writeLine();
-                    }
-                    if (resolved.numberIndexType) {
-                        // [x: number]:
-                        writePunctuation(writer, 19 /* OpenBracketToken */);
-                        writer.writeParameter(getIndexerParameterName(resolved, 1 /* Number */, /*fallbackName*/ "x"));
-                        writePunctuation(writer, 54 /* ColonToken */);
-                        writeSpace(writer);
-                        writeKeyword(writer, 128 /* NumberKeyword */);
-                        writePunctuation(writer, 20 /* CloseBracketToken */);
-                        writePunctuation(writer, 54 /* ColonToken */);
-                        writeSpace(writer);
-                        writeType(resolved.numberIndexType, 0 /* None */);
-                        writePunctuation(writer, 23 /* SemicolonToken */);
-                        writer.writeLine();
-                    }
+                    writeIndexSignature(resolved.stringIndexInfo, 131 /* StringKeyword */);
+                    writeIndexSignature(resolved.numberIndexInfo, 129 /* NumberKeyword */);
                     for (var _d = 0, _e = resolved.properties; _d < _e.length; _d++) {
                         var p = _e[_d];
                         var t = getTypeOfSymbol(p);
@@ -16339,20 +16935,14 @@ var ts;
                             var signatures = getSignaturesOfType(t, 0 /* Call */);
                             for (var _f = 0, signatures_1 = signatures; _f < signatures_1.length; _f++) {
                                 var signature = signatures_1[_f];
-                                buildSymbolDisplay(p, writer);
-                                if (p.flags & 536870912 /* Optional */) {
-                                    writePunctuation(writer, 53 /* QuestionToken */);
-                                }
+                                writePropertyWithModifiers(p);
                                 buildSignatureDisplay(signature, writer, enclosingDeclaration, globalFlagsToPass, /*kind*/ undefined, symbolStack);
                                 writePunctuation(writer, 23 /* SemicolonToken */);
                                 writer.writeLine();
                             }
                         }
                         else {
-                            buildSymbolDisplay(p, writer);
-                            if (p.flags & 536870912 /* Optional */) {
-                                writePunctuation(writer, 53 /* QuestionToken */);
-                            }
+                            writePropertyWithModifiers(p);
                             writePunctuation(writer, 54 /* ColonToken */);
                             writeSpace(writer);
                             writeType(t, 0 /* None */);
@@ -16365,10 +16955,10 @@ var ts;
                     inObjectTypeLiteral = saveInObjectTypeLiteral;
                 }
             }
-            function buildTypeParameterDisplayFromSymbol(symbol, writer, enclosingDeclaraiton, flags) {
+            function buildTypeParameterDisplayFromSymbol(symbol, writer, enclosingDeclaration, flags) {
                 var targetSymbol = getTargetSymbol(symbol);
                 if (targetSymbol.flags & 32 /* Class */ || targetSymbol.flags & 64 /* Interface */ || targetSymbol.flags & 524288 /* TypeAlias */) {
-                    buildDisplayForTypeParametersAndDelimiters(getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol), writer, enclosingDeclaraiton, flags);
+                    buildDisplayForTypeParametersAndDelimiters(getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol), writer, enclosingDeclaration, flags);
                 }
             }
             function buildTypeParameterDisplay(tp, writer, enclosingDeclaration, flags, symbolStack) {
@@ -16386,7 +16976,12 @@ var ts;
                 if (ts.isRestParameter(parameterNode)) {
                     writePunctuation(writer, 22 /* DotDotDotToken */);
                 }
-                appendSymbolNameOnly(p, writer);
+                if (ts.isBindingPattern(parameterNode.name)) {
+                    buildBindingPatternDisplay(parameterNode.name, writer, enclosingDeclaration, flags, symbolStack);
+                }
+                else {
+                    appendSymbolNameOnly(p, writer);
+                }
                 if (isOptionalParameter(parameterNode)) {
                     writePunctuation(writer, 53 /* QuestionToken */);
                 }
@@ -16394,19 +16989,59 @@ var ts;
                 writeSpace(writer);
                 buildTypeDisplay(getTypeOfSymbol(p), writer, enclosingDeclaration, flags, symbolStack);
             }
+            function buildBindingPatternDisplay(bindingPattern, writer, enclosingDeclaration, flags, symbolStack) {
+                // We have to explicitly emit square bracket and bracket because these tokens are not stored inside the node.
+                if (bindingPattern.kind === 166 /* ObjectBindingPattern */) {
+                    writePunctuation(writer, 15 /* OpenBraceToken */);
+                    buildDisplayForCommaSeparatedList(bindingPattern.elements, writer, function (e) { return buildBindingElementDisplay(e, writer, enclosingDeclaration, flags, symbolStack); });
+                    writePunctuation(writer, 16 /* CloseBraceToken */);
+                }
+                else if (bindingPattern.kind === 167 /* ArrayBindingPattern */) {
+                    writePunctuation(writer, 19 /* OpenBracketToken */);
+                    var elements = bindingPattern.elements;
+                    buildDisplayForCommaSeparatedList(elements, writer, function (e) { return buildBindingElementDisplay(e, writer, enclosingDeclaration, flags, symbolStack); });
+                    if (elements && elements.hasTrailingComma) {
+                        writePunctuation(writer, 24 /* CommaToken */);
+                    }
+                    writePunctuation(writer, 20 /* CloseBracketToken */);
+                }
+            }
+            function buildBindingElementDisplay(bindingElement, writer, enclosingDeclaration, flags, symbolStack) {
+                if (bindingElement.kind === 192 /* OmittedExpression */) {
+                    return;
+                }
+                ts.Debug.assert(bindingElement.kind === 168 /* BindingElement */);
+                if (bindingElement.propertyName) {
+                    writer.writeSymbol(ts.getTextOfNode(bindingElement.propertyName), bindingElement.symbol);
+                    writePunctuation(writer, 54 /* ColonToken */);
+                    writeSpace(writer);
+                }
+                if (ts.isBindingPattern(bindingElement.name)) {
+                    buildBindingPatternDisplay(bindingElement.name, writer, enclosingDeclaration, flags, symbolStack);
+                }
+                else {
+                    if (bindingElement.dotDotDotToken) {
+                        writePunctuation(writer, 22 /* DotDotDotToken */);
+                    }
+                    appendSymbolNameOnly(bindingElement.symbol, writer);
+                }
+            }
             function buildDisplayForTypeParametersAndDelimiters(typeParameters, writer, enclosingDeclaration, flags, symbolStack) {
                 if (typeParameters && typeParameters.length) {
                     writePunctuation(writer, 25 /* LessThanToken */);
-                    for (var i = 0; i < typeParameters.length; i++) {
-                        if (i > 0) {
-                            writePunctuation(writer, 24 /* CommaToken */);
-                            writeSpace(writer);
-                        }
-                        buildTypeParameterDisplay(typeParameters[i], writer, enclosingDeclaration, flags, symbolStack);
-                    }
+                    buildDisplayForCommaSeparatedList(typeParameters, writer, function (p) { return buildTypeParameterDisplay(p, writer, enclosingDeclaration, flags, symbolStack); });
                     writePunctuation(writer, 27 /* GreaterThanToken */);
                 }
             }
+            function buildDisplayForCommaSeparatedList(list, writer, action) {
+                for (var i = 0; i < list.length; i++) {
+                    if (i > 0) {
+                        writePunctuation(writer, 24 /* CommaToken */);
+                        writeSpace(writer);
+                    }
+                    action(list[i]);
+                }
+            }
             function buildDisplayForTypeArgumentsAndDelimiters(typeParameters, mapper, writer, enclosingDeclaration, flags, symbolStack) {
                 if (typeParameters && typeParameters.length) {
                     writePunctuation(writer, 25 /* LessThanToken */);
@@ -16420,10 +17055,16 @@ var ts;
                     writePunctuation(writer, 27 /* GreaterThanToken */);
                 }
             }
-            function buildDisplayForParametersAndDelimiters(parameters, writer, enclosingDeclaration, flags, symbolStack) {
+            function buildDisplayForParametersAndDelimiters(thisType, parameters, writer, enclosingDeclaration, flags, symbolStack) {
                 writePunctuation(writer, 17 /* OpenParenToken */);
+                if (thisType) {
+                    writeKeyword(writer, 97 /* ThisKeyword */);
+                    writePunctuation(writer, 54 /* ColonToken */);
+                    writeSpace(writer);
+                    buildTypeDisplay(thisType, writer, enclosingDeclaration, flags, symbolStack);
+                }
                 for (var i = 0; i < parameters.length; i++) {
-                    if (i > 0) {
+                    if (i > 0 || thisType) {
                         writePunctuation(writer, 24 /* CommaToken */);
                         writeSpace(writer);
                     }
@@ -16431,7 +17072,7 @@ var ts;
                 }
                 writePunctuation(writer, 18 /* CloseParenToken */);
             }
-            function buildTypePredicateDisplay(writer, predicate) {
+            function buildTypePredicateDisplay(predicate, writer, enclosingDeclaration, flags, symbolStack) {
                 if (ts.isIdentifierTypePredicate(predicate)) {
                     writer.writeParameter(predicate.parameterName);
                 }
@@ -16441,6 +17082,7 @@ var ts;
                 writeSpace(writer);
                 writeKeyword(writer, 124 /* IsKeyword */);
                 writeSpace(writer);
+                buildTypeDisplay(predicate.type, writer, enclosingDeclaration, flags, symbolStack);
             }
             function buildReturnTypeDisplay(signature, writer, enclosingDeclaration, flags, symbolStack) {
                 if (flags & 8 /* WriteArrowStyleSignature */) {
@@ -16451,8 +17093,13 @@ var ts;
                     writePunctuation(writer, 54 /* ColonToken */);
                 }
                 writeSpace(writer);
-                var returnType = getReturnTypeOfSignature(signature);
-                buildTypeDisplay(returnType, writer, enclosingDeclaration, flags, symbolStack);
+                if (signature.typePredicate) {
+                    buildTypePredicateDisplay(signature.typePredicate, writer, enclosingDeclaration, flags, symbolStack);
+                }
+                else {
+                    var returnType = getReturnTypeOfSignature(signature);
+                    buildTypeDisplay(returnType, writer, enclosingDeclaration, flags, symbolStack);
+                }
             }
             function buildSignatureDisplay(signature, writer, enclosingDeclaration, flags, kind, symbolStack) {
                 if (kind === 1 /* Construct */) {
@@ -16467,13 +17114,14 @@ var ts;
                 else {
                     buildDisplayForTypeParametersAndDelimiters(signature.typeParameters, writer, enclosingDeclaration, flags, symbolStack);
                 }
-                buildDisplayForParametersAndDelimiters(signature.parameters, writer, enclosingDeclaration, flags, symbolStack);
+                buildDisplayForParametersAndDelimiters(signature.thisType, signature.parameters, writer, enclosingDeclaration, flags, symbolStack);
                 buildReturnTypeDisplay(signature, writer, enclosingDeclaration, flags, symbolStack);
             }
             return _displayBuilder || (_displayBuilder = {
                 buildSymbolDisplay: buildSymbolDisplay,
                 buildTypeDisplay: buildTypeDisplay,
                 buildTypeParameterDisplay: buildTypeParameterDisplay,
+                buildTypePredicateDisplay: buildTypePredicateDisplay,
                 buildParameterDisplay: buildParameterDisplay,
                 buildDisplayForParametersAndDelimiters: buildDisplayForParametersAndDelimiters,
                 buildDisplayForTypeParametersAndDelimiters: buildDisplayForTypeParametersAndDelimiters,
@@ -16493,86 +17141,86 @@ var ts;
             return false;
             function determineIfDeclarationIsVisible() {
                 switch (node.kind) {
-                    case 166 /* BindingElement */:
+                    case 168 /* BindingElement */:
                         return isDeclarationVisible(node.parent.parent);
-                    case 214 /* VariableDeclaration */:
+                    case 217 /* VariableDeclaration */:
                         if (ts.isBindingPattern(node.name) &&
                             !node.name.elements.length) {
                             // If the binding pattern is empty, this variable declaration is not visible
                             return false;
                         }
                     // Otherwise fall through
-                    case 221 /* ModuleDeclaration */:
-                    case 217 /* ClassDeclaration */:
-                    case 218 /* InterfaceDeclaration */:
-                    case 219 /* TypeAliasDeclaration */:
-                    case 216 /* FunctionDeclaration */:
-                    case 220 /* EnumDeclaration */:
-                    case 224 /* ImportEqualsDeclaration */:
+                    case 224 /* ModuleDeclaration */:
+                    case 220 /* ClassDeclaration */:
+                    case 221 /* InterfaceDeclaration */:
+                    case 222 /* TypeAliasDeclaration */:
+                    case 219 /* FunctionDeclaration */:
+                    case 223 /* EnumDeclaration */:
+                    case 228 /* ImportEqualsDeclaration */:
                         // external module augmentation is always visible
                         if (ts.isExternalModuleAugmentation(node)) {
                             return true;
                         }
-                        var parent_4 = getDeclarationContainer(node);
+                        var parent_6 = getDeclarationContainer(node);
                         // If the node is not exported or it is not ambient module element (except import declaration)
-                        if (!(ts.getCombinedNodeFlags(node) & 2 /* Export */) &&
-                            !(node.kind !== 224 /* ImportEqualsDeclaration */ && parent_4.kind !== 251 /* SourceFile */ && ts.isInAmbientContext(parent_4))) {
-                            return isGlobalSourceFile(parent_4);
+                        if (!(ts.getCombinedNodeFlags(node) & 1 /* Export */) &&
+                            !(node.kind !== 228 /* ImportEqualsDeclaration */ && parent_6.kind !== 255 /* SourceFile */ && ts.isInAmbientContext(parent_6))) {
+                            return isGlobalSourceFile(parent_6);
                         }
                         // Exported members/ambient module elements (exception import declaration) are visible if parent is visible
-                        return isDeclarationVisible(parent_4);
-                    case 142 /* PropertyDeclaration */:
-                    case 141 /* PropertySignature */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
-                        if (node.flags & (16 /* Private */ | 32 /* Protected */)) {
+                        return isDeclarationVisible(parent_6);
+                    case 144 /* PropertyDeclaration */:
+                    case 143 /* PropertySignature */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
+                        if (node.flags & (8 /* Private */ | 16 /* Protected */)) {
                             // Private/protected properties/methods are not visible
                             return false;
                         }
                     // Public properties/methods are visible if its parents are visible, so const it fall into next case statement
-                    case 145 /* Constructor */:
-                    case 149 /* ConstructSignature */:
-                    case 148 /* CallSignature */:
-                    case 150 /* IndexSignature */:
-                    case 139 /* Parameter */:
-                    case 222 /* ModuleBlock */:
-                    case 153 /* FunctionType */:
-                    case 154 /* ConstructorType */:
-                    case 156 /* TypeLiteral */:
-                    case 152 /* TypeReference */:
-                    case 157 /* ArrayType */:
-                    case 158 /* TupleType */:
-                    case 159 /* UnionType */:
-                    case 160 /* IntersectionType */:
-                    case 161 /* ParenthesizedType */:
+                    case 147 /* Constructor */:
+                    case 151 /* ConstructSignature */:
+                    case 150 /* CallSignature */:
+                    case 152 /* IndexSignature */:
+                    case 141 /* Parameter */:
+                    case 225 /* ModuleBlock */:
+                    case 155 /* FunctionType */:
+                    case 156 /* ConstructorType */:
+                    case 158 /* TypeLiteral */:
+                    case 154 /* TypeReference */:
+                    case 159 /* ArrayType */:
+                    case 160 /* TupleType */:
+                    case 161 /* UnionType */:
+                    case 162 /* IntersectionType */:
+                    case 163 /* ParenthesizedType */:
                         return isDeclarationVisible(node.parent);
                     // Default binding, import specifier and namespace import is visible
                     // only on demand so by default it is not visible
-                    case 226 /* ImportClause */:
-                    case 227 /* NamespaceImport */:
-                    case 229 /* ImportSpecifier */:
+                    case 230 /* ImportClause */:
+                    case 231 /* NamespaceImport */:
+                    case 233 /* ImportSpecifier */:
                         return false;
                     // Type parameters are always visible
-                    case 138 /* TypeParameter */:
+                    case 140 /* TypeParameter */:
                     // Source file is always visible
-                    case 251 /* SourceFile */:
+                    case 255 /* SourceFile */:
                         return true;
                     // Export assignments do not create name bindings outside the module
-                    case 230 /* ExportAssignment */:
+                    case 234 /* ExportAssignment */:
                         return false;
                     default:
-                        ts.Debug.fail("isDeclarationVisible unknown: SyntaxKind: " + node.kind);
+                        return false;
                 }
             }
         }
         function collectLinkedAliases(node) {
             var exportSymbol;
-            if (node.parent && node.parent.kind === 230 /* ExportAssignment */) {
+            if (node.parent && node.parent.kind === 234 /* ExportAssignment */) {
                 exportSymbol = resolveName(node.parent, node.text, 107455 /* Value */ | 793056 /* Type */ | 1536 /* Namespace */ | 8388608 /* Alias */, ts.Diagnostics.Cannot_find_name_0, node);
             }
-            else if (node.parent.kind === 233 /* ExportSpecifier */) {
+            else if (node.parent.kind === 237 /* ExportSpecifier */) {
                 var exportSpecifier = node.parent;
                 exportSymbol = exportSpecifier.parent.parent.moduleSpecifier ?
                     getExternalModuleMember(exportSpecifier.parent.parent, exportSpecifier) :
@@ -16664,16 +17312,27 @@ var ts;
         }
         function getDeclarationContainer(node) {
             node = ts.getRootDeclaration(node);
-            // Parent chain:
-            // VaribleDeclaration -> VariableDeclarationList -> VariableStatement -> 'Declaration Container'
-            return node.kind === 214 /* VariableDeclaration */ ? node.parent.parent.parent : node.parent;
+            while (node) {
+                switch (node.kind) {
+                    case 217 /* VariableDeclaration */:
+                    case 218 /* VariableDeclarationList */:
+                    case 233 /* ImportSpecifier */:
+                    case 232 /* NamedImports */:
+                    case 231 /* NamespaceImport */:
+                    case 230 /* ImportClause */:
+                        node = node.parent;
+                        break;
+                    default:
+                        return node.parent;
+                }
+            }
         }
         function getTypeOfPrototypeProperty(prototype) {
             // TypeScript 1.0 spec (April 2014): 8.4
             // Every class automatically contains a static property member named 'prototype',
             // the type of which is an instantiation of the class type with type Any supplied as a type argument for each type parameter.
             // It is an error to explicitly declare a static property member with the name 'prototype'.
-            var classType = getDeclaredTypeOfSymbol(getMergedSymbol(prototype.parent));
+            var classType = getDeclaredTypeOfSymbol(getParentOfSymbol(prototype));
             return classType.typeParameters ? createTypeReference(classType, ts.map(classType.typeParameters, function (_) { return anyType; })) : classType;
         }
         // Return the type of the given property in the given type, or undefined if no such property exists
@@ -16697,7 +17356,7 @@ var ts;
                 case 9 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
                     return name.text;
-                case 137 /* ComputedPropertyName */:
+                case 139 /* ComputedPropertyName */:
                     if (ts.isStringOrNumericLiteral(name.expression.kind)) {
                         return name.expression.text;
                     }
@@ -16705,9 +17364,9 @@ var ts;
             return undefined;
         }
         function isComputedNonLiteralName(name) {
-            return name.kind === 137 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteral(name.expression.kind);
+            return name.kind === 139 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteral(name.expression.kind);
         }
-        // Return the inferred type for a binding element
+        /** Return the inferred type for a binding element */
         function getTypeForBindingElement(declaration) {
             var pattern = declaration.parent;
             var parentType = getTypeForBindingElementParent(pattern.parent);
@@ -16725,13 +17384,16 @@ var ts;
                 return parentType;
             }
             var type;
-            if (pattern.kind === 164 /* ObjectBindingPattern */) {
+            if (pattern.kind === 166 /* ObjectBindingPattern */) {
                 // Use explicitly specified property name ({ p: xxx } form), or otherwise the implied name ({ p } form)
                 var name_10 = declaration.propertyName || declaration.name;
                 if (isComputedNonLiteralName(name_10)) {
                     // computed properties with non-literal names are treated as 'any'
                     return anyType;
                 }
+                if (declaration.initializer) {
+                    getContextualType(declaration.initializer);
+                }
                 // Use type of the specified property, or otherwise, for a numeric name, the type of the numeric index signature,
                 // or otherwise the type of the string index signature.
                 var text = getTextOfPropertyName(name_10);
@@ -16769,15 +17431,60 @@ var ts;
                     type = createArrayType(elementType);
                 }
             }
+            // In strict null checking mode, if a default value of a non-undefined type is specified, remove
+            // undefined from the final type.
+            if (strictNullChecks && declaration.initializer && !(getNullableKind(checkExpressionCached(declaration.initializer)) & 32 /* Undefined */)) {
+                type = removeNullableKind(type, 32 /* Undefined */);
+            }
             return type;
         }
+        function getTypeForVariableLikeDeclarationFromJSDocComment(declaration) {
+            var jsDocType = getJSDocTypeForVariableLikeDeclarationFromJSDocComment(declaration);
+            if (jsDocType) {
+                return getTypeFromTypeNode(jsDocType);
+            }
+        }
+        function getJSDocTypeForVariableLikeDeclarationFromJSDocComment(declaration) {
+            // First, see if this node has an @type annotation on it directly.
+            var typeTag = ts.getJSDocTypeTag(declaration);
+            if (typeTag && typeTag.typeExpression) {
+                return typeTag.typeExpression.type;
+            }
+            if (declaration.kind === 217 /* VariableDeclaration */ &&
+                declaration.parent.kind === 218 /* VariableDeclarationList */ &&
+                declaration.parent.parent.kind === 199 /* VariableStatement */) {
+                // @type annotation might have been on the variable statement, try that instead.
+                var annotation = ts.getJSDocTypeTag(declaration.parent.parent);
+                if (annotation && annotation.typeExpression) {
+                    return annotation.typeExpression.type;
+                }
+            }
+            else if (declaration.kind === 141 /* Parameter */) {
+                // If it's a parameter, see if the parent has a jsdoc comment with an @param
+                // annotation.
+                var paramTag = ts.getCorrespondingJSDocParameterTag(declaration);
+                if (paramTag && paramTag.typeExpression) {
+                    return paramTag.typeExpression.type;
+                }
+            }
+            return undefined;
+        }
         // Return the inferred type for a variable, parameter, or property declaration
         function getTypeForVariableLikeDeclaration(declaration) {
+            if (declaration.flags & 134217728 /* JavaScriptFile */) {
+                // If this is a variable in a JavaScript file, then use the JSDoc type (if it has
+                // one as its type), otherwise fallback to the below standard TS codepaths to
+                // try to figure it out.
+                var type = getTypeForVariableLikeDeclarationFromJSDocComment(declaration);
+                if (type && type !== unknownType) {
+                    return type;
+                }
+            }
             // A variable declared in a for..in statement is always of type string
-            if (declaration.parent.parent.kind === 203 /* ForInStatement */) {
+            if (declaration.parent.parent.kind === 206 /* ForInStatement */) {
                 return stringType;
             }
-            if (declaration.parent.parent.kind === 204 /* ForOfStatement */) {
+            if (declaration.parent.parent.kind === 207 /* ForOfStatement */) {
                 // checkRightHandSideOfForOf will return undefined if the for-of expression type was
                 // missing properties/signatures required to get its iteratedType (like
                 // [Symbol.iterator] or next). This may be because we accessed properties from anyType,
@@ -16789,21 +17496,24 @@ var ts;
             }
             // Use type from type annotation if one is present
             if (declaration.type) {
-                return getTypeFromTypeNode(declaration.type);
+                var type = getTypeFromTypeNode(declaration.type);
+                return strictNullChecks && declaration.questionToken ? addNullableKind(type, 32 /* Undefined */) : type;
             }
-            if (declaration.kind === 139 /* Parameter */) {
+            if (declaration.kind === 141 /* Parameter */) {
                 var func = declaration.parent;
                 // For a parameter of a set accessor, use the type of the get accessor if one is present
-                if (func.kind === 147 /* SetAccessor */ && !ts.hasDynamicName(func)) {
-                    var getter = ts.getDeclarationOfKind(declaration.parent.symbol, 146 /* GetAccessor */);
+                if (func.kind === 149 /* SetAccessor */ && !ts.hasDynamicName(func)) {
+                    var getter = ts.getDeclarationOfKind(declaration.parent.symbol, 148 /* GetAccessor */);
                     if (getter) {
                         return getReturnTypeOfSignature(getSignatureFromDeclaration(getter));
                     }
                 }
                 // Use contextual parameter type if one is available
-                var type = getContextuallyTypedParameterType(declaration);
+                var type = declaration.symbol.name === "this"
+                    ? getContextuallyTypedThisType(func)
+                    : getContextuallyTypedParameterType(declaration);
                 if (type) {
-                    return type;
+                    return strictNullChecks && declaration.questionToken ? addNullableKind(type, 32 /* Undefined */) : type;
                 }
             }
             // Use the type of the initializer expression if one is present
@@ -16811,7 +17521,7 @@ var ts;
                 return checkExpressionCached(declaration.initializer);
             }
             // If it is a short-hand property assignment, use the type of the identifier
-            if (declaration.kind === 249 /* ShorthandPropertyAssignment */) {
+            if (declaration.kind === 253 /* ShorthandPropertyAssignment */) {
                 return checkIdentifier(declaration.name);
             }
             // If the declaration specifies a binding pattern, use the type implied by the binding pattern
@@ -16826,11 +17536,16 @@ var ts;
         // pattern. Otherwise, it is the type any.
         function getTypeFromBindingElement(element, includePatternInType) {
             if (element.initializer) {
-                return getWidenedType(checkExpressionCached(element.initializer));
+                var type = checkExpressionCached(element.initializer);
+                reportErrorsFromWidening(element, type);
+                return getWidenedType(type);
             }
             if (ts.isBindingPattern(element.name)) {
                 return getTypeFromBindingPattern(element.name, includePatternInType);
             }
+            if (compilerOptions.noImplicitAny) {
+                reportImplicitAnyError(element, anyType);
+            }
             return anyType;
         }
         // Return the type implied by an object binding pattern
@@ -16867,7 +17582,7 @@ var ts;
                 return languageVersion >= 2 /* ES6 */ ? createIterableType(anyType) : anyArrayType;
             }
             // If the pattern has at least one element, and no rest element, then it should imply a tuple type.
-            var elementTypes = ts.map(elements, function (e) { return e.kind === 190 /* OmittedExpression */ ? anyType : getTypeFromBindingElement(e, includePatternInType); });
+            var elementTypes = ts.map(elements, function (e) { return e.kind === 192 /* OmittedExpression */ ? anyType : getTypeFromBindingElement(e, includePatternInType); });
             if (includePatternInType) {
                 var result = createNewTupleType(elementTypes);
                 result.pattern = pattern;
@@ -16883,7 +17598,7 @@ var ts;
         // parameter with no type annotation or initializer, the type implied by the binding pattern becomes the type of
         // the parameter.
         function getTypeFromBindingPattern(pattern, includePatternInType) {
-            return pattern.kind === 164 /* ObjectBindingPattern */
+            return pattern.kind === 166 /* ObjectBindingPattern */
                 ? getTypeFromObjectBindingPattern(pattern, includePatternInType)
                 : getTypeFromArrayBindingPattern(pattern, includePatternInType);
         }
@@ -16905,10 +17620,7 @@ var ts;
                 // During a normal type check we'll never get to here with a property assignment (the check of the containing
                 // object literal uses a different path). We exclude widening only so that language services and type verification
                 // tools see the actual type.
-                if (declaration.kind === 248 /* PropertyAssignment */) {
-                    return type;
-                }
-                if (type.flags & 134217728 /* PredicateType */ && (declaration.kind === 142 /* PropertyDeclaration */ || declaration.kind === 141 /* PropertySignature */)) {
+                if (declaration.kind === 252 /* PropertyAssignment */) {
                     return type;
                 }
                 return getWidenedType(type);
@@ -16918,7 +17630,7 @@ var ts;
             // Report implicit any errors unless this is a private property within an ambient declaration
             if (reportErrors && compilerOptions.noImplicitAny) {
                 var root = ts.getRootDeclaration(declaration);
-                if (!isPrivateWithinAmbient(root) && !(root.kind === 139 /* Parameter */ && isPrivateWithinAmbient(root.parent))) {
+                if (!isPrivateWithinAmbient(root) && !(root.kind === 141 /* Parameter */ && isPrivateWithinAmbient(root.parent))) {
                     reportImplicitAnyError(declaration, type);
                 }
             }
@@ -16933,21 +17645,21 @@ var ts;
                 }
                 // Handle catch clause variables
                 var declaration = symbol.valueDeclaration;
-                if (declaration.parent.kind === 247 /* CatchClause */) {
+                if (declaration.parent.kind === 251 /* CatchClause */) {
                     return links.type = anyType;
                 }
                 // Handle export default expressions
-                if (declaration.kind === 230 /* ExportAssignment */) {
+                if (declaration.kind === 234 /* ExportAssignment */) {
                     return links.type = checkExpression(declaration.expression);
                 }
                 // Handle module.exports = expr
-                if (declaration.kind === 184 /* BinaryExpression */) {
-                    return links.type = checkExpression(declaration.right);
+                if (declaration.kind === 186 /* BinaryExpression */) {
+                    return links.type = getUnionType(ts.map(symbol.declarations, function (decl) { return checkExpressionCached(decl.right); }));
                 }
-                if (declaration.kind === 169 /* PropertyAccessExpression */) {
+                if (declaration.kind === 171 /* PropertyAccessExpression */) {
                     // Declarations only exist for property access expressions for certain
                     // special assignment kinds
-                    if (declaration.parent.kind === 184 /* BinaryExpression */) {
+                    if (declaration.parent.kind === 186 /* BinaryExpression */) {
                         // Handle exports.p = expr or this.p = expr or className.prototype.method = expr
                         return links.type = checkExpressionCached(declaration.parent.right);
                     }
@@ -16977,7 +17689,7 @@ var ts;
         }
         function getAnnotatedAccessorType(accessor) {
             if (accessor) {
-                if (accessor.kind === 146 /* GetAccessor */) {
+                if (accessor.kind === 148 /* GetAccessor */) {
                     return accessor.type && getTypeFromTypeNode(accessor.type);
                 }
                 else {
@@ -16990,12 +17702,18 @@ var ts;
         function getTypeOfAccessors(symbol) {
             var links = getSymbolLinks(symbol);
             if (!links.type) {
+                var getter = ts.getDeclarationOfKind(symbol, 148 /* GetAccessor */);
+                var setter = ts.getDeclarationOfKind(symbol, 149 /* SetAccessor */);
+                if (getter && getter.flags & 134217728 /* JavaScriptFile */) {
+                    var jsDocType = getTypeForVariableLikeDeclarationFromJSDocComment(getter);
+                    if (jsDocType) {
+                        return links.type = jsDocType;
+                    }
+                }
                 if (!pushTypeResolution(symbol, 0 /* Type */)) {
                     return unknownType;
                 }
-                var getter = ts.getDeclarationOfKind(symbol, 146 /* GetAccessor */);
-                var setter = ts.getDeclarationOfKind(symbol, 147 /* SetAccessor */);
-                var type;
+                var type = void 0;
                 // First try to see if the user specified a return type on the get-accessor.
                 var getterReturnType = getAnnotatedAccessorType(getter);
                 if (getterReturnType) {
@@ -17023,7 +17741,7 @@ var ts;
                 if (!popTypeResolution()) {
                     type = anyType;
                     if (compilerOptions.noImplicitAny) {
-                        var getter_1 = ts.getDeclarationOfKind(symbol, 146 /* GetAccessor */);
+                        var getter_1 = ts.getDeclarationOfKind(symbol, 148 /* GetAccessor */);
                         error(getter_1, ts.Diagnostics._0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions, symbolToString(symbol));
                     }
                 }
@@ -17123,9 +17841,9 @@ var ts;
                 if (!node) {
                     return typeParameters;
                 }
-                if (node.kind === 217 /* ClassDeclaration */ || node.kind === 189 /* ClassExpression */ ||
-                    node.kind === 216 /* FunctionDeclaration */ || node.kind === 176 /* FunctionExpression */ ||
-                    node.kind === 144 /* MethodDeclaration */ || node.kind === 177 /* ArrowFunction */) {
+                if (node.kind === 220 /* ClassDeclaration */ || node.kind === 191 /* ClassExpression */ ||
+                    node.kind === 219 /* FunctionDeclaration */ || node.kind === 178 /* FunctionExpression */ ||
+                    node.kind === 146 /* MethodDeclaration */ || node.kind === 179 /* ArrowFunction */) {
                     var declarations = node.typeParameters;
                     if (declarations) {
                         return appendTypeParameters(appendOuterTypeParameters(typeParameters, node), declarations);
@@ -17135,7 +17853,7 @@ var ts;
         }
         // The outer type parameters are those defined by enclosing generic classes, methods, or functions.
         function getOuterTypeParametersOfClassOrInterface(symbol) {
-            var declaration = symbol.flags & 32 /* Class */ ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 218 /* InterfaceDeclaration */);
+            var declaration = symbol.flags & 32 /* Class */ ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 221 /* InterfaceDeclaration */);
             return appendOuterTypeParameters(undefined, declaration);
         }
         // The local type parameters are the combined set of type parameters from all declarations of the class,
@@ -17144,8 +17862,8 @@ var ts;
             var result;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var node = _a[_i];
-                if (node.kind === 218 /* InterfaceDeclaration */ || node.kind === 217 /* ClassDeclaration */ ||
-                    node.kind === 189 /* ClassExpression */ || node.kind === 219 /* TypeAliasDeclaration */) {
+                if (node.kind === 221 /* InterfaceDeclaration */ || node.kind === 220 /* ClassDeclaration */ ||
+                    node.kind === 191 /* ClassExpression */ || node.kind === 222 /* TypeAliasDeclaration */) {
                     var declaration = node;
                     if (declaration.typeParameters) {
                         result = appendTypeParameters(result, declaration.typeParameters);
@@ -17172,8 +17890,8 @@ var ts;
         function getInstantiatedConstructorsForTypeArguments(type, typeArgumentNodes) {
             var signatures = getConstructorsForTypeArguments(type, typeArgumentNodes);
             if (typeArgumentNodes) {
-                var typeArguments = ts.map(typeArgumentNodes, getTypeFromTypeNode);
-                signatures = ts.map(signatures, function (sig) { return getSignatureInstantiation(sig, typeArguments); });
+                var typeArguments_1 = ts.map(typeArgumentNodes, getTypeFromTypeNode);
+                signatures = ts.map(signatures, function (sig) { return getSignatureInstantiation(sig, typeArguments_1); });
             }
             return signatures;
         }
@@ -17285,7 +18003,7 @@ var ts;
             type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
             for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 218 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
+                if (declaration.kind === 221 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
                     for (var _b = 0, _c = ts.getInterfaceBaseTypeNodes(declaration); _b < _c.length; _b++) {
                         var node = _c[_b];
                         var baseType = getTypeFromTypeNode(node);
@@ -17317,8 +18035,8 @@ var ts;
         function isIndependentInterface(symbol) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 218 /* InterfaceDeclaration */) {
-                    if (declaration.flags & 262144 /* ContainsThis */) {
+                if (declaration.kind === 221 /* InterfaceDeclaration */) {
+                    if (declaration.flags & 16384 /* ContainsThis */) {
                         return false;
                     }
                     var baseTypeNodes = ts.getInterfaceBaseTypeNodes(declaration);
@@ -17373,7 +18091,7 @@ var ts;
                 if (!pushTypeResolution(symbol, 2 /* DeclaredType */)) {
                     return unknownType;
                 }
-                var declaration = ts.getDeclarationOfKind(symbol, 219 /* TypeAliasDeclaration */);
+                var declaration = ts.getDeclarationOfKind(symbol, 222 /* TypeAliasDeclaration */);
                 var type = getTypeFromTypeNode(declaration.type);
                 if (popTypeResolution()) {
                     links.typeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
@@ -17406,7 +18124,7 @@ var ts;
             if (!links.declaredType) {
                 var type = createType(512 /* TypeParameter */);
                 type.symbol = symbol;
-                if (!ts.getDeclarationOfKind(symbol, 138 /* TypeParameter */).constraint) {
+                if (!ts.getDeclarationOfKind(symbol, 140 /* TypeParameter */).constraint) {
                     type.constraint = noConstraintType;
                 }
                 links.declaredType = type;
@@ -17457,16 +18175,18 @@ var ts;
         function isIndependentType(node) {
             switch (node.kind) {
                 case 117 /* AnyKeyword */:
-                case 130 /* StringKeyword */:
-                case 128 /* NumberKeyword */:
+                case 131 /* StringKeyword */:
+                case 129 /* NumberKeyword */:
                 case 120 /* BooleanKeyword */:
-                case 131 /* SymbolKeyword */:
+                case 132 /* SymbolKeyword */:
                 case 103 /* VoidKeyword */:
-                case 163 /* StringLiteralType */:
+                case 134 /* UndefinedKeyword */:
+                case 93 /* NullKeyword */:
+                case 165 /* StringLiteralType */:
                     return true;
-                case 157 /* ArrayType */:
+                case 159 /* ArrayType */:
                     return isIndependentType(node.elementType);
-                case 152 /* TypeReference */:
+                case 154 /* TypeReference */:
                     return isIndependentTypeReference(node);
             }
             return false;
@@ -17479,7 +18199,7 @@ var ts;
         // A function-like declaration is considered independent (free of this references) if it has a return type
         // annotation that is considered independent and if each parameter is considered independent.
         function isIndependentFunctionLikeDeclaration(node) {
-            if (node.kind !== 145 /* Constructor */ && (!node.type || !isIndependentType(node.type))) {
+            if (node.kind !== 147 /* Constructor */ && (!node.type || !isIndependentType(node.type))) {
                 return false;
             }
             for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
@@ -17493,19 +18213,19 @@ var ts;
         // Returns true if the class or interface member given by the symbol is free of "this" references. The
         // function may return false for symbols that are actually free of "this" references because it is not
         // feasible to perform a complete analysis in all cases. In particular, property members with types
-        // inferred from their initializers and function members with inferred return types are convervatively
+        // inferred from their initializers and function members with inferred return types are conservatively
         // assumed not to be free of "this" references.
         function isIndependentMember(symbol) {
             if (symbol.declarations && symbol.declarations.length === 1) {
                 var declaration = symbol.declarations[0];
                 if (declaration) {
                     switch (declaration.kind) {
-                        case 142 /* PropertyDeclaration */:
-                        case 141 /* PropertySignature */:
+                        case 144 /* PropertyDeclaration */:
+                        case 143 /* PropertySignature */:
                             return isIndependentVariableLikeDeclaration(declaration);
-                        case 144 /* MethodDeclaration */:
-                        case 143 /* MethodSignature */:
-                        case 145 /* Constructor */:
+                        case 146 /* MethodDeclaration */:
+                        case 145 /* MethodSignature */:
+                        case 147 /* Constructor */:
                             return isIndependentFunctionLikeDeclaration(declaration);
                     }
                 }
@@ -17544,8 +18264,8 @@ var ts;
                 type.declaredProperties = getNamedMembers(symbol.members);
                 type.declaredCallSignatures = getSignaturesOfSymbol(symbol.members["__call"]);
                 type.declaredConstructSignatures = getSignaturesOfSymbol(symbol.members["__new"]);
-                type.declaredStringIndexType = getIndexTypeOfSymbol(symbol, 0 /* String */);
-                type.declaredNumberIndexType = getIndexTypeOfSymbol(symbol, 1 /* Number */);
+                type.declaredStringIndexInfo = getIndexInfoOfSymbol(symbol, 0 /* String */);
+                type.declaredNumberIndexInfo = getIndexInfoOfSymbol(symbol, 1 /* Number */);
             }
             return type;
         }
@@ -17560,15 +18280,15 @@ var ts;
             var members = source.symbol.members;
             var callSignatures = source.declaredCallSignatures;
             var constructSignatures = source.declaredConstructSignatures;
-            var stringIndexType = source.declaredStringIndexType;
-            var numberIndexType = source.declaredNumberIndexType;
+            var stringIndexInfo = source.declaredStringIndexInfo;
+            var numberIndexInfo = source.declaredNumberIndexInfo;
             if (!ts.rangeEquals(typeParameters, typeArguments, 0, typeParameters.length)) {
                 mapper = createTypeMapper(typeParameters, typeArguments);
                 members = createInstantiatedSymbolTable(source.declaredProperties, mapper, /*mappingThisOnly*/ typeParameters.length === 1);
                 callSignatures = instantiateList(source.declaredCallSignatures, mapper, instantiateSignature);
                 constructSignatures = instantiateList(source.declaredConstructSignatures, mapper, instantiateSignature);
-                stringIndexType = instantiateType(source.declaredStringIndexType, mapper);
-                numberIndexType = instantiateType(source.declaredNumberIndexType, mapper);
+                stringIndexInfo = instantiateIndexInfo(source.declaredStringIndexInfo, mapper);
+                numberIndexInfo = instantiateIndexInfo(source.declaredNumberIndexInfo, mapper);
             }
             var baseTypes = getBaseTypes(source);
             if (baseTypes.length) {
@@ -17582,11 +18302,11 @@ var ts;
                     addInheritedMembers(members, getPropertiesOfObjectType(instantiatedBaseType));
                     callSignatures = ts.concatenate(callSignatures, getSignaturesOfType(instantiatedBaseType, 0 /* Call */));
                     constructSignatures = ts.concatenate(constructSignatures, getSignaturesOfType(instantiatedBaseType, 1 /* Construct */));
-                    stringIndexType = stringIndexType || getIndexTypeOfType(instantiatedBaseType, 0 /* String */);
-                    numberIndexType = numberIndexType || getIndexTypeOfType(instantiatedBaseType, 1 /* Number */);
+                    stringIndexInfo = stringIndexInfo || getIndexInfoOfType(instantiatedBaseType, 0 /* String */);
+                    numberIndexInfo = numberIndexInfo || getIndexInfoOfType(instantiatedBaseType, 1 /* Number */);
                 }
             }
-            setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexType, numberIndexType);
+            setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function resolveClassOrInterfaceMembers(type) {
             resolveObjectTypeMembers(type, resolveDeclaredMembers(type), emptyArray, emptyArray);
@@ -17598,25 +18318,27 @@ var ts;
                 type.typeArguments : ts.concatenate(type.typeArguments, [type]);
             resolveObjectTypeMembers(type, source, typeParameters, typeArguments);
         }
-        function createSignature(declaration, typeParameters, parameters, resolvedReturnType, minArgumentCount, hasRestParameter, hasStringLiterals) {
+        function createSignature(declaration, typeParameters, thisType, parameters, resolvedReturnType, typePredicate, minArgumentCount, hasRestParameter, hasStringLiterals) {
             var sig = new Signature(checker);
             sig.declaration = declaration;
             sig.typeParameters = typeParameters;
             sig.parameters = parameters;
+            sig.thisType = thisType;
             sig.resolvedReturnType = resolvedReturnType;
+            sig.typePredicate = typePredicate;
             sig.minArgumentCount = minArgumentCount;
             sig.hasRestParameter = hasRestParameter;
             sig.hasStringLiterals = hasStringLiterals;
             return sig;
         }
         function cloneSignature(sig) {
-            return createSignature(sig.declaration, sig.typeParameters, sig.parameters, sig.resolvedReturnType, sig.minArgumentCount, sig.hasRestParameter, sig.hasStringLiterals);
+            return createSignature(sig.declaration, sig.typeParameters, sig.thisType, sig.parameters, sig.resolvedReturnType, sig.typePredicate, sig.minArgumentCount, sig.hasRestParameter, sig.hasStringLiterals);
         }
         function getDefaultConstructSignatures(classType) {
             var baseConstructorType = getBaseConstructorTypeOfClass(classType);
             var baseSignatures = getSignaturesOfType(baseConstructorType, 1 /* Construct */);
             if (baseSignatures.length === 0) {
-                return [createSignature(undefined, classType.localTypeParameters, emptyArray, classType, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false)];
+                return [createSignature(undefined, classType.localTypeParameters, undefined, emptyArray, classType, /*typePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false)];
             }
             var baseTypeNode = getBaseTypeNodeOfClass(classType);
             var typeArguments = ts.map(baseTypeNode.typeArguments, getTypeFromTypeNode);
@@ -17649,12 +18371,12 @@ var ts;
             var arrayType = resolveStructuredTypeMembers(createTypeFromGenericGlobalType(globalArrayType, [arrayElementType, type]));
             var members = createTupleTypeMemberSymbols(type.elementTypes);
             addInheritedMembers(members, arrayType.properties);
-            setObjectTypeMembers(type, members, arrayType.callSignatures, arrayType.constructSignatures, arrayType.stringIndexType, arrayType.numberIndexType);
+            setObjectTypeMembers(type, members, arrayType.callSignatures, arrayType.constructSignatures, arrayType.stringIndexInfo, arrayType.numberIndexInfo);
         }
-        function findMatchingSignature(signatureList, signature, partialMatch, ignoreReturnTypes) {
+        function findMatchingSignature(signatureList, signature, partialMatch, ignoreThisTypes, ignoreReturnTypes) {
             for (var _i = 0, signatureList_1 = signatureList; _i < signatureList_1.length; _i++) {
                 var s = signatureList_1[_i];
-                if (compareSignaturesIdentical(s, signature, partialMatch, ignoreReturnTypes, compareTypesIdentical)) {
+                if (compareSignaturesIdentical(s, signature, partialMatch, ignoreThisTypes, ignoreReturnTypes, compareTypesIdentical)) {
                     return s;
                 }
             }
@@ -17667,7 +18389,7 @@ var ts;
                     return undefined;
                 }
                 for (var i = 1; i < signatureLists.length; i++) {
-                    if (!findMatchingSignature(signatureLists[i], signature, /*partialMatch*/ false, /*ignoreReturnTypes*/ false)) {
+                    if (!findMatchingSignature(signatureLists[i], signature, /*partialMatch*/ false, /*ignoreThisTypes*/ false, /*ignoreReturnTypes*/ false)) {
                         return undefined;
                     }
                 }
@@ -17676,7 +18398,7 @@ var ts;
             var result = undefined;
             for (var i = 0; i < signatureLists.length; i++) {
                 // Allow matching non-generic signatures to have excess parameters and different return types
-                var match = i === listIndex ? signature : findMatchingSignature(signatureLists[i], signature, /*partialMatch*/ true, /*ignoreReturnTypes*/ true);
+                var match = i === listIndex ? signature : findMatchingSignature(signatureLists[i], signature, /*partialMatch*/ true, /*ignoreThisTypes*/ true, /*ignoreReturnTypes*/ true);
                 if (!match) {
                     return undefined;
                 }
@@ -17697,13 +18419,16 @@ var ts;
                 for (var _i = 0, _a = signatureLists[i]; _i < _a.length; _i++) {
                     var signature = _a[_i];
                     // Only process signatures with parameter lists that aren't already in the result list
-                    if (!result || !findMatchingSignature(result, signature, /*partialMatch*/ false, /*ignoreReturnTypes*/ true)) {
+                    if (!result || !findMatchingSignature(result, signature, /*partialMatch*/ false, /*ignoreThisTypes*/ true, /*ignoreReturnTypes*/ true)) {
                         var unionSignatures = findMatchingSignatures(signatureLists, signature, i);
                         if (unionSignatures) {
                             var s = signature;
                             // Union the result types when more than one signature matches
                             if (unionSignatures.length > 1) {
                                 s = cloneSignature(signature);
+                                if (ts.forEach(unionSignatures, function (sig) { return sig.thisType; })) {
+                                    s.thisType = getUnionType(ts.map(unionSignatures, function (sig) { return sig.thisType || anyType; }));
+                                }
                                 // Clear resolved return type we possibly got from cloneSignature
                                 s.resolvedReturnType = undefined;
                                 s.unionSignatures = unionSignatures;
@@ -17715,45 +18440,50 @@ var ts;
             }
             return result || emptyArray;
         }
-        function getUnionIndexType(types, kind) {
+        function getUnionIndexInfo(types, kind) {
             var indexTypes = [];
+            var isAnyReadonly = false;
             for (var _i = 0, types_1 = types; _i < types_1.length; _i++) {
                 var type = types_1[_i];
-                var indexType = getIndexTypeOfType(type, kind);
-                if (!indexType) {
+                var indexInfo = getIndexInfoOfType(type, kind);
+                if (!indexInfo) {
                     return undefined;
                 }
-                indexTypes.push(indexType);
+                indexTypes.push(indexInfo.type);
+                isAnyReadonly = isAnyReadonly || indexInfo.isReadonly;
             }
-            return getUnionType(indexTypes);
+            return createIndexInfo(getUnionType(indexTypes), isAnyReadonly);
         }
         function resolveUnionTypeMembers(type) {
             // The members and properties collections are empty for union types. To get all properties of a union
             // type use getPropertiesOfType (only the language service uses this).
             var callSignatures = getUnionSignatures(type.types, 0 /* Call */);
             var constructSignatures = getUnionSignatures(type.types, 1 /* Construct */);
-            var stringIndexType = getUnionIndexType(type.types, 0 /* String */);
-            var numberIndexType = getUnionIndexType(type.types, 1 /* Number */);
-            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexType, numberIndexType);
+            var stringIndexInfo = getUnionIndexInfo(type.types, 0 /* String */);
+            var numberIndexInfo = getUnionIndexInfo(type.types, 1 /* Number */);
+            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function intersectTypes(type1, type2) {
             return !type1 ? type2 : !type2 ? type1 : getIntersectionType([type1, type2]);
         }
+        function intersectIndexInfos(info1, info2) {
+            return !info1 ? info2 : !info2 ? info1 : createIndexInfo(getIntersectionType([info1.type, info2.type]), info1.isReadonly && info2.isReadonly);
+        }
         function resolveIntersectionTypeMembers(type) {
             // The members and properties collections are empty for intersection types. To get all properties of an
             // intersection type use getPropertiesOfType (only the language service uses this).
             var callSignatures = emptyArray;
             var constructSignatures = emptyArray;
-            var stringIndexType = undefined;
-            var numberIndexType = undefined;
+            var stringIndexInfo = undefined;
+            var numberIndexInfo = undefined;
             for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                 var t = _a[_i];
                 callSignatures = ts.concatenate(callSignatures, getSignaturesOfType(t, 0 /* Call */));
                 constructSignatures = ts.concatenate(constructSignatures, getSignaturesOfType(t, 1 /* Construct */));
-                stringIndexType = intersectTypes(stringIndexType, getIndexTypeOfType(t, 0 /* String */));
-                numberIndexType = intersectTypes(numberIndexType, getIndexTypeOfType(t, 1 /* Number */));
+                stringIndexInfo = intersectIndexInfos(stringIndexInfo, getIndexInfoOfType(t, 0 /* String */));
+                numberIndexInfo = intersectIndexInfos(numberIndexInfo, getIndexInfoOfType(t, 1 /* Number */));
             }
-            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexType, numberIndexType);
+            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function resolveAnonymousTypeMembers(type) {
             var symbol = type.symbol;
@@ -17761,17 +18491,17 @@ var ts;
                 var members = createInstantiatedSymbolTable(getPropertiesOfObjectType(type.target), type.mapper, /*mappingThisOnly*/ false);
                 var callSignatures = instantiateList(getSignaturesOfType(type.target, 0 /* Call */), type.mapper, instantiateSignature);
                 var constructSignatures = instantiateList(getSignaturesOfType(type.target, 1 /* Construct */), type.mapper, instantiateSignature);
-                var stringIndexType = instantiateType(getIndexTypeOfType(type.target, 0 /* String */), type.mapper);
-                var numberIndexType = instantiateType(getIndexTypeOfType(type.target, 1 /* Number */), type.mapper);
-                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexType, numberIndexType);
+                var stringIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, 0 /* String */), type.mapper);
+                var numberIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, 1 /* Number */), type.mapper);
+                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
             }
             else if (symbol.flags & 2048 /* TypeLiteral */) {
                 var members = symbol.members;
                 var callSignatures = getSignaturesOfSymbol(members["__call"]);
                 var constructSignatures = getSignaturesOfSymbol(members["__new"]);
-                var stringIndexType = getIndexTypeOfSymbol(symbol, 0 /* String */);
-                var numberIndexType = getIndexTypeOfSymbol(symbol, 1 /* Number */);
-                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexType, numberIndexType);
+                var stringIndexInfo = getIndexInfoOfSymbol(symbol, 0 /* String */);
+                var numberIndexInfo = getIndexInfoOfSymbol(symbol, 1 /* Number */);
+                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
             }
             else {
                 // Combinations of function, class, enum and module
@@ -17792,8 +18522,8 @@ var ts;
                         addInheritedMembers(members, getPropertiesOfObjectType(baseConstructorType));
                     }
                 }
-                var numberIndexType = (symbol.flags & 384 /* Enum */) ? stringType : undefined;
-                setObjectTypeMembers(type, members, emptyArray, constructSignatures, undefined, numberIndexType);
+                var numberIndexInfo = symbol.flags & 384 /* Enum */ ? enumNumberIndexInfo : undefined;
+                setObjectTypeMembers(type, members, emptyArray, constructSignatures, undefined, numberIndexInfo);
                 // We resolve the members before computing the signatures because a signature may use
                 // typeof with a qualified name expression that circularly references the type we are
                 // in the process of resolving (see issue #6072). The temporarily empty signature list
@@ -17898,7 +18628,7 @@ var ts;
                 type = globalBooleanType;
             }
             else if (type.flags & 16777216 /* ESSymbol */) {
-                type = globalESSymbolType;
+                type = getGlobalESSymbolType();
             }
             return type;
         }
@@ -17912,7 +18642,7 @@ var ts;
                 var type = getApparentType(current);
                 if (type !== unknownType) {
                     var prop = getPropertyOfType(type, name);
-                    if (prop && !(getDeclarationFlagsFromSymbol(prop) & (16 /* Private */ | 32 /* Protected */))) {
+                    if (prop && !(getDeclarationFlagsFromSymbol(prop) & (8 /* Private */ | 16 /* Protected */))) {
                         commonFlags &= prop.flags;
                         if (!props) {
                             props = [prop];
@@ -18002,17 +18732,48 @@ var ts;
         function getSignaturesOfType(type, kind) {
             return getSignaturesOfStructuredType(getApparentType(type), kind);
         }
-        function getIndexTypeOfStructuredType(type, kind) {
+        function getIndexInfoOfStructuredType(type, kind) {
             if (type.flags & 130048 /* StructuredType */) {
                 var resolved = resolveStructuredTypeMembers(type);
-                return kind === 0 /* String */ ? resolved.stringIndexType : resolved.numberIndexType;
+                return kind === 0 /* String */ ? resolved.stringIndexInfo : resolved.numberIndexInfo;
             }
         }
+        function getIndexTypeOfStructuredType(type, kind) {
+            var info = getIndexInfoOfStructuredType(type, kind);
+            return info && info.type;
+        }
+        // Return the indexing info of the given kind in the given type. Creates synthetic union index types when necessary and
+        // maps primitive types and type parameters are to their apparent types.
+        function getIndexInfoOfType(type, kind) {
+            return getIndexInfoOfStructuredType(getApparentType(type), kind);
+        }
         // Return the index type of the given kind in the given type. Creates synthetic union index types when necessary and
         // maps primitive types and type parameters are to their apparent types.
         function getIndexTypeOfType(type, kind) {
             return getIndexTypeOfStructuredType(getApparentType(type), kind);
         }
+        function getImplicitIndexTypeOfType(type, kind) {
+            if (isObjectLiteralType(type)) {
+                var propTypes = [];
+                for (var _i = 0, _a = getPropertiesOfType(type); _i < _a.length; _i++) {
+                    var prop = _a[_i];
+                    if (kind === 0 /* String */ || isNumericLiteralName(prop.name)) {
+                        propTypes.push(getTypeOfSymbol(prop));
+                    }
+                }
+                return getUnionType(propTypes);
+            }
+            return undefined;
+        }
+        function getTypeParametersFromJSDocTemplate(declaration) {
+            if (declaration.flags & 134217728 /* JavaScriptFile */) {
+                var templateTag = ts.getJSDocTemplateTag(declaration);
+                if (templateTag) {
+                    return getTypeParametersFromDeclaration(templateTag.typeParameters);
+                }
+            }
+            return undefined;
+        }
         // Return list of type parameters with duplicates removed (duplicate identifier errors are generated in the actual
         // type checking functions).
         function getTypeParametersFromDeclaration(typeParameterDeclarations) {
@@ -18035,6 +18796,20 @@ var ts;
             return result;
         }
         function isOptionalParameter(node) {
+            if (node.flags & 134217728 /* JavaScriptFile */) {
+                if (node.type && node.type.kind === 267 /* JSDocOptionalType */) {
+                    return true;
+                }
+                var paramTag = ts.getCorrespondingJSDocParameterTag(node);
+                if (paramTag) {
+                    if (paramTag.isBracketed) {
+                        return true;
+                    }
+                    if (paramTag.typeExpression) {
+                        return paramTag.typeExpression.type.kind === 267 /* JSDocOptionalType */;
+                    }
+                }
+            }
             if (ts.hasQuestionToken(node)) {
                 return true;
             }
@@ -18067,15 +18842,24 @@ var ts;
         function getSignatureFromDeclaration(declaration) {
             var links = getNodeLinks(declaration);
             if (!links.resolvedSignature) {
-                var classType = declaration.kind === 145 /* Constructor */ ?
+                var classType = declaration.kind === 147 /* Constructor */ ?
                     getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol))
                     : undefined;
                 var typeParameters = classType ? classType.localTypeParameters :
-                    declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) : undefined;
+                    declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) :
+                        getTypeParametersFromJSDocTemplate(declaration);
                 var parameters = [];
                 var hasStringLiterals = false;
                 var minArgumentCount = -1;
-                for (var i = 0, n = declaration.parameters.length; i < n; i++) {
+                var thisType = undefined;
+                var hasThisParameter = void 0;
+                var isJSConstructSignature = ts.isJSDocConstructSignature(declaration);
+                var returnType = undefined;
+                var typePredicate = undefined;
+                // If this is a JSDoc construct signature, then skip the first parameter in the
+                // parameter list.  The first parameter represents the return type of the construct
+                // signature.
+                for (var i = isJSConstructSignature ? 1 : 0, n = declaration.parameters.length; i < n; i++) {
                     var param = declaration.parameters[i];
                     var paramSymbol = param.symbol;
                     // Include parameter symbol instead of property symbol in the signature
@@ -18083,13 +18867,19 @@ var ts;
                         var resolvedSymbol = resolveName(param, paramSymbol.name, 107455 /* Value */, undefined, undefined);
                         paramSymbol = resolvedSymbol;
                     }
-                    parameters.push(paramSymbol);
-                    if (param.type && param.type.kind === 163 /* StringLiteralType */) {
+                    if (i === 0 && paramSymbol.name === "this") {
+                        hasThisParameter = true;
+                        thisType = param.type ? getTypeFromTypeNode(param.type) : unknownType;
+                    }
+                    else {
+                        parameters.push(paramSymbol);
+                    }
+                    if (param.type && param.type.kind === 165 /* StringLiteralType */) {
                         hasStringLiterals = true;
                     }
                     if (param.initializer || param.questionToken || param.dotDotDotToken) {
                         if (minArgumentCount < 0) {
-                            minArgumentCount = i;
+                            minArgumentCount = i - (hasThisParameter ? 1 : 0);
                         }
                     }
                     else {
@@ -18098,27 +18888,39 @@ var ts;
                     }
                 }
                 if (minArgumentCount < 0) {
-                    minArgumentCount = declaration.parameters.length;
+                    minArgumentCount = declaration.parameters.length - (hasThisParameter ? 1 : 0);
                 }
-                var returnType;
-                if (classType) {
+                if (isJSConstructSignature) {
+                    minArgumentCount--;
+                    returnType = getTypeFromTypeNode(declaration.parameters[0].type);
+                }
+                else if (classType) {
                     returnType = classType;
                 }
                 else if (declaration.type) {
                     returnType = getTypeFromTypeNode(declaration.type);
+                    if (declaration.type.kind === 153 /* TypePredicate */) {
+                        typePredicate = createTypePredicateFromTypePredicateNode(declaration.type);
+                    }
                 }
                 else {
+                    if (declaration.flags & 134217728 /* JavaScriptFile */) {
+                        var type = getReturnTypeFromJSDocComment(declaration);
+                        if (type && type !== unknownType) {
+                            returnType = type;
+                        }
+                    }
                     // TypeScript 1.0 spec (April 2014):
                     // If only one accessor includes a type annotation, the other behaves as if it had the same type annotation.
-                    if (declaration.kind === 146 /* GetAccessor */ && !ts.hasDynamicName(declaration)) {
-                        var setter = ts.getDeclarationOfKind(declaration.symbol, 147 /* SetAccessor */);
+                    if (declaration.kind === 148 /* GetAccessor */ && !ts.hasDynamicName(declaration)) {
+                        var setter = ts.getDeclarationOfKind(declaration.symbol, 149 /* SetAccessor */);
                         returnType = getAnnotatedAccessorType(setter);
                     }
                     if (!returnType && ts.nodeIsMissing(declaration.body)) {
                         returnType = anyType;
                     }
                 }
-                links.resolvedSignature = createSignature(declaration, typeParameters, parameters, returnType, minArgumentCount, ts.hasRestParameter(declaration), hasStringLiterals);
+                links.resolvedSignature = createSignature(declaration, typeParameters, thisType, parameters, returnType, typePredicate, minArgumentCount, ts.hasRestParameter(declaration), hasStringLiterals);
             }
             return links.resolvedSignature;
         }
@@ -18129,19 +18931,20 @@ var ts;
             for (var i = 0, len = symbol.declarations.length; i < len; i++) {
                 var node = symbol.declarations[i];
                 switch (node.kind) {
-                    case 153 /* FunctionType */:
-                    case 154 /* ConstructorType */:
-                    case 216 /* FunctionDeclaration */:
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
-                    case 145 /* Constructor */:
-                    case 148 /* CallSignature */:
-                    case 149 /* ConstructSignature */:
-                    case 150 /* IndexSignature */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
-                    case 176 /* FunctionExpression */:
-                    case 177 /* ArrowFunction */:
+                    case 155 /* FunctionType */:
+                    case 156 /* ConstructorType */:
+                    case 219 /* FunctionDeclaration */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
+                    case 147 /* Constructor */:
+                    case 150 /* CallSignature */:
+                    case 151 /* ConstructSignature */:
+                    case 152 /* IndexSignature */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
+                    case 178 /* FunctionExpression */:
+                    case 179 /* ArrowFunction */:
+                    case 268 /* JSDocFunctionType */:
                         // Don't include signature if node is the implementation of an overloaded function. A node is considered
                         // an implementation node if it has a body and the previous node is of the same kind and immediately
                         // precedes the implementation node (i.e. has the same parent and ends where the implementation starts).
@@ -18171,7 +18974,7 @@ var ts;
                 if (!pushTypeResolution(signature, 3 /* ResolvedReturnType */)) {
                     return unknownType;
                 }
-                var type;
+                var type = void 0;
                 if (signature.target) {
                     type = instantiateType(getReturnTypeOfSignature(signature.target), signature.mapper);
                 }
@@ -18228,7 +19031,7 @@ var ts;
             // object type literal or interface (using the new keyword). Each way of declaring a constructor
             // will result in a different declaration kind.
             if (!signature.isolatedSignatureType) {
-                var isConstructor = signature.declaration.kind === 145 /* Constructor */ || signature.declaration.kind === 149 /* ConstructSignature */;
+                var isConstructor = signature.declaration.kind === 147 /* Constructor */ || signature.declaration.kind === 151 /* ConstructSignature */;
                 var type = createObjectType(65536 /* Anonymous */ | 262144 /* FromSignature */);
                 type.members = emptySymbols;
                 type.properties = emptyArray;
@@ -18242,7 +19045,7 @@ var ts;
             return symbol.members["__index"];
         }
         function getIndexDeclarationOfSymbol(symbol, kind) {
-            var syntaxKind = kind === 1 /* Number */ ? 128 /* NumberKeyword */ : 130 /* StringKeyword */;
+            var syntaxKind = kind === 1 /* Number */ ? 129 /* NumberKeyword */ : 131 /* StringKeyword */;
             var indexSymbol = getIndexSymbol(symbol);
             if (indexSymbol) {
                 for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
@@ -18258,18 +19061,22 @@ var ts;
             }
             return undefined;
         }
-        function getIndexTypeOfSymbol(symbol, kind) {
+        function createIndexInfo(type, isReadonly, declaration) {
+            return { type: type, isReadonly: isReadonly, declaration: declaration };
+        }
+        function getIndexInfoOfSymbol(symbol, kind) {
             var declaration = getIndexDeclarationOfSymbol(symbol, kind);
-            return declaration
-                ? declaration.type ? getTypeFromTypeNode(declaration.type) : anyType
-                : undefined;
+            if (declaration) {
+                return createIndexInfo(declaration.type ? getTypeFromTypeNode(declaration.type) : anyType, (declaration.flags & 64 /* Readonly */) !== 0, declaration);
+            }
+            return undefined;
         }
         function getConstraintDeclaration(type) {
-            return ts.getDeclarationOfKind(type.symbol, 138 /* TypeParameter */).constraint;
+            return ts.getDeclarationOfKind(type.symbol, 140 /* TypeParameter */).constraint;
         }
         function hasConstraintReferenceTo(type, target) {
             var checked;
-            while (type && type.flags & 512 /* TypeParameter */ && !ts.contains(checked, type)) {
+            while (type && !(type.flags & 33554432 /* ThisType */) && type.flags & 512 /* TypeParameter */ && !ts.contains(checked, type)) {
                 if (type === target) {
                     return true;
                 }
@@ -18298,7 +19105,7 @@ var ts;
             return typeParameter.constraint === noConstraintType ? undefined : typeParameter.constraint;
         }
         function getParentSymbolOfTypeParameter(typeParameter) {
-            return getSymbolOfNode(ts.getDeclarationOfKind(typeParameter.symbol, 138 /* TypeParameter */).parent);
+            return getSymbolOfNode(ts.getDeclarationOfKind(typeParameter.symbol, 140 /* TypeParameter */).parent);
         }
         function getTypeListId(types) {
             if (types) {
@@ -18324,11 +19131,13 @@ var ts;
         // It is only necessary to do so if a constituent type might be the undefined type, the null type, the type
         // of an object literal or the anyFunctionType. This is because there are operations in the type checker
         // that care about the presence of such types at arbitrary depth in a containing type.
-        function getPropagatingFlagsOfTypes(types) {
+        function getPropagatingFlagsOfTypes(types, excludeKinds) {
             var result = 0;
             for (var _i = 0, types_3 = types; _i < types_3.length; _i++) {
                 var type = types_3[_i];
-                result |= type.flags;
+                if (!(type.flags & excludeKinds)) {
+                    result |= type.flags;
+                }
             }
             return result & 14680064 /* PropagatingFlags */;
         }
@@ -18336,7 +19145,8 @@ var ts;
             var id = getTypeListId(typeArguments);
             var type = target.instantiations[id];
             if (!type) {
-                var flags = 4096 /* Reference */ | (typeArguments ? getPropagatingFlagsOfTypes(typeArguments) : 0);
+                var propagatedFlags = typeArguments ? getPropagatingFlagsOfTypes(typeArguments, /*excludeKinds*/ 0) : 0;
+                var flags = 4096 /* Reference */ | propagatedFlags;
                 type = target.instantiations[id] = createObjectType(flags, target.symbol);
                 type.target = target;
                 type.typeArguments = typeArguments;
@@ -18345,7 +19155,7 @@ var ts;
         }
         // Get type from reference to class or interface
         function getTypeFromClassOrInterfaceReference(node, symbol) {
-            var type = getDeclaredTypeOfSymbol(symbol);
+            var type = getDeclaredTypeOfSymbol(getMergedSymbol(symbol));
             var typeParameters = type.localTypeParameters;
             if (typeParameters) {
                 if (!node.typeArguments || node.typeArguments.length !== typeParameters.length) {
@@ -18393,18 +19203,68 @@ var ts;
             }
             return getDeclaredTypeOfSymbol(symbol);
         }
+        function getTypeReferenceName(node) {
+            switch (node.kind) {
+                case 154 /* TypeReference */:
+                    return node.typeName;
+                case 266 /* JSDocTypeReference */:
+                    return node.name;
+                case 193 /* ExpressionWithTypeArguments */:
+                    // We only support expressions that are simple qualified names. For other
+                    // expressions this produces undefined.
+                    if (ts.isSupportedExpressionWithTypeArguments(node)) {
+                        return node.expression;
+                    }
+            }
+            return undefined;
+        }
+        function resolveTypeReferenceName(node, typeReferenceName) {
+            if (!typeReferenceName) {
+                return unknownSymbol;
+            }
+            return resolveEntityName(typeReferenceName, 793056 /* Type */) || unknownSymbol;
+        }
+        function getTypeReferenceType(node, symbol) {
+            if (symbol === unknownSymbol) {
+                return unknownType;
+            }
+            if (symbol.flags & (32 /* Class */ | 64 /* Interface */)) {
+                return getTypeFromClassOrInterfaceReference(node, symbol);
+            }
+            if (symbol.flags & 524288 /* TypeAlias */) {
+                return getTypeFromTypeAliasReference(node, symbol);
+            }
+            if (symbol.flags & 107455 /* Value */ && node.kind === 266 /* JSDocTypeReference */) {
+                // A JSDocTypeReference may have resolved to a value (as opposed to a type). In
+                // that case, the type of this reference is just the type of the value we resolved
+                // to.
+                return getTypeOfSymbol(symbol);
+            }
+            return getTypeFromNonGenericTypeReference(node, symbol);
+        }
         function getTypeFromTypeReference(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                // We only support expressions that are simple qualified names. For other expressions this produces undefined.
-                var typeNameOrExpression = node.kind === 152 /* TypeReference */ ? node.typeName :
-                    ts.isSupportedExpressionWithTypeArguments(node) ? node.expression :
-                        undefined;
-                var symbol = typeNameOrExpression && resolveEntityName(typeNameOrExpression, 793056 /* Type */) || unknownSymbol;
-                var type = symbol === unknownSymbol ? unknownType :
-                    symbol.flags & (32 /* Class */ | 64 /* Interface */) ? getTypeFromClassOrInterfaceReference(node, symbol) :
-                        symbol.flags & 524288 /* TypeAlias */ ? getTypeFromTypeAliasReference(node, symbol) :
-                            getTypeFromNonGenericTypeReference(node, symbol);
+                var symbol = void 0;
+                var type = void 0;
+                if (node.kind === 266 /* JSDocTypeReference */) {
+                    var typeReferenceName = getTypeReferenceName(node);
+                    symbol = resolveTypeReferenceName(node, typeReferenceName);
+                    type = getTypeReferenceType(node, symbol);
+                    links.resolvedSymbol = symbol;
+                    links.resolvedType = type;
+                }
+                else {
+                    // We only support expressions that are simple qualified names. For other expressions this produces undefined.
+                    var typeNameOrExpression = node.kind === 154 /* TypeReference */ ? node.typeName :
+                        ts.isSupportedExpressionWithTypeArguments(node) ? node.expression :
+                            undefined;
+                    symbol = typeNameOrExpression && resolveEntityName(typeNameOrExpression, 793056 /* Type */) || unknownSymbol;
+                    type = symbol === unknownSymbol ? unknownType :
+                        symbol.flags & (32 /* Class */ | 64 /* Interface */) ? getTypeFromClassOrInterfaceReference(node, symbol) :
+                            symbol.flags & 524288 /* TypeAlias */ ? getTypeFromTypeAliasReference(node, symbol) :
+                                getTypeFromNonGenericTypeReference(node, symbol);
+                }
                 // Cache both the resolved symbol and the resolved type. The resolved symbol is needed in when we check the
                 // type reference in checkTypeReferenceOrExpressionWithTypeArguments.
                 links.resolvedSymbol = symbol;
@@ -18429,9 +19289,9 @@ var ts;
                 for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
                     var declaration = declarations_3[_i];
                     switch (declaration.kind) {
-                        case 217 /* ClassDeclaration */:
-                        case 218 /* InterfaceDeclaration */:
-                        case 220 /* EnumDeclaration */:
+                        case 220 /* ClassDeclaration */:
+                        case 221 /* InterfaceDeclaration */:
+                        case 223 /* EnumDeclaration */:
                             return declaration;
                     }
                 }
@@ -18472,9 +19332,6 @@ var ts;
             var typeSymbol = namespaceSymbol && getSymbol(namespaceSymbol.exports, name, 793056 /* Type */);
             return typeSymbol && getDeclaredTypeOfSymbol(typeSymbol);
         }
-        function getGlobalESSymbolConstructorSymbol() {
-            return globalESSymbolConstructorSymbol || (globalESSymbolConstructorSymbol = getGlobalValueSymbol("Symbol"));
-        }
         /**
           * Creates a TypeReference for a generic `TypedPropertyDescriptor<T>`.
           */
@@ -18491,10 +19348,10 @@ var ts;
             return genericGlobalType !== emptyGenericType ? createTypeReference(genericGlobalType, typeArguments) : emptyObjectType;
         }
         function createIterableType(elementType) {
-            return createTypeFromGenericGlobalType(globalIterableType, [elementType]);
+            return createTypeFromGenericGlobalType(getGlobalIterableType(), [elementType]);
         }
         function createIterableIteratorType(elementType) {
-            return createTypeFromGenericGlobalType(globalIterableIteratorType, [elementType]);
+            return createTypeFromGenericGlobalType(getGlobalIterableIteratorType(), [elementType]);
         }
         function createArrayType(elementType) {
             return createTypeFromGenericGlobalType(globalArrayType, [elementType]);
@@ -18511,7 +19368,8 @@ var ts;
             return tupleTypes[id] || (tupleTypes[id] = createNewTupleType(elementTypes));
         }
         function createNewTupleType(elementTypes) {
-            var type = createObjectType(8192 /* Tuple */ | getPropagatingFlagsOfTypes(elementTypes));
+            var propagatedFlags = getPropagatingFlagsOfTypes(elementTypes, /*excludeKinds*/ 0);
+            var type = createObjectType(8192 /* Tuple */ | propagatedFlags);
             type.elementTypes = elementTypes;
             return type;
         }
@@ -18526,6 +19384,14 @@ var ts;
             if (type.flags & typeSetKind) {
                 addTypesToSet(typeSet, type.types, typeSetKind);
             }
+            else if (type.flags & (1 /* Any */ | 32 /* Undefined */ | 64 /* Null */)) {
+                if (type.flags & 1 /* Any */)
+                    typeSet.containsAny = true;
+                if (type.flags & 32 /* Undefined */)
+                    typeSet.containsUndefined = true;
+                if (type.flags & 64 /* Null */)
+                    typeSet.containsNull = true;
+            }
             else if (!ts.contains(typeSet, type)) {
                 typeSet.push(type);
             }
@@ -18555,24 +19421,6 @@ var ts;
                 }
             }
         }
-        function containsTypeAny(types) {
-            for (var _i = 0, types_5 = types; _i < types_5.length; _i++) {
-                var type = types_5[_i];
-                if (isTypeAny(type)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-        function removeAllButLast(types, typeToRemove) {
-            var i = types.length;
-            while (i > 0 && types.length > 1) {
-                i--;
-                if (types[i] === typeToRemove) {
-                    types.splice(i, 1);
-                }
-            }
-        }
         // We reduce the constituent type set to only include types that aren't subtypes of other types, unless
         // the noSubtypeReduction flag is specified, in which case we perform a simple deduplication based on
         // object identity. Subtype reduction is possible only when union types are known not to circularly
@@ -18586,23 +19434,29 @@ var ts;
             }
             var typeSet = [];
             addTypesToSet(typeSet, types, 16384 /* Union */);
-            if (containsTypeAny(typeSet)) {
+            if (typeSet.containsAny) {
                 return anyType;
             }
-            if (noSubtypeReduction) {
-                removeAllButLast(typeSet, undefinedType);
-                removeAllButLast(typeSet, nullType);
+            if (strictNullChecks) {
+                if (typeSet.containsNull)
+                    typeSet.push(nullType);
+                if (typeSet.containsUndefined)
+                    typeSet.push(undefinedType);
             }
-            else {
+            if (!noSubtypeReduction) {
                 removeSubtypes(typeSet);
             }
-            if (typeSet.length === 1) {
+            if (typeSet.length === 0) {
+                return typeSet.containsNull ? nullType : undefinedType;
+            }
+            else if (typeSet.length === 1) {
                 return typeSet[0];
             }
             var id = getTypeListId(typeSet);
             var type = unionTypes[id];
             if (!type) {
-                type = unionTypes[id] = createObjectType(16384 /* Union */ | getPropagatingFlagsOfTypes(typeSet));
+                var propagatedFlags = getPropagatingFlagsOfTypes(typeSet, /*excludeKinds*/ 96 /* Nullable */);
+                type = unionTypes[id] = createObjectType(16384 /* Union */ | propagatedFlags);
                 type.types = typeSet;
             }
             return type;
@@ -18625,16 +19479,23 @@ var ts;
             }
             var typeSet = [];
             addTypesToSet(typeSet, types, 32768 /* Intersection */);
-            if (containsTypeAny(typeSet)) {
+            if (typeSet.containsAny) {
                 return anyType;
             }
+            if (strictNullChecks) {
+                if (typeSet.containsNull)
+                    typeSet.push(nullType);
+                if (typeSet.containsUndefined)
+                    typeSet.push(undefinedType);
+            }
             if (typeSet.length === 1) {
                 return typeSet[0];
             }
             var id = getTypeListId(typeSet);
             var type = intersectionTypes[id];
             if (!type) {
-                type = intersectionTypes[id] = createObjectType(32768 /* Intersection */ | getPropagatingFlagsOfTypes(typeSet));
+                var propagatedFlags = getPropagatingFlagsOfTypes(typeSet, /*excludeKinds*/ 96 /* Nullable */);
+                type = intersectionTypes[id] = createObjectType(32768 /* Intersection */ | propagatedFlags);
                 type.types = typeSet;
             }
             return type;
@@ -18669,12 +19530,28 @@ var ts;
             }
             return links.resolvedType;
         }
+        function getTypeFromJSDocVariadicType(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                var type = getTypeFromTypeNode(node.type);
+                links.resolvedType = type ? createArrayType(type) : unknownType;
+            }
+            return links.resolvedType;
+        }
+        function getTypeFromJSDocTupleType(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                var types = ts.map(node.types, getTypeFromTypeNode);
+                links.resolvedType = createTupleType(types);
+            }
+            return links.resolvedType;
+        }
         function getThisType(node) {
             var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
             var parent = container && container.parent;
-            if (parent && (ts.isClassLike(parent) || parent.kind === 218 /* InterfaceDeclaration */)) {
-                if (!(container.flags & 64 /* Static */) &&
-                    (container.kind !== 145 /* Constructor */ || ts.isNodeDescendentOf(node, container.body))) {
+            if (parent && (ts.isClassLike(parent) || parent.kind === 221 /* InterfaceDeclaration */)) {
+                if (!(container.flags & 32 /* Static */) &&
+                    (container.kind !== 147 /* Constructor */ || ts.isNodeDescendentOf(node, container.body))) {
                     return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
                 }
             }
@@ -18688,68 +19565,72 @@ var ts;
             }
             return links.resolvedType;
         }
-        function getPredicateType(node) {
-            return createPredicateType(getSymbolOfNode(node), createTypePredicateFromTypePredicateNode(node));
-        }
-        function createPredicateType(symbol, predicate) {
-            var type = createType(8 /* Boolean */ | 134217728 /* PredicateType */);
-            type.symbol = symbol;
-            type.predicate = predicate;
-            return type;
-        }
-        function getTypeFromPredicateTypeNode(node) {
-            var links = getNodeLinks(node);
-            if (!links.resolvedType) {
-                links.resolvedType = getPredicateType(node);
-            }
-            return links.resolvedType;
-        }
         function getTypeFromTypeNode(node) {
             switch (node.kind) {
                 case 117 /* AnyKeyword */:
+                case 257 /* JSDocAllType */:
+                case 258 /* JSDocUnknownType */:
                     return anyType;
-                case 130 /* StringKeyword */:
+                case 131 /* StringKeyword */:
                     return stringType;
-                case 128 /* NumberKeyword */:
+                case 129 /* NumberKeyword */:
                     return numberType;
                 case 120 /* BooleanKeyword */:
                     return booleanType;
-                case 131 /* SymbolKeyword */:
+                case 132 /* SymbolKeyword */:
                     return esSymbolType;
                 case 103 /* VoidKeyword */:
                     return voidType;
-                case 162 /* ThisType */:
+                case 134 /* UndefinedKeyword */:
+                    return undefinedType;
+                case 93 /* NullKeyword */:
+                    return nullType;
+                case 164 /* ThisType */:
                     return getTypeFromThisTypeNode(node);
-                case 163 /* StringLiteralType */:
+                case 165 /* StringLiteralType */:
                     return getTypeFromStringLiteralTypeNode(node);
-                case 152 /* TypeReference */:
+                case 154 /* TypeReference */:
+                case 266 /* JSDocTypeReference */:
                     return getTypeFromTypeReference(node);
-                case 151 /* TypePredicate */:
-                    return getTypeFromPredicateTypeNode(node);
-                case 191 /* ExpressionWithTypeArguments */:
+                case 153 /* TypePredicate */:
+                    return booleanType;
+                case 193 /* ExpressionWithTypeArguments */:
                     return getTypeFromTypeReference(node);
-                case 155 /* TypeQuery */:
+                case 157 /* TypeQuery */:
                     return getTypeFromTypeQueryNode(node);
-                case 157 /* ArrayType */:
+                case 159 /* ArrayType */:
+                case 259 /* JSDocArrayType */:
                     return getTypeFromArrayTypeNode(node);
-                case 158 /* TupleType */:
+                case 160 /* TupleType */:
                     return getTypeFromTupleTypeNode(node);
-                case 159 /* UnionType */:
+                case 161 /* UnionType */:
+                case 260 /* JSDocUnionType */:
                     return getTypeFromUnionTypeNode(node);
-                case 160 /* IntersectionType */:
+                case 162 /* IntersectionType */:
                     return getTypeFromIntersectionTypeNode(node);
-                case 161 /* ParenthesizedType */:
+                case 163 /* ParenthesizedType */:
+                case 262 /* JSDocNullableType */:
+                case 263 /* JSDocNonNullableType */:
+                case 270 /* JSDocConstructorType */:
+                case 271 /* JSDocThisType */:
+                case 267 /* JSDocOptionalType */:
                     return getTypeFromTypeNode(node.type);
-                case 153 /* FunctionType */:
-                case 154 /* ConstructorType */:
-                case 156 /* TypeLiteral */:
+                case 155 /* FunctionType */:
+                case 156 /* ConstructorType */:
+                case 158 /* TypeLiteral */:
+                case 268 /* JSDocFunctionType */:
+                case 264 /* JSDocRecordType */:
                     return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
                 // This function assumes that an identifier or qualified name is a type expression
                 // Callers should first ensure this by calling isTypeNode
                 case 69 /* Identifier */:
-                case 136 /* QualifiedName */:
+                case 138 /* QualifiedName */:
                     var symbol = getSymbolAtLocation(node);
                     return symbol && getDeclaredTypeOfSymbol(symbol);
+                case 261 /* JSDocTupleType */:
+                    return getTypeFromJSDocTupleType(node);
+                case 269 /* JSDocVariadicType */:
+                    return getTypeFromJSDocVariadicType(node);
                 default:
                     return unknownType;
             }
@@ -18771,40 +19652,26 @@ var ts;
         function createBinaryTypeMapper(source1, target1, source2, target2) {
             return function (t) { return t === source1 ? target1 : t === source2 ? target2 : t; };
         }
-        function createTypeMapper(sources, targets) {
-            switch (sources.length) {
-                case 1: return createUnaryTypeMapper(sources[0], targets[0]);
-                case 2: return createBinaryTypeMapper(sources[0], targets[0], sources[1], targets[1]);
-            }
+        function createArrayTypeMapper(sources, targets) {
             return function (t) {
                 for (var i = 0; i < sources.length; i++) {
                     if (t === sources[i]) {
-                        return targets[i];
+                        return targets ? targets[i] : anyType;
                     }
                 }
                 return t;
             };
         }
-        function createUnaryTypeEraser(source) {
-            return function (t) { return t === source ? anyType : t; };
-        }
-        function createBinaryTypeEraser(source1, source2) {
-            return function (t) { return t === source1 || t === source2 ? anyType : t; };
+        function createTypeMapper(sources, targets) {
+            var count = sources.length;
+            var mapper = count == 1 ? createUnaryTypeMapper(sources[0], targets ? targets[0] : anyType) :
+                count == 2 ? createBinaryTypeMapper(sources[0], targets ? targets[0] : anyType, sources[1], targets ? targets[1] : anyType) :
+                    createArrayTypeMapper(sources, targets);
+            mapper.mappedTypes = sources;
+            return mapper;
         }
         function createTypeEraser(sources) {
-            switch (sources.length) {
-                case 1: return createUnaryTypeEraser(sources[0]);
-                case 2: return createBinaryTypeEraser(sources[0], sources[1]);
-            }
-            return function (t) {
-                for (var _i = 0, sources_1 = sources; _i < sources_1.length; _i++) {
-                    var source = sources_1[_i];
-                    if (t === source) {
-                        return anyType;
-                    }
-                }
-                return t;
-            };
+            return createTypeMapper(sources, undefined);
         }
         function getInferenceMapper(context) {
             if (!context.mapper) {
@@ -18818,6 +19685,7 @@ var ts;
                     }
                     return t;
                 };
+                mapper.mappedTypes = context.typeParameters;
                 mapper.context = context;
                 context.mapper = mapper;
             }
@@ -18827,7 +19695,9 @@ var ts;
             return type;
         }
         function combineTypeMappers(mapper1, mapper2) {
-            return function (t) { return instantiateType(mapper1(t), mapper2); };
+            var mapper = function (t) { return instantiateType(mapper1(t), mapper2); };
+            mapper.mappedTypes = mapper1.mappedTypes;
+            return mapper;
         }
         function cloneTypeParameter(typeParameter) {
             var result = createType(512 /* TypeParameter */);
@@ -18853,6 +19723,7 @@ var ts;
         }
         function instantiateSignature(signature, mapper, eraseTypeParameters) {
             var freshTypeParameters;
+            var freshTypePredicate;
             if (signature.typeParameters && !eraseTypeParameters) {
                 // First create a fresh set of type parameters, then include a mapping from the old to the
                 // new type parameters in the mapper function. Finally store this mapper in the new type
@@ -18864,7 +19735,10 @@ var ts;
                     tp.mapper = mapper;
                 }
             }
-            var result = createSignature(signature.declaration, freshTypeParameters, instantiateList(signature.parameters, mapper, instantiateSymbol), instantiateType(signature.resolvedReturnType, mapper), signature.minArgumentCount, signature.hasRestParameter, signature.hasStringLiterals);
+            if (signature.typePredicate) {
+                freshTypePredicate = cloneTypePredicate(signature.typePredicate, mapper);
+            }
+            var result = createSignature(signature.declaration, freshTypeParameters, signature.thisType && instantiateType(signature.thisType, mapper), instantiateList(signature.parameters, mapper, instantiateSymbol), instantiateType(signature.resolvedReturnType, mapper), freshTypePredicate, signature.minArgumentCount, signature.hasRestParameter, signature.hasStringLiterals);
             result.target = signature;
             result.mapper = mapper;
             return result;
@@ -18907,13 +19781,70 @@ var ts;
             mapper.instantiations[type.id] = result;
             return result;
         }
+        function isSymbolInScopeOfMappedTypeParameter(symbol, mapper) {
+            var mappedTypes = mapper.mappedTypes;
+            // Starting with the parent of the symbol's declaration, check if the mapper maps any of
+            // the type parameters introduced by enclosing declarations. We just pick the first
+            // declaration since multiple declarations will all have the same parent anyway.
+            var node = symbol.declarations[0].parent;
+            while (node) {
+                switch (node.kind) {
+                    case 155 /* FunctionType */:
+                    case 156 /* ConstructorType */:
+                    case 219 /* FunctionDeclaration */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
+                    case 147 /* Constructor */:
+                    case 150 /* CallSignature */:
+                    case 151 /* ConstructSignature */:
+                    case 152 /* IndexSignature */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
+                    case 178 /* FunctionExpression */:
+                    case 179 /* ArrowFunction */:
+                    case 220 /* ClassDeclaration */:
+                    case 191 /* ClassExpression */:
+                    case 221 /* InterfaceDeclaration */:
+                    case 222 /* TypeAliasDeclaration */:
+                        var declaration = node;
+                        if (declaration.typeParameters) {
+                            for (var _i = 0, _a = declaration.typeParameters; _i < _a.length; _i++) {
+                                var d = _a[_i];
+                                if (ts.contains(mappedTypes, getDeclaredTypeOfTypeParameter(d.symbol))) {
+                                    return true;
+                                }
+                            }
+                        }
+                        if (ts.isClassLike(node) || node.kind === 221 /* InterfaceDeclaration */) {
+                            var thisType = getDeclaredTypeOfClassOrInterface(getSymbolOfNode(node)).thisType;
+                            if (thisType && ts.contains(mappedTypes, thisType)) {
+                                return true;
+                            }
+                        }
+                        break;
+                    case 224 /* ModuleDeclaration */:
+                    case 255 /* SourceFile */:
+                        return false;
+                }
+                node = node.parent;
+            }
+            return false;
+        }
         function instantiateType(type, mapper) {
             if (type && mapper !== identityMapper) {
                 if (type.flags & 512 /* TypeParameter */) {
                     return mapper(type);
                 }
                 if (type.flags & 65536 /* Anonymous */) {
-                    return type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) ?
+                    // If the anonymous type originates in a declaration of a function, method, class, or
+                    // interface, in an object type literal, or in an object literal expression, we may need
+                    // to instantiate the type because it might reference a type parameter. We skip instantiation
+                    // if none of the type parameters that are in scope in the type's declaration are mapped by
+                    // the given mapper, however we can only do that analysis if the type isn't itself an
+                    // instantiation.
+                    return type.symbol &&
+                        type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) &&
+                        (type.flags & 131072 /* Instantiated */ || isSymbolInScopeOfMappedTypeParameter(type.symbol, mapper)) ?
                         instantiateAnonymousType(type, mapper) : type;
                 }
                 if (type.flags & 4096 /* Reference */) {
@@ -18928,43 +19859,44 @@ var ts;
                 if (type.flags & 32768 /* Intersection */) {
                     return getIntersectionType(instantiateList(type.types, mapper, instantiateType));
                 }
-                if (type.flags & 134217728 /* PredicateType */) {
-                    var predicate = type.predicate;
-                    return createPredicateType(type.symbol, cloneTypePredicate(predicate, mapper));
-                }
             }
             return type;
         }
+        function instantiateIndexInfo(info, mapper) {
+            return info && createIndexInfo(instantiateType(info.type, mapper), info.isReadonly, info.declaration);
+        }
         // Returns true if the given expression contains (at any level of nesting) a function or arrow expression
         // that is subject to contextual typing.
         function isContextSensitive(node) {
-            ts.Debug.assert(node.kind !== 144 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 146 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             switch (node.kind) {
-                case 176 /* FunctionExpression */:
-                case 177 /* ArrowFunction */:
+                case 178 /* FunctionExpression */:
+                case 179 /* ArrowFunction */:
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 168 /* ObjectLiteralExpression */:
+                case 170 /* ObjectLiteralExpression */:
                     return ts.forEach(node.properties, isContextSensitive);
-                case 167 /* ArrayLiteralExpression */:
+                case 169 /* ArrayLiteralExpression */:
                     return ts.forEach(node.elements, isContextSensitive);
-                case 185 /* ConditionalExpression */:
+                case 187 /* ConditionalExpression */:
                     return isContextSensitive(node.whenTrue) ||
                         isContextSensitive(node.whenFalse);
-                case 184 /* BinaryExpression */:
+                case 186 /* BinaryExpression */:
                     return node.operatorToken.kind === 52 /* BarBarToken */ &&
                         (isContextSensitive(node.left) || isContextSensitive(node.right));
-                case 248 /* PropertyAssignment */:
+                case 252 /* PropertyAssignment */:
                     return isContextSensitive(node.initializer);
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 175 /* ParenthesizedExpression */:
+                case 177 /* ParenthesizedExpression */:
                     return isContextSensitive(node.expression);
             }
             return false;
         }
         function isContextSensitiveFunctionLikeDeclaration(node) {
-            return !node.typeParameters && node.parameters.length && !ts.forEach(node.parameters, function (p) { return p.type; });
+            var areAllParametersUntyped = !ts.forEach(node.parameters, function (p) { return p.type; });
+            var isNullaryArrow = node.kind === 179 /* ArrowFunction */ && !node.parameters.length;
+            return !node.typeParameters && areAllParametersUntyped && !isNullaryArrow;
         }
         function getTypeWithoutSignatures(type) {
             if (type.flags & 80896 /* ObjectType */) {
@@ -18996,12 +19928,26 @@ var ts;
         function isTypeAssignableTo(source, target) {
             return checkTypeAssignableTo(source, target, /*errorNode*/ undefined);
         }
+        /**
+         * This is *not* a bi-directional relationship.
+         * If one needs to check both directions for comparability, use a second call to this function or 'checkTypeComparableTo'.
+         */
+        function isTypeComparableTo(source, target) {
+            return checkTypeComparableTo(source, target, /*errorNode*/ undefined);
+        }
         function checkTypeSubtypeOf(source, target, errorNode, headMessage, containingMessageChain) {
             return checkTypeRelatedTo(source, target, subtypeRelation, errorNode, headMessage, containingMessageChain);
         }
         function checkTypeAssignableTo(source, target, errorNode, headMessage, containingMessageChain) {
             return checkTypeRelatedTo(source, target, assignableRelation, errorNode, headMessage, containingMessageChain);
         }
+        /**
+         * This is *not* a bi-directional relationship.
+         * If one needs to check both directions for comparability, use a second call to this function or 'isTypeComparableTo'.
+         */
+        function checkTypeComparableTo(source, target, errorNode, headMessage, containingMessageChain) {
+            return checkTypeRelatedTo(source, target, comparableRelation, errorNode, headMessage, containingMessageChain);
+        }
         function isSignatureAssignableTo(source, target, ignoreReturnTypes) {
             return compareSignaturesRelated(source, target, ignoreReturnTypes, /*reportErrors*/ false, /*errorReporter*/ undefined, compareTypesAssignable) !== 0 /* False */;
         }
@@ -19021,15 +19967,27 @@ var ts;
             source = getErasedSignature(source);
             target = getErasedSignature(target);
             var result = -1 /* True */;
+            if (source.thisType && target.thisType && source.thisType !== voidType) {
+                // void sources are assignable to anything.
+                var related = compareTypes(source.thisType, target.thisType, /*reportErrors*/ false)
+                    || compareTypes(target.thisType, source.thisType, reportErrors);
+                if (!related) {
+                    if (reportErrors) {
+                        errorReporter(ts.Diagnostics.The_this_types_of_each_signature_are_incompatible);
+                    }
+                    return 0 /* False */;
+                }
+                result &= related;
+            }
             var sourceMax = getNumNonRestParameters(source);
             var targetMax = getNumNonRestParameters(target);
             var checkCount = getNumParametersToCheckForSignatureRelatability(source, sourceMax, target, targetMax);
             var sourceParams = source.parameters;
             var targetParams = target.parameters;
             for (var i = 0; i < checkCount; i++) {
-                var s = i < sourceMax ? getTypeOfSymbol(sourceParams[i]) : getRestTypeOfSignature(source);
-                var t = i < targetMax ? getTypeOfSymbol(targetParams[i]) : getRestTypeOfSignature(target);
-                var related = compareTypes(t, s, /*reportErrors*/ false) || compareTypes(s, t, reportErrors);
+                var s = i < sourceMax ? getTypeOfParameter(sourceParams[i]) : getRestTypeOfSignature(source);
+                var t = i < targetMax ? getTypeOfParameter(targetParams[i]) : getRestTypeOfSignature(target);
+                var related = compareTypes(s, t, /*reportErrors*/ false) || compareTypes(t, s, reportErrors);
                 if (!related) {
                     if (reportErrors) {
                         errorReporter(ts.Diagnostics.Types_of_parameters_0_and_1_are_incompatible, sourceParams[i < sourceMax ? i : sourceMax].name, targetParams[i < targetMax ? i : targetMax].name);
@@ -19045,18 +20003,48 @@ var ts;
                 }
                 var sourceReturnType = getReturnTypeOfSignature(source);
                 // The following block preserves behavior forbidding boolean returning functions from being assignable to type guard returning functions
-                if (targetReturnType.flags & 134217728 /* PredicateType */ && targetReturnType.predicate.kind === 1 /* Identifier */) {
-                    if (!(sourceReturnType.flags & 134217728 /* PredicateType */)) {
+                if (target.typePredicate) {
+                    if (source.typePredicate) {
+                        result &= compareTypePredicateRelatedTo(source.typePredicate, target.typePredicate, reportErrors, errorReporter, compareTypes);
+                    }
+                    else if (ts.isIdentifierTypePredicate(target.typePredicate)) {
                         if (reportErrors) {
                             errorReporter(ts.Diagnostics.Signature_0_must_have_a_type_predicate, signatureToString(source));
                         }
                         return 0 /* False */;
                     }
                 }
-                result &= compareTypes(sourceReturnType, targetReturnType, reportErrors);
+                else {
+                    result &= compareTypes(sourceReturnType, targetReturnType, reportErrors);
+                }
             }
             return result;
         }
+        function compareTypePredicateRelatedTo(source, target, reportErrors, errorReporter, compareTypes) {
+            if (source.kind !== target.kind) {
+                if (reportErrors) {
+                    errorReporter(ts.Diagnostics.A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard);
+                    errorReporter(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
+                }
+                return 0 /* False */;
+            }
+            if (source.kind === 1 /* Identifier */) {
+                var sourceIdentifierPredicate = source;
+                var targetIdentifierPredicate = target;
+                if (sourceIdentifierPredicate.parameterIndex !== targetIdentifierPredicate.parameterIndex) {
+                    if (reportErrors) {
+                        errorReporter(ts.Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, sourceIdentifierPredicate.parameterName, targetIdentifierPredicate.parameterName);
+                        errorReporter(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
+                    }
+                    return 0 /* False */;
+                }
+            }
+            var related = compareTypes(source.type, target.type, reportErrors);
+            if (related === 0 /* False */ && reportErrors) {
+                errorReporter(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
+            }
+            return related;
+        }
         function isImplementationCompatibleWithOverload(implementation, overload) {
             var erasedSource = getErasedSignature(implementation);
             var erasedTarget = getErasedSignature(overload);
@@ -19098,7 +20086,7 @@ var ts;
          * Checks if 'source' is related to 'target' (e.g.: is a assignable to).
          * @param source The left-hand-side of the relation.
          * @param target The right-hand-side of the relation.
-         * @param relation The relation considered. One of 'identityRelation', 'assignableRelation', or 'subTypeRelation'.
+         * @param relation The relation considered. One of 'identityRelation', 'subtypeRelation', 'assignableRelation', or 'comparableRelation'.
          * Used as both to determine which checks are performed and as a cache of previously computed results.
          * @param errorNode The suggested node upon which all errors will be reported, if defined. This may or may not be the actual node used.
          * @param headMessage If the error chain should be prepended by a head message, then headMessage will be used.
@@ -19135,7 +20123,12 @@ var ts;
                     sourceType = typeToString(source, /*enclosingDeclaration*/ undefined, 128 /* UseFullyQualifiedType */);
                     targetType = typeToString(target, /*enclosingDeclaration*/ undefined, 128 /* UseFullyQualifiedType */);
                 }
-                reportError(message || ts.Diagnostics.Type_0_is_not_assignable_to_type_1, sourceType, targetType);
+                if (!message) {
+                    message = relation === comparableRelation ?
+                        ts.Diagnostics.Type_0_is_not_comparable_to_type_1 :
+                        ts.Diagnostics.Type_0_is_not_assignable_to_type_1;
+                }
+                reportError(message, sourceType, targetType);
             }
             // Compare two types and return
             // Ternary.True if they are related with no assumptions,
@@ -19151,53 +20144,30 @@ var ts;
                 }
                 if (isTypeAny(target))
                     return -1 /* True */;
-                if (source === undefinedType)
-                    return -1 /* True */;
-                if (source === nullType && target !== undefinedType)
-                    return -1 /* True */;
+                if (source.flags & 32 /* Undefined */) {
+                    if (!strictNullChecks || target.flags & (32 /* Undefined */ | 16 /* Void */) || source === emptyArrayElementType)
+                        return -1 /* True */;
+                }
+                if (source.flags & 64 /* Null */) {
+                    if (!strictNullChecks || target.flags & 64 /* Null */)
+                        return -1 /* True */;
+                }
                 if (source.flags & 128 /* Enum */ && target === numberType)
                     return -1 /* True */;
                 if (source.flags & 128 /* Enum */ && target.flags & 128 /* Enum */) {
-                    if (result = enumRelatedTo(source, target)) {
+                    if (result = enumRelatedTo(source, target, reportErrors)) {
                         return result;
                     }
                 }
                 if (source.flags & 256 /* StringLiteral */ && target === stringType)
                     return -1 /* True */;
-                if (relation === assignableRelation) {
+                if (relation === assignableRelation || relation === comparableRelation) {
                     if (isTypeAny(source))
                         return -1 /* True */;
                     if (source === numberType && target.flags & 128 /* Enum */)
                         return -1 /* True */;
                 }
                 if (source.flags & 8 /* Boolean */ && target.flags & 8 /* Boolean */) {
-                    if (source.flags & 134217728 /* PredicateType */ && target.flags & 134217728 /* PredicateType */) {
-                        var sourcePredicate = source;
-                        var targetPredicate = target;
-                        if (sourcePredicate.predicate.kind !== targetPredicate.predicate.kind) {
-                            if (reportErrors) {
-                                reportError(ts.Diagnostics.A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard);
-                                reportError(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typeToString(source), typeToString(target));
-                            }
-                            return 0 /* False */;
-                        }
-                        if (sourcePredicate.predicate.kind === 1 /* Identifier */) {
-                            var sourceIdentifierPredicate = sourcePredicate.predicate;
-                            var targetIdentifierPredicate = targetPredicate.predicate;
-                            if (sourceIdentifierPredicate.parameterIndex !== targetIdentifierPredicate.parameterIndex) {
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, sourceIdentifierPredicate.parameterName, targetIdentifierPredicate.parameterName);
-                                    reportError(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typeToString(source), typeToString(target));
-                                }
-                                return 0 /* False */;
-                            }
-                        }
-                        var related = isRelatedTo(sourcePredicate.predicate.type, targetPredicate.predicate.type, reportErrors, headMessage);
-                        if (related === 0 /* False */ && reportErrors) {
-                            reportError(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typeToString(source), typeToString(target));
-                        }
-                        return related;
-                    }
                     return -1 /* True */;
                 }
                 if (source.flags & 1048576 /* FreshObjectLiteral */) {
@@ -19216,29 +20186,48 @@ var ts;
                     }
                 }
                 var saveErrorInfo = errorInfo;
-                // Note that the "each" checks must precede the "some" checks to produce the correct results
+                // Note that these checks are specifically ordered to produce correct results.
                 if (source.flags & 16384 /* Union */) {
-                    if (result = eachTypeRelatedToType(source, target, reportErrors)) {
+                    if (relation === comparableRelation) {
+                        result = someTypeRelatedToType(source, target, reportErrors);
+                    }
+                    else {
+                        result = eachTypeRelatedToType(source, target, reportErrors);
+                    }
+                    if (result) {
                         return result;
                     }
                 }
                 else if (target.flags & 32768 /* Intersection */) {
-                    if (result = typeRelatedToEachType(source, target, reportErrors)) {
+                    result = typeRelatedToEachType(source, target, reportErrors);
+                    if (result) {
                         return result;
                     }
                 }
                 else {
-                    // It is necessary to try "some" checks on both sides because there may be nested "each" checks
+                    // It is necessary to try these "some" checks on both sides because there may be nested "each" checks
                     // on either side that need to be prioritized. For example, A | B = (A | B) & (C | D) or
                     // A & B = (A & B) | (C & D).
                     if (source.flags & 32768 /* Intersection */) {
-                        // If target is a union type the following check will report errors so we suppress them here
-                        if (result = someTypeRelatedToType(source, target, reportErrors && !(target.flags & 16384 /* Union */))) {
+                        // Check to see if any constituents of the intersection are immediately related to the target.
+                        //
+                        // Don't report errors though. Checking whether a constituent is related to the source is not actually
+                        // useful and leads to some confusing error messages. Instead it is better to let the below checks
+                        // take care of this, or to not elaborate at all. For instance,
+                        //
+                        //    - For an object type (such as 'C = A & B'), users are usually more interested in structural errors.
+                        //
+                        //    - For a union type (such as '(A | B) = (C & D)'), it's better to hold onto the whole intersection
+                        //          than to report that 'D' is not assignable to 'A' or 'B'.
+                        //
+                        //    - For a primitive type or type parameter (such as 'number = A & B') there is no point in
+                        //          breaking the intersection apart.
+                        if (result = someTypeRelatedToType(source, target, /*reportErrors*/ false)) {
                             return result;
                         }
                     }
                     if (target.flags & 16384 /* Union */) {
-                        if (result = typeRelatedToSomeType(source, target, reportErrors)) {
+                        if (result = typeRelatedToSomeType(source, target, reportErrors && !(source.flags & 16777726 /* Primitive */))) {
                             return result;
                         }
                     }
@@ -19295,8 +20284,8 @@ var ts;
                 }
                 if (source.flags & 16384 /* Union */ && target.flags & 16384 /* Union */ ||
                     source.flags & 32768 /* Intersection */ && target.flags & 32768 /* Intersection */) {
-                    if (result = eachTypeRelatedToSomeType(source, target)) {
-                        if (result &= eachTypeRelatedToSomeType(target, source)) {
+                    if (result = eachTypeRelatedToSomeType(source, target, /*reportErrors*/ false)) {
+                        if (result &= eachTypeRelatedToSomeType(target, source, /*reportErrors*/ false)) {
                             return result;
                         }
                     }
@@ -19310,8 +20299,9 @@ var ts;
             function isKnownProperty(type, name) {
                 if (type.flags & 80896 /* ObjectType */) {
                     var resolved = resolveStructuredTypeMembers(type);
-                    if (relation === assignableRelation && (type === globalObjectType || resolved.properties.length === 0) ||
-                        resolved.stringIndexType || resolved.numberIndexType || getPropertyOfType(type, name)) {
+                    if ((relation === assignableRelation || relation === comparableRelation) &&
+                        (type === globalObjectType || resolved.properties.length === 0) ||
+                        resolved.stringIndexInfo || resolved.numberIndexInfo || getPropertyOfType(type, name)) {
                         return true;
                     }
                 }
@@ -19326,7 +20316,7 @@ var ts;
                 return false;
             }
             function hasExcessProperties(source, target, reportErrors) {
-                if (!(target.flags & 67108864 /* ObjectLiteralPatternWithComputedProperties */) && someConstituentTypeHasKind(target, 80896 /* ObjectType */)) {
+                if (!(target.flags & 67108864 /* ObjectLiteralPatternWithComputedProperties */) && maybeTypeOfKind(target, 80896 /* ObjectType */)) {
                     for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
                         var prop = _a[_i];
                         if (!isKnownProperty(target, prop.name)) {
@@ -19344,7 +20334,7 @@ var ts;
                 }
                 return false;
             }
-            function eachTypeRelatedToSomeType(source, target) {
+            function eachTypeRelatedToSomeType(source, target, reportErrors) {
                 var result = -1 /* True */;
                 var sourceTypes = source.types;
                 for (var _i = 0, sourceTypes_1 = sourceTypes; _i < sourceTypes_1.length; _i++) {
@@ -19359,7 +20349,19 @@ var ts;
             }
             function typeRelatedToSomeType(source, target, reportErrors) {
                 var targetTypes = target.types;
-                for (var i = 0, len = targetTypes.length; i < len; i++) {
+                var len = targetTypes.length;
+                // The null and undefined types are guaranteed to be at the end of the constituent type list. In order
+                // to produce the best possible errors we first check the nullable types, such that the last type we
+                // check and report errors from is a non-nullable type if one is present.
+                while (len >= 2 && targetTypes[len - 1].flags & 96 /* Nullable */) {
+                    var related = isRelatedTo(source, targetTypes[len - 1], /*reportErrors*/ false);
+                    if (related) {
+                        return related;
+                    }
+                    len--;
+                }
+                // Now check the non-nullable types and report errors on the last one.
+                for (var i = 0; i < len; i++) {
                     var related = isRelatedTo(source, targetTypes[i], reportErrors && i === len - 1);
                     if (related) {
                         return related;
@@ -19382,7 +20384,19 @@ var ts;
             }
             function someTypeRelatedToType(source, target, reportErrors) {
                 var sourceTypes = source.types;
-                for (var i = 0, len = sourceTypes.length; i < len; i++) {
+                var len = sourceTypes.length;
+                // The null and undefined types are guaranteed to be at the end of the constituent type list. In order
+                // to produce the best possible errors we first check the nullable types, such that the last type we
+                // check and report errors from is a non-nullable type if one is present.
+                while (len >= 2 && sourceTypes[len - 1].flags & 96 /* Nullable */) {
+                    var related = isRelatedTo(sourceTypes[len - 1], target, /*reportErrors*/ false);
+                    if (related) {
+                        return related;
+                    }
+                    len--;
+                }
+                // Now check the non-nullable types and report errors on the last one.
+                for (var i = 0; i < len; i++) {
                     var related = isRelatedTo(sourceTypes[i], target, reportErrors && i === len - 1);
                     if (related) {
                         return related;
@@ -19480,9 +20494,9 @@ var ts;
                         if (result) {
                             result &= signaturesRelatedTo(source, target, 1 /* Construct */, reportErrors);
                             if (result) {
-                                result &= stringIndexTypesRelatedTo(source, originalSource, target, reportErrors);
+                                result &= indexTypesRelatedTo(source, originalSource, target, 0 /* String */, reportErrors);
                                 if (result) {
-                                    result &= numberIndexTypesRelatedTo(source, originalSource, target, reportErrors);
+                                    result &= indexTypesRelatedTo(source, originalSource, target, 1 /* Number */, reportErrors);
                                 }
                             }
                         }
@@ -19525,23 +20539,23 @@ var ts;
                         else if (!(targetProp.flags & 134217728 /* Prototype */)) {
                             var sourcePropFlags = getDeclarationFlagsFromSymbol(sourceProp);
                             var targetPropFlags = getDeclarationFlagsFromSymbol(targetProp);
-                            if (sourcePropFlags & 16 /* Private */ || targetPropFlags & 16 /* Private */) {
+                            if (sourcePropFlags & 8 /* Private */ || targetPropFlags & 8 /* Private */) {
                                 if (sourceProp.valueDeclaration !== targetProp.valueDeclaration) {
                                     if (reportErrors) {
-                                        if (sourcePropFlags & 16 /* Private */ && targetPropFlags & 16 /* Private */) {
+                                        if (sourcePropFlags & 8 /* Private */ && targetPropFlags & 8 /* Private */) {
                                             reportError(ts.Diagnostics.Types_have_separate_declarations_of_a_private_property_0, symbolToString(targetProp));
                                         }
                                         else {
-                                            reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 16 /* Private */ ? source : target), typeToString(sourcePropFlags & 16 /* Private */ ? target : source));
+                                            reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 8 /* Private */ ? source : target), typeToString(sourcePropFlags & 8 /* Private */ ? target : source));
                                         }
                                     }
                                     return 0 /* False */;
                                 }
                             }
-                            else if (targetPropFlags & 32 /* Protected */) {
+                            else if (targetPropFlags & 16 /* Protected */) {
                                 var sourceDeclaredInClass = sourceProp.parent && sourceProp.parent.flags & 32 /* Class */;
-                                var sourceClass = sourceDeclaredInClass ? getDeclaredTypeOfSymbol(sourceProp.parent) : undefined;
-                                var targetClass = getDeclaredTypeOfSymbol(targetProp.parent);
+                                var sourceClass = sourceDeclaredInClass ? getDeclaredTypeOfSymbol(getParentOfSymbol(sourceProp)) : undefined;
+                                var targetClass = getDeclaredTypeOfSymbol(getParentOfSymbol(targetProp));
                                 if (!sourceClass || !hasBaseType(sourceClass, targetClass)) {
                                     if (reportErrors) {
                                         reportError(ts.Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2, symbolToString(targetProp), typeToString(sourceClass || source), typeToString(targetClass));
@@ -19549,7 +20563,7 @@ var ts;
                                     return 0 /* False */;
                                 }
                             }
-                            else if (sourcePropFlags & 32 /* Protected */) {
+                            else if (sourcePropFlags & 16 /* Protected */) {
                                 if (reportErrors) {
                                     reportError(ts.Diagnostics.Property_0_is_protected_in_type_1_but_public_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
                                 }
@@ -19614,43 +20628,41 @@ var ts;
                 }
                 var sourceSignatures = getSignaturesOfType(source, kind);
                 var targetSignatures = getSignaturesOfType(target, kind);
-                if (kind === 1 /* Construct */ && sourceSignatures.length && targetSignatures.length &&
-                    isAbstractConstructorType(source) && !isAbstractConstructorType(target)) {
-                    // An abstract constructor type is not assignable to a non-abstract constructor type
-                    // as it would otherwise be possible to new an abstract class. Note that the assignablity
-                    // check we perform for an extends clause excludes construct signatures from the target,
-                    // so this check never proceeds.
-                    if (reportErrors) {
-                        reportError(ts.Diagnostics.Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type);
+                if (kind === 1 /* Construct */ && sourceSignatures.length && targetSignatures.length) {
+                    if (isAbstractConstructorType(source) && !isAbstractConstructorType(target)) {
+                        // An abstract constructor type is not assignable to a non-abstract constructor type
+                        // as it would otherwise be possible to new an abstract class. Note that the assignability
+                        // check we perform for an extends clause excludes construct signatures from the target,
+                        // so this check never proceeds.
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type);
+                        }
+                        return 0 /* False */;
+                    }
+                    if (!constructorVisibilitiesAreCompatible(sourceSignatures[0], targetSignatures[0], reportErrors)) {
+                        return 0 /* False */;
                     }
-                    return 0 /* False */;
                 }
                 var result = -1 /* True */;
                 var saveErrorInfo = errorInfo;
                 outer: for (var _i = 0, targetSignatures_1 = targetSignatures; _i < targetSignatures_1.length; _i++) {
                     var t = targetSignatures_1[_i];
-                    if (!t.hasStringLiterals || target.flags & 262144 /* FromSignature */) {
-                        // Only elaborate errors from the first failure
-                        var shouldElaborateErrors = reportErrors;
-                        for (var _a = 0, sourceSignatures_1 = sourceSignatures; _a < sourceSignatures_1.length; _a++) {
-                            var s = sourceSignatures_1[_a];
-                            if (!s.hasStringLiterals || source.flags & 262144 /* FromSignature */) {
-                                var related = signatureRelatedTo(s, t, shouldElaborateErrors);
-                                if (related) {
-                                    result &= related;
-                                    errorInfo = saveErrorInfo;
-                                    continue outer;
-                                }
-                                shouldElaborateErrors = false;
-                            }
+                    // Only elaborate errors from the first failure
+                    var shouldElaborateErrors = reportErrors;
+                    for (var _a = 0, sourceSignatures_1 = sourceSignatures; _a < sourceSignatures_1.length; _a++) {
+                        var s = sourceSignatures_1[_a];
+                        var related = signatureRelatedTo(s, t, shouldElaborateErrors);
+                        if (related) {
+                            result &= related;
+                            errorInfo = saveErrorInfo;
+                            continue outer;
                         }
-                        // don't elaborate the primitive apparent types (like Number)
-                        // because the actual primitives will have already been reported.
-                        if (shouldElaborateErrors) {
-                            reportError(ts.Diagnostics.Type_0_provides_no_match_for_the_signature_1, typeToString(source), signatureToString(t, /*enclosingDeclaration*/ undefined, /*flags*/ undefined, kind));
-                        }
-                        return 0 /* False */;
+                        shouldElaborateErrors = false;
                     }
+                    if (shouldElaborateErrors) {
+                        reportError(ts.Diagnostics.Type_0_provides_no_match_for_the_signature_1, typeToString(source), signatureToString(t, /*enclosingDeclaration*/ undefined, /*flags*/ undefined, kind));
+                    }
+                    return 0 /* False */;
                 }
                 return result;
             }
@@ -19668,7 +20680,7 @@ var ts;
                 }
                 var result = -1 /* True */;
                 for (var i = 0, len = sourceSignatures.length; i < len; i++) {
-                    var related = compareSignaturesIdentical(sourceSignatures[i], targetSignatures[i], /*partialMatch*/ false, /*ignoreReturnTypes*/ false, isRelatedTo);
+                    var related = compareSignaturesIdentical(sourceSignatures[i], targetSignatures[i], /*partialMatch*/ false, /*ignoreThisTypes*/ false, /*ignoreReturnTypes*/ false, isRelatedTo);
                     if (!related) {
                         return 0 /* False */;
                     }
@@ -19676,84 +20688,74 @@ var ts;
                 }
                 return result;
             }
-            function stringIndexTypesRelatedTo(source, originalSource, target, reportErrors) {
-                if (relation === identityRelation) {
-                    return indexTypesIdenticalTo(0 /* String */, source, target);
-                }
-                var targetType = getIndexTypeOfType(target, 0 /* String */);
-                if (targetType) {
-                    if ((targetType.flags & 1 /* Any */) && !(originalSource.flags & 16777726 /* Primitive */)) {
-                        // non-primitive assignment to any is always allowed, eg
-                        //   `var x: { [index: string]: any } = { property: 12 };`
-                        return -1 /* True */;
-                    }
-                    var sourceType = getIndexTypeOfType(source, 0 /* String */);
-                    if (!sourceType) {
-                        if (reportErrors) {
-                            reportError(ts.Diagnostics.Index_signature_is_missing_in_type_0, typeToString(source));
+            function eachPropertyRelatedTo(source, target, kind, reportErrors) {
+                var result = -1 /* True */;
+                for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
+                    var prop = _a[_i];
+                    if (kind === 0 /* String */ || isNumericLiteralName(prop.name)) {
+                        var related = isRelatedTo(getTypeOfSymbol(prop), target, reportErrors);
+                        if (!related) {
+                            if (reportErrors) {
+                                reportError(ts.Diagnostics.Property_0_is_incompatible_with_index_signature, symbolToString(prop));
+                            }
+                            return 0 /* False */;
                         }
-                        return 0 /* False */;
+                        result &= related;
                     }
-                    var related = isRelatedTo(sourceType, targetType, reportErrors);
-                    if (!related) {
-                        if (reportErrors) {
-                            reportError(ts.Diagnostics.Index_signatures_are_incompatible);
-                        }
-                        return 0 /* False */;
-                    }
-                    return related;
                 }
-                return -1 /* True */;
+                return result;
             }
-            function numberIndexTypesRelatedTo(source, originalSource, target, reportErrors) {
-                if (relation === identityRelation) {
-                    return indexTypesIdenticalTo(1 /* Number */, source, target);
+            function indexInfoRelatedTo(sourceInfo, targetInfo, reportErrors) {
+                var related = isRelatedTo(sourceInfo.type, targetInfo.type, reportErrors);
+                if (!related && reportErrors) {
+                    reportError(ts.Diagnostics.Index_signatures_are_incompatible);
                 }
-                var targetType = getIndexTypeOfType(target, 1 /* Number */);
-                if (targetType) {
-                    if ((targetType.flags & 1 /* Any */) && !(originalSource.flags & 16777726 /* Primitive */)) {
-                        // non-primitive assignment to any is always allowed, eg
-                        //   `var x: { [index: number]: any } = { property: 12 };`
-                        return -1 /* True */;
-                    }
-                    var sourceStringType = getIndexTypeOfType(source, 0 /* String */);
-                    var sourceNumberType = getIndexTypeOfType(source, 1 /* Number */);
-                    if (!(sourceStringType || sourceNumberType)) {
-                        if (reportErrors) {
-                            reportError(ts.Diagnostics.Index_signature_is_missing_in_type_0, typeToString(source));
-                        }
-                        return 0 /* False */;
-                    }
-                    var related;
-                    if (sourceStringType && sourceNumberType) {
-                        // If we know for sure we're testing both string and numeric index types then only report errors from the second one
-                        related = isRelatedTo(sourceStringType, targetType, /*reportErrors*/ false) || isRelatedTo(sourceNumberType, targetType, reportErrors);
-                    }
-                    else {
-                        related = isRelatedTo(sourceStringType || sourceNumberType, targetType, reportErrors);
-                    }
-                    if (!related) {
-                        if (reportErrors) {
-                            reportError(ts.Diagnostics.Index_signatures_are_incompatible);
-                        }
-                        return 0 /* False */;
-                    }
-                    return related;
-                }
-                return -1 /* True */;
+                return related;
             }
-            function indexTypesIdenticalTo(indexKind, source, target) {
-                var targetType = getIndexTypeOfType(target, indexKind);
-                var sourceType = getIndexTypeOfType(source, indexKind);
-                if (!sourceType && !targetType) {
+            function indexTypesRelatedTo(source, originalSource, target, kind, reportErrors) {
+                if (relation === identityRelation) {
+                    return indexTypesIdenticalTo(source, target, kind);
+                }
+                var targetInfo = getIndexInfoOfType(target, kind);
+                if (!targetInfo || ((targetInfo.type.flags & 1 /* Any */) && !(originalSource.flags & 16777726 /* Primitive */))) {
+                    // Index signature of type any permits assignment from everything but primitives
                     return -1 /* True */;
                 }
-                if (sourceType && targetType) {
-                    return isRelatedTo(sourceType, targetType);
+                var sourceInfo = getIndexInfoOfType(source, kind) ||
+                    kind === 1 /* Number */ && getIndexInfoOfType(source, 0 /* String */);
+                if (sourceInfo) {
+                    return indexInfoRelatedTo(sourceInfo, targetInfo, reportErrors);
+                }
+                if (isObjectLiteralType(source)) {
+                    var related = -1 /* True */;
+                    if (kind === 0 /* String */) {
+                        var sourceNumberInfo = getIndexInfoOfType(source, 1 /* Number */);
+                        if (sourceNumberInfo) {
+                            related = indexInfoRelatedTo(sourceNumberInfo, targetInfo, reportErrors);
+                        }
+                    }
+                    if (related) {
+                        related &= eachPropertyRelatedTo(source, targetInfo.type, kind, reportErrors);
+                    }
+                    return related;
+                }
+                if (reportErrors) {
+                    reportError(ts.Diagnostics.Index_signature_is_missing_in_type_0, typeToString(source));
                 }
                 return 0 /* False */;
             }
-            function enumRelatedTo(source, target) {
+            function indexTypesIdenticalTo(source, target, indexKind) {
+                var targetInfo = getIndexInfoOfType(target, indexKind);
+                var sourceInfo = getIndexInfoOfType(source, indexKind);
+                if (!sourceInfo && !targetInfo) {
+                    return -1 /* True */;
+                }
+                if (sourceInfo && targetInfo && sourceInfo.isReadonly === targetInfo.isReadonly) {
+                    return isRelatedTo(sourceInfo.type, targetInfo.type);
+                }
+                return 0 /* False */;
+            }
+            function enumRelatedTo(source, target, reportErrors) {
                 if (source.symbol.name !== target.symbol.name ||
                     source.symbol.flags & 128 /* ConstEnum */ ||
                     target.symbol.flags & 128 /* ConstEnum */) {
@@ -19765,13 +20767,38 @@ var ts;
                     if (property.flags & 8 /* EnumMember */) {
                         var targetProperty = getPropertyOfType(targetEnumType, property.name);
                         if (!targetProperty || !(targetProperty.flags & 8 /* EnumMember */)) {
-                            reportError(ts.Diagnostics.Property_0_is_missing_in_type_1, property.name, typeToString(target, /*enclosingDeclaration*/ undefined, 128 /* UseFullyQualifiedType */));
+                            if (reportErrors) {
+                                reportError(ts.Diagnostics.Property_0_is_missing_in_type_1, property.name, typeToString(target, /*enclosingDeclaration*/ undefined, 128 /* UseFullyQualifiedType */));
+                            }
                             return 0 /* False */;
                         }
                     }
                 }
                 return -1 /* True */;
             }
+            function constructorVisibilitiesAreCompatible(sourceSignature, targetSignature, reportErrors) {
+                if (!sourceSignature.declaration || !targetSignature.declaration) {
+                    return true;
+                }
+                var sourceAccessibility = sourceSignature.declaration.flags & (8 /* Private */ | 16 /* Protected */);
+                var targetAccessibility = targetSignature.declaration.flags & (8 /* Private */ | 16 /* Protected */);
+                // A public, protected and private signature is assignable to a private signature.
+                if (targetAccessibility === 8 /* Private */) {
+                    return true;
+                }
+                // A public and protected signature is assignable to a protected signature.
+                if (targetAccessibility === 16 /* Protected */ && sourceAccessibility !== 8 /* Private */) {
+                    return true;
+                }
+                // Only a public signature is assignable to public signature.
+                if (targetAccessibility !== 16 /* Protected */ && !sourceAccessibility) {
+                    return true;
+                }
+                if (reportErrors) {
+                    reportError(ts.Diagnostics.Cannot_assign_a_0_constructor_type_to_a_1_constructor_type, visibilityToString(sourceAccessibility), visibilityToString(targetAccessibility));
+                }
+                return false;
+            }
         }
         // Return true if the given type is the constructor type for an abstract class
         function isAbstractConstructorType(type) {
@@ -19817,8 +20844,8 @@ var ts;
             if (sourceProp === targetProp) {
                 return -1 /* True */;
             }
-            var sourcePropAccessibility = getDeclarationFlagsFromSymbol(sourceProp) & (16 /* Private */ | 32 /* Protected */);
-            var targetPropAccessibility = getDeclarationFlagsFromSymbol(targetProp) & (16 /* Private */ | 32 /* Protected */);
+            var sourcePropAccessibility = getDeclarationFlagsFromSymbol(sourceProp) & (8 /* Private */ | 16 /* Protected */);
+            var targetPropAccessibility = getDeclarationFlagsFromSymbol(targetProp) & (8 /* Private */ | 16 /* Protected */);
             if (sourcePropAccessibility !== targetPropAccessibility) {
                 return 0 /* False */;
             }
@@ -19832,6 +20859,9 @@ var ts;
                     return 0 /* False */;
                 }
             }
+            if (isReadonlySymbol(sourceProp) !== isReadonlySymbol(targetProp)) {
+                return 0 /* False */;
+            }
             return compareTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
         }
         function isMatchingSignature(source, target, partialMatch) {
@@ -19854,7 +20884,7 @@ var ts;
         /**
          * See signatureRelatedTo, compareSignaturesIdentical
          */
-        function compareSignaturesIdentical(source, target, partialMatch, ignoreReturnTypes, compareTypes) {
+        function compareSignaturesIdentical(source, target, partialMatch, ignoreThisTypes, ignoreReturnTypes, compareTypes) {
             // TODO (drosen): De-duplicate code between related functions.
             if (source === target) {
                 return -1 /* True */;
@@ -19875,10 +20905,17 @@ var ts;
             source = getErasedSignature(source);
             target = getErasedSignature(target);
             var result = -1 /* True */;
+            if (!ignoreThisTypes && source.thisType && target.thisType) {
+                var related = compareTypes(source.thisType, target.thisType);
+                if (!related) {
+                    return 0 /* False */;
+                }
+                result &= related;
+            }
             var targetLen = target.parameters.length;
             for (var i = 0; i < targetLen; i++) {
-                var s = isRestParameterIndex(source, i) ? getRestTypeOfSignature(source) : getTypeOfSymbol(source.parameters[i]);
-                var t = isRestParameterIndex(target, i) ? getRestTypeOfSignature(target) : getTypeOfSymbol(target.parameters[i]);
+                var s = isRestParameterIndex(source, i) ? getRestTypeOfSignature(source) : getTypeOfParameter(source.parameters[i]);
+                var t = isRestParameterIndex(target, i) ? getRestTypeOfSignature(target) : getTypeOfParameter(target.parameters[i]);
                 var related = compareTypes(s, t);
                 if (!related) {
                     return 0 /* False */;
@@ -19894,15 +20931,31 @@ var ts;
             return signature.hasRestParameter && parameterIndex >= signature.parameters.length - 1;
         }
         function isSupertypeOfEach(candidate, types) {
-            for (var _i = 0, types_6 = types; _i < types_6.length; _i++) {
-                var type = types_6[_i];
-                if (candidate !== type && !isTypeSubtypeOf(type, candidate))
+            for (var _i = 0, types_5 = types; _i < types_5.length; _i++) {
+                var t = types_5[_i];
+                if (candidate !== t && !isTypeSubtypeOf(t, candidate))
                     return false;
             }
             return true;
         }
+        function getCombinedFlagsOfTypes(types) {
+            var flags = 0;
+            for (var _i = 0, types_6 = types; _i < types_6.length; _i++) {
+                var t = types_6[_i];
+                flags |= t.flags;
+            }
+            return flags;
+        }
         function getCommonSupertype(types) {
-            return ts.forEach(types, function (t) { return isSupertypeOfEach(t, types) ? t : undefined; });
+            if (!strictNullChecks) {
+                return ts.forEach(types, function (t) { return isSupertypeOfEach(t, types) ? t : undefined; });
+            }
+            var primaryTypes = ts.filter(types, function (t) { return !(t.flags & 96 /* Nullable */); });
+            if (!primaryTypes.length) {
+                return getUnionType(types);
+            }
+            var supertype = ts.forEach(primaryTypes, function (t) { return isSupertypeOfEach(t, primaryTypes) ? t : undefined; });
+            return supertype && addNullableKind(supertype, getCombinedFlagsOfTypes(types) & 96 /* Nullable */);
         }
         function reportNoCommonSupertypeError(types, errorLocation, errorMessageChainHead) {
             // The downfallType/bestSupertypeDownfallType is the first type that caused a particular candidate
@@ -19941,8 +20994,10 @@ var ts;
             return type.flags & 4096 /* Reference */ && type.target === globalArrayType;
         }
         function isArrayLikeType(type) {
-            // A type is array-like if it is not the undefined or null type and if it is assignable to any[]
-            return !(type.flags & (32 /* Undefined */ | 64 /* Null */)) && isTypeAssignableTo(type, anyArrayType);
+            // A type is array-like if it is a reference to the global Array or global ReadonlyArray type,
+            // or if it is not the undefined or null type and if it is assignable to ReadonlyArray<any>
+            return type.flags & 4096 /* Reference */ && (type.target === globalArrayType || type.target === globalReadonlyArrayType) ||
+                !(type.flags & 96 /* Nullable */) && isTypeAssignableTo(type, anyReadonlyArrayType);
         }
         function isTupleLikeType(type) {
             return !!getPropertyOfType(type, "0");
@@ -19957,6 +21012,69 @@ var ts;
         function isTupleType(type) {
             return !!(type.flags & 8192 /* Tuple */);
         }
+        function getNullableKind(type) {
+            var flags = type.flags;
+            if (flags & 16384 /* Union */) {
+                for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                    var t = _a[_i];
+                    flags |= t.flags;
+                }
+            }
+            return flags & 96 /* Nullable */;
+        }
+        function getNullableTypeOfKind(kind) {
+            return kind & 64 /* Null */ ? kind & 32 /* Undefined */ ?
+                getUnionType([nullType, undefinedType]) : nullType : undefinedType;
+        }
+        function addNullableKind(type, kind) {
+            if ((getNullableKind(type) & kind) !== kind) {
+                var types = [type];
+                if (kind & 32 /* Undefined */) {
+                    types.push(undefinedType);
+                }
+                if (kind & 64 /* Null */) {
+                    types.push(nullType);
+                }
+                type = getUnionType(types);
+            }
+            return type;
+        }
+        function removeNullableKind(type, kind) {
+            if (type.flags & 16384 /* Union */ && getNullableKind(type) & kind) {
+                var firstType = void 0;
+                var types = void 0;
+                for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                    var t = _a[_i];
+                    if (!(t.flags & kind)) {
+                        if (!firstType) {
+                            firstType = t;
+                        }
+                        else {
+                            if (!types) {
+                                types = [firstType];
+                            }
+                            types.push(t);
+                        }
+                    }
+                }
+                if (firstType) {
+                    type = types ? getUnionType(types) : firstType;
+                }
+            }
+            return type;
+        }
+        function getNonNullableType(type) {
+            return strictNullChecks ? removeNullableKind(type, 96 /* Nullable */) : type;
+        }
+        /**
+         * Return true if type was inferred from an object literal or written as an object type literal
+         * with no call or construct signatures.
+         */
+        function isObjectLiteralType(type) {
+            return type.symbol && (type.symbol.flags & (4096 /* ObjectLiteral */ | 2048 /* TypeLiteral */)) !== 0 &&
+                getSignaturesOfType(type, 0 /* Call */).length === 0 &&
+                getSignaturesOfType(type, 1 /* Construct */).length === 0;
+        }
         function getRegularTypeOfObjectLiteral(type) {
             if (type.flags & 1048576 /* FreshObjectLiteral */) {
                 var regularType = type.regularType;
@@ -19967,8 +21085,8 @@ var ts;
                     regularType.properties = type.properties;
                     regularType.callSignatures = type.callSignatures;
                     regularType.constructSignatures = type.constructSignatures;
-                    regularType.stringIndexType = type.stringIndexType;
-                    regularType.numberIndexType = type.numberIndexType;
+                    regularType.stringIndexInfo = type.stringIndexInfo;
+                    regularType.numberIndexInfo = type.numberIndexInfo;
                     type.regularType = regularType;
                 }
                 return regularType;
@@ -19993,27 +21111,23 @@ var ts;
                 }
                 members[p.name] = p;
             });
-            var stringIndexType = getIndexTypeOfType(type, 0 /* String */);
-            var numberIndexType = getIndexTypeOfType(type, 1 /* Number */);
-            if (stringIndexType)
-                stringIndexType = getWidenedType(stringIndexType);
-            if (numberIndexType)
-                numberIndexType = getWidenedType(numberIndexType);
-            return createAnonymousType(type.symbol, members, emptyArray, emptyArray, stringIndexType, numberIndexType);
+            var stringIndexInfo = getIndexInfoOfType(type, 0 /* String */);
+            var numberIndexInfo = getIndexInfoOfType(type, 1 /* Number */);
+            return createAnonymousType(type.symbol, members, emptyArray, emptyArray, stringIndexInfo && createIndexInfo(getWidenedType(stringIndexInfo.type), stringIndexInfo.isReadonly), numberIndexInfo && createIndexInfo(getWidenedType(numberIndexInfo.type), numberIndexInfo.isReadonly));
+        }
+        function getWidenedConstituentType(type) {
+            return type.flags & 96 /* Nullable */ ? type : getWidenedType(type);
         }
         function getWidenedType(type) {
-            if (type.flags & 140509184 /* RequiresWidening */) {
-                if (type.flags & (32 /* Undefined */ | 64 /* Null */)) {
+            if (type.flags & 6291456 /* RequiresWidening */) {
+                if (type.flags & 96 /* Nullable */) {
                     return anyType;
                 }
-                if (type.flags & 134217728 /* PredicateType */) {
-                    return booleanType;
-                }
                 if (type.flags & 524288 /* ObjectLiteral */) {
                     return getWidenedTypeOfObjectLiteral(type);
                 }
                 if (type.flags & 16384 /* Union */) {
-                    return getUnionType(ts.map(type.types, getWidenedType), /*noSubtypeReduction*/ true);
+                    return getUnionType(ts.map(type.types, getWidenedConstituentType), /*noSubtypeReduction*/ true);
                 }
                 if (isArrayType(type)) {
                     return createArrayType(getWidenedType(type.typeArguments[0]));
@@ -20074,22 +21188,25 @@ var ts;
             var typeAsString = typeToString(getWidenedType(type));
             var diagnostic;
             switch (declaration.kind) {
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
                     diagnostic = ts.Diagnostics.Member_0_implicitly_has_an_1_type;
                     break;
-                case 139 /* Parameter */:
+                case 141 /* Parameter */:
                     diagnostic = declaration.dotDotDotToken ?
                         ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type :
                         ts.Diagnostics.Parameter_0_implicitly_has_an_1_type;
                     break;
-                case 216 /* FunctionDeclaration */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
-                case 176 /* FunctionExpression */:
-                case 177 /* ArrowFunction */:
+                case 168 /* BindingElement */:
+                    diagnostic = ts.Diagnostics.Binding_element_0_implicitly_has_an_1_type;
+                    break;
+                case 219 /* FunctionDeclaration */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
+                case 178 /* FunctionExpression */:
+                case 179 /* ArrowFunction */:
                     if (!declaration.name) {
                         error(declaration, ts.Diagnostics.Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
                         return;
@@ -20114,25 +21231,19 @@ var ts;
             var targetMax = target.parameters.length;
             var count;
             if (source.hasRestParameter && target.hasRestParameter) {
-                count = sourceMax > targetMax ? sourceMax : targetMax;
-                sourceMax--;
-                targetMax--;
+                count = Math.max(sourceMax, targetMax);
             }
             else if (source.hasRestParameter) {
-                sourceMax--;
                 count = targetMax;
             }
             else if (target.hasRestParameter) {
-                targetMax--;
                 count = sourceMax;
             }
             else {
-                count = sourceMax < targetMax ? sourceMax : targetMax;
+                count = Math.min(sourceMax, targetMax);
             }
             for (var i = 0; i < count; i++) {
-                var s = i < sourceMax ? getTypeOfSymbol(source.parameters[i]) : getRestTypeOfSignature(source);
-                var t = i < targetMax ? getTypeOfSymbol(target.parameters[i]) : getRestTypeOfSignature(target);
-                callback(s, t);
+                callback(getTypeAtPosition(source, i), getTypeAtPosition(target, i));
             }
         }
         function createInferenceContext(typeParameters, inferUnionTypes) {
@@ -20156,6 +21267,7 @@ var ts;
             var targetStack;
             var depth = 0;
             var inferiority = 0;
+            var visited = {};
             inferFromTypes(source, target);
             function isInProcess(source, target) {
                 for (var i = 0; i < depth; i++) {
@@ -20173,7 +21285,7 @@ var ts;
                     // type, and for each such target constituent type infer from the type to itself.
                     // When inferring from a type to itself we effectively find all type parameter
                     // occurrences within that type and infer themselves as their type arguments.
-                    var matchingTypes;
+                    var matchingTypes = void 0;
                     for (var _i = 0, _a = target.types; _i < _a.length; _i++) {
                         var t = _a[_i];
                         if (typeIdenticalToSomeType(t, source.types)) {
@@ -20230,11 +21342,6 @@ var ts;
                         inferFromTypes(sourceTypes[i], targetTypes[i]);
                     }
                 }
-                else if (source.flags & 134217728 /* PredicateType */ && target.flags & 134217728 /* PredicateType */) {
-                    if (source.predicate.kind === target.predicate.kind) {
-                        inferFromTypes(source.predicate.type, target.predicate.type);
-                    }
-                }
                 else if (source.flags & 8192 /* Tuple */ && target.flags & 8192 /* Tuple */ && source.elementTypes.length === target.elementTypes.length) {
                     // If source and target are tuples of the same size, infer from element types
                     var sourceTypes = source.elementTypes;
@@ -20246,7 +21353,7 @@ var ts;
                 else if (target.flags & 49152 /* UnionOrIntersection */) {
                     var targetTypes = target.types;
                     var typeParameterCount = 0;
-                    var typeParameter;
+                    var typeParameter = void 0;
                     // First infer to each type in union or intersection that isn't a type parameter
                     for (var _b = 0, targetTypes_2 = targetTypes; _b < targetTypes_2.length; _b++) {
                         var t = targetTypes_2[_b];
@@ -20269,7 +21376,7 @@ var ts;
                     }
                 }
                 else if (source.flags & 49152 /* UnionOrIntersection */) {
-                    // Source is a union or intersection type, infer from each consituent type
+                    // Source is a union or intersection type, infer from each constituent type
                     var sourceTypes = source.types;
                     for (var _c = 0, sourceTypes_3 = sourceTypes; _c < sourceTypes_3.length; _c++) {
                         var sourceType = sourceTypes_3[_c];
@@ -20289,6 +21396,11 @@ var ts;
                         if (isDeeplyNestedGeneric(source, sourceStack, depth) && isDeeplyNestedGeneric(target, targetStack, depth)) {
                             return;
                         }
+                        var key = source.id + "," + target.id;
+                        if (ts.hasProperty(visited, key)) {
+                            return;
+                        }
+                        visited[key] = true;
                         if (depth === 0) {
                             sourceStack = [];
                             targetStack = [];
@@ -20299,9 +21411,7 @@ var ts;
                         inferFromProperties(source, target);
                         inferFromSignatures(source, target, 0 /* Call */);
                         inferFromSignatures(source, target, 1 /* Construct */);
-                        inferFromIndexTypes(source, target, 0 /* String */, 0 /* String */);
-                        inferFromIndexTypes(source, target, 1 /* Number */, 1 /* Number */);
-                        inferFromIndexTypes(source, target, 0 /* String */, 1 /* Number */);
+                        inferFromIndexTypes(source, target);
                         depth--;
                     }
                 }
@@ -20328,14 +21438,29 @@ var ts;
             }
             function inferFromSignature(source, target) {
                 forEachMatchingParameterType(source, target, inferFromTypes);
-                inferFromTypes(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
+                if (source.typePredicate && target.typePredicate && source.typePredicate.kind === target.typePredicate.kind) {
+                    inferFromTypes(source.typePredicate.type, target.typePredicate.type);
+                }
+                else {
+                    inferFromTypes(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
+                }
             }
-            function inferFromIndexTypes(source, target, sourceKind, targetKind) {
-                var targetIndexType = getIndexTypeOfType(target, targetKind);
-                if (targetIndexType) {
-                    var sourceIndexType = getIndexTypeOfType(source, sourceKind);
+            function inferFromIndexTypes(source, target) {
+                var targetStringIndexType = getIndexTypeOfType(target, 0 /* String */);
+                if (targetStringIndexType) {
+                    var sourceIndexType = getIndexTypeOfType(source, 0 /* String */) ||
+                        getImplicitIndexTypeOfType(source, 0 /* String */);
                     if (sourceIndexType) {
-                        inferFromTypes(sourceIndexType, targetIndexType);
+                        inferFromTypes(sourceIndexType, targetStringIndexType);
+                    }
+                }
+                var targetNumberIndexType = getIndexTypeOfType(target, 1 /* Number */);
+                if (targetNumberIndexType) {
+                    var sourceIndexType = getIndexTypeOfType(source, 1 /* Number */) ||
+                        getIndexTypeOfType(source, 0 /* String */) ||
+                        getImplicitIndexTypeOfType(source, 1 /* Number */);
+                    if (sourceIndexType) {
+                        inferFromTypes(sourceIndexType, targetNumberIndexType);
                     }
                 }
             }
@@ -20413,10 +21538,21 @@ var ts;
             return context.inferredTypes;
         }
         // EXPRESSION TYPE CHECKING
+        function createTransientIdentifier(symbol, location) {
+            var result = ts.createNode(69 /* Identifier */);
+            result.text = symbol.name;
+            result.resolvedSymbol = symbol;
+            result.parent = location;
+            result.id = -1;
+            return result;
+        }
         function getResolvedSymbol(node) {
+            if (node.id === -1) {
+                return node.resolvedSymbol;
+            }
             var links = getNodeLinks(node);
             if (!links.resolvedSymbol) {
-                links.resolvedSymbol = (!ts.nodeIsMissing(node) && resolveName(node, node.text, 107455 /* Value */ | 1048576 /* ExportValue */, ts.Diagnostics.Cannot_find_name_0, node)) || unknownSymbol;
+                links.resolvedSymbol = !ts.nodeIsMissing(node) && resolveName(node, node.text, 107455 /* Value */ | 1048576 /* ExportValue */, ts.Diagnostics.Cannot_find_name_0, node) || unknownSymbol;
             }
             return links.resolvedSymbol;
         }
@@ -20426,10 +21562,10 @@ var ts;
             // The expression is restricted to a single identifier or a sequence of identifiers separated by periods
             while (node) {
                 switch (node.kind) {
-                    case 155 /* TypeQuery */:
+                    case 157 /* TypeQuery */:
                         return true;
                     case 69 /* Identifier */:
-                    case 136 /* QualifiedName */:
+                    case 138 /* QualifiedName */:
                         node = node.parent;
                         continue;
                     default:
@@ -20438,174 +21574,294 @@ var ts;
             }
             ts.Debug.fail("should not get here");
         }
+        // Return the assignment key for a "dotted name" (i.e. a sequence of identifiers
+        // separated by dots). The key consists of the id of the symbol referenced by the
+        // leftmost identifier followed by zero or more property names separated by dots.
+        // The result is undefined if the reference isn't a dotted name.
+        function getAssignmentKey(node) {
+            if (node.kind === 69 /* Identifier */) {
+                var symbol = getResolvedSymbol(node);
+                return symbol !== unknownSymbol ? "" + getSymbolId(symbol) : undefined;
+            }
+            if (node.kind === 97 /* ThisKeyword */) {
+                return "0";
+            }
+            if (node.kind === 171 /* PropertyAccessExpression */) {
+                var key = getAssignmentKey(node.expression);
+                return key && key + "." + node.name.text;
+            }
+            return undefined;
+        }
         function hasInitializer(node) {
             return !!(node.initializer || ts.isBindingPattern(node.parent) && hasInitializer(node.parent.parent));
         }
-        // Check if a given variable is assigned within a given syntax node
-        function isVariableAssignedWithin(symbol, node) {
-            var links = getNodeLinks(node);
-            if (links.assignmentChecks) {
-                var cachedResult = links.assignmentChecks[symbol.id];
-                if (cachedResult !== undefined) {
-                    return cachedResult;
-                }
-            }
-            else {
-                links.assignmentChecks = {};
-            }
-            return links.assignmentChecks[symbol.id] = isAssignedIn(node);
-            function isAssignedInBinaryExpression(node) {
-                if (node.operatorToken.kind >= 56 /* FirstAssignment */ && node.operatorToken.kind <= 68 /* LastAssignment */) {
-                    var n = skipParenthesizedNodes(node.left);
-                    if (n.kind === 69 /* Identifier */ && getResolvedSymbol(n) === symbol) {
-                        return true;
+        // For a given node compute a map of which dotted names are assigned within
+        // the node.
+        function getAssignmentMap(node) {
+            var assignmentMap = {};
+            visit(node);
+            return assignmentMap;
+            function visitReference(node) {
+                if (isAssignmentTarget(node) || isCompoundAssignmentTarget(node)) {
+                    var key = getAssignmentKey(node);
+                    if (key) {
+                        assignmentMap[key] = true;
                     }
                 }
-                return ts.forEachChild(node, isAssignedIn);
+                ts.forEachChild(node, visit);
             }
-            function isAssignedInVariableDeclaration(node) {
-                if (!ts.isBindingPattern(node.name) && getSymbolOfNode(node) === symbol && hasInitializer(node)) {
-                    return true;
+            function visitVariableDeclaration(node) {
+                if (!ts.isBindingPattern(node.name) && hasInitializer(node)) {
+                    assignmentMap[getSymbolId(getSymbolOfNode(node))] = true;
                 }
-                return ts.forEachChild(node, isAssignedIn);
+                ts.forEachChild(node, visit);
             }
-            function isAssignedIn(node) {
+            function visit(node) {
                 switch (node.kind) {
-                    case 184 /* BinaryExpression */:
-                        return isAssignedInBinaryExpression(node);
-                    case 214 /* VariableDeclaration */:
-                    case 166 /* BindingElement */:
-                        return isAssignedInVariableDeclaration(node);
-                    case 164 /* ObjectBindingPattern */:
-                    case 165 /* ArrayBindingPattern */:
-                    case 167 /* ArrayLiteralExpression */:
-                    case 168 /* ObjectLiteralExpression */:
-                    case 169 /* PropertyAccessExpression */:
-                    case 170 /* ElementAccessExpression */:
-                    case 171 /* CallExpression */:
-                    case 172 /* NewExpression */:
-                    case 174 /* TypeAssertionExpression */:
-                    case 192 /* AsExpression */:
-                    case 175 /* ParenthesizedExpression */:
-                    case 182 /* PrefixUnaryExpression */:
-                    case 178 /* DeleteExpression */:
-                    case 181 /* AwaitExpression */:
-                    case 179 /* TypeOfExpression */:
-                    case 180 /* VoidExpression */:
-                    case 183 /* PostfixUnaryExpression */:
-                    case 187 /* YieldExpression */:
-                    case 185 /* ConditionalExpression */:
-                    case 188 /* SpreadElementExpression */:
-                    case 195 /* Block */:
-                    case 196 /* VariableStatement */:
-                    case 198 /* ExpressionStatement */:
-                    case 199 /* IfStatement */:
-                    case 200 /* DoStatement */:
-                    case 201 /* WhileStatement */:
-                    case 202 /* ForStatement */:
-                    case 203 /* ForInStatement */:
-                    case 204 /* ForOfStatement */:
-                    case 207 /* ReturnStatement */:
-                    case 208 /* WithStatement */:
-                    case 209 /* SwitchStatement */:
-                    case 244 /* CaseClause */:
-                    case 245 /* DefaultClause */:
-                    case 210 /* LabeledStatement */:
-                    case 211 /* ThrowStatement */:
-                    case 212 /* TryStatement */:
-                    case 247 /* CatchClause */:
-                    case 236 /* JsxElement */:
-                    case 237 /* JsxSelfClosingElement */:
-                    case 241 /* JsxAttribute */:
-                    case 242 /* JsxSpreadAttribute */:
-                    case 238 /* JsxOpeningElement */:
-                    case 243 /* JsxExpression */:
-                        return ts.forEachChild(node, isAssignedIn);
+                    case 69 /* Identifier */:
+                    case 171 /* PropertyAccessExpression */:
+                        visitReference(node);
+                        break;
+                    case 217 /* VariableDeclaration */:
+                    case 168 /* BindingElement */:
+                        visitVariableDeclaration(node);
+                        break;
+                    case 186 /* BinaryExpression */:
+                    case 166 /* ObjectBindingPattern */:
+                    case 167 /* ArrayBindingPattern */:
+                    case 169 /* ArrayLiteralExpression */:
+                    case 170 /* ObjectLiteralExpression */:
+                    case 172 /* ElementAccessExpression */:
+                    case 173 /* CallExpression */:
+                    case 174 /* NewExpression */:
+                    case 176 /* TypeAssertionExpression */:
+                    case 194 /* AsExpression */:
+                    case 195 /* NonNullExpression */:
+                    case 177 /* ParenthesizedExpression */:
+                    case 184 /* PrefixUnaryExpression */:
+                    case 180 /* DeleteExpression */:
+                    case 183 /* AwaitExpression */:
+                    case 181 /* TypeOfExpression */:
+                    case 182 /* VoidExpression */:
+                    case 185 /* PostfixUnaryExpression */:
+                    case 189 /* YieldExpression */:
+                    case 187 /* ConditionalExpression */:
+                    case 190 /* SpreadElementExpression */:
+                    case 198 /* Block */:
+                    case 199 /* VariableStatement */:
+                    case 201 /* ExpressionStatement */:
+                    case 202 /* IfStatement */:
+                    case 203 /* DoStatement */:
+                    case 204 /* WhileStatement */:
+                    case 205 /* ForStatement */:
+                    case 206 /* ForInStatement */:
+                    case 207 /* ForOfStatement */:
+                    case 210 /* ReturnStatement */:
+                    case 211 /* WithStatement */:
+                    case 212 /* SwitchStatement */:
+                    case 226 /* CaseBlock */:
+                    case 248 /* CaseClause */:
+                    case 249 /* DefaultClause */:
+                    case 213 /* LabeledStatement */:
+                    case 214 /* ThrowStatement */:
+                    case 215 /* TryStatement */:
+                    case 251 /* CatchClause */:
+                    case 240 /* JsxElement */:
+                    case 241 /* JsxSelfClosingElement */:
+                    case 245 /* JsxAttribute */:
+                    case 246 /* JsxSpreadAttribute */:
+                    case 242 /* JsxOpeningElement */:
+                    case 247 /* JsxExpression */:
+                        ts.forEachChild(node, visit);
+                        break;
                 }
-                return false;
             }
         }
-        // Get the narrowed type of a given symbol at a given location
-        function getNarrowedTypeOfSymbol(symbol, node) {
-            var type = getTypeOfSymbol(symbol);
-            // Only narrow when symbol is variable of type any or an object, union, or type parameter type
-            if (node && symbol.flags & 3 /* Variable */) {
-                if (isTypeAny(type) || type.flags & (80896 /* ObjectType */ | 16384 /* Union */ | 512 /* TypeParameter */)) {
-                    var declaration = ts.getDeclarationOfKind(symbol, 214 /* VariableDeclaration */);
-                    var top_1 = declaration && getDeclarationContainer(declaration);
-                    var originalType = type;
-                    var nodeStack = [];
-                    loop: while (node.parent) {
-                        var child = node;
-                        node = node.parent;
-                        switch (node.kind) {
-                            case 199 /* IfStatement */:
-                            case 185 /* ConditionalExpression */:
-                            case 184 /* BinaryExpression */:
-                                nodeStack.push({ node: node, child: child });
-                                break;
-                            case 251 /* SourceFile */:
-                            case 221 /* ModuleDeclaration */:
-                                // Stop at the first containing file or module declaration
-                                break loop;
-                        }
-                        if (node === top_1) {
-                            break;
-                        }
-                    }
-                    var nodes;
-                    while (nodes = nodeStack.pop()) {
-                        var node_1 = nodes.node, child = nodes.child;
-                        switch (node_1.kind) {
-                            case 199 /* IfStatement */:
-                                // In a branch of an if statement, narrow based on controlling expression
-                                if (child !== node_1.expression) {
-                                    type = narrowType(type, node_1.expression, /*assumeTrue*/ child === node_1.thenStatement);
-                                }
-                                break;
-                            case 185 /* ConditionalExpression */:
-                                // In a branch of a conditional expression, narrow based on controlling condition
-                                if (child !== node_1.condition) {
-                                    type = narrowType(type, node_1.condition, /*assumeTrue*/ child === node_1.whenTrue);
-                                }
-                                break;
-                            case 184 /* BinaryExpression */:
-                                // In the right operand of an && or ||, narrow based on left operand
-                                if (child === node_1.right) {
-                                    if (node_1.operatorToken.kind === 51 /* AmpersandAmpersandToken */) {
-                                        type = narrowType(type, node_1.left, /*assumeTrue*/ true);
-                                    }
-                                    else if (node_1.operatorToken.kind === 52 /* BarBarToken */) {
-                                        type = narrowType(type, node_1.left, /*assumeTrue*/ false);
-                                    }
-                                }
-                                break;
-                            default:
-                                ts.Debug.fail("Unreachable!");
-                        }
-                        // Use original type if construct contains assignments to variable
-                        if (type !== originalType && isVariableAssignedWithin(symbol, node_1)) {
-                            type = originalType;
-                        }
-                    }
-                    // Preserve old top-level behavior - if the branch is really an empty set, revert to prior type
-                    if (type === emptyUnionType) {
-                        type = originalType;
-                    }
+        function isReferenceAssignedWithin(reference, node) {
+            if (reference.kind !== 97 /* ThisKeyword */) {
+                var key = getAssignmentKey(reference);
+                if (key) {
+                    var links = getNodeLinks(node);
+                    return (links.assignmentMap || (links.assignmentMap = getAssignmentMap(node)))[key];
                 }
             }
-            return type;
-            function narrowTypeByEquality(type, expr, assumeTrue) {
-                // Check that we have 'typeof <symbol>' on the left and string literal on the right
-                if (expr.left.kind !== 179 /* TypeOfExpression */ || expr.right.kind !== 9 /* StringLiteral */) {
+            return false;
+        }
+        function isAnyPartOfReferenceAssignedWithin(reference, node) {
+            while (true) {
+                if (isReferenceAssignedWithin(reference, node)) {
+                    return true;
+                }
+                if (reference.kind !== 171 /* PropertyAccessExpression */) {
+                    return false;
+                }
+                reference = reference.expression;
+            }
+        }
+        function isNullOrUndefinedLiteral(node) {
+            return node.kind === 93 /* NullKeyword */ ||
+                node.kind === 69 /* Identifier */ && getResolvedSymbol(node) === undefinedSymbol;
+        }
+        function getLeftmostIdentifierOrThis(node) {
+            switch (node.kind) {
+                case 69 /* Identifier */:
+                case 97 /* ThisKeyword */:
+                    return node;
+                case 171 /* PropertyAccessExpression */:
+                    return getLeftmostIdentifierOrThis(node.expression);
+            }
+            return undefined;
+        }
+        function isMatchingReference(source, target) {
+            if (source.kind === target.kind) {
+                switch (source.kind) {
+                    case 69 /* Identifier */:
+                        return getResolvedSymbol(source) === getResolvedSymbol(target);
+                    case 97 /* ThisKeyword */:
+                        return true;
+                    case 171 /* PropertyAccessExpression */:
+                        return source.name.text === target.name.text &&
+                            isMatchingReference(source.expression, target.expression);
+                }
+            }
+            return false;
+        }
+        // Get the narrowed type of a given symbol at a given location
+        function getNarrowedTypeOfReference(type, reference) {
+            if (!(type.flags & (1 /* Any */ | 80896 /* ObjectType */ | 16384 /* Union */ | 512 /* TypeParameter */))) {
+                return type;
+            }
+            var leftmostNode = getLeftmostIdentifierOrThis(reference);
+            if (!leftmostNode) {
+                return type;
+            }
+            var top;
+            if (leftmostNode.kind === 69 /* Identifier */) {
+                var leftmostSymbol = getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(leftmostNode));
+                if (!leftmostSymbol) {
                     return type;
                 }
+                var declaration = leftmostSymbol.valueDeclaration;
+                if (!declaration || declaration.kind !== 217 /* VariableDeclaration */ && declaration.kind !== 141 /* Parameter */ && declaration.kind !== 168 /* BindingElement */) {
+                    return type;
+                }
+                top = getDeclarationContainer(declaration);
+            }
+            var originalType = type;
+            var nodeStack = [];
+            var node = reference;
+            loop: while (node.parent) {
+                var child = node;
+                node = node.parent;
+                switch (node.kind) {
+                    case 202 /* IfStatement */:
+                    case 187 /* ConditionalExpression */:
+                    case 186 /* BinaryExpression */:
+                        nodeStack.push({ node: node, child: child });
+                        break;
+                    case 255 /* SourceFile */:
+                    case 224 /* ModuleDeclaration */:
+                        break loop;
+                    default:
+                        if (node === top || ts.isFunctionLikeKind(node.kind)) {
+                            break loop;
+                        }
+                        break;
+                }
+            }
+            var nodes;
+            while (nodes = nodeStack.pop()) {
+                var node_1 = nodes.node, child = nodes.child;
+                switch (node_1.kind) {
+                    case 202 /* IfStatement */:
+                        // In a branch of an if statement, narrow based on controlling expression
+                        if (child !== node_1.expression) {
+                            type = narrowType(type, node_1.expression, /*assumeTrue*/ child === node_1.thenStatement);
+                        }
+                        break;
+                    case 187 /* ConditionalExpression */:
+                        // In a branch of a conditional expression, narrow based on controlling condition
+                        if (child !== node_1.condition) {
+                            type = narrowType(type, node_1.condition, /*assumeTrue*/ child === node_1.whenTrue);
+                        }
+                        break;
+                    case 186 /* BinaryExpression */:
+                        // In the right operand of an && or ||, narrow based on left operand
+                        if (child === node_1.right) {
+                            if (node_1.operatorToken.kind === 51 /* AmpersandAmpersandToken */) {
+                                type = narrowType(type, node_1.left, /*assumeTrue*/ true);
+                            }
+                            else if (node_1.operatorToken.kind === 52 /* BarBarToken */) {
+                                type = narrowType(type, node_1.left, /*assumeTrue*/ false);
+                            }
+                        }
+                        break;
+                    default:
+                        ts.Debug.fail("Unreachable!");
+                }
+                // Use original type if construct contains assignments to variable
+                if (type !== originalType && isAnyPartOfReferenceAssignedWithin(reference, node_1)) {
+                    type = originalType;
+                }
+            }
+            // Preserve old top-level behavior - if the branch is really an empty set, revert to prior type
+            if (type === emptyUnionType) {
+                type = originalType;
+            }
+            return type;
+            function narrowTypeByTruthiness(type, expr, assumeTrue) {
+                return strictNullChecks && assumeTrue && isMatchingReference(expr, reference) ? getNonNullableType(type) : type;
+            }
+            function narrowTypeByBinaryExpression(type, expr, assumeTrue) {
+                switch (expr.operatorToken.kind) {
+                    case 30 /* EqualsEqualsToken */:
+                    case 31 /* ExclamationEqualsToken */:
+                    case 32 /* EqualsEqualsEqualsToken */:
+                    case 33 /* ExclamationEqualsEqualsToken */:
+                        if (isNullOrUndefinedLiteral(expr.right)) {
+                            return narrowTypeByNullCheck(type, expr, assumeTrue);
+                        }
+                        if (expr.left.kind === 181 /* TypeOfExpression */ && expr.right.kind === 9 /* StringLiteral */) {
+                            return narrowTypeByTypeof(type, expr, assumeTrue);
+                        }
+                        break;
+                    case 51 /* AmpersandAmpersandToken */:
+                        return narrowTypeByAnd(type, expr, assumeTrue);
+                    case 52 /* BarBarToken */:
+                        return narrowTypeByOr(type, expr, assumeTrue);
+                    case 91 /* InstanceOfKeyword */:
+                        return narrowTypeByInstanceof(type, expr, assumeTrue);
+                }
+                return type;
+            }
+            function narrowTypeByNullCheck(type, expr, assumeTrue) {
+                // We have '==', '!=', '===', or '!==' operator with 'null' or 'undefined' on the right
+                var operator = expr.operatorToken.kind;
+                if (operator === 31 /* ExclamationEqualsToken */ || operator === 33 /* ExclamationEqualsEqualsToken */) {
+                    assumeTrue = !assumeTrue;
+                }
+                if (!strictNullChecks || !isMatchingReference(expr.left, reference)) {
+                    return type;
+                }
+                var doubleEquals = operator === 30 /* EqualsEqualsToken */ || operator === 31 /* ExclamationEqualsToken */;
+                var exprNullableKind = doubleEquals ? 96 /* Nullable */ :
+                    expr.right.kind === 93 /* NullKeyword */ ? 64 /* Null */ : 32 /* Undefined */;
+                if (assumeTrue) {
+                    var nullableKind = getNullableKind(type) & exprNullableKind;
+                    return nullableKind ? getNullableTypeOfKind(nullableKind) : type;
+                }
+                return removeNullableKind(type, exprNullableKind);
+            }
+            function narrowTypeByTypeof(type, expr, assumeTrue) {
+                // We have '==', '!=', '====', or !==' operator with 'typeof xxx' on the left
+                // and string literal on the right
                 var left = expr.left;
                 var right = expr.right;
-                if (left.expression.kind !== 69 /* Identifier */ || getResolvedSymbol(left.expression) !== symbol) {
+                if (!isMatchingReference(left.expression, reference)) {
                     return type;
                 }
-                if (expr.operatorToken.kind === 33 /* ExclamationEqualsEqualsToken */) {
+                if (expr.operatorToken.kind === 31 /* ExclamationEqualsToken */ ||
+                    expr.operatorToken.kind === 33 /* ExclamationEqualsEqualsToken */) {
                     assumeTrue = !assumeTrue;
                 }
                 var typeInfo = primitiveTypeInfo[right.text];
@@ -20665,7 +21921,7 @@ var ts;
             }
             function narrowTypeByInstanceof(type, expr, assumeTrue) {
                 // Check that type is not any, assumed result is true, and we have variable symbol on the left
-                if (isTypeAny(type) || expr.left.kind !== 69 /* Identifier */ || getResolvedSymbol(expr.left) !== symbol) {
+                if (isTypeAny(type) || !isMatchingReference(expr.left, reference)) {
                     return type;
                 }
                 // Check that right operand is a function type with a prototype property
@@ -20684,7 +21940,7 @@ var ts;
                 }
                 if (!targetType) {
                     // Target type is type of construct signature
-                    var constructSignatures;
+                    var constructSignatures = void 0;
                     if (rightType.flags & 2048 /* Interface */) {
                         constructSignatures = resolveDeclaredMembers(rightType).declaredConstructSignatures;
                     }
@@ -20715,105 +21971,181 @@ var ts;
                         return getUnionType(assignableConstituents);
                     }
                 }
-                if (isTypeAssignableTo(narrowedTypeCandidate, originalType)) {
+                var targetType = originalType.flags & 512 /* TypeParameter */ ? getApparentType(originalType) : originalType;
+                if (isTypeAssignableTo(narrowedTypeCandidate, targetType)) {
                     // Narrow to the target type if it's assignable to the current type
                     return narrowedTypeCandidate;
                 }
                 return originalType;
             }
-            function narrowTypeByTypePredicate(type, expr, assumeTrue) {
+            function narrowTypeByTypePredicate(type, callExpression, assumeTrue) {
                 if (type.flags & 1 /* Any */) {
                     return type;
                 }
-                var signature = getResolvedSignature(expr);
-                var predicateType = getReturnTypeOfSignature(signature);
-                if (!predicateType || !(predicateType.flags & 134217728 /* PredicateType */)) {
+                var signature = getResolvedSignature(callExpression);
+                var predicate = signature.typePredicate;
+                if (!predicate) {
                     return type;
                 }
-                var predicate = predicateType.predicate;
                 if (ts.isIdentifierTypePredicate(predicate)) {
-                    var callExpression = expr;
-                    if (callExpression.arguments[predicate.parameterIndex] &&
-                        getSymbolAtTypePredicatePosition(callExpression.arguments[predicate.parameterIndex]) === symbol) {
+                    var predicateArgument = callExpression.arguments[predicate.parameterIndex];
+                    if (predicateArgument && isMatchingReference(predicateArgument, reference)) {
                         return getNarrowedType(type, predicate.type, assumeTrue);
                     }
                 }
                 else {
-                    var expression = skipParenthesizedNodes(expr.expression);
-                    return narrowTypeByThisTypePredicate(type, predicate, expression, assumeTrue);
-                }
-                return type;
-            }
-            function narrowTypeByTypePredicateMember(type, expr, assumeTrue) {
-                if (type.flags & 1 /* Any */) {
-                    return type;
-                }
-                var memberType = getTypeOfExpression(expr);
-                if (!(memberType.flags & 134217728 /* PredicateType */)) {
-                    return type;
-                }
-                return narrowTypeByThisTypePredicate(type, memberType.predicate, expr, assumeTrue);
-            }
-            function narrowTypeByThisTypePredicate(type, predicate, expression, assumeTrue) {
-                if (expression.kind === 170 /* ElementAccessExpression */ || expression.kind === 169 /* PropertyAccessExpression */) {
-                    var accessExpression = expression;
-                    var possibleIdentifier = skipParenthesizedNodes(accessExpression.expression);
-                    if (possibleIdentifier.kind === 69 /* Identifier */ && getSymbolAtTypePredicatePosition(possibleIdentifier) === symbol) {
-                        return getNarrowedType(type, predicate.type, assumeTrue);
+                    var invokedExpression = skipParenthesizedNodes(callExpression.expression);
+                    if (invokedExpression.kind === 172 /* ElementAccessExpression */ || invokedExpression.kind === 171 /* PropertyAccessExpression */) {
+                        var accessExpression = invokedExpression;
+                        var possibleReference = skipParenthesizedNodes(accessExpression.expression);
+                        if (isMatchingReference(possibleReference, reference)) {
+                            return getNarrowedType(type, predicate.type, assumeTrue);
+                        }
                     }
                 }
                 return type;
             }
-            function getSymbolAtTypePredicatePosition(expr) {
-                expr = skipParenthesizedNodes(expr);
-                switch (expr.kind) {
-                    case 69 /* Identifier */:
-                    case 169 /* PropertyAccessExpression */:
-                    case 136 /* QualifiedName */:
-                        return getSymbolOfEntityNameOrPropertyAccessExpression(expr);
-                }
-            }
             // Narrow the given type based on the given expression having the assumed boolean value. The returned type
             // will be a subtype or the same type as the argument.
             function narrowType(type, expr, assumeTrue) {
                 switch (expr.kind) {
-                    case 171 /* CallExpression */:
+                    case 69 /* Identifier */:
+                    case 97 /* ThisKeyword */:
+                    case 171 /* PropertyAccessExpression */:
+                        return narrowTypeByTruthiness(type, expr, assumeTrue);
+                    case 173 /* CallExpression */:
                         return narrowTypeByTypePredicate(type, expr, assumeTrue);
-                    case 175 /* ParenthesizedExpression */:
+                    case 177 /* ParenthesizedExpression */:
                         return narrowType(type, expr.expression, assumeTrue);
-                    case 184 /* BinaryExpression */:
-                        var operator = expr.operatorToken.kind;
-                        if (operator === 32 /* EqualsEqualsEqualsToken */ || operator === 33 /* ExclamationEqualsEqualsToken */) {
-                            return narrowTypeByEquality(type, expr, assumeTrue);
-                        }
-                        else if (operator === 51 /* AmpersandAmpersandToken */) {
-                            return narrowTypeByAnd(type, expr, assumeTrue);
-                        }
-                        else if (operator === 52 /* BarBarToken */) {
-                            return narrowTypeByOr(type, expr, assumeTrue);
-                        }
-                        else if (operator === 91 /* InstanceOfKeyword */) {
-                            return narrowTypeByInstanceof(type, expr, assumeTrue);
-                        }
-                        break;
-                    case 182 /* PrefixUnaryExpression */:
+                    case 186 /* BinaryExpression */:
+                        return narrowTypeByBinaryExpression(type, expr, assumeTrue);
+                    case 184 /* PrefixUnaryExpression */:
                         if (expr.operator === 49 /* ExclamationToken */) {
                             return narrowType(type, expr.operand, !assumeTrue);
                         }
                         break;
-                    case 170 /* ElementAccessExpression */:
-                    case 169 /* PropertyAccessExpression */:
-                        return narrowTypeByTypePredicateMember(type, expr, assumeTrue);
                 }
                 return type;
             }
         }
+        function getTypeOfSymbolAtLocation(symbol, location) {
+            // The language service will always care about the narrowed type of a symbol, because that is
+            // the type the language says the symbol should have.
+            var type = getTypeOfSymbol(symbol);
+            if (location.kind === 69 /* Identifier */) {
+                if (ts.isRightSideOfQualifiedNameOrPropertyAccess(location)) {
+                    location = location.parent;
+                }
+                // If location is an identifier or property access that references the given
+                // symbol, use the location as the reference with respect to which we narrow.
+                if (ts.isExpression(location)) {
+                    checkExpression(location);
+                    if (getNodeLinks(location).resolvedSymbol === symbol) {
+                        return getNarrowedTypeOfReference(type, location);
+                    }
+                }
+            }
+            // 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. To answer that question we manufacture a transient
+            // identifier at the location and narrow with respect to that identifier.
+            return getNarrowedTypeOfReference(type, createTransientIdentifier(symbol, location));
+        }
         function skipParenthesizedNodes(expression) {
-            while (expression.kind === 175 /* ParenthesizedExpression */) {
+            while (expression.kind === 177 /* ParenthesizedExpression */) {
                 expression = expression.expression;
             }
             return expression;
         }
+        function findFirstAssignment(symbol, container) {
+            return visit(ts.isFunctionLike(container) ? container.body : container);
+            function visit(node) {
+                switch (node.kind) {
+                    case 69 /* Identifier */:
+                        var assignment = getAssignmentRoot(node);
+                        return assignment && getResolvedSymbol(node) === symbol ? assignment : undefined;
+                    case 186 /* BinaryExpression */:
+                    case 217 /* VariableDeclaration */:
+                    case 168 /* BindingElement */:
+                    case 166 /* ObjectBindingPattern */:
+                    case 167 /* ArrayBindingPattern */:
+                    case 169 /* ArrayLiteralExpression */:
+                    case 170 /* ObjectLiteralExpression */:
+                    case 171 /* PropertyAccessExpression */:
+                    case 172 /* ElementAccessExpression */:
+                    case 173 /* CallExpression */:
+                    case 174 /* NewExpression */:
+                    case 176 /* TypeAssertionExpression */:
+                    case 194 /* AsExpression */:
+                    case 195 /* NonNullExpression */:
+                    case 177 /* ParenthesizedExpression */:
+                    case 184 /* PrefixUnaryExpression */:
+                    case 180 /* DeleteExpression */:
+                    case 183 /* AwaitExpression */:
+                    case 181 /* TypeOfExpression */:
+                    case 182 /* VoidExpression */:
+                    case 185 /* PostfixUnaryExpression */:
+                    case 189 /* YieldExpression */:
+                    case 187 /* ConditionalExpression */:
+                    case 190 /* SpreadElementExpression */:
+                    case 199 /* VariableStatement */:
+                    case 201 /* ExpressionStatement */:
+                    case 202 /* IfStatement */:
+                    case 203 /* DoStatement */:
+                    case 204 /* WhileStatement */:
+                    case 205 /* ForStatement */:
+                    case 206 /* ForInStatement */:
+                    case 207 /* ForOfStatement */:
+                    case 210 /* ReturnStatement */:
+                    case 211 /* WithStatement */:
+                    case 212 /* SwitchStatement */:
+                    case 226 /* CaseBlock */:
+                    case 248 /* CaseClause */:
+                    case 249 /* DefaultClause */:
+                    case 213 /* LabeledStatement */:
+                    case 214 /* ThrowStatement */:
+                    case 215 /* TryStatement */:
+                    case 251 /* CatchClause */:
+                    case 240 /* JsxElement */:
+                    case 241 /* JsxSelfClosingElement */:
+                    case 245 /* JsxAttribute */:
+                    case 246 /* JsxSpreadAttribute */:
+                    case 242 /* JsxOpeningElement */:
+                    case 247 /* JsxExpression */:
+                    case 198 /* Block */:
+                    case 255 /* SourceFile */:
+                        return ts.forEachChild(node, visit);
+                }
+                return undefined;
+            }
+        }
+        function checkVariableAssignedBefore(symbol, reference) {
+            if (!(symbol.flags & 3 /* Variable */)) {
+                return;
+            }
+            var declaration = symbol.valueDeclaration;
+            if (!declaration || declaration.kind !== 217 /* VariableDeclaration */ || declaration.initializer || ts.isInAmbientContext(declaration)) {
+                return;
+            }
+            var parentParentKind = declaration.parent.parent.kind;
+            if (parentParentKind === 207 /* ForOfStatement */ || parentParentKind === 206 /* ForInStatement */) {
+                return;
+            }
+            var declarationContainer = ts.getContainingFunction(declaration) || ts.getSourceFileOfNode(declaration);
+            var referenceContainer = ts.getContainingFunction(reference) || ts.getSourceFileOfNode(reference);
+            if (declarationContainer !== referenceContainer) {
+                return;
+            }
+            var links = getSymbolLinks(symbol);
+            if (!links.firstAssignmentChecked) {
+                links.firstAssignmentChecked = true;
+                links.firstAssignment = findFirstAssignment(symbol, declarationContainer);
+            }
+            if (links.firstAssignment && links.firstAssignment.end <= reference.pos) {
+                return;
+            }
+            error(reference, ts.Diagnostics.Variable_0_is_used_before_being_assigned, symbolToString(symbol));
+        }
         function checkIdentifier(node) {
             var symbol = getResolvedSymbol(node);
             // As noted in ECMAScript 6 language spec, arrow functions never have an arguments objects.
@@ -20824,23 +22156,44 @@ var ts;
             // can explicitly bound arguments objects
             if (symbol === argumentsSymbol) {
                 var container = ts.getContainingFunction(node);
-                if (container.kind === 177 /* ArrowFunction */) {
+                if (container.kind === 179 /* ArrowFunction */) {
                     if (languageVersion < 2 /* ES6 */) {
                         error(node, ts.Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression);
                     }
                 }
-                if (node.parserContextFlags & 8 /* Await */) {
-                    getNodeLinks(container).flags |= 4096 /* CaptureArguments */;
-                    getNodeLinks(node).flags |= 2048 /* LexicalArguments */;
+                if (node.flags & 33554432 /* AwaitContext */) {
+                    getNodeLinks(container).flags |= 8192 /* CaptureArguments */;
                 }
             }
             if (symbol.flags & 8388608 /* Alias */ && !isInTypeQuery(node) && !isConstEnumOrConstEnumOnlyModule(resolveAlias(symbol))) {
                 markAliasSymbolAsReferenced(symbol);
             }
+            var 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 === 2 /* ES6 */
+                && localOrExportSymbol.flags & 32 /* Class */
+                && localOrExportSymbol.valueDeclaration.kind === 220 /* ClassDeclaration */
+                && ts.nodeIsDecorated(localOrExportSymbol.valueDeclaration)) {
+                var container = ts.getContainingClass(node);
+                while (container !== undefined) {
+                    if (container === localOrExportSymbol.valueDeclaration && container.name !== node) {
+                        getNodeLinks(container).flags |= 524288 /* ClassWithBodyScopedClassBinding */;
+                        getNodeLinks(node).flags |= 1048576 /* BodyScopedClassBinding */;
+                        break;
+                    }
+                    container = ts.getContainingClass(container);
+                }
+            }
             checkCollisionWithCapturedSuperVariable(node, node);
             checkCollisionWithCapturedThisVariable(node, node);
-            checkBlockScopedBindingCapturedInLoop(node, symbol);
-            return getNarrowedTypeOfSymbol(getExportSymbolOfValueSymbolIfExported(symbol), node);
+            checkNestedBlockScopedBinding(node, symbol);
+            var type = getTypeOfSymbol(localOrExportSymbol);
+            if (strictNullChecks && !isAssignmentTarget(node) && !(type.flags & 1 /* Any */) && !(getNullableKind(type) & 32 /* Undefined */)) {
+                checkVariableAssignedBefore(symbol, node);
+            }
+            return getNarrowedTypeOfReference(type, node);
         }
         function isInsideFunction(node, threshold) {
             var current = node;
@@ -20852,52 +22205,79 @@ var ts;
             }
             return false;
         }
-        function checkBlockScopedBindingCapturedInLoop(node, symbol) {
+        function checkNestedBlockScopedBinding(node, symbol) {
             if (languageVersion >= 2 /* ES6 */ ||
                 (symbol.flags & (2 /* BlockScopedVariable */ | 32 /* Class */)) === 0 ||
-                symbol.valueDeclaration.parent.kind === 247 /* CatchClause */) {
+                symbol.valueDeclaration.parent.kind === 251 /* CatchClause */) {
                 return;
             }
             // 1. walk from the use site up to the declaration and check
             // if there is anything function like between declaration and use-site (is binding/class is captured in function).
             // 2. walk from the declaration up to the boundary of lexical environment and check
             // if there is an iteration statement in between declaration and boundary (is binding/class declared inside iteration statement)
-            var container;
-            if (symbol.flags & 32 /* Class */) {
-                // get parent of class declaration
-                container = getClassLikeDeclarationOfSymbol(symbol).parent;
-            }
-            else {
-                // nesting structure:
-                // (variable declaration or binding element) -> variable declaration list -> container
-                container = symbol.valueDeclaration;
-                while (container.kind !== 215 /* VariableDeclarationList */) {
-                    container = container.parent;
-                }
-                // get the parent of variable declaration list
-                container = container.parent;
-                if (container.kind === 196 /* VariableStatement */) {
-                    // if parent is variable statement - get its parent
-                    container = container.parent;
-                }
-            }
-            var inFunction = isInsideFunction(node.parent, container);
+            var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
+            var usedInFunction = isInsideFunction(node.parent, container);
             var current = container;
+            var containedInIterationStatement = false;
             while (current && !ts.nodeStartsNewLexicalEnvironment(current)) {
                 if (ts.isIterationStatement(current, /*lookInLabeledStatements*/ false)) {
-                    if (inFunction) {
-                        getNodeLinks(current).flags |= 65536 /* LoopWithBlockScopedBindingCapturedInFunction */;
-                    }
-                    // mark value declaration so during emit they can have a special handling
-                    getNodeLinks(symbol.valueDeclaration).flags |= 16384 /* BlockScopedBindingInLoop */;
+                    containedInIterationStatement = true;
                     break;
                 }
                 current = current.parent;
             }
+            if (containedInIterationStatement) {
+                if (usedInFunction) {
+                    // mark iteration statement as containing block-scoped binding captured in some function
+                    getNodeLinks(current).flags |= 65536 /* LoopWithCapturedBlockScopedBinding */;
+                }
+                // mark variables that are declared in loop initializer and reassigned inside the body of ForStatement.
+                // if body of ForStatement will be converted to function then we'll need a extra machinery to propagate reassigned values back.
+                if (container.kind === 205 /* ForStatement */ &&
+                    ts.getAncestor(symbol.valueDeclaration, 218 /* VariableDeclarationList */).parent === container &&
+                    isAssignedInBodyOfForStatement(node, container)) {
+                    getNodeLinks(symbol.valueDeclaration).flags |= 2097152 /* NeedsLoopOutParameter */;
+                }
+                // set 'declared inside loop' bit on the block-scoped binding
+                getNodeLinks(symbol.valueDeclaration).flags |= 262144 /* BlockScopedBindingInLoop */;
+            }
+            if (usedInFunction) {
+                getNodeLinks(symbol.valueDeclaration).flags |= 131072 /* CapturedBlockScopedBinding */;
+            }
+        }
+        function isAssignedInBodyOfForStatement(node, container) {
+            var current = node;
+            // skip parenthesized nodes
+            while (current.parent.kind === 177 /* ParenthesizedExpression */) {
+                current = current.parent;
+            }
+            // check if node is used as LHS in some assignment expression
+            var isAssigned = false;
+            if (isAssignmentTarget(current)) {
+                isAssigned = true;
+            }
+            else if ((current.parent.kind === 184 /* PrefixUnaryExpression */ || current.parent.kind === 185 /* PostfixUnaryExpression */)) {
+                var expr = current.parent;
+                isAssigned = expr.operator === 41 /* PlusPlusToken */ || expr.operator === 42 /* MinusMinusToken */;
+            }
+            if (!isAssigned) {
+                return false;
+            }
+            // at this point we know that node is the target of assignment
+            // now check that modification happens inside the statement part of the ForStatement
+            while (current !== container) {
+                if (current === container.statement) {
+                    return true;
+                }
+                else {
+                    current = current.parent;
+                }
+            }
+            return false;
         }
         function captureLexicalThis(node, container) {
             getNodeLinks(node).flags |= 2 /* LexicalThis */;
-            if (container.kind === 142 /* PropertyDeclaration */ || container.kind === 145 /* Constructor */) {
+            if (container.kind === 144 /* PropertyDeclaration */ || container.kind === 147 /* Constructor */) {
                 var classNode = container.parent;
                 getNodeLinks(classNode).flags |= 4 /* CaptureThis */;
             }
@@ -20905,80 +22285,173 @@ var ts;
                 getNodeLinks(container).flags |= 4 /* CaptureThis */;
             }
         }
+        function findFirstSuperCall(n) {
+            if (ts.isSuperCallExpression(n)) {
+                return n;
+            }
+            else if (ts.isFunctionLike(n)) {
+                return undefined;
+            }
+            return ts.forEachChild(n, findFirstSuperCall);
+        }
+        /**
+         * Return a cached result if super-statement is already found.
+         * Otherwise, find a super statement in a given constructor function and cache the result in the node-links of the constructor
+         *
+         * @param constructor constructor-function to look for super statement
+         */
+        function getSuperCallInConstructor(constructor) {
+            var links = getNodeLinks(constructor);
+            // Only trying to find super-call if we haven't yet tried to find one.  Once we try, we will record the result
+            if (links.hasSuperCall === undefined) {
+                links.superCall = findFirstSuperCall(constructor.body);
+                links.hasSuperCall = links.superCall ? true : false;
+            }
+            return links.superCall;
+        }
+        /**
+         * Check if the given class-declaration extends null then return true.
+         * Otherwise, return false
+         * @param classDecl a class declaration to check if it extends null
+         */
+        function classDeclarationExtendsNull(classDecl) {
+            var classSymbol = getSymbolOfNode(classDecl);
+            var classInstanceType = getDeclaredTypeOfSymbol(classSymbol);
+            var baseConstructorType = getBaseConstructorTypeOfClass(classInstanceType);
+            return baseConstructorType === nullType;
+        }
         function checkThisExpression(node) {
             // Stop at the first arrow function so that we can
             // tell whether 'this' needs to be captured.
             var container = ts.getThisContainer(node, /* includeArrowFunctions */ true);
             var needToCaptureLexicalThis = false;
+            if (container.kind === 147 /* Constructor */) {
+                var containingClassDecl = container.parent;
+                var baseTypeNode = ts.getClassExtendsHeritageClauseElement(containingClassDecl);
+                // If a containing class does not have extends clause or the class extends null
+                // skip checking whether super statement is called before "this" accessing.
+                if (baseTypeNode && !classDeclarationExtendsNull(containingClassDecl)) {
+                    var superCall = getSuperCallInConstructor(container);
+                    // We should give an error in the following cases:
+                    //      - No super-call
+                    //      - "this" is accessing before super-call.
+                    //          i.e super(this)
+                    //              this.x; super();
+                    // We want to make sure that super-call is done before accessing "this" so that
+                    // "this" is not accessed as a parameter of the super-call.
+                    if (!superCall || superCall.end > node.pos) {
+                        // In ES6, super inside constructor of class-declaration has to precede "this" accessing
+                        error(node, ts.Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class);
+                    }
+                }
+            }
             // Now skip arrow functions to get the "real" owner of 'this'.
-            if (container.kind === 177 /* ArrowFunction */) {
+            if (container.kind === 179 /* ArrowFunction */) {
                 container = ts.getThisContainer(container, /* includeArrowFunctions */ false);
                 // When targeting es6, arrow function lexically bind "this" so we do not need to do the work of binding "this" in emitted code
                 needToCaptureLexicalThis = (languageVersion < 2 /* ES6 */);
             }
             switch (container.kind) {
-                case 221 /* ModuleDeclaration */:
+                case 224 /* ModuleDeclaration */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_module_or_namespace_body);
                     // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     break;
-                case 220 /* EnumDeclaration */:
+                case 223 /* EnumDeclaration */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
                     // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     break;
-                case 145 /* Constructor */:
+                case 147 /* Constructor */:
                     if (isInConstructorArgumentInitializer(node, container)) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_constructor_arguments);
                     }
                     break;
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
-                    if (container.flags & 64 /* Static */) {
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
+                    if (container.flags & 32 /* Static */) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_static_property_initializer);
                     }
                     break;
-                case 137 /* ComputedPropertyName */:
+                case 139 /* ComputedPropertyName */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_computed_property_name);
                     break;
             }
             if (needToCaptureLexicalThis) {
                 captureLexicalThis(node, container);
             }
-            if (ts.isClassLike(container.parent)) {
-                var symbol = getSymbolOfNode(container.parent);
-                return container.flags & 64 /* Static */ ? getTypeOfSymbol(symbol) : getDeclaredTypeOfSymbol(symbol).thisType;
-            }
-            // If this is a function in a JS file, it might be a class method. Check if it's the RHS
-            // of a x.prototype.y = function [name]() { .... }
-            if (ts.isInJavaScriptFile(node) && container.kind === 176 /* FunctionExpression */) {
-                if (ts.getSpecialPropertyAssignmentKind(container.parent) === 3 /* PrototypeProperty */) {
-                    // Get the 'x' of 'x.prototype.y = f' (here, 'f' is 'container')
-                    var className = container.parent // x.protoype.y = f
-                        .left // x.prototype.y
-                        .expression // x.prototype
-                        .expression; // x
-                    var classSymbol = checkExpression(className).symbol;
-                    if (classSymbol && classSymbol.members && (classSymbol.flags & 16 /* Function */)) {
-                        return getInferredClassType(classSymbol);
+            if (ts.isFunctionLike(container)) {
+                var type = getContextuallyTypedThisType(container);
+                if (type) {
+                    return type;
+                }
+                var signature = getSignatureFromDeclaration(container);
+                if (signature.thisType) {
+                    return signature.thisType;
+                }
+                if (container.parent && container.parent.kind === 170 /* ObjectLiteralExpression */) {
+                    // Note: this works because object literal methods are deferred,
+                    // which means that the type of the containing object literal is already known.
+                    var type_1 = checkExpressionCached(container.parent);
+                    if (type_1) {
+                        return type_1;
                     }
                 }
             }
+            if (ts.isClassLike(container.parent)) {
+                var symbol = getSymbolOfNode(container.parent);
+                var type = container.flags & 32 /* Static */ ? getTypeOfSymbol(symbol) : getDeclaredTypeOfSymbol(symbol).thisType;
+                return getNarrowedTypeOfReference(type, node);
+            }
+            if (ts.isInJavaScriptFile(node)) {
+                var type = getTypeForThisExpressionFromJSDoc(container);
+                if (type && type !== unknownType) {
+                    return type;
+                }
+                // If this is a function in a JS file, it might be a class method. Check if it's the RHS
+                // of a x.prototype.y = function [name]() { .... }
+                if (container.kind === 178 /* FunctionExpression */) {
+                    if (ts.getSpecialPropertyAssignmentKind(container.parent) === 3 /* PrototypeProperty */) {
+                        // Get the 'x' of 'x.prototype.y = f' (here, 'f' is 'container')
+                        var className = container.parent // x.prototype.y = f
+                            .left // x.prototype.y
+                            .expression // x.prototype
+                            .expression; // x
+                        var classSymbol = checkExpression(className).symbol;
+                        if (classSymbol && classSymbol.members && (classSymbol.flags & 16 /* Function */)) {
+                            return getInferredClassType(classSymbol);
+                        }
+                    }
+                }
+            }
+            if (compilerOptions.noImplicitThis) {
+                // With noImplicitThis, functions may not reference 'this' if it has type 'any'
+                error(node, ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation);
+            }
             return anyType;
         }
+        function getTypeForThisExpressionFromJSDoc(node) {
+            var typeTag = ts.getJSDocTypeTag(node);
+            if (typeTag && typeTag.typeExpression && typeTag.typeExpression.type && typeTag.typeExpression.type.kind === 268 /* JSDocFunctionType */) {
+                var jsDocFunctionType = typeTag.typeExpression.type;
+                if (jsDocFunctionType.parameters.length > 0 && jsDocFunctionType.parameters[0].type.kind === 271 /* JSDocThisType */) {
+                    return getTypeFromTypeNode(jsDocFunctionType.parameters[0].type);
+                }
+            }
+        }
         function isInConstructorArgumentInitializer(node, constructorDecl) {
             for (var n = node; n && n !== constructorDecl; n = n.parent) {
-                if (n.kind === 139 /* Parameter */) {
+                if (n.kind === 141 /* Parameter */) {
                     return true;
                 }
             }
             return false;
         }
         function checkSuperExpression(node) {
-            var isCallExpression = node.parent.kind === 171 /* CallExpression */ && node.parent.expression === node;
+            var isCallExpression = node.parent.kind === 173 /* CallExpression */ && node.parent.expression === node;
             var container = ts.getSuperContainer(node, /*stopOnFunctions*/ true);
             var needToCaptureLexicalThis = false;
             if (!isCallExpression) {
                 // adjust the container reference in case if super is used inside arrow functions with arbitrary deep nesting
-                while (container && container.kind === 177 /* ArrowFunction */) {
+                while (container && container.kind === 179 /* ArrowFunction */) {
                     container = ts.getSuperContainer(container, /*stopOnFunctions*/ true);
                     needToCaptureLexicalThis = languageVersion < 2 /* ES6 */;
                 }
@@ -20992,16 +22465,16 @@ var ts;
                 //     [super.foo()]() {}
                 // }
                 var current = node;
-                while (current && current !== container && current.kind !== 137 /* ComputedPropertyName */) {
+                while (current && current !== container && current.kind !== 139 /* ComputedPropertyName */) {
                     current = current.parent;
                 }
-                if (current && current.kind === 137 /* ComputedPropertyName */) {
+                if (current && current.kind === 139 /* ComputedPropertyName */) {
                     error(node, ts.Diagnostics.super_cannot_be_referenced_in_a_computed_property_name);
                 }
                 else if (isCallExpression) {
                     error(node, ts.Diagnostics.Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors);
                 }
-                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 168 /* ObjectLiteralExpression */)) {
+                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 170 /* ObjectLiteralExpression */)) {
                     error(node, ts.Diagnostics.super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions);
                 }
                 else {
@@ -21009,20 +22482,84 @@ var ts;
                 }
                 return unknownType;
             }
-            if ((container.flags & 64 /* Static */) || isCallExpression) {
+            if ((container.flags & 32 /* Static */) || isCallExpression) {
                 nodeCheckFlag = 512 /* SuperStatic */;
             }
             else {
                 nodeCheckFlag = 256 /* SuperInstance */;
             }
             getNodeLinks(node).flags |= nodeCheckFlag;
+            // Due to how we emit async functions, we need to specialize the emit for an async method that contains a `super` reference.
+            // This is due to the fact that we emit the body of an async function inside of a generator function. As generator
+            // functions cannot reference `super`, we emit a helper inside of the method body, but outside of the generator. This helper
+            // uses an arrow function, which is permitted to reference `super`.
+            //
+            // There are two primary ways we can access `super` from within an async method. The first is getting the value of a property
+            // or indexed access on super, either as part of a right-hand-side expression or call expression. The second is when setting the value
+            // of a property or indexed access, either as part of an assignment expression or destructuring assignment.
+            //
+            // The simplest case is reading a value, in which case we will emit something like the following:
+            //
+            //  // ts
+            //  ...
+            //  async asyncMethod() {
+            //    let x = await super.asyncMethod();
+            //    return x;
+            //  }
+            //  ...
+            //
+            //  // js
+            //  ...
+            //  asyncMethod() {
+            //      const _super = name => super[name];
+            //      return __awaiter(this, arguments, Promise, function *() {
+            //          let x = yield _super("asyncMethod").call(this);
+            //          return x;
+            //      });
+            //  }
+            //  ...
+            //
+            // The more complex case is when we wish to assign a value, especially as part of a destructuring assignment. As both cases
+            // are legal in ES6, but also likely less frequent, we emit the same more complex helper for both scenarios:
+            //
+            //  // ts
+            //  ...
+            //  async asyncMethod(ar: Promise<any[]>) {
+            //      [super.a, super.b] = await ar;
+            //  }
+            //  ...
+            //
+            //  // js
+            //  ...
+            //  asyncMethod(ar) {
+            //      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 __awaiter(this, arguments, Promise, function *() {
+            //          [_super("a").value, _super("b").value] = yield ar;
+            //      });
+            //  }
+            //  ...
+            //
+            // 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 === 146 /* MethodDeclaration */ && container.flags & 256 /* Async */) {
+                if (ts.isSuperPropertyOrElementAccess(node.parent) && isAssignmentTarget(node.parent)) {
+                    getNodeLinks(container).flags |= 4096 /* AsyncMethodWithSuperBinding */;
+                }
+                else {
+                    getNodeLinks(container).flags |= 2048 /* AsyncMethodWithSuper */;
+                }
+            }
             if (needToCaptureLexicalThis) {
                 // call expressions are allowed only in constructors so they should always capture correct 'this'
                 // super property access expressions can also appear in arrow functions -
                 // in this case they should also use correct lexical this
                 captureLexicalThis(node.parent, container);
             }
-            if (container.parent.kind === 168 /* ObjectLiteralExpression */) {
+            if (container.parent.kind === 170 /* ObjectLiteralExpression */) {
                 if (languageVersion < 2 /* ES6 */) {
                     error(node, ts.Diagnostics.super_is_only_allowed_in_members_of_object_literal_expressions_when_option_target_is_ES2015_or_higher);
                     return unknownType;
@@ -21042,7 +22579,7 @@ var ts;
                 }
                 return unknownType;
             }
-            if (container.kind === 145 /* Constructor */ && isInConstructorArgumentInitializer(node, container)) {
+            if (container.kind === 147 /* Constructor */ && isInConstructorArgumentInitializer(node, container)) {
                 // issue custom error message for super property access in constructor arguments (to be aligned with old compiler)
                 error(node, ts.Diagnostics.super_cannot_be_referenced_in_constructor_arguments);
                 return unknownType;
@@ -21057,7 +22594,7 @@ var ts;
                 if (isCallExpression) {
                     // TS 1.0 SPEC (April 2014): 4.8.1
                     // Super calls are only permitted in constructors of derived classes
-                    return container.kind === 145 /* Constructor */;
+                    return container.kind === 147 /* Constructor */;
                 }
                 else {
                     // TS 1.0 SPEC (April 2014)
@@ -21065,27 +22602,38 @@ var ts;
                     // - In a constructor, instance member function, instance member accessor, or instance member variable initializer where this references a derived class instance
                     // - In a static member function or static member accessor
                     // topmost container must be something that is directly nested in the class declaration\object literal expression
-                    if (ts.isClassLike(container.parent) || container.parent.kind === 168 /* ObjectLiteralExpression */) {
-                        if (container.flags & 64 /* Static */) {
-                            return container.kind === 144 /* MethodDeclaration */ ||
-                                container.kind === 143 /* MethodSignature */ ||
-                                container.kind === 146 /* GetAccessor */ ||
-                                container.kind === 147 /* SetAccessor */;
+                    if (ts.isClassLike(container.parent) || container.parent.kind === 170 /* ObjectLiteralExpression */) {
+                        if (container.flags & 32 /* Static */) {
+                            return container.kind === 146 /* MethodDeclaration */ ||
+                                container.kind === 145 /* MethodSignature */ ||
+                                container.kind === 148 /* GetAccessor */ ||
+                                container.kind === 149 /* SetAccessor */;
                         }
                         else {
-                            return container.kind === 144 /* MethodDeclaration */ ||
-                                container.kind === 143 /* MethodSignature */ ||
-                                container.kind === 146 /* GetAccessor */ ||
-                                container.kind === 147 /* SetAccessor */ ||
-                                container.kind === 142 /* PropertyDeclaration */ ||
-                                container.kind === 141 /* PropertySignature */ ||
-                                container.kind === 145 /* Constructor */;
+                            return container.kind === 146 /* MethodDeclaration */ ||
+                                container.kind === 145 /* MethodSignature */ ||
+                                container.kind === 148 /* GetAccessor */ ||
+                                container.kind === 149 /* SetAccessor */ ||
+                                container.kind === 144 /* PropertyDeclaration */ ||
+                                container.kind === 143 /* PropertySignature */ ||
+                                container.kind === 147 /* Constructor */;
                         }
                     }
                 }
                 return false;
             }
         }
+        function getContextuallyTypedThisType(func) {
+            if ((isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) &&
+                isContextSensitive(func) &&
+                func.kind !== 179 /* ArrowFunction */) {
+                var contextualSignature = getContextualSignature(func);
+                if (contextualSignature) {
+                    return contextualSignature.thisType;
+                }
+            }
+            return undefined;
+        }
         // Return contextual type of parameter or undefined if no contextual type is available
         function getContextuallyTypedParameterType(parameter) {
             var func = parameter.parent;
@@ -21110,18 +22658,21 @@ var ts;
             }
             return undefined;
         }
-        // In a variable, parameter or property declaration with a type annotation, the contextual type of an initializer
-        // expression is the type of the variable, parameter or property. Otherwise, in a parameter declaration of a
-        // contextually typed function expression, the contextual type of an initializer expression is the contextual type
-        // of the parameter. Otherwise, in a variable or parameter declaration with a binding pattern name, the contextual
-        // type of an initializer expression is the type implied by the binding pattern.
+        // In a variable, parameter or property declaration with a type annotation,
+        //   the contextual type of an initializer expression is the type of the variable, parameter or property. 
+        // Otherwise, in a parameter declaration of a contextually typed function expression, 
+        //   the contextual type of an initializer expression is the contextual type of the parameter. 
+        // Otherwise, in a variable or parameter declaration with a binding pattern name,
+        //   the contextual type of an initializer expression is the type implied by the binding pattern.
+        // Otherwise, in a binding pattern inside a variable or parameter declaration,
+        //   the contextual type of an initializer expression is the type annotation of the containing declaration, if present.
         function getContextualTypeForInitializerExpression(node) {
             var declaration = node.parent;
             if (node === declaration.initializer) {
                 if (declaration.type) {
                     return getTypeFromTypeNode(declaration.type);
                 }
-                if (declaration.kind === 139 /* Parameter */) {
+                if (declaration.kind === 141 /* Parameter */) {
                     var type = getContextuallyTypedParameterType(declaration);
                     if (type) {
                         return type;
@@ -21130,6 +22681,18 @@ var ts;
                 if (ts.isBindingPattern(declaration.name)) {
                     return getTypeFromBindingPattern(declaration.name, /*includePatternInType*/ true);
                 }
+                if (ts.isBindingPattern(declaration.parent)) {
+                    var parentDeclaration = declaration.parent.parent;
+                    var name_11 = declaration.propertyName || declaration.name;
+                    if (ts.isVariableLike(parentDeclaration) &&
+                        parentDeclaration.type &&
+                        !ts.isBindingPattern(name_11)) {
+                        var text = getTextOfPropertyName(name_11);
+                        if (text) {
+                            return getTypeOfPropertyOfType(getTypeFromTypeNode(parentDeclaration.type), text);
+                        }
+                    }
+                }
             }
             return undefined;
         }
@@ -21154,7 +22717,7 @@ var ts;
         }
         function isInParameterInitializerBeforeContainingFunction(node) {
             while (node.parent && !ts.isFunctionLike(node.parent)) {
-                if (node.parent.kind === 139 /* Parameter */ && node.parent.initializer === node) {
+                if (node.parent.kind === 141 /* Parameter */ && node.parent.initializer === node) {
                     return true;
                 }
                 node = node.parent;
@@ -21165,8 +22728,8 @@ var ts;
             // If the containing function has a return type annotation, is a constructor, or is a get accessor whose
             // corresponding set accessor has a type annotation, return statements in the function are contextually typed
             if (functionDecl.type ||
-                functionDecl.kind === 145 /* Constructor */ ||
-                functionDecl.kind === 146 /* GetAccessor */ && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(functionDecl.symbol, 147 /* SetAccessor */))) {
+                functionDecl.kind === 147 /* Constructor */ ||
+                functionDecl.kind === 148 /* GetAccessor */ && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(functionDecl.symbol, 149 /* SetAccessor */))) {
                 return getReturnTypeOfSignature(getSignatureFromDeclaration(functionDecl));
             }
             // Otherwise, if the containing function is contextually typed by a function type with exactly one call signature
@@ -21188,7 +22751,7 @@ var ts;
             return undefined;
         }
         function getContextualTypeForSubstitutionExpression(template, substitutionExpression) {
-            if (template.parent.kind === 173 /* TaggedTemplateExpression */) {
+            if (template.parent.kind === 175 /* TaggedTemplateExpression */) {
                 return getContextualTypeForArgument(template.parent, substitutionExpression);
             }
             return undefined;
@@ -21261,10 +22824,6 @@ var ts;
         function contextualTypeIsTupleLikeType(type) {
             return !!(type.flags & 16384 /* Union */ ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type));
         }
-        // Return true if the given contextual type provides an index signature of the given kind
-        function contextualTypeHasIndexSignature(type, kind) {
-            return !!(type.flags & 16384 /* Union */ ? ts.forEach(type.types, function (t) { return getIndexTypeOfStructuredType(t, kind); }) : getIndexTypeOfStructuredType(type, kind));
-        }
         // In an object literal contextually typed by a type T, the contextual type of a property assignment is the type of
         // the matching property in T, if one exists. Otherwise, it is the type of the numeric index signature in T, if one
         // exists. Otherwise, it is the type of the string index signature in T, if one exists.
@@ -21319,13 +22878,13 @@ var ts;
             var kind = attribute.kind;
             var jsxElement = attribute.parent;
             var attrsType = getJsxElementAttributesType(jsxElement);
-            if (attribute.kind === 241 /* JsxAttribute */) {
+            if (attribute.kind === 245 /* JsxAttribute */) {
                 if (!attrsType || isTypeAny(attrsType)) {
                     return undefined;
                 }
                 return getTypeOfPropertyOfType(attrsType, attribute.name.text);
             }
-            else if (attribute.kind === 242 /* JsxSpreadAttribute */) {
+            else if (attribute.kind === 246 /* JsxSpreadAttribute */) {
                 return attrsType;
             }
             ts.Debug.fail("Expected JsxAttribute or JsxSpreadAttribute, got ts.SyntaxKind[" + kind + "]");
@@ -21345,7 +22904,7 @@ var ts;
          * Otherwise this may not be very useful.
          *
          * In cases where you *are* working on this function, you should understand
-         * when it is appropriate to use 'getContextualType' and 'getApparentTypeOfContetxualType'.
+         * when it is appropriate to use 'getContextualType' and 'getApparentTypeOfContextualType'.
          *
          *   - Use 'getContextualType' when you are simply going to propagate the result to the expression.
          *   - Use 'getApparentTypeOfContextualType' when you're going to need the members of the type.
@@ -21363,40 +22922,40 @@ var ts;
             }
             var parent = node.parent;
             switch (parent.kind) {
-                case 214 /* VariableDeclaration */:
-                case 139 /* Parameter */:
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
-                case 166 /* BindingElement */:
+                case 217 /* VariableDeclaration */:
+                case 141 /* Parameter */:
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
+                case 168 /* BindingElement */:
                     return getContextualTypeForInitializerExpression(node);
-                case 177 /* ArrowFunction */:
-                case 207 /* ReturnStatement */:
+                case 179 /* ArrowFunction */:
+                case 210 /* ReturnStatement */:
                     return getContextualTypeForReturnExpression(node);
-                case 187 /* YieldExpression */:
+                case 189 /* YieldExpression */:
                     return getContextualTypeForYieldOperand(parent);
-                case 171 /* CallExpression */:
-                case 172 /* NewExpression */:
+                case 173 /* CallExpression */:
+                case 174 /* NewExpression */:
                     return getContextualTypeForArgument(parent, node);
-                case 174 /* TypeAssertionExpression */:
-                case 192 /* AsExpression */:
+                case 176 /* TypeAssertionExpression */:
+                case 194 /* AsExpression */:
                     return getTypeFromTypeNode(parent.type);
-                case 184 /* BinaryExpression */:
+                case 186 /* BinaryExpression */:
                     return getContextualTypeForBinaryOperand(node);
-                case 248 /* PropertyAssignment */:
+                case 252 /* PropertyAssignment */:
                     return getContextualTypeForObjectLiteralElement(parent);
-                case 167 /* ArrayLiteralExpression */:
+                case 169 /* ArrayLiteralExpression */:
                     return getContextualTypeForElementExpression(node);
-                case 185 /* ConditionalExpression */:
+                case 187 /* ConditionalExpression */:
                     return getContextualTypeForConditionalOperand(node);
-                case 193 /* TemplateSpan */:
-                    ts.Debug.assert(parent.parent.kind === 186 /* TemplateExpression */);
+                case 196 /* TemplateSpan */:
+                    ts.Debug.assert(parent.parent.kind === 188 /* TemplateExpression */);
                     return getContextualTypeForSubstitutionExpression(parent.parent, node);
-                case 175 /* ParenthesizedExpression */:
+                case 177 /* ParenthesizedExpression */:
                     return getContextualType(parent);
-                case 243 /* JsxExpression */:
+                case 247 /* JsxExpression */:
                     return getContextualType(parent);
-                case 241 /* JsxAttribute */:
-                case 242 /* JsxSpreadAttribute */:
+                case 245 /* JsxAttribute */:
+                case 246 /* JsxSpreadAttribute */:
                     return getContextualTypeForJsxAttribute(parent);
             }
             return undefined;
@@ -21413,7 +22972,7 @@ var ts;
             }
         }
         function isFunctionExpressionOrArrowFunction(node) {
-            return node.kind === 176 /* FunctionExpression */ || node.kind === 177 /* ArrowFunction */;
+            return node.kind === 178 /* FunctionExpression */ || node.kind === 179 /* ArrowFunction */;
         }
         function getContextualSignatureForFunctionLikeDeclaration(node) {
             // Only function expressions, arrow functions, and object literal methods are contextually typed.
@@ -21427,7 +22986,7 @@ var ts;
         // all identical ignoring their return type, the result is same signature but with return type as
         // union type of return types from these signatures
         function getContextualSignature(node) {
-            ts.Debug.assert(node.kind !== 144 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 146 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var type = ts.isObjectLiteralMethod(node)
                 ? getContextualTypeForObjectLiteralMethod(node)
                 : getApparentTypeOfContextualType(node);
@@ -21447,7 +23006,7 @@ var ts;
                         // This signature will contribute to contextual union signature
                         signatureList = [signature];
                     }
-                    else if (!compareSignaturesIdentical(signatureList[0], signature, /*partialMatch*/ false, /*ignoreReturnTypes*/ true, compareTypesIdentical)) {
+                    else if (!compareSignaturesIdentical(signatureList[0], signature, /*partialMatch*/ false, /*ignoreThisTypes*/ true, /*ignoreReturnTypes*/ true, compareTypesIdentical)) {
                         // Signatures aren't identical, do not use
                         return undefined;
                     }
@@ -21485,19 +23044,38 @@ var ts;
         function isInferentialContext(mapper) {
             return mapper && mapper.context;
         }
+        // Return the root assignment node of an assignment target
+        function getAssignmentRoot(node) {
+            while (node.parent.kind === 177 /* ParenthesizedExpression */) {
+                node = node.parent;
+            }
+            while (true) {
+                if (node.parent.kind === 252 /* PropertyAssignment */) {
+                    node = node.parent.parent;
+                }
+                else if (node.parent.kind === 169 /* ArrayLiteralExpression */) {
+                    node = node.parent;
+                }
+                else {
+                    break;
+                }
+            }
+            var parent = node.parent;
+            return parent.kind === 186 /* BinaryExpression */ &&
+                parent.operatorToken.kind === 56 /* EqualsToken */ &&
+                parent.left === node ? parent : undefined;
+        }
         // 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'.
         function isAssignmentTarget(node) {
+            return !!getAssignmentRoot(node);
+        }
+        function isCompoundAssignmentTarget(node) {
             var parent = node.parent;
-            if (parent.kind === 184 /* BinaryExpression */ && parent.operatorToken.kind === 56 /* EqualsToken */ && parent.left === node) {
-                return true;
-            }
-            if (parent.kind === 248 /* PropertyAssignment */) {
-                return isAssignmentTarget(parent.parent);
-            }
-            if (parent.kind === 167 /* ArrayLiteralExpression */) {
-                return isAssignmentTarget(parent);
+            if (parent.kind === 186 /* BinaryExpression */ && parent.left === node) {
+                var operator = parent.operatorToken.kind;
+                return operator >= 56 /* FirstAssignment */ && operator <= 68 /* LastAssignment */;
             }
             return false;
         }
@@ -21512,8 +23090,8 @@ var ts;
             return checkIteratedTypeOrElementType(arrayOrIterableType, node.expression, /*allowStringInput*/ false);
         }
         function hasDefaultValue(node) {
-            return (node.kind === 166 /* BindingElement */ && !!node.initializer) ||
-                (node.kind === 184 /* BinaryExpression */ && node.operatorToken.kind === 56 /* EqualsToken */);
+            return (node.kind === 168 /* BindingElement */ && !!node.initializer) ||
+                (node.kind === 186 /* BinaryExpression */ && node.operatorToken.kind === 56 /* EqualsToken */);
         }
         function checkArrayLiteral(node, contextualMapper) {
             var elements = node.elements;
@@ -21522,7 +23100,7 @@ var ts;
             var inDestructuringPattern = isAssignmentTarget(node);
             for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
                 var e = elements_1[_i];
-                if (inDestructuringPattern && e.kind === 188 /* SpreadElementExpression */) {
+                if (inDestructuringPattern && e.kind === 190 /* SpreadElementExpression */) {
                     // Given the following situation:
                     //    var c: {};
                     //    [...c] = ["", 0];
@@ -21546,7 +23124,7 @@ var ts;
                     var type = checkExpression(e, contextualMapper);
                     elementTypes.push(type);
                 }
-                hasSpreadElement = hasSpreadElement || e.kind === 188 /* SpreadElementExpression */;
+                hasSpreadElement = hasSpreadElement || e.kind === 190 /* SpreadElementExpression */;
             }
             if (!hasSpreadElement) {
                 // If array literal is actually a destructuring pattern, mark it as an implied type. We do this such
@@ -21561,7 +23139,7 @@ var ts;
                     var pattern = contextualType.pattern;
                     // If array literal is contextually typed by a binding pattern or an assignment pattern, pad the resulting
                     // tuple type with the corresponding binding or assignment element types to make the lengths equal.
-                    if (pattern && (pattern.kind === 165 /* ArrayBindingPattern */ || pattern.kind === 167 /* ArrayLiteralExpression */)) {
+                    if (pattern && (pattern.kind === 167 /* ArrayBindingPattern */ || pattern.kind === 169 /* ArrayLiteralExpression */)) {
                         var patternElements = pattern.elements;
                         for (var i = elementTypes.length; i < patternElements.length; i++) {
                             var patternElement = patternElements[i];
@@ -21569,7 +23147,7 @@ var ts;
                                 elementTypes.push(contextualType.elementTypes[i]);
                             }
                             else {
-                                if (patternElement.kind !== 190 /* OmittedExpression */) {
+                                if (patternElement.kind !== 192 /* OmittedExpression */) {
                                     error(patternElement, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
                                 }
                                 elementTypes.push(unknownType);
@@ -21581,10 +23159,10 @@ var ts;
                     }
                 }
             }
-            return createArrayType(elementTypes.length ? getUnionType(elementTypes) : undefinedType);
+            return createArrayType(elementTypes.length ? getUnionType(elementTypes) : emptyArrayElementType);
         }
         function isNumericName(name) {
-            return name.kind === 137 /* ComputedPropertyName */ ? isNumericComputedName(name) : isNumericLiteralName(name.text);
+            return name.kind === 139 /* ComputedPropertyName */ ? isNumericComputedName(name) : isNumericLiteralName(name.text);
         }
         function isNumericComputedName(name) {
             // It seems odd to consider an expression of type Any to result in a numeric name,
@@ -21592,7 +23170,7 @@ var ts;
             return isTypeAnyOrAllConstituentTypesHaveKind(checkComputedPropertyName(name), 132 /* NumberLike */);
         }
         function isTypeAnyOrAllConstituentTypesHaveKind(type, kind) {
-            return isTypeAny(type) || allConstituentTypesHaveKind(type, kind);
+            return isTypeAny(type) || isTypeOfKind(type, kind);
         }
         function isNumericLiteralName(name) {
             // The intent of numeric names is that
@@ -21633,6 +23211,16 @@ var ts;
             }
             return links.resolvedType;
         }
+        function getObjectLiteralIndexInfo(node, properties, kind) {
+            var propTypes = [];
+            for (var i = 0; i < properties.length; i++) {
+                if (kind === 0 /* String */ || isNumericName(node.properties[i].name)) {
+                    propTypes.push(getTypeOfSymbol(properties[i]));
+                }
+            }
+            var unionType = propTypes.length ? getUnionType(propTypes) : undefinedType;
+            return createIndexInfo(unionType, /*isReadonly*/ false);
+        }
         function checkObjectLiteral(node, contextualMapper) {
             var inDestructuringPattern = isAssignmentTarget(node);
             // Grammar checking
@@ -21641,24 +23229,26 @@ var ts;
             var propertiesArray = [];
             var contextualType = getApparentTypeOfContextualType(node);
             var contextualTypeHasPattern = contextualType && contextualType.pattern &&
-                (contextualType.pattern.kind === 164 /* ObjectBindingPattern */ || contextualType.pattern.kind === 168 /* ObjectLiteralExpression */);
+                (contextualType.pattern.kind === 166 /* ObjectBindingPattern */ || contextualType.pattern.kind === 170 /* ObjectLiteralExpression */);
             var typeFlags = 0;
             var patternWithComputedProperties = false;
+            var hasComputedStringProperty = false;
+            var hasComputedNumberProperty = false;
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var memberDecl = _a[_i];
                 var member = memberDecl.symbol;
-                if (memberDecl.kind === 248 /* PropertyAssignment */ ||
-                    memberDecl.kind === 249 /* ShorthandPropertyAssignment */ ||
+                if (memberDecl.kind === 252 /* PropertyAssignment */ ||
+                    memberDecl.kind === 253 /* ShorthandPropertyAssignment */ ||
                     ts.isObjectLiteralMethod(memberDecl)) {
                     var type = void 0;
-                    if (memberDecl.kind === 248 /* PropertyAssignment */) {
+                    if (memberDecl.kind === 252 /* PropertyAssignment */) {
                         type = checkPropertyAssignment(memberDecl, contextualMapper);
                     }
-                    else if (memberDecl.kind === 144 /* MethodDeclaration */) {
+                    else if (memberDecl.kind === 146 /* MethodDeclaration */) {
                         type = checkObjectLiteralMethod(memberDecl, contextualMapper);
                     }
                     else {
-                        ts.Debug.assert(memberDecl.kind === 249 /* ShorthandPropertyAssignment */);
+                        ts.Debug.assert(memberDecl.kind === 253 /* ShorthandPropertyAssignment */);
                         type = checkExpression(memberDecl.name, contextualMapper);
                     }
                     typeFlags |= type.flags;
@@ -21666,8 +23256,8 @@ var ts;
                     if (inDestructuringPattern) {
                         // If object literal is an assignment pattern and if the assignment pattern specifies a default value
                         // for the property, make the property optional.
-                        var isOptional = (memberDecl.kind === 248 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
-                            (memberDecl.kind === 249 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
+                        var isOptional = (memberDecl.kind === 252 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
+                            (memberDecl.kind === 253 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
                         if (isOptional) {
                             prop.flags |= 536870912 /* Optional */;
                         }
@@ -21701,10 +23291,18 @@ var ts;
                     // an ordinary function declaration(section 6.1) with no parameters.
                     // A set accessor declaration is processed in the same manner
                     // as an ordinary function declaration with a single parameter and a Void return type.
-                    ts.Debug.assert(memberDecl.kind === 146 /* GetAccessor */ || memberDecl.kind === 147 /* SetAccessor */);
+                    ts.Debug.assert(memberDecl.kind === 148 /* GetAccessor */ || memberDecl.kind === 149 /* SetAccessor */);
                     checkAccessorDeclaration(memberDecl);
                 }
-                if (!ts.hasDynamicName(memberDecl)) {
+                if (ts.hasDynamicName(memberDecl)) {
+                    if (isNumericName(memberDecl.name)) {
+                        hasComputedNumberProperty = true;
+                    }
+                    else {
+                        hasComputedStringProperty = true;
+                    }
+                }
+                else {
                     propertiesTable[member.name] = member;
                 }
                 propertiesArray.push(member);
@@ -21723,37 +23321,15 @@ var ts;
                     }
                 }
             }
-            var stringIndexType = getIndexType(0 /* String */);
-            var numberIndexType = getIndexType(1 /* Number */);
-            var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexType, numberIndexType);
+            var stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 0 /* String */) : undefined;
+            var numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 1 /* Number */) : undefined;
+            var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
             var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 1048576 /* FreshObjectLiteral */;
             result.flags |= 524288 /* ObjectLiteral */ | 4194304 /* ContainsObjectLiteral */ | freshObjectLiteralFlag | (typeFlags & 14680064 /* PropagatingFlags */) | (patternWithComputedProperties ? 67108864 /* ObjectLiteralPatternWithComputedProperties */ : 0);
             if (inDestructuringPattern) {
                 result.pattern = node;
             }
             return result;
-            function getIndexType(kind) {
-                if (contextualType && contextualTypeHasIndexSignature(contextualType, kind)) {
-                    var propTypes = [];
-                    for (var i = 0; i < propertiesArray.length; i++) {
-                        var propertyDecl = node.properties[i];
-                        if (kind === 0 /* String */ || isNumericName(propertyDecl.name)) {
-                            // Do not call getSymbolOfNode(propertyDecl), as that will get the
-                            // original symbol for the node. We actually want to get the symbol
-                            // created by checkObjectLiteral, since that will be appropriately
-                            // contextually typed and resolved.
-                            var type = getTypeOfSymbol(propertiesArray[i]);
-                            if (!ts.contains(propTypes, type)) {
-                                propTypes.push(type);
-                            }
-                        }
-                    }
-                    var result_1 = propTypes.length ? getUnionType(propTypes) : undefinedType;
-                    typeFlags |= result_1.flags;
-                    return result_1;
-                }
-                return undefined;
-            }
         }
         function checkJsxSelfClosingElement(node) {
             checkJsxOpeningLikeElement(node);
@@ -21763,18 +23339,23 @@ var ts;
             // Check attributes
             checkJsxOpeningLikeElement(node.openingElement);
             // Perform resolution on the closing tag so that rename/go to definition/etc work
-            getJsxElementTagSymbol(node.closingElement);
+            if (isJsxIntrinsicIdentifier(node.closingElement.tagName)) {
+                getIntrinsicTagSymbol(node.closingElement);
+            }
+            else {
+                checkExpression(node.closingElement.tagName);
+            }
             // Check children
             for (var _i = 0, _a = node.children; _i < _a.length; _i++) {
                 var child = _a[_i];
                 switch (child.kind) {
-                    case 243 /* JsxExpression */:
+                    case 247 /* JsxExpression */:
                         checkJsxExpression(child);
                         break;
-                    case 236 /* JsxElement */:
+                    case 240 /* JsxElement */:
                         checkJsxElement(child);
                         break;
-                    case 237 /* JsxSelfClosingElement */:
+                    case 241 /* JsxSelfClosingElement */:
                         checkJsxSelfClosingElement(child);
                         break;
                 }
@@ -21792,7 +23373,7 @@ var ts;
          * Returns true iff React would emit this tag name as a string rather than an identifier or qualified name
          */
         function isJsxIntrinsicIdentifier(tagName) {
-            if (tagName.kind === 136 /* QualifiedName */) {
+            if (tagName.kind === 138 /* QualifiedName */) {
                 return false;
             }
             else {
@@ -21862,70 +23443,41 @@ var ts;
             }
             return jsxTypes[name];
         }
-        /// Given a JSX opening element or self-closing element, return the symbol of the property that the tag name points to if
-        /// this is an intrinsic tag. This might be a named
-        /// property of the IntrinsicElements interface, or its string indexer.
-        /// If this is a class-based tag (otherwise returns undefined), returns the symbol of the class
-        /// type or factory function.
-        /// Otherwise, returns unknownSymbol.
-        function getJsxElementTagSymbol(node) {
+        /**
+          * Looks up an intrinsic tag name and returns a symbol that either points to an intrinsic
+          * property (in which case nodeLinks.jsxFlags will be IntrinsicNamedElement) or an intrinsic
+          * string index signature (in which case nodeLinks.jsxFlags will be IntrinsicIndexedElement).
+          * May also return unknownSymbol if both of these lookups fail.
+          */
+        function getIntrinsicTagSymbol(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedSymbol) {
-                if (isJsxIntrinsicIdentifier(node.tagName)) {
-                    links.resolvedSymbol = lookupIntrinsicTag(node);
-                }
-                else {
-                    links.resolvedSymbol = lookupClassTag(node);
-                }
-            }
-            return links.resolvedSymbol;
-            function lookupIntrinsicTag(node) {
                 var intrinsicElementsType = getJsxType(JsxNames.IntrinsicElements);
                 if (intrinsicElementsType !== unknownType) {
                     // Property case
                     var intrinsicProp = getPropertyOfType(intrinsicElementsType, node.tagName.text);
                     if (intrinsicProp) {
                         links.jsxFlags |= 1 /* IntrinsicNamedElement */;
-                        return intrinsicProp;
+                        return links.resolvedSymbol = intrinsicProp;
                     }
                     // Intrinsic string indexer case
                     var indexSignatureType = getIndexTypeOfType(intrinsicElementsType, 0 /* String */);
                     if (indexSignatureType) {
                         links.jsxFlags |= 2 /* IntrinsicIndexedElement */;
-                        return intrinsicElementsType.symbol;
+                        return links.resolvedSymbol = intrinsicElementsType.symbol;
                     }
                     // Wasn't found
                     error(node, ts.Diagnostics.Property_0_does_not_exist_on_type_1, node.tagName.text, "JSX." + JsxNames.IntrinsicElements);
-                    return unknownSymbol;
+                    return links.resolvedSymbol = unknownSymbol;
                 }
                 else {
                     if (compilerOptions.noImplicitAny) {
                         error(node, ts.Diagnostics.JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists, JsxNames.IntrinsicElements);
                     }
-                    return unknownSymbol;
-                }
-            }
-            function lookupClassTag(node) {
-                var valueSymbol = resolveJsxTagName(node);
-                // Look up the value in the current scope
-                if (valueSymbol && valueSymbol !== unknownSymbol) {
-                    links.jsxFlags |= 4 /* ValueElement */;
-                    if (valueSymbol.flags & 8388608 /* Alias */) {
-                        markAliasSymbolAsReferenced(valueSymbol);
-                    }
-                }
-                return valueSymbol || unknownSymbol;
-            }
-            function resolveJsxTagName(node) {
-                if (node.tagName.kind === 69 /* Identifier */) {
-                    var tag = node.tagName;
-                    var sym = getResolvedSymbol(tag);
-                    return sym.exportSymbol || sym;
-                }
-                else {
-                    return checkQualifiedName(node.tagName).symbol;
+                    return links.resolvedSymbol = unknownSymbol;
                 }
             }
+            return links.resolvedSymbol;
         }
         /**
          * Given a JSX element that is a class element, finds the Element Instance Type. If the
@@ -21933,15 +23485,7 @@ var ts;
          * For example, in the element <MyClass>, the element instance type is `MyClass` (not `typeof MyClass`).
          */
         function getJsxElementInstanceType(node) {
-            // There is no such thing as an instance type for a non-class element. This
-            // line shouldn't be hit.
-            ts.Debug.assert(!!(getNodeLinks(node).jsxFlags & 4 /* ValueElement */), "Should not call getJsxElementInstanceType on non-class Element");
-            var classSymbol = getJsxElementTagSymbol(node);
-            if (classSymbol === unknownSymbol) {
-                // Couldn't find the class instance type. Error has already been issued
-                return anyType;
-            }
-            var valueType = getTypeOfSymbol(classSymbol);
+            var valueType = checkExpression(node.tagName);
             if (isTypeAny(valueType)) {
                 // Short-circuit if the class tag is using an element type 'any'
                 return anyType;
@@ -21960,10 +23504,10 @@ var ts;
             return getUnionType(signatures.map(getReturnTypeOfSignature));
         }
         /// e.g. "props" for React.d.ts,
-        /// or 'undefined' if ElementAttributesPropery doesn't exist (which means all
+        /// or 'undefined' if ElementAttributesProperty doesn't exist (which means all
         ///     non-intrinsic elements' attributes type is 'any'),
         /// or '' if it has 0 properties (which means every
-        ///     non-instrinsic elements' attributes type is the element instance type)
+        ///     non-intrinsic elements' attributes type is the element instance type)
         function getJsxElementPropertiesName() {
             // JSX
             var jsxNamespace = getGlobalSymbol(JsxNames.JSX, 1536 /* Namespace */, /*diagnosticMessage*/ undefined);
@@ -21971,7 +23515,7 @@ var ts;
             var attribsPropTypeSym = jsxNamespace && getSymbol(jsxNamespace.exports, JsxNames.ElementAttributesPropertyNameContainer, 793056 /* Type */);
             // JSX.ElementAttributesProperty [type]
             var attribPropType = attribsPropTypeSym && getDeclaredTypeOfSymbol(attribsPropTypeSym);
-            // The properites of JSX.ElementAttributesProperty
+            // The properties of JSX.ElementAttributesProperty
             var attribProperties = attribPropType && getPropertiesOfType(attribPropType);
             if (attribProperties) {
                 // Element Attributes has zero properties, so the element attributes type will be the class instance type
@@ -21998,26 +23542,36 @@ var ts;
         function getJsxElementAttributesType(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedJsxType) {
-                var sym = getJsxElementTagSymbol(node);
-                if (links.jsxFlags & 4 /* ValueElement */) {
+                if (isJsxIntrinsicIdentifier(node.tagName)) {
+                    var symbol = getIntrinsicTagSymbol(node);
+                    if (links.jsxFlags & 1 /* IntrinsicNamedElement */) {
+                        return links.resolvedJsxType = getTypeOfSymbol(symbol);
+                    }
+                    else if (links.jsxFlags & 2 /* IntrinsicIndexedElement */) {
+                        return links.resolvedJsxType = getIndexInfoOfSymbol(symbol, 0 /* String */).type;
+                    }
+                }
+                else {
                     // Get the element instance type (the result of newing or invoking this tag)
                     var elemInstanceType = getJsxElementInstanceType(node);
                     var elemClassType = getJsxGlobalElementClassType();
                     if (!elemClassType || !isTypeAssignableTo(elemInstanceType, elemClassType)) {
                         // Is this is a stateless function component? See if its single signature's return type is
                         // assignable to the JSX Element Type
-                        var elemType = getTypeOfSymbol(sym);
-                        var callSignatures = elemType && getSignaturesOfType(elemType, 0 /* Call */);
-                        var callSignature = callSignatures && callSignatures.length > 0 && callSignatures[0];
-                        var callReturnType = callSignature && getReturnTypeOfSignature(callSignature);
-                        var paramType = callReturnType && (callSignature.parameters.length === 0 ? emptyObjectType : getTypeOfSymbol(callSignature.parameters[0]));
-                        if (callReturnType && isTypeAssignableTo(callReturnType, jsxElementType)) {
-                            // Intersect in JSX.IntrinsicAttributes if it exists
-                            var intrinsicAttributes = getJsxType(JsxNames.IntrinsicAttributes);
-                            if (intrinsicAttributes !== unknownType) {
-                                paramType = intersectTypes(intrinsicAttributes, paramType);
+                        if (jsxElementType) {
+                            var elemType = checkExpression(node.tagName);
+                            var callSignatures = elemType && getSignaturesOfType(elemType, 0 /* Call */);
+                            var callSignature = callSignatures && callSignatures.length > 0 && callSignatures[0];
+                            var callReturnType = callSignature && getReturnTypeOfSignature(callSignature);
+                            var paramType = callReturnType && (callSignature.parameters.length === 0 ? emptyObjectType : getTypeOfSymbol(callSignature.parameters[0]));
+                            if (callReturnType && isTypeAssignableTo(callReturnType, jsxElementType)) {
+                                // Intersect in JSX.IntrinsicAttributes if it exists
+                                var intrinsicAttributes = getJsxType(JsxNames.IntrinsicAttributes);
+                                if (intrinsicAttributes !== unknownType) {
+                                    paramType = intersectTypes(intrinsicAttributes, paramType);
+                                }
+                                return links.resolvedJsxType = paramType;
                             }
-                            return links.resolvedJsxType = paramType;
                         }
                     }
                     // Issue an error if this return type isn't assignable to JSX.ElementClass
@@ -22074,16 +23628,7 @@ var ts;
                         }
                     }
                 }
-                else if (links.jsxFlags & 1 /* IntrinsicNamedElement */) {
-                    return links.resolvedJsxType = getTypeOfSymbol(sym);
-                }
-                else if (links.jsxFlags & 2 /* IntrinsicIndexedElement */) {
-                    return links.resolvedJsxType = getIndexTypeOfSymbol(sym, 0 /* String */);
-                }
-                else {
-                    // Resolution failed, so we don't know
-                    return links.resolvedJsxType = anyType;
-                }
+                return links.resolvedJsxType = unknownType;
             }
             return links.resolvedJsxType;
         }
@@ -22137,11 +23682,11 @@ var ts;
             // thus should have their types ignored
             var sawSpreadedAny = false;
             for (var i = node.attributes.length - 1; i >= 0; i--) {
-                if (node.attributes[i].kind === 241 /* JsxAttribute */) {
+                if (node.attributes[i].kind === 245 /* JsxAttribute */) {
                     checkJsxAttribute((node.attributes[i]), targetAttributesType, nameTable);
                 }
                 else {
-                    ts.Debug.assert(node.attributes[i].kind === 242 /* JsxSpreadAttribute */);
+                    ts.Debug.assert(node.attributes[i].kind === 246 /* JsxSpreadAttribute */);
                     var spreadType = checkJsxSpreadAttribute((node.attributes[i]), targetAttributesType, nameTable);
                     if (isTypeAny(spreadType)) {
                         sawSpreadedAny = true;
@@ -22171,10 +23716,10 @@ var ts;
         // If a symbol is a synthesized symbol with no value declaration, we assume it is a property. Example of this are the synthesized
         // '.prototype' property as well as synthesized tuple index properties.
         function getDeclarationKindFromSymbol(s) {
-            return s.valueDeclaration ? s.valueDeclaration.kind : 142 /* PropertyDeclaration */;
+            return s.valueDeclaration ? s.valueDeclaration.kind : 144 /* PropertyDeclaration */;
         }
         function getDeclarationFlagsFromSymbol(s) {
-            return s.valueDeclaration ? ts.getCombinedNodeFlags(s.valueDeclaration) : s.flags & 134217728 /* Prototype */ ? 8 /* Public */ | 64 /* Static */ : 0;
+            return s.valueDeclaration ? ts.getCombinedNodeFlags(s.valueDeclaration) : s.flags & 134217728 /* Prototype */ ? 4 /* Public */ | 32 /* Static */ : 0;
         }
         /**
          * Check whether the requested property access is valid.
@@ -22186,11 +23731,11 @@ var ts;
          */
         function checkClassPropertyAccess(node, left, type, prop) {
             var flags = getDeclarationFlagsFromSymbol(prop);
-            var declaringClass = getDeclaredTypeOfSymbol(prop.parent);
+            var declaringClass = getDeclaredTypeOfSymbol(getParentOfSymbol(prop));
+            var errorNode = node.kind === 171 /* PropertyAccessExpression */ || node.kind === 217 /* VariableDeclaration */ ?
+                node.name :
+                node.right;
             if (left.kind === 95 /* SuperKeyword */) {
-                var errorNode = node.kind === 169 /* PropertyAccessExpression */ ?
-                    node.name :
-                    node.right;
                 // TS 1.0 spec (April 2014): 4.8.2
                 // - In a constructor, instance member function, instance member accessor, or
                 //   instance member variable initializer where this references a derived class instance,
@@ -22198,7 +23743,7 @@ var ts;
                 // - In a static member function or static member accessor
                 //   where this references the constructor function object of a derived class,
                 //   a super property access is permitted and must specify a public static member function of the base class.
-                if (languageVersion < 2 /* ES6 */ && getDeclarationKindFromSymbol(prop) !== 144 /* MethodDeclaration */) {
+                if (languageVersion < 2 /* ES6 */ && getDeclarationKindFromSymbol(prop) !== 146 /* MethodDeclaration */) {
                     // `prop` refers to a *property* declared in the super class
                     // rather than a *method*, so it does not satisfy the above criteria.
                     error(errorNode, ts.Diagnostics.Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword);
@@ -22214,17 +23759,15 @@ var ts;
                 }
             }
             // Public properties are otherwise accessible.
-            if (!(flags & (16 /* Private */ | 32 /* Protected */))) {
+            if (!(flags & (8 /* Private */ | 16 /* Protected */))) {
                 return true;
             }
             // Property is known to be private or protected at this point
-            // Get the declaring and enclosing class instance types
-            var enclosingClassDeclaration = ts.getContainingClass(node);
-            var enclosingClass = enclosingClassDeclaration ? getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingClassDeclaration)) : undefined;
-            // Private property is accessible if declaring and enclosing class are the same
-            if (flags & 16 /* Private */) {
-                if (declaringClass !== enclosingClass) {
-                    error(node, ts.Diagnostics.Property_0_is_private_and_only_accessible_within_class_1, symbolToString(prop), typeToString(declaringClass));
+            // Private property is accessible if the property is within the declaring class
+            if (flags & 8 /* Private */) {
+                var declaringClassDeclaration = getClassLikeDeclarationOfSymbol(getParentOfSymbol(prop));
+                if (!isNodeWithinClass(node, declaringClassDeclaration)) {
+                    error(errorNode, ts.Diagnostics.Property_0_is_private_and_only_accessible_within_class_1, symbolToString(prop), typeToString(declaringClass));
                     return false;
                 }
                 return true;
@@ -22234,13 +23777,18 @@ var ts;
             if (left.kind === 95 /* SuperKeyword */) {
                 return true;
             }
-            // A protected property is accessible in the declaring class and classes derived from it
-            if (!enclosingClass || !hasBaseType(enclosingClass, declaringClass)) {
-                error(node, ts.Diagnostics.Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses, symbolToString(prop), typeToString(declaringClass));
+            // Get the enclosing class that has the declaring class as its base type
+            var enclosingClass = forEachEnclosingClass(node, function (enclosingDeclaration) {
+                var enclosingClass = getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingDeclaration));
+                return hasBaseType(enclosingClass, declaringClass) ? enclosingClass : undefined;
+            });
+            // A protected property is accessible if the property is within the declaring class or classes derived from it
+            if (!enclosingClass) {
+                error(errorNode, ts.Diagnostics.Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses, symbolToString(prop), typeToString(declaringClass));
                 return false;
             }
             // No further restrictions for static properties
-            if (flags & 64 /* Static */) {
+            if (flags & 32 /* Static */) {
                 return true;
             }
             // An instance property must be accessed through an instance of the enclosing class
@@ -22250,11 +23798,19 @@ var ts;
             }
             // TODO: why is the first part of this check here?
             if (!(getTargetType(type).flags & (1024 /* Class */ | 2048 /* Interface */) && hasBaseType(type, enclosingClass))) {
-                error(node, ts.Diagnostics.Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1, symbolToString(prop), typeToString(enclosingClass));
+                error(errorNode, ts.Diagnostics.Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1, symbolToString(prop), typeToString(enclosingClass));
                 return false;
             }
             return true;
         }
+        function checkNonNullExpression(node) {
+            var type = checkExpression(node);
+            if (strictNullChecks && getNullableKind(type)) {
+                error(node, ts.Diagnostics.Object_is_possibly_null_or_undefined);
+                return getNonNullableType(type);
+            }
+            return type;
+        }
         function checkPropertyAccessExpression(node) {
             return checkPropertyAccessExpressionOrQualifiedName(node, node.expression, node.name);
         }
@@ -22262,7 +23818,7 @@ var ts;
             return checkPropertyAccessExpressionOrQualifiedName(node, node.left, node.right);
         }
         function checkPropertyAccessExpressionOrQualifiedName(node, left, right) {
-            var type = checkExpression(left);
+            var type = checkNonNullExpression(left);
             if (isTypeAny(type)) {
                 return type;
             }
@@ -22282,10 +23838,12 @@ var ts;
             if (prop.parent && prop.parent.flags & 32 /* Class */) {
                 checkClassPropertyAccess(node, left, apparentType, prop);
             }
-            return getTypeOfSymbol(prop);
+            var propType = getTypeOfSymbol(prop);
+            return node.kind === 171 /* PropertyAccessExpression */ && prop.flags & 4 /* Property */ ?
+                getNarrowedTypeOfReference(propType, node) : propType;
         }
         function isValidPropertyAccess(node, propertyName) {
-            var left = node.kind === 169 /* PropertyAccessExpression */
+            var left = node.kind === 171 /* PropertyAccessExpression */
                 ? node.expression
                 : node.left;
             var type = checkExpression(left);
@@ -22302,7 +23860,7 @@ var ts;
          */
         function getForInVariableSymbol(node) {
             var initializer = node.initializer;
-            if (initializer.kind === 215 /* VariableDeclarationList */) {
+            if (initializer.kind === 218 /* VariableDeclarationList */) {
                 var variable = initializer.declarations[0];
                 if (variable && !ts.isBindingPattern(variable.name)) {
                     return getSymbolOfNode(variable);
@@ -22331,7 +23889,7 @@ var ts;
                     var child = expr;
                     var node = expr.parent;
                     while (node) {
-                        if (node.kind === 203 /* ForInStatement */ &&
+                        if (node.kind === 206 /* ForInStatement */ &&
                             child === node.statement &&
                             getForInVariableSymbol(node) === symbol &&
                             hasNumericPropertyNames(checkExpression(node.expression))) {
@@ -22348,7 +23906,7 @@ var ts;
             // Grammar checking
             if (!node.argumentExpression) {
                 var sourceFile = ts.getSourceFileOfNode(node);
-                if (node.parent.kind === 172 /* NewExpression */ && node.parent.expression === node) {
+                if (node.parent.kind === 174 /* NewExpression */ && node.parent.expression === node) {
                     var start = ts.skipTrivia(sourceFile.text, node.expression.end);
                     var end = node.end;
                     grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead);
@@ -22360,7 +23918,7 @@ var ts;
                 }
             }
             // Obtain base constraint such that we can bail out if the constraint is an unknown type
-            var objectType = getApparentType(checkExpression(node.expression));
+            var objectType = getApparentType(checkNonNullExpression(node.expression));
             var indexType = node.argumentExpression ? checkExpression(node.argumentExpression) : unknownType;
             if (objectType === unknownType) {
                 return unknownType;
@@ -22381,15 +23939,15 @@ var ts;
             // - Otherwise, if IndexExpr is of type Any, the String or Number primitive type, or an enum type, the property access is of type Any.
             // See if we can index as a property.
             if (node.argumentExpression) {
-                var name_11 = getPropertyNameForIndexedAccess(node.argumentExpression, indexType);
-                if (name_11 !== undefined) {
-                    var prop = getPropertyOfType(objectType, name_11);
+                var name_12 = getPropertyNameForIndexedAccess(node.argumentExpression, indexType);
+                if (name_12 !== undefined) {
+                    var prop = getPropertyOfType(objectType, name_12);
                     if (prop) {
                         getNodeLinks(node).resolvedSymbol = prop;
                         return getTypeOfSymbol(prop);
                     }
                     else if (isConstEnum) {
-                        error(node.argumentExpression, ts.Diagnostics.Property_0_does_not_exist_on_const_enum_1, name_11, symbolToString(objectType.symbol));
+                        error(node.argumentExpression, ts.Diagnostics.Property_0_does_not_exist_on_const_enum_1, name_12, symbolToString(objectType.symbol));
                         return unknownType;
                     }
                 }
@@ -22398,15 +23956,17 @@ var ts;
             if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, 258 /* StringLike */ | 132 /* NumberLike */ | 16777216 /* ESSymbol */)) {
                 // Try to use a number indexer.
                 if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, 132 /* NumberLike */) || isForInVariableForNumericPropertyNames(node.argumentExpression)) {
-                    var numberIndexType = getIndexTypeOfType(objectType, 1 /* Number */);
-                    if (numberIndexType) {
-                        return numberIndexType;
+                    var numberIndexInfo = getIndexInfoOfType(objectType, 1 /* Number */);
+                    if (numberIndexInfo) {
+                        getNodeLinks(node).resolvedIndexInfo = numberIndexInfo;
+                        return numberIndexInfo.type;
                     }
                 }
                 // Try to use string indexing.
-                var stringIndexType = getIndexTypeOfType(objectType, 0 /* String */);
-                if (stringIndexType) {
-                    return stringIndexType;
+                var stringIndexInfo = getIndexInfoOfType(objectType, 0 /* String */);
+                if (stringIndexInfo) {
+                    getNodeLinks(node).resolvedIndexInfo = stringIndexInfo;
+                    return stringIndexInfo.type;
                 }
                 // Fall back to any.
                 if (compilerOptions.noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors && !isTypeAny(objectType)) {
@@ -22431,7 +23991,7 @@ var ts;
             if (indexArgumentExpression.kind === 9 /* StringLiteral */ || indexArgumentExpression.kind === 8 /* NumericLiteral */) {
                 return indexArgumentExpression.text;
             }
-            if (indexArgumentExpression.kind === 170 /* ElementAccessExpression */ || indexArgumentExpression.kind === 169 /* PropertyAccessExpression */) {
+            if (indexArgumentExpression.kind === 172 /* ElementAccessExpression */ || indexArgumentExpression.kind === 171 /* PropertyAccessExpression */) {
                 var value = getConstantValue(indexArgumentExpression);
                 if (value !== undefined) {
                     return value.toString();
@@ -22486,10 +24046,10 @@ var ts;
             return true;
         }
         function resolveUntypedCall(node) {
-            if (node.kind === 173 /* TaggedTemplateExpression */) {
+            if (node.kind === 175 /* TaggedTemplateExpression */) {
                 checkExpression(node.template);
             }
-            else if (node.kind !== 140 /* Decorator */) {
+            else if (node.kind !== 142 /* Decorator */) {
                 ts.forEach(node.arguments, function (argument) {
                     checkExpression(argument);
                 });
@@ -22519,13 +24079,13 @@ var ts;
             for (var _i = 0, signatures_2 = signatures; _i < signatures_2.length; _i++) {
                 var signature = signatures_2[_i];
                 var symbol = signature.declaration && getSymbolOfNode(signature.declaration);
-                var parent_5 = signature.declaration && signature.declaration.parent;
+                var parent_7 = signature.declaration && signature.declaration.parent;
                 if (!lastSymbol || symbol === lastSymbol) {
-                    if (lastParent && parent_5 === lastParent) {
+                    if (lastParent && parent_7 === lastParent) {
                         index++;
                     }
                     else {
-                        lastParent = parent_5;
+                        lastParent = parent_7;
                         index = cutoffIndex;
                     }
                 }
@@ -22533,7 +24093,7 @@ var ts;
                     // current declaration belongs to a different symbol
                     // set cutoffIndex so re-orderings in the future won't change result set from 0 to cutoffIndex
                     index = cutoffIndex = result.length;
-                    lastParent = parent_5;
+                    lastParent = parent_7;
                 }
                 lastSymbol = symbol;
                 // specialized signatures always need to be placed before non-specialized signatures regardless
@@ -22555,7 +24115,7 @@ var ts;
         function getSpreadArgumentIndex(args) {
             for (var i = 0; i < args.length; i++) {
                 var arg = args[i];
-                if (arg && arg.kind === 188 /* SpreadElementExpression */) {
+                if (arg && arg.kind === 190 /* SpreadElementExpression */) {
                     return i;
                 }
             }
@@ -22567,13 +24127,13 @@ var ts;
             var callIsIncomplete; // In incomplete call we want to be lenient when we have too few arguments
             var isDecorator;
             var spreadArgIndex = -1;
-            if (node.kind === 173 /* TaggedTemplateExpression */) {
+            if (node.kind === 175 /* TaggedTemplateExpression */) {
                 var tagExpression = node;
                 // Even if the call is incomplete, we'll have a missing expression as our last argument,
                 // so we can say the count is just the arg list length
                 adjustedArgCount = args.length;
                 typeArguments = undefined;
-                if (tagExpression.template.kind === 186 /* TemplateExpression */) {
+                if (tagExpression.template.kind === 188 /* TemplateExpression */) {
                     // If a tagged template expression lacks a tail literal, the call is incomplete.
                     // Specifically, a template only can end in a TemplateTail or a Missing literal.
                     var templateExpression = tagExpression.template;
@@ -22590,7 +24150,7 @@ var ts;
                     callIsIncomplete = !!templateLiteral.isUnterminated;
                 }
             }
-            else if (node.kind === 140 /* Decorator */) {
+            else if (node.kind === 142 /* Decorator */) {
                 isDecorator = true;
                 typeArguments = undefined;
                 adjustedArgCount = getEffectiveArgumentCount(node, /*args*/ undefined, signature);
@@ -22599,7 +24159,7 @@ var ts;
                 var callExpression = node;
                 if (!callExpression.arguments) {
                     // This only happens when we have something of the form: 'new C'
-                    ts.Debug.assert(callExpression.kind === 172 /* NewExpression */);
+                    ts.Debug.assert(callExpression.kind === 174 /* NewExpression */);
                     return signature.minArgumentCount === 0;
                 }
                 // For IDE scenarios we may have an incomplete call, so a trailing comma is tantamount to adding another argument.
@@ -22634,7 +24194,7 @@ var ts;
             if (type.flags & 80896 /* ObjectType */) {
                 var resolved = resolveStructuredTypeMembers(type);
                 if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 &&
-                    resolved.properties.length === 0 && !resolved.stringIndexType && !resolved.numberIndexType) {
+                    resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
                     return resolved.callSignatures[0];
                 }
             }
@@ -22672,13 +24232,18 @@ var ts;
             if (context.failedTypeParameterIndex !== undefined && !context.inferences[context.failedTypeParameterIndex].isFixed) {
                 context.failedTypeParameterIndex = undefined;
             }
+            if (signature.thisType) {
+                var thisArgumentNode = getThisArgumentOfCall(node);
+                var thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
+                inferTypes(context, thisArgumentType, signature.thisType);
+            }
             // We perform two passes over the arguments. In the first pass we infer from all arguments, but use
             // wildcards for all context sensitive function expressions.
             var argCount = getEffectiveArgumentCount(node, args, signature);
             for (var i = 0; i < argCount; i++) {
                 var arg = getEffectiveArgument(node, args, i);
                 // If the effective argument is 'undefined', then it is an argument that is present but is synthetic.
-                if (arg === undefined || arg.kind !== 190 /* OmittedExpression */) {
+                if (arg === undefined || arg.kind !== 192 /* OmittedExpression */) {
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = getEffectiveArgumentType(node, i, arg);
                     // If the effective argument type is 'undefined', there is no synthetic type
@@ -22699,7 +24264,7 @@ var ts;
             // Tagged template expressions will always have `undefined` for `excludeArgument[0]`.
             if (excludeArgument) {
                 for (var i = 0; i < argCount; i++) {
-                    // No need to check for omitted args and template expressions, their exlusion value is always undefined
+                    // No need to check for omitted args and template expressions, their exclusion value is always undefined
                     if (excludeArgument[i] === false) {
                         var arg = args[i];
                         var paramType = getTypeAtPosition(signature, i);
@@ -22734,11 +24299,24 @@ var ts;
             return typeArgumentsAreAssignable;
         }
         function checkApplicableSignature(node, args, signature, relation, excludeArgument, reportErrors) {
+            if (signature.thisType && signature.thisType !== voidType && node.kind !== 174 /* NewExpression */) {
+                // If the called expression is not of the form `x.f` or `x["f"]`, then sourceType = voidType
+                // If the signature's 'this' type is voidType, then the check is skipped -- anything is compatible.
+                // If the expression is a new expression, then the check is skipped.
+                var thisArgumentNode = getThisArgumentOfCall(node);
+                var thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
+                var errorNode = reportErrors ? (thisArgumentNode || node) : undefined;
+                var headMessage_1 = ts.Diagnostics.The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1;
+                if (!checkTypeRelatedTo(thisArgumentType, signature.thisType, relation, errorNode, headMessage_1)) {
+                    return false;
+                }
+            }
+            var headMessage = ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1;
             var argCount = getEffectiveArgumentCount(node, args, signature);
             for (var i = 0; i < argCount; i++) {
                 var arg = getEffectiveArgument(node, args, i);
                 // If the effective argument is 'undefined', then it is an argument that is present but is synthetic.
-                if (arg === undefined || arg.kind !== 190 /* OmittedExpression */) {
+                if (arg === undefined || arg.kind !== 192 /* OmittedExpression */) {
                     // Check spread elements against rest type (from arity check we know spread argument corresponds to a rest parameter)
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = getEffectiveArgumentType(node, i, arg);
@@ -22751,7 +24329,6 @@ var ts;
                     }
                     // Use argument expression as error location when reporting errors
                     var errorNode = reportErrors ? getEffectiveArgumentErrorNode(node, i, arg) : undefined;
-                    var headMessage = ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1;
                     if (!checkTypeRelatedTo(argType, paramType, relation, errorNode, headMessage)) {
                         return false;
                     }
@@ -22759,6 +24336,20 @@ var ts;
             }
             return true;
         }
+        /**
+         * Returns the this argument in calls like x.f(...) and x[f](...). Undefined otherwise.
+         */
+        function getThisArgumentOfCall(node) {
+            if (node.kind === 173 /* CallExpression */) {
+                var callee = node.expression;
+                if (callee.kind === 171 /* PropertyAccessExpression */) {
+                    return callee.expression;
+                }
+                else if (callee.kind === 172 /* ElementAccessExpression */) {
+                    return callee.expression;
+                }
+            }
+        }
         /**
          * Returns the effective arguments for an expression that works like a function invocation.
          *
@@ -22770,16 +24361,16 @@ var ts;
          */
         function getEffectiveCallArguments(node) {
             var args;
-            if (node.kind === 173 /* TaggedTemplateExpression */) {
+            if (node.kind === 175 /* TaggedTemplateExpression */) {
                 var template = node.template;
                 args = [undefined];
-                if (template.kind === 186 /* TemplateExpression */) {
+                if (template.kind === 188 /* TemplateExpression */) {
                     ts.forEach(template.templateSpans, function (span) {
                         args.push(span.expression);
                     });
                 }
             }
-            else if (node.kind === 140 /* Decorator */) {
+            else if (node.kind === 142 /* Decorator */) {
                 // For a decorator, we return undefined as we will determine
                 // the number and types of arguments for a decorator using
                 // `getEffectiveArgumentCount` and `getEffectiveArgumentType` below.
@@ -22804,19 +24395,19 @@ var ts;
           * Otherwise, the argument count is the length of the 'args' array.
           */
         function getEffectiveArgumentCount(node, args, signature) {
-            if (node.kind === 140 /* Decorator */) {
+            if (node.kind === 142 /* Decorator */) {
                 switch (node.parent.kind) {
-                    case 217 /* ClassDeclaration */:
-                    case 189 /* ClassExpression */:
+                    case 220 /* ClassDeclaration */:
+                    case 191 /* ClassExpression */:
                         // A class decorator will have one argument (see `ClassDecorator` in core.d.ts)
                         return 1;
-                    case 142 /* PropertyDeclaration */:
+                    case 144 /* PropertyDeclaration */:
                         // A property declaration decorator will have two arguments (see
                         // `PropertyDecorator` in core.d.ts)
                         return 2;
-                    case 144 /* MethodDeclaration */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
+                    case 146 /* MethodDeclaration */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
                         // A method or accessor declaration decorator will have two or three arguments (see
                         // `PropertyDecorator` and `MethodDecorator` in core.d.ts)
                         // If we are emitting decorators for ES3, we will only pass two arguments.
@@ -22826,7 +24417,7 @@ var ts;
                         // If the method decorator signature only accepts a target and a key, we will only
                         // type check those arguments.
                         return signature.parameters.length >= 3 ? 3 : 2;
-                    case 139 /* Parameter */:
+                    case 141 /* Parameter */:
                         // A parameter declaration decorator will have three arguments (see
                         // `ParameterDecorator` in core.d.ts)
                         return 3;
@@ -22850,25 +24441,25 @@ var ts;
           */
         function getEffectiveDecoratorFirstArgumentType(node) {
             // The first argument to a decorator is its `target`.
-            if (node.kind === 217 /* ClassDeclaration */) {
+            if (node.kind === 220 /* ClassDeclaration */) {
                 // For a class decorator, the `target` is the type of the class (e.g. the
                 // "static" or "constructor" side of the class)
                 var classSymbol = getSymbolOfNode(node);
                 return getTypeOfSymbol(classSymbol);
             }
-            if (node.kind === 139 /* Parameter */) {
+            if (node.kind === 141 /* Parameter */) {
                 // For a parameter decorator, the `target` is the parent type of the
                 // parameter's containing method.
                 node = node.parent;
-                if (node.kind === 145 /* Constructor */) {
+                if (node.kind === 147 /* Constructor */) {
                     var classSymbol = getSymbolOfNode(node);
                     return getTypeOfSymbol(classSymbol);
                 }
             }
-            if (node.kind === 142 /* PropertyDeclaration */ ||
-                node.kind === 144 /* MethodDeclaration */ ||
-                node.kind === 146 /* GetAccessor */ ||
-                node.kind === 147 /* SetAccessor */) {
+            if (node.kind === 144 /* PropertyDeclaration */ ||
+                node.kind === 146 /* MethodDeclaration */ ||
+                node.kind === 148 /* GetAccessor */ ||
+                node.kind === 149 /* SetAccessor */) {
                 // For a property or method decorator, the `target` is the
                 // "static"-side type of the parent of the member if the member is
                 // declared "static"; otherwise, it is the "instance"-side type of the
@@ -22895,21 +24486,21 @@ var ts;
           */
         function getEffectiveDecoratorSecondArgumentType(node) {
             // The second argument to a decorator is its `propertyKey`
-            if (node.kind === 217 /* ClassDeclaration */) {
+            if (node.kind === 220 /* ClassDeclaration */) {
                 ts.Debug.fail("Class decorators should not have a second synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 139 /* Parameter */) {
+            if (node.kind === 141 /* Parameter */) {
                 node = node.parent;
-                if (node.kind === 145 /* Constructor */) {
+                if (node.kind === 147 /* Constructor */) {
                     // For a constructor parameter decorator, the `propertyKey` will be `undefined`.
                     return anyType;
                 }
             }
-            if (node.kind === 142 /* PropertyDeclaration */ ||
-                node.kind === 144 /* MethodDeclaration */ ||
-                node.kind === 146 /* GetAccessor */ ||
-                node.kind === 147 /* SetAccessor */) {
+            if (node.kind === 144 /* PropertyDeclaration */ ||
+                node.kind === 146 /* MethodDeclaration */ ||
+                node.kind === 148 /* GetAccessor */ ||
+                node.kind === 149 /* SetAccessor */) {
                 // The `propertyKey` for a property or method decorator will be a
                 // string literal type if the member name is an identifier, number, or string;
                 // otherwise, if the member name is a computed property name it will
@@ -22920,9 +24511,9 @@ var ts;
                     case 8 /* NumericLiteral */:
                     case 9 /* StringLiteral */:
                         return getStringLiteralTypeForText(element.name.text);
-                    case 137 /* ComputedPropertyName */:
+                    case 139 /* ComputedPropertyName */:
                         var nameType = checkComputedPropertyName(element.name);
-                        if (allConstituentTypesHaveKind(nameType, 16777216 /* ESSymbol */)) {
+                        if (isTypeOfKind(nameType, 16777216 /* ESSymbol */)) {
                             return nameType;
                         }
                         else {
@@ -22945,22 +24536,22 @@ var ts;
           */
         function getEffectiveDecoratorThirdArgumentType(node) {
             // The third argument to a decorator is either its `descriptor` for a method decorator
-            // or its `parameterIndex` for a paramter decorator
-            if (node.kind === 217 /* ClassDeclaration */) {
+            // or its `parameterIndex` for a parameter decorator
+            if (node.kind === 220 /* ClassDeclaration */) {
                 ts.Debug.fail("Class decorators should not have a third synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 139 /* Parameter */) {
+            if (node.kind === 141 /* Parameter */) {
                 // The `parameterIndex` for a parameter decorator is always a number
                 return numberType;
             }
-            if (node.kind === 142 /* PropertyDeclaration */) {
+            if (node.kind === 144 /* PropertyDeclaration */) {
                 ts.Debug.fail("Property decorators should not have a third synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 144 /* MethodDeclaration */ ||
-                node.kind === 146 /* GetAccessor */ ||
-                node.kind === 147 /* SetAccessor */) {
+            if (node.kind === 146 /* MethodDeclaration */ ||
+                node.kind === 148 /* GetAccessor */ ||
+                node.kind === 149 /* SetAccessor */) {
                 // The `descriptor` for a method decorator will be a `TypedPropertyDescriptor<T>`
                 // for the type of the member.
                 var propertyType = getTypeOfNode(node);
@@ -22992,11 +24583,11 @@ var ts;
             // Decorators provide special arguments, a tagged template expression provides
             // a special first argument, and string literals get string literal types
             // unless we're reporting errors
-            if (node.kind === 140 /* Decorator */) {
+            if (node.kind === 142 /* Decorator */) {
                 return getEffectiveDecoratorArgumentType(node, argIndex);
             }
-            else if (argIndex === 0 && node.kind === 173 /* TaggedTemplateExpression */) {
-                return globalTemplateStringsArrayType;
+            else if (argIndex === 0 && node.kind === 175 /* TaggedTemplateExpression */) {
+                return getGlobalTemplateStringsArrayType();
             }
             // This is not a synthetic argument, so we return 'undefined'
             // to signal that the caller needs to check the argument.
@@ -23007,8 +24598,8 @@ var ts;
           */
         function getEffectiveArgument(node, args, argIndex) {
             // For a decorator or the first argument of a tagged template expression we return undefined.
-            if (node.kind === 140 /* Decorator */ ||
-                (argIndex === 0 && node.kind === 173 /* TaggedTemplateExpression */)) {
+            if (node.kind === 142 /* Decorator */ ||
+                (argIndex === 0 && node.kind === 175 /* TaggedTemplateExpression */)) {
                 return undefined;
             }
             return args[argIndex];
@@ -23017,11 +24608,11 @@ var ts;
           * Gets the error node to use when reporting errors for an effective argument.
           */
         function getEffectiveArgumentErrorNode(node, argIndex, arg) {
-            if (node.kind === 140 /* Decorator */) {
+            if (node.kind === 142 /* Decorator */) {
                 // For a decorator, we use the expression of the decorator for error reporting.
                 return node.expression;
             }
-            else if (argIndex === 0 && node.kind === 173 /* TaggedTemplateExpression */) {
+            else if (argIndex === 0 && node.kind === 175 /* TaggedTemplateExpression */) {
                 // For a the first argument of a tagged template expression, we use the template of the tag for error reporting.
                 return node.template;
             }
@@ -23030,8 +24621,8 @@ var ts;
             }
         }
         function resolveCall(node, signatures, candidatesOutArray, headMessage) {
-            var isTaggedTemplate = node.kind === 173 /* TaggedTemplateExpression */;
-            var isDecorator = node.kind === 140 /* Decorator */;
+            var isTaggedTemplate = node.kind === 175 /* TaggedTemplateExpression */;
+            var isDecorator = node.kind === 142 /* Decorator */;
             var typeArguments;
             if (!isTaggedTemplate && !isDecorator) {
                 typeArguments = node.typeArguments;
@@ -23137,8 +24728,8 @@ var ts;
             }
             else if (candidateForTypeArgumentError) {
                 if (!isTaggedTemplate && !isDecorator && typeArguments) {
-                    var typeArguments_1 = node.typeArguments;
-                    checkTypeArguments(candidateForTypeArgumentError, typeArguments_1, ts.map(typeArguments_1, getTypeFromTypeNode), /*reportErrors*/ true, headMessage);
+                    var typeArguments_2 = node.typeArguments;
+                    checkTypeArguments(candidateForTypeArgumentError, typeArguments_2, ts.map(typeArguments_2, getTypeFromTypeNode), /*reportErrors*/ true, headMessage);
                 }
                 else {
                     ts.Debug.assert(resultOfFailedInference.failedTypeParameterIndex >= 0);
@@ -23250,12 +24841,14 @@ var ts;
                     // In super call, the candidate signatures are the matching arity signatures of the base constructor function instantiated
                     // with the type arguments specified in the extends clause.
                     var baseTypeNode = ts.getClassExtendsHeritageClauseElement(ts.getContainingClass(node));
-                    var baseConstructors = getInstantiatedConstructorsForTypeArguments(superType, baseTypeNode.typeArguments);
-                    return resolveCall(node, baseConstructors, candidatesOutArray);
+                    if (baseTypeNode) {
+                        var baseConstructors = getInstantiatedConstructorsForTypeArguments(superType, baseTypeNode.typeArguments);
+                        return resolveCall(node, baseConstructors, candidatesOutArray);
+                    }
                 }
                 return resolveUntypedCall(node);
             }
-            var funcType = checkExpression(node.expression);
+            var funcType = checkNonNullExpression(node.expression);
             var apparentType = getApparentType(funcType);
             if (apparentType === unknownType) {
                 // Another error has already been reported
@@ -23275,7 +24868,7 @@ var ts;
             // We exclude union types because we may have a union of function types that happen to have
             // no common signatures.
             if (isTypeAny(funcType) || (!callSignatures.length && !constructSignatures.length && !(funcType.flags & 16384 /* Union */) && isTypeAssignableTo(funcType, globalFunctionType))) {
-                // The unknownType indicates that an error already occured (and was reported).  No
+                // The unknownType indicates that an error already occurred (and was reported).  No
                 // need to report another error in this case.
                 if (funcType !== unknownType && node.typeArguments) {
                     error(node, ts.Diagnostics.Untyped_function_calls_may_not_accept_type_arguments);
@@ -23303,7 +24896,7 @@ var ts;
                     error(node.arguments[spreadIndex], ts.Diagnostics.Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_5_and_higher);
                 }
             }
-            var expressionType = checkExpression(node.expression);
+            var expressionType = checkNonNullExpression(node.expression);
             // If expressionType's apparent type(section 3.8.1) is an object type with one or
             // more construct signatures, the expression is processed in the same manner as a
             // function call, but using the construct signatures as the initial set of candidate
@@ -23338,23 +24931,53 @@ var ts;
             // that the user will not add any.
             var constructSignatures = getSignaturesOfType(expressionType, 1 /* Construct */);
             if (constructSignatures.length) {
+                if (!isConstructorAccessible(node, constructSignatures[0])) {
+                    return resolveErrorCall(node);
+                }
                 return resolveCall(node, constructSignatures, candidatesOutArray);
             }
             // If expressionType's apparent type is an object type with no construct signatures but
             // one or more call signatures, the expression is processed as a function call. A compile-time
             // error occurs if the result of the function call is not Void. The type of the result of the
-            // operation is Any.
+            // operation is Any. It is an error to have a Void this type.
             var callSignatures = getSignaturesOfType(expressionType, 0 /* Call */);
             if (callSignatures.length) {
                 var signature = resolveCall(node, callSignatures, candidatesOutArray);
                 if (getReturnTypeOfSignature(signature) !== voidType) {
                     error(node, ts.Diagnostics.Only_a_void_function_can_be_called_with_the_new_keyword);
                 }
+                if (signature.thisType === voidType) {
+                    error(node, ts.Diagnostics.A_function_that_is_called_with_the_new_keyword_cannot_have_a_this_type_that_is_void);
+                }
                 return signature;
             }
             error(node, ts.Diagnostics.Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature);
             return resolveErrorCall(node);
         }
+        function isConstructorAccessible(node, signature) {
+            if (!signature || !signature.declaration) {
+                return true;
+            }
+            var declaration = signature.declaration;
+            var flags = declaration.flags;
+            // Public constructor is accessible.
+            if (!(flags & (8 /* Private */ | 16 /* Protected */))) {
+                return true;
+            }
+            var declaringClassDeclaration = getClassLikeDeclarationOfSymbol(declaration.parent.symbol);
+            var declaringClass = getDeclaredTypeOfSymbol(declaration.parent.symbol);
+            // A private or protected constructor can only be instantiated within it's own class 
+            if (!isNodeWithinClass(node, declaringClassDeclaration)) {
+                if (flags & 8 /* Private */) {
+                    error(node, ts.Diagnostics.Constructor_of_class_0_is_private_and_only_accessible_within_the_class_declaration, typeToString(declaringClass));
+                }
+                if (flags & 16 /* Protected */) {
+                    error(node, ts.Diagnostics.Constructor_of_class_0_is_protected_and_only_accessible_within_the_class_declaration, typeToString(declaringClass));
+                }
+                return false;
+            }
+            return true;
+        }
         function resolveTaggedTemplateExpression(node, candidatesOutArray) {
             var tagType = checkExpression(node.tag);
             var apparentType = getApparentType(tagType);
@@ -23377,16 +25000,16 @@ var ts;
           */
         function getDiagnosticHeadMessageForDecoratorResolution(node) {
             switch (node.parent.kind) {
-                case 217 /* ClassDeclaration */:
-                case 189 /* ClassExpression */:
+                case 220 /* ClassDeclaration */:
+                case 191 /* ClassExpression */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression;
-                case 139 /* Parameter */:
+                case 141 /* Parameter */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression;
-                case 142 /* PropertyDeclaration */:
+                case 144 /* PropertyDeclaration */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression;
-                case 144 /* MethodDeclaration */:
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
+                case 146 /* MethodDeclaration */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression;
             }
         }
@@ -23405,7 +25028,7 @@ var ts;
             }
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             if (!callSignatures.length) {
-                var errorInfo;
+                var errorInfo = void 0;
                 errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature);
                 errorInfo = ts.chainDiagnosticMessages(errorInfo, headMessage);
                 diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(node, errorInfo));
@@ -23423,16 +25046,16 @@ var ts;
             // to correctly fill the candidatesOutArray.
             if (!links.resolvedSignature || candidatesOutArray) {
                 links.resolvedSignature = anySignature;
-                if (node.kind === 171 /* CallExpression */) {
+                if (node.kind === 173 /* CallExpression */) {
                     links.resolvedSignature = resolveCallExpression(node, candidatesOutArray);
                 }
-                else if (node.kind === 172 /* NewExpression */) {
+                else if (node.kind === 174 /* NewExpression */) {
                     links.resolvedSignature = resolveNewExpression(node, candidatesOutArray);
                 }
-                else if (node.kind === 173 /* TaggedTemplateExpression */) {
+                else if (node.kind === 175 /* TaggedTemplateExpression */) {
                     links.resolvedSignature = resolveTaggedTemplateExpression(node, candidatesOutArray);
                 }
-                else if (node.kind === 140 /* Decorator */) {
+                else if (node.kind === 142 /* Decorator */) {
                     links.resolvedSignature = resolveDecorator(node, candidatesOutArray);
                 }
                 else {
@@ -23460,12 +25083,13 @@ var ts;
             if (node.expression.kind === 95 /* SuperKeyword */) {
                 return voidType;
             }
-            if (node.kind === 172 /* NewExpression */) {
+            if (node.kind === 174 /* NewExpression */) {
                 var declaration = signature.declaration;
                 if (declaration &&
-                    declaration.kind !== 145 /* Constructor */ &&
-                    declaration.kind !== 149 /* ConstructSignature */ &&
-                    declaration.kind !== 154 /* ConstructorType */) {
+                    declaration.kind !== 147 /* Constructor */ &&
+                    declaration.kind !== 151 /* ConstructSignature */ &&
+                    declaration.kind !== 156 /* ConstructorType */ &&
+                    !ts.isJSDocConstructSignature(declaration)) {
                     // When resolved signature is a call signature (and not a construct signature) the result type is any, unless
                     // the declaring function had members created through 'x.prototype.y = expr' or 'this.y = expr' psuedodeclarations
                     // in a JS file
@@ -23480,7 +25104,7 @@ var ts;
                 }
             }
             // In JavaScript files, calls to any identifier 'require' are treated as external module imports
-            if (ts.isInJavaScriptFile(node) && ts.isRequireCall(node)) {
+            if (ts.isInJavaScriptFile(node) && ts.isRequireCall(node, /*checkArgumentIsStringLiteral*/ true)) {
                 return resolveExternalModuleTypeByLiteral(node.arguments[0]);
             }
             return getReturnTypeOfSignature(signature);
@@ -23493,19 +25117,29 @@ var ts;
             var targetType = getTypeFromTypeNode(node.type);
             if (produceDiagnostics && targetType !== unknownType) {
                 var widenedType = getWidenedType(exprType);
-                // Permit 'number[] | "foo"' to be asserted to 'string'.
-                var bothAreStringLike = someConstituentTypeHasKind(targetType, 258 /* StringLike */) &&
-                    someConstituentTypeHasKind(widenedType, 258 /* StringLike */);
-                if (!bothAreStringLike && !(isTypeAssignableTo(targetType, widenedType))) {
-                    checkTypeAssignableTo(exprType, targetType, node, ts.Diagnostics.Neither_type_0_nor_type_1_is_assignable_to_the_other);
+                if (!isTypeComparableTo(targetType, widenedType)) {
+                    checkTypeComparableTo(exprType, targetType, node, ts.Diagnostics.Type_0_cannot_be_converted_to_type_1);
                 }
             }
             return targetType;
         }
+        function checkNonNullAssertion(node) {
+            return getNonNullableType(checkExpression(node.expression));
+        }
+        function getTypeOfParameter(symbol) {
+            var type = getTypeOfSymbol(symbol);
+            if (strictNullChecks) {
+                var declaration = symbol.valueDeclaration;
+                if (declaration && declaration.initializer) {
+                    return addNullableKind(type, 32 /* Undefined */);
+                }
+            }
+            return type;
+        }
         function getTypeAtPosition(signature, pos) {
             return signature.hasRestParameter ?
-                pos < signature.parameters.length - 1 ? getTypeOfSymbol(signature.parameters[pos]) : getRestTypeOfSignature(signature) :
-                pos < signature.parameters.length ? getTypeOfSymbol(signature.parameters[pos]) : anyType;
+                pos < signature.parameters.length - 1 ? getTypeOfParameter(signature.parameters[pos]) : getRestTypeOfSignature(signature) :
+                pos < signature.parameters.length ? getTypeOfParameter(signature.parameters[pos]) : anyType;
         }
         function assignContextualParameterTypes(signature, context, mapper) {
             var len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0);
@@ -23526,7 +25160,7 @@ var ts;
             if (ts.isBindingPattern(node.name)) {
                 for (var _i = 0, _a = node.name.elements; _i < _a.length; _i++) {
                     var element = _a[_i];
-                    if (element.kind !== 190 /* OmittedExpression */) {
+                    if (element.kind !== 192 /* OmittedExpression */) {
                         if (element.name.kind === 69 /* Identifier */) {
                             getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
                         }
@@ -23574,6 +25208,13 @@ var ts;
                 inferTypes(mapper.context, links.type, instantiateType(contextualType, mapper));
             }
         }
+        function getReturnTypeFromJSDocComment(func) {
+            var returnTag = ts.getJSDocReturnTag(func);
+            if (returnTag && returnTag.typeExpression) {
+                return getTypeFromTypeNode(returnTag.typeExpression.type);
+            }
+            return undefined;
+        }
         function createPromiseType(promisedType) {
             // creates a `Promise<T>` type where `T` is the promisedType argument
             var globalPromiseType = getGlobalPromiseType();
@@ -23591,7 +25232,7 @@ var ts;
             }
             var isAsync = ts.isAsyncFunctionLike(func);
             var type;
-            if (func.body.kind !== 195 /* Block */) {
+            if (func.body.kind !== 198 /* Block */) {
                 type = checkExpressionCached(func.body, contextualMapper);
                 if (isAsync) {
                     // From within an async function you can return either a non-promise value or a promise. Any
@@ -23602,7 +25243,7 @@ var ts;
                 }
             }
             else {
-                var types;
+                var types = void 0;
                 var funcIsGenerator = !!func.asteriskToken;
                 if (funcIsGenerator) {
                     types = checkAndAggregateYieldOperandTypes(func.body, contextualMapper);
@@ -23615,7 +25256,8 @@ var ts;
                     }
                 }
                 else {
-                    types = checkAndAggregateReturnExpressionTypes(func.body, contextualMapper, isAsync);
+                    var hasImplicitReturn = !!(func.flags & 32768 /* HasImplicitReturn */);
+                    types = checkAndAggregateReturnExpressionTypes(func.body, contextualMapper, isAsync, hasImplicitReturn);
                     if (types.length === 0) {
                         if (isAsync) {
                             // For an async function, the return type will not be void, but rather a Promise for void.
@@ -23641,7 +25283,8 @@ var ts;
                     }
                     else {
                         error(func, ts.Diagnostics.No_best_common_type_exists_among_return_expressions);
-                        return unknownType;
+                        // Defer to unioning the return types so we get a) downstream errors earlier and b) better Salsa experience
+                        return getUnionType(types);
                     }
                 }
                 if (funcIsGenerator) {
@@ -23684,8 +25327,9 @@ var ts;
             });
             return aggregatedTypes;
         }
-        function checkAndAggregateReturnExpressionTypes(body, contextualMapper, isAsync) {
+        function checkAndAggregateReturnExpressionTypes(body, contextualMapper, isAsync, hasImplicitReturn) {
             var aggregatedTypes = [];
+            var hasOmittedExpressions = false;
             ts.forEachReturnStatement(body, function (returnStatement) {
                 var expr = returnStatement.expression;
                 if (expr) {
@@ -23701,14 +25345,24 @@ var ts;
                         aggregatedTypes.push(type);
                     }
                 }
+                else {
+                    hasOmittedExpressions = true;
+                }
             });
+            if (strictNullChecks && aggregatedTypes.length && (hasOmittedExpressions || hasImplicitReturn)) {
+                if (!ts.contains(aggregatedTypes, undefinedType)) {
+                    aggregatedTypes.push(undefinedType);
+                }
+            }
             return aggregatedTypes;
         }
-        /*
-         *TypeScript Specification 1.0 (6.3) - July 2014
-         * An explicitly typed function whose return type isn't the Void or the Any type
-         * must have at least one return statement somewhere in its body.
-         * An exception to this rule is if the function implementation consists of a single 'throw' statement.
+        /**
+         * TypeScript Specification 1.0 (6.3) - July 2014
+         *   An explicitly typed function whose return type isn't the Void type,
+         *   the Any type, or a union type containing the Void or Any type as a constituent
+         *   must have at least one return statement somewhere in its body.
+         *   An exception to this rule is if the function implementation consists of a single 'throw' statement.
+         *
          * @param returnType - return type of the function, can be undefined if return type is not explicitly specified
          */
         function checkAllCodePathsInNonVoidFunctionReturnOrThrow(func, returnType) {
@@ -23716,30 +25370,34 @@ var ts;
                 return;
             }
             // Functions with with an explicitly specified 'void' or 'any' return type don't need any return expressions.
-            if (returnType === voidType || isTypeAny(returnType)) {
+            if (returnType && maybeTypeOfKind(returnType, 1 /* Any */ | 16 /* Void */)) {
                 return;
             }
             // If all we have is a function signature, or an arrow function with an expression body, then there is nothing to check.
             // also if HasImplicitReturn flag is not set this means that all codepaths in function body end with return or throw
-            if (ts.nodeIsMissing(func.body) || func.body.kind !== 195 /* Block */ || !(func.flags & 524288 /* HasImplicitReturn */)) {
+            if (ts.nodeIsMissing(func.body) || func.body.kind !== 198 /* Block */ || !(func.flags & 32768 /* HasImplicitReturn */)) {
                 return;
             }
-            var hasExplicitReturn = func.flags & 1048576 /* HasExplicitReturn */;
+            var hasExplicitReturn = func.flags & 65536 /* HasExplicitReturn */;
             if (returnType && !hasExplicitReturn) {
                 // minimal check: function has syntactic return type annotation and no explicit return statements in the body
                 // this function does not conform to the specification.
                 // NOTE: having returnType !== undefined is a precondition for entering this branch so func.type will always be present
                 error(func.type, ts.Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value);
             }
+            else if (returnType && strictNullChecks && !isTypeAssignableTo(undefinedType, returnType)) {
+                error(func.type, ts.Diagnostics.Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined);
+            }
             else if (compilerOptions.noImplicitReturns) {
                 if (!returnType) {
                     // If return type annotation is omitted check if function has any explicit return statements.
                     // If it does not have any - its inferred return type is void - don't do any checks.
                     // Otherwise get inferred return type from function body and report error only if it is not void / anytype
-                    var inferredReturnType = hasExplicitReturn
-                        ? getReturnTypeOfSignature(getSignatureFromDeclaration(func))
-                        : voidType;
-                    if (inferredReturnType === voidType || isTypeAny(inferredReturnType)) {
+                    if (!hasExplicitReturn) {
+                        return;
+                    }
+                    var inferredReturnType = getReturnTypeOfSignature(getSignatureFromDeclaration(func));
+                    if (isUnwrappedReturnTypeVoidOrAny(func, inferredReturnType)) {
                         return;
                     }
                 }
@@ -23747,14 +25405,15 @@ var ts;
             }
         }
         function checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper) {
-            ts.Debug.assert(node.kind !== 144 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 146 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             // Grammar checking
             var hasGrammarError = checkGrammarFunctionLikeDeclaration(node);
-            if (!hasGrammarError && node.kind === 176 /* FunctionExpression */) {
+            if (!hasGrammarError && node.kind === 178 /* FunctionExpression */) {
                 checkGrammarForGenerator(node);
             }
             // The identityMapper object is used to indicate that function expressions are wildcards
             if (contextualMapper === identityMapper && isContextSensitive(node)) {
+                checkNodeDeferred(node);
                 return anyFunctionType;
             }
             var links = getNodeLinks(node);
@@ -23790,14 +25449,14 @@ var ts;
                     }
                 }
             }
-            if (produceDiagnostics && node.kind !== 144 /* MethodDeclaration */ && node.kind !== 143 /* MethodSignature */) {
+            if (produceDiagnostics && node.kind !== 146 /* MethodDeclaration */ && node.kind !== 145 /* MethodSignature */) {
                 checkCollisionWithCapturedSuperVariable(node, node.name);
                 checkCollisionWithCapturedThisVariable(node, node.name);
             }
             return type;
         }
         function checkFunctionExpressionOrObjectLiteralMethodDeferred(node) {
-            ts.Debug.assert(node.kind !== 144 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 146 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var isAsync = ts.isAsyncFunctionLike(node);
             var returnOrPromisedType = node.type && (isAsync ? checkAsyncFunctionReturnType(node) : getTypeFromTypeNode(node.type));
             if (!node.asteriskToken) {
@@ -23813,7 +25472,7 @@ var ts;
                     // checkFunctionExpressionBodies). So it must be done now.
                     getReturnTypeOfSignature(getSignatureFromDeclaration(node));
                 }
-                if (node.body.kind === 195 /* Block */) {
+                if (node.body.kind === 198 /* Block */) {
                     checkSourceElement(node.body);
                 }
                 else {
@@ -23842,75 +25501,74 @@ var ts;
             }
             return true;
         }
-        function checkReferenceExpression(n, invalidReferenceMessage, constantVariableMessage) {
-            function findSymbol(n) {
-                var symbol = getNodeLinks(n).resolvedSymbol;
-                // Because we got the symbol from the resolvedSymbol property, it might be of kind
-                // SymbolFlags.ExportValue. In this case it is necessary to get the actual export
-                // symbol, which will have the correct flags set on it.
-                return symbol && getExportSymbolOfValueSymbolIfExported(symbol);
+        function isReadonlySymbol(symbol) {
+            // The following symbols are considered read-only:
+            // Properties with a 'readonly' modifier
+            // Variables declared with 'const'
+            // Get accessors without matching set accessors
+            // Enum members
+            return symbol.flags & 4 /* Property */ && (getDeclarationFlagsFromSymbol(symbol) & 64 /* Readonly */) !== 0 ||
+                symbol.flags & 3 /* Variable */ && (getDeclarationFlagsFromSymbol(symbol) & 2048 /* Const */) !== 0 ||
+                symbol.flags & 98304 /* Accessor */ && !(symbol.flags & 65536 /* SetAccessor */) ||
+                (symbol.flags & 8 /* EnumMember */) !== 0;
+        }
+        function isReferenceToReadonlyEntity(expr, symbol) {
+            if (isReadonlySymbol(symbol)) {
+                // Allow assignments to readonly properties within constructors of the same class declaration.
+                if (symbol.flags & 4 /* Property */ &&
+                    (expr.kind === 171 /* PropertyAccessExpression */ || expr.kind === 172 /* ElementAccessExpression */) &&
+                    expr.expression.kind === 97 /* ThisKeyword */) {
+                    var func = ts.getContainingFunction(expr);
+                    return !(func && func.kind === 147 /* Constructor */ && func.parent === symbol.valueDeclaration.parent);
+                }
+                return true;
             }
-            function isReferenceOrErrorExpression(n) {
-                // TypeScript 1.0 spec (April 2014):
-                // Expressions are classified as values or references.
-                // References are the subset of expressions that are permitted as the target of an assignment.
-                // Specifically, references are combinations of identifiers(section 4.3), parentheses(section 4.7),
-                // and property accesses(section 4.10).
-                // All other expression constructs described in this chapter are classified as values.
-                switch (n.kind) {
-                    case 69 /* Identifier */: {
-                        var symbol = findSymbol(n);
-                        // TypeScript 1.0 spec (April 2014): 4.3
-                        // An identifier expression that references a variable or parameter is classified as a reference.
-                        // An identifier expression that references any other kind of entity is classified as a value(and therefore cannot be the target of an assignment).
-                        return !symbol || symbol === unknownSymbol || symbol === argumentsSymbol || (symbol.flags & 3 /* Variable */) !== 0;
+            return false;
+        }
+        function isReferenceThroughNamespaceImport(expr) {
+            if (expr.kind === 171 /* PropertyAccessExpression */ || expr.kind === 172 /* ElementAccessExpression */) {
+                var node = skipParenthesizedNodes(expr.expression);
+                if (node.kind === 69 /* Identifier */) {
+                    var symbol = getNodeLinks(node).resolvedSymbol;
+                    if (symbol.flags & 8388608 /* Alias */) {
+                        var declaration = getDeclarationOfAliasSymbol(symbol);
+                        return declaration && declaration.kind === 231 /* NamespaceImport */;
                     }
-                    case 169 /* PropertyAccessExpression */: {
-                        var symbol = findSymbol(n);
-                        // TypeScript 1.0 spec (April 2014): 4.10
-                        // A property access expression is always classified as a reference.
-                        // NOTE (not in spec): assignment to enum members should not be allowed
-                        return !symbol || symbol === unknownSymbol || (symbol.flags & ~8 /* EnumMember */) !== 0;
-                    }
-                    case 170 /* ElementAccessExpression */:
-                        //  old compiler doesn't check indexed access
-                        return true;
-                    case 175 /* ParenthesizedExpression */:
-                        return isReferenceOrErrorExpression(n.expression);
-                    default:
-                        return false;
                 }
             }
-            function isConstVariableReference(n) {
-                switch (n.kind) {
-                    case 69 /* Identifier */:
-                    case 169 /* PropertyAccessExpression */: {
-                        var symbol = findSymbol(n);
-                        return symbol && (symbol.flags & 3 /* Variable */) !== 0 && (getDeclarationFlagsFromSymbol(symbol) & 16384 /* Const */) !== 0;
-                    }
-                    case 170 /* ElementAccessExpression */: {
-                        var index = n.argumentExpression;
-                        var symbol = findSymbol(n.expression);
-                        if (symbol && index && index.kind === 9 /* StringLiteral */) {
-                            var name_12 = index.text;
-                            var prop = getPropertyOfType(getTypeOfSymbol(symbol), name_12);
-                            return prop && (prop.flags & 3 /* Variable */) !== 0 && (getDeclarationFlagsFromSymbol(prop) & 16384 /* Const */) !== 0;
-                        }
+            return false;
+        }
+        function checkReferenceExpression(expr, invalidReferenceMessage, constantVariableMessage) {
+            // References are combinations of identifiers, parentheses, and property accesses.
+            var node = skipParenthesizedNodes(expr);
+            if (node.kind !== 69 /* Identifier */ && node.kind !== 171 /* PropertyAccessExpression */ && node.kind !== 172 /* ElementAccessExpression */) {
+                error(expr, invalidReferenceMessage);
+                return false;
+            }
+            // Because we get the symbol from the resolvedSymbol property, it might be of kind
+            // SymbolFlags.ExportValue. In this case it is necessary to get the actual export
+            // symbol, which will have the correct flags set on it.
+            var links = getNodeLinks(node);
+            var symbol = getExportSymbolOfValueSymbolIfExported(links.resolvedSymbol);
+            if (symbol) {
+                if (symbol !== unknownSymbol && symbol !== argumentsSymbol) {
+                    // Only variables (and not functions, classes, namespaces, enum objects, or enum members)
+                    // are considered references when referenced using a simple identifier.
+                    if (node.kind === 69 /* Identifier */ && !(symbol.flags & 3 /* Variable */)) {
+                        error(expr, invalidReferenceMessage);
                         return false;
                     }
-                    case 175 /* ParenthesizedExpression */:
-                        return isConstVariableReference(n.expression);
-                    default:
+                    if (isReferenceToReadonlyEntity(node, symbol) || isReferenceThroughNamespaceImport(node)) {
+                        error(expr, constantVariableMessage);
                         return false;
+                    }
                 }
             }
-            if (!isReferenceOrErrorExpression(n)) {
-                error(n, invalidReferenceMessage);
-                return false;
-            }
-            if (isConstVariableReference(n)) {
-                error(n, constantVariableMessage);
-                return false;
+            else if (node.kind === 172 /* ElementAccessExpression */) {
+                if (links.resolvedIndexInfo && links.resolvedIndexInfo.isReadonly) {
+                    error(expr, constantVariableMessage);
+                    return false;
+                }
             }
             return true;
         }
@@ -23929,7 +25587,7 @@ var ts;
         function checkAwaitExpression(node) {
             // Grammar checking
             if (produceDiagnostics) {
-                if (!(node.parserContextFlags & 8 /* Await */)) {
+                if (!(node.flags & 33554432 /* AwaitContext */)) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function);
                 }
                 if (isInParameterInitializerBeforeContainingFunction(node)) {
@@ -23945,7 +25603,7 @@ var ts;
                 case 35 /* PlusToken */:
                 case 36 /* MinusToken */:
                 case 50 /* TildeToken */:
-                    if (someConstituentTypeHasKind(operandType, 16777216 /* ESSymbol */)) {
+                    if (maybeTypeOfKind(operandType, 16777216 /* ESSymbol */)) {
                         error(node.operand, ts.Diagnostics.The_0_operator_cannot_be_applied_to_type_symbol, ts.tokenToString(node.operator));
                     }
                     return numberType;
@@ -23953,10 +25611,10 @@ var ts;
                     return booleanType;
                 case 41 /* PlusPlusToken */:
                 case 42 /* MinusMinusToken */:
-                    var ok = checkArithmeticOperandType(node.operand, operandType, ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
+                    var ok = checkArithmeticOperandType(node.operand, getNonNullableType(operandType), ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
                     if (ok) {
                         // run check only if former checks succeeded to avoid reporting cascading errors
-                        checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant);
+                        checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property);
                     }
                     return numberType;
             }
@@ -23964,46 +25622,56 @@ var ts;
         }
         function checkPostfixUnaryExpression(node) {
             var operandType = checkExpression(node.operand);
-            var ok = checkArithmeticOperandType(node.operand, operandType, ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
+            var ok = checkArithmeticOperandType(node.operand, getNonNullableType(operandType), ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
             if (ok) {
                 // run check only if former checks succeeded to avoid reporting cascading errors
-                checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant);
+                checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property);
             }
             return numberType;
         }
-        // Just like isTypeOfKind below, except that it returns true if *any* constituent
-        // has this kind.
-        function someConstituentTypeHasKind(type, kind) {
+        // Return true if type might be of the given kind. A union or intersection type might be of a given
+        // kind if at least one constituent type is of the given kind.
+        function maybeTypeOfKind(type, kind) {
             if (type.flags & kind) {
                 return true;
             }
             if (type.flags & 49152 /* UnionOrIntersection */) {
                 var types = type.types;
                 for (var _i = 0, types_10 = types; _i < types_10.length; _i++) {
-                    var current = types_10[_i];
-                    if (current.flags & kind) {
+                    var t = types_10[_i];
+                    if (maybeTypeOfKind(t, kind)) {
                         return true;
                     }
                 }
-                return false;
             }
             return false;
         }
-        // Return true if type has the given flags, or is a union or intersection type composed of types that all have those flags.
-        function allConstituentTypesHaveKind(type, kind) {
+        // Return true if type is of the given kind. A union type is of a given kind if all constituent types
+        // are of the given kind. An intersection type is of a given kind if at least one constituent type is
+        // of the given kind.
+        function isTypeOfKind(type, kind) {
             if (type.flags & kind) {
                 return true;
             }
-            if (type.flags & 49152 /* UnionOrIntersection */) {
+            if (type.flags & 16384 /* Union */) {
                 var types = type.types;
                 for (var _i = 0, types_11 = types; _i < types_11.length; _i++) {
-                    var current = types_11[_i];
-                    if (!(current.flags & kind)) {
+                    var t = types_11[_i];
+                    if (!isTypeOfKind(t, kind)) {
                         return false;
                     }
                 }
                 return true;
             }
+            if (type.flags & 32768 /* Intersection */) {
+                var types = type.types;
+                for (var _a = 0, types_12 = types; _a < types_12.length; _a++) {
+                    var t = types_12[_a];
+                    if (isTypeOfKind(t, kind)) {
+                        return true;
+                    }
+                }
+            }
             return false;
         }
         function isConstEnumObjectType(type) {
@@ -24018,7 +25686,7 @@ var ts;
             // and the right operand to be of type Any or a subtype of the 'Function' interface type.
             // The result is always of the Boolean primitive type.
             // NOTE: do not raise error if leftType is unknown as related error was already reported
-            if (allConstituentTypesHaveKind(leftType, 16777726 /* Primitive */)) {
+            if (isTypeOfKind(leftType, 16777726 /* Primitive */)) {
                 error(left, ts.Diagnostics.The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter);
             }
             // NOTE: do not raise error if right is unknown as related error was already reported
@@ -24044,9 +25712,9 @@ var ts;
             var properties = node.properties;
             for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
                 var p = properties_3[_i];
-                if (p.kind === 248 /* PropertyAssignment */ || p.kind === 249 /* ShorthandPropertyAssignment */) {
+                if (p.kind === 252 /* PropertyAssignment */ || p.kind === 253 /* ShorthandPropertyAssignment */) {
                     var name_13 = p.name;
-                    if (name_13.kind === 137 /* ComputedPropertyName */) {
+                    if (name_13.kind === 139 /* ComputedPropertyName */) {
                         checkComputedPropertyName(name_13);
                     }
                     if (isComputedNonLiteralName(name_13)) {
@@ -24059,7 +25727,7 @@ var ts;
                             isNumericLiteralName(text) && getIndexTypeOfType(sourceType, 1 /* Number */) ||
                             getIndexTypeOfType(sourceType, 0 /* String */);
                     if (type) {
-                        if (p.kind === 249 /* ShorthandPropertyAssignment */) {
+                        if (p.kind === 253 /* ShorthandPropertyAssignment */) {
                             checkDestructuringAssignment(p, type);
                         }
                         else {
@@ -24085,8 +25753,8 @@ var ts;
             var elements = node.elements;
             for (var i = 0; i < elements.length; i++) {
                 var e = elements[i];
-                if (e.kind !== 190 /* OmittedExpression */) {
-                    if (e.kind !== 188 /* SpreadElementExpression */) {
+                if (e.kind !== 192 /* OmittedExpression */) {
+                    if (e.kind !== 190 /* SpreadElementExpression */) {
                         var propName = "" + i;
                         var type = isTypeAny(sourceType)
                             ? sourceType
@@ -24111,7 +25779,7 @@ var ts;
                         }
                         else {
                             var restExpression = e.expression;
-                            if (restExpression.kind === 184 /* BinaryExpression */ && restExpression.operatorToken.kind === 56 /* EqualsToken */) {
+                            if (restExpression.kind === 186 /* BinaryExpression */ && restExpression.operatorToken.kind === 56 /* EqualsToken */) {
                                 error(restExpression.operatorToken, ts.Diagnostics.A_rest_element_cannot_have_an_initializer);
                             }
                             else {
@@ -24125,7 +25793,7 @@ var ts;
         }
         function checkDestructuringAssignment(exprOrAssignment, sourceType, contextualMapper) {
             var target;
-            if (exprOrAssignment.kind === 249 /* ShorthandPropertyAssignment */) {
+            if (exprOrAssignment.kind === 253 /* ShorthandPropertyAssignment */) {
                 var prop = exprOrAssignment;
                 if (prop.objectAssignmentInitializer) {
                     checkBinaryLikeExpression(prop.name, prop.equalsToken, prop.objectAssignmentInitializer, contextualMapper);
@@ -24135,21 +25803,21 @@ var ts;
             else {
                 target = exprOrAssignment;
             }
-            if (target.kind === 184 /* BinaryExpression */ && target.operatorToken.kind === 56 /* EqualsToken */) {
+            if (target.kind === 186 /* BinaryExpression */ && target.operatorToken.kind === 56 /* EqualsToken */) {
                 checkBinaryExpression(target, contextualMapper);
                 target = target.left;
             }
-            if (target.kind === 168 /* ObjectLiteralExpression */) {
+            if (target.kind === 170 /* ObjectLiteralExpression */) {
                 return checkObjectLiteralAssignment(target, sourceType, contextualMapper);
             }
-            if (target.kind === 167 /* ArrayLiteralExpression */) {
+            if (target.kind === 169 /* ArrayLiteralExpression */) {
                 return checkArrayLiteralAssignment(target, sourceType, contextualMapper);
             }
             return checkReferenceAssignment(target, sourceType, contextualMapper);
         }
         function checkReferenceAssignment(target, sourceType, contextualMapper) {
             var targetType = checkExpression(target, contextualMapper);
-            if (checkReferenceExpression(target, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant)) {
+            if (checkReferenceExpression(target, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property)) {
                 checkTypeAssignableTo(sourceType, targetType, target, /*headMessage*/ undefined);
             }
             return sourceType;
@@ -24159,7 +25827,7 @@ var ts;
         }
         function checkBinaryLikeExpression(left, operatorToken, right, contextualMapper, errorNode) {
             var operator = operatorToken.kind;
-            if (operator === 56 /* EqualsToken */ && (left.kind === 168 /* ObjectLiteralExpression */ || left.kind === 167 /* ArrayLiteralExpression */)) {
+            if (operator === 56 /* EqualsToken */ && (left.kind === 170 /* ObjectLiteralExpression */ || left.kind === 169 /* ArrayLiteralExpression */)) {
                 return checkDestructuringAssignment(left, checkExpression(right, contextualMapper), contextualMapper);
             }
             var leftType = checkExpression(left, contextualMapper);
@@ -24193,11 +25861,13 @@ var ts;
                     // as having the primitive type Number. If one operand is the null or undefined value,
                     // it is treated as having the type of the other operand.
                     // The result is always of the Number primitive type.
-                    if (leftType.flags & (32 /* Undefined */ | 64 /* Null */))
+                    if (leftType.flags & 96 /* Nullable */)
                         leftType = rightType;
-                    if (rightType.flags & (32 /* Undefined */ | 64 /* Null */))
+                    if (rightType.flags & 96 /* Nullable */)
                         rightType = leftType;
-                    var suggestedOperator;
+                    leftType = getNonNullableType(leftType);
+                    rightType = getNonNullableType(rightType);
+                    var suggestedOperator = void 0;
                     // if a user tries to apply a bitwise operator to 2 boolean operands
                     // try and return them a helpful suggestion
                     if ((leftType.flags & 8 /* Boolean */) &&
@@ -24220,18 +25890,20 @@ var ts;
                     // The binary + operator requires both operands to be of the Number primitive type or an enum type,
                     // or at least one of the operands to be of type Any or the String primitive type.
                     // If one operand is the null or undefined value, it is treated as having the type of the other operand.
-                    if (leftType.flags & (32 /* Undefined */ | 64 /* Null */))
+                    if (leftType.flags & 96 /* Nullable */)
                         leftType = rightType;
-                    if (rightType.flags & (32 /* Undefined */ | 64 /* Null */))
+                    if (rightType.flags & 96 /* Nullable */)
                         rightType = leftType;
-                    var resultType;
-                    if (allConstituentTypesHaveKind(leftType, 132 /* NumberLike */) && allConstituentTypesHaveKind(rightType, 132 /* NumberLike */)) {
+                    leftType = getNonNullableType(leftType);
+                    rightType = getNonNullableType(rightType);
+                    var resultType = void 0;
+                    if (isTypeOfKind(leftType, 132 /* NumberLike */) && isTypeOfKind(rightType, 132 /* NumberLike */)) {
                         // Operands of an enum type are treated as having the primitive type Number.
                         // If both operands are of the Number primitive type, the result is of the Number primitive type.
                         resultType = numberType;
                     }
                     else {
-                        if (allConstituentTypesHaveKind(leftType, 258 /* StringLike */) || allConstituentTypesHaveKind(rightType, 258 /* StringLike */)) {
+                        if (isTypeOfKind(leftType, 258 /* StringLike */) || isTypeOfKind(rightType, 258 /* StringLike */)) {
                             // If one or both operands are of the String primitive type, the result is of the String primitive type.
                             resultType = stringType;
                         }
@@ -24265,11 +25937,7 @@ var ts;
                 case 31 /* ExclamationEqualsToken */:
                 case 32 /* EqualsEqualsEqualsToken */:
                 case 33 /* ExclamationEqualsEqualsToken */:
-                    // Permit 'number[] | "foo"' to be asserted to 'string'.
-                    if (someConstituentTypeHasKind(leftType, 258 /* StringLike */) && someConstituentTypeHasKind(rightType, 258 /* StringLike */)) {
-                        return booleanType;
-                    }
-                    if (!isTypeAssignableTo(leftType, rightType) && !isTypeAssignableTo(rightType, leftType)) {
+                    if (!isTypeComparableTo(leftType, rightType) && !isTypeComparableTo(rightType, leftType)) {
                         reportOperatorError();
                     }
                     return booleanType;
@@ -24278,9 +25946,9 @@ var ts;
                 case 90 /* InKeyword */:
                     return checkInExpression(left, right, leftType, rightType);
                 case 51 /* AmpersandAmpersandToken */:
-                    return rightType;
+                    return addNullableKind(rightType, getNullableKind(leftType));
                 case 52 /* BarBarToken */:
-                    return getUnionType([leftType, rightType]);
+                    return getUnionType([getNonNullableType(leftType), rightType]);
                 case 56 /* EqualsToken */:
                     checkAssignmentOperator(rightType);
                     return getRegularTypeOfObjectLiteral(rightType);
@@ -24289,8 +25957,8 @@ var ts;
             }
             // Return true if there was no error, false if there was an error.
             function checkForDisallowedESSymbolOperand(operator) {
-                var offendingSymbolOperand = someConstituentTypeHasKind(leftType, 16777216 /* ESSymbol */) ? left :
-                    someConstituentTypeHasKind(rightType, 16777216 /* ESSymbol */) ? right :
+                var offendingSymbolOperand = maybeTypeOfKind(leftType, 16777216 /* ESSymbol */) ? left :
+                    maybeTypeOfKind(rightType, 16777216 /* ESSymbol */) ? right :
                         undefined;
                 if (offendingSymbolOperand) {
                     error(offendingSymbolOperand, ts.Diagnostics.The_0_operator_cannot_be_applied_to_type_symbol, ts.tokenToString(operator));
@@ -24321,7 +25989,7 @@ var ts;
                     // requires VarExpr to be classified as a reference
                     // A compound assignment furthermore requires VarExpr to be classified as a reference (section 4.1)
                     // and the type of the non - compound operation to be assignable to the type of VarExpr.
-                    var ok = checkReferenceExpression(left, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant);
+                    var ok = checkReferenceExpression(left, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property);
                     // Use default messages
                     if (ok) {
                         // to avoid cascading errors check assignability only if 'isReference' check succeeded and no errors were reported
@@ -24351,7 +26019,7 @@ var ts;
         function checkYieldExpression(node) {
             // Grammar checking
             if (produceDiagnostics) {
-                if (!(node.parserContextFlags & 2 /* Yield */) || isYieldExpressionInClass(node)) {
+                if (!(node.flags & 8388608 /* YieldContext */) || isYieldExpressionInClass(node)) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.A_yield_expression_is_only_allowed_in_a_generator_body);
                 }
                 if (isInParameterInitializerBeforeContainingFunction(node)) {
@@ -24364,7 +26032,7 @@ var ts;
                 // we are in a yield context.
                 if (func && func.asteriskToken) {
                     var expressionType = checkExpressionCached(node.expression, /*contextualMapper*/ undefined);
-                    var expressionElementType;
+                    var expressionElementType = void 0;
                     var nodeIsYieldStar = !!node.asteriskToken;
                     if (nodeIsYieldStar) {
                         expressionElementType = checkElementTypeOfIterable(expressionType, node.expression);
@@ -24428,7 +26096,7 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name.kind === 137 /* ComputedPropertyName */) {
+            if (node.name.kind === 139 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
             }
             return checkExpression(node.initializer, contextualMapper);
@@ -24439,7 +26107,7 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name.kind === 137 /* ComputedPropertyName */) {
+            if (node.name.kind === 139 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
             }
             var uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
@@ -24469,7 +26137,7 @@ var ts;
         // contextually typed function and arrow expressions in the initial phase.
         function checkExpression(node, contextualMapper) {
             var type;
-            if (node.kind === 136 /* QualifiedName */) {
+            if (node.kind === 138 /* QualifiedName */) {
                 type = checkQualifiedName(node);
             }
             else {
@@ -24481,9 +26149,9 @@ var ts;
                 // - 'left' in property access
                 // - 'object' in indexed access
                 // - target in rhs of import statement
-                var ok = (node.parent.kind === 169 /* PropertyAccessExpression */ && node.parent.expression === node) ||
-                    (node.parent.kind === 170 /* ElementAccessExpression */ && node.parent.expression === node) ||
-                    ((node.kind === 69 /* Identifier */ || node.kind === 136 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node));
+                var ok = (node.parent.kind === 171 /* PropertyAccessExpression */ && node.parent.expression === node) ||
+                    (node.parent.kind === 172 /* ElementAccessExpression */ && node.parent.expression === node) ||
+                    ((node.kind === 69 /* Identifier */ || node.kind === 138 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node));
                 if (!ok) {
                     error(node, ts.Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment);
                 }
@@ -24510,7 +26178,7 @@ var ts;
                     return booleanType;
                 case 8 /* NumericLiteral */:
                     return checkNumericLiteral(node);
-                case 186 /* TemplateExpression */:
+                case 188 /* TemplateExpression */:
                     return checkTemplateExpression(node);
                 case 9 /* StringLiteral */:
                     return checkStringLiteralExpression(node);
@@ -24518,58 +26186,60 @@ var ts;
                     return stringType;
                 case 10 /* RegularExpressionLiteral */:
                     return globalRegExpType;
-                case 167 /* ArrayLiteralExpression */:
+                case 169 /* ArrayLiteralExpression */:
                     return checkArrayLiteral(node, contextualMapper);
-                case 168 /* ObjectLiteralExpression */:
+                case 170 /* ObjectLiteralExpression */:
                     return checkObjectLiteral(node, contextualMapper);
-                case 169 /* PropertyAccessExpression */:
+                case 171 /* PropertyAccessExpression */:
                     return checkPropertyAccessExpression(node);
-                case 170 /* ElementAccessExpression */:
+                case 172 /* ElementAccessExpression */:
                     return checkIndexedAccess(node);
-                case 171 /* CallExpression */:
-                case 172 /* NewExpression */:
+                case 173 /* CallExpression */:
+                case 174 /* NewExpression */:
                     return checkCallExpression(node);
-                case 173 /* TaggedTemplateExpression */:
+                case 175 /* TaggedTemplateExpression */:
                     return checkTaggedTemplateExpression(node);
-                case 175 /* ParenthesizedExpression */:
+                case 177 /* ParenthesizedExpression */:
                     return checkExpression(node.expression, contextualMapper);
-                case 189 /* ClassExpression */:
+                case 191 /* ClassExpression */:
                     return checkClassExpression(node);
-                case 176 /* FunctionExpression */:
-                case 177 /* ArrowFunction */:
+                case 178 /* FunctionExpression */:
+                case 179 /* ArrowFunction */:
                     return checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
-                case 179 /* TypeOfExpression */:
+                case 181 /* TypeOfExpression */:
                     return checkTypeOfExpression(node);
-                case 174 /* TypeAssertionExpression */:
-                case 192 /* AsExpression */:
+                case 176 /* TypeAssertionExpression */:
+                case 194 /* AsExpression */:
                     return checkAssertion(node);
-                case 178 /* DeleteExpression */:
+                case 195 /* NonNullExpression */:
+                    return checkNonNullAssertion(node);
+                case 180 /* DeleteExpression */:
                     return checkDeleteExpression(node);
-                case 180 /* VoidExpression */:
+                case 182 /* VoidExpression */:
                     return checkVoidExpression(node);
-                case 181 /* AwaitExpression */:
+                case 183 /* AwaitExpression */:
                     return checkAwaitExpression(node);
-                case 182 /* PrefixUnaryExpression */:
+                case 184 /* PrefixUnaryExpression */:
                     return checkPrefixUnaryExpression(node);
-                case 183 /* PostfixUnaryExpression */:
+                case 185 /* PostfixUnaryExpression */:
                     return checkPostfixUnaryExpression(node);
-                case 184 /* BinaryExpression */:
+                case 186 /* BinaryExpression */:
                     return checkBinaryExpression(node, contextualMapper);
-                case 185 /* ConditionalExpression */:
+                case 187 /* ConditionalExpression */:
                     return checkConditionalExpression(node, contextualMapper);
-                case 188 /* SpreadElementExpression */:
+                case 190 /* SpreadElementExpression */:
                     return checkSpreadElementExpression(node, contextualMapper);
-                case 190 /* OmittedExpression */:
+                case 192 /* OmittedExpression */:
                     return undefinedType;
-                case 187 /* YieldExpression */:
+                case 189 /* YieldExpression */:
                     return checkYieldExpression(node);
-                case 243 /* JsxExpression */:
+                case 247 /* JsxExpression */:
                     return checkJsxExpression(node);
-                case 236 /* JsxElement */:
+                case 240 /* JsxElement */:
                     return checkJsxElement(node);
-                case 237 /* JsxSelfClosingElement */:
+                case 241 /* JsxSelfClosingElement */:
                     return checkJsxSelfClosingElement(node);
-                case 238 /* JsxOpeningElement */:
+                case 242 /* JsxOpeningElement */:
                     ts.Debug.fail("Shouldn't ever directly check a JsxOpeningElement");
             }
             return unknownType;
@@ -24595,15 +26265,26 @@ var ts;
             checkGrammarDecorators(node) || checkGrammarModifiers(node);
             checkVariableLikeDeclaration(node);
             var func = ts.getContainingFunction(node);
-            if (node.flags & 56 /* AccessibilityModifier */) {
+            if (node.flags & 28 /* AccessibilityModifier */) {
                 func = ts.getContainingFunction(node);
-                if (!(func.kind === 145 /* Constructor */ && ts.nodeIsPresent(func.body))) {
+                if (!(func.kind === 147 /* Constructor */ && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                 }
             }
             if (node.questionToken && ts.isBindingPattern(node.name) && func.body) {
                 error(node, ts.Diagnostics.A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature);
             }
+            if (node.name.text === "this") {
+                if (ts.indexOf(func.parameters, node) !== 0) {
+                    error(node, ts.Diagnostics.A_this_parameter_must_be_the_first_parameter);
+                }
+                if (func.kind === 147 /* Constructor */ || func.kind === 151 /* ConstructSignature */ || func.kind === 156 /* ConstructorType */) {
+                    error(node, ts.Diagnostics.A_constructor_cannot_have_a_this_parameter);
+                }
+                if (func.kind === 149 /* SetAccessor */) {
+                    error(node, ts.Diagnostics.A_setter_cannot_have_a_this_parameter);
+                }
+            }
             // Only check rest parameter type if it's not a binding pattern. Since binding patterns are
             // not allowed in a rest parameter, we already have an error from checkGrammarParameterList.
             if (node.dotDotDotToken && !ts.isBindingPattern(node.name) && !isArrayType(getTypeOfSymbol(node.symbol))) {
@@ -24614,9 +26295,9 @@ var ts;
             if (!node.asteriskToken || !node.body) {
                 return false;
             }
-            return node.kind === 144 /* MethodDeclaration */ ||
-                node.kind === 216 /* FunctionDeclaration */ ||
-                node.kind === 176 /* FunctionExpression */;
+            return node.kind === 146 /* MethodDeclaration */ ||
+                node.kind === 219 /* FunctionDeclaration */ ||
+                node.kind === 178 /* FunctionExpression */;
         }
         function getTypePredicateParameterIndex(parameterList, parameter) {
             if (parameterList) {
@@ -24633,32 +26314,34 @@ var ts;
         function checkTypePredicate(node) {
             var parent = getTypePredicateParent(node);
             if (!parent) {
+                // The parent must not be valid.
+                error(node, ts.Diagnostics.A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods);
                 return;
             }
-            var returnType = getReturnTypeOfSignature(getSignatureFromDeclaration(parent));
-            if (!returnType || !(returnType.flags & 134217728 /* PredicateType */)) {
+            var typePredicate = getSignatureFromDeclaration(parent).typePredicate;
+            if (!typePredicate) {
                 return;
             }
             var parameterName = node.parameterName;
-            if (parameterName.kind === 162 /* ThisType */) {
+            if (ts.isThisTypePredicate(typePredicate)) {
                 getTypeFromThisTypeNode(parameterName);
             }
             else {
-                var typePredicate = returnType.predicate;
                 if (typePredicate.parameterIndex >= 0) {
                     if (parent.parameters[typePredicate.parameterIndex].dotDotDotToken) {
                         error(parameterName, ts.Diagnostics.A_type_predicate_cannot_reference_a_rest_parameter);
                     }
                     else {
-                        checkTypeAssignableTo(typePredicate.type, getTypeOfNode(parent.parameters[typePredicate.parameterIndex]), node.type);
+                        var leadingError = ts.chainDiagnosticMessages(undefined, ts.Diagnostics.A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type);
+                        checkTypeAssignableTo(typePredicate.type, getTypeOfNode(parent.parameters[typePredicate.parameterIndex]), node.type, 
+                        /*headMessage*/ undefined, leadingError);
                     }
                 }
                 else if (parameterName) {
                     var hasReportedError = false;
                     for (var _i = 0, _a = parent.parameters; _i < _a.length; _i++) {
                         var name_14 = _a[_i].name;
-                        if ((name_14.kind === 164 /* ObjectBindingPattern */ ||
-                            name_14.kind === 165 /* ArrayBindingPattern */) &&
+                        if (ts.isBindingPattern(name_14) &&
                             checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_14, parameterName, typePredicate.parameterName)) {
                             hasReportedError = true;
                             break;
@@ -24672,16 +26355,16 @@ var ts;
         }
         function getTypePredicateParent(node) {
             switch (node.parent.kind) {
-                case 177 /* ArrowFunction */:
-                case 148 /* CallSignature */:
-                case 216 /* FunctionDeclaration */:
-                case 176 /* FunctionExpression */:
-                case 153 /* FunctionType */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
-                    var parent_6 = node.parent;
-                    if (node === parent_6.type) {
-                        return parent_6;
+                case 179 /* ArrowFunction */:
+                case 150 /* CallSignature */:
+                case 219 /* FunctionDeclaration */:
+                case 178 /* FunctionExpression */:
+                case 155 /* FunctionType */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
+                    var parent_8 = node.parent;
+                    if (node === parent_8.type) {
+                        return parent_8;
                     }
             }
         }
@@ -24693,8 +26376,8 @@ var ts;
                     error(predicateVariableNode, ts.Diagnostics.A_type_predicate_cannot_reference_element_0_in_a_binding_pattern, predicateVariableName);
                     return true;
                 }
-                else if (name_15.kind === 165 /* ArrayBindingPattern */ ||
-                    name_15.kind === 164 /* ObjectBindingPattern */) {
+                else if (name_15.kind === 167 /* ArrayBindingPattern */ ||
+                    name_15.kind === 166 /* ObjectBindingPattern */) {
                     if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_15, predicateVariableNode, predicateVariableName)) {
                         return true;
                     }
@@ -24703,25 +26386,27 @@ var ts;
         }
         function checkSignatureDeclaration(node) {
             // Grammar checking
-            if (node.kind === 150 /* IndexSignature */) {
+            if (node.kind === 152 /* IndexSignature */) {
                 checkGrammarIndexSignature(node);
             }
-            else if (node.kind === 153 /* FunctionType */ || node.kind === 216 /* FunctionDeclaration */ || node.kind === 154 /* ConstructorType */ ||
-                node.kind === 148 /* CallSignature */ || node.kind === 145 /* Constructor */ ||
-                node.kind === 149 /* ConstructSignature */) {
+            else if (node.kind === 155 /* FunctionType */ || node.kind === 219 /* FunctionDeclaration */ || node.kind === 156 /* ConstructorType */ ||
+                node.kind === 150 /* CallSignature */ || node.kind === 147 /* Constructor */ ||
+                node.kind === 151 /* ConstructSignature */) {
                 checkGrammarFunctionLikeDeclaration(node);
             }
             checkTypeParameters(node.typeParameters);
             ts.forEach(node.parameters, checkParameter);
-            checkSourceElement(node.type);
+            if (node.type) {
+                checkSourceElement(node.type);
+            }
             if (produceDiagnostics) {
                 checkCollisionWithArgumentsInGeneratedCode(node);
                 if (compilerOptions.noImplicitAny && !node.type) {
                     switch (node.kind) {
-                        case 149 /* ConstructSignature */:
+                        case 151 /* ConstructSignature */:
                             error(node, ts.Diagnostics.Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
-                        case 148 /* CallSignature */:
+                        case 150 /* CallSignature */:
                             error(node, ts.Diagnostics.Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
                     }
@@ -24744,12 +26429,14 @@ var ts;
                             checkTypeAssignableTo(iterableIteratorInstantiation, returnType, node.type);
                         }
                     }
+                    else if (ts.isAsyncFunctionLike(node)) {
+                        checkAsyncFunctionReturnType(node);
+                    }
                 }
             }
-            checkSpecializedSignatureDeclaration(node);
         }
         function checkTypeForDuplicateIndexSignatures(node) {
-            if (node.kind === 218 /* InterfaceDeclaration */) {
+            if (node.kind === 221 /* InterfaceDeclaration */) {
                 var nodeSymbol = getSymbolOfNode(node);
                 // in case of merging interface declaration it is possible that we'll enter this check procedure several times for every declaration
                 // to prevent this run check only for the first declaration of a given kind
@@ -24769,7 +26456,7 @@ var ts;
                     var declaration = decl;
                     if (declaration.parameters.length === 1 && declaration.parameters[0].type) {
                         switch (declaration.parameters[0].type.kind) {
-                            case 130 /* StringKeyword */:
+                            case 131 /* StringKeyword */:
                                 if (!seenStringIndexer) {
                                     seenStringIndexer = true;
                                 }
@@ -24777,7 +26464,7 @@ var ts;
                                     error(declaration, ts.Diagnostics.Duplicate_string_index_signature);
                                 }
                                 break;
-                            case 128 /* NumberKeyword */:
+                            case 129 /* NumberKeyword */:
                                 if (!seenNumericIndexer) {
                                     seenNumericIndexer = true;
                                 }
@@ -24809,7 +26496,7 @@ var ts;
         function checkConstructorDeclaration(node) {
             // Grammar check on signature of constructor and modifier of the constructor is done in checkSignatureDeclaration function.
             checkSignatureDeclaration(node);
-            // Grammar check for checking only related to constructoDeclaration
+            // Grammar check for checking only related to constructorDeclaration
             checkGrammarConstructorTypeParameters(node) || checkGrammarConstructorTypeAnnotation(node);
             checkSourceElement(node.body);
             var symbol = getSymbolOfNode(node);
@@ -24825,14 +26512,11 @@ var ts;
             if (!produceDiagnostics) {
                 return;
             }
-            function isSuperCallExpression(n) {
-                return n.kind === 171 /* CallExpression */ && n.expression.kind === 95 /* SuperKeyword */;
-            }
             function containsSuperCallAsComputedPropertyName(n) {
                 return n.name && containsSuperCall(n.name);
             }
             function containsSuperCall(n) {
-                if (isSuperCallExpression(n)) {
+                if (ts.isSuperCallExpression(n)) {
                     return true;
                 }
                 else if (ts.isFunctionLike(n)) {
@@ -24847,13 +26531,13 @@ var ts;
                 if (n.kind === 97 /* ThisKeyword */) {
                     error(n, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
                 }
-                else if (n.kind !== 176 /* FunctionExpression */ && n.kind !== 216 /* FunctionDeclaration */) {
+                else if (n.kind !== 178 /* FunctionExpression */ && n.kind !== 219 /* FunctionDeclaration */) {
                     ts.forEachChild(n, markThisReferencesAsErrors);
                 }
             }
             function isInstancePropertyWithInitializer(n) {
-                return n.kind === 142 /* PropertyDeclaration */ &&
-                    !(n.flags & 64 /* Static */) &&
+                return n.kind === 144 /* PropertyDeclaration */ &&
+                    !(n.flags & 32 /* Static */) &&
                     !!n.initializer;
             }
             // TS 1.0 spec (April 2014): 8.3.2
@@ -24861,12 +26545,11 @@ var ts;
             // constructors of derived classes must contain at least one super call somewhere in their function body.
             var containingClassDecl = node.parent;
             if (ts.getClassExtendsHeritageClauseElement(containingClassDecl)) {
-                var containingClassSymbol = getSymbolOfNode(containingClassDecl);
-                var containingClassInstanceType = getDeclaredTypeOfSymbol(containingClassSymbol);
-                var baseConstructorType = getBaseConstructorTypeOfClass(containingClassInstanceType);
-                if (containsSuperCall(node.body)) {
-                    if (baseConstructorType === nullType) {
-                        error(node, ts.Diagnostics.A_constructor_cannot_contain_a_super_call_when_its_class_extends_null);
+                var classExtendsNull = classDeclarationExtendsNull(containingClassDecl);
+                var superCall = getSuperCallInConstructor(node);
+                if (superCall) {
+                    if (classExtendsNull) {
+                        error(superCall, ts.Diagnostics.A_constructor_cannot_contain_a_super_call_when_its_class_extends_null);
                     }
                     // The first statement in the body of a constructor (excluding prologue directives) must be a super call
                     // if both of the following are true:
@@ -24874,15 +26557,15 @@ var ts;
                     // - The constructor declares parameter properties
                     //   or the containing class declares instance member variables with initializers.
                     var superCallShouldBeFirst = ts.forEach(node.parent.members, isInstancePropertyWithInitializer) ||
-                        ts.forEach(node.parameters, function (p) { return p.flags & (8 /* Public */ | 16 /* Private */ | 32 /* Protected */); });
+                        ts.forEach(node.parameters, function (p) { return p.flags & (4 /* Public */ | 8 /* Private */ | 16 /* Protected */); });
                     // Skip past any prologue directives to find the first statement
                     // to ensure that it was a super call.
                     if (superCallShouldBeFirst) {
                         var statements = node.body.statements;
-                        var superCallStatement;
+                        var superCallStatement = void 0;
                         for (var _i = 0, statements_2 = statements; _i < statements_2.length; _i++) {
                             var statement = statements_2[_i];
-                            if (statement.kind === 198 /* ExpressionStatement */ && isSuperCallExpression(statement.expression)) {
+                            if (statement.kind === 201 /* ExpressionStatement */ && ts.isSuperCallExpression(statement.expression)) {
                                 superCallStatement = statement;
                                 break;
                             }
@@ -24893,13 +26576,9 @@ var ts;
                         if (!superCallStatement) {
                             error(node, ts.Diagnostics.A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties);
                         }
-                        else {
-                            // In such a required super call, it is a compile-time error for argument expressions to reference this.
-                            markThisReferencesAsErrors(superCallStatement.expression);
-                        }
                     }
                 }
-                else if (baseConstructorType !== nullType) {
+                else if (!classExtendsNull) {
                     error(node, ts.Diagnostics.Constructors_for_derived_classes_must_contain_a_super_call);
                 }
             }
@@ -24910,9 +26589,9 @@ var ts;
                 checkGrammarFunctionLikeDeclaration(node) || checkGrammarAccessor(node) || checkGrammarComputedPropertyName(node.name);
                 checkDecorators(node);
                 checkSignatureDeclaration(node);
-                if (node.kind === 146 /* GetAccessor */) {
-                    if (!ts.isInAmbientContext(node) && ts.nodeIsPresent(node.body) && (node.flags & 524288 /* HasImplicitReturn */)) {
-                        if (node.flags & 1048576 /* HasExplicitReturn */) {
+                if (node.kind === 148 /* GetAccessor */) {
+                    if (!ts.isInAmbientContext(node) && ts.nodeIsPresent(node.body) && (node.flags & 32768 /* HasImplicitReturn */)) {
+                        if (node.flags & 65536 /* HasExplicitReturn */) {
                             if (compilerOptions.noImplicitReturns) {
                                 error(node.name, ts.Diagnostics.Not_all_code_paths_return_a_value);
                             }
@@ -24925,18 +26604,21 @@ var ts;
                 // Do not use hasDynamicName here, because that returns false for well known symbols.
                 // We want to perform checkComputedPropertyName for all computed properties, including
                 // well known symbols.
-                if (node.name.kind === 137 /* ComputedPropertyName */) {
+                if (node.name.kind === 139 /* ComputedPropertyName */) {
                     checkComputedPropertyName(node.name);
                 }
                 if (!ts.hasDynamicName(node)) {
                     // TypeScript 1.0 spec (April 2014): 8.4.3
                     // Accessors for the same member name must specify the same accessibility.
-                    var otherKind = node.kind === 146 /* GetAccessor */ ? 147 /* SetAccessor */ : 146 /* GetAccessor */;
+                    var otherKind = node.kind === 148 /* GetAccessor */ ? 149 /* SetAccessor */ : 148 /* GetAccessor */;
                     var otherAccessor = ts.getDeclarationOfKind(node.symbol, otherKind);
                     if (otherAccessor) {
-                        if (((node.flags & 56 /* AccessibilityModifier */) !== (otherAccessor.flags & 56 /* AccessibilityModifier */))) {
+                        if (((node.flags & 28 /* AccessibilityModifier */) !== (otherAccessor.flags & 28 /* AccessibilityModifier */))) {
                             error(node.name, ts.Diagnostics.Getter_and_setter_accessors_do_not_agree_in_visibility);
                         }
+                        if (((node.flags & 128 /* Abstract */) !== (otherAccessor.flags & 128 /* Abstract */))) {
+                            error(node.name, ts.Diagnostics.Accessors_must_both_be_abstract_or_non_abstract);
+                        }
                         var currentAccessorType = getAnnotatedAccessorType(node);
                         var otherAccessorType = getAnnotatedAccessorType(otherAccessor);
                         // TypeScript 1.0 spec (April 2014): 4.5
@@ -24950,7 +26632,7 @@ var ts;
                 }
                 getTypeOfAccessors(getSymbolOfNode(node));
             }
-            if (node.parent.kind !== 168 /* ObjectLiteralExpression */) {
+            if (node.parent.kind !== 170 /* ObjectLiteralExpression */) {
                 checkSourceElement(node.body);
             }
             else {
@@ -25019,59 +26701,21 @@ var ts;
             ts.forEach(node.types, checkSourceElement);
         }
         function isPrivateWithinAmbient(node) {
-            return (node.flags & 16 /* Private */) && ts.isInAmbientContext(node);
-        }
-        function checkSpecializedSignatureDeclaration(signatureDeclarationNode) {
-            if (!produceDiagnostics) {
-                return;
-            }
-            var signature = getSignatureFromDeclaration(signatureDeclarationNode);
-            if (!signature.hasStringLiterals) {
-                return;
-            }
-            // TypeScript 1.0 spec (April 2014): 3.7.2.2
-            // Specialized signatures are not permitted in conjunction with a function body
-            if (ts.nodeIsPresent(signatureDeclarationNode.body)) {
-                error(signatureDeclarationNode, ts.Diagnostics.A_signature_with_an_implementation_cannot_use_a_string_literal_type);
-                return;
-            }
-            // TypeScript 1.0 spec (April 2014): 3.7.2.4
-            // Every specialized call or construct signature in an object type must be assignable
-            // to at least one non-specialized call or construct signature in the same object type
-            var signaturesToCheck;
-            // Unnamed (call\construct) signatures in interfaces are inherited and not shadowed so examining just node symbol won't give complete answer.
-            // Use declaring type to obtain full list of signatures.
-            if (!signatureDeclarationNode.name && signatureDeclarationNode.parent && signatureDeclarationNode.parent.kind === 218 /* InterfaceDeclaration */) {
-                ts.Debug.assert(signatureDeclarationNode.kind === 148 /* CallSignature */ || signatureDeclarationNode.kind === 149 /* ConstructSignature */);
-                var signatureKind = signatureDeclarationNode.kind === 148 /* CallSignature */ ? 0 /* Call */ : 1 /* Construct */;
-                var containingSymbol = getSymbolOfNode(signatureDeclarationNode.parent);
-                var containingType = getDeclaredTypeOfSymbol(containingSymbol);
-                signaturesToCheck = getSignaturesOfType(containingType, signatureKind);
-            }
-            else {
-                signaturesToCheck = getSignaturesOfSymbol(getSymbolOfNode(signatureDeclarationNode));
-            }
-            for (var _i = 0, signaturesToCheck_1 = signaturesToCheck; _i < signaturesToCheck_1.length; _i++) {
-                var otherSignature = signaturesToCheck_1[_i];
-                if (!otherSignature.hasStringLiterals && isSignatureAssignableTo(signature, otherSignature, /*ignoreReturnTypes*/ false)) {
-                    return;
-                }
-            }
-            error(signatureDeclarationNode, ts.Diagnostics.Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature);
+            return (node.flags & 8 /* Private */) && ts.isInAmbientContext(node);
         }
         function getEffectiveDeclarationFlags(n, flagsToCheck) {
             var flags = ts.getCombinedNodeFlags(n);
             // children of classes (even ambient classes) should not be marked as ambient or export
             // because those flags have no useful semantics there.
-            if (n.parent.kind !== 218 /* InterfaceDeclaration */ &&
-                n.parent.kind !== 217 /* ClassDeclaration */ &&
-                n.parent.kind !== 189 /* ClassExpression */ &&
+            if (n.parent.kind !== 221 /* InterfaceDeclaration */ &&
+                n.parent.kind !== 220 /* ClassDeclaration */ &&
+                n.parent.kind !== 191 /* ClassExpression */ &&
                 ts.isInAmbientContext(n)) {
-                if (!(flags & 4 /* Ambient */)) {
+                if (!(flags & 2 /* Ambient */)) {
                     // It is nested in an ambient context, which means it is automatically exported
-                    flags |= 2 /* Export */;
+                    flags |= 1 /* Export */;
                 }
-                flags |= 4 /* Ambient */;
+                flags |= 2 /* Ambient */;
             }
             return flags & flagsToCheck;
         }
@@ -25093,36 +26737,36 @@ var ts;
                 // deviations, we XOR someOverloadFlags with allOverloadFlags
                 var someButNotAllOverloadFlags = someOverloadFlags ^ allOverloadFlags;
                 if (someButNotAllOverloadFlags !== 0) {
-                    var canonicalFlags = getEffectiveDeclarationFlags(getCanonicalOverload(overloads, implementation), flagsToCheck);
+                    var canonicalFlags_1 = getEffectiveDeclarationFlags(getCanonicalOverload(overloads, implementation), flagsToCheck);
                     ts.forEach(overloads, function (o) {
-                        var deviation = getEffectiveDeclarationFlags(o, flagsToCheck) ^ canonicalFlags;
-                        if (deviation & 2 /* Export */) {
-                            error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_exported_or_not_exported);
+                        var deviation = getEffectiveDeclarationFlags(o, flagsToCheck) ^ canonicalFlags_1;
+                        if (deviation & 1 /* Export */) {
+                            error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_exported_or_non_exported);
                         }
-                        else if (deviation & 4 /* Ambient */) {
+                        else if (deviation & 2 /* Ambient */) {
                             error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_ambient_or_non_ambient);
                         }
-                        else if (deviation & (16 /* Private */ | 32 /* Protected */)) {
-                            error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_public_private_or_protected);
+                        else if (deviation & (8 /* Private */ | 16 /* Protected */)) {
+                            error(o.name || o, ts.Diagnostics.Overload_signatures_must_all_be_public_private_or_protected);
                         }
                         else if (deviation & 128 /* Abstract */) {
-                            error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_abstract_or_not_abstract);
+                            error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_abstract_or_non_abstract);
                         }
                     });
                 }
             }
             function checkQuestionTokenAgreementBetweenOverloads(overloads, implementation, someHaveQuestionToken, allHaveQuestionToken) {
                 if (someHaveQuestionToken !== allHaveQuestionToken) {
-                    var canonicalHasQuestionToken = ts.hasQuestionToken(getCanonicalOverload(overloads, implementation));
+                    var canonicalHasQuestionToken_1 = ts.hasQuestionToken(getCanonicalOverload(overloads, implementation));
                     ts.forEach(overloads, function (o) {
-                        var deviation = ts.hasQuestionToken(o) !== canonicalHasQuestionToken;
+                        var deviation = ts.hasQuestionToken(o) !== canonicalHasQuestionToken_1;
                         if (deviation) {
                             error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_optional_or_required);
                         }
                     });
                 }
             }
-            var flagsToCheck = 2 /* Export */ | 4 /* Ambient */ | 16 /* Private */ | 32 /* Protected */ | 128 /* Abstract */;
+            var flagsToCheck = 1 /* Export */ | 2 /* Ambient */ | 8 /* Private */ | 16 /* Protected */ | 128 /* Abstract */;
             var someNodeFlags = 0;
             var allNodeFlags = flagsToCheck;
             var someHaveQuestionToken = false;
@@ -25146,21 +26790,21 @@ var ts;
                         seen = c === node;
                     }
                 });
-                // We may be here because of some extra junk between overloads that could not be parsed into a valid node.
+                // We may be here because of some extra nodes between overloads that could not be parsed into a valid node.
                 // In this case the subsequent node is not really consecutive (.pos !== node.end), and we must ignore it here.
                 if (subsequentNode && subsequentNode.pos === node.end) {
                     if (subsequentNode.kind === node.kind) {
                         var errorNode_1 = subsequentNode.name || subsequentNode;
                         // TODO(jfreeman): These are methods, so handle computed name case
                         if (node.name && subsequentNode.name && node.name.text === subsequentNode.name.text) {
-                            var reportError = (node.kind === 144 /* MethodDeclaration */ || node.kind === 143 /* MethodSignature */) &&
-                                (node.flags & 64 /* Static */) !== (subsequentNode.flags & 64 /* Static */);
+                            var reportError = (node.kind === 146 /* MethodDeclaration */ || node.kind === 145 /* MethodSignature */) &&
+                                (node.flags & 32 /* Static */) !== (subsequentNode.flags & 32 /* 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) {
-                                var diagnostic = node.flags & 64 /* Static */ ? ts.Diagnostics.Function_overload_must_be_static : ts.Diagnostics.Function_overload_must_not_be_static;
+                                var diagnostic = node.flags & 32 /* Static */ ? ts.Diagnostics.Function_overload_must_be_static : ts.Diagnostics.Function_overload_must_not_be_static;
                                 error(errorNode_1, diagnostic);
                             }
                             return;
@@ -25195,7 +26839,7 @@ var ts;
                 var current = declarations_4[_i];
                 var node = current;
                 var inAmbientContext = ts.isInAmbientContext(node);
-                var inAmbientContextOrInterface = node.parent.kind === 218 /* InterfaceDeclaration */ || node.parent.kind === 156 /* TypeLiteral */ || inAmbientContext;
+                var inAmbientContextOrInterface = node.parent.kind === 221 /* InterfaceDeclaration */ || node.parent.kind === 158 /* TypeLiteral */ || inAmbientContext;
                 if (inAmbientContextOrInterface) {
                     // check if declarations are consecutive only if they are non-ambient
                     // 1. ambient declarations can be interleaved
@@ -25206,7 +26850,7 @@ var ts;
                     // 2. mixing ambient and non-ambient declarations is a separate error that will be reported - do not want to report an extra one
                     previousDeclaration = undefined;
                 }
-                if (node.kind === 216 /* FunctionDeclaration */ || node.kind === 144 /* MethodDeclaration */ || node.kind === 143 /* MethodSignature */ || node.kind === 145 /* Constructor */) {
+                if (node.kind === 219 /* FunctionDeclaration */ || node.kind === 146 /* MethodDeclaration */ || node.kind === 145 /* MethodSignature */ || node.kind === 147 /* Constructor */) {
                     var currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
                     someNodeFlags |= currentNodeFlags;
                     allNodeFlags &= currentNodeFlags;
@@ -25258,29 +26902,11 @@ var ts;
                 if (bodyDeclaration) {
                     var signatures = getSignaturesOfSymbol(symbol);
                     var bodySignature = getSignatureFromDeclaration(bodyDeclaration);
-                    // If the implementation signature has string literals, we will have reported an error in
-                    // checkSpecializedSignatureDeclaration
-                    if (!bodySignature.hasStringLiterals) {
-                        // TypeScript 1.0 spec (April 2014): 6.1
-                        // If a function declaration includes overloads, the overloads determine the call
-                        // signatures of the type given to the function object
-                        // and the function implementation signature must be assignable to that type
-                        //
-                        // TypeScript 1.0 spec (April 2014): 3.8.4
-                        // Note that specialized call and construct signatures (section 3.7.2.4) are not significant when determining assignment compatibility
-                        // Consider checking against specialized signatures too. Not doing so creates a type hole:
-                        //
-                        // function g(x: "hi", y: boolean);
-                        // function g(x: string, y: {});
-                        // function g(x: string, y: string) { }
-                        //
-                        // The implementation is completely unrelated to the specialized signature, yet we do not check this.
-                        for (var _a = 0, signatures_3 = signatures; _a < signatures_3.length; _a++) {
-                            var signature = signatures_3[_a];
-                            if (!signature.hasStringLiterals && !isImplementationCompatibleWithOverload(bodySignature, signature)) {
-                                error(signature.declaration, ts.Diagnostics.Overload_signature_is_not_compatible_with_function_implementation);
-                                break;
-                            }
+                    for (var _a = 0, signatures_3 = signatures; _a < signatures_3.length; _a++) {
+                        var signature = signatures_3[_a];
+                        if (!isImplementationCompatibleWithOverload(bodySignature, signature)) {
+                            error(signature.declaration, ts.Diagnostics.Overload_signature_is_not_compatible_with_function_implementation);
+                            break;
                         }
                     }
                 }
@@ -25313,8 +26939,8 @@ var ts;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var d = _a[_i];
                 var declarationSpaces = getDeclarationSpaces(d);
-                var effectiveDeclarationFlags = getEffectiveDeclarationFlags(d, 2 /* Export */ | 512 /* Default */);
-                if (effectiveDeclarationFlags & 2 /* Export */) {
+                var effectiveDeclarationFlags = getEffectiveDeclarationFlags(d, 1 /* Export */ | 512 /* Default */);
+                if (effectiveDeclarationFlags & 1 /* Export */) {
                     if (effectiveDeclarationFlags & 512 /* Default */) {
                         defaultExportedDeclarationSpaces |= declarationSpaces;
                     }
@@ -25326,7 +26952,7 @@ var ts;
                     nonExportedDeclarationSpaces |= declarationSpaces;
                 }
             }
-            // Spaces for anyting not declared a 'default export'.
+            // Spaces for anything not declared a 'default export'.
             var nonDefaultExportedDeclarationSpaces = exportedDeclarationSpaces | nonExportedDeclarationSpaces;
             var commonDeclarationSpacesForExportsAndLocals = exportedDeclarationSpaces & nonExportedDeclarationSpaces;
             var commonDeclarationSpacesForDefaultAndNonDefault = defaultExportedDeclarationSpaces & nonDefaultExportedDeclarationSpaces;
@@ -25335,7 +26961,7 @@ var ts;
                 for (var _b = 0, _c = symbol.declarations; _b < _c.length; _b++) {
                     var d = _c[_b];
                     var declarationSpaces = getDeclarationSpaces(d);
-                    // Only error on the declarations that conributed to the intersecting spaces.
+                    // Only error on the declarations that contributed to the intersecting spaces.
                     if (declarationSpaces & commonDeclarationSpacesForDefaultAndNonDefault) {
                         error(d.name, ts.Diagnostics.Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_default_0_declaration_instead, ts.declarationNameToString(d.name));
                     }
@@ -25346,20 +26972,20 @@ var ts;
             }
             function getDeclarationSpaces(d) {
                 switch (d.kind) {
-                    case 218 /* InterfaceDeclaration */:
+                    case 221 /* InterfaceDeclaration */:
                         return 2097152 /* ExportType */;
-                    case 221 /* ModuleDeclaration */:
+                    case 224 /* ModuleDeclaration */:
                         return ts.isAmbientModule(d) || ts.getModuleInstanceState(d) !== 0 /* NonInstantiated */
                             ? 4194304 /* ExportNamespace */ | 1048576 /* ExportValue */
                             : 4194304 /* ExportNamespace */;
-                    case 217 /* ClassDeclaration */:
-                    case 220 /* EnumDeclaration */:
+                    case 220 /* ClassDeclaration */:
+                    case 223 /* EnumDeclaration */:
                         return 2097152 /* ExportType */ | 1048576 /* ExportValue */;
-                    case 224 /* ImportEqualsDeclaration */:
-                        var result = 0;
+                    case 228 /* ImportEqualsDeclaration */:
+                        var result_1 = 0;
                         var target = resolveAlias(getSymbolOfNode(d));
-                        ts.forEach(target.declarations, function (d) { result |= getDeclarationSpaces(d); });
-                        return result;
+                        ts.forEach(target.declarations, function (d) { result_1 |= getDeclarationSpaces(d); });
+                        return result_1;
                     default:
                         return 1048576 /* ExportValue */;
                 }
@@ -25467,7 +27093,7 @@ var ts;
                         return checkNonThenableType(type, location, message);
                     }
                     else {
-                        if (type.id === promisedType.id || awaitedTypeStack.indexOf(promisedType.id) >= 0) {
+                        if (type.id === promisedType.id || ts.indexOf(awaitedTypeStack, promisedType.id) >= 0) {
                             // We have a bad actor in the form of a promise whose promised type is
                             // the same promise type, or a mutually recursive promise. Return the
                             // unknown type as we cannot guess the shape. If this were the actual
@@ -25516,6 +27142,33 @@ var ts;
                 }
             }
         }
+        /**
+         * Checks that the return type provided is an instantiation of the global Promise<T> type
+         * and returns the awaited type of the return type.
+         *
+         * @param returnType The return type of a FunctionLikeDeclaration
+         * @param location The node on which to report the error.
+         */
+        function checkCorrectPromiseType(returnType, location) {
+            if (returnType === unknownType) {
+                // The return type already had some other error, so we ignore and return
+                // the unknown type.
+                return unknownType;
+            }
+            var globalPromiseType = getGlobalPromiseType();
+            if (globalPromiseType === emptyGenericType
+                || globalPromiseType === getTargetType(returnType)) {
+                // Either we couldn't resolve the global promise type, which would have already
+                // reported an error, or we could resolve it and the return type is a valid type
+                // reference to the global type. In either case, we return the awaited type for
+                // the return type.
+                return checkAwaitedType(returnType, location, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
+            }
+            // 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, ts.Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type);
+            return unknownType;
+        }
         /**
           * Checks the return type of an async function to ensure it is a compatible
           * Promise implementation.
@@ -25530,6 +27183,10 @@ var ts;
           * callable `then` signature.
           */
         function checkAsyncFunctionReturnType(node) {
+            if (languageVersion >= 2 /* ES6 */) {
+                var returnType = getTypeFromTypeNode(node.type);
+                return checkCorrectPromiseType(returnType, node.type);
+            }
             var globalPromiseConstructorLikeType = getGlobalPromiseConstructorLikeType();
             if (globalPromiseConstructorLikeType === emptyObjectType) {
                 // If we couldn't resolve the global PromiseConstructorLike type we cannot verify
@@ -25605,22 +27262,22 @@ var ts;
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             var errorInfo;
             switch (node.parent.kind) {
-                case 217 /* ClassDeclaration */:
+                case 220 /* ClassDeclaration */:
                     var classSymbol = getSymbolOfNode(node.parent);
                     var classConstructorType = getTypeOfSymbol(classSymbol);
                     expectedReturnType = getUnionType([classConstructorType, voidType]);
                     break;
-                case 139 /* Parameter */:
+                case 141 /* Parameter */:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any);
                     break;
-                case 142 /* PropertyDeclaration */:
+                case 144 /* PropertyDeclaration */:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.The_return_type_of_a_property_decorator_function_must_be_either_void_or_any);
                     break;
-                case 144 /* MethodDeclaration */:
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
+                case 146 /* MethodDeclaration */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
                     var methodType = getTypeOfNode(node.parent);
                     var descriptorType = createTypedPropertyDescriptorType(methodType);
                     expectedReturnType = getUnionType([descriptorType, voidType]);
@@ -25633,9 +27290,9 @@ var ts;
             // When we are emitting type metadata for decorators, we need to try to check the type
             // as if it were an expression so that we can emit the type in a value position when we
             // serialize the type metadata.
-            if (node && node.kind === 152 /* TypeReference */) {
+            if (node && node.kind === 154 /* TypeReference */) {
                 var root = getFirstIdentifier(node.typeName);
-                var meaning = root.parent.kind === 152 /* TypeReference */ ? 793056 /* Type */ : 1536 /* Namespace */;
+                var meaning = root.parent.kind === 154 /* TypeReference */ ? 793056 /* Type */ : 1536 /* Namespace */;
                 // Resolve type so we know which symbol is referenced
                 var rootSymbol = resolveName(root, root.text, meaning | 8388608 /* Alias */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
                 // Resolved symbol is alias
@@ -25677,25 +27334,25 @@ var ts;
                 return;
             }
             if (!compilerOptions.experimentalDecorators) {
-                error(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Specify_experimentalDecorators_to_remove_this_warning);
+                error(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning);
             }
             if (compilerOptions.emitDecoratorMetadata) {
                 // we only need to perform these checks if we are emitting serialized type metadata for the target of a decorator.
                 switch (node.kind) {
-                    case 217 /* ClassDeclaration */:
+                    case 220 /* ClassDeclaration */:
                         var constructor = ts.getFirstConstructorWithBody(node);
                         if (constructor) {
                             checkParameterTypeAnnotationsAsExpressions(constructor);
                         }
                         break;
-                    case 144 /* MethodDeclaration */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
+                    case 146 /* MethodDeclaration */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
                         checkParameterTypeAnnotationsAsExpressions(node);
                         checkReturnTypeAnnotationAsExpression(node);
                         break;
-                    case 142 /* PropertyDeclaration */:
-                    case 139 /* Parameter */:
+                    case 144 /* PropertyDeclaration */:
+                    case 141 /* Parameter */:
                         checkTypeAnnotationAsExpression(node);
                         break;
                 }
@@ -25708,6 +27365,7 @@ var ts;
                 checkCollisionWithCapturedSuperVariable(node, node.name);
                 checkCollisionWithCapturedThisVariable(node, node.name);
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+                checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             }
         }
         function checkFunctionOrMethodDeclaration(node) {
@@ -25717,7 +27375,7 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name && node.name.kind === 137 /* ComputedPropertyName */) {
+            if (node.name && node.name.kind === 139 /* ComputedPropertyName */) {
                 // This check will account for methods in class/interface declarations,
                 // as well as accessors in classes/object literals
                 checkComputedPropertyName(node.name);
@@ -25768,7 +27426,7 @@ var ts;
         }
         function checkBlock(node) {
             // Grammar checking for SyntaxKind.Block
-            if (node.kind === 195 /* Block */) {
+            if (node.kind === 198 /* Block */) {
                 checkGrammarStatementInAmbientContext(node);
             }
             ts.forEach(node.statements, checkSourceElement);
@@ -25788,12 +27446,12 @@ var ts;
             if (!(identifier && identifier.text === name)) {
                 return false;
             }
-            if (node.kind === 142 /* PropertyDeclaration */ ||
-                node.kind === 141 /* PropertySignature */ ||
-                node.kind === 144 /* MethodDeclaration */ ||
-                node.kind === 143 /* MethodSignature */ ||
-                node.kind === 146 /* GetAccessor */ ||
-                node.kind === 147 /* SetAccessor */) {
+            if (node.kind === 144 /* PropertyDeclaration */ ||
+                node.kind === 143 /* PropertySignature */ ||
+                node.kind === 146 /* MethodDeclaration */ ||
+                node.kind === 145 /* MethodSignature */ ||
+                node.kind === 148 /* GetAccessor */ ||
+                node.kind === 149 /* SetAccessor */) {
                 // it is ok to have member named '_super' or '_this' - member access is always qualified
                 return false;
             }
@@ -25802,7 +27460,7 @@ var ts;
                 return false;
             }
             var root = ts.getRootDeclaration(node);
-            if (root.kind === 139 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
+            if (root.kind === 141 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
                 // just an overload - no codegen impact
                 return false;
             }
@@ -25855,16 +27513,31 @@ var ts;
                 return;
             }
             // Uninstantiated modules shouldnt do this check
-            if (node.kind === 221 /* ModuleDeclaration */ && ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
+            if (node.kind === 224 /* ModuleDeclaration */ && ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
                 return;
             }
             // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 251 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
+            if (parent.kind === 255 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
                 // If the declaration happens to be in external module, report error that require and exports are reserved keywords
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
         }
+        function checkCollisionWithGlobalPromiseInGeneratedCode(node, name) {
+            if (!needCollisionCheckForIdentifier(node, name, "Promise")) {
+                return;
+            }
+            // Uninstantiated modules shouldnt do this check
+            if (node.kind === 224 /* ModuleDeclaration */ && ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
+                return;
+            }
+            // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
+            var parent = getDeclarationContainer(node);
+            if (parent.kind === 255 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 2097152 /* HasAsyncFunctions */) {
+                // If the declaration happens to be in external module, report error that Promise is a reserved identifier.
+                error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_functions, ts.declarationNameToString(name), ts.declarationNameToString(name));
+            }
+        }
         function checkVarDeclaredNamesNotShadowed(node) {
             // - ScriptBody : StatementList
             // It is a Syntax Error if any element of the LexicallyDeclaredNames of StatementList
@@ -25889,13 +27562,13 @@ var ts;
             //          const x = 0; // symbol for this declaration will be 'symbol'
             //      }
             // skip block-scoped variables and parameters
-            if ((ts.getCombinedNodeFlags(node) & 24576 /* BlockScoped */) !== 0 || ts.isParameterDeclaration(node)) {
+            if ((ts.getCombinedNodeFlags(node) & 3072 /* BlockScoped */) !== 0 || ts.isParameterDeclaration(node)) {
                 return;
             }
             // skip variable declarations that don't have initializers
             // NOTE: in ES6 spec initializer is required in variable declarations where name is binding pattern
             // so we'll always treat binding elements as initialized
-            if (node.kind === 214 /* VariableDeclaration */ && !node.initializer) {
+            if (node.kind === 217 /* VariableDeclaration */ && !node.initializer) {
                 return;
             }
             var symbol = getSymbolOfNode(node);
@@ -25904,18 +27577,18 @@ var ts;
                 if (localDeclarationSymbol &&
                     localDeclarationSymbol !== symbol &&
                     localDeclarationSymbol.flags & 2 /* BlockScopedVariable */) {
-                    if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 24576 /* BlockScoped */) {
-                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 215 /* VariableDeclarationList */);
-                        var container = varDeclList.parent.kind === 196 /* VariableStatement */ && varDeclList.parent.parent
+                    if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 3072 /* BlockScoped */) {
+                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 218 /* VariableDeclarationList */);
+                        var container = varDeclList.parent.kind === 199 /* VariableStatement */ && varDeclList.parent.parent
                             ? varDeclList.parent.parent
                             : undefined;
                         // names of block-scoped and function scoped variables can collide only
                         // if block scoped variable is defined in the function\module\source file scope (because of variable hoisting)
                         var namesShareScope = container &&
-                            (container.kind === 195 /* Block */ && ts.isFunctionLike(container.parent) ||
-                                container.kind === 222 /* ModuleBlock */ ||
-                                container.kind === 221 /* ModuleDeclaration */ ||
-                                container.kind === 251 /* SourceFile */);
+                            (container.kind === 198 /* Block */ && ts.isFunctionLike(container.parent) ||
+                                container.kind === 225 /* ModuleBlock */ ||
+                                container.kind === 224 /* ModuleDeclaration */ ||
+                                container.kind === 255 /* SourceFile */);
                         // here we know that function scoped variable is shadowed by block scoped one
                         // if they are defined in the same scope - binder has already reported redeclaration error
                         // otherwise if variable has an initializer - show error that initialization will fail
@@ -25930,7 +27603,7 @@ var ts;
         }
         // Check that a parameter initializer contains no references to parameters declared to the right of itself
         function checkParameterInitializer(node) {
-            if (ts.getRootDeclaration(node).kind !== 139 /* Parameter */) {
+            if (ts.getRootDeclaration(node).kind !== 141 /* Parameter */) {
                 return;
             }
             var func = ts.getContainingFunction(node);
@@ -25941,7 +27614,7 @@ var ts;
                     // check FunctionLikeDeclaration.locals (stores parameters\function local variable)
                     // if it contains entry with a specified name and if this entry matches the resolved symbol
                     if (referencedSymbol && referencedSymbol !== unknownSymbol && getSymbol(func.locals, referencedSymbol.name, 107455 /* Value */) === referencedSymbol) {
-                        if (referencedSymbol.valueDeclaration.kind === 139 /* Parameter */) {
+                        if (referencedSymbol.valueDeclaration.kind === 141 /* Parameter */) {
                             if (referencedSymbol.valueDeclaration === node) {
                                 error(n, ts.Diagnostics.Parameter_0_cannot_be_referenced_in_its_initializer, ts.declarationNameToString(node.name));
                                 return;
@@ -25967,31 +27640,39 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name.kind === 137 /* ComputedPropertyName */) {
+            if (node.name.kind === 139 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
                 if (node.initializer) {
                     checkExpressionCached(node.initializer);
                 }
             }
-            if (node.kind === 166 /* BindingElement */) {
+            if (node.kind === 168 /* BindingElement */) {
                 // check computed properties inside property names of binding elements
-                if (node.propertyName && node.propertyName.kind === 137 /* ComputedPropertyName */) {
+                if (node.propertyName && node.propertyName.kind === 139 /* ComputedPropertyName */) {
                     checkComputedPropertyName(node.propertyName);
                 }
+                // check private/protected variable access
+                var parent_9 = node.parent.parent;
+                var parentType = getTypeForBindingElementParent(parent_9);
+                var name_17 = node.propertyName || node.name;
+                var property = getPropertyOfType(parentType, getTextOfPropertyName(name_17));
+                if (parent_9.initializer && property && getParentOfSymbol(property)) {
+                    checkClassPropertyAccess(parent_9, parent_9.initializer, parentType, property);
+                }
             }
             // For a binding pattern, check contained binding elements
             if (ts.isBindingPattern(node.name)) {
                 ts.forEach(node.name.elements, checkSourceElement);
             }
             // For a parameter declaration with an initializer, error and exit if the containing function doesn't have a body
-            if (node.initializer && ts.getRootDeclaration(node).kind === 139 /* Parameter */ && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
+            if (node.initializer && ts.getRootDeclaration(node).kind === 141 /* Parameter */ && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
                 error(node, ts.Diagnostics.A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation);
                 return;
             }
             // For a binding pattern, validate the initializer and exit
             if (ts.isBindingPattern(node.name)) {
                 // Don't validate for-in initializer as it is already an error
-                if (node.initializer && node.parent.parent.kind !== 203 /* ForInStatement */) {
+                if (node.initializer && node.parent.parent.kind !== 206 /* ForInStatement */) {
                     checkTypeAssignableTo(checkExpressionCached(node.initializer), getWidenedTypeForVariableLikeDeclaration(node), node, /*headMessage*/ undefined);
                     checkParameterInitializer(node);
                 }
@@ -26002,7 +27683,7 @@ var ts;
             if (node === symbol.valueDeclaration) {
                 // Node is the primary declaration of the symbol, just validate the initializer
                 // Don't validate for-in initializer as it is already an error
-                if (node.initializer && node.parent.parent.kind !== 203 /* ForInStatement */) {
+                if (node.initializer && node.parent.parent.kind !== 206 /* ForInStatement */) {
                     checkTypeAssignableTo(checkExpressionCached(node.initializer), type, node, /*headMessage*/ undefined);
                     checkParameterInitializer(node);
                 }
@@ -26018,15 +27699,16 @@ var ts;
                     checkTypeAssignableTo(checkExpressionCached(node.initializer), declarationType, node, /*headMessage*/ undefined);
                 }
             }
-            if (node.kind !== 142 /* PropertyDeclaration */ && node.kind !== 141 /* PropertySignature */) {
+            if (node.kind !== 144 /* PropertyDeclaration */ && node.kind !== 143 /* PropertySignature */) {
                 // We know we don't have a binding pattern or computed name here
                 checkExportsOnMergedDeclarations(node);
-                if (node.kind === 214 /* VariableDeclaration */ || node.kind === 166 /* BindingElement */) {
+                if (node.kind === 217 /* VariableDeclaration */ || node.kind === 168 /* BindingElement */) {
                     checkVarDeclaredNamesNotShadowed(node);
                 }
                 checkCollisionWithCapturedSuperVariable(node, node.name);
                 checkCollisionWithCapturedThisVariable(node, node.name);
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+                checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             }
         }
         function checkVariableDeclaration(node) {
@@ -26044,7 +27726,7 @@ var ts;
         }
         function checkGrammarDisallowedModifiersOnObjectLiteralExpressionMethod(node) {
             // We only disallow modifier on a method declaration if it is a property of object-literal-expression
-            if (node.modifiers && node.parent.kind === 168 /* ObjectLiteralExpression */) {
+            if (node.modifiers && node.parent.kind === 170 /* ObjectLiteralExpression */) {
                 if (ts.isAsyncFunctionLike(node)) {
                     if (node.modifiers.length > 1) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
@@ -26065,7 +27747,7 @@ var ts;
             checkGrammarStatementInAmbientContext(node);
             checkExpression(node.expression);
             checkSourceElement(node.thenStatement);
-            if (node.thenStatement.kind === 197 /* EmptyStatement */) {
+            if (node.thenStatement.kind === 200 /* EmptyStatement */) {
                 error(node.thenStatement, ts.Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement);
             }
             checkSourceElement(node.elseStatement);
@@ -26085,12 +27767,12 @@ var ts;
         function checkForStatement(node) {
             // Grammar checking
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.initializer && node.initializer.kind === 215 /* VariableDeclarationList */) {
+                if (node.initializer && node.initializer.kind === 218 /* VariableDeclarationList */) {
                     checkGrammarVariableDeclarationList(node.initializer);
                 }
             }
             if (node.initializer) {
-                if (node.initializer.kind === 215 /* VariableDeclarationList */) {
+                if (node.initializer.kind === 218 /* VariableDeclarationList */) {
                     ts.forEach(node.initializer.declarations, checkVariableDeclaration);
                 }
                 else {
@@ -26110,14 +27792,14 @@ var ts;
             // via checkRightHandSideOfForOf.
             // If the LHS is an expression, check the LHS, as a destructuring assignment or as a reference.
             // Then check that the RHS is assignable to it.
-            if (node.initializer.kind === 215 /* VariableDeclarationList */) {
+            if (node.initializer.kind === 218 /* VariableDeclarationList */) {
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
                 var varExpr = node.initializer;
                 var iteratedType = checkRightHandSideOfForOf(node.expression);
                 // There may be a destructuring assignment on the left side
-                if (varExpr.kind === 167 /* ArrayLiteralExpression */ || varExpr.kind === 168 /* ObjectLiteralExpression */) {
+                if (varExpr.kind === 169 /* ArrayLiteralExpression */ || varExpr.kind === 170 /* ObjectLiteralExpression */) {
                     // iteratedType may be undefined. In this case, we still want to check the structure of
                     // varExpr, in particular making sure it's a valid LeftHandSideExpression. But we'd like
                     // to short circuit the type relation checking as much as possible, so we pass the unknownType.
@@ -26126,7 +27808,7 @@ var ts;
                 else {
                     var leftType = checkExpression(varExpr);
                     checkReferenceExpression(varExpr, /*invalidReferenceMessage*/ ts.Diagnostics.Invalid_left_hand_side_in_for_of_statement, 
-                    /*constantVariableMessage*/ ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant);
+                    /*constantVariableMessage*/ ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property);
                     // iteratedType will be undefined if the rightType was missing properties/signatures
                     // required to get its iteratedType (like [Symbol.iterator] or next). This may be
                     // because we accessed properties from anyType, or it may have led to an error inside
@@ -26146,7 +27828,7 @@ var ts;
             // for (let VarDecl in Expr) Statement
             //   VarDecl must be a variable declaration without a type annotation that declares a variable of type Any,
             //   and Expr must be an expression of type Any, an object type, or a type parameter type.
-            if (node.initializer.kind === 215 /* VariableDeclarationList */) {
+            if (node.initializer.kind === 218 /* VariableDeclarationList */) {
                 var variable = node.initializer.declarations[0];
                 if (variable && ts.isBindingPattern(variable.name)) {
                     error(variable.name, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
@@ -26160,7 +27842,7 @@ var ts;
                 //   and Expr must be an expression of type Any, an object type, or a type parameter type.
                 var varExpr = node.initializer;
                 var leftType = checkExpression(varExpr);
-                if (varExpr.kind === 167 /* ArrayLiteralExpression */ || varExpr.kind === 168 /* ObjectLiteralExpression */) {
+                if (varExpr.kind === 169 /* ArrayLiteralExpression */ || varExpr.kind === 170 /* ObjectLiteralExpression */) {
                     error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
                 }
                 else if (!isTypeAnyOrAllConstituentTypesHaveKind(leftType, 258 /* StringLike */)) {
@@ -26168,10 +27850,10 @@ var ts;
                 }
                 else {
                     // run check only former check succeeded to avoid cascading errors
-                    checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_in_statement, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant);
+                    checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_in_statement, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property);
                 }
             }
-            var rightType = checkExpression(node.expression);
+            var rightType = checkNonNullExpression(node.expression);
             // unknownType is returned i.e. if node.expression is identifier whose name cannot be resolved
             // in this case error about missing name is already reported - do not report extra one
             if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 80896 /* ObjectType */ | 512 /* TypeParameter */)) {
@@ -26188,7 +27870,7 @@ var ts;
             }
         }
         function checkRightHandSideOfForOf(rhsExpression) {
-            var expressionType = getTypeOfExpression(rhsExpression);
+            var expressionType = checkNonNullExpression(rhsExpression);
             return checkIteratedTypeOrElementType(expressionType, rhsExpression, /*allowStringInput*/ true);
         }
         function checkIteratedTypeOrElementType(inputType, errorNode, allowStringInput) {
@@ -26251,7 +27933,7 @@ var ts;
             if (!typeAsIterable.iterableElementType) {
                 // As an optimization, if the type is instantiated directly using the globalIterableType (Iterable<number>),
                 // then just grab its type argument.
-                if ((type.flags & 4096 /* Reference */) && type.target === globalIterableType) {
+                if ((type.flags & 4096 /* Reference */) && type.target === getGlobalIterableType()) {
                     typeAsIterable.iterableElementType = type.typeArguments[0];
                 }
                 else {
@@ -26292,7 +27974,7 @@ var ts;
             if (!typeAsIterator.iteratorElementType) {
                 // As an optimization, if the type is instantiated directly using the globalIteratorType (Iterator<number>),
                 // then just grab its type argument.
-                if ((type.flags & 4096 /* Reference */) && type.target === globalIteratorType) {
+                if ((type.flags & 4096 /* Reference */) && type.target === getGlobalIteratorType()) {
                     typeAsIterator.iteratorElementType = type.typeArguments[0];
                 }
                 else {
@@ -26329,7 +28011,7 @@ var ts;
             }
             // As an optimization, if the type is instantiated directly using the globalIterableIteratorType (IterableIterator<number>),
             // then just grab its type argument.
-            if ((type.flags & 4096 /* Reference */) && type.target === globalIterableIteratorType) {
+            if ((type.flags & 4096 /* Reference */) && type.target === getGlobalIterableIteratorType()) {
                 return type.typeArguments[0];
             }
             return getElementTypeOfIterable(type, /*errorNode*/ undefined) ||
@@ -26339,7 +28021,7 @@ var ts;
          * This function does the following steps:
          *   1. Break up arrayOrStringType (possibly a union) into its string constituents and array constituents.
          *   2. Take the element types of the array constituents.
-         *   3. Return the union of the element types, and string if there was a string constitutent.
+         *   3. Return the union of the element types, and string if there was a string constituent.
          *
          * For example:
          *     string -> string
@@ -26404,8 +28086,12 @@ var ts;
             checkGrammarStatementInAmbientContext(node) || checkGrammarBreakOrContinueStatement(node);
             // TODO: Check that target label is valid
         }
-        function isGetAccessorWithAnnotatatedSetAccessor(node) {
-            return !!(node.kind === 146 /* GetAccessor */ && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(node.symbol, 147 /* SetAccessor */)));
+        function isGetAccessorWithAnnotatedSetAccessor(node) {
+            return !!(node.kind === 148 /* GetAccessor */ && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(node.symbol, 149 /* SetAccessor */)));
+        }
+        function isUnwrappedReturnTypeVoidOrAny(func, returnType) {
+            var unwrappedReturnType = ts.isAsyncFunctionLike(func) ? getPromisedType(returnType) : returnType;
+            return maybeTypeOfKind(unwrappedReturnType, 16 /* Void */ | 1 /* Any */);
         }
         function checkReturnStatement(node) {
             // Grammar checking
@@ -26415,12 +28101,12 @@ var ts;
                     grammarErrorOnFirstToken(node, ts.Diagnostics.A_return_statement_can_only_be_used_within_a_function_body);
                 }
             }
-            if (node.expression) {
-                var func = ts.getContainingFunction(node);
-                if (func) {
-                    var signature = getSignatureFromDeclaration(func);
-                    var returnType = getReturnTypeOfSignature(signature);
-                    var exprType = checkExpressionCached(node.expression);
+            var func = ts.getContainingFunction(node);
+            if (func) {
+                var signature = getSignatureFromDeclaration(func);
+                var returnType = getReturnTypeOfSignature(signature);
+                if (strictNullChecks || node.expression) {
+                    var exprType = node.expression ? checkExpressionCached(node.expression) : undefinedType;
                     if (func.asteriskToken) {
                         // A generator does not need its return expressions checked against its return type.
                         // Instead, the yield expressions are checked against the element type.
@@ -26428,36 +28114,42 @@ var ts;
                         // for generators.
                         return;
                     }
-                    if (func.kind === 147 /* SetAccessor */) {
-                        error(node.expression, ts.Diagnostics.Setters_cannot_return_a_value);
+                    if (func.kind === 149 /* SetAccessor */) {
+                        if (node.expression) {
+                            error(node.expression, ts.Diagnostics.Setters_cannot_return_a_value);
+                        }
                     }
-                    else if (func.kind === 145 /* Constructor */) {
-                        if (!checkTypeAssignableTo(exprType, returnType, node.expression)) {
+                    else if (func.kind === 147 /* Constructor */) {
+                        if (node.expression && !checkTypeAssignableTo(exprType, returnType, node.expression)) {
                             error(node.expression, ts.Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
                         }
                     }
-                    else if (func.type || isGetAccessorWithAnnotatatedSetAccessor(func) || returnType.flags & 134217728 /* PredicateType */) {
+                    else if (func.type || isGetAccessorWithAnnotatedSetAccessor(func)) {
                         if (ts.isAsyncFunctionLike(func)) {
                             var promisedType = getPromisedType(returnType);
-                            var awaitedType = checkAwaitedType(exprType, node.expression, ts.Diagnostics.Return_expression_in_async_function_does_not_have_a_valid_callable_then_member);
+                            var awaitedType = checkAwaitedType(exprType, node.expression || node, ts.Diagnostics.Return_expression_in_async_function_does_not_have_a_valid_callable_then_member);
                             if (promisedType) {
                                 // If the function has a return type, but promisedType is
                                 // undefined, an error will be reported in checkAsyncFunctionReturnType
                                 // so we don't need to report one here.
-                                checkTypeAssignableTo(awaitedType, promisedType, node.expression);
+                                checkTypeAssignableTo(awaitedType, promisedType, node.expression || node);
                             }
                         }
                         else {
-                            checkTypeAssignableTo(exprType, returnType, node.expression);
+                            checkTypeAssignableTo(exprType, returnType, node.expression || node);
                         }
                     }
                 }
+                else if (func.kind !== 147 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType)) {
+                    // The function has a return type, but the return statement doesn't have an expression.
+                    error(node, ts.Diagnostics.Not_all_code_paths_return_a_value);
+                }
             }
         }
         function checkWithStatement(node) {
             // Grammar checking for withStatement
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.parserContextFlags & 8 /* Await */) {
+                if (node.flags & 33554432 /* AwaitContext */) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_an_async_function_block);
                 }
             }
@@ -26470,10 +28162,9 @@ var ts;
             var firstDefaultClause;
             var hasDuplicateDefaultClause = false;
             var expressionType = checkExpression(node.expression);
-            var expressionTypeIsStringLike = someConstituentTypeHasKind(expressionType, 258 /* StringLike */);
             ts.forEach(node.caseBlock.clauses, function (clause) {
                 // Grammar check for duplicate default clauses, skip if we already report duplicate default clause
-                if (clause.kind === 245 /* DefaultClause */ && !hasDuplicateDefaultClause) {
+                if (clause.kind === 249 /* DefaultClause */ && !hasDuplicateDefaultClause) {
                     if (firstDefaultClause === undefined) {
                         firstDefaultClause = clause;
                     }
@@ -26485,18 +28176,15 @@ var ts;
                         hasDuplicateDefaultClause = true;
                     }
                 }
-                if (produceDiagnostics && clause.kind === 244 /* CaseClause */) {
+                if (produceDiagnostics && clause.kind === 248 /* CaseClause */) {
                     var caseClause = clause;
-                    // TypeScript 1.0 spec (April 2014):5.9
-                    // In a 'switch' statement, each 'case' expression must be of a type that is assignable to or from the type of the 'switch' expression.
+                    // TypeScript 1.0 spec (April 2014): 5.9
+                    // In a 'switch' statement, each 'case' expression must be of a type that is comparable
+                    // to or from the type of the 'switch' expression.
                     var caseType = checkExpression(caseClause.expression);
-                    var expressionTypeIsAssignableToCaseType = 
-                    // Permit 'number[] | "foo"' to be asserted to 'string'.
-                    (expressionTypeIsStringLike && someConstituentTypeHasKind(caseType, 258 /* StringLike */)) ||
-                        isTypeAssignableTo(expressionType, caseType);
-                    if (!expressionTypeIsAssignableToCaseType) {
-                        // 'expressionType is not assignable to caseType', try the reversed check and report errors if it fails
-                        checkTypeAssignableTo(caseType, expressionType, caseClause.expression, /*headMessage*/ undefined);
+                    if (!isTypeComparableTo(expressionType, caseType)) {
+                        // expressionType is not comparable to caseType, try the reversed check and report errors if it fails
+                        checkTypeComparableTo(caseType, expressionType, caseClause.expression, /*headMessage*/ undefined);
                     }
                 }
                 ts.forEach(clause.statements, checkSourceElement);
@@ -26510,7 +28198,7 @@ var ts;
                     if (ts.isFunctionLike(current)) {
                         break;
                     }
-                    if (current.kind === 210 /* LabeledStatement */ && current.label.text === node.label.text) {
+                    if (current.kind === 213 /* LabeledStatement */ && current.label.text === node.label.text) {
                         var sourceFile = ts.getSourceFileOfNode(node);
                         grammarErrorOnNode(node.label, ts.Diagnostics.Duplicate_label_0, ts.getTextOfNodeFromSourceText(sourceFile.text, node.label));
                         break;
@@ -26584,7 +28272,7 @@ var 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 & 64 /* Static */) && ts.hasDynamicName(member)) {
+                        if (!(member.flags & 32 /* Static */) && ts.hasDynamicName(member)) {
                             var propType = getTypeOfSymbol(member.symbol);
                             checkIndexConstraintForProperty(member.symbol, propType, type, declaredStringIndexer, stringIndexType, 0 /* String */);
                             checkIndexConstraintForProperty(member.symbol, propType, type, declaredNumberIndexer, numberIndexType, 1 /* Number */);
@@ -26615,7 +28303,7 @@ var ts;
                 // perform property check if property or indexer is declared in 'type'
                 // this allows to rule out cases when both property and indexer are inherited from the base class
                 var errorNode;
-                if (prop.valueDeclaration.name.kind === 137 /* ComputedPropertyName */ || prop.parent === containingType.symbol) {
+                if (prop.valueDeclaration.name.kind === 139 /* ComputedPropertyName */ || prop.parent === containingType.symbol) {
                     errorNode = prop.valueDeclaration;
                 }
                 else if (indexDeclaration) {
@@ -26649,7 +28337,7 @@ var ts;
                     error(name, message, name.text);
             }
         }
-        // Check each type parameter and check that list has no duplicate type parameter declarations
+        /** Check each type parameter and check that type parameters have no duplicate type parameter declarations */
         function checkTypeParameters(typeParameterDeclarations) {
             if (typeParameterDeclarations) {
                 for (var i = 0, n = typeParameterDeclarations.length; i < n; i++) {
@@ -26665,6 +28353,24 @@ var ts;
                 }
             }
         }
+        /** Check that type parameter lists are identical across multiple declarations */
+        function checkTypeParameterListsIdentical(node, symbol) {
+            if (symbol.declarations.length === 1) {
+                return;
+            }
+            var firstDecl;
+            for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                var declaration = _a[_i];
+                if (declaration.kind === 220 /* ClassDeclaration */ || declaration.kind === 221 /* InterfaceDeclaration */) {
+                    if (!firstDecl) {
+                        firstDecl = declaration;
+                    }
+                    else if (!areTypeParametersIdentical(firstDecl.typeParameters, node.typeParameters)) {
+                        error(node.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_type_parameters, node.name.text);
+                    }
+                }
+            }
+        }
         function checkClassExpression(node) {
             checkClassLikeDeclaration(node);
             checkNodeDeferred(node);
@@ -26687,6 +28393,7 @@ var ts;
                 checkTypeNameIsReserved(node.name, ts.Diagnostics.Class_name_cannot_be_0);
                 checkCollisionWithCapturedThisVariable(node, node.name);
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+                checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             }
             checkTypeParameters(node.typeParameters);
             checkExportsOnMergedDeclarations(node);
@@ -26694,12 +28401,14 @@ var ts;
             var type = getDeclaredTypeOfSymbol(symbol);
             var typeWithThis = getTypeWithThisArgument(type);
             var staticType = getTypeOfSymbol(symbol);
+            checkTypeParameterListsIdentical(node, symbol);
             var baseTypeNode = ts.getClassExtendsHeritageClauseElement(node);
             if (baseTypeNode) {
                 var baseTypes = getBaseTypes(type);
                 if (baseTypes.length && produceDiagnostics) {
-                    var baseType = baseTypes[0];
+                    var baseType_1 = baseTypes[0];
                     var staticBaseType = getBaseConstructorTypeOfClass(type);
+                    checkBaseTypeAccessibility(staticBaseType, baseTypeNode);
                     checkSourceElement(baseTypeNode.expression);
                     if (baseTypeNode.typeArguments) {
                         ts.forEach(baseTypeNode.typeArguments, checkSourceElement);
@@ -26710,7 +28419,7 @@ var ts;
                             }
                         }
                     }
-                    checkTypeAssignableTo(typeWithThis, getTypeWithThisArgument(baseType, type.thisType), node.name || node, ts.Diagnostics.Class_0_incorrectly_extends_base_class_1);
+                    checkTypeAssignableTo(typeWithThis, getTypeWithThisArgument(baseType_1, type.thisType), node.name || node, ts.Diagnostics.Class_0_incorrectly_extends_base_class_1);
                     checkTypeAssignableTo(staticType, getTypeWithoutSignatures(staticBaseType), node.name || node, ts.Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1);
                     if (!(staticBaseType.symbol && staticBaseType.symbol.flags & 32 /* Class */)) {
                         // When the static base type is a "class-like" constructor function (but not actually a class), we verify
@@ -26718,11 +28427,11 @@ var ts;
                         // references (as opposed to checking the structure of the types) because elsewhere we have already checked
                         // that the base type is a class or interface type (and not, for example, an anonymous object type).
                         var constructors = getInstantiatedConstructorsForTypeArguments(staticBaseType, baseTypeNode.typeArguments);
-                        if (ts.forEach(constructors, function (sig) { return getReturnTypeOfSignature(sig) !== baseType; })) {
+                        if (ts.forEach(constructors, function (sig) { return getReturnTypeOfSignature(sig) !== baseType_1; })) {
                             error(baseTypeNode.expression, ts.Diagnostics.Base_constructors_must_all_have_the_same_return_type);
                         }
                     }
-                    checkKindsOfPropertyMemberOverrides(type, baseType);
+                    checkKindsOfPropertyMemberOverrides(type, baseType_1);
                 }
             }
             var implementedTypeNodes = ts.getClassImplementsHeritageClauseElements(node);
@@ -26752,6 +28461,18 @@ var ts;
                 checkTypeForDuplicateIndexSignatures(node);
             }
         }
+        function checkBaseTypeAccessibility(type, node) {
+            var signatures = getSignaturesOfType(type, 1 /* Construct */);
+            if (signatures.length) {
+                var declaration = signatures[0].declaration;
+                if (declaration && declaration.flags & 8 /* Private */) {
+                    var typeClassDeclaration = getClassLikeDeclarationOfSymbol(type.symbol);
+                    if (!isNodeWithinClass(node, typeClassDeclaration)) {
+                        error(node, ts.Diagnostics.Cannot_extend_a_class_0_Class_constructor_is_marked_as_private, node.expression.text);
+                    }
+                }
+            }
+        }
         function getTargetSymbol(s) {
             // if symbol is instantiated its flags are not copied from the 'target'
             // so we'll need to get back original 'target' symbol to work with correct set of flags
@@ -26786,7 +28507,7 @@ var ts;
                 var baseDeclarationFlags = getDeclarationFlagsFromSymbol(base);
                 ts.Debug.assert(!!derived, "derived should point to something, even if it is the base class' declaration.");
                 if (derived) {
-                    // In order to resolve whether the inherited method was overriden in the base class or not,
+                    // In order to resolve whether the inherited method was overridden in the base class or not,
                     // we compare the Symbols obtained. Since getTargetSymbol returns the symbol on the *uninstantiated*
                     // type declaration, derived and base resolve to the same symbol even in the case of generic classes.
                     if (derived === base) {
@@ -26796,7 +28517,7 @@ var ts;
                         // 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 & 128 /* Abstract */ && (!derivedClassDecl || !(derivedClassDecl.flags & 128 /* Abstract */))) {
-                            if (derivedClassDecl.kind === 189 /* ClassExpression */) {
+                            if (derivedClassDecl.kind === 191 /* ClassExpression */) {
                                 error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, symbolToString(baseProperty), typeToString(baseType));
                             }
                             else {
@@ -26807,11 +28528,11 @@ var ts;
                     else {
                         // derived overrides base.
                         var derivedDeclarationFlags = getDeclarationFlagsFromSymbol(derived);
-                        if ((baseDeclarationFlags & 16 /* Private */) || (derivedDeclarationFlags & 16 /* Private */)) {
+                        if ((baseDeclarationFlags & 8 /* Private */) || (derivedDeclarationFlags & 8 /* Private */)) {
                             // either base or derived property is private - not override, skip it
                             continue;
                         }
-                        if ((baseDeclarationFlags & 64 /* Static */) !== (derivedDeclarationFlags & 64 /* Static */)) {
+                        if ((baseDeclarationFlags & 32 /* Static */) !== (derivedDeclarationFlags & 32 /* Static */)) {
                             // value of 'static' is not the same for properties - not override, skip it
                             continue;
                         }
@@ -26844,7 +28565,7 @@ var ts;
             }
         }
         function isAccessor(kind) {
-            return kind === 146 /* GetAccessor */ || kind === 147 /* SetAccessor */;
+            return kind === 148 /* GetAccessor */ || kind === 149 /* SetAccessor */;
         }
         function areTypeParametersIdentical(list1, list2) {
             if (!list1 && !list2) {
@@ -26914,13 +28635,9 @@ var ts;
                 checkTypeNameIsReserved(node.name, ts.Diagnostics.Interface_name_cannot_be_0);
                 checkExportsOnMergedDeclarations(node);
                 var symbol = getSymbolOfNode(node);
-                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 218 /* InterfaceDeclaration */);
-                if (symbol.declarations.length > 1) {
-                    if (node !== firstInterfaceDecl && !areTypeParametersIdentical(firstInterfaceDecl.typeParameters, node.typeParameters)) {
-                        error(node.name, ts.Diagnostics.All_declarations_of_an_interface_must_have_identical_type_parameters);
-                    }
-                }
+                checkTypeParameterListsIdentical(node, symbol);
                 // Only check this symbol once
+                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 221 /* InterfaceDeclaration */);
                 if (node === firstInterfaceDecl) {
                     var type = getDeclaredTypeOfSymbol(symbol);
                     var typeWithThis = getTypeWithThisArgument(type);
@@ -26953,7 +28670,7 @@ var ts;
         }
         function computeEnumMemberValues(node) {
             var nodeLinks = getNodeLinks(node);
-            if (!(nodeLinks.flags & 8192 /* EnumValuesComputed */)) {
+            if (!(nodeLinks.flags & 16384 /* EnumValuesComputed */)) {
                 var enumSymbol = getSymbolOfNode(node);
                 var enumType = getDeclaredTypeOfSymbol(enumSymbol);
                 var autoValue = 0; // set to undefined when enum member is non-constant
@@ -26992,7 +28709,7 @@ var ts;
                         autoValue++;
                     }
                 }
-                nodeLinks.flags |= 8192 /* EnumValuesComputed */;
+                nodeLinks.flags |= 16384 /* EnumValuesComputed */;
             }
             function computeConstantValueForEnumMemberInitializer(initializer, enumType, enumIsConst, ambient) {
                 // Controls if error should be reported after evaluation of constant value is completed
@@ -27024,7 +28741,7 @@ var ts;
                 return value;
                 function evalConstant(e) {
                     switch (e.kind) {
-                        case 182 /* PrefixUnaryExpression */:
+                        case 184 /* PrefixUnaryExpression */:
                             var value_1 = evalConstant(e.operand);
                             if (value_1 === undefined) {
                                 return undefined;
@@ -27035,7 +28752,7 @@ var ts;
                                 case 50 /* TildeToken */: return ~value_1;
                             }
                             return undefined;
-                        case 184 /* BinaryExpression */:
+                        case 186 /* BinaryExpression */:
                             var left = evalConstant(e.left);
                             if (left === undefined) {
                                 return undefined;
@@ -27060,15 +28777,15 @@ var ts;
                             return undefined;
                         case 8 /* NumericLiteral */:
                             return +e.text;
-                        case 175 /* ParenthesizedExpression */:
+                        case 177 /* ParenthesizedExpression */:
                             return evalConstant(e.expression);
                         case 69 /* Identifier */:
-                        case 170 /* ElementAccessExpression */:
-                        case 169 /* PropertyAccessExpression */:
+                        case 172 /* ElementAccessExpression */:
+                        case 171 /* PropertyAccessExpression */:
                             var member = initializer.parent;
                             var currentType = getTypeOfSymbol(getSymbolOfNode(member.parent));
                             var enumType_1;
-                            var propertyName;
+                            var propertyName = void 0;
                             if (e.kind === 69 /* Identifier */) {
                                 // unqualified names can refer to member that reside in different declaration of the enum so just doing name resolution won't work.
                                 // instead pick current enum type and later try to fetch member from the type
@@ -27076,8 +28793,8 @@ var ts;
                                 propertyName = e.text;
                             }
                             else {
-                                var expression;
-                                if (e.kind === 170 /* ElementAccessExpression */) {
+                                var expression = void 0;
+                                if (e.kind === 172 /* ElementAccessExpression */) {
                                     if (e.argumentExpression === undefined ||
                                         e.argumentExpression.kind !== 9 /* StringLiteral */) {
                                         return undefined;
@@ -27095,7 +28812,7 @@ var ts;
                                     if (current.kind === 69 /* Identifier */) {
                                         break;
                                     }
-                                    else if (current.kind === 169 /* PropertyAccessExpression */) {
+                                    else if (current.kind === 171 /* PropertyAccessExpression */) {
                                         current = current.expression;
                                     }
                                     else {
@@ -27140,6 +28857,7 @@ var ts;
             checkTypeNameIsReserved(node.name, ts.Diagnostics.Enum_name_cannot_be_0);
             checkCollisionWithCapturedThisVariable(node, node.name);
             checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+            checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             checkExportsOnMergedDeclarations(node);
             computeEnumMemberValues(node);
             var enumIsConst = ts.isConst(node);
@@ -27163,10 +28881,10 @@ var ts;
                         }
                     });
                 }
-                var seenEnumMissingInitialInitializer = false;
+                var seenEnumMissingInitialInitializer_1 = false;
                 ts.forEach(enumSymbol.declarations, function (declaration) {
                     // return true if we hit a violation of the rule, false otherwise
-                    if (declaration.kind !== 220 /* EnumDeclaration */) {
+                    if (declaration.kind !== 223 /* EnumDeclaration */) {
                         return false;
                     }
                     var enumDeclaration = declaration;
@@ -27175,11 +28893,11 @@ var ts;
                     }
                     var firstEnumMember = enumDeclaration.members[0];
                     if (!firstEnumMember.initializer) {
-                        if (seenEnumMissingInitialInitializer) {
+                        if (seenEnumMissingInitialInitializer_1) {
                             error(firstEnumMember.name, ts.Diagnostics.In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element);
                         }
                         else {
-                            seenEnumMissingInitialInitializer = true;
+                            seenEnumMissingInitialInitializer_1 = true;
                         }
                     }
                 });
@@ -27189,8 +28907,8 @@ var ts;
             var declarations = symbol.declarations;
             for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
                 var declaration = declarations_5[_i];
-                if ((declaration.kind === 217 /* ClassDeclaration */ ||
-                    (declaration.kind === 216 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
+                if ((declaration.kind === 220 /* ClassDeclaration */ ||
+                    (declaration.kind === 219 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
                     !ts.isInAmbientContext(declaration)) {
                     return declaration;
                 }
@@ -27233,6 +28951,7 @@ var ts;
                 }
                 checkCollisionWithCapturedThisVariable(node, node.name);
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+                checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
                 checkExportsOnMergedDeclarations(node);
                 var symbol = getSymbolOfNode(node);
                 // The following checks only apply on a non-ambient instantiated module declaration.
@@ -27251,7 +28970,7 @@ var ts;
                     }
                     // if the module merges with a class declaration in the same lexical scope,
                     // we need to track this to ensure the correct emit.
-                    var mergedClass = ts.getDeclarationOfKind(symbol, 217 /* ClassDeclaration */);
+                    var mergedClass = ts.getDeclarationOfKind(symbol, 220 /* ClassDeclaration */);
                     if (mergedClass &&
                         inSameLexicalScope(node, mergedClass)) {
                         getNodeLinks(node).flags |= 32768 /* LexicalModuleMergesWithClass */;
@@ -27260,10 +28979,10 @@ var ts;
                 if (isAmbientExternalModule) {
                     if (ts.isExternalModuleAugmentation(node)) {
                         // body of the augmentation should be checked for consistency only if augmentation was applied to its target (either global scope or module)
-                        // otherwise we'll be swamped in cascading errors. 
+                        // otherwise we'll be swamped in cascading errors.
                         // We can detect if augmentation was applied using following rules:
                         // - augmentation for a global scope is always applied
-                        // - augmentation for some external module is applied if symbol for augmentation is merged (it was combined with target module). 
+                        // - augmentation for some external module is applied if symbol for augmentation is merged (it was combined with target module).
                         var checkBody = isGlobalAugmentation || (getSymbolOfNode(node).flags & 33554432 /* Merged */);
                         if (checkBody) {
                             // body of ambient external module is always a module block
@@ -27297,31 +29016,31 @@ var ts;
         }
         function checkModuleAugmentationElement(node, isGlobalAugmentation) {
             switch (node.kind) {
-                case 196 /* VariableStatement */:
+                case 199 /* VariableStatement */:
                     // error each individual name in variable statement instead of marking the entire variable statement
                     for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
                         checkModuleAugmentationElement(decl, isGlobalAugmentation);
                     }
                     break;
-                case 230 /* ExportAssignment */:
-                case 231 /* ExportDeclaration */:
+                case 234 /* ExportAssignment */:
+                case 235 /* ExportDeclaration */:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Exports_and_export_assignments_are_not_permitted_in_module_augmentations);
                     break;
-                case 224 /* ImportEqualsDeclaration */:
+                case 228 /* ImportEqualsDeclaration */:
                     if (node.moduleReference.kind !== 9 /* StringLiteral */) {
                         error(node.name, ts.Diagnostics.Module_augmentation_cannot_introduce_new_names_in_the_top_level_scope);
                         break;
                     }
                 // fallthrough
-                case 225 /* ImportDeclaration */:
+                case 229 /* ImportDeclaration */:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module);
                     break;
-                case 166 /* BindingElement */:
-                case 214 /* VariableDeclaration */:
-                    var name_17 = node.name;
-                    if (ts.isBindingPattern(name_17)) {
-                        for (var _b = 0, _c = name_17.elements; _b < _c.length; _b++) {
+                case 168 /* BindingElement */:
+                case 217 /* VariableDeclaration */:
+                    var name_18 = node.name;
+                    if (ts.isBindingPattern(name_18)) {
+                        for (var _b = 0, _c = name_18.elements; _b < _c.length; _b++) {
                             var el = _c[_b];
                             // mark individual names in binding pattern
                             checkModuleAugmentationElement(el, isGlobalAugmentation);
@@ -27329,12 +29048,12 @@ var ts;
                         break;
                     }
                 // fallthrough
-                case 217 /* ClassDeclaration */:
-                case 220 /* EnumDeclaration */:
-                case 216 /* FunctionDeclaration */:
-                case 218 /* InterfaceDeclaration */:
-                case 221 /* ModuleDeclaration */:
-                case 219 /* TypeAliasDeclaration */:
+                case 220 /* ClassDeclaration */:
+                case 223 /* EnumDeclaration */:
+                case 219 /* FunctionDeclaration */:
+                case 221 /* InterfaceDeclaration */:
+                case 224 /* ModuleDeclaration */:
+                case 222 /* TypeAliasDeclaration */:
                     var symbol = getSymbolOfNode(node);
                     if (symbol) {
                         // module augmentations cannot introduce new names on the top level scope of the module
@@ -27349,7 +29068,7 @@ var ts;
                             }
                             else {
                                 // symbol should not originate in augmentation
-                                reportError = ts.isExternalModuleAugmentation(symbol.parent.valueDeclaration);
+                                reportError = ts.isExternalModuleAugmentation(symbol.parent.declarations[0]);
                             }
                         }
                         if (reportError) {
@@ -27361,10 +29080,10 @@ var ts;
         }
         function getFirstIdentifier(node) {
             while (true) {
-                if (node.kind === 136 /* QualifiedName */) {
+                if (node.kind === 138 /* QualifiedName */) {
                     node = node.left;
                 }
-                else if (node.kind === 169 /* PropertyAccessExpression */) {
+                else if (node.kind === 171 /* PropertyAccessExpression */) {
                     node = node.expression;
                 }
                 else {
@@ -27380,9 +29099,9 @@ var ts;
                 error(moduleName, ts.Diagnostics.String_literal_expected);
                 return false;
             }
-            var inAmbientExternalModule = node.parent.kind === 222 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-            if (node.parent.kind !== 251 /* SourceFile */ && !inAmbientExternalModule) {
-                error(moduleName, node.kind === 231 /* ExportDeclaration */ ?
+            var inAmbientExternalModule = node.parent.kind === 225 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+            if (node.parent.kind !== 255 /* SourceFile */ && !inAmbientExternalModule) {
+                error(moduleName, node.kind === 235 /* ExportDeclaration */ ?
                     ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace :
                     ts.Diagnostics.Import_declarations_in_a_namespace_cannot_reference_a_module);
                 return false;
@@ -27405,11 +29124,17 @@ var ts;
             var symbol = getSymbolOfNode(node);
             var target = resolveAlias(symbol);
             if (target !== unknownSymbol) {
-                var excludedMeanings = (symbol.flags & 107455 /* Value */ ? 107455 /* Value */ : 0) |
+                // For external modules symbol represent local symbol for an alias. 
+                // This local symbol will merge any other local declarations (excluding other aliases)
+                // and symbol.flags will contains combined representation for all merged declaration.
+                // Based on symbol.flags we can compute a set of excluded meanings (meaning that resolved alias should not have,
+                // otherwise it will conflict with some local declaration). Note that in addition to normal flags we include matching SymbolFlags.Export* 
+                // in order to prevent collisions with declarations that were exported from the current module (they still contribute to local names). 
+                var excludedMeanings = (symbol.flags & (107455 /* Value */ | 1048576 /* ExportValue */) ? 107455 /* Value */ : 0) |
                     (symbol.flags & 793056 /* Type */ ? 793056 /* Type */ : 0) |
                     (symbol.flags & 1536 /* Namespace */ ? 1536 /* Namespace */ : 0);
                 if (target.flags & excludedMeanings) {
-                    var message = node.kind === 233 /* ExportSpecifier */ ?
+                    var message = node.kind === 237 /* ExportSpecifier */ ?
                         ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 :
                         ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0;
                     error(node, message, symbolToString(symbol));
@@ -27419,6 +29144,7 @@ var ts;
         function checkImportBinding(node) {
             checkCollisionWithCapturedThisVariable(node, node.name);
             checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+            checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             checkAliasSymbol(node);
         }
         function checkImportDeclaration(node) {
@@ -27426,7 +29152,7 @@ var 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 & 1022 /* Modifier */)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 959 /* Modifier */)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_import_declaration_cannot_have_modifiers);
             }
             if (checkExternalImportOrExportDeclaration(node)) {
@@ -27436,7 +29162,7 @@ var ts;
                         checkImportBinding(importClause);
                     }
                     if (importClause.namedBindings) {
-                        if (importClause.namedBindings.kind === 227 /* NamespaceImport */) {
+                        if (importClause.namedBindings.kind === 231 /* NamespaceImport */) {
                             checkImportBinding(importClause.namedBindings);
                         }
                         else {
@@ -27454,7 +29180,7 @@ var ts;
             checkGrammarDecorators(node) || checkGrammarModifiers(node);
             if (ts.isInternalModuleImportEqualsDeclaration(node) || checkExternalImportOrExportDeclaration(node)) {
                 checkImportBinding(node);
-                if (node.flags & 2 /* Export */) {
+                if (node.flags & 1 /* Export */) {
                     markExportAsReferenced(node);
                 }
                 if (ts.isInternalModuleImportEqualsDeclaration(node)) {
@@ -27473,7 +29199,7 @@ var ts;
                     }
                 }
                 else {
-                    if (modulekind === 5 /* ES6 */ && !ts.isInAmbientContext(node)) {
+                    if (modulekind === ts.ModuleKind.ES6 && !ts.isInAmbientContext(node)) {
                         // Import equals declaration is deprecated in es6 or above
                         grammarErrorOnNode(node, ts.Diagnostics.Import_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_import_Asterisk_as_ns_from_mod_import_a_from_mod_import_d_from_mod_or_another_module_format_instead);
                     }
@@ -27485,7 +29211,7 @@ var ts;
                 // If we hit an export in an illegal context, just bail out to avoid cascading errors.
                 return;
             }
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 1022 /* Modifier */)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 959 /* Modifier */)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_declaration_cannot_have_modifiers);
             }
             if (!node.moduleSpecifier || checkExternalImportOrExportDeclaration(node)) {
@@ -27493,22 +29219,22 @@ var ts;
                     // export { x, y }
                     // export { x, y } from "foo"
                     ts.forEach(node.exportClause.elements, checkExportSpecifier);
-                    var inAmbientExternalModule = node.parent.kind === 222 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-                    if (node.parent.kind !== 251 /* SourceFile */ && !inAmbientExternalModule) {
+                    var inAmbientExternalModule = node.parent.kind === 225 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+                    if (node.parent.kind !== 255 /* SourceFile */ && !inAmbientExternalModule) {
                         error(node, ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace);
                     }
                 }
                 else {
                     // export * from "foo"
                     var moduleSymbol = resolveExternalModuleName(node, node.moduleSpecifier);
-                    if (moduleSymbol && moduleSymbol.exports["export="]) {
+                    if (moduleSymbol && hasExportAssignmentSymbol(moduleSymbol)) {
                         error(node.moduleSpecifier, ts.Diagnostics.Module_0_uses_export_and_cannot_be_used_with_export_Asterisk, symbolToString(moduleSymbol));
                     }
                 }
             }
         }
         function checkGrammarModuleElementContext(node, errorMessage) {
-            if (node.parent.kind !== 251 /* SourceFile */ && node.parent.kind !== 222 /* ModuleBlock */ && node.parent.kind !== 221 /* ModuleDeclaration */) {
+            if (node.parent.kind !== 255 /* SourceFile */ && node.parent.kind !== 225 /* ModuleBlock */ && node.parent.kind !== 224 /* ModuleDeclaration */) {
                 return grammarErrorOnFirstToken(node, errorMessage);
             }
         }
@@ -27519,7 +29245,7 @@ var ts;
                 // find immediate value referenced by exported name (SymbolFlags.Alias is set so we don't chase down aliases)
                 var symbol = resolveName(exportedName, exportedName.text, 107455 /* Value */ | 793056 /* Type */ | 1536 /* Namespace */ | 8388608 /* Alias */, 
                 /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
-                if (symbol && isGlobalSourceFile(getDeclarationContainer(symbol.declarations[0]))) {
+                if (symbol && (symbol === undefinedSymbol || isGlobalSourceFile(getDeclarationContainer(symbol.declarations[0])))) {
                     error(exportedName, ts.Diagnostics.Cannot_re_export_name_that_is_not_defined_in_the_module);
                 }
                 else {
@@ -27532,13 +29258,13 @@ var ts;
                 // If we hit an export assignment in an illegal context, just bail out to avoid cascading errors.
                 return;
             }
-            var container = node.parent.kind === 251 /* SourceFile */ ? node.parent : node.parent.parent;
-            if (container.kind === 221 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
+            var container = node.parent.kind === 255 /* SourceFile */ ? node.parent : node.parent.parent;
+            if (container.kind === 224 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
                 error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace);
                 return;
             }
             // Grammar checking
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 1022 /* Modifier */)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 959 /* Modifier */)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_assignment_cannot_have_modifiers);
             }
             if (node.expression.kind === 69 /* Identifier */) {
@@ -27549,11 +29275,11 @@ var ts;
             }
             checkExternalModuleExports(container);
             if (node.isExportEquals && !ts.isInAmbientContext(node)) {
-                if (modulekind === 5 /* ES6 */) {
+                if (modulekind === ts.ModuleKind.ES6) {
                     // export assignment is not supported in es6 modules
                     grammarErrorOnNode(node, ts.Diagnostics.Export_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_export_default_or_another_module_format_instead);
                 }
-                else if (modulekind === 4 /* System */) {
+                else if (modulekind === ts.ModuleKind.System) {
                     // system modules does not support export assignment
                     grammarErrorOnNode(node, ts.Diagnostics.Export_assignment_is_not_supported_when_module_flag_is_system);
                 }
@@ -27585,12 +29311,21 @@ var ts;
                         continue;
                     }
                     var _a = exports[id], declarations = _a.declarations, flags = _a.flags;
-                    // ECMA262: 15.2.1.1 It is a Syntax Error if the ExportedNames of ModuleItemList contains any duplicate entries. (TS Exceptions: namespaces, function overloads, enums, and interfaces)
-                    if (!(flags & (1536 /* Namespace */ | 64 /* Interface */ | 384 /* Enum */)) && (flags & 524288 /* TypeAlias */ ? declarations.length - 1 : declarations.length) > 1) {
-                        var exportedDeclarations = ts.filter(declarations, isNotOverload);
-                        if (exportedDeclarations.length > 1) {
-                            for (var _i = 0, exportedDeclarations_1 = exportedDeclarations; _i < exportedDeclarations_1.length; _i++) {
-                                var declaration = exportedDeclarations_1[_i];
+                    // ECMA262: 15.2.1.1 It is a Syntax Error if the ExportedNames of ModuleItemList contains any duplicate entries. 
+                    // (TS Exceptions: namespaces, function overloads, enums, and interfaces)
+                    if (flags & (1536 /* Namespace */ | 64 /* Interface */ | 384 /* Enum */)) {
+                        continue;
+                    }
+                    var exportedDeclarationsCount = ts.countWhere(declarations, isNotOverload);
+                    if (flags & 524288 /* TypeAlias */ && exportedDeclarationsCount <= 2) {
+                        // it is legal to merge type alias with other values
+                        // so count should be either 1 (just type alias) or 2 (type alias + merged value)
+                        continue;
+                    }
+                    if (exportedDeclarationsCount > 1) {
+                        for (var _i = 0, declarations_6 = declarations; _i < declarations_6.length; _i++) {
+                            var declaration = declarations_6[_i];
+                            if (isNotOverload(declaration)) {
                                 diagnostics.add(ts.createDiagnosticForNode(declaration, ts.Diagnostics.Cannot_redeclare_exported_variable_0, id));
                             }
                         }
@@ -27599,7 +29334,7 @@ var ts;
                 links.exportsChecked = true;
             }
             function isNotOverload(declaration) {
-                return declaration.kind !== 216 /* FunctionDeclaration */ || !!declaration.body;
+                return declaration.kind !== 219 /* FunctionDeclaration */ || !!declaration.body;
             }
         }
         function checkSourceElement(node) {
@@ -27608,121 +29343,121 @@ var ts;
             }
             var kind = node.kind;
             if (cancellationToken) {
-                // Only bother checking on a few construct kinds.  We don't want to be excessivly
+                // Only bother checking on a few construct kinds.  We don't want to be excessively
                 // hitting the cancellation token on every node we check.
                 switch (kind) {
-                    case 221 /* ModuleDeclaration */:
-                    case 217 /* ClassDeclaration */:
-                    case 218 /* InterfaceDeclaration */:
-                    case 216 /* FunctionDeclaration */:
+                    case 224 /* ModuleDeclaration */:
+                    case 220 /* ClassDeclaration */:
+                    case 221 /* InterfaceDeclaration */:
+                    case 219 /* FunctionDeclaration */:
                         cancellationToken.throwIfCancellationRequested();
                 }
             }
             switch (kind) {
-                case 138 /* TypeParameter */:
+                case 140 /* TypeParameter */:
                     return checkTypeParameter(node);
-                case 139 /* Parameter */:
+                case 141 /* Parameter */:
                     return checkParameter(node);
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
                     return checkPropertyDeclaration(node);
-                case 153 /* FunctionType */:
-                case 154 /* ConstructorType */:
-                case 148 /* CallSignature */:
-                case 149 /* ConstructSignature */:
+                case 155 /* FunctionType */:
+                case 156 /* ConstructorType */:
+                case 150 /* CallSignature */:
+                case 151 /* ConstructSignature */:
                     return checkSignatureDeclaration(node);
-                case 150 /* IndexSignature */:
+                case 152 /* IndexSignature */:
                     return checkSignatureDeclaration(node);
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
                     return checkMethodDeclaration(node);
-                case 145 /* Constructor */:
+                case 147 /* Constructor */:
                     return checkConstructorDeclaration(node);
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
                     return checkAccessorDeclaration(node);
-                case 152 /* TypeReference */:
+                case 154 /* TypeReference */:
                     return checkTypeReferenceNode(node);
-                case 151 /* TypePredicate */:
+                case 153 /* TypePredicate */:
                     return checkTypePredicate(node);
-                case 155 /* TypeQuery */:
+                case 157 /* TypeQuery */:
                     return checkTypeQuery(node);
-                case 156 /* TypeLiteral */:
+                case 158 /* TypeLiteral */:
                     return checkTypeLiteral(node);
-                case 157 /* ArrayType */:
+                case 159 /* ArrayType */:
                     return checkArrayType(node);
-                case 158 /* TupleType */:
+                case 160 /* TupleType */:
                     return checkTupleType(node);
-                case 159 /* UnionType */:
-                case 160 /* IntersectionType */:
+                case 161 /* UnionType */:
+                case 162 /* IntersectionType */:
                     return checkUnionOrIntersectionType(node);
-                case 161 /* ParenthesizedType */:
+                case 163 /* ParenthesizedType */:
                     return checkSourceElement(node.type);
-                case 216 /* FunctionDeclaration */:
+                case 219 /* FunctionDeclaration */:
                     return checkFunctionDeclaration(node);
-                case 195 /* Block */:
-                case 222 /* ModuleBlock */:
+                case 198 /* Block */:
+                case 225 /* ModuleBlock */:
                     return checkBlock(node);
-                case 196 /* VariableStatement */:
+                case 199 /* VariableStatement */:
                     return checkVariableStatement(node);
-                case 198 /* ExpressionStatement */:
+                case 201 /* ExpressionStatement */:
                     return checkExpressionStatement(node);
-                case 199 /* IfStatement */:
+                case 202 /* IfStatement */:
                     return checkIfStatement(node);
-                case 200 /* DoStatement */:
+                case 203 /* DoStatement */:
                     return checkDoStatement(node);
-                case 201 /* WhileStatement */:
+                case 204 /* WhileStatement */:
                     return checkWhileStatement(node);
-                case 202 /* ForStatement */:
+                case 205 /* ForStatement */:
                     return checkForStatement(node);
-                case 203 /* ForInStatement */:
+                case 206 /* ForInStatement */:
                     return checkForInStatement(node);
-                case 204 /* ForOfStatement */:
+                case 207 /* ForOfStatement */:
                     return checkForOfStatement(node);
-                case 205 /* ContinueStatement */:
-                case 206 /* BreakStatement */:
+                case 208 /* ContinueStatement */:
+                case 209 /* BreakStatement */:
                     return checkBreakOrContinueStatement(node);
-                case 207 /* ReturnStatement */:
+                case 210 /* ReturnStatement */:
                     return checkReturnStatement(node);
-                case 208 /* WithStatement */:
+                case 211 /* WithStatement */:
                     return checkWithStatement(node);
-                case 209 /* SwitchStatement */:
+                case 212 /* SwitchStatement */:
                     return checkSwitchStatement(node);
-                case 210 /* LabeledStatement */:
+                case 213 /* LabeledStatement */:
                     return checkLabeledStatement(node);
-                case 211 /* ThrowStatement */:
+                case 214 /* ThrowStatement */:
                     return checkThrowStatement(node);
-                case 212 /* TryStatement */:
+                case 215 /* TryStatement */:
                     return checkTryStatement(node);
-                case 214 /* VariableDeclaration */:
+                case 217 /* VariableDeclaration */:
                     return checkVariableDeclaration(node);
-                case 166 /* BindingElement */:
+                case 168 /* BindingElement */:
                     return checkBindingElement(node);
-                case 217 /* ClassDeclaration */:
+                case 220 /* ClassDeclaration */:
                     return checkClassDeclaration(node);
-                case 218 /* InterfaceDeclaration */:
+                case 221 /* InterfaceDeclaration */:
                     return checkInterfaceDeclaration(node);
-                case 219 /* TypeAliasDeclaration */:
+                case 222 /* TypeAliasDeclaration */:
                     return checkTypeAliasDeclaration(node);
-                case 220 /* EnumDeclaration */:
+                case 223 /* EnumDeclaration */:
                     return checkEnumDeclaration(node);
-                case 221 /* ModuleDeclaration */:
+                case 224 /* ModuleDeclaration */:
                     return checkModuleDeclaration(node);
-                case 225 /* ImportDeclaration */:
+                case 229 /* ImportDeclaration */:
                     return checkImportDeclaration(node);
-                case 224 /* ImportEqualsDeclaration */:
+                case 228 /* ImportEqualsDeclaration */:
                     return checkImportEqualsDeclaration(node);
-                case 231 /* ExportDeclaration */:
+                case 235 /* ExportDeclaration */:
                     return checkExportDeclaration(node);
-                case 230 /* ExportAssignment */:
+                case 234 /* ExportAssignment */:
                     return checkExportAssignment(node);
-                case 197 /* EmptyStatement */:
+                case 200 /* EmptyStatement */:
                     checkGrammarStatementInAmbientContext(node);
                     return;
-                case 213 /* DebuggerStatement */:
+                case 216 /* DebuggerStatement */:
                     checkGrammarStatementInAmbientContext(node);
                     return;
-                case 234 /* MissingDeclaration */:
+                case 238 /* MissingDeclaration */:
                     return checkMissingDeclaration(node);
             }
         }
@@ -27744,17 +29479,17 @@ var ts;
             for (var _i = 0, deferredNodes_1 = deferredNodes; _i < deferredNodes_1.length; _i++) {
                 var node = deferredNodes_1[_i];
                 switch (node.kind) {
-                    case 176 /* FunctionExpression */:
-                    case 177 /* ArrowFunction */:
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
+                    case 178 /* FunctionExpression */:
+                    case 179 /* ArrowFunction */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
                         checkFunctionExpressionOrObjectLiteralMethodDeferred(node);
                         break;
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
                         checkAccessorDeferred(node);
                         break;
-                    case 189 /* ClassExpression */:
+                    case 191 /* ClassExpression */:
                         checkClassExpressionDeferred(node);
                         break;
                 }
@@ -27829,7 +29564,7 @@ var ts;
         function isInsideWithStatementBody(node) {
             if (node) {
                 while (node.parent) {
-                    if (node.parent.kind === 208 /* WithStatement */ && node.parent.statement === node) {
+                    if (node.parent.kind === 211 /* WithStatement */ && node.parent.statement === node) {
                         return true;
                     }
                     node = node.parent;
@@ -27852,34 +29587,34 @@ var ts;
                         copySymbols(location.locals, meaning);
                     }
                     switch (location.kind) {
-                        case 251 /* SourceFile */:
+                        case 255 /* SourceFile */:
                             if (!ts.isExternalOrCommonJsModule(location)) {
                                 break;
                             }
-                        case 221 /* ModuleDeclaration */:
+                        case 224 /* ModuleDeclaration */:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8914931 /* ModuleMember */);
                             break;
-                        case 220 /* EnumDeclaration */:
+                        case 223 /* EnumDeclaration */:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8 /* EnumMember */);
                             break;
-                        case 189 /* ClassExpression */:
+                        case 191 /* ClassExpression */:
                             var className = location.name;
                             if (className) {
                                 copySymbol(location.symbol, meaning);
                             }
                         // fall through; this fall-through is necessary because we would like to handle
                         // type parameter inside class expression similar to how we handle it in classDeclaration and interface Declaration
-                        case 217 /* ClassDeclaration */:
-                        case 218 /* InterfaceDeclaration */:
+                        case 220 /* ClassDeclaration */:
+                        case 221 /* InterfaceDeclaration */:
                             // If we didn't come from static member of class or interface,
                             // 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 & 64 /* Static */)) {
+                            if (!(memberFlags & 32 /* Static */)) {
                                 copySymbols(getSymbolOfNode(location).members, meaning & 793056 /* Type */);
                             }
                             break;
-                        case 176 /* FunctionExpression */:
+                        case 178 /* FunctionExpression */:
                             var funcName = location.name;
                             if (funcName) {
                                 copySymbol(location.symbol, meaning);
@@ -27928,37 +29663,51 @@ var ts;
         }
         function isTypeDeclaration(node) {
             switch (node.kind) {
-                case 138 /* TypeParameter */:
-                case 217 /* ClassDeclaration */:
-                case 218 /* InterfaceDeclaration */:
-                case 219 /* TypeAliasDeclaration */:
-                case 220 /* EnumDeclaration */:
+                case 140 /* TypeParameter */:
+                case 220 /* ClassDeclaration */:
+                case 221 /* InterfaceDeclaration */:
+                case 222 /* TypeAliasDeclaration */:
+                case 223 /* EnumDeclaration */:
                     return true;
             }
         }
         // True if the given identifier is part of a type reference
         function isTypeReferenceIdentifier(entityName) {
             var node = entityName;
-            while (node.parent && node.parent.kind === 136 /* QualifiedName */) {
+            while (node.parent && node.parent.kind === 138 /* QualifiedName */) {
                 node = node.parent;
             }
-            return node.parent && node.parent.kind === 152 /* TypeReference */;
+            return node.parent && node.parent.kind === 154 /* TypeReference */;
         }
         function isHeritageClauseElementIdentifier(entityName) {
             var node = entityName;
-            while (node.parent && node.parent.kind === 169 /* PropertyAccessExpression */) {
+            while (node.parent && node.parent.kind === 171 /* PropertyAccessExpression */) {
                 node = node.parent;
             }
-            return node.parent && node.parent.kind === 191 /* ExpressionWithTypeArguments */;
+            return node.parent && node.parent.kind === 193 /* ExpressionWithTypeArguments */;
+        }
+        function forEachEnclosingClass(node, callback) {
+            var result;
+            while (true) {
+                node = ts.getContainingClass(node);
+                if (!node)
+                    break;
+                if (result = callback(node))
+                    break;
+            }
+            return result;
+        }
+        function isNodeWithinClass(node, classDeclaration) {
+            return !!forEachEnclosingClass(node, function (n) { return n === classDeclaration; });
         }
         function getLeftSideOfImportEqualsOrExportAssignment(nodeOnRightSide) {
-            while (nodeOnRightSide.parent.kind === 136 /* QualifiedName */) {
+            while (nodeOnRightSide.parent.kind === 138 /* QualifiedName */) {
                 nodeOnRightSide = nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 224 /* ImportEqualsDeclaration */) {
+            if (nodeOnRightSide.parent.kind === 228 /* ImportEqualsDeclaration */) {
                 return nodeOnRightSide.parent.moduleReference === nodeOnRightSide && nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 230 /* ExportAssignment */) {
+            if (nodeOnRightSide.parent.kind === 234 /* ExportAssignment */) {
                 return nodeOnRightSide.parent.expression === nodeOnRightSide && nodeOnRightSide.parent;
             }
             return undefined;
@@ -27970,11 +29719,23 @@ var ts;
             if (ts.isDeclarationName(entityName)) {
                 return getSymbolOfNode(entityName.parent);
             }
-            if (entityName.parent.kind === 230 /* ExportAssignment */) {
+            if (ts.isInJavaScriptFile(entityName) && entityName.parent.kind === 171 /* PropertyAccessExpression */) {
+                var specialPropertyAssignmentKind = ts.getSpecialPropertyAssignmentKind(entityName.parent.parent);
+                switch (specialPropertyAssignmentKind) {
+                    case 1 /* ExportsProperty */:
+                    case 3 /* PrototypeProperty */:
+                        return getSymbolOfNode(entityName.parent);
+                    case 4 /* ThisProperty */:
+                    case 2 /* ModuleExports */:
+                        return getSymbolOfNode(entityName.parent.parent);
+                    default:
+                }
+            }
+            if (entityName.parent.kind === 234 /* ExportAssignment */) {
                 return resolveEntityName(entityName, 
                 /*all meanings*/ 107455 /* Value */ | 793056 /* Type */ | 1536 /* Namespace */ | 8388608 /* Alias */);
             }
-            if (entityName.kind !== 169 /* PropertyAccessExpression */) {
+            if (entityName.kind !== 171 /* PropertyAccessExpression */) {
                 if (isInRightSideOfImportOrExportAssignment(entityName)) {
                     // Since we already checked for ExportAssignment, this really could only be an Import
                     return getSymbolOfPartOfRightHandSideOfImportEquals(entityName);
@@ -27986,7 +29747,7 @@ var ts;
             if (isHeritageClauseElementIdentifier(entityName)) {
                 var meaning = 0 /* None */;
                 // In an interface or class, we're definitely interested in a type.
-                if (entityName.parent.kind === 191 /* ExpressionWithTypeArguments */) {
+                if (entityName.parent.kind === 193 /* ExpressionWithTypeArguments */) {
                     meaning = 793056 /* Type */;
                     // In a class 'extends' clause we are also looking for a value.
                     if (ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
@@ -27999,30 +29760,28 @@ var ts;
                 meaning |= 8388608 /* Alias */;
                 return resolveEntityName(entityName, meaning);
             }
-            else if ((entityName.parent.kind === 238 /* JsxOpeningElement */) ||
-                (entityName.parent.kind === 237 /* JsxSelfClosingElement */) ||
-                (entityName.parent.kind === 240 /* JsxClosingElement */)) {
-                return getJsxElementTagSymbol(entityName.parent);
-            }
             else if (ts.isExpression(entityName)) {
                 if (ts.nodeIsMissing(entityName)) {
                     // Missing entity name.
                     return undefined;
                 }
                 if (entityName.kind === 69 /* Identifier */) {
+                    if (ts.isJSXTagName(entityName) && isJsxIntrinsicIdentifier(entityName)) {
+                        return getIntrinsicTagSymbol(entityName.parent);
+                    }
                     // Include aliases in the meaning, this ensures that we do not follow aliases to where they point and instead
                     // return the alias symbol.
                     var meaning = 107455 /* Value */ | 8388608 /* Alias */;
                     return resolveEntityName(entityName, meaning);
                 }
-                else if (entityName.kind === 169 /* PropertyAccessExpression */) {
+                else if (entityName.kind === 171 /* PropertyAccessExpression */) {
                     var symbol = getNodeLinks(entityName).resolvedSymbol;
                     if (!symbol) {
                         checkPropertyAccessExpression(entityName);
                     }
                     return getNodeLinks(entityName).resolvedSymbol;
                 }
-                else if (entityName.kind === 136 /* QualifiedName */) {
+                else if (entityName.kind === 138 /* QualifiedName */) {
                     var symbol = getNodeLinks(entityName).resolvedSymbol;
                     if (!symbol) {
                         checkQualifiedName(entityName);
@@ -28031,16 +29790,16 @@ var ts;
                 }
             }
             else if (isTypeReferenceIdentifier(entityName)) {
-                var meaning = entityName.parent.kind === 152 /* TypeReference */ ? 793056 /* Type */ : 1536 /* Namespace */;
+                var meaning = entityName.parent.kind === 154 /* TypeReference */ ? 793056 /* Type */ : 1536 /* Namespace */;
                 // Include aliases in the meaning, this ensures that we do not follow aliases to where they point and instead
                 // return the alias symbol.
                 meaning |= 8388608 /* Alias */;
                 return resolveEntityName(entityName, meaning);
             }
-            else if (entityName.parent.kind === 241 /* JsxAttribute */) {
+            else if (entityName.parent.kind === 245 /* JsxAttribute */) {
                 return getJsxAttributePropertySymbol(entityName.parent);
             }
-            if (entityName.parent.kind === 151 /* TypePredicate */) {
+            if (entityName.parent.kind === 153 /* TypePredicate */) {
                 return resolveEntityName(entityName, /*meaning*/ 1 /* FunctionScopedVariable */);
             }
             // Do we want to return undefined here?
@@ -28057,12 +29816,12 @@ var ts;
             }
             if (node.kind === 69 /* Identifier */) {
                 if (isInRightSideOfImportOrExportAssignment(node)) {
-                    return node.parent.kind === 230 /* ExportAssignment */
+                    return node.parent.kind === 234 /* ExportAssignment */
                         ? getSymbolOfEntityNameOrPropertyAccessExpression(node)
                         : getSymbolOfPartOfRightHandSideOfImportEquals(node);
                 }
-                else if (node.parent.kind === 166 /* BindingElement */ &&
-                    node.parent.parent.kind === 164 /* ObjectBindingPattern */ &&
+                else if (node.parent.kind === 168 /* BindingElement */ &&
+                    node.parent.parent.kind === 166 /* ObjectBindingPattern */ &&
                     node === node.parent.propertyName) {
                     var typeOfPattern = getTypeOfNode(node.parent.parent);
                     var propertyDeclaration = typeOfPattern && getPropertyOfType(typeOfPattern, node.text);
@@ -28073,19 +29832,19 @@ var ts;
             }
             switch (node.kind) {
                 case 69 /* Identifier */:
-                case 169 /* PropertyAccessExpression */:
-                case 136 /* QualifiedName */:
+                case 171 /* PropertyAccessExpression */:
+                case 138 /* QualifiedName */:
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
                 case 97 /* ThisKeyword */:
                 case 95 /* SuperKeyword */:
                     var type = ts.isExpression(node) ? checkExpression(node) : getTypeFromTypeNode(node);
                     return type.symbol;
-                case 162 /* ThisType */:
+                case 164 /* ThisType */:
                     return getTypeFromTypeNode(node).symbol;
                 case 121 /* ConstructorKeyword */:
                     // constructor keyword for an overload, should take us to the definition if it exist
                     var constructorDeclaration = node.parent;
-                    if (constructorDeclaration && constructorDeclaration.kind === 145 /* Constructor */) {
+                    if (constructorDeclaration && constructorDeclaration.kind === 147 /* Constructor */) {
                         return constructorDeclaration.parent.symbol;
                     }
                     return undefined;
@@ -28093,14 +29852,14 @@ var ts;
                     // External module name in an import declaration
                     if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) &&
                         ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) ||
-                        ((node.parent.kind === 225 /* ImportDeclaration */ || node.parent.kind === 231 /* ExportDeclaration */) &&
+                        ((node.parent.kind === 229 /* ImportDeclaration */ || node.parent.kind === 235 /* ExportDeclaration */) &&
                             node.parent.moduleSpecifier === node)) {
                         return resolveExternalModuleName(node, node);
                     }
                 // Fall through
                 case 8 /* NumericLiteral */:
                     // index access
-                    if (node.parent.kind === 170 /* ElementAccessExpression */ && node.parent.argumentExpression === node) {
+                    if (node.parent.kind === 172 /* ElementAccessExpression */ && node.parent.argumentExpression === node) {
                         var objectType = checkExpression(node.parent.expression);
                         if (objectType === unknownType)
                             return undefined;
@@ -28117,7 +29876,7 @@ var ts;
             // The function returns a value symbol of an identifier in the short-hand property assignment.
             // This is necessary as an identifier in short-hand property assignment can contains two meaning:
             // property name and property value.
-            if (location && location.kind === 249 /* ShorthandPropertyAssignment */) {
+            if (location && location.kind === 253 /* ShorthandPropertyAssignment */) {
                 return resolveEntityName(location.name, 107455 /* Value */ | 8388608 /* Alias */);
             }
             return undefined;
@@ -28184,7 +29943,7 @@ var ts;
           */
         function getParentTypeOfClassElement(node) {
             var classSymbol = getSymbolOfNode(node.parent);
-            return node.flags & 64 /* Static */
+            return node.flags & 32 /* Static */
                 ? getTypeOfSymbol(classSymbol)
                 : getDeclaredTypeOfSymbol(classSymbol);
         }
@@ -28204,15 +29963,15 @@ var ts;
         }
         function getRootSymbols(symbol) {
             if (symbol.flags & 268435456 /* SyntheticProperty */) {
-                var symbols = [];
-                var name_18 = symbol.name;
+                var symbols_3 = [];
+                var name_19 = symbol.name;
                 ts.forEach(getSymbolLinks(symbol).containingType.types, function (t) {
-                    var symbol = getPropertyOfType(t, name_18);
+                    var symbol = getPropertyOfType(t, name_19);
                     if (symbol) {
-                        symbols.push(symbol);
+                        symbols_3.push(symbol);
                     }
                 });
-                return symbols;
+                return symbols_3;
             }
             else if (symbol.flags & 67108864 /* Transient */) {
                 var target = getSymbolLinks(symbol).target;
@@ -28232,7 +29991,7 @@ var ts;
                 // module not found - be conservative
                 return true;
             }
-            var hasExportAssignment = getExportAssignmentSymbol(moduleSymbol) !== undefined;
+            var hasExportAssignment = hasExportAssignmentSymbol(moduleSymbol);
             // if module has export assignment then 'resolveExternalModuleSymbol' will return resolved symbol for export assignment
             // otherwise it will return moduleSymbol itself
             moduleSymbol = resolveExternalModuleSymbol(moduleSymbol);
@@ -28267,11 +30026,11 @@ var ts;
                 }
                 var parentSymbol = getParentOfSymbol(symbol);
                 if (parentSymbol) {
-                    if (parentSymbol.flags & 512 /* ValueModule */ && parentSymbol.valueDeclaration.kind === 251 /* SourceFile */) {
+                    if (parentSymbol.flags & 512 /* ValueModule */ && parentSymbol.valueDeclaration.kind === 255 /* SourceFile */) {
                         return parentSymbol.valueDeclaration;
                     }
                     for (var n = node.parent; n; n = n.parent) {
-                        if ((n.kind === 221 /* ModuleDeclaration */ || n.kind === 220 /* EnumDeclaration */) && getSymbolOfNode(n) === parentSymbol) {
+                        if ((n.kind === 224 /* ModuleDeclaration */ || n.kind === 223 /* EnumDeclaration */) && getSymbolOfNode(n) === parentSymbol) {
                             return n;
                         }
                     }
@@ -28284,58 +30043,77 @@ var ts;
             var symbol = getReferencedValueSymbol(node);
             return symbol && symbol.flags & 8388608 /* Alias */ ? getDeclarationOfAliasSymbol(symbol) : undefined;
         }
-        function isStatementWithLocals(node) {
-            switch (node.kind) {
-                case 195 /* Block */:
-                case 223 /* CaseBlock */:
-                case 202 /* ForStatement */:
-                case 203 /* ForInStatement */:
-                case 204 /* ForOfStatement */:
-                    return true;
-            }
-            return false;
-        }
-        function isNestedRedeclarationSymbol(symbol) {
+        function isSymbolOfDeclarationWithCollidingName(symbol) {
             if (symbol.flags & 418 /* BlockScoped */) {
                 var links = getSymbolLinks(symbol);
-                if (links.isNestedRedeclaration === undefined) {
+                if (links.isDeclarationWithCollidingName === undefined) {
                     var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
-                    links.isNestedRedeclaration = isStatementWithLocals(container) &&
-                        !!resolveName(container.parent, symbol.name, 107455 /* Value */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
+                    if (ts.isStatementWithLocals(container)) {
+                        var nodeLinks_1 = getNodeLinks(symbol.valueDeclaration);
+                        if (!!resolveName(container.parent, symbol.name, 107455 /* Value */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined)) {
+                            // redeclaration - always should be renamed
+                            links.isDeclarationWithCollidingName = true;
+                        }
+                        else if (nodeLinks_1.flags & 131072 /* CapturedBlockScopedBinding */) {
+                            // binding is captured in the function
+                            // should be renamed if:
+                            // - binding is not top level - top level bindings never collide with anything
+                            // AND
+                            //   - binding is not declared in loop, should be renamed to avoid name reuse across siblings
+                            //     let a, b
+                            //     { let x = 1; a = () => x;  }
+                            //     { let x = 100; b = () => x; }
+                            //     console.log(a()); // should print '1'
+                            //     console.log(b()); // should print '100'
+                            //     OR
+                            //   - binding is declared inside loop but not in inside initializer of iteration statement or directly inside loop body
+                            //     * variables from initializer are passed to rewritten loop body as parameters so they are not captured directly
+                            //     * variables that are declared immediately in loop body will become top level variable after loop is rewritten and thus
+                            //       they will not collide with anything
+                            var isDeclaredInLoop = nodeLinks_1.flags & 262144 /* BlockScopedBindingInLoop */;
+                            var inLoopInitializer = ts.isIterationStatement(container, /*lookInLabeledStatements*/ false);
+                            var inLoopBodyBlock = container.kind === 198 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false);
+                            links.isDeclarationWithCollidingName = !ts.isBlockScopedContainerTopLevel(container) && (!isDeclaredInLoop || (!inLoopInitializer && !inLoopBodyBlock));
+                        }
+                        else {
+                            links.isDeclarationWithCollidingName = false;
+                        }
+                    }
                 }
-                return links.isNestedRedeclaration;
+                return links.isDeclarationWithCollidingName;
             }
             return false;
         }
         // When resolved as an expression identifier, if the given node references a nested block scoped entity with
-        // a name that hides an existing name, return the declaration of that entity. Otherwise, return undefined.
-        function getReferencedNestedRedeclaration(node) {
+        // 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) {
             var symbol = getReferencedValueSymbol(node);
-            return symbol && isNestedRedeclarationSymbol(symbol) ? symbol.valueDeclaration : undefined;
+            return symbol && isSymbolOfDeclarationWithCollidingName(symbol) ? symbol.valueDeclaration : undefined;
         }
-        // Return true if the given node is a declaration of a nested block scoped entity with a name that hides an
-        // existing name.
-        function isNestedRedeclaration(node) {
-            return isNestedRedeclarationSymbol(getSymbolOfNode(node));
+        // 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) {
+            return isSymbolOfDeclarationWithCollidingName(getSymbolOfNode(node));
         }
         function isValueAliasDeclaration(node) {
             switch (node.kind) {
-                case 224 /* ImportEqualsDeclaration */:
-                case 226 /* ImportClause */:
-                case 227 /* NamespaceImport */:
-                case 229 /* ImportSpecifier */:
-                case 233 /* ExportSpecifier */:
+                case 228 /* ImportEqualsDeclaration */:
+                case 230 /* ImportClause */:
+                case 231 /* NamespaceImport */:
+                case 233 /* ImportSpecifier */:
+                case 237 /* ExportSpecifier */:
                     return isAliasResolvedToValue(getSymbolOfNode(node));
-                case 231 /* ExportDeclaration */:
+                case 235 /* ExportDeclaration */:
                     var exportClause = node.exportClause;
                     return exportClause && ts.forEach(exportClause.elements, isValueAliasDeclaration);
-                case 230 /* ExportAssignment */:
+                case 234 /* ExportAssignment */:
                     return node.expression && node.expression.kind === 69 /* Identifier */ ? isAliasResolvedToValue(getSymbolOfNode(node)) : true;
             }
             return false;
         }
         function isTopLevelValueImportEqualsWithEntityName(node) {
-            if (node.parent.kind !== 251 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
+            if (node.parent.kind !== 255 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
                 // parent is not source file or it is not reference to internal module
                 return false;
             }
@@ -28347,7 +30125,7 @@ var ts;
             if (target === unknownSymbol && compilerOptions.isolatedModules) {
                 return true;
             }
-            // const enums and modules that contain only const enums are not considered values from the emit perespective
+            // const enums and modules that contain only const enums are not considered values from the emit perspective
             // unless 'preserveConstEnums' option is set to true
             return target !== unknownSymbol &&
                 target &&
@@ -28397,7 +30175,7 @@ var ts;
             return getNodeLinks(node).enumMemberValue;
         }
         function getConstantValue(node) {
-            if (node.kind === 250 /* EnumMember */) {
+            if (node.kind === 254 /* EnumMember */) {
                 return getEnumMemberValue(node);
             }
             var symbol = getNodeLinks(node).resolvedSymbol;
@@ -28432,22 +30210,22 @@ var ts;
             else if (type.flags & 1 /* Any */) {
                 return ts.TypeReferenceSerializationKind.ObjectType;
             }
-            else if (allConstituentTypesHaveKind(type, 16 /* Void */)) {
+            else if (isTypeOfKind(type, 16 /* Void */)) {
                 return ts.TypeReferenceSerializationKind.VoidType;
             }
-            else if (allConstituentTypesHaveKind(type, 8 /* Boolean */)) {
+            else if (isTypeOfKind(type, 8 /* Boolean */)) {
                 return ts.TypeReferenceSerializationKind.BooleanType;
             }
-            else if (allConstituentTypesHaveKind(type, 132 /* NumberLike */)) {
+            else if (isTypeOfKind(type, 132 /* NumberLike */)) {
                 return ts.TypeReferenceSerializationKind.NumberLikeType;
             }
-            else if (allConstituentTypesHaveKind(type, 258 /* StringLike */)) {
+            else if (isTypeOfKind(type, 258 /* StringLike */)) {
                 return ts.TypeReferenceSerializationKind.StringLikeType;
             }
-            else if (allConstituentTypesHaveKind(type, 8192 /* Tuple */)) {
+            else if (isTypeOfKind(type, 8192 /* Tuple */)) {
                 return ts.TypeReferenceSerializationKind.ArrayLikeType;
             }
-            else if (allConstituentTypesHaveKind(type, 16777216 /* ESSymbol */)) {
+            else if (isTypeOfKind(type, 16777216 /* ESSymbol */)) {
                 return ts.TypeReferenceSerializationKind.ESSymbolType;
             }
             else if (isFunctionType(type)) {
@@ -28473,9 +30251,15 @@ var ts;
             getSymbolDisplayBuilder().buildTypeDisplay(getReturnTypeOfSignature(signature), writer, enclosingDeclaration, flags);
         }
         function writeTypeOfExpression(expr, enclosingDeclaration, flags, writer) {
-            var type = getTypeOfExpression(expr);
+            var type = getWidenedType(getTypeOfExpression(expr));
             getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags);
         }
+        function writeBaseConstructorTypeOfClass(node, enclosingDeclaration, flags, writer) {
+            var classType = getDeclaredTypeOfSymbol(getSymbolOfNode(node));
+            resolveBaseTypesOfClass(classType);
+            var baseType = classType.resolvedBaseTypes.length ? classType.resolvedBaseTypes[0] : unknownType;
+            getSymbolDisplayBuilder().buildTypeDisplay(baseType, writer, enclosingDeclaration, flags);
+        }
         function hasGlobalName(name) {
             return ts.hasProperty(globals, name);
         }
@@ -28493,8 +30277,8 @@ var ts;
             return {
                 getReferencedExportContainer: getReferencedExportContainer,
                 getReferencedImportDeclaration: getReferencedImportDeclaration,
-                getReferencedNestedRedeclaration: getReferencedNestedRedeclaration,
-                isNestedRedeclaration: isNestedRedeclaration,
+                getReferencedDeclarationWithCollidingName: getReferencedDeclarationWithCollidingName,
+                isDeclarationWithCollidingName: isDeclarationWithCollidingName,
                 isValueAliasDeclaration: isValueAliasDeclaration,
                 hasGlobalName: hasGlobalName,
                 isReferencedAliasDeclaration: isReferencedAliasDeclaration,
@@ -28505,6 +30289,7 @@ var ts;
                 writeTypeOfDeclaration: writeTypeOfDeclaration,
                 writeReturnTypeOfSignatureDeclaration: writeReturnTypeOfSignatureDeclaration,
                 writeTypeOfExpression: writeTypeOfExpression,
+                writeBaseConstructorTypeOfClass: writeBaseConstructorTypeOfClass,
                 isSymbolAccessible: isSymbolAccessible,
                 isEntityNameVisible: isEntityNameVisible,
                 getConstantValue: getConstantValue,
@@ -28523,7 +30308,7 @@ var ts;
             if (!moduleSymbol) {
                 return undefined;
             }
-            return ts.getDeclarationOfKind(moduleSymbol, 251 /* SourceFile */);
+            return ts.getDeclarationOfKind(moduleSymbol, 255 /* SourceFile */);
         }
         function initializeTypeChecker() {
             // Bind all source files and propagate errors
@@ -28536,9 +30321,12 @@ var ts;
                 if (!ts.isExternalOrCommonJsModule(file)) {
                     mergeSymbolTable(globals, file.locals);
                 }
-                if (file.moduleAugmentations) {
+                if (file.moduleAugmentations.length) {
                     (augmentations || (augmentations = [])).push(file.moduleAugmentations);
                 }
+                if (file.wasReferenced && file.symbol && file.symbol.globalExports) {
+                    mergeSymbolTable(globals, file.symbol.globalExports);
+                }
             });
             if (augmentations) {
                 // merge module augmentations.
@@ -28570,6 +30358,7 @@ var ts;
             getGlobalMethodDecoratorType = ts.memoize(function () { return getGlobalType("MethodDecorator"); });
             getGlobalParameterDecoratorType = ts.memoize(function () { return getGlobalType("ParameterDecorator"); });
             getGlobalTypedPropertyDescriptorType = ts.memoize(function () { return getGlobalType("TypedPropertyDescriptor", /*arity*/ 1); });
+            getGlobalESSymbolConstructorSymbol = ts.memoize(function () { return getGlobalValueSymbol("Symbol"); });
             getGlobalPromiseType = ts.memoize(function () { return getGlobalType("Promise", /*arity*/ 1); });
             tryGetGlobalPromiseType = ts.memoize(function () { return getGlobalSymbol("Promise", 793056 /* Type */, /*diagnostic*/ undefined) && getGlobalPromiseType(); });
             getGlobalPromiseLikeType = ts.memoize(function () { return getGlobalType("PromiseLike", /*arity*/ 1); });
@@ -28577,28 +30366,23 @@ var ts;
             getGlobalPromiseConstructorSymbol = ts.memoize(function () { return getGlobalValueSymbol("Promise"); });
             getGlobalPromiseConstructorLikeType = ts.memoize(function () { return getGlobalType("PromiseConstructorLike"); });
             getGlobalThenableType = ts.memoize(createThenableType);
-            // If we're in ES6 mode, load the TemplateStringsArray.
-            // Otherwise, default to 'unknown' for the purposes of type checking in LS scenarios.
+            getGlobalTemplateStringsArrayType = ts.memoize(function () { return getGlobalType("TemplateStringsArray"); });
             if (languageVersion >= 2 /* ES6 */) {
-                globalTemplateStringsArrayType = getGlobalType("TemplateStringsArray");
-                globalESSymbolType = getGlobalType("Symbol");
-                globalESSymbolConstructorSymbol = getGlobalValueSymbol("Symbol");
-                globalIterableType = getGlobalType("Iterable", /*arity*/ 1);
-                globalIteratorType = getGlobalType("Iterator", /*arity*/ 1);
-                globalIterableIteratorType = getGlobalType("IterableIterator", /*arity*/ 1);
+                getGlobalESSymbolType = ts.memoize(function () { return getGlobalType("Symbol"); });
+                getGlobalIterableType = ts.memoize(function () { return getGlobalType("Iterable", /*arity*/ 1); });
+                getGlobalIteratorType = ts.memoize(function () { return getGlobalType("Iterator", /*arity*/ 1); });
+                getGlobalIterableIteratorType = ts.memoize(function () { return getGlobalType("IterableIterator", /*arity*/ 1); });
             }
             else {
-                globalTemplateStringsArrayType = unknownType;
-                // Consider putting Symbol interface in lib.d.ts. On the plus side, putting it in lib.d.ts would make it
-                // extensible for Polyfilling Symbols. But putting it into lib.d.ts could also break users that have
-                // a global Symbol already, particularly if it is a class.
-                globalESSymbolType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
-                globalESSymbolConstructorSymbol = undefined;
-                globalIterableType = emptyGenericType;
-                globalIteratorType = emptyGenericType;
-                globalIterableIteratorType = emptyGenericType;
+                getGlobalESSymbolType = ts.memoize(function () { return emptyObjectType; });
+                getGlobalIterableType = ts.memoize(function () { return emptyGenericType; });
+                getGlobalIteratorType = ts.memoize(function () { return emptyGenericType; });
+                getGlobalIterableIteratorType = ts.memoize(function () { return emptyGenericType; });
             }
             anyArrayType = createArrayType(anyType);
+            var symbol = getGlobalSymbol("ReadonlyArray", 793056 /* Type */, /*diagnostic*/ undefined);
+            globalReadonlyArrayType = symbol && getTypeOfGlobalSymbol(symbol, /*arity*/ 1);
+            anyReadonlyArrayType = globalReadonlyArrayType ? createTypeFromGenericGlobalType(globalReadonlyArrayType, [anyType]) : anyArrayType;
         }
         function createInstantiatedPromiseLikeType() {
             var promiseLikeType = getGlobalPromiseLikeType();
@@ -28624,14 +30408,14 @@ var ts;
                 return false;
             }
             if (!ts.nodeCanBeDecorated(node)) {
-                if (node.kind === 144 /* MethodDeclaration */ && !ts.nodeIsPresent(node.body)) {
+                if (node.kind === 146 /* MethodDeclaration */ && !ts.nodeIsPresent(node.body)) {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.A_decorator_can_only_decorate_a_method_implementation_not_an_overload);
                 }
                 else {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_are_not_valid_here);
                 }
             }
-            else if (node.kind === 146 /* GetAccessor */ || node.kind === 147 /* SetAccessor */) {
+            else if (node.kind === 148 /* GetAccessor */ || node.kind === 149 /* SetAccessor */) {
                 var accessors = ts.getAllAccessorDeclarations(node.parent.members, node);
                 if (accessors.firstAccessor.decorators && node === accessors.secondAccessor) {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name);
@@ -28641,38 +30425,38 @@ var ts;
         }
         function checkGrammarModifiers(node) {
             switch (node.kind) {
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
-                case 145 /* Constructor */:
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
-                case 150 /* IndexSignature */:
-                case 221 /* ModuleDeclaration */:
-                case 225 /* ImportDeclaration */:
-                case 224 /* ImportEqualsDeclaration */:
-                case 231 /* ExportDeclaration */:
-                case 230 /* ExportAssignment */:
-                case 139 /* Parameter */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
+                case 147 /* Constructor */:
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
+                case 152 /* IndexSignature */:
+                case 224 /* ModuleDeclaration */:
+                case 229 /* ImportDeclaration */:
+                case 228 /* ImportEqualsDeclaration */:
+                case 235 /* ExportDeclaration */:
+                case 234 /* ExportAssignment */:
+                case 141 /* Parameter */:
                     break;
-                case 216 /* FunctionDeclaration */:
+                case 219 /* FunctionDeclaration */:
                     if (node.modifiers && (node.modifiers.length > 1 || node.modifiers[0].kind !== 118 /* AsyncKeyword */) &&
-                        node.parent.kind !== 222 /* ModuleBlock */ && node.parent.kind !== 251 /* SourceFile */) {
+                        node.parent.kind !== 225 /* ModuleBlock */ && node.parent.kind !== 255 /* SourceFile */) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
                     }
                     break;
-                case 217 /* ClassDeclaration */:
-                case 218 /* InterfaceDeclaration */:
-                case 196 /* VariableStatement */:
-                case 219 /* TypeAliasDeclaration */:
-                    if (node.modifiers && node.parent.kind !== 222 /* ModuleBlock */ && node.parent.kind !== 251 /* SourceFile */) {
+                case 220 /* ClassDeclaration */:
+                case 221 /* InterfaceDeclaration */:
+                case 199 /* VariableStatement */:
+                case 222 /* TypeAliasDeclaration */:
+                    if (node.modifiers && node.parent.kind !== 225 /* ModuleBlock */ && node.parent.kind !== 255 /* SourceFile */) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
                     }
                     break;
-                case 220 /* EnumDeclaration */:
+                case 223 /* EnumDeclaration */:
                     if (node.modifiers && (node.modifiers.length > 1 || node.modifiers[0].kind !== 74 /* ConstKeyword */) &&
-                        node.parent.kind !== 222 /* ModuleBlock */ && node.parent.kind !== 251 /* SourceFile */) {
+                        node.parent.kind !== 225 /* ModuleBlock */ && node.parent.kind !== 255 /* SourceFile */) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
                     }
                     break;
@@ -28682,42 +30466,48 @@ var ts;
             if (!node.modifiers) {
                 return;
             }
-            var lastStatic, lastPrivate, lastProtected, lastDeclare, lastAsync;
+            var lastStatic, lastPrivate, lastProtected, lastDeclare, lastAsync, lastReadonly;
             var flags = 0;
             for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
                 var modifier = _a[_i];
+                if (modifier.kind !== 127 /* ReadonlyKeyword */) {
+                    if (node.kind === 143 /* PropertySignature */ || node.kind === 145 /* MethodSignature */) {
+                        return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_type_member, ts.tokenToString(modifier.kind));
+                    }
+                    if (node.kind === 152 /* IndexSignature */) {
+                        return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_an_index_signature, ts.tokenToString(modifier.kind));
+                    }
+                }
                 switch (modifier.kind) {
                     case 74 /* ConstKeyword */:
-                        if (node.kind !== 220 /* EnumDeclaration */ && node.parent.kind === 217 /* ClassDeclaration */) {
+                        if (node.kind !== 223 /* EnumDeclaration */ && node.parent.kind === 220 /* ClassDeclaration */) {
                             return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(74 /* ConstKeyword */));
                         }
                         break;
                     case 112 /* PublicKeyword */:
                     case 111 /* ProtectedKeyword */:
                     case 110 /* PrivateKeyword */:
-                        var text = void 0;
-                        if (modifier.kind === 112 /* PublicKeyword */) {
-                            text = "public";
-                        }
-                        else if (modifier.kind === 111 /* ProtectedKeyword */) {
-                            text = "protected";
+                        var text = visibilityToString(ts.modifierToFlag(modifier.kind));
+                        if (modifier.kind === 111 /* ProtectedKeyword */) {
                             lastProtected = modifier;
                         }
-                        else {
-                            text = "private";
+                        else if (modifier.kind === 110 /* PrivateKeyword */) {
                             lastPrivate = modifier;
                         }
-                        if (flags & 56 /* AccessibilityModifier */) {
+                        if (flags & 28 /* AccessibilityModifier */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.Accessibility_modifier_already_seen);
                         }
-                        else if (flags & 64 /* Static */) {
+                        else if (flags & 32 /* Static */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "static");
                         }
+                        else if (flags & 64 /* Readonly */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "readonly");
+                        }
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "async");
                         }
-                        else if (node.parent.kind === 222 /* ModuleBlock */ || node.parent.kind === 251 /* SourceFile */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_element, text);
+                        else if (node.parent.kind === 225 /* ModuleBlock */ || node.parent.kind === 255 /* SourceFile */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, text);
                         }
                         else if (flags & 128 /* Abstract */) {
                             if (modifier.kind === 110 /* PrivateKeyword */) {
@@ -28730,29 +30520,42 @@ var ts;
                         flags |= ts.modifierToFlag(modifier.kind);
                         break;
                     case 113 /* StaticKeyword */:
-                        if (flags & 64 /* Static */) {
+                        if (flags & 32 /* Static */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static");
                         }
+                        else if (flags & 64 /* Readonly */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "readonly");
+                        }
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "async");
                         }
-                        else if (node.parent.kind === 222 /* ModuleBlock */ || node.parent.kind === 251 /* SourceFile */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_element, "static");
+                        else if (node.parent.kind === 225 /* ModuleBlock */ || node.parent.kind === 255 /* SourceFile */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, "static");
                         }
-                        else if (node.kind === 139 /* Parameter */) {
+                        else if (node.kind === 141 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
                         }
                         else if (flags & 128 /* Abstract */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "static", "abstract");
                         }
-                        flags |= 64 /* Static */;
+                        flags |= 32 /* Static */;
                         lastStatic = modifier;
                         break;
+                    case 127 /* ReadonlyKeyword */:
+                        if (flags & 64 /* Readonly */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "readonly");
+                        }
+                        else if (node.kind !== 144 /* PropertyDeclaration */ && node.kind !== 143 /* PropertySignature */ && node.kind !== 152 /* IndexSignature */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics.readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature);
+                        }
+                        flags |= 64 /* Readonly */;
+                        lastReadonly = modifier;
+                        break;
                     case 82 /* ExportKeyword */:
-                        if (flags & 2 /* Export */) {
+                        if (flags & 1 /* Export */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "export");
                         }
-                        else if (flags & 4 /* Ambient */) {
+                        else if (flags & 2 /* Ambient */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "declare");
                         }
                         else if (flags & 128 /* Abstract */) {
@@ -28761,48 +30564,51 @@ var ts;
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "async");
                         }
-                        else if (node.parent.kind === 217 /* ClassDeclaration */) {
+                        else if (node.parent.kind === 220 /* ClassDeclaration */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "export");
                         }
-                        else if (node.kind === 139 /* Parameter */) {
+                        else if (node.kind === 141 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");
                         }
-                        flags |= 2 /* Export */;
+                        flags |= 1 /* Export */;
                         break;
                     case 122 /* DeclareKeyword */:
-                        if (flags & 4 /* Ambient */) {
+                        if (flags & 2 /* Ambient */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "declare");
                         }
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.parent.kind === 217 /* ClassDeclaration */) {
+                        else if (node.parent.kind === 220 /* ClassDeclaration */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "declare");
                         }
-                        else if (node.kind === 139 /* Parameter */) {
+                        else if (node.kind === 141 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "declare");
                         }
-                        else if (ts.isInAmbientContext(node.parent) && node.parent.kind === 222 /* ModuleBlock */) {
+                        else if (ts.isInAmbientContext(node.parent) && node.parent.kind === 225 /* ModuleBlock */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
                         }
-                        flags |= 4 /* Ambient */;
+                        flags |= 2 /* Ambient */;
                         lastDeclare = modifier;
                         break;
                     case 115 /* AbstractKeyword */:
                         if (flags & 128 /* Abstract */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "abstract");
                         }
-                        if (node.kind !== 217 /* ClassDeclaration */) {
-                            if (node.kind !== 144 /* MethodDeclaration */) {
-                                return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_or_method_declaration);
+                        if (node.kind !== 220 /* ClassDeclaration */) {
+                            if (node.kind !== 146 /* MethodDeclaration */ &&
+                                node.kind !== 144 /* PropertyDeclaration */ &&
+                                node.kind !== 148 /* GetAccessor */ &&
+                                node.kind !== 149 /* SetAccessor */) {
+                                return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration);
                             }
-                            if (!(node.parent.kind === 217 /* ClassDeclaration */ && node.parent.flags & 128 /* Abstract */)) {
+                            if (!(node.parent.kind === 220 /* ClassDeclaration */ && node.parent.flags & 128 /* Abstract */)) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.Abstract_methods_can_only_appear_within_an_abstract_class);
                             }
-                            if (flags & 64 /* Static */) {
+                            if (flags & 32 /* Static */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "static", "abstract");
                             }
-                            if (flags & 16 /* Private */) {
+                            if (flags & 8 /* Private */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "private", "abstract");
                             }
                         }
@@ -28812,10 +30618,10 @@ var ts;
                         if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "async");
                         }
-                        else if (flags & 4 /* Ambient */ || ts.isInAmbientContext(node.parent)) {
+                        else if (flags & 2 /* Ambient */ || ts.isInAmbientContext(node.parent)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.kind === 139 /* Parameter */) {
+                        else if (node.kind === 141 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async");
                         }
                         flags |= 256 /* Async */;
@@ -28823,28 +30629,25 @@ var ts;
                         break;
                 }
             }
-            if (node.kind === 145 /* Constructor */) {
-                if (flags & 64 /* Static */) {
+            if (node.kind === 147 /* Constructor */) {
+                if (flags & 32 /* Static */) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
                 }
                 if (flags & 128 /* Abstract */) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "abstract");
                 }
-                else if (flags & 32 /* Protected */) {
-                    return grammarErrorOnNode(lastProtected, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "protected");
-                }
-                else if (flags & 16 /* Private */) {
-                    return grammarErrorOnNode(lastPrivate, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "private");
-                }
                 else if (flags & 256 /* Async */) {
                     return grammarErrorOnNode(lastAsync, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "async");
                 }
+                else if (flags & 64 /* Readonly */) {
+                    return grammarErrorOnNode(lastReadonly, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "readonly");
+                }
                 return;
             }
-            else if ((node.kind === 225 /* ImportDeclaration */ || node.kind === 224 /* ImportEqualsDeclaration */) && flags & 4 /* Ambient */) {
+            else if ((node.kind === 229 /* ImportDeclaration */ || node.kind === 228 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
-            else if (node.kind === 139 /* Parameter */ && (flags & 56 /* AccessibilityModifier */) && ts.isBindingPattern(node.name)) {
+            else if (node.kind === 141 /* Parameter */ && (flags & 28 /* AccessibilityModifier */) && ts.isBindingPattern(node.name)) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_may_not_be_a_binding_pattern);
             }
             if (flags & 256 /* Async */) {
@@ -28856,10 +30659,10 @@ var ts;
                 return grammarErrorOnNode(asyncModifier, ts.Diagnostics.Async_functions_are_only_available_when_targeting_ECMAScript_6_and_higher);
             }
             switch (node.kind) {
-                case 144 /* MethodDeclaration */:
-                case 216 /* FunctionDeclaration */:
-                case 176 /* FunctionExpression */:
-                case 177 /* ArrowFunction */:
+                case 146 /* MethodDeclaration */:
+                case 219 /* FunctionDeclaration */:
+                case 178 /* FunctionExpression */:
+                case 179 /* ArrowFunction */:
                     if (!node.asteriskToken) {
                         return false;
                     }
@@ -28925,7 +30728,7 @@ var ts;
                 checkGrammarParameterList(node.parameters) || checkGrammarArrowFunction(node, file);
         }
         function checkGrammarArrowFunction(node, file) {
-            if (node.kind === 177 /* ArrowFunction */) {
+            if (node.kind === 179 /* ArrowFunction */) {
                 var arrowFunction = node;
                 var startLine = ts.getLineAndCharacterOfPosition(file, arrowFunction.equalsGreaterThanToken.pos).line;
                 var endLine = ts.getLineAndCharacterOfPosition(file, arrowFunction.equalsGreaterThanToken.end).line;
@@ -28948,7 +30751,7 @@ var ts;
             if (parameter.dotDotDotToken) {
                 return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.An_index_signature_cannot_have_a_rest_parameter);
             }
-            if (parameter.flags & 1022 /* Modifier */) {
+            if (parameter.flags & 959 /* Modifier */) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_cannot_have_an_accessibility_modifier);
             }
             if (parameter.questionToken) {
@@ -28960,21 +30763,16 @@ var ts;
             if (!parameter.type) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_must_have_a_type_annotation);
             }
-            if (parameter.type.kind !== 130 /* StringKeyword */ && parameter.type.kind !== 128 /* NumberKeyword */) {
+            if (parameter.type.kind !== 131 /* StringKeyword */ && parameter.type.kind !== 129 /* NumberKeyword */) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_must_be_string_or_number);
             }
             if (!node.type) {
                 return grammarErrorOnNode(node, ts.Diagnostics.An_index_signature_must_have_a_type_annotation);
             }
         }
-        function checkGrammarForIndexSignatureModifier(node) {
-            if (node.flags & 1022 /* Modifier */) {
-                grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_not_permitted_on_index_signature_members);
-            }
-        }
         function checkGrammarIndexSignature(node) {
             // Prevent cascading error by short-circuit
-            return checkGrammarDecorators(node) || checkGrammarModifiers(node) || checkGrammarIndexSignatureParameters(node) || checkGrammarForIndexSignatureModifier(node);
+            return checkGrammarDecorators(node) || checkGrammarModifiers(node) || checkGrammarIndexSignatureParameters(node);
         }
         function checkGrammarForAtLeastOneTypeArgument(node, typeArguments) {
             if (typeArguments && typeArguments.length === 0) {
@@ -28993,7 +30791,7 @@ var ts;
                 var sourceFile = ts.getSourceFileOfNode(node);
                 for (var _i = 0, args_1 = args; _i < args_1.length; _i++) {
                     var arg = args_1[_i];
-                    if (arg.kind === 190 /* OmittedExpression */) {
+                    if (arg.kind === 192 /* OmittedExpression */) {
                         return grammarErrorAtPos(sourceFile, arg.pos, 0, ts.Diagnostics.Argument_expression_expected);
                     }
                 }
@@ -29067,19 +30865,19 @@ var ts;
         }
         function checkGrammarComputedPropertyName(node) {
             // If node is not a computedPropertyName, just skip the grammar checking
-            if (node.kind !== 137 /* ComputedPropertyName */) {
+            if (node.kind !== 139 /* ComputedPropertyName */) {
                 return false;
             }
             var computedPropertyName = node;
-            if (computedPropertyName.expression.kind === 184 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 24 /* CommaToken */) {
+            if (computedPropertyName.expression.kind === 186 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 24 /* CommaToken */) {
                 return grammarErrorOnNode(computedPropertyName.expression, ts.Diagnostics.A_comma_expression_is_not_allowed_in_a_computed_property_name);
             }
         }
         function checkGrammarForGenerator(node) {
             if (node.asteriskToken) {
-                ts.Debug.assert(node.kind === 216 /* FunctionDeclaration */ ||
-                    node.kind === 176 /* FunctionExpression */ ||
-                    node.kind === 144 /* MethodDeclaration */);
+                ts.Debug.assert(node.kind === 219 /* FunctionDeclaration */ ||
+                    node.kind === 178 /* FunctionExpression */ ||
+                    node.kind === 146 /* MethodDeclaration */);
                 if (ts.isInAmbientContext(node)) {
                     return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
                 }
@@ -29100,28 +30898,28 @@ var ts;
             var seen = {};
             var Property = 1;
             var GetAccessor = 2;
-            var SetAccesor = 4;
-            var GetOrSetAccessor = GetAccessor | SetAccesor;
+            var SetAccessor = 4;
+            var GetOrSetAccessor = GetAccessor | SetAccessor;
             var _loop_1 = function(prop) {
-                var name_19 = prop.name;
-                if (prop.kind === 190 /* OmittedExpression */ ||
-                    name_19.kind === 137 /* ComputedPropertyName */) {
+                var name_20 = prop.name;
+                if (prop.kind === 192 /* OmittedExpression */ ||
+                    name_20.kind === 139 /* ComputedPropertyName */) {
                     // If the name is not a ComputedPropertyName, the grammar checking will skip it
-                    checkGrammarComputedPropertyName(name_19);
+                    checkGrammarComputedPropertyName(name_20);
                     return "continue";
                 }
-                if (prop.kind === 249 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) {
+                if (prop.kind === 253 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) {
                     // having objectAssignmentInitializer is only valid in ObjectAssignmentPattern
                     // outside of destructuring it is a syntax error
                     return { value: grammarErrorOnNode(prop.equalsToken, ts.Diagnostics.can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment) };
                 }
                 // Modifiers are never allowed on properties except for 'async' on a method declaration
                 ts.forEach(prop.modifiers, function (mod) {
-                    if (mod.kind !== 118 /* AsyncKeyword */ || prop.kind !== 144 /* MethodDeclaration */) {
+                    if (mod.kind !== 118 /* AsyncKeyword */ || prop.kind !== 146 /* MethodDeclaration */) {
                         grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod));
                     }
                 });
-                // ECMA-262 11.1.5 Object Initialiser
+                // 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
                 // a.This production is contained in strict code and IsDataDescriptor(previous) is true and
                 // IsDataDescriptor(propId.descriptor) is true.
@@ -29130,71 +30928,70 @@ var ts;
                 //    d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true
                 // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
                 var currentKind = void 0;
-                if (prop.kind === 248 /* PropertyAssignment */ || prop.kind === 249 /* ShorthandPropertyAssignment */) {
-                    // Grammar checking for computedPropertName and shorthandPropertyAssignment
+                if (prop.kind === 252 /* PropertyAssignment */ || prop.kind === 253 /* ShorthandPropertyAssignment */) {
+                    // Grammar checking for computedPropertyName and shorthandPropertyAssignment
                     checkGrammarForInvalidQuestionMark(prop, prop.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional);
-                    if (name_19.kind === 8 /* NumericLiteral */) {
-                        checkGrammarNumericLiteral(name_19);
+                    if (name_20.kind === 8 /* NumericLiteral */) {
+                        checkGrammarNumericLiteral(name_20);
                     }
                     currentKind = Property;
                 }
-                else if (prop.kind === 144 /* MethodDeclaration */) {
+                else if (prop.kind === 146 /* MethodDeclaration */) {
                     currentKind = Property;
                 }
-                else if (prop.kind === 146 /* GetAccessor */) {
+                else if (prop.kind === 148 /* GetAccessor */) {
                     currentKind = GetAccessor;
                 }
-                else if (prop.kind === 147 /* SetAccessor */) {
-                    currentKind = SetAccesor;
+                else if (prop.kind === 149 /* SetAccessor */) {
+                    currentKind = SetAccessor;
                 }
                 else {
                     ts.Debug.fail("Unexpected syntax kind:" + prop.kind);
                 }
-                if (!ts.hasProperty(seen, name_19.text)) {
-                    seen[name_19.text] = currentKind;
+                if (!ts.hasProperty(seen, name_20.text)) {
+                    seen[name_20.text] = currentKind;
                 }
                 else {
-                    var existingKind = seen[name_19.text];
+                    var existingKind = seen[name_20.text];
                     if (currentKind === Property && existingKind === Property) {
                         return "continue";
                     }
                     else if ((currentKind & GetOrSetAccessor) && (existingKind & GetOrSetAccessor)) {
                         if (existingKind !== GetOrSetAccessor && currentKind !== existingKind) {
-                            seen[name_19.text] = currentKind | existingKind;
+                            seen[name_20.text] = currentKind | existingKind;
                         }
                         else {
-                            return { value: grammarErrorOnNode(name_19, ts.Diagnostics.An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name) };
+                            return { value: grammarErrorOnNode(name_20, ts.Diagnostics.An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name) };
                         }
                     }
                     else {
-                        return { value: grammarErrorOnNode(name_19, ts.Diagnostics.An_object_literal_cannot_have_property_and_accessor_with_the_same_name) };
+                        return { value: grammarErrorOnNode(name_20, ts.Diagnostics.An_object_literal_cannot_have_property_and_accessor_with_the_same_name) };
                     }
                 }
             };
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var prop = _a[_i];
-                var state_1 = _loop_1(prop);
-                if (typeof state_1 === "object") return state_1.value
-                if (state_1 === "continue") continue;
+                var state_2 = _loop_1(prop);
+                if (typeof state_2 === "object") return state_2.value;
             }
         }
         function checkGrammarJsxElement(node) {
             var seen = {};
             for (var _i = 0, _a = node.attributes; _i < _a.length; _i++) {
                 var attr = _a[_i];
-                if (attr.kind === 242 /* JsxSpreadAttribute */) {
+                if (attr.kind === 246 /* JsxSpreadAttribute */) {
                     continue;
                 }
                 var jsxAttr = attr;
-                var name_20 = jsxAttr.name;
-                if (!ts.hasProperty(seen, name_20.text)) {
-                    seen[name_20.text] = true;
+                var name_21 = jsxAttr.name;
+                if (!ts.hasProperty(seen, name_21.text)) {
+                    seen[name_21.text] = true;
                 }
                 else {
-                    return grammarErrorOnNode(name_20, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
+                    return grammarErrorOnNode(name_21, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
                 }
                 var initializer = jsxAttr.initializer;
-                if (initializer && initializer.kind === 243 /* JsxExpression */ && !initializer.expression) {
+                if (initializer && initializer.kind === 247 /* JsxExpression */ && !initializer.expression) {
                     return grammarErrorOnNode(jsxAttr.initializer, ts.Diagnostics.JSX_attributes_must_only_be_assigned_a_non_empty_expression);
                 }
             }
@@ -29203,7 +31000,7 @@ var ts;
             if (checkGrammarStatementInAmbientContext(forInOrOfStatement)) {
                 return true;
             }
-            if (forInOrOfStatement.initializer.kind === 215 /* VariableDeclarationList */) {
+            if (forInOrOfStatement.initializer.kind === 218 /* VariableDeclarationList */) {
                 var variableList = forInOrOfStatement.initializer;
                 if (!checkGrammarVariableDeclarationList(variableList)) {
                     var declarations = variableList.declarations;
@@ -29218,20 +31015,20 @@ var ts;
                         return false;
                     }
                     if (declarations.length > 1) {
-                        var diagnostic = forInOrOfStatement.kind === 203 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 206 /* ForInStatement */
                             ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement
                             : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement;
                         return grammarErrorOnFirstToken(variableList.declarations[1], diagnostic);
                     }
                     var firstDeclaration = declarations[0];
                     if (firstDeclaration.initializer) {
-                        var diagnostic = forInOrOfStatement.kind === 203 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 206 /* ForInStatement */
                             ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer
                             : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer;
                         return grammarErrorOnNode(firstDeclaration.name, diagnostic);
                     }
                     if (firstDeclaration.type) {
-                        var diagnostic = forInOrOfStatement.kind === 203 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 206 /* ForInStatement */
                             ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation
                             : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation;
                         return grammarErrorOnNode(firstDeclaration, diagnostic);
@@ -29248,16 +31045,16 @@ var ts;
             else if (ts.isInAmbientContext(accessor)) {
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_be_declared_in_an_ambient_context);
             }
-            else if (accessor.body === undefined) {
+            else if (accessor.body === undefined && !(accessor.flags & 128 /* Abstract */)) {
                 return grammarErrorAtPos(ts.getSourceFileOfNode(accessor), accessor.end - 1, ";".length, ts.Diagnostics._0_expected, "{");
             }
             else if (accessor.typeParameters) {
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_have_type_parameters);
             }
-            else if (kind === 146 /* GetAccessor */ && accessor.parameters.length) {
+            else if (kind === 148 /* GetAccessor */ && accessor.parameters.length) {
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_get_accessor_cannot_have_parameters);
             }
-            else if (kind === 147 /* SetAccessor */) {
+            else if (kind === 149 /* SetAccessor */) {
                 if (accessor.type) {
                     return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_set_accessor_cannot_have_a_return_type_annotation);
                 }
@@ -29269,7 +31066,7 @@ var ts;
                     if (parameter.dotDotDotToken) {
                         return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.A_set_accessor_cannot_have_rest_parameter);
                     }
-                    else if (parameter.flags & 1022 /* Modifier */) {
+                    else if (parameter.flags & 959 /* Modifier */) {
                         return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                     }
                     else if (parameter.questionToken) {
@@ -29292,7 +31089,7 @@ var ts;
                 checkGrammarForGenerator(node)) {
                 return true;
             }
-            if (node.parent.kind === 168 /* ObjectLiteralExpression */) {
+            if (node.parent.kind === 170 /* ObjectLiteralExpression */) {
                 if (checkGrammarForInvalidQuestionMark(node, node.questionToken, ts.Diagnostics.A_class_member_cannot_be_declared_optional)) {
                     return true;
                 }
@@ -29316,10 +31113,10 @@ var ts;
                     return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol);
                 }
             }
-            else if (node.parent.kind === 218 /* InterfaceDeclaration */) {
+            else if (node.parent.kind === 221 /* InterfaceDeclaration */) {
                 return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol);
             }
-            else if (node.parent.kind === 156 /* TypeLiteral */) {
+            else if (node.parent.kind === 158 /* TypeLiteral */) {
                 return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol);
             }
         }
@@ -29330,11 +31127,11 @@ var ts;
                     return grammarErrorOnNode(node, ts.Diagnostics.Jump_target_cannot_cross_function_boundary);
                 }
                 switch (current.kind) {
-                    case 210 /* LabeledStatement */:
+                    case 213 /* LabeledStatement */:
                         if (node.label && current.label.text === node.label.text) {
                             // found matching label - verify that label usage is correct
                             // continue can only target labels that are on iteration statements
-                            var isMisplacedContinueLabel = node.kind === 205 /* ContinueStatement */
+                            var isMisplacedContinueLabel = node.kind === 208 /* ContinueStatement */
                                 && !ts.isIterationStatement(current.statement, /*lookInLabeledStatement*/ true);
                             if (isMisplacedContinueLabel) {
                                 return grammarErrorOnNode(node, ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement);
@@ -29342,8 +31139,8 @@ var ts;
                             return false;
                         }
                         break;
-                    case 209 /* SwitchStatement */:
-                        if (node.kind === 206 /* BreakStatement */ && !node.label) {
+                    case 212 /* SwitchStatement */:
+                        if (node.kind === 209 /* BreakStatement */ && !node.label) {
                             // unlabeled break within switch statement - ok
                             return false;
                         }
@@ -29358,13 +31155,13 @@ var ts;
                 current = current.parent;
             }
             if (node.label) {
-                var message = node.kind === 206 /* BreakStatement */
+                var message = node.kind === 209 /* BreakStatement */
                     ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement
                     : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
             }
             else {
-                var message = node.kind === 206 /* BreakStatement */
+                var message = node.kind === 209 /* BreakStatement */
                     ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement
                     : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
@@ -29376,7 +31173,7 @@ var ts;
                 if (node !== ts.lastOrUndefined(elements)) {
                     return grammarErrorOnNode(node, ts.Diagnostics.A_rest_element_must_be_last_in_an_array_destructuring_pattern);
                 }
-                if (node.name.kind === 165 /* ArrayBindingPattern */ || node.name.kind === 164 /* ObjectBindingPattern */) {
+                if (node.name.kind === 167 /* ArrayBindingPattern */ || node.name.kind === 166 /* ObjectBindingPattern */) {
                     return grammarErrorOnNode(node.name, ts.Diagnostics.A_rest_element_cannot_contain_a_binding_pattern);
                 }
                 if (node.initializer) {
@@ -29386,7 +31183,7 @@ var ts;
             }
         }
         function checkGrammarVariableDeclaration(node) {
-            if (node.parent.parent.kind !== 203 /* ForInStatement */ && node.parent.parent.kind !== 204 /* ForOfStatement */) {
+            if (node.parent.parent.kind !== 206 /* ForInStatement */ && node.parent.parent.kind !== 207 /* ForOfStatement */) {
                 if (ts.isInAmbientContext(node)) {
                     if (node.initializer) {
                         // Error on equals token which immediate precedes the initializer
@@ -29422,7 +31219,7 @@ var ts;
                 var elements = name.elements;
                 for (var _i = 0, elements_2 = elements; _i < elements_2.length; _i++) {
                     var element = elements_2[_i];
-                    if (element.kind !== 190 /* OmittedExpression */) {
+                    if (element.kind !== 192 /* OmittedExpression */) {
                         checkGrammarNameInLetOrConstDeclarations(element.name);
                     }
                 }
@@ -29439,15 +31236,15 @@ var ts;
         }
         function allowLetAndConstDeclarations(parent) {
             switch (parent.kind) {
-                case 199 /* IfStatement */:
-                case 200 /* DoStatement */:
-                case 201 /* WhileStatement */:
-                case 208 /* WithStatement */:
-                case 202 /* ForStatement */:
-                case 203 /* ForInStatement */:
-                case 204 /* ForOfStatement */:
+                case 202 /* IfStatement */:
+                case 203 /* DoStatement */:
+                case 204 /* WhileStatement */:
+                case 211 /* WithStatement */:
+                case 205 /* ForStatement */:
+                case 206 /* ForInStatement */:
+                case 207 /* ForOfStatement */:
                     return false;
-                case 210 /* LabeledStatement */:
+                case 213 /* LabeledStatement */:
                     return allowLetAndConstDeclarations(parent.parent);
             }
             return true;
@@ -29503,7 +31300,7 @@ var ts;
                     return true;
                 }
             }
-            else if (node.parent.kind === 218 /* InterfaceDeclaration */) {
+            else if (node.parent.kind === 221 /* InterfaceDeclaration */) {
                 if (checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol)) {
                     return true;
                 }
@@ -29511,7 +31308,7 @@ var ts;
                     return grammarErrorOnNode(node.initializer, ts.Diagnostics.An_interface_property_cannot_have_an_initializer);
                 }
             }
-            else if (node.parent.kind === 156 /* TypeLiteral */) {
+            else if (node.parent.kind === 158 /* TypeLiteral */) {
                 if (checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol)) {
                     return true;
                 }
@@ -29536,14 +31333,14 @@ var ts;
             //     export_opt   AmbientDeclaration
             //
             // TODO: The spec needs to be amended to reflect this grammar.
-            if (node.kind === 218 /* InterfaceDeclaration */ ||
-                node.kind === 219 /* TypeAliasDeclaration */ ||
-                node.kind === 225 /* ImportDeclaration */ ||
-                node.kind === 224 /* ImportEqualsDeclaration */ ||
-                node.kind === 231 /* ExportDeclaration */ ||
-                node.kind === 230 /* ExportAssignment */ ||
-                (node.flags & 4 /* Ambient */) ||
-                (node.flags & (2 /* Export */ | 512 /* Default */))) {
+            if (node.kind === 221 /* InterfaceDeclaration */ ||
+                node.kind === 222 /* TypeAliasDeclaration */ ||
+                node.kind === 229 /* ImportDeclaration */ ||
+                node.kind === 228 /* ImportEqualsDeclaration */ ||
+                node.kind === 235 /* ExportDeclaration */ ||
+                node.kind === 234 /* ExportAssignment */ ||
+                (node.flags & 2 /* Ambient */) ||
+                (node.flags & (1 /* Export */ | 512 /* Default */))) {
                 return false;
             }
             return grammarErrorOnFirstToken(node, ts.Diagnostics.A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file);
@@ -29551,7 +31348,7 @@ var ts;
         function checkGrammarTopLevelElementsForRequiredDeclareModifier(file) {
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
                 var decl = _a[_i];
-                if (ts.isDeclaration(decl) || decl.kind === 196 /* VariableStatement */) {
+                if (ts.isDeclaration(decl) || decl.kind === 199 /* VariableStatement */) {
                     if (checkGrammarTopLevelElementForRequiredDeclareModifier(decl)) {
                         return true;
                     }
@@ -29574,10 +31371,10 @@ var ts;
                 }
                 // We are either parented by another statement, or some sort of block.
                 // If we're in a block, we only want to really report an error once
-                // to prevent noisyness.  So use a bit on the block to indicate if
+                // to prevent noisiness.  So use a bit on the block to indicate if
                 // this has already been reported, and don't report if it has.
                 //
-                if (node.parent.kind === 195 /* Block */ || node.parent.kind === 222 /* ModuleBlock */ || node.parent.kind === 251 /* SourceFile */) {
+                if (node.parent.kind === 198 /* Block */ || node.parent.kind === 225 /* ModuleBlock */ || node.parent.kind === 255 /* SourceFile */) {
                     var links_1 = getNodeLinks(node.parent);
                     // Check if the containing block ever report this error
                     if (!links_1.hasReportedStatementInAmbientContext) {
@@ -29590,7 +31387,7 @@ var ts;
         }
         function checkGrammarNumericLiteral(node) {
             // Grammar checking
-            if (node.flags & 32768 /* OctalLiteral */ && languageVersion >= 1 /* ES5 */) {
+            if (node.isOctalLiteral && languageVersion >= 1 /* ES5 */) {
                 return grammarErrorOnNode(node, ts.Diagnostics.Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher);
             }
         }
@@ -29611,6 +31408,14 @@ var ts;
 var ts;
 (function (ts) {
     var nullSourceMapWriter;
+    // Used for initialize lastEncodedSourceMapSpan and reset lastEncodedSourceMapSpan when updateLastEncodedAndRecordedSpans
+    var defaultLastEncodedSourceMapSpan = {
+        emittedLine: 1,
+        emittedColumn: 1,
+        sourceLine: 1,
+        sourceColumn: 1,
+        sourceIndex: 0
+    };
     function getNullSourceMapWriter() {
         if (nullSourceMapWriter === undefined) {
             nullSourceMapWriter = {
@@ -29664,13 +31469,7 @@ var ts;
             sourceMapSourceIndex = -1;
             // Last recorded and encoded spans
             lastRecordedSourceMapSpan = undefined;
-            lastEncodedSourceMapSpan = {
-                emittedLine: 1,
-                emittedColumn: 1,
-                sourceLine: 1,
-                sourceColumn: 1,
-                sourceIndex: 0
-            };
+            lastEncodedSourceMapSpan = defaultLastEncodedSourceMapSpan;
             lastEncodedNameIndex = 0;
             // Initialize source map data
             sourceMapData = {
@@ -29733,10 +31532,12 @@ var ts;
                 lastRecordedSourceMapSpan.emittedColumn = lastEncodedSourceMapSpan.emittedColumn;
                 // Pop sourceMapDecodedMappings to remove last entry
                 sourceMapData.sourceMapDecodedMappings.pop();
-                // Change the last encoded source map
+                // Point the lastEncodedSourceMapSpace to the previous encoded sourceMapSpan
+                // If the list is empty which indicates that we are at the beginning of the file,
+                // we have to reset it to default value (same value when we first initialize sourceMapWriter)
                 lastEncodedSourceMapSpan = sourceMapData.sourceMapDecodedMappings.length ?
                     sourceMapData.sourceMapDecodedMappings[sourceMapData.sourceMapDecodedMappings.length - 1] :
-                    undefined;
+                    defaultLastEncodedSourceMapSpan;
                 // TODO: Update lastEncodedNameIndex 
                 // Since we dont support this any more, lets not worry about it right now.
                 // When we start supporting nameIndex, we will get back to this
@@ -29929,7 +31730,7 @@ var ts;
     function getDeclarationDiagnostics(host, resolver, targetSourceFile) {
         var declarationDiagnostics = ts.createDiagnosticCollection();
         ts.forEachExpectedEmitFile(host, getDeclarationDiagnosticsFromFile, targetSourceFile);
-        return declarationDiagnostics.getDiagnostics(targetSourceFile.fileName);
+        return declarationDiagnostics.getDiagnostics(targetSourceFile ? targetSourceFile.fileName : undefined);
         function getDeclarationDiagnosticsFromFile(_a, sources, isBundledEmit) {
             var declarationFilePath = _a.declarationFilePath;
             emitDeclarations(host, resolver, declarationDiagnostics, declarationFilePath, sources, isBundledEmit);
@@ -29944,7 +31745,8 @@ var ts;
         var increaseIndent;
         var decreaseIndent;
         var writeTextOfNode;
-        var writer = createAndSetNewTextWriterWithSymbolWriter();
+        var writer;
+        createAndSetNewTextWriterWithSymbolWriter();
         var enclosingDeclaration;
         var resultHasExternalModuleIndicator;
         var currentText;
@@ -30008,7 +31810,7 @@ var ts;
                 var oldWriter = writer;
                 ts.forEach(moduleElementDeclarationEmitInfo, function (aliasEmitInfo) {
                     if (aliasEmitInfo.isVisible && !aliasEmitInfo.asynchronousOutput) {
-                        ts.Debug.assert(aliasEmitInfo.node.kind === 225 /* ImportDeclaration */);
+                        ts.Debug.assert(aliasEmitInfo.node.kind === 229 /* ImportDeclaration */);
                         createAndSetNewTextWriterWithSymbolWriter();
                         ts.Debug.assert(aliasEmitInfo.indent === 0 || (aliasEmitInfo.indent === 1 && isBundledEmit));
                         for (var i = 0; i < aliasEmitInfo.indent; i++) {
@@ -30064,7 +31866,6 @@ var ts;
             writer.writeParameter = writer.write;
             writer.writeSymbol = writer.write;
             setWriter(writer);
-            return writer;
         }
         function setWriter(newWriter) {
             writer = newWriter;
@@ -30078,10 +31879,10 @@ var ts;
             var oldWriter = writer;
             ts.forEach(nodes, function (declaration) {
                 var nodeToCheck;
-                if (declaration.kind === 214 /* VariableDeclaration */) {
+                if (declaration.kind === 217 /* VariableDeclaration */) {
                     nodeToCheck = declaration.parent.parent;
                 }
-                else if (declaration.kind === 228 /* NamedImports */ || declaration.kind === 229 /* ImportSpecifier */ || declaration.kind === 226 /* ImportClause */) {
+                else if (declaration.kind === 232 /* NamedImports */ || declaration.kind === 233 /* ImportSpecifier */ || declaration.kind === 230 /* ImportClause */) {
                     ts.Debug.fail("We should be getting ImportDeclaration instead to write");
                 }
                 else {
@@ -30099,7 +31900,7 @@ var ts;
                 // Writing of function bar would mark alias declaration foo as visible but we haven't yet visited that declaration so do nothing,
                 // we would write alias foo declaration when we visit it since it would now be marked as visible
                 if (moduleElementEmitInfo) {
-                    if (moduleElementEmitInfo.node.kind === 225 /* ImportDeclaration */) {
+                    if (moduleElementEmitInfo.node.kind === 229 /* ImportDeclaration */) {
                         // we have to create asynchronous output only after we have collected complete information
                         // because it is possible to enable multiple bindings as asynchronously visible
                         moduleElementEmitInfo.isVisible = true;
@@ -30109,12 +31910,12 @@ var ts;
                         for (var declarationIndent = moduleElementEmitInfo.indent; declarationIndent; declarationIndent--) {
                             increaseIndent();
                         }
-                        if (nodeToCheck.kind === 221 /* ModuleDeclaration */) {
+                        if (nodeToCheck.kind === 224 /* ModuleDeclaration */) {
                             ts.Debug.assert(asynchronousSubModuleDeclarationEmitInfo === undefined);
                             asynchronousSubModuleDeclarationEmitInfo = [];
                         }
                         writeModuleElement(nodeToCheck);
-                        if (nodeToCheck.kind === 221 /* ModuleDeclaration */) {
+                        if (nodeToCheck.kind === 224 /* ModuleDeclaration */) {
                             moduleElementEmitInfo.subModuleElementDeclarationEmitInfo = asynchronousSubModuleDeclarationEmitInfo;
                             asynchronousSubModuleDeclarationEmitInfo = undefined;
                         }
@@ -30124,23 +31925,23 @@ var ts;
             });
             setWriter(oldWriter);
         }
-        function handleSymbolAccessibilityError(symbolAccesibilityResult) {
-            if (symbolAccesibilityResult.accessibility === 0 /* Accessible */) {
+        function handleSymbolAccessibilityError(symbolAccessibilityResult) {
+            if (symbolAccessibilityResult.accessibility === 0 /* Accessible */) {
                 // write the aliases
-                if (symbolAccesibilityResult && symbolAccesibilityResult.aliasesToMakeVisible) {
-                    writeAsynchronousModuleElements(symbolAccesibilityResult.aliasesToMakeVisible);
+                if (symbolAccessibilityResult && symbolAccessibilityResult.aliasesToMakeVisible) {
+                    writeAsynchronousModuleElements(symbolAccessibilityResult.aliasesToMakeVisible);
                 }
             }
             else {
                 // Report error
                 reportedDeclarationError = true;
-                var errorInfo = writer.getSymbolAccessibilityDiagnostic(symbolAccesibilityResult);
+                var errorInfo = writer.getSymbolAccessibilityDiagnostic(symbolAccessibilityResult);
                 if (errorInfo) {
                     if (errorInfo.typeName) {
-                        emitterDiagnostics.add(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getTextOfNodeFromSourceText(currentText, errorInfo.typeName), symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName));
+                        emitterDiagnostics.add(ts.createDiagnosticForNode(symbolAccessibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getTextOfNodeFromSourceText(currentText, errorInfo.typeName), symbolAccessibilityResult.errorSymbolName, symbolAccessibilityResult.errorModuleName));
                     }
                     else {
-                        emitterDiagnostics.add(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName));
+                        emitterDiagnostics.add(ts.createDiagnosticForNode(symbolAccessibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, symbolAccessibilityResult.errorSymbolName, symbolAccessibilityResult.errorModuleName));
                     }
                 }
             }
@@ -30217,40 +32018,42 @@ var ts;
         function emitType(type) {
             switch (type.kind) {
                 case 117 /* AnyKeyword */:
-                case 130 /* StringKeyword */:
-                case 128 /* NumberKeyword */:
+                case 131 /* StringKeyword */:
+                case 129 /* NumberKeyword */:
                 case 120 /* BooleanKeyword */:
-                case 131 /* SymbolKeyword */:
+                case 132 /* SymbolKeyword */:
                 case 103 /* VoidKeyword */:
-                case 162 /* ThisType */:
-                case 163 /* StringLiteralType */:
+                case 134 /* UndefinedKeyword */:
+                case 93 /* NullKeyword */:
+                case 164 /* ThisType */:
+                case 165 /* StringLiteralType */:
                     return writeTextOfNode(currentText, type);
-                case 191 /* ExpressionWithTypeArguments */:
+                case 193 /* ExpressionWithTypeArguments */:
                     return emitExpressionWithTypeArguments(type);
-                case 152 /* TypeReference */:
+                case 154 /* TypeReference */:
                     return emitTypeReference(type);
-                case 155 /* TypeQuery */:
+                case 157 /* TypeQuery */:
                     return emitTypeQuery(type);
-                case 157 /* ArrayType */:
+                case 159 /* ArrayType */:
                     return emitArrayType(type);
-                case 158 /* TupleType */:
+                case 160 /* TupleType */:
                     return emitTupleType(type);
-                case 159 /* UnionType */:
+                case 161 /* UnionType */:
                     return emitUnionType(type);
-                case 160 /* IntersectionType */:
+                case 162 /* IntersectionType */:
                     return emitIntersectionType(type);
-                case 161 /* ParenthesizedType */:
+                case 163 /* ParenthesizedType */:
                     return emitParenType(type);
-                case 153 /* FunctionType */:
-                case 154 /* ConstructorType */:
+                case 155 /* FunctionType */:
+                case 156 /* ConstructorType */:
                     return emitSignatureDeclarationWithJsDocComments(type);
-                case 156 /* TypeLiteral */:
+                case 158 /* TypeLiteral */:
                     return emitTypeLiteral(type);
                 case 69 /* Identifier */:
                     return emitEntityName(type);
-                case 136 /* QualifiedName */:
+                case 138 /* QualifiedName */:
                     return emitEntityName(type);
-                case 151 /* TypePredicate */:
+                case 153 /* TypePredicate */:
                     return emitTypePredicate(type);
             }
             function writeEntityName(entityName) {
@@ -30258,8 +32061,8 @@ var ts;
                     writeTextOfNode(currentText, entityName);
                 }
                 else {
-                    var left = entityName.kind === 136 /* QualifiedName */ ? entityName.left : entityName.expression;
-                    var right = entityName.kind === 136 /* QualifiedName */ ? entityName.right : entityName.name;
+                    var left = entityName.kind === 138 /* QualifiedName */ ? entityName.left : entityName.expression;
+                    var right = entityName.kind === 138 /* QualifiedName */ ? entityName.right : entityName.name;
                     writeEntityName(left);
                     write(".");
                     writeTextOfNode(currentText, right);
@@ -30268,13 +32071,13 @@ var ts;
             function emitEntityName(entityName) {
                 var visibilityResult = resolver.isEntityNameVisible(entityName, 
                 // Aliases can be written asynchronously so use correct enclosing declaration
-                entityName.parent.kind === 224 /* ImportEqualsDeclaration */ ? entityName.parent : enclosingDeclaration);
+                entityName.parent.kind === 228 /* ImportEqualsDeclaration */ ? entityName.parent : enclosingDeclaration);
                 handleSymbolAccessibilityError(visibilityResult);
                 writeEntityName(entityName);
             }
             function emitExpressionWithTypeArguments(node) {
                 if (ts.isSupportedExpressionWithTypeArguments(node)) {
-                    ts.Debug.assert(node.expression.kind === 69 /* Identifier */ || node.expression.kind === 169 /* PropertyAccessExpression */);
+                    ts.Debug.assert(node.expression.kind === 69 /* Identifier */ || node.expression.kind === 171 /* PropertyAccessExpression */);
                     emitEntityName(node.expression);
                     if (node.typeArguments) {
                         write("<");
@@ -30353,9 +32156,9 @@ var ts;
             var count = 0;
             while (true) {
                 count++;
-                var name_21 = baseName + "_" + count;
-                if (!ts.hasProperty(currentIdentifiers, name_21)) {
-                    return name_21;
+                var name_22 = baseName + "_" + count;
+                if (!ts.hasProperty(currentIdentifiers, name_22)) {
+                    return name_22;
                 }
             }
         }
@@ -30367,7 +32170,10 @@ var ts;
             else {
                 // Expression
                 var tempVarName = getExportDefaultTempVariableName();
-                write("declare var ");
+                if (!noDeclare) {
+                    write("declare ");
+                }
+                write("var ");
                 write(tempVarName);
                 write(": ");
                 writer.getSymbolAccessibilityDiagnostic = getDefaultExportAccessibilityDiagnostic;
@@ -30399,10 +32205,10 @@ var ts;
             if (isModuleElementVisible) {
                 writeModuleElement(node);
             }
-            else if (node.kind === 224 /* ImportEqualsDeclaration */ ||
-                (node.parent.kind === 251 /* SourceFile */ && isCurrentFileExternalModule)) {
-                var isVisible;
-                if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 251 /* SourceFile */) {
+            else if (node.kind === 228 /* ImportEqualsDeclaration */ ||
+                (node.parent.kind === 255 /* SourceFile */ && isCurrentFileExternalModule)) {
+                var isVisible = void 0;
+                if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 255 /* SourceFile */) {
                     // Import declaration of another module that is visited async so lets put it in right spot
                     asynchronousSubModuleDeclarationEmitInfo.push({
                         node: node,
@@ -30412,7 +32218,7 @@ var ts;
                     });
                 }
                 else {
-                    if (node.kind === 225 /* ImportDeclaration */) {
+                    if (node.kind === 229 /* ImportDeclaration */) {
                         var importDeclaration = node;
                         if (importDeclaration.importClause) {
                             isVisible = (importDeclaration.importClause.name && resolver.isDeclarationVisible(importDeclaration.importClause)) ||
@@ -30430,23 +32236,23 @@ var ts;
         }
         function writeModuleElement(node) {
             switch (node.kind) {
-                case 216 /* FunctionDeclaration */:
+                case 219 /* FunctionDeclaration */:
                     return writeFunctionDeclaration(node);
-                case 196 /* VariableStatement */:
+                case 199 /* VariableStatement */:
                     return writeVariableStatement(node);
-                case 218 /* InterfaceDeclaration */:
+                case 221 /* InterfaceDeclaration */:
                     return writeInterfaceDeclaration(node);
-                case 217 /* ClassDeclaration */:
+                case 220 /* ClassDeclaration */:
                     return writeClassDeclaration(node);
-                case 219 /* TypeAliasDeclaration */:
+                case 222 /* TypeAliasDeclaration */:
                     return writeTypeAliasDeclaration(node);
-                case 220 /* EnumDeclaration */:
+                case 223 /* EnumDeclaration */:
                     return writeEnumDeclaration(node);
-                case 221 /* ModuleDeclaration */:
+                case 224 /* ModuleDeclaration */:
                     return writeModuleDeclaration(node);
-                case 224 /* ImportEqualsDeclaration */:
+                case 228 /* ImportEqualsDeclaration */:
                     return writeImportEqualsDeclaration(node);
-                case 225 /* ImportDeclaration */:
+                case 229 /* ImportDeclaration */:
                     return writeImportDeclaration(node);
                 default:
                     ts.Debug.fail("Unknown symbol kind");
@@ -30454,30 +32260,33 @@ var ts;
         }
         function emitModuleElementDeclarationFlags(node) {
             // If the node is parented in the current source file we need to emit export declare or just export
-            if (node.parent.kind === 251 /* SourceFile */) {
+            if (node.parent.kind === 255 /* SourceFile */) {
                 // If the node is exported
-                if (node.flags & 2 /* Export */) {
+                if (node.flags & 1 /* Export */) {
                     write("export ");
                 }
                 if (node.flags & 512 /* Default */) {
                     write("default ");
                 }
-                else if (node.kind !== 218 /* InterfaceDeclaration */ && !noDeclare) {
+                else if (node.kind !== 221 /* InterfaceDeclaration */ && !noDeclare) {
                     write("declare ");
                 }
             }
         }
-        function emitClassMemberDeclarationFlags(node) {
-            if (node.flags & 16 /* Private */) {
+        function emitClassMemberDeclarationFlags(flags) {
+            if (flags & 8 /* Private */) {
                 write("private ");
             }
-            else if (node.flags & 32 /* Protected */) {
+            else if (flags & 16 /* Protected */) {
                 write("protected ");
             }
-            if (node.flags & 64 /* Static */) {
+            if (flags & 32 /* Static */) {
                 write("static ");
             }
-            if (node.flags & 128 /* Abstract */) {
+            if (flags & 64 /* Readonly */) {
+                write("readonly ");
+            }
+            if (flags & 128 /* Abstract */) {
                 write("abstract ");
             }
         }
@@ -30485,7 +32294,7 @@ var 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 & 2 /* Export */) {
+            if (node.flags & 1 /* Export */) {
                 write("export ");
             }
             write("import ");
@@ -30501,7 +32310,7 @@ var ts;
                 write(");");
             }
             writer.writeLine();
-            function getImportEntityNameVisibilityError(symbolAccesibilityResult) {
+            function getImportEntityNameVisibilityError(symbolAccessibilityResult) {
                 return {
                     diagnosticMessage: ts.Diagnostics.Import_declaration_0_is_using_private_name_1,
                     errorNode: node,
@@ -30511,7 +32320,7 @@ var ts;
         }
         function isVisibleNamedBinding(namedBindings) {
             if (namedBindings) {
-                if (namedBindings.kind === 227 /* NamespaceImport */) {
+                if (namedBindings.kind === 231 /* NamespaceImport */) {
                     return resolver.isDeclarationVisible(namedBindings);
                 }
                 else {
@@ -30520,12 +32329,8 @@ var ts;
             }
         }
         function writeImportDeclaration(node) {
-            if (!node.importClause && !(node.flags & 2 /* Export */)) {
-                // do not write non-exported import declarations that don't have import clauses
-                return;
-            }
             emitJsDocComments(node);
-            if (node.flags & 2 /* Export */) {
+            if (node.flags & 1 /* Export */) {
                 write("export ");
             }
             write("import ");
@@ -30539,7 +32344,7 @@ var ts;
                         // If the default binding was emitted, write the separated
                         write(", ");
                     }
-                    if (node.importClause.namedBindings.kind === 227 /* NamespaceImport */) {
+                    if (node.importClause.namedBindings.kind === 231 /* NamespaceImport */) {
                         write("* as ");
                         writeTextOfNode(currentText, node.importClause.namedBindings.name);
                     }
@@ -30558,15 +32363,15 @@ var ts;
         function emitExternalModuleSpecifier(parent) {
             // emitExternalModuleSpecifier is usually called when we emit something in the.d.ts file that will make it an external module (i.e. import/export declarations).
             // the only case when it is not true is when we call it to emit correct name for module augmentation - d.ts files with just module augmentations are not considered 
-            // external modules since they are indistingushable from script files with ambient modules. To fix this in such d.ts files we'll emit top level 'export {}'
+            // external modules since they are indistinguishable from script files with ambient modules. To fix this in such d.ts files we'll emit top level 'export {}'
             // so compiler will treat them as external modules.
-            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || parent.kind !== 221 /* ModuleDeclaration */;
+            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || parent.kind !== 224 /* ModuleDeclaration */;
             var moduleSpecifier;
-            if (parent.kind === 224 /* ImportEqualsDeclaration */) {
+            if (parent.kind === 228 /* ImportEqualsDeclaration */) {
                 var node = parent;
                 moduleSpecifier = ts.getExternalModuleImportEqualsDeclarationExpression(node);
             }
-            else if (parent.kind === 221 /* ModuleDeclaration */) {
+            else if (parent.kind === 224 /* ModuleDeclaration */) {
                 moduleSpecifier = parent.name;
             }
             else {
@@ -30576,9 +32381,9 @@ var ts;
             if (moduleSpecifier.kind === 9 /* StringLiteral */ && isBundledEmit && (compilerOptions.out || compilerOptions.outFile)) {
                 var moduleName = ts.getExternalModuleNameFromDeclaration(host, resolver, parent);
                 if (moduleName) {
-                    write("\"");
+                    write('"');
                     write(moduleName);
-                    write("\"");
+                    write('"');
                     return;
                 }
             }
@@ -30623,7 +32428,7 @@ var ts;
                 write("global ");
             }
             else {
-                if (node.flags & 65536 /* Namespace */) {
+                if (node.flags & 4096 /* Namespace */) {
                     write("namespace ");
                 }
                 else {
@@ -30636,7 +32441,7 @@ var ts;
                     writeTextOfNode(currentText, node.name);
                 }
             }
-            while (node.body.kind !== 222 /* ModuleBlock */) {
+            while (node.body.kind !== 225 /* ModuleBlock */) {
                 node = node.body;
                 write(".");
                 writeTextOfNode(currentText, node.name);
@@ -30665,7 +32470,7 @@ var ts;
             write(";");
             writeLine();
             enclosingDeclaration = prevEnclosingDeclaration;
-            function getTypeAliasDeclarationVisibilityError(symbolAccesibilityResult) {
+            function getTypeAliasDeclarationVisibilityError(symbolAccessibilityResult) {
                 return {
                     diagnosticMessage: ts.Diagnostics.Exported_type_alias_0_has_or_is_using_private_name_1,
                     errorNode: node.type,
@@ -30701,7 +32506,7 @@ var ts;
             writeLine();
         }
         function isPrivateMethodTypeParameter(node) {
-            return node.parent.kind === 144 /* MethodDeclaration */ && (node.parent.flags & 16 /* Private */);
+            return node.parent.kind === 146 /* MethodDeclaration */ && (node.parent.flags & 8 /* Private */);
         }
         function emitTypeParameters(typeParameters) {
             function emitTypeParameter(node) {
@@ -30712,50 +32517,50 @@ var ts;
                 // If there is constraint present and this is not a type parameter of the private method emit the constraint
                 if (node.constraint && !isPrivateMethodTypeParameter(node)) {
                     write(" extends ");
-                    if (node.parent.kind === 153 /* FunctionType */ ||
-                        node.parent.kind === 154 /* ConstructorType */ ||
-                        (node.parent.parent && node.parent.parent.kind === 156 /* TypeLiteral */)) {
-                        ts.Debug.assert(node.parent.kind === 144 /* MethodDeclaration */ ||
-                            node.parent.kind === 143 /* MethodSignature */ ||
-                            node.parent.kind === 153 /* FunctionType */ ||
-                            node.parent.kind === 154 /* ConstructorType */ ||
-                            node.parent.kind === 148 /* CallSignature */ ||
-                            node.parent.kind === 149 /* ConstructSignature */);
+                    if (node.parent.kind === 155 /* FunctionType */ ||
+                        node.parent.kind === 156 /* ConstructorType */ ||
+                        (node.parent.parent && node.parent.parent.kind === 158 /* TypeLiteral */)) {
+                        ts.Debug.assert(node.parent.kind === 146 /* MethodDeclaration */ ||
+                            node.parent.kind === 145 /* MethodSignature */ ||
+                            node.parent.kind === 155 /* FunctionType */ ||
+                            node.parent.kind === 156 /* ConstructorType */ ||
+                            node.parent.kind === 150 /* CallSignature */ ||
+                            node.parent.kind === 151 /* ConstructSignature */);
                         emitType(node.constraint);
                     }
                     else {
                         emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.constraint, getTypeParameterConstraintVisibilityError);
                     }
                 }
-                function getTypeParameterConstraintVisibilityError(symbolAccesibilityResult) {
+                function getTypeParameterConstraintVisibilityError(symbolAccessibilityResult) {
                     // Type parameter constraints are named by user so we should always be able to name it
                     var diagnosticMessage;
                     switch (node.parent.kind) {
-                        case 217 /* ClassDeclaration */:
+                        case 220 /* ClassDeclaration */:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_class_has_or_is_using_private_name_1;
                             break;
-                        case 218 /* InterfaceDeclaration */:
+                        case 221 /* InterfaceDeclaration */:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1;
                             break;
-                        case 149 /* ConstructSignature */:
+                        case 151 /* ConstructSignature */:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
                             break;
-                        case 148 /* CallSignature */:
+                        case 150 /* CallSignature */:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
                             break;
-                        case 144 /* MethodDeclaration */:
-                        case 143 /* MethodSignature */:
-                            if (node.parent.flags & 64 /* Static */) {
+                        case 146 /* MethodDeclaration */:
+                        case 145 /* MethodSignature */:
+                            if (node.parent.flags & 32 /* Static */) {
                                 diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                             }
-                            else if (node.parent.parent.kind === 217 /* ClassDeclaration */) {
+                            else if (node.parent.parent.kind === 220 /* ClassDeclaration */) {
                                 diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
                             }
                             else {
                                 diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                             }
                             break;
-                        case 216 /* FunctionDeclaration */:
+                        case 219 /* FunctionDeclaration */:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_function_has_or_is_using_private_name_1;
                             break;
                         default:
@@ -30786,10 +32591,14 @@ var ts;
                 else if (!isImplementsList && node.expression.kind === 93 /* NullKeyword */) {
                     write("null");
                 }
-                function getHeritageClauseVisibilityError(symbolAccesibilityResult) {
+                else {
+                    writer.getSymbolAccessibilityDiagnostic = getHeritageClauseVisibilityError;
+                    resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2 /* UseTypeOfFunction */, writer);
+                }
+                function getHeritageClauseVisibilityError(symbolAccessibilityResult) {
                     var diagnosticMessage;
                     // Heritage clause is written by user so it can always be named
-                    if (node.parent.parent.kind === 217 /* ClassDeclaration */) {
+                    if (node.parent.parent.kind === 220 /* ClassDeclaration */) {
                         // Class or Interface implemented/extended is inaccessible
                         diagnosticMessage = isImplementsList ?
                             ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 :
@@ -30811,7 +32620,7 @@ var ts;
             function emitParameterProperties(constructorDeclaration) {
                 if (constructorDeclaration) {
                     ts.forEach(constructorDeclaration.parameters, function (param) {
-                        if (param.flags & 56 /* AccessibilityModifier */) {
+                        if (param.flags & 28 /* AccessibilityModifier */) {
                             emitPropertyDeclaration(param);
                         }
                     });
@@ -30865,7 +32674,7 @@ var ts;
                 return;
             }
             emitJsDocComments(node);
-            emitClassMemberDeclarationFlags(node);
+            emitClassMemberDeclarationFlags(node.flags);
             emitVariableDeclaration(node);
             write(";");
             writeLine();
@@ -30873,7 +32682,7 @@ var ts;
         function emitVariableDeclaration(node) {
             // If we are emitting property it isn't moduleElement and hence we already know it needs to be emitted
             // so there is no check needed to see if declaration is visible
-            if (node.kind !== 214 /* VariableDeclaration */ || resolver.isDeclarationVisible(node)) {
+            if (node.kind !== 217 /* VariableDeclaration */ || resolver.isDeclarationVisible(node)) {
                 if (ts.isBindingPattern(node.name)) {
                     emitBindingPattern(node.name);
                 }
@@ -30883,51 +32692,51 @@ var ts;
                     // what we want, namely the name expression enclosed in brackets.
                     writeTextOfNode(currentText, node.name);
                     // If optional property emit ?
-                    if ((node.kind === 142 /* PropertyDeclaration */ || node.kind === 141 /* PropertySignature */) && ts.hasQuestionToken(node)) {
+                    if ((node.kind === 144 /* PropertyDeclaration */ || node.kind === 143 /* PropertySignature */) && ts.hasQuestionToken(node)) {
                         write("?");
                     }
-                    if ((node.kind === 142 /* PropertyDeclaration */ || node.kind === 141 /* PropertySignature */) && node.parent.kind === 156 /* TypeLiteral */) {
+                    if ((node.kind === 144 /* PropertyDeclaration */ || node.kind === 143 /* PropertySignature */) && node.parent.kind === 158 /* TypeLiteral */) {
                         emitTypeOfVariableDeclarationFromTypeLiteral(node);
                     }
-                    else if (!(node.flags & 16 /* Private */)) {
+                    else if (!(node.flags & 8 /* Private */)) {
                         writeTypeOfDeclaration(node, node.type, getVariableDeclarationTypeVisibilityError);
                     }
                 }
             }
-            function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult) {
-                if (node.kind === 214 /* VariableDeclaration */) {
-                    return symbolAccesibilityResult.errorModuleName ?
-                        symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+            function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
+                if (node.kind === 217 /* VariableDeclaration */) {
+                    return symbolAccessibilityResult.errorModuleName ?
+                        symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                             ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Exported_variable_0_has_or_is_using_private_name_1;
                 }
-                else if (node.kind === 142 /* PropertyDeclaration */ || node.kind === 141 /* PropertySignature */) {
+                else if (node.kind === 144 /* PropertyDeclaration */ || node.kind === 143 /* PropertySignature */) {
                     // TODO(jfreeman): Deal with computed properties in error reporting.
-                    if (node.flags & 64 /* Static */) {
-                        return symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                    if (node.flags & 32 /* Static */) {
+                        return symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                 ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
                     }
-                    else if (node.parent.kind === 217 /* ClassDeclaration */) {
-                        return symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                    else if (node.parent.kind === 220 /* ClassDeclaration */) {
+                        return symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                 ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_private_name_1;
                     }
                     else {
                         // Interfaces cannot have types that cannot be named
-                        return symbolAccesibilityResult.errorModuleName ?
+                        return symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_private_name_1;
                     }
                 }
             }
-            function getVariableDeclarationTypeVisibilityError(symbolAccesibilityResult) {
-                var diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult);
+            function getVariableDeclarationTypeVisibilityError(symbolAccessibilityResult) {
+                var diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult);
                 return diagnosticMessage !== undefined ? {
                     diagnosticMessage: diagnosticMessage,
                     errorNode: node,
@@ -30943,15 +32752,15 @@ var ts;
                 var elements = [];
                 for (var _i = 0, _a = bindingPattern.elements; _i < _a.length; _i++) {
                     var element = _a[_i];
-                    if (element.kind !== 190 /* OmittedExpression */) {
+                    if (element.kind !== 192 /* OmittedExpression */) {
                         elements.push(element);
                     }
                 }
                 emitCommaList(elements, emitBindingElement);
             }
             function emitBindingElement(bindingElement) {
-                function getBindingElementTypeVisibilityError(symbolAccesibilityResult) {
-                    var diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult);
+                function getBindingElementTypeVisibilityError(symbolAccessibilityResult) {
+                    var diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult);
                     return diagnosticMessage !== undefined ? {
                         diagnosticMessage: diagnosticMessage,
                         errorNode: bindingElement,
@@ -31006,14 +32815,14 @@ var ts;
             if (node === accessors.firstAccessor) {
                 emitJsDocComments(accessors.getAccessor);
                 emitJsDocComments(accessors.setAccessor);
-                emitClassMemberDeclarationFlags(node);
+                emitClassMemberDeclarationFlags(node.flags | (accessors.setAccessor ? 0 : 64 /* Readonly */));
                 writeTextOfNode(currentText, node.name);
-                if (!(node.flags & 16 /* Private */)) {
+                if (!(node.flags & 8 /* Private */)) {
                     accessorWithTypeAnnotation = node;
                     var type = getTypeAnnotationFromAccessor(node);
                     if (!type) {
                         // couldn't get type for the first accessor, try the another one
-                        var anotherAccessor = node.kind === 146 /* GetAccessor */ ? accessors.setAccessor : accessors.getAccessor;
+                        var anotherAccessor = node.kind === 148 /* GetAccessor */ ? accessors.setAccessor : accessors.getAccessor;
                         type = getTypeAnnotationFromAccessor(anotherAccessor);
                         if (type) {
                             accessorWithTypeAnnotation = anotherAccessor;
@@ -31026,24 +32835,24 @@ var ts;
             }
             function getTypeAnnotationFromAccessor(accessor) {
                 if (accessor) {
-                    return accessor.kind === 146 /* GetAccessor */
+                    return accessor.kind === 148 /* GetAccessor */
                         ? accessor.type // Getter - return type
                         : accessor.parameters.length > 0
                             ? accessor.parameters[0].type // Setter parameter type
                             : undefined;
                 }
             }
-            function getAccessorDeclarationTypeVisibilityError(symbolAccesibilityResult) {
+            function getAccessorDeclarationTypeVisibilityError(symbolAccessibilityResult) {
                 var diagnosticMessage;
-                if (accessorWithTypeAnnotation.kind === 147 /* SetAccessor */) {
+                if (accessorWithTypeAnnotation.kind === 149 /* SetAccessor */) {
                     // Setters have to have type named and cannot infer it so, the type should always be named
-                    if (accessorWithTypeAnnotation.parent.flags & 64 /* Static */) {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                    if (accessorWithTypeAnnotation.parent.flags & 32 /* Static */) {
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1;
                     }
                     else {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1;
                     }
@@ -31055,16 +32864,16 @@ var ts;
                     };
                 }
                 else {
-                    if (accessorWithTypeAnnotation.flags & 64 /* Static */) {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                    if (accessorWithTypeAnnotation.flags & 32 /* Static */) {
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.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 :
                                 ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0;
                     }
                     else {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
                                 ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0;
@@ -31085,17 +32894,17 @@ var ts;
             // so no need to verify if the declaration is visible
             if (!resolver.isImplementationOfOverload(node)) {
                 emitJsDocComments(node);
-                if (node.kind === 216 /* FunctionDeclaration */) {
+                if (node.kind === 219 /* FunctionDeclaration */) {
                     emitModuleElementDeclarationFlags(node);
                 }
-                else if (node.kind === 144 /* MethodDeclaration */) {
-                    emitClassMemberDeclarationFlags(node);
+                else if (node.kind === 146 /* MethodDeclaration */ || node.kind === 147 /* Constructor */) {
+                    emitClassMemberDeclarationFlags(node.flags);
                 }
-                if (node.kind === 216 /* FunctionDeclaration */) {
+                if (node.kind === 219 /* FunctionDeclaration */) {
                     write("function ");
                     writeTextOfNode(currentText, node.name);
                 }
-                else if (node.kind === 145 /* Constructor */) {
+                else if (node.kind === 147 /* Constructor */) {
                     write("constructor");
                 }
                 else {
@@ -31114,35 +32923,37 @@ var ts;
         function emitSignatureDeclaration(node) {
             var prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
-            // Construct signature or constructor type write new Signature
-            if (node.kind === 149 /* ConstructSignature */ || node.kind === 154 /* ConstructorType */) {
-                write("new ");
-            }
-            emitTypeParameters(node.typeParameters);
-            if (node.kind === 150 /* IndexSignature */) {
+            if (node.kind === 152 /* IndexSignature */) {
+                // Index signature can have readonly modifier
+                emitClassMemberDeclarationFlags(node.flags);
                 write("[");
             }
             else {
+                // Construct signature or constructor type write new Signature
+                if (node.kind === 151 /* ConstructSignature */ || node.kind === 156 /* ConstructorType */) {
+                    write("new ");
+                }
+                emitTypeParameters(node.typeParameters);
                 write("(");
             }
             // Parameters
             emitCommaList(node.parameters, emitParameterDeclaration);
-            if (node.kind === 150 /* IndexSignature */) {
+            if (node.kind === 152 /* IndexSignature */) {
                 write("]");
             }
             else {
                 write(")");
             }
             // If this is not a constructor and is not private, emit the return type
-            var isFunctionTypeOrConstructorType = node.kind === 153 /* FunctionType */ || node.kind === 154 /* ConstructorType */;
-            if (isFunctionTypeOrConstructorType || node.parent.kind === 156 /* TypeLiteral */) {
+            var isFunctionTypeOrConstructorType = node.kind === 155 /* FunctionType */ || node.kind === 156 /* ConstructorType */;
+            if (isFunctionTypeOrConstructorType || node.parent.kind === 158 /* TypeLiteral */) {
                 // Emit type literal signature return type only if specified
                 if (node.type) {
                     write(isFunctionTypeOrConstructorType ? " => " : ": ");
                     emitType(node.type);
                 }
             }
-            else if (node.kind !== 145 /* Constructor */ && !(node.flags & 16 /* Private */)) {
+            else if (node.kind !== 147 /* Constructor */ && !(node.flags & 8 /* Private */)) {
                 writeReturnTypeAtSignature(node, getReturnTypeVisibilityError);
             }
             enclosingDeclaration = prevEnclosingDeclaration;
@@ -31150,53 +32961,53 @@ var ts;
                 write(";");
                 writeLine();
             }
-            function getReturnTypeVisibilityError(symbolAccesibilityResult) {
+            function getReturnTypeVisibilityError(symbolAccessibilityResult) {
                 var diagnosticMessage;
                 switch (node.kind) {
-                    case 149 /* ConstructSignature */:
+                    case 151 /* ConstructSignature */:
                         // Interfaces cannot have return types that cannot be named
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0;
                         break;
-                    case 148 /* CallSignature */:
+                    case 150 /* CallSignature */:
                         // Interfaces cannot have return types that cannot be named
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0;
                         break;
-                    case 150 /* IndexSignature */:
+                    case 152 /* IndexSignature */:
                         // Interfaces cannot have return types that cannot be named
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0;
                         break;
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
-                        if (node.flags & 64 /* Static */) {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
+                        if (node.flags & 32 /* Static */) {
+                            diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                                symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                     ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
                                     ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                                 ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0;
                         }
-                        else if (node.parent.kind === 217 /* ClassDeclaration */) {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                        else if (node.parent.kind === 220 /* ClassDeclaration */) {
+                            diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                                symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                     ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
                                     ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                                 ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0;
                         }
                         else {
                             // Interfaces cannot have return types that cannot be named
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                            diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                                 ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                                 ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
                         }
                         break;
-                    case 216 /* FunctionDeclaration */:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                    case 219 /* FunctionDeclaration */:
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
                                 ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_private_name_0;
@@ -31229,65 +33040,65 @@ var ts;
                 write("?");
             }
             decreaseIndent();
-            if (node.parent.kind === 153 /* FunctionType */ ||
-                node.parent.kind === 154 /* ConstructorType */ ||
-                node.parent.parent.kind === 156 /* TypeLiteral */) {
+            if (node.parent.kind === 155 /* FunctionType */ ||
+                node.parent.kind === 156 /* ConstructorType */ ||
+                node.parent.parent.kind === 158 /* TypeLiteral */) {
                 emitTypeOfVariableDeclarationFromTypeLiteral(node);
             }
-            else if (!(node.parent.flags & 16 /* Private */)) {
+            else if (!(node.parent.flags & 8 /* Private */)) {
                 writeTypeOfDeclaration(node, node.type, getParameterDeclarationTypeVisibilityError);
             }
-            function getParameterDeclarationTypeVisibilityError(symbolAccesibilityResult) {
-                var diagnosticMessage = getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult);
+            function getParameterDeclarationTypeVisibilityError(symbolAccessibilityResult) {
+                var diagnosticMessage = getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult);
                 return diagnosticMessage !== undefined ? {
                     diagnosticMessage: diagnosticMessage,
                     errorNode: node,
                     typeName: node.name
                 } : undefined;
             }
-            function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult) {
+            function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
                 switch (node.parent.kind) {
-                    case 145 /* Constructor */:
-                        return symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                    case 147 /* Constructor */:
+                        return symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                 ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1;
-                    case 149 /* ConstructSignature */:
+                    case 151 /* ConstructSignature */:
                         // Interfaces cannot have parameter types that cannot be named
-                        return symbolAccesibilityResult.errorModuleName ?
+                        return symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
-                    case 148 /* CallSignature */:
+                    case 150 /* CallSignature */:
                         // Interfaces cannot have parameter types that cannot be named
-                        return symbolAccesibilityResult.errorModuleName ?
+                        return symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
-                        if (node.parent.flags & 64 /* Static */) {
-                            return symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
+                        if (node.parent.flags & 32 /* Static */) {
+                            return symbolAccessibilityResult.errorModuleName ?
+                                symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                     ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                     ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                                 ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                         }
-                        else if (node.parent.parent.kind === 217 /* ClassDeclaration */) {
-                            return symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                        else if (node.parent.parent.kind === 220 /* ClassDeclaration */) {
+                            return symbolAccessibilityResult.errorModuleName ?
+                                symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                     ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                     ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                                 ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
                         }
                         else {
                             // Interfaces cannot have parameter types that cannot be named
-                            return symbolAccesibilityResult.errorModuleName ?
+                            return symbolAccessibilityResult.errorModuleName ?
                                 ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                                 ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                         }
-                    case 216 /* FunctionDeclaration */:
-                        return symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                    case 219 /* FunctionDeclaration */:
+                        return symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                 ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_private_name_1;
@@ -31297,12 +33108,12 @@ var ts;
             }
             function emitBindingPattern(bindingPattern) {
                 // We have to explicitly emit square bracket and bracket because these tokens are not store inside the node.
-                if (bindingPattern.kind === 164 /* ObjectBindingPattern */) {
+                if (bindingPattern.kind === 166 /* ObjectBindingPattern */) {
                     write("{");
                     emitCommaList(bindingPattern.elements, emitBindingElement);
                     write("}");
                 }
-                else if (bindingPattern.kind === 165 /* ArrayBindingPattern */) {
+                else if (bindingPattern.kind === 167 /* ArrayBindingPattern */) {
                     write("[");
                     var elements = bindingPattern.elements;
                     emitCommaList(elements, emitBindingElement);
@@ -31313,7 +33124,7 @@ var ts;
                 }
             }
             function emitBindingElement(bindingElement) {
-                if (bindingElement.kind === 190 /* OmittedExpression */) {
+                if (bindingElement.kind === 192 /* OmittedExpression */) {
                     // If bindingElement is an omittedExpression (i.e. containing elision),
                     // we will emit blank space (although this may differ from users' original code,
                     // it allows emitSeparatedList to write separator appropriately)
@@ -31322,7 +33133,7 @@ var ts;
                     //      emit    : function foo([ , x,  , ]) {}
                     write(" ");
                 }
-                else if (bindingElement.kind === 166 /* BindingElement */) {
+                else if (bindingElement.kind === 168 /* BindingElement */) {
                     if (bindingElement.propertyName) {
                         // bindingElement has propertyName property in the following case:
                         //      { y: [a,b,c] ...} -> bindingPattern will have a property called propertyName for "y"
@@ -31361,40 +33172,40 @@ var ts;
         }
         function emitNode(node) {
             switch (node.kind) {
-                case 216 /* FunctionDeclaration */:
-                case 221 /* ModuleDeclaration */:
-                case 224 /* ImportEqualsDeclaration */:
-                case 218 /* InterfaceDeclaration */:
-                case 217 /* ClassDeclaration */:
-                case 219 /* TypeAliasDeclaration */:
-                case 220 /* EnumDeclaration */:
+                case 219 /* FunctionDeclaration */:
+                case 224 /* ModuleDeclaration */:
+                case 228 /* ImportEqualsDeclaration */:
+                case 221 /* InterfaceDeclaration */:
+                case 220 /* ClassDeclaration */:
+                case 222 /* TypeAliasDeclaration */:
+                case 223 /* EnumDeclaration */:
                     return emitModuleElement(node, isModuleElementVisible(node));
-                case 196 /* VariableStatement */:
+                case 199 /* VariableStatement */:
                     return emitModuleElement(node, isVariableStatementVisible(node));
-                case 225 /* ImportDeclaration */:
+                case 229 /* ImportDeclaration */:
                     // Import declaration without import clause is visible, otherwise it is not visible
                     return emitModuleElement(node, /*isModuleElementVisible*/ !node.importClause);
-                case 231 /* ExportDeclaration */:
+                case 235 /* ExportDeclaration */:
                     return emitExportDeclaration(node);
-                case 145 /* Constructor */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
+                case 147 /* Constructor */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
                     return writeFunctionDeclaration(node);
-                case 149 /* ConstructSignature */:
-                case 148 /* CallSignature */:
-                case 150 /* IndexSignature */:
+                case 151 /* ConstructSignature */:
+                case 150 /* CallSignature */:
+                case 152 /* IndexSignature */:
                     return emitSignatureDeclarationWithJsDocComments(node);
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
                     return emitAccessorDeclaration(node);
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
                     return emitPropertyDeclaration(node);
-                case 250 /* EnumMember */:
+                case 254 /* EnumMember */:
                     return emitEnumMemberDeclaration(node);
-                case 230 /* ExportAssignment */:
+                case 234 /* ExportAssignment */:
                     return emitExportAssignment(node);
-                case 251 /* SourceFile */:
+                case 255 /* SourceFile */:
                     return emitSourceFile(node);
             }
         }
@@ -31417,7 +33228,7 @@ var ts;
             if (declFileName) {
                 declFileName = ts.getRelativePathToDirectoryOrUrl(ts.getDirectoryPath(ts.normalizeSlashes(declarationFilePath)), declFileName, host.getCurrentDirectory(), host.getCanonicalFileName, 
                 /*isAbsolutePathAnUrl*/ false);
-                referencePathsOutput += "/// <reference path=\"" + declFileName + "\" />" + newLine;
+                referencePathsOutput += '/// <reference path="' + declFileName + '" />' + newLine;
             }
             return addedBundledEmitReference;
             function getDeclFileName(emitFileNames, sourceFiles, isBundledEmit) {
@@ -31744,21 +33555,28 @@ var ts;
         TempFlags[TempFlags["CountMask"] = 268435455] = "CountMask";
         TempFlags[TempFlags["_i"] = 268435456] = "_i";
     })(TempFlags || (TempFlags = {}));
+    var CopyDirection;
+    (function (CopyDirection) {
+        CopyDirection[CopyDirection["ToOriginal"] = 0] = "ToOriginal";
+        CopyDirection[CopyDirection["ToOutParameter"] = 1] = "ToOutParameter";
+    })(CopyDirection || (CopyDirection = {}));
     // targetSourceFile is when users only want one file in entire project to be emitted. This is used in compileOnSave feature
     function emitFiles(resolver, host, targetSourceFile) {
         // emit output for the __extends helper function
         var extendsHelper = "\nvar __extends = (this && this.__extends) || function (d, b) {\n    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];\n    function __() { this.constructor = d; }\n    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());\n};";
+        var assignHelper = "\nvar __assign = (this && this.__assign) || Object.assign || function(t) {\n    for (var s, i = 1, n = arguments.length; i < n; i++) {\n        s = arguments[i];\n        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))\n            t[p] = s[p];\n    }\n    return t;\n};";
         // emit output for the __decorate helper function
         var decorateHelper = "\nvar __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {\n    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;\n    if (typeof Reflect === \"object\" && typeof Reflect.decorate === \"function\") r = Reflect.decorate(decorators, target, key, desc);\n    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;\n    return c > 3 && r && Object.defineProperty(target, key, r), r;\n};";
         // emit output for the __metadata helper function
         var metadataHelper = "\nvar __metadata = (this && this.__metadata) || function (k, v) {\n    if (typeof Reflect === \"object\" && typeof Reflect.metadata === \"function\") return Reflect.metadata(k, v);\n};";
         // emit output for the __param helper function
         var paramHelper = "\nvar __param = (this && this.__param) || function (paramIndex, decorator) {\n    return function (target, key) { decorator(target, key, paramIndex); }\n};";
-        var awaiterHelper = "\nvar __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n    return new P(function (resolve, reject) {\n        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n        function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }\n        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }\n        step((generator = generator.call(thisArg, _arguments)).next());\n    });\n};";
+        var awaiterHelper = "\nvar __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n    return new (P || (P = Promise))(function (resolve, reject) {\n        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n        function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }\n        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }\n        step((generator = generator.apply(thisArg, _arguments)).next());\n    });\n};";
         var compilerOptions = host.getCompilerOptions();
         var languageVersion = ts.getEmitScriptTarget(compilerOptions);
         var modulekind = ts.getEmitModuleKind(compilerOptions);
         var sourceMapDataList = compilerOptions.sourceMap || compilerOptions.inlineSourceMap ? [] : undefined;
+        var emittedFilesList = compilerOptions.listEmittedFiles ? [] : undefined;
         var emitterDiagnostics = ts.createDiagnosticCollection();
         var emitSkipped = false;
         var newLine = host.getNewLine();
@@ -31767,6 +33585,7 @@ var ts;
         return {
             emitSkipped: emitSkipped,
             diagnostics: emitterDiagnostics.getDiagnostics(),
+            emittedFiles: emittedFilesList,
             sourceMaps: sourceMapDataList
         };
         function isUniqueLocalName(name, container) {
@@ -31830,11 +33649,14 @@ var ts;
             // =>
             // var x;... exporter("x", x = 1)
             var exportFunctionForFile;
+            var contextObjectForFile;
             var generatedNameSet;
             var nodeToGeneratedName;
             var computedPropertyNamesToGeneratedNames;
+            var decoratedClassAliases;
             var convertedLoopState;
             var extendsEmitted;
+            var assignEmitted;
             var decorateEmitted;
             var paramEmitted;
             var awaiterEmitted;
@@ -31854,19 +33676,19 @@ var ts;
             var emitLeadingCommentsOfPosition = compilerOptions.removeComments ? function (pos) { } : emitLeadingCommentsOfPositionWorker;
             var setSourceMapWriterEmit = compilerOptions.sourceMap || compilerOptions.inlineSourceMap ? changeSourceMapEmit : function (writer) { };
             var moduleEmitDelegates = (_a = {},
-                _a[5 /* ES6 */] = emitES6Module,
-                _a[2 /* AMD */] = emitAMDModule,
-                _a[4 /* System */] = emitSystemModule,
-                _a[3 /* UMD */] = emitUMDModule,
-                _a[1 /* CommonJS */] = emitCommonJSModule,
+                _a[ts.ModuleKind.ES6] = emitES6Module,
+                _a[ts.ModuleKind.AMD] = emitAMDModule,
+                _a[ts.ModuleKind.System] = emitSystemModule,
+                _a[ts.ModuleKind.UMD] = emitUMDModule,
+                _a[ts.ModuleKind.CommonJS] = emitCommonJSModule,
                 _a
             );
             var bundleEmitDelegates = (_b = {},
-                _b[5 /* ES6 */] = function () { },
-                _b[2 /* AMD */] = emitAMDModule,
-                _b[4 /* System */] = emitSystemModule,
-                _b[3 /* UMD */] = function () { },
-                _b[1 /* CommonJS */] = function () { },
+                _b[ts.ModuleKind.ES6] = function () { },
+                _b[ts.ModuleKind.AMD] = emitAMDModule,
+                _b[ts.ModuleKind.System] = emitSystemModule,
+                _b[ts.ModuleKind.UMD] = function () { },
+                _b[ts.ModuleKind.CommonJS] = function () { },
                 _b
             );
             return doEmit;
@@ -31874,6 +33696,7 @@ var ts;
                 sourceMap.initialize(jsFilePath, sourceMapFilePath, sourceFiles, isBundledEmit);
                 generatedNameSet = {};
                 nodeToGeneratedName = [];
+                decoratedClassAliases = [];
                 isOwnFileEmit = !isBundledEmit;
                 // Emit helpers from all the files
                 if (isBundledEmit && modulekind) {
@@ -31886,7 +33709,7 @@ var ts;
                 if (sourceMappingURL) {
                     write("//# sourceMappingURL=" + sourceMappingURL);
                 }
-                writeEmittedFiles(writer.getText(), jsFilePath, sourceMapFilePath, /*writeByteOrderMark*/ compilerOptions.emitBOM);
+                writeEmittedFiles(writer.getText(), jsFilePath, sourceMapFilePath, /*writeByteOrderMark*/ compilerOptions.emitBOM, sourceFiles);
                 // reset the state
                 sourceMap.reset();
                 writer.reset();
@@ -31894,14 +33717,17 @@ var ts;
                 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;
@@ -31920,6 +33746,7 @@ var ts;
                 currentText = sourceFile.text;
                 currentLineMap = ts.getLineStarts(sourceFile);
                 exportFunctionForFile = undefined;
+                contextObjectForFile = undefined;
                 isEs6Module = sourceFile.symbol && sourceFile.symbol.exports && !!sourceFile.symbol.exports["___esModule"];
                 renamedDependencies = sourceFile.renamedDependencies;
                 currentFileIdentifiers = sourceFile.identifiers;
@@ -31937,10 +33764,10 @@ var ts;
             // Note that names generated by makeTempVariableName and makeUniqueName will never conflict.
             function makeTempVariableName(flags) {
                 if (flags && !(tempFlags & flags)) {
-                    var name_22 = flags === 268435456 /* _i */ ? "_i" : "_n";
-                    if (isUniqueName(name_22)) {
+                    var name_23 = flags === 268435456 /* _i */ ? "_i" : "_n";
+                    if (isUniqueName(name_23)) {
                         tempFlags |= flags;
-                        return name_22;
+                        return name_23;
                     }
                 }
                 while (true) {
@@ -31948,9 +33775,9 @@ var ts;
                     tempFlags++;
                     // Skip over 'i' and 'n'
                     if (count !== 8 && count !== 13) {
-                        var name_23 = count < 26 ? "_" + String.fromCharCode(97 /* a */ + count) : "_" + (count - 26);
-                        if (isUniqueName(name_23)) {
-                            return name_23;
+                        var name_24 = count < 26 ? "_" + String.fromCharCode(97 /* a */ + count) : "_" + (count - 26);
+                        if (isUniqueName(name_24)) {
+                            return name_24;
                         }
                     }
                 }
@@ -31994,17 +33821,17 @@ var ts;
                 switch (node.kind) {
                     case 69 /* Identifier */:
                         return makeUniqueName(node.text);
-                    case 221 /* ModuleDeclaration */:
-                    case 220 /* EnumDeclaration */:
+                    case 224 /* ModuleDeclaration */:
+                    case 223 /* EnumDeclaration */:
                         return generateNameForModuleOrEnum(node);
-                    case 225 /* ImportDeclaration */:
-                    case 231 /* ExportDeclaration */:
+                    case 229 /* ImportDeclaration */:
+                    case 235 /* ExportDeclaration */:
                         return generateNameForImportOrExportDeclaration(node);
-                    case 216 /* FunctionDeclaration */:
-                    case 217 /* ClassDeclaration */:
-                    case 230 /* ExportAssignment */:
+                    case 219 /* FunctionDeclaration */:
+                    case 220 /* ClassDeclaration */:
+                    case 234 /* ExportAssignment */:
                         return generateNameForExportDefault();
-                    case 189 /* ClassExpression */:
+                    case 191 /* ClassExpression */:
                         return generateNameForClassExpression();
                 }
             }
@@ -32013,14 +33840,14 @@ var ts;
                 return nodeToGeneratedName[id] || (nodeToGeneratedName[id] = ts.unescapeIdentifier(generateNameForNode(node)));
             }
             /** Write emitted output to disk */
-            function writeEmittedFiles(emitOutput, jsFilePath, sourceMapFilePath, writeByteOrderMark) {
+            function writeEmittedFiles(emitOutput, jsFilePath, sourceMapFilePath, writeByteOrderMark, sourceFiles) {
                 if (compilerOptions.sourceMap && !compilerOptions.inlineSourceMap) {
-                    ts.writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(), /*writeByteOrderMark*/ false);
+                    ts.writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(), /*writeByteOrderMark*/ false, sourceFiles);
                 }
                 if (sourceMapDataList) {
                     sourceMapDataList.push(sourceMap.getSourceMapData());
                 }
-                ts.writeFile(host, emitterDiagnostics, jsFilePath, emitOutput, writeByteOrderMark);
+                ts.writeFile(host, emitterDiagnostics, jsFilePath, emitOutput, writeByteOrderMark, sourceFiles);
             }
             // Create a temporary variable with a unique unused name.
             function createTempVariable(flags) {
@@ -32199,7 +34026,7 @@ var ts;
                 // 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 < 2 /* ES6 */ && (ts.isTemplateLiteralKind(node.kind) || node.hasExtendedUnicodeEscape)) {
-                    return getQuotedEscapedLiteralText("\"", node.text, "\"");
+                    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.
@@ -32210,7 +34037,7 @@ var ts;
                 // or an escaped quoted form of the original text if it's string-like.
                 switch (node.kind) {
                     case 9 /* StringLiteral */:
-                        return getQuotedEscapedLiteralText("\"", node.text, "\"");
+                        return getQuotedEscapedLiteralText('"', node.text, '"');
                     case 11 /* NoSubstitutionTemplateLiteral */:
                         return getQuotedEscapedLiteralText("`", node.text, "`");
                     case 12 /* TemplateHead */:
@@ -32232,7 +34059,7 @@ var ts;
                 // 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".
                 var text = ts.getTextOfNodeFromSourceText(currentText, node);
-                // text contains the original source, it will also contain quotes ("`"), dolar signs and braces ("${" and "}"),
+                // 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 "${"
@@ -32274,10 +34101,10 @@ var ts;
                 write("(");
                 emit(tempVariable);
                 // Now we emit the expressions
-                if (node.template.kind === 186 /* TemplateExpression */) {
+                if (node.template.kind === 188 /* TemplateExpression */) {
                     ts.forEach(node.template.templateSpans, function (templateSpan) {
                         write(", ");
-                        var needsParens = templateSpan.expression.kind === 184 /* BinaryExpression */
+                        var needsParens = templateSpan.expression.kind === 186 /* BinaryExpression */
                             && templateSpan.expression.operatorToken.kind === 24 /* CommaToken */;
                         emitParenthesizedIf(templateSpan.expression, needsParens);
                     });
@@ -32312,7 +34139,7 @@ var ts;
                     //    ("abc" + 1) << (2 + "")
                     // rather than
                     //    "abc" + (1 << 2) + ""
-                    var needsParens = templateSpan.expression.kind !== 175 /* ParenthesizedExpression */
+                    var needsParens = templateSpan.expression.kind !== 177 /* ParenthesizedExpression */
                         && comparePrecedenceToBinaryPlus(templateSpan.expression) !== 1 /* GreaterThan */;
                     if (i > 0 || headEmitted) {
                         // If this is the first span and the head was not emitted, then this templateSpan's
@@ -32354,11 +34181,11 @@ var ts;
                 }
                 function templateNeedsParens(template, parent) {
                     switch (parent.kind) {
-                        case 171 /* CallExpression */:
-                        case 172 /* NewExpression */:
+                        case 173 /* CallExpression */:
+                        case 174 /* NewExpression */:
                             return parent.expression === template;
-                        case 173 /* TaggedTemplateExpression */:
-                        case 175 /* ParenthesizedExpression */:
+                        case 175 /* TaggedTemplateExpression */:
+                        case 177 /* ParenthesizedExpression */:
                             return false;
                         default:
                             return comparePrecedenceToBinaryPlus(parent) !== -1 /* LessThan */;
@@ -32379,7 +34206,7 @@ var ts;
                     // 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 184 /* BinaryExpression */:
+                        case 186 /* BinaryExpression */:
                             switch (expression.operatorToken.kind) {
                                 case 37 /* AsteriskToken */:
                                 case 39 /* SlashToken */:
@@ -32391,8 +34218,8 @@ var ts;
                                 default:
                                     return -1 /* LessThan */;
                             }
-                        case 187 /* YieldExpression */:
-                        case 185 /* ConditionalExpression */:
+                        case 189 /* YieldExpression */:
+                        case 187 /* ConditionalExpression */:
                             return -1 /* LessThan */;
                         default:
                             return 1 /* GreaterThan */;
@@ -32408,9 +34235,9 @@ var ts;
                 /// 'Div' for upper-cased or dotted names
                 function emitTagName(name) {
                     if (name.kind === 69 /* Identifier */ && ts.isIntrinsicJsxName(name.text)) {
-                        write("\"");
+                        write('"');
                         emit(name);
-                        write("\"");
+                        write('"');
                     }
                     else {
                         emit(name);
@@ -32424,9 +34251,9 @@ var ts;
                         emit(name);
                     }
                     else {
-                        write("\"");
+                        write('"');
                         emit(name);
-                        write("\"");
+                        write('"');
                     }
                 }
                 /// Emit an name/value pair for an attribute (e.g. "x: 3")
@@ -32457,14 +34284,13 @@ var ts;
                     }
                     else {
                         // Either emit one big object literal (no spread attribs), or
-                        // a call to React.__spread
+                        // a call to the __assign helper
                         var attrs = openingNode.attributes;
-                        if (ts.forEach(attrs, function (attr) { return attr.kind === 242 /* JsxSpreadAttribute */; })) {
-                            emitExpressionIdentifier(syntheticReactRef);
-                            write(".__spread(");
+                        if (ts.forEach(attrs, function (attr) { return attr.kind === 246 /* JsxSpreadAttribute */; })) {
+                            write("__assign(");
                             var haveOpenedObjectLiteral = false;
                             for (var i = 0; i < attrs.length; i++) {
-                                if (attrs[i].kind === 242 /* JsxSpreadAttribute */) {
+                                if (attrs[i].kind === 246 /* JsxSpreadAttribute */) {
                                     // If this is the first argument, we need to emit a {} as the first argument
                                     if (i === 0) {
                                         write("{}, ");
@@ -32479,7 +34305,7 @@ var ts;
                                     emit(attrs[i].expression);
                                 }
                                 else {
-                                    ts.Debug.assert(attrs[i].kind === 241 /* JsxAttribute */);
+                                    ts.Debug.assert(attrs[i].kind === 245 /* JsxAttribute */);
                                     if (haveOpenedObjectLiteral) {
                                         write(", ");
                                     }
@@ -32511,23 +34337,45 @@ var ts;
                     }
                     // Children
                     if (children) {
-                        for (var i = 0; i < children.length; i++) {
-                            // Don't emit empty expressions
-                            if (children[i].kind === 243 /* JsxExpression */ && !(children[i].expression)) {
-                                continue;
-                            }
-                            // Don't emit empty strings
-                            if (children[i].kind === 239 /* JsxText */) {
-                                var text = getTextToEmit(children[i]);
-                                if (text !== undefined) {
-                                    write(", \"");
-                                    write(text);
-                                    write("\"");
+                        var firstChild = void 0;
+                        var multipleEmittableChildren = false;
+                        for (var i = 0, n = children.length; i < n; i++) {
+                            var 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 !== 240 /* JsxElement */ && firstChild.kind !== 241 /* JsxSelfClosingElement */) {
+                                emit(firstChild);
+                            }
                             else {
-                                write(", ");
-                                emit(children[i]);
+                                // If the only child is jsx element, put it on a new indented line
+                                increaseIndent();
+                                writeLine();
+                                emit(firstChild);
+                                writeLine();
+                                decreaseIndent();
                             }
                         }
                     }
@@ -32535,11 +34383,11 @@ var ts;
                     write(")"); // closes "React.createElement("
                     emitTrailingComments(openingNode);
                 }
-                if (node.kind === 236 /* JsxElement */) {
+                if (node.kind === 240 /* JsxElement */) {
                     emitJsxElement(node.openingElement, node.children);
                 }
                 else {
-                    ts.Debug.assert(node.kind === 237 /* JsxSelfClosingElement */);
+                    ts.Debug.assert(node.kind === 241 /* JsxSelfClosingElement */);
                     emitJsxElement(node);
                 }
             }
@@ -32561,11 +34409,11 @@ var ts;
                         if (i > 0) {
                             write(" ");
                         }
-                        if (attribs[i].kind === 242 /* JsxSpreadAttribute */) {
+                        if (attribs[i].kind === 246 /* JsxSpreadAttribute */) {
                             emitJsxSpreadAttribute(attribs[i]);
                         }
                         else {
-                            ts.Debug.assert(attribs[i].kind === 241 /* JsxAttribute */);
+                            ts.Debug.assert(attribs[i].kind === 245 /* JsxAttribute */);
                             emitJsxAttribute(attribs[i]);
                         }
                     }
@@ -32573,11 +34421,11 @@ var ts;
                 function emitJsxOpeningOrSelfClosingElement(node) {
                     write("<");
                     emit(node.tagName);
-                    if (node.attributes.length > 0 || (node.kind === 237 /* JsxSelfClosingElement */)) {
+                    if (node.attributes.length > 0 || (node.kind === 241 /* JsxSelfClosingElement */)) {
                         write(" ");
                     }
                     emitAttributes(node.attributes);
-                    if (node.kind === 237 /* JsxSelfClosingElement */) {
+                    if (node.kind === 241 /* JsxSelfClosingElement */) {
                         write("/>");
                     }
                     else {
@@ -32596,11 +34444,11 @@ var ts;
                     }
                     emitJsxClosingElement(node.closingElement);
                 }
-                if (node.kind === 236 /* JsxElement */) {
+                if (node.kind === 240 /* JsxElement */) {
                     emitJsxElement(node);
                 }
                 else {
-                    ts.Debug.assert(node.kind === 237 /* JsxSelfClosingElement */);
+                    ts.Debug.assert(node.kind === 241 /* JsxSelfClosingElement */);
                     emitJsxOpeningOrSelfClosingElement(node);
                 }
             }
@@ -32608,11 +34456,11 @@ var ts;
             // 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) {
-                ts.Debug.assert(node.kind !== 166 /* BindingElement */);
+                ts.Debug.assert(node.kind !== 168 /* BindingElement */);
                 if (node.kind === 9 /* StringLiteral */) {
                     emitLiteral(node);
                 }
-                else if (node.kind === 137 /* ComputedPropertyName */) {
+                else if (node.kind === 139 /* 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:
@@ -32643,89 +34491,86 @@ var ts;
                     emit(node.expression);
                 }
                 else {
-                    write("\"");
+                    write('"');
                     if (node.kind === 8 /* NumericLiteral */) {
                         write(node.text);
                     }
                     else {
                         writeTextOfNode(currentText, node);
                     }
-                    write("\"");
+                    write('"');
                 }
             }
             function isExpressionIdentifier(node) {
                 var parent = node.parent;
                 switch (parent.kind) {
-                    case 167 /* ArrayLiteralExpression */:
-                    case 192 /* AsExpression */:
-                    case 184 /* BinaryExpression */:
-                    case 171 /* CallExpression */:
-                    case 244 /* CaseClause */:
-                    case 137 /* ComputedPropertyName */:
-                    case 185 /* ConditionalExpression */:
-                    case 140 /* Decorator */:
-                    case 178 /* DeleteExpression */:
-                    case 200 /* DoStatement */:
-                    case 170 /* ElementAccessExpression */:
-                    case 230 /* ExportAssignment */:
-                    case 198 /* ExpressionStatement */:
-                    case 191 /* ExpressionWithTypeArguments */:
-                    case 202 /* ForStatement */:
-                    case 203 /* ForInStatement */:
-                    case 204 /* ForOfStatement */:
-                    case 199 /* IfStatement */:
-                    case 240 /* JsxClosingElement */:
-                    case 237 /* JsxSelfClosingElement */:
-                    case 238 /* JsxOpeningElement */:
-                    case 242 /* JsxSpreadAttribute */:
-                    case 243 /* JsxExpression */:
-                    case 172 /* NewExpression */:
-                    case 175 /* ParenthesizedExpression */:
-                    case 183 /* PostfixUnaryExpression */:
-                    case 182 /* PrefixUnaryExpression */:
-                    case 207 /* ReturnStatement */:
-                    case 249 /* ShorthandPropertyAssignment */:
-                    case 188 /* SpreadElementExpression */:
-                    case 209 /* SwitchStatement */:
-                    case 173 /* TaggedTemplateExpression */:
-                    case 193 /* TemplateSpan */:
-                    case 211 /* ThrowStatement */:
-                    case 174 /* TypeAssertionExpression */:
-                    case 179 /* TypeOfExpression */:
-                    case 180 /* VoidExpression */:
-                    case 201 /* WhileStatement */:
-                    case 208 /* WithStatement */:
-                    case 187 /* YieldExpression */:
+                    case 169 /* ArrayLiteralExpression */:
+                    case 194 /* AsExpression */:
+                    case 186 /* BinaryExpression */:
+                    case 173 /* CallExpression */:
+                    case 248 /* CaseClause */:
+                    case 139 /* ComputedPropertyName */:
+                    case 187 /* ConditionalExpression */:
+                    case 142 /* Decorator */:
+                    case 180 /* DeleteExpression */:
+                    case 203 /* DoStatement */:
+                    case 172 /* ElementAccessExpression */:
+                    case 234 /* ExportAssignment */:
+                    case 201 /* ExpressionStatement */:
+                    case 193 /* ExpressionWithTypeArguments */:
+                    case 205 /* ForStatement */:
+                    case 206 /* ForInStatement */:
+                    case 207 /* ForOfStatement */:
+                    case 202 /* IfStatement */:
+                    case 244 /* JsxClosingElement */:
+                    case 241 /* JsxSelfClosingElement */:
+                    case 242 /* JsxOpeningElement */:
+                    case 246 /* JsxSpreadAttribute */:
+                    case 247 /* JsxExpression */:
+                    case 174 /* NewExpression */:
+                    case 195 /* NonNullExpression */:
+                    case 177 /* ParenthesizedExpression */:
+                    case 185 /* PostfixUnaryExpression */:
+                    case 184 /* PrefixUnaryExpression */:
+                    case 210 /* ReturnStatement */:
+                    case 253 /* ShorthandPropertyAssignment */:
+                    case 190 /* SpreadElementExpression */:
+                    case 212 /* SwitchStatement */:
+                    case 175 /* TaggedTemplateExpression */:
+                    case 196 /* TemplateSpan */:
+                    case 214 /* ThrowStatement */:
+                    case 176 /* TypeAssertionExpression */:
+                    case 181 /* TypeOfExpression */:
+                    case 182 /* VoidExpression */:
+                    case 204 /* WhileStatement */:
+                    case 211 /* WithStatement */:
+                    case 189 /* YieldExpression */:
                         return true;
-                    case 166 /* BindingElement */:
-                    case 250 /* EnumMember */:
-                    case 139 /* Parameter */:
-                    case 248 /* PropertyAssignment */:
-                    case 142 /* PropertyDeclaration */:
-                    case 214 /* VariableDeclaration */:
+                    case 168 /* BindingElement */:
+                    case 254 /* EnumMember */:
+                    case 141 /* Parameter */:
+                    case 252 /* PropertyAssignment */:
+                    case 144 /* PropertyDeclaration */:
+                    case 217 /* VariableDeclaration */:
                         return parent.initializer === node;
-                    case 169 /* PropertyAccessExpression */:
+                    case 171 /* PropertyAccessExpression */:
                         return parent.expression === node;
-                    case 177 /* ArrowFunction */:
-                    case 176 /* FunctionExpression */:
+                    case 179 /* ArrowFunction */:
+                    case 178 /* FunctionExpression */:
                         return parent.body === node;
-                    case 224 /* ImportEqualsDeclaration */:
+                    case 228 /* ImportEqualsDeclaration */:
                         return parent.moduleReference === node;
-                    case 136 /* QualifiedName */:
+                    case 138 /* QualifiedName */:
                         return parent.left === node;
                 }
                 return false;
             }
             function emitExpressionIdentifier(node) {
-                if (resolver.getNodeCheckFlags(node) & 2048 /* LexicalArguments */) {
-                    write("_arguments");
-                    return;
-                }
                 var container = resolver.getReferencedExportContainer(node);
                 if (container) {
-                    if (container.kind === 251 /* SourceFile */) {
+                    if (container.kind === 255 /* SourceFile */) {
                         // Identifier references module export
-                        if (modulekind !== 5 /* ES6 */ && modulekind !== 4 /* System */) {
+                        if (modulekind !== ts.ModuleKind.ES6 && modulekind !== ts.ModuleKind.System) {
                             write("exports.");
                         }
                     }
@@ -32736,22 +34581,22 @@ var ts;
                     }
                 }
                 else {
-                    if (modulekind !== 5 /* ES6 */) {
+                    if (modulekind !== ts.ModuleKind.ES6) {
                         var declaration = resolver.getReferencedImportDeclaration(node);
                         if (declaration) {
-                            if (declaration.kind === 226 /* ImportClause */) {
+                            if (declaration.kind === 230 /* ImportClause */) {
                                 // Identifier references default import
                                 write(getGeneratedNameForNode(declaration.parent));
-                                write(languageVersion === 0 /* ES3 */ ? "[\"default\"]" : ".default");
+                                write(languageVersion === 0 /* ES3 */ ? '["default"]' : ".default");
                                 return;
                             }
-                            else if (declaration.kind === 229 /* ImportSpecifier */) {
+                            else if (declaration.kind === 233 /* ImportSpecifier */) {
                                 // Identifier references named import
                                 write(getGeneratedNameForNode(declaration.parent.parent.parent));
-                                var name_24 = declaration.propertyName || declaration.name;
-                                var identifier = ts.getTextOfNodeFromSourceText(currentText, name_24);
+                                var name_25 = declaration.propertyName || declaration.name;
+                                var identifier = ts.getTextOfNodeFromSourceText(currentText, name_25);
                                 if (languageVersion === 0 /* ES3 */ && identifier === "default") {
-                                    write("[\"default\"]");
+                                    write('["default"]');
                                 }
                                 else {
                                     write(".");
@@ -32761,13 +34606,26 @@ var ts;
                             }
                         }
                     }
-                    if (languageVersion !== 2 /* ES6 */) {
-                        var declaration = resolver.getReferencedNestedRedeclaration(node);
+                    if (languageVersion < 2 /* ES6 */) {
+                        var declaration = resolver.getReferencedDeclarationWithCollidingName(node);
                         if (declaration) {
                             write(getGeneratedNameForNode(declaration.name));
                             return;
                         }
                     }
+                    else if (resolver.getNodeCheckFlags(node) & 1048576 /* 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.
+                        var declaration = resolver.getReferencedValueDeclaration(node);
+                        if (declaration) {
+                            var classAlias = decoratedClassAliases[ts.getNodeId(declaration)];
+                            if (classAlias !== undefined) {
+                                write(classAlias);
+                                return;
+                            }
+                        }
+                    }
                 }
                 if (ts.nodeIsSynthesized(node)) {
                     write(node.text);
@@ -32776,15 +34634,15 @@ var ts;
                     writeTextOfNode(currentText, node);
                 }
             }
-            function isNameOfNestedRedeclaration(node) {
+            function isNameOfNestedBlockScopedRedeclarationOrCapturedBinding(node) {
                 if (languageVersion < 2 /* ES6 */) {
-                    var parent_7 = node.parent;
-                    switch (parent_7.kind) {
-                        case 166 /* BindingElement */:
-                        case 217 /* ClassDeclaration */:
-                        case 220 /* EnumDeclaration */:
-                        case 214 /* VariableDeclaration */:
-                            return parent_7.name === node && resolver.isNestedRedeclaration(parent_7);
+                    var parent_10 = node.parent;
+                    switch (parent_10.kind) {
+                        case 168 /* BindingElement */:
+                        case 220 /* ClassDeclaration */:
+                        case 223 /* EnumDeclaration */:
+                        case 217 /* VariableDeclaration */:
+                            return parent_10.name === node && resolver.isDeclarationWithCollidingName(parent_10);
                     }
                 }
                 return false;
@@ -32793,8 +34651,8 @@ var ts;
                 if (convertedLoopState) {
                     if (node.text == "arguments" && resolver.isArgumentsLocalBinding(node)) {
                         // in converted loop body arguments cannot be used directly.
-                        var name_25 = convertedLoopState.argumentsName || (convertedLoopState.argumentsName = makeUniqueName("arguments"));
-                        write(name_25);
+                        var name_26 = convertedLoopState.argumentsName || (convertedLoopState.argumentsName = makeUniqueName("arguments"));
+                        write(name_26);
                         return;
                     }
                 }
@@ -32804,7 +34662,7 @@ var ts;
                 else if (isExpressionIdentifier(node)) {
                     emitExpressionIdentifier(node);
                 }
-                else if (isNameOfNestedRedeclaration(node)) {
+                else if (isNameOfNestedBlockScopedRedeclarationOrCapturedBinding(node)) {
                     write(getGeneratedNameForNode(node));
                 }
                 else if (ts.nodeIsSynthesized(node)) {
@@ -32894,10 +34752,10 @@ var ts;
                 }
             }
             function needsParenthesisForAwaitExpressionAsYield(node) {
-                if (node.parent.kind === 184 /* BinaryExpression */ && !ts.isAssignmentOperator(node.parent.operatorToken.kind)) {
+                if (node.parent.kind === 186 /* BinaryExpression */ && !ts.isAssignmentOperator(node.parent.operatorToken.kind)) {
                     return true;
                 }
-                else if (node.parent.kind === 185 /* ConditionalExpression */ && node.parent.condition === node) {
+                else if (node.parent.kind === 187 /* ConditionalExpression */ && node.parent.condition === node) {
                     return true;
                 }
                 return false;
@@ -32905,11 +34763,11 @@ var ts;
             function needsParenthesisForPropertyAccessOrInvocation(node) {
                 switch (node.kind) {
                     case 69 /* Identifier */:
-                    case 167 /* ArrayLiteralExpression */:
-                    case 169 /* PropertyAccessExpression */:
-                    case 170 /* ElementAccessExpression */:
-                    case 171 /* CallExpression */:
-                    case 175 /* ParenthesizedExpression */:
+                    case 169 /* ArrayLiteralExpression */:
+                    case 171 /* PropertyAccessExpression */:
+                    case 172 /* ElementAccessExpression */:
+                    case 173 /* CallExpression */:
+                    case 177 /* 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;
@@ -32929,17 +34787,17 @@ var ts;
                         write(", ");
                     }
                     var e = elements[pos];
-                    if (e.kind === 188 /* SpreadElementExpression */) {
+                    if (e.kind === 190 /* SpreadElementExpression */) {
                         e = e.expression;
                         emitParenthesizedIf(e, /*parenthesized*/ group === 0 && needsParenthesisForPropertyAccessOrInvocation(e));
                         pos++;
-                        if (pos === length && group === 0 && needsUniqueCopy && e.kind !== 167 /* ArrayLiteralExpression */) {
+                        if (pos === length && group === 0 && needsUniqueCopy && e.kind !== 169 /* ArrayLiteralExpression */) {
                             write(".slice()");
                         }
                     }
                     else {
                         var i = pos;
-                        while (i < length && elements[i].kind !== 188 /* SpreadElementExpression */) {
+                        while (i < length && elements[i].kind !== 190 /* SpreadElementExpression */) {
                             i++;
                         }
                         write("[");
@@ -32962,7 +34820,7 @@ var ts;
                 }
             }
             function isSpreadElementExpression(node) {
-                return node.kind === 188 /* SpreadElementExpression */;
+                return node.kind === 190 /* SpreadElementExpression */;
             }
             function emitArrayLiteral(node) {
                 var elements = node.elements;
@@ -32975,7 +34833,7 @@ var ts;
                     write("]");
                 }
                 else {
-                    emitListWithSpread(elements, /*needsUniqueCopy*/ true, /*multiLine*/ (node.flags & 1024 /* MultiLine */) !== 0, 
+                    emitListWithSpread(elements, /*needsUniqueCopy*/ true, /*multiLine*/ node.multiLine, 
                     /*trailingComma*/ elements.hasTrailingComma, /*useConcat*/ true);
                 }
             }
@@ -32994,7 +34852,7 @@ var ts;
                         emitLinePreservingList(node, properties, /*allowTrailingComma*/ languageVersion >= 1 /* ES5 */, /*spacesBetweenBraces*/ true);
                     }
                     else {
-                        var multiLine = (node.flags & 1024 /* MultiLine */) !== 0;
+                        var multiLine = node.multiLine;
                         if (!multiLine) {
                             write(" ");
                         }
@@ -33013,7 +34871,7 @@ var ts;
                 write("}");
             }
             function emitDownlevelObjectLiteralWithComputedProperties(node, firstComputedPropertyIndex) {
-                var multiLine = (node.flags & 1024 /* MultiLine */) !== 0;
+                var multiLine = node.multiLine;
                 var properties = node.properties;
                 write("(");
                 if (multiLine) {
@@ -33032,7 +34890,7 @@ var ts;
                     writeComma();
                     var property = properties[i];
                     emitStart(property);
-                    if (property.kind === 146 /* GetAccessor */ || property.kind === 147 /* SetAccessor */) {
+                    if (property.kind === 148 /* GetAccessor */ || property.kind === 149 /* SetAccessor */) {
                         // TODO (drosen): Reconcile with 'emitMemberFunctions'.
                         var accessors = ts.getAllAccessorDeclarations(node.properties, property);
                         if (property !== accessors.firstAccessor) {
@@ -33084,13 +34942,13 @@ var ts;
                         emitMemberAccessForPropertyName(property.name);
                         emitEnd(property.name);
                         write(" = ");
-                        if (property.kind === 248 /* PropertyAssignment */) {
+                        if (property.kind === 252 /* PropertyAssignment */) {
                             emit(property.initializer);
                         }
-                        else if (property.kind === 249 /* ShorthandPropertyAssignment */) {
+                        else if (property.kind === 253 /* ShorthandPropertyAssignment */) {
                             emitExpressionIdentifier(property.name);
                         }
-                        else if (property.kind === 144 /* MethodDeclaration */) {
+                        else if (property.kind === 146 /* MethodDeclaration */) {
                             emitFunctionDeclaration(property);
                         }
                         else {
@@ -33124,7 +34982,7 @@ var ts;
                     // Everything until that point can be emitted as part of the initial object literal.
                     var numInitialNonComputedProperties = numProperties;
                     for (var i = 0, n = properties.length; i < n; i++) {
-                        if (properties[i].name.kind === 137 /* ComputedPropertyName */) {
+                        if (properties[i].name.kind === 139 /* ComputedPropertyName */) {
                             numInitialNonComputedProperties = i;
                             break;
                         }
@@ -33140,21 +34998,21 @@ var ts;
                 emitObjectLiteralBody(node, properties.length);
             }
             function createBinaryExpression(left, operator, right, startsOnNewLine) {
-                var result = ts.createSynthesizedNode(184 /* BinaryExpression */, startsOnNewLine);
+                var result = ts.createSynthesizedNode(186 /* BinaryExpression */, startsOnNewLine);
                 result.operatorToken = ts.createSynthesizedNode(operator);
                 result.left = left;
                 result.right = right;
                 return result;
             }
             function createPropertyAccessExpression(expression, name) {
-                var result = ts.createSynthesizedNode(169 /* PropertyAccessExpression */);
+                var result = ts.createSynthesizedNode(171 /* PropertyAccessExpression */);
                 result.expression = parenthesizeForAccess(expression);
                 result.dotToken = ts.createSynthesizedNode(21 /* DotToken */);
                 result.name = name;
                 return result;
             }
             function createElementAccessExpression(expression, argumentExpression) {
-                var result = ts.createSynthesizedNode(170 /* ElementAccessExpression */);
+                var result = ts.createSynthesizedNode(172 /* ElementAccessExpression */);
                 result.expression = parenthesizeForAccess(expression);
                 result.argumentExpression = argumentExpression;
                 return result;
@@ -33162,7 +35020,9 @@ var ts;
             function parenthesizeForAccess(expr) {
                 // 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 === 174 /* TypeAssertionExpression */ || expr.kind === 192 /* AsExpression */) {
+                while (expr.kind === 176 /* TypeAssertionExpression */ ||
+                    expr.kind === 194 /* AsExpression */ ||
+                    expr.kind === 195 /* NonNullExpression */) {
                     expr = expr.expression;
                 }
                 // isLeftHandSideExpression is almost the correct criterion for when it is not necessary
@@ -33174,11 +35034,11 @@ var ts;
                 //       1.x            -> not the same as (1).x
                 //
                 if (ts.isLeftHandSideExpression(expr) &&
-                    expr.kind !== 172 /* NewExpression */ &&
+                    expr.kind !== 174 /* NewExpression */ &&
                     expr.kind !== 8 /* NumericLiteral */) {
                     return expr;
                 }
-                var node = ts.createSynthesizedNode(175 /* ParenthesizedExpression */);
+                var node = ts.createSynthesizedNode(177 /* ParenthesizedExpression */);
                 node.expression = expr;
                 return node;
             }
@@ -33213,7 +35073,12 @@ var ts;
             // Return true if identifier resolves to an exported member of a namespace
             function isNamespaceExportReference(node) {
                 var container = resolver.getReferencedExportContainer(node);
-                return container && container.kind !== 251 /* SourceFile */;
+                return container && container.kind !== 255 /* SourceFile */;
+            }
+            // Return true if identifier resolves to an imported identifier
+            function isImportedReference(node) {
+                var declaration = resolver.getReferencedImportDeclaration(node);
+                return declaration && (declaration.kind === 230 /* ImportClause */ || declaration.kind === 233 /* ImportSpecifier */);
             }
             function emitShorthandPropertyAssignment(node) {
                 // The name property of a short-hand property assignment is considered an expression position, so here
@@ -33228,7 +35093,18 @@ var ts;
                 //       let obj = { y };
                 //   }
                 // Here we need to emit obj = { y : m.y } regardless of the output target.
-                if (modulekind !== 5 /* ES6 */ || isNamespaceExportReference(node.name)) {
+                // 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 < 2 /* ES6 */ || (modulekind !== ts.ModuleKind.ES6 && isImportedReference(node.name)) || isNamespaceExportReference(node.name)) {
                     // Emit identifier as an identifier
                     write(": ");
                     emit(node.name);
@@ -33243,7 +35119,7 @@ var ts;
                 if (constantValue !== undefined) {
                     write(constantValue.toString());
                     if (!compilerOptions.removeComments) {
-                        var propertyName = node.kind === 169 /* PropertyAccessExpression */ ? ts.declarationNameToString(node.name) : ts.getTextOfNode(node.argumentExpression);
+                        var propertyName = node.kind === 171 /* PropertyAccessExpression */ ? ts.declarationNameToString(node.name) : ts.getTextOfNode(node.argumentExpression);
                         write(" /* " + propertyName + " */");
                     }
                     return true;
@@ -33254,7 +35130,7 @@ var ts;
                 if (compilerOptions.isolatedModules) {
                     return undefined;
                 }
-                return node.kind === 169 /* PropertyAccessExpression */ || node.kind === 170 /* ElementAccessExpression */
+                return node.kind === 171 /* PropertyAccessExpression */ || node.kind === 172 /* ElementAccessExpression */
                     ? resolver.getConstantValue(node)
                     : undefined;
             }
@@ -33281,6 +35157,14 @@ var ts;
                 if (tryEmitConstantValue(node)) {
                     return;
                 }
+                if (languageVersion === 2 /* ES6 */ &&
+                    node.expression.kind === 95 /* SuperKeyword */ &&
+                    isInAsyncMethodWithSuperInES6(node)) {
+                    var name_27 = ts.createSynthesizedNode(9 /* StringLiteral */);
+                    name_27.text = node.name.text;
+                    emitSuperAccessInAsyncMethod(node.expression, name_27);
+                    return;
+                }
                 emit(node.expression);
                 var indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, node.dotToken);
                 // 1 .toString is a valid property access, emit a space after the literal
@@ -33343,7 +35227,7 @@ var ts;
                         }
                         emitExpressionIdentifier(node);
                         break;
-                    case 136 /* QualifiedName */:
+                    case 138 /* QualifiedName */:
                         emitQualifiedNameAsExpression(node, useFallback);
                         break;
                     default:
@@ -33355,16 +35239,25 @@ var ts;
                 if (tryEmitConstantValue(node)) {
                     return;
                 }
+                if (languageVersion === 2 /* ES6 */ &&
+                    node.expression.kind === 95 /* SuperKeyword */ &&
+                    isInAsyncMethodWithSuperInES6(node)) {
+                    emitSuperAccessInAsyncMethod(node.expression, node.argumentExpression);
+                    return;
+                }
                 emit(node.expression);
                 write("[");
                 emit(node.argumentExpression);
                 write("]");
             }
             function hasSpreadElement(elements) {
-                return ts.forEach(elements, function (e) { return e.kind === 188 /* SpreadElementExpression */; });
+                return ts.forEach(elements, function (e) { return e.kind === 190 /* SpreadElementExpression */; });
             }
             function skipParentheses(node) {
-                while (node.kind === 175 /* ParenthesizedExpression */ || node.kind === 174 /* TypeAssertionExpression */ || node.kind === 192 /* AsExpression */) {
+                while (node.kind === 177 /* ParenthesizedExpression */ ||
+                    node.kind === 176 /* TypeAssertionExpression */ ||
+                    node.kind === 194 /* AsExpression */ ||
+                    node.kind === 195 /* NonNullExpression */) {
                     node = node.expression;
                 }
                 return node;
@@ -33385,13 +35278,13 @@ var ts;
             function emitCallWithSpread(node) {
                 var target;
                 var expr = skipParentheses(node.expression);
-                if (expr.kind === 169 /* PropertyAccessExpression */) {
+                if (expr.kind === 171 /* PropertyAccessExpression */) {
                     // Target will be emitted as "this" argument
                     target = emitCallTarget(expr.expression);
                     write(".");
                     emit(expr.name);
                 }
-                else if (expr.kind === 170 /* ElementAccessExpression */) {
+                else if (expr.kind === 172 /* ElementAccessExpression */) {
                     // Target will be emitted as "this" argument
                     target = emitCallTarget(expr.expression);
                     write("[");
@@ -33424,23 +35317,42 @@ var ts;
                 emitListWithSpread(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*trailingComma*/ false, /*useConcat*/ true);
                 write(")");
             }
+            function isInAsyncMethodWithSuperInES6(node) {
+                if (languageVersion === 2 /* ES6 */) {
+                    var container = ts.getSuperContainer(node, /*includeFunctions*/ false);
+                    if (container && resolver.getNodeCheckFlags(container) & (2048 /* AsyncMethodWithSuper */ | 4096 /* AsyncMethodWithSuperBinding */)) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+            function emitSuperAccessInAsyncMethod(superNode, argumentExpression) {
+                var container = ts.getSuperContainer(superNode, /*includeFunctions*/ false);
+                var isSuperBinding = resolver.getNodeCheckFlags(container) & 4096 /* AsyncMethodWithSuperBinding */;
+                write("_super(");
+                emit(argumentExpression);
+                write(isSuperBinding ? ").value" : ")");
+            }
             function emitCallExpression(node) {
                 if (languageVersion < 2 /* ES6 */ && hasSpreadElement(node.arguments)) {
                     emitCallWithSpread(node);
                     return;
                 }
+                var expression = node.expression;
                 var superCall = false;
-                if (node.expression.kind === 95 /* SuperKeyword */) {
-                    emitSuper(node.expression);
+                var isAsyncMethodWithSuper = false;
+                if (expression.kind === 95 /* SuperKeyword */) {
+                    emitSuper(expression);
                     superCall = true;
                 }
                 else {
-                    emit(node.expression);
-                    superCall = node.expression.kind === 169 /* PropertyAccessExpression */ && node.expression.expression.kind === 95 /* SuperKeyword */;
+                    superCall = ts.isSuperPropertyOrElementAccess(expression);
+                    isAsyncMethodWithSuper = superCall && isInAsyncMethodWithSuperInES6(node);
+                    emit(expression);
                 }
-                if (superCall && languageVersion < 2 /* ES6 */) {
+                if (superCall && (languageVersion < 2 /* ES6 */ || isAsyncMethodWithSuper)) {
                     write(".call(");
-                    emitThis(node.expression);
+                    emitThis(expression);
                     if (node.arguments.length) {
                         write(", ");
                         emitCommaList(node.arguments);
@@ -33505,12 +35417,16 @@ var ts;
                 // 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 (!ts.nodeIsSynthesized(node) && node.parent.kind !== 177 /* ArrowFunction */) {
-                    if (node.expression.kind === 174 /* TypeAssertionExpression */ || node.expression.kind === 192 /* AsExpression */) {
+                if (!ts.nodeIsSynthesized(node) && node.parent.kind !== 179 /* ArrowFunction */) {
+                    if (node.expression.kind === 176 /* TypeAssertionExpression */ ||
+                        node.expression.kind === 194 /* AsExpression */ ||
+                        node.expression.kind === 195 /* NonNullExpression */) {
                         var operand = node.expression.expression;
                         // Make sure we consider all nested cast expressions, e.g.:
                         // (<any><number><any>-A).x;
-                        while (operand.kind === 174 /* TypeAssertionExpression */ || operand.kind === 192 /* AsExpression */) {
+                        while (operand.kind === 176 /* TypeAssertionExpression */ ||
+                            operand.kind === 194 /* AsExpression */ ||
+                            operand.kind === 195 /* NonNullExpression */) {
                             operand = operand.expression;
                         }
                         // We have an expression of the form: (<Type>SubExpr)
@@ -33521,15 +35437,15 @@ var ts;
                         //      (<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 !== 182 /* PrefixUnaryExpression */ &&
-                            operand.kind !== 180 /* VoidExpression */ &&
-                            operand.kind !== 179 /* TypeOfExpression */ &&
-                            operand.kind !== 178 /* DeleteExpression */ &&
-                            operand.kind !== 183 /* PostfixUnaryExpression */ &&
-                            operand.kind !== 172 /* NewExpression */ &&
-                            !(operand.kind === 171 /* CallExpression */ && node.parent.kind === 172 /* NewExpression */) &&
-                            !(operand.kind === 176 /* FunctionExpression */ && node.parent.kind === 171 /* CallExpression */) &&
-                            !(operand.kind === 8 /* NumericLiteral */ && node.parent.kind === 169 /* PropertyAccessExpression */)) {
+                        if (operand.kind !== 184 /* PrefixUnaryExpression */ &&
+                            operand.kind !== 182 /* VoidExpression */ &&
+                            operand.kind !== 181 /* TypeOfExpression */ &&
+                            operand.kind !== 180 /* DeleteExpression */ &&
+                            operand.kind !== 185 /* PostfixUnaryExpression */ &&
+                            operand.kind !== 174 /* NewExpression */ &&
+                            !(operand.kind === 173 /* CallExpression */ && node.parent.kind === 174 /* NewExpression */) &&
+                            !(operand.kind === 178 /* FunctionExpression */ && node.parent.kind === 173 /* CallExpression */) &&
+                            !(operand.kind === 8 /* NumericLiteral */ && node.parent.kind === 171 /* PropertyAccessExpression */)) {
                             emit(operand);
                             return;
                         }
@@ -33558,7 +35474,7 @@ var ts;
                 if (!isCurrentFileSystemExternalModule() || node.kind !== 69 /* Identifier */ || ts.nodeIsSynthesized(node)) {
                     return false;
                 }
-                var isVariableDeclarationOrBindingElement = node.parent && (node.parent.kind === 214 /* VariableDeclaration */ || node.parent.kind === 166 /* BindingElement */);
+                var isVariableDeclarationOrBindingElement = node.parent && (node.parent.kind === 217 /* VariableDeclaration */ || node.parent.kind === 168 /* BindingElement */);
                 var targetDeclaration = isVariableDeclarationOrBindingElement
                     ? node.parent
                     : resolver.getReferencedValueDeclaration(node);
@@ -33589,7 +35505,7 @@ var ts;
                 // 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 === 182 /* PrefixUnaryExpression */) {
+                if (node.operand.kind === 184 /* PrefixUnaryExpression */) {
                     var operand = node.operand;
                     if (node.operator === 35 /* PlusToken */ && (operand.operator === 35 /* PlusToken */ || operand.operator === 41 /* PlusPlusToken */)) {
                         write(" ");
@@ -33643,12 +35559,12 @@ var ts;
                 if (!node || !isCurrentFileSystemExternalModule()) {
                     return false;
                 }
-                var current = node;
+                var current = ts.getRootDeclaration(node).parent;
                 while (current) {
-                    if (current.kind === 251 /* SourceFile */) {
-                        return !isExported || ((ts.getCombinedNodeFlags(node) & 2 /* Export */) !== 0);
+                    if (current.kind === 255 /* SourceFile */) {
+                        return !isExported || ((ts.getCombinedNodeFlags(node) & 1 /* Export */) !== 0);
                     }
-                    else if (ts.isFunctionLike(current) || current.kind === 222 /* ModuleBlock */) {
+                    else if (ts.isDeclaration(current)) {
                         return false;
                     }
                     else {
@@ -33663,12 +35579,12 @@ var ts;
             function emitExponentiationOperator(node) {
                 var leftHandSideExpression = node.left;
                 if (node.operatorToken.kind === 60 /* AsteriskAsteriskEqualsToken */) {
-                    var synthesizedLHS;
+                    var synthesizedLHS = void 0;
                     var shouldEmitParentheses = false;
                     if (ts.isElementAccessExpression(leftHandSideExpression)) {
                         shouldEmitParentheses = true;
                         write("(");
-                        synthesizedLHS = ts.createSynthesizedNode(170 /* ElementAccessExpression */, /*startsOnNewLine*/ false);
+                        synthesizedLHS = ts.createSynthesizedNode(172 /* ElementAccessExpression */, /*startsOnNewLine*/ false);
                         var identifier = emitTempVariableAssignment(leftHandSideExpression.expression, /*canDefineTempVariablesInPlace*/ false, /*shouldEmitCommaBeforeAssignment*/ false);
                         synthesizedLHS.expression = identifier;
                         if (leftHandSideExpression.argumentExpression.kind !== 8 /* NumericLiteral */ &&
@@ -33685,7 +35601,7 @@ var ts;
                     else if (ts.isPropertyAccessExpression(leftHandSideExpression)) {
                         shouldEmitParentheses = true;
                         write("(");
-                        synthesizedLHS = ts.createSynthesizedNode(169 /* PropertyAccessExpression */, /*startsOnNewLine*/ false);
+                        synthesizedLHS = ts.createSynthesizedNode(171 /* PropertyAccessExpression */, /*startsOnNewLine*/ false);
                         var identifier = emitTempVariableAssignment(leftHandSideExpression.expression, /*canDefineTempVariablesInPlace*/ false, /*shouldEmitCommaBeforeAssignment*/ false);
                         synthesizedLHS.expression = identifier;
                         synthesizedLHS.dotToken = leftHandSideExpression.dotToken;
@@ -33713,8 +35629,8 @@ var ts;
             }
             function emitBinaryExpression(node) {
                 if (languageVersion < 2 /* ES6 */ && node.operatorToken.kind === 56 /* EqualsToken */ &&
-                    (node.left.kind === 168 /* ObjectLiteralExpression */ || node.left.kind === 167 /* ArrayLiteralExpression */)) {
-                    emitDestructuring(node, node.parent.kind === 198 /* ExpressionStatement */);
+                    (node.left.kind === 170 /* ObjectLiteralExpression */ || node.left.kind === 169 /* ArrayLiteralExpression */)) {
+                    emitDestructuring(node, node.parent.kind === 201 /* ExpressionStatement */);
                 }
                 else {
                     var exportChanged = node.operatorToken.kind >= 56 /* FirstAssignment */ &&
@@ -33779,7 +35695,7 @@ var ts;
                 }
             }
             function isSingleLineEmptyBlock(node) {
-                if (node && node.kind === 195 /* Block */) {
+                if (node && node.kind === 198 /* Block */) {
                     var block = node;
                     return block.statements.length === 0 && nodeEndIsOnSameLineAsNodeStart(block, block);
                 }
@@ -33793,12 +35709,12 @@ var ts;
                 }
                 emitToken(15 /* OpenBraceToken */, node.pos);
                 increaseIndent();
-                if (node.kind === 222 /* ModuleBlock */) {
-                    ts.Debug.assert(node.parent.kind === 221 /* ModuleDeclaration */);
+                if (node.kind === 225 /* ModuleBlock */) {
+                    ts.Debug.assert(node.parent.kind === 224 /* ModuleDeclaration */);
                     emitCaptureThisForNodeIfNecessary(node.parent);
                 }
                 emitLines(node.statements);
-                if (node.kind === 222 /* ModuleBlock */) {
+                if (node.kind === 225 /* ModuleBlock */) {
                     emitTempDeclarations(/*newLine*/ true);
                 }
                 decreaseIndent();
@@ -33806,7 +35722,7 @@ var ts;
                 emitToken(16 /* CloseBraceToken */, node.statements.end);
             }
             function emitEmbeddedStatement(node) {
-                if (node.kind === 195 /* Block */) {
+                if (node.kind === 198 /* Block */) {
                     write(" ");
                     emit(node);
                 }
@@ -33818,7 +35734,7 @@ var ts;
                 }
             }
             function emitExpressionStatement(node) {
-                emitParenthesizedIf(node.expression, /*parenthesized*/ node.expression.kind === 177 /* ArrowFunction */);
+                emitParenthesizedIf(node.expression, /*parenthesized*/ node.expression.kind === 179 /* ArrowFunction */);
                 write(";");
             }
             function emitIfStatement(node) {
@@ -33831,7 +35747,7 @@ var ts;
                 if (node.elseStatement) {
                     writeLine();
                     emitToken(80 /* ElseKeyword */, node.thenStatement.end);
-                    if (node.elseStatement.kind === 199 /* IfStatement */) {
+                    if (node.elseStatement.kind === 202 /* IfStatement */) {
                         write(" ");
                         emit(node.elseStatement);
                     }
@@ -33851,7 +35767,7 @@ var ts;
                 else {
                     emitNormalLoopBody(node, /*emitAsEmbeddedStatement*/ true);
                 }
-                if (node.statement.kind === 195 /* Block */) {
+                if (node.statement.kind === 198 /* Block */) {
                     write(" ");
                 }
                 else {
@@ -33885,7 +35801,7 @@ var ts;
                     // variables in variable declaration list were already hoisted
                     return false;
                 }
-                if (convertedLoopState && (ts.getCombinedNodeFlags(decl) & 24576 /* BlockScoped */) === 0) {
+                if (convertedLoopState && (ts.getCombinedNodeFlags(decl) & 3072 /* BlockScoped */) === 0) {
                     // we are inside a converted loop - this can only happen in downlevel scenarios
                     // record names for all variable declarations
                     for (var _a = 0, _b = decl.declarations; _a < _b.length; _a++) {
@@ -33932,7 +35848,7 @@ var ts;
             }
             function shouldConvertLoopBody(node) {
                 return languageVersion < 2 /* ES6 */ &&
-                    (resolver.getNodeCheckFlags(node) & 65536 /* LoopWithBlockScopedBindingCapturedInFunction */) !== 0;
+                    (resolver.getNodeCheckFlags(node) & 65536 /* LoopWithCapturedBlockScopedBinding */) !== 0;
             }
             function emitLoop(node, loopEmitter) {
                 var shouldConvert = shouldConvertLoopBody(node);
@@ -33941,7 +35857,7 @@ var ts;
                 }
                 else {
                     var loop = convertLoopBody(node);
-                    if (node.parent.kind === 210 /* LabeledStatement */) {
+                    if (node.parent.kind === 213 /* LabeledStatement */) {
                         // if parent of the loop was labeled statement - attach the label to loop skipping converted loop body
                         emitLabelAndColon(node.parent);
                     }
@@ -33952,35 +35868,31 @@ var ts;
                 var functionName = makeUniqueName("_loop");
                 var loopInitializer;
                 switch (node.kind) {
-                    case 202 /* ForStatement */:
-                    case 203 /* ForInStatement */:
-                    case 204 /* ForOfStatement */:
+                    case 205 /* ForStatement */:
+                    case 206 /* ForInStatement */:
+                    case 207 /* ForOfStatement */:
                         var initializer = node.initializer;
-                        if (initializer && initializer.kind === 215 /* VariableDeclarationList */) {
+                        if (initializer && initializer.kind === 218 /* VariableDeclarationList */) {
                             loopInitializer = node.initializer;
                         }
                         break;
                 }
                 var loopParameters;
-                if (loopInitializer && (ts.getCombinedNodeFlags(loopInitializer) & 24576 /* BlockScoped */)) {
+                var loopOutParameters;
+                if (loopInitializer && (ts.getCombinedNodeFlags(loopInitializer) & 3072 /* BlockScoped */)) {
                     // if loop initializer contains block scoped variables - they should be passed to converted loop body as parameters
                     loopParameters = [];
                     for (var _a = 0, _b = loopInitializer.declarations; _a < _b.length; _a++) {
                         var varDeclaration = _b[_a];
-                        collectNames(varDeclaration.name);
+                        processVariableDeclaration(varDeclaration.name);
                     }
                 }
-                var bodyIsBlock = node.statement.kind === 195 /* Block */;
+                var bodyIsBlock = node.statement.kind === 198 /* Block */;
                 var paramList = loopParameters ? loopParameters.join(", ") : "";
                 writeLine();
                 write("var " + functionName + " = function(" + paramList + ")");
-                if (!bodyIsBlock) {
-                    write(" {");
-                    writeLine();
-                    increaseIndent();
-                }
                 var convertedOuterLoopState = convertedLoopState;
-                convertedLoopState = {};
+                convertedLoopState = { loopOutParameters: 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
@@ -34000,14 +35912,34 @@ var ts;
                         convertedLoopState.hoistedLocalVariables = convertedOuterLoopState.hoistedLocalVariables;
                     }
                 }
-                emitEmbeddedStatement(node.statement);
-                if (!bodyIsBlock) {
-                    decreaseIndent();
-                    writeLine();
-                    write("}");
-                }
-                write(";");
+                write(" {");
                 writeLine();
+                increaseIndent();
+                if (bodyIsBlock) {
+                    emitLines(node.statement.statements);
+                }
+                else {
+                    emit(node.statement);
+                }
+                writeLine();
+                // end of loop body -> copy out parameter
+                copyLoopOutParameters(convertedLoopState, 1 /* ToOutParameter */, /*emitAsStatements*/ true);
+                decreaseIndent();
+                writeLine();
+                write("};");
+                writeLine();
+                if (loopOutParameters) {
+                    // declare variables to hold out params for loop body
+                    write("var ");
+                    for (var 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) {
@@ -34044,7 +35976,7 @@ var ts;
                     else {
                         // deduplicate and hoist collected variable declarations
                         write("var ");
-                        var seen;
+                        var seen = void 0;
                         for (var _c = 0, _d = convertedLoopState.hoistedLocalVariables; _c < _d.length; _c++) {
                             var id = _d[_c];
                             // Don't initialize seen unless we have at least one element.
@@ -34067,15 +35999,21 @@ var ts;
                 var currentLoopState = convertedLoopState;
                 convertedLoopState = convertedOuterLoopState;
                 return { functionName: functionName, paramList: paramList, state: currentLoopState };
-                function collectNames(name) {
+                function processVariableDeclaration(name) {
                     if (name.kind === 69 /* Identifier */) {
-                        var nameText = isNameOfNestedRedeclaration(name) ? getGeneratedNameForNode(name) : name.text;
+                        var nameText = isNameOfNestedBlockScopedRedeclarationOrCapturedBinding(name)
+                            ? getGeneratedNameForNode(name)
+                            : name.text;
                         loopParameters.push(nameText);
+                        if (resolver.getNodeCheckFlags(name.parent) & 2097152 /* NeedsLoopOutParameter */) {
+                            var reassignedVariable = { originalName: name, outParamName: makeUniqueName("out_" + nameText) };
+                            (loopOutParameters || (loopOutParameters = [])).push(reassignedVariable);
+                        }
                     }
                     else {
                         for (var _a = 0, _b = name.elements; _a < _b.length; _a++) {
                             var element = _b[_a];
-                            collectNames(element.name);
+                            processVariableDeclaration(element.name);
                         }
                     }
                 }
@@ -34091,7 +36029,7 @@ var ts;
                 if (emitAsEmbeddedStatement) {
                     emitEmbeddedStatement(node.statement);
                 }
-                else if (node.statement.kind === 195 /* Block */) {
+                else if (node.statement.kind === 198 /* Block */) {
                     emitLines(node.statement.statements);
                 }
                 else {
@@ -34102,6 +36040,28 @@ var ts;
                     convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
                 }
             }
+            function copyLoopOutParameters(state, copyDirection, emitAsStatements) {
+                if (state.loopOutParameters) {
+                    for (var _a = 0, _b = state.loopOutParameters; _a < _b.length; _a++) {
+                        var outParam = _b[_a];
+                        if (copyDirection === 0 /* ToOriginal */) {
+                            emitIdentifier(outParam.originalName);
+                            write(" = " + outParam.outParamName);
+                        }
+                        else {
+                            write(outParam.outParamName + " = ");
+                            emitIdentifier(outParam.originalName);
+                        }
+                        if (emitAsStatements) {
+                            write(";");
+                            writeLine();
+                        }
+                        else {
+                            write(", ");
+                        }
+                    }
+                }
+            }
             function emitConvertedLoopCall(loop, emitAsBlock) {
                 if (emitAsBlock) {
                     write(" {");
@@ -34110,7 +36070,8 @@ var ts;
                 }
                 // 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()';
-                var isSimpleLoop = !loop.state.nonLocalJumps &&
+                // NOTE: if loop uses only 'continue' it still will be emitted as simple loop
+                var isSimpleLoop = !(loop.state.nonLocalJumps & ~4 /* Continue */) &&
                     !loop.state.labeledNonLocalBreaks &&
                     !loop.state.labeledNonLocalContinues;
                 var loopResult = makeUniqueName("state");
@@ -34118,6 +36079,8 @@ var ts;
                     write("var " + loopResult + " = ");
                 }
                 write(loop.functionName + "(" + loop.paramList + ");");
+                writeLine();
+                copyLoopOutParameters(loop.state, 0 /* 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:
@@ -34135,7 +36098,7 @@ var ts;
                         }
                         else {
                             // top level converted loop - return unwrapped value
-                            write("return " + loopResult + ".value");
+                            write("return " + loopResult + ".value;");
                         }
                         writeLine();
                     }
@@ -34143,10 +36106,6 @@ var ts;
                         write("if (" + loopResult + " === \"break\") break;");
                         writeLine();
                     }
-                    if (loop.state.nonLocalJumps & 4 /* Continue */) {
-                        write("if (" + loopResult + " === \"continue\") continue;");
-                        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);
                 }
@@ -34201,7 +36160,7 @@ var ts;
                 var endPos = emitToken(86 /* ForKeyword */, node.pos);
                 write(" ");
                 endPos = emitToken(17 /* OpenParenToken */, endPos);
-                if (node.initializer && node.initializer.kind === 215 /* VariableDeclarationList */) {
+                if (node.initializer && node.initializer.kind === 218 /* VariableDeclarationList */) {
                     var variableDeclarationList = node.initializer;
                     var startIsEmitted = tryEmitStartOfVariableDeclarationList(variableDeclarationList);
                     if (startIsEmitted) {
@@ -34227,7 +36186,7 @@ var ts;
                 }
             }
             function emitForInOrForOfStatement(node) {
-                if (languageVersion < 2 /* ES6 */ && node.kind === 204 /* ForOfStatement */) {
+                if (languageVersion < 2 /* ES6 */ && node.kind === 207 /* ForOfStatement */) {
                     emitLoop(node, emitDownLevelForOfStatementWorker);
                 }
                 else {
@@ -34238,7 +36197,7 @@ var ts;
                 var endPos = emitToken(86 /* ForKeyword */, node.pos);
                 write(" ");
                 endPos = emitToken(17 /* OpenParenToken */, endPos);
-                if (node.initializer.kind === 215 /* VariableDeclarationList */) {
+                if (node.initializer.kind === 218 /* VariableDeclarationList */) {
                     var variableDeclarationList = node.initializer;
                     if (variableDeclarationList.declarations.length >= 1) {
                         tryEmitStartOfVariableDeclarationList(variableDeclarationList);
@@ -34248,7 +36207,7 @@ var ts;
                 else {
                     emit(node.initializer);
                 }
-                if (node.kind === 203 /* ForInStatement */) {
+                if (node.kind === 206 /* ForInStatement */) {
                     write(" in ");
                 }
                 else {
@@ -34338,7 +36297,7 @@ var ts;
                 // let v = _a[_i];
                 var rhsIterationValue = createElementAccessExpression(rhsReference, counter);
                 emitStart(node.initializer);
-                if (node.initializer.kind === 215 /* VariableDeclarationList */) {
+                if (node.initializer.kind === 218 /* VariableDeclarationList */) {
                     write("var ");
                     var variableDeclarationList = node.initializer;
                     if (variableDeclarationList.declarations.length > 0) {
@@ -34368,7 +36327,7 @@ var ts;
                     // Initializer is an expression. Emit the expression in the body, so that it's
                     // evaluated on every iteration.
                     var assignmentExpression = createBinaryExpression(node.initializer, 56 /* EqualsToken */, rhsIterationValue, /*startsOnNewLine*/ false);
-                    if (node.initializer.kind === 167 /* ArrayLiteralExpression */ || node.initializer.kind === 168 /* ObjectLiteralExpression */) {
+                    if (node.initializer.kind === 169 /* ArrayLiteralExpression */ || node.initializer.kind === 170 /* 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);
@@ -34396,23 +36355,27 @@ var ts;
                     // 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
-                    var jump = node.kind === 206 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
+                    var jump = node.kind === 209 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
                     var 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, 1 /* ToOutParameter */, /*emitAsStatements*/ false);
                         if (!node.label) {
-                            if (node.kind === 206 /* BreakStatement */) {
+                            if (node.kind === 209 /* BreakStatement */) {
                                 convertedLoopState.nonLocalJumps |= 2 /* Break */;
-                                write("return \"break\";");
+                                write("\"break\";");
                             }
                             else {
                                 convertedLoopState.nonLocalJumps |= 4 /* Continue */;
-                                write("return \"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 {
-                            var labelMarker;
-                            if (node.kind === 206 /* BreakStatement */) {
+                            var labelMarker = void 0;
+                            if (node.kind === 209 /* BreakStatement */) {
                                 labelMarker = "break-" + node.label.text;
                                 setLabeledJump(convertedLoopState, /*isBreak*/ true, node.label.text, labelMarker);
                             }
@@ -34420,12 +36383,12 @@ var ts;
                                 labelMarker = "continue-" + node.label.text;
                                 setLabeledJump(convertedLoopState, /*isBreak*/ false, node.label.text, labelMarker);
                             }
-                            write("return \"" + labelMarker + "\";");
+                            write("\"" + labelMarker + "\";");
                         }
                         return;
                     }
                 }
-                emitToken(node.kind === 206 /* BreakStatement */ ? 70 /* BreakKeyword */ : 75 /* ContinueKeyword */, node.pos);
+                emitToken(node.kind === 209 /* BreakStatement */ ? 70 /* BreakKeyword */ : 75 /* ContinueKeyword */, node.pos);
                 emitOptional(" ", node.label);
                 write(";");
             }
@@ -34491,7 +36454,7 @@ var ts;
                     ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node2.pos));
             }
             function emitCaseOrDefaultClause(node) {
-                if (node.kind === 244 /* CaseClause */) {
+                if (node.kind === 248 /* CaseClause */) {
                     write("case ");
                     emit(node.expression);
                     write(":");
@@ -34560,7 +36523,7 @@ var ts;
             function getContainingModule(node) {
                 do {
                     node = node.parent;
-                } while (node && node.kind !== 221 /* ModuleDeclaration */);
+                } while (node && node.kind !== 224 /* ModuleDeclaration */);
                 return node;
             }
             function emitContainingModuleName(node) {
@@ -34569,13 +36532,13 @@ var ts;
             }
             function emitModuleMemberName(node) {
                 emitStart(node.name);
-                if (ts.getCombinedNodeFlags(node) & 2 /* Export */) {
+                if (ts.getCombinedNodeFlags(node) & 1 /* Export */) {
                     var container = getContainingModule(node);
                     if (container) {
                         write(getGeneratedNameForNode(container));
                         write(".");
                     }
-                    else if (modulekind !== 5 /* ES6 */ && modulekind !== 4 /* System */) {
+                    else if (modulekind !== ts.ModuleKind.ES6 && modulekind !== ts.ModuleKind.System) {
                         write("exports.");
                     }
                 }
@@ -34585,19 +36548,19 @@ var ts;
             function createVoidZero() {
                 var zero = ts.createSynthesizedNode(8 /* NumericLiteral */);
                 zero.text = "0";
-                var result = ts.createSynthesizedNode(180 /* VoidExpression */);
+                var result = ts.createSynthesizedNode(182 /* VoidExpression */);
                 result.expression = zero;
                 return result;
             }
             function emitEs6ExportDefaultCompat(node) {
-                if (node.parent.kind === 251 /* SourceFile */) {
-                    ts.Debug.assert(!!(node.flags & 512 /* Default */) || node.kind === 230 /* ExportAssignment */);
+                if (node.parent.kind === 255 /* SourceFile */) {
+                    ts.Debug.assert(!!(node.flags & 512 /* Default */) || node.kind === 234 /* ExportAssignment */);
                     // only allow export default at a source file level
-                    if (modulekind === 1 /* CommonJS */ || modulekind === 2 /* AMD */ || modulekind === 3 /* UMD */) {
+                    if (modulekind === ts.ModuleKind.CommonJS || modulekind === ts.ModuleKind.AMD || modulekind === ts.ModuleKind.UMD) {
                         if (!isEs6Module) {
                             if (languageVersion !== 0 /* ES3 */) {
                                 // default value of configurable, enumerable, writable are `false`.
-                                write("Object.defineProperty(exports, \"__esModule\", { value: true });");
+                                write('Object.defineProperty(exports, "__esModule", { value: true });');
                                 writeLine();
                             }
                             else {
@@ -34609,11 +36572,11 @@ var ts;
                 }
             }
             function emitExportMemberAssignment(node) {
-                if (node.flags & 2 /* Export */) {
+                if (node.flags & 1 /* Export */) {
                     writeLine();
                     emitStart(node);
                     // emit call to exporter only for top level nodes
-                    if (modulekind === 4 /* System */ && node.parent === currentSourceFile) {
+                    if (modulekind === ts.ModuleKind.System && node.parent === currentSourceFile) {
                         // emit export default <smth> as
                         // export("default", <smth>)
                         write(exportFunctionForFile + "(\"");
@@ -34631,7 +36594,7 @@ var ts;
                         if (node.flags & 512 /* Default */) {
                             emitEs6ExportDefaultCompat(node);
                             if (languageVersion === 0 /* ES3 */) {
-                                write("exports[\"default\"]");
+                                write('exports["default"]');
                             }
                             else {
                                 write("exports.default");
@@ -34648,7 +36611,7 @@ var ts;
                 }
             }
             function emitExportMemberAssignments(name) {
-                if (modulekind === 4 /* System */) {
+                if (modulekind === ts.ModuleKind.System) {
                     return;
                 }
                 if (!exportEquals && exportSpecifiers && ts.hasProperty(exportSpecifiers, name.text)) {
@@ -34667,7 +36630,7 @@ var ts;
                 }
             }
             function emitExportSpecifierInSystemModule(specifier) {
-                ts.Debug.assert(modulekind === 4 /* System */);
+                ts.Debug.assert(modulekind === ts.ModuleKind.System);
                 if (!resolver.getReferencedValueDeclaration(specifier.propertyName || specifier.name) && !resolver.isValueAliasDeclaration(specifier)) {
                     return;
                 }
@@ -34697,7 +36660,7 @@ var ts;
                     emitNodeWithCommentsAndWithoutSourcemap(name);
                     write("\", ");
                 }
-                var isVariableDeclarationOrBindingElement = name.parent && (name.parent.kind === 214 /* VariableDeclaration */ || name.parent.kind === 166 /* BindingElement */);
+                var isVariableDeclarationOrBindingElement = name.parent && (name.parent.kind === 217 /* VariableDeclaration */ || name.parent.kind === 168 /* 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);
@@ -34731,8 +36694,8 @@ var ts;
                 return identifier;
             }
             function isFirstVariableDeclaration(root) {
-                return root.kind === 214 /* VariableDeclaration */ &&
-                    root.parent.kind === 215 /* VariableDeclarationList */ &&
+                return root.kind === 217 /* VariableDeclaration */ &&
+                    root.parent.kind === 218 /* VariableDeclarationList */ &&
                     root.parent.declarations[0] === root;
             }
             function emitDestructuring(root, isAssignmentExpressionStatement, value) {
@@ -34742,15 +36705,15 @@ var ts;
                 // Also temporary variables should be explicitly allocated for source level declarations when module target is system
                 // because actual variable declarations are hoisted
                 var canDefineTempVariablesInPlace = false;
-                if (root.kind === 214 /* VariableDeclaration */) {
-                    var isExported = ts.getCombinedNodeFlags(root) & 2 /* Export */;
+                if (root.kind === 217 /* VariableDeclaration */) {
+                    var isExported = ts.getCombinedNodeFlags(root) & 1 /* Export */;
                     var isSourceLevelForSystemModuleKind = shouldHoistDeclarationInSystemJsModule(root);
                     canDefineTempVariablesInPlace = !isExported && !isSourceLevelForSystemModuleKind;
                 }
-                else if (root.kind === 139 /* Parameter */) {
+                else if (root.kind === 141 /* Parameter */) {
                     canDefineTempVariablesInPlace = true;
                 }
-                if (root.kind === 184 /* BinaryExpression */) {
+                if (root.kind === 186 /* BinaryExpression */) {
                     emitAssignmentExpression(root);
                 }
                 else {
@@ -34785,14 +36748,14 @@ var ts;
                     // 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'
-                    var equals = ts.createSynthesizedNode(184 /* BinaryExpression */);
+                    var equals = ts.createSynthesizedNode(186 /* BinaryExpression */);
                     equals.left = value;
                     equals.operatorToken = ts.createSynthesizedNode(32 /* EqualsEqualsEqualsToken */);
                     equals.right = createVoidZero();
                     return createConditionalExpression(equals, defaultValue, value);
                 }
                 function createConditionalExpression(condition, whenTrue, whenFalse) {
-                    var cond = ts.createSynthesizedNode(185 /* ConditionalExpression */);
+                    var cond = ts.createSynthesizedNode(187 /* ConditionalExpression */);
                     cond.condition = condition;
                     cond.questionToken = ts.createSynthesizedNode(53 /* QuestionToken */);
                     cond.whenTrue = whenTrue;
@@ -34807,7 +36770,7 @@ var ts;
                 }
                 function createPropertyAccessForDestructuringProperty(object, propName) {
                     var index;
-                    var nameIsComputed = propName.kind === 137 /* ComputedPropertyName */;
+                    var nameIsComputed = propName.kind === 139 /* ComputedPropertyName */;
                     if (nameIsComputed) {
                         // TODO to handle when we look into sourcemaps for computed properties, for now use propName
                         index = ensureIdentifier(propName.expression, /*reuseIdentifierExpressions*/ false, propName);
@@ -34816,14 +36779,18 @@ var ts;
                         // We create a synthetic copy of the identifier in order to avoid the rewriting that might
                         // otherwise occur when the identifier is emitted.
                         index = ts.createSynthesizedNode(propName.kind);
-                        index.text = propName.text;
+                        // 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)
+                        index.text = ts.unescapeIdentifier(propName.text);
                     }
                     return !nameIsComputed && index.kind === 69 /* Identifier */
                         ? createPropertyAccessExpression(object, index)
                         : createElementAccessExpression(object, index);
                 }
                 function createSliceCall(value, sliceIndex) {
-                    var call = ts.createSynthesizedNode(171 /* CallExpression */);
+                    var call = ts.createSynthesizedNode(173 /* CallExpression */);
                     var sliceIdentifier = ts.createSynthesizedNode(69 /* Identifier */);
                     sliceIdentifier.text = "slice";
                     call.expression = createPropertyAccessExpression(value, sliceIdentifier);
@@ -34836,15 +36803,15 @@ var ts;
                     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
+                        // 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 (var _a = 0, properties_5 = properties; _a < properties_5.length; _a++) {
                         var p = properties_5[_a];
-                        if (p.kind === 248 /* PropertyAssignment */ || p.kind === 249 /* ShorthandPropertyAssignment */) {
+                        if (p.kind === 252 /* PropertyAssignment */ || p.kind === 253 /* ShorthandPropertyAssignment */) {
                             var propName = p.name;
-                            var target_1 = p.kind === 249 /* ShorthandPropertyAssignment */ ? p : p.initializer || propName;
-                            // Assignment for target = value.propName should highligh whole property, hence use p as source map node
+                            var target_1 = p.kind === 253 /* ShorthandPropertyAssignment */ ? p : p.initializer || propName;
+                            // Assignment for target = value.propName should highlight whole property, hence use p as source map node
                             emitDestructuringAssignment(target_1, createPropertyAccessForDestructuringProperty(value, propName), p);
                         }
                     }
@@ -34854,14 +36821,14 @@ var ts;
                     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 hightlight the passed in source map node since thats the one needing this temp assignment
+                        // 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 (var i = 0; i < elements.length; i++) {
                         var e = elements[i];
-                        if (e.kind !== 190 /* OmittedExpression */) {
-                            // Assignment for target = value.propName should highligh whole property, hence use e as source map node
-                            if (e.kind !== 188 /* SpreadElementExpression */) {
+                        if (e.kind !== 192 /* OmittedExpression */) {
+                            // Assignment for target = value.propName should highlight whole property, hence use e as source map node
+                            if (e.kind !== 190 /* SpreadElementExpression */) {
                                 emitDestructuringAssignment(e, createElementAccessExpression(value, createNumericLiteral(i)), e);
                             }
                             else if (i === elements.length - 1) {
@@ -34872,20 +36839,20 @@ var ts;
                 }
                 function emitDestructuringAssignment(target, value, sourceMapNode) {
                     // When emitting target = value use source map node to highlight, including any temporary assignments needed for this
-                    if (target.kind === 249 /* ShorthandPropertyAssignment */) {
+                    if (target.kind === 253 /* ShorthandPropertyAssignment */) {
                         if (target.objectAssignmentInitializer) {
                             value = createDefaultValueCheck(value, target.objectAssignmentInitializer, sourceMapNode);
                         }
                         target = target.name;
                     }
-                    else if (target.kind === 184 /* BinaryExpression */ && target.operatorToken.kind === 56 /* EqualsToken */) {
+                    else if (target.kind === 186 /* BinaryExpression */ && target.operatorToken.kind === 56 /* EqualsToken */) {
                         value = createDefaultValueCheck(value, target.right, sourceMapNode);
                         target = target.left;
                     }
-                    if (target.kind === 168 /* ObjectLiteralExpression */) {
+                    if (target.kind === 170 /* ObjectLiteralExpression */) {
                         emitObjectLiteralAssignment(target, value, sourceMapNode);
                     }
-                    else if (target.kind === 167 /* ArrayLiteralExpression */) {
+                    else if (target.kind === 169 /* ArrayLiteralExpression */) {
                         emitArrayLiteralAssignment(target, value, sourceMapNode);
                     }
                     else {
@@ -34907,7 +36874,7 @@ var ts;
                         emitDestructuringAssignment(target, value, ts.nodeIsSynthesized(root) ? target : root);
                     }
                     else {
-                        if (root.parent.kind !== 175 /* ParenthesizedExpression */) {
+                        if (root.parent.kind !== 177 /* ParenthesizedExpression */) {
                             write("(");
                         }
                         // Temporary assignment needed to emit root should highlight whole binary expression
@@ -34916,7 +36883,7 @@ var ts;
                         emitDestructuringAssignment(target, value, root);
                         write(", ");
                         emit(value);
-                        if (root.parent.kind !== 175 /* ParenthesizedExpression */) {
+                        if (root.parent.kind !== 177 /* ParenthesizedExpression */) {
                             write(")");
                         }
                     }
@@ -34944,12 +36911,12 @@ var ts;
                         }
                         for (var i = 0; i < numElements; i++) {
                             var element = elements[i];
-                            if (pattern.kind === 164 /* ObjectBindingPattern */) {
+                            if (pattern.kind === 166 /* ObjectBindingPattern */) {
                                 // Rewrite element to a declaration with an initializer that fetches property
                                 var propName = element.propertyName || element.name;
                                 emitBindingElement(element, createPropertyAccessForDestructuringProperty(value, propName));
                             }
-                            else if (element.kind !== 190 /* OmittedExpression */) {
+                            else if (element.kind !== 192 /* OmittedExpression */) {
                                 if (!element.dotDotDotToken) {
                                     // Rewrite element to a declaration that accesses array element at index i
                                     emitBindingElement(element, createElementAccessExpression(value, createNumericLiteral(i)));
@@ -34968,29 +36935,70 @@ var ts;
             }
             function emitVariableDeclaration(node) {
                 if (ts.isBindingPattern(node.name)) {
-                    if (languageVersion < 2 /* ES6 */) {
-                        emitDestructuring(node, /*isAssignmentExpressionStatement*/ false);
-                    }
-                    else {
+                    var isExported = ts.getCombinedNodeFlags(node) & 1 /* Export */;
+                    if (languageVersion >= 2 /* ES6 */ && (!isExported || modulekind === ts.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
+                        var isTopLevelDeclarationInSystemModule = modulekind === ts.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 {
                     var initializer = node.initializer;
-                    if (!initializer && languageVersion < 2 /* ES6 */) {
-                        // downlevel emit for non-initialized let bindings defined in loops
-                        // for (...) {  let x; }
-                        // should be
-                        // for (...) { var <some-uniqie-name> = void 0; }
-                        // this is necessary to preserve ES6 semantic in scenarios like
-                        // for (...) { let x; console.log(x); x = 1 } // assignment on one iteration should not affect other iterations
-                        var isLetDefinedInLoop = (resolver.getNodeCheckFlags(node) & 16384 /* BlockScopedBindingInLoop */) &&
-                            (getCombinedFlagsForIdentifier(node.name) & 8192 /* Let */);
-                        // NOTE: default initialization should not be added to let bindings in for-in\for-of statements
-                        if (isLetDefinedInLoop &&
-                            node.parent.parent.kind !== 203 /* ForInStatement */ &&
-                            node.parent.parent.kind !== 204 /* ForOfStatement */) {
+                    if (!initializer &&
+                        languageVersion < 2 /* 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 === 69 /* Identifier */) {
+                        var container = ts.getEnclosingBlockScopeContainer(node);
+                        var 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.
+                        var isCapturedInFunction = flags & 131072 /* CapturedBlockScopedBinding */;
+                        var isDeclaredInLoop = flags & 262144 /* BlockScopedBindingInLoop */;
+                        var emittedAsTopLevel = ts.isBlockScopedContainerTopLevel(container) ||
+                            (isCapturedInFunction && isDeclaredInLoop && container.kind === 198 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false));
+                        var emittedAsNestedLetDeclaration = ts.getCombinedNodeFlags(node) & 1024 /* Let */ &&
+                            !emittedAsTopLevel;
+                        var emitExplicitInitializer = emittedAsNestedLetDeclaration &&
+                            container.kind !== 206 /* ForInStatement */ &&
+                            container.kind !== 207 /* ForOfStatement */ &&
+                            (!resolver.isDeclarationWithCollidingName(node) ||
+                                (isDeclaredInLoop && !isCapturedInFunction && !ts.isIterationStatement(container, /*lookInLabeledStatements*/ false)));
+                        if (emitExplicitInitializer) {
                             initializer = createVoidZero();
                         }
                     }
@@ -35008,7 +37016,7 @@ var ts;
                 }
             }
             function emitExportVariableAssignments(node) {
-                if (node.kind === 190 /* OmittedExpression */) {
+                if (node.kind === 192 /* OmittedExpression */) {
                     return;
                 }
                 var name = node.name;
@@ -35019,20 +37027,14 @@ var ts;
                     ts.forEach(name.elements, emitExportVariableAssignments);
                 }
             }
-            function getCombinedFlagsForIdentifier(node) {
-                if (!node.parent || (node.parent.kind !== 214 /* VariableDeclaration */ && node.parent.kind !== 166 /* BindingElement */)) {
-                    return 0;
-                }
-                return ts.getCombinedNodeFlags(node.parent);
-            }
             function isES6ExportedDeclaration(node) {
-                return !!(node.flags & 2 /* Export */) &&
-                    modulekind === 5 /* ES6 */ &&
-                    node.parent.kind === 251 /* SourceFile */;
+                return !!(node.flags & 1 /* Export */) &&
+                    modulekind === ts.ModuleKind.ES6 &&
+                    node.parent.kind === 255 /* SourceFile */;
             }
             function emitVariableStatement(node) {
                 var startIsEmitted = false;
-                if (node.flags & 2 /* Export */) {
+                if (node.flags & 1 /* Export */) {
                     if (isES6ExportedDeclaration(node)) {
                         // Exported ES6 module member
                         write("export ");
@@ -35052,14 +37054,14 @@ var ts;
                         write(";");
                     }
                 }
-                if (modulekind !== 5 /* ES6 */ && node.parent === currentSourceFile) {
+                if (modulekind !== ts.ModuleKind.ES6 && node.parent === currentSourceFile) {
                     ts.forEach(node.declarationList.declarations, emitExportVariableAssignments);
                 }
             }
             function shouldEmitLeadingAndTrailingCommentsForVariableStatement(node) {
                 // If we're not exporting the variables, there's nothing special here.
                 // Always emit comments for these nodes.
-                if (!(node.flags & 2 /* Export */)) {
+                if (!(node.flags & 1 /* Export */)) {
                     return true;
                 }
                 // If we are exporting, but it's a top-level ES6 module exports,
@@ -35079,12 +37081,12 @@ var ts;
             function emitParameter(node) {
                 if (languageVersion < 2 /* ES6 */) {
                     if (ts.isBindingPattern(node.name)) {
-                        var name_26 = createTempVariable(0 /* Auto */);
+                        var name_28 = createTempVariable(0 /* Auto */);
                         if (!tempParameters) {
                             tempParameters = [];
                         }
-                        tempParameters.push(name_26);
-                        emit(name_26);
+                        tempParameters.push(name_28);
+                        emit(name_28);
                     }
                     else {
                         emit(node.name);
@@ -35100,7 +37102,7 @@ var ts;
             }
             function emitDefaultValueAssignments(node) {
                 if (languageVersion < 2 /* ES6 */) {
-                    var tempIndex = 0;
+                    var tempIndex_1 = 0;
                     ts.forEach(node.parameters, function (parameter) {
                         // A rest parameter cannot have a binding pattern or an initializer,
                         // so let's just ignore it.
@@ -35117,15 +37119,15 @@ var ts;
                                 writeLine();
                                 write("var ");
                                 if (hasBindingElements) {
-                                    emitDestructuring(parameter, /*isAssignmentExpressionStatement*/ false, tempParameters[tempIndex]);
+                                    emitDestructuring(parameter, /*isAssignmentExpressionStatement*/ false, tempParameters[tempIndex_1]);
                                 }
                                 else {
-                                    emit(tempParameters[tempIndex]);
+                                    emit(tempParameters[tempIndex_1]);
                                     write(" = ");
                                     emit(initializer);
                                 }
                                 write(";");
-                                tempIndex++;
+                                tempIndex_1++;
                             }
                         }
                         else if (initializer) {
@@ -35189,12 +37191,12 @@ var ts;
                 }
             }
             function emitAccessor(node) {
-                write(node.kind === 146 /* GetAccessor */ ? "get " : "set ");
+                write(node.kind === 148 /* GetAccessor */ ? "get " : "set ");
                 emit(node.name);
                 emitSignatureAndBody(node);
             }
             function shouldEmitAsArrowFunction(node) {
-                return node.kind === 177 /* ArrowFunction */ && languageVersion >= 2 /* ES6 */;
+                return node.kind === 179 /* ArrowFunction */ && languageVersion >= 2 /* ES6 */;
             }
             function emitDeclarationName(node) {
                 if (node.name) {
@@ -35205,13 +37207,13 @@ var ts;
                 }
             }
             function shouldEmitFunctionName(node) {
-                if (node.kind === 176 /* FunctionExpression */) {
+                if (node.kind === 178 /* FunctionExpression */) {
                     // Emit name if one is present
                     return !!node.name;
                 }
-                if (node.kind === 216 /* FunctionDeclaration */) {
+                if (node.kind === 219 /* FunctionDeclaration */) {
                     // Emit name if one is present, or emit generated name in down-level case (for export default case)
-                    return !!node.name || modulekind !== 5 /* ES6 */;
+                    return !!node.name || modulekind !== ts.ModuleKind.ES6;
                 }
             }
             function emitFunctionDeclaration(node) {
@@ -35221,12 +37223,12 @@ var ts;
                 // TODO (yuisu) : we should not have special cases to condition emitting comments
                 // but have one place to fix check for these conditions.
                 var kind = node.kind, parent = node.parent;
-                if (kind !== 144 /* MethodDeclaration */ &&
-                    kind !== 143 /* MethodSignature */ &&
+                if (kind !== 146 /* MethodDeclaration */ &&
+                    kind !== 145 /* MethodSignature */ &&
                     parent &&
-                    parent.kind !== 248 /* PropertyAssignment */ &&
-                    parent.kind !== 171 /* CallExpression */ &&
-                    parent.kind !== 167 /* ArrayLiteralExpression */) {
+                    parent.kind !== 252 /* PropertyAssignment */ &&
+                    parent.kind !== 173 /* CallExpression */ &&
+                    parent.kind !== 169 /* ArrayLiteralExpression */) {
                     // 1. Methods will emit comments at their assignment declaration sites.
                     //
                     // 2. If the function is a property of object literal, emitting leading-comments
@@ -35265,11 +37267,13 @@ var ts;
                     emitDeclarationName(node);
                 }
                 emitSignatureAndBody(node);
-                if (modulekind !== 5 /* ES6 */ && kind === 216 /* FunctionDeclaration */ && parent === currentSourceFile && node.name) {
+                if (modulekind !== ts.ModuleKind.ES6 && kind === 219 /* FunctionDeclaration */ && parent === currentSourceFile && node.name) {
                     emitExportMemberAssignments(node.name);
                 }
                 emitEnd(node);
-                if (kind !== 144 /* MethodDeclaration */ && kind !== 143 /* MethodSignature */) {
+                if (kind !== 146 /* MethodDeclaration */ &&
+                    kind !== 145 /* MethodSignature */ &&
+                    kind !== 179 /* ArrowFunction */) {
                     emitTrailingComments(node);
                 }
             }
@@ -35286,8 +37290,9 @@ var ts;
                 write("(");
                 if (node) {
                     var parameters = node.parameters;
+                    var skipCount = node.parameters.length && node.parameters[0].name.text === "this" ? 1 : 0;
                     var omitCount = languageVersion < 2 /* ES6 */ && ts.hasRestParameter(node) ? 1 : 0;
-                    emitList(parameters, 0, parameters.length - omitCount, /*multiLine*/ false, /*trailingComma*/ false);
+                    emitList(parameters, skipCount, parameters.length - omitCount - skipCount, /*multiLine*/ false, /*trailingComma*/ false);
                 }
                 write(")");
                 decreaseIndent();
@@ -35302,8 +37307,8 @@ var ts;
             }
             function emitAsyncFunctionBodyForES6(node) {
                 var promiseConstructor = ts.getEntityNameFromTypeNode(node.type);
-                var isArrowFunction = node.kind === 177 /* ArrowFunction */;
-                var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 4096 /* CaptureArguments */) !== 0;
+                var isArrowFunction = node.kind === 179 /* ArrowFunction */;
+                var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 8192 /* 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
@@ -35381,6 +37386,14 @@ var ts;
                     write(" {");
                     increaseIndent();
                     writeLine();
+                    if (resolver.getNodeCheckFlags(node) & 4096 /* AsyncMethodWithSuperBinding */) {
+                        writeLines("\nconst _super = (function (geti, seti) {\n    const cache = Object.create(null);\n    return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } });\n})(name => super[name], (name, value) => super[name] = value);");
+                        writeLine();
+                    }
+                    else if (resolver.getNodeCheckFlags(node) & 2048 /* AsyncMethodWithSuper */) {
+                        write("const _super = name => super[name];");
+                        writeLine();
+                    }
                     write("return");
                 }
                 write(" __awaiter(this");
@@ -35390,19 +37403,14 @@ var ts;
                 else {
                     write(", void 0, ");
                 }
-                if (promiseConstructor) {
+                if (languageVersion >= 2 /* ES6 */ || !promiseConstructor) {
+                    write("void 0");
+                }
+                else {
                     emitEntityNameAsExpression(promiseConstructor, /*useFallback*/ false);
                 }
-                else {
-                    write("Promise");
-                }
                 // Emit the call to __awaiter.
-                if (hasLexicalArguments) {
-                    write(", function* (_arguments)");
-                }
-                else {
-                    write(", function* ()");
-                }
+                write(", function* ()");
                 // Emit the signature and body for the inner generator function.
                 emitFunctionBody(node);
                 write(")");
@@ -35421,7 +37429,7 @@ var ts;
                     write(" { }");
                 }
                 else {
-                    if (node.body.kind === 195 /* Block */) {
+                    if (node.body.kind === 198 /* Block */) {
                         emitBlockFunctionBody(node, node.body);
                     }
                     else {
@@ -35480,10 +37488,10 @@ var ts;
                 write(" ");
                 // Unwrap all type assertions.
                 var current = body;
-                while (current.kind === 174 /* TypeAssertionExpression */) {
+                while (current.kind === 176 /* TypeAssertionExpression */) {
                     current = current.expression;
                 }
-                emitParenthesizedIf(body, current.kind === 168 /* ObjectLiteralExpression */);
+                emitParenthesizedIf(body, current.kind === 170 /* ObjectLiteralExpression */);
             }
             function emitDownLevelExpressionFunctionBody(node, body) {
                 write(" {");
@@ -35554,23 +37562,27 @@ var ts;
                 }
                 emitToken(16 /* CloseBraceToken */, body.statements.end);
             }
-            function findInitialSuperCall(ctor) {
-                if (ctor.body) {
-                    var statement = ctor.body.statements[0];
-                    if (statement && statement.kind === 198 /* ExpressionStatement */) {
-                        var expr = statement.expression;
-                        if (expr && expr.kind === 171 /* CallExpression */) {
-                            var func = expr.expression;
-                            if (func && func.kind === 95 /* SuperKeyword */) {
-                                return statement;
-                            }
-                        }
-                    }
+            /**
+             * 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, index) {
+                if (!ctor.body) {
+                    return undefined;
+                }
+                var statements = ctor.body.statements;
+                if (!statements || index >= statements.length) {
+                    return undefined;
+                }
+                var statement = statements[index];
+                if (statement.kind === 201 /* ExpressionStatement */) {
+                    return ts.isSuperCallExpression(statement.expression) ? statement : undefined;
                 }
             }
             function emitParameterPropertyAssignments(node) {
                 ts.forEach(node.parameters, function (param) {
-                    if (param.flags & 56 /* AccessibilityModifier */) {
+                    if (param.flags & 28 /* AccessibilityModifier */) {
                         writeLine();
                         emitStart(param);
                         emitStart(param.name);
@@ -35593,7 +37605,7 @@ var ts;
                     emitNodeWithCommentsAndWithoutSourcemap(memberName);
                     write("]");
                 }
-                else if (memberName.kind === 137 /* ComputedPropertyName */) {
+                else if (memberName.kind === 139 /* ComputedPropertyName */) {
                     emitComputedPropertyName(memberName);
                 }
                 else {
@@ -35605,7 +37617,7 @@ var ts;
                 var properties = [];
                 for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
                     var member = _b[_a];
-                    if (member.kind === 142 /* PropertyDeclaration */ && isStatic === ((member.flags & 64 /* Static */) !== 0) && member.initializer) {
+                    if (member.kind === 144 /* PropertyDeclaration */ && isStatic === ((member.flags & 32 /* Static */) !== 0) && member.initializer) {
                         properties.push(member);
                     }
                 }
@@ -35626,7 +37638,7 @@ var ts;
                     emit(receiver);
                 }
                 else {
-                    if (property.flags & 64 /* Static */) {
+                    if (property.flags & 32 /* Static */) {
                         emitDeclarationName(node);
                     }
                     else {
@@ -35645,11 +37657,11 @@ var ts;
             }
             function emitMemberFunctionsForES5AndLower(node) {
                 ts.forEach(node.members, function (member) {
-                    if (member.kind === 194 /* SemicolonClassElement */) {
+                    if (member.kind === 197 /* SemicolonClassElement */) {
                         writeLine();
                         write(";");
                     }
-                    else if (member.kind === 144 /* MethodDeclaration */ || node.kind === 143 /* MethodSignature */) {
+                    else if (member.kind === 146 /* MethodDeclaration */ || node.kind === 145 /* MethodSignature */) {
                         if (!member.body) {
                             return emitCommentsOnNotEmittedNode(member);
                         }
@@ -35666,7 +37678,7 @@ var ts;
                         write(";");
                         emitTrailingComments(member);
                     }
-                    else if (member.kind === 146 /* GetAccessor */ || member.kind === 147 /* SetAccessor */) {
+                    else if (member.kind === 148 /* GetAccessor */ || member.kind === 149 /* SetAccessor */) {
                         var accessors = ts.getAllAccessorDeclarations(node.members, member);
                         if (member === accessors.firstAccessor) {
                             writeLine();
@@ -35716,22 +37728,22 @@ var ts;
             function emitMemberFunctionsForES6AndHigher(node) {
                 for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
                     var member = _b[_a];
-                    if ((member.kind === 144 /* MethodDeclaration */ || node.kind === 143 /* MethodSignature */) && !member.body) {
+                    if ((member.kind === 146 /* MethodDeclaration */ || node.kind === 145 /* MethodSignature */) && !member.body) {
                         emitCommentsOnNotEmittedNode(member);
                     }
-                    else if (member.kind === 144 /* MethodDeclaration */ ||
-                        member.kind === 146 /* GetAccessor */ ||
-                        member.kind === 147 /* SetAccessor */) {
+                    else if (member.kind === 146 /* MethodDeclaration */ ||
+                        member.kind === 148 /* GetAccessor */ ||
+                        member.kind === 149 /* SetAccessor */) {
                         writeLine();
                         emitLeadingComments(member);
                         emitStart(member);
-                        if (member.flags & 64 /* Static */) {
+                        if (member.flags & 32 /* Static */) {
                             write("static ");
                         }
-                        if (member.kind === 146 /* GetAccessor */) {
+                        if (member.kind === 148 /* GetAccessor */) {
                             write("get ");
                         }
-                        else if (member.kind === 147 /* SetAccessor */) {
+                        else if (member.kind === 149 /* SetAccessor */) {
                             write("set ");
                         }
                         if (member.asteriskToken) {
@@ -35742,7 +37754,7 @@ var ts;
                         emitEnd(member);
                         emitTrailingComments(member);
                     }
-                    else if (member.kind === 194 /* SemicolonClassElement */) {
+                    else if (member.kind === 197 /* SemicolonClassElement */) {
                         writeLine();
                         write(";");
                     }
@@ -35771,11 +37783,11 @@ var ts;
                 var hasInstancePropertyWithInitializer = false;
                 // Emit the constructor overload pinned comments
                 ts.forEach(node.members, function (member) {
-                    if (member.kind === 145 /* Constructor */ && !member.body) {
+                    if (member.kind === 147 /* Constructor */ && !member.body) {
                         emitCommentsOnNotEmittedNode(member);
                     }
                     // Check if there is any non-static property assignment
-                    if (member.kind === 142 /* PropertyDeclaration */ && member.initializer && (member.flags & 64 /* Static */) === 0) {
+                    if (member.kind === 144 /* PropertyDeclaration */ && member.initializer && (member.flags & 32 /* Static */) === 0) {
                         hasInstancePropertyWithInitializer = true;
                     }
                 });
@@ -35829,7 +37841,7 @@ var ts;
                     emitDefaultValueAssignments(ctor);
                     emitRestParameter(ctor);
                     if (baseTypeElement) {
-                        superCall = findInitialSuperCall(ctor);
+                        superCall = getSuperCallAtGivenIndex(ctor, startIndex);
                         if (superCall) {
                             writeLine();
                             emit(superCall);
@@ -35883,68 +37895,115 @@ var ts;
                 else {
                     emitClassLikeDeclarationForES6AndHigher(node);
                 }
-                if (modulekind !== 5 /* ES6 */ && node.parent === currentSourceFile && node.name) {
+                if (modulekind !== ts.ModuleKind.ES6 && node.parent === currentSourceFile && node.name) {
                     emitExportMemberAssignments(node.name);
                 }
             }
             function emitClassLikeDeclarationForES6AndHigher(node) {
-                var thisNodeIsDecorated = ts.nodeIsDecorated(node);
-                if (node.kind === 217 /* ClassDeclaration */) {
-                    if (thisNodeIsDecorated) {
-                        // To preserve the correct runtime semantics when decorators are applied to the class,
-                        // the emit needs to follow one of the following rules:
+                var decoratedClassAlias;
+                var isHoistedDeclarationInSystemModule = shouldHoistDeclarationInSystemJsModule(node);
+                var isDecorated = ts.nodeIsDecorated(node);
+                var rewriteAsClassExpression = isDecorated || isHoistedDeclarationInSystemModule;
+                if (node.kind === 220 /* ClassDeclaration */) {
+                    if (rewriteAsClassExpression) {
+                        // When we emit an ES6 class that has a class decorator, we must tailor the
+                        // emit to certain specific cases.
                         //
-                        // * For a local class declaration:
+                        // In the simplest case, we emit the class declaration as a let declaration, and
+                        // evaluate decorators after the close of the class body:
                         //
-                        //     @dec class C {
-                        //     }
+                        //  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]
                         //
-                        //   The emit should be:
+                        // 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.
                         //
-                        //     let C = class {
-                        //     };
-                        //     C = __decorate([dec], C);
+                        // 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:
                         //
-                        // * For an exported class declaration:
+                        //  TypeScript                      | Javascript
+                        //  --------------------------------|------------------------------------
+                        //  @dec                            | let C_1;
+                        //  class C {                       | let C = C_1 = class C {
+                        //    static x() { return C.y; }    |   static x() { return C_1.y; }
+                        //    static y = 1;                 | }
+                        //  }                               | C.y = 1;
+                        //                                  | C = C_1 = __decorate([dec], C);
+                        //  --------------------------------|------------------------------------
+                        //  @dec                            | let C_1;
+                        //  export class C {                | export let C = C_1 = class C {
+                        //    static x() { return C.y; }    |   static x() { return C_1.y; }
+                        //    static y = 1;                 | }
+                        //  }                               | C.y = 1;
+                        //                                  | C = C_1 = __decorate([dec], C);
+                        //  ---------------------------------------------------------------------
+                        //  [Example 2]
                         //
-                        //     @dec export class C {
-                        //     }
+                        // If a class declaration is the default export of a module, we instead emit
+                        // the export after the decorated declaration:
                         //
-                        //   The emit should be:
+                        //  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]
                         //
-                        //     export let C = class {
-                        //     };
-                        //     C = __decorate([dec], 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:
                         //
-                        // * For a default export of a class declaration with a name:
-                        //
-                        //     @dec default export class C {
-                        //     }
-                        //
-                        //   The emit should be:
-                        //
-                        //     let C = class {
-                        //     }
-                        //     C = __decorate([dec], C);
-                        //     export default C;
-                        //
-                        // * For a default export of a class declaration without a name:
-                        //
-                        //     @dec default export class {
-                        //     }
-                        //
-                        //   The emit should be:
-                        //
-                        //     let _default = class {
-                        //     }
-                        //     _default = __decorate([dec], _default);
-                        //     export default _default;
+                        //  TypeScript                      | Javascript
+                        //  --------------------------------|------------------------------------
+                        //  @dec                            | let C_1;
+                        //  export default class C {        | let C = C_1 = class C {
+                        //    static x() { return C.y; }    |   static x() { return C_1.y; }
+                        //    static y = 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) & 524288 /* ClassWithBodyScopedClassBinding */) {
+                            decoratedClassAlias = ts.unescapeIdentifier(makeUniqueName(node.name ? node.name.text : "default"));
+                            decoratedClassAliases[ts.getNodeId(node)] = decoratedClassAlias;
+                            write("let " + decoratedClassAlias + ";");
+                            writeLine();
+                        }
                         if (isES6ExportedDeclaration(node) && !(node.flags & 512 /* Default */)) {
                             write("export ");
                         }
-                        write("let ");
+                        if (!isHoistedDeclarationInSystemModule) {
+                            write("let ");
+                        }
                         emitDeclarationName(node);
+                        if (decoratedClassAlias !== undefined) {
+                            write(" = " + decoratedClassAlias);
+                        }
                         write(" = ");
                     }
                     else if (isES6ExportedDeclaration(node)) {
@@ -35966,7 +38025,7 @@ var ts;
                 // This keeps the expression as an expression, while ensuring that the static parts
                 // of it have been initialized by the time it is used.
                 var staticProperties = getInitializedProperties(node, /*isStatic*/ true);
-                var isClassExpressionWithStaticProperties = staticProperties.length > 0 && node.kind === 189 /* ClassExpression */;
+                var isClassExpressionWithStaticProperties = staticProperties.length > 0 && node.kind === 191 /* ClassExpression */;
                 var tempVariable;
                 if (isClassExpressionWithStaticProperties) {
                     tempVariable = createAndRecordTempVariable(0 /* Auto */);
@@ -35979,7 +38038,7 @@ var ts;
                 // emit name if
                 // - node has a name
                 // - this is default export with static initializers
-                if ((node.name || (node.flags & 512 /* Default */ && (staticProperties.length > 0 || modulekind !== 5 /* ES6 */))) && !thisNodeIsDecorated) {
+                if (node.name || (node.flags & 512 /* Default */ && (staticProperties.length > 0 || modulekind !== ts.ModuleKind.ES6) && !rewriteAsClassExpression)) {
                     write(" ");
                     emitDeclarationName(node);
                 }
@@ -35996,15 +38055,8 @@ var ts;
                 decreaseIndent();
                 writeLine();
                 emitToken(16 /* CloseBraceToken */, node.members.end);
-                // TODO(rbuckton): Need to go back to `let _a = class C {}` approach, removing the defineProperty call for now.
-                // For a decorated class, we need to assign its name (if it has one). This is because we emit
-                // the class as a class expression to avoid the double-binding of the identifier:
-                //
-                //   let C = class {
-                //   }
-                //   Object.defineProperty(C, "name", { value: "C", configurable: true });
-                //
-                if (thisNodeIsDecorated) {
+                if (rewriteAsClassExpression) {
+                    decoratedClassAliases[ts.getNodeId(node)] = undefined;
                     write(";");
                 }
                 // Emit static property assignment. Because classDeclaration is lexically evaluated,
@@ -36028,12 +38080,12 @@ var ts;
                 else {
                     writeLine();
                     emitPropertyDeclarations(node, staticProperties);
-                    emitDecoratorsOfClass(node);
+                    emitDecoratorsOfClass(node, decoratedClassAlias);
                 }
-                if (!(node.flags & 2 /* Export */)) {
+                if (!(node.flags & 1 /* Export */)) {
                     return;
                 }
-                if (modulekind !== 5 /* ES6 */) {
+                if (modulekind !== ts.ModuleKind.ES6) {
                     emitExportMemberAssignment(node);
                 }
                 else {
@@ -36041,14 +38093,14 @@ var ts;
                     // module), export it
                     if (node.flags & 512 /* Default */) {
                         // if this is a top level default export of decorated class, write the export after the declaration.
-                        if (thisNodeIsDecorated) {
+                        if (isDecorated) {
                             writeLine();
                             write("export default ");
                             emitDeclarationName(node);
                             write(";");
                         }
                     }
-                    else if (node.parent.kind !== 251 /* SourceFile */) {
+                    else if (node.parent.kind !== 255 /* SourceFile */) {
                         writeLine();
                         emitStart(node);
                         emitModuleMemberName(node);
@@ -36060,7 +38112,7 @@ var ts;
                 }
             }
             function emitClassLikeDeclarationBelowES6(node) {
-                if (node.kind === 217 /* ClassDeclaration */) {
+                if (node.kind === 220 /* ClassDeclaration */) {
                     // source file level classes in system modules are hoisted so 'var's for them are already defined
                     if (!shouldHoistDeclarationInSystemJsModule(node)) {
                         write("var ");
@@ -36098,7 +38150,7 @@ var ts;
                 emitMemberFunctionsForES5AndLower(node);
                 emitPropertyDeclarations(node, getInitializedProperties(node, /*isStatic*/ true));
                 writeLine();
-                emitDecoratorsOfClass(node);
+                emitDecoratorsOfClass(node, /*decoratedClassAlias*/ undefined);
                 writeLine();
                 emitToken(16 /* CloseBraceToken */, node.members.end, function () {
                     write("return ");
@@ -36121,26 +38173,26 @@ var ts;
                     emit(baseTypeNode.expression);
                 }
                 write("))");
-                if (node.kind === 217 /* ClassDeclaration */) {
+                if (node.kind === 220 /* ClassDeclaration */) {
                     write(";");
                 }
                 emitEnd(node);
-                if (node.kind === 217 /* ClassDeclaration */) {
+                if (node.kind === 220 /* ClassDeclaration */) {
                     emitExportMemberAssignment(node);
                 }
             }
             function emitClassMemberPrefix(node, member) {
                 emitDeclarationName(node);
-                if (!(member.flags & 64 /* Static */)) {
+                if (!(member.flags & 32 /* Static */)) {
                     write(".prototype");
                 }
             }
-            function emitDecoratorsOfClass(node) {
+            function emitDecoratorsOfClass(node, decoratedClassAlias) {
                 emitDecoratorsOfMembers(node, /*staticFlag*/ 0);
-                emitDecoratorsOfMembers(node, 64 /* Static */);
-                emitDecoratorsOfConstructor(node);
+                emitDecoratorsOfMembers(node, 32 /* Static */);
+                emitDecoratorsOfConstructor(node, decoratedClassAlias);
             }
-            function emitDecoratorsOfConstructor(node) {
+            function emitDecoratorsOfConstructor(node, decoratedClassAlias) {
                 var decorators = node.decorators;
                 var constructor = ts.getFirstConstructorWithBody(node);
                 var firstParameterDecorator = constructor && ts.forEach(constructor.parameters, function (parameter) { return parameter.decorators; });
@@ -36161,6 +38213,9 @@ var ts;
                 writeLine();
                 emitStart(node.decorators || firstParameterDecorator);
                 emitDeclarationName(node);
+                if (decoratedClassAlias !== undefined) {
+                    write(" = " + decoratedClassAlias);
+                }
                 write(" = __decorate([");
                 increaseIndent();
                 writeLine();
@@ -36183,7 +38238,7 @@ var ts;
                 for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
                     var member = _b[_a];
                     // only emit members in the correct group
-                    if ((member.flags & 64 /* Static */) !== staticFlag) {
+                    if ((member.flags & 32 /* Static */) !== staticFlag) {
                         continue;
                     }
                     // skip members that cannot be decorated (such as the constructor)
@@ -36209,7 +38264,7 @@ var ts;
                     else {
                         decorators = member.decorators;
                         // we only decorate the parameters here if this is a method
-                        if (member.kind === 144 /* MethodDeclaration */) {
+                        if (member.kind === 146 /* MethodDeclaration */) {
                             functionLikeMember = member;
                         }
                     }
@@ -36266,7 +38321,7 @@ var ts;
                     write(", ");
                     emitExpressionForPropertyName(member.name);
                     if (languageVersion > 0 /* ES3 */) {
-                        if (member.kind !== 142 /* PropertyDeclaration */) {
+                        if (member.kind !== 144 /* 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");
@@ -36286,19 +38341,19 @@ var ts;
             function emitDecoratorsOfParameters(node, leadingComma) {
                 var argumentsWritten = 0;
                 if (node) {
-                    var parameterIndex = 0;
+                    var parameterIndex_1 = 0;
                     for (var _a = 0, _b = node.parameters; _a < _b.length; _a++) {
                         var parameter = _b[_a];
                         if (ts.nodeIsDecorated(parameter)) {
                             var decorators = parameter.decorators;
                             argumentsWritten += emitList(decorators, 0, decorators.length, /*multiLine*/ true, /*trailingComma*/ false, /*leadingComma*/ leadingComma, /*noTrailingNewLine*/ true, function (decorator) {
-                                write("__param(" + parameterIndex + ", ");
+                                write("__param(" + parameterIndex_1 + ", ");
                                 emit(decorator.expression);
                                 write(")");
                             });
                             leadingComma = true;
                         }
-                        parameterIndex++;
+                        parameterIndex_1++;
                     }
                 }
                 return argumentsWritten;
@@ -36308,10 +38363,10 @@ var ts;
                 // The caller should have already tested whether the node has decorators and whether the emitDecoratorMetadata
                 // compiler option is set.
                 switch (node.kind) {
-                    case 144 /* MethodDeclaration */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
-                    case 142 /* PropertyDeclaration */:
+                    case 146 /* MethodDeclaration */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
+                    case 144 /* PropertyDeclaration */:
                         return true;
                 }
                 return false;
@@ -36321,7 +38376,7 @@ var ts;
                 // The caller should have already tested whether the node has decorators and whether the emitDecoratorMetadata
                 // compiler option is set.
                 switch (node.kind) {
-                    case 144 /* MethodDeclaration */:
+                    case 146 /* MethodDeclaration */:
                         return true;
                 }
                 return false;
@@ -36331,9 +38386,9 @@ var ts;
                 // The caller should have already tested whether the node has decorators and whether the emitDecoratorMetadata
                 // compiler option is set.
                 switch (node.kind) {
-                    case 217 /* ClassDeclaration */:
-                    case 144 /* MethodDeclaration */:
-                    case 147 /* SetAccessor */:
+                    case 220 /* ClassDeclaration */:
+                    case 146 /* MethodDeclaration */:
+                    case 149 /* SetAccessor */:
                         return true;
                 }
                 return false;
@@ -36351,19 +38406,19 @@ var ts;
                 //
                 // For rules on serializing type annotations, see `serializeTypeNode`.
                 switch (node.kind) {
-                    case 217 /* ClassDeclaration */:
+                    case 220 /* ClassDeclaration */:
                         write("Function");
                         return;
-                    case 142 /* PropertyDeclaration */:
+                    case 144 /* PropertyDeclaration */:
                         emitSerializedTypeNode(node.type);
                         return;
-                    case 139 /* Parameter */:
+                    case 141 /* Parameter */:
                         emitSerializedTypeNode(node.type);
                         return;
-                    case 146 /* GetAccessor */:
+                    case 148 /* GetAccessor */:
                         emitSerializedTypeNode(node.type);
                         return;
-                    case 147 /* SetAccessor */:
+                    case 149 /* SetAccessor */:
                         emitSerializedTypeNode(ts.getSetAccessorTypeAnnotationNode(node));
                         return;
                 }
@@ -36379,40 +38434,40 @@ var ts;
                         case 103 /* VoidKeyword */:
                             write("void 0");
                             return;
-                        case 161 /* ParenthesizedType */:
+                        case 163 /* ParenthesizedType */:
                             emitSerializedTypeNode(node.type);
                             return;
-                        case 153 /* FunctionType */:
-                        case 154 /* ConstructorType */:
+                        case 155 /* FunctionType */:
+                        case 156 /* ConstructorType */:
                             write("Function");
                             return;
-                        case 157 /* ArrayType */:
-                        case 158 /* TupleType */:
+                        case 159 /* ArrayType */:
+                        case 160 /* TupleType */:
                             write("Array");
                             return;
-                        case 151 /* TypePredicate */:
+                        case 153 /* TypePredicate */:
                         case 120 /* BooleanKeyword */:
                             write("Boolean");
                             return;
-                        case 130 /* StringKeyword */:
-                        case 163 /* StringLiteralType */:
+                        case 131 /* StringKeyword */:
+                        case 165 /* StringLiteralType */:
                             write("String");
                             return;
-                        case 128 /* NumberKeyword */:
+                        case 129 /* NumberKeyword */:
                             write("Number");
                             return;
-                        case 131 /* SymbolKeyword */:
+                        case 132 /* SymbolKeyword */:
                             write("Symbol");
                             return;
-                        case 152 /* TypeReference */:
+                        case 154 /* TypeReference */:
                             emitSerializedTypeReferenceNode(node);
                             return;
-                        case 155 /* TypeQuery */:
-                        case 156 /* TypeLiteral */:
-                        case 159 /* UnionType */:
-                        case 160 /* IntersectionType */:
+                        case 157 /* TypeQuery */:
+                        case 158 /* TypeLiteral */:
+                        case 161 /* UnionType */:
+                        case 162 /* IntersectionType */:
                         case 117 /* AnyKeyword */:
-                        case 162 /* ThisType */:
+                        case 164 /* ThisType */:
                             break;
                         default:
                             ts.Debug.fail("Cannot serialize unexpected type node.");
@@ -36484,8 +38539,8 @@ var ts;
                 //
                 // For the rules on serializing the type of each parameter declaration, see `serializeTypeOfDeclaration`.
                 if (node) {
-                    var valueDeclaration;
-                    if (node.kind === 217 /* ClassDeclaration */) {
+                    var valueDeclaration = void 0;
+                    if (node.kind === 220 /* ClassDeclaration */) {
                         valueDeclaration = ts.getFirstConstructorWithBody(node);
                     }
                     else if (ts.isFunctionLike(node) && ts.nodeIsPresent(node.body)) {
@@ -36501,10 +38556,10 @@ var ts;
                                 }
                                 if (parameters[i].dotDotDotToken) {
                                     var parameterType = parameters[i].type;
-                                    if (parameterType.kind === 157 /* ArrayType */) {
+                                    if (parameterType.kind === 159 /* ArrayType */) {
                                         parameterType = parameterType.elementType;
                                     }
-                                    else if (parameterType.kind === 152 /* TypeReference */ && parameterType.typeArguments && parameterType.typeArguments.length === 1) {
+                                    else if (parameterType.kind === 154 /* TypeReference */ && parameterType.typeArguments && parameterType.typeArguments.length === 1) {
                                         parameterType = parameterType.typeArguments[0];
                                     }
                                     else {
@@ -36581,7 +38636,7 @@ var ts;
                 if (!shouldHoistDeclarationInSystemJsModule(node)) {
                     // do not emit var if variable was already hoisted
                     var isES6ExportedEnum = isES6ExportedDeclaration(node);
-                    if (!(node.flags & 2 /* Export */) || (isES6ExportedEnum && isFirstDeclarationOfKind(node, node.symbol && node.symbol.declarations, 220 /* EnumDeclaration */))) {
+                    if (!(node.flags & 1 /* Export */) || (isES6ExportedEnum && isFirstDeclarationOfKind(node, node.symbol && node.symbol.declarations, 223 /* EnumDeclaration */))) {
                         emitStart(node);
                         if (isES6ExportedEnum) {
                             write("export ");
@@ -36610,7 +38665,7 @@ var ts;
                 emitModuleMemberName(node);
                 write(" = {}));");
                 emitEnd(node);
-                if (!isES6ExportedDeclaration(node) && node.flags & 2 /* Export */ && !shouldHoistDeclarationInSystemJsModule(node)) {
+                if (!isES6ExportedDeclaration(node) && node.flags & 1 /* Export */ && !shouldHoistDeclarationInSystemJsModule(node)) {
                     // do not emit var if variable was already hoisted
                     writeLine();
                     emitStart(node);
@@ -36621,8 +38676,8 @@ var ts;
                     emitEnd(node);
                     write(";");
                 }
-                if (modulekind !== 5 /* ES6 */ && node.parent === currentSourceFile) {
-                    if (modulekind === 4 /* System */ && (node.flags & 2 /* Export */)) {
+                if (modulekind !== ts.ModuleKind.ES6 && node.parent === currentSourceFile) {
+                    if (modulekind === ts.ModuleKind.System && (node.flags & 1 /* Export */)) {
                         // write the call to exporter for enum
                         writeLine();
                         write(exportFunctionForFile + "(\"");
@@ -36663,7 +38718,7 @@ var ts;
                 }
             }
             function getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration) {
-                if (moduleDeclaration.body.kind === 221 /* ModuleDeclaration */) {
+                if (moduleDeclaration.body.kind === 224 /* ModuleDeclaration */) {
                     var recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration.body);
                     return recursiveInnerModule || moduleDeclaration.body;
                 }
@@ -36687,7 +38742,7 @@ var ts;
                 var emitVarForModule = !hoistedInDeclarationScope && !isModuleMergedWithES6Class(node);
                 if (emitVarForModule) {
                     var isES6ExportedNamespace = isES6ExportedDeclaration(node);
-                    if (!isES6ExportedNamespace || isFirstDeclarationOfKind(node, node.symbol && node.symbol.declarations, 221 /* ModuleDeclaration */)) {
+                    if (!isES6ExportedNamespace || isFirstDeclarationOfKind(node, node.symbol && node.symbol.declarations, 224 /* ModuleDeclaration */)) {
                         emitStart(node);
                         if (isES6ExportedNamespace) {
                             write("export ");
@@ -36705,7 +38760,7 @@ var ts;
                 write(getGeneratedNameForNode(node));
                 emitEnd(node.name);
                 write(") ");
-                if (node.body.kind === 222 /* ModuleBlock */) {
+                if (node.body.kind === 225 /* ModuleBlock */) {
                     var saveConvertedLoopState = convertedLoopState;
                     var saveTempFlags = tempFlags;
                     var saveTempVariables = tempVariables;
@@ -36731,7 +38786,7 @@ var ts;
                 }
                 write(")(");
                 // write moduleDecl = containingModule.m only if it is not exported es6 module member
-                if ((node.flags & 2 /* Export */) && !isES6ExportedDeclaration(node)) {
+                if ((node.flags & 1 /* Export */) && !isES6ExportedDeclaration(node)) {
                     emit(node.name);
                     write(" = ");
                 }
@@ -36741,7 +38796,7 @@ var ts;
                 write(" = {}));");
                 emitEnd(node);
                 if (!isES6ExportedDeclaration(node) && node.name.kind === 69 /* Identifier */ && node.parent === currentSourceFile) {
-                    if (modulekind === 4 /* System */ && (node.flags & 2 /* Export */)) {
+                    if (modulekind === ts.ModuleKind.System && (node.flags & 1 /* Export */)) {
                         writeLine();
                         write(exportFunctionForFile + "(\"");
                         emitDeclarationName(node);
@@ -36781,16 +38836,16 @@ var ts;
                 }
             }
             function getNamespaceDeclarationNode(node) {
-                if (node.kind === 224 /* ImportEqualsDeclaration */) {
+                if (node.kind === 228 /* ImportEqualsDeclaration */) {
                     return node;
                 }
                 var importClause = node.importClause;
-                if (importClause && importClause.namedBindings && importClause.namedBindings.kind === 227 /* NamespaceImport */) {
+                if (importClause && importClause.namedBindings && importClause.namedBindings.kind === 231 /* NamespaceImport */) {
                     return importClause.namedBindings;
                 }
             }
             function isDefaultImport(node) {
-                return node.kind === 225 /* ImportDeclaration */ && node.importClause && !!node.importClause.name;
+                return node.kind === 229 /* ImportDeclaration */ && node.importClause && !!node.importClause.name;
             }
             function emitExportImportAssignments(node) {
                 if (ts.isAliasSymbolDeclaration(node) && resolver.isValueAliasDeclaration(node)) {
@@ -36799,7 +38854,7 @@ var ts;
                 ts.forEachChild(node, emitExportImportAssignments);
             }
             function emitImportDeclaration(node) {
-                if (modulekind !== 5 /* ES6 */) {
+                if (modulekind !== ts.ModuleKind.ES6) {
                     return emitExternalImportDeclaration(node);
                 }
                 // ES6 import
@@ -36818,7 +38873,7 @@ var ts;
                         if (shouldEmitNamedBindings) {
                             emitLeadingComments(node.importClause.namedBindings);
                             emitStart(node.importClause.namedBindings);
-                            if (node.importClause.namedBindings.kind === 227 /* NamespaceImport */) {
+                            if (node.importClause.namedBindings.kind === 231 /* NamespaceImport */) {
                                 write("* as ");
                                 emit(node.importClause.namedBindings.name);
                             }
@@ -36844,16 +38899,19 @@ var ts;
             }
             function emitExternalImportDeclaration(node) {
                 if (ts.contains(externalImports, node)) {
-                    var isExportedImport = node.kind === 224 /* ImportEqualsDeclaration */ && (node.flags & 2 /* Export */) !== 0;
+                    var isExportedImport = node.kind === 228 /* ImportEqualsDeclaration */ && (node.flags & 1 /* Export */) !== 0;
                     var namespaceDeclaration = getNamespaceDeclarationNode(node);
-                    if (modulekind !== 2 /* AMD */) {
+                    var varOrConst = (languageVersion <= 1 /* ES5 */) ? "var " : "const ";
+                    if (modulekind !== ts.ModuleKind.AMD) {
                         emitLeadingComments(node);
                         emitStart(node);
                         if (namespaceDeclaration && !isDefaultImport(node)) {
                             // import x = require("foo")
                             // import * as x from "foo"
-                            if (!isExportedImport)
-                                write("var ");
+                            if (!isExportedImport) {
+                                write(varOrConst);
+                            }
+                            ;
                             emitModuleMemberName(namespaceDeclaration);
                             write(" = ");
                         }
@@ -36863,9 +38921,9 @@ var ts;
                             // import { x, y } from "foo"
                             // import d, * as x from "foo"
                             // import d, { x, y } from "foo"
-                            var isNakedImport = 225 /* ImportDeclaration */ && !node.importClause;
+                            var isNakedImport = 229 /* ImportDeclaration */ && !node.importClause;
                             if (!isNakedImport) {
-                                write("var ");
+                                write(varOrConst);
                                 write(getGeneratedNameForNode(node));
                                 write(" = ");
                             }
@@ -36892,7 +38950,7 @@ var ts;
                         }
                         else if (namespaceDeclaration && isDefaultImport(node)) {
                             // import d, * as x from "foo"
-                            write("var ");
+                            write(varOrConst);
                             emitModuleMemberName(namespaceDeclaration);
                             write(" = ");
                             write(getGeneratedNameForNode(node));
@@ -36926,7 +38984,7 @@ var ts;
                             write("export ");
                             write("var ");
                         }
-                        else if (!(node.flags & 2 /* Export */)) {
+                        else if (!(node.flags & 1 /* Export */)) {
                             write("var ");
                         }
                     }
@@ -36948,14 +39006,14 @@ var ts;
                 }
             }
             function emitExportDeclaration(node) {
-                ts.Debug.assert(modulekind !== 4 /* System */);
-                if (modulekind !== 5 /* ES6 */) {
+                ts.Debug.assert(modulekind !== ts.ModuleKind.System);
+                if (modulekind !== ts.ModuleKind.ES6) {
                     if (node.moduleSpecifier && (!node.exportClause || resolver.isValueAliasDeclaration(node))) {
                         emitStart(node);
                         var generatedName = getGeneratedNameForNode(node);
                         if (node.exportClause) {
                             // export { x, y, ... } from "foo"
-                            if (modulekind !== 2 /* AMD */) {
+                            if (modulekind !== ts.ModuleKind.AMD) {
                                 write("var ");
                                 write(generatedName);
                                 write(" = ");
@@ -36984,7 +39042,7 @@ var ts;
                             if (hasExportStarsToExportValues && resolver.moduleExportsSomeValue(node.moduleSpecifier)) {
                                 writeLine();
                                 write("__export(");
-                                if (modulekind !== 2 /* AMD */) {
+                                if (modulekind !== ts.ModuleKind.AMD) {
                                     emitRequire(ts.getExternalModuleName(node));
                                 }
                                 else {
@@ -37017,7 +39075,7 @@ var ts;
                 }
             }
             function emitExportOrImportSpecifierList(specifiers, shouldEmit) {
-                ts.Debug.assert(modulekind === 5 /* ES6 */);
+                ts.Debug.assert(modulekind === ts.ModuleKind.ES6);
                 var needsComma = false;
                 for (var _a = 0, specifiers_1 = specifiers; _a < specifiers_1.length; _a++) {
                     var specifier = specifiers_1[_a];
@@ -37036,14 +39094,14 @@ var ts;
             }
             function emitExportAssignment(node) {
                 if (!node.isExportEquals && resolver.isValueAliasDeclaration(node)) {
-                    if (modulekind === 5 /* ES6 */) {
+                    if (modulekind === ts.ModuleKind.ES6) {
                         writeLine();
                         emitStart(node);
                         write("export default ");
                         var expression = node.expression;
                         emit(expression);
-                        if (expression.kind !== 216 /* FunctionDeclaration */ &&
-                            expression.kind !== 217 /* ClassDeclaration */) {
+                        if (expression.kind !== 219 /* FunctionDeclaration */ &&
+                            expression.kind !== 220 /* ClassDeclaration */) {
                             write(";");
                         }
                         emitEnd(node);
@@ -37051,7 +39109,7 @@ var ts;
                     else {
                         writeLine();
                         emitStart(node);
-                        if (modulekind === 4 /* System */) {
+                        if (modulekind === ts.ModuleKind.System) {
                             write(exportFunctionForFile + "(\"default\",");
                             emit(node.expression);
                             write(")");
@@ -37060,7 +39118,7 @@ var ts;
                             emitEs6ExportDefaultCompat(node);
                             emitContainingModuleName(node);
                             if (languageVersion === 0 /* ES3 */) {
-                                write("[\"default\"] = ");
+                                write('["default"] = ');
                             }
                             else {
                                 write(".default = ");
@@ -37080,7 +39138,7 @@ var ts;
                 for (var _a = 0, _b = sourceFile.statements; _a < _b.length; _a++) {
                     var node = _b[_a];
                     switch (node.kind) {
-                        case 225 /* ImportDeclaration */:
+                        case 229 /* ImportDeclaration */:
                             if (!node.importClause ||
                                 resolver.isReferencedAliasDeclaration(node.importClause, /*checkChildren*/ true)) {
                                 // import "mod"
@@ -37090,13 +39148,13 @@ var ts;
                                 externalImports.push(node);
                             }
                             break;
-                        case 224 /* ImportEqualsDeclaration */:
-                            if (node.moduleReference.kind === 235 /* ExternalModuleReference */ && resolver.isReferencedAliasDeclaration(node)) {
+                        case 228 /* ImportEqualsDeclaration */:
+                            if (node.moduleReference.kind === 239 /* ExternalModuleReference */ && resolver.isReferencedAliasDeclaration(node)) {
                                 // import x = require("mod") where x is referenced
                                 externalImports.push(node);
                             }
                             break;
-                        case 231 /* ExportDeclaration */:
+                        case 235 /* ExportDeclaration */:
                             if (node.moduleSpecifier) {
                                 if (!node.exportClause) {
                                     // export * from "mod"
@@ -37114,12 +39172,12 @@ var ts;
                                 // export { x, y }
                                 for (var _c = 0, _d = node.exportClause.elements; _c < _d.length; _c++) {
                                     var specifier = _d[_c];
-                                    var name_27 = (specifier.propertyName || specifier.name).text;
-                                    (exportSpecifiers[name_27] || (exportSpecifiers[name_27] = [])).push(specifier);
+                                    var name_29 = (specifier.propertyName || specifier.name).text;
+                                    (exportSpecifiers[name_29] || (exportSpecifiers[name_29] = [])).push(specifier);
                                 }
                             }
                             break;
-                        case 230 /* ExportAssignment */:
+                        case 234 /* ExportAssignment */:
                             if (node.isExportEquals && !exportEquals) {
                                 // export = x
                                 exportEquals = node;
@@ -37145,18 +39203,18 @@ var ts;
                 if (namespaceDeclaration && !isDefaultImport(node)) {
                     return ts.getTextOfNodeFromSourceText(currentText, namespaceDeclaration.name);
                 }
-                if (node.kind === 225 /* ImportDeclaration */ && node.importClause) {
+                if (node.kind === 229 /* ImportDeclaration */ && node.importClause) {
                     return getGeneratedNameForNode(node);
                 }
-                if (node.kind === 231 /* ExportDeclaration */ && node.moduleSpecifier) {
+                if (node.kind === 235 /* ExportDeclaration */ && node.moduleSpecifier) {
                     return getGeneratedNameForNode(node);
                 }
             }
             function getExternalModuleNameText(importNode, emitRelativePathAsModuleName) {
                 if (emitRelativePathAsModuleName) {
-                    var name_28 = getExternalModuleNameFromDeclaration(host, resolver, importNode);
-                    if (name_28) {
-                        return "\"" + name_28 + "\"";
+                    var name_30 = getExternalModuleNameFromDeclaration(host, resolver, importNode);
+                    if (name_30) {
+                        return "\"" + name_30 + "\"";
                     }
                 }
                 var moduleName = ts.getExternalModuleName(importNode);
@@ -37174,8 +39232,8 @@ var ts;
                 for (var _a = 0, externalImports_1 = externalImports; _a < externalImports_1.length; _a++) {
                     var importNode = externalImports_1[_a];
                     // do not create variable declaration for exports and imports that lack import clause
-                    var skipNode = importNode.kind === 231 /* ExportDeclaration */ ||
-                        (importNode.kind === 225 /* ImportDeclaration */ && !importNode.importClause);
+                    var skipNode = importNode.kind === 235 /* ExportDeclaration */ ||
+                        (importNode.kind === 229 /* ImportDeclaration */ && !importNode.importClause);
                     if (skipNode) {
                         continue;
                     }
@@ -37196,7 +39254,7 @@ var ts;
                 // 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.
+                // 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;
@@ -37208,7 +39266,7 @@ var ts;
                     var hasExportDeclarationWithExportClause = false;
                     for (var _a = 0, externalImports_2 = externalImports; _a < externalImports_2.length; _a++) {
                         var externalImport = externalImports_2[_a];
-                        if (externalImport.kind === 231 /* ExportDeclaration */ && externalImport.exportClause) {
+                        if (externalImport.kind === 235 /* ExportDeclaration */ && externalImport.exportClause) {
                             hasExportDeclarationWithExportClause = true;
                             break;
                         }
@@ -37240,7 +39298,7 @@ var ts;
                 }
                 for (var _d = 0, externalImports_3 = externalImports; _d < externalImports_3.length; _d++) {
                     var externalImport = externalImports_3[_d];
-                    if (externalImport.kind !== 231 /* ExportDeclaration */) {
+                    if (externalImport.kind !== 235 /* ExportDeclaration */) {
                         continue;
                     }
                     var exportDecl = externalImport;
@@ -37328,12 +39386,12 @@ var ts;
                     var seen = {};
                     for (var i = 0; i < hoistedVars.length; i++) {
                         var local = hoistedVars[i];
-                        var name_29 = local.kind === 69 /* Identifier */
+                        var name_31 = local.kind === 69 /* Identifier */
                             ? local
                             : local.name;
-                        if (name_29) {
+                        if (name_31) {
                             // do not emit duplicate entries (in case of declaration merging) in the list of hoisted variables
-                            var text = ts.unescapeIdentifier(name_29.text);
+                            var text = ts.unescapeIdentifier(name_31.text);
                             if (ts.hasProperty(seen, text)) {
                                 continue;
                             }
@@ -37344,14 +39402,14 @@ var ts;
                         if (i !== 0) {
                             write(", ");
                         }
-                        if (local.kind === 217 /* ClassDeclaration */ || local.kind === 221 /* ModuleDeclaration */ || local.kind === 220 /* EnumDeclaration */) {
+                        if (local.kind === 220 /* ClassDeclaration */ || local.kind === 224 /* ModuleDeclaration */ || local.kind === 223 /* EnumDeclaration */) {
                             emitDeclarationName(local);
                         }
                         else {
                             emit(local);
                         }
                         var flags = ts.getCombinedNodeFlags(local.kind === 69 /* Identifier */ ? local.parent : local);
-                        if (flags & 2 /* Export */) {
+                        if (flags & 1 /* Export */) {
                             if (!exportedDeclarations) {
                                 exportedDeclarations = [];
                             }
@@ -37365,7 +39423,7 @@ var ts;
                         var f = hoistedFunctionDeclarations_1[_a];
                         writeLine();
                         emit(f);
-                        if (f.flags & 2 /* Export */) {
+                        if (f.flags & 1 /* Export */) {
                             if (!exportedDeclarations) {
                                 exportedDeclarations = [];
                             }
@@ -37375,24 +39433,24 @@ var ts;
                 }
                 return exportedDeclarations;
                 function visit(node) {
-                    if (node.flags & 4 /* Ambient */) {
+                    if (node.flags & 2 /* Ambient */) {
                         return;
                     }
-                    if (node.kind === 216 /* FunctionDeclaration */) {
+                    if (node.kind === 219 /* FunctionDeclaration */) {
                         if (!hoistedFunctionDeclarations) {
                             hoistedFunctionDeclarations = [];
                         }
                         hoistedFunctionDeclarations.push(node);
                         return;
                     }
-                    if (node.kind === 217 /* ClassDeclaration */) {
+                    if (node.kind === 220 /* ClassDeclaration */) {
                         if (!hoistedVars) {
                             hoistedVars = [];
                         }
                         hoistedVars.push(node);
                         return;
                     }
-                    if (node.kind === 220 /* EnumDeclaration */) {
+                    if (node.kind === 223 /* EnumDeclaration */) {
                         if (shouldEmitEnumDeclaration(node)) {
                             if (!hoistedVars) {
                                 hoistedVars = [];
@@ -37401,7 +39459,7 @@ var ts;
                         }
                         return;
                     }
-                    if (node.kind === 221 /* ModuleDeclaration */) {
+                    if (node.kind === 224 /* ModuleDeclaration */) {
                         if (shouldEmitModuleDeclaration(node)) {
                             if (!hoistedVars) {
                                 hoistedVars = [];
@@ -37410,17 +39468,17 @@ var ts;
                         }
                         return;
                     }
-                    if (node.kind === 214 /* VariableDeclaration */ || node.kind === 166 /* BindingElement */) {
+                    if (node.kind === 217 /* VariableDeclaration */ || node.kind === 168 /* BindingElement */) {
                         if (shouldHoistVariable(node, /*checkIfSourceFileLevelDecl*/ false)) {
-                            var name_30 = node.name;
-                            if (name_30.kind === 69 /* Identifier */) {
+                            var name_32 = node.name;
+                            if (name_32.kind === 69 /* Identifier */) {
                                 if (!hoistedVars) {
                                     hoistedVars = [];
                                 }
-                                hoistedVars.push(name_30);
+                                hoistedVars.push(name_32);
                             }
                             else {
-                                ts.forEachChild(name_30, visit);
+                                ts.forEachChild(name_32, visit);
                             }
                         }
                         return;
@@ -37450,11 +39508,11 @@ var ts;
                 // - 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 (ts.getCombinedNodeFlags(node) & 24576 /* BlockScoped */) === 0 ||
-                    ts.getEnclosingBlockScopeContainer(node).kind === 251 /* SourceFile */;
+                return (ts.getCombinedNodeFlags(node) & 3072 /* BlockScoped */) === 0 ||
+                    ts.getEnclosingBlockScopeContainer(node).kind === 255 /* SourceFile */;
             }
             function isCurrentFileSystemExternalModule() {
-                return modulekind === 4 /* System */ && isCurrentFileExternalModule;
+                return modulekind === ts.ModuleKind.System && isCurrentFileExternalModule;
             }
             function emitSystemModuleBody(node, dependencyGroups, startIndex) {
                 // shape of the body in system modules:
@@ -37526,21 +39584,21 @@ var ts;
                         var entry = group_1[_a];
                         var importVariableName = getLocalNameForExternalImport(entry) || "";
                         switch (entry.kind) {
-                            case 225 /* ImportDeclaration */:
+                            case 229 /* ImportDeclaration */:
                                 if (!entry.importClause) {
                                     // 'import "..."' case
                                     // module is imported only for side-effects, no emit required
                                     break;
                                 }
                             // fall-through
-                            case 224 /* ImportEqualsDeclaration */:
+                            case 228 /* ImportEqualsDeclaration */:
                                 ts.Debug.assert(importVariableName !== "");
                                 writeLine();
                                 // save import into the local
                                 write(importVariableName + " = " + parameterName + ";");
                                 writeLine();
                                 break;
-                            case 231 /* ExportDeclaration */:
+                            case 235 /* ExportDeclaration */:
                                 ts.Debug.assert(importVariableName !== "");
                                 if (entry.exportClause) {
                                     // export {a, b as c} from 'foo'
@@ -37599,10 +39657,10 @@ var ts;
                         // - 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 216 /* FunctionDeclaration */:
-                        case 225 /* ImportDeclaration */:
+                        case 219 /* FunctionDeclaration */:
+                        case 229 /* ImportDeclaration */:
                             continue;
-                        case 231 /* ExportDeclaration */:
+                        case 235 /* ExportDeclaration */:
                             if (!statement.moduleSpecifier) {
                                 for (var _a = 0, _b = statement.exportClause.elements; _a < _b.length; _a++) {
                                     var element = _b[_a];
@@ -37611,7 +39669,7 @@ var ts;
                                 }
                             }
                             continue;
-                        case 224 /* ImportEqualsDeclaration */:
+                        case 228 /* ImportEqualsDeclaration */:
                             if (!ts.isInternalModuleImportEqualsDeclaration(statement)) {
                                 // - import equals declarations that import external modules are not emitted
                                 continue;
@@ -37645,6 +39703,7 @@ var ts;
                 ts.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);
@@ -37653,14 +39712,20 @@ var ts;
                 var dependencyGroups = [];
                 for (var i = 0; i < externalImports.length; i++) {
                     var text = getExternalModuleNameText(externalImports[i], emitRelativePathAsModuleName);
-                    if (ts.hasProperty(groupIndices, text)) {
+                    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
+                    var key = text.substr(1, text.length - 2);
+                    if (ts.hasProperty(groupIndices, key)) {
                         // deduplicate/group entries in dependency list by the dependency name
-                        var groupIndex = groupIndices[text];
+                        var groupIndex = groupIndices[key];
                         dependencyGroups[groupIndex].push(externalImports[i]);
                         continue;
                     }
                     else {
-                        groupIndices[text] = dependencyGroups.length;
+                        groupIndices[key] = dependencyGroups.length;
                         dependencyGroups.push([externalImports[i]]);
                     }
                     if (i !== 0) {
@@ -37668,10 +39733,13 @@ var ts;
                     }
                     write(text);
                 }
-                write("], function(" + exportFunctionForFile + ") {");
+                write("], function(" + exportFunctionForFile + ", " + contextObjectForFile + ") {");
                 writeLine();
                 increaseIndent();
-                var startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ true);
+                var 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);
@@ -37691,11 +39759,11 @@ var ts;
                 for (var _a = 0, _b = node.amdDependencies; _a < _b.length; _a++) {
                     var amdDependency = _b[_a];
                     if (amdDependency.name) {
-                        aliasedModuleNames.push("\"" + amdDependency.path + "\"");
+                        aliasedModuleNames.push('"' + amdDependency.path + '"');
                         importAliasNames.push(amdDependency.name);
                     }
                     else {
-                        unaliasedModuleNames.push("\"" + amdDependency.path + "\"");
+                        unaliasedModuleNames.push('"' + amdDependency.path + '"');
                     }
                 }
                 for (var _c = 0, externalImports_4 = externalImports; _c < externalImports_4.length; _c++) {
@@ -37733,7 +39801,7 @@ var ts;
             }
             function emitAMDDependencyList(_a) {
                 var aliasedModuleNames = _a.aliasedModuleNames, unaliasedModuleNames = _a.unaliasedModuleNames;
-                write("[\"require\", \"exports\"");
+                write('["require", "exports"');
                 if (aliasedModuleNames.length) {
                     write(", ");
                     write(aliasedModuleNames.join(", "));
@@ -37761,25 +39829,25 @@ var ts;
                 writeModuleName(node, emitRelativePathAsModuleName);
                 emitAMDDependencies(node, /*includeNonAmdDependencies*/ true, emitRelativePathAsModuleName);
                 increaseIndent();
-                var startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ true);
+                var startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict);
                 emitExportStarHelper();
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
-                emitTempDeclarations(/*newLine*/ true);
                 emitExportEquals(/*emitAsReturn*/ true);
+                emitTempDeclarations(/*newLine*/ true);
                 decreaseIndent();
                 writeLine();
                 write("});");
             }
             function emitCommonJSModule(node) {
-                var startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false, /*ensureUseStrict*/ true);
+                var startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict);
                 emitEmitHelpers(node);
                 collectExternalModuleInfo(node);
                 emitExportStarHelper();
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
-                emitTempDeclarations(/*newLine*/ true);
                 emitExportEquals(/*emitAsReturn*/ false);
+                emitTempDeclarations(/*newLine*/ true);
             }
             function emitUMDModule(node) {
                 emitEmitHelpers(node);
@@ -37792,12 +39860,12 @@ var ts;
                 writeLines("    }\n})(");
                 emitAMDFactoryHeader(dependencyNames);
                 increaseIndent();
-                var startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ true);
+                var startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict);
                 emitExportStarHelper();
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
-                emitTempDeclarations(/*newLine*/ true);
                 emitExportEquals(/*emitAsReturn*/ true);
+                emitTempDeclarations(/*newLine*/ true);
                 decreaseIndent();
                 writeLine();
                 write("});");
@@ -37871,7 +39939,7 @@ var ts;
                         if (entities[m] !== undefined) {
                             var ch = String.fromCharCode(entities[m]);
                             // &quot; needs to be escaped
-                            return ch === "\"" ? "\\\"" : ch;
+                            return ch === '"' ? "\\\"" : ch;
                         }
                         else {
                             return s;
@@ -37880,6 +39948,18 @@ var ts;
                 }
                 return result;
             }
+            function isJsxChildEmittable(child) {
+                if (child.kind === 247 /* JsxExpression */) {
+                    // Don't emit empty expressions
+                    return !!child.expression;
+                }
+                else if (child.kind === 243 /* JsxText */) {
+                    // Don't emit empty strings
+                    return !!getTextToEmit(child);
+                }
+                return true;
+            }
+            ;
             function getTextToEmit(node) {
                 switch (compilerOptions.jsx) {
                     case 2 /* React */:
@@ -37898,9 +39978,9 @@ var ts;
             function emitJsxText(node) {
                 switch (compilerOptions.jsx) {
                     case 2 /* React */:
-                        write("\"");
+                        write('"');
                         write(trimReactWhitespaceAndApplyEntities(node));
-                        write("\"");
+                        write('"');
                         break;
                     case 1 /* Preserve */:
                     default:
@@ -37924,7 +40004,7 @@ var ts;
                 }
             }
             function isUseStrictPrologue(node) {
-                return !!node.expression.text.match(/use strict/);
+                return node.expression.text === "use strict";
             }
             function ensureUseStrictPrologue(startWithNewLine, writeUseStrict) {
                 if (writeUseStrict) {
@@ -37970,22 +40050,26 @@ var ts;
                 if (!compilerOptions.noEmitHelpers) {
                     // Only Emit __extends function when target ES5.
                     // For target ES6 and above, we can emit classDeclaration as is.
-                    if ((languageVersion < 2 /* ES6 */) && (!extendsEmitted && node.flags & 4194304 /* HasClassExtends */)) {
+                    if (languageVersion < 2 /* ES6 */ && !extendsEmitted && node.flags & 262144 /* HasClassExtends */) {
                         writeLines(extendsHelper);
                         extendsEmitted = true;
                     }
-                    if (!decorateEmitted && node.flags & 8388608 /* HasDecorators */) {
+                    if (compilerOptions.jsx !== 1 /* Preserve */ && !assignEmitted && (node.flags & 1073741824 /* HasJsxSpreadAttribute */)) {
+                        writeLines(assignHelper);
+                        assignEmitted = true;
+                    }
+                    if (!decorateEmitted && node.flags & 524288 /* HasDecorators */) {
                         writeLines(decorateHelper);
                         if (compilerOptions.emitDecoratorMetadata) {
                             writeLines(metadataHelper);
                         }
                         decorateEmitted = true;
                     }
-                    if (!paramEmitted && node.flags & 16777216 /* HasParamDecorators */) {
+                    if (!paramEmitted && node.flags & 1048576 /* HasParamDecorators */) {
                         writeLines(paramHelper);
                         paramEmitted = true;
                     }
-                    if (!awaiterEmitted && node.flags & 33554432 /* HasAsyncFunctions */) {
+                    if (!awaiterEmitted && node.flags & 2097152 /* HasAsyncFunctions */) {
                         writeLines(awaiterHelper);
                         awaiterEmitted = true;
                     }
@@ -37998,7 +40082,7 @@ var ts;
                 emitDetachedCommentsAndUpdateCommentsInfo(node);
                 if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
                     if (isOwnFileEmit || (!ts.isExternalModule(node) && compilerOptions.isolatedModules)) {
-                        var emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[1 /* CommonJS */];
+                        var emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[ts.ModuleKind.CommonJS];
                         emitModule(node);
                     }
                     else {
@@ -38027,7 +40111,7 @@ var ts;
             }
             function emitNodeConsideringCommentsOption(node, emitNodeConsideringSourcemap) {
                 if (node) {
-                    if (node.flags & 4 /* Ambient */) {
+                    if (node.flags & 2 /* Ambient */) {
                         return emitCommentsOnNotEmittedNode(node);
                     }
                     if (isSpecializedCommentHandling(node)) {
@@ -38073,24 +40157,24 @@ var ts;
                 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 218 /* InterfaceDeclaration */:
-                    case 216 /* FunctionDeclaration */:
-                    case 225 /* ImportDeclaration */:
-                    case 224 /* ImportEqualsDeclaration */:
-                    case 219 /* TypeAliasDeclaration */:
-                    case 230 /* ExportAssignment */:
+                    case 221 /* InterfaceDeclaration */:
+                    case 219 /* FunctionDeclaration */:
+                    case 229 /* ImportDeclaration */:
+                    case 228 /* ImportEqualsDeclaration */:
+                    case 222 /* TypeAliasDeclaration */:
+                    case 234 /* ExportAssignment */:
                         return true;
                 }
             }
             function shouldEmitLeadingAndTrailingComments(node) {
                 switch (node.kind) {
-                    case 196 /* VariableStatement */:
+                    case 199 /* VariableStatement */:
                         return shouldEmitLeadingAndTrailingCommentsForVariableStatement(node);
-                    case 221 /* ModuleDeclaration */:
+                    case 224 /* ModuleDeclaration */:
                         // Only emit the leading/trailing comments for a module if we're actually
                         // emitting the module as well.
                         return shouldEmitModuleDeclaration(node);
-                    case 220 /* EnumDeclaration */:
+                    case 223 /* EnumDeclaration */:
                         // Only emit the leading/trailing comments for an enum if we're actually
                         // emitting the module as well.
                         return shouldEmitEnumDeclaration(node);
@@ -38102,9 +40186,9 @@ var ts;
                 // 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 !== 195 /* Block */ &&
+                if (node.kind !== 198 /* Block */ &&
                     node.parent &&
-                    node.parent.kind === 177 /* ArrowFunction */ &&
+                    node.parent.kind === 179 /* ArrowFunction */ &&
                     node.parent.body === node &&
                     compilerOptions.target <= 1 /* ES5 */) {
                     return false;
@@ -38117,13 +40201,13 @@ var ts;
                 switch (node.kind) {
                     case 69 /* Identifier */:
                         return emitIdentifier(node);
-                    case 139 /* Parameter */:
+                    case 141 /* Parameter */:
                         return emitParameter(node);
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
                         return emitMethod(node);
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
                         return emitAccessor(node);
                     case 97 /* ThisKeyword */:
                         return emitThis(node);
@@ -38143,142 +40227,142 @@ var ts;
                     case 13 /* TemplateMiddle */:
                     case 14 /* TemplateTail */:
                         return emitLiteral(node);
-                    case 186 /* TemplateExpression */:
+                    case 188 /* TemplateExpression */:
                         return emitTemplateExpression(node);
-                    case 193 /* TemplateSpan */:
+                    case 196 /* TemplateSpan */:
                         return emitTemplateSpan(node);
-                    case 236 /* JsxElement */:
-                    case 237 /* JsxSelfClosingElement */:
+                    case 240 /* JsxElement */:
+                    case 241 /* JsxSelfClosingElement */:
                         return emitJsxElement(node);
-                    case 239 /* JsxText */:
+                    case 243 /* JsxText */:
                         return emitJsxText(node);
-                    case 243 /* JsxExpression */:
+                    case 247 /* JsxExpression */:
                         return emitJsxExpression(node);
-                    case 136 /* QualifiedName */:
+                    case 138 /* QualifiedName */:
                         return emitQualifiedName(node);
-                    case 164 /* ObjectBindingPattern */:
+                    case 166 /* ObjectBindingPattern */:
                         return emitObjectBindingPattern(node);
-                    case 165 /* ArrayBindingPattern */:
+                    case 167 /* ArrayBindingPattern */:
                         return emitArrayBindingPattern(node);
-                    case 166 /* BindingElement */:
+                    case 168 /* BindingElement */:
                         return emitBindingElement(node);
-                    case 167 /* ArrayLiteralExpression */:
+                    case 169 /* ArrayLiteralExpression */:
                         return emitArrayLiteral(node);
-                    case 168 /* ObjectLiteralExpression */:
+                    case 170 /* ObjectLiteralExpression */:
                         return emitObjectLiteral(node);
-                    case 248 /* PropertyAssignment */:
+                    case 252 /* PropertyAssignment */:
                         return emitPropertyAssignment(node);
-                    case 249 /* ShorthandPropertyAssignment */:
+                    case 253 /* ShorthandPropertyAssignment */:
                         return emitShorthandPropertyAssignment(node);
-                    case 137 /* ComputedPropertyName */:
+                    case 139 /* ComputedPropertyName */:
                         return emitComputedPropertyName(node);
-                    case 169 /* PropertyAccessExpression */:
+                    case 171 /* PropertyAccessExpression */:
                         return emitPropertyAccess(node);
-                    case 170 /* ElementAccessExpression */:
+                    case 172 /* ElementAccessExpression */:
                         return emitIndexedAccess(node);
-                    case 171 /* CallExpression */:
+                    case 173 /* CallExpression */:
                         return emitCallExpression(node);
-                    case 172 /* NewExpression */:
+                    case 174 /* NewExpression */:
                         return emitNewExpression(node);
-                    case 173 /* TaggedTemplateExpression */:
+                    case 175 /* TaggedTemplateExpression */:
                         return emitTaggedTemplateExpression(node);
-                    case 174 /* TypeAssertionExpression */:
+                    case 176 /* TypeAssertionExpression */:
+                    case 194 /* AsExpression */:
+                    case 195 /* NonNullExpression */:
                         return emit(node.expression);
-                    case 192 /* AsExpression */:
-                        return emit(node.expression);
-                    case 175 /* ParenthesizedExpression */:
+                    case 177 /* ParenthesizedExpression */:
                         return emitParenExpression(node);
-                    case 216 /* FunctionDeclaration */:
-                    case 176 /* FunctionExpression */:
-                    case 177 /* ArrowFunction */:
+                    case 219 /* FunctionDeclaration */:
+                    case 178 /* FunctionExpression */:
+                    case 179 /* ArrowFunction */:
                         return emitFunctionDeclaration(node);
-                    case 178 /* DeleteExpression */:
+                    case 180 /* DeleteExpression */:
                         return emitDeleteExpression(node);
-                    case 179 /* TypeOfExpression */:
+                    case 181 /* TypeOfExpression */:
                         return emitTypeOfExpression(node);
-                    case 180 /* VoidExpression */:
+                    case 182 /* VoidExpression */:
                         return emitVoidExpression(node);
-                    case 181 /* AwaitExpression */:
+                    case 183 /* AwaitExpression */:
                         return emitAwaitExpression(node);
-                    case 182 /* PrefixUnaryExpression */:
+                    case 184 /* PrefixUnaryExpression */:
                         return emitPrefixUnaryExpression(node);
-                    case 183 /* PostfixUnaryExpression */:
+                    case 185 /* PostfixUnaryExpression */:
                         return emitPostfixUnaryExpression(node);
-                    case 184 /* BinaryExpression */:
+                    case 186 /* BinaryExpression */:
                         return emitBinaryExpression(node);
-                    case 185 /* ConditionalExpression */:
+                    case 187 /* ConditionalExpression */:
                         return emitConditionalExpression(node);
-                    case 188 /* SpreadElementExpression */:
+                    case 190 /* SpreadElementExpression */:
                         return emitSpreadElementExpression(node);
-                    case 187 /* YieldExpression */:
+                    case 189 /* YieldExpression */:
                         return emitYieldExpression(node);
-                    case 190 /* OmittedExpression */:
+                    case 192 /* OmittedExpression */:
                         return;
-                    case 195 /* Block */:
-                    case 222 /* ModuleBlock */:
+                    case 198 /* Block */:
+                    case 225 /* ModuleBlock */:
                         return emitBlock(node);
-                    case 196 /* VariableStatement */:
+                    case 199 /* VariableStatement */:
                         return emitVariableStatement(node);
-                    case 197 /* EmptyStatement */:
+                    case 200 /* EmptyStatement */:
                         return write(";");
-                    case 198 /* ExpressionStatement */:
+                    case 201 /* ExpressionStatement */:
                         return emitExpressionStatement(node);
-                    case 199 /* IfStatement */:
+                    case 202 /* IfStatement */:
                         return emitIfStatement(node);
-                    case 200 /* DoStatement */:
+                    case 203 /* DoStatement */:
                         return emitDoStatement(node);
-                    case 201 /* WhileStatement */:
+                    case 204 /* WhileStatement */:
                         return emitWhileStatement(node);
-                    case 202 /* ForStatement */:
+                    case 205 /* ForStatement */:
                         return emitForStatement(node);
-                    case 204 /* ForOfStatement */:
-                    case 203 /* ForInStatement */:
+                    case 207 /* ForOfStatement */:
+                    case 206 /* ForInStatement */:
                         return emitForInOrForOfStatement(node);
-                    case 205 /* ContinueStatement */:
-                    case 206 /* BreakStatement */:
+                    case 208 /* ContinueStatement */:
+                    case 209 /* BreakStatement */:
                         return emitBreakOrContinueStatement(node);
-                    case 207 /* ReturnStatement */:
+                    case 210 /* ReturnStatement */:
                         return emitReturnStatement(node);
-                    case 208 /* WithStatement */:
+                    case 211 /* WithStatement */:
                         return emitWithStatement(node);
-                    case 209 /* SwitchStatement */:
+                    case 212 /* SwitchStatement */:
                         return emitSwitchStatement(node);
-                    case 244 /* CaseClause */:
-                    case 245 /* DefaultClause */:
+                    case 248 /* CaseClause */:
+                    case 249 /* DefaultClause */:
                         return emitCaseOrDefaultClause(node);
-                    case 210 /* LabeledStatement */:
+                    case 213 /* LabeledStatement */:
                         return emitLabeledStatement(node);
-                    case 211 /* ThrowStatement */:
+                    case 214 /* ThrowStatement */:
                         return emitThrowStatement(node);
-                    case 212 /* TryStatement */:
+                    case 215 /* TryStatement */:
                         return emitTryStatement(node);
-                    case 247 /* CatchClause */:
+                    case 251 /* CatchClause */:
                         return emitCatchClause(node);
-                    case 213 /* DebuggerStatement */:
+                    case 216 /* DebuggerStatement */:
                         return emitDebuggerStatement(node);
-                    case 214 /* VariableDeclaration */:
+                    case 217 /* VariableDeclaration */:
                         return emitVariableDeclaration(node);
-                    case 189 /* ClassExpression */:
+                    case 191 /* ClassExpression */:
                         return emitClassExpression(node);
-                    case 217 /* ClassDeclaration */:
+                    case 220 /* ClassDeclaration */:
                         return emitClassDeclaration(node);
-                    case 218 /* InterfaceDeclaration */:
+                    case 221 /* InterfaceDeclaration */:
                         return emitInterfaceDeclaration(node);
-                    case 220 /* EnumDeclaration */:
+                    case 223 /* EnumDeclaration */:
                         return emitEnumDeclaration(node);
-                    case 250 /* EnumMember */:
+                    case 254 /* EnumMember */:
                         return emitEnumMember(node);
-                    case 221 /* ModuleDeclaration */:
+                    case 224 /* ModuleDeclaration */:
                         return emitModuleDeclaration(node);
-                    case 225 /* ImportDeclaration */:
+                    case 229 /* ImportDeclaration */:
                         return emitImportDeclaration(node);
-                    case 224 /* ImportEqualsDeclaration */:
+                    case 228 /* ImportEqualsDeclaration */:
                         return emitImportEqualsDeclaration(node);
-                    case 231 /* ExportDeclaration */:
+                    case 235 /* ExportDeclaration */:
                         return emitExportDeclaration(node);
-                    case 230 /* ExportAssignment */:
+                    case 234 /* ExportAssignment */:
                         return emitExportAssignment(node);
-                    case 251 /* SourceFile */:
+                    case 255 /* SourceFile */:
                         return emitSourceFileNode(node);
                 }
             }
@@ -38317,7 +40401,7 @@ var ts;
             function getLeadingCommentsToEmit(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 === 251 /* SourceFile */ || node.pos !== node.parent.pos) {
+                    if (node.parent.kind === 255 /* SourceFile */ || node.pos !== node.parent.pos) {
                         if (hasDetachedComments(node.pos)) {
                             // get comments without detached comments
                             return getLeadingCommentsWithoutDetachedComments();
@@ -38332,7 +40416,7 @@ var ts;
             function getTrailingCommentsToEmit(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 === 251 /* SourceFile */ || node.end !== node.parent.end) {
+                    if (node.parent.kind === 255 /* SourceFile */ || node.end !== node.parent.end) {
                         return ts.getTrailingCommentRanges(currentText, node.end);
                     }
                 }
@@ -38362,7 +40446,7 @@ var ts;
                     //      declare var x;
                     //      /// <reference-path ...>
                     //      interface F {}
-                    //  The first /// will NOT be removed while the second one will be removed eventhough both node will not be emitted
+                    //  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 = ts.filter(getLeadingCommentsToEmit(node), isTripleSlashComment);
                     }
@@ -38447,6 +40531,15 @@ var ts;
             if (declarationFilePath) {
                 emitSkipped = ts.writeDeclarationFile(declarationFilePath, sourceFiles, isBundledEmit, host, resolver, emitterDiagnostics) || emitSkipped;
             }
+            if (!emitSkipped && emittedFilesList) {
+                emittedFilesList.push(jsFilePath);
+                if (sourceMapFilePath) {
+                    emittedFilesList.push(sourceMapFilePath);
+                }
+                if (declarationFilePath) {
+                    emittedFilesList.push(declarationFilePath);
+                }
+            }
         }
     }
     ts.emitFiles = emitFiles;
@@ -38462,10 +40555,15 @@ var ts;
     /* @internal */ ts.ioWriteTime = 0;
     /** The version of the TypeScript compiler release */
     var emptyArray = [];
-    ts.version = "1.8.0";
+    var defaultLibrarySearchPaths = [
+        "types/",
+        "node_modules/",
+        "node_modules/@types/",
+    ];
+    ts.version = "1.9.0";
     function findConfigFile(searchPath, fileExists) {
-        var fileName = "tsconfig.json";
         while (true) {
+            var fileName = ts.combinePaths(searchPath, "tsconfig.json");
             if (fileExists(fileName)) {
                 return fileName;
             }
@@ -38474,7 +40572,6 @@ var ts;
                 break;
             }
             searchPath = parentPath;
-            fileName = "../" + fileName;
         }
         return undefined;
     }
@@ -38485,36 +40582,490 @@ var ts;
         return ts.normalizePath(referencedFileName);
     }
     ts.resolveTripleslashReference = resolveTripleslashReference;
-    function resolveModuleName(moduleName, containingFile, compilerOptions, host) {
-        var moduleResolution = compilerOptions.moduleResolution !== undefined
-            ? compilerOptions.moduleResolution
-            : compilerOptions.module === 1 /* CommonJS */ ? 2 /* NodeJs */ : 1 /* Classic */;
-        switch (moduleResolution) {
-            case 2 /* NodeJs */: return nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host);
-            case 1 /* Classic */: return classicNameResolver(moduleName, containingFile, compilerOptions, host);
+    /* @internal */
+    function computeCommonSourceDirectoryOfFilenames(fileNames, currentDirectory, getCanonicalFileName) {
+        var commonPathComponents;
+        var failed = ts.forEach(fileNames, function (sourceFile) {
+            // Each file contributes into common source file path
+            var sourcePathComponents = ts.getNormalizedPathComponents(sourceFile, currentDirectory);
+            sourcePathComponents.pop(); // The base file name is not part of the common directory path
+            if (!commonPathComponents) {
+                // first file
+                commonPathComponents = sourcePathComponents;
+                return;
+            }
+            for (var i = 0, n = Math.min(commonPathComponents.length, sourcePathComponents.length); i < n; i++) {
+                if (getCanonicalFileName(commonPathComponents[i]) !== getCanonicalFileName(sourcePathComponents[i])) {
+                    if (i === 0) {
+                        // Failed to find any common path component
+                        return true;
+                    }
+                    // New common path found that is 0 -> i-1
+                    commonPathComponents.length = i;
+                    break;
+                }
+            }
+            // If the sourcePathComponents was shorter than the commonPathComponents, truncate to the sourcePathComponents
+            if (sourcePathComponents.length < commonPathComponents.length) {
+                commonPathComponents.length = sourcePathComponents.length;
+            }
+        });
+        // A common path can not be found when paths span multiple drives on windows, for example
+        if (failed) {
+            return "";
         }
+        if (!commonPathComponents) {
+            return currentDirectory;
+        }
+        return ts.getNormalizedPathFromPathComponents(commonPathComponents);
+    }
+    ts.computeCommonSourceDirectoryOfFilenames = computeCommonSourceDirectoryOfFilenames;
+    function trace(host, message) {
+        host.trace(ts.formatMessage.apply(undefined, arguments));
+    }
+    function isTraceEnabled(compilerOptions, host) {
+        return compilerOptions.traceResolution && host.trace !== undefined;
+    }
+    function hasZeroOrOneAsteriskCharacter(str) {
+        var seenAsterisk = false;
+        for (var i = 0; i < str.length; i++) {
+            if (str.charCodeAt(i) === 42 /* asterisk */) {
+                if (!seenAsterisk) {
+                    seenAsterisk = true;
+                }
+                else {
+                    // have already seen asterisk
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+    function createResolvedModule(resolvedFileName, isExternalLibraryImport, failedLookupLocations) {
+        return { resolvedModule: resolvedFileName ? { resolvedFileName: resolvedFileName, isExternalLibraryImport: isExternalLibraryImport } : undefined, failedLookupLocations: failedLookupLocations };
+    }
+    function moduleHasNonRelativeName(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;
+        try {
+            var jsonText = state.host.readFile(packageJsonPath);
+            jsonContent = jsonText ? JSON.parse(jsonText) : {};
+        }
+        catch (e) {
+            // gracefully handle if readFile fails or returns not JSON
+            jsonContent = {};
+        }
+        var typesFile;
+        var fieldName;
+        // first try to read content of 'typings' section (backward compatibility)
+        if (jsonContent.typings) {
+            if (typeof jsonContent.typings === "string") {
+                fieldName = "typings";
+                typesFile = jsonContent.typings;
+            }
+            else {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.Expected_type_of_0_field_in_package_json_to_be_string_got_1, "typings", typeof jsonContent.typings);
+                }
+            }
+        }
+        // then read 'types'
+        if (!typesFile && jsonContent.types) {
+            if (typeof jsonContent.types === "string") {
+                fieldName = "types";
+                typesFile = jsonContent.types;
+            }
+            else {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.Expected_type_of_0_field_in_package_json_to_be_string_got_1, "types", typeof jsonContent.types);
+                }
+            }
+        }
+        if (typesFile) {
+            var typesFilePath = ts.normalizePath(ts.combinePaths(baseDirectory, typesFile));
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, typesFile, typesFilePath);
+            }
+            return typesFilePath;
+        }
+        return undefined;
+    }
+    var typeReferenceExtensions = [".d.ts"];
+    /**
+     * @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
+     * is assumed to be the same as root directory of the project.
+     */
+    function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host) {
+        var traceEnabled = isTraceEnabled(options, host);
+        var moduleResolutionState = {
+            compilerOptions: options,
+            host: host,
+            skipTsx: true,
+            traceEnabled: traceEnabled
+        };
+        // use typesRoot and fallback to directory that contains tsconfig if typesRoot is not set
+        var rootDir = options.typesRoot || (options.configFilePath ? ts.getDirectoryPath(options.configFilePath) : undefined);
+        if (traceEnabled) {
+            if (containingFile === undefined) {
+                if (rootDir === undefined) {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_not_set_root_directory_not_set, typeReferenceDirectiveName);
+                }
+                else {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_not_set_root_directory_1, typeReferenceDirectiveName, rootDir);
+                }
+            }
+            else {
+                if (rootDir === undefined) {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_1_root_directory_not_set, typeReferenceDirectiveName, containingFile);
+                }
+                else {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_1_root_directory_2, typeReferenceDirectiveName, containingFile, rootDir);
+                }
+            }
+        }
+        var failedLookupLocations = [];
+        // Check primary library paths
+        if (rootDir !== undefined) {
+            var effectivePrimarySearchPaths = options.typesSearchPaths || defaultLibrarySearchPaths;
+            for (var _i = 0, effectivePrimarySearchPaths_1 = effectivePrimarySearchPaths; _i < effectivePrimarySearchPaths_1.length; _i++) {
+                var searchPath = effectivePrimarySearchPaths_1[_i];
+                var primaryPath = ts.combinePaths(rootDir, searchPath);
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Resolving_with_primary_search_path_0, primaryPath);
+                }
+                var candidate = ts.combinePaths(primaryPath, typeReferenceDirectiveName);
+                var candidateDirectory = ts.getDirectoryPath(candidate);
+                var resolvedFile_1 = loadNodeModuleFromDirectory(typeReferenceExtensions, candidate, failedLookupLocations, !directoryProbablyExists(candidateDirectory, host), moduleResolutionState);
+                if (resolvedFile_1) {
+                    if (traceEnabled) {
+                        trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile_1, true);
+                    }
+                    return {
+                        resolvedTypeReferenceDirective: { primary: true, resolvedFileName: resolvedFile_1 },
+                        failedLookupLocations: failedLookupLocations
+                    };
+                }
+            }
+        }
+        else {
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Root_directory_cannot_be_determined_skipping_primary_search_paths);
+            }
+        }
+        var resolvedFile;
+        var initialLocationForSecondaryLookup;
+        if (containingFile) {
+            initialLocationForSecondaryLookup = ts.getDirectoryPath(containingFile);
+        }
+        else {
+            initialLocationForSecondaryLookup = rootDir;
+        }
+        if (initialLocationForSecondaryLookup !== undefined) {
+            // check secondary locations
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
+            }
+            resolvedFile = loadModuleFromNodeModules(typeReferenceDirectiveName, initialLocationForSecondaryLookup, failedLookupLocations, moduleResolutionState);
+            if (traceEnabled) {
+                if (resolvedFile) {
+                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile, false);
+                }
+                else {
+                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_not_resolved, typeReferenceDirectiveName);
+                }
+            }
+        }
+        else {
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder);
+            }
+        }
+        return {
+            resolvedTypeReferenceDirective: resolvedFile
+                ? { primary: false, resolvedFileName: resolvedFile }
+                : undefined,
+            failedLookupLocations: failedLookupLocations
+        };
+    }
+    ts.resolveTypeReferenceDirective = resolveTypeReferenceDirective;
+    function resolveModuleName(moduleName, containingFile, compilerOptions, host) {
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        if (traceEnabled) {
+            trace(host, ts.Diagnostics.Resolving_module_0_from_1, moduleName, containingFile);
+        }
+        var moduleResolution = compilerOptions.moduleResolution;
+        if (moduleResolution === undefined) {
+            moduleResolution = ts.getEmitModuleKind(compilerOptions) === ts.ModuleKind.CommonJS ? ts.ModuleResolutionKind.NodeJs : ts.ModuleResolutionKind.Classic;
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Module_resolution_kind_is_not_specified_using_0, ts.ModuleResolutionKind[moduleResolution]);
+            }
+        }
+        else {
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Explicitly_specified_module_resolution_kind_Colon_0, ts.ModuleResolutionKind[moduleResolution]);
+            }
+        }
+        var result;
+        switch (moduleResolution) {
+            case ts.ModuleResolutionKind.NodeJs:
+                result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host);
+                break;
+            case ts.ModuleResolutionKind.Classic:
+                result = classicNameResolver(moduleName, containingFile, compilerOptions, host);
+                break;
+        }
+        if (traceEnabled) {
+            if (result.resolvedModule) {
+                trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1, moduleName, result.resolvedModule.resolvedFileName);
+            }
+            else {
+                trace(host, ts.Diagnostics.Module_name_0_was_not_resolved, moduleName);
+            }
+        }
+        return result;
     }
     ts.resolveModuleName = resolveModuleName;
+    /**
+     * Any module resolution kind can be augmented with optional settings: 'baseUrl', 'paths' and 'rootDirs' - they are used to
+     * mitigate differences between design time structure of the project and its runtime counterpart so the same import name
+     * can be resolved successfully by TypeScript compiler and runtime module loader.
+     * If these settings are set then loading procedure will try to use them to resolve module name and it can of failure it will
+     * fallback to standard resolution routine.
+     *
+     * - baseUrl - this setting controls how non-relative module names are resolved. If this setting is specified then non-relative
+     * names will be resolved relative to baseUrl: i.e. if baseUrl is '/a/b' then candidate location to resolve module name 'c/d' will
+     * be '/a/b/c/d'
+     * - paths - this setting can only be used when baseUrl is specified. allows to tune how non-relative module names
+     * will be resolved based on the content of the module name.
+     * Structure of 'paths' compiler options
+     * 'paths': {
+     *    pattern-1: [...substitutions],
+     *    pattern-2: [...substitutions],
+     *    ...
+     *    pattern-n: [...substitutions]
+     * }
+     * Pattern here is a string that can contain zero or one '*' character. During module resolution module name will be matched against
+     * all patterns in the list. Matching for patterns that don't contain '*' means that module name must be equal to pattern respecting the case.
+     * If pattern contains '*' then to match pattern "<prefix>*<suffix>" module name must start with the <prefix> and end with <suffix>.
+     * <MatchedStar> denotes part of the module name between <prefix> and <suffix>.
+     * If module name can be matches with multiple patterns then pattern with the longest prefix will be picked.
+     * After selecting pattern we'll use list of substitutions to get candidate locations of the module and the try to load module
+     * from the candidate location.
+     * Substitution is a string that can contain zero or one '*'. To get candidate location from substitution we'll pick every
+     * substitution in the list and replace '*' with <MatchedStar> string. If candidate location is not rooted it
+     * will be converted to absolute using baseUrl.
+     * For example:
+     * baseUrl: /a/b/c
+     * "paths": {
+     *     // match all module names
+     *     "*": [
+     *         "*",        // use matched name as is,
+     *                     // <matched name> will be looked as /a/b/c/<matched name>
+     *
+     *         "folder1/*" // substitution will convert matched name to 'folder1/<matched name>',
+     *                     // since it is not rooted then final candidate location will be /a/b/c/folder1/<matched name>
+     *     ],
+     *     // match module names that start with 'components/'
+     *     "components/*": [ "/root/components/*" ] // substitution will convert /components/folder1/<matched name> to '/root/components/folder1/<matched name>',
+     *                                              // it is rooted so it will be final candidate location
+     * }
+     *
+     * 'rootDirs' allows the project to be spreaded across multiple locations and resolve modules with relative names as if
+     * they were in the same location. For example lets say there are two files
+     * '/local/src/content/file1.ts'
+     * '/shared/components/contracts/src/content/protocols/file2.ts'
+     * After bundling content of '/shared/components/contracts/src' will be merged with '/local/src' so
+     * if file1 has the following import 'import {x} from "./protocols/file2"' it will be resolved successfully in runtime.
+     * 'rootDirs' provides the way to tell compiler that in order to get the whole project it should behave as if content of all
+     * root dirs were merged together.
+     * I.e. for the example above 'rootDirs' will have two entries: [ '/local/src', '/shared/components/contracts/src' ].
+     * Compiler will first convert './protocols/file2' into absolute path relative to the location of containing file:
+     * '/local/src/content/protocols/file2' and try to load it - failure.
+     * Then it will search 'rootDirs' looking for a longest matching prefix of this absolute path and if such prefix is found - absolute path will
+     * be converted to a path relative to found rootDir entry './content/protocols/file2' (*). As a last step compiler will check all remaining
+     * entries in 'rootDirs', use them to build absolute path out of (*) and try to resolve module from this location.
+     */
+    function tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state) {
+        if (moduleHasNonRelativeName(moduleName)) {
+            return tryLoadModuleUsingBaseUrl(moduleName, loader, failedLookupLocations, supportedExtensions, state);
+        }
+        else {
+            return tryLoadModuleUsingRootDirs(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state);
+        }
+    }
+    function tryLoadModuleUsingRootDirs(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state) {
+        if (!state.compilerOptions.rootDirs) {
+            return undefined;
+        }
+        if (state.traceEnabled) {
+            trace(state.host, ts.Diagnostics.rootDirs_option_is_set_using_it_to_resolve_relative_module_name_0, moduleName);
+        }
+        var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+        var matchedRootDir;
+        var matchedNormalizedPrefix;
+        for (var _i = 0, _a = state.compilerOptions.rootDirs; _i < _a.length; _i++) {
+            var rootDir = _a[_i];
+            // rootDirs are expected to be absolute
+            // in case of tsconfig.json this will happen automatically - compiler will expand relative names
+            // using location of tsconfig.json as base location
+            var normalizedRoot = ts.normalizePath(rootDir);
+            if (!ts.endsWith(normalizedRoot, ts.directorySeparator)) {
+                normalizedRoot += ts.directorySeparator;
+            }
+            var isLongestMatchingPrefix = ts.startsWith(candidate, normalizedRoot) &&
+                (matchedNormalizedPrefix === undefined || matchedNormalizedPrefix.length < normalizedRoot.length);
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Checking_if_0_is_the_longest_matching_prefix_for_1_2, normalizedRoot, candidate, isLongestMatchingPrefix);
+            }
+            if (isLongestMatchingPrefix) {
+                matchedNormalizedPrefix = normalizedRoot;
+                matchedRootDir = rootDir;
+            }
+        }
+        if (matchedNormalizedPrefix) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Longest_matching_prefix_for_0_is_1, candidate, matchedNormalizedPrefix);
+            }
+            var suffix = candidate.substr(matchedNormalizedPrefix.length);
+            // first - try to load from a initial location
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, matchedNormalizedPrefix, candidate);
+            }
+            var resolvedFileName = loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(containingDirectory, state.host), state);
+            if (resolvedFileName) {
+                return resolvedFileName;
+            }
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Trying_other_entries_in_rootDirs);
+            }
+            // then try to resolve using remaining entries in rootDirs
+            for (var _b = 0, _c = state.compilerOptions.rootDirs; _b < _c.length; _b++) {
+                var rootDir = _c[_b];
+                if (rootDir === matchedRootDir) {
+                    // skip the initially matched entry
+                    continue;
+                }
+                var candidate_1 = ts.combinePaths(ts.normalizePath(rootDir), suffix);
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, rootDir, candidate_1);
+                }
+                var baseDirectory = ts.getDirectoryPath(candidate_1);
+                var resolvedFileName_1 = loader(candidate_1, supportedExtensions, failedLookupLocations, !directoryProbablyExists(baseDirectory, state.host), state);
+                if (resolvedFileName_1) {
+                    return resolvedFileName_1;
+                }
+            }
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Module_resolution_using_rootDirs_has_failed);
+            }
+        }
+        return undefined;
+    }
+    function tryLoadModuleUsingBaseUrl(moduleName, loader, failedLookupLocations, supportedExtensions, state) {
+        if (!state.compilerOptions.baseUrl) {
+            return undefined;
+        }
+        if (state.traceEnabled) {
+            trace(state.host, ts.Diagnostics.baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1, state.compilerOptions.baseUrl, moduleName);
+        }
+        var longestMatchPrefixLength = -1;
+        var matchedPattern;
+        var matchedStar;
+        if (state.compilerOptions.paths) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0, moduleName);
+            }
+            for (var key in state.compilerOptions.paths) {
+                var pattern = key;
+                var indexOfStar = pattern.indexOf("*");
+                if (indexOfStar !== -1) {
+                    var prefix = pattern.substr(0, indexOfStar);
+                    var suffix = pattern.substr(indexOfStar + 1);
+                    if (moduleName.length >= prefix.length + suffix.length &&
+                        ts.startsWith(moduleName, prefix) &&
+                        ts.endsWith(moduleName, suffix)) {
+                        // use length of prefix as betterness criteria
+                        if (prefix.length > longestMatchPrefixLength) {
+                            longestMatchPrefixLength = prefix.length;
+                            matchedPattern = pattern;
+                            matchedStar = moduleName.substr(prefix.length, moduleName.length - suffix.length);
+                        }
+                    }
+                }
+                else if (pattern === moduleName) {
+                    // pattern was matched as is - no need to search further
+                    matchedPattern = pattern;
+                    matchedStar = undefined;
+                    break;
+                }
+            }
+        }
+        if (matchedPattern) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Module_name_0_matched_pattern_1, moduleName, matchedPattern);
+            }
+            for (var _i = 0, _a = state.compilerOptions.paths[matchedPattern]; _i < _a.length; _i++) {
+                var subst = _a[_i];
+                var path = matchedStar ? subst.replace("\*", matchedStar) : subst;
+                var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, path));
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.Trying_substitution_0_candidate_module_location_Colon_1, subst, path);
+                }
+                var resolvedFileName = loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
+                if (resolvedFileName) {
+                    return resolvedFileName;
+                }
+            }
+            return undefined;
+        }
+        else {
+            var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, moduleName));
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Resolving_module_name_0_relative_to_base_url_1_2, moduleName, state.compilerOptions.baseUrl, candidate);
+            }
+            return loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
+        }
+    }
     function nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host) {
         var containingDirectory = ts.getDirectoryPath(containingFile);
         var supportedExtensions = ts.getSupportedExtensions(compilerOptions);
-        if (ts.getRootLength(moduleName) !== 0 || nameStartsWithDotSlashOrDotDotSlash(moduleName)) {
-            var failedLookupLocations = [];
-            var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-            var resolvedFileName = loadNodeModuleFromFile(supportedExtensions, candidate, failedLookupLocations, /*onlyRecordFailures*/ false, host);
-            if (resolvedFileName) {
-                return { resolvedModule: { resolvedFileName: resolvedFileName }, failedLookupLocations: failedLookupLocations };
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        var failedLookupLocations = [];
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, skipTsx: false };
+        var resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, nodeLoadModuleByRelativeName, failedLookupLocations, supportedExtensions, state);
+        if (resolvedFileName) {
+            return createResolvedModule(resolvedFileName, /*isExternalLibraryImport*/ false, failedLookupLocations);
+        }
+        var isExternalLibraryImport = false;
+        if (moduleHasNonRelativeName(moduleName)) {
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Loading_module_0_from_node_modules_folder, moduleName);
             }
-            resolvedFileName = loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, /*onlyRecordFailures*/ false, host);
-            return resolvedFileName
-                ? { resolvedModule: { resolvedFileName: resolvedFileName }, failedLookupLocations: failedLookupLocations }
-                : { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
+            resolvedFileName = loadModuleFromNodeModules(moduleName, containingDirectory, failedLookupLocations, state);
+            isExternalLibraryImport = resolvedFileName !== undefined;
         }
         else {
-            return loadModuleFromNodeModules(moduleName, containingDirectory, host);
+            var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+            resolvedFileName = nodeLoadModuleByRelativeName(candidate, supportedExtensions, failedLookupLocations, /*onlyRecordFailures*/ false, state);
         }
+        return createResolvedModule(resolvedFileName, isExternalLibraryImport, failedLookupLocations);
     }
     ts.nodeModuleNameResolver = nodeModuleNameResolver;
+    function nodeLoadModuleByRelativeName(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state) {
+        if (state.traceEnabled) {
+            trace(state.host, ts.Diagnostics.Loading_module_as_file_Slash_folder_candidate_module_location_0, candidate);
+        }
+        var resolvedFileName = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state);
+        return resolvedFileName || loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, onlyRecordFailures, state);
+    }
     /* @internal */
     function directoryProbablyExists(directoryName, host) {
         // if host does not support 'directoryExists' assume that directory will exist
@@ -38525,63 +41076,90 @@ var ts;
      * @param {boolean} onlyRecordFailures - if true then function won't try to actually load files but instead record all attempts as failures. This flag is necessary
      * in cases when we know upfront that all load attempts will fail (because containing folder does not exists) however we still need to record all failed lookup locations.
      */
-    function loadNodeModuleFromFile(extensions, candidate, failedLookupLocation, onlyRecordFailures, host) {
+    function loadModuleFromFile(candidate, extensions, failedLookupLocation, onlyRecordFailures, state) {
+        if (!onlyRecordFailures) {
+            // check if containig folder exists - if it doesn't then just record failures for all supported extensions without disk probing
+            var directory = ts.getDirectoryPath(candidate);
+            if (directory) {
+                onlyRecordFailures = !directoryProbablyExists(directory, state.host);
+            }
+        }
         return ts.forEach(extensions, tryLoad);
         function tryLoad(ext) {
+            if (ext === ".tsx" && state.skipTsx) {
+                return undefined;
+            }
             var fileName = ts.fileExtensionIs(candidate, ext) ? candidate : candidate + ext;
-            if (!onlyRecordFailures && host.fileExists(fileName)) {
+            if (!onlyRecordFailures && state.host.fileExists(fileName)) {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.File_0_exist_use_it_as_a_name_resolution_result, fileName);
+                }
                 return fileName;
             }
             else {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.File_0_does_not_exist, fileName);
+                }
                 failedLookupLocation.push(fileName);
                 return undefined;
             }
         }
     }
-    function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocation, onlyRecordFailures, host) {
+    function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocation, onlyRecordFailures, state) {
         var packageJsonPath = ts.combinePaths(candidate, "package.json");
-        var directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, host);
-        if (directoryExists && host.fileExists(packageJsonPath)) {
-            var jsonContent;
-            try {
-                var jsonText = host.readFile(packageJsonPath);
-                jsonContent = jsonText ? JSON.parse(jsonText) : { typings: undefined };
+        var directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, state.host);
+        if (directoryExists && state.host.fileExists(packageJsonPath)) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
             }
-            catch (e) {
-                // gracefully handle if readFile fails or returns not JSON 
-                jsonContent = { typings: undefined };
-            }
-            if (typeof jsonContent.typings === "string") {
-                var path = ts.normalizePath(ts.combinePaths(candidate, jsonContent.typings));
-                var result = loadNodeModuleFromFile(extensions, path, failedLookupLocation, !directoryProbablyExists(ts.getDirectoryPath(path), host), host);
+            var typesFile = tryReadTypesSection(packageJsonPath, candidate, state);
+            if (typesFile) {
+                var result = loadModuleFromFile(typesFile, extensions, failedLookupLocation, !directoryProbablyExists(ts.getDirectoryPath(typesFile), state.host), state);
                 if (result) {
                     return result;
                 }
             }
+            else {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.package_json_does_not_have_types_field);
+                }
+            }
         }
         else {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath);
+            }
             // record package json as one of failed lookup locations - in the future if this file will appear it will invalidate resolution results
             failedLookupLocation.push(packageJsonPath);
         }
-        return loadNodeModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocation, !directoryExists, host);
+        return loadModuleFromFile(ts.combinePaths(candidate, "index"), extensions, failedLookupLocation, !directoryExists, state);
     }
-    function loadModuleFromNodeModules(moduleName, directory, host) {
-        var failedLookupLocations = [];
+    function loadModuleFromNodeModulesFolder(moduleName, directory, failedLookupLocations, state) {
+        var nodeModulesFolder = ts.combinePaths(directory, "node_modules");
+        var nodeModulesFolderExists = directoryProbablyExists(nodeModulesFolder, state.host);
+        var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName));
+        // Load only typescript files irrespective of allowJs option if loading from node modules
+        var result = loadModuleFromFile(candidate, ts.supportedTypeScriptExtensions, failedLookupLocations, !nodeModulesFolderExists, state);
+        if (result) {
+            return result;
+        }
+        result = loadNodeModuleFromDirectory(ts.supportedTypeScriptExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state);
+        if (result) {
+            return result;
+        }
+    }
+    function loadModuleFromNodeModules(moduleName, directory, failedLookupLocations, state) {
         directory = ts.normalizeSlashes(directory);
         while (true) {
             var baseName = ts.getBaseFileName(directory);
             if (baseName !== "node_modules") {
-                var nodeModulesFolder = ts.combinePaths(directory, "node_modules");
-                var nodeModulesFolderExists = directoryProbablyExists(nodeModulesFolder, host);
-                var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName));
-                // Load only typescript files irrespective of allowJs option if loading from node modules
-                var result = loadNodeModuleFromFile(ts.supportedTypeScriptExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, host);
+                var result = 
+                // first: try to load module as-is
+                loadModuleFromNodeModulesFolder(moduleName, directory, failedLookupLocations, state) ||
+                    // second: try to load module from the scope '@types'
+                    loadModuleFromNodeModulesFolder(ts.combinePaths("@types", moduleName), directory, failedLookupLocations, state);
                 if (result) {
-                    return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations: failedLookupLocations };
-                }
-                result = loadNodeModuleFromDirectory(ts.supportedTypeScriptExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, host);
-                if (result) {
-                    return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations: failedLookupLocations };
+                    return result;
                 }
             }
             var parentPath = ts.getDirectoryPath(directory);
@@ -38590,46 +41168,36 @@ var ts;
             }
             directory = parentPath;
         }
-        return { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
-    }
-    function nameStartsWithDotSlashOrDotDotSlash(name) {
-        var i = name.lastIndexOf("./", 1);
-        return i === 0 || (i === 1 && name.charCodeAt(0) === 46 /* dot */);
+        return undefined;
     }
     function classicNameResolver(moduleName, containingFile, compilerOptions, host) {
-        // module names that contain '!' are used to reference resources and are not resolved to actual files on disk
-        if (moduleName.indexOf("!") != -1) {
-            return { resolvedModule: undefined, failedLookupLocations: [] };
-        }
-        var searchPath = ts.getDirectoryPath(containingFile);
-        var searchName;
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, skipTsx: !compilerOptions.jsx };
         var failedLookupLocations = [];
-        var referencedSourceFile;
         var supportedExtensions = ts.getSupportedExtensions(compilerOptions);
-        while (true) {
-            searchName = ts.normalizePath(ts.combinePaths(searchPath, moduleName));
-            referencedSourceFile = ts.forEach(supportedExtensions, function (extension) {
-                if (extension === ".tsx" && !compilerOptions.jsx) {
-                    // resolve .tsx files only if jsx support is enabled 
-                    // 'logical not' handles both undefined and None cases
-                    return undefined;
+        var containingDirectory = ts.getDirectoryPath(containingFile);
+        var resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, loadModuleFromFile, failedLookupLocations, supportedExtensions, state);
+        if (resolvedFileName) {
+            return createResolvedModule(resolvedFileName, /*isExternalLibraryImport*/ false, failedLookupLocations);
+        }
+        var referencedSourceFile;
+        if (moduleHasNonRelativeName(moduleName)) {
+            while (true) {
+                var searchName = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+                referencedSourceFile = loadModuleFromFile(searchName, supportedExtensions, failedLookupLocations, /*onlyRecordFailures*/ false, state);
+                if (referencedSourceFile) {
+                    break;
                 }
-                var candidate = searchName + extension;
-                if (host.fileExists(candidate)) {
-                    return candidate;
+                var parentPath = ts.getDirectoryPath(containingDirectory);
+                if (parentPath === containingDirectory) {
+                    break;
                 }
-                else {
-                    failedLookupLocations.push(candidate);
-                }
-            });
-            if (referencedSourceFile) {
-                break;
+                containingDirectory = parentPath;
             }
-            var parentPath = ts.getDirectoryPath(searchPath);
-            if (parentPath === searchPath) {
-                break;
-            }
-            searchPath = parentPath;
+        }
+        else {
+            var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+            referencedSourceFile = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, /*onlyRecordFailures*/ false, state);
         }
         return referencedSourceFile
             ? { resolvedModule: { resolvedFileName: referencedSourceFile }, failedLookupLocations: failedLookupLocations }
@@ -38638,7 +41206,7 @@ var ts;
     ts.classicNameResolver = classicNameResolver;
     /* @internal */
     ts.defaultInitCompilerOptions = {
-        module: 1 /* CommonJS */,
+        module: ts.ModuleKind.CommonJS,
         target: 1 /* ES5 */,
         noImplicitAny: false,
         sourceMap: false
@@ -38686,11 +41254,40 @@ var ts;
                 ts.sys.createDirectory(directoryPath);
             }
         }
+        var outputFingerprints;
+        function writeFileIfUpdated(fileName, data, writeByteOrderMark) {
+            if (!outputFingerprints) {
+                outputFingerprints = {};
+            }
+            var hash = ts.sys.createHash(data);
+            var mtimeBefore = ts.sys.getModifiedTime(fileName);
+            if (mtimeBefore && ts.hasProperty(outputFingerprints, fileName)) {
+                var fingerprint = outputFingerprints[fileName];
+                // If output has not been changed, and the file has no external modification
+                if (fingerprint.byteOrderMark === writeByteOrderMark &&
+                    fingerprint.hash === hash &&
+                    fingerprint.mtime.getTime() === mtimeBefore.getTime()) {
+                    return;
+                }
+            }
+            ts.sys.writeFile(fileName, data, writeByteOrderMark);
+            var mtimeAfter = ts.sys.getModifiedTime(fileName);
+            outputFingerprints[fileName] = {
+                hash: hash,
+                byteOrderMark: writeByteOrderMark,
+                mtime: mtimeAfter
+            };
+        }
         function writeFile(fileName, data, writeByteOrderMark, onError) {
             try {
                 var start = new Date().getTime();
                 ensureDirectoriesExist(ts.getDirectoryPath(ts.normalizePath(fileName)));
-                ts.sys.writeFile(fileName, data, writeByteOrderMark);
+                if (ts.isWatchSet(options) && ts.sys.createHash && ts.sys.getModifiedTime) {
+                    writeFileIfUpdated(fileName, data, writeByteOrderMark);
+                }
+                else {
+                    ts.sys.writeFile(fileName, data, writeByteOrderMark);
+                }
                 ts.ioWriteTime += new Date().getTime() - start;
             }
             catch (e) {
@@ -38699,10 +41296,14 @@ var ts;
                 }
             }
         }
+        function getDefaultLibLocation() {
+            return ts.getDirectoryPath(ts.normalizePath(ts.sys.getExecutingFilePath()));
+        }
         var newLine = ts.getNewLineCharacter(options);
         return {
             getSourceFile: getSourceFile,
-            getDefaultLibFileName: function (options) { return ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(ts.sys.getExecutingFilePath())), ts.getDefaultLibFileName(options)); },
+            getDefaultLibLocation: getDefaultLibLocation,
+            getDefaultLibFileName: function (options) { return ts.combinePaths(getDefaultLibLocation(), ts.getDefaultLibFileName(options)); },
             writeFile: writeFile,
             getCurrentDirectory: ts.memoize(function () { return ts.sys.getCurrentDirectory(); }),
             useCaseSensitiveFileNames: function () { return ts.sys.useCaseSensitiveFileNames; },
@@ -38710,6 +41311,7 @@ var ts;
             getNewLine: function () { return newLine; },
             fileExists: function (fileName) { return ts.sys.fileExists(fileName); },
             readFile: function (fileName) { return ts.sys.readFile(fileName); },
+            trace: function (s) { return ts.sys.write(s + newLine); },
             directoryExists: function (directoryName) { return ts.sys.directoryExists(directoryName); }
         };
     }
@@ -38745,68 +41347,88 @@ var ts;
         }
     }
     ts.flattenDiagnosticMessageText = flattenDiagnosticMessageText;
+    function loadWithLocalCache(names, containingFile, loader) {
+        if (names.length === 0) {
+            return [];
+        }
+        var resolutions = [];
+        var cache = {};
+        for (var _i = 0, names_1 = names; _i < names_1.length; _i++) {
+            var name_33 = names_1[_i];
+            var result = void 0;
+            if (ts.hasProperty(cache, name_33)) {
+                result = cache[name_33];
+            }
+            else {
+                result = loader(name_33, containingFile);
+                cache[name_33] = result;
+            }
+            resolutions.push(result);
+        }
+        return resolutions;
+    }
     function createProgram(rootNames, options, host, oldProgram) {
         var program;
         var files = [];
-        var fileProcessingDiagnostics = ts.createDiagnosticCollection();
-        var programDiagnostics = ts.createDiagnosticCollection();
         var commonSourceDirectory;
         var diagnosticsProducingTypeChecker;
         var noDiagnosticsTypeChecker;
         var classifiableNames;
-        var skipDefaultLib = options.noLib;
-        var supportedExtensions = ts.getSupportedExtensions(options);
+        var resolvedTypeReferenceDirectives = {};
+        var fileProcessingDiagnostics = ts.createDiagnosticCollection();
         var start = new Date().getTime();
         host = host || createCompilerHost(options);
+        var skipDefaultLib = options.noLib;
+        var programDiagnostics = ts.createDiagnosticCollection();
+        var currentDirectory = host.getCurrentDirectory();
+        var supportedExtensions = ts.getSupportedExtensions(options);
         // Map storing if there is emit blocking diagnostics for given input
         var hasEmitBlockingDiagnostics = ts.createFileMap(getCanonicalFileName);
-        var currentDirectory = host.getCurrentDirectory();
-        var resolveModuleNamesWorker = host.resolveModuleNames
-            ? (function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile); })
-            : (function (moduleNames, containingFile) {
-                var resolvedModuleNames = [];
-                // resolveModuleName does not store any results between calls.
-                // lookup is a local cache to avoid resolving the same module name several times
-                var lookup = {};
-                for (var _i = 0, moduleNames_1 = moduleNames; _i < moduleNames_1.length; _i++) {
-                    var moduleName = moduleNames_1[_i];
-                    var resolvedName = void 0;
-                    if (ts.hasProperty(lookup, moduleName)) {
-                        resolvedName = lookup[moduleName];
-                    }
-                    else {
-                        resolvedName = resolveModuleName(moduleName, containingFile, options, host).resolvedModule;
-                        lookup[moduleName] = resolvedName;
-                    }
-                    resolvedModuleNames.push(resolvedName);
-                }
-                return resolvedModuleNames;
-            });
+        var resolveModuleNamesWorker;
+        if (host.resolveModuleNames) {
+            resolveModuleNamesWorker = function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile); };
+        }
+        else {
+            var loader_1 = function (moduleName, containingFile) { return resolveModuleName(moduleName, containingFile, options, host).resolvedModule; };
+            resolveModuleNamesWorker = function (moduleNames, containingFile) { return loadWithLocalCache(moduleNames, containingFile, loader_1); };
+        }
+        var resolveTypeReferenceDirectiveNamesWorker;
+        if (host.resolveTypeReferenceDirectives) {
+            resolveTypeReferenceDirectiveNamesWorker = function (typeDirectiveNames, containingFile) { return host.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile); };
+        }
+        else {
+            var loader_2 = function (typesRef, containingFile) { return resolveTypeReferenceDirective(typesRef, containingFile, options, host).resolvedTypeReferenceDirective; };
+            resolveTypeReferenceDirectiveNamesWorker = function (typeReferenceDirectiveNames, containingFile) { return loadWithLocalCache(typeReferenceDirectiveNames, containingFile, loader_2); };
+        }
         var filesByName = ts.createFileMap();
         // stores 'filename -> file association' ignoring case
-        // used to track cases when two file names differ only in casing 
+        // used to track cases when two file names differ only in casing
         var filesByNameIgnoreCase = host.useCaseSensitiveFileNames() ? ts.createFileMap(function (fileName) { return fileName.toLowerCase(); }) : undefined;
-        if (oldProgram) {
-            // check properties that can affect structure of the program or module resolution strategy
-            // if any of these properties has changed - structure cannot be reused
-            var oldOptions = oldProgram.getCompilerOptions();
-            if ((oldOptions.module !== options.module) ||
-                (oldOptions.noResolve !== options.noResolve) ||
-                (oldOptions.target !== options.target) ||
-                (oldOptions.noLib !== options.noLib) ||
-                (oldOptions.jsx !== options.jsx) ||
-                (oldOptions.allowJs !== options.allowJs)) {
-                oldProgram = undefined;
-            }
-        }
         if (!tryReuseStructureFromOldProgram()) {
+            // load type declarations specified via 'types' argument
+            if (options.types && options.types.length) {
+                var resolutions = resolveTypeReferenceDirectiveNamesWorker(options.types, /*containingFile*/ undefined);
+                for (var i = 0; i < options.types.length; i++) {
+                    processTypeReferenceDirective(options.types[i], resolutions[i]);
+                }
+            }
             ts.forEach(rootNames, function (name) { return processRootFile(name, /*isDefaultLib*/ false); });
             // Do not process the default library if:
             //  - The '--noLib' flag is used.
             //  - A 'no-default-lib' reference comment is encountered in
             //      processing the root files.
             if (!skipDefaultLib) {
-                processRootFile(host.getDefaultLibFileName(options), /*isDefaultLib*/ true);
+                // If '--lib' is not specified, include default library file according to '--target'
+                // otherwise, using options specified in '--lib' instead of '--target' default library file
+                if (!options.lib) {
+                    processRootFile(host.getDefaultLibFileName(options), /*isDefaultLib*/ true);
+                }
+                else {
+                    var libDirectory_1 = host.getDefaultLibLocation ? host.getDefaultLibLocation() : ts.getDirectoryPath(host.getDefaultLibFileName(options));
+                    ts.forEach(options.lib, function (libFileName) {
+                        processRootFile(ts.combinePaths(libDirectory_1, libFileName), /*isDefaultLib*/ true);
+                    });
+                }
             }
         }
         // unconditionally set oldProgram to undefined to prevent it from being captured in closure
@@ -38831,7 +41453,8 @@ var ts;
             getIdentifierCount: function () { return getDiagnosticsProducingTypeChecker().getIdentifierCount(); },
             getSymbolCount: function () { return getDiagnosticsProducingTypeChecker().getSymbolCount(); },
             getTypeCount: function () { return getDiagnosticsProducingTypeChecker().getTypeCount(); },
-            getFileProcessingDiagnostics: function () { return fileProcessingDiagnostics; }
+            getFileProcessingDiagnostics: function () { return fileProcessingDiagnostics; },
+            resolvedTypeReferenceDirectives: resolvedTypeReferenceDirectives
         };
         verifyCompilerOptions();
         ts.programTime += new Date().getTime() - start;
@@ -38870,12 +41493,29 @@ var ts;
             if (!oldProgram) {
                 return false;
             }
+            // check properties that can affect structure of the program or module resolution strategy
+            // if any of these properties has changed - structure cannot be reused
+            var oldOptions = oldProgram.getCompilerOptions();
+            if ((oldOptions.module !== options.module) ||
+                (oldOptions.noResolve !== options.noResolve) ||
+                (oldOptions.target !== options.target) ||
+                (oldOptions.noLib !== options.noLib) ||
+                (oldOptions.jsx !== options.jsx) ||
+                (oldOptions.allowJs !== options.allowJs) ||
+                (oldOptions.rootDir !== options.rootDir) ||
+                (oldOptions.typesSearchPaths !== options.typesSearchPaths) ||
+                (oldOptions.configFilePath !== options.configFilePath)) {
+                return false;
+            }
             ts.Debug.assert(!oldProgram.structureIsReused);
             // there is an old program, check if we can reuse its structure
             var oldRootNames = oldProgram.getRootFileNames();
             if (!ts.arrayIsEqualTo(oldRootNames, rootNames)) {
                 return false;
             }
+            if (!ts.arrayIsEqualTo(options.types, oldOptions.types)) {
+                return false;
+            }
             // check if program source files has changed in the way that can affect structure of the program
             var newSourceFiles = [];
             var filePaths = [];
@@ -38909,25 +41549,32 @@ var ts;
                         // moduleAugmentations has changed
                         return false;
                     }
+                    if (!ts.arrayIsEqualTo(oldSourceFile.typeReferenceDirectives, newSourceFile.typeReferenceDirectives, fileReferenceIsEqualTo)) {
+                        // 'types' references has changed
+                        return false;
+                    }
+                    var newSourceFilePath = ts.getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory);
                     if (resolveModuleNamesWorker) {
                         var moduleNames = ts.map(ts.concatenate(newSourceFile.imports, newSourceFile.moduleAugmentations), getTextOfLiteral);
-                        var resolutions = resolveModuleNamesWorker(moduleNames, ts.getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory));
+                        var resolutions = resolveModuleNamesWorker(moduleNames, newSourceFilePath);
                         // ensure that module resolution results are still correct
-                        for (var i = 0; i < moduleNames.length; i++) {
-                            var newResolution = resolutions[i];
-                            var oldResolution = ts.getResolvedModule(oldSourceFile, moduleNames[i]);
-                            var resolutionChanged = oldResolution
-                                ? !newResolution ||
-                                    oldResolution.resolvedFileName !== newResolution.resolvedFileName ||
-                                    !!oldResolution.isExternalLibraryImport !== !!newResolution.isExternalLibraryImport
-                                : newResolution;
-                            if (resolutionChanged) {
-                                return false;
-                            }
+                        var resolutionsChanged = ts.hasChangesInResolutions(moduleNames, resolutions, oldSourceFile.resolvedModules, ts.moduleResolutionIsEqualTo);
+                        if (resolutionsChanged) {
+                            return false;
                         }
                     }
-                    // pass the cache of module resolutions from the old source file
+                    if (resolveTypeReferenceDirectiveNamesWorker) {
+                        var typesReferenceDirectives = ts.map(newSourceFile.typeReferenceDirectives, function (x) { return x.fileName; });
+                        var resolutions = resolveTypeReferenceDirectiveNamesWorker(typesReferenceDirectives, newSourceFilePath);
+                        // ensure that types resolutions are still correct
+                        var resolutionsChanged = ts.hasChangesInResolutions(typesReferenceDirectives, resolutions, oldSourceFile.resolvedTypeReferenceDirectiveNames, ts.typeDirectiveIsEqualTo);
+                        if (resolutionsChanged) {
+                            return false;
+                        }
+                    }
+                    // pass the cache of module/types resolutions from the old source file
                     newSourceFile.resolvedModules = oldSourceFile.resolvedModules;
+                    newSourceFile.resolvedTypeReferenceDirectiveNames = oldSourceFile.resolvedTypeReferenceDirectiveNames;
                     modifiedSourceFiles.push(newSourceFile);
                 }
                 else {
@@ -38947,6 +41594,7 @@ var ts;
                 var modifiedFile = modifiedSourceFiles_1[_b];
                 fileProcessingDiagnostics.reattachFileDiagnostics(modifiedFile);
             }
+            resolvedTypeReferenceDirectives = oldProgram.resolvedTypeReferenceDirectives;
             oldProgram.structureIsReused = true;
             return true;
         }
@@ -38959,7 +41607,7 @@ var ts;
                 getNewLine: function () { return host.getNewLine(); },
                 getSourceFile: program.getSourceFile,
                 getSourceFiles: program.getSourceFiles,
-                writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError) { return host.writeFile(fileName, data, writeByteOrderMark, onError); }),
+                writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }),
                 isEmitBlocked: isEmitBlocked
             };
         }
@@ -38977,13 +41625,25 @@ var ts;
             return hasEmitBlockingDiagnostics.contains(ts.toPath(emitFileName, currentDirectory, getCanonicalFileName));
         }
         function emitWorker(program, sourceFile, writeFileCallback, cancellationToken) {
+            var declarationDiagnostics = [];
+            if (options.noEmit) {
+                return { diagnostics: declarationDiagnostics, sourceMaps: undefined, emittedFiles: undefined, emitSkipped: true };
+            }
             // If the noEmitOnError flag is set, then check if we have any errors so far.  If so,
             // immediately bail out.  Note that we pass 'undefined' for 'sourceFile' so that we
             // get any preEmit diagnostics, not just the ones
             if (options.noEmitOnError) {
-                var preEmitDiagnostics = getPreEmitDiagnostics(program, /*sourceFile:*/ undefined, cancellationToken);
-                if (preEmitDiagnostics.length > 0) {
-                    return { diagnostics: preEmitDiagnostics, sourceMaps: undefined, emitSkipped: true };
+                var diagnostics = program.getOptionsDiagnostics(cancellationToken).concat(program.getSyntacticDiagnostics(sourceFile, cancellationToken), program.getGlobalDiagnostics(cancellationToken), program.getSemanticDiagnostics(sourceFile, cancellationToken));
+                if (diagnostics.length === 0 && program.getCompilerOptions().declaration) {
+                    declarationDiagnostics = program.getDeclarationDiagnostics(/*sourceFile*/ undefined, cancellationToken);
+                }
+                if (diagnostics.length > 0 || declarationDiagnostics.length > 0) {
+                    return {
+                        diagnostics: ts.concatenate(diagnostics, declarationDiagnostics),
+                        sourceMaps: undefined,
+                        emittedFiles: undefined,
+                        emitSkipped: true
+                    };
                 }
             }
             // Create the emit resolver outside of the "emitTime" tracking code below.  That way
@@ -39023,7 +41683,14 @@ var ts;
             return getDiagnosticsHelper(sourceFile, getSemanticDiagnosticsForFile, cancellationToken);
         }
         function getDeclarationDiagnostics(sourceFile, cancellationToken) {
-            return getDiagnosticsHelper(sourceFile, getDeclarationDiagnosticsForFile, cancellationToken);
+            var options = program.getCompilerOptions();
+            // collect diagnostics from the program only once if either no source file was specified or out/outFile is set (bundled emit)
+            if (!sourceFile || options.out || options.outFile) {
+                return getDeclarationDiagnosticsWorker(sourceFile, cancellationToken);
+            }
+            else {
+                return getDiagnosticsHelper(sourceFile, getDeclarationDiagnosticsForFile, cancellationToken);
+            }
         }
         function getSyntacticDiagnosticsForFile(sourceFile, cancellationToken) {
             return sourceFile.parseDiagnostics;
@@ -39037,7 +41704,7 @@ var ts;
                     // We were canceled while performing the operation.  Because our type checker
                     // might be a bad state, we need to throw it away.
                     //
-                    // Note: we are overly agressive here.  We do not actually *have* to throw away
+                    // Note: we are overly aggressive here.  We do not actually *have* to throw away
                     // the "noDiagnosticsTypeChecker".  However, for simplicity, i'd like to keep
                     // the lifetimes of these two TypeCheckers the same.  Also, we generally only
                     // cancel when the user has made a change anyways.  And, in that case, we (the
@@ -39075,44 +41742,47 @@ var ts;
                         return false;
                     }
                     switch (node.kind) {
-                        case 224 /* ImportEqualsDeclaration */:
+                        case 228 /* ImportEqualsDeclaration */:
                             diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 230 /* ExportAssignment */:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 217 /* ClassDeclaration */:
+                        case 234 /* ExportAssignment */:
+                            if (node.isExportEquals) {
+                                diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
+                                return true;
+                            }
+                            break;
+                        case 220 /* ClassDeclaration */:
                             var classDeclaration = node;
                             if (checkModifiers(classDeclaration.modifiers) ||
                                 checkTypeParameters(classDeclaration.typeParameters)) {
                                 return true;
                             }
                             break;
-                        case 246 /* HeritageClause */:
+                        case 250 /* HeritageClause */:
                             var heritageClause = node;
                             if (heritageClause.token === 106 /* ImplementsKeyword */) {
                                 diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file));
                                 return true;
                             }
                             break;
-                        case 218 /* InterfaceDeclaration */:
+                        case 221 /* InterfaceDeclaration */:
                             diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 221 /* ModuleDeclaration */:
+                        case 224 /* ModuleDeclaration */:
                             diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.module_declarations_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 219 /* TypeAliasDeclaration */:
+                        case 222 /* TypeAliasDeclaration */:
                             diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.type_aliases_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 144 /* MethodDeclaration */:
-                        case 143 /* MethodSignature */:
-                        case 145 /* Constructor */:
-                        case 146 /* GetAccessor */:
-                        case 147 /* SetAccessor */:
-                        case 176 /* FunctionExpression */:
-                        case 216 /* FunctionDeclaration */:
-                        case 177 /* ArrowFunction */:
-                        case 216 /* FunctionDeclaration */:
+                        case 146 /* MethodDeclaration */:
+                        case 145 /* MethodSignature */:
+                        case 147 /* Constructor */:
+                        case 148 /* GetAccessor */:
+                        case 149 /* SetAccessor */:
+                        case 178 /* FunctionExpression */:
+                        case 219 /* FunctionDeclaration */:
+                        case 179 /* ArrowFunction */:
+                        case 219 /* FunctionDeclaration */:
                             var functionDeclaration = node;
                             if (checkModifiers(functionDeclaration.modifiers) ||
                                 checkTypeParameters(functionDeclaration.typeParameters) ||
@@ -39120,20 +41790,20 @@ var ts;
                                 return true;
                             }
                             break;
-                        case 196 /* VariableStatement */:
+                        case 199 /* VariableStatement */:
                             var variableStatement = node;
                             if (checkModifiers(variableStatement.modifiers)) {
                                 return true;
                             }
                             break;
-                        case 214 /* VariableDeclaration */:
+                        case 217 /* VariableDeclaration */:
                             var variableDeclaration = node;
                             if (checkTypeAnnotation(variableDeclaration.type)) {
                                 return true;
                             }
                             break;
-                        case 171 /* CallExpression */:
-                        case 172 /* NewExpression */:
+                        case 173 /* CallExpression */:
+                        case 174 /* NewExpression */:
                             var expression = node;
                             if (expression.typeArguments && expression.typeArguments.length > 0) {
                                 var start_2 = expression.typeArguments.pos;
@@ -39141,7 +41811,7 @@ var ts;
                                 return true;
                             }
                             break;
-                        case 139 /* Parameter */:
+                        case 141 /* Parameter */:
                             var parameter = node;
                             if (parameter.modifiers) {
                                 var start_3 = parameter.modifiers.pos;
@@ -39157,18 +41827,20 @@ var ts;
                                 return true;
                             }
                             break;
-                        case 142 /* PropertyDeclaration */:
+                        case 144 /* PropertyDeclaration */:
                             diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.property_declarations_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 220 /* EnumDeclaration */:
+                        case 223 /* EnumDeclaration */:
                             diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 174 /* TypeAssertionExpression */:
+                        case 176 /* TypeAssertionExpression */:
                             var typeAssertionExpression = node;
                             diagnostics.push(ts.createDiagnosticForNode(typeAssertionExpression.type, ts.Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 140 /* Decorator */:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.decorators_can_only_be_used_in_a_ts_file));
+                        case 142 /* Decorator */:
+                            if (!options.experimentalDecorators) {
+                                diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning));
+                            }
                             return true;
                     }
                     return ts.forEachChild(node, walk);
@@ -39196,6 +41868,7 @@ var ts;
                                 case 112 /* PublicKeyword */:
                                 case 110 /* PrivateKeyword */:
                                 case 111 /* ProtectedKeyword */:
+                                case 127 /* ReadonlyKeyword */:
                                 case 122 /* DeclareKeyword */:
                                     diagnostics.push(ts.createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
                                     return true;
@@ -39212,16 +41885,17 @@ var ts;
                 }
             });
         }
-        function getDeclarationDiagnosticsForFile(sourceFile, cancellationToken) {
+        function getDeclarationDiagnosticsWorker(sourceFile, cancellationToken) {
             return runWithCancellationToken(function () {
-                if (!ts.isDeclarationFile(sourceFile)) {
-                    var resolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile, cancellationToken);
-                    // Don't actually write any files since we're just getting diagnostics.
-                    var writeFile_1 = function () { };
-                    return ts.getDeclarationDiagnostics(getEmitHost(writeFile_1), resolver, sourceFile);
-                }
+                var resolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile, cancellationToken);
+                // Don't actually write any files since we're just getting diagnostics.
+                var writeFile = function () { };
+                return ts.getDeclarationDiagnostics(getEmitHost(writeFile), resolver, sourceFile);
             });
         }
+        function getDeclarationDiagnosticsForFile(sourceFile, cancellationToken) {
+            return ts.isDeclarationFile(sourceFile) ? [] : getDeclarationDiagnosticsWorker(sourceFile, cancellationToken);
+        }
         function getOptionsDiagnostics() {
             var allDiagnostics = [];
             ts.addRange(allDiagnostics, fileProcessingDiagnostics.getGlobalDiagnostics());
@@ -39237,7 +41911,7 @@ var ts;
             return ts.getBaseFileName(fileName).indexOf(".") >= 0;
         }
         function processRootFile(fileName, isDefaultLib) {
-            processSourceFile(ts.normalizePath(fileName), isDefaultLib);
+            processSourceFile(ts.normalizePath(fileName), isDefaultLib, /*isReference*/ true);
         }
         function fileReferenceIsEqualTo(a, b) {
             return a.fileName === b.fileName;
@@ -39268,9 +41942,9 @@ var ts;
             return;
             function collectModuleReferences(node, inAmbientModule) {
                 switch (node.kind) {
-                    case 225 /* ImportDeclaration */:
-                    case 224 /* ImportEqualsDeclaration */:
-                    case 231 /* ExportDeclaration */:
+                    case 229 /* ImportDeclaration */:
+                    case 228 /* ImportEqualsDeclaration */:
+                    case 235 /* ExportDeclaration */:
                         var moduleNameExpr = ts.getExternalModuleName(node);
                         if (!moduleNameExpr || moduleNameExpr.kind !== 9 /* StringLiteral */) {
                             break;
@@ -39279,14 +41953,14 @@ var ts;
                             break;
                         }
                         // TypeScript 1.0 spec (April 2014): 12.1.6
-                        // An ExternalImportDeclaration in an AmbientExternalModuleDeclaration may reference other external modules 
+                        // An ExternalImportDeclaration in an AmbientExternalModuleDeclaration may reference other external modules
                         // only through top - level external module names. Relative external module names are not permitted.
                         if (!inAmbientModule || !ts.isExternalModuleNameRelative(moduleNameExpr.text)) {
                             (imports || (imports = [])).push(moduleNameExpr);
                         }
                         break;
-                    case 221 /* ModuleDeclaration */:
-                        if (ts.isAmbientModule(node) && (inAmbientModule || node.flags & 4 /* Ambient */ || ts.isDeclarationFile(file))) {
+                    case 224 /* ModuleDeclaration */:
+                        if (ts.isAmbientModule(node) && (inAmbientModule || node.flags & 2 /* Ambient */ || ts.isDeclarationFile(file))) {
                             var moduleName = node.name;
                             // Ambient module declarations can be interpreted as augmentations for some existing external modules.
                             // This will happen in two cases:
@@ -39297,7 +41971,7 @@ var ts;
                                 (moduleAugmentations || (moduleAugmentations = [])).push(moduleName);
                             }
                             else if (!inAmbientModule) {
-                                // An AmbientExternalModuleDeclaration declares an external module. 
+                                // An AmbientExternalModuleDeclaration declares an external module.
                                 // This type of declaration is permitted only in the global module.
                                 // The StringLiteral must specify a top - level external module name.
                                 // Relative external module names are not permitted
@@ -39311,7 +41985,7 @@ var ts;
                 }
             }
             function collectRequireCalls(node) {
-                if (ts.isRequireCall(node)) {
+                if (ts.isRequireCall(node, /*checkArgumentIsStringLiteral*/ true)) {
                     (imports || (imports = [])).push(node.arguments[0]);
                 }
                 else {
@@ -39319,7 +41993,10 @@ var ts;
                 }
             }
         }
-        function processSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd) {
+        /**
+          * 'isReference' indicates whether the file was brought in via a reference directive (rather than an import declaration)
+          */
+        function processSourceFile(fileName, isDefaultLib, isReference, refFile, refPos, refEnd) {
             var diagnosticArgument;
             var diagnostic;
             if (hasExtension(fileName)) {
@@ -39327,7 +42004,7 @@ var ts;
                     diagnostic = ts.Diagnostics.File_0_has_unsupported_extension_The_only_supported_extensions_are_1;
                     diagnosticArgument = [fileName, "'" + supportedExtensions.join("', '") + "'"];
                 }
-                else if (!findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd)) {
+                else if (!findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, isReference, refFile, refPos, refEnd)) {
                     diagnostic = ts.Diagnostics.File_0_not_found;
                     diagnosticArgument = [fileName];
                 }
@@ -39337,13 +42014,13 @@ var ts;
                 }
             }
             else {
-                var nonTsFile = options.allowNonTsExtensions && findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd);
+                var nonTsFile = options.allowNonTsExtensions && findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, isReference, refFile, refPos, refEnd);
                 if (!nonTsFile) {
                     if (options.allowNonTsExtensions) {
                         diagnostic = ts.Diagnostics.File_0_not_found;
                         diagnosticArgument = [fileName];
                     }
-                    else if (!ts.forEach(supportedExtensions, function (extension) { return findSourceFile(fileName + extension, ts.toPath(fileName + extension, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd); })) {
+                    else if (!ts.forEach(supportedExtensions, function (extension) { return findSourceFile(fileName + extension, ts.toPath(fileName + extension, currentDirectory, getCanonicalFileName), isDefaultLib, isReference, refFile, refPos, refEnd); })) {
                         diagnostic = ts.Diagnostics.File_0_not_found;
                         fileName += ".ts";
                         diagnosticArgument = [fileName];
@@ -39368,7 +42045,7 @@ var ts;
             }
         }
         // Get source file from normalized fileName
-        function findSourceFile(fileName, path, isDefaultLib, refFile, refPos, refEnd) {
+        function findSourceFile(fileName, path, isDefaultLib, isReference, refFile, refPos, refEnd) {
             if (filesByName.contains(path)) {
                 var file_1 = filesByName.get(path);
                 // try to check if we've already seen this file but with a different casing in path
@@ -39376,6 +42053,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 (file_1) {
+                    file_1.wasReferenced = file_1.wasReferenced || isReference;
+                }
                 return file_1;
             }
             // We haven't looked for this file, do so now and cache result
@@ -39389,6 +42069,7 @@ var ts;
             });
             filesByName.set(path, file);
             if (file) {
+                file.wasReferenced = file.wasReferenced || isReference;
                 file.path = path;
                 if (host.useCaseSensitiveFileNames()) {
                     // for case-sensitive file systems check if we've already seen some file with similar filename ignoring case
@@ -39403,7 +42084,8 @@ var ts;
                 skipDefaultLib = skipDefaultLib || file.hasNoDefaultLib;
                 var basePath = ts.getDirectoryPath(fileName);
                 if (!options.noResolve) {
-                    processReferencedFiles(file, basePath);
+                    processReferencedFiles(file, basePath, isDefaultLib);
+                    processTypeReferenceDirectives(file);
                 }
                 // always process imported modules to record module name resolutions
                 processImportedModules(file, basePath);
@@ -39416,12 +42098,71 @@ var ts;
             }
             return file;
         }
-        function processReferencedFiles(file, basePath) {
+        function processReferencedFiles(file, basePath, isDefaultLib) {
             ts.forEach(file.referencedFiles, function (ref) {
                 var referencedFileName = resolveTripleslashReference(ref.fileName, file.fileName);
-                processSourceFile(referencedFileName, /*isDefaultLib*/ false, file, ref.pos, ref.end);
+                processSourceFile(referencedFileName, isDefaultLib, /*isReference*/ true, file, ref.pos, ref.end);
             });
         }
+        function processTypeReferenceDirectives(file) {
+            var typeDirectives = ts.map(file.typeReferenceDirectives, function (l) { return l.fileName; });
+            var resolutions = resolveTypeReferenceDirectiveNamesWorker(typeDirectives, file.fileName);
+            for (var i = 0; i < typeDirectives.length; i++) {
+                var ref = file.typeReferenceDirectives[i];
+                var resolvedTypeReferenceDirective = resolutions[i];
+                // store resolved type directive on the file
+                ts.setResolvedTypeReferenceDirective(file, ref.fileName, resolvedTypeReferenceDirective);
+                processTypeReferenceDirective(ref.fileName, resolvedTypeReferenceDirective, file, ref.pos, ref.end);
+            }
+        }
+        function processTypeReferenceDirective(typeReferenceDirective, resolvedTypeReferenceDirective, refFile, refPos, refEnd) {
+            // If we already found this library as a primary reference - nothing to do
+            var previousResolution = resolvedTypeReferenceDirectives[typeReferenceDirective];
+            if (previousResolution && previousResolution.primary) {
+                return;
+            }
+            var saveResolution = true;
+            if (resolvedTypeReferenceDirective) {
+                if (resolvedTypeReferenceDirective.primary) {
+                    // resolved from the primary path
+                    processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, /*isDefaultLib*/ false, /*isReference*/ true, refFile, refPos, refEnd);
+                }
+                else {
+                    // If we already resolved to this file, it must have been a secondary reference. Check file contents
+                    // for sameness and possibly issue an error
+                    if (previousResolution) {
+                        var otherFileText = host.readFile(resolvedTypeReferenceDirective.resolvedFileName);
+                        if (otherFileText !== getSourceFile(previousResolution.resolvedFileName).text) {
+                            fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd, ts.Diagnostics.Conflicting_library_definitions_for_0_found_at_1_and_2_Copy_the_correct_file_to_the_typings_folder_to_resolve_this_conflict, typeReferenceDirective, resolvedTypeReferenceDirective.resolvedFileName, previousResolution.resolvedFileName));
+                        }
+                        // don't overwrite previous resolution result
+                        saveResolution = false;
+                    }
+                    else {
+                        // First resolution of this library
+                        processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, /*isDefaultLib*/ false, /*isReference*/ true, refFile, refPos, refEnd);
+                    }
+                }
+            }
+            else {
+                fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd, ts.Diagnostics.Cannot_find_name_0, typeReferenceDirective));
+            }
+            if (saveResolution) {
+                resolvedTypeReferenceDirectives[typeReferenceDirective] = resolvedTypeReferenceDirective;
+            }
+        }
+        function createDiagnostic(refFile, refPos, refEnd, message) {
+            var args = [];
+            for (var _i = 4; _i < arguments.length; _i++) {
+                args[_i - 4] = arguments[_i];
+            }
+            if (refFile === undefined || refPos === undefined || refEnd === undefined) {
+                return ts.createCompilerDiagnostic.apply(void 0, [message].concat(args));
+            }
+            else {
+                return ts.createFileDiagnostic.apply(void 0, [refFile, refPos, refEnd - refPos, message].concat(args));
+            }
+        }
         function getCanonicalFileName(fileName) {
             return host.getCanonicalFileName(fileName);
         }
@@ -39435,18 +42176,18 @@ var ts;
                     var resolution = resolutions[i];
                     ts.setResolvedModule(file, moduleNames[i], resolution);
                     // add file to program only if:
-                    // - resolution was successfull
+                    // - resolution was successful
                     // - noResolve is falsy
                     // - module name come from the list fo imports
                     var shouldAddFile = resolution &&
                         !options.noResolve &&
                         i < file.imports.length;
                     if (shouldAddFile) {
-                        var importedFile = findSourceFile(resolution.resolvedFileName, ts.toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), /*isDefaultLib*/ false, file, ts.skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
+                        var importedFile = findSourceFile(resolution.resolvedFileName, ts.toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), /*isDefaultLib*/ false, /*isReference*/ false, file, ts.skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
                         if (importedFile && resolution.isExternalLibraryImport) {
                             // Since currently irrespective of allowJs, we only look for supportedTypeScript extension external module files,
                             // this check is ok. Otherwise this would be never true for javascript file
-                            if (!ts.isExternalModule(importedFile)) {
+                            if (!ts.isExternalModule(importedFile) && importedFile.statements.length) {
                                 var start_5 = ts.getTokenPosOfNode(file.imports[i], file);
                                 fileProcessingDiagnostics.add(ts.createFileDiagnostic(file, start_5, file.imports[i].end - start_5, ts.Diagnostics.Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition, importedFile.fileName));
                             }
@@ -39465,50 +42206,21 @@ var ts;
             return;
         }
         function computeCommonSourceDirectory(sourceFiles) {
-            var commonPathComponents;
-            var failed = ts.forEach(files, function (sourceFile) {
-                // Each file contributes into common source file path
-                if (ts.isDeclarationFile(sourceFile)) {
-                    return;
+            var fileNames = [];
+            for (var _i = 0, sourceFiles_2 = sourceFiles; _i < sourceFiles_2.length; _i++) {
+                var file = sourceFiles_2[_i];
+                if (!file.isDeclarationFile) {
+                    fileNames.push(file.fileName);
                 }
-                var sourcePathComponents = ts.getNormalizedPathComponents(sourceFile.fileName, currentDirectory);
-                sourcePathComponents.pop(); // The base file name is not part of the common directory path
-                if (!commonPathComponents) {
-                    // first file
-                    commonPathComponents = sourcePathComponents;
-                    return;
-                }
-                for (var i = 0, n = Math.min(commonPathComponents.length, sourcePathComponents.length); i < n; i++) {
-                    if (getCanonicalFileName(commonPathComponents[i]) !== getCanonicalFileName(sourcePathComponents[i])) {
-                        if (i === 0) {
-                            // Failed to find any common path component
-                            return true;
-                        }
-                        // New common path found that is 0 -> i-1
-                        commonPathComponents.length = i;
-                        break;
-                    }
-                }
-                // If the sourcePathComponents was shorter than the commonPathComponents, truncate to the sourcePathComponents
-                if (sourcePathComponents.length < commonPathComponents.length) {
-                    commonPathComponents.length = sourcePathComponents.length;
-                }
-            });
-            // A common path can not be found when paths span multiple drives on windows, for example
-            if (failed) {
-                return "";
             }
-            if (!commonPathComponents) {
-                return currentDirectory;
-            }
-            return ts.getNormalizedPathFromPathComponents(commonPathComponents);
+            return computeCommonSourceDirectoryOfFilenames(fileNames, currentDirectory, getCanonicalFileName);
         }
         function checkSourceFilesBelongToPath(sourceFiles, rootDirectory) {
             var allFilesBelongToPath = true;
             if (sourceFiles) {
                 var absoluteRootDirectoryPath = host.getCanonicalFileName(ts.getNormalizedAbsolutePath(rootDirectory, currentDirectory));
-                for (var _i = 0, sourceFiles_2 = sourceFiles; _i < sourceFiles_2.length; _i++) {
-                    var sourceFile = sourceFiles_2[_i];
+                for (var _i = 0, sourceFiles_3 = sourceFiles; _i < sourceFiles_3.length; _i++) {
+                    var sourceFile = sourceFiles_3[_i];
                     if (!ts.isDeclarationFile(sourceFile)) {
                         var absoluteSourceFilePath = host.getCanonicalFileName(ts.getNormalizedAbsolutePath(sourceFile.fileName, currentDirectory));
                         if (absoluteSourceFilePath.indexOf(absoluteRootDirectoryPath) !== 0) {
@@ -39543,6 +42255,25 @@ var ts;
                     programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "mapRoot", "inlineSourceMap"));
                 }
             }
+            if (options.paths && options.baseUrl === undefined) {
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_paths_cannot_be_used_without_specifying_baseUrl_option));
+            }
+            if (options.paths) {
+                for (var key in options.paths) {
+                    if (!ts.hasProperty(options.paths, key)) {
+                        continue;
+                    }
+                    if (!hasZeroOrOneAsteriskCharacter(key)) {
+                        programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Pattern_0_can_have_at_most_one_Asterisk_character, key));
+                    }
+                    for (var _i = 0, _a = options.paths[key]; _i < _a.length; _i++) {
+                        var subst = _a[_i];
+                        if (!hasZeroOrOneAsteriskCharacter(subst)) {
+                            programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character, subst, key));
+                        }
+                    }
+                }
+            }
             if (options.inlineSources) {
                 if (!options.sourceMap && !options.inlineSourceMap) {
                     programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_inlineSources_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_provided));
@@ -39563,11 +42294,22 @@ var ts;
                     programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "sourceRoot", "sourceMap"));
                 }
             }
+            if (options.declarationDir) {
+                if (!options.declaration) {
+                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "declarationDir", "declaration"));
+                }
+                if (options.out || options.outFile) {
+                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "declarationDir", options.out ? "out" : "outFile"));
+                }
+            }
+            if (options.lib && options.noLib) {
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "lib", "noLib"));
+            }
             var languageVersion = options.target || 0 /* ES3 */;
             var outFile = options.outFile || options.out;
             var firstExternalModuleSourceFile = ts.forEach(files, function (f) { return ts.isExternalModule(f) ? f : undefined; });
             if (options.isolatedModules) {
-                if (!options.module && languageVersion < 2 /* ES6 */) {
+                if (options.module === ts.ModuleKind.None && languageVersion < 2 /* ES6 */) {
                     programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher));
                 }
                 var firstNonExternalModuleSourceFile = ts.forEach(files, function (f) { return !ts.isExternalModule(f) && !ts.isDeclarationFile(f) ? f : undefined; });
@@ -39576,17 +42318,17 @@ var ts;
                     programDiagnostics.add(ts.createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided));
                 }
             }
-            else if (firstExternalModuleSourceFile && languageVersion < 2 /* ES6 */ && !options.module) {
+            else if (firstExternalModuleSourceFile && languageVersion < 2 /* ES6 */ && options.module === ts.ModuleKind.None) {
                 // We cannot use createDiagnosticFromNode because nodes do not have parents yet
                 var span = ts.getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator);
-                programDiagnostics.add(ts.createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_modules_unless_the_module_flag_is_provided_Consider_setting_the_module_compiler_option_in_a_tsconfig_json_file));
+                programDiagnostics.add(ts.createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_modules_unless_the_module_flag_is_provided_with_a_valid_module_type_Consider_setting_the_module_compiler_option_in_a_tsconfig_json_file));
             }
             // Cannot specify module gen target of es6 when below es6
-            if (options.module === 5 /* ES6 */ && languageVersion < 2 /* ES6 */) {
+            if (options.module === ts.ModuleKind.ES6 && languageVersion < 2 /* ES6 */) {
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_compile_modules_into_es2015_when_targeting_ES5_or_lower));
             }
             // Cannot specify module gen that isn't amd or system with --out
-            if (outFile && options.module && !(options.module === 2 /* AMD */ || options.module === 4 /* System */)) {
+            if (outFile && options.module && !(options.module === ts.ModuleKind.AMD || options.module === ts.ModuleKind.System)) {
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Only_amd_and_system_modules_are_supported_alongside_0, options.out ? "out" : "outFile"));
             }
             // there has to be common source directory if user specified --outdir || --sourceRoot
@@ -39601,21 +42343,7 @@ var ts;
                     programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_find_the_common_subdirectory_path_for_the_input_files));
                 }
             }
-            if (options.noEmit) {
-                if (options.out) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "out"));
-                }
-                if (options.outFile) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "outFile"));
-                }
-                if (options.outDir) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "outDir"));
-                }
-                if (options.declaration) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "declaration"));
-                }
-            }
-            else if (options.allowJs && options.declaration) {
+            if (!options.noEmit && options.allowJs && options.declaration) {
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "allowJs", "declaration"));
             }
             if (options.emitDecoratorMetadata &&
@@ -39623,15 +42351,15 @@ var ts;
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "emitDecoratorMetadata", "experimentalDecorators"));
             }
             if (options.reactNamespace && !ts.isIdentifier(options.reactNamespace, languageVersion)) {
-                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Invalide_value_for_reactNamespace_0_is_not_a_valid_identifier, options.reactNamespace));
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier, options.reactNamespace));
             }
             // If the emit is enabled make sure that every output file is unique and not overwriting any of the input files
-            if (!options.noEmit) {
+            if (!options.noEmit && !options.suppressOutputPathCheck) {
                 var emitHost = getEmitHost();
-                var emitFilesSeen = ts.createFileMap(!host.useCaseSensitiveFileNames() ? function (key) { return key.toLocaleLowerCase(); } : undefined);
+                var emitFilesSeen_1 = ts.createFileMap(!host.useCaseSensitiveFileNames() ? function (key) { return key.toLocaleLowerCase(); } : undefined);
                 ts.forEachExpectedEmitFile(emitHost, function (emitFileNames, sourceFiles, isBundledEmit) {
-                    verifyEmitFilePath(emitFileNames.jsFilePath, emitFilesSeen);
-                    verifyEmitFilePath(emitFileNames.declarationFilePath, emitFilesSeen);
+                    verifyEmitFilePath(emitFileNames.jsFilePath, emitFilesSeen_1);
+                    verifyEmitFilePath(emitFileNames.declarationFilePath, emitFilesSeen_1);
                 });
             }
             // Verify that all the emit files are unique and don't overwrite input files
@@ -39679,6 +42407,12 @@ var ts;
             type: "boolean",
             description: ts.Diagnostics.Generates_corresponding_d_ts_file
         },
+        {
+            name: "declarationDir",
+            type: "string",
+            isFilePath: true,
+            paramType: ts.Diagnostics.DIRECTORY
+        },
         {
             name: "diagnostics",
             type: "boolean"
@@ -39713,13 +42447,12 @@ var ts;
                 "react": 2 /* React */
             },
             paramType: ts.Diagnostics.KIND,
-            description: ts.Diagnostics.Specify_JSX_code_generation_Colon_preserve_or_react,
-            error: ts.Diagnostics.Argument_for_jsx_must_be_preserve_or_react
+            description: ts.Diagnostics.Specify_JSX_code_generation_Colon_preserve_or_react
         },
         {
             name: "reactNamespace",
             type: "string",
-            description: ts.Diagnostics.Specifies_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit
+            description: ts.Diagnostics.Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit
         },
         {
             name: "listFiles",
@@ -39733,23 +42466,23 @@ var ts;
             name: "mapRoot",
             type: "string",
             isFilePath: true,
-            description: ts.Diagnostics.Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations,
+            description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations,
             paramType: ts.Diagnostics.LOCATION
         },
         {
             name: "module",
             shortName: "m",
             type: {
-                "commonjs": 1 /* CommonJS */,
-                "amd": 2 /* AMD */,
-                "system": 4 /* System */,
-                "umd": 3 /* UMD */,
-                "es6": 5 /* ES6 */,
-                "es2015": 5 /* ES2015 */
+                "none": ts.ModuleKind.None,
+                "commonjs": ts.ModuleKind.CommonJS,
+                "amd": ts.ModuleKind.AMD,
+                "system": ts.ModuleKind.System,
+                "umd": ts.ModuleKind.UMD,
+                "es6": ts.ModuleKind.ES6,
+                "es2015": ts.ModuleKind.ES2015
             },
             description: ts.Diagnostics.Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015,
-            paramType: ts.Diagnostics.KIND,
-            error: ts.Diagnostics.Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015
+            paramType: ts.Diagnostics.KIND
         },
         {
             name: "newLine",
@@ -39757,9 +42490,8 @@ var ts;
                 "crlf": 0 /* CarriageReturnLineFeed */,
                 "lf": 1 /* LineFeed */
             },
-            description: ts.Diagnostics.Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix,
-            paramType: ts.Diagnostics.NEWLINE,
-            error: ts.Diagnostics.Argument_for_newLine_option_must_be_CRLF_or_LF
+            description: ts.Diagnostics.Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix,
+            paramType: ts.Diagnostics.NEWLINE
         },
         {
             name: "noEmit",
@@ -39780,6 +42512,11 @@ var ts;
             type: "boolean",
             description: ts.Diagnostics.Raise_error_on_expressions_and_declarations_with_an_implied_any_type
         },
+        {
+            name: "noImplicitThis",
+            type: "boolean",
+            description: ts.Diagnostics.Raise_error_on_this_expressions_with_an_implied_any_type
+        },
         {
             name: "noLib",
             type: "boolean"
@@ -39820,7 +42557,6 @@ var ts;
         },
         {
             name: "pretty",
-            paramType: ts.Diagnostics.KIND,
             description: ts.Diagnostics.Stylize_errors_and_messages_using_color_and_context_experimental,
             type: "boolean"
         },
@@ -39841,8 +42577,8 @@ var ts;
             name: "rootDir",
             type: "string",
             isFilePath: true,
-            description: ts.Diagnostics.Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir,
-            paramType: ts.Diagnostics.LOCATION
+            paramType: ts.Diagnostics.LOCATION,
+            description: ts.Diagnostics.Specify_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir
         },
         {
             name: "isolatedModules",
@@ -39857,7 +42593,7 @@ var ts;
             name: "sourceRoot",
             type: "string",
             isFilePath: true,
-            description: ts.Diagnostics.Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations,
+            description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations,
             paramType: ts.Diagnostics.LOCATION
         },
         {
@@ -39886,9 +42622,8 @@ var ts;
                 "es6": 2 /* ES6 */,
                 "es2015": 2 /* ES2015 */
             },
-            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental,
-            paramType: ts.Diagnostics.VERSION,
-            error: ts.Diagnostics.Argument_for_target_option_must_be_ES3_ES5_or_ES2015
+            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015,
+            paramType: ts.Diagnostics.VERSION
         },
         {
             name: "version",
@@ -39916,11 +42651,10 @@ var ts;
         {
             name: "moduleResolution",
             type: {
-                "node": 2 /* NodeJs */,
-                "classic": 1 /* Classic */
+                "node": ts.ModuleResolutionKind.NodeJs,
+                "classic": ts.ModuleResolutionKind.Classic
             },
-            description: ts.Diagnostics.Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6,
-            error: ts.Diagnostics.Argument_for_moduleResolution_option_must_be_node_or_classic
+            description: ts.Diagnostics.Specify_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6
         },
         {
             name: "allowUnusedLabels",
@@ -39948,14 +42682,135 @@ var ts;
             description: ts.Diagnostics.Disallow_inconsistently_cased_references_to_the_same_file
         },
         {
-            name: "allowSyntheticDefaultImports",
+            name: "baseUrl",
+            type: "string",
+            isFilePath: true,
+            description: ts.Diagnostics.Base_directory_to_resolve_non_absolute_module_names
+        },
+        {
+            // this option can only be specified in tsconfig.json
+            // use type = object to copy the value as-is
+            name: "paths",
+            type: "object",
+            isTSConfigOnly: true
+        },
+        {
+            // this option can only be specified in tsconfig.json
+            // use type = object to copy the value as-is
+            name: "rootDirs",
+            type: "list",
+            isTSConfigOnly: true,
+            element: {
+                name: "rootDirs",
+                type: "string",
+                isFilePath: true
+            }
+        },
+        {
+            name: "typesSearchPaths",
+            type: "list",
+            isTSConfigOnly: true,
+            element: {
+                name: "typesSearchPaths",
+                type: "string",
+                isFilePath: true
+            }
+        },
+        {
+            name: "typesRoot",
+            type: "string"
+        },
+        {
+            name: "types",
+            type: "list",
+            element: {
+                name: "types",
+                type: "string"
+            },
+            description: ts.Diagnostics.Type_declaration_files_to_be_included_in_compilation
+        },
+        {
+            name: "traceResolution",
             type: "boolean",
-            description: ts.Diagnostics.Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking
+            description: ts.Diagnostics.Enable_tracing_of_the_name_resolution_process
         },
         {
             name: "allowJs",
             type: "boolean",
             description: ts.Diagnostics.Allow_javascript_files_to_be_compiled
+        },
+        {
+            name: "allowSyntheticDefaultImports",
+            type: "boolean",
+            description: ts.Diagnostics.Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking
+        },
+        {
+            name: "noImplicitUseStrict",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_emit_use_strict_directives_in_module_output
+        },
+        {
+            name: "listEmittedFiles",
+            type: "boolean"
+        },
+        {
+            name: "lib",
+            type: "list",
+            element: {
+                name: "lib",
+                type: {
+                    // JavaScript only
+                    "es5": "lib.es5.d.ts",
+                    "es6": "lib.es2015.d.ts",
+                    "es2015": "lib.es2015.d.ts",
+                    "es7": "lib.es2016.d.ts",
+                    "es2016": "lib.es2016.d.ts",
+                    // Host only
+                    "dom": "lib.dom.d.ts",
+                    "webworker": "lib.webworker.d.ts",
+                    "scripthost": "lib.scripthost.d.ts",
+                    // ES2015 Or ESNext By-feature options
+                    "es2015.core": "lib.es2015.core.d.ts",
+                    "es2015.collection": "lib.es2015.collection.d.ts",
+                    "es2015.generator": "lib.es2015.generator.d.ts",
+                    "es2015.iterable": "lib.es2015.iterable.d.ts",
+                    "es2015.promise": "lib.es2015.promise.d.ts",
+                    "es2015.proxy": "lib.es2015.proxy.d.ts",
+                    "es2015.reflect": "lib.es2015.reflect.d.ts",
+                    "es2015.symbol": "lib.es2015.symbol.d.ts",
+                    "es2015.symbol.wellknown": "lib.es2015.symbol.wellknown.d.ts",
+                    "es2016.array.include": "lib.es2016.array.include.d.ts"
+                }
+            },
+            description: ts.Diagnostics.Specify_library_files_to_be_included_in_the_compilation_Colon
+        },
+        {
+            name: "strictNullChecks",
+            type: "boolean",
+            description: ts.Diagnostics.Enable_strict_null_checks
+        }
+    ];
+    /* @internal */
+    ts.typingOptionDeclarations = [
+        {
+            name: "enableAutoDiscovery",
+            type: "boolean"
+        },
+        {
+            name: "include",
+            type: "list",
+            element: {
+                name: "include",
+                type: "string"
+            }
+        },
+        {
+            name: "exclude",
+            type: "list",
+            element: {
+                name: "exclude",
+                type: "string"
+            }
         }
     ];
     var optionNameMapCache;
@@ -39976,6 +42831,41 @@ var ts;
         return optionNameMapCache;
     }
     ts.getOptionNameMap = getOptionNameMap;
+    /* @internal */
+    function createCompilerDiagnosticForInvalidCustomType(opt) {
+        var namesOfType = [];
+        ts.forEachKey(opt.type, function (key) {
+            namesOfType.push(" '" + key + "'");
+        });
+        return ts.createCompilerDiagnostic(ts.Diagnostics.Argument_for_0_option_must_be_Colon_1, "--" + opt.name, namesOfType);
+    }
+    ts.createCompilerDiagnosticForInvalidCustomType = createCompilerDiagnosticForInvalidCustomType;
+    /* @internal */
+    function parseCustomTypeOption(opt, value, errors) {
+        var key = (value || "").trim().toLowerCase();
+        var map = opt.type;
+        if (ts.hasProperty(map, key)) {
+            return map[key];
+        }
+        else {
+            errors.push(createCompilerDiagnosticForInvalidCustomType(opt));
+        }
+    }
+    ts.parseCustomTypeOption = parseCustomTypeOption;
+    /* @internal */
+    function parseListTypeOption(opt, value, errors) {
+        var values = (value || "").trim().split(",");
+        switch (opt.element.type) {
+            case "number":
+                return ts.map(values, parseInt);
+            case "string":
+                return ts.map(values, function (v) { return v || ""; });
+            default:
+                return ts.filter(ts.map(values, function (v) { return parseCustomTypeOption(opt.element, v, errors); }), function (v) { return !!v; });
+        }
+    }
+    ts.parseListTypeOption = parseListTypeOption;
+    /* @internal */
     function parseCommandLine(commandLine, readFile) {
         var options = {};
         var fileNames = [];
@@ -40003,33 +42893,36 @@ var ts;
                     }
                     if (ts.hasProperty(optionNameMap, s)) {
                         var opt = optionNameMap[s];
-                        // Check to see if no argument was provided (e.g. "--locale" is the last command-line argument).
-                        if (!args[i] && opt.type !== "boolean") {
-                            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_expects_an_argument, opt.name));
+                        if (opt.isTSConfigOnly) {
+                            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_can_only_be_specified_in_tsconfig_json_file, opt.name));
                         }
-                        switch (opt.type) {
-                            case "number":
-                                options[opt.name] = parseInt(args[i]);
-                                i++;
-                                break;
-                            case "boolean":
-                                options[opt.name] = true;
-                                break;
-                            case "string":
-                                options[opt.name] = args[i] || "";
-                                i++;
-                                break;
-                            // If not a primitive, the possible types are specified in what is effectively a map of options.
-                            default:
-                                var map_1 = opt.type;
-                                var key = (args[i] || "").toLowerCase();
-                                i++;
-                                if (ts.hasProperty(map_1, key)) {
-                                    options[opt.name] = map_1[key];
-                                }
-                                else {
-                                    errors.push(ts.createCompilerDiagnostic(opt.error));
-                                }
+                        else {
+                            // Check to see if no argument was provided (e.g. "--locale" is the last command-line argument).
+                            if (!args[i] && opt.type !== "boolean") {
+                                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_expects_an_argument, opt.name));
+                            }
+                            switch (opt.type) {
+                                case "number":
+                                    options[opt.name] = parseInt(args[i]);
+                                    i++;
+                                    break;
+                                case "boolean":
+                                    options[opt.name] = true;
+                                    break;
+                                case "string":
+                                    options[opt.name] = args[i] || "";
+                                    i++;
+                                    break;
+                                case "list":
+                                    options[opt.name] = parseListTypeOption(opt, args[i], errors);
+                                    i++;
+                                    break;
+                                // If not a primitive, the possible types are specified in what is effectively a map of options.
+                                default:
+                                    options[opt.name] = parseCustomTypeOption(opt, args[i], errors);
+                                    i++;
+                                    break;
+                            }
                         }
                     }
                     else {
@@ -40138,19 +43031,24 @@ var ts;
       * @param basePath A root directory to resolve relative path entries in the config
       *    file to. e.g. outDir
       */
-    function parseJsonConfigFileContent(json, host, basePath, existingOptions) {
+    function parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName) {
         if (existingOptions === void 0) { existingOptions = {}; }
-        var _a = convertCompilerOptionsFromJson(json["compilerOptions"], basePath), optionsFromJsonConfigFile = _a.options, errors = _a.errors;
-        var options = ts.extend(existingOptions, optionsFromJsonConfigFile);
+        var errors = [];
+        var compilerOptions = convertCompilerOptionsFromJsonWorker(json["compilerOptions"], basePath, errors, configFileName);
+        var options = ts.extend(existingOptions, compilerOptions);
+        var typingOptions = convertTypingOptionsFromJsonWorker(json["typingOptions"], basePath, errors, configFileName);
+        options.configFilePath = configFileName;
+        var fileNames = getFileNames(errors);
         return {
             options: options,
-            fileNames: getFileNames(),
+            fileNames: fileNames,
+            typingOptions: typingOptions,
             errors: errors
         };
-        function getFileNames() {
+        function getFileNames(errors) {
             var fileNames = [];
             if (ts.hasProperty(json, "files")) {
-                if (json["files"] instanceof Array) {
+                if (ts.isArray(json["files"])) {
                     fileNames = ts.map(json["files"], function (s) { return ts.combinePaths(basePath, s); });
                 }
                 else {
@@ -40159,7 +43057,19 @@ var ts;
             }
             else {
                 var filesSeen = {};
-                var exclude = json["exclude"] instanceof Array ? ts.map(json["exclude"], ts.normalizeSlashes) : undefined;
+                var exclude = [];
+                if (ts.isArray(json["exclude"])) {
+                    exclude = json["exclude"];
+                }
+                else {
+                    // by default exclude node_modules, and any specificied output directory
+                    exclude = ["node_modules"];
+                    var outDir = json["compilerOptions"] && json["compilerOptions"]["outDir"];
+                    if (outDir) {
+                        exclude.push(outDir);
+                    }
+                }
+                exclude = ts.map(exclude, ts.normalizeSlashes);
                 var supportedExtensions = ts.getSupportedExtensions(options);
                 ts.Debug.assert(ts.indexOf(supportedExtensions, ".ts") < ts.indexOf(supportedExtensions, ".d.ts"), "Changed priority of extensions to pick");
                 // Get files of supported extensions in their order of resolution
@@ -40168,11 +43078,15 @@ var ts;
                     var filesInDirWithExtension = host.readDirectory(basePath, extension, exclude);
                     for (var _a = 0, filesInDirWithExtension_1 = filesInDirWithExtension; _a < filesInDirWithExtension_1.length; _a++) {
                         var fileName = filesInDirWithExtension_1[_a];
-                        // .ts extension would read the .d.ts extension files too but since .d.ts is lower priority extension, 
+                        // .ts extension would read the .d.ts extension files too but since .d.ts is lower priority extension,
                         // lets pick them when its turn comes up
                         if (extension === ".ts" && ts.fileExtensionIs(fileName, ".d.ts")) {
                             continue;
                         }
+                        // Skip over any minified JavaScript files (ending in ".min.js")
+                        if (/\.min\.js$/.test(fileName)) {
+                            continue;
+                        }
                         // If this is one of the output extension (which would be .d.ts and .js if we are allowing compilation of js files)
                         // do not include this file if we included .ts or .tsx file with same base name as it could be output of the earlier compilation
                         if (extension === ".d.ts" || (options.allowJs && ts.contains(ts.supportedJavascriptExtensions, extension))) {
@@ -40186,53 +43100,88 @@ var ts;
                     }
                 }
             }
+            if (ts.hasProperty(json, "excludes") && !ts.hasProperty(json, "exclude")) {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_option_excludes_Did_you_mean_exclude));
+            }
             return fileNames;
         }
     }
     ts.parseJsonConfigFileContent = parseJsonConfigFileContent;
-    function convertCompilerOptionsFromJson(jsonOptions, basePath) {
-        var options = {};
+    function convertCompilerOptionsFromJson(jsonOptions, basePath, configFileName) {
         var errors = [];
-        if (!jsonOptions) {
-            return { options: options, errors: errors };
-        }
-        var optionNameMap = ts.arrayToMap(ts.optionDeclarations, function (opt) { return opt.name; });
-        for (var id in jsonOptions) {
-            if (ts.hasProperty(optionNameMap, id)) {
-                var opt = optionNameMap[id];
-                var optType = opt.type;
-                var value = jsonOptions[id];
-                var expectedType = typeof optType === "string" ? optType : "string";
-                if (typeof value === expectedType) {
-                    if (typeof optType !== "string") {
-                        var key = value.toLowerCase();
-                        if (ts.hasProperty(optType, key)) {
-                            value = optType[key];
-                        }
-                        else {
-                            errors.push(ts.createCompilerDiagnostic(opt.error));
-                            value = 0;
-                        }
-                    }
-                    if (opt.isFilePath) {
-                        value = ts.normalizePath(ts.combinePaths(basePath, value));
-                        if (value === "") {
-                            value = ".";
-                        }
-                    }
-                    options[opt.name] = value;
-                }
-                else {
-                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, id, expectedType));
-                }
-            }
-            else {
-                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_compiler_option_0, id));
-            }
-        }
+        var options = convertCompilerOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName);
         return { options: options, errors: errors };
     }
     ts.convertCompilerOptionsFromJson = convertCompilerOptionsFromJson;
+    function convertTypingOptionsFromJson(jsonOptions, basePath, configFileName) {
+        var errors = [];
+        var options = convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName);
+        return { options: options, errors: errors };
+    }
+    ts.convertTypingOptionsFromJson = convertTypingOptionsFromJson;
+    function convertCompilerOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName) {
+        var options = ts.getBaseFileName(configFileName) === "jsconfig.json" ? { allowJs: true } : {};
+        convertOptionsFromJson(ts.optionDeclarations, jsonOptions, basePath, options, ts.Diagnostics.Unknown_compiler_option_0, errors);
+        return options;
+    }
+    function convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName) {
+        var options = ts.getBaseFileName(configFileName) === "jsconfig.json"
+            ? { enableAutoDiscovery: true, include: [], exclude: [] }
+            : { enableAutoDiscovery: false, include: [], exclude: [] };
+        convertOptionsFromJson(ts.typingOptionDeclarations, jsonOptions, basePath, options, ts.Diagnostics.Unknown_typing_option_0, errors);
+        return options;
+    }
+    function convertOptionsFromJson(optionDeclarations, jsonOptions, basePath, defaultOptions, diagnosticMessage, errors) {
+        if (!jsonOptions) {
+            return;
+        }
+        var optionNameMap = ts.arrayToMap(optionDeclarations, function (opt) { return opt.name; });
+        for (var id in jsonOptions) {
+            if (ts.hasProperty(optionNameMap, id)) {
+                var opt = optionNameMap[id];
+                defaultOptions[opt.name] = convertJsonOption(opt, jsonOptions[id], basePath, errors);
+            }
+            else {
+                errors.push(ts.createCompilerDiagnostic(diagnosticMessage, id));
+            }
+        }
+    }
+    function convertJsonOption(opt, value, basePath, errors) {
+        var optType = opt.type;
+        var expectedType = typeof optType === "string" ? optType : "string";
+        if (optType === "list" && ts.isArray(value)) {
+            return convertJsonOptionOfListType(opt, value, basePath, errors);
+        }
+        else if (typeof value === expectedType) {
+            if (typeof optType !== "string") {
+                return convertJsonOptionOfCustomType(opt, value, errors);
+            }
+            else {
+                if (opt.isFilePath) {
+                    value = ts.normalizePath(ts.combinePaths(basePath, value));
+                    if (value === "") {
+                        value = ".";
+                    }
+                }
+            }
+            return value;
+        }
+        else {
+            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, opt.name, expectedType));
+        }
+    }
+    function convertJsonOptionOfCustomType(opt, value, errors) {
+        var key = value.toLowerCase();
+        if (ts.hasProperty(opt.type, key)) {
+            return opt.type[key];
+        }
+        else {
+            errors.push(createCompilerDiagnosticForInvalidCustomType(opt));
+        }
+    }
+    function convertJsonOptionOfListType(option, values, basePath, errors) {
+        return ts.filter(ts.map(values, function (v) { return convertJsonOption(option.element, v, basePath, errors); }), function (v) { return !!v; });
+    }
 })(ts || (ts = {}));
 /* @internal */
 var ts;
@@ -40306,7 +43255,7 @@ var ts;
                 }
             }
             function autoCollapse(node) {
-                return ts.isFunctionBlock(node) && node.parent.kind !== 177 /* ArrowFunction */;
+                return ts.isFunctionBlock(node) && node.parent.kind !== 179 /* ArrowFunction */;
             }
             var depth = 0;
             var maxDepth = 20;
@@ -40318,30 +43267,30 @@ var ts;
                     addOutliningForLeadingCommentsForNode(n);
                 }
                 switch (n.kind) {
-                    case 195 /* Block */:
+                    case 198 /* Block */:
                         if (!ts.isFunctionBlock(n)) {
-                            var parent_8 = n.parent;
+                            var parent_11 = n.parent;
                             var openBrace = ts.findChildOfKind(n, 15 /* OpenBraceToken */, sourceFile);
                             var closeBrace = ts.findChildOfKind(n, 16 /* CloseBraceToken */, sourceFile);
                             // Check if the block is standalone, or 'attached' to some parent statement.
-                            // If the latter, we want to collaps the block, but consider its hint span
+                            // If the latter, we want to collapse the block, but consider its hint span
                             // to be the entire span of the parent.
-                            if (parent_8.kind === 200 /* DoStatement */ ||
-                                parent_8.kind === 203 /* ForInStatement */ ||
-                                parent_8.kind === 204 /* ForOfStatement */ ||
-                                parent_8.kind === 202 /* ForStatement */ ||
-                                parent_8.kind === 199 /* IfStatement */ ||
-                                parent_8.kind === 201 /* WhileStatement */ ||
-                                parent_8.kind === 208 /* WithStatement */ ||
-                                parent_8.kind === 247 /* CatchClause */) {
-                                addOutliningSpan(parent_8, openBrace, closeBrace, autoCollapse(n));
+                            if (parent_11.kind === 203 /* DoStatement */ ||
+                                parent_11.kind === 206 /* ForInStatement */ ||
+                                parent_11.kind === 207 /* ForOfStatement */ ||
+                                parent_11.kind === 205 /* ForStatement */ ||
+                                parent_11.kind === 202 /* IfStatement */ ||
+                                parent_11.kind === 204 /* WhileStatement */ ||
+                                parent_11.kind === 211 /* WithStatement */ ||
+                                parent_11.kind === 251 /* CatchClause */) {
+                                addOutliningSpan(parent_11, openBrace, closeBrace, autoCollapse(n));
                                 break;
                             }
-                            if (parent_8.kind === 212 /* TryStatement */) {
+                            if (parent_11.kind === 215 /* TryStatement */) {
                                 // Could be the try-block, or the finally-block.
-                                var tryStatement = parent_8;
+                                var tryStatement = parent_11;
                                 if (tryStatement.tryBlock === n) {
-                                    addOutliningSpan(parent_8, openBrace, closeBrace, autoCollapse(n));
+                                    addOutliningSpan(parent_11, openBrace, closeBrace, autoCollapse(n));
                                     break;
                                 }
                                 else if (tryStatement.finallyBlock === n) {
@@ -40364,23 +43313,23 @@ var ts;
                             break;
                         }
                     // Fallthrough.
-                    case 222 /* ModuleBlock */: {
+                    case 225 /* ModuleBlock */: {
                         var openBrace = ts.findChildOfKind(n, 15 /* OpenBraceToken */, sourceFile);
                         var closeBrace = ts.findChildOfKind(n, 16 /* CloseBraceToken */, sourceFile);
                         addOutliningSpan(n.parent, openBrace, closeBrace, autoCollapse(n));
                         break;
                     }
-                    case 217 /* ClassDeclaration */:
-                    case 218 /* InterfaceDeclaration */:
-                    case 220 /* EnumDeclaration */:
-                    case 168 /* ObjectLiteralExpression */:
-                    case 223 /* CaseBlock */: {
+                    case 220 /* ClassDeclaration */:
+                    case 221 /* InterfaceDeclaration */:
+                    case 223 /* EnumDeclaration */:
+                    case 170 /* ObjectLiteralExpression */:
+                    case 226 /* CaseBlock */: {
                         var openBrace = ts.findChildOfKind(n, 15 /* OpenBraceToken */, sourceFile);
                         var closeBrace = ts.findChildOfKind(n, 16 /* CloseBraceToken */, sourceFile);
                         addOutliningSpan(n, openBrace, closeBrace, autoCollapse(n));
                         break;
                     }
-                    case 167 /* ArrayLiteralExpression */:
+                    case 169 /* ArrayLiteralExpression */:
                         var openBracket = ts.findChildOfKind(n, 19 /* OpenBracketToken */, sourceFile);
                         var closeBracket = ts.findChildOfKind(n, 20 /* CloseBracketToken */, sourceFile);
                         addOutliningSpan(n, openBracket, closeBracket, autoCollapse(n));
@@ -40410,17 +43359,17 @@ var ts;
             ts.forEach(program.getSourceFiles(), function (sourceFile) {
                 cancellationToken.throwIfCancellationRequested();
                 var nameToDeclarations = sourceFile.getNamedDeclarations();
-                for (var name_31 in nameToDeclarations) {
-                    var declarations = ts.getProperty(nameToDeclarations, name_31);
+                for (var name_34 in nameToDeclarations) {
+                    var declarations = ts.getProperty(nameToDeclarations, name_34);
                     if (declarations) {
                         // First do a quick check to see if the name of the declaration matches the 
                         // last portion of the (possibly) dotted name they're searching for.
-                        var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_31);
+                        var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_34);
                         if (!matches) {
                             continue;
                         }
-                        for (var _i = 0, declarations_6 = declarations; _i < declarations_6.length; _i++) {
-                            var declaration = declarations_6[_i];
+                        for (var _i = 0, declarations_7 = declarations; _i < declarations_7.length; _i++) {
+                            var declaration = declarations_7[_i];
                             // It was a match!  If the pattern has dots in it, then also see if the 
                             // declaration container matches as well.
                             if (patternMatcher.patternContainsDots) {
@@ -40428,14 +43377,14 @@ var ts;
                                 if (!containers) {
                                     return undefined;
                                 }
-                                matches = patternMatcher.getMatches(containers, name_31);
+                                matches = patternMatcher.getMatches(containers, name_34);
                                 if (!matches) {
                                     continue;
                                 }
                             }
                             var fileName = sourceFile.fileName;
                             var matchKind = bestMatchKind(matches);
-                            rawItems.push({ name: name_31, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration });
+                            rawItems.push({ name: name_34, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration });
                         }
                     }
                 }
@@ -40473,7 +43422,7 @@ var ts;
                     if (text !== undefined) {
                         containers.unshift(text);
                     }
-                    else if (declaration.name.kind === 137 /* ComputedPropertyName */) {
+                    else if (declaration.name.kind === 139 /* ComputedPropertyName */) {
                         return tryAddComputedPropertyName(declaration.name.expression, containers, /*includeLastPortion*/ true);
                     }
                     else {
@@ -40494,7 +43443,7 @@ var ts;
                     }
                     return true;
                 }
-                if (expression.kind === 169 /* PropertyAccessExpression */) {
+                if (expression.kind === 171 /* PropertyAccessExpression */) {
                     var propertyAccess = expression;
                     if (includeLastPortion) {
                         containers.unshift(propertyAccess.name.text);
@@ -40507,7 +43456,7 @@ var ts;
                 var containers = [];
                 // First, if we started with a computed property name, then add all but the last
                 // portion into the container array.
-                if (declaration.name.kind === 137 /* ComputedPropertyName */) {
+                if (declaration.name.kind === 139 /* ComputedPropertyName */) {
                     if (!tryAddComputedPropertyName(declaration.name.expression, containers, /*includeLastPortion*/ false)) {
                         return undefined;
                     }
@@ -40570,6 +43519,11 @@ var ts;
     var NavigationBar;
     (function (NavigationBar) {
         function getNavigationBarItems(sourceFile, compilerOptions) {
+            // TODO: Handle JS files differently in 'navbar' calls for now, but ideally we should unify
+            // the 'navbar' and 'navto' logic for TypeScript and JavaScript.
+            if (ts.isSourceFileJavaScript(sourceFile)) {
+                return getJsNavigationBarItems(sourceFile, compilerOptions);
+            }
             // If the source file has any child items, then it included in the tree
             // and takes lexical ownership of all other top-level items.
             var hasGlobalNode = false;
@@ -40581,17 +43535,17 @@ var ts;
                 var current = node.parent;
                 while (current) {
                     switch (current.kind) {
-                        case 221 /* ModuleDeclaration */:
+                        case 224 /* ModuleDeclaration */:
                             // If we have a module declared as A.B.C, it is more "intuitive"
                             // to say it only has a single layer of depth
                             do {
                                 current = current.parent;
-                            } while (current.kind === 221 /* ModuleDeclaration */);
+                            } while (current.kind === 224 /* ModuleDeclaration */);
                         // fall through
-                        case 217 /* ClassDeclaration */:
-                        case 220 /* EnumDeclaration */:
-                        case 218 /* InterfaceDeclaration */:
-                        case 216 /* FunctionDeclaration */:
+                        case 220 /* ClassDeclaration */:
+                        case 223 /* EnumDeclaration */:
+                        case 221 /* InterfaceDeclaration */:
+                        case 219 /* FunctionDeclaration */:
                             indent++;
                     }
                     current = current.parent;
@@ -40602,21 +43556,21 @@ var ts;
                 var childNodes = [];
                 function visit(node) {
                     switch (node.kind) {
-                        case 196 /* VariableStatement */:
+                        case 199 /* VariableStatement */:
                             ts.forEach(node.declarationList.declarations, visit);
                             break;
-                        case 164 /* ObjectBindingPattern */:
-                        case 165 /* ArrayBindingPattern */:
+                        case 166 /* ObjectBindingPattern */:
+                        case 167 /* ArrayBindingPattern */:
                             ts.forEach(node.elements, visit);
                             break;
-                        case 231 /* ExportDeclaration */:
+                        case 235 /* ExportDeclaration */:
                             // Handle named exports case e.g.:
                             //    export {a, b as B} from "mod";
                             if (node.exportClause) {
                                 ts.forEach(node.exportClause.elements, visit);
                             }
                             break;
-                        case 225 /* ImportDeclaration */:
+                        case 229 /* ImportDeclaration */:
                             var importClause = node.importClause;
                             if (importClause) {
                                 // Handle default import case e.g.:
@@ -40628,7 +43582,7 @@ var ts;
                                 //    import * as NS from "mod";
                                 //    import {a, b as B} from "mod";
                                 if (importClause.namedBindings) {
-                                    if (importClause.namedBindings.kind === 227 /* NamespaceImport */) {
+                                    if (importClause.namedBindings.kind === 231 /* NamespaceImport */) {
                                         childNodes.push(importClause.namedBindings);
                                     }
                                     else {
@@ -40637,21 +43591,21 @@ var ts;
                                 }
                             }
                             break;
-                        case 166 /* BindingElement */:
-                        case 214 /* VariableDeclaration */:
+                        case 168 /* BindingElement */:
+                        case 217 /* VariableDeclaration */:
                             if (ts.isBindingPattern(node.name)) {
                                 visit(node.name);
                                 break;
                             }
                         // Fall through
-                        case 217 /* ClassDeclaration */:
-                        case 220 /* EnumDeclaration */:
-                        case 218 /* InterfaceDeclaration */:
-                        case 221 /* ModuleDeclaration */:
-                        case 216 /* FunctionDeclaration */:
-                        case 224 /* ImportEqualsDeclaration */:
-                        case 229 /* ImportSpecifier */:
-                        case 233 /* ExportSpecifier */:
+                        case 220 /* ClassDeclaration */:
+                        case 223 /* EnumDeclaration */:
+                        case 221 /* InterfaceDeclaration */:
+                        case 224 /* ModuleDeclaration */:
+                        case 219 /* FunctionDeclaration */:
+                        case 228 /* ImportEqualsDeclaration */:
+                        case 233 /* ImportSpecifier */:
+                        case 237 /* ExportSpecifier */:
                             childNodes.push(node);
                             break;
                     }
@@ -40699,17 +43653,31 @@ var ts;
                 for (var _i = 0, nodes_4 = nodes; _i < nodes_4.length; _i++) {
                     var node = nodes_4[_i];
                     switch (node.kind) {
-                        case 217 /* ClassDeclaration */:
-                        case 220 /* EnumDeclaration */:
-                        case 218 /* InterfaceDeclaration */:
+                        case 220 /* ClassDeclaration */:
+                            topLevelNodes.push(node);
+                            for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
+                                var member = _b[_a];
+                                if (member.kind === 146 /* MethodDeclaration */ || member.kind === 147 /* Constructor */) {
+                                    if (member.body) {
+                                        // We do not include methods that does not have child functions in it, because of duplications.
+                                        if (hasNamedFunctionDeclarations(member.body.statements)) {
+                                            topLevelNodes.push(member);
+                                        }
+                                        addTopLevelNodes(member.body.statements, topLevelNodes);
+                                    }
+                                }
+                            }
+                            break;
+                        case 223 /* EnumDeclaration */:
+                        case 221 /* InterfaceDeclaration */:
                             topLevelNodes.push(node);
                             break;
-                        case 221 /* ModuleDeclaration */:
+                        case 224 /* ModuleDeclaration */:
                             var moduleDeclaration = node;
                             topLevelNodes.push(node);
                             addTopLevelNodes(getInnermostModule(moduleDeclaration).body.statements, topLevelNodes);
                             break;
-                        case 216 /* FunctionDeclaration */:
+                        case 219 /* FunctionDeclaration */:
                             var functionDeclaration = node;
                             if (isTopLevelFunctionDeclaration(functionDeclaration)) {
                                 topLevelNodes.push(node);
@@ -40719,20 +43687,36 @@ var ts;
                     }
                 }
             }
+            function hasNamedFunctionDeclarations(nodes) {
+                for (var _i = 0, nodes_5 = nodes; _i < nodes_5.length; _i++) {
+                    var s = nodes_5[_i];
+                    if (s.kind === 219 /* FunctionDeclaration */ && !isEmpty(s.name.text)) {
+                        return true;
+                    }
+                }
+                return false;
+            }
             function isTopLevelFunctionDeclaration(functionDeclaration) {
-                if (functionDeclaration.kind === 216 /* FunctionDeclaration */) {
-                    // A function declaration is 'top level' if it contains any function declarations 
-                    // within it. 
-                    if (functionDeclaration.body && functionDeclaration.body.kind === 195 /* Block */) {
+                if (functionDeclaration.kind === 219 /* FunctionDeclaration */) {
+                    // A function declaration is 'top level' if it contains any function declarations
+                    // within it.
+                    if (functionDeclaration.body && functionDeclaration.body.kind === 198 /* Block */) {
                         // Proper function declarations can only have identifier names
-                        if (ts.forEach(functionDeclaration.body.statements, function (s) { return s.kind === 216 /* FunctionDeclaration */ && !isEmpty(s.name.text); })) {
+                        if (hasNamedFunctionDeclarations(functionDeclaration.body.statements)) {
                             return true;
                         }
-                        // Or if it is not parented by another function.  i.e all functions
-                        // at module scope are 'top level'.
+                        // Or if it is not parented by another function. I.e all functions at module scope are 'top level'.
                         if (!ts.isFunctionBlock(functionDeclaration.parent)) {
                             return true;
                         }
+                        else {
+                            // We have made sure that a grand parent node exists with 'isFunctionBlock()' above.
+                            var grandParentKind = functionDeclaration.parent.parent.kind;
+                            if (grandParentKind === 146 /* MethodDeclaration */ ||
+                                grandParentKind === 147 /* Constructor */) {
+                                return true;
+                            }
+                        }
                     }
                 }
                 return false;
@@ -40740,8 +43724,8 @@ var ts;
             function getItemsWorker(nodes, createItem) {
                 var items = [];
                 var keyToItem = {};
-                for (var _i = 0, nodes_5 = nodes; _i < nodes_5.length; _i++) {
-                    var child = nodes_5[_i];
+                for (var _i = 0, nodes_6 = nodes; _i < nodes_6.length; _i++) {
+                    var child = nodes_6[_i];
                     var item = createItem(child);
                     if (item !== undefined) {
                         if (item.text.length > 0) {
@@ -40785,44 +43769,44 @@ var ts;
             }
             function createChildItem(node) {
                 switch (node.kind) {
-                    case 139 /* Parameter */:
+                    case 141 /* Parameter */:
                         if (ts.isBindingPattern(node.name)) {
                             break;
                         }
-                        if ((node.flags & 1022 /* Modifier */) === 0) {
+                        if ((node.flags & 959 /* Modifier */) === 0) {
                             return undefined;
                         }
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberVariableElement);
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberFunctionElement);
-                    case 146 /* GetAccessor */:
+                    case 148 /* GetAccessor */:
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberGetAccessorElement);
-                    case 147 /* SetAccessor */:
+                    case 149 /* SetAccessor */:
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberSetAccessorElement);
-                    case 150 /* IndexSignature */:
+                    case 152 /* IndexSignature */:
                         return createItem(node, "[]", ts.ScriptElementKind.indexSignatureElement);
-                    case 250 /* EnumMember */:
+                    case 254 /* EnumMember */:
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberVariableElement);
-                    case 148 /* CallSignature */:
+                    case 150 /* CallSignature */:
                         return createItem(node, "()", ts.ScriptElementKind.callSignatureElement);
-                    case 149 /* ConstructSignature */:
+                    case 151 /* ConstructSignature */:
                         return createItem(node, "new()", ts.ScriptElementKind.constructSignatureElement);
-                    case 142 /* PropertyDeclaration */:
-                    case 141 /* PropertySignature */:
+                    case 144 /* PropertyDeclaration */:
+                    case 143 /* PropertySignature */:
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberVariableElement);
-                    case 216 /* FunctionDeclaration */:
+                    case 219 /* FunctionDeclaration */:
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.functionElement);
-                    case 214 /* VariableDeclaration */:
-                    case 166 /* BindingElement */:
-                        var variableDeclarationNode;
-                        var name_32;
-                        if (node.kind === 166 /* BindingElement */) {
-                            name_32 = node.name;
+                    case 217 /* VariableDeclaration */:
+                    case 168 /* BindingElement */:
+                        var variableDeclarationNode = void 0;
+                        var name_35;
+                        if (node.kind === 168 /* BindingElement */) {
+                            name_35 = node.name;
                             variableDeclarationNode = node;
                             // binding elements are added only for variable declarations
                             // bubble up to the containing variable declaration
-                            while (variableDeclarationNode && variableDeclarationNode.kind !== 214 /* VariableDeclaration */) {
+                            while (variableDeclarationNode && variableDeclarationNode.kind !== 217 /* VariableDeclaration */) {
                                 variableDeclarationNode = variableDeclarationNode.parent;
                             }
                             ts.Debug.assert(variableDeclarationNode !== undefined);
@@ -40830,24 +43814,24 @@ var ts;
                         else {
                             ts.Debug.assert(!ts.isBindingPattern(node.name));
                             variableDeclarationNode = node;
-                            name_32 = node.name;
+                            name_35 = node.name;
                         }
                         if (ts.isConst(variableDeclarationNode)) {
-                            return createItem(node, getTextOfNode(name_32), ts.ScriptElementKind.constElement);
+                            return createItem(node, getTextOfNode(name_35), ts.ScriptElementKind.constElement);
                         }
                         else if (ts.isLet(variableDeclarationNode)) {
-                            return createItem(node, getTextOfNode(name_32), ts.ScriptElementKind.letElement);
+                            return createItem(node, getTextOfNode(name_35), ts.ScriptElementKind.letElement);
                         }
                         else {
-                            return createItem(node, getTextOfNode(name_32), ts.ScriptElementKind.variableElement);
+                            return createItem(node, getTextOfNode(name_35), ts.ScriptElementKind.variableElement);
                         }
-                    case 145 /* Constructor */:
+                    case 147 /* Constructor */:
                         return createItem(node, "constructor", ts.ScriptElementKind.constructorImplementationElement);
-                    case 233 /* ExportSpecifier */:
-                    case 229 /* ImportSpecifier */:
-                    case 224 /* ImportEqualsDeclaration */:
-                    case 226 /* ImportClause */:
-                    case 227 /* NamespaceImport */:
+                    case 237 /* ExportSpecifier */:
+                    case 233 /* ImportSpecifier */:
+                    case 228 /* ImportEqualsDeclaration */:
+                    case 230 /* ImportClause */:
+                    case 231 /* NamespaceImport */:
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.alias);
                 }
                 return undefined;
@@ -40877,17 +43861,20 @@ var ts;
             }
             function createTopLevelItem(node) {
                 switch (node.kind) {
-                    case 251 /* SourceFile */:
+                    case 255 /* SourceFile */:
                         return createSourceFileItem(node);
-                    case 217 /* ClassDeclaration */:
+                    case 220 /* ClassDeclaration */:
                         return createClassItem(node);
-                    case 220 /* EnumDeclaration */:
+                    case 146 /* MethodDeclaration */:
+                    case 147 /* Constructor */:
+                        return createMemberFunctionLikeItem(node);
+                    case 223 /* EnumDeclaration */:
                         return createEnumItem(node);
-                    case 218 /* InterfaceDeclaration */:
-                        return createIterfaceItem(node);
-                    case 221 /* ModuleDeclaration */:
+                    case 221 /* InterfaceDeclaration */:
+                        return createInterfaceItem(node);
+                    case 224 /* ModuleDeclaration */:
                         return createModuleItem(node);
-                    case 216 /* FunctionDeclaration */:
+                    case 219 /* FunctionDeclaration */:
                         return createFunctionItem(node);
                 }
                 return undefined;
@@ -40899,7 +43886,7 @@ var ts;
                     // Otherwise, we need to aggregate each identifier to build up the qualified name.
                     var result = [];
                     result.push(moduleDeclaration.name.text);
-                    while (moduleDeclaration.body && moduleDeclaration.body.kind === 221 /* ModuleDeclaration */) {
+                    while (moduleDeclaration.body && moduleDeclaration.body.kind === 224 /* ModuleDeclaration */) {
                         moduleDeclaration = moduleDeclaration.body;
                         result.push(moduleDeclaration.name.text);
                     }
@@ -40911,12 +43898,29 @@ var ts;
                     return getNavigationBarItem(moduleName, ts.ScriptElementKind.moduleElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
                 }
                 function createFunctionItem(node) {
-                    if (node.body && node.body.kind === 195 /* Block */) {
+                    if (node.body && node.body.kind === 198 /* Block */) {
                         var childItems = getItemsWorker(sortNodes(node.body.statements), createChildItem);
                         return getNavigationBarItem(!node.name ? "default" : node.name.text, ts.ScriptElementKind.functionElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
                     }
                     return undefined;
                 }
+                function createMemberFunctionLikeItem(node) {
+                    if (node.body && node.body.kind === 198 /* Block */) {
+                        var childItems = getItemsWorker(sortNodes(node.body.statements), createChildItem);
+                        var scriptElementKind = void 0;
+                        var memberFunctionName = void 0;
+                        if (node.kind === 146 /* MethodDeclaration */) {
+                            memberFunctionName = ts.getPropertyNameForPropertyNameNode(node.name);
+                            scriptElementKind = ts.ScriptElementKind.memberFunctionElement;
+                        }
+                        else {
+                            memberFunctionName = "constructor";
+                            scriptElementKind = ts.ScriptElementKind.constructorImplementationElement;
+                        }
+                        return getNavigationBarItem(memberFunctionName, scriptElementKind, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
+                    }
+                    return undefined;
+                }
                 function createSourceFileItem(node) {
                     var childItems = getItemsWorker(getChildNodes(node.statements), createChildItem);
                     if (childItems === undefined || childItems.length === 0) {
@@ -40932,7 +43936,7 @@ var ts;
                     var childItems;
                     if (node.members) {
                         var constructor = ts.forEach(node.members, function (member) {
-                            return member.kind === 145 /* Constructor */ && member;
+                            return member.kind === 147 /* Constructor */ && member;
                         });
                         // Add the constructor parameters in as children of the class (for property parameters).
                         // Note that *all non-binding pattern named* parameters will be added to the nodes array, but parameters that
@@ -40950,13 +43954,13 @@ var ts;
                     var childItems = getItemsWorker(sortNodes(removeComputedProperties(node)), createChildItem);
                     return getNavigationBarItem(node.name.text, ts.ScriptElementKind.enumElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
                 }
-                function createIterfaceItem(node) {
+                function createInterfaceItem(node) {
                     var childItems = getItemsWorker(sortNodes(removeDynamicallyNamedProperties(node)), createChildItem);
                     return getNavigationBarItem(node.name.text, ts.ScriptElementKind.interfaceElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
                 }
             }
             function removeComputedProperties(node) {
-                return ts.filter(node.members, function (member) { return member.name === undefined || member.name.kind !== 137 /* ComputedPropertyName */; });
+                return ts.filter(node.members, function (member) { return member.name === undefined || member.name.kind !== 139 /* ComputedPropertyName */; });
             }
             /**
              * Like removeComputedProperties, but retains the properties with well known symbol names
@@ -40965,13 +43969,13 @@ var ts;
                 return ts.filter(node.members, function (member) { return !ts.hasDynamicName(member); });
             }
             function getInnermostModule(node) {
-                while (node.body.kind === 221 /* ModuleDeclaration */) {
+                while (node.body.kind === 224 /* ModuleDeclaration */) {
                     node = node.body;
                 }
                 return node;
             }
             function getNodeSpan(node) {
-                return node.kind === 251 /* SourceFile */
+                return node.kind === 255 /* SourceFile */
                     ? ts.createTextSpanFromBounds(node.getFullStart(), node.getEnd())
                     : ts.createTextSpanFromBounds(node.getStart(), node.getEnd());
             }
@@ -40980,6 +43984,188 @@ var ts;
             }
         }
         NavigationBar.getNavigationBarItems = getNavigationBarItems;
+        function getJsNavigationBarItems(sourceFile, compilerOptions) {
+            var anonFnText = "<function>";
+            var anonClassText = "<class>";
+            var indent = 0;
+            var rootName = ts.isExternalModule(sourceFile) ?
+                "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(sourceFile.fileName)))) + "\""
+                : "<global>";
+            var sourceFileItem = getNavBarItem(rootName, ts.ScriptElementKind.moduleElement, [getNodeSpan(sourceFile)]);
+            var topItem = sourceFileItem;
+            // Walk the whole file, because we want to also find function expressions - which may be in variable initializer,
+            // call arguments, expressions, etc...
+            ts.forEachChild(sourceFile, visitNode);
+            function visitNode(node) {
+                var newItem = createNavBarItem(node);
+                if (newItem) {
+                    topItem.childItems.push(newItem);
+                }
+                // Add a level if traversing into a container
+                if (newItem && (ts.isFunctionLike(node) || ts.isClassLike(node))) {
+                    var lastTop = topItem;
+                    indent++;
+                    topItem = newItem;
+                    ts.forEachChild(node, visitNode);
+                    topItem = lastTop;
+                    indent--;
+                    // If the last item added was an anonymous function expression, and it had no children, discard it.
+                    if (newItem && newItem.text === anonFnText && newItem.childItems.length === 0) {
+                        topItem.childItems.pop();
+                    }
+                }
+                else {
+                    ts.forEachChild(node, visitNode);
+                }
+            }
+            function createNavBarItem(node) {
+                switch (node.kind) {
+                    case 217 /* VariableDeclaration */:
+                        // Only add to the navbar if at the top-level of the file
+                        // Note: "const" and "let" are also SyntaxKind.VariableDeclarations
+                        if (node.parent /*VariableDeclarationList*/.parent /*VariableStatement*/
+                            .parent /*SourceFile*/.kind !== 255 /* SourceFile */) {
+                            return undefined;
+                        }
+                        // If it is initialized with a function expression, handle it when we reach the function expression node
+                        var varDecl = node;
+                        if (varDecl.initializer && (varDecl.initializer.kind === 178 /* FunctionExpression */ ||
+                            varDecl.initializer.kind === 179 /* ArrowFunction */ ||
+                            varDecl.initializer.kind === 191 /* ClassExpression */)) {
+                            return undefined;
+                        }
+                    // Fall through
+                    case 219 /* FunctionDeclaration */:
+                    case 220 /* ClassDeclaration */:
+                    case 147 /* Constructor */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
+                        // "export default function().." looks just like a regular function/class declaration, except with the 'default' flag
+                        var name_36 = node.flags && (node.flags & 512 /* Default */) && !node.name ? "default" :
+                            node.kind === 147 /* Constructor */ ? "constructor" :
+                                ts.declarationNameToString(node.name);
+                        return getNavBarItem(name_36, getScriptKindForElementKind(node.kind), [getNodeSpan(node)]);
+                    case 178 /* FunctionExpression */:
+                    case 179 /* ArrowFunction */:
+                    case 191 /* ClassExpression */:
+                        return getDefineModuleItem(node) || getFunctionOrClassExpressionItem(node);
+                    case 146 /* MethodDeclaration */:
+                        var methodDecl = node;
+                        return getNavBarItem(ts.declarationNameToString(methodDecl.name), ts.ScriptElementKind.memberFunctionElement, [getNodeSpan(node)]);
+                    case 234 /* ExportAssignment */:
+                        // e.g. "export default <expr>"
+                        return getNavBarItem("default", ts.ScriptElementKind.variableElement, [getNodeSpan(node)]);
+                    case 230 /* ImportClause */:
+                        if (!node.name) {
+                            // No default import (this node is still a parent of named & namespace imports, which are handled below)
+                            return undefined;
+                        }
+                    // fall through
+                    case 233 /* ImportSpecifier */: // e.g. 'id' in: import {id} from 'mod' (in NamedImports, in ImportClause)
+                    case 231 /* NamespaceImport */: // e.g. '* as ns' in: import * as ns from 'mod' (in ImportClause)
+                    case 237 /* ExportSpecifier */:
+                        // Export specifiers are only interesting if they are reexports from another module, or renamed, else they are already globals
+                        if (node.kind === 237 /* ExportSpecifier */) {
+                            if (!node.parent.parent.moduleSpecifier && !node.propertyName) {
+                                return undefined;
+                            }
+                        }
+                        var decl = node;
+                        if (!decl.name) {
+                            return undefined;
+                        }
+                        var declName = ts.declarationNameToString(decl.name);
+                        return getNavBarItem(declName, ts.ScriptElementKind.constElement, [getNodeSpan(node)]);
+                    default:
+                        return undefined;
+                }
+            }
+            function getNavBarItem(text, kind, spans, kindModifiers) {
+                if (kindModifiers === void 0) { kindModifiers = ts.ScriptElementKindModifier.none; }
+                return {
+                    text: text, kind: kind, kindModifiers: kindModifiers, spans: spans, childItems: [], indent: indent, bolded: false, grayed: false
+                };
+            }
+            function getDefineModuleItem(node) {
+                if (node.kind !== 178 /* FunctionExpression */ && node.kind !== 179 /* ArrowFunction */) {
+                    return undefined;
+                }
+                // No match if this is not a call expression to an identifier named 'define'
+                if (node.parent.kind !== 173 /* CallExpression */) {
+                    return undefined;
+                }
+                var callExpr = node.parent;
+                if (callExpr.expression.kind !== 69 /* Identifier */ || callExpr.expression.getText() !== 'define') {
+                    return undefined;
+                }
+                // Return a module of either the given text in the first argument, or of the source file path
+                var defaultName = node.getSourceFile().fileName;
+                if (callExpr.arguments[0].kind === 9 /* StringLiteral */) {
+                    defaultName = (callExpr.arguments[0]).text;
+                }
+                return getNavBarItem(defaultName, ts.ScriptElementKind.moduleElement, [getNodeSpan(node.parent)]);
+            }
+            function getFunctionOrClassExpressionItem(node) {
+                if (node.kind !== 178 /* FunctionExpression */ &&
+                    node.kind !== 179 /* ArrowFunction */ &&
+                    node.kind !== 191 /* ClassExpression */) {
+                    return undefined;
+                }
+                var fnExpr = node;
+                var fnName;
+                if (fnExpr.name && ts.getFullWidth(fnExpr.name) > 0) {
+                    // The expression has an identifier, so use that as the name
+                    fnName = ts.declarationNameToString(fnExpr.name);
+                }
+                else {
+                    // See if it is a var initializer. If so, use the var name.
+                    if (fnExpr.parent.kind === 217 /* VariableDeclaration */) {
+                        fnName = ts.declarationNameToString(fnExpr.parent.name);
+                    }
+                    else if (fnExpr.parent.kind === 186 /* BinaryExpression */ &&
+                        fnExpr.parent.operatorToken.kind === 56 /* EqualsToken */) {
+                        fnName = fnExpr.parent.left.getText();
+                        if (fnName.length > 20) {
+                            fnName = fnName.substring(0, 17) + "...";
+                        }
+                    }
+                    else if (fnExpr.parent.kind === 252 /* PropertyAssignment */ &&
+                        fnExpr.parent.name) {
+                        fnName = fnExpr.parent.name.getText();
+                    }
+                    else {
+                        fnName = node.kind === 191 /* ClassExpression */ ? anonClassText : anonFnText;
+                    }
+                }
+                var scriptKind = node.kind === 191 /* ClassExpression */ ? ts.ScriptElementKind.classElement : ts.ScriptElementKind.functionElement;
+                return getNavBarItem(fnName, scriptKind, [getNodeSpan(node)]);
+            }
+            function getNodeSpan(node) {
+                return node.kind === 255 /* SourceFile */
+                    ? ts.createTextSpanFromBounds(node.getFullStart(), node.getEnd())
+                    : ts.createTextSpanFromBounds(node.getStart(), node.getEnd());
+            }
+            function getScriptKindForElementKind(kind) {
+                switch (kind) {
+                    case 217 /* VariableDeclaration */:
+                        return ts.ScriptElementKind.variableElement;
+                    case 219 /* FunctionDeclaration */:
+                        return ts.ScriptElementKind.functionElement;
+                    case 220 /* ClassDeclaration */:
+                        return ts.ScriptElementKind.classElement;
+                    case 147 /* Constructor */:
+                        return ts.ScriptElementKind.constructorImplementationElement;
+                    case 148 /* GetAccessor */:
+                        return ts.ScriptElementKind.memberGetAccessorElement;
+                    case 149 /* SetAccessor */:
+                        return ts.ScriptElementKind.memberSetAccessorElement;
+                    default:
+                        return "unknown";
+                }
+            }
+            return sourceFileItem.childItems;
+        }
+        NavigationBar.getJsNavigationBarItems = getJsNavigationBarItems;
     })(NavigationBar = ts.NavigationBar || (ts.NavigationBar = {}));
 })(ts || (ts = {}));
 /* @internal */
@@ -41596,7 +44782,7 @@ var ts;
         //                break;
         //            case TypeScript.SyntaxKind.GreaterThanGreaterThanGreaterThanToken:
         //                stack++;
-        //            // Intentaion fall through
+        //            // Intentional fall through
         //            case TypeScript.SyntaxKind.GreaterThanToken:
         //                stack++;
         //                break;
@@ -41616,7 +44802,7 @@ var ts;
         //                }
         //                break;
         //            case TypeScript.SyntaxKind.EqualsGreaterThanToken:
-        //                // This can be a function type or a constructor type. In either case, we want to skip the function defintion
+        //                // This can be a function type or a constructor type. In either case, we want to skip the function definition
         //                token = previousToken(token, /*includeSkippedTokens*/ true);
         //                if (token && token.kind() === TypeScript.SyntaxKind.CloseParenToken) {
         //                    // Skip untill the matching open paren token
@@ -41635,7 +44821,7 @@ var ts;
         //                    }
         //                }
         //                else {
-        //                    // This is not a funtion type. exit the main loop
+        //                    // This is not a function type. exit the main loop
         //                    break whileLoop;
         //                }
         //                break;
@@ -41722,7 +44908,7 @@ var ts;
             }
             return createSignatureHelpItems(candidates, resolvedSignature, argumentInfo);
             function createJavaScriptSignatureHelpItems(argumentInfo) {
-                if (argumentInfo.invocation.kind !== 171 /* CallExpression */) {
+                if (argumentInfo.invocation.kind !== 173 /* CallExpression */) {
                     return undefined;
                 }
                 // See if we can find some symbol with the call expression name that has call signatures.
@@ -41730,7 +44916,7 @@ var ts;
                 var expression = callExpression.expression;
                 var name = expression.kind === 69 /* Identifier */
                     ? expression
-                    : expression.kind === 169 /* PropertyAccessExpression */
+                    : expression.kind === 171 /* PropertyAccessExpression */
                         ? expression.name
                         : undefined;
                 if (!name || !name.text) {
@@ -41742,8 +44928,8 @@ var ts;
                     var nameToDeclarations = sourceFile_1.getNamedDeclarations();
                     var declarations = ts.getProperty(nameToDeclarations, name.text);
                     if (declarations) {
-                        for (var _b = 0, declarations_7 = declarations; _b < declarations_7.length; _b++) {
-                            var declaration = declarations_7[_b];
+                        for (var _b = 0, declarations_8 = declarations; _b < declarations_8.length; _b++) {
+                            var declaration = declarations_8[_b];
                             var symbol = declaration.symbol;
                             if (symbol) {
                                 var type = typeChecker.getTypeOfSymbolAtLocation(symbol, declaration);
@@ -41763,7 +44949,7 @@ var ts;
              * in the argument of an invocation; returns undefined otherwise.
              */
             function getImmediatelyContainingArgumentInfo(node) {
-                if (node.parent.kind === 171 /* CallExpression */ || node.parent.kind === 172 /* NewExpression */) {
+                if (node.parent.kind === 173 /* CallExpression */ || node.parent.kind === 174 /* NewExpression */) {
                     var callExpression = node.parent;
                     // There are 3 cases to handle:
                     //   1. The token introduces a list, and should begin a sig help session
@@ -41816,25 +45002,25 @@ var ts;
                         };
                     }
                 }
-                else if (node.kind === 11 /* NoSubstitutionTemplateLiteral */ && node.parent.kind === 173 /* TaggedTemplateExpression */) {
+                else if (node.kind === 11 /* NoSubstitutionTemplateLiteral */ && node.parent.kind === 175 /* TaggedTemplateExpression */) {
                     // Check if we're actually inside the template;
                     // otherwise we'll fall out and return undefined.
                     if (ts.isInsideTemplateLiteral(node, position)) {
                         return getArgumentListInfoForTemplate(node.parent, /*argumentIndex*/ 0);
                     }
                 }
-                else if (node.kind === 12 /* TemplateHead */ && node.parent.parent.kind === 173 /* TaggedTemplateExpression */) {
+                else if (node.kind === 12 /* TemplateHead */ && node.parent.parent.kind === 175 /* TaggedTemplateExpression */) {
                     var templateExpression = node.parent;
                     var tagExpression = templateExpression.parent;
-                    ts.Debug.assert(templateExpression.kind === 186 /* TemplateExpression */);
+                    ts.Debug.assert(templateExpression.kind === 188 /* TemplateExpression */);
                     var argumentIndex = ts.isInsideTemplateLiteral(node, position) ? 0 : 1;
                     return getArgumentListInfoForTemplate(tagExpression, argumentIndex);
                 }
-                else if (node.parent.kind === 193 /* TemplateSpan */ && node.parent.parent.parent.kind === 173 /* TaggedTemplateExpression */) {
+                else if (node.parent.kind === 196 /* TemplateSpan */ && node.parent.parent.parent.kind === 175 /* TaggedTemplateExpression */) {
                     var templateSpan = node.parent;
                     var templateExpression = templateSpan.parent;
                     var tagExpression = templateExpression.parent;
-                    ts.Debug.assert(templateExpression.kind === 186 /* TemplateExpression */);
+                    ts.Debug.assert(templateExpression.kind === 188 /* TemplateExpression */);
                     // If we're just after a template tail, don't show signature help.
                     if (node.kind === 14 /* TemplateTail */ && !ts.isInsideTemplateLiteral(node, position)) {
                         return undefined;
@@ -41952,7 +45138,7 @@ var ts;
                 //
                 // This is because a Missing node has no width. However, what we actually want is to include trivia
                 // leading up to the next token in case the user is about to type in a TemplateMiddle or TemplateTail.
-                if (template.kind === 186 /* TemplateExpression */) {
+                if (template.kind === 188 /* TemplateExpression */) {
                     var lastSpan = ts.lastOrUndefined(template.templateSpans);
                     if (lastSpan.literal.getFullWidth() === 0) {
                         applicableSpanEnd = ts.skipTrivia(sourceFile.text, applicableSpanEnd, /*stopAfterLineBreak*/ false);
@@ -41961,7 +45147,7 @@ var ts;
                 return ts.createTextSpan(applicableSpanStart, applicableSpanEnd - applicableSpanStart);
             }
             function getContainingArgumentInfo(node) {
-                for (var n = node; n.kind !== 251 /* SourceFile */; n = n.parent) {
+                for (var n = node; n.kind !== 255 /* SourceFile */; n = n.parent) {
                     if (ts.isFunctionBlock(n)) {
                         return undefined;
                     }
@@ -42026,7 +45212,7 @@ var ts;
                         signatureHelpParameters = typeParameters && typeParameters.length > 0 ? ts.map(typeParameters, createSignatureHelpParameterForTypeParameter) : emptyArray;
                         suffixDisplayParts.push(ts.punctuationPart(27 /* GreaterThanToken */));
                         var parameterParts = ts.mapToDisplayParts(function (writer) {
-                            return typeChecker.getSymbolDisplayBuilder().buildDisplayForParametersAndDelimiters(candidateSignature.parameters, writer, invocation);
+                            return typeChecker.getSymbolDisplayBuilder().buildDisplayForParametersAndDelimiters(candidateSignature.thisType, candidateSignature.parameters, writer, invocation);
                         });
                         ts.addRange(suffixDisplayParts, parameterParts);
                     }
@@ -42099,31 +45285,6 @@ var ts;
 /* @internal */
 var ts;
 (function (ts) {
-    function getEndLinePosition(line, sourceFile) {
-        ts.Debug.assert(line >= 0);
-        var lineStarts = sourceFile.getLineStarts();
-        var lineIndex = line;
-        if (lineIndex + 1 === lineStarts.length) {
-            // last line - return EOF
-            return sourceFile.text.length - 1;
-        }
-        else {
-            // current line start
-            var start = lineStarts[lineIndex];
-            // take the start position of the next line -1 = it should be some line break
-            var pos = lineStarts[lineIndex + 1] - 1;
-            ts.Debug.assert(ts.isLineBreak(sourceFile.text.charCodeAt(pos)));
-            // walk backwards skipping line breaks, stop the the beginning of current line.
-            // i.e:
-            // <some text>
-            // $ <- end of line for this position should match the start position
-            while (start <= pos && ts.isLineBreak(sourceFile.text.charCodeAt(pos))) {
-                pos--;
-            }
-            return pos;
-        }
-    }
-    ts.getEndLinePosition = getEndLinePosition;
     function getLineStartPositionForPosition(position, sourceFile) {
         var lineStarts = sourceFile.getLineStarts();
         var line = sourceFile.getLineAndCharacterOfPosition(position).line;
@@ -42161,40 +45322,40 @@ var ts;
             return false;
         }
         switch (n.kind) {
-            case 217 /* ClassDeclaration */:
-            case 218 /* InterfaceDeclaration */:
-            case 220 /* EnumDeclaration */:
-            case 168 /* ObjectLiteralExpression */:
-            case 164 /* ObjectBindingPattern */:
-            case 156 /* TypeLiteral */:
-            case 195 /* Block */:
-            case 222 /* ModuleBlock */:
-            case 223 /* CaseBlock */:
+            case 220 /* ClassDeclaration */:
+            case 221 /* InterfaceDeclaration */:
+            case 223 /* EnumDeclaration */:
+            case 170 /* ObjectLiteralExpression */:
+            case 166 /* ObjectBindingPattern */:
+            case 158 /* TypeLiteral */:
+            case 198 /* Block */:
+            case 225 /* ModuleBlock */:
+            case 226 /* CaseBlock */:
                 return nodeEndsWith(n, 16 /* CloseBraceToken */, sourceFile);
-            case 247 /* CatchClause */:
+            case 251 /* CatchClause */:
                 return isCompletedNode(n.block, sourceFile);
-            case 172 /* NewExpression */:
+            case 174 /* NewExpression */:
                 if (!n.arguments) {
                     return true;
                 }
             // fall through
-            case 171 /* CallExpression */:
-            case 175 /* ParenthesizedExpression */:
-            case 161 /* ParenthesizedType */:
+            case 173 /* CallExpression */:
+            case 177 /* ParenthesizedExpression */:
+            case 163 /* ParenthesizedType */:
                 return nodeEndsWith(n, 18 /* CloseParenToken */, sourceFile);
-            case 153 /* FunctionType */:
-            case 154 /* ConstructorType */:
+            case 155 /* FunctionType */:
+            case 156 /* ConstructorType */:
                 return isCompletedNode(n.type, sourceFile);
-            case 145 /* Constructor */:
-            case 146 /* GetAccessor */:
-            case 147 /* SetAccessor */:
-            case 216 /* FunctionDeclaration */:
-            case 176 /* FunctionExpression */:
-            case 144 /* MethodDeclaration */:
-            case 143 /* MethodSignature */:
-            case 149 /* ConstructSignature */:
-            case 148 /* CallSignature */:
-            case 177 /* ArrowFunction */:
+            case 147 /* Constructor */:
+            case 148 /* GetAccessor */:
+            case 149 /* SetAccessor */:
+            case 219 /* FunctionDeclaration */:
+            case 178 /* FunctionExpression */:
+            case 146 /* MethodDeclaration */:
+            case 145 /* MethodSignature */:
+            case 151 /* ConstructSignature */:
+            case 150 /* CallSignature */:
+            case 179 /* ArrowFunction */:
                 if (n.body) {
                     return isCompletedNode(n.body, sourceFile);
                 }
@@ -42204,64 +45365,64 @@ var ts;
                 // Even though type parameters can be unclosed, we can get away with
                 // having at least a closing paren.
                 return hasChildOfKind(n, 18 /* CloseParenToken */, sourceFile);
-            case 221 /* ModuleDeclaration */:
+            case 224 /* ModuleDeclaration */:
                 return n.body && isCompletedNode(n.body, sourceFile);
-            case 199 /* IfStatement */:
+            case 202 /* IfStatement */:
                 if (n.elseStatement) {
                     return isCompletedNode(n.elseStatement, sourceFile);
                 }
                 return isCompletedNode(n.thenStatement, sourceFile);
-            case 198 /* ExpressionStatement */:
+            case 201 /* ExpressionStatement */:
                 return isCompletedNode(n.expression, sourceFile) ||
                     hasChildOfKind(n, 23 /* SemicolonToken */);
-            case 167 /* ArrayLiteralExpression */:
-            case 165 /* ArrayBindingPattern */:
-            case 170 /* ElementAccessExpression */:
-            case 137 /* ComputedPropertyName */:
-            case 158 /* TupleType */:
+            case 169 /* ArrayLiteralExpression */:
+            case 167 /* ArrayBindingPattern */:
+            case 172 /* ElementAccessExpression */:
+            case 139 /* ComputedPropertyName */:
+            case 160 /* TupleType */:
                 return nodeEndsWith(n, 20 /* CloseBracketToken */, sourceFile);
-            case 150 /* IndexSignature */:
+            case 152 /* IndexSignature */:
                 if (n.type) {
                     return isCompletedNode(n.type, sourceFile);
                 }
                 return hasChildOfKind(n, 20 /* CloseBracketToken */, sourceFile);
-            case 244 /* CaseClause */:
-            case 245 /* DefaultClause */:
-                // there is no such thing as terminator token for CaseClause/DefaultClause so for simplicitly always consider them non-completed
+            case 248 /* CaseClause */:
+            case 249 /* DefaultClause */:
+                // there is no such thing as terminator token for CaseClause/DefaultClause so for simplicity always consider them non-completed
                 return false;
-            case 202 /* ForStatement */:
-            case 203 /* ForInStatement */:
-            case 204 /* ForOfStatement */:
-            case 201 /* WhileStatement */:
+            case 205 /* ForStatement */:
+            case 206 /* ForInStatement */:
+            case 207 /* ForOfStatement */:
+            case 204 /* WhileStatement */:
                 return isCompletedNode(n.statement, sourceFile);
-            case 200 /* DoStatement */:
+            case 203 /* DoStatement */:
                 // rough approximation: if DoStatement has While keyword - then if node is completed is checking the presence of ')';
                 var hasWhileKeyword = findChildOfKind(n, 104 /* WhileKeyword */, sourceFile);
                 if (hasWhileKeyword) {
                     return nodeEndsWith(n, 18 /* CloseParenToken */, sourceFile);
                 }
                 return isCompletedNode(n.statement, sourceFile);
-            case 155 /* TypeQuery */:
+            case 157 /* TypeQuery */:
                 return isCompletedNode(n.exprName, sourceFile);
-            case 179 /* TypeOfExpression */:
-            case 178 /* DeleteExpression */:
-            case 180 /* VoidExpression */:
-            case 187 /* YieldExpression */:
-            case 188 /* SpreadElementExpression */:
+            case 181 /* TypeOfExpression */:
+            case 180 /* DeleteExpression */:
+            case 182 /* VoidExpression */:
+            case 189 /* YieldExpression */:
+            case 190 /* SpreadElementExpression */:
                 var unaryWordExpression = n;
                 return isCompletedNode(unaryWordExpression.expression, sourceFile);
-            case 173 /* TaggedTemplateExpression */:
+            case 175 /* TaggedTemplateExpression */:
                 return isCompletedNode(n.template, sourceFile);
-            case 186 /* TemplateExpression */:
+            case 188 /* TemplateExpression */:
                 var lastSpan = ts.lastOrUndefined(n.templateSpans);
                 return isCompletedNode(lastSpan, sourceFile);
-            case 193 /* TemplateSpan */:
+            case 196 /* TemplateSpan */:
                 return ts.nodeIsPresent(n.literal);
-            case 182 /* PrefixUnaryExpression */:
+            case 184 /* PrefixUnaryExpression */:
                 return isCompletedNode(n.operand, sourceFile);
-            case 184 /* BinaryExpression */:
+            case 186 /* BinaryExpression */:
                 return isCompletedNode(n.right, sourceFile);
-            case 185 /* ConditionalExpression */:
+            case 187 /* ConditionalExpression */:
                 return isCompletedNode(n.whenFalse, sourceFile);
             default:
                 return true;
@@ -42317,7 +45478,7 @@ var ts;
         // for the position of the relevant node (or comma).
         var syntaxList = ts.forEach(node.parent.getChildren(), function (c) {
             // find syntax list that covers the span of the node
-            if (c.kind === 274 /* SyntaxList */ && c.pos <= node.pos && c.end >= node.end) {
+            if (c.kind === 278 /* SyntaxList */ && c.pos <= node.pos && c.end >= node.end) {
                 return c;
             }
         });
@@ -42334,7 +45495,7 @@ var ts;
     }
     ts.getTouchingWord = getTouchingWord;
     /* Gets the token whose text has range [start, end) and position >= start
-     * and (position < end or (position === end && token is keyword or identifier or numeric\string litera))
+     * and (position < end or (position === end && token is keyword or identifier or numeric/string literal))
      */
     function getTouchingPropertyName(sourceFile, position) {
         return getTouchingToken(sourceFile, position, function (n) { return isPropertyName(n.kind); });
@@ -42423,7 +45584,7 @@ var ts;
     function findPrecedingToken(position, sourceFile, startNode) {
         return find(startNode || sourceFile);
         function findRightmostToken(n) {
-            if (isToken(n) || n.kind === 239 /* JsxText */) {
+            if (isToken(n) || n.kind === 243 /* JsxText */) {
                 return n;
             }
             var children = n.getChildren();
@@ -42431,7 +45592,7 @@ var ts;
             return candidate && findRightmostToken(candidate);
         }
         function find(n) {
-            if (isToken(n) || n.kind === 239 /* JsxText */) {
+            if (isToken(n) || n.kind === 243 /* JsxText */) {
                 return n;
             }
             var children = n.getChildren();
@@ -42445,10 +45606,10 @@ var ts;
                 // if no - position is in the node itself so we should recurse in it.
                 // NOTE: JsxText is a weird kind of node that can contain only whitespaces (since they are not counted as trivia).
                 // if this is the case - then we should assume that token in question is located in previous child.
-                if (position < child.end && (nodeHasTokens(child) || child.kind === 239 /* JsxText */)) {
+                if (position < child.end && (nodeHasTokens(child) || child.kind === 243 /* JsxText */)) {
                     var start = child.getStart(sourceFile);
                     var lookInPreviousChild = (start >= position) ||
-                        (child.kind === 239 /* JsxText */ && start === child.end); // whitespace only JsxText
+                        (child.kind === 243 /* JsxText */ && start === child.end); // whitespace only JsxText
                     if (lookInPreviousChild) {
                         // actual start of the node is past the position - previous token should be at the end of previous child
                         var candidate = findRightmostChildNodeWithTokens(children, /*exclusiveStartPosition*/ i);
@@ -42460,7 +45621,7 @@ var ts;
                     }
                 }
             }
-            ts.Debug.assert(startNode !== undefined || n.kind === 251 /* SourceFile */);
+            ts.Debug.assert(startNode !== undefined || n.kind === 255 /* SourceFile */);
             // Here we know that none of child token nodes embrace the position,
             // the only known case is when position is at the end of the file.
             // Try to find the rightmost token in the file without filtering.
@@ -42482,7 +45643,7 @@ var ts;
     ts.findPrecedingToken = findPrecedingToken;
     function isInString(sourceFile, position) {
         var token = getTokenAtPosition(sourceFile, position);
-        return token && (token.kind === 9 /* StringLiteral */ || token.kind === 163 /* StringLiteralType */) && position > token.getStart();
+        return token && (token.kind === 9 /* StringLiteral */ || token.kind === 165 /* StringLiteralType */) && position > token.getStart();
     }
     ts.isInString = isInString;
     function isInComment(sourceFile, position) {
@@ -42568,17 +45729,17 @@ var ts;
     function getNodeModifiers(node) {
         var flags = ts.getCombinedNodeFlags(node);
         var result = [];
-        if (flags & 16 /* Private */)
+        if (flags & 8 /* Private */)
             result.push(ts.ScriptElementKindModifier.privateMemberModifier);
-        if (flags & 32 /* Protected */)
+        if (flags & 16 /* Protected */)
             result.push(ts.ScriptElementKindModifier.protectedMemberModifier);
-        if (flags & 8 /* Public */)
+        if (flags & 4 /* Public */)
             result.push(ts.ScriptElementKindModifier.publicMemberModifier);
-        if (flags & 64 /* Static */)
+        if (flags & 32 /* Static */)
             result.push(ts.ScriptElementKindModifier.staticModifier);
         if (flags & 128 /* Abstract */)
             result.push(ts.ScriptElementKindModifier.abstractModifier);
-        if (flags & 2 /* Export */)
+        if (flags & 1 /* Export */)
             result.push(ts.ScriptElementKindModifier.exportedModifier);
         if (ts.isInAmbientContext(node))
             result.push(ts.ScriptElementKindModifier.ambientModifier);
@@ -42586,17 +45747,17 @@ var ts;
     }
     ts.getNodeModifiers = getNodeModifiers;
     function getTypeArgumentOrTypeParameterList(node) {
-        if (node.kind === 152 /* TypeReference */ || node.kind === 171 /* CallExpression */) {
+        if (node.kind === 154 /* TypeReference */ || node.kind === 173 /* CallExpression */) {
             return node.typeArguments;
         }
-        if (ts.isFunctionLike(node) || node.kind === 217 /* ClassDeclaration */ || node.kind === 218 /* InterfaceDeclaration */) {
+        if (ts.isFunctionLike(node) || node.kind === 220 /* ClassDeclaration */ || node.kind === 221 /* InterfaceDeclaration */) {
             return node.typeParameters;
         }
         return undefined;
     }
     ts.getTypeArgumentOrTypeParameterList = getTypeArgumentOrTypeParameterList;
     function isToken(n) {
-        return n.kind >= 0 /* FirstToken */ && n.kind <= 135 /* LastToken */;
+        return n.kind >= 0 /* FirstToken */ && n.kind <= 137 /* LastToken */;
     }
     ts.isToken = isToken;
     function isWord(kind) {
@@ -42612,7 +45773,7 @@ var ts;
     ts.isComment = isComment;
     function isStringOrRegularExpressionOrTemplateLiteral(kind) {
         if (kind === 9 /* StringLiteral */
-            || kind === 163 /* StringLiteralType */
+            || kind === 165 /* StringLiteralType */
             || kind === 10 /* RegularExpressionLiteral */
             || ts.isTemplateLiteralKind(kind)) {
             return true;
@@ -42656,18 +45817,18 @@ var ts;
     }
     ts.compareDataObjects = compareDataObjects;
     function isArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-        if (node.kind === 167 /* ArrayLiteralExpression */ ||
-            node.kind === 168 /* ObjectLiteralExpression */) {
+        if (node.kind === 169 /* ArrayLiteralExpression */ ||
+            node.kind === 170 /* ObjectLiteralExpression */) {
             // [a,b,c] from:
             // [a, b, c] = someExpression;
-            if (node.parent.kind === 184 /* BinaryExpression */ &&
+            if (node.parent.kind === 186 /* BinaryExpression */ &&
                 node.parent.left === node &&
                 node.parent.operatorToken.kind === 56 /* EqualsToken */) {
                 return true;
             }
             // [a, b, c] from:
             // for([a, b, c] of expression)
-            if (node.parent.kind === 204 /* ForOfStatement */ &&
+            if (node.parent.kind === 207 /* ForOfStatement */ &&
                 node.parent.initializer === node) {
                 return true;
             }
@@ -42675,7 +45836,7 @@ var ts;
             // [x, [a, b, c] ] = someExpression
             // or 
             // {x, a: {a, b, c} } = someExpression
-            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 248 /* PropertyAssignment */ ? node.parent.parent : node.parent)) {
+            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 252 /* PropertyAssignment */ ? node.parent.parent : node.parent)) {
                 return true;
             }
         }
@@ -42688,7 +45849,7 @@ var ts;
 var ts;
 (function (ts) {
     function isFirstDeclarationOfSymbolParameter(symbol) {
-        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 139 /* Parameter */;
+        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 141 /* Parameter */;
     }
     ts.isFirstDeclarationOfSymbolParameter = isFirstDeclarationOfSymbolParameter;
     var displayPartWriter = getDisplayPartWriter();
@@ -42876,7 +46037,7 @@ var ts;
     ts.getDeclaredName = getDeclaredName;
     function isImportOrExportSpecifierName(location) {
         return location.parent &&
-            (location.parent.kind === 229 /* ImportSpecifier */ || location.parent.kind === 233 /* ExportSpecifier */) &&
+            (location.parent.kind === 233 /* ImportSpecifier */ || location.parent.kind === 237 /* ExportSpecifier */) &&
             location.parent.propertyName === location;
     }
     ts.isImportOrExportSpecifierName = isImportOrExportSpecifierName;
@@ -42896,6 +46057,213 @@ var ts;
         return name;
     }
     ts.stripQuotes = stripQuotes;
+    function scriptKindIs(fileName, host) {
+        var scriptKinds = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            scriptKinds[_i - 2] = arguments[_i];
+        }
+        var scriptKind = getScriptKind(fileName, host);
+        return ts.forEach(scriptKinds, function (k) { return k === scriptKind; });
+    }
+    ts.scriptKindIs = scriptKindIs;
+    function getScriptKind(fileName, host) {
+        // First check to see if the script kind can be determined from the file name
+        var scriptKind = ts.getScriptKindFromFileName(fileName);
+        if (scriptKind === 0 /* Unknown */ && host && host.getScriptKind) {
+            // Next check to see if the host can resolve the script kind
+            scriptKind = host.getScriptKind(fileName);
+        }
+        return ts.ensureScriptKind(fileName, scriptKind);
+    }
+    ts.getScriptKind = getScriptKind;
+})(ts || (ts = {}));
+// Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0.
+// See LICENSE.txt in the project root for complete license information.
+/// <reference path='services.ts' />
+/* @internal */
+var ts;
+(function (ts) {
+    var JsTyping;
+    (function (JsTyping) {
+        ;
+        ;
+        // A map of loose file names to library names
+        // that we are confident require typings
+        var safeList;
+        /**
+         * @param host is the object providing I/O related operations.
+         * @param fileNames are the file names that belong to the same project
+         * @param projectRootPath is the path to the project root directory
+         * @param safeListPath is the path used to retrieve the safe list
+         * @param packageNameToTypingLocation is the map of package names to their cached typing locations
+         * @param typingOptions are used to customize the typing inference process
+         * @param compilerOptions are used as a source for typing inference
+         */
+        function discoverTypings(host, fileNames, projectRootPath, safeListPath, packageNameToTypingLocation, typingOptions, compilerOptions) {
+            // A typing name to typing file path mapping
+            var inferredTypings = {};
+            if (!typingOptions || !typingOptions.enableAutoDiscovery) {
+                return { cachedTypingPaths: [], newTypingNames: [], filesToWatch: [] };
+            }
+            // Only infer typings for .js and .jsx files
+            fileNames = ts.filter(ts.map(fileNames, ts.normalizePath), function (f) { return ts.scriptKindIs(f, /*LanguageServiceHost*/ undefined, 1 /* JS */, 2 /* JSX */); });
+            if (!safeList) {
+                var result = ts.readConfigFile(safeListPath, function (path) { return host.readFile(path); });
+                if (result.config) {
+                    safeList = result.config;
+                }
+                else {
+                    safeList = {};
+                }
+                ;
+            }
+            var filesToWatch = [];
+            // Directories to search for package.json, bower.json and other typing information
+            var searchDirs = [];
+            var exclude = [];
+            mergeTypings(typingOptions.include);
+            exclude = typingOptions.exclude || [];
+            var possibleSearchDirs = ts.map(fileNames, ts.getDirectoryPath);
+            if (projectRootPath !== undefined) {
+                possibleSearchDirs.push(projectRootPath);
+            }
+            searchDirs = ts.deduplicate(possibleSearchDirs);
+            for (var _i = 0, searchDirs_1 = searchDirs; _i < searchDirs_1.length; _i++) {
+                var searchDir = searchDirs_1[_i];
+                var packageJsonPath = ts.combinePaths(searchDir, "package.json");
+                getTypingNamesFromJson(packageJsonPath, filesToWatch);
+                var bowerJsonPath = ts.combinePaths(searchDir, "bower.json");
+                getTypingNamesFromJson(bowerJsonPath, filesToWatch);
+                var nodeModulesPath = ts.combinePaths(searchDir, "node_modules");
+                getTypingNamesFromNodeModuleFolder(nodeModulesPath);
+            }
+            getTypingNamesFromSourceFileNames(fileNames);
+            // Add the cached typing locations for inferred typings that are already installed
+            for (var name_37 in packageNameToTypingLocation) {
+                if (ts.hasProperty(inferredTypings, name_37) && !inferredTypings[name_37]) {
+                    inferredTypings[name_37] = packageNameToTypingLocation[name_37];
+                }
+            }
+            // Remove typings that the user has added to the exclude list
+            for (var _a = 0, exclude_1 = exclude; _a < exclude_1.length; _a++) {
+                var excludeTypingName = exclude_1[_a];
+                delete inferredTypings[excludeTypingName];
+            }
+            var newTypingNames = [];
+            var cachedTypingPaths = [];
+            for (var typing in inferredTypings) {
+                if (inferredTypings[typing] !== undefined) {
+                    cachedTypingPaths.push(inferredTypings[typing]);
+                }
+                else {
+                    newTypingNames.push(typing);
+                }
+            }
+            return { cachedTypingPaths: cachedTypingPaths, newTypingNames: newTypingNames, filesToWatch: filesToWatch };
+            /**
+             * Merge a given list of typingNames to the inferredTypings map
+             */
+            function mergeTypings(typingNames) {
+                if (!typingNames) {
+                    return;
+                }
+                for (var _i = 0, typingNames_1 = typingNames; _i < typingNames_1.length; _i++) {
+                    var typing = typingNames_1[_i];
+                    if (!ts.hasProperty(inferredTypings, typing)) {
+                        inferredTypings[typing] = undefined;
+                    }
+                }
+            }
+            /**
+             * Get the typing info from common package manager json files like package.json or bower.json
+             */
+            function getTypingNamesFromJson(jsonPath, filesToWatch) {
+                var result = ts.readConfigFile(jsonPath, function (path) { return host.readFile(path); });
+                if (result.config) {
+                    var jsonConfig = result.config;
+                    filesToWatch.push(jsonPath);
+                    if (jsonConfig.dependencies) {
+                        mergeTypings(ts.getKeys(jsonConfig.dependencies));
+                    }
+                    if (jsonConfig.devDependencies) {
+                        mergeTypings(ts.getKeys(jsonConfig.devDependencies));
+                    }
+                    if (jsonConfig.optionalDependencies) {
+                        mergeTypings(ts.getKeys(jsonConfig.optionalDependencies));
+                    }
+                    if (jsonConfig.peerDependencies) {
+                        mergeTypings(ts.getKeys(jsonConfig.peerDependencies));
+                    }
+                }
+            }
+            /**
+             * Infer typing names from given file names. For example, the file name "jquery-min.2.3.4.js"
+             * should be inferred to the 'jquery' typing name; and "angular-route.1.2.3.js" should be inferred
+             * to the 'angular-route' typing name.
+             * @param fileNames are the names for source files in the project
+             */
+            function getTypingNamesFromSourceFileNames(fileNames) {
+                var jsFileNames = ts.filter(fileNames, ts.hasJavaScriptFileExtension);
+                var inferredTypingNames = ts.map(jsFileNames, function (f) { return ts.removeFileExtension(ts.getBaseFileName(f.toLowerCase())); });
+                var cleanedTypingNames = ts.map(inferredTypingNames, function (f) { return f.replace(/((?:\.|-)min(?=\.|$))|((?:-|\.)\d+)/g, ""); });
+                if (safeList === undefined) {
+                    mergeTypings(cleanedTypingNames);
+                }
+                else {
+                    mergeTypings(ts.filter(cleanedTypingNames, function (f) { return ts.hasProperty(safeList, f); }));
+                }
+                var hasJsxFile = ts.forEach(fileNames, function (f) { return ts.scriptKindIs(f, /*LanguageServiceHost*/ undefined, 2 /* JSX */); });
+                if (hasJsxFile) {
+                    mergeTypings(["react"]);
+                }
+            }
+            /**
+             * Infer typing names from node_module folder
+             * @param nodeModulesPath is the path to the "node_modules" folder
+             */
+            function getTypingNamesFromNodeModuleFolder(nodeModulesPath) {
+                // Todo: add support for ModuleResolutionHost too
+                if (!host.directoryExists(nodeModulesPath)) {
+                    return;
+                }
+                var typingNames = [];
+                var fileNames = host.readDirectory(nodeModulesPath, "*.json", /*exclude*/ undefined, /*depth*/ 2);
+                for (var _i = 0, fileNames_1 = fileNames; _i < fileNames_1.length; _i++) {
+                    var fileName = fileNames_1[_i];
+                    var normalizedFileName = ts.normalizePath(fileName);
+                    if (ts.getBaseFileName(normalizedFileName) !== "package.json") {
+                        continue;
+                    }
+                    var result = ts.readConfigFile(normalizedFileName, function (path) { return host.readFile(path); });
+                    if (!result.config) {
+                        continue;
+                    }
+                    var packageJson = result.config;
+                    // npm 3's package.json contains a "_requiredBy" field
+                    // we should include all the top level module names for npm 2, and only module names whose
+                    // "_requiredBy" field starts with "#" or equals "/" for npm 3.
+                    if (packageJson._requiredBy &&
+                        ts.filter(packageJson._requiredBy, function (r) { return r[0] === "#" || r === "/"; }).length === 0) {
+                        continue;
+                    }
+                    // If the package has its own d.ts typings, those will take precedence. Otherwise the package name will be used
+                    // to download d.ts files from DefinitelyTyped
+                    if (!packageJson.name) {
+                        continue;
+                    }
+                    if (packageJson.typings) {
+                        var absolutePath = ts.getNormalizedAbsolutePath(packageJson.typings, ts.getDirectoryPath(normalizedFileName));
+                        inferredTypings[packageJson.name] = absolutePath;
+                    }
+                    else {
+                        typingNames.push(packageJson.name);
+                    }
+                }
+                mergeTypings(typingNames);
+            }
+        }
+        JsTyping.discoverTypings = discoverTypings;
+    })(JsTyping = ts.JsTyping || (ts.JsTyping = {}));
 })(ts || (ts = {}));
 /// <reference path="formatting.ts"/>
 /// <reference path="..\..\compiler\scanner.ts"/>
@@ -42999,10 +46367,10 @@ var ts;
             function shouldRescanJsxIdentifier(node) {
                 if (node.parent) {
                     switch (node.parent.kind) {
-                        case 241 /* JsxAttribute */:
-                        case 238 /* JsxOpeningElement */:
-                        case 240 /* JsxClosingElement */:
-                        case 237 /* JsxSelfClosingElement */:
+                        case 245 /* JsxAttribute */:
+                        case 242 /* JsxOpeningElement */:
+                        case 244 /* JsxClosingElement */:
+                        case 241 /* JsxSelfClosingElement */:
                             return node.kind === 69 /* Identifier */;
                     }
                 }
@@ -43043,7 +46411,7 @@ var ts;
                     // readTokenInfo was called before with the same expected scan action.
                     // No need to re-scan text, return existing 'lastTokenInfo'
                     // it is ok to call fixTokenKind here since it does not affect
-                    // what portion of text is consumed. In opposize rescanning can change it,
+                    // what portion of text is consumed. In contrast rescanning can change it,
                     // i.e. for '>=' when originally scanner eats just one character
                     // and rescanning forces it to consume more.
                     return fixTokenKind(lastTokenInfo, n);
@@ -43391,25 +46759,25 @@ var ts;
                 this.IgnoreBeforeComment = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.Comments), formatting.RuleOperation.create1(1 /* Ignore */));
                 this.IgnoreAfterLineComment = new formatting.Rule(formatting.RuleDescriptor.create3(2 /* SingleLineCommentTrivia */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create1(1 /* Ignore */));
                 // Space after keyword but not before ; or : or ?
-                this.NoSpaceBeforeSemicolon = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 23 /* SemicolonToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceBeforeColon = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 54 /* ColonToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), 8 /* Delete */));
-                this.NoSpaceBeforeQuestionMark = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 53 /* QuestionToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), 8 /* Delete */));
-                this.SpaceAfterColon = new formatting.Rule(formatting.RuleDescriptor.create3(54 /* ColonToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), 2 /* Space */));
-                this.SpaceAfterQuestionMarkInConditionalOperator = new formatting.Rule(formatting.RuleDescriptor.create3(53 /* QuestionToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsConditionalOperatorContext), 2 /* Space */));
-                this.NoSpaceAfterQuestionMark = new formatting.Rule(formatting.RuleDescriptor.create3(53 /* QuestionToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.SpaceAfterSemicolon = new formatting.Rule(formatting.RuleDescriptor.create3(23 /* SemicolonToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
+                this.NoSpaceBeforeSemicolon = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 23 /* SemicolonToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceBeforeColon = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 54 /* ColonToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBinaryOpContext), 8 /* Delete */));
+                this.NoSpaceBeforeQuestionMark = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 53 /* QuestionToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBinaryOpContext), 8 /* Delete */));
+                this.SpaceAfterColon = new formatting.Rule(formatting.RuleDescriptor.create3(54 /* ColonToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBinaryOpContext), 2 /* Space */));
+                this.SpaceAfterQuestionMarkInConditionalOperator = new formatting.Rule(formatting.RuleDescriptor.create3(53 /* QuestionToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsConditionalOperatorContext), 2 /* Space */));
+                this.NoSpaceAfterQuestionMark = new formatting.Rule(formatting.RuleDescriptor.create3(53 /* QuestionToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.SpaceAfterSemicolon = new formatting.Rule(formatting.RuleDescriptor.create3(23 /* SemicolonToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
                 // Space after }.
-                this.SpaceAfterCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create3(16 /* CloseBraceToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsAfterCodeBlockContext), 2 /* Space */));
+                this.SpaceAfterCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create3(16 /* CloseBraceToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsAfterCodeBlockContext), 2 /* Space */));
                 // Special case for (}, else) and (}, while) since else & while tokens are not part of the tree which makes SpaceAfterCloseBrace rule not applied
-                this.SpaceBetweenCloseBraceAndElse = new formatting.Rule(formatting.RuleDescriptor.create1(16 /* CloseBraceToken */, 80 /* ElseKeyword */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
-                this.SpaceBetweenCloseBraceAndWhile = new formatting.Rule(formatting.RuleDescriptor.create1(16 /* CloseBraceToken */, 104 /* WhileKeyword */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
-                this.NoSpaceAfterCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create3(16 /* CloseBraceToken */, formatting.Shared.TokenRange.FromTokens([18 /* CloseParenToken */, 20 /* CloseBracketToken */, 24 /* CommaToken */, 23 /* SemicolonToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
+                this.SpaceBetweenCloseBraceAndElse = new formatting.Rule(formatting.RuleDescriptor.create1(16 /* CloseBraceToken */, 80 /* ElseKeyword */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.SpaceBetweenCloseBraceAndWhile = new formatting.Rule(formatting.RuleDescriptor.create1(16 /* CloseBraceToken */, 104 /* WhileKeyword */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.NoSpaceAfterCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create3(16 /* CloseBraceToken */, formatting.Shared.TokenRange.FromTokens([18 /* CloseParenToken */, 20 /* CloseBracketToken */, 24 /* CommaToken */, 23 /* SemicolonToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
                 // No space for dot
-                this.NoSpaceBeforeDot = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 21 /* DotToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceAfterDot = new formatting.Rule(formatting.RuleDescriptor.create3(21 /* DotToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceBeforeDot = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 21 /* DotToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceAfterDot = new formatting.Rule(formatting.RuleDescriptor.create3(21 /* DotToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
                 // No space before and after indexer
-                this.NoSpaceBeforeOpenBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 19 /* OpenBracketToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceAfterCloseBracket = new formatting.Rule(formatting.RuleDescriptor.create3(20 /* CloseBracketToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBeforeBlockInFunctionDeclarationContext), 8 /* Delete */));
+                this.NoSpaceBeforeOpenBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 19 /* OpenBracketToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceAfterCloseBracket = new formatting.Rule(formatting.RuleDescriptor.create3(20 /* CloseBracketToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBeforeBlockInFunctionDeclarationContext), 8 /* Delete */));
                 // Place a space before open brace in a function declaration
                 this.FunctionOpenBraceLeftTokenRange = formatting.Shared.TokenRange.AnyIncludingMultilineComments;
                 this.SpaceBeforeOpenBraceInFunction = new formatting.Rule(formatting.RuleDescriptor.create2(this.FunctionOpenBraceLeftTokenRange, 15 /* OpenBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext, Rules.IsBeforeBlockContext, Rules.IsNotFormatOnEnter, Rules.IsSameLineTokenOrBeforeMultilineBlockContext), 2 /* Space */), 1 /* CanDeleteNewLines */);
@@ -43422,7 +46790,7 @@ var ts;
                 // Insert a space after { and before } in single-line contexts, but remove space from empty object literals {}.
                 this.SpaceAfterOpenBrace = new formatting.Rule(formatting.RuleDescriptor.create3(15 /* OpenBraceToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSingleLineBlockContext), 2 /* Space */));
                 this.SpaceBeforeCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 16 /* CloseBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSingleLineBlockContext), 2 /* Space */));
-                this.NoSpaceBetweenEmptyBraceBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(15 /* OpenBraceToken */, 16 /* CloseBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsObjectContext), 8 /* Delete */));
+                this.NoSpaceBetweenEmptyBraceBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(15 /* OpenBraceToken */, 16 /* CloseBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsObjectContext), 8 /* Delete */));
                 // Insert new line after { and before } in multi-line contexts.
                 this.NewLineAfterOpenBraceInBlockContext = new formatting.Rule(formatting.RuleDescriptor.create3(15 /* OpenBraceToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsMultilineBlockContext), 4 /* NewLine */));
                 // For functions and control block place } on a new line    [multi-line rule]
@@ -43430,79 +46798,79 @@ var ts;
                 // Special handling of unary operators.
                 // Prefix operators generally shouldn't have a space between
                 // them and their target unary expression.
-                this.NoSpaceAfterUnaryPrefixOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.UnaryPrefixOperators, formatting.Shared.TokenRange.UnaryPrefixExpressions), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), 8 /* Delete */));
-                this.NoSpaceAfterUnaryPreincrementOperator = new formatting.Rule(formatting.RuleDescriptor.create3(41 /* PlusPlusToken */, formatting.Shared.TokenRange.UnaryPreincrementExpressions), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceAfterUnaryPredecrementOperator = new formatting.Rule(formatting.RuleDescriptor.create3(42 /* MinusMinusToken */, formatting.Shared.TokenRange.UnaryPredecrementExpressions), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceBeforeUnaryPostincrementOperator = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.UnaryPostincrementExpressions, 41 /* PlusPlusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceBeforeUnaryPostdecrementOperator = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.UnaryPostdecrementExpressions, 42 /* MinusMinusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceAfterUnaryPrefixOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.UnaryPrefixOperators, formatting.Shared.TokenRange.UnaryPrefixExpressions), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBinaryOpContext), 8 /* Delete */));
+                this.NoSpaceAfterUnaryPreincrementOperator = new formatting.Rule(formatting.RuleDescriptor.create3(41 /* PlusPlusToken */, formatting.Shared.TokenRange.UnaryPreincrementExpressions), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceAfterUnaryPredecrementOperator = new formatting.Rule(formatting.RuleDescriptor.create3(42 /* MinusMinusToken */, formatting.Shared.TokenRange.UnaryPredecrementExpressions), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceBeforeUnaryPostincrementOperator = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.UnaryPostincrementExpressions, 41 /* PlusPlusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceBeforeUnaryPostdecrementOperator = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.UnaryPostdecrementExpressions, 42 /* MinusMinusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
                 // More unary operator special-casing.
                 // DevDiv 181814:  Be careful when removing leading whitespace
                 // around unary operators.  Examples:
                 //      1 - -2  --X-->  1--2
                 //      a + ++b --X-->  a+++b
-                this.SpaceAfterPostincrementWhenFollowedByAdd = new formatting.Rule(formatting.RuleDescriptor.create1(41 /* PlusPlusToken */, 35 /* PlusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.SpaceAfterAddWhenFollowedByUnaryPlus = new formatting.Rule(formatting.RuleDescriptor.create1(35 /* PlusToken */, 35 /* PlusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.SpaceAfterAddWhenFollowedByPreincrement = new formatting.Rule(formatting.RuleDescriptor.create1(35 /* PlusToken */, 41 /* PlusPlusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.SpaceAfterPostdecrementWhenFollowedBySubtract = new formatting.Rule(formatting.RuleDescriptor.create1(42 /* MinusMinusToken */, 36 /* MinusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.SpaceAfterSubtractWhenFollowedByUnaryMinus = new formatting.Rule(formatting.RuleDescriptor.create1(36 /* MinusToken */, 36 /* MinusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.SpaceAfterSubtractWhenFollowedByPredecrement = new formatting.Rule(formatting.RuleDescriptor.create1(36 /* MinusToken */, 42 /* MinusMinusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.NoSpaceBeforeComma = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 24 /* CommaToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.SpaceAfterCertainKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([102 /* VarKeyword */, 98 /* ThrowKeyword */, 92 /* NewKeyword */, 78 /* DeleteKeyword */, 94 /* ReturnKeyword */, 101 /* TypeOfKeyword */, 119 /* AwaitKeyword */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
-                this.SpaceAfterLetConstInVariableDeclaration = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([108 /* LetKeyword */, 74 /* ConstKeyword */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsStartOfVariableDeclarationList), 2 /* Space */));
-                this.NoSpaceBeforeOpenParenInFuncCall = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsFunctionCallOrNewContext, Rules.IsPreviousTokenNotComma), 8 /* Delete */));
+                this.SpaceAfterPostincrementWhenFollowedByAdd = new formatting.Rule(formatting.RuleDescriptor.create1(41 /* PlusPlusToken */, 35 /* PlusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
+                this.SpaceAfterAddWhenFollowedByUnaryPlus = new formatting.Rule(formatting.RuleDescriptor.create1(35 /* PlusToken */, 35 /* PlusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
+                this.SpaceAfterAddWhenFollowedByPreincrement = new formatting.Rule(formatting.RuleDescriptor.create1(35 /* PlusToken */, 41 /* PlusPlusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
+                this.SpaceAfterPostdecrementWhenFollowedBySubtract = new formatting.Rule(formatting.RuleDescriptor.create1(42 /* MinusMinusToken */, 36 /* MinusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
+                this.SpaceAfterSubtractWhenFollowedByUnaryMinus = new formatting.Rule(formatting.RuleDescriptor.create1(36 /* MinusToken */, 36 /* MinusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
+                this.SpaceAfterSubtractWhenFollowedByPredecrement = new formatting.Rule(formatting.RuleDescriptor.create1(36 /* MinusToken */, 42 /* MinusMinusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
+                this.NoSpaceBeforeComma = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 24 /* CommaToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.SpaceAfterCertainKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([102 /* VarKeyword */, 98 /* ThrowKeyword */, 92 /* NewKeyword */, 78 /* DeleteKeyword */, 94 /* ReturnKeyword */, 101 /* TypeOfKeyword */, 119 /* AwaitKeyword */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.SpaceAfterLetConstInVariableDeclaration = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([108 /* LetKeyword */, 74 /* ConstKeyword */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsStartOfVariableDeclarationList), 2 /* Space */));
+                this.NoSpaceBeforeOpenParenInFuncCall = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsFunctionCallOrNewContext, Rules.IsPreviousTokenNotComma), 8 /* Delete */));
                 this.SpaceAfterFunctionInFuncDecl = new formatting.Rule(formatting.RuleDescriptor.create3(87 /* FunctionKeyword */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2 /* Space */));
-                this.NoSpaceBeforeOpenParenInFuncDecl = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsFunctionDeclContext), 8 /* Delete */));
-                this.SpaceAfterVoidOperator = new formatting.Rule(formatting.RuleDescriptor.create3(103 /* VoidKeyword */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsVoidOpContext), 2 /* Space */));
-                this.NoSpaceBetweenReturnAndSemicolon = new formatting.Rule(formatting.RuleDescriptor.create1(94 /* ReturnKeyword */, 23 /* SemicolonToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceBeforeOpenParenInFuncDecl = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsFunctionDeclContext), 8 /* Delete */));
+                this.SpaceAfterVoidOperator = new formatting.Rule(formatting.RuleDescriptor.create3(103 /* VoidKeyword */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsVoidOpContext), 2 /* Space */));
+                this.NoSpaceBetweenReturnAndSemicolon = new formatting.Rule(formatting.RuleDescriptor.create1(94 /* ReturnKeyword */, 23 /* SemicolonToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
                 // Add a space between statements. All keywords except (do,else,case) has open/close parens after them.
                 // So, we have a rule to add a space for [),Any], [do,Any], [else,Any], and [case,Any]
-                this.SpaceBetweenStatements = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([18 /* CloseParenToken */, 79 /* DoKeyword */, 80 /* ElseKeyword */, 71 /* CaseKeyword */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotForContext), 2 /* Space */));
+                this.SpaceBetweenStatements = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([18 /* CloseParenToken */, 79 /* DoKeyword */, 80 /* ElseKeyword */, 71 /* CaseKeyword */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotForContext), 2 /* Space */));
                 // This low-pri rule takes care of "try {" and "finally {" in case the rule SpaceBeforeOpenBraceInControl didn't execute on FormatOnEnter.
-                this.SpaceAfterTryFinally = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([100 /* TryKeyword */, 85 /* FinallyKeyword */]), 15 /* OpenBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
+                this.SpaceAfterTryFinally = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([100 /* TryKeyword */, 85 /* FinallyKeyword */]), 15 /* OpenBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
                 //      get x() {}
                 //      set x(val) {}
-                this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([123 /* GetKeyword */, 129 /* SetKeyword */]), 69 /* Identifier */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2 /* Space */));
+                this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([123 /* GetKeyword */, 130 /* SetKeyword */]), 69 /* Identifier */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2 /* Space */));
                 // Special case for binary operators (that are keywords). For these we have to add a space and shouldn't follow any user options.
-                this.SpaceBeforeBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryKeywordOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.SpaceAfterBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryKeywordOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
+                this.SpaceBeforeBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryKeywordOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
+                this.SpaceAfterBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryKeywordOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
                 // TypeScript-specific higher priority rules
                 // Treat constructor as an identifier in a function declaration, and remove spaces between constructor and following left parentheses
-                this.NoSpaceAfterConstructor = new formatting.Rule(formatting.RuleDescriptor.create1(121 /* ConstructorKeyword */, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceAfterConstructor = new formatting.Rule(formatting.RuleDescriptor.create1(121 /* ConstructorKeyword */, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
                 // Use of module as a function call. e.g.: import m2 = module("m2");
-                this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([125 /* ModuleKeyword */, 127 /* RequireKeyword */]), 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([125 /* ModuleKeyword */, 128 /* RequireKeyword */]), 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
                 // Add a space around certain TypeScript keywords
-                this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([115 /* AbstractKeyword */, 73 /* ClassKeyword */, 122 /* DeclareKeyword */, 77 /* DefaultKeyword */, 81 /* EnumKeyword */, 82 /* ExportKeyword */, 83 /* ExtendsKeyword */, 123 /* GetKeyword */, 106 /* ImplementsKeyword */, 89 /* ImportKeyword */, 107 /* InterfaceKeyword */, 125 /* ModuleKeyword */, 126 /* NamespaceKeyword */, 110 /* PrivateKeyword */, 112 /* PublicKeyword */, 111 /* ProtectedKeyword */, 129 /* SetKeyword */, 113 /* StaticKeyword */, 132 /* TypeKeyword */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
-                this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([83 /* ExtendsKeyword */, 106 /* ImplementsKeyword */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
+                this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([115 /* AbstractKeyword */, 73 /* ClassKeyword */, 122 /* DeclareKeyword */, 77 /* DefaultKeyword */, 81 /* EnumKeyword */, 82 /* ExportKeyword */, 83 /* ExtendsKeyword */, 123 /* GetKeyword */, 106 /* ImplementsKeyword */, 89 /* ImportKeyword */, 107 /* InterfaceKeyword */, 125 /* ModuleKeyword */, 126 /* NamespaceKeyword */, 110 /* PrivateKeyword */, 112 /* PublicKeyword */, 111 /* ProtectedKeyword */, 130 /* SetKeyword */, 113 /* StaticKeyword */, 133 /* TypeKeyword */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([83 /* ExtendsKeyword */, 106 /* ImplementsKeyword */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
                 // Treat string literals in module names as identifiers, and add a space between the literal and the opening Brace braces, e.g.: module "m2" {
                 this.SpaceAfterModuleName = new formatting.Rule(formatting.RuleDescriptor.create1(9 /* StringLiteral */, 15 /* OpenBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsModuleDeclContext), 2 /* Space */));
                 // Lambda expressions
-                this.SpaceBeforeArrow = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 34 /* EqualsGreaterThanToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
-                this.SpaceAfterArrow = new formatting.Rule(formatting.RuleDescriptor.create3(34 /* EqualsGreaterThanToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
+                this.SpaceBeforeArrow = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 34 /* EqualsGreaterThanToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.SpaceAfterArrow = new formatting.Rule(formatting.RuleDescriptor.create3(34 /* EqualsGreaterThanToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
                 // Optional parameters and let args
-                this.NoSpaceAfterEllipsis = new formatting.Rule(formatting.RuleDescriptor.create1(22 /* DotDotDotToken */, 69 /* Identifier */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceAfterOptionalParameters = new formatting.Rule(formatting.RuleDescriptor.create3(53 /* QuestionToken */, formatting.Shared.TokenRange.FromTokens([18 /* CloseParenToken */, 24 /* CommaToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), 8 /* Delete */));
+                this.NoSpaceAfterEllipsis = new formatting.Rule(formatting.RuleDescriptor.create1(22 /* DotDotDotToken */, 69 /* Identifier */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceAfterOptionalParameters = new formatting.Rule(formatting.RuleDescriptor.create3(53 /* QuestionToken */, formatting.Shared.TokenRange.FromTokens([18 /* CloseParenToken */, 24 /* CommaToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBinaryOpContext), 8 /* Delete */));
                 // generics and type assertions
-                this.NoSpaceBeforeOpenAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.TypeNames, 25 /* LessThanToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8 /* Delete */));
-                this.NoSpaceBetweenCloseParenAndAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create1(18 /* CloseParenToken */, 25 /* LessThanToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8 /* Delete */));
-                this.NoSpaceAfterOpenAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(25 /* LessThanToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8 /* Delete */));
-                this.NoSpaceBeforeCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 27 /* GreaterThanToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8 /* Delete */));
-                this.NoSpaceAfterCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(27 /* GreaterThanToken */, formatting.Shared.TokenRange.FromTokens([17 /* OpenParenToken */, 19 /* OpenBracketToken */, 27 /* GreaterThanToken */, 24 /* CommaToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8 /* Delete */));
-                this.NoSpaceAfterTypeAssertion = new formatting.Rule(formatting.RuleDescriptor.create3(27 /* GreaterThanToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeAssertionContext), 8 /* Delete */));
+                this.NoSpaceBeforeOpenAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.TypeNames, 25 /* LessThanToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8 /* Delete */));
+                this.NoSpaceBetweenCloseParenAndAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create1(18 /* CloseParenToken */, 25 /* LessThanToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8 /* Delete */));
+                this.NoSpaceAfterOpenAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(25 /* LessThanToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8 /* Delete */));
+                this.NoSpaceBeforeCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 27 /* GreaterThanToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8 /* Delete */));
+                this.NoSpaceAfterCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(27 /* GreaterThanToken */, formatting.Shared.TokenRange.FromTokens([17 /* OpenParenToken */, 19 /* OpenBracketToken */, 27 /* GreaterThanToken */, 24 /* CommaToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8 /* Delete */));
+                this.NoSpaceAfterTypeAssertion = new formatting.Rule(formatting.RuleDescriptor.create3(27 /* GreaterThanToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeAssertionContext), 8 /* Delete */));
                 // Remove spaces in empty interface literals. e.g.: x: {}
-                this.NoSpaceBetweenEmptyInterfaceBraceBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(15 /* OpenBraceToken */, 16 /* CloseBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsObjectTypeContext), 8 /* Delete */));
+                this.NoSpaceBetweenEmptyInterfaceBraceBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(15 /* OpenBraceToken */, 16 /* CloseBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsObjectTypeContext), 8 /* Delete */));
                 // decorators
-                this.SpaceBeforeAt = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 55 /* AtToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
-                this.NoSpaceAfterAt = new formatting.Rule(formatting.RuleDescriptor.create3(55 /* AtToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.SpaceAfterDecorator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([115 /* AbstractKeyword */, 69 /* Identifier */, 82 /* ExportKeyword */, 77 /* DefaultKeyword */, 73 /* ClassKeyword */, 113 /* StaticKeyword */, 112 /* PublicKeyword */, 110 /* PrivateKeyword */, 111 /* ProtectedKeyword */, 123 /* GetKeyword */, 129 /* SetKeyword */, 19 /* OpenBracketToken */, 37 /* AsteriskToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsEndOfDecoratorContextOnSameLine), 2 /* Space */));
+                this.SpaceBeforeAt = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 55 /* AtToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.NoSpaceAfterAt = new formatting.Rule(formatting.RuleDescriptor.create3(55 /* AtToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.SpaceAfterDecorator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([115 /* AbstractKeyword */, 69 /* Identifier */, 82 /* ExportKeyword */, 77 /* DefaultKeyword */, 73 /* ClassKeyword */, 113 /* StaticKeyword */, 112 /* PublicKeyword */, 110 /* PrivateKeyword */, 111 /* ProtectedKeyword */, 123 /* GetKeyword */, 130 /* SetKeyword */, 19 /* OpenBracketToken */, 37 /* AsteriskToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsEndOfDecoratorContextOnSameLine), 2 /* Space */));
                 this.NoSpaceBetweenFunctionKeywordAndStar = new formatting.Rule(formatting.RuleDescriptor.create1(87 /* FunctionKeyword */, 37 /* AsteriskToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclarationOrFunctionExpressionContext), 8 /* Delete */));
                 this.SpaceAfterStarInGeneratorDeclaration = new formatting.Rule(formatting.RuleDescriptor.create3(37 /* AsteriskToken */, formatting.Shared.TokenRange.FromTokens([69 /* Identifier */, 17 /* OpenParenToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclarationOrFunctionExpressionContext), 2 /* Space */));
-                this.NoSpaceBetweenYieldKeywordAndStar = new formatting.Rule(formatting.RuleDescriptor.create1(114 /* YieldKeyword */, 37 /* AsteriskToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsYieldOrYieldStarWithOperand), 8 /* Delete */));
-                this.SpaceBetweenYieldOrYieldStarAndOperand = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([114 /* YieldKeyword */, 37 /* AsteriskToken */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsYieldOrYieldStarWithOperand), 2 /* Space */));
+                this.NoSpaceBetweenYieldKeywordAndStar = new formatting.Rule(formatting.RuleDescriptor.create1(114 /* YieldKeyword */, 37 /* AsteriskToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsYieldOrYieldStarWithOperand), 8 /* Delete */));
+                this.SpaceBetweenYieldOrYieldStarAndOperand = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([114 /* YieldKeyword */, 37 /* AsteriskToken */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsYieldOrYieldStarWithOperand), 2 /* Space */));
                 // Async-await
-                this.SpaceBetweenAsyncAndOpenParen = new formatting.Rule(formatting.RuleDescriptor.create1(118 /* AsyncKeyword */, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsArrowFunctionContext, Rules.IsSameLineTokenContext), 2 /* Space */));
-                this.SpaceBetweenAsyncAndFunctionKeyword = new formatting.Rule(formatting.RuleDescriptor.create1(118 /* AsyncKeyword */, 87 /* FunctionKeyword */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
+                this.SpaceBetweenAsyncAndOpenParen = new formatting.Rule(formatting.RuleDescriptor.create1(118 /* AsyncKeyword */, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsArrowFunctionContext, Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.SpaceBetweenAsyncAndFunctionKeyword = new formatting.Rule(formatting.RuleDescriptor.create1(118 /* AsyncKeyword */, 87 /* FunctionKeyword */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
                 // template string
-                this.NoSpaceBetweenTagAndTemplateString = new formatting.Rule(formatting.RuleDescriptor.create3(69 /* Identifier */, formatting.Shared.TokenRange.FromTokens([11 /* NoSubstitutionTemplateLiteral */, 12 /* TemplateHead */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceBetweenTagAndTemplateString = new formatting.Rule(formatting.RuleDescriptor.create3(69 /* Identifier */, formatting.Shared.TokenRange.FromTokens([11 /* NoSubstitutionTemplateLiteral */, 12 /* TemplateHead */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
                 // These rules are higher in priority than user-configurable rules.
                 this.HighPriorityCommonRules = [
                     this.IgnoreBeforeComment, this.IgnoreAfterLineComment,
@@ -43563,13 +46931,13 @@ var ts;
                 /// Rules controlled by user options
                 ///
                 // Insert space after comma delimiter
-                this.SpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(24 /* CommaToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNextTokenNotCloseBracket), 2 /* Space */));
-                this.NoSpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(24 /* CommaToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
+                this.SpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(24 /* CommaToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNextTokenNotCloseBracket), 2 /* Space */));
+                this.NoSpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(24 /* CommaToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
                 // Insert space before and after binary operators
-                this.SpaceBeforeBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.SpaceAfterBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.NoSpaceBeforeBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 8 /* Delete */));
-                this.NoSpaceAfterBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 8 /* Delete */));
+                this.SpaceBeforeBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
+                this.SpaceAfterBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
+                this.NoSpaceBeforeBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 8 /* Delete */));
+                this.NoSpaceAfterBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 8 /* Delete */));
                 // Insert space after keywords in control flow statements
                 this.SpaceAfterKeywordInControl = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Keywords, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsControlDeclContext), 2 /* Space */));
                 this.NoSpaceAfterKeywordInControl = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Keywords, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsControlDeclContext), 8 /* Delete */));
@@ -43581,34 +46949,34 @@ var ts;
                 // Open Brace braces after control block
                 this.NewLineBeforeOpenBraceInControl = new formatting.Rule(formatting.RuleDescriptor.create2(this.ControlOpenBraceLeftTokenRange, 15 /* OpenBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsControlDeclContext, Rules.IsBeforeMultilineBlockContext), 4 /* NewLine */), 1 /* CanDeleteNewLines */);
                 // Insert space after semicolon in for statement
-                this.SpaceAfterSemicolonInFor = new formatting.Rule(formatting.RuleDescriptor.create3(23 /* SemicolonToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsForContext), 2 /* Space */));
-                this.NoSpaceAfterSemicolonInFor = new formatting.Rule(formatting.RuleDescriptor.create3(23 /* SemicolonToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsForContext), 8 /* Delete */));
+                this.SpaceAfterSemicolonInFor = new formatting.Rule(formatting.RuleDescriptor.create3(23 /* SemicolonToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsForContext), 2 /* Space */));
+                this.NoSpaceAfterSemicolonInFor = new formatting.Rule(formatting.RuleDescriptor.create3(23 /* SemicolonToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsForContext), 8 /* Delete */));
                 // Insert space after opening and before closing nonempty parenthesis
-                this.SpaceAfterOpenParen = new formatting.Rule(formatting.RuleDescriptor.create3(17 /* OpenParenToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
-                this.SpaceBeforeCloseParen = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 18 /* CloseParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
-                this.NoSpaceBetweenParens = new formatting.Rule(formatting.RuleDescriptor.create1(17 /* OpenParenToken */, 18 /* CloseParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceAfterOpenParen = new formatting.Rule(formatting.RuleDescriptor.create3(17 /* OpenParenToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceBeforeCloseParen = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 18 /* CloseParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
+                this.SpaceAfterOpenParen = new formatting.Rule(formatting.RuleDescriptor.create3(17 /* OpenParenToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.SpaceBeforeCloseParen = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 18 /* CloseParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.NoSpaceBetweenParens = new formatting.Rule(formatting.RuleDescriptor.create1(17 /* OpenParenToken */, 18 /* CloseParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceAfterOpenParen = new formatting.Rule(formatting.RuleDescriptor.create3(17 /* OpenParenToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceBeforeCloseParen = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 18 /* CloseParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
                 // Insert space after opening and before closing nonempty brackets
-                this.SpaceAfterOpenBracket = new formatting.Rule(formatting.RuleDescriptor.create3(19 /* OpenBracketToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
-                this.SpaceBeforeCloseBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 20 /* CloseBracketToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
-                this.NoSpaceBetweenBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(19 /* OpenBracketToken */, 20 /* CloseBracketToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceAfterOpenBracket = new formatting.Rule(formatting.RuleDescriptor.create3(19 /* OpenBracketToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceBeforeCloseBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 20 /* CloseBracketToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
+                this.SpaceAfterOpenBracket = new formatting.Rule(formatting.RuleDescriptor.create3(19 /* OpenBracketToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.SpaceBeforeCloseBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 20 /* CloseBracketToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.NoSpaceBetweenBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(19 /* OpenBracketToken */, 20 /* CloseBracketToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceAfterOpenBracket = new formatting.Rule(formatting.RuleDescriptor.create3(19 /* OpenBracketToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceBeforeCloseBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 20 /* CloseBracketToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
                 // Insert space after opening and before closing template string braces
-                this.NoSpaceAfterTemplateHeadAndMiddle = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([12 /* TemplateHead */, 13 /* TemplateMiddle */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.SpaceAfterTemplateHeadAndMiddle = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([12 /* TemplateHead */, 13 /* TemplateMiddle */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
-                this.NoSpaceBeforeTemplateMiddleAndTail = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([13 /* TemplateMiddle */, 14 /* TemplateTail */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.SpaceBeforeTemplateMiddleAndTail = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([13 /* TemplateMiddle */, 14 /* TemplateTail */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
+                this.NoSpaceAfterTemplateHeadAndMiddle = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([12 /* TemplateHead */, 13 /* TemplateMiddle */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.SpaceAfterTemplateHeadAndMiddle = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([12 /* TemplateHead */, 13 /* TemplateMiddle */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.NoSpaceBeforeTemplateMiddleAndTail = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([13 /* TemplateMiddle */, 14 /* TemplateTail */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.SpaceBeforeTemplateMiddleAndTail = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([13 /* TemplateMiddle */, 14 /* TemplateTail */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
                 // Insert space after function keyword for anonymous functions
                 this.SpaceAfterAnonymousFunctionKeyword = new formatting.Rule(formatting.RuleDescriptor.create1(87 /* FunctionKeyword */, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2 /* Space */));
                 this.NoSpaceAfterAnonymousFunctionKeyword = new formatting.Rule(formatting.RuleDescriptor.create1(87 /* FunctionKeyword */, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 8 /* Delete */));
             }
             Rules.prototype.getRuleName = function (rule) {
                 var o = this;
-                for (var name_33 in o) {
-                    if (o[name_33] === rule) {
-                        return name_33;
+                for (var name_38 in o) {
+                    if (o[name_38] === rule) {
+                        return name_38;
                     }
                 }
                 throw new Error("Unknown rule");
@@ -43617,40 +46985,40 @@ var ts;
             /// Contexts
             ///
             Rules.IsForContext = function (context) {
-                return context.contextNode.kind === 202 /* ForStatement */;
+                return context.contextNode.kind === 205 /* ForStatement */;
             };
             Rules.IsNotForContext = function (context) {
                 return !Rules.IsForContext(context);
             };
             Rules.IsBinaryOpContext = function (context) {
                 switch (context.contextNode.kind) {
-                    case 184 /* BinaryExpression */:
-                    case 185 /* ConditionalExpression */:
-                    case 192 /* AsExpression */:
-                    case 151 /* TypePredicate */:
-                    case 159 /* UnionType */:
-                    case 160 /* IntersectionType */:
+                    case 186 /* BinaryExpression */:
+                    case 187 /* ConditionalExpression */:
+                    case 194 /* AsExpression */:
+                    case 153 /* TypePredicate */:
+                    case 161 /* UnionType */:
+                    case 162 /* IntersectionType */:
                         return true;
                     // equals in binding elements: function foo([[x, y] = [1, 2]])
-                    case 166 /* BindingElement */:
+                    case 168 /* BindingElement */:
                     // equals in type X = ...
-                    case 219 /* TypeAliasDeclaration */:
+                    case 222 /* TypeAliasDeclaration */:
                     // equal in import a = module('a');
-                    case 224 /* ImportEqualsDeclaration */:
+                    case 228 /* ImportEqualsDeclaration */:
                     // equal in let a = 0;
-                    case 214 /* VariableDeclaration */:
+                    case 217 /* VariableDeclaration */:
                     // equal in p = 0;
-                    case 139 /* Parameter */:
-                    case 250 /* EnumMember */:
-                    case 142 /* PropertyDeclaration */:
-                    case 141 /* PropertySignature */:
+                    case 141 /* Parameter */:
+                    case 254 /* EnumMember */:
+                    case 144 /* PropertyDeclaration */:
+                    case 143 /* PropertySignature */:
                         return context.currentTokenSpan.kind === 56 /* EqualsToken */ || context.nextTokenSpan.kind === 56 /* EqualsToken */;
                     // "in" keyword in for (let x in []) { }
-                    case 203 /* ForInStatement */:
+                    case 206 /* ForInStatement */:
                         return context.currentTokenSpan.kind === 90 /* InKeyword */ || context.nextTokenSpan.kind === 90 /* InKeyword */;
                     // Technically, "of" is not a binary operator, but format it the same way as "in"
-                    case 204 /* ForOfStatement */:
-                        return context.currentTokenSpan.kind === 135 /* OfKeyword */ || context.nextTokenSpan.kind === 135 /* OfKeyword */;
+                    case 207 /* ForOfStatement */:
+                        return context.currentTokenSpan.kind === 137 /* OfKeyword */ || context.nextTokenSpan.kind === 137 /* OfKeyword */;
                 }
                 return false;
             };
@@ -43658,7 +47026,7 @@ var ts;
                 return !Rules.IsBinaryOpContext(context);
             };
             Rules.IsConditionalOperatorContext = function (context) {
-                return context.contextNode.kind === 185 /* ConditionalExpression */;
+                return context.contextNode.kind === 187 /* ConditionalExpression */;
             };
             Rules.IsSameLineTokenOrBeforeMultilineBlockContext = function (context) {
                 //// This check is mainly used inside SpaceBeforeOpenBraceInControl and SpaceBeforeOpenBraceInFunction.
@@ -43670,13 +47038,13 @@ var ts;
                 //// Ex: 
                 //// if (1)
                 //// { ... }
-                ////      * ) and { are on differnet lines. We only need to format if the block is multiline context. So in this case we don't format.
+                ////      * ) and { are on different lines. We only need to format if the block is multiline context. So in this case we don't format.
                 ////
                 //// Ex:
                 //// if (1) 
                 //// { ...
                 //// }
-                ////      * ) and { are on differnet lines. We only need to format if the block is multiline context. So in this case we format.
+                ////      * ) and { are on different lines. We only need to format if the block is multiline context. So in this case we format.
                 return context.TokensAreOnSameLine() || Rules.IsBeforeMultilineBlockContext(context);
             };
             // This check is done before an open brace in a control construct, a function, or a typescript block declaration
@@ -43702,93 +47070,93 @@ var ts;
                     return true;
                 }
                 switch (node.kind) {
-                    case 195 /* Block */:
-                    case 223 /* CaseBlock */:
-                    case 168 /* ObjectLiteralExpression */:
-                    case 222 /* ModuleBlock */:
+                    case 198 /* Block */:
+                    case 226 /* CaseBlock */:
+                    case 170 /* ObjectLiteralExpression */:
+                    case 225 /* ModuleBlock */:
                         return true;
                 }
                 return false;
             };
             Rules.IsFunctionDeclContext = function (context) {
                 switch (context.contextNode.kind) {
-                    case 216 /* FunctionDeclaration */:
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
+                    case 219 /* FunctionDeclaration */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
                     //case SyntaxKind.MemberFunctionDeclaration:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
                     ///case SyntaxKind.MethodSignature:
-                    case 148 /* CallSignature */:
-                    case 176 /* FunctionExpression */:
-                    case 145 /* Constructor */:
-                    case 177 /* ArrowFunction */:
+                    case 150 /* CallSignature */:
+                    case 178 /* FunctionExpression */:
+                    case 147 /* Constructor */:
+                    case 179 /* ArrowFunction */:
                     //case SyntaxKind.ConstructorDeclaration:
                     //case SyntaxKind.SimpleArrowFunctionExpression:
                     //case SyntaxKind.ParenthesizedArrowFunctionExpression:
-                    case 218 /* InterfaceDeclaration */:
+                    case 221 /* InterfaceDeclaration */:
                         return true;
                 }
                 return false;
             };
             Rules.IsFunctionDeclarationOrFunctionExpressionContext = function (context) {
-                return context.contextNode.kind === 216 /* FunctionDeclaration */ || context.contextNode.kind === 176 /* FunctionExpression */;
+                return context.contextNode.kind === 219 /* FunctionDeclaration */ || context.contextNode.kind === 178 /* FunctionExpression */;
             };
             Rules.IsTypeScriptDeclWithBlockContext = function (context) {
                 return Rules.NodeIsTypeScriptDeclWithBlockContext(context.contextNode);
             };
             Rules.NodeIsTypeScriptDeclWithBlockContext = function (node) {
                 switch (node.kind) {
-                    case 217 /* ClassDeclaration */:
-                    case 189 /* ClassExpression */:
-                    case 218 /* InterfaceDeclaration */:
-                    case 220 /* EnumDeclaration */:
-                    case 156 /* TypeLiteral */:
-                    case 221 /* ModuleDeclaration */:
+                    case 220 /* ClassDeclaration */:
+                    case 191 /* ClassExpression */:
+                    case 221 /* InterfaceDeclaration */:
+                    case 223 /* EnumDeclaration */:
+                    case 158 /* TypeLiteral */:
+                    case 224 /* ModuleDeclaration */:
                         return true;
                 }
                 return false;
             };
             Rules.IsAfterCodeBlockContext = function (context) {
                 switch (context.currentTokenParent.kind) {
-                    case 217 /* ClassDeclaration */:
-                    case 221 /* ModuleDeclaration */:
-                    case 220 /* EnumDeclaration */:
-                    case 195 /* Block */:
-                    case 247 /* CatchClause */:
-                    case 222 /* ModuleBlock */:
-                    case 209 /* SwitchStatement */:
+                    case 220 /* ClassDeclaration */:
+                    case 224 /* ModuleDeclaration */:
+                    case 223 /* EnumDeclaration */:
+                    case 198 /* Block */:
+                    case 251 /* CatchClause */:
+                    case 225 /* ModuleBlock */:
+                    case 212 /* SwitchStatement */:
                         return true;
                 }
                 return false;
             };
             Rules.IsControlDeclContext = function (context) {
                 switch (context.contextNode.kind) {
-                    case 199 /* IfStatement */:
-                    case 209 /* SwitchStatement */:
-                    case 202 /* ForStatement */:
-                    case 203 /* ForInStatement */:
-                    case 204 /* ForOfStatement */:
-                    case 201 /* WhileStatement */:
-                    case 212 /* TryStatement */:
-                    case 200 /* DoStatement */:
-                    case 208 /* WithStatement */:
+                    case 202 /* IfStatement */:
+                    case 212 /* SwitchStatement */:
+                    case 205 /* ForStatement */:
+                    case 206 /* ForInStatement */:
+                    case 207 /* ForOfStatement */:
+                    case 204 /* WhileStatement */:
+                    case 215 /* TryStatement */:
+                    case 203 /* DoStatement */:
+                    case 211 /* WithStatement */:
                     // TODO
                     // case SyntaxKind.ElseClause:
-                    case 247 /* CatchClause */:
+                    case 251 /* CatchClause */:
                         return true;
                     default:
                         return false;
                 }
             };
             Rules.IsObjectContext = function (context) {
-                return context.contextNode.kind === 168 /* ObjectLiteralExpression */;
+                return context.contextNode.kind === 170 /* ObjectLiteralExpression */;
             };
             Rules.IsFunctionCallContext = function (context) {
-                return context.contextNode.kind === 171 /* CallExpression */;
+                return context.contextNode.kind === 173 /* CallExpression */;
             };
             Rules.IsNewContext = function (context) {
-                return context.contextNode.kind === 172 /* NewExpression */;
+                return context.contextNode.kind === 174 /* NewExpression */;
             };
             Rules.IsFunctionCallOrNewContext = function (context) {
                 return Rules.IsFunctionCallContext(context) || Rules.IsNewContext(context);
@@ -43800,10 +47168,10 @@ var ts;
                 return context.nextTokenSpan.kind !== 20 /* CloseBracketToken */;
             };
             Rules.IsArrowFunctionContext = function (context) {
-                return context.contextNode.kind === 177 /* ArrowFunction */;
+                return context.contextNode.kind === 179 /* ArrowFunction */;
             };
-            Rules.IsSameLineTokenContext = function (context) {
-                return context.TokensAreOnSameLine();
+            Rules.IsNonJsxSameLineTokenContext = function (context) {
+                return context.TokensAreOnSameLine() && context.contextNode.kind !== 243 /* JsxText */;
             };
             Rules.IsNotBeforeBlockInFunctionDeclarationContext = function (context) {
                 return !Rules.IsFunctionDeclContext(context) && !Rules.IsBeforeBlockContext(context);
@@ -43818,41 +47186,41 @@ var ts;
                 while (ts.isExpression(node)) {
                     node = node.parent;
                 }
-                return node.kind === 140 /* Decorator */;
+                return node.kind === 142 /* Decorator */;
             };
             Rules.IsStartOfVariableDeclarationList = function (context) {
-                return context.currentTokenParent.kind === 215 /* VariableDeclarationList */ &&
+                return context.currentTokenParent.kind === 218 /* VariableDeclarationList */ &&
                     context.currentTokenParent.getStart(context.sourceFile) === context.currentTokenSpan.pos;
             };
             Rules.IsNotFormatOnEnter = function (context) {
                 return context.formattingRequestKind !== 2 /* FormatOnEnter */;
             };
             Rules.IsModuleDeclContext = function (context) {
-                return context.contextNode.kind === 221 /* ModuleDeclaration */;
+                return context.contextNode.kind === 224 /* ModuleDeclaration */;
             };
             Rules.IsObjectTypeContext = function (context) {
-                return context.contextNode.kind === 156 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration;
+                return context.contextNode.kind === 158 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration;
             };
             Rules.IsTypeArgumentOrParameterOrAssertion = function (token, parent) {
                 if (token.kind !== 25 /* LessThanToken */ && token.kind !== 27 /* GreaterThanToken */) {
                     return false;
                 }
                 switch (parent.kind) {
-                    case 152 /* TypeReference */:
-                    case 174 /* TypeAssertionExpression */:
-                    case 217 /* ClassDeclaration */:
-                    case 189 /* ClassExpression */:
-                    case 218 /* InterfaceDeclaration */:
-                    case 216 /* FunctionDeclaration */:
-                    case 176 /* FunctionExpression */:
-                    case 177 /* ArrowFunction */:
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
-                    case 148 /* CallSignature */:
-                    case 149 /* ConstructSignature */:
-                    case 171 /* CallExpression */:
-                    case 172 /* NewExpression */:
-                    case 191 /* ExpressionWithTypeArguments */:
+                    case 154 /* TypeReference */:
+                    case 176 /* TypeAssertionExpression */:
+                    case 220 /* ClassDeclaration */:
+                    case 191 /* ClassExpression */:
+                    case 221 /* InterfaceDeclaration */:
+                    case 219 /* FunctionDeclaration */:
+                    case 178 /* FunctionExpression */:
+                    case 179 /* ArrowFunction */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
+                    case 150 /* CallSignature */:
+                    case 151 /* ConstructSignature */:
+                    case 173 /* CallExpression */:
+                    case 174 /* NewExpression */:
+                    case 193 /* ExpressionWithTypeArguments */:
                         return true;
                     default:
                         return false;
@@ -43863,13 +47231,13 @@ var ts;
                     Rules.IsTypeArgumentOrParameterOrAssertion(context.nextTokenSpan, context.nextTokenParent);
             };
             Rules.IsTypeAssertionContext = function (context) {
-                return context.contextNode.kind === 174 /* TypeAssertionExpression */;
+                return context.contextNode.kind === 176 /* TypeAssertionExpression */;
             };
             Rules.IsVoidOpContext = function (context) {
-                return context.currentTokenSpan.kind === 103 /* VoidKeyword */ && context.currentTokenParent.kind === 180 /* VoidExpression */;
+                return context.currentTokenSpan.kind === 103 /* VoidKeyword */ && context.currentTokenParent.kind === 182 /* VoidExpression */;
             };
             Rules.IsYieldOrYieldStarWithOperand = function (context) {
-                return context.contextNode.kind === 187 /* YieldExpression */ && context.contextNode.expression !== undefined;
+                return context.contextNode.kind === 189 /* YieldExpression */ && context.contextNode.expression !== undefined;
             };
             return Rules;
         }());
@@ -43893,7 +47261,7 @@ var ts;
                 return result;
             };
             RulesMap.prototype.Initialize = function (rules) {
-                this.mapRowLength = 135 /* LastToken */ + 1;
+                this.mapRowLength = 137 /* LastToken */ + 1;
                 this.map = new Array(this.mapRowLength * this.mapRowLength); //new Array<RulesBucket>(this.mapRowLength * this.mapRowLength);
                 // This array is used only during construction of the rulesbucket in the map
                 var rulesBucketConstructionStateList = new Array(this.map.length); //new Array<RulesBucketConstructionState>(this.map.length);
@@ -44088,7 +47456,7 @@ var ts;
                 }
                 TokenAllAccess.prototype.GetTokens = function () {
                     var result = [];
-                    for (var token = 0 /* FirstToken */; token <= 135 /* LastToken */; token++) {
+                    for (var token = 0 /* FirstToken */; token <= 137 /* LastToken */; token++) {
                         result.push(token);
                     }
                     return result;
@@ -44130,9 +47498,9 @@ var ts;
                 };
                 TokenRange.Any = TokenRange.AllTokens();
                 TokenRange.AnyIncludingMultilineComments = TokenRange.FromTokens(TokenRange.Any.GetTokens().concat([3 /* MultiLineCommentTrivia */]));
-                TokenRange.Keywords = TokenRange.FromRange(70 /* FirstKeyword */, 135 /* LastKeyword */);
+                TokenRange.Keywords = TokenRange.FromRange(70 /* FirstKeyword */, 137 /* LastKeyword */);
                 TokenRange.BinaryOperators = TokenRange.FromRange(25 /* FirstBinaryOperator */, 68 /* LastBinaryOperator */);
-                TokenRange.BinaryKeywordOperators = TokenRange.FromTokens([90 /* InKeyword */, 91 /* InstanceOfKeyword */, 135 /* OfKeyword */, 116 /* AsKeyword */, 124 /* IsKeyword */]);
+                TokenRange.BinaryKeywordOperators = TokenRange.FromTokens([90 /* InKeyword */, 91 /* InstanceOfKeyword */, 137 /* OfKeyword */, 116 /* AsKeyword */, 124 /* IsKeyword */]);
                 TokenRange.UnaryPrefixOperators = TokenRange.FromTokens([41 /* PlusPlusToken */, 42 /* MinusMinusToken */, 50 /* TildeToken */, 49 /* ExclamationToken */]);
                 TokenRange.UnaryPrefixExpressions = TokenRange.FromTokens([8 /* NumericLiteral */, 69 /* Identifier */, 17 /* OpenParenToken */, 19 /* OpenBracketToken */, 15 /* OpenBraceToken */, 97 /* ThisKeyword */, 92 /* NewKeyword */]);
                 TokenRange.UnaryPreincrementExpressions = TokenRange.FromTokens([69 /* Identifier */, 17 /* OpenParenToken */, 97 /* ThisKeyword */, 92 /* NewKeyword */]);
@@ -44140,7 +47508,7 @@ var ts;
                 TokenRange.UnaryPredecrementExpressions = TokenRange.FromTokens([69 /* Identifier */, 17 /* OpenParenToken */, 97 /* ThisKeyword */, 92 /* NewKeyword */]);
                 TokenRange.UnaryPostdecrementExpressions = TokenRange.FromTokens([69 /* Identifier */, 18 /* CloseParenToken */, 20 /* CloseBracketToken */, 92 /* NewKeyword */]);
                 TokenRange.Comments = TokenRange.FromTokens([2 /* SingleLineCommentTrivia */, 3 /* MultiLineCommentTrivia */]);
-                TokenRange.TypeNames = TokenRange.FromTokens([69 /* Identifier */, 128 /* NumberKeyword */, 130 /* StringKeyword */, 120 /* BooleanKeyword */, 131 /* SymbolKeyword */, 103 /* VoidKeyword */, 117 /* AnyKeyword */]);
+                TokenRange.TypeNames = TokenRange.FromTokens([69 /* Identifier */, 129 /* NumberKeyword */, 131 /* StringKeyword */, 120 /* BooleanKeyword */, 132 /* SymbolKeyword */, 103 /* VoidKeyword */, 117 /* AnyKeyword */]);
                 return TokenRange;
             }());
             Shared.TokenRange = TokenRange;
@@ -44283,12 +47651,20 @@ var ts;
             if (line === 0) {
                 return [];
             }
-            // get the span for the previous\current line
+            // After the enter key, the cursor is now at a new line. The new line may or may not contain non-whitespace characters.
+            // If the new line has only whitespaces, we won't want to format this line, because that would remove the indentation as
+            // trailing whitespaces. So the end of the formatting span should be the later one between:
+            //  1. the end of the previous line
+            //  2. the last non-whitespace character in the current line
+            var endOfFormatSpan = ts.getEndLinePosition(line, sourceFile);
+            while (ts.isWhiteSpace(sourceFile.text.charCodeAt(endOfFormatSpan)) && !ts.isLineBreak(sourceFile.text.charCodeAt(endOfFormatSpan))) {
+                endOfFormatSpan--;
+            }
             var span = {
                 // get start position for the previous line
                 pos: ts.getStartPositionOfLine(line - 1, sourceFile),
-                // get end position for the current line (end value is exclusive so add 1 to the result)
-                end: ts.getEndLinePosition(line, sourceFile) + 1
+                // end value is exclusive so add 1 to the result
+                end: endOfFormatSpan + 1
             };
             return formatSpan(span, sourceFile, options, rulesProvider, 2 /* FormatOnEnter */);
         }
@@ -44362,17 +47738,17 @@ var ts;
         // i.e. parent is class declaration with the list of members and node is one of members.
         function isListElement(parent, node) {
             switch (parent.kind) {
-                case 217 /* ClassDeclaration */:
-                case 218 /* InterfaceDeclaration */:
+                case 220 /* ClassDeclaration */:
+                case 221 /* InterfaceDeclaration */:
                     return ts.rangeContainsRange(parent.members, node);
-                case 221 /* ModuleDeclaration */:
+                case 224 /* ModuleDeclaration */:
                     var body = parent.body;
-                    return body && body.kind === 195 /* Block */ && ts.rangeContainsRange(body.statements, node);
-                case 251 /* SourceFile */:
-                case 195 /* Block */:
-                case 222 /* ModuleBlock */:
+                    return body && body.kind === 198 /* Block */ && ts.rangeContainsRange(body.statements, node);
+                case 255 /* SourceFile */:
+                case 198 /* Block */:
+                case 225 /* ModuleBlock */:
                     return ts.rangeContainsRange(parent.statements, node);
-                case 247 /* CatchClause */:
+                case 251 /* CatchClause */:
                     return ts.rangeContainsRange(parent.block.statements, node);
             }
             return false;
@@ -44446,7 +47822,7 @@ var ts;
                 // no preceding token found - start from the beginning of enclosing node
                 return enclosingNode.pos;
             }
-            // preceding token ends after the start of original range (i.e when originaRange.pos falls in the middle of literal)
+            // preceding token ends after the start of original range (i.e when originalRange.pos falls in the middle of literal)
             // start from the beginning of enclosingNode to handle the entire 'originalRange'
             if (precedingToken.end >= originalRange.pos) {
                 return enclosingNode.pos;
@@ -44574,19 +47950,19 @@ var ts;
                     return node.modifiers[0].kind;
                 }
                 switch (node.kind) {
-                    case 217 /* ClassDeclaration */: return 73 /* ClassKeyword */;
-                    case 218 /* InterfaceDeclaration */: return 107 /* InterfaceKeyword */;
-                    case 216 /* FunctionDeclaration */: return 87 /* FunctionKeyword */;
-                    case 220 /* EnumDeclaration */: return 220 /* EnumDeclaration */;
-                    case 146 /* GetAccessor */: return 123 /* GetKeyword */;
-                    case 147 /* SetAccessor */: return 129 /* SetKeyword */;
-                    case 144 /* MethodDeclaration */:
+                    case 220 /* ClassDeclaration */: return 73 /* ClassKeyword */;
+                    case 221 /* InterfaceDeclaration */: return 107 /* InterfaceKeyword */;
+                    case 219 /* FunctionDeclaration */: return 87 /* FunctionKeyword */;
+                    case 223 /* EnumDeclaration */: return 223 /* EnumDeclaration */;
+                    case 148 /* GetAccessor */: return 123 /* GetKeyword */;
+                    case 149 /* SetAccessor */: return 130 /* SetKeyword */;
+                    case 146 /* MethodDeclaration */:
                         if (node.asteriskToken) {
                             return 37 /* AsteriskToken */;
                         }
                     // fall-through
-                    case 142 /* PropertyDeclaration */:
-                    case 139 /* Parameter */:
+                    case 144 /* PropertyDeclaration */:
+                    case 141 /* Parameter */:
                         return node.name.kind;
                 }
             }
@@ -44726,7 +48102,7 @@ var ts;
                         consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation, child);
                         return inheritedIndentation;
                     }
-                    var effectiveParentStartLine = child.kind === 140 /* Decorator */ ? childStartLine : undecoratedParentStartLine;
+                    var effectiveParentStartLine = child.kind === 142 /* Decorator */ ? childStartLine : undecoratedParentStartLine;
                     var childIndentation = computeIndentation(child, childStartLine, childIndentationAmount, node, parentDynamicIndentation, effectiveParentStartLine);
                     processNode(child, childContextNode, childStartLine, undecoratedChildStartLine, childIndentation.indentation, childIndentation.delta);
                     childContextNode = node;
@@ -44759,8 +48135,8 @@ var ts;
                         }
                     }
                     var inheritedIndentation = -1 /* Unknown */;
-                    for (var _i = 0, nodes_6 = nodes; _i < nodes_6.length; _i++) {
-                        var child = nodes_6[_i];
+                    for (var _i = 0, nodes_7 = nodes; _i < nodes_7.length; _i++) {
+                        var child = nodes_7[_i];
                         inheritedIndentation = processChildNode(child, inheritedIndentation, node, listDynamicIndentation, startLine, startLine, /*isListElement*/ true);
                     }
                     if (listEndToken !== 0 /* Unknown */) {
@@ -45070,20 +48446,20 @@ var ts;
         }
         function isSomeBlock(kind) {
             switch (kind) {
-                case 195 /* Block */:
-                case 222 /* ModuleBlock */:
+                case 198 /* Block */:
+                case 225 /* ModuleBlock */:
                     return true;
             }
             return false;
         }
         function getOpenTokenForList(node, list) {
             switch (node.kind) {
-                case 145 /* Constructor */:
-                case 216 /* FunctionDeclaration */:
-                case 176 /* FunctionExpression */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
-                case 177 /* ArrowFunction */:
+                case 147 /* Constructor */:
+                case 219 /* FunctionDeclaration */:
+                case 178 /* FunctionExpression */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
+                case 179 /* ArrowFunction */:
                     if (node.typeParameters === list) {
                         return 25 /* LessThanToken */;
                     }
@@ -45091,8 +48467,8 @@ var ts;
                         return 17 /* OpenParenToken */;
                     }
                     break;
-                case 171 /* CallExpression */:
-                case 172 /* NewExpression */:
+                case 173 /* CallExpression */:
+                case 174 /* NewExpression */:
                     if (node.typeArguments === list) {
                         return 25 /* LessThanToken */;
                     }
@@ -45100,7 +48476,7 @@ var ts;
                         return 17 /* OpenParenToken */;
                     }
                     break;
-                case 152 /* TypeReference */:
+                case 154 /* TypeReference */:
                     if (node.typeArguments === list) {
                         return 25 /* LessThanToken */;
                     }
@@ -45129,7 +48505,7 @@ var ts;
             if (!options.ConvertTabsToSpaces) {
                 var tabs = Math.floor(indentation / options.TabSize);
                 var spaces = indentation - tabs * options.TabSize;
-                var tabString;
+                var tabString = void 0;
                 if (!internedTabsIndentation) {
                     internedTabsIndentation = [];
                 }
@@ -45142,7 +48518,7 @@ var ts;
                 return spaces ? tabString + repeat(" ", spaces) : tabString;
             }
             else {
-                var spacesString;
+                var spacesString = void 0;
                 var quotient = Math.floor(indentation / options.IndentSize);
                 var remainder = indentation % options.IndentSize;
                 if (!internedSpacesIndentation) {
@@ -45216,7 +48592,7 @@ var ts;
                     var lineStart = ts.getLineStartPositionForPosition(current_1, sourceFile);
                     return SmartIndenter.findFirstNonWhitespaceColumn(lineStart, current_1, sourceFile, options);
                 }
-                if (precedingToken.kind === 24 /* CommaToken */ && precedingToken.parent.kind !== 184 /* BinaryExpression */) {
+                if (precedingToken.kind === 24 /* CommaToken */ && precedingToken.parent.kind !== 186 /* BinaryExpression */) {
                     // previous token is comma that separates items in list - find the previous item and try to derive indentation from it
                     var actualIndentation = getActualIndentationForListItemBeforeComma(precedingToken, sourceFile, options);
                     if (actualIndentation !== -1 /* Unknown */) {
@@ -45335,7 +48711,7 @@ var ts;
                 // - 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
                 var useActualIndentation = (ts.isDeclaration(current) || ts.isStatement(current)) &&
-                    (parent.kind === 251 /* SourceFile */ || !parentAndChildShareLine);
+                    (parent.kind === 255 /* SourceFile */ || !parentAndChildShareLine);
                 if (!useActualIndentation) {
                     return -1 /* Unknown */;
                 }
@@ -45368,7 +48744,7 @@ var ts;
                 return sourceFile.getLineAndCharacterOfPosition(n.getStart(sourceFile));
             }
             function childStartsOnTheSameLineWithElseInIfStatement(parent, child, childStartLine, sourceFile) {
-                if (parent.kind === 199 /* IfStatement */ && parent.elseStatement === child) {
+                if (parent.kind === 202 /* IfStatement */ && parent.elseStatement === child) {
                     var elseKeyword = ts.findChildOfKind(parent, 80 /* ElseKeyword */, sourceFile);
                     ts.Debug.assert(elseKeyword !== undefined);
                     var elseKeywordStartLine = getStartLineAndCharacterForNode(elseKeyword, sourceFile).line;
@@ -45380,23 +48756,23 @@ var ts;
             function getContainingList(node, sourceFile) {
                 if (node.parent) {
                     switch (node.parent.kind) {
-                        case 152 /* TypeReference */:
+                        case 154 /* TypeReference */:
                             if (node.parent.typeArguments &&
                                 ts.rangeContainsStartEnd(node.parent.typeArguments, node.getStart(sourceFile), node.getEnd())) {
                                 return node.parent.typeArguments;
                             }
                             break;
-                        case 168 /* ObjectLiteralExpression */:
+                        case 170 /* ObjectLiteralExpression */:
                             return node.parent.properties;
-                        case 167 /* ArrayLiteralExpression */:
+                        case 169 /* ArrayLiteralExpression */:
                             return node.parent.elements;
-                        case 216 /* FunctionDeclaration */:
-                        case 176 /* FunctionExpression */:
-                        case 177 /* ArrowFunction */:
-                        case 144 /* MethodDeclaration */:
-                        case 143 /* MethodSignature */:
-                        case 148 /* CallSignature */:
-                        case 149 /* ConstructSignature */: {
+                        case 219 /* FunctionDeclaration */:
+                        case 178 /* FunctionExpression */:
+                        case 179 /* ArrowFunction */:
+                        case 146 /* MethodDeclaration */:
+                        case 145 /* MethodSignature */:
+                        case 150 /* CallSignature */:
+                        case 151 /* ConstructSignature */: {
                             var start = node.getStart(sourceFile);
                             if (node.parent.typeParameters &&
                                 ts.rangeContainsStartEnd(node.parent.typeParameters, start, node.getEnd())) {
@@ -45407,8 +48783,8 @@ var ts;
                             }
                             break;
                         }
-                        case 172 /* NewExpression */:
-                        case 171 /* CallExpression */: {
+                        case 174 /* NewExpression */:
+                        case 173 /* CallExpression */: {
                             var start = node.getStart(sourceFile);
                             if (node.parent.typeArguments &&
                                 ts.rangeContainsStartEnd(node.parent.typeArguments, start, node.getEnd())) {
@@ -45438,8 +48814,8 @@ var ts;
                 if (node.kind === 18 /* CloseParenToken */) {
                     return -1 /* Unknown */;
                 }
-                if (node.parent && (node.parent.kind === 171 /* CallExpression */ ||
-                    node.parent.kind === 172 /* NewExpression */) &&
+                if (node.parent && (node.parent.kind === 173 /* CallExpression */ ||
+                    node.parent.kind === 174 /* NewExpression */) &&
                     node.parent.expression !== node) {
                     var fullCallOrNewExpression = node.parent.expression;
                     var startingExpression = getStartingExpression(fullCallOrNewExpression);
@@ -45457,10 +48833,10 @@ var ts;
                 function getStartingExpression(node) {
                     while (true) {
                         switch (node.kind) {
-                            case 171 /* CallExpression */:
-                            case 172 /* NewExpression */:
-                            case 169 /* PropertyAccessExpression */:
-                            case 170 /* ElementAccessExpression */:
+                            case 173 /* CallExpression */:
+                            case 174 /* NewExpression */:
+                            case 171 /* PropertyAccessExpression */:
+                            case 172 /* ElementAccessExpression */:
                                 node = node.expression;
                                 break;
                             default:
@@ -45524,45 +48900,45 @@ var ts;
             SmartIndenter.findFirstNonWhitespaceColumn = findFirstNonWhitespaceColumn;
             function nodeContentIsAlwaysIndented(kind) {
                 switch (kind) {
-                    case 198 /* ExpressionStatement */:
-                    case 217 /* ClassDeclaration */:
-                    case 189 /* ClassExpression */:
-                    case 218 /* InterfaceDeclaration */:
-                    case 220 /* EnumDeclaration */:
-                    case 219 /* TypeAliasDeclaration */:
-                    case 167 /* ArrayLiteralExpression */:
-                    case 195 /* Block */:
-                    case 222 /* ModuleBlock */:
-                    case 168 /* ObjectLiteralExpression */:
-                    case 156 /* TypeLiteral */:
-                    case 158 /* TupleType */:
-                    case 223 /* CaseBlock */:
-                    case 245 /* DefaultClause */:
-                    case 244 /* CaseClause */:
-                    case 175 /* ParenthesizedExpression */:
-                    case 169 /* PropertyAccessExpression */:
-                    case 171 /* CallExpression */:
-                    case 172 /* NewExpression */:
-                    case 196 /* VariableStatement */:
-                    case 214 /* VariableDeclaration */:
-                    case 230 /* ExportAssignment */:
-                    case 207 /* ReturnStatement */:
-                    case 185 /* ConditionalExpression */:
-                    case 165 /* ArrayBindingPattern */:
-                    case 164 /* ObjectBindingPattern */:
-                    case 238 /* JsxOpeningElement */:
-                    case 237 /* JsxSelfClosingElement */:
-                    case 243 /* JsxExpression */:
-                    case 143 /* MethodSignature */:
-                    case 148 /* CallSignature */:
-                    case 149 /* ConstructSignature */:
-                    case 139 /* Parameter */:
-                    case 153 /* FunctionType */:
-                    case 154 /* ConstructorType */:
-                    case 161 /* ParenthesizedType */:
-                    case 173 /* TaggedTemplateExpression */:
-                    case 181 /* AwaitExpression */:
-                    case 228 /* NamedImports */:
+                    case 201 /* ExpressionStatement */:
+                    case 220 /* ClassDeclaration */:
+                    case 191 /* ClassExpression */:
+                    case 221 /* InterfaceDeclaration */:
+                    case 223 /* EnumDeclaration */:
+                    case 222 /* TypeAliasDeclaration */:
+                    case 169 /* ArrayLiteralExpression */:
+                    case 198 /* Block */:
+                    case 225 /* ModuleBlock */:
+                    case 170 /* ObjectLiteralExpression */:
+                    case 158 /* TypeLiteral */:
+                    case 160 /* TupleType */:
+                    case 226 /* CaseBlock */:
+                    case 249 /* DefaultClause */:
+                    case 248 /* CaseClause */:
+                    case 177 /* ParenthesizedExpression */:
+                    case 171 /* PropertyAccessExpression */:
+                    case 173 /* CallExpression */:
+                    case 174 /* NewExpression */:
+                    case 199 /* VariableStatement */:
+                    case 217 /* VariableDeclaration */:
+                    case 234 /* ExportAssignment */:
+                    case 210 /* ReturnStatement */:
+                    case 187 /* ConditionalExpression */:
+                    case 167 /* ArrayBindingPattern */:
+                    case 166 /* ObjectBindingPattern */:
+                    case 242 /* JsxOpeningElement */:
+                    case 241 /* JsxSelfClosingElement */:
+                    case 247 /* JsxExpression */:
+                    case 145 /* MethodSignature */:
+                    case 150 /* CallSignature */:
+                    case 151 /* ConstructSignature */:
+                    case 141 /* Parameter */:
+                    case 155 /* FunctionType */:
+                    case 156 /* ConstructorType */:
+                    case 163 /* ParenthesizedType */:
+                    case 175 /* TaggedTemplateExpression */:
+                    case 183 /* AwaitExpression */:
+                    case 232 /* NamedImports */:
                         return true;
                 }
                 return false;
@@ -45571,22 +48947,22 @@ var ts;
             function nodeWillIndentChild(parent, child, indentByDefault) {
                 var childKind = child ? child.kind : 0 /* Unknown */;
                 switch (parent.kind) {
-                    case 200 /* DoStatement */:
-                    case 201 /* WhileStatement */:
-                    case 203 /* ForInStatement */:
-                    case 204 /* ForOfStatement */:
-                    case 202 /* ForStatement */:
-                    case 199 /* IfStatement */:
-                    case 216 /* FunctionDeclaration */:
-                    case 176 /* FunctionExpression */:
-                    case 144 /* MethodDeclaration */:
-                    case 177 /* ArrowFunction */:
-                    case 145 /* Constructor */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
-                        return childKind !== 195 /* Block */;
-                    case 236 /* JsxElement */:
-                        return childKind !== 240 /* JsxClosingElement */;
+                    case 203 /* DoStatement */:
+                    case 204 /* WhileStatement */:
+                    case 206 /* ForInStatement */:
+                    case 207 /* ForOfStatement */:
+                    case 205 /* ForStatement */:
+                    case 202 /* IfStatement */:
+                    case 219 /* FunctionDeclaration */:
+                    case 178 /* FunctionExpression */:
+                    case 146 /* MethodDeclaration */:
+                    case 179 /* ArrowFunction */:
+                    case 147 /* Constructor */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
+                        return childKind !== 198 /* Block */;
+                    case 240 /* JsxElement */:
+                        return childKind !== 244 /* JsxClosingElement */;
                 }
                 // No explicit rule for given nodes so the result will follow the default value argument
                 return indentByDefault;
@@ -45603,11 +48979,6 @@ var ts;
     })(formatting = ts.formatting || (ts.formatting = {}));
 })(ts || (ts = {}));
 /// <reference path="..\compiler\program.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 __());
-};
 /// <reference path='breakpoints.ts' />
 /// <reference path='outliningElementsCollector.ts' />
 /// <reference path='navigateTo.ts' />
@@ -45615,6 +48986,7 @@ var __extends = (this && this.__extends) || function (d, b) {
 /// <reference path='patternMatcher.ts' />
 /// <reference path='signatureHelp.ts' />
 /// <reference path='utilities.ts' />
+/// <reference path='jsTyping.ts' />
 /// <reference path='formatting\formatting.ts' />
 /// <reference path='formatting\smartIndenter.ts' />
 var ts;
@@ -45732,17 +49104,17 @@ var ts;
             while (pos < end) {
                 var token = scanner.scan();
                 var textPos = scanner.getTextPos();
-                nodes.push(createNode(token, pos, textPos, 2048 /* Synthetic */, this));
+                nodes.push(createNode(token, pos, textPos, 0, this));
                 pos = textPos;
             }
             return pos;
         };
         NodeObject.prototype.createSyntaxList = function (nodes) {
-            var list = createNode(274 /* SyntaxList */, nodes.pos, nodes.end, 2048 /* Synthetic */, this);
+            var list = createNode(278 /* SyntaxList */, nodes.pos, nodes.end, 0, this);
             list._children = [];
             var pos = nodes.pos;
-            for (var _i = 0, nodes_7 = nodes; _i < nodes_7.length; _i++) {
-                var node = nodes_7[_i];
+            for (var _i = 0, nodes_8 = nodes; _i < nodes_8.length; _i++) {
+                var node = nodes_8[_i];
                 if (pos < node.pos) {
                     pos = this.addSyntheticNodes(list._children, pos, node.pos);
                 }
@@ -45757,27 +49129,27 @@ var ts;
         NodeObject.prototype.createChildren = function (sourceFile) {
             var _this = this;
             var children;
-            if (this.kind >= 136 /* FirstNode */) {
+            if (this.kind >= 138 /* FirstNode */) {
                 scanner.setText((sourceFile || this.getSourceFile()).text);
                 children = [];
-                var pos = this.pos;
+                var pos_3 = this.pos;
                 var processNode = function (node) {
-                    if (pos < node.pos) {
-                        pos = _this.addSyntheticNodes(children, pos, node.pos);
+                    if (pos_3 < node.pos) {
+                        pos_3 = _this.addSyntheticNodes(children, pos_3, node.pos);
                     }
                     children.push(node);
-                    pos = node.end;
+                    pos_3 = node.end;
                 };
                 var processNodes = function (nodes) {
-                    if (pos < nodes.pos) {
-                        pos = _this.addSyntheticNodes(children, pos, nodes.pos);
+                    if (pos_3 < nodes.pos) {
+                        pos_3 = _this.addSyntheticNodes(children, pos_3, nodes.pos);
                     }
                     children.push(_this.createSyntaxList(nodes));
-                    pos = nodes.end;
+                    pos_3 = nodes.end;
                 };
                 ts.forEachChild(this, processNode, processNodes);
-                if (pos < this.end) {
-                    this.addSyntheticNodes(children, pos, this.end);
+                if (pos_3 < this.end) {
+                    this.addSyntheticNodes(children, pos_3, this.end);
                 }
                 scanner.setText(undefined);
             }
@@ -45804,7 +49176,7 @@ var ts;
                 return undefined;
             }
             var child = children[0];
-            return child.kind < 136 /* FirstNode */ ? child : child.getFirstToken(sourceFile);
+            return child.kind < 138 /* FirstNode */ ? child : child.getFirstToken(sourceFile);
         };
         NodeObject.prototype.getLastToken = function (sourceFile) {
             var children = this.getChildren(sourceFile);
@@ -45812,7 +49184,7 @@ var ts;
             if (!child) {
                 return undefined;
             }
-            return child.kind < 136 /* FirstNode */ ? child : child.getLastToken(sourceFile);
+            return child.kind < 138 /* FirstNode */ ? child : child.getLastToken(sourceFile);
         };
         return NodeObject;
     }());
@@ -45859,27 +49231,27 @@ var ts;
                 // The property length will have two declarations of property length coming
                 // from Array<T> - Array<string> and Array<number>
                 if (ts.indexOf(declarations, declaration) === indexOfDeclaration) {
-                    var sourceFileOfDeclaration = ts.getSourceFileOfNode(declaration);
+                    var sourceFileOfDeclaration_1 = ts.getSourceFileOfNode(declaration);
                     // If it is parameter - try and get the jsDoc comment with @param tag from function declaration's jsDoc comments
-                    if (canUseParsedParamTagComments && declaration.kind === 139 /* Parameter */) {
-                        ts.forEach(getJsDocCommentTextRange(declaration.parent, sourceFileOfDeclaration), function (jsDocCommentTextRange) {
-                            var cleanedParamJsDocComment = getCleanedParamJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration);
+                    if (canUseParsedParamTagComments && declaration.kind === 141 /* Parameter */) {
+                        ts.forEach(getJsDocCommentTextRange(declaration.parent, sourceFileOfDeclaration_1), function (jsDocCommentTextRange) {
+                            var cleanedParamJsDocComment = getCleanedParamJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration_1);
                             if (cleanedParamJsDocComment) {
                                 ts.addRange(jsDocCommentParts, cleanedParamJsDocComment);
                             }
                         });
                     }
                     // If this is left side of dotted module declaration, there is no doc comments associated with this node
-                    if (declaration.kind === 221 /* ModuleDeclaration */ && declaration.body.kind === 221 /* ModuleDeclaration */) {
+                    if (declaration.kind === 224 /* ModuleDeclaration */ && declaration.body.kind === 224 /* ModuleDeclaration */) {
                         return;
                     }
                     // If this is dotted module name, get the doc comments from the parent
-                    while (declaration.kind === 221 /* ModuleDeclaration */ && declaration.parent.kind === 221 /* ModuleDeclaration */) {
+                    while (declaration.kind === 224 /* ModuleDeclaration */ && declaration.parent.kind === 224 /* ModuleDeclaration */) {
                         declaration = declaration.parent;
                     }
                     // Get the cleaned js doc comment text from the declaration
-                    ts.forEach(getJsDocCommentTextRange(declaration.kind === 214 /* VariableDeclaration */ ? declaration.parent.parent : declaration, sourceFileOfDeclaration), function (jsDocCommentTextRange) {
-                        var cleanedJsDocComment = getCleanedJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration);
+                    ts.forEach(getJsDocCommentTextRange(declaration.kind === 217 /* VariableDeclaration */ ? declaration.parent.parent : declaration, sourceFileOfDeclaration_1), function (jsDocCommentTextRange) {
+                        var cleanedJsDocComment = getCleanedJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration_1);
                         if (cleanedJsDocComment) {
                             ts.addRange(jsDocCommentParts, cleanedJsDocComment);
                         }
@@ -45953,7 +49325,7 @@ var ts;
                     else if (spacesToRemoveAfterAsterisk === undefined) {
                         spacesToRemoveAfterAsterisk = 0;
                     }
-                    // Analyse text on this line
+                    // Analyze text on this line
                     while (pos < end && !ts.isLineBreak(sourceFile.text.charCodeAt(pos))) {
                         var ch = sourceFile.text.charAt(pos);
                         if (ch === "@") {
@@ -46073,7 +49445,7 @@ var ts;
                             }
                             paramHelpStringMargin = undefined;
                         }
-                        // If this is the start of another tag, continue with the loop in seach of param tag with symbol name
+                        // If this is the start of another tag, continue with the loop in search of param tag with symbol name
                         if (sourceFile.text.charCodeAt(pos) === 64 /* at */) {
                             continue;
                         }
@@ -46223,9 +49595,9 @@ var ts;
                     if (result_2 !== undefined) {
                         return result_2;
                     }
-                    if (declaration.name.kind === 137 /* ComputedPropertyName */) {
+                    if (declaration.name.kind === 139 /* ComputedPropertyName */) {
                         var expr = declaration.name.expression;
-                        if (expr.kind === 169 /* PropertyAccessExpression */) {
+                        if (expr.kind === 171 /* PropertyAccessExpression */) {
                             return expr.name.text;
                         }
                         return getTextOfIdentifierOrLiteral(expr);
@@ -46245,9 +49617,9 @@ var ts;
             }
             function visit(node) {
                 switch (node.kind) {
-                    case 216 /* FunctionDeclaration */:
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
+                    case 219 /* FunctionDeclaration */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
                         var functionDeclaration = node;
                         var declarationName = getDeclarationName(functionDeclaration);
                         if (declarationName) {
@@ -46267,60 +49639,60 @@ var ts;
                             ts.forEachChild(node, visit);
                         }
                         break;
-                    case 217 /* ClassDeclaration */:
-                    case 218 /* InterfaceDeclaration */:
-                    case 219 /* TypeAliasDeclaration */:
-                    case 220 /* EnumDeclaration */:
-                    case 221 /* ModuleDeclaration */:
-                    case 224 /* ImportEqualsDeclaration */:
-                    case 233 /* ExportSpecifier */:
-                    case 229 /* ImportSpecifier */:
-                    case 224 /* ImportEqualsDeclaration */:
-                    case 226 /* ImportClause */:
-                    case 227 /* NamespaceImport */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
-                    case 156 /* TypeLiteral */:
+                    case 220 /* ClassDeclaration */:
+                    case 221 /* InterfaceDeclaration */:
+                    case 222 /* TypeAliasDeclaration */:
+                    case 223 /* EnumDeclaration */:
+                    case 224 /* ModuleDeclaration */:
+                    case 228 /* ImportEqualsDeclaration */:
+                    case 237 /* ExportSpecifier */:
+                    case 233 /* ImportSpecifier */:
+                    case 228 /* ImportEqualsDeclaration */:
+                    case 230 /* ImportClause */:
+                    case 231 /* NamespaceImport */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
+                    case 158 /* TypeLiteral */:
                         addDeclaration(node);
                     // fall through
-                    case 145 /* Constructor */:
-                    case 196 /* VariableStatement */:
-                    case 215 /* VariableDeclarationList */:
-                    case 164 /* ObjectBindingPattern */:
-                    case 165 /* ArrayBindingPattern */:
-                    case 222 /* ModuleBlock */:
+                    case 147 /* Constructor */:
+                    case 199 /* VariableStatement */:
+                    case 218 /* VariableDeclarationList */:
+                    case 166 /* ObjectBindingPattern */:
+                    case 167 /* ArrayBindingPattern */:
+                    case 225 /* ModuleBlock */:
                         ts.forEachChild(node, visit);
                         break;
-                    case 195 /* Block */:
+                    case 198 /* Block */:
                         if (ts.isFunctionBlock(node)) {
                             ts.forEachChild(node, visit);
                         }
                         break;
-                    case 139 /* Parameter */:
+                    case 141 /* Parameter */:
                         // Only consider properties defined as constructor parameters
-                        if (!(node.flags & 56 /* AccessibilityModifier */)) {
+                        if (!(node.flags & 28 /* AccessibilityModifier */)) {
                             break;
                         }
                     // fall through
-                    case 214 /* VariableDeclaration */:
-                    case 166 /* BindingElement */:
+                    case 217 /* VariableDeclaration */:
+                    case 168 /* BindingElement */:
                         if (ts.isBindingPattern(node.name)) {
                             ts.forEachChild(node.name, visit);
                             break;
                         }
-                    case 250 /* EnumMember */:
-                    case 142 /* PropertyDeclaration */:
-                    case 141 /* PropertySignature */:
+                    case 254 /* EnumMember */:
+                    case 144 /* PropertyDeclaration */:
+                    case 143 /* PropertySignature */:
                         addDeclaration(node);
                         break;
-                    case 231 /* ExportDeclaration */:
+                    case 235 /* ExportDeclaration */:
                         // Handle named exports case e.g.:
                         //    export {a, b as B} from "mod";
                         if (node.exportClause) {
                             ts.forEach(node.exportClause.elements, visit);
                         }
                         break;
-                    case 225 /* ImportDeclaration */:
+                    case 229 /* ImportDeclaration */:
                         var importClause = node.importClause;
                         if (importClause) {
                             // Handle default import case e.g.:
@@ -46332,7 +49704,7 @@ var ts;
                             //    import * as NS from "mod";
                             //    import {a, b as B} from "mod";
                             if (importClause.namedBindings) {
-                                if (importClause.namedBindings.kind === 227 /* NamespaceImport */) {
+                                if (importClause.namedBindings.kind === 231 /* NamespaceImport */) {
                                     addDeclaration(importClause.namedBindings);
                                 }
                                 else {
@@ -46554,16 +49926,16 @@ var ts;
         }
         return ts.forEach(symbol.declarations, function (declaration) {
             // Function expressions are local
-            if (declaration.kind === 176 /* FunctionExpression */) {
+            if (declaration.kind === 178 /* FunctionExpression */) {
                 return true;
             }
-            if (declaration.kind !== 214 /* VariableDeclaration */ && declaration.kind !== 216 /* FunctionDeclaration */) {
+            if (declaration.kind !== 217 /* VariableDeclaration */ && declaration.kind !== 219 /* FunctionDeclaration */) {
                 return false;
             }
             // If the parent is not sourceFile or module block it is local variable
-            for (var parent_9 = declaration.parent; !ts.isFunctionBlock(parent_9); parent_9 = parent_9.parent) {
+            for (var parent_12 = declaration.parent; !ts.isFunctionBlock(parent_12); parent_12 = parent_12.parent) {
                 // Reached source file or module block
-                if (parent_9.kind === 251 /* SourceFile */ || parent_9.kind === 222 /* ModuleBlock */) {
+                if (parent_12.kind === 255 /* SourceFile */ || parent_12.kind === 225 /* ModuleBlock */) {
                     return false;
                 }
             }
@@ -46575,7 +49947,6 @@ var ts;
         // Always default to "ScriptTarget.ES5" for the language service
         return {
             target: 1 /* ES5 */,
-            module: 0 /* None */,
             jsx: 1 /* Preserve */
         };
     }
@@ -46609,7 +49980,8 @@ var ts;
                 entry = {
                     hostFileName: fileName,
                     version: this.host.getScriptVersion(fileName),
-                    scriptSnapshot: scriptSnapshot
+                    scriptSnapshot: scriptSnapshot,
+                    scriptKind: ts.getScriptKind(fileName, this.host)
                 };
             }
             this.fileNameToEntry.set(path, entry);
@@ -46657,11 +50029,12 @@ var ts;
                 // The host does not know about this file.
                 throw new Error("Could not find file: '" + fileName + "'.");
             }
+            var scriptKind = ts.getScriptKind(fileName, this.host);
             var version = this.host.getScriptVersion(fileName);
             var sourceFile;
             if (this.currentFileName !== fileName) {
                 // This is a new file, just parse it
-                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 2 /* Latest */, version, /*setNodeParents*/ true);
+                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 2 /* Latest */, version, /*setNodeParents*/ true, scriptKind);
             }
             else if (this.currentFileVersion !== version) {
                 // This is the same file, just a newer version. Incrementally parse the file.
@@ -46695,6 +50068,8 @@ var ts;
     function transpileModule(input, transpileOptions) {
         var options = transpileOptions.compilerOptions ? ts.clone(transpileOptions.compilerOptions) : getDefaultCompilerOptions();
         options.isolatedModules = true;
+        // transpileModule does not write anything to disk so there is no need to verify that there are no conflicts between input and output paths. 
+        options.suppressOutputPathCheck = true;
         // Filename can be non-ts file.
         options.allowNonTsExtensions = true;
         // We are not returning a sourceFile for lib file when asked by the program,
@@ -46759,12 +50134,10 @@ var ts;
         return output.outputText;
     }
     ts.transpile = transpile;
-    function createLanguageServiceSourceFile(fileName, scriptSnapshot, scriptTarget, version, setNodeParents) {
+    function createLanguageServiceSourceFile(fileName, scriptSnapshot, scriptTarget, version, setNodeParents, scriptKind) {
         var text = scriptSnapshot.getText(0, scriptSnapshot.getLength());
-        var sourceFile = ts.createSourceFile(fileName, text, scriptTarget, setNodeParents);
+        var sourceFile = ts.createSourceFile(fileName, text, scriptTarget, setNodeParents, scriptKind);
         setSourceFileFields(sourceFile, scriptSnapshot, version);
-        // after full parsing we can use table with interned strings as name table
-        sourceFile.nameTable = sourceFile.identifiers;
         return sourceFile;
     }
     ts.createLanguageServiceSourceFile = createLanguageServiceSourceFile;
@@ -46776,7 +50149,7 @@ var ts;
             if (version !== sourceFile.version) {
                 // Once incremental parsing is ready, then just call into this function.
                 if (!ts.disableIncrementalParsing) {
-                    var newText;
+                    var newText = void 0;
                     // grab the fragment from the beginning of the original text to the beginning of the span
                     var prefix = textChangeRange.span.start !== 0
                         ? sourceFile.text.substr(0, textChangeRange.span.start)
@@ -46816,7 +50189,7 @@ var ts;
             }
         }
         // Otherwise, just create a new source file.
-        return createLanguageServiceSourceFile(sourceFile.fileName, scriptSnapshot, sourceFile.languageVersion, version, /*setNodeParents*/ true);
+        return createLanguageServiceSourceFile(sourceFile.fileName, scriptSnapshot, sourceFile.languageVersion, version, /*setNodeParents*/ true, sourceFile.scriptKind);
     }
     ts.updateLanguageServiceSourceFile = updateLanguageServiceSourceFile;
     function createDocumentRegistry(useCaseSensitiveFileNames, currentDirectory) {
@@ -46855,20 +50228,20 @@ var ts;
             });
             return JSON.stringify(bucketInfoArray, undefined, 2);
         }
-        function acquireDocument(fileName, compilationSettings, scriptSnapshot, version) {
-            return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring*/ true);
+        function acquireDocument(fileName, compilationSettings, scriptSnapshot, version, scriptKind) {
+            return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring*/ true, scriptKind);
         }
-        function updateDocument(fileName, compilationSettings, scriptSnapshot, version) {
-            return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring*/ false);
+        function updateDocument(fileName, compilationSettings, scriptSnapshot, version, scriptKind) {
+            return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring*/ false, scriptKind);
         }
-        function acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, acquiring) {
+        function acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, acquiring, scriptKind) {
             var bucket = getBucketForCompilationSettings(compilationSettings, /*createIfMissing*/ true);
             var path = ts.toPath(fileName, currentDirectory, getCanonicalFileName);
             var entry = bucket.get(path);
             if (!entry) {
                 ts.Debug.assert(acquiring, "How could we be trying to update a document that the registry doesn't have?");
                 // Have never seen this file with these settings.  Create a new source file for it.
-                var sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, compilationSettings.target, version, /*setNodeParents*/ false);
+                var sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, compilationSettings.target, version, /*setNodeParents*/ false, scriptKind);
                 entry = {
                     sourceFile: sourceFile,
                     languageServiceRefCount: 0,
@@ -46917,9 +50290,24 @@ var ts;
         if (readImportFiles === void 0) { readImportFiles = true; }
         if (detectJavaScriptImports === void 0) { detectJavaScriptImports = false; }
         var referencedFiles = [];
+        var typeReferenceDirectives = [];
         var importedFiles = [];
         var ambientExternalModules;
         var isNoDefaultLib = false;
+        var braceNesting = 0;
+        // assume that text represent an external module if it contains at least one top level import/export
+        // ambient modules that are found inside external modules are interpreted as module augmentations
+        var externalModule = false;
+        function nextToken() {
+            var token = scanner.scan();
+            if (token === 15 /* OpenBraceToken */) {
+                braceNesting++;
+            }
+            else if (token === 16 /* CloseBraceToken */) {
+                braceNesting--;
+            }
+            return token;
+        }
         function processTripleSlashDirectives() {
             var commentRanges = ts.getLeadingCommentRanges(sourceText, 0);
             ts.forEach(commentRanges, function (commentRange) {
@@ -46929,25 +50317,37 @@ var ts;
                     isNoDefaultLib = referencePathMatchResult.isNoDefaultLib;
                     var fileReference = referencePathMatchResult.fileReference;
                     if (fileReference) {
-                        referencedFiles.push(fileReference);
+                        var collection = referencePathMatchResult.isTypeReferenceDirective
+                            ? typeReferenceDirectives
+                            : referencedFiles;
+                        collection.push(fileReference);
                     }
                 }
             });
         }
+        function getFileReference() {
+            var file = scanner.getTokenValue();
+            var pos = scanner.getTokenPos();
+            return {
+                fileName: file,
+                pos: pos,
+                end: pos + file.length
+            };
+        }
         function recordAmbientExternalModule() {
             if (!ambientExternalModules) {
                 ambientExternalModules = [];
             }
-            ambientExternalModules.push(scanner.getTokenValue());
+            ambientExternalModules.push({ ref: getFileReference(), depth: braceNesting });
         }
         function recordModuleName() {
-            var importPath = scanner.getTokenValue();
-            var pos = scanner.getTokenPos();
-            importedFiles.push({
-                fileName: importPath,
-                pos: pos,
-                end: pos + importPath.length
-            });
+            importedFiles.push(getFileReference());
+            markAsExternalModuleIfTopLevel();
+        }
+        function markAsExternalModuleIfTopLevel() {
+            if (braceNesting === 0) {
+                externalModule = true;
+            }
         }
         /**
          * Returns true if at least one token was consumed from the stream
@@ -46956,9 +50356,9 @@ var ts;
             var token = scanner.getToken();
             if (token === 122 /* DeclareKeyword */) {
                 // declare module "mod"
-                token = scanner.scan();
+                token = nextToken();
                 if (token === 125 /* ModuleKeyword */) {
-                    token = scanner.scan();
+                    token = nextToken();
                     if (token === 9 /* StringLiteral */) {
                         recordAmbientExternalModule();
                     }
@@ -46973,7 +50373,7 @@ var ts;
         function tryConsumeImport() {
             var token = scanner.getToken();
             if (token === 89 /* ImportKeyword */) {
-                token = scanner.scan();
+                token = nextToken();
                 if (token === 9 /* StringLiteral */) {
                     // import "mod";
                     recordModuleName();
@@ -46981,9 +50381,9 @@ var ts;
                 }
                 else {
                     if (token === 69 /* Identifier */ || ts.isKeyword(token)) {
-                        token = scanner.scan();
-                        if (token === 133 /* FromKeyword */) {
-                            token = scanner.scan();
+                        token = nextToken();
+                        if (token === 135 /* FromKeyword */) {
+                            token = nextToken();
                             if (token === 9 /* StringLiteral */) {
                                 // import d from "mod";
                                 recordModuleName();
@@ -46997,7 +50397,7 @@ var ts;
                         }
                         else if (token === 24 /* CommaToken */) {
                             // consume comma and keep going
-                            token = scanner.scan();
+                            token = nextToken();
                         }
                         else {
                             // unknown syntax
@@ -47005,16 +50405,16 @@ var ts;
                         }
                     }
                     if (token === 15 /* OpenBraceToken */) {
-                        token = scanner.scan();
+                        token = nextToken();
                         // consume "{ a as B, c, d as D}" clauses
                         // make sure that it stops on EOF
                         while (token !== 16 /* CloseBraceToken */ && token !== 1 /* EndOfFileToken */) {
-                            token = scanner.scan();
+                            token = nextToken();
                         }
                         if (token === 16 /* CloseBraceToken */) {
-                            token = scanner.scan();
-                            if (token === 133 /* FromKeyword */) {
-                                token = scanner.scan();
+                            token = nextToken();
+                            if (token === 135 /* FromKeyword */) {
+                                token = nextToken();
                                 if (token === 9 /* StringLiteral */) {
                                     // import {a as A} from "mod";
                                     // import d, {a, b as B} from "mod"
@@ -47024,13 +50424,13 @@ var ts;
                         }
                     }
                     else if (token === 37 /* AsteriskToken */) {
-                        token = scanner.scan();
+                        token = nextToken();
                         if (token === 116 /* AsKeyword */) {
-                            token = scanner.scan();
+                            token = nextToken();
                             if (token === 69 /* Identifier */ || ts.isKeyword(token)) {
-                                token = scanner.scan();
-                                if (token === 133 /* FromKeyword */) {
-                                    token = scanner.scan();
+                                token = nextToken();
+                                if (token === 135 /* FromKeyword */) {
+                                    token = nextToken();
                                     if (token === 9 /* StringLiteral */) {
                                         // import * as NS from "mod"
                                         // import d, * as NS from "mod"
@@ -47048,18 +50448,19 @@ var ts;
         function tryConsumeExport() {
             var token = scanner.getToken();
             if (token === 82 /* ExportKeyword */) {
-                token = scanner.scan();
+                markAsExternalModuleIfTopLevel();
+                token = nextToken();
                 if (token === 15 /* OpenBraceToken */) {
-                    token = scanner.scan();
+                    token = nextToken();
                     // consume "{ a as B, c, d as D}" clauses
                     // make sure it stops on EOF
                     while (token !== 16 /* CloseBraceToken */ && token !== 1 /* EndOfFileToken */) {
-                        token = scanner.scan();
+                        token = nextToken();
                     }
                     if (token === 16 /* CloseBraceToken */) {
-                        token = scanner.scan();
-                        if (token === 133 /* FromKeyword */) {
-                            token = scanner.scan();
+                        token = nextToken();
+                        if (token === 135 /* FromKeyword */) {
+                            token = nextToken();
                             if (token === 9 /* StringLiteral */) {
                                 // export {a as A} from "mod";
                                 // export {a, b as B} from "mod"
@@ -47069,9 +50470,9 @@ var ts;
                     }
                 }
                 else if (token === 37 /* AsteriskToken */) {
-                    token = scanner.scan();
-                    if (token === 133 /* FromKeyword */) {
-                        token = scanner.scan();
+                    token = nextToken();
+                    if (token === 135 /* FromKeyword */) {
+                        token = nextToken();
                         if (token === 9 /* StringLiteral */) {
                             // export * from "mod"
                             recordModuleName();
@@ -47079,9 +50480,9 @@ var ts;
                     }
                 }
                 else if (token === 89 /* ImportKeyword */) {
-                    token = scanner.scan();
+                    token = nextToken();
                     if (token === 69 /* Identifier */ || ts.isKeyword(token)) {
-                        token = scanner.scan();
+                        token = nextToken();
                         if (token === 56 /* EqualsToken */) {
                             if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) {
                                 return true;
@@ -47094,11 +50495,11 @@ var ts;
             return false;
         }
         function tryConsumeRequireCall(skipCurrentToken) {
-            var token = skipCurrentToken ? scanner.scan() : scanner.getToken();
-            if (token === 127 /* RequireKeyword */) {
-                token = scanner.scan();
+            var token = skipCurrentToken ? nextToken() : scanner.getToken();
+            if (token === 128 /* RequireKeyword */) {
+                token = nextToken();
                 if (token === 17 /* OpenParenToken */) {
-                    token = scanner.scan();
+                    token = nextToken();
                     if (token === 9 /* StringLiteral */) {
                         //  require("mod");
                         recordModuleName();
@@ -47111,16 +50512,16 @@ var ts;
         function tryConsumeDefine() {
             var token = scanner.getToken();
             if (token === 69 /* Identifier */ && scanner.getTokenValue() === "define") {
-                token = scanner.scan();
+                token = nextToken();
                 if (token !== 17 /* OpenParenToken */) {
                     return true;
                 }
-                token = scanner.scan();
+                token = nextToken();
                 if (token === 9 /* StringLiteral */) {
                     // looks like define ("modname", ... - skip string literal and comma
-                    token = scanner.scan();
+                    token = nextToken();
                     if (token === 24 /* CommaToken */) {
-                        token = scanner.scan();
+                        token = nextToken();
                     }
                     else {
                         // unexpected token
@@ -47132,7 +50533,7 @@ var ts;
                     return true;
                 }
                 // skip open bracket
-                token = scanner.scan();
+                token = nextToken();
                 var i = 0;
                 // scan until ']' or EOF
                 while (token !== 20 /* CloseBracketToken */ && token !== 1 /* EndOfFileToken */) {
@@ -47141,7 +50542,7 @@ var ts;
                         recordModuleName();
                         i++;
                     }
-                    token = scanner.scan();
+                    token = nextToken();
                 }
                 return true;
             }
@@ -47149,7 +50550,7 @@ var ts;
         }
         function processImports() {
             scanner.setText(sourceText);
-            scanner.scan();
+            nextToken();
             // Look for:
             //    import "mod";
             //    import d from "mod"
@@ -47174,7 +50575,7 @@ var ts;
                     continue;
                 }
                 else {
-                    scanner.scan();
+                    nextToken();
                 }
             }
             scanner.setText(undefined);
@@ -47183,13 +50584,42 @@ var ts;
             processImports();
         }
         processTripleSlashDirectives();
-        return { referencedFiles: referencedFiles, importedFiles: importedFiles, isLibFile: isNoDefaultLib, ambientExternalModules: ambientExternalModules };
+        if (externalModule) {
+            // for external modules module all nested ambient modules are augmentations
+            if (ambientExternalModules) {
+                // move all detected ambient modules to imported files since they need to be resolved
+                for (var _i = 0, ambientExternalModules_1 = ambientExternalModules; _i < ambientExternalModules_1.length; _i++) {
+                    var decl = ambientExternalModules_1[_i];
+                    importedFiles.push(decl.ref);
+                }
+            }
+            return { referencedFiles: referencedFiles, typeReferenceDirectives: typeReferenceDirectives, importedFiles: importedFiles, isLibFile: isNoDefaultLib, ambientExternalModules: undefined };
+        }
+        else {
+            // for global scripts ambient modules still can have augmentations - look for ambient modules with depth > 0
+            var ambientModuleNames = void 0;
+            if (ambientExternalModules) {
+                for (var _a = 0, ambientExternalModules_2 = ambientExternalModules; _a < ambientExternalModules_2.length; _a++) {
+                    var decl = ambientExternalModules_2[_a];
+                    if (decl.depth === 0) {
+                        if (!ambientModuleNames) {
+                            ambientModuleNames = [];
+                        }
+                        ambientModuleNames.push(decl.ref.fileName);
+                    }
+                    else {
+                        importedFiles.push(decl.ref);
+                    }
+                }
+            }
+            return { referencedFiles: referencedFiles, typeReferenceDirectives: typeReferenceDirectives, importedFiles: importedFiles, isLibFile: isNoDefaultLib, ambientExternalModules: ambientModuleNames };
+        }
     }
     ts.preProcessFile = preProcessFile;
     /// Helpers
     function getTargetLabel(referenceNode, labelName) {
         while (referenceNode) {
-            if (referenceNode.kind === 210 /* LabeledStatement */ && referenceNode.label.text === labelName) {
+            if (referenceNode.kind === 213 /* LabeledStatement */ && referenceNode.label.text === labelName) {
                 return referenceNode.label;
             }
             referenceNode = referenceNode.parent;
@@ -47198,12 +50628,12 @@ var ts;
     }
     function isJumpStatementTarget(node) {
         return node.kind === 69 /* Identifier */ &&
-            (node.parent.kind === 206 /* BreakStatement */ || node.parent.kind === 205 /* ContinueStatement */) &&
+            (node.parent.kind === 209 /* BreakStatement */ || node.parent.kind === 208 /* ContinueStatement */) &&
             node.parent.label === node;
     }
     function isLabelOfLabeledStatement(node) {
         return node.kind === 69 /* Identifier */ &&
-            node.parent.kind === 210 /* LabeledStatement */ &&
+            node.parent.kind === 213 /* LabeledStatement */ &&
             node.parent.label === node;
     }
     /**
@@ -47211,7 +50641,7 @@ var ts;
      * Note: 'node' cannot be a SourceFile.
      */
     function isLabeledBy(node, labelName) {
-        for (var owner = node.parent; owner.kind === 210 /* LabeledStatement */; owner = owner.parent) {
+        for (var owner = node.parent; owner.kind === 213 /* LabeledStatement */; owner = owner.parent) {
             if (owner.label.text === labelName) {
                 return true;
             }
@@ -47222,25 +50652,25 @@ var ts;
         return isLabelOfLabeledStatement(node) || isJumpStatementTarget(node);
     }
     function isRightSideOfQualifiedName(node) {
-        return node.parent.kind === 136 /* QualifiedName */ && node.parent.right === node;
+        return node.parent.kind === 138 /* QualifiedName */ && node.parent.right === node;
     }
     function isRightSideOfPropertyAccess(node) {
-        return node && node.parent && node.parent.kind === 169 /* PropertyAccessExpression */ && node.parent.name === node;
+        return node && node.parent && node.parent.kind === 171 /* PropertyAccessExpression */ && node.parent.name === node;
     }
     function isCallExpressionTarget(node) {
         if (isRightSideOfPropertyAccess(node)) {
             node = node.parent;
         }
-        return node && node.parent && node.parent.kind === 171 /* CallExpression */ && node.parent.expression === node;
+        return node && node.parent && node.parent.kind === 173 /* CallExpression */ && node.parent.expression === node;
     }
     function isNewExpressionTarget(node) {
         if (isRightSideOfPropertyAccess(node)) {
             node = node.parent;
         }
-        return node && node.parent && node.parent.kind === 172 /* NewExpression */ && node.parent.expression === node;
+        return node && node.parent && node.parent.kind === 174 /* NewExpression */ && node.parent.expression === node;
     }
     function isNameOfModuleDeclaration(node) {
-        return node.parent.kind === 221 /* ModuleDeclaration */ && node.parent.name === node;
+        return node.parent.kind === 224 /* ModuleDeclaration */ && node.parent.name === node;
     }
     function isNameOfFunctionDeclaration(node) {
         return node.kind === 69 /* Identifier */ &&
@@ -47249,22 +50679,22 @@ var ts;
     /** Returns true if node is a name of an object literal property, e.g. "a" in x = { "a": 1 } */
     function isNameOfPropertyAssignment(node) {
         return (node.kind === 69 /* Identifier */ || node.kind === 9 /* StringLiteral */ || node.kind === 8 /* NumericLiteral */) &&
-            (node.parent.kind === 248 /* PropertyAssignment */ || node.parent.kind === 249 /* ShorthandPropertyAssignment */) && node.parent.name === node;
+            (node.parent.kind === 252 /* PropertyAssignment */ || node.parent.kind === 253 /* ShorthandPropertyAssignment */) && node.parent.name === node;
     }
     function isLiteralNameOfPropertyDeclarationOrIndexAccess(node) {
         if (node.kind === 9 /* StringLiteral */ || node.kind === 8 /* NumericLiteral */) {
             switch (node.parent.kind) {
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
-                case 248 /* PropertyAssignment */:
-                case 250 /* EnumMember */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
-                case 221 /* ModuleDeclaration */:
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
+                case 252 /* PropertyAssignment */:
+                case 254 /* EnumMember */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
+                case 224 /* ModuleDeclaration */:
                     return node.parent.name === node;
-                case 170 /* ElementAccessExpression */:
+                case 172 /* ElementAccessExpression */:
                     return node.parent.argumentExpression === node;
             }
         }
@@ -47323,7 +50753,7 @@ var ts;
     })(BreakContinueSearchType || (BreakContinueSearchType = {}));
     // A cache of completion entries for keywords, these do not change between sessions
     var keywordCompletions = [];
-    for (var i = 70 /* FirstKeyword */; i <= 135 /* LastKeyword */; i++) {
+    for (var i = 70 /* FirstKeyword */; i <= 137 /* LastKeyword */; i++) {
         keywordCompletions.push({
             name: ts.tokenToString(i),
             kind: ScriptElementKind.keyword,
@@ -47338,17 +50768,17 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 251 /* SourceFile */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
-                case 216 /* FunctionDeclaration */:
-                case 176 /* FunctionExpression */:
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
-                case 217 /* ClassDeclaration */:
-                case 218 /* InterfaceDeclaration */:
-                case 220 /* EnumDeclaration */:
-                case 221 /* ModuleDeclaration */:
+                case 255 /* SourceFile */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
+                case 219 /* FunctionDeclaration */:
+                case 178 /* FunctionExpression */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
+                case 220 /* ClassDeclaration */:
+                case 221 /* InterfaceDeclaration */:
+                case 223 /* EnumDeclaration */:
+                case 224 /* ModuleDeclaration */:
                     return node;
             }
         }
@@ -47356,38 +50786,38 @@ var ts;
     ts.getContainerNode = getContainerNode;
     /* @internal */ function getNodeKind(node) {
         switch (node.kind) {
-            case 221 /* ModuleDeclaration */: return ScriptElementKind.moduleElement;
-            case 217 /* ClassDeclaration */: return ScriptElementKind.classElement;
-            case 218 /* InterfaceDeclaration */: return ScriptElementKind.interfaceElement;
-            case 219 /* TypeAliasDeclaration */: return ScriptElementKind.typeElement;
-            case 220 /* EnumDeclaration */: return ScriptElementKind.enumElement;
-            case 214 /* VariableDeclaration */:
+            case 224 /* ModuleDeclaration */: return ScriptElementKind.moduleElement;
+            case 220 /* ClassDeclaration */: return ScriptElementKind.classElement;
+            case 221 /* InterfaceDeclaration */: return ScriptElementKind.interfaceElement;
+            case 222 /* TypeAliasDeclaration */: return ScriptElementKind.typeElement;
+            case 223 /* EnumDeclaration */: return ScriptElementKind.enumElement;
+            case 217 /* VariableDeclaration */:
                 return ts.isConst(node)
                     ? ScriptElementKind.constElement
                     : ts.isLet(node)
                         ? ScriptElementKind.letElement
                         : ScriptElementKind.variableElement;
-            case 216 /* FunctionDeclaration */: return ScriptElementKind.functionElement;
-            case 146 /* GetAccessor */: return ScriptElementKind.memberGetAccessorElement;
-            case 147 /* SetAccessor */: return ScriptElementKind.memberSetAccessorElement;
-            case 144 /* MethodDeclaration */:
-            case 143 /* MethodSignature */:
+            case 219 /* FunctionDeclaration */: return ScriptElementKind.functionElement;
+            case 148 /* GetAccessor */: return ScriptElementKind.memberGetAccessorElement;
+            case 149 /* SetAccessor */: return ScriptElementKind.memberSetAccessorElement;
+            case 146 /* MethodDeclaration */:
+            case 145 /* MethodSignature */:
                 return ScriptElementKind.memberFunctionElement;
-            case 142 /* PropertyDeclaration */:
-            case 141 /* PropertySignature */:
+            case 144 /* PropertyDeclaration */:
+            case 143 /* PropertySignature */:
                 return ScriptElementKind.memberVariableElement;
-            case 150 /* IndexSignature */: return ScriptElementKind.indexSignatureElement;
-            case 149 /* ConstructSignature */: return ScriptElementKind.constructSignatureElement;
-            case 148 /* CallSignature */: return ScriptElementKind.callSignatureElement;
-            case 145 /* Constructor */: return ScriptElementKind.constructorImplementationElement;
-            case 138 /* TypeParameter */: return ScriptElementKind.typeParameterElement;
-            case 250 /* EnumMember */: return ScriptElementKind.variableElement;
-            case 139 /* Parameter */: return (node.flags & 56 /* AccessibilityModifier */) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement;
-            case 224 /* ImportEqualsDeclaration */:
-            case 229 /* ImportSpecifier */:
-            case 226 /* ImportClause */:
-            case 233 /* ExportSpecifier */:
-            case 227 /* NamespaceImport */:
+            case 152 /* IndexSignature */: return ScriptElementKind.indexSignatureElement;
+            case 151 /* ConstructSignature */: return ScriptElementKind.constructSignatureElement;
+            case 150 /* CallSignature */: return ScriptElementKind.callSignatureElement;
+            case 147 /* Constructor */: return ScriptElementKind.constructorImplementationElement;
+            case 140 /* TypeParameter */: return ScriptElementKind.typeParameterElement;
+            case 254 /* EnumMember */: return ScriptElementKind.variableElement;
+            case 141 /* Parameter */: return (node.flags & 28 /* AccessibilityModifier */) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement;
+            case 228 /* ImportEqualsDeclaration */:
+            case 233 /* ImportSpecifier */:
+            case 230 /* ImportClause */:
+            case 237 /* ExportSpecifier */:
+            case 231 /* NamespaceImport */:
                 return ScriptElementKind.alias;
         }
         return ScriptElementKind.unknown;
@@ -47483,7 +50913,7 @@ var ts;
                 getCurrentDirectory: function () { return currentDirectory; },
                 fileExists: function (fileName) {
                     // stub missing host functionality
-                    ts.Debug.assert(!host.resolveModuleNames);
+                    ts.Debug.assert(!host.resolveModuleNames || !host.resolveTypeReferenceDirectives);
                     return hostCache.getOrCreateEntry(fileName) !== undefined;
                 },
                 readFile: function (fileName) {
@@ -47492,13 +50922,21 @@ var ts;
                     return entry && entry.scriptSnapshot.getText(0, entry.scriptSnapshot.getLength());
                 },
                 directoryExists: function (directoryName) {
-                    ts.Debug.assert(!host.resolveModuleNames);
+                    ts.Debug.assert(!host.resolveModuleNames || !host.resolveTypeReferenceDirectives);
                     return ts.directoryProbablyExists(directoryName, host);
                 }
             };
+            if (host.trace) {
+                compilerHost.trace = function (message) { return host.trace(message); };
+            }
             if (host.resolveModuleNames) {
                 compilerHost.resolveModuleNames = function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile); };
             }
+            if (host.resolveTypeReferenceDirectives) {
+                compilerHost.resolveTypeReferenceDirectives = function (typeReferenceDirectiveNames, containingFile) {
+                    return host.resolveTypeReferenceDirectives(typeReferenceDirectiveNames, containingFile);
+                };
+            }
             var newProgram = ts.createProgram(hostCache.getRootFileNames(), newSettings, compilerHost, program);
             // Release any files we have acquired in the old program but are
             // not part of the new program.
@@ -47529,7 +50967,7 @@ var ts;
                     return undefined;
                 }
                 // Check if the language version has changed since we last created a program; if they are the same,
-                // it is safe to reuse the souceFiles; if not, then the shape of the AST can change, and the oldSourceFile
+                // it is safe to reuse the sourceFiles; if not, then the shape of the AST can change, and the oldSourceFile
                 // can not be reused. we have to dump all syntax trees and create new ones.
                 if (!changesInCompilationSettingsAffectSyntax) {
                     // Check if the old program had this file already
@@ -47537,7 +50975,7 @@ var ts;
                     if (oldSourceFile) {
                         // We already had a source file for this file name.  Go to the registry to
                         // ensure that we get the right up to date version of it.  We need this to
-                        // address the following 'race'.  Specifically, say we have the following:
+                        // address the following race-condition.  Specifically, say we have the following:
                         //
                         //      LS1
                         //          \
@@ -47556,11 +50994,15 @@ var ts;
                         // it's source file any more, and instead defers to DocumentRegistry to get
                         // either version 1, version 2 (or some other version) depending on what the
                         // host says should be used.
-                        return documentRegistry.updateDocument(fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version);
+                        // We do not support the scenario where a host can modify a registered
+                        // file's script kind, i.e. in one project some file is treated as ".ts"
+                        // and in another as ".js"
+                        ts.Debug.assert(hostFileInformation.scriptKind === oldSourceFile.scriptKind, "Registered script kind (" + oldSourceFile.scriptKind + ") should match new script kind (" + hostFileInformation.scriptKind + ") for file: " + fileName);
+                        return documentRegistry.updateDocument(fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version, hostFileInformation.scriptKind);
                     }
                 }
                 // Could not find this file in the old program, create a new SourceFile for it.
-                return documentRegistry.acquireDocument(fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version);
+                return documentRegistry.acquireDocument(fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version, hostFileInformation.scriptKind);
             }
             function sourceFileUpToDate(sourceFile) {
                 if (!sourceFile) {
@@ -47610,7 +51052,7 @@ var ts;
             return program.getSyntacticDiagnostics(getValidSourceFile(fileName), cancellationToken);
         }
         /**
-         * getSemanticDiagnostiscs return array of Diagnostics. If '-d' is not enabled, only report semantic errors
+         * getSemanticDiagnostics return array of Diagnostics. If '-d' is not enabled, only report semantic errors
          * If '-d' enabled, report both semantic and emitter errors
          */
         function getSemanticDiagnostics(fileName) {
@@ -47699,9 +51141,9 @@ var ts;
                         isJsDocTagName = true;
                     }
                     switch (tag.kind) {
-                        case 272 /* JSDocTypeTag */:
-                        case 270 /* JSDocParameterTag */:
-                        case 271 /* JSDocReturnTag */:
+                        case 276 /* JSDocTypeTag */:
+                        case 274 /* JSDocParameterTag */:
+                        case 275 /* JSDocReturnTag */:
                             var tagWithExpression = tag;
                             if (tagWithExpression.typeExpression) {
                                 insideJsDocTagExpression = tagWithExpression.typeExpression.pos < position && position < tagWithExpression.typeExpression.end;
@@ -47746,13 +51188,13 @@ var ts;
                     log("Returning an empty list because completion was requested in an invalid position.");
                     return undefined;
                 }
-                var parent_10 = contextToken.parent, kind = contextToken.kind;
+                var parent_13 = contextToken.parent, kind = contextToken.kind;
                 if (kind === 21 /* DotToken */) {
-                    if (parent_10.kind === 169 /* PropertyAccessExpression */) {
+                    if (parent_13.kind === 171 /* PropertyAccessExpression */) {
                         node = contextToken.parent.expression;
                         isRightOfDot = true;
                     }
-                    else if (parent_10.kind === 136 /* QualifiedName */) {
+                    else if (parent_13.kind === 138 /* QualifiedName */) {
                         node = contextToken.parent.left;
                         isRightOfDot = true;
                     }
@@ -47767,7 +51209,7 @@ var ts;
                         isRightOfOpenTag = true;
                         location = contextToken;
                     }
-                    else if (kind === 39 /* SlashToken */ && contextToken.parent.kind === 240 /* JsxClosingElement */) {
+                    else if (kind === 39 /* SlashToken */ && contextToken.parent.kind === 244 /* JsxClosingElement */) {
                         isStartingCloseTag = true;
                         location = contextToken;
                     }
@@ -47783,7 +51225,7 @@ var ts;
             else if (isRightOfOpenTag) {
                 var tagSymbols = typeChecker.getJsxIntrinsicTagNames();
                 if (tryGetGlobalSymbols()) {
-                    symbols = tagSymbols.concat(symbols.filter(function (s) { return !!(s.flags & 107455 /* Value */); }));
+                    symbols = tagSymbols.concat(symbols.filter(function (s) { return !!(s.flags & (107455 /* Value */ | 8388608 /* Alias */)); }));
                 }
                 else {
                     symbols = tagSymbols;
@@ -47814,7 +51256,7 @@ var ts;
                 // Right of dot member completion list
                 isMemberCompletion = true;
                 isNewIdentifierLocation = false;
-                if (node.kind === 69 /* Identifier */ || node.kind === 136 /* QualifiedName */ || node.kind === 169 /* PropertyAccessExpression */) {
+                if (node.kind === 69 /* Identifier */ || node.kind === 138 /* QualifiedName */ || node.kind === 171 /* PropertyAccessExpression */) {
                     var symbol = typeChecker.getSymbolAtLocation(node);
                     // This is an alias, follow what it aliases
                     if (symbol && symbol.flags & 8388608 /* Alias */) {
@@ -47869,8 +51311,8 @@ var ts;
                     return tryGetImportOrExportClauseCompletionSymbols(namedImportsOrExports);
                 }
                 if (jsxContainer = tryGetContainingJsxElement(contextToken)) {
-                    var attrsType;
-                    if ((jsxContainer.kind === 237 /* JsxSelfClosingElement */) || (jsxContainer.kind === 238 /* JsxOpeningElement */)) {
+                    var attrsType = void 0;
+                    if ((jsxContainer.kind === 241 /* JsxSelfClosingElement */) || (jsxContainer.kind === 242 /* JsxOpeningElement */)) {
                         // Cursor is inside a JSX self-closing element or opening element
                         attrsType = typeChecker.getJsxElementAttributesType(jsxContainer);
                         if (attrsType) {
@@ -47942,15 +51384,15 @@ var ts;
                 return result;
             }
             function isInJsxText(contextToken) {
-                if (contextToken.kind === 239 /* JsxText */) {
+                if (contextToken.kind === 243 /* JsxText */) {
                     return true;
                 }
                 if (contextToken.kind === 27 /* GreaterThanToken */ && contextToken.parent) {
-                    if (contextToken.parent.kind === 238 /* JsxOpeningElement */) {
+                    if (contextToken.parent.kind === 242 /* JsxOpeningElement */) {
                         return true;
                     }
-                    if (contextToken.parent.kind === 240 /* JsxClosingElement */ || contextToken.parent.kind === 237 /* JsxSelfClosingElement */) {
-                        return contextToken.parent.parent && contextToken.parent.parent.kind === 236 /* JsxElement */;
+                    if (contextToken.parent.kind === 244 /* JsxClosingElement */ || contextToken.parent.kind === 241 /* JsxSelfClosingElement */) {
+                        return contextToken.parent.parent && contextToken.parent.parent.kind === 240 /* JsxElement */;
                     }
                 }
                 return false;
@@ -47960,40 +51402,40 @@ var ts;
                     var containingNodeKind = previousToken.parent.kind;
                     switch (previousToken.kind) {
                         case 24 /* CommaToken */:
-                            return containingNodeKind === 171 /* CallExpression */ // func( a, |
-                                || containingNodeKind === 145 /* Constructor */ // constructor( a, |   /* public, protected, private keywords are allowed here, so show completion */
-                                || containingNodeKind === 172 /* NewExpression */ // new C(a, |
-                                || containingNodeKind === 167 /* ArrayLiteralExpression */ // [a, |
-                                || containingNodeKind === 184 /* BinaryExpression */ // const x = (a, |
-                                || containingNodeKind === 153 /* FunctionType */; // var x: (s: string, list|
+                            return containingNodeKind === 173 /* CallExpression */ // func( a, |
+                                || containingNodeKind === 147 /* Constructor */ // constructor( a, |   /* public, protected, private keywords are allowed here, so show completion */
+                                || containingNodeKind === 174 /* NewExpression */ // new C(a, |
+                                || containingNodeKind === 169 /* ArrayLiteralExpression */ // [a, |
+                                || containingNodeKind === 186 /* BinaryExpression */ // const x = (a, |
+                                || containingNodeKind === 155 /* FunctionType */; // var x: (s: string, list|
                         case 17 /* OpenParenToken */:
-                            return containingNodeKind === 171 /* CallExpression */ // func( |
-                                || containingNodeKind === 145 /* Constructor */ // constructor( |
-                                || containingNodeKind === 172 /* NewExpression */ // new C(a|
-                                || containingNodeKind === 175 /* ParenthesizedExpression */ // const x = (a|
-                                || containingNodeKind === 161 /* ParenthesizedType */; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */
+                            return containingNodeKind === 173 /* CallExpression */ // func( |
+                                || containingNodeKind === 147 /* Constructor */ // constructor( |
+                                || containingNodeKind === 174 /* NewExpression */ // new C(a|
+                                || containingNodeKind === 177 /* ParenthesizedExpression */ // const x = (a|
+                                || containingNodeKind === 163 /* ParenthesizedType */; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */
                         case 19 /* OpenBracketToken */:
-                            return containingNodeKind === 167 /* ArrayLiteralExpression */ // [ |
-                                || containingNodeKind === 150 /* IndexSignature */ // [ | : string ]
-                                || containingNodeKind === 137 /* ComputedPropertyName */; // [ |    /* this can become an index signature */
+                            return containingNodeKind === 169 /* ArrayLiteralExpression */ // [ |
+                                || containingNodeKind === 152 /* IndexSignature */ // [ | : string ]
+                                || containingNodeKind === 139 /* ComputedPropertyName */; // [ |    /* this can become an index signature */
                         case 125 /* ModuleKeyword */: // module |
                         case 126 /* NamespaceKeyword */:
                             return true;
                         case 21 /* DotToken */:
-                            return containingNodeKind === 221 /* ModuleDeclaration */; // module A.|
+                            return containingNodeKind === 224 /* ModuleDeclaration */; // module A.|
                         case 15 /* OpenBraceToken */:
-                            return containingNodeKind === 217 /* ClassDeclaration */; // class A{ |
+                            return containingNodeKind === 220 /* ClassDeclaration */; // class A{ |
                         case 56 /* EqualsToken */:
-                            return containingNodeKind === 214 /* VariableDeclaration */ // const x = a|
-                                || containingNodeKind === 184 /* BinaryExpression */; // x = a|
+                            return containingNodeKind === 217 /* VariableDeclaration */ // const x = a|
+                                || containingNodeKind === 186 /* BinaryExpression */; // x = a|
                         case 12 /* TemplateHead */:
-                            return containingNodeKind === 186 /* TemplateExpression */; // `aa ${|
+                            return containingNodeKind === 188 /* TemplateExpression */; // `aa ${|
                         case 13 /* TemplateMiddle */:
-                            return containingNodeKind === 193 /* TemplateSpan */; // `aa ${10} dd ${|
+                            return containingNodeKind === 196 /* TemplateSpan */; // `aa ${10} dd ${|
                         case 112 /* PublicKeyword */:
                         case 110 /* PrivateKeyword */:
                         case 111 /* ProtectedKeyword */:
-                            return containingNodeKind === 142 /* PropertyDeclaration */; // class A{ public |
+                            return containingNodeKind === 144 /* PropertyDeclaration */; // class A{ public |
                     }
                     // Previous token may have been a keyword that was converted to an identifier.
                     switch (previousToken.getText()) {
@@ -48007,7 +51449,7 @@ var ts;
             }
             function isInStringOrRegularExpressionOrTemplateLiteral(contextToken) {
                 if (contextToken.kind === 9 /* StringLiteral */
-                    || contextToken.kind === 163 /* StringLiteralType */
+                    || contextToken.kind === 165 /* StringLiteralType */
                     || contextToken.kind === 10 /* RegularExpressionLiteral */
                     || ts.isTemplateLiteralKind(contextToken.kind)) {
                     var start_7 = contextToken.getStart();
@@ -48037,14 +51479,14 @@ var ts;
                 isMemberCompletion = true;
                 var typeForObject;
                 var existingMembers;
-                if (objectLikeContainer.kind === 168 /* ObjectLiteralExpression */) {
+                if (objectLikeContainer.kind === 170 /* ObjectLiteralExpression */) {
                     // We are completing on contextual types, but may also include properties
                     // other than those within the declared type.
                     isNewIdentifierLocation = true;
                     typeForObject = typeChecker.getContextualType(objectLikeContainer);
                     existingMembers = objectLikeContainer.properties;
                 }
-                else if (objectLikeContainer.kind === 164 /* ObjectBindingPattern */) {
+                else if (objectLikeContainer.kind === 166 /* ObjectBindingPattern */) {
                     // We are *only* completing on properties from the type being destructured.
                     isNewIdentifierLocation = false;
                     var rootDeclaration = ts.getRootDeclaration(objectLikeContainer.parent);
@@ -48052,7 +51494,18 @@ var ts;
                         // We don't want to complete using the type acquired by the shape
                         // of the binding pattern; we are only interested in types acquired
                         // through type declaration or inference.
-                        if (rootDeclaration.initializer || rootDeclaration.type) {
+                        // Also proceed if rootDeclaration is parameter and if its containing function expression\arrow function is contextually typed -
+                        // type of parameter will flow in from the contextual type of the function
+                        var canGetType = !!(rootDeclaration.initializer || rootDeclaration.type);
+                        if (!canGetType && rootDeclaration.kind === 141 /* Parameter */) {
+                            if (ts.isExpression(rootDeclaration.parent)) {
+                                canGetType = !!typeChecker.getContextualType(rootDeclaration.parent);
+                            }
+                            else if (rootDeclaration.parent.kind === 146 /* MethodDeclaration */ || rootDeclaration.parent.kind === 149 /* SetAccessor */) {
+                                canGetType = ts.isExpression(rootDeclaration.parent.parent) && !!typeChecker.getContextualType(rootDeclaration.parent.parent);
+                            }
+                        }
+                        if (canGetType) {
                             typeForObject = typeChecker.getTypeAtLocation(objectLikeContainer);
                             existingMembers = objectLikeContainer.elements;
                         }
@@ -48090,9 +51543,9 @@ var ts;
              * @returns true if 'symbols' was successfully populated; false otherwise.
              */
             function tryGetImportOrExportClauseCompletionSymbols(namedImportsOrExports) {
-                var declarationKind = namedImportsOrExports.kind === 228 /* NamedImports */ ?
-                    225 /* ImportDeclaration */ :
-                    231 /* ExportDeclaration */;
+                var declarationKind = namedImportsOrExports.kind === 232 /* NamedImports */ ?
+                    229 /* ImportDeclaration */ :
+                    235 /* ExportDeclaration */;
                 var importOrExportDeclaration = ts.getAncestor(namedImportsOrExports, declarationKind);
                 var moduleSpecifier = importOrExportDeclaration.moduleSpecifier;
                 if (!moduleSpecifier) {
@@ -48117,9 +51570,9 @@ var ts;
                     switch (contextToken.kind) {
                         case 15 /* OpenBraceToken */: // const x = { |
                         case 24 /* CommaToken */:
-                            var parent_11 = contextToken.parent;
-                            if (parent_11 && (parent_11.kind === 168 /* ObjectLiteralExpression */ || parent_11.kind === 164 /* ObjectBindingPattern */)) {
-                                return parent_11;
+                            var parent_14 = contextToken.parent;
+                            if (parent_14 && (parent_14.kind === 170 /* ObjectLiteralExpression */ || parent_14.kind === 166 /* ObjectBindingPattern */)) {
+                                return parent_14;
                             }
                             break;
                     }
@@ -48136,8 +51589,8 @@ var ts;
                         case 15 /* OpenBraceToken */: // import { |
                         case 24 /* CommaToken */:
                             switch (contextToken.parent.kind) {
-                                case 228 /* NamedImports */:
-                                case 232 /* NamedExports */:
+                                case 232 /* NamedImports */:
+                                case 236 /* NamedExports */:
                                     return contextToken.parent;
                             }
                     }
@@ -48146,37 +51599,37 @@ var ts;
             }
             function tryGetContainingJsxElement(contextToken) {
                 if (contextToken) {
-                    var parent_12 = contextToken.parent;
+                    var parent_15 = contextToken.parent;
                     switch (contextToken.kind) {
                         case 26 /* LessThanSlashToken */:
                         case 39 /* SlashToken */:
                         case 69 /* Identifier */:
-                        case 241 /* JsxAttribute */:
-                        case 242 /* JsxSpreadAttribute */:
-                            if (parent_12 && (parent_12.kind === 237 /* JsxSelfClosingElement */ || parent_12.kind === 238 /* JsxOpeningElement */)) {
-                                return parent_12;
+                        case 245 /* JsxAttribute */:
+                        case 246 /* JsxSpreadAttribute */:
+                            if (parent_15 && (parent_15.kind === 241 /* JsxSelfClosingElement */ || parent_15.kind === 242 /* JsxOpeningElement */)) {
+                                return parent_15;
                             }
-                            else if (parent_12.kind === 241 /* JsxAttribute */) {
-                                return parent_12.parent;
+                            else if (parent_15.kind === 245 /* JsxAttribute */) {
+                                return parent_15.parent;
                             }
                             break;
                         // The context token is the closing } or " of an attribute, which means
                         // its parent is a JsxExpression, whose parent is a JsxAttribute,
                         // whose parent is a JsxOpeningLikeElement
                         case 9 /* StringLiteral */:
-                            if (parent_12 && ((parent_12.kind === 241 /* JsxAttribute */) || (parent_12.kind === 242 /* JsxSpreadAttribute */))) {
-                                return parent_12.parent;
+                            if (parent_15 && ((parent_15.kind === 245 /* JsxAttribute */) || (parent_15.kind === 246 /* JsxSpreadAttribute */))) {
+                                return parent_15.parent;
                             }
                             break;
                         case 16 /* CloseBraceToken */:
-                            if (parent_12 &&
-                                parent_12.kind === 243 /* JsxExpression */ &&
-                                parent_12.parent &&
-                                (parent_12.parent.kind === 241 /* JsxAttribute */)) {
-                                return parent_12.parent.parent;
+                            if (parent_15 &&
+                                parent_15.kind === 247 /* JsxExpression */ &&
+                                parent_15.parent &&
+                                (parent_15.parent.kind === 245 /* JsxAttribute */)) {
+                                return parent_15.parent.parent;
                             }
-                            if (parent_12 && parent_12.kind === 242 /* JsxSpreadAttribute */) {
-                                return parent_12.parent;
+                            if (parent_15 && parent_15.kind === 246 /* JsxSpreadAttribute */) {
+                                return parent_15.parent;
                             }
                             break;
                     }
@@ -48185,16 +51638,16 @@ var ts;
             }
             function isFunction(kind) {
                 switch (kind) {
-                    case 176 /* FunctionExpression */:
-                    case 177 /* ArrowFunction */:
-                    case 216 /* FunctionDeclaration */:
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
-                    case 148 /* CallSignature */:
-                    case 149 /* ConstructSignature */:
-                    case 150 /* IndexSignature */:
+                    case 178 /* FunctionExpression */:
+                    case 179 /* ArrowFunction */:
+                    case 219 /* FunctionDeclaration */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
+                    case 150 /* CallSignature */:
+                    case 151 /* ConstructSignature */:
+                    case 152 /* IndexSignature */:
                         return true;
                 }
                 return false;
@@ -48206,66 +51659,66 @@ var ts;
                 var containingNodeKind = contextToken.parent.kind;
                 switch (contextToken.kind) {
                     case 24 /* CommaToken */:
-                        return containingNodeKind === 214 /* VariableDeclaration */ ||
-                            containingNodeKind === 215 /* VariableDeclarationList */ ||
-                            containingNodeKind === 196 /* VariableStatement */ ||
-                            containingNodeKind === 220 /* EnumDeclaration */ ||
+                        return containingNodeKind === 217 /* VariableDeclaration */ ||
+                            containingNodeKind === 218 /* VariableDeclarationList */ ||
+                            containingNodeKind === 199 /* VariableStatement */ ||
+                            containingNodeKind === 223 /* EnumDeclaration */ ||
                             isFunction(containingNodeKind) ||
-                            containingNodeKind === 217 /* ClassDeclaration */ ||
-                            containingNodeKind === 189 /* ClassExpression */ ||
-                            containingNodeKind === 218 /* InterfaceDeclaration */ ||
-                            containingNodeKind === 165 /* ArrayBindingPattern */ ||
-                            containingNodeKind === 219 /* TypeAliasDeclaration */; // type Map, K, |
+                            containingNodeKind === 220 /* ClassDeclaration */ ||
+                            containingNodeKind === 191 /* ClassExpression */ ||
+                            containingNodeKind === 221 /* InterfaceDeclaration */ ||
+                            containingNodeKind === 167 /* ArrayBindingPattern */ ||
+                            containingNodeKind === 222 /* TypeAliasDeclaration */; // type Map, K, |
                     case 21 /* DotToken */:
-                        return containingNodeKind === 165 /* ArrayBindingPattern */; // var [.|
+                        return containingNodeKind === 167 /* ArrayBindingPattern */; // var [.|
                     case 54 /* ColonToken */:
-                        return containingNodeKind === 166 /* BindingElement */; // var {x :html|
+                        return containingNodeKind === 168 /* BindingElement */; // var {x :html|
                     case 19 /* OpenBracketToken */:
-                        return containingNodeKind === 165 /* ArrayBindingPattern */; // var [x|
+                        return containingNodeKind === 167 /* ArrayBindingPattern */; // var [x|
                     case 17 /* OpenParenToken */:
-                        return containingNodeKind === 247 /* CatchClause */ ||
+                        return containingNodeKind === 251 /* CatchClause */ ||
                             isFunction(containingNodeKind);
                     case 15 /* OpenBraceToken */:
-                        return containingNodeKind === 220 /* EnumDeclaration */ ||
-                            containingNodeKind === 218 /* InterfaceDeclaration */ ||
-                            containingNodeKind === 156 /* TypeLiteral */; // const x : { |
+                        return containingNodeKind === 223 /* EnumDeclaration */ ||
+                            containingNodeKind === 221 /* InterfaceDeclaration */ ||
+                            containingNodeKind === 158 /* TypeLiteral */; // const x : { |
                     case 23 /* SemicolonToken */:
-                        return containingNodeKind === 141 /* PropertySignature */ &&
+                        return containingNodeKind === 143 /* PropertySignature */ &&
                             contextToken.parent && contextToken.parent.parent &&
-                            (contextToken.parent.parent.kind === 218 /* InterfaceDeclaration */ ||
-                                contextToken.parent.parent.kind === 156 /* TypeLiteral */); // const x : { a; |
+                            (contextToken.parent.parent.kind === 221 /* InterfaceDeclaration */ ||
+                                contextToken.parent.parent.kind === 158 /* TypeLiteral */); // const x : { a; |
                     case 25 /* LessThanToken */:
-                        return containingNodeKind === 217 /* ClassDeclaration */ ||
-                            containingNodeKind === 189 /* ClassExpression */ ||
-                            containingNodeKind === 218 /* InterfaceDeclaration */ ||
-                            containingNodeKind === 219 /* TypeAliasDeclaration */ ||
+                        return containingNodeKind === 220 /* ClassDeclaration */ ||
+                            containingNodeKind === 191 /* ClassExpression */ ||
+                            containingNodeKind === 221 /* InterfaceDeclaration */ ||
+                            containingNodeKind === 222 /* TypeAliasDeclaration */ ||
                             isFunction(containingNodeKind);
                     case 113 /* StaticKeyword */:
-                        return containingNodeKind === 142 /* PropertyDeclaration */;
+                        return containingNodeKind === 144 /* PropertyDeclaration */;
                     case 22 /* DotDotDotToken */:
-                        return containingNodeKind === 139 /* Parameter */ ||
+                        return containingNodeKind === 141 /* Parameter */ ||
                             (contextToken.parent && contextToken.parent.parent &&
-                                contextToken.parent.parent.kind === 165 /* ArrayBindingPattern */); // var [...z|
+                                contextToken.parent.parent.kind === 167 /* ArrayBindingPattern */); // var [...z|
                     case 112 /* PublicKeyword */:
                     case 110 /* PrivateKeyword */:
                     case 111 /* ProtectedKeyword */:
-                        return containingNodeKind === 139 /* Parameter */;
+                        return containingNodeKind === 141 /* Parameter */;
                     case 116 /* AsKeyword */:
-                        return containingNodeKind === 229 /* ImportSpecifier */ ||
-                            containingNodeKind === 233 /* ExportSpecifier */ ||
-                            containingNodeKind === 227 /* NamespaceImport */;
+                        return containingNodeKind === 233 /* ImportSpecifier */ ||
+                            containingNodeKind === 237 /* ExportSpecifier */ ||
+                            containingNodeKind === 231 /* NamespaceImport */;
                     case 73 /* ClassKeyword */:
                     case 81 /* EnumKeyword */:
                     case 107 /* InterfaceKeyword */:
                     case 87 /* FunctionKeyword */:
                     case 102 /* VarKeyword */:
                     case 123 /* GetKeyword */:
-                    case 129 /* SetKeyword */:
+                    case 130 /* SetKeyword */:
                     case 89 /* ImportKeyword */:
                     case 108 /* LetKeyword */:
                     case 74 /* ConstKeyword */:
                     case 114 /* YieldKeyword */:
-                    case 132 /* TypeKeyword */:
+                    case 133 /* TypeKeyword */:
                         return true;
                 }
                 // Previous token may have been a keyword that was converted to an identifier.
@@ -48306,20 +51759,20 @@ var ts;
              *          do not occur at the current position and have not otherwise been typed.
              */
             function filterNamedImportOrExportCompletionItems(exportsOfModule, namedImportsOrExports) {
-                var exisingImportsOrExports = {};
+                var existingImportsOrExports = {};
                 for (var _i = 0, namedImportsOrExports_1 = namedImportsOrExports; _i < namedImportsOrExports_1.length; _i++) {
                     var element = namedImportsOrExports_1[_i];
                     // If this is the current item we are editing right now, do not filter it out
                     if (element.getStart() <= position && position <= element.getEnd()) {
                         continue;
                     }
-                    var name_34 = element.propertyName || element.name;
-                    exisingImportsOrExports[name_34.text] = true;
+                    var name_39 = element.propertyName || element.name;
+                    existingImportsOrExports[name_39.text] = true;
                 }
-                if (ts.isEmpty(exisingImportsOrExports)) {
+                if (ts.isEmpty(existingImportsOrExports)) {
                     return exportsOfModule;
                 }
-                return ts.filter(exportsOfModule, function (e) { return !ts.lookUp(exisingImportsOrExports, e.name); });
+                return ts.filter(exportsOfModule, function (e) { return !ts.lookUp(existingImportsOrExports, e.name); });
             }
             /**
              * Filters out completion suggestions for named imports or exports.
@@ -48335,10 +51788,10 @@ var ts;
                 for (var _i = 0, existingMembers_1 = existingMembers; _i < existingMembers_1.length; _i++) {
                     var m = existingMembers_1[_i];
                     // Ignore omitted expressions for missing members
-                    if (m.kind !== 248 /* PropertyAssignment */ &&
-                        m.kind !== 249 /* ShorthandPropertyAssignment */ &&
-                        m.kind !== 166 /* BindingElement */ &&
-                        m.kind !== 144 /* MethodDeclaration */) {
+                    if (m.kind !== 252 /* PropertyAssignment */ &&
+                        m.kind !== 253 /* ShorthandPropertyAssignment */ &&
+                        m.kind !== 168 /* BindingElement */ &&
+                        m.kind !== 146 /* MethodDeclaration */) {
                         continue;
                     }
                     // If this is the current item we are editing right now, do not filter it out
@@ -48346,7 +51799,7 @@ var ts;
                         continue;
                     }
                     var existingName = void 0;
-                    if (m.kind === 166 /* BindingElement */ && m.propertyName) {
+                    if (m.kind === 168 /* BindingElement */ && m.propertyName) {
                         // include only identifiers in completion list
                         if (m.propertyName.kind === 69 /* Identifier */) {
                             existingName = m.propertyName.text;
@@ -48376,7 +51829,7 @@ var ts;
                     if (attr.getStart() <= position && position <= attr.getEnd()) {
                         continue;
                     }
-                    if (attr.kind === 241 /* JsxAttribute */) {
+                    if (attr.kind === 245 /* JsxAttribute */) {
                         seenNames[attr.name.text] = true;
                     }
                 }
@@ -48389,21 +51842,21 @@ var ts;
             if (!completionData) {
                 return undefined;
             }
-            var symbols = completionData.symbols, isMemberCompletion = completionData.isMemberCompletion, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, isRightOfDot = completionData.isRightOfDot, isJsDocTagName = completionData.isJsDocTagName;
+            var symbols = completionData.symbols, isMemberCompletion = completionData.isMemberCompletion, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, isJsDocTagName = completionData.isJsDocTagName;
             if (isJsDocTagName) {
                 // If the current position is a jsDoc tag name, only tag names should be provided for completion
                 return { isMemberCompletion: false, isNewIdentifierLocation: false, entries: getAllJsDocCompletionEntries() };
             }
             var sourceFile = getValidSourceFile(fileName);
             var entries = [];
-            if (isRightOfDot && ts.isSourceFileJavaScript(sourceFile)) {
+            if (ts.isSourceFileJavaScript(sourceFile)) {
                 var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries);
-                ts.addRange(entries, getJavaScriptCompletionEntries(sourceFile, uniqueNames));
+                ts.addRange(entries, getJavaScriptCompletionEntries(sourceFile, location.pos, uniqueNames));
             }
             else {
                 if (!symbols || symbols.length === 0) {
                     if (sourceFile.languageVariant === 1 /* JSX */ &&
-                        location.parent && location.parent.kind === 240 /* JsxClosingElement */) {
+                        location.parent && location.parent.kind === 244 /* JsxClosingElement */) {
                         // In the TypeScript JSX element, if such element is not defined. When users query for completion at closing tag,
                         // instead of simply giving unknown value, the completion will return the tag-name of an associated opening-element.
                         // For example:
@@ -48427,14 +51880,18 @@ var ts;
                 ts.addRange(entries, keywordCompletions);
             }
             return { isMemberCompletion: isMemberCompletion, isNewIdentifierLocation: isNewIdentifierLocation, entries: entries };
-            function getJavaScriptCompletionEntries(sourceFile, uniqueNames) {
+            function getJavaScriptCompletionEntries(sourceFile, position, uniqueNames) {
                 var entries = [];
                 var target = program.getCompilerOptions().target;
                 var nameTable = getNameTable(sourceFile);
-                for (var name_35 in nameTable) {
-                    if (!uniqueNames[name_35]) {
-                        uniqueNames[name_35] = name_35;
-                        var displayName = getCompletionEntryDisplayName(name_35, target, /*performCharacterChecks*/ true);
+                for (var name_40 in nameTable) {
+                    // Skip identifiers produced only from the current location
+                    if (nameTable[name_40] === position) {
+                        continue;
+                    }
+                    if (!uniqueNames[name_40]) {
+                        uniqueNames[name_40] = name_40;
+                        var displayName = getCompletionEntryDisplayName(name_40, target, /*performCharacterChecks*/ true);
                         if (displayName) {
                             var entry = {
                                 name: displayName,
@@ -48484,8 +51941,8 @@ var ts;
                 var start = new Date().getTime();
                 var uniqueNames = {};
                 if (symbols) {
-                    for (var _i = 0, symbols_3 = symbols; _i < symbols_3.length; _i++) {
-                        var symbol = symbols_3[_i];
+                    for (var _i = 0, symbols_4 = symbols; _i < symbols_4.length; _i++) {
+                        var symbol = symbols_4[_i];
                         var entry = createCompletionEntry(symbol, location);
                         if (entry) {
                             var id = ts.escapeIdentifier(entry.name);
@@ -48507,11 +51964,11 @@ var ts;
             if (completionData) {
                 var symbols = completionData.symbols, location_2 = completionData.location;
                 // Find the symbol with the matching entry name.
-                var target = program.getCompilerOptions().target;
+                var target_2 = program.getCompilerOptions().target;
                 // We don't need to perform character checks here because we're only comparing the
                 // name against 'entryName' (which is known to be good), not building a new
                 // completion entry.
-                var symbol = ts.forEach(symbols, function (s) { return getCompletionEntryDisplayNameForSymbol(s, target, /*performCharacterChecks*/ false, location_2) === entryName ? s : undefined; });
+                var symbol = ts.forEach(symbols, function (s) { return getCompletionEntryDisplayNameForSymbol(s, target_2, /*performCharacterChecks*/ false, location_2) === entryName ? s : undefined; });
                 if (symbol) {
                     var _a = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, getValidSourceFile(fileName), location_2, location_2, 7 /* All */), displayParts = _a.displayParts, documentation = _a.documentation, symbolKind = _a.symbolKind;
                     return {
@@ -48540,7 +51997,7 @@ var ts;
         function getSymbolKind(symbol, location) {
             var flags = symbol.getFlags();
             if (flags & 32 /* Class */)
-                return ts.getDeclarationOfKind(symbol, 189 /* ClassExpression */) ?
+                return ts.getDeclarationOfKind(symbol, 191 /* ClassExpression */) ?
                     ScriptElementKind.localClassElement : ScriptElementKind.classElement;
             if (flags & 384 /* Enum */)
                 return ScriptElementKind.enumElement;
@@ -48571,6 +52028,9 @@ var ts;
             if (typeChecker.isArgumentsSymbol(symbol)) {
                 return ScriptElementKind.localVariableElement;
             }
+            if (location.kind === 97 /* ThisKeyword */ && ts.isExpression(location)) {
+                return ScriptElementKind.parameterElement;
+            }
             if (flags & 3 /* Variable */) {
                 if (ts.isFirstDeclarationOfSymbolParameter(symbol)) {
                     return ScriptElementKind.parameterElement;
@@ -48632,6 +52092,7 @@ var ts;
             var symbolFlags = symbol.flags;
             var symbolKind = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, symbolFlags, location);
             var hasAddedSymbolInfo;
+            var isThisExpression = location.kind === 97 /* ThisKeyword */ && ts.isExpression(location);
             var type;
             // Class at constructor site need to be shown as constructor apart from property,method, vars
             if (symbolKind !== ScriptElementKind.unknown || symbolFlags & 32 /* Class */ || symbolFlags & 8388608 /* Alias */) {
@@ -48639,10 +52100,10 @@ var ts;
                 if (symbolKind === ScriptElementKind.memberGetAccessorElement || symbolKind === ScriptElementKind.memberSetAccessorElement) {
                     symbolKind = ScriptElementKind.memberVariableElement;
                 }
-                var signature;
-                type = typeChecker.getTypeOfSymbolAtLocation(symbol, location);
+                var signature = void 0;
+                type = isThisExpression ? typeChecker.getTypeAtLocation(location) : typeChecker.getTypeOfSymbolAtLocation(symbol, location);
                 if (type) {
-                    if (location.parent && location.parent.kind === 169 /* PropertyAccessExpression */) {
+                    if (location.parent && location.parent.kind === 171 /* PropertyAccessExpression */) {
                         var right = location.parent.name;
                         // Either the location is on the right of a property access, or on the left and the right is missing
                         if (right === location || (right && right.getFullWidth() === 0)) {
@@ -48650,8 +52111,8 @@ var ts;
                         }
                     }
                     // try get the call/construct signature from the type if it matches
-                    var callExpression;
-                    if (location.kind === 171 /* CallExpression */ || location.kind === 172 /* NewExpression */) {
+                    var callExpression = void 0;
+                    if (location.kind === 173 /* CallExpression */ || location.kind === 174 /* NewExpression */) {
                         callExpression = location;
                     }
                     else if (isCallExpressionTarget(location) || isNewExpressionTarget(location)) {
@@ -48664,7 +52125,7 @@ var ts;
                             // Use the first candidate:
                             signature = candidateSignatures[0];
                         }
-                        var useConstructSignatures = callExpression.kind === 172 /* NewExpression */ || callExpression.expression.kind === 95 /* SuperKeyword */;
+                        var useConstructSignatures = callExpression.kind === 174 /* NewExpression */ || callExpression.expression.kind === 95 /* SuperKeyword */;
                         var allSignatures = useConstructSignatures ? type.getConstructSignatures() : type.getCallSignatures();
                         if (!ts.contains(allSignatures, signature.target) && !ts.contains(allSignatures, signature)) {
                             // Get the first signature if there is one -- allSignatures may contain
@@ -48717,24 +52178,24 @@ var ts;
                         }
                     }
                     else if ((isNameOfFunctionDeclaration(location) && !(symbol.flags & 98304 /* Accessor */)) ||
-                        (location.kind === 121 /* ConstructorKeyword */ && location.parent.kind === 145 /* Constructor */)) {
+                        (location.kind === 121 /* ConstructorKeyword */ && location.parent.kind === 147 /* Constructor */)) {
                         // get the signature from the declaration and write it
                         var functionDeclaration = location.parent;
-                        var allSignatures = functionDeclaration.kind === 145 /* Constructor */ ? type.getConstructSignatures() : type.getCallSignatures();
+                        var allSignatures = functionDeclaration.kind === 147 /* Constructor */ ? type.getConstructSignatures() : type.getCallSignatures();
                         if (!typeChecker.isImplementationOfOverload(functionDeclaration)) {
                             signature = typeChecker.getSignatureFromDeclaration(functionDeclaration);
                         }
                         else {
                             signature = allSignatures[0];
                         }
-                        if (functionDeclaration.kind === 145 /* Constructor */) {
+                        if (functionDeclaration.kind === 147 /* Constructor */) {
                             // show (constructor) Type(...) signature
                             symbolKind = ScriptElementKind.constructorImplementationElement;
                             addPrefixForAnyFunctionOrVar(type.symbol, symbolKind);
                         }
                         else {
                             // (function/method) symbol(..signature)
-                            addPrefixForAnyFunctionOrVar(functionDeclaration.kind === 148 /* CallSignature */ &&
+                            addPrefixForAnyFunctionOrVar(functionDeclaration.kind === 150 /* CallSignature */ &&
                                 !(type.symbol.flags & 2048 /* TypeLiteral */ || type.symbol.flags & 4096 /* ObjectLiteral */) ? type.symbol : symbol, symbolKind);
                         }
                         addSignatureDisplayParts(signature, allSignatures);
@@ -48742,8 +52203,8 @@ var ts;
                     }
                 }
             }
-            if (symbolFlags & 32 /* Class */ && !hasAddedSymbolInfo) {
-                if (ts.getDeclarationOfKind(symbol, 189 /* ClassExpression */)) {
+            if (symbolFlags & 32 /* Class */ && !hasAddedSymbolInfo && !isThisExpression) {
+                if (ts.getDeclarationOfKind(symbol, 191 /* ClassExpression */)) {
                     // Special case for class expressions because we would like to indicate that
                     // the class name is local to the class body (similar to function expression)
                     //      (local class) class <className>
@@ -48766,7 +52227,7 @@ var ts;
             }
             if (symbolFlags & 524288 /* TypeAlias */) {
                 addNewLineIfDisplayPartsExist();
-                displayParts.push(ts.keywordPart(132 /* TypeKeyword */));
+                displayParts.push(ts.keywordPart(133 /* TypeKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 writeTypeParametersOfSymbol(symbol, sourceFile);
@@ -48787,7 +52248,7 @@ var ts;
             }
             if (symbolFlags & 1536 /* Module */) {
                 addNewLineIfDisplayPartsExist();
-                var declaration = ts.getDeclarationOfKind(symbol, 221 /* ModuleDeclaration */);
+                var declaration = ts.getDeclarationOfKind(symbol, 224 /* ModuleDeclaration */);
                 var isNamespace = declaration && declaration.name && declaration.name.kind === 69 /* Identifier */;
                 displayParts.push(ts.keywordPart(isNamespace ? 126 /* NamespaceKeyword */ : 125 /* ModuleKeyword */));
                 displayParts.push(ts.spacePart());
@@ -48810,17 +52271,17 @@ var ts;
                 }
                 else {
                     // Method/function type parameter
-                    var declaration = ts.getDeclarationOfKind(symbol, 138 /* TypeParameter */);
+                    var declaration = ts.getDeclarationOfKind(symbol, 140 /* TypeParameter */);
                     ts.Debug.assert(declaration !== undefined);
                     declaration = declaration.parent;
                     if (declaration) {
                         if (ts.isFunctionLikeKind(declaration.kind)) {
                             var signature = typeChecker.getSignatureFromDeclaration(declaration);
-                            if (declaration.kind === 149 /* ConstructSignature */) {
+                            if (declaration.kind === 151 /* ConstructSignature */) {
                                 displayParts.push(ts.keywordPart(92 /* NewKeyword */));
                                 displayParts.push(ts.spacePart());
                             }
-                            else if (declaration.kind !== 148 /* CallSignature */ && declaration.name) {
+                            else if (declaration.kind !== 150 /* CallSignature */ && declaration.name) {
                                 addFullSymbolName(declaration.symbol);
                             }
                             ts.addRange(displayParts, ts.signatureToDisplayParts(typeChecker, signature, sourceFile, 32 /* WriteTypeArgumentsOfSignature */));
@@ -48829,7 +52290,7 @@ var ts;
                             // Type alias type parameter
                             // For example
                             //      type list<T> = T[];  // Both T will go through same code path
-                            displayParts.push(ts.keywordPart(132 /* TypeKeyword */));
+                            displayParts.push(ts.keywordPart(133 /* TypeKeyword */));
                             displayParts.push(ts.spacePart());
                             addFullSymbolName(declaration.symbol);
                             writeTypeParametersOfSymbol(declaration.symbol, sourceFile);
@@ -48840,7 +52301,7 @@ var ts;
             if (symbolFlags & 8 /* EnumMember */) {
                 addPrefixForAnyFunctionOrVar(symbol, "enum member");
                 var declaration = symbol.declarations[0];
-                if (declaration.kind === 250 /* EnumMember */) {
+                if (declaration.kind === 254 /* EnumMember */) {
                     var constantValue = typeChecker.getConstantValue(declaration);
                     if (constantValue !== undefined) {
                         displayParts.push(ts.spacePart());
@@ -48856,13 +52317,13 @@ var ts;
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 ts.forEach(symbol.declarations, function (declaration) {
-                    if (declaration.kind === 224 /* ImportEqualsDeclaration */) {
+                    if (declaration.kind === 228 /* ImportEqualsDeclaration */) {
                         var importEqualsDeclaration = declaration;
                         if (ts.isExternalModuleImportEqualsDeclaration(importEqualsDeclaration)) {
                             displayParts.push(ts.spacePart());
                             displayParts.push(ts.operatorPart(56 /* EqualsToken */));
                             displayParts.push(ts.spacePart());
-                            displayParts.push(ts.keywordPart(127 /* RequireKeyword */));
+                            displayParts.push(ts.keywordPart(128 /* RequireKeyword */));
                             displayParts.push(ts.punctuationPart(17 /* OpenParenToken */));
                             displayParts.push(ts.displayPart(ts.getTextOfNode(ts.getExternalModuleImportEqualsDeclarationExpression(importEqualsDeclaration)), SymbolDisplayPartKind.stringLiteral));
                             displayParts.push(ts.punctuationPart(18 /* CloseParenToken */));
@@ -48883,11 +52344,18 @@ var ts;
             if (!hasAddedSymbolInfo) {
                 if (symbolKind !== ScriptElementKind.unknown) {
                     if (type) {
-                        addPrefixForAnyFunctionOrVar(symbol, symbolKind);
+                        if (isThisExpression) {
+                            addNewLineIfDisplayPartsExist();
+                            displayParts.push(ts.keywordPart(97 /* ThisKeyword */));
+                        }
+                        else {
+                            addPrefixForAnyFunctionOrVar(symbol, symbolKind);
+                        }
                         // For properties, variables and local vars: show the type
                         if (symbolKind === ScriptElementKind.memberVariableElement ||
                             symbolFlags & 3 /* Variable */ ||
-                            symbolKind === ScriptElementKind.localVariableElement) {
+                            symbolKind === ScriptElementKind.localVariableElement ||
+                            isThisExpression) {
                             displayParts.push(ts.punctuationPart(54 /* ColonToken */));
                             displayParts.push(ts.spacePart());
                             // If the type is type parameter, format it specially
@@ -48989,10 +52457,10 @@ var ts;
                 // Try getting just type at this position and show
                 switch (node.kind) {
                     case 69 /* Identifier */:
-                    case 169 /* PropertyAccessExpression */:
-                    case 136 /* QualifiedName */:
+                    case 171 /* PropertyAccessExpression */:
+                    case 138 /* QualifiedName */:
                     case 97 /* ThisKeyword */:
-                    case 162 /* ThisType */:
+                    case 164 /* ThisType */:
                     case 95 /* SuperKeyword */:
                         // For the identifiers/this/super etc get the type at position
                         var type = typeChecker.getTypeAtLocation(node);
@@ -49071,8 +52539,8 @@ var ts;
                 var declarations = [];
                 var definition;
                 ts.forEach(signatureDeclarations, function (d) {
-                    if ((selectConstructors && d.kind === 145 /* Constructor */) ||
-                        (!selectConstructors && (d.kind === 216 /* FunctionDeclaration */ || d.kind === 144 /* MethodDeclaration */ || d.kind === 143 /* MethodSignature */))) {
+                    if ((selectConstructors && d.kind === 147 /* Constructor */) ||
+                        (!selectConstructors && (d.kind === 219 /* FunctionDeclaration */ || d.kind === 146 /* MethodDeclaration */ || d.kind === 145 /* MethodSignature */))) {
                         declarations.push(d);
                         if (d.body)
                             definition = d;
@@ -49089,6 +52557,25 @@ var ts;
                 return false;
             }
         }
+        function findReferenceInPosition(refs, pos) {
+            for (var _i = 0, refs_1 = refs; _i < refs_1.length; _i++) {
+                var ref = refs_1[_i];
+                if (ref.pos <= pos && pos < ref.end) {
+                    return ref;
+                }
+            }
+            return undefined;
+        }
+        function getDefinitionInfoForFileReference(name, targetFileName) {
+            return {
+                fileName: targetFileName,
+                textSpan: ts.createTextSpanFromBounds(0, 0),
+                kind: ScriptElementKind.scriptElement,
+                name: name,
+                containerName: undefined,
+                containerKind: undefined
+            };
+        }
         /// Goto definition
         function getDefinitionAtPosition(fileName, position) {
             synchronizeHostData();
@@ -49104,18 +52591,20 @@ var ts;
                 return label ? [createDefinitionInfo(label, ScriptElementKind.label, labelName, /*containerName*/ undefined)] : undefined;
             }
             /// Triple slash reference comments
-            var comment = ts.forEach(sourceFile.referencedFiles, function (r) { return (r.pos <= position && position < r.end) ? r : undefined; });
+            var comment = findReferenceInPosition(sourceFile.referencedFiles, position);
             if (comment) {
                 var referenceFile = ts.tryResolveScriptReference(program, sourceFile, comment);
                 if (referenceFile) {
-                    return [{
-                            fileName: referenceFile.fileName,
-                            textSpan: ts.createTextSpanFromBounds(0, 0),
-                            kind: ScriptElementKind.scriptElement,
-                            name: comment.fileName,
-                            containerName: undefined,
-                            containerKind: undefined
-                        }];
+                    return [getDefinitionInfoForFileReference(comment.fileName, referenceFile.fileName)];
+                }
+                return undefined;
+            }
+            // Type reference directives
+            var typeReferenceDirective = findReferenceInPosition(sourceFile.typeReferenceDirectives, position);
+            if (typeReferenceDirective) {
+                var referenceFile = ts.lookUp(program.resolvedTypeReferenceDirectives, typeReferenceDirective.fileName);
+                if (referenceFile && referenceFile.resolvedFileName) {
+                    return [getDefinitionInfoForFileReference(typeReferenceDirective.fileName, referenceFile.resolvedFileName)];
                 }
                 return undefined;
             }
@@ -49132,7 +52621,14 @@ var ts;
             // to jump to the implementation directly.
             if (symbol.flags & 8388608 /* Alias */) {
                 var declaration = symbol.declarations[0];
-                if (node.kind === 69 /* Identifier */ && node.parent === declaration) {
+                // Go to the original declaration for cases:
+                //
+                //   (1) when the aliased symbol was declared in the location(parent).
+                //   (2) when the aliased symbol is originating from a named import.
+                //
+                if (node.kind === 69 /* Identifier */ &&
+                    (node.parent === declaration ||
+                        (declaration.kind === 233 /* ImportSpecifier */ && declaration.parent && declaration.parent.kind === 232 /* NamedImports */))) {
                     symbol = typeChecker.getAliasedSymbol(symbol);
                 }
             }
@@ -49141,16 +52637,16 @@ var ts;
             // go to the declaration of the property name (in this case stay at the same position). However, if go-to-definition
             // is performed at the location of property access, we would like to go to definition of the property in the short-hand
             // assignment. This case and others are handled by the following code.
-            if (node.parent.kind === 249 /* ShorthandPropertyAssignment */) {
+            if (node.parent.kind === 253 /* ShorthandPropertyAssignment */) {
                 var shorthandSymbol = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
                 if (!shorthandSymbol) {
                     return [];
                 }
                 var shorthandDeclarations = shorthandSymbol.getDeclarations();
-                var shorthandSymbolKind = getSymbolKind(shorthandSymbol, node);
-                var shorthandSymbolName = typeChecker.symbolToString(shorthandSymbol);
-                var shorthandContainerName = typeChecker.symbolToString(symbol.parent, node);
-                return ts.map(shorthandDeclarations, function (declaration) { return createDefinitionInfo(declaration, shorthandSymbolKind, shorthandSymbolName, shorthandContainerName); });
+                var shorthandSymbolKind_1 = getSymbolKind(shorthandSymbol, node);
+                var shorthandSymbolName_1 = typeChecker.symbolToString(shorthandSymbol);
+                var shorthandContainerName_1 = typeChecker.symbolToString(symbol.parent, node);
+                return ts.map(shorthandDeclarations, function (declaration) { return createDefinitionInfo(declaration, shorthandSymbolKind_1, shorthandSymbolName_1, shorthandContainerName_1); });
             }
             return getDefinitionFromSymbol(symbol, node);
         }
@@ -49172,13 +52668,13 @@ var ts;
                 return undefined;
             }
             if (type.flags & 16384 /* Union */) {
-                var result = [];
+                var result_3 = [];
                 ts.forEach(type.types, function (t) {
                     if (t.symbol) {
-                        ts.addRange(/*to*/ result, /*from*/ getDefinitionFromSymbol(t.symbol, node));
+                        ts.addRange(/*to*/ result_3, /*from*/ getDefinitionFromSymbol(t.symbol, node));
                     }
                 });
-                return result;
+                return result_3;
             }
             if (!type.symbol) {
                 return undefined;
@@ -49188,10 +52684,10 @@ var ts;
         function getOccurrencesAtPosition(fileName, position) {
             var results = getOccurrencesAtPositionCore(fileName, position);
             if (results) {
-                var sourceFile = getCanonicalFileName(ts.normalizeSlashes(fileName));
+                var sourceFile_2 = getCanonicalFileName(ts.normalizeSlashes(fileName));
                 // Get occurrences only supports reporting occurrences for the file queried.  So
                 // filter down to that list.
-                results = ts.filter(results, function (r) { return getCanonicalFileName(ts.normalizeSlashes(r.fileName)) === sourceFile; });
+                results = ts.filter(results, function (r) { return getCanonicalFileName(ts.normalizeSlashes(r.fileName)) === sourceFile_2; });
             }
             return results;
         }
@@ -49217,7 +52713,7 @@ var ts;
             function getSemanticDocumentHighlights(node) {
                 if (node.kind === 69 /* Identifier */ ||
                     node.kind === 97 /* ThisKeyword */ ||
-                    node.kind === 162 /* ThisType */ ||
+                    node.kind === 164 /* ThisType */ ||
                     node.kind === 95 /* SuperKeyword */ ||
                     isLiteralNameOfPropertyDeclarationOrIndexAccess(node) ||
                     isNameOfExternalModuleImportOrDeclaration(node)) {
@@ -49271,75 +52767,75 @@ var ts;
                         switch (node.kind) {
                             case 88 /* IfKeyword */:
                             case 80 /* ElseKeyword */:
-                                if (hasKind(node.parent, 199 /* IfStatement */)) {
+                                if (hasKind(node.parent, 202 /* IfStatement */)) {
                                     return getIfElseOccurrences(node.parent);
                                 }
                                 break;
                             case 94 /* ReturnKeyword */:
-                                if (hasKind(node.parent, 207 /* ReturnStatement */)) {
+                                if (hasKind(node.parent, 210 /* ReturnStatement */)) {
                                     return getReturnOccurrences(node.parent);
                                 }
                                 break;
                             case 98 /* ThrowKeyword */:
-                                if (hasKind(node.parent, 211 /* ThrowStatement */)) {
+                                if (hasKind(node.parent, 214 /* ThrowStatement */)) {
                                     return getThrowOccurrences(node.parent);
                                 }
                                 break;
                             case 72 /* CatchKeyword */:
-                                if (hasKind(parent(parent(node)), 212 /* TryStatement */)) {
+                                if (hasKind(parent(parent(node)), 215 /* TryStatement */)) {
                                     return getTryCatchFinallyOccurrences(node.parent.parent);
                                 }
                                 break;
                             case 100 /* TryKeyword */:
                             case 85 /* FinallyKeyword */:
-                                if (hasKind(parent(node), 212 /* TryStatement */)) {
+                                if (hasKind(parent(node), 215 /* TryStatement */)) {
                                     return getTryCatchFinallyOccurrences(node.parent);
                                 }
                                 break;
                             case 96 /* SwitchKeyword */:
-                                if (hasKind(node.parent, 209 /* SwitchStatement */)) {
+                                if (hasKind(node.parent, 212 /* SwitchStatement */)) {
                                     return getSwitchCaseDefaultOccurrences(node.parent);
                                 }
                                 break;
                             case 71 /* CaseKeyword */:
                             case 77 /* DefaultKeyword */:
-                                if (hasKind(parent(parent(parent(node))), 209 /* SwitchStatement */)) {
+                                if (hasKind(parent(parent(parent(node))), 212 /* SwitchStatement */)) {
                                     return getSwitchCaseDefaultOccurrences(node.parent.parent.parent);
                                 }
                                 break;
                             case 70 /* BreakKeyword */:
                             case 75 /* ContinueKeyword */:
-                                if (hasKind(node.parent, 206 /* BreakStatement */) || hasKind(node.parent, 205 /* ContinueStatement */)) {
+                                if (hasKind(node.parent, 209 /* BreakStatement */) || hasKind(node.parent, 208 /* ContinueStatement */)) {
                                     return getBreakOrContinueStatementOccurrences(node.parent);
                                 }
                                 break;
                             case 86 /* ForKeyword */:
-                                if (hasKind(node.parent, 202 /* ForStatement */) ||
-                                    hasKind(node.parent, 203 /* ForInStatement */) ||
-                                    hasKind(node.parent, 204 /* ForOfStatement */)) {
+                                if (hasKind(node.parent, 205 /* ForStatement */) ||
+                                    hasKind(node.parent, 206 /* ForInStatement */) ||
+                                    hasKind(node.parent, 207 /* ForOfStatement */)) {
                                     return getLoopBreakContinueOccurrences(node.parent);
                                 }
                                 break;
                             case 104 /* WhileKeyword */:
                             case 79 /* DoKeyword */:
-                                if (hasKind(node.parent, 201 /* WhileStatement */) || hasKind(node.parent, 200 /* DoStatement */)) {
+                                if (hasKind(node.parent, 204 /* WhileStatement */) || hasKind(node.parent, 203 /* DoStatement */)) {
                                     return getLoopBreakContinueOccurrences(node.parent);
                                 }
                                 break;
                             case 121 /* ConstructorKeyword */:
-                                if (hasKind(node.parent, 145 /* Constructor */)) {
+                                if (hasKind(node.parent, 147 /* Constructor */)) {
                                     return getConstructorOccurrences(node.parent);
                                 }
                                 break;
                             case 123 /* GetKeyword */:
-                            case 129 /* SetKeyword */:
-                                if (hasKind(node.parent, 146 /* GetAccessor */) || hasKind(node.parent, 147 /* SetAccessor */)) {
+                            case 130 /* SetKeyword */:
+                                if (hasKind(node.parent, 148 /* GetAccessor */) || hasKind(node.parent, 149 /* SetAccessor */)) {
                                     return getGetAndSetOccurrences(node.parent);
                                 }
                                 break;
                             default:
                                 if (ts.isModifierKind(node.kind) && node.parent &&
-                                    (ts.isDeclaration(node.parent) || node.parent.kind === 196 /* VariableStatement */)) {
+                                    (ts.isDeclaration(node.parent) || node.parent.kind === 199 /* VariableStatement */)) {
                                     return getModifierOccurrences(node.kind, node.parent);
                                 }
                         }
@@ -49355,10 +52851,10 @@ var ts;
                     aggregate(node);
                     return statementAccumulator;
                     function aggregate(node) {
-                        if (node.kind === 211 /* ThrowStatement */) {
+                        if (node.kind === 214 /* ThrowStatement */) {
                             statementAccumulator.push(node);
                         }
-                        else if (node.kind === 212 /* TryStatement */) {
+                        else if (node.kind === 215 /* TryStatement */) {
                             var tryStatement = node;
                             if (tryStatement.catchClause) {
                                 aggregate(tryStatement.catchClause);
@@ -49385,19 +52881,19 @@ var ts;
                 function getThrowStatementOwner(throwStatement) {
                     var child = throwStatement;
                     while (child.parent) {
-                        var parent_13 = child.parent;
-                        if (ts.isFunctionBlock(parent_13) || parent_13.kind === 251 /* SourceFile */) {
-                            return parent_13;
+                        var parent_16 = child.parent;
+                        if (ts.isFunctionBlock(parent_16) || parent_16.kind === 255 /* SourceFile */) {
+                            return parent_16;
                         }
                         // A throw-statement is only owned by a try-statement if the try-statement has
                         // a catch clause, and if the throw-statement occurs within the try block.
-                        if (parent_13.kind === 212 /* TryStatement */) {
-                            var tryStatement = parent_13;
+                        if (parent_16.kind === 215 /* TryStatement */) {
+                            var tryStatement = parent_16;
                             if (tryStatement.tryBlock === child && tryStatement.catchClause) {
                                 return child;
                             }
                         }
-                        child = parent_13;
+                        child = parent_16;
                     }
                     return undefined;
                 }
@@ -49406,7 +52902,7 @@ var ts;
                     aggregate(node);
                     return statementAccumulator;
                     function aggregate(node) {
-                        if (node.kind === 206 /* BreakStatement */ || node.kind === 205 /* ContinueStatement */) {
+                        if (node.kind === 209 /* BreakStatement */ || node.kind === 208 /* ContinueStatement */) {
                             statementAccumulator.push(node);
                         }
                         else if (!ts.isFunctionLike(node)) {
@@ -49421,16 +52917,16 @@ var ts;
                 function getBreakOrContinueOwner(statement) {
                     for (var node_2 = statement.parent; node_2; node_2 = node_2.parent) {
                         switch (node_2.kind) {
-                            case 209 /* SwitchStatement */:
-                                if (statement.kind === 205 /* ContinueStatement */) {
+                            case 212 /* SwitchStatement */:
+                                if (statement.kind === 208 /* ContinueStatement */) {
                                     continue;
                                 }
                             // Fall through.
-                            case 202 /* ForStatement */:
-                            case 203 /* ForInStatement */:
-                            case 204 /* ForOfStatement */:
-                            case 201 /* WhileStatement */:
-                            case 200 /* DoStatement */:
+                            case 205 /* ForStatement */:
+                            case 206 /* ForInStatement */:
+                            case 207 /* ForOfStatement */:
+                            case 204 /* WhileStatement */:
+                            case 203 /* DoStatement */:
                                 if (!statement.label || isLabeledBy(node_2, statement.label.text)) {
                                     return node_2;
                                 }
@@ -49449,24 +52945,24 @@ var ts;
                     var container = declaration.parent;
                     // Make sure we only highlight the keyword when it makes sense to do so.
                     if (ts.isAccessibilityModifier(modifier)) {
-                        if (!(container.kind === 217 /* ClassDeclaration */ ||
-                            container.kind === 189 /* ClassExpression */ ||
-                            (declaration.kind === 139 /* Parameter */ && hasKind(container, 145 /* Constructor */)))) {
+                        if (!(container.kind === 220 /* ClassDeclaration */ ||
+                            container.kind === 191 /* ClassExpression */ ||
+                            (declaration.kind === 141 /* Parameter */ && hasKind(container, 147 /* Constructor */)))) {
                             return undefined;
                         }
                     }
                     else if (modifier === 113 /* StaticKeyword */) {
-                        if (!(container.kind === 217 /* ClassDeclaration */ || container.kind === 189 /* ClassExpression */)) {
+                        if (!(container.kind === 220 /* ClassDeclaration */ || container.kind === 191 /* ClassExpression */)) {
                             return undefined;
                         }
                     }
                     else if (modifier === 82 /* ExportKeyword */ || modifier === 122 /* DeclareKeyword */) {
-                        if (!(container.kind === 222 /* ModuleBlock */ || container.kind === 251 /* SourceFile */)) {
+                        if (!(container.kind === 225 /* ModuleBlock */ || container.kind === 255 /* SourceFile */)) {
                             return undefined;
                         }
                     }
                     else if (modifier === 115 /* AbstractKeyword */) {
-                        if (!(container.kind === 217 /* ClassDeclaration */ || declaration.kind === 217 /* ClassDeclaration */)) {
+                        if (!(container.kind === 220 /* ClassDeclaration */ || declaration.kind === 220 /* ClassDeclaration */)) {
                             return undefined;
                         }
                     }
@@ -49478,8 +52974,8 @@ var ts;
                     var modifierFlag = getFlagFromModifier(modifier);
                     var nodes;
                     switch (container.kind) {
-                        case 222 /* ModuleBlock */:
-                        case 251 /* SourceFile */:
+                        case 225 /* ModuleBlock */:
+                        case 255 /* SourceFile */:
                             // Container is either a class declaration or the declaration is a classDeclaration
                             if (modifierFlag & 128 /* Abstract */) {
                                 nodes = declaration.members.concat(declaration);
@@ -49488,17 +52984,17 @@ var ts;
                                 nodes = container.statements;
                             }
                             break;
-                        case 145 /* Constructor */:
+                        case 147 /* Constructor */:
                             nodes = container.parameters.concat(container.parent.members);
                             break;
-                        case 217 /* ClassDeclaration */:
-                        case 189 /* ClassExpression */:
+                        case 220 /* ClassDeclaration */:
+                        case 191 /* ClassExpression */:
                             nodes = container.members;
                             // 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 & 56 /* AccessibilityModifier */) {
+                            if (modifierFlag & 28 /* AccessibilityModifier */) {
                                 var constructor = ts.forEach(container.members, function (member) {
-                                    return member.kind === 145 /* Constructor */ && member;
+                                    return member.kind === 147 /* Constructor */ && member;
                                 });
                                 if (constructor) {
                                     nodes = nodes.concat(constructor.parameters);
@@ -49520,17 +53016,17 @@ var ts;
                     function getFlagFromModifier(modifier) {
                         switch (modifier) {
                             case 112 /* PublicKeyword */:
-                                return 8 /* Public */;
+                                return 4 /* Public */;
                             case 110 /* PrivateKeyword */:
-                                return 16 /* Private */;
+                                return 8 /* Private */;
                             case 111 /* ProtectedKeyword */:
-                                return 32 /* Protected */;
+                                return 16 /* Protected */;
                             case 113 /* StaticKeyword */:
-                                return 64 /* Static */;
+                                return 32 /* Static */;
                             case 82 /* ExportKeyword */:
-                                return 2 /* Export */;
+                                return 1 /* Export */;
                             case 122 /* DeclareKeyword */:
-                                return 4 /* Ambient */;
+                                return 2 /* Ambient */;
                             case 115 /* AbstractKeyword */:
                                 return 128 /* Abstract */;
                             default:
@@ -49551,13 +53047,13 @@ var ts;
                 }
                 function getGetAndSetOccurrences(accessorDeclaration) {
                     var keywords = [];
-                    tryPushAccessorKeyword(accessorDeclaration.symbol, 146 /* GetAccessor */);
-                    tryPushAccessorKeyword(accessorDeclaration.symbol, 147 /* SetAccessor */);
+                    tryPushAccessorKeyword(accessorDeclaration.symbol, 148 /* GetAccessor */);
+                    tryPushAccessorKeyword(accessorDeclaration.symbol, 149 /* SetAccessor */);
                     return ts.map(keywords, getHighlightSpanForNode);
                     function tryPushAccessorKeyword(accessorSymbol, accessorKind) {
                         var accessor = ts.getDeclarationOfKind(accessorSymbol, accessorKind);
                         if (accessor) {
-                            ts.forEach(accessor.getChildren(), function (child) { return pushKeywordIf(keywords, child, 123 /* GetKeyword */, 129 /* SetKeyword */); });
+                            ts.forEach(accessor.getChildren(), function (child) { return pushKeywordIf(keywords, child, 123 /* GetKeyword */, 130 /* SetKeyword */); });
                         }
                     }
                 }
@@ -49575,7 +53071,7 @@ var ts;
                     var keywords = [];
                     if (pushKeywordIf(keywords, loopNode.getFirstToken(), 86 /* ForKeyword */, 104 /* WhileKeyword */, 79 /* DoKeyword */)) {
                         // If we succeeded and got a do-while loop, then start looking for a 'while' keyword.
-                        if (loopNode.kind === 200 /* DoStatement */) {
+                        if (loopNode.kind === 203 /* DoStatement */) {
                             var loopTokens = loopNode.getChildren();
                             for (var i = loopTokens.length - 1; i >= 0; i--) {
                                 if (pushKeywordIf(keywords, loopTokens[i], 104 /* WhileKeyword */)) {
@@ -49596,13 +53092,13 @@ var ts;
                     var owner = getBreakOrContinueOwner(breakOrContinueStatement);
                     if (owner) {
                         switch (owner.kind) {
-                            case 202 /* ForStatement */:
-                            case 203 /* ForInStatement */:
-                            case 204 /* ForOfStatement */:
-                            case 200 /* DoStatement */:
-                            case 201 /* WhileStatement */:
+                            case 205 /* ForStatement */:
+                            case 206 /* ForInStatement */:
+                            case 207 /* ForOfStatement */:
+                            case 203 /* DoStatement */:
+                            case 204 /* WhileStatement */:
                                 return getLoopBreakContinueOccurrences(owner);
-                            case 209 /* SwitchStatement */:
+                            case 212 /* SwitchStatement */:
                                 return getSwitchCaseDefaultOccurrences(owner);
                         }
                     }
@@ -49656,7 +53152,7 @@ var ts;
                 function getReturnOccurrences(returnStatement) {
                     var func = ts.getContainingFunction(returnStatement);
                     // If we didn't find a containing function with a block body, bail out.
-                    if (!(func && hasKind(func.body, 195 /* Block */))) {
+                    if (!(func && hasKind(func.body, 198 /* Block */))) {
                         return undefined;
                     }
                     var keywords = [];
@@ -49672,7 +53168,7 @@ var ts;
                 function getIfElseOccurrences(ifStatement) {
                     var keywords = [];
                     // Traverse upwards through all parent if-statements linked by their else-branches.
-                    while (hasKind(ifStatement.parent, 199 /* IfStatement */) && ifStatement.parent.elseStatement === ifStatement) {
+                    while (hasKind(ifStatement.parent, 202 /* IfStatement */) && ifStatement.parent.elseStatement === ifStatement) {
                         ifStatement = ifStatement.parent;
                     }
                     // Now traverse back down through the else branches, aggregating if/else keywords of if-statements.
@@ -49685,7 +53181,7 @@ var ts;
                                 break;
                             }
                         }
-                        if (!hasKind(ifStatement.elseStatement, 199 /* IfStatement */)) {
+                        if (!hasKind(ifStatement.elseStatement, 202 /* IfStatement */)) {
                             break;
                         }
                         ifStatement = ifStatement.elseStatement;
@@ -49802,7 +53298,7 @@ var ts;
                     return getLabelReferencesInNode(node.parent, node);
                 }
             }
-            if (node.kind === 97 /* ThisKeyword */ || node.kind === 162 /* ThisType */) {
+            if (node.kind === 97 /* ThisKeyword */ || node.kind === 164 /* ThisType */) {
                 return getReferencesForThisKeyword(node, sourceFiles);
             }
             if (node.kind === 95 /* SuperKeyword */) {
@@ -49836,11 +53332,11 @@ var ts;
             }
             else {
                 var internedName = getInternedName(symbol, node, declarations);
-                for (var _i = 0, sourceFiles_3 = sourceFiles; _i < sourceFiles_3.length; _i++) {
-                    var sourceFile = sourceFiles_3[_i];
+                for (var _i = 0, sourceFiles_4 = sourceFiles; _i < sourceFiles_4.length; _i++) {
+                    var sourceFile = sourceFiles_4[_i];
                     cancellationToken.throwIfCancellationRequested();
                     var nameTable = getNameTable(sourceFile);
-                    if (ts.lookUp(nameTable, internedName)) {
+                    if (ts.lookUp(nameTable, internedName) !== undefined) {
                         result = result || [];
                         getReferencesInNode(sourceFile, symbol, declaredName, node, searchMeaning, findInStrings, findInComments, result, symbolToIndex);
                     }
@@ -49864,7 +53360,7 @@ var ts;
                 };
             }
             function isImportSpecifierSymbol(symbol) {
-                return (symbol.flags & 8388608 /* Alias */) && !!ts.getDeclarationOfKind(symbol, 229 /* ImportSpecifier */);
+                return (symbol.flags & 8388608 /* Alias */) && !!ts.getDeclarationOfKind(symbol, 233 /* ImportSpecifier */);
             }
             function getInternedName(symbol, location, declarations) {
                 // If this is an export or import specifier it could have been renamed using the 'as' syntax.
@@ -49890,18 +53386,18 @@ var ts;
                 // If this is the symbol of a named function expression or named class expression,
                 // then named references are limited to its own scope.
                 var valueDeclaration = symbol.valueDeclaration;
-                if (valueDeclaration && (valueDeclaration.kind === 176 /* FunctionExpression */ || valueDeclaration.kind === 189 /* ClassExpression */)) {
+                if (valueDeclaration && (valueDeclaration.kind === 178 /* FunctionExpression */ || valueDeclaration.kind === 191 /* ClassExpression */)) {
                     return valueDeclaration;
                 }
                 // If this is private property or method, the scope is the containing class
                 if (symbol.flags & (4 /* Property */ | 8192 /* Method */)) {
-                    var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) { return (d.flags & 16 /* Private */) ? d : undefined; });
+                    var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) { return (d.flags & 8 /* Private */) ? d : undefined; });
                     if (privateDeclaration) {
-                        return ts.getAncestor(privateDeclaration, 217 /* ClassDeclaration */);
+                        return ts.getAncestor(privateDeclaration, 220 /* ClassDeclaration */);
                     }
                 }
                 // If the symbol is an import we would like to find it if we are looking for what it imports.
-                // So consider it visibile outside its declaration scope.
+                // So consider it visible outside its declaration scope.
                 if (symbol.flags & 8388608 /* Alias */) {
                     return undefined;
                 }
@@ -49913,8 +53409,8 @@ var ts;
                 var scope;
                 var declarations = symbol.getDeclarations();
                 if (declarations) {
-                    for (var _i = 0, declarations_8 = declarations; _i < declarations_8.length; _i++) {
-                        var declaration = declarations_8[_i];
+                    for (var _i = 0, declarations_9 = declarations; _i < declarations_9.length; _i++) {
+                        var declaration = declarations_9[_i];
                         var container = getContainerNode(declaration);
                         if (!container) {
                             return undefined;
@@ -49923,7 +53419,7 @@ var ts;
                             // Different declarations have different containers, bail out
                             return undefined;
                         }
-                        if (container.kind === 251 /* SourceFile */ && !ts.isExternalModule(container)) {
+                        if (container.kind === 255 /* SourceFile */ && !ts.isExternalModule(container)) {
                             // This is a global variable and not an external module, any declaration defined
                             // within this scope is visible outside the file
                             return undefined;
@@ -50022,7 +53518,7 @@ var ts;
                 var possiblePositions = getPossibleSymbolReferencePositions(sourceFile, searchText, container.getStart(), container.getEnd());
                 if (possiblePositions.length) {
                     // Build the set of symbols to search for, initially it has only the current symbol
-                    var searchSymbols = populateSearchSymbolSet(searchSymbol, searchLocation);
+                    var searchSymbols_1 = populateSearchSymbolSet(searchSymbol, searchLocation);
                     ts.forEach(possiblePositions, function (position) {
                         cancellationToken.throwIfCancellationRequested();
                         var referenceLocation = ts.getTouchingPropertyName(sourceFile, position);
@@ -50054,12 +53550,12 @@ var ts;
                         if (referenceSymbol) {
                             var referenceSymbolDeclaration = referenceSymbol.valueDeclaration;
                             var shorthandValueSymbol = typeChecker.getShorthandAssignmentValueSymbol(referenceSymbolDeclaration);
-                            var relatedSymbol = getRelatedSymbol(searchSymbols, referenceSymbol, referenceLocation);
+                            var relatedSymbol = getRelatedSymbol(searchSymbols_1, referenceSymbol, referenceLocation);
                             if (relatedSymbol) {
                                 var referencedSymbol = getReferencedSymbol(relatedSymbol);
                                 referencedSymbol.references.push(getReferenceEntryFromNode(referenceLocation));
                             }
-                            else if (!(referenceSymbol.flags & 67108864 /* Transient */) && searchSymbols.indexOf(shorthandValueSymbol) >= 0) {
+                            else if (!(referenceSymbol.flags & 67108864 /* Transient */) && searchSymbols_1.indexOf(shorthandValueSymbol) >= 0) {
                                 var referencedSymbol = getReferencedSymbol(shorthandValueSymbol);
                                 referencedSymbol.references.push(getReferenceEntryFromNode(referenceSymbolDeclaration.name));
                             }
@@ -50094,15 +53590,15 @@ var ts;
                     return undefined;
                 }
                 // Whether 'super' occurs in a static context within a class.
-                var staticFlag = 64 /* Static */;
+                var staticFlag = 32 /* Static */;
                 switch (searchSpaceNode.kind) {
-                    case 142 /* PropertyDeclaration */:
-                    case 141 /* PropertySignature */:
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
-                    case 145 /* Constructor */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
+                    case 144 /* PropertyDeclaration */:
+                    case 143 /* PropertySignature */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
+                    case 147 /* Constructor */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
                         staticFlag &= searchSpaceNode.flags;
                         searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
                         break;
@@ -50122,7 +53618,7 @@ var 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 && (64 /* Static */ & container.flags) === staticFlag && container.parent.symbol === searchSpaceNode.symbol) {
+                    if (container && (32 /* Static */ & container.flags) === staticFlag && container.parent.symbol === searchSpaceNode.symbol) {
                         references.push(getReferenceEntryFromNode(node));
                     }
                 });
@@ -50132,29 +53628,29 @@ var ts;
             function getReferencesForThisKeyword(thisOrSuperKeyword, sourceFiles) {
                 var searchSpaceNode = ts.getThisContainer(thisOrSuperKeyword, /* includeArrowFunctions */ false);
                 // Whether 'this' occurs in a static context within a class.
-                var staticFlag = 64 /* Static */;
+                var staticFlag = 32 /* Static */;
                 switch (searchSpaceNode.kind) {
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
                         if (ts.isObjectLiteralMethod(searchSpaceNode)) {
                             break;
                         }
                     // fall through
-                    case 142 /* PropertyDeclaration */:
-                    case 141 /* PropertySignature */:
-                    case 145 /* Constructor */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
+                    case 144 /* PropertyDeclaration */:
+                    case 143 /* PropertySignature */:
+                    case 147 /* Constructor */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
                         staticFlag &= searchSpaceNode.flags;
                         searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
                         break;
-                    case 251 /* SourceFile */:
+                    case 255 /* SourceFile */:
                         if (ts.isExternalModule(searchSpaceNode)) {
                             return undefined;
                         }
                     // Fall through
-                    case 216 /* FunctionDeclaration */:
-                    case 176 /* FunctionExpression */:
+                    case 219 /* FunctionDeclaration */:
+                    case 178 /* FunctionExpression */:
                         break;
                     // Computed properties in classes are not handled here because references to this are illegal,
                     // so there is no point finding references to them.
@@ -50163,7 +53659,7 @@ var ts;
                 }
                 var references = [];
                 var possiblePositions;
-                if (searchSpaceNode.kind === 251 /* SourceFile */) {
+                if (searchSpaceNode.kind === 255 /* SourceFile */) {
                     ts.forEach(sourceFiles, function (sourceFile) {
                         possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "this", sourceFile.getStart(), sourceFile.getEnd());
                         getThisReferencesInFile(sourceFile, sourceFile, possiblePositions, references);
@@ -50189,33 +53685,33 @@ var ts;
                     ts.forEach(possiblePositions, function (position) {
                         cancellationToken.throwIfCancellationRequested();
                         var node = ts.getTouchingWord(sourceFile, position);
-                        if (!node || (node.kind !== 97 /* ThisKeyword */ && node.kind !== 162 /* ThisType */)) {
+                        if (!node || (node.kind !== 97 /* ThisKeyword */ && node.kind !== 164 /* ThisType */)) {
                             return;
                         }
                         var container = ts.getThisContainer(node, /* includeArrowFunctions */ false);
                         switch (searchSpaceNode.kind) {
-                            case 176 /* FunctionExpression */:
-                            case 216 /* FunctionDeclaration */:
+                            case 178 /* FunctionExpression */:
+                            case 219 /* FunctionDeclaration */:
                                 if (searchSpaceNode.symbol === container.symbol) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
-                            case 144 /* MethodDeclaration */:
-                            case 143 /* MethodSignature */:
+                            case 146 /* MethodDeclaration */:
+                            case 145 /* MethodSignature */:
                                 if (ts.isObjectLiteralMethod(searchSpaceNode) && searchSpaceNode.symbol === container.symbol) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
-                            case 189 /* ClassExpression */:
-                            case 217 /* ClassDeclaration */:
+                            case 191 /* ClassExpression */:
+                            case 220 /* 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 & 64 /* Static */) === staticFlag) {
+                                if (container.parent && searchSpaceNode.symbol === container.parent.symbol && (container.flags & 32 /* Static */) === staticFlag) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
-                            case 251 /* SourceFile */:
-                                if (container.kind === 251 /* SourceFile */ && !ts.isExternalModule(container)) {
+                            case 255 /* SourceFile */:
+                                if (container.kind === 255 /* SourceFile */ && !ts.isExternalModule(container)) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
@@ -50226,16 +53722,16 @@ var ts;
             function populateSearchSymbolSet(symbol, location) {
                 // The search set contains at least the current symbol
                 var result = [symbol];
-                // If the symbol is an alias, add what it alaises to the list
+                // If the symbol is an alias, add what it aliases to the list
                 if (isImportSpecifierSymbol(symbol)) {
                     result.push(typeChecker.getAliasedSymbol(symbol));
                 }
-                // For export specifiers, the exported name can be refering to a local symbol, e.g.:
+                // For export specifiers, the exported name can be referring to a local symbol, e.g.:
                 //     import {a} from "mod";
                 //     export {a as somethingElse}
                 // We want the *local* declaration of 'a' as declared in the import,
                 // *not* as declared within "mod" (or farther)
-                if (location.parent.kind === 233 /* ExportSpecifier */) {
+                if (location.parent.kind === 237 /* ExportSpecifier */) {
                     result.push(typeChecker.getExportSpecifierLocalTargetSymbol(location.parent));
                 }
                 // If the location is in a context sensitive location (i.e. in an object literal) try
@@ -50263,9 +53759,9 @@ var ts;
                 }
                 // If the symbol.valueDeclaration is a property parameter declaration,
                 // we should include both parameter declaration symbol and property declaration symbol
-                // Parameter Declaration symbol is only visible within function scope, so the symbol is stored in contructor.locals.
+                // Parameter Declaration symbol is only visible within function scope, so the symbol is stored in constructor.locals.
                 // Property Declaration symbol is a member of the class, so the symbol is stored in its class Declaration.symbol.members
-                if (symbol.valueDeclaration && symbol.valueDeclaration.kind === 139 /* Parameter */ &&
+                if (symbol.valueDeclaration && symbol.valueDeclaration.kind === 141 /* Parameter */ &&
                     ts.isParameterPropertyDeclaration(symbol.valueDeclaration)) {
                     result = result.concat(typeChecker.getSymbolsOfParameterPropertyDeclaration(symbol.valueDeclaration, symbol.name));
                 }
@@ -50285,9 +53781,9 @@ var ts;
             /**
              * Find symbol of the given property-name and add the symbol to the given result array
              * @param symbol a symbol to start searching for the given propertyName
-             * @param propertyName a name of property to serach for
+             * @param propertyName a name of property to search for
              * @param result an array of symbol of found property symbols
-             * @param previousIterationSymbolsCache a cache of symbol from previous iterations of calling this function to prevent infinite revisitng of the same symbol.
+             * @param previousIterationSymbolsCache a cache of symbol from previous iterations of calling this function to prevent infinite revisiting of the same symbol.
              *                                The value of previousIterationSymbol is undefined when the function is first called.
              */
             function getPropertySymbolsFromBaseTypes(symbol, propertyName, result, previousIterationSymbolsCache) {
@@ -50310,11 +53806,11 @@ var ts;
                 }
                 if (symbol.flags & (32 /* Class */ | 64 /* Interface */)) {
                     ts.forEach(symbol.getDeclarations(), function (declaration) {
-                        if (declaration.kind === 217 /* ClassDeclaration */) {
+                        if (declaration.kind === 220 /* ClassDeclaration */) {
                             getPropertySymbolFromTypeReference(ts.getClassExtendsHeritageClauseElement(declaration));
                             ts.forEach(ts.getClassImplementsHeritageClauseElements(declaration), getPropertySymbolFromTypeReference);
                         }
-                        else if (declaration.kind === 218 /* InterfaceDeclaration */) {
+                        else if (declaration.kind === 221 /* InterfaceDeclaration */) {
                             ts.forEach(ts.getInterfaceBaseTypeNodes(declaration), getPropertySymbolFromTypeReference);
                         }
                     });
@@ -50351,7 +53847,7 @@ var ts;
                 //     import {a} from "mod";
                 //     export {a as somethingElse}
                 // We want the local target of the export (i.e. the import symbol) and not the final target (i.e. "mod".a)
-                if (referenceLocation.parent.kind === 233 /* ExportSpecifier */) {
+                if (referenceLocation.parent.kind === 237 /* ExportSpecifier */) {
                     var aliasedSymbol = typeChecker.getExportSpecifierLocalTargetSymbol(referenceLocation.parent);
                     if (searchSymbols.indexOf(aliasedSymbol) >= 0) {
                         return aliasedSymbol;
@@ -50375,9 +53871,9 @@ var ts;
                     // Finally, try all properties with the same name in any type the containing type extended or implemented, and
                     // see if any is in the list
                     if (rootSymbol.parent && rootSymbol.parent.flags & (32 /* Class */ | 64 /* Interface */)) {
-                        var result_3 = [];
-                        getPropertySymbolsFromBaseTypes(rootSymbol.parent, rootSymbol.getName(), result_3, /*previousIterationSymbolsCache*/ {});
-                        return ts.forEach(result_3, function (s) { return searchSymbols.indexOf(s) >= 0 ? s : undefined; });
+                        var result_4 = [];
+                        getPropertySymbolsFromBaseTypes(rootSymbol.parent, rootSymbol.getName(), result_4, /*previousIterationSymbolsCache*/ {});
+                        return ts.forEach(result_4, function (s) { return searchSymbols.indexOf(s) >= 0 ? s : undefined; });
                     }
                     return undefined;
                 });
@@ -50386,28 +53882,28 @@ var ts;
                 if (isNameOfPropertyAssignment(node)) {
                     var objectLiteral = node.parent.parent;
                     var contextualType = typeChecker.getContextualType(objectLiteral);
-                    var name_36 = node.text;
+                    var name_41 = node.text;
                     if (contextualType) {
                         if (contextualType.flags & 16384 /* Union */) {
                             // This is a union type, first see if the property we are looking for is a union property (i.e. exists in all types)
                             // if not, search the constituent types for the property
-                            var unionProperty = contextualType.getProperty(name_36);
+                            var unionProperty = contextualType.getProperty(name_41);
                             if (unionProperty) {
                                 return [unionProperty];
                             }
                             else {
-                                var result_4 = [];
+                                var result_5 = [];
                                 ts.forEach(contextualType.types, function (t) {
-                                    var symbol = t.getProperty(name_36);
+                                    var symbol = t.getProperty(name_41);
                                     if (symbol) {
-                                        result_4.push(symbol);
+                                        result_5.push(symbol);
                                     }
                                 });
-                                return result_4;
+                                return result_5;
                             }
                         }
                         else {
-                            var symbol_1 = contextualType.getProperty(name_36);
+                            var symbol_1 = contextualType.getProperty(name_41);
                             if (symbol_1) {
                                 return [symbol_1];
                             }
@@ -50425,7 +53921,7 @@ var ts;
               */
             function getIntersectingMeaningFromDeclarations(meaning, declarations) {
                 if (declarations) {
-                    var lastIterationMeaning;
+                    var lastIterationMeaning = void 0;
                     do {
                         // The result is order-sensitive, for instance if initialMeaning === Namespace, and declarations = [class, instantiated module]
                         // we need to consider both as they initialMeaning intersects with the module in the namespace space, and the module
@@ -50433,8 +53929,8 @@ var ts;
                         // To achieve that we will keep iterating until the result stabilizes.
                         // Remember the last meaning
                         lastIterationMeaning = meaning;
-                        for (var _i = 0, declarations_9 = declarations; _i < declarations_9.length; _i++) {
-                            var declaration = declarations_9[_i];
+                        for (var _i = 0, declarations_10 = declarations; _i < declarations_10.length; _i++) {
+                            var declaration = declarations_10[_i];
                             var declarationMeaning = getMeaningFromDeclaration(declaration);
                             if (declarationMeaning & meaning) {
                                 meaning |= declarationMeaning;
@@ -50465,10 +53961,10 @@ var ts;
             }
             var parent = node.parent;
             if (parent) {
-                if (parent.kind === 183 /* PostfixUnaryExpression */ || parent.kind === 182 /* PrefixUnaryExpression */) {
+                if (parent.kind === 185 /* PostfixUnaryExpression */ || parent.kind === 184 /* PrefixUnaryExpression */) {
                     return true;
                 }
-                else if (parent.kind === 184 /* BinaryExpression */ && parent.left === node) {
+                else if (parent.kind === 186 /* BinaryExpression */ && parent.left === node) {
                     var operator = parent.operatorToken.kind;
                     return 56 /* FirstAssignment */ <= operator && operator <= 68 /* LastAssignment */;
                 }
@@ -50499,33 +53995,33 @@ var ts;
         }
         function getMeaningFromDeclaration(node) {
             switch (node.kind) {
-                case 139 /* Parameter */:
-                case 214 /* VariableDeclaration */:
-                case 166 /* BindingElement */:
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
-                case 248 /* PropertyAssignment */:
-                case 249 /* ShorthandPropertyAssignment */:
-                case 250 /* EnumMember */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
-                case 145 /* Constructor */:
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
-                case 216 /* FunctionDeclaration */:
-                case 176 /* FunctionExpression */:
-                case 177 /* ArrowFunction */:
-                case 247 /* CatchClause */:
+                case 141 /* Parameter */:
+                case 217 /* VariableDeclaration */:
+                case 168 /* BindingElement */:
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
+                case 252 /* PropertyAssignment */:
+                case 253 /* ShorthandPropertyAssignment */:
+                case 254 /* EnumMember */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
+                case 147 /* Constructor */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
+                case 219 /* FunctionDeclaration */:
+                case 178 /* FunctionExpression */:
+                case 179 /* ArrowFunction */:
+                case 251 /* CatchClause */:
                     return 1 /* Value */;
-                case 138 /* TypeParameter */:
-                case 218 /* InterfaceDeclaration */:
-                case 219 /* TypeAliasDeclaration */:
-                case 156 /* TypeLiteral */:
+                case 140 /* TypeParameter */:
+                case 221 /* InterfaceDeclaration */:
+                case 222 /* TypeAliasDeclaration */:
+                case 158 /* TypeLiteral */:
                     return 2 /* Type */;
-                case 217 /* ClassDeclaration */:
-                case 220 /* EnumDeclaration */:
+                case 220 /* ClassDeclaration */:
+                case 223 /* EnumDeclaration */:
                     return 1 /* Value */ | 2 /* Type */;
-                case 221 /* ModuleDeclaration */:
+                case 224 /* ModuleDeclaration */:
                     if (ts.isAmbientModule(node)) {
                         return 4 /* Namespace */ | 1 /* Value */;
                     }
@@ -50535,15 +54031,15 @@ var ts;
                     else {
                         return 4 /* Namespace */;
                     }
-                case 228 /* NamedImports */:
-                case 229 /* ImportSpecifier */:
-                case 224 /* ImportEqualsDeclaration */:
-                case 225 /* ImportDeclaration */:
-                case 230 /* ExportAssignment */:
-                case 231 /* ExportDeclaration */:
+                case 232 /* NamedImports */:
+                case 233 /* ImportSpecifier */:
+                case 228 /* ImportEqualsDeclaration */:
+                case 229 /* ImportDeclaration */:
+                case 234 /* ExportAssignment */:
+                case 235 /* ExportDeclaration */:
                     return 1 /* Value */ | 2 /* Type */ | 4 /* Namespace */;
                 // An external module can be a Value
-                case 251 /* SourceFile */:
+                case 255 /* SourceFile */:
                     return 4 /* Namespace */ | 1 /* Value */;
             }
             return 1 /* Value */ | 2 /* Type */ | 4 /* Namespace */;
@@ -50552,10 +54048,10 @@ var ts;
             if (ts.isRightSideOfQualifiedNameOrPropertyAccess(node)) {
                 node = node.parent;
             }
-            return node.parent.kind === 152 /* TypeReference */ ||
-                (node.parent.kind === 191 /* ExpressionWithTypeArguments */ && !ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent)) ||
+            return node.parent.kind === 154 /* TypeReference */ ||
+                (node.parent.kind === 193 /* ExpressionWithTypeArguments */ && !ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent)) ||
                 (node.kind === 97 /* ThisKeyword */ && !ts.isExpression(node)) ||
-                node.kind === 162 /* ThisType */;
+                node.kind === 164 /* ThisType */;
         }
         function isNamespaceReference(node) {
             return isQualifiedNameNamespaceReference(node) || isPropertyAccessNamespaceReference(node);
@@ -50563,32 +54059,32 @@ var ts;
         function isPropertyAccessNamespaceReference(node) {
             var root = node;
             var isLastClause = true;
-            if (root.parent.kind === 169 /* PropertyAccessExpression */) {
-                while (root.parent && root.parent.kind === 169 /* PropertyAccessExpression */) {
+            if (root.parent.kind === 171 /* PropertyAccessExpression */) {
+                while (root.parent && root.parent.kind === 171 /* PropertyAccessExpression */) {
                     root = root.parent;
                 }
                 isLastClause = root.name === node;
             }
-            if (!isLastClause && root.parent.kind === 191 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 246 /* HeritageClause */) {
+            if (!isLastClause && root.parent.kind === 193 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 250 /* HeritageClause */) {
                 var decl = root.parent.parent.parent;
-                return (decl.kind === 217 /* ClassDeclaration */ && root.parent.parent.token === 106 /* ImplementsKeyword */) ||
-                    (decl.kind === 218 /* InterfaceDeclaration */ && root.parent.parent.token === 83 /* ExtendsKeyword */);
+                return (decl.kind === 220 /* ClassDeclaration */ && root.parent.parent.token === 106 /* ImplementsKeyword */) ||
+                    (decl.kind === 221 /* InterfaceDeclaration */ && root.parent.parent.token === 83 /* ExtendsKeyword */);
             }
             return false;
         }
         function isQualifiedNameNamespaceReference(node) {
             var root = node;
             var isLastClause = true;
-            if (root.parent.kind === 136 /* QualifiedName */) {
-                while (root.parent && root.parent.kind === 136 /* QualifiedName */) {
+            if (root.parent.kind === 138 /* QualifiedName */) {
+                while (root.parent && root.parent.kind === 138 /* QualifiedName */) {
                     root = root.parent;
                 }
                 isLastClause = root.right === node;
             }
-            return root.parent.kind === 152 /* TypeReference */ && !isLastClause;
+            return root.parent.kind === 154 /* TypeReference */ && !isLastClause;
         }
         function isInRightSideOfImport(node) {
-            while (node.parent.kind === 136 /* QualifiedName */) {
+            while (node.parent.kind === 138 /* QualifiedName */) {
                 node = node.parent;
             }
             return ts.isInternalModuleImportEqualsDeclaration(node.parent) && node.parent.moduleReference === node;
@@ -50598,15 +54094,15 @@ var ts;
             //     import a = |b|; // Namespace
             //     import a = |b.c|; // Value, type, namespace
             //     import a = |b.c|.d; // Namespace
-            if (node.parent.kind === 136 /* QualifiedName */ &&
+            if (node.parent.kind === 138 /* QualifiedName */ &&
                 node.parent.right === node &&
-                node.parent.parent.kind === 224 /* ImportEqualsDeclaration */) {
+                node.parent.parent.kind === 228 /* ImportEqualsDeclaration */) {
                 return 1 /* Value */ | 2 /* Type */ | 4 /* Namespace */;
             }
             return 4 /* Namespace */;
         }
         function getMeaningFromLocation(node) {
-            if (node.parent.kind === 230 /* ExportAssignment */) {
+            if (node.parent.kind === 234 /* ExportAssignment */) {
                 return 1 /* Value */ | 2 /* Type */ | 4 /* Namespace */;
             }
             else if (isInRightSideOfImport(node)) {
@@ -50635,7 +54131,7 @@ var ts;
             return ts.SignatureHelp.getSignatureHelpItems(program, sourceFile, position, cancellationToken);
         }
         /// Syntactic features
-        function getSourceFile(fileName) {
+        function getNonBoundSourceFile(fileName) {
             return syntaxTreeCache.getCurrentSourceFile(fileName);
         }
         function getNameOrDottedNameSpan(fileName, startPos, endPos) {
@@ -50646,16 +54142,16 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 169 /* PropertyAccessExpression */:
-                case 136 /* QualifiedName */:
+                case 171 /* PropertyAccessExpression */:
+                case 138 /* QualifiedName */:
                 case 9 /* StringLiteral */:
-                case 163 /* StringLiteralType */:
+                case 165 /* StringLiteralType */:
                 case 84 /* FalseKeyword */:
                 case 99 /* TrueKeyword */:
                 case 93 /* NullKeyword */:
                 case 95 /* SuperKeyword */:
                 case 97 /* ThisKeyword */:
-                case 162 /* ThisType */:
+                case 164 /* ThisType */:
                 case 69 /* Identifier */:
                     break;
                 // Cant create the text span
@@ -50672,7 +54168,7 @@ var ts;
                     // If this is name of a module declarations, check if this is right side of dotted module name
                     // If parent of the module declaration which is parent of this node is module declaration and its body is the module declaration that this node is name of
                     // Then this name is name from dotted module
-                    if (nodeForStartPos.parent.parent.kind === 221 /* ModuleDeclaration */ &&
+                    if (nodeForStartPos.parent.parent.kind === 224 /* ModuleDeclaration */ &&
                         nodeForStartPos.parent.parent.body === nodeForStartPos.parent) {
                         // Use parent module declarations name for start pos
                         nodeForStartPos = nodeForStartPos.parent.parent.name;
@@ -50713,10 +54209,10 @@ var ts;
             // That means we're calling back into the host around every 1.2k of the file we process.
             // Lib.d.ts has similar numbers.
             switch (kind) {
-                case 221 /* ModuleDeclaration */:
-                case 217 /* ClassDeclaration */:
-                case 218 /* InterfaceDeclaration */:
-                case 216 /* FunctionDeclaration */:
+                case 224 /* ModuleDeclaration */:
+                case 220 /* ClassDeclaration */:
+                case 221 /* InterfaceDeclaration */:
+                case 219 /* FunctionDeclaration */:
                     cancellationToken.throwIfCancellationRequested();
             }
         }
@@ -50770,7 +54266,7 @@ var ts;
                  */
                 function hasValueSideModule(symbol) {
                     return ts.forEach(symbol.declarations, function (declaration) {
-                        return declaration.kind === 221 /* ModuleDeclaration */ &&
+                        return declaration.kind === 224 /* ModuleDeclaration */ &&
                             ts.getModuleInstanceState(declaration) === 1 /* Instantiated */;
                     });
                 }
@@ -50931,16 +54427,16 @@ var ts;
                     pushClassification(tag.tagName.pos, tag.tagName.end - tag.tagName.pos, 18 /* docCommentTagName */);
                     pos = tag.tagName.end;
                     switch (tag.kind) {
-                        case 270 /* JSDocParameterTag */:
+                        case 274 /* JSDocParameterTag */:
                             processJSDocParameterTag(tag);
                             break;
-                        case 273 /* JSDocTemplateTag */:
+                        case 277 /* JSDocTemplateTag */:
                             processJSDocTemplateTag(tag);
                             break;
-                        case 272 /* JSDocTypeTag */:
+                        case 276 /* JSDocTypeTag */:
                             processElement(tag.typeExpression);
                             break;
-                        case 271 /* JSDocReturnTag */:
+                        case 275 /* JSDocReturnTag */:
                             processElement(tag.typeExpression);
                             break;
                     }
@@ -50998,19 +54494,53 @@ var ts;
                     pushClassification(start, end - start, type);
                 }
             }
-            function classifyTokenOrJsxText(token) {
-                if (ts.nodeIsMissing(token)) {
-                    return;
+            /**
+             * Returns true if node should be treated as classified and no further processing is required.
+             * False will mean that node is not classified and traverse routine should recurse into node contents.
+             */
+            function tryClassifyNode(node) {
+                if (ts.nodeIsMissing(node)) {
+                    return true;
                 }
-                var tokenStart = token.kind === 239 /* JsxText */ ? token.pos : classifyLeadingTriviaAndGetTokenStart(token);
-                var tokenWidth = token.end - tokenStart;
+                var classifiedElementName = tryClassifyJsxElementName(node);
+                if (!ts.isToken(node) && node.kind !== 243 /* JsxText */ && classifiedElementName === undefined) {
+                    return false;
+                }
+                var tokenStart = node.kind === 243 /* JsxText */ ? node.pos : classifyLeadingTriviaAndGetTokenStart(node);
+                var tokenWidth = node.end - tokenStart;
                 ts.Debug.assert(tokenWidth >= 0);
                 if (tokenWidth > 0) {
-                    var type = classifyTokenType(token.kind, token);
+                    var type = classifiedElementName || classifyTokenType(node.kind, node);
                     if (type) {
                         pushClassification(tokenStart, tokenWidth, type);
                     }
                 }
+                return true;
+            }
+            function tryClassifyJsxElementName(token) {
+                switch (token.parent && token.parent.kind) {
+                    case 242 /* JsxOpeningElement */:
+                        if (token.parent.tagName === token) {
+                            return 19 /* jsxOpenTagName */;
+                        }
+                        break;
+                    case 244 /* JsxClosingElement */:
+                        if (token.parent.tagName === token) {
+                            return 20 /* jsxCloseTagName */;
+                        }
+                        break;
+                    case 241 /* JsxSelfClosingElement */:
+                        if (token.parent.tagName === token) {
+                            return 21 /* jsxSelfClosingTagName */;
+                        }
+                        break;
+                    case 245 /* JsxAttribute */:
+                        if (token.parent.name === token) {
+                            return 22 /* jsxAttribute */;
+                        }
+                        break;
+                }
+                return undefined;
             }
             // for accurate classification, the actual token should be passed in.  however, for
             // cases like 'disabled merge code' classification, we just get the token kind and
@@ -51032,17 +54562,17 @@ var ts;
                     if (token) {
                         if (tokenKind === 56 /* EqualsToken */) {
                             // the '=' in a variable declaration is special cased here.
-                            if (token.parent.kind === 214 /* VariableDeclaration */ ||
-                                token.parent.kind === 142 /* PropertyDeclaration */ ||
-                                token.parent.kind === 139 /* Parameter */ ||
-                                token.parent.kind === 241 /* JsxAttribute */) {
+                            if (token.parent.kind === 217 /* VariableDeclaration */ ||
+                                token.parent.kind === 144 /* PropertyDeclaration */ ||
+                                token.parent.kind === 141 /* Parameter */ ||
+                                token.parent.kind === 245 /* JsxAttribute */) {
                                 return 5 /* operator */;
                             }
                         }
-                        if (token.parent.kind === 184 /* BinaryExpression */ ||
-                            token.parent.kind === 182 /* PrefixUnaryExpression */ ||
-                            token.parent.kind === 183 /* PostfixUnaryExpression */ ||
-                            token.parent.kind === 185 /* ConditionalExpression */) {
+                        if (token.parent.kind === 186 /* BinaryExpression */ ||
+                            token.parent.kind === 184 /* PrefixUnaryExpression */ ||
+                            token.parent.kind === 185 /* PostfixUnaryExpression */ ||
+                            token.parent.kind === 187 /* ConditionalExpression */) {
                             return 5 /* operator */;
                         }
                     }
@@ -51051,8 +54581,8 @@ var ts;
                 else if (tokenKind === 8 /* NumericLiteral */) {
                     return 4 /* numericLiteral */;
                 }
-                else if (tokenKind === 9 /* StringLiteral */ || tokenKind === 163 /* StringLiteralType */) {
-                    return token.parent.kind === 241 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */;
+                else if (tokenKind === 9 /* StringLiteral */ || tokenKind === 165 /* StringLiteralType */) {
+                    return token.parent.kind === 245 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */;
                 }
                 else if (tokenKind === 10 /* RegularExpressionLiteral */) {
                     // TODO: we should get another classification type for these literals.
@@ -51062,61 +54592,42 @@ var ts;
                     // TODO (drosen): we should *also* get another classification type for these literals.
                     return 6 /* stringLiteral */;
                 }
-                else if (tokenKind === 239 /* JsxText */) {
+                else if (tokenKind === 243 /* JsxText */) {
                     return 23 /* jsxText */;
                 }
                 else if (tokenKind === 69 /* Identifier */) {
                     if (token) {
                         switch (token.parent.kind) {
-                            case 217 /* ClassDeclaration */:
+                            case 220 /* ClassDeclaration */:
                                 if (token.parent.name === token) {
                                     return 11 /* className */;
                                 }
                                 return;
-                            case 138 /* TypeParameter */:
+                            case 140 /* TypeParameter */:
                                 if (token.parent.name === token) {
                                     return 15 /* typeParameterName */;
                                 }
                                 return;
-                            case 218 /* InterfaceDeclaration */:
+                            case 221 /* InterfaceDeclaration */:
                                 if (token.parent.name === token) {
                                     return 13 /* interfaceName */;
                                 }
                                 return;
-                            case 220 /* EnumDeclaration */:
+                            case 223 /* EnumDeclaration */:
                                 if (token.parent.name === token) {
                                     return 12 /* enumName */;
                                 }
                                 return;
-                            case 221 /* ModuleDeclaration */:
+                            case 224 /* ModuleDeclaration */:
                                 if (token.parent.name === token) {
                                     return 14 /* moduleName */;
                                 }
                                 return;
-                            case 139 /* Parameter */:
+                            case 141 /* Parameter */:
                                 if (token.parent.name === token) {
                                     return 17 /* parameterName */;
                                 }
                                 return;
-                            case 238 /* JsxOpeningElement */:
-                                if (token.parent.tagName === token) {
-                                    return 19 /* jsxOpenTagName */;
-                                }
-                                return;
-                            case 240 /* JsxClosingElement */:
-                                if (token.parent.tagName === token) {
-                                    return 20 /* jsxCloseTagName */;
-                                }
-                                return;
-                            case 237 /* JsxSelfClosingElement */:
-                                if (token.parent.tagName === token) {
-                                    return 21 /* jsxSelfClosingTagName */;
-                                }
-                                return;
-                            case 241 /* JsxAttribute */:
-                                if (token.parent.name === token) {
-                                    return 22 /* jsxAttribute */;
-                                }
                         }
                     }
                     return 2 /* identifier */;
@@ -51132,10 +54643,7 @@ var ts;
                     var children = element.getChildren(sourceFile);
                     for (var i = 0, n = children.length; i < n; i++) {
                         var child = children[i];
-                        if (ts.isToken(child) || child.kind === 239 /* JsxText */) {
-                            classifyTokenOrJsxText(child);
-                        }
-                        else {
+                        if (!tryClassifyNode(child)) {
                             // Recurse into our child nodes.
                             processElement(child);
                         }
@@ -51259,19 +54767,19 @@ var ts;
             var commentOwner;
             findOwner: for (commentOwner = tokenAtPos; commentOwner; commentOwner = commentOwner.parent) {
                 switch (commentOwner.kind) {
-                    case 216 /* FunctionDeclaration */:
-                    case 144 /* MethodDeclaration */:
-                    case 145 /* Constructor */:
-                    case 217 /* ClassDeclaration */:
-                    case 196 /* VariableStatement */:
+                    case 219 /* FunctionDeclaration */:
+                    case 146 /* MethodDeclaration */:
+                    case 147 /* Constructor */:
+                    case 220 /* ClassDeclaration */:
+                    case 199 /* VariableStatement */:
                         break findOwner;
-                    case 251 /* SourceFile */:
+                    case 255 /* SourceFile */:
                         return undefined;
-                    case 221 /* ModuleDeclaration */:
+                    case 224 /* ModuleDeclaration */:
                         // If in walking up the tree, we hit a a nested namespace declaration,
                         // then we must be somewhere within a dotted namespace name; however we don't
                         // want to give back a JSDoc template for the 'b' or 'c' in 'namespace a.b.c { }'.
-                        if (commentOwner.parent.kind === 221 /* ModuleDeclaration */) {
+                        if (commentOwner.parent.kind === 224 /* ModuleDeclaration */) {
                             return undefined;
                         }
                         break findOwner;
@@ -51284,8 +54792,7 @@ var ts;
             var posLineAndChar = sourceFile.getLineAndCharacterOfPosition(position);
             var lineStart = sourceFile.getLineStarts()[posLineAndChar.line];
             var indentationStr = sourceFile.text.substr(lineStart, posLineAndChar.character);
-            // TODO: call a helper method instead once PR #4133 gets merged in.
-            var newLine = host.getNewLine ? host.getNewLine() : "\r\n";
+            var newLine = ts.getNewLineOrDefaultFromHost(host);
             var docParams = "";
             for (var i = 0, numParams = parameters.length; i < numParams; i++) {
                 var currentName = parameters[i].name;
@@ -51313,7 +54820,7 @@ var ts;
             if (ts.isFunctionLike(commentOwner)) {
                 return commentOwner.parameters;
             }
-            if (commentOwner.kind === 196 /* VariableStatement */) {
+            if (commentOwner.kind === 199 /* VariableStatement */) {
                 var varStatement = commentOwner;
                 var varDeclarations = varStatement.declarationList.declarations;
                 if (varDeclarations.length === 1 && varDeclarations[0].initializer) {
@@ -51331,17 +54838,17 @@ var ts;
          * @returns the parameters of a signature found on the RHS if one exists; otherwise 'emptyArray'.
          */
         function getParametersFromRightHandSideOfAssignment(rightHandSide) {
-            while (rightHandSide.kind === 175 /* ParenthesizedExpression */) {
+            while (rightHandSide.kind === 177 /* ParenthesizedExpression */) {
                 rightHandSide = rightHandSide.expression;
             }
             switch (rightHandSide.kind) {
-                case 176 /* FunctionExpression */:
-                case 177 /* ArrowFunction */:
+                case 178 /* FunctionExpression */:
+                case 179 /* ArrowFunction */:
                     return rightHandSide.parameters;
-                case 189 /* ClassExpression */:
+                case 191 /* ClassExpression */:
                     for (var _i = 0, _a = rightHandSide.members; _i < _a.length; _i++) {
                         var member = _a[_i];
-                        if (member.kind === 145 /* Constructor */) {
+                        if (member.kind === 147 /* Constructor */) {
                             return member.parameters;
                         }
                     }
@@ -51363,7 +54870,7 @@ var ts;
             var result = [];
             if (descriptors.length > 0) {
                 var regExp = getTodoCommentsRegExp();
-                var matchArray;
+                var matchArray = void 0;
                 while (matchArray = regExp.exec(fileContents)) {
                     cancellationToken.throwIfCancellationRequested();
                     // If we got a match, here is what the match array will look like.  Say the source text is:
@@ -51434,11 +54941,11 @@ var ts;
                 // comment portion.
                 var singleLineCommentStart = /(?:\/\/+\s*)/.source;
                 var multiLineCommentStart = /(?:\/\*+\s*)/.source;
-                var anyNumberOfSpacesAndAsterixesAtStartOfLine = /(?:^(?:\s|\*)*)/.source;
+                var anyNumberOfSpacesAndAsterisksAtStartOfLine = /(?:^(?:\s|\*)*)/.source;
                 // Match any of the above three TODO comment start regexps.
                 // Note that the outermost group *is* a capture group.  We want to capture the preamble
                 // so that we can determine the starting position of the TODO comment match.
-                var preamble = "(" + anyNumberOfSpacesAndAsterixesAtStartOfLine + "|" + singleLineCommentStart + "|" + multiLineCommentStart + ")";
+                var preamble = "(" + anyNumberOfSpacesAndAsterisksAtStartOfLine + "|" + singleLineCommentStart + "|" + multiLineCommentStart + ")";
                 // Takes the descriptors and forms a regexp that matches them as if they were literals.
                 // For example, if the descriptors are "TODO(jason)" and "HACK", then this will be:
                 //
@@ -51489,14 +54996,14 @@ var ts;
                         var defaultLibFileName = host.getDefaultLibFileName(host.getCompilationSettings());
                         var canonicalDefaultLibName = getCanonicalFileName(ts.normalizePath(defaultLibFileName));
                         if (defaultLibFileName) {
-                            for (var _i = 0, declarations_10 = declarations; _i < declarations_10.length; _i++) {
-                                var current = declarations_10[_i];
-                                var sourceFile_2 = current.getSourceFile();
+                            for (var _i = 0, declarations_11 = declarations; _i < declarations_11.length; _i++) {
+                                var current = declarations_11[_i];
+                                var sourceFile_3 = current.getSourceFile();
                                 // TODO (drosen): When is there no source file?
-                                if (!sourceFile_2) {
+                                if (!sourceFile_3) {
                                     continue;
                                 }
-                                var canonicalName = getCanonicalFileName(ts.normalizePath(sourceFile_2.fileName));
+                                var canonicalName = getCanonicalFileName(ts.normalizePath(sourceFile_3.fileName));
                                 if (canonicalName === canonicalDefaultLibName) {
                                     return getRenameInfoError(ts.getLocaleSpecificMessage(ts.Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library));
                                 }
@@ -51566,7 +55073,7 @@ var ts;
             getFormattingEditsAfterKeystroke: getFormattingEditsAfterKeystroke,
             getDocCommentTemplateAtPosition: getDocCommentTemplateAtPosition,
             getEmitOutput: getEmitOutput,
-            getSourceFile: getSourceFile,
+            getNonBoundSourceFile: getNonBoundSourceFile,
             getProgram: getProgram
         };
     }
@@ -51586,7 +55093,7 @@ var ts;
         function walk(node) {
             switch (node.kind) {
                 case 69 /* Identifier */:
-                    nameTable[node.text] = node.text;
+                    nameTable[node.text] = nameTable[node.text] === undefined ? node.pos : -1;
                     break;
                 case 9 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
@@ -51595,9 +55102,9 @@ var ts;
                     // then we want 'something' to be in the name table.  Similarly, if we have
                     // "a['propname']" then we want to store "propname" in the name table.
                     if (ts.isDeclarationName(node) ||
-                        node.parent.kind === 235 /* ExternalModuleReference */ ||
+                        node.parent.kind === 239 /* ExternalModuleReference */ ||
                         isArgumentOfElementAccessExpression(node)) {
-                        nameTable[node.text] = node.text;
+                        nameTable[node.text] = nameTable[node.text] === undefined ? node.pos : -1;
                     }
                     break;
                 default:
@@ -51608,7 +55115,7 @@ var ts;
     function isArgumentOfElementAccessExpression(node) {
         return node &&
             node.parent &&
-            node.parent.kind === 170 /* ElementAccessExpression */ &&
+            node.parent.kind === 172 /* ElementAccessExpression */ &&
             node.parent.argumentExpression === node;
     }
     /// Classifier
@@ -51656,7 +55163,7 @@ var ts;
         function canFollow(keyword1, keyword2) {
             if (ts.isAccessibilityModifier(keyword1)) {
                 if (keyword2 === 123 /* GetKeyword */ ||
-                    keyword2 === 129 /* SetKeyword */ ||
+                    keyword2 === 130 /* SetKeyword */ ||
                     keyword2 === 121 /* ConstructorKeyword */ ||
                     keyword2 === 113 /* StaticKeyword */) {
                     // Allow things like "public get", "public constructor" and "public static".
@@ -51815,10 +55322,10 @@ var ts;
                         angleBracketStack--;
                     }
                     else if (token === 117 /* AnyKeyword */ ||
-                        token === 130 /* StringKeyword */ ||
-                        token === 128 /* NumberKeyword */ ||
+                        token === 131 /* StringKeyword */ ||
+                        token === 129 /* NumberKeyword */ ||
                         token === 120 /* BooleanKeyword */ ||
-                        token === 131 /* SymbolKeyword */) {
+                        token === 132 /* SymbolKeyword */) {
                         if (angleBracketStack > 0 && !syntacticClassifierAbsent) {
                             // If it looks like we're could be in something generic, don't classify this
                             // as a keyword.  We may just get overwritten by the syntactic classifier,
@@ -51867,7 +55374,7 @@ var ts;
                 var end = scanner.getTextPos();
                 addResult(start, end, classFromKind(token));
                 if (end >= text.length) {
-                    if (token === 9 /* StringLiteral */ || token === 163 /* StringLiteralType */) {
+                    if (token === 9 /* StringLiteral */ || token === 165 /* StringLiteralType */) {
                         // Check to see if we finished up on a multiline string literal.
                         var tokenText = scanner.getTokenText();
                         if (scanner.isUnterminated()) {
@@ -51990,7 +55497,7 @@ var ts;
             }
         }
         function isKeyword(token) {
-            return token >= 70 /* FirstKeyword */ && token <= 135 /* LastKeyword */;
+            return token >= 70 /* FirstKeyword */ && token <= 137 /* LastKeyword */;
         }
         function classFromKind(token) {
             if (isKeyword(token)) {
@@ -52006,7 +55513,7 @@ var ts;
                 case 8 /* NumericLiteral */:
                     return 4 /* numericLiteral */;
                 case 9 /* StringLiteral */:
-                case 163 /* StringLiteralType */:
+                case 165 /* StringLiteralType */:
                     return 6 /* stringLiteral */;
                 case 10 /* RegularExpressionLiteral */:
                     return 7 /* regularExpressionLiteral */;
@@ -52068,7 +55575,7 @@ var ts;
          */
         function spanInSourceFileAtLocation(sourceFile, position) {
             // Cannot set breakpoint in dts file
-            if (sourceFile.flags & 4096 /* DeclarationFile */) {
+            if (sourceFile.isDeclarationFile) {
                 return undefined;
             }
             var tokenAtLocation = ts.getTokenAtPosition(sourceFile, position);
@@ -52118,113 +55625,113 @@ var ts;
             function spanInNode(node) {
                 if (node) {
                     switch (node.kind) {
-                        case 196 /* VariableStatement */:
+                        case 199 /* VariableStatement */:
                             // Span on first variable declaration
                             return spanInVariableDeclaration(node.declarationList.declarations[0]);
-                        case 214 /* VariableDeclaration */:
-                        case 142 /* PropertyDeclaration */:
-                        case 141 /* PropertySignature */:
+                        case 217 /* VariableDeclaration */:
+                        case 144 /* PropertyDeclaration */:
+                        case 143 /* PropertySignature */:
                             return spanInVariableDeclaration(node);
-                        case 139 /* Parameter */:
+                        case 141 /* Parameter */:
                             return spanInParameterDeclaration(node);
-                        case 216 /* FunctionDeclaration */:
-                        case 144 /* MethodDeclaration */:
-                        case 143 /* MethodSignature */:
-                        case 146 /* GetAccessor */:
-                        case 147 /* SetAccessor */:
-                        case 145 /* Constructor */:
-                        case 176 /* FunctionExpression */:
-                        case 177 /* ArrowFunction */:
+                        case 219 /* FunctionDeclaration */:
+                        case 146 /* MethodDeclaration */:
+                        case 145 /* MethodSignature */:
+                        case 148 /* GetAccessor */:
+                        case 149 /* SetAccessor */:
+                        case 147 /* Constructor */:
+                        case 178 /* FunctionExpression */:
+                        case 179 /* ArrowFunction */:
                             return spanInFunctionDeclaration(node);
-                        case 195 /* Block */:
+                        case 198 /* Block */:
                             if (ts.isFunctionBlock(node)) {
                                 return spanInFunctionBlock(node);
                             }
                         // Fall through
-                        case 222 /* ModuleBlock */:
+                        case 225 /* ModuleBlock */:
                             return spanInBlock(node);
-                        case 247 /* CatchClause */:
+                        case 251 /* CatchClause */:
                             return spanInBlock(node.block);
-                        case 198 /* ExpressionStatement */:
+                        case 201 /* ExpressionStatement */:
                             // span on the expression
                             return textSpan(node.expression);
-                        case 207 /* ReturnStatement */:
+                        case 210 /* ReturnStatement */:
                             // span on return keyword and expression if present
                             return textSpan(node.getChildAt(0), node.expression);
-                        case 201 /* WhileStatement */:
+                        case 204 /* WhileStatement */:
                             // Span on while(...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 200 /* DoStatement */:
+                        case 203 /* DoStatement */:
                             // span in statement of the do statement
                             return spanInNode(node.statement);
-                        case 213 /* DebuggerStatement */:
+                        case 216 /* DebuggerStatement */:
                             // span on debugger keyword
                             return textSpan(node.getChildAt(0));
-                        case 199 /* IfStatement */:
+                        case 202 /* IfStatement */:
                             // set on if(..) span
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 210 /* LabeledStatement */:
+                        case 213 /* LabeledStatement */:
                             // span in statement
                             return spanInNode(node.statement);
-                        case 206 /* BreakStatement */:
-                        case 205 /* ContinueStatement */:
+                        case 209 /* BreakStatement */:
+                        case 208 /* ContinueStatement */:
                             // On break or continue keyword and label if present
                             return textSpan(node.getChildAt(0), node.label);
-                        case 202 /* ForStatement */:
+                        case 205 /* ForStatement */:
                             return spanInForStatement(node);
-                        case 203 /* ForInStatement */:
+                        case 206 /* ForInStatement */:
                             // span of for (a in ...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 204 /* ForOfStatement */:
+                        case 207 /* ForOfStatement */:
                             // span in initializer
                             return spanInInitializerOfForLike(node);
-                        case 209 /* SwitchStatement */:
+                        case 212 /* SwitchStatement */:
                             // span on switch(...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 244 /* CaseClause */:
-                        case 245 /* DefaultClause */:
+                        case 248 /* CaseClause */:
+                        case 249 /* DefaultClause */:
                             // span in first statement of the clause
                             return spanInNode(node.statements[0]);
-                        case 212 /* TryStatement */:
+                        case 215 /* TryStatement */:
                             // span in try block
                             return spanInBlock(node.tryBlock);
-                        case 211 /* ThrowStatement */:
+                        case 214 /* ThrowStatement */:
                             // span in throw ...
                             return textSpan(node, node.expression);
-                        case 230 /* ExportAssignment */:
+                        case 234 /* ExportAssignment */:
                             // span on export = id
                             return textSpan(node, node.expression);
-                        case 224 /* ImportEqualsDeclaration */:
+                        case 228 /* ImportEqualsDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleReference);
-                        case 225 /* ImportDeclaration */:
+                        case 229 /* ImportDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleSpecifier);
-                        case 231 /* ExportDeclaration */:
+                        case 235 /* ExportDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleSpecifier);
-                        case 221 /* ModuleDeclaration */:
+                        case 224 /* ModuleDeclaration */:
                             // span on complete module if it is instantiated
                             if (ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
-                        case 217 /* ClassDeclaration */:
-                        case 220 /* EnumDeclaration */:
-                        case 250 /* EnumMember */:
-                        case 166 /* BindingElement */:
+                        case 220 /* ClassDeclaration */:
+                        case 223 /* EnumDeclaration */:
+                        case 254 /* EnumMember */:
+                        case 168 /* BindingElement */:
                             // span on complete node
                             return textSpan(node);
-                        case 208 /* WithStatement */:
+                        case 211 /* WithStatement */:
                             // span in statement
                             return spanInNode(node.statement);
-                        case 140 /* Decorator */:
+                        case 142 /* Decorator */:
                             return spanInNodeArray(node.parent.decorators);
-                        case 164 /* ObjectBindingPattern */:
-                        case 165 /* ArrayBindingPattern */:
+                        case 166 /* ObjectBindingPattern */:
+                        case 167 /* ArrayBindingPattern */:
                             return spanInBindingPattern(node);
                         // No breakpoint in interface, type alias
-                        case 218 /* InterfaceDeclaration */:
-                        case 219 /* TypeAliasDeclaration */:
+                        case 221 /* InterfaceDeclaration */:
+                        case 222 /* TypeAliasDeclaration */:
                             return undefined;
                         // Tokens:
                         case 23 /* SemicolonToken */:
@@ -52254,7 +55761,7 @@ var ts;
                         case 72 /* CatchKeyword */:
                         case 85 /* FinallyKeyword */:
                             return spanInNextNode(node);
-                        case 135 /* OfKeyword */:
+                        case 137 /* OfKeyword */:
                             return spanInOfKeyword(node);
                         default:
                             // Destructuring pattern in destructuring assignment
@@ -52267,13 +55774,13 @@ var ts;
                             // a or ...c  or d: x from 
                             // [a, b, ...c] or { a, b } or { d: x } from destructuring pattern
                             if ((node.kind === 69 /* Identifier */ ||
-                                node.kind == 188 /* SpreadElementExpression */ ||
-                                node.kind === 248 /* PropertyAssignment */ ||
-                                node.kind === 249 /* ShorthandPropertyAssignment */) &&
+                                node.kind == 190 /* SpreadElementExpression */ ||
+                                node.kind === 252 /* PropertyAssignment */ ||
+                                node.kind === 253 /* ShorthandPropertyAssignment */) &&
                                 ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent)) {
                                 return textSpan(node);
                             }
-                            if (node.kind === 184 /* BinaryExpression */) {
+                            if (node.kind === 186 /* BinaryExpression */) {
                                 var binaryExpression = node;
                                 // Set breakpoint in destructuring pattern if its destructuring assignment
                                 // [a, b, c] or {a, b, c} of
@@ -52296,22 +55803,22 @@ var ts;
                             }
                             if (ts.isExpression(node)) {
                                 switch (node.parent.kind) {
-                                    case 200 /* DoStatement */:
+                                    case 203 /* DoStatement */:
                                         // Set span as if on while keyword
                                         return spanInPreviousNode(node);
-                                    case 140 /* Decorator */:
+                                    case 142 /* Decorator */:
                                         // Set breakpoint on the decorator emit
                                         return spanInNode(node.parent);
-                                    case 202 /* ForStatement */:
-                                    case 204 /* ForOfStatement */:
+                                    case 205 /* ForStatement */:
+                                    case 207 /* ForOfStatement */:
                                         return textSpan(node);
-                                    case 184 /* BinaryExpression */:
+                                    case 186 /* BinaryExpression */:
                                         if (node.parent.operatorToken.kind === 24 /* CommaToken */) {
                                             // if this is comma expression, the breakpoint is possible in this expression
                                             return textSpan(node);
                                         }
                                         break;
-                                    case 177 /* ArrowFunction */:
+                                    case 179 /* ArrowFunction */:
                                         if (node.parent.body === node) {
                                             // If this is body of arrow function, it is allowed to have the breakpoint
                                             return textSpan(node);
@@ -52320,13 +55827,13 @@ var ts;
                                 }
                             }
                             // If this is name of property assignment, set breakpoint in the initializer
-                            if (node.parent.kind === 248 /* PropertyAssignment */ &&
+                            if (node.parent.kind === 252 /* PropertyAssignment */ &&
                                 node.parent.name === node &&
                                 !ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.parent)) {
                                 return spanInNode(node.parent.initializer);
                             }
                             // Breakpoint in type assertion goes to its operand
-                            if (node.parent.kind === 174 /* TypeAssertionExpression */ && node.parent.type === node) {
+                            if (node.parent.kind === 176 /* TypeAssertionExpression */ && node.parent.type === node) {
                                 return spanInNextNode(node.parent.type);
                             }
                             // return type of function go to previous token
@@ -52334,8 +55841,8 @@ var ts;
                                 return spanInPreviousNode(node);
                             }
                             // initializer of variable/parameter declaration go to previous node
-                            if ((node.parent.kind === 214 /* VariableDeclaration */ ||
-                                node.parent.kind === 139 /* Parameter */)) {
+                            if ((node.parent.kind === 217 /* VariableDeclaration */ ||
+                                node.parent.kind === 141 /* Parameter */)) {
                                 var paramOrVarDecl = node.parent;
                                 if (paramOrVarDecl.initializer === node ||
                                     paramOrVarDecl.type === node ||
@@ -52343,7 +55850,7 @@ var ts;
                                     return spanInPreviousNode(node);
                                 }
                             }
-                            if (node.parent.kind === 184 /* BinaryExpression */) {
+                            if (node.parent.kind === 186 /* BinaryExpression */) {
                                 var binaryExpression = node.parent;
                                 if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(binaryExpression.left) &&
                                     (binaryExpression.right === node ||
@@ -52369,7 +55876,7 @@ var ts;
                 }
                 function spanInVariableDeclaration(variableDeclaration) {
                     // If declaration of for in statement, just set the span in parent
-                    if (variableDeclaration.parent.parent.kind === 203 /* ForInStatement */) {
+                    if (variableDeclaration.parent.parent.kind === 206 /* ForInStatement */) {
                         return spanInNode(variableDeclaration.parent.parent);
                     }
                     // If this is a destructuring pattern set breakpoint in binding pattern
@@ -52379,8 +55886,8 @@ var ts;
                     // Breakpoint is possible in variableDeclaration only if there is initialization
                     // or its declaration from 'for of'
                     if (variableDeclaration.initializer ||
-                        (variableDeclaration.flags & 2 /* Export */) ||
-                        variableDeclaration.parent.parent.kind === 204 /* ForOfStatement */) {
+                        (variableDeclaration.flags & 1 /* Export */) ||
+                        variableDeclaration.parent.parent.kind === 207 /* ForOfStatement */) {
                         return textSpanFromVariableDeclaration(variableDeclaration);
                     }
                     var declarations = variableDeclaration.parent.declarations;
@@ -52395,7 +55902,7 @@ var ts;
                 function canHaveSpanInParameterDeclaration(parameter) {
                     // 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 & 8 /* Public */) || !!(parameter.flags & 16 /* Private */);
+                        !!(parameter.flags & 4 /* Public */) || !!(parameter.flags & 8 /* Private */);
                 }
                 function spanInParameterDeclaration(parameter) {
                     if (ts.isBindingPattern(parameter.name)) {
@@ -52419,8 +55926,8 @@ var ts;
                     }
                 }
                 function canFunctionHaveSpanInWholeDeclaration(functionDeclaration) {
-                    return !!(functionDeclaration.flags & 2 /* Export */) ||
-                        (functionDeclaration.parent.kind === 217 /* ClassDeclaration */ && functionDeclaration.kind !== 145 /* Constructor */);
+                    return !!(functionDeclaration.flags & 1 /* Export */) ||
+                        (functionDeclaration.parent.kind === 220 /* ClassDeclaration */ && functionDeclaration.kind !== 147 /* Constructor */);
                 }
                 function spanInFunctionDeclaration(functionDeclaration) {
                     // No breakpoints in the function signature
@@ -52443,34 +55950,34 @@ var ts;
                 }
                 function spanInBlock(block) {
                     switch (block.parent.kind) {
-                        case 221 /* ModuleDeclaration */:
+                        case 224 /* ModuleDeclaration */:
                             if (ts.getModuleInstanceState(block.parent) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
                         // Set on parent if on same line otherwise on first statement
-                        case 201 /* WhileStatement */:
-                        case 199 /* IfStatement */:
-                        case 203 /* ForInStatement */:
+                        case 204 /* WhileStatement */:
+                        case 202 /* IfStatement */:
+                        case 206 /* ForInStatement */:
                             return spanInNodeIfStartsOnSameLine(block.parent, block.statements[0]);
                         // Set span on previous token if it starts on same line otherwise on the first statement of the block
-                        case 202 /* ForStatement */:
-                        case 204 /* ForOfStatement */:
+                        case 205 /* ForStatement */:
+                        case 207 /* ForOfStatement */:
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(block.pos, sourceFile, block.parent), block.statements[0]);
                     }
                     // Default action is to set on first statement
                     return spanInNode(block.statements[0]);
                 }
-                function spanInInitializerOfForLike(forLikeStaement) {
-                    if (forLikeStaement.initializer.kind === 215 /* VariableDeclarationList */) {
+                function spanInInitializerOfForLike(forLikeStatement) {
+                    if (forLikeStatement.initializer.kind === 218 /* VariableDeclarationList */) {
                         // declaration list, set breakpoint in first declaration
-                        var variableDeclarationList = forLikeStaement.initializer;
+                        var variableDeclarationList = forLikeStatement.initializer;
                         if (variableDeclarationList.declarations.length > 0) {
                             return spanInNode(variableDeclarationList.declarations[0]);
                         }
                     }
                     else {
                         // Expression - set breakpoint in it
-                        return spanInNode(forLikeStaement.initializer);
+                        return spanInNode(forLikeStatement.initializer);
                     }
                 }
                 function spanInForStatement(forStatement) {
@@ -52486,23 +55993,23 @@ var ts;
                 }
                 function spanInBindingPattern(bindingPattern) {
                     // Set breakpoint in first binding element
-                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 190 /* OmittedExpression */ ? element : undefined; });
+                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 192 /* OmittedExpression */ ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
                     // Empty binding pattern of binding element, set breakpoint on binding element
-                    if (bindingPattern.parent.kind === 166 /* BindingElement */) {
+                    if (bindingPattern.parent.kind === 168 /* BindingElement */) {
                         return textSpan(bindingPattern.parent);
                     }
                     // Variable declaration is used as the span
                     return textSpanFromVariableDeclaration(bindingPattern.parent);
                 }
                 function spanInArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-                    ts.Debug.assert(node.kind !== 165 /* ArrayBindingPattern */ && node.kind !== 164 /* ObjectBindingPattern */);
-                    var elements = node.kind === 167 /* ArrayLiteralExpression */ ?
+                    ts.Debug.assert(node.kind !== 167 /* ArrayBindingPattern */ && node.kind !== 166 /* ObjectBindingPattern */);
+                    var elements = node.kind === 169 /* ArrayLiteralExpression */ ?
                         node.elements :
                         node.properties;
-                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 190 /* OmittedExpression */ ? element : undefined; });
+                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 192 /* OmittedExpression */ ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
@@ -52510,18 +56017,18 @@ var ts;
                     // just nested element in another destructuring assignment
                     // set breakpoint on assignment when parent is destructuring assignment
                     // Otherwise set breakpoint for this element
-                    return textSpan(node.parent.kind === 184 /* BinaryExpression */ ? node.parent : node);
+                    return textSpan(node.parent.kind === 186 /* BinaryExpression */ ? node.parent : node);
                 }
                 // Tokens:
                 function spanInOpenBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 220 /* EnumDeclaration */:
+                        case 223 /* EnumDeclaration */:
                             var enumDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), enumDeclaration.members.length ? enumDeclaration.members[0] : enumDeclaration.getLastToken(sourceFile));
-                        case 217 /* ClassDeclaration */:
+                        case 220 /* ClassDeclaration */:
                             var classDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), classDeclaration.members.length ? classDeclaration.members[0] : classDeclaration.getLastToken(sourceFile));
-                        case 223 /* CaseBlock */:
+                        case 226 /* CaseBlock */:
                             return spanInNodeIfStartsOnSameLine(node.parent.parent, node.parent.clauses[0]);
                     }
                     // Default to parent node
@@ -52529,24 +56036,24 @@ var ts;
                 }
                 function spanInCloseBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 222 /* ModuleBlock */:
+                        case 225 /* ModuleBlock */:
                             // If this is not instantiated module block no bp span
                             if (ts.getModuleInstanceState(node.parent.parent) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
-                        case 220 /* EnumDeclaration */:
-                        case 217 /* ClassDeclaration */:
+                        case 223 /* EnumDeclaration */:
+                        case 220 /* ClassDeclaration */:
                             // Span on close brace token
                             return textSpan(node);
-                        case 195 /* Block */:
+                        case 198 /* Block */:
                             if (ts.isFunctionBlock(node.parent)) {
                                 // Span on close brace token
                                 return textSpan(node);
                             }
                         // fall through.
-                        case 247 /* CatchClause */:
+                        case 251 /* CatchClause */:
                             return spanInNode(ts.lastOrUndefined(node.parent.statements));
-                        case 223 /* CaseBlock */:
+                        case 226 /* CaseBlock */:
                             // breakpoint in last statement of the last clause
                             var caseBlock = node.parent;
                             var lastClause = ts.lastOrUndefined(caseBlock.clauses);
@@ -52554,7 +56061,7 @@ var ts;
                                 return spanInNode(ts.lastOrUndefined(lastClause.statements));
                             }
                             return undefined;
-                        case 164 /* ObjectBindingPattern */:
+                        case 166 /* ObjectBindingPattern */:
                             // Breakpoint in last binding element or binding pattern if it contains no elements
                             var bindingPattern = node.parent;
                             return spanInNode(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern);
@@ -52570,7 +56077,7 @@ var ts;
                 }
                 function spanInCloseBracketToken(node) {
                     switch (node.parent.kind) {
-                        case 165 /* ArrayBindingPattern */:
+                        case 167 /* ArrayBindingPattern */:
                             // Breakpoint in last binding element or binding pattern if it contains no elements
                             var bindingPattern = node.parent;
                             return textSpan(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern);
@@ -52585,12 +56092,12 @@ var ts;
                     }
                 }
                 function spanInOpenParenToken(node) {
-                    if (node.parent.kind === 200 /* DoStatement */ ||
-                        node.parent.kind === 171 /* CallExpression */ ||
-                        node.parent.kind === 172 /* NewExpression */) {
+                    if (node.parent.kind === 203 /* DoStatement */ ||
+                        node.parent.kind === 173 /* CallExpression */ ||
+                        node.parent.kind === 174 /* NewExpression */) {
                         return spanInPreviousNode(node);
                     }
-                    if (node.parent.kind === 175 /* ParenthesizedExpression */) {
+                    if (node.parent.kind === 177 /* ParenthesizedExpression */) {
                         return spanInNextNode(node);
                     }
                     // Default to parent node
@@ -52599,21 +56106,21 @@ var ts;
                 function spanInCloseParenToken(node) {
                     // Is this close paren token of parameter list, set span in previous token
                     switch (node.parent.kind) {
-                        case 176 /* FunctionExpression */:
-                        case 216 /* FunctionDeclaration */:
-                        case 177 /* ArrowFunction */:
-                        case 144 /* MethodDeclaration */:
-                        case 143 /* MethodSignature */:
-                        case 146 /* GetAccessor */:
-                        case 147 /* SetAccessor */:
-                        case 145 /* Constructor */:
-                        case 201 /* WhileStatement */:
-                        case 200 /* DoStatement */:
-                        case 202 /* ForStatement */:
-                        case 204 /* ForOfStatement */:
-                        case 171 /* CallExpression */:
-                        case 172 /* NewExpression */:
-                        case 175 /* ParenthesizedExpression */:
+                        case 178 /* FunctionExpression */:
+                        case 219 /* FunctionDeclaration */:
+                        case 179 /* ArrowFunction */:
+                        case 146 /* MethodDeclaration */:
+                        case 145 /* MethodSignature */:
+                        case 148 /* GetAccessor */:
+                        case 149 /* SetAccessor */:
+                        case 147 /* Constructor */:
+                        case 204 /* WhileStatement */:
+                        case 203 /* DoStatement */:
+                        case 205 /* ForStatement */:
+                        case 207 /* ForOfStatement */:
+                        case 173 /* CallExpression */:
+                        case 174 /* NewExpression */:
+                        case 177 /* ParenthesizedExpression */:
                             return spanInPreviousNode(node);
                         // Default to parent node
                         default:
@@ -52623,20 +56130,20 @@ var ts;
                 function spanInColonToken(node) {
                     // Is this : specifying return annotation of the function declaration
                     if (ts.isFunctionLike(node.parent) ||
-                        node.parent.kind === 248 /* PropertyAssignment */ ||
-                        node.parent.kind === 139 /* Parameter */) {
+                        node.parent.kind === 252 /* PropertyAssignment */ ||
+                        node.parent.kind === 141 /* Parameter */) {
                         return spanInPreviousNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInGreaterThanOrLessThanToken(node) {
-                    if (node.parent.kind === 174 /* TypeAssertionExpression */) {
+                    if (node.parent.kind === 176 /* TypeAssertionExpression */) {
                         return spanInNextNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInWhileKeyword(node) {
-                    if (node.parent.kind === 200 /* DoStatement */) {
+                    if (node.parent.kind === 203 /* DoStatement */) {
                         // Set span on while expression
                         return textSpanEndingAtNextToken(node, node.parent.expression);
                     }
@@ -52644,7 +56151,7 @@ var ts;
                     return spanInNode(node.parent);
                 }
                 function spanInOfKeyword(node) {
-                    if (node.parent.kind === 204 /* ForOfStatement */) {
+                    if (node.parent.kind === 207 /* ForOfStatement */) {
                         // set using next token
                         return spanInNextNode(node);
                     }
@@ -52733,6 +56240,12 @@ var ts;
             if ("directoryExists" in this.shimHost) {
                 this.directoryExists = function (directoryName) { return _this.shimHost.directoryExists(directoryName); };
             }
+            if ("getTypeReferenceDirectiveResolutionsForFile" in this.shimHost) {
+                this.resolveTypeReferenceDirectives = function (typeDirectiveNames, containingFile) {
+                    var typeDirectivesForFile = JSON.parse(_this.shimHost.getTypeReferenceDirectiveResolutionsForFile(containingFile));
+                    return ts.map(typeDirectiveNames, function (name) { return ts.lookUp(typeDirectivesForFile, name); });
+                };
+            }
         }
         LanguageServiceShimHostAdapter.prototype.log = function (s) {
             if (this.loggingEnabled) {
@@ -52773,6 +56286,14 @@ var ts;
             var scriptSnapshot = this.shimHost.getScriptSnapshot(fileName);
             return scriptSnapshot && new ScriptSnapshotShimAdapter(scriptSnapshot);
         };
+        LanguageServiceShimHostAdapter.prototype.getScriptKind = function (fileName) {
+            if ("getScriptKind" in this.shimHost) {
+                return this.shimHost.getScriptKind(fileName);
+            }
+            else {
+                return 0 /* Unknown */;
+            }
+        };
         LanguageServiceShimHostAdapter.prototype.getScriptVersion = function (fileName) {
             return this.shimHost.getScriptVersion(fileName);
         };
@@ -52831,8 +56352,16 @@ var ts;
                 this.directoryExists = function (directoryName) { return _this.shimHost.directoryExists(directoryName); };
             }
         }
-        CoreServicesShimHostAdapter.prototype.readDirectory = function (rootDir, extension, exclude) {
-            var encoded = this.shimHost.readDirectory(rootDir, extension, JSON.stringify(exclude));
+        CoreServicesShimHostAdapter.prototype.readDirectory = function (rootDir, extension, exclude, depth) {
+            // Wrap the API changes for 2.0 release. This try/catch
+            // should be removed once TypeScript 2.0 has shipped.
+            var encoded;
+            try {
+                encoded = this.shimHost.readDirectory(rootDir, extension, JSON.stringify(exclude), depth);
+            }
+            catch (e) {
+                encoded = this.shimHost.readDirectory(rootDir, extension, JSON.stringify(exclude));
+            }
             return JSON.parse(encoded);
         };
         CoreServicesShimHostAdapter.prototype.fileExists = function (fileName) {
@@ -53079,7 +56608,7 @@ var ts;
             var _this = this;
             return this.forwardJSONCall("getDocumentHighlights('" + fileName + "', " + position + ")", function () {
                 var results = _this.languageService.getDocumentHighlights(fileName, position, JSON.parse(filesToSearch));
-                // workaround for VS document higlighting issue - keep only items from the initial file
+                // workaround for VS document highlighting issue - keep only items from the initial file
                 var normalizedName = ts.normalizeSlashes(fileName).toLowerCase();
                 return ts.filter(results, function (r) { return ts.normalizeSlashes(r.fileName).toLowerCase() === normalizedName; });
             });
@@ -53200,33 +56729,47 @@ var ts;
                 };
             });
         };
+        CoreServicesShimObject.prototype.resolveTypeReferenceDirective = function (fileName, typeReferenceDirective, compilerOptionsJson) {
+            var _this = this;
+            return this.forwardJSONCall("resolveTypeReferenceDirective(" + fileName + ")", function () {
+                var compilerOptions = JSON.parse(compilerOptionsJson);
+                var result = ts.resolveTypeReferenceDirective(typeReferenceDirective, ts.normalizeSlashes(fileName), compilerOptions, _this.host);
+                return {
+                    resolvedFileName: result.resolvedTypeReferenceDirective ? result.resolvedTypeReferenceDirective.resolvedFileName : undefined,
+                    primary: result.resolvedTypeReferenceDirective ? result.resolvedTypeReferenceDirective.primary : true,
+                    failedLookupLocations: result.failedLookupLocations
+                };
+            });
+        };
         CoreServicesShimObject.prototype.getPreProcessedFileInfo = function (fileName, sourceTextSnapshot) {
+            var _this = this;
             return this.forwardJSONCall("getPreProcessedFileInfo('" + fileName + "')", function () {
                 // for now treat files as JavaScript 
                 var result = ts.preProcessFile(sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength()), /* readImportFiles */ true, /* detectJavaScriptImports */ true);
-                var convertResult = {
-                    referencedFiles: [],
-                    importedFiles: [],
+                return {
+                    referencedFiles: _this.convertFileReferences(result.referencedFiles),
+                    importedFiles: _this.convertFileReferences(result.importedFiles),
                     ambientExternalModules: result.ambientExternalModules,
-                    isLibFile: result.isLibFile
+                    isLibFile: result.isLibFile,
+                    typeReferenceDirectives: _this.convertFileReferences(result.typeReferenceDirectives)
                 };
-                ts.forEach(result.referencedFiles, function (refFile) {
-                    convertResult.referencedFiles.push({
-                        path: ts.normalizePath(refFile.fileName),
-                        position: refFile.pos,
-                        length: refFile.end - refFile.pos
-                    });
-                });
-                ts.forEach(result.importedFiles, function (importedFile) {
-                    convertResult.importedFiles.push({
-                        path: ts.normalizeSlashes(importedFile.fileName),
-                        position: importedFile.pos,
-                        length: importedFile.end - importedFile.pos
-                    });
-                });
-                return convertResult;
             });
         };
+        CoreServicesShimObject.prototype.convertFileReferences = function (refs) {
+            if (!refs) {
+                return undefined;
+            }
+            var result = [];
+            for (var _i = 0, refs_2 = refs; _i < refs_2.length; _i++) {
+                var ref = refs_2[_i];
+                result.push({
+                    path: ts.normalizeSlashes(ref.fileName),
+                    position: ref.pos,
+                    length: ref.end - ref.pos
+                });
+            }
+            return result;
+        };
         CoreServicesShimObject.prototype.getTSConfigFileInfo = function (fileName, sourceTextSnapshot) {
             var _this = this;
             return this.forwardJSONCall("getTSConfigFileInfo('" + fileName + "')", function () {
@@ -53235,13 +56778,16 @@ var ts;
                 if (result.error) {
                     return {
                         options: {},
+                        typingOptions: {},
                         files: [],
                         errors: [realizeDiagnostic(result.error, "\r\n")]
                     };
                 }
-                var configFile = ts.parseJsonConfigFileContent(result.config, _this.host, ts.getDirectoryPath(ts.normalizeSlashes(fileName)));
+                var normalizedFileName = ts.normalizeSlashes(fileName);
+                var configFile = ts.parseJsonConfigFileContent(result.config, _this.host, ts.getDirectoryPath(normalizedFileName), /*existingOptions*/ {}, normalizedFileName);
                 return {
                     options: configFile.options,
+                    typingOptions: configFile.typingOptions,
                     files: configFile.fileNames,
                     errors: realizeDiagnostics(configFile.errors, "\r\n")
                 };
@@ -53250,6 +56796,14 @@ var ts;
         CoreServicesShimObject.prototype.getDefaultCompilationSettings = function () {
             return this.forwardJSONCall("getDefaultCompilationSettings()", function () { return ts.getDefaultCompilerOptions(); });
         };
+        CoreServicesShimObject.prototype.discoverTypings = function (discoverTypingsJson) {
+            var _this = this;
+            var getCanonicalFileName = ts.createGetCanonicalFileName(/*useCaseSensitivefileNames:*/ false);
+            return this.forwardJSONCall("discoverTypings()", function () {
+                var info = JSON.parse(discoverTypingsJson);
+                return ts.JsTyping.discoverTypings(_this.host, info.fileNames, ts.toPath(info.projectRootPath, info.projectRootPath, getCanonicalFileName), ts.toPath(info.safeListPath, info.safeListPath, getCanonicalFileName), info.packageNameToTypingLocation, info.typingOptions, info.compilerOptions);
+            });
+        };
         return CoreServicesShimObject;
     }(ShimBase));
     var TypeScriptServicesFactory = (function () {
@@ -53334,5 +56888,5 @@ var TypeScript;
 // 'toolsVersion' gets consumed by the managed side, so it's not unused.
 // TODO: it should be moved into a namespace though.
 /* @internal */
-var toolsVersion = "1.8";
+var toolsVersion = "1.9";
 /* tslint:enable:no-unused-variable */ 
diff --git a/lib/typescriptServices.d.ts b/lib/typescriptServices.d.ts
index 3cd6e23dc1d..c5e72bdbbbf 100644
--- a/lib/typescriptServices.d.ts
+++ b/lib/typescriptServices.d.ts
@@ -160,169 +160,173 @@ declare namespace ts {
         IsKeyword = 124,
         ModuleKeyword = 125,
         NamespaceKeyword = 126,
-        RequireKeyword = 127,
-        NumberKeyword = 128,
-        SetKeyword = 129,
-        StringKeyword = 130,
-        SymbolKeyword = 131,
-        TypeKeyword = 132,
-        FromKeyword = 133,
-        GlobalKeyword = 134,
-        OfKeyword = 135,
-        QualifiedName = 136,
-        ComputedPropertyName = 137,
-        TypeParameter = 138,
-        Parameter = 139,
-        Decorator = 140,
-        PropertySignature = 141,
-        PropertyDeclaration = 142,
-        MethodSignature = 143,
-        MethodDeclaration = 144,
-        Constructor = 145,
-        GetAccessor = 146,
-        SetAccessor = 147,
-        CallSignature = 148,
-        ConstructSignature = 149,
-        IndexSignature = 150,
-        TypePredicate = 151,
-        TypeReference = 152,
-        FunctionType = 153,
-        ConstructorType = 154,
-        TypeQuery = 155,
-        TypeLiteral = 156,
-        ArrayType = 157,
-        TupleType = 158,
-        UnionType = 159,
-        IntersectionType = 160,
-        ParenthesizedType = 161,
-        ThisType = 162,
-        StringLiteralType = 163,
-        ObjectBindingPattern = 164,
-        ArrayBindingPattern = 165,
-        BindingElement = 166,
-        ArrayLiteralExpression = 167,
-        ObjectLiteralExpression = 168,
-        PropertyAccessExpression = 169,
-        ElementAccessExpression = 170,
-        CallExpression = 171,
-        NewExpression = 172,
-        TaggedTemplateExpression = 173,
-        TypeAssertionExpression = 174,
-        ParenthesizedExpression = 175,
-        FunctionExpression = 176,
-        ArrowFunction = 177,
-        DeleteExpression = 178,
-        TypeOfExpression = 179,
-        VoidExpression = 180,
-        AwaitExpression = 181,
-        PrefixUnaryExpression = 182,
-        PostfixUnaryExpression = 183,
-        BinaryExpression = 184,
-        ConditionalExpression = 185,
-        TemplateExpression = 186,
-        YieldExpression = 187,
-        SpreadElementExpression = 188,
-        ClassExpression = 189,
-        OmittedExpression = 190,
-        ExpressionWithTypeArguments = 191,
-        AsExpression = 192,
-        TemplateSpan = 193,
-        SemicolonClassElement = 194,
-        Block = 195,
-        VariableStatement = 196,
-        EmptyStatement = 197,
-        ExpressionStatement = 198,
-        IfStatement = 199,
-        DoStatement = 200,
-        WhileStatement = 201,
-        ForStatement = 202,
-        ForInStatement = 203,
-        ForOfStatement = 204,
-        ContinueStatement = 205,
-        BreakStatement = 206,
-        ReturnStatement = 207,
-        WithStatement = 208,
-        SwitchStatement = 209,
-        LabeledStatement = 210,
-        ThrowStatement = 211,
-        TryStatement = 212,
-        DebuggerStatement = 213,
-        VariableDeclaration = 214,
-        VariableDeclarationList = 215,
-        FunctionDeclaration = 216,
-        ClassDeclaration = 217,
-        InterfaceDeclaration = 218,
-        TypeAliasDeclaration = 219,
-        EnumDeclaration = 220,
-        ModuleDeclaration = 221,
-        ModuleBlock = 222,
-        CaseBlock = 223,
-        ImportEqualsDeclaration = 224,
-        ImportDeclaration = 225,
-        ImportClause = 226,
-        NamespaceImport = 227,
-        NamedImports = 228,
-        ImportSpecifier = 229,
-        ExportAssignment = 230,
-        ExportDeclaration = 231,
-        NamedExports = 232,
-        ExportSpecifier = 233,
-        MissingDeclaration = 234,
-        ExternalModuleReference = 235,
-        JsxElement = 236,
-        JsxSelfClosingElement = 237,
-        JsxOpeningElement = 238,
-        JsxText = 239,
-        JsxClosingElement = 240,
-        JsxAttribute = 241,
-        JsxSpreadAttribute = 242,
-        JsxExpression = 243,
-        CaseClause = 244,
-        DefaultClause = 245,
-        HeritageClause = 246,
-        CatchClause = 247,
-        PropertyAssignment = 248,
-        ShorthandPropertyAssignment = 249,
-        EnumMember = 250,
-        SourceFile = 251,
-        JSDocTypeExpression = 252,
-        JSDocAllType = 253,
-        JSDocUnknownType = 254,
-        JSDocArrayType = 255,
-        JSDocUnionType = 256,
-        JSDocTupleType = 257,
-        JSDocNullableType = 258,
-        JSDocNonNullableType = 259,
-        JSDocRecordType = 260,
-        JSDocRecordMember = 261,
-        JSDocTypeReference = 262,
-        JSDocOptionalType = 263,
-        JSDocFunctionType = 264,
-        JSDocVariadicType = 265,
-        JSDocConstructorType = 266,
-        JSDocThisType = 267,
-        JSDocComment = 268,
-        JSDocTag = 269,
-        JSDocParameterTag = 270,
-        JSDocReturnTag = 271,
-        JSDocTypeTag = 272,
-        JSDocTemplateTag = 273,
-        SyntaxList = 274,
-        Count = 275,
+        ReadonlyKeyword = 127,
+        RequireKeyword = 128,
+        NumberKeyword = 129,
+        SetKeyword = 130,
+        StringKeyword = 131,
+        SymbolKeyword = 132,
+        TypeKeyword = 133,
+        UndefinedKeyword = 134,
+        FromKeyword = 135,
+        GlobalKeyword = 136,
+        OfKeyword = 137,
+        QualifiedName = 138,
+        ComputedPropertyName = 139,
+        TypeParameter = 140,
+        Parameter = 141,
+        Decorator = 142,
+        PropertySignature = 143,
+        PropertyDeclaration = 144,
+        MethodSignature = 145,
+        MethodDeclaration = 146,
+        Constructor = 147,
+        GetAccessor = 148,
+        SetAccessor = 149,
+        CallSignature = 150,
+        ConstructSignature = 151,
+        IndexSignature = 152,
+        TypePredicate = 153,
+        TypeReference = 154,
+        FunctionType = 155,
+        ConstructorType = 156,
+        TypeQuery = 157,
+        TypeLiteral = 158,
+        ArrayType = 159,
+        TupleType = 160,
+        UnionType = 161,
+        IntersectionType = 162,
+        ParenthesizedType = 163,
+        ThisType = 164,
+        StringLiteralType = 165,
+        ObjectBindingPattern = 166,
+        ArrayBindingPattern = 167,
+        BindingElement = 168,
+        ArrayLiteralExpression = 169,
+        ObjectLiteralExpression = 170,
+        PropertyAccessExpression = 171,
+        ElementAccessExpression = 172,
+        CallExpression = 173,
+        NewExpression = 174,
+        TaggedTemplateExpression = 175,
+        TypeAssertionExpression = 176,
+        ParenthesizedExpression = 177,
+        FunctionExpression = 178,
+        ArrowFunction = 179,
+        DeleteExpression = 180,
+        TypeOfExpression = 181,
+        VoidExpression = 182,
+        AwaitExpression = 183,
+        PrefixUnaryExpression = 184,
+        PostfixUnaryExpression = 185,
+        BinaryExpression = 186,
+        ConditionalExpression = 187,
+        TemplateExpression = 188,
+        YieldExpression = 189,
+        SpreadElementExpression = 190,
+        ClassExpression = 191,
+        OmittedExpression = 192,
+        ExpressionWithTypeArguments = 193,
+        AsExpression = 194,
+        NonNullExpression = 195,
+        TemplateSpan = 196,
+        SemicolonClassElement = 197,
+        Block = 198,
+        VariableStatement = 199,
+        EmptyStatement = 200,
+        ExpressionStatement = 201,
+        IfStatement = 202,
+        DoStatement = 203,
+        WhileStatement = 204,
+        ForStatement = 205,
+        ForInStatement = 206,
+        ForOfStatement = 207,
+        ContinueStatement = 208,
+        BreakStatement = 209,
+        ReturnStatement = 210,
+        WithStatement = 211,
+        SwitchStatement = 212,
+        LabeledStatement = 213,
+        ThrowStatement = 214,
+        TryStatement = 215,
+        DebuggerStatement = 216,
+        VariableDeclaration = 217,
+        VariableDeclarationList = 218,
+        FunctionDeclaration = 219,
+        ClassDeclaration = 220,
+        InterfaceDeclaration = 221,
+        TypeAliasDeclaration = 222,
+        EnumDeclaration = 223,
+        ModuleDeclaration = 224,
+        ModuleBlock = 225,
+        CaseBlock = 226,
+        GlobalModuleExportDeclaration = 227,
+        ImportEqualsDeclaration = 228,
+        ImportDeclaration = 229,
+        ImportClause = 230,
+        NamespaceImport = 231,
+        NamedImports = 232,
+        ImportSpecifier = 233,
+        ExportAssignment = 234,
+        ExportDeclaration = 235,
+        NamedExports = 236,
+        ExportSpecifier = 237,
+        MissingDeclaration = 238,
+        ExternalModuleReference = 239,
+        JsxElement = 240,
+        JsxSelfClosingElement = 241,
+        JsxOpeningElement = 242,
+        JsxText = 243,
+        JsxClosingElement = 244,
+        JsxAttribute = 245,
+        JsxSpreadAttribute = 246,
+        JsxExpression = 247,
+        CaseClause = 248,
+        DefaultClause = 249,
+        HeritageClause = 250,
+        CatchClause = 251,
+        PropertyAssignment = 252,
+        ShorthandPropertyAssignment = 253,
+        EnumMember = 254,
+        SourceFile = 255,
+        JSDocTypeExpression = 256,
+        JSDocAllType = 257,
+        JSDocUnknownType = 258,
+        JSDocArrayType = 259,
+        JSDocUnionType = 260,
+        JSDocTupleType = 261,
+        JSDocNullableType = 262,
+        JSDocNonNullableType = 263,
+        JSDocRecordType = 264,
+        JSDocRecordMember = 265,
+        JSDocTypeReference = 266,
+        JSDocOptionalType = 267,
+        JSDocFunctionType = 268,
+        JSDocVariadicType = 269,
+        JSDocConstructorType = 270,
+        JSDocThisType = 271,
+        JSDocComment = 272,
+        JSDocTag = 273,
+        JSDocParameterTag = 274,
+        JSDocReturnTag = 275,
+        JSDocTypeTag = 276,
+        JSDocTemplateTag = 277,
+        SyntaxList = 278,
+        Count = 279,
         FirstAssignment = 56,
         LastAssignment = 68,
         FirstReservedWord = 70,
         LastReservedWord = 105,
         FirstKeyword = 70,
-        LastKeyword = 135,
+        LastKeyword = 137,
         FirstFutureReservedWord = 106,
         LastFutureReservedWord = 114,
-        FirstTypeNode = 151,
-        LastTypeNode = 163,
+        FirstTypeNode = 153,
+        LastTypeNode = 165,
         FirstPunctuation = 15,
         LastPunctuation = 68,
         FirstToken = 0,
-        LastToken = 135,
+        LastToken = 137,
         FirstTriviaToken = 2,
         LastTriviaToken = 7,
         FirstLiteralToken = 8,
@@ -331,40 +335,48 @@ declare namespace ts {
         LastTemplateToken = 14,
         FirstBinaryOperator = 25,
         LastBinaryOperator = 68,
-        FirstNode = 136,
+        FirstNode = 138,
     }
     enum NodeFlags {
         None = 0,
-        Export = 2,
-        Ambient = 4,
-        Public = 8,
-        Private = 16,
-        Protected = 32,
-        Static = 64,
+        Export = 1,
+        Ambient = 2,
+        Public = 4,
+        Private = 8,
+        Protected = 16,
+        Static = 32,
+        Readonly = 64,
         Abstract = 128,
         Async = 256,
         Default = 512,
-        MultiLine = 1024,
-        Synthetic = 2048,
-        DeclarationFile = 4096,
-        Let = 8192,
-        Const = 16384,
-        OctalLiteral = 32768,
-        Namespace = 65536,
-        ExportContext = 131072,
-        ContainsThis = 262144,
-        HasImplicitReturn = 524288,
-        HasExplicitReturn = 1048576,
-        GlobalAugmentation = 2097152,
-        HasClassExtends = 4194304,
-        HasDecorators = 8388608,
-        HasParamDecorators = 16777216,
-        HasAsyncFunctions = 33554432,
-        Modifier = 1022,
-        AccessibilityModifier = 56,
-        BlockScoped = 24576,
-        ReachabilityCheckFlags = 1572864,
-        EmitHelperFlags = 62914560,
+        Let = 1024,
+        Const = 2048,
+        Namespace = 4096,
+        ExportContext = 8192,
+        ContainsThis = 16384,
+        HasImplicitReturn = 32768,
+        HasExplicitReturn = 65536,
+        GlobalAugmentation = 131072,
+        HasClassExtends = 262144,
+        HasDecorators = 524288,
+        HasParamDecorators = 1048576,
+        HasAsyncFunctions = 2097152,
+        DisallowInContext = 4194304,
+        YieldContext = 8388608,
+        DecoratorContext = 16777216,
+        AwaitContext = 33554432,
+        ThisNodeHasError = 67108864,
+        JavaScriptFile = 134217728,
+        ThisNodeOrAnySubNodesHasError = 268435456,
+        HasAggregatedChildData = 536870912,
+        HasJsxSpreadAttribute = 1073741824,
+        Modifier = 959,
+        AccessibilityModifier = 28,
+        BlockScoped = 3072,
+        ReachabilityCheckFlags = 98304,
+        EmitHelperFlags = 3932160,
+        ContextFlags = 197132288,
+        TypeExcludesFlags = 41943040,
     }
     enum JsxFlags {
         None = 0,
@@ -372,10 +384,6 @@ declare namespace ts {
         IntrinsicNamedElement = 1,
         /** An element inferred from the string index signature of the JSX.IntrinsicElements interface */
         IntrinsicIndexedElement = 2,
-        /** An element backed by a class, class-like, or function value */
-        ValueElement = 4,
-        /** Element resolution failed */
-        UnknownElement = 16,
         IntrinsicElement = 3,
     }
     interface Node extends TextRange {
@@ -397,6 +405,9 @@ declare namespace ts {
         text: string;
         originalKeywordKind?: SyntaxKind;
     }
+    interface TransientIdentifier extends Identifier {
+        resolvedSymbol: Symbol;
+    }
     interface QualifiedName extends Node {
         left: EntityName;
         right: Identifier;
@@ -698,11 +709,12 @@ declare namespace ts {
         dotToken: Node;
         name: Identifier;
     }
+    type IdentifierOrPropertyAccess = Identifier | PropertyAccessExpression;
     interface ElementAccessExpression extends MemberExpression {
         expression: LeftHandSideExpression;
         argumentExpression?: Expression;
     }
-    interface CallExpression extends LeftHandSideExpression {
+    interface CallExpression extends LeftHandSideExpression, Declaration {
         expression: LeftHandSideExpression;
         typeArguments?: NodeArray<TypeNode>;
         arguments: NodeArray<Expression>;
@@ -727,6 +739,9 @@ declare namespace ts {
         expression: UnaryExpression;
     }
     type AssertionExpression = TypeAssertion | AsExpression;
+    interface NonNullExpression extends LeftHandSideExpression {
+        expression: Expression;
+    }
     interface JsxElement extends PrimaryExpression {
         openingElement: JsxOpeningElement;
         children: NodeArray<JsxChild>;
@@ -850,6 +865,7 @@ declare namespace ts {
         variableDeclaration: VariableDeclaration;
         block: Block;
     }
+    type DeclarationWithTypeParameters = SignatureDeclaration | ClassLikeDeclaration | InterfaceDeclaration | TypeAliasDeclaration;
     interface ClassLikeDeclaration extends Declaration {
         name?: Identifier;
         typeParameters?: NodeArray<TypeParameterDeclaration>;
@@ -919,6 +935,10 @@ declare namespace ts {
     interface NamespaceImport extends Declaration {
         name: Identifier;
     }
+    interface GlobalModuleExportDeclaration extends DeclarationStatement {
+        name: Identifier;
+        moduleReference: LiteralLikeNode;
+    }
     interface ExportDeclaration extends DeclarationStatement {
         exportClause?: NamedExports;
         moduleSpecifier?: Expression;
@@ -1000,6 +1020,7 @@ declare namespace ts {
     interface JSDocThisType extends JSDocType {
         type: JSDocType;
     }
+    type JSDocTypeReferencingNode = JSDocThisType | JSDocConstructorType | JSDocVariadicType | JSDocOptionalType | JSDocNullableType | JSDocNonNullableType;
     interface JSDocRecordMember extends PropertySignature {
         name: Identifier | LiteralExpression;
         type?: JSDocType;
@@ -1039,7 +1060,9 @@ declare namespace ts {
         amdDependencies: AmdDependency[];
         moduleName: string;
         referencedFiles: FileReference[];
+        typeReferenceDirectives: FileReference[];
         languageVariant: LanguageVariant;
+        isDeclarationFile: boolean;
         /**
          * lib.d.ts should have a reference comment like
          *
@@ -1060,7 +1083,7 @@ declare namespace ts {
         readDirectory(rootDir: string, extension: string, exclude: string[]): string[];
     }
     interface WriteFileCallback {
-        (fileName: string, data: string, writeByteOrderMark: boolean, onError?: (message: string) => void): void;
+        (fileName: string, data: string, writeByteOrderMark: boolean, onError?: (message: string) => void, sourceFiles?: SourceFile[]): void;
     }
     class OperationCanceledException {
     }
@@ -1133,7 +1156,9 @@ declare namespace ts {
     }
     interface EmitResult {
         emitSkipped: boolean;
+        /** Contains declaration emit diagnostics */
         diagnostics: Diagnostic[];
+        emittedFiles: string[];
     }
     interface TypeChecker {
         getTypeOfSymbolAtLocation(symbol: Symbol, node: Node): Type;
@@ -1177,8 +1202,9 @@ declare namespace ts {
         buildSignatureDisplay(signatures: Signature, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags, kind?: SignatureKind): void;
         buildParameterDisplay(parameter: Symbol, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
         buildTypeParameterDisplay(tp: TypeParameter, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
-        buildTypeParameterDisplayFromSymbol(symbol: Symbol, writer: SymbolWriter, enclosingDeclaraiton?: Node, flags?: TypeFormatFlags): void;
-        buildDisplayForParametersAndDelimiters(parameters: Symbol[], writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
+        buildTypePredicateDisplay(predicate: TypePredicate, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
+        buildTypeParameterDisplayFromSymbol(symbol: Symbol, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
+        buildDisplayForParametersAndDelimiters(thisType: Type, parameters: Symbol[], writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
         buildDisplayForTypeParametersAndDelimiters(typeParameters: TypeParameter[], writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
         buildReturnTypeDisplay(signature: Signature, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
     }
@@ -1217,17 +1243,18 @@ declare namespace ts {
         This = 0,
         Identifier = 1,
     }
-    interface TypePredicate {
+    interface TypePredicateBase {
         kind: TypePredicateKind;
         type: Type;
     }
-    interface ThisTypePredicate extends TypePredicate {
+    interface ThisTypePredicate extends TypePredicateBase {
         _thisTypePredicateBrand: any;
     }
-    interface IdentifierTypePredicate extends TypePredicate {
+    interface IdentifierTypePredicate extends TypePredicateBase {
         parameterName: string;
         parameterIndex: number;
     }
+    type TypePredicate = IdentifierTypePredicate | ThisTypePredicate;
     enum SymbolFlags {
         None = 0,
         FunctionScopedVariable = 1,
@@ -1301,6 +1328,7 @@ declare namespace ts {
         valueDeclaration?: Declaration;
         members?: SymbolTable;
         exports?: SymbolTable;
+        globalExports?: SymbolTable;
     }
     interface SymbolTable {
         [index: string]: Symbol;
@@ -1328,7 +1356,6 @@ declare namespace ts {
         ESSymbol = 16777216,
         ThisType = 33554432,
         ObjectLiteralPatternWithComputedProperties = 67108864,
-        PredicateType = 134217728,
         StringLike = 258,
         NumberLike = 132,
         ObjectType = 80896,
@@ -1341,9 +1368,6 @@ declare namespace ts {
         symbol?: Symbol;
         pattern?: DestructuringPattern;
     }
-    interface PredicateType extends Type {
-        predicate: ThisTypePredicate | IdentifierTypePredicate;
-    }
     interface StringLiteralType extends Type {
         text: string;
     }
@@ -1359,8 +1383,8 @@ declare namespace ts {
         declaredProperties: Symbol[];
         declaredCallSignatures: Signature[];
         declaredConstructSignatures: Signature[];
-        declaredStringIndexType: Type;
-        declaredNumberIndexType: Type;
+        declaredStringIndexInfo: IndexInfo;
+        declaredNumberIndexInfo: IndexInfo;
     }
     interface TypeReference extends ObjectType {
         target: GenericType;
@@ -1389,11 +1413,17 @@ declare namespace ts {
         declaration: SignatureDeclaration;
         typeParameters: TypeParameter[];
         parameters: Symbol[];
+        thisType?: Type;
     }
     enum IndexKind {
         String = 0,
         Number = 1,
     }
+    interface IndexInfo {
+        type: Type;
+        isReadonly: boolean;
+        declaration?: SignatureDeclaration;
+    }
     interface DiagnosticMessage {
         key: string;
         category: DiagnosticCategory;
@@ -1429,10 +1459,15 @@ declare namespace ts {
         Classic = 1,
         NodeJs = 2,
     }
+    type RootPaths = string[];
+    type PathSubstitutions = Map<string[]>;
+    type TsConfigOnlyOptions = RootPaths | PathSubstitutions;
+    type CompilerOptionsValue = string | number | boolean | (string | number)[] | TsConfigOnlyOptions;
     interface CompilerOptions {
         allowNonTsExtensions?: boolean;
         charset?: string;
         declaration?: boolean;
+        declarationDir?: string;
         diagnostics?: boolean;
         emitBOM?: boolean;
         help?: boolean;
@@ -1442,6 +1477,7 @@ declare namespace ts {
         jsx?: JsxEmit;
         reactNamespace?: string;
         listFiles?: boolean;
+        typesSearchPaths?: string[];
         locale?: string;
         mapRoot?: string;
         module?: ModuleKind;
@@ -1451,6 +1487,7 @@ declare namespace ts {
         noEmitOnError?: boolean;
         noErrorTruncation?: boolean;
         noImplicitAny?: boolean;
+        noImplicitThis?: boolean;
         noLib?: boolean;
         noResolve?: boolean;
         out?: string;
@@ -1476,9 +1513,33 @@ declare namespace ts {
         noImplicitReturns?: boolean;
         noFallthroughCasesInSwitch?: boolean;
         forceConsistentCasingInFileNames?: boolean;
+        baseUrl?: string;
+        paths?: PathSubstitutions;
+        rootDirs?: RootPaths;
+        traceResolution?: boolean;
         allowSyntheticDefaultImports?: boolean;
         allowJs?: boolean;
-        [option: string]: string | number | boolean;
+        noImplicitUseStrict?: boolean;
+        strictNullChecks?: boolean;
+        listEmittedFiles?: boolean;
+        lib?: string[];
+        types?: string[];
+        list?: string[];
+        [option: string]: CompilerOptionsValue;
+    }
+    interface TypingOptions {
+        enableAutoDiscovery?: boolean;
+        include?: string[];
+        exclude?: string[];
+        [option: string]: string[] | boolean;
+    }
+    interface DiscoverTypingsInfo {
+        fileNames: string[];
+        projectRootPath: string;
+        safeListPath: string;
+        packageNameToTypingLocation: Map<string>;
+        typingOptions: TypingOptions;
+        compilerOptions: CompilerOptions;
     }
     enum ModuleKind {
         None = 0,
@@ -1502,6 +1563,13 @@ declare namespace ts {
         line: number;
         character: number;
     }
+    enum ScriptKind {
+        Unknown = 0,
+        JS = 1,
+        JSX = 2,
+        TS = 3,
+        TSX = 4,
+    }
     enum ScriptTarget {
         ES3 = 0,
         ES5 = 1,
@@ -1515,12 +1583,14 @@ declare namespace ts {
     }
     interface ParsedCommandLine {
         options: CompilerOptions;
+        typingOptions?: TypingOptions;
         fileNames: string[];
         errors: Diagnostic[];
     }
     interface ModuleResolutionHost {
         fileExists(fileName: string): boolean;
         readFile(fileName: string): string;
+        trace?(s: string): void;
         directoryExists?(directoryName: string): boolean;
     }
     interface ResolvedModule {
@@ -1531,16 +1601,29 @@ declare namespace ts {
         resolvedModule: ResolvedModule;
         failedLookupLocations: string[];
     }
+    interface ResolvedTypeReferenceDirective {
+        primary: boolean;
+        resolvedFileName?: string;
+    }
+    interface ResolvedTypeReferenceDirectiveWithFailedLookupLocations {
+        resolvedTypeReferenceDirective: ResolvedTypeReferenceDirective;
+        failedLookupLocations: string[];
+    }
     interface CompilerHost extends ModuleResolutionHost {
         getSourceFile(fileName: string, languageVersion: ScriptTarget, onError?: (message: string) => void): SourceFile;
         getCancellationToken?(): CancellationToken;
         getDefaultLibFileName(options: CompilerOptions): string;
+        getDefaultLibLocation?(): string;
         writeFile: WriteFileCallback;
         getCurrentDirectory(): string;
         getCanonicalFileName(fileName: string): string;
         useCaseSensitiveFileNames(): boolean;
         getNewLine(): string;
         resolveModuleNames?(moduleNames: string[], containingFile: string): ResolvedModule[];
+        /**
+         * 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[];
     }
     interface TextSpan {
         start: number;
@@ -1552,8 +1635,8 @@ declare namespace ts {
     }
 }
 declare namespace ts {
-    type FileWatcherCallback = (path: string, removed?: boolean) => void;
-    type DirectoryWatcherCallback = (path: string) => void;
+    type FileWatcherCallback = (fileName: string, removed?: boolean) => void;
+    type DirectoryWatcherCallback = (directoryName: string) => void;
     interface System {
         args: string[];
         newLine: string;
@@ -1561,7 +1644,7 @@ declare namespace ts {
         write(s: string): void;
         readFile(path: string, encoding?: string): string;
         writeFile(path: string, data: string, writeByteOrderMark?: boolean): void;
-        watchFile?(path: Path, callback: FileWatcherCallback): FileWatcher;
+        watchFile?(path: string, callback: FileWatcherCallback): FileWatcher;
         watchDirectory?(path: string, callback: DirectoryWatcherCallback, recursive?: boolean): FileWatcher;
         resolvePath(path: string): string;
         fileExists(path: string): boolean;
@@ -1570,6 +1653,8 @@ declare namespace ts {
         getExecutingFilePath(): string;
         getCurrentDirectory(): string;
         readDirectory(path: string, extension?: string, exclude?: string[]): string[];
+        getModifiedTime?(path: string): Date;
+        createHash?(data: string): string;
         getMemoryUsage?(): number;
         exit(exitCode?: number): void;
     }
@@ -1577,7 +1662,7 @@ declare namespace ts {
         close(): void;
     }
     interface DirectoryWatcher extends FileWatcher {
-        directoryPath: Path;
+        directoryName: string;
         referenceCount: number;
     }
     var sys: System;
@@ -1604,6 +1689,7 @@ declare namespace ts {
         scanJsxIdentifier(): SyntaxKind;
         reScanJsxToken(): SyntaxKind;
         scanJsxToken(): SyntaxKind;
+        scanJSDocToken(): SyntaxKind;
         scan(): SyntaxKind;
         setText(text: string, start?: number, length?: number): void;
         setOnError(onError: ErrorCallback): void;
@@ -1611,6 +1697,7 @@ declare namespace ts {
         setLanguageVariant(variant: LanguageVariant): void;
         setTextPos(textPos: number): void;
         lookAhead<T>(callback: () => T): T;
+        scanRange<T>(start: number, length: number, callback: () => T): T;
         tryScan<T>(callback: () => T): T;
     }
     function tokenToString(t: SyntaxKind): string;
@@ -1657,17 +1744,26 @@ 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;
     function forEachChild<T>(node: Node, cbNode: (node: Node) => T, cbNodeArray?: (nodes: Node[]) => T): T;
-    function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes?: boolean): SourceFile;
+    function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes?: boolean, scriptKind?: ScriptKind): SourceFile;
+    function isExternalModule(file: SourceFile): boolean;
     function updateSourceFile(sourceFile: SourceFile, newText: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
 }
 declare namespace ts {
     const version: string;
     function findConfigFile(searchPath: string, fileExists: (fileName: string) => boolean): string;
     function resolveTripleslashReference(moduleName: string, containingFile: string): string;
+    /**
+     * @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
+     * is assumed to be the same as root directory of the project.
+     */
+    function resolveTypeReferenceDirective(typeReferenceDirectiveName: string, containingFile: string, options: CompilerOptions, host: ModuleResolutionHost): ResolvedTypeReferenceDirectiveWithFailedLookupLocations;
     function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations;
     function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations;
     function classicNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations;
@@ -1677,7 +1773,6 @@ declare namespace ts {
     function createProgram(rootNames: string[], options: CompilerOptions, host?: CompilerHost, oldProgram?: Program): Program;
 }
 declare namespace ts {
-    function parseCommandLine(commandLine: string[], readFile?: (path: string) => string): ParsedCommandLine;
     /**
       * Read tsconfig.json file
       * @param fileName The path to the config file
@@ -1702,8 +1797,12 @@ declare namespace ts {
       * @param basePath A root directory to resolve relative path entries in the config
       *    file to. e.g. outDir
       */
-    function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions): ParsedCommandLine;
-    function convertCompilerOptionsFromJson(jsonOptions: any, basePath: string): {
+    function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string): ParsedCommandLine;
+    function convertCompilerOptionsFromJson(jsonOptions: any, basePath: string, configFileName?: string): {
+        options: CompilerOptions;
+        errors: Diagnostic[];
+    };
+    function convertTypingOptionsFromJson(jsonOptions: any, basePath: string, configFileName?: string): {
         options: CompilerOptions;
         errors: Diagnostic[];
     };
@@ -1784,6 +1883,7 @@ declare namespace ts {
     }
     interface PreProcessedFileInfo {
         referencedFiles: FileReference[];
+        typeReferenceDirectives: FileReference[];
         importedFiles: FileReference[];
         ambientExternalModules: string[];
         isLibFile: boolean;
@@ -1796,6 +1896,7 @@ declare namespace ts {
         getNewLine?(): string;
         getProjectVersion?(): string;
         getScriptFileNames(): string[];
+        getScriptKind?(fileName: string): ScriptKind;
         getScriptVersion(fileName: string): string;
         getScriptSnapshot(fileName: string): IScriptSnapshot;
         getLocalizedDiagnosticMessages?(): any;
@@ -1807,6 +1908,7 @@ declare namespace ts {
         error?(s: string): void;
         useCaseSensitiveFileNames?(): boolean;
         resolveModuleNames?(moduleNames: string[], containingFile: string): ResolvedModule[];
+        resolveTypeReferenceDirectives?(typeDirectiveNames: string[], containingFile: string): ResolvedTypeReferenceDirective[];
         directoryExists?(directoryName: string): boolean;
     }
     interface LanguageService {
@@ -1851,7 +1953,6 @@ declare namespace ts {
         getDocCommentTemplateAtPosition(fileName: string, position: number): TextInsertion;
         getEmitOutput(fileName: string): EmitOutput;
         getProgram(): Program;
-        getSourceFile(fileName: string): SourceFile;
         dispose(): void;
     }
     interface Classifications {
@@ -2164,7 +2265,7 @@ declare namespace ts {
           * @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): SourceFile;
+        acquireDocument(fileName: string, compilationSettings: CompilerOptions, 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
@@ -2177,7 +2278,7 @@ declare namespace ts {
           * @param scriptSnapshot Text of the file.
           * @param version Current version of the file.
           */
-        updateDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string): SourceFile;
+        updateDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string, scriptKind?: ScriptKind): SourceFile;
         /**
           * Informs the DocumentRegistry that a file is not needed any longer.
           *
@@ -2301,7 +2402,7 @@ declare namespace ts {
     }
     function transpileModule(input: string, transpileOptions: TranspileOptions): TranspileOutput;
     function transpile(input: string, compilerOptions?: CompilerOptions, fileName?: string, diagnostics?: Diagnostic[], moduleName?: string): string;
-    function createLanguageServiceSourceFile(fileName: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, setNodeParents: boolean): SourceFile;
+    function createLanguageServiceSourceFile(fileName: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, setNodeParents: boolean, scriptKind?: ScriptKind): SourceFile;
     let disableIncrementalParsing: boolean;
     function updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
     function createDocumentRegistry(useCaseSensitiveFileNames?: boolean, currentDirectory?: string): DocumentRegistry;
diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js
index bbe9a4b07e3..f8b128defd8 100644
--- a/lib/typescriptServices.js
+++ b/lib/typescriptServices.js
@@ -13,6 +13,11 @@ See the Apache Version 2.0 License for specific language governing permissions
 and limitations under the License.
 ***************************************************************************** */
 
+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 ts;
 (function (ts) {
     // token > SyntaxKind.Identifer => token is a keyword
@@ -156,190 +161,194 @@ var ts;
         SyntaxKind[SyntaxKind["IsKeyword"] = 124] = "IsKeyword";
         SyntaxKind[SyntaxKind["ModuleKeyword"] = 125] = "ModuleKeyword";
         SyntaxKind[SyntaxKind["NamespaceKeyword"] = 126] = "NamespaceKeyword";
-        SyntaxKind[SyntaxKind["RequireKeyword"] = 127] = "RequireKeyword";
-        SyntaxKind[SyntaxKind["NumberKeyword"] = 128] = "NumberKeyword";
-        SyntaxKind[SyntaxKind["SetKeyword"] = 129] = "SetKeyword";
-        SyntaxKind[SyntaxKind["StringKeyword"] = 130] = "StringKeyword";
-        SyntaxKind[SyntaxKind["SymbolKeyword"] = 131] = "SymbolKeyword";
-        SyntaxKind[SyntaxKind["TypeKeyword"] = 132] = "TypeKeyword";
-        SyntaxKind[SyntaxKind["FromKeyword"] = 133] = "FromKeyword";
-        SyntaxKind[SyntaxKind["GlobalKeyword"] = 134] = "GlobalKeyword";
-        SyntaxKind[SyntaxKind["OfKeyword"] = 135] = "OfKeyword";
+        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 127] = "ReadonlyKeyword";
+        SyntaxKind[SyntaxKind["RequireKeyword"] = 128] = "RequireKeyword";
+        SyntaxKind[SyntaxKind["NumberKeyword"] = 129] = "NumberKeyword";
+        SyntaxKind[SyntaxKind["SetKeyword"] = 130] = "SetKeyword";
+        SyntaxKind[SyntaxKind["StringKeyword"] = 131] = "StringKeyword";
+        SyntaxKind[SyntaxKind["SymbolKeyword"] = 132] = "SymbolKeyword";
+        SyntaxKind[SyntaxKind["TypeKeyword"] = 133] = "TypeKeyword";
+        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 134] = "UndefinedKeyword";
+        SyntaxKind[SyntaxKind["FromKeyword"] = 135] = "FromKeyword";
+        SyntaxKind[SyntaxKind["GlobalKeyword"] = 136] = "GlobalKeyword";
+        SyntaxKind[SyntaxKind["OfKeyword"] = 137] = "OfKeyword";
         // Parse tree nodes
         // Names
-        SyntaxKind[SyntaxKind["QualifiedName"] = 136] = "QualifiedName";
-        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 137] = "ComputedPropertyName";
+        SyntaxKind[SyntaxKind["QualifiedName"] = 138] = "QualifiedName";
+        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 139] = "ComputedPropertyName";
         // Signature elements
-        SyntaxKind[SyntaxKind["TypeParameter"] = 138] = "TypeParameter";
-        SyntaxKind[SyntaxKind["Parameter"] = 139] = "Parameter";
-        SyntaxKind[SyntaxKind["Decorator"] = 140] = "Decorator";
+        SyntaxKind[SyntaxKind["TypeParameter"] = 140] = "TypeParameter";
+        SyntaxKind[SyntaxKind["Parameter"] = 141] = "Parameter";
+        SyntaxKind[SyntaxKind["Decorator"] = 142] = "Decorator";
         // TypeMember
-        SyntaxKind[SyntaxKind["PropertySignature"] = 141] = "PropertySignature";
-        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 142] = "PropertyDeclaration";
-        SyntaxKind[SyntaxKind["MethodSignature"] = 143] = "MethodSignature";
-        SyntaxKind[SyntaxKind["MethodDeclaration"] = 144] = "MethodDeclaration";
-        SyntaxKind[SyntaxKind["Constructor"] = 145] = "Constructor";
-        SyntaxKind[SyntaxKind["GetAccessor"] = 146] = "GetAccessor";
-        SyntaxKind[SyntaxKind["SetAccessor"] = 147] = "SetAccessor";
-        SyntaxKind[SyntaxKind["CallSignature"] = 148] = "CallSignature";
-        SyntaxKind[SyntaxKind["ConstructSignature"] = 149] = "ConstructSignature";
-        SyntaxKind[SyntaxKind["IndexSignature"] = 150] = "IndexSignature";
+        SyntaxKind[SyntaxKind["PropertySignature"] = 143] = "PropertySignature";
+        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 144] = "PropertyDeclaration";
+        SyntaxKind[SyntaxKind["MethodSignature"] = 145] = "MethodSignature";
+        SyntaxKind[SyntaxKind["MethodDeclaration"] = 146] = "MethodDeclaration";
+        SyntaxKind[SyntaxKind["Constructor"] = 147] = "Constructor";
+        SyntaxKind[SyntaxKind["GetAccessor"] = 148] = "GetAccessor";
+        SyntaxKind[SyntaxKind["SetAccessor"] = 149] = "SetAccessor";
+        SyntaxKind[SyntaxKind["CallSignature"] = 150] = "CallSignature";
+        SyntaxKind[SyntaxKind["ConstructSignature"] = 151] = "ConstructSignature";
+        SyntaxKind[SyntaxKind["IndexSignature"] = 152] = "IndexSignature";
         // Type
-        SyntaxKind[SyntaxKind["TypePredicate"] = 151] = "TypePredicate";
-        SyntaxKind[SyntaxKind["TypeReference"] = 152] = "TypeReference";
-        SyntaxKind[SyntaxKind["FunctionType"] = 153] = "FunctionType";
-        SyntaxKind[SyntaxKind["ConstructorType"] = 154] = "ConstructorType";
-        SyntaxKind[SyntaxKind["TypeQuery"] = 155] = "TypeQuery";
-        SyntaxKind[SyntaxKind["TypeLiteral"] = 156] = "TypeLiteral";
-        SyntaxKind[SyntaxKind["ArrayType"] = 157] = "ArrayType";
-        SyntaxKind[SyntaxKind["TupleType"] = 158] = "TupleType";
-        SyntaxKind[SyntaxKind["UnionType"] = 159] = "UnionType";
-        SyntaxKind[SyntaxKind["IntersectionType"] = 160] = "IntersectionType";
-        SyntaxKind[SyntaxKind["ParenthesizedType"] = 161] = "ParenthesizedType";
-        SyntaxKind[SyntaxKind["ThisType"] = 162] = "ThisType";
-        SyntaxKind[SyntaxKind["StringLiteralType"] = 163] = "StringLiteralType";
+        SyntaxKind[SyntaxKind["TypePredicate"] = 153] = "TypePredicate";
+        SyntaxKind[SyntaxKind["TypeReference"] = 154] = "TypeReference";
+        SyntaxKind[SyntaxKind["FunctionType"] = 155] = "FunctionType";
+        SyntaxKind[SyntaxKind["ConstructorType"] = 156] = "ConstructorType";
+        SyntaxKind[SyntaxKind["TypeQuery"] = 157] = "TypeQuery";
+        SyntaxKind[SyntaxKind["TypeLiteral"] = 158] = "TypeLiteral";
+        SyntaxKind[SyntaxKind["ArrayType"] = 159] = "ArrayType";
+        SyntaxKind[SyntaxKind["TupleType"] = 160] = "TupleType";
+        SyntaxKind[SyntaxKind["UnionType"] = 161] = "UnionType";
+        SyntaxKind[SyntaxKind["IntersectionType"] = 162] = "IntersectionType";
+        SyntaxKind[SyntaxKind["ParenthesizedType"] = 163] = "ParenthesizedType";
+        SyntaxKind[SyntaxKind["ThisType"] = 164] = "ThisType";
+        SyntaxKind[SyntaxKind["StringLiteralType"] = 165] = "StringLiteralType";
         // Binding patterns
-        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 164] = "ObjectBindingPattern";
-        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 165] = "ArrayBindingPattern";
-        SyntaxKind[SyntaxKind["BindingElement"] = 166] = "BindingElement";
+        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 166] = "ObjectBindingPattern";
+        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 167] = "ArrayBindingPattern";
+        SyntaxKind[SyntaxKind["BindingElement"] = 168] = "BindingElement";
         // Expression
-        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 167] = "ArrayLiteralExpression";
-        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 168] = "ObjectLiteralExpression";
-        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 169] = "PropertyAccessExpression";
-        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 170] = "ElementAccessExpression";
-        SyntaxKind[SyntaxKind["CallExpression"] = 171] = "CallExpression";
-        SyntaxKind[SyntaxKind["NewExpression"] = 172] = "NewExpression";
-        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 173] = "TaggedTemplateExpression";
-        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 174] = "TypeAssertionExpression";
-        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 175] = "ParenthesizedExpression";
-        SyntaxKind[SyntaxKind["FunctionExpression"] = 176] = "FunctionExpression";
-        SyntaxKind[SyntaxKind["ArrowFunction"] = 177] = "ArrowFunction";
-        SyntaxKind[SyntaxKind["DeleteExpression"] = 178] = "DeleteExpression";
-        SyntaxKind[SyntaxKind["TypeOfExpression"] = 179] = "TypeOfExpression";
-        SyntaxKind[SyntaxKind["VoidExpression"] = 180] = "VoidExpression";
-        SyntaxKind[SyntaxKind["AwaitExpression"] = 181] = "AwaitExpression";
-        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 182] = "PrefixUnaryExpression";
-        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 183] = "PostfixUnaryExpression";
-        SyntaxKind[SyntaxKind["BinaryExpression"] = 184] = "BinaryExpression";
-        SyntaxKind[SyntaxKind["ConditionalExpression"] = 185] = "ConditionalExpression";
-        SyntaxKind[SyntaxKind["TemplateExpression"] = 186] = "TemplateExpression";
-        SyntaxKind[SyntaxKind["YieldExpression"] = 187] = "YieldExpression";
-        SyntaxKind[SyntaxKind["SpreadElementExpression"] = 188] = "SpreadElementExpression";
-        SyntaxKind[SyntaxKind["ClassExpression"] = 189] = "ClassExpression";
-        SyntaxKind[SyntaxKind["OmittedExpression"] = 190] = "OmittedExpression";
-        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 191] = "ExpressionWithTypeArguments";
-        SyntaxKind[SyntaxKind["AsExpression"] = 192] = "AsExpression";
+        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 169] = "ArrayLiteralExpression";
+        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 170] = "ObjectLiteralExpression";
+        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 171] = "PropertyAccessExpression";
+        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 172] = "ElementAccessExpression";
+        SyntaxKind[SyntaxKind["CallExpression"] = 173] = "CallExpression";
+        SyntaxKind[SyntaxKind["NewExpression"] = 174] = "NewExpression";
+        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 175] = "TaggedTemplateExpression";
+        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 176] = "TypeAssertionExpression";
+        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 177] = "ParenthesizedExpression";
+        SyntaxKind[SyntaxKind["FunctionExpression"] = 178] = "FunctionExpression";
+        SyntaxKind[SyntaxKind["ArrowFunction"] = 179] = "ArrowFunction";
+        SyntaxKind[SyntaxKind["DeleteExpression"] = 180] = "DeleteExpression";
+        SyntaxKind[SyntaxKind["TypeOfExpression"] = 181] = "TypeOfExpression";
+        SyntaxKind[SyntaxKind["VoidExpression"] = 182] = "VoidExpression";
+        SyntaxKind[SyntaxKind["AwaitExpression"] = 183] = "AwaitExpression";
+        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 184] = "PrefixUnaryExpression";
+        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 185] = "PostfixUnaryExpression";
+        SyntaxKind[SyntaxKind["BinaryExpression"] = 186] = "BinaryExpression";
+        SyntaxKind[SyntaxKind["ConditionalExpression"] = 187] = "ConditionalExpression";
+        SyntaxKind[SyntaxKind["TemplateExpression"] = 188] = "TemplateExpression";
+        SyntaxKind[SyntaxKind["YieldExpression"] = 189] = "YieldExpression";
+        SyntaxKind[SyntaxKind["SpreadElementExpression"] = 190] = "SpreadElementExpression";
+        SyntaxKind[SyntaxKind["ClassExpression"] = 191] = "ClassExpression";
+        SyntaxKind[SyntaxKind["OmittedExpression"] = 192] = "OmittedExpression";
+        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 193] = "ExpressionWithTypeArguments";
+        SyntaxKind[SyntaxKind["AsExpression"] = 194] = "AsExpression";
+        SyntaxKind[SyntaxKind["NonNullExpression"] = 195] = "NonNullExpression";
         // Misc
-        SyntaxKind[SyntaxKind["TemplateSpan"] = 193] = "TemplateSpan";
-        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 194] = "SemicolonClassElement";
+        SyntaxKind[SyntaxKind["TemplateSpan"] = 196] = "TemplateSpan";
+        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 197] = "SemicolonClassElement";
         // Element
-        SyntaxKind[SyntaxKind["Block"] = 195] = "Block";
-        SyntaxKind[SyntaxKind["VariableStatement"] = 196] = "VariableStatement";
-        SyntaxKind[SyntaxKind["EmptyStatement"] = 197] = "EmptyStatement";
-        SyntaxKind[SyntaxKind["ExpressionStatement"] = 198] = "ExpressionStatement";
-        SyntaxKind[SyntaxKind["IfStatement"] = 199] = "IfStatement";
-        SyntaxKind[SyntaxKind["DoStatement"] = 200] = "DoStatement";
-        SyntaxKind[SyntaxKind["WhileStatement"] = 201] = "WhileStatement";
-        SyntaxKind[SyntaxKind["ForStatement"] = 202] = "ForStatement";
-        SyntaxKind[SyntaxKind["ForInStatement"] = 203] = "ForInStatement";
-        SyntaxKind[SyntaxKind["ForOfStatement"] = 204] = "ForOfStatement";
-        SyntaxKind[SyntaxKind["ContinueStatement"] = 205] = "ContinueStatement";
-        SyntaxKind[SyntaxKind["BreakStatement"] = 206] = "BreakStatement";
-        SyntaxKind[SyntaxKind["ReturnStatement"] = 207] = "ReturnStatement";
-        SyntaxKind[SyntaxKind["WithStatement"] = 208] = "WithStatement";
-        SyntaxKind[SyntaxKind["SwitchStatement"] = 209] = "SwitchStatement";
-        SyntaxKind[SyntaxKind["LabeledStatement"] = 210] = "LabeledStatement";
-        SyntaxKind[SyntaxKind["ThrowStatement"] = 211] = "ThrowStatement";
-        SyntaxKind[SyntaxKind["TryStatement"] = 212] = "TryStatement";
-        SyntaxKind[SyntaxKind["DebuggerStatement"] = 213] = "DebuggerStatement";
-        SyntaxKind[SyntaxKind["VariableDeclaration"] = 214] = "VariableDeclaration";
-        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 215] = "VariableDeclarationList";
-        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 216] = "FunctionDeclaration";
-        SyntaxKind[SyntaxKind["ClassDeclaration"] = 217] = "ClassDeclaration";
-        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 218] = "InterfaceDeclaration";
-        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 219] = "TypeAliasDeclaration";
-        SyntaxKind[SyntaxKind["EnumDeclaration"] = 220] = "EnumDeclaration";
-        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 221] = "ModuleDeclaration";
-        SyntaxKind[SyntaxKind["ModuleBlock"] = 222] = "ModuleBlock";
-        SyntaxKind[SyntaxKind["CaseBlock"] = 223] = "CaseBlock";
-        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 224] = "ImportEqualsDeclaration";
-        SyntaxKind[SyntaxKind["ImportDeclaration"] = 225] = "ImportDeclaration";
-        SyntaxKind[SyntaxKind["ImportClause"] = 226] = "ImportClause";
-        SyntaxKind[SyntaxKind["NamespaceImport"] = 227] = "NamespaceImport";
-        SyntaxKind[SyntaxKind["NamedImports"] = 228] = "NamedImports";
-        SyntaxKind[SyntaxKind["ImportSpecifier"] = 229] = "ImportSpecifier";
-        SyntaxKind[SyntaxKind["ExportAssignment"] = 230] = "ExportAssignment";
-        SyntaxKind[SyntaxKind["ExportDeclaration"] = 231] = "ExportDeclaration";
-        SyntaxKind[SyntaxKind["NamedExports"] = 232] = "NamedExports";
-        SyntaxKind[SyntaxKind["ExportSpecifier"] = 233] = "ExportSpecifier";
-        SyntaxKind[SyntaxKind["MissingDeclaration"] = 234] = "MissingDeclaration";
+        SyntaxKind[SyntaxKind["Block"] = 198] = "Block";
+        SyntaxKind[SyntaxKind["VariableStatement"] = 199] = "VariableStatement";
+        SyntaxKind[SyntaxKind["EmptyStatement"] = 200] = "EmptyStatement";
+        SyntaxKind[SyntaxKind["ExpressionStatement"] = 201] = "ExpressionStatement";
+        SyntaxKind[SyntaxKind["IfStatement"] = 202] = "IfStatement";
+        SyntaxKind[SyntaxKind["DoStatement"] = 203] = "DoStatement";
+        SyntaxKind[SyntaxKind["WhileStatement"] = 204] = "WhileStatement";
+        SyntaxKind[SyntaxKind["ForStatement"] = 205] = "ForStatement";
+        SyntaxKind[SyntaxKind["ForInStatement"] = 206] = "ForInStatement";
+        SyntaxKind[SyntaxKind["ForOfStatement"] = 207] = "ForOfStatement";
+        SyntaxKind[SyntaxKind["ContinueStatement"] = 208] = "ContinueStatement";
+        SyntaxKind[SyntaxKind["BreakStatement"] = 209] = "BreakStatement";
+        SyntaxKind[SyntaxKind["ReturnStatement"] = 210] = "ReturnStatement";
+        SyntaxKind[SyntaxKind["WithStatement"] = 211] = "WithStatement";
+        SyntaxKind[SyntaxKind["SwitchStatement"] = 212] = "SwitchStatement";
+        SyntaxKind[SyntaxKind["LabeledStatement"] = 213] = "LabeledStatement";
+        SyntaxKind[SyntaxKind["ThrowStatement"] = 214] = "ThrowStatement";
+        SyntaxKind[SyntaxKind["TryStatement"] = 215] = "TryStatement";
+        SyntaxKind[SyntaxKind["DebuggerStatement"] = 216] = "DebuggerStatement";
+        SyntaxKind[SyntaxKind["VariableDeclaration"] = 217] = "VariableDeclaration";
+        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 218] = "VariableDeclarationList";
+        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 219] = "FunctionDeclaration";
+        SyntaxKind[SyntaxKind["ClassDeclaration"] = 220] = "ClassDeclaration";
+        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 221] = "InterfaceDeclaration";
+        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 222] = "TypeAliasDeclaration";
+        SyntaxKind[SyntaxKind["EnumDeclaration"] = 223] = "EnumDeclaration";
+        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 224] = "ModuleDeclaration";
+        SyntaxKind[SyntaxKind["ModuleBlock"] = 225] = "ModuleBlock";
+        SyntaxKind[SyntaxKind["CaseBlock"] = 226] = "CaseBlock";
+        SyntaxKind[SyntaxKind["GlobalModuleExportDeclaration"] = 227] = "GlobalModuleExportDeclaration";
+        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 228] = "ImportEqualsDeclaration";
+        SyntaxKind[SyntaxKind["ImportDeclaration"] = 229] = "ImportDeclaration";
+        SyntaxKind[SyntaxKind["ImportClause"] = 230] = "ImportClause";
+        SyntaxKind[SyntaxKind["NamespaceImport"] = 231] = "NamespaceImport";
+        SyntaxKind[SyntaxKind["NamedImports"] = 232] = "NamedImports";
+        SyntaxKind[SyntaxKind["ImportSpecifier"] = 233] = "ImportSpecifier";
+        SyntaxKind[SyntaxKind["ExportAssignment"] = 234] = "ExportAssignment";
+        SyntaxKind[SyntaxKind["ExportDeclaration"] = 235] = "ExportDeclaration";
+        SyntaxKind[SyntaxKind["NamedExports"] = 236] = "NamedExports";
+        SyntaxKind[SyntaxKind["ExportSpecifier"] = 237] = "ExportSpecifier";
+        SyntaxKind[SyntaxKind["MissingDeclaration"] = 238] = "MissingDeclaration";
         // Module references
-        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 235] = "ExternalModuleReference";
+        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 239] = "ExternalModuleReference";
         // JSX
-        SyntaxKind[SyntaxKind["JsxElement"] = 236] = "JsxElement";
-        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 237] = "JsxSelfClosingElement";
-        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 238] = "JsxOpeningElement";
-        SyntaxKind[SyntaxKind["JsxText"] = 239] = "JsxText";
-        SyntaxKind[SyntaxKind["JsxClosingElement"] = 240] = "JsxClosingElement";
-        SyntaxKind[SyntaxKind["JsxAttribute"] = 241] = "JsxAttribute";
-        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 242] = "JsxSpreadAttribute";
-        SyntaxKind[SyntaxKind["JsxExpression"] = 243] = "JsxExpression";
+        SyntaxKind[SyntaxKind["JsxElement"] = 240] = "JsxElement";
+        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 241] = "JsxSelfClosingElement";
+        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 242] = "JsxOpeningElement";
+        SyntaxKind[SyntaxKind["JsxText"] = 243] = "JsxText";
+        SyntaxKind[SyntaxKind["JsxClosingElement"] = 244] = "JsxClosingElement";
+        SyntaxKind[SyntaxKind["JsxAttribute"] = 245] = "JsxAttribute";
+        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 246] = "JsxSpreadAttribute";
+        SyntaxKind[SyntaxKind["JsxExpression"] = 247] = "JsxExpression";
         // Clauses
-        SyntaxKind[SyntaxKind["CaseClause"] = 244] = "CaseClause";
-        SyntaxKind[SyntaxKind["DefaultClause"] = 245] = "DefaultClause";
-        SyntaxKind[SyntaxKind["HeritageClause"] = 246] = "HeritageClause";
-        SyntaxKind[SyntaxKind["CatchClause"] = 247] = "CatchClause";
+        SyntaxKind[SyntaxKind["CaseClause"] = 248] = "CaseClause";
+        SyntaxKind[SyntaxKind["DefaultClause"] = 249] = "DefaultClause";
+        SyntaxKind[SyntaxKind["HeritageClause"] = 250] = "HeritageClause";
+        SyntaxKind[SyntaxKind["CatchClause"] = 251] = "CatchClause";
         // Property assignments
-        SyntaxKind[SyntaxKind["PropertyAssignment"] = 248] = "PropertyAssignment";
-        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 249] = "ShorthandPropertyAssignment";
+        SyntaxKind[SyntaxKind["PropertyAssignment"] = 252] = "PropertyAssignment";
+        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 253] = "ShorthandPropertyAssignment";
         // Enum
-        SyntaxKind[SyntaxKind["EnumMember"] = 250] = "EnumMember";
+        SyntaxKind[SyntaxKind["EnumMember"] = 254] = "EnumMember";
         // Top-level nodes
-        SyntaxKind[SyntaxKind["SourceFile"] = 251] = "SourceFile";
-        // JSDoc nodes.
-        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 252] = "JSDocTypeExpression";
-        // The * type.
-        SyntaxKind[SyntaxKind["JSDocAllType"] = 253] = "JSDocAllType";
-        // The ? type.
-        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 254] = "JSDocUnknownType";
-        SyntaxKind[SyntaxKind["JSDocArrayType"] = 255] = "JSDocArrayType";
-        SyntaxKind[SyntaxKind["JSDocUnionType"] = 256] = "JSDocUnionType";
-        SyntaxKind[SyntaxKind["JSDocTupleType"] = 257] = "JSDocTupleType";
-        SyntaxKind[SyntaxKind["JSDocNullableType"] = 258] = "JSDocNullableType";
-        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 259] = "JSDocNonNullableType";
-        SyntaxKind[SyntaxKind["JSDocRecordType"] = 260] = "JSDocRecordType";
-        SyntaxKind[SyntaxKind["JSDocRecordMember"] = 261] = "JSDocRecordMember";
-        SyntaxKind[SyntaxKind["JSDocTypeReference"] = 262] = "JSDocTypeReference";
-        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 263] = "JSDocOptionalType";
-        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 264] = "JSDocFunctionType";
-        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 265] = "JSDocVariadicType";
-        SyntaxKind[SyntaxKind["JSDocConstructorType"] = 266] = "JSDocConstructorType";
-        SyntaxKind[SyntaxKind["JSDocThisType"] = 267] = "JSDocThisType";
-        SyntaxKind[SyntaxKind["JSDocComment"] = 268] = "JSDocComment";
-        SyntaxKind[SyntaxKind["JSDocTag"] = 269] = "JSDocTag";
-        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 270] = "JSDocParameterTag";
-        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 271] = "JSDocReturnTag";
-        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 272] = "JSDocTypeTag";
-        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 273] = "JSDocTemplateTag";
+        SyntaxKind[SyntaxKind["SourceFile"] = 255] = "SourceFile";
+        // JSDoc nodes
+        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 256] = "JSDocTypeExpression";
+        // The * type
+        SyntaxKind[SyntaxKind["JSDocAllType"] = 257] = "JSDocAllType";
+        // The ? type
+        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 258] = "JSDocUnknownType";
+        SyntaxKind[SyntaxKind["JSDocArrayType"] = 259] = "JSDocArrayType";
+        SyntaxKind[SyntaxKind["JSDocUnionType"] = 260] = "JSDocUnionType";
+        SyntaxKind[SyntaxKind["JSDocTupleType"] = 261] = "JSDocTupleType";
+        SyntaxKind[SyntaxKind["JSDocNullableType"] = 262] = "JSDocNullableType";
+        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 263] = "JSDocNonNullableType";
+        SyntaxKind[SyntaxKind["JSDocRecordType"] = 264] = "JSDocRecordType";
+        SyntaxKind[SyntaxKind["JSDocRecordMember"] = 265] = "JSDocRecordMember";
+        SyntaxKind[SyntaxKind["JSDocTypeReference"] = 266] = "JSDocTypeReference";
+        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 267] = "JSDocOptionalType";
+        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 268] = "JSDocFunctionType";
+        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 269] = "JSDocVariadicType";
+        SyntaxKind[SyntaxKind["JSDocConstructorType"] = 270] = "JSDocConstructorType";
+        SyntaxKind[SyntaxKind["JSDocThisType"] = 271] = "JSDocThisType";
+        SyntaxKind[SyntaxKind["JSDocComment"] = 272] = "JSDocComment";
+        SyntaxKind[SyntaxKind["JSDocTag"] = 273] = "JSDocTag";
+        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 274] = "JSDocParameterTag";
+        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 275] = "JSDocReturnTag";
+        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 276] = "JSDocTypeTag";
+        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 277] = "JSDocTemplateTag";
         // Synthesized list
-        SyntaxKind[SyntaxKind["SyntaxList"] = 274] = "SyntaxList";
+        SyntaxKind[SyntaxKind["SyntaxList"] = 278] = "SyntaxList";
         // Enum value count
-        SyntaxKind[SyntaxKind["Count"] = 275] = "Count";
+        SyntaxKind[SyntaxKind["Count"] = 279] = "Count";
         // Markers
         SyntaxKind[SyntaxKind["FirstAssignment"] = 56] = "FirstAssignment";
         SyntaxKind[SyntaxKind["LastAssignment"] = 68] = "LastAssignment";
         SyntaxKind[SyntaxKind["FirstReservedWord"] = 70] = "FirstReservedWord";
         SyntaxKind[SyntaxKind["LastReservedWord"] = 105] = "LastReservedWord";
         SyntaxKind[SyntaxKind["FirstKeyword"] = 70] = "FirstKeyword";
-        SyntaxKind[SyntaxKind["LastKeyword"] = 135] = "LastKeyword";
+        SyntaxKind[SyntaxKind["LastKeyword"] = 137] = "LastKeyword";
         SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 106] = "FirstFutureReservedWord";
         SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 114] = "LastFutureReservedWord";
-        SyntaxKind[SyntaxKind["FirstTypeNode"] = 151] = "FirstTypeNode";
-        SyntaxKind[SyntaxKind["LastTypeNode"] = 163] = "LastTypeNode";
+        SyntaxKind[SyntaxKind["FirstTypeNode"] = 153] = "FirstTypeNode";
+        SyntaxKind[SyntaxKind["LastTypeNode"] = 165] = "LastTypeNode";
         SyntaxKind[SyntaxKind["FirstPunctuation"] = 15] = "FirstPunctuation";
         SyntaxKind[SyntaxKind["LastPunctuation"] = 68] = "LastPunctuation";
         SyntaxKind[SyntaxKind["FirstToken"] = 0] = "FirstToken";
-        SyntaxKind[SyntaxKind["LastToken"] = 135] = "LastToken";
+        SyntaxKind[SyntaxKind["LastToken"] = 137] = "LastToken";
         SyntaxKind[SyntaxKind["FirstTriviaToken"] = 2] = "FirstTriviaToken";
         SyntaxKind[SyntaxKind["LastTriviaToken"] = 7] = "LastTriviaToken";
         SyntaxKind[SyntaxKind["FirstLiteralToken"] = 8] = "FirstLiteralToken";
@@ -348,83 +357,59 @@ var ts;
         SyntaxKind[SyntaxKind["LastTemplateToken"] = 14] = "LastTemplateToken";
         SyntaxKind[SyntaxKind["FirstBinaryOperator"] = 25] = "FirstBinaryOperator";
         SyntaxKind[SyntaxKind["LastBinaryOperator"] = 68] = "LastBinaryOperator";
-        SyntaxKind[SyntaxKind["FirstNode"] = 136] = "FirstNode";
+        SyntaxKind[SyntaxKind["FirstNode"] = 138] = "FirstNode";
     })(ts.SyntaxKind || (ts.SyntaxKind = {}));
     var SyntaxKind = ts.SyntaxKind;
     (function (NodeFlags) {
         NodeFlags[NodeFlags["None"] = 0] = "None";
-        NodeFlags[NodeFlags["Export"] = 2] = "Export";
-        NodeFlags[NodeFlags["Ambient"] = 4] = "Ambient";
-        NodeFlags[NodeFlags["Public"] = 8] = "Public";
-        NodeFlags[NodeFlags["Private"] = 16] = "Private";
-        NodeFlags[NodeFlags["Protected"] = 32] = "Protected";
-        NodeFlags[NodeFlags["Static"] = 64] = "Static";
+        NodeFlags[NodeFlags["Export"] = 1] = "Export";
+        NodeFlags[NodeFlags["Ambient"] = 2] = "Ambient";
+        NodeFlags[NodeFlags["Public"] = 4] = "Public";
+        NodeFlags[NodeFlags["Private"] = 8] = "Private";
+        NodeFlags[NodeFlags["Protected"] = 16] = "Protected";
+        NodeFlags[NodeFlags["Static"] = 32] = "Static";
+        NodeFlags[NodeFlags["Readonly"] = 64] = "Readonly";
         NodeFlags[NodeFlags["Abstract"] = 128] = "Abstract";
         NodeFlags[NodeFlags["Async"] = 256] = "Async";
         NodeFlags[NodeFlags["Default"] = 512] = "Default";
-        NodeFlags[NodeFlags["MultiLine"] = 1024] = "MultiLine";
-        NodeFlags[NodeFlags["Synthetic"] = 2048] = "Synthetic";
-        NodeFlags[NodeFlags["DeclarationFile"] = 4096] = "DeclarationFile";
-        NodeFlags[NodeFlags["Let"] = 8192] = "Let";
-        NodeFlags[NodeFlags["Const"] = 16384] = "Const";
-        NodeFlags[NodeFlags["OctalLiteral"] = 32768] = "OctalLiteral";
-        NodeFlags[NodeFlags["Namespace"] = 65536] = "Namespace";
-        NodeFlags[NodeFlags["ExportContext"] = 131072] = "ExportContext";
-        NodeFlags[NodeFlags["ContainsThis"] = 262144] = "ContainsThis";
-        NodeFlags[NodeFlags["HasImplicitReturn"] = 524288] = "HasImplicitReturn";
-        NodeFlags[NodeFlags["HasExplicitReturn"] = 1048576] = "HasExplicitReturn";
-        NodeFlags[NodeFlags["GlobalAugmentation"] = 2097152] = "GlobalAugmentation";
-        NodeFlags[NodeFlags["HasClassExtends"] = 4194304] = "HasClassExtends";
-        NodeFlags[NodeFlags["HasDecorators"] = 8388608] = "HasDecorators";
-        NodeFlags[NodeFlags["HasParamDecorators"] = 16777216] = "HasParamDecorators";
-        NodeFlags[NodeFlags["HasAsyncFunctions"] = 33554432] = "HasAsyncFunctions";
-        NodeFlags[NodeFlags["Modifier"] = 1022] = "Modifier";
-        NodeFlags[NodeFlags["AccessibilityModifier"] = 56] = "AccessibilityModifier";
-        NodeFlags[NodeFlags["BlockScoped"] = 24576] = "BlockScoped";
-        NodeFlags[NodeFlags["ReachabilityCheckFlags"] = 1572864] = "ReachabilityCheckFlags";
-        NodeFlags[NodeFlags["EmitHelperFlags"] = 62914560] = "EmitHelperFlags";
+        NodeFlags[NodeFlags["Let"] = 1024] = "Let";
+        NodeFlags[NodeFlags["Const"] = 2048] = "Const";
+        NodeFlags[NodeFlags["Namespace"] = 4096] = "Namespace";
+        NodeFlags[NodeFlags["ExportContext"] = 8192] = "ExportContext";
+        NodeFlags[NodeFlags["ContainsThis"] = 16384] = "ContainsThis";
+        NodeFlags[NodeFlags["HasImplicitReturn"] = 32768] = "HasImplicitReturn";
+        NodeFlags[NodeFlags["HasExplicitReturn"] = 65536] = "HasExplicitReturn";
+        NodeFlags[NodeFlags["GlobalAugmentation"] = 131072] = "GlobalAugmentation";
+        NodeFlags[NodeFlags["HasClassExtends"] = 262144] = "HasClassExtends";
+        NodeFlags[NodeFlags["HasDecorators"] = 524288] = "HasDecorators";
+        NodeFlags[NodeFlags["HasParamDecorators"] = 1048576] = "HasParamDecorators";
+        NodeFlags[NodeFlags["HasAsyncFunctions"] = 2097152] = "HasAsyncFunctions";
+        NodeFlags[NodeFlags["DisallowInContext"] = 4194304] = "DisallowInContext";
+        NodeFlags[NodeFlags["YieldContext"] = 8388608] = "YieldContext";
+        NodeFlags[NodeFlags["DecoratorContext"] = 16777216] = "DecoratorContext";
+        NodeFlags[NodeFlags["AwaitContext"] = 33554432] = "AwaitContext";
+        NodeFlags[NodeFlags["ThisNodeHasError"] = 67108864] = "ThisNodeHasError";
+        NodeFlags[NodeFlags["JavaScriptFile"] = 134217728] = "JavaScriptFile";
+        NodeFlags[NodeFlags["ThisNodeOrAnySubNodesHasError"] = 268435456] = "ThisNodeOrAnySubNodesHasError";
+        NodeFlags[NodeFlags["HasAggregatedChildData"] = 536870912] = "HasAggregatedChildData";
+        NodeFlags[NodeFlags["HasJsxSpreadAttribute"] = 1073741824] = "HasJsxSpreadAttribute";
+        NodeFlags[NodeFlags["Modifier"] = 959] = "Modifier";
+        NodeFlags[NodeFlags["AccessibilityModifier"] = 28] = "AccessibilityModifier";
+        NodeFlags[NodeFlags["BlockScoped"] = 3072] = "BlockScoped";
+        NodeFlags[NodeFlags["ReachabilityCheckFlags"] = 98304] = "ReachabilityCheckFlags";
+        NodeFlags[NodeFlags["EmitHelperFlags"] = 3932160] = "EmitHelperFlags";
+        // Parsing context flags
+        NodeFlags[NodeFlags["ContextFlags"] = 197132288] = "ContextFlags";
+        // Exclude these flags when parsing a Type
+        NodeFlags[NodeFlags["TypeExcludesFlags"] = 41943040] = "TypeExcludesFlags";
     })(ts.NodeFlags || (ts.NodeFlags = {}));
     var NodeFlags = ts.NodeFlags;
-    /* @internal */
-    (function (ParserContextFlags) {
-        ParserContextFlags[ParserContextFlags["None"] = 0] = "None";
-        // If this node was parsed in a context where 'in-expressions' are not allowed.
-        ParserContextFlags[ParserContextFlags["DisallowIn"] = 1] = "DisallowIn";
-        // If this node was parsed in the 'yield' context created when parsing a generator.
-        ParserContextFlags[ParserContextFlags["Yield"] = 2] = "Yield";
-        // If this node was parsed as part of a decorator
-        ParserContextFlags[ParserContextFlags["Decorator"] = 4] = "Decorator";
-        // If this node was parsed in the 'await' context created when parsing an async function.
-        ParserContextFlags[ParserContextFlags["Await"] = 8] = "Await";
-        // If the parser encountered an error when parsing the code that created this node.  Note
-        // the parser only sets this directly on the node it creates right after encountering the
-        // error.
-        ParserContextFlags[ParserContextFlags["ThisNodeHasError"] = 16] = "ThisNodeHasError";
-        // This node was parsed in a JavaScript file and can be processed differently.  For example
-        // its type can be specified usign a JSDoc comment.
-        ParserContextFlags[ParserContextFlags["JavaScriptFile"] = 32] = "JavaScriptFile";
-        // Context flags set directly by the parser.
-        ParserContextFlags[ParserContextFlags["ParserGeneratedFlags"] = 31] = "ParserGeneratedFlags";
-        // Exclude these flags when parsing a Type
-        ParserContextFlags[ParserContextFlags["TypeExcludesFlags"] = 10] = "TypeExcludesFlags";
-        // Context flags computed by aggregating child flags upwards.
-        // Used during incremental parsing to determine if this node or any of its children had an
-        // error.  Computed only once and then cached.
-        ParserContextFlags[ParserContextFlags["ThisNodeOrAnySubNodesHasError"] = 64] = "ThisNodeOrAnySubNodesHasError";
-        // Used to know if we've computed data from children and cached it in this node.
-        ParserContextFlags[ParserContextFlags["HasAggregatedChildData"] = 128] = "HasAggregatedChildData";
-    })(ts.ParserContextFlags || (ts.ParserContextFlags = {}));
-    var ParserContextFlags = ts.ParserContextFlags;
     (function (JsxFlags) {
         JsxFlags[JsxFlags["None"] = 0] = "None";
         /** An element from a named property of the JSX.IntrinsicElements interface */
         JsxFlags[JsxFlags["IntrinsicNamedElement"] = 1] = "IntrinsicNamedElement";
         /** An element inferred from the string index signature of the JSX.IntrinsicElements interface */
         JsxFlags[JsxFlags["IntrinsicIndexedElement"] = 2] = "IntrinsicIndexedElement";
-        /** An element backed by a class, class-like, or function value */
-        JsxFlags[JsxFlags["ValueElement"] = 4] = "ValueElement";
-        /** Element resolution failed */
-        JsxFlags[JsxFlags["UnknownElement"] = 16] = "UnknownElement";
         JsxFlags[JsxFlags["IntrinsicElement"] = 3] = "IntrinsicElement";
     })(ts.JsxFlags || (ts.JsxFlags = {}));
     var JsxFlags = ts.JsxFlags;
@@ -594,13 +579,17 @@ var ts;
         NodeCheckFlags[NodeCheckFlags["SuperInstance"] = 256] = "SuperInstance";
         NodeCheckFlags[NodeCheckFlags["SuperStatic"] = 512] = "SuperStatic";
         NodeCheckFlags[NodeCheckFlags["ContextChecked"] = 1024] = "ContextChecked";
-        NodeCheckFlags[NodeCheckFlags["LexicalArguments"] = 2048] = "LexicalArguments";
-        NodeCheckFlags[NodeCheckFlags["CaptureArguments"] = 4096] = "CaptureArguments";
-        // Values for enum members have been computed, and any errors have been reported for them.
-        NodeCheckFlags[NodeCheckFlags["EnumValuesComputed"] = 8192] = "EnumValuesComputed";
-        NodeCheckFlags[NodeCheckFlags["BlockScopedBindingInLoop"] = 16384] = "BlockScopedBindingInLoop";
+        NodeCheckFlags[NodeCheckFlags["AsyncMethodWithSuper"] = 2048] = "AsyncMethodWithSuper";
+        NodeCheckFlags[NodeCheckFlags["AsyncMethodWithSuperBinding"] = 4096] = "AsyncMethodWithSuperBinding";
+        NodeCheckFlags[NodeCheckFlags["CaptureArguments"] = 8192] = "CaptureArguments";
+        NodeCheckFlags[NodeCheckFlags["EnumValuesComputed"] = 16384] = "EnumValuesComputed";
         NodeCheckFlags[NodeCheckFlags["LexicalModuleMergesWithClass"] = 32768] = "LexicalModuleMergesWithClass";
-        NodeCheckFlags[NodeCheckFlags["LoopWithBlockScopedBindingCapturedInFunction"] = 65536] = "LoopWithBlockScopedBindingCapturedInFunction";
+        NodeCheckFlags[NodeCheckFlags["LoopWithCapturedBlockScopedBinding"] = 65536] = "LoopWithCapturedBlockScopedBinding";
+        NodeCheckFlags[NodeCheckFlags["CapturedBlockScopedBinding"] = 131072] = "CapturedBlockScopedBinding";
+        NodeCheckFlags[NodeCheckFlags["BlockScopedBindingInLoop"] = 262144] = "BlockScopedBindingInLoop";
+        NodeCheckFlags[NodeCheckFlags["ClassWithBodyScopedClassBinding"] = 524288] = "ClassWithBodyScopedClassBinding";
+        NodeCheckFlags[NodeCheckFlags["BodyScopedClassBinding"] = 1048576] = "BodyScopedClassBinding";
+        NodeCheckFlags[NodeCheckFlags["NeedsLoopOutParameter"] = 2097152] = "NeedsLoopOutParameter";
     })(ts.NodeCheckFlags || (ts.NodeCheckFlags = {}));
     var NodeCheckFlags = ts.NodeCheckFlags;
     (function (TypeFlags) {
@@ -636,7 +625,8 @@ var ts;
         TypeFlags[TypeFlags["ESSymbol"] = 16777216] = "ESSymbol";
         TypeFlags[TypeFlags["ThisType"] = 33554432] = "ThisType";
         TypeFlags[TypeFlags["ObjectLiteralPatternWithComputedProperties"] = 67108864] = "ObjectLiteralPatternWithComputedProperties";
-        TypeFlags[TypeFlags["PredicateType"] = 134217728] = "PredicateType";
+        /* @internal */
+        TypeFlags[TypeFlags["Nullable"] = 96] = "Nullable";
         /* @internal */
         TypeFlags[TypeFlags["Intrinsic"] = 16777343] = "Intrinsic";
         /* @internal */
@@ -647,7 +637,7 @@ var ts;
         TypeFlags[TypeFlags["UnionOrIntersection"] = 49152] = "UnionOrIntersection";
         TypeFlags[TypeFlags["StructuredType"] = 130048] = "StructuredType";
         /* @internal */
-        TypeFlags[TypeFlags["RequiresWidening"] = 140509184] = "RequiresWidening";
+        TypeFlags[TypeFlags["RequiresWidening"] = 6291456] = "RequiresWidening";
         /* @internal */
         TypeFlags[TypeFlags["PropagatingFlags"] = 14680064] = "PropagatingFlags";
     })(ts.TypeFlags || (ts.TypeFlags = {}));
@@ -707,6 +697,14 @@ var ts;
         NewLineKind[NewLineKind["LineFeed"] = 1] = "LineFeed";
     })(ts.NewLineKind || (ts.NewLineKind = {}));
     var NewLineKind = ts.NewLineKind;
+    (function (ScriptKind) {
+        ScriptKind[ScriptKind["Unknown"] = 0] = "Unknown";
+        ScriptKind[ScriptKind["JS"] = 1] = "JS";
+        ScriptKind[ScriptKind["JSX"] = 2] = "JSX";
+        ScriptKind[ScriptKind["TS"] = 3] = "TS";
+        ScriptKind[ScriptKind["TSX"] = 4] = "TSX";
+    })(ts.ScriptKind || (ts.ScriptKind = {}));
+    var ScriptKind = ts.ScriptKind;
     (function (ScriptTarget) {
         ScriptTarget[ScriptTarget["ES3"] = 0] = "ES3";
         ScriptTarget[ScriptTarget["ES5"] = 1] = "ES5";
@@ -1095,8 +1093,14 @@ var ts;
             var count = array.length;
             if (count > 0) {
                 var pos = 0;
-                var result = arguments.length <= 2 ? array[pos] : initial;
-                pos++;
+                var result = void 0;
+                if (arguments.length <= 2) {
+                    result = array[pos];
+                    pos++;
+                }
+                else {
+                    result = initial;
+                }
                 while (pos < count) {
                     result = f(result, array[pos]);
                     pos++;
@@ -1111,8 +1115,14 @@ var ts;
         if (array) {
             var pos = array.length - 1;
             if (pos >= 0) {
-                var result = arguments.length <= 2 ? array[pos] : initial;
-                pos--;
+                var result = void 0;
+                if (arguments.length <= 2) {
+                    result = array[pos];
+                    pos--;
+                }
+                else {
+                    result = initial;
+                }
                 while (pos >= 0) {
                     result = f(result, array[pos]);
                     pos--;
@@ -1128,6 +1138,14 @@ var ts;
         return hasOwnProperty.call(map, key);
     }
     ts.hasProperty = hasProperty;
+    function getKeys(map) {
+        var keys = [];
+        for (var key in map) {
+            keys.push(key);
+        }
+        return keys;
+    }
+    ts.getKeys = getKeys;
     function getProperty(map, key) {
         return hasOwnProperty.call(map, key) ? map[key] : undefined;
     }
@@ -1278,6 +1296,15 @@ var ts;
         };
     }
     ts.createFileDiagnostic = createFileDiagnostic;
+    /* internal */
+    function formatMessage(dummy, message) {
+        var text = getLocaleSpecificMessage(message);
+        if (arguments.length > 2) {
+            text = formatStringFromArgs(text, arguments, 2);
+        }
+        return text;
+    }
+    ts.formatMessage = formatMessage;
     function createCompilerDiagnostic(message) {
         var text = getLocaleSpecificMessage(message);
         if (arguments.length > 1) {
@@ -1480,7 +1507,7 @@ var ts;
     }
     ts.getNormalizedPathFromPathComponents = getNormalizedPathFromPathComponents;
     function getNormalizedPathComponentsOfUrl(url) {
-        // Get root length of http://www.website.com/folder1/foler2/
+        // Get root length of http://www.website.com/folder1/folder2/
         // In this example the root is:  http://www.website.com/
         // normalized path components should be ["http://www.website.com/", "folder1", "folder2"]
         var urlLength = url.length;
@@ -1505,7 +1532,7 @@ var ts;
         var indexOfNextSlash = url.indexOf(ts.directorySeparator, rootLength);
         if (indexOfNextSlash !== -1) {
             // Found the "/" after the website.com so the root is length of http://www.website.com/
-            // and get components afetr the root normally like any other folder components
+            // and get components after the root normally like any other folder components
             rootLength = indexOfNextSlash + 1;
             return normalizedPathComponents(url, rootLength);
         }
@@ -1585,6 +1612,32 @@ var ts;
         return pathLen > extLen && path.substr(pathLen - extLen, extLen) === extension;
     }
     ts.fileExtensionIs = fileExtensionIs;
+    function ensureScriptKind(fileName, scriptKind) {
+        // Using scriptKind as a condition handles both:
+        // - 'scriptKind' is unspecified and thus it is `undefined`
+        // - 'scriptKind' is set and it is `Unknown` (0)
+        // If the 'scriptKind' is 'undefined' or 'Unknown' then we attempt
+        // to get the ScriptKind from the file name. If it cannot be resolved
+        // from the file name then the default 'TS' script kind is returned.
+        return (scriptKind || getScriptKindFromFileName(fileName)) || 3 /* TS */;
+    }
+    ts.ensureScriptKind = ensureScriptKind;
+    function getScriptKindFromFileName(fileName) {
+        var ext = fileName.substr(fileName.lastIndexOf("."));
+        switch (ext.toLowerCase()) {
+            case ".js":
+                return 1 /* JS */;
+            case ".jsx":
+                return 2 /* JSX */;
+            case ".ts":
+                return 3 /* TS */;
+            case ".tsx":
+                return 4 /* TSX */;
+            default:
+                return 0 /* Unknown */;
+        }
+    }
+    ts.getScriptKindFromFileName = getScriptKindFromFileName;
     /**
      *  List of supported extensions in order of file resolution precedence.
      */
@@ -1836,6 +1889,7 @@ var ts;
             var _fs = require("fs");
             var _path = require("path");
             var _os = require("os");
+            var _crypto = require("crypto");
             // average async stat takes about 30 microseconds
             // set chunk size to do 30 files in < 1 millisecond
             function createPollingWatchedFileSet(interval, chunkSize) {
@@ -1852,13 +1906,13 @@ var ts;
                     if (!watchedFile) {
                         return;
                     }
-                    _fs.stat(watchedFile.filePath, function (err, stats) {
+                    _fs.stat(watchedFile.fileName, function (err, stats) {
                         if (err) {
-                            watchedFile.callback(watchedFile.filePath);
+                            watchedFile.callback(watchedFile.fileName);
                         }
                         else if (watchedFile.mtime.getTime() !== stats.mtime.getTime()) {
-                            watchedFile.mtime = getModifiedTime(watchedFile.filePath);
-                            watchedFile.callback(watchedFile.filePath, watchedFile.mtime.getTime() === 0);
+                            watchedFile.mtime = getModifiedTime(watchedFile.fileName);
+                            watchedFile.callback(watchedFile.fileName, watchedFile.mtime.getTime() === 0);
                         }
                     });
                 }
@@ -1884,11 +1938,11 @@ var ts;
                         nextFileToCheck = nextToCheck;
                     }, interval);
                 }
-                function addFile(filePath, callback) {
+                function addFile(fileName, callback) {
                     var file = {
-                        filePath: filePath,
+                        fileName: fileName,
                         callback: callback,
-                        mtime: getModifiedTime(filePath)
+                        mtime: getModifiedTime(fileName)
                     };
                     watchedFiles.push(file);
                     if (watchedFiles.length === 1) {
@@ -1908,72 +1962,70 @@ var ts;
                 };
             }
             function createWatchedFileSet() {
-                var dirWatchers = ts.createFileMap();
+                var dirWatchers = {};
                 // One file can have multiple watchers
-                var fileWatcherCallbacks = ts.createFileMap();
+                var fileWatcherCallbacks = {};
                 return { addFile: addFile, removeFile: removeFile };
-                function reduceDirWatcherRefCountForFile(filePath) {
-                    var dirPath = ts.getDirectoryPath(filePath);
-                    if (dirWatchers.contains(dirPath)) {
-                        var watcher = dirWatchers.get(dirPath);
+                function reduceDirWatcherRefCountForFile(fileName) {
+                    var dirName = ts.getDirectoryPath(fileName);
+                    if (ts.hasProperty(dirWatchers, dirName)) {
+                        var watcher = dirWatchers[dirName];
                         watcher.referenceCount -= 1;
                         if (watcher.referenceCount <= 0) {
                             watcher.close();
-                            dirWatchers.remove(dirPath);
+                            delete dirWatchers[dirName];
                         }
                     }
                 }
                 function addDirWatcher(dirPath) {
-                    if (dirWatchers.contains(dirPath)) {
-                        var watcher_1 = dirWatchers.get(dirPath);
+                    if (ts.hasProperty(dirWatchers, dirPath)) {
+                        var watcher_1 = dirWatchers[dirPath];
                         watcher_1.referenceCount += 1;
                         return;
                     }
                     var watcher = _fs.watch(dirPath, { persistent: true }, function (eventName, relativeFileName) { return fileEventHandler(eventName, relativeFileName, dirPath); });
                     watcher.referenceCount = 1;
-                    dirWatchers.set(dirPath, watcher);
+                    dirWatchers[dirPath] = watcher;
                     return;
                 }
                 function addFileWatcherCallback(filePath, callback) {
-                    if (fileWatcherCallbacks.contains(filePath)) {
-                        fileWatcherCallbacks.get(filePath).push(callback);
+                    if (ts.hasProperty(fileWatcherCallbacks, filePath)) {
+                        fileWatcherCallbacks[filePath].push(callback);
                     }
                     else {
-                        fileWatcherCallbacks.set(filePath, [callback]);
+                        fileWatcherCallbacks[filePath] = [callback];
                     }
                 }
-                function addFile(filePath, callback) {
-                    addFileWatcherCallback(filePath, callback);
-                    addDirWatcher(ts.getDirectoryPath(filePath));
-                    return { filePath: filePath, callback: callback };
+                function addFile(fileName, callback) {
+                    addFileWatcherCallback(fileName, callback);
+                    addDirWatcher(ts.getDirectoryPath(fileName));
+                    return { fileName: fileName, callback: callback };
                 }
                 function removeFile(watchedFile) {
-                    removeFileWatcherCallback(watchedFile.filePath, watchedFile.callback);
-                    reduceDirWatcherRefCountForFile(watchedFile.filePath);
+                    removeFileWatcherCallback(watchedFile.fileName, watchedFile.callback);
+                    reduceDirWatcherRefCountForFile(watchedFile.fileName);
                 }
                 function removeFileWatcherCallback(filePath, callback) {
-                    if (fileWatcherCallbacks.contains(filePath)) {
-                        var newCallbacks = ts.copyListRemovingItem(callback, fileWatcherCallbacks.get(filePath));
+                    if (ts.hasProperty(fileWatcherCallbacks, filePath)) {
+                        var newCallbacks = ts.copyListRemovingItem(callback, fileWatcherCallbacks[filePath]);
                         if (newCallbacks.length === 0) {
-                            fileWatcherCallbacks.remove(filePath);
+                            delete fileWatcherCallbacks[filePath];
                         }
                         else {
-                            fileWatcherCallbacks.set(filePath, newCallbacks);
+                            fileWatcherCallbacks[filePath] = newCallbacks;
                         }
                     }
                 }
-                /**
-                 * @param watcherPath is the path from which the watcher is triggered.
-                 */
                 function fileEventHandler(eventName, relativeFileName, baseDirPath) {
                     // When files are deleted from disk, the triggered "rename" event would have a relativefileName of "undefined"
-                    var filePath = typeof relativeFileName !== "string"
+                    var fileName = typeof relativeFileName !== "string"
                         ? undefined
-                        : ts.toPath(relativeFileName, baseDirPath, ts.createGetCanonicalFileName(ts.sys.useCaseSensitiveFileNames));
-                    if (eventName === "change" && fileWatcherCallbacks.contains(filePath)) {
-                        for (var _i = 0, _a = fileWatcherCallbacks.get(filePath); _i < _a.length; _i++) {
+                        : ts.getNormalizedAbsolutePath(relativeFileName, baseDirPath);
+                    // Some applications save a working file via rename operations
+                    if ((eventName === "change" || eventName === "rename") && ts.hasProperty(fileWatcherCallbacks, fileName)) {
+                        for (var _i = 0, _a = fileWatcherCallbacks[fileName]; _i < _a.length; _i++) {
                             var fileCallback = _a[_i];
-                            fileCallback(filePath);
+                            fileCallback(fileName);
                         }
                     }
                 }
@@ -2000,7 +2052,7 @@ var ts;
             // win32\win64 are case insensitive platforms, MacOS (darwin) by default is also case insensitive
             var useCaseSensitiveFileNames = platform !== "win32" && platform !== "win64" && platform !== "darwin";
             function readFile(fileName, encoding) {
-                if (!_fs.existsSync(fileName)) {
+                if (!fileExists(fileName)) {
                     return undefined;
                 }
                 var buffer = _fs.readFileSync(fileName);
@@ -2046,6 +2098,29 @@ var ts;
             function getCanonicalPath(path) {
                 return useCaseSensitiveFileNames ? path : path.toLowerCase();
             }
+            var FileSystemEntryKind;
+            (function (FileSystemEntryKind) {
+                FileSystemEntryKind[FileSystemEntryKind["File"] = 0] = "File";
+                FileSystemEntryKind[FileSystemEntryKind["Directory"] = 1] = "Directory";
+            })(FileSystemEntryKind || (FileSystemEntryKind = {}));
+            function fileSystemEntryExists(path, entryKind) {
+                try {
+                    var stat = _fs.statSync(path);
+                    switch (entryKind) {
+                        case 0 /* File */: return stat.isFile();
+                        case 1 /* Directory */: return stat.isDirectory();
+                    }
+                }
+                catch (e) {
+                    return false;
+                }
+            }
+            function fileExists(path) {
+                return fileSystemEntryExists(path, 0 /* File */);
+            }
+            function directoryExists(path) {
+                return fileSystemEntryExists(path, 1 /* Directory */);
+            }
             function readDirectory(path, extension, exclude) {
                 var result = [];
                 exclude = ts.map(exclude, function (s) { return getCanonicalPath(ts.combinePaths(path, s)); });
@@ -2056,6 +2131,11 @@ var ts;
                     var directories = [];
                     for (var _i = 0, files_2 = files; _i < files_2.length; _i++) {
                         var current = files_2[_i];
+                        // This is necessary because on some file system node fails to exclude 
+                        // "." and "..". See https://github.com/nodejs/node/issues/4002
+                        if (current === "." || current === "..") {
+                            continue;
+                        }
                         var name_3 = ts.combinePaths(path, current);
                         if (!ts.contains(exclude, getCanonicalPath(name_3))) {
                             var stat = _fs.statSync(name_3);
@@ -2084,18 +2164,18 @@ var ts;
                 },
                 readFile: readFile,
                 writeFile: writeFile,
-                watchFile: function (filePath, callback) {
-                    // Node 4.0 stablized the `fs.watch` function on Windows which avoids polling
+                watchFile: function (fileName, callback) {
+                    // Node 4.0 stabilized the `fs.watch` function on Windows which avoids polling
                     // and is more efficient than `fs.watchFile` (ref: https://github.com/nodejs/node/pull/2649
                     // and https://github.com/Microsoft/TypeScript/issues/4643), therefore
                     // if the current node.js version is newer than 4, use `fs.watch` instead.
                     var watchSet = isNode4OrLater() ? watchedFileSet : pollingWatchedFileSet;
-                    var watchedFile = watchSet.addFile(filePath, callback);
+                    var watchedFile = watchSet.addFile(fileName, callback);
                     return {
                         close: function () { return watchSet.removeFile(watchedFile); }
                     };
                 },
-                watchDirectory: function (path, callback, recursive) {
+                watchDirectory: function (directoryName, callback, recursive) {
                     // Node 4.0 `fs.watch` function supports the "recursive" option on both OSX and Windows
                     // (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
                     var options;
@@ -2105,13 +2185,13 @@ var ts;
                     else {
                         options = { persistent: true };
                     }
-                    return _fs.watch(path, options, function (eventName, relativeFileName) {
+                    return _fs.watch(directoryName, options, function (eventName, relativeFileName) {
                         // In watchDirectory we only care about adding and removing files (when event name is
                         // "rename"); changes made within files are handled by corresponding fileWatchers (when
                         // event name is "change")
                         if (eventName === "rename") {
                             // When deleting a file, the passed baseFileName is null
-                            callback(!relativeFileName ? relativeFileName : ts.normalizePath(ts.combinePaths(path, relativeFileName)));
+                            callback(!relativeFileName ? relativeFileName : ts.normalizePath(ts.combinePaths(directoryName, relativeFileName)));
                         }
                         ;
                     });
@@ -2119,12 +2199,8 @@ var ts;
                 resolvePath: function (path) {
                     return _path.resolve(path);
                 },
-                fileExists: function (path) {
-                    return _fs.existsSync(path);
-                },
-                directoryExists: function (path) {
-                    return _fs.existsSync(path) && _fs.statSync(path).isDirectory();
-                },
+                fileExists: fileExists,
+                directoryExists: directoryExists,
                 createDirectory: function (directoryName) {
                     if (!this.directoryExists(directoryName)) {
                         _fs.mkdirSync(directoryName);
@@ -2137,6 +2213,19 @@ var ts;
                     return process.cwd();
                 },
                 readDirectory: readDirectory,
+                getModifiedTime: function (path) {
+                    try {
+                        return _fs.statSync(path).mtime;
+                    }
+                    catch (e) {
+                        return undefined;
+                    }
+                },
+                createHash: function (data) {
+                    var hash = _crypto.createHash("md5");
+                    hash.update(data);
+                    return hash.digest("hex");
+                },
                 getMemoryUsage: function () {
                     if (global.gc) {
                         global.gc();
@@ -2214,6 +2303,7 @@ var ts;
         An_index_signature_must_have_a_type_annotation: { code: 1021, category: ts.DiagnosticCategory.Error, key: "An_index_signature_must_have_a_type_annotation_1021", message: "An index signature must have a type annotation." },
         An_index_signature_parameter_must_have_a_type_annotation: { code: 1022, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_must_have_a_type_annotation_1022", message: "An index signature parameter must have a type annotation." },
         An_index_signature_parameter_type_must_be_string_or_number: { code: 1023, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_type_must_be_string_or_number_1023", message: "An index signature parameter type must be 'string' or 'number'." },
+        readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature: { code: 1024, category: ts.DiagnosticCategory.Error, key: "readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature_1024", message: "'readonly' modifier can only appear on a property declaration or index signature." },
         Accessibility_modifier_already_seen: { code: 1028, category: ts.DiagnosticCategory.Error, key: "Accessibility_modifier_already_seen_1028", message: "Accessibility modifier already seen." },
         _0_modifier_must_precede_1_modifier: { code: 1029, category: ts.DiagnosticCategory.Error, key: "_0_modifier_must_precede_1_modifier_1029", message: "'{0}' modifier must precede '{1}' modifier." },
         _0_modifier_already_seen: { code: 1030, category: ts.DiagnosticCategory.Error, key: "_0_modifier_already_seen_1030", message: "'{0}' modifier already seen." },
@@ -2227,7 +2317,7 @@ var ts;
         _0_modifier_cannot_be_used_with_a_class_declaration: { code: 1041, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_with_a_class_declaration_1041", message: "'{0}' modifier cannot be used with a class declaration." },
         _0_modifier_cannot_be_used_here: { code: 1042, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_here_1042", message: "'{0}' modifier cannot be used here." },
         _0_modifier_cannot_appear_on_a_data_property: { code: 1043, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_data_property_1043", message: "'{0}' modifier cannot appear on a data property." },
-        _0_modifier_cannot_appear_on_a_module_element: { code: 1044, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_module_element_1044", message: "'{0}' modifier cannot appear on a module element." },
+        _0_modifier_cannot_appear_on_a_module_or_namespace_element: { code: 1044, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_module_or_namespace_element_1044", message: "'{0}' modifier cannot appear on a module or namespace element." },
         A_0_modifier_cannot_be_used_with_an_interface_declaration: { code: 1045, category: ts.DiagnosticCategory.Error, key: "A_0_modifier_cannot_be_used_with_an_interface_declaration_1045", message: "A '{0}' modifier cannot be used with an interface declaration." },
         A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: { code: 1046, category: ts.DiagnosticCategory.Error, key: "A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file_1046", message: "A 'declare' modifier is required for a top level declaration in a .d.ts file." },
         A_rest_parameter_cannot_be_optional: { code: 1047, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_cannot_be_optional_1047", message: "A rest parameter cannot be optional." },
@@ -2246,8 +2336,11 @@ var ts;
         Enum_member_must_have_initializer: { code: 1061, category: ts.DiagnosticCategory.Error, key: "Enum_member_must_have_initializer_1061", message: "Enum member must have initializer." },
         _0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method: { code: 1062, category: ts.DiagnosticCategory.Error, key: "_0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method_1062", message: "{0} is referenced directly or indirectly in the fulfillment callback of its own 'then' method." },
         An_export_assignment_cannot_be_used_in_a_namespace: { code: 1063, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_cannot_be_used_in_a_namespace_1063", message: "An export assignment cannot be used in a namespace." },
+        The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type: { code: 1064, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_1064", message: "The return type of an async function or method must be the global Promise<T> type." },
         In_ambient_enum_declarations_member_initializer_must_be_constant_expression: { code: 1066, category: ts.DiagnosticCategory.Error, key: "In_ambient_enum_declarations_member_initializer_must_be_constant_expression_1066", message: "In ambient enum declarations member initializer must be constant expression." },
         Unexpected_token_A_constructor_method_accessor_or_property_was_expected: { code: 1068, category: ts.DiagnosticCategory.Error, key: "Unexpected_token_A_constructor_method_accessor_or_property_was_expected_1068", message: "Unexpected token. A constructor, method, accessor, or property was expected." },
+        _0_modifier_cannot_appear_on_a_type_member: { code: 1070, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_type_member_1070", message: "'{0}' modifier cannot appear on a type member." },
+        _0_modifier_cannot_appear_on_an_index_signature: { code: 1071, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_an_index_signature_1071", message: "'{0}' modifier cannot appear on an index signature." },
         A_0_modifier_cannot_be_used_with_an_import_declaration: { code: 1079, category: ts.DiagnosticCategory.Error, key: "A_0_modifier_cannot_be_used_with_an_import_declaration_1079", message: "A '{0}' modifier cannot be used with an import declaration." },
         Invalid_reference_directive_syntax: { code: 1084, category: ts.DiagnosticCategory.Error, key: "Invalid_reference_directive_syntax_1084", message: "Invalid 'reference' directive syntax." },
         Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher: { code: 1085, category: ts.DiagnosticCategory.Error, key: "Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher_1085", message: "Octal literals are not available when targeting ECMAScript 5 and higher." },
@@ -2303,10 +2396,9 @@ var ts;
         String_literal_expected: { code: 1141, category: ts.DiagnosticCategory.Error, key: "String_literal_expected_1141", message: "String literal expected." },
         Line_break_not_permitted_here: { code: 1142, category: ts.DiagnosticCategory.Error, key: "Line_break_not_permitted_here_1142", message: "Line break not permitted here." },
         or_expected: { code: 1144, category: ts.DiagnosticCategory.Error, key: "or_expected_1144", message: "'{' or ';' expected." },
-        Modifiers_not_permitted_on_index_signature_members: { code: 1145, category: ts.DiagnosticCategory.Error, key: "Modifiers_not_permitted_on_index_signature_members_1145", message: "Modifiers not permitted on index signature members." },
         Declaration_expected: { code: 1146, category: ts.DiagnosticCategory.Error, key: "Declaration_expected_1146", message: "Declaration expected." },
         Import_declarations_in_a_namespace_cannot_reference_a_module: { code: 1147, category: ts.DiagnosticCategory.Error, key: "Import_declarations_in_a_namespace_cannot_reference_a_module_1147", message: "Import declarations in a namespace cannot reference a module." },
-        Cannot_compile_modules_unless_the_module_flag_is_provided_Consider_setting_the_module_compiler_option_in_a_tsconfig_json_file: { code: 1148, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_modules_unless_the_module_flag_is_provided_Consider_setting_the_module_compiler_optio_1148", message: "Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file." },
+        Cannot_compile_modules_unless_the_module_flag_is_provided_with_a_valid_module_type_Consider_setting_the_module_compiler_option_in_a_tsconfig_json_file: { code: 1148, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_modules_unless_the_module_flag_is_provided_with_a_valid_module_type_Consider_setting__1148", message: "Cannot compile modules unless the '--module' flag is provided with a valid module type. Consider setting the 'module' compiler option in a 'tsconfig.json' file." },
         File_name_0_differs_from_already_included_file_name_1_only_in_casing: { code: 1149, category: ts.DiagnosticCategory.Error, key: "File_name_0_differs_from_already_included_file_name_1_only_in_casing_1149", message: "File name '{0}' differs from already included file name '{1}' only in casing" },
         new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead: { code: 1150, category: ts.DiagnosticCategory.Error, key: "new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead_1150", message: "'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead." },
         const_declarations_must_be_initialized: { code: 1155, category: ts.DiagnosticCategory.Error, key: "const_declarations_must_be_initialized_1155", message: "'const' declarations must be initialized" },
@@ -2366,7 +2458,7 @@ var ts;
         Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode: { code: 1214, category: ts.DiagnosticCategory.Error, key: "Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode_1214", message: "Identifier expected. '{0}' is a reserved word in strict mode. Modules are automatically in strict mode." },
         Invalid_use_of_0_Modules_are_automatically_in_strict_mode: { code: 1215, category: ts.DiagnosticCategory.Error, key: "Invalid_use_of_0_Modules_are_automatically_in_strict_mode_1215", message: "Invalid use of '{0}'. Modules are automatically in strict mode." },
         Export_assignment_is_not_supported_when_module_flag_is_system: { code: 1218, category: ts.DiagnosticCategory.Error, key: "Export_assignment_is_not_supported_when_module_flag_is_system_1218", message: "Export assignment is not supported when '--module' flag is 'system'." },
-        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Specify_experimentalDecorators_to_remove_this_warning: { code: 1219, category: ts.DiagnosticCategory.Error, key: "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Speci_1219", message: "Experimental support for decorators is a feature that is subject to change in a future release. Specify '--experimentalDecorators' to remove this warning." },
+        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning: { code: 1219, category: ts.DiagnosticCategory.Error, key: "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_t_1219", message: "Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning." },
         Generators_are_only_available_when_targeting_ECMAScript_6_or_higher: { code: 1220, category: ts.DiagnosticCategory.Error, key: "Generators_are_only_available_when_targeting_ECMAScript_6_or_higher_1220", message: "Generators are only available when targeting ECMAScript 6 or higher." },
         Generators_are_not_allowed_in_an_ambient_context: { code: 1221, category: ts.DiagnosticCategory.Error, key: "Generators_are_not_allowed_in_an_ambient_context_1221", message: "Generators are not allowed in an ambient context." },
         An_overload_signature_cannot_be_declared_as_a_generator: { code: 1222, category: ts.DiagnosticCategory.Error, key: "An_overload_signature_cannot_be_declared_as_a_generator_1222", message: "An overload signature cannot be declared as a generator." },
@@ -2375,6 +2467,7 @@ var ts;
         Cannot_find_parameter_0: { code: 1225, category: ts.DiagnosticCategory.Error, key: "Cannot_find_parameter_0_1225", message: "Cannot find parameter '{0}'." },
         Type_predicate_0_is_not_assignable_to_1: { code: 1226, category: ts.DiagnosticCategory.Error, key: "Type_predicate_0_is_not_assignable_to_1_1226", message: "Type predicate '{0}' is not assignable to '{1}'." },
         Parameter_0_is_not_in_the_same_position_as_parameter_1: { code: 1227, category: ts.DiagnosticCategory.Error, key: "Parameter_0_is_not_in_the_same_position_as_parameter_1_1227", message: "Parameter '{0}' is not in the same position as parameter '{1}'." },
+        A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods: { code: 1228, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods_1228", message: "A type predicate is only allowed in return type position for functions and methods." },
         A_type_predicate_cannot_reference_a_rest_parameter: { code: 1229, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_cannot_reference_a_rest_parameter_1229", message: "A type predicate cannot reference a rest parameter." },
         A_type_predicate_cannot_reference_element_0_in_a_binding_pattern: { code: 1230, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_cannot_reference_element_0_in_a_binding_pattern_1230", message: "A type predicate cannot reference element '{0}' in a binding pattern." },
         An_export_assignment_can_only_be_used_in_a_module: { code: 1231, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_can_only_be_used_in_a_module_1231", message: "An export assignment can only be used in a module." },
@@ -2388,7 +2481,7 @@ var ts;
         Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression: { code: 1239, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression_1239", message: "Unable to resolve signature of parameter decorator when called as an expression." },
         Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression: { code: 1240, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression_1240", message: "Unable to resolve signature of property decorator when called as an expression." },
         Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression: { code: 1241, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression_1241", message: "Unable to resolve signature of method decorator when called as an expression." },
-        abstract_modifier_can_only_appear_on_a_class_or_method_declaration: { code: 1242, category: ts.DiagnosticCategory.Error, key: "abstract_modifier_can_only_appear_on_a_class_or_method_declaration_1242", message: "'abstract' modifier can only appear on a class or method declaration." },
+        abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration: { code: 1242, category: ts.DiagnosticCategory.Error, key: "abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration_1242", message: "'abstract' modifier can only appear on a class, method, or property declaration." },
         _0_modifier_cannot_be_used_with_1_modifier: { code: 1243, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_with_1_modifier_1243", message: "'{0}' modifier cannot be used with '{1}' modifier." },
         Abstract_methods_can_only_appear_within_an_abstract_class: { code: 1244, category: ts.DiagnosticCategory.Error, key: "Abstract_methods_can_only_appear_within_an_abstract_class_1244", message: "Abstract methods can only appear within an abstract class." },
         Method_0_cannot_have_an_implementation_because_it_is_marked_abstract: { code: 1245, category: ts.DiagnosticCategory.Error, key: "Method_0_cannot_have_an_implementation_because_it_is_marked_abstract_1245", message: "Method '{0}' cannot have an implementation because it is marked abstract." },
@@ -2401,6 +2494,9 @@ var ts;
         Async_functions_are_only_available_when_targeting_ECMAScript_6_and_higher: { code: 1311, category: ts.DiagnosticCategory.Error, key: "Async_functions_are_only_available_when_targeting_ECMAScript_6_and_higher_1311", message: "Async functions are only available when targeting ECMAScript 6 and higher." },
         can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment: { code: 1312, category: ts.DiagnosticCategory.Error, key: "can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment_1312", message: "'=' can only be used in an object literal property inside a destructuring assignment." },
         The_body_of_an_if_statement_cannot_be_the_empty_statement: { code: 1313, category: ts.DiagnosticCategory.Error, key: "The_body_of_an_if_statement_cannot_be_the_empty_statement_1313", message: "The body of an 'if' statement cannot be the empty statement." },
+        Global_module_exports_may_only_appear_in_module_files: { code: 1314, category: ts.DiagnosticCategory.Error, key: "Global_module_exports_may_only_appear_in_module_files_1314", message: "Global module exports may only appear in module files." },
+        Global_module_exports_may_only_appear_in_declaration_files: { code: 1315, category: ts.DiagnosticCategory.Error, key: "Global_module_exports_may_only_appear_in_declaration_files_1315", message: "Global module exports may only appear in declaration files." },
+        Global_module_exports_may_only_appear_at_top_level: { code: 1316, category: ts.DiagnosticCategory.Error, key: "Global_module_exports_may_only_appear_at_top_level_1316", message: "Global module exports may only appear at top level." },
         Duplicate_identifier_0: { code: 2300, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_0_2300", message: "Duplicate identifier '{0}'." },
         Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: ts.DiagnosticCategory.Error, key: "Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2301", message: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." },
         Static_members_cannot_reference_class_type_parameters: { code: 2302, category: ts.DiagnosticCategory.Error, key: "Static_members_cannot_reference_class_type_parameters_2302", message: "Static members cannot reference class type parameters." },
@@ -2452,7 +2548,7 @@ var ts;
         Cannot_invoke_an_expression_whose_type_lacks_a_call_signature: { code: 2349, category: ts.DiagnosticCategory.Error, key: "Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_2349", message: "Cannot invoke an expression whose type lacks a call signature." },
         Only_a_void_function_can_be_called_with_the_new_keyword: { code: 2350, category: ts.DiagnosticCategory.Error, key: "Only_a_void_function_can_be_called_with_the_new_keyword_2350", message: "Only a void function can be called with the 'new' keyword." },
         Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: { code: 2351, category: ts.DiagnosticCategory.Error, key: "Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature_2351", message: "Cannot use 'new' with an expression whose type lacks a call or construct signature." },
-        Neither_type_0_nor_type_1_is_assignable_to_the_other: { code: 2352, category: ts.DiagnosticCategory.Error, key: "Neither_type_0_nor_type_1_is_assignable_to_the_other_2352", message: "Neither type '{0}' nor type '{1}' is assignable to the other." },
+        Type_0_cannot_be_converted_to_type_1: { code: 2352, category: ts.DiagnosticCategory.Error, key: "Type_0_cannot_be_converted_to_type_1_2352", message: "Type '{0}' cannot be converted to type '{1}'." },
         Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: { code: 2353, category: ts.DiagnosticCategory.Error, key: "Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1_2353", message: "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'." },
         No_best_common_type_exists_among_return_expressions: { code: 2354, category: ts.DiagnosticCategory.Error, key: "No_best_common_type_exists_among_return_expressions_2354", message: "No best common type exists among return expressions." },
         A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value: { code: 2355, category: ts.DiagnosticCategory.Error, key: "A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_2355", message: "A function whose declared type is neither 'void' nor 'any' must return a value." },
@@ -2466,6 +2562,7 @@ var ts;
         The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2363, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2363", message: "The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
         Invalid_left_hand_side_of_assignment_expression: { code: 2364, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_of_assignment_expression_2364", message: "Invalid left-hand side of assignment expression." },
         Operator_0_cannot_be_applied_to_types_1_and_2: { code: 2365, category: ts.DiagnosticCategory.Error, key: "Operator_0_cannot_be_applied_to_types_1_and_2_2365", message: "Operator '{0}' cannot be applied to types '{1}' and '{2}'." },
+        Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined: { code: 2366, category: ts.DiagnosticCategory.Error, key: "Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined_2366", message: "Function lacks ending return statement and return type does not include 'undefined'." },
         Type_parameter_name_cannot_be_0: { code: 2368, category: ts.DiagnosticCategory.Error, key: "Type_parameter_name_cannot_be_0_2368", message: "Type parameter name cannot be '{0}'" },
         A_parameter_property_is_only_allowed_in_a_constructor_implementation: { code: 2369, category: ts.DiagnosticCategory.Error, key: "A_parameter_property_is_only_allowed_in_a_constructor_implementation_2369", message: "A parameter property is only allowed in a constructor implementation." },
         A_rest_parameter_must_be_of_an_array_type: { code: 2370, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_must_be_of_an_array_type_2370", message: "A rest parameter must be of an array type." },
@@ -2481,7 +2578,7 @@ var ts;
         get_and_set_accessor_must_have_the_same_type: { code: 2380, category: ts.DiagnosticCategory.Error, key: "get_and_set_accessor_must_have_the_same_type_2380", message: "'get' and 'set' accessor must have the same type." },
         A_signature_with_an_implementation_cannot_use_a_string_literal_type: { code: 2381, category: ts.DiagnosticCategory.Error, key: "A_signature_with_an_implementation_cannot_use_a_string_literal_type_2381", message: "A signature with an implementation cannot use a string literal type." },
         Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature: { code: 2382, category: ts.DiagnosticCategory.Error, key: "Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature_2382", message: "Specialized overload signature is not assignable to any non-specialized signature." },
-        Overload_signatures_must_all_be_exported_or_not_exported: { code: 2383, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_exported_or_not_exported_2383", message: "Overload signatures must all be exported or not exported." },
+        Overload_signatures_must_all_be_exported_or_non_exported: { code: 2383, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_exported_or_non_exported_2383", message: "Overload signatures must all be exported or non-exported." },
         Overload_signatures_must_all_be_ambient_or_non_ambient: { code: 2384, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_ambient_or_non_ambient_2384", message: "Overload signatures must all be ambient or non-ambient." },
         Overload_signatures_must_all_be_public_private_or_protected: { code: 2385, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_public_private_or_protected_2385", message: "Overload signatures must all be public, private or protected." },
         Overload_signatures_must_all_be_optional_or_required: { code: 2386, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_optional_or_required_2386", message: "Overload signatures must all be optional or required." },
@@ -2514,7 +2611,6 @@ var ts;
         Class_name_cannot_be_0: { code: 2414, category: ts.DiagnosticCategory.Error, key: "Class_name_cannot_be_0_2414", message: "Class name cannot be '{0}'" },
         Class_0_incorrectly_extends_base_class_1: { code: 2415, category: ts.DiagnosticCategory.Error, key: "Class_0_incorrectly_extends_base_class_1_2415", message: "Class '{0}' incorrectly extends base class '{1}'." },
         Class_static_side_0_incorrectly_extends_base_class_static_side_1: { code: 2417, category: ts.DiagnosticCategory.Error, key: "Class_static_side_0_incorrectly_extends_base_class_static_side_1_2417", message: "Class static side '{0}' incorrectly extends base class static side '{1}'." },
-        Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0: { code: 2419, category: ts.DiagnosticCategory.Error, key: "Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0_2419", message: "Type name '{0}' in extends clause does not reference constructor function for '{0}'." },
         Class_0_incorrectly_implements_interface_1: { code: 2420, category: ts.DiagnosticCategory.Error, key: "Class_0_incorrectly_implements_interface_1_2420", message: "Class '{0}' incorrectly implements interface '{1}'." },
         A_class_may_only_implement_another_class_or_interface: { code: 2422, category: ts.DiagnosticCategory.Error, key: "A_class_may_only_implement_another_class_or_interface_2422", message: "A class may only implement another class or interface." },
         Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor: { code: 2423, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_access_2423", message: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member accessor." },
@@ -2522,7 +2618,7 @@ var ts;
         Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2425, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_functi_2425", message: "Class '{0}' defines instance member property '{1}', but extended class '{2}' defines it as instance member function." },
         Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2426, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_functi_2426", message: "Class '{0}' defines instance member accessor '{1}', but extended class '{2}' defines it as instance member function." },
         Interface_name_cannot_be_0: { code: 2427, category: ts.DiagnosticCategory.Error, key: "Interface_name_cannot_be_0_2427", message: "Interface name cannot be '{0}'" },
-        All_declarations_of_an_interface_must_have_identical_type_parameters: { code: 2428, category: ts.DiagnosticCategory.Error, key: "All_declarations_of_an_interface_must_have_identical_type_parameters_2428", message: "All declarations of an interface must have identical type parameters." },
+        All_declarations_of_0_must_have_identical_type_parameters: { code: 2428, category: ts.DiagnosticCategory.Error, key: "All_declarations_of_0_must_have_identical_type_parameters_2428", message: "All declarations of '{0}' must have identical type parameters." },
         Interface_0_incorrectly_extends_interface_1: { code: 2430, category: ts.DiagnosticCategory.Error, key: "Interface_0_incorrectly_extends_interface_1_2430", message: "Interface '{0}' incorrectly extends interface '{1}'." },
         Enum_name_cannot_be_0: { code: 2431, category: ts.DiagnosticCategory.Error, key: "Enum_name_cannot_be_0_2431", message: "Enum name cannot be '{0}'" },
         In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element: { code: 2432, category: ts.DiagnosticCategory.Error, key: "In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enu_2432", message: "In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element." },
@@ -2542,11 +2638,12 @@ var ts;
         Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: { code: 2446, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1_2446", message: "Property '{0}' is protected and only accessible through an instance of class '{1}'." },
         The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: { code: 2447, category: ts.DiagnosticCategory.Error, key: "The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead_2447", message: "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead." },
         Block_scoped_variable_0_used_before_its_declaration: { code: 2448, category: ts.DiagnosticCategory.Error, key: "Block_scoped_variable_0_used_before_its_declaration_2448", message: "Block-scoped variable '{0}' used before its declaration." },
-        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant: { code: 2449, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_2449", message: "The operand of an increment or decrement operator cannot be a constant." },
-        Left_hand_side_of_assignment_expression_cannot_be_a_constant: { code: 2450, category: ts.DiagnosticCategory.Error, key: "Left_hand_side_of_assignment_expression_cannot_be_a_constant_2450", message: "Left-hand side of assignment expression cannot be a constant." },
+        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property: { code: 2449, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property_2449", message: "The operand of an increment or decrement operator cannot be a constant or a read-only property." },
+        Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property: { code: 2450, category: ts.DiagnosticCategory.Error, key: "Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property_2450", message: "Left-hand side of assignment expression cannot be a constant or a read-only property." },
         Cannot_redeclare_block_scoped_variable_0: { code: 2451, category: ts.DiagnosticCategory.Error, key: "Cannot_redeclare_block_scoped_variable_0_2451", message: "Cannot redeclare block-scoped variable '{0}'." },
         An_enum_member_cannot_have_a_numeric_name: { code: 2452, category: ts.DiagnosticCategory.Error, key: "An_enum_member_cannot_have_a_numeric_name_2452", message: "An enum member cannot have a numeric name." },
         The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: { code: 2453, category: ts.DiagnosticCategory.Error, key: "The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_typ_2453", message: "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly." },
+        Variable_0_is_used_before_being_assigned: { code: 2454, category: ts.DiagnosticCategory.Error, key: "Variable_0_is_used_before_being_assigned_2454", message: "Variable '{0}' is used before being assigned." },
         Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0: { code: 2455, category: ts.DiagnosticCategory.Error, key: "Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0_2455", message: "Type argument candidate '{1}' is not a valid type argument because it is not a supertype of candidate '{0}'." },
         Type_alias_0_circularly_references_itself: { code: 2456, category: ts.DiagnosticCategory.Error, key: "Type_alias_0_circularly_references_itself_2456", message: "Type alias '{0}' circularly references itself." },
         Type_alias_name_cannot_be_0: { code: 2457, category: ts.DiagnosticCategory.Error, key: "Type_alias_name_cannot_be_0_2457", message: "Type alias name cannot be '{0}'" },
@@ -2576,8 +2673,8 @@ var ts;
         Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: { code: 2481, category: ts.DiagnosticCategory.Error, key: "Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1_2481", message: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'." },
         The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation_2483", message: "The left-hand side of a 'for...of' statement cannot use a type annotation." },
         Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: ts.DiagnosticCategory.Error, key: "Export_declaration_conflicts_with_exported_declaration_of_0_2484", message: "Export declaration conflicts with exported declaration of '{0}'" },
-        The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant: { code: 2485, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant_2485", message: "The left-hand side of a 'for...of' statement cannot be a previously defined constant." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant: { code: 2486, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant_2486", message: "The left-hand side of a 'for...in' statement cannot be a previously defined constant." },
+        The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property: { code: 2485, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property_2485", message: "The left-hand side of a 'for...of' statement cannot be a constant or a read-only property." },
+        The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property: { code: 2486, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property_2486", message: "The left-hand side of a 'for...in' statement cannot be a constant or a read-only property." },
         Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_of_statement_2487", message: "Invalid left-hand side in 'for...of' statement." },
         Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: ts.DiagnosticCategory.Error, key: "Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator_2488", message: "Type must have a '[Symbol.iterator]()' method that returns an iterator." },
         An_iterator_must_have_a_next_method: { code: 2489, category: ts.DiagnosticCategory.Error, key: "An_iterator_must_have_a_next_method_2489", message: "An iterator must have a 'next()' method." },
@@ -2603,7 +2700,7 @@ var ts;
         Base_constructor_return_type_0_is_not_a_class_or_interface_type: { code: 2509, category: ts.DiagnosticCategory.Error, key: "Base_constructor_return_type_0_is_not_a_class_or_interface_type_2509", message: "Base constructor return type '{0}' is not a class or interface type." },
         Base_constructors_must_all_have_the_same_return_type: { code: 2510, category: ts.DiagnosticCategory.Error, key: "Base_constructors_must_all_have_the_same_return_type_2510", message: "Base constructors must all have the same return type." },
         Cannot_create_an_instance_of_the_abstract_class_0: { code: 2511, category: ts.DiagnosticCategory.Error, key: "Cannot_create_an_instance_of_the_abstract_class_0_2511", message: "Cannot create an instance of the abstract class '{0}'." },
-        Overload_signatures_must_all_be_abstract_or_not_abstract: { code: 2512, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_abstract_or_not_abstract_2512", message: "Overload signatures must all be abstract or not abstract." },
+        Overload_signatures_must_all_be_abstract_or_non_abstract: { code: 2512, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_abstract_or_non_abstract_2512", message: "Overload signatures must all be abstract or non-abstract." },
         Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression: { code: 2513, category: ts.DiagnosticCategory.Error, key: "Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression_2513", message: "Abstract method '{0}' in class '{1}' cannot be accessed via super expression." },
         Classes_containing_abstract_methods_must_be_marked_abstract: { code: 2514, category: ts.DiagnosticCategory.Error, key: "Classes_containing_abstract_methods_must_be_marked_abstract_2514", message: "Classes containing abstract methods must be marked abstract." },
         Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2: { code: 2515, category: ts.DiagnosticCategory.Error, key: "Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2_2515", message: "Non-abstract class '{0}' does not implement inherited abstract member '{1}' from class '{2}'." },
@@ -2619,6 +2716,9 @@ var ts;
         A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface: { code: 2526, category: ts.DiagnosticCategory.Error, key: "A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface_2526", message: "A 'this' type is available only in a non-static member of a class or interface." },
         The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary: { code: 2527, category: ts.DiagnosticCategory.Error, key: "The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary_2527", message: "The inferred type of '{0}' references an inaccessible 'this' type. A type annotation is necessary." },
         A_module_cannot_have_multiple_default_exports: { code: 2528, category: ts.DiagnosticCategory.Error, key: "A_module_cannot_have_multiple_default_exports_2528", message: "A module cannot have multiple default exports." },
+        Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_functions: { code: 2529, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_func_2529", message: "Duplicate identifier '{0}'. Compiler reserves name '{1}' in top level scope of a module containing async functions." },
+        Property_0_is_incompatible_with_index_signature: { code: 2530, category: ts.DiagnosticCategory.Error, key: "Property_0_is_incompatible_with_index_signature_2530", message: "Property '{0}' is incompatible with index signature." },
+        Object_is_possibly_null_or_undefined: { code: 2531, category: ts.DiagnosticCategory.Error, key: "Object_is_possibly_null_or_undefined_2531", message: "Object is possibly 'null' or 'undefined'." },
         JSX_element_attributes_type_0_may_not_be_a_union_type: { code: 2600, category: ts.DiagnosticCategory.Error, key: "JSX_element_attributes_type_0_may_not_be_a_union_type_2600", message: "JSX element attributes type '{0}' may not be a union type." },
         The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: { code: 2601, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_a_JSX_element_constructor_must_return_an_object_type_2601", message: "The return type of a JSX element constructor must return an object type." },
         JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist: { code: 2602, category: ts.DiagnosticCategory.Error, key: "JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist_2602", message: "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist." },
@@ -2648,6 +2748,21 @@ var ts;
         export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always_visible: { code: 2668, category: ts.DiagnosticCategory.Error, key: "export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always__2668", message: "'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible." },
         Augmentations_for_the_global_scope_can_only_be_directly_nested_in_external_modules_or_ambient_module_declarations: { code: 2669, category: ts.DiagnosticCategory.Error, key: "Augmentations_for_the_global_scope_can_only_be_directly_nested_in_external_modules_or_ambient_module_2669", message: "Augmentations for the global scope can only be directly nested in external modules or ambient module declarations." },
         Augmentations_for_the_global_scope_should_have_declare_modifier_unless_they_appear_in_already_ambient_context: { code: 2670, category: ts.DiagnosticCategory.Error, key: "Augmentations_for_the_global_scope_should_have_declare_modifier_unless_they_appear_in_already_ambien_2670", message: "Augmentations for the global scope should have 'declare' modifier unless they appear in already ambient context." },
+        Cannot_augment_module_0_because_it_resolves_to_a_non_module_entity: { code: 2671, category: ts.DiagnosticCategory.Error, key: "Cannot_augment_module_0_because_it_resolves_to_a_non_module_entity_2671", message: "Cannot augment module '{0}' because it resolves to a non-module entity." },
+        Cannot_assign_a_0_constructor_type_to_a_1_constructor_type: { code: 2672, category: ts.DiagnosticCategory.Error, key: "Cannot_assign_a_0_constructor_type_to_a_1_constructor_type_2672", message: "Cannot assign a '{0}' constructor type to a '{1}' constructor type." },
+        Constructor_of_class_0_is_private_and_only_accessible_within_the_class_declaration: { code: 2673, category: ts.DiagnosticCategory.Error, key: "Constructor_of_class_0_is_private_and_only_accessible_within_the_class_declaration_2673", message: "Constructor of class '{0}' is private and only accessible within the class declaration." },
+        Constructor_of_class_0_is_protected_and_only_accessible_within_the_class_declaration: { code: 2674, category: ts.DiagnosticCategory.Error, key: "Constructor_of_class_0_is_protected_and_only_accessible_within_the_class_declaration_2674", message: "Constructor of class '{0}' is protected and only accessible within the class declaration." },
+        Cannot_extend_a_class_0_Class_constructor_is_marked_as_private: { code: 2675, category: ts.DiagnosticCategory.Error, key: "Cannot_extend_a_class_0_Class_constructor_is_marked_as_private_2675", message: "Cannot extend a class '{0}'. Class constructor is marked as private." },
+        Accessors_must_both_be_abstract_or_non_abstract: { code: 2676, category: ts.DiagnosticCategory.Error, key: "Accessors_must_both_be_abstract_or_non_abstract_2676", message: "Accessors must both be abstract or non-abstract." },
+        A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type: { code: 2677, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type_2677", message: "A type predicate's type must be assignable to its parameter's type." },
+        Type_0_is_not_comparable_to_type_1: { code: 2678, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_comparable_to_type_1_2678", message: "Type '{0}' is not comparable to type '{1}'." },
+        A_function_that_is_called_with_the_new_keyword_cannot_have_a_this_type_that_is_void: { code: 2679, category: ts.DiagnosticCategory.Error, key: "A_function_that_is_called_with_the_new_keyword_cannot_have_a_this_type_that_is_void_2679", message: "A function that is called with the 'new' keyword cannot have a 'this' type that is 'void'." },
+        A_this_parameter_must_be_the_first_parameter: { code: 2680, category: ts.DiagnosticCategory.Error, key: "A_this_parameter_must_be_the_first_parameter_2680", message: "A 'this' parameter must be the first parameter." },
+        A_constructor_cannot_have_a_this_parameter: { code: 2681, category: ts.DiagnosticCategory.Error, key: "A_constructor_cannot_have_a_this_parameter_2681", message: "A constructor cannot have a 'this' parameter." },
+        A_setter_cannot_have_a_this_parameter: { code: 2682, category: ts.DiagnosticCategory.Error, key: "A_setter_cannot_have_a_this_parameter_2682", message: "A setter cannot have a 'this' parameter." },
+        this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation: { code: 2683, category: ts.DiagnosticCategory.Error, key: "this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_2683", message: "'this' implicitly has type 'any' because it does not have a type annotation." },
+        The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1: { code: 2684, category: ts.DiagnosticCategory.Error, key: "The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1_2684", message: "The 'this' context of type '{0}' is not assignable to method's 'this' of type '{1}'." },
+        The_this_types_of_each_signature_are_incompatible: { code: 2685, category: ts.DiagnosticCategory.Error, key: "The_this_types_of_each_signature_are_incompatible_2685", message: "The 'this' types of each signature are incompatible." },
         Import_declaration_0_is_using_private_name_1: { code: 4000, category: ts.DiagnosticCategory.Error, key: "Import_declaration_0_is_using_private_name_1_4000", message: "Import declaration '{0}' is using private name '{1}'." },
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", message: "Type parameter '{0}' of exported class has or is using private name '{1}'." },
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", message: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
@@ -2718,6 +2833,7 @@ var ts;
         Parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4078, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_exported_function_has_or_is_using_private_name_1_4078", message: "Parameter '{0}' of exported function has or is using private name '{1}'." },
         Exported_type_alias_0_has_or_is_using_private_name_1: { code: 4081, category: ts.DiagnosticCategory.Error, key: "Exported_type_alias_0_has_or_is_using_private_name_1_4081", message: "Exported type alias '{0}' has or is using private name '{1}'." },
         Default_export_of_the_module_has_or_is_using_private_name_0: { code: 4082, category: ts.DiagnosticCategory.Error, key: "Default_export_of_the_module_has_or_is_using_private_name_0_4082", message: "Default export of the module has or is using private name '{0}'." },
+        Conflicting_library_definitions_for_0_found_at_1_and_2_Copy_the_correct_file_to_the_typings_folder_to_resolve_this_conflict: { code: 4090, category: ts.DiagnosticCategory.Message, key: "Conflicting_library_definitions_for_0_found_at_1_and_2_Copy_the_correct_file_to_the_typings_folder_t_4090", message: "Conflicting library definitions for '{0}' found at '{1}' and '{2}'. Copy the correct file to the 'typings' folder to resolve this conflict." },
         The_current_host_does_not_support_the_0_option: { code: 5001, category: ts.DiagnosticCategory.Error, key: "The_current_host_does_not_support_the_0_option_5001", message: "The current host does not support the '{0}' option." },
         Cannot_find_the_common_subdirectory_path_for_the_input_files: { code: 5009, category: ts.DiagnosticCategory.Error, key: "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", message: "Cannot find the common subdirectory path for the input files." },
         Cannot_read_file_0_Colon_1: { code: 5012, category: ts.DiagnosticCategory.Error, key: "Cannot_read_file_0_Colon_1_5012", message: "Cannot read file '{0}': {1}" },
@@ -2736,11 +2852,14 @@ var ts;
         Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files: { code: 5056, category: ts.DiagnosticCategory.Error, key: "Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files_5056", message: "Cannot write file '{0}' because it would be overwritten by multiple input files." },
         Cannot_find_a_tsconfig_json_file_at_the_specified_directory_Colon_0: { code: 5057, category: ts.DiagnosticCategory.Error, key: "Cannot_find_a_tsconfig_json_file_at_the_specified_directory_Colon_0_5057", message: "Cannot find a tsconfig.json file at the specified directory: '{0}'" },
         The_specified_path_does_not_exist_Colon_0: { code: 5058, category: ts.DiagnosticCategory.Error, key: "The_specified_path_does_not_exist_Colon_0_5058", message: "The specified path does not exist: '{0}'" },
-        Invalide_value_for_reactNamespace_0_is_not_a_valid_identifier: { code: 5059, category: ts.DiagnosticCategory.Error, key: "Invalide_value_for_reactNamespace_0_is_not_a_valid_identifier_5059", message: "Invalide value for '--reactNamespace'. '{0}' is not a valid identifier." },
+        Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier: { code: 5059, category: ts.DiagnosticCategory.Error, key: "Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier_5059", message: "Invalid value for '--reactNamespace'. '{0}' is not a valid identifier." },
+        Option_paths_cannot_be_used_without_specifying_baseUrl_option: { code: 5060, category: ts.DiagnosticCategory.Error, key: "Option_paths_cannot_be_used_without_specifying_baseUrl_option_5060", message: "Option 'paths' cannot be used without specifying '--baseUrl' option." },
+        Pattern_0_can_have_at_most_one_Asterisk_character: { code: 5061, category: ts.DiagnosticCategory.Error, key: "Pattern_0_can_have_at_most_one_Asterisk_character_5061", message: "Pattern '{0}' can have at most one '*' character" },
+        Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character: { code: 5062, category: ts.DiagnosticCategory.Error, key: "Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character_5062", message: "Substitution '{0}' in pattern '{1}' in can have at most one '*' character" },
         Concatenate_and_emit_output_to_single_file: { code: 6001, category: ts.DiagnosticCategory.Message, key: "Concatenate_and_emit_output_to_single_file_6001", message: "Concatenate and emit output to single file." },
         Generates_corresponding_d_ts_file: { code: 6002, category: ts.DiagnosticCategory.Message, key: "Generates_corresponding_d_ts_file_6002", message: "Generates corresponding '.d.ts' file." },
-        Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: ts.DiagnosticCategory.Message, key: "Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations_6003", message: "Specifies the location where debugger should locate map files instead of generated locations." },
-        Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: { code: 6004, category: ts.DiagnosticCategory.Message, key: "Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations_6004", message: "Specifies the location where debugger should locate TypeScript files instead of source locations." },
+        Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: ts.DiagnosticCategory.Message, key: "Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations_6003", message: "Specify the location where debugger should locate map files instead of generated locations." },
+        Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: { code: 6004, category: ts.DiagnosticCategory.Message, key: "Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations_6004", message: "Specify the location where debugger should locate TypeScript files instead of source locations." },
         Watch_input_files: { code: 6005, category: ts.DiagnosticCategory.Message, key: "Watch_input_files_6005", message: "Watch input files." },
         Redirect_output_structure_to_the_directory: { code: 6006, category: ts.DiagnosticCategory.Message, key: "Redirect_output_structure_to_the_directory_6006", message: "Redirect output structure to the directory." },
         Do_not_erase_const_enum_declarations_in_generated_code: { code: 6007, category: ts.DiagnosticCategory.Message, key: "Do_not_erase_const_enum_declarations_in_generated_code_6007", message: "Do not erase const enum declarations in generated code." },
@@ -2748,7 +2867,7 @@ var ts;
         Do_not_emit_comments_to_output: { code: 6009, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_comments_to_output_6009", message: "Do not emit comments to output." },
         Do_not_emit_outputs: { code: 6010, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_outputs_6010", message: "Do not emit outputs." },
         Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking: { code: 6011, category: ts.DiagnosticCategory.Message, key: "Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typech_6011", message: "Allow default imports from modules with no default export. This does not affect code emit, just typechecking." },
-        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental: { code: 6015, category: ts.DiagnosticCategory.Message, key: "Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental_6015", message: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES2015' (experimental)" },
+        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015: { code: 6015, category: ts.DiagnosticCategory.Message, key: "Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_6015", message: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES2015'" },
         Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015: { code: 6016, category: ts.DiagnosticCategory.Message, key: "Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015_6016", message: "Specify module code generation: 'commonjs', 'amd', 'system', 'umd' or 'es2015'" },
         Print_this_message: { code: 6017, category: ts.DiagnosticCategory.Message, key: "Print_this_message_6017", message: "Print this message." },
         Print_the_compiler_s_version: { code: 6019, category: ts.DiagnosticCategory.Message, key: "Print_the_compiler_s_version_6019", message: "Print the compiler's version." },
@@ -2770,8 +2889,7 @@ var ts;
         Generates_corresponding_map_file: { code: 6043, category: ts.DiagnosticCategory.Message, key: "Generates_corresponding_map_file_6043", message: "Generates corresponding '.map' file." },
         Compiler_option_0_expects_an_argument: { code: 6044, category: ts.DiagnosticCategory.Error, key: "Compiler_option_0_expects_an_argument_6044", message: "Compiler option '{0}' expects an argument." },
         Unterminated_quoted_string_in_response_file_0: { code: 6045, category: ts.DiagnosticCategory.Error, key: "Unterminated_quoted_string_in_response_file_0_6045", message: "Unterminated quoted string in response file '{0}'." },
-        Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015: { code: 6046, category: ts.DiagnosticCategory.Error, key: "Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015_6046", message: "Argument for '--module' option must be 'commonjs', 'amd', 'system', 'umd', or 'es2015'." },
-        Argument_for_target_option_must_be_ES3_ES5_or_ES2015: { code: 6047, category: ts.DiagnosticCategory.Error, key: "Argument_for_target_option_must_be_ES3_ES5_or_ES2015_6047", message: "Argument for '--target' option must be 'ES3', 'ES5', or 'ES2015'." },
+        Argument_for_0_option_must_be_Colon_1: { code: 6046, category: ts.DiagnosticCategory.Error, key: "Argument_for_0_option_must_be_Colon_1_6046", message: "Argument for '{0}' option must be: {1}" },
         Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1: { code: 6048, category: ts.DiagnosticCategory.Error, key: "Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1_6048", message: "Locale must be of the form <language> or <language>-<territory>. For example '{0}' or '{1}'." },
         Unsupported_locale_0: { code: 6049, category: ts.DiagnosticCategory.Error, key: "Unsupported_locale_0_6049", message: "Unsupported locale '{0}'." },
         Unable_to_open_file_0: { code: 6050, category: ts.DiagnosticCategory.Error, key: "Unable_to_open_file_0_6050", message: "Unable to open file '{0}'." },
@@ -2781,16 +2899,15 @@ var ts;
         File_0_has_unsupported_extension_The_only_supported_extensions_are_1: { code: 6054, category: ts.DiagnosticCategory.Error, key: "File_0_has_unsupported_extension_The_only_supported_extensions_are_1_6054", message: "File '{0}' has unsupported extension. The only supported extensions are {1}." },
         Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures: { code: 6055, category: ts.DiagnosticCategory.Message, key: "Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures_6055", message: "Suppress noImplicitAny errors for indexing objects lacking index signatures." },
         Do_not_emit_declarations_for_code_that_has_an_internal_annotation: { code: 6056, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_declarations_for_code_that_has_an_internal_annotation_6056", message: "Do not emit declarations for code that has an '@internal' annotation." },
-        Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir: { code: 6058, category: ts.DiagnosticCategory.Message, key: "Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDi_6058", message: "Specifies the root directory of input files. Use to control the output directory structure with --outDir." },
+        Specify_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir: { code: 6058, category: ts.DiagnosticCategory.Message, key: "Specify_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir_6058", message: "Specify the root directory of input files. Use to control the output directory structure with --outDir." },
         File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files: { code: 6059, category: ts.DiagnosticCategory.Error, key: "File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files_6059", message: "File '{0}' is not under 'rootDir' '{1}'. 'rootDir' is expected to contain all source files." },
-        Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix: { code: 6060, category: ts.DiagnosticCategory.Message, key: "Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix_6060", message: "Specifies the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix)." },
+        Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix: { code: 6060, category: ts.DiagnosticCategory.Message, key: "Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix_6060", message: "Specify the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix)." },
         NEWLINE: { code: 6061, category: ts.DiagnosticCategory.Message, key: "NEWLINE_6061", message: "NEWLINE" },
-        Argument_for_newLine_option_must_be_CRLF_or_LF: { code: 6062, category: ts.DiagnosticCategory.Error, key: "Argument_for_newLine_option_must_be_CRLF_or_LF_6062", message: "Argument for '--newLine' option must be 'CRLF' or 'LF'." },
-        Argument_for_moduleResolution_option_must_be_node_or_classic: { code: 6063, category: ts.DiagnosticCategory.Error, key: "Argument_for_moduleResolution_option_must_be_node_or_classic_6063", message: "Argument for '--moduleResolution' option must be 'node' or 'classic'." },
+        Option_0_can_only_be_specified_in_tsconfig_json_file: { code: 6064, category: ts.DiagnosticCategory.Error, key: "Option_0_can_only_be_specified_in_tsconfig_json_file_6064", message: "Option '{0}' can only be specified in 'tsconfig.json' file." },
         Enables_experimental_support_for_ES7_decorators: { code: 6065, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_ES7_decorators_6065", message: "Enables experimental support for ES7 decorators." },
         Enables_experimental_support_for_emitting_type_metadata_for_decorators: { code: 6066, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_emitting_type_metadata_for_decorators_6066", message: "Enables experimental support for emitting type metadata for decorators." },
         Enables_experimental_support_for_ES7_async_functions: { code: 6068, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_ES7_async_functions_6068", message: "Enables experimental support for ES7 async functions." },
-        Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6: { code: 6069, category: ts.DiagnosticCategory.Message, key: "Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6_6069", message: "Specifies module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6)." },
+        Specify_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6: { code: 6069, category: ts.DiagnosticCategory.Message, key: "Specify_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6_6069", message: "Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6)." },
         Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file: { code: 6070, category: ts.DiagnosticCategory.Message, key: "Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file_6070", message: "Initializes a TypeScript project and creates a tsconfig.json file." },
         Successfully_created_a_tsconfig_json_file: { code: 6071, category: ts.DiagnosticCategory.Message, key: "Successfully_created_a_tsconfig_json_file_6071", message: "Successfully created a tsconfig.json file." },
         Suppress_excess_property_checks_for_object_literals: { code: 6072, category: ts.DiagnosticCategory.Message, key: "Suppress_excess_property_checks_for_object_literals_6072", message: "Suppress excess property checks for object literals." },
@@ -2800,11 +2917,55 @@ var ts;
         Report_errors_for_fallthrough_cases_in_switch_statement: { code: 6076, category: ts.DiagnosticCategory.Message, key: "Report_errors_for_fallthrough_cases_in_switch_statement_6076", message: "Report errors for fallthrough cases in switch statement." },
         Do_not_report_errors_on_unreachable_code: { code: 6077, category: ts.DiagnosticCategory.Message, key: "Do_not_report_errors_on_unreachable_code_6077", message: "Do not report errors on unreachable code." },
         Disallow_inconsistently_cased_references_to_the_same_file: { code: 6078, category: ts.DiagnosticCategory.Message, key: "Disallow_inconsistently_cased_references_to_the_same_file_6078", message: "Disallow inconsistently-cased references to the same file." },
+        Specify_library_files_to_be_included_in_the_compilation_Colon: { code: 6079, category: ts.DiagnosticCategory.Message, key: "Specify_library_files_to_be_included_in_the_compilation_Colon_6079", message: "Specify library files to be included in the compilation: " },
         Specify_JSX_code_generation_Colon_preserve_or_react: { code: 6080, category: ts.DiagnosticCategory.Message, key: "Specify_JSX_code_generation_Colon_preserve_or_react_6080", message: "Specify JSX code generation: 'preserve' or 'react'" },
-        Argument_for_jsx_must_be_preserve_or_react: { code: 6081, category: ts.DiagnosticCategory.Message, key: "Argument_for_jsx_must_be_preserve_or_react_6081", message: "Argument for '--jsx' must be 'preserve' or 'react'." },
         Only_amd_and_system_modules_are_supported_alongside_0: { code: 6082, category: ts.DiagnosticCategory.Error, key: "Only_amd_and_system_modules_are_supported_alongside_0_6082", message: "Only 'amd' and 'system' modules are supported alongside --{0}." },
-        Allow_javascript_files_to_be_compiled: { code: 6083, category: ts.DiagnosticCategory.Message, key: "Allow_javascript_files_to_be_compiled_6083", message: "Allow javascript files to be compiled." },
-        Specifies_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit: { code: 6084, category: ts.DiagnosticCategory.Message, key: "Specifies_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit_6084", message: "Specifies the object invoked for createElement and __spread when targeting 'react' JSX emit" },
+        Base_directory_to_resolve_non_absolute_module_names: { code: 6083, category: ts.DiagnosticCategory.Message, key: "Base_directory_to_resolve_non_absolute_module_names_6083", message: "Base directory to resolve non-absolute module names." },
+        Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit: { code: 6084, category: ts.DiagnosticCategory.Message, key: "Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit_6084", message: "Specify the object invoked for createElement and __spread when targeting 'react' JSX emit" },
+        Enable_tracing_of_the_name_resolution_process: { code: 6085, category: ts.DiagnosticCategory.Message, key: "Enable_tracing_of_the_name_resolution_process_6085", message: "Enable tracing of the name resolution process." },
+        Resolving_module_0_from_1: { code: 6086, category: ts.DiagnosticCategory.Message, key: "Resolving_module_0_from_1_6086", message: "======== Resolving module '{0}' from '{1}'. ========" },
+        Explicitly_specified_module_resolution_kind_Colon_0: { code: 6087, category: ts.DiagnosticCategory.Message, key: "Explicitly_specified_module_resolution_kind_Colon_0_6087", message: "Explicitly specified module resolution kind: '{0}'." },
+        Module_resolution_kind_is_not_specified_using_0: { code: 6088, category: ts.DiagnosticCategory.Message, key: "Module_resolution_kind_is_not_specified_using_0_6088", message: "Module resolution kind is not specified, using '{0}'." },
+        Module_name_0_was_successfully_resolved_to_1: { code: 6089, category: ts.DiagnosticCategory.Message, key: "Module_name_0_was_successfully_resolved_to_1_6089", message: "======== Module name '{0}' was successfully resolved to '{1}'. ========" },
+        Module_name_0_was_not_resolved: { code: 6090, category: ts.DiagnosticCategory.Message, key: "Module_name_0_was_not_resolved_6090", message: "======== Module name '{0}' was not resolved. ========" },
+        paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0: { code: 6091, category: ts.DiagnosticCategory.Message, key: "paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0_6091", message: "'paths' option is specified, looking for a pattern to match module name '{0}'." },
+        Module_name_0_matched_pattern_1: { code: 6092, category: ts.DiagnosticCategory.Message, key: "Module_name_0_matched_pattern_1_6092", message: "Module name '{0}', matched pattern '{1}'." },
+        Trying_substitution_0_candidate_module_location_Colon_1: { code: 6093, category: ts.DiagnosticCategory.Message, key: "Trying_substitution_0_candidate_module_location_Colon_1_6093", message: "Trying substitution '{0}', candidate module location: '{1}'." },
+        Resolving_module_name_0_relative_to_base_url_1_2: { code: 6094, category: ts.DiagnosticCategory.Message, key: "Resolving_module_name_0_relative_to_base_url_1_2_6094", message: "Resolving module name '{0}' relative to base url '{1}' - '{2}'." },
+        Loading_module_as_file_Slash_folder_candidate_module_location_0: { code: 6095, category: ts.DiagnosticCategory.Message, key: "Loading_module_as_file_Slash_folder_candidate_module_location_0_6095", message: "Loading module as file / folder, candidate module location '{0}'." },
+        File_0_does_not_exist: { code: 6096, category: ts.DiagnosticCategory.Message, key: "File_0_does_not_exist_6096", message: "File '{0}' does not exist." },
+        File_0_exist_use_it_as_a_name_resolution_result: { code: 6097, category: ts.DiagnosticCategory.Message, key: "File_0_exist_use_it_as_a_name_resolution_result_6097", message: "File '{0}' exist - use it as a name resolution result." },
+        Loading_module_0_from_node_modules_folder: { code: 6098, category: ts.DiagnosticCategory.Message, key: "Loading_module_0_from_node_modules_folder_6098", message: "Loading module '{0}' from 'node_modules' folder." },
+        Found_package_json_at_0: { code: 6099, category: ts.DiagnosticCategory.Message, key: "Found_package_json_at_0_6099", message: "Found 'package.json' at '{0}'." },
+        package_json_does_not_have_types_field: { code: 6100, category: ts.DiagnosticCategory.Message, key: "package_json_does_not_have_types_field_6100", message: "'package.json' does not have 'types' field." },
+        package_json_has_0_field_1_that_references_2: { code: 6101, category: ts.DiagnosticCategory.Message, key: "package_json_has_0_field_1_that_references_2_6101", message: "'package.json' has '{0}' field '{1}' that references '{2}'." },
+        Allow_javascript_files_to_be_compiled: { code: 6102, category: ts.DiagnosticCategory.Message, key: "Allow_javascript_files_to_be_compiled_6102", message: "Allow javascript files to be compiled." },
+        Option_0_should_have_array_of_strings_as_a_value: { code: 6103, category: ts.DiagnosticCategory.Error, key: "Option_0_should_have_array_of_strings_as_a_value_6103", message: "Option '{0}' should have array of strings as a value." },
+        Checking_if_0_is_the_longest_matching_prefix_for_1_2: { code: 6104, category: ts.DiagnosticCategory.Message, key: "Checking_if_0_is_the_longest_matching_prefix_for_1_2_6104", message: "Checking if '{0}' is the longest matching prefix for '{1}' - '{2}'." },
+        Expected_type_of_0_field_in_package_json_to_be_string_got_1: { code: 6105, category: ts.DiagnosticCategory.Message, key: "Expected_type_of_0_field_in_package_json_to_be_string_got_1_6105", message: "Expected type of '{0}' field in 'package.json' to be 'string', got '{1}'." },
+        baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1: { code: 6106, category: ts.DiagnosticCategory.Message, key: "baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1_6106", message: "'baseUrl' option is set to '{0}', using this value to resolve non-relative module name '{1}'" },
+        rootDirs_option_is_set_using_it_to_resolve_relative_module_name_0: { code: 6107, category: ts.DiagnosticCategory.Message, key: "rootDirs_option_is_set_using_it_to_resolve_relative_module_name_0_6107", message: "'rootDirs' option is set, using it to resolve relative module name '{0}'" },
+        Longest_matching_prefix_for_0_is_1: { code: 6108, category: ts.DiagnosticCategory.Message, key: "Longest_matching_prefix_for_0_is_1_6108", message: "Longest matching prefix for '{0}' is '{1}'" },
+        Loading_0_from_the_root_dir_1_candidate_location_2: { code: 6109, category: ts.DiagnosticCategory.Message, key: "Loading_0_from_the_root_dir_1_candidate_location_2_6109", message: "Loading '{0}' from the root dir '{1}', candidate location '{2}'" },
+        Trying_other_entries_in_rootDirs: { code: 6110, category: ts.DiagnosticCategory.Message, key: "Trying_other_entries_in_rootDirs_6110", message: "Trying other entries in 'rootDirs'" },
+        Module_resolution_using_rootDirs_has_failed: { code: 6111, category: ts.DiagnosticCategory.Message, key: "Module_resolution_using_rootDirs_has_failed_6111", message: "Module resolution using 'rootDirs' has failed" },
+        Do_not_emit_use_strict_directives_in_module_output: { code: 6112, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_use_strict_directives_in_module_output_6112", message: "Do not emit 'use strict' directives in module output." },
+        Enable_strict_null_checks: { code: 6113, category: ts.DiagnosticCategory.Message, key: "Enable_strict_null_checks_6113", message: "Enable strict null checks." },
+        Unknown_option_excludes_Did_you_mean_exclude: { code: 6114, category: ts.DiagnosticCategory.Error, key: "Unknown_option_excludes_Did_you_mean_exclude_6114", message: "Unknown option 'excludes'. Did you mean 'exclude'?" },
+        Raise_error_on_this_expressions_with_an_implied_any_type: { code: 6115, category: ts.DiagnosticCategory.Message, key: "Raise_error_on_this_expressions_with_an_implied_any_type_6115", message: "Raise error on 'this' expressions with an implied 'any' type." },
+        Resolving_type_reference_directive_0_containing_file_1_root_directory_2: { code: 6116, category: ts.DiagnosticCategory.Message, key: "Resolving_type_reference_directive_0_containing_file_1_root_directory_2_6116", message: "======== Resolving type reference directive '{0}', containing file '{1}', root directory '{2}'. ========" },
+        Resolving_using_primary_search_paths: { code: 6117, category: ts.DiagnosticCategory.Message, key: "Resolving_using_primary_search_paths_6117", message: "Resolving using primary search paths..." },
+        Resolving_from_node_modules_folder: { code: 6118, category: ts.DiagnosticCategory.Message, key: "Resolving_from_node_modules_folder_6118", message: "Resolving from node_modules folder..." },
+        Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2: { code: 6119, category: ts.DiagnosticCategory.Message, key: "Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2_6119", message: "======== Type reference directive '{0}' was successfully resolved to '{1}', primary: {2}. ========" },
+        Type_reference_directive_0_was_not_resolved: { code: 6120, category: ts.DiagnosticCategory.Message, key: "Type_reference_directive_0_was_not_resolved_6120", message: "======== Type reference directive '{0}' was not resolved. ========" },
+        Resolving_with_primary_search_path_0: { code: 6121, category: ts.DiagnosticCategory.Message, key: "Resolving_with_primary_search_path_0_6121", message: "Resolving with primary search path '{0}'" },
+        Root_directory_cannot_be_determined_skipping_primary_search_paths: { code: 6122, category: ts.DiagnosticCategory.Message, key: "Root_directory_cannot_be_determined_skipping_primary_search_paths_6122", message: "Root directory cannot be determined, skipping primary search paths." },
+        Resolving_type_reference_directive_0_containing_file_1_root_directory_not_set: { code: 6123, category: ts.DiagnosticCategory.Message, key: "Resolving_type_reference_directive_0_containing_file_1_root_directory_not_set_6123", message: "======== Resolving type reference directive '{0}', containing file '{1}', root directory not set. ========" },
+        Type_declaration_files_to_be_included_in_compilation: { code: 6124, category: ts.DiagnosticCategory.Message, key: "Type_declaration_files_to_be_included_in_compilation_6124", message: "Type declaration files to be included in compilation." },
+        Looking_up_in_node_modules_folder_initial_location_0: { code: 6125, category: ts.DiagnosticCategory.Message, key: "Looking_up_in_node_modules_folder_initial_location_0_6125", message: "Looking up in 'node_modules' folder, initial location '{0}'" },
+        Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder: { code: 6126, category: ts.DiagnosticCategory.Message, key: "Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_mod_6126", message: "Containing file is not specified and root directory cannot be determined, skipping lookup in 'node_modules' folder." },
+        Resolving_type_reference_directive_0_containing_file_not_set_root_directory_1: { code: 6127, category: ts.DiagnosticCategory.Message, key: "Resolving_type_reference_directive_0_containing_file_not_set_root_directory_1_6127", message: "======== Resolving type reference directive '{0}', containing file not set, root directory '{1}'. ========" },
+        Resolving_type_reference_directive_0_containing_file_not_set_root_directory_not_set: { code: 6128, category: ts.DiagnosticCategory.Message, key: "Resolving_type_reference_directive_0_containing_file_not_set_root_directory_not_set_6128", message: "======== Resolving type reference directive '{0}', containing file not set, root directory not set. ========" },
         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." },
         Parameter_0_implicitly_has_an_1_type: { code: 7006, category: ts.DiagnosticCategory.Error, key: "Parameter_0_implicitly_has_an_1_type_7006", message: "Parameter '{0}' implicitly has an '{1}' type." },
         Member_0_implicitly_has_an_1_type: { code: 7008, category: ts.DiagnosticCategory.Error, key: "Member_0_implicitly_has_an_1_type_7008", message: "Member '{0}' implicitly has an '{1}' type." },
@@ -2827,6 +2988,7 @@ var ts;
         Unused_label: { code: 7028, category: ts.DiagnosticCategory.Error, key: "Unused_label_7028", message: "Unused label." },
         Fallthrough_case_in_switch: { code: 7029, category: ts.DiagnosticCategory.Error, key: "Fallthrough_case_in_switch_7029", message: "Fallthrough case in switch." },
         Not_all_code_paths_return_a_value: { code: 7030, category: ts.DiagnosticCategory.Error, key: "Not_all_code_paths_return_a_value_7030", message: "Not all code paths return a value." },
+        Binding_element_0_implicitly_has_an_1_type: { code: 7031, category: ts.DiagnosticCategory.Error, key: "Binding_element_0_implicitly_has_an_1_type_7031", message: "Binding element '{0}' implicitly has an '{1}' type." },
         You_cannot_rename_this_element: { code: 8000, category: ts.DiagnosticCategory.Error, key: "You_cannot_rename_this_element_8000", message: "You cannot rename this element." },
         You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: { code: 8001, category: ts.DiagnosticCategory.Error, key: "You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library_8001", message: "You cannot rename elements that are defined in the standard TypeScript library." },
         import_can_only_be_used_in_a_ts_file: { code: 8002, category: ts.DiagnosticCategory.Error, key: "import_can_only_be_used_in_a_ts_file_8002", message: "'import ... =' can only be used in a .ts file." },
@@ -2843,7 +3005,6 @@ var ts;
         property_declarations_can_only_be_used_in_a_ts_file: { code: 8014, category: ts.DiagnosticCategory.Error, key: "property_declarations_can_only_be_used_in_a_ts_file_8014", message: "'property declarations' can only be used in a .ts file." },
         enum_declarations_can_only_be_used_in_a_ts_file: { code: 8015, category: ts.DiagnosticCategory.Error, key: "enum_declarations_can_only_be_used_in_a_ts_file_8015", message: "'enum declarations' can only be used in a .ts file." },
         type_assertion_expressions_can_only_be_used_in_a_ts_file: { code: 8016, category: ts.DiagnosticCategory.Error, key: "type_assertion_expressions_can_only_be_used_in_a_ts_file_8016", message: "'type assertion expressions' can only be used in a .ts file." },
-        decorators_can_only_be_used_in_a_ts_file: { code: 8017, category: ts.DiagnosticCategory.Error, key: "decorators_can_only_be_used_in_a_ts_file_8017", message: "'decorators' can only be used in a .ts file." },
         Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_class_extends_clauses: { code: 9002, category: ts.DiagnosticCategory.Error, key: "Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_clas_9002", message: "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses." },
         class_expressions_are_not_currently_supported: { code: 9003, category: ts.DiagnosticCategory.Error, key: "class_expressions_are_not_currently_supported_9003", message: "'class' expressions are not currently supported." },
         JSX_attributes_must_only_be_assigned_a_non_empty_expression: { code: 17000, category: ts.DiagnosticCategory.Error, key: "JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000", message: "JSX attributes must only be assigned a non-empty 'expression'." },
@@ -2854,7 +3015,9 @@ var ts;
         A_constructor_cannot_contain_a_super_call_when_its_class_extends_null: { code: 17005, category: ts.DiagnosticCategory.Error, key: "A_constructor_cannot_contain_a_super_call_when_its_class_extends_null_17005", message: "A constructor cannot contain a 'super' call when its class extends 'null'" },
         An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17006, category: ts.DiagnosticCategory.Error, key: "An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_ex_17006", message: "An unary expression with the '{0}' operator is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." },
         A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17007, category: ts.DiagnosticCategory.Error, key: "A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Con_17007", message: "A type assertion expression is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." },
-        JSX_element_0_has_no_corresponding_closing_tag: { code: 17008, category: ts.DiagnosticCategory.Error, key: "JSX_element_0_has_no_corresponding_closing_tag_17008", message: "JSX element '{0}' has no corresponding closing tag." }
+        JSX_element_0_has_no_corresponding_closing_tag: { code: 17008, category: ts.DiagnosticCategory.Error, key: "JSX_element_0_has_no_corresponding_closing_tag_17008", message: "JSX element '{0}' has no corresponding closing tag." },
+        super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class: { code: 17009, category: ts.DiagnosticCategory.Error, key: "super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class_17009", message: "'super' must be called before accessing 'this' in the constructor of a derived class." },
+        Unknown_typing_option_0: { code: 17010, category: ts.DiagnosticCategory.Error, key: "Unknown_typing_option_0_17010", message: "Unknown typing option '{0}'." }
     };
 })(ts || (ts = {}));
 /// <reference path="core.ts"/>
@@ -2890,7 +3053,7 @@ var ts;
         "false": 84 /* FalseKeyword */,
         "finally": 85 /* FinallyKeyword */,
         "for": 86 /* ForKeyword */,
-        "from": 133 /* FromKeyword */,
+        "from": 135 /* FromKeyword */,
         "function": 87 /* FunctionKeyword */,
         "get": 123 /* GetKeyword */,
         "if": 88 /* IfKeyword */,
@@ -2905,26 +3068,28 @@ var ts;
         "namespace": 126 /* NamespaceKeyword */,
         "new": 92 /* NewKeyword */,
         "null": 93 /* NullKeyword */,
-        "number": 128 /* NumberKeyword */,
+        "number": 129 /* NumberKeyword */,
         "package": 109 /* PackageKeyword */,
         "private": 110 /* PrivateKeyword */,
         "protected": 111 /* ProtectedKeyword */,
         "public": 112 /* PublicKeyword */,
-        "require": 127 /* RequireKeyword */,
-        "global": 134 /* GlobalKeyword */,
+        "readonly": 127 /* ReadonlyKeyword */,
+        "require": 128 /* RequireKeyword */,
+        "global": 136 /* GlobalKeyword */,
         "return": 94 /* ReturnKeyword */,
-        "set": 129 /* SetKeyword */,
+        "set": 130 /* SetKeyword */,
         "static": 113 /* StaticKeyword */,
-        "string": 130 /* StringKeyword */,
+        "string": 131 /* StringKeyword */,
         "super": 95 /* SuperKeyword */,
         "switch": 96 /* SwitchKeyword */,
-        "symbol": 131 /* SymbolKeyword */,
+        "symbol": 132 /* SymbolKeyword */,
         "this": 97 /* ThisKeyword */,
         "throw": 98 /* ThrowKeyword */,
         "true": 99 /* TrueKeyword */,
         "try": 100 /* TryKeyword */,
-        "type": 132 /* TypeKeyword */,
+        "type": 133 /* TypeKeyword */,
         "typeof": 101 /* TypeOfKeyword */,
+        "undefined": 134 /* UndefinedKeyword */,
         "var": 102 /* VarKeyword */,
         "void": 103 /* VoidKeyword */,
         "while": 104 /* WhileKeyword */,
@@ -2932,7 +3097,7 @@ var ts;
         "yield": 114 /* YieldKeyword */,
         "async": 118 /* AsyncKeyword */,
         "await": 119 /* AwaitKeyword */,
-        "of": 135 /* OfKeyword */,
+        "of": 137 /* OfKeyword */,
         "{": 15 /* OpenBraceToken */,
         "}": 16 /* CloseBraceToken */,
         "(": 17 /* OpenParenToken */,
@@ -3304,7 +3469,7 @@ var ts;
     }
     ts.skipTrivia = skipTrivia;
     // All conflict markers consist of the same character repeated seven times.  If it is
-    // a <<<<<<< or >>>>>>> marker then it is also followd by a space.
+    // a <<<<<<< or >>>>>>> marker then it is also followed by a space.
     var mergeConflictMarkerLength = "<<<<<<<".length;
     function isConflictMarkerTrivia(text, pos) {
         ts.Debug.assert(pos >= 0);
@@ -3336,7 +3501,7 @@ var ts;
         }
         else {
             ts.Debug.assert(ch === 61 /* equals */);
-            // Consume everything from the start of the mid-conlict marker to the start of the next
+            // Consume everything from the start of the mid-conflict marker to the start of the next
             // end-conflict marker.
             while (pos < len) {
                 var ch_1 = text.charCodeAt(pos);
@@ -3519,6 +3684,7 @@ var ts;
             scanJsxIdentifier: scanJsxIdentifier,
             reScanJsxToken: reScanJsxToken,
             scanJsxToken: scanJsxToken,
+            scanJSDocToken: scanJSDocToken,
             scan: scan,
             setText: setText,
             setScriptTarget: setScriptTarget,
@@ -3526,7 +3692,8 @@ var ts;
             setOnError: setOnError,
             setTextPos: setTextPos,
             tryScan: tryScan,
-            lookAhead: lookAhead
+            lookAhead: lookAhead,
+            scanRange: scanRange
         };
         function error(message, length) {
             if (onError) {
@@ -4348,7 +4515,7 @@ var ts;
                     break;
                 }
             }
-            return token = 239 /* JsxText */;
+            return token = 243 /* JsxText */;
         }
         // Scans a JSX identifier; these differ from normal identifiers in that
         // they allow dashes
@@ -4368,6 +4535,55 @@ var ts;
             }
             return token;
         }
+        function scanJSDocToken() {
+            if (pos >= end) {
+                return token = 1 /* EndOfFileToken */;
+            }
+            startPos = pos;
+            // Eat leading whitespace
+            var ch = text.charCodeAt(pos);
+            while (pos < end) {
+                ch = text.charCodeAt(pos);
+                if (isWhiteSpace(ch)) {
+                    pos++;
+                }
+                else {
+                    break;
+                }
+            }
+            tokenPos = pos;
+            switch (ch) {
+                case 64 /* at */:
+                    return pos += 1, token = 55 /* AtToken */;
+                case 10 /* lineFeed */:
+                case 13 /* carriageReturn */:
+                    return pos += 1, token = 4 /* NewLineTrivia */;
+                case 42 /* asterisk */:
+                    return pos += 1, token = 37 /* AsteriskToken */;
+                case 123 /* openBrace */:
+                    return pos += 1, token = 15 /* OpenBraceToken */;
+                case 125 /* closeBrace */:
+                    return pos += 1, token = 16 /* CloseBraceToken */;
+                case 91 /* openBracket */:
+                    return pos += 1, token = 19 /* OpenBracketToken */;
+                case 93 /* closeBracket */:
+                    return pos += 1, token = 20 /* CloseBracketToken */;
+                case 61 /* equals */:
+                    return pos += 1, token = 56 /* EqualsToken */;
+                case 44 /* comma */:
+                    return pos += 1, token = 24 /* CommaToken */;
+            }
+            if (isIdentifierStart(ch, 2 /* Latest */)) {
+                pos++;
+                while (isIdentifierPart(text.charCodeAt(pos), 2 /* Latest */) && pos < end) {
+                    pos++;
+                }
+                return token = 69 /* Identifier */;
+            }
+            else {
+                return pos += 1, token = 0 /* Unknown */;
+            }
+        }
         function speculationHelper(callback, isLookahead) {
             var savePos = pos;
             var saveStartPos = startPos;
@@ -4388,6 +4604,29 @@ var ts;
             }
             return result;
         }
+        function scanRange(start, length, callback) {
+            var saveEnd = end;
+            var savePos = pos;
+            var saveStartPos = startPos;
+            var saveTokenPos = tokenPos;
+            var saveToken = token;
+            var savePrecedingLineBreak = precedingLineBreak;
+            var saveTokenValue = tokenValue;
+            var saveHasExtendedUnicodeEscape = hasExtendedUnicodeEscape;
+            var saveTokenIsUnterminated = tokenIsUnterminated;
+            setText(text, start, length);
+            var result = callback();
+            end = saveEnd;
+            pos = savePos;
+            startPos = saveStartPos;
+            tokenPos = saveTokenPos;
+            token = saveToken;
+            precedingLineBreak = savePrecedingLineBreak;
+            tokenValue = saveTokenValue;
+            hasExtendedUnicodeEscape = saveHasExtendedUnicodeEscape;
+            tokenIsUnterminated = saveTokenIsUnterminated;
+            return result;
+        }
         function lookAhead(callback) {
             return speculationHelper(callback, /*isLookahead*/ true);
         }
@@ -4443,10 +4682,10 @@ var ts;
     var stringWriters = [];
     function getSingleLineStringWriter() {
         if (stringWriters.length === 0) {
-            var str = "";
-            var writeText = function (text) { return str += text; };
+            var str_1 = "";
+            var writeText = function (text) { return str_1 += text; };
             return {
-                string: function () { return str; },
+                string: function () { return str_1; },
                 writeKeyword: writeText,
                 writeOperator: writeText,
                 writePunctuation: writeText,
@@ -4456,10 +4695,10 @@ var ts;
                 writeSymbol: writeText,
                 // Completely ignore indentation for string writers.  And map newlines to
                 // a single space.
-                writeLine: function () { return str += " "; },
+                writeLine: function () { return str_1 += " "; },
                 increaseIndent: function () { },
                 decreaseIndent: function () { },
-                clear: function () { return str = ""; },
+                clear: function () { return str_1 = ""; },
                 trackSymbol: function () { },
                 reportInaccessibleThisError: function () { }
             };
@@ -4507,36 +4746,83 @@ var ts;
         sourceFile.resolvedModules[moduleNameText] = resolvedModule;
     }
     ts.setResolvedModule = setResolvedModule;
+    function setResolvedTypeReferenceDirective(sourceFile, typeReferenceDirectiveName, resolvedTypeReferenceDirective) {
+        if (!sourceFile.resolvedTypeReferenceDirectiveNames) {
+            sourceFile.resolvedTypeReferenceDirectiveNames = {};
+        }
+        sourceFile.resolvedTypeReferenceDirectiveNames[typeReferenceDirectiveName] = resolvedTypeReferenceDirective;
+    }
+    ts.setResolvedTypeReferenceDirective = setResolvedTypeReferenceDirective;
+    /* @internal */
+    function moduleResolutionIsEqualTo(oldResolution, newResolution) {
+        return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.isExternalLibraryImport === newResolution.isExternalLibraryImport;
+    }
+    ts.moduleResolutionIsEqualTo = moduleResolutionIsEqualTo;
+    /* @internal */
+    function typeDirectiveIsEqualTo(oldResolution, newResolution) {
+        return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.primary === newResolution.primary;
+    }
+    ts.typeDirectiveIsEqualTo = typeDirectiveIsEqualTo;
+    /* @internal */
+    function hasChangesInResolutions(names, newResolutions, oldResolutions, comparer) {
+        if (names.length !== newResolutions.length) {
+            return false;
+        }
+        for (var i = 0; i < names.length; i++) {
+            var newResolution = newResolutions[i];
+            var oldResolution = oldResolutions && ts.hasProperty(oldResolutions, names[i]) ? oldResolutions[names[i]] : undefined;
+            var changed = oldResolution
+                ? !newResolution || !comparer(oldResolution, newResolution)
+                : newResolution;
+            if (changed) {
+                return true;
+            }
+        }
+        return false;
+    }
+    ts.hasChangesInResolutions = hasChangesInResolutions;
     // Returns true if this node contains a parse error anywhere underneath it.
     function containsParseError(node) {
         aggregateChildData(node);
-        return (node.parserContextFlags & 64 /* ThisNodeOrAnySubNodesHasError */) !== 0;
+        return (node.flags & 268435456 /* ThisNodeOrAnySubNodesHasError */) !== 0;
     }
     ts.containsParseError = containsParseError;
     function aggregateChildData(node) {
-        if (!(node.parserContextFlags & 128 /* HasAggregatedChildData */)) {
+        if (!(node.flags & 536870912 /* HasAggregatedChildData */)) {
             // A node is considered to contain a parse error if:
             //  a) the parser explicitly marked that it had an error
             //  b) any of it's children reported that it had an error.
-            var thisNodeOrAnySubNodesHasError = ((node.parserContextFlags & 16 /* ThisNodeHasError */) !== 0) ||
+            var thisNodeOrAnySubNodesHasError = ((node.flags & 67108864 /* ThisNodeHasError */) !== 0) ||
                 ts.forEachChild(node, containsParseError);
             // If so, mark ourselves accordingly.
             if (thisNodeOrAnySubNodesHasError) {
-                node.parserContextFlags |= 64 /* ThisNodeOrAnySubNodesHasError */;
+                node.flags |= 268435456 /* ThisNodeOrAnySubNodesHasError */;
             }
-            // Also mark that we've propogated the child information to this node.  This way we can
+            // Also mark that we've propagated the child information to this node.  This way we can
             // always consult the bit directly on this node without needing to check its children
             // again.
-            node.parserContextFlags |= 128 /* HasAggregatedChildData */;
+            node.flags |= 536870912 /* HasAggregatedChildData */;
         }
     }
     function getSourceFileOfNode(node) {
-        while (node && node.kind !== 251 /* SourceFile */) {
+        while (node && node.kind !== 255 /* SourceFile */) {
             node = node.parent;
         }
         return node;
     }
     ts.getSourceFileOfNode = getSourceFileOfNode;
+    function isStatementWithLocals(node) {
+        switch (node.kind) {
+            case 198 /* Block */:
+            case 226 /* CaseBlock */:
+            case 205 /* ForStatement */:
+            case 206 /* ForInStatement */:
+            case 207 /* ForOfStatement */:
+                return true;
+        }
+        return false;
+    }
+    ts.isStatementWithLocals = isStatementWithLocals;
     function getStartPositionOfLine(line, sourceFile) {
         ts.Debug.assert(line >= 0);
         return ts.getLineStarts(sourceFile)[line];
@@ -4553,6 +4839,32 @@ var ts;
         return node.pos;
     }
     ts.getStartPosOfNode = getStartPosOfNode;
+    function getEndLinePosition(line, sourceFile) {
+        ts.Debug.assert(line >= 0);
+        var lineStarts = ts.getLineStarts(sourceFile);
+        var lineIndex = line;
+        var sourceText = sourceFile.text;
+        if (lineIndex + 1 === lineStarts.length) {
+            // last line - return EOF
+            return sourceText.length - 1;
+        }
+        else {
+            // current line start
+            var start = lineStarts[lineIndex];
+            // take the start position of the next line - 1 = it should be some line break
+            var pos = lineStarts[lineIndex + 1] - 1;
+            ts.Debug.assert(ts.isLineBreak(sourceText.charCodeAt(pos)));
+            // walk backwards skipping line breaks, stop the the beginning of current line.
+            // i.e:
+            // <some text>
+            // $ <- end of line for this position should match the start position
+            while (start <= pos && ts.isLineBreak(sourceText.charCodeAt(pos))) {
+                pos--;
+            }
+            return pos;
+        }
+    }
+    ts.getEndLinePosition = getEndLinePosition;
     // Returns true if this node is missing from the actual source code. A 'missing' node is different
     // from 'undefined/defined'. When a node is undefined (which can happen for optional nodes
     // in the tree), it is definitely missing. However, a node may be defined, but still be
@@ -4630,17 +4942,24 @@ var ts;
     }
     ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName;
     function isBlockOrCatchScoped(declaration) {
-        return (getCombinedNodeFlags(declaration) & 24576 /* BlockScoped */) !== 0 ||
+        return (getCombinedNodeFlags(declaration) & 3072 /* BlockScoped */) !== 0 ||
             isCatchClauseVariableDeclaration(declaration);
     }
     ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
     function isAmbientModule(node) {
-        return node && node.kind === 221 /* ModuleDeclaration */ &&
+        return node && node.kind === 224 /* ModuleDeclaration */ &&
             (node.name.kind === 9 /* StringLiteral */ || isGlobalScopeAugmentation(node));
     }
     ts.isAmbientModule = isAmbientModule;
+    function isBlockScopedContainerTopLevel(node) {
+        return node.kind === 255 /* SourceFile */ ||
+            node.kind === 224 /* ModuleDeclaration */ ||
+            isFunctionLike(node) ||
+            isFunctionBlock(node);
+    }
+    ts.isBlockScopedContainerTopLevel = isBlockScopedContainerTopLevel;
     function isGlobalScopeAugmentation(module) {
-        return !!(module.flags & 2097152 /* GlobalAugmentation */);
+        return !!(module.flags & 131072 /* GlobalAugmentation */);
     }
     ts.isGlobalScopeAugmentation = isGlobalScopeAugmentation;
     function isExternalModuleAugmentation(node) {
@@ -4651,10 +4970,10 @@ var ts;
             return false;
         }
         switch (node.parent.kind) {
-            case 251 /* SourceFile */:
-                return isExternalModule(node.parent);
-            case 222 /* ModuleBlock */:
-                return isAmbientModule(node.parent.parent) && !isExternalModule(node.parent.parent.parent);
+            case 255 /* SourceFile */:
+                return ts.isExternalModule(node.parent);
+            case 225 /* ModuleBlock */:
+                return isAmbientModule(node.parent.parent) && !ts.isExternalModule(node.parent.parent.parent);
         }
         return false;
     }
@@ -4668,15 +4987,15 @@ var ts;
                 return current;
             }
             switch (current.kind) {
-                case 251 /* SourceFile */:
-                case 223 /* CaseBlock */:
-                case 247 /* CatchClause */:
-                case 221 /* ModuleDeclaration */:
-                case 202 /* ForStatement */:
-                case 203 /* ForInStatement */:
-                case 204 /* ForOfStatement */:
+                case 255 /* SourceFile */:
+                case 226 /* CaseBlock */:
+                case 251 /* CatchClause */:
+                case 224 /* ModuleDeclaration */:
+                case 205 /* ForStatement */:
+                case 206 /* ForInStatement */:
+                case 207 /* ForOfStatement */:
                     return current;
-                case 195 /* Block */:
+                case 198 /* Block */:
                     // function block is not considered block-scope container
                     // see comment in binder.ts: bind(...), case for SyntaxKind.Block
                     if (!isFunctionLike(current.parent)) {
@@ -4689,9 +5008,9 @@ var ts;
     ts.getEnclosingBlockScopeContainer = getEnclosingBlockScopeContainer;
     function isCatchClauseVariableDeclaration(declaration) {
         return declaration &&
-            declaration.kind === 214 /* VariableDeclaration */ &&
+            declaration.kind === 217 /* VariableDeclaration */ &&
             declaration.parent &&
-            declaration.parent.kind === 247 /* CatchClause */;
+            declaration.parent.kind === 251 /* CatchClause */;
     }
     ts.isCatchClauseVariableDeclaration = isCatchClauseVariableDeclaration;
     // Return display name of an identifier
@@ -4727,10 +5046,23 @@ var ts;
         return ts.createTextSpanFromBounds(start, scanner.getTextPos());
     }
     ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition;
+    function getErrorSpanForArrowFunction(sourceFile, node) {
+        var pos = ts.skipTrivia(sourceFile.text, node.pos);
+        if (node.body && node.body.kind === 198 /* Block */) {
+            var startLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.pos).line;
+            var endLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.end).line;
+            if (startLine < endLine) {
+                // The arrow function spans multiple lines, 
+                // make the error span be the first line, inclusive.
+                return ts.createTextSpan(pos, getEndLinePosition(startLine, sourceFile) - pos + 1);
+            }
+        }
+        return ts.createTextSpanFromBounds(pos, node.end);
+    }
     function getErrorSpanForNode(sourceFile, node) {
         var errorNode = node;
         switch (node.kind) {
-            case 251 /* SourceFile */:
+            case 255 /* SourceFile */:
                 var pos_1 = ts.skipTrivia(sourceFile.text, 0, /*stopAfterLineBreak*/ false);
                 if (pos_1 === sourceFile.text.length) {
                     // file is empty - return span for the beginning of the file
@@ -4739,20 +5071,24 @@ var ts;
                 return getSpanOfTokenAtPosition(sourceFile, pos_1);
             // This list is a work in progress. Add missing node kinds to improve their error
             // spans.
-            case 214 /* VariableDeclaration */:
-            case 166 /* BindingElement */:
-            case 217 /* ClassDeclaration */:
-            case 189 /* ClassExpression */:
-            case 218 /* InterfaceDeclaration */:
-            case 221 /* ModuleDeclaration */:
-            case 220 /* EnumDeclaration */:
-            case 250 /* EnumMember */:
-            case 216 /* FunctionDeclaration */:
-            case 176 /* FunctionExpression */:
-            case 144 /* MethodDeclaration */:
-            case 219 /* TypeAliasDeclaration */:
+            case 217 /* VariableDeclaration */:
+            case 168 /* BindingElement */:
+            case 220 /* ClassDeclaration */:
+            case 191 /* ClassExpression */:
+            case 221 /* InterfaceDeclaration */:
+            case 224 /* ModuleDeclaration */:
+            case 223 /* EnumDeclaration */:
+            case 254 /* EnumMember */:
+            case 219 /* FunctionDeclaration */:
+            case 178 /* FunctionExpression */:
+            case 146 /* MethodDeclaration */:
+            case 148 /* GetAccessor */:
+            case 149 /* SetAccessor */:
+            case 222 /* TypeAliasDeclaration */:
                 errorNode = node.name;
                 break;
+            case 179 /* ArrowFunction */:
+                return getErrorSpanForArrowFunction(sourceFile, node);
         }
         if (errorNode === undefined) {
             // If we don't have a better node, then just set the error on the first token of
@@ -4765,24 +5101,20 @@ var ts;
         return ts.createTextSpanFromBounds(pos, errorNode.end);
     }
     ts.getErrorSpanForNode = getErrorSpanForNode;
-    function isExternalModule(file) {
-        return file.externalModuleIndicator !== undefined;
-    }
-    ts.isExternalModule = isExternalModule;
     function isExternalOrCommonJsModule(file) {
         return (file.externalModuleIndicator || file.commonJsModuleIndicator) !== undefined;
     }
     ts.isExternalOrCommonJsModule = isExternalOrCommonJsModule;
     function isDeclarationFile(file) {
-        return (file.flags & 4096 /* DeclarationFile */) !== 0;
+        return file.isDeclarationFile;
     }
     ts.isDeclarationFile = isDeclarationFile;
     function isConstEnumDeclaration(node) {
-        return node.kind === 220 /* EnumDeclaration */ && isConst(node);
+        return node.kind === 223 /* EnumDeclaration */ && isConst(node);
     }
     ts.isConstEnumDeclaration = isConstEnumDeclaration;
     function walkUpBindingElementsAndPatterns(node) {
-        while (node && (node.kind === 166 /* BindingElement */ || isBindingPattern(node))) {
+        while (node && (node.kind === 168 /* BindingElement */ || isBindingPattern(node))) {
             node = node.parent;
         }
         return node;
@@ -4797,29 +5129,33 @@ var ts;
     function getCombinedNodeFlags(node) {
         node = walkUpBindingElementsAndPatterns(node);
         var flags = node.flags;
-        if (node.kind === 214 /* VariableDeclaration */) {
+        if (node.kind === 217 /* VariableDeclaration */) {
             node = node.parent;
         }
-        if (node && node.kind === 215 /* VariableDeclarationList */) {
+        if (node && node.kind === 218 /* VariableDeclarationList */) {
             flags |= node.flags;
             node = node.parent;
         }
-        if (node && node.kind === 196 /* VariableStatement */) {
+        if (node && node.kind === 199 /* VariableStatement */) {
             flags |= node.flags;
         }
         return flags;
     }
     ts.getCombinedNodeFlags = getCombinedNodeFlags;
     function isConst(node) {
-        return !!(getCombinedNodeFlags(node) & 16384 /* Const */);
+        return !!(getCombinedNodeFlags(node) & 2048 /* Const */);
     }
     ts.isConst = isConst;
     function isLet(node) {
-        return !!(getCombinedNodeFlags(node) & 8192 /* Let */);
+        return !!(getCombinedNodeFlags(node) & 1024 /* Let */);
     }
     ts.isLet = isLet;
+    function isSuperCallExpression(n) {
+        return n.kind === 173 /* CallExpression */ && n.expression.kind === 95 /* SuperKeyword */;
+    }
+    ts.isSuperCallExpression = isSuperCallExpression;
     function isPrologueDirective(node) {
-        return node.kind === 198 /* ExpressionStatement */ && node.expression.kind === 9 /* StringLiteral */;
+        return node.kind === 201 /* ExpressionStatement */ && node.expression.kind === 9 /* StringLiteral */;
     }
     ts.isPrologueDirective = isPrologueDirective;
     function getLeadingCommentRangesOfNode(node, sourceFileOfNode) {
@@ -4835,7 +5171,7 @@ var ts;
     }
     ts.getJsDocComments = getJsDocComments;
     function getJsDocCommentsFromText(node, text) {
-        var commentRanges = (node.kind === 139 /* Parameter */ || node.kind === 138 /* TypeParameter */) ?
+        var commentRanges = (node.kind === 141 /* Parameter */ || node.kind === 140 /* TypeParameter */) ?
             ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
             getLeadingCommentRangesOfNodeFromText(node, text);
         return ts.filter(commentRanges, isJsDocComment);
@@ -4848,39 +5184,41 @@ var ts;
     }
     ts.getJsDocCommentsFromText = getJsDocCommentsFromText;
     ts.fullTripleSlashReferencePathRegEx = /^(\/\/\/\s*<reference\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
+    ts.fullTripleSlashReferenceTypeReferenceDirectiveRegEx = /^(\/\/\/\s*<reference\s+types\s*=\s*)('|")(.+?)\2.*?\/>/;
     ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
     function isTypeNode(node) {
-        if (151 /* FirstTypeNode */ <= node.kind && node.kind <= 163 /* LastTypeNode */) {
+        if (153 /* FirstTypeNode */ <= node.kind && node.kind <= 165 /* LastTypeNode */) {
             return true;
         }
         switch (node.kind) {
             case 117 /* AnyKeyword */:
-            case 128 /* NumberKeyword */:
-            case 130 /* StringKeyword */:
+            case 129 /* NumberKeyword */:
+            case 131 /* StringKeyword */:
             case 120 /* BooleanKeyword */:
-            case 131 /* SymbolKeyword */:
+            case 132 /* SymbolKeyword */:
+            case 134 /* UndefinedKeyword */:
                 return true;
             case 103 /* VoidKeyword */:
-                return node.parent.kind !== 180 /* VoidExpression */;
-            case 191 /* ExpressionWithTypeArguments */:
+                return node.parent.kind !== 182 /* VoidExpression */;
+            case 193 /* ExpressionWithTypeArguments */:
                 return !isExpressionWithTypeArgumentsInClassExtendsClause(node);
             // Identifiers and qualified names may be type nodes, depending on their context. Climb
             // above them to find the lowest container
             case 69 /* Identifier */:
                 // If the identifier is the RHS of a qualified name, then it's a type iff its parent is.
-                if (node.parent.kind === 136 /* QualifiedName */ && node.parent.right === node) {
+                if (node.parent.kind === 138 /* QualifiedName */ && node.parent.right === node) {
                     node = node.parent;
                 }
-                else if (node.parent.kind === 169 /* PropertyAccessExpression */ && node.parent.name === node) {
+                else if (node.parent.kind === 171 /* PropertyAccessExpression */ && node.parent.name === node) {
                     node = node.parent;
                 }
                 // At this point, node is either a qualified name or an identifier
-                ts.Debug.assert(node.kind === 69 /* Identifier */ || node.kind === 136 /* QualifiedName */ || node.kind === 169 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isTypeNode'.");
-            case 136 /* QualifiedName */:
-            case 169 /* PropertyAccessExpression */:
+                ts.Debug.assert(node.kind === 69 /* Identifier */ || node.kind === 138 /* QualifiedName */ || node.kind === 171 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isTypeNode'.");
+            case 138 /* QualifiedName */:
+            case 171 /* PropertyAccessExpression */:
             case 97 /* ThisKeyword */:
                 var parent_1 = node.parent;
-                if (parent_1.kind === 155 /* TypeQuery */) {
+                if (parent_1.kind === 157 /* TypeQuery */) {
                     return false;
                 }
                 // Do not recursively call isTypeNode on the parent. In the example:
@@ -4889,38 +5227,38 @@ var ts;
                 //
                 // Calling isTypeNode would consider the qualified name A.B a type node. Only C or
                 // A.B.C is a type node.
-                if (151 /* FirstTypeNode */ <= parent_1.kind && parent_1.kind <= 163 /* LastTypeNode */) {
+                if (153 /* FirstTypeNode */ <= parent_1.kind && parent_1.kind <= 165 /* LastTypeNode */) {
                     return true;
                 }
                 switch (parent_1.kind) {
-                    case 191 /* ExpressionWithTypeArguments */:
+                    case 193 /* ExpressionWithTypeArguments */:
                         return !isExpressionWithTypeArgumentsInClassExtendsClause(parent_1);
-                    case 138 /* TypeParameter */:
+                    case 140 /* TypeParameter */:
                         return node === parent_1.constraint;
-                    case 142 /* PropertyDeclaration */:
-                    case 141 /* PropertySignature */:
-                    case 139 /* Parameter */:
-                    case 214 /* VariableDeclaration */:
+                    case 144 /* PropertyDeclaration */:
+                    case 143 /* PropertySignature */:
+                    case 141 /* Parameter */:
+                    case 217 /* VariableDeclaration */:
                         return node === parent_1.type;
-                    case 216 /* FunctionDeclaration */:
-                    case 176 /* FunctionExpression */:
-                    case 177 /* ArrowFunction */:
-                    case 145 /* Constructor */:
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
+                    case 219 /* FunctionDeclaration */:
+                    case 178 /* FunctionExpression */:
+                    case 179 /* ArrowFunction */:
+                    case 147 /* Constructor */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
                         return node === parent_1.type;
-                    case 148 /* CallSignature */:
-                    case 149 /* ConstructSignature */:
-                    case 150 /* IndexSignature */:
+                    case 150 /* CallSignature */:
+                    case 151 /* ConstructSignature */:
+                    case 152 /* IndexSignature */:
                         return node === parent_1.type;
-                    case 174 /* TypeAssertionExpression */:
+                    case 176 /* TypeAssertionExpression */:
                         return node === parent_1.type;
-                    case 171 /* CallExpression */:
-                    case 172 /* NewExpression */:
+                    case 173 /* CallExpression */:
+                    case 174 /* NewExpression */:
                         return parent_1.typeArguments && ts.indexOf(parent_1.typeArguments, node) >= 0;
-                    case 173 /* TaggedTemplateExpression */:
+                    case 175 /* TaggedTemplateExpression */:
                         // TODO (drosen): TaggedTemplateExpressions may eventually support type arguments.
                         return false;
                 }
@@ -4934,23 +5272,23 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 207 /* ReturnStatement */:
+                case 210 /* ReturnStatement */:
                     return visitor(node);
-                case 223 /* CaseBlock */:
-                case 195 /* Block */:
-                case 199 /* IfStatement */:
-                case 200 /* DoStatement */:
-                case 201 /* WhileStatement */:
-                case 202 /* ForStatement */:
-                case 203 /* ForInStatement */:
-                case 204 /* ForOfStatement */:
-                case 208 /* WithStatement */:
-                case 209 /* SwitchStatement */:
-                case 244 /* CaseClause */:
-                case 245 /* DefaultClause */:
-                case 210 /* LabeledStatement */:
-                case 212 /* TryStatement */:
-                case 247 /* CatchClause */:
+                case 226 /* CaseBlock */:
+                case 198 /* Block */:
+                case 202 /* IfStatement */:
+                case 203 /* DoStatement */:
+                case 204 /* WhileStatement */:
+                case 205 /* ForStatement */:
+                case 206 /* ForInStatement */:
+                case 207 /* ForOfStatement */:
+                case 211 /* WithStatement */:
+                case 212 /* SwitchStatement */:
+                case 248 /* CaseClause */:
+                case 249 /* DefaultClause */:
+                case 213 /* LabeledStatement */:
+                case 215 /* TryStatement */:
+                case 251 /* CatchClause */:
                     return ts.forEachChild(node, traverse);
             }
         }
@@ -4960,18 +5298,18 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 187 /* YieldExpression */:
+                case 189 /* YieldExpression */:
                     visitor(node);
                     var operand = node.expression;
                     if (operand) {
                         traverse(operand);
                     }
-                case 220 /* EnumDeclaration */:
-                case 218 /* InterfaceDeclaration */:
-                case 221 /* ModuleDeclaration */:
-                case 219 /* TypeAliasDeclaration */:
-                case 217 /* ClassDeclaration */:
-                case 189 /* ClassExpression */:
+                case 223 /* EnumDeclaration */:
+                case 221 /* InterfaceDeclaration */:
+                case 224 /* ModuleDeclaration */:
+                case 222 /* TypeAliasDeclaration */:
+                case 220 /* ClassDeclaration */:
+                case 191 /* ClassExpression */:
                     // These are not allowed inside a generator now, but eventually they may be allowed
                     // as local types. Regardless, any yield statements contained within them should be
                     // skipped in this traversal.
@@ -4979,7 +5317,7 @@ var ts;
                 default:
                     if (isFunctionLike(node)) {
                         var name_5 = node.name;
-                        if (name_5 && name_5.kind === 137 /* ComputedPropertyName */) {
+                        if (name_5 && name_5.kind === 139 /* ComputedPropertyName */) {
                             // Note that we will not include methods/accessors of a class because they would require
                             // first descending into the class. This is by design.
                             traverse(name_5.expression);
@@ -4998,14 +5336,14 @@ var ts;
     function isVariableLike(node) {
         if (node) {
             switch (node.kind) {
-                case 166 /* BindingElement */:
-                case 250 /* EnumMember */:
-                case 139 /* Parameter */:
-                case 248 /* PropertyAssignment */:
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
-                case 249 /* ShorthandPropertyAssignment */:
-                case 214 /* VariableDeclaration */:
+                case 168 /* BindingElement */:
+                case 254 /* EnumMember */:
+                case 141 /* Parameter */:
+                case 252 /* PropertyAssignment */:
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
+                case 253 /* ShorthandPropertyAssignment */:
+                case 217 /* VariableDeclaration */:
                     return true;
             }
         }
@@ -5013,11 +5351,11 @@ var ts;
     }
     ts.isVariableLike = isVariableLike;
     function isAccessor(node) {
-        return node && (node.kind === 146 /* GetAccessor */ || node.kind === 147 /* SetAccessor */);
+        return node && (node.kind === 148 /* GetAccessor */ || node.kind === 149 /* SetAccessor */);
     }
     ts.isAccessor = isAccessor;
     function isClassLike(node) {
-        return node && (node.kind === 217 /* ClassDeclaration */ || node.kind === 189 /* ClassExpression */);
+        return node && (node.kind === 220 /* ClassDeclaration */ || node.kind === 191 /* ClassExpression */);
     }
     ts.isClassLike = isClassLike;
     function isFunctionLike(node) {
@@ -5026,32 +5364,32 @@ var ts;
     ts.isFunctionLike = isFunctionLike;
     function isFunctionLikeKind(kind) {
         switch (kind) {
-            case 145 /* Constructor */:
-            case 176 /* FunctionExpression */:
-            case 216 /* FunctionDeclaration */:
-            case 177 /* ArrowFunction */:
-            case 144 /* MethodDeclaration */:
-            case 143 /* MethodSignature */:
-            case 146 /* GetAccessor */:
-            case 147 /* SetAccessor */:
-            case 148 /* CallSignature */:
-            case 149 /* ConstructSignature */:
-            case 150 /* IndexSignature */:
-            case 153 /* FunctionType */:
-            case 154 /* ConstructorType */:
+            case 147 /* Constructor */:
+            case 178 /* FunctionExpression */:
+            case 219 /* FunctionDeclaration */:
+            case 179 /* ArrowFunction */:
+            case 146 /* MethodDeclaration */:
+            case 145 /* MethodSignature */:
+            case 148 /* GetAccessor */:
+            case 149 /* SetAccessor */:
+            case 150 /* CallSignature */:
+            case 151 /* ConstructSignature */:
+            case 152 /* IndexSignature */:
+            case 155 /* FunctionType */:
+            case 156 /* ConstructorType */:
                 return true;
         }
     }
     ts.isFunctionLikeKind = isFunctionLikeKind;
     function introducesArgumentsExoticObject(node) {
         switch (node.kind) {
-            case 144 /* MethodDeclaration */:
-            case 143 /* MethodSignature */:
-            case 145 /* Constructor */:
-            case 146 /* GetAccessor */:
-            case 147 /* SetAccessor */:
-            case 216 /* FunctionDeclaration */:
-            case 176 /* FunctionExpression */:
+            case 146 /* MethodDeclaration */:
+            case 145 /* MethodSignature */:
+            case 147 /* Constructor */:
+            case 148 /* GetAccessor */:
+            case 149 /* SetAccessor */:
+            case 219 /* FunctionDeclaration */:
+            case 178 /* FunctionExpression */:
                 return true;
         }
         return false;
@@ -5059,30 +5397,34 @@ var ts;
     ts.introducesArgumentsExoticObject = introducesArgumentsExoticObject;
     function isIterationStatement(node, lookInLabeledStatements) {
         switch (node.kind) {
-            case 202 /* ForStatement */:
-            case 203 /* ForInStatement */:
-            case 204 /* ForOfStatement */:
-            case 200 /* DoStatement */:
-            case 201 /* WhileStatement */:
+            case 205 /* ForStatement */:
+            case 206 /* ForInStatement */:
+            case 207 /* ForOfStatement */:
+            case 203 /* DoStatement */:
+            case 204 /* WhileStatement */:
                 return true;
-            case 210 /* LabeledStatement */:
+            case 213 /* LabeledStatement */:
                 return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
         }
         return false;
     }
     ts.isIterationStatement = isIterationStatement;
     function isFunctionBlock(node) {
-        return node && node.kind === 195 /* Block */ && isFunctionLike(node.parent);
+        return node && node.kind === 198 /* Block */ && isFunctionLike(node.parent);
     }
     ts.isFunctionBlock = isFunctionBlock;
     function isObjectLiteralMethod(node) {
-        return node && node.kind === 144 /* MethodDeclaration */ && node.parent.kind === 168 /* ObjectLiteralExpression */;
+        return node && node.kind === 146 /* MethodDeclaration */ && node.parent.kind === 170 /* ObjectLiteralExpression */;
     }
     ts.isObjectLiteralMethod = isObjectLiteralMethod;
     function isIdentifierTypePredicate(predicate) {
         return predicate && predicate.kind === 1 /* Identifier */;
     }
     ts.isIdentifierTypePredicate = isIdentifierTypePredicate;
+    function isThisTypePredicate(predicate) {
+        return predicate && predicate.kind === 0 /* This */;
+    }
+    ts.isThisTypePredicate = isThisTypePredicate;
     function getContainingFunction(node) {
         while (true) {
             node = node.parent;
@@ -5108,7 +5450,7 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 137 /* ComputedPropertyName */:
+                case 139 /* ComputedPropertyName */:
                     // If the grandparent node is an object literal (as opposed to a class),
                     // then the computed property is not a 'this' container.
                     // A computed property name in a class needs to be a this container
@@ -5123,9 +5465,9 @@ var ts;
                     // the *body* of the container.
                     node = node.parent;
                     break;
-                case 140 /* Decorator */:
+                case 142 /* Decorator */:
                     // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 139 /* Parameter */ && isClassElement(node.parent.parent)) {
+                    if (node.parent.kind === 141 /* Parameter */ && isClassElement(node.parent.parent)) {
                         // If the decorator's parent is a Parameter, we resolve the this container from
                         // the grandparent class declaration.
                         node = node.parent.parent;
@@ -5136,26 +5478,26 @@ var ts;
                         node = node.parent;
                     }
                     break;
-                case 177 /* ArrowFunction */:
+                case 179 /* ArrowFunction */:
                     if (!includeArrowFunctions) {
                         continue;
                     }
                 // Fall through
-                case 216 /* FunctionDeclaration */:
-                case 176 /* FunctionExpression */:
-                case 221 /* ModuleDeclaration */:
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
-                case 145 /* Constructor */:
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
-                case 148 /* CallSignature */:
-                case 149 /* ConstructSignature */:
-                case 150 /* IndexSignature */:
-                case 220 /* EnumDeclaration */:
-                case 251 /* SourceFile */:
+                case 219 /* FunctionDeclaration */:
+                case 178 /* FunctionExpression */:
+                case 224 /* ModuleDeclaration */:
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
+                case 147 /* Constructor */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
+                case 150 /* CallSignature */:
+                case 151 /* ConstructSignature */:
+                case 152 /* IndexSignature */:
+                case 223 /* EnumDeclaration */:
+                case 255 /* SourceFile */:
                     return node;
             }
         }
@@ -5176,26 +5518,26 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 137 /* ComputedPropertyName */:
+                case 139 /* ComputedPropertyName */:
                     node = node.parent;
                     break;
-                case 216 /* FunctionDeclaration */:
-                case 176 /* FunctionExpression */:
-                case 177 /* ArrowFunction */:
+                case 219 /* FunctionDeclaration */:
+                case 178 /* FunctionExpression */:
+                case 179 /* ArrowFunction */:
                     if (!stopOnFunctions) {
                         continue;
                     }
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
-                case 145 /* Constructor */:
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
+                case 147 /* Constructor */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
                     return node;
-                case 140 /* Decorator */:
+                case 142 /* Decorator */:
                     // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 139 /* Parameter */ && isClassElement(node.parent.parent)) {
+                    if (node.parent.kind === 141 /* Parameter */ && isClassElement(node.parent.parent)) {
                         // If the decorator's parent is a Parameter, we resolve the this container from
                         // the grandparent class declaration.
                         node = node.parent.parent;
@@ -5210,15 +5552,24 @@ var ts;
         }
     }
     ts.getSuperContainer = getSuperContainer;
+    /**
+     * Determines whether a node is a property or element access expression for super.
+     */
+    function isSuperPropertyOrElementAccess(node) {
+        return (node.kind === 171 /* PropertyAccessExpression */
+            || node.kind === 172 /* ElementAccessExpression */)
+            && node.expression.kind === 95 /* SuperKeyword */;
+    }
+    ts.isSuperPropertyOrElementAccess = isSuperPropertyOrElementAccess;
     function getEntityNameFromTypeNode(node) {
         if (node) {
             switch (node.kind) {
-                case 152 /* TypeReference */:
+                case 154 /* TypeReference */:
                     return node.typeName;
-                case 191 /* ExpressionWithTypeArguments */:
+                case 193 /* ExpressionWithTypeArguments */:
                     return node.expression;
                 case 69 /* Identifier */:
-                case 136 /* QualifiedName */:
+                case 138 /* QualifiedName */:
                     return node;
             }
         }
@@ -5226,7 +5577,7 @@ var ts;
     }
     ts.getEntityNameFromTypeNode = getEntityNameFromTypeNode;
     function getInvokedExpression(node) {
-        if (node.kind === 173 /* TaggedTemplateExpression */) {
+        if (node.kind === 175 /* TaggedTemplateExpression */) {
             return node.tag;
         }
         // Will either be a CallExpression, NewExpression, or Decorator.
@@ -5235,25 +5586,25 @@ var ts;
     ts.getInvokedExpression = getInvokedExpression;
     function nodeCanBeDecorated(node) {
         switch (node.kind) {
-            case 217 /* ClassDeclaration */:
+            case 220 /* ClassDeclaration */:
                 // classes are valid targets
                 return true;
-            case 142 /* PropertyDeclaration */:
+            case 144 /* PropertyDeclaration */:
                 // property declarations are valid if their parent is a class declaration.
-                return node.parent.kind === 217 /* ClassDeclaration */;
-            case 146 /* GetAccessor */:
-            case 147 /* SetAccessor */:
-            case 144 /* MethodDeclaration */:
+                return node.parent.kind === 220 /* ClassDeclaration */;
+            case 148 /* GetAccessor */:
+            case 149 /* SetAccessor */:
+            case 146 /* MethodDeclaration */:
                 // if this method has a body and its parent is a class declaration, this is a valid target.
                 return node.body !== undefined
-                    && node.parent.kind === 217 /* ClassDeclaration */;
-            case 139 /* Parameter */:
+                    && node.parent.kind === 220 /* ClassDeclaration */;
+            case 141 /* Parameter */:
                 // if the parameter's parent has a body and its grandparent is a class declaration, this is a valid target;
                 return node.parent.body !== undefined
-                    && (node.parent.kind === 145 /* Constructor */
-                        || node.parent.kind === 144 /* MethodDeclaration */
-                        || node.parent.kind === 147 /* SetAccessor */)
-                    && node.parent.parent.kind === 217 /* ClassDeclaration */;
+                    && (node.parent.kind === 147 /* Constructor */
+                        || node.parent.kind === 146 /* MethodDeclaration */
+                        || node.parent.kind === 149 /* SetAccessor */)
+                    && node.parent.parent.kind === 220 /* ClassDeclaration */;
         }
         return false;
     }
@@ -5264,13 +5615,23 @@ var ts;
     }
     ts.nodeIsDecorated = nodeIsDecorated;
     function isPropertyAccessExpression(node) {
-        return node.kind === 169 /* PropertyAccessExpression */;
+        return node.kind === 171 /* PropertyAccessExpression */;
     }
     ts.isPropertyAccessExpression = isPropertyAccessExpression;
     function isElementAccessExpression(node) {
-        return node.kind === 170 /* ElementAccessExpression */;
+        return node.kind === 172 /* ElementAccessExpression */;
     }
     ts.isElementAccessExpression = isElementAccessExpression;
+    function isJSXTagName(node) {
+        var parent = node.parent;
+        if (parent.kind === 242 /* JsxOpeningElement */ ||
+            parent.kind === 241 /* JsxSelfClosingElement */ ||
+            parent.kind === 244 /* JsxClosingElement */) {
+            return parent.tagName === node;
+        }
+        return false;
+    }
+    ts.isJSXTagName = isJSXTagName;
     function isExpression(node) {
         switch (node.kind) {
             case 95 /* SuperKeyword */:
@@ -5278,42 +5639,43 @@ var ts;
             case 99 /* TrueKeyword */:
             case 84 /* FalseKeyword */:
             case 10 /* RegularExpressionLiteral */:
-            case 167 /* ArrayLiteralExpression */:
-            case 168 /* ObjectLiteralExpression */:
-            case 169 /* PropertyAccessExpression */:
-            case 170 /* ElementAccessExpression */:
-            case 171 /* CallExpression */:
-            case 172 /* NewExpression */:
-            case 173 /* TaggedTemplateExpression */:
-            case 192 /* AsExpression */:
-            case 174 /* TypeAssertionExpression */:
-            case 175 /* ParenthesizedExpression */:
-            case 176 /* FunctionExpression */:
-            case 189 /* ClassExpression */:
-            case 177 /* ArrowFunction */:
-            case 180 /* VoidExpression */:
-            case 178 /* DeleteExpression */:
-            case 179 /* TypeOfExpression */:
-            case 182 /* PrefixUnaryExpression */:
-            case 183 /* PostfixUnaryExpression */:
-            case 184 /* BinaryExpression */:
-            case 185 /* ConditionalExpression */:
-            case 188 /* SpreadElementExpression */:
-            case 186 /* TemplateExpression */:
+            case 169 /* ArrayLiteralExpression */:
+            case 170 /* ObjectLiteralExpression */:
+            case 171 /* PropertyAccessExpression */:
+            case 172 /* ElementAccessExpression */:
+            case 173 /* CallExpression */:
+            case 174 /* NewExpression */:
+            case 175 /* TaggedTemplateExpression */:
+            case 194 /* AsExpression */:
+            case 176 /* TypeAssertionExpression */:
+            case 195 /* NonNullExpression */:
+            case 177 /* ParenthesizedExpression */:
+            case 178 /* FunctionExpression */:
+            case 191 /* ClassExpression */:
+            case 179 /* ArrowFunction */:
+            case 182 /* VoidExpression */:
+            case 180 /* DeleteExpression */:
+            case 181 /* TypeOfExpression */:
+            case 184 /* PrefixUnaryExpression */:
+            case 185 /* PostfixUnaryExpression */:
+            case 186 /* BinaryExpression */:
+            case 187 /* ConditionalExpression */:
+            case 190 /* SpreadElementExpression */:
+            case 188 /* TemplateExpression */:
             case 11 /* NoSubstitutionTemplateLiteral */:
-            case 190 /* OmittedExpression */:
-            case 236 /* JsxElement */:
-            case 237 /* JsxSelfClosingElement */:
-            case 187 /* YieldExpression */:
-            case 181 /* AwaitExpression */:
+            case 192 /* OmittedExpression */:
+            case 240 /* JsxElement */:
+            case 241 /* JsxSelfClosingElement */:
+            case 189 /* YieldExpression */:
+            case 183 /* AwaitExpression */:
                 return true;
-            case 136 /* QualifiedName */:
-                while (node.parent.kind === 136 /* QualifiedName */) {
+            case 138 /* QualifiedName */:
+                while (node.parent.kind === 138 /* QualifiedName */) {
                     node = node.parent;
                 }
-                return node.parent.kind === 155 /* TypeQuery */;
+                return node.parent.kind === 157 /* TypeQuery */ || isJSXTagName(node);
             case 69 /* Identifier */:
-                if (node.parent.kind === 155 /* TypeQuery */) {
+                if (node.parent.kind === 157 /* TypeQuery */ || isJSXTagName(node)) {
                     return true;
                 }
             // fall through
@@ -5322,47 +5684,47 @@ var ts;
             case 97 /* ThisKeyword */:
                 var parent_2 = node.parent;
                 switch (parent_2.kind) {
-                    case 214 /* VariableDeclaration */:
-                    case 139 /* Parameter */:
-                    case 142 /* PropertyDeclaration */:
-                    case 141 /* PropertySignature */:
-                    case 250 /* EnumMember */:
-                    case 248 /* PropertyAssignment */:
-                    case 166 /* BindingElement */:
+                    case 217 /* VariableDeclaration */:
+                    case 141 /* Parameter */:
+                    case 144 /* PropertyDeclaration */:
+                    case 143 /* PropertySignature */:
+                    case 254 /* EnumMember */:
+                    case 252 /* PropertyAssignment */:
+                    case 168 /* BindingElement */:
                         return parent_2.initializer === node;
-                    case 198 /* ExpressionStatement */:
-                    case 199 /* IfStatement */:
-                    case 200 /* DoStatement */:
-                    case 201 /* WhileStatement */:
-                    case 207 /* ReturnStatement */:
-                    case 208 /* WithStatement */:
-                    case 209 /* SwitchStatement */:
-                    case 244 /* CaseClause */:
-                    case 211 /* ThrowStatement */:
-                    case 209 /* SwitchStatement */:
+                    case 201 /* ExpressionStatement */:
+                    case 202 /* IfStatement */:
+                    case 203 /* DoStatement */:
+                    case 204 /* WhileStatement */:
+                    case 210 /* ReturnStatement */:
+                    case 211 /* WithStatement */:
+                    case 212 /* SwitchStatement */:
+                    case 248 /* CaseClause */:
+                    case 214 /* ThrowStatement */:
+                    case 212 /* SwitchStatement */:
                         return parent_2.expression === node;
-                    case 202 /* ForStatement */:
+                    case 205 /* ForStatement */:
                         var forStatement = parent_2;
-                        return (forStatement.initializer === node && forStatement.initializer.kind !== 215 /* VariableDeclarationList */) ||
+                        return (forStatement.initializer === node && forStatement.initializer.kind !== 218 /* VariableDeclarationList */) ||
                             forStatement.condition === node ||
                             forStatement.incrementor === node;
-                    case 203 /* ForInStatement */:
-                    case 204 /* ForOfStatement */:
+                    case 206 /* ForInStatement */:
+                    case 207 /* ForOfStatement */:
                         var forInStatement = parent_2;
-                        return (forInStatement.initializer === node && forInStatement.initializer.kind !== 215 /* VariableDeclarationList */) ||
+                        return (forInStatement.initializer === node && forInStatement.initializer.kind !== 218 /* VariableDeclarationList */) ||
                             forInStatement.expression === node;
-                    case 174 /* TypeAssertionExpression */:
-                    case 192 /* AsExpression */:
+                    case 176 /* TypeAssertionExpression */:
+                    case 194 /* AsExpression */:
                         return node === parent_2.expression;
-                    case 193 /* TemplateSpan */:
+                    case 196 /* TemplateSpan */:
                         return node === parent_2.expression;
-                    case 137 /* ComputedPropertyName */:
+                    case 139 /* ComputedPropertyName */:
                         return node === parent_2.expression;
-                    case 140 /* Decorator */:
-                    case 243 /* JsxExpression */:
-                    case 242 /* JsxSpreadAttribute */:
+                    case 142 /* Decorator */:
+                    case 247 /* JsxExpression */:
+                    case 246 /* JsxSpreadAttribute */:
                         return true;
-                    case 191 /* ExpressionWithTypeArguments */:
+                    case 193 /* ExpressionWithTypeArguments */:
                         return parent_2.expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent_2);
                     default:
                         if (isExpression(parent_2)) {
@@ -5386,7 +5748,7 @@ var ts;
     }
     ts.isInstantiatedModule = isInstantiatedModule;
     function isExternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 224 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 235 /* ExternalModuleReference */;
+        return node.kind === 228 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 239 /* ExternalModuleReference */;
     }
     ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
     function getExternalModuleImportEqualsDeclarationExpression(node) {
@@ -5395,7 +5757,7 @@ var ts;
     }
     ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
     function isInternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 224 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 235 /* ExternalModuleReference */;
+        return node.kind === 228 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 239 /* ExternalModuleReference */;
     }
     ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
     function isSourceFileJavaScript(file) {
@@ -5403,31 +5765,34 @@ var ts;
     }
     ts.isSourceFileJavaScript = isSourceFileJavaScript;
     function isInJavaScriptFile(node) {
-        return node && !!(node.parserContextFlags & 32 /* JavaScriptFile */);
+        return node && !!(node.flags & 134217728 /* JavaScriptFile */);
     }
     ts.isInJavaScriptFile = isInJavaScriptFile;
     /**
      * Returns true if the node is a CallExpression to the identifier 'require' with
-     * exactly one string literal argument.
+     * exactly one argument.
      * This function does not test if the node is in a JavaScript file or not.
     */
-    function isRequireCall(expression) {
+    function isRequireCall(expression, checkArgumentIsStringLiteral) {
         // of the form 'require("name")'
-        return expression.kind === 171 /* CallExpression */ &&
+        var isRequire = expression.kind === 173 /* CallExpression */ &&
             expression.expression.kind === 69 /* Identifier */ &&
             expression.expression.text === "require" &&
-            expression.arguments.length === 1 &&
-            expression.arguments[0].kind === 9 /* StringLiteral */;
+            expression.arguments.length === 1;
+        return isRequire && (!checkArgumentIsStringLiteral || expression.arguments[0].kind === 9 /* StringLiteral */);
     }
     ts.isRequireCall = isRequireCall;
     /// Given a BinaryExpression, returns SpecialPropertyAssignmentKind for the various kinds of property
     /// assignments we treat as special in the binder
     function getSpecialPropertyAssignmentKind(expression) {
-        if (expression.kind !== 184 /* BinaryExpression */) {
+        if (!isInJavaScriptFile(expression)) {
+            return 0 /* None */;
+        }
+        if (expression.kind !== 186 /* BinaryExpression */) {
             return 0 /* None */;
         }
         var expr = expression;
-        if (expr.operatorToken.kind !== 56 /* EqualsToken */ || expr.left.kind !== 169 /* PropertyAccessExpression */) {
+        if (expr.operatorToken.kind !== 56 /* EqualsToken */ || expr.left.kind !== 171 /* PropertyAccessExpression */) {
             return 0 /* None */;
         }
         var lhs = expr.left;
@@ -5445,7 +5810,7 @@ var ts;
         else if (lhs.expression.kind === 97 /* ThisKeyword */) {
             return 4 /* ThisProperty */;
         }
-        else if (lhs.expression.kind === 169 /* PropertyAccessExpression */) {
+        else if (lhs.expression.kind === 171 /* PropertyAccessExpression */) {
             // chained dot, e.g. x.y.z = expr; this var is the 'x.y' part
             var innerPropertyAccess = lhs.expression;
             if (innerPropertyAccess.expression.kind === 69 /* Identifier */ && innerPropertyAccess.name.text === "prototype") {
@@ -5456,19 +5821,19 @@ var ts;
     }
     ts.getSpecialPropertyAssignmentKind = getSpecialPropertyAssignmentKind;
     function getExternalModuleName(node) {
-        if (node.kind === 225 /* ImportDeclaration */) {
+        if (node.kind === 229 /* ImportDeclaration */) {
             return node.moduleSpecifier;
         }
-        if (node.kind === 224 /* ImportEqualsDeclaration */) {
+        if (node.kind === 228 /* ImportEqualsDeclaration */) {
             var reference = node.moduleReference;
-            if (reference.kind === 235 /* ExternalModuleReference */) {
+            if (reference.kind === 239 /* ExternalModuleReference */) {
                 return reference.expression;
             }
         }
-        if (node.kind === 231 /* ExportDeclaration */) {
+        if (node.kind === 235 /* ExportDeclaration */) {
             return node.moduleSpecifier;
         }
-        if (node.kind === 221 /* ModuleDeclaration */ && node.name.kind === 9 /* StringLiteral */) {
+        if (node.kind === 224 /* ModuleDeclaration */ && node.name.kind === 9 /* StringLiteral */) {
             return node.name;
         }
     }
@@ -5476,13 +5841,13 @@ var ts;
     function hasQuestionToken(node) {
         if (node) {
             switch (node.kind) {
-                case 139 /* Parameter */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
-                case 249 /* ShorthandPropertyAssignment */:
-                case 248 /* PropertyAssignment */:
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
+                case 141 /* Parameter */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
+                case 253 /* ShorthandPropertyAssignment */:
+                case 252 /* PropertyAssignment */:
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
                     return node.questionToken !== undefined;
             }
         }
@@ -5490,31 +5855,70 @@ var ts;
     }
     ts.hasQuestionToken = hasQuestionToken;
     function isJSDocConstructSignature(node) {
-        return node.kind === 264 /* JSDocFunctionType */ &&
+        return node.kind === 268 /* JSDocFunctionType */ &&
             node.parameters.length > 0 &&
-            node.parameters[0].type.kind === 266 /* JSDocConstructorType */;
+            node.parameters[0].type.kind === 270 /* JSDocConstructorType */;
     }
     ts.isJSDocConstructSignature = isJSDocConstructSignature;
-    function getJSDocTag(node, kind) {
-        if (node && node.jsDocComment) {
-            for (var _i = 0, _a = node.jsDocComment.tags; _i < _a.length; _i++) {
-                var tag = _a[_i];
-                if (tag.kind === kind) {
-                    return tag;
-                }
+    function getJSDocTag(node, kind, checkParentVariableStatement) {
+        if (!node) {
+            return undefined;
+        }
+        var jsDocComment = getJSDocComment(node, checkParentVariableStatement);
+        if (!jsDocComment) {
+            return undefined;
+        }
+        for (var _i = 0, _a = jsDocComment.tags; _i < _a.length; _i++) {
+            var tag = _a[_i];
+            if (tag.kind === kind) {
+                return tag;
             }
         }
     }
+    function getJSDocComment(node, checkParentVariableStatement) {
+        if (node.jsDocComment) {
+            return node.jsDocComment;
+        }
+        // Try to recognize this pattern when node is initializer of variable declaration and JSDoc comments are on containing variable statement. 
+        // /** 
+        //   * @param {number} name
+        //   * @returns {number} 
+        //   */
+        // var x = function(name) { return name.length; }
+        if (checkParentVariableStatement) {
+            var isInitializerOfVariableDeclarationInStatement = node.parent.kind === 217 /* VariableDeclaration */ &&
+                node.parent.initializer === node &&
+                node.parent.parent.parent.kind === 199 /* VariableStatement */;
+            var variableStatementNode = isInitializerOfVariableDeclarationInStatement ? node.parent.parent.parent : undefined;
+            if (variableStatementNode) {
+                return variableStatementNode.jsDocComment;
+            }
+            // Also recognize when the node is the RHS of an assignment expression
+            var parent_3 = node.parent;
+            var isSourceOfAssignmentExpressionStatement = parent_3 && parent_3.parent &&
+                parent_3.kind === 186 /* BinaryExpression */ &&
+                parent_3.operatorToken.kind === 56 /* EqualsToken */ &&
+                parent_3.parent.kind === 201 /* ExpressionStatement */;
+            if (isSourceOfAssignmentExpressionStatement) {
+                return parent_3.parent.jsDocComment;
+            }
+            var isPropertyAssignmentExpression = parent_3 && parent_3.kind === 252 /* PropertyAssignment */;
+            if (isPropertyAssignmentExpression) {
+                return parent_3.jsDocComment;
+            }
+        }
+        return undefined;
+    }
     function getJSDocTypeTag(node) {
-        return getJSDocTag(node, 272 /* JSDocTypeTag */);
+        return getJSDocTag(node, 276 /* JSDocTypeTag */, /*checkParentVariableStatement*/ false);
     }
     ts.getJSDocTypeTag = getJSDocTypeTag;
     function getJSDocReturnTag(node) {
-        return getJSDocTag(node, 271 /* JSDocReturnTag */);
+        return getJSDocTag(node, 275 /* JSDocReturnTag */, /*checkParentVariableStatement*/ true);
     }
     ts.getJSDocReturnTag = getJSDocReturnTag;
     function getJSDocTemplateTag(node) {
-        return getJSDocTag(node, 273 /* JSDocTemplateTag */);
+        return getJSDocTag(node, 277 /* JSDocTemplateTag */, /*checkParentVariableStatement*/ false);
     }
     ts.getJSDocTemplateTag = getJSDocTemplateTag;
     function getCorrespondingJSDocParameterTag(parameter) {
@@ -5522,19 +5926,21 @@ var ts;
             // If it's a parameter, see if the parent has a jsdoc comment with an @param
             // annotation.
             var parameterName = parameter.name.text;
-            var docComment = parameter.parent.jsDocComment;
-            if (docComment) {
-                return ts.forEach(docComment.tags, function (t) {
-                    if (t.kind === 270 /* JSDocParameterTag */) {
-                        var parameterTag = t;
+            var jsDocComment = getJSDocComment(parameter.parent, /*checkParentVariableStatement*/ true);
+            if (jsDocComment) {
+                for (var _i = 0, _a = jsDocComment.tags; _i < _a.length; _i++) {
+                    var tag = _a[_i];
+                    if (tag.kind === 274 /* JSDocParameterTag */) {
+                        var parameterTag = tag;
                         var name_6 = parameterTag.preParameterName || parameterTag.postParameterName;
                         if (name_6.text === parameterName) {
-                            return t;
+                            return parameterTag;
                         }
                     }
-                });
+                }
             }
         }
+        return undefined;
     }
     ts.getCorrespondingJSDocParameterTag = getCorrespondingJSDocParameterTag;
     function hasRestParameter(s) {
@@ -5543,13 +5949,13 @@ var ts;
     ts.hasRestParameter = hasRestParameter;
     function isRestParameter(node) {
         if (node) {
-            if (node.parserContextFlags & 32 /* JavaScriptFile */) {
-                if (node.type && node.type.kind === 265 /* JSDocVariadicType */) {
+            if (node.flags & 134217728 /* JavaScriptFile */) {
+                if (node.type && node.type.kind === 269 /* JSDocVariadicType */) {
                     return true;
                 }
                 var paramTag = getCorrespondingJSDocParameterTag(node);
                 if (paramTag && paramTag.typeExpression) {
-                    return paramTag.typeExpression.type.kind === 265 /* JSDocVariadicType */;
+                    return paramTag.typeExpression.type.kind === 269 /* JSDocVariadicType */;
                 }
             }
             return node.dotDotDotToken !== undefined;
@@ -5570,7 +5976,7 @@ var ts;
     }
     ts.isTemplateLiteralKind = isTemplateLiteralKind;
     function isBindingPattern(node) {
-        return !!node && (node.kind === 165 /* ArrayBindingPattern */ || node.kind === 164 /* ObjectBindingPattern */);
+        return !!node && (node.kind === 167 /* ArrayBindingPattern */ || node.kind === 166 /* ObjectBindingPattern */);
     }
     ts.isBindingPattern = isBindingPattern;
     function isNodeDescendentOf(node, ancestor) {
@@ -5584,7 +5990,7 @@ var ts;
     ts.isNodeDescendentOf = isNodeDescendentOf;
     function isInAmbientContext(node) {
         while (node) {
-            if (node.flags & (4 /* Ambient */ | 4096 /* DeclarationFile */)) {
+            if (node.flags & 2 /* Ambient */ || (node.kind === 255 /* SourceFile */ && node.isDeclarationFile)) {
                 return true;
             }
             node = node.parent;
@@ -5594,34 +6000,34 @@ var ts;
     ts.isInAmbientContext = isInAmbientContext;
     function isDeclaration(node) {
         switch (node.kind) {
-            case 177 /* ArrowFunction */:
-            case 166 /* BindingElement */:
-            case 217 /* ClassDeclaration */:
-            case 189 /* ClassExpression */:
-            case 145 /* Constructor */:
-            case 220 /* EnumDeclaration */:
-            case 250 /* EnumMember */:
-            case 233 /* ExportSpecifier */:
-            case 216 /* FunctionDeclaration */:
-            case 176 /* FunctionExpression */:
-            case 146 /* GetAccessor */:
-            case 226 /* ImportClause */:
-            case 224 /* ImportEqualsDeclaration */:
-            case 229 /* ImportSpecifier */:
-            case 218 /* InterfaceDeclaration */:
-            case 144 /* MethodDeclaration */:
-            case 143 /* MethodSignature */:
-            case 221 /* ModuleDeclaration */:
-            case 227 /* NamespaceImport */:
-            case 139 /* Parameter */:
-            case 248 /* PropertyAssignment */:
-            case 142 /* PropertyDeclaration */:
-            case 141 /* PropertySignature */:
-            case 147 /* SetAccessor */:
-            case 249 /* ShorthandPropertyAssignment */:
-            case 219 /* TypeAliasDeclaration */:
-            case 138 /* TypeParameter */:
-            case 214 /* VariableDeclaration */:
+            case 179 /* ArrowFunction */:
+            case 168 /* BindingElement */:
+            case 220 /* ClassDeclaration */:
+            case 191 /* ClassExpression */:
+            case 147 /* Constructor */:
+            case 223 /* EnumDeclaration */:
+            case 254 /* EnumMember */:
+            case 237 /* ExportSpecifier */:
+            case 219 /* FunctionDeclaration */:
+            case 178 /* FunctionExpression */:
+            case 148 /* GetAccessor */:
+            case 230 /* ImportClause */:
+            case 228 /* ImportEqualsDeclaration */:
+            case 233 /* ImportSpecifier */:
+            case 221 /* InterfaceDeclaration */:
+            case 146 /* MethodDeclaration */:
+            case 145 /* MethodSignature */:
+            case 224 /* ModuleDeclaration */:
+            case 231 /* NamespaceImport */:
+            case 141 /* Parameter */:
+            case 252 /* PropertyAssignment */:
+            case 144 /* PropertyDeclaration */:
+            case 143 /* PropertySignature */:
+            case 149 /* SetAccessor */:
+            case 253 /* ShorthandPropertyAssignment */:
+            case 222 /* TypeAliasDeclaration */:
+            case 140 /* TypeParameter */:
+            case 217 /* VariableDeclaration */:
                 return true;
         }
         return false;
@@ -5629,25 +6035,25 @@ var ts;
     ts.isDeclaration = isDeclaration;
     function isStatement(n) {
         switch (n.kind) {
-            case 206 /* BreakStatement */:
-            case 205 /* ContinueStatement */:
-            case 213 /* DebuggerStatement */:
-            case 200 /* DoStatement */:
-            case 198 /* ExpressionStatement */:
-            case 197 /* EmptyStatement */:
-            case 203 /* ForInStatement */:
-            case 204 /* ForOfStatement */:
-            case 202 /* ForStatement */:
-            case 199 /* IfStatement */:
-            case 210 /* LabeledStatement */:
-            case 207 /* ReturnStatement */:
-            case 209 /* SwitchStatement */:
-            case 211 /* ThrowStatement */:
-            case 212 /* TryStatement */:
-            case 196 /* VariableStatement */:
-            case 201 /* WhileStatement */:
-            case 208 /* WithStatement */:
-            case 230 /* ExportAssignment */:
+            case 209 /* BreakStatement */:
+            case 208 /* ContinueStatement */:
+            case 216 /* DebuggerStatement */:
+            case 203 /* DoStatement */:
+            case 201 /* ExpressionStatement */:
+            case 200 /* EmptyStatement */:
+            case 206 /* ForInStatement */:
+            case 207 /* ForOfStatement */:
+            case 205 /* ForStatement */:
+            case 202 /* IfStatement */:
+            case 213 /* LabeledStatement */:
+            case 210 /* ReturnStatement */:
+            case 212 /* SwitchStatement */:
+            case 214 /* ThrowStatement */:
+            case 215 /* TryStatement */:
+            case 199 /* VariableStatement */:
+            case 204 /* WhileStatement */:
+            case 211 /* WithStatement */:
+            case 234 /* ExportAssignment */:
                 return true;
             default:
                 return false;
@@ -5656,13 +6062,13 @@ var ts;
     ts.isStatement = isStatement;
     function isClassElement(n) {
         switch (n.kind) {
-            case 145 /* Constructor */:
-            case 142 /* PropertyDeclaration */:
-            case 144 /* MethodDeclaration */:
-            case 146 /* GetAccessor */:
-            case 147 /* SetAccessor */:
-            case 143 /* MethodSignature */:
-            case 150 /* IndexSignature */:
+            case 147 /* Constructor */:
+            case 144 /* PropertyDeclaration */:
+            case 146 /* MethodDeclaration */:
+            case 148 /* GetAccessor */:
+            case 149 /* SetAccessor */:
+            case 145 /* MethodSignature */:
+            case 152 /* IndexSignature */:
                 return true;
             default:
                 return false;
@@ -5675,7 +6081,7 @@ var ts;
             return false;
         }
         var parent = name.parent;
-        if (parent.kind === 229 /* ImportSpecifier */ || parent.kind === 233 /* ExportSpecifier */) {
+        if (parent.kind === 233 /* ImportSpecifier */ || parent.kind === 237 /* ExportSpecifier */) {
             if (parent.propertyName) {
                 return true;
             }
@@ -5690,31 +6096,31 @@ var ts;
     function isIdentifierName(node) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 142 /* PropertyDeclaration */:
-            case 141 /* PropertySignature */:
-            case 144 /* MethodDeclaration */:
-            case 143 /* MethodSignature */:
-            case 146 /* GetAccessor */:
-            case 147 /* SetAccessor */:
-            case 250 /* EnumMember */:
-            case 248 /* PropertyAssignment */:
-            case 169 /* PropertyAccessExpression */:
+            case 144 /* PropertyDeclaration */:
+            case 143 /* PropertySignature */:
+            case 146 /* MethodDeclaration */:
+            case 145 /* MethodSignature */:
+            case 148 /* GetAccessor */:
+            case 149 /* SetAccessor */:
+            case 254 /* EnumMember */:
+            case 252 /* PropertyAssignment */:
+            case 171 /* PropertyAccessExpression */:
                 // Name in member declaration or property name in property access
                 return parent.name === node;
-            case 136 /* QualifiedName */:
+            case 138 /* QualifiedName */:
                 // Name on right hand side of dot in a type query
                 if (parent.right === node) {
-                    while (parent.kind === 136 /* QualifiedName */) {
+                    while (parent.kind === 138 /* QualifiedName */) {
                         parent = parent.parent;
                     }
-                    return parent.kind === 155 /* TypeQuery */;
+                    return parent.kind === 157 /* TypeQuery */;
                 }
                 return false;
-            case 166 /* BindingElement */:
-            case 229 /* ImportSpecifier */:
+            case 168 /* BindingElement */:
+            case 233 /* ImportSpecifier */:
                 // Property name in binding element or import specifier
                 return parent.propertyName === node;
-            case 233 /* ExportSpecifier */:
+            case 237 /* ExportSpecifier */:
                 // Any name in an export specifier
                 return true;
         }
@@ -5730,12 +6136,13 @@ var ts;
     // export = ...
     // export default ...
     function isAliasSymbolDeclaration(node) {
-        return node.kind === 224 /* ImportEqualsDeclaration */ ||
-            node.kind === 226 /* ImportClause */ && !!node.name ||
-            node.kind === 227 /* NamespaceImport */ ||
-            node.kind === 229 /* ImportSpecifier */ ||
-            node.kind === 233 /* ExportSpecifier */ ||
-            node.kind === 230 /* ExportAssignment */ && node.expression.kind === 69 /* Identifier */;
+        return node.kind === 228 /* ImportEqualsDeclaration */ ||
+            node.kind === 227 /* GlobalModuleExportDeclaration */ ||
+            node.kind === 230 /* ImportClause */ && !!node.name ||
+            node.kind === 231 /* NamespaceImport */ ||
+            node.kind === 233 /* ImportSpecifier */ ||
+            node.kind === 237 /* ExportSpecifier */ ||
+            node.kind === 234 /* ExportAssignment */ && node.expression.kind === 69 /* Identifier */;
     }
     ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
     function getClassExtendsHeritageClauseElement(node) {
@@ -5792,32 +6199,32 @@ var ts;
                 };
             }
             else {
-                var matchResult = ts.fullTripleSlashReferencePathRegEx.exec(comment);
-                if (matchResult) {
+                var refMatchResult = ts.fullTripleSlashReferencePathRegEx.exec(comment);
+                var refLibResult = !refMatchResult && ts.fullTripleSlashReferenceTypeReferenceDirectiveRegEx.exec(comment);
+                if (refMatchResult || refLibResult) {
                     var start = commentRange.pos;
                     var end = commentRange.end;
                     return {
                         fileReference: {
                             pos: start,
                             end: end,
-                            fileName: matchResult[3]
+                            fileName: (refMatchResult || refLibResult)[3]
                         },
-                        isNoDefaultLib: false
-                    };
-                }
-                else {
-                    return {
-                        diagnosticMessage: ts.Diagnostics.Invalid_reference_directive_syntax,
-                        isNoDefaultLib: false
+                        isNoDefaultLib: false,
+                        isTypeReferenceDirective: !!refLibResult
                     };
                 }
+                return {
+                    diagnosticMessage: ts.Diagnostics.Invalid_reference_directive_syntax,
+                    isNoDefaultLib: false
+                };
             }
         }
         return undefined;
     }
     ts.getFileReferenceFromReferencePath = getFileReferenceFromReferencePath;
     function isKeyword(token) {
-        return 70 /* FirstKeyword */ <= token && token <= 135 /* LastKeyword */;
+        return 70 /* FirstKeyword */ <= token && token <= 137 /* LastKeyword */;
     }
     ts.isKeyword = isKeyword;
     function isTrivia(token) {
@@ -5844,7 +6251,7 @@ var ts;
     }
     ts.hasDynamicName = hasDynamicName;
     function isDynamicName(name) {
-        return name.kind === 137 /* ComputedPropertyName */ &&
+        return name.kind === 139 /* ComputedPropertyName */ &&
             !isStringOrNumericLiteral(name.expression.kind) &&
             !isWellKnownSymbolSyntactically(name.expression);
     }
@@ -5862,7 +6269,7 @@ var ts;
         if (name.kind === 69 /* Identifier */ || name.kind === 9 /* StringLiteral */ || name.kind === 8 /* NumericLiteral */) {
             return name.text;
         }
-        if (name.kind === 137 /* ComputedPropertyName */) {
+        if (name.kind === 139 /* ComputedPropertyName */) {
             var nameExpression = name.expression;
             if (isWellKnownSymbolSyntactically(nameExpression)) {
                 var rightHandSideName = nameExpression.name.text;
@@ -5894,6 +6301,7 @@ var ts;
             case 112 /* PublicKeyword */:
             case 110 /* PrivateKeyword */:
             case 111 /* ProtectedKeyword */:
+            case 127 /* ReadonlyKeyword */:
             case 113 /* StaticKeyword */:
                 return true;
         }
@@ -5902,18 +6310,18 @@ var ts;
     ts.isModifierKind = isModifierKind;
     function isParameterDeclaration(node) {
         var root = getRootDeclaration(node);
-        return root.kind === 139 /* Parameter */;
+        return root.kind === 141 /* Parameter */;
     }
     ts.isParameterDeclaration = isParameterDeclaration;
     function getRootDeclaration(node) {
-        while (node.kind === 166 /* BindingElement */) {
+        while (node.kind === 168 /* BindingElement */) {
             node = node.parent.parent;
         }
         return node;
     }
     ts.getRootDeclaration = getRootDeclaration;
     function nodeStartsNewLexicalEnvironment(n) {
-        return isFunctionLike(n) || n.kind === 221 /* ModuleDeclaration */ || n.kind === 251 /* SourceFile */;
+        return isFunctionLike(n) || n.kind === 224 /* ModuleDeclaration */ || n.kind === 255 /* SourceFile */;
     }
     ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
     /**
@@ -5963,7 +6371,7 @@ var ts;
     }
     ts.cloneEntityName = cloneEntityName;
     function isQualifiedName(node) {
-        return node.kind === 136 /* QualifiedName */;
+        return node.kind === 138 /* QualifiedName */;
     }
     ts.isQualifiedName = isQualifiedName;
     function nodeIsSynthesized(node) {
@@ -6214,14 +6622,25 @@ var ts;
         return emitOutputFilePathWithoutExtension + extension;
     }
     ts.getOwnEmitOutputFilePath = getOwnEmitOutputFilePath;
+    function getDeclarationEmitOutputFilePath(sourceFile, host) {
+        var options = host.getCompilerOptions();
+        var outputDir = options.declarationDir || options.outDir; // Prefer declaration folder if specified
+        if (options.declaration) {
+            var path = outputDir
+                ? getSourceFilePathInNewDir(sourceFile, host, outputDir)
+                : sourceFile.fileName;
+            return ts.removeFileExtension(path) + ".d.ts";
+        }
+    }
+    ts.getDeclarationEmitOutputFilePath = getDeclarationEmitOutputFilePath;
     function getEmitScriptTarget(compilerOptions) {
         return compilerOptions.target || 0 /* ES3 */;
     }
     ts.getEmitScriptTarget = getEmitScriptTarget;
     function getEmitModuleKind(compilerOptions) {
-        return compilerOptions.module ?
+        return typeof compilerOptions.module === "number" ?
             compilerOptions.module :
-            getEmitScriptTarget(compilerOptions) === 2 /* ES6 */ ? 5 /* ES6 */ : 0 /* None */;
+            getEmitScriptTarget(compilerOptions) === 2 /* ES6 */ ? ts.ModuleKind.ES6 : ts.ModuleKind.CommonJS;
     }
     ts.getEmitModuleKind = getEmitModuleKind;
     function forEachExpectedEmitFile(host, action, targetSourceFile) {
@@ -6240,25 +6659,41 @@ var ts;
             }
         }
         function onSingleFileEmit(host, sourceFile) {
-            var jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, sourceFile.languageVariant === 1 /* JSX */ && options.jsx === 1 /* Preserve */ ? ".jsx" : ".js");
+            // 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
+            var extension = ".js";
+            if (options.jsx === 1 /* Preserve */) {
+                if (isSourceFileJavaScript(sourceFile)) {
+                    if (ts.fileExtensionIs(sourceFile.fileName, ".jsx")) {
+                        extension = ".jsx";
+                    }
+                }
+                else if (sourceFile.languageVariant === 1 /* JSX */) {
+                    // TypeScript source file preserving JSX syntax
+                    extension = ".jsx";
+                }
+            }
+            var jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, extension);
             var emitFileNames = {
                 jsFilePath: jsFilePath,
                 sourceMapFilePath: getSourceMapFilePath(jsFilePath, options),
-                declarationFilePath: !isSourceFileJavaScript(sourceFile) ? getDeclarationEmitFilePath(jsFilePath, options) : undefined
+                declarationFilePath: !isSourceFileJavaScript(sourceFile) ? getDeclarationEmitOutputFilePath(sourceFile, host) : undefined
             };
             action(emitFileNames, [sourceFile], /*isBundledEmit*/ false);
         }
         function onBundledEmit(host) {
             // Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified
-            var bundledSources = ts.filter(host.getSourceFiles(), function (sourceFile) { return !isDeclarationFile(sourceFile) &&
-                (!isExternalModule(sourceFile) ||
-                    (getEmitModuleKind(options) && isExternalModule(sourceFile))); }); // module that can emit - note falsy value from getEmitModuleKind means the module kind that shouldn't be emitted
+            var bundledSources = ts.filter(host.getSourceFiles(), function (sourceFile) {
+                return !isDeclarationFile(sourceFile) // Not a declaration file
+                    && (!ts.isExternalModule(sourceFile) || !!getEmitModuleKind(options));
+            }); // and not a module, unless module emit enabled
             if (bundledSources.length) {
                 var jsFilePath = options.outFile || options.out;
                 var emitFileNames = {
                     jsFilePath: jsFilePath,
                     sourceMapFilePath: getSourceMapFilePath(jsFilePath, options),
-                    declarationFilePath: getDeclarationEmitFilePath(jsFilePath, options)
+                    declarationFilePath: options.declaration ? ts.removeFileExtension(jsFilePath) + ".d.ts" : undefined
                 };
                 action(emitFileNames, bundledSources, /*isBundledEmit*/ true);
             }
@@ -6266,9 +6701,6 @@ var ts;
         function getSourceMapFilePath(jsFilePath, options) {
             return options.sourceMap ? jsFilePath + ".map" : undefined;
         }
-        function getDeclarationEmitFilePath(jsFilePath, options) {
-            return options.declaration ? ts.removeFileExtension(jsFilePath) + ".d.ts" : undefined;
-        }
     }
     ts.forEachExpectedEmitFile = forEachExpectedEmitFile;
     function getSourceFilePathInNewDir(sourceFile, host, newDirPath) {
@@ -6277,10 +6709,10 @@ var ts;
         return ts.combinePaths(newDirPath, sourceFilePath);
     }
     ts.getSourceFilePathInNewDir = getSourceFilePathInNewDir;
-    function writeFile(host, diagnostics, fileName, data, writeByteOrderMark) {
+    function writeFile(host, diagnostics, fileName, data, writeByteOrderMark, sourceFiles) {
         host.writeFile(fileName, data, writeByteOrderMark, function (hostErrorMessage) {
             diagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Could_not_write_file_0_Colon_1, fileName, hostErrorMessage));
-        });
+        }, sourceFiles);
     }
     ts.writeFile = writeFile;
     function getLineOfLocalPosition(currentSourceFile, pos) {
@@ -6293,7 +6725,7 @@ var ts;
     ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap;
     function getFirstConstructorWithBody(node) {
         return ts.forEach(node.members, function (member) {
-            if (member.kind === 145 /* Constructor */ && nodeIsPresent(member.body)) {
+            if (member.kind === 147 /* Constructor */ && nodeIsPresent(member.body)) {
                 return member;
             }
         });
@@ -6310,10 +6742,10 @@ var ts;
         var setAccessor;
         if (hasDynamicName(accessor)) {
             firstAccessor = accessor;
-            if (accessor.kind === 146 /* GetAccessor */) {
+            if (accessor.kind === 148 /* GetAccessor */) {
                 getAccessor = accessor;
             }
-            else if (accessor.kind === 147 /* SetAccessor */) {
+            else if (accessor.kind === 149 /* SetAccessor */) {
                 setAccessor = accessor;
             }
             else {
@@ -6322,8 +6754,8 @@ var ts;
         }
         else {
             ts.forEach(declarations, function (member) {
-                if ((member.kind === 146 /* GetAccessor */ || member.kind === 147 /* SetAccessor */)
-                    && (member.flags & 64 /* Static */) === (accessor.flags & 64 /* Static */)) {
+                if ((member.kind === 148 /* GetAccessor */ || member.kind === 149 /* SetAccessor */)
+                    && (member.flags & 32 /* Static */) === (accessor.flags & 32 /* Static */)) {
                     var memberName = getPropertyNameForPropertyNameNode(member.name);
                     var accessorName = getPropertyNameForPropertyNameNode(accessor.name);
                     if (memberName === accessorName) {
@@ -6333,10 +6765,10 @@ var ts;
                         else if (!secondAccessor) {
                             secondAccessor = member;
                         }
-                        if (member.kind === 146 /* GetAccessor */ && !getAccessor) {
+                        if (member.kind === 148 /* GetAccessor */ && !getAccessor) {
                             getAccessor = member;
                         }
-                        if (member.kind === 147 /* SetAccessor */ && !setAccessor) {
+                        if (member.kind === 149 /* SetAccessor */ && !setAccessor) {
                             setAccessor = member;
                         }
                     }
@@ -6403,7 +6835,7 @@ var ts;
         }
         if (leadingComments) {
             var detachedComments = [];
-            var lastComment;
+            var lastComment = void 0;
             for (var _i = 0, leadingComments_1 = leadingComments; _i < leadingComments_1.length; _i++) {
                 var comment = leadingComments_1[_i];
                 if (lastComment) {
@@ -6444,7 +6876,7 @@ var ts;
         if (text.charCodeAt(comment.pos + 1) === 42 /* asterisk */) {
             var firstCommentLineAndCharacter = ts.computeLineAndCharacterOfPosition(lineMap, comment.pos);
             var lineCount = lineMap.length;
-            var firstCommentLineIndent;
+            var firstCommentLineIndent = void 0;
             for (var pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) {
                 var nextLineStart = (currentLine + 1) === lineCount
                     ? text.length + 1
@@ -6529,16 +6961,17 @@ var ts;
     }
     function modifierToFlag(token) {
         switch (token) {
-            case 113 /* StaticKeyword */: return 64 /* Static */;
-            case 112 /* PublicKeyword */: return 8 /* Public */;
-            case 111 /* ProtectedKeyword */: return 32 /* Protected */;
-            case 110 /* PrivateKeyword */: return 16 /* Private */;
+            case 113 /* StaticKeyword */: return 32 /* Static */;
+            case 112 /* PublicKeyword */: return 4 /* Public */;
+            case 111 /* ProtectedKeyword */: return 16 /* Protected */;
+            case 110 /* PrivateKeyword */: return 8 /* Private */;
             case 115 /* AbstractKeyword */: return 128 /* Abstract */;
-            case 82 /* ExportKeyword */: return 2 /* Export */;
-            case 122 /* DeclareKeyword */: return 4 /* Ambient */;
-            case 74 /* ConstKeyword */: return 16384 /* Const */;
+            case 82 /* ExportKeyword */: return 1 /* Export */;
+            case 122 /* DeclareKeyword */: return 2 /* Ambient */;
+            case 74 /* ConstKeyword */: return 2048 /* Const */;
             case 77 /* DefaultKeyword */: return 512 /* Default */;
             case 118 /* AsyncKeyword */: return 256 /* Async */;
+            case 127 /* ReadonlyKeyword */: return 64 /* Readonly */;
         }
         return 0;
     }
@@ -6546,24 +6979,25 @@ var ts;
     function isLeftHandSideExpression(expr) {
         if (expr) {
             switch (expr.kind) {
-                case 169 /* PropertyAccessExpression */:
-                case 170 /* ElementAccessExpression */:
-                case 172 /* NewExpression */:
-                case 171 /* CallExpression */:
-                case 236 /* JsxElement */:
-                case 237 /* JsxSelfClosingElement */:
-                case 173 /* TaggedTemplateExpression */:
-                case 167 /* ArrayLiteralExpression */:
-                case 175 /* ParenthesizedExpression */:
-                case 168 /* ObjectLiteralExpression */:
-                case 189 /* ClassExpression */:
-                case 176 /* FunctionExpression */:
+                case 171 /* PropertyAccessExpression */:
+                case 172 /* ElementAccessExpression */:
+                case 174 /* NewExpression */:
+                case 173 /* CallExpression */:
+                case 195 /* NonNullExpression */:
+                case 240 /* JsxElement */:
+                case 241 /* JsxSelfClosingElement */:
+                case 175 /* TaggedTemplateExpression */:
+                case 169 /* ArrayLiteralExpression */:
+                case 177 /* ParenthesizedExpression */:
+                case 170 /* ObjectLiteralExpression */:
+                case 191 /* ClassExpression */:
+                case 178 /* FunctionExpression */:
                 case 69 /* Identifier */:
                 case 10 /* RegularExpressionLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* StringLiteral */:
                 case 11 /* NoSubstitutionTemplateLiteral */:
-                case 186 /* TemplateExpression */:
+                case 188 /* TemplateExpression */:
                 case 84 /* FalseKeyword */:
                 case 93 /* NullKeyword */:
                 case 97 /* ThisKeyword */:
@@ -6580,7 +7014,7 @@ var ts;
     }
     ts.isAssignmentOperator = isAssignmentOperator;
     function isExpressionWithTypeArgumentsInClassExtendsClause(node) {
-        return node.kind === 191 /* ExpressionWithTypeArguments */ &&
+        return node.kind === 193 /* ExpressionWithTypeArguments */ &&
             node.parent.token === 83 /* ExtendsKeyword */ &&
             isClassLike(node.parent.parent);
     }
@@ -6603,16 +7037,16 @@ var ts;
         }
     }
     function isRightSideOfQualifiedNameOrPropertyAccess(node) {
-        return (node.parent.kind === 136 /* QualifiedName */ && node.parent.right === node) ||
-            (node.parent.kind === 169 /* PropertyAccessExpression */ && node.parent.name === node);
+        return (node.parent.kind === 138 /* QualifiedName */ && node.parent.right === node) ||
+            (node.parent.kind === 171 /* PropertyAccessExpression */ && node.parent.name === node);
     }
     ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess;
     function isEmptyObjectLiteralOrArrayLiteral(expression) {
         var kind = expression.kind;
-        if (kind === 168 /* ObjectLiteralExpression */) {
+        if (kind === 170 /* ObjectLiteralExpression */) {
             return expression.properties.length === 0;
         }
-        if (kind === 167 /* ArrayLiteralExpression */) {
+        if (kind === 169 /* ArrayLiteralExpression */) {
             return expression.elements.length === 0;
         }
         return false;
@@ -6726,7 +7160,7 @@ var ts;
             else if (i + 2 >= length) {
                 byte4 = 64;
             }
-            // Write to the ouput
+            // Write to the output
             result += base64Digits.charAt(byte1) + base64Digits.charAt(byte2) + base64Digits.charAt(byte3) + base64Digits.charAt(byte4);
             i += 3;
         }
@@ -6754,6 +7188,11 @@ var ts;
         return carriageReturnLineFeed;
     }
     ts.getNewLineCharacter = getNewLineCharacter;
+    function isWatchSet(options) {
+        // Firefox has Object.prototype.watch
+        return options.watch && options.hasOwnProperty("watch");
+    }
+    ts.isWatchSet = isWatchSet;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -6912,9 +7351,9 @@ var ts;
             //                .                    |                                      \
             //      ----------------------------------------------------------------------*--------------------------------
             //
-            // (Note the dots represent the newly inferrred start.
+            // (Note the dots represent the newly inferred start.
             // Determining the new and old end is also pretty simple.  Basically it boils down to paying attention to the
-            // absolute positions at the asterixes, and the relative change between the dollar signs. Basically, we see
+            // absolute positions at the asterisks, and the relative change between the dollar signs. Basically, we see
             // which if the two $'s precedes the other, and we move that one forward until they line up.  in this case that
             // means:
             //
@@ -6937,8 +7376,8 @@ var ts;
             // ended with a delta of 20 characters (60 - 40).  Thus, if we go back in time to where the first edit started
             // that's the same as if we started at char 80 instead of 60.
             //
-            // As it so happens, the same logic applies if the second edit precedes the first edit.  In that case rahter
-            // than pusing the first edit forward to match the second, we'll push the second edit forward to match the
+            // As it so happens, the same logic applies if the second edit precedes the first edit.  In that case rather
+            // than pushing the first edit forward to match the second, we'll push the second edit forward to match the
             // first.
             //
             // In this case that means we have { oldStart: 10, oldEnd: 80, newEnd: 70 } or, in TextChangeRange
@@ -6967,9 +7406,9 @@ var ts;
     }
     ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
     function getTypeParameterOwner(d) {
-        if (d && d.kind === 138 /* TypeParameter */) {
+        if (d && d.kind === 140 /* TypeParameter */) {
             for (var current = d; current; current = current.parent) {
-                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 218 /* InterfaceDeclaration */) {
+                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 221 /* InterfaceDeclaration */) {
                     return current;
                 }
             }
@@ -6977,9 +7416,18 @@ var ts;
     }
     ts.getTypeParameterOwner = getTypeParameterOwner;
     function isParameterPropertyDeclaration(node) {
-        return node.flags & 56 /* AccessibilityModifier */ && node.parent.kind === 145 /* Constructor */ && ts.isClassLike(node.parent.parent);
+        return node.flags & 28 /* AccessibilityModifier */ && node.parent.kind === 147 /* 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"/>
@@ -6989,7 +7437,7 @@ var ts;
     var NodeConstructor;
     var SourceFileConstructor;
     function createNode(kind, pos, end) {
-        if (kind === 251 /* SourceFile */) {
+        if (kind === 255 /* SourceFile */) {
             return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
         }
         else {
@@ -7032,26 +7480,26 @@ var ts;
         var visitNodes = cbNodeArray ? visitNodeArray : visitEachNode;
         var cbNodes = cbNodeArray || cbNode;
         switch (node.kind) {
-            case 136 /* QualifiedName */:
+            case 138 /* QualifiedName */:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.right);
-            case 138 /* TypeParameter */:
+            case 140 /* TypeParameter */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNode(cbNode, node.expression);
-            case 249 /* ShorthandPropertyAssignment */:
+            case 253 /* ShorthandPropertyAssignment */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.equalsToken) ||
                     visitNode(cbNode, node.objectAssignmentInitializer);
-            case 139 /* Parameter */:
-            case 142 /* PropertyDeclaration */:
-            case 141 /* PropertySignature */:
-            case 248 /* PropertyAssignment */:
-            case 214 /* VariableDeclaration */:
-            case 166 /* BindingElement */:
+            case 141 /* Parameter */:
+            case 144 /* PropertyDeclaration */:
+            case 143 /* PropertySignature */:
+            case 252 /* PropertyAssignment */:
+            case 217 /* VariableDeclaration */:
+            case 168 /* BindingElement */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.propertyName) ||
@@ -7060,24 +7508,24 @@ var ts;
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 153 /* FunctionType */:
-            case 154 /* ConstructorType */:
-            case 148 /* CallSignature */:
-            case 149 /* ConstructSignature */:
-            case 150 /* IndexSignature */:
+            case 155 /* FunctionType */:
+            case 156 /* ConstructorType */:
+            case 150 /* CallSignature */:
+            case 151 /* ConstructSignature */:
+            case 152 /* IndexSignature */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNodes(cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 144 /* MethodDeclaration */:
-            case 143 /* MethodSignature */:
-            case 145 /* Constructor */:
-            case 146 /* GetAccessor */:
-            case 147 /* SetAccessor */:
-            case 176 /* FunctionExpression */:
-            case 216 /* FunctionDeclaration */:
-            case 177 /* ArrowFunction */:
+            case 146 /* MethodDeclaration */:
+            case 145 /* MethodSignature */:
+            case 147 /* Constructor */:
+            case 148 /* GetAccessor */:
+            case 149 /* SetAccessor */:
+            case 178 /* FunctionExpression */:
+            case 219 /* FunctionDeclaration */:
+            case 179 /* ArrowFunction */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.asteriskToken) ||
@@ -7088,302 +7536,310 @@ var ts;
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.equalsGreaterThanToken) ||
                     visitNode(cbNode, node.body);
-            case 152 /* TypeReference */:
+            case 154 /* TypeReference */:
                 return visitNode(cbNode, node.typeName) ||
                     visitNodes(cbNodes, node.typeArguments);
-            case 151 /* TypePredicate */:
+            case 153 /* TypePredicate */:
                 return visitNode(cbNode, node.parameterName) ||
                     visitNode(cbNode, node.type);
-            case 155 /* TypeQuery */:
+            case 157 /* TypeQuery */:
                 return visitNode(cbNode, node.exprName);
-            case 156 /* TypeLiteral */:
+            case 158 /* TypeLiteral */:
                 return visitNodes(cbNodes, node.members);
-            case 157 /* ArrayType */:
+            case 159 /* ArrayType */:
                 return visitNode(cbNode, node.elementType);
-            case 158 /* TupleType */:
+            case 160 /* TupleType */:
                 return visitNodes(cbNodes, node.elementTypes);
-            case 159 /* UnionType */:
-            case 160 /* IntersectionType */:
+            case 161 /* UnionType */:
+            case 162 /* IntersectionType */:
                 return visitNodes(cbNodes, node.types);
-            case 161 /* ParenthesizedType */:
+            case 163 /* ParenthesizedType */:
                 return visitNode(cbNode, node.type);
-            case 164 /* ObjectBindingPattern */:
-            case 165 /* ArrayBindingPattern */:
+            case 166 /* ObjectBindingPattern */:
+            case 167 /* ArrayBindingPattern */:
                 return visitNodes(cbNodes, node.elements);
-            case 167 /* ArrayLiteralExpression */:
+            case 169 /* ArrayLiteralExpression */:
                 return visitNodes(cbNodes, node.elements);
-            case 168 /* ObjectLiteralExpression */:
+            case 170 /* ObjectLiteralExpression */:
                 return visitNodes(cbNodes, node.properties);
-            case 169 /* PropertyAccessExpression */:
+            case 171 /* PropertyAccessExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.dotToken) ||
                     visitNode(cbNode, node.name);
-            case 170 /* ElementAccessExpression */:
+            case 172 /* ElementAccessExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.argumentExpression);
-            case 171 /* CallExpression */:
-            case 172 /* NewExpression */:
+            case 173 /* CallExpression */:
+            case 174 /* NewExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNodes, node.typeArguments) ||
                     visitNodes(cbNodes, node.arguments);
-            case 173 /* TaggedTemplateExpression */:
+            case 175 /* TaggedTemplateExpression */:
                 return visitNode(cbNode, node.tag) ||
                     visitNode(cbNode, node.template);
-            case 174 /* TypeAssertionExpression */:
+            case 176 /* TypeAssertionExpression */:
                 return visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.expression);
-            case 175 /* ParenthesizedExpression */:
+            case 177 /* ParenthesizedExpression */:
                 return visitNode(cbNode, node.expression);
-            case 178 /* DeleteExpression */:
+            case 180 /* DeleteExpression */:
                 return visitNode(cbNode, node.expression);
-            case 179 /* TypeOfExpression */:
+            case 181 /* TypeOfExpression */:
                 return visitNode(cbNode, node.expression);
-            case 180 /* VoidExpression */:
+            case 182 /* VoidExpression */:
                 return visitNode(cbNode, node.expression);
-            case 182 /* PrefixUnaryExpression */:
+            case 184 /* PrefixUnaryExpression */:
                 return visitNode(cbNode, node.operand);
-            case 187 /* YieldExpression */:
+            case 189 /* YieldExpression */:
                 return visitNode(cbNode, node.asteriskToken) ||
                     visitNode(cbNode, node.expression);
-            case 181 /* AwaitExpression */:
+            case 183 /* AwaitExpression */:
                 return visitNode(cbNode, node.expression);
-            case 183 /* PostfixUnaryExpression */:
+            case 185 /* PostfixUnaryExpression */:
                 return visitNode(cbNode, node.operand);
-            case 184 /* BinaryExpression */:
+            case 186 /* BinaryExpression */:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.operatorToken) ||
                     visitNode(cbNode, node.right);
-            case 192 /* AsExpression */:
+            case 194 /* AsExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.type);
-            case 185 /* ConditionalExpression */:
+            case 195 /* NonNullExpression */:
+                return visitNode(cbNode, node.expression);
+            case 187 /* ConditionalExpression */:
                 return visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.whenTrue) ||
                     visitNode(cbNode, node.colonToken) ||
                     visitNode(cbNode, node.whenFalse);
-            case 188 /* SpreadElementExpression */:
+            case 190 /* SpreadElementExpression */:
                 return visitNode(cbNode, node.expression);
-            case 195 /* Block */:
-            case 222 /* ModuleBlock */:
+            case 198 /* Block */:
+            case 225 /* ModuleBlock */:
                 return visitNodes(cbNodes, node.statements);
-            case 251 /* SourceFile */:
+            case 255 /* SourceFile */:
                 return visitNodes(cbNodes, node.statements) ||
                     visitNode(cbNode, node.endOfFileToken);
-            case 196 /* VariableStatement */:
+            case 199 /* VariableStatement */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.declarationList);
-            case 215 /* VariableDeclarationList */:
+            case 218 /* VariableDeclarationList */:
                 return visitNodes(cbNodes, node.declarations);
-            case 198 /* ExpressionStatement */:
+            case 201 /* ExpressionStatement */:
                 return visitNode(cbNode, node.expression);
-            case 199 /* IfStatement */:
+            case 202 /* IfStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.thenStatement) ||
                     visitNode(cbNode, node.elseStatement);
-            case 200 /* DoStatement */:
+            case 203 /* DoStatement */:
                 return visitNode(cbNode, node.statement) ||
                     visitNode(cbNode, node.expression);
-            case 201 /* WhileStatement */:
+            case 204 /* WhileStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 202 /* ForStatement */:
+            case 205 /* ForStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.incrementor) ||
                     visitNode(cbNode, node.statement);
-            case 203 /* ForInStatement */:
+            case 206 /* ForInStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 204 /* ForOfStatement */:
+            case 207 /* ForOfStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 205 /* ContinueStatement */:
-            case 206 /* BreakStatement */:
+            case 208 /* ContinueStatement */:
+            case 209 /* BreakStatement */:
                 return visitNode(cbNode, node.label);
-            case 207 /* ReturnStatement */:
+            case 210 /* ReturnStatement */:
                 return visitNode(cbNode, node.expression);
-            case 208 /* WithStatement */:
+            case 211 /* WithStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 209 /* SwitchStatement */:
+            case 212 /* SwitchStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.caseBlock);
-            case 223 /* CaseBlock */:
+            case 226 /* CaseBlock */:
                 return visitNodes(cbNodes, node.clauses);
-            case 244 /* CaseClause */:
+            case 248 /* CaseClause */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNodes, node.statements);
-            case 245 /* DefaultClause */:
+            case 249 /* DefaultClause */:
                 return visitNodes(cbNodes, node.statements);
-            case 210 /* LabeledStatement */:
+            case 213 /* LabeledStatement */:
                 return visitNode(cbNode, node.label) ||
                     visitNode(cbNode, node.statement);
-            case 211 /* ThrowStatement */:
+            case 214 /* ThrowStatement */:
                 return visitNode(cbNode, node.expression);
-            case 212 /* TryStatement */:
+            case 215 /* TryStatement */:
                 return visitNode(cbNode, node.tryBlock) ||
                     visitNode(cbNode, node.catchClause) ||
                     visitNode(cbNode, node.finallyBlock);
-            case 247 /* CatchClause */:
+            case 251 /* CatchClause */:
                 return visitNode(cbNode, node.variableDeclaration) ||
                     visitNode(cbNode, node.block);
-            case 140 /* Decorator */:
+            case 142 /* Decorator */:
                 return visitNode(cbNode, node.expression);
-            case 217 /* ClassDeclaration */:
-            case 189 /* ClassExpression */:
+            case 220 /* ClassDeclaration */:
+            case 191 /* ClassExpression */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNodes(cbNodes, node.heritageClauses) ||
                     visitNodes(cbNodes, node.members);
-            case 218 /* InterfaceDeclaration */:
+            case 221 /* InterfaceDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNodes(cbNodes, node.heritageClauses) ||
                     visitNodes(cbNodes, node.members);
-            case 219 /* TypeAliasDeclaration */:
+            case 222 /* TypeAliasDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.typeParameters) ||
                     visitNode(cbNode, node.type);
-            case 220 /* EnumDeclaration */:
+            case 223 /* EnumDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.members);
-            case 250 /* EnumMember */:
+            case 254 /* EnumMember */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 221 /* ModuleDeclaration */:
+            case 224 /* ModuleDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.body);
-            case 224 /* ImportEqualsDeclaration */:
+            case 228 /* ImportEqualsDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.moduleReference);
-            case 225 /* ImportDeclaration */:
+            case 229 /* ImportDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.importClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 226 /* ImportClause */:
+            case 230 /* ImportClause */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.namedBindings);
-            case 227 /* NamespaceImport */:
+            case 227 /* GlobalModuleExportDeclaration */:
                 return visitNode(cbNode, node.name);
-            case 228 /* NamedImports */:
-            case 232 /* NamedExports */:
+            case 231 /* NamespaceImport */:
+                return visitNode(cbNode, node.name);
+            case 232 /* NamedImports */:
+            case 236 /* NamedExports */:
                 return visitNodes(cbNodes, node.elements);
-            case 231 /* ExportDeclaration */:
+            case 235 /* ExportDeclaration */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.exportClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 229 /* ImportSpecifier */:
-            case 233 /* ExportSpecifier */:
+            case 233 /* ImportSpecifier */:
+            case 237 /* ExportSpecifier */:
                 return visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name);
-            case 230 /* ExportAssignment */:
+            case 234 /* ExportAssignment */:
                 return visitNodes(cbNodes, node.decorators) ||
                     visitNodes(cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.expression);
-            case 186 /* TemplateExpression */:
+            case 188 /* TemplateExpression */:
                 return visitNode(cbNode, node.head) || visitNodes(cbNodes, node.templateSpans);
-            case 193 /* TemplateSpan */:
+            case 196 /* TemplateSpan */:
                 return visitNode(cbNode, node.expression) || visitNode(cbNode, node.literal);
-            case 137 /* ComputedPropertyName */:
+            case 139 /* ComputedPropertyName */:
                 return visitNode(cbNode, node.expression);
-            case 246 /* HeritageClause */:
+            case 250 /* HeritageClause */:
                 return visitNodes(cbNodes, node.types);
-            case 191 /* ExpressionWithTypeArguments */:
+            case 193 /* ExpressionWithTypeArguments */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNodes, node.typeArguments);
-            case 235 /* ExternalModuleReference */:
+            case 239 /* ExternalModuleReference */:
                 return visitNode(cbNode, node.expression);
-            case 234 /* MissingDeclaration */:
+            case 238 /* MissingDeclaration */:
                 return visitNodes(cbNodes, node.decorators);
-            case 236 /* JsxElement */:
+            case 240 /* JsxElement */:
                 return visitNode(cbNode, node.openingElement) ||
                     visitNodes(cbNodes, node.children) ||
                     visitNode(cbNode, node.closingElement);
-            case 237 /* JsxSelfClosingElement */:
-            case 238 /* JsxOpeningElement */:
+            case 241 /* JsxSelfClosingElement */:
+            case 242 /* JsxOpeningElement */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNodes(cbNodes, node.attributes);
-            case 241 /* JsxAttribute */:
+            case 245 /* JsxAttribute */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 242 /* JsxSpreadAttribute */:
+            case 246 /* JsxSpreadAttribute */:
                 return visitNode(cbNode, node.expression);
-            case 243 /* JsxExpression */:
+            case 247 /* JsxExpression */:
                 return visitNode(cbNode, node.expression);
-            case 240 /* JsxClosingElement */:
+            case 244 /* JsxClosingElement */:
                 return visitNode(cbNode, node.tagName);
-            case 252 /* JSDocTypeExpression */:
+            case 256 /* JSDocTypeExpression */:
                 return visitNode(cbNode, node.type);
-            case 256 /* JSDocUnionType */:
+            case 260 /* JSDocUnionType */:
                 return visitNodes(cbNodes, node.types);
-            case 257 /* JSDocTupleType */:
+            case 261 /* JSDocTupleType */:
                 return visitNodes(cbNodes, node.types);
-            case 255 /* JSDocArrayType */:
+            case 259 /* JSDocArrayType */:
                 return visitNode(cbNode, node.elementType);
-            case 259 /* JSDocNonNullableType */:
+            case 263 /* JSDocNonNullableType */:
                 return visitNode(cbNode, node.type);
-            case 258 /* JSDocNullableType */:
+            case 262 /* JSDocNullableType */:
                 return visitNode(cbNode, node.type);
-            case 260 /* JSDocRecordType */:
+            case 264 /* JSDocRecordType */:
                 return visitNodes(cbNodes, node.members);
-            case 262 /* JSDocTypeReference */:
+            case 266 /* JSDocTypeReference */:
                 return visitNode(cbNode, node.name) ||
                     visitNodes(cbNodes, node.typeArguments);
-            case 263 /* JSDocOptionalType */:
+            case 267 /* JSDocOptionalType */:
                 return visitNode(cbNode, node.type);
-            case 264 /* JSDocFunctionType */:
+            case 268 /* JSDocFunctionType */:
                 return visitNodes(cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 265 /* JSDocVariadicType */:
+            case 269 /* JSDocVariadicType */:
                 return visitNode(cbNode, node.type);
-            case 266 /* JSDocConstructorType */:
+            case 270 /* JSDocConstructorType */:
                 return visitNode(cbNode, node.type);
-            case 267 /* JSDocThisType */:
+            case 271 /* JSDocThisType */:
                 return visitNode(cbNode, node.type);
-            case 261 /* JSDocRecordMember */:
+            case 265 /* JSDocRecordMember */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.type);
-            case 268 /* JSDocComment */:
+            case 272 /* JSDocComment */:
                 return visitNodes(cbNodes, node.tags);
-            case 270 /* JSDocParameterTag */:
+            case 274 /* JSDocParameterTag */:
                 return visitNode(cbNode, node.preParameterName) ||
                     visitNode(cbNode, node.typeExpression) ||
                     visitNode(cbNode, node.postParameterName);
-            case 271 /* JSDocReturnTag */:
+            case 275 /* JSDocReturnTag */:
                 return visitNode(cbNode, node.typeExpression);
-            case 272 /* JSDocTypeTag */:
+            case 276 /* JSDocTypeTag */:
                 return visitNode(cbNode, node.typeExpression);
-            case 273 /* JSDocTemplateTag */:
+            case 277 /* JSDocTemplateTag */:
                 return visitNodes(cbNodes, node.typeParameters);
         }
     }
     ts.forEachChild = forEachChild;
-    function createSourceFile(fileName, sourceText, languageVersion, setParentNodes) {
+    function createSourceFile(fileName, sourceText, languageVersion, setParentNodes, scriptKind) {
         if (setParentNodes === void 0) { setParentNodes = false; }
         var start = new Date().getTime();
-        var result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes);
+        var result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes, scriptKind);
         ts.parseTime += new Date().getTime() - start;
         return result;
     }
     ts.createSourceFile = createSourceFile;
+    function isExternalModule(file) {
+        return file.externalModuleIndicator !== undefined;
+    }
+    ts.isExternalModule = isExternalModule;
     // Produces a new SourceFile for the 'newText' provided. The 'textChangeRange' parameter
     // indicates what changed between the 'text' that this SourceFile has and the 'newText'.
     // The SourceFile will be created with the compiler attempting to reuse as many nodes from
@@ -7416,7 +7872,7 @@ var ts;
         // Share a single scanner across all calls to parse a source file.  This helps speed things
         // up by avoiding the cost of creating/compiling scanners over and over again.
         var scanner = ts.createScanner(2 /* Latest */, /*skipTrivia*/ true);
-        var disallowInAndDecoratorContext = 1 /* DisallowIn */ | 4 /* Decorator */;
+        var disallowInAndDecoratorContext = 4194304 /* DisallowInContext */ | 16777216 /* DecoratorContext */;
         // capture constructors in 'initializeState' to avoid null checks
         var NodeConstructor;
         var SourceFileConstructor;
@@ -7504,19 +7960,19 @@ var ts;
         // Note: any errors at the end of the file that do not precede a regular node, should get
         // attached to the EOF token.
         var parseErrorBeforeNextFinishedNode = false;
-        function parseSourceFile(fileName, _sourceText, languageVersion, _syntaxCursor, setParentNodes) {
-            var isJavaScriptFile = ts.hasJavaScriptFileExtension(fileName) || _sourceText.lastIndexOf("// @language=javascript", 0) === 0;
-            initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor);
-            var result = parseSourceFileWorker(fileName, languageVersion, setParentNodes);
+        function parseSourceFile(fileName, _sourceText, languageVersion, _syntaxCursor, setParentNodes, scriptKind) {
+            scriptKind = ts.ensureScriptKind(fileName, scriptKind);
+            initializeState(fileName, _sourceText, languageVersion, _syntaxCursor, scriptKind);
+            var result = parseSourceFileWorker(fileName, languageVersion, setParentNodes, scriptKind);
             clearState();
             return result;
         }
         Parser.parseSourceFile = parseSourceFile;
-        function getLanguageVariant(fileName) {
+        function getLanguageVariant(scriptKind) {
             // .tsx and .jsx files are treated as jsx language variant.
-            return ts.fileExtensionIs(fileName, ".tsx") || ts.fileExtensionIs(fileName, ".jsx") ? 1 /* JSX */ : 0 /* Standard */;
+            return scriptKind === 4 /* TSX */ || scriptKind === 2 /* JSX */ || scriptKind === 1 /* JS */ ? 1 /* JSX */ : 0 /* Standard */;
         }
-        function initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor) {
+        function initializeState(fileName, _sourceText, languageVersion, _syntaxCursor, scriptKind) {
             NodeConstructor = ts.objectAllocator.getNodeConstructor();
             SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor();
             sourceText = _sourceText;
@@ -7526,30 +7982,28 @@ var ts;
             identifiers = {};
             identifierCount = 0;
             nodeCount = 0;
-            contextFlags = isJavaScriptFile ? 32 /* JavaScriptFile */ : 0 /* None */;
+            contextFlags = scriptKind === 1 /* JS */ || scriptKind === 2 /* JSX */ ? 134217728 /* JavaScriptFile */ : 0 /* None */;
             parseErrorBeforeNextFinishedNode = false;
             // Initialize and prime the scanner before parsing the source elements.
             scanner.setText(sourceText);
             scanner.setOnError(scanError);
             scanner.setScriptTarget(languageVersion);
-            scanner.setLanguageVariant(getLanguageVariant(fileName));
+            scanner.setLanguageVariant(getLanguageVariant(scriptKind));
         }
         function clearState() {
             // Clear out the text the scanner is pointing at, so it doesn't keep anything alive unnecessarily.
             scanner.setText("");
             scanner.setOnError(undefined);
-            // Clear any data.  We don't want to accidently hold onto it for too long.
+            // Clear any data.  We don't want to accidentally hold onto it for too long.
             parseDiagnostics = undefined;
             sourceFile = undefined;
             identifiers = undefined;
             syntaxCursor = undefined;
             sourceText = undefined;
         }
-        function parseSourceFileWorker(fileName, languageVersion, setParentNodes) {
-            sourceFile = createSourceFile(fileName, languageVersion);
-            if (contextFlags & 32 /* JavaScriptFile */) {
-                sourceFile.parserContextFlags = 32 /* JavaScriptFile */;
-            }
+        function parseSourceFileWorker(fileName, languageVersion, setParentNodes, scriptKind) {
+            sourceFile = createSourceFile(fileName, languageVersion, scriptKind);
+            sourceFile.flags = contextFlags;
             // Prime the scanner.
             token = nextToken();
             processReferenceComments(sourceFile);
@@ -7564,40 +8018,22 @@ var ts;
             if (setParentNodes) {
                 fixupParentReferences(sourceFile);
             }
-            // If this is a javascript file, proactively see if we can get JSDoc comments for
-            // relevant nodes in the file.  We'll use these to provide typing informaion if they're
-            // available.
-            if (ts.isSourceFileJavaScript(sourceFile)) {
-                addJSDocComments();
-            }
             return sourceFile;
         }
-        function addJSDocComments() {
-            forEachChild(sourceFile, visit);
-            return;
-            function visit(node) {
-                // Add additional cases as necessary depending on how we see JSDoc comments used
-                // in the wild.
-                switch (node.kind) {
-                    case 196 /* VariableStatement */:
-                    case 216 /* FunctionDeclaration */:
-                    case 139 /* Parameter */:
-                        addJSDocComment(node);
-                }
-                forEachChild(node, visit);
-            }
-        }
         function addJSDocComment(node) {
-            var comments = ts.getLeadingCommentRangesOfNode(node, sourceFile);
-            if (comments) {
-                for (var _i = 0, comments_1 = comments; _i < comments_1.length; _i++) {
-                    var comment = comments_1[_i];
-                    var jsDocComment = JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos);
-                    if (jsDocComment) {
-                        node.jsDocComment = jsDocComment;
+            if (contextFlags & 134217728 /* JavaScriptFile */) {
+                var comments = ts.getLeadingCommentRangesOfNode(node, sourceFile);
+                if (comments) {
+                    for (var _i = 0, comments_1 = comments; _i < comments_1.length; _i++) {
+                        var comment = comments_1[_i];
+                        var jsDocComment = JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos);
+                        if (jsDocComment) {
+                            node.jsDocComment = jsDocComment;
+                        }
                     }
                 }
             }
+            return node;
         }
         function fixupParentReferences(sourceFile) {
             // normally parent references are set during binding. However, for clients that only need
@@ -7621,17 +8057,18 @@ var ts;
             }
         }
         Parser.fixupParentReferences = fixupParentReferences;
-        function createSourceFile(fileName, languageVersion) {
+        function createSourceFile(fileName, languageVersion, scriptKind) {
             // code from createNode is inlined here so createNode won't have to deal with special case of creating source files
             // this is quite rare comparing to other nodes and createNode should be as fast as possible
-            var sourceFile = new SourceFileConstructor(251 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
+            var sourceFile = new SourceFileConstructor(255 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
             nodeCount++;
             sourceFile.text = sourceText;
             sourceFile.bindDiagnostics = [];
             sourceFile.languageVersion = languageVersion;
             sourceFile.fileName = ts.normalizePath(fileName);
-            sourceFile.flags = ts.fileExtensionIs(sourceFile.fileName, ".d.ts") ? 4096 /* DeclarationFile */ : 0;
-            sourceFile.languageVariant = getLanguageVariant(sourceFile.fileName);
+            sourceFile.languageVariant = getLanguageVariant(scriptKind);
+            sourceFile.isDeclarationFile = ts.fileExtensionIs(sourceFile.fileName, ".d.ts");
+            sourceFile.scriptKind = scriptKind;
             return sourceFile;
         }
         function setContextFlag(val, flag) {
@@ -7643,16 +8080,16 @@ var ts;
             }
         }
         function setDisallowInContext(val) {
-            setContextFlag(val, 1 /* DisallowIn */);
+            setContextFlag(val, 4194304 /* DisallowInContext */);
         }
         function setYieldContext(val) {
-            setContextFlag(val, 2 /* Yield */);
+            setContextFlag(val, 8388608 /* YieldContext */);
         }
         function setDecoratorContext(val) {
-            setContextFlag(val, 4 /* Decorator */);
+            setContextFlag(val, 16777216 /* DecoratorContext */);
         }
         function setAwaitContext(val) {
-            setContextFlag(val, 8 /* Await */);
+            setContextFlag(val, 33554432 /* AwaitContext */);
         }
         function doOutsideOfContext(context, func) {
             // contextFlagsToClear will contain only the context flags that are
@@ -7693,40 +8130,40 @@ var ts;
             return func();
         }
         function allowInAnd(func) {
-            return doOutsideOfContext(1 /* DisallowIn */, func);
+            return doOutsideOfContext(4194304 /* DisallowInContext */, func);
         }
         function disallowInAnd(func) {
-            return doInsideOfContext(1 /* DisallowIn */, func);
+            return doInsideOfContext(4194304 /* DisallowInContext */, func);
         }
         function doInYieldContext(func) {
-            return doInsideOfContext(2 /* Yield */, func);
+            return doInsideOfContext(8388608 /* YieldContext */, func);
         }
         function doInDecoratorContext(func) {
-            return doInsideOfContext(4 /* Decorator */, func);
+            return doInsideOfContext(16777216 /* DecoratorContext */, func);
         }
         function doInAwaitContext(func) {
-            return doInsideOfContext(8 /* Await */, func);
+            return doInsideOfContext(33554432 /* AwaitContext */, func);
         }
         function doOutsideOfAwaitContext(func) {
-            return doOutsideOfContext(8 /* Await */, func);
+            return doOutsideOfContext(33554432 /* AwaitContext */, func);
         }
         function doInYieldAndAwaitContext(func) {
-            return doInsideOfContext(2 /* Yield */ | 8 /* Await */, func);
+            return doInsideOfContext(8388608 /* YieldContext */ | 33554432 /* AwaitContext */, func);
         }
         function inContext(flags) {
             return (contextFlags & flags) !== 0;
         }
         function inYieldContext() {
-            return inContext(2 /* Yield */);
+            return inContext(8388608 /* YieldContext */);
         }
         function inDisallowInContext() {
-            return inContext(1 /* DisallowIn */);
+            return inContext(4194304 /* DisallowInContext */);
         }
         function inDecoratorContext() {
-            return inContext(4 /* Decorator */);
+            return inContext(16777216 /* DecoratorContext */);
         }
         function inAwaitContext() {
-            return inContext(8 /* Await */);
+            return inContext(33554432 /* AwaitContext */);
         }
         function parseErrorAtCurrentToken(message, arg0) {
             var start = scanner.getTokenPos();
@@ -7900,14 +8337,14 @@ var ts;
         function finishNode(node, end) {
             node.end = end === undefined ? scanner.getStartPos() : end;
             if (contextFlags) {
-                node.parserContextFlags = contextFlags;
+                node.flags |= contextFlags;
             }
             // Keep track on the node if we encountered an error while parsing it.  If we did, then
             // we cannot reuse the node incrementally.  Once we've marked this node, clear out the
             // flag so that we don't mark any subsequent nodes.
             if (parseErrorBeforeNextFinishedNode) {
                 parseErrorBeforeNextFinishedNode = false;
-                node.parserContextFlags |= 16 /* ThisNodeHasError */;
+                node.flags |= 67108864 /* ThisNodeHasError */;
             }
             return node;
         }
@@ -7976,7 +8413,7 @@ var ts;
             // PropertyName [Yield]:
             //      LiteralPropertyName
             //      ComputedPropertyName[?Yield]
-            var node = createNode(137 /* ComputedPropertyName */);
+            var node = createNode(139 /* ComputedPropertyName */);
             parseExpected(19 /* OpenBracketToken */);
             // We parse any expression (including a comma expression). But the grammar
             // says that only an assignment expression is allowed, so the grammar checker
@@ -8005,7 +8442,7 @@ var ts;
                 if (token === 77 /* DefaultKeyword */) {
                     return lookAhead(nextTokenIsClassOrFunction);
                 }
-                return token !== 37 /* AsteriskToken */ && token !== 15 /* OpenBraceToken */ && canFollowModifier();
+                return token !== 37 /* AsteriskToken */ && token !== 116 /* AsKeyword */ && token !== 15 /* OpenBraceToken */ && canFollowModifier();
             }
             if (token === 77 /* DefaultKeyword */) {
                 return nextTokenIsClassOrFunction();
@@ -8049,7 +8486,7 @@ var ts;
                 case 2 /* SwitchClauses */:
                     return token === 71 /* CaseKeyword */ || token === 77 /* DefaultKeyword */;
                 case 4 /* TypeMembers */:
-                    return isStartOfTypeMember();
+                    return lookAhead(isTypeMemberStart);
                 case 5 /* ClassMembers */:
                     // We allow semicolons as class elements (as specified by ES6) as long as we're
                     // not in error recovery.  If we're in error recovery, we don't want an errant
@@ -8289,20 +8726,20 @@ var ts;
             // We can only reuse a node if it was parsed under the same strict mode that we're
             // currently in.  i.e. if we originally parsed a node in non-strict mode, but then
             // the user added 'using strict' at the top of the file, then we can't use that node
-            // again as the presense of strict mode may cause us to parse the tokens in the file
-            // differetly.
+            // again as the presence of strict mode may cause us to parse the tokens in the file
+            // differently.
             //
             // Note: we *can* reuse tokens when the strict mode changes.  That's because tokens
             // are unaffected by strict mode.  It's just the parser will decide what to do with it
             // differently depending on what mode it is in.
             //
             // This also applies to all our other context flags as well.
-            var nodeContextFlags = node.parserContextFlags & 31 /* ParserGeneratedFlags */;
+            var nodeContextFlags = node.flags & 197132288 /* ContextFlags */;
             if (nodeContextFlags !== contextFlags) {
                 return undefined;
             }
             // Ok, we have a node that looks like it could be reused.  Now verify that it is valid
-            // in the currest list parsing context that we're currently at.
+            // in the current list parsing context that we're currently at.
             if (!canReuseNode(node, parsingContext)) {
                 return undefined;
             }
@@ -8377,14 +8814,14 @@ var ts;
         function isReusableClassMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 145 /* Constructor */:
-                    case 150 /* IndexSignature */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
-                    case 142 /* PropertyDeclaration */:
-                    case 194 /* SemicolonClassElement */:
+                    case 147 /* Constructor */:
+                    case 152 /* IndexSignature */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
+                    case 144 /* PropertyDeclaration */:
+                    case 197 /* SemicolonClassElement */:
                         return true;
-                    case 144 /* MethodDeclaration */:
+                    case 146 /* MethodDeclaration */:
                         // Method declarations are not necessarily reusable.  An object-literal
                         // may have a method calls "constructor(...)" and we must reparse that
                         // into an actual .ConstructorDeclaration.
@@ -8399,8 +8836,8 @@ var ts;
         function isReusableSwitchClause(node) {
             if (node) {
                 switch (node.kind) {
-                    case 244 /* CaseClause */:
-                    case 245 /* DefaultClause */:
+                    case 248 /* CaseClause */:
+                    case 249 /* DefaultClause */:
                         return true;
                 }
             }
@@ -8409,58 +8846,58 @@ var ts;
         function isReusableStatement(node) {
             if (node) {
                 switch (node.kind) {
-                    case 216 /* FunctionDeclaration */:
-                    case 196 /* VariableStatement */:
-                    case 195 /* Block */:
-                    case 199 /* IfStatement */:
-                    case 198 /* ExpressionStatement */:
-                    case 211 /* ThrowStatement */:
-                    case 207 /* ReturnStatement */:
-                    case 209 /* SwitchStatement */:
-                    case 206 /* BreakStatement */:
-                    case 205 /* ContinueStatement */:
-                    case 203 /* ForInStatement */:
-                    case 204 /* ForOfStatement */:
-                    case 202 /* ForStatement */:
-                    case 201 /* WhileStatement */:
-                    case 208 /* WithStatement */:
-                    case 197 /* EmptyStatement */:
-                    case 212 /* TryStatement */:
-                    case 210 /* LabeledStatement */:
-                    case 200 /* DoStatement */:
-                    case 213 /* DebuggerStatement */:
-                    case 225 /* ImportDeclaration */:
-                    case 224 /* ImportEqualsDeclaration */:
-                    case 231 /* ExportDeclaration */:
-                    case 230 /* ExportAssignment */:
-                    case 221 /* ModuleDeclaration */:
-                    case 217 /* ClassDeclaration */:
-                    case 218 /* InterfaceDeclaration */:
-                    case 220 /* EnumDeclaration */:
-                    case 219 /* TypeAliasDeclaration */:
+                    case 219 /* FunctionDeclaration */:
+                    case 199 /* VariableStatement */:
+                    case 198 /* Block */:
+                    case 202 /* IfStatement */:
+                    case 201 /* ExpressionStatement */:
+                    case 214 /* ThrowStatement */:
+                    case 210 /* ReturnStatement */:
+                    case 212 /* SwitchStatement */:
+                    case 209 /* BreakStatement */:
+                    case 208 /* ContinueStatement */:
+                    case 206 /* ForInStatement */:
+                    case 207 /* ForOfStatement */:
+                    case 205 /* ForStatement */:
+                    case 204 /* WhileStatement */:
+                    case 211 /* WithStatement */:
+                    case 200 /* EmptyStatement */:
+                    case 215 /* TryStatement */:
+                    case 213 /* LabeledStatement */:
+                    case 203 /* DoStatement */:
+                    case 216 /* DebuggerStatement */:
+                    case 229 /* ImportDeclaration */:
+                    case 228 /* ImportEqualsDeclaration */:
+                    case 235 /* ExportDeclaration */:
+                    case 234 /* ExportAssignment */:
+                    case 224 /* ModuleDeclaration */:
+                    case 220 /* ClassDeclaration */:
+                    case 221 /* InterfaceDeclaration */:
+                    case 223 /* EnumDeclaration */:
+                    case 222 /* TypeAliasDeclaration */:
                         return true;
                 }
             }
             return false;
         }
         function isReusableEnumMember(node) {
-            return node.kind === 250 /* EnumMember */;
+            return node.kind === 254 /* EnumMember */;
         }
         function isReusableTypeMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 149 /* ConstructSignature */:
-                    case 143 /* MethodSignature */:
-                    case 150 /* IndexSignature */:
-                    case 141 /* PropertySignature */:
-                    case 148 /* CallSignature */:
+                    case 151 /* ConstructSignature */:
+                    case 145 /* MethodSignature */:
+                    case 152 /* IndexSignature */:
+                    case 143 /* PropertySignature */:
+                    case 150 /* CallSignature */:
                         return true;
                 }
             }
             return false;
         }
         function isReusableVariableDeclaration(node) {
-            if (node.kind !== 214 /* VariableDeclaration */) {
+            if (node.kind !== 217 /* VariableDeclaration */) {
                 return false;
             }
             // Very subtle incremental parsing bug.  Consider the following code:
@@ -8481,7 +8918,7 @@ var ts;
             return variableDeclarator.initializer === undefined;
         }
         function isReusableParameter(node) {
-            if (node.kind !== 139 /* Parameter */) {
+            if (node.kind !== 141 /* Parameter */) {
                 return false;
             }
             // See the comment in isReusableVariableDeclaration for why we do this.
@@ -8529,7 +8966,7 @@ var ts;
         }
         ;
         // Parses a comma-delimited list of elements
-        function parseDelimitedList(kind, parseElement, considerSemicolonAsDelimeter) {
+        function parseDelimitedList(kind, parseElement, considerSemicolonAsDelimiter) {
             var saveParsingContext = parsingContext;
             parsingContext |= 1 << kind;
             var result = [];
@@ -8554,7 +8991,7 @@ var ts;
                     // parse errors.  For example, this can happen when people do things like use
                     // a semicolon to delimit object literal members.   Note: we'll have already
                     // reported an error when we called parseExpected above.
-                    if (considerSemicolonAsDelimeter && token === 23 /* SemicolonToken */ && !scanner.hasPrecedingLineBreak()) {
+                    if (considerSemicolonAsDelimiter && token === 23 /* SemicolonToken */ && !scanner.hasPrecedingLineBreak()) {
                         nextToken();
                     }
                     continue;
@@ -8598,7 +9035,7 @@ var ts;
         function parseEntityName(allowReservedWords, diagnosticMessage) {
             var entity = parseIdentifier(diagnosticMessage);
             while (parseOptional(21 /* DotToken */)) {
-                var node = createNode(136 /* QualifiedName */, entity.pos);
+                var node = createNode(138 /* QualifiedName */, entity.pos);
                 node.left = entity;
                 node.right = parseRightSideOfDot(allowReservedWords);
                 entity = finishNode(node);
@@ -8637,7 +9074,7 @@ var ts;
             return allowIdentifierNames ? parseIdentifierName() : parseIdentifier();
         }
         function parseTemplateExpression() {
-            var template = createNode(186 /* TemplateExpression */);
+            var template = createNode(188 /* TemplateExpression */);
             template.head = parseTemplateLiteralFragment();
             ts.Debug.assert(template.head.kind === 12 /* TemplateHead */, "Template head has wrong token kind");
             var templateSpans = [];
@@ -8650,7 +9087,7 @@ var ts;
             return finishNode(template);
         }
         function parseTemplateSpan() {
-            var span = createNode(193 /* TemplateSpan */);
+            var span = createNode(196 /* TemplateSpan */);
             span.expression = allowInAnd(parseExpression);
             var literal;
             if (token === 16 /* CloseBraceToken */) {
@@ -8664,7 +9101,7 @@ var ts;
             return finishNode(span);
         }
         function parseStringLiteralTypeNode() {
-            return parseLiteralLikeNode(163 /* StringLiteralType */, /*internName*/ true);
+            return parseLiteralLikeNode(165 /* StringLiteralType */, /*internName*/ true);
         }
         function parseLiteralNode(internName) {
             return parseLiteralLikeNode(token, internName);
@@ -8694,40 +9131,40 @@ var ts;
             if (node.kind === 8 /* NumericLiteral */
                 && sourceText.charCodeAt(tokenPos) === 48 /* _0 */
                 && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) {
-                node.flags |= 32768 /* OctalLiteral */;
+                node.isOctalLiteral = true;
             }
             return node;
         }
         // TYPES
         function parseTypeReference() {
             var typeName = parseEntityName(/*allowReservedWords*/ false, ts.Diagnostics.Type_expected);
-            var node = createNode(152 /* TypeReference */, typeName.pos);
+            var node = createNode(154 /* TypeReference */, typeName.pos);
             node.typeName = typeName;
             if (!scanner.hasPrecedingLineBreak() && token === 25 /* LessThanToken */) {
                 node.typeArguments = parseBracketedList(18 /* TypeArguments */, parseType, 25 /* LessThanToken */, 27 /* GreaterThanToken */);
             }
             return finishNode(node);
         }
-        function parseTypePredicate(lhs) {
+        function parseThisTypePredicate(lhs) {
             nextToken();
-            var node = createNode(151 /* TypePredicate */, lhs.pos);
+            var node = createNode(153 /* TypePredicate */, lhs.pos);
             node.parameterName = lhs;
             node.type = parseType();
             return finishNode(node);
         }
         function parseThisTypeNode() {
-            var node = createNode(162 /* ThisType */);
+            var node = createNode(164 /* ThisType */);
             nextToken();
             return finishNode(node);
         }
         function parseTypeQuery() {
-            var node = createNode(155 /* TypeQuery */);
+            var node = createNode(157 /* TypeQuery */);
             parseExpected(101 /* TypeOfKeyword */);
             node.exprName = parseEntityName(/*allowReservedWords*/ true);
             return finishNode(node);
         }
         function parseTypeParameter() {
-            var node = createNode(138 /* TypeParameter */);
+            var node = createNode(140 /* TypeParameter */);
             node.name = parseIdentifier();
             if (parseOptional(83 /* ExtendsKeyword */)) {
                 // It's not uncommon for people to write improper constraints to a generic.  If the
@@ -8762,7 +9199,7 @@ var ts;
             return undefined;
         }
         function isStartOfParameter() {
-            return token === 22 /* DotDotDotToken */ || isIdentifierOrPattern() || ts.isModifierKind(token) || token === 55 /* AtToken */;
+            return token === 22 /* DotDotDotToken */ || isIdentifierOrPattern() || ts.isModifierKind(token) || token === 55 /* AtToken */ || token === 97 /* ThisKeyword */;
         }
         function setModifiers(node, modifiers) {
             if (modifiers) {
@@ -8771,7 +9208,12 @@ var ts;
             }
         }
         function parseParameter() {
-            var node = createNode(139 /* Parameter */);
+            var node = createNode(141 /* Parameter */);
+            if (token === 97 /* ThisKeyword */) {
+                node.name = createIdentifier(/*isIdentifier*/ true, undefined);
+                node.type = parseParameterType();
+                return finishNode(node);
+            }
             node.decorators = parseDecorators();
             setModifiers(node, parseModifiers());
             node.dotDotDotToken = parseOptionalToken(22 /* DotDotDotToken */);
@@ -8800,7 +9242,7 @@ var ts;
             // contexts. In addition, parameter initializers are semantically disallowed in
             // overload signatures. So parameter initializers are transitively disallowed in
             // ambient contexts.
-            return finishNode(node);
+            return addJSDocComment(finishNode(node));
         }
         function parseBindingElementInitializer(inParameter) {
             return inParameter ? parseParameterInitializer() : parseNonParameterInitializer();
@@ -8865,7 +9307,7 @@ var ts;
         }
         function parseSignatureMember(kind) {
             var node = createNode(kind);
-            if (kind === 149 /* ConstructSignature */) {
+            if (kind === 151 /* ConstructSignature */) {
                 parseExpected(92 /* NewKeyword */);
             }
             fillSignature(54 /* ColonToken */, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node);
@@ -8929,7 +9371,7 @@ var ts;
             return token === 54 /* ColonToken */ || token === 24 /* CommaToken */ || token === 20 /* CloseBracketToken */;
         }
         function parseIndexSignatureDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(150 /* IndexSignature */, fullStart);
+            var node = createNode(152 /* IndexSignature */, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             node.parameters = parseBracketedList(16 /* Parameters */, parseParameter, 19 /* OpenBracketToken */, 20 /* CloseBracketToken */);
@@ -8937,22 +9379,23 @@ var ts;
             parseTypeMemberSemicolon();
             return finishNode(node);
         }
-        function parsePropertyOrMethodSignature() {
-            var fullStart = scanner.getStartPos();
+        function parsePropertyOrMethodSignature(fullStart, modifiers) {
             var name = parsePropertyName();
             var questionToken = parseOptionalToken(53 /* QuestionToken */);
             if (token === 17 /* OpenParenToken */ || token === 25 /* LessThanToken */) {
-                var method = createNode(143 /* MethodSignature */, fullStart);
+                var method = createNode(145 /* MethodSignature */, fullStart);
+                setModifiers(method, modifiers);
                 method.name = name;
                 method.questionToken = questionToken;
-                // Method signatues don't exist in expression contexts.  So they have neither
+                // Method signatures don't exist in expression contexts.  So they have neither
                 // [Yield] nor [Await]
                 fillSignature(54 /* ColonToken */, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, method);
                 parseTypeMemberSemicolon();
                 return finishNode(method);
             }
             else {
-                var property = createNode(141 /* PropertySignature */, fullStart);
+                var property = createNode(143 /* PropertySignature */, fullStart);
+                setModifiers(property, modifiers);
                 property.name = name;
                 property.questionToken = questionToken;
                 property.type = parseTypeAnnotation();
@@ -8966,86 +9409,57 @@ var ts;
                 return finishNode(property);
             }
         }
-        function isStartOfTypeMember() {
-            switch (token) {
-                case 17 /* OpenParenToken */:
-                case 25 /* LessThanToken */:
-                case 19 /* OpenBracketToken */:
-                    return true;
-                default:
-                    if (ts.isModifierKind(token)) {
-                        var result = lookAhead(isStartOfIndexSignatureDeclaration);
-                        if (result) {
-                            return result;
-                        }
-                    }
-                    return isLiteralPropertyName() && lookAhead(isTypeMemberWithLiteralPropertyName);
+        function isTypeMemberStart() {
+            var idToken;
+            // Return true if we have the start of a signature member
+            if (token === 17 /* OpenParenToken */ || token === 25 /* LessThanToken */) {
+                return true;
             }
-        }
-        function isStartOfIndexSignatureDeclaration() {
+            // Eat up all modifiers, but hold on to the last one in case it is actually an identifier
             while (ts.isModifierKind(token)) {
+                idToken = token;
                 nextToken();
             }
-            return isIndexSignature();
-        }
-        function isTypeMemberWithLiteralPropertyName() {
-            nextToken();
-            return token === 17 /* OpenParenToken */ ||
-                token === 25 /* LessThanToken */ ||
-                token === 53 /* QuestionToken */ ||
-                token === 54 /* ColonToken */ ||
-                canParseSemicolon();
+            // Index signatures and computed property names are type members
+            if (token === 19 /* OpenBracketToken */) {
+                return true;
+            }
+            // Try to get the first property-like token following all modifiers
+            if (isLiteralPropertyName()) {
+                idToken = token;
+                nextToken();
+            }
+            // If we were able to get any potential identifier, check that it is
+            // the start of a member declaration
+            if (idToken) {
+                return token === 17 /* OpenParenToken */ ||
+                    token === 25 /* LessThanToken */ ||
+                    token === 53 /* QuestionToken */ ||
+                    token === 54 /* ColonToken */ ||
+                    canParseSemicolon();
+            }
+            return false;
         }
         function parseTypeMember() {
-            switch (token) {
-                case 17 /* OpenParenToken */:
-                case 25 /* LessThanToken */:
-                    return parseSignatureMember(148 /* CallSignature */);
-                case 19 /* OpenBracketToken */:
-                    // Indexer or computed property
-                    return isIndexSignature()
-                        ? parseIndexSignatureDeclaration(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers*/ undefined)
-                        : parsePropertyOrMethodSignature();
-                case 92 /* NewKeyword */:
-                    if (lookAhead(isStartOfConstructSignature)) {
-                        return parseSignatureMember(149 /* ConstructSignature */);
-                    }
-                // fall through.
-                case 9 /* StringLiteral */:
-                case 8 /* NumericLiteral */:
-                    return parsePropertyOrMethodSignature();
-                default:
-                    // Index declaration as allowed as a type member.  But as per the grammar,
-                    // they also allow modifiers. So we have to check for an index declaration
-                    // that might be following modifiers. This ensures that things work properly
-                    // when incrementally parsing as the parser will produce the Index declaration
-                    // if it has the same text regardless of whether it is inside a class or an
-                    // object type.
-                    if (ts.isModifierKind(token)) {
-                        var result = tryParse(parseIndexSignatureWithModifiers);
-                        if (result) {
-                            return result;
-                        }
-                    }
-                    if (ts.tokenIsIdentifierOrKeyword(token)) {
-                        return parsePropertyOrMethodSignature();
-                    }
+            if (token === 17 /* OpenParenToken */ || token === 25 /* LessThanToken */) {
+                return parseSignatureMember(150 /* CallSignature */);
             }
-        }
-        function parseIndexSignatureWithModifiers() {
-            var fullStart = scanner.getStartPos();
-            var decorators = parseDecorators();
+            if (token === 92 /* NewKeyword */ && lookAhead(isStartOfConstructSignature)) {
+                return parseSignatureMember(151 /* ConstructSignature */);
+            }
+            var fullStart = getNodePos();
             var modifiers = parseModifiers();
-            return isIndexSignature()
-                ? parseIndexSignatureDeclaration(fullStart, decorators, modifiers)
-                : undefined;
+            if (isIndexSignature()) {
+                return parseIndexSignatureDeclaration(fullStart, /*decorators*/ undefined, modifiers);
+            }
+            return parsePropertyOrMethodSignature(fullStart, modifiers);
         }
         function isStartOfConstructSignature() {
             nextToken();
             return token === 17 /* OpenParenToken */ || token === 25 /* LessThanToken */;
         }
         function parseTypeLiteral() {
-            var node = createNode(156 /* TypeLiteral */);
+            var node = createNode(158 /* TypeLiteral */);
             node.members = parseObjectTypeMembers();
             return finishNode(node);
         }
@@ -9061,12 +9475,12 @@ var ts;
             return members;
         }
         function parseTupleType() {
-            var node = createNode(158 /* TupleType */);
+            var node = createNode(160 /* TupleType */);
             node.elementTypes = parseBracketedList(19 /* TupleElementTypes */, parseType, 19 /* OpenBracketToken */, 20 /* CloseBracketToken */);
             return finishNode(node);
         }
         function parseParenthesizedType() {
-            var node = createNode(161 /* ParenthesizedType */);
+            var node = createNode(163 /* ParenthesizedType */);
             parseExpected(17 /* OpenParenToken */);
             node.type = parseType();
             parseExpected(18 /* CloseParenToken */);
@@ -9074,7 +9488,7 @@ var ts;
         }
         function parseFunctionOrConstructorType(kind) {
             var node = createNode(kind);
-            if (kind === 154 /* ConstructorType */) {
+            if (kind === 156 /* ConstructorType */) {
                 parseExpected(92 /* NewKeyword */);
             }
             fillSignature(34 /* EqualsGreaterThanToken */, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node);
@@ -9087,21 +9501,23 @@ var ts;
         function parseNonArrayType() {
             switch (token) {
                 case 117 /* AnyKeyword */:
-                case 130 /* StringKeyword */:
-                case 128 /* NumberKeyword */:
+                case 131 /* StringKeyword */:
+                case 129 /* NumberKeyword */:
                 case 120 /* BooleanKeyword */:
-                case 131 /* SymbolKeyword */:
+                case 132 /* SymbolKeyword */:
+                case 134 /* UndefinedKeyword */:
                     // If these are followed by a dot, then parse these out as a dotted type reference instead.
                     var node = tryParse(parseKeywordAndNoDot);
                     return node || parseTypeReference();
                 case 9 /* StringLiteral */:
                     return parseStringLiteralTypeNode();
                 case 103 /* VoidKeyword */:
+                case 93 /* NullKeyword */:
                     return parseTokenNode();
                 case 97 /* ThisKeyword */: {
                     var thisKeyword = parseThisTypeNode();
                     if (token === 124 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
-                        return parseTypePredicate(thisKeyword);
+                        return parseThisTypePredicate(thisKeyword);
                     }
                     else {
                         return thisKeyword;
@@ -9122,11 +9538,13 @@ var ts;
         function isStartOfType() {
             switch (token) {
                 case 117 /* AnyKeyword */:
-                case 130 /* StringKeyword */:
-                case 128 /* NumberKeyword */:
+                case 131 /* StringKeyword */:
+                case 129 /* NumberKeyword */:
                 case 120 /* BooleanKeyword */:
-                case 131 /* SymbolKeyword */:
+                case 132 /* SymbolKeyword */:
                 case 103 /* VoidKeyword */:
+                case 134 /* UndefinedKeyword */:
+                case 93 /* NullKeyword */:
                 case 97 /* ThisKeyword */:
                 case 101 /* TypeOfKeyword */:
                 case 15 /* OpenBraceToken */:
@@ -9151,7 +9569,7 @@ var ts;
             var type = parseNonArrayType();
             while (!scanner.hasPrecedingLineBreak() && parseOptional(19 /* OpenBracketToken */)) {
                 parseExpected(20 /* CloseBracketToken */);
-                var node = createNode(157 /* ArrayType */, type.pos);
+                var node = createNode(159 /* ArrayType */, type.pos);
                 node.elementType = type;
                 type = finishNode(node);
             }
@@ -9173,10 +9591,10 @@ var ts;
             return type;
         }
         function parseIntersectionTypeOrHigher() {
-            return parseUnionOrIntersectionType(160 /* IntersectionType */, parseArrayTypeOrHigher, 46 /* AmpersandToken */);
+            return parseUnionOrIntersectionType(162 /* IntersectionType */, parseArrayTypeOrHigher, 46 /* AmpersandToken */);
         }
         function parseUnionTypeOrHigher() {
-            return parseUnionOrIntersectionType(159 /* UnionType */, parseIntersectionTypeOrHigher, 47 /* BarToken */);
+            return parseUnionOrIntersectionType(161 /* UnionType */, parseIntersectionTypeOrHigher, 47 /* BarToken */);
         }
         function isStartOfFunctionType() {
             if (token === 25 /* LessThanToken */) {
@@ -9184,6 +9602,23 @@ var ts;
             }
             return token === 17 /* OpenParenToken */ && lookAhead(isUnambiguouslyStartOfFunctionType);
         }
+        function skipParameterStart() {
+            if (ts.isModifierKind(token)) {
+                // Skip modifiers
+                parseModifiers();
+            }
+            if (isIdentifier() || token === 97 /* ThisKeyword */) {
+                nextToken();
+                return true;
+            }
+            if (token === 19 /* OpenBracketToken */ || token === 15 /* OpenBraceToken */) {
+                // Return true if we can parse an array or object binding pattern with no errors
+                var previousErrorCount = parseDiagnostics.length;
+                parseIdentifierOrPattern();
+                return previousErrorCount === parseDiagnostics.length;
+            }
+            return false;
+        }
         function isUnambiguouslyStartOfFunctionType() {
             nextToken();
             if (token === 18 /* CloseParenToken */ || token === 22 /* DotDotDotToken */) {
@@ -9191,22 +9626,21 @@ var ts;
                 // ( ...
                 return true;
             }
-            if (isIdentifier() || ts.isModifierKind(token)) {
-                nextToken();
+            if (skipParameterStart()) {
+                // We successfully skipped modifiers (if any) and an identifier or binding pattern,
+                // now see if we have something that indicates a parameter declaration
                 if (token === 54 /* ColonToken */ || token === 24 /* CommaToken */ ||
-                    token === 53 /* QuestionToken */ || token === 56 /* EqualsToken */ ||
-                    isIdentifier() || ts.isModifierKind(token)) {
-                    // ( id :
-                    // ( id ,
-                    // ( id ?
-                    // ( id =
-                    // ( modifier id
+                    token === 53 /* QuestionToken */ || token === 56 /* EqualsToken */) {
+                    // ( xxx :
+                    // ( xxx ,
+                    // ( xxx ?
+                    // ( xxx =
                     return true;
                 }
                 if (token === 18 /* CloseParenToken */) {
                     nextToken();
                     if (token === 34 /* EqualsGreaterThanToken */) {
-                        // ( id ) =>
+                        // ( xxx ) =>
                         return true;
                     }
                 }
@@ -9217,7 +9651,7 @@ var ts;
             var typePredicateVariable = isIdentifier() && tryParse(parseTypePredicatePrefix);
             var type = parseType();
             if (typePredicateVariable) {
-                var node = createNode(151 /* TypePredicate */, typePredicateVariable.pos);
+                var node = createNode(153 /* TypePredicate */, typePredicateVariable.pos);
                 node.parameterName = typePredicateVariable;
                 node.type = type;
                 return finishNode(node);
@@ -9236,14 +9670,14 @@ var ts;
         function parseType() {
             // The rules about 'yield' only apply to actual code/expression contexts.  They don't
             // apply to 'type' contexts.  So we disable these parameters here before moving on.
-            return doOutsideOfContext(10 /* TypeExcludesFlags */, parseTypeWorker);
+            return doOutsideOfContext(41943040 /* TypeExcludesFlags */, parseTypeWorker);
         }
         function parseTypeWorker() {
             if (isStartOfFunctionType()) {
-                return parseFunctionOrConstructorType(153 /* FunctionType */);
+                return parseFunctionOrConstructorType(155 /* FunctionType */);
             }
             if (token === 92 /* NewKeyword */) {
-                return parseFunctionOrConstructorType(154 /* ConstructorType */);
+                return parseFunctionOrConstructorType(156 /* ConstructorType */);
             }
             return parseUnionTypeOrHigher();
         }
@@ -9408,7 +9842,7 @@ var ts;
         }
         function isYieldExpression() {
             if (token === 114 /* YieldKeyword */) {
-                // If we have a 'yield' keyword, and htis is a context where yield expressions are
+                // If we have a 'yield' keyword, and this is a context where yield expressions are
                 // allowed, then definitely parse out a yield expression.
                 if (inYieldContext()) {
                     return true;
@@ -9426,7 +9860,7 @@ var ts;
                 //
                 // for now we just check if the next token is an identifier.  More heuristics
                 // can be added here later as necessary.  We just need to make sure that we
-                // don't accidently consume something legal.
+                // don't accidentally consume something legal.
                 return lookAhead(nextTokenIsIdentifierOrKeywordOrNumberOnSameLine);
             }
             return false;
@@ -9436,7 +9870,7 @@ var ts;
             return !scanner.hasPrecedingLineBreak() && isIdentifier();
         }
         function parseYieldExpression() {
-            var node = createNode(187 /* YieldExpression */);
+            var node = createNode(189 /* YieldExpression */);
             // YieldExpression[In] :
             //      yield
             //      yield [no LineTerminator here] [Lexical goal InputElementRegExp]AssignmentExpression[?In, Yield]
@@ -9450,14 +9884,14 @@ var ts;
             }
             else {
                 // if the next token is not on the same line as yield.  or we don't have an '*' or
-                // the start of an expressin, then this is just a simple "yield" expression.
+                // the start of an expression, then this is just a simple "yield" expression.
                 return finishNode(node);
             }
         }
         function parseSimpleArrowFunctionExpression(identifier) {
             ts.Debug.assert(token === 34 /* EqualsGreaterThanToken */, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
-            var node = createNode(177 /* ArrowFunction */, identifier.pos);
-            var parameter = createNode(139 /* Parameter */, identifier.pos);
+            var node = createNode(179 /* ArrowFunction */, identifier.pos);
+            var parameter = createNode(141 /* Parameter */, identifier.pos);
             parameter.name = identifier;
             finishNode(parameter);
             node.parameters = [parameter];
@@ -9609,7 +10043,7 @@ var ts;
             return parseParenthesizedArrowFunctionExpressionHead(/*allowAmbiguity*/ false);
         }
         function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity) {
-            var node = createNode(177 /* ArrowFunction */);
+            var node = createNode(179 /* ArrowFunction */);
             setModifiers(node, parseModifiersForArrowFunction());
             var isAsync = !!(node.flags & 256 /* Async */);
             // Arrow functions are never generators.
@@ -9675,7 +10109,7 @@ var ts;
             }
             // Note: we explicitly 'allowIn' in the whenTrue part of the condition expression, and
             // we do not that for the 'whenFalse' part.
-            var node = createNode(185 /* ConditionalExpression */, leftOperand.pos);
+            var node = createNode(187 /* ConditionalExpression */, leftOperand.pos);
             node.condition = leftOperand;
             node.questionToken = questionToken;
             node.whenTrue = doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher);
@@ -9688,7 +10122,7 @@ var ts;
             return parseBinaryExpressionRest(precedence, leftOperand);
         }
         function isInOrOfKeyword(t) {
-            return t === 90 /* InKeyword */ || t === 135 /* OfKeyword */;
+            return t === 90 /* InKeyword */ || t === 137 /* OfKeyword */;
         }
         function parseBinaryExpressionRest(precedence, leftOperand) {
             while (true) {
@@ -9699,7 +10133,7 @@ var ts;
                 // Check the precedence to see if we should "take" this operator
                 // - For left associative operator (all operator but **), consume the operator,
                 //   recursively call the function below, and parse binaryExpression as a rightOperand
-                //   of the caller if the new precendence of the operator is greater then or equal to the current precendence.
+                //   of the caller if the new precedence of the operator is greater then or equal to the current precedence.
                 //   For example:
                 //      a - b - c;
                 //            ^token; leftOperand = b. Return b to the caller as a rightOperand
@@ -9708,8 +10142,8 @@ var ts;
                 //      a - b * c;
                 //            ^token; leftOperand = b. Return b * c to the caller as a rightOperand
                 // - For right associative operator (**), consume the operator, recursively call the function
-                //   and parse binaryExpression as a rightOperand of the caller if the new precendence of
-                //   the operator is strictly grater than the current precendence
+                //   and parse binaryExpression as a rightOperand of the caller if the new precedence of
+                //   the operator is strictly grater than the current precedence
                 //   For example:
                 //      a ** b ** c;
                 //             ^^token; leftOperand = b. Return b ** c to the caller as a rightOperand
@@ -9796,39 +10230,39 @@ var ts;
             return -1;
         }
         function makeBinaryExpression(left, operatorToken, right) {
-            var node = createNode(184 /* BinaryExpression */, left.pos);
+            var node = createNode(186 /* BinaryExpression */, left.pos);
             node.left = left;
             node.operatorToken = operatorToken;
             node.right = right;
             return finishNode(node);
         }
         function makeAsExpression(left, right) {
-            var node = createNode(192 /* AsExpression */, left.pos);
+            var node = createNode(194 /* AsExpression */, left.pos);
             node.expression = left;
             node.type = right;
             return finishNode(node);
         }
         function parsePrefixUnaryExpression() {
-            var node = createNode(182 /* PrefixUnaryExpression */);
+            var node = createNode(184 /* PrefixUnaryExpression */);
             node.operator = token;
             nextToken();
             node.operand = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseDeleteExpression() {
-            var node = createNode(178 /* DeleteExpression */);
+            var node = createNode(180 /* DeleteExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseTypeOfExpression() {
-            var node = createNode(179 /* TypeOfExpression */);
+            var node = createNode(181 /* TypeOfExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseVoidExpression() {
-            var node = createNode(180 /* VoidExpression */);
+            var node = createNode(182 /* VoidExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -9844,7 +10278,7 @@ var ts;
             return false;
         }
         function parseAwaitExpression() {
-            var node = createNode(181 /* AwaitExpression */);
+            var node = createNode(183 /* AwaitExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -9870,7 +10304,7 @@ var ts;
             var simpleUnaryExpression = parseSimpleUnaryExpression();
             if (token === 38 /* AsteriskAsteriskToken */) {
                 var start = ts.skipTrivia(sourceText, simpleUnaryExpression.pos);
-                if (simpleUnaryExpression.kind === 174 /* TypeAssertionExpression */) {
+                if (simpleUnaryExpression.kind === 176 /* TypeAssertionExpression */) {
                     parseErrorAtPosition(start, simpleUnaryExpression.end - start, ts.Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses);
                 }
                 else {
@@ -9926,7 +10360,7 @@ var ts;
          */
         function isIncrementExpression() {
             // This function is called inside parseUnaryExpression to decide
-            // whether to call parseSimpleUnaryExpression or call parseIncrmentExpression directly
+            // whether to call parseSimpleUnaryExpression or call parseIncrementExpression directly
             switch (token) {
                 case 35 /* PlusToken */:
                 case 36 /* MinusToken */:
@@ -9960,7 +10394,7 @@ var ts;
          */
         function parseIncrementExpression() {
             if (token === 41 /* PlusPlusToken */ || token === 42 /* MinusMinusToken */) {
-                var node = createNode(182 /* PrefixUnaryExpression */);
+                var node = createNode(184 /* PrefixUnaryExpression */);
                 node.operator = token;
                 nextToken();
                 node.operand = parseLeftHandSideExpressionOrHigher();
@@ -9973,7 +10407,7 @@ var ts;
             var expression = parseLeftHandSideExpressionOrHigher();
             ts.Debug.assert(ts.isLeftHandSideExpression(expression));
             if ((token === 41 /* PlusPlusToken */ || token === 42 /* MinusMinusToken */) && !scanner.hasPrecedingLineBreak()) {
-                var node = createNode(183 /* PostfixUnaryExpression */, expression.pos);
+                var node = createNode(185 /* PostfixUnaryExpression */, expression.pos);
                 node.operand = expression;
                 node.operator = token;
                 nextToken();
@@ -10077,7 +10511,7 @@ var ts;
             }
             // If we have seen "super" it must be followed by '(' or '.'.
             // If it wasn't then just try to parse out a '.' and report an error.
-            var node = createNode(169 /* PropertyAccessExpression */, expression.pos);
+            var node = createNode(171 /* PropertyAccessExpression */, expression.pos);
             node.expression = expression;
             node.dotToken = parseExpectedToken(21 /* DotToken */, /*reportAtCurrentPosition*/ false, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access);
             node.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
@@ -10096,8 +10530,8 @@ var ts;
         function parseJsxElementOrSelfClosingElement(inExpressionContext) {
             var opening = parseJsxOpeningOrSelfClosingElement(inExpressionContext);
             var result;
-            if (opening.kind === 238 /* JsxOpeningElement */) {
-                var node = createNode(236 /* JsxElement */, opening.pos);
+            if (opening.kind === 242 /* JsxOpeningElement */) {
+                var node = createNode(240 /* JsxElement */, opening.pos);
                 node.openingElement = opening;
                 node.children = parseJsxChildren(node.openingElement.tagName);
                 node.closingElement = parseJsxClosingElement(inExpressionContext);
@@ -10107,7 +10541,7 @@ var ts;
                 result = finishNode(node);
             }
             else {
-                ts.Debug.assert(opening.kind === 237 /* JsxSelfClosingElement */);
+                ts.Debug.assert(opening.kind === 241 /* JsxSelfClosingElement */);
                 // Nothing else to do for self-closing elements
                 result = opening;
             }
@@ -10122,7 +10556,7 @@ var ts;
                 var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElement(/*inExpressionContext*/ true); });
                 if (invalidElement) {
                     parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element);
-                    var badNode = createNode(184 /* BinaryExpression */, result.pos);
+                    var badNode = createNode(186 /* BinaryExpression */, result.pos);
                     badNode.end = invalidElement.end;
                     badNode.left = result;
                     badNode.right = invalidElement;
@@ -10134,13 +10568,13 @@ var ts;
             return result;
         }
         function parseJsxText() {
-            var node = createNode(239 /* JsxText */, scanner.getStartPos());
+            var node = createNode(243 /* JsxText */, scanner.getStartPos());
             token = scanner.scanJsxToken();
             return finishNode(node);
         }
         function parseJsxChild() {
             switch (token) {
-                case 239 /* JsxText */:
+                case 243 /* JsxText */:
                     return parseJsxText();
                 case 15 /* OpenBraceToken */:
                     return parseJsxExpression(/*inExpressionContext*/ false);
@@ -10182,7 +10616,7 @@ var ts;
                 // Closing tag, so scan the immediately-following text with the JSX scanning instead
                 // of regular scanning to avoid treating illegal characters (e.g. '#') as immediate
                 // scanning errors
-                node = createNode(238 /* JsxOpeningElement */, fullStart);
+                node = createNode(242 /* JsxOpeningElement */, fullStart);
                 scanJsxText();
             }
             else {
@@ -10194,7 +10628,7 @@ var ts;
                     parseExpected(27 /* GreaterThanToken */, /*diagnostic*/ undefined, /*shouldAdvance*/ false);
                     scanJsxText();
                 }
-                node = createNode(237 /* JsxSelfClosingElement */, fullStart);
+                node = createNode(241 /* JsxSelfClosingElement */, fullStart);
             }
             node.tagName = tagName;
             node.attributes = attributes;
@@ -10205,7 +10639,7 @@ var ts;
             var elementName = parseIdentifierName();
             while (parseOptional(21 /* DotToken */)) {
                 scanJsxIdentifier();
-                var node = createNode(136 /* QualifiedName */, elementName.pos);
+                var node = createNode(138 /* QualifiedName */, elementName.pos);
                 node.left = elementName;
                 node.right = parseIdentifierName();
                 elementName = finishNode(node);
@@ -10213,7 +10647,7 @@ var ts;
             return elementName;
         }
         function parseJsxExpression(inExpressionContext) {
-            var node = createNode(243 /* JsxExpression */);
+            var node = createNode(247 /* JsxExpression */);
             parseExpected(15 /* OpenBraceToken */);
             if (token !== 16 /* CloseBraceToken */) {
                 node.expression = parseAssignmentExpressionOrHigher();
@@ -10232,7 +10666,7 @@ var ts;
                 return parseJsxSpreadAttribute();
             }
             scanJsxIdentifier();
-            var node = createNode(241 /* JsxAttribute */);
+            var node = createNode(245 /* JsxAttribute */);
             node.name = parseIdentifierName();
             if (parseOptional(56 /* EqualsToken */)) {
                 switch (token) {
@@ -10247,7 +10681,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxSpreadAttribute() {
-            var node = createNode(242 /* JsxSpreadAttribute */);
+            var node = createNode(246 /* JsxSpreadAttribute */);
             parseExpected(15 /* OpenBraceToken */);
             parseExpected(22 /* DotDotDotToken */);
             node.expression = parseExpression();
@@ -10255,7 +10689,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxClosingElement(inExpressionContext) {
-            var node = createNode(240 /* JsxClosingElement */);
+            var node = createNode(244 /* JsxClosingElement */);
             parseExpected(26 /* LessThanSlashToken */);
             node.tagName = parseJsxElementName();
             if (inExpressionContext) {
@@ -10268,7 +10702,7 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAssertion() {
-            var node = createNode(174 /* TypeAssertionExpression */);
+            var node = createNode(176 /* TypeAssertionExpression */);
             parseExpected(25 /* LessThanToken */);
             node.type = parseType();
             parseExpected(27 /* GreaterThanToken */);
@@ -10279,16 +10713,23 @@ var ts;
             while (true) {
                 var dotToken = parseOptionalToken(21 /* DotToken */);
                 if (dotToken) {
-                    var propertyAccess = createNode(169 /* PropertyAccessExpression */, expression.pos);
+                    var propertyAccess = createNode(171 /* PropertyAccessExpression */, expression.pos);
                     propertyAccess.expression = expression;
                     propertyAccess.dotToken = dotToken;
                     propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
                     expression = finishNode(propertyAccess);
                     continue;
                 }
+                if (token === 49 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
+                    nextToken();
+                    var nonNullExpression = createNode(195 /* NonNullExpression */, expression.pos);
+                    nonNullExpression.expression = expression;
+                    expression = finishNode(nonNullExpression);
+                    continue;
+                }
                 // when in the [Decorator] context, we do not parse ElementAccess as it could be part of a ComputedPropertyName
                 if (!inDecoratorContext() && parseOptional(19 /* OpenBracketToken */)) {
-                    var indexedAccess = createNode(170 /* ElementAccessExpression */, expression.pos);
+                    var indexedAccess = createNode(172 /* ElementAccessExpression */, expression.pos);
                     indexedAccess.expression = expression;
                     // It's not uncommon for a user to write: "new Type[]".
                     // Check for that common pattern and report a better error message.
@@ -10304,7 +10745,7 @@ var ts;
                     continue;
                 }
                 if (token === 11 /* NoSubstitutionTemplateLiteral */ || token === 12 /* TemplateHead */) {
-                    var tagExpression = createNode(173 /* TaggedTemplateExpression */, expression.pos);
+                    var tagExpression = createNode(175 /* TaggedTemplateExpression */, expression.pos);
                     tagExpression.tag = expression;
                     tagExpression.template = token === 11 /* NoSubstitutionTemplateLiteral */
                         ? parseLiteralNode()
@@ -10327,7 +10768,7 @@ var ts;
                     if (!typeArguments) {
                         return expression;
                     }
-                    var callExpr = createNode(171 /* CallExpression */, expression.pos);
+                    var callExpr = createNode(173 /* CallExpression */, expression.pos);
                     callExpr.expression = expression;
                     callExpr.typeArguments = typeArguments;
                     callExpr.arguments = parseArgumentList();
@@ -10335,7 +10776,7 @@ var ts;
                     continue;
                 }
                 else if (token === 17 /* OpenParenToken */) {
-                    var callExpr = createNode(171 /* CallExpression */, expression.pos);
+                    var callExpr = createNode(173 /* CallExpression */, expression.pos);
                     callExpr.expression = expression;
                     callExpr.arguments = parseArgumentList();
                     expression = finishNode(callExpr);
@@ -10359,7 +10800,7 @@ var ts;
                 // If it doesn't have the closing >  then it's definitely not an type argument list.
                 return undefined;
             }
-            // If we have a '<', then only parse this as a arugment list if the type arguments
+            // If we have a '<', then only parse this as a argument list if the type arguments
             // are complete and we have an open paren.  if we don't, rewind and return nothing.
             return typeArguments && canFollowTypeArgumentsInExpression()
                 ? typeArguments
@@ -10445,41 +10886,42 @@ var ts;
             return parseIdentifier(ts.Diagnostics.Expression_expected);
         }
         function parseParenthesizedExpression() {
-            var node = createNode(175 /* ParenthesizedExpression */);
+            var node = createNode(177 /* ParenthesizedExpression */);
             parseExpected(17 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(18 /* CloseParenToken */);
             return finishNode(node);
         }
         function parseSpreadElement() {
-            var node = createNode(188 /* SpreadElementExpression */);
+            var node = createNode(190 /* SpreadElementExpression */);
             parseExpected(22 /* DotDotDotToken */);
             node.expression = parseAssignmentExpressionOrHigher();
             return finishNode(node);
         }
         function parseArgumentOrArrayLiteralElement() {
             return token === 22 /* DotDotDotToken */ ? parseSpreadElement() :
-                token === 24 /* CommaToken */ ? createNode(190 /* OmittedExpression */) :
+                token === 24 /* CommaToken */ ? createNode(192 /* OmittedExpression */) :
                     parseAssignmentExpressionOrHigher();
         }
         function parseArgumentExpression() {
             return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement);
         }
         function parseArrayLiteralExpression() {
-            var node = createNode(167 /* ArrayLiteralExpression */);
+            var node = createNode(169 /* ArrayLiteralExpression */);
             parseExpected(19 /* OpenBracketToken */);
-            if (scanner.hasPrecedingLineBreak())
-                node.flags |= 1024 /* MultiLine */;
+            if (scanner.hasPrecedingLineBreak()) {
+                node.multiLine = true;
+            }
             node.elements = parseDelimitedList(15 /* ArrayLiteralMembers */, parseArgumentOrArrayLiteralElement);
             parseExpected(20 /* CloseBracketToken */);
             return finishNode(node);
         }
         function tryParseAccessorDeclaration(fullStart, decorators, modifiers) {
             if (parseContextualModifier(123 /* GetKeyword */)) {
-                return parseAccessorDeclaration(146 /* GetAccessor */, fullStart, decorators, modifiers);
+                return addJSDocComment(parseAccessorDeclaration(148 /* GetAccessor */, fullStart, decorators, modifiers));
             }
-            else if (parseContextualModifier(129 /* SetKeyword */)) {
-                return parseAccessorDeclaration(147 /* SetAccessor */, fullStart, decorators, modifiers);
+            else if (parseContextualModifier(130 /* SetKeyword */)) {
+                return parseAccessorDeclaration(149 /* SetAccessor */, fullStart, decorators, modifiers);
             }
             return undefined;
         }
@@ -10506,7 +10948,7 @@ var ts;
             // this is necessary because ObjectLiteral productions are also used to cover grammar for ObjectAssignmentPattern
             var isShorthandPropertyAssignment = tokenIsIdentifier && (token === 24 /* CommaToken */ || token === 16 /* CloseBraceToken */ || token === 56 /* EqualsToken */);
             if (isShorthandPropertyAssignment) {
-                var shorthandDeclaration = createNode(249 /* ShorthandPropertyAssignment */, fullStart);
+                var shorthandDeclaration = createNode(253 /* ShorthandPropertyAssignment */, fullStart);
                 shorthandDeclaration.name = propertyName;
                 shorthandDeclaration.questionToken = questionToken;
                 var equalsToken = parseOptionalToken(56 /* EqualsToken */);
@@ -10514,25 +10956,25 @@ var ts;
                     shorthandDeclaration.equalsToken = equalsToken;
                     shorthandDeclaration.objectAssignmentInitializer = allowInAnd(parseAssignmentExpressionOrHigher);
                 }
-                return finishNode(shorthandDeclaration);
+                return addJSDocComment(finishNode(shorthandDeclaration));
             }
             else {
-                var propertyAssignment = createNode(248 /* PropertyAssignment */, fullStart);
+                var propertyAssignment = createNode(252 /* PropertyAssignment */, fullStart);
                 propertyAssignment.modifiers = modifiers;
                 propertyAssignment.name = propertyName;
                 propertyAssignment.questionToken = questionToken;
                 parseExpected(54 /* ColonToken */);
                 propertyAssignment.initializer = allowInAnd(parseAssignmentExpressionOrHigher);
-                return finishNode(propertyAssignment);
+                return addJSDocComment(finishNode(propertyAssignment));
             }
         }
         function parseObjectLiteralExpression() {
-            var node = createNode(168 /* ObjectLiteralExpression */);
+            var node = createNode(170 /* ObjectLiteralExpression */);
             parseExpected(15 /* OpenBraceToken */);
             if (scanner.hasPrecedingLineBreak()) {
-                node.flags |= 1024 /* MultiLine */;
+                node.multiLine = true;
             }
-            node.properties = parseDelimitedList(12 /* ObjectLiteralMembers */, parseObjectLiteralElement, /*considerSemicolonAsDelimeter*/ true);
+            node.properties = parseDelimitedList(12 /* ObjectLiteralMembers */, parseObjectLiteralElement, /*considerSemicolonAsDelimiter*/ true);
             parseExpected(16 /* CloseBraceToken */);
             return finishNode(node);
         }
@@ -10546,7 +10988,7 @@ var ts;
             if (saveDecoratorContext) {
                 setDecoratorContext(/*val*/ false);
             }
-            var node = createNode(176 /* FunctionExpression */);
+            var node = createNode(178 /* FunctionExpression */);
             setModifiers(node, parseModifiers());
             parseExpected(87 /* FunctionKeyword */);
             node.asteriskToken = parseOptionalToken(37 /* AsteriskToken */);
@@ -10562,13 +11004,13 @@ var ts;
             if (saveDecoratorContext) {
                 setDecoratorContext(/*val*/ true);
             }
-            return finishNode(node);
+            return addJSDocComment(finishNode(node));
         }
         function parseOptionalIdentifier() {
             return isIdentifier() ? parseIdentifier() : undefined;
         }
         function parseNewExpression() {
-            var node = createNode(172 /* NewExpression */);
+            var node = createNode(174 /* NewExpression */);
             parseExpected(92 /* NewKeyword */);
             node.expression = parseMemberExpressionOrHigher();
             node.typeArguments = tryParse(parseTypeArgumentsInExpression);
@@ -10579,7 +11021,7 @@ var ts;
         }
         // STATEMENTS
         function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) {
-            var node = createNode(195 /* Block */);
+            var node = createNode(198 /* Block */);
             if (parseExpected(15 /* OpenBraceToken */, diagnosticMessage) || ignoreMissingOpenBrace) {
                 node.statements = parseList(1 /* BlockStatements */, parseStatement);
                 parseExpected(16 /* CloseBraceToken */);
@@ -10609,12 +11051,12 @@ var ts;
             return block;
         }
         function parseEmptyStatement() {
-            var node = createNode(197 /* EmptyStatement */);
+            var node = createNode(200 /* EmptyStatement */);
             parseExpected(23 /* SemicolonToken */);
             return finishNode(node);
         }
         function parseIfStatement() {
-            var node = createNode(199 /* IfStatement */);
+            var node = createNode(202 /* IfStatement */);
             parseExpected(88 /* IfKeyword */);
             parseExpected(17 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
@@ -10624,7 +11066,7 @@ var ts;
             return finishNode(node);
         }
         function parseDoStatement() {
-            var node = createNode(200 /* DoStatement */);
+            var node = createNode(203 /* DoStatement */);
             parseExpected(79 /* DoKeyword */);
             node.statement = parseStatement();
             parseExpected(104 /* WhileKeyword */);
@@ -10639,7 +11081,7 @@ var ts;
             return finishNode(node);
         }
         function parseWhileStatement() {
-            var node = createNode(201 /* WhileStatement */);
+            var node = createNode(204 /* WhileStatement */);
             parseExpected(104 /* WhileKeyword */);
             parseExpected(17 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
@@ -10662,21 +11104,21 @@ var ts;
             }
             var forOrForInOrForOfStatement;
             if (parseOptional(90 /* InKeyword */)) {
-                var forInStatement = createNode(203 /* ForInStatement */, pos);
+                var forInStatement = createNode(206 /* ForInStatement */, pos);
                 forInStatement.initializer = initializer;
                 forInStatement.expression = allowInAnd(parseExpression);
                 parseExpected(18 /* CloseParenToken */);
                 forOrForInOrForOfStatement = forInStatement;
             }
-            else if (parseOptional(135 /* OfKeyword */)) {
-                var forOfStatement = createNode(204 /* ForOfStatement */, pos);
+            else if (parseOptional(137 /* OfKeyword */)) {
+                var forOfStatement = createNode(207 /* ForOfStatement */, pos);
                 forOfStatement.initializer = initializer;
                 forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher);
                 parseExpected(18 /* CloseParenToken */);
                 forOrForInOrForOfStatement = forOfStatement;
             }
             else {
-                var forStatement = createNode(202 /* ForStatement */, pos);
+                var forStatement = createNode(205 /* ForStatement */, pos);
                 forStatement.initializer = initializer;
                 parseExpected(23 /* SemicolonToken */);
                 if (token !== 23 /* SemicolonToken */ && token !== 18 /* CloseParenToken */) {
@@ -10694,7 +11136,7 @@ var ts;
         }
         function parseBreakOrContinueStatement(kind) {
             var node = createNode(kind);
-            parseExpected(kind === 206 /* BreakStatement */ ? 70 /* BreakKeyword */ : 75 /* ContinueKeyword */);
+            parseExpected(kind === 209 /* BreakStatement */ ? 70 /* BreakKeyword */ : 75 /* ContinueKeyword */);
             if (!canParseSemicolon()) {
                 node.label = parseIdentifier();
             }
@@ -10702,7 +11144,7 @@ var ts;
             return finishNode(node);
         }
         function parseReturnStatement() {
-            var node = createNode(207 /* ReturnStatement */);
+            var node = createNode(210 /* ReturnStatement */);
             parseExpected(94 /* ReturnKeyword */);
             if (!canParseSemicolon()) {
                 node.expression = allowInAnd(parseExpression);
@@ -10711,7 +11153,7 @@ var ts;
             return finishNode(node);
         }
         function parseWithStatement() {
-            var node = createNode(208 /* WithStatement */);
+            var node = createNode(211 /* WithStatement */);
             parseExpected(105 /* WithKeyword */);
             parseExpected(17 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
@@ -10720,7 +11162,7 @@ var ts;
             return finishNode(node);
         }
         function parseCaseClause() {
-            var node = createNode(244 /* CaseClause */);
+            var node = createNode(248 /* CaseClause */);
             parseExpected(71 /* CaseKeyword */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(54 /* ColonToken */);
@@ -10728,7 +11170,7 @@ var ts;
             return finishNode(node);
         }
         function parseDefaultClause() {
-            var node = createNode(245 /* DefaultClause */);
+            var node = createNode(249 /* DefaultClause */);
             parseExpected(77 /* DefaultKeyword */);
             parseExpected(54 /* ColonToken */);
             node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement);
@@ -10738,12 +11180,12 @@ var ts;
             return token === 71 /* CaseKeyword */ ? parseCaseClause() : parseDefaultClause();
         }
         function parseSwitchStatement() {
-            var node = createNode(209 /* SwitchStatement */);
+            var node = createNode(212 /* SwitchStatement */);
             parseExpected(96 /* SwitchKeyword */);
             parseExpected(17 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(18 /* CloseParenToken */);
-            var caseBlock = createNode(223 /* CaseBlock */, scanner.getStartPos());
+            var caseBlock = createNode(226 /* CaseBlock */, scanner.getStartPos());
             parseExpected(15 /* OpenBraceToken */);
             caseBlock.clauses = parseList(2 /* SwitchClauses */, parseCaseOrDefaultClause);
             parseExpected(16 /* CloseBraceToken */);
@@ -10758,7 +11200,7 @@ var ts;
             // directly as that might consume an expression on the following line.
             // We just return 'undefined' in that case.  The actual error will be reported in the
             // grammar walker.
-            var node = createNode(211 /* ThrowStatement */);
+            var node = createNode(214 /* ThrowStatement */);
             parseExpected(98 /* ThrowKeyword */);
             node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression);
             parseSemicolon();
@@ -10766,7 +11208,7 @@ var ts;
         }
         // TODO: Review for error recovery
         function parseTryStatement() {
-            var node = createNode(212 /* TryStatement */);
+            var node = createNode(215 /* TryStatement */);
             parseExpected(100 /* TryKeyword */);
             node.tryBlock = parseBlock(/*ignoreMissingOpenBrace*/ false);
             node.catchClause = token === 72 /* CatchKeyword */ ? parseCatchClause() : undefined;
@@ -10779,7 +11221,7 @@ var ts;
             return finishNode(node);
         }
         function parseCatchClause() {
-            var result = createNode(247 /* CatchClause */);
+            var result = createNode(251 /* CatchClause */);
             parseExpected(72 /* CatchKeyword */);
             if (parseExpected(17 /* OpenParenToken */)) {
                 result.variableDeclaration = parseVariableDeclaration();
@@ -10789,7 +11231,7 @@ var ts;
             return finishNode(result);
         }
         function parseDebuggerStatement() {
-            var node = createNode(213 /* DebuggerStatement */);
+            var node = createNode(216 /* DebuggerStatement */);
             parseExpected(76 /* DebuggerKeyword */);
             parseSemicolon();
             return finishNode(node);
@@ -10801,16 +11243,16 @@ var ts;
             var fullStart = scanner.getStartPos();
             var expression = allowInAnd(parseExpression);
             if (expression.kind === 69 /* Identifier */ && parseOptional(54 /* ColonToken */)) {
-                var labeledStatement = createNode(210 /* LabeledStatement */, fullStart);
+                var labeledStatement = createNode(213 /* LabeledStatement */, fullStart);
                 labeledStatement.label = expression;
                 labeledStatement.statement = parseStatement();
-                return finishNode(labeledStatement);
+                return addJSDocComment(finishNode(labeledStatement));
             }
             else {
-                var expressionStatement = createNode(198 /* ExpressionStatement */, fullStart);
+                var expressionStatement = createNode(201 /* ExpressionStatement */, fullStart);
                 expressionStatement.expression = expression;
                 parseSemicolon();
-                return finishNode(expressionStatement);
+                return addJSDocComment(finishNode(expressionStatement));
             }
         }
         function nextTokenIsIdentifierOrKeywordOnSameLine() {
@@ -10857,7 +11299,7 @@ var ts;
                     //
                     // could be legal, it would add complexity for very little gain.
                     case 107 /* InterfaceKeyword */:
-                    case 132 /* TypeKeyword */:
+                    case 133 /* TypeKeyword */:
                         return nextTokenIsIdentifierOnSameLine();
                     case 125 /* ModuleKeyword */:
                     case 126 /* NamespaceKeyword */:
@@ -10868,14 +11310,16 @@ var ts;
                     case 110 /* PrivateKeyword */:
                     case 111 /* ProtectedKeyword */:
                     case 112 /* PublicKeyword */:
+                    case 127 /* ReadonlyKeyword */:
                         nextToken();
                         // ASI takes effect for this modifier.
                         if (scanner.hasPrecedingLineBreak()) {
                             return false;
                         }
                         continue;
-                    case 134 /* GlobalKeyword */:
-                        return nextToken() === 15 /* OpenBraceToken */;
+                    case 136 /* GlobalKeyword */:
+                        nextToken();
+                        return token === 15 /* OpenBraceToken */ || token === 69 /* Identifier */ || token === 82 /* ExportKeyword */;
                     case 89 /* ImportKeyword */:
                         nextToken();
                         return token === 9 /* StringLiteral */ || token === 37 /* AsteriskToken */ ||
@@ -10883,7 +11327,8 @@ var ts;
                     case 82 /* ExportKeyword */:
                         nextToken();
                         if (token === 56 /* EqualsToken */ || token === 37 /* AsteriskToken */ ||
-                            token === 15 /* OpenBraceToken */ || token === 77 /* DefaultKeyword */) {
+                            token === 15 /* OpenBraceToken */ || token === 77 /* DefaultKeyword */ ||
+                            token === 116 /* AsKeyword */) {
                             return true;
                         }
                         continue;
@@ -10934,14 +11379,15 @@ var ts;
                 case 107 /* InterfaceKeyword */:
                 case 125 /* ModuleKeyword */:
                 case 126 /* NamespaceKeyword */:
-                case 132 /* TypeKeyword */:
-                case 134 /* GlobalKeyword */:
+                case 133 /* TypeKeyword */:
+                case 136 /* GlobalKeyword */:
                     // When these don't start a declaration, they're an identifier in an expression statement
                     return true;
                 case 112 /* PublicKeyword */:
                 case 110 /* PrivateKeyword */:
                 case 111 /* ProtectedKeyword */:
                 case 113 /* StaticKeyword */:
+                case 127 /* ReadonlyKeyword */:
                     // When these don't start a declaration, they may be the start of a class member if an identifier
                     // immediately follows. Otherwise they're an identifier in an expression statement.
                     return isStartOfDeclaration() || !lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine);
@@ -10984,9 +11430,9 @@ var ts;
                 case 86 /* ForKeyword */:
                     return parseForOrForInOrForOfStatement();
                 case 75 /* ContinueKeyword */:
-                    return parseBreakOrContinueStatement(205 /* ContinueStatement */);
+                    return parseBreakOrContinueStatement(208 /* ContinueStatement */);
                 case 70 /* BreakKeyword */:
-                    return parseBreakOrContinueStatement(206 /* BreakStatement */);
+                    return parseBreakOrContinueStatement(209 /* BreakStatement */);
                 case 94 /* ReturnKeyword */:
                     return parseReturnStatement();
                 case 105 /* WithKeyword */:
@@ -11006,7 +11452,7 @@ var ts;
                     return parseDeclaration();
                 case 118 /* AsyncKeyword */:
                 case 107 /* InterfaceKeyword */:
-                case 132 /* TypeKeyword */:
+                case 133 /* TypeKeyword */:
                 case 125 /* ModuleKeyword */:
                 case 126 /* NamespaceKeyword */:
                 case 122 /* DeclareKeyword */:
@@ -11019,7 +11465,8 @@ var ts;
                 case 112 /* PublicKeyword */:
                 case 115 /* AbstractKeyword */:
                 case 113 /* StaticKeyword */:
-                case 134 /* GlobalKeyword */:
+                case 127 /* ReadonlyKeyword */:
+                case 136 /* GlobalKeyword */:
                     if (isStartOfDeclaration()) {
                         return parseDeclaration();
                     }
@@ -11042,11 +11489,11 @@ var ts;
                     return parseClassDeclaration(fullStart, decorators, modifiers);
                 case 107 /* InterfaceKeyword */:
                     return parseInterfaceDeclaration(fullStart, decorators, modifiers);
-                case 132 /* TypeKeyword */:
+                case 133 /* TypeKeyword */:
                     return parseTypeAliasDeclaration(fullStart, decorators, modifiers);
                 case 81 /* EnumKeyword */:
                     return parseEnumDeclaration(fullStart, decorators, modifiers);
-                case 134 /* GlobalKeyword */:
+                case 136 /* GlobalKeyword */:
                 case 125 /* ModuleKeyword */:
                 case 126 /* NamespaceKeyword */:
                     return parseModuleDeclaration(fullStart, decorators, modifiers);
@@ -11054,14 +11501,20 @@ var ts;
                     return parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers);
                 case 82 /* ExportKeyword */:
                     nextToken();
-                    return token === 77 /* DefaultKeyword */ || token === 56 /* EqualsToken */ ?
-                        parseExportAssignment(fullStart, decorators, modifiers) :
-                        parseExportDeclaration(fullStart, decorators, modifiers);
+                    switch (token) {
+                        case 77 /* DefaultKeyword */:
+                        case 56 /* EqualsToken */:
+                            return parseExportAssignment(fullStart, decorators, modifiers);
+                        case 116 /* AsKeyword */:
+                            return parseGlobalModuleExportDeclaration(fullStart, decorators, modifiers);
+                        default:
+                            return parseExportDeclaration(fullStart, decorators, modifiers);
+                    }
                 default:
                     if (decorators || modifiers) {
                         // We reached this point because we encountered decorators and/or modifiers and assumed a declaration
                         // would follow. For recovery and error reporting purposes, return an incomplete declaration.
-                        var node = createMissingNode(234 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
+                        var node = createMissingNode(238 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
                         node.pos = fullStart;
                         node.decorators = decorators;
                         setModifiers(node, modifiers);
@@ -11083,16 +11536,16 @@ var ts;
         // DECLARATIONS
         function parseArrayBindingElement() {
             if (token === 24 /* CommaToken */) {
-                return createNode(190 /* OmittedExpression */);
+                return createNode(192 /* OmittedExpression */);
             }
-            var node = createNode(166 /* BindingElement */);
+            var node = createNode(168 /* BindingElement */);
             node.dotDotDotToken = parseOptionalToken(22 /* DotDotDotToken */);
             node.name = parseIdentifierOrPattern();
             node.initializer = parseBindingElementInitializer(/*inParameter*/ false);
             return finishNode(node);
         }
         function parseObjectBindingElement() {
-            var node = createNode(166 /* BindingElement */);
+            var node = createNode(168 /* BindingElement */);
             var tokenIsIdentifier = isIdentifier();
             var propertyName = parsePropertyName();
             if (tokenIsIdentifier && token !== 54 /* ColonToken */) {
@@ -11107,14 +11560,14 @@ var ts;
             return finishNode(node);
         }
         function parseObjectBindingPattern() {
-            var node = createNode(164 /* ObjectBindingPattern */);
+            var node = createNode(166 /* ObjectBindingPattern */);
             parseExpected(15 /* OpenBraceToken */);
             node.elements = parseDelimitedList(9 /* ObjectBindingElements */, parseObjectBindingElement);
             parseExpected(16 /* CloseBraceToken */);
             return finishNode(node);
         }
         function parseArrayBindingPattern() {
-            var node = createNode(165 /* ArrayBindingPattern */);
+            var node = createNode(167 /* ArrayBindingPattern */);
             parseExpected(19 /* OpenBracketToken */);
             node.elements = parseDelimitedList(10 /* ArrayBindingElements */, parseArrayBindingElement);
             parseExpected(20 /* CloseBracketToken */);
@@ -11133,7 +11586,7 @@ var ts;
             return parseIdentifier();
         }
         function parseVariableDeclaration() {
-            var node = createNode(214 /* VariableDeclaration */);
+            var node = createNode(217 /* VariableDeclaration */);
             node.name = parseIdentifierOrPattern();
             node.type = parseTypeAnnotation();
             if (!isInOrOfKeyword(token)) {
@@ -11142,15 +11595,15 @@ var ts;
             return finishNode(node);
         }
         function parseVariableDeclarationList(inForStatementInitializer) {
-            var node = createNode(215 /* VariableDeclarationList */);
+            var node = createNode(218 /* VariableDeclarationList */);
             switch (token) {
                 case 102 /* VarKeyword */:
                     break;
                 case 108 /* LetKeyword */:
-                    node.flags |= 8192 /* Let */;
+                    node.flags |= 1024 /* Let */;
                     break;
                 case 74 /* ConstKeyword */:
-                    node.flags |= 16384 /* Const */;
+                    node.flags |= 2048 /* Const */;
                     break;
                 default:
                     ts.Debug.fail();
@@ -11165,7 +11618,7 @@ var ts;
             // So we need to look ahead to determine if 'of' should be treated as a keyword in
             // this context.
             // The checker will then give an error that there is an empty declaration list.
-            if (token === 135 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
+            if (token === 137 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
                 node.declarations = createMissingList();
             }
             else {
@@ -11180,15 +11633,15 @@ var ts;
             return nextTokenIsIdentifier() && nextToken() === 18 /* CloseParenToken */;
         }
         function parseVariableStatement(fullStart, decorators, modifiers) {
-            var node = createNode(196 /* VariableStatement */, fullStart);
+            var node = createNode(199 /* VariableStatement */, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             node.declarationList = parseVariableDeclarationList(/*inForStatementInitializer*/ false);
             parseSemicolon();
-            return finishNode(node);
+            return addJSDocComment(finishNode(node));
         }
         function parseFunctionDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(216 /* FunctionDeclaration */, fullStart);
+            var node = createNode(219 /* FunctionDeclaration */, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(87 /* FunctionKeyword */);
@@ -11198,19 +11651,19 @@ var ts;
             var isAsync = !!(node.flags & 256 /* Async */);
             fillSignature(54 /* ColonToken */, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, node);
             node.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, ts.Diagnostics.or_expected);
-            return finishNode(node);
+            return addJSDocComment(finishNode(node));
         }
         function parseConstructorDeclaration(pos, decorators, modifiers) {
-            var node = createNode(145 /* Constructor */, pos);
+            var node = createNode(147 /* Constructor */, pos);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(121 /* ConstructorKeyword */);
             fillSignature(54 /* ColonToken */, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node);
             node.body = parseFunctionBlockOrSemicolon(/*isGenerator*/ false, /*isAsync*/ false, ts.Diagnostics.or_expected);
-            return finishNode(node);
+            return addJSDocComment(finishNode(node));
         }
         function parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, name, questionToken, diagnosticMessage) {
-            var method = createNode(144 /* MethodDeclaration */, fullStart);
+            var method = createNode(146 /* MethodDeclaration */, fullStart);
             method.decorators = decorators;
             setModifiers(method, modifiers);
             method.asteriskToken = asteriskToken;
@@ -11220,10 +11673,10 @@ var ts;
             var isAsync = !!(method.flags & 256 /* Async */);
             fillSignature(54 /* ColonToken */, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, method);
             method.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, diagnosticMessage);
-            return finishNode(method);
+            return addJSDocComment(finishNode(method));
         }
         function parsePropertyDeclaration(fullStart, decorators, modifiers, name, questionToken) {
-            var property = createNode(142 /* PropertyDeclaration */, fullStart);
+            var property = createNode(144 /* PropertyDeclaration */, fullStart);
             property.decorators = decorators;
             setModifiers(property, modifiers);
             property.name = name;
@@ -11234,13 +11687,13 @@ var ts;
             // off. The grammar would look something like this:
             //
             //    MemberVariableDeclaration[Yield]:
-            //        AccessibilityModifier_opt   PropertyName   TypeAnnotation_opt   Initialiser_opt[In];
-            //        AccessibilityModifier_opt  static_opt  PropertyName   TypeAnnotation_opt   Initialiser_opt[In, ?Yield];
+            //        AccessibilityModifier_opt   PropertyName   TypeAnnotation_opt   Initializer_opt[In];
+            //        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 & 64 /* Static */
+            property.initializer = modifiers && modifiers.flags & 32 /* Static */
                 ? allowInAnd(parseNonParameterInitializer)
-                : doOutsideOfContext(2 /* Yield */ | 1 /* DisallowIn */, parseNonParameterInitializer);
+                : doOutsideOfContext(8388608 /* YieldContext */ | 4194304 /* DisallowInContext */, parseNonParameterInitializer);
             parseSemicolon();
             return finishNode(property);
         }
@@ -11275,6 +11728,7 @@ var ts;
                 case 110 /* PrivateKeyword */:
                 case 111 /* ProtectedKeyword */:
                 case 113 /* StaticKeyword */:
+                case 127 /* ReadonlyKeyword */:
                     return true;
                 default:
                     return false;
@@ -11315,7 +11769,7 @@ var ts;
             // If we were able to get any potential identifier...
             if (idToken !== undefined) {
                 // If we have a non-keyword identifier, or if we have an accessor, then it's safe to parse.
-                if (!ts.isKeyword(idToken) || idToken === 129 /* SetKeyword */ || idToken === 123 /* GetKeyword */) {
+                if (!ts.isKeyword(idToken) || idToken === 130 /* SetKeyword */ || idToken === 123 /* GetKeyword */) {
                     return true;
                 }
                 // If it *is* a keyword, but not an accessor, check a little farther along
@@ -11349,7 +11803,7 @@ var ts;
                     decorators = [];
                     decorators.pos = decoratorStart;
                 }
-                var decorator = createNode(140 /* Decorator */, decoratorStart);
+                var decorator = createNode(142 /* Decorator */, decoratorStart);
                 decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher);
                 decorators.push(finishNode(decorator));
             }
@@ -11414,7 +11868,7 @@ var ts;
         }
         function parseClassElement() {
             if (token === 23 /* SemicolonToken */) {
-                var result = createNode(194 /* SemicolonClassElement */);
+                var result = createNode(197 /* SemicolonClassElement */);
                 nextToken();
                 return finishNode(result);
             }
@@ -11452,10 +11906,10 @@ var ts;
             return parseClassDeclarationOrExpression(
             /*fullStart*/ scanner.getStartPos(), 
             /*decorators*/ undefined, 
-            /*modifiers*/ undefined, 189 /* ClassExpression */);
+            /*modifiers*/ undefined, 191 /* ClassExpression */);
         }
         function parseClassDeclaration(fullStart, decorators, modifiers) {
-            return parseClassDeclarationOrExpression(fullStart, decorators, modifiers, 217 /* ClassDeclaration */);
+            return parseClassDeclarationOrExpression(fullStart, decorators, modifiers, 220 /* ClassDeclaration */);
         }
         function parseClassDeclarationOrExpression(fullStart, decorators, modifiers, kind) {
             var node = createNode(kind, fullStart);
@@ -11499,7 +11953,7 @@ var ts;
         }
         function parseHeritageClause() {
             if (token === 83 /* ExtendsKeyword */ || token === 106 /* ImplementsKeyword */) {
-                var node = createNode(246 /* HeritageClause */);
+                var node = createNode(250 /* HeritageClause */);
                 node.token = token;
                 nextToken();
                 node.types = parseDelimitedList(7 /* HeritageClauseElement */, parseExpressionWithTypeArguments);
@@ -11508,7 +11962,7 @@ var ts;
             return undefined;
         }
         function parseExpressionWithTypeArguments() {
-            var node = createNode(191 /* ExpressionWithTypeArguments */);
+            var node = createNode(193 /* ExpressionWithTypeArguments */);
             node.expression = parseLeftHandSideExpressionOrHigher();
             if (token === 25 /* LessThanToken */) {
                 node.typeArguments = parseBracketedList(18 /* TypeArguments */, parseType, 25 /* LessThanToken */, 27 /* GreaterThanToken */);
@@ -11522,7 +11976,7 @@ var ts;
             return parseList(5 /* ClassMembers */, parseClassElement);
         }
         function parseInterfaceDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(218 /* InterfaceDeclaration */, fullStart);
+            var node = createNode(221 /* InterfaceDeclaration */, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(107 /* InterfaceKeyword */);
@@ -11533,10 +11987,10 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAliasDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(219 /* TypeAliasDeclaration */, fullStart);
+            var node = createNode(222 /* TypeAliasDeclaration */, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
-            parseExpected(132 /* TypeKeyword */);
+            parseExpected(133 /* TypeKeyword */);
             node.name = parseIdentifier();
             node.typeParameters = parseTypeParameters();
             parseExpected(56 /* EqualsToken */);
@@ -11549,13 +12003,13 @@ var ts;
         // ConstantEnumMemberSection, which starts at the beginning of an enum declaration
         // or any time an integer literal initializer is encountered.
         function parseEnumMember() {
-            var node = createNode(250 /* EnumMember */, scanner.getStartPos());
+            var node = createNode(254 /* EnumMember */, scanner.getStartPos());
             node.name = parsePropertyName();
             node.initializer = allowInAnd(parseNonParameterInitializer);
             return finishNode(node);
         }
         function parseEnumDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(220 /* EnumDeclaration */, fullStart);
+            var node = createNode(223 /* EnumDeclaration */, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             parseExpected(81 /* EnumKeyword */);
@@ -11570,7 +12024,7 @@ var ts;
             return finishNode(node);
         }
         function parseModuleBlock() {
-            var node = createNode(222 /* ModuleBlock */, scanner.getStartPos());
+            var node = createNode(225 /* ModuleBlock */, scanner.getStartPos());
             if (parseExpected(15 /* OpenBraceToken */)) {
                 node.statements = parseList(1 /* BlockStatements */, parseStatement);
                 parseExpected(16 /* CloseBraceToken */);
@@ -11581,27 +12035,27 @@ var ts;
             return finishNode(node);
         }
         function parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags) {
-            var node = createNode(221 /* ModuleDeclaration */, fullStart);
+            var node = createNode(224 /* ModuleDeclaration */, fullStart);
             // If we are parsing a dotted namespace name, we want to
             // propagate the 'Namespace' flag across the names if set.
-            var namespaceFlag = flags & 65536 /* Namespace */;
+            var namespaceFlag = flags & 4096 /* Namespace */;
             node.decorators = decorators;
             setModifiers(node, modifiers);
             node.flags |= flags;
             node.name = parseIdentifier();
             node.body = parseOptional(21 /* DotToken */)
-                ? parseModuleOrNamespaceDeclaration(getNodePos(), /*decorators*/ undefined, /*modifiers*/ undefined, 2 /* Export */ | namespaceFlag)
+                ? parseModuleOrNamespaceDeclaration(getNodePos(), /*decorators*/ undefined, /*modifiers*/ undefined, 1 /* Export */ | namespaceFlag)
                 : parseModuleBlock();
             return finishNode(node);
         }
         function parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(221 /* ModuleDeclaration */, fullStart);
+            var node = createNode(224 /* ModuleDeclaration */, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
-            if (token === 134 /* GlobalKeyword */) {
+            if (token === 136 /* GlobalKeyword */) {
                 // parse 'global' as name of global scope augmentation 
                 node.name = parseIdentifier();
-                node.flags |= 2097152 /* GlobalAugmentation */;
+                node.flags |= 131072 /* GlobalAugmentation */;
             }
             else {
                 node.name = parseLiteralNode(/*internName*/ true);
@@ -11611,12 +12065,12 @@ var ts;
         }
         function parseModuleDeclaration(fullStart, decorators, modifiers) {
             var flags = modifiers ? modifiers.flags : 0;
-            if (token === 134 /* GlobalKeyword */) {
+            if (token === 136 /* GlobalKeyword */) {
                 // global augmentation
                 return parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers);
             }
             else if (parseOptional(126 /* NamespaceKeyword */)) {
-                flags |= 65536 /* Namespace */;
+                flags |= 4096 /* Namespace */;
             }
             else {
                 parseExpected(125 /* ModuleKeyword */);
@@ -11627,7 +12081,7 @@ var ts;
             return parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags);
         }
         function isExternalModuleReference() {
-            return token === 127 /* RequireKeyword */ &&
+            return token === 128 /* RequireKeyword */ &&
                 lookAhead(nextTokenIsOpenParen);
         }
         function nextTokenIsOpenParen() {
@@ -11636,17 +12090,27 @@ var ts;
         function nextTokenIsSlash() {
             return nextToken() === 39 /* SlashToken */;
         }
+        function parseGlobalModuleExportDeclaration(fullStart, decorators, modifiers) {
+            var exportDeclaration = createNode(227 /* GlobalModuleExportDeclaration */, fullStart);
+            exportDeclaration.decorators = decorators;
+            exportDeclaration.modifiers = modifiers;
+            parseExpected(116 /* AsKeyword */);
+            parseExpected(126 /* NamespaceKeyword */);
+            exportDeclaration.name = parseIdentifier();
+            parseExpected(23 /* SemicolonToken */);
+            return finishNode(exportDeclaration);
+        }
         function parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers) {
             parseExpected(89 /* ImportKeyword */);
             var afterImportPos = scanner.getStartPos();
             var identifier;
             if (isIdentifier()) {
                 identifier = parseIdentifier();
-                if (token !== 24 /* CommaToken */ && token !== 133 /* FromKeyword */) {
+                if (token !== 24 /* CommaToken */ && token !== 135 /* FromKeyword */) {
                     // ImportEquals declaration of type:
                     // import x = require("mod"); or
                     // import x = M.x;
-                    var importEqualsDeclaration = createNode(224 /* ImportEqualsDeclaration */, fullStart);
+                    var importEqualsDeclaration = createNode(228 /* ImportEqualsDeclaration */, fullStart);
                     importEqualsDeclaration.decorators = decorators;
                     setModifiers(importEqualsDeclaration, modifiers);
                     importEqualsDeclaration.name = identifier;
@@ -11657,7 +12121,7 @@ var ts;
                 }
             }
             // Import statement
-            var importDeclaration = createNode(225 /* ImportDeclaration */, fullStart);
+            var importDeclaration = createNode(229 /* ImportDeclaration */, fullStart);
             importDeclaration.decorators = decorators;
             setModifiers(importDeclaration, modifiers);
             // ImportDeclaration:
@@ -11667,7 +12131,7 @@ var ts;
                 token === 37 /* AsteriskToken */ ||
                 token === 15 /* OpenBraceToken */) {
                 importDeclaration.importClause = parseImportClause(identifier, afterImportPos);
-                parseExpected(133 /* FromKeyword */);
+                parseExpected(135 /* FromKeyword */);
             }
             importDeclaration.moduleSpecifier = parseModuleSpecifier();
             parseSemicolon();
@@ -11680,7 +12144,7 @@ var ts;
             //  NamedImports
             //  ImportedDefaultBinding, NameSpaceImport
             //  ImportedDefaultBinding, NamedImports
-            var importClause = createNode(226 /* ImportClause */, fullStart);
+            var importClause = createNode(230 /* ImportClause */, fullStart);
             if (identifier) {
                 // ImportedDefaultBinding:
                 //  ImportedBinding
@@ -11690,7 +12154,7 @@ var ts;
             // parse namespace or named imports
             if (!importClause.name ||
                 parseOptional(24 /* CommaToken */)) {
-                importClause.namedBindings = token === 37 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(228 /* NamedImports */);
+                importClause.namedBindings = token === 37 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(232 /* NamedImports */);
             }
             return finishNode(importClause);
         }
@@ -11700,8 +12164,8 @@ var ts;
                 : parseEntityName(/*allowReservedWords*/ false);
         }
         function parseExternalModuleReference() {
-            var node = createNode(235 /* ExternalModuleReference */);
-            parseExpected(127 /* RequireKeyword */);
+            var node = createNode(239 /* ExternalModuleReference */);
+            parseExpected(128 /* RequireKeyword */);
             parseExpected(17 /* OpenParenToken */);
             node.expression = parseModuleSpecifier();
             parseExpected(18 /* CloseParenToken */);
@@ -11723,7 +12187,7 @@ var ts;
         function parseNamespaceImport() {
             // NameSpaceImport:
             //  * as ImportedBinding
-            var namespaceImport = createNode(227 /* NamespaceImport */);
+            var namespaceImport = createNode(231 /* NamespaceImport */);
             parseExpected(37 /* AsteriskToken */);
             parseExpected(116 /* AsKeyword */);
             namespaceImport.name = parseIdentifier();
@@ -11738,21 +12202,21 @@ var ts;
             // ImportsList:
             //  ImportSpecifier
             //  ImportsList, ImportSpecifier
-            node.elements = parseBracketedList(21 /* ImportOrExportSpecifiers */, kind === 228 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 15 /* OpenBraceToken */, 16 /* CloseBraceToken */);
+            node.elements = parseBracketedList(21 /* ImportOrExportSpecifiers */, kind === 232 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 15 /* OpenBraceToken */, 16 /* CloseBraceToken */);
             return finishNode(node);
         }
         function parseExportSpecifier() {
-            return parseImportOrExportSpecifier(233 /* ExportSpecifier */);
+            return parseImportOrExportSpecifier(237 /* ExportSpecifier */);
         }
         function parseImportSpecifier() {
-            return parseImportOrExportSpecifier(229 /* ImportSpecifier */);
+            return parseImportOrExportSpecifier(233 /* ImportSpecifier */);
         }
         function parseImportOrExportSpecifier(kind) {
             var node = createNode(kind);
             // ImportSpecifier:
             //   BindingIdentifier
             //   IdentifierName as BindingIdentifier
-            // ExportSpecififer:
+            // ExportSpecifier:
             //   IdentifierName
             //   IdentifierName as IdentifierName
             var checkIdentifierIsKeyword = ts.isKeyword(token) && !isIdentifier();
@@ -11770,27 +12234,27 @@ var ts;
             else {
                 node.name = identifierName;
             }
-            if (kind === 229 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
+            if (kind === 233 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
                 // Report error identifier expected
                 parseErrorAtPosition(checkIdentifierStart, checkIdentifierEnd - checkIdentifierStart, ts.Diagnostics.Identifier_expected);
             }
             return finishNode(node);
         }
         function parseExportDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(231 /* ExportDeclaration */, fullStart);
+            var node = createNode(235 /* ExportDeclaration */, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             if (parseOptional(37 /* AsteriskToken */)) {
-                parseExpected(133 /* FromKeyword */);
+                parseExpected(135 /* FromKeyword */);
                 node.moduleSpecifier = parseModuleSpecifier();
             }
             else {
-                node.exportClause = parseNamedImportsOrExports(232 /* NamedExports */);
+                node.exportClause = parseNamedImportsOrExports(236 /* NamedExports */);
                 // It is not uncommon to accidentally omit the 'from' keyword. Additionally, in editing scenarios,
                 // the 'from' keyword can be parsed as a named export when the export clause is unterminated (i.e. `export { from "moduleName";`)
                 // If we don't have a 'from' keyword, see if we have a string literal such that ASI won't take effect.
-                if (token === 133 /* FromKeyword */ || (token === 9 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) {
-                    parseExpected(133 /* FromKeyword */);
+                if (token === 135 /* FromKeyword */ || (token === 9 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) {
+                    parseExpected(135 /* FromKeyword */);
                     node.moduleSpecifier = parseModuleSpecifier();
                 }
             }
@@ -11798,7 +12262,7 @@ var ts;
             return finishNode(node);
         }
         function parseExportAssignment(fullStart, decorators, modifiers) {
-            var node = createNode(230 /* ExportAssignment */, fullStart);
+            var node = createNode(234 /* ExportAssignment */, fullStart);
             node.decorators = decorators;
             setModifiers(node, modifiers);
             if (parseOptional(56 /* EqualsToken */)) {
@@ -11814,6 +12278,7 @@ var ts;
         function processReferenceComments(sourceFile) {
             var triviaScanner = ts.createScanner(sourceFile.languageVersion, /*skipTrivia*/ false, 0 /* Standard */, sourceText);
             var referencedFiles = [];
+            var typeReferenceDirectives = [];
             var amdDependencies = [];
             var amdModuleName;
             // Keep scanning all the leading trivia in the file until we get to something that
@@ -11837,7 +12302,12 @@ var ts;
                     sourceFile.hasNoDefaultLib = referencePathMatchResult.isNoDefaultLib;
                     var diagnosticMessage = referencePathMatchResult.diagnosticMessage;
                     if (fileReference) {
-                        referencedFiles.push(fileReference);
+                        if (referencePathMatchResult.isTypeReferenceDirective) {
+                            typeReferenceDirectives.push(fileReference);
+                        }
+                        else {
+                            referencedFiles.push(fileReference);
+                        }
                     }
                     if (diagnosticMessage) {
                         parseDiagnostics.push(ts.createFileDiagnostic(sourceFile, range.pos, range.end - range.pos, diagnosticMessage));
@@ -11867,16 +12337,17 @@ var ts;
                 }
             }
             sourceFile.referencedFiles = referencedFiles;
+            sourceFile.typeReferenceDirectives = typeReferenceDirectives;
             sourceFile.amdDependencies = amdDependencies;
             sourceFile.moduleName = amdModuleName;
         }
         function setExternalModuleIndicator(sourceFile) {
             sourceFile.externalModuleIndicator = ts.forEach(sourceFile.statements, function (node) {
-                return node.flags & 2 /* Export */
-                    || node.kind === 224 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 235 /* ExternalModuleReference */
-                    || node.kind === 225 /* ImportDeclaration */
-                    || node.kind === 230 /* ExportAssignment */
-                    || node.kind === 231 /* ExportDeclaration */
+                return node.flags & 1 /* Export */
+                    || node.kind === 228 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 239 /* ExternalModuleReference */
+                    || node.kind === 229 /* ImportDeclaration */
+                    || node.kind === 234 /* ExportAssignment */
+                    || node.kind === 235 /* ExportDeclaration */
                     ? node
                     : undefined;
             });
@@ -11937,21 +12408,19 @@ var ts;
             }
             JSDocParser.isJSDocType = isJSDocType;
             function parseJSDocTypeExpressionForTests(content, start, length) {
-                initializeState("file.js", content, 2 /* Latest */, /*isJavaScriptFile*/ true, /*_syntaxCursor:*/ undefined);
-                var jsDocTypeExpression = parseJSDocTypeExpression(start, length);
+                initializeState("file.js", content, 2 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
+                scanner.setText(content, start, length);
+                token = scanner.scan();
+                var jsDocTypeExpression = parseJSDocTypeExpression();
                 var diagnostics = parseDiagnostics;
                 clearState();
                 return jsDocTypeExpression ? { jsDocTypeExpression: jsDocTypeExpression, diagnostics: diagnostics } : undefined;
             }
             JSDocParser.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
-            // Parses out a JSDoc type expression.  The starting position should be right at the open
-            // curly in the type expression.  Returns 'undefined' if it encounters any errors while parsing.
+            // Parses out a JSDoc type expression.
             /* @internal */
-            function parseJSDocTypeExpression(start, length) {
-                scanner.setText(sourceText, start, length);
-                // Prime the first token for us to start processing.
-                token = nextToken();
-                var result = createNode(252 /* JSDocTypeExpression */);
+            function parseJSDocTypeExpression() {
+                var result = createNode(256 /* JSDocTypeExpression */, scanner.getTokenPos());
                 parseExpected(15 /* OpenBraceToken */);
                 result.type = parseJSDocTopLevelType();
                 parseExpected(16 /* CloseBraceToken */);
@@ -11962,12 +12431,12 @@ var ts;
             function parseJSDocTopLevelType() {
                 var type = parseJSDocType();
                 if (token === 47 /* BarToken */) {
-                    var unionType = createNode(256 /* JSDocUnionType */, type.pos);
+                    var unionType = createNode(260 /* JSDocUnionType */, type.pos);
                     unionType.types = parseJSDocTypeList(type);
                     type = finishNode(unionType);
                 }
                 if (token === 56 /* EqualsToken */) {
-                    var optionalType = createNode(263 /* JSDocOptionalType */, type.pos);
+                    var optionalType = createNode(267 /* JSDocOptionalType */, type.pos);
                     nextToken();
                     optionalType.type = type;
                     type = finishNode(optionalType);
@@ -11978,20 +12447,20 @@ var ts;
                 var type = parseBasicTypeExpression();
                 while (true) {
                     if (token === 19 /* OpenBracketToken */) {
-                        var arrayType = createNode(255 /* JSDocArrayType */, type.pos);
+                        var arrayType = createNode(259 /* JSDocArrayType */, type.pos);
                         arrayType.elementType = type;
                         nextToken();
                         parseExpected(20 /* CloseBracketToken */);
                         type = finishNode(arrayType);
                     }
                     else if (token === 53 /* QuestionToken */) {
-                        var nullableType = createNode(258 /* JSDocNullableType */, type.pos);
+                        var nullableType = createNode(262 /* JSDocNullableType */, type.pos);
                         nullableType.type = type;
                         nextToken();
                         type = finishNode(nullableType);
                     }
                     else if (token === 49 /* ExclamationToken */) {
-                        var nonNullableType = createNode(259 /* JSDocNonNullableType */, type.pos);
+                        var nonNullableType = createNode(263 /* JSDocNonNullableType */, type.pos);
                         nonNullableType.type = type;
                         nextToken();
                         type = finishNode(nonNullableType);
@@ -12025,10 +12494,10 @@ var ts;
                     case 97 /* ThisKeyword */:
                         return parseJSDocThisType();
                     case 117 /* AnyKeyword */:
-                    case 130 /* StringKeyword */:
-                    case 128 /* NumberKeyword */:
+                    case 131 /* StringKeyword */:
+                    case 129 /* NumberKeyword */:
                     case 120 /* BooleanKeyword */:
-                    case 131 /* SymbolKeyword */:
+                    case 132 /* SymbolKeyword */:
                     case 103 /* VoidKeyword */:
                         return parseTokenNode();
                 }
@@ -12036,27 +12505,27 @@ var ts;
                 return parseJSDocTypeReference();
             }
             function parseJSDocThisType() {
-                var result = createNode(267 /* JSDocThisType */);
+                var result = createNode(271 /* JSDocThisType */);
                 nextToken();
                 parseExpected(54 /* ColonToken */);
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocConstructorType() {
-                var result = createNode(266 /* JSDocConstructorType */);
+                var result = createNode(270 /* JSDocConstructorType */);
                 nextToken();
                 parseExpected(54 /* ColonToken */);
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocVariadicType() {
-                var result = createNode(265 /* JSDocVariadicType */);
+                var result = createNode(269 /* JSDocVariadicType */);
                 nextToken();
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocFunctionType() {
-                var result = createNode(264 /* JSDocFunctionType */);
+                var result = createNode(268 /* JSDocFunctionType */);
                 nextToken();
                 parseExpected(17 /* OpenParenToken */);
                 result.parameters = parseDelimitedList(22 /* JSDocFunctionParameters */, parseJSDocParameter);
@@ -12069,20 +12538,28 @@ var ts;
                 return finishNode(result);
             }
             function parseJSDocParameter() {
-                var parameter = createNode(139 /* Parameter */);
+                var parameter = createNode(141 /* Parameter */);
                 parameter.type = parseJSDocType();
+                if (parseOptional(56 /* EqualsToken */)) {
+                    parameter.questionToken = createNode(56 /* EqualsToken */);
+                }
                 return finishNode(parameter);
             }
             function parseJSDocTypeReference() {
-                var result = createNode(262 /* JSDocTypeReference */);
+                var result = createNode(266 /* JSDocTypeReference */);
                 result.name = parseSimplePropertyName();
-                while (parseOptional(21 /* DotToken */)) {
-                    if (token === 25 /* LessThanToken */) {
-                        result.typeArguments = parseTypeArguments();
-                        break;
-                    }
-                    else {
-                        result.name = parseQualifiedName(result.name);
+                if (token === 25 /* LessThanToken */) {
+                    result.typeArguments = parseTypeArguments();
+                }
+                else {
+                    while (parseOptional(21 /* DotToken */)) {
+                        if (token === 25 /* LessThanToken */) {
+                            result.typeArguments = parseTypeArguments();
+                            break;
+                        }
+                        else {
+                            result.name = parseQualifiedName(result.name);
+                        }
                     }
                 }
                 return finishNode(result);
@@ -12104,13 +12581,13 @@ var ts;
                 }
             }
             function parseQualifiedName(left) {
-                var result = createNode(136 /* QualifiedName */, left.pos);
+                var result = createNode(138 /* QualifiedName */, left.pos);
                 result.left = left;
                 result.right = parseIdentifierName();
                 return finishNode(result);
             }
             function parseJSDocRecordType() {
-                var result = createNode(260 /* JSDocRecordType */);
+                var result = createNode(264 /* JSDocRecordType */);
                 nextToken();
                 result.members = parseDelimitedList(24 /* JSDocRecordMembers */, parseJSDocRecordMember);
                 checkForTrailingComma(result.members);
@@ -12118,7 +12595,7 @@ var ts;
                 return finishNode(result);
             }
             function parseJSDocRecordMember() {
-                var result = createNode(261 /* JSDocRecordMember */);
+                var result = createNode(265 /* JSDocRecordMember */);
                 result.name = parseSimplePropertyName();
                 if (token === 54 /* ColonToken */) {
                     nextToken();
@@ -12127,13 +12604,13 @@ var ts;
                 return finishNode(result);
             }
             function parseJSDocNonNullableType() {
-                var result = createNode(259 /* JSDocNonNullableType */);
+                var result = createNode(263 /* JSDocNonNullableType */);
                 nextToken();
                 result.type = parseJSDocType();
                 return finishNode(result);
             }
             function parseJSDocTupleType() {
-                var result = createNode(257 /* JSDocTupleType */);
+                var result = createNode(261 /* JSDocTupleType */);
                 nextToken();
                 result.types = parseDelimitedList(25 /* JSDocTupleTypes */, parseJSDocType);
                 checkForTrailingComma(result.types);
@@ -12147,7 +12624,7 @@ var ts;
                 }
             }
             function parseJSDocUnionType() {
-                var result = createNode(256 /* JSDocUnionType */);
+                var result = createNode(260 /* JSDocUnionType */);
                 nextToken();
                 result.types = parseJSDocTypeList(parseJSDocType());
                 parseExpected(18 /* CloseParenToken */);
@@ -12165,7 +12642,7 @@ var ts;
                 return types;
             }
             function parseJSDocAllType() {
-                var result = createNode(253 /* JSDocAllType */);
+                var result = createNode(257 /* JSDocAllType */);
                 nextToken();
                 return finishNode(result);
             }
@@ -12188,29 +12665,35 @@ var ts;
                     token === 27 /* GreaterThanToken */ ||
                     token === 56 /* EqualsToken */ ||
                     token === 47 /* BarToken */) {
-                    var result = createNode(254 /* JSDocUnknownType */, pos);
+                    var result = createNode(258 /* JSDocUnknownType */, pos);
                     return finishNode(result);
                 }
                 else {
-                    var result = createNode(258 /* JSDocNullableType */, pos);
+                    var result = createNode(262 /* JSDocNullableType */, pos);
                     result.type = parseJSDocType();
                     return finishNode(result);
                 }
             }
             function parseIsolatedJSDocComment(content, start, length) {
-                initializeState("file.js", content, 2 /* Latest */, /*isJavaScriptFile*/ true, /*_syntaxCursor:*/ undefined);
-                var jsDocComment = parseJSDocComment(/*parent:*/ undefined, start, length);
+                initializeState("file.js", content, 2 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
+                sourceFile = { languageVariant: 0 /* Standard */, text: content };
+                var jsDocComment = parseJSDocCommentWorker(start, length);
                 var diagnostics = parseDiagnostics;
                 clearState();
                 return jsDocComment ? { jsDocComment: jsDocComment, diagnostics: diagnostics } : undefined;
             }
             JSDocParser.parseIsolatedJSDocComment = parseIsolatedJSDocComment;
             function parseJSDocComment(parent, start, length) {
+                var saveToken = token;
+                var saveParseDiagnosticsLength = parseDiagnostics.length;
+                var saveParseErrorBeforeNextFinishedNode = parseErrorBeforeNextFinishedNode;
                 var comment = parseJSDocCommentWorker(start, length);
                 if (comment) {
-                    fixupParentReferences(comment);
                     comment.parent = parent;
                 }
+                token = saveToken;
+                parseDiagnostics.length = saveParseDiagnosticsLength;
+                parseErrorBeforeNextFinishedNode = saveParseErrorBeforeNextFinishedNode;
                 return comment;
             }
             JSDocParser.parseJSDocComment = parseJSDocComment;
@@ -12223,77 +12706,75 @@ var ts;
                 ts.Debug.assert(start <= end);
                 ts.Debug.assert(end <= content.length);
                 var tags;
-                var pos;
-                // NOTE(cyrusn): This is essentially a handwritten scanner for JSDocComments. I
-                // considered using an actual Scanner, but this would complicate things.  The
-                // scanner would need to know it was in a Doc Comment.  Otherwise, it would then
-                // produce comments *inside* the doc comment.  In the end it was just easier to
-                // write a simple scanner rather than go that route.
-                if (length >= "/** */".length) {
-                    if (content.charCodeAt(start) === 47 /* slash */ &&
-                        content.charCodeAt(start + 1) === 42 /* asterisk */ &&
-                        content.charCodeAt(start + 2) === 42 /* asterisk */ &&
-                        content.charCodeAt(start + 3) !== 42 /* asterisk */) {
+                var result;
+                // Check for /** (JSDoc opening part)
+                if (content.charCodeAt(start) === 47 /* slash */ &&
+                    content.charCodeAt(start + 1) === 42 /* asterisk */ &&
+                    content.charCodeAt(start + 2) === 42 /* asterisk */ &&
+                    content.charCodeAt(start + 3) !== 42 /* asterisk */) {
+                    // + 3 for leading /**, - 5 in total for /** */
+                    scanner.scanRange(start + 3, length - 5, function () {
                         // Initially we can parse out a tag.  We also have seen a starting asterisk.
                         // This is so that /** * @type */ doesn't parse.
                         var canParseTag = true;
                         var seenAsterisk = true;
-                        for (pos = start + "/**".length; pos < end;) {
-                            var ch = content.charCodeAt(pos);
-                            pos++;
-                            if (ch === 64 /* at */ && canParseTag) {
-                                parseTag();
-                                // Once we parse out a tag, we cannot keep parsing out tags on this line.
-                                canParseTag = false;
-                                continue;
-                            }
-                            if (ts.isLineBreak(ch)) {
-                                // After a line break, we can parse a tag, and we haven't seen as asterisk
-                                // on the next line yet.
-                                canParseTag = true;
-                                seenAsterisk = false;
-                                continue;
-                            }
-                            if (ts.isWhiteSpace(ch)) {
-                                // Whitespace doesn't affect any of our parsing.
-                                continue;
-                            }
-                            // Ignore the first asterisk on a line.
-                            if (ch === 42 /* asterisk */) {
-                                if (seenAsterisk) {
-                                    // If we've already seen an asterisk, then we can no longer parse a tag
-                                    // on this line.
+                        nextJSDocToken();
+                        while (token !== 1 /* EndOfFileToken */) {
+                            switch (token) {
+                                case 55 /* AtToken */:
+                                    if (canParseTag) {
+                                        parseTag();
+                                    }
+                                    // This will take us to the end of the line, so it's OK to parse a tag on the next pass through the loop
+                                    seenAsterisk = false;
+                                    break;
+                                case 4 /* NewLineTrivia */:
+                                    // After a line break, we can parse a tag, and we haven't seen an asterisk on the next line yet
+                                    canParseTag = true;
+                                    seenAsterisk = false;
+                                    break;
+                                case 37 /* AsteriskToken */:
+                                    if (seenAsterisk) {
+                                        // If we've already seen an asterisk, then we can no longer parse a tag on this line
+                                        canParseTag = false;
+                                    }
+                                    // Ignore the first asterisk on a line
+                                    seenAsterisk = true;
+                                    break;
+                                case 69 /* Identifier */:
+                                    // Anything else is doc comment text.  We can't do anything with it.  Because it
+                                    // wasn't a tag, we can no longer parse a tag on this line until we hit the next
+                                    // line break.
                                     canParseTag = false;
-                                }
-                                seenAsterisk = true;
-                                continue;
+                                    break;
+                                case 1 /* EndOfFileToken */:
+                                    break;
                             }
-                            // Anything else is doc comment text.  We can't do anything with it.  Because it
-                            // wasn't a tag, we can no longer parse a tag on this line until we hit the next
-                            // line break.
-                            canParseTag = false;
+                            nextJSDocToken();
                         }
-                    }
+                        result = createJSDocComment();
+                    });
                 }
-                return createJSDocComment();
+                return result;
                 function createJSDocComment() {
                     if (!tags) {
                         return undefined;
                     }
-                    var result = createNode(268 /* JSDocComment */, start);
+                    var result = createNode(272 /* JSDocComment */, start);
                     result.tags = tags;
                     return finishNode(result, end);
                 }
                 function skipWhitespace() {
-                    while (pos < end && ts.isWhiteSpace(content.charCodeAt(pos))) {
-                        pos++;
+                    while (token === 5 /* WhitespaceTrivia */ || token === 4 /* NewLineTrivia */) {
+                        nextJSDocToken();
                     }
                 }
                 function parseTag() {
-                    ts.Debug.assert(content.charCodeAt(pos - 1) === 64 /* at */);
-                    var atToken = createNode(55 /* AtToken */, pos - 1);
-                    atToken.end = pos;
-                    var tagName = scanIdentifier();
+                    ts.Debug.assert(token === 55 /* AtToken */);
+                    var atToken = createNode(55 /* AtToken */, scanner.getTokenPos());
+                    atToken.end = scanner.getTextPos();
+                    nextJSDocToken();
+                    var tagName = parseJSDocIdentifier();
                     if (!tagName) {
                         return;
                     }
@@ -12317,10 +12798,10 @@ var ts;
                     return undefined;
                 }
                 function handleUnknownTag(atToken, tagName) {
-                    var result = createNode(269 /* JSDocTag */, atToken.pos);
+                    var result = createNode(273 /* JSDocTag */, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
-                    return finishNode(result, pos);
+                    return finishNode(result);
                 }
                 function addTag(tag) {
                     if (tag) {
@@ -12333,12 +12814,10 @@ var ts;
                     }
                 }
                 function tryParseTypeExpression() {
-                    skipWhitespace();
-                    if (content.charCodeAt(pos) !== 123 /* openBrace */) {
+                    if (token !== 15 /* OpenBraceToken */) {
                         return undefined;
                     }
-                    var typeExpression = parseJSDocTypeExpression(pos, end - pos);
-                    pos = typeExpression.end;
+                    var typeExpression = parseJSDocTypeExpression();
                     return typeExpression;
                 }
                 function handleParamTag(atToken, tagName) {
@@ -12346,17 +12825,22 @@ var ts;
                     skipWhitespace();
                     var name;
                     var isBracketed;
-                    if (content.charCodeAt(pos) === 91 /* openBracket */) {
-                        pos++;
-                        skipWhitespace();
-                        name = scanIdentifier();
+                    // Looking for something like '[foo]' or 'foo'
+                    if (parseOptionalToken(19 /* OpenBracketToken */)) {
+                        name = parseJSDocIdentifier();
                         isBracketed = true;
+                        // May have an optional default, e.g. '[foo = 42]'
+                        if (parseOptionalToken(56 /* EqualsToken */)) {
+                            parseExpression();
+                        }
+                        parseExpected(20 /* CloseBracketToken */);
                     }
-                    else {
-                        name = scanIdentifier();
+                    else if (token === 69 /* Identifier */) {
+                        name = parseJSDocIdentifier();
                     }
                     if (!name) {
-                        parseErrorAtPosition(pos, 0, ts.Diagnostics.Identifier_expected);
+                        parseErrorAtPosition(scanner.getStartPos(), 0, ts.Diagnostics.Identifier_expected);
+                        return undefined;
                     }
                     var preName, postName;
                     if (typeExpression) {
@@ -12368,84 +12852,82 @@ var ts;
                     if (!typeExpression) {
                         typeExpression = tryParseTypeExpression();
                     }
-                    var result = createNode(270 /* JSDocParameterTag */, atToken.pos);
+                    var result = createNode(274 /* JSDocParameterTag */, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.preParameterName = preName;
                     result.typeExpression = typeExpression;
                     result.postParameterName = postName;
                     result.isBracketed = isBracketed;
-                    return finishNode(result, pos);
+                    return finishNode(result);
                 }
                 function handleReturnTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 271 /* JSDocReturnTag */; })) {
-                        parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
+                    if (ts.forEach(tags, function (t) { return t.kind === 275 /* JSDocReturnTag */; })) {
+                        parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
-                    var result = createNode(271 /* JSDocReturnTag */, atToken.pos);
+                    var result = createNode(275 /* JSDocReturnTag */, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
-                    return finishNode(result, pos);
+                    return finishNode(result);
                 }
                 function handleTypeTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 272 /* JSDocTypeTag */; })) {
-                        parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
+                    if (ts.forEach(tags, function (t) { return t.kind === 276 /* JSDocTypeTag */; })) {
+                        parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
-                    var result = createNode(272 /* JSDocTypeTag */, atToken.pos);
+                    var result = createNode(276 /* JSDocTypeTag */, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
-                    return finishNode(result, pos);
+                    return finishNode(result);
                 }
                 function handleTemplateTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 273 /* JSDocTemplateTag */; })) {
-                        parseErrorAtPosition(tagName.pos, pos - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
+                    if (ts.forEach(tags, function (t) { return t.kind === 277 /* JSDocTemplateTag */; })) {
+                        parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
                     }
+                    // Type parameter list looks like '@template T,U,V'
                     var typeParameters = [];
-                    typeParameters.pos = pos;
+                    typeParameters.pos = scanner.getStartPos();
                     while (true) {
-                        skipWhitespace();
-                        var startPos = pos;
-                        var name_8 = scanIdentifier();
+                        var name_8 = parseJSDocIdentifier();
                         if (!name_8) {
-                            parseErrorAtPosition(startPos, 0, ts.Diagnostics.Identifier_expected);
+                            parseErrorAtPosition(scanner.getStartPos(), 0, ts.Diagnostics.Identifier_expected);
                             return undefined;
                         }
-                        var typeParameter = createNode(138 /* TypeParameter */, name_8.pos);
+                        var typeParameter = createNode(140 /* TypeParameter */, name_8.pos);
                         typeParameter.name = name_8;
-                        finishNode(typeParameter, pos);
+                        finishNode(typeParameter);
                         typeParameters.push(typeParameter);
-                        skipWhitespace();
-                        if (content.charCodeAt(pos) !== 44 /* comma */) {
+                        if (token === 24 /* CommaToken */) {
+                            nextJSDocToken();
+                        }
+                        else {
                             break;
                         }
-                        pos++;
                     }
-                    typeParameters.end = pos;
-                    var result = createNode(273 /* JSDocTemplateTag */, atToken.pos);
+                    var result = createNode(277 /* JSDocTemplateTag */, atToken.pos);
                     result.atToken = atToken;
                     result.tagName = tagName;
                     result.typeParameters = typeParameters;
-                    return finishNode(result, pos);
+                    finishNode(result);
+                    typeParameters.end = result.end;
+                    return result;
                 }
-                function scanIdentifier() {
-                    var startPos = pos;
-                    for (; pos < end; pos++) {
-                        var ch = content.charCodeAt(pos);
-                        if (pos === startPos && ts.isIdentifierStart(ch, 2 /* Latest */)) {
-                            continue;
-                        }
-                        else if (pos > startPos && ts.isIdentifierPart(ch, 2 /* Latest */)) {
-                            continue;
-                        }
-                        break;
-                    }
-                    if (startPos === pos) {
+                function nextJSDocToken() {
+                    return token = scanner.scanJSDocToken();
+                }
+                function parseJSDocIdentifier() {
+                    if (token !== 69 /* Identifier */) {
+                        parseErrorAtCurrentToken(ts.Diagnostics.Identifier_expected);
                         return undefined;
                     }
-                    var result = createNode(69 /* Identifier */, startPos);
-                    result.text = content.substring(startPos, pos);
-                    return finishNode(result, pos);
+                    var pos = scanner.getTokenPos();
+                    var end = scanner.getTextPos();
+                    var result = createNode(69 /* Identifier */, pos);
+                    result.text = content.substring(pos, end);
+                    finishNode(result, end);
+                    nextJSDocToken();
+                    return result;
                 }
             }
             JSDocParser.parseJSDocCommentWorker = parseJSDocCommentWorker;
@@ -12463,10 +12945,10 @@ var ts;
             if (sourceFile.statements.length === 0) {
                 // If we don't have any statements in the current source file, then there's no real
                 // way to incrementally parse.  So just do a full parse instead.
-                return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, /*syntaxCursor*/ undefined, /*setParentNodes*/ true);
+                return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, /*syntaxCursor*/ undefined, /*setParentNodes*/ true, sourceFile.scriptKind);
             }
             // Make sure we're not trying to incrementally update a source file more than once.  Once
-            // we do an update the original source file is considered unusbale from that point onwards.
+            // we do an update the original source file is considered unusable from that point onwards.
             //
             // This is because we do incremental parsing in-place.  i.e. we take nodes from the old
             // tree and give them new positions and parents.  From that point on, trusting the old
@@ -12519,7 +13001,7 @@ var ts;
             // inconsistent tree.  Setting the parents on the new tree should be very fast.  We
             // will immediately bail out of walking any subtrees when we can see that their parents
             // are already correct.
-            var result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, /*setParentNodes*/ true);
+            var result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, /*setParentNodes*/ true, sourceFile.scriptKind);
             return result;
         }
         IncrementalParser.updateSourceFile = updateSourceFile;
@@ -12578,7 +13060,7 @@ var ts;
             // We have an element that intersects the change range in some way.  It may have its
             // start, or its end (or both) in the changed range.  We want to adjust any part
             // that intersects such that the final tree is in a consistent state.  i.e. all
-            // chlidren have spans within the span of their parent, and all siblings are ordered
+            // children have spans within the span of their parent, and all siblings are ordered
             // properly.
             // We may need to update both the 'pos' and the 'end' of the element.
             // If the 'pos' is before the start of the change, then we don't need to touch it.
@@ -12598,7 +13080,7 @@ var ts;
             //  -------------------ZZZ-----------------
             //
             // In this case, any element that started in the 'X' range will keep its position.
-            // However any element htat started after that will have their pos adjusted to be
+            // However any element that started after that will have their pos adjusted to be
             // at the end of the new range.  i.e. any node that started in the 'Y' range will
             // be adjusted to have their start at the end of the 'Z' range.
             //
@@ -12622,7 +13104,7 @@ var ts;
             //  -------------------ZZZ-----------------
             //
             // In this case, any element that ended in the 'X' range will keep its position.
-            // However any element htat ended after that will have their pos adjusted to be
+            // However any element that ended after that will have their pos adjusted to be
             // at the end of the new range.  i.e. any node that ended in the 'Y' range will
             // be adjusted to have their end at the end of the 'Z' range.
             if (element.end >= changeRangeOldEnd) {
@@ -12642,12 +13124,12 @@ var ts;
         }
         function checkNodePositions(node, aggressiveChecks) {
             if (aggressiveChecks) {
-                var pos = node.pos;
+                var pos_2 = node.pos;
                 forEachChild(node, function (child) {
-                    ts.Debug.assert(child.pos >= pos);
-                    pos = child.end;
+                    ts.Debug.assert(child.pos >= pos_2);
+                    pos_2 = child.end;
                 });
-                ts.Debug.assert(pos <= node.end);
+                ts.Debug.assert(pos_2 <= node.end);
             }
         }
         function updateTokenPositionsAndMarkElements(sourceFile, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta, oldText, newText, aggressiveChecks) {
@@ -12881,7 +13363,7 @@ var ts;
                     if (position >= node.pos && position < node.end) {
                         // Position was within this node.  Keep searching deeper to find the node.
                         forEachChild(node, visitNode, visitArray);
-                        // don't procede any futher in the search.
+                        // don't proceed any further in the search.
                         return true;
                     }
                     // position wasn't in this node, have to keep searching.
@@ -12937,7 +13419,7 @@ var ts;
     var ModuleInstanceState = ts.ModuleInstanceState;
     var Reachability;
     (function (Reachability) {
-        Reachability[Reachability["Unintialized"] = 1] = "Unintialized";
+        Reachability[Reachability["Uninitialized"] = 1] = "Uninitialized";
         Reachability[Reachability["Reachable"] = 2] = "Reachable";
         Reachability[Reachability["Unreachable"] = 4] = "Unreachable";
         Reachability[Reachability["ReportedUnreachable"] = 8] = "ReportedUnreachable";
@@ -12952,17 +13434,17 @@ var ts;
     function getModuleInstanceState(node) {
         // A module is uninstantiated if it contains only
         // 1. interface declarations, type alias declarations
-        if (node.kind === 218 /* InterfaceDeclaration */ || node.kind === 219 /* TypeAliasDeclaration */) {
+        if (node.kind === 221 /* InterfaceDeclaration */ || node.kind === 222 /* TypeAliasDeclaration */) {
             return 0 /* NonInstantiated */;
         }
         else if (ts.isConstEnumDeclaration(node)) {
             return 2 /* ConstEnumOnly */;
         }
-        else if ((node.kind === 225 /* ImportDeclaration */ || node.kind === 224 /* ImportEqualsDeclaration */) && !(node.flags & 2 /* Export */)) {
+        else if ((node.kind === 229 /* ImportDeclaration */ || node.kind === 228 /* ImportEqualsDeclaration */) && !(node.flags & 1 /* Export */)) {
             return 0 /* NonInstantiated */;
         }
-        else if (node.kind === 222 /* ModuleBlock */) {
-            var state = 0 /* NonInstantiated */;
+        else if (node.kind === 225 /* ModuleBlock */) {
+            var state_1 = 0 /* NonInstantiated */;
             ts.forEachChild(node, function (n) {
                 switch (getModuleInstanceState(n)) {
                     case 0 /* NonInstantiated */:
@@ -12970,17 +13452,17 @@ var ts;
                         return false;
                     case 2 /* ConstEnumOnly */:
                         // child is const enum only - record state and continue searching
-                        state = 2 /* ConstEnumOnly */;
+                        state_1 = 2 /* ConstEnumOnly */;
                         return false;
                     case 1 /* Instantiated */:
                         // child is instantiated - record state and stop
-                        state = 1 /* Instantiated */;
+                        state_1 = 1 /* Instantiated */;
                         return true;
                 }
             });
-            return state;
+            return state_1;
         }
-        else if (node.kind === 221 /* ModuleDeclaration */) {
+        else if (node.kind === 224 /* ModuleDeclaration */) {
             return getModuleInstanceState(node.body);
         }
         else {
@@ -13035,6 +13517,7 @@ var ts;
         var hasAsyncFunctions;
         var hasDecorators;
         var hasParameterDecorators;
+        var hasJsxSpreadAttribute;
         // If this file is an external module, then it is automatically in strict-mode according to
         // ES6.  If it is not an external module, then we'll determine if it is in strict mode or
         // not depending on if we see "use strict" in certain places (or if we hit a class/namespace).
@@ -13068,6 +13551,7 @@ var ts;
             hasAsyncFunctions = false;
             hasDecorators = false;
             hasParameterDecorators = false;
+            hasJsxSpreadAttribute = false;
         }
         return bindSourceFile;
         function createSymbol(flags, name) {
@@ -13090,7 +13574,7 @@ var ts;
             if (symbolFlags & 107455 /* Value */) {
                 var valueDeclaration = symbol.valueDeclaration;
                 if (!valueDeclaration ||
-                    (valueDeclaration.kind !== node.kind && valueDeclaration.kind === 221 /* ModuleDeclaration */)) {
+                    (valueDeclaration.kind !== node.kind && valueDeclaration.kind === 224 /* ModuleDeclaration */)) {
                     // other kinds of value declarations take precedence over modules
                     symbol.valueDeclaration = node;
                 }
@@ -13103,7 +13587,7 @@ var ts;
                 if (ts.isAmbientModule(node)) {
                     return ts.isGlobalScopeAugmentation(node) ? "__global" : "\"" + node.name.text + "\"";
                 }
-                if (node.name.kind === 137 /* ComputedPropertyName */) {
+                if (node.name.kind === 139 /* ComputedPropertyName */) {
                     var nameExpression = node.name.expression;
                     // treat computed property names where expression is string/numeric literal as just string/numeric literal
                     if (ts.isStringOrNumericLiteral(nameExpression.kind)) {
@@ -13115,21 +13599,21 @@ var ts;
                 return node.name.text;
             }
             switch (node.kind) {
-                case 145 /* Constructor */:
+                case 147 /* Constructor */:
                     return "__constructor";
-                case 153 /* FunctionType */:
-                case 148 /* CallSignature */:
+                case 155 /* FunctionType */:
+                case 150 /* CallSignature */:
                     return "__call";
-                case 154 /* ConstructorType */:
-                case 149 /* ConstructSignature */:
+                case 156 /* ConstructorType */:
+                case 151 /* ConstructSignature */:
                     return "__new";
-                case 150 /* IndexSignature */:
+                case 152 /* IndexSignature */:
                     return "__index";
-                case 231 /* ExportDeclaration */:
+                case 235 /* ExportDeclaration */:
                     return "__export";
-                case 230 /* ExportAssignment */:
+                case 234 /* ExportAssignment */:
                     return node.isExportEquals ? "export=" : "default";
-                case 184 /* BinaryExpression */:
+                case 186 /* BinaryExpression */:
                     switch (ts.getSpecialPropertyAssignmentKind(node)) {
                         case 2 /* ModuleExports */:
                             // module.exports = ...
@@ -13144,9 +13628,18 @@ var ts;
                     }
                     ts.Debug.fail("Unknown binary declaration kind");
                     break;
-                case 216 /* FunctionDeclaration */:
-                case 217 /* ClassDeclaration */:
+                case 219 /* FunctionDeclaration */:
+                case 220 /* ClassDeclaration */:
                     return node.flags & 512 /* Default */ ? "default" : undefined;
+                case 268 /* JSDocFunctionType */:
+                    return ts.isJSDocConstructSignature(node) ? "__new" : "__call";
+                case 141 /* Parameter */:
+                    // Parameters with names are handled at the top of this function.  Parameters
+                    // without names can only come from JSDocFunctionTypes.
+                    ts.Debug.assert(node.parent.kind === 268 /* JSDocFunctionType */);
+                    var functionType = node.parent;
+                    var index = ts.indexOf(functionType.parameters, node);
+                    return "p" + index;
             }
         }
         function getDisplayName(node) {
@@ -13197,18 +13690,18 @@ var ts;
                     }
                     // Report errors every position with duplicate declaration
                     // Report errors on previous encountered declarations
-                    var message = symbol.flags & 2 /* BlockScopedVariable */
+                    var message_1 = symbol.flags & 2 /* BlockScopedVariable */
                         ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0
                         : ts.Diagnostics.Duplicate_identifier_0;
                     ts.forEach(symbol.declarations, function (declaration) {
                         if (declaration.flags & 512 /* Default */) {
-                            message = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
+                            message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                         }
                     });
                     ts.forEach(symbol.declarations, function (declaration) {
-                        file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message, getDisplayName(declaration)));
+                        file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message_1, getDisplayName(declaration)));
                     });
-                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name || node, message, getDisplayName(node)));
+                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name || node, message_1, getDisplayName(node)));
                     symbol = createSymbol(0 /* None */, name);
                 }
             }
@@ -13220,9 +13713,9 @@ var ts;
             return symbol;
         }
         function declareModuleMember(node, symbolFlags, symbolExcludes) {
-            var hasExportModifier = ts.getCombinedNodeFlags(node) & 2 /* Export */;
+            var hasExportModifier = ts.getCombinedNodeFlags(node) & 1 /* Export */;
             if (symbolFlags & 8388608 /* Alias */) {
-                if (node.kind === 233 /* ExportSpecifier */ || (node.kind === 224 /* ImportEqualsDeclaration */ && hasExportModifier)) {
+                if (node.kind === 237 /* ExportSpecifier */ || (node.kind === 228 /* ImportEqualsDeclaration */ && hasExportModifier)) {
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
                 }
                 else {
@@ -13245,7 +13738,7 @@ var ts;
                 //       during global merging in the checker. Why? The only case when ambient module is permitted inside another module is module augmentation
                 //       and this case is specially handled. Module augmentations should only be merged with original module definition
                 //       and should never be merged directly with other augmentation, and the latter case would be possible if automatic merge is allowed.
-                if (!ts.isAmbientModule(node) && (hasExportModifier || container.flags & 131072 /* ExportContext */)) {
+                if (!ts.isAmbientModule(node) && (hasExportModifier || container.flags & 8192 /* ExportContext */)) {
                     var exportKind = (symbolFlags & 107455 /* Value */ ? 1048576 /* ExportValue */ : 0) |
                         (symbolFlags & 793056 /* Type */ ? 2097152 /* ExportType */ : 0) |
                         (symbolFlags & 1536 /* Namespace */ ? 4194304 /* ExportNamespace */ : 0);
@@ -13263,7 +13756,7 @@ var ts;
         // the getLocalNameOfContainer function in the type checker to validate that the local name
         // used for a container is unique.
         function bindChildren(node) {
-            // Before we recurse into a node's chilren, we first save the existing parent, container
+            // Before we recurse into a node's children, we first save the existing parent, container
             // and block-container.  Then after we pop out of processing the children, we restore
             // these saved values.
             var saveParent = parent;
@@ -13286,7 +13779,7 @@ var ts;
             // Finally, if this is a block-container, then we clear out any existing .locals object
             // it may contain within it.  This happens in incremental scenarios.  Because we can be
             // reusing a node from a previous compilation, that node may have had 'locals' created
-            // for it.  We must clear this so we don't accidently move any stale data forward from
+            // for it.  We must clear this so we don't accidentally move any stale data forward from
             // a previous compilation.
             var containerFlags = getContainerFlags(node);
             if (containerFlags & 1 /* IsContainer */) {
@@ -13308,13 +13801,13 @@ var ts;
             var kind = node.kind;
             var flags = node.flags;
             // reset all reachability check related flags on node (for incremental scenarios)
-            flags &= ~1572864 /* ReachabilityCheckFlags */;
+            flags &= ~98304 /* ReachabilityCheckFlags */;
             // reset all emit helper flags on node (for incremental scenarios)
-            flags &= ~62914560 /* EmitHelperFlags */;
-            if (kind === 218 /* InterfaceDeclaration */) {
+            flags &= ~3932160 /* EmitHelperFlags */;
+            if (kind === 221 /* InterfaceDeclaration */) {
                 seenThisKeyword = false;
             }
-            var saveState = kind === 251 /* SourceFile */ || kind === 222 /* ModuleBlock */ || ts.isFunctionLikeKind(kind);
+            var saveState = kind === 255 /* SourceFile */ || kind === 225 /* ModuleBlock */ || ts.isFunctionLikeKind(kind);
             if (saveState) {
                 savedReachabilityState = currentReachabilityState;
                 savedLabelStack = labelStack;
@@ -13325,28 +13818,34 @@ var ts;
                 hasExplicitReturn = false;
                 labelStack = labelIndexMap = implicitLabels = undefined;
             }
+            if (ts.isInJavaScriptFile(node) && node.jsDocComment) {
+                bind(node.jsDocComment);
+            }
             bindReachableStatement(node);
             if (currentReachabilityState === 2 /* Reachable */ && ts.isFunctionLikeKind(kind) && ts.nodeIsPresent(node.body)) {
-                flags |= 524288 /* HasImplicitReturn */;
+                flags |= 32768 /* HasImplicitReturn */;
                 if (hasExplicitReturn) {
-                    flags |= 1048576 /* HasExplicitReturn */;
+                    flags |= 65536 /* HasExplicitReturn */;
                 }
             }
-            if (kind === 218 /* InterfaceDeclaration */) {
-                flags = seenThisKeyword ? flags | 262144 /* ContainsThis */ : flags & ~262144 /* ContainsThis */;
+            if (kind === 221 /* InterfaceDeclaration */) {
+                flags = seenThisKeyword ? flags | 16384 /* ContainsThis */ : flags & ~16384 /* ContainsThis */;
             }
-            if (kind === 251 /* SourceFile */) {
+            if (kind === 255 /* SourceFile */) {
                 if (hasClassExtends) {
-                    flags |= 4194304 /* HasClassExtends */;
+                    flags |= 262144 /* HasClassExtends */;
                 }
                 if (hasDecorators) {
-                    flags |= 8388608 /* HasDecorators */;
+                    flags |= 524288 /* HasDecorators */;
                 }
                 if (hasParameterDecorators) {
-                    flags |= 16777216 /* HasParamDecorators */;
+                    flags |= 1048576 /* HasParamDecorators */;
                 }
                 if (hasAsyncFunctions) {
-                    flags |= 33554432 /* HasAsyncFunctions */;
+                    flags |= 2097152 /* HasAsyncFunctions */;
+                }
+                if (hasJsxSpreadAttribute) {
+                    flags |= 1073741824 /* HasJsxSpreadAttribute */;
                 }
             }
             node.flags = flags;
@@ -13371,40 +13870,40 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 201 /* WhileStatement */:
+                case 204 /* WhileStatement */:
                     bindWhileStatement(node);
                     break;
-                case 200 /* DoStatement */:
+                case 203 /* DoStatement */:
                     bindDoStatement(node);
                     break;
-                case 202 /* ForStatement */:
+                case 205 /* ForStatement */:
                     bindForStatement(node);
                     break;
-                case 203 /* ForInStatement */:
-                case 204 /* ForOfStatement */:
+                case 206 /* ForInStatement */:
+                case 207 /* ForOfStatement */:
                     bindForInOrForOfStatement(node);
                     break;
-                case 199 /* IfStatement */:
+                case 202 /* IfStatement */:
                     bindIfStatement(node);
                     break;
-                case 207 /* ReturnStatement */:
-                case 211 /* ThrowStatement */:
+                case 210 /* ReturnStatement */:
+                case 214 /* ThrowStatement */:
                     bindReturnOrThrow(node);
                     break;
-                case 206 /* BreakStatement */:
-                case 205 /* ContinueStatement */:
+                case 209 /* BreakStatement */:
+                case 208 /* ContinueStatement */:
                     bindBreakOrContinueStatement(node);
                     break;
-                case 212 /* TryStatement */:
+                case 215 /* TryStatement */:
                     bindTryStatement(node);
                     break;
-                case 209 /* SwitchStatement */:
+                case 212 /* SwitchStatement */:
                     bindSwitchStatement(node);
                     break;
-                case 223 /* CaseBlock */:
+                case 226 /* CaseBlock */:
                     bindCaseBlock(node);
                     break;
-                case 210 /* LabeledStatement */:
+                case 213 /* LabeledStatement */:
                     bindLabeledStatement(node);
                     break;
                 default:
@@ -13479,7 +13978,7 @@ var ts;
         function bindReturnOrThrow(n) {
             // bind expression (don't affect reachability)
             bind(n.expression);
-            if (n.kind === 207 /* ReturnStatement */) {
+            if (n.kind === 210 /* ReturnStatement */) {
                 hasExplicitReturn = true;
             }
             currentReachabilityState = 4 /* Unreachable */;
@@ -13488,7 +13987,7 @@ var ts;
             // call bind on label (don't affect reachability)
             bind(n.label);
             // for continue case touch label so it will be marked a used
-            var isValidJump = jumpToLabel(n.label, n.kind === 206 /* BreakStatement */ ? currentReachabilityState : 4 /* Unreachable */);
+            var isValidJump = jumpToLabel(n.label, n.kind === 209 /* BreakStatement */ ? currentReachabilityState : 4 /* Unreachable */);
             if (isValidJump) {
                 currentReachabilityState = 4 /* Unreachable */;
             }
@@ -13506,7 +14005,7 @@ var ts;
             // post catch/finally state is reachable if
             // - post try state is reachable - control flow can fall out of try block
             // - post catch state is reachable - control flow can fall out of catch block
-            currentReachabilityState = or(postTryState, postCatchState);
+            currentReachabilityState = n.catchClause ? or(postTryState, postCatchState) : postTryState;
         }
         function bindSwitchStatement(n) {
             var preSwitchState = currentReachabilityState;
@@ -13514,18 +14013,21 @@ var ts;
             // bind expression (don't affect reachability)
             bind(n.expression);
             bind(n.caseBlock);
-            var hasDefault = ts.forEach(n.caseBlock.clauses, function (c) { return c.kind === 245 /* DefaultClause */; });
-            // post switch state is unreachable if switch is exaustive (has a default case ) and does not have fallthrough from the last case
+            var hasDefault = ts.forEach(n.caseBlock.clauses, function (c) { return c.kind === 249 /* DefaultClause */; });
+            // post switch state is unreachable if switch is exhaustive (has a default case ) and does not have fallthrough from the last case
             var postSwitchState = hasDefault && currentReachabilityState !== 2 /* Reachable */ ? 4 /* Unreachable */ : preSwitchState;
             popImplicitLabel(postSwitchLabel, postSwitchState);
         }
         function bindCaseBlock(n) {
             var startState = currentReachabilityState;
-            for (var _i = 0, _a = n.clauses; _i < _a.length; _i++) {
-                var clause = _a[_i];
+            for (var i = 0; i < n.clauses.length; i++) {
+                var clause = n.clauses[i];
                 currentReachabilityState = startState;
                 bind(clause);
-                if (clause.statements.length && currentReachabilityState === 2 /* Reachable */ && options.noFallthroughCasesInSwitch) {
+                if (clause.statements.length &&
+                    i !== n.clauses.length - 1 &&
+                    currentReachabilityState === 2 /* Reachable */ &&
+                    options.noFallthroughCasesInSwitch) {
                     errorOnFirstToken(clause, ts.Diagnostics.Fallthrough_case_in_switch);
                 }
             }
@@ -13541,39 +14043,41 @@ var ts;
         }
         function getContainerFlags(node) {
             switch (node.kind) {
-                case 189 /* ClassExpression */:
-                case 217 /* ClassDeclaration */:
-                case 218 /* InterfaceDeclaration */:
-                case 220 /* EnumDeclaration */:
-                case 156 /* TypeLiteral */:
-                case 168 /* ObjectLiteralExpression */:
+                case 191 /* ClassExpression */:
+                case 220 /* ClassDeclaration */:
+                case 221 /* InterfaceDeclaration */:
+                case 223 /* EnumDeclaration */:
+                case 170 /* ObjectLiteralExpression */:
+                case 158 /* TypeLiteral */:
+                case 264 /* JSDocRecordType */:
                     return 1 /* IsContainer */;
-                case 148 /* CallSignature */:
-                case 149 /* ConstructSignature */:
-                case 150 /* IndexSignature */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
-                case 216 /* FunctionDeclaration */:
-                case 145 /* Constructor */:
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
-                case 153 /* FunctionType */:
-                case 154 /* ConstructorType */:
-                case 176 /* FunctionExpression */:
-                case 177 /* ArrowFunction */:
-                case 221 /* ModuleDeclaration */:
-                case 251 /* SourceFile */:
-                case 219 /* TypeAliasDeclaration */:
+                case 150 /* CallSignature */:
+                case 151 /* ConstructSignature */:
+                case 152 /* IndexSignature */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
+                case 219 /* FunctionDeclaration */:
+                case 147 /* Constructor */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
+                case 155 /* FunctionType */:
+                case 268 /* JSDocFunctionType */:
+                case 156 /* ConstructorType */:
+                case 178 /* FunctionExpression */:
+                case 179 /* ArrowFunction */:
+                case 224 /* ModuleDeclaration */:
+                case 255 /* SourceFile */:
+                case 222 /* TypeAliasDeclaration */:
                     return 5 /* IsContainerWithLocals */;
-                case 247 /* CatchClause */:
-                case 202 /* ForStatement */:
-                case 203 /* ForInStatement */:
-                case 204 /* ForOfStatement */:
-                case 223 /* CaseBlock */:
+                case 251 /* CatchClause */:
+                case 205 /* ForStatement */:
+                case 206 /* ForInStatement */:
+                case 207 /* ForOfStatement */:
+                case 226 /* CaseBlock */:
                     return 2 /* IsBlockScopedContainer */;
-                case 195 /* Block */:
+                case 198 /* Block */:
                     // do not treat blocks directly inside a function as a block-scoped-container.
-                    // Locals that reside in this block should go to the function locals. Othewise 'x'
+                    // Locals that reside in this block should go to the function locals. Otherwise 'x'
                     // would not appear to be a redeclaration of a block scoped local in the following
                     // example:
                     //
@@ -13608,38 +14112,40 @@ var ts;
                 // members are declared (for example, a member of a class will go into a specific
                 // symbol table depending on if it is static or not). We defer to specialized
                 // handlers to take care of declaring these child members.
-                case 221 /* ModuleDeclaration */:
+                case 224 /* ModuleDeclaration */:
                     return declareModuleMember(node, symbolFlags, symbolExcludes);
-                case 251 /* SourceFile */:
+                case 255 /* SourceFile */:
                     return declareSourceFileMember(node, symbolFlags, symbolExcludes);
-                case 189 /* ClassExpression */:
-                case 217 /* ClassDeclaration */:
+                case 191 /* ClassExpression */:
+                case 220 /* ClassDeclaration */:
                     return declareClassMember(node, symbolFlags, symbolExcludes);
-                case 220 /* EnumDeclaration */:
+                case 223 /* EnumDeclaration */:
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                case 156 /* TypeLiteral */:
-                case 168 /* ObjectLiteralExpression */:
-                case 218 /* InterfaceDeclaration */:
+                case 158 /* TypeLiteral */:
+                case 170 /* ObjectLiteralExpression */:
+                case 221 /* InterfaceDeclaration */:
+                case 264 /* JSDocRecordType */:
                     // Interface/Object-types always have their children added to the 'members' of
                     // their container. They are only accessible through an instance of their
                     // container, and are never in scope otherwise (even inside the body of the
                     // object / type / interface declaring them). An exception is type parameters,
                     // which are in scope without qualification (similar to 'locals').
                     return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
-                case 153 /* FunctionType */:
-                case 154 /* ConstructorType */:
-                case 148 /* CallSignature */:
-                case 149 /* ConstructSignature */:
-                case 150 /* IndexSignature */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
-                case 145 /* Constructor */:
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
-                case 216 /* FunctionDeclaration */:
-                case 176 /* FunctionExpression */:
-                case 177 /* ArrowFunction */:
-                case 219 /* TypeAliasDeclaration */:
+                case 155 /* FunctionType */:
+                case 156 /* ConstructorType */:
+                case 150 /* CallSignature */:
+                case 151 /* ConstructSignature */:
+                case 152 /* IndexSignature */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
+                case 147 /* Constructor */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
+                case 219 /* FunctionDeclaration */:
+                case 178 /* FunctionExpression */:
+                case 179 /* ArrowFunction */:
+                case 268 /* JSDocFunctionType */:
+                case 222 /* TypeAliasDeclaration */:
                     // All the children of these container types are never visible through another
                     // symbol (i.e. through another symbol's 'exports' or 'members').  Instead,
                     // they're only accessed 'lexically' (i.e. from code that exists underneath
@@ -13650,7 +14156,7 @@ var ts;
             }
         }
         function declareClassMember(node, symbolFlags, symbolExcludes) {
-            return node.flags & 64 /* Static */
+            return node.flags & 32 /* Static */
                 ? declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes)
                 : declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
         }
@@ -13660,11 +14166,11 @@ var ts;
                 : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes);
         }
         function hasExportDeclarations(node) {
-            var body = node.kind === 251 /* SourceFile */ ? node : node.body;
-            if (body.kind === 251 /* SourceFile */ || body.kind === 222 /* ModuleBlock */) {
+            var body = node.kind === 255 /* SourceFile */ ? node : node.body;
+            if (body.kind === 255 /* SourceFile */ || body.kind === 225 /* ModuleBlock */) {
                 for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
                     var stat = _a[_i];
-                    if (stat.kind === 231 /* ExportDeclaration */ || stat.kind === 230 /* ExportAssignment */) {
+                    if (stat.kind === 235 /* ExportDeclaration */ || stat.kind === 234 /* ExportAssignment */) {
                         return true;
                     }
                 }
@@ -13675,19 +14181,24 @@ var ts;
             // A declaration source file or ambient module declaration that contains no export declarations (but possibly regular
             // declarations with export modifiers) is an export context in which declarations are implicitly exported.
             if (ts.isInAmbientContext(node) && !hasExportDeclarations(node)) {
-                node.flags |= 131072 /* ExportContext */;
+                node.flags |= 8192 /* ExportContext */;
             }
             else {
-                node.flags &= ~131072 /* ExportContext */;
+                node.flags &= ~8192 /* ExportContext */;
             }
         }
         function bindModuleDeclaration(node) {
             setExportContextFlag(node);
             if (ts.isAmbientModule(node)) {
-                if (node.flags & 2 /* Export */) {
+                if (node.flags & 1 /* Export */) {
                     errorOnFirstToken(node, ts.Diagnostics.export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always_visible);
                 }
-                declareSymbolAndAddToSymbolTable(node, 512 /* ValueModule */, 106639 /* ValueModuleExcludes */);
+                if (ts.isExternalModuleAugmentation(node)) {
+                    declareSymbolAndAddToSymbolTable(node, 1024 /* NamespaceModule */, 0 /* NamespaceModuleExcludes */);
+                }
+                else {
+                    declareSymbolAndAddToSymbolTable(node, 512 /* ValueModule */, 106639 /* ValueModuleExcludes */);
+                }
             }
             else {
                 var state = getModuleInstanceState(node);
@@ -13743,7 +14254,7 @@ var ts;
                         continue;
                     }
                     var identifier = prop.name;
-                    // ECMA-262 11.1.5 Object Initialiser
+                    // 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
                     // a.This production is contained in strict code and IsDataDescriptor(previous) is true and
                     // IsDataDescriptor(propId.descriptor) is true.
@@ -13751,7 +14262,7 @@ var ts;
                     //    c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true.
                     //    d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true
                     // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
-                    var currentKind = prop.kind === 248 /* PropertyAssignment */ || prop.kind === 249 /* ShorthandPropertyAssignment */ || prop.kind === 144 /* MethodDeclaration */
+                    var currentKind = prop.kind === 252 /* PropertyAssignment */ || prop.kind === 253 /* ShorthandPropertyAssignment */ || prop.kind === 146 /* MethodDeclaration */
                         ? 1 /* Property */
                         : 2 /* Accessor */;
                     var existingKind = seen[identifier.text];
@@ -13773,10 +14284,10 @@ var ts;
         }
         function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
             switch (blockScopeContainer.kind) {
-                case 221 /* ModuleDeclaration */:
+                case 224 /* ModuleDeclaration */:
                     declareModuleMember(node, symbolFlags, symbolExcludes);
                     break;
-                case 251 /* SourceFile */:
+                case 255 /* SourceFile */:
                     if (ts.isExternalModule(container)) {
                         declareModuleMember(node, symbolFlags, symbolExcludes);
                         break;
@@ -13873,7 +14384,7 @@ var ts;
             }
         }
         function checkStrictModeNumericLiteral(node) {
-            if (inStrictMode && node.flags & 32768 /* OctalLiteral */) {
+            if (inStrictMode && node.isOctalLiteral) {
                 file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode));
             }
         }
@@ -13936,17 +14447,17 @@ var ts;
         }
         function updateStrictMode(node) {
             switch (node.kind) {
-                case 251 /* SourceFile */:
-                case 222 /* ModuleBlock */:
+                case 255 /* SourceFile */:
+                case 225 /* ModuleBlock */:
                     updateStrictModeStatementList(node.statements);
                     return;
-                case 195 /* Block */:
+                case 198 /* Block */:
                     if (ts.isFunctionLike(node.parent)) {
                         updateStrictModeStatementList(node.statements);
                     }
                     return;
-                case 217 /* ClassDeclaration */:
-                case 189 /* ClassExpression */:
+                case 220 /* ClassDeclaration */:
+                case 191 /* ClassExpression */:
                     // All classes are automatically in strict mode in ES6.
                     inStrictMode = true;
                     return;
@@ -13969,14 +14480,14 @@ var ts;
             var nodeText = ts.getTextOfNodeFromSourceText(file.text, node.expression);
             // Note: the node text must be exactly "use strict" or 'use strict'.  It is not ok for the
             // string to contain unicode escapes (as per ES5).
-            return nodeText === "\"use strict\"" || nodeText === "'use strict'";
+            return nodeText === '"use strict"' || nodeText === "'use strict'";
         }
         function bindWorker(node) {
             switch (node.kind) {
                 /* Strict mode checks */
                 case 69 /* Identifier */:
                     return checkStrictModeIdentifier(node);
-                case 184 /* BinaryExpression */:
+                case 186 /* BinaryExpression */:
                     if (ts.isInJavaScriptFile(node)) {
                         var specialKind = ts.getSpecialPropertyAssignmentKind(node);
                         switch (specialKind) {
@@ -14000,97 +14511,105 @@ var ts;
                         }
                     }
                     return checkStrictModeBinaryExpression(node);
-                case 247 /* CatchClause */:
+                case 251 /* CatchClause */:
                     return checkStrictModeCatchClause(node);
-                case 178 /* DeleteExpression */:
+                case 180 /* DeleteExpression */:
                     return checkStrictModeDeleteExpression(node);
                 case 8 /* NumericLiteral */:
                     return checkStrictModeNumericLiteral(node);
-                case 183 /* PostfixUnaryExpression */:
+                case 185 /* PostfixUnaryExpression */:
                     return checkStrictModePostfixUnaryExpression(node);
-                case 182 /* PrefixUnaryExpression */:
+                case 184 /* PrefixUnaryExpression */:
                     return checkStrictModePrefixUnaryExpression(node);
-                case 208 /* WithStatement */:
+                case 211 /* WithStatement */:
                     return checkStrictModeWithStatement(node);
-                case 162 /* ThisType */:
+                case 164 /* ThisType */:
                     seenThisKeyword = true;
                     return;
-                case 151 /* TypePredicate */:
+                case 153 /* TypePredicate */:
                     return checkTypePredicate(node);
-                case 138 /* TypeParameter */:
+                case 140 /* TypeParameter */:
                     return declareSymbolAndAddToSymbolTable(node, 262144 /* TypeParameter */, 530912 /* TypeParameterExcludes */);
-                case 139 /* Parameter */:
+                case 141 /* Parameter */:
                     return bindParameter(node);
-                case 214 /* VariableDeclaration */:
-                case 166 /* BindingElement */:
+                case 217 /* VariableDeclaration */:
+                case 168 /* BindingElement */:
                     return bindVariableDeclarationOrBindingElement(node);
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
+                case 265 /* JSDocRecordMember */:
                     return bindPropertyOrMethodOrAccessor(node, 4 /* Property */ | (node.questionToken ? 536870912 /* Optional */ : 0 /* None */), 107455 /* PropertyExcludes */);
-                case 248 /* PropertyAssignment */:
-                case 249 /* ShorthandPropertyAssignment */:
+                case 252 /* PropertyAssignment */:
+                case 253 /* ShorthandPropertyAssignment */:
                     return bindPropertyOrMethodOrAccessor(node, 4 /* Property */, 107455 /* PropertyExcludes */);
-                case 250 /* EnumMember */:
+                case 254 /* EnumMember */:
                     return bindPropertyOrMethodOrAccessor(node, 8 /* EnumMember */, 107455 /* EnumMemberExcludes */);
-                case 148 /* CallSignature */:
-                case 149 /* ConstructSignature */:
-                case 150 /* IndexSignature */:
+                case 246 /* JsxSpreadAttribute */:
+                    hasJsxSpreadAttribute = true;
+                    return;
+                case 150 /* CallSignature */:
+                case 151 /* ConstructSignature */:
+                case 152 /* IndexSignature */:
                     return declareSymbolAndAddToSymbolTable(node, 131072 /* Signature */, 0 /* None */);
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
                     // If this is an ObjectLiteralExpression method, then it sits in the same space
                     // as other properties in the object literal.  So we use SymbolFlags.PropertyExcludes
                     // so that it will conflict with any other object literal members with the same
                     // name.
                     return bindPropertyOrMethodOrAccessor(node, 8192 /* Method */ | (node.questionToken ? 536870912 /* Optional */ : 0 /* None */), ts.isObjectLiteralMethod(node) ? 107455 /* PropertyExcludes */ : 99263 /* MethodExcludes */);
-                case 216 /* FunctionDeclaration */:
+                case 219 /* FunctionDeclaration */:
                     return bindFunctionDeclaration(node);
-                case 145 /* Constructor */:
+                case 147 /* Constructor */:
                     return declareSymbolAndAddToSymbolTable(node, 16384 /* Constructor */, /*symbolExcludes:*/ 0 /* None */);
-                case 146 /* GetAccessor */:
+                case 148 /* GetAccessor */:
                     return bindPropertyOrMethodOrAccessor(node, 32768 /* GetAccessor */, 41919 /* GetAccessorExcludes */);
-                case 147 /* SetAccessor */:
+                case 149 /* SetAccessor */:
                     return bindPropertyOrMethodOrAccessor(node, 65536 /* SetAccessor */, 74687 /* SetAccessorExcludes */);
-                case 153 /* FunctionType */:
-                case 154 /* ConstructorType */:
+                case 155 /* FunctionType */:
+                case 156 /* ConstructorType */:
+                case 268 /* JSDocFunctionType */:
                     return bindFunctionOrConstructorType(node);
-                case 156 /* TypeLiteral */:
+                case 158 /* TypeLiteral */:
+                case 264 /* JSDocRecordType */:
                     return bindAnonymousDeclaration(node, 2048 /* TypeLiteral */, "__type");
-                case 168 /* ObjectLiteralExpression */:
+                case 170 /* ObjectLiteralExpression */:
                     return bindObjectLiteralExpression(node);
-                case 176 /* FunctionExpression */:
-                case 177 /* ArrowFunction */:
+                case 178 /* FunctionExpression */:
+                case 179 /* ArrowFunction */:
                     return bindFunctionExpression(node);
-                case 171 /* CallExpression */:
+                case 173 /* CallExpression */:
                     if (ts.isInJavaScriptFile(node)) {
                         bindCallExpression(node);
                     }
                     break;
                 // Members of classes, interfaces, and modules
-                case 189 /* ClassExpression */:
-                case 217 /* ClassDeclaration */:
+                case 191 /* ClassExpression */:
+                case 220 /* ClassDeclaration */:
                     return bindClassLikeDeclaration(node);
-                case 218 /* InterfaceDeclaration */:
+                case 221 /* InterfaceDeclaration */:
                     return bindBlockScopedDeclaration(node, 64 /* Interface */, 792960 /* InterfaceExcludes */);
-                case 219 /* TypeAliasDeclaration */:
+                case 222 /* TypeAliasDeclaration */:
                     return bindBlockScopedDeclaration(node, 524288 /* TypeAlias */, 793056 /* TypeAliasExcludes */);
-                case 220 /* EnumDeclaration */:
+                case 223 /* EnumDeclaration */:
                     return bindEnumDeclaration(node);
-                case 221 /* ModuleDeclaration */:
+                case 224 /* ModuleDeclaration */:
                     return bindModuleDeclaration(node);
                 // Imports and exports
-                case 224 /* ImportEqualsDeclaration */:
-                case 227 /* NamespaceImport */:
-                case 229 /* ImportSpecifier */:
-                case 233 /* ExportSpecifier */:
+                case 228 /* ImportEqualsDeclaration */:
+                case 231 /* NamespaceImport */:
+                case 233 /* ImportSpecifier */:
+                case 237 /* ExportSpecifier */:
                     return declareSymbolAndAddToSymbolTable(node, 8388608 /* Alias */, 8388608 /* AliasExcludes */);
-                case 226 /* ImportClause */:
+                case 227 /* GlobalModuleExportDeclaration */:
+                    return bindGlobalModuleExportDeclaration(node);
+                case 230 /* ImportClause */:
                     return bindImportClause(node);
-                case 231 /* ExportDeclaration */:
+                case 235 /* ExportDeclaration */:
                     return bindExportDeclaration(node);
-                case 230 /* ExportAssignment */:
+                case 234 /* ExportAssignment */:
                     return bindExportAssignment(node);
-                case 251 /* SourceFile */:
+                case 255 /* SourceFile */:
                     return bindSourceFileIfExternalModule();
             }
         }
@@ -14099,7 +14618,7 @@ var ts;
             if (parameterName && parameterName.kind === 69 /* Identifier */) {
                 checkStrictModeIdentifier(parameterName);
             }
-            if (parameterName && parameterName.kind === 162 /* ThisType */) {
+            if (parameterName && parameterName.kind === 164 /* ThisType */) {
                 seenThisKeyword = true;
             }
             bind(type);
@@ -14114,12 +14633,12 @@ var ts;
             bindAnonymousDeclaration(file, 512 /* ValueModule */, "\"" + ts.removeFileExtension(file.fileName) + "\"");
         }
         function bindExportAssignment(node) {
-            var boundExpression = node.kind === 230 /* ExportAssignment */ ? node.expression : node.right;
+            var boundExpression = node.kind === 234 /* ExportAssignment */ ? node.expression : node.right;
             if (!container.symbol || !container.symbol.exports) {
                 // Export assignment in some sort of block construct
                 bindAnonymousDeclaration(node, 8388608 /* Alias */, getDeclarationName(node));
             }
-            else if (boundExpression.kind === 69 /* Identifier */) {
+            else if (boundExpression.kind === 69 /* Identifier */ && node.kind === 234 /* ExportAssignment */) {
                 // An export default clause with an identifier exports all meanings of that identifier
                 declareSymbol(container.symbol.exports, container.symbol, node, 8388608 /* Alias */, 107455 /* PropertyExcludes */ | 8388608 /* AliasExcludes */);
             }
@@ -14128,6 +14647,28 @@ var ts;
                 declareSymbol(container.symbol.exports, container.symbol, node, 4 /* Property */, 107455 /* PropertyExcludes */ | 8388608 /* AliasExcludes */);
             }
         }
+        function bindGlobalModuleExportDeclaration(node) {
+            if (node.modifiers && node.modifiers.length) {
+                file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Modifiers_cannot_appear_here));
+            }
+            if (node.parent.kind !== 255 /* SourceFile */) {
+                file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_at_top_level));
+                return;
+            }
+            else {
+                var parent_4 = node.parent;
+                if (!ts.isExternalModule(parent_4)) {
+                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_in_module_files));
+                    return;
+                }
+                if (!parent_4.isDeclarationFile) {
+                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_in_declaration_files));
+                    return;
+                }
+            }
+            file.symbol.globalExports = file.symbol.globalExports || {};
+            declareSymbol(file.symbol.globalExports, file.symbol, node, 8388608 /* Alias */, 8388608 /* AliasExcludes */);
+        }
         function bindExportDeclaration(node) {
             if (!container.symbol || !container.symbol.exports) {
                 // Export * in some sort of block construct
@@ -14158,21 +14699,28 @@ var ts;
         function bindModuleExportsAssignment(node) {
             // 'module.exports = expr' assignment
             setCommonJsModuleIndicator(node);
-            bindExportAssignment(node);
+            declareSymbol(file.symbol.exports, file.symbol, node, 4 /* Property */ | 7340032 /* Export */ | 512 /* ValueModule */, 0 /* None */);
         }
         function bindThisPropertyAssignment(node) {
             // Declare a 'member' in case it turns out the container was an ES5 class
-            if (container.kind === 176 /* FunctionExpression */ || container.kind === 216 /* FunctionDeclaration */) {
+            if (container.kind === 178 /* FunctionExpression */ || container.kind === 219 /* FunctionDeclaration */) {
                 container.symbol.members = container.symbol.members || {};
-                declareSymbol(container.symbol.members, container.symbol, node, 4 /* Property */, 107455 /* PropertyExcludes */);
+                // It's acceptable for multiple 'this' assignments of the same identifier to occur
+                declareSymbol(container.symbol.members, container.symbol, node, 4 /* Property */, 107455 /* PropertyExcludes */ & ~4 /* Property */);
             }
         }
         function bindPrototypePropertyAssignment(node) {
             // We saw a node of the form 'x.prototype.y = z'. Declare a 'member' y on x if x was a function.
             // Look up the function in the local scope, since prototype assignments should
             // follow the function declaration
-            var classId = node.left.expression.expression;
-            var funcSymbol = container.locals[classId.text];
+            var leftSideOfAssignment = node.left;
+            var classPrototype = leftSideOfAssignment.expression;
+            var constructorFunction = classPrototype.expression;
+            // Fix up parent pointers since we're going to use these nodes before we bind into them
+            leftSideOfAssignment.parent = node;
+            constructorFunction.parent = classPrototype;
+            classPrototype.parent = leftSideOfAssignment;
+            var funcSymbol = container.locals[constructorFunction.text];
             if (!funcSymbol || !(funcSymbol.flags & 16 /* Function */)) {
                 return;
             }
@@ -14181,12 +14729,12 @@ var ts;
                 funcSymbol.members = {};
             }
             // Declare the method/property
-            declareSymbol(funcSymbol.members, funcSymbol, node.left, 4 /* Property */, 107455 /* PropertyExcludes */);
+            declareSymbol(funcSymbol.members, funcSymbol, leftSideOfAssignment, 4 /* Property */, 107455 /* PropertyExcludes */);
         }
         function bindCallExpression(node) {
             // We're only inspecting call expressions to detect CommonJS modules, so we can skip
             // this check if we've already seen the module indicator
-            if (!file.commonJsModuleIndicator && ts.isRequireCall(node)) {
+            if (!file.commonJsModuleIndicator && ts.isRequireCall(node, /*checkArgumentIsStringLiteral*/ false)) {
                 setCommonJsModuleIndicator(node);
             }
         }
@@ -14199,7 +14747,7 @@ var ts;
                     hasDecorators = true;
                 }
             }
-            if (node.kind === 217 /* ClassDeclaration */) {
+            if (node.kind === 220 /* ClassDeclaration */) {
                 bindBlockScopedDeclaration(node, 32 /* Class */, 899519 /* ClassExcludes */);
             }
             else {
@@ -14323,12 +14871,12 @@ var ts;
             if (ts.hasProperty(labelIndexMap, name.text)) {
                 return false;
             }
-            labelIndexMap[name.text] = labelStack.push(1 /* Unintialized */) - 1;
+            labelIndexMap[name.text] = labelStack.push(1 /* Uninitialized */) - 1;
             return true;
         }
         function pushImplicitLabel() {
             initializeReachabilityStateIfNecessary();
-            var index = labelStack.push(1 /* Unintialized */) - 1;
+            var index = labelStack.push(1 /* Uninitialized */) - 1;
             implicitLabels.push(index);
             return index;
         }
@@ -14350,7 +14898,7 @@ var ts;
             setCurrentStateAtLabel(labelStack.pop(), outerState, /*name*/ undefined);
         }
         function setCurrentStateAtLabel(innerMergedState, outerState, label) {
-            if (innerMergedState === 1 /* Unintialized */) {
+            if (innerMergedState === 1 /* Uninitialized */) {
                 if (label && !options.allowUnusedLabels) {
                     file.bindDiagnostics.push(ts.createDiagnosticForNode(label, ts.Diagnostics.Unused_label));
                 }
@@ -14369,7 +14917,7 @@ var ts;
                 return false;
             }
             var stateAtLabel = labelStack[index];
-            labelStack[index] = stateAtLabel === 1 /* Unintialized */ ? outerState : or(stateAtLabel, outerState);
+            labelStack[index] = stateAtLabel === 1 /* Uninitialized */ ? outerState : or(stateAtLabel, outerState);
             return true;
         }
         function checkUnreachable(node) {
@@ -14377,13 +14925,13 @@ var ts;
                 case 4 /* Unreachable */:
                     var reportError = 
                     // report error on all statements except empty ones
-                    (ts.isStatement(node) && node.kind !== 197 /* EmptyStatement */) ||
+                    (ts.isStatement(node) && node.kind !== 200 /* EmptyStatement */) ||
                         // report error on class declarations
-                        node.kind === 217 /* ClassDeclaration */ ||
+                        node.kind === 220 /* ClassDeclaration */ ||
                         // report error on instantiated modules or const-enums only modules if preserveConstEnums is set
-                        (node.kind === 221 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node)) ||
+                        (node.kind === 224 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node)) ||
                         // report error on regular enums and const enums if preserveConstEnums is set
-                        (node.kind === 220 /* EnumDeclaration */ && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums));
+                        (node.kind === 223 /* EnumDeclaration */ && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums));
                     if (reportError) {
                         currentReachabilityState = 8 /* ReportedUnreachable */;
                         // unreachable code is reported if
@@ -14397,8 +14945,8 @@ var ts;
                         //   On the other side we do want to report errors on non-initialized 'lets' because of TDZ
                         var reportUnreachableCode = !options.allowUnreachableCode &&
                             !ts.isInAmbientContext(node) &&
-                            (node.kind !== 196 /* VariableStatement */ ||
-                                ts.getCombinedNodeFlags(node.declarationList) & 24576 /* BlockScoped */ ||
+                            (node.kind !== 199 /* VariableStatement */ ||
+                                ts.getCombinedNodeFlags(node.declarationList) & 3072 /* BlockScoped */ ||
                                 ts.forEach(node.declarationList.declarations, function (d) { return d.initializer; }));
                         if (reportUnreachableCode) {
                             errorOnFirstToken(node, ts.Diagnostics.Unreachable_code_detected);
@@ -14469,8 +15017,9 @@ var ts;
         var emptySymbols = {};
         var compilerOptions = host.getCompilerOptions();
         var languageVersion = compilerOptions.target || 0 /* ES3 */;
-        var modulekind = compilerOptions.module ? compilerOptions.module : languageVersion === 2 /* ES6 */ ? 5 /* ES6 */ : 0 /* None */;
-        var allowSyntheticDefaultImports = typeof compilerOptions.allowSyntheticDefaultImports !== "undefined" ? compilerOptions.allowSyntheticDefaultImports : modulekind === 4 /* System */;
+        var modulekind = ts.getEmitModuleKind(compilerOptions);
+        var allowSyntheticDefaultImports = typeof compilerOptions.allowSyntheticDefaultImports !== "undefined" ? compilerOptions.allowSyntheticDefaultImports : modulekind === ts.ModuleKind.System;
+        var strictNullChecks = compilerOptions.strictNullChecks;
         var emitResolver = createResolver();
         var undefinedSymbol = createSymbol(4 /* Property */ | 67108864 /* Transient */, "undefined");
         undefinedSymbol.declarations = [];
@@ -14485,9 +15034,7 @@ var ts;
             isUnknownSymbol: function (symbol) { return symbol === unknownSymbol; },
             getDiagnostics: getDiagnostics,
             getGlobalDiagnostics: getGlobalDiagnostics,
-            // The language service will always care about the narrowed type of a symbol, because that is
-            // the type the language says the symbol should have.
-            getTypeOfSymbolAtLocation: getNarrowedTypeOfSymbol,
+            getTypeOfSymbolAtLocation: getTypeOfSymbolAtLocation,
             getSymbolsOfParameterPropertyDeclaration: getSymbolsOfParameterPropertyDeclaration,
             getDeclaredTypeOfSymbol: getDeclaredTypeOfSymbol,
             getPropertiesOfType: getPropertiesOfType,
@@ -14522,14 +15069,16 @@ var ts;
         };
         var unknownSymbol = createSymbol(4 /* Property */ | 67108864 /* Transient */, "unknown");
         var resolvingSymbol = createSymbol(67108864 /* Transient */, "__resolving__");
+        var nullableWideningFlags = strictNullChecks ? 0 : 2097152 /* ContainsUndefinedOrNull */;
         var anyType = createIntrinsicType(1 /* Any */, "any");
         var stringType = createIntrinsicType(2 /* String */, "string");
         var numberType = createIntrinsicType(4 /* Number */, "number");
         var booleanType = createIntrinsicType(8 /* Boolean */, "boolean");
         var esSymbolType = createIntrinsicType(16777216 /* ESSymbol */, "symbol");
         var voidType = createIntrinsicType(16 /* Void */, "void");
-        var undefinedType = createIntrinsicType(32 /* Undefined */ | 2097152 /* ContainsUndefinedOrNull */, "undefined");
-        var nullType = createIntrinsicType(64 /* Null */ | 2097152 /* ContainsUndefinedOrNull */, "null");
+        var undefinedType = createIntrinsicType(32 /* Undefined */ | nullableWideningFlags, "undefined");
+        var nullType = createIntrinsicType(64 /* Null */ | nullableWideningFlags, "null");
+        var emptyArrayElementType = createIntrinsicType(32 /* Undefined */ | 2097152 /* ContainsUndefinedOrNull */, "undefined");
         var unknownType = createIntrinsicType(1 /* Any */, "unknown");
         var emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         var emptyUnionType = emptyObjectType;
@@ -14540,24 +15089,30 @@ var ts;
         // in getPropagatingFlagsOfTypes, and it is checked in inferFromTypes.
         anyFunctionType.flags |= 8388608 /* ContainsAnyFunctionType */;
         var noConstraintType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
-        var anySignature = createSignature(undefined, undefined, emptyArray, anyType, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false);
-        var unknownSignature = createSignature(undefined, undefined, emptyArray, unknownType, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false);
+        var anySignature = createSignature(undefined, undefined, undefined, emptyArray, anyType, /*typePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false);
+        var unknownSignature = createSignature(undefined, undefined, undefined, emptyArray, unknownType, /*typePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false);
+        var enumNumberIndexInfo = createIndexInfo(stringType, /*isReadonly*/ true);
         var globals = {};
-        var globalESSymbolConstructorSymbol;
+        var getGlobalESSymbolConstructorSymbol;
         var getGlobalPromiseConstructorSymbol;
         var globalObjectType;
         var globalFunctionType;
         var globalArrayType;
+        var globalReadonlyArrayType;
         var globalStringType;
         var globalNumberType;
         var globalBooleanType;
         var globalRegExpType;
-        var globalTemplateStringsArrayType;
-        var globalESSymbolType;
-        var globalIterableType;
-        var globalIteratorType;
-        var globalIterableIteratorType;
         var anyArrayType;
+        var anyReadonlyArrayType;
+        // The library files are only loaded when the feature is used.
+        // This allows users to just specify library files they want to used through --lib
+        // and they will not get an error from not having unrelated library files
+        var getGlobalTemplateStringsArrayType;
+        var getGlobalESSymbolType;
+        var getGlobalIterableType;
+        var getGlobalIteratorType;
+        var getGlobalIterableIteratorType;
         var getGlobalClassDecoratorType;
         var getGlobalParameterDecoratorType;
         var getGlobalPropertyDecoratorType;
@@ -14620,6 +15175,7 @@ var ts;
         };
         var subtypeRelation = {};
         var assignableRelation = {};
+        var comparableRelation = {};
         var identityRelation = {};
         // This is for caching the result of getSymbolDisplayBuilder. Do not access directly.
         var _displayBuilder;
@@ -14719,7 +15275,7 @@ var ts;
                 target.flags |= source.flags;
                 if (source.valueDeclaration &&
                     (!target.valueDeclaration ||
-                        (target.valueDeclaration.kind === 221 /* ModuleDeclaration */ && source.valueDeclaration.kind !== 221 /* ModuleDeclaration */))) {
+                        (target.valueDeclaration.kind === 224 /* ModuleDeclaration */ && source.valueDeclaration.kind !== 224 /* ModuleDeclaration */))) {
                     // other kinds of value declarations take precedence over modules
                     target.valueDeclaration = source.valueDeclaration;
                 }
@@ -14739,13 +15295,13 @@ var ts;
                 recordMergedSymbol(target, source);
             }
             else {
-                var message = target.flags & 2 /* BlockScopedVariable */ || source.flags & 2 /* BlockScopedVariable */
+                var message_2 = target.flags & 2 /* BlockScopedVariable */ || source.flags & 2 /* BlockScopedVariable */
                     ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0;
                 ts.forEach(source.declarations, function (node) {
-                    error(node.name ? node.name : node, message, symbolToString(source));
+                    error(node.name ? node.name : node, message_2, symbolToString(source));
                 });
                 ts.forEach(target.declarations, function (node) {
-                    error(node.name ? node.name : node, message, symbolToString(source));
+                    error(node.name ? node.name : node, message_2, symbolToString(source));
                 });
             }
         }
@@ -14776,10 +15332,10 @@ var ts;
         }
         function mergeModuleAugmentation(moduleName) {
             var moduleAugmentation = moduleName.parent;
-            if (moduleAugmentation.symbol.valueDeclaration !== moduleAugmentation) {
+            if (moduleAugmentation.symbol.declarations[0] !== moduleAugmentation) {
                 // this is a combined symbol for multiple augmentations within the same file.
-                // its symbol already has accumulated information for all declarations 
-                // so we need to add it just once - do the work only for first declaration 
+                // its symbol already has accumulated information for all declarations
+                // so we need to add it just once - do the work only for first declaration
                 ts.Debug.assert(moduleAugmentation.symbol.declarations.length > 1);
                 return;
             }
@@ -14787,15 +15343,22 @@ var ts;
                 mergeSymbolTable(globals, moduleAugmentation.symbol.exports);
             }
             else {
-                // find a module that about to be augmented 
+                // find a module that about to be augmented
                 var mainModule = resolveExternalModuleNameWorker(moduleName, moduleName, ts.Diagnostics.Invalid_module_name_in_augmentation_module_0_cannot_be_found);
                 if (!mainModule) {
                     return;
                 }
-                // if module symbol has already been merged - it is safe to use it.
-                // otherwise clone it
-                mainModule = mainModule.flags & 33554432 /* Merged */ ? mainModule : cloneSymbol(mainModule);
-                mergeSymbol(mainModule, moduleAugmentation.symbol);
+                // obtain item referenced by 'export='
+                mainModule = resolveExternalModuleSymbol(mainModule);
+                if (mainModule.flags & 1536 /* Namespace */) {
+                    // if module symbol has already been merged - it is safe to use it.
+                    // otherwise clone it
+                    mainModule = mainModule.flags & 33554432 /* Merged */ ? mainModule : cloneSymbol(mainModule);
+                    mergeSymbol(mainModule, moduleAugmentation.symbol);
+                }
+                else {
+                    error(moduleName, ts.Diagnostics.Cannot_augment_module_0_because_it_resolves_to_a_non_module_entity, moduleName.text);
+                }
             }
         }
         function addToSymbolTable(target, source, message) {
@@ -14825,7 +15388,7 @@ var ts;
             return nodeLinks[nodeId] || (nodeLinks[nodeId] = {});
         }
         function isGlobalSourceFile(node) {
-            return node.kind === 251 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
+            return node.kind === 255 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning && ts.hasProperty(symbols, name)) {
@@ -14851,9 +15414,9 @@ var ts;
          * @return a tuple of two symbols
          */
         function getSymbolsOfParameterPropertyDeclaration(parameter, parameterName) {
-            var constructoDeclaration = parameter.parent;
+            var constructorDeclaration = parameter.parent;
             var classDeclaration = parameter.parent.parent;
-            var parameterSymbol = getSymbol(constructoDeclaration.locals, parameterName, 107455 /* Value */);
+            var parameterSymbol = getSymbol(constructorDeclaration.locals, parameterName, 107455 /* Value */);
             var propertySymbol = getSymbol(classDeclaration.symbol.members, parameterName, 107455 /* Value */);
             if (parameterSymbol && propertySymbol) {
                 return [parameterSymbol, propertySymbol];
@@ -14874,7 +15437,7 @@ var ts;
             if (declaration.pos <= usage.pos) {
                 // declaration is before usage
                 // still might be illegal if usage is in the initializer of the variable declaration
-                return declaration.kind !== 214 /* VariableDeclaration */ ||
+                return declaration.kind !== 217 /* VariableDeclaration */ ||
                     !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
             }
             // declaration is after usage
@@ -14882,14 +15445,14 @@ var ts;
             return isUsedInFunctionOrNonStaticProperty(declaration, usage);
             function isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage) {
                 var container = ts.getEnclosingBlockScopeContainer(declaration);
-                if (declaration.parent.parent.kind === 196 /* VariableStatement */ ||
-                    declaration.parent.parent.kind === 202 /* ForStatement */) {
+                if (declaration.parent.parent.kind === 199 /* VariableStatement */ ||
+                    declaration.parent.parent.kind === 205 /* ForStatement */) {
                     // variable statement/for statement case,
                     // use site should not be inside variable declaration (initializer of declaration or binding element)
                     return isSameScopeDescendentOf(usage, declaration, container);
                 }
-                else if (declaration.parent.parent.kind === 204 /* ForOfStatement */ ||
-                    declaration.parent.parent.kind === 203 /* ForInStatement */) {
+                else if (declaration.parent.parent.kind === 207 /* ForOfStatement */ ||
+                    declaration.parent.parent.kind === 206 /* ForInStatement */) {
                     // ForIn/ForOf case - use site should not be used in expression part
                     var expression = declaration.parent.parent.expression;
                     return isSameScopeDescendentOf(usage, expression, container);
@@ -14906,8 +15469,8 @@ var ts;
                         return true;
                     }
                     var initializerOfNonStaticProperty = current.parent &&
-                        current.parent.kind === 142 /* PropertyDeclaration */ &&
-                        (current.parent.flags & 64 /* Static */) === 0 &&
+                        current.parent.kind === 144 /* PropertyDeclaration */ &&
+                        (current.parent.flags & 32 /* Static */) === 0 &&
                         current.parent.initializer === current;
                     if (initializerOfNonStaticProperty) {
                         return true;
@@ -14936,11 +15499,13 @@ var ts;
                             // - Type parameters of a function are in scope in the entire function declaration, including the parameter
                             //   list and return type. However, local types are only in scope in the function body.
                             // - parameters are only in the scope of function body
-                            if (meaning & result.flags & 793056 /* Type */) {
+                            // This restriction does not apply to JSDoc comment types because they are parented
+                            // at a higher level than type parameters would normally be
+                            if (meaning & result.flags & 793056 /* Type */ && lastLocation.kind !== 272 /* JSDocComment */) {
                                 useResult = result.flags & 262144 /* TypeParameter */
                                     ? lastLocation === location.type ||
-                                        lastLocation.kind === 139 /* Parameter */ ||
-                                        lastLocation.kind === 138 /* TypeParameter */
+                                        lastLocation.kind === 141 /* Parameter */ ||
+                                        lastLocation.kind === 140 /* TypeParameter */
                                     : false;
                             }
                             if (meaning & 107455 /* Value */ && result.flags & 1 /* FunctionScopedVariable */) {
@@ -14949,9 +15514,9 @@ var ts;
                                 // however it is detected separately when checking initializers of parameters
                                 // to make sure that they reference no variables declared after them.
                                 useResult =
-                                    lastLocation.kind === 139 /* Parameter */ ||
+                                    lastLocation.kind === 141 /* Parameter */ ||
                                         (lastLocation === location.type &&
-                                            result.valueDeclaration.kind === 139 /* Parameter */);
+                                            result.valueDeclaration.kind === 141 /* Parameter */);
                             }
                         }
                         if (useResult) {
@@ -14963,12 +15528,12 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 251 /* SourceFile */:
+                    case 255 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location))
                             break;
-                    case 221 /* ModuleDeclaration */:
+                    case 224 /* ModuleDeclaration */:
                         var moduleExports = getSymbolOfNode(location).exports;
-                        if (location.kind === 251 /* SourceFile */ || ts.isAmbientModule(location)) {
+                        if (location.kind === 255 /* SourceFile */ || ts.isAmbientModule(location)) {
                             // It's an external module. First see if the module has an export default and if the local
                             // name of that export default matches.
                             if (result = moduleExports["default"]) {
@@ -14991,7 +15556,7 @@ var ts;
                             //        which is not the desired behavior.
                             if (ts.hasProperty(moduleExports, name) &&
                                 moduleExports[name].flags === 8388608 /* Alias */ &&
-                                ts.getDeclarationOfKind(moduleExports[name], 233 /* ExportSpecifier */)) {
+                                ts.getDeclarationOfKind(moduleExports[name], 237 /* ExportSpecifier */)) {
                                 break;
                             }
                         }
@@ -14999,20 +15564,20 @@ var ts;
                             break loop;
                         }
                         break;
-                    case 220 /* EnumDeclaration */:
+                    case 223 /* EnumDeclaration */:
                         if (result = getSymbol(getSymbolOfNode(location).exports, name, meaning & 8 /* EnumMember */)) {
                             break loop;
                         }
                         break;
-                    case 142 /* PropertyDeclaration */:
-                    case 141 /* PropertySignature */:
+                    case 144 /* PropertyDeclaration */:
+                    case 143 /* PropertySignature */:
                         // TypeScript 1.0 spec (April 2014): 8.4.1
                         // Initializer expressions for instance member variables are evaluated in the scope
                         // of the class constructor body but are not permitted to reference parameters or
                         // 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 (ts.isClassLike(location.parent) && !(location.flags & 64 /* Static */)) {
+                        if (ts.isClassLike(location.parent) && !(location.flags & 32 /* Static */)) {
                             var ctor = findConstructorDeclaration(location.parent);
                             if (ctor && ctor.locals) {
                                 if (getSymbol(ctor.locals, name, meaning & 107455 /* Value */)) {
@@ -15022,11 +15587,11 @@ var ts;
                             }
                         }
                         break;
-                    case 217 /* ClassDeclaration */:
-                    case 189 /* ClassExpression */:
-                    case 218 /* InterfaceDeclaration */:
+                    case 220 /* ClassDeclaration */:
+                    case 191 /* ClassExpression */:
+                    case 221 /* InterfaceDeclaration */:
                         if (result = getSymbol(getSymbolOfNode(location).members, name, meaning & 793056 /* Type */)) {
-                            if (lastLocation && lastLocation.flags & 64 /* Static */) {
+                            if (lastLocation && lastLocation.flags & 32 /* 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.
@@ -15035,7 +15600,7 @@ var ts;
                             }
                             break loop;
                         }
-                        if (location.kind === 189 /* ClassExpression */ && meaning & 32 /* Class */) {
+                        if (location.kind === 191 /* ClassExpression */ && meaning & 32 /* Class */) {
                             var className = location.name;
                             if (className && name === className.text) {
                                 result = location.symbol;
@@ -15051,9 +15616,9 @@ var ts;
                     //       [foo<T>()]() { } // <-- Reference to T from class's own computed property
                     //   }
                     //
-                    case 137 /* ComputedPropertyName */:
+                    case 139 /* ComputedPropertyName */:
                         grandparent = location.parent.parent;
-                        if (ts.isClassLike(grandparent) || grandparent.kind === 218 /* InterfaceDeclaration */) {
+                        if (ts.isClassLike(grandparent) || grandparent.kind === 221 /* InterfaceDeclaration */) {
                             // A reference to this grandparent's type parameters would be an error
                             if (result = getSymbol(getSymbolOfNode(grandparent).members, name, meaning & 793056 /* Type */)) {
                                 error(errorLocation, ts.Diagnostics.A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type);
@@ -15061,19 +15626,19 @@ var ts;
                             }
                         }
                         break;
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
-                    case 145 /* Constructor */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
-                    case 216 /* FunctionDeclaration */:
-                    case 177 /* ArrowFunction */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
+                    case 147 /* Constructor */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
+                    case 219 /* FunctionDeclaration */:
+                    case 179 /* ArrowFunction */:
                         if (meaning & 3 /* Variable */ && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
                         }
                         break;
-                    case 176 /* FunctionExpression */:
+                    case 178 /* FunctionExpression */:
                         if (meaning & 3 /* Variable */ && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
@@ -15086,7 +15651,7 @@ var ts;
                             }
                         }
                         break;
-                    case 140 /* Decorator */:
+                    case 142 /* Decorator */:
                         // Decorators are resolved at the class declaration. Resolving at the parameter
                         // or member would result in looking up locals in the method.
                         //
@@ -15095,7 +15660,7 @@ var ts;
                         //       method(@y x, y) {} // <-- decorator y should be resolved at the class declaration, not the parameter.
                         //   }
                         //
-                        if (location.parent && location.parent.kind === 139 /* Parameter */) {
+                        if (location.parent && location.parent.kind === 141 /* Parameter */) {
                             location = location.parent;
                         }
                         //
@@ -15171,8 +15736,8 @@ var ts;
                         return true;
                     }
                     // 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 & 64 /* Static */)) {
+                    // Check if we're in an instance method and look for a relevant instance member.
+                    if (location === container && !(location.flags & 32 /* Static */)) {
                         var instanceType = getDeclaredTypeOfSymbol(classSymbol).thisType;
                         if (getPropertyOfType(instanceType, name)) {
                             error(errorLocation, ts.Diagnostics.Cannot_find_name_0_Did_you_mean_the_instance_member_this_0, typeof nameArg === "string" ? nameArg : ts.declarationNameToString(nameArg));
@@ -15189,7 +15754,7 @@ var ts;
             // Block-scoped variables cannot be used before their definition
             var declaration = ts.forEach(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) ? d : undefined; });
             ts.Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined");
-            if (!isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 214 /* VariableDeclaration */), errorLocation)) {
+            if (!isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 217 /* VariableDeclaration */), errorLocation)) {
                 error(errorLocation, ts.Diagnostics.Block_scoped_variable_0_used_before_its_declaration, ts.declarationNameToString(declaration.name));
             }
         }
@@ -15210,10 +15775,10 @@ var ts;
         }
         function getAnyImportSyntax(node) {
             if (ts.isAliasSymbolDeclaration(node)) {
-                if (node.kind === 224 /* ImportEqualsDeclaration */) {
+                if (node.kind === 228 /* ImportEqualsDeclaration */) {
                     return node;
                 }
-                while (node && node.kind !== 225 /* ImportDeclaration */) {
+                while (node && node.kind !== 229 /* ImportDeclaration */) {
                     node = node.parent;
                 }
                 return node;
@@ -15223,7 +15788,7 @@ var ts;
             return ts.forEach(symbol.declarations, function (d) { return ts.isAliasSymbolDeclaration(d) ? d : undefined; });
         }
         function getTargetOfImportEqualsDeclaration(node) {
-            if (node.moduleReference.kind === 235 /* ExternalModuleReference */) {
+            if (node.moduleReference.kind === 239 /* ExternalModuleReference */) {
                 return resolveExternalModuleSymbol(resolveExternalModuleName(node, ts.getExternalModuleImportEqualsDeclarationExpression(node)));
             }
             return getSymbolOfPartOfRightHandSideOfImportEquals(node.moduleReference, node);
@@ -15231,12 +15796,14 @@ var ts;
         function getTargetOfImportClause(node) {
             var moduleSymbol = resolveExternalModuleName(node, node.parent.moduleSpecifier);
             if (moduleSymbol) {
-                var exportDefaultSymbol = resolveSymbol(moduleSymbol.exports["default"]);
+                var exportDefaultSymbol = moduleSymbol.exports["export="] ?
+                    getPropertyOfType(getTypeOfSymbol(moduleSymbol.exports["export="]), "default") :
+                    resolveSymbol(moduleSymbol.exports["default"]);
                 if (!exportDefaultSymbol && !allowSyntheticDefaultImports) {
                     error(node.name, ts.Diagnostics.Module_0_has_no_default_export, symbolToString(moduleSymbol));
                 }
                 else if (!exportDefaultSymbol && allowSyntheticDefaultImports) {
-                    return resolveSymbol(moduleSymbol.exports["export="]) || resolveSymbol(moduleSymbol);
+                    return resolveExternalModuleSymbol(moduleSymbol) || resolveSymbol(moduleSymbol);
                 }
                 return exportDefaultSymbol;
             }
@@ -15300,8 +15867,15 @@ var ts;
             if (targetSymbol) {
                 var name_9 = specifier.propertyName || specifier.name;
                 if (name_9.text) {
+                    var symbolFromVariable = void 0;
+                    // First check if module was specified with "export=". If so, get the member from the resolved type
+                    if (moduleSymbol && moduleSymbol.exports && moduleSymbol.exports["export="]) {
+                        symbolFromVariable = getPropertyOfType(getTypeOfSymbol(targetSymbol), name_9.text);
+                    }
+                    else {
+                        symbolFromVariable = getPropertyOfVariable(targetSymbol, name_9.text);
+                    }
                     var symbolFromModule = getExportOfModule(targetSymbol, name_9.text);
-                    var symbolFromVariable = getPropertyOfVariable(targetSymbol, name_9.text);
                     var symbol = symbolFromModule && symbolFromVariable ?
                         combineValueAndTypeSymbols(symbolFromVariable, symbolFromModule) :
                         symbolFromModule || symbolFromVariable;
@@ -15315,6 +15889,9 @@ var ts;
         function getTargetOfImportSpecifier(node) {
             return getExternalModuleMember(node.parent.parent.parent, node);
         }
+        function getTargetOfGlobalModuleExportDeclaration(node) {
+            return resolveExternalModuleSymbol(node.parent.symbol);
+        }
         function getTargetOfExportSpecifier(node) {
             return node.parent.parent.moduleSpecifier ?
                 getExternalModuleMember(node.parent.parent, node) :
@@ -15325,18 +15902,20 @@ var ts;
         }
         function getTargetOfAliasDeclaration(node) {
             switch (node.kind) {
-                case 224 /* ImportEqualsDeclaration */:
+                case 228 /* ImportEqualsDeclaration */:
                     return getTargetOfImportEqualsDeclaration(node);
-                case 226 /* ImportClause */:
+                case 230 /* ImportClause */:
                     return getTargetOfImportClause(node);
-                case 227 /* NamespaceImport */:
+                case 231 /* NamespaceImport */:
                     return getTargetOfNamespaceImport(node);
-                case 229 /* ImportSpecifier */:
+                case 233 /* ImportSpecifier */:
                     return getTargetOfImportSpecifier(node);
-                case 233 /* ExportSpecifier */:
+                case 237 /* ExportSpecifier */:
                     return getTargetOfExportSpecifier(node);
-                case 230 /* ExportAssignment */:
+                case 234 /* ExportAssignment */:
                     return getTargetOfExportAssignment(node);
+                case 227 /* GlobalModuleExportDeclaration */:
+                    return getTargetOfGlobalModuleExportDeclaration(node);
             }
         }
         function resolveSymbol(symbol) {
@@ -15380,11 +15959,11 @@ var ts;
             if (!links.referenced) {
                 links.referenced = true;
                 var node = getDeclarationOfAliasSymbol(symbol);
-                if (node.kind === 230 /* ExportAssignment */) {
+                if (node.kind === 234 /* ExportAssignment */) {
                     // export default <symbol>
                     checkExpressionCached(node.expression);
                 }
-                else if (node.kind === 233 /* ExportSpecifier */) {
+                else if (node.kind === 237 /* ExportSpecifier */) {
                     // export { <symbol> } or export { <symbol> as foo }
                     checkExpressionCached(node.propertyName || node.name);
                 }
@@ -15397,7 +15976,7 @@ var ts;
         // This function is only for imports with entity names
         function getSymbolOfPartOfRightHandSideOfImportEquals(entityName, importDeclaration) {
             if (!importDeclaration) {
-                importDeclaration = ts.getAncestor(entityName, 224 /* ImportEqualsDeclaration */);
+                importDeclaration = ts.getAncestor(entityName, 228 /* ImportEqualsDeclaration */);
                 ts.Debug.assert(importDeclaration !== undefined);
             }
             // There are three things we might try to look for. In the following examples,
@@ -15410,13 +15989,13 @@ var ts;
                 entityName = entityName.parent;
             }
             // Check for case 1 and 3 in the above example
-            if (entityName.kind === 69 /* Identifier */ || entityName.parent.kind === 136 /* QualifiedName */) {
+            if (entityName.kind === 69 /* Identifier */ || entityName.parent.kind === 138 /* QualifiedName */) {
                 return resolveEntityName(entityName, 1536 /* Namespace */);
             }
             else {
                 // Case 2 in above example
                 // entityName.kind could be a QualifiedName or a Missing identifier
-                ts.Debug.assert(entityName.parent.kind === 224 /* ImportEqualsDeclaration */);
+                ts.Debug.assert(entityName.parent.kind === 228 /* ImportEqualsDeclaration */);
                 return resolveEntityName(entityName, 107455 /* Value */ | 793056 /* Type */ | 1536 /* Namespace */);
             }
         }
@@ -15436,9 +16015,9 @@ var ts;
                     return undefined;
                 }
             }
-            else if (name.kind === 136 /* QualifiedName */ || name.kind === 169 /* PropertyAccessExpression */) {
-                var left = name.kind === 136 /* QualifiedName */ ? name.left : name.expression;
-                var right = name.kind === 136 /* QualifiedName */ ? name.right : name.name;
+            else if (name.kind === 138 /* QualifiedName */ || name.kind === 171 /* PropertyAccessExpression */) {
+                var left = name.kind === 138 /* QualifiedName */ ? name.left : name.expression;
+                var right = name.kind === 138 /* QualifiedName */ ? name.right : name.name;
                 var namespace = resolveEntityName(left, 1536 /* Namespace */, ignoreErrors);
                 if (!namespace || namespace === unknownSymbol || ts.nodeIsMissing(right)) {
                     return undefined;
@@ -15473,7 +16052,7 @@ var ts;
             }
             var isRelative = ts.isExternalModuleNameRelative(moduleName);
             if (!isRelative) {
-                var symbol = getSymbol(globals, "\"" + moduleName + "\"", 512 /* ValueModule */);
+                var symbol = getSymbol(globals, '"' + moduleName + '"', 512 /* ValueModule */);
                 if (symbol) {
                     // merged symbol is module declaration symbol combined with all augmentations
                     return getMergedSymbol(symbol);
@@ -15487,7 +16066,7 @@ var ts;
                     return getMergedSymbol(sourceFile.symbol);
                 }
                 if (moduleNotFoundError) {
-                    // report errors only if it was requested 
+                    // report errors only if it was requested
                     error(moduleReferenceLiteral, ts.Diagnostics.File_0_is_not_a_module, sourceFile.fileName);
                 }
                 return undefined;
@@ -15501,7 +16080,7 @@ var ts;
         // An external module with an 'export =' declaration resolves to the target of the 'export =' declaration,
         // and an external module with no 'export =' declaration resolves to the module itself.
         function resolveExternalModuleSymbol(moduleSymbol) {
-            return moduleSymbol && resolveSymbol(moduleSymbol.exports["export="]) || moduleSymbol;
+            return moduleSymbol && getMergedSymbol(resolveSymbol(moduleSymbol.exports["export="])) || moduleSymbol;
         }
         // An external module with an 'export =' declaration may be referenced as an ES6 module provided the 'export ='
         // references a symbol that is at least declared as a module or a variable. The target of the 'export =' may
@@ -15514,8 +16093,8 @@ var ts;
             }
             return symbol;
         }
-        function getExportAssignmentSymbol(moduleSymbol) {
-            return moduleSymbol.exports["export="];
+        function hasExportAssignmentSymbol(moduleSymbol) {
+            return moduleSymbol.exports["export="] !== undefined;
         }
         function getExportsOfModuleAsArray(moduleSymbol) {
             return symbolsToArray(getExportsOfModule(moduleSymbol));
@@ -15624,7 +16203,7 @@ var ts;
             var members = node.members;
             for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
                 var member = members_1[_i];
-                if (member.kind === 145 /* Constructor */ && ts.nodeIsPresent(member.body)) {
+                if (member.kind === 147 /* Constructor */ && ts.nodeIsPresent(member.body)) {
                     return member;
                 }
             }
@@ -15671,19 +16250,19 @@ var ts;
             }
             return result || emptyArray;
         }
-        function setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexType, numberIndexType) {
+        function setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
             type.members = members;
             type.properties = getNamedMembers(members);
             type.callSignatures = callSignatures;
             type.constructSignatures = constructSignatures;
-            if (stringIndexType)
-                type.stringIndexType = stringIndexType;
-            if (numberIndexType)
-                type.numberIndexType = numberIndexType;
+            if (stringIndexInfo)
+                type.stringIndexInfo = stringIndexInfo;
+            if (numberIndexInfo)
+                type.numberIndexInfo = numberIndexInfo;
             return type;
         }
-        function createAnonymousType(symbol, members, callSignatures, constructSignatures, stringIndexType, numberIndexType) {
-            return setObjectTypeMembers(createObjectType(65536 /* Anonymous */, symbol), members, callSignatures, constructSignatures, stringIndexType, numberIndexType);
+        function createAnonymousType(symbol, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
+            return setObjectTypeMembers(createObjectType(65536 /* Anonymous */, symbol), members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function forEachSymbolTableInScope(enclosingDeclaration, callback) {
             var result;
@@ -15695,21 +16274,15 @@ var ts;
                     }
                 }
                 switch (location_1.kind) {
-                    case 251 /* SourceFile */:
+                    case 255 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location_1)) {
                             break;
                         }
-                    case 221 /* ModuleDeclaration */:
+                    case 224 /* ModuleDeclaration */:
                         if (result = callback(getSymbolOfNode(location_1).exports)) {
                             return result;
                         }
                         break;
-                    case 217 /* ClassDeclaration */:
-                    case 218 /* InterfaceDeclaration */:
-                        if (result = callback(getSymbolOfNode(location_1).members)) {
-                            return result;
-                        }
-                        break;
                 }
             }
             return callback(globals);
@@ -15732,7 +16305,7 @@ var ts;
                 function isAccessible(symbolFromSymbolTable, resolvedAliasSymbol) {
                     if (symbol === (resolvedAliasSymbol || symbolFromSymbolTable)) {
                         // if the symbolFromSymbolTable is not external module (it could be if it was determined as ambient external module and would be in globals table)
-                        // and if symbolfrom symbolTable or alias resolution matches the symbol,
+                        // and if symbolFromSymbolTable or alias resolution matches the symbol,
                         // check the symbol can be qualified, it is only then this symbol is accessible
                         return !ts.forEach(symbolFromSymbolTable.declarations, hasExternalModuleSymbol) &&
                             canQualifySymbol(symbolFromSymbolTable, meaning);
@@ -15746,7 +16319,7 @@ var ts;
                 return ts.forEachValue(symbols, function (symbolFromSymbolTable) {
                     if (symbolFromSymbolTable.flags & 8388608 /* Alias */
                         && symbolFromSymbolTable.name !== "export="
-                        && !ts.getDeclarationOfKind(symbolFromSymbolTable, 233 /* ExportSpecifier */)) {
+                        && !ts.getDeclarationOfKind(symbolFromSymbolTable, 237 /* ExportSpecifier */)) {
                         if (!useOnlyExternalAliasing ||
                             // Is this external alias, then use it to name
                             ts.forEach(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration)) {
@@ -15765,7 +16338,9 @@ var ts;
                 });
             }
             if (symbol) {
-                return forEachSymbolTableInScope(enclosingDeclaration, getAccessibleSymbolChainFromSymbolTable);
+                if (!(isPropertyOrMethodDeclarationSymbol(symbol))) {
+                    return forEachSymbolTableInScope(enclosingDeclaration, getAccessibleSymbolChainFromSymbolTable);
+                }
             }
         }
         function needsQualification(symbol, enclosingDeclaration, meaning) {
@@ -15783,7 +16358,7 @@ var ts;
                     return true;
                 }
                 // Qualify if the symbol from symbol table has same meaning as expected
-                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 233 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
+                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 237 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
                 if (symbolFromSymbolTable.flags & meaning) {
                     qualify = true;
                     return true;
@@ -15793,6 +16368,24 @@ var ts;
             });
             return qualify;
         }
+        function isPropertyOrMethodDeclarationSymbol(symbol) {
+            if (symbol.declarations && symbol.declarations.length) {
+                for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                    var declaration = _a[_i];
+                    switch (declaration.kind) {
+                        case 144 /* PropertyDeclaration */:
+                        case 146 /* MethodDeclaration */:
+                        case 148 /* GetAccessor */:
+                        case 149 /* SetAccessor */:
+                            continue;
+                        default:
+                            return false;
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
         function isSymbolAccessible(symbol, enclosingDeclaration, meaning) {
             if (symbol && enclosingDeclaration && !(symbol.flags & 262144 /* TypeParameter */)) {
                 var initialSymbol = symbol;
@@ -15856,7 +16449,7 @@ var ts;
             }
         }
         function hasExternalModuleSymbol(declaration) {
-            return ts.isAmbientModule(declaration) || (declaration.kind === 251 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isAmbientModule(declaration) || (declaration.kind === 255 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasVisibleDeclarations(symbol) {
             var aliasesToMakeVisible;
@@ -15870,7 +16463,7 @@ var ts;
                     // because these kind of aliases can be used to name types in declaration file
                     var anyImportSyntax = getAnyImportSyntax(declaration);
                     if (anyImportSyntax &&
-                        !(anyImportSyntax.flags & 2 /* Export */) &&
+                        !(anyImportSyntax.flags & 1 /* Export */) &&
                         isDeclarationVisible(anyImportSyntax.parent)) {
                         getNodeLinks(declaration).isVisible = true;
                         if (aliasesToMakeVisible) {
@@ -15892,12 +16485,12 @@ var ts;
         function isEntityNameVisible(entityName, enclosingDeclaration) {
             // get symbol of the first identifier of the entityName
             var meaning;
-            if (entityName.parent.kind === 155 /* TypeQuery */) {
+            if (entityName.parent.kind === 157 /* TypeQuery */ || ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
                 // Typeof value
                 meaning = 107455 /* Value */ | 1048576 /* ExportValue */;
             }
-            else if (entityName.kind === 136 /* QualifiedName */ || entityName.kind === 169 /* PropertyAccessExpression */ ||
-                entityName.parent.kind === 224 /* ImportEqualsDeclaration */) {
+            else if (entityName.kind === 138 /* QualifiedName */ || entityName.kind === 171 /* PropertyAccessExpression */ ||
+                entityName.parent.kind === 228 /* ImportEqualsDeclaration */) {
                 // Left identifier from type reference or TypeAlias
                 // Entity name of the import declaration
                 meaning = 1536 /* Namespace */;
@@ -15949,13 +16542,29 @@ var ts;
             }
             return result;
         }
+        function typePredicateToString(typePredicate, enclosingDeclaration, flags) {
+            var writer = ts.getSingleLineStringWriter();
+            getSymbolDisplayBuilder().buildTypePredicateDisplay(typePredicate, writer, enclosingDeclaration, flags);
+            var result = writer.string();
+            ts.releaseStringWriter(writer);
+            return result;
+        }
+        function visibilityToString(flags) {
+            if (flags === 8 /* Private */) {
+                return "private";
+            }
+            if (flags === 16 /* Protected */) {
+                return "protected";
+            }
+            return "public";
+        }
         function getTypeAliasForTypeLiteral(type) {
             if (type.symbol && type.symbol.flags & 2048 /* TypeLiteral */) {
                 var node = type.symbol.declarations[0].parent;
-                while (node.kind === 161 /* ParenthesizedType */) {
+                while (node.kind === 163 /* ParenthesizedType */) {
                     node = node.parent;
                 }
-                if (node.kind === 219 /* TypeAliasDeclaration */) {
+                if (node.kind === 222 /* TypeAliasDeclaration */) {
                     return getSymbolOfNode(node);
                 }
             }
@@ -15963,7 +16572,7 @@ var ts;
         }
         function isTopLevelInExternalModuleAugmentation(node) {
             return node && node.parent &&
-                node.parent.kind === 222 /* ModuleBlock */ &&
+                node.parent.kind === 225 /* ModuleBlock */ &&
                 ts.isExternalModuleAugmentation(node.parent.parent);
         }
         function getSymbolDisplayBuilder() {
@@ -15974,10 +16583,10 @@ var ts;
                         return ts.declarationNameToString(declaration.name);
                     }
                     switch (declaration.kind) {
-                        case 189 /* ClassExpression */:
+                        case 191 /* ClassExpression */:
                             return "(Anonymous class)";
-                        case 176 /* FunctionExpression */:
-                        case 177 /* ArrowFunction */:
+                        case 178 /* FunctionExpression */:
+                        case 179 /* ArrowFunction */:
                             return "(Anonymous function)";
                     }
                 }
@@ -16065,16 +16674,10 @@ var ts;
                 function writeType(type, flags) {
                     // Write undefined/null type as any
                     if (type.flags & 16777343 /* Intrinsic */) {
-                        if (type.flags & 134217728 /* PredicateType */) {
-                            buildTypePredicateDisplay(writer, type.predicate);
-                            buildTypeDisplay(type.predicate.type, writer, enclosingDeclaration, flags, symbolStack);
-                        }
-                        else {
-                            // Special handling for unknown / resolving types, they should show up as any and not unknown or __resolving
-                            writer.writeKeyword(!(globalFlags & 16 /* WriteOwnNameForAnyLike */) && isTypeAny(type)
-                                ? "any"
-                                : type.intrinsicName);
-                        }
+                        // Special handling for unknown / resolving types, they should show up as any and not unknown or __resolving
+                        writer.writeKeyword(!(globalFlags & 16 /* WriteOwnNameForAnyLike */) && isTypeAny(type)
+                            ? "any"
+                            : type.intrinsicName);
                     }
                     else if (type.flags & 33554432 /* ThisType */) {
                         if (inObjectTypeLiteral) {
@@ -16159,14 +16762,14 @@ var ts;
                             while (i < length_1) {
                                 // Find group of type arguments for type parameters with the same declaring container.
                                 var start = i;
-                                var parent_3 = getParentSymbolOfTypeParameter(outerTypeParameters[i]);
+                                var parent_5 = getParentSymbolOfTypeParameter(outerTypeParameters[i]);
                                 do {
                                     i++;
-                                } while (i < length_1 && getParentSymbolOfTypeParameter(outerTypeParameters[i]) === parent_3);
+                                } while (i < length_1 && getParentSymbolOfTypeParameter(outerTypeParameters[i]) === parent_5);
                                 // When type parameters are their own type arguments for the whole group (i.e. we have
                                 // the default outer type arguments), we don't show the group.
                                 if (!ts.rangeEquals(outerTypeParameters, typeArguments, start, i)) {
-                                    writeSymbolTypeReference(parent_3, typeArguments, start, i, flags);
+                                    writeSymbolTypeReference(parent_5, typeArguments, start, i, flags);
                                     writePunctuation(writer, 21 /* DotToken */);
                                 }
                             }
@@ -16228,11 +16831,11 @@ var ts;
                     }
                     function shouldWriteTypeOfFunctionSymbol() {
                         var isStaticMethodSymbol = !!(symbol.flags & 8192 /* Method */ &&
-                            ts.forEach(symbol.declarations, function (declaration) { return declaration.flags & 64 /* Static */; }));
+                            ts.forEach(symbol.declarations, function (declaration) { return declaration.flags & 32 /* Static */; }));
                         var isNonLocalFunctionSymbol = !!(symbol.flags & 16 /* Function */) &&
                             (symbol.parent ||
                                 ts.forEach(symbol.declarations, function (declaration) {
-                                    return declaration.parent.kind === 251 /* SourceFile */ || declaration.parent.kind === 222 /* ModuleBlock */;
+                                    return declaration.parent.kind === 255 /* SourceFile */ || declaration.parent.kind === 225 /* ModuleBlock */;
                                 }));
                         if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
                             // typeof is allowed only for static/non local functions
@@ -16246,19 +16849,38 @@ var ts;
                     writeSpace(writer);
                     buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, 107455 /* Value */, 0 /* None */, typeFormatFlags);
                 }
-                function getIndexerParameterName(type, indexKind, fallbackName) {
-                    var declaration = getIndexDeclarationOfSymbol(type.symbol, indexKind);
-                    if (!declaration) {
-                        // declaration might not be found if indexer was added from the contextual type.
-                        // in this case use fallback name
-                        return fallbackName;
+                function writeIndexSignature(info, keyword) {
+                    if (info) {
+                        if (info.isReadonly) {
+                            writeKeyword(writer, 127 /* ReadonlyKeyword */);
+                            writeSpace(writer);
+                        }
+                        writePunctuation(writer, 19 /* OpenBracketToken */);
+                        writer.writeParameter(info.declaration ? ts.declarationNameToString(info.declaration.parameters[0].name) : "x");
+                        writePunctuation(writer, 54 /* ColonToken */);
+                        writeSpace(writer);
+                        writeKeyword(writer, keyword);
+                        writePunctuation(writer, 20 /* CloseBracketToken */);
+                        writePunctuation(writer, 54 /* ColonToken */);
+                        writeSpace(writer);
+                        writeType(info.type, 0 /* None */);
+                        writePunctuation(writer, 23 /* SemicolonToken */);
+                        writer.writeLine();
+                    }
+                }
+                function writePropertyWithModifiers(prop) {
+                    if (isReadonlySymbol(prop)) {
+                        writeKeyword(writer, 127 /* ReadonlyKeyword */);
+                        writeSpace(writer);
+                    }
+                    buildSymbolDisplay(prop, writer);
+                    if (prop.flags & 536870912 /* Optional */) {
+                        writePunctuation(writer, 53 /* QuestionToken */);
                     }
-                    ts.Debug.assert(declaration.parameters.length !== 0);
-                    return ts.declarationNameToString(declaration.parameters[0].name);
                 }
                 function writeLiteralType(type, flags) {
                     var resolved = resolveStructuredTypeMembers(type);
-                    if (!resolved.properties.length && !resolved.stringIndexType && !resolved.numberIndexType) {
+                    if (!resolved.properties.length && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
                         if (!resolved.callSignatures.length && !resolved.constructSignatures.length) {
                             writePunctuation(writer, 15 /* OpenBraceToken */);
                             writePunctuation(writer, 16 /* CloseBraceToken */);
@@ -16304,34 +16926,8 @@ var ts;
                         writePunctuation(writer, 23 /* SemicolonToken */);
                         writer.writeLine();
                     }
-                    if (resolved.stringIndexType) {
-                        // [x: string]:
-                        writePunctuation(writer, 19 /* OpenBracketToken */);
-                        writer.writeParameter(getIndexerParameterName(resolved, 0 /* String */, /*fallbackName*/ "x"));
-                        writePunctuation(writer, 54 /* ColonToken */);
-                        writeSpace(writer);
-                        writeKeyword(writer, 130 /* StringKeyword */);
-                        writePunctuation(writer, 20 /* CloseBracketToken */);
-                        writePunctuation(writer, 54 /* ColonToken */);
-                        writeSpace(writer);
-                        writeType(resolved.stringIndexType, 0 /* None */);
-                        writePunctuation(writer, 23 /* SemicolonToken */);
-                        writer.writeLine();
-                    }
-                    if (resolved.numberIndexType) {
-                        // [x: number]:
-                        writePunctuation(writer, 19 /* OpenBracketToken */);
-                        writer.writeParameter(getIndexerParameterName(resolved, 1 /* Number */, /*fallbackName*/ "x"));
-                        writePunctuation(writer, 54 /* ColonToken */);
-                        writeSpace(writer);
-                        writeKeyword(writer, 128 /* NumberKeyword */);
-                        writePunctuation(writer, 20 /* CloseBracketToken */);
-                        writePunctuation(writer, 54 /* ColonToken */);
-                        writeSpace(writer);
-                        writeType(resolved.numberIndexType, 0 /* None */);
-                        writePunctuation(writer, 23 /* SemicolonToken */);
-                        writer.writeLine();
-                    }
+                    writeIndexSignature(resolved.stringIndexInfo, 131 /* StringKeyword */);
+                    writeIndexSignature(resolved.numberIndexInfo, 129 /* NumberKeyword */);
                     for (var _d = 0, _e = resolved.properties; _d < _e.length; _d++) {
                         var p = _e[_d];
                         var t = getTypeOfSymbol(p);
@@ -16339,20 +16935,14 @@ var ts;
                             var signatures = getSignaturesOfType(t, 0 /* Call */);
                             for (var _f = 0, signatures_1 = signatures; _f < signatures_1.length; _f++) {
                                 var signature = signatures_1[_f];
-                                buildSymbolDisplay(p, writer);
-                                if (p.flags & 536870912 /* Optional */) {
-                                    writePunctuation(writer, 53 /* QuestionToken */);
-                                }
+                                writePropertyWithModifiers(p);
                                 buildSignatureDisplay(signature, writer, enclosingDeclaration, globalFlagsToPass, /*kind*/ undefined, symbolStack);
                                 writePunctuation(writer, 23 /* SemicolonToken */);
                                 writer.writeLine();
                             }
                         }
                         else {
-                            buildSymbolDisplay(p, writer);
-                            if (p.flags & 536870912 /* Optional */) {
-                                writePunctuation(writer, 53 /* QuestionToken */);
-                            }
+                            writePropertyWithModifiers(p);
                             writePunctuation(writer, 54 /* ColonToken */);
                             writeSpace(writer);
                             writeType(t, 0 /* None */);
@@ -16365,10 +16955,10 @@ var ts;
                     inObjectTypeLiteral = saveInObjectTypeLiteral;
                 }
             }
-            function buildTypeParameterDisplayFromSymbol(symbol, writer, enclosingDeclaraiton, flags) {
+            function buildTypeParameterDisplayFromSymbol(symbol, writer, enclosingDeclaration, flags) {
                 var targetSymbol = getTargetSymbol(symbol);
                 if (targetSymbol.flags & 32 /* Class */ || targetSymbol.flags & 64 /* Interface */ || targetSymbol.flags & 524288 /* TypeAlias */) {
-                    buildDisplayForTypeParametersAndDelimiters(getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol), writer, enclosingDeclaraiton, flags);
+                    buildDisplayForTypeParametersAndDelimiters(getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol), writer, enclosingDeclaration, flags);
                 }
             }
             function buildTypeParameterDisplay(tp, writer, enclosingDeclaration, flags, symbolStack) {
@@ -16386,7 +16976,12 @@ var ts;
                 if (ts.isRestParameter(parameterNode)) {
                     writePunctuation(writer, 22 /* DotDotDotToken */);
                 }
-                appendSymbolNameOnly(p, writer);
+                if (ts.isBindingPattern(parameterNode.name)) {
+                    buildBindingPatternDisplay(parameterNode.name, writer, enclosingDeclaration, flags, symbolStack);
+                }
+                else {
+                    appendSymbolNameOnly(p, writer);
+                }
                 if (isOptionalParameter(parameterNode)) {
                     writePunctuation(writer, 53 /* QuestionToken */);
                 }
@@ -16394,19 +16989,59 @@ var ts;
                 writeSpace(writer);
                 buildTypeDisplay(getTypeOfSymbol(p), writer, enclosingDeclaration, flags, symbolStack);
             }
+            function buildBindingPatternDisplay(bindingPattern, writer, enclosingDeclaration, flags, symbolStack) {
+                // We have to explicitly emit square bracket and bracket because these tokens are not stored inside the node.
+                if (bindingPattern.kind === 166 /* ObjectBindingPattern */) {
+                    writePunctuation(writer, 15 /* OpenBraceToken */);
+                    buildDisplayForCommaSeparatedList(bindingPattern.elements, writer, function (e) { return buildBindingElementDisplay(e, writer, enclosingDeclaration, flags, symbolStack); });
+                    writePunctuation(writer, 16 /* CloseBraceToken */);
+                }
+                else if (bindingPattern.kind === 167 /* ArrayBindingPattern */) {
+                    writePunctuation(writer, 19 /* OpenBracketToken */);
+                    var elements = bindingPattern.elements;
+                    buildDisplayForCommaSeparatedList(elements, writer, function (e) { return buildBindingElementDisplay(e, writer, enclosingDeclaration, flags, symbolStack); });
+                    if (elements && elements.hasTrailingComma) {
+                        writePunctuation(writer, 24 /* CommaToken */);
+                    }
+                    writePunctuation(writer, 20 /* CloseBracketToken */);
+                }
+            }
+            function buildBindingElementDisplay(bindingElement, writer, enclosingDeclaration, flags, symbolStack) {
+                if (bindingElement.kind === 192 /* OmittedExpression */) {
+                    return;
+                }
+                ts.Debug.assert(bindingElement.kind === 168 /* BindingElement */);
+                if (bindingElement.propertyName) {
+                    writer.writeSymbol(ts.getTextOfNode(bindingElement.propertyName), bindingElement.symbol);
+                    writePunctuation(writer, 54 /* ColonToken */);
+                    writeSpace(writer);
+                }
+                if (ts.isBindingPattern(bindingElement.name)) {
+                    buildBindingPatternDisplay(bindingElement.name, writer, enclosingDeclaration, flags, symbolStack);
+                }
+                else {
+                    if (bindingElement.dotDotDotToken) {
+                        writePunctuation(writer, 22 /* DotDotDotToken */);
+                    }
+                    appendSymbolNameOnly(bindingElement.symbol, writer);
+                }
+            }
             function buildDisplayForTypeParametersAndDelimiters(typeParameters, writer, enclosingDeclaration, flags, symbolStack) {
                 if (typeParameters && typeParameters.length) {
                     writePunctuation(writer, 25 /* LessThanToken */);
-                    for (var i = 0; i < typeParameters.length; i++) {
-                        if (i > 0) {
-                            writePunctuation(writer, 24 /* CommaToken */);
-                            writeSpace(writer);
-                        }
-                        buildTypeParameterDisplay(typeParameters[i], writer, enclosingDeclaration, flags, symbolStack);
-                    }
+                    buildDisplayForCommaSeparatedList(typeParameters, writer, function (p) { return buildTypeParameterDisplay(p, writer, enclosingDeclaration, flags, symbolStack); });
                     writePunctuation(writer, 27 /* GreaterThanToken */);
                 }
             }
+            function buildDisplayForCommaSeparatedList(list, writer, action) {
+                for (var i = 0; i < list.length; i++) {
+                    if (i > 0) {
+                        writePunctuation(writer, 24 /* CommaToken */);
+                        writeSpace(writer);
+                    }
+                    action(list[i]);
+                }
+            }
             function buildDisplayForTypeArgumentsAndDelimiters(typeParameters, mapper, writer, enclosingDeclaration, flags, symbolStack) {
                 if (typeParameters && typeParameters.length) {
                     writePunctuation(writer, 25 /* LessThanToken */);
@@ -16420,10 +17055,16 @@ var ts;
                     writePunctuation(writer, 27 /* GreaterThanToken */);
                 }
             }
-            function buildDisplayForParametersAndDelimiters(parameters, writer, enclosingDeclaration, flags, symbolStack) {
+            function buildDisplayForParametersAndDelimiters(thisType, parameters, writer, enclosingDeclaration, flags, symbolStack) {
                 writePunctuation(writer, 17 /* OpenParenToken */);
+                if (thisType) {
+                    writeKeyword(writer, 97 /* ThisKeyword */);
+                    writePunctuation(writer, 54 /* ColonToken */);
+                    writeSpace(writer);
+                    buildTypeDisplay(thisType, writer, enclosingDeclaration, flags, symbolStack);
+                }
                 for (var i = 0; i < parameters.length; i++) {
-                    if (i > 0) {
+                    if (i > 0 || thisType) {
                         writePunctuation(writer, 24 /* CommaToken */);
                         writeSpace(writer);
                     }
@@ -16431,7 +17072,7 @@ var ts;
                 }
                 writePunctuation(writer, 18 /* CloseParenToken */);
             }
-            function buildTypePredicateDisplay(writer, predicate) {
+            function buildTypePredicateDisplay(predicate, writer, enclosingDeclaration, flags, symbolStack) {
                 if (ts.isIdentifierTypePredicate(predicate)) {
                     writer.writeParameter(predicate.parameterName);
                 }
@@ -16441,6 +17082,7 @@ var ts;
                 writeSpace(writer);
                 writeKeyword(writer, 124 /* IsKeyword */);
                 writeSpace(writer);
+                buildTypeDisplay(predicate.type, writer, enclosingDeclaration, flags, symbolStack);
             }
             function buildReturnTypeDisplay(signature, writer, enclosingDeclaration, flags, symbolStack) {
                 if (flags & 8 /* WriteArrowStyleSignature */) {
@@ -16451,8 +17093,13 @@ var ts;
                     writePunctuation(writer, 54 /* ColonToken */);
                 }
                 writeSpace(writer);
-                var returnType = getReturnTypeOfSignature(signature);
-                buildTypeDisplay(returnType, writer, enclosingDeclaration, flags, symbolStack);
+                if (signature.typePredicate) {
+                    buildTypePredicateDisplay(signature.typePredicate, writer, enclosingDeclaration, flags, symbolStack);
+                }
+                else {
+                    var returnType = getReturnTypeOfSignature(signature);
+                    buildTypeDisplay(returnType, writer, enclosingDeclaration, flags, symbolStack);
+                }
             }
             function buildSignatureDisplay(signature, writer, enclosingDeclaration, flags, kind, symbolStack) {
                 if (kind === 1 /* Construct */) {
@@ -16467,13 +17114,14 @@ var ts;
                 else {
                     buildDisplayForTypeParametersAndDelimiters(signature.typeParameters, writer, enclosingDeclaration, flags, symbolStack);
                 }
-                buildDisplayForParametersAndDelimiters(signature.parameters, writer, enclosingDeclaration, flags, symbolStack);
+                buildDisplayForParametersAndDelimiters(signature.thisType, signature.parameters, writer, enclosingDeclaration, flags, symbolStack);
                 buildReturnTypeDisplay(signature, writer, enclosingDeclaration, flags, symbolStack);
             }
             return _displayBuilder || (_displayBuilder = {
                 buildSymbolDisplay: buildSymbolDisplay,
                 buildTypeDisplay: buildTypeDisplay,
                 buildTypeParameterDisplay: buildTypeParameterDisplay,
+                buildTypePredicateDisplay: buildTypePredicateDisplay,
                 buildParameterDisplay: buildParameterDisplay,
                 buildDisplayForParametersAndDelimiters: buildDisplayForParametersAndDelimiters,
                 buildDisplayForTypeParametersAndDelimiters: buildDisplayForTypeParametersAndDelimiters,
@@ -16493,86 +17141,86 @@ var ts;
             return false;
             function determineIfDeclarationIsVisible() {
                 switch (node.kind) {
-                    case 166 /* BindingElement */:
+                    case 168 /* BindingElement */:
                         return isDeclarationVisible(node.parent.parent);
-                    case 214 /* VariableDeclaration */:
+                    case 217 /* VariableDeclaration */:
                         if (ts.isBindingPattern(node.name) &&
                             !node.name.elements.length) {
                             // If the binding pattern is empty, this variable declaration is not visible
                             return false;
                         }
                     // Otherwise fall through
-                    case 221 /* ModuleDeclaration */:
-                    case 217 /* ClassDeclaration */:
-                    case 218 /* InterfaceDeclaration */:
-                    case 219 /* TypeAliasDeclaration */:
-                    case 216 /* FunctionDeclaration */:
-                    case 220 /* EnumDeclaration */:
-                    case 224 /* ImportEqualsDeclaration */:
+                    case 224 /* ModuleDeclaration */:
+                    case 220 /* ClassDeclaration */:
+                    case 221 /* InterfaceDeclaration */:
+                    case 222 /* TypeAliasDeclaration */:
+                    case 219 /* FunctionDeclaration */:
+                    case 223 /* EnumDeclaration */:
+                    case 228 /* ImportEqualsDeclaration */:
                         // external module augmentation is always visible
                         if (ts.isExternalModuleAugmentation(node)) {
                             return true;
                         }
-                        var parent_4 = getDeclarationContainer(node);
+                        var parent_6 = getDeclarationContainer(node);
                         // If the node is not exported or it is not ambient module element (except import declaration)
-                        if (!(ts.getCombinedNodeFlags(node) & 2 /* Export */) &&
-                            !(node.kind !== 224 /* ImportEqualsDeclaration */ && parent_4.kind !== 251 /* SourceFile */ && ts.isInAmbientContext(parent_4))) {
-                            return isGlobalSourceFile(parent_4);
+                        if (!(ts.getCombinedNodeFlags(node) & 1 /* Export */) &&
+                            !(node.kind !== 228 /* ImportEqualsDeclaration */ && parent_6.kind !== 255 /* SourceFile */ && ts.isInAmbientContext(parent_6))) {
+                            return isGlobalSourceFile(parent_6);
                         }
                         // Exported members/ambient module elements (exception import declaration) are visible if parent is visible
-                        return isDeclarationVisible(parent_4);
-                    case 142 /* PropertyDeclaration */:
-                    case 141 /* PropertySignature */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
-                        if (node.flags & (16 /* Private */ | 32 /* Protected */)) {
+                        return isDeclarationVisible(parent_6);
+                    case 144 /* PropertyDeclaration */:
+                    case 143 /* PropertySignature */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
+                        if (node.flags & (8 /* Private */ | 16 /* Protected */)) {
                             // Private/protected properties/methods are not visible
                             return false;
                         }
                     // Public properties/methods are visible if its parents are visible, so const it fall into next case statement
-                    case 145 /* Constructor */:
-                    case 149 /* ConstructSignature */:
-                    case 148 /* CallSignature */:
-                    case 150 /* IndexSignature */:
-                    case 139 /* Parameter */:
-                    case 222 /* ModuleBlock */:
-                    case 153 /* FunctionType */:
-                    case 154 /* ConstructorType */:
-                    case 156 /* TypeLiteral */:
-                    case 152 /* TypeReference */:
-                    case 157 /* ArrayType */:
-                    case 158 /* TupleType */:
-                    case 159 /* UnionType */:
-                    case 160 /* IntersectionType */:
-                    case 161 /* ParenthesizedType */:
+                    case 147 /* Constructor */:
+                    case 151 /* ConstructSignature */:
+                    case 150 /* CallSignature */:
+                    case 152 /* IndexSignature */:
+                    case 141 /* Parameter */:
+                    case 225 /* ModuleBlock */:
+                    case 155 /* FunctionType */:
+                    case 156 /* ConstructorType */:
+                    case 158 /* TypeLiteral */:
+                    case 154 /* TypeReference */:
+                    case 159 /* ArrayType */:
+                    case 160 /* TupleType */:
+                    case 161 /* UnionType */:
+                    case 162 /* IntersectionType */:
+                    case 163 /* ParenthesizedType */:
                         return isDeclarationVisible(node.parent);
                     // Default binding, import specifier and namespace import is visible
                     // only on demand so by default it is not visible
-                    case 226 /* ImportClause */:
-                    case 227 /* NamespaceImport */:
-                    case 229 /* ImportSpecifier */:
+                    case 230 /* ImportClause */:
+                    case 231 /* NamespaceImport */:
+                    case 233 /* ImportSpecifier */:
                         return false;
                     // Type parameters are always visible
-                    case 138 /* TypeParameter */:
+                    case 140 /* TypeParameter */:
                     // Source file is always visible
-                    case 251 /* SourceFile */:
+                    case 255 /* SourceFile */:
                         return true;
                     // Export assignments do not create name bindings outside the module
-                    case 230 /* ExportAssignment */:
+                    case 234 /* ExportAssignment */:
                         return false;
                     default:
-                        ts.Debug.fail("isDeclarationVisible unknown: SyntaxKind: " + node.kind);
+                        return false;
                 }
             }
         }
         function collectLinkedAliases(node) {
             var exportSymbol;
-            if (node.parent && node.parent.kind === 230 /* ExportAssignment */) {
+            if (node.parent && node.parent.kind === 234 /* ExportAssignment */) {
                 exportSymbol = resolveName(node.parent, node.text, 107455 /* Value */ | 793056 /* Type */ | 1536 /* Namespace */ | 8388608 /* Alias */, ts.Diagnostics.Cannot_find_name_0, node);
             }
-            else if (node.parent.kind === 233 /* ExportSpecifier */) {
+            else if (node.parent.kind === 237 /* ExportSpecifier */) {
                 var exportSpecifier = node.parent;
                 exportSymbol = exportSpecifier.parent.parent.moduleSpecifier ?
                     getExternalModuleMember(exportSpecifier.parent.parent, exportSpecifier) :
@@ -16664,16 +17312,27 @@ var ts;
         }
         function getDeclarationContainer(node) {
             node = ts.getRootDeclaration(node);
-            // Parent chain:
-            // VaribleDeclaration -> VariableDeclarationList -> VariableStatement -> 'Declaration Container'
-            return node.kind === 214 /* VariableDeclaration */ ? node.parent.parent.parent : node.parent;
+            while (node) {
+                switch (node.kind) {
+                    case 217 /* VariableDeclaration */:
+                    case 218 /* VariableDeclarationList */:
+                    case 233 /* ImportSpecifier */:
+                    case 232 /* NamedImports */:
+                    case 231 /* NamespaceImport */:
+                    case 230 /* ImportClause */:
+                        node = node.parent;
+                        break;
+                    default:
+                        return node.parent;
+                }
+            }
         }
         function getTypeOfPrototypeProperty(prototype) {
             // TypeScript 1.0 spec (April 2014): 8.4
             // Every class automatically contains a static property member named 'prototype',
             // the type of which is an instantiation of the class type with type Any supplied as a type argument for each type parameter.
             // It is an error to explicitly declare a static property member with the name 'prototype'.
-            var classType = getDeclaredTypeOfSymbol(getMergedSymbol(prototype.parent));
+            var classType = getDeclaredTypeOfSymbol(getParentOfSymbol(prototype));
             return classType.typeParameters ? createTypeReference(classType, ts.map(classType.typeParameters, function (_) { return anyType; })) : classType;
         }
         // Return the type of the given property in the given type, or undefined if no such property exists
@@ -16697,7 +17356,7 @@ var ts;
                 case 9 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
                     return name.text;
-                case 137 /* ComputedPropertyName */:
+                case 139 /* ComputedPropertyName */:
                     if (ts.isStringOrNumericLiteral(name.expression.kind)) {
                         return name.expression.text;
                     }
@@ -16705,9 +17364,9 @@ var ts;
             return undefined;
         }
         function isComputedNonLiteralName(name) {
-            return name.kind === 137 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteral(name.expression.kind);
+            return name.kind === 139 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteral(name.expression.kind);
         }
-        // Return the inferred type for a binding element
+        /** Return the inferred type for a binding element */
         function getTypeForBindingElement(declaration) {
             var pattern = declaration.parent;
             var parentType = getTypeForBindingElementParent(pattern.parent);
@@ -16725,13 +17384,16 @@ var ts;
                 return parentType;
             }
             var type;
-            if (pattern.kind === 164 /* ObjectBindingPattern */) {
+            if (pattern.kind === 166 /* ObjectBindingPattern */) {
                 // Use explicitly specified property name ({ p: xxx } form), or otherwise the implied name ({ p } form)
                 var name_10 = declaration.propertyName || declaration.name;
                 if (isComputedNonLiteralName(name_10)) {
                     // computed properties with non-literal names are treated as 'any'
                     return anyType;
                 }
+                if (declaration.initializer) {
+                    getContextualType(declaration.initializer);
+                }
                 // Use type of the specified property, or otherwise, for a numeric name, the type of the numeric index signature,
                 // or otherwise the type of the string index signature.
                 var text = getTextOfPropertyName(name_10);
@@ -16769,15 +17431,60 @@ var ts;
                     type = createArrayType(elementType);
                 }
             }
+            // In strict null checking mode, if a default value of a non-undefined type is specified, remove
+            // undefined from the final type.
+            if (strictNullChecks && declaration.initializer && !(getNullableKind(checkExpressionCached(declaration.initializer)) & 32 /* Undefined */)) {
+                type = removeNullableKind(type, 32 /* Undefined */);
+            }
             return type;
         }
+        function getTypeForVariableLikeDeclarationFromJSDocComment(declaration) {
+            var jsDocType = getJSDocTypeForVariableLikeDeclarationFromJSDocComment(declaration);
+            if (jsDocType) {
+                return getTypeFromTypeNode(jsDocType);
+            }
+        }
+        function getJSDocTypeForVariableLikeDeclarationFromJSDocComment(declaration) {
+            // First, see if this node has an @type annotation on it directly.
+            var typeTag = ts.getJSDocTypeTag(declaration);
+            if (typeTag && typeTag.typeExpression) {
+                return typeTag.typeExpression.type;
+            }
+            if (declaration.kind === 217 /* VariableDeclaration */ &&
+                declaration.parent.kind === 218 /* VariableDeclarationList */ &&
+                declaration.parent.parent.kind === 199 /* VariableStatement */) {
+                // @type annotation might have been on the variable statement, try that instead.
+                var annotation = ts.getJSDocTypeTag(declaration.parent.parent);
+                if (annotation && annotation.typeExpression) {
+                    return annotation.typeExpression.type;
+                }
+            }
+            else if (declaration.kind === 141 /* Parameter */) {
+                // If it's a parameter, see if the parent has a jsdoc comment with an @param
+                // annotation.
+                var paramTag = ts.getCorrespondingJSDocParameterTag(declaration);
+                if (paramTag && paramTag.typeExpression) {
+                    return paramTag.typeExpression.type;
+                }
+            }
+            return undefined;
+        }
         // Return the inferred type for a variable, parameter, or property declaration
         function getTypeForVariableLikeDeclaration(declaration) {
+            if (declaration.flags & 134217728 /* JavaScriptFile */) {
+                // If this is a variable in a JavaScript file, then use the JSDoc type (if it has
+                // one as its type), otherwise fallback to the below standard TS codepaths to
+                // try to figure it out.
+                var type = getTypeForVariableLikeDeclarationFromJSDocComment(declaration);
+                if (type && type !== unknownType) {
+                    return type;
+                }
+            }
             // A variable declared in a for..in statement is always of type string
-            if (declaration.parent.parent.kind === 203 /* ForInStatement */) {
+            if (declaration.parent.parent.kind === 206 /* ForInStatement */) {
                 return stringType;
             }
-            if (declaration.parent.parent.kind === 204 /* ForOfStatement */) {
+            if (declaration.parent.parent.kind === 207 /* ForOfStatement */) {
                 // checkRightHandSideOfForOf will return undefined if the for-of expression type was
                 // missing properties/signatures required to get its iteratedType (like
                 // [Symbol.iterator] or next). This may be because we accessed properties from anyType,
@@ -16789,21 +17496,24 @@ var ts;
             }
             // Use type from type annotation if one is present
             if (declaration.type) {
-                return getTypeFromTypeNode(declaration.type);
+                var type = getTypeFromTypeNode(declaration.type);
+                return strictNullChecks && declaration.questionToken ? addNullableKind(type, 32 /* Undefined */) : type;
             }
-            if (declaration.kind === 139 /* Parameter */) {
+            if (declaration.kind === 141 /* Parameter */) {
                 var func = declaration.parent;
                 // For a parameter of a set accessor, use the type of the get accessor if one is present
-                if (func.kind === 147 /* SetAccessor */ && !ts.hasDynamicName(func)) {
-                    var getter = ts.getDeclarationOfKind(declaration.parent.symbol, 146 /* GetAccessor */);
+                if (func.kind === 149 /* SetAccessor */ && !ts.hasDynamicName(func)) {
+                    var getter = ts.getDeclarationOfKind(declaration.parent.symbol, 148 /* GetAccessor */);
                     if (getter) {
                         return getReturnTypeOfSignature(getSignatureFromDeclaration(getter));
                     }
                 }
                 // Use contextual parameter type if one is available
-                var type = getContextuallyTypedParameterType(declaration);
+                var type = declaration.symbol.name === "this"
+                    ? getContextuallyTypedThisType(func)
+                    : getContextuallyTypedParameterType(declaration);
                 if (type) {
-                    return type;
+                    return strictNullChecks && declaration.questionToken ? addNullableKind(type, 32 /* Undefined */) : type;
                 }
             }
             // Use the type of the initializer expression if one is present
@@ -16811,7 +17521,7 @@ var ts;
                 return checkExpressionCached(declaration.initializer);
             }
             // If it is a short-hand property assignment, use the type of the identifier
-            if (declaration.kind === 249 /* ShorthandPropertyAssignment */) {
+            if (declaration.kind === 253 /* ShorthandPropertyAssignment */) {
                 return checkIdentifier(declaration.name);
             }
             // If the declaration specifies a binding pattern, use the type implied by the binding pattern
@@ -16826,11 +17536,16 @@ var ts;
         // pattern. Otherwise, it is the type any.
         function getTypeFromBindingElement(element, includePatternInType) {
             if (element.initializer) {
-                return getWidenedType(checkExpressionCached(element.initializer));
+                var type = checkExpressionCached(element.initializer);
+                reportErrorsFromWidening(element, type);
+                return getWidenedType(type);
             }
             if (ts.isBindingPattern(element.name)) {
                 return getTypeFromBindingPattern(element.name, includePatternInType);
             }
+            if (compilerOptions.noImplicitAny) {
+                reportImplicitAnyError(element, anyType);
+            }
             return anyType;
         }
         // Return the type implied by an object binding pattern
@@ -16867,7 +17582,7 @@ var ts;
                 return languageVersion >= 2 /* ES6 */ ? createIterableType(anyType) : anyArrayType;
             }
             // If the pattern has at least one element, and no rest element, then it should imply a tuple type.
-            var elementTypes = ts.map(elements, function (e) { return e.kind === 190 /* OmittedExpression */ ? anyType : getTypeFromBindingElement(e, includePatternInType); });
+            var elementTypes = ts.map(elements, function (e) { return e.kind === 192 /* OmittedExpression */ ? anyType : getTypeFromBindingElement(e, includePatternInType); });
             if (includePatternInType) {
                 var result = createNewTupleType(elementTypes);
                 result.pattern = pattern;
@@ -16883,7 +17598,7 @@ var ts;
         // parameter with no type annotation or initializer, the type implied by the binding pattern becomes the type of
         // the parameter.
         function getTypeFromBindingPattern(pattern, includePatternInType) {
-            return pattern.kind === 164 /* ObjectBindingPattern */
+            return pattern.kind === 166 /* ObjectBindingPattern */
                 ? getTypeFromObjectBindingPattern(pattern, includePatternInType)
                 : getTypeFromArrayBindingPattern(pattern, includePatternInType);
         }
@@ -16905,10 +17620,7 @@ var ts;
                 // During a normal type check we'll never get to here with a property assignment (the check of the containing
                 // object literal uses a different path). We exclude widening only so that language services and type verification
                 // tools see the actual type.
-                if (declaration.kind === 248 /* PropertyAssignment */) {
-                    return type;
-                }
-                if (type.flags & 134217728 /* PredicateType */ && (declaration.kind === 142 /* PropertyDeclaration */ || declaration.kind === 141 /* PropertySignature */)) {
+                if (declaration.kind === 252 /* PropertyAssignment */) {
                     return type;
                 }
                 return getWidenedType(type);
@@ -16918,7 +17630,7 @@ var ts;
             // Report implicit any errors unless this is a private property within an ambient declaration
             if (reportErrors && compilerOptions.noImplicitAny) {
                 var root = ts.getRootDeclaration(declaration);
-                if (!isPrivateWithinAmbient(root) && !(root.kind === 139 /* Parameter */ && isPrivateWithinAmbient(root.parent))) {
+                if (!isPrivateWithinAmbient(root) && !(root.kind === 141 /* Parameter */ && isPrivateWithinAmbient(root.parent))) {
                     reportImplicitAnyError(declaration, type);
                 }
             }
@@ -16933,21 +17645,21 @@ var ts;
                 }
                 // Handle catch clause variables
                 var declaration = symbol.valueDeclaration;
-                if (declaration.parent.kind === 247 /* CatchClause */) {
+                if (declaration.parent.kind === 251 /* CatchClause */) {
                     return links.type = anyType;
                 }
                 // Handle export default expressions
-                if (declaration.kind === 230 /* ExportAssignment */) {
+                if (declaration.kind === 234 /* ExportAssignment */) {
                     return links.type = checkExpression(declaration.expression);
                 }
                 // Handle module.exports = expr
-                if (declaration.kind === 184 /* BinaryExpression */) {
-                    return links.type = checkExpression(declaration.right);
+                if (declaration.kind === 186 /* BinaryExpression */) {
+                    return links.type = getUnionType(ts.map(symbol.declarations, function (decl) { return checkExpressionCached(decl.right); }));
                 }
-                if (declaration.kind === 169 /* PropertyAccessExpression */) {
+                if (declaration.kind === 171 /* PropertyAccessExpression */) {
                     // Declarations only exist for property access expressions for certain
                     // special assignment kinds
-                    if (declaration.parent.kind === 184 /* BinaryExpression */) {
+                    if (declaration.parent.kind === 186 /* BinaryExpression */) {
                         // Handle exports.p = expr or this.p = expr or className.prototype.method = expr
                         return links.type = checkExpressionCached(declaration.parent.right);
                     }
@@ -16977,7 +17689,7 @@ var ts;
         }
         function getAnnotatedAccessorType(accessor) {
             if (accessor) {
-                if (accessor.kind === 146 /* GetAccessor */) {
+                if (accessor.kind === 148 /* GetAccessor */) {
                     return accessor.type && getTypeFromTypeNode(accessor.type);
                 }
                 else {
@@ -16990,12 +17702,18 @@ var ts;
         function getTypeOfAccessors(symbol) {
             var links = getSymbolLinks(symbol);
             if (!links.type) {
+                var getter = ts.getDeclarationOfKind(symbol, 148 /* GetAccessor */);
+                var setter = ts.getDeclarationOfKind(symbol, 149 /* SetAccessor */);
+                if (getter && getter.flags & 134217728 /* JavaScriptFile */) {
+                    var jsDocType = getTypeForVariableLikeDeclarationFromJSDocComment(getter);
+                    if (jsDocType) {
+                        return links.type = jsDocType;
+                    }
+                }
                 if (!pushTypeResolution(symbol, 0 /* Type */)) {
                     return unknownType;
                 }
-                var getter = ts.getDeclarationOfKind(symbol, 146 /* GetAccessor */);
-                var setter = ts.getDeclarationOfKind(symbol, 147 /* SetAccessor */);
-                var type;
+                var type = void 0;
                 // First try to see if the user specified a return type on the get-accessor.
                 var getterReturnType = getAnnotatedAccessorType(getter);
                 if (getterReturnType) {
@@ -17023,7 +17741,7 @@ var ts;
                 if (!popTypeResolution()) {
                     type = anyType;
                     if (compilerOptions.noImplicitAny) {
-                        var getter_1 = ts.getDeclarationOfKind(symbol, 146 /* GetAccessor */);
+                        var getter_1 = ts.getDeclarationOfKind(symbol, 148 /* GetAccessor */);
                         error(getter_1, ts.Diagnostics._0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions, symbolToString(symbol));
                     }
                 }
@@ -17123,9 +17841,9 @@ var ts;
                 if (!node) {
                     return typeParameters;
                 }
-                if (node.kind === 217 /* ClassDeclaration */ || node.kind === 189 /* ClassExpression */ ||
-                    node.kind === 216 /* FunctionDeclaration */ || node.kind === 176 /* FunctionExpression */ ||
-                    node.kind === 144 /* MethodDeclaration */ || node.kind === 177 /* ArrowFunction */) {
+                if (node.kind === 220 /* ClassDeclaration */ || node.kind === 191 /* ClassExpression */ ||
+                    node.kind === 219 /* FunctionDeclaration */ || node.kind === 178 /* FunctionExpression */ ||
+                    node.kind === 146 /* MethodDeclaration */ || node.kind === 179 /* ArrowFunction */) {
                     var declarations = node.typeParameters;
                     if (declarations) {
                         return appendTypeParameters(appendOuterTypeParameters(typeParameters, node), declarations);
@@ -17135,7 +17853,7 @@ var ts;
         }
         // The outer type parameters are those defined by enclosing generic classes, methods, or functions.
         function getOuterTypeParametersOfClassOrInterface(symbol) {
-            var declaration = symbol.flags & 32 /* Class */ ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 218 /* InterfaceDeclaration */);
+            var declaration = symbol.flags & 32 /* Class */ ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 221 /* InterfaceDeclaration */);
             return appendOuterTypeParameters(undefined, declaration);
         }
         // The local type parameters are the combined set of type parameters from all declarations of the class,
@@ -17144,8 +17862,8 @@ var ts;
             var result;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var node = _a[_i];
-                if (node.kind === 218 /* InterfaceDeclaration */ || node.kind === 217 /* ClassDeclaration */ ||
-                    node.kind === 189 /* ClassExpression */ || node.kind === 219 /* TypeAliasDeclaration */) {
+                if (node.kind === 221 /* InterfaceDeclaration */ || node.kind === 220 /* ClassDeclaration */ ||
+                    node.kind === 191 /* ClassExpression */ || node.kind === 222 /* TypeAliasDeclaration */) {
                     var declaration = node;
                     if (declaration.typeParameters) {
                         result = appendTypeParameters(result, declaration.typeParameters);
@@ -17172,8 +17890,8 @@ var ts;
         function getInstantiatedConstructorsForTypeArguments(type, typeArgumentNodes) {
             var signatures = getConstructorsForTypeArguments(type, typeArgumentNodes);
             if (typeArgumentNodes) {
-                var typeArguments = ts.map(typeArgumentNodes, getTypeFromTypeNode);
-                signatures = ts.map(signatures, function (sig) { return getSignatureInstantiation(sig, typeArguments); });
+                var typeArguments_1 = ts.map(typeArgumentNodes, getTypeFromTypeNode);
+                signatures = ts.map(signatures, function (sig) { return getSignatureInstantiation(sig, typeArguments_1); });
             }
             return signatures;
         }
@@ -17285,7 +18003,7 @@ var ts;
             type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
             for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 218 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
+                if (declaration.kind === 221 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
                     for (var _b = 0, _c = ts.getInterfaceBaseTypeNodes(declaration); _b < _c.length; _b++) {
                         var node = _c[_b];
                         var baseType = getTypeFromTypeNode(node);
@@ -17317,8 +18035,8 @@ var ts;
         function isIndependentInterface(symbol) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 218 /* InterfaceDeclaration */) {
-                    if (declaration.flags & 262144 /* ContainsThis */) {
+                if (declaration.kind === 221 /* InterfaceDeclaration */) {
+                    if (declaration.flags & 16384 /* ContainsThis */) {
                         return false;
                     }
                     var baseTypeNodes = ts.getInterfaceBaseTypeNodes(declaration);
@@ -17373,7 +18091,7 @@ var ts;
                 if (!pushTypeResolution(symbol, 2 /* DeclaredType */)) {
                     return unknownType;
                 }
-                var declaration = ts.getDeclarationOfKind(symbol, 219 /* TypeAliasDeclaration */);
+                var declaration = ts.getDeclarationOfKind(symbol, 222 /* TypeAliasDeclaration */);
                 var type = getTypeFromTypeNode(declaration.type);
                 if (popTypeResolution()) {
                     links.typeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
@@ -17406,7 +18124,7 @@ var ts;
             if (!links.declaredType) {
                 var type = createType(512 /* TypeParameter */);
                 type.symbol = symbol;
-                if (!ts.getDeclarationOfKind(symbol, 138 /* TypeParameter */).constraint) {
+                if (!ts.getDeclarationOfKind(symbol, 140 /* TypeParameter */).constraint) {
                     type.constraint = noConstraintType;
                 }
                 links.declaredType = type;
@@ -17457,16 +18175,18 @@ var ts;
         function isIndependentType(node) {
             switch (node.kind) {
                 case 117 /* AnyKeyword */:
-                case 130 /* StringKeyword */:
-                case 128 /* NumberKeyword */:
+                case 131 /* StringKeyword */:
+                case 129 /* NumberKeyword */:
                 case 120 /* BooleanKeyword */:
-                case 131 /* SymbolKeyword */:
+                case 132 /* SymbolKeyword */:
                 case 103 /* VoidKeyword */:
-                case 163 /* StringLiteralType */:
+                case 134 /* UndefinedKeyword */:
+                case 93 /* NullKeyword */:
+                case 165 /* StringLiteralType */:
                     return true;
-                case 157 /* ArrayType */:
+                case 159 /* ArrayType */:
                     return isIndependentType(node.elementType);
-                case 152 /* TypeReference */:
+                case 154 /* TypeReference */:
                     return isIndependentTypeReference(node);
             }
             return false;
@@ -17479,7 +18199,7 @@ var ts;
         // A function-like declaration is considered independent (free of this references) if it has a return type
         // annotation that is considered independent and if each parameter is considered independent.
         function isIndependentFunctionLikeDeclaration(node) {
-            if (node.kind !== 145 /* Constructor */ && (!node.type || !isIndependentType(node.type))) {
+            if (node.kind !== 147 /* Constructor */ && (!node.type || !isIndependentType(node.type))) {
                 return false;
             }
             for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
@@ -17493,19 +18213,19 @@ var ts;
         // Returns true if the class or interface member given by the symbol is free of "this" references. The
         // function may return false for symbols that are actually free of "this" references because it is not
         // feasible to perform a complete analysis in all cases. In particular, property members with types
-        // inferred from their initializers and function members with inferred return types are convervatively
+        // inferred from their initializers and function members with inferred return types are conservatively
         // assumed not to be free of "this" references.
         function isIndependentMember(symbol) {
             if (symbol.declarations && symbol.declarations.length === 1) {
                 var declaration = symbol.declarations[0];
                 if (declaration) {
                     switch (declaration.kind) {
-                        case 142 /* PropertyDeclaration */:
-                        case 141 /* PropertySignature */:
+                        case 144 /* PropertyDeclaration */:
+                        case 143 /* PropertySignature */:
                             return isIndependentVariableLikeDeclaration(declaration);
-                        case 144 /* MethodDeclaration */:
-                        case 143 /* MethodSignature */:
-                        case 145 /* Constructor */:
+                        case 146 /* MethodDeclaration */:
+                        case 145 /* MethodSignature */:
+                        case 147 /* Constructor */:
                             return isIndependentFunctionLikeDeclaration(declaration);
                     }
                 }
@@ -17544,8 +18264,8 @@ var ts;
                 type.declaredProperties = getNamedMembers(symbol.members);
                 type.declaredCallSignatures = getSignaturesOfSymbol(symbol.members["__call"]);
                 type.declaredConstructSignatures = getSignaturesOfSymbol(symbol.members["__new"]);
-                type.declaredStringIndexType = getIndexTypeOfSymbol(symbol, 0 /* String */);
-                type.declaredNumberIndexType = getIndexTypeOfSymbol(symbol, 1 /* Number */);
+                type.declaredStringIndexInfo = getIndexInfoOfSymbol(symbol, 0 /* String */);
+                type.declaredNumberIndexInfo = getIndexInfoOfSymbol(symbol, 1 /* Number */);
             }
             return type;
         }
@@ -17560,15 +18280,15 @@ var ts;
             var members = source.symbol.members;
             var callSignatures = source.declaredCallSignatures;
             var constructSignatures = source.declaredConstructSignatures;
-            var stringIndexType = source.declaredStringIndexType;
-            var numberIndexType = source.declaredNumberIndexType;
+            var stringIndexInfo = source.declaredStringIndexInfo;
+            var numberIndexInfo = source.declaredNumberIndexInfo;
             if (!ts.rangeEquals(typeParameters, typeArguments, 0, typeParameters.length)) {
                 mapper = createTypeMapper(typeParameters, typeArguments);
                 members = createInstantiatedSymbolTable(source.declaredProperties, mapper, /*mappingThisOnly*/ typeParameters.length === 1);
                 callSignatures = instantiateList(source.declaredCallSignatures, mapper, instantiateSignature);
                 constructSignatures = instantiateList(source.declaredConstructSignatures, mapper, instantiateSignature);
-                stringIndexType = instantiateType(source.declaredStringIndexType, mapper);
-                numberIndexType = instantiateType(source.declaredNumberIndexType, mapper);
+                stringIndexInfo = instantiateIndexInfo(source.declaredStringIndexInfo, mapper);
+                numberIndexInfo = instantiateIndexInfo(source.declaredNumberIndexInfo, mapper);
             }
             var baseTypes = getBaseTypes(source);
             if (baseTypes.length) {
@@ -17582,11 +18302,11 @@ var ts;
                     addInheritedMembers(members, getPropertiesOfObjectType(instantiatedBaseType));
                     callSignatures = ts.concatenate(callSignatures, getSignaturesOfType(instantiatedBaseType, 0 /* Call */));
                     constructSignatures = ts.concatenate(constructSignatures, getSignaturesOfType(instantiatedBaseType, 1 /* Construct */));
-                    stringIndexType = stringIndexType || getIndexTypeOfType(instantiatedBaseType, 0 /* String */);
-                    numberIndexType = numberIndexType || getIndexTypeOfType(instantiatedBaseType, 1 /* Number */);
+                    stringIndexInfo = stringIndexInfo || getIndexInfoOfType(instantiatedBaseType, 0 /* String */);
+                    numberIndexInfo = numberIndexInfo || getIndexInfoOfType(instantiatedBaseType, 1 /* Number */);
                 }
             }
-            setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexType, numberIndexType);
+            setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function resolveClassOrInterfaceMembers(type) {
             resolveObjectTypeMembers(type, resolveDeclaredMembers(type), emptyArray, emptyArray);
@@ -17598,25 +18318,27 @@ var ts;
                 type.typeArguments : ts.concatenate(type.typeArguments, [type]);
             resolveObjectTypeMembers(type, source, typeParameters, typeArguments);
         }
-        function createSignature(declaration, typeParameters, parameters, resolvedReturnType, minArgumentCount, hasRestParameter, hasStringLiterals) {
+        function createSignature(declaration, typeParameters, thisType, parameters, resolvedReturnType, typePredicate, minArgumentCount, hasRestParameter, hasStringLiterals) {
             var sig = new Signature(checker);
             sig.declaration = declaration;
             sig.typeParameters = typeParameters;
             sig.parameters = parameters;
+            sig.thisType = thisType;
             sig.resolvedReturnType = resolvedReturnType;
+            sig.typePredicate = typePredicate;
             sig.minArgumentCount = minArgumentCount;
             sig.hasRestParameter = hasRestParameter;
             sig.hasStringLiterals = hasStringLiterals;
             return sig;
         }
         function cloneSignature(sig) {
-            return createSignature(sig.declaration, sig.typeParameters, sig.parameters, sig.resolvedReturnType, sig.minArgumentCount, sig.hasRestParameter, sig.hasStringLiterals);
+            return createSignature(sig.declaration, sig.typeParameters, sig.thisType, sig.parameters, sig.resolvedReturnType, sig.typePredicate, sig.minArgumentCount, sig.hasRestParameter, sig.hasStringLiterals);
         }
         function getDefaultConstructSignatures(classType) {
             var baseConstructorType = getBaseConstructorTypeOfClass(classType);
             var baseSignatures = getSignaturesOfType(baseConstructorType, 1 /* Construct */);
             if (baseSignatures.length === 0) {
-                return [createSignature(undefined, classType.localTypeParameters, emptyArray, classType, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false)];
+                return [createSignature(undefined, classType.localTypeParameters, undefined, emptyArray, classType, /*typePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false)];
             }
             var baseTypeNode = getBaseTypeNodeOfClass(classType);
             var typeArguments = ts.map(baseTypeNode.typeArguments, getTypeFromTypeNode);
@@ -17649,12 +18371,12 @@ var ts;
             var arrayType = resolveStructuredTypeMembers(createTypeFromGenericGlobalType(globalArrayType, [arrayElementType, type]));
             var members = createTupleTypeMemberSymbols(type.elementTypes);
             addInheritedMembers(members, arrayType.properties);
-            setObjectTypeMembers(type, members, arrayType.callSignatures, arrayType.constructSignatures, arrayType.stringIndexType, arrayType.numberIndexType);
+            setObjectTypeMembers(type, members, arrayType.callSignatures, arrayType.constructSignatures, arrayType.stringIndexInfo, arrayType.numberIndexInfo);
         }
-        function findMatchingSignature(signatureList, signature, partialMatch, ignoreReturnTypes) {
+        function findMatchingSignature(signatureList, signature, partialMatch, ignoreThisTypes, ignoreReturnTypes) {
             for (var _i = 0, signatureList_1 = signatureList; _i < signatureList_1.length; _i++) {
                 var s = signatureList_1[_i];
-                if (compareSignaturesIdentical(s, signature, partialMatch, ignoreReturnTypes, compareTypesIdentical)) {
+                if (compareSignaturesIdentical(s, signature, partialMatch, ignoreThisTypes, ignoreReturnTypes, compareTypesIdentical)) {
                     return s;
                 }
             }
@@ -17667,7 +18389,7 @@ var ts;
                     return undefined;
                 }
                 for (var i = 1; i < signatureLists.length; i++) {
-                    if (!findMatchingSignature(signatureLists[i], signature, /*partialMatch*/ false, /*ignoreReturnTypes*/ false)) {
+                    if (!findMatchingSignature(signatureLists[i], signature, /*partialMatch*/ false, /*ignoreThisTypes*/ false, /*ignoreReturnTypes*/ false)) {
                         return undefined;
                     }
                 }
@@ -17676,7 +18398,7 @@ var ts;
             var result = undefined;
             for (var i = 0; i < signatureLists.length; i++) {
                 // Allow matching non-generic signatures to have excess parameters and different return types
-                var match = i === listIndex ? signature : findMatchingSignature(signatureLists[i], signature, /*partialMatch*/ true, /*ignoreReturnTypes*/ true);
+                var match = i === listIndex ? signature : findMatchingSignature(signatureLists[i], signature, /*partialMatch*/ true, /*ignoreThisTypes*/ true, /*ignoreReturnTypes*/ true);
                 if (!match) {
                     return undefined;
                 }
@@ -17697,13 +18419,16 @@ var ts;
                 for (var _i = 0, _a = signatureLists[i]; _i < _a.length; _i++) {
                     var signature = _a[_i];
                     // Only process signatures with parameter lists that aren't already in the result list
-                    if (!result || !findMatchingSignature(result, signature, /*partialMatch*/ false, /*ignoreReturnTypes*/ true)) {
+                    if (!result || !findMatchingSignature(result, signature, /*partialMatch*/ false, /*ignoreThisTypes*/ true, /*ignoreReturnTypes*/ true)) {
                         var unionSignatures = findMatchingSignatures(signatureLists, signature, i);
                         if (unionSignatures) {
                             var s = signature;
                             // Union the result types when more than one signature matches
                             if (unionSignatures.length > 1) {
                                 s = cloneSignature(signature);
+                                if (ts.forEach(unionSignatures, function (sig) { return sig.thisType; })) {
+                                    s.thisType = getUnionType(ts.map(unionSignatures, function (sig) { return sig.thisType || anyType; }));
+                                }
                                 // Clear resolved return type we possibly got from cloneSignature
                                 s.resolvedReturnType = undefined;
                                 s.unionSignatures = unionSignatures;
@@ -17715,45 +18440,50 @@ var ts;
             }
             return result || emptyArray;
         }
-        function getUnionIndexType(types, kind) {
+        function getUnionIndexInfo(types, kind) {
             var indexTypes = [];
+            var isAnyReadonly = false;
             for (var _i = 0, types_1 = types; _i < types_1.length; _i++) {
                 var type = types_1[_i];
-                var indexType = getIndexTypeOfType(type, kind);
-                if (!indexType) {
+                var indexInfo = getIndexInfoOfType(type, kind);
+                if (!indexInfo) {
                     return undefined;
                 }
-                indexTypes.push(indexType);
+                indexTypes.push(indexInfo.type);
+                isAnyReadonly = isAnyReadonly || indexInfo.isReadonly;
             }
-            return getUnionType(indexTypes);
+            return createIndexInfo(getUnionType(indexTypes), isAnyReadonly);
         }
         function resolveUnionTypeMembers(type) {
             // The members and properties collections are empty for union types. To get all properties of a union
             // type use getPropertiesOfType (only the language service uses this).
             var callSignatures = getUnionSignatures(type.types, 0 /* Call */);
             var constructSignatures = getUnionSignatures(type.types, 1 /* Construct */);
-            var stringIndexType = getUnionIndexType(type.types, 0 /* String */);
-            var numberIndexType = getUnionIndexType(type.types, 1 /* Number */);
-            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexType, numberIndexType);
+            var stringIndexInfo = getUnionIndexInfo(type.types, 0 /* String */);
+            var numberIndexInfo = getUnionIndexInfo(type.types, 1 /* Number */);
+            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function intersectTypes(type1, type2) {
             return !type1 ? type2 : !type2 ? type1 : getIntersectionType([type1, type2]);
         }
+        function intersectIndexInfos(info1, info2) {
+            return !info1 ? info2 : !info2 ? info1 : createIndexInfo(getIntersectionType([info1.type, info2.type]), info1.isReadonly && info2.isReadonly);
+        }
         function resolveIntersectionTypeMembers(type) {
             // The members and properties collections are empty for intersection types. To get all properties of an
             // intersection type use getPropertiesOfType (only the language service uses this).
             var callSignatures = emptyArray;
             var constructSignatures = emptyArray;
-            var stringIndexType = undefined;
-            var numberIndexType = undefined;
+            var stringIndexInfo = undefined;
+            var numberIndexInfo = undefined;
             for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                 var t = _a[_i];
                 callSignatures = ts.concatenate(callSignatures, getSignaturesOfType(t, 0 /* Call */));
                 constructSignatures = ts.concatenate(constructSignatures, getSignaturesOfType(t, 1 /* Construct */));
-                stringIndexType = intersectTypes(stringIndexType, getIndexTypeOfType(t, 0 /* String */));
-                numberIndexType = intersectTypes(numberIndexType, getIndexTypeOfType(t, 1 /* Number */));
+                stringIndexInfo = intersectIndexInfos(stringIndexInfo, getIndexInfoOfType(t, 0 /* String */));
+                numberIndexInfo = intersectIndexInfos(numberIndexInfo, getIndexInfoOfType(t, 1 /* Number */));
             }
-            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexType, numberIndexType);
+            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
         function resolveAnonymousTypeMembers(type) {
             var symbol = type.symbol;
@@ -17761,17 +18491,17 @@ var ts;
                 var members = createInstantiatedSymbolTable(getPropertiesOfObjectType(type.target), type.mapper, /*mappingThisOnly*/ false);
                 var callSignatures = instantiateList(getSignaturesOfType(type.target, 0 /* Call */), type.mapper, instantiateSignature);
                 var constructSignatures = instantiateList(getSignaturesOfType(type.target, 1 /* Construct */), type.mapper, instantiateSignature);
-                var stringIndexType = instantiateType(getIndexTypeOfType(type.target, 0 /* String */), type.mapper);
-                var numberIndexType = instantiateType(getIndexTypeOfType(type.target, 1 /* Number */), type.mapper);
-                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexType, numberIndexType);
+                var stringIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, 0 /* String */), type.mapper);
+                var numberIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, 1 /* Number */), type.mapper);
+                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
             }
             else if (symbol.flags & 2048 /* TypeLiteral */) {
                 var members = symbol.members;
                 var callSignatures = getSignaturesOfSymbol(members["__call"]);
                 var constructSignatures = getSignaturesOfSymbol(members["__new"]);
-                var stringIndexType = getIndexTypeOfSymbol(symbol, 0 /* String */);
-                var numberIndexType = getIndexTypeOfSymbol(symbol, 1 /* Number */);
-                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexType, numberIndexType);
+                var stringIndexInfo = getIndexInfoOfSymbol(symbol, 0 /* String */);
+                var numberIndexInfo = getIndexInfoOfSymbol(symbol, 1 /* Number */);
+                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
             }
             else {
                 // Combinations of function, class, enum and module
@@ -17792,8 +18522,8 @@ var ts;
                         addInheritedMembers(members, getPropertiesOfObjectType(baseConstructorType));
                     }
                 }
-                var numberIndexType = (symbol.flags & 384 /* Enum */) ? stringType : undefined;
-                setObjectTypeMembers(type, members, emptyArray, constructSignatures, undefined, numberIndexType);
+                var numberIndexInfo = symbol.flags & 384 /* Enum */ ? enumNumberIndexInfo : undefined;
+                setObjectTypeMembers(type, members, emptyArray, constructSignatures, undefined, numberIndexInfo);
                 // We resolve the members before computing the signatures because a signature may use
                 // typeof with a qualified name expression that circularly references the type we are
                 // in the process of resolving (see issue #6072). The temporarily empty signature list
@@ -17898,7 +18628,7 @@ var ts;
                 type = globalBooleanType;
             }
             else if (type.flags & 16777216 /* ESSymbol */) {
-                type = globalESSymbolType;
+                type = getGlobalESSymbolType();
             }
             return type;
         }
@@ -17912,7 +18642,7 @@ var ts;
                 var type = getApparentType(current);
                 if (type !== unknownType) {
                     var prop = getPropertyOfType(type, name);
-                    if (prop && !(getDeclarationFlagsFromSymbol(prop) & (16 /* Private */ | 32 /* Protected */))) {
+                    if (prop && !(getDeclarationFlagsFromSymbol(prop) & (8 /* Private */ | 16 /* Protected */))) {
                         commonFlags &= prop.flags;
                         if (!props) {
                             props = [prop];
@@ -18002,17 +18732,48 @@ var ts;
         function getSignaturesOfType(type, kind) {
             return getSignaturesOfStructuredType(getApparentType(type), kind);
         }
-        function getIndexTypeOfStructuredType(type, kind) {
+        function getIndexInfoOfStructuredType(type, kind) {
             if (type.flags & 130048 /* StructuredType */) {
                 var resolved = resolveStructuredTypeMembers(type);
-                return kind === 0 /* String */ ? resolved.stringIndexType : resolved.numberIndexType;
+                return kind === 0 /* String */ ? resolved.stringIndexInfo : resolved.numberIndexInfo;
             }
         }
+        function getIndexTypeOfStructuredType(type, kind) {
+            var info = getIndexInfoOfStructuredType(type, kind);
+            return info && info.type;
+        }
+        // Return the indexing info of the given kind in the given type. Creates synthetic union index types when necessary and
+        // maps primitive types and type parameters are to their apparent types.
+        function getIndexInfoOfType(type, kind) {
+            return getIndexInfoOfStructuredType(getApparentType(type), kind);
+        }
         // Return the index type of the given kind in the given type. Creates synthetic union index types when necessary and
         // maps primitive types and type parameters are to their apparent types.
         function getIndexTypeOfType(type, kind) {
             return getIndexTypeOfStructuredType(getApparentType(type), kind);
         }
+        function getImplicitIndexTypeOfType(type, kind) {
+            if (isObjectLiteralType(type)) {
+                var propTypes = [];
+                for (var _i = 0, _a = getPropertiesOfType(type); _i < _a.length; _i++) {
+                    var prop = _a[_i];
+                    if (kind === 0 /* String */ || isNumericLiteralName(prop.name)) {
+                        propTypes.push(getTypeOfSymbol(prop));
+                    }
+                }
+                return getUnionType(propTypes);
+            }
+            return undefined;
+        }
+        function getTypeParametersFromJSDocTemplate(declaration) {
+            if (declaration.flags & 134217728 /* JavaScriptFile */) {
+                var templateTag = ts.getJSDocTemplateTag(declaration);
+                if (templateTag) {
+                    return getTypeParametersFromDeclaration(templateTag.typeParameters);
+                }
+            }
+            return undefined;
+        }
         // Return list of type parameters with duplicates removed (duplicate identifier errors are generated in the actual
         // type checking functions).
         function getTypeParametersFromDeclaration(typeParameterDeclarations) {
@@ -18035,6 +18796,20 @@ var ts;
             return result;
         }
         function isOptionalParameter(node) {
+            if (node.flags & 134217728 /* JavaScriptFile */) {
+                if (node.type && node.type.kind === 267 /* JSDocOptionalType */) {
+                    return true;
+                }
+                var paramTag = ts.getCorrespondingJSDocParameterTag(node);
+                if (paramTag) {
+                    if (paramTag.isBracketed) {
+                        return true;
+                    }
+                    if (paramTag.typeExpression) {
+                        return paramTag.typeExpression.type.kind === 267 /* JSDocOptionalType */;
+                    }
+                }
+            }
             if (ts.hasQuestionToken(node)) {
                 return true;
             }
@@ -18067,15 +18842,24 @@ var ts;
         function getSignatureFromDeclaration(declaration) {
             var links = getNodeLinks(declaration);
             if (!links.resolvedSignature) {
-                var classType = declaration.kind === 145 /* Constructor */ ?
+                var classType = declaration.kind === 147 /* Constructor */ ?
                     getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol))
                     : undefined;
                 var typeParameters = classType ? classType.localTypeParameters :
-                    declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) : undefined;
+                    declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) :
+                        getTypeParametersFromJSDocTemplate(declaration);
                 var parameters = [];
                 var hasStringLiterals = false;
                 var minArgumentCount = -1;
-                for (var i = 0, n = declaration.parameters.length; i < n; i++) {
+                var thisType = undefined;
+                var hasThisParameter = void 0;
+                var isJSConstructSignature = ts.isJSDocConstructSignature(declaration);
+                var returnType = undefined;
+                var typePredicate = undefined;
+                // If this is a JSDoc construct signature, then skip the first parameter in the
+                // parameter list.  The first parameter represents the return type of the construct
+                // signature.
+                for (var i = isJSConstructSignature ? 1 : 0, n = declaration.parameters.length; i < n; i++) {
                     var param = declaration.parameters[i];
                     var paramSymbol = param.symbol;
                     // Include parameter symbol instead of property symbol in the signature
@@ -18083,13 +18867,19 @@ var ts;
                         var resolvedSymbol = resolveName(param, paramSymbol.name, 107455 /* Value */, undefined, undefined);
                         paramSymbol = resolvedSymbol;
                     }
-                    parameters.push(paramSymbol);
-                    if (param.type && param.type.kind === 163 /* StringLiteralType */) {
+                    if (i === 0 && paramSymbol.name === "this") {
+                        hasThisParameter = true;
+                        thisType = param.type ? getTypeFromTypeNode(param.type) : unknownType;
+                    }
+                    else {
+                        parameters.push(paramSymbol);
+                    }
+                    if (param.type && param.type.kind === 165 /* StringLiteralType */) {
                         hasStringLiterals = true;
                     }
                     if (param.initializer || param.questionToken || param.dotDotDotToken) {
                         if (minArgumentCount < 0) {
-                            minArgumentCount = i;
+                            minArgumentCount = i - (hasThisParameter ? 1 : 0);
                         }
                     }
                     else {
@@ -18098,27 +18888,39 @@ var ts;
                     }
                 }
                 if (minArgumentCount < 0) {
-                    minArgumentCount = declaration.parameters.length;
+                    minArgumentCount = declaration.parameters.length - (hasThisParameter ? 1 : 0);
                 }
-                var returnType;
-                if (classType) {
+                if (isJSConstructSignature) {
+                    minArgumentCount--;
+                    returnType = getTypeFromTypeNode(declaration.parameters[0].type);
+                }
+                else if (classType) {
                     returnType = classType;
                 }
                 else if (declaration.type) {
                     returnType = getTypeFromTypeNode(declaration.type);
+                    if (declaration.type.kind === 153 /* TypePredicate */) {
+                        typePredicate = createTypePredicateFromTypePredicateNode(declaration.type);
+                    }
                 }
                 else {
+                    if (declaration.flags & 134217728 /* JavaScriptFile */) {
+                        var type = getReturnTypeFromJSDocComment(declaration);
+                        if (type && type !== unknownType) {
+                            returnType = type;
+                        }
+                    }
                     // TypeScript 1.0 spec (April 2014):
                     // If only one accessor includes a type annotation, the other behaves as if it had the same type annotation.
-                    if (declaration.kind === 146 /* GetAccessor */ && !ts.hasDynamicName(declaration)) {
-                        var setter = ts.getDeclarationOfKind(declaration.symbol, 147 /* SetAccessor */);
+                    if (declaration.kind === 148 /* GetAccessor */ && !ts.hasDynamicName(declaration)) {
+                        var setter = ts.getDeclarationOfKind(declaration.symbol, 149 /* SetAccessor */);
                         returnType = getAnnotatedAccessorType(setter);
                     }
                     if (!returnType && ts.nodeIsMissing(declaration.body)) {
                         returnType = anyType;
                     }
                 }
-                links.resolvedSignature = createSignature(declaration, typeParameters, parameters, returnType, minArgumentCount, ts.hasRestParameter(declaration), hasStringLiterals);
+                links.resolvedSignature = createSignature(declaration, typeParameters, thisType, parameters, returnType, typePredicate, minArgumentCount, ts.hasRestParameter(declaration), hasStringLiterals);
             }
             return links.resolvedSignature;
         }
@@ -18129,19 +18931,20 @@ var ts;
             for (var i = 0, len = symbol.declarations.length; i < len; i++) {
                 var node = symbol.declarations[i];
                 switch (node.kind) {
-                    case 153 /* FunctionType */:
-                    case 154 /* ConstructorType */:
-                    case 216 /* FunctionDeclaration */:
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
-                    case 145 /* Constructor */:
-                    case 148 /* CallSignature */:
-                    case 149 /* ConstructSignature */:
-                    case 150 /* IndexSignature */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
-                    case 176 /* FunctionExpression */:
-                    case 177 /* ArrowFunction */:
+                    case 155 /* FunctionType */:
+                    case 156 /* ConstructorType */:
+                    case 219 /* FunctionDeclaration */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
+                    case 147 /* Constructor */:
+                    case 150 /* CallSignature */:
+                    case 151 /* ConstructSignature */:
+                    case 152 /* IndexSignature */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
+                    case 178 /* FunctionExpression */:
+                    case 179 /* ArrowFunction */:
+                    case 268 /* JSDocFunctionType */:
                         // Don't include signature if node is the implementation of an overloaded function. A node is considered
                         // an implementation node if it has a body and the previous node is of the same kind and immediately
                         // precedes the implementation node (i.e. has the same parent and ends where the implementation starts).
@@ -18171,7 +18974,7 @@ var ts;
                 if (!pushTypeResolution(signature, 3 /* ResolvedReturnType */)) {
                     return unknownType;
                 }
-                var type;
+                var type = void 0;
                 if (signature.target) {
                     type = instantiateType(getReturnTypeOfSignature(signature.target), signature.mapper);
                 }
@@ -18228,7 +19031,7 @@ var ts;
             // object type literal or interface (using the new keyword). Each way of declaring a constructor
             // will result in a different declaration kind.
             if (!signature.isolatedSignatureType) {
-                var isConstructor = signature.declaration.kind === 145 /* Constructor */ || signature.declaration.kind === 149 /* ConstructSignature */;
+                var isConstructor = signature.declaration.kind === 147 /* Constructor */ || signature.declaration.kind === 151 /* ConstructSignature */;
                 var type = createObjectType(65536 /* Anonymous */ | 262144 /* FromSignature */);
                 type.members = emptySymbols;
                 type.properties = emptyArray;
@@ -18242,7 +19045,7 @@ var ts;
             return symbol.members["__index"];
         }
         function getIndexDeclarationOfSymbol(symbol, kind) {
-            var syntaxKind = kind === 1 /* Number */ ? 128 /* NumberKeyword */ : 130 /* StringKeyword */;
+            var syntaxKind = kind === 1 /* Number */ ? 129 /* NumberKeyword */ : 131 /* StringKeyword */;
             var indexSymbol = getIndexSymbol(symbol);
             if (indexSymbol) {
                 for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
@@ -18258,18 +19061,22 @@ var ts;
             }
             return undefined;
         }
-        function getIndexTypeOfSymbol(symbol, kind) {
+        function createIndexInfo(type, isReadonly, declaration) {
+            return { type: type, isReadonly: isReadonly, declaration: declaration };
+        }
+        function getIndexInfoOfSymbol(symbol, kind) {
             var declaration = getIndexDeclarationOfSymbol(symbol, kind);
-            return declaration
-                ? declaration.type ? getTypeFromTypeNode(declaration.type) : anyType
-                : undefined;
+            if (declaration) {
+                return createIndexInfo(declaration.type ? getTypeFromTypeNode(declaration.type) : anyType, (declaration.flags & 64 /* Readonly */) !== 0, declaration);
+            }
+            return undefined;
         }
         function getConstraintDeclaration(type) {
-            return ts.getDeclarationOfKind(type.symbol, 138 /* TypeParameter */).constraint;
+            return ts.getDeclarationOfKind(type.symbol, 140 /* TypeParameter */).constraint;
         }
         function hasConstraintReferenceTo(type, target) {
             var checked;
-            while (type && type.flags & 512 /* TypeParameter */ && !ts.contains(checked, type)) {
+            while (type && !(type.flags & 33554432 /* ThisType */) && type.flags & 512 /* TypeParameter */ && !ts.contains(checked, type)) {
                 if (type === target) {
                     return true;
                 }
@@ -18298,7 +19105,7 @@ var ts;
             return typeParameter.constraint === noConstraintType ? undefined : typeParameter.constraint;
         }
         function getParentSymbolOfTypeParameter(typeParameter) {
-            return getSymbolOfNode(ts.getDeclarationOfKind(typeParameter.symbol, 138 /* TypeParameter */).parent);
+            return getSymbolOfNode(ts.getDeclarationOfKind(typeParameter.symbol, 140 /* TypeParameter */).parent);
         }
         function getTypeListId(types) {
             if (types) {
@@ -18324,11 +19131,13 @@ var ts;
         // It is only necessary to do so if a constituent type might be the undefined type, the null type, the type
         // of an object literal or the anyFunctionType. This is because there are operations in the type checker
         // that care about the presence of such types at arbitrary depth in a containing type.
-        function getPropagatingFlagsOfTypes(types) {
+        function getPropagatingFlagsOfTypes(types, excludeKinds) {
             var result = 0;
             for (var _i = 0, types_3 = types; _i < types_3.length; _i++) {
                 var type = types_3[_i];
-                result |= type.flags;
+                if (!(type.flags & excludeKinds)) {
+                    result |= type.flags;
+                }
             }
             return result & 14680064 /* PropagatingFlags */;
         }
@@ -18336,7 +19145,8 @@ var ts;
             var id = getTypeListId(typeArguments);
             var type = target.instantiations[id];
             if (!type) {
-                var flags = 4096 /* Reference */ | (typeArguments ? getPropagatingFlagsOfTypes(typeArguments) : 0);
+                var propagatedFlags = typeArguments ? getPropagatingFlagsOfTypes(typeArguments, /*excludeKinds*/ 0) : 0;
+                var flags = 4096 /* Reference */ | propagatedFlags;
                 type = target.instantiations[id] = createObjectType(flags, target.symbol);
                 type.target = target;
                 type.typeArguments = typeArguments;
@@ -18345,7 +19155,7 @@ var ts;
         }
         // Get type from reference to class or interface
         function getTypeFromClassOrInterfaceReference(node, symbol) {
-            var type = getDeclaredTypeOfSymbol(symbol);
+            var type = getDeclaredTypeOfSymbol(getMergedSymbol(symbol));
             var typeParameters = type.localTypeParameters;
             if (typeParameters) {
                 if (!node.typeArguments || node.typeArguments.length !== typeParameters.length) {
@@ -18393,18 +19203,68 @@ var ts;
             }
             return getDeclaredTypeOfSymbol(symbol);
         }
+        function getTypeReferenceName(node) {
+            switch (node.kind) {
+                case 154 /* TypeReference */:
+                    return node.typeName;
+                case 266 /* JSDocTypeReference */:
+                    return node.name;
+                case 193 /* ExpressionWithTypeArguments */:
+                    // We only support expressions that are simple qualified names. For other
+                    // expressions this produces undefined.
+                    if (ts.isSupportedExpressionWithTypeArguments(node)) {
+                        return node.expression;
+                    }
+            }
+            return undefined;
+        }
+        function resolveTypeReferenceName(node, typeReferenceName) {
+            if (!typeReferenceName) {
+                return unknownSymbol;
+            }
+            return resolveEntityName(typeReferenceName, 793056 /* Type */) || unknownSymbol;
+        }
+        function getTypeReferenceType(node, symbol) {
+            if (symbol === unknownSymbol) {
+                return unknownType;
+            }
+            if (symbol.flags & (32 /* Class */ | 64 /* Interface */)) {
+                return getTypeFromClassOrInterfaceReference(node, symbol);
+            }
+            if (symbol.flags & 524288 /* TypeAlias */) {
+                return getTypeFromTypeAliasReference(node, symbol);
+            }
+            if (symbol.flags & 107455 /* Value */ && node.kind === 266 /* JSDocTypeReference */) {
+                // A JSDocTypeReference may have resolved to a value (as opposed to a type). In
+                // that case, the type of this reference is just the type of the value we resolved
+                // to.
+                return getTypeOfSymbol(symbol);
+            }
+            return getTypeFromNonGenericTypeReference(node, symbol);
+        }
         function getTypeFromTypeReference(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                // We only support expressions that are simple qualified names. For other expressions this produces undefined.
-                var typeNameOrExpression = node.kind === 152 /* TypeReference */ ? node.typeName :
-                    ts.isSupportedExpressionWithTypeArguments(node) ? node.expression :
-                        undefined;
-                var symbol = typeNameOrExpression && resolveEntityName(typeNameOrExpression, 793056 /* Type */) || unknownSymbol;
-                var type = symbol === unknownSymbol ? unknownType :
-                    symbol.flags & (32 /* Class */ | 64 /* Interface */) ? getTypeFromClassOrInterfaceReference(node, symbol) :
-                        symbol.flags & 524288 /* TypeAlias */ ? getTypeFromTypeAliasReference(node, symbol) :
-                            getTypeFromNonGenericTypeReference(node, symbol);
+                var symbol = void 0;
+                var type = void 0;
+                if (node.kind === 266 /* JSDocTypeReference */) {
+                    var typeReferenceName = getTypeReferenceName(node);
+                    symbol = resolveTypeReferenceName(node, typeReferenceName);
+                    type = getTypeReferenceType(node, symbol);
+                    links.resolvedSymbol = symbol;
+                    links.resolvedType = type;
+                }
+                else {
+                    // We only support expressions that are simple qualified names. For other expressions this produces undefined.
+                    var typeNameOrExpression = node.kind === 154 /* TypeReference */ ? node.typeName :
+                        ts.isSupportedExpressionWithTypeArguments(node) ? node.expression :
+                            undefined;
+                    symbol = typeNameOrExpression && resolveEntityName(typeNameOrExpression, 793056 /* Type */) || unknownSymbol;
+                    type = symbol === unknownSymbol ? unknownType :
+                        symbol.flags & (32 /* Class */ | 64 /* Interface */) ? getTypeFromClassOrInterfaceReference(node, symbol) :
+                            symbol.flags & 524288 /* TypeAlias */ ? getTypeFromTypeAliasReference(node, symbol) :
+                                getTypeFromNonGenericTypeReference(node, symbol);
+                }
                 // Cache both the resolved symbol and the resolved type. The resolved symbol is needed in when we check the
                 // type reference in checkTypeReferenceOrExpressionWithTypeArguments.
                 links.resolvedSymbol = symbol;
@@ -18429,9 +19289,9 @@ var ts;
                 for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
                     var declaration = declarations_3[_i];
                     switch (declaration.kind) {
-                        case 217 /* ClassDeclaration */:
-                        case 218 /* InterfaceDeclaration */:
-                        case 220 /* EnumDeclaration */:
+                        case 220 /* ClassDeclaration */:
+                        case 221 /* InterfaceDeclaration */:
+                        case 223 /* EnumDeclaration */:
                             return declaration;
                     }
                 }
@@ -18472,9 +19332,6 @@ var ts;
             var typeSymbol = namespaceSymbol && getSymbol(namespaceSymbol.exports, name, 793056 /* Type */);
             return typeSymbol && getDeclaredTypeOfSymbol(typeSymbol);
         }
-        function getGlobalESSymbolConstructorSymbol() {
-            return globalESSymbolConstructorSymbol || (globalESSymbolConstructorSymbol = getGlobalValueSymbol("Symbol"));
-        }
         /**
           * Creates a TypeReference for a generic `TypedPropertyDescriptor<T>`.
           */
@@ -18491,10 +19348,10 @@ var ts;
             return genericGlobalType !== emptyGenericType ? createTypeReference(genericGlobalType, typeArguments) : emptyObjectType;
         }
         function createIterableType(elementType) {
-            return createTypeFromGenericGlobalType(globalIterableType, [elementType]);
+            return createTypeFromGenericGlobalType(getGlobalIterableType(), [elementType]);
         }
         function createIterableIteratorType(elementType) {
-            return createTypeFromGenericGlobalType(globalIterableIteratorType, [elementType]);
+            return createTypeFromGenericGlobalType(getGlobalIterableIteratorType(), [elementType]);
         }
         function createArrayType(elementType) {
             return createTypeFromGenericGlobalType(globalArrayType, [elementType]);
@@ -18511,7 +19368,8 @@ var ts;
             return tupleTypes[id] || (tupleTypes[id] = createNewTupleType(elementTypes));
         }
         function createNewTupleType(elementTypes) {
-            var type = createObjectType(8192 /* Tuple */ | getPropagatingFlagsOfTypes(elementTypes));
+            var propagatedFlags = getPropagatingFlagsOfTypes(elementTypes, /*excludeKinds*/ 0);
+            var type = createObjectType(8192 /* Tuple */ | propagatedFlags);
             type.elementTypes = elementTypes;
             return type;
         }
@@ -18526,6 +19384,14 @@ var ts;
             if (type.flags & typeSetKind) {
                 addTypesToSet(typeSet, type.types, typeSetKind);
             }
+            else if (type.flags & (1 /* Any */ | 32 /* Undefined */ | 64 /* Null */)) {
+                if (type.flags & 1 /* Any */)
+                    typeSet.containsAny = true;
+                if (type.flags & 32 /* Undefined */)
+                    typeSet.containsUndefined = true;
+                if (type.flags & 64 /* Null */)
+                    typeSet.containsNull = true;
+            }
             else if (!ts.contains(typeSet, type)) {
                 typeSet.push(type);
             }
@@ -18555,24 +19421,6 @@ var ts;
                 }
             }
         }
-        function containsTypeAny(types) {
-            for (var _i = 0, types_5 = types; _i < types_5.length; _i++) {
-                var type = types_5[_i];
-                if (isTypeAny(type)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-        function removeAllButLast(types, typeToRemove) {
-            var i = types.length;
-            while (i > 0 && types.length > 1) {
-                i--;
-                if (types[i] === typeToRemove) {
-                    types.splice(i, 1);
-                }
-            }
-        }
         // We reduce the constituent type set to only include types that aren't subtypes of other types, unless
         // the noSubtypeReduction flag is specified, in which case we perform a simple deduplication based on
         // object identity. Subtype reduction is possible only when union types are known not to circularly
@@ -18586,23 +19434,29 @@ var ts;
             }
             var typeSet = [];
             addTypesToSet(typeSet, types, 16384 /* Union */);
-            if (containsTypeAny(typeSet)) {
+            if (typeSet.containsAny) {
                 return anyType;
             }
-            if (noSubtypeReduction) {
-                removeAllButLast(typeSet, undefinedType);
-                removeAllButLast(typeSet, nullType);
+            if (strictNullChecks) {
+                if (typeSet.containsNull)
+                    typeSet.push(nullType);
+                if (typeSet.containsUndefined)
+                    typeSet.push(undefinedType);
             }
-            else {
+            if (!noSubtypeReduction) {
                 removeSubtypes(typeSet);
             }
-            if (typeSet.length === 1) {
+            if (typeSet.length === 0) {
+                return typeSet.containsNull ? nullType : undefinedType;
+            }
+            else if (typeSet.length === 1) {
                 return typeSet[0];
             }
             var id = getTypeListId(typeSet);
             var type = unionTypes[id];
             if (!type) {
-                type = unionTypes[id] = createObjectType(16384 /* Union */ | getPropagatingFlagsOfTypes(typeSet));
+                var propagatedFlags = getPropagatingFlagsOfTypes(typeSet, /*excludeKinds*/ 96 /* Nullable */);
+                type = unionTypes[id] = createObjectType(16384 /* Union */ | propagatedFlags);
                 type.types = typeSet;
             }
             return type;
@@ -18625,16 +19479,23 @@ var ts;
             }
             var typeSet = [];
             addTypesToSet(typeSet, types, 32768 /* Intersection */);
-            if (containsTypeAny(typeSet)) {
+            if (typeSet.containsAny) {
                 return anyType;
             }
+            if (strictNullChecks) {
+                if (typeSet.containsNull)
+                    typeSet.push(nullType);
+                if (typeSet.containsUndefined)
+                    typeSet.push(undefinedType);
+            }
             if (typeSet.length === 1) {
                 return typeSet[0];
             }
             var id = getTypeListId(typeSet);
             var type = intersectionTypes[id];
             if (!type) {
-                type = intersectionTypes[id] = createObjectType(32768 /* Intersection */ | getPropagatingFlagsOfTypes(typeSet));
+                var propagatedFlags = getPropagatingFlagsOfTypes(typeSet, /*excludeKinds*/ 96 /* Nullable */);
+                type = intersectionTypes[id] = createObjectType(32768 /* Intersection */ | propagatedFlags);
                 type.types = typeSet;
             }
             return type;
@@ -18669,12 +19530,28 @@ var ts;
             }
             return links.resolvedType;
         }
+        function getTypeFromJSDocVariadicType(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                var type = getTypeFromTypeNode(node.type);
+                links.resolvedType = type ? createArrayType(type) : unknownType;
+            }
+            return links.resolvedType;
+        }
+        function getTypeFromJSDocTupleType(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                var types = ts.map(node.types, getTypeFromTypeNode);
+                links.resolvedType = createTupleType(types);
+            }
+            return links.resolvedType;
+        }
         function getThisType(node) {
             var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
             var parent = container && container.parent;
-            if (parent && (ts.isClassLike(parent) || parent.kind === 218 /* InterfaceDeclaration */)) {
-                if (!(container.flags & 64 /* Static */) &&
-                    (container.kind !== 145 /* Constructor */ || ts.isNodeDescendentOf(node, container.body))) {
+            if (parent && (ts.isClassLike(parent) || parent.kind === 221 /* InterfaceDeclaration */)) {
+                if (!(container.flags & 32 /* Static */) &&
+                    (container.kind !== 147 /* Constructor */ || ts.isNodeDescendentOf(node, container.body))) {
                     return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
                 }
             }
@@ -18688,68 +19565,72 @@ var ts;
             }
             return links.resolvedType;
         }
-        function getPredicateType(node) {
-            return createPredicateType(getSymbolOfNode(node), createTypePredicateFromTypePredicateNode(node));
-        }
-        function createPredicateType(symbol, predicate) {
-            var type = createType(8 /* Boolean */ | 134217728 /* PredicateType */);
-            type.symbol = symbol;
-            type.predicate = predicate;
-            return type;
-        }
-        function getTypeFromPredicateTypeNode(node) {
-            var links = getNodeLinks(node);
-            if (!links.resolvedType) {
-                links.resolvedType = getPredicateType(node);
-            }
-            return links.resolvedType;
-        }
         function getTypeFromTypeNode(node) {
             switch (node.kind) {
                 case 117 /* AnyKeyword */:
+                case 257 /* JSDocAllType */:
+                case 258 /* JSDocUnknownType */:
                     return anyType;
-                case 130 /* StringKeyword */:
+                case 131 /* StringKeyword */:
                     return stringType;
-                case 128 /* NumberKeyword */:
+                case 129 /* NumberKeyword */:
                     return numberType;
                 case 120 /* BooleanKeyword */:
                     return booleanType;
-                case 131 /* SymbolKeyword */:
+                case 132 /* SymbolKeyword */:
                     return esSymbolType;
                 case 103 /* VoidKeyword */:
                     return voidType;
-                case 162 /* ThisType */:
+                case 134 /* UndefinedKeyword */:
+                    return undefinedType;
+                case 93 /* NullKeyword */:
+                    return nullType;
+                case 164 /* ThisType */:
                     return getTypeFromThisTypeNode(node);
-                case 163 /* StringLiteralType */:
+                case 165 /* StringLiteralType */:
                     return getTypeFromStringLiteralTypeNode(node);
-                case 152 /* TypeReference */:
+                case 154 /* TypeReference */:
+                case 266 /* JSDocTypeReference */:
                     return getTypeFromTypeReference(node);
-                case 151 /* TypePredicate */:
-                    return getTypeFromPredicateTypeNode(node);
-                case 191 /* ExpressionWithTypeArguments */:
+                case 153 /* TypePredicate */:
+                    return booleanType;
+                case 193 /* ExpressionWithTypeArguments */:
                     return getTypeFromTypeReference(node);
-                case 155 /* TypeQuery */:
+                case 157 /* TypeQuery */:
                     return getTypeFromTypeQueryNode(node);
-                case 157 /* ArrayType */:
+                case 159 /* ArrayType */:
+                case 259 /* JSDocArrayType */:
                     return getTypeFromArrayTypeNode(node);
-                case 158 /* TupleType */:
+                case 160 /* TupleType */:
                     return getTypeFromTupleTypeNode(node);
-                case 159 /* UnionType */:
+                case 161 /* UnionType */:
+                case 260 /* JSDocUnionType */:
                     return getTypeFromUnionTypeNode(node);
-                case 160 /* IntersectionType */:
+                case 162 /* IntersectionType */:
                     return getTypeFromIntersectionTypeNode(node);
-                case 161 /* ParenthesizedType */:
+                case 163 /* ParenthesizedType */:
+                case 262 /* JSDocNullableType */:
+                case 263 /* JSDocNonNullableType */:
+                case 270 /* JSDocConstructorType */:
+                case 271 /* JSDocThisType */:
+                case 267 /* JSDocOptionalType */:
                     return getTypeFromTypeNode(node.type);
-                case 153 /* FunctionType */:
-                case 154 /* ConstructorType */:
-                case 156 /* TypeLiteral */:
+                case 155 /* FunctionType */:
+                case 156 /* ConstructorType */:
+                case 158 /* TypeLiteral */:
+                case 268 /* JSDocFunctionType */:
+                case 264 /* JSDocRecordType */:
                     return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
                 // This function assumes that an identifier or qualified name is a type expression
                 // Callers should first ensure this by calling isTypeNode
                 case 69 /* Identifier */:
-                case 136 /* QualifiedName */:
+                case 138 /* QualifiedName */:
                     var symbol = getSymbolAtLocation(node);
                     return symbol && getDeclaredTypeOfSymbol(symbol);
+                case 261 /* JSDocTupleType */:
+                    return getTypeFromJSDocTupleType(node);
+                case 269 /* JSDocVariadicType */:
+                    return getTypeFromJSDocVariadicType(node);
                 default:
                     return unknownType;
             }
@@ -18771,40 +19652,26 @@ var ts;
         function createBinaryTypeMapper(source1, target1, source2, target2) {
             return function (t) { return t === source1 ? target1 : t === source2 ? target2 : t; };
         }
-        function createTypeMapper(sources, targets) {
-            switch (sources.length) {
-                case 1: return createUnaryTypeMapper(sources[0], targets[0]);
-                case 2: return createBinaryTypeMapper(sources[0], targets[0], sources[1], targets[1]);
-            }
+        function createArrayTypeMapper(sources, targets) {
             return function (t) {
                 for (var i = 0; i < sources.length; i++) {
                     if (t === sources[i]) {
-                        return targets[i];
+                        return targets ? targets[i] : anyType;
                     }
                 }
                 return t;
             };
         }
-        function createUnaryTypeEraser(source) {
-            return function (t) { return t === source ? anyType : t; };
-        }
-        function createBinaryTypeEraser(source1, source2) {
-            return function (t) { return t === source1 || t === source2 ? anyType : t; };
+        function createTypeMapper(sources, targets) {
+            var count = sources.length;
+            var mapper = count == 1 ? createUnaryTypeMapper(sources[0], targets ? targets[0] : anyType) :
+                count == 2 ? createBinaryTypeMapper(sources[0], targets ? targets[0] : anyType, sources[1], targets ? targets[1] : anyType) :
+                    createArrayTypeMapper(sources, targets);
+            mapper.mappedTypes = sources;
+            return mapper;
         }
         function createTypeEraser(sources) {
-            switch (sources.length) {
-                case 1: return createUnaryTypeEraser(sources[0]);
-                case 2: return createBinaryTypeEraser(sources[0], sources[1]);
-            }
-            return function (t) {
-                for (var _i = 0, sources_1 = sources; _i < sources_1.length; _i++) {
-                    var source = sources_1[_i];
-                    if (t === source) {
-                        return anyType;
-                    }
-                }
-                return t;
-            };
+            return createTypeMapper(sources, undefined);
         }
         function getInferenceMapper(context) {
             if (!context.mapper) {
@@ -18818,6 +19685,7 @@ var ts;
                     }
                     return t;
                 };
+                mapper.mappedTypes = context.typeParameters;
                 mapper.context = context;
                 context.mapper = mapper;
             }
@@ -18827,7 +19695,9 @@ var ts;
             return type;
         }
         function combineTypeMappers(mapper1, mapper2) {
-            return function (t) { return instantiateType(mapper1(t), mapper2); };
+            var mapper = function (t) { return instantiateType(mapper1(t), mapper2); };
+            mapper.mappedTypes = mapper1.mappedTypes;
+            return mapper;
         }
         function cloneTypeParameter(typeParameter) {
             var result = createType(512 /* TypeParameter */);
@@ -18853,6 +19723,7 @@ var ts;
         }
         function instantiateSignature(signature, mapper, eraseTypeParameters) {
             var freshTypeParameters;
+            var freshTypePredicate;
             if (signature.typeParameters && !eraseTypeParameters) {
                 // First create a fresh set of type parameters, then include a mapping from the old to the
                 // new type parameters in the mapper function. Finally store this mapper in the new type
@@ -18864,7 +19735,10 @@ var ts;
                     tp.mapper = mapper;
                 }
             }
-            var result = createSignature(signature.declaration, freshTypeParameters, instantiateList(signature.parameters, mapper, instantiateSymbol), instantiateType(signature.resolvedReturnType, mapper), signature.minArgumentCount, signature.hasRestParameter, signature.hasStringLiterals);
+            if (signature.typePredicate) {
+                freshTypePredicate = cloneTypePredicate(signature.typePredicate, mapper);
+            }
+            var result = createSignature(signature.declaration, freshTypeParameters, signature.thisType && instantiateType(signature.thisType, mapper), instantiateList(signature.parameters, mapper, instantiateSymbol), instantiateType(signature.resolvedReturnType, mapper), freshTypePredicate, signature.minArgumentCount, signature.hasRestParameter, signature.hasStringLiterals);
             result.target = signature;
             result.mapper = mapper;
             return result;
@@ -18907,13 +19781,70 @@ var ts;
             mapper.instantiations[type.id] = result;
             return result;
         }
+        function isSymbolInScopeOfMappedTypeParameter(symbol, mapper) {
+            var mappedTypes = mapper.mappedTypes;
+            // Starting with the parent of the symbol's declaration, check if the mapper maps any of
+            // the type parameters introduced by enclosing declarations. We just pick the first
+            // declaration since multiple declarations will all have the same parent anyway.
+            var node = symbol.declarations[0].parent;
+            while (node) {
+                switch (node.kind) {
+                    case 155 /* FunctionType */:
+                    case 156 /* ConstructorType */:
+                    case 219 /* FunctionDeclaration */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
+                    case 147 /* Constructor */:
+                    case 150 /* CallSignature */:
+                    case 151 /* ConstructSignature */:
+                    case 152 /* IndexSignature */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
+                    case 178 /* FunctionExpression */:
+                    case 179 /* ArrowFunction */:
+                    case 220 /* ClassDeclaration */:
+                    case 191 /* ClassExpression */:
+                    case 221 /* InterfaceDeclaration */:
+                    case 222 /* TypeAliasDeclaration */:
+                        var declaration = node;
+                        if (declaration.typeParameters) {
+                            for (var _i = 0, _a = declaration.typeParameters; _i < _a.length; _i++) {
+                                var d = _a[_i];
+                                if (ts.contains(mappedTypes, getDeclaredTypeOfTypeParameter(d.symbol))) {
+                                    return true;
+                                }
+                            }
+                        }
+                        if (ts.isClassLike(node) || node.kind === 221 /* InterfaceDeclaration */) {
+                            var thisType = getDeclaredTypeOfClassOrInterface(getSymbolOfNode(node)).thisType;
+                            if (thisType && ts.contains(mappedTypes, thisType)) {
+                                return true;
+                            }
+                        }
+                        break;
+                    case 224 /* ModuleDeclaration */:
+                    case 255 /* SourceFile */:
+                        return false;
+                }
+                node = node.parent;
+            }
+            return false;
+        }
         function instantiateType(type, mapper) {
             if (type && mapper !== identityMapper) {
                 if (type.flags & 512 /* TypeParameter */) {
                     return mapper(type);
                 }
                 if (type.flags & 65536 /* Anonymous */) {
-                    return type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) ?
+                    // If the anonymous type originates in a declaration of a function, method, class, or
+                    // interface, in an object type literal, or in an object literal expression, we may need
+                    // to instantiate the type because it might reference a type parameter. We skip instantiation
+                    // if none of the type parameters that are in scope in the type's declaration are mapped by
+                    // the given mapper, however we can only do that analysis if the type isn't itself an
+                    // instantiation.
+                    return type.symbol &&
+                        type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) &&
+                        (type.flags & 131072 /* Instantiated */ || isSymbolInScopeOfMappedTypeParameter(type.symbol, mapper)) ?
                         instantiateAnonymousType(type, mapper) : type;
                 }
                 if (type.flags & 4096 /* Reference */) {
@@ -18928,43 +19859,44 @@ var ts;
                 if (type.flags & 32768 /* Intersection */) {
                     return getIntersectionType(instantiateList(type.types, mapper, instantiateType));
                 }
-                if (type.flags & 134217728 /* PredicateType */) {
-                    var predicate = type.predicate;
-                    return createPredicateType(type.symbol, cloneTypePredicate(predicate, mapper));
-                }
             }
             return type;
         }
+        function instantiateIndexInfo(info, mapper) {
+            return info && createIndexInfo(instantiateType(info.type, mapper), info.isReadonly, info.declaration);
+        }
         // Returns true if the given expression contains (at any level of nesting) a function or arrow expression
         // that is subject to contextual typing.
         function isContextSensitive(node) {
-            ts.Debug.assert(node.kind !== 144 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 146 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             switch (node.kind) {
-                case 176 /* FunctionExpression */:
-                case 177 /* ArrowFunction */:
+                case 178 /* FunctionExpression */:
+                case 179 /* ArrowFunction */:
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 168 /* ObjectLiteralExpression */:
+                case 170 /* ObjectLiteralExpression */:
                     return ts.forEach(node.properties, isContextSensitive);
-                case 167 /* ArrayLiteralExpression */:
+                case 169 /* ArrayLiteralExpression */:
                     return ts.forEach(node.elements, isContextSensitive);
-                case 185 /* ConditionalExpression */:
+                case 187 /* ConditionalExpression */:
                     return isContextSensitive(node.whenTrue) ||
                         isContextSensitive(node.whenFalse);
-                case 184 /* BinaryExpression */:
+                case 186 /* BinaryExpression */:
                     return node.operatorToken.kind === 52 /* BarBarToken */ &&
                         (isContextSensitive(node.left) || isContextSensitive(node.right));
-                case 248 /* PropertyAssignment */:
+                case 252 /* PropertyAssignment */:
                     return isContextSensitive(node.initializer);
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 175 /* ParenthesizedExpression */:
+                case 177 /* ParenthesizedExpression */:
                     return isContextSensitive(node.expression);
             }
             return false;
         }
         function isContextSensitiveFunctionLikeDeclaration(node) {
-            return !node.typeParameters && node.parameters.length && !ts.forEach(node.parameters, function (p) { return p.type; });
+            var areAllParametersUntyped = !ts.forEach(node.parameters, function (p) { return p.type; });
+            var isNullaryArrow = node.kind === 179 /* ArrowFunction */ && !node.parameters.length;
+            return !node.typeParameters && areAllParametersUntyped && !isNullaryArrow;
         }
         function getTypeWithoutSignatures(type) {
             if (type.flags & 80896 /* ObjectType */) {
@@ -18996,12 +19928,26 @@ var ts;
         function isTypeAssignableTo(source, target) {
             return checkTypeAssignableTo(source, target, /*errorNode*/ undefined);
         }
+        /**
+         * This is *not* a bi-directional relationship.
+         * If one needs to check both directions for comparability, use a second call to this function or 'checkTypeComparableTo'.
+         */
+        function isTypeComparableTo(source, target) {
+            return checkTypeComparableTo(source, target, /*errorNode*/ undefined);
+        }
         function checkTypeSubtypeOf(source, target, errorNode, headMessage, containingMessageChain) {
             return checkTypeRelatedTo(source, target, subtypeRelation, errorNode, headMessage, containingMessageChain);
         }
         function checkTypeAssignableTo(source, target, errorNode, headMessage, containingMessageChain) {
             return checkTypeRelatedTo(source, target, assignableRelation, errorNode, headMessage, containingMessageChain);
         }
+        /**
+         * This is *not* a bi-directional relationship.
+         * If one needs to check both directions for comparability, use a second call to this function or 'isTypeComparableTo'.
+         */
+        function checkTypeComparableTo(source, target, errorNode, headMessage, containingMessageChain) {
+            return checkTypeRelatedTo(source, target, comparableRelation, errorNode, headMessage, containingMessageChain);
+        }
         function isSignatureAssignableTo(source, target, ignoreReturnTypes) {
             return compareSignaturesRelated(source, target, ignoreReturnTypes, /*reportErrors*/ false, /*errorReporter*/ undefined, compareTypesAssignable) !== 0 /* False */;
         }
@@ -19021,15 +19967,27 @@ var ts;
             source = getErasedSignature(source);
             target = getErasedSignature(target);
             var result = -1 /* True */;
+            if (source.thisType && target.thisType && source.thisType !== voidType) {
+                // void sources are assignable to anything.
+                var related = compareTypes(source.thisType, target.thisType, /*reportErrors*/ false)
+                    || compareTypes(target.thisType, source.thisType, reportErrors);
+                if (!related) {
+                    if (reportErrors) {
+                        errorReporter(ts.Diagnostics.The_this_types_of_each_signature_are_incompatible);
+                    }
+                    return 0 /* False */;
+                }
+                result &= related;
+            }
             var sourceMax = getNumNonRestParameters(source);
             var targetMax = getNumNonRestParameters(target);
             var checkCount = getNumParametersToCheckForSignatureRelatability(source, sourceMax, target, targetMax);
             var sourceParams = source.parameters;
             var targetParams = target.parameters;
             for (var i = 0; i < checkCount; i++) {
-                var s = i < sourceMax ? getTypeOfSymbol(sourceParams[i]) : getRestTypeOfSignature(source);
-                var t = i < targetMax ? getTypeOfSymbol(targetParams[i]) : getRestTypeOfSignature(target);
-                var related = compareTypes(t, s, /*reportErrors*/ false) || compareTypes(s, t, reportErrors);
+                var s = i < sourceMax ? getTypeOfParameter(sourceParams[i]) : getRestTypeOfSignature(source);
+                var t = i < targetMax ? getTypeOfParameter(targetParams[i]) : getRestTypeOfSignature(target);
+                var related = compareTypes(s, t, /*reportErrors*/ false) || compareTypes(t, s, reportErrors);
                 if (!related) {
                     if (reportErrors) {
                         errorReporter(ts.Diagnostics.Types_of_parameters_0_and_1_are_incompatible, sourceParams[i < sourceMax ? i : sourceMax].name, targetParams[i < targetMax ? i : targetMax].name);
@@ -19045,18 +20003,48 @@ var ts;
                 }
                 var sourceReturnType = getReturnTypeOfSignature(source);
                 // The following block preserves behavior forbidding boolean returning functions from being assignable to type guard returning functions
-                if (targetReturnType.flags & 134217728 /* PredicateType */ && targetReturnType.predicate.kind === 1 /* Identifier */) {
-                    if (!(sourceReturnType.flags & 134217728 /* PredicateType */)) {
+                if (target.typePredicate) {
+                    if (source.typePredicate) {
+                        result &= compareTypePredicateRelatedTo(source.typePredicate, target.typePredicate, reportErrors, errorReporter, compareTypes);
+                    }
+                    else if (ts.isIdentifierTypePredicate(target.typePredicate)) {
                         if (reportErrors) {
                             errorReporter(ts.Diagnostics.Signature_0_must_have_a_type_predicate, signatureToString(source));
                         }
                         return 0 /* False */;
                     }
                 }
-                result &= compareTypes(sourceReturnType, targetReturnType, reportErrors);
+                else {
+                    result &= compareTypes(sourceReturnType, targetReturnType, reportErrors);
+                }
             }
             return result;
         }
+        function compareTypePredicateRelatedTo(source, target, reportErrors, errorReporter, compareTypes) {
+            if (source.kind !== target.kind) {
+                if (reportErrors) {
+                    errorReporter(ts.Diagnostics.A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard);
+                    errorReporter(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
+                }
+                return 0 /* False */;
+            }
+            if (source.kind === 1 /* Identifier */) {
+                var sourceIdentifierPredicate = source;
+                var targetIdentifierPredicate = target;
+                if (sourceIdentifierPredicate.parameterIndex !== targetIdentifierPredicate.parameterIndex) {
+                    if (reportErrors) {
+                        errorReporter(ts.Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, sourceIdentifierPredicate.parameterName, targetIdentifierPredicate.parameterName);
+                        errorReporter(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
+                    }
+                    return 0 /* False */;
+                }
+            }
+            var related = compareTypes(source.type, target.type, reportErrors);
+            if (related === 0 /* False */ && reportErrors) {
+                errorReporter(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
+            }
+            return related;
+        }
         function isImplementationCompatibleWithOverload(implementation, overload) {
             var erasedSource = getErasedSignature(implementation);
             var erasedTarget = getErasedSignature(overload);
@@ -19098,7 +20086,7 @@ var ts;
          * Checks if 'source' is related to 'target' (e.g.: is a assignable to).
          * @param source The left-hand-side of the relation.
          * @param target The right-hand-side of the relation.
-         * @param relation The relation considered. One of 'identityRelation', 'assignableRelation', or 'subTypeRelation'.
+         * @param relation The relation considered. One of 'identityRelation', 'subtypeRelation', 'assignableRelation', or 'comparableRelation'.
          * Used as both to determine which checks are performed and as a cache of previously computed results.
          * @param errorNode The suggested node upon which all errors will be reported, if defined. This may or may not be the actual node used.
          * @param headMessage If the error chain should be prepended by a head message, then headMessage will be used.
@@ -19135,7 +20123,12 @@ var ts;
                     sourceType = typeToString(source, /*enclosingDeclaration*/ undefined, 128 /* UseFullyQualifiedType */);
                     targetType = typeToString(target, /*enclosingDeclaration*/ undefined, 128 /* UseFullyQualifiedType */);
                 }
-                reportError(message || ts.Diagnostics.Type_0_is_not_assignable_to_type_1, sourceType, targetType);
+                if (!message) {
+                    message = relation === comparableRelation ?
+                        ts.Diagnostics.Type_0_is_not_comparable_to_type_1 :
+                        ts.Diagnostics.Type_0_is_not_assignable_to_type_1;
+                }
+                reportError(message, sourceType, targetType);
             }
             // Compare two types and return
             // Ternary.True if they are related with no assumptions,
@@ -19151,53 +20144,30 @@ var ts;
                 }
                 if (isTypeAny(target))
                     return -1 /* True */;
-                if (source === undefinedType)
-                    return -1 /* True */;
-                if (source === nullType && target !== undefinedType)
-                    return -1 /* True */;
+                if (source.flags & 32 /* Undefined */) {
+                    if (!strictNullChecks || target.flags & (32 /* Undefined */ | 16 /* Void */) || source === emptyArrayElementType)
+                        return -1 /* True */;
+                }
+                if (source.flags & 64 /* Null */) {
+                    if (!strictNullChecks || target.flags & 64 /* Null */)
+                        return -1 /* True */;
+                }
                 if (source.flags & 128 /* Enum */ && target === numberType)
                     return -1 /* True */;
                 if (source.flags & 128 /* Enum */ && target.flags & 128 /* Enum */) {
-                    if (result = enumRelatedTo(source, target)) {
+                    if (result = enumRelatedTo(source, target, reportErrors)) {
                         return result;
                     }
                 }
                 if (source.flags & 256 /* StringLiteral */ && target === stringType)
                     return -1 /* True */;
-                if (relation === assignableRelation) {
+                if (relation === assignableRelation || relation === comparableRelation) {
                     if (isTypeAny(source))
                         return -1 /* True */;
                     if (source === numberType && target.flags & 128 /* Enum */)
                         return -1 /* True */;
                 }
                 if (source.flags & 8 /* Boolean */ && target.flags & 8 /* Boolean */) {
-                    if (source.flags & 134217728 /* PredicateType */ && target.flags & 134217728 /* PredicateType */) {
-                        var sourcePredicate = source;
-                        var targetPredicate = target;
-                        if (sourcePredicate.predicate.kind !== targetPredicate.predicate.kind) {
-                            if (reportErrors) {
-                                reportError(ts.Diagnostics.A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard);
-                                reportError(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typeToString(source), typeToString(target));
-                            }
-                            return 0 /* False */;
-                        }
-                        if (sourcePredicate.predicate.kind === 1 /* Identifier */) {
-                            var sourceIdentifierPredicate = sourcePredicate.predicate;
-                            var targetIdentifierPredicate = targetPredicate.predicate;
-                            if (sourceIdentifierPredicate.parameterIndex !== targetIdentifierPredicate.parameterIndex) {
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, sourceIdentifierPredicate.parameterName, targetIdentifierPredicate.parameterName);
-                                    reportError(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typeToString(source), typeToString(target));
-                                }
-                                return 0 /* False */;
-                            }
-                        }
-                        var related = isRelatedTo(sourcePredicate.predicate.type, targetPredicate.predicate.type, reportErrors, headMessage);
-                        if (related === 0 /* False */ && reportErrors) {
-                            reportError(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typeToString(source), typeToString(target));
-                        }
-                        return related;
-                    }
                     return -1 /* True */;
                 }
                 if (source.flags & 1048576 /* FreshObjectLiteral */) {
@@ -19216,29 +20186,48 @@ var ts;
                     }
                 }
                 var saveErrorInfo = errorInfo;
-                // Note that the "each" checks must precede the "some" checks to produce the correct results
+                // Note that these checks are specifically ordered to produce correct results.
                 if (source.flags & 16384 /* Union */) {
-                    if (result = eachTypeRelatedToType(source, target, reportErrors)) {
+                    if (relation === comparableRelation) {
+                        result = someTypeRelatedToType(source, target, reportErrors);
+                    }
+                    else {
+                        result = eachTypeRelatedToType(source, target, reportErrors);
+                    }
+                    if (result) {
                         return result;
                     }
                 }
                 else if (target.flags & 32768 /* Intersection */) {
-                    if (result = typeRelatedToEachType(source, target, reportErrors)) {
+                    result = typeRelatedToEachType(source, target, reportErrors);
+                    if (result) {
                         return result;
                     }
                 }
                 else {
-                    // It is necessary to try "some" checks on both sides because there may be nested "each" checks
+                    // It is necessary to try these "some" checks on both sides because there may be nested "each" checks
                     // on either side that need to be prioritized. For example, A | B = (A | B) & (C | D) or
                     // A & B = (A & B) | (C & D).
                     if (source.flags & 32768 /* Intersection */) {
-                        // If target is a union type the following check will report errors so we suppress them here
-                        if (result = someTypeRelatedToType(source, target, reportErrors && !(target.flags & 16384 /* Union */))) {
+                        // Check to see if any constituents of the intersection are immediately related to the target.
+                        //
+                        // Don't report errors though. Checking whether a constituent is related to the source is not actually
+                        // useful and leads to some confusing error messages. Instead it is better to let the below checks
+                        // take care of this, or to not elaborate at all. For instance,
+                        //
+                        //    - For an object type (such as 'C = A & B'), users are usually more interested in structural errors.
+                        //
+                        //    - For a union type (such as '(A | B) = (C & D)'), it's better to hold onto the whole intersection
+                        //          than to report that 'D' is not assignable to 'A' or 'B'.
+                        //
+                        //    - For a primitive type or type parameter (such as 'number = A & B') there is no point in
+                        //          breaking the intersection apart.
+                        if (result = someTypeRelatedToType(source, target, /*reportErrors*/ false)) {
                             return result;
                         }
                     }
                     if (target.flags & 16384 /* Union */) {
-                        if (result = typeRelatedToSomeType(source, target, reportErrors)) {
+                        if (result = typeRelatedToSomeType(source, target, reportErrors && !(source.flags & 16777726 /* Primitive */))) {
                             return result;
                         }
                     }
@@ -19295,8 +20284,8 @@ var ts;
                 }
                 if (source.flags & 16384 /* Union */ && target.flags & 16384 /* Union */ ||
                     source.flags & 32768 /* Intersection */ && target.flags & 32768 /* Intersection */) {
-                    if (result = eachTypeRelatedToSomeType(source, target)) {
-                        if (result &= eachTypeRelatedToSomeType(target, source)) {
+                    if (result = eachTypeRelatedToSomeType(source, target, /*reportErrors*/ false)) {
+                        if (result &= eachTypeRelatedToSomeType(target, source, /*reportErrors*/ false)) {
                             return result;
                         }
                     }
@@ -19310,8 +20299,9 @@ var ts;
             function isKnownProperty(type, name) {
                 if (type.flags & 80896 /* ObjectType */) {
                     var resolved = resolveStructuredTypeMembers(type);
-                    if (relation === assignableRelation && (type === globalObjectType || resolved.properties.length === 0) ||
-                        resolved.stringIndexType || resolved.numberIndexType || getPropertyOfType(type, name)) {
+                    if ((relation === assignableRelation || relation === comparableRelation) &&
+                        (type === globalObjectType || resolved.properties.length === 0) ||
+                        resolved.stringIndexInfo || resolved.numberIndexInfo || getPropertyOfType(type, name)) {
                         return true;
                     }
                 }
@@ -19326,7 +20316,7 @@ var ts;
                 return false;
             }
             function hasExcessProperties(source, target, reportErrors) {
-                if (!(target.flags & 67108864 /* ObjectLiteralPatternWithComputedProperties */) && someConstituentTypeHasKind(target, 80896 /* ObjectType */)) {
+                if (!(target.flags & 67108864 /* ObjectLiteralPatternWithComputedProperties */) && maybeTypeOfKind(target, 80896 /* ObjectType */)) {
                     for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
                         var prop = _a[_i];
                         if (!isKnownProperty(target, prop.name)) {
@@ -19344,7 +20334,7 @@ var ts;
                 }
                 return false;
             }
-            function eachTypeRelatedToSomeType(source, target) {
+            function eachTypeRelatedToSomeType(source, target, reportErrors) {
                 var result = -1 /* True */;
                 var sourceTypes = source.types;
                 for (var _i = 0, sourceTypes_1 = sourceTypes; _i < sourceTypes_1.length; _i++) {
@@ -19359,7 +20349,19 @@ var ts;
             }
             function typeRelatedToSomeType(source, target, reportErrors) {
                 var targetTypes = target.types;
-                for (var i = 0, len = targetTypes.length; i < len; i++) {
+                var len = targetTypes.length;
+                // The null and undefined types are guaranteed to be at the end of the constituent type list. In order
+                // to produce the best possible errors we first check the nullable types, such that the last type we
+                // check and report errors from is a non-nullable type if one is present.
+                while (len >= 2 && targetTypes[len - 1].flags & 96 /* Nullable */) {
+                    var related = isRelatedTo(source, targetTypes[len - 1], /*reportErrors*/ false);
+                    if (related) {
+                        return related;
+                    }
+                    len--;
+                }
+                // Now check the non-nullable types and report errors on the last one.
+                for (var i = 0; i < len; i++) {
                     var related = isRelatedTo(source, targetTypes[i], reportErrors && i === len - 1);
                     if (related) {
                         return related;
@@ -19382,7 +20384,19 @@ var ts;
             }
             function someTypeRelatedToType(source, target, reportErrors) {
                 var sourceTypes = source.types;
-                for (var i = 0, len = sourceTypes.length; i < len; i++) {
+                var len = sourceTypes.length;
+                // The null and undefined types are guaranteed to be at the end of the constituent type list. In order
+                // to produce the best possible errors we first check the nullable types, such that the last type we
+                // check and report errors from is a non-nullable type if one is present.
+                while (len >= 2 && sourceTypes[len - 1].flags & 96 /* Nullable */) {
+                    var related = isRelatedTo(sourceTypes[len - 1], target, /*reportErrors*/ false);
+                    if (related) {
+                        return related;
+                    }
+                    len--;
+                }
+                // Now check the non-nullable types and report errors on the last one.
+                for (var i = 0; i < len; i++) {
                     var related = isRelatedTo(sourceTypes[i], target, reportErrors && i === len - 1);
                     if (related) {
                         return related;
@@ -19480,9 +20494,9 @@ var ts;
                         if (result) {
                             result &= signaturesRelatedTo(source, target, 1 /* Construct */, reportErrors);
                             if (result) {
-                                result &= stringIndexTypesRelatedTo(source, originalSource, target, reportErrors);
+                                result &= indexTypesRelatedTo(source, originalSource, target, 0 /* String */, reportErrors);
                                 if (result) {
-                                    result &= numberIndexTypesRelatedTo(source, originalSource, target, reportErrors);
+                                    result &= indexTypesRelatedTo(source, originalSource, target, 1 /* Number */, reportErrors);
                                 }
                             }
                         }
@@ -19525,23 +20539,23 @@ var ts;
                         else if (!(targetProp.flags & 134217728 /* Prototype */)) {
                             var sourcePropFlags = getDeclarationFlagsFromSymbol(sourceProp);
                             var targetPropFlags = getDeclarationFlagsFromSymbol(targetProp);
-                            if (sourcePropFlags & 16 /* Private */ || targetPropFlags & 16 /* Private */) {
+                            if (sourcePropFlags & 8 /* Private */ || targetPropFlags & 8 /* Private */) {
                                 if (sourceProp.valueDeclaration !== targetProp.valueDeclaration) {
                                     if (reportErrors) {
-                                        if (sourcePropFlags & 16 /* Private */ && targetPropFlags & 16 /* Private */) {
+                                        if (sourcePropFlags & 8 /* Private */ && targetPropFlags & 8 /* Private */) {
                                             reportError(ts.Diagnostics.Types_have_separate_declarations_of_a_private_property_0, symbolToString(targetProp));
                                         }
                                         else {
-                                            reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 16 /* Private */ ? source : target), typeToString(sourcePropFlags & 16 /* Private */ ? target : source));
+                                            reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 8 /* Private */ ? source : target), typeToString(sourcePropFlags & 8 /* Private */ ? target : source));
                                         }
                                     }
                                     return 0 /* False */;
                                 }
                             }
-                            else if (targetPropFlags & 32 /* Protected */) {
+                            else if (targetPropFlags & 16 /* Protected */) {
                                 var sourceDeclaredInClass = sourceProp.parent && sourceProp.parent.flags & 32 /* Class */;
-                                var sourceClass = sourceDeclaredInClass ? getDeclaredTypeOfSymbol(sourceProp.parent) : undefined;
-                                var targetClass = getDeclaredTypeOfSymbol(targetProp.parent);
+                                var sourceClass = sourceDeclaredInClass ? getDeclaredTypeOfSymbol(getParentOfSymbol(sourceProp)) : undefined;
+                                var targetClass = getDeclaredTypeOfSymbol(getParentOfSymbol(targetProp));
                                 if (!sourceClass || !hasBaseType(sourceClass, targetClass)) {
                                     if (reportErrors) {
                                         reportError(ts.Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2, symbolToString(targetProp), typeToString(sourceClass || source), typeToString(targetClass));
@@ -19549,7 +20563,7 @@ var ts;
                                     return 0 /* False */;
                                 }
                             }
-                            else if (sourcePropFlags & 32 /* Protected */) {
+                            else if (sourcePropFlags & 16 /* Protected */) {
                                 if (reportErrors) {
                                     reportError(ts.Diagnostics.Property_0_is_protected_in_type_1_but_public_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
                                 }
@@ -19614,43 +20628,41 @@ var ts;
                 }
                 var sourceSignatures = getSignaturesOfType(source, kind);
                 var targetSignatures = getSignaturesOfType(target, kind);
-                if (kind === 1 /* Construct */ && sourceSignatures.length && targetSignatures.length &&
-                    isAbstractConstructorType(source) && !isAbstractConstructorType(target)) {
-                    // An abstract constructor type is not assignable to a non-abstract constructor type
-                    // as it would otherwise be possible to new an abstract class. Note that the assignablity
-                    // check we perform for an extends clause excludes construct signatures from the target,
-                    // so this check never proceeds.
-                    if (reportErrors) {
-                        reportError(ts.Diagnostics.Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type);
+                if (kind === 1 /* Construct */ && sourceSignatures.length && targetSignatures.length) {
+                    if (isAbstractConstructorType(source) && !isAbstractConstructorType(target)) {
+                        // An abstract constructor type is not assignable to a non-abstract constructor type
+                        // as it would otherwise be possible to new an abstract class. Note that the assignability
+                        // check we perform for an extends clause excludes construct signatures from the target,
+                        // so this check never proceeds.
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type);
+                        }
+                        return 0 /* False */;
+                    }
+                    if (!constructorVisibilitiesAreCompatible(sourceSignatures[0], targetSignatures[0], reportErrors)) {
+                        return 0 /* False */;
                     }
-                    return 0 /* False */;
                 }
                 var result = -1 /* True */;
                 var saveErrorInfo = errorInfo;
                 outer: for (var _i = 0, targetSignatures_1 = targetSignatures; _i < targetSignatures_1.length; _i++) {
                     var t = targetSignatures_1[_i];
-                    if (!t.hasStringLiterals || target.flags & 262144 /* FromSignature */) {
-                        // Only elaborate errors from the first failure
-                        var shouldElaborateErrors = reportErrors;
-                        for (var _a = 0, sourceSignatures_1 = sourceSignatures; _a < sourceSignatures_1.length; _a++) {
-                            var s = sourceSignatures_1[_a];
-                            if (!s.hasStringLiterals || source.flags & 262144 /* FromSignature */) {
-                                var related = signatureRelatedTo(s, t, shouldElaborateErrors);
-                                if (related) {
-                                    result &= related;
-                                    errorInfo = saveErrorInfo;
-                                    continue outer;
-                                }
-                                shouldElaborateErrors = false;
-                            }
+                    // Only elaborate errors from the first failure
+                    var shouldElaborateErrors = reportErrors;
+                    for (var _a = 0, sourceSignatures_1 = sourceSignatures; _a < sourceSignatures_1.length; _a++) {
+                        var s = sourceSignatures_1[_a];
+                        var related = signatureRelatedTo(s, t, shouldElaborateErrors);
+                        if (related) {
+                            result &= related;
+                            errorInfo = saveErrorInfo;
+                            continue outer;
                         }
-                        // don't elaborate the primitive apparent types (like Number)
-                        // because the actual primitives will have already been reported.
-                        if (shouldElaborateErrors) {
-                            reportError(ts.Diagnostics.Type_0_provides_no_match_for_the_signature_1, typeToString(source), signatureToString(t, /*enclosingDeclaration*/ undefined, /*flags*/ undefined, kind));
-                        }
-                        return 0 /* False */;
+                        shouldElaborateErrors = false;
                     }
+                    if (shouldElaborateErrors) {
+                        reportError(ts.Diagnostics.Type_0_provides_no_match_for_the_signature_1, typeToString(source), signatureToString(t, /*enclosingDeclaration*/ undefined, /*flags*/ undefined, kind));
+                    }
+                    return 0 /* False */;
                 }
                 return result;
             }
@@ -19668,7 +20680,7 @@ var ts;
                 }
                 var result = -1 /* True */;
                 for (var i = 0, len = sourceSignatures.length; i < len; i++) {
-                    var related = compareSignaturesIdentical(sourceSignatures[i], targetSignatures[i], /*partialMatch*/ false, /*ignoreReturnTypes*/ false, isRelatedTo);
+                    var related = compareSignaturesIdentical(sourceSignatures[i], targetSignatures[i], /*partialMatch*/ false, /*ignoreThisTypes*/ false, /*ignoreReturnTypes*/ false, isRelatedTo);
                     if (!related) {
                         return 0 /* False */;
                     }
@@ -19676,84 +20688,74 @@ var ts;
                 }
                 return result;
             }
-            function stringIndexTypesRelatedTo(source, originalSource, target, reportErrors) {
-                if (relation === identityRelation) {
-                    return indexTypesIdenticalTo(0 /* String */, source, target);
-                }
-                var targetType = getIndexTypeOfType(target, 0 /* String */);
-                if (targetType) {
-                    if ((targetType.flags & 1 /* Any */) && !(originalSource.flags & 16777726 /* Primitive */)) {
-                        // non-primitive assignment to any is always allowed, eg
-                        //   `var x: { [index: string]: any } = { property: 12 };`
-                        return -1 /* True */;
-                    }
-                    var sourceType = getIndexTypeOfType(source, 0 /* String */);
-                    if (!sourceType) {
-                        if (reportErrors) {
-                            reportError(ts.Diagnostics.Index_signature_is_missing_in_type_0, typeToString(source));
+            function eachPropertyRelatedTo(source, target, kind, reportErrors) {
+                var result = -1 /* True */;
+                for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
+                    var prop = _a[_i];
+                    if (kind === 0 /* String */ || isNumericLiteralName(prop.name)) {
+                        var related = isRelatedTo(getTypeOfSymbol(prop), target, reportErrors);
+                        if (!related) {
+                            if (reportErrors) {
+                                reportError(ts.Diagnostics.Property_0_is_incompatible_with_index_signature, symbolToString(prop));
+                            }
+                            return 0 /* False */;
                         }
-                        return 0 /* False */;
+                        result &= related;
                     }
-                    var related = isRelatedTo(sourceType, targetType, reportErrors);
-                    if (!related) {
-                        if (reportErrors) {
-                            reportError(ts.Diagnostics.Index_signatures_are_incompatible);
-                        }
-                        return 0 /* False */;
-                    }
-                    return related;
                 }
-                return -1 /* True */;
+                return result;
             }
-            function numberIndexTypesRelatedTo(source, originalSource, target, reportErrors) {
-                if (relation === identityRelation) {
-                    return indexTypesIdenticalTo(1 /* Number */, source, target);
+            function indexInfoRelatedTo(sourceInfo, targetInfo, reportErrors) {
+                var related = isRelatedTo(sourceInfo.type, targetInfo.type, reportErrors);
+                if (!related && reportErrors) {
+                    reportError(ts.Diagnostics.Index_signatures_are_incompatible);
                 }
-                var targetType = getIndexTypeOfType(target, 1 /* Number */);
-                if (targetType) {
-                    if ((targetType.flags & 1 /* Any */) && !(originalSource.flags & 16777726 /* Primitive */)) {
-                        // non-primitive assignment to any is always allowed, eg
-                        //   `var x: { [index: number]: any } = { property: 12 };`
-                        return -1 /* True */;
-                    }
-                    var sourceStringType = getIndexTypeOfType(source, 0 /* String */);
-                    var sourceNumberType = getIndexTypeOfType(source, 1 /* Number */);
-                    if (!(sourceStringType || sourceNumberType)) {
-                        if (reportErrors) {
-                            reportError(ts.Diagnostics.Index_signature_is_missing_in_type_0, typeToString(source));
-                        }
-                        return 0 /* False */;
-                    }
-                    var related;
-                    if (sourceStringType && sourceNumberType) {
-                        // If we know for sure we're testing both string and numeric index types then only report errors from the second one
-                        related = isRelatedTo(sourceStringType, targetType, /*reportErrors*/ false) || isRelatedTo(sourceNumberType, targetType, reportErrors);
-                    }
-                    else {
-                        related = isRelatedTo(sourceStringType || sourceNumberType, targetType, reportErrors);
-                    }
-                    if (!related) {
-                        if (reportErrors) {
-                            reportError(ts.Diagnostics.Index_signatures_are_incompatible);
-                        }
-                        return 0 /* False */;
-                    }
-                    return related;
-                }
-                return -1 /* True */;
+                return related;
             }
-            function indexTypesIdenticalTo(indexKind, source, target) {
-                var targetType = getIndexTypeOfType(target, indexKind);
-                var sourceType = getIndexTypeOfType(source, indexKind);
-                if (!sourceType && !targetType) {
+            function indexTypesRelatedTo(source, originalSource, target, kind, reportErrors) {
+                if (relation === identityRelation) {
+                    return indexTypesIdenticalTo(source, target, kind);
+                }
+                var targetInfo = getIndexInfoOfType(target, kind);
+                if (!targetInfo || ((targetInfo.type.flags & 1 /* Any */) && !(originalSource.flags & 16777726 /* Primitive */))) {
+                    // Index signature of type any permits assignment from everything but primitives
                     return -1 /* True */;
                 }
-                if (sourceType && targetType) {
-                    return isRelatedTo(sourceType, targetType);
+                var sourceInfo = getIndexInfoOfType(source, kind) ||
+                    kind === 1 /* Number */ && getIndexInfoOfType(source, 0 /* String */);
+                if (sourceInfo) {
+                    return indexInfoRelatedTo(sourceInfo, targetInfo, reportErrors);
+                }
+                if (isObjectLiteralType(source)) {
+                    var related = -1 /* True */;
+                    if (kind === 0 /* String */) {
+                        var sourceNumberInfo = getIndexInfoOfType(source, 1 /* Number */);
+                        if (sourceNumberInfo) {
+                            related = indexInfoRelatedTo(sourceNumberInfo, targetInfo, reportErrors);
+                        }
+                    }
+                    if (related) {
+                        related &= eachPropertyRelatedTo(source, targetInfo.type, kind, reportErrors);
+                    }
+                    return related;
+                }
+                if (reportErrors) {
+                    reportError(ts.Diagnostics.Index_signature_is_missing_in_type_0, typeToString(source));
                 }
                 return 0 /* False */;
             }
-            function enumRelatedTo(source, target) {
+            function indexTypesIdenticalTo(source, target, indexKind) {
+                var targetInfo = getIndexInfoOfType(target, indexKind);
+                var sourceInfo = getIndexInfoOfType(source, indexKind);
+                if (!sourceInfo && !targetInfo) {
+                    return -1 /* True */;
+                }
+                if (sourceInfo && targetInfo && sourceInfo.isReadonly === targetInfo.isReadonly) {
+                    return isRelatedTo(sourceInfo.type, targetInfo.type);
+                }
+                return 0 /* False */;
+            }
+            function enumRelatedTo(source, target, reportErrors) {
                 if (source.symbol.name !== target.symbol.name ||
                     source.symbol.flags & 128 /* ConstEnum */ ||
                     target.symbol.flags & 128 /* ConstEnum */) {
@@ -19765,13 +20767,38 @@ var ts;
                     if (property.flags & 8 /* EnumMember */) {
                         var targetProperty = getPropertyOfType(targetEnumType, property.name);
                         if (!targetProperty || !(targetProperty.flags & 8 /* EnumMember */)) {
-                            reportError(ts.Diagnostics.Property_0_is_missing_in_type_1, property.name, typeToString(target, /*enclosingDeclaration*/ undefined, 128 /* UseFullyQualifiedType */));
+                            if (reportErrors) {
+                                reportError(ts.Diagnostics.Property_0_is_missing_in_type_1, property.name, typeToString(target, /*enclosingDeclaration*/ undefined, 128 /* UseFullyQualifiedType */));
+                            }
                             return 0 /* False */;
                         }
                     }
                 }
                 return -1 /* True */;
             }
+            function constructorVisibilitiesAreCompatible(sourceSignature, targetSignature, reportErrors) {
+                if (!sourceSignature.declaration || !targetSignature.declaration) {
+                    return true;
+                }
+                var sourceAccessibility = sourceSignature.declaration.flags & (8 /* Private */ | 16 /* Protected */);
+                var targetAccessibility = targetSignature.declaration.flags & (8 /* Private */ | 16 /* Protected */);
+                // A public, protected and private signature is assignable to a private signature.
+                if (targetAccessibility === 8 /* Private */) {
+                    return true;
+                }
+                // A public and protected signature is assignable to a protected signature.
+                if (targetAccessibility === 16 /* Protected */ && sourceAccessibility !== 8 /* Private */) {
+                    return true;
+                }
+                // Only a public signature is assignable to public signature.
+                if (targetAccessibility !== 16 /* Protected */ && !sourceAccessibility) {
+                    return true;
+                }
+                if (reportErrors) {
+                    reportError(ts.Diagnostics.Cannot_assign_a_0_constructor_type_to_a_1_constructor_type, visibilityToString(sourceAccessibility), visibilityToString(targetAccessibility));
+                }
+                return false;
+            }
         }
         // Return true if the given type is the constructor type for an abstract class
         function isAbstractConstructorType(type) {
@@ -19817,8 +20844,8 @@ var ts;
             if (sourceProp === targetProp) {
                 return -1 /* True */;
             }
-            var sourcePropAccessibility = getDeclarationFlagsFromSymbol(sourceProp) & (16 /* Private */ | 32 /* Protected */);
-            var targetPropAccessibility = getDeclarationFlagsFromSymbol(targetProp) & (16 /* Private */ | 32 /* Protected */);
+            var sourcePropAccessibility = getDeclarationFlagsFromSymbol(sourceProp) & (8 /* Private */ | 16 /* Protected */);
+            var targetPropAccessibility = getDeclarationFlagsFromSymbol(targetProp) & (8 /* Private */ | 16 /* Protected */);
             if (sourcePropAccessibility !== targetPropAccessibility) {
                 return 0 /* False */;
             }
@@ -19832,6 +20859,9 @@ var ts;
                     return 0 /* False */;
                 }
             }
+            if (isReadonlySymbol(sourceProp) !== isReadonlySymbol(targetProp)) {
+                return 0 /* False */;
+            }
             return compareTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
         }
         function isMatchingSignature(source, target, partialMatch) {
@@ -19854,7 +20884,7 @@ var ts;
         /**
          * See signatureRelatedTo, compareSignaturesIdentical
          */
-        function compareSignaturesIdentical(source, target, partialMatch, ignoreReturnTypes, compareTypes) {
+        function compareSignaturesIdentical(source, target, partialMatch, ignoreThisTypes, ignoreReturnTypes, compareTypes) {
             // TODO (drosen): De-duplicate code between related functions.
             if (source === target) {
                 return -1 /* True */;
@@ -19875,10 +20905,17 @@ var ts;
             source = getErasedSignature(source);
             target = getErasedSignature(target);
             var result = -1 /* True */;
+            if (!ignoreThisTypes && source.thisType && target.thisType) {
+                var related = compareTypes(source.thisType, target.thisType);
+                if (!related) {
+                    return 0 /* False */;
+                }
+                result &= related;
+            }
             var targetLen = target.parameters.length;
             for (var i = 0; i < targetLen; i++) {
-                var s = isRestParameterIndex(source, i) ? getRestTypeOfSignature(source) : getTypeOfSymbol(source.parameters[i]);
-                var t = isRestParameterIndex(target, i) ? getRestTypeOfSignature(target) : getTypeOfSymbol(target.parameters[i]);
+                var s = isRestParameterIndex(source, i) ? getRestTypeOfSignature(source) : getTypeOfParameter(source.parameters[i]);
+                var t = isRestParameterIndex(target, i) ? getRestTypeOfSignature(target) : getTypeOfParameter(target.parameters[i]);
                 var related = compareTypes(s, t);
                 if (!related) {
                     return 0 /* False */;
@@ -19894,15 +20931,31 @@ var ts;
             return signature.hasRestParameter && parameterIndex >= signature.parameters.length - 1;
         }
         function isSupertypeOfEach(candidate, types) {
-            for (var _i = 0, types_6 = types; _i < types_6.length; _i++) {
-                var type = types_6[_i];
-                if (candidate !== type && !isTypeSubtypeOf(type, candidate))
+            for (var _i = 0, types_5 = types; _i < types_5.length; _i++) {
+                var t = types_5[_i];
+                if (candidate !== t && !isTypeSubtypeOf(t, candidate))
                     return false;
             }
             return true;
         }
+        function getCombinedFlagsOfTypes(types) {
+            var flags = 0;
+            for (var _i = 0, types_6 = types; _i < types_6.length; _i++) {
+                var t = types_6[_i];
+                flags |= t.flags;
+            }
+            return flags;
+        }
         function getCommonSupertype(types) {
-            return ts.forEach(types, function (t) { return isSupertypeOfEach(t, types) ? t : undefined; });
+            if (!strictNullChecks) {
+                return ts.forEach(types, function (t) { return isSupertypeOfEach(t, types) ? t : undefined; });
+            }
+            var primaryTypes = ts.filter(types, function (t) { return !(t.flags & 96 /* Nullable */); });
+            if (!primaryTypes.length) {
+                return getUnionType(types);
+            }
+            var supertype = ts.forEach(primaryTypes, function (t) { return isSupertypeOfEach(t, primaryTypes) ? t : undefined; });
+            return supertype && addNullableKind(supertype, getCombinedFlagsOfTypes(types) & 96 /* Nullable */);
         }
         function reportNoCommonSupertypeError(types, errorLocation, errorMessageChainHead) {
             // The downfallType/bestSupertypeDownfallType is the first type that caused a particular candidate
@@ -19941,8 +20994,10 @@ var ts;
             return type.flags & 4096 /* Reference */ && type.target === globalArrayType;
         }
         function isArrayLikeType(type) {
-            // A type is array-like if it is not the undefined or null type and if it is assignable to any[]
-            return !(type.flags & (32 /* Undefined */ | 64 /* Null */)) && isTypeAssignableTo(type, anyArrayType);
+            // A type is array-like if it is a reference to the global Array or global ReadonlyArray type,
+            // or if it is not the undefined or null type and if it is assignable to ReadonlyArray<any>
+            return type.flags & 4096 /* Reference */ && (type.target === globalArrayType || type.target === globalReadonlyArrayType) ||
+                !(type.flags & 96 /* Nullable */) && isTypeAssignableTo(type, anyReadonlyArrayType);
         }
         function isTupleLikeType(type) {
             return !!getPropertyOfType(type, "0");
@@ -19957,6 +21012,69 @@ var ts;
         function isTupleType(type) {
             return !!(type.flags & 8192 /* Tuple */);
         }
+        function getNullableKind(type) {
+            var flags = type.flags;
+            if (flags & 16384 /* Union */) {
+                for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                    var t = _a[_i];
+                    flags |= t.flags;
+                }
+            }
+            return flags & 96 /* Nullable */;
+        }
+        function getNullableTypeOfKind(kind) {
+            return kind & 64 /* Null */ ? kind & 32 /* Undefined */ ?
+                getUnionType([nullType, undefinedType]) : nullType : undefinedType;
+        }
+        function addNullableKind(type, kind) {
+            if ((getNullableKind(type) & kind) !== kind) {
+                var types = [type];
+                if (kind & 32 /* Undefined */) {
+                    types.push(undefinedType);
+                }
+                if (kind & 64 /* Null */) {
+                    types.push(nullType);
+                }
+                type = getUnionType(types);
+            }
+            return type;
+        }
+        function removeNullableKind(type, kind) {
+            if (type.flags & 16384 /* Union */ && getNullableKind(type) & kind) {
+                var firstType = void 0;
+                var types = void 0;
+                for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                    var t = _a[_i];
+                    if (!(t.flags & kind)) {
+                        if (!firstType) {
+                            firstType = t;
+                        }
+                        else {
+                            if (!types) {
+                                types = [firstType];
+                            }
+                            types.push(t);
+                        }
+                    }
+                }
+                if (firstType) {
+                    type = types ? getUnionType(types) : firstType;
+                }
+            }
+            return type;
+        }
+        function getNonNullableType(type) {
+            return strictNullChecks ? removeNullableKind(type, 96 /* Nullable */) : type;
+        }
+        /**
+         * Return true if type was inferred from an object literal or written as an object type literal
+         * with no call or construct signatures.
+         */
+        function isObjectLiteralType(type) {
+            return type.symbol && (type.symbol.flags & (4096 /* ObjectLiteral */ | 2048 /* TypeLiteral */)) !== 0 &&
+                getSignaturesOfType(type, 0 /* Call */).length === 0 &&
+                getSignaturesOfType(type, 1 /* Construct */).length === 0;
+        }
         function getRegularTypeOfObjectLiteral(type) {
             if (type.flags & 1048576 /* FreshObjectLiteral */) {
                 var regularType = type.regularType;
@@ -19967,8 +21085,8 @@ var ts;
                     regularType.properties = type.properties;
                     regularType.callSignatures = type.callSignatures;
                     regularType.constructSignatures = type.constructSignatures;
-                    regularType.stringIndexType = type.stringIndexType;
-                    regularType.numberIndexType = type.numberIndexType;
+                    regularType.stringIndexInfo = type.stringIndexInfo;
+                    regularType.numberIndexInfo = type.numberIndexInfo;
                     type.regularType = regularType;
                 }
                 return regularType;
@@ -19993,27 +21111,23 @@ var ts;
                 }
                 members[p.name] = p;
             });
-            var stringIndexType = getIndexTypeOfType(type, 0 /* String */);
-            var numberIndexType = getIndexTypeOfType(type, 1 /* Number */);
-            if (stringIndexType)
-                stringIndexType = getWidenedType(stringIndexType);
-            if (numberIndexType)
-                numberIndexType = getWidenedType(numberIndexType);
-            return createAnonymousType(type.symbol, members, emptyArray, emptyArray, stringIndexType, numberIndexType);
+            var stringIndexInfo = getIndexInfoOfType(type, 0 /* String */);
+            var numberIndexInfo = getIndexInfoOfType(type, 1 /* Number */);
+            return createAnonymousType(type.symbol, members, emptyArray, emptyArray, stringIndexInfo && createIndexInfo(getWidenedType(stringIndexInfo.type), stringIndexInfo.isReadonly), numberIndexInfo && createIndexInfo(getWidenedType(numberIndexInfo.type), numberIndexInfo.isReadonly));
+        }
+        function getWidenedConstituentType(type) {
+            return type.flags & 96 /* Nullable */ ? type : getWidenedType(type);
         }
         function getWidenedType(type) {
-            if (type.flags & 140509184 /* RequiresWidening */) {
-                if (type.flags & (32 /* Undefined */ | 64 /* Null */)) {
+            if (type.flags & 6291456 /* RequiresWidening */) {
+                if (type.flags & 96 /* Nullable */) {
                     return anyType;
                 }
-                if (type.flags & 134217728 /* PredicateType */) {
-                    return booleanType;
-                }
                 if (type.flags & 524288 /* ObjectLiteral */) {
                     return getWidenedTypeOfObjectLiteral(type);
                 }
                 if (type.flags & 16384 /* Union */) {
-                    return getUnionType(ts.map(type.types, getWidenedType), /*noSubtypeReduction*/ true);
+                    return getUnionType(ts.map(type.types, getWidenedConstituentType), /*noSubtypeReduction*/ true);
                 }
                 if (isArrayType(type)) {
                     return createArrayType(getWidenedType(type.typeArguments[0]));
@@ -20074,22 +21188,25 @@ var ts;
             var typeAsString = typeToString(getWidenedType(type));
             var diagnostic;
             switch (declaration.kind) {
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
                     diagnostic = ts.Diagnostics.Member_0_implicitly_has_an_1_type;
                     break;
-                case 139 /* Parameter */:
+                case 141 /* Parameter */:
                     diagnostic = declaration.dotDotDotToken ?
                         ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type :
                         ts.Diagnostics.Parameter_0_implicitly_has_an_1_type;
                     break;
-                case 216 /* FunctionDeclaration */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
-                case 176 /* FunctionExpression */:
-                case 177 /* ArrowFunction */:
+                case 168 /* BindingElement */:
+                    diagnostic = ts.Diagnostics.Binding_element_0_implicitly_has_an_1_type;
+                    break;
+                case 219 /* FunctionDeclaration */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
+                case 178 /* FunctionExpression */:
+                case 179 /* ArrowFunction */:
                     if (!declaration.name) {
                         error(declaration, ts.Diagnostics.Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
                         return;
@@ -20114,25 +21231,19 @@ var ts;
             var targetMax = target.parameters.length;
             var count;
             if (source.hasRestParameter && target.hasRestParameter) {
-                count = sourceMax > targetMax ? sourceMax : targetMax;
-                sourceMax--;
-                targetMax--;
+                count = Math.max(sourceMax, targetMax);
             }
             else if (source.hasRestParameter) {
-                sourceMax--;
                 count = targetMax;
             }
             else if (target.hasRestParameter) {
-                targetMax--;
                 count = sourceMax;
             }
             else {
-                count = sourceMax < targetMax ? sourceMax : targetMax;
+                count = Math.min(sourceMax, targetMax);
             }
             for (var i = 0; i < count; i++) {
-                var s = i < sourceMax ? getTypeOfSymbol(source.parameters[i]) : getRestTypeOfSignature(source);
-                var t = i < targetMax ? getTypeOfSymbol(target.parameters[i]) : getRestTypeOfSignature(target);
-                callback(s, t);
+                callback(getTypeAtPosition(source, i), getTypeAtPosition(target, i));
             }
         }
         function createInferenceContext(typeParameters, inferUnionTypes) {
@@ -20156,6 +21267,7 @@ var ts;
             var targetStack;
             var depth = 0;
             var inferiority = 0;
+            var visited = {};
             inferFromTypes(source, target);
             function isInProcess(source, target) {
                 for (var i = 0; i < depth; i++) {
@@ -20173,7 +21285,7 @@ var ts;
                     // type, and for each such target constituent type infer from the type to itself.
                     // When inferring from a type to itself we effectively find all type parameter
                     // occurrences within that type and infer themselves as their type arguments.
-                    var matchingTypes;
+                    var matchingTypes = void 0;
                     for (var _i = 0, _a = target.types; _i < _a.length; _i++) {
                         var t = _a[_i];
                         if (typeIdenticalToSomeType(t, source.types)) {
@@ -20230,11 +21342,6 @@ var ts;
                         inferFromTypes(sourceTypes[i], targetTypes[i]);
                     }
                 }
-                else if (source.flags & 134217728 /* PredicateType */ && target.flags & 134217728 /* PredicateType */) {
-                    if (source.predicate.kind === target.predicate.kind) {
-                        inferFromTypes(source.predicate.type, target.predicate.type);
-                    }
-                }
                 else if (source.flags & 8192 /* Tuple */ && target.flags & 8192 /* Tuple */ && source.elementTypes.length === target.elementTypes.length) {
                     // If source and target are tuples of the same size, infer from element types
                     var sourceTypes = source.elementTypes;
@@ -20246,7 +21353,7 @@ var ts;
                 else if (target.flags & 49152 /* UnionOrIntersection */) {
                     var targetTypes = target.types;
                     var typeParameterCount = 0;
-                    var typeParameter;
+                    var typeParameter = void 0;
                     // First infer to each type in union or intersection that isn't a type parameter
                     for (var _b = 0, targetTypes_2 = targetTypes; _b < targetTypes_2.length; _b++) {
                         var t = targetTypes_2[_b];
@@ -20269,7 +21376,7 @@ var ts;
                     }
                 }
                 else if (source.flags & 49152 /* UnionOrIntersection */) {
-                    // Source is a union or intersection type, infer from each consituent type
+                    // Source is a union or intersection type, infer from each constituent type
                     var sourceTypes = source.types;
                     for (var _c = 0, sourceTypes_3 = sourceTypes; _c < sourceTypes_3.length; _c++) {
                         var sourceType = sourceTypes_3[_c];
@@ -20289,6 +21396,11 @@ var ts;
                         if (isDeeplyNestedGeneric(source, sourceStack, depth) && isDeeplyNestedGeneric(target, targetStack, depth)) {
                             return;
                         }
+                        var key = source.id + "," + target.id;
+                        if (ts.hasProperty(visited, key)) {
+                            return;
+                        }
+                        visited[key] = true;
                         if (depth === 0) {
                             sourceStack = [];
                             targetStack = [];
@@ -20299,9 +21411,7 @@ var ts;
                         inferFromProperties(source, target);
                         inferFromSignatures(source, target, 0 /* Call */);
                         inferFromSignatures(source, target, 1 /* Construct */);
-                        inferFromIndexTypes(source, target, 0 /* String */, 0 /* String */);
-                        inferFromIndexTypes(source, target, 1 /* Number */, 1 /* Number */);
-                        inferFromIndexTypes(source, target, 0 /* String */, 1 /* Number */);
+                        inferFromIndexTypes(source, target);
                         depth--;
                     }
                 }
@@ -20328,14 +21438,29 @@ var ts;
             }
             function inferFromSignature(source, target) {
                 forEachMatchingParameterType(source, target, inferFromTypes);
-                inferFromTypes(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
+                if (source.typePredicate && target.typePredicate && source.typePredicate.kind === target.typePredicate.kind) {
+                    inferFromTypes(source.typePredicate.type, target.typePredicate.type);
+                }
+                else {
+                    inferFromTypes(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
+                }
             }
-            function inferFromIndexTypes(source, target, sourceKind, targetKind) {
-                var targetIndexType = getIndexTypeOfType(target, targetKind);
-                if (targetIndexType) {
-                    var sourceIndexType = getIndexTypeOfType(source, sourceKind);
+            function inferFromIndexTypes(source, target) {
+                var targetStringIndexType = getIndexTypeOfType(target, 0 /* String */);
+                if (targetStringIndexType) {
+                    var sourceIndexType = getIndexTypeOfType(source, 0 /* String */) ||
+                        getImplicitIndexTypeOfType(source, 0 /* String */);
                     if (sourceIndexType) {
-                        inferFromTypes(sourceIndexType, targetIndexType);
+                        inferFromTypes(sourceIndexType, targetStringIndexType);
+                    }
+                }
+                var targetNumberIndexType = getIndexTypeOfType(target, 1 /* Number */);
+                if (targetNumberIndexType) {
+                    var sourceIndexType = getIndexTypeOfType(source, 1 /* Number */) ||
+                        getIndexTypeOfType(source, 0 /* String */) ||
+                        getImplicitIndexTypeOfType(source, 1 /* Number */);
+                    if (sourceIndexType) {
+                        inferFromTypes(sourceIndexType, targetNumberIndexType);
                     }
                 }
             }
@@ -20413,10 +21538,21 @@ var ts;
             return context.inferredTypes;
         }
         // EXPRESSION TYPE CHECKING
+        function createTransientIdentifier(symbol, location) {
+            var result = ts.createNode(69 /* Identifier */);
+            result.text = symbol.name;
+            result.resolvedSymbol = symbol;
+            result.parent = location;
+            result.id = -1;
+            return result;
+        }
         function getResolvedSymbol(node) {
+            if (node.id === -1) {
+                return node.resolvedSymbol;
+            }
             var links = getNodeLinks(node);
             if (!links.resolvedSymbol) {
-                links.resolvedSymbol = (!ts.nodeIsMissing(node) && resolveName(node, node.text, 107455 /* Value */ | 1048576 /* ExportValue */, ts.Diagnostics.Cannot_find_name_0, node)) || unknownSymbol;
+                links.resolvedSymbol = !ts.nodeIsMissing(node) && resolveName(node, node.text, 107455 /* Value */ | 1048576 /* ExportValue */, ts.Diagnostics.Cannot_find_name_0, node) || unknownSymbol;
             }
             return links.resolvedSymbol;
         }
@@ -20426,10 +21562,10 @@ var ts;
             // The expression is restricted to a single identifier or a sequence of identifiers separated by periods
             while (node) {
                 switch (node.kind) {
-                    case 155 /* TypeQuery */:
+                    case 157 /* TypeQuery */:
                         return true;
                     case 69 /* Identifier */:
-                    case 136 /* QualifiedName */:
+                    case 138 /* QualifiedName */:
                         node = node.parent;
                         continue;
                     default:
@@ -20438,174 +21574,294 @@ var ts;
             }
             ts.Debug.fail("should not get here");
         }
+        // Return the assignment key for a "dotted name" (i.e. a sequence of identifiers
+        // separated by dots). The key consists of the id of the symbol referenced by the
+        // leftmost identifier followed by zero or more property names separated by dots.
+        // The result is undefined if the reference isn't a dotted name.
+        function getAssignmentKey(node) {
+            if (node.kind === 69 /* Identifier */) {
+                var symbol = getResolvedSymbol(node);
+                return symbol !== unknownSymbol ? "" + getSymbolId(symbol) : undefined;
+            }
+            if (node.kind === 97 /* ThisKeyword */) {
+                return "0";
+            }
+            if (node.kind === 171 /* PropertyAccessExpression */) {
+                var key = getAssignmentKey(node.expression);
+                return key && key + "." + node.name.text;
+            }
+            return undefined;
+        }
         function hasInitializer(node) {
             return !!(node.initializer || ts.isBindingPattern(node.parent) && hasInitializer(node.parent.parent));
         }
-        // Check if a given variable is assigned within a given syntax node
-        function isVariableAssignedWithin(symbol, node) {
-            var links = getNodeLinks(node);
-            if (links.assignmentChecks) {
-                var cachedResult = links.assignmentChecks[symbol.id];
-                if (cachedResult !== undefined) {
-                    return cachedResult;
-                }
-            }
-            else {
-                links.assignmentChecks = {};
-            }
-            return links.assignmentChecks[symbol.id] = isAssignedIn(node);
-            function isAssignedInBinaryExpression(node) {
-                if (node.operatorToken.kind >= 56 /* FirstAssignment */ && node.operatorToken.kind <= 68 /* LastAssignment */) {
-                    var n = skipParenthesizedNodes(node.left);
-                    if (n.kind === 69 /* Identifier */ && getResolvedSymbol(n) === symbol) {
-                        return true;
+        // For a given node compute a map of which dotted names are assigned within
+        // the node.
+        function getAssignmentMap(node) {
+            var assignmentMap = {};
+            visit(node);
+            return assignmentMap;
+            function visitReference(node) {
+                if (isAssignmentTarget(node) || isCompoundAssignmentTarget(node)) {
+                    var key = getAssignmentKey(node);
+                    if (key) {
+                        assignmentMap[key] = true;
                     }
                 }
-                return ts.forEachChild(node, isAssignedIn);
+                ts.forEachChild(node, visit);
             }
-            function isAssignedInVariableDeclaration(node) {
-                if (!ts.isBindingPattern(node.name) && getSymbolOfNode(node) === symbol && hasInitializer(node)) {
-                    return true;
+            function visitVariableDeclaration(node) {
+                if (!ts.isBindingPattern(node.name) && hasInitializer(node)) {
+                    assignmentMap[getSymbolId(getSymbolOfNode(node))] = true;
                 }
-                return ts.forEachChild(node, isAssignedIn);
+                ts.forEachChild(node, visit);
             }
-            function isAssignedIn(node) {
+            function visit(node) {
                 switch (node.kind) {
-                    case 184 /* BinaryExpression */:
-                        return isAssignedInBinaryExpression(node);
-                    case 214 /* VariableDeclaration */:
-                    case 166 /* BindingElement */:
-                        return isAssignedInVariableDeclaration(node);
-                    case 164 /* ObjectBindingPattern */:
-                    case 165 /* ArrayBindingPattern */:
-                    case 167 /* ArrayLiteralExpression */:
-                    case 168 /* ObjectLiteralExpression */:
-                    case 169 /* PropertyAccessExpression */:
-                    case 170 /* ElementAccessExpression */:
-                    case 171 /* CallExpression */:
-                    case 172 /* NewExpression */:
-                    case 174 /* TypeAssertionExpression */:
-                    case 192 /* AsExpression */:
-                    case 175 /* ParenthesizedExpression */:
-                    case 182 /* PrefixUnaryExpression */:
-                    case 178 /* DeleteExpression */:
-                    case 181 /* AwaitExpression */:
-                    case 179 /* TypeOfExpression */:
-                    case 180 /* VoidExpression */:
-                    case 183 /* PostfixUnaryExpression */:
-                    case 187 /* YieldExpression */:
-                    case 185 /* ConditionalExpression */:
-                    case 188 /* SpreadElementExpression */:
-                    case 195 /* Block */:
-                    case 196 /* VariableStatement */:
-                    case 198 /* ExpressionStatement */:
-                    case 199 /* IfStatement */:
-                    case 200 /* DoStatement */:
-                    case 201 /* WhileStatement */:
-                    case 202 /* ForStatement */:
-                    case 203 /* ForInStatement */:
-                    case 204 /* ForOfStatement */:
-                    case 207 /* ReturnStatement */:
-                    case 208 /* WithStatement */:
-                    case 209 /* SwitchStatement */:
-                    case 244 /* CaseClause */:
-                    case 245 /* DefaultClause */:
-                    case 210 /* LabeledStatement */:
-                    case 211 /* ThrowStatement */:
-                    case 212 /* TryStatement */:
-                    case 247 /* CatchClause */:
-                    case 236 /* JsxElement */:
-                    case 237 /* JsxSelfClosingElement */:
-                    case 241 /* JsxAttribute */:
-                    case 242 /* JsxSpreadAttribute */:
-                    case 238 /* JsxOpeningElement */:
-                    case 243 /* JsxExpression */:
-                        return ts.forEachChild(node, isAssignedIn);
+                    case 69 /* Identifier */:
+                    case 171 /* PropertyAccessExpression */:
+                        visitReference(node);
+                        break;
+                    case 217 /* VariableDeclaration */:
+                    case 168 /* BindingElement */:
+                        visitVariableDeclaration(node);
+                        break;
+                    case 186 /* BinaryExpression */:
+                    case 166 /* ObjectBindingPattern */:
+                    case 167 /* ArrayBindingPattern */:
+                    case 169 /* ArrayLiteralExpression */:
+                    case 170 /* ObjectLiteralExpression */:
+                    case 172 /* ElementAccessExpression */:
+                    case 173 /* CallExpression */:
+                    case 174 /* NewExpression */:
+                    case 176 /* TypeAssertionExpression */:
+                    case 194 /* AsExpression */:
+                    case 195 /* NonNullExpression */:
+                    case 177 /* ParenthesizedExpression */:
+                    case 184 /* PrefixUnaryExpression */:
+                    case 180 /* DeleteExpression */:
+                    case 183 /* AwaitExpression */:
+                    case 181 /* TypeOfExpression */:
+                    case 182 /* VoidExpression */:
+                    case 185 /* PostfixUnaryExpression */:
+                    case 189 /* YieldExpression */:
+                    case 187 /* ConditionalExpression */:
+                    case 190 /* SpreadElementExpression */:
+                    case 198 /* Block */:
+                    case 199 /* VariableStatement */:
+                    case 201 /* ExpressionStatement */:
+                    case 202 /* IfStatement */:
+                    case 203 /* DoStatement */:
+                    case 204 /* WhileStatement */:
+                    case 205 /* ForStatement */:
+                    case 206 /* ForInStatement */:
+                    case 207 /* ForOfStatement */:
+                    case 210 /* ReturnStatement */:
+                    case 211 /* WithStatement */:
+                    case 212 /* SwitchStatement */:
+                    case 226 /* CaseBlock */:
+                    case 248 /* CaseClause */:
+                    case 249 /* DefaultClause */:
+                    case 213 /* LabeledStatement */:
+                    case 214 /* ThrowStatement */:
+                    case 215 /* TryStatement */:
+                    case 251 /* CatchClause */:
+                    case 240 /* JsxElement */:
+                    case 241 /* JsxSelfClosingElement */:
+                    case 245 /* JsxAttribute */:
+                    case 246 /* JsxSpreadAttribute */:
+                    case 242 /* JsxOpeningElement */:
+                    case 247 /* JsxExpression */:
+                        ts.forEachChild(node, visit);
+                        break;
                 }
-                return false;
             }
         }
-        // Get the narrowed type of a given symbol at a given location
-        function getNarrowedTypeOfSymbol(symbol, node) {
-            var type = getTypeOfSymbol(symbol);
-            // Only narrow when symbol is variable of type any or an object, union, or type parameter type
-            if (node && symbol.flags & 3 /* Variable */) {
-                if (isTypeAny(type) || type.flags & (80896 /* ObjectType */ | 16384 /* Union */ | 512 /* TypeParameter */)) {
-                    var declaration = ts.getDeclarationOfKind(symbol, 214 /* VariableDeclaration */);
-                    var top_1 = declaration && getDeclarationContainer(declaration);
-                    var originalType = type;
-                    var nodeStack = [];
-                    loop: while (node.parent) {
-                        var child = node;
-                        node = node.parent;
-                        switch (node.kind) {
-                            case 199 /* IfStatement */:
-                            case 185 /* ConditionalExpression */:
-                            case 184 /* BinaryExpression */:
-                                nodeStack.push({ node: node, child: child });
-                                break;
-                            case 251 /* SourceFile */:
-                            case 221 /* ModuleDeclaration */:
-                                // Stop at the first containing file or module declaration
-                                break loop;
-                        }
-                        if (node === top_1) {
-                            break;
-                        }
-                    }
-                    var nodes;
-                    while (nodes = nodeStack.pop()) {
-                        var node_1 = nodes.node, child = nodes.child;
-                        switch (node_1.kind) {
-                            case 199 /* IfStatement */:
-                                // In a branch of an if statement, narrow based on controlling expression
-                                if (child !== node_1.expression) {
-                                    type = narrowType(type, node_1.expression, /*assumeTrue*/ child === node_1.thenStatement);
-                                }
-                                break;
-                            case 185 /* ConditionalExpression */:
-                                // In a branch of a conditional expression, narrow based on controlling condition
-                                if (child !== node_1.condition) {
-                                    type = narrowType(type, node_1.condition, /*assumeTrue*/ child === node_1.whenTrue);
-                                }
-                                break;
-                            case 184 /* BinaryExpression */:
-                                // In the right operand of an && or ||, narrow based on left operand
-                                if (child === node_1.right) {
-                                    if (node_1.operatorToken.kind === 51 /* AmpersandAmpersandToken */) {
-                                        type = narrowType(type, node_1.left, /*assumeTrue*/ true);
-                                    }
-                                    else if (node_1.operatorToken.kind === 52 /* BarBarToken */) {
-                                        type = narrowType(type, node_1.left, /*assumeTrue*/ false);
-                                    }
-                                }
-                                break;
-                            default:
-                                ts.Debug.fail("Unreachable!");
-                        }
-                        // Use original type if construct contains assignments to variable
-                        if (type !== originalType && isVariableAssignedWithin(symbol, node_1)) {
-                            type = originalType;
-                        }
-                    }
-                    // Preserve old top-level behavior - if the branch is really an empty set, revert to prior type
-                    if (type === emptyUnionType) {
-                        type = originalType;
-                    }
+        function isReferenceAssignedWithin(reference, node) {
+            if (reference.kind !== 97 /* ThisKeyword */) {
+                var key = getAssignmentKey(reference);
+                if (key) {
+                    var links = getNodeLinks(node);
+                    return (links.assignmentMap || (links.assignmentMap = getAssignmentMap(node)))[key];
                 }
             }
-            return type;
-            function narrowTypeByEquality(type, expr, assumeTrue) {
-                // Check that we have 'typeof <symbol>' on the left and string literal on the right
-                if (expr.left.kind !== 179 /* TypeOfExpression */ || expr.right.kind !== 9 /* StringLiteral */) {
+            return false;
+        }
+        function isAnyPartOfReferenceAssignedWithin(reference, node) {
+            while (true) {
+                if (isReferenceAssignedWithin(reference, node)) {
+                    return true;
+                }
+                if (reference.kind !== 171 /* PropertyAccessExpression */) {
+                    return false;
+                }
+                reference = reference.expression;
+            }
+        }
+        function isNullOrUndefinedLiteral(node) {
+            return node.kind === 93 /* NullKeyword */ ||
+                node.kind === 69 /* Identifier */ && getResolvedSymbol(node) === undefinedSymbol;
+        }
+        function getLeftmostIdentifierOrThis(node) {
+            switch (node.kind) {
+                case 69 /* Identifier */:
+                case 97 /* ThisKeyword */:
+                    return node;
+                case 171 /* PropertyAccessExpression */:
+                    return getLeftmostIdentifierOrThis(node.expression);
+            }
+            return undefined;
+        }
+        function isMatchingReference(source, target) {
+            if (source.kind === target.kind) {
+                switch (source.kind) {
+                    case 69 /* Identifier */:
+                        return getResolvedSymbol(source) === getResolvedSymbol(target);
+                    case 97 /* ThisKeyword */:
+                        return true;
+                    case 171 /* PropertyAccessExpression */:
+                        return source.name.text === target.name.text &&
+                            isMatchingReference(source.expression, target.expression);
+                }
+            }
+            return false;
+        }
+        // Get the narrowed type of a given symbol at a given location
+        function getNarrowedTypeOfReference(type, reference) {
+            if (!(type.flags & (1 /* Any */ | 80896 /* ObjectType */ | 16384 /* Union */ | 512 /* TypeParameter */))) {
+                return type;
+            }
+            var leftmostNode = getLeftmostIdentifierOrThis(reference);
+            if (!leftmostNode) {
+                return type;
+            }
+            var top;
+            if (leftmostNode.kind === 69 /* Identifier */) {
+                var leftmostSymbol = getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(leftmostNode));
+                if (!leftmostSymbol) {
                     return type;
                 }
+                var declaration = leftmostSymbol.valueDeclaration;
+                if (!declaration || declaration.kind !== 217 /* VariableDeclaration */ && declaration.kind !== 141 /* Parameter */ && declaration.kind !== 168 /* BindingElement */) {
+                    return type;
+                }
+                top = getDeclarationContainer(declaration);
+            }
+            var originalType = type;
+            var nodeStack = [];
+            var node = reference;
+            loop: while (node.parent) {
+                var child = node;
+                node = node.parent;
+                switch (node.kind) {
+                    case 202 /* IfStatement */:
+                    case 187 /* ConditionalExpression */:
+                    case 186 /* BinaryExpression */:
+                        nodeStack.push({ node: node, child: child });
+                        break;
+                    case 255 /* SourceFile */:
+                    case 224 /* ModuleDeclaration */:
+                        break loop;
+                    default:
+                        if (node === top || ts.isFunctionLikeKind(node.kind)) {
+                            break loop;
+                        }
+                        break;
+                }
+            }
+            var nodes;
+            while (nodes = nodeStack.pop()) {
+                var node_1 = nodes.node, child = nodes.child;
+                switch (node_1.kind) {
+                    case 202 /* IfStatement */:
+                        // In a branch of an if statement, narrow based on controlling expression
+                        if (child !== node_1.expression) {
+                            type = narrowType(type, node_1.expression, /*assumeTrue*/ child === node_1.thenStatement);
+                        }
+                        break;
+                    case 187 /* ConditionalExpression */:
+                        // In a branch of a conditional expression, narrow based on controlling condition
+                        if (child !== node_1.condition) {
+                            type = narrowType(type, node_1.condition, /*assumeTrue*/ child === node_1.whenTrue);
+                        }
+                        break;
+                    case 186 /* BinaryExpression */:
+                        // In the right operand of an && or ||, narrow based on left operand
+                        if (child === node_1.right) {
+                            if (node_1.operatorToken.kind === 51 /* AmpersandAmpersandToken */) {
+                                type = narrowType(type, node_1.left, /*assumeTrue*/ true);
+                            }
+                            else if (node_1.operatorToken.kind === 52 /* BarBarToken */) {
+                                type = narrowType(type, node_1.left, /*assumeTrue*/ false);
+                            }
+                        }
+                        break;
+                    default:
+                        ts.Debug.fail("Unreachable!");
+                }
+                // Use original type if construct contains assignments to variable
+                if (type !== originalType && isAnyPartOfReferenceAssignedWithin(reference, node_1)) {
+                    type = originalType;
+                }
+            }
+            // Preserve old top-level behavior - if the branch is really an empty set, revert to prior type
+            if (type === emptyUnionType) {
+                type = originalType;
+            }
+            return type;
+            function narrowTypeByTruthiness(type, expr, assumeTrue) {
+                return strictNullChecks && assumeTrue && isMatchingReference(expr, reference) ? getNonNullableType(type) : type;
+            }
+            function narrowTypeByBinaryExpression(type, expr, assumeTrue) {
+                switch (expr.operatorToken.kind) {
+                    case 30 /* EqualsEqualsToken */:
+                    case 31 /* ExclamationEqualsToken */:
+                    case 32 /* EqualsEqualsEqualsToken */:
+                    case 33 /* ExclamationEqualsEqualsToken */:
+                        if (isNullOrUndefinedLiteral(expr.right)) {
+                            return narrowTypeByNullCheck(type, expr, assumeTrue);
+                        }
+                        if (expr.left.kind === 181 /* TypeOfExpression */ && expr.right.kind === 9 /* StringLiteral */) {
+                            return narrowTypeByTypeof(type, expr, assumeTrue);
+                        }
+                        break;
+                    case 51 /* AmpersandAmpersandToken */:
+                        return narrowTypeByAnd(type, expr, assumeTrue);
+                    case 52 /* BarBarToken */:
+                        return narrowTypeByOr(type, expr, assumeTrue);
+                    case 91 /* InstanceOfKeyword */:
+                        return narrowTypeByInstanceof(type, expr, assumeTrue);
+                }
+                return type;
+            }
+            function narrowTypeByNullCheck(type, expr, assumeTrue) {
+                // We have '==', '!=', '===', or '!==' operator with 'null' or 'undefined' on the right
+                var operator = expr.operatorToken.kind;
+                if (operator === 31 /* ExclamationEqualsToken */ || operator === 33 /* ExclamationEqualsEqualsToken */) {
+                    assumeTrue = !assumeTrue;
+                }
+                if (!strictNullChecks || !isMatchingReference(expr.left, reference)) {
+                    return type;
+                }
+                var doubleEquals = operator === 30 /* EqualsEqualsToken */ || operator === 31 /* ExclamationEqualsToken */;
+                var exprNullableKind = doubleEquals ? 96 /* Nullable */ :
+                    expr.right.kind === 93 /* NullKeyword */ ? 64 /* Null */ : 32 /* Undefined */;
+                if (assumeTrue) {
+                    var nullableKind = getNullableKind(type) & exprNullableKind;
+                    return nullableKind ? getNullableTypeOfKind(nullableKind) : type;
+                }
+                return removeNullableKind(type, exprNullableKind);
+            }
+            function narrowTypeByTypeof(type, expr, assumeTrue) {
+                // We have '==', '!=', '====', or !==' operator with 'typeof xxx' on the left
+                // and string literal on the right
                 var left = expr.left;
                 var right = expr.right;
-                if (left.expression.kind !== 69 /* Identifier */ || getResolvedSymbol(left.expression) !== symbol) {
+                if (!isMatchingReference(left.expression, reference)) {
                     return type;
                 }
-                if (expr.operatorToken.kind === 33 /* ExclamationEqualsEqualsToken */) {
+                if (expr.operatorToken.kind === 31 /* ExclamationEqualsToken */ ||
+                    expr.operatorToken.kind === 33 /* ExclamationEqualsEqualsToken */) {
                     assumeTrue = !assumeTrue;
                 }
                 var typeInfo = primitiveTypeInfo[right.text];
@@ -20665,7 +21921,7 @@ var ts;
             }
             function narrowTypeByInstanceof(type, expr, assumeTrue) {
                 // Check that type is not any, assumed result is true, and we have variable symbol on the left
-                if (isTypeAny(type) || expr.left.kind !== 69 /* Identifier */ || getResolvedSymbol(expr.left) !== symbol) {
+                if (isTypeAny(type) || !isMatchingReference(expr.left, reference)) {
                     return type;
                 }
                 // Check that right operand is a function type with a prototype property
@@ -20684,7 +21940,7 @@ var ts;
                 }
                 if (!targetType) {
                     // Target type is type of construct signature
-                    var constructSignatures;
+                    var constructSignatures = void 0;
                     if (rightType.flags & 2048 /* Interface */) {
                         constructSignatures = resolveDeclaredMembers(rightType).declaredConstructSignatures;
                     }
@@ -20715,105 +21971,181 @@ var ts;
                         return getUnionType(assignableConstituents);
                     }
                 }
-                if (isTypeAssignableTo(narrowedTypeCandidate, originalType)) {
+                var targetType = originalType.flags & 512 /* TypeParameter */ ? getApparentType(originalType) : originalType;
+                if (isTypeAssignableTo(narrowedTypeCandidate, targetType)) {
                     // Narrow to the target type if it's assignable to the current type
                     return narrowedTypeCandidate;
                 }
                 return originalType;
             }
-            function narrowTypeByTypePredicate(type, expr, assumeTrue) {
+            function narrowTypeByTypePredicate(type, callExpression, assumeTrue) {
                 if (type.flags & 1 /* Any */) {
                     return type;
                 }
-                var signature = getResolvedSignature(expr);
-                var predicateType = getReturnTypeOfSignature(signature);
-                if (!predicateType || !(predicateType.flags & 134217728 /* PredicateType */)) {
+                var signature = getResolvedSignature(callExpression);
+                var predicate = signature.typePredicate;
+                if (!predicate) {
                     return type;
                 }
-                var predicate = predicateType.predicate;
                 if (ts.isIdentifierTypePredicate(predicate)) {
-                    var callExpression = expr;
-                    if (callExpression.arguments[predicate.parameterIndex] &&
-                        getSymbolAtTypePredicatePosition(callExpression.arguments[predicate.parameterIndex]) === symbol) {
+                    var predicateArgument = callExpression.arguments[predicate.parameterIndex];
+                    if (predicateArgument && isMatchingReference(predicateArgument, reference)) {
                         return getNarrowedType(type, predicate.type, assumeTrue);
                     }
                 }
                 else {
-                    var expression = skipParenthesizedNodes(expr.expression);
-                    return narrowTypeByThisTypePredicate(type, predicate, expression, assumeTrue);
-                }
-                return type;
-            }
-            function narrowTypeByTypePredicateMember(type, expr, assumeTrue) {
-                if (type.flags & 1 /* Any */) {
-                    return type;
-                }
-                var memberType = getTypeOfExpression(expr);
-                if (!(memberType.flags & 134217728 /* PredicateType */)) {
-                    return type;
-                }
-                return narrowTypeByThisTypePredicate(type, memberType.predicate, expr, assumeTrue);
-            }
-            function narrowTypeByThisTypePredicate(type, predicate, expression, assumeTrue) {
-                if (expression.kind === 170 /* ElementAccessExpression */ || expression.kind === 169 /* PropertyAccessExpression */) {
-                    var accessExpression = expression;
-                    var possibleIdentifier = skipParenthesizedNodes(accessExpression.expression);
-                    if (possibleIdentifier.kind === 69 /* Identifier */ && getSymbolAtTypePredicatePosition(possibleIdentifier) === symbol) {
-                        return getNarrowedType(type, predicate.type, assumeTrue);
+                    var invokedExpression = skipParenthesizedNodes(callExpression.expression);
+                    if (invokedExpression.kind === 172 /* ElementAccessExpression */ || invokedExpression.kind === 171 /* PropertyAccessExpression */) {
+                        var accessExpression = invokedExpression;
+                        var possibleReference = skipParenthesizedNodes(accessExpression.expression);
+                        if (isMatchingReference(possibleReference, reference)) {
+                            return getNarrowedType(type, predicate.type, assumeTrue);
+                        }
                     }
                 }
                 return type;
             }
-            function getSymbolAtTypePredicatePosition(expr) {
-                expr = skipParenthesizedNodes(expr);
-                switch (expr.kind) {
-                    case 69 /* Identifier */:
-                    case 169 /* PropertyAccessExpression */:
-                    case 136 /* QualifiedName */:
-                        return getSymbolOfEntityNameOrPropertyAccessExpression(expr);
-                }
-            }
             // Narrow the given type based on the given expression having the assumed boolean value. The returned type
             // will be a subtype or the same type as the argument.
             function narrowType(type, expr, assumeTrue) {
                 switch (expr.kind) {
-                    case 171 /* CallExpression */:
+                    case 69 /* Identifier */:
+                    case 97 /* ThisKeyword */:
+                    case 171 /* PropertyAccessExpression */:
+                        return narrowTypeByTruthiness(type, expr, assumeTrue);
+                    case 173 /* CallExpression */:
                         return narrowTypeByTypePredicate(type, expr, assumeTrue);
-                    case 175 /* ParenthesizedExpression */:
+                    case 177 /* ParenthesizedExpression */:
                         return narrowType(type, expr.expression, assumeTrue);
-                    case 184 /* BinaryExpression */:
-                        var operator = expr.operatorToken.kind;
-                        if (operator === 32 /* EqualsEqualsEqualsToken */ || operator === 33 /* ExclamationEqualsEqualsToken */) {
-                            return narrowTypeByEquality(type, expr, assumeTrue);
-                        }
-                        else if (operator === 51 /* AmpersandAmpersandToken */) {
-                            return narrowTypeByAnd(type, expr, assumeTrue);
-                        }
-                        else if (operator === 52 /* BarBarToken */) {
-                            return narrowTypeByOr(type, expr, assumeTrue);
-                        }
-                        else if (operator === 91 /* InstanceOfKeyword */) {
-                            return narrowTypeByInstanceof(type, expr, assumeTrue);
-                        }
-                        break;
-                    case 182 /* PrefixUnaryExpression */:
+                    case 186 /* BinaryExpression */:
+                        return narrowTypeByBinaryExpression(type, expr, assumeTrue);
+                    case 184 /* PrefixUnaryExpression */:
                         if (expr.operator === 49 /* ExclamationToken */) {
                             return narrowType(type, expr.operand, !assumeTrue);
                         }
                         break;
-                    case 170 /* ElementAccessExpression */:
-                    case 169 /* PropertyAccessExpression */:
-                        return narrowTypeByTypePredicateMember(type, expr, assumeTrue);
                 }
                 return type;
             }
         }
+        function getTypeOfSymbolAtLocation(symbol, location) {
+            // The language service will always care about the narrowed type of a symbol, because that is
+            // the type the language says the symbol should have.
+            var type = getTypeOfSymbol(symbol);
+            if (location.kind === 69 /* Identifier */) {
+                if (ts.isRightSideOfQualifiedNameOrPropertyAccess(location)) {
+                    location = location.parent;
+                }
+                // If location is an identifier or property access that references the given
+                // symbol, use the location as the reference with respect to which we narrow.
+                if (ts.isExpression(location)) {
+                    checkExpression(location);
+                    if (getNodeLinks(location).resolvedSymbol === symbol) {
+                        return getNarrowedTypeOfReference(type, location);
+                    }
+                }
+            }
+            // 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. To answer that question we manufacture a transient
+            // identifier at the location and narrow with respect to that identifier.
+            return getNarrowedTypeOfReference(type, createTransientIdentifier(symbol, location));
+        }
         function skipParenthesizedNodes(expression) {
-            while (expression.kind === 175 /* ParenthesizedExpression */) {
+            while (expression.kind === 177 /* ParenthesizedExpression */) {
                 expression = expression.expression;
             }
             return expression;
         }
+        function findFirstAssignment(symbol, container) {
+            return visit(ts.isFunctionLike(container) ? container.body : container);
+            function visit(node) {
+                switch (node.kind) {
+                    case 69 /* Identifier */:
+                        var assignment = getAssignmentRoot(node);
+                        return assignment && getResolvedSymbol(node) === symbol ? assignment : undefined;
+                    case 186 /* BinaryExpression */:
+                    case 217 /* VariableDeclaration */:
+                    case 168 /* BindingElement */:
+                    case 166 /* ObjectBindingPattern */:
+                    case 167 /* ArrayBindingPattern */:
+                    case 169 /* ArrayLiteralExpression */:
+                    case 170 /* ObjectLiteralExpression */:
+                    case 171 /* PropertyAccessExpression */:
+                    case 172 /* ElementAccessExpression */:
+                    case 173 /* CallExpression */:
+                    case 174 /* NewExpression */:
+                    case 176 /* TypeAssertionExpression */:
+                    case 194 /* AsExpression */:
+                    case 195 /* NonNullExpression */:
+                    case 177 /* ParenthesizedExpression */:
+                    case 184 /* PrefixUnaryExpression */:
+                    case 180 /* DeleteExpression */:
+                    case 183 /* AwaitExpression */:
+                    case 181 /* TypeOfExpression */:
+                    case 182 /* VoidExpression */:
+                    case 185 /* PostfixUnaryExpression */:
+                    case 189 /* YieldExpression */:
+                    case 187 /* ConditionalExpression */:
+                    case 190 /* SpreadElementExpression */:
+                    case 199 /* VariableStatement */:
+                    case 201 /* ExpressionStatement */:
+                    case 202 /* IfStatement */:
+                    case 203 /* DoStatement */:
+                    case 204 /* WhileStatement */:
+                    case 205 /* ForStatement */:
+                    case 206 /* ForInStatement */:
+                    case 207 /* ForOfStatement */:
+                    case 210 /* ReturnStatement */:
+                    case 211 /* WithStatement */:
+                    case 212 /* SwitchStatement */:
+                    case 226 /* CaseBlock */:
+                    case 248 /* CaseClause */:
+                    case 249 /* DefaultClause */:
+                    case 213 /* LabeledStatement */:
+                    case 214 /* ThrowStatement */:
+                    case 215 /* TryStatement */:
+                    case 251 /* CatchClause */:
+                    case 240 /* JsxElement */:
+                    case 241 /* JsxSelfClosingElement */:
+                    case 245 /* JsxAttribute */:
+                    case 246 /* JsxSpreadAttribute */:
+                    case 242 /* JsxOpeningElement */:
+                    case 247 /* JsxExpression */:
+                    case 198 /* Block */:
+                    case 255 /* SourceFile */:
+                        return ts.forEachChild(node, visit);
+                }
+                return undefined;
+            }
+        }
+        function checkVariableAssignedBefore(symbol, reference) {
+            if (!(symbol.flags & 3 /* Variable */)) {
+                return;
+            }
+            var declaration = symbol.valueDeclaration;
+            if (!declaration || declaration.kind !== 217 /* VariableDeclaration */ || declaration.initializer || ts.isInAmbientContext(declaration)) {
+                return;
+            }
+            var parentParentKind = declaration.parent.parent.kind;
+            if (parentParentKind === 207 /* ForOfStatement */ || parentParentKind === 206 /* ForInStatement */) {
+                return;
+            }
+            var declarationContainer = ts.getContainingFunction(declaration) || ts.getSourceFileOfNode(declaration);
+            var referenceContainer = ts.getContainingFunction(reference) || ts.getSourceFileOfNode(reference);
+            if (declarationContainer !== referenceContainer) {
+                return;
+            }
+            var links = getSymbolLinks(symbol);
+            if (!links.firstAssignmentChecked) {
+                links.firstAssignmentChecked = true;
+                links.firstAssignment = findFirstAssignment(symbol, declarationContainer);
+            }
+            if (links.firstAssignment && links.firstAssignment.end <= reference.pos) {
+                return;
+            }
+            error(reference, ts.Diagnostics.Variable_0_is_used_before_being_assigned, symbolToString(symbol));
+        }
         function checkIdentifier(node) {
             var symbol = getResolvedSymbol(node);
             // As noted in ECMAScript 6 language spec, arrow functions never have an arguments objects.
@@ -20824,23 +22156,44 @@ var ts;
             // can explicitly bound arguments objects
             if (symbol === argumentsSymbol) {
                 var container = ts.getContainingFunction(node);
-                if (container.kind === 177 /* ArrowFunction */) {
+                if (container.kind === 179 /* ArrowFunction */) {
                     if (languageVersion < 2 /* ES6 */) {
                         error(node, ts.Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression);
                     }
                 }
-                if (node.parserContextFlags & 8 /* Await */) {
-                    getNodeLinks(container).flags |= 4096 /* CaptureArguments */;
-                    getNodeLinks(node).flags |= 2048 /* LexicalArguments */;
+                if (node.flags & 33554432 /* AwaitContext */) {
+                    getNodeLinks(container).flags |= 8192 /* CaptureArguments */;
                 }
             }
             if (symbol.flags & 8388608 /* Alias */ && !isInTypeQuery(node) && !isConstEnumOrConstEnumOnlyModule(resolveAlias(symbol))) {
                 markAliasSymbolAsReferenced(symbol);
             }
+            var 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 === 2 /* ES6 */
+                && localOrExportSymbol.flags & 32 /* Class */
+                && localOrExportSymbol.valueDeclaration.kind === 220 /* ClassDeclaration */
+                && ts.nodeIsDecorated(localOrExportSymbol.valueDeclaration)) {
+                var container = ts.getContainingClass(node);
+                while (container !== undefined) {
+                    if (container === localOrExportSymbol.valueDeclaration && container.name !== node) {
+                        getNodeLinks(container).flags |= 524288 /* ClassWithBodyScopedClassBinding */;
+                        getNodeLinks(node).flags |= 1048576 /* BodyScopedClassBinding */;
+                        break;
+                    }
+                    container = ts.getContainingClass(container);
+                }
+            }
             checkCollisionWithCapturedSuperVariable(node, node);
             checkCollisionWithCapturedThisVariable(node, node);
-            checkBlockScopedBindingCapturedInLoop(node, symbol);
-            return getNarrowedTypeOfSymbol(getExportSymbolOfValueSymbolIfExported(symbol), node);
+            checkNestedBlockScopedBinding(node, symbol);
+            var type = getTypeOfSymbol(localOrExportSymbol);
+            if (strictNullChecks && !isAssignmentTarget(node) && !(type.flags & 1 /* Any */) && !(getNullableKind(type) & 32 /* Undefined */)) {
+                checkVariableAssignedBefore(symbol, node);
+            }
+            return getNarrowedTypeOfReference(type, node);
         }
         function isInsideFunction(node, threshold) {
             var current = node;
@@ -20852,52 +22205,79 @@ var ts;
             }
             return false;
         }
-        function checkBlockScopedBindingCapturedInLoop(node, symbol) {
+        function checkNestedBlockScopedBinding(node, symbol) {
             if (languageVersion >= 2 /* ES6 */ ||
                 (symbol.flags & (2 /* BlockScopedVariable */ | 32 /* Class */)) === 0 ||
-                symbol.valueDeclaration.parent.kind === 247 /* CatchClause */) {
+                symbol.valueDeclaration.parent.kind === 251 /* CatchClause */) {
                 return;
             }
             // 1. walk from the use site up to the declaration and check
             // if there is anything function like between declaration and use-site (is binding/class is captured in function).
             // 2. walk from the declaration up to the boundary of lexical environment and check
             // if there is an iteration statement in between declaration and boundary (is binding/class declared inside iteration statement)
-            var container;
-            if (symbol.flags & 32 /* Class */) {
-                // get parent of class declaration
-                container = getClassLikeDeclarationOfSymbol(symbol).parent;
-            }
-            else {
-                // nesting structure:
-                // (variable declaration or binding element) -> variable declaration list -> container
-                container = symbol.valueDeclaration;
-                while (container.kind !== 215 /* VariableDeclarationList */) {
-                    container = container.parent;
-                }
-                // get the parent of variable declaration list
-                container = container.parent;
-                if (container.kind === 196 /* VariableStatement */) {
-                    // if parent is variable statement - get its parent
-                    container = container.parent;
-                }
-            }
-            var inFunction = isInsideFunction(node.parent, container);
+            var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
+            var usedInFunction = isInsideFunction(node.parent, container);
             var current = container;
+            var containedInIterationStatement = false;
             while (current && !ts.nodeStartsNewLexicalEnvironment(current)) {
                 if (ts.isIterationStatement(current, /*lookInLabeledStatements*/ false)) {
-                    if (inFunction) {
-                        getNodeLinks(current).flags |= 65536 /* LoopWithBlockScopedBindingCapturedInFunction */;
-                    }
-                    // mark value declaration so during emit they can have a special handling
-                    getNodeLinks(symbol.valueDeclaration).flags |= 16384 /* BlockScopedBindingInLoop */;
+                    containedInIterationStatement = true;
                     break;
                 }
                 current = current.parent;
             }
+            if (containedInIterationStatement) {
+                if (usedInFunction) {
+                    // mark iteration statement as containing block-scoped binding captured in some function
+                    getNodeLinks(current).flags |= 65536 /* LoopWithCapturedBlockScopedBinding */;
+                }
+                // mark variables that are declared in loop initializer and reassigned inside the body of ForStatement.
+                // if body of ForStatement will be converted to function then we'll need a extra machinery to propagate reassigned values back.
+                if (container.kind === 205 /* ForStatement */ &&
+                    ts.getAncestor(symbol.valueDeclaration, 218 /* VariableDeclarationList */).parent === container &&
+                    isAssignedInBodyOfForStatement(node, container)) {
+                    getNodeLinks(symbol.valueDeclaration).flags |= 2097152 /* NeedsLoopOutParameter */;
+                }
+                // set 'declared inside loop' bit on the block-scoped binding
+                getNodeLinks(symbol.valueDeclaration).flags |= 262144 /* BlockScopedBindingInLoop */;
+            }
+            if (usedInFunction) {
+                getNodeLinks(symbol.valueDeclaration).flags |= 131072 /* CapturedBlockScopedBinding */;
+            }
+        }
+        function isAssignedInBodyOfForStatement(node, container) {
+            var current = node;
+            // skip parenthesized nodes
+            while (current.parent.kind === 177 /* ParenthesizedExpression */) {
+                current = current.parent;
+            }
+            // check if node is used as LHS in some assignment expression
+            var isAssigned = false;
+            if (isAssignmentTarget(current)) {
+                isAssigned = true;
+            }
+            else if ((current.parent.kind === 184 /* PrefixUnaryExpression */ || current.parent.kind === 185 /* PostfixUnaryExpression */)) {
+                var expr = current.parent;
+                isAssigned = expr.operator === 41 /* PlusPlusToken */ || expr.operator === 42 /* MinusMinusToken */;
+            }
+            if (!isAssigned) {
+                return false;
+            }
+            // at this point we know that node is the target of assignment
+            // now check that modification happens inside the statement part of the ForStatement
+            while (current !== container) {
+                if (current === container.statement) {
+                    return true;
+                }
+                else {
+                    current = current.parent;
+                }
+            }
+            return false;
         }
         function captureLexicalThis(node, container) {
             getNodeLinks(node).flags |= 2 /* LexicalThis */;
-            if (container.kind === 142 /* PropertyDeclaration */ || container.kind === 145 /* Constructor */) {
+            if (container.kind === 144 /* PropertyDeclaration */ || container.kind === 147 /* Constructor */) {
                 var classNode = container.parent;
                 getNodeLinks(classNode).flags |= 4 /* CaptureThis */;
             }
@@ -20905,80 +22285,173 @@ var ts;
                 getNodeLinks(container).flags |= 4 /* CaptureThis */;
             }
         }
+        function findFirstSuperCall(n) {
+            if (ts.isSuperCallExpression(n)) {
+                return n;
+            }
+            else if (ts.isFunctionLike(n)) {
+                return undefined;
+            }
+            return ts.forEachChild(n, findFirstSuperCall);
+        }
+        /**
+         * Return a cached result if super-statement is already found.
+         * Otherwise, find a super statement in a given constructor function and cache the result in the node-links of the constructor
+         *
+         * @param constructor constructor-function to look for super statement
+         */
+        function getSuperCallInConstructor(constructor) {
+            var links = getNodeLinks(constructor);
+            // Only trying to find super-call if we haven't yet tried to find one.  Once we try, we will record the result
+            if (links.hasSuperCall === undefined) {
+                links.superCall = findFirstSuperCall(constructor.body);
+                links.hasSuperCall = links.superCall ? true : false;
+            }
+            return links.superCall;
+        }
+        /**
+         * Check if the given class-declaration extends null then return true.
+         * Otherwise, return false
+         * @param classDecl a class declaration to check if it extends null
+         */
+        function classDeclarationExtendsNull(classDecl) {
+            var classSymbol = getSymbolOfNode(classDecl);
+            var classInstanceType = getDeclaredTypeOfSymbol(classSymbol);
+            var baseConstructorType = getBaseConstructorTypeOfClass(classInstanceType);
+            return baseConstructorType === nullType;
+        }
         function checkThisExpression(node) {
             // Stop at the first arrow function so that we can
             // tell whether 'this' needs to be captured.
             var container = ts.getThisContainer(node, /* includeArrowFunctions */ true);
             var needToCaptureLexicalThis = false;
+            if (container.kind === 147 /* Constructor */) {
+                var containingClassDecl = container.parent;
+                var baseTypeNode = ts.getClassExtendsHeritageClauseElement(containingClassDecl);
+                // If a containing class does not have extends clause or the class extends null
+                // skip checking whether super statement is called before "this" accessing.
+                if (baseTypeNode && !classDeclarationExtendsNull(containingClassDecl)) {
+                    var superCall = getSuperCallInConstructor(container);
+                    // We should give an error in the following cases:
+                    //      - No super-call
+                    //      - "this" is accessing before super-call.
+                    //          i.e super(this)
+                    //              this.x; super();
+                    // We want to make sure that super-call is done before accessing "this" so that
+                    // "this" is not accessed as a parameter of the super-call.
+                    if (!superCall || superCall.end > node.pos) {
+                        // In ES6, super inside constructor of class-declaration has to precede "this" accessing
+                        error(node, ts.Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class);
+                    }
+                }
+            }
             // Now skip arrow functions to get the "real" owner of 'this'.
-            if (container.kind === 177 /* ArrowFunction */) {
+            if (container.kind === 179 /* ArrowFunction */) {
                 container = ts.getThisContainer(container, /* includeArrowFunctions */ false);
                 // When targeting es6, arrow function lexically bind "this" so we do not need to do the work of binding "this" in emitted code
                 needToCaptureLexicalThis = (languageVersion < 2 /* ES6 */);
             }
             switch (container.kind) {
-                case 221 /* ModuleDeclaration */:
+                case 224 /* ModuleDeclaration */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_module_or_namespace_body);
                     // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     break;
-                case 220 /* EnumDeclaration */:
+                case 223 /* EnumDeclaration */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
                     // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     break;
-                case 145 /* Constructor */:
+                case 147 /* Constructor */:
                     if (isInConstructorArgumentInitializer(node, container)) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_constructor_arguments);
                     }
                     break;
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
-                    if (container.flags & 64 /* Static */) {
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
+                    if (container.flags & 32 /* Static */) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_static_property_initializer);
                     }
                     break;
-                case 137 /* ComputedPropertyName */:
+                case 139 /* ComputedPropertyName */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_computed_property_name);
                     break;
             }
             if (needToCaptureLexicalThis) {
                 captureLexicalThis(node, container);
             }
-            if (ts.isClassLike(container.parent)) {
-                var symbol = getSymbolOfNode(container.parent);
-                return container.flags & 64 /* Static */ ? getTypeOfSymbol(symbol) : getDeclaredTypeOfSymbol(symbol).thisType;
-            }
-            // If this is a function in a JS file, it might be a class method. Check if it's the RHS
-            // of a x.prototype.y = function [name]() { .... }
-            if (ts.isInJavaScriptFile(node) && container.kind === 176 /* FunctionExpression */) {
-                if (ts.getSpecialPropertyAssignmentKind(container.parent) === 3 /* PrototypeProperty */) {
-                    // Get the 'x' of 'x.prototype.y = f' (here, 'f' is 'container')
-                    var className = container.parent // x.protoype.y = f
-                        .left // x.prototype.y
-                        .expression // x.prototype
-                        .expression; // x
-                    var classSymbol = checkExpression(className).symbol;
-                    if (classSymbol && classSymbol.members && (classSymbol.flags & 16 /* Function */)) {
-                        return getInferredClassType(classSymbol);
+            if (ts.isFunctionLike(container)) {
+                var type = getContextuallyTypedThisType(container);
+                if (type) {
+                    return type;
+                }
+                var signature = getSignatureFromDeclaration(container);
+                if (signature.thisType) {
+                    return signature.thisType;
+                }
+                if (container.parent && container.parent.kind === 170 /* ObjectLiteralExpression */) {
+                    // Note: this works because object literal methods are deferred,
+                    // which means that the type of the containing object literal is already known.
+                    var type_1 = checkExpressionCached(container.parent);
+                    if (type_1) {
+                        return type_1;
                     }
                 }
             }
+            if (ts.isClassLike(container.parent)) {
+                var symbol = getSymbolOfNode(container.parent);
+                var type = container.flags & 32 /* Static */ ? getTypeOfSymbol(symbol) : getDeclaredTypeOfSymbol(symbol).thisType;
+                return getNarrowedTypeOfReference(type, node);
+            }
+            if (ts.isInJavaScriptFile(node)) {
+                var type = getTypeForThisExpressionFromJSDoc(container);
+                if (type && type !== unknownType) {
+                    return type;
+                }
+                // If this is a function in a JS file, it might be a class method. Check if it's the RHS
+                // of a x.prototype.y = function [name]() { .... }
+                if (container.kind === 178 /* FunctionExpression */) {
+                    if (ts.getSpecialPropertyAssignmentKind(container.parent) === 3 /* PrototypeProperty */) {
+                        // Get the 'x' of 'x.prototype.y = f' (here, 'f' is 'container')
+                        var className = container.parent // x.prototype.y = f
+                            .left // x.prototype.y
+                            .expression // x.prototype
+                            .expression; // x
+                        var classSymbol = checkExpression(className).symbol;
+                        if (classSymbol && classSymbol.members && (classSymbol.flags & 16 /* Function */)) {
+                            return getInferredClassType(classSymbol);
+                        }
+                    }
+                }
+            }
+            if (compilerOptions.noImplicitThis) {
+                // With noImplicitThis, functions may not reference 'this' if it has type 'any'
+                error(node, ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation);
+            }
             return anyType;
         }
+        function getTypeForThisExpressionFromJSDoc(node) {
+            var typeTag = ts.getJSDocTypeTag(node);
+            if (typeTag && typeTag.typeExpression && typeTag.typeExpression.type && typeTag.typeExpression.type.kind === 268 /* JSDocFunctionType */) {
+                var jsDocFunctionType = typeTag.typeExpression.type;
+                if (jsDocFunctionType.parameters.length > 0 && jsDocFunctionType.parameters[0].type.kind === 271 /* JSDocThisType */) {
+                    return getTypeFromTypeNode(jsDocFunctionType.parameters[0].type);
+                }
+            }
+        }
         function isInConstructorArgumentInitializer(node, constructorDecl) {
             for (var n = node; n && n !== constructorDecl; n = n.parent) {
-                if (n.kind === 139 /* Parameter */) {
+                if (n.kind === 141 /* Parameter */) {
                     return true;
                 }
             }
             return false;
         }
         function checkSuperExpression(node) {
-            var isCallExpression = node.parent.kind === 171 /* CallExpression */ && node.parent.expression === node;
+            var isCallExpression = node.parent.kind === 173 /* CallExpression */ && node.parent.expression === node;
             var container = ts.getSuperContainer(node, /*stopOnFunctions*/ true);
             var needToCaptureLexicalThis = false;
             if (!isCallExpression) {
                 // adjust the container reference in case if super is used inside arrow functions with arbitrary deep nesting
-                while (container && container.kind === 177 /* ArrowFunction */) {
+                while (container && container.kind === 179 /* ArrowFunction */) {
                     container = ts.getSuperContainer(container, /*stopOnFunctions*/ true);
                     needToCaptureLexicalThis = languageVersion < 2 /* ES6 */;
                 }
@@ -20992,16 +22465,16 @@ var ts;
                 //     [super.foo()]() {}
                 // }
                 var current = node;
-                while (current && current !== container && current.kind !== 137 /* ComputedPropertyName */) {
+                while (current && current !== container && current.kind !== 139 /* ComputedPropertyName */) {
                     current = current.parent;
                 }
-                if (current && current.kind === 137 /* ComputedPropertyName */) {
+                if (current && current.kind === 139 /* ComputedPropertyName */) {
                     error(node, ts.Diagnostics.super_cannot_be_referenced_in_a_computed_property_name);
                 }
                 else if (isCallExpression) {
                     error(node, ts.Diagnostics.Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors);
                 }
-                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 168 /* ObjectLiteralExpression */)) {
+                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 170 /* ObjectLiteralExpression */)) {
                     error(node, ts.Diagnostics.super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions);
                 }
                 else {
@@ -21009,20 +22482,84 @@ var ts;
                 }
                 return unknownType;
             }
-            if ((container.flags & 64 /* Static */) || isCallExpression) {
+            if ((container.flags & 32 /* Static */) || isCallExpression) {
                 nodeCheckFlag = 512 /* SuperStatic */;
             }
             else {
                 nodeCheckFlag = 256 /* SuperInstance */;
             }
             getNodeLinks(node).flags |= nodeCheckFlag;
+            // Due to how we emit async functions, we need to specialize the emit for an async method that contains a `super` reference.
+            // This is due to the fact that we emit the body of an async function inside of a generator function. As generator
+            // functions cannot reference `super`, we emit a helper inside of the method body, but outside of the generator. This helper
+            // uses an arrow function, which is permitted to reference `super`.
+            //
+            // There are two primary ways we can access `super` from within an async method. The first is getting the value of a property
+            // or indexed access on super, either as part of a right-hand-side expression or call expression. The second is when setting the value
+            // of a property or indexed access, either as part of an assignment expression or destructuring assignment.
+            //
+            // The simplest case is reading a value, in which case we will emit something like the following:
+            //
+            //  // ts
+            //  ...
+            //  async asyncMethod() {
+            //    let x = await super.asyncMethod();
+            //    return x;
+            //  }
+            //  ...
+            //
+            //  // js
+            //  ...
+            //  asyncMethod() {
+            //      const _super = name => super[name];
+            //      return __awaiter(this, arguments, Promise, function *() {
+            //          let x = yield _super("asyncMethod").call(this);
+            //          return x;
+            //      });
+            //  }
+            //  ...
+            //
+            // The more complex case is when we wish to assign a value, especially as part of a destructuring assignment. As both cases
+            // are legal in ES6, but also likely less frequent, we emit the same more complex helper for both scenarios:
+            //
+            //  // ts
+            //  ...
+            //  async asyncMethod(ar: Promise<any[]>) {
+            //      [super.a, super.b] = await ar;
+            //  }
+            //  ...
+            //
+            //  // js
+            //  ...
+            //  asyncMethod(ar) {
+            //      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 __awaiter(this, arguments, Promise, function *() {
+            //          [_super("a").value, _super("b").value] = yield ar;
+            //      });
+            //  }
+            //  ...
+            //
+            // 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 === 146 /* MethodDeclaration */ && container.flags & 256 /* Async */) {
+                if (ts.isSuperPropertyOrElementAccess(node.parent) && isAssignmentTarget(node.parent)) {
+                    getNodeLinks(container).flags |= 4096 /* AsyncMethodWithSuperBinding */;
+                }
+                else {
+                    getNodeLinks(container).flags |= 2048 /* AsyncMethodWithSuper */;
+                }
+            }
             if (needToCaptureLexicalThis) {
                 // call expressions are allowed only in constructors so they should always capture correct 'this'
                 // super property access expressions can also appear in arrow functions -
                 // in this case they should also use correct lexical this
                 captureLexicalThis(node.parent, container);
             }
-            if (container.parent.kind === 168 /* ObjectLiteralExpression */) {
+            if (container.parent.kind === 170 /* ObjectLiteralExpression */) {
                 if (languageVersion < 2 /* ES6 */) {
                     error(node, ts.Diagnostics.super_is_only_allowed_in_members_of_object_literal_expressions_when_option_target_is_ES2015_or_higher);
                     return unknownType;
@@ -21042,7 +22579,7 @@ var ts;
                 }
                 return unknownType;
             }
-            if (container.kind === 145 /* Constructor */ && isInConstructorArgumentInitializer(node, container)) {
+            if (container.kind === 147 /* Constructor */ && isInConstructorArgumentInitializer(node, container)) {
                 // issue custom error message for super property access in constructor arguments (to be aligned with old compiler)
                 error(node, ts.Diagnostics.super_cannot_be_referenced_in_constructor_arguments);
                 return unknownType;
@@ -21057,7 +22594,7 @@ var ts;
                 if (isCallExpression) {
                     // TS 1.0 SPEC (April 2014): 4.8.1
                     // Super calls are only permitted in constructors of derived classes
-                    return container.kind === 145 /* Constructor */;
+                    return container.kind === 147 /* Constructor */;
                 }
                 else {
                     // TS 1.0 SPEC (April 2014)
@@ -21065,27 +22602,38 @@ var ts;
                     // - In a constructor, instance member function, instance member accessor, or instance member variable initializer where this references a derived class instance
                     // - In a static member function or static member accessor
                     // topmost container must be something that is directly nested in the class declaration\object literal expression
-                    if (ts.isClassLike(container.parent) || container.parent.kind === 168 /* ObjectLiteralExpression */) {
-                        if (container.flags & 64 /* Static */) {
-                            return container.kind === 144 /* MethodDeclaration */ ||
-                                container.kind === 143 /* MethodSignature */ ||
-                                container.kind === 146 /* GetAccessor */ ||
-                                container.kind === 147 /* SetAccessor */;
+                    if (ts.isClassLike(container.parent) || container.parent.kind === 170 /* ObjectLiteralExpression */) {
+                        if (container.flags & 32 /* Static */) {
+                            return container.kind === 146 /* MethodDeclaration */ ||
+                                container.kind === 145 /* MethodSignature */ ||
+                                container.kind === 148 /* GetAccessor */ ||
+                                container.kind === 149 /* SetAccessor */;
                         }
                         else {
-                            return container.kind === 144 /* MethodDeclaration */ ||
-                                container.kind === 143 /* MethodSignature */ ||
-                                container.kind === 146 /* GetAccessor */ ||
-                                container.kind === 147 /* SetAccessor */ ||
-                                container.kind === 142 /* PropertyDeclaration */ ||
-                                container.kind === 141 /* PropertySignature */ ||
-                                container.kind === 145 /* Constructor */;
+                            return container.kind === 146 /* MethodDeclaration */ ||
+                                container.kind === 145 /* MethodSignature */ ||
+                                container.kind === 148 /* GetAccessor */ ||
+                                container.kind === 149 /* SetAccessor */ ||
+                                container.kind === 144 /* PropertyDeclaration */ ||
+                                container.kind === 143 /* PropertySignature */ ||
+                                container.kind === 147 /* Constructor */;
                         }
                     }
                 }
                 return false;
             }
         }
+        function getContextuallyTypedThisType(func) {
+            if ((isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) &&
+                isContextSensitive(func) &&
+                func.kind !== 179 /* ArrowFunction */) {
+                var contextualSignature = getContextualSignature(func);
+                if (contextualSignature) {
+                    return contextualSignature.thisType;
+                }
+            }
+            return undefined;
+        }
         // Return contextual type of parameter or undefined if no contextual type is available
         function getContextuallyTypedParameterType(parameter) {
             var func = parameter.parent;
@@ -21110,18 +22658,21 @@ var ts;
             }
             return undefined;
         }
-        // In a variable, parameter or property declaration with a type annotation, the contextual type of an initializer
-        // expression is the type of the variable, parameter or property. Otherwise, in a parameter declaration of a
-        // contextually typed function expression, the contextual type of an initializer expression is the contextual type
-        // of the parameter. Otherwise, in a variable or parameter declaration with a binding pattern name, the contextual
-        // type of an initializer expression is the type implied by the binding pattern.
+        // In a variable, parameter or property declaration with a type annotation,
+        //   the contextual type of an initializer expression is the type of the variable, parameter or property. 
+        // Otherwise, in a parameter declaration of a contextually typed function expression, 
+        //   the contextual type of an initializer expression is the contextual type of the parameter. 
+        // Otherwise, in a variable or parameter declaration with a binding pattern name,
+        //   the contextual type of an initializer expression is the type implied by the binding pattern.
+        // Otherwise, in a binding pattern inside a variable or parameter declaration,
+        //   the contextual type of an initializer expression is the type annotation of the containing declaration, if present.
         function getContextualTypeForInitializerExpression(node) {
             var declaration = node.parent;
             if (node === declaration.initializer) {
                 if (declaration.type) {
                     return getTypeFromTypeNode(declaration.type);
                 }
-                if (declaration.kind === 139 /* Parameter */) {
+                if (declaration.kind === 141 /* Parameter */) {
                     var type = getContextuallyTypedParameterType(declaration);
                     if (type) {
                         return type;
@@ -21130,6 +22681,18 @@ var ts;
                 if (ts.isBindingPattern(declaration.name)) {
                     return getTypeFromBindingPattern(declaration.name, /*includePatternInType*/ true);
                 }
+                if (ts.isBindingPattern(declaration.parent)) {
+                    var parentDeclaration = declaration.parent.parent;
+                    var name_11 = declaration.propertyName || declaration.name;
+                    if (ts.isVariableLike(parentDeclaration) &&
+                        parentDeclaration.type &&
+                        !ts.isBindingPattern(name_11)) {
+                        var text = getTextOfPropertyName(name_11);
+                        if (text) {
+                            return getTypeOfPropertyOfType(getTypeFromTypeNode(parentDeclaration.type), text);
+                        }
+                    }
+                }
             }
             return undefined;
         }
@@ -21154,7 +22717,7 @@ var ts;
         }
         function isInParameterInitializerBeforeContainingFunction(node) {
             while (node.parent && !ts.isFunctionLike(node.parent)) {
-                if (node.parent.kind === 139 /* Parameter */ && node.parent.initializer === node) {
+                if (node.parent.kind === 141 /* Parameter */ && node.parent.initializer === node) {
                     return true;
                 }
                 node = node.parent;
@@ -21165,8 +22728,8 @@ var ts;
             // If the containing function has a return type annotation, is a constructor, or is a get accessor whose
             // corresponding set accessor has a type annotation, return statements in the function are contextually typed
             if (functionDecl.type ||
-                functionDecl.kind === 145 /* Constructor */ ||
-                functionDecl.kind === 146 /* GetAccessor */ && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(functionDecl.symbol, 147 /* SetAccessor */))) {
+                functionDecl.kind === 147 /* Constructor */ ||
+                functionDecl.kind === 148 /* GetAccessor */ && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(functionDecl.symbol, 149 /* SetAccessor */))) {
                 return getReturnTypeOfSignature(getSignatureFromDeclaration(functionDecl));
             }
             // Otherwise, if the containing function is contextually typed by a function type with exactly one call signature
@@ -21188,7 +22751,7 @@ var ts;
             return undefined;
         }
         function getContextualTypeForSubstitutionExpression(template, substitutionExpression) {
-            if (template.parent.kind === 173 /* TaggedTemplateExpression */) {
+            if (template.parent.kind === 175 /* TaggedTemplateExpression */) {
                 return getContextualTypeForArgument(template.parent, substitutionExpression);
             }
             return undefined;
@@ -21261,10 +22824,6 @@ var ts;
         function contextualTypeIsTupleLikeType(type) {
             return !!(type.flags & 16384 /* Union */ ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type));
         }
-        // Return true if the given contextual type provides an index signature of the given kind
-        function contextualTypeHasIndexSignature(type, kind) {
-            return !!(type.flags & 16384 /* Union */ ? ts.forEach(type.types, function (t) { return getIndexTypeOfStructuredType(t, kind); }) : getIndexTypeOfStructuredType(type, kind));
-        }
         // In an object literal contextually typed by a type T, the contextual type of a property assignment is the type of
         // the matching property in T, if one exists. Otherwise, it is the type of the numeric index signature in T, if one
         // exists. Otherwise, it is the type of the string index signature in T, if one exists.
@@ -21319,13 +22878,13 @@ var ts;
             var kind = attribute.kind;
             var jsxElement = attribute.parent;
             var attrsType = getJsxElementAttributesType(jsxElement);
-            if (attribute.kind === 241 /* JsxAttribute */) {
+            if (attribute.kind === 245 /* JsxAttribute */) {
                 if (!attrsType || isTypeAny(attrsType)) {
                     return undefined;
                 }
                 return getTypeOfPropertyOfType(attrsType, attribute.name.text);
             }
-            else if (attribute.kind === 242 /* JsxSpreadAttribute */) {
+            else if (attribute.kind === 246 /* JsxSpreadAttribute */) {
                 return attrsType;
             }
             ts.Debug.fail("Expected JsxAttribute or JsxSpreadAttribute, got ts.SyntaxKind[" + kind + "]");
@@ -21345,7 +22904,7 @@ var ts;
          * Otherwise this may not be very useful.
          *
          * In cases where you *are* working on this function, you should understand
-         * when it is appropriate to use 'getContextualType' and 'getApparentTypeOfContetxualType'.
+         * when it is appropriate to use 'getContextualType' and 'getApparentTypeOfContextualType'.
          *
          *   - Use 'getContextualType' when you are simply going to propagate the result to the expression.
          *   - Use 'getApparentTypeOfContextualType' when you're going to need the members of the type.
@@ -21363,40 +22922,40 @@ var ts;
             }
             var parent = node.parent;
             switch (parent.kind) {
-                case 214 /* VariableDeclaration */:
-                case 139 /* Parameter */:
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
-                case 166 /* BindingElement */:
+                case 217 /* VariableDeclaration */:
+                case 141 /* Parameter */:
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
+                case 168 /* BindingElement */:
                     return getContextualTypeForInitializerExpression(node);
-                case 177 /* ArrowFunction */:
-                case 207 /* ReturnStatement */:
+                case 179 /* ArrowFunction */:
+                case 210 /* ReturnStatement */:
                     return getContextualTypeForReturnExpression(node);
-                case 187 /* YieldExpression */:
+                case 189 /* YieldExpression */:
                     return getContextualTypeForYieldOperand(parent);
-                case 171 /* CallExpression */:
-                case 172 /* NewExpression */:
+                case 173 /* CallExpression */:
+                case 174 /* NewExpression */:
                     return getContextualTypeForArgument(parent, node);
-                case 174 /* TypeAssertionExpression */:
-                case 192 /* AsExpression */:
+                case 176 /* TypeAssertionExpression */:
+                case 194 /* AsExpression */:
                     return getTypeFromTypeNode(parent.type);
-                case 184 /* BinaryExpression */:
+                case 186 /* BinaryExpression */:
                     return getContextualTypeForBinaryOperand(node);
-                case 248 /* PropertyAssignment */:
+                case 252 /* PropertyAssignment */:
                     return getContextualTypeForObjectLiteralElement(parent);
-                case 167 /* ArrayLiteralExpression */:
+                case 169 /* ArrayLiteralExpression */:
                     return getContextualTypeForElementExpression(node);
-                case 185 /* ConditionalExpression */:
+                case 187 /* ConditionalExpression */:
                     return getContextualTypeForConditionalOperand(node);
-                case 193 /* TemplateSpan */:
-                    ts.Debug.assert(parent.parent.kind === 186 /* TemplateExpression */);
+                case 196 /* TemplateSpan */:
+                    ts.Debug.assert(parent.parent.kind === 188 /* TemplateExpression */);
                     return getContextualTypeForSubstitutionExpression(parent.parent, node);
-                case 175 /* ParenthesizedExpression */:
+                case 177 /* ParenthesizedExpression */:
                     return getContextualType(parent);
-                case 243 /* JsxExpression */:
+                case 247 /* JsxExpression */:
                     return getContextualType(parent);
-                case 241 /* JsxAttribute */:
-                case 242 /* JsxSpreadAttribute */:
+                case 245 /* JsxAttribute */:
+                case 246 /* JsxSpreadAttribute */:
                     return getContextualTypeForJsxAttribute(parent);
             }
             return undefined;
@@ -21413,7 +22972,7 @@ var ts;
             }
         }
         function isFunctionExpressionOrArrowFunction(node) {
-            return node.kind === 176 /* FunctionExpression */ || node.kind === 177 /* ArrowFunction */;
+            return node.kind === 178 /* FunctionExpression */ || node.kind === 179 /* ArrowFunction */;
         }
         function getContextualSignatureForFunctionLikeDeclaration(node) {
             // Only function expressions, arrow functions, and object literal methods are contextually typed.
@@ -21427,7 +22986,7 @@ var ts;
         // all identical ignoring their return type, the result is same signature but with return type as
         // union type of return types from these signatures
         function getContextualSignature(node) {
-            ts.Debug.assert(node.kind !== 144 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 146 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var type = ts.isObjectLiteralMethod(node)
                 ? getContextualTypeForObjectLiteralMethod(node)
                 : getApparentTypeOfContextualType(node);
@@ -21447,7 +23006,7 @@ var ts;
                         // This signature will contribute to contextual union signature
                         signatureList = [signature];
                     }
-                    else if (!compareSignaturesIdentical(signatureList[0], signature, /*partialMatch*/ false, /*ignoreReturnTypes*/ true, compareTypesIdentical)) {
+                    else if (!compareSignaturesIdentical(signatureList[0], signature, /*partialMatch*/ false, /*ignoreThisTypes*/ true, /*ignoreReturnTypes*/ true, compareTypesIdentical)) {
                         // Signatures aren't identical, do not use
                         return undefined;
                     }
@@ -21485,19 +23044,38 @@ var ts;
         function isInferentialContext(mapper) {
             return mapper && mapper.context;
         }
+        // Return the root assignment node of an assignment target
+        function getAssignmentRoot(node) {
+            while (node.parent.kind === 177 /* ParenthesizedExpression */) {
+                node = node.parent;
+            }
+            while (true) {
+                if (node.parent.kind === 252 /* PropertyAssignment */) {
+                    node = node.parent.parent;
+                }
+                else if (node.parent.kind === 169 /* ArrayLiteralExpression */) {
+                    node = node.parent;
+                }
+                else {
+                    break;
+                }
+            }
+            var parent = node.parent;
+            return parent.kind === 186 /* BinaryExpression */ &&
+                parent.operatorToken.kind === 56 /* EqualsToken */ &&
+                parent.left === node ? parent : undefined;
+        }
         // 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'.
         function isAssignmentTarget(node) {
+            return !!getAssignmentRoot(node);
+        }
+        function isCompoundAssignmentTarget(node) {
             var parent = node.parent;
-            if (parent.kind === 184 /* BinaryExpression */ && parent.operatorToken.kind === 56 /* EqualsToken */ && parent.left === node) {
-                return true;
-            }
-            if (parent.kind === 248 /* PropertyAssignment */) {
-                return isAssignmentTarget(parent.parent);
-            }
-            if (parent.kind === 167 /* ArrayLiteralExpression */) {
-                return isAssignmentTarget(parent);
+            if (parent.kind === 186 /* BinaryExpression */ && parent.left === node) {
+                var operator = parent.operatorToken.kind;
+                return operator >= 56 /* FirstAssignment */ && operator <= 68 /* LastAssignment */;
             }
             return false;
         }
@@ -21512,8 +23090,8 @@ var ts;
             return checkIteratedTypeOrElementType(arrayOrIterableType, node.expression, /*allowStringInput*/ false);
         }
         function hasDefaultValue(node) {
-            return (node.kind === 166 /* BindingElement */ && !!node.initializer) ||
-                (node.kind === 184 /* BinaryExpression */ && node.operatorToken.kind === 56 /* EqualsToken */);
+            return (node.kind === 168 /* BindingElement */ && !!node.initializer) ||
+                (node.kind === 186 /* BinaryExpression */ && node.operatorToken.kind === 56 /* EqualsToken */);
         }
         function checkArrayLiteral(node, contextualMapper) {
             var elements = node.elements;
@@ -21522,7 +23100,7 @@ var ts;
             var inDestructuringPattern = isAssignmentTarget(node);
             for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
                 var e = elements_1[_i];
-                if (inDestructuringPattern && e.kind === 188 /* SpreadElementExpression */) {
+                if (inDestructuringPattern && e.kind === 190 /* SpreadElementExpression */) {
                     // Given the following situation:
                     //    var c: {};
                     //    [...c] = ["", 0];
@@ -21546,7 +23124,7 @@ var ts;
                     var type = checkExpression(e, contextualMapper);
                     elementTypes.push(type);
                 }
-                hasSpreadElement = hasSpreadElement || e.kind === 188 /* SpreadElementExpression */;
+                hasSpreadElement = hasSpreadElement || e.kind === 190 /* SpreadElementExpression */;
             }
             if (!hasSpreadElement) {
                 // If array literal is actually a destructuring pattern, mark it as an implied type. We do this such
@@ -21561,7 +23139,7 @@ var ts;
                     var pattern = contextualType.pattern;
                     // If array literal is contextually typed by a binding pattern or an assignment pattern, pad the resulting
                     // tuple type with the corresponding binding or assignment element types to make the lengths equal.
-                    if (pattern && (pattern.kind === 165 /* ArrayBindingPattern */ || pattern.kind === 167 /* ArrayLiteralExpression */)) {
+                    if (pattern && (pattern.kind === 167 /* ArrayBindingPattern */ || pattern.kind === 169 /* ArrayLiteralExpression */)) {
                         var patternElements = pattern.elements;
                         for (var i = elementTypes.length; i < patternElements.length; i++) {
                             var patternElement = patternElements[i];
@@ -21569,7 +23147,7 @@ var ts;
                                 elementTypes.push(contextualType.elementTypes[i]);
                             }
                             else {
-                                if (patternElement.kind !== 190 /* OmittedExpression */) {
+                                if (patternElement.kind !== 192 /* OmittedExpression */) {
                                     error(patternElement, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
                                 }
                                 elementTypes.push(unknownType);
@@ -21581,10 +23159,10 @@ var ts;
                     }
                 }
             }
-            return createArrayType(elementTypes.length ? getUnionType(elementTypes) : undefinedType);
+            return createArrayType(elementTypes.length ? getUnionType(elementTypes) : emptyArrayElementType);
         }
         function isNumericName(name) {
-            return name.kind === 137 /* ComputedPropertyName */ ? isNumericComputedName(name) : isNumericLiteralName(name.text);
+            return name.kind === 139 /* ComputedPropertyName */ ? isNumericComputedName(name) : isNumericLiteralName(name.text);
         }
         function isNumericComputedName(name) {
             // It seems odd to consider an expression of type Any to result in a numeric name,
@@ -21592,7 +23170,7 @@ var ts;
             return isTypeAnyOrAllConstituentTypesHaveKind(checkComputedPropertyName(name), 132 /* NumberLike */);
         }
         function isTypeAnyOrAllConstituentTypesHaveKind(type, kind) {
-            return isTypeAny(type) || allConstituentTypesHaveKind(type, kind);
+            return isTypeAny(type) || isTypeOfKind(type, kind);
         }
         function isNumericLiteralName(name) {
             // The intent of numeric names is that
@@ -21633,6 +23211,16 @@ var ts;
             }
             return links.resolvedType;
         }
+        function getObjectLiteralIndexInfo(node, properties, kind) {
+            var propTypes = [];
+            for (var i = 0; i < properties.length; i++) {
+                if (kind === 0 /* String */ || isNumericName(node.properties[i].name)) {
+                    propTypes.push(getTypeOfSymbol(properties[i]));
+                }
+            }
+            var unionType = propTypes.length ? getUnionType(propTypes) : undefinedType;
+            return createIndexInfo(unionType, /*isReadonly*/ false);
+        }
         function checkObjectLiteral(node, contextualMapper) {
             var inDestructuringPattern = isAssignmentTarget(node);
             // Grammar checking
@@ -21641,24 +23229,26 @@ var ts;
             var propertiesArray = [];
             var contextualType = getApparentTypeOfContextualType(node);
             var contextualTypeHasPattern = contextualType && contextualType.pattern &&
-                (contextualType.pattern.kind === 164 /* ObjectBindingPattern */ || contextualType.pattern.kind === 168 /* ObjectLiteralExpression */);
+                (contextualType.pattern.kind === 166 /* ObjectBindingPattern */ || contextualType.pattern.kind === 170 /* ObjectLiteralExpression */);
             var typeFlags = 0;
             var patternWithComputedProperties = false;
+            var hasComputedStringProperty = false;
+            var hasComputedNumberProperty = false;
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var memberDecl = _a[_i];
                 var member = memberDecl.symbol;
-                if (memberDecl.kind === 248 /* PropertyAssignment */ ||
-                    memberDecl.kind === 249 /* ShorthandPropertyAssignment */ ||
+                if (memberDecl.kind === 252 /* PropertyAssignment */ ||
+                    memberDecl.kind === 253 /* ShorthandPropertyAssignment */ ||
                     ts.isObjectLiteralMethod(memberDecl)) {
                     var type = void 0;
-                    if (memberDecl.kind === 248 /* PropertyAssignment */) {
+                    if (memberDecl.kind === 252 /* PropertyAssignment */) {
                         type = checkPropertyAssignment(memberDecl, contextualMapper);
                     }
-                    else if (memberDecl.kind === 144 /* MethodDeclaration */) {
+                    else if (memberDecl.kind === 146 /* MethodDeclaration */) {
                         type = checkObjectLiteralMethod(memberDecl, contextualMapper);
                     }
                     else {
-                        ts.Debug.assert(memberDecl.kind === 249 /* ShorthandPropertyAssignment */);
+                        ts.Debug.assert(memberDecl.kind === 253 /* ShorthandPropertyAssignment */);
                         type = checkExpression(memberDecl.name, contextualMapper);
                     }
                     typeFlags |= type.flags;
@@ -21666,8 +23256,8 @@ var ts;
                     if (inDestructuringPattern) {
                         // If object literal is an assignment pattern and if the assignment pattern specifies a default value
                         // for the property, make the property optional.
-                        var isOptional = (memberDecl.kind === 248 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
-                            (memberDecl.kind === 249 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
+                        var isOptional = (memberDecl.kind === 252 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
+                            (memberDecl.kind === 253 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
                         if (isOptional) {
                             prop.flags |= 536870912 /* Optional */;
                         }
@@ -21701,10 +23291,18 @@ var ts;
                     // an ordinary function declaration(section 6.1) with no parameters.
                     // A set accessor declaration is processed in the same manner
                     // as an ordinary function declaration with a single parameter and a Void return type.
-                    ts.Debug.assert(memberDecl.kind === 146 /* GetAccessor */ || memberDecl.kind === 147 /* SetAccessor */);
+                    ts.Debug.assert(memberDecl.kind === 148 /* GetAccessor */ || memberDecl.kind === 149 /* SetAccessor */);
                     checkAccessorDeclaration(memberDecl);
                 }
-                if (!ts.hasDynamicName(memberDecl)) {
+                if (ts.hasDynamicName(memberDecl)) {
+                    if (isNumericName(memberDecl.name)) {
+                        hasComputedNumberProperty = true;
+                    }
+                    else {
+                        hasComputedStringProperty = true;
+                    }
+                }
+                else {
                     propertiesTable[member.name] = member;
                 }
                 propertiesArray.push(member);
@@ -21723,37 +23321,15 @@ var ts;
                     }
                 }
             }
-            var stringIndexType = getIndexType(0 /* String */);
-            var numberIndexType = getIndexType(1 /* Number */);
-            var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexType, numberIndexType);
+            var stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 0 /* String */) : undefined;
+            var numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 1 /* Number */) : undefined;
+            var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
             var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 1048576 /* FreshObjectLiteral */;
             result.flags |= 524288 /* ObjectLiteral */ | 4194304 /* ContainsObjectLiteral */ | freshObjectLiteralFlag | (typeFlags & 14680064 /* PropagatingFlags */) | (patternWithComputedProperties ? 67108864 /* ObjectLiteralPatternWithComputedProperties */ : 0);
             if (inDestructuringPattern) {
                 result.pattern = node;
             }
             return result;
-            function getIndexType(kind) {
-                if (contextualType && contextualTypeHasIndexSignature(contextualType, kind)) {
-                    var propTypes = [];
-                    for (var i = 0; i < propertiesArray.length; i++) {
-                        var propertyDecl = node.properties[i];
-                        if (kind === 0 /* String */ || isNumericName(propertyDecl.name)) {
-                            // Do not call getSymbolOfNode(propertyDecl), as that will get the
-                            // original symbol for the node. We actually want to get the symbol
-                            // created by checkObjectLiteral, since that will be appropriately
-                            // contextually typed and resolved.
-                            var type = getTypeOfSymbol(propertiesArray[i]);
-                            if (!ts.contains(propTypes, type)) {
-                                propTypes.push(type);
-                            }
-                        }
-                    }
-                    var result_1 = propTypes.length ? getUnionType(propTypes) : undefinedType;
-                    typeFlags |= result_1.flags;
-                    return result_1;
-                }
-                return undefined;
-            }
         }
         function checkJsxSelfClosingElement(node) {
             checkJsxOpeningLikeElement(node);
@@ -21763,18 +23339,23 @@ var ts;
             // Check attributes
             checkJsxOpeningLikeElement(node.openingElement);
             // Perform resolution on the closing tag so that rename/go to definition/etc work
-            getJsxElementTagSymbol(node.closingElement);
+            if (isJsxIntrinsicIdentifier(node.closingElement.tagName)) {
+                getIntrinsicTagSymbol(node.closingElement);
+            }
+            else {
+                checkExpression(node.closingElement.tagName);
+            }
             // Check children
             for (var _i = 0, _a = node.children; _i < _a.length; _i++) {
                 var child = _a[_i];
                 switch (child.kind) {
-                    case 243 /* JsxExpression */:
+                    case 247 /* JsxExpression */:
                         checkJsxExpression(child);
                         break;
-                    case 236 /* JsxElement */:
+                    case 240 /* JsxElement */:
                         checkJsxElement(child);
                         break;
-                    case 237 /* JsxSelfClosingElement */:
+                    case 241 /* JsxSelfClosingElement */:
                         checkJsxSelfClosingElement(child);
                         break;
                 }
@@ -21792,7 +23373,7 @@ var ts;
          * Returns true iff React would emit this tag name as a string rather than an identifier or qualified name
          */
         function isJsxIntrinsicIdentifier(tagName) {
-            if (tagName.kind === 136 /* QualifiedName */) {
+            if (tagName.kind === 138 /* QualifiedName */) {
                 return false;
             }
             else {
@@ -21862,70 +23443,41 @@ var ts;
             }
             return jsxTypes[name];
         }
-        /// Given a JSX opening element or self-closing element, return the symbol of the property that the tag name points to if
-        /// this is an intrinsic tag. This might be a named
-        /// property of the IntrinsicElements interface, or its string indexer.
-        /// If this is a class-based tag (otherwise returns undefined), returns the symbol of the class
-        /// type or factory function.
-        /// Otherwise, returns unknownSymbol.
-        function getJsxElementTagSymbol(node) {
+        /**
+          * Looks up an intrinsic tag name and returns a symbol that either points to an intrinsic
+          * property (in which case nodeLinks.jsxFlags will be IntrinsicNamedElement) or an intrinsic
+          * string index signature (in which case nodeLinks.jsxFlags will be IntrinsicIndexedElement).
+          * May also return unknownSymbol if both of these lookups fail.
+          */
+        function getIntrinsicTagSymbol(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedSymbol) {
-                if (isJsxIntrinsicIdentifier(node.tagName)) {
-                    links.resolvedSymbol = lookupIntrinsicTag(node);
-                }
-                else {
-                    links.resolvedSymbol = lookupClassTag(node);
-                }
-            }
-            return links.resolvedSymbol;
-            function lookupIntrinsicTag(node) {
                 var intrinsicElementsType = getJsxType(JsxNames.IntrinsicElements);
                 if (intrinsicElementsType !== unknownType) {
                     // Property case
                     var intrinsicProp = getPropertyOfType(intrinsicElementsType, node.tagName.text);
                     if (intrinsicProp) {
                         links.jsxFlags |= 1 /* IntrinsicNamedElement */;
-                        return intrinsicProp;
+                        return links.resolvedSymbol = intrinsicProp;
                     }
                     // Intrinsic string indexer case
                     var indexSignatureType = getIndexTypeOfType(intrinsicElementsType, 0 /* String */);
                     if (indexSignatureType) {
                         links.jsxFlags |= 2 /* IntrinsicIndexedElement */;
-                        return intrinsicElementsType.symbol;
+                        return links.resolvedSymbol = intrinsicElementsType.symbol;
                     }
                     // Wasn't found
                     error(node, ts.Diagnostics.Property_0_does_not_exist_on_type_1, node.tagName.text, "JSX." + JsxNames.IntrinsicElements);
-                    return unknownSymbol;
+                    return links.resolvedSymbol = unknownSymbol;
                 }
                 else {
                     if (compilerOptions.noImplicitAny) {
                         error(node, ts.Diagnostics.JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists, JsxNames.IntrinsicElements);
                     }
-                    return unknownSymbol;
-                }
-            }
-            function lookupClassTag(node) {
-                var valueSymbol = resolveJsxTagName(node);
-                // Look up the value in the current scope
-                if (valueSymbol && valueSymbol !== unknownSymbol) {
-                    links.jsxFlags |= 4 /* ValueElement */;
-                    if (valueSymbol.flags & 8388608 /* Alias */) {
-                        markAliasSymbolAsReferenced(valueSymbol);
-                    }
-                }
-                return valueSymbol || unknownSymbol;
-            }
-            function resolveJsxTagName(node) {
-                if (node.tagName.kind === 69 /* Identifier */) {
-                    var tag = node.tagName;
-                    var sym = getResolvedSymbol(tag);
-                    return sym.exportSymbol || sym;
-                }
-                else {
-                    return checkQualifiedName(node.tagName).symbol;
+                    return links.resolvedSymbol = unknownSymbol;
                 }
             }
+            return links.resolvedSymbol;
         }
         /**
          * Given a JSX element that is a class element, finds the Element Instance Type. If the
@@ -21933,15 +23485,7 @@ var ts;
          * For example, in the element <MyClass>, the element instance type is `MyClass` (not `typeof MyClass`).
          */
         function getJsxElementInstanceType(node) {
-            // There is no such thing as an instance type for a non-class element. This
-            // line shouldn't be hit.
-            ts.Debug.assert(!!(getNodeLinks(node).jsxFlags & 4 /* ValueElement */), "Should not call getJsxElementInstanceType on non-class Element");
-            var classSymbol = getJsxElementTagSymbol(node);
-            if (classSymbol === unknownSymbol) {
-                // Couldn't find the class instance type. Error has already been issued
-                return anyType;
-            }
-            var valueType = getTypeOfSymbol(classSymbol);
+            var valueType = checkExpression(node.tagName);
             if (isTypeAny(valueType)) {
                 // Short-circuit if the class tag is using an element type 'any'
                 return anyType;
@@ -21960,10 +23504,10 @@ var ts;
             return getUnionType(signatures.map(getReturnTypeOfSignature));
         }
         /// e.g. "props" for React.d.ts,
-        /// or 'undefined' if ElementAttributesPropery doesn't exist (which means all
+        /// or 'undefined' if ElementAttributesProperty doesn't exist (which means all
         ///     non-intrinsic elements' attributes type is 'any'),
         /// or '' if it has 0 properties (which means every
-        ///     non-instrinsic elements' attributes type is the element instance type)
+        ///     non-intrinsic elements' attributes type is the element instance type)
         function getJsxElementPropertiesName() {
             // JSX
             var jsxNamespace = getGlobalSymbol(JsxNames.JSX, 1536 /* Namespace */, /*diagnosticMessage*/ undefined);
@@ -21971,7 +23515,7 @@ var ts;
             var attribsPropTypeSym = jsxNamespace && getSymbol(jsxNamespace.exports, JsxNames.ElementAttributesPropertyNameContainer, 793056 /* Type */);
             // JSX.ElementAttributesProperty [type]
             var attribPropType = attribsPropTypeSym && getDeclaredTypeOfSymbol(attribsPropTypeSym);
-            // The properites of JSX.ElementAttributesProperty
+            // The properties of JSX.ElementAttributesProperty
             var attribProperties = attribPropType && getPropertiesOfType(attribPropType);
             if (attribProperties) {
                 // Element Attributes has zero properties, so the element attributes type will be the class instance type
@@ -21998,26 +23542,36 @@ var ts;
         function getJsxElementAttributesType(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedJsxType) {
-                var sym = getJsxElementTagSymbol(node);
-                if (links.jsxFlags & 4 /* ValueElement */) {
+                if (isJsxIntrinsicIdentifier(node.tagName)) {
+                    var symbol = getIntrinsicTagSymbol(node);
+                    if (links.jsxFlags & 1 /* IntrinsicNamedElement */) {
+                        return links.resolvedJsxType = getTypeOfSymbol(symbol);
+                    }
+                    else if (links.jsxFlags & 2 /* IntrinsicIndexedElement */) {
+                        return links.resolvedJsxType = getIndexInfoOfSymbol(symbol, 0 /* String */).type;
+                    }
+                }
+                else {
                     // Get the element instance type (the result of newing or invoking this tag)
                     var elemInstanceType = getJsxElementInstanceType(node);
                     var elemClassType = getJsxGlobalElementClassType();
                     if (!elemClassType || !isTypeAssignableTo(elemInstanceType, elemClassType)) {
                         // Is this is a stateless function component? See if its single signature's return type is
                         // assignable to the JSX Element Type
-                        var elemType = getTypeOfSymbol(sym);
-                        var callSignatures = elemType && getSignaturesOfType(elemType, 0 /* Call */);
-                        var callSignature = callSignatures && callSignatures.length > 0 && callSignatures[0];
-                        var callReturnType = callSignature && getReturnTypeOfSignature(callSignature);
-                        var paramType = callReturnType && (callSignature.parameters.length === 0 ? emptyObjectType : getTypeOfSymbol(callSignature.parameters[0]));
-                        if (callReturnType && isTypeAssignableTo(callReturnType, jsxElementType)) {
-                            // Intersect in JSX.IntrinsicAttributes if it exists
-                            var intrinsicAttributes = getJsxType(JsxNames.IntrinsicAttributes);
-                            if (intrinsicAttributes !== unknownType) {
-                                paramType = intersectTypes(intrinsicAttributes, paramType);
+                        if (jsxElementType) {
+                            var elemType = checkExpression(node.tagName);
+                            var callSignatures = elemType && getSignaturesOfType(elemType, 0 /* Call */);
+                            var callSignature = callSignatures && callSignatures.length > 0 && callSignatures[0];
+                            var callReturnType = callSignature && getReturnTypeOfSignature(callSignature);
+                            var paramType = callReturnType && (callSignature.parameters.length === 0 ? emptyObjectType : getTypeOfSymbol(callSignature.parameters[0]));
+                            if (callReturnType && isTypeAssignableTo(callReturnType, jsxElementType)) {
+                                // Intersect in JSX.IntrinsicAttributes if it exists
+                                var intrinsicAttributes = getJsxType(JsxNames.IntrinsicAttributes);
+                                if (intrinsicAttributes !== unknownType) {
+                                    paramType = intersectTypes(intrinsicAttributes, paramType);
+                                }
+                                return links.resolvedJsxType = paramType;
                             }
-                            return links.resolvedJsxType = paramType;
                         }
                     }
                     // Issue an error if this return type isn't assignable to JSX.ElementClass
@@ -22074,16 +23628,7 @@ var ts;
                         }
                     }
                 }
-                else if (links.jsxFlags & 1 /* IntrinsicNamedElement */) {
-                    return links.resolvedJsxType = getTypeOfSymbol(sym);
-                }
-                else if (links.jsxFlags & 2 /* IntrinsicIndexedElement */) {
-                    return links.resolvedJsxType = getIndexTypeOfSymbol(sym, 0 /* String */);
-                }
-                else {
-                    // Resolution failed, so we don't know
-                    return links.resolvedJsxType = anyType;
-                }
+                return links.resolvedJsxType = unknownType;
             }
             return links.resolvedJsxType;
         }
@@ -22137,11 +23682,11 @@ var ts;
             // thus should have their types ignored
             var sawSpreadedAny = false;
             for (var i = node.attributes.length - 1; i >= 0; i--) {
-                if (node.attributes[i].kind === 241 /* JsxAttribute */) {
+                if (node.attributes[i].kind === 245 /* JsxAttribute */) {
                     checkJsxAttribute((node.attributes[i]), targetAttributesType, nameTable);
                 }
                 else {
-                    ts.Debug.assert(node.attributes[i].kind === 242 /* JsxSpreadAttribute */);
+                    ts.Debug.assert(node.attributes[i].kind === 246 /* JsxSpreadAttribute */);
                     var spreadType = checkJsxSpreadAttribute((node.attributes[i]), targetAttributesType, nameTable);
                     if (isTypeAny(spreadType)) {
                         sawSpreadedAny = true;
@@ -22171,10 +23716,10 @@ var ts;
         // If a symbol is a synthesized symbol with no value declaration, we assume it is a property. Example of this are the synthesized
         // '.prototype' property as well as synthesized tuple index properties.
         function getDeclarationKindFromSymbol(s) {
-            return s.valueDeclaration ? s.valueDeclaration.kind : 142 /* PropertyDeclaration */;
+            return s.valueDeclaration ? s.valueDeclaration.kind : 144 /* PropertyDeclaration */;
         }
         function getDeclarationFlagsFromSymbol(s) {
-            return s.valueDeclaration ? ts.getCombinedNodeFlags(s.valueDeclaration) : s.flags & 134217728 /* Prototype */ ? 8 /* Public */ | 64 /* Static */ : 0;
+            return s.valueDeclaration ? ts.getCombinedNodeFlags(s.valueDeclaration) : s.flags & 134217728 /* Prototype */ ? 4 /* Public */ | 32 /* Static */ : 0;
         }
         /**
          * Check whether the requested property access is valid.
@@ -22186,11 +23731,11 @@ var ts;
          */
         function checkClassPropertyAccess(node, left, type, prop) {
             var flags = getDeclarationFlagsFromSymbol(prop);
-            var declaringClass = getDeclaredTypeOfSymbol(prop.parent);
+            var declaringClass = getDeclaredTypeOfSymbol(getParentOfSymbol(prop));
+            var errorNode = node.kind === 171 /* PropertyAccessExpression */ || node.kind === 217 /* VariableDeclaration */ ?
+                node.name :
+                node.right;
             if (left.kind === 95 /* SuperKeyword */) {
-                var errorNode = node.kind === 169 /* PropertyAccessExpression */ ?
-                    node.name :
-                    node.right;
                 // TS 1.0 spec (April 2014): 4.8.2
                 // - In a constructor, instance member function, instance member accessor, or
                 //   instance member variable initializer where this references a derived class instance,
@@ -22198,7 +23743,7 @@ var ts;
                 // - In a static member function or static member accessor
                 //   where this references the constructor function object of a derived class,
                 //   a super property access is permitted and must specify a public static member function of the base class.
-                if (languageVersion < 2 /* ES6 */ && getDeclarationKindFromSymbol(prop) !== 144 /* MethodDeclaration */) {
+                if (languageVersion < 2 /* ES6 */ && getDeclarationKindFromSymbol(prop) !== 146 /* MethodDeclaration */) {
                     // `prop` refers to a *property* declared in the super class
                     // rather than a *method*, so it does not satisfy the above criteria.
                     error(errorNode, ts.Diagnostics.Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword);
@@ -22214,17 +23759,15 @@ var ts;
                 }
             }
             // Public properties are otherwise accessible.
-            if (!(flags & (16 /* Private */ | 32 /* Protected */))) {
+            if (!(flags & (8 /* Private */ | 16 /* Protected */))) {
                 return true;
             }
             // Property is known to be private or protected at this point
-            // Get the declaring and enclosing class instance types
-            var enclosingClassDeclaration = ts.getContainingClass(node);
-            var enclosingClass = enclosingClassDeclaration ? getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingClassDeclaration)) : undefined;
-            // Private property is accessible if declaring and enclosing class are the same
-            if (flags & 16 /* Private */) {
-                if (declaringClass !== enclosingClass) {
-                    error(node, ts.Diagnostics.Property_0_is_private_and_only_accessible_within_class_1, symbolToString(prop), typeToString(declaringClass));
+            // Private property is accessible if the property is within the declaring class
+            if (flags & 8 /* Private */) {
+                var declaringClassDeclaration = getClassLikeDeclarationOfSymbol(getParentOfSymbol(prop));
+                if (!isNodeWithinClass(node, declaringClassDeclaration)) {
+                    error(errorNode, ts.Diagnostics.Property_0_is_private_and_only_accessible_within_class_1, symbolToString(prop), typeToString(declaringClass));
                     return false;
                 }
                 return true;
@@ -22234,13 +23777,18 @@ var ts;
             if (left.kind === 95 /* SuperKeyword */) {
                 return true;
             }
-            // A protected property is accessible in the declaring class and classes derived from it
-            if (!enclosingClass || !hasBaseType(enclosingClass, declaringClass)) {
-                error(node, ts.Diagnostics.Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses, symbolToString(prop), typeToString(declaringClass));
+            // Get the enclosing class that has the declaring class as its base type
+            var enclosingClass = forEachEnclosingClass(node, function (enclosingDeclaration) {
+                var enclosingClass = getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingDeclaration));
+                return hasBaseType(enclosingClass, declaringClass) ? enclosingClass : undefined;
+            });
+            // A protected property is accessible if the property is within the declaring class or classes derived from it
+            if (!enclosingClass) {
+                error(errorNode, ts.Diagnostics.Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses, symbolToString(prop), typeToString(declaringClass));
                 return false;
             }
             // No further restrictions for static properties
-            if (flags & 64 /* Static */) {
+            if (flags & 32 /* Static */) {
                 return true;
             }
             // An instance property must be accessed through an instance of the enclosing class
@@ -22250,11 +23798,19 @@ var ts;
             }
             // TODO: why is the first part of this check here?
             if (!(getTargetType(type).flags & (1024 /* Class */ | 2048 /* Interface */) && hasBaseType(type, enclosingClass))) {
-                error(node, ts.Diagnostics.Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1, symbolToString(prop), typeToString(enclosingClass));
+                error(errorNode, ts.Diagnostics.Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1, symbolToString(prop), typeToString(enclosingClass));
                 return false;
             }
             return true;
         }
+        function checkNonNullExpression(node) {
+            var type = checkExpression(node);
+            if (strictNullChecks && getNullableKind(type)) {
+                error(node, ts.Diagnostics.Object_is_possibly_null_or_undefined);
+                return getNonNullableType(type);
+            }
+            return type;
+        }
         function checkPropertyAccessExpression(node) {
             return checkPropertyAccessExpressionOrQualifiedName(node, node.expression, node.name);
         }
@@ -22262,7 +23818,7 @@ var ts;
             return checkPropertyAccessExpressionOrQualifiedName(node, node.left, node.right);
         }
         function checkPropertyAccessExpressionOrQualifiedName(node, left, right) {
-            var type = checkExpression(left);
+            var type = checkNonNullExpression(left);
             if (isTypeAny(type)) {
                 return type;
             }
@@ -22282,10 +23838,12 @@ var ts;
             if (prop.parent && prop.parent.flags & 32 /* Class */) {
                 checkClassPropertyAccess(node, left, apparentType, prop);
             }
-            return getTypeOfSymbol(prop);
+            var propType = getTypeOfSymbol(prop);
+            return node.kind === 171 /* PropertyAccessExpression */ && prop.flags & 4 /* Property */ ?
+                getNarrowedTypeOfReference(propType, node) : propType;
         }
         function isValidPropertyAccess(node, propertyName) {
-            var left = node.kind === 169 /* PropertyAccessExpression */
+            var left = node.kind === 171 /* PropertyAccessExpression */
                 ? node.expression
                 : node.left;
             var type = checkExpression(left);
@@ -22302,7 +23860,7 @@ var ts;
          */
         function getForInVariableSymbol(node) {
             var initializer = node.initializer;
-            if (initializer.kind === 215 /* VariableDeclarationList */) {
+            if (initializer.kind === 218 /* VariableDeclarationList */) {
                 var variable = initializer.declarations[0];
                 if (variable && !ts.isBindingPattern(variable.name)) {
                     return getSymbolOfNode(variable);
@@ -22331,7 +23889,7 @@ var ts;
                     var child = expr;
                     var node = expr.parent;
                     while (node) {
-                        if (node.kind === 203 /* ForInStatement */ &&
+                        if (node.kind === 206 /* ForInStatement */ &&
                             child === node.statement &&
                             getForInVariableSymbol(node) === symbol &&
                             hasNumericPropertyNames(checkExpression(node.expression))) {
@@ -22348,7 +23906,7 @@ var ts;
             // Grammar checking
             if (!node.argumentExpression) {
                 var sourceFile = ts.getSourceFileOfNode(node);
-                if (node.parent.kind === 172 /* NewExpression */ && node.parent.expression === node) {
+                if (node.parent.kind === 174 /* NewExpression */ && node.parent.expression === node) {
                     var start = ts.skipTrivia(sourceFile.text, node.expression.end);
                     var end = node.end;
                     grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead);
@@ -22360,7 +23918,7 @@ var ts;
                 }
             }
             // Obtain base constraint such that we can bail out if the constraint is an unknown type
-            var objectType = getApparentType(checkExpression(node.expression));
+            var objectType = getApparentType(checkNonNullExpression(node.expression));
             var indexType = node.argumentExpression ? checkExpression(node.argumentExpression) : unknownType;
             if (objectType === unknownType) {
                 return unknownType;
@@ -22381,15 +23939,15 @@ var ts;
             // - Otherwise, if IndexExpr is of type Any, the String or Number primitive type, or an enum type, the property access is of type Any.
             // See if we can index as a property.
             if (node.argumentExpression) {
-                var name_11 = getPropertyNameForIndexedAccess(node.argumentExpression, indexType);
-                if (name_11 !== undefined) {
-                    var prop = getPropertyOfType(objectType, name_11);
+                var name_12 = getPropertyNameForIndexedAccess(node.argumentExpression, indexType);
+                if (name_12 !== undefined) {
+                    var prop = getPropertyOfType(objectType, name_12);
                     if (prop) {
                         getNodeLinks(node).resolvedSymbol = prop;
                         return getTypeOfSymbol(prop);
                     }
                     else if (isConstEnum) {
-                        error(node.argumentExpression, ts.Diagnostics.Property_0_does_not_exist_on_const_enum_1, name_11, symbolToString(objectType.symbol));
+                        error(node.argumentExpression, ts.Diagnostics.Property_0_does_not_exist_on_const_enum_1, name_12, symbolToString(objectType.symbol));
                         return unknownType;
                     }
                 }
@@ -22398,15 +23956,17 @@ var ts;
             if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, 258 /* StringLike */ | 132 /* NumberLike */ | 16777216 /* ESSymbol */)) {
                 // Try to use a number indexer.
                 if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, 132 /* NumberLike */) || isForInVariableForNumericPropertyNames(node.argumentExpression)) {
-                    var numberIndexType = getIndexTypeOfType(objectType, 1 /* Number */);
-                    if (numberIndexType) {
-                        return numberIndexType;
+                    var numberIndexInfo = getIndexInfoOfType(objectType, 1 /* Number */);
+                    if (numberIndexInfo) {
+                        getNodeLinks(node).resolvedIndexInfo = numberIndexInfo;
+                        return numberIndexInfo.type;
                     }
                 }
                 // Try to use string indexing.
-                var stringIndexType = getIndexTypeOfType(objectType, 0 /* String */);
-                if (stringIndexType) {
-                    return stringIndexType;
+                var stringIndexInfo = getIndexInfoOfType(objectType, 0 /* String */);
+                if (stringIndexInfo) {
+                    getNodeLinks(node).resolvedIndexInfo = stringIndexInfo;
+                    return stringIndexInfo.type;
                 }
                 // Fall back to any.
                 if (compilerOptions.noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors && !isTypeAny(objectType)) {
@@ -22431,7 +23991,7 @@ var ts;
             if (indexArgumentExpression.kind === 9 /* StringLiteral */ || indexArgumentExpression.kind === 8 /* NumericLiteral */) {
                 return indexArgumentExpression.text;
             }
-            if (indexArgumentExpression.kind === 170 /* ElementAccessExpression */ || indexArgumentExpression.kind === 169 /* PropertyAccessExpression */) {
+            if (indexArgumentExpression.kind === 172 /* ElementAccessExpression */ || indexArgumentExpression.kind === 171 /* PropertyAccessExpression */) {
                 var value = getConstantValue(indexArgumentExpression);
                 if (value !== undefined) {
                     return value.toString();
@@ -22486,10 +24046,10 @@ var ts;
             return true;
         }
         function resolveUntypedCall(node) {
-            if (node.kind === 173 /* TaggedTemplateExpression */) {
+            if (node.kind === 175 /* TaggedTemplateExpression */) {
                 checkExpression(node.template);
             }
-            else if (node.kind !== 140 /* Decorator */) {
+            else if (node.kind !== 142 /* Decorator */) {
                 ts.forEach(node.arguments, function (argument) {
                     checkExpression(argument);
                 });
@@ -22519,13 +24079,13 @@ var ts;
             for (var _i = 0, signatures_2 = signatures; _i < signatures_2.length; _i++) {
                 var signature = signatures_2[_i];
                 var symbol = signature.declaration && getSymbolOfNode(signature.declaration);
-                var parent_5 = signature.declaration && signature.declaration.parent;
+                var parent_7 = signature.declaration && signature.declaration.parent;
                 if (!lastSymbol || symbol === lastSymbol) {
-                    if (lastParent && parent_5 === lastParent) {
+                    if (lastParent && parent_7 === lastParent) {
                         index++;
                     }
                     else {
-                        lastParent = parent_5;
+                        lastParent = parent_7;
                         index = cutoffIndex;
                     }
                 }
@@ -22533,7 +24093,7 @@ var ts;
                     // current declaration belongs to a different symbol
                     // set cutoffIndex so re-orderings in the future won't change result set from 0 to cutoffIndex
                     index = cutoffIndex = result.length;
-                    lastParent = parent_5;
+                    lastParent = parent_7;
                 }
                 lastSymbol = symbol;
                 // specialized signatures always need to be placed before non-specialized signatures regardless
@@ -22555,7 +24115,7 @@ var ts;
         function getSpreadArgumentIndex(args) {
             for (var i = 0; i < args.length; i++) {
                 var arg = args[i];
-                if (arg && arg.kind === 188 /* SpreadElementExpression */) {
+                if (arg && arg.kind === 190 /* SpreadElementExpression */) {
                     return i;
                 }
             }
@@ -22567,13 +24127,13 @@ var ts;
             var callIsIncomplete; // In incomplete call we want to be lenient when we have too few arguments
             var isDecorator;
             var spreadArgIndex = -1;
-            if (node.kind === 173 /* TaggedTemplateExpression */) {
+            if (node.kind === 175 /* TaggedTemplateExpression */) {
                 var tagExpression = node;
                 // Even if the call is incomplete, we'll have a missing expression as our last argument,
                 // so we can say the count is just the arg list length
                 adjustedArgCount = args.length;
                 typeArguments = undefined;
-                if (tagExpression.template.kind === 186 /* TemplateExpression */) {
+                if (tagExpression.template.kind === 188 /* TemplateExpression */) {
                     // If a tagged template expression lacks a tail literal, the call is incomplete.
                     // Specifically, a template only can end in a TemplateTail or a Missing literal.
                     var templateExpression = tagExpression.template;
@@ -22590,7 +24150,7 @@ var ts;
                     callIsIncomplete = !!templateLiteral.isUnterminated;
                 }
             }
-            else if (node.kind === 140 /* Decorator */) {
+            else if (node.kind === 142 /* Decorator */) {
                 isDecorator = true;
                 typeArguments = undefined;
                 adjustedArgCount = getEffectiveArgumentCount(node, /*args*/ undefined, signature);
@@ -22599,7 +24159,7 @@ var ts;
                 var callExpression = node;
                 if (!callExpression.arguments) {
                     // This only happens when we have something of the form: 'new C'
-                    ts.Debug.assert(callExpression.kind === 172 /* NewExpression */);
+                    ts.Debug.assert(callExpression.kind === 174 /* NewExpression */);
                     return signature.minArgumentCount === 0;
                 }
                 // For IDE scenarios we may have an incomplete call, so a trailing comma is tantamount to adding another argument.
@@ -22634,7 +24194,7 @@ var ts;
             if (type.flags & 80896 /* ObjectType */) {
                 var resolved = resolveStructuredTypeMembers(type);
                 if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 &&
-                    resolved.properties.length === 0 && !resolved.stringIndexType && !resolved.numberIndexType) {
+                    resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
                     return resolved.callSignatures[0];
                 }
             }
@@ -22672,13 +24232,18 @@ var ts;
             if (context.failedTypeParameterIndex !== undefined && !context.inferences[context.failedTypeParameterIndex].isFixed) {
                 context.failedTypeParameterIndex = undefined;
             }
+            if (signature.thisType) {
+                var thisArgumentNode = getThisArgumentOfCall(node);
+                var thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
+                inferTypes(context, thisArgumentType, signature.thisType);
+            }
             // We perform two passes over the arguments. In the first pass we infer from all arguments, but use
             // wildcards for all context sensitive function expressions.
             var argCount = getEffectiveArgumentCount(node, args, signature);
             for (var i = 0; i < argCount; i++) {
                 var arg = getEffectiveArgument(node, args, i);
                 // If the effective argument is 'undefined', then it is an argument that is present but is synthetic.
-                if (arg === undefined || arg.kind !== 190 /* OmittedExpression */) {
+                if (arg === undefined || arg.kind !== 192 /* OmittedExpression */) {
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = getEffectiveArgumentType(node, i, arg);
                     // If the effective argument type is 'undefined', there is no synthetic type
@@ -22699,7 +24264,7 @@ var ts;
             // Tagged template expressions will always have `undefined` for `excludeArgument[0]`.
             if (excludeArgument) {
                 for (var i = 0; i < argCount; i++) {
-                    // No need to check for omitted args and template expressions, their exlusion value is always undefined
+                    // No need to check for omitted args and template expressions, their exclusion value is always undefined
                     if (excludeArgument[i] === false) {
                         var arg = args[i];
                         var paramType = getTypeAtPosition(signature, i);
@@ -22734,11 +24299,24 @@ var ts;
             return typeArgumentsAreAssignable;
         }
         function checkApplicableSignature(node, args, signature, relation, excludeArgument, reportErrors) {
+            if (signature.thisType && signature.thisType !== voidType && node.kind !== 174 /* NewExpression */) {
+                // If the called expression is not of the form `x.f` or `x["f"]`, then sourceType = voidType
+                // If the signature's 'this' type is voidType, then the check is skipped -- anything is compatible.
+                // If the expression is a new expression, then the check is skipped.
+                var thisArgumentNode = getThisArgumentOfCall(node);
+                var thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
+                var errorNode = reportErrors ? (thisArgumentNode || node) : undefined;
+                var headMessage_1 = ts.Diagnostics.The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1;
+                if (!checkTypeRelatedTo(thisArgumentType, signature.thisType, relation, errorNode, headMessage_1)) {
+                    return false;
+                }
+            }
+            var headMessage = ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1;
             var argCount = getEffectiveArgumentCount(node, args, signature);
             for (var i = 0; i < argCount; i++) {
                 var arg = getEffectiveArgument(node, args, i);
                 // If the effective argument is 'undefined', then it is an argument that is present but is synthetic.
-                if (arg === undefined || arg.kind !== 190 /* OmittedExpression */) {
+                if (arg === undefined || arg.kind !== 192 /* OmittedExpression */) {
                     // Check spread elements against rest type (from arity check we know spread argument corresponds to a rest parameter)
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = getEffectiveArgumentType(node, i, arg);
@@ -22751,7 +24329,6 @@ var ts;
                     }
                     // Use argument expression as error location when reporting errors
                     var errorNode = reportErrors ? getEffectiveArgumentErrorNode(node, i, arg) : undefined;
-                    var headMessage = ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1;
                     if (!checkTypeRelatedTo(argType, paramType, relation, errorNode, headMessage)) {
                         return false;
                     }
@@ -22759,6 +24336,20 @@ var ts;
             }
             return true;
         }
+        /**
+         * Returns the this argument in calls like x.f(...) and x[f](...). Undefined otherwise.
+         */
+        function getThisArgumentOfCall(node) {
+            if (node.kind === 173 /* CallExpression */) {
+                var callee = node.expression;
+                if (callee.kind === 171 /* PropertyAccessExpression */) {
+                    return callee.expression;
+                }
+                else if (callee.kind === 172 /* ElementAccessExpression */) {
+                    return callee.expression;
+                }
+            }
+        }
         /**
          * Returns the effective arguments for an expression that works like a function invocation.
          *
@@ -22770,16 +24361,16 @@ var ts;
          */
         function getEffectiveCallArguments(node) {
             var args;
-            if (node.kind === 173 /* TaggedTemplateExpression */) {
+            if (node.kind === 175 /* TaggedTemplateExpression */) {
                 var template = node.template;
                 args = [undefined];
-                if (template.kind === 186 /* TemplateExpression */) {
+                if (template.kind === 188 /* TemplateExpression */) {
                     ts.forEach(template.templateSpans, function (span) {
                         args.push(span.expression);
                     });
                 }
             }
-            else if (node.kind === 140 /* Decorator */) {
+            else if (node.kind === 142 /* Decorator */) {
                 // For a decorator, we return undefined as we will determine
                 // the number and types of arguments for a decorator using
                 // `getEffectiveArgumentCount` and `getEffectiveArgumentType` below.
@@ -22804,19 +24395,19 @@ var ts;
           * Otherwise, the argument count is the length of the 'args' array.
           */
         function getEffectiveArgumentCount(node, args, signature) {
-            if (node.kind === 140 /* Decorator */) {
+            if (node.kind === 142 /* Decorator */) {
                 switch (node.parent.kind) {
-                    case 217 /* ClassDeclaration */:
-                    case 189 /* ClassExpression */:
+                    case 220 /* ClassDeclaration */:
+                    case 191 /* ClassExpression */:
                         // A class decorator will have one argument (see `ClassDecorator` in core.d.ts)
                         return 1;
-                    case 142 /* PropertyDeclaration */:
+                    case 144 /* PropertyDeclaration */:
                         // A property declaration decorator will have two arguments (see
                         // `PropertyDecorator` in core.d.ts)
                         return 2;
-                    case 144 /* MethodDeclaration */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
+                    case 146 /* MethodDeclaration */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
                         // A method or accessor declaration decorator will have two or three arguments (see
                         // `PropertyDecorator` and `MethodDecorator` in core.d.ts)
                         // If we are emitting decorators for ES3, we will only pass two arguments.
@@ -22826,7 +24417,7 @@ var ts;
                         // If the method decorator signature only accepts a target and a key, we will only
                         // type check those arguments.
                         return signature.parameters.length >= 3 ? 3 : 2;
-                    case 139 /* Parameter */:
+                    case 141 /* Parameter */:
                         // A parameter declaration decorator will have three arguments (see
                         // `ParameterDecorator` in core.d.ts)
                         return 3;
@@ -22850,25 +24441,25 @@ var ts;
           */
         function getEffectiveDecoratorFirstArgumentType(node) {
             // The first argument to a decorator is its `target`.
-            if (node.kind === 217 /* ClassDeclaration */) {
+            if (node.kind === 220 /* ClassDeclaration */) {
                 // For a class decorator, the `target` is the type of the class (e.g. the
                 // "static" or "constructor" side of the class)
                 var classSymbol = getSymbolOfNode(node);
                 return getTypeOfSymbol(classSymbol);
             }
-            if (node.kind === 139 /* Parameter */) {
+            if (node.kind === 141 /* Parameter */) {
                 // For a parameter decorator, the `target` is the parent type of the
                 // parameter's containing method.
                 node = node.parent;
-                if (node.kind === 145 /* Constructor */) {
+                if (node.kind === 147 /* Constructor */) {
                     var classSymbol = getSymbolOfNode(node);
                     return getTypeOfSymbol(classSymbol);
                 }
             }
-            if (node.kind === 142 /* PropertyDeclaration */ ||
-                node.kind === 144 /* MethodDeclaration */ ||
-                node.kind === 146 /* GetAccessor */ ||
-                node.kind === 147 /* SetAccessor */) {
+            if (node.kind === 144 /* PropertyDeclaration */ ||
+                node.kind === 146 /* MethodDeclaration */ ||
+                node.kind === 148 /* GetAccessor */ ||
+                node.kind === 149 /* SetAccessor */) {
                 // For a property or method decorator, the `target` is the
                 // "static"-side type of the parent of the member if the member is
                 // declared "static"; otherwise, it is the "instance"-side type of the
@@ -22895,21 +24486,21 @@ var ts;
           */
         function getEffectiveDecoratorSecondArgumentType(node) {
             // The second argument to a decorator is its `propertyKey`
-            if (node.kind === 217 /* ClassDeclaration */) {
+            if (node.kind === 220 /* ClassDeclaration */) {
                 ts.Debug.fail("Class decorators should not have a second synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 139 /* Parameter */) {
+            if (node.kind === 141 /* Parameter */) {
                 node = node.parent;
-                if (node.kind === 145 /* Constructor */) {
+                if (node.kind === 147 /* Constructor */) {
                     // For a constructor parameter decorator, the `propertyKey` will be `undefined`.
                     return anyType;
                 }
             }
-            if (node.kind === 142 /* PropertyDeclaration */ ||
-                node.kind === 144 /* MethodDeclaration */ ||
-                node.kind === 146 /* GetAccessor */ ||
-                node.kind === 147 /* SetAccessor */) {
+            if (node.kind === 144 /* PropertyDeclaration */ ||
+                node.kind === 146 /* MethodDeclaration */ ||
+                node.kind === 148 /* GetAccessor */ ||
+                node.kind === 149 /* SetAccessor */) {
                 // The `propertyKey` for a property or method decorator will be a
                 // string literal type if the member name is an identifier, number, or string;
                 // otherwise, if the member name is a computed property name it will
@@ -22920,9 +24511,9 @@ var ts;
                     case 8 /* NumericLiteral */:
                     case 9 /* StringLiteral */:
                         return getStringLiteralTypeForText(element.name.text);
-                    case 137 /* ComputedPropertyName */:
+                    case 139 /* ComputedPropertyName */:
                         var nameType = checkComputedPropertyName(element.name);
-                        if (allConstituentTypesHaveKind(nameType, 16777216 /* ESSymbol */)) {
+                        if (isTypeOfKind(nameType, 16777216 /* ESSymbol */)) {
                             return nameType;
                         }
                         else {
@@ -22945,22 +24536,22 @@ var ts;
           */
         function getEffectiveDecoratorThirdArgumentType(node) {
             // The third argument to a decorator is either its `descriptor` for a method decorator
-            // or its `parameterIndex` for a paramter decorator
-            if (node.kind === 217 /* ClassDeclaration */) {
+            // or its `parameterIndex` for a parameter decorator
+            if (node.kind === 220 /* ClassDeclaration */) {
                 ts.Debug.fail("Class decorators should not have a third synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 139 /* Parameter */) {
+            if (node.kind === 141 /* Parameter */) {
                 // The `parameterIndex` for a parameter decorator is always a number
                 return numberType;
             }
-            if (node.kind === 142 /* PropertyDeclaration */) {
+            if (node.kind === 144 /* PropertyDeclaration */) {
                 ts.Debug.fail("Property decorators should not have a third synthetic argument.");
                 return unknownType;
             }
-            if (node.kind === 144 /* MethodDeclaration */ ||
-                node.kind === 146 /* GetAccessor */ ||
-                node.kind === 147 /* SetAccessor */) {
+            if (node.kind === 146 /* MethodDeclaration */ ||
+                node.kind === 148 /* GetAccessor */ ||
+                node.kind === 149 /* SetAccessor */) {
                 // The `descriptor` for a method decorator will be a `TypedPropertyDescriptor<T>`
                 // for the type of the member.
                 var propertyType = getTypeOfNode(node);
@@ -22992,11 +24583,11 @@ var ts;
             // Decorators provide special arguments, a tagged template expression provides
             // a special first argument, and string literals get string literal types
             // unless we're reporting errors
-            if (node.kind === 140 /* Decorator */) {
+            if (node.kind === 142 /* Decorator */) {
                 return getEffectiveDecoratorArgumentType(node, argIndex);
             }
-            else if (argIndex === 0 && node.kind === 173 /* TaggedTemplateExpression */) {
-                return globalTemplateStringsArrayType;
+            else if (argIndex === 0 && node.kind === 175 /* TaggedTemplateExpression */) {
+                return getGlobalTemplateStringsArrayType();
             }
             // This is not a synthetic argument, so we return 'undefined'
             // to signal that the caller needs to check the argument.
@@ -23007,8 +24598,8 @@ var ts;
           */
         function getEffectiveArgument(node, args, argIndex) {
             // For a decorator or the first argument of a tagged template expression we return undefined.
-            if (node.kind === 140 /* Decorator */ ||
-                (argIndex === 0 && node.kind === 173 /* TaggedTemplateExpression */)) {
+            if (node.kind === 142 /* Decorator */ ||
+                (argIndex === 0 && node.kind === 175 /* TaggedTemplateExpression */)) {
                 return undefined;
             }
             return args[argIndex];
@@ -23017,11 +24608,11 @@ var ts;
           * Gets the error node to use when reporting errors for an effective argument.
           */
         function getEffectiveArgumentErrorNode(node, argIndex, arg) {
-            if (node.kind === 140 /* Decorator */) {
+            if (node.kind === 142 /* Decorator */) {
                 // For a decorator, we use the expression of the decorator for error reporting.
                 return node.expression;
             }
-            else if (argIndex === 0 && node.kind === 173 /* TaggedTemplateExpression */) {
+            else if (argIndex === 0 && node.kind === 175 /* TaggedTemplateExpression */) {
                 // For a the first argument of a tagged template expression, we use the template of the tag for error reporting.
                 return node.template;
             }
@@ -23030,8 +24621,8 @@ var ts;
             }
         }
         function resolveCall(node, signatures, candidatesOutArray, headMessage) {
-            var isTaggedTemplate = node.kind === 173 /* TaggedTemplateExpression */;
-            var isDecorator = node.kind === 140 /* Decorator */;
+            var isTaggedTemplate = node.kind === 175 /* TaggedTemplateExpression */;
+            var isDecorator = node.kind === 142 /* Decorator */;
             var typeArguments;
             if (!isTaggedTemplate && !isDecorator) {
                 typeArguments = node.typeArguments;
@@ -23137,8 +24728,8 @@ var ts;
             }
             else if (candidateForTypeArgumentError) {
                 if (!isTaggedTemplate && !isDecorator && typeArguments) {
-                    var typeArguments_1 = node.typeArguments;
-                    checkTypeArguments(candidateForTypeArgumentError, typeArguments_1, ts.map(typeArguments_1, getTypeFromTypeNode), /*reportErrors*/ true, headMessage);
+                    var typeArguments_2 = node.typeArguments;
+                    checkTypeArguments(candidateForTypeArgumentError, typeArguments_2, ts.map(typeArguments_2, getTypeFromTypeNode), /*reportErrors*/ true, headMessage);
                 }
                 else {
                     ts.Debug.assert(resultOfFailedInference.failedTypeParameterIndex >= 0);
@@ -23250,12 +24841,14 @@ var ts;
                     // In super call, the candidate signatures are the matching arity signatures of the base constructor function instantiated
                     // with the type arguments specified in the extends clause.
                     var baseTypeNode = ts.getClassExtendsHeritageClauseElement(ts.getContainingClass(node));
-                    var baseConstructors = getInstantiatedConstructorsForTypeArguments(superType, baseTypeNode.typeArguments);
-                    return resolveCall(node, baseConstructors, candidatesOutArray);
+                    if (baseTypeNode) {
+                        var baseConstructors = getInstantiatedConstructorsForTypeArguments(superType, baseTypeNode.typeArguments);
+                        return resolveCall(node, baseConstructors, candidatesOutArray);
+                    }
                 }
                 return resolveUntypedCall(node);
             }
-            var funcType = checkExpression(node.expression);
+            var funcType = checkNonNullExpression(node.expression);
             var apparentType = getApparentType(funcType);
             if (apparentType === unknownType) {
                 // Another error has already been reported
@@ -23275,7 +24868,7 @@ var ts;
             // We exclude union types because we may have a union of function types that happen to have
             // no common signatures.
             if (isTypeAny(funcType) || (!callSignatures.length && !constructSignatures.length && !(funcType.flags & 16384 /* Union */) && isTypeAssignableTo(funcType, globalFunctionType))) {
-                // The unknownType indicates that an error already occured (and was reported).  No
+                // The unknownType indicates that an error already occurred (and was reported).  No
                 // need to report another error in this case.
                 if (funcType !== unknownType && node.typeArguments) {
                     error(node, ts.Diagnostics.Untyped_function_calls_may_not_accept_type_arguments);
@@ -23303,7 +24896,7 @@ var ts;
                     error(node.arguments[spreadIndex], ts.Diagnostics.Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_5_and_higher);
                 }
             }
-            var expressionType = checkExpression(node.expression);
+            var expressionType = checkNonNullExpression(node.expression);
             // If expressionType's apparent type(section 3.8.1) is an object type with one or
             // more construct signatures, the expression is processed in the same manner as a
             // function call, but using the construct signatures as the initial set of candidate
@@ -23338,23 +24931,53 @@ var ts;
             // that the user will not add any.
             var constructSignatures = getSignaturesOfType(expressionType, 1 /* Construct */);
             if (constructSignatures.length) {
+                if (!isConstructorAccessible(node, constructSignatures[0])) {
+                    return resolveErrorCall(node);
+                }
                 return resolveCall(node, constructSignatures, candidatesOutArray);
             }
             // If expressionType's apparent type is an object type with no construct signatures but
             // one or more call signatures, the expression is processed as a function call. A compile-time
             // error occurs if the result of the function call is not Void. The type of the result of the
-            // operation is Any.
+            // operation is Any. It is an error to have a Void this type.
             var callSignatures = getSignaturesOfType(expressionType, 0 /* Call */);
             if (callSignatures.length) {
                 var signature = resolveCall(node, callSignatures, candidatesOutArray);
                 if (getReturnTypeOfSignature(signature) !== voidType) {
                     error(node, ts.Diagnostics.Only_a_void_function_can_be_called_with_the_new_keyword);
                 }
+                if (signature.thisType === voidType) {
+                    error(node, ts.Diagnostics.A_function_that_is_called_with_the_new_keyword_cannot_have_a_this_type_that_is_void);
+                }
                 return signature;
             }
             error(node, ts.Diagnostics.Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature);
             return resolveErrorCall(node);
         }
+        function isConstructorAccessible(node, signature) {
+            if (!signature || !signature.declaration) {
+                return true;
+            }
+            var declaration = signature.declaration;
+            var flags = declaration.flags;
+            // Public constructor is accessible.
+            if (!(flags & (8 /* Private */ | 16 /* Protected */))) {
+                return true;
+            }
+            var declaringClassDeclaration = getClassLikeDeclarationOfSymbol(declaration.parent.symbol);
+            var declaringClass = getDeclaredTypeOfSymbol(declaration.parent.symbol);
+            // A private or protected constructor can only be instantiated within it's own class 
+            if (!isNodeWithinClass(node, declaringClassDeclaration)) {
+                if (flags & 8 /* Private */) {
+                    error(node, ts.Diagnostics.Constructor_of_class_0_is_private_and_only_accessible_within_the_class_declaration, typeToString(declaringClass));
+                }
+                if (flags & 16 /* Protected */) {
+                    error(node, ts.Diagnostics.Constructor_of_class_0_is_protected_and_only_accessible_within_the_class_declaration, typeToString(declaringClass));
+                }
+                return false;
+            }
+            return true;
+        }
         function resolveTaggedTemplateExpression(node, candidatesOutArray) {
             var tagType = checkExpression(node.tag);
             var apparentType = getApparentType(tagType);
@@ -23377,16 +25000,16 @@ var ts;
           */
         function getDiagnosticHeadMessageForDecoratorResolution(node) {
             switch (node.parent.kind) {
-                case 217 /* ClassDeclaration */:
-                case 189 /* ClassExpression */:
+                case 220 /* ClassDeclaration */:
+                case 191 /* ClassExpression */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression;
-                case 139 /* Parameter */:
+                case 141 /* Parameter */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression;
-                case 142 /* PropertyDeclaration */:
+                case 144 /* PropertyDeclaration */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression;
-                case 144 /* MethodDeclaration */:
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
+                case 146 /* MethodDeclaration */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression;
             }
         }
@@ -23405,7 +25028,7 @@ var ts;
             }
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             if (!callSignatures.length) {
-                var errorInfo;
+                var errorInfo = void 0;
                 errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature);
                 errorInfo = ts.chainDiagnosticMessages(errorInfo, headMessage);
                 diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(node, errorInfo));
@@ -23423,16 +25046,16 @@ var ts;
             // to correctly fill the candidatesOutArray.
             if (!links.resolvedSignature || candidatesOutArray) {
                 links.resolvedSignature = anySignature;
-                if (node.kind === 171 /* CallExpression */) {
+                if (node.kind === 173 /* CallExpression */) {
                     links.resolvedSignature = resolveCallExpression(node, candidatesOutArray);
                 }
-                else if (node.kind === 172 /* NewExpression */) {
+                else if (node.kind === 174 /* NewExpression */) {
                     links.resolvedSignature = resolveNewExpression(node, candidatesOutArray);
                 }
-                else if (node.kind === 173 /* TaggedTemplateExpression */) {
+                else if (node.kind === 175 /* TaggedTemplateExpression */) {
                     links.resolvedSignature = resolveTaggedTemplateExpression(node, candidatesOutArray);
                 }
-                else if (node.kind === 140 /* Decorator */) {
+                else if (node.kind === 142 /* Decorator */) {
                     links.resolvedSignature = resolveDecorator(node, candidatesOutArray);
                 }
                 else {
@@ -23460,12 +25083,13 @@ var ts;
             if (node.expression.kind === 95 /* SuperKeyword */) {
                 return voidType;
             }
-            if (node.kind === 172 /* NewExpression */) {
+            if (node.kind === 174 /* NewExpression */) {
                 var declaration = signature.declaration;
                 if (declaration &&
-                    declaration.kind !== 145 /* Constructor */ &&
-                    declaration.kind !== 149 /* ConstructSignature */ &&
-                    declaration.kind !== 154 /* ConstructorType */) {
+                    declaration.kind !== 147 /* Constructor */ &&
+                    declaration.kind !== 151 /* ConstructSignature */ &&
+                    declaration.kind !== 156 /* ConstructorType */ &&
+                    !ts.isJSDocConstructSignature(declaration)) {
                     // When resolved signature is a call signature (and not a construct signature) the result type is any, unless
                     // the declaring function had members created through 'x.prototype.y = expr' or 'this.y = expr' psuedodeclarations
                     // in a JS file
@@ -23480,7 +25104,7 @@ var ts;
                 }
             }
             // In JavaScript files, calls to any identifier 'require' are treated as external module imports
-            if (ts.isInJavaScriptFile(node) && ts.isRequireCall(node)) {
+            if (ts.isInJavaScriptFile(node) && ts.isRequireCall(node, /*checkArgumentIsStringLiteral*/ true)) {
                 return resolveExternalModuleTypeByLiteral(node.arguments[0]);
             }
             return getReturnTypeOfSignature(signature);
@@ -23493,19 +25117,29 @@ var ts;
             var targetType = getTypeFromTypeNode(node.type);
             if (produceDiagnostics && targetType !== unknownType) {
                 var widenedType = getWidenedType(exprType);
-                // Permit 'number[] | "foo"' to be asserted to 'string'.
-                var bothAreStringLike = someConstituentTypeHasKind(targetType, 258 /* StringLike */) &&
-                    someConstituentTypeHasKind(widenedType, 258 /* StringLike */);
-                if (!bothAreStringLike && !(isTypeAssignableTo(targetType, widenedType))) {
-                    checkTypeAssignableTo(exprType, targetType, node, ts.Diagnostics.Neither_type_0_nor_type_1_is_assignable_to_the_other);
+                if (!isTypeComparableTo(targetType, widenedType)) {
+                    checkTypeComparableTo(exprType, targetType, node, ts.Diagnostics.Type_0_cannot_be_converted_to_type_1);
                 }
             }
             return targetType;
         }
+        function checkNonNullAssertion(node) {
+            return getNonNullableType(checkExpression(node.expression));
+        }
+        function getTypeOfParameter(symbol) {
+            var type = getTypeOfSymbol(symbol);
+            if (strictNullChecks) {
+                var declaration = symbol.valueDeclaration;
+                if (declaration && declaration.initializer) {
+                    return addNullableKind(type, 32 /* Undefined */);
+                }
+            }
+            return type;
+        }
         function getTypeAtPosition(signature, pos) {
             return signature.hasRestParameter ?
-                pos < signature.parameters.length - 1 ? getTypeOfSymbol(signature.parameters[pos]) : getRestTypeOfSignature(signature) :
-                pos < signature.parameters.length ? getTypeOfSymbol(signature.parameters[pos]) : anyType;
+                pos < signature.parameters.length - 1 ? getTypeOfParameter(signature.parameters[pos]) : getRestTypeOfSignature(signature) :
+                pos < signature.parameters.length ? getTypeOfParameter(signature.parameters[pos]) : anyType;
         }
         function assignContextualParameterTypes(signature, context, mapper) {
             var len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0);
@@ -23526,7 +25160,7 @@ var ts;
             if (ts.isBindingPattern(node.name)) {
                 for (var _i = 0, _a = node.name.elements; _i < _a.length; _i++) {
                     var element = _a[_i];
-                    if (element.kind !== 190 /* OmittedExpression */) {
+                    if (element.kind !== 192 /* OmittedExpression */) {
                         if (element.name.kind === 69 /* Identifier */) {
                             getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
                         }
@@ -23574,6 +25208,13 @@ var ts;
                 inferTypes(mapper.context, links.type, instantiateType(contextualType, mapper));
             }
         }
+        function getReturnTypeFromJSDocComment(func) {
+            var returnTag = ts.getJSDocReturnTag(func);
+            if (returnTag && returnTag.typeExpression) {
+                return getTypeFromTypeNode(returnTag.typeExpression.type);
+            }
+            return undefined;
+        }
         function createPromiseType(promisedType) {
             // creates a `Promise<T>` type where `T` is the promisedType argument
             var globalPromiseType = getGlobalPromiseType();
@@ -23591,7 +25232,7 @@ var ts;
             }
             var isAsync = ts.isAsyncFunctionLike(func);
             var type;
-            if (func.body.kind !== 195 /* Block */) {
+            if (func.body.kind !== 198 /* Block */) {
                 type = checkExpressionCached(func.body, contextualMapper);
                 if (isAsync) {
                     // From within an async function you can return either a non-promise value or a promise. Any
@@ -23602,7 +25243,7 @@ var ts;
                 }
             }
             else {
-                var types;
+                var types = void 0;
                 var funcIsGenerator = !!func.asteriskToken;
                 if (funcIsGenerator) {
                     types = checkAndAggregateYieldOperandTypes(func.body, contextualMapper);
@@ -23615,7 +25256,8 @@ var ts;
                     }
                 }
                 else {
-                    types = checkAndAggregateReturnExpressionTypes(func.body, contextualMapper, isAsync);
+                    var hasImplicitReturn = !!(func.flags & 32768 /* HasImplicitReturn */);
+                    types = checkAndAggregateReturnExpressionTypes(func.body, contextualMapper, isAsync, hasImplicitReturn);
                     if (types.length === 0) {
                         if (isAsync) {
                             // For an async function, the return type will not be void, but rather a Promise for void.
@@ -23641,7 +25283,8 @@ var ts;
                     }
                     else {
                         error(func, ts.Diagnostics.No_best_common_type_exists_among_return_expressions);
-                        return unknownType;
+                        // Defer to unioning the return types so we get a) downstream errors earlier and b) better Salsa experience
+                        return getUnionType(types);
                     }
                 }
                 if (funcIsGenerator) {
@@ -23684,8 +25327,9 @@ var ts;
             });
             return aggregatedTypes;
         }
-        function checkAndAggregateReturnExpressionTypes(body, contextualMapper, isAsync) {
+        function checkAndAggregateReturnExpressionTypes(body, contextualMapper, isAsync, hasImplicitReturn) {
             var aggregatedTypes = [];
+            var hasOmittedExpressions = false;
             ts.forEachReturnStatement(body, function (returnStatement) {
                 var expr = returnStatement.expression;
                 if (expr) {
@@ -23701,14 +25345,24 @@ var ts;
                         aggregatedTypes.push(type);
                     }
                 }
+                else {
+                    hasOmittedExpressions = true;
+                }
             });
+            if (strictNullChecks && aggregatedTypes.length && (hasOmittedExpressions || hasImplicitReturn)) {
+                if (!ts.contains(aggregatedTypes, undefinedType)) {
+                    aggregatedTypes.push(undefinedType);
+                }
+            }
             return aggregatedTypes;
         }
-        /*
-         *TypeScript Specification 1.0 (6.3) - July 2014
-         * An explicitly typed function whose return type isn't the Void or the Any type
-         * must have at least one return statement somewhere in its body.
-         * An exception to this rule is if the function implementation consists of a single 'throw' statement.
+        /**
+         * TypeScript Specification 1.0 (6.3) - July 2014
+         *   An explicitly typed function whose return type isn't the Void type,
+         *   the Any type, or a union type containing the Void or Any type as a constituent
+         *   must have at least one return statement somewhere in its body.
+         *   An exception to this rule is if the function implementation consists of a single 'throw' statement.
+         *
          * @param returnType - return type of the function, can be undefined if return type is not explicitly specified
          */
         function checkAllCodePathsInNonVoidFunctionReturnOrThrow(func, returnType) {
@@ -23716,30 +25370,34 @@ var ts;
                 return;
             }
             // Functions with with an explicitly specified 'void' or 'any' return type don't need any return expressions.
-            if (returnType === voidType || isTypeAny(returnType)) {
+            if (returnType && maybeTypeOfKind(returnType, 1 /* Any */ | 16 /* Void */)) {
                 return;
             }
             // If all we have is a function signature, or an arrow function with an expression body, then there is nothing to check.
             // also if HasImplicitReturn flag is not set this means that all codepaths in function body end with return or throw
-            if (ts.nodeIsMissing(func.body) || func.body.kind !== 195 /* Block */ || !(func.flags & 524288 /* HasImplicitReturn */)) {
+            if (ts.nodeIsMissing(func.body) || func.body.kind !== 198 /* Block */ || !(func.flags & 32768 /* HasImplicitReturn */)) {
                 return;
             }
-            var hasExplicitReturn = func.flags & 1048576 /* HasExplicitReturn */;
+            var hasExplicitReturn = func.flags & 65536 /* HasExplicitReturn */;
             if (returnType && !hasExplicitReturn) {
                 // minimal check: function has syntactic return type annotation and no explicit return statements in the body
                 // this function does not conform to the specification.
                 // NOTE: having returnType !== undefined is a precondition for entering this branch so func.type will always be present
                 error(func.type, ts.Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value);
             }
+            else if (returnType && strictNullChecks && !isTypeAssignableTo(undefinedType, returnType)) {
+                error(func.type, ts.Diagnostics.Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined);
+            }
             else if (compilerOptions.noImplicitReturns) {
                 if (!returnType) {
                     // If return type annotation is omitted check if function has any explicit return statements.
                     // If it does not have any - its inferred return type is void - don't do any checks.
                     // Otherwise get inferred return type from function body and report error only if it is not void / anytype
-                    var inferredReturnType = hasExplicitReturn
-                        ? getReturnTypeOfSignature(getSignatureFromDeclaration(func))
-                        : voidType;
-                    if (inferredReturnType === voidType || isTypeAny(inferredReturnType)) {
+                    if (!hasExplicitReturn) {
+                        return;
+                    }
+                    var inferredReturnType = getReturnTypeOfSignature(getSignatureFromDeclaration(func));
+                    if (isUnwrappedReturnTypeVoidOrAny(func, inferredReturnType)) {
                         return;
                     }
                 }
@@ -23747,14 +25405,15 @@ var ts;
             }
         }
         function checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper) {
-            ts.Debug.assert(node.kind !== 144 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 146 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             // Grammar checking
             var hasGrammarError = checkGrammarFunctionLikeDeclaration(node);
-            if (!hasGrammarError && node.kind === 176 /* FunctionExpression */) {
+            if (!hasGrammarError && node.kind === 178 /* FunctionExpression */) {
                 checkGrammarForGenerator(node);
             }
             // The identityMapper object is used to indicate that function expressions are wildcards
             if (contextualMapper === identityMapper && isContextSensitive(node)) {
+                checkNodeDeferred(node);
                 return anyFunctionType;
             }
             var links = getNodeLinks(node);
@@ -23790,14 +25449,14 @@ var ts;
                     }
                 }
             }
-            if (produceDiagnostics && node.kind !== 144 /* MethodDeclaration */ && node.kind !== 143 /* MethodSignature */) {
+            if (produceDiagnostics && node.kind !== 146 /* MethodDeclaration */ && node.kind !== 145 /* MethodSignature */) {
                 checkCollisionWithCapturedSuperVariable(node, node.name);
                 checkCollisionWithCapturedThisVariable(node, node.name);
             }
             return type;
         }
         function checkFunctionExpressionOrObjectLiteralMethodDeferred(node) {
-            ts.Debug.assert(node.kind !== 144 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 146 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var isAsync = ts.isAsyncFunctionLike(node);
             var returnOrPromisedType = node.type && (isAsync ? checkAsyncFunctionReturnType(node) : getTypeFromTypeNode(node.type));
             if (!node.asteriskToken) {
@@ -23813,7 +25472,7 @@ var ts;
                     // checkFunctionExpressionBodies). So it must be done now.
                     getReturnTypeOfSignature(getSignatureFromDeclaration(node));
                 }
-                if (node.body.kind === 195 /* Block */) {
+                if (node.body.kind === 198 /* Block */) {
                     checkSourceElement(node.body);
                 }
                 else {
@@ -23842,75 +25501,74 @@ var ts;
             }
             return true;
         }
-        function checkReferenceExpression(n, invalidReferenceMessage, constantVariableMessage) {
-            function findSymbol(n) {
-                var symbol = getNodeLinks(n).resolvedSymbol;
-                // Because we got the symbol from the resolvedSymbol property, it might be of kind
-                // SymbolFlags.ExportValue. In this case it is necessary to get the actual export
-                // symbol, which will have the correct flags set on it.
-                return symbol && getExportSymbolOfValueSymbolIfExported(symbol);
+        function isReadonlySymbol(symbol) {
+            // The following symbols are considered read-only:
+            // Properties with a 'readonly' modifier
+            // Variables declared with 'const'
+            // Get accessors without matching set accessors
+            // Enum members
+            return symbol.flags & 4 /* Property */ && (getDeclarationFlagsFromSymbol(symbol) & 64 /* Readonly */) !== 0 ||
+                symbol.flags & 3 /* Variable */ && (getDeclarationFlagsFromSymbol(symbol) & 2048 /* Const */) !== 0 ||
+                symbol.flags & 98304 /* Accessor */ && !(symbol.flags & 65536 /* SetAccessor */) ||
+                (symbol.flags & 8 /* EnumMember */) !== 0;
+        }
+        function isReferenceToReadonlyEntity(expr, symbol) {
+            if (isReadonlySymbol(symbol)) {
+                // Allow assignments to readonly properties within constructors of the same class declaration.
+                if (symbol.flags & 4 /* Property */ &&
+                    (expr.kind === 171 /* PropertyAccessExpression */ || expr.kind === 172 /* ElementAccessExpression */) &&
+                    expr.expression.kind === 97 /* ThisKeyword */) {
+                    var func = ts.getContainingFunction(expr);
+                    return !(func && func.kind === 147 /* Constructor */ && func.parent === symbol.valueDeclaration.parent);
+                }
+                return true;
             }
-            function isReferenceOrErrorExpression(n) {
-                // TypeScript 1.0 spec (April 2014):
-                // Expressions are classified as values or references.
-                // References are the subset of expressions that are permitted as the target of an assignment.
-                // Specifically, references are combinations of identifiers(section 4.3), parentheses(section 4.7),
-                // and property accesses(section 4.10).
-                // All other expression constructs described in this chapter are classified as values.
-                switch (n.kind) {
-                    case 69 /* Identifier */: {
-                        var symbol = findSymbol(n);
-                        // TypeScript 1.0 spec (April 2014): 4.3
-                        // An identifier expression that references a variable or parameter is classified as a reference.
-                        // An identifier expression that references any other kind of entity is classified as a value(and therefore cannot be the target of an assignment).
-                        return !symbol || symbol === unknownSymbol || symbol === argumentsSymbol || (symbol.flags & 3 /* Variable */) !== 0;
+            return false;
+        }
+        function isReferenceThroughNamespaceImport(expr) {
+            if (expr.kind === 171 /* PropertyAccessExpression */ || expr.kind === 172 /* ElementAccessExpression */) {
+                var node = skipParenthesizedNodes(expr.expression);
+                if (node.kind === 69 /* Identifier */) {
+                    var symbol = getNodeLinks(node).resolvedSymbol;
+                    if (symbol.flags & 8388608 /* Alias */) {
+                        var declaration = getDeclarationOfAliasSymbol(symbol);
+                        return declaration && declaration.kind === 231 /* NamespaceImport */;
                     }
-                    case 169 /* PropertyAccessExpression */: {
-                        var symbol = findSymbol(n);
-                        // TypeScript 1.0 spec (April 2014): 4.10
-                        // A property access expression is always classified as a reference.
-                        // NOTE (not in spec): assignment to enum members should not be allowed
-                        return !symbol || symbol === unknownSymbol || (symbol.flags & ~8 /* EnumMember */) !== 0;
-                    }
-                    case 170 /* ElementAccessExpression */:
-                        //  old compiler doesn't check indexed access
-                        return true;
-                    case 175 /* ParenthesizedExpression */:
-                        return isReferenceOrErrorExpression(n.expression);
-                    default:
-                        return false;
                 }
             }
-            function isConstVariableReference(n) {
-                switch (n.kind) {
-                    case 69 /* Identifier */:
-                    case 169 /* PropertyAccessExpression */: {
-                        var symbol = findSymbol(n);
-                        return symbol && (symbol.flags & 3 /* Variable */) !== 0 && (getDeclarationFlagsFromSymbol(symbol) & 16384 /* Const */) !== 0;
-                    }
-                    case 170 /* ElementAccessExpression */: {
-                        var index = n.argumentExpression;
-                        var symbol = findSymbol(n.expression);
-                        if (symbol && index && index.kind === 9 /* StringLiteral */) {
-                            var name_12 = index.text;
-                            var prop = getPropertyOfType(getTypeOfSymbol(symbol), name_12);
-                            return prop && (prop.flags & 3 /* Variable */) !== 0 && (getDeclarationFlagsFromSymbol(prop) & 16384 /* Const */) !== 0;
-                        }
+            return false;
+        }
+        function checkReferenceExpression(expr, invalidReferenceMessage, constantVariableMessage) {
+            // References are combinations of identifiers, parentheses, and property accesses.
+            var node = skipParenthesizedNodes(expr);
+            if (node.kind !== 69 /* Identifier */ && node.kind !== 171 /* PropertyAccessExpression */ && node.kind !== 172 /* ElementAccessExpression */) {
+                error(expr, invalidReferenceMessage);
+                return false;
+            }
+            // Because we get the symbol from the resolvedSymbol property, it might be of kind
+            // SymbolFlags.ExportValue. In this case it is necessary to get the actual export
+            // symbol, which will have the correct flags set on it.
+            var links = getNodeLinks(node);
+            var symbol = getExportSymbolOfValueSymbolIfExported(links.resolvedSymbol);
+            if (symbol) {
+                if (symbol !== unknownSymbol && symbol !== argumentsSymbol) {
+                    // Only variables (and not functions, classes, namespaces, enum objects, or enum members)
+                    // are considered references when referenced using a simple identifier.
+                    if (node.kind === 69 /* Identifier */ && !(symbol.flags & 3 /* Variable */)) {
+                        error(expr, invalidReferenceMessage);
                         return false;
                     }
-                    case 175 /* ParenthesizedExpression */:
-                        return isConstVariableReference(n.expression);
-                    default:
+                    if (isReferenceToReadonlyEntity(node, symbol) || isReferenceThroughNamespaceImport(node)) {
+                        error(expr, constantVariableMessage);
                         return false;
+                    }
                 }
             }
-            if (!isReferenceOrErrorExpression(n)) {
-                error(n, invalidReferenceMessage);
-                return false;
-            }
-            if (isConstVariableReference(n)) {
-                error(n, constantVariableMessage);
-                return false;
+            else if (node.kind === 172 /* ElementAccessExpression */) {
+                if (links.resolvedIndexInfo && links.resolvedIndexInfo.isReadonly) {
+                    error(expr, constantVariableMessage);
+                    return false;
+                }
             }
             return true;
         }
@@ -23929,7 +25587,7 @@ var ts;
         function checkAwaitExpression(node) {
             // Grammar checking
             if (produceDiagnostics) {
-                if (!(node.parserContextFlags & 8 /* Await */)) {
+                if (!(node.flags & 33554432 /* AwaitContext */)) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function);
                 }
                 if (isInParameterInitializerBeforeContainingFunction(node)) {
@@ -23945,7 +25603,7 @@ var ts;
                 case 35 /* PlusToken */:
                 case 36 /* MinusToken */:
                 case 50 /* TildeToken */:
-                    if (someConstituentTypeHasKind(operandType, 16777216 /* ESSymbol */)) {
+                    if (maybeTypeOfKind(operandType, 16777216 /* ESSymbol */)) {
                         error(node.operand, ts.Diagnostics.The_0_operator_cannot_be_applied_to_type_symbol, ts.tokenToString(node.operator));
                     }
                     return numberType;
@@ -23953,10 +25611,10 @@ var ts;
                     return booleanType;
                 case 41 /* PlusPlusToken */:
                 case 42 /* MinusMinusToken */:
-                    var ok = checkArithmeticOperandType(node.operand, operandType, ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
+                    var ok = checkArithmeticOperandType(node.operand, getNonNullableType(operandType), ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
                     if (ok) {
                         // run check only if former checks succeeded to avoid reporting cascading errors
-                        checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant);
+                        checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property);
                     }
                     return numberType;
             }
@@ -23964,46 +25622,56 @@ var ts;
         }
         function checkPostfixUnaryExpression(node) {
             var operandType = checkExpression(node.operand);
-            var ok = checkArithmeticOperandType(node.operand, operandType, ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
+            var ok = checkArithmeticOperandType(node.operand, getNonNullableType(operandType), ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
             if (ok) {
                 // run check only if former checks succeeded to avoid reporting cascading errors
-                checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant);
+                checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property);
             }
             return numberType;
         }
-        // Just like isTypeOfKind below, except that it returns true if *any* constituent
-        // has this kind.
-        function someConstituentTypeHasKind(type, kind) {
+        // Return true if type might be of the given kind. A union or intersection type might be of a given
+        // kind if at least one constituent type is of the given kind.
+        function maybeTypeOfKind(type, kind) {
             if (type.flags & kind) {
                 return true;
             }
             if (type.flags & 49152 /* UnionOrIntersection */) {
                 var types = type.types;
                 for (var _i = 0, types_10 = types; _i < types_10.length; _i++) {
-                    var current = types_10[_i];
-                    if (current.flags & kind) {
+                    var t = types_10[_i];
+                    if (maybeTypeOfKind(t, kind)) {
                         return true;
                     }
                 }
-                return false;
             }
             return false;
         }
-        // Return true if type has the given flags, or is a union or intersection type composed of types that all have those flags.
-        function allConstituentTypesHaveKind(type, kind) {
+        // Return true if type is of the given kind. A union type is of a given kind if all constituent types
+        // are of the given kind. An intersection type is of a given kind if at least one constituent type is
+        // of the given kind.
+        function isTypeOfKind(type, kind) {
             if (type.flags & kind) {
                 return true;
             }
-            if (type.flags & 49152 /* UnionOrIntersection */) {
+            if (type.flags & 16384 /* Union */) {
                 var types = type.types;
                 for (var _i = 0, types_11 = types; _i < types_11.length; _i++) {
-                    var current = types_11[_i];
-                    if (!(current.flags & kind)) {
+                    var t = types_11[_i];
+                    if (!isTypeOfKind(t, kind)) {
                         return false;
                     }
                 }
                 return true;
             }
+            if (type.flags & 32768 /* Intersection */) {
+                var types = type.types;
+                for (var _a = 0, types_12 = types; _a < types_12.length; _a++) {
+                    var t = types_12[_a];
+                    if (isTypeOfKind(t, kind)) {
+                        return true;
+                    }
+                }
+            }
             return false;
         }
         function isConstEnumObjectType(type) {
@@ -24018,7 +25686,7 @@ var ts;
             // and the right operand to be of type Any or a subtype of the 'Function' interface type.
             // The result is always of the Boolean primitive type.
             // NOTE: do not raise error if leftType is unknown as related error was already reported
-            if (allConstituentTypesHaveKind(leftType, 16777726 /* Primitive */)) {
+            if (isTypeOfKind(leftType, 16777726 /* Primitive */)) {
                 error(left, ts.Diagnostics.The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter);
             }
             // NOTE: do not raise error if right is unknown as related error was already reported
@@ -24044,9 +25712,9 @@ var ts;
             var properties = node.properties;
             for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
                 var p = properties_3[_i];
-                if (p.kind === 248 /* PropertyAssignment */ || p.kind === 249 /* ShorthandPropertyAssignment */) {
+                if (p.kind === 252 /* PropertyAssignment */ || p.kind === 253 /* ShorthandPropertyAssignment */) {
                     var name_13 = p.name;
-                    if (name_13.kind === 137 /* ComputedPropertyName */) {
+                    if (name_13.kind === 139 /* ComputedPropertyName */) {
                         checkComputedPropertyName(name_13);
                     }
                     if (isComputedNonLiteralName(name_13)) {
@@ -24059,7 +25727,7 @@ var ts;
                             isNumericLiteralName(text) && getIndexTypeOfType(sourceType, 1 /* Number */) ||
                             getIndexTypeOfType(sourceType, 0 /* String */);
                     if (type) {
-                        if (p.kind === 249 /* ShorthandPropertyAssignment */) {
+                        if (p.kind === 253 /* ShorthandPropertyAssignment */) {
                             checkDestructuringAssignment(p, type);
                         }
                         else {
@@ -24085,8 +25753,8 @@ var ts;
             var elements = node.elements;
             for (var i = 0; i < elements.length; i++) {
                 var e = elements[i];
-                if (e.kind !== 190 /* OmittedExpression */) {
-                    if (e.kind !== 188 /* SpreadElementExpression */) {
+                if (e.kind !== 192 /* OmittedExpression */) {
+                    if (e.kind !== 190 /* SpreadElementExpression */) {
                         var propName = "" + i;
                         var type = isTypeAny(sourceType)
                             ? sourceType
@@ -24111,7 +25779,7 @@ var ts;
                         }
                         else {
                             var restExpression = e.expression;
-                            if (restExpression.kind === 184 /* BinaryExpression */ && restExpression.operatorToken.kind === 56 /* EqualsToken */) {
+                            if (restExpression.kind === 186 /* BinaryExpression */ && restExpression.operatorToken.kind === 56 /* EqualsToken */) {
                                 error(restExpression.operatorToken, ts.Diagnostics.A_rest_element_cannot_have_an_initializer);
                             }
                             else {
@@ -24125,7 +25793,7 @@ var ts;
         }
         function checkDestructuringAssignment(exprOrAssignment, sourceType, contextualMapper) {
             var target;
-            if (exprOrAssignment.kind === 249 /* ShorthandPropertyAssignment */) {
+            if (exprOrAssignment.kind === 253 /* ShorthandPropertyAssignment */) {
                 var prop = exprOrAssignment;
                 if (prop.objectAssignmentInitializer) {
                     checkBinaryLikeExpression(prop.name, prop.equalsToken, prop.objectAssignmentInitializer, contextualMapper);
@@ -24135,21 +25803,21 @@ var ts;
             else {
                 target = exprOrAssignment;
             }
-            if (target.kind === 184 /* BinaryExpression */ && target.operatorToken.kind === 56 /* EqualsToken */) {
+            if (target.kind === 186 /* BinaryExpression */ && target.operatorToken.kind === 56 /* EqualsToken */) {
                 checkBinaryExpression(target, contextualMapper);
                 target = target.left;
             }
-            if (target.kind === 168 /* ObjectLiteralExpression */) {
+            if (target.kind === 170 /* ObjectLiteralExpression */) {
                 return checkObjectLiteralAssignment(target, sourceType, contextualMapper);
             }
-            if (target.kind === 167 /* ArrayLiteralExpression */) {
+            if (target.kind === 169 /* ArrayLiteralExpression */) {
                 return checkArrayLiteralAssignment(target, sourceType, contextualMapper);
             }
             return checkReferenceAssignment(target, sourceType, contextualMapper);
         }
         function checkReferenceAssignment(target, sourceType, contextualMapper) {
             var targetType = checkExpression(target, contextualMapper);
-            if (checkReferenceExpression(target, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant)) {
+            if (checkReferenceExpression(target, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property)) {
                 checkTypeAssignableTo(sourceType, targetType, target, /*headMessage*/ undefined);
             }
             return sourceType;
@@ -24159,7 +25827,7 @@ var ts;
         }
         function checkBinaryLikeExpression(left, operatorToken, right, contextualMapper, errorNode) {
             var operator = operatorToken.kind;
-            if (operator === 56 /* EqualsToken */ && (left.kind === 168 /* ObjectLiteralExpression */ || left.kind === 167 /* ArrayLiteralExpression */)) {
+            if (operator === 56 /* EqualsToken */ && (left.kind === 170 /* ObjectLiteralExpression */ || left.kind === 169 /* ArrayLiteralExpression */)) {
                 return checkDestructuringAssignment(left, checkExpression(right, contextualMapper), contextualMapper);
             }
             var leftType = checkExpression(left, contextualMapper);
@@ -24193,11 +25861,13 @@ var ts;
                     // as having the primitive type Number. If one operand is the null or undefined value,
                     // it is treated as having the type of the other operand.
                     // The result is always of the Number primitive type.
-                    if (leftType.flags & (32 /* Undefined */ | 64 /* Null */))
+                    if (leftType.flags & 96 /* Nullable */)
                         leftType = rightType;
-                    if (rightType.flags & (32 /* Undefined */ | 64 /* Null */))
+                    if (rightType.flags & 96 /* Nullable */)
                         rightType = leftType;
-                    var suggestedOperator;
+                    leftType = getNonNullableType(leftType);
+                    rightType = getNonNullableType(rightType);
+                    var suggestedOperator = void 0;
                     // if a user tries to apply a bitwise operator to 2 boolean operands
                     // try and return them a helpful suggestion
                     if ((leftType.flags & 8 /* Boolean */) &&
@@ -24220,18 +25890,20 @@ var ts;
                     // The binary + operator requires both operands to be of the Number primitive type or an enum type,
                     // or at least one of the operands to be of type Any or the String primitive type.
                     // If one operand is the null or undefined value, it is treated as having the type of the other operand.
-                    if (leftType.flags & (32 /* Undefined */ | 64 /* Null */))
+                    if (leftType.flags & 96 /* Nullable */)
                         leftType = rightType;
-                    if (rightType.flags & (32 /* Undefined */ | 64 /* Null */))
+                    if (rightType.flags & 96 /* Nullable */)
                         rightType = leftType;
-                    var resultType;
-                    if (allConstituentTypesHaveKind(leftType, 132 /* NumberLike */) && allConstituentTypesHaveKind(rightType, 132 /* NumberLike */)) {
+                    leftType = getNonNullableType(leftType);
+                    rightType = getNonNullableType(rightType);
+                    var resultType = void 0;
+                    if (isTypeOfKind(leftType, 132 /* NumberLike */) && isTypeOfKind(rightType, 132 /* NumberLike */)) {
                         // Operands of an enum type are treated as having the primitive type Number.
                         // If both operands are of the Number primitive type, the result is of the Number primitive type.
                         resultType = numberType;
                     }
                     else {
-                        if (allConstituentTypesHaveKind(leftType, 258 /* StringLike */) || allConstituentTypesHaveKind(rightType, 258 /* StringLike */)) {
+                        if (isTypeOfKind(leftType, 258 /* StringLike */) || isTypeOfKind(rightType, 258 /* StringLike */)) {
                             // If one or both operands are of the String primitive type, the result is of the String primitive type.
                             resultType = stringType;
                         }
@@ -24265,11 +25937,7 @@ var ts;
                 case 31 /* ExclamationEqualsToken */:
                 case 32 /* EqualsEqualsEqualsToken */:
                 case 33 /* ExclamationEqualsEqualsToken */:
-                    // Permit 'number[] | "foo"' to be asserted to 'string'.
-                    if (someConstituentTypeHasKind(leftType, 258 /* StringLike */) && someConstituentTypeHasKind(rightType, 258 /* StringLike */)) {
-                        return booleanType;
-                    }
-                    if (!isTypeAssignableTo(leftType, rightType) && !isTypeAssignableTo(rightType, leftType)) {
+                    if (!isTypeComparableTo(leftType, rightType) && !isTypeComparableTo(rightType, leftType)) {
                         reportOperatorError();
                     }
                     return booleanType;
@@ -24278,9 +25946,9 @@ var ts;
                 case 90 /* InKeyword */:
                     return checkInExpression(left, right, leftType, rightType);
                 case 51 /* AmpersandAmpersandToken */:
-                    return rightType;
+                    return addNullableKind(rightType, getNullableKind(leftType));
                 case 52 /* BarBarToken */:
-                    return getUnionType([leftType, rightType]);
+                    return getUnionType([getNonNullableType(leftType), rightType]);
                 case 56 /* EqualsToken */:
                     checkAssignmentOperator(rightType);
                     return getRegularTypeOfObjectLiteral(rightType);
@@ -24289,8 +25957,8 @@ var ts;
             }
             // Return true if there was no error, false if there was an error.
             function checkForDisallowedESSymbolOperand(operator) {
-                var offendingSymbolOperand = someConstituentTypeHasKind(leftType, 16777216 /* ESSymbol */) ? left :
-                    someConstituentTypeHasKind(rightType, 16777216 /* ESSymbol */) ? right :
+                var offendingSymbolOperand = maybeTypeOfKind(leftType, 16777216 /* ESSymbol */) ? left :
+                    maybeTypeOfKind(rightType, 16777216 /* ESSymbol */) ? right :
                         undefined;
                 if (offendingSymbolOperand) {
                     error(offendingSymbolOperand, ts.Diagnostics.The_0_operator_cannot_be_applied_to_type_symbol, ts.tokenToString(operator));
@@ -24321,7 +25989,7 @@ var ts;
                     // requires VarExpr to be classified as a reference
                     // A compound assignment furthermore requires VarExpr to be classified as a reference (section 4.1)
                     // and the type of the non - compound operation to be assignable to the type of VarExpr.
-                    var ok = checkReferenceExpression(left, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant);
+                    var ok = checkReferenceExpression(left, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property);
                     // Use default messages
                     if (ok) {
                         // to avoid cascading errors check assignability only if 'isReference' check succeeded and no errors were reported
@@ -24351,7 +26019,7 @@ var ts;
         function checkYieldExpression(node) {
             // Grammar checking
             if (produceDiagnostics) {
-                if (!(node.parserContextFlags & 2 /* Yield */) || isYieldExpressionInClass(node)) {
+                if (!(node.flags & 8388608 /* YieldContext */) || isYieldExpressionInClass(node)) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.A_yield_expression_is_only_allowed_in_a_generator_body);
                 }
                 if (isInParameterInitializerBeforeContainingFunction(node)) {
@@ -24364,7 +26032,7 @@ var ts;
                 // we are in a yield context.
                 if (func && func.asteriskToken) {
                     var expressionType = checkExpressionCached(node.expression, /*contextualMapper*/ undefined);
-                    var expressionElementType;
+                    var expressionElementType = void 0;
                     var nodeIsYieldStar = !!node.asteriskToken;
                     if (nodeIsYieldStar) {
                         expressionElementType = checkElementTypeOfIterable(expressionType, node.expression);
@@ -24428,7 +26096,7 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name.kind === 137 /* ComputedPropertyName */) {
+            if (node.name.kind === 139 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
             }
             return checkExpression(node.initializer, contextualMapper);
@@ -24439,7 +26107,7 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name.kind === 137 /* ComputedPropertyName */) {
+            if (node.name.kind === 139 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
             }
             var uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
@@ -24469,7 +26137,7 @@ var ts;
         // contextually typed function and arrow expressions in the initial phase.
         function checkExpression(node, contextualMapper) {
             var type;
-            if (node.kind === 136 /* QualifiedName */) {
+            if (node.kind === 138 /* QualifiedName */) {
                 type = checkQualifiedName(node);
             }
             else {
@@ -24481,9 +26149,9 @@ var ts;
                 // - 'left' in property access
                 // - 'object' in indexed access
                 // - target in rhs of import statement
-                var ok = (node.parent.kind === 169 /* PropertyAccessExpression */ && node.parent.expression === node) ||
-                    (node.parent.kind === 170 /* ElementAccessExpression */ && node.parent.expression === node) ||
-                    ((node.kind === 69 /* Identifier */ || node.kind === 136 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node));
+                var ok = (node.parent.kind === 171 /* PropertyAccessExpression */ && node.parent.expression === node) ||
+                    (node.parent.kind === 172 /* ElementAccessExpression */ && node.parent.expression === node) ||
+                    ((node.kind === 69 /* Identifier */ || node.kind === 138 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node));
                 if (!ok) {
                     error(node, ts.Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment);
                 }
@@ -24510,7 +26178,7 @@ var ts;
                     return booleanType;
                 case 8 /* NumericLiteral */:
                     return checkNumericLiteral(node);
-                case 186 /* TemplateExpression */:
+                case 188 /* TemplateExpression */:
                     return checkTemplateExpression(node);
                 case 9 /* StringLiteral */:
                     return checkStringLiteralExpression(node);
@@ -24518,58 +26186,60 @@ var ts;
                     return stringType;
                 case 10 /* RegularExpressionLiteral */:
                     return globalRegExpType;
-                case 167 /* ArrayLiteralExpression */:
+                case 169 /* ArrayLiteralExpression */:
                     return checkArrayLiteral(node, contextualMapper);
-                case 168 /* ObjectLiteralExpression */:
+                case 170 /* ObjectLiteralExpression */:
                     return checkObjectLiteral(node, contextualMapper);
-                case 169 /* PropertyAccessExpression */:
+                case 171 /* PropertyAccessExpression */:
                     return checkPropertyAccessExpression(node);
-                case 170 /* ElementAccessExpression */:
+                case 172 /* ElementAccessExpression */:
                     return checkIndexedAccess(node);
-                case 171 /* CallExpression */:
-                case 172 /* NewExpression */:
+                case 173 /* CallExpression */:
+                case 174 /* NewExpression */:
                     return checkCallExpression(node);
-                case 173 /* TaggedTemplateExpression */:
+                case 175 /* TaggedTemplateExpression */:
                     return checkTaggedTemplateExpression(node);
-                case 175 /* ParenthesizedExpression */:
+                case 177 /* ParenthesizedExpression */:
                     return checkExpression(node.expression, contextualMapper);
-                case 189 /* ClassExpression */:
+                case 191 /* ClassExpression */:
                     return checkClassExpression(node);
-                case 176 /* FunctionExpression */:
-                case 177 /* ArrowFunction */:
+                case 178 /* FunctionExpression */:
+                case 179 /* ArrowFunction */:
                     return checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
-                case 179 /* TypeOfExpression */:
+                case 181 /* TypeOfExpression */:
                     return checkTypeOfExpression(node);
-                case 174 /* TypeAssertionExpression */:
-                case 192 /* AsExpression */:
+                case 176 /* TypeAssertionExpression */:
+                case 194 /* AsExpression */:
                     return checkAssertion(node);
-                case 178 /* DeleteExpression */:
+                case 195 /* NonNullExpression */:
+                    return checkNonNullAssertion(node);
+                case 180 /* DeleteExpression */:
                     return checkDeleteExpression(node);
-                case 180 /* VoidExpression */:
+                case 182 /* VoidExpression */:
                     return checkVoidExpression(node);
-                case 181 /* AwaitExpression */:
+                case 183 /* AwaitExpression */:
                     return checkAwaitExpression(node);
-                case 182 /* PrefixUnaryExpression */:
+                case 184 /* PrefixUnaryExpression */:
                     return checkPrefixUnaryExpression(node);
-                case 183 /* PostfixUnaryExpression */:
+                case 185 /* PostfixUnaryExpression */:
                     return checkPostfixUnaryExpression(node);
-                case 184 /* BinaryExpression */:
+                case 186 /* BinaryExpression */:
                     return checkBinaryExpression(node, contextualMapper);
-                case 185 /* ConditionalExpression */:
+                case 187 /* ConditionalExpression */:
                     return checkConditionalExpression(node, contextualMapper);
-                case 188 /* SpreadElementExpression */:
+                case 190 /* SpreadElementExpression */:
                     return checkSpreadElementExpression(node, contextualMapper);
-                case 190 /* OmittedExpression */:
+                case 192 /* OmittedExpression */:
                     return undefinedType;
-                case 187 /* YieldExpression */:
+                case 189 /* YieldExpression */:
                     return checkYieldExpression(node);
-                case 243 /* JsxExpression */:
+                case 247 /* JsxExpression */:
                     return checkJsxExpression(node);
-                case 236 /* JsxElement */:
+                case 240 /* JsxElement */:
                     return checkJsxElement(node);
-                case 237 /* JsxSelfClosingElement */:
+                case 241 /* JsxSelfClosingElement */:
                     return checkJsxSelfClosingElement(node);
-                case 238 /* JsxOpeningElement */:
+                case 242 /* JsxOpeningElement */:
                     ts.Debug.fail("Shouldn't ever directly check a JsxOpeningElement");
             }
             return unknownType;
@@ -24595,15 +26265,26 @@ var ts;
             checkGrammarDecorators(node) || checkGrammarModifiers(node);
             checkVariableLikeDeclaration(node);
             var func = ts.getContainingFunction(node);
-            if (node.flags & 56 /* AccessibilityModifier */) {
+            if (node.flags & 28 /* AccessibilityModifier */) {
                 func = ts.getContainingFunction(node);
-                if (!(func.kind === 145 /* Constructor */ && ts.nodeIsPresent(func.body))) {
+                if (!(func.kind === 147 /* Constructor */ && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                 }
             }
             if (node.questionToken && ts.isBindingPattern(node.name) && func.body) {
                 error(node, ts.Diagnostics.A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature);
             }
+            if (node.name.text === "this") {
+                if (ts.indexOf(func.parameters, node) !== 0) {
+                    error(node, ts.Diagnostics.A_this_parameter_must_be_the_first_parameter);
+                }
+                if (func.kind === 147 /* Constructor */ || func.kind === 151 /* ConstructSignature */ || func.kind === 156 /* ConstructorType */) {
+                    error(node, ts.Diagnostics.A_constructor_cannot_have_a_this_parameter);
+                }
+                if (func.kind === 149 /* SetAccessor */) {
+                    error(node, ts.Diagnostics.A_setter_cannot_have_a_this_parameter);
+                }
+            }
             // Only check rest parameter type if it's not a binding pattern. Since binding patterns are
             // not allowed in a rest parameter, we already have an error from checkGrammarParameterList.
             if (node.dotDotDotToken && !ts.isBindingPattern(node.name) && !isArrayType(getTypeOfSymbol(node.symbol))) {
@@ -24614,9 +26295,9 @@ var ts;
             if (!node.asteriskToken || !node.body) {
                 return false;
             }
-            return node.kind === 144 /* MethodDeclaration */ ||
-                node.kind === 216 /* FunctionDeclaration */ ||
-                node.kind === 176 /* FunctionExpression */;
+            return node.kind === 146 /* MethodDeclaration */ ||
+                node.kind === 219 /* FunctionDeclaration */ ||
+                node.kind === 178 /* FunctionExpression */;
         }
         function getTypePredicateParameterIndex(parameterList, parameter) {
             if (parameterList) {
@@ -24633,32 +26314,34 @@ var ts;
         function checkTypePredicate(node) {
             var parent = getTypePredicateParent(node);
             if (!parent) {
+                // The parent must not be valid.
+                error(node, ts.Diagnostics.A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods);
                 return;
             }
-            var returnType = getReturnTypeOfSignature(getSignatureFromDeclaration(parent));
-            if (!returnType || !(returnType.flags & 134217728 /* PredicateType */)) {
+            var typePredicate = getSignatureFromDeclaration(parent).typePredicate;
+            if (!typePredicate) {
                 return;
             }
             var parameterName = node.parameterName;
-            if (parameterName.kind === 162 /* ThisType */) {
+            if (ts.isThisTypePredicate(typePredicate)) {
                 getTypeFromThisTypeNode(parameterName);
             }
             else {
-                var typePredicate = returnType.predicate;
                 if (typePredicate.parameterIndex >= 0) {
                     if (parent.parameters[typePredicate.parameterIndex].dotDotDotToken) {
                         error(parameterName, ts.Diagnostics.A_type_predicate_cannot_reference_a_rest_parameter);
                     }
                     else {
-                        checkTypeAssignableTo(typePredicate.type, getTypeOfNode(parent.parameters[typePredicate.parameterIndex]), node.type);
+                        var leadingError = ts.chainDiagnosticMessages(undefined, ts.Diagnostics.A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type);
+                        checkTypeAssignableTo(typePredicate.type, getTypeOfNode(parent.parameters[typePredicate.parameterIndex]), node.type, 
+                        /*headMessage*/ undefined, leadingError);
                     }
                 }
                 else if (parameterName) {
                     var hasReportedError = false;
                     for (var _i = 0, _a = parent.parameters; _i < _a.length; _i++) {
                         var name_14 = _a[_i].name;
-                        if ((name_14.kind === 164 /* ObjectBindingPattern */ ||
-                            name_14.kind === 165 /* ArrayBindingPattern */) &&
+                        if (ts.isBindingPattern(name_14) &&
                             checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_14, parameterName, typePredicate.parameterName)) {
                             hasReportedError = true;
                             break;
@@ -24672,16 +26355,16 @@ var ts;
         }
         function getTypePredicateParent(node) {
             switch (node.parent.kind) {
-                case 177 /* ArrowFunction */:
-                case 148 /* CallSignature */:
-                case 216 /* FunctionDeclaration */:
-                case 176 /* FunctionExpression */:
-                case 153 /* FunctionType */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
-                    var parent_6 = node.parent;
-                    if (node === parent_6.type) {
-                        return parent_6;
+                case 179 /* ArrowFunction */:
+                case 150 /* CallSignature */:
+                case 219 /* FunctionDeclaration */:
+                case 178 /* FunctionExpression */:
+                case 155 /* FunctionType */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
+                    var parent_8 = node.parent;
+                    if (node === parent_8.type) {
+                        return parent_8;
                     }
             }
         }
@@ -24693,8 +26376,8 @@ var ts;
                     error(predicateVariableNode, ts.Diagnostics.A_type_predicate_cannot_reference_element_0_in_a_binding_pattern, predicateVariableName);
                     return true;
                 }
-                else if (name_15.kind === 165 /* ArrayBindingPattern */ ||
-                    name_15.kind === 164 /* ObjectBindingPattern */) {
+                else if (name_15.kind === 167 /* ArrayBindingPattern */ ||
+                    name_15.kind === 166 /* ObjectBindingPattern */) {
                     if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_15, predicateVariableNode, predicateVariableName)) {
                         return true;
                     }
@@ -24703,25 +26386,27 @@ var ts;
         }
         function checkSignatureDeclaration(node) {
             // Grammar checking
-            if (node.kind === 150 /* IndexSignature */) {
+            if (node.kind === 152 /* IndexSignature */) {
                 checkGrammarIndexSignature(node);
             }
-            else if (node.kind === 153 /* FunctionType */ || node.kind === 216 /* FunctionDeclaration */ || node.kind === 154 /* ConstructorType */ ||
-                node.kind === 148 /* CallSignature */ || node.kind === 145 /* Constructor */ ||
-                node.kind === 149 /* ConstructSignature */) {
+            else if (node.kind === 155 /* FunctionType */ || node.kind === 219 /* FunctionDeclaration */ || node.kind === 156 /* ConstructorType */ ||
+                node.kind === 150 /* CallSignature */ || node.kind === 147 /* Constructor */ ||
+                node.kind === 151 /* ConstructSignature */) {
                 checkGrammarFunctionLikeDeclaration(node);
             }
             checkTypeParameters(node.typeParameters);
             ts.forEach(node.parameters, checkParameter);
-            checkSourceElement(node.type);
+            if (node.type) {
+                checkSourceElement(node.type);
+            }
             if (produceDiagnostics) {
                 checkCollisionWithArgumentsInGeneratedCode(node);
                 if (compilerOptions.noImplicitAny && !node.type) {
                     switch (node.kind) {
-                        case 149 /* ConstructSignature */:
+                        case 151 /* ConstructSignature */:
                             error(node, ts.Diagnostics.Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
-                        case 148 /* CallSignature */:
+                        case 150 /* CallSignature */:
                             error(node, ts.Diagnostics.Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
                     }
@@ -24744,12 +26429,14 @@ var ts;
                             checkTypeAssignableTo(iterableIteratorInstantiation, returnType, node.type);
                         }
                     }
+                    else if (ts.isAsyncFunctionLike(node)) {
+                        checkAsyncFunctionReturnType(node);
+                    }
                 }
             }
-            checkSpecializedSignatureDeclaration(node);
         }
         function checkTypeForDuplicateIndexSignatures(node) {
-            if (node.kind === 218 /* InterfaceDeclaration */) {
+            if (node.kind === 221 /* InterfaceDeclaration */) {
                 var nodeSymbol = getSymbolOfNode(node);
                 // in case of merging interface declaration it is possible that we'll enter this check procedure several times for every declaration
                 // to prevent this run check only for the first declaration of a given kind
@@ -24769,7 +26456,7 @@ var ts;
                     var declaration = decl;
                     if (declaration.parameters.length === 1 && declaration.parameters[0].type) {
                         switch (declaration.parameters[0].type.kind) {
-                            case 130 /* StringKeyword */:
+                            case 131 /* StringKeyword */:
                                 if (!seenStringIndexer) {
                                     seenStringIndexer = true;
                                 }
@@ -24777,7 +26464,7 @@ var ts;
                                     error(declaration, ts.Diagnostics.Duplicate_string_index_signature);
                                 }
                                 break;
-                            case 128 /* NumberKeyword */:
+                            case 129 /* NumberKeyword */:
                                 if (!seenNumericIndexer) {
                                     seenNumericIndexer = true;
                                 }
@@ -24809,7 +26496,7 @@ var ts;
         function checkConstructorDeclaration(node) {
             // Grammar check on signature of constructor and modifier of the constructor is done in checkSignatureDeclaration function.
             checkSignatureDeclaration(node);
-            // Grammar check for checking only related to constructoDeclaration
+            // Grammar check for checking only related to constructorDeclaration
             checkGrammarConstructorTypeParameters(node) || checkGrammarConstructorTypeAnnotation(node);
             checkSourceElement(node.body);
             var symbol = getSymbolOfNode(node);
@@ -24825,14 +26512,11 @@ var ts;
             if (!produceDiagnostics) {
                 return;
             }
-            function isSuperCallExpression(n) {
-                return n.kind === 171 /* CallExpression */ && n.expression.kind === 95 /* SuperKeyword */;
-            }
             function containsSuperCallAsComputedPropertyName(n) {
                 return n.name && containsSuperCall(n.name);
             }
             function containsSuperCall(n) {
-                if (isSuperCallExpression(n)) {
+                if (ts.isSuperCallExpression(n)) {
                     return true;
                 }
                 else if (ts.isFunctionLike(n)) {
@@ -24847,13 +26531,13 @@ var ts;
                 if (n.kind === 97 /* ThisKeyword */) {
                     error(n, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
                 }
-                else if (n.kind !== 176 /* FunctionExpression */ && n.kind !== 216 /* FunctionDeclaration */) {
+                else if (n.kind !== 178 /* FunctionExpression */ && n.kind !== 219 /* FunctionDeclaration */) {
                     ts.forEachChild(n, markThisReferencesAsErrors);
                 }
             }
             function isInstancePropertyWithInitializer(n) {
-                return n.kind === 142 /* PropertyDeclaration */ &&
-                    !(n.flags & 64 /* Static */) &&
+                return n.kind === 144 /* PropertyDeclaration */ &&
+                    !(n.flags & 32 /* Static */) &&
                     !!n.initializer;
             }
             // TS 1.0 spec (April 2014): 8.3.2
@@ -24861,12 +26545,11 @@ var ts;
             // constructors of derived classes must contain at least one super call somewhere in their function body.
             var containingClassDecl = node.parent;
             if (ts.getClassExtendsHeritageClauseElement(containingClassDecl)) {
-                var containingClassSymbol = getSymbolOfNode(containingClassDecl);
-                var containingClassInstanceType = getDeclaredTypeOfSymbol(containingClassSymbol);
-                var baseConstructorType = getBaseConstructorTypeOfClass(containingClassInstanceType);
-                if (containsSuperCall(node.body)) {
-                    if (baseConstructorType === nullType) {
-                        error(node, ts.Diagnostics.A_constructor_cannot_contain_a_super_call_when_its_class_extends_null);
+                var classExtendsNull = classDeclarationExtendsNull(containingClassDecl);
+                var superCall = getSuperCallInConstructor(node);
+                if (superCall) {
+                    if (classExtendsNull) {
+                        error(superCall, ts.Diagnostics.A_constructor_cannot_contain_a_super_call_when_its_class_extends_null);
                     }
                     // The first statement in the body of a constructor (excluding prologue directives) must be a super call
                     // if both of the following are true:
@@ -24874,15 +26557,15 @@ var ts;
                     // - The constructor declares parameter properties
                     //   or the containing class declares instance member variables with initializers.
                     var superCallShouldBeFirst = ts.forEach(node.parent.members, isInstancePropertyWithInitializer) ||
-                        ts.forEach(node.parameters, function (p) { return p.flags & (8 /* Public */ | 16 /* Private */ | 32 /* Protected */); });
+                        ts.forEach(node.parameters, function (p) { return p.flags & (4 /* Public */ | 8 /* Private */ | 16 /* Protected */); });
                     // Skip past any prologue directives to find the first statement
                     // to ensure that it was a super call.
                     if (superCallShouldBeFirst) {
                         var statements = node.body.statements;
-                        var superCallStatement;
+                        var superCallStatement = void 0;
                         for (var _i = 0, statements_2 = statements; _i < statements_2.length; _i++) {
                             var statement = statements_2[_i];
-                            if (statement.kind === 198 /* ExpressionStatement */ && isSuperCallExpression(statement.expression)) {
+                            if (statement.kind === 201 /* ExpressionStatement */ && ts.isSuperCallExpression(statement.expression)) {
                                 superCallStatement = statement;
                                 break;
                             }
@@ -24893,13 +26576,9 @@ var ts;
                         if (!superCallStatement) {
                             error(node, ts.Diagnostics.A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties);
                         }
-                        else {
-                            // In such a required super call, it is a compile-time error for argument expressions to reference this.
-                            markThisReferencesAsErrors(superCallStatement.expression);
-                        }
                     }
                 }
-                else if (baseConstructorType !== nullType) {
+                else if (!classExtendsNull) {
                     error(node, ts.Diagnostics.Constructors_for_derived_classes_must_contain_a_super_call);
                 }
             }
@@ -24910,9 +26589,9 @@ var ts;
                 checkGrammarFunctionLikeDeclaration(node) || checkGrammarAccessor(node) || checkGrammarComputedPropertyName(node.name);
                 checkDecorators(node);
                 checkSignatureDeclaration(node);
-                if (node.kind === 146 /* GetAccessor */) {
-                    if (!ts.isInAmbientContext(node) && ts.nodeIsPresent(node.body) && (node.flags & 524288 /* HasImplicitReturn */)) {
-                        if (node.flags & 1048576 /* HasExplicitReturn */) {
+                if (node.kind === 148 /* GetAccessor */) {
+                    if (!ts.isInAmbientContext(node) && ts.nodeIsPresent(node.body) && (node.flags & 32768 /* HasImplicitReturn */)) {
+                        if (node.flags & 65536 /* HasExplicitReturn */) {
                             if (compilerOptions.noImplicitReturns) {
                                 error(node.name, ts.Diagnostics.Not_all_code_paths_return_a_value);
                             }
@@ -24925,18 +26604,21 @@ var ts;
                 // Do not use hasDynamicName here, because that returns false for well known symbols.
                 // We want to perform checkComputedPropertyName for all computed properties, including
                 // well known symbols.
-                if (node.name.kind === 137 /* ComputedPropertyName */) {
+                if (node.name.kind === 139 /* ComputedPropertyName */) {
                     checkComputedPropertyName(node.name);
                 }
                 if (!ts.hasDynamicName(node)) {
                     // TypeScript 1.0 spec (April 2014): 8.4.3
                     // Accessors for the same member name must specify the same accessibility.
-                    var otherKind = node.kind === 146 /* GetAccessor */ ? 147 /* SetAccessor */ : 146 /* GetAccessor */;
+                    var otherKind = node.kind === 148 /* GetAccessor */ ? 149 /* SetAccessor */ : 148 /* GetAccessor */;
                     var otherAccessor = ts.getDeclarationOfKind(node.symbol, otherKind);
                     if (otherAccessor) {
-                        if (((node.flags & 56 /* AccessibilityModifier */) !== (otherAccessor.flags & 56 /* AccessibilityModifier */))) {
+                        if (((node.flags & 28 /* AccessibilityModifier */) !== (otherAccessor.flags & 28 /* AccessibilityModifier */))) {
                             error(node.name, ts.Diagnostics.Getter_and_setter_accessors_do_not_agree_in_visibility);
                         }
+                        if (((node.flags & 128 /* Abstract */) !== (otherAccessor.flags & 128 /* Abstract */))) {
+                            error(node.name, ts.Diagnostics.Accessors_must_both_be_abstract_or_non_abstract);
+                        }
                         var currentAccessorType = getAnnotatedAccessorType(node);
                         var otherAccessorType = getAnnotatedAccessorType(otherAccessor);
                         // TypeScript 1.0 spec (April 2014): 4.5
@@ -24950,7 +26632,7 @@ var ts;
                 }
                 getTypeOfAccessors(getSymbolOfNode(node));
             }
-            if (node.parent.kind !== 168 /* ObjectLiteralExpression */) {
+            if (node.parent.kind !== 170 /* ObjectLiteralExpression */) {
                 checkSourceElement(node.body);
             }
             else {
@@ -25019,59 +26701,21 @@ var ts;
             ts.forEach(node.types, checkSourceElement);
         }
         function isPrivateWithinAmbient(node) {
-            return (node.flags & 16 /* Private */) && ts.isInAmbientContext(node);
-        }
-        function checkSpecializedSignatureDeclaration(signatureDeclarationNode) {
-            if (!produceDiagnostics) {
-                return;
-            }
-            var signature = getSignatureFromDeclaration(signatureDeclarationNode);
-            if (!signature.hasStringLiterals) {
-                return;
-            }
-            // TypeScript 1.0 spec (April 2014): 3.7.2.2
-            // Specialized signatures are not permitted in conjunction with a function body
-            if (ts.nodeIsPresent(signatureDeclarationNode.body)) {
-                error(signatureDeclarationNode, ts.Diagnostics.A_signature_with_an_implementation_cannot_use_a_string_literal_type);
-                return;
-            }
-            // TypeScript 1.0 spec (April 2014): 3.7.2.4
-            // Every specialized call or construct signature in an object type must be assignable
-            // to at least one non-specialized call or construct signature in the same object type
-            var signaturesToCheck;
-            // Unnamed (call\construct) signatures in interfaces are inherited and not shadowed so examining just node symbol won't give complete answer.
-            // Use declaring type to obtain full list of signatures.
-            if (!signatureDeclarationNode.name && signatureDeclarationNode.parent && signatureDeclarationNode.parent.kind === 218 /* InterfaceDeclaration */) {
-                ts.Debug.assert(signatureDeclarationNode.kind === 148 /* CallSignature */ || signatureDeclarationNode.kind === 149 /* ConstructSignature */);
-                var signatureKind = signatureDeclarationNode.kind === 148 /* CallSignature */ ? 0 /* Call */ : 1 /* Construct */;
-                var containingSymbol = getSymbolOfNode(signatureDeclarationNode.parent);
-                var containingType = getDeclaredTypeOfSymbol(containingSymbol);
-                signaturesToCheck = getSignaturesOfType(containingType, signatureKind);
-            }
-            else {
-                signaturesToCheck = getSignaturesOfSymbol(getSymbolOfNode(signatureDeclarationNode));
-            }
-            for (var _i = 0, signaturesToCheck_1 = signaturesToCheck; _i < signaturesToCheck_1.length; _i++) {
-                var otherSignature = signaturesToCheck_1[_i];
-                if (!otherSignature.hasStringLiterals && isSignatureAssignableTo(signature, otherSignature, /*ignoreReturnTypes*/ false)) {
-                    return;
-                }
-            }
-            error(signatureDeclarationNode, ts.Diagnostics.Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature);
+            return (node.flags & 8 /* Private */) && ts.isInAmbientContext(node);
         }
         function getEffectiveDeclarationFlags(n, flagsToCheck) {
             var flags = ts.getCombinedNodeFlags(n);
             // children of classes (even ambient classes) should not be marked as ambient or export
             // because those flags have no useful semantics there.
-            if (n.parent.kind !== 218 /* InterfaceDeclaration */ &&
-                n.parent.kind !== 217 /* ClassDeclaration */ &&
-                n.parent.kind !== 189 /* ClassExpression */ &&
+            if (n.parent.kind !== 221 /* InterfaceDeclaration */ &&
+                n.parent.kind !== 220 /* ClassDeclaration */ &&
+                n.parent.kind !== 191 /* ClassExpression */ &&
                 ts.isInAmbientContext(n)) {
-                if (!(flags & 4 /* Ambient */)) {
+                if (!(flags & 2 /* Ambient */)) {
                     // It is nested in an ambient context, which means it is automatically exported
-                    flags |= 2 /* Export */;
+                    flags |= 1 /* Export */;
                 }
-                flags |= 4 /* Ambient */;
+                flags |= 2 /* Ambient */;
             }
             return flags & flagsToCheck;
         }
@@ -25093,36 +26737,36 @@ var ts;
                 // deviations, we XOR someOverloadFlags with allOverloadFlags
                 var someButNotAllOverloadFlags = someOverloadFlags ^ allOverloadFlags;
                 if (someButNotAllOverloadFlags !== 0) {
-                    var canonicalFlags = getEffectiveDeclarationFlags(getCanonicalOverload(overloads, implementation), flagsToCheck);
+                    var canonicalFlags_1 = getEffectiveDeclarationFlags(getCanonicalOverload(overloads, implementation), flagsToCheck);
                     ts.forEach(overloads, function (o) {
-                        var deviation = getEffectiveDeclarationFlags(o, flagsToCheck) ^ canonicalFlags;
-                        if (deviation & 2 /* Export */) {
-                            error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_exported_or_not_exported);
+                        var deviation = getEffectiveDeclarationFlags(o, flagsToCheck) ^ canonicalFlags_1;
+                        if (deviation & 1 /* Export */) {
+                            error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_exported_or_non_exported);
                         }
-                        else if (deviation & 4 /* Ambient */) {
+                        else if (deviation & 2 /* Ambient */) {
                             error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_ambient_or_non_ambient);
                         }
-                        else if (deviation & (16 /* Private */ | 32 /* Protected */)) {
-                            error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_public_private_or_protected);
+                        else if (deviation & (8 /* Private */ | 16 /* Protected */)) {
+                            error(o.name || o, ts.Diagnostics.Overload_signatures_must_all_be_public_private_or_protected);
                         }
                         else if (deviation & 128 /* Abstract */) {
-                            error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_abstract_or_not_abstract);
+                            error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_abstract_or_non_abstract);
                         }
                     });
                 }
             }
             function checkQuestionTokenAgreementBetweenOverloads(overloads, implementation, someHaveQuestionToken, allHaveQuestionToken) {
                 if (someHaveQuestionToken !== allHaveQuestionToken) {
-                    var canonicalHasQuestionToken = ts.hasQuestionToken(getCanonicalOverload(overloads, implementation));
+                    var canonicalHasQuestionToken_1 = ts.hasQuestionToken(getCanonicalOverload(overloads, implementation));
                     ts.forEach(overloads, function (o) {
-                        var deviation = ts.hasQuestionToken(o) !== canonicalHasQuestionToken;
+                        var deviation = ts.hasQuestionToken(o) !== canonicalHasQuestionToken_1;
                         if (deviation) {
                             error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_optional_or_required);
                         }
                     });
                 }
             }
-            var flagsToCheck = 2 /* Export */ | 4 /* Ambient */ | 16 /* Private */ | 32 /* Protected */ | 128 /* Abstract */;
+            var flagsToCheck = 1 /* Export */ | 2 /* Ambient */ | 8 /* Private */ | 16 /* Protected */ | 128 /* Abstract */;
             var someNodeFlags = 0;
             var allNodeFlags = flagsToCheck;
             var someHaveQuestionToken = false;
@@ -25146,21 +26790,21 @@ var ts;
                         seen = c === node;
                     }
                 });
-                // We may be here because of some extra junk between overloads that could not be parsed into a valid node.
+                // We may be here because of some extra nodes between overloads that could not be parsed into a valid node.
                 // In this case the subsequent node is not really consecutive (.pos !== node.end), and we must ignore it here.
                 if (subsequentNode && subsequentNode.pos === node.end) {
                     if (subsequentNode.kind === node.kind) {
                         var errorNode_1 = subsequentNode.name || subsequentNode;
                         // TODO(jfreeman): These are methods, so handle computed name case
                         if (node.name && subsequentNode.name && node.name.text === subsequentNode.name.text) {
-                            var reportError = (node.kind === 144 /* MethodDeclaration */ || node.kind === 143 /* MethodSignature */) &&
-                                (node.flags & 64 /* Static */) !== (subsequentNode.flags & 64 /* Static */);
+                            var reportError = (node.kind === 146 /* MethodDeclaration */ || node.kind === 145 /* MethodSignature */) &&
+                                (node.flags & 32 /* Static */) !== (subsequentNode.flags & 32 /* 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) {
-                                var diagnostic = node.flags & 64 /* Static */ ? ts.Diagnostics.Function_overload_must_be_static : ts.Diagnostics.Function_overload_must_not_be_static;
+                                var diagnostic = node.flags & 32 /* Static */ ? ts.Diagnostics.Function_overload_must_be_static : ts.Diagnostics.Function_overload_must_not_be_static;
                                 error(errorNode_1, diagnostic);
                             }
                             return;
@@ -25195,7 +26839,7 @@ var ts;
                 var current = declarations_4[_i];
                 var node = current;
                 var inAmbientContext = ts.isInAmbientContext(node);
-                var inAmbientContextOrInterface = node.parent.kind === 218 /* InterfaceDeclaration */ || node.parent.kind === 156 /* TypeLiteral */ || inAmbientContext;
+                var inAmbientContextOrInterface = node.parent.kind === 221 /* InterfaceDeclaration */ || node.parent.kind === 158 /* TypeLiteral */ || inAmbientContext;
                 if (inAmbientContextOrInterface) {
                     // check if declarations are consecutive only if they are non-ambient
                     // 1. ambient declarations can be interleaved
@@ -25206,7 +26850,7 @@ var ts;
                     // 2. mixing ambient and non-ambient declarations is a separate error that will be reported - do not want to report an extra one
                     previousDeclaration = undefined;
                 }
-                if (node.kind === 216 /* FunctionDeclaration */ || node.kind === 144 /* MethodDeclaration */ || node.kind === 143 /* MethodSignature */ || node.kind === 145 /* Constructor */) {
+                if (node.kind === 219 /* FunctionDeclaration */ || node.kind === 146 /* MethodDeclaration */ || node.kind === 145 /* MethodSignature */ || node.kind === 147 /* Constructor */) {
                     var currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
                     someNodeFlags |= currentNodeFlags;
                     allNodeFlags &= currentNodeFlags;
@@ -25258,29 +26902,11 @@ var ts;
                 if (bodyDeclaration) {
                     var signatures = getSignaturesOfSymbol(symbol);
                     var bodySignature = getSignatureFromDeclaration(bodyDeclaration);
-                    // If the implementation signature has string literals, we will have reported an error in
-                    // checkSpecializedSignatureDeclaration
-                    if (!bodySignature.hasStringLiterals) {
-                        // TypeScript 1.0 spec (April 2014): 6.1
-                        // If a function declaration includes overloads, the overloads determine the call
-                        // signatures of the type given to the function object
-                        // and the function implementation signature must be assignable to that type
-                        //
-                        // TypeScript 1.0 spec (April 2014): 3.8.4
-                        // Note that specialized call and construct signatures (section 3.7.2.4) are not significant when determining assignment compatibility
-                        // Consider checking against specialized signatures too. Not doing so creates a type hole:
-                        //
-                        // function g(x: "hi", y: boolean);
-                        // function g(x: string, y: {});
-                        // function g(x: string, y: string) { }
-                        //
-                        // The implementation is completely unrelated to the specialized signature, yet we do not check this.
-                        for (var _a = 0, signatures_3 = signatures; _a < signatures_3.length; _a++) {
-                            var signature = signatures_3[_a];
-                            if (!signature.hasStringLiterals && !isImplementationCompatibleWithOverload(bodySignature, signature)) {
-                                error(signature.declaration, ts.Diagnostics.Overload_signature_is_not_compatible_with_function_implementation);
-                                break;
-                            }
+                    for (var _a = 0, signatures_3 = signatures; _a < signatures_3.length; _a++) {
+                        var signature = signatures_3[_a];
+                        if (!isImplementationCompatibleWithOverload(bodySignature, signature)) {
+                            error(signature.declaration, ts.Diagnostics.Overload_signature_is_not_compatible_with_function_implementation);
+                            break;
                         }
                     }
                 }
@@ -25313,8 +26939,8 @@ var ts;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var d = _a[_i];
                 var declarationSpaces = getDeclarationSpaces(d);
-                var effectiveDeclarationFlags = getEffectiveDeclarationFlags(d, 2 /* Export */ | 512 /* Default */);
-                if (effectiveDeclarationFlags & 2 /* Export */) {
+                var effectiveDeclarationFlags = getEffectiveDeclarationFlags(d, 1 /* Export */ | 512 /* Default */);
+                if (effectiveDeclarationFlags & 1 /* Export */) {
                     if (effectiveDeclarationFlags & 512 /* Default */) {
                         defaultExportedDeclarationSpaces |= declarationSpaces;
                     }
@@ -25326,7 +26952,7 @@ var ts;
                     nonExportedDeclarationSpaces |= declarationSpaces;
                 }
             }
-            // Spaces for anyting not declared a 'default export'.
+            // Spaces for anything not declared a 'default export'.
             var nonDefaultExportedDeclarationSpaces = exportedDeclarationSpaces | nonExportedDeclarationSpaces;
             var commonDeclarationSpacesForExportsAndLocals = exportedDeclarationSpaces & nonExportedDeclarationSpaces;
             var commonDeclarationSpacesForDefaultAndNonDefault = defaultExportedDeclarationSpaces & nonDefaultExportedDeclarationSpaces;
@@ -25335,7 +26961,7 @@ var ts;
                 for (var _b = 0, _c = symbol.declarations; _b < _c.length; _b++) {
                     var d = _c[_b];
                     var declarationSpaces = getDeclarationSpaces(d);
-                    // Only error on the declarations that conributed to the intersecting spaces.
+                    // Only error on the declarations that contributed to the intersecting spaces.
                     if (declarationSpaces & commonDeclarationSpacesForDefaultAndNonDefault) {
                         error(d.name, ts.Diagnostics.Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_default_0_declaration_instead, ts.declarationNameToString(d.name));
                     }
@@ -25346,20 +26972,20 @@ var ts;
             }
             function getDeclarationSpaces(d) {
                 switch (d.kind) {
-                    case 218 /* InterfaceDeclaration */:
+                    case 221 /* InterfaceDeclaration */:
                         return 2097152 /* ExportType */;
-                    case 221 /* ModuleDeclaration */:
+                    case 224 /* ModuleDeclaration */:
                         return ts.isAmbientModule(d) || ts.getModuleInstanceState(d) !== 0 /* NonInstantiated */
                             ? 4194304 /* ExportNamespace */ | 1048576 /* ExportValue */
                             : 4194304 /* ExportNamespace */;
-                    case 217 /* ClassDeclaration */:
-                    case 220 /* EnumDeclaration */:
+                    case 220 /* ClassDeclaration */:
+                    case 223 /* EnumDeclaration */:
                         return 2097152 /* ExportType */ | 1048576 /* ExportValue */;
-                    case 224 /* ImportEqualsDeclaration */:
-                        var result = 0;
+                    case 228 /* ImportEqualsDeclaration */:
+                        var result_1 = 0;
                         var target = resolveAlias(getSymbolOfNode(d));
-                        ts.forEach(target.declarations, function (d) { result |= getDeclarationSpaces(d); });
-                        return result;
+                        ts.forEach(target.declarations, function (d) { result_1 |= getDeclarationSpaces(d); });
+                        return result_1;
                     default:
                         return 1048576 /* ExportValue */;
                 }
@@ -25467,7 +27093,7 @@ var ts;
                         return checkNonThenableType(type, location, message);
                     }
                     else {
-                        if (type.id === promisedType.id || awaitedTypeStack.indexOf(promisedType.id) >= 0) {
+                        if (type.id === promisedType.id || ts.indexOf(awaitedTypeStack, promisedType.id) >= 0) {
                             // We have a bad actor in the form of a promise whose promised type is
                             // the same promise type, or a mutually recursive promise. Return the
                             // unknown type as we cannot guess the shape. If this were the actual
@@ -25516,6 +27142,33 @@ var ts;
                 }
             }
         }
+        /**
+         * Checks that the return type provided is an instantiation of the global Promise<T> type
+         * and returns the awaited type of the return type.
+         *
+         * @param returnType The return type of a FunctionLikeDeclaration
+         * @param location The node on which to report the error.
+         */
+        function checkCorrectPromiseType(returnType, location) {
+            if (returnType === unknownType) {
+                // The return type already had some other error, so we ignore and return
+                // the unknown type.
+                return unknownType;
+            }
+            var globalPromiseType = getGlobalPromiseType();
+            if (globalPromiseType === emptyGenericType
+                || globalPromiseType === getTargetType(returnType)) {
+                // Either we couldn't resolve the global promise type, which would have already
+                // reported an error, or we could resolve it and the return type is a valid type
+                // reference to the global type. In either case, we return the awaited type for
+                // the return type.
+                return checkAwaitedType(returnType, location, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
+            }
+            // 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, ts.Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type);
+            return unknownType;
+        }
         /**
           * Checks the return type of an async function to ensure it is a compatible
           * Promise implementation.
@@ -25530,6 +27183,10 @@ var ts;
           * callable `then` signature.
           */
         function checkAsyncFunctionReturnType(node) {
+            if (languageVersion >= 2 /* ES6 */) {
+                var returnType = getTypeFromTypeNode(node.type);
+                return checkCorrectPromiseType(returnType, node.type);
+            }
             var globalPromiseConstructorLikeType = getGlobalPromiseConstructorLikeType();
             if (globalPromiseConstructorLikeType === emptyObjectType) {
                 // If we couldn't resolve the global PromiseConstructorLike type we cannot verify
@@ -25605,22 +27262,22 @@ var ts;
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             var errorInfo;
             switch (node.parent.kind) {
-                case 217 /* ClassDeclaration */:
+                case 220 /* ClassDeclaration */:
                     var classSymbol = getSymbolOfNode(node.parent);
                     var classConstructorType = getTypeOfSymbol(classSymbol);
                     expectedReturnType = getUnionType([classConstructorType, voidType]);
                     break;
-                case 139 /* Parameter */:
+                case 141 /* Parameter */:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any);
                     break;
-                case 142 /* PropertyDeclaration */:
+                case 144 /* PropertyDeclaration */:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.The_return_type_of_a_property_decorator_function_must_be_either_void_or_any);
                     break;
-                case 144 /* MethodDeclaration */:
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
+                case 146 /* MethodDeclaration */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
                     var methodType = getTypeOfNode(node.parent);
                     var descriptorType = createTypedPropertyDescriptorType(methodType);
                     expectedReturnType = getUnionType([descriptorType, voidType]);
@@ -25633,9 +27290,9 @@ var ts;
             // When we are emitting type metadata for decorators, we need to try to check the type
             // as if it were an expression so that we can emit the type in a value position when we
             // serialize the type metadata.
-            if (node && node.kind === 152 /* TypeReference */) {
+            if (node && node.kind === 154 /* TypeReference */) {
                 var root = getFirstIdentifier(node.typeName);
-                var meaning = root.parent.kind === 152 /* TypeReference */ ? 793056 /* Type */ : 1536 /* Namespace */;
+                var meaning = root.parent.kind === 154 /* TypeReference */ ? 793056 /* Type */ : 1536 /* Namespace */;
                 // Resolve type so we know which symbol is referenced
                 var rootSymbol = resolveName(root, root.text, meaning | 8388608 /* Alias */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
                 // Resolved symbol is alias
@@ -25677,25 +27334,25 @@ var ts;
                 return;
             }
             if (!compilerOptions.experimentalDecorators) {
-                error(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Specify_experimentalDecorators_to_remove_this_warning);
+                error(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning);
             }
             if (compilerOptions.emitDecoratorMetadata) {
                 // we only need to perform these checks if we are emitting serialized type metadata for the target of a decorator.
                 switch (node.kind) {
-                    case 217 /* ClassDeclaration */:
+                    case 220 /* ClassDeclaration */:
                         var constructor = ts.getFirstConstructorWithBody(node);
                         if (constructor) {
                             checkParameterTypeAnnotationsAsExpressions(constructor);
                         }
                         break;
-                    case 144 /* MethodDeclaration */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
+                    case 146 /* MethodDeclaration */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
                         checkParameterTypeAnnotationsAsExpressions(node);
                         checkReturnTypeAnnotationAsExpression(node);
                         break;
-                    case 142 /* PropertyDeclaration */:
-                    case 139 /* Parameter */:
+                    case 144 /* PropertyDeclaration */:
+                    case 141 /* Parameter */:
                         checkTypeAnnotationAsExpression(node);
                         break;
                 }
@@ -25708,6 +27365,7 @@ var ts;
                 checkCollisionWithCapturedSuperVariable(node, node.name);
                 checkCollisionWithCapturedThisVariable(node, node.name);
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+                checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             }
         }
         function checkFunctionOrMethodDeclaration(node) {
@@ -25717,7 +27375,7 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name && node.name.kind === 137 /* ComputedPropertyName */) {
+            if (node.name && node.name.kind === 139 /* ComputedPropertyName */) {
                 // This check will account for methods in class/interface declarations,
                 // as well as accessors in classes/object literals
                 checkComputedPropertyName(node.name);
@@ -25768,7 +27426,7 @@ var ts;
         }
         function checkBlock(node) {
             // Grammar checking for SyntaxKind.Block
-            if (node.kind === 195 /* Block */) {
+            if (node.kind === 198 /* Block */) {
                 checkGrammarStatementInAmbientContext(node);
             }
             ts.forEach(node.statements, checkSourceElement);
@@ -25788,12 +27446,12 @@ var ts;
             if (!(identifier && identifier.text === name)) {
                 return false;
             }
-            if (node.kind === 142 /* PropertyDeclaration */ ||
-                node.kind === 141 /* PropertySignature */ ||
-                node.kind === 144 /* MethodDeclaration */ ||
-                node.kind === 143 /* MethodSignature */ ||
-                node.kind === 146 /* GetAccessor */ ||
-                node.kind === 147 /* SetAccessor */) {
+            if (node.kind === 144 /* PropertyDeclaration */ ||
+                node.kind === 143 /* PropertySignature */ ||
+                node.kind === 146 /* MethodDeclaration */ ||
+                node.kind === 145 /* MethodSignature */ ||
+                node.kind === 148 /* GetAccessor */ ||
+                node.kind === 149 /* SetAccessor */) {
                 // it is ok to have member named '_super' or '_this' - member access is always qualified
                 return false;
             }
@@ -25802,7 +27460,7 @@ var ts;
                 return false;
             }
             var root = ts.getRootDeclaration(node);
-            if (root.kind === 139 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
+            if (root.kind === 141 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
                 // just an overload - no codegen impact
                 return false;
             }
@@ -25855,16 +27513,31 @@ var ts;
                 return;
             }
             // Uninstantiated modules shouldnt do this check
-            if (node.kind === 221 /* ModuleDeclaration */ && ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
+            if (node.kind === 224 /* ModuleDeclaration */ && ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
                 return;
             }
             // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 251 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
+            if (parent.kind === 255 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
                 // If the declaration happens to be in external module, report error that require and exports are reserved keywords
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
         }
+        function checkCollisionWithGlobalPromiseInGeneratedCode(node, name) {
+            if (!needCollisionCheckForIdentifier(node, name, "Promise")) {
+                return;
+            }
+            // Uninstantiated modules shouldnt do this check
+            if (node.kind === 224 /* ModuleDeclaration */ && ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
+                return;
+            }
+            // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
+            var parent = getDeclarationContainer(node);
+            if (parent.kind === 255 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 2097152 /* HasAsyncFunctions */) {
+                // If the declaration happens to be in external module, report error that Promise is a reserved identifier.
+                error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_functions, ts.declarationNameToString(name), ts.declarationNameToString(name));
+            }
+        }
         function checkVarDeclaredNamesNotShadowed(node) {
             // - ScriptBody : StatementList
             // It is a Syntax Error if any element of the LexicallyDeclaredNames of StatementList
@@ -25889,13 +27562,13 @@ var ts;
             //          const x = 0; // symbol for this declaration will be 'symbol'
             //      }
             // skip block-scoped variables and parameters
-            if ((ts.getCombinedNodeFlags(node) & 24576 /* BlockScoped */) !== 0 || ts.isParameterDeclaration(node)) {
+            if ((ts.getCombinedNodeFlags(node) & 3072 /* BlockScoped */) !== 0 || ts.isParameterDeclaration(node)) {
                 return;
             }
             // skip variable declarations that don't have initializers
             // NOTE: in ES6 spec initializer is required in variable declarations where name is binding pattern
             // so we'll always treat binding elements as initialized
-            if (node.kind === 214 /* VariableDeclaration */ && !node.initializer) {
+            if (node.kind === 217 /* VariableDeclaration */ && !node.initializer) {
                 return;
             }
             var symbol = getSymbolOfNode(node);
@@ -25904,18 +27577,18 @@ var ts;
                 if (localDeclarationSymbol &&
                     localDeclarationSymbol !== symbol &&
                     localDeclarationSymbol.flags & 2 /* BlockScopedVariable */) {
-                    if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 24576 /* BlockScoped */) {
-                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 215 /* VariableDeclarationList */);
-                        var container = varDeclList.parent.kind === 196 /* VariableStatement */ && varDeclList.parent.parent
+                    if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 3072 /* BlockScoped */) {
+                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 218 /* VariableDeclarationList */);
+                        var container = varDeclList.parent.kind === 199 /* VariableStatement */ && varDeclList.parent.parent
                             ? varDeclList.parent.parent
                             : undefined;
                         // names of block-scoped and function scoped variables can collide only
                         // if block scoped variable is defined in the function\module\source file scope (because of variable hoisting)
                         var namesShareScope = container &&
-                            (container.kind === 195 /* Block */ && ts.isFunctionLike(container.parent) ||
-                                container.kind === 222 /* ModuleBlock */ ||
-                                container.kind === 221 /* ModuleDeclaration */ ||
-                                container.kind === 251 /* SourceFile */);
+                            (container.kind === 198 /* Block */ && ts.isFunctionLike(container.parent) ||
+                                container.kind === 225 /* ModuleBlock */ ||
+                                container.kind === 224 /* ModuleDeclaration */ ||
+                                container.kind === 255 /* SourceFile */);
                         // here we know that function scoped variable is shadowed by block scoped one
                         // if they are defined in the same scope - binder has already reported redeclaration error
                         // otherwise if variable has an initializer - show error that initialization will fail
@@ -25930,7 +27603,7 @@ var ts;
         }
         // Check that a parameter initializer contains no references to parameters declared to the right of itself
         function checkParameterInitializer(node) {
-            if (ts.getRootDeclaration(node).kind !== 139 /* Parameter */) {
+            if (ts.getRootDeclaration(node).kind !== 141 /* Parameter */) {
                 return;
             }
             var func = ts.getContainingFunction(node);
@@ -25941,7 +27614,7 @@ var ts;
                     // check FunctionLikeDeclaration.locals (stores parameters\function local variable)
                     // if it contains entry with a specified name and if this entry matches the resolved symbol
                     if (referencedSymbol && referencedSymbol !== unknownSymbol && getSymbol(func.locals, referencedSymbol.name, 107455 /* Value */) === referencedSymbol) {
-                        if (referencedSymbol.valueDeclaration.kind === 139 /* Parameter */) {
+                        if (referencedSymbol.valueDeclaration.kind === 141 /* Parameter */) {
                             if (referencedSymbol.valueDeclaration === node) {
                                 error(n, ts.Diagnostics.Parameter_0_cannot_be_referenced_in_its_initializer, ts.declarationNameToString(node.name));
                                 return;
@@ -25967,31 +27640,39 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name.kind === 137 /* ComputedPropertyName */) {
+            if (node.name.kind === 139 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
                 if (node.initializer) {
                     checkExpressionCached(node.initializer);
                 }
             }
-            if (node.kind === 166 /* BindingElement */) {
+            if (node.kind === 168 /* BindingElement */) {
                 // check computed properties inside property names of binding elements
-                if (node.propertyName && node.propertyName.kind === 137 /* ComputedPropertyName */) {
+                if (node.propertyName && node.propertyName.kind === 139 /* ComputedPropertyName */) {
                     checkComputedPropertyName(node.propertyName);
                 }
+                // check private/protected variable access
+                var parent_9 = node.parent.parent;
+                var parentType = getTypeForBindingElementParent(parent_9);
+                var name_17 = node.propertyName || node.name;
+                var property = getPropertyOfType(parentType, getTextOfPropertyName(name_17));
+                if (parent_9.initializer && property && getParentOfSymbol(property)) {
+                    checkClassPropertyAccess(parent_9, parent_9.initializer, parentType, property);
+                }
             }
             // For a binding pattern, check contained binding elements
             if (ts.isBindingPattern(node.name)) {
                 ts.forEach(node.name.elements, checkSourceElement);
             }
             // For a parameter declaration with an initializer, error and exit if the containing function doesn't have a body
-            if (node.initializer && ts.getRootDeclaration(node).kind === 139 /* Parameter */ && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
+            if (node.initializer && ts.getRootDeclaration(node).kind === 141 /* Parameter */ && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
                 error(node, ts.Diagnostics.A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation);
                 return;
             }
             // For a binding pattern, validate the initializer and exit
             if (ts.isBindingPattern(node.name)) {
                 // Don't validate for-in initializer as it is already an error
-                if (node.initializer && node.parent.parent.kind !== 203 /* ForInStatement */) {
+                if (node.initializer && node.parent.parent.kind !== 206 /* ForInStatement */) {
                     checkTypeAssignableTo(checkExpressionCached(node.initializer), getWidenedTypeForVariableLikeDeclaration(node), node, /*headMessage*/ undefined);
                     checkParameterInitializer(node);
                 }
@@ -26002,7 +27683,7 @@ var ts;
             if (node === symbol.valueDeclaration) {
                 // Node is the primary declaration of the symbol, just validate the initializer
                 // Don't validate for-in initializer as it is already an error
-                if (node.initializer && node.parent.parent.kind !== 203 /* ForInStatement */) {
+                if (node.initializer && node.parent.parent.kind !== 206 /* ForInStatement */) {
                     checkTypeAssignableTo(checkExpressionCached(node.initializer), type, node, /*headMessage*/ undefined);
                     checkParameterInitializer(node);
                 }
@@ -26018,15 +27699,16 @@ var ts;
                     checkTypeAssignableTo(checkExpressionCached(node.initializer), declarationType, node, /*headMessage*/ undefined);
                 }
             }
-            if (node.kind !== 142 /* PropertyDeclaration */ && node.kind !== 141 /* PropertySignature */) {
+            if (node.kind !== 144 /* PropertyDeclaration */ && node.kind !== 143 /* PropertySignature */) {
                 // We know we don't have a binding pattern or computed name here
                 checkExportsOnMergedDeclarations(node);
-                if (node.kind === 214 /* VariableDeclaration */ || node.kind === 166 /* BindingElement */) {
+                if (node.kind === 217 /* VariableDeclaration */ || node.kind === 168 /* BindingElement */) {
                     checkVarDeclaredNamesNotShadowed(node);
                 }
                 checkCollisionWithCapturedSuperVariable(node, node.name);
                 checkCollisionWithCapturedThisVariable(node, node.name);
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+                checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             }
         }
         function checkVariableDeclaration(node) {
@@ -26044,7 +27726,7 @@ var ts;
         }
         function checkGrammarDisallowedModifiersOnObjectLiteralExpressionMethod(node) {
             // We only disallow modifier on a method declaration if it is a property of object-literal-expression
-            if (node.modifiers && node.parent.kind === 168 /* ObjectLiteralExpression */) {
+            if (node.modifiers && node.parent.kind === 170 /* ObjectLiteralExpression */) {
                 if (ts.isAsyncFunctionLike(node)) {
                     if (node.modifiers.length > 1) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
@@ -26065,7 +27747,7 @@ var ts;
             checkGrammarStatementInAmbientContext(node);
             checkExpression(node.expression);
             checkSourceElement(node.thenStatement);
-            if (node.thenStatement.kind === 197 /* EmptyStatement */) {
+            if (node.thenStatement.kind === 200 /* EmptyStatement */) {
                 error(node.thenStatement, ts.Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement);
             }
             checkSourceElement(node.elseStatement);
@@ -26085,12 +27767,12 @@ var ts;
         function checkForStatement(node) {
             // Grammar checking
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.initializer && node.initializer.kind === 215 /* VariableDeclarationList */) {
+                if (node.initializer && node.initializer.kind === 218 /* VariableDeclarationList */) {
                     checkGrammarVariableDeclarationList(node.initializer);
                 }
             }
             if (node.initializer) {
-                if (node.initializer.kind === 215 /* VariableDeclarationList */) {
+                if (node.initializer.kind === 218 /* VariableDeclarationList */) {
                     ts.forEach(node.initializer.declarations, checkVariableDeclaration);
                 }
                 else {
@@ -26110,14 +27792,14 @@ var ts;
             // via checkRightHandSideOfForOf.
             // If the LHS is an expression, check the LHS, as a destructuring assignment or as a reference.
             // Then check that the RHS is assignable to it.
-            if (node.initializer.kind === 215 /* VariableDeclarationList */) {
+            if (node.initializer.kind === 218 /* VariableDeclarationList */) {
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
                 var varExpr = node.initializer;
                 var iteratedType = checkRightHandSideOfForOf(node.expression);
                 // There may be a destructuring assignment on the left side
-                if (varExpr.kind === 167 /* ArrayLiteralExpression */ || varExpr.kind === 168 /* ObjectLiteralExpression */) {
+                if (varExpr.kind === 169 /* ArrayLiteralExpression */ || varExpr.kind === 170 /* ObjectLiteralExpression */) {
                     // iteratedType may be undefined. In this case, we still want to check the structure of
                     // varExpr, in particular making sure it's a valid LeftHandSideExpression. But we'd like
                     // to short circuit the type relation checking as much as possible, so we pass the unknownType.
@@ -26126,7 +27808,7 @@ var ts;
                 else {
                     var leftType = checkExpression(varExpr);
                     checkReferenceExpression(varExpr, /*invalidReferenceMessage*/ ts.Diagnostics.Invalid_left_hand_side_in_for_of_statement, 
-                    /*constantVariableMessage*/ ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant);
+                    /*constantVariableMessage*/ ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property);
                     // iteratedType will be undefined if the rightType was missing properties/signatures
                     // required to get its iteratedType (like [Symbol.iterator] or next). This may be
                     // because we accessed properties from anyType, or it may have led to an error inside
@@ -26146,7 +27828,7 @@ var ts;
             // for (let VarDecl in Expr) Statement
             //   VarDecl must be a variable declaration without a type annotation that declares a variable of type Any,
             //   and Expr must be an expression of type Any, an object type, or a type parameter type.
-            if (node.initializer.kind === 215 /* VariableDeclarationList */) {
+            if (node.initializer.kind === 218 /* VariableDeclarationList */) {
                 var variable = node.initializer.declarations[0];
                 if (variable && ts.isBindingPattern(variable.name)) {
                     error(variable.name, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
@@ -26160,7 +27842,7 @@ var ts;
                 //   and Expr must be an expression of type Any, an object type, or a type parameter type.
                 var varExpr = node.initializer;
                 var leftType = checkExpression(varExpr);
-                if (varExpr.kind === 167 /* ArrayLiteralExpression */ || varExpr.kind === 168 /* ObjectLiteralExpression */) {
+                if (varExpr.kind === 169 /* ArrayLiteralExpression */ || varExpr.kind === 170 /* ObjectLiteralExpression */) {
                     error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
                 }
                 else if (!isTypeAnyOrAllConstituentTypesHaveKind(leftType, 258 /* StringLike */)) {
@@ -26168,10 +27850,10 @@ var ts;
                 }
                 else {
                     // run check only former check succeeded to avoid cascading errors
-                    checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_in_statement, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant);
+                    checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_in_statement, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property);
                 }
             }
-            var rightType = checkExpression(node.expression);
+            var rightType = checkNonNullExpression(node.expression);
             // unknownType is returned i.e. if node.expression is identifier whose name cannot be resolved
             // in this case error about missing name is already reported - do not report extra one
             if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 80896 /* ObjectType */ | 512 /* TypeParameter */)) {
@@ -26188,7 +27870,7 @@ var ts;
             }
         }
         function checkRightHandSideOfForOf(rhsExpression) {
-            var expressionType = getTypeOfExpression(rhsExpression);
+            var expressionType = checkNonNullExpression(rhsExpression);
             return checkIteratedTypeOrElementType(expressionType, rhsExpression, /*allowStringInput*/ true);
         }
         function checkIteratedTypeOrElementType(inputType, errorNode, allowStringInput) {
@@ -26251,7 +27933,7 @@ var ts;
             if (!typeAsIterable.iterableElementType) {
                 // As an optimization, if the type is instantiated directly using the globalIterableType (Iterable<number>),
                 // then just grab its type argument.
-                if ((type.flags & 4096 /* Reference */) && type.target === globalIterableType) {
+                if ((type.flags & 4096 /* Reference */) && type.target === getGlobalIterableType()) {
                     typeAsIterable.iterableElementType = type.typeArguments[0];
                 }
                 else {
@@ -26292,7 +27974,7 @@ var ts;
             if (!typeAsIterator.iteratorElementType) {
                 // As an optimization, if the type is instantiated directly using the globalIteratorType (Iterator<number>),
                 // then just grab its type argument.
-                if ((type.flags & 4096 /* Reference */) && type.target === globalIteratorType) {
+                if ((type.flags & 4096 /* Reference */) && type.target === getGlobalIteratorType()) {
                     typeAsIterator.iteratorElementType = type.typeArguments[0];
                 }
                 else {
@@ -26329,7 +28011,7 @@ var ts;
             }
             // As an optimization, if the type is instantiated directly using the globalIterableIteratorType (IterableIterator<number>),
             // then just grab its type argument.
-            if ((type.flags & 4096 /* Reference */) && type.target === globalIterableIteratorType) {
+            if ((type.flags & 4096 /* Reference */) && type.target === getGlobalIterableIteratorType()) {
                 return type.typeArguments[0];
             }
             return getElementTypeOfIterable(type, /*errorNode*/ undefined) ||
@@ -26339,7 +28021,7 @@ var ts;
          * This function does the following steps:
          *   1. Break up arrayOrStringType (possibly a union) into its string constituents and array constituents.
          *   2. Take the element types of the array constituents.
-         *   3. Return the union of the element types, and string if there was a string constitutent.
+         *   3. Return the union of the element types, and string if there was a string constituent.
          *
          * For example:
          *     string -> string
@@ -26404,8 +28086,12 @@ var ts;
             checkGrammarStatementInAmbientContext(node) || checkGrammarBreakOrContinueStatement(node);
             // TODO: Check that target label is valid
         }
-        function isGetAccessorWithAnnotatatedSetAccessor(node) {
-            return !!(node.kind === 146 /* GetAccessor */ && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(node.symbol, 147 /* SetAccessor */)));
+        function isGetAccessorWithAnnotatedSetAccessor(node) {
+            return !!(node.kind === 148 /* GetAccessor */ && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(node.symbol, 149 /* SetAccessor */)));
+        }
+        function isUnwrappedReturnTypeVoidOrAny(func, returnType) {
+            var unwrappedReturnType = ts.isAsyncFunctionLike(func) ? getPromisedType(returnType) : returnType;
+            return maybeTypeOfKind(unwrappedReturnType, 16 /* Void */ | 1 /* Any */);
         }
         function checkReturnStatement(node) {
             // Grammar checking
@@ -26415,12 +28101,12 @@ var ts;
                     grammarErrorOnFirstToken(node, ts.Diagnostics.A_return_statement_can_only_be_used_within_a_function_body);
                 }
             }
-            if (node.expression) {
-                var func = ts.getContainingFunction(node);
-                if (func) {
-                    var signature = getSignatureFromDeclaration(func);
-                    var returnType = getReturnTypeOfSignature(signature);
-                    var exprType = checkExpressionCached(node.expression);
+            var func = ts.getContainingFunction(node);
+            if (func) {
+                var signature = getSignatureFromDeclaration(func);
+                var returnType = getReturnTypeOfSignature(signature);
+                if (strictNullChecks || node.expression) {
+                    var exprType = node.expression ? checkExpressionCached(node.expression) : undefinedType;
                     if (func.asteriskToken) {
                         // A generator does not need its return expressions checked against its return type.
                         // Instead, the yield expressions are checked against the element type.
@@ -26428,36 +28114,42 @@ var ts;
                         // for generators.
                         return;
                     }
-                    if (func.kind === 147 /* SetAccessor */) {
-                        error(node.expression, ts.Diagnostics.Setters_cannot_return_a_value);
+                    if (func.kind === 149 /* SetAccessor */) {
+                        if (node.expression) {
+                            error(node.expression, ts.Diagnostics.Setters_cannot_return_a_value);
+                        }
                     }
-                    else if (func.kind === 145 /* Constructor */) {
-                        if (!checkTypeAssignableTo(exprType, returnType, node.expression)) {
+                    else if (func.kind === 147 /* Constructor */) {
+                        if (node.expression && !checkTypeAssignableTo(exprType, returnType, node.expression)) {
                             error(node.expression, ts.Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
                         }
                     }
-                    else if (func.type || isGetAccessorWithAnnotatatedSetAccessor(func) || returnType.flags & 134217728 /* PredicateType */) {
+                    else if (func.type || isGetAccessorWithAnnotatedSetAccessor(func)) {
                         if (ts.isAsyncFunctionLike(func)) {
                             var promisedType = getPromisedType(returnType);
-                            var awaitedType = checkAwaitedType(exprType, node.expression, ts.Diagnostics.Return_expression_in_async_function_does_not_have_a_valid_callable_then_member);
+                            var awaitedType = checkAwaitedType(exprType, node.expression || node, ts.Diagnostics.Return_expression_in_async_function_does_not_have_a_valid_callable_then_member);
                             if (promisedType) {
                                 // If the function has a return type, but promisedType is
                                 // undefined, an error will be reported in checkAsyncFunctionReturnType
                                 // so we don't need to report one here.
-                                checkTypeAssignableTo(awaitedType, promisedType, node.expression);
+                                checkTypeAssignableTo(awaitedType, promisedType, node.expression || node);
                             }
                         }
                         else {
-                            checkTypeAssignableTo(exprType, returnType, node.expression);
+                            checkTypeAssignableTo(exprType, returnType, node.expression || node);
                         }
                     }
                 }
+                else if (func.kind !== 147 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType)) {
+                    // The function has a return type, but the return statement doesn't have an expression.
+                    error(node, ts.Diagnostics.Not_all_code_paths_return_a_value);
+                }
             }
         }
         function checkWithStatement(node) {
             // Grammar checking for withStatement
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.parserContextFlags & 8 /* Await */) {
+                if (node.flags & 33554432 /* AwaitContext */) {
                     grammarErrorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_an_async_function_block);
                 }
             }
@@ -26470,10 +28162,9 @@ var ts;
             var firstDefaultClause;
             var hasDuplicateDefaultClause = false;
             var expressionType = checkExpression(node.expression);
-            var expressionTypeIsStringLike = someConstituentTypeHasKind(expressionType, 258 /* StringLike */);
             ts.forEach(node.caseBlock.clauses, function (clause) {
                 // Grammar check for duplicate default clauses, skip if we already report duplicate default clause
-                if (clause.kind === 245 /* DefaultClause */ && !hasDuplicateDefaultClause) {
+                if (clause.kind === 249 /* DefaultClause */ && !hasDuplicateDefaultClause) {
                     if (firstDefaultClause === undefined) {
                         firstDefaultClause = clause;
                     }
@@ -26485,18 +28176,15 @@ var ts;
                         hasDuplicateDefaultClause = true;
                     }
                 }
-                if (produceDiagnostics && clause.kind === 244 /* CaseClause */) {
+                if (produceDiagnostics && clause.kind === 248 /* CaseClause */) {
                     var caseClause = clause;
-                    // TypeScript 1.0 spec (April 2014):5.9
-                    // In a 'switch' statement, each 'case' expression must be of a type that is assignable to or from the type of the 'switch' expression.
+                    // TypeScript 1.0 spec (April 2014): 5.9
+                    // In a 'switch' statement, each 'case' expression must be of a type that is comparable
+                    // to or from the type of the 'switch' expression.
                     var caseType = checkExpression(caseClause.expression);
-                    var expressionTypeIsAssignableToCaseType = 
-                    // Permit 'number[] | "foo"' to be asserted to 'string'.
-                    (expressionTypeIsStringLike && someConstituentTypeHasKind(caseType, 258 /* StringLike */)) ||
-                        isTypeAssignableTo(expressionType, caseType);
-                    if (!expressionTypeIsAssignableToCaseType) {
-                        // 'expressionType is not assignable to caseType', try the reversed check and report errors if it fails
-                        checkTypeAssignableTo(caseType, expressionType, caseClause.expression, /*headMessage*/ undefined);
+                    if (!isTypeComparableTo(expressionType, caseType)) {
+                        // expressionType is not comparable to caseType, try the reversed check and report errors if it fails
+                        checkTypeComparableTo(caseType, expressionType, caseClause.expression, /*headMessage*/ undefined);
                     }
                 }
                 ts.forEach(clause.statements, checkSourceElement);
@@ -26510,7 +28198,7 @@ var ts;
                     if (ts.isFunctionLike(current)) {
                         break;
                     }
-                    if (current.kind === 210 /* LabeledStatement */ && current.label.text === node.label.text) {
+                    if (current.kind === 213 /* LabeledStatement */ && current.label.text === node.label.text) {
                         var sourceFile = ts.getSourceFileOfNode(node);
                         grammarErrorOnNode(node.label, ts.Diagnostics.Duplicate_label_0, ts.getTextOfNodeFromSourceText(sourceFile.text, node.label));
                         break;
@@ -26584,7 +28272,7 @@ var 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 & 64 /* Static */) && ts.hasDynamicName(member)) {
+                        if (!(member.flags & 32 /* Static */) && ts.hasDynamicName(member)) {
                             var propType = getTypeOfSymbol(member.symbol);
                             checkIndexConstraintForProperty(member.symbol, propType, type, declaredStringIndexer, stringIndexType, 0 /* String */);
                             checkIndexConstraintForProperty(member.symbol, propType, type, declaredNumberIndexer, numberIndexType, 1 /* Number */);
@@ -26615,7 +28303,7 @@ var ts;
                 // perform property check if property or indexer is declared in 'type'
                 // this allows to rule out cases when both property and indexer are inherited from the base class
                 var errorNode;
-                if (prop.valueDeclaration.name.kind === 137 /* ComputedPropertyName */ || prop.parent === containingType.symbol) {
+                if (prop.valueDeclaration.name.kind === 139 /* ComputedPropertyName */ || prop.parent === containingType.symbol) {
                     errorNode = prop.valueDeclaration;
                 }
                 else if (indexDeclaration) {
@@ -26649,7 +28337,7 @@ var ts;
                     error(name, message, name.text);
             }
         }
-        // Check each type parameter and check that list has no duplicate type parameter declarations
+        /** Check each type parameter and check that type parameters have no duplicate type parameter declarations */
         function checkTypeParameters(typeParameterDeclarations) {
             if (typeParameterDeclarations) {
                 for (var i = 0, n = typeParameterDeclarations.length; i < n; i++) {
@@ -26665,6 +28353,24 @@ var ts;
                 }
             }
         }
+        /** Check that type parameter lists are identical across multiple declarations */
+        function checkTypeParameterListsIdentical(node, symbol) {
+            if (symbol.declarations.length === 1) {
+                return;
+            }
+            var firstDecl;
+            for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                var declaration = _a[_i];
+                if (declaration.kind === 220 /* ClassDeclaration */ || declaration.kind === 221 /* InterfaceDeclaration */) {
+                    if (!firstDecl) {
+                        firstDecl = declaration;
+                    }
+                    else if (!areTypeParametersIdentical(firstDecl.typeParameters, node.typeParameters)) {
+                        error(node.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_type_parameters, node.name.text);
+                    }
+                }
+            }
+        }
         function checkClassExpression(node) {
             checkClassLikeDeclaration(node);
             checkNodeDeferred(node);
@@ -26687,6 +28393,7 @@ var ts;
                 checkTypeNameIsReserved(node.name, ts.Diagnostics.Class_name_cannot_be_0);
                 checkCollisionWithCapturedThisVariable(node, node.name);
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+                checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             }
             checkTypeParameters(node.typeParameters);
             checkExportsOnMergedDeclarations(node);
@@ -26694,12 +28401,14 @@ var ts;
             var type = getDeclaredTypeOfSymbol(symbol);
             var typeWithThis = getTypeWithThisArgument(type);
             var staticType = getTypeOfSymbol(symbol);
+            checkTypeParameterListsIdentical(node, symbol);
             var baseTypeNode = ts.getClassExtendsHeritageClauseElement(node);
             if (baseTypeNode) {
                 var baseTypes = getBaseTypes(type);
                 if (baseTypes.length && produceDiagnostics) {
-                    var baseType = baseTypes[0];
+                    var baseType_1 = baseTypes[0];
                     var staticBaseType = getBaseConstructorTypeOfClass(type);
+                    checkBaseTypeAccessibility(staticBaseType, baseTypeNode);
                     checkSourceElement(baseTypeNode.expression);
                     if (baseTypeNode.typeArguments) {
                         ts.forEach(baseTypeNode.typeArguments, checkSourceElement);
@@ -26710,7 +28419,7 @@ var ts;
                             }
                         }
                     }
-                    checkTypeAssignableTo(typeWithThis, getTypeWithThisArgument(baseType, type.thisType), node.name || node, ts.Diagnostics.Class_0_incorrectly_extends_base_class_1);
+                    checkTypeAssignableTo(typeWithThis, getTypeWithThisArgument(baseType_1, type.thisType), node.name || node, ts.Diagnostics.Class_0_incorrectly_extends_base_class_1);
                     checkTypeAssignableTo(staticType, getTypeWithoutSignatures(staticBaseType), node.name || node, ts.Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1);
                     if (!(staticBaseType.symbol && staticBaseType.symbol.flags & 32 /* Class */)) {
                         // When the static base type is a "class-like" constructor function (but not actually a class), we verify
@@ -26718,11 +28427,11 @@ var ts;
                         // references (as opposed to checking the structure of the types) because elsewhere we have already checked
                         // that the base type is a class or interface type (and not, for example, an anonymous object type).
                         var constructors = getInstantiatedConstructorsForTypeArguments(staticBaseType, baseTypeNode.typeArguments);
-                        if (ts.forEach(constructors, function (sig) { return getReturnTypeOfSignature(sig) !== baseType; })) {
+                        if (ts.forEach(constructors, function (sig) { return getReturnTypeOfSignature(sig) !== baseType_1; })) {
                             error(baseTypeNode.expression, ts.Diagnostics.Base_constructors_must_all_have_the_same_return_type);
                         }
                     }
-                    checkKindsOfPropertyMemberOverrides(type, baseType);
+                    checkKindsOfPropertyMemberOverrides(type, baseType_1);
                 }
             }
             var implementedTypeNodes = ts.getClassImplementsHeritageClauseElements(node);
@@ -26752,6 +28461,18 @@ var ts;
                 checkTypeForDuplicateIndexSignatures(node);
             }
         }
+        function checkBaseTypeAccessibility(type, node) {
+            var signatures = getSignaturesOfType(type, 1 /* Construct */);
+            if (signatures.length) {
+                var declaration = signatures[0].declaration;
+                if (declaration && declaration.flags & 8 /* Private */) {
+                    var typeClassDeclaration = getClassLikeDeclarationOfSymbol(type.symbol);
+                    if (!isNodeWithinClass(node, typeClassDeclaration)) {
+                        error(node, ts.Diagnostics.Cannot_extend_a_class_0_Class_constructor_is_marked_as_private, node.expression.text);
+                    }
+                }
+            }
+        }
         function getTargetSymbol(s) {
             // if symbol is instantiated its flags are not copied from the 'target'
             // so we'll need to get back original 'target' symbol to work with correct set of flags
@@ -26786,7 +28507,7 @@ var ts;
                 var baseDeclarationFlags = getDeclarationFlagsFromSymbol(base);
                 ts.Debug.assert(!!derived, "derived should point to something, even if it is the base class' declaration.");
                 if (derived) {
-                    // In order to resolve whether the inherited method was overriden in the base class or not,
+                    // In order to resolve whether the inherited method was overridden in the base class or not,
                     // we compare the Symbols obtained. Since getTargetSymbol returns the symbol on the *uninstantiated*
                     // type declaration, derived and base resolve to the same symbol even in the case of generic classes.
                     if (derived === base) {
@@ -26796,7 +28517,7 @@ var ts;
                         // 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 & 128 /* Abstract */ && (!derivedClassDecl || !(derivedClassDecl.flags & 128 /* Abstract */))) {
-                            if (derivedClassDecl.kind === 189 /* ClassExpression */) {
+                            if (derivedClassDecl.kind === 191 /* ClassExpression */) {
                                 error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, symbolToString(baseProperty), typeToString(baseType));
                             }
                             else {
@@ -26807,11 +28528,11 @@ var ts;
                     else {
                         // derived overrides base.
                         var derivedDeclarationFlags = getDeclarationFlagsFromSymbol(derived);
-                        if ((baseDeclarationFlags & 16 /* Private */) || (derivedDeclarationFlags & 16 /* Private */)) {
+                        if ((baseDeclarationFlags & 8 /* Private */) || (derivedDeclarationFlags & 8 /* Private */)) {
                             // either base or derived property is private - not override, skip it
                             continue;
                         }
-                        if ((baseDeclarationFlags & 64 /* Static */) !== (derivedDeclarationFlags & 64 /* Static */)) {
+                        if ((baseDeclarationFlags & 32 /* Static */) !== (derivedDeclarationFlags & 32 /* Static */)) {
                             // value of 'static' is not the same for properties - not override, skip it
                             continue;
                         }
@@ -26844,7 +28565,7 @@ var ts;
             }
         }
         function isAccessor(kind) {
-            return kind === 146 /* GetAccessor */ || kind === 147 /* SetAccessor */;
+            return kind === 148 /* GetAccessor */ || kind === 149 /* SetAccessor */;
         }
         function areTypeParametersIdentical(list1, list2) {
             if (!list1 && !list2) {
@@ -26914,13 +28635,9 @@ var ts;
                 checkTypeNameIsReserved(node.name, ts.Diagnostics.Interface_name_cannot_be_0);
                 checkExportsOnMergedDeclarations(node);
                 var symbol = getSymbolOfNode(node);
-                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 218 /* InterfaceDeclaration */);
-                if (symbol.declarations.length > 1) {
-                    if (node !== firstInterfaceDecl && !areTypeParametersIdentical(firstInterfaceDecl.typeParameters, node.typeParameters)) {
-                        error(node.name, ts.Diagnostics.All_declarations_of_an_interface_must_have_identical_type_parameters);
-                    }
-                }
+                checkTypeParameterListsIdentical(node, symbol);
                 // Only check this symbol once
+                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 221 /* InterfaceDeclaration */);
                 if (node === firstInterfaceDecl) {
                     var type = getDeclaredTypeOfSymbol(symbol);
                     var typeWithThis = getTypeWithThisArgument(type);
@@ -26953,7 +28670,7 @@ var ts;
         }
         function computeEnumMemberValues(node) {
             var nodeLinks = getNodeLinks(node);
-            if (!(nodeLinks.flags & 8192 /* EnumValuesComputed */)) {
+            if (!(nodeLinks.flags & 16384 /* EnumValuesComputed */)) {
                 var enumSymbol = getSymbolOfNode(node);
                 var enumType = getDeclaredTypeOfSymbol(enumSymbol);
                 var autoValue = 0; // set to undefined when enum member is non-constant
@@ -26992,7 +28709,7 @@ var ts;
                         autoValue++;
                     }
                 }
-                nodeLinks.flags |= 8192 /* EnumValuesComputed */;
+                nodeLinks.flags |= 16384 /* EnumValuesComputed */;
             }
             function computeConstantValueForEnumMemberInitializer(initializer, enumType, enumIsConst, ambient) {
                 // Controls if error should be reported after evaluation of constant value is completed
@@ -27024,7 +28741,7 @@ var ts;
                 return value;
                 function evalConstant(e) {
                     switch (e.kind) {
-                        case 182 /* PrefixUnaryExpression */:
+                        case 184 /* PrefixUnaryExpression */:
                             var value_1 = evalConstant(e.operand);
                             if (value_1 === undefined) {
                                 return undefined;
@@ -27035,7 +28752,7 @@ var ts;
                                 case 50 /* TildeToken */: return ~value_1;
                             }
                             return undefined;
-                        case 184 /* BinaryExpression */:
+                        case 186 /* BinaryExpression */:
                             var left = evalConstant(e.left);
                             if (left === undefined) {
                                 return undefined;
@@ -27060,15 +28777,15 @@ var ts;
                             return undefined;
                         case 8 /* NumericLiteral */:
                             return +e.text;
-                        case 175 /* ParenthesizedExpression */:
+                        case 177 /* ParenthesizedExpression */:
                             return evalConstant(e.expression);
                         case 69 /* Identifier */:
-                        case 170 /* ElementAccessExpression */:
-                        case 169 /* PropertyAccessExpression */:
+                        case 172 /* ElementAccessExpression */:
+                        case 171 /* PropertyAccessExpression */:
                             var member = initializer.parent;
                             var currentType = getTypeOfSymbol(getSymbolOfNode(member.parent));
                             var enumType_1;
-                            var propertyName;
+                            var propertyName = void 0;
                             if (e.kind === 69 /* Identifier */) {
                                 // unqualified names can refer to member that reside in different declaration of the enum so just doing name resolution won't work.
                                 // instead pick current enum type and later try to fetch member from the type
@@ -27076,8 +28793,8 @@ var ts;
                                 propertyName = e.text;
                             }
                             else {
-                                var expression;
-                                if (e.kind === 170 /* ElementAccessExpression */) {
+                                var expression = void 0;
+                                if (e.kind === 172 /* ElementAccessExpression */) {
                                     if (e.argumentExpression === undefined ||
                                         e.argumentExpression.kind !== 9 /* StringLiteral */) {
                                         return undefined;
@@ -27095,7 +28812,7 @@ var ts;
                                     if (current.kind === 69 /* Identifier */) {
                                         break;
                                     }
-                                    else if (current.kind === 169 /* PropertyAccessExpression */) {
+                                    else if (current.kind === 171 /* PropertyAccessExpression */) {
                                         current = current.expression;
                                     }
                                     else {
@@ -27140,6 +28857,7 @@ var ts;
             checkTypeNameIsReserved(node.name, ts.Diagnostics.Enum_name_cannot_be_0);
             checkCollisionWithCapturedThisVariable(node, node.name);
             checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+            checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             checkExportsOnMergedDeclarations(node);
             computeEnumMemberValues(node);
             var enumIsConst = ts.isConst(node);
@@ -27163,10 +28881,10 @@ var ts;
                         }
                     });
                 }
-                var seenEnumMissingInitialInitializer = false;
+                var seenEnumMissingInitialInitializer_1 = false;
                 ts.forEach(enumSymbol.declarations, function (declaration) {
                     // return true if we hit a violation of the rule, false otherwise
-                    if (declaration.kind !== 220 /* EnumDeclaration */) {
+                    if (declaration.kind !== 223 /* EnumDeclaration */) {
                         return false;
                     }
                     var enumDeclaration = declaration;
@@ -27175,11 +28893,11 @@ var ts;
                     }
                     var firstEnumMember = enumDeclaration.members[0];
                     if (!firstEnumMember.initializer) {
-                        if (seenEnumMissingInitialInitializer) {
+                        if (seenEnumMissingInitialInitializer_1) {
                             error(firstEnumMember.name, ts.Diagnostics.In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element);
                         }
                         else {
-                            seenEnumMissingInitialInitializer = true;
+                            seenEnumMissingInitialInitializer_1 = true;
                         }
                     }
                 });
@@ -27189,8 +28907,8 @@ var ts;
             var declarations = symbol.declarations;
             for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
                 var declaration = declarations_5[_i];
-                if ((declaration.kind === 217 /* ClassDeclaration */ ||
-                    (declaration.kind === 216 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
+                if ((declaration.kind === 220 /* ClassDeclaration */ ||
+                    (declaration.kind === 219 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
                     !ts.isInAmbientContext(declaration)) {
                     return declaration;
                 }
@@ -27233,6 +28951,7 @@ var ts;
                 }
                 checkCollisionWithCapturedThisVariable(node, node.name);
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+                checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
                 checkExportsOnMergedDeclarations(node);
                 var symbol = getSymbolOfNode(node);
                 // The following checks only apply on a non-ambient instantiated module declaration.
@@ -27251,7 +28970,7 @@ var ts;
                     }
                     // if the module merges with a class declaration in the same lexical scope,
                     // we need to track this to ensure the correct emit.
-                    var mergedClass = ts.getDeclarationOfKind(symbol, 217 /* ClassDeclaration */);
+                    var mergedClass = ts.getDeclarationOfKind(symbol, 220 /* ClassDeclaration */);
                     if (mergedClass &&
                         inSameLexicalScope(node, mergedClass)) {
                         getNodeLinks(node).flags |= 32768 /* LexicalModuleMergesWithClass */;
@@ -27260,10 +28979,10 @@ var ts;
                 if (isAmbientExternalModule) {
                     if (ts.isExternalModuleAugmentation(node)) {
                         // body of the augmentation should be checked for consistency only if augmentation was applied to its target (either global scope or module)
-                        // otherwise we'll be swamped in cascading errors. 
+                        // otherwise we'll be swamped in cascading errors.
                         // We can detect if augmentation was applied using following rules:
                         // - augmentation for a global scope is always applied
-                        // - augmentation for some external module is applied if symbol for augmentation is merged (it was combined with target module). 
+                        // - augmentation for some external module is applied if symbol for augmentation is merged (it was combined with target module).
                         var checkBody = isGlobalAugmentation || (getSymbolOfNode(node).flags & 33554432 /* Merged */);
                         if (checkBody) {
                             // body of ambient external module is always a module block
@@ -27297,31 +29016,31 @@ var ts;
         }
         function checkModuleAugmentationElement(node, isGlobalAugmentation) {
             switch (node.kind) {
-                case 196 /* VariableStatement */:
+                case 199 /* VariableStatement */:
                     // error each individual name in variable statement instead of marking the entire variable statement
                     for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
                         checkModuleAugmentationElement(decl, isGlobalAugmentation);
                     }
                     break;
-                case 230 /* ExportAssignment */:
-                case 231 /* ExportDeclaration */:
+                case 234 /* ExportAssignment */:
+                case 235 /* ExportDeclaration */:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Exports_and_export_assignments_are_not_permitted_in_module_augmentations);
                     break;
-                case 224 /* ImportEqualsDeclaration */:
+                case 228 /* ImportEqualsDeclaration */:
                     if (node.moduleReference.kind !== 9 /* StringLiteral */) {
                         error(node.name, ts.Diagnostics.Module_augmentation_cannot_introduce_new_names_in_the_top_level_scope);
                         break;
                     }
                 // fallthrough
-                case 225 /* ImportDeclaration */:
+                case 229 /* ImportDeclaration */:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module);
                     break;
-                case 166 /* BindingElement */:
-                case 214 /* VariableDeclaration */:
-                    var name_17 = node.name;
-                    if (ts.isBindingPattern(name_17)) {
-                        for (var _b = 0, _c = name_17.elements; _b < _c.length; _b++) {
+                case 168 /* BindingElement */:
+                case 217 /* VariableDeclaration */:
+                    var name_18 = node.name;
+                    if (ts.isBindingPattern(name_18)) {
+                        for (var _b = 0, _c = name_18.elements; _b < _c.length; _b++) {
                             var el = _c[_b];
                             // mark individual names in binding pattern
                             checkModuleAugmentationElement(el, isGlobalAugmentation);
@@ -27329,12 +29048,12 @@ var ts;
                         break;
                     }
                 // fallthrough
-                case 217 /* ClassDeclaration */:
-                case 220 /* EnumDeclaration */:
-                case 216 /* FunctionDeclaration */:
-                case 218 /* InterfaceDeclaration */:
-                case 221 /* ModuleDeclaration */:
-                case 219 /* TypeAliasDeclaration */:
+                case 220 /* ClassDeclaration */:
+                case 223 /* EnumDeclaration */:
+                case 219 /* FunctionDeclaration */:
+                case 221 /* InterfaceDeclaration */:
+                case 224 /* ModuleDeclaration */:
+                case 222 /* TypeAliasDeclaration */:
                     var symbol = getSymbolOfNode(node);
                     if (symbol) {
                         // module augmentations cannot introduce new names on the top level scope of the module
@@ -27349,7 +29068,7 @@ var ts;
                             }
                             else {
                                 // symbol should not originate in augmentation
-                                reportError = ts.isExternalModuleAugmentation(symbol.parent.valueDeclaration);
+                                reportError = ts.isExternalModuleAugmentation(symbol.parent.declarations[0]);
                             }
                         }
                         if (reportError) {
@@ -27361,10 +29080,10 @@ var ts;
         }
         function getFirstIdentifier(node) {
             while (true) {
-                if (node.kind === 136 /* QualifiedName */) {
+                if (node.kind === 138 /* QualifiedName */) {
                     node = node.left;
                 }
-                else if (node.kind === 169 /* PropertyAccessExpression */) {
+                else if (node.kind === 171 /* PropertyAccessExpression */) {
                     node = node.expression;
                 }
                 else {
@@ -27380,9 +29099,9 @@ var ts;
                 error(moduleName, ts.Diagnostics.String_literal_expected);
                 return false;
             }
-            var inAmbientExternalModule = node.parent.kind === 222 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-            if (node.parent.kind !== 251 /* SourceFile */ && !inAmbientExternalModule) {
-                error(moduleName, node.kind === 231 /* ExportDeclaration */ ?
+            var inAmbientExternalModule = node.parent.kind === 225 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+            if (node.parent.kind !== 255 /* SourceFile */ && !inAmbientExternalModule) {
+                error(moduleName, node.kind === 235 /* ExportDeclaration */ ?
                     ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace :
                     ts.Diagnostics.Import_declarations_in_a_namespace_cannot_reference_a_module);
                 return false;
@@ -27405,11 +29124,17 @@ var ts;
             var symbol = getSymbolOfNode(node);
             var target = resolveAlias(symbol);
             if (target !== unknownSymbol) {
-                var excludedMeanings = (symbol.flags & 107455 /* Value */ ? 107455 /* Value */ : 0) |
+                // For external modules symbol represent local symbol for an alias. 
+                // This local symbol will merge any other local declarations (excluding other aliases)
+                // and symbol.flags will contains combined representation for all merged declaration.
+                // Based on symbol.flags we can compute a set of excluded meanings (meaning that resolved alias should not have,
+                // otherwise it will conflict with some local declaration). Note that in addition to normal flags we include matching SymbolFlags.Export* 
+                // in order to prevent collisions with declarations that were exported from the current module (they still contribute to local names). 
+                var excludedMeanings = (symbol.flags & (107455 /* Value */ | 1048576 /* ExportValue */) ? 107455 /* Value */ : 0) |
                     (symbol.flags & 793056 /* Type */ ? 793056 /* Type */ : 0) |
                     (symbol.flags & 1536 /* Namespace */ ? 1536 /* Namespace */ : 0);
                 if (target.flags & excludedMeanings) {
-                    var message = node.kind === 233 /* ExportSpecifier */ ?
+                    var message = node.kind === 237 /* ExportSpecifier */ ?
                         ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 :
                         ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0;
                     error(node, message, symbolToString(symbol));
@@ -27419,6 +29144,7 @@ var ts;
         function checkImportBinding(node) {
             checkCollisionWithCapturedThisVariable(node, node.name);
             checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+            checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             checkAliasSymbol(node);
         }
         function checkImportDeclaration(node) {
@@ -27426,7 +29152,7 @@ var 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 & 1022 /* Modifier */)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 959 /* Modifier */)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_import_declaration_cannot_have_modifiers);
             }
             if (checkExternalImportOrExportDeclaration(node)) {
@@ -27436,7 +29162,7 @@ var ts;
                         checkImportBinding(importClause);
                     }
                     if (importClause.namedBindings) {
-                        if (importClause.namedBindings.kind === 227 /* NamespaceImport */) {
+                        if (importClause.namedBindings.kind === 231 /* NamespaceImport */) {
                             checkImportBinding(importClause.namedBindings);
                         }
                         else {
@@ -27454,7 +29180,7 @@ var ts;
             checkGrammarDecorators(node) || checkGrammarModifiers(node);
             if (ts.isInternalModuleImportEqualsDeclaration(node) || checkExternalImportOrExportDeclaration(node)) {
                 checkImportBinding(node);
-                if (node.flags & 2 /* Export */) {
+                if (node.flags & 1 /* Export */) {
                     markExportAsReferenced(node);
                 }
                 if (ts.isInternalModuleImportEqualsDeclaration(node)) {
@@ -27473,7 +29199,7 @@ var ts;
                     }
                 }
                 else {
-                    if (modulekind === 5 /* ES6 */ && !ts.isInAmbientContext(node)) {
+                    if (modulekind === ts.ModuleKind.ES6 && !ts.isInAmbientContext(node)) {
                         // Import equals declaration is deprecated in es6 or above
                         grammarErrorOnNode(node, ts.Diagnostics.Import_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_import_Asterisk_as_ns_from_mod_import_a_from_mod_import_d_from_mod_or_another_module_format_instead);
                     }
@@ -27485,7 +29211,7 @@ var ts;
                 // If we hit an export in an illegal context, just bail out to avoid cascading errors.
                 return;
             }
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 1022 /* Modifier */)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 959 /* Modifier */)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_declaration_cannot_have_modifiers);
             }
             if (!node.moduleSpecifier || checkExternalImportOrExportDeclaration(node)) {
@@ -27493,22 +29219,22 @@ var ts;
                     // export { x, y }
                     // export { x, y } from "foo"
                     ts.forEach(node.exportClause.elements, checkExportSpecifier);
-                    var inAmbientExternalModule = node.parent.kind === 222 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-                    if (node.parent.kind !== 251 /* SourceFile */ && !inAmbientExternalModule) {
+                    var inAmbientExternalModule = node.parent.kind === 225 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+                    if (node.parent.kind !== 255 /* SourceFile */ && !inAmbientExternalModule) {
                         error(node, ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace);
                     }
                 }
                 else {
                     // export * from "foo"
                     var moduleSymbol = resolveExternalModuleName(node, node.moduleSpecifier);
-                    if (moduleSymbol && moduleSymbol.exports["export="]) {
+                    if (moduleSymbol && hasExportAssignmentSymbol(moduleSymbol)) {
                         error(node.moduleSpecifier, ts.Diagnostics.Module_0_uses_export_and_cannot_be_used_with_export_Asterisk, symbolToString(moduleSymbol));
                     }
                 }
             }
         }
         function checkGrammarModuleElementContext(node, errorMessage) {
-            if (node.parent.kind !== 251 /* SourceFile */ && node.parent.kind !== 222 /* ModuleBlock */ && node.parent.kind !== 221 /* ModuleDeclaration */) {
+            if (node.parent.kind !== 255 /* SourceFile */ && node.parent.kind !== 225 /* ModuleBlock */ && node.parent.kind !== 224 /* ModuleDeclaration */) {
                 return grammarErrorOnFirstToken(node, errorMessage);
             }
         }
@@ -27519,7 +29245,7 @@ var ts;
                 // find immediate value referenced by exported name (SymbolFlags.Alias is set so we don't chase down aliases)
                 var symbol = resolveName(exportedName, exportedName.text, 107455 /* Value */ | 793056 /* Type */ | 1536 /* Namespace */ | 8388608 /* Alias */, 
                 /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
-                if (symbol && isGlobalSourceFile(getDeclarationContainer(symbol.declarations[0]))) {
+                if (symbol && (symbol === undefinedSymbol || isGlobalSourceFile(getDeclarationContainer(symbol.declarations[0])))) {
                     error(exportedName, ts.Diagnostics.Cannot_re_export_name_that_is_not_defined_in_the_module);
                 }
                 else {
@@ -27532,13 +29258,13 @@ var ts;
                 // If we hit an export assignment in an illegal context, just bail out to avoid cascading errors.
                 return;
             }
-            var container = node.parent.kind === 251 /* SourceFile */ ? node.parent : node.parent.parent;
-            if (container.kind === 221 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
+            var container = node.parent.kind === 255 /* SourceFile */ ? node.parent : node.parent.parent;
+            if (container.kind === 224 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
                 error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace);
                 return;
             }
             // Grammar checking
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 1022 /* Modifier */)) {
+            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 959 /* Modifier */)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_assignment_cannot_have_modifiers);
             }
             if (node.expression.kind === 69 /* Identifier */) {
@@ -27549,11 +29275,11 @@ var ts;
             }
             checkExternalModuleExports(container);
             if (node.isExportEquals && !ts.isInAmbientContext(node)) {
-                if (modulekind === 5 /* ES6 */) {
+                if (modulekind === ts.ModuleKind.ES6) {
                     // export assignment is not supported in es6 modules
                     grammarErrorOnNode(node, ts.Diagnostics.Export_assignment_cannot_be_used_when_targeting_ECMAScript_6_modules_Consider_using_export_default_or_another_module_format_instead);
                 }
-                else if (modulekind === 4 /* System */) {
+                else if (modulekind === ts.ModuleKind.System) {
                     // system modules does not support export assignment
                     grammarErrorOnNode(node, ts.Diagnostics.Export_assignment_is_not_supported_when_module_flag_is_system);
                 }
@@ -27585,12 +29311,21 @@ var ts;
                         continue;
                     }
                     var _a = exports[id], declarations = _a.declarations, flags = _a.flags;
-                    // ECMA262: 15.2.1.1 It is a Syntax Error if the ExportedNames of ModuleItemList contains any duplicate entries. (TS Exceptions: namespaces, function overloads, enums, and interfaces)
-                    if (!(flags & (1536 /* Namespace */ | 64 /* Interface */ | 384 /* Enum */)) && (flags & 524288 /* TypeAlias */ ? declarations.length - 1 : declarations.length) > 1) {
-                        var exportedDeclarations = ts.filter(declarations, isNotOverload);
-                        if (exportedDeclarations.length > 1) {
-                            for (var _i = 0, exportedDeclarations_1 = exportedDeclarations; _i < exportedDeclarations_1.length; _i++) {
-                                var declaration = exportedDeclarations_1[_i];
+                    // ECMA262: 15.2.1.1 It is a Syntax Error if the ExportedNames of ModuleItemList contains any duplicate entries. 
+                    // (TS Exceptions: namespaces, function overloads, enums, and interfaces)
+                    if (flags & (1536 /* Namespace */ | 64 /* Interface */ | 384 /* Enum */)) {
+                        continue;
+                    }
+                    var exportedDeclarationsCount = ts.countWhere(declarations, isNotOverload);
+                    if (flags & 524288 /* TypeAlias */ && exportedDeclarationsCount <= 2) {
+                        // it is legal to merge type alias with other values
+                        // so count should be either 1 (just type alias) or 2 (type alias + merged value)
+                        continue;
+                    }
+                    if (exportedDeclarationsCount > 1) {
+                        for (var _i = 0, declarations_6 = declarations; _i < declarations_6.length; _i++) {
+                            var declaration = declarations_6[_i];
+                            if (isNotOverload(declaration)) {
                                 diagnostics.add(ts.createDiagnosticForNode(declaration, ts.Diagnostics.Cannot_redeclare_exported_variable_0, id));
                             }
                         }
@@ -27599,7 +29334,7 @@ var ts;
                 links.exportsChecked = true;
             }
             function isNotOverload(declaration) {
-                return declaration.kind !== 216 /* FunctionDeclaration */ || !!declaration.body;
+                return declaration.kind !== 219 /* FunctionDeclaration */ || !!declaration.body;
             }
         }
         function checkSourceElement(node) {
@@ -27608,121 +29343,121 @@ var ts;
             }
             var kind = node.kind;
             if (cancellationToken) {
-                // Only bother checking on a few construct kinds.  We don't want to be excessivly
+                // Only bother checking on a few construct kinds.  We don't want to be excessively
                 // hitting the cancellation token on every node we check.
                 switch (kind) {
-                    case 221 /* ModuleDeclaration */:
-                    case 217 /* ClassDeclaration */:
-                    case 218 /* InterfaceDeclaration */:
-                    case 216 /* FunctionDeclaration */:
+                    case 224 /* ModuleDeclaration */:
+                    case 220 /* ClassDeclaration */:
+                    case 221 /* InterfaceDeclaration */:
+                    case 219 /* FunctionDeclaration */:
                         cancellationToken.throwIfCancellationRequested();
                 }
             }
             switch (kind) {
-                case 138 /* TypeParameter */:
+                case 140 /* TypeParameter */:
                     return checkTypeParameter(node);
-                case 139 /* Parameter */:
+                case 141 /* Parameter */:
                     return checkParameter(node);
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
                     return checkPropertyDeclaration(node);
-                case 153 /* FunctionType */:
-                case 154 /* ConstructorType */:
-                case 148 /* CallSignature */:
-                case 149 /* ConstructSignature */:
+                case 155 /* FunctionType */:
+                case 156 /* ConstructorType */:
+                case 150 /* CallSignature */:
+                case 151 /* ConstructSignature */:
                     return checkSignatureDeclaration(node);
-                case 150 /* IndexSignature */:
+                case 152 /* IndexSignature */:
                     return checkSignatureDeclaration(node);
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
                     return checkMethodDeclaration(node);
-                case 145 /* Constructor */:
+                case 147 /* Constructor */:
                     return checkConstructorDeclaration(node);
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
                     return checkAccessorDeclaration(node);
-                case 152 /* TypeReference */:
+                case 154 /* TypeReference */:
                     return checkTypeReferenceNode(node);
-                case 151 /* TypePredicate */:
+                case 153 /* TypePredicate */:
                     return checkTypePredicate(node);
-                case 155 /* TypeQuery */:
+                case 157 /* TypeQuery */:
                     return checkTypeQuery(node);
-                case 156 /* TypeLiteral */:
+                case 158 /* TypeLiteral */:
                     return checkTypeLiteral(node);
-                case 157 /* ArrayType */:
+                case 159 /* ArrayType */:
                     return checkArrayType(node);
-                case 158 /* TupleType */:
+                case 160 /* TupleType */:
                     return checkTupleType(node);
-                case 159 /* UnionType */:
-                case 160 /* IntersectionType */:
+                case 161 /* UnionType */:
+                case 162 /* IntersectionType */:
                     return checkUnionOrIntersectionType(node);
-                case 161 /* ParenthesizedType */:
+                case 163 /* ParenthesizedType */:
                     return checkSourceElement(node.type);
-                case 216 /* FunctionDeclaration */:
+                case 219 /* FunctionDeclaration */:
                     return checkFunctionDeclaration(node);
-                case 195 /* Block */:
-                case 222 /* ModuleBlock */:
+                case 198 /* Block */:
+                case 225 /* ModuleBlock */:
                     return checkBlock(node);
-                case 196 /* VariableStatement */:
+                case 199 /* VariableStatement */:
                     return checkVariableStatement(node);
-                case 198 /* ExpressionStatement */:
+                case 201 /* ExpressionStatement */:
                     return checkExpressionStatement(node);
-                case 199 /* IfStatement */:
+                case 202 /* IfStatement */:
                     return checkIfStatement(node);
-                case 200 /* DoStatement */:
+                case 203 /* DoStatement */:
                     return checkDoStatement(node);
-                case 201 /* WhileStatement */:
+                case 204 /* WhileStatement */:
                     return checkWhileStatement(node);
-                case 202 /* ForStatement */:
+                case 205 /* ForStatement */:
                     return checkForStatement(node);
-                case 203 /* ForInStatement */:
+                case 206 /* ForInStatement */:
                     return checkForInStatement(node);
-                case 204 /* ForOfStatement */:
+                case 207 /* ForOfStatement */:
                     return checkForOfStatement(node);
-                case 205 /* ContinueStatement */:
-                case 206 /* BreakStatement */:
+                case 208 /* ContinueStatement */:
+                case 209 /* BreakStatement */:
                     return checkBreakOrContinueStatement(node);
-                case 207 /* ReturnStatement */:
+                case 210 /* ReturnStatement */:
                     return checkReturnStatement(node);
-                case 208 /* WithStatement */:
+                case 211 /* WithStatement */:
                     return checkWithStatement(node);
-                case 209 /* SwitchStatement */:
+                case 212 /* SwitchStatement */:
                     return checkSwitchStatement(node);
-                case 210 /* LabeledStatement */:
+                case 213 /* LabeledStatement */:
                     return checkLabeledStatement(node);
-                case 211 /* ThrowStatement */:
+                case 214 /* ThrowStatement */:
                     return checkThrowStatement(node);
-                case 212 /* TryStatement */:
+                case 215 /* TryStatement */:
                     return checkTryStatement(node);
-                case 214 /* VariableDeclaration */:
+                case 217 /* VariableDeclaration */:
                     return checkVariableDeclaration(node);
-                case 166 /* BindingElement */:
+                case 168 /* BindingElement */:
                     return checkBindingElement(node);
-                case 217 /* ClassDeclaration */:
+                case 220 /* ClassDeclaration */:
                     return checkClassDeclaration(node);
-                case 218 /* InterfaceDeclaration */:
+                case 221 /* InterfaceDeclaration */:
                     return checkInterfaceDeclaration(node);
-                case 219 /* TypeAliasDeclaration */:
+                case 222 /* TypeAliasDeclaration */:
                     return checkTypeAliasDeclaration(node);
-                case 220 /* EnumDeclaration */:
+                case 223 /* EnumDeclaration */:
                     return checkEnumDeclaration(node);
-                case 221 /* ModuleDeclaration */:
+                case 224 /* ModuleDeclaration */:
                     return checkModuleDeclaration(node);
-                case 225 /* ImportDeclaration */:
+                case 229 /* ImportDeclaration */:
                     return checkImportDeclaration(node);
-                case 224 /* ImportEqualsDeclaration */:
+                case 228 /* ImportEqualsDeclaration */:
                     return checkImportEqualsDeclaration(node);
-                case 231 /* ExportDeclaration */:
+                case 235 /* ExportDeclaration */:
                     return checkExportDeclaration(node);
-                case 230 /* ExportAssignment */:
+                case 234 /* ExportAssignment */:
                     return checkExportAssignment(node);
-                case 197 /* EmptyStatement */:
+                case 200 /* EmptyStatement */:
                     checkGrammarStatementInAmbientContext(node);
                     return;
-                case 213 /* DebuggerStatement */:
+                case 216 /* DebuggerStatement */:
                     checkGrammarStatementInAmbientContext(node);
                     return;
-                case 234 /* MissingDeclaration */:
+                case 238 /* MissingDeclaration */:
                     return checkMissingDeclaration(node);
             }
         }
@@ -27744,17 +29479,17 @@ var ts;
             for (var _i = 0, deferredNodes_1 = deferredNodes; _i < deferredNodes_1.length; _i++) {
                 var node = deferredNodes_1[_i];
                 switch (node.kind) {
-                    case 176 /* FunctionExpression */:
-                    case 177 /* ArrowFunction */:
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
+                    case 178 /* FunctionExpression */:
+                    case 179 /* ArrowFunction */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
                         checkFunctionExpressionOrObjectLiteralMethodDeferred(node);
                         break;
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
                         checkAccessorDeferred(node);
                         break;
-                    case 189 /* ClassExpression */:
+                    case 191 /* ClassExpression */:
                         checkClassExpressionDeferred(node);
                         break;
                 }
@@ -27829,7 +29564,7 @@ var ts;
         function isInsideWithStatementBody(node) {
             if (node) {
                 while (node.parent) {
-                    if (node.parent.kind === 208 /* WithStatement */ && node.parent.statement === node) {
+                    if (node.parent.kind === 211 /* WithStatement */ && node.parent.statement === node) {
                         return true;
                     }
                     node = node.parent;
@@ -27852,34 +29587,34 @@ var ts;
                         copySymbols(location.locals, meaning);
                     }
                     switch (location.kind) {
-                        case 251 /* SourceFile */:
+                        case 255 /* SourceFile */:
                             if (!ts.isExternalOrCommonJsModule(location)) {
                                 break;
                             }
-                        case 221 /* ModuleDeclaration */:
+                        case 224 /* ModuleDeclaration */:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8914931 /* ModuleMember */);
                             break;
-                        case 220 /* EnumDeclaration */:
+                        case 223 /* EnumDeclaration */:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8 /* EnumMember */);
                             break;
-                        case 189 /* ClassExpression */:
+                        case 191 /* ClassExpression */:
                             var className = location.name;
                             if (className) {
                                 copySymbol(location.symbol, meaning);
                             }
                         // fall through; this fall-through is necessary because we would like to handle
                         // type parameter inside class expression similar to how we handle it in classDeclaration and interface Declaration
-                        case 217 /* ClassDeclaration */:
-                        case 218 /* InterfaceDeclaration */:
+                        case 220 /* ClassDeclaration */:
+                        case 221 /* InterfaceDeclaration */:
                             // If we didn't come from static member of class or interface,
                             // 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 & 64 /* Static */)) {
+                            if (!(memberFlags & 32 /* Static */)) {
                                 copySymbols(getSymbolOfNode(location).members, meaning & 793056 /* Type */);
                             }
                             break;
-                        case 176 /* FunctionExpression */:
+                        case 178 /* FunctionExpression */:
                             var funcName = location.name;
                             if (funcName) {
                                 copySymbol(location.symbol, meaning);
@@ -27928,37 +29663,51 @@ var ts;
         }
         function isTypeDeclaration(node) {
             switch (node.kind) {
-                case 138 /* TypeParameter */:
-                case 217 /* ClassDeclaration */:
-                case 218 /* InterfaceDeclaration */:
-                case 219 /* TypeAliasDeclaration */:
-                case 220 /* EnumDeclaration */:
+                case 140 /* TypeParameter */:
+                case 220 /* ClassDeclaration */:
+                case 221 /* InterfaceDeclaration */:
+                case 222 /* TypeAliasDeclaration */:
+                case 223 /* EnumDeclaration */:
                     return true;
             }
         }
         // True if the given identifier is part of a type reference
         function isTypeReferenceIdentifier(entityName) {
             var node = entityName;
-            while (node.parent && node.parent.kind === 136 /* QualifiedName */) {
+            while (node.parent && node.parent.kind === 138 /* QualifiedName */) {
                 node = node.parent;
             }
-            return node.parent && node.parent.kind === 152 /* TypeReference */;
+            return node.parent && node.parent.kind === 154 /* TypeReference */;
         }
         function isHeritageClauseElementIdentifier(entityName) {
             var node = entityName;
-            while (node.parent && node.parent.kind === 169 /* PropertyAccessExpression */) {
+            while (node.parent && node.parent.kind === 171 /* PropertyAccessExpression */) {
                 node = node.parent;
             }
-            return node.parent && node.parent.kind === 191 /* ExpressionWithTypeArguments */;
+            return node.parent && node.parent.kind === 193 /* ExpressionWithTypeArguments */;
+        }
+        function forEachEnclosingClass(node, callback) {
+            var result;
+            while (true) {
+                node = ts.getContainingClass(node);
+                if (!node)
+                    break;
+                if (result = callback(node))
+                    break;
+            }
+            return result;
+        }
+        function isNodeWithinClass(node, classDeclaration) {
+            return !!forEachEnclosingClass(node, function (n) { return n === classDeclaration; });
         }
         function getLeftSideOfImportEqualsOrExportAssignment(nodeOnRightSide) {
-            while (nodeOnRightSide.parent.kind === 136 /* QualifiedName */) {
+            while (nodeOnRightSide.parent.kind === 138 /* QualifiedName */) {
                 nodeOnRightSide = nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 224 /* ImportEqualsDeclaration */) {
+            if (nodeOnRightSide.parent.kind === 228 /* ImportEqualsDeclaration */) {
                 return nodeOnRightSide.parent.moduleReference === nodeOnRightSide && nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 230 /* ExportAssignment */) {
+            if (nodeOnRightSide.parent.kind === 234 /* ExportAssignment */) {
                 return nodeOnRightSide.parent.expression === nodeOnRightSide && nodeOnRightSide.parent;
             }
             return undefined;
@@ -27970,11 +29719,23 @@ var ts;
             if (ts.isDeclarationName(entityName)) {
                 return getSymbolOfNode(entityName.parent);
             }
-            if (entityName.parent.kind === 230 /* ExportAssignment */) {
+            if (ts.isInJavaScriptFile(entityName) && entityName.parent.kind === 171 /* PropertyAccessExpression */) {
+                var specialPropertyAssignmentKind = ts.getSpecialPropertyAssignmentKind(entityName.parent.parent);
+                switch (specialPropertyAssignmentKind) {
+                    case 1 /* ExportsProperty */:
+                    case 3 /* PrototypeProperty */:
+                        return getSymbolOfNode(entityName.parent);
+                    case 4 /* ThisProperty */:
+                    case 2 /* ModuleExports */:
+                        return getSymbolOfNode(entityName.parent.parent);
+                    default:
+                }
+            }
+            if (entityName.parent.kind === 234 /* ExportAssignment */) {
                 return resolveEntityName(entityName, 
                 /*all meanings*/ 107455 /* Value */ | 793056 /* Type */ | 1536 /* Namespace */ | 8388608 /* Alias */);
             }
-            if (entityName.kind !== 169 /* PropertyAccessExpression */) {
+            if (entityName.kind !== 171 /* PropertyAccessExpression */) {
                 if (isInRightSideOfImportOrExportAssignment(entityName)) {
                     // Since we already checked for ExportAssignment, this really could only be an Import
                     return getSymbolOfPartOfRightHandSideOfImportEquals(entityName);
@@ -27986,7 +29747,7 @@ var ts;
             if (isHeritageClauseElementIdentifier(entityName)) {
                 var meaning = 0 /* None */;
                 // In an interface or class, we're definitely interested in a type.
-                if (entityName.parent.kind === 191 /* ExpressionWithTypeArguments */) {
+                if (entityName.parent.kind === 193 /* ExpressionWithTypeArguments */) {
                     meaning = 793056 /* Type */;
                     // In a class 'extends' clause we are also looking for a value.
                     if (ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
@@ -27999,30 +29760,28 @@ var ts;
                 meaning |= 8388608 /* Alias */;
                 return resolveEntityName(entityName, meaning);
             }
-            else if ((entityName.parent.kind === 238 /* JsxOpeningElement */) ||
-                (entityName.parent.kind === 237 /* JsxSelfClosingElement */) ||
-                (entityName.parent.kind === 240 /* JsxClosingElement */)) {
-                return getJsxElementTagSymbol(entityName.parent);
-            }
             else if (ts.isExpression(entityName)) {
                 if (ts.nodeIsMissing(entityName)) {
                     // Missing entity name.
                     return undefined;
                 }
                 if (entityName.kind === 69 /* Identifier */) {
+                    if (ts.isJSXTagName(entityName) && isJsxIntrinsicIdentifier(entityName)) {
+                        return getIntrinsicTagSymbol(entityName.parent);
+                    }
                     // Include aliases in the meaning, this ensures that we do not follow aliases to where they point and instead
                     // return the alias symbol.
                     var meaning = 107455 /* Value */ | 8388608 /* Alias */;
                     return resolveEntityName(entityName, meaning);
                 }
-                else if (entityName.kind === 169 /* PropertyAccessExpression */) {
+                else if (entityName.kind === 171 /* PropertyAccessExpression */) {
                     var symbol = getNodeLinks(entityName).resolvedSymbol;
                     if (!symbol) {
                         checkPropertyAccessExpression(entityName);
                     }
                     return getNodeLinks(entityName).resolvedSymbol;
                 }
-                else if (entityName.kind === 136 /* QualifiedName */) {
+                else if (entityName.kind === 138 /* QualifiedName */) {
                     var symbol = getNodeLinks(entityName).resolvedSymbol;
                     if (!symbol) {
                         checkQualifiedName(entityName);
@@ -28031,16 +29790,16 @@ var ts;
                 }
             }
             else if (isTypeReferenceIdentifier(entityName)) {
-                var meaning = entityName.parent.kind === 152 /* TypeReference */ ? 793056 /* Type */ : 1536 /* Namespace */;
+                var meaning = entityName.parent.kind === 154 /* TypeReference */ ? 793056 /* Type */ : 1536 /* Namespace */;
                 // Include aliases in the meaning, this ensures that we do not follow aliases to where they point and instead
                 // return the alias symbol.
                 meaning |= 8388608 /* Alias */;
                 return resolveEntityName(entityName, meaning);
             }
-            else if (entityName.parent.kind === 241 /* JsxAttribute */) {
+            else if (entityName.parent.kind === 245 /* JsxAttribute */) {
                 return getJsxAttributePropertySymbol(entityName.parent);
             }
-            if (entityName.parent.kind === 151 /* TypePredicate */) {
+            if (entityName.parent.kind === 153 /* TypePredicate */) {
                 return resolveEntityName(entityName, /*meaning*/ 1 /* FunctionScopedVariable */);
             }
             // Do we want to return undefined here?
@@ -28057,12 +29816,12 @@ var ts;
             }
             if (node.kind === 69 /* Identifier */) {
                 if (isInRightSideOfImportOrExportAssignment(node)) {
-                    return node.parent.kind === 230 /* ExportAssignment */
+                    return node.parent.kind === 234 /* ExportAssignment */
                         ? getSymbolOfEntityNameOrPropertyAccessExpression(node)
                         : getSymbolOfPartOfRightHandSideOfImportEquals(node);
                 }
-                else if (node.parent.kind === 166 /* BindingElement */ &&
-                    node.parent.parent.kind === 164 /* ObjectBindingPattern */ &&
+                else if (node.parent.kind === 168 /* BindingElement */ &&
+                    node.parent.parent.kind === 166 /* ObjectBindingPattern */ &&
                     node === node.parent.propertyName) {
                     var typeOfPattern = getTypeOfNode(node.parent.parent);
                     var propertyDeclaration = typeOfPattern && getPropertyOfType(typeOfPattern, node.text);
@@ -28073,19 +29832,19 @@ var ts;
             }
             switch (node.kind) {
                 case 69 /* Identifier */:
-                case 169 /* PropertyAccessExpression */:
-                case 136 /* QualifiedName */:
+                case 171 /* PropertyAccessExpression */:
+                case 138 /* QualifiedName */:
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
                 case 97 /* ThisKeyword */:
                 case 95 /* SuperKeyword */:
                     var type = ts.isExpression(node) ? checkExpression(node) : getTypeFromTypeNode(node);
                     return type.symbol;
-                case 162 /* ThisType */:
+                case 164 /* ThisType */:
                     return getTypeFromTypeNode(node).symbol;
                 case 121 /* ConstructorKeyword */:
                     // constructor keyword for an overload, should take us to the definition if it exist
                     var constructorDeclaration = node.parent;
-                    if (constructorDeclaration && constructorDeclaration.kind === 145 /* Constructor */) {
+                    if (constructorDeclaration && constructorDeclaration.kind === 147 /* Constructor */) {
                         return constructorDeclaration.parent.symbol;
                     }
                     return undefined;
@@ -28093,14 +29852,14 @@ var ts;
                     // External module name in an import declaration
                     if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) &&
                         ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) ||
-                        ((node.parent.kind === 225 /* ImportDeclaration */ || node.parent.kind === 231 /* ExportDeclaration */) &&
+                        ((node.parent.kind === 229 /* ImportDeclaration */ || node.parent.kind === 235 /* ExportDeclaration */) &&
                             node.parent.moduleSpecifier === node)) {
                         return resolveExternalModuleName(node, node);
                     }
                 // Fall through
                 case 8 /* NumericLiteral */:
                     // index access
-                    if (node.parent.kind === 170 /* ElementAccessExpression */ && node.parent.argumentExpression === node) {
+                    if (node.parent.kind === 172 /* ElementAccessExpression */ && node.parent.argumentExpression === node) {
                         var objectType = checkExpression(node.parent.expression);
                         if (objectType === unknownType)
                             return undefined;
@@ -28117,7 +29876,7 @@ var ts;
             // The function returns a value symbol of an identifier in the short-hand property assignment.
             // This is necessary as an identifier in short-hand property assignment can contains two meaning:
             // property name and property value.
-            if (location && location.kind === 249 /* ShorthandPropertyAssignment */) {
+            if (location && location.kind === 253 /* ShorthandPropertyAssignment */) {
                 return resolveEntityName(location.name, 107455 /* Value */ | 8388608 /* Alias */);
             }
             return undefined;
@@ -28184,7 +29943,7 @@ var ts;
           */
         function getParentTypeOfClassElement(node) {
             var classSymbol = getSymbolOfNode(node.parent);
-            return node.flags & 64 /* Static */
+            return node.flags & 32 /* Static */
                 ? getTypeOfSymbol(classSymbol)
                 : getDeclaredTypeOfSymbol(classSymbol);
         }
@@ -28204,15 +29963,15 @@ var ts;
         }
         function getRootSymbols(symbol) {
             if (symbol.flags & 268435456 /* SyntheticProperty */) {
-                var symbols = [];
-                var name_18 = symbol.name;
+                var symbols_3 = [];
+                var name_19 = symbol.name;
                 ts.forEach(getSymbolLinks(symbol).containingType.types, function (t) {
-                    var symbol = getPropertyOfType(t, name_18);
+                    var symbol = getPropertyOfType(t, name_19);
                     if (symbol) {
-                        symbols.push(symbol);
+                        symbols_3.push(symbol);
                     }
                 });
-                return symbols;
+                return symbols_3;
             }
             else if (symbol.flags & 67108864 /* Transient */) {
                 var target = getSymbolLinks(symbol).target;
@@ -28232,7 +29991,7 @@ var ts;
                 // module not found - be conservative
                 return true;
             }
-            var hasExportAssignment = getExportAssignmentSymbol(moduleSymbol) !== undefined;
+            var hasExportAssignment = hasExportAssignmentSymbol(moduleSymbol);
             // if module has export assignment then 'resolveExternalModuleSymbol' will return resolved symbol for export assignment
             // otherwise it will return moduleSymbol itself
             moduleSymbol = resolveExternalModuleSymbol(moduleSymbol);
@@ -28267,11 +30026,11 @@ var ts;
                 }
                 var parentSymbol = getParentOfSymbol(symbol);
                 if (parentSymbol) {
-                    if (parentSymbol.flags & 512 /* ValueModule */ && parentSymbol.valueDeclaration.kind === 251 /* SourceFile */) {
+                    if (parentSymbol.flags & 512 /* ValueModule */ && parentSymbol.valueDeclaration.kind === 255 /* SourceFile */) {
                         return parentSymbol.valueDeclaration;
                     }
                     for (var n = node.parent; n; n = n.parent) {
-                        if ((n.kind === 221 /* ModuleDeclaration */ || n.kind === 220 /* EnumDeclaration */) && getSymbolOfNode(n) === parentSymbol) {
+                        if ((n.kind === 224 /* ModuleDeclaration */ || n.kind === 223 /* EnumDeclaration */) && getSymbolOfNode(n) === parentSymbol) {
                             return n;
                         }
                     }
@@ -28284,58 +30043,77 @@ var ts;
             var symbol = getReferencedValueSymbol(node);
             return symbol && symbol.flags & 8388608 /* Alias */ ? getDeclarationOfAliasSymbol(symbol) : undefined;
         }
-        function isStatementWithLocals(node) {
-            switch (node.kind) {
-                case 195 /* Block */:
-                case 223 /* CaseBlock */:
-                case 202 /* ForStatement */:
-                case 203 /* ForInStatement */:
-                case 204 /* ForOfStatement */:
-                    return true;
-            }
-            return false;
-        }
-        function isNestedRedeclarationSymbol(symbol) {
+        function isSymbolOfDeclarationWithCollidingName(symbol) {
             if (symbol.flags & 418 /* BlockScoped */) {
                 var links = getSymbolLinks(symbol);
-                if (links.isNestedRedeclaration === undefined) {
+                if (links.isDeclarationWithCollidingName === undefined) {
                     var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
-                    links.isNestedRedeclaration = isStatementWithLocals(container) &&
-                        !!resolveName(container.parent, symbol.name, 107455 /* Value */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
+                    if (ts.isStatementWithLocals(container)) {
+                        var nodeLinks_1 = getNodeLinks(symbol.valueDeclaration);
+                        if (!!resolveName(container.parent, symbol.name, 107455 /* Value */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined)) {
+                            // redeclaration - always should be renamed
+                            links.isDeclarationWithCollidingName = true;
+                        }
+                        else if (nodeLinks_1.flags & 131072 /* CapturedBlockScopedBinding */) {
+                            // binding is captured in the function
+                            // should be renamed if:
+                            // - binding is not top level - top level bindings never collide with anything
+                            // AND
+                            //   - binding is not declared in loop, should be renamed to avoid name reuse across siblings
+                            //     let a, b
+                            //     { let x = 1; a = () => x;  }
+                            //     { let x = 100; b = () => x; }
+                            //     console.log(a()); // should print '1'
+                            //     console.log(b()); // should print '100'
+                            //     OR
+                            //   - binding is declared inside loop but not in inside initializer of iteration statement or directly inside loop body
+                            //     * variables from initializer are passed to rewritten loop body as parameters so they are not captured directly
+                            //     * variables that are declared immediately in loop body will become top level variable after loop is rewritten and thus
+                            //       they will not collide with anything
+                            var isDeclaredInLoop = nodeLinks_1.flags & 262144 /* BlockScopedBindingInLoop */;
+                            var inLoopInitializer = ts.isIterationStatement(container, /*lookInLabeledStatements*/ false);
+                            var inLoopBodyBlock = container.kind === 198 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false);
+                            links.isDeclarationWithCollidingName = !ts.isBlockScopedContainerTopLevel(container) && (!isDeclaredInLoop || (!inLoopInitializer && !inLoopBodyBlock));
+                        }
+                        else {
+                            links.isDeclarationWithCollidingName = false;
+                        }
+                    }
                 }
-                return links.isNestedRedeclaration;
+                return links.isDeclarationWithCollidingName;
             }
             return false;
         }
         // When resolved as an expression identifier, if the given node references a nested block scoped entity with
-        // a name that hides an existing name, return the declaration of that entity. Otherwise, return undefined.
-        function getReferencedNestedRedeclaration(node) {
+        // 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) {
             var symbol = getReferencedValueSymbol(node);
-            return symbol && isNestedRedeclarationSymbol(symbol) ? symbol.valueDeclaration : undefined;
+            return symbol && isSymbolOfDeclarationWithCollidingName(symbol) ? symbol.valueDeclaration : undefined;
         }
-        // Return true if the given node is a declaration of a nested block scoped entity with a name that hides an
-        // existing name.
-        function isNestedRedeclaration(node) {
-            return isNestedRedeclarationSymbol(getSymbolOfNode(node));
+        // 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) {
+            return isSymbolOfDeclarationWithCollidingName(getSymbolOfNode(node));
         }
         function isValueAliasDeclaration(node) {
             switch (node.kind) {
-                case 224 /* ImportEqualsDeclaration */:
-                case 226 /* ImportClause */:
-                case 227 /* NamespaceImport */:
-                case 229 /* ImportSpecifier */:
-                case 233 /* ExportSpecifier */:
+                case 228 /* ImportEqualsDeclaration */:
+                case 230 /* ImportClause */:
+                case 231 /* NamespaceImport */:
+                case 233 /* ImportSpecifier */:
+                case 237 /* ExportSpecifier */:
                     return isAliasResolvedToValue(getSymbolOfNode(node));
-                case 231 /* ExportDeclaration */:
+                case 235 /* ExportDeclaration */:
                     var exportClause = node.exportClause;
                     return exportClause && ts.forEach(exportClause.elements, isValueAliasDeclaration);
-                case 230 /* ExportAssignment */:
+                case 234 /* ExportAssignment */:
                     return node.expression && node.expression.kind === 69 /* Identifier */ ? isAliasResolvedToValue(getSymbolOfNode(node)) : true;
             }
             return false;
         }
         function isTopLevelValueImportEqualsWithEntityName(node) {
-            if (node.parent.kind !== 251 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
+            if (node.parent.kind !== 255 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
                 // parent is not source file or it is not reference to internal module
                 return false;
             }
@@ -28347,7 +30125,7 @@ var ts;
             if (target === unknownSymbol && compilerOptions.isolatedModules) {
                 return true;
             }
-            // const enums and modules that contain only const enums are not considered values from the emit perespective
+            // const enums and modules that contain only const enums are not considered values from the emit perspective
             // unless 'preserveConstEnums' option is set to true
             return target !== unknownSymbol &&
                 target &&
@@ -28397,7 +30175,7 @@ var ts;
             return getNodeLinks(node).enumMemberValue;
         }
         function getConstantValue(node) {
-            if (node.kind === 250 /* EnumMember */) {
+            if (node.kind === 254 /* EnumMember */) {
                 return getEnumMemberValue(node);
             }
             var symbol = getNodeLinks(node).resolvedSymbol;
@@ -28432,22 +30210,22 @@ var ts;
             else if (type.flags & 1 /* Any */) {
                 return ts.TypeReferenceSerializationKind.ObjectType;
             }
-            else if (allConstituentTypesHaveKind(type, 16 /* Void */)) {
+            else if (isTypeOfKind(type, 16 /* Void */)) {
                 return ts.TypeReferenceSerializationKind.VoidType;
             }
-            else if (allConstituentTypesHaveKind(type, 8 /* Boolean */)) {
+            else if (isTypeOfKind(type, 8 /* Boolean */)) {
                 return ts.TypeReferenceSerializationKind.BooleanType;
             }
-            else if (allConstituentTypesHaveKind(type, 132 /* NumberLike */)) {
+            else if (isTypeOfKind(type, 132 /* NumberLike */)) {
                 return ts.TypeReferenceSerializationKind.NumberLikeType;
             }
-            else if (allConstituentTypesHaveKind(type, 258 /* StringLike */)) {
+            else if (isTypeOfKind(type, 258 /* StringLike */)) {
                 return ts.TypeReferenceSerializationKind.StringLikeType;
             }
-            else if (allConstituentTypesHaveKind(type, 8192 /* Tuple */)) {
+            else if (isTypeOfKind(type, 8192 /* Tuple */)) {
                 return ts.TypeReferenceSerializationKind.ArrayLikeType;
             }
-            else if (allConstituentTypesHaveKind(type, 16777216 /* ESSymbol */)) {
+            else if (isTypeOfKind(type, 16777216 /* ESSymbol */)) {
                 return ts.TypeReferenceSerializationKind.ESSymbolType;
             }
             else if (isFunctionType(type)) {
@@ -28473,9 +30251,15 @@ var ts;
             getSymbolDisplayBuilder().buildTypeDisplay(getReturnTypeOfSignature(signature), writer, enclosingDeclaration, flags);
         }
         function writeTypeOfExpression(expr, enclosingDeclaration, flags, writer) {
-            var type = getTypeOfExpression(expr);
+            var type = getWidenedType(getTypeOfExpression(expr));
             getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags);
         }
+        function writeBaseConstructorTypeOfClass(node, enclosingDeclaration, flags, writer) {
+            var classType = getDeclaredTypeOfSymbol(getSymbolOfNode(node));
+            resolveBaseTypesOfClass(classType);
+            var baseType = classType.resolvedBaseTypes.length ? classType.resolvedBaseTypes[0] : unknownType;
+            getSymbolDisplayBuilder().buildTypeDisplay(baseType, writer, enclosingDeclaration, flags);
+        }
         function hasGlobalName(name) {
             return ts.hasProperty(globals, name);
         }
@@ -28493,8 +30277,8 @@ var ts;
             return {
                 getReferencedExportContainer: getReferencedExportContainer,
                 getReferencedImportDeclaration: getReferencedImportDeclaration,
-                getReferencedNestedRedeclaration: getReferencedNestedRedeclaration,
-                isNestedRedeclaration: isNestedRedeclaration,
+                getReferencedDeclarationWithCollidingName: getReferencedDeclarationWithCollidingName,
+                isDeclarationWithCollidingName: isDeclarationWithCollidingName,
                 isValueAliasDeclaration: isValueAliasDeclaration,
                 hasGlobalName: hasGlobalName,
                 isReferencedAliasDeclaration: isReferencedAliasDeclaration,
@@ -28505,6 +30289,7 @@ var ts;
                 writeTypeOfDeclaration: writeTypeOfDeclaration,
                 writeReturnTypeOfSignatureDeclaration: writeReturnTypeOfSignatureDeclaration,
                 writeTypeOfExpression: writeTypeOfExpression,
+                writeBaseConstructorTypeOfClass: writeBaseConstructorTypeOfClass,
                 isSymbolAccessible: isSymbolAccessible,
                 isEntityNameVisible: isEntityNameVisible,
                 getConstantValue: getConstantValue,
@@ -28523,7 +30308,7 @@ var ts;
             if (!moduleSymbol) {
                 return undefined;
             }
-            return ts.getDeclarationOfKind(moduleSymbol, 251 /* SourceFile */);
+            return ts.getDeclarationOfKind(moduleSymbol, 255 /* SourceFile */);
         }
         function initializeTypeChecker() {
             // Bind all source files and propagate errors
@@ -28536,9 +30321,12 @@ var ts;
                 if (!ts.isExternalOrCommonJsModule(file)) {
                     mergeSymbolTable(globals, file.locals);
                 }
-                if (file.moduleAugmentations) {
+                if (file.moduleAugmentations.length) {
                     (augmentations || (augmentations = [])).push(file.moduleAugmentations);
                 }
+                if (file.wasReferenced && file.symbol && file.symbol.globalExports) {
+                    mergeSymbolTable(globals, file.symbol.globalExports);
+                }
             });
             if (augmentations) {
                 // merge module augmentations.
@@ -28570,6 +30358,7 @@ var ts;
             getGlobalMethodDecoratorType = ts.memoize(function () { return getGlobalType("MethodDecorator"); });
             getGlobalParameterDecoratorType = ts.memoize(function () { return getGlobalType("ParameterDecorator"); });
             getGlobalTypedPropertyDescriptorType = ts.memoize(function () { return getGlobalType("TypedPropertyDescriptor", /*arity*/ 1); });
+            getGlobalESSymbolConstructorSymbol = ts.memoize(function () { return getGlobalValueSymbol("Symbol"); });
             getGlobalPromiseType = ts.memoize(function () { return getGlobalType("Promise", /*arity*/ 1); });
             tryGetGlobalPromiseType = ts.memoize(function () { return getGlobalSymbol("Promise", 793056 /* Type */, /*diagnostic*/ undefined) && getGlobalPromiseType(); });
             getGlobalPromiseLikeType = ts.memoize(function () { return getGlobalType("PromiseLike", /*arity*/ 1); });
@@ -28577,28 +30366,23 @@ var ts;
             getGlobalPromiseConstructorSymbol = ts.memoize(function () { return getGlobalValueSymbol("Promise"); });
             getGlobalPromiseConstructorLikeType = ts.memoize(function () { return getGlobalType("PromiseConstructorLike"); });
             getGlobalThenableType = ts.memoize(createThenableType);
-            // If we're in ES6 mode, load the TemplateStringsArray.
-            // Otherwise, default to 'unknown' for the purposes of type checking in LS scenarios.
+            getGlobalTemplateStringsArrayType = ts.memoize(function () { return getGlobalType("TemplateStringsArray"); });
             if (languageVersion >= 2 /* ES6 */) {
-                globalTemplateStringsArrayType = getGlobalType("TemplateStringsArray");
-                globalESSymbolType = getGlobalType("Symbol");
-                globalESSymbolConstructorSymbol = getGlobalValueSymbol("Symbol");
-                globalIterableType = getGlobalType("Iterable", /*arity*/ 1);
-                globalIteratorType = getGlobalType("Iterator", /*arity*/ 1);
-                globalIterableIteratorType = getGlobalType("IterableIterator", /*arity*/ 1);
+                getGlobalESSymbolType = ts.memoize(function () { return getGlobalType("Symbol"); });
+                getGlobalIterableType = ts.memoize(function () { return getGlobalType("Iterable", /*arity*/ 1); });
+                getGlobalIteratorType = ts.memoize(function () { return getGlobalType("Iterator", /*arity*/ 1); });
+                getGlobalIterableIteratorType = ts.memoize(function () { return getGlobalType("IterableIterator", /*arity*/ 1); });
             }
             else {
-                globalTemplateStringsArrayType = unknownType;
-                // Consider putting Symbol interface in lib.d.ts. On the plus side, putting it in lib.d.ts would make it
-                // extensible for Polyfilling Symbols. But putting it into lib.d.ts could also break users that have
-                // a global Symbol already, particularly if it is a class.
-                globalESSymbolType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
-                globalESSymbolConstructorSymbol = undefined;
-                globalIterableType = emptyGenericType;
-                globalIteratorType = emptyGenericType;
-                globalIterableIteratorType = emptyGenericType;
+                getGlobalESSymbolType = ts.memoize(function () { return emptyObjectType; });
+                getGlobalIterableType = ts.memoize(function () { return emptyGenericType; });
+                getGlobalIteratorType = ts.memoize(function () { return emptyGenericType; });
+                getGlobalIterableIteratorType = ts.memoize(function () { return emptyGenericType; });
             }
             anyArrayType = createArrayType(anyType);
+            var symbol = getGlobalSymbol("ReadonlyArray", 793056 /* Type */, /*diagnostic*/ undefined);
+            globalReadonlyArrayType = symbol && getTypeOfGlobalSymbol(symbol, /*arity*/ 1);
+            anyReadonlyArrayType = globalReadonlyArrayType ? createTypeFromGenericGlobalType(globalReadonlyArrayType, [anyType]) : anyArrayType;
         }
         function createInstantiatedPromiseLikeType() {
             var promiseLikeType = getGlobalPromiseLikeType();
@@ -28624,14 +30408,14 @@ var ts;
                 return false;
             }
             if (!ts.nodeCanBeDecorated(node)) {
-                if (node.kind === 144 /* MethodDeclaration */ && !ts.nodeIsPresent(node.body)) {
+                if (node.kind === 146 /* MethodDeclaration */ && !ts.nodeIsPresent(node.body)) {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.A_decorator_can_only_decorate_a_method_implementation_not_an_overload);
                 }
                 else {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_are_not_valid_here);
                 }
             }
-            else if (node.kind === 146 /* GetAccessor */ || node.kind === 147 /* SetAccessor */) {
+            else if (node.kind === 148 /* GetAccessor */ || node.kind === 149 /* SetAccessor */) {
                 var accessors = ts.getAllAccessorDeclarations(node.parent.members, node);
                 if (accessors.firstAccessor.decorators && node === accessors.secondAccessor) {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name);
@@ -28641,38 +30425,38 @@ var ts;
         }
         function checkGrammarModifiers(node) {
             switch (node.kind) {
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
-                case 145 /* Constructor */:
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
-                case 150 /* IndexSignature */:
-                case 221 /* ModuleDeclaration */:
-                case 225 /* ImportDeclaration */:
-                case 224 /* ImportEqualsDeclaration */:
-                case 231 /* ExportDeclaration */:
-                case 230 /* ExportAssignment */:
-                case 139 /* Parameter */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
+                case 147 /* Constructor */:
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
+                case 152 /* IndexSignature */:
+                case 224 /* ModuleDeclaration */:
+                case 229 /* ImportDeclaration */:
+                case 228 /* ImportEqualsDeclaration */:
+                case 235 /* ExportDeclaration */:
+                case 234 /* ExportAssignment */:
+                case 141 /* Parameter */:
                     break;
-                case 216 /* FunctionDeclaration */:
+                case 219 /* FunctionDeclaration */:
                     if (node.modifiers && (node.modifiers.length > 1 || node.modifiers[0].kind !== 118 /* AsyncKeyword */) &&
-                        node.parent.kind !== 222 /* ModuleBlock */ && node.parent.kind !== 251 /* SourceFile */) {
+                        node.parent.kind !== 225 /* ModuleBlock */ && node.parent.kind !== 255 /* SourceFile */) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
                     }
                     break;
-                case 217 /* ClassDeclaration */:
-                case 218 /* InterfaceDeclaration */:
-                case 196 /* VariableStatement */:
-                case 219 /* TypeAliasDeclaration */:
-                    if (node.modifiers && node.parent.kind !== 222 /* ModuleBlock */ && node.parent.kind !== 251 /* SourceFile */) {
+                case 220 /* ClassDeclaration */:
+                case 221 /* InterfaceDeclaration */:
+                case 199 /* VariableStatement */:
+                case 222 /* TypeAliasDeclaration */:
+                    if (node.modifiers && node.parent.kind !== 225 /* ModuleBlock */ && node.parent.kind !== 255 /* SourceFile */) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
                     }
                     break;
-                case 220 /* EnumDeclaration */:
+                case 223 /* EnumDeclaration */:
                     if (node.modifiers && (node.modifiers.length > 1 || node.modifiers[0].kind !== 74 /* ConstKeyword */) &&
-                        node.parent.kind !== 222 /* ModuleBlock */ && node.parent.kind !== 251 /* SourceFile */) {
+                        node.parent.kind !== 225 /* ModuleBlock */ && node.parent.kind !== 255 /* SourceFile */) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
                     }
                     break;
@@ -28682,42 +30466,48 @@ var ts;
             if (!node.modifiers) {
                 return;
             }
-            var lastStatic, lastPrivate, lastProtected, lastDeclare, lastAsync;
+            var lastStatic, lastPrivate, lastProtected, lastDeclare, lastAsync, lastReadonly;
             var flags = 0;
             for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
                 var modifier = _a[_i];
+                if (modifier.kind !== 127 /* ReadonlyKeyword */) {
+                    if (node.kind === 143 /* PropertySignature */ || node.kind === 145 /* MethodSignature */) {
+                        return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_type_member, ts.tokenToString(modifier.kind));
+                    }
+                    if (node.kind === 152 /* IndexSignature */) {
+                        return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_an_index_signature, ts.tokenToString(modifier.kind));
+                    }
+                }
                 switch (modifier.kind) {
                     case 74 /* ConstKeyword */:
-                        if (node.kind !== 220 /* EnumDeclaration */ && node.parent.kind === 217 /* ClassDeclaration */) {
+                        if (node.kind !== 223 /* EnumDeclaration */ && node.parent.kind === 220 /* ClassDeclaration */) {
                             return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(74 /* ConstKeyword */));
                         }
                         break;
                     case 112 /* PublicKeyword */:
                     case 111 /* ProtectedKeyword */:
                     case 110 /* PrivateKeyword */:
-                        var text = void 0;
-                        if (modifier.kind === 112 /* PublicKeyword */) {
-                            text = "public";
-                        }
-                        else if (modifier.kind === 111 /* ProtectedKeyword */) {
-                            text = "protected";
+                        var text = visibilityToString(ts.modifierToFlag(modifier.kind));
+                        if (modifier.kind === 111 /* ProtectedKeyword */) {
                             lastProtected = modifier;
                         }
-                        else {
-                            text = "private";
+                        else if (modifier.kind === 110 /* PrivateKeyword */) {
                             lastPrivate = modifier;
                         }
-                        if (flags & 56 /* AccessibilityModifier */) {
+                        if (flags & 28 /* AccessibilityModifier */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.Accessibility_modifier_already_seen);
                         }
-                        else if (flags & 64 /* Static */) {
+                        else if (flags & 32 /* Static */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "static");
                         }
+                        else if (flags & 64 /* Readonly */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "readonly");
+                        }
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "async");
                         }
-                        else if (node.parent.kind === 222 /* ModuleBlock */ || node.parent.kind === 251 /* SourceFile */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_element, text);
+                        else if (node.parent.kind === 225 /* ModuleBlock */ || node.parent.kind === 255 /* SourceFile */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, text);
                         }
                         else if (flags & 128 /* Abstract */) {
                             if (modifier.kind === 110 /* PrivateKeyword */) {
@@ -28730,29 +30520,42 @@ var ts;
                         flags |= ts.modifierToFlag(modifier.kind);
                         break;
                     case 113 /* StaticKeyword */:
-                        if (flags & 64 /* Static */) {
+                        if (flags & 32 /* Static */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static");
                         }
+                        else if (flags & 64 /* Readonly */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "readonly");
+                        }
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "async");
                         }
-                        else if (node.parent.kind === 222 /* ModuleBlock */ || node.parent.kind === 251 /* SourceFile */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_element, "static");
+                        else if (node.parent.kind === 225 /* ModuleBlock */ || node.parent.kind === 255 /* SourceFile */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, "static");
                         }
-                        else if (node.kind === 139 /* Parameter */) {
+                        else if (node.kind === 141 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
                         }
                         else if (flags & 128 /* Abstract */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "static", "abstract");
                         }
-                        flags |= 64 /* Static */;
+                        flags |= 32 /* Static */;
                         lastStatic = modifier;
                         break;
+                    case 127 /* ReadonlyKeyword */:
+                        if (flags & 64 /* Readonly */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "readonly");
+                        }
+                        else if (node.kind !== 144 /* PropertyDeclaration */ && node.kind !== 143 /* PropertySignature */ && node.kind !== 152 /* IndexSignature */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics.readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature);
+                        }
+                        flags |= 64 /* Readonly */;
+                        lastReadonly = modifier;
+                        break;
                     case 82 /* ExportKeyword */:
-                        if (flags & 2 /* Export */) {
+                        if (flags & 1 /* Export */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "export");
                         }
-                        else if (flags & 4 /* Ambient */) {
+                        else if (flags & 2 /* Ambient */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "declare");
                         }
                         else if (flags & 128 /* Abstract */) {
@@ -28761,48 +30564,51 @@ var ts;
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "async");
                         }
-                        else if (node.parent.kind === 217 /* ClassDeclaration */) {
+                        else if (node.parent.kind === 220 /* ClassDeclaration */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "export");
                         }
-                        else if (node.kind === 139 /* Parameter */) {
+                        else if (node.kind === 141 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");
                         }
-                        flags |= 2 /* Export */;
+                        flags |= 1 /* Export */;
                         break;
                     case 122 /* DeclareKeyword */:
-                        if (flags & 4 /* Ambient */) {
+                        if (flags & 2 /* Ambient */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "declare");
                         }
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.parent.kind === 217 /* ClassDeclaration */) {
+                        else if (node.parent.kind === 220 /* ClassDeclaration */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "declare");
                         }
-                        else if (node.kind === 139 /* Parameter */) {
+                        else if (node.kind === 141 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "declare");
                         }
-                        else if (ts.isInAmbientContext(node.parent) && node.parent.kind === 222 /* ModuleBlock */) {
+                        else if (ts.isInAmbientContext(node.parent) && node.parent.kind === 225 /* ModuleBlock */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
                         }
-                        flags |= 4 /* Ambient */;
+                        flags |= 2 /* Ambient */;
                         lastDeclare = modifier;
                         break;
                     case 115 /* AbstractKeyword */:
                         if (flags & 128 /* Abstract */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "abstract");
                         }
-                        if (node.kind !== 217 /* ClassDeclaration */) {
-                            if (node.kind !== 144 /* MethodDeclaration */) {
-                                return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_or_method_declaration);
+                        if (node.kind !== 220 /* ClassDeclaration */) {
+                            if (node.kind !== 146 /* MethodDeclaration */ &&
+                                node.kind !== 144 /* PropertyDeclaration */ &&
+                                node.kind !== 148 /* GetAccessor */ &&
+                                node.kind !== 149 /* SetAccessor */) {
+                                return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration);
                             }
-                            if (!(node.parent.kind === 217 /* ClassDeclaration */ && node.parent.flags & 128 /* Abstract */)) {
+                            if (!(node.parent.kind === 220 /* ClassDeclaration */ && node.parent.flags & 128 /* Abstract */)) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.Abstract_methods_can_only_appear_within_an_abstract_class);
                             }
-                            if (flags & 64 /* Static */) {
+                            if (flags & 32 /* Static */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "static", "abstract");
                             }
-                            if (flags & 16 /* Private */) {
+                            if (flags & 8 /* Private */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "private", "abstract");
                             }
                         }
@@ -28812,10 +30618,10 @@ var ts;
                         if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "async");
                         }
-                        else if (flags & 4 /* Ambient */ || ts.isInAmbientContext(node.parent)) {
+                        else if (flags & 2 /* Ambient */ || ts.isInAmbientContext(node.parent)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.kind === 139 /* Parameter */) {
+                        else if (node.kind === 141 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async");
                         }
                         flags |= 256 /* Async */;
@@ -28823,28 +30629,25 @@ var ts;
                         break;
                 }
             }
-            if (node.kind === 145 /* Constructor */) {
-                if (flags & 64 /* Static */) {
+            if (node.kind === 147 /* Constructor */) {
+                if (flags & 32 /* Static */) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
                 }
                 if (flags & 128 /* Abstract */) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "abstract");
                 }
-                else if (flags & 32 /* Protected */) {
-                    return grammarErrorOnNode(lastProtected, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "protected");
-                }
-                else if (flags & 16 /* Private */) {
-                    return grammarErrorOnNode(lastPrivate, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "private");
-                }
                 else if (flags & 256 /* Async */) {
                     return grammarErrorOnNode(lastAsync, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "async");
                 }
+                else if (flags & 64 /* Readonly */) {
+                    return grammarErrorOnNode(lastReadonly, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "readonly");
+                }
                 return;
             }
-            else if ((node.kind === 225 /* ImportDeclaration */ || node.kind === 224 /* ImportEqualsDeclaration */) && flags & 4 /* Ambient */) {
+            else if ((node.kind === 229 /* ImportDeclaration */ || node.kind === 228 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
-            else if (node.kind === 139 /* Parameter */ && (flags & 56 /* AccessibilityModifier */) && ts.isBindingPattern(node.name)) {
+            else if (node.kind === 141 /* Parameter */ && (flags & 28 /* AccessibilityModifier */) && ts.isBindingPattern(node.name)) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_may_not_be_a_binding_pattern);
             }
             if (flags & 256 /* Async */) {
@@ -28856,10 +30659,10 @@ var ts;
                 return grammarErrorOnNode(asyncModifier, ts.Diagnostics.Async_functions_are_only_available_when_targeting_ECMAScript_6_and_higher);
             }
             switch (node.kind) {
-                case 144 /* MethodDeclaration */:
-                case 216 /* FunctionDeclaration */:
-                case 176 /* FunctionExpression */:
-                case 177 /* ArrowFunction */:
+                case 146 /* MethodDeclaration */:
+                case 219 /* FunctionDeclaration */:
+                case 178 /* FunctionExpression */:
+                case 179 /* ArrowFunction */:
                     if (!node.asteriskToken) {
                         return false;
                     }
@@ -28925,7 +30728,7 @@ var ts;
                 checkGrammarParameterList(node.parameters) || checkGrammarArrowFunction(node, file);
         }
         function checkGrammarArrowFunction(node, file) {
-            if (node.kind === 177 /* ArrowFunction */) {
+            if (node.kind === 179 /* ArrowFunction */) {
                 var arrowFunction = node;
                 var startLine = ts.getLineAndCharacterOfPosition(file, arrowFunction.equalsGreaterThanToken.pos).line;
                 var endLine = ts.getLineAndCharacterOfPosition(file, arrowFunction.equalsGreaterThanToken.end).line;
@@ -28948,7 +30751,7 @@ var ts;
             if (parameter.dotDotDotToken) {
                 return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.An_index_signature_cannot_have_a_rest_parameter);
             }
-            if (parameter.flags & 1022 /* Modifier */) {
+            if (parameter.flags & 959 /* Modifier */) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_cannot_have_an_accessibility_modifier);
             }
             if (parameter.questionToken) {
@@ -28960,21 +30763,16 @@ var ts;
             if (!parameter.type) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_must_have_a_type_annotation);
             }
-            if (parameter.type.kind !== 130 /* StringKeyword */ && parameter.type.kind !== 128 /* NumberKeyword */) {
+            if (parameter.type.kind !== 131 /* StringKeyword */ && parameter.type.kind !== 129 /* NumberKeyword */) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_must_be_string_or_number);
             }
             if (!node.type) {
                 return grammarErrorOnNode(node, ts.Diagnostics.An_index_signature_must_have_a_type_annotation);
             }
         }
-        function checkGrammarForIndexSignatureModifier(node) {
-            if (node.flags & 1022 /* Modifier */) {
-                grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_not_permitted_on_index_signature_members);
-            }
-        }
         function checkGrammarIndexSignature(node) {
             // Prevent cascading error by short-circuit
-            return checkGrammarDecorators(node) || checkGrammarModifiers(node) || checkGrammarIndexSignatureParameters(node) || checkGrammarForIndexSignatureModifier(node);
+            return checkGrammarDecorators(node) || checkGrammarModifiers(node) || checkGrammarIndexSignatureParameters(node);
         }
         function checkGrammarForAtLeastOneTypeArgument(node, typeArguments) {
             if (typeArguments && typeArguments.length === 0) {
@@ -28993,7 +30791,7 @@ var ts;
                 var sourceFile = ts.getSourceFileOfNode(node);
                 for (var _i = 0, args_1 = args; _i < args_1.length; _i++) {
                     var arg = args_1[_i];
-                    if (arg.kind === 190 /* OmittedExpression */) {
+                    if (arg.kind === 192 /* OmittedExpression */) {
                         return grammarErrorAtPos(sourceFile, arg.pos, 0, ts.Diagnostics.Argument_expression_expected);
                     }
                 }
@@ -29067,19 +30865,19 @@ var ts;
         }
         function checkGrammarComputedPropertyName(node) {
             // If node is not a computedPropertyName, just skip the grammar checking
-            if (node.kind !== 137 /* ComputedPropertyName */) {
+            if (node.kind !== 139 /* ComputedPropertyName */) {
                 return false;
             }
             var computedPropertyName = node;
-            if (computedPropertyName.expression.kind === 184 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 24 /* CommaToken */) {
+            if (computedPropertyName.expression.kind === 186 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 24 /* CommaToken */) {
                 return grammarErrorOnNode(computedPropertyName.expression, ts.Diagnostics.A_comma_expression_is_not_allowed_in_a_computed_property_name);
             }
         }
         function checkGrammarForGenerator(node) {
             if (node.asteriskToken) {
-                ts.Debug.assert(node.kind === 216 /* FunctionDeclaration */ ||
-                    node.kind === 176 /* FunctionExpression */ ||
-                    node.kind === 144 /* MethodDeclaration */);
+                ts.Debug.assert(node.kind === 219 /* FunctionDeclaration */ ||
+                    node.kind === 178 /* FunctionExpression */ ||
+                    node.kind === 146 /* MethodDeclaration */);
                 if (ts.isInAmbientContext(node)) {
                     return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
                 }
@@ -29100,28 +30898,28 @@ var ts;
             var seen = {};
             var Property = 1;
             var GetAccessor = 2;
-            var SetAccesor = 4;
-            var GetOrSetAccessor = GetAccessor | SetAccesor;
+            var SetAccessor = 4;
+            var GetOrSetAccessor = GetAccessor | SetAccessor;
             var _loop_1 = function(prop) {
-                var name_19 = prop.name;
-                if (prop.kind === 190 /* OmittedExpression */ ||
-                    name_19.kind === 137 /* ComputedPropertyName */) {
+                var name_20 = prop.name;
+                if (prop.kind === 192 /* OmittedExpression */ ||
+                    name_20.kind === 139 /* ComputedPropertyName */) {
                     // If the name is not a ComputedPropertyName, the grammar checking will skip it
-                    checkGrammarComputedPropertyName(name_19);
+                    checkGrammarComputedPropertyName(name_20);
                     return "continue";
                 }
-                if (prop.kind === 249 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) {
+                if (prop.kind === 253 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) {
                     // having objectAssignmentInitializer is only valid in ObjectAssignmentPattern
                     // outside of destructuring it is a syntax error
                     return { value: grammarErrorOnNode(prop.equalsToken, ts.Diagnostics.can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment) };
                 }
                 // Modifiers are never allowed on properties except for 'async' on a method declaration
                 ts.forEach(prop.modifiers, function (mod) {
-                    if (mod.kind !== 118 /* AsyncKeyword */ || prop.kind !== 144 /* MethodDeclaration */) {
+                    if (mod.kind !== 118 /* AsyncKeyword */ || prop.kind !== 146 /* MethodDeclaration */) {
                         grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod));
                     }
                 });
-                // ECMA-262 11.1.5 Object Initialiser
+                // 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
                 // a.This production is contained in strict code and IsDataDescriptor(previous) is true and
                 // IsDataDescriptor(propId.descriptor) is true.
@@ -29130,71 +30928,70 @@ var ts;
                 //    d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true
                 // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
                 var currentKind = void 0;
-                if (prop.kind === 248 /* PropertyAssignment */ || prop.kind === 249 /* ShorthandPropertyAssignment */) {
-                    // Grammar checking for computedPropertName and shorthandPropertyAssignment
+                if (prop.kind === 252 /* PropertyAssignment */ || prop.kind === 253 /* ShorthandPropertyAssignment */) {
+                    // Grammar checking for computedPropertyName and shorthandPropertyAssignment
                     checkGrammarForInvalidQuestionMark(prop, prop.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional);
-                    if (name_19.kind === 8 /* NumericLiteral */) {
-                        checkGrammarNumericLiteral(name_19);
+                    if (name_20.kind === 8 /* NumericLiteral */) {
+                        checkGrammarNumericLiteral(name_20);
                     }
                     currentKind = Property;
                 }
-                else if (prop.kind === 144 /* MethodDeclaration */) {
+                else if (prop.kind === 146 /* MethodDeclaration */) {
                     currentKind = Property;
                 }
-                else if (prop.kind === 146 /* GetAccessor */) {
+                else if (prop.kind === 148 /* GetAccessor */) {
                     currentKind = GetAccessor;
                 }
-                else if (prop.kind === 147 /* SetAccessor */) {
-                    currentKind = SetAccesor;
+                else if (prop.kind === 149 /* SetAccessor */) {
+                    currentKind = SetAccessor;
                 }
                 else {
                     ts.Debug.fail("Unexpected syntax kind:" + prop.kind);
                 }
-                if (!ts.hasProperty(seen, name_19.text)) {
-                    seen[name_19.text] = currentKind;
+                if (!ts.hasProperty(seen, name_20.text)) {
+                    seen[name_20.text] = currentKind;
                 }
                 else {
-                    var existingKind = seen[name_19.text];
+                    var existingKind = seen[name_20.text];
                     if (currentKind === Property && existingKind === Property) {
                         return "continue";
                     }
                     else if ((currentKind & GetOrSetAccessor) && (existingKind & GetOrSetAccessor)) {
                         if (existingKind !== GetOrSetAccessor && currentKind !== existingKind) {
-                            seen[name_19.text] = currentKind | existingKind;
+                            seen[name_20.text] = currentKind | existingKind;
                         }
                         else {
-                            return { value: grammarErrorOnNode(name_19, ts.Diagnostics.An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name) };
+                            return { value: grammarErrorOnNode(name_20, ts.Diagnostics.An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name) };
                         }
                     }
                     else {
-                        return { value: grammarErrorOnNode(name_19, ts.Diagnostics.An_object_literal_cannot_have_property_and_accessor_with_the_same_name) };
+                        return { value: grammarErrorOnNode(name_20, ts.Diagnostics.An_object_literal_cannot_have_property_and_accessor_with_the_same_name) };
                     }
                 }
             };
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var prop = _a[_i];
-                var state_1 = _loop_1(prop);
-                if (typeof state_1 === "object") return state_1.value
-                if (state_1 === "continue") continue;
+                var state_2 = _loop_1(prop);
+                if (typeof state_2 === "object") return state_2.value;
             }
         }
         function checkGrammarJsxElement(node) {
             var seen = {};
             for (var _i = 0, _a = node.attributes; _i < _a.length; _i++) {
                 var attr = _a[_i];
-                if (attr.kind === 242 /* JsxSpreadAttribute */) {
+                if (attr.kind === 246 /* JsxSpreadAttribute */) {
                     continue;
                 }
                 var jsxAttr = attr;
-                var name_20 = jsxAttr.name;
-                if (!ts.hasProperty(seen, name_20.text)) {
-                    seen[name_20.text] = true;
+                var name_21 = jsxAttr.name;
+                if (!ts.hasProperty(seen, name_21.text)) {
+                    seen[name_21.text] = true;
                 }
                 else {
-                    return grammarErrorOnNode(name_20, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
+                    return grammarErrorOnNode(name_21, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
                 }
                 var initializer = jsxAttr.initializer;
-                if (initializer && initializer.kind === 243 /* JsxExpression */ && !initializer.expression) {
+                if (initializer && initializer.kind === 247 /* JsxExpression */ && !initializer.expression) {
                     return grammarErrorOnNode(jsxAttr.initializer, ts.Diagnostics.JSX_attributes_must_only_be_assigned_a_non_empty_expression);
                 }
             }
@@ -29203,7 +31000,7 @@ var ts;
             if (checkGrammarStatementInAmbientContext(forInOrOfStatement)) {
                 return true;
             }
-            if (forInOrOfStatement.initializer.kind === 215 /* VariableDeclarationList */) {
+            if (forInOrOfStatement.initializer.kind === 218 /* VariableDeclarationList */) {
                 var variableList = forInOrOfStatement.initializer;
                 if (!checkGrammarVariableDeclarationList(variableList)) {
                     var declarations = variableList.declarations;
@@ -29218,20 +31015,20 @@ var ts;
                         return false;
                     }
                     if (declarations.length > 1) {
-                        var diagnostic = forInOrOfStatement.kind === 203 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 206 /* ForInStatement */
                             ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement
                             : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement;
                         return grammarErrorOnFirstToken(variableList.declarations[1], diagnostic);
                     }
                     var firstDeclaration = declarations[0];
                     if (firstDeclaration.initializer) {
-                        var diagnostic = forInOrOfStatement.kind === 203 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 206 /* ForInStatement */
                             ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer
                             : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer;
                         return grammarErrorOnNode(firstDeclaration.name, diagnostic);
                     }
                     if (firstDeclaration.type) {
-                        var diagnostic = forInOrOfStatement.kind === 203 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 206 /* ForInStatement */
                             ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation
                             : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation;
                         return grammarErrorOnNode(firstDeclaration, diagnostic);
@@ -29248,16 +31045,16 @@ var ts;
             else if (ts.isInAmbientContext(accessor)) {
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_be_declared_in_an_ambient_context);
             }
-            else if (accessor.body === undefined) {
+            else if (accessor.body === undefined && !(accessor.flags & 128 /* Abstract */)) {
                 return grammarErrorAtPos(ts.getSourceFileOfNode(accessor), accessor.end - 1, ";".length, ts.Diagnostics._0_expected, "{");
             }
             else if (accessor.typeParameters) {
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_have_type_parameters);
             }
-            else if (kind === 146 /* GetAccessor */ && accessor.parameters.length) {
+            else if (kind === 148 /* GetAccessor */ && accessor.parameters.length) {
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_get_accessor_cannot_have_parameters);
             }
-            else if (kind === 147 /* SetAccessor */) {
+            else if (kind === 149 /* SetAccessor */) {
                 if (accessor.type) {
                     return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_set_accessor_cannot_have_a_return_type_annotation);
                 }
@@ -29269,7 +31066,7 @@ var ts;
                     if (parameter.dotDotDotToken) {
                         return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.A_set_accessor_cannot_have_rest_parameter);
                     }
-                    else if (parameter.flags & 1022 /* Modifier */) {
+                    else if (parameter.flags & 959 /* Modifier */) {
                         return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                     }
                     else if (parameter.questionToken) {
@@ -29292,7 +31089,7 @@ var ts;
                 checkGrammarForGenerator(node)) {
                 return true;
             }
-            if (node.parent.kind === 168 /* ObjectLiteralExpression */) {
+            if (node.parent.kind === 170 /* ObjectLiteralExpression */) {
                 if (checkGrammarForInvalidQuestionMark(node, node.questionToken, ts.Diagnostics.A_class_member_cannot_be_declared_optional)) {
                     return true;
                 }
@@ -29316,10 +31113,10 @@ var ts;
                     return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol);
                 }
             }
-            else if (node.parent.kind === 218 /* InterfaceDeclaration */) {
+            else if (node.parent.kind === 221 /* InterfaceDeclaration */) {
                 return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol);
             }
-            else if (node.parent.kind === 156 /* TypeLiteral */) {
+            else if (node.parent.kind === 158 /* TypeLiteral */) {
                 return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol);
             }
         }
@@ -29330,11 +31127,11 @@ var ts;
                     return grammarErrorOnNode(node, ts.Diagnostics.Jump_target_cannot_cross_function_boundary);
                 }
                 switch (current.kind) {
-                    case 210 /* LabeledStatement */:
+                    case 213 /* LabeledStatement */:
                         if (node.label && current.label.text === node.label.text) {
                             // found matching label - verify that label usage is correct
                             // continue can only target labels that are on iteration statements
-                            var isMisplacedContinueLabel = node.kind === 205 /* ContinueStatement */
+                            var isMisplacedContinueLabel = node.kind === 208 /* ContinueStatement */
                                 && !ts.isIterationStatement(current.statement, /*lookInLabeledStatement*/ true);
                             if (isMisplacedContinueLabel) {
                                 return grammarErrorOnNode(node, ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement);
@@ -29342,8 +31139,8 @@ var ts;
                             return false;
                         }
                         break;
-                    case 209 /* SwitchStatement */:
-                        if (node.kind === 206 /* BreakStatement */ && !node.label) {
+                    case 212 /* SwitchStatement */:
+                        if (node.kind === 209 /* BreakStatement */ && !node.label) {
                             // unlabeled break within switch statement - ok
                             return false;
                         }
@@ -29358,13 +31155,13 @@ var ts;
                 current = current.parent;
             }
             if (node.label) {
-                var message = node.kind === 206 /* BreakStatement */
+                var message = node.kind === 209 /* BreakStatement */
                     ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement
                     : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
             }
             else {
-                var message = node.kind === 206 /* BreakStatement */
+                var message = node.kind === 209 /* BreakStatement */
                     ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement
                     : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
@@ -29376,7 +31173,7 @@ var ts;
                 if (node !== ts.lastOrUndefined(elements)) {
                     return grammarErrorOnNode(node, ts.Diagnostics.A_rest_element_must_be_last_in_an_array_destructuring_pattern);
                 }
-                if (node.name.kind === 165 /* ArrayBindingPattern */ || node.name.kind === 164 /* ObjectBindingPattern */) {
+                if (node.name.kind === 167 /* ArrayBindingPattern */ || node.name.kind === 166 /* ObjectBindingPattern */) {
                     return grammarErrorOnNode(node.name, ts.Diagnostics.A_rest_element_cannot_contain_a_binding_pattern);
                 }
                 if (node.initializer) {
@@ -29386,7 +31183,7 @@ var ts;
             }
         }
         function checkGrammarVariableDeclaration(node) {
-            if (node.parent.parent.kind !== 203 /* ForInStatement */ && node.parent.parent.kind !== 204 /* ForOfStatement */) {
+            if (node.parent.parent.kind !== 206 /* ForInStatement */ && node.parent.parent.kind !== 207 /* ForOfStatement */) {
                 if (ts.isInAmbientContext(node)) {
                     if (node.initializer) {
                         // Error on equals token which immediate precedes the initializer
@@ -29422,7 +31219,7 @@ var ts;
                 var elements = name.elements;
                 for (var _i = 0, elements_2 = elements; _i < elements_2.length; _i++) {
                     var element = elements_2[_i];
-                    if (element.kind !== 190 /* OmittedExpression */) {
+                    if (element.kind !== 192 /* OmittedExpression */) {
                         checkGrammarNameInLetOrConstDeclarations(element.name);
                     }
                 }
@@ -29439,15 +31236,15 @@ var ts;
         }
         function allowLetAndConstDeclarations(parent) {
             switch (parent.kind) {
-                case 199 /* IfStatement */:
-                case 200 /* DoStatement */:
-                case 201 /* WhileStatement */:
-                case 208 /* WithStatement */:
-                case 202 /* ForStatement */:
-                case 203 /* ForInStatement */:
-                case 204 /* ForOfStatement */:
+                case 202 /* IfStatement */:
+                case 203 /* DoStatement */:
+                case 204 /* WhileStatement */:
+                case 211 /* WithStatement */:
+                case 205 /* ForStatement */:
+                case 206 /* ForInStatement */:
+                case 207 /* ForOfStatement */:
                     return false;
-                case 210 /* LabeledStatement */:
+                case 213 /* LabeledStatement */:
                     return allowLetAndConstDeclarations(parent.parent);
             }
             return true;
@@ -29503,7 +31300,7 @@ var ts;
                     return true;
                 }
             }
-            else if (node.parent.kind === 218 /* InterfaceDeclaration */) {
+            else if (node.parent.kind === 221 /* InterfaceDeclaration */) {
                 if (checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol)) {
                     return true;
                 }
@@ -29511,7 +31308,7 @@ var ts;
                     return grammarErrorOnNode(node.initializer, ts.Diagnostics.An_interface_property_cannot_have_an_initializer);
                 }
             }
-            else if (node.parent.kind === 156 /* TypeLiteral */) {
+            else if (node.parent.kind === 158 /* TypeLiteral */) {
                 if (checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol)) {
                     return true;
                 }
@@ -29536,14 +31333,14 @@ var ts;
             //     export_opt   AmbientDeclaration
             //
             // TODO: The spec needs to be amended to reflect this grammar.
-            if (node.kind === 218 /* InterfaceDeclaration */ ||
-                node.kind === 219 /* TypeAliasDeclaration */ ||
-                node.kind === 225 /* ImportDeclaration */ ||
-                node.kind === 224 /* ImportEqualsDeclaration */ ||
-                node.kind === 231 /* ExportDeclaration */ ||
-                node.kind === 230 /* ExportAssignment */ ||
-                (node.flags & 4 /* Ambient */) ||
-                (node.flags & (2 /* Export */ | 512 /* Default */))) {
+            if (node.kind === 221 /* InterfaceDeclaration */ ||
+                node.kind === 222 /* TypeAliasDeclaration */ ||
+                node.kind === 229 /* ImportDeclaration */ ||
+                node.kind === 228 /* ImportEqualsDeclaration */ ||
+                node.kind === 235 /* ExportDeclaration */ ||
+                node.kind === 234 /* ExportAssignment */ ||
+                (node.flags & 2 /* Ambient */) ||
+                (node.flags & (1 /* Export */ | 512 /* Default */))) {
                 return false;
             }
             return grammarErrorOnFirstToken(node, ts.Diagnostics.A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file);
@@ -29551,7 +31348,7 @@ var ts;
         function checkGrammarTopLevelElementsForRequiredDeclareModifier(file) {
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
                 var decl = _a[_i];
-                if (ts.isDeclaration(decl) || decl.kind === 196 /* VariableStatement */) {
+                if (ts.isDeclaration(decl) || decl.kind === 199 /* VariableStatement */) {
                     if (checkGrammarTopLevelElementForRequiredDeclareModifier(decl)) {
                         return true;
                     }
@@ -29574,10 +31371,10 @@ var ts;
                 }
                 // We are either parented by another statement, or some sort of block.
                 // If we're in a block, we only want to really report an error once
-                // to prevent noisyness.  So use a bit on the block to indicate if
+                // to prevent noisiness.  So use a bit on the block to indicate if
                 // this has already been reported, and don't report if it has.
                 //
-                if (node.parent.kind === 195 /* Block */ || node.parent.kind === 222 /* ModuleBlock */ || node.parent.kind === 251 /* SourceFile */) {
+                if (node.parent.kind === 198 /* Block */ || node.parent.kind === 225 /* ModuleBlock */ || node.parent.kind === 255 /* SourceFile */) {
                     var links_1 = getNodeLinks(node.parent);
                     // Check if the containing block ever report this error
                     if (!links_1.hasReportedStatementInAmbientContext) {
@@ -29590,7 +31387,7 @@ var ts;
         }
         function checkGrammarNumericLiteral(node) {
             // Grammar checking
-            if (node.flags & 32768 /* OctalLiteral */ && languageVersion >= 1 /* ES5 */) {
+            if (node.isOctalLiteral && languageVersion >= 1 /* ES5 */) {
                 return grammarErrorOnNode(node, ts.Diagnostics.Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher);
             }
         }
@@ -29611,6 +31408,14 @@ var ts;
 var ts;
 (function (ts) {
     var nullSourceMapWriter;
+    // Used for initialize lastEncodedSourceMapSpan and reset lastEncodedSourceMapSpan when updateLastEncodedAndRecordedSpans
+    var defaultLastEncodedSourceMapSpan = {
+        emittedLine: 1,
+        emittedColumn: 1,
+        sourceLine: 1,
+        sourceColumn: 1,
+        sourceIndex: 0
+    };
     function getNullSourceMapWriter() {
         if (nullSourceMapWriter === undefined) {
             nullSourceMapWriter = {
@@ -29664,13 +31469,7 @@ var ts;
             sourceMapSourceIndex = -1;
             // Last recorded and encoded spans
             lastRecordedSourceMapSpan = undefined;
-            lastEncodedSourceMapSpan = {
-                emittedLine: 1,
-                emittedColumn: 1,
-                sourceLine: 1,
-                sourceColumn: 1,
-                sourceIndex: 0
-            };
+            lastEncodedSourceMapSpan = defaultLastEncodedSourceMapSpan;
             lastEncodedNameIndex = 0;
             // Initialize source map data
             sourceMapData = {
@@ -29733,10 +31532,12 @@ var ts;
                 lastRecordedSourceMapSpan.emittedColumn = lastEncodedSourceMapSpan.emittedColumn;
                 // Pop sourceMapDecodedMappings to remove last entry
                 sourceMapData.sourceMapDecodedMappings.pop();
-                // Change the last encoded source map
+                // Point the lastEncodedSourceMapSpace to the previous encoded sourceMapSpan
+                // If the list is empty which indicates that we are at the beginning of the file,
+                // we have to reset it to default value (same value when we first initialize sourceMapWriter)
                 lastEncodedSourceMapSpan = sourceMapData.sourceMapDecodedMappings.length ?
                     sourceMapData.sourceMapDecodedMappings[sourceMapData.sourceMapDecodedMappings.length - 1] :
-                    undefined;
+                    defaultLastEncodedSourceMapSpan;
                 // TODO: Update lastEncodedNameIndex 
                 // Since we dont support this any more, lets not worry about it right now.
                 // When we start supporting nameIndex, we will get back to this
@@ -29929,7 +31730,7 @@ var ts;
     function getDeclarationDiagnostics(host, resolver, targetSourceFile) {
         var declarationDiagnostics = ts.createDiagnosticCollection();
         ts.forEachExpectedEmitFile(host, getDeclarationDiagnosticsFromFile, targetSourceFile);
-        return declarationDiagnostics.getDiagnostics(targetSourceFile.fileName);
+        return declarationDiagnostics.getDiagnostics(targetSourceFile ? targetSourceFile.fileName : undefined);
         function getDeclarationDiagnosticsFromFile(_a, sources, isBundledEmit) {
             var declarationFilePath = _a.declarationFilePath;
             emitDeclarations(host, resolver, declarationDiagnostics, declarationFilePath, sources, isBundledEmit);
@@ -29944,7 +31745,8 @@ var ts;
         var increaseIndent;
         var decreaseIndent;
         var writeTextOfNode;
-        var writer = createAndSetNewTextWriterWithSymbolWriter();
+        var writer;
+        createAndSetNewTextWriterWithSymbolWriter();
         var enclosingDeclaration;
         var resultHasExternalModuleIndicator;
         var currentText;
@@ -30008,7 +31810,7 @@ var ts;
                 var oldWriter = writer;
                 ts.forEach(moduleElementDeclarationEmitInfo, function (aliasEmitInfo) {
                     if (aliasEmitInfo.isVisible && !aliasEmitInfo.asynchronousOutput) {
-                        ts.Debug.assert(aliasEmitInfo.node.kind === 225 /* ImportDeclaration */);
+                        ts.Debug.assert(aliasEmitInfo.node.kind === 229 /* ImportDeclaration */);
                         createAndSetNewTextWriterWithSymbolWriter();
                         ts.Debug.assert(aliasEmitInfo.indent === 0 || (aliasEmitInfo.indent === 1 && isBundledEmit));
                         for (var i = 0; i < aliasEmitInfo.indent; i++) {
@@ -30064,7 +31866,6 @@ var ts;
             writer.writeParameter = writer.write;
             writer.writeSymbol = writer.write;
             setWriter(writer);
-            return writer;
         }
         function setWriter(newWriter) {
             writer = newWriter;
@@ -30078,10 +31879,10 @@ var ts;
             var oldWriter = writer;
             ts.forEach(nodes, function (declaration) {
                 var nodeToCheck;
-                if (declaration.kind === 214 /* VariableDeclaration */) {
+                if (declaration.kind === 217 /* VariableDeclaration */) {
                     nodeToCheck = declaration.parent.parent;
                 }
-                else if (declaration.kind === 228 /* NamedImports */ || declaration.kind === 229 /* ImportSpecifier */ || declaration.kind === 226 /* ImportClause */) {
+                else if (declaration.kind === 232 /* NamedImports */ || declaration.kind === 233 /* ImportSpecifier */ || declaration.kind === 230 /* ImportClause */) {
                     ts.Debug.fail("We should be getting ImportDeclaration instead to write");
                 }
                 else {
@@ -30099,7 +31900,7 @@ var ts;
                 // Writing of function bar would mark alias declaration foo as visible but we haven't yet visited that declaration so do nothing,
                 // we would write alias foo declaration when we visit it since it would now be marked as visible
                 if (moduleElementEmitInfo) {
-                    if (moduleElementEmitInfo.node.kind === 225 /* ImportDeclaration */) {
+                    if (moduleElementEmitInfo.node.kind === 229 /* ImportDeclaration */) {
                         // we have to create asynchronous output only after we have collected complete information
                         // because it is possible to enable multiple bindings as asynchronously visible
                         moduleElementEmitInfo.isVisible = true;
@@ -30109,12 +31910,12 @@ var ts;
                         for (var declarationIndent = moduleElementEmitInfo.indent; declarationIndent; declarationIndent--) {
                             increaseIndent();
                         }
-                        if (nodeToCheck.kind === 221 /* ModuleDeclaration */) {
+                        if (nodeToCheck.kind === 224 /* ModuleDeclaration */) {
                             ts.Debug.assert(asynchronousSubModuleDeclarationEmitInfo === undefined);
                             asynchronousSubModuleDeclarationEmitInfo = [];
                         }
                         writeModuleElement(nodeToCheck);
-                        if (nodeToCheck.kind === 221 /* ModuleDeclaration */) {
+                        if (nodeToCheck.kind === 224 /* ModuleDeclaration */) {
                             moduleElementEmitInfo.subModuleElementDeclarationEmitInfo = asynchronousSubModuleDeclarationEmitInfo;
                             asynchronousSubModuleDeclarationEmitInfo = undefined;
                         }
@@ -30124,23 +31925,23 @@ var ts;
             });
             setWriter(oldWriter);
         }
-        function handleSymbolAccessibilityError(symbolAccesibilityResult) {
-            if (symbolAccesibilityResult.accessibility === 0 /* Accessible */) {
+        function handleSymbolAccessibilityError(symbolAccessibilityResult) {
+            if (symbolAccessibilityResult.accessibility === 0 /* Accessible */) {
                 // write the aliases
-                if (symbolAccesibilityResult && symbolAccesibilityResult.aliasesToMakeVisible) {
-                    writeAsynchronousModuleElements(symbolAccesibilityResult.aliasesToMakeVisible);
+                if (symbolAccessibilityResult && symbolAccessibilityResult.aliasesToMakeVisible) {
+                    writeAsynchronousModuleElements(symbolAccessibilityResult.aliasesToMakeVisible);
                 }
             }
             else {
                 // Report error
                 reportedDeclarationError = true;
-                var errorInfo = writer.getSymbolAccessibilityDiagnostic(symbolAccesibilityResult);
+                var errorInfo = writer.getSymbolAccessibilityDiagnostic(symbolAccessibilityResult);
                 if (errorInfo) {
                     if (errorInfo.typeName) {
-                        emitterDiagnostics.add(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getTextOfNodeFromSourceText(currentText, errorInfo.typeName), symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName));
+                        emitterDiagnostics.add(ts.createDiagnosticForNode(symbolAccessibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getTextOfNodeFromSourceText(currentText, errorInfo.typeName), symbolAccessibilityResult.errorSymbolName, symbolAccessibilityResult.errorModuleName));
                     }
                     else {
-                        emitterDiagnostics.add(ts.createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, symbolAccesibilityResult.errorSymbolName, symbolAccesibilityResult.errorModuleName));
+                        emitterDiagnostics.add(ts.createDiagnosticForNode(symbolAccessibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, symbolAccessibilityResult.errorSymbolName, symbolAccessibilityResult.errorModuleName));
                     }
                 }
             }
@@ -30217,40 +32018,42 @@ var ts;
         function emitType(type) {
             switch (type.kind) {
                 case 117 /* AnyKeyword */:
-                case 130 /* StringKeyword */:
-                case 128 /* NumberKeyword */:
+                case 131 /* StringKeyword */:
+                case 129 /* NumberKeyword */:
                 case 120 /* BooleanKeyword */:
-                case 131 /* SymbolKeyword */:
+                case 132 /* SymbolKeyword */:
                 case 103 /* VoidKeyword */:
-                case 162 /* ThisType */:
-                case 163 /* StringLiteralType */:
+                case 134 /* UndefinedKeyword */:
+                case 93 /* NullKeyword */:
+                case 164 /* ThisType */:
+                case 165 /* StringLiteralType */:
                     return writeTextOfNode(currentText, type);
-                case 191 /* ExpressionWithTypeArguments */:
+                case 193 /* ExpressionWithTypeArguments */:
                     return emitExpressionWithTypeArguments(type);
-                case 152 /* TypeReference */:
+                case 154 /* TypeReference */:
                     return emitTypeReference(type);
-                case 155 /* TypeQuery */:
+                case 157 /* TypeQuery */:
                     return emitTypeQuery(type);
-                case 157 /* ArrayType */:
+                case 159 /* ArrayType */:
                     return emitArrayType(type);
-                case 158 /* TupleType */:
+                case 160 /* TupleType */:
                     return emitTupleType(type);
-                case 159 /* UnionType */:
+                case 161 /* UnionType */:
                     return emitUnionType(type);
-                case 160 /* IntersectionType */:
+                case 162 /* IntersectionType */:
                     return emitIntersectionType(type);
-                case 161 /* ParenthesizedType */:
+                case 163 /* ParenthesizedType */:
                     return emitParenType(type);
-                case 153 /* FunctionType */:
-                case 154 /* ConstructorType */:
+                case 155 /* FunctionType */:
+                case 156 /* ConstructorType */:
                     return emitSignatureDeclarationWithJsDocComments(type);
-                case 156 /* TypeLiteral */:
+                case 158 /* TypeLiteral */:
                     return emitTypeLiteral(type);
                 case 69 /* Identifier */:
                     return emitEntityName(type);
-                case 136 /* QualifiedName */:
+                case 138 /* QualifiedName */:
                     return emitEntityName(type);
-                case 151 /* TypePredicate */:
+                case 153 /* TypePredicate */:
                     return emitTypePredicate(type);
             }
             function writeEntityName(entityName) {
@@ -30258,8 +32061,8 @@ var ts;
                     writeTextOfNode(currentText, entityName);
                 }
                 else {
-                    var left = entityName.kind === 136 /* QualifiedName */ ? entityName.left : entityName.expression;
-                    var right = entityName.kind === 136 /* QualifiedName */ ? entityName.right : entityName.name;
+                    var left = entityName.kind === 138 /* QualifiedName */ ? entityName.left : entityName.expression;
+                    var right = entityName.kind === 138 /* QualifiedName */ ? entityName.right : entityName.name;
                     writeEntityName(left);
                     write(".");
                     writeTextOfNode(currentText, right);
@@ -30268,13 +32071,13 @@ var ts;
             function emitEntityName(entityName) {
                 var visibilityResult = resolver.isEntityNameVisible(entityName, 
                 // Aliases can be written asynchronously so use correct enclosing declaration
-                entityName.parent.kind === 224 /* ImportEqualsDeclaration */ ? entityName.parent : enclosingDeclaration);
+                entityName.parent.kind === 228 /* ImportEqualsDeclaration */ ? entityName.parent : enclosingDeclaration);
                 handleSymbolAccessibilityError(visibilityResult);
                 writeEntityName(entityName);
             }
             function emitExpressionWithTypeArguments(node) {
                 if (ts.isSupportedExpressionWithTypeArguments(node)) {
-                    ts.Debug.assert(node.expression.kind === 69 /* Identifier */ || node.expression.kind === 169 /* PropertyAccessExpression */);
+                    ts.Debug.assert(node.expression.kind === 69 /* Identifier */ || node.expression.kind === 171 /* PropertyAccessExpression */);
                     emitEntityName(node.expression);
                     if (node.typeArguments) {
                         write("<");
@@ -30353,9 +32156,9 @@ var ts;
             var count = 0;
             while (true) {
                 count++;
-                var name_21 = baseName + "_" + count;
-                if (!ts.hasProperty(currentIdentifiers, name_21)) {
-                    return name_21;
+                var name_22 = baseName + "_" + count;
+                if (!ts.hasProperty(currentIdentifiers, name_22)) {
+                    return name_22;
                 }
             }
         }
@@ -30367,7 +32170,10 @@ var ts;
             else {
                 // Expression
                 var tempVarName = getExportDefaultTempVariableName();
-                write("declare var ");
+                if (!noDeclare) {
+                    write("declare ");
+                }
+                write("var ");
                 write(tempVarName);
                 write(": ");
                 writer.getSymbolAccessibilityDiagnostic = getDefaultExportAccessibilityDiagnostic;
@@ -30399,10 +32205,10 @@ var ts;
             if (isModuleElementVisible) {
                 writeModuleElement(node);
             }
-            else if (node.kind === 224 /* ImportEqualsDeclaration */ ||
-                (node.parent.kind === 251 /* SourceFile */ && isCurrentFileExternalModule)) {
-                var isVisible;
-                if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 251 /* SourceFile */) {
+            else if (node.kind === 228 /* ImportEqualsDeclaration */ ||
+                (node.parent.kind === 255 /* SourceFile */ && isCurrentFileExternalModule)) {
+                var isVisible = void 0;
+                if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 255 /* SourceFile */) {
                     // Import declaration of another module that is visited async so lets put it in right spot
                     asynchronousSubModuleDeclarationEmitInfo.push({
                         node: node,
@@ -30412,7 +32218,7 @@ var ts;
                     });
                 }
                 else {
-                    if (node.kind === 225 /* ImportDeclaration */) {
+                    if (node.kind === 229 /* ImportDeclaration */) {
                         var importDeclaration = node;
                         if (importDeclaration.importClause) {
                             isVisible = (importDeclaration.importClause.name && resolver.isDeclarationVisible(importDeclaration.importClause)) ||
@@ -30430,23 +32236,23 @@ var ts;
         }
         function writeModuleElement(node) {
             switch (node.kind) {
-                case 216 /* FunctionDeclaration */:
+                case 219 /* FunctionDeclaration */:
                     return writeFunctionDeclaration(node);
-                case 196 /* VariableStatement */:
+                case 199 /* VariableStatement */:
                     return writeVariableStatement(node);
-                case 218 /* InterfaceDeclaration */:
+                case 221 /* InterfaceDeclaration */:
                     return writeInterfaceDeclaration(node);
-                case 217 /* ClassDeclaration */:
+                case 220 /* ClassDeclaration */:
                     return writeClassDeclaration(node);
-                case 219 /* TypeAliasDeclaration */:
+                case 222 /* TypeAliasDeclaration */:
                     return writeTypeAliasDeclaration(node);
-                case 220 /* EnumDeclaration */:
+                case 223 /* EnumDeclaration */:
                     return writeEnumDeclaration(node);
-                case 221 /* ModuleDeclaration */:
+                case 224 /* ModuleDeclaration */:
                     return writeModuleDeclaration(node);
-                case 224 /* ImportEqualsDeclaration */:
+                case 228 /* ImportEqualsDeclaration */:
                     return writeImportEqualsDeclaration(node);
-                case 225 /* ImportDeclaration */:
+                case 229 /* ImportDeclaration */:
                     return writeImportDeclaration(node);
                 default:
                     ts.Debug.fail("Unknown symbol kind");
@@ -30454,30 +32260,33 @@ var ts;
         }
         function emitModuleElementDeclarationFlags(node) {
             // If the node is parented in the current source file we need to emit export declare or just export
-            if (node.parent.kind === 251 /* SourceFile */) {
+            if (node.parent.kind === 255 /* SourceFile */) {
                 // If the node is exported
-                if (node.flags & 2 /* Export */) {
+                if (node.flags & 1 /* Export */) {
                     write("export ");
                 }
                 if (node.flags & 512 /* Default */) {
                     write("default ");
                 }
-                else if (node.kind !== 218 /* InterfaceDeclaration */ && !noDeclare) {
+                else if (node.kind !== 221 /* InterfaceDeclaration */ && !noDeclare) {
                     write("declare ");
                 }
             }
         }
-        function emitClassMemberDeclarationFlags(node) {
-            if (node.flags & 16 /* Private */) {
+        function emitClassMemberDeclarationFlags(flags) {
+            if (flags & 8 /* Private */) {
                 write("private ");
             }
-            else if (node.flags & 32 /* Protected */) {
+            else if (flags & 16 /* Protected */) {
                 write("protected ");
             }
-            if (node.flags & 64 /* Static */) {
+            if (flags & 32 /* Static */) {
                 write("static ");
             }
-            if (node.flags & 128 /* Abstract */) {
+            if (flags & 64 /* Readonly */) {
+                write("readonly ");
+            }
+            if (flags & 128 /* Abstract */) {
                 write("abstract ");
             }
         }
@@ -30485,7 +32294,7 @@ var 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 & 2 /* Export */) {
+            if (node.flags & 1 /* Export */) {
                 write("export ");
             }
             write("import ");
@@ -30501,7 +32310,7 @@ var ts;
                 write(");");
             }
             writer.writeLine();
-            function getImportEntityNameVisibilityError(symbolAccesibilityResult) {
+            function getImportEntityNameVisibilityError(symbolAccessibilityResult) {
                 return {
                     diagnosticMessage: ts.Diagnostics.Import_declaration_0_is_using_private_name_1,
                     errorNode: node,
@@ -30511,7 +32320,7 @@ var ts;
         }
         function isVisibleNamedBinding(namedBindings) {
             if (namedBindings) {
-                if (namedBindings.kind === 227 /* NamespaceImport */) {
+                if (namedBindings.kind === 231 /* NamespaceImport */) {
                     return resolver.isDeclarationVisible(namedBindings);
                 }
                 else {
@@ -30520,12 +32329,8 @@ var ts;
             }
         }
         function writeImportDeclaration(node) {
-            if (!node.importClause && !(node.flags & 2 /* Export */)) {
-                // do not write non-exported import declarations that don't have import clauses
-                return;
-            }
             emitJsDocComments(node);
-            if (node.flags & 2 /* Export */) {
+            if (node.flags & 1 /* Export */) {
                 write("export ");
             }
             write("import ");
@@ -30539,7 +32344,7 @@ var ts;
                         // If the default binding was emitted, write the separated
                         write(", ");
                     }
-                    if (node.importClause.namedBindings.kind === 227 /* NamespaceImport */) {
+                    if (node.importClause.namedBindings.kind === 231 /* NamespaceImport */) {
                         write("* as ");
                         writeTextOfNode(currentText, node.importClause.namedBindings.name);
                     }
@@ -30558,15 +32363,15 @@ var ts;
         function emitExternalModuleSpecifier(parent) {
             // emitExternalModuleSpecifier is usually called when we emit something in the.d.ts file that will make it an external module (i.e. import/export declarations).
             // the only case when it is not true is when we call it to emit correct name for module augmentation - d.ts files with just module augmentations are not considered 
-            // external modules since they are indistingushable from script files with ambient modules. To fix this in such d.ts files we'll emit top level 'export {}'
+            // external modules since they are indistinguishable from script files with ambient modules. To fix this in such d.ts files we'll emit top level 'export {}'
             // so compiler will treat them as external modules.
-            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || parent.kind !== 221 /* ModuleDeclaration */;
+            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || parent.kind !== 224 /* ModuleDeclaration */;
             var moduleSpecifier;
-            if (parent.kind === 224 /* ImportEqualsDeclaration */) {
+            if (parent.kind === 228 /* ImportEqualsDeclaration */) {
                 var node = parent;
                 moduleSpecifier = ts.getExternalModuleImportEqualsDeclarationExpression(node);
             }
-            else if (parent.kind === 221 /* ModuleDeclaration */) {
+            else if (parent.kind === 224 /* ModuleDeclaration */) {
                 moduleSpecifier = parent.name;
             }
             else {
@@ -30576,9 +32381,9 @@ var ts;
             if (moduleSpecifier.kind === 9 /* StringLiteral */ && isBundledEmit && (compilerOptions.out || compilerOptions.outFile)) {
                 var moduleName = ts.getExternalModuleNameFromDeclaration(host, resolver, parent);
                 if (moduleName) {
-                    write("\"");
+                    write('"');
                     write(moduleName);
-                    write("\"");
+                    write('"');
                     return;
                 }
             }
@@ -30623,7 +32428,7 @@ var ts;
                 write("global ");
             }
             else {
-                if (node.flags & 65536 /* Namespace */) {
+                if (node.flags & 4096 /* Namespace */) {
                     write("namespace ");
                 }
                 else {
@@ -30636,7 +32441,7 @@ var ts;
                     writeTextOfNode(currentText, node.name);
                 }
             }
-            while (node.body.kind !== 222 /* ModuleBlock */) {
+            while (node.body.kind !== 225 /* ModuleBlock */) {
                 node = node.body;
                 write(".");
                 writeTextOfNode(currentText, node.name);
@@ -30665,7 +32470,7 @@ var ts;
             write(";");
             writeLine();
             enclosingDeclaration = prevEnclosingDeclaration;
-            function getTypeAliasDeclarationVisibilityError(symbolAccesibilityResult) {
+            function getTypeAliasDeclarationVisibilityError(symbolAccessibilityResult) {
                 return {
                     diagnosticMessage: ts.Diagnostics.Exported_type_alias_0_has_or_is_using_private_name_1,
                     errorNode: node.type,
@@ -30701,7 +32506,7 @@ var ts;
             writeLine();
         }
         function isPrivateMethodTypeParameter(node) {
-            return node.parent.kind === 144 /* MethodDeclaration */ && (node.parent.flags & 16 /* Private */);
+            return node.parent.kind === 146 /* MethodDeclaration */ && (node.parent.flags & 8 /* Private */);
         }
         function emitTypeParameters(typeParameters) {
             function emitTypeParameter(node) {
@@ -30712,50 +32517,50 @@ var ts;
                 // If there is constraint present and this is not a type parameter of the private method emit the constraint
                 if (node.constraint && !isPrivateMethodTypeParameter(node)) {
                     write(" extends ");
-                    if (node.parent.kind === 153 /* FunctionType */ ||
-                        node.parent.kind === 154 /* ConstructorType */ ||
-                        (node.parent.parent && node.parent.parent.kind === 156 /* TypeLiteral */)) {
-                        ts.Debug.assert(node.parent.kind === 144 /* MethodDeclaration */ ||
-                            node.parent.kind === 143 /* MethodSignature */ ||
-                            node.parent.kind === 153 /* FunctionType */ ||
-                            node.parent.kind === 154 /* ConstructorType */ ||
-                            node.parent.kind === 148 /* CallSignature */ ||
-                            node.parent.kind === 149 /* ConstructSignature */);
+                    if (node.parent.kind === 155 /* FunctionType */ ||
+                        node.parent.kind === 156 /* ConstructorType */ ||
+                        (node.parent.parent && node.parent.parent.kind === 158 /* TypeLiteral */)) {
+                        ts.Debug.assert(node.parent.kind === 146 /* MethodDeclaration */ ||
+                            node.parent.kind === 145 /* MethodSignature */ ||
+                            node.parent.kind === 155 /* FunctionType */ ||
+                            node.parent.kind === 156 /* ConstructorType */ ||
+                            node.parent.kind === 150 /* CallSignature */ ||
+                            node.parent.kind === 151 /* ConstructSignature */);
                         emitType(node.constraint);
                     }
                     else {
                         emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.constraint, getTypeParameterConstraintVisibilityError);
                     }
                 }
-                function getTypeParameterConstraintVisibilityError(symbolAccesibilityResult) {
+                function getTypeParameterConstraintVisibilityError(symbolAccessibilityResult) {
                     // Type parameter constraints are named by user so we should always be able to name it
                     var diagnosticMessage;
                     switch (node.parent.kind) {
-                        case 217 /* ClassDeclaration */:
+                        case 220 /* ClassDeclaration */:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_class_has_or_is_using_private_name_1;
                             break;
-                        case 218 /* InterfaceDeclaration */:
+                        case 221 /* InterfaceDeclaration */:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1;
                             break;
-                        case 149 /* ConstructSignature */:
+                        case 151 /* ConstructSignature */:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
                             break;
-                        case 148 /* CallSignature */:
+                        case 150 /* CallSignature */:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
                             break;
-                        case 144 /* MethodDeclaration */:
-                        case 143 /* MethodSignature */:
-                            if (node.parent.flags & 64 /* Static */) {
+                        case 146 /* MethodDeclaration */:
+                        case 145 /* MethodSignature */:
+                            if (node.parent.flags & 32 /* Static */) {
                                 diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                             }
-                            else if (node.parent.parent.kind === 217 /* ClassDeclaration */) {
+                            else if (node.parent.parent.kind === 220 /* ClassDeclaration */) {
                                 diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
                             }
                             else {
                                 diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                             }
                             break;
-                        case 216 /* FunctionDeclaration */:
+                        case 219 /* FunctionDeclaration */:
                             diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_function_has_or_is_using_private_name_1;
                             break;
                         default:
@@ -30786,10 +32591,14 @@ var ts;
                 else if (!isImplementsList && node.expression.kind === 93 /* NullKeyword */) {
                     write("null");
                 }
-                function getHeritageClauseVisibilityError(symbolAccesibilityResult) {
+                else {
+                    writer.getSymbolAccessibilityDiagnostic = getHeritageClauseVisibilityError;
+                    resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2 /* UseTypeOfFunction */, writer);
+                }
+                function getHeritageClauseVisibilityError(symbolAccessibilityResult) {
                     var diagnosticMessage;
                     // Heritage clause is written by user so it can always be named
-                    if (node.parent.parent.kind === 217 /* ClassDeclaration */) {
+                    if (node.parent.parent.kind === 220 /* ClassDeclaration */) {
                         // Class or Interface implemented/extended is inaccessible
                         diagnosticMessage = isImplementsList ?
                             ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 :
@@ -30811,7 +32620,7 @@ var ts;
             function emitParameterProperties(constructorDeclaration) {
                 if (constructorDeclaration) {
                     ts.forEach(constructorDeclaration.parameters, function (param) {
-                        if (param.flags & 56 /* AccessibilityModifier */) {
+                        if (param.flags & 28 /* AccessibilityModifier */) {
                             emitPropertyDeclaration(param);
                         }
                     });
@@ -30865,7 +32674,7 @@ var ts;
                 return;
             }
             emitJsDocComments(node);
-            emitClassMemberDeclarationFlags(node);
+            emitClassMemberDeclarationFlags(node.flags);
             emitVariableDeclaration(node);
             write(";");
             writeLine();
@@ -30873,7 +32682,7 @@ var ts;
         function emitVariableDeclaration(node) {
             // If we are emitting property it isn't moduleElement and hence we already know it needs to be emitted
             // so there is no check needed to see if declaration is visible
-            if (node.kind !== 214 /* VariableDeclaration */ || resolver.isDeclarationVisible(node)) {
+            if (node.kind !== 217 /* VariableDeclaration */ || resolver.isDeclarationVisible(node)) {
                 if (ts.isBindingPattern(node.name)) {
                     emitBindingPattern(node.name);
                 }
@@ -30883,51 +32692,51 @@ var ts;
                     // what we want, namely the name expression enclosed in brackets.
                     writeTextOfNode(currentText, node.name);
                     // If optional property emit ?
-                    if ((node.kind === 142 /* PropertyDeclaration */ || node.kind === 141 /* PropertySignature */) && ts.hasQuestionToken(node)) {
+                    if ((node.kind === 144 /* PropertyDeclaration */ || node.kind === 143 /* PropertySignature */) && ts.hasQuestionToken(node)) {
                         write("?");
                     }
-                    if ((node.kind === 142 /* PropertyDeclaration */ || node.kind === 141 /* PropertySignature */) && node.parent.kind === 156 /* TypeLiteral */) {
+                    if ((node.kind === 144 /* PropertyDeclaration */ || node.kind === 143 /* PropertySignature */) && node.parent.kind === 158 /* TypeLiteral */) {
                         emitTypeOfVariableDeclarationFromTypeLiteral(node);
                     }
-                    else if (!(node.flags & 16 /* Private */)) {
+                    else if (!(node.flags & 8 /* Private */)) {
                         writeTypeOfDeclaration(node, node.type, getVariableDeclarationTypeVisibilityError);
                     }
                 }
             }
-            function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult) {
-                if (node.kind === 214 /* VariableDeclaration */) {
-                    return symbolAccesibilityResult.errorModuleName ?
-                        symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+            function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
+                if (node.kind === 217 /* VariableDeclaration */) {
+                    return symbolAccessibilityResult.errorModuleName ?
+                        symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                             ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Exported_variable_0_has_or_is_using_private_name_1;
                 }
-                else if (node.kind === 142 /* PropertyDeclaration */ || node.kind === 141 /* PropertySignature */) {
+                else if (node.kind === 144 /* PropertyDeclaration */ || node.kind === 143 /* PropertySignature */) {
                     // TODO(jfreeman): Deal with computed properties in error reporting.
-                    if (node.flags & 64 /* Static */) {
-                        return symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                    if (node.flags & 32 /* Static */) {
+                        return symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                 ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
                     }
-                    else if (node.parent.kind === 217 /* ClassDeclaration */) {
-                        return symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                    else if (node.parent.kind === 220 /* ClassDeclaration */) {
+                        return symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                 ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_private_name_1;
                     }
                     else {
                         // Interfaces cannot have types that cannot be named
-                        return symbolAccesibilityResult.errorModuleName ?
+                        return symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_private_name_1;
                     }
                 }
             }
-            function getVariableDeclarationTypeVisibilityError(symbolAccesibilityResult) {
-                var diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult);
+            function getVariableDeclarationTypeVisibilityError(symbolAccessibilityResult) {
+                var diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult);
                 return diagnosticMessage !== undefined ? {
                     diagnosticMessage: diagnosticMessage,
                     errorNode: node,
@@ -30943,15 +32752,15 @@ var ts;
                 var elements = [];
                 for (var _i = 0, _a = bindingPattern.elements; _i < _a.length; _i++) {
                     var element = _a[_i];
-                    if (element.kind !== 190 /* OmittedExpression */) {
+                    if (element.kind !== 192 /* OmittedExpression */) {
                         elements.push(element);
                     }
                 }
                 emitCommaList(elements, emitBindingElement);
             }
             function emitBindingElement(bindingElement) {
-                function getBindingElementTypeVisibilityError(symbolAccesibilityResult) {
-                    var diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult);
+                function getBindingElementTypeVisibilityError(symbolAccessibilityResult) {
+                    var diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult);
                     return diagnosticMessage !== undefined ? {
                         diagnosticMessage: diagnosticMessage,
                         errorNode: bindingElement,
@@ -31006,14 +32815,14 @@ var ts;
             if (node === accessors.firstAccessor) {
                 emitJsDocComments(accessors.getAccessor);
                 emitJsDocComments(accessors.setAccessor);
-                emitClassMemberDeclarationFlags(node);
+                emitClassMemberDeclarationFlags(node.flags | (accessors.setAccessor ? 0 : 64 /* Readonly */));
                 writeTextOfNode(currentText, node.name);
-                if (!(node.flags & 16 /* Private */)) {
+                if (!(node.flags & 8 /* Private */)) {
                     accessorWithTypeAnnotation = node;
                     var type = getTypeAnnotationFromAccessor(node);
                     if (!type) {
                         // couldn't get type for the first accessor, try the another one
-                        var anotherAccessor = node.kind === 146 /* GetAccessor */ ? accessors.setAccessor : accessors.getAccessor;
+                        var anotherAccessor = node.kind === 148 /* GetAccessor */ ? accessors.setAccessor : accessors.getAccessor;
                         type = getTypeAnnotationFromAccessor(anotherAccessor);
                         if (type) {
                             accessorWithTypeAnnotation = anotherAccessor;
@@ -31026,24 +32835,24 @@ var ts;
             }
             function getTypeAnnotationFromAccessor(accessor) {
                 if (accessor) {
-                    return accessor.kind === 146 /* GetAccessor */
+                    return accessor.kind === 148 /* GetAccessor */
                         ? accessor.type // Getter - return type
                         : accessor.parameters.length > 0
                             ? accessor.parameters[0].type // Setter parameter type
                             : undefined;
                 }
             }
-            function getAccessorDeclarationTypeVisibilityError(symbolAccesibilityResult) {
+            function getAccessorDeclarationTypeVisibilityError(symbolAccessibilityResult) {
                 var diagnosticMessage;
-                if (accessorWithTypeAnnotation.kind === 147 /* SetAccessor */) {
+                if (accessorWithTypeAnnotation.kind === 149 /* SetAccessor */) {
                     // Setters have to have type named and cannot infer it so, the type should always be named
-                    if (accessorWithTypeAnnotation.parent.flags & 64 /* Static */) {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                    if (accessorWithTypeAnnotation.parent.flags & 32 /* Static */) {
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1;
                     }
                     else {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1;
                     }
@@ -31055,16 +32864,16 @@ var ts;
                     };
                 }
                 else {
-                    if (accessorWithTypeAnnotation.flags & 64 /* Static */) {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                    if (accessorWithTypeAnnotation.flags & 32 /* Static */) {
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.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 :
                                 ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0;
                     }
                     else {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
                                 ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0;
@@ -31085,17 +32894,17 @@ var ts;
             // so no need to verify if the declaration is visible
             if (!resolver.isImplementationOfOverload(node)) {
                 emitJsDocComments(node);
-                if (node.kind === 216 /* FunctionDeclaration */) {
+                if (node.kind === 219 /* FunctionDeclaration */) {
                     emitModuleElementDeclarationFlags(node);
                 }
-                else if (node.kind === 144 /* MethodDeclaration */) {
-                    emitClassMemberDeclarationFlags(node);
+                else if (node.kind === 146 /* MethodDeclaration */ || node.kind === 147 /* Constructor */) {
+                    emitClassMemberDeclarationFlags(node.flags);
                 }
-                if (node.kind === 216 /* FunctionDeclaration */) {
+                if (node.kind === 219 /* FunctionDeclaration */) {
                     write("function ");
                     writeTextOfNode(currentText, node.name);
                 }
-                else if (node.kind === 145 /* Constructor */) {
+                else if (node.kind === 147 /* Constructor */) {
                     write("constructor");
                 }
                 else {
@@ -31114,35 +32923,37 @@ var ts;
         function emitSignatureDeclaration(node) {
             var prevEnclosingDeclaration = enclosingDeclaration;
             enclosingDeclaration = node;
-            // Construct signature or constructor type write new Signature
-            if (node.kind === 149 /* ConstructSignature */ || node.kind === 154 /* ConstructorType */) {
-                write("new ");
-            }
-            emitTypeParameters(node.typeParameters);
-            if (node.kind === 150 /* IndexSignature */) {
+            if (node.kind === 152 /* IndexSignature */) {
+                // Index signature can have readonly modifier
+                emitClassMemberDeclarationFlags(node.flags);
                 write("[");
             }
             else {
+                // Construct signature or constructor type write new Signature
+                if (node.kind === 151 /* ConstructSignature */ || node.kind === 156 /* ConstructorType */) {
+                    write("new ");
+                }
+                emitTypeParameters(node.typeParameters);
                 write("(");
             }
             // Parameters
             emitCommaList(node.parameters, emitParameterDeclaration);
-            if (node.kind === 150 /* IndexSignature */) {
+            if (node.kind === 152 /* IndexSignature */) {
                 write("]");
             }
             else {
                 write(")");
             }
             // If this is not a constructor and is not private, emit the return type
-            var isFunctionTypeOrConstructorType = node.kind === 153 /* FunctionType */ || node.kind === 154 /* ConstructorType */;
-            if (isFunctionTypeOrConstructorType || node.parent.kind === 156 /* TypeLiteral */) {
+            var isFunctionTypeOrConstructorType = node.kind === 155 /* FunctionType */ || node.kind === 156 /* ConstructorType */;
+            if (isFunctionTypeOrConstructorType || node.parent.kind === 158 /* TypeLiteral */) {
                 // Emit type literal signature return type only if specified
                 if (node.type) {
                     write(isFunctionTypeOrConstructorType ? " => " : ": ");
                     emitType(node.type);
                 }
             }
-            else if (node.kind !== 145 /* Constructor */ && !(node.flags & 16 /* Private */)) {
+            else if (node.kind !== 147 /* Constructor */ && !(node.flags & 8 /* Private */)) {
                 writeReturnTypeAtSignature(node, getReturnTypeVisibilityError);
             }
             enclosingDeclaration = prevEnclosingDeclaration;
@@ -31150,53 +32961,53 @@ var ts;
                 write(";");
                 writeLine();
             }
-            function getReturnTypeVisibilityError(symbolAccesibilityResult) {
+            function getReturnTypeVisibilityError(symbolAccessibilityResult) {
                 var diagnosticMessage;
                 switch (node.kind) {
-                    case 149 /* ConstructSignature */:
+                    case 151 /* ConstructSignature */:
                         // Interfaces cannot have return types that cannot be named
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0;
                         break;
-                    case 148 /* CallSignature */:
+                    case 150 /* CallSignature */:
                         // Interfaces cannot have return types that cannot be named
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0;
                         break;
-                    case 150 /* IndexSignature */:
+                    case 152 /* IndexSignature */:
                         // Interfaces cannot have return types that cannot be named
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0;
                         break;
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
-                        if (node.flags & 64 /* Static */) {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
+                        if (node.flags & 32 /* Static */) {
+                            diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                                symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                     ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
                                     ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                                 ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0;
                         }
-                        else if (node.parent.kind === 217 /* ClassDeclaration */) {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                        else if (node.parent.kind === 220 /* ClassDeclaration */) {
+                            diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                                symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                     ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
                                     ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                                 ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0;
                         }
                         else {
                             // Interfaces cannot have return types that cannot be named
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                            diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                                 ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                                 ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
                         }
                         break;
-                    case 216 /* FunctionDeclaration */:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                    case 219 /* FunctionDeclaration */:
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
                                 ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_private_name_0;
@@ -31229,65 +33040,65 @@ var ts;
                 write("?");
             }
             decreaseIndent();
-            if (node.parent.kind === 153 /* FunctionType */ ||
-                node.parent.kind === 154 /* ConstructorType */ ||
-                node.parent.parent.kind === 156 /* TypeLiteral */) {
+            if (node.parent.kind === 155 /* FunctionType */ ||
+                node.parent.kind === 156 /* ConstructorType */ ||
+                node.parent.parent.kind === 158 /* TypeLiteral */) {
                 emitTypeOfVariableDeclarationFromTypeLiteral(node);
             }
-            else if (!(node.parent.flags & 16 /* Private */)) {
+            else if (!(node.parent.flags & 8 /* Private */)) {
                 writeTypeOfDeclaration(node, node.type, getParameterDeclarationTypeVisibilityError);
             }
-            function getParameterDeclarationTypeVisibilityError(symbolAccesibilityResult) {
-                var diagnosticMessage = getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult);
+            function getParameterDeclarationTypeVisibilityError(symbolAccessibilityResult) {
+                var diagnosticMessage = getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult);
                 return diagnosticMessage !== undefined ? {
                     diagnosticMessage: diagnosticMessage,
                     errorNode: node,
                     typeName: node.name
                 } : undefined;
             }
-            function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult) {
+            function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
                 switch (node.parent.kind) {
-                    case 145 /* Constructor */:
-                        return symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                    case 147 /* Constructor */:
+                        return symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                 ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1;
-                    case 149 /* ConstructSignature */:
+                    case 151 /* ConstructSignature */:
                         // Interfaces cannot have parameter types that cannot be named
-                        return symbolAccesibilityResult.errorModuleName ?
+                        return symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
-                    case 148 /* CallSignature */:
+                    case 150 /* CallSignature */:
                         // Interfaces cannot have parameter types that cannot be named
-                        return symbolAccesibilityResult.errorModuleName ?
+                        return symbolAccessibilityResult.errorModuleName ?
                             ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
-                        if (node.parent.flags & 64 /* Static */) {
-                            return symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
+                        if (node.parent.flags & 32 /* Static */) {
+                            return symbolAccessibilityResult.errorModuleName ?
+                                symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                     ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                     ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                                 ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                         }
-                        else if (node.parent.parent.kind === 217 /* ClassDeclaration */) {
-                            return symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                        else if (node.parent.parent.kind === 220 /* ClassDeclaration */) {
+                            return symbolAccessibilityResult.errorModuleName ?
+                                symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                     ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                     ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                                 ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
                         }
                         else {
                             // Interfaces cannot have parameter types that cannot be named
-                            return symbolAccesibilityResult.errorModuleName ?
+                            return symbolAccessibilityResult.errorModuleName ?
                                 ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                                 ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                         }
-                    case 216 /* FunctionDeclaration */:
-                        return symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                    case 219 /* FunctionDeclaration */:
+                        return symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                 ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_private_name_1;
@@ -31297,12 +33108,12 @@ var ts;
             }
             function emitBindingPattern(bindingPattern) {
                 // We have to explicitly emit square bracket and bracket because these tokens are not store inside the node.
-                if (bindingPattern.kind === 164 /* ObjectBindingPattern */) {
+                if (bindingPattern.kind === 166 /* ObjectBindingPattern */) {
                     write("{");
                     emitCommaList(bindingPattern.elements, emitBindingElement);
                     write("}");
                 }
-                else if (bindingPattern.kind === 165 /* ArrayBindingPattern */) {
+                else if (bindingPattern.kind === 167 /* ArrayBindingPattern */) {
                     write("[");
                     var elements = bindingPattern.elements;
                     emitCommaList(elements, emitBindingElement);
@@ -31313,7 +33124,7 @@ var ts;
                 }
             }
             function emitBindingElement(bindingElement) {
-                if (bindingElement.kind === 190 /* OmittedExpression */) {
+                if (bindingElement.kind === 192 /* OmittedExpression */) {
                     // If bindingElement is an omittedExpression (i.e. containing elision),
                     // we will emit blank space (although this may differ from users' original code,
                     // it allows emitSeparatedList to write separator appropriately)
@@ -31322,7 +33133,7 @@ var ts;
                     //      emit    : function foo([ , x,  , ]) {}
                     write(" ");
                 }
-                else if (bindingElement.kind === 166 /* BindingElement */) {
+                else if (bindingElement.kind === 168 /* BindingElement */) {
                     if (bindingElement.propertyName) {
                         // bindingElement has propertyName property in the following case:
                         //      { y: [a,b,c] ...} -> bindingPattern will have a property called propertyName for "y"
@@ -31361,40 +33172,40 @@ var ts;
         }
         function emitNode(node) {
             switch (node.kind) {
-                case 216 /* FunctionDeclaration */:
-                case 221 /* ModuleDeclaration */:
-                case 224 /* ImportEqualsDeclaration */:
-                case 218 /* InterfaceDeclaration */:
-                case 217 /* ClassDeclaration */:
-                case 219 /* TypeAliasDeclaration */:
-                case 220 /* EnumDeclaration */:
+                case 219 /* FunctionDeclaration */:
+                case 224 /* ModuleDeclaration */:
+                case 228 /* ImportEqualsDeclaration */:
+                case 221 /* InterfaceDeclaration */:
+                case 220 /* ClassDeclaration */:
+                case 222 /* TypeAliasDeclaration */:
+                case 223 /* EnumDeclaration */:
                     return emitModuleElement(node, isModuleElementVisible(node));
-                case 196 /* VariableStatement */:
+                case 199 /* VariableStatement */:
                     return emitModuleElement(node, isVariableStatementVisible(node));
-                case 225 /* ImportDeclaration */:
+                case 229 /* ImportDeclaration */:
                     // Import declaration without import clause is visible, otherwise it is not visible
                     return emitModuleElement(node, /*isModuleElementVisible*/ !node.importClause);
-                case 231 /* ExportDeclaration */:
+                case 235 /* ExportDeclaration */:
                     return emitExportDeclaration(node);
-                case 145 /* Constructor */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
+                case 147 /* Constructor */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
                     return writeFunctionDeclaration(node);
-                case 149 /* ConstructSignature */:
-                case 148 /* CallSignature */:
-                case 150 /* IndexSignature */:
+                case 151 /* ConstructSignature */:
+                case 150 /* CallSignature */:
+                case 152 /* IndexSignature */:
                     return emitSignatureDeclarationWithJsDocComments(node);
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
                     return emitAccessorDeclaration(node);
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
                     return emitPropertyDeclaration(node);
-                case 250 /* EnumMember */:
+                case 254 /* EnumMember */:
                     return emitEnumMemberDeclaration(node);
-                case 230 /* ExportAssignment */:
+                case 234 /* ExportAssignment */:
                     return emitExportAssignment(node);
-                case 251 /* SourceFile */:
+                case 255 /* SourceFile */:
                     return emitSourceFile(node);
             }
         }
@@ -31417,7 +33228,7 @@ var ts;
             if (declFileName) {
                 declFileName = ts.getRelativePathToDirectoryOrUrl(ts.getDirectoryPath(ts.normalizeSlashes(declarationFilePath)), declFileName, host.getCurrentDirectory(), host.getCanonicalFileName, 
                 /*isAbsolutePathAnUrl*/ false);
-                referencePathsOutput += "/// <reference path=\"" + declFileName + "\" />" + newLine;
+                referencePathsOutput += '/// <reference path="' + declFileName + '" />' + newLine;
             }
             return addedBundledEmitReference;
             function getDeclFileName(emitFileNames, sourceFiles, isBundledEmit) {
@@ -31744,21 +33555,28 @@ var ts;
         TempFlags[TempFlags["CountMask"] = 268435455] = "CountMask";
         TempFlags[TempFlags["_i"] = 268435456] = "_i";
     })(TempFlags || (TempFlags = {}));
+    var CopyDirection;
+    (function (CopyDirection) {
+        CopyDirection[CopyDirection["ToOriginal"] = 0] = "ToOriginal";
+        CopyDirection[CopyDirection["ToOutParameter"] = 1] = "ToOutParameter";
+    })(CopyDirection || (CopyDirection = {}));
     // targetSourceFile is when users only want one file in entire project to be emitted. This is used in compileOnSave feature
     function emitFiles(resolver, host, targetSourceFile) {
         // emit output for the __extends helper function
         var extendsHelper = "\nvar __extends = (this && this.__extends) || function (d, b) {\n    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];\n    function __() { this.constructor = d; }\n    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());\n};";
+        var assignHelper = "\nvar __assign = (this && this.__assign) || Object.assign || function(t) {\n    for (var s, i = 1, n = arguments.length; i < n; i++) {\n        s = arguments[i];\n        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))\n            t[p] = s[p];\n    }\n    return t;\n};";
         // emit output for the __decorate helper function
         var decorateHelper = "\nvar __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {\n    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;\n    if (typeof Reflect === \"object\" && typeof Reflect.decorate === \"function\") r = Reflect.decorate(decorators, target, key, desc);\n    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;\n    return c > 3 && r && Object.defineProperty(target, key, r), r;\n};";
         // emit output for the __metadata helper function
         var metadataHelper = "\nvar __metadata = (this && this.__metadata) || function (k, v) {\n    if (typeof Reflect === \"object\" && typeof Reflect.metadata === \"function\") return Reflect.metadata(k, v);\n};";
         // emit output for the __param helper function
         var paramHelper = "\nvar __param = (this && this.__param) || function (paramIndex, decorator) {\n    return function (target, key) { decorator(target, key, paramIndex); }\n};";
-        var awaiterHelper = "\nvar __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n    return new P(function (resolve, reject) {\n        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n        function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }\n        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }\n        step((generator = generator.call(thisArg, _arguments)).next());\n    });\n};";
+        var awaiterHelper = "\nvar __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n    return new (P || (P = Promise))(function (resolve, reject) {\n        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n        function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }\n        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }\n        step((generator = generator.apply(thisArg, _arguments)).next());\n    });\n};";
         var compilerOptions = host.getCompilerOptions();
         var languageVersion = ts.getEmitScriptTarget(compilerOptions);
         var modulekind = ts.getEmitModuleKind(compilerOptions);
         var sourceMapDataList = compilerOptions.sourceMap || compilerOptions.inlineSourceMap ? [] : undefined;
+        var emittedFilesList = compilerOptions.listEmittedFiles ? [] : undefined;
         var emitterDiagnostics = ts.createDiagnosticCollection();
         var emitSkipped = false;
         var newLine = host.getNewLine();
@@ -31767,6 +33585,7 @@ var ts;
         return {
             emitSkipped: emitSkipped,
             diagnostics: emitterDiagnostics.getDiagnostics(),
+            emittedFiles: emittedFilesList,
             sourceMaps: sourceMapDataList
         };
         function isUniqueLocalName(name, container) {
@@ -31830,11 +33649,14 @@ var ts;
             // =>
             // var x;... exporter("x", x = 1)
             var exportFunctionForFile;
+            var contextObjectForFile;
             var generatedNameSet;
             var nodeToGeneratedName;
             var computedPropertyNamesToGeneratedNames;
+            var decoratedClassAliases;
             var convertedLoopState;
             var extendsEmitted;
+            var assignEmitted;
             var decorateEmitted;
             var paramEmitted;
             var awaiterEmitted;
@@ -31854,19 +33676,19 @@ var ts;
             var emitLeadingCommentsOfPosition = compilerOptions.removeComments ? function (pos) { } : emitLeadingCommentsOfPositionWorker;
             var setSourceMapWriterEmit = compilerOptions.sourceMap || compilerOptions.inlineSourceMap ? changeSourceMapEmit : function (writer) { };
             var moduleEmitDelegates = (_a = {},
-                _a[5 /* ES6 */] = emitES6Module,
-                _a[2 /* AMD */] = emitAMDModule,
-                _a[4 /* System */] = emitSystemModule,
-                _a[3 /* UMD */] = emitUMDModule,
-                _a[1 /* CommonJS */] = emitCommonJSModule,
+                _a[ts.ModuleKind.ES6] = emitES6Module,
+                _a[ts.ModuleKind.AMD] = emitAMDModule,
+                _a[ts.ModuleKind.System] = emitSystemModule,
+                _a[ts.ModuleKind.UMD] = emitUMDModule,
+                _a[ts.ModuleKind.CommonJS] = emitCommonJSModule,
                 _a
             );
             var bundleEmitDelegates = (_b = {},
-                _b[5 /* ES6 */] = function () { },
-                _b[2 /* AMD */] = emitAMDModule,
-                _b[4 /* System */] = emitSystemModule,
-                _b[3 /* UMD */] = function () { },
-                _b[1 /* CommonJS */] = function () { },
+                _b[ts.ModuleKind.ES6] = function () { },
+                _b[ts.ModuleKind.AMD] = emitAMDModule,
+                _b[ts.ModuleKind.System] = emitSystemModule,
+                _b[ts.ModuleKind.UMD] = function () { },
+                _b[ts.ModuleKind.CommonJS] = function () { },
                 _b
             );
             return doEmit;
@@ -31874,6 +33696,7 @@ var ts;
                 sourceMap.initialize(jsFilePath, sourceMapFilePath, sourceFiles, isBundledEmit);
                 generatedNameSet = {};
                 nodeToGeneratedName = [];
+                decoratedClassAliases = [];
                 isOwnFileEmit = !isBundledEmit;
                 // Emit helpers from all the files
                 if (isBundledEmit && modulekind) {
@@ -31886,7 +33709,7 @@ var ts;
                 if (sourceMappingURL) {
                     write("//# sourceMappingURL=" + sourceMappingURL);
                 }
-                writeEmittedFiles(writer.getText(), jsFilePath, sourceMapFilePath, /*writeByteOrderMark*/ compilerOptions.emitBOM);
+                writeEmittedFiles(writer.getText(), jsFilePath, sourceMapFilePath, /*writeByteOrderMark*/ compilerOptions.emitBOM, sourceFiles);
                 // reset the state
                 sourceMap.reset();
                 writer.reset();
@@ -31894,14 +33717,17 @@ var ts;
                 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;
@@ -31920,6 +33746,7 @@ var ts;
                 currentText = sourceFile.text;
                 currentLineMap = ts.getLineStarts(sourceFile);
                 exportFunctionForFile = undefined;
+                contextObjectForFile = undefined;
                 isEs6Module = sourceFile.symbol && sourceFile.symbol.exports && !!sourceFile.symbol.exports["___esModule"];
                 renamedDependencies = sourceFile.renamedDependencies;
                 currentFileIdentifiers = sourceFile.identifiers;
@@ -31937,10 +33764,10 @@ var ts;
             // Note that names generated by makeTempVariableName and makeUniqueName will never conflict.
             function makeTempVariableName(flags) {
                 if (flags && !(tempFlags & flags)) {
-                    var name_22 = flags === 268435456 /* _i */ ? "_i" : "_n";
-                    if (isUniqueName(name_22)) {
+                    var name_23 = flags === 268435456 /* _i */ ? "_i" : "_n";
+                    if (isUniqueName(name_23)) {
                         tempFlags |= flags;
-                        return name_22;
+                        return name_23;
                     }
                 }
                 while (true) {
@@ -31948,9 +33775,9 @@ var ts;
                     tempFlags++;
                     // Skip over 'i' and 'n'
                     if (count !== 8 && count !== 13) {
-                        var name_23 = count < 26 ? "_" + String.fromCharCode(97 /* a */ + count) : "_" + (count - 26);
-                        if (isUniqueName(name_23)) {
-                            return name_23;
+                        var name_24 = count < 26 ? "_" + String.fromCharCode(97 /* a */ + count) : "_" + (count - 26);
+                        if (isUniqueName(name_24)) {
+                            return name_24;
                         }
                     }
                 }
@@ -31994,17 +33821,17 @@ var ts;
                 switch (node.kind) {
                     case 69 /* Identifier */:
                         return makeUniqueName(node.text);
-                    case 221 /* ModuleDeclaration */:
-                    case 220 /* EnumDeclaration */:
+                    case 224 /* ModuleDeclaration */:
+                    case 223 /* EnumDeclaration */:
                         return generateNameForModuleOrEnum(node);
-                    case 225 /* ImportDeclaration */:
-                    case 231 /* ExportDeclaration */:
+                    case 229 /* ImportDeclaration */:
+                    case 235 /* ExportDeclaration */:
                         return generateNameForImportOrExportDeclaration(node);
-                    case 216 /* FunctionDeclaration */:
-                    case 217 /* ClassDeclaration */:
-                    case 230 /* ExportAssignment */:
+                    case 219 /* FunctionDeclaration */:
+                    case 220 /* ClassDeclaration */:
+                    case 234 /* ExportAssignment */:
                         return generateNameForExportDefault();
-                    case 189 /* ClassExpression */:
+                    case 191 /* ClassExpression */:
                         return generateNameForClassExpression();
                 }
             }
@@ -32013,14 +33840,14 @@ var ts;
                 return nodeToGeneratedName[id] || (nodeToGeneratedName[id] = ts.unescapeIdentifier(generateNameForNode(node)));
             }
             /** Write emitted output to disk */
-            function writeEmittedFiles(emitOutput, jsFilePath, sourceMapFilePath, writeByteOrderMark) {
+            function writeEmittedFiles(emitOutput, jsFilePath, sourceMapFilePath, writeByteOrderMark, sourceFiles) {
                 if (compilerOptions.sourceMap && !compilerOptions.inlineSourceMap) {
-                    ts.writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(), /*writeByteOrderMark*/ false);
+                    ts.writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(), /*writeByteOrderMark*/ false, sourceFiles);
                 }
                 if (sourceMapDataList) {
                     sourceMapDataList.push(sourceMap.getSourceMapData());
                 }
-                ts.writeFile(host, emitterDiagnostics, jsFilePath, emitOutput, writeByteOrderMark);
+                ts.writeFile(host, emitterDiagnostics, jsFilePath, emitOutput, writeByteOrderMark, sourceFiles);
             }
             // Create a temporary variable with a unique unused name.
             function createTempVariable(flags) {
@@ -32199,7 +34026,7 @@ var ts;
                 // 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 < 2 /* ES6 */ && (ts.isTemplateLiteralKind(node.kind) || node.hasExtendedUnicodeEscape)) {
-                    return getQuotedEscapedLiteralText("\"", node.text, "\"");
+                    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.
@@ -32210,7 +34037,7 @@ var ts;
                 // or an escaped quoted form of the original text if it's string-like.
                 switch (node.kind) {
                     case 9 /* StringLiteral */:
-                        return getQuotedEscapedLiteralText("\"", node.text, "\"");
+                        return getQuotedEscapedLiteralText('"', node.text, '"');
                     case 11 /* NoSubstitutionTemplateLiteral */:
                         return getQuotedEscapedLiteralText("`", node.text, "`");
                     case 12 /* TemplateHead */:
@@ -32232,7 +34059,7 @@ var ts;
                 // 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".
                 var text = ts.getTextOfNodeFromSourceText(currentText, node);
-                // text contains the original source, it will also contain quotes ("`"), dolar signs and braces ("${" and "}"),
+                // 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 "${"
@@ -32274,10 +34101,10 @@ var ts;
                 write("(");
                 emit(tempVariable);
                 // Now we emit the expressions
-                if (node.template.kind === 186 /* TemplateExpression */) {
+                if (node.template.kind === 188 /* TemplateExpression */) {
                     ts.forEach(node.template.templateSpans, function (templateSpan) {
                         write(", ");
-                        var needsParens = templateSpan.expression.kind === 184 /* BinaryExpression */
+                        var needsParens = templateSpan.expression.kind === 186 /* BinaryExpression */
                             && templateSpan.expression.operatorToken.kind === 24 /* CommaToken */;
                         emitParenthesizedIf(templateSpan.expression, needsParens);
                     });
@@ -32312,7 +34139,7 @@ var ts;
                     //    ("abc" + 1) << (2 + "")
                     // rather than
                     //    "abc" + (1 << 2) + ""
-                    var needsParens = templateSpan.expression.kind !== 175 /* ParenthesizedExpression */
+                    var needsParens = templateSpan.expression.kind !== 177 /* ParenthesizedExpression */
                         && comparePrecedenceToBinaryPlus(templateSpan.expression) !== 1 /* GreaterThan */;
                     if (i > 0 || headEmitted) {
                         // If this is the first span and the head was not emitted, then this templateSpan's
@@ -32354,11 +34181,11 @@ var ts;
                 }
                 function templateNeedsParens(template, parent) {
                     switch (parent.kind) {
-                        case 171 /* CallExpression */:
-                        case 172 /* NewExpression */:
+                        case 173 /* CallExpression */:
+                        case 174 /* NewExpression */:
                             return parent.expression === template;
-                        case 173 /* TaggedTemplateExpression */:
-                        case 175 /* ParenthesizedExpression */:
+                        case 175 /* TaggedTemplateExpression */:
+                        case 177 /* ParenthesizedExpression */:
                             return false;
                         default:
                             return comparePrecedenceToBinaryPlus(parent) !== -1 /* LessThan */;
@@ -32379,7 +34206,7 @@ var ts;
                     // 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 184 /* BinaryExpression */:
+                        case 186 /* BinaryExpression */:
                             switch (expression.operatorToken.kind) {
                                 case 37 /* AsteriskToken */:
                                 case 39 /* SlashToken */:
@@ -32391,8 +34218,8 @@ var ts;
                                 default:
                                     return -1 /* LessThan */;
                             }
-                        case 187 /* YieldExpression */:
-                        case 185 /* ConditionalExpression */:
+                        case 189 /* YieldExpression */:
+                        case 187 /* ConditionalExpression */:
                             return -1 /* LessThan */;
                         default:
                             return 1 /* GreaterThan */;
@@ -32408,9 +34235,9 @@ var ts;
                 /// 'Div' for upper-cased or dotted names
                 function emitTagName(name) {
                     if (name.kind === 69 /* Identifier */ && ts.isIntrinsicJsxName(name.text)) {
-                        write("\"");
+                        write('"');
                         emit(name);
-                        write("\"");
+                        write('"');
                     }
                     else {
                         emit(name);
@@ -32424,9 +34251,9 @@ var ts;
                         emit(name);
                     }
                     else {
-                        write("\"");
+                        write('"');
                         emit(name);
-                        write("\"");
+                        write('"');
                     }
                 }
                 /// Emit an name/value pair for an attribute (e.g. "x: 3")
@@ -32457,14 +34284,13 @@ var ts;
                     }
                     else {
                         // Either emit one big object literal (no spread attribs), or
-                        // a call to React.__spread
+                        // a call to the __assign helper
                         var attrs = openingNode.attributes;
-                        if (ts.forEach(attrs, function (attr) { return attr.kind === 242 /* JsxSpreadAttribute */; })) {
-                            emitExpressionIdentifier(syntheticReactRef);
-                            write(".__spread(");
+                        if (ts.forEach(attrs, function (attr) { return attr.kind === 246 /* JsxSpreadAttribute */; })) {
+                            write("__assign(");
                             var haveOpenedObjectLiteral = false;
                             for (var i = 0; i < attrs.length; i++) {
-                                if (attrs[i].kind === 242 /* JsxSpreadAttribute */) {
+                                if (attrs[i].kind === 246 /* JsxSpreadAttribute */) {
                                     // If this is the first argument, we need to emit a {} as the first argument
                                     if (i === 0) {
                                         write("{}, ");
@@ -32479,7 +34305,7 @@ var ts;
                                     emit(attrs[i].expression);
                                 }
                                 else {
-                                    ts.Debug.assert(attrs[i].kind === 241 /* JsxAttribute */);
+                                    ts.Debug.assert(attrs[i].kind === 245 /* JsxAttribute */);
                                     if (haveOpenedObjectLiteral) {
                                         write(", ");
                                     }
@@ -32511,23 +34337,45 @@ var ts;
                     }
                     // Children
                     if (children) {
-                        for (var i = 0; i < children.length; i++) {
-                            // Don't emit empty expressions
-                            if (children[i].kind === 243 /* JsxExpression */ && !(children[i].expression)) {
-                                continue;
-                            }
-                            // Don't emit empty strings
-                            if (children[i].kind === 239 /* JsxText */) {
-                                var text = getTextToEmit(children[i]);
-                                if (text !== undefined) {
-                                    write(", \"");
-                                    write(text);
-                                    write("\"");
+                        var firstChild = void 0;
+                        var multipleEmittableChildren = false;
+                        for (var i = 0, n = children.length; i < n; i++) {
+                            var 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 !== 240 /* JsxElement */ && firstChild.kind !== 241 /* JsxSelfClosingElement */) {
+                                emit(firstChild);
+                            }
                             else {
-                                write(", ");
-                                emit(children[i]);
+                                // If the only child is jsx element, put it on a new indented line
+                                increaseIndent();
+                                writeLine();
+                                emit(firstChild);
+                                writeLine();
+                                decreaseIndent();
                             }
                         }
                     }
@@ -32535,11 +34383,11 @@ var ts;
                     write(")"); // closes "React.createElement("
                     emitTrailingComments(openingNode);
                 }
-                if (node.kind === 236 /* JsxElement */) {
+                if (node.kind === 240 /* JsxElement */) {
                     emitJsxElement(node.openingElement, node.children);
                 }
                 else {
-                    ts.Debug.assert(node.kind === 237 /* JsxSelfClosingElement */);
+                    ts.Debug.assert(node.kind === 241 /* JsxSelfClosingElement */);
                     emitJsxElement(node);
                 }
             }
@@ -32561,11 +34409,11 @@ var ts;
                         if (i > 0) {
                             write(" ");
                         }
-                        if (attribs[i].kind === 242 /* JsxSpreadAttribute */) {
+                        if (attribs[i].kind === 246 /* JsxSpreadAttribute */) {
                             emitJsxSpreadAttribute(attribs[i]);
                         }
                         else {
-                            ts.Debug.assert(attribs[i].kind === 241 /* JsxAttribute */);
+                            ts.Debug.assert(attribs[i].kind === 245 /* JsxAttribute */);
                             emitJsxAttribute(attribs[i]);
                         }
                     }
@@ -32573,11 +34421,11 @@ var ts;
                 function emitJsxOpeningOrSelfClosingElement(node) {
                     write("<");
                     emit(node.tagName);
-                    if (node.attributes.length > 0 || (node.kind === 237 /* JsxSelfClosingElement */)) {
+                    if (node.attributes.length > 0 || (node.kind === 241 /* JsxSelfClosingElement */)) {
                         write(" ");
                     }
                     emitAttributes(node.attributes);
-                    if (node.kind === 237 /* JsxSelfClosingElement */) {
+                    if (node.kind === 241 /* JsxSelfClosingElement */) {
                         write("/>");
                     }
                     else {
@@ -32596,11 +34444,11 @@ var ts;
                     }
                     emitJsxClosingElement(node.closingElement);
                 }
-                if (node.kind === 236 /* JsxElement */) {
+                if (node.kind === 240 /* JsxElement */) {
                     emitJsxElement(node);
                 }
                 else {
-                    ts.Debug.assert(node.kind === 237 /* JsxSelfClosingElement */);
+                    ts.Debug.assert(node.kind === 241 /* JsxSelfClosingElement */);
                     emitJsxOpeningOrSelfClosingElement(node);
                 }
             }
@@ -32608,11 +34456,11 @@ var ts;
             // 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) {
-                ts.Debug.assert(node.kind !== 166 /* BindingElement */);
+                ts.Debug.assert(node.kind !== 168 /* BindingElement */);
                 if (node.kind === 9 /* StringLiteral */) {
                     emitLiteral(node);
                 }
-                else if (node.kind === 137 /* ComputedPropertyName */) {
+                else if (node.kind === 139 /* 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:
@@ -32643,89 +34491,86 @@ var ts;
                     emit(node.expression);
                 }
                 else {
-                    write("\"");
+                    write('"');
                     if (node.kind === 8 /* NumericLiteral */) {
                         write(node.text);
                     }
                     else {
                         writeTextOfNode(currentText, node);
                     }
-                    write("\"");
+                    write('"');
                 }
             }
             function isExpressionIdentifier(node) {
                 var parent = node.parent;
                 switch (parent.kind) {
-                    case 167 /* ArrayLiteralExpression */:
-                    case 192 /* AsExpression */:
-                    case 184 /* BinaryExpression */:
-                    case 171 /* CallExpression */:
-                    case 244 /* CaseClause */:
-                    case 137 /* ComputedPropertyName */:
-                    case 185 /* ConditionalExpression */:
-                    case 140 /* Decorator */:
-                    case 178 /* DeleteExpression */:
-                    case 200 /* DoStatement */:
-                    case 170 /* ElementAccessExpression */:
-                    case 230 /* ExportAssignment */:
-                    case 198 /* ExpressionStatement */:
-                    case 191 /* ExpressionWithTypeArguments */:
-                    case 202 /* ForStatement */:
-                    case 203 /* ForInStatement */:
-                    case 204 /* ForOfStatement */:
-                    case 199 /* IfStatement */:
-                    case 240 /* JsxClosingElement */:
-                    case 237 /* JsxSelfClosingElement */:
-                    case 238 /* JsxOpeningElement */:
-                    case 242 /* JsxSpreadAttribute */:
-                    case 243 /* JsxExpression */:
-                    case 172 /* NewExpression */:
-                    case 175 /* ParenthesizedExpression */:
-                    case 183 /* PostfixUnaryExpression */:
-                    case 182 /* PrefixUnaryExpression */:
-                    case 207 /* ReturnStatement */:
-                    case 249 /* ShorthandPropertyAssignment */:
-                    case 188 /* SpreadElementExpression */:
-                    case 209 /* SwitchStatement */:
-                    case 173 /* TaggedTemplateExpression */:
-                    case 193 /* TemplateSpan */:
-                    case 211 /* ThrowStatement */:
-                    case 174 /* TypeAssertionExpression */:
-                    case 179 /* TypeOfExpression */:
-                    case 180 /* VoidExpression */:
-                    case 201 /* WhileStatement */:
-                    case 208 /* WithStatement */:
-                    case 187 /* YieldExpression */:
+                    case 169 /* ArrayLiteralExpression */:
+                    case 194 /* AsExpression */:
+                    case 186 /* BinaryExpression */:
+                    case 173 /* CallExpression */:
+                    case 248 /* CaseClause */:
+                    case 139 /* ComputedPropertyName */:
+                    case 187 /* ConditionalExpression */:
+                    case 142 /* Decorator */:
+                    case 180 /* DeleteExpression */:
+                    case 203 /* DoStatement */:
+                    case 172 /* ElementAccessExpression */:
+                    case 234 /* ExportAssignment */:
+                    case 201 /* ExpressionStatement */:
+                    case 193 /* ExpressionWithTypeArguments */:
+                    case 205 /* ForStatement */:
+                    case 206 /* ForInStatement */:
+                    case 207 /* ForOfStatement */:
+                    case 202 /* IfStatement */:
+                    case 244 /* JsxClosingElement */:
+                    case 241 /* JsxSelfClosingElement */:
+                    case 242 /* JsxOpeningElement */:
+                    case 246 /* JsxSpreadAttribute */:
+                    case 247 /* JsxExpression */:
+                    case 174 /* NewExpression */:
+                    case 195 /* NonNullExpression */:
+                    case 177 /* ParenthesizedExpression */:
+                    case 185 /* PostfixUnaryExpression */:
+                    case 184 /* PrefixUnaryExpression */:
+                    case 210 /* ReturnStatement */:
+                    case 253 /* ShorthandPropertyAssignment */:
+                    case 190 /* SpreadElementExpression */:
+                    case 212 /* SwitchStatement */:
+                    case 175 /* TaggedTemplateExpression */:
+                    case 196 /* TemplateSpan */:
+                    case 214 /* ThrowStatement */:
+                    case 176 /* TypeAssertionExpression */:
+                    case 181 /* TypeOfExpression */:
+                    case 182 /* VoidExpression */:
+                    case 204 /* WhileStatement */:
+                    case 211 /* WithStatement */:
+                    case 189 /* YieldExpression */:
                         return true;
-                    case 166 /* BindingElement */:
-                    case 250 /* EnumMember */:
-                    case 139 /* Parameter */:
-                    case 248 /* PropertyAssignment */:
-                    case 142 /* PropertyDeclaration */:
-                    case 214 /* VariableDeclaration */:
+                    case 168 /* BindingElement */:
+                    case 254 /* EnumMember */:
+                    case 141 /* Parameter */:
+                    case 252 /* PropertyAssignment */:
+                    case 144 /* PropertyDeclaration */:
+                    case 217 /* VariableDeclaration */:
                         return parent.initializer === node;
-                    case 169 /* PropertyAccessExpression */:
+                    case 171 /* PropertyAccessExpression */:
                         return parent.expression === node;
-                    case 177 /* ArrowFunction */:
-                    case 176 /* FunctionExpression */:
+                    case 179 /* ArrowFunction */:
+                    case 178 /* FunctionExpression */:
                         return parent.body === node;
-                    case 224 /* ImportEqualsDeclaration */:
+                    case 228 /* ImportEqualsDeclaration */:
                         return parent.moduleReference === node;
-                    case 136 /* QualifiedName */:
+                    case 138 /* QualifiedName */:
                         return parent.left === node;
                 }
                 return false;
             }
             function emitExpressionIdentifier(node) {
-                if (resolver.getNodeCheckFlags(node) & 2048 /* LexicalArguments */) {
-                    write("_arguments");
-                    return;
-                }
                 var container = resolver.getReferencedExportContainer(node);
                 if (container) {
-                    if (container.kind === 251 /* SourceFile */) {
+                    if (container.kind === 255 /* SourceFile */) {
                         // Identifier references module export
-                        if (modulekind !== 5 /* ES6 */ && modulekind !== 4 /* System */) {
+                        if (modulekind !== ts.ModuleKind.ES6 && modulekind !== ts.ModuleKind.System) {
                             write("exports.");
                         }
                     }
@@ -32736,22 +34581,22 @@ var ts;
                     }
                 }
                 else {
-                    if (modulekind !== 5 /* ES6 */) {
+                    if (modulekind !== ts.ModuleKind.ES6) {
                         var declaration = resolver.getReferencedImportDeclaration(node);
                         if (declaration) {
-                            if (declaration.kind === 226 /* ImportClause */) {
+                            if (declaration.kind === 230 /* ImportClause */) {
                                 // Identifier references default import
                                 write(getGeneratedNameForNode(declaration.parent));
-                                write(languageVersion === 0 /* ES3 */ ? "[\"default\"]" : ".default");
+                                write(languageVersion === 0 /* ES3 */ ? '["default"]' : ".default");
                                 return;
                             }
-                            else if (declaration.kind === 229 /* ImportSpecifier */) {
+                            else if (declaration.kind === 233 /* ImportSpecifier */) {
                                 // Identifier references named import
                                 write(getGeneratedNameForNode(declaration.parent.parent.parent));
-                                var name_24 = declaration.propertyName || declaration.name;
-                                var identifier = ts.getTextOfNodeFromSourceText(currentText, name_24);
+                                var name_25 = declaration.propertyName || declaration.name;
+                                var identifier = ts.getTextOfNodeFromSourceText(currentText, name_25);
                                 if (languageVersion === 0 /* ES3 */ && identifier === "default") {
-                                    write("[\"default\"]");
+                                    write('["default"]');
                                 }
                                 else {
                                     write(".");
@@ -32761,13 +34606,26 @@ var ts;
                             }
                         }
                     }
-                    if (languageVersion !== 2 /* ES6 */) {
-                        var declaration = resolver.getReferencedNestedRedeclaration(node);
+                    if (languageVersion < 2 /* ES6 */) {
+                        var declaration = resolver.getReferencedDeclarationWithCollidingName(node);
                         if (declaration) {
                             write(getGeneratedNameForNode(declaration.name));
                             return;
                         }
                     }
+                    else if (resolver.getNodeCheckFlags(node) & 1048576 /* 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.
+                        var declaration = resolver.getReferencedValueDeclaration(node);
+                        if (declaration) {
+                            var classAlias = decoratedClassAliases[ts.getNodeId(declaration)];
+                            if (classAlias !== undefined) {
+                                write(classAlias);
+                                return;
+                            }
+                        }
+                    }
                 }
                 if (ts.nodeIsSynthesized(node)) {
                     write(node.text);
@@ -32776,15 +34634,15 @@ var ts;
                     writeTextOfNode(currentText, node);
                 }
             }
-            function isNameOfNestedRedeclaration(node) {
+            function isNameOfNestedBlockScopedRedeclarationOrCapturedBinding(node) {
                 if (languageVersion < 2 /* ES6 */) {
-                    var parent_7 = node.parent;
-                    switch (parent_7.kind) {
-                        case 166 /* BindingElement */:
-                        case 217 /* ClassDeclaration */:
-                        case 220 /* EnumDeclaration */:
-                        case 214 /* VariableDeclaration */:
-                            return parent_7.name === node && resolver.isNestedRedeclaration(parent_7);
+                    var parent_10 = node.parent;
+                    switch (parent_10.kind) {
+                        case 168 /* BindingElement */:
+                        case 220 /* ClassDeclaration */:
+                        case 223 /* EnumDeclaration */:
+                        case 217 /* VariableDeclaration */:
+                            return parent_10.name === node && resolver.isDeclarationWithCollidingName(parent_10);
                     }
                 }
                 return false;
@@ -32793,8 +34651,8 @@ var ts;
                 if (convertedLoopState) {
                     if (node.text == "arguments" && resolver.isArgumentsLocalBinding(node)) {
                         // in converted loop body arguments cannot be used directly.
-                        var name_25 = convertedLoopState.argumentsName || (convertedLoopState.argumentsName = makeUniqueName("arguments"));
-                        write(name_25);
+                        var name_26 = convertedLoopState.argumentsName || (convertedLoopState.argumentsName = makeUniqueName("arguments"));
+                        write(name_26);
                         return;
                     }
                 }
@@ -32804,7 +34662,7 @@ var ts;
                 else if (isExpressionIdentifier(node)) {
                     emitExpressionIdentifier(node);
                 }
-                else if (isNameOfNestedRedeclaration(node)) {
+                else if (isNameOfNestedBlockScopedRedeclarationOrCapturedBinding(node)) {
                     write(getGeneratedNameForNode(node));
                 }
                 else if (ts.nodeIsSynthesized(node)) {
@@ -32894,10 +34752,10 @@ var ts;
                 }
             }
             function needsParenthesisForAwaitExpressionAsYield(node) {
-                if (node.parent.kind === 184 /* BinaryExpression */ && !ts.isAssignmentOperator(node.parent.operatorToken.kind)) {
+                if (node.parent.kind === 186 /* BinaryExpression */ && !ts.isAssignmentOperator(node.parent.operatorToken.kind)) {
                     return true;
                 }
-                else if (node.parent.kind === 185 /* ConditionalExpression */ && node.parent.condition === node) {
+                else if (node.parent.kind === 187 /* ConditionalExpression */ && node.parent.condition === node) {
                     return true;
                 }
                 return false;
@@ -32905,11 +34763,11 @@ var ts;
             function needsParenthesisForPropertyAccessOrInvocation(node) {
                 switch (node.kind) {
                     case 69 /* Identifier */:
-                    case 167 /* ArrayLiteralExpression */:
-                    case 169 /* PropertyAccessExpression */:
-                    case 170 /* ElementAccessExpression */:
-                    case 171 /* CallExpression */:
-                    case 175 /* ParenthesizedExpression */:
+                    case 169 /* ArrayLiteralExpression */:
+                    case 171 /* PropertyAccessExpression */:
+                    case 172 /* ElementAccessExpression */:
+                    case 173 /* CallExpression */:
+                    case 177 /* 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;
@@ -32929,17 +34787,17 @@ var ts;
                         write(", ");
                     }
                     var e = elements[pos];
-                    if (e.kind === 188 /* SpreadElementExpression */) {
+                    if (e.kind === 190 /* SpreadElementExpression */) {
                         e = e.expression;
                         emitParenthesizedIf(e, /*parenthesized*/ group === 0 && needsParenthesisForPropertyAccessOrInvocation(e));
                         pos++;
-                        if (pos === length && group === 0 && needsUniqueCopy && e.kind !== 167 /* ArrayLiteralExpression */) {
+                        if (pos === length && group === 0 && needsUniqueCopy && e.kind !== 169 /* ArrayLiteralExpression */) {
                             write(".slice()");
                         }
                     }
                     else {
                         var i = pos;
-                        while (i < length && elements[i].kind !== 188 /* SpreadElementExpression */) {
+                        while (i < length && elements[i].kind !== 190 /* SpreadElementExpression */) {
                             i++;
                         }
                         write("[");
@@ -32962,7 +34820,7 @@ var ts;
                 }
             }
             function isSpreadElementExpression(node) {
-                return node.kind === 188 /* SpreadElementExpression */;
+                return node.kind === 190 /* SpreadElementExpression */;
             }
             function emitArrayLiteral(node) {
                 var elements = node.elements;
@@ -32975,7 +34833,7 @@ var ts;
                     write("]");
                 }
                 else {
-                    emitListWithSpread(elements, /*needsUniqueCopy*/ true, /*multiLine*/ (node.flags & 1024 /* MultiLine */) !== 0, 
+                    emitListWithSpread(elements, /*needsUniqueCopy*/ true, /*multiLine*/ node.multiLine, 
                     /*trailingComma*/ elements.hasTrailingComma, /*useConcat*/ true);
                 }
             }
@@ -32994,7 +34852,7 @@ var ts;
                         emitLinePreservingList(node, properties, /*allowTrailingComma*/ languageVersion >= 1 /* ES5 */, /*spacesBetweenBraces*/ true);
                     }
                     else {
-                        var multiLine = (node.flags & 1024 /* MultiLine */) !== 0;
+                        var multiLine = node.multiLine;
                         if (!multiLine) {
                             write(" ");
                         }
@@ -33013,7 +34871,7 @@ var ts;
                 write("}");
             }
             function emitDownlevelObjectLiteralWithComputedProperties(node, firstComputedPropertyIndex) {
-                var multiLine = (node.flags & 1024 /* MultiLine */) !== 0;
+                var multiLine = node.multiLine;
                 var properties = node.properties;
                 write("(");
                 if (multiLine) {
@@ -33032,7 +34890,7 @@ var ts;
                     writeComma();
                     var property = properties[i];
                     emitStart(property);
-                    if (property.kind === 146 /* GetAccessor */ || property.kind === 147 /* SetAccessor */) {
+                    if (property.kind === 148 /* GetAccessor */ || property.kind === 149 /* SetAccessor */) {
                         // TODO (drosen): Reconcile with 'emitMemberFunctions'.
                         var accessors = ts.getAllAccessorDeclarations(node.properties, property);
                         if (property !== accessors.firstAccessor) {
@@ -33084,13 +34942,13 @@ var ts;
                         emitMemberAccessForPropertyName(property.name);
                         emitEnd(property.name);
                         write(" = ");
-                        if (property.kind === 248 /* PropertyAssignment */) {
+                        if (property.kind === 252 /* PropertyAssignment */) {
                             emit(property.initializer);
                         }
-                        else if (property.kind === 249 /* ShorthandPropertyAssignment */) {
+                        else if (property.kind === 253 /* ShorthandPropertyAssignment */) {
                             emitExpressionIdentifier(property.name);
                         }
-                        else if (property.kind === 144 /* MethodDeclaration */) {
+                        else if (property.kind === 146 /* MethodDeclaration */) {
                             emitFunctionDeclaration(property);
                         }
                         else {
@@ -33124,7 +34982,7 @@ var ts;
                     // Everything until that point can be emitted as part of the initial object literal.
                     var numInitialNonComputedProperties = numProperties;
                     for (var i = 0, n = properties.length; i < n; i++) {
-                        if (properties[i].name.kind === 137 /* ComputedPropertyName */) {
+                        if (properties[i].name.kind === 139 /* ComputedPropertyName */) {
                             numInitialNonComputedProperties = i;
                             break;
                         }
@@ -33140,21 +34998,21 @@ var ts;
                 emitObjectLiteralBody(node, properties.length);
             }
             function createBinaryExpression(left, operator, right, startsOnNewLine) {
-                var result = ts.createSynthesizedNode(184 /* BinaryExpression */, startsOnNewLine);
+                var result = ts.createSynthesizedNode(186 /* BinaryExpression */, startsOnNewLine);
                 result.operatorToken = ts.createSynthesizedNode(operator);
                 result.left = left;
                 result.right = right;
                 return result;
             }
             function createPropertyAccessExpression(expression, name) {
-                var result = ts.createSynthesizedNode(169 /* PropertyAccessExpression */);
+                var result = ts.createSynthesizedNode(171 /* PropertyAccessExpression */);
                 result.expression = parenthesizeForAccess(expression);
                 result.dotToken = ts.createSynthesizedNode(21 /* DotToken */);
                 result.name = name;
                 return result;
             }
             function createElementAccessExpression(expression, argumentExpression) {
-                var result = ts.createSynthesizedNode(170 /* ElementAccessExpression */);
+                var result = ts.createSynthesizedNode(172 /* ElementAccessExpression */);
                 result.expression = parenthesizeForAccess(expression);
                 result.argumentExpression = argumentExpression;
                 return result;
@@ -33162,7 +35020,9 @@ var ts;
             function parenthesizeForAccess(expr) {
                 // 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 === 174 /* TypeAssertionExpression */ || expr.kind === 192 /* AsExpression */) {
+                while (expr.kind === 176 /* TypeAssertionExpression */ ||
+                    expr.kind === 194 /* AsExpression */ ||
+                    expr.kind === 195 /* NonNullExpression */) {
                     expr = expr.expression;
                 }
                 // isLeftHandSideExpression is almost the correct criterion for when it is not necessary
@@ -33174,11 +35034,11 @@ var ts;
                 //       1.x            -> not the same as (1).x
                 //
                 if (ts.isLeftHandSideExpression(expr) &&
-                    expr.kind !== 172 /* NewExpression */ &&
+                    expr.kind !== 174 /* NewExpression */ &&
                     expr.kind !== 8 /* NumericLiteral */) {
                     return expr;
                 }
-                var node = ts.createSynthesizedNode(175 /* ParenthesizedExpression */);
+                var node = ts.createSynthesizedNode(177 /* ParenthesizedExpression */);
                 node.expression = expr;
                 return node;
             }
@@ -33213,7 +35073,12 @@ var ts;
             // Return true if identifier resolves to an exported member of a namespace
             function isNamespaceExportReference(node) {
                 var container = resolver.getReferencedExportContainer(node);
-                return container && container.kind !== 251 /* SourceFile */;
+                return container && container.kind !== 255 /* SourceFile */;
+            }
+            // Return true if identifier resolves to an imported identifier
+            function isImportedReference(node) {
+                var declaration = resolver.getReferencedImportDeclaration(node);
+                return declaration && (declaration.kind === 230 /* ImportClause */ || declaration.kind === 233 /* ImportSpecifier */);
             }
             function emitShorthandPropertyAssignment(node) {
                 // The name property of a short-hand property assignment is considered an expression position, so here
@@ -33228,7 +35093,18 @@ var ts;
                 //       let obj = { y };
                 //   }
                 // Here we need to emit obj = { y : m.y } regardless of the output target.
-                if (modulekind !== 5 /* ES6 */ || isNamespaceExportReference(node.name)) {
+                // 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 < 2 /* ES6 */ || (modulekind !== ts.ModuleKind.ES6 && isImportedReference(node.name)) || isNamespaceExportReference(node.name)) {
                     // Emit identifier as an identifier
                     write(": ");
                     emit(node.name);
@@ -33243,7 +35119,7 @@ var ts;
                 if (constantValue !== undefined) {
                     write(constantValue.toString());
                     if (!compilerOptions.removeComments) {
-                        var propertyName = node.kind === 169 /* PropertyAccessExpression */ ? ts.declarationNameToString(node.name) : ts.getTextOfNode(node.argumentExpression);
+                        var propertyName = node.kind === 171 /* PropertyAccessExpression */ ? ts.declarationNameToString(node.name) : ts.getTextOfNode(node.argumentExpression);
                         write(" /* " + propertyName + " */");
                     }
                     return true;
@@ -33254,7 +35130,7 @@ var ts;
                 if (compilerOptions.isolatedModules) {
                     return undefined;
                 }
-                return node.kind === 169 /* PropertyAccessExpression */ || node.kind === 170 /* ElementAccessExpression */
+                return node.kind === 171 /* PropertyAccessExpression */ || node.kind === 172 /* ElementAccessExpression */
                     ? resolver.getConstantValue(node)
                     : undefined;
             }
@@ -33281,6 +35157,14 @@ var ts;
                 if (tryEmitConstantValue(node)) {
                     return;
                 }
+                if (languageVersion === 2 /* ES6 */ &&
+                    node.expression.kind === 95 /* SuperKeyword */ &&
+                    isInAsyncMethodWithSuperInES6(node)) {
+                    var name_27 = ts.createSynthesizedNode(9 /* StringLiteral */);
+                    name_27.text = node.name.text;
+                    emitSuperAccessInAsyncMethod(node.expression, name_27);
+                    return;
+                }
                 emit(node.expression);
                 var indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, node.dotToken);
                 // 1 .toString is a valid property access, emit a space after the literal
@@ -33343,7 +35227,7 @@ var ts;
                         }
                         emitExpressionIdentifier(node);
                         break;
-                    case 136 /* QualifiedName */:
+                    case 138 /* QualifiedName */:
                         emitQualifiedNameAsExpression(node, useFallback);
                         break;
                     default:
@@ -33355,16 +35239,25 @@ var ts;
                 if (tryEmitConstantValue(node)) {
                     return;
                 }
+                if (languageVersion === 2 /* ES6 */ &&
+                    node.expression.kind === 95 /* SuperKeyword */ &&
+                    isInAsyncMethodWithSuperInES6(node)) {
+                    emitSuperAccessInAsyncMethod(node.expression, node.argumentExpression);
+                    return;
+                }
                 emit(node.expression);
                 write("[");
                 emit(node.argumentExpression);
                 write("]");
             }
             function hasSpreadElement(elements) {
-                return ts.forEach(elements, function (e) { return e.kind === 188 /* SpreadElementExpression */; });
+                return ts.forEach(elements, function (e) { return e.kind === 190 /* SpreadElementExpression */; });
             }
             function skipParentheses(node) {
-                while (node.kind === 175 /* ParenthesizedExpression */ || node.kind === 174 /* TypeAssertionExpression */ || node.kind === 192 /* AsExpression */) {
+                while (node.kind === 177 /* ParenthesizedExpression */ ||
+                    node.kind === 176 /* TypeAssertionExpression */ ||
+                    node.kind === 194 /* AsExpression */ ||
+                    node.kind === 195 /* NonNullExpression */) {
                     node = node.expression;
                 }
                 return node;
@@ -33385,13 +35278,13 @@ var ts;
             function emitCallWithSpread(node) {
                 var target;
                 var expr = skipParentheses(node.expression);
-                if (expr.kind === 169 /* PropertyAccessExpression */) {
+                if (expr.kind === 171 /* PropertyAccessExpression */) {
                     // Target will be emitted as "this" argument
                     target = emitCallTarget(expr.expression);
                     write(".");
                     emit(expr.name);
                 }
-                else if (expr.kind === 170 /* ElementAccessExpression */) {
+                else if (expr.kind === 172 /* ElementAccessExpression */) {
                     // Target will be emitted as "this" argument
                     target = emitCallTarget(expr.expression);
                     write("[");
@@ -33424,23 +35317,42 @@ var ts;
                 emitListWithSpread(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*trailingComma*/ false, /*useConcat*/ true);
                 write(")");
             }
+            function isInAsyncMethodWithSuperInES6(node) {
+                if (languageVersion === 2 /* ES6 */) {
+                    var container = ts.getSuperContainer(node, /*includeFunctions*/ false);
+                    if (container && resolver.getNodeCheckFlags(container) & (2048 /* AsyncMethodWithSuper */ | 4096 /* AsyncMethodWithSuperBinding */)) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+            function emitSuperAccessInAsyncMethod(superNode, argumentExpression) {
+                var container = ts.getSuperContainer(superNode, /*includeFunctions*/ false);
+                var isSuperBinding = resolver.getNodeCheckFlags(container) & 4096 /* AsyncMethodWithSuperBinding */;
+                write("_super(");
+                emit(argumentExpression);
+                write(isSuperBinding ? ").value" : ")");
+            }
             function emitCallExpression(node) {
                 if (languageVersion < 2 /* ES6 */ && hasSpreadElement(node.arguments)) {
                     emitCallWithSpread(node);
                     return;
                 }
+                var expression = node.expression;
                 var superCall = false;
-                if (node.expression.kind === 95 /* SuperKeyword */) {
-                    emitSuper(node.expression);
+                var isAsyncMethodWithSuper = false;
+                if (expression.kind === 95 /* SuperKeyword */) {
+                    emitSuper(expression);
                     superCall = true;
                 }
                 else {
-                    emit(node.expression);
-                    superCall = node.expression.kind === 169 /* PropertyAccessExpression */ && node.expression.expression.kind === 95 /* SuperKeyword */;
+                    superCall = ts.isSuperPropertyOrElementAccess(expression);
+                    isAsyncMethodWithSuper = superCall && isInAsyncMethodWithSuperInES6(node);
+                    emit(expression);
                 }
-                if (superCall && languageVersion < 2 /* ES6 */) {
+                if (superCall && (languageVersion < 2 /* ES6 */ || isAsyncMethodWithSuper)) {
                     write(".call(");
-                    emitThis(node.expression);
+                    emitThis(expression);
                     if (node.arguments.length) {
                         write(", ");
                         emitCommaList(node.arguments);
@@ -33505,12 +35417,16 @@ var ts;
                 // 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 (!ts.nodeIsSynthesized(node) && node.parent.kind !== 177 /* ArrowFunction */) {
-                    if (node.expression.kind === 174 /* TypeAssertionExpression */ || node.expression.kind === 192 /* AsExpression */) {
+                if (!ts.nodeIsSynthesized(node) && node.parent.kind !== 179 /* ArrowFunction */) {
+                    if (node.expression.kind === 176 /* TypeAssertionExpression */ ||
+                        node.expression.kind === 194 /* AsExpression */ ||
+                        node.expression.kind === 195 /* NonNullExpression */) {
                         var operand = node.expression.expression;
                         // Make sure we consider all nested cast expressions, e.g.:
                         // (<any><number><any>-A).x;
-                        while (operand.kind === 174 /* TypeAssertionExpression */ || operand.kind === 192 /* AsExpression */) {
+                        while (operand.kind === 176 /* TypeAssertionExpression */ ||
+                            operand.kind === 194 /* AsExpression */ ||
+                            operand.kind === 195 /* NonNullExpression */) {
                             operand = operand.expression;
                         }
                         // We have an expression of the form: (<Type>SubExpr)
@@ -33521,15 +35437,15 @@ var ts;
                         //      (<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 !== 182 /* PrefixUnaryExpression */ &&
-                            operand.kind !== 180 /* VoidExpression */ &&
-                            operand.kind !== 179 /* TypeOfExpression */ &&
-                            operand.kind !== 178 /* DeleteExpression */ &&
-                            operand.kind !== 183 /* PostfixUnaryExpression */ &&
-                            operand.kind !== 172 /* NewExpression */ &&
-                            !(operand.kind === 171 /* CallExpression */ && node.parent.kind === 172 /* NewExpression */) &&
-                            !(operand.kind === 176 /* FunctionExpression */ && node.parent.kind === 171 /* CallExpression */) &&
-                            !(operand.kind === 8 /* NumericLiteral */ && node.parent.kind === 169 /* PropertyAccessExpression */)) {
+                        if (operand.kind !== 184 /* PrefixUnaryExpression */ &&
+                            operand.kind !== 182 /* VoidExpression */ &&
+                            operand.kind !== 181 /* TypeOfExpression */ &&
+                            operand.kind !== 180 /* DeleteExpression */ &&
+                            operand.kind !== 185 /* PostfixUnaryExpression */ &&
+                            operand.kind !== 174 /* NewExpression */ &&
+                            !(operand.kind === 173 /* CallExpression */ && node.parent.kind === 174 /* NewExpression */) &&
+                            !(operand.kind === 178 /* FunctionExpression */ && node.parent.kind === 173 /* CallExpression */) &&
+                            !(operand.kind === 8 /* NumericLiteral */ && node.parent.kind === 171 /* PropertyAccessExpression */)) {
                             emit(operand);
                             return;
                         }
@@ -33558,7 +35474,7 @@ var ts;
                 if (!isCurrentFileSystemExternalModule() || node.kind !== 69 /* Identifier */ || ts.nodeIsSynthesized(node)) {
                     return false;
                 }
-                var isVariableDeclarationOrBindingElement = node.parent && (node.parent.kind === 214 /* VariableDeclaration */ || node.parent.kind === 166 /* BindingElement */);
+                var isVariableDeclarationOrBindingElement = node.parent && (node.parent.kind === 217 /* VariableDeclaration */ || node.parent.kind === 168 /* BindingElement */);
                 var targetDeclaration = isVariableDeclarationOrBindingElement
                     ? node.parent
                     : resolver.getReferencedValueDeclaration(node);
@@ -33589,7 +35505,7 @@ var ts;
                 // 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 === 182 /* PrefixUnaryExpression */) {
+                if (node.operand.kind === 184 /* PrefixUnaryExpression */) {
                     var operand = node.operand;
                     if (node.operator === 35 /* PlusToken */ && (operand.operator === 35 /* PlusToken */ || operand.operator === 41 /* PlusPlusToken */)) {
                         write(" ");
@@ -33643,12 +35559,12 @@ var ts;
                 if (!node || !isCurrentFileSystemExternalModule()) {
                     return false;
                 }
-                var current = node;
+                var current = ts.getRootDeclaration(node).parent;
                 while (current) {
-                    if (current.kind === 251 /* SourceFile */) {
-                        return !isExported || ((ts.getCombinedNodeFlags(node) & 2 /* Export */) !== 0);
+                    if (current.kind === 255 /* SourceFile */) {
+                        return !isExported || ((ts.getCombinedNodeFlags(node) & 1 /* Export */) !== 0);
                     }
-                    else if (ts.isFunctionLike(current) || current.kind === 222 /* ModuleBlock */) {
+                    else if (ts.isDeclaration(current)) {
                         return false;
                     }
                     else {
@@ -33663,12 +35579,12 @@ var ts;
             function emitExponentiationOperator(node) {
                 var leftHandSideExpression = node.left;
                 if (node.operatorToken.kind === 60 /* AsteriskAsteriskEqualsToken */) {
-                    var synthesizedLHS;
+                    var synthesizedLHS = void 0;
                     var shouldEmitParentheses = false;
                     if (ts.isElementAccessExpression(leftHandSideExpression)) {
                         shouldEmitParentheses = true;
                         write("(");
-                        synthesizedLHS = ts.createSynthesizedNode(170 /* ElementAccessExpression */, /*startsOnNewLine*/ false);
+                        synthesizedLHS = ts.createSynthesizedNode(172 /* ElementAccessExpression */, /*startsOnNewLine*/ false);
                         var identifier = emitTempVariableAssignment(leftHandSideExpression.expression, /*canDefineTempVariablesInPlace*/ false, /*shouldEmitCommaBeforeAssignment*/ false);
                         synthesizedLHS.expression = identifier;
                         if (leftHandSideExpression.argumentExpression.kind !== 8 /* NumericLiteral */ &&
@@ -33685,7 +35601,7 @@ var ts;
                     else if (ts.isPropertyAccessExpression(leftHandSideExpression)) {
                         shouldEmitParentheses = true;
                         write("(");
-                        synthesizedLHS = ts.createSynthesizedNode(169 /* PropertyAccessExpression */, /*startsOnNewLine*/ false);
+                        synthesizedLHS = ts.createSynthesizedNode(171 /* PropertyAccessExpression */, /*startsOnNewLine*/ false);
                         var identifier = emitTempVariableAssignment(leftHandSideExpression.expression, /*canDefineTempVariablesInPlace*/ false, /*shouldEmitCommaBeforeAssignment*/ false);
                         synthesizedLHS.expression = identifier;
                         synthesizedLHS.dotToken = leftHandSideExpression.dotToken;
@@ -33713,8 +35629,8 @@ var ts;
             }
             function emitBinaryExpression(node) {
                 if (languageVersion < 2 /* ES6 */ && node.operatorToken.kind === 56 /* EqualsToken */ &&
-                    (node.left.kind === 168 /* ObjectLiteralExpression */ || node.left.kind === 167 /* ArrayLiteralExpression */)) {
-                    emitDestructuring(node, node.parent.kind === 198 /* ExpressionStatement */);
+                    (node.left.kind === 170 /* ObjectLiteralExpression */ || node.left.kind === 169 /* ArrayLiteralExpression */)) {
+                    emitDestructuring(node, node.parent.kind === 201 /* ExpressionStatement */);
                 }
                 else {
                     var exportChanged = node.operatorToken.kind >= 56 /* FirstAssignment */ &&
@@ -33779,7 +35695,7 @@ var ts;
                 }
             }
             function isSingleLineEmptyBlock(node) {
-                if (node && node.kind === 195 /* Block */) {
+                if (node && node.kind === 198 /* Block */) {
                     var block = node;
                     return block.statements.length === 0 && nodeEndIsOnSameLineAsNodeStart(block, block);
                 }
@@ -33793,12 +35709,12 @@ var ts;
                 }
                 emitToken(15 /* OpenBraceToken */, node.pos);
                 increaseIndent();
-                if (node.kind === 222 /* ModuleBlock */) {
-                    ts.Debug.assert(node.parent.kind === 221 /* ModuleDeclaration */);
+                if (node.kind === 225 /* ModuleBlock */) {
+                    ts.Debug.assert(node.parent.kind === 224 /* ModuleDeclaration */);
                     emitCaptureThisForNodeIfNecessary(node.parent);
                 }
                 emitLines(node.statements);
-                if (node.kind === 222 /* ModuleBlock */) {
+                if (node.kind === 225 /* ModuleBlock */) {
                     emitTempDeclarations(/*newLine*/ true);
                 }
                 decreaseIndent();
@@ -33806,7 +35722,7 @@ var ts;
                 emitToken(16 /* CloseBraceToken */, node.statements.end);
             }
             function emitEmbeddedStatement(node) {
-                if (node.kind === 195 /* Block */) {
+                if (node.kind === 198 /* Block */) {
                     write(" ");
                     emit(node);
                 }
@@ -33818,7 +35734,7 @@ var ts;
                 }
             }
             function emitExpressionStatement(node) {
-                emitParenthesizedIf(node.expression, /*parenthesized*/ node.expression.kind === 177 /* ArrowFunction */);
+                emitParenthesizedIf(node.expression, /*parenthesized*/ node.expression.kind === 179 /* ArrowFunction */);
                 write(";");
             }
             function emitIfStatement(node) {
@@ -33831,7 +35747,7 @@ var ts;
                 if (node.elseStatement) {
                     writeLine();
                     emitToken(80 /* ElseKeyword */, node.thenStatement.end);
-                    if (node.elseStatement.kind === 199 /* IfStatement */) {
+                    if (node.elseStatement.kind === 202 /* IfStatement */) {
                         write(" ");
                         emit(node.elseStatement);
                     }
@@ -33851,7 +35767,7 @@ var ts;
                 else {
                     emitNormalLoopBody(node, /*emitAsEmbeddedStatement*/ true);
                 }
-                if (node.statement.kind === 195 /* Block */) {
+                if (node.statement.kind === 198 /* Block */) {
                     write(" ");
                 }
                 else {
@@ -33885,7 +35801,7 @@ var ts;
                     // variables in variable declaration list were already hoisted
                     return false;
                 }
-                if (convertedLoopState && (ts.getCombinedNodeFlags(decl) & 24576 /* BlockScoped */) === 0) {
+                if (convertedLoopState && (ts.getCombinedNodeFlags(decl) & 3072 /* BlockScoped */) === 0) {
                     // we are inside a converted loop - this can only happen in downlevel scenarios
                     // record names for all variable declarations
                     for (var _a = 0, _b = decl.declarations; _a < _b.length; _a++) {
@@ -33932,7 +35848,7 @@ var ts;
             }
             function shouldConvertLoopBody(node) {
                 return languageVersion < 2 /* ES6 */ &&
-                    (resolver.getNodeCheckFlags(node) & 65536 /* LoopWithBlockScopedBindingCapturedInFunction */) !== 0;
+                    (resolver.getNodeCheckFlags(node) & 65536 /* LoopWithCapturedBlockScopedBinding */) !== 0;
             }
             function emitLoop(node, loopEmitter) {
                 var shouldConvert = shouldConvertLoopBody(node);
@@ -33941,7 +35857,7 @@ var ts;
                 }
                 else {
                     var loop = convertLoopBody(node);
-                    if (node.parent.kind === 210 /* LabeledStatement */) {
+                    if (node.parent.kind === 213 /* LabeledStatement */) {
                         // if parent of the loop was labeled statement - attach the label to loop skipping converted loop body
                         emitLabelAndColon(node.parent);
                     }
@@ -33952,35 +35868,31 @@ var ts;
                 var functionName = makeUniqueName("_loop");
                 var loopInitializer;
                 switch (node.kind) {
-                    case 202 /* ForStatement */:
-                    case 203 /* ForInStatement */:
-                    case 204 /* ForOfStatement */:
+                    case 205 /* ForStatement */:
+                    case 206 /* ForInStatement */:
+                    case 207 /* ForOfStatement */:
                         var initializer = node.initializer;
-                        if (initializer && initializer.kind === 215 /* VariableDeclarationList */) {
+                        if (initializer && initializer.kind === 218 /* VariableDeclarationList */) {
                             loopInitializer = node.initializer;
                         }
                         break;
                 }
                 var loopParameters;
-                if (loopInitializer && (ts.getCombinedNodeFlags(loopInitializer) & 24576 /* BlockScoped */)) {
+                var loopOutParameters;
+                if (loopInitializer && (ts.getCombinedNodeFlags(loopInitializer) & 3072 /* BlockScoped */)) {
                     // if loop initializer contains block scoped variables - they should be passed to converted loop body as parameters
                     loopParameters = [];
                     for (var _a = 0, _b = loopInitializer.declarations; _a < _b.length; _a++) {
                         var varDeclaration = _b[_a];
-                        collectNames(varDeclaration.name);
+                        processVariableDeclaration(varDeclaration.name);
                     }
                 }
-                var bodyIsBlock = node.statement.kind === 195 /* Block */;
+                var bodyIsBlock = node.statement.kind === 198 /* Block */;
                 var paramList = loopParameters ? loopParameters.join(", ") : "";
                 writeLine();
                 write("var " + functionName + " = function(" + paramList + ")");
-                if (!bodyIsBlock) {
-                    write(" {");
-                    writeLine();
-                    increaseIndent();
-                }
                 var convertedOuterLoopState = convertedLoopState;
-                convertedLoopState = {};
+                convertedLoopState = { loopOutParameters: 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
@@ -34000,14 +35912,34 @@ var ts;
                         convertedLoopState.hoistedLocalVariables = convertedOuterLoopState.hoistedLocalVariables;
                     }
                 }
-                emitEmbeddedStatement(node.statement);
-                if (!bodyIsBlock) {
-                    decreaseIndent();
-                    writeLine();
-                    write("}");
-                }
-                write(";");
+                write(" {");
                 writeLine();
+                increaseIndent();
+                if (bodyIsBlock) {
+                    emitLines(node.statement.statements);
+                }
+                else {
+                    emit(node.statement);
+                }
+                writeLine();
+                // end of loop body -> copy out parameter
+                copyLoopOutParameters(convertedLoopState, 1 /* ToOutParameter */, /*emitAsStatements*/ true);
+                decreaseIndent();
+                writeLine();
+                write("};");
+                writeLine();
+                if (loopOutParameters) {
+                    // declare variables to hold out params for loop body
+                    write("var ");
+                    for (var 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) {
@@ -34044,7 +35976,7 @@ var ts;
                     else {
                         // deduplicate and hoist collected variable declarations
                         write("var ");
-                        var seen;
+                        var seen = void 0;
                         for (var _c = 0, _d = convertedLoopState.hoistedLocalVariables; _c < _d.length; _c++) {
                             var id = _d[_c];
                             // Don't initialize seen unless we have at least one element.
@@ -34067,15 +35999,21 @@ var ts;
                 var currentLoopState = convertedLoopState;
                 convertedLoopState = convertedOuterLoopState;
                 return { functionName: functionName, paramList: paramList, state: currentLoopState };
-                function collectNames(name) {
+                function processVariableDeclaration(name) {
                     if (name.kind === 69 /* Identifier */) {
-                        var nameText = isNameOfNestedRedeclaration(name) ? getGeneratedNameForNode(name) : name.text;
+                        var nameText = isNameOfNestedBlockScopedRedeclarationOrCapturedBinding(name)
+                            ? getGeneratedNameForNode(name)
+                            : name.text;
                         loopParameters.push(nameText);
+                        if (resolver.getNodeCheckFlags(name.parent) & 2097152 /* NeedsLoopOutParameter */) {
+                            var reassignedVariable = { originalName: name, outParamName: makeUniqueName("out_" + nameText) };
+                            (loopOutParameters || (loopOutParameters = [])).push(reassignedVariable);
+                        }
                     }
                     else {
                         for (var _a = 0, _b = name.elements; _a < _b.length; _a++) {
                             var element = _b[_a];
-                            collectNames(element.name);
+                            processVariableDeclaration(element.name);
                         }
                     }
                 }
@@ -34091,7 +36029,7 @@ var ts;
                 if (emitAsEmbeddedStatement) {
                     emitEmbeddedStatement(node.statement);
                 }
-                else if (node.statement.kind === 195 /* Block */) {
+                else if (node.statement.kind === 198 /* Block */) {
                     emitLines(node.statement.statements);
                 }
                 else {
@@ -34102,6 +36040,28 @@ var ts;
                     convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
                 }
             }
+            function copyLoopOutParameters(state, copyDirection, emitAsStatements) {
+                if (state.loopOutParameters) {
+                    for (var _a = 0, _b = state.loopOutParameters; _a < _b.length; _a++) {
+                        var outParam = _b[_a];
+                        if (copyDirection === 0 /* ToOriginal */) {
+                            emitIdentifier(outParam.originalName);
+                            write(" = " + outParam.outParamName);
+                        }
+                        else {
+                            write(outParam.outParamName + " = ");
+                            emitIdentifier(outParam.originalName);
+                        }
+                        if (emitAsStatements) {
+                            write(";");
+                            writeLine();
+                        }
+                        else {
+                            write(", ");
+                        }
+                    }
+                }
+            }
             function emitConvertedLoopCall(loop, emitAsBlock) {
                 if (emitAsBlock) {
                     write(" {");
@@ -34110,7 +36070,8 @@ var ts;
                 }
                 // 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()';
-                var isSimpleLoop = !loop.state.nonLocalJumps &&
+                // NOTE: if loop uses only 'continue' it still will be emitted as simple loop
+                var isSimpleLoop = !(loop.state.nonLocalJumps & ~4 /* Continue */) &&
                     !loop.state.labeledNonLocalBreaks &&
                     !loop.state.labeledNonLocalContinues;
                 var loopResult = makeUniqueName("state");
@@ -34118,6 +36079,8 @@ var ts;
                     write("var " + loopResult + " = ");
                 }
                 write(loop.functionName + "(" + loop.paramList + ");");
+                writeLine();
+                copyLoopOutParameters(loop.state, 0 /* 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:
@@ -34135,7 +36098,7 @@ var ts;
                         }
                         else {
                             // top level converted loop - return unwrapped value
-                            write("return " + loopResult + ".value");
+                            write("return " + loopResult + ".value;");
                         }
                         writeLine();
                     }
@@ -34143,10 +36106,6 @@ var ts;
                         write("if (" + loopResult + " === \"break\") break;");
                         writeLine();
                     }
-                    if (loop.state.nonLocalJumps & 4 /* Continue */) {
-                        write("if (" + loopResult + " === \"continue\") continue;");
-                        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);
                 }
@@ -34201,7 +36160,7 @@ var ts;
                 var endPos = emitToken(86 /* ForKeyword */, node.pos);
                 write(" ");
                 endPos = emitToken(17 /* OpenParenToken */, endPos);
-                if (node.initializer && node.initializer.kind === 215 /* VariableDeclarationList */) {
+                if (node.initializer && node.initializer.kind === 218 /* VariableDeclarationList */) {
                     var variableDeclarationList = node.initializer;
                     var startIsEmitted = tryEmitStartOfVariableDeclarationList(variableDeclarationList);
                     if (startIsEmitted) {
@@ -34227,7 +36186,7 @@ var ts;
                 }
             }
             function emitForInOrForOfStatement(node) {
-                if (languageVersion < 2 /* ES6 */ && node.kind === 204 /* ForOfStatement */) {
+                if (languageVersion < 2 /* ES6 */ && node.kind === 207 /* ForOfStatement */) {
                     emitLoop(node, emitDownLevelForOfStatementWorker);
                 }
                 else {
@@ -34238,7 +36197,7 @@ var ts;
                 var endPos = emitToken(86 /* ForKeyword */, node.pos);
                 write(" ");
                 endPos = emitToken(17 /* OpenParenToken */, endPos);
-                if (node.initializer.kind === 215 /* VariableDeclarationList */) {
+                if (node.initializer.kind === 218 /* VariableDeclarationList */) {
                     var variableDeclarationList = node.initializer;
                     if (variableDeclarationList.declarations.length >= 1) {
                         tryEmitStartOfVariableDeclarationList(variableDeclarationList);
@@ -34248,7 +36207,7 @@ var ts;
                 else {
                     emit(node.initializer);
                 }
-                if (node.kind === 203 /* ForInStatement */) {
+                if (node.kind === 206 /* ForInStatement */) {
                     write(" in ");
                 }
                 else {
@@ -34338,7 +36297,7 @@ var ts;
                 // let v = _a[_i];
                 var rhsIterationValue = createElementAccessExpression(rhsReference, counter);
                 emitStart(node.initializer);
-                if (node.initializer.kind === 215 /* VariableDeclarationList */) {
+                if (node.initializer.kind === 218 /* VariableDeclarationList */) {
                     write("var ");
                     var variableDeclarationList = node.initializer;
                     if (variableDeclarationList.declarations.length > 0) {
@@ -34368,7 +36327,7 @@ var ts;
                     // Initializer is an expression. Emit the expression in the body, so that it's
                     // evaluated on every iteration.
                     var assignmentExpression = createBinaryExpression(node.initializer, 56 /* EqualsToken */, rhsIterationValue, /*startsOnNewLine*/ false);
-                    if (node.initializer.kind === 167 /* ArrayLiteralExpression */ || node.initializer.kind === 168 /* ObjectLiteralExpression */) {
+                    if (node.initializer.kind === 169 /* ArrayLiteralExpression */ || node.initializer.kind === 170 /* 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);
@@ -34396,23 +36355,27 @@ var ts;
                     // 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
-                    var jump = node.kind === 206 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
+                    var jump = node.kind === 209 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
                     var 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, 1 /* ToOutParameter */, /*emitAsStatements*/ false);
                         if (!node.label) {
-                            if (node.kind === 206 /* BreakStatement */) {
+                            if (node.kind === 209 /* BreakStatement */) {
                                 convertedLoopState.nonLocalJumps |= 2 /* Break */;
-                                write("return \"break\";");
+                                write("\"break\";");
                             }
                             else {
                                 convertedLoopState.nonLocalJumps |= 4 /* Continue */;
-                                write("return \"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 {
-                            var labelMarker;
-                            if (node.kind === 206 /* BreakStatement */) {
+                            var labelMarker = void 0;
+                            if (node.kind === 209 /* BreakStatement */) {
                                 labelMarker = "break-" + node.label.text;
                                 setLabeledJump(convertedLoopState, /*isBreak*/ true, node.label.text, labelMarker);
                             }
@@ -34420,12 +36383,12 @@ var ts;
                                 labelMarker = "continue-" + node.label.text;
                                 setLabeledJump(convertedLoopState, /*isBreak*/ false, node.label.text, labelMarker);
                             }
-                            write("return \"" + labelMarker + "\";");
+                            write("\"" + labelMarker + "\";");
                         }
                         return;
                     }
                 }
-                emitToken(node.kind === 206 /* BreakStatement */ ? 70 /* BreakKeyword */ : 75 /* ContinueKeyword */, node.pos);
+                emitToken(node.kind === 209 /* BreakStatement */ ? 70 /* BreakKeyword */ : 75 /* ContinueKeyword */, node.pos);
                 emitOptional(" ", node.label);
                 write(";");
             }
@@ -34491,7 +36454,7 @@ var ts;
                     ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node2.pos));
             }
             function emitCaseOrDefaultClause(node) {
-                if (node.kind === 244 /* CaseClause */) {
+                if (node.kind === 248 /* CaseClause */) {
                     write("case ");
                     emit(node.expression);
                     write(":");
@@ -34560,7 +36523,7 @@ var ts;
             function getContainingModule(node) {
                 do {
                     node = node.parent;
-                } while (node && node.kind !== 221 /* ModuleDeclaration */);
+                } while (node && node.kind !== 224 /* ModuleDeclaration */);
                 return node;
             }
             function emitContainingModuleName(node) {
@@ -34569,13 +36532,13 @@ var ts;
             }
             function emitModuleMemberName(node) {
                 emitStart(node.name);
-                if (ts.getCombinedNodeFlags(node) & 2 /* Export */) {
+                if (ts.getCombinedNodeFlags(node) & 1 /* Export */) {
                     var container = getContainingModule(node);
                     if (container) {
                         write(getGeneratedNameForNode(container));
                         write(".");
                     }
-                    else if (modulekind !== 5 /* ES6 */ && modulekind !== 4 /* System */) {
+                    else if (modulekind !== ts.ModuleKind.ES6 && modulekind !== ts.ModuleKind.System) {
                         write("exports.");
                     }
                 }
@@ -34585,19 +36548,19 @@ var ts;
             function createVoidZero() {
                 var zero = ts.createSynthesizedNode(8 /* NumericLiteral */);
                 zero.text = "0";
-                var result = ts.createSynthesizedNode(180 /* VoidExpression */);
+                var result = ts.createSynthesizedNode(182 /* VoidExpression */);
                 result.expression = zero;
                 return result;
             }
             function emitEs6ExportDefaultCompat(node) {
-                if (node.parent.kind === 251 /* SourceFile */) {
-                    ts.Debug.assert(!!(node.flags & 512 /* Default */) || node.kind === 230 /* ExportAssignment */);
+                if (node.parent.kind === 255 /* SourceFile */) {
+                    ts.Debug.assert(!!(node.flags & 512 /* Default */) || node.kind === 234 /* ExportAssignment */);
                     // only allow export default at a source file level
-                    if (modulekind === 1 /* CommonJS */ || modulekind === 2 /* AMD */ || modulekind === 3 /* UMD */) {
+                    if (modulekind === ts.ModuleKind.CommonJS || modulekind === ts.ModuleKind.AMD || modulekind === ts.ModuleKind.UMD) {
                         if (!isEs6Module) {
                             if (languageVersion !== 0 /* ES3 */) {
                                 // default value of configurable, enumerable, writable are `false`.
-                                write("Object.defineProperty(exports, \"__esModule\", { value: true });");
+                                write('Object.defineProperty(exports, "__esModule", { value: true });');
                                 writeLine();
                             }
                             else {
@@ -34609,11 +36572,11 @@ var ts;
                 }
             }
             function emitExportMemberAssignment(node) {
-                if (node.flags & 2 /* Export */) {
+                if (node.flags & 1 /* Export */) {
                     writeLine();
                     emitStart(node);
                     // emit call to exporter only for top level nodes
-                    if (modulekind === 4 /* System */ && node.parent === currentSourceFile) {
+                    if (modulekind === ts.ModuleKind.System && node.parent === currentSourceFile) {
                         // emit export default <smth> as
                         // export("default", <smth>)
                         write(exportFunctionForFile + "(\"");
@@ -34631,7 +36594,7 @@ var ts;
                         if (node.flags & 512 /* Default */) {
                             emitEs6ExportDefaultCompat(node);
                             if (languageVersion === 0 /* ES3 */) {
-                                write("exports[\"default\"]");
+                                write('exports["default"]');
                             }
                             else {
                                 write("exports.default");
@@ -34648,7 +36611,7 @@ var ts;
                 }
             }
             function emitExportMemberAssignments(name) {
-                if (modulekind === 4 /* System */) {
+                if (modulekind === ts.ModuleKind.System) {
                     return;
                 }
                 if (!exportEquals && exportSpecifiers && ts.hasProperty(exportSpecifiers, name.text)) {
@@ -34667,7 +36630,7 @@ var ts;
                 }
             }
             function emitExportSpecifierInSystemModule(specifier) {
-                ts.Debug.assert(modulekind === 4 /* System */);
+                ts.Debug.assert(modulekind === ts.ModuleKind.System);
                 if (!resolver.getReferencedValueDeclaration(specifier.propertyName || specifier.name) && !resolver.isValueAliasDeclaration(specifier)) {
                     return;
                 }
@@ -34697,7 +36660,7 @@ var ts;
                     emitNodeWithCommentsAndWithoutSourcemap(name);
                     write("\", ");
                 }
-                var isVariableDeclarationOrBindingElement = name.parent && (name.parent.kind === 214 /* VariableDeclaration */ || name.parent.kind === 166 /* BindingElement */);
+                var isVariableDeclarationOrBindingElement = name.parent && (name.parent.kind === 217 /* VariableDeclaration */ || name.parent.kind === 168 /* 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);
@@ -34731,8 +36694,8 @@ var ts;
                 return identifier;
             }
             function isFirstVariableDeclaration(root) {
-                return root.kind === 214 /* VariableDeclaration */ &&
-                    root.parent.kind === 215 /* VariableDeclarationList */ &&
+                return root.kind === 217 /* VariableDeclaration */ &&
+                    root.parent.kind === 218 /* VariableDeclarationList */ &&
                     root.parent.declarations[0] === root;
             }
             function emitDestructuring(root, isAssignmentExpressionStatement, value) {
@@ -34742,15 +36705,15 @@ var ts;
                 // Also temporary variables should be explicitly allocated for source level declarations when module target is system
                 // because actual variable declarations are hoisted
                 var canDefineTempVariablesInPlace = false;
-                if (root.kind === 214 /* VariableDeclaration */) {
-                    var isExported = ts.getCombinedNodeFlags(root) & 2 /* Export */;
+                if (root.kind === 217 /* VariableDeclaration */) {
+                    var isExported = ts.getCombinedNodeFlags(root) & 1 /* Export */;
                     var isSourceLevelForSystemModuleKind = shouldHoistDeclarationInSystemJsModule(root);
                     canDefineTempVariablesInPlace = !isExported && !isSourceLevelForSystemModuleKind;
                 }
-                else if (root.kind === 139 /* Parameter */) {
+                else if (root.kind === 141 /* Parameter */) {
                     canDefineTempVariablesInPlace = true;
                 }
-                if (root.kind === 184 /* BinaryExpression */) {
+                if (root.kind === 186 /* BinaryExpression */) {
                     emitAssignmentExpression(root);
                 }
                 else {
@@ -34785,14 +36748,14 @@ var ts;
                     // 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'
-                    var equals = ts.createSynthesizedNode(184 /* BinaryExpression */);
+                    var equals = ts.createSynthesizedNode(186 /* BinaryExpression */);
                     equals.left = value;
                     equals.operatorToken = ts.createSynthesizedNode(32 /* EqualsEqualsEqualsToken */);
                     equals.right = createVoidZero();
                     return createConditionalExpression(equals, defaultValue, value);
                 }
                 function createConditionalExpression(condition, whenTrue, whenFalse) {
-                    var cond = ts.createSynthesizedNode(185 /* ConditionalExpression */);
+                    var cond = ts.createSynthesizedNode(187 /* ConditionalExpression */);
                     cond.condition = condition;
                     cond.questionToken = ts.createSynthesizedNode(53 /* QuestionToken */);
                     cond.whenTrue = whenTrue;
@@ -34807,7 +36770,7 @@ var ts;
                 }
                 function createPropertyAccessForDestructuringProperty(object, propName) {
                     var index;
-                    var nameIsComputed = propName.kind === 137 /* ComputedPropertyName */;
+                    var nameIsComputed = propName.kind === 139 /* ComputedPropertyName */;
                     if (nameIsComputed) {
                         // TODO to handle when we look into sourcemaps for computed properties, for now use propName
                         index = ensureIdentifier(propName.expression, /*reuseIdentifierExpressions*/ false, propName);
@@ -34816,14 +36779,18 @@ var ts;
                         // We create a synthetic copy of the identifier in order to avoid the rewriting that might
                         // otherwise occur when the identifier is emitted.
                         index = ts.createSynthesizedNode(propName.kind);
-                        index.text = propName.text;
+                        // 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)
+                        index.text = ts.unescapeIdentifier(propName.text);
                     }
                     return !nameIsComputed && index.kind === 69 /* Identifier */
                         ? createPropertyAccessExpression(object, index)
                         : createElementAccessExpression(object, index);
                 }
                 function createSliceCall(value, sliceIndex) {
-                    var call = ts.createSynthesizedNode(171 /* CallExpression */);
+                    var call = ts.createSynthesizedNode(173 /* CallExpression */);
                     var sliceIdentifier = ts.createSynthesizedNode(69 /* Identifier */);
                     sliceIdentifier.text = "slice";
                     call.expression = createPropertyAccessExpression(value, sliceIdentifier);
@@ -34836,15 +36803,15 @@ var ts;
                     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
+                        // 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 (var _a = 0, properties_5 = properties; _a < properties_5.length; _a++) {
                         var p = properties_5[_a];
-                        if (p.kind === 248 /* PropertyAssignment */ || p.kind === 249 /* ShorthandPropertyAssignment */) {
+                        if (p.kind === 252 /* PropertyAssignment */ || p.kind === 253 /* ShorthandPropertyAssignment */) {
                             var propName = p.name;
-                            var target_1 = p.kind === 249 /* ShorthandPropertyAssignment */ ? p : p.initializer || propName;
-                            // Assignment for target = value.propName should highligh whole property, hence use p as source map node
+                            var target_1 = p.kind === 253 /* ShorthandPropertyAssignment */ ? p : p.initializer || propName;
+                            // Assignment for target = value.propName should highlight whole property, hence use p as source map node
                             emitDestructuringAssignment(target_1, createPropertyAccessForDestructuringProperty(value, propName), p);
                         }
                     }
@@ -34854,14 +36821,14 @@ var ts;
                     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 hightlight the passed in source map node since thats the one needing this temp assignment
+                        // 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 (var i = 0; i < elements.length; i++) {
                         var e = elements[i];
-                        if (e.kind !== 190 /* OmittedExpression */) {
-                            // Assignment for target = value.propName should highligh whole property, hence use e as source map node
-                            if (e.kind !== 188 /* SpreadElementExpression */) {
+                        if (e.kind !== 192 /* OmittedExpression */) {
+                            // Assignment for target = value.propName should highlight whole property, hence use e as source map node
+                            if (e.kind !== 190 /* SpreadElementExpression */) {
                                 emitDestructuringAssignment(e, createElementAccessExpression(value, createNumericLiteral(i)), e);
                             }
                             else if (i === elements.length - 1) {
@@ -34872,20 +36839,20 @@ var ts;
                 }
                 function emitDestructuringAssignment(target, value, sourceMapNode) {
                     // When emitting target = value use source map node to highlight, including any temporary assignments needed for this
-                    if (target.kind === 249 /* ShorthandPropertyAssignment */) {
+                    if (target.kind === 253 /* ShorthandPropertyAssignment */) {
                         if (target.objectAssignmentInitializer) {
                             value = createDefaultValueCheck(value, target.objectAssignmentInitializer, sourceMapNode);
                         }
                         target = target.name;
                     }
-                    else if (target.kind === 184 /* BinaryExpression */ && target.operatorToken.kind === 56 /* EqualsToken */) {
+                    else if (target.kind === 186 /* BinaryExpression */ && target.operatorToken.kind === 56 /* EqualsToken */) {
                         value = createDefaultValueCheck(value, target.right, sourceMapNode);
                         target = target.left;
                     }
-                    if (target.kind === 168 /* ObjectLiteralExpression */) {
+                    if (target.kind === 170 /* ObjectLiteralExpression */) {
                         emitObjectLiteralAssignment(target, value, sourceMapNode);
                     }
-                    else if (target.kind === 167 /* ArrayLiteralExpression */) {
+                    else if (target.kind === 169 /* ArrayLiteralExpression */) {
                         emitArrayLiteralAssignment(target, value, sourceMapNode);
                     }
                     else {
@@ -34907,7 +36874,7 @@ var ts;
                         emitDestructuringAssignment(target, value, ts.nodeIsSynthesized(root) ? target : root);
                     }
                     else {
-                        if (root.parent.kind !== 175 /* ParenthesizedExpression */) {
+                        if (root.parent.kind !== 177 /* ParenthesizedExpression */) {
                             write("(");
                         }
                         // Temporary assignment needed to emit root should highlight whole binary expression
@@ -34916,7 +36883,7 @@ var ts;
                         emitDestructuringAssignment(target, value, root);
                         write(", ");
                         emit(value);
-                        if (root.parent.kind !== 175 /* ParenthesizedExpression */) {
+                        if (root.parent.kind !== 177 /* ParenthesizedExpression */) {
                             write(")");
                         }
                     }
@@ -34944,12 +36911,12 @@ var ts;
                         }
                         for (var i = 0; i < numElements; i++) {
                             var element = elements[i];
-                            if (pattern.kind === 164 /* ObjectBindingPattern */) {
+                            if (pattern.kind === 166 /* ObjectBindingPattern */) {
                                 // Rewrite element to a declaration with an initializer that fetches property
                                 var propName = element.propertyName || element.name;
                                 emitBindingElement(element, createPropertyAccessForDestructuringProperty(value, propName));
                             }
-                            else if (element.kind !== 190 /* OmittedExpression */) {
+                            else if (element.kind !== 192 /* OmittedExpression */) {
                                 if (!element.dotDotDotToken) {
                                     // Rewrite element to a declaration that accesses array element at index i
                                     emitBindingElement(element, createElementAccessExpression(value, createNumericLiteral(i)));
@@ -34968,29 +36935,70 @@ var ts;
             }
             function emitVariableDeclaration(node) {
                 if (ts.isBindingPattern(node.name)) {
-                    if (languageVersion < 2 /* ES6 */) {
-                        emitDestructuring(node, /*isAssignmentExpressionStatement*/ false);
-                    }
-                    else {
+                    var isExported = ts.getCombinedNodeFlags(node) & 1 /* Export */;
+                    if (languageVersion >= 2 /* ES6 */ && (!isExported || modulekind === ts.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
+                        var isTopLevelDeclarationInSystemModule = modulekind === ts.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 {
                     var initializer = node.initializer;
-                    if (!initializer && languageVersion < 2 /* ES6 */) {
-                        // downlevel emit for non-initialized let bindings defined in loops
-                        // for (...) {  let x; }
-                        // should be
-                        // for (...) { var <some-uniqie-name> = void 0; }
-                        // this is necessary to preserve ES6 semantic in scenarios like
-                        // for (...) { let x; console.log(x); x = 1 } // assignment on one iteration should not affect other iterations
-                        var isLetDefinedInLoop = (resolver.getNodeCheckFlags(node) & 16384 /* BlockScopedBindingInLoop */) &&
-                            (getCombinedFlagsForIdentifier(node.name) & 8192 /* Let */);
-                        // NOTE: default initialization should not be added to let bindings in for-in\for-of statements
-                        if (isLetDefinedInLoop &&
-                            node.parent.parent.kind !== 203 /* ForInStatement */ &&
-                            node.parent.parent.kind !== 204 /* ForOfStatement */) {
+                    if (!initializer &&
+                        languageVersion < 2 /* 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 === 69 /* Identifier */) {
+                        var container = ts.getEnclosingBlockScopeContainer(node);
+                        var 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.
+                        var isCapturedInFunction = flags & 131072 /* CapturedBlockScopedBinding */;
+                        var isDeclaredInLoop = flags & 262144 /* BlockScopedBindingInLoop */;
+                        var emittedAsTopLevel = ts.isBlockScopedContainerTopLevel(container) ||
+                            (isCapturedInFunction && isDeclaredInLoop && container.kind === 198 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false));
+                        var emittedAsNestedLetDeclaration = ts.getCombinedNodeFlags(node) & 1024 /* Let */ &&
+                            !emittedAsTopLevel;
+                        var emitExplicitInitializer = emittedAsNestedLetDeclaration &&
+                            container.kind !== 206 /* ForInStatement */ &&
+                            container.kind !== 207 /* ForOfStatement */ &&
+                            (!resolver.isDeclarationWithCollidingName(node) ||
+                                (isDeclaredInLoop && !isCapturedInFunction && !ts.isIterationStatement(container, /*lookInLabeledStatements*/ false)));
+                        if (emitExplicitInitializer) {
                             initializer = createVoidZero();
                         }
                     }
@@ -35008,7 +37016,7 @@ var ts;
                 }
             }
             function emitExportVariableAssignments(node) {
-                if (node.kind === 190 /* OmittedExpression */) {
+                if (node.kind === 192 /* OmittedExpression */) {
                     return;
                 }
                 var name = node.name;
@@ -35019,20 +37027,14 @@ var ts;
                     ts.forEach(name.elements, emitExportVariableAssignments);
                 }
             }
-            function getCombinedFlagsForIdentifier(node) {
-                if (!node.parent || (node.parent.kind !== 214 /* VariableDeclaration */ && node.parent.kind !== 166 /* BindingElement */)) {
-                    return 0;
-                }
-                return ts.getCombinedNodeFlags(node.parent);
-            }
             function isES6ExportedDeclaration(node) {
-                return !!(node.flags & 2 /* Export */) &&
-                    modulekind === 5 /* ES6 */ &&
-                    node.parent.kind === 251 /* SourceFile */;
+                return !!(node.flags & 1 /* Export */) &&
+                    modulekind === ts.ModuleKind.ES6 &&
+                    node.parent.kind === 255 /* SourceFile */;
             }
             function emitVariableStatement(node) {
                 var startIsEmitted = false;
-                if (node.flags & 2 /* Export */) {
+                if (node.flags & 1 /* Export */) {
                     if (isES6ExportedDeclaration(node)) {
                         // Exported ES6 module member
                         write("export ");
@@ -35052,14 +37054,14 @@ var ts;
                         write(";");
                     }
                 }
-                if (modulekind !== 5 /* ES6 */ && node.parent === currentSourceFile) {
+                if (modulekind !== ts.ModuleKind.ES6 && node.parent === currentSourceFile) {
                     ts.forEach(node.declarationList.declarations, emitExportVariableAssignments);
                 }
             }
             function shouldEmitLeadingAndTrailingCommentsForVariableStatement(node) {
                 // If we're not exporting the variables, there's nothing special here.
                 // Always emit comments for these nodes.
-                if (!(node.flags & 2 /* Export */)) {
+                if (!(node.flags & 1 /* Export */)) {
                     return true;
                 }
                 // If we are exporting, but it's a top-level ES6 module exports,
@@ -35079,12 +37081,12 @@ var ts;
             function emitParameter(node) {
                 if (languageVersion < 2 /* ES6 */) {
                     if (ts.isBindingPattern(node.name)) {
-                        var name_26 = createTempVariable(0 /* Auto */);
+                        var name_28 = createTempVariable(0 /* Auto */);
                         if (!tempParameters) {
                             tempParameters = [];
                         }
-                        tempParameters.push(name_26);
-                        emit(name_26);
+                        tempParameters.push(name_28);
+                        emit(name_28);
                     }
                     else {
                         emit(node.name);
@@ -35100,7 +37102,7 @@ var ts;
             }
             function emitDefaultValueAssignments(node) {
                 if (languageVersion < 2 /* ES6 */) {
-                    var tempIndex = 0;
+                    var tempIndex_1 = 0;
                     ts.forEach(node.parameters, function (parameter) {
                         // A rest parameter cannot have a binding pattern or an initializer,
                         // so let's just ignore it.
@@ -35117,15 +37119,15 @@ var ts;
                                 writeLine();
                                 write("var ");
                                 if (hasBindingElements) {
-                                    emitDestructuring(parameter, /*isAssignmentExpressionStatement*/ false, tempParameters[tempIndex]);
+                                    emitDestructuring(parameter, /*isAssignmentExpressionStatement*/ false, tempParameters[tempIndex_1]);
                                 }
                                 else {
-                                    emit(tempParameters[tempIndex]);
+                                    emit(tempParameters[tempIndex_1]);
                                     write(" = ");
                                     emit(initializer);
                                 }
                                 write(";");
-                                tempIndex++;
+                                tempIndex_1++;
                             }
                         }
                         else if (initializer) {
@@ -35189,12 +37191,12 @@ var ts;
                 }
             }
             function emitAccessor(node) {
-                write(node.kind === 146 /* GetAccessor */ ? "get " : "set ");
+                write(node.kind === 148 /* GetAccessor */ ? "get " : "set ");
                 emit(node.name);
                 emitSignatureAndBody(node);
             }
             function shouldEmitAsArrowFunction(node) {
-                return node.kind === 177 /* ArrowFunction */ && languageVersion >= 2 /* ES6 */;
+                return node.kind === 179 /* ArrowFunction */ && languageVersion >= 2 /* ES6 */;
             }
             function emitDeclarationName(node) {
                 if (node.name) {
@@ -35205,13 +37207,13 @@ var ts;
                 }
             }
             function shouldEmitFunctionName(node) {
-                if (node.kind === 176 /* FunctionExpression */) {
+                if (node.kind === 178 /* FunctionExpression */) {
                     // Emit name if one is present
                     return !!node.name;
                 }
-                if (node.kind === 216 /* FunctionDeclaration */) {
+                if (node.kind === 219 /* FunctionDeclaration */) {
                     // Emit name if one is present, or emit generated name in down-level case (for export default case)
-                    return !!node.name || modulekind !== 5 /* ES6 */;
+                    return !!node.name || modulekind !== ts.ModuleKind.ES6;
                 }
             }
             function emitFunctionDeclaration(node) {
@@ -35221,12 +37223,12 @@ var ts;
                 // TODO (yuisu) : we should not have special cases to condition emitting comments
                 // but have one place to fix check for these conditions.
                 var kind = node.kind, parent = node.parent;
-                if (kind !== 144 /* MethodDeclaration */ &&
-                    kind !== 143 /* MethodSignature */ &&
+                if (kind !== 146 /* MethodDeclaration */ &&
+                    kind !== 145 /* MethodSignature */ &&
                     parent &&
-                    parent.kind !== 248 /* PropertyAssignment */ &&
-                    parent.kind !== 171 /* CallExpression */ &&
-                    parent.kind !== 167 /* ArrayLiteralExpression */) {
+                    parent.kind !== 252 /* PropertyAssignment */ &&
+                    parent.kind !== 173 /* CallExpression */ &&
+                    parent.kind !== 169 /* ArrayLiteralExpression */) {
                     // 1. Methods will emit comments at their assignment declaration sites.
                     //
                     // 2. If the function is a property of object literal, emitting leading-comments
@@ -35265,11 +37267,13 @@ var ts;
                     emitDeclarationName(node);
                 }
                 emitSignatureAndBody(node);
-                if (modulekind !== 5 /* ES6 */ && kind === 216 /* FunctionDeclaration */ && parent === currentSourceFile && node.name) {
+                if (modulekind !== ts.ModuleKind.ES6 && kind === 219 /* FunctionDeclaration */ && parent === currentSourceFile && node.name) {
                     emitExportMemberAssignments(node.name);
                 }
                 emitEnd(node);
-                if (kind !== 144 /* MethodDeclaration */ && kind !== 143 /* MethodSignature */) {
+                if (kind !== 146 /* MethodDeclaration */ &&
+                    kind !== 145 /* MethodSignature */ &&
+                    kind !== 179 /* ArrowFunction */) {
                     emitTrailingComments(node);
                 }
             }
@@ -35286,8 +37290,9 @@ var ts;
                 write("(");
                 if (node) {
                     var parameters = node.parameters;
+                    var skipCount = node.parameters.length && node.parameters[0].name.text === "this" ? 1 : 0;
                     var omitCount = languageVersion < 2 /* ES6 */ && ts.hasRestParameter(node) ? 1 : 0;
-                    emitList(parameters, 0, parameters.length - omitCount, /*multiLine*/ false, /*trailingComma*/ false);
+                    emitList(parameters, skipCount, parameters.length - omitCount - skipCount, /*multiLine*/ false, /*trailingComma*/ false);
                 }
                 write(")");
                 decreaseIndent();
@@ -35302,8 +37307,8 @@ var ts;
             }
             function emitAsyncFunctionBodyForES6(node) {
                 var promiseConstructor = ts.getEntityNameFromTypeNode(node.type);
-                var isArrowFunction = node.kind === 177 /* ArrowFunction */;
-                var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 4096 /* CaptureArguments */) !== 0;
+                var isArrowFunction = node.kind === 179 /* ArrowFunction */;
+                var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 8192 /* 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
@@ -35381,6 +37386,14 @@ var ts;
                     write(" {");
                     increaseIndent();
                     writeLine();
+                    if (resolver.getNodeCheckFlags(node) & 4096 /* AsyncMethodWithSuperBinding */) {
+                        writeLines("\nconst _super = (function (geti, seti) {\n    const cache = Object.create(null);\n    return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } });\n})(name => super[name], (name, value) => super[name] = value);");
+                        writeLine();
+                    }
+                    else if (resolver.getNodeCheckFlags(node) & 2048 /* AsyncMethodWithSuper */) {
+                        write("const _super = name => super[name];");
+                        writeLine();
+                    }
                     write("return");
                 }
                 write(" __awaiter(this");
@@ -35390,19 +37403,14 @@ var ts;
                 else {
                     write(", void 0, ");
                 }
-                if (promiseConstructor) {
+                if (languageVersion >= 2 /* ES6 */ || !promiseConstructor) {
+                    write("void 0");
+                }
+                else {
                     emitEntityNameAsExpression(promiseConstructor, /*useFallback*/ false);
                 }
-                else {
-                    write("Promise");
-                }
                 // Emit the call to __awaiter.
-                if (hasLexicalArguments) {
-                    write(", function* (_arguments)");
-                }
-                else {
-                    write(", function* ()");
-                }
+                write(", function* ()");
                 // Emit the signature and body for the inner generator function.
                 emitFunctionBody(node);
                 write(")");
@@ -35421,7 +37429,7 @@ var ts;
                     write(" { }");
                 }
                 else {
-                    if (node.body.kind === 195 /* Block */) {
+                    if (node.body.kind === 198 /* Block */) {
                         emitBlockFunctionBody(node, node.body);
                     }
                     else {
@@ -35480,10 +37488,10 @@ var ts;
                 write(" ");
                 // Unwrap all type assertions.
                 var current = body;
-                while (current.kind === 174 /* TypeAssertionExpression */) {
+                while (current.kind === 176 /* TypeAssertionExpression */) {
                     current = current.expression;
                 }
-                emitParenthesizedIf(body, current.kind === 168 /* ObjectLiteralExpression */);
+                emitParenthesizedIf(body, current.kind === 170 /* ObjectLiteralExpression */);
             }
             function emitDownLevelExpressionFunctionBody(node, body) {
                 write(" {");
@@ -35554,23 +37562,27 @@ var ts;
                 }
                 emitToken(16 /* CloseBraceToken */, body.statements.end);
             }
-            function findInitialSuperCall(ctor) {
-                if (ctor.body) {
-                    var statement = ctor.body.statements[0];
-                    if (statement && statement.kind === 198 /* ExpressionStatement */) {
-                        var expr = statement.expression;
-                        if (expr && expr.kind === 171 /* CallExpression */) {
-                            var func = expr.expression;
-                            if (func && func.kind === 95 /* SuperKeyword */) {
-                                return statement;
-                            }
-                        }
-                    }
+            /**
+             * 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, index) {
+                if (!ctor.body) {
+                    return undefined;
+                }
+                var statements = ctor.body.statements;
+                if (!statements || index >= statements.length) {
+                    return undefined;
+                }
+                var statement = statements[index];
+                if (statement.kind === 201 /* ExpressionStatement */) {
+                    return ts.isSuperCallExpression(statement.expression) ? statement : undefined;
                 }
             }
             function emitParameterPropertyAssignments(node) {
                 ts.forEach(node.parameters, function (param) {
-                    if (param.flags & 56 /* AccessibilityModifier */) {
+                    if (param.flags & 28 /* AccessibilityModifier */) {
                         writeLine();
                         emitStart(param);
                         emitStart(param.name);
@@ -35593,7 +37605,7 @@ var ts;
                     emitNodeWithCommentsAndWithoutSourcemap(memberName);
                     write("]");
                 }
-                else if (memberName.kind === 137 /* ComputedPropertyName */) {
+                else if (memberName.kind === 139 /* ComputedPropertyName */) {
                     emitComputedPropertyName(memberName);
                 }
                 else {
@@ -35605,7 +37617,7 @@ var ts;
                 var properties = [];
                 for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
                     var member = _b[_a];
-                    if (member.kind === 142 /* PropertyDeclaration */ && isStatic === ((member.flags & 64 /* Static */) !== 0) && member.initializer) {
+                    if (member.kind === 144 /* PropertyDeclaration */ && isStatic === ((member.flags & 32 /* Static */) !== 0) && member.initializer) {
                         properties.push(member);
                     }
                 }
@@ -35626,7 +37638,7 @@ var ts;
                     emit(receiver);
                 }
                 else {
-                    if (property.flags & 64 /* Static */) {
+                    if (property.flags & 32 /* Static */) {
                         emitDeclarationName(node);
                     }
                     else {
@@ -35645,11 +37657,11 @@ var ts;
             }
             function emitMemberFunctionsForES5AndLower(node) {
                 ts.forEach(node.members, function (member) {
-                    if (member.kind === 194 /* SemicolonClassElement */) {
+                    if (member.kind === 197 /* SemicolonClassElement */) {
                         writeLine();
                         write(";");
                     }
-                    else if (member.kind === 144 /* MethodDeclaration */ || node.kind === 143 /* MethodSignature */) {
+                    else if (member.kind === 146 /* MethodDeclaration */ || node.kind === 145 /* MethodSignature */) {
                         if (!member.body) {
                             return emitCommentsOnNotEmittedNode(member);
                         }
@@ -35666,7 +37678,7 @@ var ts;
                         write(";");
                         emitTrailingComments(member);
                     }
-                    else if (member.kind === 146 /* GetAccessor */ || member.kind === 147 /* SetAccessor */) {
+                    else if (member.kind === 148 /* GetAccessor */ || member.kind === 149 /* SetAccessor */) {
                         var accessors = ts.getAllAccessorDeclarations(node.members, member);
                         if (member === accessors.firstAccessor) {
                             writeLine();
@@ -35716,22 +37728,22 @@ var ts;
             function emitMemberFunctionsForES6AndHigher(node) {
                 for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
                     var member = _b[_a];
-                    if ((member.kind === 144 /* MethodDeclaration */ || node.kind === 143 /* MethodSignature */) && !member.body) {
+                    if ((member.kind === 146 /* MethodDeclaration */ || node.kind === 145 /* MethodSignature */) && !member.body) {
                         emitCommentsOnNotEmittedNode(member);
                     }
-                    else if (member.kind === 144 /* MethodDeclaration */ ||
-                        member.kind === 146 /* GetAccessor */ ||
-                        member.kind === 147 /* SetAccessor */) {
+                    else if (member.kind === 146 /* MethodDeclaration */ ||
+                        member.kind === 148 /* GetAccessor */ ||
+                        member.kind === 149 /* SetAccessor */) {
                         writeLine();
                         emitLeadingComments(member);
                         emitStart(member);
-                        if (member.flags & 64 /* Static */) {
+                        if (member.flags & 32 /* Static */) {
                             write("static ");
                         }
-                        if (member.kind === 146 /* GetAccessor */) {
+                        if (member.kind === 148 /* GetAccessor */) {
                             write("get ");
                         }
-                        else if (member.kind === 147 /* SetAccessor */) {
+                        else if (member.kind === 149 /* SetAccessor */) {
                             write("set ");
                         }
                         if (member.asteriskToken) {
@@ -35742,7 +37754,7 @@ var ts;
                         emitEnd(member);
                         emitTrailingComments(member);
                     }
-                    else if (member.kind === 194 /* SemicolonClassElement */) {
+                    else if (member.kind === 197 /* SemicolonClassElement */) {
                         writeLine();
                         write(";");
                     }
@@ -35771,11 +37783,11 @@ var ts;
                 var hasInstancePropertyWithInitializer = false;
                 // Emit the constructor overload pinned comments
                 ts.forEach(node.members, function (member) {
-                    if (member.kind === 145 /* Constructor */ && !member.body) {
+                    if (member.kind === 147 /* Constructor */ && !member.body) {
                         emitCommentsOnNotEmittedNode(member);
                     }
                     // Check if there is any non-static property assignment
-                    if (member.kind === 142 /* PropertyDeclaration */ && member.initializer && (member.flags & 64 /* Static */) === 0) {
+                    if (member.kind === 144 /* PropertyDeclaration */ && member.initializer && (member.flags & 32 /* Static */) === 0) {
                         hasInstancePropertyWithInitializer = true;
                     }
                 });
@@ -35829,7 +37841,7 @@ var ts;
                     emitDefaultValueAssignments(ctor);
                     emitRestParameter(ctor);
                     if (baseTypeElement) {
-                        superCall = findInitialSuperCall(ctor);
+                        superCall = getSuperCallAtGivenIndex(ctor, startIndex);
                         if (superCall) {
                             writeLine();
                             emit(superCall);
@@ -35883,68 +37895,115 @@ var ts;
                 else {
                     emitClassLikeDeclarationForES6AndHigher(node);
                 }
-                if (modulekind !== 5 /* ES6 */ && node.parent === currentSourceFile && node.name) {
+                if (modulekind !== ts.ModuleKind.ES6 && node.parent === currentSourceFile && node.name) {
                     emitExportMemberAssignments(node.name);
                 }
             }
             function emitClassLikeDeclarationForES6AndHigher(node) {
-                var thisNodeIsDecorated = ts.nodeIsDecorated(node);
-                if (node.kind === 217 /* ClassDeclaration */) {
-                    if (thisNodeIsDecorated) {
-                        // To preserve the correct runtime semantics when decorators are applied to the class,
-                        // the emit needs to follow one of the following rules:
+                var decoratedClassAlias;
+                var isHoistedDeclarationInSystemModule = shouldHoistDeclarationInSystemJsModule(node);
+                var isDecorated = ts.nodeIsDecorated(node);
+                var rewriteAsClassExpression = isDecorated || isHoistedDeclarationInSystemModule;
+                if (node.kind === 220 /* ClassDeclaration */) {
+                    if (rewriteAsClassExpression) {
+                        // When we emit an ES6 class that has a class decorator, we must tailor the
+                        // emit to certain specific cases.
                         //
-                        // * For a local class declaration:
+                        // In the simplest case, we emit the class declaration as a let declaration, and
+                        // evaluate decorators after the close of the class body:
                         //
-                        //     @dec class C {
-                        //     }
+                        //  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]
                         //
-                        //   The emit should be:
+                        // 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.
                         //
-                        //     let C = class {
-                        //     };
-                        //     C = __decorate([dec], C);
+                        // 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:
                         //
-                        // * For an exported class declaration:
+                        //  TypeScript                      | Javascript
+                        //  --------------------------------|------------------------------------
+                        //  @dec                            | let C_1;
+                        //  class C {                       | let C = C_1 = class C {
+                        //    static x() { return C.y; }    |   static x() { return C_1.y; }
+                        //    static y = 1;                 | }
+                        //  }                               | C.y = 1;
+                        //                                  | C = C_1 = __decorate([dec], C);
+                        //  --------------------------------|------------------------------------
+                        //  @dec                            | let C_1;
+                        //  export class C {                | export let C = C_1 = class C {
+                        //    static x() { return C.y; }    |   static x() { return C_1.y; }
+                        //    static y = 1;                 | }
+                        //  }                               | C.y = 1;
+                        //                                  | C = C_1 = __decorate([dec], C);
+                        //  ---------------------------------------------------------------------
+                        //  [Example 2]
                         //
-                        //     @dec export class C {
-                        //     }
+                        // If a class declaration is the default export of a module, we instead emit
+                        // the export after the decorated declaration:
                         //
-                        //   The emit should be:
+                        //  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]
                         //
-                        //     export let C = class {
-                        //     };
-                        //     C = __decorate([dec], 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:
                         //
-                        // * For a default export of a class declaration with a name:
-                        //
-                        //     @dec default export class C {
-                        //     }
-                        //
-                        //   The emit should be:
-                        //
-                        //     let C = class {
-                        //     }
-                        //     C = __decorate([dec], C);
-                        //     export default C;
-                        //
-                        // * For a default export of a class declaration without a name:
-                        //
-                        //     @dec default export class {
-                        //     }
-                        //
-                        //   The emit should be:
-                        //
-                        //     let _default = class {
-                        //     }
-                        //     _default = __decorate([dec], _default);
-                        //     export default _default;
+                        //  TypeScript                      | Javascript
+                        //  --------------------------------|------------------------------------
+                        //  @dec                            | let C_1;
+                        //  export default class C {        | let C = C_1 = class C {
+                        //    static x() { return C.y; }    |   static x() { return C_1.y; }
+                        //    static y = 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) & 524288 /* ClassWithBodyScopedClassBinding */) {
+                            decoratedClassAlias = ts.unescapeIdentifier(makeUniqueName(node.name ? node.name.text : "default"));
+                            decoratedClassAliases[ts.getNodeId(node)] = decoratedClassAlias;
+                            write("let " + decoratedClassAlias + ";");
+                            writeLine();
+                        }
                         if (isES6ExportedDeclaration(node) && !(node.flags & 512 /* Default */)) {
                             write("export ");
                         }
-                        write("let ");
+                        if (!isHoistedDeclarationInSystemModule) {
+                            write("let ");
+                        }
                         emitDeclarationName(node);
+                        if (decoratedClassAlias !== undefined) {
+                            write(" = " + decoratedClassAlias);
+                        }
                         write(" = ");
                     }
                     else if (isES6ExportedDeclaration(node)) {
@@ -35966,7 +38025,7 @@ var ts;
                 // This keeps the expression as an expression, while ensuring that the static parts
                 // of it have been initialized by the time it is used.
                 var staticProperties = getInitializedProperties(node, /*isStatic*/ true);
-                var isClassExpressionWithStaticProperties = staticProperties.length > 0 && node.kind === 189 /* ClassExpression */;
+                var isClassExpressionWithStaticProperties = staticProperties.length > 0 && node.kind === 191 /* ClassExpression */;
                 var tempVariable;
                 if (isClassExpressionWithStaticProperties) {
                     tempVariable = createAndRecordTempVariable(0 /* Auto */);
@@ -35979,7 +38038,7 @@ var ts;
                 // emit name if
                 // - node has a name
                 // - this is default export with static initializers
-                if ((node.name || (node.flags & 512 /* Default */ && (staticProperties.length > 0 || modulekind !== 5 /* ES6 */))) && !thisNodeIsDecorated) {
+                if (node.name || (node.flags & 512 /* Default */ && (staticProperties.length > 0 || modulekind !== ts.ModuleKind.ES6) && !rewriteAsClassExpression)) {
                     write(" ");
                     emitDeclarationName(node);
                 }
@@ -35996,15 +38055,8 @@ var ts;
                 decreaseIndent();
                 writeLine();
                 emitToken(16 /* CloseBraceToken */, node.members.end);
-                // TODO(rbuckton): Need to go back to `let _a = class C {}` approach, removing the defineProperty call for now.
-                // For a decorated class, we need to assign its name (if it has one). This is because we emit
-                // the class as a class expression to avoid the double-binding of the identifier:
-                //
-                //   let C = class {
-                //   }
-                //   Object.defineProperty(C, "name", { value: "C", configurable: true });
-                //
-                if (thisNodeIsDecorated) {
+                if (rewriteAsClassExpression) {
+                    decoratedClassAliases[ts.getNodeId(node)] = undefined;
                     write(";");
                 }
                 // Emit static property assignment. Because classDeclaration is lexically evaluated,
@@ -36028,12 +38080,12 @@ var ts;
                 else {
                     writeLine();
                     emitPropertyDeclarations(node, staticProperties);
-                    emitDecoratorsOfClass(node);
+                    emitDecoratorsOfClass(node, decoratedClassAlias);
                 }
-                if (!(node.flags & 2 /* Export */)) {
+                if (!(node.flags & 1 /* Export */)) {
                     return;
                 }
-                if (modulekind !== 5 /* ES6 */) {
+                if (modulekind !== ts.ModuleKind.ES6) {
                     emitExportMemberAssignment(node);
                 }
                 else {
@@ -36041,14 +38093,14 @@ var ts;
                     // module), export it
                     if (node.flags & 512 /* Default */) {
                         // if this is a top level default export of decorated class, write the export after the declaration.
-                        if (thisNodeIsDecorated) {
+                        if (isDecorated) {
                             writeLine();
                             write("export default ");
                             emitDeclarationName(node);
                             write(";");
                         }
                     }
-                    else if (node.parent.kind !== 251 /* SourceFile */) {
+                    else if (node.parent.kind !== 255 /* SourceFile */) {
                         writeLine();
                         emitStart(node);
                         emitModuleMemberName(node);
@@ -36060,7 +38112,7 @@ var ts;
                 }
             }
             function emitClassLikeDeclarationBelowES6(node) {
-                if (node.kind === 217 /* ClassDeclaration */) {
+                if (node.kind === 220 /* ClassDeclaration */) {
                     // source file level classes in system modules are hoisted so 'var's for them are already defined
                     if (!shouldHoistDeclarationInSystemJsModule(node)) {
                         write("var ");
@@ -36098,7 +38150,7 @@ var ts;
                 emitMemberFunctionsForES5AndLower(node);
                 emitPropertyDeclarations(node, getInitializedProperties(node, /*isStatic*/ true));
                 writeLine();
-                emitDecoratorsOfClass(node);
+                emitDecoratorsOfClass(node, /*decoratedClassAlias*/ undefined);
                 writeLine();
                 emitToken(16 /* CloseBraceToken */, node.members.end, function () {
                     write("return ");
@@ -36121,26 +38173,26 @@ var ts;
                     emit(baseTypeNode.expression);
                 }
                 write("))");
-                if (node.kind === 217 /* ClassDeclaration */) {
+                if (node.kind === 220 /* ClassDeclaration */) {
                     write(";");
                 }
                 emitEnd(node);
-                if (node.kind === 217 /* ClassDeclaration */) {
+                if (node.kind === 220 /* ClassDeclaration */) {
                     emitExportMemberAssignment(node);
                 }
             }
             function emitClassMemberPrefix(node, member) {
                 emitDeclarationName(node);
-                if (!(member.flags & 64 /* Static */)) {
+                if (!(member.flags & 32 /* Static */)) {
                     write(".prototype");
                 }
             }
-            function emitDecoratorsOfClass(node) {
+            function emitDecoratorsOfClass(node, decoratedClassAlias) {
                 emitDecoratorsOfMembers(node, /*staticFlag*/ 0);
-                emitDecoratorsOfMembers(node, 64 /* Static */);
-                emitDecoratorsOfConstructor(node);
+                emitDecoratorsOfMembers(node, 32 /* Static */);
+                emitDecoratorsOfConstructor(node, decoratedClassAlias);
             }
-            function emitDecoratorsOfConstructor(node) {
+            function emitDecoratorsOfConstructor(node, decoratedClassAlias) {
                 var decorators = node.decorators;
                 var constructor = ts.getFirstConstructorWithBody(node);
                 var firstParameterDecorator = constructor && ts.forEach(constructor.parameters, function (parameter) { return parameter.decorators; });
@@ -36161,6 +38213,9 @@ var ts;
                 writeLine();
                 emitStart(node.decorators || firstParameterDecorator);
                 emitDeclarationName(node);
+                if (decoratedClassAlias !== undefined) {
+                    write(" = " + decoratedClassAlias);
+                }
                 write(" = __decorate([");
                 increaseIndent();
                 writeLine();
@@ -36183,7 +38238,7 @@ var ts;
                 for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
                     var member = _b[_a];
                     // only emit members in the correct group
-                    if ((member.flags & 64 /* Static */) !== staticFlag) {
+                    if ((member.flags & 32 /* Static */) !== staticFlag) {
                         continue;
                     }
                     // skip members that cannot be decorated (such as the constructor)
@@ -36209,7 +38264,7 @@ var ts;
                     else {
                         decorators = member.decorators;
                         // we only decorate the parameters here if this is a method
-                        if (member.kind === 144 /* MethodDeclaration */) {
+                        if (member.kind === 146 /* MethodDeclaration */) {
                             functionLikeMember = member;
                         }
                     }
@@ -36266,7 +38321,7 @@ var ts;
                     write(", ");
                     emitExpressionForPropertyName(member.name);
                     if (languageVersion > 0 /* ES3 */) {
-                        if (member.kind !== 142 /* PropertyDeclaration */) {
+                        if (member.kind !== 144 /* 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");
@@ -36286,19 +38341,19 @@ var ts;
             function emitDecoratorsOfParameters(node, leadingComma) {
                 var argumentsWritten = 0;
                 if (node) {
-                    var parameterIndex = 0;
+                    var parameterIndex_1 = 0;
                     for (var _a = 0, _b = node.parameters; _a < _b.length; _a++) {
                         var parameter = _b[_a];
                         if (ts.nodeIsDecorated(parameter)) {
                             var decorators = parameter.decorators;
                             argumentsWritten += emitList(decorators, 0, decorators.length, /*multiLine*/ true, /*trailingComma*/ false, /*leadingComma*/ leadingComma, /*noTrailingNewLine*/ true, function (decorator) {
-                                write("__param(" + parameterIndex + ", ");
+                                write("__param(" + parameterIndex_1 + ", ");
                                 emit(decorator.expression);
                                 write(")");
                             });
                             leadingComma = true;
                         }
-                        parameterIndex++;
+                        parameterIndex_1++;
                     }
                 }
                 return argumentsWritten;
@@ -36308,10 +38363,10 @@ var ts;
                 // The caller should have already tested whether the node has decorators and whether the emitDecoratorMetadata
                 // compiler option is set.
                 switch (node.kind) {
-                    case 144 /* MethodDeclaration */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
-                    case 142 /* PropertyDeclaration */:
+                    case 146 /* MethodDeclaration */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
+                    case 144 /* PropertyDeclaration */:
                         return true;
                 }
                 return false;
@@ -36321,7 +38376,7 @@ var ts;
                 // The caller should have already tested whether the node has decorators and whether the emitDecoratorMetadata
                 // compiler option is set.
                 switch (node.kind) {
-                    case 144 /* MethodDeclaration */:
+                    case 146 /* MethodDeclaration */:
                         return true;
                 }
                 return false;
@@ -36331,9 +38386,9 @@ var ts;
                 // The caller should have already tested whether the node has decorators and whether the emitDecoratorMetadata
                 // compiler option is set.
                 switch (node.kind) {
-                    case 217 /* ClassDeclaration */:
-                    case 144 /* MethodDeclaration */:
-                    case 147 /* SetAccessor */:
+                    case 220 /* ClassDeclaration */:
+                    case 146 /* MethodDeclaration */:
+                    case 149 /* SetAccessor */:
                         return true;
                 }
                 return false;
@@ -36351,19 +38406,19 @@ var ts;
                 //
                 // For rules on serializing type annotations, see `serializeTypeNode`.
                 switch (node.kind) {
-                    case 217 /* ClassDeclaration */:
+                    case 220 /* ClassDeclaration */:
                         write("Function");
                         return;
-                    case 142 /* PropertyDeclaration */:
+                    case 144 /* PropertyDeclaration */:
                         emitSerializedTypeNode(node.type);
                         return;
-                    case 139 /* Parameter */:
+                    case 141 /* Parameter */:
                         emitSerializedTypeNode(node.type);
                         return;
-                    case 146 /* GetAccessor */:
+                    case 148 /* GetAccessor */:
                         emitSerializedTypeNode(node.type);
                         return;
-                    case 147 /* SetAccessor */:
+                    case 149 /* SetAccessor */:
                         emitSerializedTypeNode(ts.getSetAccessorTypeAnnotationNode(node));
                         return;
                 }
@@ -36379,40 +38434,40 @@ var ts;
                         case 103 /* VoidKeyword */:
                             write("void 0");
                             return;
-                        case 161 /* ParenthesizedType */:
+                        case 163 /* ParenthesizedType */:
                             emitSerializedTypeNode(node.type);
                             return;
-                        case 153 /* FunctionType */:
-                        case 154 /* ConstructorType */:
+                        case 155 /* FunctionType */:
+                        case 156 /* ConstructorType */:
                             write("Function");
                             return;
-                        case 157 /* ArrayType */:
-                        case 158 /* TupleType */:
+                        case 159 /* ArrayType */:
+                        case 160 /* TupleType */:
                             write("Array");
                             return;
-                        case 151 /* TypePredicate */:
+                        case 153 /* TypePredicate */:
                         case 120 /* BooleanKeyword */:
                             write("Boolean");
                             return;
-                        case 130 /* StringKeyword */:
-                        case 163 /* StringLiteralType */:
+                        case 131 /* StringKeyword */:
+                        case 165 /* StringLiteralType */:
                             write("String");
                             return;
-                        case 128 /* NumberKeyword */:
+                        case 129 /* NumberKeyword */:
                             write("Number");
                             return;
-                        case 131 /* SymbolKeyword */:
+                        case 132 /* SymbolKeyword */:
                             write("Symbol");
                             return;
-                        case 152 /* TypeReference */:
+                        case 154 /* TypeReference */:
                             emitSerializedTypeReferenceNode(node);
                             return;
-                        case 155 /* TypeQuery */:
-                        case 156 /* TypeLiteral */:
-                        case 159 /* UnionType */:
-                        case 160 /* IntersectionType */:
+                        case 157 /* TypeQuery */:
+                        case 158 /* TypeLiteral */:
+                        case 161 /* UnionType */:
+                        case 162 /* IntersectionType */:
                         case 117 /* AnyKeyword */:
-                        case 162 /* ThisType */:
+                        case 164 /* ThisType */:
                             break;
                         default:
                             ts.Debug.fail("Cannot serialize unexpected type node.");
@@ -36484,8 +38539,8 @@ var ts;
                 //
                 // For the rules on serializing the type of each parameter declaration, see `serializeTypeOfDeclaration`.
                 if (node) {
-                    var valueDeclaration;
-                    if (node.kind === 217 /* ClassDeclaration */) {
+                    var valueDeclaration = void 0;
+                    if (node.kind === 220 /* ClassDeclaration */) {
                         valueDeclaration = ts.getFirstConstructorWithBody(node);
                     }
                     else if (ts.isFunctionLike(node) && ts.nodeIsPresent(node.body)) {
@@ -36501,10 +38556,10 @@ var ts;
                                 }
                                 if (parameters[i].dotDotDotToken) {
                                     var parameterType = parameters[i].type;
-                                    if (parameterType.kind === 157 /* ArrayType */) {
+                                    if (parameterType.kind === 159 /* ArrayType */) {
                                         parameterType = parameterType.elementType;
                                     }
-                                    else if (parameterType.kind === 152 /* TypeReference */ && parameterType.typeArguments && parameterType.typeArguments.length === 1) {
+                                    else if (parameterType.kind === 154 /* TypeReference */ && parameterType.typeArguments && parameterType.typeArguments.length === 1) {
                                         parameterType = parameterType.typeArguments[0];
                                     }
                                     else {
@@ -36581,7 +38636,7 @@ var ts;
                 if (!shouldHoistDeclarationInSystemJsModule(node)) {
                     // do not emit var if variable was already hoisted
                     var isES6ExportedEnum = isES6ExportedDeclaration(node);
-                    if (!(node.flags & 2 /* Export */) || (isES6ExportedEnum && isFirstDeclarationOfKind(node, node.symbol && node.symbol.declarations, 220 /* EnumDeclaration */))) {
+                    if (!(node.flags & 1 /* Export */) || (isES6ExportedEnum && isFirstDeclarationOfKind(node, node.symbol && node.symbol.declarations, 223 /* EnumDeclaration */))) {
                         emitStart(node);
                         if (isES6ExportedEnum) {
                             write("export ");
@@ -36610,7 +38665,7 @@ var ts;
                 emitModuleMemberName(node);
                 write(" = {}));");
                 emitEnd(node);
-                if (!isES6ExportedDeclaration(node) && node.flags & 2 /* Export */ && !shouldHoistDeclarationInSystemJsModule(node)) {
+                if (!isES6ExportedDeclaration(node) && node.flags & 1 /* Export */ && !shouldHoistDeclarationInSystemJsModule(node)) {
                     // do not emit var if variable was already hoisted
                     writeLine();
                     emitStart(node);
@@ -36621,8 +38676,8 @@ var ts;
                     emitEnd(node);
                     write(";");
                 }
-                if (modulekind !== 5 /* ES6 */ && node.parent === currentSourceFile) {
-                    if (modulekind === 4 /* System */ && (node.flags & 2 /* Export */)) {
+                if (modulekind !== ts.ModuleKind.ES6 && node.parent === currentSourceFile) {
+                    if (modulekind === ts.ModuleKind.System && (node.flags & 1 /* Export */)) {
                         // write the call to exporter for enum
                         writeLine();
                         write(exportFunctionForFile + "(\"");
@@ -36663,7 +38718,7 @@ var ts;
                 }
             }
             function getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration) {
-                if (moduleDeclaration.body.kind === 221 /* ModuleDeclaration */) {
+                if (moduleDeclaration.body.kind === 224 /* ModuleDeclaration */) {
                     var recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration.body);
                     return recursiveInnerModule || moduleDeclaration.body;
                 }
@@ -36687,7 +38742,7 @@ var ts;
                 var emitVarForModule = !hoistedInDeclarationScope && !isModuleMergedWithES6Class(node);
                 if (emitVarForModule) {
                     var isES6ExportedNamespace = isES6ExportedDeclaration(node);
-                    if (!isES6ExportedNamespace || isFirstDeclarationOfKind(node, node.symbol && node.symbol.declarations, 221 /* ModuleDeclaration */)) {
+                    if (!isES6ExportedNamespace || isFirstDeclarationOfKind(node, node.symbol && node.symbol.declarations, 224 /* ModuleDeclaration */)) {
                         emitStart(node);
                         if (isES6ExportedNamespace) {
                             write("export ");
@@ -36705,7 +38760,7 @@ var ts;
                 write(getGeneratedNameForNode(node));
                 emitEnd(node.name);
                 write(") ");
-                if (node.body.kind === 222 /* ModuleBlock */) {
+                if (node.body.kind === 225 /* ModuleBlock */) {
                     var saveConvertedLoopState = convertedLoopState;
                     var saveTempFlags = tempFlags;
                     var saveTempVariables = tempVariables;
@@ -36731,7 +38786,7 @@ var ts;
                 }
                 write(")(");
                 // write moduleDecl = containingModule.m only if it is not exported es6 module member
-                if ((node.flags & 2 /* Export */) && !isES6ExportedDeclaration(node)) {
+                if ((node.flags & 1 /* Export */) && !isES6ExportedDeclaration(node)) {
                     emit(node.name);
                     write(" = ");
                 }
@@ -36741,7 +38796,7 @@ var ts;
                 write(" = {}));");
                 emitEnd(node);
                 if (!isES6ExportedDeclaration(node) && node.name.kind === 69 /* Identifier */ && node.parent === currentSourceFile) {
-                    if (modulekind === 4 /* System */ && (node.flags & 2 /* Export */)) {
+                    if (modulekind === ts.ModuleKind.System && (node.flags & 1 /* Export */)) {
                         writeLine();
                         write(exportFunctionForFile + "(\"");
                         emitDeclarationName(node);
@@ -36781,16 +38836,16 @@ var ts;
                 }
             }
             function getNamespaceDeclarationNode(node) {
-                if (node.kind === 224 /* ImportEqualsDeclaration */) {
+                if (node.kind === 228 /* ImportEqualsDeclaration */) {
                     return node;
                 }
                 var importClause = node.importClause;
-                if (importClause && importClause.namedBindings && importClause.namedBindings.kind === 227 /* NamespaceImport */) {
+                if (importClause && importClause.namedBindings && importClause.namedBindings.kind === 231 /* NamespaceImport */) {
                     return importClause.namedBindings;
                 }
             }
             function isDefaultImport(node) {
-                return node.kind === 225 /* ImportDeclaration */ && node.importClause && !!node.importClause.name;
+                return node.kind === 229 /* ImportDeclaration */ && node.importClause && !!node.importClause.name;
             }
             function emitExportImportAssignments(node) {
                 if (ts.isAliasSymbolDeclaration(node) && resolver.isValueAliasDeclaration(node)) {
@@ -36799,7 +38854,7 @@ var ts;
                 ts.forEachChild(node, emitExportImportAssignments);
             }
             function emitImportDeclaration(node) {
-                if (modulekind !== 5 /* ES6 */) {
+                if (modulekind !== ts.ModuleKind.ES6) {
                     return emitExternalImportDeclaration(node);
                 }
                 // ES6 import
@@ -36818,7 +38873,7 @@ var ts;
                         if (shouldEmitNamedBindings) {
                             emitLeadingComments(node.importClause.namedBindings);
                             emitStart(node.importClause.namedBindings);
-                            if (node.importClause.namedBindings.kind === 227 /* NamespaceImport */) {
+                            if (node.importClause.namedBindings.kind === 231 /* NamespaceImport */) {
                                 write("* as ");
                                 emit(node.importClause.namedBindings.name);
                             }
@@ -36844,16 +38899,19 @@ var ts;
             }
             function emitExternalImportDeclaration(node) {
                 if (ts.contains(externalImports, node)) {
-                    var isExportedImport = node.kind === 224 /* ImportEqualsDeclaration */ && (node.flags & 2 /* Export */) !== 0;
+                    var isExportedImport = node.kind === 228 /* ImportEqualsDeclaration */ && (node.flags & 1 /* Export */) !== 0;
                     var namespaceDeclaration = getNamespaceDeclarationNode(node);
-                    if (modulekind !== 2 /* AMD */) {
+                    var varOrConst = (languageVersion <= 1 /* ES5 */) ? "var " : "const ";
+                    if (modulekind !== ts.ModuleKind.AMD) {
                         emitLeadingComments(node);
                         emitStart(node);
                         if (namespaceDeclaration && !isDefaultImport(node)) {
                             // import x = require("foo")
                             // import * as x from "foo"
-                            if (!isExportedImport)
-                                write("var ");
+                            if (!isExportedImport) {
+                                write(varOrConst);
+                            }
+                            ;
                             emitModuleMemberName(namespaceDeclaration);
                             write(" = ");
                         }
@@ -36863,9 +38921,9 @@ var ts;
                             // import { x, y } from "foo"
                             // import d, * as x from "foo"
                             // import d, { x, y } from "foo"
-                            var isNakedImport = 225 /* ImportDeclaration */ && !node.importClause;
+                            var isNakedImport = 229 /* ImportDeclaration */ && !node.importClause;
                             if (!isNakedImport) {
-                                write("var ");
+                                write(varOrConst);
                                 write(getGeneratedNameForNode(node));
                                 write(" = ");
                             }
@@ -36892,7 +38950,7 @@ var ts;
                         }
                         else if (namespaceDeclaration && isDefaultImport(node)) {
                             // import d, * as x from "foo"
-                            write("var ");
+                            write(varOrConst);
                             emitModuleMemberName(namespaceDeclaration);
                             write(" = ");
                             write(getGeneratedNameForNode(node));
@@ -36926,7 +38984,7 @@ var ts;
                             write("export ");
                             write("var ");
                         }
-                        else if (!(node.flags & 2 /* Export */)) {
+                        else if (!(node.flags & 1 /* Export */)) {
                             write("var ");
                         }
                     }
@@ -36948,14 +39006,14 @@ var ts;
                 }
             }
             function emitExportDeclaration(node) {
-                ts.Debug.assert(modulekind !== 4 /* System */);
-                if (modulekind !== 5 /* ES6 */) {
+                ts.Debug.assert(modulekind !== ts.ModuleKind.System);
+                if (modulekind !== ts.ModuleKind.ES6) {
                     if (node.moduleSpecifier && (!node.exportClause || resolver.isValueAliasDeclaration(node))) {
                         emitStart(node);
                         var generatedName = getGeneratedNameForNode(node);
                         if (node.exportClause) {
                             // export { x, y, ... } from "foo"
-                            if (modulekind !== 2 /* AMD */) {
+                            if (modulekind !== ts.ModuleKind.AMD) {
                                 write("var ");
                                 write(generatedName);
                                 write(" = ");
@@ -36984,7 +39042,7 @@ var ts;
                             if (hasExportStarsToExportValues && resolver.moduleExportsSomeValue(node.moduleSpecifier)) {
                                 writeLine();
                                 write("__export(");
-                                if (modulekind !== 2 /* AMD */) {
+                                if (modulekind !== ts.ModuleKind.AMD) {
                                     emitRequire(ts.getExternalModuleName(node));
                                 }
                                 else {
@@ -37017,7 +39075,7 @@ var ts;
                 }
             }
             function emitExportOrImportSpecifierList(specifiers, shouldEmit) {
-                ts.Debug.assert(modulekind === 5 /* ES6 */);
+                ts.Debug.assert(modulekind === ts.ModuleKind.ES6);
                 var needsComma = false;
                 for (var _a = 0, specifiers_1 = specifiers; _a < specifiers_1.length; _a++) {
                     var specifier = specifiers_1[_a];
@@ -37036,14 +39094,14 @@ var ts;
             }
             function emitExportAssignment(node) {
                 if (!node.isExportEquals && resolver.isValueAliasDeclaration(node)) {
-                    if (modulekind === 5 /* ES6 */) {
+                    if (modulekind === ts.ModuleKind.ES6) {
                         writeLine();
                         emitStart(node);
                         write("export default ");
                         var expression = node.expression;
                         emit(expression);
-                        if (expression.kind !== 216 /* FunctionDeclaration */ &&
-                            expression.kind !== 217 /* ClassDeclaration */) {
+                        if (expression.kind !== 219 /* FunctionDeclaration */ &&
+                            expression.kind !== 220 /* ClassDeclaration */) {
                             write(";");
                         }
                         emitEnd(node);
@@ -37051,7 +39109,7 @@ var ts;
                     else {
                         writeLine();
                         emitStart(node);
-                        if (modulekind === 4 /* System */) {
+                        if (modulekind === ts.ModuleKind.System) {
                             write(exportFunctionForFile + "(\"default\",");
                             emit(node.expression);
                             write(")");
@@ -37060,7 +39118,7 @@ var ts;
                             emitEs6ExportDefaultCompat(node);
                             emitContainingModuleName(node);
                             if (languageVersion === 0 /* ES3 */) {
-                                write("[\"default\"] = ");
+                                write('["default"] = ');
                             }
                             else {
                                 write(".default = ");
@@ -37080,7 +39138,7 @@ var ts;
                 for (var _a = 0, _b = sourceFile.statements; _a < _b.length; _a++) {
                     var node = _b[_a];
                     switch (node.kind) {
-                        case 225 /* ImportDeclaration */:
+                        case 229 /* ImportDeclaration */:
                             if (!node.importClause ||
                                 resolver.isReferencedAliasDeclaration(node.importClause, /*checkChildren*/ true)) {
                                 // import "mod"
@@ -37090,13 +39148,13 @@ var ts;
                                 externalImports.push(node);
                             }
                             break;
-                        case 224 /* ImportEqualsDeclaration */:
-                            if (node.moduleReference.kind === 235 /* ExternalModuleReference */ && resolver.isReferencedAliasDeclaration(node)) {
+                        case 228 /* ImportEqualsDeclaration */:
+                            if (node.moduleReference.kind === 239 /* ExternalModuleReference */ && resolver.isReferencedAliasDeclaration(node)) {
                                 // import x = require("mod") where x is referenced
                                 externalImports.push(node);
                             }
                             break;
-                        case 231 /* ExportDeclaration */:
+                        case 235 /* ExportDeclaration */:
                             if (node.moduleSpecifier) {
                                 if (!node.exportClause) {
                                     // export * from "mod"
@@ -37114,12 +39172,12 @@ var ts;
                                 // export { x, y }
                                 for (var _c = 0, _d = node.exportClause.elements; _c < _d.length; _c++) {
                                     var specifier = _d[_c];
-                                    var name_27 = (specifier.propertyName || specifier.name).text;
-                                    (exportSpecifiers[name_27] || (exportSpecifiers[name_27] = [])).push(specifier);
+                                    var name_29 = (specifier.propertyName || specifier.name).text;
+                                    (exportSpecifiers[name_29] || (exportSpecifiers[name_29] = [])).push(specifier);
                                 }
                             }
                             break;
-                        case 230 /* ExportAssignment */:
+                        case 234 /* ExportAssignment */:
                             if (node.isExportEquals && !exportEquals) {
                                 // export = x
                                 exportEquals = node;
@@ -37145,18 +39203,18 @@ var ts;
                 if (namespaceDeclaration && !isDefaultImport(node)) {
                     return ts.getTextOfNodeFromSourceText(currentText, namespaceDeclaration.name);
                 }
-                if (node.kind === 225 /* ImportDeclaration */ && node.importClause) {
+                if (node.kind === 229 /* ImportDeclaration */ && node.importClause) {
                     return getGeneratedNameForNode(node);
                 }
-                if (node.kind === 231 /* ExportDeclaration */ && node.moduleSpecifier) {
+                if (node.kind === 235 /* ExportDeclaration */ && node.moduleSpecifier) {
                     return getGeneratedNameForNode(node);
                 }
             }
             function getExternalModuleNameText(importNode, emitRelativePathAsModuleName) {
                 if (emitRelativePathAsModuleName) {
-                    var name_28 = getExternalModuleNameFromDeclaration(host, resolver, importNode);
-                    if (name_28) {
-                        return "\"" + name_28 + "\"";
+                    var name_30 = getExternalModuleNameFromDeclaration(host, resolver, importNode);
+                    if (name_30) {
+                        return "\"" + name_30 + "\"";
                     }
                 }
                 var moduleName = ts.getExternalModuleName(importNode);
@@ -37174,8 +39232,8 @@ var ts;
                 for (var _a = 0, externalImports_1 = externalImports; _a < externalImports_1.length; _a++) {
                     var importNode = externalImports_1[_a];
                     // do not create variable declaration for exports and imports that lack import clause
-                    var skipNode = importNode.kind === 231 /* ExportDeclaration */ ||
-                        (importNode.kind === 225 /* ImportDeclaration */ && !importNode.importClause);
+                    var skipNode = importNode.kind === 235 /* ExportDeclaration */ ||
+                        (importNode.kind === 229 /* ImportDeclaration */ && !importNode.importClause);
                     if (skipNode) {
                         continue;
                     }
@@ -37196,7 +39254,7 @@ var ts;
                 // 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.
+                // 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;
@@ -37208,7 +39266,7 @@ var ts;
                     var hasExportDeclarationWithExportClause = false;
                     for (var _a = 0, externalImports_2 = externalImports; _a < externalImports_2.length; _a++) {
                         var externalImport = externalImports_2[_a];
-                        if (externalImport.kind === 231 /* ExportDeclaration */ && externalImport.exportClause) {
+                        if (externalImport.kind === 235 /* ExportDeclaration */ && externalImport.exportClause) {
                             hasExportDeclarationWithExportClause = true;
                             break;
                         }
@@ -37240,7 +39298,7 @@ var ts;
                 }
                 for (var _d = 0, externalImports_3 = externalImports; _d < externalImports_3.length; _d++) {
                     var externalImport = externalImports_3[_d];
-                    if (externalImport.kind !== 231 /* ExportDeclaration */) {
+                    if (externalImport.kind !== 235 /* ExportDeclaration */) {
                         continue;
                     }
                     var exportDecl = externalImport;
@@ -37328,12 +39386,12 @@ var ts;
                     var seen = {};
                     for (var i = 0; i < hoistedVars.length; i++) {
                         var local = hoistedVars[i];
-                        var name_29 = local.kind === 69 /* Identifier */
+                        var name_31 = local.kind === 69 /* Identifier */
                             ? local
                             : local.name;
-                        if (name_29) {
+                        if (name_31) {
                             // do not emit duplicate entries (in case of declaration merging) in the list of hoisted variables
-                            var text = ts.unescapeIdentifier(name_29.text);
+                            var text = ts.unescapeIdentifier(name_31.text);
                             if (ts.hasProperty(seen, text)) {
                                 continue;
                             }
@@ -37344,14 +39402,14 @@ var ts;
                         if (i !== 0) {
                             write(", ");
                         }
-                        if (local.kind === 217 /* ClassDeclaration */ || local.kind === 221 /* ModuleDeclaration */ || local.kind === 220 /* EnumDeclaration */) {
+                        if (local.kind === 220 /* ClassDeclaration */ || local.kind === 224 /* ModuleDeclaration */ || local.kind === 223 /* EnumDeclaration */) {
                             emitDeclarationName(local);
                         }
                         else {
                             emit(local);
                         }
                         var flags = ts.getCombinedNodeFlags(local.kind === 69 /* Identifier */ ? local.parent : local);
-                        if (flags & 2 /* Export */) {
+                        if (flags & 1 /* Export */) {
                             if (!exportedDeclarations) {
                                 exportedDeclarations = [];
                             }
@@ -37365,7 +39423,7 @@ var ts;
                         var f = hoistedFunctionDeclarations_1[_a];
                         writeLine();
                         emit(f);
-                        if (f.flags & 2 /* Export */) {
+                        if (f.flags & 1 /* Export */) {
                             if (!exportedDeclarations) {
                                 exportedDeclarations = [];
                             }
@@ -37375,24 +39433,24 @@ var ts;
                 }
                 return exportedDeclarations;
                 function visit(node) {
-                    if (node.flags & 4 /* Ambient */) {
+                    if (node.flags & 2 /* Ambient */) {
                         return;
                     }
-                    if (node.kind === 216 /* FunctionDeclaration */) {
+                    if (node.kind === 219 /* FunctionDeclaration */) {
                         if (!hoistedFunctionDeclarations) {
                             hoistedFunctionDeclarations = [];
                         }
                         hoistedFunctionDeclarations.push(node);
                         return;
                     }
-                    if (node.kind === 217 /* ClassDeclaration */) {
+                    if (node.kind === 220 /* ClassDeclaration */) {
                         if (!hoistedVars) {
                             hoistedVars = [];
                         }
                         hoistedVars.push(node);
                         return;
                     }
-                    if (node.kind === 220 /* EnumDeclaration */) {
+                    if (node.kind === 223 /* EnumDeclaration */) {
                         if (shouldEmitEnumDeclaration(node)) {
                             if (!hoistedVars) {
                                 hoistedVars = [];
@@ -37401,7 +39459,7 @@ var ts;
                         }
                         return;
                     }
-                    if (node.kind === 221 /* ModuleDeclaration */) {
+                    if (node.kind === 224 /* ModuleDeclaration */) {
                         if (shouldEmitModuleDeclaration(node)) {
                             if (!hoistedVars) {
                                 hoistedVars = [];
@@ -37410,17 +39468,17 @@ var ts;
                         }
                         return;
                     }
-                    if (node.kind === 214 /* VariableDeclaration */ || node.kind === 166 /* BindingElement */) {
+                    if (node.kind === 217 /* VariableDeclaration */ || node.kind === 168 /* BindingElement */) {
                         if (shouldHoistVariable(node, /*checkIfSourceFileLevelDecl*/ false)) {
-                            var name_30 = node.name;
-                            if (name_30.kind === 69 /* Identifier */) {
+                            var name_32 = node.name;
+                            if (name_32.kind === 69 /* Identifier */) {
                                 if (!hoistedVars) {
                                     hoistedVars = [];
                                 }
-                                hoistedVars.push(name_30);
+                                hoistedVars.push(name_32);
                             }
                             else {
-                                ts.forEachChild(name_30, visit);
+                                ts.forEachChild(name_32, visit);
                             }
                         }
                         return;
@@ -37450,11 +39508,11 @@ var ts;
                 // - 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 (ts.getCombinedNodeFlags(node) & 24576 /* BlockScoped */) === 0 ||
-                    ts.getEnclosingBlockScopeContainer(node).kind === 251 /* SourceFile */;
+                return (ts.getCombinedNodeFlags(node) & 3072 /* BlockScoped */) === 0 ||
+                    ts.getEnclosingBlockScopeContainer(node).kind === 255 /* SourceFile */;
             }
             function isCurrentFileSystemExternalModule() {
-                return modulekind === 4 /* System */ && isCurrentFileExternalModule;
+                return modulekind === ts.ModuleKind.System && isCurrentFileExternalModule;
             }
             function emitSystemModuleBody(node, dependencyGroups, startIndex) {
                 // shape of the body in system modules:
@@ -37526,21 +39584,21 @@ var ts;
                         var entry = group_1[_a];
                         var importVariableName = getLocalNameForExternalImport(entry) || "";
                         switch (entry.kind) {
-                            case 225 /* ImportDeclaration */:
+                            case 229 /* ImportDeclaration */:
                                 if (!entry.importClause) {
                                     // 'import "..."' case
                                     // module is imported only for side-effects, no emit required
                                     break;
                                 }
                             // fall-through
-                            case 224 /* ImportEqualsDeclaration */:
+                            case 228 /* ImportEqualsDeclaration */:
                                 ts.Debug.assert(importVariableName !== "");
                                 writeLine();
                                 // save import into the local
                                 write(importVariableName + " = " + parameterName + ";");
                                 writeLine();
                                 break;
-                            case 231 /* ExportDeclaration */:
+                            case 235 /* ExportDeclaration */:
                                 ts.Debug.assert(importVariableName !== "");
                                 if (entry.exportClause) {
                                     // export {a, b as c} from 'foo'
@@ -37599,10 +39657,10 @@ var ts;
                         // - 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 216 /* FunctionDeclaration */:
-                        case 225 /* ImportDeclaration */:
+                        case 219 /* FunctionDeclaration */:
+                        case 229 /* ImportDeclaration */:
                             continue;
-                        case 231 /* ExportDeclaration */:
+                        case 235 /* ExportDeclaration */:
                             if (!statement.moduleSpecifier) {
                                 for (var _a = 0, _b = statement.exportClause.elements; _a < _b.length; _a++) {
                                     var element = _b[_a];
@@ -37611,7 +39669,7 @@ var ts;
                                 }
                             }
                             continue;
-                        case 224 /* ImportEqualsDeclaration */:
+                        case 228 /* ImportEqualsDeclaration */:
                             if (!ts.isInternalModuleImportEqualsDeclaration(statement)) {
                                 // - import equals declarations that import external modules are not emitted
                                 continue;
@@ -37645,6 +39703,7 @@ var ts;
                 ts.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);
@@ -37653,14 +39712,20 @@ var ts;
                 var dependencyGroups = [];
                 for (var i = 0; i < externalImports.length; i++) {
                     var text = getExternalModuleNameText(externalImports[i], emitRelativePathAsModuleName);
-                    if (ts.hasProperty(groupIndices, text)) {
+                    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
+                    var key = text.substr(1, text.length - 2);
+                    if (ts.hasProperty(groupIndices, key)) {
                         // deduplicate/group entries in dependency list by the dependency name
-                        var groupIndex = groupIndices[text];
+                        var groupIndex = groupIndices[key];
                         dependencyGroups[groupIndex].push(externalImports[i]);
                         continue;
                     }
                     else {
-                        groupIndices[text] = dependencyGroups.length;
+                        groupIndices[key] = dependencyGroups.length;
                         dependencyGroups.push([externalImports[i]]);
                     }
                     if (i !== 0) {
@@ -37668,10 +39733,13 @@ var ts;
                     }
                     write(text);
                 }
-                write("], function(" + exportFunctionForFile + ") {");
+                write("], function(" + exportFunctionForFile + ", " + contextObjectForFile + ") {");
                 writeLine();
                 increaseIndent();
-                var startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ true);
+                var 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);
@@ -37691,11 +39759,11 @@ var ts;
                 for (var _a = 0, _b = node.amdDependencies; _a < _b.length; _a++) {
                     var amdDependency = _b[_a];
                     if (amdDependency.name) {
-                        aliasedModuleNames.push("\"" + amdDependency.path + "\"");
+                        aliasedModuleNames.push('"' + amdDependency.path + '"');
                         importAliasNames.push(amdDependency.name);
                     }
                     else {
-                        unaliasedModuleNames.push("\"" + amdDependency.path + "\"");
+                        unaliasedModuleNames.push('"' + amdDependency.path + '"');
                     }
                 }
                 for (var _c = 0, externalImports_4 = externalImports; _c < externalImports_4.length; _c++) {
@@ -37733,7 +39801,7 @@ var ts;
             }
             function emitAMDDependencyList(_a) {
                 var aliasedModuleNames = _a.aliasedModuleNames, unaliasedModuleNames = _a.unaliasedModuleNames;
-                write("[\"require\", \"exports\"");
+                write('["require", "exports"');
                 if (aliasedModuleNames.length) {
                     write(", ");
                     write(aliasedModuleNames.join(", "));
@@ -37761,25 +39829,25 @@ var ts;
                 writeModuleName(node, emitRelativePathAsModuleName);
                 emitAMDDependencies(node, /*includeNonAmdDependencies*/ true, emitRelativePathAsModuleName);
                 increaseIndent();
-                var startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ true);
+                var startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict);
                 emitExportStarHelper();
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
-                emitTempDeclarations(/*newLine*/ true);
                 emitExportEquals(/*emitAsReturn*/ true);
+                emitTempDeclarations(/*newLine*/ true);
                 decreaseIndent();
                 writeLine();
                 write("});");
             }
             function emitCommonJSModule(node) {
-                var startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false, /*ensureUseStrict*/ true);
+                var startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict);
                 emitEmitHelpers(node);
                 collectExternalModuleInfo(node);
                 emitExportStarHelper();
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
-                emitTempDeclarations(/*newLine*/ true);
                 emitExportEquals(/*emitAsReturn*/ false);
+                emitTempDeclarations(/*newLine*/ true);
             }
             function emitUMDModule(node) {
                 emitEmitHelpers(node);
@@ -37792,12 +39860,12 @@ var ts;
                 writeLines("    }\n})(");
                 emitAMDFactoryHeader(dependencyNames);
                 increaseIndent();
-                var startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ true);
+                var startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict);
                 emitExportStarHelper();
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
-                emitTempDeclarations(/*newLine*/ true);
                 emitExportEquals(/*emitAsReturn*/ true);
+                emitTempDeclarations(/*newLine*/ true);
                 decreaseIndent();
                 writeLine();
                 write("});");
@@ -37871,7 +39939,7 @@ var ts;
                         if (entities[m] !== undefined) {
                             var ch = String.fromCharCode(entities[m]);
                             // &quot; needs to be escaped
-                            return ch === "\"" ? "\\\"" : ch;
+                            return ch === '"' ? "\\\"" : ch;
                         }
                         else {
                             return s;
@@ -37880,6 +39948,18 @@ var ts;
                 }
                 return result;
             }
+            function isJsxChildEmittable(child) {
+                if (child.kind === 247 /* JsxExpression */) {
+                    // Don't emit empty expressions
+                    return !!child.expression;
+                }
+                else if (child.kind === 243 /* JsxText */) {
+                    // Don't emit empty strings
+                    return !!getTextToEmit(child);
+                }
+                return true;
+            }
+            ;
             function getTextToEmit(node) {
                 switch (compilerOptions.jsx) {
                     case 2 /* React */:
@@ -37898,9 +39978,9 @@ var ts;
             function emitJsxText(node) {
                 switch (compilerOptions.jsx) {
                     case 2 /* React */:
-                        write("\"");
+                        write('"');
                         write(trimReactWhitespaceAndApplyEntities(node));
-                        write("\"");
+                        write('"');
                         break;
                     case 1 /* Preserve */:
                     default:
@@ -37924,7 +40004,7 @@ var ts;
                 }
             }
             function isUseStrictPrologue(node) {
-                return !!node.expression.text.match(/use strict/);
+                return node.expression.text === "use strict";
             }
             function ensureUseStrictPrologue(startWithNewLine, writeUseStrict) {
                 if (writeUseStrict) {
@@ -37970,22 +40050,26 @@ var ts;
                 if (!compilerOptions.noEmitHelpers) {
                     // Only Emit __extends function when target ES5.
                     // For target ES6 and above, we can emit classDeclaration as is.
-                    if ((languageVersion < 2 /* ES6 */) && (!extendsEmitted && node.flags & 4194304 /* HasClassExtends */)) {
+                    if (languageVersion < 2 /* ES6 */ && !extendsEmitted && node.flags & 262144 /* HasClassExtends */) {
                         writeLines(extendsHelper);
                         extendsEmitted = true;
                     }
-                    if (!decorateEmitted && node.flags & 8388608 /* HasDecorators */) {
+                    if (compilerOptions.jsx !== 1 /* Preserve */ && !assignEmitted && (node.flags & 1073741824 /* HasJsxSpreadAttribute */)) {
+                        writeLines(assignHelper);
+                        assignEmitted = true;
+                    }
+                    if (!decorateEmitted && node.flags & 524288 /* HasDecorators */) {
                         writeLines(decorateHelper);
                         if (compilerOptions.emitDecoratorMetadata) {
                             writeLines(metadataHelper);
                         }
                         decorateEmitted = true;
                     }
-                    if (!paramEmitted && node.flags & 16777216 /* HasParamDecorators */) {
+                    if (!paramEmitted && node.flags & 1048576 /* HasParamDecorators */) {
                         writeLines(paramHelper);
                         paramEmitted = true;
                     }
-                    if (!awaiterEmitted && node.flags & 33554432 /* HasAsyncFunctions */) {
+                    if (!awaiterEmitted && node.flags & 2097152 /* HasAsyncFunctions */) {
                         writeLines(awaiterHelper);
                         awaiterEmitted = true;
                     }
@@ -37998,7 +40082,7 @@ var ts;
                 emitDetachedCommentsAndUpdateCommentsInfo(node);
                 if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
                     if (isOwnFileEmit || (!ts.isExternalModule(node) && compilerOptions.isolatedModules)) {
-                        var emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[1 /* CommonJS */];
+                        var emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[ts.ModuleKind.CommonJS];
                         emitModule(node);
                     }
                     else {
@@ -38027,7 +40111,7 @@ var ts;
             }
             function emitNodeConsideringCommentsOption(node, emitNodeConsideringSourcemap) {
                 if (node) {
-                    if (node.flags & 4 /* Ambient */) {
+                    if (node.flags & 2 /* Ambient */) {
                         return emitCommentsOnNotEmittedNode(node);
                     }
                     if (isSpecializedCommentHandling(node)) {
@@ -38073,24 +40157,24 @@ var ts;
                 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 218 /* InterfaceDeclaration */:
-                    case 216 /* FunctionDeclaration */:
-                    case 225 /* ImportDeclaration */:
-                    case 224 /* ImportEqualsDeclaration */:
-                    case 219 /* TypeAliasDeclaration */:
-                    case 230 /* ExportAssignment */:
+                    case 221 /* InterfaceDeclaration */:
+                    case 219 /* FunctionDeclaration */:
+                    case 229 /* ImportDeclaration */:
+                    case 228 /* ImportEqualsDeclaration */:
+                    case 222 /* TypeAliasDeclaration */:
+                    case 234 /* ExportAssignment */:
                         return true;
                 }
             }
             function shouldEmitLeadingAndTrailingComments(node) {
                 switch (node.kind) {
-                    case 196 /* VariableStatement */:
+                    case 199 /* VariableStatement */:
                         return shouldEmitLeadingAndTrailingCommentsForVariableStatement(node);
-                    case 221 /* ModuleDeclaration */:
+                    case 224 /* ModuleDeclaration */:
                         // Only emit the leading/trailing comments for a module if we're actually
                         // emitting the module as well.
                         return shouldEmitModuleDeclaration(node);
-                    case 220 /* EnumDeclaration */:
+                    case 223 /* EnumDeclaration */:
                         // Only emit the leading/trailing comments for an enum if we're actually
                         // emitting the module as well.
                         return shouldEmitEnumDeclaration(node);
@@ -38102,9 +40186,9 @@ var ts;
                 // 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 !== 195 /* Block */ &&
+                if (node.kind !== 198 /* Block */ &&
                     node.parent &&
-                    node.parent.kind === 177 /* ArrowFunction */ &&
+                    node.parent.kind === 179 /* ArrowFunction */ &&
                     node.parent.body === node &&
                     compilerOptions.target <= 1 /* ES5 */) {
                     return false;
@@ -38117,13 +40201,13 @@ var ts;
                 switch (node.kind) {
                     case 69 /* Identifier */:
                         return emitIdentifier(node);
-                    case 139 /* Parameter */:
+                    case 141 /* Parameter */:
                         return emitParameter(node);
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
                         return emitMethod(node);
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
                         return emitAccessor(node);
                     case 97 /* ThisKeyword */:
                         return emitThis(node);
@@ -38143,142 +40227,142 @@ var ts;
                     case 13 /* TemplateMiddle */:
                     case 14 /* TemplateTail */:
                         return emitLiteral(node);
-                    case 186 /* TemplateExpression */:
+                    case 188 /* TemplateExpression */:
                         return emitTemplateExpression(node);
-                    case 193 /* TemplateSpan */:
+                    case 196 /* TemplateSpan */:
                         return emitTemplateSpan(node);
-                    case 236 /* JsxElement */:
-                    case 237 /* JsxSelfClosingElement */:
+                    case 240 /* JsxElement */:
+                    case 241 /* JsxSelfClosingElement */:
                         return emitJsxElement(node);
-                    case 239 /* JsxText */:
+                    case 243 /* JsxText */:
                         return emitJsxText(node);
-                    case 243 /* JsxExpression */:
+                    case 247 /* JsxExpression */:
                         return emitJsxExpression(node);
-                    case 136 /* QualifiedName */:
+                    case 138 /* QualifiedName */:
                         return emitQualifiedName(node);
-                    case 164 /* ObjectBindingPattern */:
+                    case 166 /* ObjectBindingPattern */:
                         return emitObjectBindingPattern(node);
-                    case 165 /* ArrayBindingPattern */:
+                    case 167 /* ArrayBindingPattern */:
                         return emitArrayBindingPattern(node);
-                    case 166 /* BindingElement */:
+                    case 168 /* BindingElement */:
                         return emitBindingElement(node);
-                    case 167 /* ArrayLiteralExpression */:
+                    case 169 /* ArrayLiteralExpression */:
                         return emitArrayLiteral(node);
-                    case 168 /* ObjectLiteralExpression */:
+                    case 170 /* ObjectLiteralExpression */:
                         return emitObjectLiteral(node);
-                    case 248 /* PropertyAssignment */:
+                    case 252 /* PropertyAssignment */:
                         return emitPropertyAssignment(node);
-                    case 249 /* ShorthandPropertyAssignment */:
+                    case 253 /* ShorthandPropertyAssignment */:
                         return emitShorthandPropertyAssignment(node);
-                    case 137 /* ComputedPropertyName */:
+                    case 139 /* ComputedPropertyName */:
                         return emitComputedPropertyName(node);
-                    case 169 /* PropertyAccessExpression */:
+                    case 171 /* PropertyAccessExpression */:
                         return emitPropertyAccess(node);
-                    case 170 /* ElementAccessExpression */:
+                    case 172 /* ElementAccessExpression */:
                         return emitIndexedAccess(node);
-                    case 171 /* CallExpression */:
+                    case 173 /* CallExpression */:
                         return emitCallExpression(node);
-                    case 172 /* NewExpression */:
+                    case 174 /* NewExpression */:
                         return emitNewExpression(node);
-                    case 173 /* TaggedTemplateExpression */:
+                    case 175 /* TaggedTemplateExpression */:
                         return emitTaggedTemplateExpression(node);
-                    case 174 /* TypeAssertionExpression */:
+                    case 176 /* TypeAssertionExpression */:
+                    case 194 /* AsExpression */:
+                    case 195 /* NonNullExpression */:
                         return emit(node.expression);
-                    case 192 /* AsExpression */:
-                        return emit(node.expression);
-                    case 175 /* ParenthesizedExpression */:
+                    case 177 /* ParenthesizedExpression */:
                         return emitParenExpression(node);
-                    case 216 /* FunctionDeclaration */:
-                    case 176 /* FunctionExpression */:
-                    case 177 /* ArrowFunction */:
+                    case 219 /* FunctionDeclaration */:
+                    case 178 /* FunctionExpression */:
+                    case 179 /* ArrowFunction */:
                         return emitFunctionDeclaration(node);
-                    case 178 /* DeleteExpression */:
+                    case 180 /* DeleteExpression */:
                         return emitDeleteExpression(node);
-                    case 179 /* TypeOfExpression */:
+                    case 181 /* TypeOfExpression */:
                         return emitTypeOfExpression(node);
-                    case 180 /* VoidExpression */:
+                    case 182 /* VoidExpression */:
                         return emitVoidExpression(node);
-                    case 181 /* AwaitExpression */:
+                    case 183 /* AwaitExpression */:
                         return emitAwaitExpression(node);
-                    case 182 /* PrefixUnaryExpression */:
+                    case 184 /* PrefixUnaryExpression */:
                         return emitPrefixUnaryExpression(node);
-                    case 183 /* PostfixUnaryExpression */:
+                    case 185 /* PostfixUnaryExpression */:
                         return emitPostfixUnaryExpression(node);
-                    case 184 /* BinaryExpression */:
+                    case 186 /* BinaryExpression */:
                         return emitBinaryExpression(node);
-                    case 185 /* ConditionalExpression */:
+                    case 187 /* ConditionalExpression */:
                         return emitConditionalExpression(node);
-                    case 188 /* SpreadElementExpression */:
+                    case 190 /* SpreadElementExpression */:
                         return emitSpreadElementExpression(node);
-                    case 187 /* YieldExpression */:
+                    case 189 /* YieldExpression */:
                         return emitYieldExpression(node);
-                    case 190 /* OmittedExpression */:
+                    case 192 /* OmittedExpression */:
                         return;
-                    case 195 /* Block */:
-                    case 222 /* ModuleBlock */:
+                    case 198 /* Block */:
+                    case 225 /* ModuleBlock */:
                         return emitBlock(node);
-                    case 196 /* VariableStatement */:
+                    case 199 /* VariableStatement */:
                         return emitVariableStatement(node);
-                    case 197 /* EmptyStatement */:
+                    case 200 /* EmptyStatement */:
                         return write(";");
-                    case 198 /* ExpressionStatement */:
+                    case 201 /* ExpressionStatement */:
                         return emitExpressionStatement(node);
-                    case 199 /* IfStatement */:
+                    case 202 /* IfStatement */:
                         return emitIfStatement(node);
-                    case 200 /* DoStatement */:
+                    case 203 /* DoStatement */:
                         return emitDoStatement(node);
-                    case 201 /* WhileStatement */:
+                    case 204 /* WhileStatement */:
                         return emitWhileStatement(node);
-                    case 202 /* ForStatement */:
+                    case 205 /* ForStatement */:
                         return emitForStatement(node);
-                    case 204 /* ForOfStatement */:
-                    case 203 /* ForInStatement */:
+                    case 207 /* ForOfStatement */:
+                    case 206 /* ForInStatement */:
                         return emitForInOrForOfStatement(node);
-                    case 205 /* ContinueStatement */:
-                    case 206 /* BreakStatement */:
+                    case 208 /* ContinueStatement */:
+                    case 209 /* BreakStatement */:
                         return emitBreakOrContinueStatement(node);
-                    case 207 /* ReturnStatement */:
+                    case 210 /* ReturnStatement */:
                         return emitReturnStatement(node);
-                    case 208 /* WithStatement */:
+                    case 211 /* WithStatement */:
                         return emitWithStatement(node);
-                    case 209 /* SwitchStatement */:
+                    case 212 /* SwitchStatement */:
                         return emitSwitchStatement(node);
-                    case 244 /* CaseClause */:
-                    case 245 /* DefaultClause */:
+                    case 248 /* CaseClause */:
+                    case 249 /* DefaultClause */:
                         return emitCaseOrDefaultClause(node);
-                    case 210 /* LabeledStatement */:
+                    case 213 /* LabeledStatement */:
                         return emitLabeledStatement(node);
-                    case 211 /* ThrowStatement */:
+                    case 214 /* ThrowStatement */:
                         return emitThrowStatement(node);
-                    case 212 /* TryStatement */:
+                    case 215 /* TryStatement */:
                         return emitTryStatement(node);
-                    case 247 /* CatchClause */:
+                    case 251 /* CatchClause */:
                         return emitCatchClause(node);
-                    case 213 /* DebuggerStatement */:
+                    case 216 /* DebuggerStatement */:
                         return emitDebuggerStatement(node);
-                    case 214 /* VariableDeclaration */:
+                    case 217 /* VariableDeclaration */:
                         return emitVariableDeclaration(node);
-                    case 189 /* ClassExpression */:
+                    case 191 /* ClassExpression */:
                         return emitClassExpression(node);
-                    case 217 /* ClassDeclaration */:
+                    case 220 /* ClassDeclaration */:
                         return emitClassDeclaration(node);
-                    case 218 /* InterfaceDeclaration */:
+                    case 221 /* InterfaceDeclaration */:
                         return emitInterfaceDeclaration(node);
-                    case 220 /* EnumDeclaration */:
+                    case 223 /* EnumDeclaration */:
                         return emitEnumDeclaration(node);
-                    case 250 /* EnumMember */:
+                    case 254 /* EnumMember */:
                         return emitEnumMember(node);
-                    case 221 /* ModuleDeclaration */:
+                    case 224 /* ModuleDeclaration */:
                         return emitModuleDeclaration(node);
-                    case 225 /* ImportDeclaration */:
+                    case 229 /* ImportDeclaration */:
                         return emitImportDeclaration(node);
-                    case 224 /* ImportEqualsDeclaration */:
+                    case 228 /* ImportEqualsDeclaration */:
                         return emitImportEqualsDeclaration(node);
-                    case 231 /* ExportDeclaration */:
+                    case 235 /* ExportDeclaration */:
                         return emitExportDeclaration(node);
-                    case 230 /* ExportAssignment */:
+                    case 234 /* ExportAssignment */:
                         return emitExportAssignment(node);
-                    case 251 /* SourceFile */:
+                    case 255 /* SourceFile */:
                         return emitSourceFileNode(node);
                 }
             }
@@ -38317,7 +40401,7 @@ var ts;
             function getLeadingCommentsToEmit(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 === 251 /* SourceFile */ || node.pos !== node.parent.pos) {
+                    if (node.parent.kind === 255 /* SourceFile */ || node.pos !== node.parent.pos) {
                         if (hasDetachedComments(node.pos)) {
                             // get comments without detached comments
                             return getLeadingCommentsWithoutDetachedComments();
@@ -38332,7 +40416,7 @@ var ts;
             function getTrailingCommentsToEmit(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 === 251 /* SourceFile */ || node.end !== node.parent.end) {
+                    if (node.parent.kind === 255 /* SourceFile */ || node.end !== node.parent.end) {
                         return ts.getTrailingCommentRanges(currentText, node.end);
                     }
                 }
@@ -38362,7 +40446,7 @@ var ts;
                     //      declare var x;
                     //      /// <reference-path ...>
                     //      interface F {}
-                    //  The first /// will NOT be removed while the second one will be removed eventhough both node will not be emitted
+                    //  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 = ts.filter(getLeadingCommentsToEmit(node), isTripleSlashComment);
                     }
@@ -38447,6 +40531,15 @@ var ts;
             if (declarationFilePath) {
                 emitSkipped = ts.writeDeclarationFile(declarationFilePath, sourceFiles, isBundledEmit, host, resolver, emitterDiagnostics) || emitSkipped;
             }
+            if (!emitSkipped && emittedFilesList) {
+                emittedFilesList.push(jsFilePath);
+                if (sourceMapFilePath) {
+                    emittedFilesList.push(sourceMapFilePath);
+                }
+                if (declarationFilePath) {
+                    emittedFilesList.push(declarationFilePath);
+                }
+            }
         }
     }
     ts.emitFiles = emitFiles;
@@ -38462,10 +40555,15 @@ var ts;
     /* @internal */ ts.ioWriteTime = 0;
     /** The version of the TypeScript compiler release */
     var emptyArray = [];
-    ts.version = "1.8.0";
+    var defaultLibrarySearchPaths = [
+        "types/",
+        "node_modules/",
+        "node_modules/@types/",
+    ];
+    ts.version = "1.9.0";
     function findConfigFile(searchPath, fileExists) {
-        var fileName = "tsconfig.json";
         while (true) {
+            var fileName = ts.combinePaths(searchPath, "tsconfig.json");
             if (fileExists(fileName)) {
                 return fileName;
             }
@@ -38474,7 +40572,6 @@ var ts;
                 break;
             }
             searchPath = parentPath;
-            fileName = "../" + fileName;
         }
         return undefined;
     }
@@ -38485,36 +40582,490 @@ var ts;
         return ts.normalizePath(referencedFileName);
     }
     ts.resolveTripleslashReference = resolveTripleslashReference;
-    function resolveModuleName(moduleName, containingFile, compilerOptions, host) {
-        var moduleResolution = compilerOptions.moduleResolution !== undefined
-            ? compilerOptions.moduleResolution
-            : compilerOptions.module === 1 /* CommonJS */ ? 2 /* NodeJs */ : 1 /* Classic */;
-        switch (moduleResolution) {
-            case 2 /* NodeJs */: return nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host);
-            case 1 /* Classic */: return classicNameResolver(moduleName, containingFile, compilerOptions, host);
+    /* @internal */
+    function computeCommonSourceDirectoryOfFilenames(fileNames, currentDirectory, getCanonicalFileName) {
+        var commonPathComponents;
+        var failed = ts.forEach(fileNames, function (sourceFile) {
+            // Each file contributes into common source file path
+            var sourcePathComponents = ts.getNormalizedPathComponents(sourceFile, currentDirectory);
+            sourcePathComponents.pop(); // The base file name is not part of the common directory path
+            if (!commonPathComponents) {
+                // first file
+                commonPathComponents = sourcePathComponents;
+                return;
+            }
+            for (var i = 0, n = Math.min(commonPathComponents.length, sourcePathComponents.length); i < n; i++) {
+                if (getCanonicalFileName(commonPathComponents[i]) !== getCanonicalFileName(sourcePathComponents[i])) {
+                    if (i === 0) {
+                        // Failed to find any common path component
+                        return true;
+                    }
+                    // New common path found that is 0 -> i-1
+                    commonPathComponents.length = i;
+                    break;
+                }
+            }
+            // If the sourcePathComponents was shorter than the commonPathComponents, truncate to the sourcePathComponents
+            if (sourcePathComponents.length < commonPathComponents.length) {
+                commonPathComponents.length = sourcePathComponents.length;
+            }
+        });
+        // A common path can not be found when paths span multiple drives on windows, for example
+        if (failed) {
+            return "";
         }
+        if (!commonPathComponents) {
+            return currentDirectory;
+        }
+        return ts.getNormalizedPathFromPathComponents(commonPathComponents);
+    }
+    ts.computeCommonSourceDirectoryOfFilenames = computeCommonSourceDirectoryOfFilenames;
+    function trace(host, message) {
+        host.trace(ts.formatMessage.apply(undefined, arguments));
+    }
+    function isTraceEnabled(compilerOptions, host) {
+        return compilerOptions.traceResolution && host.trace !== undefined;
+    }
+    function hasZeroOrOneAsteriskCharacter(str) {
+        var seenAsterisk = false;
+        for (var i = 0; i < str.length; i++) {
+            if (str.charCodeAt(i) === 42 /* asterisk */) {
+                if (!seenAsterisk) {
+                    seenAsterisk = true;
+                }
+                else {
+                    // have already seen asterisk
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+    function createResolvedModule(resolvedFileName, isExternalLibraryImport, failedLookupLocations) {
+        return { resolvedModule: resolvedFileName ? { resolvedFileName: resolvedFileName, isExternalLibraryImport: isExternalLibraryImport } : undefined, failedLookupLocations: failedLookupLocations };
+    }
+    function moduleHasNonRelativeName(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;
+        try {
+            var jsonText = state.host.readFile(packageJsonPath);
+            jsonContent = jsonText ? JSON.parse(jsonText) : {};
+        }
+        catch (e) {
+            // gracefully handle if readFile fails or returns not JSON
+            jsonContent = {};
+        }
+        var typesFile;
+        var fieldName;
+        // first try to read content of 'typings' section (backward compatibility)
+        if (jsonContent.typings) {
+            if (typeof jsonContent.typings === "string") {
+                fieldName = "typings";
+                typesFile = jsonContent.typings;
+            }
+            else {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.Expected_type_of_0_field_in_package_json_to_be_string_got_1, "typings", typeof jsonContent.typings);
+                }
+            }
+        }
+        // then read 'types'
+        if (!typesFile && jsonContent.types) {
+            if (typeof jsonContent.types === "string") {
+                fieldName = "types";
+                typesFile = jsonContent.types;
+            }
+            else {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.Expected_type_of_0_field_in_package_json_to_be_string_got_1, "types", typeof jsonContent.types);
+                }
+            }
+        }
+        if (typesFile) {
+            var typesFilePath = ts.normalizePath(ts.combinePaths(baseDirectory, typesFile));
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, typesFile, typesFilePath);
+            }
+            return typesFilePath;
+        }
+        return undefined;
+    }
+    var typeReferenceExtensions = [".d.ts"];
+    /**
+     * @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
+     * is assumed to be the same as root directory of the project.
+     */
+    function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host) {
+        var traceEnabled = isTraceEnabled(options, host);
+        var moduleResolutionState = {
+            compilerOptions: options,
+            host: host,
+            skipTsx: true,
+            traceEnabled: traceEnabled
+        };
+        // use typesRoot and fallback to directory that contains tsconfig if typesRoot is not set
+        var rootDir = options.typesRoot || (options.configFilePath ? ts.getDirectoryPath(options.configFilePath) : undefined);
+        if (traceEnabled) {
+            if (containingFile === undefined) {
+                if (rootDir === undefined) {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_not_set_root_directory_not_set, typeReferenceDirectiveName);
+                }
+                else {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_not_set_root_directory_1, typeReferenceDirectiveName, rootDir);
+                }
+            }
+            else {
+                if (rootDir === undefined) {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_1_root_directory_not_set, typeReferenceDirectiveName, containingFile);
+                }
+                else {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_1_root_directory_2, typeReferenceDirectiveName, containingFile, rootDir);
+                }
+            }
+        }
+        var failedLookupLocations = [];
+        // Check primary library paths
+        if (rootDir !== undefined) {
+            var effectivePrimarySearchPaths = options.typesSearchPaths || defaultLibrarySearchPaths;
+            for (var _i = 0, effectivePrimarySearchPaths_1 = effectivePrimarySearchPaths; _i < effectivePrimarySearchPaths_1.length; _i++) {
+                var searchPath = effectivePrimarySearchPaths_1[_i];
+                var primaryPath = ts.combinePaths(rootDir, searchPath);
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Resolving_with_primary_search_path_0, primaryPath);
+                }
+                var candidate = ts.combinePaths(primaryPath, typeReferenceDirectiveName);
+                var candidateDirectory = ts.getDirectoryPath(candidate);
+                var resolvedFile_1 = loadNodeModuleFromDirectory(typeReferenceExtensions, candidate, failedLookupLocations, !directoryProbablyExists(candidateDirectory, host), moduleResolutionState);
+                if (resolvedFile_1) {
+                    if (traceEnabled) {
+                        trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile_1, true);
+                    }
+                    return {
+                        resolvedTypeReferenceDirective: { primary: true, resolvedFileName: resolvedFile_1 },
+                        failedLookupLocations: failedLookupLocations
+                    };
+                }
+            }
+        }
+        else {
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Root_directory_cannot_be_determined_skipping_primary_search_paths);
+            }
+        }
+        var resolvedFile;
+        var initialLocationForSecondaryLookup;
+        if (containingFile) {
+            initialLocationForSecondaryLookup = ts.getDirectoryPath(containingFile);
+        }
+        else {
+            initialLocationForSecondaryLookup = rootDir;
+        }
+        if (initialLocationForSecondaryLookup !== undefined) {
+            // check secondary locations
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
+            }
+            resolvedFile = loadModuleFromNodeModules(typeReferenceDirectiveName, initialLocationForSecondaryLookup, failedLookupLocations, moduleResolutionState);
+            if (traceEnabled) {
+                if (resolvedFile) {
+                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile, false);
+                }
+                else {
+                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_not_resolved, typeReferenceDirectiveName);
+                }
+            }
+        }
+        else {
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder);
+            }
+        }
+        return {
+            resolvedTypeReferenceDirective: resolvedFile
+                ? { primary: false, resolvedFileName: resolvedFile }
+                : undefined,
+            failedLookupLocations: failedLookupLocations
+        };
+    }
+    ts.resolveTypeReferenceDirective = resolveTypeReferenceDirective;
+    function resolveModuleName(moduleName, containingFile, compilerOptions, host) {
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        if (traceEnabled) {
+            trace(host, ts.Diagnostics.Resolving_module_0_from_1, moduleName, containingFile);
+        }
+        var moduleResolution = compilerOptions.moduleResolution;
+        if (moduleResolution === undefined) {
+            moduleResolution = ts.getEmitModuleKind(compilerOptions) === ts.ModuleKind.CommonJS ? ts.ModuleResolutionKind.NodeJs : ts.ModuleResolutionKind.Classic;
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Module_resolution_kind_is_not_specified_using_0, ts.ModuleResolutionKind[moduleResolution]);
+            }
+        }
+        else {
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Explicitly_specified_module_resolution_kind_Colon_0, ts.ModuleResolutionKind[moduleResolution]);
+            }
+        }
+        var result;
+        switch (moduleResolution) {
+            case ts.ModuleResolutionKind.NodeJs:
+                result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host);
+                break;
+            case ts.ModuleResolutionKind.Classic:
+                result = classicNameResolver(moduleName, containingFile, compilerOptions, host);
+                break;
+        }
+        if (traceEnabled) {
+            if (result.resolvedModule) {
+                trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1, moduleName, result.resolvedModule.resolvedFileName);
+            }
+            else {
+                trace(host, ts.Diagnostics.Module_name_0_was_not_resolved, moduleName);
+            }
+        }
+        return result;
     }
     ts.resolveModuleName = resolveModuleName;
+    /**
+     * Any module resolution kind can be augmented with optional settings: 'baseUrl', 'paths' and 'rootDirs' - they are used to
+     * mitigate differences between design time structure of the project and its runtime counterpart so the same import name
+     * can be resolved successfully by TypeScript compiler and runtime module loader.
+     * If these settings are set then loading procedure will try to use them to resolve module name and it can of failure it will
+     * fallback to standard resolution routine.
+     *
+     * - baseUrl - this setting controls how non-relative module names are resolved. If this setting is specified then non-relative
+     * names will be resolved relative to baseUrl: i.e. if baseUrl is '/a/b' then candidate location to resolve module name 'c/d' will
+     * be '/a/b/c/d'
+     * - paths - this setting can only be used when baseUrl is specified. allows to tune how non-relative module names
+     * will be resolved based on the content of the module name.
+     * Structure of 'paths' compiler options
+     * 'paths': {
+     *    pattern-1: [...substitutions],
+     *    pattern-2: [...substitutions],
+     *    ...
+     *    pattern-n: [...substitutions]
+     * }
+     * Pattern here is a string that can contain zero or one '*' character. During module resolution module name will be matched against
+     * all patterns in the list. Matching for patterns that don't contain '*' means that module name must be equal to pattern respecting the case.
+     * If pattern contains '*' then to match pattern "<prefix>*<suffix>" module name must start with the <prefix> and end with <suffix>.
+     * <MatchedStar> denotes part of the module name between <prefix> and <suffix>.
+     * If module name can be matches with multiple patterns then pattern with the longest prefix will be picked.
+     * After selecting pattern we'll use list of substitutions to get candidate locations of the module and the try to load module
+     * from the candidate location.
+     * Substitution is a string that can contain zero or one '*'. To get candidate location from substitution we'll pick every
+     * substitution in the list and replace '*' with <MatchedStar> string. If candidate location is not rooted it
+     * will be converted to absolute using baseUrl.
+     * For example:
+     * baseUrl: /a/b/c
+     * "paths": {
+     *     // match all module names
+     *     "*": [
+     *         "*",        // use matched name as is,
+     *                     // <matched name> will be looked as /a/b/c/<matched name>
+     *
+     *         "folder1/*" // substitution will convert matched name to 'folder1/<matched name>',
+     *                     // since it is not rooted then final candidate location will be /a/b/c/folder1/<matched name>
+     *     ],
+     *     // match module names that start with 'components/'
+     *     "components/*": [ "/root/components/*" ] // substitution will convert /components/folder1/<matched name> to '/root/components/folder1/<matched name>',
+     *                                              // it is rooted so it will be final candidate location
+     * }
+     *
+     * 'rootDirs' allows the project to be spreaded across multiple locations and resolve modules with relative names as if
+     * they were in the same location. For example lets say there are two files
+     * '/local/src/content/file1.ts'
+     * '/shared/components/contracts/src/content/protocols/file2.ts'
+     * After bundling content of '/shared/components/contracts/src' will be merged with '/local/src' so
+     * if file1 has the following import 'import {x} from "./protocols/file2"' it will be resolved successfully in runtime.
+     * 'rootDirs' provides the way to tell compiler that in order to get the whole project it should behave as if content of all
+     * root dirs were merged together.
+     * I.e. for the example above 'rootDirs' will have two entries: [ '/local/src', '/shared/components/contracts/src' ].
+     * Compiler will first convert './protocols/file2' into absolute path relative to the location of containing file:
+     * '/local/src/content/protocols/file2' and try to load it - failure.
+     * Then it will search 'rootDirs' looking for a longest matching prefix of this absolute path and if such prefix is found - absolute path will
+     * be converted to a path relative to found rootDir entry './content/protocols/file2' (*). As a last step compiler will check all remaining
+     * entries in 'rootDirs', use them to build absolute path out of (*) and try to resolve module from this location.
+     */
+    function tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state) {
+        if (moduleHasNonRelativeName(moduleName)) {
+            return tryLoadModuleUsingBaseUrl(moduleName, loader, failedLookupLocations, supportedExtensions, state);
+        }
+        else {
+            return tryLoadModuleUsingRootDirs(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state);
+        }
+    }
+    function tryLoadModuleUsingRootDirs(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state) {
+        if (!state.compilerOptions.rootDirs) {
+            return undefined;
+        }
+        if (state.traceEnabled) {
+            trace(state.host, ts.Diagnostics.rootDirs_option_is_set_using_it_to_resolve_relative_module_name_0, moduleName);
+        }
+        var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+        var matchedRootDir;
+        var matchedNormalizedPrefix;
+        for (var _i = 0, _a = state.compilerOptions.rootDirs; _i < _a.length; _i++) {
+            var rootDir = _a[_i];
+            // rootDirs are expected to be absolute
+            // in case of tsconfig.json this will happen automatically - compiler will expand relative names
+            // using location of tsconfig.json as base location
+            var normalizedRoot = ts.normalizePath(rootDir);
+            if (!ts.endsWith(normalizedRoot, ts.directorySeparator)) {
+                normalizedRoot += ts.directorySeparator;
+            }
+            var isLongestMatchingPrefix = ts.startsWith(candidate, normalizedRoot) &&
+                (matchedNormalizedPrefix === undefined || matchedNormalizedPrefix.length < normalizedRoot.length);
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Checking_if_0_is_the_longest_matching_prefix_for_1_2, normalizedRoot, candidate, isLongestMatchingPrefix);
+            }
+            if (isLongestMatchingPrefix) {
+                matchedNormalizedPrefix = normalizedRoot;
+                matchedRootDir = rootDir;
+            }
+        }
+        if (matchedNormalizedPrefix) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Longest_matching_prefix_for_0_is_1, candidate, matchedNormalizedPrefix);
+            }
+            var suffix = candidate.substr(matchedNormalizedPrefix.length);
+            // first - try to load from a initial location
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, matchedNormalizedPrefix, candidate);
+            }
+            var resolvedFileName = loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(containingDirectory, state.host), state);
+            if (resolvedFileName) {
+                return resolvedFileName;
+            }
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Trying_other_entries_in_rootDirs);
+            }
+            // then try to resolve using remaining entries in rootDirs
+            for (var _b = 0, _c = state.compilerOptions.rootDirs; _b < _c.length; _b++) {
+                var rootDir = _c[_b];
+                if (rootDir === matchedRootDir) {
+                    // skip the initially matched entry
+                    continue;
+                }
+                var candidate_1 = ts.combinePaths(ts.normalizePath(rootDir), suffix);
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, rootDir, candidate_1);
+                }
+                var baseDirectory = ts.getDirectoryPath(candidate_1);
+                var resolvedFileName_1 = loader(candidate_1, supportedExtensions, failedLookupLocations, !directoryProbablyExists(baseDirectory, state.host), state);
+                if (resolvedFileName_1) {
+                    return resolvedFileName_1;
+                }
+            }
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Module_resolution_using_rootDirs_has_failed);
+            }
+        }
+        return undefined;
+    }
+    function tryLoadModuleUsingBaseUrl(moduleName, loader, failedLookupLocations, supportedExtensions, state) {
+        if (!state.compilerOptions.baseUrl) {
+            return undefined;
+        }
+        if (state.traceEnabled) {
+            trace(state.host, ts.Diagnostics.baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1, state.compilerOptions.baseUrl, moduleName);
+        }
+        var longestMatchPrefixLength = -1;
+        var matchedPattern;
+        var matchedStar;
+        if (state.compilerOptions.paths) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0, moduleName);
+            }
+            for (var key in state.compilerOptions.paths) {
+                var pattern = key;
+                var indexOfStar = pattern.indexOf("*");
+                if (indexOfStar !== -1) {
+                    var prefix = pattern.substr(0, indexOfStar);
+                    var suffix = pattern.substr(indexOfStar + 1);
+                    if (moduleName.length >= prefix.length + suffix.length &&
+                        ts.startsWith(moduleName, prefix) &&
+                        ts.endsWith(moduleName, suffix)) {
+                        // use length of prefix as betterness criteria
+                        if (prefix.length > longestMatchPrefixLength) {
+                            longestMatchPrefixLength = prefix.length;
+                            matchedPattern = pattern;
+                            matchedStar = moduleName.substr(prefix.length, moduleName.length - suffix.length);
+                        }
+                    }
+                }
+                else if (pattern === moduleName) {
+                    // pattern was matched as is - no need to search further
+                    matchedPattern = pattern;
+                    matchedStar = undefined;
+                    break;
+                }
+            }
+        }
+        if (matchedPattern) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Module_name_0_matched_pattern_1, moduleName, matchedPattern);
+            }
+            for (var _i = 0, _a = state.compilerOptions.paths[matchedPattern]; _i < _a.length; _i++) {
+                var subst = _a[_i];
+                var path = matchedStar ? subst.replace("\*", matchedStar) : subst;
+                var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, path));
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.Trying_substitution_0_candidate_module_location_Colon_1, subst, path);
+                }
+                var resolvedFileName = loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
+                if (resolvedFileName) {
+                    return resolvedFileName;
+                }
+            }
+            return undefined;
+        }
+        else {
+            var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, moduleName));
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Resolving_module_name_0_relative_to_base_url_1_2, moduleName, state.compilerOptions.baseUrl, candidate);
+            }
+            return loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
+        }
+    }
     function nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host) {
         var containingDirectory = ts.getDirectoryPath(containingFile);
         var supportedExtensions = ts.getSupportedExtensions(compilerOptions);
-        if (ts.getRootLength(moduleName) !== 0 || nameStartsWithDotSlashOrDotDotSlash(moduleName)) {
-            var failedLookupLocations = [];
-            var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-            var resolvedFileName = loadNodeModuleFromFile(supportedExtensions, candidate, failedLookupLocations, /*onlyRecordFailures*/ false, host);
-            if (resolvedFileName) {
-                return { resolvedModule: { resolvedFileName: resolvedFileName }, failedLookupLocations: failedLookupLocations };
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        var failedLookupLocations = [];
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, skipTsx: false };
+        var resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, nodeLoadModuleByRelativeName, failedLookupLocations, supportedExtensions, state);
+        if (resolvedFileName) {
+            return createResolvedModule(resolvedFileName, /*isExternalLibraryImport*/ false, failedLookupLocations);
+        }
+        var isExternalLibraryImport = false;
+        if (moduleHasNonRelativeName(moduleName)) {
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Loading_module_0_from_node_modules_folder, moduleName);
             }
-            resolvedFileName = loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, /*onlyRecordFailures*/ false, host);
-            return resolvedFileName
-                ? { resolvedModule: { resolvedFileName: resolvedFileName }, failedLookupLocations: failedLookupLocations }
-                : { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
+            resolvedFileName = loadModuleFromNodeModules(moduleName, containingDirectory, failedLookupLocations, state);
+            isExternalLibraryImport = resolvedFileName !== undefined;
         }
         else {
-            return loadModuleFromNodeModules(moduleName, containingDirectory, host);
+            var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+            resolvedFileName = nodeLoadModuleByRelativeName(candidate, supportedExtensions, failedLookupLocations, /*onlyRecordFailures*/ false, state);
         }
+        return createResolvedModule(resolvedFileName, isExternalLibraryImport, failedLookupLocations);
     }
     ts.nodeModuleNameResolver = nodeModuleNameResolver;
+    function nodeLoadModuleByRelativeName(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state) {
+        if (state.traceEnabled) {
+            trace(state.host, ts.Diagnostics.Loading_module_as_file_Slash_folder_candidate_module_location_0, candidate);
+        }
+        var resolvedFileName = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state);
+        return resolvedFileName || loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, onlyRecordFailures, state);
+    }
     /* @internal */
     function directoryProbablyExists(directoryName, host) {
         // if host does not support 'directoryExists' assume that directory will exist
@@ -38525,63 +41076,90 @@ var ts;
      * @param {boolean} onlyRecordFailures - if true then function won't try to actually load files but instead record all attempts as failures. This flag is necessary
      * in cases when we know upfront that all load attempts will fail (because containing folder does not exists) however we still need to record all failed lookup locations.
      */
-    function loadNodeModuleFromFile(extensions, candidate, failedLookupLocation, onlyRecordFailures, host) {
+    function loadModuleFromFile(candidate, extensions, failedLookupLocation, onlyRecordFailures, state) {
+        if (!onlyRecordFailures) {
+            // check if containig folder exists - if it doesn't then just record failures for all supported extensions without disk probing
+            var directory = ts.getDirectoryPath(candidate);
+            if (directory) {
+                onlyRecordFailures = !directoryProbablyExists(directory, state.host);
+            }
+        }
         return ts.forEach(extensions, tryLoad);
         function tryLoad(ext) {
+            if (ext === ".tsx" && state.skipTsx) {
+                return undefined;
+            }
             var fileName = ts.fileExtensionIs(candidate, ext) ? candidate : candidate + ext;
-            if (!onlyRecordFailures && host.fileExists(fileName)) {
+            if (!onlyRecordFailures && state.host.fileExists(fileName)) {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.File_0_exist_use_it_as_a_name_resolution_result, fileName);
+                }
                 return fileName;
             }
             else {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.File_0_does_not_exist, fileName);
+                }
                 failedLookupLocation.push(fileName);
                 return undefined;
             }
         }
     }
-    function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocation, onlyRecordFailures, host) {
+    function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocation, onlyRecordFailures, state) {
         var packageJsonPath = ts.combinePaths(candidate, "package.json");
-        var directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, host);
-        if (directoryExists && host.fileExists(packageJsonPath)) {
-            var jsonContent;
-            try {
-                var jsonText = host.readFile(packageJsonPath);
-                jsonContent = jsonText ? JSON.parse(jsonText) : { typings: undefined };
+        var directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, state.host);
+        if (directoryExists && state.host.fileExists(packageJsonPath)) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
             }
-            catch (e) {
-                // gracefully handle if readFile fails or returns not JSON 
-                jsonContent = { typings: undefined };
-            }
-            if (typeof jsonContent.typings === "string") {
-                var path = ts.normalizePath(ts.combinePaths(candidate, jsonContent.typings));
-                var result = loadNodeModuleFromFile(extensions, path, failedLookupLocation, !directoryProbablyExists(ts.getDirectoryPath(path), host), host);
+            var typesFile = tryReadTypesSection(packageJsonPath, candidate, state);
+            if (typesFile) {
+                var result = loadModuleFromFile(typesFile, extensions, failedLookupLocation, !directoryProbablyExists(ts.getDirectoryPath(typesFile), state.host), state);
                 if (result) {
                     return result;
                 }
             }
+            else {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.package_json_does_not_have_types_field);
+                }
+            }
         }
         else {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath);
+            }
             // record package json as one of failed lookup locations - in the future if this file will appear it will invalidate resolution results
             failedLookupLocation.push(packageJsonPath);
         }
-        return loadNodeModuleFromFile(extensions, ts.combinePaths(candidate, "index"), failedLookupLocation, !directoryExists, host);
+        return loadModuleFromFile(ts.combinePaths(candidate, "index"), extensions, failedLookupLocation, !directoryExists, state);
     }
-    function loadModuleFromNodeModules(moduleName, directory, host) {
-        var failedLookupLocations = [];
+    function loadModuleFromNodeModulesFolder(moduleName, directory, failedLookupLocations, state) {
+        var nodeModulesFolder = ts.combinePaths(directory, "node_modules");
+        var nodeModulesFolderExists = directoryProbablyExists(nodeModulesFolder, state.host);
+        var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName));
+        // Load only typescript files irrespective of allowJs option if loading from node modules
+        var result = loadModuleFromFile(candidate, ts.supportedTypeScriptExtensions, failedLookupLocations, !nodeModulesFolderExists, state);
+        if (result) {
+            return result;
+        }
+        result = loadNodeModuleFromDirectory(ts.supportedTypeScriptExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state);
+        if (result) {
+            return result;
+        }
+    }
+    function loadModuleFromNodeModules(moduleName, directory, failedLookupLocations, state) {
         directory = ts.normalizeSlashes(directory);
         while (true) {
             var baseName = ts.getBaseFileName(directory);
             if (baseName !== "node_modules") {
-                var nodeModulesFolder = ts.combinePaths(directory, "node_modules");
-                var nodeModulesFolderExists = directoryProbablyExists(nodeModulesFolder, host);
-                var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName));
-                // Load only typescript files irrespective of allowJs option if loading from node modules
-                var result = loadNodeModuleFromFile(ts.supportedTypeScriptExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, host);
+                var result = 
+                // first: try to load module as-is
+                loadModuleFromNodeModulesFolder(moduleName, directory, failedLookupLocations, state) ||
+                    // second: try to load module from the scope '@types'
+                    loadModuleFromNodeModulesFolder(ts.combinePaths("@types", moduleName), directory, failedLookupLocations, state);
                 if (result) {
-                    return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations: failedLookupLocations };
-                }
-                result = loadNodeModuleFromDirectory(ts.supportedTypeScriptExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, host);
-                if (result) {
-                    return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations: failedLookupLocations };
+                    return result;
                 }
             }
             var parentPath = ts.getDirectoryPath(directory);
@@ -38590,46 +41168,36 @@ var ts;
             }
             directory = parentPath;
         }
-        return { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
-    }
-    function nameStartsWithDotSlashOrDotDotSlash(name) {
-        var i = name.lastIndexOf("./", 1);
-        return i === 0 || (i === 1 && name.charCodeAt(0) === 46 /* dot */);
+        return undefined;
     }
     function classicNameResolver(moduleName, containingFile, compilerOptions, host) {
-        // module names that contain '!' are used to reference resources and are not resolved to actual files on disk
-        if (moduleName.indexOf("!") != -1) {
-            return { resolvedModule: undefined, failedLookupLocations: [] };
-        }
-        var searchPath = ts.getDirectoryPath(containingFile);
-        var searchName;
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, skipTsx: !compilerOptions.jsx };
         var failedLookupLocations = [];
-        var referencedSourceFile;
         var supportedExtensions = ts.getSupportedExtensions(compilerOptions);
-        while (true) {
-            searchName = ts.normalizePath(ts.combinePaths(searchPath, moduleName));
-            referencedSourceFile = ts.forEach(supportedExtensions, function (extension) {
-                if (extension === ".tsx" && !compilerOptions.jsx) {
-                    // resolve .tsx files only if jsx support is enabled 
-                    // 'logical not' handles both undefined and None cases
-                    return undefined;
+        var containingDirectory = ts.getDirectoryPath(containingFile);
+        var resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, loadModuleFromFile, failedLookupLocations, supportedExtensions, state);
+        if (resolvedFileName) {
+            return createResolvedModule(resolvedFileName, /*isExternalLibraryImport*/ false, failedLookupLocations);
+        }
+        var referencedSourceFile;
+        if (moduleHasNonRelativeName(moduleName)) {
+            while (true) {
+                var searchName = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+                referencedSourceFile = loadModuleFromFile(searchName, supportedExtensions, failedLookupLocations, /*onlyRecordFailures*/ false, state);
+                if (referencedSourceFile) {
+                    break;
                 }
-                var candidate = searchName + extension;
-                if (host.fileExists(candidate)) {
-                    return candidate;
+                var parentPath = ts.getDirectoryPath(containingDirectory);
+                if (parentPath === containingDirectory) {
+                    break;
                 }
-                else {
-                    failedLookupLocations.push(candidate);
-                }
-            });
-            if (referencedSourceFile) {
-                break;
+                containingDirectory = parentPath;
             }
-            var parentPath = ts.getDirectoryPath(searchPath);
-            if (parentPath === searchPath) {
-                break;
-            }
-            searchPath = parentPath;
+        }
+        else {
+            var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+            referencedSourceFile = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, /*onlyRecordFailures*/ false, state);
         }
         return referencedSourceFile
             ? { resolvedModule: { resolvedFileName: referencedSourceFile }, failedLookupLocations: failedLookupLocations }
@@ -38638,7 +41206,7 @@ var ts;
     ts.classicNameResolver = classicNameResolver;
     /* @internal */
     ts.defaultInitCompilerOptions = {
-        module: 1 /* CommonJS */,
+        module: ts.ModuleKind.CommonJS,
         target: 1 /* ES5 */,
         noImplicitAny: false,
         sourceMap: false
@@ -38686,11 +41254,40 @@ var ts;
                 ts.sys.createDirectory(directoryPath);
             }
         }
+        var outputFingerprints;
+        function writeFileIfUpdated(fileName, data, writeByteOrderMark) {
+            if (!outputFingerprints) {
+                outputFingerprints = {};
+            }
+            var hash = ts.sys.createHash(data);
+            var mtimeBefore = ts.sys.getModifiedTime(fileName);
+            if (mtimeBefore && ts.hasProperty(outputFingerprints, fileName)) {
+                var fingerprint = outputFingerprints[fileName];
+                // If output has not been changed, and the file has no external modification
+                if (fingerprint.byteOrderMark === writeByteOrderMark &&
+                    fingerprint.hash === hash &&
+                    fingerprint.mtime.getTime() === mtimeBefore.getTime()) {
+                    return;
+                }
+            }
+            ts.sys.writeFile(fileName, data, writeByteOrderMark);
+            var mtimeAfter = ts.sys.getModifiedTime(fileName);
+            outputFingerprints[fileName] = {
+                hash: hash,
+                byteOrderMark: writeByteOrderMark,
+                mtime: mtimeAfter
+            };
+        }
         function writeFile(fileName, data, writeByteOrderMark, onError) {
             try {
                 var start = new Date().getTime();
                 ensureDirectoriesExist(ts.getDirectoryPath(ts.normalizePath(fileName)));
-                ts.sys.writeFile(fileName, data, writeByteOrderMark);
+                if (ts.isWatchSet(options) && ts.sys.createHash && ts.sys.getModifiedTime) {
+                    writeFileIfUpdated(fileName, data, writeByteOrderMark);
+                }
+                else {
+                    ts.sys.writeFile(fileName, data, writeByteOrderMark);
+                }
                 ts.ioWriteTime += new Date().getTime() - start;
             }
             catch (e) {
@@ -38699,10 +41296,14 @@ var ts;
                 }
             }
         }
+        function getDefaultLibLocation() {
+            return ts.getDirectoryPath(ts.normalizePath(ts.sys.getExecutingFilePath()));
+        }
         var newLine = ts.getNewLineCharacter(options);
         return {
             getSourceFile: getSourceFile,
-            getDefaultLibFileName: function (options) { return ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(ts.sys.getExecutingFilePath())), ts.getDefaultLibFileName(options)); },
+            getDefaultLibLocation: getDefaultLibLocation,
+            getDefaultLibFileName: function (options) { return ts.combinePaths(getDefaultLibLocation(), ts.getDefaultLibFileName(options)); },
             writeFile: writeFile,
             getCurrentDirectory: ts.memoize(function () { return ts.sys.getCurrentDirectory(); }),
             useCaseSensitiveFileNames: function () { return ts.sys.useCaseSensitiveFileNames; },
@@ -38710,6 +41311,7 @@ var ts;
             getNewLine: function () { return newLine; },
             fileExists: function (fileName) { return ts.sys.fileExists(fileName); },
             readFile: function (fileName) { return ts.sys.readFile(fileName); },
+            trace: function (s) { return ts.sys.write(s + newLine); },
             directoryExists: function (directoryName) { return ts.sys.directoryExists(directoryName); }
         };
     }
@@ -38745,68 +41347,88 @@ var ts;
         }
     }
     ts.flattenDiagnosticMessageText = flattenDiagnosticMessageText;
+    function loadWithLocalCache(names, containingFile, loader) {
+        if (names.length === 0) {
+            return [];
+        }
+        var resolutions = [];
+        var cache = {};
+        for (var _i = 0, names_1 = names; _i < names_1.length; _i++) {
+            var name_33 = names_1[_i];
+            var result = void 0;
+            if (ts.hasProperty(cache, name_33)) {
+                result = cache[name_33];
+            }
+            else {
+                result = loader(name_33, containingFile);
+                cache[name_33] = result;
+            }
+            resolutions.push(result);
+        }
+        return resolutions;
+    }
     function createProgram(rootNames, options, host, oldProgram) {
         var program;
         var files = [];
-        var fileProcessingDiagnostics = ts.createDiagnosticCollection();
-        var programDiagnostics = ts.createDiagnosticCollection();
         var commonSourceDirectory;
         var diagnosticsProducingTypeChecker;
         var noDiagnosticsTypeChecker;
         var classifiableNames;
-        var skipDefaultLib = options.noLib;
-        var supportedExtensions = ts.getSupportedExtensions(options);
+        var resolvedTypeReferenceDirectives = {};
+        var fileProcessingDiagnostics = ts.createDiagnosticCollection();
         var start = new Date().getTime();
         host = host || createCompilerHost(options);
+        var skipDefaultLib = options.noLib;
+        var programDiagnostics = ts.createDiagnosticCollection();
+        var currentDirectory = host.getCurrentDirectory();
+        var supportedExtensions = ts.getSupportedExtensions(options);
         // Map storing if there is emit blocking diagnostics for given input
         var hasEmitBlockingDiagnostics = ts.createFileMap(getCanonicalFileName);
-        var currentDirectory = host.getCurrentDirectory();
-        var resolveModuleNamesWorker = host.resolveModuleNames
-            ? (function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile); })
-            : (function (moduleNames, containingFile) {
-                var resolvedModuleNames = [];
-                // resolveModuleName does not store any results between calls.
-                // lookup is a local cache to avoid resolving the same module name several times
-                var lookup = {};
-                for (var _i = 0, moduleNames_1 = moduleNames; _i < moduleNames_1.length; _i++) {
-                    var moduleName = moduleNames_1[_i];
-                    var resolvedName = void 0;
-                    if (ts.hasProperty(lookup, moduleName)) {
-                        resolvedName = lookup[moduleName];
-                    }
-                    else {
-                        resolvedName = resolveModuleName(moduleName, containingFile, options, host).resolvedModule;
-                        lookup[moduleName] = resolvedName;
-                    }
-                    resolvedModuleNames.push(resolvedName);
-                }
-                return resolvedModuleNames;
-            });
+        var resolveModuleNamesWorker;
+        if (host.resolveModuleNames) {
+            resolveModuleNamesWorker = function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile); };
+        }
+        else {
+            var loader_1 = function (moduleName, containingFile) { return resolveModuleName(moduleName, containingFile, options, host).resolvedModule; };
+            resolveModuleNamesWorker = function (moduleNames, containingFile) { return loadWithLocalCache(moduleNames, containingFile, loader_1); };
+        }
+        var resolveTypeReferenceDirectiveNamesWorker;
+        if (host.resolveTypeReferenceDirectives) {
+            resolveTypeReferenceDirectiveNamesWorker = function (typeDirectiveNames, containingFile) { return host.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile); };
+        }
+        else {
+            var loader_2 = function (typesRef, containingFile) { return resolveTypeReferenceDirective(typesRef, containingFile, options, host).resolvedTypeReferenceDirective; };
+            resolveTypeReferenceDirectiveNamesWorker = function (typeReferenceDirectiveNames, containingFile) { return loadWithLocalCache(typeReferenceDirectiveNames, containingFile, loader_2); };
+        }
         var filesByName = ts.createFileMap();
         // stores 'filename -> file association' ignoring case
-        // used to track cases when two file names differ only in casing 
+        // used to track cases when two file names differ only in casing
         var filesByNameIgnoreCase = host.useCaseSensitiveFileNames() ? ts.createFileMap(function (fileName) { return fileName.toLowerCase(); }) : undefined;
-        if (oldProgram) {
-            // check properties that can affect structure of the program or module resolution strategy
-            // if any of these properties has changed - structure cannot be reused
-            var oldOptions = oldProgram.getCompilerOptions();
-            if ((oldOptions.module !== options.module) ||
-                (oldOptions.noResolve !== options.noResolve) ||
-                (oldOptions.target !== options.target) ||
-                (oldOptions.noLib !== options.noLib) ||
-                (oldOptions.jsx !== options.jsx) ||
-                (oldOptions.allowJs !== options.allowJs)) {
-                oldProgram = undefined;
-            }
-        }
         if (!tryReuseStructureFromOldProgram()) {
+            // load type declarations specified via 'types' argument
+            if (options.types && options.types.length) {
+                var resolutions = resolveTypeReferenceDirectiveNamesWorker(options.types, /*containingFile*/ undefined);
+                for (var i = 0; i < options.types.length; i++) {
+                    processTypeReferenceDirective(options.types[i], resolutions[i]);
+                }
+            }
             ts.forEach(rootNames, function (name) { return processRootFile(name, /*isDefaultLib*/ false); });
             // Do not process the default library if:
             //  - The '--noLib' flag is used.
             //  - A 'no-default-lib' reference comment is encountered in
             //      processing the root files.
             if (!skipDefaultLib) {
-                processRootFile(host.getDefaultLibFileName(options), /*isDefaultLib*/ true);
+                // If '--lib' is not specified, include default library file according to '--target'
+                // otherwise, using options specified in '--lib' instead of '--target' default library file
+                if (!options.lib) {
+                    processRootFile(host.getDefaultLibFileName(options), /*isDefaultLib*/ true);
+                }
+                else {
+                    var libDirectory_1 = host.getDefaultLibLocation ? host.getDefaultLibLocation() : ts.getDirectoryPath(host.getDefaultLibFileName(options));
+                    ts.forEach(options.lib, function (libFileName) {
+                        processRootFile(ts.combinePaths(libDirectory_1, libFileName), /*isDefaultLib*/ true);
+                    });
+                }
             }
         }
         // unconditionally set oldProgram to undefined to prevent it from being captured in closure
@@ -38831,7 +41453,8 @@ var ts;
             getIdentifierCount: function () { return getDiagnosticsProducingTypeChecker().getIdentifierCount(); },
             getSymbolCount: function () { return getDiagnosticsProducingTypeChecker().getSymbolCount(); },
             getTypeCount: function () { return getDiagnosticsProducingTypeChecker().getTypeCount(); },
-            getFileProcessingDiagnostics: function () { return fileProcessingDiagnostics; }
+            getFileProcessingDiagnostics: function () { return fileProcessingDiagnostics; },
+            resolvedTypeReferenceDirectives: resolvedTypeReferenceDirectives
         };
         verifyCompilerOptions();
         ts.programTime += new Date().getTime() - start;
@@ -38870,12 +41493,29 @@ var ts;
             if (!oldProgram) {
                 return false;
             }
+            // check properties that can affect structure of the program or module resolution strategy
+            // if any of these properties has changed - structure cannot be reused
+            var oldOptions = oldProgram.getCompilerOptions();
+            if ((oldOptions.module !== options.module) ||
+                (oldOptions.noResolve !== options.noResolve) ||
+                (oldOptions.target !== options.target) ||
+                (oldOptions.noLib !== options.noLib) ||
+                (oldOptions.jsx !== options.jsx) ||
+                (oldOptions.allowJs !== options.allowJs) ||
+                (oldOptions.rootDir !== options.rootDir) ||
+                (oldOptions.typesSearchPaths !== options.typesSearchPaths) ||
+                (oldOptions.configFilePath !== options.configFilePath)) {
+                return false;
+            }
             ts.Debug.assert(!oldProgram.structureIsReused);
             // there is an old program, check if we can reuse its structure
             var oldRootNames = oldProgram.getRootFileNames();
             if (!ts.arrayIsEqualTo(oldRootNames, rootNames)) {
                 return false;
             }
+            if (!ts.arrayIsEqualTo(options.types, oldOptions.types)) {
+                return false;
+            }
             // check if program source files has changed in the way that can affect structure of the program
             var newSourceFiles = [];
             var filePaths = [];
@@ -38909,25 +41549,32 @@ var ts;
                         // moduleAugmentations has changed
                         return false;
                     }
+                    if (!ts.arrayIsEqualTo(oldSourceFile.typeReferenceDirectives, newSourceFile.typeReferenceDirectives, fileReferenceIsEqualTo)) {
+                        // 'types' references has changed
+                        return false;
+                    }
+                    var newSourceFilePath = ts.getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory);
                     if (resolveModuleNamesWorker) {
                         var moduleNames = ts.map(ts.concatenate(newSourceFile.imports, newSourceFile.moduleAugmentations), getTextOfLiteral);
-                        var resolutions = resolveModuleNamesWorker(moduleNames, ts.getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory));
+                        var resolutions = resolveModuleNamesWorker(moduleNames, newSourceFilePath);
                         // ensure that module resolution results are still correct
-                        for (var i = 0; i < moduleNames.length; i++) {
-                            var newResolution = resolutions[i];
-                            var oldResolution = ts.getResolvedModule(oldSourceFile, moduleNames[i]);
-                            var resolutionChanged = oldResolution
-                                ? !newResolution ||
-                                    oldResolution.resolvedFileName !== newResolution.resolvedFileName ||
-                                    !!oldResolution.isExternalLibraryImport !== !!newResolution.isExternalLibraryImport
-                                : newResolution;
-                            if (resolutionChanged) {
-                                return false;
-                            }
+                        var resolutionsChanged = ts.hasChangesInResolutions(moduleNames, resolutions, oldSourceFile.resolvedModules, ts.moduleResolutionIsEqualTo);
+                        if (resolutionsChanged) {
+                            return false;
                         }
                     }
-                    // pass the cache of module resolutions from the old source file
+                    if (resolveTypeReferenceDirectiveNamesWorker) {
+                        var typesReferenceDirectives = ts.map(newSourceFile.typeReferenceDirectives, function (x) { return x.fileName; });
+                        var resolutions = resolveTypeReferenceDirectiveNamesWorker(typesReferenceDirectives, newSourceFilePath);
+                        // ensure that types resolutions are still correct
+                        var resolutionsChanged = ts.hasChangesInResolutions(typesReferenceDirectives, resolutions, oldSourceFile.resolvedTypeReferenceDirectiveNames, ts.typeDirectiveIsEqualTo);
+                        if (resolutionsChanged) {
+                            return false;
+                        }
+                    }
+                    // pass the cache of module/types resolutions from the old source file
                     newSourceFile.resolvedModules = oldSourceFile.resolvedModules;
+                    newSourceFile.resolvedTypeReferenceDirectiveNames = oldSourceFile.resolvedTypeReferenceDirectiveNames;
                     modifiedSourceFiles.push(newSourceFile);
                 }
                 else {
@@ -38947,6 +41594,7 @@ var ts;
                 var modifiedFile = modifiedSourceFiles_1[_b];
                 fileProcessingDiagnostics.reattachFileDiagnostics(modifiedFile);
             }
+            resolvedTypeReferenceDirectives = oldProgram.resolvedTypeReferenceDirectives;
             oldProgram.structureIsReused = true;
             return true;
         }
@@ -38959,7 +41607,7 @@ var ts;
                 getNewLine: function () { return host.getNewLine(); },
                 getSourceFile: program.getSourceFile,
                 getSourceFiles: program.getSourceFiles,
-                writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError) { return host.writeFile(fileName, data, writeByteOrderMark, onError); }),
+                writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }),
                 isEmitBlocked: isEmitBlocked
             };
         }
@@ -38977,13 +41625,25 @@ var ts;
             return hasEmitBlockingDiagnostics.contains(ts.toPath(emitFileName, currentDirectory, getCanonicalFileName));
         }
         function emitWorker(program, sourceFile, writeFileCallback, cancellationToken) {
+            var declarationDiagnostics = [];
+            if (options.noEmit) {
+                return { diagnostics: declarationDiagnostics, sourceMaps: undefined, emittedFiles: undefined, emitSkipped: true };
+            }
             // If the noEmitOnError flag is set, then check if we have any errors so far.  If so,
             // immediately bail out.  Note that we pass 'undefined' for 'sourceFile' so that we
             // get any preEmit diagnostics, not just the ones
             if (options.noEmitOnError) {
-                var preEmitDiagnostics = getPreEmitDiagnostics(program, /*sourceFile:*/ undefined, cancellationToken);
-                if (preEmitDiagnostics.length > 0) {
-                    return { diagnostics: preEmitDiagnostics, sourceMaps: undefined, emitSkipped: true };
+                var diagnostics = program.getOptionsDiagnostics(cancellationToken).concat(program.getSyntacticDiagnostics(sourceFile, cancellationToken), program.getGlobalDiagnostics(cancellationToken), program.getSemanticDiagnostics(sourceFile, cancellationToken));
+                if (diagnostics.length === 0 && program.getCompilerOptions().declaration) {
+                    declarationDiagnostics = program.getDeclarationDiagnostics(/*sourceFile*/ undefined, cancellationToken);
+                }
+                if (diagnostics.length > 0 || declarationDiagnostics.length > 0) {
+                    return {
+                        diagnostics: ts.concatenate(diagnostics, declarationDiagnostics),
+                        sourceMaps: undefined,
+                        emittedFiles: undefined,
+                        emitSkipped: true
+                    };
                 }
             }
             // Create the emit resolver outside of the "emitTime" tracking code below.  That way
@@ -39023,7 +41683,14 @@ var ts;
             return getDiagnosticsHelper(sourceFile, getSemanticDiagnosticsForFile, cancellationToken);
         }
         function getDeclarationDiagnostics(sourceFile, cancellationToken) {
-            return getDiagnosticsHelper(sourceFile, getDeclarationDiagnosticsForFile, cancellationToken);
+            var options = program.getCompilerOptions();
+            // collect diagnostics from the program only once if either no source file was specified or out/outFile is set (bundled emit)
+            if (!sourceFile || options.out || options.outFile) {
+                return getDeclarationDiagnosticsWorker(sourceFile, cancellationToken);
+            }
+            else {
+                return getDiagnosticsHelper(sourceFile, getDeclarationDiagnosticsForFile, cancellationToken);
+            }
         }
         function getSyntacticDiagnosticsForFile(sourceFile, cancellationToken) {
             return sourceFile.parseDiagnostics;
@@ -39037,7 +41704,7 @@ var ts;
                     // We were canceled while performing the operation.  Because our type checker
                     // might be a bad state, we need to throw it away.
                     //
-                    // Note: we are overly agressive here.  We do not actually *have* to throw away
+                    // Note: we are overly aggressive here.  We do not actually *have* to throw away
                     // the "noDiagnosticsTypeChecker".  However, for simplicity, i'd like to keep
                     // the lifetimes of these two TypeCheckers the same.  Also, we generally only
                     // cancel when the user has made a change anyways.  And, in that case, we (the
@@ -39075,44 +41742,47 @@ var ts;
                         return false;
                     }
                     switch (node.kind) {
-                        case 224 /* ImportEqualsDeclaration */:
+                        case 228 /* ImportEqualsDeclaration */:
                             diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 230 /* ExportAssignment */:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 217 /* ClassDeclaration */:
+                        case 234 /* ExportAssignment */:
+                            if (node.isExportEquals) {
+                                diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
+                                return true;
+                            }
+                            break;
+                        case 220 /* ClassDeclaration */:
                             var classDeclaration = node;
                             if (checkModifiers(classDeclaration.modifiers) ||
                                 checkTypeParameters(classDeclaration.typeParameters)) {
                                 return true;
                             }
                             break;
-                        case 246 /* HeritageClause */:
+                        case 250 /* HeritageClause */:
                             var heritageClause = node;
                             if (heritageClause.token === 106 /* ImplementsKeyword */) {
                                 diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file));
                                 return true;
                             }
                             break;
-                        case 218 /* InterfaceDeclaration */:
+                        case 221 /* InterfaceDeclaration */:
                             diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 221 /* ModuleDeclaration */:
+                        case 224 /* ModuleDeclaration */:
                             diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.module_declarations_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 219 /* TypeAliasDeclaration */:
+                        case 222 /* TypeAliasDeclaration */:
                             diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.type_aliases_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 144 /* MethodDeclaration */:
-                        case 143 /* MethodSignature */:
-                        case 145 /* Constructor */:
-                        case 146 /* GetAccessor */:
-                        case 147 /* SetAccessor */:
-                        case 176 /* FunctionExpression */:
-                        case 216 /* FunctionDeclaration */:
-                        case 177 /* ArrowFunction */:
-                        case 216 /* FunctionDeclaration */:
+                        case 146 /* MethodDeclaration */:
+                        case 145 /* MethodSignature */:
+                        case 147 /* Constructor */:
+                        case 148 /* GetAccessor */:
+                        case 149 /* SetAccessor */:
+                        case 178 /* FunctionExpression */:
+                        case 219 /* FunctionDeclaration */:
+                        case 179 /* ArrowFunction */:
+                        case 219 /* FunctionDeclaration */:
                             var functionDeclaration = node;
                             if (checkModifiers(functionDeclaration.modifiers) ||
                                 checkTypeParameters(functionDeclaration.typeParameters) ||
@@ -39120,20 +41790,20 @@ var ts;
                                 return true;
                             }
                             break;
-                        case 196 /* VariableStatement */:
+                        case 199 /* VariableStatement */:
                             var variableStatement = node;
                             if (checkModifiers(variableStatement.modifiers)) {
                                 return true;
                             }
                             break;
-                        case 214 /* VariableDeclaration */:
+                        case 217 /* VariableDeclaration */:
                             var variableDeclaration = node;
                             if (checkTypeAnnotation(variableDeclaration.type)) {
                                 return true;
                             }
                             break;
-                        case 171 /* CallExpression */:
-                        case 172 /* NewExpression */:
+                        case 173 /* CallExpression */:
+                        case 174 /* NewExpression */:
                             var expression = node;
                             if (expression.typeArguments && expression.typeArguments.length > 0) {
                                 var start_2 = expression.typeArguments.pos;
@@ -39141,7 +41811,7 @@ var ts;
                                 return true;
                             }
                             break;
-                        case 139 /* Parameter */:
+                        case 141 /* Parameter */:
                             var parameter = node;
                             if (parameter.modifiers) {
                                 var start_3 = parameter.modifiers.pos;
@@ -39157,18 +41827,20 @@ var ts;
                                 return true;
                             }
                             break;
-                        case 142 /* PropertyDeclaration */:
+                        case 144 /* PropertyDeclaration */:
                             diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.property_declarations_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 220 /* EnumDeclaration */:
+                        case 223 /* EnumDeclaration */:
                             diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 174 /* TypeAssertionExpression */:
+                        case 176 /* TypeAssertionExpression */:
                             var typeAssertionExpression = node;
                             diagnostics.push(ts.createDiagnosticForNode(typeAssertionExpression.type, ts.Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
                             return true;
-                        case 140 /* Decorator */:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.decorators_can_only_be_used_in_a_ts_file));
+                        case 142 /* Decorator */:
+                            if (!options.experimentalDecorators) {
+                                diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning));
+                            }
                             return true;
                     }
                     return ts.forEachChild(node, walk);
@@ -39196,6 +41868,7 @@ var ts;
                                 case 112 /* PublicKeyword */:
                                 case 110 /* PrivateKeyword */:
                                 case 111 /* ProtectedKeyword */:
+                                case 127 /* ReadonlyKeyword */:
                                 case 122 /* DeclareKeyword */:
                                     diagnostics.push(ts.createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
                                     return true;
@@ -39212,16 +41885,17 @@ var ts;
                 }
             });
         }
-        function getDeclarationDiagnosticsForFile(sourceFile, cancellationToken) {
+        function getDeclarationDiagnosticsWorker(sourceFile, cancellationToken) {
             return runWithCancellationToken(function () {
-                if (!ts.isDeclarationFile(sourceFile)) {
-                    var resolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile, cancellationToken);
-                    // Don't actually write any files since we're just getting diagnostics.
-                    var writeFile_1 = function () { };
-                    return ts.getDeclarationDiagnostics(getEmitHost(writeFile_1), resolver, sourceFile);
-                }
+                var resolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile, cancellationToken);
+                // Don't actually write any files since we're just getting diagnostics.
+                var writeFile = function () { };
+                return ts.getDeclarationDiagnostics(getEmitHost(writeFile), resolver, sourceFile);
             });
         }
+        function getDeclarationDiagnosticsForFile(sourceFile, cancellationToken) {
+            return ts.isDeclarationFile(sourceFile) ? [] : getDeclarationDiagnosticsWorker(sourceFile, cancellationToken);
+        }
         function getOptionsDiagnostics() {
             var allDiagnostics = [];
             ts.addRange(allDiagnostics, fileProcessingDiagnostics.getGlobalDiagnostics());
@@ -39237,7 +41911,7 @@ var ts;
             return ts.getBaseFileName(fileName).indexOf(".") >= 0;
         }
         function processRootFile(fileName, isDefaultLib) {
-            processSourceFile(ts.normalizePath(fileName), isDefaultLib);
+            processSourceFile(ts.normalizePath(fileName), isDefaultLib, /*isReference*/ true);
         }
         function fileReferenceIsEqualTo(a, b) {
             return a.fileName === b.fileName;
@@ -39268,9 +41942,9 @@ var ts;
             return;
             function collectModuleReferences(node, inAmbientModule) {
                 switch (node.kind) {
-                    case 225 /* ImportDeclaration */:
-                    case 224 /* ImportEqualsDeclaration */:
-                    case 231 /* ExportDeclaration */:
+                    case 229 /* ImportDeclaration */:
+                    case 228 /* ImportEqualsDeclaration */:
+                    case 235 /* ExportDeclaration */:
                         var moduleNameExpr = ts.getExternalModuleName(node);
                         if (!moduleNameExpr || moduleNameExpr.kind !== 9 /* StringLiteral */) {
                             break;
@@ -39279,14 +41953,14 @@ var ts;
                             break;
                         }
                         // TypeScript 1.0 spec (April 2014): 12.1.6
-                        // An ExternalImportDeclaration in an AmbientExternalModuleDeclaration may reference other external modules 
+                        // An ExternalImportDeclaration in an AmbientExternalModuleDeclaration may reference other external modules
                         // only through top - level external module names. Relative external module names are not permitted.
                         if (!inAmbientModule || !ts.isExternalModuleNameRelative(moduleNameExpr.text)) {
                             (imports || (imports = [])).push(moduleNameExpr);
                         }
                         break;
-                    case 221 /* ModuleDeclaration */:
-                        if (ts.isAmbientModule(node) && (inAmbientModule || node.flags & 4 /* Ambient */ || ts.isDeclarationFile(file))) {
+                    case 224 /* ModuleDeclaration */:
+                        if (ts.isAmbientModule(node) && (inAmbientModule || node.flags & 2 /* Ambient */ || ts.isDeclarationFile(file))) {
                             var moduleName = node.name;
                             // Ambient module declarations can be interpreted as augmentations for some existing external modules.
                             // This will happen in two cases:
@@ -39297,7 +41971,7 @@ var ts;
                                 (moduleAugmentations || (moduleAugmentations = [])).push(moduleName);
                             }
                             else if (!inAmbientModule) {
-                                // An AmbientExternalModuleDeclaration declares an external module. 
+                                // An AmbientExternalModuleDeclaration declares an external module.
                                 // This type of declaration is permitted only in the global module.
                                 // The StringLiteral must specify a top - level external module name.
                                 // Relative external module names are not permitted
@@ -39311,7 +41985,7 @@ var ts;
                 }
             }
             function collectRequireCalls(node) {
-                if (ts.isRequireCall(node)) {
+                if (ts.isRequireCall(node, /*checkArgumentIsStringLiteral*/ true)) {
                     (imports || (imports = [])).push(node.arguments[0]);
                 }
                 else {
@@ -39319,7 +41993,10 @@ var ts;
                 }
             }
         }
-        function processSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd) {
+        /**
+          * 'isReference' indicates whether the file was brought in via a reference directive (rather than an import declaration)
+          */
+        function processSourceFile(fileName, isDefaultLib, isReference, refFile, refPos, refEnd) {
             var diagnosticArgument;
             var diagnostic;
             if (hasExtension(fileName)) {
@@ -39327,7 +42004,7 @@ var ts;
                     diagnostic = ts.Diagnostics.File_0_has_unsupported_extension_The_only_supported_extensions_are_1;
                     diagnosticArgument = [fileName, "'" + supportedExtensions.join("', '") + "'"];
                 }
-                else if (!findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd)) {
+                else if (!findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, isReference, refFile, refPos, refEnd)) {
                     diagnostic = ts.Diagnostics.File_0_not_found;
                     diagnosticArgument = [fileName];
                 }
@@ -39337,13 +42014,13 @@ var ts;
                 }
             }
             else {
-                var nonTsFile = options.allowNonTsExtensions && findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd);
+                var nonTsFile = options.allowNonTsExtensions && findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, isReference, refFile, refPos, refEnd);
                 if (!nonTsFile) {
                     if (options.allowNonTsExtensions) {
                         diagnostic = ts.Diagnostics.File_0_not_found;
                         diagnosticArgument = [fileName];
                     }
-                    else if (!ts.forEach(supportedExtensions, function (extension) { return findSourceFile(fileName + extension, ts.toPath(fileName + extension, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd); })) {
+                    else if (!ts.forEach(supportedExtensions, function (extension) { return findSourceFile(fileName + extension, ts.toPath(fileName + extension, currentDirectory, getCanonicalFileName), isDefaultLib, isReference, refFile, refPos, refEnd); })) {
                         diagnostic = ts.Diagnostics.File_0_not_found;
                         fileName += ".ts";
                         diagnosticArgument = [fileName];
@@ -39368,7 +42045,7 @@ var ts;
             }
         }
         // Get source file from normalized fileName
-        function findSourceFile(fileName, path, isDefaultLib, refFile, refPos, refEnd) {
+        function findSourceFile(fileName, path, isDefaultLib, isReference, refFile, refPos, refEnd) {
             if (filesByName.contains(path)) {
                 var file_1 = filesByName.get(path);
                 // try to check if we've already seen this file but with a different casing in path
@@ -39376,6 +42053,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 (file_1) {
+                    file_1.wasReferenced = file_1.wasReferenced || isReference;
+                }
                 return file_1;
             }
             // We haven't looked for this file, do so now and cache result
@@ -39389,6 +42069,7 @@ var ts;
             });
             filesByName.set(path, file);
             if (file) {
+                file.wasReferenced = file.wasReferenced || isReference;
                 file.path = path;
                 if (host.useCaseSensitiveFileNames()) {
                     // for case-sensitive file systems check if we've already seen some file with similar filename ignoring case
@@ -39403,7 +42084,8 @@ var ts;
                 skipDefaultLib = skipDefaultLib || file.hasNoDefaultLib;
                 var basePath = ts.getDirectoryPath(fileName);
                 if (!options.noResolve) {
-                    processReferencedFiles(file, basePath);
+                    processReferencedFiles(file, basePath, isDefaultLib);
+                    processTypeReferenceDirectives(file);
                 }
                 // always process imported modules to record module name resolutions
                 processImportedModules(file, basePath);
@@ -39416,12 +42098,71 @@ var ts;
             }
             return file;
         }
-        function processReferencedFiles(file, basePath) {
+        function processReferencedFiles(file, basePath, isDefaultLib) {
             ts.forEach(file.referencedFiles, function (ref) {
                 var referencedFileName = resolveTripleslashReference(ref.fileName, file.fileName);
-                processSourceFile(referencedFileName, /*isDefaultLib*/ false, file, ref.pos, ref.end);
+                processSourceFile(referencedFileName, isDefaultLib, /*isReference*/ true, file, ref.pos, ref.end);
             });
         }
+        function processTypeReferenceDirectives(file) {
+            var typeDirectives = ts.map(file.typeReferenceDirectives, function (l) { return l.fileName; });
+            var resolutions = resolveTypeReferenceDirectiveNamesWorker(typeDirectives, file.fileName);
+            for (var i = 0; i < typeDirectives.length; i++) {
+                var ref = file.typeReferenceDirectives[i];
+                var resolvedTypeReferenceDirective = resolutions[i];
+                // store resolved type directive on the file
+                ts.setResolvedTypeReferenceDirective(file, ref.fileName, resolvedTypeReferenceDirective);
+                processTypeReferenceDirective(ref.fileName, resolvedTypeReferenceDirective, file, ref.pos, ref.end);
+            }
+        }
+        function processTypeReferenceDirective(typeReferenceDirective, resolvedTypeReferenceDirective, refFile, refPos, refEnd) {
+            // If we already found this library as a primary reference - nothing to do
+            var previousResolution = resolvedTypeReferenceDirectives[typeReferenceDirective];
+            if (previousResolution && previousResolution.primary) {
+                return;
+            }
+            var saveResolution = true;
+            if (resolvedTypeReferenceDirective) {
+                if (resolvedTypeReferenceDirective.primary) {
+                    // resolved from the primary path
+                    processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, /*isDefaultLib*/ false, /*isReference*/ true, refFile, refPos, refEnd);
+                }
+                else {
+                    // If we already resolved to this file, it must have been a secondary reference. Check file contents
+                    // for sameness and possibly issue an error
+                    if (previousResolution) {
+                        var otherFileText = host.readFile(resolvedTypeReferenceDirective.resolvedFileName);
+                        if (otherFileText !== getSourceFile(previousResolution.resolvedFileName).text) {
+                            fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd, ts.Diagnostics.Conflicting_library_definitions_for_0_found_at_1_and_2_Copy_the_correct_file_to_the_typings_folder_to_resolve_this_conflict, typeReferenceDirective, resolvedTypeReferenceDirective.resolvedFileName, previousResolution.resolvedFileName));
+                        }
+                        // don't overwrite previous resolution result
+                        saveResolution = false;
+                    }
+                    else {
+                        // First resolution of this library
+                        processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, /*isDefaultLib*/ false, /*isReference*/ true, refFile, refPos, refEnd);
+                    }
+                }
+            }
+            else {
+                fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd, ts.Diagnostics.Cannot_find_name_0, typeReferenceDirective));
+            }
+            if (saveResolution) {
+                resolvedTypeReferenceDirectives[typeReferenceDirective] = resolvedTypeReferenceDirective;
+            }
+        }
+        function createDiagnostic(refFile, refPos, refEnd, message) {
+            var args = [];
+            for (var _i = 4; _i < arguments.length; _i++) {
+                args[_i - 4] = arguments[_i];
+            }
+            if (refFile === undefined || refPos === undefined || refEnd === undefined) {
+                return ts.createCompilerDiagnostic.apply(void 0, [message].concat(args));
+            }
+            else {
+                return ts.createFileDiagnostic.apply(void 0, [refFile, refPos, refEnd - refPos, message].concat(args));
+            }
+        }
         function getCanonicalFileName(fileName) {
             return host.getCanonicalFileName(fileName);
         }
@@ -39435,18 +42176,18 @@ var ts;
                     var resolution = resolutions[i];
                     ts.setResolvedModule(file, moduleNames[i], resolution);
                     // add file to program only if:
-                    // - resolution was successfull
+                    // - resolution was successful
                     // - noResolve is falsy
                     // - module name come from the list fo imports
                     var shouldAddFile = resolution &&
                         !options.noResolve &&
                         i < file.imports.length;
                     if (shouldAddFile) {
-                        var importedFile = findSourceFile(resolution.resolvedFileName, ts.toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), /*isDefaultLib*/ false, file, ts.skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
+                        var importedFile = findSourceFile(resolution.resolvedFileName, ts.toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), /*isDefaultLib*/ false, /*isReference*/ false, file, ts.skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
                         if (importedFile && resolution.isExternalLibraryImport) {
                             // Since currently irrespective of allowJs, we only look for supportedTypeScript extension external module files,
                             // this check is ok. Otherwise this would be never true for javascript file
-                            if (!ts.isExternalModule(importedFile)) {
+                            if (!ts.isExternalModule(importedFile) && importedFile.statements.length) {
                                 var start_5 = ts.getTokenPosOfNode(file.imports[i], file);
                                 fileProcessingDiagnostics.add(ts.createFileDiagnostic(file, start_5, file.imports[i].end - start_5, ts.Diagnostics.Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition, importedFile.fileName));
                             }
@@ -39465,50 +42206,21 @@ var ts;
             return;
         }
         function computeCommonSourceDirectory(sourceFiles) {
-            var commonPathComponents;
-            var failed = ts.forEach(files, function (sourceFile) {
-                // Each file contributes into common source file path
-                if (ts.isDeclarationFile(sourceFile)) {
-                    return;
+            var fileNames = [];
+            for (var _i = 0, sourceFiles_2 = sourceFiles; _i < sourceFiles_2.length; _i++) {
+                var file = sourceFiles_2[_i];
+                if (!file.isDeclarationFile) {
+                    fileNames.push(file.fileName);
                 }
-                var sourcePathComponents = ts.getNormalizedPathComponents(sourceFile.fileName, currentDirectory);
-                sourcePathComponents.pop(); // The base file name is not part of the common directory path
-                if (!commonPathComponents) {
-                    // first file
-                    commonPathComponents = sourcePathComponents;
-                    return;
-                }
-                for (var i = 0, n = Math.min(commonPathComponents.length, sourcePathComponents.length); i < n; i++) {
-                    if (getCanonicalFileName(commonPathComponents[i]) !== getCanonicalFileName(sourcePathComponents[i])) {
-                        if (i === 0) {
-                            // Failed to find any common path component
-                            return true;
-                        }
-                        // New common path found that is 0 -> i-1
-                        commonPathComponents.length = i;
-                        break;
-                    }
-                }
-                // If the sourcePathComponents was shorter than the commonPathComponents, truncate to the sourcePathComponents
-                if (sourcePathComponents.length < commonPathComponents.length) {
-                    commonPathComponents.length = sourcePathComponents.length;
-                }
-            });
-            // A common path can not be found when paths span multiple drives on windows, for example
-            if (failed) {
-                return "";
             }
-            if (!commonPathComponents) {
-                return currentDirectory;
-            }
-            return ts.getNormalizedPathFromPathComponents(commonPathComponents);
+            return computeCommonSourceDirectoryOfFilenames(fileNames, currentDirectory, getCanonicalFileName);
         }
         function checkSourceFilesBelongToPath(sourceFiles, rootDirectory) {
             var allFilesBelongToPath = true;
             if (sourceFiles) {
                 var absoluteRootDirectoryPath = host.getCanonicalFileName(ts.getNormalizedAbsolutePath(rootDirectory, currentDirectory));
-                for (var _i = 0, sourceFiles_2 = sourceFiles; _i < sourceFiles_2.length; _i++) {
-                    var sourceFile = sourceFiles_2[_i];
+                for (var _i = 0, sourceFiles_3 = sourceFiles; _i < sourceFiles_3.length; _i++) {
+                    var sourceFile = sourceFiles_3[_i];
                     if (!ts.isDeclarationFile(sourceFile)) {
                         var absoluteSourceFilePath = host.getCanonicalFileName(ts.getNormalizedAbsolutePath(sourceFile.fileName, currentDirectory));
                         if (absoluteSourceFilePath.indexOf(absoluteRootDirectoryPath) !== 0) {
@@ -39543,6 +42255,25 @@ var ts;
                     programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "mapRoot", "inlineSourceMap"));
                 }
             }
+            if (options.paths && options.baseUrl === undefined) {
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_paths_cannot_be_used_without_specifying_baseUrl_option));
+            }
+            if (options.paths) {
+                for (var key in options.paths) {
+                    if (!ts.hasProperty(options.paths, key)) {
+                        continue;
+                    }
+                    if (!hasZeroOrOneAsteriskCharacter(key)) {
+                        programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Pattern_0_can_have_at_most_one_Asterisk_character, key));
+                    }
+                    for (var _i = 0, _a = options.paths[key]; _i < _a.length; _i++) {
+                        var subst = _a[_i];
+                        if (!hasZeroOrOneAsteriskCharacter(subst)) {
+                            programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character, subst, key));
+                        }
+                    }
+                }
+            }
             if (options.inlineSources) {
                 if (!options.sourceMap && !options.inlineSourceMap) {
                     programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_inlineSources_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_provided));
@@ -39563,11 +42294,22 @@ var ts;
                     programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "sourceRoot", "sourceMap"));
                 }
             }
+            if (options.declarationDir) {
+                if (!options.declaration) {
+                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "declarationDir", "declaration"));
+                }
+                if (options.out || options.outFile) {
+                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "declarationDir", options.out ? "out" : "outFile"));
+                }
+            }
+            if (options.lib && options.noLib) {
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "lib", "noLib"));
+            }
             var languageVersion = options.target || 0 /* ES3 */;
             var outFile = options.outFile || options.out;
             var firstExternalModuleSourceFile = ts.forEach(files, function (f) { return ts.isExternalModule(f) ? f : undefined; });
             if (options.isolatedModules) {
-                if (!options.module && languageVersion < 2 /* ES6 */) {
+                if (options.module === ts.ModuleKind.None && languageVersion < 2 /* ES6 */) {
                     programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher));
                 }
                 var firstNonExternalModuleSourceFile = ts.forEach(files, function (f) { return !ts.isExternalModule(f) && !ts.isDeclarationFile(f) ? f : undefined; });
@@ -39576,17 +42318,17 @@ var ts;
                     programDiagnostics.add(ts.createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided));
                 }
             }
-            else if (firstExternalModuleSourceFile && languageVersion < 2 /* ES6 */ && !options.module) {
+            else if (firstExternalModuleSourceFile && languageVersion < 2 /* ES6 */ && options.module === ts.ModuleKind.None) {
                 // We cannot use createDiagnosticFromNode because nodes do not have parents yet
                 var span = ts.getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator);
-                programDiagnostics.add(ts.createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_modules_unless_the_module_flag_is_provided_Consider_setting_the_module_compiler_option_in_a_tsconfig_json_file));
+                programDiagnostics.add(ts.createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_modules_unless_the_module_flag_is_provided_with_a_valid_module_type_Consider_setting_the_module_compiler_option_in_a_tsconfig_json_file));
             }
             // Cannot specify module gen target of es6 when below es6
-            if (options.module === 5 /* ES6 */ && languageVersion < 2 /* ES6 */) {
+            if (options.module === ts.ModuleKind.ES6 && languageVersion < 2 /* ES6 */) {
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_compile_modules_into_es2015_when_targeting_ES5_or_lower));
             }
             // Cannot specify module gen that isn't amd or system with --out
-            if (outFile && options.module && !(options.module === 2 /* AMD */ || options.module === 4 /* System */)) {
+            if (outFile && options.module && !(options.module === ts.ModuleKind.AMD || options.module === ts.ModuleKind.System)) {
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Only_amd_and_system_modules_are_supported_alongside_0, options.out ? "out" : "outFile"));
             }
             // there has to be common source directory if user specified --outdir || --sourceRoot
@@ -39601,21 +42343,7 @@ var ts;
                     programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_find_the_common_subdirectory_path_for_the_input_files));
                 }
             }
-            if (options.noEmit) {
-                if (options.out) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "out"));
-                }
-                if (options.outFile) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "outFile"));
-                }
-                if (options.outDir) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "outDir"));
-                }
-                if (options.declaration) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "declaration"));
-                }
-            }
-            else if (options.allowJs && options.declaration) {
+            if (!options.noEmit && options.allowJs && options.declaration) {
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "allowJs", "declaration"));
             }
             if (options.emitDecoratorMetadata &&
@@ -39623,15 +42351,15 @@ var ts;
                 programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "emitDecoratorMetadata", "experimentalDecorators"));
             }
             if (options.reactNamespace && !ts.isIdentifier(options.reactNamespace, languageVersion)) {
-                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Invalide_value_for_reactNamespace_0_is_not_a_valid_identifier, options.reactNamespace));
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier, options.reactNamespace));
             }
             // If the emit is enabled make sure that every output file is unique and not overwriting any of the input files
-            if (!options.noEmit) {
+            if (!options.noEmit && !options.suppressOutputPathCheck) {
                 var emitHost = getEmitHost();
-                var emitFilesSeen = ts.createFileMap(!host.useCaseSensitiveFileNames() ? function (key) { return key.toLocaleLowerCase(); } : undefined);
+                var emitFilesSeen_1 = ts.createFileMap(!host.useCaseSensitiveFileNames() ? function (key) { return key.toLocaleLowerCase(); } : undefined);
                 ts.forEachExpectedEmitFile(emitHost, function (emitFileNames, sourceFiles, isBundledEmit) {
-                    verifyEmitFilePath(emitFileNames.jsFilePath, emitFilesSeen);
-                    verifyEmitFilePath(emitFileNames.declarationFilePath, emitFilesSeen);
+                    verifyEmitFilePath(emitFileNames.jsFilePath, emitFilesSeen_1);
+                    verifyEmitFilePath(emitFileNames.declarationFilePath, emitFilesSeen_1);
                 });
             }
             // Verify that all the emit files are unique and don't overwrite input files
@@ -39679,6 +42407,12 @@ var ts;
             type: "boolean",
             description: ts.Diagnostics.Generates_corresponding_d_ts_file
         },
+        {
+            name: "declarationDir",
+            type: "string",
+            isFilePath: true,
+            paramType: ts.Diagnostics.DIRECTORY
+        },
         {
             name: "diagnostics",
             type: "boolean"
@@ -39713,13 +42447,12 @@ var ts;
                 "react": 2 /* React */
             },
             paramType: ts.Diagnostics.KIND,
-            description: ts.Diagnostics.Specify_JSX_code_generation_Colon_preserve_or_react,
-            error: ts.Diagnostics.Argument_for_jsx_must_be_preserve_or_react
+            description: ts.Diagnostics.Specify_JSX_code_generation_Colon_preserve_or_react
         },
         {
             name: "reactNamespace",
             type: "string",
-            description: ts.Diagnostics.Specifies_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit
+            description: ts.Diagnostics.Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit
         },
         {
             name: "listFiles",
@@ -39733,23 +42466,23 @@ var ts;
             name: "mapRoot",
             type: "string",
             isFilePath: true,
-            description: ts.Diagnostics.Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations,
+            description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations,
             paramType: ts.Diagnostics.LOCATION
         },
         {
             name: "module",
             shortName: "m",
             type: {
-                "commonjs": 1 /* CommonJS */,
-                "amd": 2 /* AMD */,
-                "system": 4 /* System */,
-                "umd": 3 /* UMD */,
-                "es6": 5 /* ES6 */,
-                "es2015": 5 /* ES2015 */
+                "none": ts.ModuleKind.None,
+                "commonjs": ts.ModuleKind.CommonJS,
+                "amd": ts.ModuleKind.AMD,
+                "system": ts.ModuleKind.System,
+                "umd": ts.ModuleKind.UMD,
+                "es6": ts.ModuleKind.ES6,
+                "es2015": ts.ModuleKind.ES2015
             },
             description: ts.Diagnostics.Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015,
-            paramType: ts.Diagnostics.KIND,
-            error: ts.Diagnostics.Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015
+            paramType: ts.Diagnostics.KIND
         },
         {
             name: "newLine",
@@ -39757,9 +42490,8 @@ var ts;
                 "crlf": 0 /* CarriageReturnLineFeed */,
                 "lf": 1 /* LineFeed */
             },
-            description: ts.Diagnostics.Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix,
-            paramType: ts.Diagnostics.NEWLINE,
-            error: ts.Diagnostics.Argument_for_newLine_option_must_be_CRLF_or_LF
+            description: ts.Diagnostics.Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix,
+            paramType: ts.Diagnostics.NEWLINE
         },
         {
             name: "noEmit",
@@ -39780,6 +42512,11 @@ var ts;
             type: "boolean",
             description: ts.Diagnostics.Raise_error_on_expressions_and_declarations_with_an_implied_any_type
         },
+        {
+            name: "noImplicitThis",
+            type: "boolean",
+            description: ts.Diagnostics.Raise_error_on_this_expressions_with_an_implied_any_type
+        },
         {
             name: "noLib",
             type: "boolean"
@@ -39820,7 +42557,6 @@ var ts;
         },
         {
             name: "pretty",
-            paramType: ts.Diagnostics.KIND,
             description: ts.Diagnostics.Stylize_errors_and_messages_using_color_and_context_experimental,
             type: "boolean"
         },
@@ -39841,8 +42577,8 @@ var ts;
             name: "rootDir",
             type: "string",
             isFilePath: true,
-            description: ts.Diagnostics.Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir,
-            paramType: ts.Diagnostics.LOCATION
+            paramType: ts.Diagnostics.LOCATION,
+            description: ts.Diagnostics.Specify_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir
         },
         {
             name: "isolatedModules",
@@ -39857,7 +42593,7 @@ var ts;
             name: "sourceRoot",
             type: "string",
             isFilePath: true,
-            description: ts.Diagnostics.Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations,
+            description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations,
             paramType: ts.Diagnostics.LOCATION
         },
         {
@@ -39886,9 +42622,8 @@ var ts;
                 "es6": 2 /* ES6 */,
                 "es2015": 2 /* ES2015 */
             },
-            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental,
-            paramType: ts.Diagnostics.VERSION,
-            error: ts.Diagnostics.Argument_for_target_option_must_be_ES3_ES5_or_ES2015
+            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015,
+            paramType: ts.Diagnostics.VERSION
         },
         {
             name: "version",
@@ -39916,11 +42651,10 @@ var ts;
         {
             name: "moduleResolution",
             type: {
-                "node": 2 /* NodeJs */,
-                "classic": 1 /* Classic */
+                "node": ts.ModuleResolutionKind.NodeJs,
+                "classic": ts.ModuleResolutionKind.Classic
             },
-            description: ts.Diagnostics.Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6,
-            error: ts.Diagnostics.Argument_for_moduleResolution_option_must_be_node_or_classic
+            description: ts.Diagnostics.Specify_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6
         },
         {
             name: "allowUnusedLabels",
@@ -39948,14 +42682,135 @@ var ts;
             description: ts.Diagnostics.Disallow_inconsistently_cased_references_to_the_same_file
         },
         {
-            name: "allowSyntheticDefaultImports",
+            name: "baseUrl",
+            type: "string",
+            isFilePath: true,
+            description: ts.Diagnostics.Base_directory_to_resolve_non_absolute_module_names
+        },
+        {
+            // this option can only be specified in tsconfig.json
+            // use type = object to copy the value as-is
+            name: "paths",
+            type: "object",
+            isTSConfigOnly: true
+        },
+        {
+            // this option can only be specified in tsconfig.json
+            // use type = object to copy the value as-is
+            name: "rootDirs",
+            type: "list",
+            isTSConfigOnly: true,
+            element: {
+                name: "rootDirs",
+                type: "string",
+                isFilePath: true
+            }
+        },
+        {
+            name: "typesSearchPaths",
+            type: "list",
+            isTSConfigOnly: true,
+            element: {
+                name: "typesSearchPaths",
+                type: "string",
+                isFilePath: true
+            }
+        },
+        {
+            name: "typesRoot",
+            type: "string"
+        },
+        {
+            name: "types",
+            type: "list",
+            element: {
+                name: "types",
+                type: "string"
+            },
+            description: ts.Diagnostics.Type_declaration_files_to_be_included_in_compilation
+        },
+        {
+            name: "traceResolution",
             type: "boolean",
-            description: ts.Diagnostics.Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking
+            description: ts.Diagnostics.Enable_tracing_of_the_name_resolution_process
         },
         {
             name: "allowJs",
             type: "boolean",
             description: ts.Diagnostics.Allow_javascript_files_to_be_compiled
+        },
+        {
+            name: "allowSyntheticDefaultImports",
+            type: "boolean",
+            description: ts.Diagnostics.Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking
+        },
+        {
+            name: "noImplicitUseStrict",
+            type: "boolean",
+            description: ts.Diagnostics.Do_not_emit_use_strict_directives_in_module_output
+        },
+        {
+            name: "listEmittedFiles",
+            type: "boolean"
+        },
+        {
+            name: "lib",
+            type: "list",
+            element: {
+                name: "lib",
+                type: {
+                    // JavaScript only
+                    "es5": "lib.es5.d.ts",
+                    "es6": "lib.es2015.d.ts",
+                    "es2015": "lib.es2015.d.ts",
+                    "es7": "lib.es2016.d.ts",
+                    "es2016": "lib.es2016.d.ts",
+                    // Host only
+                    "dom": "lib.dom.d.ts",
+                    "webworker": "lib.webworker.d.ts",
+                    "scripthost": "lib.scripthost.d.ts",
+                    // ES2015 Or ESNext By-feature options
+                    "es2015.core": "lib.es2015.core.d.ts",
+                    "es2015.collection": "lib.es2015.collection.d.ts",
+                    "es2015.generator": "lib.es2015.generator.d.ts",
+                    "es2015.iterable": "lib.es2015.iterable.d.ts",
+                    "es2015.promise": "lib.es2015.promise.d.ts",
+                    "es2015.proxy": "lib.es2015.proxy.d.ts",
+                    "es2015.reflect": "lib.es2015.reflect.d.ts",
+                    "es2015.symbol": "lib.es2015.symbol.d.ts",
+                    "es2015.symbol.wellknown": "lib.es2015.symbol.wellknown.d.ts",
+                    "es2016.array.include": "lib.es2016.array.include.d.ts"
+                }
+            },
+            description: ts.Diagnostics.Specify_library_files_to_be_included_in_the_compilation_Colon
+        },
+        {
+            name: "strictNullChecks",
+            type: "boolean",
+            description: ts.Diagnostics.Enable_strict_null_checks
+        }
+    ];
+    /* @internal */
+    ts.typingOptionDeclarations = [
+        {
+            name: "enableAutoDiscovery",
+            type: "boolean"
+        },
+        {
+            name: "include",
+            type: "list",
+            element: {
+                name: "include",
+                type: "string"
+            }
+        },
+        {
+            name: "exclude",
+            type: "list",
+            element: {
+                name: "exclude",
+                type: "string"
+            }
         }
     ];
     var optionNameMapCache;
@@ -39976,6 +42831,41 @@ var ts;
         return optionNameMapCache;
     }
     ts.getOptionNameMap = getOptionNameMap;
+    /* @internal */
+    function createCompilerDiagnosticForInvalidCustomType(opt) {
+        var namesOfType = [];
+        ts.forEachKey(opt.type, function (key) {
+            namesOfType.push(" '" + key + "'");
+        });
+        return ts.createCompilerDiagnostic(ts.Diagnostics.Argument_for_0_option_must_be_Colon_1, "--" + opt.name, namesOfType);
+    }
+    ts.createCompilerDiagnosticForInvalidCustomType = createCompilerDiagnosticForInvalidCustomType;
+    /* @internal */
+    function parseCustomTypeOption(opt, value, errors) {
+        var key = (value || "").trim().toLowerCase();
+        var map = opt.type;
+        if (ts.hasProperty(map, key)) {
+            return map[key];
+        }
+        else {
+            errors.push(createCompilerDiagnosticForInvalidCustomType(opt));
+        }
+    }
+    ts.parseCustomTypeOption = parseCustomTypeOption;
+    /* @internal */
+    function parseListTypeOption(opt, value, errors) {
+        var values = (value || "").trim().split(",");
+        switch (opt.element.type) {
+            case "number":
+                return ts.map(values, parseInt);
+            case "string":
+                return ts.map(values, function (v) { return v || ""; });
+            default:
+                return ts.filter(ts.map(values, function (v) { return parseCustomTypeOption(opt.element, v, errors); }), function (v) { return !!v; });
+        }
+    }
+    ts.parseListTypeOption = parseListTypeOption;
+    /* @internal */
     function parseCommandLine(commandLine, readFile) {
         var options = {};
         var fileNames = [];
@@ -40003,33 +42893,36 @@ var ts;
                     }
                     if (ts.hasProperty(optionNameMap, s)) {
                         var opt = optionNameMap[s];
-                        // Check to see if no argument was provided (e.g. "--locale" is the last command-line argument).
-                        if (!args[i] && opt.type !== "boolean") {
-                            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_expects_an_argument, opt.name));
+                        if (opt.isTSConfigOnly) {
+                            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_can_only_be_specified_in_tsconfig_json_file, opt.name));
                         }
-                        switch (opt.type) {
-                            case "number":
-                                options[opt.name] = parseInt(args[i]);
-                                i++;
-                                break;
-                            case "boolean":
-                                options[opt.name] = true;
-                                break;
-                            case "string":
-                                options[opt.name] = args[i] || "";
-                                i++;
-                                break;
-                            // If not a primitive, the possible types are specified in what is effectively a map of options.
-                            default:
-                                var map_1 = opt.type;
-                                var key = (args[i] || "").toLowerCase();
-                                i++;
-                                if (ts.hasProperty(map_1, key)) {
-                                    options[opt.name] = map_1[key];
-                                }
-                                else {
-                                    errors.push(ts.createCompilerDiagnostic(opt.error));
-                                }
+                        else {
+                            // Check to see if no argument was provided (e.g. "--locale" is the last command-line argument).
+                            if (!args[i] && opt.type !== "boolean") {
+                                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_expects_an_argument, opt.name));
+                            }
+                            switch (opt.type) {
+                                case "number":
+                                    options[opt.name] = parseInt(args[i]);
+                                    i++;
+                                    break;
+                                case "boolean":
+                                    options[opt.name] = true;
+                                    break;
+                                case "string":
+                                    options[opt.name] = args[i] || "";
+                                    i++;
+                                    break;
+                                case "list":
+                                    options[opt.name] = parseListTypeOption(opt, args[i], errors);
+                                    i++;
+                                    break;
+                                // If not a primitive, the possible types are specified in what is effectively a map of options.
+                                default:
+                                    options[opt.name] = parseCustomTypeOption(opt, args[i], errors);
+                                    i++;
+                                    break;
+                            }
                         }
                     }
                     else {
@@ -40138,19 +43031,24 @@ var ts;
       * @param basePath A root directory to resolve relative path entries in the config
       *    file to. e.g. outDir
       */
-    function parseJsonConfigFileContent(json, host, basePath, existingOptions) {
+    function parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName) {
         if (existingOptions === void 0) { existingOptions = {}; }
-        var _a = convertCompilerOptionsFromJson(json["compilerOptions"], basePath), optionsFromJsonConfigFile = _a.options, errors = _a.errors;
-        var options = ts.extend(existingOptions, optionsFromJsonConfigFile);
+        var errors = [];
+        var compilerOptions = convertCompilerOptionsFromJsonWorker(json["compilerOptions"], basePath, errors, configFileName);
+        var options = ts.extend(existingOptions, compilerOptions);
+        var typingOptions = convertTypingOptionsFromJsonWorker(json["typingOptions"], basePath, errors, configFileName);
+        options.configFilePath = configFileName;
+        var fileNames = getFileNames(errors);
         return {
             options: options,
-            fileNames: getFileNames(),
+            fileNames: fileNames,
+            typingOptions: typingOptions,
             errors: errors
         };
-        function getFileNames() {
+        function getFileNames(errors) {
             var fileNames = [];
             if (ts.hasProperty(json, "files")) {
-                if (json["files"] instanceof Array) {
+                if (ts.isArray(json["files"])) {
                     fileNames = ts.map(json["files"], function (s) { return ts.combinePaths(basePath, s); });
                 }
                 else {
@@ -40159,7 +43057,19 @@ var ts;
             }
             else {
                 var filesSeen = {};
-                var exclude = json["exclude"] instanceof Array ? ts.map(json["exclude"], ts.normalizeSlashes) : undefined;
+                var exclude = [];
+                if (ts.isArray(json["exclude"])) {
+                    exclude = json["exclude"];
+                }
+                else {
+                    // by default exclude node_modules, and any specificied output directory
+                    exclude = ["node_modules"];
+                    var outDir = json["compilerOptions"] && json["compilerOptions"]["outDir"];
+                    if (outDir) {
+                        exclude.push(outDir);
+                    }
+                }
+                exclude = ts.map(exclude, ts.normalizeSlashes);
                 var supportedExtensions = ts.getSupportedExtensions(options);
                 ts.Debug.assert(ts.indexOf(supportedExtensions, ".ts") < ts.indexOf(supportedExtensions, ".d.ts"), "Changed priority of extensions to pick");
                 // Get files of supported extensions in their order of resolution
@@ -40168,11 +43078,15 @@ var ts;
                     var filesInDirWithExtension = host.readDirectory(basePath, extension, exclude);
                     for (var _a = 0, filesInDirWithExtension_1 = filesInDirWithExtension; _a < filesInDirWithExtension_1.length; _a++) {
                         var fileName = filesInDirWithExtension_1[_a];
-                        // .ts extension would read the .d.ts extension files too but since .d.ts is lower priority extension, 
+                        // .ts extension would read the .d.ts extension files too but since .d.ts is lower priority extension,
                         // lets pick them when its turn comes up
                         if (extension === ".ts" && ts.fileExtensionIs(fileName, ".d.ts")) {
                             continue;
                         }
+                        // Skip over any minified JavaScript files (ending in ".min.js")
+                        if (/\.min\.js$/.test(fileName)) {
+                            continue;
+                        }
                         // If this is one of the output extension (which would be .d.ts and .js if we are allowing compilation of js files)
                         // do not include this file if we included .ts or .tsx file with same base name as it could be output of the earlier compilation
                         if (extension === ".d.ts" || (options.allowJs && ts.contains(ts.supportedJavascriptExtensions, extension))) {
@@ -40186,53 +43100,88 @@ var ts;
                     }
                 }
             }
+            if (ts.hasProperty(json, "excludes") && !ts.hasProperty(json, "exclude")) {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_option_excludes_Did_you_mean_exclude));
+            }
             return fileNames;
         }
     }
     ts.parseJsonConfigFileContent = parseJsonConfigFileContent;
-    function convertCompilerOptionsFromJson(jsonOptions, basePath) {
-        var options = {};
+    function convertCompilerOptionsFromJson(jsonOptions, basePath, configFileName) {
         var errors = [];
-        if (!jsonOptions) {
-            return { options: options, errors: errors };
-        }
-        var optionNameMap = ts.arrayToMap(ts.optionDeclarations, function (opt) { return opt.name; });
-        for (var id in jsonOptions) {
-            if (ts.hasProperty(optionNameMap, id)) {
-                var opt = optionNameMap[id];
-                var optType = opt.type;
-                var value = jsonOptions[id];
-                var expectedType = typeof optType === "string" ? optType : "string";
-                if (typeof value === expectedType) {
-                    if (typeof optType !== "string") {
-                        var key = value.toLowerCase();
-                        if (ts.hasProperty(optType, key)) {
-                            value = optType[key];
-                        }
-                        else {
-                            errors.push(ts.createCompilerDiagnostic(opt.error));
-                            value = 0;
-                        }
-                    }
-                    if (opt.isFilePath) {
-                        value = ts.normalizePath(ts.combinePaths(basePath, value));
-                        if (value === "") {
-                            value = ".";
-                        }
-                    }
-                    options[opt.name] = value;
-                }
-                else {
-                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, id, expectedType));
-                }
-            }
-            else {
-                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_compiler_option_0, id));
-            }
-        }
+        var options = convertCompilerOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName);
         return { options: options, errors: errors };
     }
     ts.convertCompilerOptionsFromJson = convertCompilerOptionsFromJson;
+    function convertTypingOptionsFromJson(jsonOptions, basePath, configFileName) {
+        var errors = [];
+        var options = convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName);
+        return { options: options, errors: errors };
+    }
+    ts.convertTypingOptionsFromJson = convertTypingOptionsFromJson;
+    function convertCompilerOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName) {
+        var options = ts.getBaseFileName(configFileName) === "jsconfig.json" ? { allowJs: true } : {};
+        convertOptionsFromJson(ts.optionDeclarations, jsonOptions, basePath, options, ts.Diagnostics.Unknown_compiler_option_0, errors);
+        return options;
+    }
+    function convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName) {
+        var options = ts.getBaseFileName(configFileName) === "jsconfig.json"
+            ? { enableAutoDiscovery: true, include: [], exclude: [] }
+            : { enableAutoDiscovery: false, include: [], exclude: [] };
+        convertOptionsFromJson(ts.typingOptionDeclarations, jsonOptions, basePath, options, ts.Diagnostics.Unknown_typing_option_0, errors);
+        return options;
+    }
+    function convertOptionsFromJson(optionDeclarations, jsonOptions, basePath, defaultOptions, diagnosticMessage, errors) {
+        if (!jsonOptions) {
+            return;
+        }
+        var optionNameMap = ts.arrayToMap(optionDeclarations, function (opt) { return opt.name; });
+        for (var id in jsonOptions) {
+            if (ts.hasProperty(optionNameMap, id)) {
+                var opt = optionNameMap[id];
+                defaultOptions[opt.name] = convertJsonOption(opt, jsonOptions[id], basePath, errors);
+            }
+            else {
+                errors.push(ts.createCompilerDiagnostic(diagnosticMessage, id));
+            }
+        }
+    }
+    function convertJsonOption(opt, value, basePath, errors) {
+        var optType = opt.type;
+        var expectedType = typeof optType === "string" ? optType : "string";
+        if (optType === "list" && ts.isArray(value)) {
+            return convertJsonOptionOfListType(opt, value, basePath, errors);
+        }
+        else if (typeof value === expectedType) {
+            if (typeof optType !== "string") {
+                return convertJsonOptionOfCustomType(opt, value, errors);
+            }
+            else {
+                if (opt.isFilePath) {
+                    value = ts.normalizePath(ts.combinePaths(basePath, value));
+                    if (value === "") {
+                        value = ".";
+                    }
+                }
+            }
+            return value;
+        }
+        else {
+            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, opt.name, expectedType));
+        }
+    }
+    function convertJsonOptionOfCustomType(opt, value, errors) {
+        var key = value.toLowerCase();
+        if (ts.hasProperty(opt.type, key)) {
+            return opt.type[key];
+        }
+        else {
+            errors.push(createCompilerDiagnosticForInvalidCustomType(opt));
+        }
+    }
+    function convertJsonOptionOfListType(option, values, basePath, errors) {
+        return ts.filter(ts.map(values, function (v) { return convertJsonOption(option.element, v, basePath, errors); }), function (v) { return !!v; });
+    }
 })(ts || (ts = {}));
 /* @internal */
 var ts;
@@ -40306,7 +43255,7 @@ var ts;
                 }
             }
             function autoCollapse(node) {
-                return ts.isFunctionBlock(node) && node.parent.kind !== 177 /* ArrowFunction */;
+                return ts.isFunctionBlock(node) && node.parent.kind !== 179 /* ArrowFunction */;
             }
             var depth = 0;
             var maxDepth = 20;
@@ -40318,30 +43267,30 @@ var ts;
                     addOutliningForLeadingCommentsForNode(n);
                 }
                 switch (n.kind) {
-                    case 195 /* Block */:
+                    case 198 /* Block */:
                         if (!ts.isFunctionBlock(n)) {
-                            var parent_8 = n.parent;
+                            var parent_11 = n.parent;
                             var openBrace = ts.findChildOfKind(n, 15 /* OpenBraceToken */, sourceFile);
                             var closeBrace = ts.findChildOfKind(n, 16 /* CloseBraceToken */, sourceFile);
                             // Check if the block is standalone, or 'attached' to some parent statement.
-                            // If the latter, we want to collaps the block, but consider its hint span
+                            // If the latter, we want to collapse the block, but consider its hint span
                             // to be the entire span of the parent.
-                            if (parent_8.kind === 200 /* DoStatement */ ||
-                                parent_8.kind === 203 /* ForInStatement */ ||
-                                parent_8.kind === 204 /* ForOfStatement */ ||
-                                parent_8.kind === 202 /* ForStatement */ ||
-                                parent_8.kind === 199 /* IfStatement */ ||
-                                parent_8.kind === 201 /* WhileStatement */ ||
-                                parent_8.kind === 208 /* WithStatement */ ||
-                                parent_8.kind === 247 /* CatchClause */) {
-                                addOutliningSpan(parent_8, openBrace, closeBrace, autoCollapse(n));
+                            if (parent_11.kind === 203 /* DoStatement */ ||
+                                parent_11.kind === 206 /* ForInStatement */ ||
+                                parent_11.kind === 207 /* ForOfStatement */ ||
+                                parent_11.kind === 205 /* ForStatement */ ||
+                                parent_11.kind === 202 /* IfStatement */ ||
+                                parent_11.kind === 204 /* WhileStatement */ ||
+                                parent_11.kind === 211 /* WithStatement */ ||
+                                parent_11.kind === 251 /* CatchClause */) {
+                                addOutliningSpan(parent_11, openBrace, closeBrace, autoCollapse(n));
                                 break;
                             }
-                            if (parent_8.kind === 212 /* TryStatement */) {
+                            if (parent_11.kind === 215 /* TryStatement */) {
                                 // Could be the try-block, or the finally-block.
-                                var tryStatement = parent_8;
+                                var tryStatement = parent_11;
                                 if (tryStatement.tryBlock === n) {
-                                    addOutliningSpan(parent_8, openBrace, closeBrace, autoCollapse(n));
+                                    addOutliningSpan(parent_11, openBrace, closeBrace, autoCollapse(n));
                                     break;
                                 }
                                 else if (tryStatement.finallyBlock === n) {
@@ -40364,23 +43313,23 @@ var ts;
                             break;
                         }
                     // Fallthrough.
-                    case 222 /* ModuleBlock */: {
+                    case 225 /* ModuleBlock */: {
                         var openBrace = ts.findChildOfKind(n, 15 /* OpenBraceToken */, sourceFile);
                         var closeBrace = ts.findChildOfKind(n, 16 /* CloseBraceToken */, sourceFile);
                         addOutliningSpan(n.parent, openBrace, closeBrace, autoCollapse(n));
                         break;
                     }
-                    case 217 /* ClassDeclaration */:
-                    case 218 /* InterfaceDeclaration */:
-                    case 220 /* EnumDeclaration */:
-                    case 168 /* ObjectLiteralExpression */:
-                    case 223 /* CaseBlock */: {
+                    case 220 /* ClassDeclaration */:
+                    case 221 /* InterfaceDeclaration */:
+                    case 223 /* EnumDeclaration */:
+                    case 170 /* ObjectLiteralExpression */:
+                    case 226 /* CaseBlock */: {
                         var openBrace = ts.findChildOfKind(n, 15 /* OpenBraceToken */, sourceFile);
                         var closeBrace = ts.findChildOfKind(n, 16 /* CloseBraceToken */, sourceFile);
                         addOutliningSpan(n, openBrace, closeBrace, autoCollapse(n));
                         break;
                     }
-                    case 167 /* ArrayLiteralExpression */:
+                    case 169 /* ArrayLiteralExpression */:
                         var openBracket = ts.findChildOfKind(n, 19 /* OpenBracketToken */, sourceFile);
                         var closeBracket = ts.findChildOfKind(n, 20 /* CloseBracketToken */, sourceFile);
                         addOutliningSpan(n, openBracket, closeBracket, autoCollapse(n));
@@ -40410,17 +43359,17 @@ var ts;
             ts.forEach(program.getSourceFiles(), function (sourceFile) {
                 cancellationToken.throwIfCancellationRequested();
                 var nameToDeclarations = sourceFile.getNamedDeclarations();
-                for (var name_31 in nameToDeclarations) {
-                    var declarations = ts.getProperty(nameToDeclarations, name_31);
+                for (var name_34 in nameToDeclarations) {
+                    var declarations = ts.getProperty(nameToDeclarations, name_34);
                     if (declarations) {
                         // First do a quick check to see if the name of the declaration matches the 
                         // last portion of the (possibly) dotted name they're searching for.
-                        var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_31);
+                        var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_34);
                         if (!matches) {
                             continue;
                         }
-                        for (var _i = 0, declarations_6 = declarations; _i < declarations_6.length; _i++) {
-                            var declaration = declarations_6[_i];
+                        for (var _i = 0, declarations_7 = declarations; _i < declarations_7.length; _i++) {
+                            var declaration = declarations_7[_i];
                             // It was a match!  If the pattern has dots in it, then also see if the 
                             // declaration container matches as well.
                             if (patternMatcher.patternContainsDots) {
@@ -40428,14 +43377,14 @@ var ts;
                                 if (!containers) {
                                     return undefined;
                                 }
-                                matches = patternMatcher.getMatches(containers, name_31);
+                                matches = patternMatcher.getMatches(containers, name_34);
                                 if (!matches) {
                                     continue;
                                 }
                             }
                             var fileName = sourceFile.fileName;
                             var matchKind = bestMatchKind(matches);
-                            rawItems.push({ name: name_31, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration });
+                            rawItems.push({ name: name_34, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration });
                         }
                     }
                 }
@@ -40473,7 +43422,7 @@ var ts;
                     if (text !== undefined) {
                         containers.unshift(text);
                     }
-                    else if (declaration.name.kind === 137 /* ComputedPropertyName */) {
+                    else if (declaration.name.kind === 139 /* ComputedPropertyName */) {
                         return tryAddComputedPropertyName(declaration.name.expression, containers, /*includeLastPortion*/ true);
                     }
                     else {
@@ -40494,7 +43443,7 @@ var ts;
                     }
                     return true;
                 }
-                if (expression.kind === 169 /* PropertyAccessExpression */) {
+                if (expression.kind === 171 /* PropertyAccessExpression */) {
                     var propertyAccess = expression;
                     if (includeLastPortion) {
                         containers.unshift(propertyAccess.name.text);
@@ -40507,7 +43456,7 @@ var ts;
                 var containers = [];
                 // First, if we started with a computed property name, then add all but the last
                 // portion into the container array.
-                if (declaration.name.kind === 137 /* ComputedPropertyName */) {
+                if (declaration.name.kind === 139 /* ComputedPropertyName */) {
                     if (!tryAddComputedPropertyName(declaration.name.expression, containers, /*includeLastPortion*/ false)) {
                         return undefined;
                     }
@@ -40570,6 +43519,11 @@ var ts;
     var NavigationBar;
     (function (NavigationBar) {
         function getNavigationBarItems(sourceFile, compilerOptions) {
+            // TODO: Handle JS files differently in 'navbar' calls for now, but ideally we should unify
+            // the 'navbar' and 'navto' logic for TypeScript and JavaScript.
+            if (ts.isSourceFileJavaScript(sourceFile)) {
+                return getJsNavigationBarItems(sourceFile, compilerOptions);
+            }
             // If the source file has any child items, then it included in the tree
             // and takes lexical ownership of all other top-level items.
             var hasGlobalNode = false;
@@ -40581,17 +43535,17 @@ var ts;
                 var current = node.parent;
                 while (current) {
                     switch (current.kind) {
-                        case 221 /* ModuleDeclaration */:
+                        case 224 /* ModuleDeclaration */:
                             // If we have a module declared as A.B.C, it is more "intuitive"
                             // to say it only has a single layer of depth
                             do {
                                 current = current.parent;
-                            } while (current.kind === 221 /* ModuleDeclaration */);
+                            } while (current.kind === 224 /* ModuleDeclaration */);
                         // fall through
-                        case 217 /* ClassDeclaration */:
-                        case 220 /* EnumDeclaration */:
-                        case 218 /* InterfaceDeclaration */:
-                        case 216 /* FunctionDeclaration */:
+                        case 220 /* ClassDeclaration */:
+                        case 223 /* EnumDeclaration */:
+                        case 221 /* InterfaceDeclaration */:
+                        case 219 /* FunctionDeclaration */:
                             indent++;
                     }
                     current = current.parent;
@@ -40602,21 +43556,21 @@ var ts;
                 var childNodes = [];
                 function visit(node) {
                     switch (node.kind) {
-                        case 196 /* VariableStatement */:
+                        case 199 /* VariableStatement */:
                             ts.forEach(node.declarationList.declarations, visit);
                             break;
-                        case 164 /* ObjectBindingPattern */:
-                        case 165 /* ArrayBindingPattern */:
+                        case 166 /* ObjectBindingPattern */:
+                        case 167 /* ArrayBindingPattern */:
                             ts.forEach(node.elements, visit);
                             break;
-                        case 231 /* ExportDeclaration */:
+                        case 235 /* ExportDeclaration */:
                             // Handle named exports case e.g.:
                             //    export {a, b as B} from "mod";
                             if (node.exportClause) {
                                 ts.forEach(node.exportClause.elements, visit);
                             }
                             break;
-                        case 225 /* ImportDeclaration */:
+                        case 229 /* ImportDeclaration */:
                             var importClause = node.importClause;
                             if (importClause) {
                                 // Handle default import case e.g.:
@@ -40628,7 +43582,7 @@ var ts;
                                 //    import * as NS from "mod";
                                 //    import {a, b as B} from "mod";
                                 if (importClause.namedBindings) {
-                                    if (importClause.namedBindings.kind === 227 /* NamespaceImport */) {
+                                    if (importClause.namedBindings.kind === 231 /* NamespaceImport */) {
                                         childNodes.push(importClause.namedBindings);
                                     }
                                     else {
@@ -40637,21 +43591,21 @@ var ts;
                                 }
                             }
                             break;
-                        case 166 /* BindingElement */:
-                        case 214 /* VariableDeclaration */:
+                        case 168 /* BindingElement */:
+                        case 217 /* VariableDeclaration */:
                             if (ts.isBindingPattern(node.name)) {
                                 visit(node.name);
                                 break;
                             }
                         // Fall through
-                        case 217 /* ClassDeclaration */:
-                        case 220 /* EnumDeclaration */:
-                        case 218 /* InterfaceDeclaration */:
-                        case 221 /* ModuleDeclaration */:
-                        case 216 /* FunctionDeclaration */:
-                        case 224 /* ImportEqualsDeclaration */:
-                        case 229 /* ImportSpecifier */:
-                        case 233 /* ExportSpecifier */:
+                        case 220 /* ClassDeclaration */:
+                        case 223 /* EnumDeclaration */:
+                        case 221 /* InterfaceDeclaration */:
+                        case 224 /* ModuleDeclaration */:
+                        case 219 /* FunctionDeclaration */:
+                        case 228 /* ImportEqualsDeclaration */:
+                        case 233 /* ImportSpecifier */:
+                        case 237 /* ExportSpecifier */:
                             childNodes.push(node);
                             break;
                     }
@@ -40699,17 +43653,31 @@ var ts;
                 for (var _i = 0, nodes_4 = nodes; _i < nodes_4.length; _i++) {
                     var node = nodes_4[_i];
                     switch (node.kind) {
-                        case 217 /* ClassDeclaration */:
-                        case 220 /* EnumDeclaration */:
-                        case 218 /* InterfaceDeclaration */:
+                        case 220 /* ClassDeclaration */:
+                            topLevelNodes.push(node);
+                            for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
+                                var member = _b[_a];
+                                if (member.kind === 146 /* MethodDeclaration */ || member.kind === 147 /* Constructor */) {
+                                    if (member.body) {
+                                        // We do not include methods that does not have child functions in it, because of duplications.
+                                        if (hasNamedFunctionDeclarations(member.body.statements)) {
+                                            topLevelNodes.push(member);
+                                        }
+                                        addTopLevelNodes(member.body.statements, topLevelNodes);
+                                    }
+                                }
+                            }
+                            break;
+                        case 223 /* EnumDeclaration */:
+                        case 221 /* InterfaceDeclaration */:
                             topLevelNodes.push(node);
                             break;
-                        case 221 /* ModuleDeclaration */:
+                        case 224 /* ModuleDeclaration */:
                             var moduleDeclaration = node;
                             topLevelNodes.push(node);
                             addTopLevelNodes(getInnermostModule(moduleDeclaration).body.statements, topLevelNodes);
                             break;
-                        case 216 /* FunctionDeclaration */:
+                        case 219 /* FunctionDeclaration */:
                             var functionDeclaration = node;
                             if (isTopLevelFunctionDeclaration(functionDeclaration)) {
                                 topLevelNodes.push(node);
@@ -40719,20 +43687,36 @@ var ts;
                     }
                 }
             }
+            function hasNamedFunctionDeclarations(nodes) {
+                for (var _i = 0, nodes_5 = nodes; _i < nodes_5.length; _i++) {
+                    var s = nodes_5[_i];
+                    if (s.kind === 219 /* FunctionDeclaration */ && !isEmpty(s.name.text)) {
+                        return true;
+                    }
+                }
+                return false;
+            }
             function isTopLevelFunctionDeclaration(functionDeclaration) {
-                if (functionDeclaration.kind === 216 /* FunctionDeclaration */) {
-                    // A function declaration is 'top level' if it contains any function declarations 
-                    // within it. 
-                    if (functionDeclaration.body && functionDeclaration.body.kind === 195 /* Block */) {
+                if (functionDeclaration.kind === 219 /* FunctionDeclaration */) {
+                    // A function declaration is 'top level' if it contains any function declarations
+                    // within it.
+                    if (functionDeclaration.body && functionDeclaration.body.kind === 198 /* Block */) {
                         // Proper function declarations can only have identifier names
-                        if (ts.forEach(functionDeclaration.body.statements, function (s) { return s.kind === 216 /* FunctionDeclaration */ && !isEmpty(s.name.text); })) {
+                        if (hasNamedFunctionDeclarations(functionDeclaration.body.statements)) {
                             return true;
                         }
-                        // Or if it is not parented by another function.  i.e all functions
-                        // at module scope are 'top level'.
+                        // Or if it is not parented by another function. I.e all functions at module scope are 'top level'.
                         if (!ts.isFunctionBlock(functionDeclaration.parent)) {
                             return true;
                         }
+                        else {
+                            // We have made sure that a grand parent node exists with 'isFunctionBlock()' above.
+                            var grandParentKind = functionDeclaration.parent.parent.kind;
+                            if (grandParentKind === 146 /* MethodDeclaration */ ||
+                                grandParentKind === 147 /* Constructor */) {
+                                return true;
+                            }
+                        }
                     }
                 }
                 return false;
@@ -40740,8 +43724,8 @@ var ts;
             function getItemsWorker(nodes, createItem) {
                 var items = [];
                 var keyToItem = {};
-                for (var _i = 0, nodes_5 = nodes; _i < nodes_5.length; _i++) {
-                    var child = nodes_5[_i];
+                for (var _i = 0, nodes_6 = nodes; _i < nodes_6.length; _i++) {
+                    var child = nodes_6[_i];
                     var item = createItem(child);
                     if (item !== undefined) {
                         if (item.text.length > 0) {
@@ -40785,44 +43769,44 @@ var ts;
             }
             function createChildItem(node) {
                 switch (node.kind) {
-                    case 139 /* Parameter */:
+                    case 141 /* Parameter */:
                         if (ts.isBindingPattern(node.name)) {
                             break;
                         }
-                        if ((node.flags & 1022 /* Modifier */) === 0) {
+                        if ((node.flags & 959 /* Modifier */) === 0) {
                             return undefined;
                         }
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberVariableElement);
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberFunctionElement);
-                    case 146 /* GetAccessor */:
+                    case 148 /* GetAccessor */:
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberGetAccessorElement);
-                    case 147 /* SetAccessor */:
+                    case 149 /* SetAccessor */:
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberSetAccessorElement);
-                    case 150 /* IndexSignature */:
+                    case 152 /* IndexSignature */:
                         return createItem(node, "[]", ts.ScriptElementKind.indexSignatureElement);
-                    case 250 /* EnumMember */:
+                    case 254 /* EnumMember */:
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberVariableElement);
-                    case 148 /* CallSignature */:
+                    case 150 /* CallSignature */:
                         return createItem(node, "()", ts.ScriptElementKind.callSignatureElement);
-                    case 149 /* ConstructSignature */:
+                    case 151 /* ConstructSignature */:
                         return createItem(node, "new()", ts.ScriptElementKind.constructSignatureElement);
-                    case 142 /* PropertyDeclaration */:
-                    case 141 /* PropertySignature */:
+                    case 144 /* PropertyDeclaration */:
+                    case 143 /* PropertySignature */:
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.memberVariableElement);
-                    case 216 /* FunctionDeclaration */:
+                    case 219 /* FunctionDeclaration */:
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.functionElement);
-                    case 214 /* VariableDeclaration */:
-                    case 166 /* BindingElement */:
-                        var variableDeclarationNode;
-                        var name_32;
-                        if (node.kind === 166 /* BindingElement */) {
-                            name_32 = node.name;
+                    case 217 /* VariableDeclaration */:
+                    case 168 /* BindingElement */:
+                        var variableDeclarationNode = void 0;
+                        var name_35;
+                        if (node.kind === 168 /* BindingElement */) {
+                            name_35 = node.name;
                             variableDeclarationNode = node;
                             // binding elements are added only for variable declarations
                             // bubble up to the containing variable declaration
-                            while (variableDeclarationNode && variableDeclarationNode.kind !== 214 /* VariableDeclaration */) {
+                            while (variableDeclarationNode && variableDeclarationNode.kind !== 217 /* VariableDeclaration */) {
                                 variableDeclarationNode = variableDeclarationNode.parent;
                             }
                             ts.Debug.assert(variableDeclarationNode !== undefined);
@@ -40830,24 +43814,24 @@ var ts;
                         else {
                             ts.Debug.assert(!ts.isBindingPattern(node.name));
                             variableDeclarationNode = node;
-                            name_32 = node.name;
+                            name_35 = node.name;
                         }
                         if (ts.isConst(variableDeclarationNode)) {
-                            return createItem(node, getTextOfNode(name_32), ts.ScriptElementKind.constElement);
+                            return createItem(node, getTextOfNode(name_35), ts.ScriptElementKind.constElement);
                         }
                         else if (ts.isLet(variableDeclarationNode)) {
-                            return createItem(node, getTextOfNode(name_32), ts.ScriptElementKind.letElement);
+                            return createItem(node, getTextOfNode(name_35), ts.ScriptElementKind.letElement);
                         }
                         else {
-                            return createItem(node, getTextOfNode(name_32), ts.ScriptElementKind.variableElement);
+                            return createItem(node, getTextOfNode(name_35), ts.ScriptElementKind.variableElement);
                         }
-                    case 145 /* Constructor */:
+                    case 147 /* Constructor */:
                         return createItem(node, "constructor", ts.ScriptElementKind.constructorImplementationElement);
-                    case 233 /* ExportSpecifier */:
-                    case 229 /* ImportSpecifier */:
-                    case 224 /* ImportEqualsDeclaration */:
-                    case 226 /* ImportClause */:
-                    case 227 /* NamespaceImport */:
+                    case 237 /* ExportSpecifier */:
+                    case 233 /* ImportSpecifier */:
+                    case 228 /* ImportEqualsDeclaration */:
+                    case 230 /* ImportClause */:
+                    case 231 /* NamespaceImport */:
                         return createItem(node, getTextOfNode(node.name), ts.ScriptElementKind.alias);
                 }
                 return undefined;
@@ -40877,17 +43861,20 @@ var ts;
             }
             function createTopLevelItem(node) {
                 switch (node.kind) {
-                    case 251 /* SourceFile */:
+                    case 255 /* SourceFile */:
                         return createSourceFileItem(node);
-                    case 217 /* ClassDeclaration */:
+                    case 220 /* ClassDeclaration */:
                         return createClassItem(node);
-                    case 220 /* EnumDeclaration */:
+                    case 146 /* MethodDeclaration */:
+                    case 147 /* Constructor */:
+                        return createMemberFunctionLikeItem(node);
+                    case 223 /* EnumDeclaration */:
                         return createEnumItem(node);
-                    case 218 /* InterfaceDeclaration */:
-                        return createIterfaceItem(node);
-                    case 221 /* ModuleDeclaration */:
+                    case 221 /* InterfaceDeclaration */:
+                        return createInterfaceItem(node);
+                    case 224 /* ModuleDeclaration */:
                         return createModuleItem(node);
-                    case 216 /* FunctionDeclaration */:
+                    case 219 /* FunctionDeclaration */:
                         return createFunctionItem(node);
                 }
                 return undefined;
@@ -40899,7 +43886,7 @@ var ts;
                     // Otherwise, we need to aggregate each identifier to build up the qualified name.
                     var result = [];
                     result.push(moduleDeclaration.name.text);
-                    while (moduleDeclaration.body && moduleDeclaration.body.kind === 221 /* ModuleDeclaration */) {
+                    while (moduleDeclaration.body && moduleDeclaration.body.kind === 224 /* ModuleDeclaration */) {
                         moduleDeclaration = moduleDeclaration.body;
                         result.push(moduleDeclaration.name.text);
                     }
@@ -40911,12 +43898,29 @@ var ts;
                     return getNavigationBarItem(moduleName, ts.ScriptElementKind.moduleElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
                 }
                 function createFunctionItem(node) {
-                    if (node.body && node.body.kind === 195 /* Block */) {
+                    if (node.body && node.body.kind === 198 /* Block */) {
                         var childItems = getItemsWorker(sortNodes(node.body.statements), createChildItem);
                         return getNavigationBarItem(!node.name ? "default" : node.name.text, ts.ScriptElementKind.functionElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
                     }
                     return undefined;
                 }
+                function createMemberFunctionLikeItem(node) {
+                    if (node.body && node.body.kind === 198 /* Block */) {
+                        var childItems = getItemsWorker(sortNodes(node.body.statements), createChildItem);
+                        var scriptElementKind = void 0;
+                        var memberFunctionName = void 0;
+                        if (node.kind === 146 /* MethodDeclaration */) {
+                            memberFunctionName = ts.getPropertyNameForPropertyNameNode(node.name);
+                            scriptElementKind = ts.ScriptElementKind.memberFunctionElement;
+                        }
+                        else {
+                            memberFunctionName = "constructor";
+                            scriptElementKind = ts.ScriptElementKind.constructorImplementationElement;
+                        }
+                        return getNavigationBarItem(memberFunctionName, scriptElementKind, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
+                    }
+                    return undefined;
+                }
                 function createSourceFileItem(node) {
                     var childItems = getItemsWorker(getChildNodes(node.statements), createChildItem);
                     if (childItems === undefined || childItems.length === 0) {
@@ -40932,7 +43936,7 @@ var ts;
                     var childItems;
                     if (node.members) {
                         var constructor = ts.forEach(node.members, function (member) {
-                            return member.kind === 145 /* Constructor */ && member;
+                            return member.kind === 147 /* Constructor */ && member;
                         });
                         // Add the constructor parameters in as children of the class (for property parameters).
                         // Note that *all non-binding pattern named* parameters will be added to the nodes array, but parameters that
@@ -40950,13 +43954,13 @@ var ts;
                     var childItems = getItemsWorker(sortNodes(removeComputedProperties(node)), createChildItem);
                     return getNavigationBarItem(node.name.text, ts.ScriptElementKind.enumElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
                 }
-                function createIterfaceItem(node) {
+                function createInterfaceItem(node) {
                     var childItems = getItemsWorker(sortNodes(removeDynamicallyNamedProperties(node)), createChildItem);
                     return getNavigationBarItem(node.name.text, ts.ScriptElementKind.interfaceElement, ts.getNodeModifiers(node), [getNodeSpan(node)], childItems, getIndent(node));
                 }
             }
             function removeComputedProperties(node) {
-                return ts.filter(node.members, function (member) { return member.name === undefined || member.name.kind !== 137 /* ComputedPropertyName */; });
+                return ts.filter(node.members, function (member) { return member.name === undefined || member.name.kind !== 139 /* ComputedPropertyName */; });
             }
             /**
              * Like removeComputedProperties, but retains the properties with well known symbol names
@@ -40965,13 +43969,13 @@ var ts;
                 return ts.filter(node.members, function (member) { return !ts.hasDynamicName(member); });
             }
             function getInnermostModule(node) {
-                while (node.body.kind === 221 /* ModuleDeclaration */) {
+                while (node.body.kind === 224 /* ModuleDeclaration */) {
                     node = node.body;
                 }
                 return node;
             }
             function getNodeSpan(node) {
-                return node.kind === 251 /* SourceFile */
+                return node.kind === 255 /* SourceFile */
                     ? ts.createTextSpanFromBounds(node.getFullStart(), node.getEnd())
                     : ts.createTextSpanFromBounds(node.getStart(), node.getEnd());
             }
@@ -40980,6 +43984,188 @@ var ts;
             }
         }
         NavigationBar.getNavigationBarItems = getNavigationBarItems;
+        function getJsNavigationBarItems(sourceFile, compilerOptions) {
+            var anonFnText = "<function>";
+            var anonClassText = "<class>";
+            var indent = 0;
+            var rootName = ts.isExternalModule(sourceFile) ?
+                "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(sourceFile.fileName)))) + "\""
+                : "<global>";
+            var sourceFileItem = getNavBarItem(rootName, ts.ScriptElementKind.moduleElement, [getNodeSpan(sourceFile)]);
+            var topItem = sourceFileItem;
+            // Walk the whole file, because we want to also find function expressions - which may be in variable initializer,
+            // call arguments, expressions, etc...
+            ts.forEachChild(sourceFile, visitNode);
+            function visitNode(node) {
+                var newItem = createNavBarItem(node);
+                if (newItem) {
+                    topItem.childItems.push(newItem);
+                }
+                // Add a level if traversing into a container
+                if (newItem && (ts.isFunctionLike(node) || ts.isClassLike(node))) {
+                    var lastTop = topItem;
+                    indent++;
+                    topItem = newItem;
+                    ts.forEachChild(node, visitNode);
+                    topItem = lastTop;
+                    indent--;
+                    // If the last item added was an anonymous function expression, and it had no children, discard it.
+                    if (newItem && newItem.text === anonFnText && newItem.childItems.length === 0) {
+                        topItem.childItems.pop();
+                    }
+                }
+                else {
+                    ts.forEachChild(node, visitNode);
+                }
+            }
+            function createNavBarItem(node) {
+                switch (node.kind) {
+                    case 217 /* VariableDeclaration */:
+                        // Only add to the navbar if at the top-level of the file
+                        // Note: "const" and "let" are also SyntaxKind.VariableDeclarations
+                        if (node.parent /*VariableDeclarationList*/.parent /*VariableStatement*/
+                            .parent /*SourceFile*/.kind !== 255 /* SourceFile */) {
+                            return undefined;
+                        }
+                        // If it is initialized with a function expression, handle it when we reach the function expression node
+                        var varDecl = node;
+                        if (varDecl.initializer && (varDecl.initializer.kind === 178 /* FunctionExpression */ ||
+                            varDecl.initializer.kind === 179 /* ArrowFunction */ ||
+                            varDecl.initializer.kind === 191 /* ClassExpression */)) {
+                            return undefined;
+                        }
+                    // Fall through
+                    case 219 /* FunctionDeclaration */:
+                    case 220 /* ClassDeclaration */:
+                    case 147 /* Constructor */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
+                        // "export default function().." looks just like a regular function/class declaration, except with the 'default' flag
+                        var name_36 = node.flags && (node.flags & 512 /* Default */) && !node.name ? "default" :
+                            node.kind === 147 /* Constructor */ ? "constructor" :
+                                ts.declarationNameToString(node.name);
+                        return getNavBarItem(name_36, getScriptKindForElementKind(node.kind), [getNodeSpan(node)]);
+                    case 178 /* FunctionExpression */:
+                    case 179 /* ArrowFunction */:
+                    case 191 /* ClassExpression */:
+                        return getDefineModuleItem(node) || getFunctionOrClassExpressionItem(node);
+                    case 146 /* MethodDeclaration */:
+                        var methodDecl = node;
+                        return getNavBarItem(ts.declarationNameToString(methodDecl.name), ts.ScriptElementKind.memberFunctionElement, [getNodeSpan(node)]);
+                    case 234 /* ExportAssignment */:
+                        // e.g. "export default <expr>"
+                        return getNavBarItem("default", ts.ScriptElementKind.variableElement, [getNodeSpan(node)]);
+                    case 230 /* ImportClause */:
+                        if (!node.name) {
+                            // No default import (this node is still a parent of named & namespace imports, which are handled below)
+                            return undefined;
+                        }
+                    // fall through
+                    case 233 /* ImportSpecifier */: // e.g. 'id' in: import {id} from 'mod' (in NamedImports, in ImportClause)
+                    case 231 /* NamespaceImport */: // e.g. '* as ns' in: import * as ns from 'mod' (in ImportClause)
+                    case 237 /* ExportSpecifier */:
+                        // Export specifiers are only interesting if they are reexports from another module, or renamed, else they are already globals
+                        if (node.kind === 237 /* ExportSpecifier */) {
+                            if (!node.parent.parent.moduleSpecifier && !node.propertyName) {
+                                return undefined;
+                            }
+                        }
+                        var decl = node;
+                        if (!decl.name) {
+                            return undefined;
+                        }
+                        var declName = ts.declarationNameToString(decl.name);
+                        return getNavBarItem(declName, ts.ScriptElementKind.constElement, [getNodeSpan(node)]);
+                    default:
+                        return undefined;
+                }
+            }
+            function getNavBarItem(text, kind, spans, kindModifiers) {
+                if (kindModifiers === void 0) { kindModifiers = ts.ScriptElementKindModifier.none; }
+                return {
+                    text: text, kind: kind, kindModifiers: kindModifiers, spans: spans, childItems: [], indent: indent, bolded: false, grayed: false
+                };
+            }
+            function getDefineModuleItem(node) {
+                if (node.kind !== 178 /* FunctionExpression */ && node.kind !== 179 /* ArrowFunction */) {
+                    return undefined;
+                }
+                // No match if this is not a call expression to an identifier named 'define'
+                if (node.parent.kind !== 173 /* CallExpression */) {
+                    return undefined;
+                }
+                var callExpr = node.parent;
+                if (callExpr.expression.kind !== 69 /* Identifier */ || callExpr.expression.getText() !== 'define') {
+                    return undefined;
+                }
+                // Return a module of either the given text in the first argument, or of the source file path
+                var defaultName = node.getSourceFile().fileName;
+                if (callExpr.arguments[0].kind === 9 /* StringLiteral */) {
+                    defaultName = (callExpr.arguments[0]).text;
+                }
+                return getNavBarItem(defaultName, ts.ScriptElementKind.moduleElement, [getNodeSpan(node.parent)]);
+            }
+            function getFunctionOrClassExpressionItem(node) {
+                if (node.kind !== 178 /* FunctionExpression */ &&
+                    node.kind !== 179 /* ArrowFunction */ &&
+                    node.kind !== 191 /* ClassExpression */) {
+                    return undefined;
+                }
+                var fnExpr = node;
+                var fnName;
+                if (fnExpr.name && ts.getFullWidth(fnExpr.name) > 0) {
+                    // The expression has an identifier, so use that as the name
+                    fnName = ts.declarationNameToString(fnExpr.name);
+                }
+                else {
+                    // See if it is a var initializer. If so, use the var name.
+                    if (fnExpr.parent.kind === 217 /* VariableDeclaration */) {
+                        fnName = ts.declarationNameToString(fnExpr.parent.name);
+                    }
+                    else if (fnExpr.parent.kind === 186 /* BinaryExpression */ &&
+                        fnExpr.parent.operatorToken.kind === 56 /* EqualsToken */) {
+                        fnName = fnExpr.parent.left.getText();
+                        if (fnName.length > 20) {
+                            fnName = fnName.substring(0, 17) + "...";
+                        }
+                    }
+                    else if (fnExpr.parent.kind === 252 /* PropertyAssignment */ &&
+                        fnExpr.parent.name) {
+                        fnName = fnExpr.parent.name.getText();
+                    }
+                    else {
+                        fnName = node.kind === 191 /* ClassExpression */ ? anonClassText : anonFnText;
+                    }
+                }
+                var scriptKind = node.kind === 191 /* ClassExpression */ ? ts.ScriptElementKind.classElement : ts.ScriptElementKind.functionElement;
+                return getNavBarItem(fnName, scriptKind, [getNodeSpan(node)]);
+            }
+            function getNodeSpan(node) {
+                return node.kind === 255 /* SourceFile */
+                    ? ts.createTextSpanFromBounds(node.getFullStart(), node.getEnd())
+                    : ts.createTextSpanFromBounds(node.getStart(), node.getEnd());
+            }
+            function getScriptKindForElementKind(kind) {
+                switch (kind) {
+                    case 217 /* VariableDeclaration */:
+                        return ts.ScriptElementKind.variableElement;
+                    case 219 /* FunctionDeclaration */:
+                        return ts.ScriptElementKind.functionElement;
+                    case 220 /* ClassDeclaration */:
+                        return ts.ScriptElementKind.classElement;
+                    case 147 /* Constructor */:
+                        return ts.ScriptElementKind.constructorImplementationElement;
+                    case 148 /* GetAccessor */:
+                        return ts.ScriptElementKind.memberGetAccessorElement;
+                    case 149 /* SetAccessor */:
+                        return ts.ScriptElementKind.memberSetAccessorElement;
+                    default:
+                        return "unknown";
+                }
+            }
+            return sourceFileItem.childItems;
+        }
+        NavigationBar.getJsNavigationBarItems = getJsNavigationBarItems;
     })(NavigationBar = ts.NavigationBar || (ts.NavigationBar = {}));
 })(ts || (ts = {}));
 /* @internal */
@@ -41596,7 +44782,7 @@ var ts;
         //                break;
         //            case TypeScript.SyntaxKind.GreaterThanGreaterThanGreaterThanToken:
         //                stack++;
-        //            // Intentaion fall through
+        //            // Intentional fall through
         //            case TypeScript.SyntaxKind.GreaterThanToken:
         //                stack++;
         //                break;
@@ -41616,7 +44802,7 @@ var ts;
         //                }
         //                break;
         //            case TypeScript.SyntaxKind.EqualsGreaterThanToken:
-        //                // This can be a function type or a constructor type. In either case, we want to skip the function defintion
+        //                // This can be a function type or a constructor type. In either case, we want to skip the function definition
         //                token = previousToken(token, /*includeSkippedTokens*/ true);
         //                if (token && token.kind() === TypeScript.SyntaxKind.CloseParenToken) {
         //                    // Skip untill the matching open paren token
@@ -41635,7 +44821,7 @@ var ts;
         //                    }
         //                }
         //                else {
-        //                    // This is not a funtion type. exit the main loop
+        //                    // This is not a function type. exit the main loop
         //                    break whileLoop;
         //                }
         //                break;
@@ -41722,7 +44908,7 @@ var ts;
             }
             return createSignatureHelpItems(candidates, resolvedSignature, argumentInfo);
             function createJavaScriptSignatureHelpItems(argumentInfo) {
-                if (argumentInfo.invocation.kind !== 171 /* CallExpression */) {
+                if (argumentInfo.invocation.kind !== 173 /* CallExpression */) {
                     return undefined;
                 }
                 // See if we can find some symbol with the call expression name that has call signatures.
@@ -41730,7 +44916,7 @@ var ts;
                 var expression = callExpression.expression;
                 var name = expression.kind === 69 /* Identifier */
                     ? expression
-                    : expression.kind === 169 /* PropertyAccessExpression */
+                    : expression.kind === 171 /* PropertyAccessExpression */
                         ? expression.name
                         : undefined;
                 if (!name || !name.text) {
@@ -41742,8 +44928,8 @@ var ts;
                     var nameToDeclarations = sourceFile_1.getNamedDeclarations();
                     var declarations = ts.getProperty(nameToDeclarations, name.text);
                     if (declarations) {
-                        for (var _b = 0, declarations_7 = declarations; _b < declarations_7.length; _b++) {
-                            var declaration = declarations_7[_b];
+                        for (var _b = 0, declarations_8 = declarations; _b < declarations_8.length; _b++) {
+                            var declaration = declarations_8[_b];
                             var symbol = declaration.symbol;
                             if (symbol) {
                                 var type = typeChecker.getTypeOfSymbolAtLocation(symbol, declaration);
@@ -41763,7 +44949,7 @@ var ts;
              * in the argument of an invocation; returns undefined otherwise.
              */
             function getImmediatelyContainingArgumentInfo(node) {
-                if (node.parent.kind === 171 /* CallExpression */ || node.parent.kind === 172 /* NewExpression */) {
+                if (node.parent.kind === 173 /* CallExpression */ || node.parent.kind === 174 /* NewExpression */) {
                     var callExpression = node.parent;
                     // There are 3 cases to handle:
                     //   1. The token introduces a list, and should begin a sig help session
@@ -41816,25 +45002,25 @@ var ts;
                         };
                     }
                 }
-                else if (node.kind === 11 /* NoSubstitutionTemplateLiteral */ && node.parent.kind === 173 /* TaggedTemplateExpression */) {
+                else if (node.kind === 11 /* NoSubstitutionTemplateLiteral */ && node.parent.kind === 175 /* TaggedTemplateExpression */) {
                     // Check if we're actually inside the template;
                     // otherwise we'll fall out and return undefined.
                     if (ts.isInsideTemplateLiteral(node, position)) {
                         return getArgumentListInfoForTemplate(node.parent, /*argumentIndex*/ 0);
                     }
                 }
-                else if (node.kind === 12 /* TemplateHead */ && node.parent.parent.kind === 173 /* TaggedTemplateExpression */) {
+                else if (node.kind === 12 /* TemplateHead */ && node.parent.parent.kind === 175 /* TaggedTemplateExpression */) {
                     var templateExpression = node.parent;
                     var tagExpression = templateExpression.parent;
-                    ts.Debug.assert(templateExpression.kind === 186 /* TemplateExpression */);
+                    ts.Debug.assert(templateExpression.kind === 188 /* TemplateExpression */);
                     var argumentIndex = ts.isInsideTemplateLiteral(node, position) ? 0 : 1;
                     return getArgumentListInfoForTemplate(tagExpression, argumentIndex);
                 }
-                else if (node.parent.kind === 193 /* TemplateSpan */ && node.parent.parent.parent.kind === 173 /* TaggedTemplateExpression */) {
+                else if (node.parent.kind === 196 /* TemplateSpan */ && node.parent.parent.parent.kind === 175 /* TaggedTemplateExpression */) {
                     var templateSpan = node.parent;
                     var templateExpression = templateSpan.parent;
                     var tagExpression = templateExpression.parent;
-                    ts.Debug.assert(templateExpression.kind === 186 /* TemplateExpression */);
+                    ts.Debug.assert(templateExpression.kind === 188 /* TemplateExpression */);
                     // If we're just after a template tail, don't show signature help.
                     if (node.kind === 14 /* TemplateTail */ && !ts.isInsideTemplateLiteral(node, position)) {
                         return undefined;
@@ -41952,7 +45138,7 @@ var ts;
                 //
                 // This is because a Missing node has no width. However, what we actually want is to include trivia
                 // leading up to the next token in case the user is about to type in a TemplateMiddle or TemplateTail.
-                if (template.kind === 186 /* TemplateExpression */) {
+                if (template.kind === 188 /* TemplateExpression */) {
                     var lastSpan = ts.lastOrUndefined(template.templateSpans);
                     if (lastSpan.literal.getFullWidth() === 0) {
                         applicableSpanEnd = ts.skipTrivia(sourceFile.text, applicableSpanEnd, /*stopAfterLineBreak*/ false);
@@ -41961,7 +45147,7 @@ var ts;
                 return ts.createTextSpan(applicableSpanStart, applicableSpanEnd - applicableSpanStart);
             }
             function getContainingArgumentInfo(node) {
-                for (var n = node; n.kind !== 251 /* SourceFile */; n = n.parent) {
+                for (var n = node; n.kind !== 255 /* SourceFile */; n = n.parent) {
                     if (ts.isFunctionBlock(n)) {
                         return undefined;
                     }
@@ -42026,7 +45212,7 @@ var ts;
                         signatureHelpParameters = typeParameters && typeParameters.length > 0 ? ts.map(typeParameters, createSignatureHelpParameterForTypeParameter) : emptyArray;
                         suffixDisplayParts.push(ts.punctuationPart(27 /* GreaterThanToken */));
                         var parameterParts = ts.mapToDisplayParts(function (writer) {
-                            return typeChecker.getSymbolDisplayBuilder().buildDisplayForParametersAndDelimiters(candidateSignature.parameters, writer, invocation);
+                            return typeChecker.getSymbolDisplayBuilder().buildDisplayForParametersAndDelimiters(candidateSignature.thisType, candidateSignature.parameters, writer, invocation);
                         });
                         ts.addRange(suffixDisplayParts, parameterParts);
                     }
@@ -42099,31 +45285,6 @@ var ts;
 /* @internal */
 var ts;
 (function (ts) {
-    function getEndLinePosition(line, sourceFile) {
-        ts.Debug.assert(line >= 0);
-        var lineStarts = sourceFile.getLineStarts();
-        var lineIndex = line;
-        if (lineIndex + 1 === lineStarts.length) {
-            // last line - return EOF
-            return sourceFile.text.length - 1;
-        }
-        else {
-            // current line start
-            var start = lineStarts[lineIndex];
-            // take the start position of the next line -1 = it should be some line break
-            var pos = lineStarts[lineIndex + 1] - 1;
-            ts.Debug.assert(ts.isLineBreak(sourceFile.text.charCodeAt(pos)));
-            // walk backwards skipping line breaks, stop the the beginning of current line.
-            // i.e:
-            // <some text>
-            // $ <- end of line for this position should match the start position
-            while (start <= pos && ts.isLineBreak(sourceFile.text.charCodeAt(pos))) {
-                pos--;
-            }
-            return pos;
-        }
-    }
-    ts.getEndLinePosition = getEndLinePosition;
     function getLineStartPositionForPosition(position, sourceFile) {
         var lineStarts = sourceFile.getLineStarts();
         var line = sourceFile.getLineAndCharacterOfPosition(position).line;
@@ -42161,40 +45322,40 @@ var ts;
             return false;
         }
         switch (n.kind) {
-            case 217 /* ClassDeclaration */:
-            case 218 /* InterfaceDeclaration */:
-            case 220 /* EnumDeclaration */:
-            case 168 /* ObjectLiteralExpression */:
-            case 164 /* ObjectBindingPattern */:
-            case 156 /* TypeLiteral */:
-            case 195 /* Block */:
-            case 222 /* ModuleBlock */:
-            case 223 /* CaseBlock */:
+            case 220 /* ClassDeclaration */:
+            case 221 /* InterfaceDeclaration */:
+            case 223 /* EnumDeclaration */:
+            case 170 /* ObjectLiteralExpression */:
+            case 166 /* ObjectBindingPattern */:
+            case 158 /* TypeLiteral */:
+            case 198 /* Block */:
+            case 225 /* ModuleBlock */:
+            case 226 /* CaseBlock */:
                 return nodeEndsWith(n, 16 /* CloseBraceToken */, sourceFile);
-            case 247 /* CatchClause */:
+            case 251 /* CatchClause */:
                 return isCompletedNode(n.block, sourceFile);
-            case 172 /* NewExpression */:
+            case 174 /* NewExpression */:
                 if (!n.arguments) {
                     return true;
                 }
             // fall through
-            case 171 /* CallExpression */:
-            case 175 /* ParenthesizedExpression */:
-            case 161 /* ParenthesizedType */:
+            case 173 /* CallExpression */:
+            case 177 /* ParenthesizedExpression */:
+            case 163 /* ParenthesizedType */:
                 return nodeEndsWith(n, 18 /* CloseParenToken */, sourceFile);
-            case 153 /* FunctionType */:
-            case 154 /* ConstructorType */:
+            case 155 /* FunctionType */:
+            case 156 /* ConstructorType */:
                 return isCompletedNode(n.type, sourceFile);
-            case 145 /* Constructor */:
-            case 146 /* GetAccessor */:
-            case 147 /* SetAccessor */:
-            case 216 /* FunctionDeclaration */:
-            case 176 /* FunctionExpression */:
-            case 144 /* MethodDeclaration */:
-            case 143 /* MethodSignature */:
-            case 149 /* ConstructSignature */:
-            case 148 /* CallSignature */:
-            case 177 /* ArrowFunction */:
+            case 147 /* Constructor */:
+            case 148 /* GetAccessor */:
+            case 149 /* SetAccessor */:
+            case 219 /* FunctionDeclaration */:
+            case 178 /* FunctionExpression */:
+            case 146 /* MethodDeclaration */:
+            case 145 /* MethodSignature */:
+            case 151 /* ConstructSignature */:
+            case 150 /* CallSignature */:
+            case 179 /* ArrowFunction */:
                 if (n.body) {
                     return isCompletedNode(n.body, sourceFile);
                 }
@@ -42204,64 +45365,64 @@ var ts;
                 // Even though type parameters can be unclosed, we can get away with
                 // having at least a closing paren.
                 return hasChildOfKind(n, 18 /* CloseParenToken */, sourceFile);
-            case 221 /* ModuleDeclaration */:
+            case 224 /* ModuleDeclaration */:
                 return n.body && isCompletedNode(n.body, sourceFile);
-            case 199 /* IfStatement */:
+            case 202 /* IfStatement */:
                 if (n.elseStatement) {
                     return isCompletedNode(n.elseStatement, sourceFile);
                 }
                 return isCompletedNode(n.thenStatement, sourceFile);
-            case 198 /* ExpressionStatement */:
+            case 201 /* ExpressionStatement */:
                 return isCompletedNode(n.expression, sourceFile) ||
                     hasChildOfKind(n, 23 /* SemicolonToken */);
-            case 167 /* ArrayLiteralExpression */:
-            case 165 /* ArrayBindingPattern */:
-            case 170 /* ElementAccessExpression */:
-            case 137 /* ComputedPropertyName */:
-            case 158 /* TupleType */:
+            case 169 /* ArrayLiteralExpression */:
+            case 167 /* ArrayBindingPattern */:
+            case 172 /* ElementAccessExpression */:
+            case 139 /* ComputedPropertyName */:
+            case 160 /* TupleType */:
                 return nodeEndsWith(n, 20 /* CloseBracketToken */, sourceFile);
-            case 150 /* IndexSignature */:
+            case 152 /* IndexSignature */:
                 if (n.type) {
                     return isCompletedNode(n.type, sourceFile);
                 }
                 return hasChildOfKind(n, 20 /* CloseBracketToken */, sourceFile);
-            case 244 /* CaseClause */:
-            case 245 /* DefaultClause */:
-                // there is no such thing as terminator token for CaseClause/DefaultClause so for simplicitly always consider them non-completed
+            case 248 /* CaseClause */:
+            case 249 /* DefaultClause */:
+                // there is no such thing as terminator token for CaseClause/DefaultClause so for simplicity always consider them non-completed
                 return false;
-            case 202 /* ForStatement */:
-            case 203 /* ForInStatement */:
-            case 204 /* ForOfStatement */:
-            case 201 /* WhileStatement */:
+            case 205 /* ForStatement */:
+            case 206 /* ForInStatement */:
+            case 207 /* ForOfStatement */:
+            case 204 /* WhileStatement */:
                 return isCompletedNode(n.statement, sourceFile);
-            case 200 /* DoStatement */:
+            case 203 /* DoStatement */:
                 // rough approximation: if DoStatement has While keyword - then if node is completed is checking the presence of ')';
                 var hasWhileKeyword = findChildOfKind(n, 104 /* WhileKeyword */, sourceFile);
                 if (hasWhileKeyword) {
                     return nodeEndsWith(n, 18 /* CloseParenToken */, sourceFile);
                 }
                 return isCompletedNode(n.statement, sourceFile);
-            case 155 /* TypeQuery */:
+            case 157 /* TypeQuery */:
                 return isCompletedNode(n.exprName, sourceFile);
-            case 179 /* TypeOfExpression */:
-            case 178 /* DeleteExpression */:
-            case 180 /* VoidExpression */:
-            case 187 /* YieldExpression */:
-            case 188 /* SpreadElementExpression */:
+            case 181 /* TypeOfExpression */:
+            case 180 /* DeleteExpression */:
+            case 182 /* VoidExpression */:
+            case 189 /* YieldExpression */:
+            case 190 /* SpreadElementExpression */:
                 var unaryWordExpression = n;
                 return isCompletedNode(unaryWordExpression.expression, sourceFile);
-            case 173 /* TaggedTemplateExpression */:
+            case 175 /* TaggedTemplateExpression */:
                 return isCompletedNode(n.template, sourceFile);
-            case 186 /* TemplateExpression */:
+            case 188 /* TemplateExpression */:
                 var lastSpan = ts.lastOrUndefined(n.templateSpans);
                 return isCompletedNode(lastSpan, sourceFile);
-            case 193 /* TemplateSpan */:
+            case 196 /* TemplateSpan */:
                 return ts.nodeIsPresent(n.literal);
-            case 182 /* PrefixUnaryExpression */:
+            case 184 /* PrefixUnaryExpression */:
                 return isCompletedNode(n.operand, sourceFile);
-            case 184 /* BinaryExpression */:
+            case 186 /* BinaryExpression */:
                 return isCompletedNode(n.right, sourceFile);
-            case 185 /* ConditionalExpression */:
+            case 187 /* ConditionalExpression */:
                 return isCompletedNode(n.whenFalse, sourceFile);
             default:
                 return true;
@@ -42317,7 +45478,7 @@ var ts;
         // for the position of the relevant node (or comma).
         var syntaxList = ts.forEach(node.parent.getChildren(), function (c) {
             // find syntax list that covers the span of the node
-            if (c.kind === 274 /* SyntaxList */ && c.pos <= node.pos && c.end >= node.end) {
+            if (c.kind === 278 /* SyntaxList */ && c.pos <= node.pos && c.end >= node.end) {
                 return c;
             }
         });
@@ -42334,7 +45495,7 @@ var ts;
     }
     ts.getTouchingWord = getTouchingWord;
     /* Gets the token whose text has range [start, end) and position >= start
-     * and (position < end or (position === end && token is keyword or identifier or numeric\string litera))
+     * and (position < end or (position === end && token is keyword or identifier or numeric/string literal))
      */
     function getTouchingPropertyName(sourceFile, position) {
         return getTouchingToken(sourceFile, position, function (n) { return isPropertyName(n.kind); });
@@ -42423,7 +45584,7 @@ var ts;
     function findPrecedingToken(position, sourceFile, startNode) {
         return find(startNode || sourceFile);
         function findRightmostToken(n) {
-            if (isToken(n) || n.kind === 239 /* JsxText */) {
+            if (isToken(n) || n.kind === 243 /* JsxText */) {
                 return n;
             }
             var children = n.getChildren();
@@ -42431,7 +45592,7 @@ var ts;
             return candidate && findRightmostToken(candidate);
         }
         function find(n) {
-            if (isToken(n) || n.kind === 239 /* JsxText */) {
+            if (isToken(n) || n.kind === 243 /* JsxText */) {
                 return n;
             }
             var children = n.getChildren();
@@ -42445,10 +45606,10 @@ var ts;
                 // if no - position is in the node itself so we should recurse in it.
                 // NOTE: JsxText is a weird kind of node that can contain only whitespaces (since they are not counted as trivia).
                 // if this is the case - then we should assume that token in question is located in previous child.
-                if (position < child.end && (nodeHasTokens(child) || child.kind === 239 /* JsxText */)) {
+                if (position < child.end && (nodeHasTokens(child) || child.kind === 243 /* JsxText */)) {
                     var start = child.getStart(sourceFile);
                     var lookInPreviousChild = (start >= position) ||
-                        (child.kind === 239 /* JsxText */ && start === child.end); // whitespace only JsxText
+                        (child.kind === 243 /* JsxText */ && start === child.end); // whitespace only JsxText
                     if (lookInPreviousChild) {
                         // actual start of the node is past the position - previous token should be at the end of previous child
                         var candidate = findRightmostChildNodeWithTokens(children, /*exclusiveStartPosition*/ i);
@@ -42460,7 +45621,7 @@ var ts;
                     }
                 }
             }
-            ts.Debug.assert(startNode !== undefined || n.kind === 251 /* SourceFile */);
+            ts.Debug.assert(startNode !== undefined || n.kind === 255 /* SourceFile */);
             // Here we know that none of child token nodes embrace the position,
             // the only known case is when position is at the end of the file.
             // Try to find the rightmost token in the file without filtering.
@@ -42482,7 +45643,7 @@ var ts;
     ts.findPrecedingToken = findPrecedingToken;
     function isInString(sourceFile, position) {
         var token = getTokenAtPosition(sourceFile, position);
-        return token && (token.kind === 9 /* StringLiteral */ || token.kind === 163 /* StringLiteralType */) && position > token.getStart();
+        return token && (token.kind === 9 /* StringLiteral */ || token.kind === 165 /* StringLiteralType */) && position > token.getStart();
     }
     ts.isInString = isInString;
     function isInComment(sourceFile, position) {
@@ -42568,17 +45729,17 @@ var ts;
     function getNodeModifiers(node) {
         var flags = ts.getCombinedNodeFlags(node);
         var result = [];
-        if (flags & 16 /* Private */)
+        if (flags & 8 /* Private */)
             result.push(ts.ScriptElementKindModifier.privateMemberModifier);
-        if (flags & 32 /* Protected */)
+        if (flags & 16 /* Protected */)
             result.push(ts.ScriptElementKindModifier.protectedMemberModifier);
-        if (flags & 8 /* Public */)
+        if (flags & 4 /* Public */)
             result.push(ts.ScriptElementKindModifier.publicMemberModifier);
-        if (flags & 64 /* Static */)
+        if (flags & 32 /* Static */)
             result.push(ts.ScriptElementKindModifier.staticModifier);
         if (flags & 128 /* Abstract */)
             result.push(ts.ScriptElementKindModifier.abstractModifier);
-        if (flags & 2 /* Export */)
+        if (flags & 1 /* Export */)
             result.push(ts.ScriptElementKindModifier.exportedModifier);
         if (ts.isInAmbientContext(node))
             result.push(ts.ScriptElementKindModifier.ambientModifier);
@@ -42586,17 +45747,17 @@ var ts;
     }
     ts.getNodeModifiers = getNodeModifiers;
     function getTypeArgumentOrTypeParameterList(node) {
-        if (node.kind === 152 /* TypeReference */ || node.kind === 171 /* CallExpression */) {
+        if (node.kind === 154 /* TypeReference */ || node.kind === 173 /* CallExpression */) {
             return node.typeArguments;
         }
-        if (ts.isFunctionLike(node) || node.kind === 217 /* ClassDeclaration */ || node.kind === 218 /* InterfaceDeclaration */) {
+        if (ts.isFunctionLike(node) || node.kind === 220 /* ClassDeclaration */ || node.kind === 221 /* InterfaceDeclaration */) {
             return node.typeParameters;
         }
         return undefined;
     }
     ts.getTypeArgumentOrTypeParameterList = getTypeArgumentOrTypeParameterList;
     function isToken(n) {
-        return n.kind >= 0 /* FirstToken */ && n.kind <= 135 /* LastToken */;
+        return n.kind >= 0 /* FirstToken */ && n.kind <= 137 /* LastToken */;
     }
     ts.isToken = isToken;
     function isWord(kind) {
@@ -42612,7 +45773,7 @@ var ts;
     ts.isComment = isComment;
     function isStringOrRegularExpressionOrTemplateLiteral(kind) {
         if (kind === 9 /* StringLiteral */
-            || kind === 163 /* StringLiteralType */
+            || kind === 165 /* StringLiteralType */
             || kind === 10 /* RegularExpressionLiteral */
             || ts.isTemplateLiteralKind(kind)) {
             return true;
@@ -42656,18 +45817,18 @@ var ts;
     }
     ts.compareDataObjects = compareDataObjects;
     function isArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-        if (node.kind === 167 /* ArrayLiteralExpression */ ||
-            node.kind === 168 /* ObjectLiteralExpression */) {
+        if (node.kind === 169 /* ArrayLiteralExpression */ ||
+            node.kind === 170 /* ObjectLiteralExpression */) {
             // [a,b,c] from:
             // [a, b, c] = someExpression;
-            if (node.parent.kind === 184 /* BinaryExpression */ &&
+            if (node.parent.kind === 186 /* BinaryExpression */ &&
                 node.parent.left === node &&
                 node.parent.operatorToken.kind === 56 /* EqualsToken */) {
                 return true;
             }
             // [a, b, c] from:
             // for([a, b, c] of expression)
-            if (node.parent.kind === 204 /* ForOfStatement */ &&
+            if (node.parent.kind === 207 /* ForOfStatement */ &&
                 node.parent.initializer === node) {
                 return true;
             }
@@ -42675,7 +45836,7 @@ var ts;
             // [x, [a, b, c] ] = someExpression
             // or 
             // {x, a: {a, b, c} } = someExpression
-            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 248 /* PropertyAssignment */ ? node.parent.parent : node.parent)) {
+            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 252 /* PropertyAssignment */ ? node.parent.parent : node.parent)) {
                 return true;
             }
         }
@@ -42688,7 +45849,7 @@ var ts;
 var ts;
 (function (ts) {
     function isFirstDeclarationOfSymbolParameter(symbol) {
-        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 139 /* Parameter */;
+        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 141 /* Parameter */;
     }
     ts.isFirstDeclarationOfSymbolParameter = isFirstDeclarationOfSymbolParameter;
     var displayPartWriter = getDisplayPartWriter();
@@ -42876,7 +46037,7 @@ var ts;
     ts.getDeclaredName = getDeclaredName;
     function isImportOrExportSpecifierName(location) {
         return location.parent &&
-            (location.parent.kind === 229 /* ImportSpecifier */ || location.parent.kind === 233 /* ExportSpecifier */) &&
+            (location.parent.kind === 233 /* ImportSpecifier */ || location.parent.kind === 237 /* ExportSpecifier */) &&
             location.parent.propertyName === location;
     }
     ts.isImportOrExportSpecifierName = isImportOrExportSpecifierName;
@@ -42896,6 +46057,213 @@ var ts;
         return name;
     }
     ts.stripQuotes = stripQuotes;
+    function scriptKindIs(fileName, host) {
+        var scriptKinds = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            scriptKinds[_i - 2] = arguments[_i];
+        }
+        var scriptKind = getScriptKind(fileName, host);
+        return ts.forEach(scriptKinds, function (k) { return k === scriptKind; });
+    }
+    ts.scriptKindIs = scriptKindIs;
+    function getScriptKind(fileName, host) {
+        // First check to see if the script kind can be determined from the file name
+        var scriptKind = ts.getScriptKindFromFileName(fileName);
+        if (scriptKind === 0 /* Unknown */ && host && host.getScriptKind) {
+            // Next check to see if the host can resolve the script kind
+            scriptKind = host.getScriptKind(fileName);
+        }
+        return ts.ensureScriptKind(fileName, scriptKind);
+    }
+    ts.getScriptKind = getScriptKind;
+})(ts || (ts = {}));
+// Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0.
+// See LICENSE.txt in the project root for complete license information.
+/// <reference path='services.ts' />
+/* @internal */
+var ts;
+(function (ts) {
+    var JsTyping;
+    (function (JsTyping) {
+        ;
+        ;
+        // A map of loose file names to library names
+        // that we are confident require typings
+        var safeList;
+        /**
+         * @param host is the object providing I/O related operations.
+         * @param fileNames are the file names that belong to the same project
+         * @param projectRootPath is the path to the project root directory
+         * @param safeListPath is the path used to retrieve the safe list
+         * @param packageNameToTypingLocation is the map of package names to their cached typing locations
+         * @param typingOptions are used to customize the typing inference process
+         * @param compilerOptions are used as a source for typing inference
+         */
+        function discoverTypings(host, fileNames, projectRootPath, safeListPath, packageNameToTypingLocation, typingOptions, compilerOptions) {
+            // A typing name to typing file path mapping
+            var inferredTypings = {};
+            if (!typingOptions || !typingOptions.enableAutoDiscovery) {
+                return { cachedTypingPaths: [], newTypingNames: [], filesToWatch: [] };
+            }
+            // Only infer typings for .js and .jsx files
+            fileNames = ts.filter(ts.map(fileNames, ts.normalizePath), function (f) { return ts.scriptKindIs(f, /*LanguageServiceHost*/ undefined, 1 /* JS */, 2 /* JSX */); });
+            if (!safeList) {
+                var result = ts.readConfigFile(safeListPath, function (path) { return host.readFile(path); });
+                if (result.config) {
+                    safeList = result.config;
+                }
+                else {
+                    safeList = {};
+                }
+                ;
+            }
+            var filesToWatch = [];
+            // Directories to search for package.json, bower.json and other typing information
+            var searchDirs = [];
+            var exclude = [];
+            mergeTypings(typingOptions.include);
+            exclude = typingOptions.exclude || [];
+            var possibleSearchDirs = ts.map(fileNames, ts.getDirectoryPath);
+            if (projectRootPath !== undefined) {
+                possibleSearchDirs.push(projectRootPath);
+            }
+            searchDirs = ts.deduplicate(possibleSearchDirs);
+            for (var _i = 0, searchDirs_1 = searchDirs; _i < searchDirs_1.length; _i++) {
+                var searchDir = searchDirs_1[_i];
+                var packageJsonPath = ts.combinePaths(searchDir, "package.json");
+                getTypingNamesFromJson(packageJsonPath, filesToWatch);
+                var bowerJsonPath = ts.combinePaths(searchDir, "bower.json");
+                getTypingNamesFromJson(bowerJsonPath, filesToWatch);
+                var nodeModulesPath = ts.combinePaths(searchDir, "node_modules");
+                getTypingNamesFromNodeModuleFolder(nodeModulesPath);
+            }
+            getTypingNamesFromSourceFileNames(fileNames);
+            // Add the cached typing locations for inferred typings that are already installed
+            for (var name_37 in packageNameToTypingLocation) {
+                if (ts.hasProperty(inferredTypings, name_37) && !inferredTypings[name_37]) {
+                    inferredTypings[name_37] = packageNameToTypingLocation[name_37];
+                }
+            }
+            // Remove typings that the user has added to the exclude list
+            for (var _a = 0, exclude_1 = exclude; _a < exclude_1.length; _a++) {
+                var excludeTypingName = exclude_1[_a];
+                delete inferredTypings[excludeTypingName];
+            }
+            var newTypingNames = [];
+            var cachedTypingPaths = [];
+            for (var typing in inferredTypings) {
+                if (inferredTypings[typing] !== undefined) {
+                    cachedTypingPaths.push(inferredTypings[typing]);
+                }
+                else {
+                    newTypingNames.push(typing);
+                }
+            }
+            return { cachedTypingPaths: cachedTypingPaths, newTypingNames: newTypingNames, filesToWatch: filesToWatch };
+            /**
+             * Merge a given list of typingNames to the inferredTypings map
+             */
+            function mergeTypings(typingNames) {
+                if (!typingNames) {
+                    return;
+                }
+                for (var _i = 0, typingNames_1 = typingNames; _i < typingNames_1.length; _i++) {
+                    var typing = typingNames_1[_i];
+                    if (!ts.hasProperty(inferredTypings, typing)) {
+                        inferredTypings[typing] = undefined;
+                    }
+                }
+            }
+            /**
+             * Get the typing info from common package manager json files like package.json or bower.json
+             */
+            function getTypingNamesFromJson(jsonPath, filesToWatch) {
+                var result = ts.readConfigFile(jsonPath, function (path) { return host.readFile(path); });
+                if (result.config) {
+                    var jsonConfig = result.config;
+                    filesToWatch.push(jsonPath);
+                    if (jsonConfig.dependencies) {
+                        mergeTypings(ts.getKeys(jsonConfig.dependencies));
+                    }
+                    if (jsonConfig.devDependencies) {
+                        mergeTypings(ts.getKeys(jsonConfig.devDependencies));
+                    }
+                    if (jsonConfig.optionalDependencies) {
+                        mergeTypings(ts.getKeys(jsonConfig.optionalDependencies));
+                    }
+                    if (jsonConfig.peerDependencies) {
+                        mergeTypings(ts.getKeys(jsonConfig.peerDependencies));
+                    }
+                }
+            }
+            /**
+             * Infer typing names from given file names. For example, the file name "jquery-min.2.3.4.js"
+             * should be inferred to the 'jquery' typing name; and "angular-route.1.2.3.js" should be inferred
+             * to the 'angular-route' typing name.
+             * @param fileNames are the names for source files in the project
+             */
+            function getTypingNamesFromSourceFileNames(fileNames) {
+                var jsFileNames = ts.filter(fileNames, ts.hasJavaScriptFileExtension);
+                var inferredTypingNames = ts.map(jsFileNames, function (f) { return ts.removeFileExtension(ts.getBaseFileName(f.toLowerCase())); });
+                var cleanedTypingNames = ts.map(inferredTypingNames, function (f) { return f.replace(/((?:\.|-)min(?=\.|$))|((?:-|\.)\d+)/g, ""); });
+                if (safeList === undefined) {
+                    mergeTypings(cleanedTypingNames);
+                }
+                else {
+                    mergeTypings(ts.filter(cleanedTypingNames, function (f) { return ts.hasProperty(safeList, f); }));
+                }
+                var hasJsxFile = ts.forEach(fileNames, function (f) { return ts.scriptKindIs(f, /*LanguageServiceHost*/ undefined, 2 /* JSX */); });
+                if (hasJsxFile) {
+                    mergeTypings(["react"]);
+                }
+            }
+            /**
+             * Infer typing names from node_module folder
+             * @param nodeModulesPath is the path to the "node_modules" folder
+             */
+            function getTypingNamesFromNodeModuleFolder(nodeModulesPath) {
+                // Todo: add support for ModuleResolutionHost too
+                if (!host.directoryExists(nodeModulesPath)) {
+                    return;
+                }
+                var typingNames = [];
+                var fileNames = host.readDirectory(nodeModulesPath, "*.json", /*exclude*/ undefined, /*depth*/ 2);
+                for (var _i = 0, fileNames_1 = fileNames; _i < fileNames_1.length; _i++) {
+                    var fileName = fileNames_1[_i];
+                    var normalizedFileName = ts.normalizePath(fileName);
+                    if (ts.getBaseFileName(normalizedFileName) !== "package.json") {
+                        continue;
+                    }
+                    var result = ts.readConfigFile(normalizedFileName, function (path) { return host.readFile(path); });
+                    if (!result.config) {
+                        continue;
+                    }
+                    var packageJson = result.config;
+                    // npm 3's package.json contains a "_requiredBy" field
+                    // we should include all the top level module names for npm 2, and only module names whose
+                    // "_requiredBy" field starts with "#" or equals "/" for npm 3.
+                    if (packageJson._requiredBy &&
+                        ts.filter(packageJson._requiredBy, function (r) { return r[0] === "#" || r === "/"; }).length === 0) {
+                        continue;
+                    }
+                    // If the package has its own d.ts typings, those will take precedence. Otherwise the package name will be used
+                    // to download d.ts files from DefinitelyTyped
+                    if (!packageJson.name) {
+                        continue;
+                    }
+                    if (packageJson.typings) {
+                        var absolutePath = ts.getNormalizedAbsolutePath(packageJson.typings, ts.getDirectoryPath(normalizedFileName));
+                        inferredTypings[packageJson.name] = absolutePath;
+                    }
+                    else {
+                        typingNames.push(packageJson.name);
+                    }
+                }
+                mergeTypings(typingNames);
+            }
+        }
+        JsTyping.discoverTypings = discoverTypings;
+    })(JsTyping = ts.JsTyping || (ts.JsTyping = {}));
 })(ts || (ts = {}));
 /// <reference path="formatting.ts"/>
 /// <reference path="..\..\compiler\scanner.ts"/>
@@ -42999,10 +46367,10 @@ var ts;
             function shouldRescanJsxIdentifier(node) {
                 if (node.parent) {
                     switch (node.parent.kind) {
-                        case 241 /* JsxAttribute */:
-                        case 238 /* JsxOpeningElement */:
-                        case 240 /* JsxClosingElement */:
-                        case 237 /* JsxSelfClosingElement */:
+                        case 245 /* JsxAttribute */:
+                        case 242 /* JsxOpeningElement */:
+                        case 244 /* JsxClosingElement */:
+                        case 241 /* JsxSelfClosingElement */:
                             return node.kind === 69 /* Identifier */;
                     }
                 }
@@ -43043,7 +46411,7 @@ var ts;
                     // readTokenInfo was called before with the same expected scan action.
                     // No need to re-scan text, return existing 'lastTokenInfo'
                     // it is ok to call fixTokenKind here since it does not affect
-                    // what portion of text is consumed. In opposize rescanning can change it,
+                    // what portion of text is consumed. In contrast rescanning can change it,
                     // i.e. for '>=' when originally scanner eats just one character
                     // and rescanning forces it to consume more.
                     return fixTokenKind(lastTokenInfo, n);
@@ -43391,25 +46759,25 @@ var ts;
                 this.IgnoreBeforeComment = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.Comments), formatting.RuleOperation.create1(1 /* Ignore */));
                 this.IgnoreAfterLineComment = new formatting.Rule(formatting.RuleDescriptor.create3(2 /* SingleLineCommentTrivia */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create1(1 /* Ignore */));
                 // Space after keyword but not before ; or : or ?
-                this.NoSpaceBeforeSemicolon = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 23 /* SemicolonToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceBeforeColon = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 54 /* ColonToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), 8 /* Delete */));
-                this.NoSpaceBeforeQuestionMark = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 53 /* QuestionToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), 8 /* Delete */));
-                this.SpaceAfterColon = new formatting.Rule(formatting.RuleDescriptor.create3(54 /* ColonToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), 2 /* Space */));
-                this.SpaceAfterQuestionMarkInConditionalOperator = new formatting.Rule(formatting.RuleDescriptor.create3(53 /* QuestionToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsConditionalOperatorContext), 2 /* Space */));
-                this.NoSpaceAfterQuestionMark = new formatting.Rule(formatting.RuleDescriptor.create3(53 /* QuestionToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.SpaceAfterSemicolon = new formatting.Rule(formatting.RuleDescriptor.create3(23 /* SemicolonToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
+                this.NoSpaceBeforeSemicolon = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 23 /* SemicolonToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceBeforeColon = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 54 /* ColonToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBinaryOpContext), 8 /* Delete */));
+                this.NoSpaceBeforeQuestionMark = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 53 /* QuestionToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBinaryOpContext), 8 /* Delete */));
+                this.SpaceAfterColon = new formatting.Rule(formatting.RuleDescriptor.create3(54 /* ColonToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBinaryOpContext), 2 /* Space */));
+                this.SpaceAfterQuestionMarkInConditionalOperator = new formatting.Rule(formatting.RuleDescriptor.create3(53 /* QuestionToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsConditionalOperatorContext), 2 /* Space */));
+                this.NoSpaceAfterQuestionMark = new formatting.Rule(formatting.RuleDescriptor.create3(53 /* QuestionToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.SpaceAfterSemicolon = new formatting.Rule(formatting.RuleDescriptor.create3(23 /* SemicolonToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
                 // Space after }.
-                this.SpaceAfterCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create3(16 /* CloseBraceToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsAfterCodeBlockContext), 2 /* Space */));
+                this.SpaceAfterCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create3(16 /* CloseBraceToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsAfterCodeBlockContext), 2 /* Space */));
                 // Special case for (}, else) and (}, while) since else & while tokens are not part of the tree which makes SpaceAfterCloseBrace rule not applied
-                this.SpaceBetweenCloseBraceAndElse = new formatting.Rule(formatting.RuleDescriptor.create1(16 /* CloseBraceToken */, 80 /* ElseKeyword */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
-                this.SpaceBetweenCloseBraceAndWhile = new formatting.Rule(formatting.RuleDescriptor.create1(16 /* CloseBraceToken */, 104 /* WhileKeyword */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
-                this.NoSpaceAfterCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create3(16 /* CloseBraceToken */, formatting.Shared.TokenRange.FromTokens([18 /* CloseParenToken */, 20 /* CloseBracketToken */, 24 /* CommaToken */, 23 /* SemicolonToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
+                this.SpaceBetweenCloseBraceAndElse = new formatting.Rule(formatting.RuleDescriptor.create1(16 /* CloseBraceToken */, 80 /* ElseKeyword */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.SpaceBetweenCloseBraceAndWhile = new formatting.Rule(formatting.RuleDescriptor.create1(16 /* CloseBraceToken */, 104 /* WhileKeyword */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.NoSpaceAfterCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create3(16 /* CloseBraceToken */, formatting.Shared.TokenRange.FromTokens([18 /* CloseParenToken */, 20 /* CloseBracketToken */, 24 /* CommaToken */, 23 /* SemicolonToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
                 // No space for dot
-                this.NoSpaceBeforeDot = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 21 /* DotToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceAfterDot = new formatting.Rule(formatting.RuleDescriptor.create3(21 /* DotToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceBeforeDot = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 21 /* DotToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceAfterDot = new formatting.Rule(formatting.RuleDescriptor.create3(21 /* DotToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
                 // No space before and after indexer
-                this.NoSpaceBeforeOpenBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 19 /* OpenBracketToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceAfterCloseBracket = new formatting.Rule(formatting.RuleDescriptor.create3(20 /* CloseBracketToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBeforeBlockInFunctionDeclarationContext), 8 /* Delete */));
+                this.NoSpaceBeforeOpenBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 19 /* OpenBracketToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceAfterCloseBracket = new formatting.Rule(formatting.RuleDescriptor.create3(20 /* CloseBracketToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBeforeBlockInFunctionDeclarationContext), 8 /* Delete */));
                 // Place a space before open brace in a function declaration
                 this.FunctionOpenBraceLeftTokenRange = formatting.Shared.TokenRange.AnyIncludingMultilineComments;
                 this.SpaceBeforeOpenBraceInFunction = new formatting.Rule(formatting.RuleDescriptor.create2(this.FunctionOpenBraceLeftTokenRange, 15 /* OpenBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext, Rules.IsBeforeBlockContext, Rules.IsNotFormatOnEnter, Rules.IsSameLineTokenOrBeforeMultilineBlockContext), 2 /* Space */), 1 /* CanDeleteNewLines */);
@@ -43422,7 +46790,7 @@ var ts;
                 // Insert a space after { and before } in single-line contexts, but remove space from empty object literals {}.
                 this.SpaceAfterOpenBrace = new formatting.Rule(formatting.RuleDescriptor.create3(15 /* OpenBraceToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSingleLineBlockContext), 2 /* Space */));
                 this.SpaceBeforeCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 16 /* CloseBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSingleLineBlockContext), 2 /* Space */));
-                this.NoSpaceBetweenEmptyBraceBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(15 /* OpenBraceToken */, 16 /* CloseBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsObjectContext), 8 /* Delete */));
+                this.NoSpaceBetweenEmptyBraceBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(15 /* OpenBraceToken */, 16 /* CloseBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsObjectContext), 8 /* Delete */));
                 // Insert new line after { and before } in multi-line contexts.
                 this.NewLineAfterOpenBraceInBlockContext = new formatting.Rule(formatting.RuleDescriptor.create3(15 /* OpenBraceToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsMultilineBlockContext), 4 /* NewLine */));
                 // For functions and control block place } on a new line    [multi-line rule]
@@ -43430,79 +46798,79 @@ var ts;
                 // Special handling of unary operators.
                 // Prefix operators generally shouldn't have a space between
                 // them and their target unary expression.
-                this.NoSpaceAfterUnaryPrefixOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.UnaryPrefixOperators, formatting.Shared.TokenRange.UnaryPrefixExpressions), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), 8 /* Delete */));
-                this.NoSpaceAfterUnaryPreincrementOperator = new formatting.Rule(formatting.RuleDescriptor.create3(41 /* PlusPlusToken */, formatting.Shared.TokenRange.UnaryPreincrementExpressions), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceAfterUnaryPredecrementOperator = new formatting.Rule(formatting.RuleDescriptor.create3(42 /* MinusMinusToken */, formatting.Shared.TokenRange.UnaryPredecrementExpressions), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceBeforeUnaryPostincrementOperator = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.UnaryPostincrementExpressions, 41 /* PlusPlusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceBeforeUnaryPostdecrementOperator = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.UnaryPostdecrementExpressions, 42 /* MinusMinusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceAfterUnaryPrefixOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.UnaryPrefixOperators, formatting.Shared.TokenRange.UnaryPrefixExpressions), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBinaryOpContext), 8 /* Delete */));
+                this.NoSpaceAfterUnaryPreincrementOperator = new formatting.Rule(formatting.RuleDescriptor.create3(41 /* PlusPlusToken */, formatting.Shared.TokenRange.UnaryPreincrementExpressions), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceAfterUnaryPredecrementOperator = new formatting.Rule(formatting.RuleDescriptor.create3(42 /* MinusMinusToken */, formatting.Shared.TokenRange.UnaryPredecrementExpressions), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceBeforeUnaryPostincrementOperator = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.UnaryPostincrementExpressions, 41 /* PlusPlusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceBeforeUnaryPostdecrementOperator = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.UnaryPostdecrementExpressions, 42 /* MinusMinusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
                 // More unary operator special-casing.
                 // DevDiv 181814:  Be careful when removing leading whitespace
                 // around unary operators.  Examples:
                 //      1 - -2  --X-->  1--2
                 //      a + ++b --X-->  a+++b
-                this.SpaceAfterPostincrementWhenFollowedByAdd = new formatting.Rule(formatting.RuleDescriptor.create1(41 /* PlusPlusToken */, 35 /* PlusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.SpaceAfterAddWhenFollowedByUnaryPlus = new formatting.Rule(formatting.RuleDescriptor.create1(35 /* PlusToken */, 35 /* PlusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.SpaceAfterAddWhenFollowedByPreincrement = new formatting.Rule(formatting.RuleDescriptor.create1(35 /* PlusToken */, 41 /* PlusPlusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.SpaceAfterPostdecrementWhenFollowedBySubtract = new formatting.Rule(formatting.RuleDescriptor.create1(42 /* MinusMinusToken */, 36 /* MinusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.SpaceAfterSubtractWhenFollowedByUnaryMinus = new formatting.Rule(formatting.RuleDescriptor.create1(36 /* MinusToken */, 36 /* MinusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.SpaceAfterSubtractWhenFollowedByPredecrement = new formatting.Rule(formatting.RuleDescriptor.create1(36 /* MinusToken */, 42 /* MinusMinusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.NoSpaceBeforeComma = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 24 /* CommaToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.SpaceAfterCertainKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([102 /* VarKeyword */, 98 /* ThrowKeyword */, 92 /* NewKeyword */, 78 /* DeleteKeyword */, 94 /* ReturnKeyword */, 101 /* TypeOfKeyword */, 119 /* AwaitKeyword */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
-                this.SpaceAfterLetConstInVariableDeclaration = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([108 /* LetKeyword */, 74 /* ConstKeyword */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsStartOfVariableDeclarationList), 2 /* Space */));
-                this.NoSpaceBeforeOpenParenInFuncCall = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsFunctionCallOrNewContext, Rules.IsPreviousTokenNotComma), 8 /* Delete */));
+                this.SpaceAfterPostincrementWhenFollowedByAdd = new formatting.Rule(formatting.RuleDescriptor.create1(41 /* PlusPlusToken */, 35 /* PlusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
+                this.SpaceAfterAddWhenFollowedByUnaryPlus = new formatting.Rule(formatting.RuleDescriptor.create1(35 /* PlusToken */, 35 /* PlusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
+                this.SpaceAfterAddWhenFollowedByPreincrement = new formatting.Rule(formatting.RuleDescriptor.create1(35 /* PlusToken */, 41 /* PlusPlusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
+                this.SpaceAfterPostdecrementWhenFollowedBySubtract = new formatting.Rule(formatting.RuleDescriptor.create1(42 /* MinusMinusToken */, 36 /* MinusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
+                this.SpaceAfterSubtractWhenFollowedByUnaryMinus = new formatting.Rule(formatting.RuleDescriptor.create1(36 /* MinusToken */, 36 /* MinusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
+                this.SpaceAfterSubtractWhenFollowedByPredecrement = new formatting.Rule(formatting.RuleDescriptor.create1(36 /* MinusToken */, 42 /* MinusMinusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
+                this.NoSpaceBeforeComma = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 24 /* CommaToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.SpaceAfterCertainKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([102 /* VarKeyword */, 98 /* ThrowKeyword */, 92 /* NewKeyword */, 78 /* DeleteKeyword */, 94 /* ReturnKeyword */, 101 /* TypeOfKeyword */, 119 /* AwaitKeyword */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.SpaceAfterLetConstInVariableDeclaration = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([108 /* LetKeyword */, 74 /* ConstKeyword */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsStartOfVariableDeclarationList), 2 /* Space */));
+                this.NoSpaceBeforeOpenParenInFuncCall = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsFunctionCallOrNewContext, Rules.IsPreviousTokenNotComma), 8 /* Delete */));
                 this.SpaceAfterFunctionInFuncDecl = new formatting.Rule(formatting.RuleDescriptor.create3(87 /* FunctionKeyword */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2 /* Space */));
-                this.NoSpaceBeforeOpenParenInFuncDecl = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsFunctionDeclContext), 8 /* Delete */));
-                this.SpaceAfterVoidOperator = new formatting.Rule(formatting.RuleDescriptor.create3(103 /* VoidKeyword */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsVoidOpContext), 2 /* Space */));
-                this.NoSpaceBetweenReturnAndSemicolon = new formatting.Rule(formatting.RuleDescriptor.create1(94 /* ReturnKeyword */, 23 /* SemicolonToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceBeforeOpenParenInFuncDecl = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsFunctionDeclContext), 8 /* Delete */));
+                this.SpaceAfterVoidOperator = new formatting.Rule(formatting.RuleDescriptor.create3(103 /* VoidKeyword */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsVoidOpContext), 2 /* Space */));
+                this.NoSpaceBetweenReturnAndSemicolon = new formatting.Rule(formatting.RuleDescriptor.create1(94 /* ReturnKeyword */, 23 /* SemicolonToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
                 // Add a space between statements. All keywords except (do,else,case) has open/close parens after them.
                 // So, we have a rule to add a space for [),Any], [do,Any], [else,Any], and [case,Any]
-                this.SpaceBetweenStatements = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([18 /* CloseParenToken */, 79 /* DoKeyword */, 80 /* ElseKeyword */, 71 /* CaseKeyword */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotForContext), 2 /* Space */));
+                this.SpaceBetweenStatements = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([18 /* CloseParenToken */, 79 /* DoKeyword */, 80 /* ElseKeyword */, 71 /* CaseKeyword */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotForContext), 2 /* Space */));
                 // This low-pri rule takes care of "try {" and "finally {" in case the rule SpaceBeforeOpenBraceInControl didn't execute on FormatOnEnter.
-                this.SpaceAfterTryFinally = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([100 /* TryKeyword */, 85 /* FinallyKeyword */]), 15 /* OpenBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
+                this.SpaceAfterTryFinally = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([100 /* TryKeyword */, 85 /* FinallyKeyword */]), 15 /* OpenBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
                 //      get x() {}
                 //      set x(val) {}
-                this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([123 /* GetKeyword */, 129 /* SetKeyword */]), 69 /* Identifier */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2 /* Space */));
+                this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([123 /* GetKeyword */, 130 /* SetKeyword */]), 69 /* Identifier */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2 /* Space */));
                 // Special case for binary operators (that are keywords). For these we have to add a space and shouldn't follow any user options.
-                this.SpaceBeforeBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryKeywordOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.SpaceAfterBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryKeywordOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
+                this.SpaceBeforeBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryKeywordOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
+                this.SpaceAfterBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryKeywordOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
                 // TypeScript-specific higher priority rules
                 // Treat constructor as an identifier in a function declaration, and remove spaces between constructor and following left parentheses
-                this.NoSpaceAfterConstructor = new formatting.Rule(formatting.RuleDescriptor.create1(121 /* ConstructorKeyword */, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceAfterConstructor = new formatting.Rule(formatting.RuleDescriptor.create1(121 /* ConstructorKeyword */, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
                 // Use of module as a function call. e.g.: import m2 = module("m2");
-                this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([125 /* ModuleKeyword */, 127 /* RequireKeyword */]), 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([125 /* ModuleKeyword */, 128 /* RequireKeyword */]), 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
                 // Add a space around certain TypeScript keywords
-                this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([115 /* AbstractKeyword */, 73 /* ClassKeyword */, 122 /* DeclareKeyword */, 77 /* DefaultKeyword */, 81 /* EnumKeyword */, 82 /* ExportKeyword */, 83 /* ExtendsKeyword */, 123 /* GetKeyword */, 106 /* ImplementsKeyword */, 89 /* ImportKeyword */, 107 /* InterfaceKeyword */, 125 /* ModuleKeyword */, 126 /* NamespaceKeyword */, 110 /* PrivateKeyword */, 112 /* PublicKeyword */, 111 /* ProtectedKeyword */, 129 /* SetKeyword */, 113 /* StaticKeyword */, 132 /* TypeKeyword */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
-                this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([83 /* ExtendsKeyword */, 106 /* ImplementsKeyword */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
+                this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([115 /* AbstractKeyword */, 73 /* ClassKeyword */, 122 /* DeclareKeyword */, 77 /* DefaultKeyword */, 81 /* EnumKeyword */, 82 /* ExportKeyword */, 83 /* ExtendsKeyword */, 123 /* GetKeyword */, 106 /* ImplementsKeyword */, 89 /* ImportKeyword */, 107 /* InterfaceKeyword */, 125 /* ModuleKeyword */, 126 /* NamespaceKeyword */, 110 /* PrivateKeyword */, 112 /* PublicKeyword */, 111 /* ProtectedKeyword */, 130 /* SetKeyword */, 113 /* StaticKeyword */, 133 /* TypeKeyword */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([83 /* ExtendsKeyword */, 106 /* ImplementsKeyword */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
                 // Treat string literals in module names as identifiers, and add a space between the literal and the opening Brace braces, e.g.: module "m2" {
                 this.SpaceAfterModuleName = new formatting.Rule(formatting.RuleDescriptor.create1(9 /* StringLiteral */, 15 /* OpenBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsModuleDeclContext), 2 /* Space */));
                 // Lambda expressions
-                this.SpaceBeforeArrow = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 34 /* EqualsGreaterThanToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
-                this.SpaceAfterArrow = new formatting.Rule(formatting.RuleDescriptor.create3(34 /* EqualsGreaterThanToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
+                this.SpaceBeforeArrow = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 34 /* EqualsGreaterThanToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.SpaceAfterArrow = new formatting.Rule(formatting.RuleDescriptor.create3(34 /* EqualsGreaterThanToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
                 // Optional parameters and let args
-                this.NoSpaceAfterEllipsis = new formatting.Rule(formatting.RuleDescriptor.create1(22 /* DotDotDotToken */, 69 /* Identifier */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceAfterOptionalParameters = new formatting.Rule(formatting.RuleDescriptor.create3(53 /* QuestionToken */, formatting.Shared.TokenRange.FromTokens([18 /* CloseParenToken */, 24 /* CommaToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), 8 /* Delete */));
+                this.NoSpaceAfterEllipsis = new formatting.Rule(formatting.RuleDescriptor.create1(22 /* DotDotDotToken */, 69 /* Identifier */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceAfterOptionalParameters = new formatting.Rule(formatting.RuleDescriptor.create3(53 /* QuestionToken */, formatting.Shared.TokenRange.FromTokens([18 /* CloseParenToken */, 24 /* CommaToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBinaryOpContext), 8 /* Delete */));
                 // generics and type assertions
-                this.NoSpaceBeforeOpenAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.TypeNames, 25 /* LessThanToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8 /* Delete */));
-                this.NoSpaceBetweenCloseParenAndAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create1(18 /* CloseParenToken */, 25 /* LessThanToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8 /* Delete */));
-                this.NoSpaceAfterOpenAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(25 /* LessThanToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8 /* Delete */));
-                this.NoSpaceBeforeCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 27 /* GreaterThanToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8 /* Delete */));
-                this.NoSpaceAfterCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(27 /* GreaterThanToken */, formatting.Shared.TokenRange.FromTokens([17 /* OpenParenToken */, 19 /* OpenBracketToken */, 27 /* GreaterThanToken */, 24 /* CommaToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8 /* Delete */));
-                this.NoSpaceAfterTypeAssertion = new formatting.Rule(formatting.RuleDescriptor.create3(27 /* GreaterThanToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeAssertionContext), 8 /* Delete */));
+                this.NoSpaceBeforeOpenAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.TypeNames, 25 /* LessThanToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8 /* Delete */));
+                this.NoSpaceBetweenCloseParenAndAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create1(18 /* CloseParenToken */, 25 /* LessThanToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8 /* Delete */));
+                this.NoSpaceAfterOpenAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(25 /* LessThanToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8 /* Delete */));
+                this.NoSpaceBeforeCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 27 /* GreaterThanToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8 /* Delete */));
+                this.NoSpaceAfterCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(27 /* GreaterThanToken */, formatting.Shared.TokenRange.FromTokens([17 /* OpenParenToken */, 19 /* OpenBracketToken */, 27 /* GreaterThanToken */, 24 /* CommaToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8 /* Delete */));
+                this.NoSpaceAfterTypeAssertion = new formatting.Rule(formatting.RuleDescriptor.create3(27 /* GreaterThanToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeAssertionContext), 8 /* Delete */));
                 // Remove spaces in empty interface literals. e.g.: x: {}
-                this.NoSpaceBetweenEmptyInterfaceBraceBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(15 /* OpenBraceToken */, 16 /* CloseBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsObjectTypeContext), 8 /* Delete */));
+                this.NoSpaceBetweenEmptyInterfaceBraceBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(15 /* OpenBraceToken */, 16 /* CloseBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsObjectTypeContext), 8 /* Delete */));
                 // decorators
-                this.SpaceBeforeAt = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 55 /* AtToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
-                this.NoSpaceAfterAt = new formatting.Rule(formatting.RuleDescriptor.create3(55 /* AtToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.SpaceAfterDecorator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([115 /* AbstractKeyword */, 69 /* Identifier */, 82 /* ExportKeyword */, 77 /* DefaultKeyword */, 73 /* ClassKeyword */, 113 /* StaticKeyword */, 112 /* PublicKeyword */, 110 /* PrivateKeyword */, 111 /* ProtectedKeyword */, 123 /* GetKeyword */, 129 /* SetKeyword */, 19 /* OpenBracketToken */, 37 /* AsteriskToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsEndOfDecoratorContextOnSameLine), 2 /* Space */));
+                this.SpaceBeforeAt = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 55 /* AtToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.NoSpaceAfterAt = new formatting.Rule(formatting.RuleDescriptor.create3(55 /* AtToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.SpaceAfterDecorator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([115 /* AbstractKeyword */, 69 /* Identifier */, 82 /* ExportKeyword */, 77 /* DefaultKeyword */, 73 /* ClassKeyword */, 113 /* StaticKeyword */, 112 /* PublicKeyword */, 110 /* PrivateKeyword */, 111 /* ProtectedKeyword */, 123 /* GetKeyword */, 130 /* SetKeyword */, 19 /* OpenBracketToken */, 37 /* AsteriskToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsEndOfDecoratorContextOnSameLine), 2 /* Space */));
                 this.NoSpaceBetweenFunctionKeywordAndStar = new formatting.Rule(formatting.RuleDescriptor.create1(87 /* FunctionKeyword */, 37 /* AsteriskToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclarationOrFunctionExpressionContext), 8 /* Delete */));
                 this.SpaceAfterStarInGeneratorDeclaration = new formatting.Rule(formatting.RuleDescriptor.create3(37 /* AsteriskToken */, formatting.Shared.TokenRange.FromTokens([69 /* Identifier */, 17 /* OpenParenToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclarationOrFunctionExpressionContext), 2 /* Space */));
-                this.NoSpaceBetweenYieldKeywordAndStar = new formatting.Rule(formatting.RuleDescriptor.create1(114 /* YieldKeyword */, 37 /* AsteriskToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsYieldOrYieldStarWithOperand), 8 /* Delete */));
-                this.SpaceBetweenYieldOrYieldStarAndOperand = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([114 /* YieldKeyword */, 37 /* AsteriskToken */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsYieldOrYieldStarWithOperand), 2 /* Space */));
+                this.NoSpaceBetweenYieldKeywordAndStar = new formatting.Rule(formatting.RuleDescriptor.create1(114 /* YieldKeyword */, 37 /* AsteriskToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsYieldOrYieldStarWithOperand), 8 /* Delete */));
+                this.SpaceBetweenYieldOrYieldStarAndOperand = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([114 /* YieldKeyword */, 37 /* AsteriskToken */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsYieldOrYieldStarWithOperand), 2 /* Space */));
                 // Async-await
-                this.SpaceBetweenAsyncAndOpenParen = new formatting.Rule(formatting.RuleDescriptor.create1(118 /* AsyncKeyword */, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsArrowFunctionContext, Rules.IsSameLineTokenContext), 2 /* Space */));
-                this.SpaceBetweenAsyncAndFunctionKeyword = new formatting.Rule(formatting.RuleDescriptor.create1(118 /* AsyncKeyword */, 87 /* FunctionKeyword */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
+                this.SpaceBetweenAsyncAndOpenParen = new formatting.Rule(formatting.RuleDescriptor.create1(118 /* AsyncKeyword */, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsArrowFunctionContext, Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.SpaceBetweenAsyncAndFunctionKeyword = new formatting.Rule(formatting.RuleDescriptor.create1(118 /* AsyncKeyword */, 87 /* FunctionKeyword */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
                 // template string
-                this.NoSpaceBetweenTagAndTemplateString = new formatting.Rule(formatting.RuleDescriptor.create3(69 /* Identifier */, formatting.Shared.TokenRange.FromTokens([11 /* NoSubstitutionTemplateLiteral */, 12 /* TemplateHead */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceBetweenTagAndTemplateString = new formatting.Rule(formatting.RuleDescriptor.create3(69 /* Identifier */, formatting.Shared.TokenRange.FromTokens([11 /* NoSubstitutionTemplateLiteral */, 12 /* TemplateHead */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
                 // These rules are higher in priority than user-configurable rules.
                 this.HighPriorityCommonRules = [
                     this.IgnoreBeforeComment, this.IgnoreAfterLineComment,
@@ -43563,13 +46931,13 @@ var ts;
                 /// Rules controlled by user options
                 ///
                 // Insert space after comma delimiter
-                this.SpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(24 /* CommaToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNextTokenNotCloseBracket), 2 /* Space */));
-                this.NoSpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(24 /* CommaToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
+                this.SpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(24 /* CommaToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNextTokenNotCloseBracket), 2 /* Space */));
+                this.NoSpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(24 /* CommaToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
                 // Insert space before and after binary operators
-                this.SpaceBeforeBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.SpaceAfterBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.NoSpaceBeforeBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 8 /* Delete */));
-                this.NoSpaceAfterBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), 8 /* Delete */));
+                this.SpaceBeforeBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
+                this.SpaceAfterBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
+                this.NoSpaceBeforeBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 8 /* Delete */));
+                this.NoSpaceAfterBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 8 /* Delete */));
                 // Insert space after keywords in control flow statements
                 this.SpaceAfterKeywordInControl = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Keywords, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsControlDeclContext), 2 /* Space */));
                 this.NoSpaceAfterKeywordInControl = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Keywords, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsControlDeclContext), 8 /* Delete */));
@@ -43581,34 +46949,34 @@ var ts;
                 // Open Brace braces after control block
                 this.NewLineBeforeOpenBraceInControl = new formatting.Rule(formatting.RuleDescriptor.create2(this.ControlOpenBraceLeftTokenRange, 15 /* OpenBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsControlDeclContext, Rules.IsBeforeMultilineBlockContext), 4 /* NewLine */), 1 /* CanDeleteNewLines */);
                 // Insert space after semicolon in for statement
-                this.SpaceAfterSemicolonInFor = new formatting.Rule(formatting.RuleDescriptor.create3(23 /* SemicolonToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsForContext), 2 /* Space */));
-                this.NoSpaceAfterSemicolonInFor = new formatting.Rule(formatting.RuleDescriptor.create3(23 /* SemicolonToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsForContext), 8 /* Delete */));
+                this.SpaceAfterSemicolonInFor = new formatting.Rule(formatting.RuleDescriptor.create3(23 /* SemicolonToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsForContext), 2 /* Space */));
+                this.NoSpaceAfterSemicolonInFor = new formatting.Rule(formatting.RuleDescriptor.create3(23 /* SemicolonToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsForContext), 8 /* Delete */));
                 // Insert space after opening and before closing nonempty parenthesis
-                this.SpaceAfterOpenParen = new formatting.Rule(formatting.RuleDescriptor.create3(17 /* OpenParenToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
-                this.SpaceBeforeCloseParen = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 18 /* CloseParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
-                this.NoSpaceBetweenParens = new formatting.Rule(formatting.RuleDescriptor.create1(17 /* OpenParenToken */, 18 /* CloseParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceAfterOpenParen = new formatting.Rule(formatting.RuleDescriptor.create3(17 /* OpenParenToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceBeforeCloseParen = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 18 /* CloseParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
+                this.SpaceAfterOpenParen = new formatting.Rule(formatting.RuleDescriptor.create3(17 /* OpenParenToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.SpaceBeforeCloseParen = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 18 /* CloseParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.NoSpaceBetweenParens = new formatting.Rule(formatting.RuleDescriptor.create1(17 /* OpenParenToken */, 18 /* CloseParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceAfterOpenParen = new formatting.Rule(formatting.RuleDescriptor.create3(17 /* OpenParenToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceBeforeCloseParen = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 18 /* CloseParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
                 // Insert space after opening and before closing nonempty brackets
-                this.SpaceAfterOpenBracket = new formatting.Rule(formatting.RuleDescriptor.create3(19 /* OpenBracketToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
-                this.SpaceBeforeCloseBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 20 /* CloseBracketToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
-                this.NoSpaceBetweenBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(19 /* OpenBracketToken */, 20 /* CloseBracketToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceAfterOpenBracket = new formatting.Rule(formatting.RuleDescriptor.create3(19 /* OpenBracketToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceBeforeCloseBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 20 /* CloseBracketToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
+                this.SpaceAfterOpenBracket = new formatting.Rule(formatting.RuleDescriptor.create3(19 /* OpenBracketToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.SpaceBeforeCloseBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 20 /* CloseBracketToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.NoSpaceBetweenBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(19 /* OpenBracketToken */, 20 /* CloseBracketToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceAfterOpenBracket = new formatting.Rule(formatting.RuleDescriptor.create3(19 /* OpenBracketToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.NoSpaceBeforeCloseBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 20 /* CloseBracketToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
                 // Insert space after opening and before closing template string braces
-                this.NoSpaceAfterTemplateHeadAndMiddle = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([12 /* TemplateHead */, 13 /* TemplateMiddle */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.SpaceAfterTemplateHeadAndMiddle = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([12 /* TemplateHead */, 13 /* TemplateMiddle */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
-                this.NoSpaceBeforeTemplateMiddleAndTail = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([13 /* TemplateMiddle */, 14 /* TemplateTail */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 8 /* Delete */));
-                this.SpaceBeforeTemplateMiddleAndTail = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([13 /* TemplateMiddle */, 14 /* TemplateTail */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSameLineTokenContext), 2 /* Space */));
+                this.NoSpaceAfterTemplateHeadAndMiddle = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([12 /* TemplateHead */, 13 /* TemplateMiddle */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.SpaceAfterTemplateHeadAndMiddle = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([12 /* TemplateHead */, 13 /* TemplateMiddle */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
+                this.NoSpaceBeforeTemplateMiddleAndTail = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([13 /* TemplateMiddle */, 14 /* TemplateTail */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
+                this.SpaceBeforeTemplateMiddleAndTail = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([13 /* TemplateMiddle */, 14 /* TemplateTail */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
                 // Insert space after function keyword for anonymous functions
                 this.SpaceAfterAnonymousFunctionKeyword = new formatting.Rule(formatting.RuleDescriptor.create1(87 /* FunctionKeyword */, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2 /* Space */));
                 this.NoSpaceAfterAnonymousFunctionKeyword = new formatting.Rule(formatting.RuleDescriptor.create1(87 /* FunctionKeyword */, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 8 /* Delete */));
             }
             Rules.prototype.getRuleName = function (rule) {
                 var o = this;
-                for (var name_33 in o) {
-                    if (o[name_33] === rule) {
-                        return name_33;
+                for (var name_38 in o) {
+                    if (o[name_38] === rule) {
+                        return name_38;
                     }
                 }
                 throw new Error("Unknown rule");
@@ -43617,40 +46985,40 @@ var ts;
             /// Contexts
             ///
             Rules.IsForContext = function (context) {
-                return context.contextNode.kind === 202 /* ForStatement */;
+                return context.contextNode.kind === 205 /* ForStatement */;
             };
             Rules.IsNotForContext = function (context) {
                 return !Rules.IsForContext(context);
             };
             Rules.IsBinaryOpContext = function (context) {
                 switch (context.contextNode.kind) {
-                    case 184 /* BinaryExpression */:
-                    case 185 /* ConditionalExpression */:
-                    case 192 /* AsExpression */:
-                    case 151 /* TypePredicate */:
-                    case 159 /* UnionType */:
-                    case 160 /* IntersectionType */:
+                    case 186 /* BinaryExpression */:
+                    case 187 /* ConditionalExpression */:
+                    case 194 /* AsExpression */:
+                    case 153 /* TypePredicate */:
+                    case 161 /* UnionType */:
+                    case 162 /* IntersectionType */:
                         return true;
                     // equals in binding elements: function foo([[x, y] = [1, 2]])
-                    case 166 /* BindingElement */:
+                    case 168 /* BindingElement */:
                     // equals in type X = ...
-                    case 219 /* TypeAliasDeclaration */:
+                    case 222 /* TypeAliasDeclaration */:
                     // equal in import a = module('a');
-                    case 224 /* ImportEqualsDeclaration */:
+                    case 228 /* ImportEqualsDeclaration */:
                     // equal in let a = 0;
-                    case 214 /* VariableDeclaration */:
+                    case 217 /* VariableDeclaration */:
                     // equal in p = 0;
-                    case 139 /* Parameter */:
-                    case 250 /* EnumMember */:
-                    case 142 /* PropertyDeclaration */:
-                    case 141 /* PropertySignature */:
+                    case 141 /* Parameter */:
+                    case 254 /* EnumMember */:
+                    case 144 /* PropertyDeclaration */:
+                    case 143 /* PropertySignature */:
                         return context.currentTokenSpan.kind === 56 /* EqualsToken */ || context.nextTokenSpan.kind === 56 /* EqualsToken */;
                     // "in" keyword in for (let x in []) { }
-                    case 203 /* ForInStatement */:
+                    case 206 /* ForInStatement */:
                         return context.currentTokenSpan.kind === 90 /* InKeyword */ || context.nextTokenSpan.kind === 90 /* InKeyword */;
                     // Technically, "of" is not a binary operator, but format it the same way as "in"
-                    case 204 /* ForOfStatement */:
-                        return context.currentTokenSpan.kind === 135 /* OfKeyword */ || context.nextTokenSpan.kind === 135 /* OfKeyword */;
+                    case 207 /* ForOfStatement */:
+                        return context.currentTokenSpan.kind === 137 /* OfKeyword */ || context.nextTokenSpan.kind === 137 /* OfKeyword */;
                 }
                 return false;
             };
@@ -43658,7 +47026,7 @@ var ts;
                 return !Rules.IsBinaryOpContext(context);
             };
             Rules.IsConditionalOperatorContext = function (context) {
-                return context.contextNode.kind === 185 /* ConditionalExpression */;
+                return context.contextNode.kind === 187 /* ConditionalExpression */;
             };
             Rules.IsSameLineTokenOrBeforeMultilineBlockContext = function (context) {
                 //// This check is mainly used inside SpaceBeforeOpenBraceInControl and SpaceBeforeOpenBraceInFunction.
@@ -43670,13 +47038,13 @@ var ts;
                 //// Ex: 
                 //// if (1)
                 //// { ... }
-                ////      * ) and { are on differnet lines. We only need to format if the block is multiline context. So in this case we don't format.
+                ////      * ) and { are on different lines. We only need to format if the block is multiline context. So in this case we don't format.
                 ////
                 //// Ex:
                 //// if (1) 
                 //// { ...
                 //// }
-                ////      * ) and { are on differnet lines. We only need to format if the block is multiline context. So in this case we format.
+                ////      * ) and { are on different lines. We only need to format if the block is multiline context. So in this case we format.
                 return context.TokensAreOnSameLine() || Rules.IsBeforeMultilineBlockContext(context);
             };
             // This check is done before an open brace in a control construct, a function, or a typescript block declaration
@@ -43702,93 +47070,93 @@ var ts;
                     return true;
                 }
                 switch (node.kind) {
-                    case 195 /* Block */:
-                    case 223 /* CaseBlock */:
-                    case 168 /* ObjectLiteralExpression */:
-                    case 222 /* ModuleBlock */:
+                    case 198 /* Block */:
+                    case 226 /* CaseBlock */:
+                    case 170 /* ObjectLiteralExpression */:
+                    case 225 /* ModuleBlock */:
                         return true;
                 }
                 return false;
             };
             Rules.IsFunctionDeclContext = function (context) {
                 switch (context.contextNode.kind) {
-                    case 216 /* FunctionDeclaration */:
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
+                    case 219 /* FunctionDeclaration */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
                     //case SyntaxKind.MemberFunctionDeclaration:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
                     ///case SyntaxKind.MethodSignature:
-                    case 148 /* CallSignature */:
-                    case 176 /* FunctionExpression */:
-                    case 145 /* Constructor */:
-                    case 177 /* ArrowFunction */:
+                    case 150 /* CallSignature */:
+                    case 178 /* FunctionExpression */:
+                    case 147 /* Constructor */:
+                    case 179 /* ArrowFunction */:
                     //case SyntaxKind.ConstructorDeclaration:
                     //case SyntaxKind.SimpleArrowFunctionExpression:
                     //case SyntaxKind.ParenthesizedArrowFunctionExpression:
-                    case 218 /* InterfaceDeclaration */:
+                    case 221 /* InterfaceDeclaration */:
                         return true;
                 }
                 return false;
             };
             Rules.IsFunctionDeclarationOrFunctionExpressionContext = function (context) {
-                return context.contextNode.kind === 216 /* FunctionDeclaration */ || context.contextNode.kind === 176 /* FunctionExpression */;
+                return context.contextNode.kind === 219 /* FunctionDeclaration */ || context.contextNode.kind === 178 /* FunctionExpression */;
             };
             Rules.IsTypeScriptDeclWithBlockContext = function (context) {
                 return Rules.NodeIsTypeScriptDeclWithBlockContext(context.contextNode);
             };
             Rules.NodeIsTypeScriptDeclWithBlockContext = function (node) {
                 switch (node.kind) {
-                    case 217 /* ClassDeclaration */:
-                    case 189 /* ClassExpression */:
-                    case 218 /* InterfaceDeclaration */:
-                    case 220 /* EnumDeclaration */:
-                    case 156 /* TypeLiteral */:
-                    case 221 /* ModuleDeclaration */:
+                    case 220 /* ClassDeclaration */:
+                    case 191 /* ClassExpression */:
+                    case 221 /* InterfaceDeclaration */:
+                    case 223 /* EnumDeclaration */:
+                    case 158 /* TypeLiteral */:
+                    case 224 /* ModuleDeclaration */:
                         return true;
                 }
                 return false;
             };
             Rules.IsAfterCodeBlockContext = function (context) {
                 switch (context.currentTokenParent.kind) {
-                    case 217 /* ClassDeclaration */:
-                    case 221 /* ModuleDeclaration */:
-                    case 220 /* EnumDeclaration */:
-                    case 195 /* Block */:
-                    case 247 /* CatchClause */:
-                    case 222 /* ModuleBlock */:
-                    case 209 /* SwitchStatement */:
+                    case 220 /* ClassDeclaration */:
+                    case 224 /* ModuleDeclaration */:
+                    case 223 /* EnumDeclaration */:
+                    case 198 /* Block */:
+                    case 251 /* CatchClause */:
+                    case 225 /* ModuleBlock */:
+                    case 212 /* SwitchStatement */:
                         return true;
                 }
                 return false;
             };
             Rules.IsControlDeclContext = function (context) {
                 switch (context.contextNode.kind) {
-                    case 199 /* IfStatement */:
-                    case 209 /* SwitchStatement */:
-                    case 202 /* ForStatement */:
-                    case 203 /* ForInStatement */:
-                    case 204 /* ForOfStatement */:
-                    case 201 /* WhileStatement */:
-                    case 212 /* TryStatement */:
-                    case 200 /* DoStatement */:
-                    case 208 /* WithStatement */:
+                    case 202 /* IfStatement */:
+                    case 212 /* SwitchStatement */:
+                    case 205 /* ForStatement */:
+                    case 206 /* ForInStatement */:
+                    case 207 /* ForOfStatement */:
+                    case 204 /* WhileStatement */:
+                    case 215 /* TryStatement */:
+                    case 203 /* DoStatement */:
+                    case 211 /* WithStatement */:
                     // TODO
                     // case SyntaxKind.ElseClause:
-                    case 247 /* CatchClause */:
+                    case 251 /* CatchClause */:
                         return true;
                     default:
                         return false;
                 }
             };
             Rules.IsObjectContext = function (context) {
-                return context.contextNode.kind === 168 /* ObjectLiteralExpression */;
+                return context.contextNode.kind === 170 /* ObjectLiteralExpression */;
             };
             Rules.IsFunctionCallContext = function (context) {
-                return context.contextNode.kind === 171 /* CallExpression */;
+                return context.contextNode.kind === 173 /* CallExpression */;
             };
             Rules.IsNewContext = function (context) {
-                return context.contextNode.kind === 172 /* NewExpression */;
+                return context.contextNode.kind === 174 /* NewExpression */;
             };
             Rules.IsFunctionCallOrNewContext = function (context) {
                 return Rules.IsFunctionCallContext(context) || Rules.IsNewContext(context);
@@ -43800,10 +47168,10 @@ var ts;
                 return context.nextTokenSpan.kind !== 20 /* CloseBracketToken */;
             };
             Rules.IsArrowFunctionContext = function (context) {
-                return context.contextNode.kind === 177 /* ArrowFunction */;
+                return context.contextNode.kind === 179 /* ArrowFunction */;
             };
-            Rules.IsSameLineTokenContext = function (context) {
-                return context.TokensAreOnSameLine();
+            Rules.IsNonJsxSameLineTokenContext = function (context) {
+                return context.TokensAreOnSameLine() && context.contextNode.kind !== 243 /* JsxText */;
             };
             Rules.IsNotBeforeBlockInFunctionDeclarationContext = function (context) {
                 return !Rules.IsFunctionDeclContext(context) && !Rules.IsBeforeBlockContext(context);
@@ -43818,41 +47186,41 @@ var ts;
                 while (ts.isExpression(node)) {
                     node = node.parent;
                 }
-                return node.kind === 140 /* Decorator */;
+                return node.kind === 142 /* Decorator */;
             };
             Rules.IsStartOfVariableDeclarationList = function (context) {
-                return context.currentTokenParent.kind === 215 /* VariableDeclarationList */ &&
+                return context.currentTokenParent.kind === 218 /* VariableDeclarationList */ &&
                     context.currentTokenParent.getStart(context.sourceFile) === context.currentTokenSpan.pos;
             };
             Rules.IsNotFormatOnEnter = function (context) {
                 return context.formattingRequestKind !== 2 /* FormatOnEnter */;
             };
             Rules.IsModuleDeclContext = function (context) {
-                return context.contextNode.kind === 221 /* ModuleDeclaration */;
+                return context.contextNode.kind === 224 /* ModuleDeclaration */;
             };
             Rules.IsObjectTypeContext = function (context) {
-                return context.contextNode.kind === 156 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration;
+                return context.contextNode.kind === 158 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration;
             };
             Rules.IsTypeArgumentOrParameterOrAssertion = function (token, parent) {
                 if (token.kind !== 25 /* LessThanToken */ && token.kind !== 27 /* GreaterThanToken */) {
                     return false;
                 }
                 switch (parent.kind) {
-                    case 152 /* TypeReference */:
-                    case 174 /* TypeAssertionExpression */:
-                    case 217 /* ClassDeclaration */:
-                    case 189 /* ClassExpression */:
-                    case 218 /* InterfaceDeclaration */:
-                    case 216 /* FunctionDeclaration */:
-                    case 176 /* FunctionExpression */:
-                    case 177 /* ArrowFunction */:
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
-                    case 148 /* CallSignature */:
-                    case 149 /* ConstructSignature */:
-                    case 171 /* CallExpression */:
-                    case 172 /* NewExpression */:
-                    case 191 /* ExpressionWithTypeArguments */:
+                    case 154 /* TypeReference */:
+                    case 176 /* TypeAssertionExpression */:
+                    case 220 /* ClassDeclaration */:
+                    case 191 /* ClassExpression */:
+                    case 221 /* InterfaceDeclaration */:
+                    case 219 /* FunctionDeclaration */:
+                    case 178 /* FunctionExpression */:
+                    case 179 /* ArrowFunction */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
+                    case 150 /* CallSignature */:
+                    case 151 /* ConstructSignature */:
+                    case 173 /* CallExpression */:
+                    case 174 /* NewExpression */:
+                    case 193 /* ExpressionWithTypeArguments */:
                         return true;
                     default:
                         return false;
@@ -43863,13 +47231,13 @@ var ts;
                     Rules.IsTypeArgumentOrParameterOrAssertion(context.nextTokenSpan, context.nextTokenParent);
             };
             Rules.IsTypeAssertionContext = function (context) {
-                return context.contextNode.kind === 174 /* TypeAssertionExpression */;
+                return context.contextNode.kind === 176 /* TypeAssertionExpression */;
             };
             Rules.IsVoidOpContext = function (context) {
-                return context.currentTokenSpan.kind === 103 /* VoidKeyword */ && context.currentTokenParent.kind === 180 /* VoidExpression */;
+                return context.currentTokenSpan.kind === 103 /* VoidKeyword */ && context.currentTokenParent.kind === 182 /* VoidExpression */;
             };
             Rules.IsYieldOrYieldStarWithOperand = function (context) {
-                return context.contextNode.kind === 187 /* YieldExpression */ && context.contextNode.expression !== undefined;
+                return context.contextNode.kind === 189 /* YieldExpression */ && context.contextNode.expression !== undefined;
             };
             return Rules;
         }());
@@ -43893,7 +47261,7 @@ var ts;
                 return result;
             };
             RulesMap.prototype.Initialize = function (rules) {
-                this.mapRowLength = 135 /* LastToken */ + 1;
+                this.mapRowLength = 137 /* LastToken */ + 1;
                 this.map = new Array(this.mapRowLength * this.mapRowLength); //new Array<RulesBucket>(this.mapRowLength * this.mapRowLength);
                 // This array is used only during construction of the rulesbucket in the map
                 var rulesBucketConstructionStateList = new Array(this.map.length); //new Array<RulesBucketConstructionState>(this.map.length);
@@ -44088,7 +47456,7 @@ var ts;
                 }
                 TokenAllAccess.prototype.GetTokens = function () {
                     var result = [];
-                    for (var token = 0 /* FirstToken */; token <= 135 /* LastToken */; token++) {
+                    for (var token = 0 /* FirstToken */; token <= 137 /* LastToken */; token++) {
                         result.push(token);
                     }
                     return result;
@@ -44130,9 +47498,9 @@ var ts;
                 };
                 TokenRange.Any = TokenRange.AllTokens();
                 TokenRange.AnyIncludingMultilineComments = TokenRange.FromTokens(TokenRange.Any.GetTokens().concat([3 /* MultiLineCommentTrivia */]));
-                TokenRange.Keywords = TokenRange.FromRange(70 /* FirstKeyword */, 135 /* LastKeyword */);
+                TokenRange.Keywords = TokenRange.FromRange(70 /* FirstKeyword */, 137 /* LastKeyword */);
                 TokenRange.BinaryOperators = TokenRange.FromRange(25 /* FirstBinaryOperator */, 68 /* LastBinaryOperator */);
-                TokenRange.BinaryKeywordOperators = TokenRange.FromTokens([90 /* InKeyword */, 91 /* InstanceOfKeyword */, 135 /* OfKeyword */, 116 /* AsKeyword */, 124 /* IsKeyword */]);
+                TokenRange.BinaryKeywordOperators = TokenRange.FromTokens([90 /* InKeyword */, 91 /* InstanceOfKeyword */, 137 /* OfKeyword */, 116 /* AsKeyword */, 124 /* IsKeyword */]);
                 TokenRange.UnaryPrefixOperators = TokenRange.FromTokens([41 /* PlusPlusToken */, 42 /* MinusMinusToken */, 50 /* TildeToken */, 49 /* ExclamationToken */]);
                 TokenRange.UnaryPrefixExpressions = TokenRange.FromTokens([8 /* NumericLiteral */, 69 /* Identifier */, 17 /* OpenParenToken */, 19 /* OpenBracketToken */, 15 /* OpenBraceToken */, 97 /* ThisKeyword */, 92 /* NewKeyword */]);
                 TokenRange.UnaryPreincrementExpressions = TokenRange.FromTokens([69 /* Identifier */, 17 /* OpenParenToken */, 97 /* ThisKeyword */, 92 /* NewKeyword */]);
@@ -44140,7 +47508,7 @@ var ts;
                 TokenRange.UnaryPredecrementExpressions = TokenRange.FromTokens([69 /* Identifier */, 17 /* OpenParenToken */, 97 /* ThisKeyword */, 92 /* NewKeyword */]);
                 TokenRange.UnaryPostdecrementExpressions = TokenRange.FromTokens([69 /* Identifier */, 18 /* CloseParenToken */, 20 /* CloseBracketToken */, 92 /* NewKeyword */]);
                 TokenRange.Comments = TokenRange.FromTokens([2 /* SingleLineCommentTrivia */, 3 /* MultiLineCommentTrivia */]);
-                TokenRange.TypeNames = TokenRange.FromTokens([69 /* Identifier */, 128 /* NumberKeyword */, 130 /* StringKeyword */, 120 /* BooleanKeyword */, 131 /* SymbolKeyword */, 103 /* VoidKeyword */, 117 /* AnyKeyword */]);
+                TokenRange.TypeNames = TokenRange.FromTokens([69 /* Identifier */, 129 /* NumberKeyword */, 131 /* StringKeyword */, 120 /* BooleanKeyword */, 132 /* SymbolKeyword */, 103 /* VoidKeyword */, 117 /* AnyKeyword */]);
                 return TokenRange;
             }());
             Shared.TokenRange = TokenRange;
@@ -44283,12 +47651,20 @@ var ts;
             if (line === 0) {
                 return [];
             }
-            // get the span for the previous\current line
+            // After the enter key, the cursor is now at a new line. The new line may or may not contain non-whitespace characters.
+            // If the new line has only whitespaces, we won't want to format this line, because that would remove the indentation as
+            // trailing whitespaces. So the end of the formatting span should be the later one between:
+            //  1. the end of the previous line
+            //  2. the last non-whitespace character in the current line
+            var endOfFormatSpan = ts.getEndLinePosition(line, sourceFile);
+            while (ts.isWhiteSpace(sourceFile.text.charCodeAt(endOfFormatSpan)) && !ts.isLineBreak(sourceFile.text.charCodeAt(endOfFormatSpan))) {
+                endOfFormatSpan--;
+            }
             var span = {
                 // get start position for the previous line
                 pos: ts.getStartPositionOfLine(line - 1, sourceFile),
-                // get end position for the current line (end value is exclusive so add 1 to the result)
-                end: ts.getEndLinePosition(line, sourceFile) + 1
+                // end value is exclusive so add 1 to the result
+                end: endOfFormatSpan + 1
             };
             return formatSpan(span, sourceFile, options, rulesProvider, 2 /* FormatOnEnter */);
         }
@@ -44362,17 +47738,17 @@ var ts;
         // i.e. parent is class declaration with the list of members and node is one of members.
         function isListElement(parent, node) {
             switch (parent.kind) {
-                case 217 /* ClassDeclaration */:
-                case 218 /* InterfaceDeclaration */:
+                case 220 /* ClassDeclaration */:
+                case 221 /* InterfaceDeclaration */:
                     return ts.rangeContainsRange(parent.members, node);
-                case 221 /* ModuleDeclaration */:
+                case 224 /* ModuleDeclaration */:
                     var body = parent.body;
-                    return body && body.kind === 195 /* Block */ && ts.rangeContainsRange(body.statements, node);
-                case 251 /* SourceFile */:
-                case 195 /* Block */:
-                case 222 /* ModuleBlock */:
+                    return body && body.kind === 198 /* Block */ && ts.rangeContainsRange(body.statements, node);
+                case 255 /* SourceFile */:
+                case 198 /* Block */:
+                case 225 /* ModuleBlock */:
                     return ts.rangeContainsRange(parent.statements, node);
-                case 247 /* CatchClause */:
+                case 251 /* CatchClause */:
                     return ts.rangeContainsRange(parent.block.statements, node);
             }
             return false;
@@ -44446,7 +47822,7 @@ var ts;
                 // no preceding token found - start from the beginning of enclosing node
                 return enclosingNode.pos;
             }
-            // preceding token ends after the start of original range (i.e when originaRange.pos falls in the middle of literal)
+            // preceding token ends after the start of original range (i.e when originalRange.pos falls in the middle of literal)
             // start from the beginning of enclosingNode to handle the entire 'originalRange'
             if (precedingToken.end >= originalRange.pos) {
                 return enclosingNode.pos;
@@ -44574,19 +47950,19 @@ var ts;
                     return node.modifiers[0].kind;
                 }
                 switch (node.kind) {
-                    case 217 /* ClassDeclaration */: return 73 /* ClassKeyword */;
-                    case 218 /* InterfaceDeclaration */: return 107 /* InterfaceKeyword */;
-                    case 216 /* FunctionDeclaration */: return 87 /* FunctionKeyword */;
-                    case 220 /* EnumDeclaration */: return 220 /* EnumDeclaration */;
-                    case 146 /* GetAccessor */: return 123 /* GetKeyword */;
-                    case 147 /* SetAccessor */: return 129 /* SetKeyword */;
-                    case 144 /* MethodDeclaration */:
+                    case 220 /* ClassDeclaration */: return 73 /* ClassKeyword */;
+                    case 221 /* InterfaceDeclaration */: return 107 /* InterfaceKeyword */;
+                    case 219 /* FunctionDeclaration */: return 87 /* FunctionKeyword */;
+                    case 223 /* EnumDeclaration */: return 223 /* EnumDeclaration */;
+                    case 148 /* GetAccessor */: return 123 /* GetKeyword */;
+                    case 149 /* SetAccessor */: return 130 /* SetKeyword */;
+                    case 146 /* MethodDeclaration */:
                         if (node.asteriskToken) {
                             return 37 /* AsteriskToken */;
                         }
                     // fall-through
-                    case 142 /* PropertyDeclaration */:
-                    case 139 /* Parameter */:
+                    case 144 /* PropertyDeclaration */:
+                    case 141 /* Parameter */:
                         return node.name.kind;
                 }
             }
@@ -44726,7 +48102,7 @@ var ts;
                         consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation, child);
                         return inheritedIndentation;
                     }
-                    var effectiveParentStartLine = child.kind === 140 /* Decorator */ ? childStartLine : undecoratedParentStartLine;
+                    var effectiveParentStartLine = child.kind === 142 /* Decorator */ ? childStartLine : undecoratedParentStartLine;
                     var childIndentation = computeIndentation(child, childStartLine, childIndentationAmount, node, parentDynamicIndentation, effectiveParentStartLine);
                     processNode(child, childContextNode, childStartLine, undecoratedChildStartLine, childIndentation.indentation, childIndentation.delta);
                     childContextNode = node;
@@ -44759,8 +48135,8 @@ var ts;
                         }
                     }
                     var inheritedIndentation = -1 /* Unknown */;
-                    for (var _i = 0, nodes_6 = nodes; _i < nodes_6.length; _i++) {
-                        var child = nodes_6[_i];
+                    for (var _i = 0, nodes_7 = nodes; _i < nodes_7.length; _i++) {
+                        var child = nodes_7[_i];
                         inheritedIndentation = processChildNode(child, inheritedIndentation, node, listDynamicIndentation, startLine, startLine, /*isListElement*/ true);
                     }
                     if (listEndToken !== 0 /* Unknown */) {
@@ -45070,20 +48446,20 @@ var ts;
         }
         function isSomeBlock(kind) {
             switch (kind) {
-                case 195 /* Block */:
-                case 222 /* ModuleBlock */:
+                case 198 /* Block */:
+                case 225 /* ModuleBlock */:
                     return true;
             }
             return false;
         }
         function getOpenTokenForList(node, list) {
             switch (node.kind) {
-                case 145 /* Constructor */:
-                case 216 /* FunctionDeclaration */:
-                case 176 /* FunctionExpression */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
-                case 177 /* ArrowFunction */:
+                case 147 /* Constructor */:
+                case 219 /* FunctionDeclaration */:
+                case 178 /* FunctionExpression */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
+                case 179 /* ArrowFunction */:
                     if (node.typeParameters === list) {
                         return 25 /* LessThanToken */;
                     }
@@ -45091,8 +48467,8 @@ var ts;
                         return 17 /* OpenParenToken */;
                     }
                     break;
-                case 171 /* CallExpression */:
-                case 172 /* NewExpression */:
+                case 173 /* CallExpression */:
+                case 174 /* NewExpression */:
                     if (node.typeArguments === list) {
                         return 25 /* LessThanToken */;
                     }
@@ -45100,7 +48476,7 @@ var ts;
                         return 17 /* OpenParenToken */;
                     }
                     break;
-                case 152 /* TypeReference */:
+                case 154 /* TypeReference */:
                     if (node.typeArguments === list) {
                         return 25 /* LessThanToken */;
                     }
@@ -45129,7 +48505,7 @@ var ts;
             if (!options.ConvertTabsToSpaces) {
                 var tabs = Math.floor(indentation / options.TabSize);
                 var spaces = indentation - tabs * options.TabSize;
-                var tabString;
+                var tabString = void 0;
                 if (!internedTabsIndentation) {
                     internedTabsIndentation = [];
                 }
@@ -45142,7 +48518,7 @@ var ts;
                 return spaces ? tabString + repeat(" ", spaces) : tabString;
             }
             else {
-                var spacesString;
+                var spacesString = void 0;
                 var quotient = Math.floor(indentation / options.IndentSize);
                 var remainder = indentation % options.IndentSize;
                 if (!internedSpacesIndentation) {
@@ -45216,7 +48592,7 @@ var ts;
                     var lineStart = ts.getLineStartPositionForPosition(current_1, sourceFile);
                     return SmartIndenter.findFirstNonWhitespaceColumn(lineStart, current_1, sourceFile, options);
                 }
-                if (precedingToken.kind === 24 /* CommaToken */ && precedingToken.parent.kind !== 184 /* BinaryExpression */) {
+                if (precedingToken.kind === 24 /* CommaToken */ && precedingToken.parent.kind !== 186 /* BinaryExpression */) {
                     // previous token is comma that separates items in list - find the previous item and try to derive indentation from it
                     var actualIndentation = getActualIndentationForListItemBeforeComma(precedingToken, sourceFile, options);
                     if (actualIndentation !== -1 /* Unknown */) {
@@ -45335,7 +48711,7 @@ var ts;
                 // - 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
                 var useActualIndentation = (ts.isDeclaration(current) || ts.isStatement(current)) &&
-                    (parent.kind === 251 /* SourceFile */ || !parentAndChildShareLine);
+                    (parent.kind === 255 /* SourceFile */ || !parentAndChildShareLine);
                 if (!useActualIndentation) {
                     return -1 /* Unknown */;
                 }
@@ -45368,7 +48744,7 @@ var ts;
                 return sourceFile.getLineAndCharacterOfPosition(n.getStart(sourceFile));
             }
             function childStartsOnTheSameLineWithElseInIfStatement(parent, child, childStartLine, sourceFile) {
-                if (parent.kind === 199 /* IfStatement */ && parent.elseStatement === child) {
+                if (parent.kind === 202 /* IfStatement */ && parent.elseStatement === child) {
                     var elseKeyword = ts.findChildOfKind(parent, 80 /* ElseKeyword */, sourceFile);
                     ts.Debug.assert(elseKeyword !== undefined);
                     var elseKeywordStartLine = getStartLineAndCharacterForNode(elseKeyword, sourceFile).line;
@@ -45380,23 +48756,23 @@ var ts;
             function getContainingList(node, sourceFile) {
                 if (node.parent) {
                     switch (node.parent.kind) {
-                        case 152 /* TypeReference */:
+                        case 154 /* TypeReference */:
                             if (node.parent.typeArguments &&
                                 ts.rangeContainsStartEnd(node.parent.typeArguments, node.getStart(sourceFile), node.getEnd())) {
                                 return node.parent.typeArguments;
                             }
                             break;
-                        case 168 /* ObjectLiteralExpression */:
+                        case 170 /* ObjectLiteralExpression */:
                             return node.parent.properties;
-                        case 167 /* ArrayLiteralExpression */:
+                        case 169 /* ArrayLiteralExpression */:
                             return node.parent.elements;
-                        case 216 /* FunctionDeclaration */:
-                        case 176 /* FunctionExpression */:
-                        case 177 /* ArrowFunction */:
-                        case 144 /* MethodDeclaration */:
-                        case 143 /* MethodSignature */:
-                        case 148 /* CallSignature */:
-                        case 149 /* ConstructSignature */: {
+                        case 219 /* FunctionDeclaration */:
+                        case 178 /* FunctionExpression */:
+                        case 179 /* ArrowFunction */:
+                        case 146 /* MethodDeclaration */:
+                        case 145 /* MethodSignature */:
+                        case 150 /* CallSignature */:
+                        case 151 /* ConstructSignature */: {
                             var start = node.getStart(sourceFile);
                             if (node.parent.typeParameters &&
                                 ts.rangeContainsStartEnd(node.parent.typeParameters, start, node.getEnd())) {
@@ -45407,8 +48783,8 @@ var ts;
                             }
                             break;
                         }
-                        case 172 /* NewExpression */:
-                        case 171 /* CallExpression */: {
+                        case 174 /* NewExpression */:
+                        case 173 /* CallExpression */: {
                             var start = node.getStart(sourceFile);
                             if (node.parent.typeArguments &&
                                 ts.rangeContainsStartEnd(node.parent.typeArguments, start, node.getEnd())) {
@@ -45438,8 +48814,8 @@ var ts;
                 if (node.kind === 18 /* CloseParenToken */) {
                     return -1 /* Unknown */;
                 }
-                if (node.parent && (node.parent.kind === 171 /* CallExpression */ ||
-                    node.parent.kind === 172 /* NewExpression */) &&
+                if (node.parent && (node.parent.kind === 173 /* CallExpression */ ||
+                    node.parent.kind === 174 /* NewExpression */) &&
                     node.parent.expression !== node) {
                     var fullCallOrNewExpression = node.parent.expression;
                     var startingExpression = getStartingExpression(fullCallOrNewExpression);
@@ -45457,10 +48833,10 @@ var ts;
                 function getStartingExpression(node) {
                     while (true) {
                         switch (node.kind) {
-                            case 171 /* CallExpression */:
-                            case 172 /* NewExpression */:
-                            case 169 /* PropertyAccessExpression */:
-                            case 170 /* ElementAccessExpression */:
+                            case 173 /* CallExpression */:
+                            case 174 /* NewExpression */:
+                            case 171 /* PropertyAccessExpression */:
+                            case 172 /* ElementAccessExpression */:
                                 node = node.expression;
                                 break;
                             default:
@@ -45524,45 +48900,45 @@ var ts;
             SmartIndenter.findFirstNonWhitespaceColumn = findFirstNonWhitespaceColumn;
             function nodeContentIsAlwaysIndented(kind) {
                 switch (kind) {
-                    case 198 /* ExpressionStatement */:
-                    case 217 /* ClassDeclaration */:
-                    case 189 /* ClassExpression */:
-                    case 218 /* InterfaceDeclaration */:
-                    case 220 /* EnumDeclaration */:
-                    case 219 /* TypeAliasDeclaration */:
-                    case 167 /* ArrayLiteralExpression */:
-                    case 195 /* Block */:
-                    case 222 /* ModuleBlock */:
-                    case 168 /* ObjectLiteralExpression */:
-                    case 156 /* TypeLiteral */:
-                    case 158 /* TupleType */:
-                    case 223 /* CaseBlock */:
-                    case 245 /* DefaultClause */:
-                    case 244 /* CaseClause */:
-                    case 175 /* ParenthesizedExpression */:
-                    case 169 /* PropertyAccessExpression */:
-                    case 171 /* CallExpression */:
-                    case 172 /* NewExpression */:
-                    case 196 /* VariableStatement */:
-                    case 214 /* VariableDeclaration */:
-                    case 230 /* ExportAssignment */:
-                    case 207 /* ReturnStatement */:
-                    case 185 /* ConditionalExpression */:
-                    case 165 /* ArrayBindingPattern */:
-                    case 164 /* ObjectBindingPattern */:
-                    case 238 /* JsxOpeningElement */:
-                    case 237 /* JsxSelfClosingElement */:
-                    case 243 /* JsxExpression */:
-                    case 143 /* MethodSignature */:
-                    case 148 /* CallSignature */:
-                    case 149 /* ConstructSignature */:
-                    case 139 /* Parameter */:
-                    case 153 /* FunctionType */:
-                    case 154 /* ConstructorType */:
-                    case 161 /* ParenthesizedType */:
-                    case 173 /* TaggedTemplateExpression */:
-                    case 181 /* AwaitExpression */:
-                    case 228 /* NamedImports */:
+                    case 201 /* ExpressionStatement */:
+                    case 220 /* ClassDeclaration */:
+                    case 191 /* ClassExpression */:
+                    case 221 /* InterfaceDeclaration */:
+                    case 223 /* EnumDeclaration */:
+                    case 222 /* TypeAliasDeclaration */:
+                    case 169 /* ArrayLiteralExpression */:
+                    case 198 /* Block */:
+                    case 225 /* ModuleBlock */:
+                    case 170 /* ObjectLiteralExpression */:
+                    case 158 /* TypeLiteral */:
+                    case 160 /* TupleType */:
+                    case 226 /* CaseBlock */:
+                    case 249 /* DefaultClause */:
+                    case 248 /* CaseClause */:
+                    case 177 /* ParenthesizedExpression */:
+                    case 171 /* PropertyAccessExpression */:
+                    case 173 /* CallExpression */:
+                    case 174 /* NewExpression */:
+                    case 199 /* VariableStatement */:
+                    case 217 /* VariableDeclaration */:
+                    case 234 /* ExportAssignment */:
+                    case 210 /* ReturnStatement */:
+                    case 187 /* ConditionalExpression */:
+                    case 167 /* ArrayBindingPattern */:
+                    case 166 /* ObjectBindingPattern */:
+                    case 242 /* JsxOpeningElement */:
+                    case 241 /* JsxSelfClosingElement */:
+                    case 247 /* JsxExpression */:
+                    case 145 /* MethodSignature */:
+                    case 150 /* CallSignature */:
+                    case 151 /* ConstructSignature */:
+                    case 141 /* Parameter */:
+                    case 155 /* FunctionType */:
+                    case 156 /* ConstructorType */:
+                    case 163 /* ParenthesizedType */:
+                    case 175 /* TaggedTemplateExpression */:
+                    case 183 /* AwaitExpression */:
+                    case 232 /* NamedImports */:
                         return true;
                 }
                 return false;
@@ -45571,22 +48947,22 @@ var ts;
             function nodeWillIndentChild(parent, child, indentByDefault) {
                 var childKind = child ? child.kind : 0 /* Unknown */;
                 switch (parent.kind) {
-                    case 200 /* DoStatement */:
-                    case 201 /* WhileStatement */:
-                    case 203 /* ForInStatement */:
-                    case 204 /* ForOfStatement */:
-                    case 202 /* ForStatement */:
-                    case 199 /* IfStatement */:
-                    case 216 /* FunctionDeclaration */:
-                    case 176 /* FunctionExpression */:
-                    case 144 /* MethodDeclaration */:
-                    case 177 /* ArrowFunction */:
-                    case 145 /* Constructor */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
-                        return childKind !== 195 /* Block */;
-                    case 236 /* JsxElement */:
-                        return childKind !== 240 /* JsxClosingElement */;
+                    case 203 /* DoStatement */:
+                    case 204 /* WhileStatement */:
+                    case 206 /* ForInStatement */:
+                    case 207 /* ForOfStatement */:
+                    case 205 /* ForStatement */:
+                    case 202 /* IfStatement */:
+                    case 219 /* FunctionDeclaration */:
+                    case 178 /* FunctionExpression */:
+                    case 146 /* MethodDeclaration */:
+                    case 179 /* ArrowFunction */:
+                    case 147 /* Constructor */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
+                        return childKind !== 198 /* Block */;
+                    case 240 /* JsxElement */:
+                        return childKind !== 244 /* JsxClosingElement */;
                 }
                 // No explicit rule for given nodes so the result will follow the default value argument
                 return indentByDefault;
@@ -45603,11 +48979,6 @@ var ts;
     })(formatting = ts.formatting || (ts.formatting = {}));
 })(ts || (ts = {}));
 /// <reference path="..\compiler\program.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 __());
-};
 /// <reference path='breakpoints.ts' />
 /// <reference path='outliningElementsCollector.ts' />
 /// <reference path='navigateTo.ts' />
@@ -45615,6 +48986,7 @@ var __extends = (this && this.__extends) || function (d, b) {
 /// <reference path='patternMatcher.ts' />
 /// <reference path='signatureHelp.ts' />
 /// <reference path='utilities.ts' />
+/// <reference path='jsTyping.ts' />
 /// <reference path='formatting\formatting.ts' />
 /// <reference path='formatting\smartIndenter.ts' />
 var ts;
@@ -45732,17 +49104,17 @@ var ts;
             while (pos < end) {
                 var token = scanner.scan();
                 var textPos = scanner.getTextPos();
-                nodes.push(createNode(token, pos, textPos, 2048 /* Synthetic */, this));
+                nodes.push(createNode(token, pos, textPos, 0, this));
                 pos = textPos;
             }
             return pos;
         };
         NodeObject.prototype.createSyntaxList = function (nodes) {
-            var list = createNode(274 /* SyntaxList */, nodes.pos, nodes.end, 2048 /* Synthetic */, this);
+            var list = createNode(278 /* SyntaxList */, nodes.pos, nodes.end, 0, this);
             list._children = [];
             var pos = nodes.pos;
-            for (var _i = 0, nodes_7 = nodes; _i < nodes_7.length; _i++) {
-                var node = nodes_7[_i];
+            for (var _i = 0, nodes_8 = nodes; _i < nodes_8.length; _i++) {
+                var node = nodes_8[_i];
                 if (pos < node.pos) {
                     pos = this.addSyntheticNodes(list._children, pos, node.pos);
                 }
@@ -45757,27 +49129,27 @@ var ts;
         NodeObject.prototype.createChildren = function (sourceFile) {
             var _this = this;
             var children;
-            if (this.kind >= 136 /* FirstNode */) {
+            if (this.kind >= 138 /* FirstNode */) {
                 scanner.setText((sourceFile || this.getSourceFile()).text);
                 children = [];
-                var pos = this.pos;
+                var pos_3 = this.pos;
                 var processNode = function (node) {
-                    if (pos < node.pos) {
-                        pos = _this.addSyntheticNodes(children, pos, node.pos);
+                    if (pos_3 < node.pos) {
+                        pos_3 = _this.addSyntheticNodes(children, pos_3, node.pos);
                     }
                     children.push(node);
-                    pos = node.end;
+                    pos_3 = node.end;
                 };
                 var processNodes = function (nodes) {
-                    if (pos < nodes.pos) {
-                        pos = _this.addSyntheticNodes(children, pos, nodes.pos);
+                    if (pos_3 < nodes.pos) {
+                        pos_3 = _this.addSyntheticNodes(children, pos_3, nodes.pos);
                     }
                     children.push(_this.createSyntaxList(nodes));
-                    pos = nodes.end;
+                    pos_3 = nodes.end;
                 };
                 ts.forEachChild(this, processNode, processNodes);
-                if (pos < this.end) {
-                    this.addSyntheticNodes(children, pos, this.end);
+                if (pos_3 < this.end) {
+                    this.addSyntheticNodes(children, pos_3, this.end);
                 }
                 scanner.setText(undefined);
             }
@@ -45804,7 +49176,7 @@ var ts;
                 return undefined;
             }
             var child = children[0];
-            return child.kind < 136 /* FirstNode */ ? child : child.getFirstToken(sourceFile);
+            return child.kind < 138 /* FirstNode */ ? child : child.getFirstToken(sourceFile);
         };
         NodeObject.prototype.getLastToken = function (sourceFile) {
             var children = this.getChildren(sourceFile);
@@ -45812,7 +49184,7 @@ var ts;
             if (!child) {
                 return undefined;
             }
-            return child.kind < 136 /* FirstNode */ ? child : child.getLastToken(sourceFile);
+            return child.kind < 138 /* FirstNode */ ? child : child.getLastToken(sourceFile);
         };
         return NodeObject;
     }());
@@ -45859,27 +49231,27 @@ var ts;
                 // The property length will have two declarations of property length coming
                 // from Array<T> - Array<string> and Array<number>
                 if (ts.indexOf(declarations, declaration) === indexOfDeclaration) {
-                    var sourceFileOfDeclaration = ts.getSourceFileOfNode(declaration);
+                    var sourceFileOfDeclaration_1 = ts.getSourceFileOfNode(declaration);
                     // If it is parameter - try and get the jsDoc comment with @param tag from function declaration's jsDoc comments
-                    if (canUseParsedParamTagComments && declaration.kind === 139 /* Parameter */) {
-                        ts.forEach(getJsDocCommentTextRange(declaration.parent, sourceFileOfDeclaration), function (jsDocCommentTextRange) {
-                            var cleanedParamJsDocComment = getCleanedParamJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration);
+                    if (canUseParsedParamTagComments && declaration.kind === 141 /* Parameter */) {
+                        ts.forEach(getJsDocCommentTextRange(declaration.parent, sourceFileOfDeclaration_1), function (jsDocCommentTextRange) {
+                            var cleanedParamJsDocComment = getCleanedParamJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration_1);
                             if (cleanedParamJsDocComment) {
                                 ts.addRange(jsDocCommentParts, cleanedParamJsDocComment);
                             }
                         });
                     }
                     // If this is left side of dotted module declaration, there is no doc comments associated with this node
-                    if (declaration.kind === 221 /* ModuleDeclaration */ && declaration.body.kind === 221 /* ModuleDeclaration */) {
+                    if (declaration.kind === 224 /* ModuleDeclaration */ && declaration.body.kind === 224 /* ModuleDeclaration */) {
                         return;
                     }
                     // If this is dotted module name, get the doc comments from the parent
-                    while (declaration.kind === 221 /* ModuleDeclaration */ && declaration.parent.kind === 221 /* ModuleDeclaration */) {
+                    while (declaration.kind === 224 /* ModuleDeclaration */ && declaration.parent.kind === 224 /* ModuleDeclaration */) {
                         declaration = declaration.parent;
                     }
                     // Get the cleaned js doc comment text from the declaration
-                    ts.forEach(getJsDocCommentTextRange(declaration.kind === 214 /* VariableDeclaration */ ? declaration.parent.parent : declaration, sourceFileOfDeclaration), function (jsDocCommentTextRange) {
-                        var cleanedJsDocComment = getCleanedJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration);
+                    ts.forEach(getJsDocCommentTextRange(declaration.kind === 217 /* VariableDeclaration */ ? declaration.parent.parent : declaration, sourceFileOfDeclaration_1), function (jsDocCommentTextRange) {
+                        var cleanedJsDocComment = getCleanedJsDocComment(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration_1);
                         if (cleanedJsDocComment) {
                             ts.addRange(jsDocCommentParts, cleanedJsDocComment);
                         }
@@ -45953,7 +49325,7 @@ var ts;
                     else if (spacesToRemoveAfterAsterisk === undefined) {
                         spacesToRemoveAfterAsterisk = 0;
                     }
-                    // Analyse text on this line
+                    // Analyze text on this line
                     while (pos < end && !ts.isLineBreak(sourceFile.text.charCodeAt(pos))) {
                         var ch = sourceFile.text.charAt(pos);
                         if (ch === "@") {
@@ -46073,7 +49445,7 @@ var ts;
                             }
                             paramHelpStringMargin = undefined;
                         }
-                        // If this is the start of another tag, continue with the loop in seach of param tag with symbol name
+                        // If this is the start of another tag, continue with the loop in search of param tag with symbol name
                         if (sourceFile.text.charCodeAt(pos) === 64 /* at */) {
                             continue;
                         }
@@ -46223,9 +49595,9 @@ var ts;
                     if (result_2 !== undefined) {
                         return result_2;
                     }
-                    if (declaration.name.kind === 137 /* ComputedPropertyName */) {
+                    if (declaration.name.kind === 139 /* ComputedPropertyName */) {
                         var expr = declaration.name.expression;
-                        if (expr.kind === 169 /* PropertyAccessExpression */) {
+                        if (expr.kind === 171 /* PropertyAccessExpression */) {
                             return expr.name.text;
                         }
                         return getTextOfIdentifierOrLiteral(expr);
@@ -46245,9 +49617,9 @@ var ts;
             }
             function visit(node) {
                 switch (node.kind) {
-                    case 216 /* FunctionDeclaration */:
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
+                    case 219 /* FunctionDeclaration */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
                         var functionDeclaration = node;
                         var declarationName = getDeclarationName(functionDeclaration);
                         if (declarationName) {
@@ -46267,60 +49639,60 @@ var ts;
                             ts.forEachChild(node, visit);
                         }
                         break;
-                    case 217 /* ClassDeclaration */:
-                    case 218 /* InterfaceDeclaration */:
-                    case 219 /* TypeAliasDeclaration */:
-                    case 220 /* EnumDeclaration */:
-                    case 221 /* ModuleDeclaration */:
-                    case 224 /* ImportEqualsDeclaration */:
-                    case 233 /* ExportSpecifier */:
-                    case 229 /* ImportSpecifier */:
-                    case 224 /* ImportEqualsDeclaration */:
-                    case 226 /* ImportClause */:
-                    case 227 /* NamespaceImport */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
-                    case 156 /* TypeLiteral */:
+                    case 220 /* ClassDeclaration */:
+                    case 221 /* InterfaceDeclaration */:
+                    case 222 /* TypeAliasDeclaration */:
+                    case 223 /* EnumDeclaration */:
+                    case 224 /* ModuleDeclaration */:
+                    case 228 /* ImportEqualsDeclaration */:
+                    case 237 /* ExportSpecifier */:
+                    case 233 /* ImportSpecifier */:
+                    case 228 /* ImportEqualsDeclaration */:
+                    case 230 /* ImportClause */:
+                    case 231 /* NamespaceImport */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
+                    case 158 /* TypeLiteral */:
                         addDeclaration(node);
                     // fall through
-                    case 145 /* Constructor */:
-                    case 196 /* VariableStatement */:
-                    case 215 /* VariableDeclarationList */:
-                    case 164 /* ObjectBindingPattern */:
-                    case 165 /* ArrayBindingPattern */:
-                    case 222 /* ModuleBlock */:
+                    case 147 /* Constructor */:
+                    case 199 /* VariableStatement */:
+                    case 218 /* VariableDeclarationList */:
+                    case 166 /* ObjectBindingPattern */:
+                    case 167 /* ArrayBindingPattern */:
+                    case 225 /* ModuleBlock */:
                         ts.forEachChild(node, visit);
                         break;
-                    case 195 /* Block */:
+                    case 198 /* Block */:
                         if (ts.isFunctionBlock(node)) {
                             ts.forEachChild(node, visit);
                         }
                         break;
-                    case 139 /* Parameter */:
+                    case 141 /* Parameter */:
                         // Only consider properties defined as constructor parameters
-                        if (!(node.flags & 56 /* AccessibilityModifier */)) {
+                        if (!(node.flags & 28 /* AccessibilityModifier */)) {
                             break;
                         }
                     // fall through
-                    case 214 /* VariableDeclaration */:
-                    case 166 /* BindingElement */:
+                    case 217 /* VariableDeclaration */:
+                    case 168 /* BindingElement */:
                         if (ts.isBindingPattern(node.name)) {
                             ts.forEachChild(node.name, visit);
                             break;
                         }
-                    case 250 /* EnumMember */:
-                    case 142 /* PropertyDeclaration */:
-                    case 141 /* PropertySignature */:
+                    case 254 /* EnumMember */:
+                    case 144 /* PropertyDeclaration */:
+                    case 143 /* PropertySignature */:
                         addDeclaration(node);
                         break;
-                    case 231 /* ExportDeclaration */:
+                    case 235 /* ExportDeclaration */:
                         // Handle named exports case e.g.:
                         //    export {a, b as B} from "mod";
                         if (node.exportClause) {
                             ts.forEach(node.exportClause.elements, visit);
                         }
                         break;
-                    case 225 /* ImportDeclaration */:
+                    case 229 /* ImportDeclaration */:
                         var importClause = node.importClause;
                         if (importClause) {
                             // Handle default import case e.g.:
@@ -46332,7 +49704,7 @@ var ts;
                             //    import * as NS from "mod";
                             //    import {a, b as B} from "mod";
                             if (importClause.namedBindings) {
-                                if (importClause.namedBindings.kind === 227 /* NamespaceImport */) {
+                                if (importClause.namedBindings.kind === 231 /* NamespaceImport */) {
                                     addDeclaration(importClause.namedBindings);
                                 }
                                 else {
@@ -46554,16 +49926,16 @@ var ts;
         }
         return ts.forEach(symbol.declarations, function (declaration) {
             // Function expressions are local
-            if (declaration.kind === 176 /* FunctionExpression */) {
+            if (declaration.kind === 178 /* FunctionExpression */) {
                 return true;
             }
-            if (declaration.kind !== 214 /* VariableDeclaration */ && declaration.kind !== 216 /* FunctionDeclaration */) {
+            if (declaration.kind !== 217 /* VariableDeclaration */ && declaration.kind !== 219 /* FunctionDeclaration */) {
                 return false;
             }
             // If the parent is not sourceFile or module block it is local variable
-            for (var parent_9 = declaration.parent; !ts.isFunctionBlock(parent_9); parent_9 = parent_9.parent) {
+            for (var parent_12 = declaration.parent; !ts.isFunctionBlock(parent_12); parent_12 = parent_12.parent) {
                 // Reached source file or module block
-                if (parent_9.kind === 251 /* SourceFile */ || parent_9.kind === 222 /* ModuleBlock */) {
+                if (parent_12.kind === 255 /* SourceFile */ || parent_12.kind === 225 /* ModuleBlock */) {
                     return false;
                 }
             }
@@ -46575,7 +49947,6 @@ var ts;
         // Always default to "ScriptTarget.ES5" for the language service
         return {
             target: 1 /* ES5 */,
-            module: 0 /* None */,
             jsx: 1 /* Preserve */
         };
     }
@@ -46609,7 +49980,8 @@ var ts;
                 entry = {
                     hostFileName: fileName,
                     version: this.host.getScriptVersion(fileName),
-                    scriptSnapshot: scriptSnapshot
+                    scriptSnapshot: scriptSnapshot,
+                    scriptKind: ts.getScriptKind(fileName, this.host)
                 };
             }
             this.fileNameToEntry.set(path, entry);
@@ -46657,11 +50029,12 @@ var ts;
                 // The host does not know about this file.
                 throw new Error("Could not find file: '" + fileName + "'.");
             }
+            var scriptKind = ts.getScriptKind(fileName, this.host);
             var version = this.host.getScriptVersion(fileName);
             var sourceFile;
             if (this.currentFileName !== fileName) {
                 // This is a new file, just parse it
-                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 2 /* Latest */, version, /*setNodeParents*/ true);
+                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 2 /* Latest */, version, /*setNodeParents*/ true, scriptKind);
             }
             else if (this.currentFileVersion !== version) {
                 // This is the same file, just a newer version. Incrementally parse the file.
@@ -46695,6 +50068,8 @@ var ts;
     function transpileModule(input, transpileOptions) {
         var options = transpileOptions.compilerOptions ? ts.clone(transpileOptions.compilerOptions) : getDefaultCompilerOptions();
         options.isolatedModules = true;
+        // transpileModule does not write anything to disk so there is no need to verify that there are no conflicts between input and output paths. 
+        options.suppressOutputPathCheck = true;
         // Filename can be non-ts file.
         options.allowNonTsExtensions = true;
         // We are not returning a sourceFile for lib file when asked by the program,
@@ -46759,12 +50134,10 @@ var ts;
         return output.outputText;
     }
     ts.transpile = transpile;
-    function createLanguageServiceSourceFile(fileName, scriptSnapshot, scriptTarget, version, setNodeParents) {
+    function createLanguageServiceSourceFile(fileName, scriptSnapshot, scriptTarget, version, setNodeParents, scriptKind) {
         var text = scriptSnapshot.getText(0, scriptSnapshot.getLength());
-        var sourceFile = ts.createSourceFile(fileName, text, scriptTarget, setNodeParents);
+        var sourceFile = ts.createSourceFile(fileName, text, scriptTarget, setNodeParents, scriptKind);
         setSourceFileFields(sourceFile, scriptSnapshot, version);
-        // after full parsing we can use table with interned strings as name table
-        sourceFile.nameTable = sourceFile.identifiers;
         return sourceFile;
     }
     ts.createLanguageServiceSourceFile = createLanguageServiceSourceFile;
@@ -46776,7 +50149,7 @@ var ts;
             if (version !== sourceFile.version) {
                 // Once incremental parsing is ready, then just call into this function.
                 if (!ts.disableIncrementalParsing) {
-                    var newText;
+                    var newText = void 0;
                     // grab the fragment from the beginning of the original text to the beginning of the span
                     var prefix = textChangeRange.span.start !== 0
                         ? sourceFile.text.substr(0, textChangeRange.span.start)
@@ -46816,7 +50189,7 @@ var ts;
             }
         }
         // Otherwise, just create a new source file.
-        return createLanguageServiceSourceFile(sourceFile.fileName, scriptSnapshot, sourceFile.languageVersion, version, /*setNodeParents*/ true);
+        return createLanguageServiceSourceFile(sourceFile.fileName, scriptSnapshot, sourceFile.languageVersion, version, /*setNodeParents*/ true, sourceFile.scriptKind);
     }
     ts.updateLanguageServiceSourceFile = updateLanguageServiceSourceFile;
     function createDocumentRegistry(useCaseSensitiveFileNames, currentDirectory) {
@@ -46855,20 +50228,20 @@ var ts;
             });
             return JSON.stringify(bucketInfoArray, undefined, 2);
         }
-        function acquireDocument(fileName, compilationSettings, scriptSnapshot, version) {
-            return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring*/ true);
+        function acquireDocument(fileName, compilationSettings, scriptSnapshot, version, scriptKind) {
+            return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring*/ true, scriptKind);
         }
-        function updateDocument(fileName, compilationSettings, scriptSnapshot, version) {
-            return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring*/ false);
+        function updateDocument(fileName, compilationSettings, scriptSnapshot, version, scriptKind) {
+            return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring*/ false, scriptKind);
         }
-        function acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, acquiring) {
+        function acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, acquiring, scriptKind) {
             var bucket = getBucketForCompilationSettings(compilationSettings, /*createIfMissing*/ true);
             var path = ts.toPath(fileName, currentDirectory, getCanonicalFileName);
             var entry = bucket.get(path);
             if (!entry) {
                 ts.Debug.assert(acquiring, "How could we be trying to update a document that the registry doesn't have?");
                 // Have never seen this file with these settings.  Create a new source file for it.
-                var sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, compilationSettings.target, version, /*setNodeParents*/ false);
+                var sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, compilationSettings.target, version, /*setNodeParents*/ false, scriptKind);
                 entry = {
                     sourceFile: sourceFile,
                     languageServiceRefCount: 0,
@@ -46917,9 +50290,24 @@ var ts;
         if (readImportFiles === void 0) { readImportFiles = true; }
         if (detectJavaScriptImports === void 0) { detectJavaScriptImports = false; }
         var referencedFiles = [];
+        var typeReferenceDirectives = [];
         var importedFiles = [];
         var ambientExternalModules;
         var isNoDefaultLib = false;
+        var braceNesting = 0;
+        // assume that text represent an external module if it contains at least one top level import/export
+        // ambient modules that are found inside external modules are interpreted as module augmentations
+        var externalModule = false;
+        function nextToken() {
+            var token = scanner.scan();
+            if (token === 15 /* OpenBraceToken */) {
+                braceNesting++;
+            }
+            else if (token === 16 /* CloseBraceToken */) {
+                braceNesting--;
+            }
+            return token;
+        }
         function processTripleSlashDirectives() {
             var commentRanges = ts.getLeadingCommentRanges(sourceText, 0);
             ts.forEach(commentRanges, function (commentRange) {
@@ -46929,25 +50317,37 @@ var ts;
                     isNoDefaultLib = referencePathMatchResult.isNoDefaultLib;
                     var fileReference = referencePathMatchResult.fileReference;
                     if (fileReference) {
-                        referencedFiles.push(fileReference);
+                        var collection = referencePathMatchResult.isTypeReferenceDirective
+                            ? typeReferenceDirectives
+                            : referencedFiles;
+                        collection.push(fileReference);
                     }
                 }
             });
         }
+        function getFileReference() {
+            var file = scanner.getTokenValue();
+            var pos = scanner.getTokenPos();
+            return {
+                fileName: file,
+                pos: pos,
+                end: pos + file.length
+            };
+        }
         function recordAmbientExternalModule() {
             if (!ambientExternalModules) {
                 ambientExternalModules = [];
             }
-            ambientExternalModules.push(scanner.getTokenValue());
+            ambientExternalModules.push({ ref: getFileReference(), depth: braceNesting });
         }
         function recordModuleName() {
-            var importPath = scanner.getTokenValue();
-            var pos = scanner.getTokenPos();
-            importedFiles.push({
-                fileName: importPath,
-                pos: pos,
-                end: pos + importPath.length
-            });
+            importedFiles.push(getFileReference());
+            markAsExternalModuleIfTopLevel();
+        }
+        function markAsExternalModuleIfTopLevel() {
+            if (braceNesting === 0) {
+                externalModule = true;
+            }
         }
         /**
          * Returns true if at least one token was consumed from the stream
@@ -46956,9 +50356,9 @@ var ts;
             var token = scanner.getToken();
             if (token === 122 /* DeclareKeyword */) {
                 // declare module "mod"
-                token = scanner.scan();
+                token = nextToken();
                 if (token === 125 /* ModuleKeyword */) {
-                    token = scanner.scan();
+                    token = nextToken();
                     if (token === 9 /* StringLiteral */) {
                         recordAmbientExternalModule();
                     }
@@ -46973,7 +50373,7 @@ var ts;
         function tryConsumeImport() {
             var token = scanner.getToken();
             if (token === 89 /* ImportKeyword */) {
-                token = scanner.scan();
+                token = nextToken();
                 if (token === 9 /* StringLiteral */) {
                     // import "mod";
                     recordModuleName();
@@ -46981,9 +50381,9 @@ var ts;
                 }
                 else {
                     if (token === 69 /* Identifier */ || ts.isKeyword(token)) {
-                        token = scanner.scan();
-                        if (token === 133 /* FromKeyword */) {
-                            token = scanner.scan();
+                        token = nextToken();
+                        if (token === 135 /* FromKeyword */) {
+                            token = nextToken();
                             if (token === 9 /* StringLiteral */) {
                                 // import d from "mod";
                                 recordModuleName();
@@ -46997,7 +50397,7 @@ var ts;
                         }
                         else if (token === 24 /* CommaToken */) {
                             // consume comma and keep going
-                            token = scanner.scan();
+                            token = nextToken();
                         }
                         else {
                             // unknown syntax
@@ -47005,16 +50405,16 @@ var ts;
                         }
                     }
                     if (token === 15 /* OpenBraceToken */) {
-                        token = scanner.scan();
+                        token = nextToken();
                         // consume "{ a as B, c, d as D}" clauses
                         // make sure that it stops on EOF
                         while (token !== 16 /* CloseBraceToken */ && token !== 1 /* EndOfFileToken */) {
-                            token = scanner.scan();
+                            token = nextToken();
                         }
                         if (token === 16 /* CloseBraceToken */) {
-                            token = scanner.scan();
-                            if (token === 133 /* FromKeyword */) {
-                                token = scanner.scan();
+                            token = nextToken();
+                            if (token === 135 /* FromKeyword */) {
+                                token = nextToken();
                                 if (token === 9 /* StringLiteral */) {
                                     // import {a as A} from "mod";
                                     // import d, {a, b as B} from "mod"
@@ -47024,13 +50424,13 @@ var ts;
                         }
                     }
                     else if (token === 37 /* AsteriskToken */) {
-                        token = scanner.scan();
+                        token = nextToken();
                         if (token === 116 /* AsKeyword */) {
-                            token = scanner.scan();
+                            token = nextToken();
                             if (token === 69 /* Identifier */ || ts.isKeyword(token)) {
-                                token = scanner.scan();
-                                if (token === 133 /* FromKeyword */) {
-                                    token = scanner.scan();
+                                token = nextToken();
+                                if (token === 135 /* FromKeyword */) {
+                                    token = nextToken();
                                     if (token === 9 /* StringLiteral */) {
                                         // import * as NS from "mod"
                                         // import d, * as NS from "mod"
@@ -47048,18 +50448,19 @@ var ts;
         function tryConsumeExport() {
             var token = scanner.getToken();
             if (token === 82 /* ExportKeyword */) {
-                token = scanner.scan();
+                markAsExternalModuleIfTopLevel();
+                token = nextToken();
                 if (token === 15 /* OpenBraceToken */) {
-                    token = scanner.scan();
+                    token = nextToken();
                     // consume "{ a as B, c, d as D}" clauses
                     // make sure it stops on EOF
                     while (token !== 16 /* CloseBraceToken */ && token !== 1 /* EndOfFileToken */) {
-                        token = scanner.scan();
+                        token = nextToken();
                     }
                     if (token === 16 /* CloseBraceToken */) {
-                        token = scanner.scan();
-                        if (token === 133 /* FromKeyword */) {
-                            token = scanner.scan();
+                        token = nextToken();
+                        if (token === 135 /* FromKeyword */) {
+                            token = nextToken();
                             if (token === 9 /* StringLiteral */) {
                                 // export {a as A} from "mod";
                                 // export {a, b as B} from "mod"
@@ -47069,9 +50470,9 @@ var ts;
                     }
                 }
                 else if (token === 37 /* AsteriskToken */) {
-                    token = scanner.scan();
-                    if (token === 133 /* FromKeyword */) {
-                        token = scanner.scan();
+                    token = nextToken();
+                    if (token === 135 /* FromKeyword */) {
+                        token = nextToken();
                         if (token === 9 /* StringLiteral */) {
                             // export * from "mod"
                             recordModuleName();
@@ -47079,9 +50480,9 @@ var ts;
                     }
                 }
                 else if (token === 89 /* ImportKeyword */) {
-                    token = scanner.scan();
+                    token = nextToken();
                     if (token === 69 /* Identifier */ || ts.isKeyword(token)) {
-                        token = scanner.scan();
+                        token = nextToken();
                         if (token === 56 /* EqualsToken */) {
                             if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) {
                                 return true;
@@ -47094,11 +50495,11 @@ var ts;
             return false;
         }
         function tryConsumeRequireCall(skipCurrentToken) {
-            var token = skipCurrentToken ? scanner.scan() : scanner.getToken();
-            if (token === 127 /* RequireKeyword */) {
-                token = scanner.scan();
+            var token = skipCurrentToken ? nextToken() : scanner.getToken();
+            if (token === 128 /* RequireKeyword */) {
+                token = nextToken();
                 if (token === 17 /* OpenParenToken */) {
-                    token = scanner.scan();
+                    token = nextToken();
                     if (token === 9 /* StringLiteral */) {
                         //  require("mod");
                         recordModuleName();
@@ -47111,16 +50512,16 @@ var ts;
         function tryConsumeDefine() {
             var token = scanner.getToken();
             if (token === 69 /* Identifier */ && scanner.getTokenValue() === "define") {
-                token = scanner.scan();
+                token = nextToken();
                 if (token !== 17 /* OpenParenToken */) {
                     return true;
                 }
-                token = scanner.scan();
+                token = nextToken();
                 if (token === 9 /* StringLiteral */) {
                     // looks like define ("modname", ... - skip string literal and comma
-                    token = scanner.scan();
+                    token = nextToken();
                     if (token === 24 /* CommaToken */) {
-                        token = scanner.scan();
+                        token = nextToken();
                     }
                     else {
                         // unexpected token
@@ -47132,7 +50533,7 @@ var ts;
                     return true;
                 }
                 // skip open bracket
-                token = scanner.scan();
+                token = nextToken();
                 var i = 0;
                 // scan until ']' or EOF
                 while (token !== 20 /* CloseBracketToken */ && token !== 1 /* EndOfFileToken */) {
@@ -47141,7 +50542,7 @@ var ts;
                         recordModuleName();
                         i++;
                     }
-                    token = scanner.scan();
+                    token = nextToken();
                 }
                 return true;
             }
@@ -47149,7 +50550,7 @@ var ts;
         }
         function processImports() {
             scanner.setText(sourceText);
-            scanner.scan();
+            nextToken();
             // Look for:
             //    import "mod";
             //    import d from "mod"
@@ -47174,7 +50575,7 @@ var ts;
                     continue;
                 }
                 else {
-                    scanner.scan();
+                    nextToken();
                 }
             }
             scanner.setText(undefined);
@@ -47183,13 +50584,42 @@ var ts;
             processImports();
         }
         processTripleSlashDirectives();
-        return { referencedFiles: referencedFiles, importedFiles: importedFiles, isLibFile: isNoDefaultLib, ambientExternalModules: ambientExternalModules };
+        if (externalModule) {
+            // for external modules module all nested ambient modules are augmentations
+            if (ambientExternalModules) {
+                // move all detected ambient modules to imported files since they need to be resolved
+                for (var _i = 0, ambientExternalModules_1 = ambientExternalModules; _i < ambientExternalModules_1.length; _i++) {
+                    var decl = ambientExternalModules_1[_i];
+                    importedFiles.push(decl.ref);
+                }
+            }
+            return { referencedFiles: referencedFiles, typeReferenceDirectives: typeReferenceDirectives, importedFiles: importedFiles, isLibFile: isNoDefaultLib, ambientExternalModules: undefined };
+        }
+        else {
+            // for global scripts ambient modules still can have augmentations - look for ambient modules with depth > 0
+            var ambientModuleNames = void 0;
+            if (ambientExternalModules) {
+                for (var _a = 0, ambientExternalModules_2 = ambientExternalModules; _a < ambientExternalModules_2.length; _a++) {
+                    var decl = ambientExternalModules_2[_a];
+                    if (decl.depth === 0) {
+                        if (!ambientModuleNames) {
+                            ambientModuleNames = [];
+                        }
+                        ambientModuleNames.push(decl.ref.fileName);
+                    }
+                    else {
+                        importedFiles.push(decl.ref);
+                    }
+                }
+            }
+            return { referencedFiles: referencedFiles, typeReferenceDirectives: typeReferenceDirectives, importedFiles: importedFiles, isLibFile: isNoDefaultLib, ambientExternalModules: ambientModuleNames };
+        }
     }
     ts.preProcessFile = preProcessFile;
     /// Helpers
     function getTargetLabel(referenceNode, labelName) {
         while (referenceNode) {
-            if (referenceNode.kind === 210 /* LabeledStatement */ && referenceNode.label.text === labelName) {
+            if (referenceNode.kind === 213 /* LabeledStatement */ && referenceNode.label.text === labelName) {
                 return referenceNode.label;
             }
             referenceNode = referenceNode.parent;
@@ -47198,12 +50628,12 @@ var ts;
     }
     function isJumpStatementTarget(node) {
         return node.kind === 69 /* Identifier */ &&
-            (node.parent.kind === 206 /* BreakStatement */ || node.parent.kind === 205 /* ContinueStatement */) &&
+            (node.parent.kind === 209 /* BreakStatement */ || node.parent.kind === 208 /* ContinueStatement */) &&
             node.parent.label === node;
     }
     function isLabelOfLabeledStatement(node) {
         return node.kind === 69 /* Identifier */ &&
-            node.parent.kind === 210 /* LabeledStatement */ &&
+            node.parent.kind === 213 /* LabeledStatement */ &&
             node.parent.label === node;
     }
     /**
@@ -47211,7 +50641,7 @@ var ts;
      * Note: 'node' cannot be a SourceFile.
      */
     function isLabeledBy(node, labelName) {
-        for (var owner = node.parent; owner.kind === 210 /* LabeledStatement */; owner = owner.parent) {
+        for (var owner = node.parent; owner.kind === 213 /* LabeledStatement */; owner = owner.parent) {
             if (owner.label.text === labelName) {
                 return true;
             }
@@ -47222,25 +50652,25 @@ var ts;
         return isLabelOfLabeledStatement(node) || isJumpStatementTarget(node);
     }
     function isRightSideOfQualifiedName(node) {
-        return node.parent.kind === 136 /* QualifiedName */ && node.parent.right === node;
+        return node.parent.kind === 138 /* QualifiedName */ && node.parent.right === node;
     }
     function isRightSideOfPropertyAccess(node) {
-        return node && node.parent && node.parent.kind === 169 /* PropertyAccessExpression */ && node.parent.name === node;
+        return node && node.parent && node.parent.kind === 171 /* PropertyAccessExpression */ && node.parent.name === node;
     }
     function isCallExpressionTarget(node) {
         if (isRightSideOfPropertyAccess(node)) {
             node = node.parent;
         }
-        return node && node.parent && node.parent.kind === 171 /* CallExpression */ && node.parent.expression === node;
+        return node && node.parent && node.parent.kind === 173 /* CallExpression */ && node.parent.expression === node;
     }
     function isNewExpressionTarget(node) {
         if (isRightSideOfPropertyAccess(node)) {
             node = node.parent;
         }
-        return node && node.parent && node.parent.kind === 172 /* NewExpression */ && node.parent.expression === node;
+        return node && node.parent && node.parent.kind === 174 /* NewExpression */ && node.parent.expression === node;
     }
     function isNameOfModuleDeclaration(node) {
-        return node.parent.kind === 221 /* ModuleDeclaration */ && node.parent.name === node;
+        return node.parent.kind === 224 /* ModuleDeclaration */ && node.parent.name === node;
     }
     function isNameOfFunctionDeclaration(node) {
         return node.kind === 69 /* Identifier */ &&
@@ -47249,22 +50679,22 @@ var ts;
     /** Returns true if node is a name of an object literal property, e.g. "a" in x = { "a": 1 } */
     function isNameOfPropertyAssignment(node) {
         return (node.kind === 69 /* Identifier */ || node.kind === 9 /* StringLiteral */ || node.kind === 8 /* NumericLiteral */) &&
-            (node.parent.kind === 248 /* PropertyAssignment */ || node.parent.kind === 249 /* ShorthandPropertyAssignment */) && node.parent.name === node;
+            (node.parent.kind === 252 /* PropertyAssignment */ || node.parent.kind === 253 /* ShorthandPropertyAssignment */) && node.parent.name === node;
     }
     function isLiteralNameOfPropertyDeclarationOrIndexAccess(node) {
         if (node.kind === 9 /* StringLiteral */ || node.kind === 8 /* NumericLiteral */) {
             switch (node.parent.kind) {
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
-                case 248 /* PropertyAssignment */:
-                case 250 /* EnumMember */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
-                case 221 /* ModuleDeclaration */:
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
+                case 252 /* PropertyAssignment */:
+                case 254 /* EnumMember */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
+                case 224 /* ModuleDeclaration */:
                     return node.parent.name === node;
-                case 170 /* ElementAccessExpression */:
+                case 172 /* ElementAccessExpression */:
                     return node.parent.argumentExpression === node;
             }
         }
@@ -47323,7 +50753,7 @@ var ts;
     })(BreakContinueSearchType || (BreakContinueSearchType = {}));
     // A cache of completion entries for keywords, these do not change between sessions
     var keywordCompletions = [];
-    for (var i = 70 /* FirstKeyword */; i <= 135 /* LastKeyword */; i++) {
+    for (var i = 70 /* FirstKeyword */; i <= 137 /* LastKeyword */; i++) {
         keywordCompletions.push({
             name: ts.tokenToString(i),
             kind: ScriptElementKind.keyword,
@@ -47338,17 +50768,17 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 251 /* SourceFile */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
-                case 216 /* FunctionDeclaration */:
-                case 176 /* FunctionExpression */:
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
-                case 217 /* ClassDeclaration */:
-                case 218 /* InterfaceDeclaration */:
-                case 220 /* EnumDeclaration */:
-                case 221 /* ModuleDeclaration */:
+                case 255 /* SourceFile */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
+                case 219 /* FunctionDeclaration */:
+                case 178 /* FunctionExpression */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
+                case 220 /* ClassDeclaration */:
+                case 221 /* InterfaceDeclaration */:
+                case 223 /* EnumDeclaration */:
+                case 224 /* ModuleDeclaration */:
                     return node;
             }
         }
@@ -47356,38 +50786,38 @@ var ts;
     ts.getContainerNode = getContainerNode;
     /* @internal */ function getNodeKind(node) {
         switch (node.kind) {
-            case 221 /* ModuleDeclaration */: return ScriptElementKind.moduleElement;
-            case 217 /* ClassDeclaration */: return ScriptElementKind.classElement;
-            case 218 /* InterfaceDeclaration */: return ScriptElementKind.interfaceElement;
-            case 219 /* TypeAliasDeclaration */: return ScriptElementKind.typeElement;
-            case 220 /* EnumDeclaration */: return ScriptElementKind.enumElement;
-            case 214 /* VariableDeclaration */:
+            case 224 /* ModuleDeclaration */: return ScriptElementKind.moduleElement;
+            case 220 /* ClassDeclaration */: return ScriptElementKind.classElement;
+            case 221 /* InterfaceDeclaration */: return ScriptElementKind.interfaceElement;
+            case 222 /* TypeAliasDeclaration */: return ScriptElementKind.typeElement;
+            case 223 /* EnumDeclaration */: return ScriptElementKind.enumElement;
+            case 217 /* VariableDeclaration */:
                 return ts.isConst(node)
                     ? ScriptElementKind.constElement
                     : ts.isLet(node)
                         ? ScriptElementKind.letElement
                         : ScriptElementKind.variableElement;
-            case 216 /* FunctionDeclaration */: return ScriptElementKind.functionElement;
-            case 146 /* GetAccessor */: return ScriptElementKind.memberGetAccessorElement;
-            case 147 /* SetAccessor */: return ScriptElementKind.memberSetAccessorElement;
-            case 144 /* MethodDeclaration */:
-            case 143 /* MethodSignature */:
+            case 219 /* FunctionDeclaration */: return ScriptElementKind.functionElement;
+            case 148 /* GetAccessor */: return ScriptElementKind.memberGetAccessorElement;
+            case 149 /* SetAccessor */: return ScriptElementKind.memberSetAccessorElement;
+            case 146 /* MethodDeclaration */:
+            case 145 /* MethodSignature */:
                 return ScriptElementKind.memberFunctionElement;
-            case 142 /* PropertyDeclaration */:
-            case 141 /* PropertySignature */:
+            case 144 /* PropertyDeclaration */:
+            case 143 /* PropertySignature */:
                 return ScriptElementKind.memberVariableElement;
-            case 150 /* IndexSignature */: return ScriptElementKind.indexSignatureElement;
-            case 149 /* ConstructSignature */: return ScriptElementKind.constructSignatureElement;
-            case 148 /* CallSignature */: return ScriptElementKind.callSignatureElement;
-            case 145 /* Constructor */: return ScriptElementKind.constructorImplementationElement;
-            case 138 /* TypeParameter */: return ScriptElementKind.typeParameterElement;
-            case 250 /* EnumMember */: return ScriptElementKind.variableElement;
-            case 139 /* Parameter */: return (node.flags & 56 /* AccessibilityModifier */) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement;
-            case 224 /* ImportEqualsDeclaration */:
-            case 229 /* ImportSpecifier */:
-            case 226 /* ImportClause */:
-            case 233 /* ExportSpecifier */:
-            case 227 /* NamespaceImport */:
+            case 152 /* IndexSignature */: return ScriptElementKind.indexSignatureElement;
+            case 151 /* ConstructSignature */: return ScriptElementKind.constructSignatureElement;
+            case 150 /* CallSignature */: return ScriptElementKind.callSignatureElement;
+            case 147 /* Constructor */: return ScriptElementKind.constructorImplementationElement;
+            case 140 /* TypeParameter */: return ScriptElementKind.typeParameterElement;
+            case 254 /* EnumMember */: return ScriptElementKind.variableElement;
+            case 141 /* Parameter */: return (node.flags & 28 /* AccessibilityModifier */) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement;
+            case 228 /* ImportEqualsDeclaration */:
+            case 233 /* ImportSpecifier */:
+            case 230 /* ImportClause */:
+            case 237 /* ExportSpecifier */:
+            case 231 /* NamespaceImport */:
                 return ScriptElementKind.alias;
         }
         return ScriptElementKind.unknown;
@@ -47483,7 +50913,7 @@ var ts;
                 getCurrentDirectory: function () { return currentDirectory; },
                 fileExists: function (fileName) {
                     // stub missing host functionality
-                    ts.Debug.assert(!host.resolveModuleNames);
+                    ts.Debug.assert(!host.resolveModuleNames || !host.resolveTypeReferenceDirectives);
                     return hostCache.getOrCreateEntry(fileName) !== undefined;
                 },
                 readFile: function (fileName) {
@@ -47492,13 +50922,21 @@ var ts;
                     return entry && entry.scriptSnapshot.getText(0, entry.scriptSnapshot.getLength());
                 },
                 directoryExists: function (directoryName) {
-                    ts.Debug.assert(!host.resolveModuleNames);
+                    ts.Debug.assert(!host.resolveModuleNames || !host.resolveTypeReferenceDirectives);
                     return ts.directoryProbablyExists(directoryName, host);
                 }
             };
+            if (host.trace) {
+                compilerHost.trace = function (message) { return host.trace(message); };
+            }
             if (host.resolveModuleNames) {
                 compilerHost.resolveModuleNames = function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile); };
             }
+            if (host.resolveTypeReferenceDirectives) {
+                compilerHost.resolveTypeReferenceDirectives = function (typeReferenceDirectiveNames, containingFile) {
+                    return host.resolveTypeReferenceDirectives(typeReferenceDirectiveNames, containingFile);
+                };
+            }
             var newProgram = ts.createProgram(hostCache.getRootFileNames(), newSettings, compilerHost, program);
             // Release any files we have acquired in the old program but are
             // not part of the new program.
@@ -47529,7 +50967,7 @@ var ts;
                     return undefined;
                 }
                 // Check if the language version has changed since we last created a program; if they are the same,
-                // it is safe to reuse the souceFiles; if not, then the shape of the AST can change, and the oldSourceFile
+                // it is safe to reuse the sourceFiles; if not, then the shape of the AST can change, and the oldSourceFile
                 // can not be reused. we have to dump all syntax trees and create new ones.
                 if (!changesInCompilationSettingsAffectSyntax) {
                     // Check if the old program had this file already
@@ -47537,7 +50975,7 @@ var ts;
                     if (oldSourceFile) {
                         // We already had a source file for this file name.  Go to the registry to
                         // ensure that we get the right up to date version of it.  We need this to
-                        // address the following 'race'.  Specifically, say we have the following:
+                        // address the following race-condition.  Specifically, say we have the following:
                         //
                         //      LS1
                         //          \
@@ -47556,11 +50994,15 @@ var ts;
                         // it's source file any more, and instead defers to DocumentRegistry to get
                         // either version 1, version 2 (or some other version) depending on what the
                         // host says should be used.
-                        return documentRegistry.updateDocument(fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version);
+                        // We do not support the scenario where a host can modify a registered
+                        // file's script kind, i.e. in one project some file is treated as ".ts"
+                        // and in another as ".js"
+                        ts.Debug.assert(hostFileInformation.scriptKind === oldSourceFile.scriptKind, "Registered script kind (" + oldSourceFile.scriptKind + ") should match new script kind (" + hostFileInformation.scriptKind + ") for file: " + fileName);
+                        return documentRegistry.updateDocument(fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version, hostFileInformation.scriptKind);
                     }
                 }
                 // Could not find this file in the old program, create a new SourceFile for it.
-                return documentRegistry.acquireDocument(fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version);
+                return documentRegistry.acquireDocument(fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version, hostFileInformation.scriptKind);
             }
             function sourceFileUpToDate(sourceFile) {
                 if (!sourceFile) {
@@ -47610,7 +51052,7 @@ var ts;
             return program.getSyntacticDiagnostics(getValidSourceFile(fileName), cancellationToken);
         }
         /**
-         * getSemanticDiagnostiscs return array of Diagnostics. If '-d' is not enabled, only report semantic errors
+         * getSemanticDiagnostics return array of Diagnostics. If '-d' is not enabled, only report semantic errors
          * If '-d' enabled, report both semantic and emitter errors
          */
         function getSemanticDiagnostics(fileName) {
@@ -47699,9 +51141,9 @@ var ts;
                         isJsDocTagName = true;
                     }
                     switch (tag.kind) {
-                        case 272 /* JSDocTypeTag */:
-                        case 270 /* JSDocParameterTag */:
-                        case 271 /* JSDocReturnTag */:
+                        case 276 /* JSDocTypeTag */:
+                        case 274 /* JSDocParameterTag */:
+                        case 275 /* JSDocReturnTag */:
                             var tagWithExpression = tag;
                             if (tagWithExpression.typeExpression) {
                                 insideJsDocTagExpression = tagWithExpression.typeExpression.pos < position && position < tagWithExpression.typeExpression.end;
@@ -47746,13 +51188,13 @@ var ts;
                     log("Returning an empty list because completion was requested in an invalid position.");
                     return undefined;
                 }
-                var parent_10 = contextToken.parent, kind = contextToken.kind;
+                var parent_13 = contextToken.parent, kind = contextToken.kind;
                 if (kind === 21 /* DotToken */) {
-                    if (parent_10.kind === 169 /* PropertyAccessExpression */) {
+                    if (parent_13.kind === 171 /* PropertyAccessExpression */) {
                         node = contextToken.parent.expression;
                         isRightOfDot = true;
                     }
-                    else if (parent_10.kind === 136 /* QualifiedName */) {
+                    else if (parent_13.kind === 138 /* QualifiedName */) {
                         node = contextToken.parent.left;
                         isRightOfDot = true;
                     }
@@ -47767,7 +51209,7 @@ var ts;
                         isRightOfOpenTag = true;
                         location = contextToken;
                     }
-                    else if (kind === 39 /* SlashToken */ && contextToken.parent.kind === 240 /* JsxClosingElement */) {
+                    else if (kind === 39 /* SlashToken */ && contextToken.parent.kind === 244 /* JsxClosingElement */) {
                         isStartingCloseTag = true;
                         location = contextToken;
                     }
@@ -47783,7 +51225,7 @@ var ts;
             else if (isRightOfOpenTag) {
                 var tagSymbols = typeChecker.getJsxIntrinsicTagNames();
                 if (tryGetGlobalSymbols()) {
-                    symbols = tagSymbols.concat(symbols.filter(function (s) { return !!(s.flags & 107455 /* Value */); }));
+                    symbols = tagSymbols.concat(symbols.filter(function (s) { return !!(s.flags & (107455 /* Value */ | 8388608 /* Alias */)); }));
                 }
                 else {
                     symbols = tagSymbols;
@@ -47814,7 +51256,7 @@ var ts;
                 // Right of dot member completion list
                 isMemberCompletion = true;
                 isNewIdentifierLocation = false;
-                if (node.kind === 69 /* Identifier */ || node.kind === 136 /* QualifiedName */ || node.kind === 169 /* PropertyAccessExpression */) {
+                if (node.kind === 69 /* Identifier */ || node.kind === 138 /* QualifiedName */ || node.kind === 171 /* PropertyAccessExpression */) {
                     var symbol = typeChecker.getSymbolAtLocation(node);
                     // This is an alias, follow what it aliases
                     if (symbol && symbol.flags & 8388608 /* Alias */) {
@@ -47869,8 +51311,8 @@ var ts;
                     return tryGetImportOrExportClauseCompletionSymbols(namedImportsOrExports);
                 }
                 if (jsxContainer = tryGetContainingJsxElement(contextToken)) {
-                    var attrsType;
-                    if ((jsxContainer.kind === 237 /* JsxSelfClosingElement */) || (jsxContainer.kind === 238 /* JsxOpeningElement */)) {
+                    var attrsType = void 0;
+                    if ((jsxContainer.kind === 241 /* JsxSelfClosingElement */) || (jsxContainer.kind === 242 /* JsxOpeningElement */)) {
                         // Cursor is inside a JSX self-closing element or opening element
                         attrsType = typeChecker.getJsxElementAttributesType(jsxContainer);
                         if (attrsType) {
@@ -47942,15 +51384,15 @@ var ts;
                 return result;
             }
             function isInJsxText(contextToken) {
-                if (contextToken.kind === 239 /* JsxText */) {
+                if (contextToken.kind === 243 /* JsxText */) {
                     return true;
                 }
                 if (contextToken.kind === 27 /* GreaterThanToken */ && contextToken.parent) {
-                    if (contextToken.parent.kind === 238 /* JsxOpeningElement */) {
+                    if (contextToken.parent.kind === 242 /* JsxOpeningElement */) {
                         return true;
                     }
-                    if (contextToken.parent.kind === 240 /* JsxClosingElement */ || contextToken.parent.kind === 237 /* JsxSelfClosingElement */) {
-                        return contextToken.parent.parent && contextToken.parent.parent.kind === 236 /* JsxElement */;
+                    if (contextToken.parent.kind === 244 /* JsxClosingElement */ || contextToken.parent.kind === 241 /* JsxSelfClosingElement */) {
+                        return contextToken.parent.parent && contextToken.parent.parent.kind === 240 /* JsxElement */;
                     }
                 }
                 return false;
@@ -47960,40 +51402,40 @@ var ts;
                     var containingNodeKind = previousToken.parent.kind;
                     switch (previousToken.kind) {
                         case 24 /* CommaToken */:
-                            return containingNodeKind === 171 /* CallExpression */ // func( a, |
-                                || containingNodeKind === 145 /* Constructor */ // constructor( a, |   /* public, protected, private keywords are allowed here, so show completion */
-                                || containingNodeKind === 172 /* NewExpression */ // new C(a, |
-                                || containingNodeKind === 167 /* ArrayLiteralExpression */ // [a, |
-                                || containingNodeKind === 184 /* BinaryExpression */ // const x = (a, |
-                                || containingNodeKind === 153 /* FunctionType */; // var x: (s: string, list|
+                            return containingNodeKind === 173 /* CallExpression */ // func( a, |
+                                || containingNodeKind === 147 /* Constructor */ // constructor( a, |   /* public, protected, private keywords are allowed here, so show completion */
+                                || containingNodeKind === 174 /* NewExpression */ // new C(a, |
+                                || containingNodeKind === 169 /* ArrayLiteralExpression */ // [a, |
+                                || containingNodeKind === 186 /* BinaryExpression */ // const x = (a, |
+                                || containingNodeKind === 155 /* FunctionType */; // var x: (s: string, list|
                         case 17 /* OpenParenToken */:
-                            return containingNodeKind === 171 /* CallExpression */ // func( |
-                                || containingNodeKind === 145 /* Constructor */ // constructor( |
-                                || containingNodeKind === 172 /* NewExpression */ // new C(a|
-                                || containingNodeKind === 175 /* ParenthesizedExpression */ // const x = (a|
-                                || containingNodeKind === 161 /* ParenthesizedType */; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */
+                            return containingNodeKind === 173 /* CallExpression */ // func( |
+                                || containingNodeKind === 147 /* Constructor */ // constructor( |
+                                || containingNodeKind === 174 /* NewExpression */ // new C(a|
+                                || containingNodeKind === 177 /* ParenthesizedExpression */ // const x = (a|
+                                || containingNodeKind === 163 /* ParenthesizedType */; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */
                         case 19 /* OpenBracketToken */:
-                            return containingNodeKind === 167 /* ArrayLiteralExpression */ // [ |
-                                || containingNodeKind === 150 /* IndexSignature */ // [ | : string ]
-                                || containingNodeKind === 137 /* ComputedPropertyName */; // [ |    /* this can become an index signature */
+                            return containingNodeKind === 169 /* ArrayLiteralExpression */ // [ |
+                                || containingNodeKind === 152 /* IndexSignature */ // [ | : string ]
+                                || containingNodeKind === 139 /* ComputedPropertyName */; // [ |    /* this can become an index signature */
                         case 125 /* ModuleKeyword */: // module |
                         case 126 /* NamespaceKeyword */:
                             return true;
                         case 21 /* DotToken */:
-                            return containingNodeKind === 221 /* ModuleDeclaration */; // module A.|
+                            return containingNodeKind === 224 /* ModuleDeclaration */; // module A.|
                         case 15 /* OpenBraceToken */:
-                            return containingNodeKind === 217 /* ClassDeclaration */; // class A{ |
+                            return containingNodeKind === 220 /* ClassDeclaration */; // class A{ |
                         case 56 /* EqualsToken */:
-                            return containingNodeKind === 214 /* VariableDeclaration */ // const x = a|
-                                || containingNodeKind === 184 /* BinaryExpression */; // x = a|
+                            return containingNodeKind === 217 /* VariableDeclaration */ // const x = a|
+                                || containingNodeKind === 186 /* BinaryExpression */; // x = a|
                         case 12 /* TemplateHead */:
-                            return containingNodeKind === 186 /* TemplateExpression */; // `aa ${|
+                            return containingNodeKind === 188 /* TemplateExpression */; // `aa ${|
                         case 13 /* TemplateMiddle */:
-                            return containingNodeKind === 193 /* TemplateSpan */; // `aa ${10} dd ${|
+                            return containingNodeKind === 196 /* TemplateSpan */; // `aa ${10} dd ${|
                         case 112 /* PublicKeyword */:
                         case 110 /* PrivateKeyword */:
                         case 111 /* ProtectedKeyword */:
-                            return containingNodeKind === 142 /* PropertyDeclaration */; // class A{ public |
+                            return containingNodeKind === 144 /* PropertyDeclaration */; // class A{ public |
                     }
                     // Previous token may have been a keyword that was converted to an identifier.
                     switch (previousToken.getText()) {
@@ -48007,7 +51449,7 @@ var ts;
             }
             function isInStringOrRegularExpressionOrTemplateLiteral(contextToken) {
                 if (contextToken.kind === 9 /* StringLiteral */
-                    || contextToken.kind === 163 /* StringLiteralType */
+                    || contextToken.kind === 165 /* StringLiteralType */
                     || contextToken.kind === 10 /* RegularExpressionLiteral */
                     || ts.isTemplateLiteralKind(contextToken.kind)) {
                     var start_7 = contextToken.getStart();
@@ -48037,14 +51479,14 @@ var ts;
                 isMemberCompletion = true;
                 var typeForObject;
                 var existingMembers;
-                if (objectLikeContainer.kind === 168 /* ObjectLiteralExpression */) {
+                if (objectLikeContainer.kind === 170 /* ObjectLiteralExpression */) {
                     // We are completing on contextual types, but may also include properties
                     // other than those within the declared type.
                     isNewIdentifierLocation = true;
                     typeForObject = typeChecker.getContextualType(objectLikeContainer);
                     existingMembers = objectLikeContainer.properties;
                 }
-                else if (objectLikeContainer.kind === 164 /* ObjectBindingPattern */) {
+                else if (objectLikeContainer.kind === 166 /* ObjectBindingPattern */) {
                     // We are *only* completing on properties from the type being destructured.
                     isNewIdentifierLocation = false;
                     var rootDeclaration = ts.getRootDeclaration(objectLikeContainer.parent);
@@ -48052,7 +51494,18 @@ var ts;
                         // We don't want to complete using the type acquired by the shape
                         // of the binding pattern; we are only interested in types acquired
                         // through type declaration or inference.
-                        if (rootDeclaration.initializer || rootDeclaration.type) {
+                        // Also proceed if rootDeclaration is parameter and if its containing function expression\arrow function is contextually typed -
+                        // type of parameter will flow in from the contextual type of the function
+                        var canGetType = !!(rootDeclaration.initializer || rootDeclaration.type);
+                        if (!canGetType && rootDeclaration.kind === 141 /* Parameter */) {
+                            if (ts.isExpression(rootDeclaration.parent)) {
+                                canGetType = !!typeChecker.getContextualType(rootDeclaration.parent);
+                            }
+                            else if (rootDeclaration.parent.kind === 146 /* MethodDeclaration */ || rootDeclaration.parent.kind === 149 /* SetAccessor */) {
+                                canGetType = ts.isExpression(rootDeclaration.parent.parent) && !!typeChecker.getContextualType(rootDeclaration.parent.parent);
+                            }
+                        }
+                        if (canGetType) {
                             typeForObject = typeChecker.getTypeAtLocation(objectLikeContainer);
                             existingMembers = objectLikeContainer.elements;
                         }
@@ -48090,9 +51543,9 @@ var ts;
              * @returns true if 'symbols' was successfully populated; false otherwise.
              */
             function tryGetImportOrExportClauseCompletionSymbols(namedImportsOrExports) {
-                var declarationKind = namedImportsOrExports.kind === 228 /* NamedImports */ ?
-                    225 /* ImportDeclaration */ :
-                    231 /* ExportDeclaration */;
+                var declarationKind = namedImportsOrExports.kind === 232 /* NamedImports */ ?
+                    229 /* ImportDeclaration */ :
+                    235 /* ExportDeclaration */;
                 var importOrExportDeclaration = ts.getAncestor(namedImportsOrExports, declarationKind);
                 var moduleSpecifier = importOrExportDeclaration.moduleSpecifier;
                 if (!moduleSpecifier) {
@@ -48117,9 +51570,9 @@ var ts;
                     switch (contextToken.kind) {
                         case 15 /* OpenBraceToken */: // const x = { |
                         case 24 /* CommaToken */:
-                            var parent_11 = contextToken.parent;
-                            if (parent_11 && (parent_11.kind === 168 /* ObjectLiteralExpression */ || parent_11.kind === 164 /* ObjectBindingPattern */)) {
-                                return parent_11;
+                            var parent_14 = contextToken.parent;
+                            if (parent_14 && (parent_14.kind === 170 /* ObjectLiteralExpression */ || parent_14.kind === 166 /* ObjectBindingPattern */)) {
+                                return parent_14;
                             }
                             break;
                     }
@@ -48136,8 +51589,8 @@ var ts;
                         case 15 /* OpenBraceToken */: // import { |
                         case 24 /* CommaToken */:
                             switch (contextToken.parent.kind) {
-                                case 228 /* NamedImports */:
-                                case 232 /* NamedExports */:
+                                case 232 /* NamedImports */:
+                                case 236 /* NamedExports */:
                                     return contextToken.parent;
                             }
                     }
@@ -48146,37 +51599,37 @@ var ts;
             }
             function tryGetContainingJsxElement(contextToken) {
                 if (contextToken) {
-                    var parent_12 = contextToken.parent;
+                    var parent_15 = contextToken.parent;
                     switch (contextToken.kind) {
                         case 26 /* LessThanSlashToken */:
                         case 39 /* SlashToken */:
                         case 69 /* Identifier */:
-                        case 241 /* JsxAttribute */:
-                        case 242 /* JsxSpreadAttribute */:
-                            if (parent_12 && (parent_12.kind === 237 /* JsxSelfClosingElement */ || parent_12.kind === 238 /* JsxOpeningElement */)) {
-                                return parent_12;
+                        case 245 /* JsxAttribute */:
+                        case 246 /* JsxSpreadAttribute */:
+                            if (parent_15 && (parent_15.kind === 241 /* JsxSelfClosingElement */ || parent_15.kind === 242 /* JsxOpeningElement */)) {
+                                return parent_15;
                             }
-                            else if (parent_12.kind === 241 /* JsxAttribute */) {
-                                return parent_12.parent;
+                            else if (parent_15.kind === 245 /* JsxAttribute */) {
+                                return parent_15.parent;
                             }
                             break;
                         // The context token is the closing } or " of an attribute, which means
                         // its parent is a JsxExpression, whose parent is a JsxAttribute,
                         // whose parent is a JsxOpeningLikeElement
                         case 9 /* StringLiteral */:
-                            if (parent_12 && ((parent_12.kind === 241 /* JsxAttribute */) || (parent_12.kind === 242 /* JsxSpreadAttribute */))) {
-                                return parent_12.parent;
+                            if (parent_15 && ((parent_15.kind === 245 /* JsxAttribute */) || (parent_15.kind === 246 /* JsxSpreadAttribute */))) {
+                                return parent_15.parent;
                             }
                             break;
                         case 16 /* CloseBraceToken */:
-                            if (parent_12 &&
-                                parent_12.kind === 243 /* JsxExpression */ &&
-                                parent_12.parent &&
-                                (parent_12.parent.kind === 241 /* JsxAttribute */)) {
-                                return parent_12.parent.parent;
+                            if (parent_15 &&
+                                parent_15.kind === 247 /* JsxExpression */ &&
+                                parent_15.parent &&
+                                (parent_15.parent.kind === 245 /* JsxAttribute */)) {
+                                return parent_15.parent.parent;
                             }
-                            if (parent_12 && parent_12.kind === 242 /* JsxSpreadAttribute */) {
-                                return parent_12.parent;
+                            if (parent_15 && parent_15.kind === 246 /* JsxSpreadAttribute */) {
+                                return parent_15.parent;
                             }
                             break;
                     }
@@ -48185,16 +51638,16 @@ var ts;
             }
             function isFunction(kind) {
                 switch (kind) {
-                    case 176 /* FunctionExpression */:
-                    case 177 /* ArrowFunction */:
-                    case 216 /* FunctionDeclaration */:
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
-                    case 148 /* CallSignature */:
-                    case 149 /* ConstructSignature */:
-                    case 150 /* IndexSignature */:
+                    case 178 /* FunctionExpression */:
+                    case 179 /* ArrowFunction */:
+                    case 219 /* FunctionDeclaration */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
+                    case 150 /* CallSignature */:
+                    case 151 /* ConstructSignature */:
+                    case 152 /* IndexSignature */:
                         return true;
                 }
                 return false;
@@ -48206,66 +51659,66 @@ var ts;
                 var containingNodeKind = contextToken.parent.kind;
                 switch (contextToken.kind) {
                     case 24 /* CommaToken */:
-                        return containingNodeKind === 214 /* VariableDeclaration */ ||
-                            containingNodeKind === 215 /* VariableDeclarationList */ ||
-                            containingNodeKind === 196 /* VariableStatement */ ||
-                            containingNodeKind === 220 /* EnumDeclaration */ ||
+                        return containingNodeKind === 217 /* VariableDeclaration */ ||
+                            containingNodeKind === 218 /* VariableDeclarationList */ ||
+                            containingNodeKind === 199 /* VariableStatement */ ||
+                            containingNodeKind === 223 /* EnumDeclaration */ ||
                             isFunction(containingNodeKind) ||
-                            containingNodeKind === 217 /* ClassDeclaration */ ||
-                            containingNodeKind === 189 /* ClassExpression */ ||
-                            containingNodeKind === 218 /* InterfaceDeclaration */ ||
-                            containingNodeKind === 165 /* ArrayBindingPattern */ ||
-                            containingNodeKind === 219 /* TypeAliasDeclaration */; // type Map, K, |
+                            containingNodeKind === 220 /* ClassDeclaration */ ||
+                            containingNodeKind === 191 /* ClassExpression */ ||
+                            containingNodeKind === 221 /* InterfaceDeclaration */ ||
+                            containingNodeKind === 167 /* ArrayBindingPattern */ ||
+                            containingNodeKind === 222 /* TypeAliasDeclaration */; // type Map, K, |
                     case 21 /* DotToken */:
-                        return containingNodeKind === 165 /* ArrayBindingPattern */; // var [.|
+                        return containingNodeKind === 167 /* ArrayBindingPattern */; // var [.|
                     case 54 /* ColonToken */:
-                        return containingNodeKind === 166 /* BindingElement */; // var {x :html|
+                        return containingNodeKind === 168 /* BindingElement */; // var {x :html|
                     case 19 /* OpenBracketToken */:
-                        return containingNodeKind === 165 /* ArrayBindingPattern */; // var [x|
+                        return containingNodeKind === 167 /* ArrayBindingPattern */; // var [x|
                     case 17 /* OpenParenToken */:
-                        return containingNodeKind === 247 /* CatchClause */ ||
+                        return containingNodeKind === 251 /* CatchClause */ ||
                             isFunction(containingNodeKind);
                     case 15 /* OpenBraceToken */:
-                        return containingNodeKind === 220 /* EnumDeclaration */ ||
-                            containingNodeKind === 218 /* InterfaceDeclaration */ ||
-                            containingNodeKind === 156 /* TypeLiteral */; // const x : { |
+                        return containingNodeKind === 223 /* EnumDeclaration */ ||
+                            containingNodeKind === 221 /* InterfaceDeclaration */ ||
+                            containingNodeKind === 158 /* TypeLiteral */; // const x : { |
                     case 23 /* SemicolonToken */:
-                        return containingNodeKind === 141 /* PropertySignature */ &&
+                        return containingNodeKind === 143 /* PropertySignature */ &&
                             contextToken.parent && contextToken.parent.parent &&
-                            (contextToken.parent.parent.kind === 218 /* InterfaceDeclaration */ ||
-                                contextToken.parent.parent.kind === 156 /* TypeLiteral */); // const x : { a; |
+                            (contextToken.parent.parent.kind === 221 /* InterfaceDeclaration */ ||
+                                contextToken.parent.parent.kind === 158 /* TypeLiteral */); // const x : { a; |
                     case 25 /* LessThanToken */:
-                        return containingNodeKind === 217 /* ClassDeclaration */ ||
-                            containingNodeKind === 189 /* ClassExpression */ ||
-                            containingNodeKind === 218 /* InterfaceDeclaration */ ||
-                            containingNodeKind === 219 /* TypeAliasDeclaration */ ||
+                        return containingNodeKind === 220 /* ClassDeclaration */ ||
+                            containingNodeKind === 191 /* ClassExpression */ ||
+                            containingNodeKind === 221 /* InterfaceDeclaration */ ||
+                            containingNodeKind === 222 /* TypeAliasDeclaration */ ||
                             isFunction(containingNodeKind);
                     case 113 /* StaticKeyword */:
-                        return containingNodeKind === 142 /* PropertyDeclaration */;
+                        return containingNodeKind === 144 /* PropertyDeclaration */;
                     case 22 /* DotDotDotToken */:
-                        return containingNodeKind === 139 /* Parameter */ ||
+                        return containingNodeKind === 141 /* Parameter */ ||
                             (contextToken.parent && contextToken.parent.parent &&
-                                contextToken.parent.parent.kind === 165 /* ArrayBindingPattern */); // var [...z|
+                                contextToken.parent.parent.kind === 167 /* ArrayBindingPattern */); // var [...z|
                     case 112 /* PublicKeyword */:
                     case 110 /* PrivateKeyword */:
                     case 111 /* ProtectedKeyword */:
-                        return containingNodeKind === 139 /* Parameter */;
+                        return containingNodeKind === 141 /* Parameter */;
                     case 116 /* AsKeyword */:
-                        return containingNodeKind === 229 /* ImportSpecifier */ ||
-                            containingNodeKind === 233 /* ExportSpecifier */ ||
-                            containingNodeKind === 227 /* NamespaceImport */;
+                        return containingNodeKind === 233 /* ImportSpecifier */ ||
+                            containingNodeKind === 237 /* ExportSpecifier */ ||
+                            containingNodeKind === 231 /* NamespaceImport */;
                     case 73 /* ClassKeyword */:
                     case 81 /* EnumKeyword */:
                     case 107 /* InterfaceKeyword */:
                     case 87 /* FunctionKeyword */:
                     case 102 /* VarKeyword */:
                     case 123 /* GetKeyword */:
-                    case 129 /* SetKeyword */:
+                    case 130 /* SetKeyword */:
                     case 89 /* ImportKeyword */:
                     case 108 /* LetKeyword */:
                     case 74 /* ConstKeyword */:
                     case 114 /* YieldKeyword */:
-                    case 132 /* TypeKeyword */:
+                    case 133 /* TypeKeyword */:
                         return true;
                 }
                 // Previous token may have been a keyword that was converted to an identifier.
@@ -48306,20 +51759,20 @@ var ts;
              *          do not occur at the current position and have not otherwise been typed.
              */
             function filterNamedImportOrExportCompletionItems(exportsOfModule, namedImportsOrExports) {
-                var exisingImportsOrExports = {};
+                var existingImportsOrExports = {};
                 for (var _i = 0, namedImportsOrExports_1 = namedImportsOrExports; _i < namedImportsOrExports_1.length; _i++) {
                     var element = namedImportsOrExports_1[_i];
                     // If this is the current item we are editing right now, do not filter it out
                     if (element.getStart() <= position && position <= element.getEnd()) {
                         continue;
                     }
-                    var name_34 = element.propertyName || element.name;
-                    exisingImportsOrExports[name_34.text] = true;
+                    var name_39 = element.propertyName || element.name;
+                    existingImportsOrExports[name_39.text] = true;
                 }
-                if (ts.isEmpty(exisingImportsOrExports)) {
+                if (ts.isEmpty(existingImportsOrExports)) {
                     return exportsOfModule;
                 }
-                return ts.filter(exportsOfModule, function (e) { return !ts.lookUp(exisingImportsOrExports, e.name); });
+                return ts.filter(exportsOfModule, function (e) { return !ts.lookUp(existingImportsOrExports, e.name); });
             }
             /**
              * Filters out completion suggestions for named imports or exports.
@@ -48335,10 +51788,10 @@ var ts;
                 for (var _i = 0, existingMembers_1 = existingMembers; _i < existingMembers_1.length; _i++) {
                     var m = existingMembers_1[_i];
                     // Ignore omitted expressions for missing members
-                    if (m.kind !== 248 /* PropertyAssignment */ &&
-                        m.kind !== 249 /* ShorthandPropertyAssignment */ &&
-                        m.kind !== 166 /* BindingElement */ &&
-                        m.kind !== 144 /* MethodDeclaration */) {
+                    if (m.kind !== 252 /* PropertyAssignment */ &&
+                        m.kind !== 253 /* ShorthandPropertyAssignment */ &&
+                        m.kind !== 168 /* BindingElement */ &&
+                        m.kind !== 146 /* MethodDeclaration */) {
                         continue;
                     }
                     // If this is the current item we are editing right now, do not filter it out
@@ -48346,7 +51799,7 @@ var ts;
                         continue;
                     }
                     var existingName = void 0;
-                    if (m.kind === 166 /* BindingElement */ && m.propertyName) {
+                    if (m.kind === 168 /* BindingElement */ && m.propertyName) {
                         // include only identifiers in completion list
                         if (m.propertyName.kind === 69 /* Identifier */) {
                             existingName = m.propertyName.text;
@@ -48376,7 +51829,7 @@ var ts;
                     if (attr.getStart() <= position && position <= attr.getEnd()) {
                         continue;
                     }
-                    if (attr.kind === 241 /* JsxAttribute */) {
+                    if (attr.kind === 245 /* JsxAttribute */) {
                         seenNames[attr.name.text] = true;
                     }
                 }
@@ -48389,21 +51842,21 @@ var ts;
             if (!completionData) {
                 return undefined;
             }
-            var symbols = completionData.symbols, isMemberCompletion = completionData.isMemberCompletion, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, isRightOfDot = completionData.isRightOfDot, isJsDocTagName = completionData.isJsDocTagName;
+            var symbols = completionData.symbols, isMemberCompletion = completionData.isMemberCompletion, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, isJsDocTagName = completionData.isJsDocTagName;
             if (isJsDocTagName) {
                 // If the current position is a jsDoc tag name, only tag names should be provided for completion
                 return { isMemberCompletion: false, isNewIdentifierLocation: false, entries: getAllJsDocCompletionEntries() };
             }
             var sourceFile = getValidSourceFile(fileName);
             var entries = [];
-            if (isRightOfDot && ts.isSourceFileJavaScript(sourceFile)) {
+            if (ts.isSourceFileJavaScript(sourceFile)) {
                 var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries);
-                ts.addRange(entries, getJavaScriptCompletionEntries(sourceFile, uniqueNames));
+                ts.addRange(entries, getJavaScriptCompletionEntries(sourceFile, location.pos, uniqueNames));
             }
             else {
                 if (!symbols || symbols.length === 0) {
                     if (sourceFile.languageVariant === 1 /* JSX */ &&
-                        location.parent && location.parent.kind === 240 /* JsxClosingElement */) {
+                        location.parent && location.parent.kind === 244 /* JsxClosingElement */) {
                         // In the TypeScript JSX element, if such element is not defined. When users query for completion at closing tag,
                         // instead of simply giving unknown value, the completion will return the tag-name of an associated opening-element.
                         // For example:
@@ -48427,14 +51880,18 @@ var ts;
                 ts.addRange(entries, keywordCompletions);
             }
             return { isMemberCompletion: isMemberCompletion, isNewIdentifierLocation: isNewIdentifierLocation, entries: entries };
-            function getJavaScriptCompletionEntries(sourceFile, uniqueNames) {
+            function getJavaScriptCompletionEntries(sourceFile, position, uniqueNames) {
                 var entries = [];
                 var target = program.getCompilerOptions().target;
                 var nameTable = getNameTable(sourceFile);
-                for (var name_35 in nameTable) {
-                    if (!uniqueNames[name_35]) {
-                        uniqueNames[name_35] = name_35;
-                        var displayName = getCompletionEntryDisplayName(name_35, target, /*performCharacterChecks*/ true);
+                for (var name_40 in nameTable) {
+                    // Skip identifiers produced only from the current location
+                    if (nameTable[name_40] === position) {
+                        continue;
+                    }
+                    if (!uniqueNames[name_40]) {
+                        uniqueNames[name_40] = name_40;
+                        var displayName = getCompletionEntryDisplayName(name_40, target, /*performCharacterChecks*/ true);
                         if (displayName) {
                             var entry = {
                                 name: displayName,
@@ -48484,8 +51941,8 @@ var ts;
                 var start = new Date().getTime();
                 var uniqueNames = {};
                 if (symbols) {
-                    for (var _i = 0, symbols_3 = symbols; _i < symbols_3.length; _i++) {
-                        var symbol = symbols_3[_i];
+                    for (var _i = 0, symbols_4 = symbols; _i < symbols_4.length; _i++) {
+                        var symbol = symbols_4[_i];
                         var entry = createCompletionEntry(symbol, location);
                         if (entry) {
                             var id = ts.escapeIdentifier(entry.name);
@@ -48507,11 +51964,11 @@ var ts;
             if (completionData) {
                 var symbols = completionData.symbols, location_2 = completionData.location;
                 // Find the symbol with the matching entry name.
-                var target = program.getCompilerOptions().target;
+                var target_2 = program.getCompilerOptions().target;
                 // We don't need to perform character checks here because we're only comparing the
                 // name against 'entryName' (which is known to be good), not building a new
                 // completion entry.
-                var symbol = ts.forEach(symbols, function (s) { return getCompletionEntryDisplayNameForSymbol(s, target, /*performCharacterChecks*/ false, location_2) === entryName ? s : undefined; });
+                var symbol = ts.forEach(symbols, function (s) { return getCompletionEntryDisplayNameForSymbol(s, target_2, /*performCharacterChecks*/ false, location_2) === entryName ? s : undefined; });
                 if (symbol) {
                     var _a = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, getValidSourceFile(fileName), location_2, location_2, 7 /* All */), displayParts = _a.displayParts, documentation = _a.documentation, symbolKind = _a.symbolKind;
                     return {
@@ -48540,7 +51997,7 @@ var ts;
         function getSymbolKind(symbol, location) {
             var flags = symbol.getFlags();
             if (flags & 32 /* Class */)
-                return ts.getDeclarationOfKind(symbol, 189 /* ClassExpression */) ?
+                return ts.getDeclarationOfKind(symbol, 191 /* ClassExpression */) ?
                     ScriptElementKind.localClassElement : ScriptElementKind.classElement;
             if (flags & 384 /* Enum */)
                 return ScriptElementKind.enumElement;
@@ -48571,6 +52028,9 @@ var ts;
             if (typeChecker.isArgumentsSymbol(symbol)) {
                 return ScriptElementKind.localVariableElement;
             }
+            if (location.kind === 97 /* ThisKeyword */ && ts.isExpression(location)) {
+                return ScriptElementKind.parameterElement;
+            }
             if (flags & 3 /* Variable */) {
                 if (ts.isFirstDeclarationOfSymbolParameter(symbol)) {
                     return ScriptElementKind.parameterElement;
@@ -48632,6 +52092,7 @@ var ts;
             var symbolFlags = symbol.flags;
             var symbolKind = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, symbolFlags, location);
             var hasAddedSymbolInfo;
+            var isThisExpression = location.kind === 97 /* ThisKeyword */ && ts.isExpression(location);
             var type;
             // Class at constructor site need to be shown as constructor apart from property,method, vars
             if (symbolKind !== ScriptElementKind.unknown || symbolFlags & 32 /* Class */ || symbolFlags & 8388608 /* Alias */) {
@@ -48639,10 +52100,10 @@ var ts;
                 if (symbolKind === ScriptElementKind.memberGetAccessorElement || symbolKind === ScriptElementKind.memberSetAccessorElement) {
                     symbolKind = ScriptElementKind.memberVariableElement;
                 }
-                var signature;
-                type = typeChecker.getTypeOfSymbolAtLocation(symbol, location);
+                var signature = void 0;
+                type = isThisExpression ? typeChecker.getTypeAtLocation(location) : typeChecker.getTypeOfSymbolAtLocation(symbol, location);
                 if (type) {
-                    if (location.parent && location.parent.kind === 169 /* PropertyAccessExpression */) {
+                    if (location.parent && location.parent.kind === 171 /* PropertyAccessExpression */) {
                         var right = location.parent.name;
                         // Either the location is on the right of a property access, or on the left and the right is missing
                         if (right === location || (right && right.getFullWidth() === 0)) {
@@ -48650,8 +52111,8 @@ var ts;
                         }
                     }
                     // try get the call/construct signature from the type if it matches
-                    var callExpression;
-                    if (location.kind === 171 /* CallExpression */ || location.kind === 172 /* NewExpression */) {
+                    var callExpression = void 0;
+                    if (location.kind === 173 /* CallExpression */ || location.kind === 174 /* NewExpression */) {
                         callExpression = location;
                     }
                     else if (isCallExpressionTarget(location) || isNewExpressionTarget(location)) {
@@ -48664,7 +52125,7 @@ var ts;
                             // Use the first candidate:
                             signature = candidateSignatures[0];
                         }
-                        var useConstructSignatures = callExpression.kind === 172 /* NewExpression */ || callExpression.expression.kind === 95 /* SuperKeyword */;
+                        var useConstructSignatures = callExpression.kind === 174 /* NewExpression */ || callExpression.expression.kind === 95 /* SuperKeyword */;
                         var allSignatures = useConstructSignatures ? type.getConstructSignatures() : type.getCallSignatures();
                         if (!ts.contains(allSignatures, signature.target) && !ts.contains(allSignatures, signature)) {
                             // Get the first signature if there is one -- allSignatures may contain
@@ -48717,24 +52178,24 @@ var ts;
                         }
                     }
                     else if ((isNameOfFunctionDeclaration(location) && !(symbol.flags & 98304 /* Accessor */)) ||
-                        (location.kind === 121 /* ConstructorKeyword */ && location.parent.kind === 145 /* Constructor */)) {
+                        (location.kind === 121 /* ConstructorKeyword */ && location.parent.kind === 147 /* Constructor */)) {
                         // get the signature from the declaration and write it
                         var functionDeclaration = location.parent;
-                        var allSignatures = functionDeclaration.kind === 145 /* Constructor */ ? type.getConstructSignatures() : type.getCallSignatures();
+                        var allSignatures = functionDeclaration.kind === 147 /* Constructor */ ? type.getConstructSignatures() : type.getCallSignatures();
                         if (!typeChecker.isImplementationOfOverload(functionDeclaration)) {
                             signature = typeChecker.getSignatureFromDeclaration(functionDeclaration);
                         }
                         else {
                             signature = allSignatures[0];
                         }
-                        if (functionDeclaration.kind === 145 /* Constructor */) {
+                        if (functionDeclaration.kind === 147 /* Constructor */) {
                             // show (constructor) Type(...) signature
                             symbolKind = ScriptElementKind.constructorImplementationElement;
                             addPrefixForAnyFunctionOrVar(type.symbol, symbolKind);
                         }
                         else {
                             // (function/method) symbol(..signature)
-                            addPrefixForAnyFunctionOrVar(functionDeclaration.kind === 148 /* CallSignature */ &&
+                            addPrefixForAnyFunctionOrVar(functionDeclaration.kind === 150 /* CallSignature */ &&
                                 !(type.symbol.flags & 2048 /* TypeLiteral */ || type.symbol.flags & 4096 /* ObjectLiteral */) ? type.symbol : symbol, symbolKind);
                         }
                         addSignatureDisplayParts(signature, allSignatures);
@@ -48742,8 +52203,8 @@ var ts;
                     }
                 }
             }
-            if (symbolFlags & 32 /* Class */ && !hasAddedSymbolInfo) {
-                if (ts.getDeclarationOfKind(symbol, 189 /* ClassExpression */)) {
+            if (symbolFlags & 32 /* Class */ && !hasAddedSymbolInfo && !isThisExpression) {
+                if (ts.getDeclarationOfKind(symbol, 191 /* ClassExpression */)) {
                     // Special case for class expressions because we would like to indicate that
                     // the class name is local to the class body (similar to function expression)
                     //      (local class) class <className>
@@ -48766,7 +52227,7 @@ var ts;
             }
             if (symbolFlags & 524288 /* TypeAlias */) {
                 addNewLineIfDisplayPartsExist();
-                displayParts.push(ts.keywordPart(132 /* TypeKeyword */));
+                displayParts.push(ts.keywordPart(133 /* TypeKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 writeTypeParametersOfSymbol(symbol, sourceFile);
@@ -48787,7 +52248,7 @@ var ts;
             }
             if (symbolFlags & 1536 /* Module */) {
                 addNewLineIfDisplayPartsExist();
-                var declaration = ts.getDeclarationOfKind(symbol, 221 /* ModuleDeclaration */);
+                var declaration = ts.getDeclarationOfKind(symbol, 224 /* ModuleDeclaration */);
                 var isNamespace = declaration && declaration.name && declaration.name.kind === 69 /* Identifier */;
                 displayParts.push(ts.keywordPart(isNamespace ? 126 /* NamespaceKeyword */ : 125 /* ModuleKeyword */));
                 displayParts.push(ts.spacePart());
@@ -48810,17 +52271,17 @@ var ts;
                 }
                 else {
                     // Method/function type parameter
-                    var declaration = ts.getDeclarationOfKind(symbol, 138 /* TypeParameter */);
+                    var declaration = ts.getDeclarationOfKind(symbol, 140 /* TypeParameter */);
                     ts.Debug.assert(declaration !== undefined);
                     declaration = declaration.parent;
                     if (declaration) {
                         if (ts.isFunctionLikeKind(declaration.kind)) {
                             var signature = typeChecker.getSignatureFromDeclaration(declaration);
-                            if (declaration.kind === 149 /* ConstructSignature */) {
+                            if (declaration.kind === 151 /* ConstructSignature */) {
                                 displayParts.push(ts.keywordPart(92 /* NewKeyword */));
                                 displayParts.push(ts.spacePart());
                             }
-                            else if (declaration.kind !== 148 /* CallSignature */ && declaration.name) {
+                            else if (declaration.kind !== 150 /* CallSignature */ && declaration.name) {
                                 addFullSymbolName(declaration.symbol);
                             }
                             ts.addRange(displayParts, ts.signatureToDisplayParts(typeChecker, signature, sourceFile, 32 /* WriteTypeArgumentsOfSignature */));
@@ -48829,7 +52290,7 @@ var ts;
                             // Type alias type parameter
                             // For example
                             //      type list<T> = T[];  // Both T will go through same code path
-                            displayParts.push(ts.keywordPart(132 /* TypeKeyword */));
+                            displayParts.push(ts.keywordPart(133 /* TypeKeyword */));
                             displayParts.push(ts.spacePart());
                             addFullSymbolName(declaration.symbol);
                             writeTypeParametersOfSymbol(declaration.symbol, sourceFile);
@@ -48840,7 +52301,7 @@ var ts;
             if (symbolFlags & 8 /* EnumMember */) {
                 addPrefixForAnyFunctionOrVar(symbol, "enum member");
                 var declaration = symbol.declarations[0];
-                if (declaration.kind === 250 /* EnumMember */) {
+                if (declaration.kind === 254 /* EnumMember */) {
                     var constantValue = typeChecker.getConstantValue(declaration);
                     if (constantValue !== undefined) {
                         displayParts.push(ts.spacePart());
@@ -48856,13 +52317,13 @@ var ts;
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 ts.forEach(symbol.declarations, function (declaration) {
-                    if (declaration.kind === 224 /* ImportEqualsDeclaration */) {
+                    if (declaration.kind === 228 /* ImportEqualsDeclaration */) {
                         var importEqualsDeclaration = declaration;
                         if (ts.isExternalModuleImportEqualsDeclaration(importEqualsDeclaration)) {
                             displayParts.push(ts.spacePart());
                             displayParts.push(ts.operatorPart(56 /* EqualsToken */));
                             displayParts.push(ts.spacePart());
-                            displayParts.push(ts.keywordPart(127 /* RequireKeyword */));
+                            displayParts.push(ts.keywordPart(128 /* RequireKeyword */));
                             displayParts.push(ts.punctuationPart(17 /* OpenParenToken */));
                             displayParts.push(ts.displayPart(ts.getTextOfNode(ts.getExternalModuleImportEqualsDeclarationExpression(importEqualsDeclaration)), SymbolDisplayPartKind.stringLiteral));
                             displayParts.push(ts.punctuationPart(18 /* CloseParenToken */));
@@ -48883,11 +52344,18 @@ var ts;
             if (!hasAddedSymbolInfo) {
                 if (symbolKind !== ScriptElementKind.unknown) {
                     if (type) {
-                        addPrefixForAnyFunctionOrVar(symbol, symbolKind);
+                        if (isThisExpression) {
+                            addNewLineIfDisplayPartsExist();
+                            displayParts.push(ts.keywordPart(97 /* ThisKeyword */));
+                        }
+                        else {
+                            addPrefixForAnyFunctionOrVar(symbol, symbolKind);
+                        }
                         // For properties, variables and local vars: show the type
                         if (symbolKind === ScriptElementKind.memberVariableElement ||
                             symbolFlags & 3 /* Variable */ ||
-                            symbolKind === ScriptElementKind.localVariableElement) {
+                            symbolKind === ScriptElementKind.localVariableElement ||
+                            isThisExpression) {
                             displayParts.push(ts.punctuationPart(54 /* ColonToken */));
                             displayParts.push(ts.spacePart());
                             // If the type is type parameter, format it specially
@@ -48989,10 +52457,10 @@ var ts;
                 // Try getting just type at this position and show
                 switch (node.kind) {
                     case 69 /* Identifier */:
-                    case 169 /* PropertyAccessExpression */:
-                    case 136 /* QualifiedName */:
+                    case 171 /* PropertyAccessExpression */:
+                    case 138 /* QualifiedName */:
                     case 97 /* ThisKeyword */:
-                    case 162 /* ThisType */:
+                    case 164 /* ThisType */:
                     case 95 /* SuperKeyword */:
                         // For the identifiers/this/super etc get the type at position
                         var type = typeChecker.getTypeAtLocation(node);
@@ -49071,8 +52539,8 @@ var ts;
                 var declarations = [];
                 var definition;
                 ts.forEach(signatureDeclarations, function (d) {
-                    if ((selectConstructors && d.kind === 145 /* Constructor */) ||
-                        (!selectConstructors && (d.kind === 216 /* FunctionDeclaration */ || d.kind === 144 /* MethodDeclaration */ || d.kind === 143 /* MethodSignature */))) {
+                    if ((selectConstructors && d.kind === 147 /* Constructor */) ||
+                        (!selectConstructors && (d.kind === 219 /* FunctionDeclaration */ || d.kind === 146 /* MethodDeclaration */ || d.kind === 145 /* MethodSignature */))) {
                         declarations.push(d);
                         if (d.body)
                             definition = d;
@@ -49089,6 +52557,25 @@ var ts;
                 return false;
             }
         }
+        function findReferenceInPosition(refs, pos) {
+            for (var _i = 0, refs_1 = refs; _i < refs_1.length; _i++) {
+                var ref = refs_1[_i];
+                if (ref.pos <= pos && pos < ref.end) {
+                    return ref;
+                }
+            }
+            return undefined;
+        }
+        function getDefinitionInfoForFileReference(name, targetFileName) {
+            return {
+                fileName: targetFileName,
+                textSpan: ts.createTextSpanFromBounds(0, 0),
+                kind: ScriptElementKind.scriptElement,
+                name: name,
+                containerName: undefined,
+                containerKind: undefined
+            };
+        }
         /// Goto definition
         function getDefinitionAtPosition(fileName, position) {
             synchronizeHostData();
@@ -49104,18 +52591,20 @@ var ts;
                 return label ? [createDefinitionInfo(label, ScriptElementKind.label, labelName, /*containerName*/ undefined)] : undefined;
             }
             /// Triple slash reference comments
-            var comment = ts.forEach(sourceFile.referencedFiles, function (r) { return (r.pos <= position && position < r.end) ? r : undefined; });
+            var comment = findReferenceInPosition(sourceFile.referencedFiles, position);
             if (comment) {
                 var referenceFile = ts.tryResolveScriptReference(program, sourceFile, comment);
                 if (referenceFile) {
-                    return [{
-                            fileName: referenceFile.fileName,
-                            textSpan: ts.createTextSpanFromBounds(0, 0),
-                            kind: ScriptElementKind.scriptElement,
-                            name: comment.fileName,
-                            containerName: undefined,
-                            containerKind: undefined
-                        }];
+                    return [getDefinitionInfoForFileReference(comment.fileName, referenceFile.fileName)];
+                }
+                return undefined;
+            }
+            // Type reference directives
+            var typeReferenceDirective = findReferenceInPosition(sourceFile.typeReferenceDirectives, position);
+            if (typeReferenceDirective) {
+                var referenceFile = ts.lookUp(program.resolvedTypeReferenceDirectives, typeReferenceDirective.fileName);
+                if (referenceFile && referenceFile.resolvedFileName) {
+                    return [getDefinitionInfoForFileReference(typeReferenceDirective.fileName, referenceFile.resolvedFileName)];
                 }
                 return undefined;
             }
@@ -49132,7 +52621,14 @@ var ts;
             // to jump to the implementation directly.
             if (symbol.flags & 8388608 /* Alias */) {
                 var declaration = symbol.declarations[0];
-                if (node.kind === 69 /* Identifier */ && node.parent === declaration) {
+                // Go to the original declaration for cases:
+                //
+                //   (1) when the aliased symbol was declared in the location(parent).
+                //   (2) when the aliased symbol is originating from a named import.
+                //
+                if (node.kind === 69 /* Identifier */ &&
+                    (node.parent === declaration ||
+                        (declaration.kind === 233 /* ImportSpecifier */ && declaration.parent && declaration.parent.kind === 232 /* NamedImports */))) {
                     symbol = typeChecker.getAliasedSymbol(symbol);
                 }
             }
@@ -49141,16 +52637,16 @@ var ts;
             // go to the declaration of the property name (in this case stay at the same position). However, if go-to-definition
             // is performed at the location of property access, we would like to go to definition of the property in the short-hand
             // assignment. This case and others are handled by the following code.
-            if (node.parent.kind === 249 /* ShorthandPropertyAssignment */) {
+            if (node.parent.kind === 253 /* ShorthandPropertyAssignment */) {
                 var shorthandSymbol = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
                 if (!shorthandSymbol) {
                     return [];
                 }
                 var shorthandDeclarations = shorthandSymbol.getDeclarations();
-                var shorthandSymbolKind = getSymbolKind(shorthandSymbol, node);
-                var shorthandSymbolName = typeChecker.symbolToString(shorthandSymbol);
-                var shorthandContainerName = typeChecker.symbolToString(symbol.parent, node);
-                return ts.map(shorthandDeclarations, function (declaration) { return createDefinitionInfo(declaration, shorthandSymbolKind, shorthandSymbolName, shorthandContainerName); });
+                var shorthandSymbolKind_1 = getSymbolKind(shorthandSymbol, node);
+                var shorthandSymbolName_1 = typeChecker.symbolToString(shorthandSymbol);
+                var shorthandContainerName_1 = typeChecker.symbolToString(symbol.parent, node);
+                return ts.map(shorthandDeclarations, function (declaration) { return createDefinitionInfo(declaration, shorthandSymbolKind_1, shorthandSymbolName_1, shorthandContainerName_1); });
             }
             return getDefinitionFromSymbol(symbol, node);
         }
@@ -49172,13 +52668,13 @@ var ts;
                 return undefined;
             }
             if (type.flags & 16384 /* Union */) {
-                var result = [];
+                var result_3 = [];
                 ts.forEach(type.types, function (t) {
                     if (t.symbol) {
-                        ts.addRange(/*to*/ result, /*from*/ getDefinitionFromSymbol(t.symbol, node));
+                        ts.addRange(/*to*/ result_3, /*from*/ getDefinitionFromSymbol(t.symbol, node));
                     }
                 });
-                return result;
+                return result_3;
             }
             if (!type.symbol) {
                 return undefined;
@@ -49188,10 +52684,10 @@ var ts;
         function getOccurrencesAtPosition(fileName, position) {
             var results = getOccurrencesAtPositionCore(fileName, position);
             if (results) {
-                var sourceFile = getCanonicalFileName(ts.normalizeSlashes(fileName));
+                var sourceFile_2 = getCanonicalFileName(ts.normalizeSlashes(fileName));
                 // Get occurrences only supports reporting occurrences for the file queried.  So
                 // filter down to that list.
-                results = ts.filter(results, function (r) { return getCanonicalFileName(ts.normalizeSlashes(r.fileName)) === sourceFile; });
+                results = ts.filter(results, function (r) { return getCanonicalFileName(ts.normalizeSlashes(r.fileName)) === sourceFile_2; });
             }
             return results;
         }
@@ -49217,7 +52713,7 @@ var ts;
             function getSemanticDocumentHighlights(node) {
                 if (node.kind === 69 /* Identifier */ ||
                     node.kind === 97 /* ThisKeyword */ ||
-                    node.kind === 162 /* ThisType */ ||
+                    node.kind === 164 /* ThisType */ ||
                     node.kind === 95 /* SuperKeyword */ ||
                     isLiteralNameOfPropertyDeclarationOrIndexAccess(node) ||
                     isNameOfExternalModuleImportOrDeclaration(node)) {
@@ -49271,75 +52767,75 @@ var ts;
                         switch (node.kind) {
                             case 88 /* IfKeyword */:
                             case 80 /* ElseKeyword */:
-                                if (hasKind(node.parent, 199 /* IfStatement */)) {
+                                if (hasKind(node.parent, 202 /* IfStatement */)) {
                                     return getIfElseOccurrences(node.parent);
                                 }
                                 break;
                             case 94 /* ReturnKeyword */:
-                                if (hasKind(node.parent, 207 /* ReturnStatement */)) {
+                                if (hasKind(node.parent, 210 /* ReturnStatement */)) {
                                     return getReturnOccurrences(node.parent);
                                 }
                                 break;
                             case 98 /* ThrowKeyword */:
-                                if (hasKind(node.parent, 211 /* ThrowStatement */)) {
+                                if (hasKind(node.parent, 214 /* ThrowStatement */)) {
                                     return getThrowOccurrences(node.parent);
                                 }
                                 break;
                             case 72 /* CatchKeyword */:
-                                if (hasKind(parent(parent(node)), 212 /* TryStatement */)) {
+                                if (hasKind(parent(parent(node)), 215 /* TryStatement */)) {
                                     return getTryCatchFinallyOccurrences(node.parent.parent);
                                 }
                                 break;
                             case 100 /* TryKeyword */:
                             case 85 /* FinallyKeyword */:
-                                if (hasKind(parent(node), 212 /* TryStatement */)) {
+                                if (hasKind(parent(node), 215 /* TryStatement */)) {
                                     return getTryCatchFinallyOccurrences(node.parent);
                                 }
                                 break;
                             case 96 /* SwitchKeyword */:
-                                if (hasKind(node.parent, 209 /* SwitchStatement */)) {
+                                if (hasKind(node.parent, 212 /* SwitchStatement */)) {
                                     return getSwitchCaseDefaultOccurrences(node.parent);
                                 }
                                 break;
                             case 71 /* CaseKeyword */:
                             case 77 /* DefaultKeyword */:
-                                if (hasKind(parent(parent(parent(node))), 209 /* SwitchStatement */)) {
+                                if (hasKind(parent(parent(parent(node))), 212 /* SwitchStatement */)) {
                                     return getSwitchCaseDefaultOccurrences(node.parent.parent.parent);
                                 }
                                 break;
                             case 70 /* BreakKeyword */:
                             case 75 /* ContinueKeyword */:
-                                if (hasKind(node.parent, 206 /* BreakStatement */) || hasKind(node.parent, 205 /* ContinueStatement */)) {
+                                if (hasKind(node.parent, 209 /* BreakStatement */) || hasKind(node.parent, 208 /* ContinueStatement */)) {
                                     return getBreakOrContinueStatementOccurrences(node.parent);
                                 }
                                 break;
                             case 86 /* ForKeyword */:
-                                if (hasKind(node.parent, 202 /* ForStatement */) ||
-                                    hasKind(node.parent, 203 /* ForInStatement */) ||
-                                    hasKind(node.parent, 204 /* ForOfStatement */)) {
+                                if (hasKind(node.parent, 205 /* ForStatement */) ||
+                                    hasKind(node.parent, 206 /* ForInStatement */) ||
+                                    hasKind(node.parent, 207 /* ForOfStatement */)) {
                                     return getLoopBreakContinueOccurrences(node.parent);
                                 }
                                 break;
                             case 104 /* WhileKeyword */:
                             case 79 /* DoKeyword */:
-                                if (hasKind(node.parent, 201 /* WhileStatement */) || hasKind(node.parent, 200 /* DoStatement */)) {
+                                if (hasKind(node.parent, 204 /* WhileStatement */) || hasKind(node.parent, 203 /* DoStatement */)) {
                                     return getLoopBreakContinueOccurrences(node.parent);
                                 }
                                 break;
                             case 121 /* ConstructorKeyword */:
-                                if (hasKind(node.parent, 145 /* Constructor */)) {
+                                if (hasKind(node.parent, 147 /* Constructor */)) {
                                     return getConstructorOccurrences(node.parent);
                                 }
                                 break;
                             case 123 /* GetKeyword */:
-                            case 129 /* SetKeyword */:
-                                if (hasKind(node.parent, 146 /* GetAccessor */) || hasKind(node.parent, 147 /* SetAccessor */)) {
+                            case 130 /* SetKeyword */:
+                                if (hasKind(node.parent, 148 /* GetAccessor */) || hasKind(node.parent, 149 /* SetAccessor */)) {
                                     return getGetAndSetOccurrences(node.parent);
                                 }
                                 break;
                             default:
                                 if (ts.isModifierKind(node.kind) && node.parent &&
-                                    (ts.isDeclaration(node.parent) || node.parent.kind === 196 /* VariableStatement */)) {
+                                    (ts.isDeclaration(node.parent) || node.parent.kind === 199 /* VariableStatement */)) {
                                     return getModifierOccurrences(node.kind, node.parent);
                                 }
                         }
@@ -49355,10 +52851,10 @@ var ts;
                     aggregate(node);
                     return statementAccumulator;
                     function aggregate(node) {
-                        if (node.kind === 211 /* ThrowStatement */) {
+                        if (node.kind === 214 /* ThrowStatement */) {
                             statementAccumulator.push(node);
                         }
-                        else if (node.kind === 212 /* TryStatement */) {
+                        else if (node.kind === 215 /* TryStatement */) {
                             var tryStatement = node;
                             if (tryStatement.catchClause) {
                                 aggregate(tryStatement.catchClause);
@@ -49385,19 +52881,19 @@ var ts;
                 function getThrowStatementOwner(throwStatement) {
                     var child = throwStatement;
                     while (child.parent) {
-                        var parent_13 = child.parent;
-                        if (ts.isFunctionBlock(parent_13) || parent_13.kind === 251 /* SourceFile */) {
-                            return parent_13;
+                        var parent_16 = child.parent;
+                        if (ts.isFunctionBlock(parent_16) || parent_16.kind === 255 /* SourceFile */) {
+                            return parent_16;
                         }
                         // A throw-statement is only owned by a try-statement if the try-statement has
                         // a catch clause, and if the throw-statement occurs within the try block.
-                        if (parent_13.kind === 212 /* TryStatement */) {
-                            var tryStatement = parent_13;
+                        if (parent_16.kind === 215 /* TryStatement */) {
+                            var tryStatement = parent_16;
                             if (tryStatement.tryBlock === child && tryStatement.catchClause) {
                                 return child;
                             }
                         }
-                        child = parent_13;
+                        child = parent_16;
                     }
                     return undefined;
                 }
@@ -49406,7 +52902,7 @@ var ts;
                     aggregate(node);
                     return statementAccumulator;
                     function aggregate(node) {
-                        if (node.kind === 206 /* BreakStatement */ || node.kind === 205 /* ContinueStatement */) {
+                        if (node.kind === 209 /* BreakStatement */ || node.kind === 208 /* ContinueStatement */) {
                             statementAccumulator.push(node);
                         }
                         else if (!ts.isFunctionLike(node)) {
@@ -49421,16 +52917,16 @@ var ts;
                 function getBreakOrContinueOwner(statement) {
                     for (var node_2 = statement.parent; node_2; node_2 = node_2.parent) {
                         switch (node_2.kind) {
-                            case 209 /* SwitchStatement */:
-                                if (statement.kind === 205 /* ContinueStatement */) {
+                            case 212 /* SwitchStatement */:
+                                if (statement.kind === 208 /* ContinueStatement */) {
                                     continue;
                                 }
                             // Fall through.
-                            case 202 /* ForStatement */:
-                            case 203 /* ForInStatement */:
-                            case 204 /* ForOfStatement */:
-                            case 201 /* WhileStatement */:
-                            case 200 /* DoStatement */:
+                            case 205 /* ForStatement */:
+                            case 206 /* ForInStatement */:
+                            case 207 /* ForOfStatement */:
+                            case 204 /* WhileStatement */:
+                            case 203 /* DoStatement */:
                                 if (!statement.label || isLabeledBy(node_2, statement.label.text)) {
                                     return node_2;
                                 }
@@ -49449,24 +52945,24 @@ var ts;
                     var container = declaration.parent;
                     // Make sure we only highlight the keyword when it makes sense to do so.
                     if (ts.isAccessibilityModifier(modifier)) {
-                        if (!(container.kind === 217 /* ClassDeclaration */ ||
-                            container.kind === 189 /* ClassExpression */ ||
-                            (declaration.kind === 139 /* Parameter */ && hasKind(container, 145 /* Constructor */)))) {
+                        if (!(container.kind === 220 /* ClassDeclaration */ ||
+                            container.kind === 191 /* ClassExpression */ ||
+                            (declaration.kind === 141 /* Parameter */ && hasKind(container, 147 /* Constructor */)))) {
                             return undefined;
                         }
                     }
                     else if (modifier === 113 /* StaticKeyword */) {
-                        if (!(container.kind === 217 /* ClassDeclaration */ || container.kind === 189 /* ClassExpression */)) {
+                        if (!(container.kind === 220 /* ClassDeclaration */ || container.kind === 191 /* ClassExpression */)) {
                             return undefined;
                         }
                     }
                     else if (modifier === 82 /* ExportKeyword */ || modifier === 122 /* DeclareKeyword */) {
-                        if (!(container.kind === 222 /* ModuleBlock */ || container.kind === 251 /* SourceFile */)) {
+                        if (!(container.kind === 225 /* ModuleBlock */ || container.kind === 255 /* SourceFile */)) {
                             return undefined;
                         }
                     }
                     else if (modifier === 115 /* AbstractKeyword */) {
-                        if (!(container.kind === 217 /* ClassDeclaration */ || declaration.kind === 217 /* ClassDeclaration */)) {
+                        if (!(container.kind === 220 /* ClassDeclaration */ || declaration.kind === 220 /* ClassDeclaration */)) {
                             return undefined;
                         }
                     }
@@ -49478,8 +52974,8 @@ var ts;
                     var modifierFlag = getFlagFromModifier(modifier);
                     var nodes;
                     switch (container.kind) {
-                        case 222 /* ModuleBlock */:
-                        case 251 /* SourceFile */:
+                        case 225 /* ModuleBlock */:
+                        case 255 /* SourceFile */:
                             // Container is either a class declaration or the declaration is a classDeclaration
                             if (modifierFlag & 128 /* Abstract */) {
                                 nodes = declaration.members.concat(declaration);
@@ -49488,17 +52984,17 @@ var ts;
                                 nodes = container.statements;
                             }
                             break;
-                        case 145 /* Constructor */:
+                        case 147 /* Constructor */:
                             nodes = container.parameters.concat(container.parent.members);
                             break;
-                        case 217 /* ClassDeclaration */:
-                        case 189 /* ClassExpression */:
+                        case 220 /* ClassDeclaration */:
+                        case 191 /* ClassExpression */:
                             nodes = container.members;
                             // 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 & 56 /* AccessibilityModifier */) {
+                            if (modifierFlag & 28 /* AccessibilityModifier */) {
                                 var constructor = ts.forEach(container.members, function (member) {
-                                    return member.kind === 145 /* Constructor */ && member;
+                                    return member.kind === 147 /* Constructor */ && member;
                                 });
                                 if (constructor) {
                                     nodes = nodes.concat(constructor.parameters);
@@ -49520,17 +53016,17 @@ var ts;
                     function getFlagFromModifier(modifier) {
                         switch (modifier) {
                             case 112 /* PublicKeyword */:
-                                return 8 /* Public */;
+                                return 4 /* Public */;
                             case 110 /* PrivateKeyword */:
-                                return 16 /* Private */;
+                                return 8 /* Private */;
                             case 111 /* ProtectedKeyword */:
-                                return 32 /* Protected */;
+                                return 16 /* Protected */;
                             case 113 /* StaticKeyword */:
-                                return 64 /* Static */;
+                                return 32 /* Static */;
                             case 82 /* ExportKeyword */:
-                                return 2 /* Export */;
+                                return 1 /* Export */;
                             case 122 /* DeclareKeyword */:
-                                return 4 /* Ambient */;
+                                return 2 /* Ambient */;
                             case 115 /* AbstractKeyword */:
                                 return 128 /* Abstract */;
                             default:
@@ -49551,13 +53047,13 @@ var ts;
                 }
                 function getGetAndSetOccurrences(accessorDeclaration) {
                     var keywords = [];
-                    tryPushAccessorKeyword(accessorDeclaration.symbol, 146 /* GetAccessor */);
-                    tryPushAccessorKeyword(accessorDeclaration.symbol, 147 /* SetAccessor */);
+                    tryPushAccessorKeyword(accessorDeclaration.symbol, 148 /* GetAccessor */);
+                    tryPushAccessorKeyword(accessorDeclaration.symbol, 149 /* SetAccessor */);
                     return ts.map(keywords, getHighlightSpanForNode);
                     function tryPushAccessorKeyword(accessorSymbol, accessorKind) {
                         var accessor = ts.getDeclarationOfKind(accessorSymbol, accessorKind);
                         if (accessor) {
-                            ts.forEach(accessor.getChildren(), function (child) { return pushKeywordIf(keywords, child, 123 /* GetKeyword */, 129 /* SetKeyword */); });
+                            ts.forEach(accessor.getChildren(), function (child) { return pushKeywordIf(keywords, child, 123 /* GetKeyword */, 130 /* SetKeyword */); });
                         }
                     }
                 }
@@ -49575,7 +53071,7 @@ var ts;
                     var keywords = [];
                     if (pushKeywordIf(keywords, loopNode.getFirstToken(), 86 /* ForKeyword */, 104 /* WhileKeyword */, 79 /* DoKeyword */)) {
                         // If we succeeded and got a do-while loop, then start looking for a 'while' keyword.
-                        if (loopNode.kind === 200 /* DoStatement */) {
+                        if (loopNode.kind === 203 /* DoStatement */) {
                             var loopTokens = loopNode.getChildren();
                             for (var i = loopTokens.length - 1; i >= 0; i--) {
                                 if (pushKeywordIf(keywords, loopTokens[i], 104 /* WhileKeyword */)) {
@@ -49596,13 +53092,13 @@ var ts;
                     var owner = getBreakOrContinueOwner(breakOrContinueStatement);
                     if (owner) {
                         switch (owner.kind) {
-                            case 202 /* ForStatement */:
-                            case 203 /* ForInStatement */:
-                            case 204 /* ForOfStatement */:
-                            case 200 /* DoStatement */:
-                            case 201 /* WhileStatement */:
+                            case 205 /* ForStatement */:
+                            case 206 /* ForInStatement */:
+                            case 207 /* ForOfStatement */:
+                            case 203 /* DoStatement */:
+                            case 204 /* WhileStatement */:
                                 return getLoopBreakContinueOccurrences(owner);
-                            case 209 /* SwitchStatement */:
+                            case 212 /* SwitchStatement */:
                                 return getSwitchCaseDefaultOccurrences(owner);
                         }
                     }
@@ -49656,7 +53152,7 @@ var ts;
                 function getReturnOccurrences(returnStatement) {
                     var func = ts.getContainingFunction(returnStatement);
                     // If we didn't find a containing function with a block body, bail out.
-                    if (!(func && hasKind(func.body, 195 /* Block */))) {
+                    if (!(func && hasKind(func.body, 198 /* Block */))) {
                         return undefined;
                     }
                     var keywords = [];
@@ -49672,7 +53168,7 @@ var ts;
                 function getIfElseOccurrences(ifStatement) {
                     var keywords = [];
                     // Traverse upwards through all parent if-statements linked by their else-branches.
-                    while (hasKind(ifStatement.parent, 199 /* IfStatement */) && ifStatement.parent.elseStatement === ifStatement) {
+                    while (hasKind(ifStatement.parent, 202 /* IfStatement */) && ifStatement.parent.elseStatement === ifStatement) {
                         ifStatement = ifStatement.parent;
                     }
                     // Now traverse back down through the else branches, aggregating if/else keywords of if-statements.
@@ -49685,7 +53181,7 @@ var ts;
                                 break;
                             }
                         }
-                        if (!hasKind(ifStatement.elseStatement, 199 /* IfStatement */)) {
+                        if (!hasKind(ifStatement.elseStatement, 202 /* IfStatement */)) {
                             break;
                         }
                         ifStatement = ifStatement.elseStatement;
@@ -49802,7 +53298,7 @@ var ts;
                     return getLabelReferencesInNode(node.parent, node);
                 }
             }
-            if (node.kind === 97 /* ThisKeyword */ || node.kind === 162 /* ThisType */) {
+            if (node.kind === 97 /* ThisKeyword */ || node.kind === 164 /* ThisType */) {
                 return getReferencesForThisKeyword(node, sourceFiles);
             }
             if (node.kind === 95 /* SuperKeyword */) {
@@ -49836,11 +53332,11 @@ var ts;
             }
             else {
                 var internedName = getInternedName(symbol, node, declarations);
-                for (var _i = 0, sourceFiles_3 = sourceFiles; _i < sourceFiles_3.length; _i++) {
-                    var sourceFile = sourceFiles_3[_i];
+                for (var _i = 0, sourceFiles_4 = sourceFiles; _i < sourceFiles_4.length; _i++) {
+                    var sourceFile = sourceFiles_4[_i];
                     cancellationToken.throwIfCancellationRequested();
                     var nameTable = getNameTable(sourceFile);
-                    if (ts.lookUp(nameTable, internedName)) {
+                    if (ts.lookUp(nameTable, internedName) !== undefined) {
                         result = result || [];
                         getReferencesInNode(sourceFile, symbol, declaredName, node, searchMeaning, findInStrings, findInComments, result, symbolToIndex);
                     }
@@ -49864,7 +53360,7 @@ var ts;
                 };
             }
             function isImportSpecifierSymbol(symbol) {
-                return (symbol.flags & 8388608 /* Alias */) && !!ts.getDeclarationOfKind(symbol, 229 /* ImportSpecifier */);
+                return (symbol.flags & 8388608 /* Alias */) && !!ts.getDeclarationOfKind(symbol, 233 /* ImportSpecifier */);
             }
             function getInternedName(symbol, location, declarations) {
                 // If this is an export or import specifier it could have been renamed using the 'as' syntax.
@@ -49890,18 +53386,18 @@ var ts;
                 // If this is the symbol of a named function expression or named class expression,
                 // then named references are limited to its own scope.
                 var valueDeclaration = symbol.valueDeclaration;
-                if (valueDeclaration && (valueDeclaration.kind === 176 /* FunctionExpression */ || valueDeclaration.kind === 189 /* ClassExpression */)) {
+                if (valueDeclaration && (valueDeclaration.kind === 178 /* FunctionExpression */ || valueDeclaration.kind === 191 /* ClassExpression */)) {
                     return valueDeclaration;
                 }
                 // If this is private property or method, the scope is the containing class
                 if (symbol.flags & (4 /* Property */ | 8192 /* Method */)) {
-                    var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) { return (d.flags & 16 /* Private */) ? d : undefined; });
+                    var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) { return (d.flags & 8 /* Private */) ? d : undefined; });
                     if (privateDeclaration) {
-                        return ts.getAncestor(privateDeclaration, 217 /* ClassDeclaration */);
+                        return ts.getAncestor(privateDeclaration, 220 /* ClassDeclaration */);
                     }
                 }
                 // If the symbol is an import we would like to find it if we are looking for what it imports.
-                // So consider it visibile outside its declaration scope.
+                // So consider it visible outside its declaration scope.
                 if (symbol.flags & 8388608 /* Alias */) {
                     return undefined;
                 }
@@ -49913,8 +53409,8 @@ var ts;
                 var scope;
                 var declarations = symbol.getDeclarations();
                 if (declarations) {
-                    for (var _i = 0, declarations_8 = declarations; _i < declarations_8.length; _i++) {
-                        var declaration = declarations_8[_i];
+                    for (var _i = 0, declarations_9 = declarations; _i < declarations_9.length; _i++) {
+                        var declaration = declarations_9[_i];
                         var container = getContainerNode(declaration);
                         if (!container) {
                             return undefined;
@@ -49923,7 +53419,7 @@ var ts;
                             // Different declarations have different containers, bail out
                             return undefined;
                         }
-                        if (container.kind === 251 /* SourceFile */ && !ts.isExternalModule(container)) {
+                        if (container.kind === 255 /* SourceFile */ && !ts.isExternalModule(container)) {
                             // This is a global variable and not an external module, any declaration defined
                             // within this scope is visible outside the file
                             return undefined;
@@ -50022,7 +53518,7 @@ var ts;
                 var possiblePositions = getPossibleSymbolReferencePositions(sourceFile, searchText, container.getStart(), container.getEnd());
                 if (possiblePositions.length) {
                     // Build the set of symbols to search for, initially it has only the current symbol
-                    var searchSymbols = populateSearchSymbolSet(searchSymbol, searchLocation);
+                    var searchSymbols_1 = populateSearchSymbolSet(searchSymbol, searchLocation);
                     ts.forEach(possiblePositions, function (position) {
                         cancellationToken.throwIfCancellationRequested();
                         var referenceLocation = ts.getTouchingPropertyName(sourceFile, position);
@@ -50054,12 +53550,12 @@ var ts;
                         if (referenceSymbol) {
                             var referenceSymbolDeclaration = referenceSymbol.valueDeclaration;
                             var shorthandValueSymbol = typeChecker.getShorthandAssignmentValueSymbol(referenceSymbolDeclaration);
-                            var relatedSymbol = getRelatedSymbol(searchSymbols, referenceSymbol, referenceLocation);
+                            var relatedSymbol = getRelatedSymbol(searchSymbols_1, referenceSymbol, referenceLocation);
                             if (relatedSymbol) {
                                 var referencedSymbol = getReferencedSymbol(relatedSymbol);
                                 referencedSymbol.references.push(getReferenceEntryFromNode(referenceLocation));
                             }
-                            else if (!(referenceSymbol.flags & 67108864 /* Transient */) && searchSymbols.indexOf(shorthandValueSymbol) >= 0) {
+                            else if (!(referenceSymbol.flags & 67108864 /* Transient */) && searchSymbols_1.indexOf(shorthandValueSymbol) >= 0) {
                                 var referencedSymbol = getReferencedSymbol(shorthandValueSymbol);
                                 referencedSymbol.references.push(getReferenceEntryFromNode(referenceSymbolDeclaration.name));
                             }
@@ -50094,15 +53590,15 @@ var ts;
                     return undefined;
                 }
                 // Whether 'super' occurs in a static context within a class.
-                var staticFlag = 64 /* Static */;
+                var staticFlag = 32 /* Static */;
                 switch (searchSpaceNode.kind) {
-                    case 142 /* PropertyDeclaration */:
-                    case 141 /* PropertySignature */:
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
-                    case 145 /* Constructor */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
+                    case 144 /* PropertyDeclaration */:
+                    case 143 /* PropertySignature */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
+                    case 147 /* Constructor */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
                         staticFlag &= searchSpaceNode.flags;
                         searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
                         break;
@@ -50122,7 +53618,7 @@ var 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 && (64 /* Static */ & container.flags) === staticFlag && container.parent.symbol === searchSpaceNode.symbol) {
+                    if (container && (32 /* Static */ & container.flags) === staticFlag && container.parent.symbol === searchSpaceNode.symbol) {
                         references.push(getReferenceEntryFromNode(node));
                     }
                 });
@@ -50132,29 +53628,29 @@ var ts;
             function getReferencesForThisKeyword(thisOrSuperKeyword, sourceFiles) {
                 var searchSpaceNode = ts.getThisContainer(thisOrSuperKeyword, /* includeArrowFunctions */ false);
                 // Whether 'this' occurs in a static context within a class.
-                var staticFlag = 64 /* Static */;
+                var staticFlag = 32 /* Static */;
                 switch (searchSpaceNode.kind) {
-                    case 144 /* MethodDeclaration */:
-                    case 143 /* MethodSignature */:
+                    case 146 /* MethodDeclaration */:
+                    case 145 /* MethodSignature */:
                         if (ts.isObjectLiteralMethod(searchSpaceNode)) {
                             break;
                         }
                     // fall through
-                    case 142 /* PropertyDeclaration */:
-                    case 141 /* PropertySignature */:
-                    case 145 /* Constructor */:
-                    case 146 /* GetAccessor */:
-                    case 147 /* SetAccessor */:
+                    case 144 /* PropertyDeclaration */:
+                    case 143 /* PropertySignature */:
+                    case 147 /* Constructor */:
+                    case 148 /* GetAccessor */:
+                    case 149 /* SetAccessor */:
                         staticFlag &= searchSpaceNode.flags;
                         searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
                         break;
-                    case 251 /* SourceFile */:
+                    case 255 /* SourceFile */:
                         if (ts.isExternalModule(searchSpaceNode)) {
                             return undefined;
                         }
                     // Fall through
-                    case 216 /* FunctionDeclaration */:
-                    case 176 /* FunctionExpression */:
+                    case 219 /* FunctionDeclaration */:
+                    case 178 /* FunctionExpression */:
                         break;
                     // Computed properties in classes are not handled here because references to this are illegal,
                     // so there is no point finding references to them.
@@ -50163,7 +53659,7 @@ var ts;
                 }
                 var references = [];
                 var possiblePositions;
-                if (searchSpaceNode.kind === 251 /* SourceFile */) {
+                if (searchSpaceNode.kind === 255 /* SourceFile */) {
                     ts.forEach(sourceFiles, function (sourceFile) {
                         possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "this", sourceFile.getStart(), sourceFile.getEnd());
                         getThisReferencesInFile(sourceFile, sourceFile, possiblePositions, references);
@@ -50189,33 +53685,33 @@ var ts;
                     ts.forEach(possiblePositions, function (position) {
                         cancellationToken.throwIfCancellationRequested();
                         var node = ts.getTouchingWord(sourceFile, position);
-                        if (!node || (node.kind !== 97 /* ThisKeyword */ && node.kind !== 162 /* ThisType */)) {
+                        if (!node || (node.kind !== 97 /* ThisKeyword */ && node.kind !== 164 /* ThisType */)) {
                             return;
                         }
                         var container = ts.getThisContainer(node, /* includeArrowFunctions */ false);
                         switch (searchSpaceNode.kind) {
-                            case 176 /* FunctionExpression */:
-                            case 216 /* FunctionDeclaration */:
+                            case 178 /* FunctionExpression */:
+                            case 219 /* FunctionDeclaration */:
                                 if (searchSpaceNode.symbol === container.symbol) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
-                            case 144 /* MethodDeclaration */:
-                            case 143 /* MethodSignature */:
+                            case 146 /* MethodDeclaration */:
+                            case 145 /* MethodSignature */:
                                 if (ts.isObjectLiteralMethod(searchSpaceNode) && searchSpaceNode.symbol === container.symbol) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
-                            case 189 /* ClassExpression */:
-                            case 217 /* ClassDeclaration */:
+                            case 191 /* ClassExpression */:
+                            case 220 /* 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 & 64 /* Static */) === staticFlag) {
+                                if (container.parent && searchSpaceNode.symbol === container.parent.symbol && (container.flags & 32 /* Static */) === staticFlag) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
-                            case 251 /* SourceFile */:
-                                if (container.kind === 251 /* SourceFile */ && !ts.isExternalModule(container)) {
+                            case 255 /* SourceFile */:
+                                if (container.kind === 255 /* SourceFile */ && !ts.isExternalModule(container)) {
                                     result.push(getReferenceEntryFromNode(node));
                                 }
                                 break;
@@ -50226,16 +53722,16 @@ var ts;
             function populateSearchSymbolSet(symbol, location) {
                 // The search set contains at least the current symbol
                 var result = [symbol];
-                // If the symbol is an alias, add what it alaises to the list
+                // If the symbol is an alias, add what it aliases to the list
                 if (isImportSpecifierSymbol(symbol)) {
                     result.push(typeChecker.getAliasedSymbol(symbol));
                 }
-                // For export specifiers, the exported name can be refering to a local symbol, e.g.:
+                // For export specifiers, the exported name can be referring to a local symbol, e.g.:
                 //     import {a} from "mod";
                 //     export {a as somethingElse}
                 // We want the *local* declaration of 'a' as declared in the import,
                 // *not* as declared within "mod" (or farther)
-                if (location.parent.kind === 233 /* ExportSpecifier */) {
+                if (location.parent.kind === 237 /* ExportSpecifier */) {
                     result.push(typeChecker.getExportSpecifierLocalTargetSymbol(location.parent));
                 }
                 // If the location is in a context sensitive location (i.e. in an object literal) try
@@ -50263,9 +53759,9 @@ var ts;
                 }
                 // If the symbol.valueDeclaration is a property parameter declaration,
                 // we should include both parameter declaration symbol and property declaration symbol
-                // Parameter Declaration symbol is only visible within function scope, so the symbol is stored in contructor.locals.
+                // Parameter Declaration symbol is only visible within function scope, so the symbol is stored in constructor.locals.
                 // Property Declaration symbol is a member of the class, so the symbol is stored in its class Declaration.symbol.members
-                if (symbol.valueDeclaration && symbol.valueDeclaration.kind === 139 /* Parameter */ &&
+                if (symbol.valueDeclaration && symbol.valueDeclaration.kind === 141 /* Parameter */ &&
                     ts.isParameterPropertyDeclaration(symbol.valueDeclaration)) {
                     result = result.concat(typeChecker.getSymbolsOfParameterPropertyDeclaration(symbol.valueDeclaration, symbol.name));
                 }
@@ -50285,9 +53781,9 @@ var ts;
             /**
              * Find symbol of the given property-name and add the symbol to the given result array
              * @param symbol a symbol to start searching for the given propertyName
-             * @param propertyName a name of property to serach for
+             * @param propertyName a name of property to search for
              * @param result an array of symbol of found property symbols
-             * @param previousIterationSymbolsCache a cache of symbol from previous iterations of calling this function to prevent infinite revisitng of the same symbol.
+             * @param previousIterationSymbolsCache a cache of symbol from previous iterations of calling this function to prevent infinite revisiting of the same symbol.
              *                                The value of previousIterationSymbol is undefined when the function is first called.
              */
             function getPropertySymbolsFromBaseTypes(symbol, propertyName, result, previousIterationSymbolsCache) {
@@ -50310,11 +53806,11 @@ var ts;
                 }
                 if (symbol.flags & (32 /* Class */ | 64 /* Interface */)) {
                     ts.forEach(symbol.getDeclarations(), function (declaration) {
-                        if (declaration.kind === 217 /* ClassDeclaration */) {
+                        if (declaration.kind === 220 /* ClassDeclaration */) {
                             getPropertySymbolFromTypeReference(ts.getClassExtendsHeritageClauseElement(declaration));
                             ts.forEach(ts.getClassImplementsHeritageClauseElements(declaration), getPropertySymbolFromTypeReference);
                         }
-                        else if (declaration.kind === 218 /* InterfaceDeclaration */) {
+                        else if (declaration.kind === 221 /* InterfaceDeclaration */) {
                             ts.forEach(ts.getInterfaceBaseTypeNodes(declaration), getPropertySymbolFromTypeReference);
                         }
                     });
@@ -50351,7 +53847,7 @@ var ts;
                 //     import {a} from "mod";
                 //     export {a as somethingElse}
                 // We want the local target of the export (i.e. the import symbol) and not the final target (i.e. "mod".a)
-                if (referenceLocation.parent.kind === 233 /* ExportSpecifier */) {
+                if (referenceLocation.parent.kind === 237 /* ExportSpecifier */) {
                     var aliasedSymbol = typeChecker.getExportSpecifierLocalTargetSymbol(referenceLocation.parent);
                     if (searchSymbols.indexOf(aliasedSymbol) >= 0) {
                         return aliasedSymbol;
@@ -50375,9 +53871,9 @@ var ts;
                     // Finally, try all properties with the same name in any type the containing type extended or implemented, and
                     // see if any is in the list
                     if (rootSymbol.parent && rootSymbol.parent.flags & (32 /* Class */ | 64 /* Interface */)) {
-                        var result_3 = [];
-                        getPropertySymbolsFromBaseTypes(rootSymbol.parent, rootSymbol.getName(), result_3, /*previousIterationSymbolsCache*/ {});
-                        return ts.forEach(result_3, function (s) { return searchSymbols.indexOf(s) >= 0 ? s : undefined; });
+                        var result_4 = [];
+                        getPropertySymbolsFromBaseTypes(rootSymbol.parent, rootSymbol.getName(), result_4, /*previousIterationSymbolsCache*/ {});
+                        return ts.forEach(result_4, function (s) { return searchSymbols.indexOf(s) >= 0 ? s : undefined; });
                     }
                     return undefined;
                 });
@@ -50386,28 +53882,28 @@ var ts;
                 if (isNameOfPropertyAssignment(node)) {
                     var objectLiteral = node.parent.parent;
                     var contextualType = typeChecker.getContextualType(objectLiteral);
-                    var name_36 = node.text;
+                    var name_41 = node.text;
                     if (contextualType) {
                         if (contextualType.flags & 16384 /* Union */) {
                             // This is a union type, first see if the property we are looking for is a union property (i.e. exists in all types)
                             // if not, search the constituent types for the property
-                            var unionProperty = contextualType.getProperty(name_36);
+                            var unionProperty = contextualType.getProperty(name_41);
                             if (unionProperty) {
                                 return [unionProperty];
                             }
                             else {
-                                var result_4 = [];
+                                var result_5 = [];
                                 ts.forEach(contextualType.types, function (t) {
-                                    var symbol = t.getProperty(name_36);
+                                    var symbol = t.getProperty(name_41);
                                     if (symbol) {
-                                        result_4.push(symbol);
+                                        result_5.push(symbol);
                                     }
                                 });
-                                return result_4;
+                                return result_5;
                             }
                         }
                         else {
-                            var symbol_1 = contextualType.getProperty(name_36);
+                            var symbol_1 = contextualType.getProperty(name_41);
                             if (symbol_1) {
                                 return [symbol_1];
                             }
@@ -50425,7 +53921,7 @@ var ts;
               */
             function getIntersectingMeaningFromDeclarations(meaning, declarations) {
                 if (declarations) {
-                    var lastIterationMeaning;
+                    var lastIterationMeaning = void 0;
                     do {
                         // The result is order-sensitive, for instance if initialMeaning === Namespace, and declarations = [class, instantiated module]
                         // we need to consider both as they initialMeaning intersects with the module in the namespace space, and the module
@@ -50433,8 +53929,8 @@ var ts;
                         // To achieve that we will keep iterating until the result stabilizes.
                         // Remember the last meaning
                         lastIterationMeaning = meaning;
-                        for (var _i = 0, declarations_9 = declarations; _i < declarations_9.length; _i++) {
-                            var declaration = declarations_9[_i];
+                        for (var _i = 0, declarations_10 = declarations; _i < declarations_10.length; _i++) {
+                            var declaration = declarations_10[_i];
                             var declarationMeaning = getMeaningFromDeclaration(declaration);
                             if (declarationMeaning & meaning) {
                                 meaning |= declarationMeaning;
@@ -50465,10 +53961,10 @@ var ts;
             }
             var parent = node.parent;
             if (parent) {
-                if (parent.kind === 183 /* PostfixUnaryExpression */ || parent.kind === 182 /* PrefixUnaryExpression */) {
+                if (parent.kind === 185 /* PostfixUnaryExpression */ || parent.kind === 184 /* PrefixUnaryExpression */) {
                     return true;
                 }
-                else if (parent.kind === 184 /* BinaryExpression */ && parent.left === node) {
+                else if (parent.kind === 186 /* BinaryExpression */ && parent.left === node) {
                     var operator = parent.operatorToken.kind;
                     return 56 /* FirstAssignment */ <= operator && operator <= 68 /* LastAssignment */;
                 }
@@ -50499,33 +53995,33 @@ var ts;
         }
         function getMeaningFromDeclaration(node) {
             switch (node.kind) {
-                case 139 /* Parameter */:
-                case 214 /* VariableDeclaration */:
-                case 166 /* BindingElement */:
-                case 142 /* PropertyDeclaration */:
-                case 141 /* PropertySignature */:
-                case 248 /* PropertyAssignment */:
-                case 249 /* ShorthandPropertyAssignment */:
-                case 250 /* EnumMember */:
-                case 144 /* MethodDeclaration */:
-                case 143 /* MethodSignature */:
-                case 145 /* Constructor */:
-                case 146 /* GetAccessor */:
-                case 147 /* SetAccessor */:
-                case 216 /* FunctionDeclaration */:
-                case 176 /* FunctionExpression */:
-                case 177 /* ArrowFunction */:
-                case 247 /* CatchClause */:
+                case 141 /* Parameter */:
+                case 217 /* VariableDeclaration */:
+                case 168 /* BindingElement */:
+                case 144 /* PropertyDeclaration */:
+                case 143 /* PropertySignature */:
+                case 252 /* PropertyAssignment */:
+                case 253 /* ShorthandPropertyAssignment */:
+                case 254 /* EnumMember */:
+                case 146 /* MethodDeclaration */:
+                case 145 /* MethodSignature */:
+                case 147 /* Constructor */:
+                case 148 /* GetAccessor */:
+                case 149 /* SetAccessor */:
+                case 219 /* FunctionDeclaration */:
+                case 178 /* FunctionExpression */:
+                case 179 /* ArrowFunction */:
+                case 251 /* CatchClause */:
                     return 1 /* Value */;
-                case 138 /* TypeParameter */:
-                case 218 /* InterfaceDeclaration */:
-                case 219 /* TypeAliasDeclaration */:
-                case 156 /* TypeLiteral */:
+                case 140 /* TypeParameter */:
+                case 221 /* InterfaceDeclaration */:
+                case 222 /* TypeAliasDeclaration */:
+                case 158 /* TypeLiteral */:
                     return 2 /* Type */;
-                case 217 /* ClassDeclaration */:
-                case 220 /* EnumDeclaration */:
+                case 220 /* ClassDeclaration */:
+                case 223 /* EnumDeclaration */:
                     return 1 /* Value */ | 2 /* Type */;
-                case 221 /* ModuleDeclaration */:
+                case 224 /* ModuleDeclaration */:
                     if (ts.isAmbientModule(node)) {
                         return 4 /* Namespace */ | 1 /* Value */;
                     }
@@ -50535,15 +54031,15 @@ var ts;
                     else {
                         return 4 /* Namespace */;
                     }
-                case 228 /* NamedImports */:
-                case 229 /* ImportSpecifier */:
-                case 224 /* ImportEqualsDeclaration */:
-                case 225 /* ImportDeclaration */:
-                case 230 /* ExportAssignment */:
-                case 231 /* ExportDeclaration */:
+                case 232 /* NamedImports */:
+                case 233 /* ImportSpecifier */:
+                case 228 /* ImportEqualsDeclaration */:
+                case 229 /* ImportDeclaration */:
+                case 234 /* ExportAssignment */:
+                case 235 /* ExportDeclaration */:
                     return 1 /* Value */ | 2 /* Type */ | 4 /* Namespace */;
                 // An external module can be a Value
-                case 251 /* SourceFile */:
+                case 255 /* SourceFile */:
                     return 4 /* Namespace */ | 1 /* Value */;
             }
             return 1 /* Value */ | 2 /* Type */ | 4 /* Namespace */;
@@ -50552,10 +54048,10 @@ var ts;
             if (ts.isRightSideOfQualifiedNameOrPropertyAccess(node)) {
                 node = node.parent;
             }
-            return node.parent.kind === 152 /* TypeReference */ ||
-                (node.parent.kind === 191 /* ExpressionWithTypeArguments */ && !ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent)) ||
+            return node.parent.kind === 154 /* TypeReference */ ||
+                (node.parent.kind === 193 /* ExpressionWithTypeArguments */ && !ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent)) ||
                 (node.kind === 97 /* ThisKeyword */ && !ts.isExpression(node)) ||
-                node.kind === 162 /* ThisType */;
+                node.kind === 164 /* ThisType */;
         }
         function isNamespaceReference(node) {
             return isQualifiedNameNamespaceReference(node) || isPropertyAccessNamespaceReference(node);
@@ -50563,32 +54059,32 @@ var ts;
         function isPropertyAccessNamespaceReference(node) {
             var root = node;
             var isLastClause = true;
-            if (root.parent.kind === 169 /* PropertyAccessExpression */) {
-                while (root.parent && root.parent.kind === 169 /* PropertyAccessExpression */) {
+            if (root.parent.kind === 171 /* PropertyAccessExpression */) {
+                while (root.parent && root.parent.kind === 171 /* PropertyAccessExpression */) {
                     root = root.parent;
                 }
                 isLastClause = root.name === node;
             }
-            if (!isLastClause && root.parent.kind === 191 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 246 /* HeritageClause */) {
+            if (!isLastClause && root.parent.kind === 193 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 250 /* HeritageClause */) {
                 var decl = root.parent.parent.parent;
-                return (decl.kind === 217 /* ClassDeclaration */ && root.parent.parent.token === 106 /* ImplementsKeyword */) ||
-                    (decl.kind === 218 /* InterfaceDeclaration */ && root.parent.parent.token === 83 /* ExtendsKeyword */);
+                return (decl.kind === 220 /* ClassDeclaration */ && root.parent.parent.token === 106 /* ImplementsKeyword */) ||
+                    (decl.kind === 221 /* InterfaceDeclaration */ && root.parent.parent.token === 83 /* ExtendsKeyword */);
             }
             return false;
         }
         function isQualifiedNameNamespaceReference(node) {
             var root = node;
             var isLastClause = true;
-            if (root.parent.kind === 136 /* QualifiedName */) {
-                while (root.parent && root.parent.kind === 136 /* QualifiedName */) {
+            if (root.parent.kind === 138 /* QualifiedName */) {
+                while (root.parent && root.parent.kind === 138 /* QualifiedName */) {
                     root = root.parent;
                 }
                 isLastClause = root.right === node;
             }
-            return root.parent.kind === 152 /* TypeReference */ && !isLastClause;
+            return root.parent.kind === 154 /* TypeReference */ && !isLastClause;
         }
         function isInRightSideOfImport(node) {
-            while (node.parent.kind === 136 /* QualifiedName */) {
+            while (node.parent.kind === 138 /* QualifiedName */) {
                 node = node.parent;
             }
             return ts.isInternalModuleImportEqualsDeclaration(node.parent) && node.parent.moduleReference === node;
@@ -50598,15 +54094,15 @@ var ts;
             //     import a = |b|; // Namespace
             //     import a = |b.c|; // Value, type, namespace
             //     import a = |b.c|.d; // Namespace
-            if (node.parent.kind === 136 /* QualifiedName */ &&
+            if (node.parent.kind === 138 /* QualifiedName */ &&
                 node.parent.right === node &&
-                node.parent.parent.kind === 224 /* ImportEqualsDeclaration */) {
+                node.parent.parent.kind === 228 /* ImportEqualsDeclaration */) {
                 return 1 /* Value */ | 2 /* Type */ | 4 /* Namespace */;
             }
             return 4 /* Namespace */;
         }
         function getMeaningFromLocation(node) {
-            if (node.parent.kind === 230 /* ExportAssignment */) {
+            if (node.parent.kind === 234 /* ExportAssignment */) {
                 return 1 /* Value */ | 2 /* Type */ | 4 /* Namespace */;
             }
             else if (isInRightSideOfImport(node)) {
@@ -50635,7 +54131,7 @@ var ts;
             return ts.SignatureHelp.getSignatureHelpItems(program, sourceFile, position, cancellationToken);
         }
         /// Syntactic features
-        function getSourceFile(fileName) {
+        function getNonBoundSourceFile(fileName) {
             return syntaxTreeCache.getCurrentSourceFile(fileName);
         }
         function getNameOrDottedNameSpan(fileName, startPos, endPos) {
@@ -50646,16 +54142,16 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 169 /* PropertyAccessExpression */:
-                case 136 /* QualifiedName */:
+                case 171 /* PropertyAccessExpression */:
+                case 138 /* QualifiedName */:
                 case 9 /* StringLiteral */:
-                case 163 /* StringLiteralType */:
+                case 165 /* StringLiteralType */:
                 case 84 /* FalseKeyword */:
                 case 99 /* TrueKeyword */:
                 case 93 /* NullKeyword */:
                 case 95 /* SuperKeyword */:
                 case 97 /* ThisKeyword */:
-                case 162 /* ThisType */:
+                case 164 /* ThisType */:
                 case 69 /* Identifier */:
                     break;
                 // Cant create the text span
@@ -50672,7 +54168,7 @@ var ts;
                     // If this is name of a module declarations, check if this is right side of dotted module name
                     // If parent of the module declaration which is parent of this node is module declaration and its body is the module declaration that this node is name of
                     // Then this name is name from dotted module
-                    if (nodeForStartPos.parent.parent.kind === 221 /* ModuleDeclaration */ &&
+                    if (nodeForStartPos.parent.parent.kind === 224 /* ModuleDeclaration */ &&
                         nodeForStartPos.parent.parent.body === nodeForStartPos.parent) {
                         // Use parent module declarations name for start pos
                         nodeForStartPos = nodeForStartPos.parent.parent.name;
@@ -50713,10 +54209,10 @@ var ts;
             // That means we're calling back into the host around every 1.2k of the file we process.
             // Lib.d.ts has similar numbers.
             switch (kind) {
-                case 221 /* ModuleDeclaration */:
-                case 217 /* ClassDeclaration */:
-                case 218 /* InterfaceDeclaration */:
-                case 216 /* FunctionDeclaration */:
+                case 224 /* ModuleDeclaration */:
+                case 220 /* ClassDeclaration */:
+                case 221 /* InterfaceDeclaration */:
+                case 219 /* FunctionDeclaration */:
                     cancellationToken.throwIfCancellationRequested();
             }
         }
@@ -50770,7 +54266,7 @@ var ts;
                  */
                 function hasValueSideModule(symbol) {
                     return ts.forEach(symbol.declarations, function (declaration) {
-                        return declaration.kind === 221 /* ModuleDeclaration */ &&
+                        return declaration.kind === 224 /* ModuleDeclaration */ &&
                             ts.getModuleInstanceState(declaration) === 1 /* Instantiated */;
                     });
                 }
@@ -50931,16 +54427,16 @@ var ts;
                     pushClassification(tag.tagName.pos, tag.tagName.end - tag.tagName.pos, 18 /* docCommentTagName */);
                     pos = tag.tagName.end;
                     switch (tag.kind) {
-                        case 270 /* JSDocParameterTag */:
+                        case 274 /* JSDocParameterTag */:
                             processJSDocParameterTag(tag);
                             break;
-                        case 273 /* JSDocTemplateTag */:
+                        case 277 /* JSDocTemplateTag */:
                             processJSDocTemplateTag(tag);
                             break;
-                        case 272 /* JSDocTypeTag */:
+                        case 276 /* JSDocTypeTag */:
                             processElement(tag.typeExpression);
                             break;
-                        case 271 /* JSDocReturnTag */:
+                        case 275 /* JSDocReturnTag */:
                             processElement(tag.typeExpression);
                             break;
                     }
@@ -50998,19 +54494,53 @@ var ts;
                     pushClassification(start, end - start, type);
                 }
             }
-            function classifyTokenOrJsxText(token) {
-                if (ts.nodeIsMissing(token)) {
-                    return;
+            /**
+             * Returns true if node should be treated as classified and no further processing is required.
+             * False will mean that node is not classified and traverse routine should recurse into node contents.
+             */
+            function tryClassifyNode(node) {
+                if (ts.nodeIsMissing(node)) {
+                    return true;
                 }
-                var tokenStart = token.kind === 239 /* JsxText */ ? token.pos : classifyLeadingTriviaAndGetTokenStart(token);
-                var tokenWidth = token.end - tokenStart;
+                var classifiedElementName = tryClassifyJsxElementName(node);
+                if (!ts.isToken(node) && node.kind !== 243 /* JsxText */ && classifiedElementName === undefined) {
+                    return false;
+                }
+                var tokenStart = node.kind === 243 /* JsxText */ ? node.pos : classifyLeadingTriviaAndGetTokenStart(node);
+                var tokenWidth = node.end - tokenStart;
                 ts.Debug.assert(tokenWidth >= 0);
                 if (tokenWidth > 0) {
-                    var type = classifyTokenType(token.kind, token);
+                    var type = classifiedElementName || classifyTokenType(node.kind, node);
                     if (type) {
                         pushClassification(tokenStart, tokenWidth, type);
                     }
                 }
+                return true;
+            }
+            function tryClassifyJsxElementName(token) {
+                switch (token.parent && token.parent.kind) {
+                    case 242 /* JsxOpeningElement */:
+                        if (token.parent.tagName === token) {
+                            return 19 /* jsxOpenTagName */;
+                        }
+                        break;
+                    case 244 /* JsxClosingElement */:
+                        if (token.parent.tagName === token) {
+                            return 20 /* jsxCloseTagName */;
+                        }
+                        break;
+                    case 241 /* JsxSelfClosingElement */:
+                        if (token.parent.tagName === token) {
+                            return 21 /* jsxSelfClosingTagName */;
+                        }
+                        break;
+                    case 245 /* JsxAttribute */:
+                        if (token.parent.name === token) {
+                            return 22 /* jsxAttribute */;
+                        }
+                        break;
+                }
+                return undefined;
             }
             // for accurate classification, the actual token should be passed in.  however, for
             // cases like 'disabled merge code' classification, we just get the token kind and
@@ -51032,17 +54562,17 @@ var ts;
                     if (token) {
                         if (tokenKind === 56 /* EqualsToken */) {
                             // the '=' in a variable declaration is special cased here.
-                            if (token.parent.kind === 214 /* VariableDeclaration */ ||
-                                token.parent.kind === 142 /* PropertyDeclaration */ ||
-                                token.parent.kind === 139 /* Parameter */ ||
-                                token.parent.kind === 241 /* JsxAttribute */) {
+                            if (token.parent.kind === 217 /* VariableDeclaration */ ||
+                                token.parent.kind === 144 /* PropertyDeclaration */ ||
+                                token.parent.kind === 141 /* Parameter */ ||
+                                token.parent.kind === 245 /* JsxAttribute */) {
                                 return 5 /* operator */;
                             }
                         }
-                        if (token.parent.kind === 184 /* BinaryExpression */ ||
-                            token.parent.kind === 182 /* PrefixUnaryExpression */ ||
-                            token.parent.kind === 183 /* PostfixUnaryExpression */ ||
-                            token.parent.kind === 185 /* ConditionalExpression */) {
+                        if (token.parent.kind === 186 /* BinaryExpression */ ||
+                            token.parent.kind === 184 /* PrefixUnaryExpression */ ||
+                            token.parent.kind === 185 /* PostfixUnaryExpression */ ||
+                            token.parent.kind === 187 /* ConditionalExpression */) {
                             return 5 /* operator */;
                         }
                     }
@@ -51051,8 +54581,8 @@ var ts;
                 else if (tokenKind === 8 /* NumericLiteral */) {
                     return 4 /* numericLiteral */;
                 }
-                else if (tokenKind === 9 /* StringLiteral */ || tokenKind === 163 /* StringLiteralType */) {
-                    return token.parent.kind === 241 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */;
+                else if (tokenKind === 9 /* StringLiteral */ || tokenKind === 165 /* StringLiteralType */) {
+                    return token.parent.kind === 245 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */;
                 }
                 else if (tokenKind === 10 /* RegularExpressionLiteral */) {
                     // TODO: we should get another classification type for these literals.
@@ -51062,61 +54592,42 @@ var ts;
                     // TODO (drosen): we should *also* get another classification type for these literals.
                     return 6 /* stringLiteral */;
                 }
-                else if (tokenKind === 239 /* JsxText */) {
+                else if (tokenKind === 243 /* JsxText */) {
                     return 23 /* jsxText */;
                 }
                 else if (tokenKind === 69 /* Identifier */) {
                     if (token) {
                         switch (token.parent.kind) {
-                            case 217 /* ClassDeclaration */:
+                            case 220 /* ClassDeclaration */:
                                 if (token.parent.name === token) {
                                     return 11 /* className */;
                                 }
                                 return;
-                            case 138 /* TypeParameter */:
+                            case 140 /* TypeParameter */:
                                 if (token.parent.name === token) {
                                     return 15 /* typeParameterName */;
                                 }
                                 return;
-                            case 218 /* InterfaceDeclaration */:
+                            case 221 /* InterfaceDeclaration */:
                                 if (token.parent.name === token) {
                                     return 13 /* interfaceName */;
                                 }
                                 return;
-                            case 220 /* EnumDeclaration */:
+                            case 223 /* EnumDeclaration */:
                                 if (token.parent.name === token) {
                                     return 12 /* enumName */;
                                 }
                                 return;
-                            case 221 /* ModuleDeclaration */:
+                            case 224 /* ModuleDeclaration */:
                                 if (token.parent.name === token) {
                                     return 14 /* moduleName */;
                                 }
                                 return;
-                            case 139 /* Parameter */:
+                            case 141 /* Parameter */:
                                 if (token.parent.name === token) {
                                     return 17 /* parameterName */;
                                 }
                                 return;
-                            case 238 /* JsxOpeningElement */:
-                                if (token.parent.tagName === token) {
-                                    return 19 /* jsxOpenTagName */;
-                                }
-                                return;
-                            case 240 /* JsxClosingElement */:
-                                if (token.parent.tagName === token) {
-                                    return 20 /* jsxCloseTagName */;
-                                }
-                                return;
-                            case 237 /* JsxSelfClosingElement */:
-                                if (token.parent.tagName === token) {
-                                    return 21 /* jsxSelfClosingTagName */;
-                                }
-                                return;
-                            case 241 /* JsxAttribute */:
-                                if (token.parent.name === token) {
-                                    return 22 /* jsxAttribute */;
-                                }
                         }
                     }
                     return 2 /* identifier */;
@@ -51132,10 +54643,7 @@ var ts;
                     var children = element.getChildren(sourceFile);
                     for (var i = 0, n = children.length; i < n; i++) {
                         var child = children[i];
-                        if (ts.isToken(child) || child.kind === 239 /* JsxText */) {
-                            classifyTokenOrJsxText(child);
-                        }
-                        else {
+                        if (!tryClassifyNode(child)) {
                             // Recurse into our child nodes.
                             processElement(child);
                         }
@@ -51259,19 +54767,19 @@ var ts;
             var commentOwner;
             findOwner: for (commentOwner = tokenAtPos; commentOwner; commentOwner = commentOwner.parent) {
                 switch (commentOwner.kind) {
-                    case 216 /* FunctionDeclaration */:
-                    case 144 /* MethodDeclaration */:
-                    case 145 /* Constructor */:
-                    case 217 /* ClassDeclaration */:
-                    case 196 /* VariableStatement */:
+                    case 219 /* FunctionDeclaration */:
+                    case 146 /* MethodDeclaration */:
+                    case 147 /* Constructor */:
+                    case 220 /* ClassDeclaration */:
+                    case 199 /* VariableStatement */:
                         break findOwner;
-                    case 251 /* SourceFile */:
+                    case 255 /* SourceFile */:
                         return undefined;
-                    case 221 /* ModuleDeclaration */:
+                    case 224 /* ModuleDeclaration */:
                         // If in walking up the tree, we hit a a nested namespace declaration,
                         // then we must be somewhere within a dotted namespace name; however we don't
                         // want to give back a JSDoc template for the 'b' or 'c' in 'namespace a.b.c { }'.
-                        if (commentOwner.parent.kind === 221 /* ModuleDeclaration */) {
+                        if (commentOwner.parent.kind === 224 /* ModuleDeclaration */) {
                             return undefined;
                         }
                         break findOwner;
@@ -51284,8 +54792,7 @@ var ts;
             var posLineAndChar = sourceFile.getLineAndCharacterOfPosition(position);
             var lineStart = sourceFile.getLineStarts()[posLineAndChar.line];
             var indentationStr = sourceFile.text.substr(lineStart, posLineAndChar.character);
-            // TODO: call a helper method instead once PR #4133 gets merged in.
-            var newLine = host.getNewLine ? host.getNewLine() : "\r\n";
+            var newLine = ts.getNewLineOrDefaultFromHost(host);
             var docParams = "";
             for (var i = 0, numParams = parameters.length; i < numParams; i++) {
                 var currentName = parameters[i].name;
@@ -51313,7 +54820,7 @@ var ts;
             if (ts.isFunctionLike(commentOwner)) {
                 return commentOwner.parameters;
             }
-            if (commentOwner.kind === 196 /* VariableStatement */) {
+            if (commentOwner.kind === 199 /* VariableStatement */) {
                 var varStatement = commentOwner;
                 var varDeclarations = varStatement.declarationList.declarations;
                 if (varDeclarations.length === 1 && varDeclarations[0].initializer) {
@@ -51331,17 +54838,17 @@ var ts;
          * @returns the parameters of a signature found on the RHS if one exists; otherwise 'emptyArray'.
          */
         function getParametersFromRightHandSideOfAssignment(rightHandSide) {
-            while (rightHandSide.kind === 175 /* ParenthesizedExpression */) {
+            while (rightHandSide.kind === 177 /* ParenthesizedExpression */) {
                 rightHandSide = rightHandSide.expression;
             }
             switch (rightHandSide.kind) {
-                case 176 /* FunctionExpression */:
-                case 177 /* ArrowFunction */:
+                case 178 /* FunctionExpression */:
+                case 179 /* ArrowFunction */:
                     return rightHandSide.parameters;
-                case 189 /* ClassExpression */:
+                case 191 /* ClassExpression */:
                     for (var _i = 0, _a = rightHandSide.members; _i < _a.length; _i++) {
                         var member = _a[_i];
-                        if (member.kind === 145 /* Constructor */) {
+                        if (member.kind === 147 /* Constructor */) {
                             return member.parameters;
                         }
                     }
@@ -51363,7 +54870,7 @@ var ts;
             var result = [];
             if (descriptors.length > 0) {
                 var regExp = getTodoCommentsRegExp();
-                var matchArray;
+                var matchArray = void 0;
                 while (matchArray = regExp.exec(fileContents)) {
                     cancellationToken.throwIfCancellationRequested();
                     // If we got a match, here is what the match array will look like.  Say the source text is:
@@ -51434,11 +54941,11 @@ var ts;
                 // comment portion.
                 var singleLineCommentStart = /(?:\/\/+\s*)/.source;
                 var multiLineCommentStart = /(?:\/\*+\s*)/.source;
-                var anyNumberOfSpacesAndAsterixesAtStartOfLine = /(?:^(?:\s|\*)*)/.source;
+                var anyNumberOfSpacesAndAsterisksAtStartOfLine = /(?:^(?:\s|\*)*)/.source;
                 // Match any of the above three TODO comment start regexps.
                 // Note that the outermost group *is* a capture group.  We want to capture the preamble
                 // so that we can determine the starting position of the TODO comment match.
-                var preamble = "(" + anyNumberOfSpacesAndAsterixesAtStartOfLine + "|" + singleLineCommentStart + "|" + multiLineCommentStart + ")";
+                var preamble = "(" + anyNumberOfSpacesAndAsterisksAtStartOfLine + "|" + singleLineCommentStart + "|" + multiLineCommentStart + ")";
                 // Takes the descriptors and forms a regexp that matches them as if they were literals.
                 // For example, if the descriptors are "TODO(jason)" and "HACK", then this will be:
                 //
@@ -51489,14 +54996,14 @@ var ts;
                         var defaultLibFileName = host.getDefaultLibFileName(host.getCompilationSettings());
                         var canonicalDefaultLibName = getCanonicalFileName(ts.normalizePath(defaultLibFileName));
                         if (defaultLibFileName) {
-                            for (var _i = 0, declarations_10 = declarations; _i < declarations_10.length; _i++) {
-                                var current = declarations_10[_i];
-                                var sourceFile_2 = current.getSourceFile();
+                            for (var _i = 0, declarations_11 = declarations; _i < declarations_11.length; _i++) {
+                                var current = declarations_11[_i];
+                                var sourceFile_3 = current.getSourceFile();
                                 // TODO (drosen): When is there no source file?
-                                if (!sourceFile_2) {
+                                if (!sourceFile_3) {
                                     continue;
                                 }
-                                var canonicalName = getCanonicalFileName(ts.normalizePath(sourceFile_2.fileName));
+                                var canonicalName = getCanonicalFileName(ts.normalizePath(sourceFile_3.fileName));
                                 if (canonicalName === canonicalDefaultLibName) {
                                     return getRenameInfoError(ts.getLocaleSpecificMessage(ts.Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library));
                                 }
@@ -51566,7 +55073,7 @@ var ts;
             getFormattingEditsAfterKeystroke: getFormattingEditsAfterKeystroke,
             getDocCommentTemplateAtPosition: getDocCommentTemplateAtPosition,
             getEmitOutput: getEmitOutput,
-            getSourceFile: getSourceFile,
+            getNonBoundSourceFile: getNonBoundSourceFile,
             getProgram: getProgram
         };
     }
@@ -51586,7 +55093,7 @@ var ts;
         function walk(node) {
             switch (node.kind) {
                 case 69 /* Identifier */:
-                    nameTable[node.text] = node.text;
+                    nameTable[node.text] = nameTable[node.text] === undefined ? node.pos : -1;
                     break;
                 case 9 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
@@ -51595,9 +55102,9 @@ var ts;
                     // then we want 'something' to be in the name table.  Similarly, if we have
                     // "a['propname']" then we want to store "propname" in the name table.
                     if (ts.isDeclarationName(node) ||
-                        node.parent.kind === 235 /* ExternalModuleReference */ ||
+                        node.parent.kind === 239 /* ExternalModuleReference */ ||
                         isArgumentOfElementAccessExpression(node)) {
-                        nameTable[node.text] = node.text;
+                        nameTable[node.text] = nameTable[node.text] === undefined ? node.pos : -1;
                     }
                     break;
                 default:
@@ -51608,7 +55115,7 @@ var ts;
     function isArgumentOfElementAccessExpression(node) {
         return node &&
             node.parent &&
-            node.parent.kind === 170 /* ElementAccessExpression */ &&
+            node.parent.kind === 172 /* ElementAccessExpression */ &&
             node.parent.argumentExpression === node;
     }
     /// Classifier
@@ -51656,7 +55163,7 @@ var ts;
         function canFollow(keyword1, keyword2) {
             if (ts.isAccessibilityModifier(keyword1)) {
                 if (keyword2 === 123 /* GetKeyword */ ||
-                    keyword2 === 129 /* SetKeyword */ ||
+                    keyword2 === 130 /* SetKeyword */ ||
                     keyword2 === 121 /* ConstructorKeyword */ ||
                     keyword2 === 113 /* StaticKeyword */) {
                     // Allow things like "public get", "public constructor" and "public static".
@@ -51815,10 +55322,10 @@ var ts;
                         angleBracketStack--;
                     }
                     else if (token === 117 /* AnyKeyword */ ||
-                        token === 130 /* StringKeyword */ ||
-                        token === 128 /* NumberKeyword */ ||
+                        token === 131 /* StringKeyword */ ||
+                        token === 129 /* NumberKeyword */ ||
                         token === 120 /* BooleanKeyword */ ||
-                        token === 131 /* SymbolKeyword */) {
+                        token === 132 /* SymbolKeyword */) {
                         if (angleBracketStack > 0 && !syntacticClassifierAbsent) {
                             // If it looks like we're could be in something generic, don't classify this
                             // as a keyword.  We may just get overwritten by the syntactic classifier,
@@ -51867,7 +55374,7 @@ var ts;
                 var end = scanner.getTextPos();
                 addResult(start, end, classFromKind(token));
                 if (end >= text.length) {
-                    if (token === 9 /* StringLiteral */ || token === 163 /* StringLiteralType */) {
+                    if (token === 9 /* StringLiteral */ || token === 165 /* StringLiteralType */) {
                         // Check to see if we finished up on a multiline string literal.
                         var tokenText = scanner.getTokenText();
                         if (scanner.isUnterminated()) {
@@ -51990,7 +55497,7 @@ var ts;
             }
         }
         function isKeyword(token) {
-            return token >= 70 /* FirstKeyword */ && token <= 135 /* LastKeyword */;
+            return token >= 70 /* FirstKeyword */ && token <= 137 /* LastKeyword */;
         }
         function classFromKind(token) {
             if (isKeyword(token)) {
@@ -52006,7 +55513,7 @@ var ts;
                 case 8 /* NumericLiteral */:
                     return 4 /* numericLiteral */;
                 case 9 /* StringLiteral */:
-                case 163 /* StringLiteralType */:
+                case 165 /* StringLiteralType */:
                     return 6 /* stringLiteral */;
                 case 10 /* RegularExpressionLiteral */:
                     return 7 /* regularExpressionLiteral */;
@@ -52068,7 +55575,7 @@ var ts;
          */
         function spanInSourceFileAtLocation(sourceFile, position) {
             // Cannot set breakpoint in dts file
-            if (sourceFile.flags & 4096 /* DeclarationFile */) {
+            if (sourceFile.isDeclarationFile) {
                 return undefined;
             }
             var tokenAtLocation = ts.getTokenAtPosition(sourceFile, position);
@@ -52118,113 +55625,113 @@ var ts;
             function spanInNode(node) {
                 if (node) {
                     switch (node.kind) {
-                        case 196 /* VariableStatement */:
+                        case 199 /* VariableStatement */:
                             // Span on first variable declaration
                             return spanInVariableDeclaration(node.declarationList.declarations[0]);
-                        case 214 /* VariableDeclaration */:
-                        case 142 /* PropertyDeclaration */:
-                        case 141 /* PropertySignature */:
+                        case 217 /* VariableDeclaration */:
+                        case 144 /* PropertyDeclaration */:
+                        case 143 /* PropertySignature */:
                             return spanInVariableDeclaration(node);
-                        case 139 /* Parameter */:
+                        case 141 /* Parameter */:
                             return spanInParameterDeclaration(node);
-                        case 216 /* FunctionDeclaration */:
-                        case 144 /* MethodDeclaration */:
-                        case 143 /* MethodSignature */:
-                        case 146 /* GetAccessor */:
-                        case 147 /* SetAccessor */:
-                        case 145 /* Constructor */:
-                        case 176 /* FunctionExpression */:
-                        case 177 /* ArrowFunction */:
+                        case 219 /* FunctionDeclaration */:
+                        case 146 /* MethodDeclaration */:
+                        case 145 /* MethodSignature */:
+                        case 148 /* GetAccessor */:
+                        case 149 /* SetAccessor */:
+                        case 147 /* Constructor */:
+                        case 178 /* FunctionExpression */:
+                        case 179 /* ArrowFunction */:
                             return spanInFunctionDeclaration(node);
-                        case 195 /* Block */:
+                        case 198 /* Block */:
                             if (ts.isFunctionBlock(node)) {
                                 return spanInFunctionBlock(node);
                             }
                         // Fall through
-                        case 222 /* ModuleBlock */:
+                        case 225 /* ModuleBlock */:
                             return spanInBlock(node);
-                        case 247 /* CatchClause */:
+                        case 251 /* CatchClause */:
                             return spanInBlock(node.block);
-                        case 198 /* ExpressionStatement */:
+                        case 201 /* ExpressionStatement */:
                             // span on the expression
                             return textSpan(node.expression);
-                        case 207 /* ReturnStatement */:
+                        case 210 /* ReturnStatement */:
                             // span on return keyword and expression if present
                             return textSpan(node.getChildAt(0), node.expression);
-                        case 201 /* WhileStatement */:
+                        case 204 /* WhileStatement */:
                             // Span on while(...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 200 /* DoStatement */:
+                        case 203 /* DoStatement */:
                             // span in statement of the do statement
                             return spanInNode(node.statement);
-                        case 213 /* DebuggerStatement */:
+                        case 216 /* DebuggerStatement */:
                             // span on debugger keyword
                             return textSpan(node.getChildAt(0));
-                        case 199 /* IfStatement */:
+                        case 202 /* IfStatement */:
                             // set on if(..) span
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 210 /* LabeledStatement */:
+                        case 213 /* LabeledStatement */:
                             // span in statement
                             return spanInNode(node.statement);
-                        case 206 /* BreakStatement */:
-                        case 205 /* ContinueStatement */:
+                        case 209 /* BreakStatement */:
+                        case 208 /* ContinueStatement */:
                             // On break or continue keyword and label if present
                             return textSpan(node.getChildAt(0), node.label);
-                        case 202 /* ForStatement */:
+                        case 205 /* ForStatement */:
                             return spanInForStatement(node);
-                        case 203 /* ForInStatement */:
+                        case 206 /* ForInStatement */:
                             // span of for (a in ...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 204 /* ForOfStatement */:
+                        case 207 /* ForOfStatement */:
                             // span in initializer
                             return spanInInitializerOfForLike(node);
-                        case 209 /* SwitchStatement */:
+                        case 212 /* SwitchStatement */:
                             // span on switch(...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 244 /* CaseClause */:
-                        case 245 /* DefaultClause */:
+                        case 248 /* CaseClause */:
+                        case 249 /* DefaultClause */:
                             // span in first statement of the clause
                             return spanInNode(node.statements[0]);
-                        case 212 /* TryStatement */:
+                        case 215 /* TryStatement */:
                             // span in try block
                             return spanInBlock(node.tryBlock);
-                        case 211 /* ThrowStatement */:
+                        case 214 /* ThrowStatement */:
                             // span in throw ...
                             return textSpan(node, node.expression);
-                        case 230 /* ExportAssignment */:
+                        case 234 /* ExportAssignment */:
                             // span on export = id
                             return textSpan(node, node.expression);
-                        case 224 /* ImportEqualsDeclaration */:
+                        case 228 /* ImportEqualsDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleReference);
-                        case 225 /* ImportDeclaration */:
+                        case 229 /* ImportDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleSpecifier);
-                        case 231 /* ExportDeclaration */:
+                        case 235 /* ExportDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleSpecifier);
-                        case 221 /* ModuleDeclaration */:
+                        case 224 /* ModuleDeclaration */:
                             // span on complete module if it is instantiated
                             if (ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
-                        case 217 /* ClassDeclaration */:
-                        case 220 /* EnumDeclaration */:
-                        case 250 /* EnumMember */:
-                        case 166 /* BindingElement */:
+                        case 220 /* ClassDeclaration */:
+                        case 223 /* EnumDeclaration */:
+                        case 254 /* EnumMember */:
+                        case 168 /* BindingElement */:
                             // span on complete node
                             return textSpan(node);
-                        case 208 /* WithStatement */:
+                        case 211 /* WithStatement */:
                             // span in statement
                             return spanInNode(node.statement);
-                        case 140 /* Decorator */:
+                        case 142 /* Decorator */:
                             return spanInNodeArray(node.parent.decorators);
-                        case 164 /* ObjectBindingPattern */:
-                        case 165 /* ArrayBindingPattern */:
+                        case 166 /* ObjectBindingPattern */:
+                        case 167 /* ArrayBindingPattern */:
                             return spanInBindingPattern(node);
                         // No breakpoint in interface, type alias
-                        case 218 /* InterfaceDeclaration */:
-                        case 219 /* TypeAliasDeclaration */:
+                        case 221 /* InterfaceDeclaration */:
+                        case 222 /* TypeAliasDeclaration */:
                             return undefined;
                         // Tokens:
                         case 23 /* SemicolonToken */:
@@ -52254,7 +55761,7 @@ var ts;
                         case 72 /* CatchKeyword */:
                         case 85 /* FinallyKeyword */:
                             return spanInNextNode(node);
-                        case 135 /* OfKeyword */:
+                        case 137 /* OfKeyword */:
                             return spanInOfKeyword(node);
                         default:
                             // Destructuring pattern in destructuring assignment
@@ -52267,13 +55774,13 @@ var ts;
                             // a or ...c  or d: x from 
                             // [a, b, ...c] or { a, b } or { d: x } from destructuring pattern
                             if ((node.kind === 69 /* Identifier */ ||
-                                node.kind == 188 /* SpreadElementExpression */ ||
-                                node.kind === 248 /* PropertyAssignment */ ||
-                                node.kind === 249 /* ShorthandPropertyAssignment */) &&
+                                node.kind == 190 /* SpreadElementExpression */ ||
+                                node.kind === 252 /* PropertyAssignment */ ||
+                                node.kind === 253 /* ShorthandPropertyAssignment */) &&
                                 ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent)) {
                                 return textSpan(node);
                             }
-                            if (node.kind === 184 /* BinaryExpression */) {
+                            if (node.kind === 186 /* BinaryExpression */) {
                                 var binaryExpression = node;
                                 // Set breakpoint in destructuring pattern if its destructuring assignment
                                 // [a, b, c] or {a, b, c} of
@@ -52296,22 +55803,22 @@ var ts;
                             }
                             if (ts.isExpression(node)) {
                                 switch (node.parent.kind) {
-                                    case 200 /* DoStatement */:
+                                    case 203 /* DoStatement */:
                                         // Set span as if on while keyword
                                         return spanInPreviousNode(node);
-                                    case 140 /* Decorator */:
+                                    case 142 /* Decorator */:
                                         // Set breakpoint on the decorator emit
                                         return spanInNode(node.parent);
-                                    case 202 /* ForStatement */:
-                                    case 204 /* ForOfStatement */:
+                                    case 205 /* ForStatement */:
+                                    case 207 /* ForOfStatement */:
                                         return textSpan(node);
-                                    case 184 /* BinaryExpression */:
+                                    case 186 /* BinaryExpression */:
                                         if (node.parent.operatorToken.kind === 24 /* CommaToken */) {
                                             // if this is comma expression, the breakpoint is possible in this expression
                                             return textSpan(node);
                                         }
                                         break;
-                                    case 177 /* ArrowFunction */:
+                                    case 179 /* ArrowFunction */:
                                         if (node.parent.body === node) {
                                             // If this is body of arrow function, it is allowed to have the breakpoint
                                             return textSpan(node);
@@ -52320,13 +55827,13 @@ var ts;
                                 }
                             }
                             // If this is name of property assignment, set breakpoint in the initializer
-                            if (node.parent.kind === 248 /* PropertyAssignment */ &&
+                            if (node.parent.kind === 252 /* PropertyAssignment */ &&
                                 node.parent.name === node &&
                                 !ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.parent)) {
                                 return spanInNode(node.parent.initializer);
                             }
                             // Breakpoint in type assertion goes to its operand
-                            if (node.parent.kind === 174 /* TypeAssertionExpression */ && node.parent.type === node) {
+                            if (node.parent.kind === 176 /* TypeAssertionExpression */ && node.parent.type === node) {
                                 return spanInNextNode(node.parent.type);
                             }
                             // return type of function go to previous token
@@ -52334,8 +55841,8 @@ var ts;
                                 return spanInPreviousNode(node);
                             }
                             // initializer of variable/parameter declaration go to previous node
-                            if ((node.parent.kind === 214 /* VariableDeclaration */ ||
-                                node.parent.kind === 139 /* Parameter */)) {
+                            if ((node.parent.kind === 217 /* VariableDeclaration */ ||
+                                node.parent.kind === 141 /* Parameter */)) {
                                 var paramOrVarDecl = node.parent;
                                 if (paramOrVarDecl.initializer === node ||
                                     paramOrVarDecl.type === node ||
@@ -52343,7 +55850,7 @@ var ts;
                                     return spanInPreviousNode(node);
                                 }
                             }
-                            if (node.parent.kind === 184 /* BinaryExpression */) {
+                            if (node.parent.kind === 186 /* BinaryExpression */) {
                                 var binaryExpression = node.parent;
                                 if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(binaryExpression.left) &&
                                     (binaryExpression.right === node ||
@@ -52369,7 +55876,7 @@ var ts;
                 }
                 function spanInVariableDeclaration(variableDeclaration) {
                     // If declaration of for in statement, just set the span in parent
-                    if (variableDeclaration.parent.parent.kind === 203 /* ForInStatement */) {
+                    if (variableDeclaration.parent.parent.kind === 206 /* ForInStatement */) {
                         return spanInNode(variableDeclaration.parent.parent);
                     }
                     // If this is a destructuring pattern set breakpoint in binding pattern
@@ -52379,8 +55886,8 @@ var ts;
                     // Breakpoint is possible in variableDeclaration only if there is initialization
                     // or its declaration from 'for of'
                     if (variableDeclaration.initializer ||
-                        (variableDeclaration.flags & 2 /* Export */) ||
-                        variableDeclaration.parent.parent.kind === 204 /* ForOfStatement */) {
+                        (variableDeclaration.flags & 1 /* Export */) ||
+                        variableDeclaration.parent.parent.kind === 207 /* ForOfStatement */) {
                         return textSpanFromVariableDeclaration(variableDeclaration);
                     }
                     var declarations = variableDeclaration.parent.declarations;
@@ -52395,7 +55902,7 @@ var ts;
                 function canHaveSpanInParameterDeclaration(parameter) {
                     // 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 & 8 /* Public */) || !!(parameter.flags & 16 /* Private */);
+                        !!(parameter.flags & 4 /* Public */) || !!(parameter.flags & 8 /* Private */);
                 }
                 function spanInParameterDeclaration(parameter) {
                     if (ts.isBindingPattern(parameter.name)) {
@@ -52419,8 +55926,8 @@ var ts;
                     }
                 }
                 function canFunctionHaveSpanInWholeDeclaration(functionDeclaration) {
-                    return !!(functionDeclaration.flags & 2 /* Export */) ||
-                        (functionDeclaration.parent.kind === 217 /* ClassDeclaration */ && functionDeclaration.kind !== 145 /* Constructor */);
+                    return !!(functionDeclaration.flags & 1 /* Export */) ||
+                        (functionDeclaration.parent.kind === 220 /* ClassDeclaration */ && functionDeclaration.kind !== 147 /* Constructor */);
                 }
                 function spanInFunctionDeclaration(functionDeclaration) {
                     // No breakpoints in the function signature
@@ -52443,34 +55950,34 @@ var ts;
                 }
                 function spanInBlock(block) {
                     switch (block.parent.kind) {
-                        case 221 /* ModuleDeclaration */:
+                        case 224 /* ModuleDeclaration */:
                             if (ts.getModuleInstanceState(block.parent) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
                         // Set on parent if on same line otherwise on first statement
-                        case 201 /* WhileStatement */:
-                        case 199 /* IfStatement */:
-                        case 203 /* ForInStatement */:
+                        case 204 /* WhileStatement */:
+                        case 202 /* IfStatement */:
+                        case 206 /* ForInStatement */:
                             return spanInNodeIfStartsOnSameLine(block.parent, block.statements[0]);
                         // Set span on previous token if it starts on same line otherwise on the first statement of the block
-                        case 202 /* ForStatement */:
-                        case 204 /* ForOfStatement */:
+                        case 205 /* ForStatement */:
+                        case 207 /* ForOfStatement */:
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(block.pos, sourceFile, block.parent), block.statements[0]);
                     }
                     // Default action is to set on first statement
                     return spanInNode(block.statements[0]);
                 }
-                function spanInInitializerOfForLike(forLikeStaement) {
-                    if (forLikeStaement.initializer.kind === 215 /* VariableDeclarationList */) {
+                function spanInInitializerOfForLike(forLikeStatement) {
+                    if (forLikeStatement.initializer.kind === 218 /* VariableDeclarationList */) {
                         // declaration list, set breakpoint in first declaration
-                        var variableDeclarationList = forLikeStaement.initializer;
+                        var variableDeclarationList = forLikeStatement.initializer;
                         if (variableDeclarationList.declarations.length > 0) {
                             return spanInNode(variableDeclarationList.declarations[0]);
                         }
                     }
                     else {
                         // Expression - set breakpoint in it
-                        return spanInNode(forLikeStaement.initializer);
+                        return spanInNode(forLikeStatement.initializer);
                     }
                 }
                 function spanInForStatement(forStatement) {
@@ -52486,23 +55993,23 @@ var ts;
                 }
                 function spanInBindingPattern(bindingPattern) {
                     // Set breakpoint in first binding element
-                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 190 /* OmittedExpression */ ? element : undefined; });
+                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 192 /* OmittedExpression */ ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
                     // Empty binding pattern of binding element, set breakpoint on binding element
-                    if (bindingPattern.parent.kind === 166 /* BindingElement */) {
+                    if (bindingPattern.parent.kind === 168 /* BindingElement */) {
                         return textSpan(bindingPattern.parent);
                     }
                     // Variable declaration is used as the span
                     return textSpanFromVariableDeclaration(bindingPattern.parent);
                 }
                 function spanInArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-                    ts.Debug.assert(node.kind !== 165 /* ArrayBindingPattern */ && node.kind !== 164 /* ObjectBindingPattern */);
-                    var elements = node.kind === 167 /* ArrayLiteralExpression */ ?
+                    ts.Debug.assert(node.kind !== 167 /* ArrayBindingPattern */ && node.kind !== 166 /* ObjectBindingPattern */);
+                    var elements = node.kind === 169 /* ArrayLiteralExpression */ ?
                         node.elements :
                         node.properties;
-                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 190 /* OmittedExpression */ ? element : undefined; });
+                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 192 /* OmittedExpression */ ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
@@ -52510,18 +56017,18 @@ var ts;
                     // just nested element in another destructuring assignment
                     // set breakpoint on assignment when parent is destructuring assignment
                     // Otherwise set breakpoint for this element
-                    return textSpan(node.parent.kind === 184 /* BinaryExpression */ ? node.parent : node);
+                    return textSpan(node.parent.kind === 186 /* BinaryExpression */ ? node.parent : node);
                 }
                 // Tokens:
                 function spanInOpenBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 220 /* EnumDeclaration */:
+                        case 223 /* EnumDeclaration */:
                             var enumDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), enumDeclaration.members.length ? enumDeclaration.members[0] : enumDeclaration.getLastToken(sourceFile));
-                        case 217 /* ClassDeclaration */:
+                        case 220 /* ClassDeclaration */:
                             var classDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), classDeclaration.members.length ? classDeclaration.members[0] : classDeclaration.getLastToken(sourceFile));
-                        case 223 /* CaseBlock */:
+                        case 226 /* CaseBlock */:
                             return spanInNodeIfStartsOnSameLine(node.parent.parent, node.parent.clauses[0]);
                     }
                     // Default to parent node
@@ -52529,24 +56036,24 @@ var ts;
                 }
                 function spanInCloseBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 222 /* ModuleBlock */:
+                        case 225 /* ModuleBlock */:
                             // If this is not instantiated module block no bp span
                             if (ts.getModuleInstanceState(node.parent.parent) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
-                        case 220 /* EnumDeclaration */:
-                        case 217 /* ClassDeclaration */:
+                        case 223 /* EnumDeclaration */:
+                        case 220 /* ClassDeclaration */:
                             // Span on close brace token
                             return textSpan(node);
-                        case 195 /* Block */:
+                        case 198 /* Block */:
                             if (ts.isFunctionBlock(node.parent)) {
                                 // Span on close brace token
                                 return textSpan(node);
                             }
                         // fall through.
-                        case 247 /* CatchClause */:
+                        case 251 /* CatchClause */:
                             return spanInNode(ts.lastOrUndefined(node.parent.statements));
-                        case 223 /* CaseBlock */:
+                        case 226 /* CaseBlock */:
                             // breakpoint in last statement of the last clause
                             var caseBlock = node.parent;
                             var lastClause = ts.lastOrUndefined(caseBlock.clauses);
@@ -52554,7 +56061,7 @@ var ts;
                                 return spanInNode(ts.lastOrUndefined(lastClause.statements));
                             }
                             return undefined;
-                        case 164 /* ObjectBindingPattern */:
+                        case 166 /* ObjectBindingPattern */:
                             // Breakpoint in last binding element or binding pattern if it contains no elements
                             var bindingPattern = node.parent;
                             return spanInNode(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern);
@@ -52570,7 +56077,7 @@ var ts;
                 }
                 function spanInCloseBracketToken(node) {
                     switch (node.parent.kind) {
-                        case 165 /* ArrayBindingPattern */:
+                        case 167 /* ArrayBindingPattern */:
                             // Breakpoint in last binding element or binding pattern if it contains no elements
                             var bindingPattern = node.parent;
                             return textSpan(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern);
@@ -52585,12 +56092,12 @@ var ts;
                     }
                 }
                 function spanInOpenParenToken(node) {
-                    if (node.parent.kind === 200 /* DoStatement */ ||
-                        node.parent.kind === 171 /* CallExpression */ ||
-                        node.parent.kind === 172 /* NewExpression */) {
+                    if (node.parent.kind === 203 /* DoStatement */ ||
+                        node.parent.kind === 173 /* CallExpression */ ||
+                        node.parent.kind === 174 /* NewExpression */) {
                         return spanInPreviousNode(node);
                     }
-                    if (node.parent.kind === 175 /* ParenthesizedExpression */) {
+                    if (node.parent.kind === 177 /* ParenthesizedExpression */) {
                         return spanInNextNode(node);
                     }
                     // Default to parent node
@@ -52599,21 +56106,21 @@ var ts;
                 function spanInCloseParenToken(node) {
                     // Is this close paren token of parameter list, set span in previous token
                     switch (node.parent.kind) {
-                        case 176 /* FunctionExpression */:
-                        case 216 /* FunctionDeclaration */:
-                        case 177 /* ArrowFunction */:
-                        case 144 /* MethodDeclaration */:
-                        case 143 /* MethodSignature */:
-                        case 146 /* GetAccessor */:
-                        case 147 /* SetAccessor */:
-                        case 145 /* Constructor */:
-                        case 201 /* WhileStatement */:
-                        case 200 /* DoStatement */:
-                        case 202 /* ForStatement */:
-                        case 204 /* ForOfStatement */:
-                        case 171 /* CallExpression */:
-                        case 172 /* NewExpression */:
-                        case 175 /* ParenthesizedExpression */:
+                        case 178 /* FunctionExpression */:
+                        case 219 /* FunctionDeclaration */:
+                        case 179 /* ArrowFunction */:
+                        case 146 /* MethodDeclaration */:
+                        case 145 /* MethodSignature */:
+                        case 148 /* GetAccessor */:
+                        case 149 /* SetAccessor */:
+                        case 147 /* Constructor */:
+                        case 204 /* WhileStatement */:
+                        case 203 /* DoStatement */:
+                        case 205 /* ForStatement */:
+                        case 207 /* ForOfStatement */:
+                        case 173 /* CallExpression */:
+                        case 174 /* NewExpression */:
+                        case 177 /* ParenthesizedExpression */:
                             return spanInPreviousNode(node);
                         // Default to parent node
                         default:
@@ -52623,20 +56130,20 @@ var ts;
                 function spanInColonToken(node) {
                     // Is this : specifying return annotation of the function declaration
                     if (ts.isFunctionLike(node.parent) ||
-                        node.parent.kind === 248 /* PropertyAssignment */ ||
-                        node.parent.kind === 139 /* Parameter */) {
+                        node.parent.kind === 252 /* PropertyAssignment */ ||
+                        node.parent.kind === 141 /* Parameter */) {
                         return spanInPreviousNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInGreaterThanOrLessThanToken(node) {
-                    if (node.parent.kind === 174 /* TypeAssertionExpression */) {
+                    if (node.parent.kind === 176 /* TypeAssertionExpression */) {
                         return spanInNextNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInWhileKeyword(node) {
-                    if (node.parent.kind === 200 /* DoStatement */) {
+                    if (node.parent.kind === 203 /* DoStatement */) {
                         // Set span on while expression
                         return textSpanEndingAtNextToken(node, node.parent.expression);
                     }
@@ -52644,7 +56151,7 @@ var ts;
                     return spanInNode(node.parent);
                 }
                 function spanInOfKeyword(node) {
-                    if (node.parent.kind === 204 /* ForOfStatement */) {
+                    if (node.parent.kind === 207 /* ForOfStatement */) {
                         // set using next token
                         return spanInNextNode(node);
                     }
@@ -52733,6 +56240,12 @@ var ts;
             if ("directoryExists" in this.shimHost) {
                 this.directoryExists = function (directoryName) { return _this.shimHost.directoryExists(directoryName); };
             }
+            if ("getTypeReferenceDirectiveResolutionsForFile" in this.shimHost) {
+                this.resolveTypeReferenceDirectives = function (typeDirectiveNames, containingFile) {
+                    var typeDirectivesForFile = JSON.parse(_this.shimHost.getTypeReferenceDirectiveResolutionsForFile(containingFile));
+                    return ts.map(typeDirectiveNames, function (name) { return ts.lookUp(typeDirectivesForFile, name); });
+                };
+            }
         }
         LanguageServiceShimHostAdapter.prototype.log = function (s) {
             if (this.loggingEnabled) {
@@ -52773,6 +56286,14 @@ var ts;
             var scriptSnapshot = this.shimHost.getScriptSnapshot(fileName);
             return scriptSnapshot && new ScriptSnapshotShimAdapter(scriptSnapshot);
         };
+        LanguageServiceShimHostAdapter.prototype.getScriptKind = function (fileName) {
+            if ("getScriptKind" in this.shimHost) {
+                return this.shimHost.getScriptKind(fileName);
+            }
+            else {
+                return 0 /* Unknown */;
+            }
+        };
         LanguageServiceShimHostAdapter.prototype.getScriptVersion = function (fileName) {
             return this.shimHost.getScriptVersion(fileName);
         };
@@ -52831,8 +56352,16 @@ var ts;
                 this.directoryExists = function (directoryName) { return _this.shimHost.directoryExists(directoryName); };
             }
         }
-        CoreServicesShimHostAdapter.prototype.readDirectory = function (rootDir, extension, exclude) {
-            var encoded = this.shimHost.readDirectory(rootDir, extension, JSON.stringify(exclude));
+        CoreServicesShimHostAdapter.prototype.readDirectory = function (rootDir, extension, exclude, depth) {
+            // Wrap the API changes for 2.0 release. This try/catch
+            // should be removed once TypeScript 2.0 has shipped.
+            var encoded;
+            try {
+                encoded = this.shimHost.readDirectory(rootDir, extension, JSON.stringify(exclude), depth);
+            }
+            catch (e) {
+                encoded = this.shimHost.readDirectory(rootDir, extension, JSON.stringify(exclude));
+            }
             return JSON.parse(encoded);
         };
         CoreServicesShimHostAdapter.prototype.fileExists = function (fileName) {
@@ -53079,7 +56608,7 @@ var ts;
             var _this = this;
             return this.forwardJSONCall("getDocumentHighlights('" + fileName + "', " + position + ")", function () {
                 var results = _this.languageService.getDocumentHighlights(fileName, position, JSON.parse(filesToSearch));
-                // workaround for VS document higlighting issue - keep only items from the initial file
+                // workaround for VS document highlighting issue - keep only items from the initial file
                 var normalizedName = ts.normalizeSlashes(fileName).toLowerCase();
                 return ts.filter(results, function (r) { return ts.normalizeSlashes(r.fileName).toLowerCase() === normalizedName; });
             });
@@ -53200,33 +56729,47 @@ var ts;
                 };
             });
         };
+        CoreServicesShimObject.prototype.resolveTypeReferenceDirective = function (fileName, typeReferenceDirective, compilerOptionsJson) {
+            var _this = this;
+            return this.forwardJSONCall("resolveTypeReferenceDirective(" + fileName + ")", function () {
+                var compilerOptions = JSON.parse(compilerOptionsJson);
+                var result = ts.resolveTypeReferenceDirective(typeReferenceDirective, ts.normalizeSlashes(fileName), compilerOptions, _this.host);
+                return {
+                    resolvedFileName: result.resolvedTypeReferenceDirective ? result.resolvedTypeReferenceDirective.resolvedFileName : undefined,
+                    primary: result.resolvedTypeReferenceDirective ? result.resolvedTypeReferenceDirective.primary : true,
+                    failedLookupLocations: result.failedLookupLocations
+                };
+            });
+        };
         CoreServicesShimObject.prototype.getPreProcessedFileInfo = function (fileName, sourceTextSnapshot) {
+            var _this = this;
             return this.forwardJSONCall("getPreProcessedFileInfo('" + fileName + "')", function () {
                 // for now treat files as JavaScript 
                 var result = ts.preProcessFile(sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength()), /* readImportFiles */ true, /* detectJavaScriptImports */ true);
-                var convertResult = {
-                    referencedFiles: [],
-                    importedFiles: [],
+                return {
+                    referencedFiles: _this.convertFileReferences(result.referencedFiles),
+                    importedFiles: _this.convertFileReferences(result.importedFiles),
                     ambientExternalModules: result.ambientExternalModules,
-                    isLibFile: result.isLibFile
+                    isLibFile: result.isLibFile,
+                    typeReferenceDirectives: _this.convertFileReferences(result.typeReferenceDirectives)
                 };
-                ts.forEach(result.referencedFiles, function (refFile) {
-                    convertResult.referencedFiles.push({
-                        path: ts.normalizePath(refFile.fileName),
-                        position: refFile.pos,
-                        length: refFile.end - refFile.pos
-                    });
-                });
-                ts.forEach(result.importedFiles, function (importedFile) {
-                    convertResult.importedFiles.push({
-                        path: ts.normalizeSlashes(importedFile.fileName),
-                        position: importedFile.pos,
-                        length: importedFile.end - importedFile.pos
-                    });
-                });
-                return convertResult;
             });
         };
+        CoreServicesShimObject.prototype.convertFileReferences = function (refs) {
+            if (!refs) {
+                return undefined;
+            }
+            var result = [];
+            for (var _i = 0, refs_2 = refs; _i < refs_2.length; _i++) {
+                var ref = refs_2[_i];
+                result.push({
+                    path: ts.normalizeSlashes(ref.fileName),
+                    position: ref.pos,
+                    length: ref.end - ref.pos
+                });
+            }
+            return result;
+        };
         CoreServicesShimObject.prototype.getTSConfigFileInfo = function (fileName, sourceTextSnapshot) {
             var _this = this;
             return this.forwardJSONCall("getTSConfigFileInfo('" + fileName + "')", function () {
@@ -53235,13 +56778,16 @@ var ts;
                 if (result.error) {
                     return {
                         options: {},
+                        typingOptions: {},
                         files: [],
                         errors: [realizeDiagnostic(result.error, "\r\n")]
                     };
                 }
-                var configFile = ts.parseJsonConfigFileContent(result.config, _this.host, ts.getDirectoryPath(ts.normalizeSlashes(fileName)));
+                var normalizedFileName = ts.normalizeSlashes(fileName);
+                var configFile = ts.parseJsonConfigFileContent(result.config, _this.host, ts.getDirectoryPath(normalizedFileName), /*existingOptions*/ {}, normalizedFileName);
                 return {
                     options: configFile.options,
+                    typingOptions: configFile.typingOptions,
                     files: configFile.fileNames,
                     errors: realizeDiagnostics(configFile.errors, "\r\n")
                 };
@@ -53250,6 +56796,14 @@ var ts;
         CoreServicesShimObject.prototype.getDefaultCompilationSettings = function () {
             return this.forwardJSONCall("getDefaultCompilationSettings()", function () { return ts.getDefaultCompilerOptions(); });
         };
+        CoreServicesShimObject.prototype.discoverTypings = function (discoverTypingsJson) {
+            var _this = this;
+            var getCanonicalFileName = ts.createGetCanonicalFileName(/*useCaseSensitivefileNames:*/ false);
+            return this.forwardJSONCall("discoverTypings()", function () {
+                var info = JSON.parse(discoverTypingsJson);
+                return ts.JsTyping.discoverTypings(_this.host, info.fileNames, ts.toPath(info.projectRootPath, info.projectRootPath, getCanonicalFileName), ts.toPath(info.safeListPath, info.safeListPath, getCanonicalFileName), info.packageNameToTypingLocation, info.typingOptions, info.compilerOptions);
+            });
+        };
         return CoreServicesShimObject;
     }(ShimBase));
     var TypeScriptServicesFactory = (function () {
@@ -53334,5 +56888,5 @@ var TypeScript;
 // 'toolsVersion' gets consumed by the managed side, so it's not unused.
 // TODO: it should be moved into a namespace though.
 /* @internal */
-var toolsVersion = "1.8";
+var toolsVersion = "1.9";
 /* tslint:enable:no-unused-variable */ 
diff --git a/pull_request_template.md b/pull_request_template.md
new file mode 100644
index 00000000000..683e6acbf89
--- /dev/null
+++ b/pull_request_template.md
@@ -0,0 +1,16 @@
+<!--
+Thank you for submitting a pull request!
+
+Here's a checklist you might find useful.
+[ ] There is an associated issue that is labelled
+  'Bug' or 'Accepting PRs' or is in the Community milestone
+[ ] Code is up-to-date with the `master` branch
+[ ] You've successfully run `jake runtests` locally
+[ ] You've signed the CLA
+[ ] There are new or updated unit tests validating the change
+
+Refer to CONTRIBUTING.MD for more details.
+  https://github.com/Microsoft/TypeScript/blob/master/CONTRIBUTING.md
+-->
+
+Fixes #
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/scripts/ior.ts b/scripts/ior.ts
index f0c142a266c..eb67e62a275 100644
--- a/scripts/ior.ts
+++ b/scripts/ior.ts
@@ -76,8 +76,11 @@ module Commands {
                 fs.mkdirSync(directoryPath);
             }
         }
+        function normalizeSlashes(path: string): string {
+            return path.replace(/\\/g, "/");
+        }
         function transalatePath(outputFolder:string, path: string): string {
-            return outputFolder + directorySeparator + path.replace(":", "");
+            return normalizeSlashes(outputFolder + directorySeparator + path.replace(":", ""));
         }
         function fileExists(path: string): boolean {
             return fs.existsSync(path);
@@ -86,7 +89,7 @@ module Commands {
             var filename = transalatePath(outputFolder, f.path);
             ensureDirectoriesExist(getDirectoryPath(filename));
             console.log("writing filename:   " + filename);
-            fs.writeFile(filename, f.result.contents, (err) => { });
+            fs.writeFileSync(filename, f.result.contents);
         });
 
         console.log("Command:   tsc ");
diff --git a/scripts/tslint/noNullRule.ts b/scripts/tslint/noNullRule.ts
deleted file mode 100644
index 8e9deca996b..00000000000
--- a/scripts/tslint/noNullRule.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import * as Lint from "tslint/lib/lint";
-import * as ts from "typescript";
-
-
-export class Rule extends Lint.Rules.AbstractRule {
-    public static FAILURE_STRING = "Don't use the 'null' keyword - use 'undefined' for missing values instead";
-
-    public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
-        return this.applyWithWalker(new NullWalker(sourceFile, this.getOptions()));
-    }
-}
-
-class NullWalker extends Lint.RuleWalker {
-    visitNode(node: ts.Node) {
-        super.visitNode(node);
-        if (node.kind === ts.SyntaxKind.NullKeyword) {
-            this.addFailure(this.createFailure(node.getStart(), node.getWidth(), Rule.FAILURE_STRING));
-        }
-    }
-}
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index 9b0d1636ec1..d2f7a4f53fb 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -12,7 +12,7 @@ namespace ts {
     }
 
     const enum Reachability {
-        Unintialized        = 1 << 0,
+        Uninitialized       = 1 << 0,
         Reachable           = 1 << 1,
         Unreachable         = 1 << 2,
         ReportedUnreachable = 1 << 3
@@ -37,7 +37,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.
@@ -104,6 +104,7 @@ namespace ts {
     function createBinder(): (file: SourceFile, options: CompilerOptions) => void {
         let file: SourceFile;
         let options: CompilerOptions;
+        let languageVersion: ScriptTarget;
         let parent: Node;
         let container: Node;
         let blockScopeContainer: Node;
@@ -122,6 +123,7 @@ namespace ts {
         let hasAsyncFunctions: boolean;
         let hasDecorators: boolean;
         let hasParameterDecorators: boolean;
+        let hasJsxSpreadAttribute: boolean;
 
         // If this file is an external module, then it is automatically in strict-mode according to
         // ES6.  If it is not an external module, then we'll determine if it is in strict mode or
@@ -133,15 +135,15 @@ namespace ts {
         let classifiableNames: Map<string>;
 
         // state used to aggregate transform flags during bind.
-        let subtreeTransformFlags: TransformFlags;
+        let subtreeTransformFlags: TransformFlags = TransformFlags.None;
         let skipTransformFlagAggregation: boolean;
 
         function bindSourceFile(f: SourceFile, opts: CompilerOptions) {
             file = f;
             options = opts;
+            languageVersion = getEmitScriptTarget(options);
             inStrictMode = !!file.externalModuleIndicator;
             classifiableNames = {};
-            subtreeTransformFlags = undefined;
             skipTransformFlagAggregation = isDeclarationFile(file);
 
             Symbol = objectAllocator.getSymbolConstructor();
@@ -154,6 +156,7 @@ namespace ts {
 
             file = undefined;
             options = undefined;
+            languageVersion = undefined;
             parent = undefined;
             container = undefined;
             blockScopeContainer = undefined;
@@ -167,6 +170,8 @@ namespace ts {
             hasAsyncFunctions = false;
             hasDecorators = false;
             hasParameterDecorators = false;
+            subtreeTransformFlags = TransformFlags.None;
+            hasJsxSpreadAttribute = false;
         }
 
         return bindSourceFile;
@@ -256,7 +261,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:
@@ -284,7 +289,8 @@ 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);
 
@@ -329,7 +335,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;
                         }
                     });
@@ -353,7 +359,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);
@@ -399,7 +405,7 @@ namespace ts {
         // the getLocalNameOfContainer function in the type checker to validate that the local name
         // used for a container is unique.
         function bindChildren(node: Node) {
-            // Before we recurse into a node's chilren, we first save the existing parent, container
+            // Before we recurse into a node's children, we first save the existing parent, container
             // and block-container.  Then after we pop out of processing the children, we restore
             // these saved values.
             const saveParent = parent;
@@ -424,7 +430,7 @@ namespace ts {
             // Finally, if this is a block-container, then we clear out any existing .locals object
             // it may contain within it.  This happens in incremental scenarios.  Because we can be
             // reusing a node from a previous compilation, that node may have had 'locals' created
-            // for it.  We must clear this so we don't accidently move any stale data forward from
+            // for it.  We must clear this so we don't accidentally move any stale data forward from
             // a previous compilation.
             const containerFlags = getContainerFlags(node);
             if (containerFlags & ContainerFlags.IsContainer) {
@@ -503,6 +509,9 @@ namespace ts {
                 if (hasAsyncFunctions) {
                     flags |= NodeFlags.HasAsyncFunctions;
                 }
+                if (hasJsxSpreadAttribute) {
+                    flags |= NodeFlags.HasJsxSpreadAttribute;
+                }
             }
 
             node.flags = flags;
@@ -691,7 +700,7 @@ namespace ts {
             // post catch/finally state is reachable if
             // - post try state is reachable - control flow can fall out of try block
             // - post catch state is reachable - control flow can fall out of catch block
-            currentReachabilityState = or(postTryState, postCatchState);
+            currentReachabilityState = n.catchClause ? or(postTryState, postCatchState) : postTryState;
         }
 
         function bindSwitchStatement(n: SwitchStatement): void {
@@ -705,7 +714,7 @@ namespace ts {
 
             const hasDefault = forEach(n.caseBlock.clauses, c => c.kind === SyntaxKind.DefaultClause);
 
-            // post switch state is unreachable if switch is exaustive (has a default case ) and does not have fallthrough from the last case
+            // post switch state is unreachable if switch is exhaustive (has a default case ) and does not have fallthrough from the last case
             const postSwitchState = hasDefault && currentReachabilityState !== Reachability.Reachable ? Reachability.Unreachable : preSwitchState;
 
             popImplicitLabel(postSwitchLabel, postSwitchState);
@@ -714,10 +723,14 @@ namespace ts {
         function bindCaseBlock(n: CaseBlock): void {
             const startState = currentReachabilityState;
 
-            for (const clause of n.clauses) {
+            for (let i = 0; i < n.clauses.length; i++) {
+                const clause = n.clauses[i];
                 currentReachabilityState = startState;
                 bind(clause);
-                if (clause.statements.length && currentReachabilityState === Reachability.Reachable && options.noFallthroughCasesInSwitch) {
+                if (clause.statements.length &&
+                    i !== n.clauses.length - 1 && // allow fallthrough from the last case
+                    currentReachabilityState === Reachability.Reachable &&
+                    options.noFallthroughCasesInSwitch) {
                     errorOnFirstToken(clause, Diagnostics.Fallthrough_case_in_switch);
                 }
             }
@@ -755,6 +768,7 @@ namespace ts {
                 case SyntaxKind.GetAccessor:
                 case SyntaxKind.SetAccessor:
                 case SyntaxKind.FunctionType:
+                case SyntaxKind.JSDocFunctionType:
                 case SyntaxKind.ConstructorType:
                 case SyntaxKind.FunctionExpression:
                 case SyntaxKind.ArrowFunction:
@@ -772,7 +786,7 @@ namespace ts {
 
                 case SyntaxKind.Block:
                     // do not treat blocks directly inside a function as a block-scoped-container.
-                    // Locals that reside in this block should go to the function locals. Othewise 'x'
+                    // Locals that reside in this block should go to the function locals. Otherwise 'x'
                     // would not appear to be a redeclaration of a block scoped local in the following
                     // example:
                     //
@@ -862,7 +876,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);
         }
@@ -899,10 +913,15 @@ 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);
                 }
-                declareSymbolAndAddToSymbolTable(node, SymbolFlags.ValueModule, SymbolFlags.ValueModuleExcludes);
+                if (isExternalModuleAugmentation(node)) {
+                    declareSymbolAndAddToSymbolTable(node, SymbolFlags.NamespaceModule, SymbolFlags.NamespaceModuleExcludes);
+                }
+                else {
+                    declareSymbolAndAddToSymbolTable(node, SymbolFlags.ValueModule, SymbolFlags.ValueModuleExcludes);
+                }
             }
             else {
                 const state = getModuleInstanceState(node);
@@ -962,7 +981,7 @@ namespace ts {
 
                     const identifier = <Identifier>prop.name;
 
-                    // ECMA-262 11.1.5 Object Initialiser
+                    // 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
                     // a.This production is contained in strict code and IsDataDescriptor(previous) is true and
                     // IsDataDescriptor(propId.descriptor) is true.
@@ -1115,6 +1134,35 @@ namespace ts {
             }
         }
 
+        function getStrictModeBlockScopeFunctionDeclarationMessage(node: Node) {
+            // Provide specialized messages to help the user understand why we think they're in
+            // strict mode.
+            if (getContainingClass(node)) {
+                return Diagnostics.Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5_Class_definitions_are_automatically_in_strict_mode;
+            }
+
+            if (file.externalModuleIndicator) {
+                return Diagnostics.Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5_Modules_are_automatically_in_strict_mode;
+            }
+
+            return Diagnostics.Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5;
+        }
+
+        function checkStrictModeFunctionDeclaration(node: FunctionDeclaration) {
+            if (languageVersion < ScriptTarget.ES6) {
+                // Report error if function is not top level function declaration
+                if (blockScopeContainer.kind !== SyntaxKind.SourceFile &&
+                    blockScopeContainer.kind !== SyntaxKind.ModuleDeclaration &&
+                    !isFunctionLike(blockScopeContainer)) {
+                    // We check first if the name is inside class declaration or class expression; if so give explicit message
+                    // otherwise report generic error message.
+                    const errorSpan = getErrorSpanForNode(file, node);
+                    file.bindDiagnostics.push(createFileDiagnostic(file, errorSpan.start, errorSpan.length,
+                        getStrictModeBlockScopeFunctionDeclarationMessage(node)));
+                }
+            }
+        }
+
         function checkStrictModeNumericLiteral(node: NumericLiteral) {
             if (inStrictMode && node.isOctalLiteral) {
                 file.bindDiagnostics.push(createDiagnosticForNode(node, Diagnostics.Octal_literals_are_not_allowed_in_strict_mode));
@@ -1184,41 +1232,22 @@ namespace ts {
             // symbols we do specialized work when we recurse.  For example, we'll keep track of
             // the current 'container' node when it changes.  This helps us know which symbol table
             // a local should go into for example.
-            aggregateTransformFlagsIfNeededAndBindChildren(node);
-
-            inStrictMode = savedInStrictMode;
-        }
-
-        function aggregateTransformFlagsIfNeededAndBindChildren(node: Node) {
-            if (node.transformFlags !== undefined) {
-                skipTransformFlagAggregationAndBindChildren(node);
+            if (skipTransformFlagAggregation) {
+                bindChildren(node);
             }
-            else {
-                aggregateTransformFlagsAndBindChildren(node);
-            }
-        }
-
-        function skipTransformFlagAggregationAndBindChildren(node: Node) {
-            if (!skipTransformFlagAggregation) {
+            else if (node.transformFlags & TransformFlags.HasComputedFlags) {
                 skipTransformFlagAggregation = true;
                 bindChildren(node);
                 skipTransformFlagAggregation = false;
             }
             else {
-                bindChildren(node);
-            }
-        }
-
-        function aggregateTransformFlagsAndBindChildren(node: Node) {
-            if (!skipTransformFlagAggregation) {
                 const savedSubtreeTransformFlags = subtreeTransformFlags;
                 subtreeTransformFlags = 0;
                 bindChildren(node);
                 subtreeTransformFlags = savedSubtreeTransformFlags | computeTransformFlagsForNode(node, subtreeTransformFlags);
             }
-            else {
-                bindChildren(node);
-            }
+
+            inStrictMode = savedInStrictMode;
         }
 
         function updateStrictMode(node: Node) {
@@ -1259,7 +1288,7 @@ namespace ts {
 
             // Note: the node text must be exactly "use strict" or 'use strict'.  It is not ok for the
             // string to contain unicode escapes (as per ES5).
-            return nodeText === "\"use strict\"" || nodeText === "'use strict'";
+            return nodeText === '"use strict"' || nodeText === "'use strict'";
         }
 
         function bindWorker(node: Node) {
@@ -1325,6 +1354,10 @@ namespace ts {
                 case SyntaxKind.EnumMember:
                     return bindPropertyOrMethodOrAccessor(<Declaration>node, SymbolFlags.EnumMember, SymbolFlags.EnumMemberExcludes);
 
+                case SyntaxKind.JsxSpreadAttribute:
+                    hasJsxSpreadAttribute = true;
+                    return;
+
                 case SyntaxKind.CallSignature:
                 case SyntaxKind.ConstructSignature:
                 case SyntaxKind.IndexSignature:
@@ -1383,6 +1416,8 @@ namespace ts {
                 case SyntaxKind.ImportSpecifier:
                 case SyntaxKind.ExportSpecifier:
                     return declareSymbolAndAddToSymbolTable(<Declaration>node, SymbolFlags.Alias, SymbolFlags.AliasExcludes);
+                case SyntaxKind.GlobalModuleExportDeclaration:
+                    return bindGlobalModuleExportDeclaration(<GlobalModuleExportDeclaration>node);
                 case SyntaxKind.ImportClause:
                     return bindImportClause(<ImportClause>node);
                 case SyntaxKind.ExportDeclaration:
@@ -1432,6 +1467,33 @@ namespace ts {
             }
         }
 
+        function bindGlobalModuleExportDeclaration(node: GlobalModuleExportDeclaration) {
+            if (node.modifiers && node.modifiers.length) {
+                file.bindDiagnostics.push(createDiagnosticForNode(node, Diagnostics.Modifiers_cannot_appear_here));
+            }
+
+            if (node.parent.kind !== SyntaxKind.SourceFile) {
+                file.bindDiagnostics.push(createDiagnosticForNode(node, Diagnostics.Global_module_exports_may_only_appear_at_top_level));
+                return;
+            }
+            else {
+                const parent = node.parent as SourceFile;
+
+                if (!isExternalModule(parent)) {
+                    file.bindDiagnostics.push(createDiagnosticForNode(node, Diagnostics.Global_module_exports_may_only_appear_in_module_files));
+                    return;
+                }
+
+                if (!parent.isDeclarationFile) {
+                    file.bindDiagnostics.push(createDiagnosticForNode(node, Diagnostics.Global_module_exports_may_only_appear_in_declaration_files));
+                    return;
+                }
+            }
+
+            file.symbol.globalExports = file.symbol.globalExports || {};
+            declareSymbol(file.symbol.globalExports, file.symbol, node, SymbolFlags.Alias, SymbolFlags.AliasExcludes);
+        }
+
         function bindExportDeclaration(node: ExportDeclaration) {
             if (!container.symbol || !container.symbol.exports) {
                 // Export * in some sort of block construct
@@ -1466,7 +1528,7 @@ namespace ts {
         function bindModuleExportsAssignment(node: BinaryExpression) {
             // 'module.exports = expr' assignment
             setCommonJsModuleIndicator(node);
-            bindExportAssignment(node);
+            declareSymbol(file.symbol.exports, file.symbol, node, SymbolFlags.Property | SymbolFlags.Export | SymbolFlags.ValueModule, SymbolFlags.None);
         }
 
         function bindThisPropertyAssignment(node: BinaryExpression) {
@@ -1629,7 +1691,13 @@ namespace ts {
             }
 
             checkStrictModeFunctionName(<FunctionDeclaration>node);
-            return declareSymbolAndAddToSymbolTable(<Declaration>node, SymbolFlags.Function, SymbolFlags.FunctionExcludes);
+            if (inStrictMode) {
+                checkStrictModeFunctionDeclaration(node);
+                return bindBlockScopedDeclaration(node, SymbolFlags.Function, SymbolFlags.FunctionExcludes);
+            }
+            else {
+                return declareSymbolAndAddToSymbolTable(<Declaration>node, SymbolFlags.Function, SymbolFlags.FunctionExcludes);
+            }
         }
 
         function bindFunctionExpression(node: FunctionExpression) {
@@ -1667,14 +1735,14 @@ namespace ts {
             if (hasProperty(labelIndexMap, name.text)) {
                 return false;
             }
-            labelIndexMap[name.text] = labelStack.push(Reachability.Unintialized) - 1;
+            labelIndexMap[name.text] = labelStack.push(Reachability.Uninitialized) - 1;
             return true;
         }
 
         function pushImplicitLabel(): number {
             initializeReachabilityStateIfNecessary();
 
-            const index = labelStack.push(Reachability.Unintialized) - 1;
+            const index = labelStack.push(Reachability.Uninitialized) - 1;
             implicitLabels.push(index);
             return index;
         }
@@ -1704,7 +1772,7 @@ namespace ts {
         }
 
         function setCurrentStateAtLabel(innerMergedState: Reachability, outerState: Reachability, label: Identifier): void {
-            if (innerMergedState === Reachability.Unintialized) {
+            if (innerMergedState === Reachability.Uninitialized) {
                 if (label && !options.allowUnusedLabels) {
                     file.bindDiagnostics.push(createDiagnosticForNode(label, Diagnostics.Unused_label));
                 }
@@ -1725,7 +1793,7 @@ namespace ts {
                 return false;
             }
             const stateAtLabel = labelStack[index];
-            labelStack[index] = stateAtLabel === Reachability.Unintialized ? outerState : or(stateAtLabel, outerState);
+            labelStack[index] = stateAtLabel === Reachability.Uninitialized ? outerState : or(stateAtLabel, outerState);
             return true;
         }
 
@@ -1799,15 +1867,9 @@ namespace ts {
      * @param subtreeFlags Transform flags computed for this node's subtree
      */
     export function computeTransformFlagsForNode(node: Node, subtreeFlags: TransformFlags): TransformFlags {
-        // Ambient nodes are TypeScript syntax and the flags of their subtree are ignored.
-        if (node.flags & NodeFlags.Ambient) {
-            return (node.transformFlags = TransformFlags.AssertTypeScript)
-                & ~(node.excludeTransformFlags = TransformFlags.NodeExcludes);
-        }
-
         // Mark transformations needed for each node
-        let transformFlags: TransformFlags;
-        let excludeFlags: TransformFlags;
+        let transformFlags = TransformFlags.None;
+        let excludeFlags = TransformFlags.None;
         switch (node.kind) {
             case SyntaxKind.PublicKeyword:
             case SyntaxKind.PrivateKeyword:
@@ -1821,9 +1883,10 @@ namespace ts {
             case SyntaxKind.EnumMember:
             case SyntaxKind.TypeAssertionExpression:
             case SyntaxKind.AsExpression:
+            case SyntaxKind.NonNullExpression:
             case SyntaxKind.ReadonlyKeyword:
                 // These nodes are TypeScript syntax.
-                transformFlags |= TransformFlags.AssertTypeScript;
+                transformFlags = TransformFlags.AssertTypeScript;
                 break;
 
             case SyntaxKind.JsxElement:
@@ -1835,12 +1898,12 @@ namespace ts {
             case SyntaxKind.JsxSpreadAttribute:
             case SyntaxKind.JsxExpression:
                 // These nodes are Jsx syntax.
-                transformFlags |= TransformFlags.AssertJsx;
+                transformFlags = TransformFlags.AssertJsx;
                 break;
 
             case SyntaxKind.ExportKeyword:
                 // This node is both ES6 and TypeScript syntax.
-                transformFlags |= TransformFlags.AssertES6 | TransformFlags.TypeScript;
+                transformFlags = TransformFlags.AssertES6 | TransformFlags.TypeScript;
                 break;
 
             case SyntaxKind.DefaultKeyword:
@@ -1853,9 +1916,8 @@ namespace ts {
             case SyntaxKind.ShorthandPropertyAssignment:
             case SyntaxKind.ForOfStatement:
                 // These nodes are ES6 syntax.
-                transformFlags |= TransformFlags.AssertES6;
+                transformFlags = TransformFlags.AssertES6;
                 break;
-
             case SyntaxKind.YieldExpression:
                 // This node is ES6 syntax.
                 transformFlags |= TransformFlags.AssertES6 | TransformFlags.ContainsYield;
@@ -1889,36 +1951,53 @@ namespace ts {
             case SyntaxKind.ThisType:
             case SyntaxKind.StringLiteralType:
                 // Types and signatures are TypeScript syntax, and exclude all other facts.
+                subtreeFlags = TransformFlags.None;
                 excludeFlags = TransformFlags.TypeExcludes;
-                transformFlags |= TransformFlags.AssertTypeScript;
+                transformFlags = TransformFlags.AssertTypeScript;
                 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;
+                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;
+                transformFlags = TransformFlags.ContainsSpreadElementExpression;
                 break;
 
             case SyntaxKind.SuperKeyword:
                 // This node is ES6 syntax.
-                transformFlags |= TransformFlags.AssertES6;
+                transformFlags = TransformFlags.AssertES6;
                 break;
 
             case SyntaxKind.ThisKeyword:
                 // Mark this node and its ancestors as containing a lexical `this` keyword.
-                transformFlags |= TransformFlags.ContainsLexicalThis;
+                transformFlags = TransformFlags.ContainsLexicalThis;
                 break;
 
             case SyntaxKind.ObjectBindingPattern:
             case SyntaxKind.ArrayBindingPattern:
                 // These nodes are ES6 syntax.
-                transformFlags |= TransformFlags.AssertES6;
+                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:
@@ -1926,20 +2005,17 @@ namespace ts {
                 if (subtreeFlags & TransformFlags.ContainsComputedPropertyName) {
                     // If an ObjectLiteralExpression contains a ComputedPropertyName, then it
                     // is an ES6 node.
-                    transformFlags |= TransformFlags.AssertES6;
+                    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.CallExpression:
-                excludeFlags = TransformFlags.ArrayLiteralOrCallOrNewExcludes;
-                if (subtreeFlags & TransformFlags.ContainsSpreadElementExpression
-                    || isSuperCall(node)
-                    || isSuperPropertyCall(node)) {
-                    // If the this node contains a SpreadElementExpression, or is a super call, then it is an ES6
-                    // node.
-                    transformFlags |= TransformFlags.AssertES6;
-                }
-                break;
+                return computeCallExpression(<CallExpression>node, subtreeFlags);
 
             case SyntaxKind.ArrayLiteralExpression:
             case SyntaxKind.NewExpression:
@@ -1947,162 +2023,59 @@ namespace ts {
                 if (subtreeFlags & TransformFlags.ContainsSpreadElementExpression) {
                     // If the this node contains a SpreadElementExpression, then it is an ES6
                     // node.
-                    transformFlags |= TransformFlags.AssertES6;
+                    transformFlags = TransformFlags.AssertES6;
                 }
-                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.ModuleDeclaration:
+                // An ambient declaration is TypeScript syntax.
+                if (hasModifier(node, ModifierFlags.Ambient)) {
+                    subtreeFlags = TransformFlags.None;
+                }
+
                 // This node is TypeScript syntax, and excludes markers that should not escape the module scope.
                 excludeFlags = TransformFlags.ModuleExcludes;
-                transformFlags |= TransformFlags.AssertTypeScript;
+                transformFlags = TransformFlags.AssertTypeScript;
                 break;
 
             case SyntaxKind.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)) {
-                    if ((<ParenthesizedExpression>node).expression.kind === SyntaxKind.AsExpression
-                        || (<ParenthesizedExpression>node).expression.kind === SyntaxKind.TypeAssertionExpression) {
-                        transformFlags = TransformFlags.AssertTypeScript;
-                    }
-                }
-
-                // If the expression of a ParenthesizedExpression is a destructuring assignment,
-                // then the ParenthesizedExpression is a destructuring assignment.
-                if ((<ParenthesizedExpression>node).expression.transformFlags & TransformFlags.DestructuringAssignment) {
-                    transformFlags |= TransformFlags.DestructuringAssignment;
-                }
-
-                break;
+                return computeParenthesizedExpression(<ParenthesizedExpression>node, subtreeFlags);
 
             case SyntaxKind.BinaryExpression:
-                if (isDestructuringAssignment(node)) {
-                    // Destructuring assignments are ES6 syntax.
-                    transformFlags |= TransformFlags.AssertES6 | TransformFlags.DestructuringAssignment;
-                }
-                else if ((<BinaryExpression>node).operatorToken.kind === SyntaxKind.AsteriskAsteriskToken
-                    || (<BinaryExpression>node).operatorToken.kind === SyntaxKind.AsteriskAsteriskEqualsToken) {
-                    // Exponentiation is ES7 syntax.
-                    transformFlags |= TransformFlags.AssertES7;
-                }
-
-                break;
+                return computeBinaryExpression(<BinaryExpression>node, subtreeFlags);
 
             case SyntaxKind.ExpressionStatement:
                 // 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 ((<ExpressionStatement>node).expression.transformFlags & TransformFlags.DestructuringAssignment) {
-                    transformFlags |= TransformFlags.AssertES6;
+                    transformFlags = TransformFlags.AssertES6;
                 }
 
                 break;
 
             case SyntaxKind.Parameter:
-                // If the parameter has a question token, then it is TypeScript syntax.
-                if ((<ParameterDeclaration>node).questionToken) {
-                    transformFlags |= TransformFlags.AssertTypeScript;
-                }
-
-                // If a parameter has an accessibility modifier, then it is TypeScript syntax.
-                if ((<ParameterDeclaration>node).flags & NodeFlags.AccessibilityModifier) {
-                    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 ((<ParameterDeclaration>node).initializer
-                    || (<ParameterDeclaration>node).dotDotDotToken
-                    || isBindingPattern((<ParameterDeclaration>node).name)) {
-                    transformFlags |= TransformFlags.AssertES6 | TransformFlags.ContainsDefaultValueAssignments;
-                }
-
-                break;
+                return computeParameter(<ParameterDeclaration>node, subtreeFlags);
 
             case SyntaxKind.ArrowFunction:
-                // An ArrowFunction is ES6 syntax, and excludes markers that should not escape the scope of an ArrowFunction.
-                excludeFlags = TransformFlags.ArrowFunctionExcludes;
-                transformFlags = TransformFlags.AssertES6;
-
-                // If an ArrowFunction contains a lexical this, its container must capture the lexical this.
-                if (subtreeFlags & TransformFlags.ContainsLexicalThis) {
-                    transformFlags |= TransformFlags.ContainsCapturedLexicalThis;
-                }
-
-                // An async arrow function is TypeScript syntax.
-                if (node.flags & NodeFlags.Async) {
-                    transformFlags |= TransformFlags.AssertTypeScript;
-                }
-
-                break;
+                return computeArrowFunction(<ArrowFunction>node, subtreeFlags);
 
             case SyntaxKind.FunctionExpression:
-                // A FunctionExpression excludes markers that should not escape the scope of a FunctionExpression.
-                excludeFlags = TransformFlags.FunctionExcludes;
-
-                if ((<FunctionExpression>node).asteriskToken) {
-                    transformFlags |= TransformFlags.ContainsGenerators;
-                }
-
-                // If a FunctionExpression contains an asterisk token, or its subtree has marked the container
-                // as needing to capture the lexical this, then this node is ES6 syntax.
-                if (subtreeFlags & TransformFlags.ContainsCapturedLexicalThis
-                    || subtreeFlags & TransformFlags.ContainsDefaultValueAssignments) {
-                    transformFlags |= TransformFlags.AssertES6;
-                }
-
-                // An async function expression is TypeScript syntax.
-                if (node.flags & NodeFlags.Async) {
-                    transformFlags |= TransformFlags.AssertTypeScript;
-                }
-
-                break;
+                return computeFunctionExpression(<FunctionExpression>node, subtreeFlags);
 
             case SyntaxKind.FunctionDeclaration:
-                // A FunctionDeclaration excludes markers that should not escape the scope of a FunctionDeclaration.
-                excludeFlags = TransformFlags.FunctionExcludes;
-
-                // A FunctionDeclaration without a body is an overload and is TypeScript syntax.
-                if (!(<FunctionDeclaration>node).body) {
-                    transformFlags = TransformFlags.AssertTypeScript;
-                    break;
-                }
-
-                if ((<FunctionDeclaration>node).asteriskToken) {
-                    transformFlags |= TransformFlags.ContainsGenerators;
-                }
-
-                // If a FunctionDeclaration has an asterisk token, is exported, or its
-                // subtree has marked the container as needing to capture the lexical `this`,
-                // then this node is ES6 syntax.
-                if (node.flags & NodeFlags.Export
-                    || subtreeFlags & TransformFlags.ContainsCapturedLexicalThis
-                    || subtreeFlags & TransformFlags.ContainsDefaultValueAssignments) {
-                    transformFlags |= TransformFlags.AssertES6;
-                }
-
-                // An async function declaration is TypeScript syntax.
-                if (node.flags & NodeFlags.Async) {
-                    transformFlags |= TransformFlags.AssertTypeScript;
-                }
-
-                break;
+                return computeFunctionDeclaration(<FunctionDeclaration>node, subtreeFlags);
 
             case SyntaxKind.VariableDeclaration:
-                // A VariableDeclaration with a binding pattern is ES6 syntax.
-                if (isBindingPattern((<VariableDeclaration>node).name)) {
+                return computeVariableDeclaration(<VariableDeclaration>node, subtreeFlags);
+
+            case SyntaxKind.VariableDeclarationList:
+                excludeFlags = TransformFlags.VariableDeclarationListExcludes;
+                if (subtreeFlags & TransformFlags.ContainsBindingPattern) {
                     transformFlags |= TransformFlags.AssertES6;
                 }
 
-                break;
-
-            case SyntaxKind.VariableDeclarationList:
                 // If a VariableDeclarationList is `let` or `const`, then it is ES6 syntax.
                 if (node.flags & NodeFlags.BlockScoped) {
                     transformFlags |= TransformFlags.AssertES6 | TransformFlags.ContainsBlockScopedBinding;
@@ -2111,21 +2084,10 @@ namespace ts {
                 break;
 
             case SyntaxKind.VariableStatement:
-                // If a VariableStatement is exported, then it is either ES6 or TypeScript syntax.
-                if (node.flags & NodeFlags.Export) {
-                    transformFlags |= TransformFlags.AssertES6 | TransformFlags.AssertTypeScript;
-                }
-
-                break;
+                return computeVariableStatement(<VariableStatement>node, subtreeFlags);
 
             case SyntaxKind.LabeledStatement:
-                // A labeled statement containing a block scoped binding *may* need to be transformed from ES6.
-                if (subtreeFlags & TransformFlags.ContainsBlockScopedBinding
-                    && isIterationStatement(this, /*lookInLabeledStatements*/ true)) {
-                    transformFlags |= TransformFlags.AssertES6;
-                }
-
-                break;
+                return computeLabeledStatement(<LabeledStatement>node, subtreeFlags);
 
             case SyntaxKind.DoStatement:
             case SyntaxKind.WhileStatement:
@@ -2133,36 +2095,26 @@ namespace ts {
             case SyntaxKind.ForInStatement:
                 // A loop containing a block scoped binding *may* need to be transformed from ES6.
                 if (subtreeFlags & TransformFlags.ContainsBlockScopedBinding) {
-                    transformFlags |= TransformFlags.AssertES6;
+                    transformFlags = TransformFlags.AssertES6;
                 }
 
                 break;
 
             case SyntaxKind.ClassDeclaration:
+                return computeClassDeclaration(<ClassDeclaration>node, subtreeFlags);
+
             case SyntaxKind.ClassExpression:
-                // A ClassDeclarations or ClassExpression is ES6 syntax.
-                excludeFlags = TransformFlags.ClassExcludes;
-                transformFlags = TransformFlags.AssertES6;
-
-                // A class with a parameter property assignment, property initializer, or decorator is
-                // TypeScript syntax.
-                if (subtreeFlags & TransformFlags.ContainsParameterPropertyAssignments
-                    || subtreeFlags & TransformFlags.ContainsPropertyInitializer
-                    || subtreeFlags & TransformFlags.ContainsDecorators) {
-                    transformFlags |= TransformFlags.AssertTypeScript;
-                }
-
-                break;
+                return computeClassExpression(<ClassExpression>node, subtreeFlags);
 
             case SyntaxKind.HeritageClause:
                 if ((<HeritageClause>node).token === SyntaxKind.ExtendsKeyword) {
                     // An `extends` HeritageClause is ES6 syntax.
-                    transformFlags |= TransformFlags.AssertES6;
+                    transformFlags = TransformFlags.AssertES6;
                 }
                 else {
                     // An `implements` HeritageClause is TypeScript syntax.
                     Debug.assert((<HeritageClause>node).token === SyntaxKind.ImplementsKeyword);
-                    transformFlags |= TransformFlags.AssertTypeScript;
+                    transformFlags = TransformFlags.AssertTypeScript;
                 }
 
                 break;
@@ -2170,7 +2122,7 @@ namespace ts {
             case SyntaxKind.ExpressionWithTypeArguments:
                 // An ExpressionWithTypeArguments is ES6 syntax, as it is used in the
                 // extends clause of a class.
-                transformFlags |= TransformFlags.AssertES6;
+                transformFlags = TransformFlags.AssertES6;
 
                 // If an ExpressionWithTypeArguments contains type arguments, then it
                 // is TypeScript syntax.
@@ -2183,7 +2135,7 @@ namespace ts {
             case SyntaxKind.Constructor:
                 // A Constructor is ES6 syntax.
                 excludeFlags = TransformFlags.ConstructorExcludes;
-                transformFlags |= TransformFlags.AssertES6;
+                transformFlags = TransformFlags.AssertES6;
 
                 // An overload constructor is TypeScript syntax.
                 if (!(<ConstructorDeclaration>node).body) {
@@ -2194,7 +2146,7 @@ namespace ts {
 
             case SyntaxKind.PropertyDeclaration:
                 // A PropertyDeclaration is TypeScript syntax.
-                transformFlags |= TransformFlags.AssertTypeScript;
+                transformFlags = TransformFlags.AssertTypeScript;
 
                 // If the PropertyDeclaration has an initializer, we need to inform its ancestor
                 // so that it handle the transformation.
@@ -2207,20 +2159,18 @@ namespace ts {
             case SyntaxKind.MethodDeclaration:
                 // A MethodDeclaration is ES6 syntax.
                 excludeFlags = TransformFlags.MethodOrAccessorExcludes;
-                transformFlags |= TransformFlags.AssertES6;
+                transformFlags = TransformFlags.AssertES6;
 
                 if ((<MethodDeclaration>node).asteriskToken) {
                     transformFlags |= TransformFlags.ContainsGenerators;
                 }
 
                 // A MethodDeclaration is TypeScript syntax if it is either async, abstract, overloaded,
-                // generic, or has both a computed property name and a decorator.
+                // generic, or has a decorator.
                 if ((<MethodDeclaration>node).body === undefined
                     || (<MethodDeclaration>node).typeParameters !== undefined
-                    || node.flags & NodeFlags.Async
-                    || node.flags & NodeFlags.Abstract
-                    || (subtreeFlags & TransformFlags.ContainsDecorators
-                        && subtreeFlags & TransformFlags.ContainsComputedPropertyName)) {
+                    || hasModifier(node, ModifierFlags.Async | ModifierFlags.Abstract)
+                    || subtreeFlags & TransformFlags.ContainsDecorators) {
                     transformFlags |= TransformFlags.AssertTypeScript;
                 }
 
@@ -2232,11 +2182,11 @@ namespace ts {
                 excludeFlags = TransformFlags.MethodOrAccessorExcludes;
 
                 // A GetAccessor or SetAccessor is TypeScript syntax if it is either abstract,
-                // or has both a computed property name and a decorator.
-                if (node.flags & NodeFlags.Abstract ||
-                    subtreeFlags & TransformFlags.ContainsDecorators &&
-                    subtreeFlags & TransformFlags.ContainsComputedPropertyName) {
-                    transformFlags |= TransformFlags.AssertTypeScript;
+                // or has a decorator.
+                if ((<AccessorDeclaration>node).body === undefined
+                    || hasModifier(node, ModifierFlags.Async | ModifierFlags.Abstract)
+                    || subtreeFlags & TransformFlags.ContainsDecorators) {
+                    transformFlags = TransformFlags.AssertTypeScript;
                 }
 
                 break;
@@ -2244,7 +2194,7 @@ namespace ts {
             case SyntaxKind.ImportEqualsDeclaration:
                 // An ImportEqualsDeclaration with a namespace reference is TypeScript.
                 if (!isExternalModuleImportEqualsDeclaration(node)) {
-                    transformFlags |= TransformFlags.AssertTypeScript;
+                    transformFlags = TransformFlags.AssertTypeScript;
                 }
 
                 break;
@@ -2253,20 +2203,289 @@ namespace ts {
                 // If a PropertyAccessExpression starts with a super keyword, then it is
                 // ES6 syntax, and requires a lexical `this` binding.
                 if ((<PropertyAccessExpression>node).expression.kind === SyntaxKind.SuperKeyword) {
-                    transformFlags |= TransformFlags.ContainsLexicalThis;
+                    transformFlags = TransformFlags.ContainsLexicalThis;
                 }
 
                 break;
 
             case SyntaxKind.SourceFile:
                 if (subtreeFlags & TransformFlags.ContainsCapturedLexicalThis) {
-                    transformFlags |= TransformFlags.AssertES6;
+                    transformFlags = TransformFlags.AssertES6;
                 }
 
                 break;
         }
 
-        return (node.transformFlags = subtreeFlags | transformFlags)
-            & ~(node.excludeTransformFlags = excludeFlags | TransformFlags.NodeExcludes);
+        return updateTransformFlags(node, subtreeFlags, transformFlags, excludeFlags);
+    }
+
+    function computeCallExpression(node: CallExpression, subtreeFlags: TransformFlags) {
+        let transformFlags = TransformFlags.None;
+        if (subtreeFlags & TransformFlags.ContainsSpreadElementExpression
+            || isSuperCall(node)
+            || isSuperPropertyCall(node)) {
+            // If the this node contains a SpreadElementExpression, or is a super call, then it is an ES6
+            // node.
+            transformFlags = TransformFlags.AssertES6;
+        }
+
+        return updateTransformFlags(node, subtreeFlags, transformFlags, TransformFlags.ArrayLiteralOrCallOrNewExcludes);
+    }
+
+    function computeBinaryExpression(node: BinaryExpression, subtreeFlags: TransformFlags) {
+        let transformFlags = TransformFlags.None;
+        if (isDestructuringAssignment(node)) {
+            // Destructuring assignments are ES6 syntax.
+            transformFlags = TransformFlags.AssertES6 | TransformFlags.DestructuringAssignment;
+        }
+        else if (isExponentiation(node.operatorToken)) {
+            // Exponentiation is ES7 syntax.
+            transformFlags = TransformFlags.AssertES7;
+        }
+
+        return updateTransformFlags(node, subtreeFlags, transformFlags, TransformFlags.None);
+    }
+
+    function isDestructuringAssignment(node: BinaryExpression) {
+        return node.operatorToken.kind === SyntaxKind.EqualsToken
+            && isObjectOrArrayLiteral(node.left);
+    }
+
+    function isObjectOrArrayLiteral(node: Node) {
+        switch (node.kind) {
+            case SyntaxKind.ObjectLiteralExpression:
+            case SyntaxKind.ArrayLiteralExpression:
+                return true;
+        }
+
+        return false;
+    }
+
+    function isExponentiation(operatorToken: Node) {
+        switch (operatorToken.kind) {
+            case SyntaxKind.AsteriskAsteriskToken:
+            case SyntaxKind.AsteriskAsteriskEqualsToken:
+                return true;
+        }
+
+        return false;
+    }
+
+    function computeParameter(node: ParameterDeclaration, subtreeFlags: TransformFlags) {
+        let transformFlags = TransformFlags.None;
+        // If the parameter has a question token, then it is TypeScript syntax.
+        if (isDefined(node.questionToken)) {
+            transformFlags |= TransformFlags.AssertTypeScript;
+        }
+
+        // If the parameter's name is 'this', then it is TypeScript syntax.
+        if (subtreeFlags & TransformFlags.ContainsDecorators
+            || (node.name && isIdentifier(node.name) && node.name.originalKeywordKind === SyntaxKind.ThisKeyword)) {
+            transformFlags |= TransformFlags.AssertTypeScript;
+        }
+
+        // If a parameter has an accessibility modifier, then it is TypeScript syntax.
+        if (hasModifier(node, ModifierFlags.AccessibilityModifier)) {
+            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 || isDefined(node.initializer) || isDefined(node.dotDotDotToken)) {
+            transformFlags |= TransformFlags.AssertES6 | TransformFlags.ContainsDefaultValueAssignments;
+        }
+
+        return updateTransformFlags(node, subtreeFlags, transformFlags, TransformFlags.ParameterExcludes);
+    }
+
+    function computeParenthesizedExpression(node: ParenthesizedExpression, subtreeFlags: TransformFlags) {
+        let transformFlags = TransformFlags.None;
+        // 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 (node.expression.kind === SyntaxKind.AsExpression
+            || node.expression.kind === SyntaxKind.TypeAssertionExpression) {
+            transformFlags = TransformFlags.AssertTypeScript;
+        }
+
+        // If the expression of a ParenthesizedExpression is a destructuring assignment,
+        // then the ParenthesizedExpression is a destructuring assignment.
+        if (node.expression.transformFlags & TransformFlags.DestructuringAssignment) {
+            transformFlags |= TransformFlags.DestructuringAssignment;
+        }
+
+        return updateTransformFlags(node, subtreeFlags, transformFlags, TransformFlags.None);
+    }
+
+    function computeClassDeclaration(node: ClassDeclaration, subtreeFlags: TransformFlags) {
+        // An ambient declaration is TypeScript syntax.
+        if (hasModifier(node, ModifierFlags.Ambient)) {
+            return updateTransformFlags(node, TransformFlags.None, TransformFlags.TypeScript, TransformFlags.ClassExcludes);
+        }
+
+        // A ClassDeclaration is ES6 syntax.
+        let transformFlags = 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.ContainsParameterPropertyAssignments
+                | TransformFlags.ContainsPropertyInitializer
+                | TransformFlags.ContainsDecorators)
+            || hasModifier(node, 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;
+        }
+
+        return updateTransformFlags(node, subtreeFlags, transformFlags, TransformFlags.ClassExcludes);
+    }
+
+    function computeClassExpression(node: ClassExpression, subtreeFlags: TransformFlags) {
+        // A ClassExpression is ES6 syntax.
+        let transformFlags = TransformFlags.AssertES6;
+
+        // A class with a parameter property assignment, property initializer, or decorator is
+        // TypeScript syntax.
+        if (subtreeFlags
+            & (TransformFlags.ContainsParameterPropertyAssignments
+                | TransformFlags.ContainsPropertyInitializer
+                | TransformFlags.ContainsDecorators)) {
+            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;
+        }
+
+        return updateTransformFlags(node, subtreeFlags, transformFlags, TransformFlags.ClassExcludes);
+    }
+
+    function computeFunctionDeclaration(node: FunctionDeclaration, subtreeFlags: TransformFlags) {
+        const modifiers = getModifierFlags(node);
+
+        // An ambient declaration is TypeScript syntax.
+        // A FunctionDeclaration without a body is an overload and is TypeScript syntax.
+        if (!node.body || modifiers & ModifierFlags.Ambient) {
+            return updateTransformFlags(node, TransformFlags.None, TransformFlags.AssertTypeScript, TransformFlags.FunctionExcludes);
+        }
+
+        let transformFlags = TransformFlags.None;
+
+        // If a FunctionDeclaration is exported, then it is either ES6 or TypeScript syntax.
+        if (modifiers & ModifierFlags.Export) {
+            transformFlags |= TransformFlags.AssertTypeScript | TransformFlags.AssertES6;
+        }
+
+        // If a FunctionDeclaration is async, then it is TypeScript syntax.
+        if (modifiers & ModifierFlags.Async) {
+            transformFlags |= TransformFlags.AssertTypeScript;
+        }
+
+        // If a FunctionDeclaration has an asterisk token, is exported, or its
+        // subtree has marked the container as needing to capture the lexical `this`,
+        // then this node is ES6 syntax.
+        if (subtreeFlags & (TransformFlags.ContainsCapturedLexicalThis | TransformFlags.ContainsDefaultValueAssignments)) {
+            transformFlags |= TransformFlags.AssertES6;
+        }
+
+        if ((<FunctionDeclaration>node).asteriskToken) {
+            transformFlags |= TransformFlags.ContainsGenerators;
+        }
+
+        return updateTransformFlags(node, subtreeFlags, transformFlags, TransformFlags.FunctionExcludes);
+    }
+
+    function computeFunctionExpression(node: FunctionExpression, subtreeFlags: TransformFlags) {
+        let transformFlags = TransformFlags.None;
+
+        // An async function expression is TypeScript syntax.
+        if (hasModifier(node, ModifierFlags.Async)) {
+            transformFlags |= TransformFlags.AssertTypeScript;
+        }
+
+        // If a FunctionExpression contains an asterisk token, or its subtree has marked the container
+        // as needing to capture the lexical this, then this node is ES6 syntax.
+        if (subtreeFlags & (TransformFlags.ContainsCapturedLexicalThis | TransformFlags.ContainsDefaultValueAssignments)) {
+            transformFlags |= TransformFlags.AssertES6;
+        }
+
+        if ((<FunctionExpression>node).asteriskToken) {
+            transformFlags |= TransformFlags.ContainsGenerators;
+        }
+
+        return updateTransformFlags(node, subtreeFlags, 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 = TransformFlags.AssertES6;
+
+        // An async arrow function is TypeScript syntax.
+        if (hasModifier(node, 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;
+        }
+
+        return updateTransformFlags(node, subtreeFlags, transformFlags, TransformFlags.ArrowFunctionExcludes);
+    }
+
+    function computeVariableDeclaration(node: VariableDeclaration, subtreeFlags: TransformFlags) {
+        let transformFlags = TransformFlags.None;
+
+        // A VariableDeclaration with a binding pattern is ES6 syntax.
+        if (isBindingPattern(node.name)) {
+            transformFlags = TransformFlags.AssertES6 | TransformFlags.ContainsBindingPattern;
+        }
+
+        return updateTransformFlags(node, subtreeFlags, transformFlags, TransformFlags.None);
+    }
+
+    function computeVariableStatement(node: VariableStatement, subtreeFlags: TransformFlags) {
+        const modifiers = getModifierFlags(node);
+        // An ambient declaration is TypeScript syntax.
+        if (modifiers & ModifierFlags.Ambient) {
+            return updateTransformFlags(node, TransformFlags.None, TransformFlags.AssertTypeScript, TransformFlags.None);
+        }
+
+        let transformFlags = TransformFlags.None;
+
+        // If a VariableStatement is exported, then it is either ES6 or TypeScript syntax.
+        if (modifiers & ModifierFlags.Export) {
+            transformFlags = TransformFlags.AssertES6 | TransformFlags.AssertTypeScript;
+        }
+
+        if (node.declarationList.transformFlags & TransformFlags.ContainsBindingPattern) {
+            transformFlags |= TransformFlags.AssertES6;
+        }
+
+        return updateTransformFlags(node, subtreeFlags, transformFlags, TransformFlags.None);
+    }
+
+    function computeLabeledStatement(node: LabeledStatement, subtreeFlags: TransformFlags) {
+        let transformFlags = TransformFlags.None;
+
+        // A labeled statement containing a block scoped binding *may* need to be transformed from ES6.
+        if (subtreeFlags & TransformFlags.ContainsBlockScopedBinding
+            && isIterationStatement(this, /*lookInLabeledStatements*/ true)) {
+            transformFlags = TransformFlags.AssertES6;
+        }
+
+        return updateTransformFlags(node, subtreeFlags, transformFlags, TransformFlags.None);
+    }
+
+    function updateTransformFlags(node: Node, subtreeFlags: TransformFlags, transformFlags: TransformFlags, excludeFlags: TransformFlags) {
+        node.transformFlags = transformFlags | subtreeFlags | TransformFlags.HasComputedFlags;
+        node.excludeTransformFlags = excludeFlags | TransformFlags.NodeExcludes;
+        return node.transformFlags & ~node.excludeTransformFlags;
     }
 }
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 1541370e3bb..c2047d2b937 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -49,8 +49,9 @@ namespace ts {
 
         const compilerOptions = host.getCompilerOptions();
         const languageVersion = compilerOptions.target || ScriptTarget.ES3;
-        const modulekind = compilerOptions.module ? compilerOptions.module : languageVersion === ScriptTarget.ES6 ? ModuleKind.ES6 : ModuleKind.None;
+        const modulekind = getEmitModuleKind(compilerOptions);
         const allowSyntheticDefaultImports = typeof compilerOptions.allowSyntheticDefaultImports !== "undefined" ? compilerOptions.allowSyntheticDefaultImports : modulekind === ModuleKind.System;
+        const strictNullChecks = compilerOptions.strictNullChecks;
 
         const emitResolver = createResolver();
 
@@ -68,10 +69,7 @@ namespace ts {
             isUnknownSymbol: symbol => symbol === unknownSymbol,
             getDiagnostics,
             getGlobalDiagnostics,
-
-            // The language service will always care about the narrowed type of a symbol, because that is
-            // the type the language says the symbol should have.
-            getTypeOfSymbolAtLocation: getNarrowedTypeOfSymbol,
+            getTypeOfSymbolAtLocation,
             getSymbolsOfParameterPropertyDeclaration,
             getDeclaredTypeOfSymbol,
             getPropertiesOfType,
@@ -85,6 +83,7 @@ namespace ts {
             getShorthandAssignmentValueSymbol,
             getExportSpecifierLocalTargetSymbol,
             getTypeAtLocation: getTypeOfNode,
+            getPropertySymbolOfDestructuringAssignment,
             typeToString,
             getSymbolDisplayBuilder,
             symbolToString,
@@ -109,14 +108,16 @@ namespace ts {
         const unknownSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "unknown");
         const resolvingSymbol = createSymbol(SymbolFlags.Transient, "__resolving__");
 
+        const nullableWideningFlags = strictNullChecks ? 0 : TypeFlags.ContainsUndefinedOrNull;
         const anyType = createIntrinsicType(TypeFlags.Any, "any");
         const stringType = createIntrinsicType(TypeFlags.String, "string");
         const numberType = createIntrinsicType(TypeFlags.Number, "number");
         const booleanType = createIntrinsicType(TypeFlags.Boolean, "boolean");
         const esSymbolType = createIntrinsicType(TypeFlags.ESSymbol, "symbol");
         const voidType = createIntrinsicType(TypeFlags.Void, "void");
-        const undefinedType = createIntrinsicType(TypeFlags.Undefined | TypeFlags.ContainsUndefinedOrNull, "undefined");
-        const nullType = createIntrinsicType(TypeFlags.Null | TypeFlags.ContainsUndefinedOrNull, "null");
+        const undefinedType = createIntrinsicType(TypeFlags.Undefined | nullableWideningFlags, "undefined");
+        const nullType = createIntrinsicType(TypeFlags.Null | nullableWideningFlags, "null");
+        const emptyArrayElementType = createIntrinsicType(TypeFlags.Undefined | TypeFlags.ContainsUndefinedOrNull, "undefined");
         const unknownType = createIntrinsicType(TypeFlags.Any, "unknown");
 
         const emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
@@ -131,14 +132,14 @@ namespace ts {
 
         const noConstraintType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
 
-        const anySignature = createSignature(undefined, undefined, emptyArray, anyType, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false);
-        const unknownSignature = createSignature(undefined, undefined, emptyArray, unknownType, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false);
+        const anySignature = createSignature(undefined, undefined, undefined, emptyArray, anyType, /*typePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false);
+        const unknownSignature = createSignature(undefined, undefined, undefined, emptyArray, unknownType, /*typePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false);
 
         const enumNumberIndexInfo = createIndexInfo(stringType, /*isReadonly*/ true);
 
         const globals: SymbolTable = {};
 
-        let globalESSymbolConstructorSymbol: Symbol;
+        let getGlobalESSymbolConstructorSymbol: () => Symbol;
 
         let getGlobalPromiseConstructorSymbol: () => Symbol;
 
@@ -150,14 +151,19 @@ namespace ts {
         let globalNumberType: ObjectType;
         let globalBooleanType: ObjectType;
         let globalRegExpType: ObjectType;
-        let globalTemplateStringsArrayType: ObjectType;
-        let globalESSymbolType: ObjectType;
-        let globalIterableType: GenericType;
-        let globalIteratorType: GenericType;
-        let globalIterableIteratorType: GenericType;
-
         let anyArrayType: Type;
         let anyReadonlyArrayType: Type;
+
+        // The library files are only loaded when the feature is used.
+        // This allows users to just specify library files they want to used through --lib
+        // and they will not get an error from not having unrelated library files
+        let getGlobalTemplateStringsArrayType: () => ObjectType;
+
+        let getGlobalESSymbolType: () => ObjectType;
+        let getGlobalIterableType: () => GenericType;
+        let getGlobalIteratorType: () => GenericType;
+        let getGlobalIterableIteratorType: () => GenericType;
+
         let getGlobalClassDecoratorType: () => ObjectType;
         let getGlobalParameterDecoratorType: () => ObjectType;
         let getGlobalPropertyDecoratorType: () => ObjectType;
@@ -229,6 +235,7 @@ namespace ts {
 
         const subtypeRelation: Map<RelationComparisonResult> = {};
         const assignableRelation: Map<RelationComparisonResult> = {};
+        const comparableRelation: Map<RelationComparisonResult> = {};
         const identityRelation: Map<RelationComparisonResult> = {};
 
         // This is for caching the result of getSymbolDisplayBuilder. Do not access directly.
@@ -378,7 +385,7 @@ namespace ts {
 
         function mergeModuleAugmentation(moduleName: LiteralExpression): void {
             const moduleAugmentation = <ModuleDeclaration>moduleName.parent;
-            if (moduleAugmentation.symbol.valueDeclaration !== moduleAugmentation) {
+            if (moduleAugmentation.symbol.declarations[0] !== moduleAugmentation) {
                 // this is a combined symbol for multiple augmentations within the same file.
                 // its symbol already has accumulated information for all declarations
                 // so we need to add it just once - do the work only for first declaration
@@ -467,10 +474,10 @@ namespace ts {
          * @return a tuple of two symbols
          */
         function getSymbolsOfParameterPropertyDeclaration(parameter: ParameterDeclaration, parameterName: string): [Symbol, Symbol] {
-            const constructoDeclaration = parameter.parent;
+            const constructorDeclaration = parameter.parent;
             const classDeclaration = parameter.parent.parent;
 
-            const parameterSymbol = getSymbol(constructoDeclaration.locals, parameterName, SymbolFlags.Value);
+            const parameterSymbol = getSymbol(constructorDeclaration.locals, parameterName, SymbolFlags.Value);
             const propertySymbol = getSymbol(classDeclaration.symbol.members, parameterName, SymbolFlags.Value);
 
             if (parameterSymbol && propertySymbol) {
@@ -535,7 +542,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) {
@@ -653,7 +660,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)) {
@@ -667,7 +674,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.
@@ -824,7 +831,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));
@@ -892,8 +899,12 @@ namespace ts {
 
         function getTargetOfImportClause(node: ImportClause): Symbol {
             const moduleSymbol = resolveExternalModuleName(node, (<ImportDeclaration>node.parent).moduleSpecifier);
+
             if (moduleSymbol) {
-                const exportDefaultSymbol = resolveSymbol(moduleSymbol.exports["default"]);
+                const exportDefaultSymbol = moduleSymbol.exports["export="] ?
+                    getPropertyOfType(getTypeOfSymbol(moduleSymbol.exports["export="]), "default") :
+                    resolveSymbol(moduleSymbol.exports["default"]);
+
                 if (!exportDefaultSymbol && !allowSyntheticDefaultImports) {
                     error(node.name, Diagnostics.Module_0_has_no_default_export, symbolToString(moduleSymbol));
                 }
@@ -964,8 +975,15 @@ namespace ts {
             if (targetSymbol) {
                 const name = specifier.propertyName || specifier.name;
                 if (name.text) {
+                    let symbolFromVariable: Symbol;
+                    // First check if module was specified with "export=". If so, get the member from the resolved type
+                    if (moduleSymbol && moduleSymbol.exports && moduleSymbol.exports["export="]) {
+                        symbolFromVariable = getPropertyOfType(getTypeOfSymbol(targetSymbol), name.text);
+                    }
+                    else {
+                        symbolFromVariable = getPropertyOfVariable(targetSymbol, name.text);
+                    }
                     const symbolFromModule = getExportOfModule(targetSymbol, name.text);
-                    const symbolFromVariable = getPropertyOfVariable(targetSymbol, name.text);
                     const symbol = symbolFromModule && symbolFromVariable ?
                         combineValueAndTypeSymbols(symbolFromVariable, symbolFromModule) :
                         symbolFromModule || symbolFromVariable;
@@ -981,6 +999,10 @@ namespace ts {
             return getExternalModuleMember(<ImportDeclaration>node.parent.parent.parent, node);
         }
 
+        function getTargetOfGlobalModuleExportDeclaration(node: GlobalModuleExportDeclaration): Symbol {
+            return resolveExternalModuleSymbol(node.parent.symbol);
+        }
+
         function getTargetOfExportSpecifier(node: ExportSpecifier): Symbol {
             return (<ExportDeclaration>node.parent.parent).moduleSpecifier ?
                 getExternalModuleMember(<ExportDeclaration>node.parent.parent, node) :
@@ -1005,6 +1027,8 @@ namespace ts {
                     return getTargetOfExportSpecifier(<ExportSpecifier>node);
                 case SyntaxKind.ExportAssignment:
                     return getTargetOfExportAssignment(<ExportAssignment>node);
+                case SyntaxKind.GlobalModuleExportDeclaration:
+                    return getTargetOfGlobalModuleExportDeclaration(<GlobalModuleExportDeclaration>node);
             }
         }
 
@@ -1101,7 +1125,7 @@ namespace ts {
         }
 
         // Resolves a qualified name and any involved aliases
-        function resolveEntityName(name: EntityName | Expression, meaning: SymbolFlags, ignoreErrors?: boolean): Symbol {
+        function resolveEntityName(name: EntityName | Expression, meaning: SymbolFlags, ignoreErrors?: boolean, location?: Node): Symbol {
             if (nodeIsMissing(name)) {
                 return undefined;
             }
@@ -1110,7 +1134,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;
                 }
@@ -1119,7 +1143,7 @@ namespace ts {
                 const left = name.kind === SyntaxKind.QualifiedName ? (<QualifiedName>name).left : (<PropertyAccessExpression>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, location);
                 if (!namespace || namespace === unknownSymbol || nodeIsMissing(right)) {
                     return undefined;
                 }
@@ -1159,7 +1183,7 @@ namespace ts {
 
             const isRelative = isExternalModuleNameRelative(moduleName);
             if (!isRelative) {
-                const symbol = getSymbol(globals, "\"" + moduleName + "\"", SymbolFlags.ValueModule);
+                const symbol = getSymbol(globals, '"' + moduleName + '"', SymbolFlags.ValueModule);
                 if (symbol) {
                     // merged symbol is module declaration symbol combined with all augmentations
                     return getMergedSymbol(symbol);
@@ -1427,12 +1451,6 @@ namespace ts {
                             return result;
                         }
                         break;
-                    case SyntaxKind.ClassDeclaration:
-                    case SyntaxKind.InterfaceDeclaration:
-                        if (result = callback(getSymbolOfNode(location).members)) {
-                            return result;
-                        }
-                        break;
                 }
             }
 
@@ -1460,7 +1478,7 @@ namespace ts {
                 function isAccessible(symbolFromSymbolTable: Symbol, resolvedAliasSymbol?: Symbol) {
                     if (symbol === (resolvedAliasSymbol || symbolFromSymbolTable)) {
                         // if the symbolFromSymbolTable is not external module (it could be if it was determined as ambient external module and would be in globals table)
-                        // and if symbolfrom symbolTable or alias resolution matches the symbol,
+                        // and if symbolFromSymbolTable or alias resolution matches the symbol,
                         // check the symbol can be qualified, it is only then this symbol is accessible
                         return !forEach(symbolFromSymbolTable.declarations, hasExternalModuleSymbol) &&
                             canQualifySymbol(symbolFromSymbolTable, meaning);
@@ -1498,7 +1516,9 @@ namespace ts {
             }
 
             if (symbol) {
-                return forEachSymbolTableInScope(enclosingDeclaration, getAccessibleSymbolChainFromSymbolTable);
+                if (!(isPropertyOrMethodDeclarationSymbol(symbol))) {
+                    return forEachSymbolTableInScope(enclosingDeclaration, getAccessibleSymbolChainFromSymbolTable);
+                }
             }
         }
 
@@ -1531,7 +1551,25 @@ namespace ts {
             return qualify;
         }
 
-        function isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags): SymbolAccessiblityResult {
+        function isPropertyOrMethodDeclarationSymbol(symbol: Symbol) {
+            if (symbol.declarations && symbol.declarations.length) {
+                for (const declaration of symbol.declarations) {
+                    switch (declaration.kind) {
+                        case SyntaxKind.PropertyDeclaration:
+                        case SyntaxKind.MethodDeclaration:
+                        case SyntaxKind.GetAccessor:
+                        case SyntaxKind.SetAccessor:
+                            continue;
+                        default:
+                            return false;
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
+
+        function isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags): SymbolAccessibilityResult {
             if (symbol && enclosingDeclaration && !(symbol.flags & SymbolFlags.TypeParameter)) {
                 const initialSymbol = symbol;
                 let meaningToLook = meaning;
@@ -1541,7 +1579,7 @@ namespace ts {
                     if (accessibleSymbolChain) {
                         const hasAccessibleDeclarations = hasVisibleDeclarations(accessibleSymbolChain[0]);
                         if (!hasAccessibleDeclarations) {
-                            return <SymbolAccessiblityResult>{
+                            return <SymbolAccessibilityResult>{
                                 accessibility: SymbolAccessibility.NotAccessible,
                                 errorSymbolName: symbolToString(initialSymbol, enclosingDeclaration, meaning),
                                 errorModuleName: symbol !== initialSymbol ? symbolToString(symbol, enclosingDeclaration, SymbolFlags.Namespace) : undefined,
@@ -1617,7 +1655,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) {
@@ -1642,7 +1680,7 @@ namespace ts {
         function isEntityNameVisible(entityName: EntityName | Expression, enclosingDeclaration: Node): SymbolVisibilityResult {
             // get symbol of the first identifier of the entityName
             let meaning: SymbolFlags;
-            if (entityName.parent.kind === SyntaxKind.TypeQuery) {
+            if (entityName.parent.kind === SyntaxKind.TypeQuery || isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
                 // Typeof value
                 meaning = SymbolFlags.Value | SymbolFlags.ExportValue;
             }
@@ -1711,6 +1749,25 @@ namespace ts {
             return result;
         }
 
+        function typePredicateToString(typePredicate: TypePredicate, enclosingDeclaration?: Declaration, flags?: TypeFormatFlags): string {
+            const writer = getSingleLineStringWriter();
+            getSymbolDisplayBuilder().buildTypePredicateDisplay(typePredicate, writer, enclosingDeclaration, flags);
+            const result = writer.string();
+            releaseStringWriter(writer);
+
+            return result;
+        }
+
+        function visibilityToString(flags: ModifierFlags) {
+            if (flags === ModifierFlags.Private) {
+                return "private";
+            }
+            if (flags === ModifierFlags.Protected) {
+                return "protected";
+            }
+            return "public";
+        }
+
         function getTypeAliasForTypeLiteral(type: Type): Symbol {
             if (type.symbol && type.symbol.flags & SymbolFlags.TypeLiteral) {
                 let node = type.symbol.declarations[0].parent;
@@ -1844,16 +1901,10 @@ namespace ts {
                 function writeType(type: Type, flags: TypeFormatFlags) {
                     // Write undefined/null type as any
                     if (type.flags & TypeFlags.Intrinsic) {
-                        if (type.flags & TypeFlags.PredicateType) {
-                            buildTypePredicateDisplay(writer, (type as PredicateType).predicate);
-                            buildTypeDisplay((type as PredicateType).predicate.type, writer, enclosingDeclaration, flags, symbolStack);
-                        }
-                        else {
-                            // Special handling for unknown / resolving types, they should show up as any and not unknown or __resolving
-                            writer.writeKeyword(!(globalFlags & TypeFormatFlags.WriteOwnNameForAnyLike) && isTypeAny(type)
-                                ? "any"
-                                : (<IntrinsicType>type).intrinsicName);
-                        }
+                        // Special handling for unknown / resolving types, they should show up as any and not unknown or __resolving
+                        writer.writeKeyword(!(globalFlags & TypeFormatFlags.WriteOwnNameForAnyLike) && isTypeAny(type)
+                            ? "any"
+                            : (<IntrinsicType>type).intrinsicName);
                     }
                     else if (type.flags & TypeFlags.ThisType) {
                         if (inObjectTypeLiteral) {
@@ -2014,7 +2065,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 =>
@@ -2140,10 +2191,10 @@ namespace ts {
                 }
             }
 
-            function buildTypeParameterDisplayFromSymbol(symbol: Symbol, writer: SymbolWriter, enclosingDeclaraiton?: Node, flags?: TypeFormatFlags) {
+            function buildTypeParameterDisplayFromSymbol(symbol: Symbol, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags) {
                 const targetSymbol = getTargetSymbol(symbol);
                 if (targetSymbol.flags & SymbolFlags.Class || targetSymbol.flags & SymbolFlags.Interface || targetSymbol.flags & SymbolFlags.TypeAlias) {
-                    buildDisplayForTypeParametersAndDelimiters(getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol), writer, enclosingDeclaraiton, flags);
+                    buildDisplayForTypeParametersAndDelimiters(getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol), writer, enclosingDeclaration, flags);
                 }
             }
 
@@ -2163,7 +2214,12 @@ namespace ts {
                 if (isRestParameter(parameterNode)) {
                     writePunctuation(writer, SyntaxKind.DotDotDotToken);
                 }
-                appendSymbolNameOnly(p, writer);
+                if (isBindingPattern(parameterNode.name)) {
+                    buildBindingPatternDisplay(<BindingPattern>parameterNode.name, writer, enclosingDeclaration, flags, symbolStack);
+                }
+                else {
+                    appendSymbolNameOnly(p, writer);
+                }
                 if (isOptionalParameter(parameterNode)) {
                     writePunctuation(writer, SyntaxKind.QuestionToken);
                 }
@@ -2173,20 +2229,63 @@ namespace ts {
                 buildTypeDisplay(getTypeOfSymbol(p), writer, enclosingDeclaration, flags, symbolStack);
             }
 
+            function buildBindingPatternDisplay(bindingPattern: BindingPattern, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags, symbolStack?: Symbol[]) {
+                // We have to explicitly emit square bracket and bracket because these tokens are not stored inside the node.
+                if (bindingPattern.kind === SyntaxKind.ObjectBindingPattern) {
+                    writePunctuation(writer, SyntaxKind.OpenBraceToken);
+                    buildDisplayForCommaSeparatedList(bindingPattern.elements, writer, e => buildBindingElementDisplay(e, writer, enclosingDeclaration, flags, symbolStack));
+                    writePunctuation(writer, SyntaxKind.CloseBraceToken);
+                }
+                else if (bindingPattern.kind === SyntaxKind.ArrayBindingPattern) {
+                    writePunctuation(writer, SyntaxKind.OpenBracketToken);
+                    const elements = bindingPattern.elements;
+                    buildDisplayForCommaSeparatedList(elements, writer, e => buildBindingElementDisplay(e, writer, enclosingDeclaration, flags, symbolStack));
+                    if (elements && elements.hasTrailingComma) {
+                        writePunctuation(writer, SyntaxKind.CommaToken);
+                    }
+                    writePunctuation(writer, SyntaxKind.CloseBracketToken);
+                }
+            }
+
+            function buildBindingElementDisplay(bindingElement: BindingElement, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags, symbolStack?: Symbol[]) {
+                if (bindingElement.kind === SyntaxKind.OmittedExpression) {
+                    return;
+                }
+                Debug.assert(bindingElement.kind === SyntaxKind.BindingElement);
+                if (bindingElement.propertyName) {
+                    writer.writeSymbol(getTextOfNode(bindingElement.propertyName), bindingElement.symbol);
+                    writePunctuation(writer, SyntaxKind.ColonToken);
+                    writeSpace(writer);
+                }
+                if (isBindingPattern(bindingElement.name)) {
+                    buildBindingPatternDisplay(<BindingPattern>bindingElement.name, writer, enclosingDeclaration, flags, symbolStack);
+                }
+                else {
+                    if (bindingElement.dotDotDotToken) {
+                        writePunctuation(writer, SyntaxKind.DotDotDotToken);
+                    }
+                    appendSymbolNameOnly(bindingElement.symbol, writer);
+                }
+            }
+
             function buildDisplayForTypeParametersAndDelimiters(typeParameters: TypeParameter[], writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags, symbolStack?: Symbol[]) {
                 if (typeParameters && typeParameters.length) {
                     writePunctuation(writer, SyntaxKind.LessThanToken);
-                    for (let i = 0; i < typeParameters.length; i++) {
-                        if (i > 0) {
-                            writePunctuation(writer, SyntaxKind.CommaToken);
-                            writeSpace(writer);
-                        }
-                        buildTypeParameterDisplay(typeParameters[i], writer, enclosingDeclaration, flags, symbolStack);
-                    }
+                    buildDisplayForCommaSeparatedList(typeParameters, writer, p => buildTypeParameterDisplay(p, writer, enclosingDeclaration, flags, symbolStack));
                     writePunctuation(writer, SyntaxKind.GreaterThanToken);
                 }
             }
 
+            function buildDisplayForCommaSeparatedList<T>(list: T[], writer: SymbolWriter, action: (item: T) => void) {
+                for (let i = 0; i < list.length; i++) {
+                    if (i > 0) {
+                        writePunctuation(writer, SyntaxKind.CommaToken);
+                        writeSpace(writer);
+                    }
+                    action(list[i]);
+                }
+            }
+
             function buildDisplayForTypeArgumentsAndDelimiters(typeParameters: TypeParameter[], mapper: TypeMapper, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags, symbolStack?: Symbol[]) {
                 if (typeParameters && typeParameters.length) {
                     writePunctuation(writer, SyntaxKind.LessThanToken);
@@ -2201,10 +2300,16 @@ namespace ts {
                 }
             }
 
-            function buildDisplayForParametersAndDelimiters(parameters: Symbol[], writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags, symbolStack?: Symbol[]) {
+            function buildDisplayForParametersAndDelimiters(thisType: Type, parameters: Symbol[], writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags, symbolStack?: Symbol[]) {
                 writePunctuation(writer, SyntaxKind.OpenParenToken);
+                if (thisType) {
+                    writeKeyword(writer, SyntaxKind.ThisKeyword);
+                    writePunctuation(writer, SyntaxKind.ColonToken);
+                    writeSpace(writer);
+                    buildTypeDisplay(thisType, writer, enclosingDeclaration, flags, symbolStack);
+                }
                 for (let i = 0; i < parameters.length; i++) {
-                    if (i > 0) {
+                    if (i > 0 || thisType) {
                         writePunctuation(writer, SyntaxKind.CommaToken);
                         writeSpace(writer);
                     }
@@ -2213,7 +2318,7 @@ namespace ts {
                 writePunctuation(writer, SyntaxKind.CloseParenToken);
             }
 
-            function buildTypePredicateDisplay(writer: SymbolWriter, predicate: TypePredicate) {
+            function buildTypePredicateDisplay(predicate: TypePredicate, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags, symbolStack?: Symbol[]): void {
                 if (isIdentifierTypePredicate(predicate)) {
                     writer.writeParameter(predicate.parameterName);
                 }
@@ -2223,6 +2328,7 @@ namespace ts {
                 writeSpace(writer);
                 writeKeyword(writer, SyntaxKind.IsKeyword);
                 writeSpace(writer);
+                buildTypeDisplay(predicate.type, writer, enclosingDeclaration, flags, symbolStack);
             }
 
             function buildReturnTypeDisplay(signature: Signature, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags, symbolStack?: Symbol[]) {
@@ -2235,8 +2341,13 @@ namespace ts {
                 }
                 writeSpace(writer);
 
-                const returnType = getReturnTypeOfSignature(signature);
-                buildTypeDisplay(returnType, writer, enclosingDeclaration, flags, symbolStack);
+                if (signature.typePredicate) {
+                    buildTypePredicateDisplay(signature.typePredicate, writer, enclosingDeclaration, flags, symbolStack);
+                }
+                else {
+                    const returnType = getReturnTypeOfSignature(signature);
+                    buildTypeDisplay(returnType, writer, enclosingDeclaration, flags, symbolStack);
+                }
             }
 
             function buildSignatureDisplay(signature: Signature, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags, kind?: SignatureKind, symbolStack?: Symbol[]) {
@@ -2254,7 +2365,8 @@ namespace ts {
                     buildDisplayForTypeParametersAndDelimiters(signature.typeParameters, writer, enclosingDeclaration, flags, symbolStack);
                 }
 
-                buildDisplayForParametersAndDelimiters(signature.parameters, writer, enclosingDeclaration, flags, symbolStack);
+                buildDisplayForParametersAndDelimiters(signature.thisType, signature.parameters, writer, enclosingDeclaration, flags, symbolStack);
+
                 buildReturnTypeDisplay(signature, writer, enclosingDeclaration, flags, symbolStack);
             }
 
@@ -2262,6 +2374,7 @@ namespace ts {
                 buildSymbolDisplay,
                 buildTypeDisplay,
                 buildTypeParameterDisplay,
+                buildTypePredicateDisplay,
                 buildParameterDisplay,
                 buildDisplayForParametersAndDelimiters,
                 buildDisplayForTypeParametersAndDelimiters,
@@ -2306,7 +2419,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);
                         }
@@ -2319,7 +2432,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;
                         }
@@ -2360,7 +2473,7 @@ namespace ts {
                         return false;
 
                     default:
-                        Debug.fail("isDeclarationVisible unknown: SyntaxKind: " + node.kind);
+                        return false;
                 }
             }
         }
@@ -2535,7 +2648,7 @@ namespace ts {
             return name.kind === SyntaxKind.ComputedPropertyName && !isStringOrNumericLiteral((<ComputedPropertyName>name).expression.kind);
         }
 
-        // Return the inferred type for a binding element
+        /** Return the inferred type for a binding element */
         function getTypeForBindingElement(declaration: BindingElement): Type {
             const pattern = <BindingPattern>declaration.parent;
             const parentType = getTypeForBindingElementParent(<VariableLikeDeclaration>pattern.parent);
@@ -2561,6 +2674,9 @@ namespace ts {
                     // computed properties with non-literal names are treated as 'any'
                     return anyType;
                 }
+                if (declaration.initializer) {
+                    getContextualType(declaration.initializer);
+                }
 
                 // Use type of the specified property, or otherwise, for a numeric name, the type of the numeric index signature,
                 // or otherwise the type of the string index signature.
@@ -2600,6 +2716,11 @@ namespace ts {
                     type = createArrayType(elementType);
                 }
             }
+            // In strict null checking mode, if a default value of a non-undefined type is specified, remove
+            // undefined from the final type.
+            if (strictNullChecks && declaration.initializer && !(getNullableKind(checkExpressionCached(declaration.initializer)) & TypeFlags.Undefined)) {
+                type = removeNullableKind(type, TypeFlags.Undefined);
+            }
             return type;
         }
 
@@ -2613,7 +2734,7 @@ namespace ts {
         function getJSDocTypeForVariableLikeDeclarationFromJSDocComment(declaration: VariableLikeDeclaration): JSDocType {
             // First, see if this node has an @type annotation on it directly.
             const typeTag = getJSDocTypeTag(declaration);
-            if (typeTag) {
+            if (typeTag && typeTag.typeExpression) {
                 return typeTag.typeExpression.type;
             }
 
@@ -2623,7 +2744,7 @@ namespace ts {
 
                 // @type annotation might have been on the variable statement, try that instead.
                 const annotation = getJSDocTypeTag(declaration.parent.parent);
-                if (annotation) {
+                if (annotation && annotation.typeExpression) {
                     return annotation.typeExpression.type;
                 }
             }
@@ -2670,7 +2791,8 @@ namespace ts {
 
             // Use type from type annotation if one is present
             if (declaration.type) {
-                return getTypeFromTypeNode(declaration.type);
+                const type = getTypeFromTypeNode(declaration.type);
+                return strictNullChecks && declaration.questionToken ? addNullableKind(type, TypeFlags.Undefined) : type;
             }
 
             if (declaration.kind === SyntaxKind.Parameter) {
@@ -2683,9 +2805,11 @@ namespace ts {
                     }
                 }
                 // Use contextual parameter type if one is available
-                const type = getContextuallyTypedParameterType(<ParameterDeclaration>declaration);
+                const type = declaration.symbol.name === "this"
+                    ? getContextuallyTypedThisType(func)
+                    : getContextuallyTypedParameterType(<ParameterDeclaration>declaration);
                 if (type) {
-                    return type;
+                    return strictNullChecks && declaration.questionToken ? addNullableKind(type, TypeFlags.Undefined) : type;
                 }
             }
 
@@ -2713,11 +2837,16 @@ namespace ts {
         // pattern. Otherwise, it is the type any.
         function getTypeFromBindingElement(element: BindingElement, includePatternInType?: boolean): Type {
             if (element.initializer) {
-                return getWidenedType(checkExpressionCached(element.initializer));
+                const type = checkExpressionCached(element.initializer);
+                reportErrorsFromWidening(element, type);
+                return getWidenedType(type);
             }
             if (isBindingPattern(element.name)) {
                 return getTypeFromBindingPattern(<BindingPattern>element.name, includePatternInType);
             }
+            if (compilerOptions.noImplicitAny && !declarationBelongsToPrivateAmbientMember(element)) {
+                reportImplicitAnyError(element, anyType);
+            }
             return anyType;
         }
 
@@ -2800,9 +2929,6 @@ namespace ts {
                 if (declaration.kind === SyntaxKind.PropertyAssignment) {
                     return type;
                 }
-                if (type.flags & TypeFlags.PredicateType && (declaration.kind === SyntaxKind.PropertyDeclaration || declaration.kind === SyntaxKind.PropertySignature)) {
-                    return type;
-                }
                 return getWidenedType(type);
             }
 
@@ -2811,14 +2937,19 @@ namespace ts {
 
             // Report implicit any errors unless this is a private property within an ambient declaration
             if (reportErrors && compilerOptions.noImplicitAny) {
-                const root = getRootDeclaration(declaration);
-                if (!isPrivateWithinAmbient(root) && !(root.kind === SyntaxKind.Parameter && isPrivateWithinAmbient(root.parent))) {
+                if (!declarationBelongsToPrivateAmbientMember(declaration)) {
                     reportImplicitAnyError(declaration, type);
                 }
             }
             return type;
         }
 
+        function declarationBelongsToPrivateAmbientMember(declaration: VariableLikeDeclaration) {
+            const root = getRootDeclaration(declaration);
+            const memberDeclaration = root.kind === SyntaxKind.Parameter ? root.parent : root;
+            return isPrivateWithinAmbient(memberDeclaration);
+        }
+
         function getTypeOfVariableOrParameterOrProperty(symbol: Symbol): Type {
             const links = getSymbolLinks(symbol);
             if (!links.type) {
@@ -2889,12 +3020,22 @@ namespace ts {
         function getTypeOfAccessors(symbol: Symbol): Type {
             const links = getSymbolLinks(symbol);
             if (!links.type) {
+                const getter = <AccessorDeclaration>getDeclarationOfKind(symbol, SyntaxKind.GetAccessor);
+                const setter = <AccessorDeclaration>getDeclarationOfKind(symbol, SyntaxKind.SetAccessor);
+
+                if (getter && getter.flags & NodeFlags.JavaScriptFile) {
+                    const jsDocType = getTypeForVariableLikeDeclarationFromJSDocComment(getter);
+                    if (jsDocType) {
+                        return links.type = jsDocType;
+                    }
+                }
+
                 if (!pushTypeResolution(symbol, TypeSystemPropertyName.Type)) {
                     return unknownType;
                 }
-                const getter = <AccessorDeclaration>getDeclarationOfKind(symbol, SyntaxKind.GetAccessor);
-                const setter = <AccessorDeclaration>getDeclarationOfKind(symbol, SyntaxKind.SetAccessor);
+
                 let type: Type;
+
                 // First try to see if the user specified a return type on the get-accessor.
                 const getterReturnType = getAnnotatedAccessorType(getter);
                 if (getterReturnType) {
@@ -3388,6 +3529,8 @@ namespace ts {
                 case SyntaxKind.BooleanKeyword:
                 case SyntaxKind.SymbolKeyword:
                 case SyntaxKind.VoidKeyword:
+                case SyntaxKind.UndefinedKeyword:
+                case SyntaxKind.NullKeyword:
                 case SyntaxKind.StringLiteralType:
                     return true;
                 case SyntaxKind.ArrayType:
@@ -3421,7 +3564,7 @@ namespace ts {
         // Returns true if the class or interface member given by the symbol is free of "this" references. The
         // function may return false for symbols that are actually free of "this" references because it is not
         // feasible to perform a complete analysis in all cases. In particular, property members with types
-        // inferred from their initializers and function members with inferred return types are convervatively
+        // inferred from their initializers and function members with inferred return types are conservatively
         // assumed not to be free of "this" references.
         function isIndependentMember(symbol: Symbol): boolean {
             if (symbol.declarations && symbol.declarations.length === 1) {
@@ -3532,13 +3675,15 @@ namespace ts {
             resolveObjectTypeMembers(type, source, typeParameters, typeArguments);
         }
 
-        function createSignature(declaration: SignatureDeclaration, typeParameters: TypeParameter[], parameters: Symbol[],
-            resolvedReturnType: Type, minArgumentCount: number, hasRestParameter: boolean, hasStringLiterals: boolean): Signature {
+        function createSignature(declaration: SignatureDeclaration, typeParameters: TypeParameter[], thisType: Type, parameters: Symbol[],
+            resolvedReturnType: Type, typePredicate: TypePredicate, minArgumentCount: number, hasRestParameter: boolean, hasStringLiterals: boolean): Signature {
             const sig = new Signature(checker);
             sig.declaration = declaration;
             sig.typeParameters = typeParameters;
             sig.parameters = parameters;
+            sig.thisType = thisType;
             sig.resolvedReturnType = resolvedReturnType;
+            sig.typePredicate = typePredicate;
             sig.minArgumentCount = minArgumentCount;
             sig.hasRestParameter = hasRestParameter;
             sig.hasStringLiterals = hasStringLiterals;
@@ -3546,15 +3691,15 @@ namespace ts {
         }
 
         function cloneSignature(sig: Signature): Signature {
-            return createSignature(sig.declaration, sig.typeParameters, sig.parameters, sig.resolvedReturnType,
-                sig.minArgumentCount, sig.hasRestParameter, sig.hasStringLiterals);
+            return createSignature(sig.declaration, sig.typeParameters, sig.thisType, sig.parameters, sig.resolvedReturnType,
+                sig.typePredicate, sig.minArgumentCount, sig.hasRestParameter, sig.hasStringLiterals);
         }
 
         function getDefaultConstructSignatures(classType: InterfaceType): Signature[] {
             const baseConstructorType = getBaseConstructorTypeOfClass(classType);
             const baseSignatures = getSignaturesOfType(baseConstructorType, SignatureKind.Construct);
             if (baseSignatures.length === 0) {
-                return [createSignature(undefined, classType.localTypeParameters, emptyArray, classType, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false)];
+                return [createSignature(undefined, classType.localTypeParameters, undefined, emptyArray, classType, /*typePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false)];
             }
             const baseTypeNode = getBaseTypeNodeOfClass(classType);
             const typeArguments = map(baseTypeNode.typeArguments, getTypeFromTypeNode);
@@ -3591,9 +3736,9 @@ namespace ts {
             setObjectTypeMembers(type, members, arrayType.callSignatures, arrayType.constructSignatures, arrayType.stringIndexInfo, arrayType.numberIndexInfo);
         }
 
-        function findMatchingSignature(signatureList: Signature[], signature: Signature, partialMatch: boolean, ignoreReturnTypes: boolean): Signature {
+        function findMatchingSignature(signatureList: Signature[], signature: Signature, partialMatch: boolean, ignoreThisTypes: boolean, ignoreReturnTypes: boolean): Signature {
             for (const s of signatureList) {
-                if (compareSignaturesIdentical(s, signature, partialMatch, ignoreReturnTypes, compareTypesIdentical)) {
+                if (compareSignaturesIdentical(s, signature, partialMatch, ignoreThisTypes, ignoreReturnTypes, compareTypesIdentical)) {
                     return s;
                 }
             }
@@ -3607,7 +3752,7 @@ namespace ts {
                     return undefined;
                 }
                 for (let i = 1; i < signatureLists.length; i++) {
-                    if (!findMatchingSignature(signatureLists[i], signature, /*partialMatch*/ false, /*ignoreReturnTypes*/ false)) {
+                    if (!findMatchingSignature(signatureLists[i], signature, /*partialMatch*/ false, /*ignoreThisTypes*/ false, /*ignoreReturnTypes*/ false)) {
                         return undefined;
                     }
                 }
@@ -3616,7 +3761,7 @@ namespace ts {
             let result: Signature[] = undefined;
             for (let i = 0; i < signatureLists.length; i++) {
                 // Allow matching non-generic signatures to have excess parameters and different return types
-                const match = i === listIndex ? signature : findMatchingSignature(signatureLists[i], signature, /*partialMatch*/ true, /*ignoreReturnTypes*/ true);
+                const match = i === listIndex ? signature : findMatchingSignature(signatureLists[i], signature, /*partialMatch*/ true, /*ignoreThisTypes*/ true, /*ignoreReturnTypes*/ true);
                 if (!match) {
                     return undefined;
                 }
@@ -3637,13 +3782,16 @@ namespace ts {
             for (let i = 0; i < signatureLists.length; i++) {
                 for (const signature of signatureLists[i]) {
                     // Only process signatures with parameter lists that aren't already in the result list
-                    if (!result || !findMatchingSignature(result, signature, /*partialMatch*/ false, /*ignoreReturnTypes*/ true)) {
+                    if (!result || !findMatchingSignature(result, signature, /*partialMatch*/ false, /*ignoreThisTypes*/ true, /*ignoreReturnTypes*/ true)) {
                         const unionSignatures = findMatchingSignatures(signatureLists, signature, i);
                         if (unionSignatures) {
                             let s = signature;
                             // Union the result types when more than one signature matches
                             if (unionSignatures.length > 1) {
                                 s = cloneSignature(signature);
+                                if (forEach(unionSignatures, sig => sig.thisType)) {
+                                    s.thisType = getUnionType(map(unionSignatures, sig => sig.thisType || anyType));
+                                }
                                 // Clear resolved return type we possibly got from cloneSignature
                                 s.resolvedReturnType = undefined;
                                 s.unionSignatures = unionSignatures;
@@ -3853,7 +4001,7 @@ namespace ts {
                 type = globalBooleanType;
             }
             else if (type.flags & TypeFlags.ESSymbol) {
-                type = globalESSymbolType;
+                type = getGlobalESSymbolType();
             }
             return type;
         }
@@ -3867,7 +4015,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];
@@ -3987,6 +4135,19 @@ namespace ts {
             return getIndexTypeOfStructuredType(getApparentType(type), kind);
         }
 
+        function getImplicitIndexTypeOfType(type: Type, kind: IndexKind): Type {
+            if (isObjectLiteralType(type)) {
+                const propTypes: Type[] = [];
+                for (const prop of getPropertiesOfType(type)) {
+                    if (kind === IndexKind.String || isNumericLiteralName(prop.name)) {
+                        propTypes.push(getTypeOfSymbol(prop));
+                    }
+                }
+                return getUnionType(propTypes);
+            }
+            return undefined;
+        }
+
         function getTypeParametersFromJSDocTemplate(declaration: SignatureDeclaration): TypeParameter[] {
             if (declaration.flags & NodeFlags.JavaScriptFile) {
                 const templateTag = getJSDocTemplateTag(declaration);
@@ -4084,8 +4245,11 @@ namespace ts {
                 const parameters: Symbol[] = [];
                 let hasStringLiterals = false;
                 let minArgumentCount = -1;
+                let thisType: Type = undefined;
+                let hasThisParameter: boolean;
                 const isJSConstructSignature = isJSDocConstructSignature(declaration);
                 let returnType: Type = undefined;
+                let typePredicate: TypePredicate = undefined;
 
                 // If this is a JSDoc construct signature, then skip the first parameter in the
                 // parameter list.  The first parameter represents the return type of the construct
@@ -4099,7 +4263,13 @@ namespace ts {
                         const resolvedSymbol = resolveName(param, paramSymbol.name, SymbolFlags.Value, undefined, undefined);
                         paramSymbol = resolvedSymbol;
                     }
-                    parameters.push(paramSymbol);
+                    if (i === 0 && paramSymbol.name === "this") {
+                        hasThisParameter = true;
+                        thisType = param.type ? getTypeFromTypeNode(param.type) : unknownType;
+                    }
+                    else {
+                        parameters.push(paramSymbol);
+                    }
 
                     if (param.type && param.type.kind === SyntaxKind.StringLiteralType) {
                         hasStringLiterals = true;
@@ -4107,7 +4277,7 @@ namespace ts {
 
                     if (param.initializer || param.questionToken || param.dotDotDotToken) {
                         if (minArgumentCount < 0) {
-                            minArgumentCount = i;
+                            minArgumentCount = i - (hasThisParameter ? 1 : 0);
                         }
                     }
                     else {
@@ -4117,7 +4287,7 @@ namespace ts {
                 }
 
                 if (minArgumentCount < 0) {
-                    minArgumentCount = declaration.parameters.length;
+                    minArgumentCount = declaration.parameters.length - (hasThisParameter ? 1 : 0);
                 }
 
                 if (isJSConstructSignature) {
@@ -4129,6 +4299,9 @@ namespace ts {
                 }
                 else if (declaration.type) {
                     returnType = getTypeFromTypeNode(declaration.type);
+                    if (declaration.type.kind === SyntaxKind.TypePredicate) {
+                        typePredicate = createTypePredicateFromTypePredicateNode(declaration.type as TypePredicateNode);
+                    }
                 }
                 else {
                     if (declaration.flags & NodeFlags.JavaScriptFile) {
@@ -4150,7 +4323,7 @@ namespace ts {
                     }
                 }
 
-                links.resolvedSignature = createSignature(declaration, typeParameters, parameters, returnType, minArgumentCount, hasRestParameter(declaration), hasStringLiterals);
+                links.resolvedSignature = createSignature(declaration, typeParameters, thisType, parameters, returnType, typePredicate, minArgumentCount, hasRestParameter(declaration), hasStringLiterals);
             }
             return links.resolvedSignature;
         }
@@ -4309,7 +4482,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;
         }
@@ -4379,10 +4552,12 @@ namespace ts {
         // It is only necessary to do so if a constituent type might be the undefined type, the null type, the type
         // of an object literal or the anyFunctionType. This is because there are operations in the type checker
         // that care about the presence of such types at arbitrary depth in a containing type.
-        function getPropagatingFlagsOfTypes(types: Type[]): TypeFlags {
+        function getPropagatingFlagsOfTypes(types: Type[], excludeKinds: TypeFlags): TypeFlags {
             let result: TypeFlags = 0;
             for (const type of types) {
-                result |= type.flags;
+                if (!(type.flags & excludeKinds)) {
+                    result |= type.flags;
+                }
             }
             return result & TypeFlags.PropagatingFlags;
         }
@@ -4391,7 +4566,8 @@ namespace ts {
             const id = getTypeListId(typeArguments);
             let type = target.instantiations[id];
             if (!type) {
-                const flags = TypeFlags.Reference | (typeArguments ? getPropagatingFlagsOfTypes(typeArguments) : 0);
+                const propagatedFlags = typeArguments ? getPropagatingFlagsOfTypes(typeArguments, /*excludeKinds*/ 0) : 0;
+                const flags = TypeFlags.Reference | propagatedFlags;
                 type = target.instantiations[id] = <TypeReference>createObjectType(flags, target.symbol);
                 type.target = target;
                 type.typeArguments = typeArguments;
@@ -4401,7 +4577,7 @@ namespace ts {
 
         // Get type from reference to class or interface
         function getTypeFromClassOrInterfaceReference(node: TypeReferenceNode | ExpressionWithTypeArguments | JSDocTypeReference, symbol: Symbol): Type {
-            const type = <InterfaceType>getDeclaredTypeOfSymbol(symbol);
+            const type = <InterfaceType>getDeclaredTypeOfSymbol(getMergedSymbol(symbol));
             const typeParameters = type.localTypeParameters;
             if (typeParameters) {
                 if (!node.typeArguments || node.typeArguments.length !== typeParameters.length) {
@@ -4604,10 +4780,6 @@ namespace ts {
             return typeSymbol && getDeclaredTypeOfSymbol(typeSymbol);
         }
 
-        function getGlobalESSymbolConstructorSymbol() {
-            return globalESSymbolConstructorSymbol || (globalESSymbolConstructorSymbol = getGlobalValueSymbol("Symbol"));
-        }
-
         /**
           * Creates a TypeReference for a generic `TypedPropertyDescriptor<T>`.
           */
@@ -4626,11 +4798,11 @@ namespace ts {
         }
 
         function createIterableType(elementType: Type): Type {
-            return createTypeFromGenericGlobalType(globalIterableType, [elementType]);
+            return createTypeFromGenericGlobalType(getGlobalIterableType(), [elementType]);
         }
 
         function createIterableIteratorType(elementType: Type): Type {
-            return createTypeFromGenericGlobalType(globalIterableIteratorType, [elementType]);
+            return createTypeFromGenericGlobalType(getGlobalIterableIteratorType(), [elementType]);
         }
 
         function createArrayType(elementType: Type): Type {
@@ -4651,7 +4823,8 @@ namespace ts {
         }
 
         function createNewTupleType(elementTypes: Type[]) {
-            const type = <TupleType>createObjectType(TypeFlags.Tuple | getPropagatingFlagsOfTypes(elementTypes));
+            const propagatedFlags = getPropagatingFlagsOfTypes(elementTypes, /*excludeKinds*/ 0);
+            const type = <TupleType>createObjectType(TypeFlags.Tuple | propagatedFlags);
             type.elementTypes = elementTypes;
             return type;
         }
@@ -4664,10 +4837,21 @@ namespace ts {
             return links.resolvedType;
         }
 
-        function addTypeToSet(typeSet: Type[], type: Type, typeSetKind: TypeFlags) {
+        interface TypeSet extends Array<Type> {
+            containsAny?: boolean;
+            containsUndefined?: boolean;
+            containsNull?: boolean;
+        }
+
+        function addTypeToSet(typeSet: TypeSet, type: Type, typeSetKind: TypeFlags) {
             if (type.flags & typeSetKind) {
                 addTypesToSet(typeSet, (<UnionOrIntersectionType>type).types, typeSetKind);
             }
+            else if (type.flags & (TypeFlags.Any | TypeFlags.Undefined | TypeFlags.Null)) {
+                if (type.flags & TypeFlags.Any) typeSet.containsAny = true;
+                if (type.flags & TypeFlags.Undefined) typeSet.containsUndefined = true;
+                if (type.flags & TypeFlags.Null) typeSet.containsNull = true;
+            }
             else if (!contains(typeSet, type)) {
                 typeSet.push(type);
             }
@@ -4675,7 +4859,7 @@ namespace ts {
 
         // Add the given types to the given type set. Order is preserved, duplicates are removed,
         // and nested types of the given kind are flattened into the set.
-        function addTypesToSet(typeSet: Type[], types: Type[], typeSetKind: TypeFlags) {
+        function addTypesToSet(typeSet: TypeSet, types: Type[], typeSetKind: TypeFlags) {
             for (const type of types) {
                 addTypeToSet(typeSet, type, typeSetKind);
             }
@@ -4700,25 +4884,6 @@ namespace ts {
             }
         }
 
-        function containsTypeAny(types: Type[]): boolean {
-            for (const type of types) {
-                if (isTypeAny(type)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        function removeAllButLast(types: Type[], typeToRemove: Type) {
-            let i = types.length;
-            while (i > 0 && types.length > 1) {
-                i--;
-                if (types[i] === typeToRemove) {
-                    types.splice(i, 1);
-                }
-            }
-        }
-
         // We reduce the constituent type set to only include types that aren't subtypes of other types, unless
         // the noSubtypeReduction flag is specified, in which case we perform a simple deduplication based on
         // object identity. Subtype reduction is possible only when union types are known not to circularly
@@ -4730,25 +4895,29 @@ namespace ts {
             if (types.length === 0) {
                 return emptyUnionType;
             }
-            const typeSet: Type[] = [];
+            const typeSet = [] as TypeSet;
             addTypesToSet(typeSet, types, TypeFlags.Union);
-            if (containsTypeAny(typeSet)) {
+            if (typeSet.containsAny) {
                 return anyType;
             }
-            if (noSubtypeReduction) {
-                removeAllButLast(typeSet, undefinedType);
-                removeAllButLast(typeSet, nullType);
+            if (strictNullChecks) {
+                if (typeSet.containsNull) typeSet.push(nullType);
+                if (typeSet.containsUndefined) typeSet.push(undefinedType);
             }
-            else {
+            if (!noSubtypeReduction) {
                 removeSubtypes(typeSet);
             }
-            if (typeSet.length === 1) {
+            if (typeSet.length === 0) {
+                return typeSet.containsNull ? nullType : undefinedType;
+            }
+            else if (typeSet.length === 1) {
                 return typeSet[0];
             }
             const id = getTypeListId(typeSet);
             let type = unionTypes[id];
             if (!type) {
-                type = unionTypes[id] = <UnionType>createObjectType(TypeFlags.Union | getPropagatingFlagsOfTypes(typeSet));
+                const propagatedFlags = getPropagatingFlagsOfTypes(typeSet, /*excludeKinds*/ TypeFlags.Nullable);
+                type = unionTypes[id] = <UnionType>createObjectType(TypeFlags.Union | propagatedFlags);
                 type.types = typeSet;
             }
             return type;
@@ -4771,18 +4940,23 @@ namespace ts {
             if (types.length === 0) {
                 return emptyObjectType;
             }
-            const typeSet: Type[] = [];
+            const typeSet = [] as TypeSet;
             addTypesToSet(typeSet, types, TypeFlags.Intersection);
-            if (containsTypeAny(typeSet)) {
+            if (typeSet.containsAny) {
                 return anyType;
             }
+            if (strictNullChecks) {
+                if (typeSet.containsNull) typeSet.push(nullType);
+                if (typeSet.containsUndefined) typeSet.push(undefinedType);
+            }
             if (typeSet.length === 1) {
                 return typeSet[0];
             }
             const id = getTypeListId(typeSet);
             let type = intersectionTypes[id];
             if (!type) {
-                type = intersectionTypes[id] = <IntersectionType>createObjectType(TypeFlags.Intersection | getPropagatingFlagsOfTypes(typeSet));
+                const propagatedFlags = getPropagatingFlagsOfTypes(typeSet, /*excludeKinds*/ TypeFlags.Nullable);
+                type = intersectionTypes[id] = <IntersectionType>createObjectType(TypeFlags.Intersection | propagatedFlags);
                 type.types = typeSet;
             }
             return type;
@@ -4841,11 +5015,11 @@ namespace ts {
             return links.resolvedType;
         }
 
-        function getThisType(node: TypeNode): Type {
+        function getThisType(node: Node): Type {
             const container = getThisContainer(node, /*includeArrowFunctions*/ false);
             const parent = container && container.parent;
             if (parent && (isClassLike(parent) || parent.kind === SyntaxKind.InterfaceDeclaration)) {
-                if (!(container.flags & NodeFlags.Static) &&
+                if (!(getModifierFlags(container) & ModifierFlags.Static) &&
                     (container.kind !== SyntaxKind.Constructor || isNodeDescendantOf(node, (<ConstructorDeclaration>container).body))) {
                     return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
                 }
@@ -4862,25 +5036,6 @@ namespace ts {
             return links.resolvedType;
         }
 
-        function getPredicateType(node: TypePredicateNode): Type {
-            return createPredicateType(getSymbolOfNode(node), createTypePredicateFromTypePredicateNode(node));
-        }
-
-        function createPredicateType(symbol: Symbol, predicate: ThisTypePredicate | IdentifierTypePredicate) {
-                const type = createType(TypeFlags.Boolean | TypeFlags.PredicateType) as PredicateType;
-                type.symbol = symbol;
-                type.predicate = predicate;
-                return type;
-        }
-
-        function getTypeFromPredicateTypeNode(node: TypePredicateNode): Type {
-            const links = getNodeLinks(node);
-            if (!links.resolvedType) {
-                links.resolvedType = getPredicateType(node);
-            }
-            return links.resolvedType;
-        }
-
         function getTypeFromTypeNode(node: TypeNode): Type {
             switch (node.kind) {
                 case SyntaxKind.AnyKeyword:
@@ -4897,6 +5052,10 @@ namespace ts {
                     return esSymbolType;
                 case SyntaxKind.VoidKeyword:
                     return voidType;
+                case SyntaxKind.UndefinedKeyword:
+                    return undefinedType;
+                case SyntaxKind.NullKeyword:
+                    return nullType;
                 case SyntaxKind.ThisType:
                     return getTypeFromThisTypeNode(node);
                 case SyntaxKind.StringLiteralType:
@@ -4905,7 +5064,7 @@ namespace ts {
                 case SyntaxKind.JSDocTypeReference:
                     return getTypeFromTypeReference(<TypeReferenceNode>node);
                 case SyntaxKind.TypePredicate:
-                    return getTypeFromPredicateTypeNode(<TypePredicateNode>node);
+                    return booleanType;
                 case SyntaxKind.ExpressionWithTypeArguments:
                     return getTypeFromTypeReference(<ExpressionWithTypeArguments>node);
                 case SyntaxKind.TypeQuery:
@@ -4967,42 +5126,29 @@ namespace ts {
             return t => t === source1 ? target1 : t === source2 ? target2 : t;
         }
 
-        function createTypeMapper(sources: Type[], targets: Type[]): TypeMapper {
-            switch (sources.length) {
-                case 1: return createUnaryTypeMapper(sources[0], targets[0]);
-                case 2: return createBinaryTypeMapper(sources[0], targets[0], sources[1], targets[1]);
-            }
+        function createArrayTypeMapper(sources: Type[], targets: Type[]): TypeMapper {
             return t => {
                 for (let i = 0; i < sources.length; i++) {
                     if (t === sources[i]) {
-                        return targets[i];
+                        return targets ? targets[i] : anyType;
                     }
                 }
                 return t;
             };
         }
 
-        function createUnaryTypeEraser(source: Type): TypeMapper {
-            return t => t === source ? anyType : t;
-        }
-
-        function createBinaryTypeEraser(source1: Type, source2: Type): TypeMapper {
-            return t => t === source1 || t === source2 ? anyType : t;
+        function createTypeMapper(sources: Type[], targets: Type[]): TypeMapper {
+            const count = sources.length;
+            const mapper: TypeMapper =
+                count == 1 ? createUnaryTypeMapper(sources[0], targets ? targets[0] : anyType) :
+                count == 2 ? createBinaryTypeMapper(sources[0], targets ? targets[0] : anyType, sources[1], targets ? targets[1] : anyType) :
+                createArrayTypeMapper(sources, targets);
+            mapper.mappedTypes = sources;
+            return mapper;
         }
 
         function createTypeEraser(sources: Type[]): TypeMapper {
-            switch (sources.length) {
-                case 1: return createUnaryTypeEraser(sources[0]);
-                case 2: return createBinaryTypeEraser(sources[0], sources[1]);
-            }
-            return t => {
-                for (const source of sources) {
-                    if (t === source) {
-                        return anyType;
-                    }
-                }
-                return t;
-            };
+            return createTypeMapper(sources, undefined);
         }
 
         function getInferenceMapper(context: InferenceContext): TypeMapper {
@@ -5017,6 +5163,7 @@ namespace ts {
                     }
                     return t;
                 };
+                mapper.mappedTypes = context.typeParameters;
                 mapper.context = context;
                 context.mapper = mapper;
             }
@@ -5028,7 +5175,9 @@ namespace ts {
         }
 
         function combineTypeMappers(mapper1: TypeMapper, mapper2: TypeMapper): TypeMapper {
-            return t => instantiateType(mapper1(t), mapper2);
+            const mapper: TypeMapper = t => instantiateType(mapper1(t), mapper2);
+            mapper.mappedTypes = mapper1.mappedTypes;
+            return mapper;
         }
 
         function cloneTypeParameter(typeParameter: TypeParameter): TypeParameter {
@@ -5057,6 +5206,7 @@ namespace ts {
 
         function instantiateSignature(signature: Signature, mapper: TypeMapper, eraseTypeParameters?: boolean): Signature {
             let freshTypeParameters: TypeParameter[];
+            let freshTypePredicate: TypePredicate;
             if (signature.typeParameters && !eraseTypeParameters) {
                 // First create a fresh set of type parameters, then include a mapping from the old to the
                 // new type parameters in the mapper function. Finally store this mapper in the new type
@@ -5067,9 +5217,14 @@ namespace ts {
                     tp.mapper = mapper;
                 }
             }
+            if (signature.typePredicate) {
+                freshTypePredicate = cloneTypePredicate(signature.typePredicate, mapper);
+            }
             const result = createSignature(signature.declaration, freshTypeParameters,
+                signature.thisType && instantiateType(signature.thisType, mapper),
                 instantiateList(signature.parameters, mapper, instantiateSymbol),
                 instantiateType(signature.resolvedReturnType, mapper),
+                freshTypePredicate,
                 signature.minArgumentCount, signature.hasRestParameter, signature.hasStringLiterals);
             result.target = signature;
             result.mapper = mapper;
@@ -5118,13 +5273,70 @@ namespace ts {
             return result;
         }
 
+        function isSymbolInScopeOfMappedTypeParameter(symbol: Symbol, mapper: TypeMapper) {
+            const mappedTypes = mapper.mappedTypes;
+            // Starting with the parent of the symbol's declaration, check if the mapper maps any of
+            // the type parameters introduced by enclosing declarations. We just pick the first
+            // declaration since multiple declarations will all have the same parent anyway.
+            let node = symbol.declarations[0].parent;
+            while (node) {
+                switch (node.kind) {
+                    case SyntaxKind.FunctionType:
+                    case SyntaxKind.ConstructorType:
+                    case SyntaxKind.FunctionDeclaration:
+                    case SyntaxKind.MethodDeclaration:
+                    case SyntaxKind.MethodSignature:
+                    case SyntaxKind.Constructor:
+                    case SyntaxKind.CallSignature:
+                    case SyntaxKind.ConstructSignature:
+                    case SyntaxKind.IndexSignature:
+                    case SyntaxKind.GetAccessor:
+                    case SyntaxKind.SetAccessor:
+                    case SyntaxKind.FunctionExpression:
+                    case SyntaxKind.ArrowFunction:
+                    case SyntaxKind.ClassDeclaration:
+                    case SyntaxKind.ClassExpression:
+                    case SyntaxKind.InterfaceDeclaration:
+                    case SyntaxKind.TypeAliasDeclaration:
+                        const declaration = <DeclarationWithTypeParameters>node;
+                        if (declaration.typeParameters) {
+                            for (const d of declaration.typeParameters) {
+                                if (contains(mappedTypes, getDeclaredTypeOfTypeParameter(d.symbol))) {
+                                    return true;
+                                }
+                            }
+                        }
+                        if (isClassLike(node) || node.kind === SyntaxKind.InterfaceDeclaration) {
+                            const thisType = getDeclaredTypeOfClassOrInterface(getSymbolOfNode(node)).thisType;
+                            if (thisType && contains(mappedTypes, thisType)) {
+                                return true;
+                            }
+                        }
+                        break;
+                    case SyntaxKind.ModuleDeclaration:
+                    case SyntaxKind.SourceFile:
+                        return false;
+                }
+                node = node.parent;
+            }
+            return false;
+        }
+
         function instantiateType(type: Type, mapper: TypeMapper): Type {
             if (type && mapper !== identityMapper) {
                 if (type.flags & TypeFlags.TypeParameter) {
                     return mapper(<TypeParameter>type);
                 }
                 if (type.flags & TypeFlags.Anonymous) {
-                    return type.symbol && type.symbol.flags & (SymbolFlags.Function | SymbolFlags.Method | SymbolFlags.Class | SymbolFlags.TypeLiteral | SymbolFlags.ObjectLiteral) ?
+                    // If the anonymous type originates in a declaration of a function, method, class, or
+                    // interface, in an object type literal, or in an object literal expression, we may need
+                    // to instantiate the type because it might reference a type parameter. We skip instantiation
+                    // if none of the type parameters that are in scope in the type's declaration are mapped by
+                    // the given mapper, however we can only do that analysis if the type isn't itself an
+                    // instantiation.
+                    return type.symbol &&
+                        type.symbol.flags & (SymbolFlags.Function | SymbolFlags.Method | SymbolFlags.Class | SymbolFlags.TypeLiteral | SymbolFlags.ObjectLiteral) &&
+                        (type.flags & TypeFlags.Instantiated || isSymbolInScopeOfMappedTypeParameter(type.symbol, mapper)) ?
                         instantiateAnonymousType(<AnonymousType>type, mapper) : type;
                 }
                 if (type.flags & TypeFlags.Reference) {
@@ -5139,10 +5351,6 @@ namespace ts {
                 if (type.flags & TypeFlags.Intersection) {
                     return getIntersectionType(instantiateList((<IntersectionType>type).types, mapper, instantiateType));
                 }
-                if (type.flags & TypeFlags.PredicateType) {
-                    const predicate = (type as PredicateType).predicate;
-                    return createPredicateType(type.symbol, cloneTypePredicate(predicate, mapper));
-                }
             }
             return type;
         }
@@ -5182,7 +5390,9 @@ namespace ts {
         }
 
         function isContextSensitiveFunctionLikeDeclaration(node: FunctionLikeDeclaration) {
-            return !node.typeParameters && node.parameters.length && !forEach(node.parameters, p => p.type);
+            const areAllParametersUntyped = !forEach(node.parameters, p => p.type);
+            const isNullaryArrow = node.kind === SyntaxKind.ArrowFunction && !node.parameters.length;
+            return !node.typeParameters && areAllParametersUntyped && !isNullaryArrow;
         }
 
         function getTypeWithoutSignatures(type: Type): Type {
@@ -5222,6 +5432,14 @@ namespace ts {
             return checkTypeAssignableTo(source, target, /*errorNode*/ undefined);
         }
 
+        /**
+         * This is *not* a bi-directional relationship.
+         * If one needs to check both directions for comparability, use a second call to this function or 'checkTypeComparableTo'.
+         */
+        function isTypeComparableTo(source: Type, target: Type): boolean {
+            return checkTypeComparableTo(source, target, /*errorNode*/ undefined);
+        }
+
         function checkTypeSubtypeOf(source: Type, target: Type, errorNode: Node, headMessage?: DiagnosticMessage, containingMessageChain?: DiagnosticMessageChain): boolean {
             return checkTypeRelatedTo(source, target, subtypeRelation, errorNode, headMessage, containingMessageChain);
         }
@@ -5230,6 +5448,14 @@ namespace ts {
             return checkTypeRelatedTo(source, target, assignableRelation, errorNode, headMessage, containingMessageChain);
         }
 
+        /**
+         * This is *not* a bi-directional relationship.
+         * If one needs to check both directions for comparability, use a second call to this function or 'isTypeComparableTo'.
+         */
+        function checkTypeComparableTo(source: Type, target: Type, errorNode: Node, headMessage?: DiagnosticMessage, containingMessageChain?: DiagnosticMessageChain): boolean {
+            return checkTypeRelatedTo(source, target, comparableRelation, errorNode, headMessage, containingMessageChain);
+        }
+
         function isSignatureAssignableTo(source: Signature,
                                          target: Signature,
                                          ignoreReturnTypes: boolean): boolean {
@@ -5259,6 +5485,18 @@ namespace ts {
             target = getErasedSignature(target);
 
             let result = Ternary.True;
+            if (source.thisType && target.thisType && source.thisType !== voidType) {
+                // void sources are assignable to anything.
+                const related = compareTypes(source.thisType, target.thisType, /*reportErrors*/ false)
+                    || compareTypes(target.thisType, source.thisType, reportErrors);
+                if (!related) {
+                    if (reportErrors) {
+                        errorReporter(Diagnostics.The_this_types_of_each_signature_are_incompatible);
+                    }
+                    return Ternary.False;
+                }
+                result &= related;
+            }
 
             const sourceMax = getNumNonRestParameters(source);
             const targetMax = getNumNonRestParameters(target);
@@ -5266,9 +5504,9 @@ namespace ts {
             const sourceParams = source.parameters;
             const targetParams = target.parameters;
             for (let i = 0; i < checkCount; i++) {
-                const s = i < sourceMax ? getTypeOfSymbol(sourceParams[i]) : getRestTypeOfSignature(source);
-                const t = i < targetMax ? getTypeOfSymbol(targetParams[i]) : getRestTypeOfSignature(target);
-                const related = compareTypes(t, s, /*reportErrors*/ false) || compareTypes(s, t, reportErrors);
+                const s = i < sourceMax ? getTypeOfParameter(sourceParams[i]) : getRestTypeOfSignature(source);
+                const t = i < targetMax ? getTypeOfParameter(targetParams[i]) : getRestTypeOfSignature(target);
+                const related = compareTypes(s, t, /*reportErrors*/ false) || compareTypes(t, s, reportErrors);
                 if (!related) {
                     if (reportErrors) {
                         errorReporter(Diagnostics.Types_of_parameters_0_and_1_are_incompatible,
@@ -5288,21 +5526,58 @@ namespace ts {
                 const sourceReturnType = getReturnTypeOfSignature(source);
 
                 // The following block preserves behavior forbidding boolean returning functions from being assignable to type guard returning functions
-                if (targetReturnType.flags & TypeFlags.PredicateType && (targetReturnType as PredicateType).predicate.kind === TypePredicateKind.Identifier) {
-                    if (!(sourceReturnType.flags & TypeFlags.PredicateType)) {
+                if (target.typePredicate) {
+                    if (source.typePredicate) {
+                        result &= compareTypePredicateRelatedTo(source.typePredicate, target.typePredicate, reportErrors, errorReporter, compareTypes);
+                    }
+                    else if (isIdentifierTypePredicate(target.typePredicate)) {
                         if (reportErrors) {
                             errorReporter(Diagnostics.Signature_0_must_have_a_type_predicate, signatureToString(source));
                         }
                         return Ternary.False;
                     }
                 }
+                else {
+                    result &= compareTypes(sourceReturnType, targetReturnType, reportErrors);
+                }
 
-                result &= compareTypes(sourceReturnType, targetReturnType, reportErrors);
             }
 
             return result;
         }
 
+        function compareTypePredicateRelatedTo(source: TypePredicate,
+                                               target: TypePredicate,
+                                               reportErrors: boolean,
+                                               errorReporter: (d: DiagnosticMessage, arg0?: string, arg1?: string) => void,
+                                               compareTypes: (s: Type, t: Type, reportErrors?: boolean) => Ternary): Ternary {
+            if (source.kind !== target.kind) {
+                if (reportErrors) {
+                    errorReporter(Diagnostics.A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard);
+                    errorReporter(Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
+                }
+                return Ternary.False;
+            }
+
+            if (source.kind === TypePredicateKind.Identifier) {
+                const sourceIdentifierPredicate = source as IdentifierTypePredicate;
+                const targetIdentifierPredicate = target as IdentifierTypePredicate;
+                if (sourceIdentifierPredicate.parameterIndex !== targetIdentifierPredicate.parameterIndex) {
+                    if (reportErrors) {
+                        errorReporter(Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, sourceIdentifierPredicate.parameterName, targetIdentifierPredicate.parameterName);
+                        errorReporter(Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
+                    }
+                    return Ternary.False;
+                }
+            }
+
+            const related = compareTypes(source.type, target.type, reportErrors);
+            if (related === Ternary.False && reportErrors) {
+                errorReporter(Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
+            }
+            return related;
+        }
+
         function isImplementationCompatibleWithOverload(implementation: Signature, overload: Signature): boolean {
             const erasedSource = getErasedSignature(implementation);
             const erasedTarget = getErasedSignature(overload);
@@ -5350,7 +5625,7 @@ namespace ts {
          * Checks if 'source' is related to 'target' (e.g.: is a assignable to).
          * @param source The left-hand-side of the relation.
          * @param target The right-hand-side of the relation.
-         * @param relation The relation considered. One of 'identityRelation', 'assignableRelation', or 'subTypeRelation'.
+         * @param relation The relation considered. One of 'identityRelation', 'subtypeRelation', 'assignableRelation', or 'comparableRelation'.
          * Used as both to determine which checks are performed and as a cache of previously computed results.
          * @param errorNode The suggested node upon which all errors will be reported, if defined. This may or may not be the actual node used.
          * @param headMessage If the error chain should be prepended by a head message, then headMessage will be used.
@@ -5399,7 +5674,14 @@ namespace ts {
                     sourceType = typeToString(source, /*enclosingDeclaration*/ undefined, TypeFormatFlags.UseFullyQualifiedType);
                     targetType = typeToString(target, /*enclosingDeclaration*/ undefined, TypeFormatFlags.UseFullyQualifiedType);
                 }
-                reportError(message || Diagnostics.Type_0_is_not_assignable_to_type_1, sourceType, targetType);
+
+                if (!message) {
+                    message = relation === comparableRelation ?
+                        Diagnostics.Type_0_is_not_comparable_to_type_1 :
+                        Diagnostics.Type_0_is_not_assignable_to_type_1;
+                }
+
+                reportError(message, sourceType, targetType);
             }
 
             // Compare two types and return
@@ -5415,47 +5697,26 @@ namespace ts {
                 }
 
                 if (isTypeAny(target)) return Ternary.True;
-                if (source === undefinedType) return Ternary.True;
-                if (source === nullType && target !== undefinedType) return Ternary.True;
+                if (source.flags & TypeFlags.Undefined) {
+                    if (!strictNullChecks || target.flags & (TypeFlags.Undefined | TypeFlags.Void) || source === emptyArrayElementType) return Ternary.True;
+                }
+                if (source.flags & TypeFlags.Null) {
+                    if (!strictNullChecks || target.flags & TypeFlags.Null) return Ternary.True;
+                }
                 if (source.flags & TypeFlags.Enum && target === numberType) return Ternary.True;
                 if (source.flags & TypeFlags.Enum && target.flags & TypeFlags.Enum) {
-                    if (result = enumRelatedTo(source, target)) {
+                    if (result = enumRelatedTo(source, target, reportErrors)) {
                         return result;
                     }
                 }
                 if (source.flags & TypeFlags.StringLiteral && target === stringType) return Ternary.True;
-                if (relation === assignableRelation) {
+
+                if (relation === assignableRelation || relation === comparableRelation) {
                     if (isTypeAny(source)) return Ternary.True;
                     if (source === numberType && target.flags & TypeFlags.Enum) return Ternary.True;
                 }
+
                 if (source.flags & TypeFlags.Boolean && target.flags & TypeFlags.Boolean) {
-                    if (source.flags & TypeFlags.PredicateType && target.flags & TypeFlags.PredicateType) {
-                        const sourcePredicate = source as PredicateType;
-                        const targetPredicate = target as PredicateType;
-                        if (sourcePredicate.predicate.kind !== targetPredicate.predicate.kind) {
-                            if (reportErrors) {
-                                reportError(Diagnostics.A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard);
-                                reportError(Diagnostics.Type_predicate_0_is_not_assignable_to_1, typeToString(source), typeToString(target));
-                            }
-                            return Ternary.False;
-                        }
-                        if (sourcePredicate.predicate.kind === TypePredicateKind.Identifier) {
-                            const sourceIdentifierPredicate = sourcePredicate.predicate as IdentifierTypePredicate;
-                            const targetIdentifierPredicate = targetPredicate.predicate as IdentifierTypePredicate;
-                            if (sourceIdentifierPredicate.parameterIndex !== targetIdentifierPredicate.parameterIndex) {
-                                if (reportErrors) {
-                                    reportError(Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, sourceIdentifierPredicate.parameterName, targetIdentifierPredicate.parameterName);
-                                    reportError(Diagnostics.Type_predicate_0_is_not_assignable_to_1, typeToString(source), typeToString(target));
-                                }
-                                return Ternary.False;
-                            }
-                        }
-                        const related = isRelatedTo(sourcePredicate.predicate.type, targetPredicate.predicate.type, reportErrors, headMessage);
-                        if (related === Ternary.False && reportErrors) {
-                            reportError(Diagnostics.Type_predicate_0_is_not_assignable_to_1, typeToString(source), typeToString(target));
-                        }
-                        return related;
-                    }
                     return Ternary.True;
                 }
 
@@ -5477,29 +5738,50 @@ namespace ts {
 
                 const saveErrorInfo = errorInfo;
 
-                // Note that the "each" checks must precede the "some" checks to produce the correct results
+                // Note that these checks are specifically ordered to produce correct results.
                 if (source.flags & TypeFlags.Union) {
-                    if (result = eachTypeRelatedToType(<UnionType>source, target, reportErrors)) {
+                    if (relation === comparableRelation) {
+                        result = someTypeRelatedToType(source as UnionType, target, reportErrors);
+                    }
+                    else {
+                        result = eachTypeRelatedToType(source as UnionType, target, reportErrors);
+                    }
+
+                    if (result) {
                         return result;
                     }
                 }
                 else if (target.flags & TypeFlags.Intersection) {
-                    if (result = typeRelatedToEachType(source, <IntersectionType>target, reportErrors)) {
+                    result = typeRelatedToEachType(source, target as IntersectionType, reportErrors);
+
+                    if (result) {
                         return result;
                     }
                 }
                 else {
-                    // It is necessary to try "some" checks on both sides because there may be nested "each" checks
+                    // It is necessary to try these "some" checks on both sides because there may be nested "each" checks
                     // on either side that need to be prioritized. For example, A | B = (A | B) & (C | D) or
                     // A & B = (A & B) | (C & D).
                     if (source.flags & TypeFlags.Intersection) {
-                        // If target is a union type the following check will report errors so we suppress them here
-                        if (result = someTypeRelatedToType(<IntersectionType>source, target, reportErrors && !(target.flags & TypeFlags.Union))) {
+                        // Check to see if any constituents of the intersection are immediately related to the target.
+                        //
+                        // Don't report errors though. Checking whether a constituent is related to the source is not actually
+                        // useful and leads to some confusing error messages. Instead it is better to let the below checks
+                        // take care of this, or to not elaborate at all. For instance,
+                        //
+                        //    - For an object type (such as 'C = A & B'), users are usually more interested in structural errors.
+                        //
+                        //    - For a union type (such as '(A | B) = (C & D)'), it's better to hold onto the whole intersection
+                        //          than to report that 'D' is not assignable to 'A' or 'B'.
+                        //
+                        //    - For a primitive type or type parameter (such as 'number = A & B') there is no point in
+                        //          breaking the intersection apart.
+                        if (result = someTypeRelatedToType(<IntersectionType>source, target, /*reportErrors*/ false)) {
                             return result;
                         }
                     }
                     if (target.flags & TypeFlags.Union) {
-                        if (result = typeRelatedToSomeType(source, <UnionType>target, reportErrors)) {
+                        if (result = typeRelatedToSomeType(source, <UnionType>target, reportErrors && !(source.flags & TypeFlags.Primitive))) {
                             return result;
                         }
                     }
@@ -5559,8 +5841,8 @@ namespace ts {
                 }
                 if (source.flags & TypeFlags.Union && target.flags & TypeFlags.Union ||
                     source.flags & TypeFlags.Intersection && target.flags & TypeFlags.Intersection) {
-                    if (result = eachTypeRelatedToSomeType(<UnionOrIntersectionType>source, <UnionOrIntersectionType>target)) {
-                        if (result &= eachTypeRelatedToSomeType(<UnionOrIntersectionType>target, <UnionOrIntersectionType>source)) {
+                    if (result = eachTypeRelatedToSomeType(<UnionOrIntersectionType>source, <UnionOrIntersectionType>target, /*reportErrors*/ false)) {
+                        if (result &= eachTypeRelatedToSomeType(<UnionOrIntersectionType>target, <UnionOrIntersectionType>source, /*reportErrors*/ false)) {
                             return result;
                         }
                     }
@@ -5575,7 +5857,8 @@ namespace ts {
             function isKnownProperty(type: Type, name: string): boolean {
                 if (type.flags & TypeFlags.ObjectType) {
                     const resolved = resolveStructuredTypeMembers(type);
-                    if (relation === assignableRelation && (type === globalObjectType || resolved.properties.length === 0) ||
+                    if ((relation === assignableRelation || relation === comparableRelation) &&
+                        (type === globalObjectType || resolved.properties.length === 0) ||
                         resolved.stringIndexInfo || resolved.numberIndexInfo || getPropertyOfType(type, name)) {
                         return true;
                     }
@@ -5591,7 +5874,7 @@ namespace ts {
             }
 
             function hasExcessProperties(source: FreshObjectLiteralType, target: Type, reportErrors: boolean): boolean {
-                if (!(target.flags & TypeFlags.ObjectLiteralPatternWithComputedProperties) && someConstituentTypeHasKind(target, TypeFlags.ObjectType)) {
+                if (!(target.flags & TypeFlags.ObjectLiteralPatternWithComputedProperties) && maybeTypeOfKind(target, TypeFlags.ObjectType)) {
                     for (const prop of getPropertiesOfObjectType(source)) {
                         if (!isKnownProperty(target, prop.name)) {
                             if (reportErrors) {
@@ -5610,7 +5893,7 @@ namespace ts {
                 return false;
             }
 
-            function eachTypeRelatedToSomeType(source: UnionOrIntersectionType, target: UnionOrIntersectionType): Ternary {
+            function eachTypeRelatedToSomeType(source: UnionOrIntersectionType, target: UnionOrIntersectionType, reportErrors: boolean): Ternary {
                 let result = Ternary.True;
                 const sourceTypes = source.types;
                 for (const sourceType of sourceTypes) {
@@ -5625,7 +5908,19 @@ namespace ts {
 
             function typeRelatedToSomeType(source: Type, target: UnionOrIntersectionType, reportErrors: boolean): Ternary {
                 const targetTypes = target.types;
-                for (let i = 0, len = targetTypes.length; i < len; i++) {
+                let len = targetTypes.length;
+                // The null and undefined types are guaranteed to be at the end of the constituent type list. In order
+                // to produce the best possible errors we first check the nullable types, such that the last type we
+                // check and report errors from is a non-nullable type if one is present.
+                while (len >= 2 && targetTypes[len - 1].flags & TypeFlags.Nullable) {
+                    const related = isRelatedTo(source, targetTypes[len - 1], /*reportErrors*/ false);
+                    if (related) {
+                        return related;
+                    }
+                    len--;
+                }
+                // Now check the non-nullable types and report errors on the last one.
+                for (let i = 0; i < len; i++) {
                     const related = isRelatedTo(source, targetTypes[i], reportErrors && i === len - 1);
                     if (related) {
                         return related;
@@ -5649,7 +5944,19 @@ namespace ts {
 
             function someTypeRelatedToType(source: UnionOrIntersectionType, target: Type, reportErrors: boolean): Ternary {
                 const sourceTypes = source.types;
-                for (let i = 0, len = sourceTypes.length; i < len; i++) {
+                let len = sourceTypes.length;
+                // The null and undefined types are guaranteed to be at the end of the constituent type list. In order
+                // to produce the best possible errors we first check the nullable types, such that the last type we
+                // check and report errors from is a non-nullable type if one is present.
+                while (len >= 2 && sourceTypes[len - 1].flags & TypeFlags.Nullable) {
+                    const related = isRelatedTo(sourceTypes[len - 1], target, /*reportErrors*/ false);
+                    if (related) {
+                        return related;
+                    }
+                    len--;
+                }
+                // Now check the non-nullable types and report errors on the last one.
+                for (let i = 0; i < len; i++) {
                     const related = isRelatedTo(sourceTypes[i], target, reportErrors && i === len - 1);
                     if (related) {
                         return related;
@@ -5747,9 +6054,9 @@ namespace ts {
                         if (result) {
                             result &= signaturesRelatedTo(source, target, SignatureKind.Construct, reportErrors);
                             if (result) {
-                                result &= stringIndexTypesRelatedTo(source, originalSource, target, reportErrors);
+                                result &= indexTypesRelatedTo(source, originalSource, target, IndexKind.String, reportErrors);
                                 if (result) {
-                                    result &= numberIndexTypesRelatedTo(source, originalSource, target, reportErrors);
+                                    result &= indexTypesRelatedTo(source, originalSource, target, IndexKind.Number, reportErrors);
                                 }
                             }
                         }
@@ -5791,24 +6098,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));
@@ -5820,7 +6127,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));
@@ -5889,16 +6196,20 @@ namespace ts {
 
                 const sourceSignatures = getSignaturesOfType(source, kind);
                 const targetSignatures = getSignaturesOfType(target, kind);
-                if (kind === SignatureKind.Construct && sourceSignatures.length && targetSignatures.length &&
-                    isAbstractConstructorType(source) && !isAbstractConstructorType(target)) {
-                    // An abstract constructor type is not assignable to a non-abstract constructor type
-                    // as it would otherwise be possible to new an abstract class. Note that the assignablity
-                    // check we perform for an extends clause excludes construct signatures from the target,
-                    // so this check never proceeds.
-                    if (reportErrors) {
-                        reportError(Diagnostics.Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type);
+                if (kind === SignatureKind.Construct && sourceSignatures.length && targetSignatures.length) {
+                    if (isAbstractConstructorType(source) && !isAbstractConstructorType(target)) {
+                        // An abstract constructor type is not assignable to a non-abstract constructor type
+                    // as it would otherwise be possible to new an abstract class. Note that the assignability
+                        // check we perform for an extends clause excludes construct signatures from the target,
+                        // so this check never proceeds.
+                        if (reportErrors) {
+                            reportError(Diagnostics.Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type);
+                        }
+                        return Ternary.False;
+                    }
+                    if (!constructorVisibilitiesAreCompatible(sourceSignatures[0], targetSignatures[0], reportErrors)) {
+                        return Ternary.False;
                     }
-                    return Ternary.False;
                 }
 
                 let result = Ternary.True;
@@ -5942,7 +6253,7 @@ namespace ts {
                 }
                 let result = Ternary.True;
                 for (let i = 0, len = sourceSignatures.length; i < len; i++) {
-                    const related = compareSignaturesIdentical(sourceSignatures[i], targetSignatures[i], /*partialMatch*/ false, /*ignoreReturnTypes*/ false, isRelatedTo);
+                    const related = compareSignaturesIdentical(sourceSignatures[i], targetSignatures[i], /*partialMatch*/ false, /*ignoreThisTypes*/ false, /*ignoreReturnTypes*/ false, isRelatedTo);
                     if (!related) {
                         return Ternary.False;
                     }
@@ -5951,76 +6262,65 @@ namespace ts {
                 return result;
             }
 
-            function stringIndexTypesRelatedTo(source: Type, originalSource: Type, target: Type, reportErrors: boolean): Ternary {
-                if (relation === identityRelation) {
-                    return indexTypesIdenticalTo(IndexKind.String, source, target);
+            function eachPropertyRelatedTo(source: Type, target: Type, kind: IndexKind, reportErrors: boolean): Ternary {
+                let result = Ternary.True;
+                for (const prop of getPropertiesOfObjectType(source)) {
+                    if (kind === IndexKind.String || isNumericLiteralName(prop.name)) {
+                        const related = isRelatedTo(getTypeOfSymbol(prop), target, reportErrors);
+                        if (!related) {
+                            if (reportErrors) {
+                                reportError(Diagnostics.Property_0_is_incompatible_with_index_signature, symbolToString(prop));
+                            }
+                            return Ternary.False;
+                        }
+                        result &= related;
+                    }
                 }
-                const targetInfo = getIndexInfoOfType(target, IndexKind.String);
-                if (targetInfo) {
-                    if ((targetInfo.type.flags & TypeFlags.Any) && !(originalSource.flags & TypeFlags.Primitive)) {
-                        // non-primitive assignment to any is always allowed, eg
-                        //   `var x: { [index: string]: any } = { property: 12 };`
-                        return Ternary.True;
-                    }
-                    const sourceInfo = getIndexInfoOfType(source, IndexKind.String);
-                    if (!sourceInfo) {
-                        if (reportErrors) {
-                            reportError(Diagnostics.Index_signature_is_missing_in_type_0, typeToString(source));
+                return result;
+            }
+
+            function indexInfoRelatedTo(sourceInfo: IndexInfo, targetInfo: IndexInfo, reportErrors: boolean) {
+                const related = isRelatedTo(sourceInfo.type, targetInfo.type, reportErrors);
+                if (!related && reportErrors) {
+                    reportError(Diagnostics.Index_signatures_are_incompatible);
+                }
+                return related;
+            }
+
+            function indexTypesRelatedTo(source: Type, originalSource: Type, target: Type, kind: IndexKind, reportErrors: boolean) {
+                if (relation === identityRelation) {
+                    return indexTypesIdenticalTo(source, target, kind);
+                }
+                const targetInfo = getIndexInfoOfType(target, kind);
+                if (!targetInfo || ((targetInfo.type.flags & TypeFlags.Any) && !(originalSource.flags & TypeFlags.Primitive))) {
+                    // Index signature of type any permits assignment from everything but primitives
+                    return Ternary.True;
+                }
+                const sourceInfo = getIndexInfoOfType(source, kind) ||
+                    kind === IndexKind.Number && getIndexInfoOfType(source, IndexKind.String);
+                if (sourceInfo) {
+                    return indexInfoRelatedTo(sourceInfo, targetInfo, reportErrors);
+                }
+                if (isObjectLiteralType(source)) {
+                    let related = Ternary.True;
+                    if (kind === IndexKind.String) {
+                        const sourceNumberInfo = getIndexInfoOfType(source, IndexKind.Number);
+                        if (sourceNumberInfo) {
+                            related = indexInfoRelatedTo(sourceNumberInfo, targetInfo, reportErrors);
                         }
-                        return Ternary.False;
                     }
-                    const related = isRelatedTo(sourceInfo.type, targetInfo.type, reportErrors);
-                    if (!related) {
-                        if (reportErrors) {
-                            reportError(Diagnostics.Index_signatures_are_incompatible);
-                        }
-                        return Ternary.False;
+                    if (related) {
+                        related &= eachPropertyRelatedTo(source, targetInfo.type, kind, reportErrors);
                     }
                     return related;
                 }
-                return Ternary.True;
+                if (reportErrors) {
+                    reportError(Diagnostics.Index_signature_is_missing_in_type_0, typeToString(source));
+                }
+                return Ternary.False;
             }
 
-            function numberIndexTypesRelatedTo(source: Type, originalSource: Type, target: Type, reportErrors: boolean): Ternary {
-                if (relation === identityRelation) {
-                    return indexTypesIdenticalTo(IndexKind.Number, source, target);
-                }
-                const targetInfo = getIndexInfoOfType(target, IndexKind.Number);
-                if (targetInfo) {
-                    if ((targetInfo.type.flags & TypeFlags.Any) && !(originalSource.flags & TypeFlags.Primitive)) {
-                        // non-primitive assignment to any is always allowed, eg
-                        //   `var x: { [index: number]: any } = { property: 12 };`
-                        return Ternary.True;
-                    }
-                    const sourceStringInfo = getIndexInfoOfType(source, IndexKind.String);
-                    const sourceNumberInfo = getIndexInfoOfType(source, IndexKind.Number);
-                    if (!(sourceStringInfo || sourceNumberInfo)) {
-                        if (reportErrors) {
-                            reportError(Diagnostics.Index_signature_is_missing_in_type_0, typeToString(source));
-                        }
-                        return Ternary.False;
-                    }
-                    let related: Ternary;
-                    if (sourceStringInfo && sourceNumberInfo) {
-                        // If we know for sure we're testing both string and numeric index types then only report errors from the second one
-                        related = isRelatedTo(sourceStringInfo.type, targetInfo.type, /*reportErrors*/ false) ||
-                            isRelatedTo(sourceNumberInfo.type, targetInfo.type, reportErrors);
-                    }
-                    else {
-                        related = isRelatedTo((sourceStringInfo || sourceNumberInfo).type, targetInfo.type, reportErrors);
-                    }
-                    if (!related) {
-                        if (reportErrors) {
-                            reportError(Diagnostics.Index_signatures_are_incompatible);
-                        }
-                        return Ternary.False;
-                    }
-                    return related;
-                }
-                return Ternary.True;
-            }
-
-            function indexTypesIdenticalTo(indexKind: IndexKind, source: Type, target: Type): Ternary {
+            function indexTypesIdenticalTo(source: Type, target: Type, indexKind: IndexKind): Ternary {
                 const targetInfo = getIndexInfoOfType(target, indexKind);
                 const sourceInfo = getIndexInfoOfType(source, indexKind);
                 if (!sourceInfo && !targetInfo) {
@@ -6032,7 +6332,7 @@ namespace ts {
                 return Ternary.False;
             }
 
-            function enumRelatedTo(source: Type, target: Type) {
+            function enumRelatedTo(source: Type, target: Type, reportErrors?: boolean) {
                 if (source.symbol.name !== target.symbol.name ||
                     source.symbol.flags & SymbolFlags.ConstEnum ||
                     target.symbol.flags & SymbolFlags.ConstEnum) {
@@ -6043,15 +6343,47 @@ namespace ts {
                     if (property.flags & SymbolFlags.EnumMember) {
                         const targetProperty = getPropertyOfType(targetEnumType, property.name);
                         if (!targetProperty || !(targetProperty.flags & SymbolFlags.EnumMember)) {
-                            reportError(Diagnostics.Property_0_is_missing_in_type_1,
-                                property.name,
-                                typeToString(target, /*enclosingDeclaration*/ undefined, TypeFormatFlags.UseFullyQualifiedType));
+                            if (reportErrors) {
+                                reportError(Diagnostics.Property_0_is_missing_in_type_1,
+                                    property.name,
+                                    typeToString(target, /*enclosingDeclaration*/ undefined, TypeFormatFlags.UseFullyQualifiedType));
+                            }
                             return Ternary.False;
                         }
                     }
                 }
                 return Ternary.True;
             }
+
+            function constructorVisibilitiesAreCompatible(sourceSignature: Signature, targetSignature: Signature, reportErrors: boolean) {
+                if (!sourceSignature.declaration || !targetSignature.declaration) {
+                    return true;
+                }
+
+                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 === ModifierFlags.Private) {
+                    return true;
+                }
+
+                // A public and protected signature is assignable to a protected signature.
+                if (targetAccessibility === ModifierFlags.Protected && sourceAccessibility !== ModifierFlags.Private) {
+                    return true;
+                }
+
+                // Only a public signature is assignable to public signature.
+                if (targetAccessibility !== ModifierFlags.Protected && !sourceAccessibility) {
+                    return true;
+                }
+
+                if (reportErrors) {
+                    reportError(Diagnostics.Cannot_assign_a_0_constructor_type_to_a_1_constructor_type, visibilityToString(sourceAccessibility), visibilityToString(targetAccessibility));
+                }
+
+                return false;
+            }
         }
 
         // Return true if the given type is the constructor type for an abstract class
@@ -6060,7 +6392,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;
                     }
                 }
@@ -6100,8 +6432,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;
             }
@@ -6143,7 +6475,7 @@ namespace ts {
         /**
          * See signatureRelatedTo, compareSignaturesIdentical
          */
-        function compareSignaturesIdentical(source: Signature, target: Signature, partialMatch: boolean, ignoreReturnTypes: boolean, compareTypes: (s: Type, t: Type) => Ternary): Ternary {
+        function compareSignaturesIdentical(source: Signature, target: Signature, partialMatch: boolean, ignoreThisTypes: boolean, ignoreReturnTypes: boolean, compareTypes: (s: Type, t: Type) => Ternary): Ternary {
             // TODO (drosen): De-duplicate code between related functions.
             if (source === target) {
                 return Ternary.True;
@@ -6164,10 +6496,17 @@ namespace ts {
             source = getErasedSignature(source);
             target = getErasedSignature(target);
             let result = Ternary.True;
+            if (!ignoreThisTypes && source.thisType && target.thisType) {
+                const related = compareTypes(source.thisType, target.thisType);
+                if (!related) {
+                    return Ternary.False;
+                }
+                result &= related;
+            }
             const targetLen = target.parameters.length;
             for (let i = 0; i < targetLen; i++) {
-                const s = isRestParameterIndex(source, i) ? getRestTypeOfSignature(source) : getTypeOfSymbol(source.parameters[i]);
-                const t = isRestParameterIndex(target, i) ? getRestTypeOfSignature(target) : getTypeOfSymbol(target.parameters[i]);
+                const s = isRestParameterIndex(source, i) ? getRestTypeOfSignature(source) : getTypeOfParameter(source.parameters[i]);
+                const t = isRestParameterIndex(target, i) ? getRestTypeOfSignature(target) : getTypeOfParameter(target.parameters[i]);
                 const related = compareTypes(s, t);
                 if (!related) {
                     return Ternary.False;
@@ -6185,14 +6524,30 @@ namespace ts {
         }
 
         function isSupertypeOfEach(candidate: Type, types: Type[]): boolean {
-            for (const type of types) {
-                if (candidate !== type && !isTypeSubtypeOf(type, candidate)) return false;
+            for (const t of types) {
+                if (candidate !== t && !isTypeSubtypeOf(t, candidate)) return false;
             }
             return true;
         }
 
+        function getCombinedFlagsOfTypes(types: Type[]) {
+            let flags: TypeFlags = 0;
+            for (const t of types) {
+                flags |= t.flags;
+            }
+            return flags;
+        }
+
         function getCommonSupertype(types: Type[]): Type {
-            return forEach(types, t => isSupertypeOfEach(t, types) ? t : undefined);
+            if (!strictNullChecks) {
+                return forEach(types, t => isSupertypeOfEach(t, types) ? t : undefined);
+            }
+            const primaryTypes = filter(types, t => !(t.flags & TypeFlags.Nullable));
+            if (!primaryTypes.length) {
+                return getUnionType(types);
+            }
+            const supertype = forEach(primaryTypes, t => isSupertypeOfEach(t, primaryTypes) ? t : undefined);
+            return supertype && addNullableKind(supertype, getCombinedFlagsOfTypes(types) & TypeFlags.Nullable);
         }
 
         function reportNoCommonSupertypeError(types: Type[], errorLocation: Node, errorMessageChainHead: DiagnosticMessageChain): void {
@@ -6244,7 +6599,7 @@ namespace ts {
             // A type is array-like if it is a reference to the global Array or global ReadonlyArray type,
             // or if it is not the undefined or null type and if it is assignable to ReadonlyArray<any>
             return type.flags & TypeFlags.Reference && ((<TypeReference>type).target === globalArrayType || (<TypeReference>type).target === globalReadonlyArrayType) ||
-                !(type.flags & (TypeFlags.Undefined | TypeFlags.Null)) && isTypeAssignableTo(type, anyReadonlyArrayType);
+                !(type.flags & TypeFlags.Nullable) && isTypeAssignableTo(type, anyReadonlyArrayType);
         }
 
         function isTupleLikeType(type: Type): boolean {
@@ -6263,6 +6618,73 @@ namespace ts {
             return !!(type.flags & TypeFlags.Tuple);
         }
 
+        function getNullableKind(type: Type): TypeFlags {
+            let flags = type.flags;
+            if (flags & TypeFlags.Union) {
+                for (const t of (type as UnionType).types) {
+                    flags |= t.flags;
+                }
+            }
+            return flags & TypeFlags.Nullable;
+        }
+
+        function getNullableTypeOfKind(kind: TypeFlags) {
+            return kind & TypeFlags.Null ? kind & TypeFlags.Undefined ?
+                getUnionType([nullType, undefinedType]) : nullType : undefinedType;
+        }
+
+        function addNullableKind(type: Type, kind: TypeFlags): Type {
+            if ((getNullableKind(type) & kind) !== kind) {
+                const types = [type];
+                if (kind & TypeFlags.Undefined) {
+                    types.push(undefinedType);
+                }
+                if (kind & TypeFlags.Null) {
+                    types.push(nullType);
+                }
+                type = getUnionType(types);
+            }
+            return type;
+        }
+
+        function removeNullableKind(type: Type, kind: TypeFlags) {
+            if (type.flags & TypeFlags.Union && getNullableKind(type) & kind) {
+                let firstType: Type;
+                let types: Type[];
+                for (const t of (type as UnionType).types) {
+                    if (!(t.flags & kind)) {
+                        if (!firstType) {
+                            firstType = t;
+                        }
+                        else {
+                            if (!types) {
+                                types = [firstType];
+                            }
+                            types.push(t);
+                        }
+                    }
+                }
+                if (firstType) {
+                    type = types ? getUnionType(types) : firstType;
+                }
+            }
+            return type;
+        }
+
+        function getNonNullableType(type: Type): Type {
+            return strictNullChecks ? removeNullableKind(type, TypeFlags.Nullable) : type;
+        }
+
+        /**
+         * Return true if type was inferred from an object literal or written as an object type literal
+         * with no call or construct signatures.
+         */
+        function isObjectLiteralType(type: Type) {
+            return type.symbol && (type.symbol.flags & (SymbolFlags.ObjectLiteral | SymbolFlags.TypeLiteral)) !== 0 &&
+                getSignaturesOfType(type, SignatureKind.Call).length === 0 &&
+                getSignaturesOfType(type, SignatureKind.Construct).length === 0;
+        }
+
         function getRegularTypeOfObjectLiteral(type: Type): Type {
             if (type.flags & TypeFlags.FreshObjectLiteral) {
                 let regularType = (<FreshObjectLiteralType>type).regularType;
@@ -6306,19 +6728,20 @@ namespace ts {
                 numberIndexInfo && createIndexInfo(getWidenedType(numberIndexInfo.type), numberIndexInfo.isReadonly));
         }
 
+        function getWidenedConstituentType(type: Type): Type {
+            return type.flags & TypeFlags.Nullable ? type : getWidenedType(type);
+        }
+
         function getWidenedType(type: Type): Type {
             if (type.flags & TypeFlags.RequiresWidening) {
-                if (type.flags & (TypeFlags.Undefined | TypeFlags.Null)) {
+                if (type.flags & TypeFlags.Nullable) {
                     return anyType;
                 }
-                if (type.flags & TypeFlags.PredicateType) {
-                    return booleanType;
-                }
                 if (type.flags & TypeFlags.ObjectLiteral) {
                     return getWidenedTypeOfObjectLiteral(type);
                 }
                 if (type.flags & TypeFlags.Union) {
-                    return getUnionType(map((<UnionType>type).types, getWidenedType), /*noSubtypeReduction*/ true);
+                    return getUnionType(map((<UnionType>type).types, getWidenedConstituentType), /*noSubtypeReduction*/ true);
                 }
                 if (isArrayType(type)) {
                     return createArrayType(getWidenedType((<TypeReference>type).typeArguments[0]));
@@ -6387,6 +6810,9 @@ namespace ts {
                         Diagnostics.Rest_parameter_0_implicitly_has_an_any_type :
                         Diagnostics.Parameter_0_implicitly_has_an_1_type;
                     break;
+                case SyntaxKind.BindingElement:
+                    diagnostic = Diagnostics.Binding_element_0_implicitly_has_an_1_type;
+                    break;
                 case SyntaxKind.FunctionDeclaration:
                 case SyntaxKind.MethodDeclaration:
                 case SyntaxKind.MethodSignature:
@@ -6416,29 +6842,23 @@ namespace ts {
         }
 
         function forEachMatchingParameterType(source: Signature, target: Signature, callback: (s: Type, t: Type) => void) {
-            let sourceMax = source.parameters.length;
-            let targetMax = target.parameters.length;
+            const sourceMax = source.parameters.length;
+            const targetMax = target.parameters.length;
             let count: number;
             if (source.hasRestParameter && target.hasRestParameter) {
-                count = sourceMax > targetMax ? sourceMax : targetMax;
-                sourceMax--;
-                targetMax--;
+                count = Math.max(sourceMax, targetMax);
             }
             else if (source.hasRestParameter) {
-                sourceMax--;
                 count = targetMax;
             }
             else if (target.hasRestParameter) {
-                targetMax--;
                 count = sourceMax;
             }
             else {
-                count = sourceMax < targetMax ? sourceMax : targetMax;
+                count = Math.min(sourceMax, targetMax);
             }
             for (let i = 0; i < count; i++) {
-                const s = i < sourceMax ? getTypeOfSymbol(source.parameters[i]) : getRestTypeOfSignature(source);
-                const t = i < targetMax ? getTypeOfSymbol(target.parameters[i]) : getRestTypeOfSignature(target);
-                callback(s, t);
+                callback(getTypeAtPosition(source, i), getTypeAtPosition(target, i));
             }
         }
 
@@ -6466,6 +6886,7 @@ namespace ts {
             let targetStack: Type[];
             let depth = 0;
             let inferiority = 0;
+            const visited: Map<boolean> = {};
             inferFromTypes(source, target);
 
             function isInProcess(source: Type, target: Type) {
@@ -6541,11 +6962,6 @@ namespace ts {
                         inferFromTypes(sourceTypes[i], targetTypes[i]);
                     }
                 }
-                else if (source.flags & TypeFlags.PredicateType && target.flags & TypeFlags.PredicateType) {
-                    if ((source as PredicateType).predicate.kind === (target as PredicateType).predicate.kind) {
-                        inferFromTypes((source as PredicateType).predicate.type, (target as PredicateType).predicate.type);
-                    }
-                }
                 else if (source.flags & TypeFlags.Tuple && target.flags & TypeFlags.Tuple && (<TupleType>source).elementTypes.length === (<TupleType>target).elementTypes.length) {
                     // If source and target are tuples of the same size, infer from element types
                     const sourceTypes = (<TupleType>source).elementTypes;
@@ -6579,7 +6995,7 @@ namespace ts {
                     }
                 }
                 else if (source.flags & TypeFlags.UnionOrIntersection) {
-                    // Source is a union or intersection type, infer from each consituent type
+                    // Source is a union or intersection type, infer from each constituent type
                     const sourceTypes = (<UnionOrIntersectionType>source).types;
                     for (const sourceType of sourceTypes) {
                         inferFromTypes(sourceType, target);
@@ -6600,6 +7016,12 @@ namespace ts {
                             return;
                         }
 
+                        const key = source.id + "," + target.id;
+                        if (hasProperty(visited, key)) {
+                            return;
+                        }
+                        visited[key] = true;
+
                         if (depth === 0) {
                             sourceStack = [];
                             targetStack = [];
@@ -6610,9 +7032,7 @@ namespace ts {
                         inferFromProperties(source, target);
                         inferFromSignatures(source, target, SignatureKind.Call);
                         inferFromSignatures(source, target, SignatureKind.Construct);
-                        inferFromIndexTypes(source, target, IndexKind.String, IndexKind.String);
-                        inferFromIndexTypes(source, target, IndexKind.Number, IndexKind.Number);
-                        inferFromIndexTypes(source, target, IndexKind.String, IndexKind.Number);
+                        inferFromIndexTypes(source, target);
                         depth--;
                     }
                 }
@@ -6641,15 +7061,31 @@ namespace ts {
 
             function inferFromSignature(source: Signature, target: Signature) {
                 forEachMatchingParameterType(source, target, inferFromTypes);
-                inferFromTypes(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
+
+                if (source.typePredicate && target.typePredicate && source.typePredicate.kind === target.typePredicate.kind) {
+                    inferFromTypes(source.typePredicate.type, target.typePredicate.type);
+                }
+                else {
+                    inferFromTypes(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
+                }
             }
 
-            function inferFromIndexTypes(source: Type, target: Type, sourceKind: IndexKind, targetKind: IndexKind) {
-                const targetIndexType = getIndexTypeOfType(target, targetKind);
-                if (targetIndexType) {
-                    const sourceIndexType = getIndexTypeOfType(source, sourceKind);
+            function inferFromIndexTypes(source: Type, target: Type) {
+                const targetStringIndexType = getIndexTypeOfType(target, IndexKind.String);
+                if (targetStringIndexType) {
+                    const sourceIndexType = getIndexTypeOfType(source, IndexKind.String) ||
+                        getImplicitIndexTypeOfType(source, IndexKind.String);
                     if (sourceIndexType) {
-                        inferFromTypes(sourceIndexType, targetIndexType);
+                        inferFromTypes(sourceIndexType, targetStringIndexType);
+                    }
+                }
+                const targetNumberIndexType = getIndexTypeOfType(target, IndexKind.Number);
+                if (targetNumberIndexType) {
+                    const sourceIndexType = getIndexTypeOfType(source, IndexKind.Number) ||
+                        getIndexTypeOfType(source, IndexKind.String) ||
+                        getImplicitIndexTypeOfType(source, IndexKind.Number);
+                    if (sourceIndexType) {
+                        inferFromTypes(sourceIndexType, targetNumberIndexType);
                     }
                 }
             }
@@ -6733,10 +7169,22 @@ namespace ts {
 
         // EXPRESSION TYPE CHECKING
 
+        function createTransientIdentifier(symbol: Symbol, location: Node): Identifier {
+            const result = <TransientIdentifier>createNode(SyntaxKind.Identifier);
+            result.text = symbol.name;
+            result.resolvedSymbol = symbol;
+            result.parent = location;
+            result.id = -1;
+            return result;
+        }
+
         function getResolvedSymbol(node: Identifier): Symbol {
+            if (node.id === -1) {
+                return (<TransientIdentifier>node).resolvedSymbol;
+            }
             const links = getNodeLinks(node);
             if (!links.resolvedSymbol) {
-                links.resolvedSymbol = (!nodeIsMissing(node) && resolveName(node, node.text, SymbolFlags.Value | SymbolFlags.ExportValue, Diagnostics.Cannot_find_name_0, node)) || unknownSymbol;
+                links.resolvedSymbol = !nodeIsMissing(node) && resolveName(node, node.text, SymbolFlags.Value | SymbolFlags.ExportValue, Diagnostics.Cannot_find_name_0, node) || unknownSymbol;
             }
             return links.resolvedSymbol;
         }
@@ -6760,58 +7208,74 @@ namespace ts {
             Debug.fail("should not get here");
         }
 
+        // Return the assignment key for a "dotted name" (i.e. a sequence of identifiers
+        // separated by dots). The key consists of the id of the symbol referenced by the
+        // leftmost identifier followed by zero or more property names separated by dots.
+        // The result is undefined if the reference isn't a dotted name.
+        function getAssignmentKey(node: Node): string {
+            if (node.kind === SyntaxKind.Identifier) {
+                const symbol = getResolvedSymbol(<Identifier>node);
+                return symbol !== unknownSymbol ? "" + getSymbolId(symbol) : undefined;
+            }
+            if (node.kind === SyntaxKind.ThisKeyword) {
+                return "0";
+            }
+            if (node.kind === SyntaxKind.PropertyAccessExpression) {
+                const key = getAssignmentKey((<PropertyAccessExpression>node).expression);
+                return key && key + "." + (<PropertyAccessExpression>node).name.text;
+            }
+            return undefined;
+        }
+
         function hasInitializer(node: VariableLikeDeclaration): boolean {
             return !!(node.initializer || isBindingPattern(node.parent) && hasInitializer(<VariableLikeDeclaration>node.parent.parent));
         }
 
-        // Check if a given variable is assigned within a given syntax node
-        function isVariableAssignedWithin(symbol: Symbol, node: Node): boolean {
-            const links = getNodeLinks(node);
-            if (links.assignmentChecks) {
-                const cachedResult = links.assignmentChecks[symbol.id];
-                if (cachedResult !== undefined) {
-                    return cachedResult;
-                }
-            }
-            else {
-                links.assignmentChecks = {};
-            }
-            return links.assignmentChecks[symbol.id] = isAssignedIn(node);
+        // For a given node compute a map of which dotted names are assigned within
+        // the node.
+        function getAssignmentMap(node: Node): Map<boolean> {
+            const assignmentMap: Map<boolean> = {};
+            visit(node);
+            return assignmentMap;
 
-            function isAssignedInBinaryExpression(node: BinaryExpression) {
-                if (node.operatorToken.kind >= SyntaxKind.FirstAssignment && node.operatorToken.kind <= SyntaxKind.LastAssignment) {
-                    const n = skipParenthesizedNodes(node.left);
-                    if (n.kind === SyntaxKind.Identifier && getResolvedSymbol(<Identifier>n) === symbol) {
-                        return true;
+            function visitReference(node: Identifier | PropertyAccessExpression) {
+                if (isAssignmentTarget(node) || isCompoundAssignmentTarget(node)) {
+                    const key = getAssignmentKey(node);
+                    if (key) {
+                        assignmentMap[key] = true;
                     }
                 }
-                return forEachChild(node, isAssignedIn);
+                forEachChild(node, visit);
             }
 
-            function isAssignedInVariableDeclaration(node: VariableLikeDeclaration) {
-                if (!isBindingPattern(node.name) && getSymbolOfNode(node) === symbol && hasInitializer(node)) {
-                    return true;
+            function visitVariableDeclaration(node: VariableLikeDeclaration) {
+                if (!isBindingPattern(node.name) && hasInitializer(node)) {
+                    assignmentMap[getSymbolId(getSymbolOfNode(node))] = true;
                 }
-                return forEachChild(node, isAssignedIn);
+                forEachChild(node, visit);
             }
 
-            function isAssignedIn(node: Node): boolean {
+            function visit(node: Node) {
                 switch (node.kind) {
-                    case SyntaxKind.BinaryExpression:
-                        return isAssignedInBinaryExpression(<BinaryExpression>node);
+                    case SyntaxKind.Identifier:
+                    case SyntaxKind.PropertyAccessExpression:
+                        visitReference(<Identifier | PropertyAccessExpression>node);
+                        break;
                     case SyntaxKind.VariableDeclaration:
                     case SyntaxKind.BindingElement:
-                        return isAssignedInVariableDeclaration(<VariableLikeDeclaration>node);
+                        visitVariableDeclaration(<VariableLikeDeclaration>node);
+                        break;
+                    case SyntaxKind.BinaryExpression:
                     case SyntaxKind.ObjectBindingPattern:
                     case SyntaxKind.ArrayBindingPattern:
                     case SyntaxKind.ArrayLiteralExpression:
                     case SyntaxKind.ObjectLiteralExpression:
-                    case SyntaxKind.PropertyAccessExpression:
                     case SyntaxKind.ElementAccessExpression:
                     case SyntaxKind.CallExpression:
                     case SyntaxKind.NewExpression:
                     case SyntaxKind.TypeAssertionExpression:
                     case SyntaxKind.AsExpression:
+                    case SyntaxKind.NonNullExpression:
                     case SyntaxKind.ParenthesizedExpression:
                     case SyntaxKind.PrefixUnaryExpression:
                     case SyntaxKind.DeleteExpression:
@@ -6834,6 +7298,7 @@ namespace ts {
                     case SyntaxKind.ReturnStatement:
                     case SyntaxKind.WithStatement:
                     case SyntaxKind.SwitchStatement:
+                    case SyntaxKind.CaseBlock:
                     case SyntaxKind.CaseClause:
                     case SyntaxKind.DefaultClause:
                     case SyntaxKind.LabeledStatement:
@@ -6846,98 +7311,210 @@ namespace ts {
                     case SyntaxKind.JsxSpreadAttribute:
                     case SyntaxKind.JsxOpeningElement:
                     case SyntaxKind.JsxExpression:
-                        return forEachChild(node, isAssignedIn);
+                        forEachChild(node, visit);
+                        break;
                 }
-                return false;
             }
         }
 
-        // Get the narrowed type of a given symbol at a given location
-        function getNarrowedTypeOfSymbol(symbol: Symbol, node: Node) {
-            let type = getTypeOfSymbol(symbol);
-            // Only narrow when symbol is variable of type any or an object, union, or type parameter type
-            if (node && symbol.flags & SymbolFlags.Variable) {
-                if (isTypeAny(type) || type.flags & (TypeFlags.ObjectType | TypeFlags.Union | TypeFlags.TypeParameter)) {
-                    const declaration = getDeclarationOfKind(symbol, SyntaxKind.VariableDeclaration);
-                    const top = declaration && getDeclarationContainer(declaration);
-                    const originalType = type;
-                    const nodeStack: {node: Node, child: Node}[] = [];
-                    loop: while (node.parent) {
-                        const child = node;
-                        node = node.parent;
-                        switch (node.kind) {
-                            case SyntaxKind.IfStatement:
-                            case SyntaxKind.ConditionalExpression:
-                            case SyntaxKind.BinaryExpression:
-                                nodeStack.push({node, child});
-                                break;
-                            case SyntaxKind.SourceFile:
-                            case SyntaxKind.ModuleDeclaration:
-                                // Stop at the first containing file or module declaration
-                                break loop;
-                        }
-                        if (node === top) {
-                            break;
-                        }
-                    }
-
-                    let nodes: {node: Node, child: Node};
-                    while (nodes = nodeStack.pop()) {
-                        const {node, child} = nodes;
-                        switch (node.kind) {
-                            case SyntaxKind.IfStatement:
-                                // In a branch of an if statement, narrow based on controlling expression
-                                if (child !== (<IfStatement>node).expression) {
-                                    type = narrowType(type, (<IfStatement>node).expression, /*assumeTrue*/ child === (<IfStatement>node).thenStatement);
-                                }
-                                break;
-                            case SyntaxKind.ConditionalExpression:
-                                // In a branch of a conditional expression, narrow based on controlling condition
-                                if (child !== (<ConditionalExpression>node).condition) {
-                                    type = narrowType(type, (<ConditionalExpression>node).condition, /*assumeTrue*/ child === (<ConditionalExpression>node).whenTrue);
-                                }
-                                break;
-                            case SyntaxKind.BinaryExpression:
-                                // In the right operand of an && or ||, narrow based on left operand
-                                if (child === (<BinaryExpression>node).right) {
-                                    if ((<BinaryExpression>node).operatorToken.kind === SyntaxKind.AmpersandAmpersandToken) {
-                                        type = narrowType(type, (<BinaryExpression>node).left, /*assumeTrue*/ true);
-                                    }
-                                    else if ((<BinaryExpression>node).operatorToken.kind === SyntaxKind.BarBarToken) {
-                                        type = narrowType(type, (<BinaryExpression>node).left, /*assumeTrue*/ false);
-                                    }
-                                }
-                                break;
-                            default:
-                                Debug.fail("Unreachable!");
-                        }
-
-                        // Use original type if construct contains assignments to variable
-                        if (type !== originalType && isVariableAssignedWithin(symbol, node)) {
-                            type = originalType;
-                        }
-                    }
-
-                    // Preserve old top-level behavior - if the branch is really an empty set, revert to prior type
-                    if (type === emptyUnionType) {
-                        type = originalType;
-                    }
+        function isReferenceAssignedWithin(reference: Node, node: Node): boolean {
+            if (reference.kind !== SyntaxKind.ThisKeyword) {
+                const key = getAssignmentKey(reference);
+                if (key) {
+                    const links = getNodeLinks(node);
+                    return (links.assignmentMap || (links.assignmentMap = getAssignmentMap(node)))[key];
                 }
             }
+            return false;
+        }
+
+        function isAnyPartOfReferenceAssignedWithin(reference: Node, node: Node) {
+            while (true) {
+                if (isReferenceAssignedWithin(reference, node)) {
+                    return true;
+                }
+                if (reference.kind !== SyntaxKind.PropertyAccessExpression) {
+                    return false;
+                }
+                reference = (<PropertyAccessExpression>reference).expression;
+            }
+        }
+
+        function isNullOrUndefinedLiteral(node: Expression) {
+            return node.kind === SyntaxKind.NullKeyword ||
+                node.kind === SyntaxKind.Identifier && getResolvedSymbol(<Identifier>node) === undefinedSymbol;
+        }
+
+        function getLeftmostIdentifierOrThis(node: Node): Node {
+            switch (node.kind) {
+                case SyntaxKind.Identifier:
+                case SyntaxKind.ThisKeyword:
+                    return node;
+                case SyntaxKind.PropertyAccessExpression:
+                    return getLeftmostIdentifierOrThis((<PropertyAccessExpression>node).expression);
+            }
+            return undefined;
+        }
+
+        function isMatchingReference(source: Node, target: Node): boolean {
+            if (source.kind === target.kind) {
+                switch (source.kind) {
+                    case SyntaxKind.Identifier:
+                        return getResolvedSymbol(<Identifier>source) === getResolvedSymbol(<Identifier>target);
+                    case SyntaxKind.ThisKeyword:
+                        return true;
+                    case SyntaxKind.PropertyAccessExpression:
+                        return (<PropertyAccessExpression>source).name.text === (<PropertyAccessExpression>target).name.text &&
+                            isMatchingReference((<PropertyAccessExpression>source).expression, (<PropertyAccessExpression>target).expression);
+                }
+            }
+            return false;
+        }
+
+        // Get the narrowed type of a given symbol at a given location
+        function getNarrowedTypeOfReference(type: Type, reference: Node) {
+            if (!(type.flags & (TypeFlags.Any | TypeFlags.ObjectType | TypeFlags.Union | TypeFlags.TypeParameter))) {
+                return type;
+            }
+            const leftmostNode = getLeftmostIdentifierOrThis(reference);
+            if (!leftmostNode) {
+                return type;
+            }
+            let top: Node;
+            if (leftmostNode.kind === SyntaxKind.Identifier) {
+                const leftmostSymbol = getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(<Identifier>leftmostNode));
+                if (!leftmostSymbol) {
+                    return type;
+                }
+                const declaration = leftmostSymbol.valueDeclaration;
+                if (!declaration || declaration.kind !== SyntaxKind.VariableDeclaration && declaration.kind !== SyntaxKind.Parameter && declaration.kind !== SyntaxKind.BindingElement) {
+                    return type;
+                }
+                top = getDeclarationContainer(declaration);
+            }
+            const originalType = type;
+            const nodeStack: { node: Node, child: Node }[] = [];
+            let node: Node = reference;
+            loop: while (node.parent) {
+                const child = node;
+                node = node.parent;
+                switch (node.kind) {
+                    case SyntaxKind.IfStatement:
+                    case SyntaxKind.ConditionalExpression:
+                    case SyntaxKind.BinaryExpression:
+                        nodeStack.push({node, child});
+                        break;
+                    case SyntaxKind.SourceFile:
+                    case SyntaxKind.ModuleDeclaration:
+                        break loop;
+                    default:
+                        if (node === top || isFunctionLikeKind(node.kind)) {
+                            break loop;
+                        }
+                        break;
+                }
+            }
+
+            let nodes: { node: Node, child: Node };
+            while (nodes = nodeStack.pop()) {
+                const {node, child} = nodes;
+                switch (node.kind) {
+                    case SyntaxKind.IfStatement:
+                        // In a branch of an if statement, narrow based on controlling expression
+                        if (child !== (<IfStatement>node).expression) {
+                            type = narrowType(type, (<IfStatement>node).expression, /*assumeTrue*/ child === (<IfStatement>node).thenStatement);
+                        }
+                        break;
+                    case SyntaxKind.ConditionalExpression:
+                        // In a branch of a conditional expression, narrow based on controlling condition
+                        if (child !== (<ConditionalExpression>node).condition) {
+                            type = narrowType(type, (<ConditionalExpression>node).condition, /*assumeTrue*/ child === (<ConditionalExpression>node).whenTrue);
+                        }
+                        break;
+                    case SyntaxKind.BinaryExpression:
+                        // In the right operand of an && or ||, narrow based on left operand
+                        if (child === (<BinaryExpression>node).right) {
+                            if ((<BinaryExpression>node).operatorToken.kind === SyntaxKind.AmpersandAmpersandToken) {
+                                type = narrowType(type, (<BinaryExpression>node).left, /*assumeTrue*/ true);
+                            }
+                            else if ((<BinaryExpression>node).operatorToken.kind === SyntaxKind.BarBarToken) {
+                                type = narrowType(type, (<BinaryExpression>node).left, /*assumeTrue*/ false);
+                            }
+                        }
+                        break;
+                    default:
+                        Debug.fail("Unreachable!");
+                }
+
+                // Use original type if construct contains assignments to variable
+                if (type !== originalType && isAnyPartOfReferenceAssignedWithin(reference, node)) {
+                    type = originalType;
+                }
+            }
+
+            // Preserve old top-level behavior - if the branch is really an empty set, revert to prior type
+            if (type === emptyUnionType) {
+                type = originalType;
+            }
 
             return type;
 
-            function narrowTypeByEquality(type: Type, expr: BinaryExpression, assumeTrue: boolean): Type {
-                // Check that we have 'typeof <symbol>' on the left and string literal on the right
-                if (expr.left.kind !== SyntaxKind.TypeOfExpression || expr.right.kind !== SyntaxKind.StringLiteral) {
+            function narrowTypeByTruthiness(type: Type, expr: Expression, assumeTrue: boolean): Type {
+                return strictNullChecks && assumeTrue && isMatchingReference(expr, reference) ? getNonNullableType(type) : type;
+            }
+
+            function narrowTypeByBinaryExpression(type: Type, expr: BinaryExpression, assumeTrue: boolean): Type {
+                switch (expr.operatorToken.kind) {
+                    case SyntaxKind.EqualsEqualsToken:
+                    case SyntaxKind.ExclamationEqualsToken:
+                    case SyntaxKind.EqualsEqualsEqualsToken:
+                    case SyntaxKind.ExclamationEqualsEqualsToken:
+                        if (isNullOrUndefinedLiteral(expr.right)) {
+                            return narrowTypeByNullCheck(type, expr, assumeTrue);
+                        }
+                        if (expr.left.kind === SyntaxKind.TypeOfExpression && expr.right.kind === SyntaxKind.StringLiteral) {
+                            return narrowTypeByTypeof(type, expr, assumeTrue);
+                        }
+                        break;
+                    case SyntaxKind.AmpersandAmpersandToken:
+                        return narrowTypeByAnd(type, expr, assumeTrue);
+                    case SyntaxKind.BarBarToken:
+                        return narrowTypeByOr(type, expr, assumeTrue);
+                    case SyntaxKind.InstanceOfKeyword:
+                        return narrowTypeByInstanceof(type, expr, assumeTrue);
+                }
+                return type;
+            }
+
+            function narrowTypeByNullCheck(type: Type, expr: BinaryExpression, assumeTrue: boolean): Type {
+                // We have '==', '!=', '===', or '!==' operator with 'null' or 'undefined' on the right
+                const operator = expr.operatorToken.kind;
+                if (operator === SyntaxKind.ExclamationEqualsToken || operator === SyntaxKind.ExclamationEqualsEqualsToken) {
+                    assumeTrue = !assumeTrue;
+                }
+                if (!strictNullChecks || !isMatchingReference(expr.left, reference)) {
                     return type;
                 }
+                const doubleEquals = operator === SyntaxKind.EqualsEqualsToken || operator === SyntaxKind.ExclamationEqualsToken;
+                const exprNullableKind = doubleEquals ? TypeFlags.Nullable :
+                    expr.right.kind === SyntaxKind.NullKeyword ? TypeFlags.Null : TypeFlags.Undefined;
+                if (assumeTrue) {
+                    const nullableKind = getNullableKind(type) & exprNullableKind;
+                    return nullableKind ? getNullableTypeOfKind(nullableKind) : type;
+                }
+                return removeNullableKind(type, exprNullableKind);
+            }
+
+            function narrowTypeByTypeof(type: Type, expr: BinaryExpression, assumeTrue: boolean): Type {
+                // We have '==', '!=', '====', or !==' operator with 'typeof xxx' on the left
+                // and string literal on the right
                 const left = <TypeOfExpression>expr.left;
                 const right = <LiteralExpression>expr.right;
-                if (left.expression.kind !== SyntaxKind.Identifier || getResolvedSymbol(<Identifier>left.expression) !== symbol) {
+                if (!isMatchingReference(left.expression, reference)) {
                     return type;
                 }
-                if (expr.operatorToken.kind === SyntaxKind.ExclamationEqualsEqualsToken) {
+                if (expr.operatorToken.kind === SyntaxKind.ExclamationEqualsToken ||
+                    expr.operatorToken.kind === SyntaxKind.ExclamationEqualsEqualsToken) {
                     assumeTrue = !assumeTrue;
                 }
                 const typeInfo = primitiveTypeInfo[right.text];
@@ -7001,7 +7578,7 @@ namespace ts {
 
             function narrowTypeByInstanceof(type: Type, expr: BinaryExpression, assumeTrue: boolean): Type {
                 // Check that type is not any, assumed result is true, and we have variable symbol on the left
-                if (isTypeAny(type) || expr.left.kind !== SyntaxKind.Identifier || getResolvedSymbol(<Identifier>expr.left) !== symbol) {
+                if (isTypeAny(type) || !isMatchingReference(expr.left, reference)) {
                     return type;
                 }
 
@@ -7059,7 +7636,8 @@ namespace ts {
                     }
                 }
 
-                if (isTypeAssignableTo(narrowedTypeCandidate, originalType)) {
+                const targetType = originalType.flags & TypeFlags.TypeParameter ? getApparentType(originalType) : originalType;
+                if (isTypeAssignableTo(narrowedTypeCandidate, targetType)) {
                     // Narrow to the target type if it's assignable to the current type
                     return narrowedTypeCandidate;
                 }
@@ -7067,100 +7645,82 @@ namespace ts {
                 return originalType;
             }
 
-            function narrowTypeByTypePredicate(type: Type, expr: CallExpression, assumeTrue: boolean): Type {
+            function narrowTypeByTypePredicate(type: Type, callExpression: CallExpression, assumeTrue: boolean): Type {
                 if (type.flags & TypeFlags.Any) {
                     return type;
                 }
-                const signature = getResolvedSignature(expr);
-                const predicateType = getReturnTypeOfSignature(signature);
-
-                if (!predicateType || !(predicateType.flags & TypeFlags.PredicateType)) {
+                const signature = getResolvedSignature(callExpression);
+                const predicate = signature.typePredicate;
+                if (!predicate) {
                     return type;
                 }
-                const predicate = (predicateType as PredicateType).predicate;
                 if (isIdentifierTypePredicate(predicate)) {
-                    const callExpression = expr as CallExpression;
-                    if (callExpression.arguments[predicate.parameterIndex] &&
-                        getSymbolAtTypePredicatePosition(callExpression.arguments[predicate.parameterIndex]) === symbol) {
+                    const predicateArgument = callExpression.arguments[predicate.parameterIndex];
+                    if (predicateArgument && isMatchingReference(predicateArgument, reference)) {
                         return getNarrowedType(type, predicate.type, assumeTrue);
                     }
                 }
                 else {
-                    const expression = skipParenthesizedNodes(expr.expression);
-                    return narrowTypeByThisTypePredicate(type, predicate, expression, assumeTrue);
-                }
-                return type;
-            }
-
-            function narrowTypeByTypePredicateMember(type: Type, expr: ElementAccessExpression | PropertyAccessExpression, assumeTrue: boolean): Type {
-                if (type.flags & TypeFlags.Any) {
-                    return type;
-                }
-                const memberType = getTypeOfExpression(expr);
-                if (!(memberType.flags & TypeFlags.PredicateType)) {
-                    return type;
-                }
-
-                return narrowTypeByThisTypePredicate(type, (memberType as PredicateType).predicate as ThisTypePredicate, expr, assumeTrue);
-            }
-
-            function narrowTypeByThisTypePredicate(type: Type, predicate: ThisTypePredicate, expression: Expression, assumeTrue: boolean): Type {
-                if (expression.kind === SyntaxKind.ElementAccessExpression || expression.kind === SyntaxKind.PropertyAccessExpression) {
-                    const accessExpression = expression as ElementAccessExpression | PropertyAccessExpression;
-                    const possibleIdentifier = skipParenthesizedNodes(accessExpression.expression);
-                    if (possibleIdentifier.kind === SyntaxKind.Identifier && getSymbolAtTypePredicatePosition(possibleIdentifier) === symbol) {
-                        return getNarrowedType(type, predicate.type, assumeTrue);
+                    const invokedExpression = skipParenthesizedNodes(callExpression.expression);
+                    if (invokedExpression.kind === SyntaxKind.ElementAccessExpression || invokedExpression.kind === SyntaxKind.PropertyAccessExpression) {
+                        const accessExpression = invokedExpression as ElementAccessExpression | PropertyAccessExpression;
+                        const possibleReference= skipParenthesizedNodes(accessExpression.expression);
+                        if (isMatchingReference(possibleReference, reference)) {
+                            return getNarrowedType(type, predicate.type, assumeTrue);
+                        }
                     }
                 }
                 return type;
             }
 
-            function getSymbolAtTypePredicatePosition(expr: Expression): Symbol {
-                expr = skipParenthesizedNodes(expr);
-                switch (expr.kind) {
-                    case SyntaxKind.Identifier:
-                    case SyntaxKind.PropertyAccessExpression:
-                    case SyntaxKind.QualifiedName:
-                        return getSymbolOfEntityNameOrPropertyAccessExpression(expr as Node as (EntityName | PropertyAccessExpression));
-                }
-            }
-
             // Narrow the given type based on the given expression having the assumed boolean value. The returned type
             // will be a subtype or the same type as the argument.
             function narrowType(type: Type, expr: Expression, assumeTrue: boolean): Type {
                 switch (expr.kind) {
+                    case SyntaxKind.Identifier:
+                    case SyntaxKind.ThisKeyword:
+                    case SyntaxKind.PropertyAccessExpression:
+                        return narrowTypeByTruthiness(type, expr, assumeTrue);
                     case SyntaxKind.CallExpression:
                         return narrowTypeByTypePredicate(type, <CallExpression>expr, assumeTrue);
                     case SyntaxKind.ParenthesizedExpression:
                         return narrowType(type, (<ParenthesizedExpression>expr).expression, assumeTrue);
                     case SyntaxKind.BinaryExpression:
-                        const operator = (<BinaryExpression>expr).operatorToken.kind;
-                        if (operator === SyntaxKind.EqualsEqualsEqualsToken || operator === SyntaxKind.ExclamationEqualsEqualsToken) {
-                            return narrowTypeByEquality(type, <BinaryExpression>expr, assumeTrue);
-                        }
-                        else if (operator === SyntaxKind.AmpersandAmpersandToken) {
-                            return narrowTypeByAnd(type, <BinaryExpression>expr, assumeTrue);
-                        }
-                        else if (operator === SyntaxKind.BarBarToken) {
-                            return narrowTypeByOr(type, <BinaryExpression>expr, assumeTrue);
-                        }
-                        else if (operator === SyntaxKind.InstanceOfKeyword) {
-                            return narrowTypeByInstanceof(type, <BinaryExpression>expr, assumeTrue);
-                        }
-                        break;
+                        return narrowTypeByBinaryExpression(type, <BinaryExpression>expr, assumeTrue);
                     case SyntaxKind.PrefixUnaryExpression:
                         if ((<PrefixUnaryExpression>expr).operator === SyntaxKind.ExclamationToken) {
                             return narrowType(type, (<PrefixUnaryExpression>expr).operand, !assumeTrue);
                         }
                         break;
-                    case SyntaxKind.ElementAccessExpression:
-                    case SyntaxKind.PropertyAccessExpression:
-                        return narrowTypeByTypePredicateMember(type, expr as (ElementAccessExpression | PropertyAccessExpression), assumeTrue);
                 }
                 return type;
             }
         }
 
+        function getTypeOfSymbolAtLocation(symbol: Symbol, location: Node) {
+            // The language service will always care about the narrowed type of a symbol, because that is
+            // the type the language says the symbol should have.
+            const type = getTypeOfSymbol(symbol);
+            if (location.kind === SyntaxKind.Identifier) {
+                if (isRightSideOfQualifiedNameOrPropertyAccess(location)) {
+                    location = location.parent;
+                }
+                // If location is an identifier or property access that references the given
+                // symbol, use the location as the reference with respect to which we narrow.
+                if (isExpression(location)) {
+                    checkExpression(<Expression>location);
+                    if (getNodeLinks(location).resolvedSymbol === symbol) {
+                        return getNarrowedTypeOfReference(type, <IdentifierOrPropertyAccess>location);
+                    }
+                }
+            }
+            // 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. To answer that question we manufacture a transient
+            // identifier at the location and narrow with respect to that identifier.
+            return getNarrowedTypeOfReference(type, createTransientIdentifier(symbol, location));
+        }
+
         function skipParenthesizedNodes(expression: Expression): Expression {
             while (expression.kind === SyntaxKind.ParenthesizedExpression) {
                 expression = (expression as ParenthesizedExpression).expression;
@@ -7168,6 +7728,98 @@ namespace ts {
             return expression;
         }
 
+        function findFirstAssignment(symbol: Symbol, container: Node): Node {
+            return visit(isFunctionLike(container) ? (<FunctionLikeDeclaration>container).body : container);
+
+            function visit(node: Node): Node {
+                switch (node.kind) {
+                    case SyntaxKind.Identifier:
+                        const assignment = getAssignmentRoot(node);
+                        return assignment && getResolvedSymbol(<Identifier>node) === symbol ? assignment : undefined;
+                    case SyntaxKind.BinaryExpression:
+                    case SyntaxKind.VariableDeclaration:
+                    case SyntaxKind.BindingElement:
+                    case SyntaxKind.ObjectBindingPattern:
+                    case SyntaxKind.ArrayBindingPattern:
+                    case SyntaxKind.ArrayLiteralExpression:
+                    case SyntaxKind.ObjectLiteralExpression:
+                    case SyntaxKind.PropertyAccessExpression:
+                    case SyntaxKind.ElementAccessExpression:
+                    case SyntaxKind.CallExpression:
+                    case SyntaxKind.NewExpression:
+                    case SyntaxKind.TypeAssertionExpression:
+                    case SyntaxKind.AsExpression:
+                    case SyntaxKind.NonNullExpression:
+                    case SyntaxKind.ParenthesizedExpression:
+                    case SyntaxKind.PrefixUnaryExpression:
+                    case SyntaxKind.DeleteExpression:
+                    case SyntaxKind.AwaitExpression:
+                    case SyntaxKind.TypeOfExpression:
+                    case SyntaxKind.VoidExpression:
+                    case SyntaxKind.PostfixUnaryExpression:
+                    case SyntaxKind.YieldExpression:
+                    case SyntaxKind.ConditionalExpression:
+                    case SyntaxKind.SpreadElementExpression:
+                    case SyntaxKind.VariableStatement:
+                    case SyntaxKind.ExpressionStatement:
+                    case SyntaxKind.IfStatement:
+                    case SyntaxKind.DoStatement:
+                    case SyntaxKind.WhileStatement:
+                    case SyntaxKind.ForStatement:
+                    case SyntaxKind.ForInStatement:
+                    case SyntaxKind.ForOfStatement:
+                    case SyntaxKind.ReturnStatement:
+                    case SyntaxKind.WithStatement:
+                    case SyntaxKind.SwitchStatement:
+                    case SyntaxKind.CaseBlock:
+                    case SyntaxKind.CaseClause:
+                    case SyntaxKind.DefaultClause:
+                    case SyntaxKind.LabeledStatement:
+                    case SyntaxKind.ThrowStatement:
+                    case SyntaxKind.TryStatement:
+                    case SyntaxKind.CatchClause:
+                    case SyntaxKind.JsxElement:
+                    case SyntaxKind.JsxSelfClosingElement:
+                    case SyntaxKind.JsxAttribute:
+                    case SyntaxKind.JsxSpreadAttribute:
+                    case SyntaxKind.JsxOpeningElement:
+                    case SyntaxKind.JsxExpression:
+                    case SyntaxKind.Block:
+                    case SyntaxKind.SourceFile:
+                        return forEachChild(node, visit);
+                }
+                return undefined;
+            }
+        }
+
+        function checkVariableAssignedBefore(symbol: Symbol, reference: Node) {
+            if (!(symbol.flags & SymbolFlags.Variable)) {
+                return;
+            }
+            const declaration = symbol.valueDeclaration;
+            if (!declaration || declaration.kind !== SyntaxKind.VariableDeclaration || (<VariableDeclaration>declaration).initializer || isInAmbientContext(declaration)) {
+                return;
+            }
+            const parentParentKind = declaration.parent.parent.kind;
+            if (parentParentKind === SyntaxKind.ForOfStatement || parentParentKind === SyntaxKind.ForInStatement) {
+                return;
+            }
+            const declarationContainer = getContainingFunction(declaration) || getSourceFileOfNode(declaration);
+            const referenceContainer = getContainingFunction(reference) || getSourceFileOfNode(reference);
+            if (declarationContainer !== referenceContainer) {
+                return;
+            }
+            const links = getSymbolLinks(symbol);
+            if (!links.firstAssignmentChecked) {
+                links.firstAssignmentChecked = true;
+                links.firstAssignment = findFirstAssignment(symbol, declarationContainer);
+            }
+            if (links.firstAssignment && links.firstAssignment.end <= reference.pos) {
+                return;
+            }
+            error(reference, Diagnostics.Variable_0_is_used_before_being_assigned, symbolToString(symbol));
+        }
+
         function checkIdentifier(node: Identifier): Type {
             const symbol = getResolvedSymbol(node);
 
@@ -7219,7 +7871,11 @@ namespace ts {
             checkCollisionWithCapturedThisVariable(node, node);
             checkNestedBlockScopedBinding(node, symbol);
 
-            return getNarrowedTypeOfSymbol(localOrExportSymbol, node);
+            const type = getTypeOfSymbol(localOrExportSymbol);
+            if (strictNullChecks && !isAssignmentTarget(node) && !(type.flags & TypeFlags.Any) && !(getNullableKind(type) & TypeFlags.Undefined)) {
+                checkVariableAssignedBefore(symbol, node);
+            }
+            return getNarrowedTypeOfReference(type, node);
         }
 
         function isInsideFunction(node: Node, threshold: Node): boolean {
@@ -7264,6 +7920,15 @@ namespace ts {
                     // mark iteration statement as containing block-scoped binding captured in some function
                     getNodeLinks(current).flags |= NodeCheckFlags.LoopWithCapturedBlockScopedBinding;
                 }
+
+                // mark variables that are declared in loop initializer and reassigned inside the body of ForStatement.
+                // if body of ForStatement will be converted to function then we'll need a extra machinery to propagate reassigned values back.
+                if (container.kind === SyntaxKind.ForStatement &&
+                    getAncestor(symbol.valueDeclaration, SyntaxKind.VariableDeclarationList).parent === container &&
+                    isAssignedInBodyOfForStatement(node, <ForStatement>container)) {
+                    getNodeLinks(symbol.valueDeclaration).flags |= NodeCheckFlags.NeedsLoopOutParameter;
+                }
+
                 // set 'declared inside loop' bit on the block-scoped binding
                 getNodeLinks(symbol.valueDeclaration).flags |= NodeCheckFlags.BlockScopedBindingInLoop;
             }
@@ -7273,6 +7938,40 @@ namespace ts {
             }
         }
 
+        function isAssignedInBodyOfForStatement(node: Identifier, container: ForStatement): boolean {
+            let current: Node = node;
+            // skip parenthesized nodes
+            while (current.parent.kind === SyntaxKind.ParenthesizedExpression) {
+                current = current.parent;
+            }
+
+            // check if node is used as LHS in some assignment expression
+            let isAssigned = false;
+            if (isAssignmentTarget(current)) {
+                isAssigned = true;
+            }
+            else if ((current.parent.kind === SyntaxKind.PrefixUnaryExpression || current.parent.kind === SyntaxKind.PostfixUnaryExpression)) {
+                const expr = <PrefixUnaryExpression | PostfixUnaryExpression>current.parent;
+                isAssigned = expr.operator === SyntaxKind.PlusPlusToken || expr.operator === SyntaxKind.MinusMinusToken;
+            }
+
+            if (!isAssigned) {
+                return false;
+            }
+
+            // at this point we know that node is the target of assignment
+            // now check that modification happens inside the statement part of the ForStatement
+            while (current !== container) {
+                if (current === container.statement) {
+                    return true;
+                }
+                else {
+                    current = current.parent;
+                }
+            }
+            return false;
+        }
+
         function captureLexicalThis(node: Node, container: Node): void {
             getNodeLinks(node).flags |= NodeCheckFlags.LexicalThis;
             if (container.kind === SyntaxKind.PropertyDeclaration || container.kind === SyntaxKind.Constructor) {
@@ -7284,6 +7983,46 @@ namespace ts {
             }
         }
 
+        function findFirstSuperCall(n: Node): Node {
+            if (isSuperCallExpression(n)) {
+                return n;
+            }
+            else if (isFunctionLike(n)) {
+                return undefined;
+            }
+            return forEachChild(n, findFirstSuperCall);
+        }
+
+        /**
+         * Return a cached result if super-statement is already found.
+         * Otherwise, find a super statement in a given constructor function and cache the result in the node-links of the constructor
+         *
+         * @param constructor constructor-function to look for super statement
+         */
+        function getSuperCallInConstructor(constructor: ConstructorDeclaration): ExpressionStatement {
+            const links = getNodeLinks(constructor);
+
+            // Only trying to find super-call if we haven't yet tried to find one.  Once we try, we will record the result
+            if (links.hasSuperCall === undefined) {
+                links.superCall = <ExpressionStatement>findFirstSuperCall(constructor.body);
+                links.hasSuperCall = links.superCall ? true : false;
+            }
+            return links.superCall;
+        }
+
+        /**
+         * Check if the given class-declaration extends null then return true.
+         * Otherwise, return false
+         * @param classDecl a class declaration to check if it extends null
+         */
+        function classDeclarationExtendsNull(classDecl: ClassDeclaration): boolean {
+            const classSymbol = getSymbolOfNode(classDecl);
+            const classInstanceType = <InterfaceType>getDeclaredTypeOfSymbol(classSymbol);
+            const baseConstructorType = getBaseConstructorTypeOfClass(classInstanceType);
+
+            return baseConstructorType === nullType;
+        }
+
         function checkThisExpression(node: Node): Type {
             // Stop at the first arrow function so that we can
             // tell whether 'this' needs to be captured.
@@ -7291,10 +8030,25 @@ namespace ts {
             let needToCaptureLexicalThis = false;
 
             if (container.kind === SyntaxKind.Constructor) {
-                const baseTypeNode = getClassExtendsHeritageClauseElement(<ClassLikeDeclaration>container.parent);
-                if (baseTypeNode && !(getNodeCheckFlags(container) & NodeCheckFlags.HasSeenSuperCall)) {
-                    // In ES6, super inside constructor of class-declaration has to precede "this" accessing
-                    error(node, Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class);
+                const containingClassDecl = <ClassDeclaration>container.parent;
+                const baseTypeNode = getClassExtendsHeritageClauseElement(containingClassDecl);
+
+                // If a containing class does not have extends clause or the class extends null
+                // skip checking whether super statement is called before "this" accessing.
+                if (baseTypeNode && !classDeclarationExtendsNull(containingClassDecl)) {
+                    const superCall = getSuperCallInConstructor(<ConstructorDeclaration>container);
+
+                    // We should give an error in the following cases:
+                    //      - No super-call
+                    //      - "this" is accessing before super-call.
+                    //          i.e super(this)
+                    //              this.x; super();
+                    // We want to make sure that super-call is done before accessing "this" so that
+                    // "this" is not accessed as a parameter of the super-call.
+                    if (!superCall || superCall.end > node.pos) {
+                        // In ES6, super inside constructor of class-declaration has to precede "this" accessing
+                        error(node, Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class);
+                    }
                 }
             }
 
@@ -7323,7 +8077,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
                     }
@@ -7336,10 +8090,28 @@ namespace ts {
             if (needToCaptureLexicalThis) {
                 captureLexicalThis(node, container);
             }
-
+            if (isFunctionLike(container)) {
+                const type = getContextuallyTypedThisType(container);
+                if (type) {
+                    return type;
+                }
+                const signature = getSignatureFromDeclaration(container);
+                if (signature.thisType) {
+                    return signature.thisType;
+                }
+                if (container.parent && container.parent.kind === SyntaxKind.ObjectLiteralExpression) {
+                    // Note: this works because object literal methods are deferred,
+                    // which means that the type of the containing object literal is already known.
+                    const type = checkExpressionCached(<ObjectLiteralExpression>container.parent);
+                    if (type) {
+                        return type;
+                    }
+                }
+            }
             if (isClassLike(container.parent)) {
                 const symbol = getSymbolOfNode(container.parent);
-                return container.flags & NodeFlags.Static ? getTypeOfSymbol(symbol) : (<InterfaceType>getDeclaredTypeOfSymbol(symbol)).thisType;
+                const type = getModifierFlags(container) & ModifierFlags.Static ? getTypeOfSymbol(symbol) : (<InterfaceType>getDeclaredTypeOfSymbol(symbol)).thisType;
+                return getNarrowedTypeOfReference(type, node);
             }
 
             if (isInJavaScriptFile(node)) {
@@ -7353,7 +8125,7 @@ namespace ts {
                 if (container.kind === SyntaxKind.FunctionExpression) {
                     if (getSpecialPropertyAssignmentKind(container.parent) === SpecialPropertyAssignmentKind.PrototypeProperty) {
                         // Get the 'x' of 'x.prototype.y = f' (here, 'f' is 'container')
-                        const className = (((container.parent as BinaryExpression)   // x.protoype.y = f
+                        const className = (((container.parent as BinaryExpression)   // x.prototype.y = f
                             .left as PropertyAccessExpression)       // x.prototype.y
                             .expression as PropertyAccessExpression) // x.prototype
                             .expression;                             // x
@@ -7365,12 +8137,16 @@ namespace ts {
                 }
             }
 
+            if (compilerOptions.noImplicitThis) {
+                // With noImplicitThis, functions may not reference 'this' if it has type 'any'
+                error(node, Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation);
+            }
             return anyType;
         }
 
         function getTypeForThisExpressionFromJSDoc(node: Node) {
             const typeTag = getJSDocTypeTag(node);
-            if (typeTag && typeTag.typeExpression.type.kind === SyntaxKind.JSDocFunctionType) {
+            if (typeTag && typeTag.typeExpression && typeTag.typeExpression.type && typeTag.typeExpression.type.kind === SyntaxKind.JSDocFunctionType) {
                 const jsDocFunctionType = <JSDocFunctionType>typeTag.typeExpression.type;
                 if (jsDocFunctionType.parameters.length > 0 && jsDocFunctionType.parameters[0].type.kind === SyntaxKind.JSDocThisType) {
                     return getTypeFromTypeNode(jsDocFunctionType.parameters[0].type);
@@ -7429,7 +8205,7 @@ namespace ts {
                 return unknownType;
             }
 
-            if ((container.flags & NodeFlags.Static) || isCallExpression) {
+            if ((getModifierFlags(container) & ModifierFlags.Static) || isCallExpression) {
                 nodeCheckFlag = NodeCheckFlags.SuperStatic;
             }
             else {
@@ -7494,7 +8270,7 @@ 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 (container.kind === SyntaxKind.MethodDeclaration && getModifierFlags(container) & ModifierFlags.Async) {
                 if (isSuperProperty(node.parent) && isAssignmentTarget(node.parent)) {
                     getNodeLinks(container).flags |= NodeCheckFlags.AsyncMethodWithSuperBinding;
                 }
@@ -7560,7 +8336,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 ||
@@ -7582,6 +8358,19 @@ namespace ts {
             }
         }
 
+        function getContextuallyTypedThisType(func: FunctionLikeDeclaration): Type {
+            if ((isFunctionExpressionOrArrowFunction(func) || isObjectLiteralMethod(func)) &&
+                isContextSensitive(func) &&
+                func.kind !== SyntaxKind.ArrowFunction) {
+                const contextualSignature = getContextualSignature(func);
+                if (contextualSignature) {
+                    return contextualSignature.thisType;
+                }
+            }
+
+            return undefined;
+        }
+
         // Return contextual type of parameter or undefined if no contextual type is available
         function getContextuallyTypedParameterType(parameter: ParameterDeclaration): Type {
             const func = parameter.parent;
@@ -7609,11 +8398,14 @@ namespace ts {
             return undefined;
         }
 
-        // In a variable, parameter or property declaration with a type annotation, the contextual type of an initializer
-        // expression is the type of the variable, parameter or property. Otherwise, in a parameter declaration of a
-        // contextually typed function expression, the contextual type of an initializer expression is the contextual type
-        // of the parameter. Otherwise, in a variable or parameter declaration with a binding pattern name, the contextual
-        // type of an initializer expression is the type implied by the binding pattern.
+        // In a variable, parameter or property declaration with a type annotation,
+        //   the contextual type of an initializer expression is the type of the variable, parameter or property.
+        // Otherwise, in a parameter declaration of a contextually typed function expression,
+        //   the contextual type of an initializer expression is the contextual type of the parameter.
+        // Otherwise, in a variable or parameter declaration with a binding pattern name,
+        //   the contextual type of an initializer expression is the type implied by the binding pattern.
+        // Otherwise, in a binding pattern inside a variable or parameter declaration,
+        //   the contextual type of an initializer expression is the type annotation of the containing declaration, if present.
         function getContextualTypeForInitializerExpression(node: Expression): Type {
             const declaration = <VariableLikeDeclaration>node.parent;
             if (node === declaration.initializer) {
@@ -7629,6 +8421,18 @@ namespace ts {
                 if (isBindingPattern(declaration.name)) {
                     return getTypeFromBindingPattern(<BindingPattern>declaration.name, /*includePatternInType*/ true);
                 }
+                if (isBindingPattern(declaration.parent)) {
+                    const parentDeclaration = declaration.parent.parent;
+                    const name = declaration.propertyName || declaration.name;
+                    if (isVariableLike(parentDeclaration) &&
+                        parentDeclaration.type &&
+                        !isBindingPattern(name)) {
+                        const text = getTextOfPropertyName(name);
+                        if (text) {
+                            return getTypeOfPropertyOfType(getTypeFromTypeNode(parentDeclaration.type), text);
+                        }
+                    }
+                }
             }
             return undefined;
         }
@@ -7780,11 +8584,6 @@ namespace ts {
             return !!(type.flags & TypeFlags.Union ? forEach((<UnionType>type).types, isTupleLikeType) : isTupleLikeType(type));
         }
 
-        // Return true if the given contextual type provides an index signature of the given kind
-        function contextualTypeHasIndexSignature(type: Type, kind: IndexKind): boolean {
-            return !!(type.flags & TypeFlags.Union ? forEach((<UnionType>type).types, t => getIndexInfoOfStructuredType(t, kind)) : getIndexInfoOfStructuredType(type, kind));
-        }
-
         // In an object literal contextually typed by a type T, the contextual type of a property assignment is the type of
         // the matching property in T, if one exists. Otherwise, it is the type of the numeric index signature in T, if one
         // exists. Otherwise, it is the type of the string index signature in T, if one exists.
@@ -7876,7 +8675,7 @@ namespace ts {
          * Otherwise this may not be very useful.
          *
          * In cases where you *are* working on this function, you should understand
-         * when it is appropriate to use 'getContextualType' and 'getApparentTypeOfContetxualType'.
+         * when it is appropriate to use 'getContextualType' and 'getApparentTypeOfContextualType'.
          *
          *   - Use 'getContextualType' when you are simply going to propagate the result to the expression.
          *   - Use 'getApparentTypeOfContextualType' when you're going to need the members of the type.
@@ -7981,7 +8780,7 @@ namespace ts {
                         // This signature will contribute to contextual union signature
                         signatureList = [signature];
                     }
-                    else if (!compareSignaturesIdentical(signatureList[0], signature, /*partialMatch*/ false, /*ignoreReturnTypes*/ true, compareTypesIdentical)) {
+                    else if (!compareSignaturesIdentical(signatureList[0], signature, /*partialMatch*/ false, /*ignoreThisTypes*/ true, /*ignoreReturnTypes*/ true, compareTypesIdentical)) {
                         // Signatures aren't identical, do not use
                         return undefined;
                     }
@@ -8022,19 +8821,40 @@ namespace ts {
             return mapper && mapper.context;
         }
 
+        // Return the root assignment node of an assignment target
+        function getAssignmentRoot(node: Node): Node {
+            while (node.parent.kind === SyntaxKind.ParenthesizedExpression) {
+                node = node.parent;
+            }
+            while (true) {
+                if (node.parent.kind === SyntaxKind.PropertyAssignment) {
+                    node = node.parent.parent;
+                }
+                else if (node.parent.kind === SyntaxKind.ArrayLiteralExpression) {
+                    node = node.parent;
+                }
+                else {
+                    break;
+                }
+            }
+            const parent = node.parent;
+            return parent.kind === SyntaxKind.BinaryExpression &&
+                (<BinaryExpression>parent).operatorToken.kind === SyntaxKind.EqualsToken &&
+                (<BinaryExpression>parent).left === node ? parent : undefined;
+        }
+
         // 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'.
         function isAssignmentTarget(node: Node): boolean {
+            return !!getAssignmentRoot(node);
+        }
+
+        function isCompoundAssignmentTarget(node: Node) {
             const parent = node.parent;
-            if (parent.kind === SyntaxKind.BinaryExpression && (<BinaryExpression>parent).operatorToken.kind === SyntaxKind.EqualsToken && (<BinaryExpression>parent).left === node) {
-                return true;
-            }
-            if (parent.kind === SyntaxKind.PropertyAssignment) {
-                return isAssignmentTarget(parent.parent);
-            }
-            if (parent.kind === SyntaxKind.ArrayLiteralExpression) {
-                return isAssignmentTarget(parent);
+            if (parent.kind === SyntaxKind.BinaryExpression && (<BinaryExpression>parent).left === node) {
+                const operator = (<BinaryExpression>parent).operatorToken.kind;
+                return operator >= SyntaxKind.FirstAssignment && operator <= SyntaxKind.LastAssignment;
             }
             return false;
         }
@@ -8120,7 +8940,7 @@ namespace ts {
                     }
                 }
             }
-            return createArrayType(elementTypes.length ? getUnionType(elementTypes) : undefinedType);
+            return createArrayType(elementTypes.length ? getUnionType(elementTypes) : emptyArrayElementType);
         }
 
         function isNumericName(name: DeclarationName): boolean {
@@ -8134,7 +8954,7 @@ namespace ts {
         }
 
         function isTypeAnyOrAllConstituentTypesHaveKind(type: Type, kind: TypeFlags): boolean {
-            return isTypeAny(type) || allConstituentTypesHaveKind(type, kind);
+            return isTypeAny(type) || isTypeOfKind(type, kind);
         }
 
         function isNumericLiteralName(name: string) {
@@ -8180,6 +9000,17 @@ namespace ts {
             return links.resolvedType;
         }
 
+        function getObjectLiteralIndexInfo(node: ObjectLiteralExpression, properties: Symbol[], kind: IndexKind): IndexInfo {
+            const propTypes: Type[] = [];
+            for (let i = 0; i < properties.length; i++) {
+                if (kind === IndexKind.String || isNumericName(node.properties[i].name)) {
+                    propTypes.push(getTypeOfSymbol(properties[i]));
+                }
+            }
+            const unionType = propTypes.length ? getUnionType(propTypes) : undefinedType;
+            return createIndexInfo(unionType, /*isReadonly*/ false);
+        }
+
         function checkObjectLiteral(node: ObjectLiteralExpression, contextualMapper?: TypeMapper): Type {
             const inDestructuringPattern = isAssignmentTarget(node);
             // Grammar checking
@@ -8191,8 +9022,10 @@ namespace ts {
             const contextualTypeHasPattern = contextualType && contextualType.pattern &&
                 (contextualType.pattern.kind === SyntaxKind.ObjectBindingPattern || contextualType.pattern.kind === SyntaxKind.ObjectLiteralExpression);
             let typeFlags: TypeFlags = 0;
-
             let patternWithComputedProperties = false;
+            let hasComputedStringProperty = false;
+            let hasComputedNumberProperty = false;
+
             for (const memberDecl of node.properties) {
                 let member = memberDecl.symbol;
                 if (memberDecl.kind === SyntaxKind.PropertyAssignment ||
@@ -8256,7 +9089,15 @@ namespace ts {
                     checkAccessorDeclaration(<AccessorDeclaration>memberDecl);
                 }
 
-                if (!hasDynamicName(memberDecl)) {
+                if (hasDynamicName(memberDecl)) {
+                    if (isNumericName(memberDecl.name)) {
+                        hasComputedNumberProperty = true;
+                    }
+                    else {
+                        hasComputedStringProperty = true;
+                    }
+                }
+                else {
                     propertiesTable[member.name] = member;
                 }
                 propertiesArray.push(member);
@@ -8277,8 +9118,8 @@ namespace ts {
                 }
             }
 
-            const stringIndexInfo = getIndexInfo(IndexKind.String);
-            const numberIndexInfo = getIndexInfo(IndexKind.Number);
+            const stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, propertiesArray, IndexKind.String) : undefined;
+            const numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, propertiesArray, IndexKind.Number) : undefined;
             const result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
             const freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : TypeFlags.FreshObjectLiteral;
             result.flags |= TypeFlags.ObjectLiteral | TypeFlags.ContainsObjectLiteral | freshObjectLiteralFlag | (typeFlags & TypeFlags.PropagatingFlags) | (patternWithComputedProperties ? TypeFlags.ObjectLiteralPatternWithComputedProperties : 0);
@@ -8286,29 +9127,6 @@ namespace ts {
                 result.pattern = node;
             }
             return result;
-
-            function getIndexInfo(kind: IndexKind) {
-                if (contextualType && contextualTypeHasIndexSignature(contextualType, kind)) {
-                    const propTypes: Type[] = [];
-                    for (let i = 0; i < propertiesArray.length; i++) {
-                        const propertyDecl = node.properties[i];
-                        if (kind === IndexKind.String || isNumericName(propertyDecl.name)) {
-                            // Do not call getSymbolOfNode(propertyDecl), as that will get the
-                            // original symbol for the node. We actually want to get the symbol
-                            // created by checkObjectLiteral, since that will be appropriately
-                            // contextually typed and resolved.
-                            const type = getTypeOfSymbol(propertiesArray[i]);
-                            if (!contains(propTypes, type)) {
-                                propTypes.push(type);
-                            }
-                        }
-                    }
-                    const unionType = propTypes.length ? getUnionType(propTypes) : undefinedType;
-                    typeFlags |= unionType.flags;
-                    return createIndexInfo(unionType, /*isReadonly*/ false);
-                }
-                return undefined;
-            }
         }
 
         function checkJsxSelfClosingElement(node: JsxSelfClosingElement) {
@@ -8321,7 +9139,12 @@ namespace ts {
             checkJsxOpeningLikeElement(node.openingElement);
 
             // Perform resolution on the closing tag so that rename/go to definition/etc work
-            getJsxElementTagSymbol(node.closingElement);
+            if (isJsxIntrinsicIdentifier(node.closingElement.tagName)) {
+                getIntrinsicTagSymbol(node.closingElement);
+            }
+            else {
+                checkExpression(node.closingElement.tagName);
+            }
 
             // Check children
             for (const child of node.children) {
@@ -8431,77 +9254,43 @@ namespace ts {
             return jsxTypes[name];
         }
 
-        /// Given a JSX opening element or self-closing element, return the symbol of the property that the tag name points to if
-        /// this is an intrinsic tag. This might be a named
-        /// property of the IntrinsicElements interface, or its string indexer.
-        /// If this is a class-based tag (otherwise returns undefined), returns the symbol of the class
-        /// type or factory function.
-        /// Otherwise, returns unknownSymbol.
-        function getJsxElementTagSymbol(node: JsxOpeningLikeElement | JsxClosingElement): Symbol {
+        /**
+          * Looks up an intrinsic tag name and returns a symbol that either points to an intrinsic
+          * property (in which case nodeLinks.jsxFlags will be IntrinsicNamedElement) or an intrinsic
+          * string index signature (in which case nodeLinks.jsxFlags will be IntrinsicIndexedElement).
+          * May also return unknownSymbol if both of these lookups fail.
+          */
+        function getIntrinsicTagSymbol(node: JsxOpeningLikeElement | JsxClosingElement): Symbol {
             const links = getNodeLinks(node);
             if (!links.resolvedSymbol) {
-                if (isJsxIntrinsicIdentifier(node.tagName)) {
-                    links.resolvedSymbol = lookupIntrinsicTag(node);
-                }
-                else {
-                    links.resolvedSymbol = lookupClassTag(node);
-                }
-            }
-            return links.resolvedSymbol;
-
-            function lookupIntrinsicTag(node: JsxOpeningLikeElement | JsxClosingElement): Symbol {
                 const intrinsicElementsType = getJsxType(JsxNames.IntrinsicElements);
                 if (intrinsicElementsType !== unknownType) {
                     // Property case
                     const intrinsicProp = getPropertyOfType(intrinsicElementsType, (<Identifier>node.tagName).text);
                     if (intrinsicProp) {
                         links.jsxFlags |= JsxFlags.IntrinsicNamedElement;
-                        return intrinsicProp;
+                        return links.resolvedSymbol = intrinsicProp;
                     }
 
                     // Intrinsic string indexer case
                     const indexSignatureType = getIndexTypeOfType(intrinsicElementsType, IndexKind.String);
                     if (indexSignatureType) {
                         links.jsxFlags |= JsxFlags.IntrinsicIndexedElement;
-                        return intrinsicElementsType.symbol;
+                        return links.resolvedSymbol = intrinsicElementsType.symbol;
                     }
 
                     // Wasn't found
                     error(node, Diagnostics.Property_0_does_not_exist_on_type_1, (<Identifier>node.tagName).text, "JSX." + JsxNames.IntrinsicElements);
-                    return unknownSymbol;
+                    return links.resolvedSymbol = unknownSymbol;
                 }
                 else {
                     if (compilerOptions.noImplicitAny) {
                         error(node, Diagnostics.JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists, JsxNames.IntrinsicElements);
                     }
-                    return unknownSymbol;
-                }
-            }
-
-            function lookupClassTag(node: JsxOpeningLikeElement | JsxClosingElement): Symbol {
-                const valueSymbol: Symbol = resolveJsxTagName(node);
-
-                // Look up the value in the current scope
-                if (valueSymbol && valueSymbol !== unknownSymbol) {
-                    links.jsxFlags |= JsxFlags.ValueElement;
-                    if (valueSymbol.flags & SymbolFlags.Alias) {
-                        markAliasSymbolAsReferenced(valueSymbol);
-                    }
-                }
-
-                return valueSymbol || unknownSymbol;
-            }
-
-            function resolveJsxTagName(node: JsxOpeningLikeElement | JsxClosingElement): Symbol {
-                if (node.tagName.kind === SyntaxKind.Identifier) {
-                    const tag = <Identifier>node.tagName;
-                    const sym = getResolvedSymbol(tag);
-                    return sym.exportSymbol || sym;
-                }
-                else {
-                    return checkQualifiedName(<QualifiedName>node.tagName).symbol;
+                    return links.resolvedSymbol = unknownSymbol;
                 }
             }
+            return links.resolvedSymbol;
         }
 
         /**
@@ -8510,17 +9299,8 @@ namespace ts {
          * For example, in the element <MyClass>, the element instance type is `MyClass` (not `typeof MyClass`).
          */
         function getJsxElementInstanceType(node: JsxOpeningLikeElement) {
-            // There is no such thing as an instance type for a non-class element. This
-            // line shouldn't be hit.
-            Debug.assert(!!(getNodeLinks(node).jsxFlags & JsxFlags.ValueElement), "Should not call getJsxElementInstanceType on non-class Element");
+            const valueType = checkExpression(node.tagName);
 
-            const classSymbol = getJsxElementTagSymbol(node);
-            if (classSymbol === unknownSymbol) {
-                // Couldn't find the class instance type. Error has already been issued
-                return anyType;
-            }
-
-            const valueType = getTypeOfSymbol(classSymbol);
             if (isTypeAny(valueType)) {
                 // Short-circuit if the class tag is using an element type 'any'
                 return anyType;
@@ -8543,10 +9323,10 @@ namespace ts {
         }
 
         /// e.g. "props" for React.d.ts,
-        /// or 'undefined' if ElementAttributesPropery doesn't exist (which means all
+        /// or 'undefined' if ElementAttributesProperty doesn't exist (which means all
         ///     non-intrinsic elements' attributes type is 'any'),
         /// or '' if it has 0 properties (which means every
-        ///     non-instrinsic elements' attributes type is the element instance type)
+        ///     non-intrinsic elements' attributes type is the element instance type)
         function getJsxElementPropertiesName() {
             // JSX
             const jsxNamespace = getGlobalSymbol(JsxNames.JSX, SymbolFlags.Namespace, /*diagnosticMessage*/undefined);
@@ -8554,7 +9334,7 @@ namespace ts {
             const attribsPropTypeSym = jsxNamespace && getSymbol(jsxNamespace.exports, JsxNames.ElementAttributesPropertyNameContainer, SymbolFlags.Type);
             // JSX.ElementAttributesProperty [type]
             const attribPropType = attribsPropTypeSym && getDeclaredTypeOfSymbol(attribsPropTypeSym);
-            // The properites of JSX.ElementAttributesProperty
+            // The properties of JSX.ElementAttributesProperty
             const attribProperties = attribPropType && getPropertiesOfType(attribPropType);
 
             if (attribProperties) {
@@ -8586,9 +9366,16 @@ namespace ts {
         function getJsxElementAttributesType(node: JsxOpeningLikeElement): Type {
             const links = getNodeLinks(node);
             if (!links.resolvedJsxType) {
-                const sym = getJsxElementTagSymbol(node);
-
-                if (links.jsxFlags & JsxFlags.ValueElement) {
+                if (isJsxIntrinsicIdentifier(node.tagName)) {
+                    const symbol = getIntrinsicTagSymbol(node);
+                    if (links.jsxFlags & JsxFlags.IntrinsicNamedElement) {
+                        return links.resolvedJsxType = getTypeOfSymbol(symbol);
+                    }
+                    else if (links.jsxFlags & JsxFlags.IntrinsicIndexedElement) {
+                        return links.resolvedJsxType = getIndexInfoOfSymbol(symbol, IndexKind.String).type;
+                    }
+                }
+                else {
                     // Get the element instance type (the result of newing or invoking this tag)
                     const elemInstanceType = getJsxElementInstanceType(node);
 
@@ -8597,18 +9384,20 @@ namespace ts {
                     if (!elemClassType || !isTypeAssignableTo(elemInstanceType, elemClassType)) {
                         // Is this is a stateless function component? See if its single signature's return type is
                         // assignable to the JSX Element Type
-                        const elemType = getTypeOfSymbol(sym);
-                        const callSignatures = elemType && getSignaturesOfType(elemType, SignatureKind.Call);
-                        const callSignature = callSignatures && callSignatures.length > 0 && callSignatures[0];
-                        const callReturnType = callSignature && getReturnTypeOfSignature(callSignature);
-                        let paramType = callReturnType && (callSignature.parameters.length === 0 ? emptyObjectType : getTypeOfSymbol(callSignature.parameters[0]));
-                        if (callReturnType && isTypeAssignableTo(callReturnType, jsxElementType)) {
-                            // Intersect in JSX.IntrinsicAttributes if it exists
-                            const intrinsicAttributes = getJsxType(JsxNames.IntrinsicAttributes);
-                            if (intrinsicAttributes !== unknownType) {
-                                paramType = intersectTypes(intrinsicAttributes, paramType);
+                        if (jsxElementType) {
+                            const elemType = checkExpression(node.tagName);
+                            const callSignatures = elemType && getSignaturesOfType(elemType, SignatureKind.Call);
+                            const callSignature = callSignatures && callSignatures.length > 0 && callSignatures[0];
+                            const callReturnType = callSignature && getReturnTypeOfSignature(callSignature);
+                            let paramType = callReturnType && (callSignature.parameters.length === 0 ? emptyObjectType : getTypeOfSymbol(callSignature.parameters[0]));
+                            if (callReturnType && isTypeAssignableTo(callReturnType, jsxElementType)) {
+                                // Intersect in JSX.IntrinsicAttributes if it exists
+                                const intrinsicAttributes = getJsxType(JsxNames.IntrinsicAttributes);
+                                if (intrinsicAttributes !== unknownType) {
+                                    paramType = intersectTypes(intrinsicAttributes, paramType);
+                                }
+                                return links.resolvedJsxType = paramType;
                             }
-                            return links.resolvedJsxType = paramType;
                         }
                     }
 
@@ -8671,16 +9460,8 @@ namespace ts {
                         }
                     }
                 }
-                else if (links.jsxFlags & JsxFlags.IntrinsicNamedElement) {
-                    return links.resolvedJsxType = getTypeOfSymbol(sym);
-                }
-                else if (links.jsxFlags & JsxFlags.IntrinsicIndexedElement) {
-                    return links.resolvedJsxType = getIndexInfoOfSymbol(sym, IndexKind.String).type;
-                }
-                else {
-                    // Resolution failed, so we don't know
-                    return links.resolvedJsxType = anyType;
-                }
+
+                return links.resolvedJsxType = unknownType;
             }
 
             return links.resolvedJsxType;
@@ -8785,8 +9566,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;
         }
 
         /**
@@ -8797,15 +9582,13 @@ namespace ts {
          * @param type The type of left.
          * @param prop The symbol for the right hand side of the property access.
          */
-        function checkClassPropertyAccess(node: PropertyAccessExpression | QualifiedName, left: Expression | QualifiedName, type: Type, prop: Symbol): boolean {
-            const flags = getDeclarationFlagsFromSymbol(prop);
+        function checkClassPropertyAccess(node: PropertyAccessExpression | QualifiedName | VariableLikeDeclaration, left: Expression | QualifiedName, type: Type, prop: Symbol): boolean {
+            const flags = getDeclarationModifierFlagsFromSymbol(prop);
             const declaringClass = <InterfaceType>getDeclaredTypeOfSymbol(getParentOfSymbol(prop));
-
+            const errorNode = node.kind === SyntaxKind.PropertyAccessExpression || node.kind === SyntaxKind.VariableDeclaration ?
+                (<PropertyAccessExpression | VariableDeclaration>node).name :
+                (<QualifiedName>node).right;
             if (left.kind === SyntaxKind.SuperKeyword) {
-                const errorNode = node.kind === SyntaxKind.PropertyAccessExpression ?
-                    (<PropertyAccessExpression>node).name :
-                    (<QualifiedName>node).right;
-
                 // TS 1.0 spec (April 2014): 4.8.2
                 // - In a constructor, instance member function, instance member accessor, or
                 //   instance member variable initializer where this references a derived class instance,
@@ -8821,7 +9604,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
@@ -8833,20 +9616,17 @@ 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
-            // Get the declaring and enclosing class instance types
-            const enclosingClassDeclaration = getContainingClass(node);
 
-            const enclosingClass = enclosingClassDeclaration ? <InterfaceType>getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingClassDeclaration)) : undefined;
-
-            // Private property is accessible if declaring and enclosing class are the same
-            if (flags & NodeFlags.Private) {
-                if (declaringClass !== enclosingClass) {
-                    error(node, Diagnostics.Property_0_is_private_and_only_accessible_within_class_1, symbolToString(prop), typeToString(declaringClass));
+            // Private property is accessible if the property is within the declaring class
+            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));
                     return false;
                 }
                 return true;
@@ -8858,13 +9638,20 @@ namespace ts {
             if (left.kind === SyntaxKind.SuperKeyword) {
                 return true;
             }
-            // A protected property is accessible in the declaring class and classes derived from it
-            if (!enclosingClass || !hasBaseType(enclosingClass, declaringClass)) {
-                error(node, Diagnostics.Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses, symbolToString(prop), typeToString(declaringClass));
+
+            // Get the enclosing class that has the declaring class as its base type
+            const enclosingClass = forEachEnclosingClass(node, enclosingDeclaration => {
+                const enclosingClass = <InterfaceType>getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingDeclaration));
+                return hasBaseType(enclosingClass, declaringClass) ? enclosingClass : undefined;
+            });
+
+            // A protected property is accessible if the property is within the declaring class or classes derived from it
+            if (!enclosingClass) {
+                error(errorNode, Diagnostics.Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses, symbolToString(prop), typeToString(declaringClass));
                 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
@@ -8875,12 +9662,21 @@ namespace ts {
 
             // TODO: why is the first part of this check here?
             if (!(getTargetType(type).flags & (TypeFlags.Class | TypeFlags.Interface) && hasBaseType(<InterfaceType>type, enclosingClass))) {
-                error(node, Diagnostics.Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1, symbolToString(prop), typeToString(enclosingClass));
+                error(errorNode, Diagnostics.Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1, symbolToString(prop), typeToString(enclosingClass));
                 return false;
             }
             return true;
         }
 
+        function checkNonNullExpression(node: Expression | QualifiedName) {
+            const type = checkExpression(node);
+            if (strictNullChecks && getNullableKind(type)) {
+                error(node, Diagnostics.Object_is_possibly_null_or_undefined);
+                return getNonNullableType(type);
+            }
+            return type;
+        }
+
         function checkPropertyAccessExpression(node: PropertyAccessExpression) {
             return checkPropertyAccessExpressionOrQualifiedName(node, node.expression, node.name);
         }
@@ -8890,7 +9686,7 @@ namespace ts {
         }
 
         function checkPropertyAccessExpressionOrQualifiedName(node: PropertyAccessExpression | QualifiedName, left: Expression | QualifiedName, right: Identifier) {
-            const type = checkExpression(left);
+            const type = checkNonNullExpression(left);
             if (isTypeAny(type)) {
                 return type;
             }
@@ -8913,7 +9709,10 @@ namespace ts {
             if (prop.parent && prop.parent.flags & SymbolFlags.Class) {
                 checkClassPropertyAccess(node, left, apparentType, prop);
             }
-            return getTypeOfSymbol(prop);
+
+            const propType = getTypeOfSymbol(prop);
+            return node.kind === SyntaxKind.PropertyAccessExpression && prop.flags & SymbolFlags.Property ?
+                getNarrowedTypeOfReference(propType, <PropertyAccessExpression>node) : propType;
         }
 
         function isValidPropertyAccess(node: PropertyAccessExpression | QualifiedName, propertyName: string): boolean {
@@ -8998,7 +9797,7 @@ namespace ts {
             }
 
             // Obtain base constraint such that we can bail out if the constraint is an unknown type
-            const objectType = getApparentType(checkExpression(node.expression));
+            const objectType = getApparentType(checkNonNullExpression(node.expression));
             const indexType = node.argumentExpression ? checkExpression(node.argumentExpression) : unknownType;
 
             if (objectType === unknownType) {
@@ -9355,6 +10154,12 @@ namespace ts {
                 context.failedTypeParameterIndex = undefined;
             }
 
+            if (signature.thisType) {
+                const thisArgumentNode = getThisArgumentOfCall(node);
+                const thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
+                inferTypes(context, thisArgumentType, signature.thisType);
+            }
+
             // We perform two passes over the arguments. In the first pass we infer from all arguments, but use
             // wildcards for all context sensitive function expressions.
             const argCount = getEffectiveArgumentCount(node, args, signature);
@@ -9385,7 +10190,7 @@ namespace ts {
             // Tagged template expressions will always have `undefined` for `excludeArgument[0]`.
             if (excludeArgument) {
                 for (let i = 0; i < argCount; i++) {
-                    // No need to check for omitted args and template expressions, their exlusion value is always undefined
+                    // No need to check for omitted args and template expressions, their exclusion value is always undefined
                     if (excludeArgument[i] === false) {
                         const arg = args[i];
                         const paramType = getTypeAtPosition(signature, i);
@@ -9428,6 +10233,20 @@ namespace ts {
         }
 
         function checkApplicableSignature(node: CallLikeExpression, args: Expression[], signature: Signature, relation: Map<RelationComparisonResult>, excludeArgument: boolean[], reportErrors: boolean) {
+
+            if (signature.thisType && signature.thisType !== voidType && node.kind !== SyntaxKind.NewExpression) {
+                // If the called expression is not of the form `x.f` or `x["f"]`, then sourceType = voidType
+                // If the signature's 'this' type is voidType, then the check is skipped -- anything is compatible.
+                // If the expression is a new expression, then the check is skipped.
+                const thisArgumentNode = getThisArgumentOfCall(node);
+                const thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
+                const errorNode = reportErrors ? (thisArgumentNode || node) : undefined;
+                const headMessage = Diagnostics.The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1;
+                if (!checkTypeRelatedTo(thisArgumentType, signature.thisType, relation, errorNode, headMessage)) {
+                    return false;
+                }
+            }
+            const headMessage = Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1;
             const argCount = getEffectiveArgumentCount(node, args, signature);
             for (let i = 0; i < argCount; i++) {
                 const arg = getEffectiveArgument(node, args, i);
@@ -9447,7 +10266,6 @@ namespace ts {
 
                     // Use argument expression as error location when reporting errors
                     const errorNode = reportErrors ? getEffectiveArgumentErrorNode(node, i, arg) : undefined;
-                    const headMessage = Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1;
                     if (!checkTypeRelatedTo(argType, paramType, relation, errorNode, headMessage)) {
                         return false;
                     }
@@ -9457,6 +10275,21 @@ namespace ts {
             return true;
         }
 
+        /**
+         * Returns the this argument in calls like x.f(...) and x[f](...). Undefined otherwise.
+         */
+        function getThisArgumentOfCall(node: CallLikeExpression): LeftHandSideExpression {
+            if (node.kind === SyntaxKind.CallExpression) {
+                const callee = (<CallExpression>node).expression;
+                if (callee.kind === SyntaxKind.PropertyAccessExpression) {
+                    return (callee as PropertyAccessExpression).expression;
+                }
+                else if (callee.kind === SyntaxKind.ElementAccessExpression) {
+                    return (callee as ElementAccessExpression).expression;
+                }
+            }
+        }
+
         /**
          * Returns the effective arguments for an expression that works like a function invocation.
          *
@@ -9640,7 +10473,7 @@ namespace ts {
 
                     case SyntaxKind.ComputedPropertyName:
                         const nameType = checkComputedPropertyName(<ComputedPropertyName>element.name);
-                        if (allConstituentTypesHaveKind(nameType, TypeFlags.ESSymbol)) {
+                        if (isTypeOfKind(nameType, TypeFlags.ESSymbol)) {
                             return nameType;
                         }
                         else {
@@ -9666,7 +10499,7 @@ namespace ts {
           */
         function getEffectiveDecoratorThirdArgumentType(node: Node) {
             // The third argument to a decorator is either its `descriptor` for a method decorator
-            // or its `parameterIndex` for a paramter decorator
+            // or its `parameterIndex` for a parameter decorator
             if (node.kind === SyntaxKind.ClassDeclaration) {
                 Debug.fail("Class decorators should not have a third synthetic argument.");
                 return unknownType;
@@ -9724,7 +10557,7 @@ namespace ts {
                 return getEffectiveDecoratorArgumentType(<Decorator>node, argIndex);
             }
             else if (argIndex === 0 && node.kind === SyntaxKind.TaggedTemplateExpression) {
-                return globalTemplateStringsArrayType;
+                return getGlobalTemplateStringsArrayType();
             }
 
             // This is not a synthetic argument, so we return 'undefined'
@@ -10005,13 +10838,15 @@ namespace ts {
                     // In super call, the candidate signatures are the matching arity signatures of the base constructor function instantiated
                     // with the type arguments specified in the extends clause.
                     const baseTypeNode = getClassExtendsHeritageClauseElement(getContainingClass(node));
-                    const baseConstructors = getInstantiatedConstructorsForTypeArguments(superType, baseTypeNode.typeArguments);
-                    return resolveCall(node, baseConstructors, candidatesOutArray);
+                    if (baseTypeNode) {
+                        const baseConstructors = getInstantiatedConstructorsForTypeArguments(superType, baseTypeNode.typeArguments);
+                        return resolveCall(node, baseConstructors, candidatesOutArray);
+                    }
                 }
                 return resolveUntypedCall(node);
             }
 
-            const funcType = checkExpression(node.expression);
+            const funcType = checkNonNullExpression(node.expression);
             const apparentType = getApparentType(funcType);
 
             if (apparentType === unknownType) {
@@ -10034,7 +10869,7 @@ namespace ts {
             // We exclude union types because we may have a union of function types that happen to have
             // no common signatures.
             if (isTypeAny(funcType) || (!callSignatures.length && !constructSignatures.length && !(funcType.flags & TypeFlags.Union) && isTypeAssignableTo(funcType, globalFunctionType))) {
-                // The unknownType indicates that an error already occured (and was reported).  No
+                // The unknownType indicates that an error already occurred (and was reported).  No
                 // need to report another error in this case.
                 if (funcType !== unknownType && node.typeArguments) {
                     error(node, Diagnostics.Untyped_function_calls_may_not_accept_type_arguments);
@@ -10064,7 +10899,7 @@ namespace ts {
                 }
             }
 
-            let expressionType = checkExpression(node.expression);
+            let expressionType = checkNonNullExpression(node.expression);
 
             // If expressionType's apparent type(section 3.8.1) is an object type with one or
             // more construct signatures, the expression is processed in the same manner as a
@@ -10082,7 +10917,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);
             }
@@ -10103,19 +10938,25 @@ namespace ts {
             // that the user will not add any.
             const constructSignatures = getSignaturesOfType(expressionType, SignatureKind.Construct);
             if (constructSignatures.length) {
+                if (!isConstructorAccessible(node, constructSignatures[0])) {
+                    return resolveErrorCall(node);
+                }
                 return resolveCall(node, constructSignatures, candidatesOutArray);
             }
 
             // If expressionType's apparent type is an object type with no construct signatures but
             // one or more call signatures, the expression is processed as a function call. A compile-time
             // error occurs if the result of the function call is not Void. The type of the result of the
-            // operation is Any.
+            // operation is Any. It is an error to have a Void this type.
             const callSignatures = getSignaturesOfType(expressionType, SignatureKind.Call);
             if (callSignatures.length) {
                 const signature = resolveCall(node, callSignatures, candidatesOutArray);
                 if (getReturnTypeOfSignature(signature) !== voidType) {
                     error(node, Diagnostics.Only_a_void_function_can_be_called_with_the_new_keyword);
                 }
+                if (signature.thisType === voidType) {
+                    error(node, Diagnostics.A_function_that_is_called_with_the_new_keyword_cannot_have_a_this_type_that_is_void);
+                }
                 return signature;
             }
 
@@ -10123,6 +10964,36 @@ namespace ts {
             return resolveErrorCall(node);
         }
 
+        function isConstructorAccessible(node: NewExpression, signature: Signature) {
+            if (!signature || !signature.declaration) {
+                return true;
+            }
+
+            const declaration = signature.declaration;
+            const modifiers = getModifierFlags(declaration);
+
+            // Public constructor is accessible.
+            if (!(modifiers & ModifierFlags.NonPublicAccessibilityModifier)) {
+                return true;
+            }
+
+            const declaringClassDeclaration = <ClassLikeDeclaration>getClassLikeDeclarationOfSymbol(declaration.parent.symbol);
+            const declaringClass = <InterfaceType>getDeclaredTypeOfSymbol(declaration.parent.symbol);
+
+            // A private or protected constructor can only be instantiated within it's own class
+            if (!isNodeWithinClass(node, declaringClassDeclaration)) {
+                if (modifiers & ModifierFlags.Private) {
+                    error(node, Diagnostics.Constructor_of_class_0_is_private_and_only_accessible_within_the_class_declaration, typeToString(declaringClass));
+                }
+                if (modifiers & ModifierFlags.Protected) {
+                    error(node, Diagnostics.Constructor_of_class_0_is_protected_and_only_accessible_within_the_class_declaration, typeToString(declaringClass));
+                }
+                return false;
+            }
+
+            return true;
+        }
+
         function resolveTaggedTemplateExpression(node: TaggedTemplateExpression, candidatesOutArray: Signature[]): Signature {
             const tagType = checkExpression(node.tag);
             const apparentType = getApparentType(tagType);
@@ -10243,14 +11114,11 @@ namespace ts {
             checkGrammarTypeArguments(node, node.typeArguments) || checkGrammarArguments(node, node.arguments);
 
             const signature = getResolvedSignature(node);
-            if (node.expression.kind === SyntaxKind.SuperKeyword) {
-                const containgFunction = getContainingFunction(node.expression);
 
-                if (containgFunction && containgFunction.kind === SyntaxKind.Constructor) {
-                    getNodeLinks(containgFunction).flags |= NodeCheckFlags.HasSeenSuperCall;
-                }
+            if (node.expression.kind === SyntaxKind.SuperKeyword) {
                 return voidType;
             }
+
             if (node.kind === SyntaxKind.NewExpression) {
                 const declaration = signature.declaration;
 
@@ -10291,22 +11159,32 @@ namespace ts {
             const targetType = getTypeFromTypeNode(node.type);
             if (produceDiagnostics && targetType !== unknownType) {
                 const widenedType = getWidenedType(exprType);
-
-                // Permit 'number[] | "foo"' to be asserted to 'string'.
-                const bothAreStringLike =
-                    someConstituentTypeHasKind(targetType, TypeFlags.StringLike) &&
-                        someConstituentTypeHasKind(widenedType, TypeFlags.StringLike);
-                if (!bothAreStringLike && !(isTypeAssignableTo(targetType, widenedType))) {
-                    checkTypeAssignableTo(exprType, targetType, node, Diagnostics.Neither_type_0_nor_type_1_is_assignable_to_the_other);
+                if (!isTypeComparableTo(targetType, widenedType)) {
+                    checkTypeComparableTo(exprType, targetType, node, Diagnostics.Type_0_cannot_be_converted_to_type_1);
                 }
             }
             return targetType;
         }
 
+        function checkNonNullAssertion(node: NonNullExpression) {
+            return getNonNullableType(checkExpression(node.expression));
+        }
+
+        function getTypeOfParameter(symbol: Symbol) {
+            const type = getTypeOfSymbol(symbol);
+            if (strictNullChecks) {
+                const declaration = symbol.valueDeclaration;
+                if (declaration && (<VariableLikeDeclaration>declaration).initializer) {
+                    return addNullableKind(type, TypeFlags.Undefined);
+                }
+            }
+            return type;
+        }
+
         function getTypeAtPosition(signature: Signature, pos: number): Type {
             return signature.hasRestParameter ?
-                pos < signature.parameters.length - 1 ? getTypeOfSymbol(signature.parameters[pos]) : getRestTypeOfSignature(signature) :
-                pos < signature.parameters.length ? getTypeOfSymbol(signature.parameters[pos]) : anyType;
+                pos < signature.parameters.length - 1 ? getTypeOfParameter(signature.parameters[pos]) : getRestTypeOfSignature(signature) :
+                pos < signature.parameters.length ? getTypeOfParameter(signature.parameters[pos]) : anyType;
         }
 
         function assignContextualParameterTypes(signature: Signature, context: Signature, mapper: TypeMapper) {
@@ -10432,7 +11310,8 @@ namespace ts {
                     }
                 }
                 else {
-                    types = checkAndAggregateReturnExpressionTypes(<Block>func.body, contextualMapper, isAsync);
+                    const hasImplicitReturn = !!(func.flags & NodeFlags.HasImplicitReturn);
+                    types = checkAndAggregateReturnExpressionTypes(<Block>func.body, contextualMapper, isAsync, hasImplicitReturn);
                     if (types.length === 0) {
                         if (isAsync) {
                             // For an async function, the return type will not be void, but rather a Promise for void.
@@ -10512,9 +11391,9 @@ namespace ts {
             return aggregatedTypes;
         }
 
-        function checkAndAggregateReturnExpressionTypes(body: Block, contextualMapper?: TypeMapper, isAsync?: boolean): Type[] {
+        function checkAndAggregateReturnExpressionTypes(body: Block, contextualMapper: TypeMapper, isAsync: boolean, hasImplicitReturn: boolean): Type[] {
             const aggregatedTypes: Type[] = [];
-
+            let hasOmittedExpressions = false;
             forEachReturnStatement(body, returnStatement => {
                 const expr = returnStatement.expression;
                 if (expr) {
@@ -10526,22 +11405,29 @@ namespace ts {
                         // the native Promise<T> type by the caller.
                         type = checkAwaitedType(type, body.parent, Diagnostics.Return_expression_in_async_function_does_not_have_a_valid_callable_then_member);
                     }
-
                     if (!contains(aggregatedTypes, type)) {
                         aggregatedTypes.push(type);
                     }
                 }
+                else {
+                    hasOmittedExpressions = true;
+                }
             });
-
+            if (strictNullChecks && aggregatedTypes.length && (hasOmittedExpressions || hasImplicitReturn)) {
+                if (!contains(aggregatedTypes, undefinedType)) {
+                    aggregatedTypes.push(undefinedType);
+                }
+            }
             return aggregatedTypes;
         }
 
-        /*
-         *TypeScript Specification 1.0 (6.3) - July 2014
-         * An explicitly typed function whose return type isn't the Void type,
-         * the Any type, or a union type containing the Void or Any type as a constituent
-         * must have at least one return statement somewhere in its body.
-         * An exception to this rule is if the function implementation consists of a single 'throw' statement.
+        /**
+         * TypeScript Specification 1.0 (6.3) - July 2014
+         *   An explicitly typed function whose return type isn't the Void type,
+         *   the Any type, or a union type containing the Void or Any type as a constituent
+         *   must have at least one return statement somewhere in its body.
+         *   An exception to this rule is if the function implementation consists of a single 'throw' statement.
+         *
          * @param returnType - return type of the function, can be undefined if return type is not explicitly specified
          */
         function checkAllCodePathsInNonVoidFunctionReturnOrThrow(func: FunctionLikeDeclaration, returnType: Type): void {
@@ -10550,7 +11436,7 @@ namespace ts {
             }
 
             // Functions with with an explicitly specified 'void' or 'any' return type don't need any return expressions.
-            if (returnType === voidType || isTypeAny(returnType) || (returnType && (returnType.flags & TypeFlags.Union) && someConstituentTypeHasKind(returnType, TypeFlags.Any | TypeFlags.Void))) {
+            if (returnType && maybeTypeOfKind(returnType, TypeFlags.Any | TypeFlags.Void)) {
                 return;
             }
 
@@ -10568,16 +11454,19 @@ namespace ts {
                 // NOTE: having returnType !== undefined is a precondition for entering this branch so func.type will always be present
                 error(func.type, Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value);
             }
+            else if (returnType && strictNullChecks && !isTypeAssignableTo(undefinedType, returnType)) {
+                error(func.type, Diagnostics.Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined);
+            }
             else if (compilerOptions.noImplicitReturns) {
                 if (!returnType) {
                     // If return type annotation is omitted check if function has any explicit return statements.
                     // If it does not have any - its inferred return type is void - don't do any checks.
                     // Otherwise get inferred return type from function body and report error only if it is not void / anytype
-                    const inferredReturnType = hasExplicitReturn
-                        ? getReturnTypeOfSignature(getSignatureFromDeclaration(func))
-                        : voidType;
-
-                    if (inferredReturnType === voidType || isTypeAny(inferredReturnType)) {
+                    if (!hasExplicitReturn) {
+                        return;
+                    }
+                    const inferredReturnType = getReturnTypeOfSignature(getSignatureFromDeclaration(func));
+                    if (isUnwrappedReturnTypeVoidOrAny(func, inferredReturnType)) {
                         return;
                     }
                 }
@@ -10596,6 +11485,7 @@ namespace ts {
 
             // The identityMapper object is used to indicate that function expressions are wildcards
             if (contextualMapper === identityMapper && isContextSensitive(node)) {
+                checkNodeDeferred(node);
                 return anyFunctionType;
             }
 
@@ -10700,8 +11590,8 @@ namespace ts {
             // Variables declared with 'const'
             // Get accessors without matching set accessors
             // Enum members
-            return symbol.flags & SymbolFlags.Property && (getDeclarationFlagsFromSymbol(symbol) & NodeFlags.Readonly) !== 0 ||
-                symbol.flags & SymbolFlags.Variable && (getDeclarationFlagsFromSymbol(symbol) & NodeFlags.Const) !== 0 ||
+            return 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;
         }
@@ -10806,7 +11696,7 @@ namespace ts {
                 case SyntaxKind.PlusToken:
                 case SyntaxKind.MinusToken:
                 case SyntaxKind.TildeToken:
-                    if (someConstituentTypeHasKind(operandType, TypeFlags.ESSymbol)) {
+                    if (maybeTypeOfKind(operandType, TypeFlags.ESSymbol)) {
                         error(node.operand, Diagnostics.The_0_operator_cannot_be_applied_to_type_symbol, tokenToString(node.operator));
                     }
                     return numberType;
@@ -10814,7 +11704,8 @@ namespace ts {
                     return booleanType;
                 case SyntaxKind.PlusPlusToken:
                 case SyntaxKind.MinusMinusToken:
-                    const ok = checkArithmeticOperandType(node.operand, operandType, Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
+                    const ok = checkArithmeticOperandType(node.operand, getNonNullableType(operandType),
+                        Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
                     if (ok) {
                         // run check only if former checks succeeded to avoid reporting cascading errors
                         checkReferenceExpression(node.operand,
@@ -10828,7 +11719,8 @@ namespace ts {
 
         function checkPostfixUnaryExpression(node: PostfixUnaryExpression): Type {
             const operandType = checkExpression(node.operand);
-            const ok = checkArithmeticOperandType(node.operand, operandType, Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
+            const ok = checkArithmeticOperandType(node.operand, getNonNullableType(operandType),
+                Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
             if (ok) {
                 // run check only if former checks succeeded to avoid reporting cascading errors
                 checkReferenceExpression(node.operand,
@@ -10838,38 +11730,47 @@ namespace ts {
             return numberType;
         }
 
-        // Just like isTypeOfKind below, except that it returns true if *any* constituent
-        // has this kind.
-        function someConstituentTypeHasKind(type: Type, kind: TypeFlags): boolean {
+        // Return true if type might be of the given kind. A union or intersection type might be of a given
+        // kind if at least one constituent type is of the given kind.
+        function maybeTypeOfKind(type: Type, kind: TypeFlags): boolean {
             if (type.flags & kind) {
                 return true;
             }
             if (type.flags & TypeFlags.UnionOrIntersection) {
                 const types = (<UnionOrIntersectionType>type).types;
-                for (const current of types) {
-                    if (current.flags & kind) {
+                for (const t of types) {
+                    if (maybeTypeOfKind(t, kind)) {
                         return true;
                     }
                 }
-                return false;
             }
             return false;
         }
 
-        // Return true if type has the given flags, or is a union or intersection type composed of types that all have those flags.
-        function allConstituentTypesHaveKind(type: Type, kind: TypeFlags): boolean {
+        // Return true if type is of the given kind. A union type is of a given kind if all constituent types
+        // are of the given kind. An intersection type is of a given kind if at least one constituent type is
+        // of the given kind.
+        function isTypeOfKind(type: Type, kind: TypeFlags): boolean {
             if (type.flags & kind) {
                 return true;
             }
-            if (type.flags & TypeFlags.UnionOrIntersection) {
+            if (type.flags & TypeFlags.Union) {
                 const types = (<UnionOrIntersectionType>type).types;
-                for (const current of types) {
-                    if (!(current.flags & kind)) {
+                for (const t of types) {
+                    if (!isTypeOfKind(t, kind)) {
                         return false;
                     }
                 }
                 return true;
             }
+            if (type.flags & TypeFlags.Intersection) {
+                const types = (<UnionOrIntersectionType>type).types;
+                for (const t of types) {
+                    if (isTypeOfKind(t, kind)) {
+                        return true;
+                    }
+                }
+            }
             return false;
         }
 
@@ -10887,7 +11788,7 @@ namespace ts {
             // and the right operand to be of type Any or a subtype of the 'Function' interface type.
             // The result is always of the Boolean primitive type.
             // NOTE: do not raise error if leftType is unknown as related error was already reported
-            if (allConstituentTypesHaveKind(leftType, TypeFlags.Primitive)) {
+            if (isTypeOfKind(leftType, TypeFlags.Primitive)) {
                 error(left, Diagnostics.The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter);
             }
             // NOTE: do not raise error if right is unknown as related error was already reported
@@ -10914,39 +11815,43 @@ namespace ts {
         function checkObjectLiteralAssignment(node: ObjectLiteralExpression, sourceType: Type, contextualMapper?: TypeMapper): Type {
             const properties = node.properties;
             for (const p of properties) {
-                if (p.kind === SyntaxKind.PropertyAssignment || p.kind === SyntaxKind.ShorthandPropertyAssignment) {
-                    const name = <PropertyName>(<PropertyAssignment>p).name;
-                    if (name.kind === SyntaxKind.ComputedPropertyName) {
-                        checkComputedPropertyName(<ComputedPropertyName>name);
-                    }
-                    if (isComputedNonLiteralName(name)) {
-                        continue;
-                    }
+                checkObjectLiteralDestructuringPropertyAssignment(sourceType, p, contextualMapper);
+            }
+            return sourceType;
+        }
 
-                    const text = getTextOfPropertyName(name);
-                    const type = isTypeAny(sourceType)
-                        ? sourceType
-                        : getTypeOfPropertyOfType(sourceType, text) ||
-                        isNumericLiteralName(text) && getIndexTypeOfType(sourceType, IndexKind.Number) ||
-                        getIndexTypeOfType(sourceType, IndexKind.String);
-                    if (type) {
-                        if (p.kind === SyntaxKind.ShorthandPropertyAssignment) {
-                            checkDestructuringAssignment(<ShorthandPropertyAssignment>p, type);
-                        }
-                        else {
-                            // non-shorthand property assignments should always have initializers
-                            checkDestructuringAssignment((<PropertyAssignment>p).initializer, type);
-                        }
+        function checkObjectLiteralDestructuringPropertyAssignment(objectLiteralType: Type, property: ObjectLiteralElement, contextualMapper?: TypeMapper) {
+            if (property.kind === SyntaxKind.PropertyAssignment || property.kind === SyntaxKind.ShorthandPropertyAssignment) {
+                const name = <PropertyName>(<PropertyAssignment>property).name;
+                if (name.kind === SyntaxKind.ComputedPropertyName) {
+                    checkComputedPropertyName(<ComputedPropertyName>name);
+                }
+                if (isComputedNonLiteralName(name)) {
+                    return undefined;
+                }
+
+                const text = getTextOfPropertyName(name);
+                const type = isTypeAny(objectLiteralType)
+                    ? objectLiteralType
+                    : getTypeOfPropertyOfType(objectLiteralType, text) ||
+                    isNumericLiteralName(text) && getIndexTypeOfType(objectLiteralType, IndexKind.Number) ||
+                    getIndexTypeOfType(objectLiteralType, IndexKind.String);
+                if (type) {
+                    if (property.kind === SyntaxKind.ShorthandPropertyAssignment) {
+                        return checkDestructuringAssignment(<ShorthandPropertyAssignment>property, type);
                     }
                     else {
-                        error(name, Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(sourceType), declarationNameToString(name));
+                        // non-shorthand property assignments should always have initializers
+                        return checkDestructuringAssignment((<PropertyAssignment>property).initializer, type);
                     }
                 }
                 else {
-                    error(p, Diagnostics.Property_assignment_expected);
+                    error(name, Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(objectLiteralType), declarationNameToString(name));
                 }
             }
-            return sourceType;
+            else {
+                error(property, Diagnostics.Property_assignment_expected);
+            }
         }
 
         function checkArrayLiteralAssignment(node: ArrayLiteralExpression, sourceType: Type, contextualMapper?: TypeMapper): Type {
@@ -10956,44 +11861,51 @@ namespace ts {
             const elementType = checkIteratedTypeOrElementType(sourceType, node, /*allowStringInput*/ false) || unknownType;
             const elements = node.elements;
             for (let i = 0; i < elements.length; i++) {
-                const e = elements[i];
-                if (e.kind !== SyntaxKind.OmittedExpression) {
-                    if (e.kind !== SyntaxKind.SpreadElementExpression) {
-                        const propName = "" + i;
-                        const type = isTypeAny(sourceType)
-                            ? sourceType
-                            : isTupleLikeType(sourceType)
-                                ? getTypeOfPropertyOfType(sourceType, propName)
-                                : elementType;
-                        if (type) {
-                            checkDestructuringAssignment(e, type, contextualMapper);
-                        }
-                        else {
-                            if (isTupleType(sourceType)) {
-                                error(e, Diagnostics.Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2, typeToString(sourceType), (<TupleType>sourceType).elementTypes.length, elements.length);
-                            }
-                            else {
-                                error(e, Diagnostics.Type_0_has_no_property_1, typeToString(sourceType), propName);
-                            }
-                        }
+                checkArrayLiteralDestructuringElementAssignment(node, sourceType, i, elementType, contextualMapper);
+            }
+            return sourceType;
+        }
+
+        function checkArrayLiteralDestructuringElementAssignment(node: ArrayLiteralExpression, sourceType: Type,
+            elementIndex: number, elementType: Type, contextualMapper?: TypeMapper) {
+            const elements = node.elements;
+            const element = elements[elementIndex];
+            if (element.kind !== SyntaxKind.OmittedExpression) {
+                if (element.kind !== SyntaxKind.SpreadElementExpression) {
+                    const propName = "" + elementIndex;
+                    const type = isTypeAny(sourceType)
+                        ? sourceType
+                        : isTupleLikeType(sourceType)
+                            ? getTypeOfPropertyOfType(sourceType, propName)
+                            : elementType;
+                    if (type) {
+                        return checkDestructuringAssignment(element, type, contextualMapper);
                     }
                     else {
-                        if (i < elements.length - 1) {
-                            error(e, Diagnostics.A_rest_element_must_be_last_in_an_array_destructuring_pattern);
+                        if (isTupleType(sourceType)) {
+                            error(element, Diagnostics.Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2, typeToString(sourceType), (<TupleType>sourceType).elementTypes.length, elements.length);
                         }
                         else {
-                            const restExpression = (<SpreadElementExpression>e).expression;
-                            if (restExpression.kind === SyntaxKind.BinaryExpression && (<BinaryExpression>restExpression).operatorToken.kind === SyntaxKind.EqualsToken) {
-                                error((<BinaryExpression>restExpression).operatorToken, Diagnostics.A_rest_element_cannot_have_an_initializer);
-                            }
-                            else {
-                                checkDestructuringAssignment(restExpression, createArrayType(elementType), contextualMapper);
-                            }
+                            error(element, Diagnostics.Type_0_has_no_property_1, typeToString(sourceType), propName);
+                        }
+                    }
+                }
+                else {
+                    if (elementIndex < elements.length - 1) {
+                        error(element, Diagnostics.A_rest_element_must_be_last_in_an_array_destructuring_pattern);
+                    }
+                    else {
+                        const restExpression = (<SpreadElementExpression>element).expression;
+                        if (restExpression.kind === SyntaxKind.BinaryExpression && (<BinaryExpression>restExpression).operatorToken.kind === SyntaxKind.EqualsToken) {
+                            error((<BinaryExpression>restExpression).operatorToken, Diagnostics.A_rest_element_cannot_have_an_initializer);
+                        }
+                        else {
+                            return checkDestructuringAssignment(restExpression, createArrayType(elementType), contextualMapper);
                         }
                     }
                 }
             }
-            return sourceType;
+            return undefined;
         }
 
         function checkDestructuringAssignment(exprOrAssignment: Expression | ShorthandPropertyAssignment, sourceType: Type, contextualMapper?: TypeMapper): Type {
@@ -11070,8 +11982,11 @@ namespace ts {
                     // as having the primitive type Number. If one operand is the null or undefined value,
                     // it is treated as having the type of the other operand.
                     // The result is always of the Number primitive type.
-                    if (leftType.flags & (TypeFlags.Undefined | TypeFlags.Null)) leftType = rightType;
-                    if (rightType.flags & (TypeFlags.Undefined | TypeFlags.Null)) rightType = leftType;
+                    if (leftType.flags & TypeFlags.Nullable) leftType = rightType;
+                    if (rightType.flags & TypeFlags.Nullable) rightType = leftType;
+
+                    leftType = getNonNullableType(leftType);
+                    rightType = getNonNullableType(rightType);
 
                     let suggestedOperator: SyntaxKind;
                     // if a user tries to apply a bitwise operator to 2 boolean operands
@@ -11098,17 +12013,20 @@ namespace ts {
                     // or at least one of the operands to be of type Any or the String primitive type.
 
                     // If one operand is the null or undefined value, it is treated as having the type of the other operand.
-                    if (leftType.flags & (TypeFlags.Undefined | TypeFlags.Null)) leftType = rightType;
-                    if (rightType.flags & (TypeFlags.Undefined | TypeFlags.Null)) rightType = leftType;
+                    if (leftType.flags & TypeFlags.Nullable) leftType = rightType;
+                    if (rightType.flags & TypeFlags.Nullable) rightType = leftType;
+
+                    leftType = getNonNullableType(leftType);
+                    rightType = getNonNullableType(rightType);
 
                     let resultType: Type;
-                    if (allConstituentTypesHaveKind(leftType, TypeFlags.NumberLike) && allConstituentTypesHaveKind(rightType, TypeFlags.NumberLike)) {
+                    if (isTypeOfKind(leftType, TypeFlags.NumberLike) && isTypeOfKind(rightType, TypeFlags.NumberLike)) {
                         // Operands of an enum type are treated as having the primitive type Number.
                         // If both operands are of the Number primitive type, the result is of the Number primitive type.
                         resultType = numberType;
                     }
                     else {
-                        if (allConstituentTypesHaveKind(leftType, TypeFlags.StringLike) || allConstituentTypesHaveKind(rightType, TypeFlags.StringLike)) {
+                        if (isTypeOfKind(leftType, TypeFlags.StringLike) || isTypeOfKind(rightType, TypeFlags.StringLike)) {
                             // If one or both operands are of the String primitive type, the result is of the String primitive type.
                             resultType = stringType;
                         }
@@ -11145,11 +12063,7 @@ namespace ts {
                 case SyntaxKind.ExclamationEqualsToken:
                 case SyntaxKind.EqualsEqualsEqualsToken:
                 case SyntaxKind.ExclamationEqualsEqualsToken:
-                    // Permit 'number[] | "foo"' to be asserted to 'string'.
-                    if (someConstituentTypeHasKind(leftType, TypeFlags.StringLike) && someConstituentTypeHasKind(rightType, TypeFlags.StringLike)) {
-                        return booleanType;
-                    }
-                    if (!isTypeAssignableTo(leftType, rightType) && !isTypeAssignableTo(rightType, leftType)) {
+                    if (!isTypeComparableTo(leftType, rightType) && !isTypeComparableTo(rightType, leftType)) {
                         reportOperatorError();
                     }
                     return booleanType;
@@ -11158,9 +12072,9 @@ namespace ts {
                 case SyntaxKind.InKeyword:
                     return checkInExpression(left, right, leftType, rightType);
                 case SyntaxKind.AmpersandAmpersandToken:
-                    return rightType;
+                    return addNullableKind(rightType, getNullableKind(leftType));
                 case SyntaxKind.BarBarToken:
-                    return getUnionType([leftType, rightType]);
+                    return getUnionType([getNonNullableType(leftType), rightType]);
                 case SyntaxKind.EqualsToken:
                     checkAssignmentOperator(rightType);
                     return getRegularTypeOfObjectLiteral(rightType);
@@ -11171,8 +12085,8 @@ namespace ts {
             // Return true if there was no error, false if there was an error.
             function checkForDisallowedESSymbolOperand(operator: SyntaxKind): boolean {
                 const offendingSymbolOperand =
-                    someConstituentTypeHasKind(leftType, TypeFlags.ESSymbol) ? left :
-                        someConstituentTypeHasKind(rightType, TypeFlags.ESSymbol) ? right :
+                    maybeTypeOfKind(leftType, TypeFlags.ESSymbol) ? left :
+                        maybeTypeOfKind(rightType, TypeFlags.ESSymbol) ? right :
                             undefined;
                 if (offendingSymbolOperand) {
                     error(offendingSymbolOperand, Diagnostics.The_0_operator_cannot_be_applied_to_type_symbol, tokenToString(operator));
@@ -11458,6 +12372,8 @@ namespace ts {
                 case SyntaxKind.TypeAssertionExpression:
                 case SyntaxKind.AsExpression:
                     return checkAssertion(<AssertionExpression>node);
+                case SyntaxKind.NonNullExpression:
+                    return checkNonNullAssertion(<NonNullExpression>node);
                 case SyntaxKind.DeleteExpression:
                     return checkDeleteExpression(<DeleteExpression>node);
                 case SyntaxKind.VoidExpression:
@@ -11516,7 +12432,7 @@ namespace ts {
 
             checkVariableLikeDeclaration(node);
             let func = getContainingFunction(node);
-            if (node.flags & NodeFlags.AccessibilityModifier) {
+            if (getModifierFlags(node) & ModifierFlags.AccessibilityModifier) {
                 func = getContainingFunction(node);
                 if (!(func.kind === SyntaxKind.Constructor && nodeIsPresent(func.body))) {
                     error(node, Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
@@ -11525,6 +12441,17 @@ namespace ts {
             if (node.questionToken && isBindingPattern(node.name) && func.body) {
                 error(node, Diagnostics.A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature);
             }
+            if ((<Identifier>node.name).text === "this") {
+                if (indexOf(func.parameters, node) !== 0) {
+                    error(node, Diagnostics.A_this_parameter_must_be_the_first_parameter);
+                }
+                if (func.kind === SyntaxKind.Constructor || func.kind === SyntaxKind.ConstructSignature || func.kind === SyntaxKind.ConstructorType) {
+                    error(node, Diagnostics.A_constructor_cannot_have_a_this_parameter);
+                }
+                if (func.kind === SyntaxKind.SetAccessor) {
+                    error(node, Diagnostics.A_setter_cannot_have_a_this_parameter);
+                }
+            }
 
             // Only check rest parameter type if it's not a binding pattern. Since binding patterns are
             // not allowed in a rest parameter, we already have an error from checkGrammarParameterList.
@@ -11557,41 +12484,43 @@ namespace ts {
             return -1;
         }
 
-        function checkTypePredicate(node: TypePredicateNode) {
+        function checkTypePredicate(node: TypePredicateNode): void {
             const parent = getTypePredicateParent(node);
             if (!parent) {
+                // The parent must not be valid.
+                error(node, Diagnostics.A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods);
                 return;
             }
-            const returnType = getReturnTypeOfSignature(getSignatureFromDeclaration(parent));
-            if (!returnType || !(returnType.flags & TypeFlags.PredicateType)) {
+
+            const typePredicate = getSignatureFromDeclaration(parent).typePredicate;
+            if (!typePredicate) {
                 return;
             }
+
             const { parameterName } = node;
-            if (parameterName.kind === SyntaxKind.ThisType) {
+            if (isThisTypePredicate(typePredicate)) {
                 getTypeFromThisTypeNode(parameterName as ThisTypeNode);
             }
             else {
-                const typePredicate = <IdentifierTypePredicate>(<PredicateType>returnType).predicate;
                 if (typePredicate.parameterIndex >= 0) {
                     if (parent.parameters[typePredicate.parameterIndex].dotDotDotToken) {
                         error(parameterName,
                             Diagnostics.A_type_predicate_cannot_reference_a_rest_parameter);
                     }
                     else {
+                        const leadingError = chainDiagnosticMessages(undefined, Diagnostics.A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type);
                         checkTypeAssignableTo(typePredicate.type,
                             getTypeOfNode(parent.parameters[typePredicate.parameterIndex]),
-                            node.type);
+                            node.type,
+                            /*headMessage*/ undefined,
+                            leadingError);
                     }
                 }
                 else if (parameterName) {
                     let hasReportedError = false;
                     for (const { name } of parent.parameters) {
-                        if ((name.kind === SyntaxKind.ObjectBindingPattern ||
-                            name.kind === SyntaxKind.ArrayBindingPattern) &&
-                            checkIfTypePredicateVariableIsDeclaredInBindingPattern(
-                                <BindingPattern>name,
-                                parameterName,
-                                typePredicate.parameterName)) {
+                        if (isBindingPattern(name) &&
+                                checkIfTypePredicateVariableIsDeclaredInBindingPattern(name, parameterName, typePredicate.parameterName)) {
                             hasReportedError = true;
                             break;
                         }
@@ -11659,8 +12588,9 @@ namespace ts {
 
             forEach(node.parameters, checkParameter);
 
-            checkSourceElement(node.type);
-
+            if (node.type) {
+                checkSourceElement(node.type);
+            }
 
             if (produceDiagnostics) {
                 checkCollisionWithArgumentsInGeneratedCode(node);
@@ -11760,7 +12690,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));
             }
         }
@@ -11768,7 +12698,7 @@ namespace ts {
         function checkConstructorDeclaration(node: ConstructorDeclaration) {
             // Grammar check on signature of constructor and modifier of the constructor is done in checkSignatureDeclaration function.
             checkSignatureDeclaration(node);
-            // Grammar check for checking only related to constructoDeclaration
+            // Grammar check for checking only related to constructorDeclaration
             checkGrammarConstructorTypeParameters(node) || checkGrammarConstructorTypeAnnotation(node);
 
             checkSourceElement(node.body);
@@ -11790,10 +12720,6 @@ namespace ts {
                 return;
             }
 
-            function isSuperCallExpression(n: Node): boolean {
-                return n.kind === SyntaxKind.CallExpression && (<CallExpression>n).expression.kind === SyntaxKind.SuperKeyword;
-            }
-
             function containsSuperCallAsComputedPropertyName(n: Declaration): boolean {
                 return n.name && containsSuperCall(n.name);
             }
@@ -11822,7 +12748,7 @@ namespace ts {
 
             function isInstancePropertyWithInitializer(n: Node): boolean {
                 return n.kind === SyntaxKind.PropertyDeclaration &&
-                    !(n.flags & NodeFlags.Static) &&
+                    !(getModifierFlags(n) & ModifierFlags.Static) &&
                     !!(<PropertyDeclaration>n).initializer;
             }
 
@@ -11831,13 +12757,11 @@ namespace ts {
             // constructors of derived classes must contain at least one super call somewhere in their function body.
             const containingClassDecl = <ClassDeclaration>node.parent;
             if (getClassExtendsHeritageClauseElement(containingClassDecl)) {
-                const containingClassSymbol = getSymbolOfNode(containingClassDecl);
-                const containingClassInstanceType = <InterfaceType>getDeclaredTypeOfSymbol(containingClassSymbol);
-                const baseConstructorType = getBaseConstructorTypeOfClass(containingClassInstanceType);
-
-                if (containsSuperCall(node.body)) {
-                    if (baseConstructorType === nullType) {
-                        error(node, Diagnostics.A_constructor_cannot_contain_a_super_call_when_its_class_extends_null);
+                const classExtendsNull = classDeclarationExtendsNull(containingClassDecl);
+                const superCall = getSuperCallInConstructor(node);
+                if (superCall) {
+                    if (classExtendsNull) {
+                        error(superCall, Diagnostics.A_constructor_cannot_contain_a_super_call_when_its_class_extends_null);
                     }
 
                     // The first statement in the body of a constructor (excluding prologue directives) must be a super call
@@ -11847,13 +12771,14 @@ 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.Public | NodeFlags.Private | NodeFlags.Protected));
+                        forEach(node.parameters, p => getModifierFlags(p) & ModifierFlags.AccessibilityModifier);
 
                     // Skip past any prologue directives to find the first statement
                     // to ensure that it was a super call.
                     if (superCallShouldBeFirst) {
                         const statements = (<Block>node.body).statements;
                         let superCallStatement: ExpressionStatement;
+
                         for (const statement of statements) {
                             if (statement.kind === SyntaxKind.ExpressionStatement && isSuperCallExpression((<ExpressionStatement>statement).expression)) {
                                 superCallStatement = <ExpressionStatement>statement;
@@ -11868,7 +12793,7 @@ namespace ts {
                         }
                     }
                 }
-                else if (baseConstructorType !== nullType) {
+                else if (!classExtendsNull) {
                     error(node, Diagnostics.Constructors_for_derived_classes_must_contain_a_super_call);
                 }
             }
@@ -11905,9 +12830,12 @@ 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 (hasModifier(node, ModifierFlags.Abstract) !== hasModifier(otherAccessor, ModifierFlags.Abstract)) {
+                            error(node.name, Diagnostics.Accessors_must_both_be_abstract_or_non_abstract);
+                        }
 
                         const currentAccessorType = getAnnotatedAccessorType(node);
                         const otherAccessorType = getAnnotatedAccessorType(otherAccessor);
@@ -12006,11 +12934,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.
@@ -12018,11 +12946,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;
@@ -12043,7 +12971,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;
@@ -12052,17 +12980,17 @@ namespace ts {
 
                     forEach(overloads, o => {
                         const deviation = getEffectiveDeclarationFlags(o, flagsToCheck) ^ canonicalFlags;
-                        if (deviation & NodeFlags.Export) {
-                            error(o.name, Diagnostics.Overload_signatures_must_all_be_exported_or_not_exported);
+                        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)) {
-                            error(o.name, Diagnostics.Overload_signatures_must_all_be_public_private_or_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) {
-                            error(o.name, Diagnostics.Overload_signatures_must_all_be_abstract_or_not_abstract);
+                        else if (deviation & ModifierFlags.Abstract) {
+                            error(o.name, Diagnostics.Overload_signatures_must_all_be_abstract_or_non_abstract);
                         }
                     });
                 }
@@ -12080,8 +13008,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;
@@ -12107,7 +13035,7 @@ namespace ts {
                         seen = c === node;
                     }
                 });
-                // We may be here because of some extra junk between overloads that could not be parsed into a valid node.
+                // We may be here because of some extra nodes between overloads that could not be parsed into a valid node.
                 // In this case the subsequent node is not really consecutive (.pos !== node.end), and we must ignore it here.
                 if (subsequentNode && subsequentNode.pos === node.end) {
                     if (subsequentNode.kind === node.kind) {
@@ -12116,13 +13044,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;
@@ -12140,7 +13068,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 {
@@ -12219,7 +13147,7 @@ namespace ts {
 
             // Abstract methods can't have an implementation -- in particular, they don't need one.
             if (!isExportSymbolInsideModule && lastSeenNonAmbientDeclaration && !lastSeenNonAmbientDeclaration.body &&
-                !(lastSeenNonAmbientDeclaration.flags & NodeFlags.Abstract)) {
+                !(getModifierFlags(lastSeenNonAmbientDeclaration) & ModifierFlags.Abstract)) {
                 reportImplementationExpectedError(lastSeenNonAmbientDeclaration);
             }
 
@@ -12269,10 +13197,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 {
@@ -12284,7 +13212,7 @@ namespace ts {
                 }
             }
 
-            // Spaces for anyting not declared a 'default export'.
+            // Spaces for anything not declared a 'default export'.
             const nonDefaultExportedDeclarationSpaces = exportedDeclarationSpaces | nonExportedDeclarationSpaces;
 
             const commonDeclarationSpacesForExportsAndLocals = exportedDeclarationSpaces & nonExportedDeclarationSpaces;
@@ -12295,7 +13223,7 @@ namespace ts {
                 for (const d of symbol.declarations) {
                     const declarationSpaces = getDeclarationSpaces(d);
 
-                    // Only error on the declarations that conributed to the intersecting spaces.
+                    // Only error on the declarations that contributed to the intersecting spaces.
                     if (declarationSpaces & commonDeclarationSpacesForDefaultAndNonDefault) {
                         error(d.name, Diagnostics.Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_default_0_declaration_instead, declarationNameToString(d.name));
                     }
@@ -12445,7 +13373,7 @@ namespace ts {
                         return checkNonThenableType(type, location, message);
                     }
                     else {
-                        if (type.id === promisedType.id || awaitedTypeStack.indexOf(promisedType.id) >= 0) {
+                        if (type.id === promisedType.id || indexOf(awaitedTypeStack, promisedType.id) >= 0) {
                             // We have a bad actor in the form of a promise whose promised type is
                             // the same promise type, or a mutually recursive promise. Return the
                             // unknown type as we cannot guess the shape. If this were the actual
@@ -12727,7 +13655,7 @@ namespace ts {
             }
 
             if (!compilerOptions.experimentalDecorators) {
-                error(node, Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Specify_experimentalDecorators_to_remove_this_warning);
+                error(node, Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning);
             }
 
             if (compilerOptions.emitDecoratorMetadata) {
@@ -12843,7 +13771,7 @@ namespace ts {
 
         function checkCollisionWithArgumentsInGeneratedCode(node: SignatureDeclaration) {
             // no rest parameters \ declaration context \ overload - no codegen impact
-            if (!hasRestParameter(node) || isInAmbientContext(node) || nodeIsMissing((<FunctionLikeDeclaration>node).body)) {
+            if (!hasDeclaredRestParameter(node) || isInAmbientContext(node) || nodeIsMissing((<FunctionLikeDeclaration>node).body)) {
                 return;
             }
 
@@ -13012,7 +13940,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
@@ -13096,6 +14024,15 @@ namespace ts {
                 if (node.propertyName && node.propertyName.kind === SyntaxKind.ComputedPropertyName) {
                     checkComputedPropertyName(<ComputedPropertyName>node.propertyName);
                 }
+
+                // check private/protected variable access
+                const parent = <VariableLikeDeclaration>(<BindingPattern>node.parent).parent;
+                const parentType = getTypeForBindingElementParent(parent);
+                const name = node.propertyName || <Identifier>node.name;
+                const property = getPropertyOfType(parentType, getTextOfPropertyName(name));
+                if (parent.initializer && property && getParentOfSymbol(property)) {
+                    checkClassPropertyAccess(parent, parent.initializer, parentType, property);
+                }
             }
 
             // For a binding pattern, check contained binding elements
@@ -13317,7 +14254,7 @@ namespace ts {
                 }
             }
 
-            const rightType = checkExpression(node.expression);
+            const rightType = checkNonNullExpression(node.expression);
             // unknownType is returned i.e. if node.expression is identifier whose name cannot be resolved
             // in this case error about missing name is already reported - do not report extra one
             if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, TypeFlags.ObjectType | TypeFlags.TypeParameter)) {
@@ -13337,7 +14274,7 @@ namespace ts {
         }
 
         function checkRightHandSideOfForOf(rhsExpression: Expression): Type {
-            const expressionType = getTypeOfExpression(rhsExpression);
+            const expressionType = checkNonNullExpression(rhsExpression);
             return checkIteratedTypeOrElementType(expressionType, rhsExpression, /*allowStringInput*/ true);
         }
 
@@ -13409,7 +14346,7 @@ namespace ts {
             if (!typeAsIterable.iterableElementType) {
                 // As an optimization, if the type is instantiated directly using the globalIterableType (Iterable<number>),
                 // then just grab its type argument.
-                if ((type.flags & TypeFlags.Reference) && (<GenericType>type).target === globalIterableType) {
+                if ((type.flags & TypeFlags.Reference) && (<GenericType>type).target === getGlobalIterableType()) {
                     typeAsIterable.iterableElementType = (<GenericType>type).typeArguments[0];
                 }
                 else {
@@ -13455,7 +14392,7 @@ namespace ts {
             if (!typeAsIterator.iteratorElementType) {
                 // As an optimization, if the type is instantiated directly using the globalIteratorType (Iterator<number>),
                 // then just grab its type argument.
-                if ((type.flags & TypeFlags.Reference) && (<GenericType>type).target === globalIteratorType) {
+                if ((type.flags & TypeFlags.Reference) && (<GenericType>type).target === getGlobalIteratorType()) {
                     typeAsIterator.iteratorElementType = (<GenericType>type).typeArguments[0];
                 }
                 else {
@@ -13499,7 +14436,7 @@ namespace ts {
 
             // As an optimization, if the type is instantiated directly using the globalIterableIteratorType (IterableIterator<number>),
             // then just grab its type argument.
-            if ((type.flags & TypeFlags.Reference) && (<GenericType>type).target === globalIterableIteratorType) {
+            if ((type.flags & TypeFlags.Reference) && (<GenericType>type).target === getGlobalIterableIteratorType()) {
                 return (<GenericType>type).typeArguments[0];
             }
 
@@ -13511,7 +14448,7 @@ namespace ts {
          * This function does the following steps:
          *   1. Break up arrayOrStringType (possibly a union) into its string constituents and array constituents.
          *   2. Take the element types of the array constituents.
-         *   3. Return the union of the element types, and string if there was a string constitutent.
+         *   3. Return the union of the element types, and string if there was a string constituent.
          *
          * For example:
          *     string -> string
@@ -13585,10 +14522,15 @@ namespace ts {
             // TODO: Check that target label is valid
         }
 
-        function isGetAccessorWithAnnotatatedSetAccessor(node: FunctionLikeDeclaration) {
+        function isGetAccessorWithAnnotatedSetAccessor(node: FunctionLikeDeclaration) {
             return !!(node.kind === SyntaxKind.GetAccessor && getSetAccessorTypeAnnotationNode(<AccessorDeclaration>getDeclarationOfKind(node.symbol, SyntaxKind.SetAccessor)));
         }
 
+        function isUnwrappedReturnTypeVoidOrAny(func: FunctionLikeDeclaration, returnType: Type): boolean {
+            const unwrappedReturnType = isAsyncFunctionLike(func) ? getPromisedType(returnType) : returnType;
+            return maybeTypeOfKind(unwrappedReturnType, TypeFlags.Void | TypeFlags.Any);
+        }
+
         function checkReturnStatement(node: ReturnStatement) {
             // Grammar checking
             if (!checkGrammarStatementInAmbientContext(node)) {
@@ -13598,12 +14540,12 @@ namespace ts {
                 }
             }
 
-            if (node.expression) {
-                const func = getContainingFunction(node);
-                if (func) {
-                    const signature = getSignatureFromDeclaration(func);
-                    const returnType = getReturnTypeOfSignature(signature);
-                    const exprType = checkExpressionCached(node.expression);
+            const func = getContainingFunction(node);
+            if (func) {
+                const signature = getSignatureFromDeclaration(func);
+                const returnType = getReturnTypeOfSignature(signature);
+                if (strictNullChecks || node.expression) {
+                    const exprType = node.expression ? checkExpressionCached(node.expression) : undefinedType;
 
                     if (func.asteriskToken) {
                         // A generator does not need its return expressions checked against its return type.
@@ -13614,29 +14556,35 @@ namespace ts {
                     }
 
                     if (func.kind === SyntaxKind.SetAccessor) {
-                        error(node.expression, Diagnostics.Setters_cannot_return_a_value);
+                        if (node.expression) {
+                            error(node.expression, Diagnostics.Setters_cannot_return_a_value);
+                        }
                     }
                     else if (func.kind === SyntaxKind.Constructor) {
-                        if (!checkTypeAssignableTo(exprType, returnType, node.expression)) {
+                        if (node.expression && !checkTypeAssignableTo(exprType, returnType, node.expression)) {
                             error(node.expression, Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
                         }
                     }
-                    else if (func.type || isGetAccessorWithAnnotatatedSetAccessor(func) || returnType.flags & TypeFlags.PredicateType) {
+                    else if (func.type || isGetAccessorWithAnnotatedSetAccessor(func)) {
                         if (isAsyncFunctionLike(func)) {
                             const promisedType = getPromisedType(returnType);
-                            const awaitedType = checkAwaitedType(exprType, node.expression, Diagnostics.Return_expression_in_async_function_does_not_have_a_valid_callable_then_member);
+                            const awaitedType = checkAwaitedType(exprType, node.expression || node, Diagnostics.Return_expression_in_async_function_does_not_have_a_valid_callable_then_member);
                             if (promisedType) {
                                 // If the function has a return type, but promisedType is
                                 // undefined, an error will be reported in checkAsyncFunctionReturnType
                                 // so we don't need to report one here.
-                                checkTypeAssignableTo(awaitedType, promisedType, node.expression);
+                                checkTypeAssignableTo(awaitedType, promisedType, node.expression || node);
                             }
                         }
                         else {
-                            checkTypeAssignableTo(exprType, returnType, node.expression);
+                            checkTypeAssignableTo(exprType, returnType, node.expression || node);
                         }
                     }
                 }
+                else if (func.kind !== SyntaxKind.Constructor && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType)) {
+                    // The function has a return type, but the return statement doesn't have an expression.
+                    error(node, Diagnostics.Not_all_code_paths_return_a_value);
+                }
             }
         }
 
@@ -13660,7 +14608,6 @@ namespace ts {
             let hasDuplicateDefaultClause = false;
 
             const expressionType = checkExpression(node.expression);
-            const expressionTypeIsStringLike = someConstituentTypeHasKind(expressionType, TypeFlags.StringLike);
             forEach(node.caseBlock.clauses, clause => {
                 // Grammar check for duplicate default clauses, skip if we already report duplicate default clause
                 if (clause.kind === SyntaxKind.DefaultClause && !hasDuplicateDefaultClause) {
@@ -13678,18 +14625,13 @@ namespace ts {
 
                 if (produceDiagnostics && clause.kind === SyntaxKind.CaseClause) {
                     const caseClause = <CaseClause>clause;
-                    // TypeScript 1.0 spec (April 2014):5.9
-                    // In a 'switch' statement, each 'case' expression must be of a type that is assignable to or from the type of the 'switch' expression.
+                    // TypeScript 1.0 spec (April 2014): 5.9
+                    // In a 'switch' statement, each 'case' expression must be of a type that is comparable
+                    // to or from the type of the 'switch' expression.
                     const caseType = checkExpression(caseClause.expression);
-
-                    const expressionTypeIsAssignableToCaseType =
-                        // Permit 'number[] | "foo"' to be asserted to 'string'.
-                        (expressionTypeIsStringLike && someConstituentTypeHasKind(caseType, TypeFlags.StringLike)) ||
-                        isTypeAssignableTo(expressionType, caseType);
-
-                    if (!expressionTypeIsAssignableToCaseType) {
-                        // 'expressionType is not assignable to caseType', try the reversed check and report errors if it fails
-                        checkTypeAssignableTo(caseType, expressionType, caseClause.expression, /*headMessage*/ undefined);
+                    if (!isTypeComparableTo(expressionType, caseType)) {
+                        // expressionType is not comparable to caseType, try the reversed check and report errors if it fails
+                        checkTypeComparableTo(caseType, expressionType, caseClause.expression, /*headMessage*/ undefined);
                     }
                 }
                 forEach(clause.statements, checkSourceElement);
@@ -13788,7 +14730,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);
@@ -13870,7 +14812,7 @@ namespace ts {
             }
         }
 
-        // Check each type parameter and check that list has no duplicate type parameter declarations
+        /** Check each type parameter and check that type parameters have no duplicate type parameter declarations */
         function checkTypeParameters(typeParameterDeclarations: TypeParameterDeclaration[]) {
             if (typeParameterDeclarations) {
                 for (let i = 0, n = typeParameterDeclarations.length; i < n; i++) {
@@ -13888,6 +14830,24 @@ namespace ts {
             }
         }
 
+        /** Check that type parameter lists are identical across multiple declarations */
+        function checkTypeParameterListsIdentical(node: ClassLikeDeclaration | InterfaceDeclaration, symbol: Symbol) {
+            if (symbol.declarations.length === 1) {
+                return;
+            }
+            let firstDecl: ClassLikeDeclaration | InterfaceDeclaration;
+            for (const declaration of symbol.declarations) {
+                if (declaration.kind === SyntaxKind.ClassDeclaration || declaration.kind === SyntaxKind.InterfaceDeclaration) {
+                    if (!firstDecl) {
+                        firstDecl = <ClassLikeDeclaration | InterfaceDeclaration>declaration;
+                    }
+                    else if (!areTypeParametersIdentical(firstDecl.typeParameters, node.typeParameters)) {
+                        error(node.name, Diagnostics.All_declarations_of_0_must_have_identical_type_parameters, node.name.text);
+                    }
+                }
+            }
+        }
+
         function checkClassExpression(node: ClassExpression): Type {
             checkClassLikeDeclaration(node);
             checkNodeDeferred(node);
@@ -13899,7 +14859,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);
@@ -13921,6 +14881,7 @@ namespace ts {
             const type = <InterfaceType>getDeclaredTypeOfSymbol(symbol);
             const typeWithThis = getTypeWithThisArgument(type);
             const staticType = <ObjectType>getTypeOfSymbol(symbol);
+            checkTypeParameterListsIdentical(node, symbol);
 
             const baseTypeNode = getClassExtendsHeritageClauseElement(node);
             if (baseTypeNode) {
@@ -13928,6 +14889,7 @@ namespace ts {
                 if (baseTypes.length && produceDiagnostics) {
                     const baseType = baseTypes[0];
                     const staticBaseType = getBaseConstructorTypeOfClass(type);
+                    checkBaseTypeAccessibility(staticBaseType, baseTypeNode);
                     checkSourceElement(baseTypeNode.expression);
                     if (baseTypeNode.typeArguments) {
                         forEach(baseTypeNode.typeArguments, checkSourceElement);
@@ -13983,6 +14945,19 @@ namespace ts {
             }
         }
 
+        function checkBaseTypeAccessibility(type: ObjectType, node: ExpressionWithTypeArguments) {
+            const signatures = getSignaturesOfType(type, SignatureKind.Construct);
+            if (signatures.length) {
+                const declaration = signatures[0].declaration;
+                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);
+                    }
+                }
+            }
+        }
+
         function getTargetSymbol(s: Symbol) {
             // if symbol is instantiated its flags are not copied from the 'target'
             // so we'll need to get back original 'target' symbol to work with correct set of flags
@@ -14019,12 +14994,12 @@ 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.");
 
                 if (derived) {
-                    // In order to resolve whether the inherited method was overriden in the base class or not,
+                    // In order to resolve whether the inherited method was overridden in the base class or not,
                     // we compare the Symbols obtained. Since getTargetSymbol returns the symbol on the *uninstantiated*
                     // type declaration, derived and base resolve to the same symbol even in the case of generic classes.
                     if (derived === base) {
@@ -14035,7 +15010,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));
@@ -14048,13 +15023,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;
                         }
@@ -14169,14 +15144,10 @@ namespace ts {
 
                 checkExportsOnMergedDeclarations(node);
                 const symbol = getSymbolOfNode(node);
-                const firstInterfaceDecl = <InterfaceDeclaration>getDeclarationOfKind(symbol, SyntaxKind.InterfaceDeclaration);
-                if (symbol.declarations.length > 1) {
-                    if (node !== firstInterfaceDecl && !areTypeParametersIdentical(firstInterfaceDecl.typeParameters, node.typeParameters)) {
-                        error(node.name, Diagnostics.All_declarations_of_an_interface_must_have_identical_type_parameters);
-                    }
-                }
+                checkTypeParameterListsIdentical(node, symbol);
 
                 // Only check this symbol once
+                const firstInterfaceDecl = <InterfaceDeclaration>getDeclarationOfKind(symbol, SyntaxKind.InterfaceDeclaration);
                 if (node === firstInterfaceDecl) {
                     const type = <InterfaceType>getDeclaredTypeOfSymbol(symbol);
                     const typeWithThis = getTypeWithThisArgument(type);
@@ -14605,7 +15576,9 @@ namespace ts {
                     break;
                 case SyntaxKind.ImportEqualsDeclaration:
                     if ((<ImportEqualsDeclaration>node).moduleReference.kind !== SyntaxKind.StringLiteral) {
-                        error((<ImportEqualsDeclaration>node).name, Diagnostics.Module_augmentation_cannot_introduce_new_names_in_the_top_level_scope);
+                        if (!isGlobalAugmentation) {
+                            error((<ImportEqualsDeclaration>node).name, Diagnostics.Module_augmentation_cannot_introduce_new_names_in_the_top_level_scope);
+                        }
                         break;
                     }
                     // fallthrough
@@ -14629,6 +15602,9 @@ namespace ts {
                 case SyntaxKind.InterfaceDeclaration:
                 case SyntaxKind.ModuleDeclaration:
                 case SyntaxKind.TypeAliasDeclaration:
+                    if (isGlobalAugmentation) {
+                        return;
+                    }
                     const symbol = getSymbolOfNode(node);
                     if (symbol) {
                         // module augmentations cannot introduce new names on the top level scope of the module
@@ -14637,14 +15613,8 @@ namespace ts {
                         // 2. main check - report error if value declaration of the parent symbol is module augmentation)
                         let reportError = !(symbol.flags & SymbolFlags.Merged);
                         if (!reportError) {
-                            if (isGlobalAugmentation) {
-                                // global symbol should not have parent since it is not explicitly exported
-                                reportError = symbol.parent !== undefined;
-                            }
-                            else {
-                                // symbol should not originate in augmentation
-                                reportError = isExternalModuleAugmentation(symbol.parent.valueDeclaration);
-                            }
+                            // symbol should not originate in augmentation
+                            reportError = isExternalModuleAugmentation(symbol.parent.declarations[0]);
                         }
                         if (reportError) {
                             error(node, Diagnostics.Module_augmentation_cannot_introduce_new_names_in_the_top_level_scope);
@@ -14702,8 +15672,14 @@ namespace ts {
             const symbol = getSymbolOfNode(node);
             const target = resolveAlias(symbol);
             if (target !== unknownSymbol) {
+                // For external modules symbol represent local symbol for an alias.
+                // This local symbol will merge any other local declarations (excluding other aliases)
+                // and symbol.flags will contains combined representation for all merged declaration.
+                // Based on symbol.flags we can compute a set of excluded meanings (meaning that resolved alias should not have,
+                // otherwise it will conflict with some local declaration). Note that in addition to normal flags we include matching SymbolFlags.Export*
+                // in order to prevent collisions with declarations that were exported from the current module (they still contribute to local names).
                 const excludedMeanings =
-                    (symbol.flags & SymbolFlags.Value ? SymbolFlags.Value : 0) |
+                    (symbol.flags & (SymbolFlags.Value | SymbolFlags.ExportValue) ? SymbolFlags.Value : 0) |
                     (symbol.flags & SymbolFlags.Type ? SymbolFlags.Type : 0) |
                     (symbol.flags & SymbolFlags.Namespace ? SymbolFlags.Namespace : 0);
                 if (target.flags & excludedMeanings) {
@@ -14727,7 +15703,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)) {
@@ -14757,7 +15733,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)) {
@@ -14790,7 +15766,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);
             }
 
@@ -14829,7 +15805,7 @@ namespace ts {
                 const symbol = resolveName(exportedName, exportedName.text, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace | SymbolFlags.Alias,
                     /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
                 if (symbol && (symbol === undefinedSymbol || isGlobalSourceFile(getDeclarationContainer(symbol.declarations[0])))) {
-                    error(exportedName, Diagnostics.Cannot_re_export_name_that_is_not_defined_in_the_module);
+                    error(exportedName, Diagnostics.Cannot_export_0_Only_local_declarations_can_be_exported_from_a_module, exportedName.text);
                 }
                 else {
                     markExportAsReferenced(node);
@@ -14849,7 +15825,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) {
@@ -14900,11 +15876,20 @@ namespace ts {
                         continue;
                     }
                     const { declarations, flags } = exports[id];
-                    // ECMA262: 15.2.1.1 It is a Syntax Error if the ExportedNames of ModuleItemList contains any duplicate entries. (TS Exceptions: namespaces, function overloads, enums, and interfaces)
-                    if (!(flags & (SymbolFlags.Namespace | SymbolFlags.Interface | SymbolFlags.Enum)) && (flags & SymbolFlags.TypeAlias ? declarations.length - 1 : declarations.length) > 1) {
-                        const exportedDeclarations: Declaration[] = filter(declarations, isNotOverload);
-                        if (exportedDeclarations.length > 1) {
-                            for (const declaration of exportedDeclarations) {
+                    // ECMA262: 15.2.1.1 It is a Syntax Error if the ExportedNames of ModuleItemList contains any duplicate entries.
+                    // (TS Exceptions: namespaces, function overloads, enums, and interfaces)
+                    if (flags & (SymbolFlags.Namespace | SymbolFlags.Interface | SymbolFlags.Enum)) {
+                        continue;
+                    }
+                    const exportedDeclarationsCount = countWhere(declarations, isNotOverload);
+                    if (flags & SymbolFlags.TypeAlias && exportedDeclarationsCount <= 2) {
+                        // it is legal to merge type alias with other values
+                        // so count should be either 1 (just type alias) or 2 (type alias + merged value)
+                        continue;
+                    }
+                    if (exportedDeclarationsCount > 1) {
+                        for (const declaration of declarations) {
+                            if (isNotOverload(declaration)) {
                                 diagnostics.add(createDiagnosticForNode(declaration, Diagnostics.Cannot_redeclare_exported_variable_0, id));
                             }
                         }
@@ -14918,7 +15903,6 @@ namespace ts {
             }
         }
 
-
         function checkSourceElement(node: Node): void {
             if (!node) {
                 return;
@@ -14926,7 +15910,7 @@ namespace ts {
 
             const kind = node.kind;
             if (cancellationToken) {
-                // Only bother checking on a few construct kinds.  We don't want to be excessivly
+                // Only bother checking on a few construct kinds.  We don't want to be excessively
                 // hitting the cancellation token on every node we check.
                 switch (kind) {
                     case SyntaxKind.ModuleDeclaration:
@@ -15177,7 +16161,7 @@ namespace ts {
 
         function getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[] {
             const symbols: SymbolTable = {};
-            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
@@ -15218,7 +16202,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;
@@ -15234,7 +16218,7 @@ namespace ts {
                         copySymbol(argumentsSymbol, meaning);
                     }
 
-                    memberFlags = location.flags;
+                    memberFlags = getModifierFlags(location);
                     location = location.parent;
                 }
 
@@ -15306,6 +16290,22 @@ namespace ts {
             return node.parent && node.parent.kind === SyntaxKind.ExpressionWithTypeArguments;
         }
 
+        function forEachEnclosingClass<T>(node: Node, callback: (node: Node) => T): T {
+            let result: T;
+
+            while (true) {
+                node = getContainingClass(node);
+                if (!node) break;
+                if (result = callback(node)) break;
+            }
+
+            return result;
+        }
+
+        function isNodeWithinClass(node: Node, classDeclaration: ClassLikeDeclaration) {
+            return !!forEachEnclosingClass(node, n => n === classDeclaration);
+        }
+
         function getLeftSideOfImportEqualsOrExportAssignment(nodeOnRightSide: EntityName): ImportEqualsDeclaration | ExportAssignment {
             while (nodeOnRightSide.parent.kind === SyntaxKind.QualifiedName) {
                 nodeOnRightSide = <QualifiedName>nodeOnRightSide.parent;
@@ -15380,11 +16380,6 @@ namespace ts {
                 meaning |= SymbolFlags.Alias;
                 return resolveEntityName(<EntityName>entityName, meaning);
             }
-            else if ((entityName.parent.kind === SyntaxKind.JsxOpeningElement) ||
-                (entityName.parent.kind === SyntaxKind.JsxSelfClosingElement) ||
-                (entityName.parent.kind === SyntaxKind.JsxClosingElement)) {
-                return getJsxElementTagSymbol(<JsxOpeningLikeElement>entityName.parent);
-            }
             else if (isPartOfExpression(entityName)) {
                 if (nodeIsMissing(entityName)) {
                     // Missing entity name.
@@ -15392,6 +16387,10 @@ namespace ts {
                 }
 
                 if (entityName.kind === SyntaxKind.Identifier) {
+                    if (isJSXTagName(entityName) && isJsxIntrinsicIdentifier(<Identifier>entityName)) {
+                        return getIntrinsicTagSymbol(<JsxOpeningLikeElement>entityName.parent);
+                    }
+
                     // Include aliases in the meaning, this ensures that we do not follow aliases to where they point and instead
                     // return the alias symbol.
                     const meaning: SymbolFlags = SymbolFlags.Value | SymbolFlags.Alias;
@@ -15578,6 +16577,53 @@ namespace ts {
             return unknownType;
         }
 
+        // Gets the type of object literal or array literal of destructuring assignment.
+        // { a } from
+        //     for ( { a } of elems) {
+        //     }
+        // [ a ] from
+        //     [a] = [ some array ...]
+        function getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr: Expression): Type {
+            Debug.assert(expr.kind === SyntaxKind.ObjectLiteralExpression || expr.kind === SyntaxKind.ArrayLiteralExpression);
+            // If this is from "for of"
+            //     for ( { a } of elems) {
+            //     }
+            if (expr.parent.kind === SyntaxKind.ForOfStatement) {
+                const iteratedType = checkRightHandSideOfForOf((<ForOfStatement>expr.parent).expression);
+                return checkDestructuringAssignment(expr, iteratedType || unknownType);
+            }
+            // If this is from "for" initializer
+            //     for ({a } = elems[0];.....) { }
+            if (expr.parent.kind === SyntaxKind.BinaryExpression) {
+                const iteratedType = checkExpression((<BinaryExpression>expr.parent).right);
+                return checkDestructuringAssignment(expr, iteratedType || unknownType);
+            }
+            // If this is from nested object binding pattern
+            //     for ({ skills: { primary, secondary } } = multiRobot, i = 0; i < 1; i++) {
+            if (expr.parent.kind === SyntaxKind.PropertyAssignment) {
+                const typeOfParentObjectLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(<Expression>expr.parent.parent);
+                return checkObjectLiteralDestructuringPropertyAssignment(typeOfParentObjectLiteral || unknownType, <ObjectLiteralElement>expr.parent);
+            }
+            // Array literal assignment - array destructuring pattern
+            Debug.assert(expr.parent.kind === SyntaxKind.ArrayLiteralExpression);
+            //    [{ property1: p1, property2 }] = elems;
+            const typeOfArrayLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(<Expression>expr.parent);
+            const elementType = checkIteratedTypeOrElementType(typeOfArrayLiteral || unknownType, expr.parent, /*allowStringInput*/ false) || unknownType;
+            return checkArrayLiteralDestructuringElementAssignment(<ArrayLiteralExpression>expr.parent, typeOfArrayLiteral,
+                indexOf((<ArrayLiteralExpression>expr.parent).elements, expr), elementType || unknownType);
+        }
+
+        // Gets the property symbol corresponding to the property in destructuring assignment
+        // 'property1' from
+        //     for ( { property1: a } of elems) {
+        //     }
+        // 'property1' at location 'a' from:
+        //     [a] = [ property1, property2 ]
+        function getPropertySymbolOfDestructuringAssignment(location: Identifier) {
+            // Get the type of the object or array literal and then look for property of given name in the type
+            const typeOfObjectLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(<Expression>location.parent.parent);
+            return typeOfObjectLiteral && getPropertyOfType(typeOfObjectLiteral, location.text);
+        }
 
         function getTypeOfExpression(expr: Expression): Type {
             if (isRightSideOfQualifiedNameOrPropertyAccess(expr)) {
@@ -15592,7 +16638,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);
         }
@@ -15636,7 +16682,14 @@ namespace ts {
         // Emitter support
 
         function isArgumentsLocalBinding(node: Identifier): boolean {
-            return getReferencedValueSymbol(node) === argumentsSymbol;
+            if (!isGeneratedIdentifier(node)) {
+                node = getSourceTreeNodeOfType(node, isIdentifier);
+                if (node) {
+                    return getReferencedValueSymbol(node) === argumentsSymbol;
+                }
+            }
+
+            return false;
         }
 
         function moduleExportsSomeValue(moduleReferenceExpression: Expression): boolean {
@@ -15668,52 +16721,73 @@ 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;
+        function getReferencedExportContainer(node: Identifier, prefixLocals?: boolean): SourceFile | ModuleDeclaration | EnumDeclaration {
+            node = getSourceTreeNodeOfType(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;
                     }
-                    symbol = exportSymbol;
-                }
-                const parentSymbol = getParentOfSymbol(symbol);
-                if (parentSymbol) {
-                    if (parentSymbol.flags & SymbolFlags.ValueModule && parentSymbol.valueDeclaration.kind === SyntaxKind.SourceFile) {
-                        return <SourceFile>parentSymbol.valueDeclaration;
-                    }
-                    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) {
+                            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 = getSourceTreeNodeOfType(node, isIdentifier);
+            if (node) {
+                const symbol = getReferencedValueSymbol(node);
+                if (symbol && symbol.flags & SymbolFlags.Alias) {
+                    return getDeclarationOfAliasSymbol(symbol);
+                }
+            }
+
+            return undefined;
         }
 
         function isSymbolOfDeclarationWithCollidingName(symbol: Symbol): boolean {
             if (symbol.flags & SymbolFlags.BlockScoped) {
                 const links = getSymbolLinks(symbol);
-                if (links.isDeclaratonWithCollidingName === undefined) {
+                if (links.isDeclarationWithCollidingName === undefined) {
                     const container = getEnclosingBlockScopeContainer(symbol.valueDeclaration);
                     if (isStatementWithLocals(container)) {
                         const nodeLinks = getNodeLinks(symbol.valueDeclaration);
                         if (!!resolveName(container.parent, symbol.name, SymbolFlags.Value, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined)) {
                             // redeclaration - always should be renamed
-                            links.isDeclaratonWithCollidingName = true;
+                            links.isDeclarationWithCollidingName = true;
                         }
                         else if (nodeLinks.flags & NodeCheckFlags.CapturedBlockScopedBinding) {
                             // binding is captured in the function
@@ -15728,21 +16802,21 @@ namespace ts {
                             //     console.log(b()); // should print '100'
                             //     OR
                             //   - binding is declared inside loop but not in inside initializer of iteration statement or directly inside loop body
-                            //     * variables from initializer are passed to rewritted loop body as parameters so they are not captured directly
+                            //     * variables from initializer are passed to rewritten loop body as parameters so they are not captured directly
                             //     * variables that are declared immediately in loop body will become top level variable after loop is rewritten and thus
                             //       they will not collide with anything
                             const isDeclaredInLoop = nodeLinks.flags & NodeCheckFlags.BlockScopedBindingInLoop;
                             const inLoopInitializer = isIterationStatement(container, /*lookInLabeledStatements*/ false);
                             const inLoopBodyBlock = container.kind === SyntaxKind.Block && isIterationStatement(container.parent, /*lookInLabeledStatements*/ false);
 
-                            links.isDeclaratonWithCollidingName = !isBlockScopedContainerTopLevel(container) && (!isDeclaredInLoop || (!inLoopInitializer && !inLoopBodyBlock));
+                            links.isDeclarationWithCollidingName = !isBlockScopedContainerTopLevel(container) && (!isDeclaredInLoop || (!inLoopInitializer && !inLoopBodyBlock));
                         }
                         else {
-                            links.isDeclaratonWithCollidingName = false;
+                            links.isDeclarationWithCollidingName = false;
                         }
                     }
                 }
-                return links.isDeclaratonWithCollidingName;
+                return links.isDeclarationWithCollidingName;
             }
             return false;
         }
@@ -15751,35 +16825,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 = getSourceTreeNodeOfType(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 = getSourceTreeNodeOfType(node, isDeclaration);
+            if (node) {
+                const symbol = getSymbolOfNode(node);
+                if (symbol) {
+                    return isSymbolOfDeclarationWithCollidingName(symbol);
+                }
+            }
+
+            return false;
         }
 
         function isValueAliasDeclaration(node: Node): boolean {
+            node = getSourceTreeNode(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 = getSourceTreeNodeOfType(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;
             }
@@ -15793,7 +16894,7 @@ namespace ts {
             if (target === unknownSymbol && compilerOptions.isolatedModules) {
                 return true;
             }
-            // const enums and modules that contain only const enums are not considered values from the emit perespective
+            // const enums and modules that contain only const enums are not considered values from the emit perspective
             // unless 'preserveConstEnums' option is set to true
             return target !== unknownSymbol &&
                 target &&
@@ -15806,9 +16907,10 @@ namespace ts {
         }
 
         function isReferencedAliasDeclaration(node: Node, checkChildren?: boolean): boolean {
+            node = getSourceTreeNode(node);
             if (isAliasSymbolDeclaration(node)) {
                 const symbol = getSymbolOfNode(node);
-                if (getSymbolLinks(symbol).referenced) {
+                if (symbol && getSymbolLinks(symbol).referenced) {
                     return true;
                 }
             }
@@ -15841,7 +16943,8 @@ namespace ts {
         }
 
         function getNodeCheckFlags(node: Node): NodeCheckFlags {
-            return getNodeLinks(node).flags;
+            node = getSourceTreeNode(node);
+            return node ? getNodeLinks(node).flags : undefined;
         }
 
         function getEnumMemberValue(node: EnumMember): number {
@@ -15869,16 +16972,16 @@ 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, location);
             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, 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;
@@ -15890,22 +16993,22 @@ namespace ts {
             else if (type.flags & TypeFlags.Any) {
                 return TypeReferenceSerializationKind.ObjectType;
             }
-            else if (allConstituentTypesHaveKind(type, TypeFlags.Void)) {
+            else if (isTypeOfKind(type, TypeFlags.Void)) {
                 return TypeReferenceSerializationKind.VoidType;
             }
-            else if (allConstituentTypesHaveKind(type, TypeFlags.Boolean)) {
+            else if (isTypeOfKind(type, TypeFlags.Boolean)) {
                 return TypeReferenceSerializationKind.BooleanType;
             }
-            else if (allConstituentTypesHaveKind(type, TypeFlags.NumberLike)) {
+            else if (isTypeOfKind(type, TypeFlags.NumberLike)) {
                 return TypeReferenceSerializationKind.NumberLikeType;
             }
-            else if (allConstituentTypesHaveKind(type, TypeFlags.StringLike)) {
+            else if (isTypeOfKind(type, TypeFlags.StringLike)) {
                 return TypeReferenceSerializationKind.StringLikeType;
             }
-            else if (allConstituentTypesHaveKind(type, TypeFlags.Tuple)) {
+            else if (isTypeOfKind(type, TypeFlags.Tuple)) {
                 return TypeReferenceSerializationKind.ArrayLikeType;
             }
-            else if (allConstituentTypesHaveKind(type, TypeFlags.ESSymbol)) {
+            else if (isTypeOfKind(type, TypeFlags.ESSymbol)) {
                 return TypeReferenceSerializationKind.ESSymbolType;
             }
             else if (isFunctionType(type)) {
@@ -15935,27 +17038,74 @@ namespace ts {
         }
 
         function writeTypeOfExpression(expr: Expression, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter) {
-            const type = getTypeOfExpression(expr);
+            const type = getWidenedType(getTypeOfExpression(expr));
             getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags);
         }
 
+        function writeBaseConstructorTypeOfClass(node: ClassLikeDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter) {
+            const classType = <InterfaceType>getDeclaredTypeOfSymbol(getSymbolOfNode(node));
+            resolveBaseTypesOfClass(classType);
+            const baseType = classType.resolvedBaseTypes.length ? classType.resolvedBaseTypes[0] : unknownType;
+            getSymbolDisplayBuilder().buildTypeDisplay(baseType, writer, enclosingDeclaration, flags);
+        }
+
         function hasGlobalName(name: string): boolean {
             return hasProperty(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 = getSourceTreeNodeOfType(reference, isIdentifier);
+                if (reference) {
+                    const symbol = getReferencedValueSymbol(reference);
+                    if (symbol) {
+                        return getExportSymbolOfValueSymbolIfExported(symbol).valueDeclaration;
+                    }
+                }
+            }
+
+            return undefined;
         }
 
         function createResolver(): EmitResolver {
+            // this variable and functions that use it are deliberately moved here from the outer scope
+            // to avoid scope pollution
+            const resolvedTypeReferenceDirectives = host.getResolvedTypeReferenceDirectives();
+            let fileToDirective: FileMap<string>;
+            if (resolvedTypeReferenceDirectives) {
+                // populate reverse mapping: file path -> type reference directive that was resolved to this file
+                fileToDirective = createFileMap<string>();
+                for (const key in resolvedTypeReferenceDirectives) {
+                    if (!hasProperty(resolvedTypeReferenceDirectives, key)) {
+                        continue;
+                    }
+                    const resolvedDirective = resolvedTypeReferenceDirectives[key];
+                    if (!resolvedDirective) {
+                        continue;
+                    }
+                    const file = host.getSourceFile(resolvedDirective.resolvedFileName);
+                    fileToDirective.set(file.path, key);
+                }
+            }
             return {
                 getReferencedExportContainer,
                 getReferencedImportDeclaration,
@@ -15971,6 +17121,7 @@ namespace ts {
                 writeTypeOfDeclaration,
                 writeReturnTypeOfSignatureDeclaration,
                 writeTypeOfExpression,
+                writeBaseConstructorTypeOfClass,
                 isSymbolAccessible,
                 isEntityNameVisible,
                 getConstantValue,
@@ -15980,8 +17131,84 @@ namespace ts {
                 isOptionalParameter,
                 moduleExportsSomeValue,
                 isArgumentsLocalBinding,
-                getExternalModuleFileFromDeclaration
+                getExternalModuleFileFromDeclaration,
+                getTypeReferenceDirectivesForEntityName,
+                getTypeReferenceDirectivesForSymbol
             };
+
+            // defined here to avoid outer scope pollution
+            function getTypeReferenceDirectivesForEntityName(node: EntityName | PropertyAccessExpression): string[] {
+                // program does not have any files with type reference directives - bail out
+                if (!fileToDirective) {
+                    return undefined;
+                }
+                // property access can only be used as values
+                // qualified names can only be used as types\namespaces
+                // identifiers are treated as values only if they appear in type queries
+                const meaning = (node.kind === SyntaxKind.PropertyAccessExpression) || (node.kind === SyntaxKind.Identifier && isInTypeQuery(node))
+                    ? SymbolFlags.Value | SymbolFlags.ExportValue
+                    : SymbolFlags.Type | SymbolFlags.Namespace;
+
+                const symbol = resolveEntityName(node, meaning, /*ignoreErrors*/true);
+                return symbol && symbol !== unknownSymbol ? getTypeReferenceDirectivesForSymbol(symbol, meaning) : undefined;
+            }
+
+            // defined here to avoid outer scope pollution
+            function getTypeReferenceDirectivesForSymbol(symbol: Symbol, meaning?: SymbolFlags): string[] {
+                // program does not have any files with type reference directives - bail out
+                if (!fileToDirective) {
+                    return undefined;
+                }
+                if (!isSymbolFromTypeDeclarationFile(symbol)) {
+                    return undefined;
+                }
+                // check what declarations in the symbol can contribute to the target meaning
+                let typeReferenceDirectives: string[];
+                for (const decl of symbol.declarations) {
+                    // check meaning of the local symbol to see if declaration needs to be analyzed further
+                    if (decl.symbol && decl.symbol.flags & meaning) {
+                        const file = getSourceFileOfNode(decl);
+                        const typeReferenceDirective = fileToDirective.get(file.path);
+                        if (typeReferenceDirective) {
+                            (typeReferenceDirectives || (typeReferenceDirectives = [])).push(typeReferenceDirective);
+                        }
+                    }
+                }
+                return typeReferenceDirectives;
+            }
+
+            function isSymbolFromTypeDeclarationFile(symbol: Symbol): boolean {
+                // bail out if symbol does not have associated declarations (i.e. this is transient symbol created for property in binding pattern)
+                if (!symbol.declarations) {
+                    return false;
+                }
+
+                // walk the parent chain for symbols to make sure that top level parent symbol is in the global scope
+                // external modules cannot define or contribute to type declaration files
+                let current =  symbol;
+                while (true) {
+                    const parent = getParentOfSymbol(current);
+                    if (parent) {
+                        current = parent;
+                    }
+                    else {
+                        break;
+                    }
+                }
+
+                if (current.valueDeclaration && current.valueDeclaration.kind === SyntaxKind.SourceFile && current.flags & SymbolFlags.ValueModule) {
+                    return false;
+                }
+
+                // check that at least one declaration of top level symbol originates from type declaration file
+                for (const decl of symbol.declarations) {
+                    const file = getSourceFileOfNode(decl);
+                    if (fileToDirective.contains(file.path)) {
+                        return true;
+                    }
+                }
+                return false;
+            }
         }
 
         function getExternalModuleFileFromDeclaration(declaration: ImportEqualsDeclaration | ImportDeclaration | ExportDeclaration | ModuleDeclaration): SourceFile {
@@ -16008,6 +17235,9 @@ namespace ts {
                 if (file.moduleAugmentations.length) {
                     (augmentations || (augmentations = [])).push(file.moduleAugmentations);
                 }
+                if (file.wasReferenced && file.symbol && file.symbol.globalExports) {
+                    mergeSymbolTable(globals, file.symbol.globalExports);
+                }
             });
 
             if (augmentations) {
@@ -16035,12 +17265,14 @@ namespace ts {
             globalNumberType = getGlobalType("Number");
             globalBooleanType = getGlobalType("Boolean");
             globalRegExpType = getGlobalType("RegExp");
+
             jsxElementType = getExportedTypeFromNamespace("JSX", JsxNames.Element);
             getGlobalClassDecoratorType = memoize(() => getGlobalType("ClassDecorator"));
             getGlobalPropertyDecoratorType = memoize(() => getGlobalType("PropertyDecorator"));
             getGlobalMethodDecoratorType = memoize(() => getGlobalType("MethodDecorator"));
             getGlobalParameterDecoratorType = memoize(() => getGlobalType("ParameterDecorator"));
             getGlobalTypedPropertyDescriptorType = memoize(() => getGlobalType("TypedPropertyDescriptor", /*arity*/ 1));
+            getGlobalESSymbolConstructorSymbol = memoize(() => getGlobalValueSymbol("Symbol"));
             getGlobalPromiseType = memoize(() => getGlobalType("Promise", /*arity*/ 1));
             tryGetGlobalPromiseType = memoize(() => getGlobalSymbol("Promise", SymbolFlags.Type, /*diagnostic*/ undefined) && getGlobalPromiseType());
             getGlobalPromiseLikeType = memoize(() => getGlobalType("PromiseLike", /*arity*/ 1));
@@ -16049,27 +17281,19 @@ namespace ts {
             getGlobalPromiseConstructorLikeType = memoize(() => getGlobalType("PromiseConstructorLike"));
             getGlobalThenableType = memoize(createThenableType);
 
-            // If we're in ES6 mode, load the TemplateStringsArray.
-            // Otherwise, default to 'unknown' for the purposes of type checking in LS scenarios.
+            getGlobalTemplateStringsArrayType = memoize(() => getGlobalType("TemplateStringsArray"));
+
             if (languageVersion >= ScriptTarget.ES6) {
-                globalTemplateStringsArrayType = getGlobalType("TemplateStringsArray");
-                globalESSymbolType = getGlobalType("Symbol");
-                globalESSymbolConstructorSymbol = getGlobalValueSymbol("Symbol");
-                globalIterableType = <GenericType>getGlobalType("Iterable", /*arity*/ 1);
-                globalIteratorType = <GenericType>getGlobalType("Iterator", /*arity*/ 1);
-                globalIterableIteratorType = <GenericType>getGlobalType("IterableIterator", /*arity*/ 1);
+                getGlobalESSymbolType = memoize(() => getGlobalType("Symbol"));
+                getGlobalIterableType = memoize(() => <GenericType>getGlobalType("Iterable", /*arity*/ 1));
+                getGlobalIteratorType = memoize(() => <GenericType>getGlobalType("Iterator", /*arity*/ 1));
+                getGlobalIterableIteratorType = memoize(() => <GenericType>getGlobalType("IterableIterator", /*arity*/ 1));
             }
             else {
-                globalTemplateStringsArrayType = unknownType;
-
-                // Consider putting Symbol interface in lib.d.ts. On the plus side, putting it in lib.d.ts would make it
-                // extensible for Polyfilling Symbols. But putting it into lib.d.ts could also break users that have
-                // a global Symbol already, particularly if it is a class.
-                globalESSymbolType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
-                globalESSymbolConstructorSymbol = undefined;
-                globalIterableType = emptyGenericType;
-                globalIteratorType = emptyGenericType;
-                globalIterableIteratorType = emptyGenericType;
+                getGlobalESSymbolType = memoize(() => emptyObjectType);
+                getGlobalIterableType = memoize(() => emptyGenericType);
+                getGlobalIteratorType = memoize(() => emptyGenericType);
+                getGlobalIterableIteratorType = memoize(() => emptyGenericType);
             }
 
             anyArrayType = createArrayType(anyType);
@@ -16169,7 +17393,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) {
@@ -16188,35 +17412,31 @@ namespace ts {
                     case SyntaxKind.PublicKeyword:
                     case SyntaxKind.ProtectedKeyword:
                     case SyntaxKind.PrivateKeyword:
-                        let text: string;
-                        if (modifier.kind === SyntaxKind.PublicKeyword) {
-                            text = "public";
-                        }
-                        else if (modifier.kind === SyntaxKind.ProtectedKeyword) {
-                            text = "protected";
+                        let text = visibilityToString(modifierToFlag(modifier.kind));
+
+                        if (modifier.kind === SyntaxKind.ProtectedKeyword) {
                             lastProtected = modifier;
                         }
-                        else {
-                            text = "private";
+                        else if (modifier.kind === SyntaxKind.PrivateKeyword) {
                             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");
                             }
@@ -16228,13 +17448,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) {
@@ -16243,35 +17463,35 @@ 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) {
                             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) {
@@ -16280,14 +17500,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) {
@@ -16299,76 +17519,73 @@ 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) {
-                            if (node.kind !== SyntaxKind.MethodDeclaration) {
-                                return grammarErrorOnNode(modifier, Diagnostics.abstract_modifier_can_only_appear_on_a_class_or_method_declaration);
+                            if (node.kind !== SyntaxKind.MethodDeclaration &&
+                                node.kind !== SyntaxKind.PropertyDeclaration &&
+                                node.kind !== SyntaxKind.GetAccessor &&
+                                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.Protected) {
-                    return grammarErrorOnNode(lastProtected, Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "protected");
-                }
-                else if (flags & NodeFlags.Private) {
-                    return grammarErrorOnNode(lastPrivate, Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "private");
-                }
-                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.AccessibilityModifier) && isBindingPattern((<ParameterDeclaration>node).name)) {
+            else if (node.kind === SyntaxKind.Parameter && (flags & ModifierFlags.AccessibilityModifier) && isBindingPattern((<ParameterDeclaration>node).name)) {
                 return grammarErrorOnNode(node, Diagnostics.A_parameter_property_may_not_be_a_binding_pattern);
             }
-            if (flags & NodeFlags.Async) {
+            if (flags & ModifierFlags.Async) {
                 return checkGrammarAsyncModifier(node, lastAsync);
             }
         }
@@ -16485,7 +17702,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) {
@@ -16653,8 +17870,8 @@ namespace ts {
             const seen: Map<SymbolFlags> = {};
             const Property = 1;
             const GetAccessor = 2;
-            const SetAccesor = 4;
-            const GetOrSetAccessor = GetAccessor | SetAccesor;
+            const SetAccessor = 4;
+            const GetOrSetAccessor = GetAccessor | SetAccessor;
 
             for (const prop of node.properties) {
                 const name = prop.name;
@@ -16680,7 +17897,7 @@ namespace ts {
                     }
                 }
 
-                // ECMA-262 11.1.5 Object Initialiser
+                // 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
                 // a.This production is contained in strict code and IsDataDescriptor(previous) is true and
                 // IsDataDescriptor(propId.descriptor) is true.
@@ -16690,7 +17907,7 @@ namespace ts {
                 // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
                 let currentKind: number;
                 if (prop.kind === SyntaxKind.PropertyAssignment || prop.kind === SyntaxKind.ShorthandPropertyAssignment) {
-                    // Grammar checking for computedPropertName and shorthandPropertyAssignment
+                    // 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(<NumericLiteral>name);
@@ -16704,7 +17921,7 @@ namespace ts {
                     currentKind = GetAccessor;
                 }
                 else if (prop.kind === SyntaxKind.SetAccessor) {
-                    currentKind = SetAccesor;
+                    currentKind = SetAccessor;
                 }
                 else {
                     Debug.fail("Unexpected syntax kind:" + prop.kind);
@@ -16811,7 +18028,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) {
+            else if (accessor.body === undefined && !(getModifierFlags(accessor) & ModifierFlags.Abstract)) {
                 return grammarErrorAtPos(getSourceFileOfNode(accessor), accessor.end - 1, ";".length, Diagnostics._0_expected, "{");
             }
             else if (accessor.typeParameters) {
@@ -16832,7 +18049,7 @@ namespace ts {
                     if (parameter.dotDotDotToken) {
                         return grammarErrorOnNode(parameter.dotDotDotToken, Diagnostics.A_set_accessor_cannot_have_rest_parameter);
                     }
-                    else if (parameter.flags & NodeFlags.Modifier) {
+                    else if (getModifierFlags(parameter) !== 0) {
                         return grammarErrorOnNode(accessor.name, Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                     }
                     else if (parameter.questionToken) {
@@ -17138,8 +18355,7 @@ namespace ts {
                 node.kind === SyntaxKind.ImportEqualsDeclaration ||
                 node.kind === SyntaxKind.ExportDeclaration ||
                 node.kind === SyntaxKind.ExportAssignment ||
-                (node.flags & NodeFlags.Ambient) ||
-                (node.flags & (NodeFlags.Export | NodeFlags.Default))) {
+                getModifierFlags(node) & (ModifierFlags.Ambient | ModifierFlags.Export | ModifierFlags.Default)) {
 
                 return false;
             }
@@ -17176,7 +18392,7 @@ namespace ts {
 
                 // We are either parented by another statement, or some sort of block.
                 // If we're in a block, we only want to really report an error once
-                // to prevent noisyness.  So use a bit on the block to indicate if
+                // to prevent noisiness.  So use a bit on the block to indicate if
                 // this has already been reported, and don't report if it has.
                 //
                 if (node.parent.kind === SyntaxKind.Block || node.parent.kind === SyntaxKind.ModuleBlock || node.parent.kind === SyntaxKind.SourceFile) {
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index cc2806f93c1..fef057b9107 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -17,6 +17,12 @@ namespace ts {
             type: "boolean",
             description: Diagnostics.Generates_corresponding_d_ts_file,
         },
+        {
+            name: "declarationDir",
+            type: "string",
+            isFilePath: true,
+            paramType: Diagnostics.DIRECTORY,
+        },
         {
             name: "diagnostics",
             type: "boolean",
@@ -52,12 +58,11 @@ namespace ts {
             },
             paramType: Diagnostics.KIND,
             description: Diagnostics.Specify_JSX_code_generation_Colon_preserve_or_react,
-            error: Diagnostics.Argument_for_jsx_must_be_preserve_or_react
         },
         {
             name: "reactNamespace",
             type: "string",
-            description: Diagnostics.Specifies_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit
+            description: Diagnostics.Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit
         },
         {
             name: "listFiles",
@@ -71,13 +76,14 @@ namespace ts {
             name: "mapRoot",
             type: "string",
             isFilePath: true,
-            description: Diagnostics.Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations,
+            description: Diagnostics.Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations,
             paramType: Diagnostics.LOCATION,
         },
         {
             name: "module",
             shortName: "m",
             type: {
+                "none": ModuleKind.None,
                 "commonjs": ModuleKind.CommonJS,
                 "amd": ModuleKind.AMD,
                 "system": ModuleKind.System,
@@ -87,7 +93,6 @@ namespace ts {
             },
             description: Diagnostics.Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015,
             paramType: Diagnostics.KIND,
-            error: Diagnostics.Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015
         },
         {
             name: "newLine",
@@ -95,9 +100,8 @@ namespace ts {
                 "crlf": NewLineKind.CarriageReturnLineFeed,
                 "lf": NewLineKind.LineFeed
             },
-            description: Diagnostics.Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix,
+            description: Diagnostics.Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix,
             paramType: Diagnostics.NEWLINE,
-            error: Diagnostics.Argument_for_newLine_option_must_be_CRLF_or_LF
         },
         {
             name: "noEmit",
@@ -118,6 +122,11 @@ namespace ts {
             type: "boolean",
             description: Diagnostics.Raise_error_on_expressions_and_declarations_with_an_implied_any_type,
         },
+        {
+            name: "noImplicitThis",
+            type: "boolean",
+            description: Diagnostics.Raise_error_on_this_expressions_with_an_implied_any_type,
+        },
         {
             name: "noLib",
             type: "boolean",
@@ -158,7 +167,6 @@ namespace ts {
         },
         {
             name: "pretty",
-            paramType: Diagnostics.KIND,
             description: Diagnostics.Stylize_errors_and_messages_using_color_and_context_experimental,
             type: "boolean"
         },
@@ -179,8 +187,8 @@ namespace ts {
             name: "rootDir",
             type: "string",
             isFilePath: true,
-            description: Diagnostics.Specifies_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir,
             paramType: Diagnostics.LOCATION,
+            description: Diagnostics.Specify_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir,
         },
         {
             name: "isolatedModules",
@@ -195,7 +203,7 @@ namespace ts {
             name: "sourceRoot",
             type: "string",
             isFilePath: true,
-            description: Diagnostics.Specifies_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations,
+            description: Diagnostics.Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations,
             paramType: Diagnostics.LOCATION,
         },
         {
@@ -224,9 +232,8 @@ namespace ts {
                 "es6": ScriptTarget.ES6,
                 "es2015": ScriptTarget.ES2015,
             },
-            description: Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_experimental,
+            description: Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015,
             paramType: Diagnostics.VERSION,
-            error: Diagnostics.Argument_for_target_option_must_be_ES3_ES5_or_ES2015
         },
         {
             name: "version",
@@ -257,8 +264,7 @@ namespace ts {
                 "node": ModuleResolutionKind.NodeJs,
                 "classic": ModuleResolutionKind.Classic,
             },
-            description: Diagnostics.Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6,
-            error: Diagnostics.Argument_for_moduleResolution_option_must_be_node_or_classic,
+            description: Diagnostics.Specify_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6,
         },
         {
             name: "allowUnusedLabels",
@@ -302,14 +308,41 @@ namespace ts {
             // this option can only be specified in tsconfig.json
             // use type = object to copy the value as-is
             name: "rootDirs",
-            type: "object",
+            type: "list",
             isTSConfigOnly: true,
-            isFilePath: true
+            element: {
+                name: "rootDirs",
+                type: "string",
+                isFilePath: true
+            }
         },
         {
-            name: "traceModuleResolution",
+            name: "typesSearchPaths",
+            type: "list",
+            isTSConfigOnly: true,
+            element: {
+                name: "typesSearchPaths",
+                type: "string",
+                isFilePath: true
+            }
+        },
+        {
+            name: "typesRoot",
+            type: "string"
+        },
+        {
+            name: "types",
+            type: "list",
+            element: {
+                name: "types",
+                type: "string"
+            },
+            description: Diagnostics.Type_declaration_files_to_be_included_in_compilation
+        },
+        {
+            name: "traceResolution",
             type: "boolean",
-            description: Diagnostics.Enable_tracing_of_the_module_resolution_process
+            description: Diagnostics.Enable_tracing_of_the_name_resolution_process
         },
         {
             name: "allowJs",
@@ -322,11 +355,79 @@ namespace ts {
             description: Diagnostics.Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking
         },
         {
-            // this option will be removed when this is merged with master and exists solely
-            // to enable the tree transforming emitter side-by-side with the existing emitter.
-            name: "experimentalTransforms",
+            name: "noImplicitUseStrict",
             type: "boolean",
-            experimental: true
+            description: Diagnostics.Do_not_emit_use_strict_directives_in_module_output
+        },
+        {
+            name: "useLegacyEmitter",
+            type: "boolean",
+            experimental: true,
+            description: Diagnostics.Use_the_legacy_emitter_instead_of_the_transforming_emitter
+        },
+        {
+            name: "listEmittedFiles",
+            type: "boolean"
+        },
+        {
+            name: "lib",
+            type: "list",
+            element: {
+                name: "lib",
+                type: {
+                    // JavaScript only
+                    "es5": "lib.es5.d.ts",
+                    "es6": "lib.es2015.d.ts",
+                    "es2015": "lib.es2015.d.ts",
+                    "es7": "lib.es2016.d.ts",
+                    "es2016": "lib.es2016.d.ts",
+                    // Host only
+                    "dom": "lib.dom.d.ts",
+                    "webworker": "lib.webworker.d.ts",
+                    "scripthost": "lib.scripthost.d.ts",
+                    // ES2015 Or ESNext By-feature options
+                    "es2015.core": "lib.es2015.core.d.ts",
+                    "es2015.collection": "lib.es2015.collection.d.ts",
+                    "es2015.generator": "lib.es2015.generator.d.ts",
+                    "es2015.iterable": "lib.es2015.iterable.d.ts",
+                    "es2015.promise": "lib.es2015.promise.d.ts",
+                    "es2015.proxy": "lib.es2015.proxy.d.ts",
+                    "es2015.reflect": "lib.es2015.reflect.d.ts",
+                    "es2015.symbol": "lib.es2015.symbol.d.ts",
+                    "es2015.symbol.wellknown": "lib.es2015.symbol.wellknown.d.ts",
+                    "es2016.array.include": "lib.es2016.array.include.d.ts"
+                },
+            },
+            description: Diagnostics.Specify_library_files_to_be_included_in_the_compilation_Colon
+        },
+        {
+            name: "strictNullChecks",
+            type: "boolean",
+            description: Diagnostics.Enable_strict_null_checks
+        }
+    ];
+
+    /* @internal */
+    export let typingOptionDeclarations: CommandLineOption[] = [
+        {
+            name: "enableAutoDiscovery",
+            type: "boolean",
+        },
+        {
+            name: "include",
+            type: "list",
+            element: {
+                name: "include",
+                type: "string"
+            }
+        },
+        {
+            name: "exclude",
+            type: "list",
+            element: {
+                name: "exclude",
+                type: "string"
+            }
         }
     ];
 
@@ -337,6 +438,7 @@ namespace ts {
     }
 
     let optionNameMapCache: OptionNameMap;
+
     /* @internal */
     export function getOptionNameMap(): OptionNameMap {
         if (optionNameMapCache) {
@@ -356,6 +458,42 @@ namespace ts {
         return optionNameMapCache;
     }
 
+    /* @internal */
+    export function createCompilerDiagnosticForInvalidCustomType(opt: CommandLineOptionOfCustomType): Diagnostic {
+        const namesOfType: string[] = [];
+        forEachKey(opt.type, key => {
+            namesOfType.push(` '${key}'`);
+        });
+
+        return createCompilerDiagnostic(Diagnostics.Argument_for_0_option_must_be_Colon_1, `--${opt.name}`, namesOfType);
+    }
+
+    /* @internal */
+    export function parseCustomTypeOption(opt: CommandLineOptionOfCustomType, value: string, errors: Diagnostic[]) {
+        const key = (value || "").trim().toLowerCase();
+        const map = opt.type;
+        if (hasProperty(map, key)) {
+            return map[key];
+        }
+        else {
+            errors.push(createCompilerDiagnosticForInvalidCustomType(opt));
+        }
+    }
+
+    /* @internal */
+    export function parseListTypeOption(opt: CommandLineOptionOfListType, value: string, errors: Diagnostic[]): (string | number)[] {
+        const values = (value || "").trim().split(",");
+        switch (opt.element.type) {
+            case "number":
+                return ts.map(values, parseInt);
+            case "string":
+                return ts.map(values, v => v || "");
+            default:
+                return filter(map(values, v => parseCustomTypeOption(<CommandLineOptionOfCustomType>opt.element, v, errors)), v => !!v);
+        }
+    }
+
+    /* @internal */
     export function parseCommandLine(commandLine: string[], readFile?: (path: string) => string): ParsedCommandLine {
         const options: CompilerOptions = {};
         const fileNames: string[] = [];
@@ -409,17 +547,15 @@ namespace ts {
                                     options[opt.name] = args[i] || "";
                                     i++;
                                     break;
+                                case "list":
+                                    options[opt.name] = parseListTypeOption(<CommandLineOptionOfListType>opt, args[i], errors);
+                                    i++;
+                                    break;
                                 // If not a primitive, the possible types are specified in what is effectively a map of options.
                                 default:
-                                    let map = <Map<number>>opt.type;
-                                    let key = (args[i] || "").toLowerCase();
+                                    options[opt.name] = parseCustomTypeOption(<CommandLineOptionOfCustomType>opt, args[i], errors);
                                     i++;
-                                    if (hasProperty(map, key)) {
-                                        options[opt.name] = map[key];
-                                    }
-                                    else {
-                                        errors.push(createCompilerDiagnostic((<CommandLineOptionOfCustomType>opt).error));
-                                    }
+                                    break;
                             }
                         }
                     }
@@ -497,7 +633,6 @@ namespace ts {
         }
     }
 
-
     /**
      * Remove the comments from a json like text.
      * Comments can be single line comments (starting with # or //) or multiline comments using / * * /
@@ -531,20 +666,25 @@ namespace ts {
       *    file to. e.g. outDir
       */
     export function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions: CompilerOptions = {}, configFileName?: string): ParsedCommandLine {
-        const { options: optionsFromJsonConfigFile, errors } = convertCompilerOptionsFromJson(json["compilerOptions"], basePath, configFileName);
+        const errors: Diagnostic[] = [];
+        const compilerOptions: CompilerOptions = convertCompilerOptionsFromJsonWorker(json["compilerOptions"], basePath, errors, configFileName);
+        const options = extend(existingOptions, compilerOptions);
+        const typingOptions: TypingOptions = convertTypingOptionsFromJsonWorker(json["typingOptions"], basePath, errors, configFileName);
+        options.configFilePath = configFileName;
 
-        const options = extend(existingOptions, optionsFromJsonConfigFile);
+        const fileNames = getFileNames(errors);
 
         return {
             options,
-            fileNames: getFileNames(),
+            fileNames,
+            typingOptions,
             errors
         };
 
-        function getFileNames(): string[] {
+        function getFileNames(errors: Diagnostic[]): string[] {
             let fileNames: string[] = [];
             if (hasProperty(json, "files")) {
-                if (json["files"] instanceof Array) {
+                if (isArray(json["files"])) {
                     fileNames = map(<string[]>json["files"], s => combinePaths(basePath, s));
                 }
                 else {
@@ -553,7 +693,21 @@ namespace ts {
             }
             else {
                 const filesSeen: Map<boolean> = {};
-                const exclude = json["exclude"] instanceof Array ? map(<string[]>json["exclude"], normalizeSlashes) : undefined;
+
+                let exclude: string[] = [];
+                if (isArray(json["exclude"])) {
+                    exclude = json["exclude"];
+                }
+                else {
+                    // by default exclude node_modules, and any specificied output directory
+                    exclude = ["node_modules"];
+                    const outDir = json["compilerOptions"] && json["compilerOptions"]["outDir"];
+                    if (outDir) {
+                        exclude.push(outDir);
+                    }
+                }
+                exclude = map(exclude, normalizeSlashes);
+
                 const supportedExtensions = getSupportedExtensions(options);
                 Debug.assert(indexOf(supportedExtensions, ".ts") < indexOf(supportedExtensions, ".d.ts"), "Changed priority of extensions to pick");
 
@@ -567,6 +721,11 @@ namespace ts {
                             continue;
                         }
 
+                        // Skip over any minified JavaScript files (ending in ".min.js")
+                        if (/\.min\.js$/.test(fileName)) {
+                            continue;
+                        }
+
                         // If this is one of the output extension (which would be .d.ts and .js if we are allowing compilation of js files)
                         // do not include this file if we included .ts or .tsx file with same base name as it could be output of the earlier compilation
                         if (extension === ".d.ts" || (options.allowJs && contains(supportedJavascriptExtensions, extension))) {
@@ -581,21 +740,48 @@ namespace ts {
                     }
                 }
             }
+            if (hasProperty(json, "excludes") && !hasProperty(json, "exclude")) {
+                errors.push(createCompilerDiagnostic(Diagnostics.Unknown_option_excludes_Did_you_mean_exclude));
+            }
             return fileNames;
         }
     }
 
     export function convertCompilerOptionsFromJson(jsonOptions: any, basePath: string, configFileName?: string): { options: CompilerOptions, errors: Diagnostic[] } {
-        const options: CompilerOptions = {};
         const errors: Diagnostic[] = [];
+        const options = convertCompilerOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName);
+        return { options, errors };
+    }
 
-        if (configFileName && getBaseFileName(configFileName) === "jsconfig.json") {
-            options.module = ModuleKind.CommonJS;
-            options.allowJs = true;
-        }
+    export function convertTypingOptionsFromJson(jsonOptions: any, basePath: string, configFileName?: string): { options: CompilerOptions, errors: Diagnostic[] } {
+        const errors: Diagnostic[] = [];
+        const options = convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName);
+        return { options, errors };
+    }
+
+    function convertCompilerOptionsFromJsonWorker(jsonOptions: any,
+        basePath: string, errors: Diagnostic[], configFileName?: string): CompilerOptions {
+
+        const options: CompilerOptions = getBaseFileName(configFileName) === "jsconfig.json" ? { allowJs: true } : {};
+        convertOptionsFromJson(optionDeclarations, jsonOptions, basePath, options, Diagnostics.Unknown_compiler_option_0, errors);
+        return options;
+    }
+
+    function convertTypingOptionsFromJsonWorker(jsonOptions: any,
+        basePath: string, errors: Diagnostic[], configFileName?: string): TypingOptions {
+
+        const options: TypingOptions = getBaseFileName(configFileName) === "jsconfig.json"
+            ? { enableAutoDiscovery: true, include: [], exclude: [] }
+            : { enableAutoDiscovery: false, include: [], exclude: [] };
+        convertOptionsFromJson(typingOptionDeclarations, jsonOptions, basePath, options, Diagnostics.Unknown_typing_option_0, errors);
+        return options;
+    }
+
+    function convertOptionsFromJson(optionDeclarations: CommandLineOption[], jsonOptions: any, basePath: string,
+        defaultOptions: CompilerOptions | TypingOptions, diagnosticMessage: DiagnosticMessage, errors: Diagnostic[]) {
 
         if (!jsonOptions) {
-            return { options, errors };
+            return ;
         }
 
         const optionNameMap = arrayToMap(optionDeclarations, opt => opt.name);
@@ -603,66 +789,50 @@ namespace ts {
         for (const id in jsonOptions) {
             if (hasProperty(optionNameMap, id)) {
                 const opt = optionNameMap[id];
-                const optType = opt.type;
-                let value = jsonOptions[id];
-                const expectedType = typeof optType === "string" ? optType : "string";
-                if (typeof value === expectedType) {
-                    if (typeof optType !== "string") {
-                        const key = value.toLowerCase();
-                        if (hasProperty(optType, key)) {
-                            value = optType[key];
-                        }
-                        else {
-                            errors.push(createCompilerDiagnostic((<CommandLineOptionOfCustomType>opt).error));
-                            value = 0;
-                        }
-                    }
-                    if (opt.isFilePath) {
-                        switch (typeof value) {
-                            case "string":
-                                value = normalizePath(combinePaths(basePath, value));
-                                break;
-                            case "object":
-                                // "object" options with 'isFilePath' = true expected to be string arrays
-                                let paths: string[] = [];
-                                let invalidOptionType = false;
-                                if (!isArray(value)) {
-                                    invalidOptionType = true;
-                                }
-                                else {
-                                    for (const element of <any[]>value) {
-                                        if (typeof element === "string") {
-                                            paths.push(normalizePath(combinePaths(basePath, element)));
-                                        }
-                                        else {
-                                            invalidOptionType = true;
-                                            break;
-                                        }
-                                    }
-                                }
-                                if (invalidOptionType) {
-                                    errors.push(createCompilerDiagnostic(Diagnostics.Option_0_should_have_array_of_strings_as_a_value, opt.name));
-                                }
-                                else {
-                                    value = paths;
-                                }
-                                break;
-                        }
-                        if (value === "") {
-                            value = ".";
-                        }
-                    }
-                    options[opt.name] = value;
-                }
-                else {
-                    errors.push(createCompilerDiagnostic(Diagnostics.Compiler_option_0_requires_a_value_of_type_1, id, expectedType));
-                }
+                defaultOptions[opt.name] = convertJsonOption(opt, jsonOptions[id], basePath, errors);
             }
             else {
-                errors.push(createCompilerDiagnostic(Diagnostics.Unknown_compiler_option_0, id));
+                errors.push(createCompilerDiagnostic(diagnosticMessage, id));
             }
         }
+    }
 
-        return { options, errors };
+    function convertJsonOption(opt: CommandLineOption, value: any, basePath: string, errors: Diagnostic[]): CompilerOptionsValue {
+        const optType = opt.type;
+        const expectedType = typeof optType === "string" ? optType : "string";
+        if (optType === "list" && isArray(value)) {
+            return convertJsonOptionOfListType(<CommandLineOptionOfListType>opt, value, basePath, errors);
+        }
+        else if (typeof value === expectedType) {
+            if (typeof optType !== "string") {
+                return convertJsonOptionOfCustomType(<CommandLineOptionOfCustomType>opt, value, errors);
+            }
+            else {
+                if (opt.isFilePath) {
+                    value = normalizePath(combinePaths(basePath, value));
+                    if (value === "") {
+                        value = ".";
+                    }
+                }
+            }
+            return value;
+        }
+        else {
+            errors.push(createCompilerDiagnostic(Diagnostics.Compiler_option_0_requires_a_value_of_type_1, opt.name, expectedType));
+        }
+    }
+
+    function convertJsonOptionOfCustomType(opt: CommandLineOptionOfCustomType, value: string, errors: Diagnostic[]) {
+        const key = value.toLowerCase();
+        if (hasProperty(opt.type, key)) {
+            return opt.type[key];
+        }
+        else {
+            errors.push(createCompilerDiagnosticForInvalidCustomType(opt));
+        }
+    }
+
+    function convertJsonOptionOfListType(option: CommandLineOptionOfListType, values: any[], basePath: string, errors: Diagnostic[]): any[] {
+        return filter(map(values, v => convertJsonOption(option.element, v, basePath, errors)), v => !!v);
     }
 }
diff --git a/src/compiler/comments.ts b/src/compiler/comments.ts
index a680d01e102..343b388ffe2 100644
--- a/src/compiler/comments.ts
+++ b/src/compiler/comments.ts
@@ -5,15 +5,19 @@ namespace ts {
     export interface CommentWriter {
         reset(): void;
         setSourceFile(sourceFile: SourceFile): void;
-        getLeadingComments(range: Node, getAdditionalRange?: (range: Node) => Node): CommentRange[];
         getLeadingComments(range: TextRange): CommentRange[];
+        getLeadingComments(range: TextRange, contextNode: Node, ignoreNodeCallback: (contextNode: Node) => boolean, getTextRangeCallback: (contextNode: Node) => TextRange): CommentRange[];
         getLeadingCommentsOfPosition(pos: number): CommentRange[];
-        getTrailingComments(range: Node, getAdditionalRange?: (range: Node) => Node): CommentRange[];
         getTrailingComments(range: TextRange): CommentRange[];
+        getTrailingComments(range: TextRange, contextNode: Node, ignoreNodeCallback: (contextNode: Node) => boolean, getTextRangeCallback: (contextNode: Node) => TextRange): CommentRange[];
         getTrailingCommentsOfPosition(pos: number): CommentRange[];
-        emitLeadingComments(range: TextRange, comments?: CommentRange[]): void;
-        emitTrailingComments(range: TextRange, comments?: CommentRange[]): void;
-        emitDetachedComments(range: TextRange): void;
+        emitLeadingComments(range: TextRange, comments: CommentRange[]): void;
+        emitLeadingComments(range: TextRange, comments: CommentRange[], contextNode: Node, getTextRangeCallback: (contextNode: Node) => TextRange): void;
+        emitTrailingComments(range: TextRange, comments: CommentRange[]): void;
+        emitLeadingDetachedComments(range: TextRange): void;
+        emitLeadingDetachedComments(range: TextRange, contextNode: Node, ignoreNodeCallback: (contextNode: Node) => boolean): void;
+        emitTrailingDetachedComments(range: TextRange): void;
+        emitTrailingDetachedComments(range: TextRange, contextNode: Node, ignoreNodeCallback: (contextNode: Node) => boolean): void;
     }
 
     export function createCommentWriter(host: EmitHost, writer: EmitTextWriter, sourceMap: SourceMapWriter): CommentWriter {
@@ -40,16 +44,21 @@ namespace ts {
             return {
                 reset,
                 setSourceFile,
-                getLeadingComments(range: TextRange, getAdditionalRange?: (range: TextRange) => TextRange): CommentRange[] { return undefined; },
+                getLeadingComments(range: TextRange, contextNode?: Node, ignoreNodeCallback?: (contextNode: Node) => boolean, getTextRangeCallback?: (contextNode: Node) => TextRange): CommentRange[] { return undefined; },
                 getLeadingCommentsOfPosition(pos: number): CommentRange[] { return undefined; },
-                getTrailingComments(range: TextRange, getAdditionalRange?: (range: TextRange) => TextRange): CommentRange[] { return undefined; },
+                getTrailingComments(range: TextRange, contextNode?: Node, ignoreNodeCallback?: (contextNode: Node) => boolean, getTextRangeCallback?: (contextNode: Node) => TextRange): CommentRange[] { return undefined; },
                 getTrailingCommentsOfPosition(pos: number): CommentRange[] { return undefined; },
-                emitLeadingComments(range: TextRange, comments?: CommentRange[]): void { },
-                emitTrailingComments(range: TextRange, comments?: CommentRange[]): void { },
-                emitDetachedComments,
+                emitLeadingComments(range: TextRange, comments: CommentRange[], contextNode?: Node, getTextRangeCallback?: (contextNode: Node) => TextRange): void { },
+                emitTrailingComments(range: TextRange, comments: CommentRange[]): void { },
+                emitLeadingDetachedComments,
+                emitTrailingDetachedComments(range: TextRange, contextNode?: Node, ignoreNodeCallback?: (contextNode: Node) => boolean): void {}
             };
 
-            function emitDetachedComments(node: TextRange): void {
+            function emitLeadingDetachedComments(node: TextRange, contextNode?: Node, ignoreNodeCallback?: (contextNode: Node) => boolean): void {
+                if (ignoreNodeCallback && ignoreNodeCallback(contextNode)) {
+                    return;
+                }
+
                 emitDetachedCommentsAndUpdateCommentsInfo(node, /*removeComments*/ true);
             }
         }
@@ -65,41 +74,68 @@ namespace ts {
                 getTrailingCommentsOfPosition,
                 emitLeadingComments,
                 emitTrailingComments,
-                emitDetachedComments,
+                emitLeadingDetachedComments,
+                emitTrailingDetachedComments
             };
 
-            function getLeadingComments(range: TextRange | Node, getAdditionalRange?: (range: Node) => Node) {
-                let comments = getLeadingCommentsOfPosition(range.pos);
-                if (getAdditionalRange) {
-                    let additionalRange = getAdditionalRange(<Node>range);
-                    while (additionalRange) {
-                        comments = concatenate(
-                            getLeadingCommentsOfPosition(additionalRange.pos),
-                            comments
-                        );
+            function getLeadingComments(range: TextRange): CommentRange[];
+            function getLeadingComments(range: TextRange, contextNode: Node, ignoreNodeCallback: (contextNode: Node) => boolean, getTextRangeCallback: (contextNode: Node) => TextRange): CommentRange[];
+            function getLeadingComments(range: TextRange, contextNode?: Node, ignoreNodeCallback?: (contextNode: Node) => boolean, getTextRangeCallback?: (contextNode: Node) => TextRange) {
+                if (contextNode) {
+                    range = getTextRangeCallback(contextNode) || range;
+                    if (ignoreNodeCallback(contextNode)) {
+                        // 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 nodes will not be emitted.
+                        if (range.pos === 0) {
+                            return filter(getLeadingCommentsOfPosition(0), isTripleSlashComment);
+                        }
 
-                        additionalRange = getAdditionalRange(additionalRange);
+                        return undefined;
                     }
                 }
 
-                return comments;
+
+                return getLeadingCommentsOfPosition(range.pos);
             }
 
-            function getTrailingComments(range: TextRange | Node, getAdditionalRange?: (range: Node) => Node) {
-                let comments = getTrailingCommentsOfPosition(range.end);
-                if (getAdditionalRange) {
-                    let additionalRange = getAdditionalRange(<Node>range);
-                    while (additionalRange) {
-                        comments = concatenate(
-                            comments,
-                            getTrailingCommentsOfPosition(additionalRange.end)
-                        );
+            /**
+             * Determine if the given comment is a triple-slash
+             **/
+            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 fullTripleSlashReferencePathRegEx.test(textSubStr)
+                        || fullTripleSlashAMDReferencePathRegEx.test(textSubStr);
+                }
+                return false;
+            }
 
-                        additionalRange = getAdditionalRange(additionalRange);
+            function getTrailingComments(range: TextRange): CommentRange[];
+            function getTrailingComments(range: TextRange, contextNode: Node, ignoreNodeCallback: (contextNode: Node) => boolean, getTextRangeCallback: (contextNode: Node) => TextRange): CommentRange[];
+            function getTrailingComments(range: TextRange, contextNode?: Node, ignoreNodeCallback?: (contextNode: Node) => boolean, getTextRangeCallback?: (contextNode: Node) => TextRange) {
+                if (contextNode) {
+                    if (ignoreNodeCallback(contextNode)) {
+                        return undefined;
                     }
+
+                    range = getTextRangeCallback(contextNode) || range;
                 }
 
-                return comments;
+                return getTrailingCommentsOfPosition(range.end);
             }
 
             function getLeadingCommentsOfPosition(pos: number) {
@@ -124,22 +160,47 @@ namespace ts {
                 return consumeCommentRanges(comments);
             }
 
-            function emitLeadingComments(range: TextRange, comments = getLeadingComments(range)) {
-                emitNewLineBeforeLeadingComments(currentLineMap, writer, range, comments);
+            function emitLeadingComments(range: TextRange, comments: CommentRange[]): void;
+            function emitLeadingComments(range: TextRange, comments: CommentRange[], contextNode: Node, getTextRangeCallback: (contextNode: Node) => TextRange): void;
+            function emitLeadingComments(range: TextRange, comments: CommentRange[], contextNode?: Node, getTextRangeCallback?: (contextNode: Node) => TextRange) {
+                if (comments && comments.length > 0) {
+                    if (contextNode) {
+                        range = getTextRangeCallback(contextNode) || range;
+                    }
 
-                // Leading comments are emitted at /*leading comment1 */space/*leading comment*/space
-                emitComments(currentText, currentLineMap, writer, comments, /*leadingSeparator*/ false, /*trailingSeparator*/ true, newLine, writeComment);
+                    emitNewLineBeforeLeadingComments(currentLineMap, writer, range, comments);
+
+                    // Leading comments are emitted at /*leading comment1 */space/*leading comment*/space
+                    emitComments(currentText, currentLineMap, writer, comments, /*leadingSeparator*/ false, /*trailingSeparator*/ true, newLine, writeComment);
+                }
             }
 
-            function emitTrailingComments(range: TextRange, comments = getTrailingComments(range)) {
+            function emitTrailingComments(range: TextRange, comments: CommentRange[]) {
                 // trailing comments are emitted at space/*trailing comment1 */space/*trailing comment*/
                 emitComments(currentText, currentLineMap, writer, comments, /*leadingSeparator*/ true, /*trailingSeparator*/ false, newLine, writeComment);
             }
 
-            function emitDetachedComments(range: TextRange) {
+            function emitLeadingDetachedComments(range: TextRange): void;
+            function emitLeadingDetachedComments(range: TextRange, contextNode: Node, ignoreNodeCallback: (node: Node) => boolean): void;
+            function emitLeadingDetachedComments(range: TextRange, contextNode?: Node, ignoreNodeCallback?: (node: Node) => boolean): void {
+                if (contextNode && ignoreNodeCallback(contextNode)) {
+                    return;
+                }
+
                 emitDetachedCommentsAndUpdateCommentsInfo(range, /*removeComments*/ false);
             }
 
+            function emitTrailingDetachedComments(range: TextRange): void;
+            function emitTrailingDetachedComments(range: TextRange, contextNode: Node, ignoreNodeCallback?: (node: Node) => boolean): void;
+            function emitTrailingDetachedComments(range: TextRange, contextNode?: Node, ignoreNodeCallback?: (node: Node) => boolean): void {
+                if (contextNode && ignoreNodeCallback(contextNode)) {
+                    return;
+                }
+
+                range = collapseRangeToEnd(range);
+                emitLeadingComments(range, getLeadingComments(range));
+            }
+
             function hasConsumedCommentRange(comment: CommentRange) {
                 return comment.end === consumedCommentRanges[comment.pos];
             }
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index 5376b5382f3..3a5dc6e411d 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -244,7 +244,7 @@ namespace ts {
      * @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) => U): U[] {
+    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 = [];
@@ -268,7 +268,7 @@ namespace ts {
                 }
 
                 if (start < pos) {
-                    const v = mapfn(array.slice(start, pos), previousKey);
+                    const v = mapfn(array.slice(start, pos), previousKey, start, pos);
                     if (v) {
                         result.push(v);
                     }
@@ -362,6 +362,12 @@ namespace ts {
             : 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.
      */
@@ -458,6 +464,14 @@ namespace ts {
         return hasOwnProperty.call(map, key);
     }
 
+    export function getKeys<T>(map: Map<T>): string[] {
+        const keys: string[] = [];
+        for (const key in map) {
+            keys.push(key);
+        }
+        return keys;
+    }
+
     export function getProperty<T>(map: Map<T>, key: string): T {
         return hasOwnProperty.call(map, key) ? map[key] : undefined;
     }
@@ -847,7 +861,7 @@ namespace ts {
     }
 
     function getNormalizedPathComponentsOfUrl(url: string) {
-        // Get root length of http://www.website.com/folder1/foler2/
+        // Get root length of http://www.website.com/folder1/folder2/
         // In this example the root is:  http://www.website.com/
         // normalized path components should be ["http://www.website.com/", "folder1", "folder2"]
 
@@ -875,7 +889,7 @@ namespace ts {
         const indexOfNextSlash = url.indexOf(directorySeparator, rootLength);
         if (indexOfNextSlash !== -1) {
             // Found the "/" after the website.com so the root is length of http://www.website.com/
-            // and get components afetr the root normally like any other folder components
+            // and get components after the root normally like any other folder components
             rootLength = indexOfNextSlash + 1;
             return normalizedPathComponents(url, rootLength);
         }
@@ -958,6 +972,32 @@ namespace ts {
         return pathLen > extLen && path.substr(pathLen - extLen, extLen) === extension;
     }
 
+    export function ensureScriptKind(fileName: string, scriptKind?: ScriptKind): ScriptKind {
+        // Using scriptKind as a condition handles both:
+        // - 'scriptKind' is unspecified and thus it is `undefined`
+        // - 'scriptKind' is set and it is `Unknown` (0)
+        // If the 'scriptKind' is 'undefined' or 'Unknown' then we attempt
+        // to get the ScriptKind from the file name. If it cannot be resolved
+        // from the file name then the default 'TS' script kind is returned.
+        return (scriptKind || getScriptKindFromFileName(fileName)) || ScriptKind.TS;
+    }
+
+    export function getScriptKindFromFileName(fileName: string): ScriptKind {
+        const ext = fileName.substr(fileName.lastIndexOf("."));
+        switch (ext.toLowerCase()) {
+            case ".js":
+                return ScriptKind.JS;
+            case ".jsx":
+                return ScriptKind.JSX;
+            case ".ts":
+                return ScriptKind.TS;
+            case ".tsx":
+                return ScriptKind.TSX;
+            default:
+                return ScriptKind.Unknown;
+        }
+    }
+
     /**
      *  List of supported extensions in order of file resolution precedence.
      */
@@ -1016,8 +1056,9 @@ namespace ts {
         this.pos = pos;
         this.end = end;
         this.flags = NodeFlags.None;
-        this.transformFlags = undefined;
-        this.excludeTransformFlags = undefined;
+        this.modifierFlagsCache = ModifierFlags.None;
+        this.transformFlags = TransformFlags.None;
+        this.excludeTransformFlags = TransformFlags.None;
         this.parent = undefined;
         this.original = undefined;
     }
@@ -1038,10 +1079,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 {
@@ -1058,6 +1102,23 @@ 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[]) {
diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
index c89b7579d52..6be1a0d3683 100644
--- a/src/compiler/declarationEmitter.ts
+++ b/src/compiler/declarationEmitter.ts
@@ -15,10 +15,10 @@ namespace ts {
         reportedDeclarationError: boolean;
         moduleElementDeclarationEmitInfo: ModuleElementDeclarationEmitInfo[];
         synchronousDeclarationOutput: string;
-        referencePathsOutput: string;
+        referencesOutput: string;
     }
 
-    type GetSymbolAccessibilityDiagnostic = (symbolAccesibilityResult: SymbolAccessiblityResult) => SymbolAccessibilityDiagnostic;
+    type GetSymbolAccessibilityDiagnostic = (symbolAccessibilityResult: SymbolAccessibilityResult) => SymbolAccessibilityDiagnostic;
 
     interface EmitTextWriterWithSymbolWriter extends EmitTextWriter, SymbolWriter {
         getSymbolAccessibilityDiagnostic: GetSymbolAccessibilityDiagnostic;
@@ -33,9 +33,9 @@ namespace ts {
     export function getDeclarationDiagnostics(host: EmitHost, resolver: EmitResolver, targetSourceFile: SourceFile): Diagnostic[] {
         const declarationDiagnostics = createDiagnosticCollection();
         forEachExpectedEmitFile(host, getDeclarationDiagnosticsFromFile, targetSourceFile);
-        return declarationDiagnostics.getDiagnostics(targetSourceFile.fileName);
+        return declarationDiagnostics.getDiagnostics(targetSourceFile ? targetSourceFile.fileName : undefined);
 
-        function getDeclarationDiagnosticsFromFile({ declarationFilePath }, sources: SourceFile[], isBundledEmit: boolean) {
+        function getDeclarationDiagnosticsFromFile({ declarationFilePath }: EmitFileNames, sources: SourceFile[], isBundledEmit: boolean) {
             emitDeclarations(host, resolver, declarationDiagnostics, declarationFilePath, sources, isBundledEmit);
         }
     }
@@ -51,7 +51,9 @@ namespace ts {
         let decreaseIndent: () => void;
         let writeTextOfNode: (text: string, node: Node) => void;
 
-        let writer = createAndSetNewTextWriterWithSymbolWriter();
+        let writer: EmitTextWriterWithSymbolWriter;
+
+        createAndSetNewTextWriterWithSymbolWriter();
 
         let enclosingDeclaration: Node;
         let resultHasExternalModuleIndicator: boolean;
@@ -71,7 +73,9 @@ namespace ts {
         // Contains the reference paths that needs to go in the declaration file.
         // Collecting this separately because reference paths need to be first thing in the declaration file
         // and we could be collecting these paths from multiple files into single one with --out option
-        let referencePathsOutput = "";
+        let referencesOutput = "";
+
+        let usedTypeDirectiveReferences: Map<string>;
 
         // Emit references corresponding to each file
         const emittedReferencedFiles: SourceFile[] = [];
@@ -151,11 +155,19 @@ namespace ts {
             }
         });
 
+        if (usedTypeDirectiveReferences) {
+            for (const directive in usedTypeDirectiveReferences) {
+                if (hasProperty(usedTypeDirectiveReferences, directive)) {
+                    referencesOutput += `/// <reference types="${directive}" />${newLine}`;
+                }
+            }
+        }
+
         return {
             reportedDeclarationError,
             moduleElementDeclarationEmitInfo: allSourcesModuleElementDeclarationEmitInfo,
             synchronousDeclarationOutput: writer.getText(),
-            referencePathsOutput,
+            referencesOutput,
         };
 
         function hasInternalAnnotation(range: CommentRange) {
@@ -174,7 +186,7 @@ namespace ts {
             }
         }
 
-        function createAndSetNewTextWriterWithSymbolWriter(): EmitTextWriterWithSymbolWriter {
+        function createAndSetNewTextWriterWithSymbolWriter(): void {
             const writer = <EmitTextWriterWithSymbolWriter>createTextWriter(newLine);
             writer.trackSymbol = trackSymbol;
             writer.reportInaccessibleThisError = reportInaccessibleThisError;
@@ -186,7 +198,6 @@ namespace ts {
             writer.writeParameter = writer.write;
             writer.writeSymbol = writer.write;
             setWriter(writer);
-            return writer;
         }
 
         function setWriter(newWriter: EmitTextWriterWithSymbolWriter) {
@@ -252,30 +263,45 @@ namespace ts {
             setWriter(oldWriter);
         }
 
-        function handleSymbolAccessibilityError(symbolAccesibilityResult: SymbolAccessiblityResult) {
-            if (symbolAccesibilityResult.accessibility === SymbolAccessibility.Accessible) {
+        function recordTypeReferenceDirectivesIfNecessary(typeReferenceDirectives: string[]): void {
+            if (!typeReferenceDirectives) {
+                return;
+            }
+
+            if (!usedTypeDirectiveReferences) {
+                usedTypeDirectiveReferences = {};
+            }
+            for (const directive of typeReferenceDirectives) {
+                if (!hasProperty(usedTypeDirectiveReferences, directive)) {
+                    usedTypeDirectiveReferences[directive] = directive;
+                }
+            }
+        }
+
+        function handleSymbolAccessibilityError(symbolAccessibilityResult: SymbolAccessibilityResult) {
+            if (symbolAccessibilityResult.accessibility === SymbolAccessibility.Accessible) {
                 // write the aliases
-                if (symbolAccesibilityResult && symbolAccesibilityResult.aliasesToMakeVisible) {
-                    writeAsynchronousModuleElements(symbolAccesibilityResult.aliasesToMakeVisible);
+                if (symbolAccessibilityResult && symbolAccessibilityResult.aliasesToMakeVisible) {
+                    writeAsynchronousModuleElements(symbolAccessibilityResult.aliasesToMakeVisible);
                 }
             }
             else {
                 // Report error
                 reportedDeclarationError = true;
-                const errorInfo = writer.getSymbolAccessibilityDiagnostic(symbolAccesibilityResult);
+                const errorInfo = writer.getSymbolAccessibilityDiagnostic(symbolAccessibilityResult);
                 if (errorInfo) {
                     if (errorInfo.typeName) {
-                        emitterDiagnostics.add(createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode,
+                        emitterDiagnostics.add(createDiagnosticForNode(symbolAccessibilityResult.errorNode || errorInfo.errorNode,
                             errorInfo.diagnosticMessage,
                             getTextOfNodeFromSourceText(currentText, errorInfo.typeName),
-                            symbolAccesibilityResult.errorSymbolName,
-                            symbolAccesibilityResult.errorModuleName));
+                            symbolAccessibilityResult.errorSymbolName,
+                            symbolAccessibilityResult.errorModuleName));
                     }
                     else {
-                        emitterDiagnostics.add(createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode,
+                        emitterDiagnostics.add(createDiagnosticForNode(symbolAccessibilityResult.errorNode || errorInfo.errorNode,
                             errorInfo.diagnosticMessage,
-                            symbolAccesibilityResult.errorSymbolName,
-                            symbolAccesibilityResult.errorModuleName));
+                            symbolAccessibilityResult.errorSymbolName,
+                            symbolAccessibilityResult.errorModuleName));
                     }
                 }
             }
@@ -283,6 +309,7 @@ namespace ts {
 
         function trackSymbol(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags) {
             handleSymbolAccessibilityError(resolver.isSymbolAccessible(symbol, enclosingDeclaration, meaning));
+            recordTypeReferenceDirectivesIfNecessary(resolver.getTypeReferenceDirectivesForSymbol(symbol, meaning));
         }
 
         function reportInaccessibleThisError() {
@@ -366,6 +393,8 @@ namespace ts {
                 case SyntaxKind.BooleanKeyword:
                 case SyntaxKind.SymbolKeyword:
                 case SyntaxKind.VoidKeyword:
+                case SyntaxKind.UndefinedKeyword:
+                case SyntaxKind.NullKeyword:
                 case SyntaxKind.ThisType:
                 case SyntaxKind.StringLiteralType:
                     return writeTextOfNode(currentText, type);
@@ -417,6 +446,7 @@ namespace ts {
                     entityName.parent.kind === SyntaxKind.ImportEqualsDeclaration ? entityName.parent : enclosingDeclaration);
 
                 handleSymbolAccessibilityError(visibilityResult);
+                recordTypeReferenceDirectivesIfNecessary(resolver.getTypeReferenceDirectivesForEntityName(entityName));
                 writeEntityName(entityName);
             }
 
@@ -527,7 +557,10 @@ namespace ts {
             else {
                 // Expression
                 const tempVarName = getExportDefaultTempVariableName();
-                write("declare var ");
+                if (!noDeclare) {
+                    write("declare ");
+                }
+                write("var ");
                 write(tempVarName);
                 write(": ");
                 writer.getSymbolAccessibilityDiagnostic = getDefaultExportAccessibilityDiagnostic;
@@ -548,7 +581,7 @@ namespace ts {
                 writeAsynchronousModuleElements(nodes);
             }
 
-            function getDefaultExportAccessibilityDiagnostic(diagnostic: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic {
+            function getDefaultExportAccessibilityDiagnostic(diagnostic: SymbolAccessibilityResult): SymbolAccessibilityDiagnostic {
                 return {
                     diagnosticMessage: Diagnostics.Default_export_of_the_module_has_or_is_using_private_name_0,
                     errorNode: node
@@ -623,12 +656,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) {
@@ -637,21 +671,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 ");
             }
         }
@@ -660,7 +694,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 ");
@@ -677,7 +711,7 @@ namespace ts {
             }
             writer.writeLine();
 
-            function getImportEntityNameVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic {
+            function getImportEntityNameVisibilityError(symbolAccessibilityResult: SymbolAccessibilityResult): SymbolAccessibilityDiagnostic {
                 return {
                     diagnosticMessage: Diagnostics.Import_declaration_0_is_using_private_name_1,
                     errorNode: node,
@@ -698,12 +732,8 @@ namespace ts {
         }
 
         function writeImportDeclaration(node: ImportDeclaration) {
-            if (!node.importClause && !(node.flags & NodeFlags.Export)) {
-                // do not write non-exported import declarations that don't have import clauses
-                return;
-            }
             emitJsDocComments(node);
-            if (node.flags & NodeFlags.Export) {
+            if (hasModifier(node, ModifierFlags.Export)) {
                 write("export ");
             }
             write("import ");
@@ -737,7 +767,7 @@ namespace ts {
         function emitExternalModuleSpecifier(parent: ImportEqualsDeclaration | ImportDeclaration | ExportDeclaration | ModuleDeclaration) {
             // emitExternalModuleSpecifier is usually called when we emit something in the.d.ts file that will make it an external module (i.e. import/export declarations).
             // the only case when it is not true is when we call it to emit correct name for module augmentation - d.ts files with just module augmentations are not considered
-            // external modules since they are indistingushable from script files with ambient modules. To fix this in such d.ts files we'll emit top level 'export {}'
+            // external modules since they are indistinguishable from script files with ambient modules. To fix this in such d.ts files we'll emit top level 'export {}'
             // so compiler will treat them as external modules.
             resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || parent.kind !== SyntaxKind.ModuleDeclaration;
             let moduleSpecifier: Node;
@@ -756,9 +786,9 @@ namespace ts {
             if (moduleSpecifier.kind === SyntaxKind.StringLiteral && isBundledEmit && (compilerOptions.out || compilerOptions.outFile)) {
                 const moduleName = getExternalModuleNameFromDeclaration(host, resolver, parent);
                 if (moduleName) {
-                    write("\"");
+                    write('"');
                     write(moduleName);
-                    write("\"");
+                    write('"');
                     return;
                 }
             }
@@ -854,7 +884,7 @@ namespace ts {
             writeLine();
             enclosingDeclaration = prevEnclosingDeclaration;
 
-            function getTypeAliasDeclarationVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic {
+            function getTypeAliasDeclarationVisibilityError(symbolAccessibilityResult: SymbolAccessibilityResult): SymbolAccessibilityDiagnostic {
                 return {
                     diagnosticMessage: Diagnostics.Exported_type_alias_0_has_or_is_using_private_name_1,
                     errorNode: node.type,
@@ -893,7 +923,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[]) {
@@ -921,7 +951,7 @@ namespace ts {
                     }
                 }
 
-                function getTypeParameterConstraintVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic {
+                function getTypeParameterConstraintVisibilityError(symbolAccessibilityResult: SymbolAccessibilityResult): SymbolAccessibilityDiagnostic {
                     // Type parameter constraints are named by user so we should always be able to name it
                     let diagnosticMessage: DiagnosticMessage;
                     switch (node.parent.kind) {
@@ -943,7 +973,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) {
@@ -990,8 +1020,12 @@ namespace ts {
                 else if (!isImplementsList && node.expression.kind === SyntaxKind.NullKeyword) {
                     write("null");
                 }
+                else {
+                    writer.getSymbolAccessibilityDiagnostic = getHeritageClauseVisibilityError;
+                    resolver.writeBaseConstructorTypeOfClass(<ClassLikeDeclaration>enclosingDeclaration, enclosingDeclaration, TypeFormatFlags.UseTypeOfFunction, writer);
+                }
 
-                function getHeritageClauseVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic {
+                function getHeritageClauseVisibilityError(symbolAccessibilityResult: SymbolAccessibilityResult): SymbolAccessibilityDiagnostic {
                     let diagnosticMessage: DiagnosticMessage;
                     // Heritage clause is written by user so it can always be named
                     if (node.parent.parent.kind === SyntaxKind.ClassDeclaration) {
@@ -1018,7 +1052,7 @@ namespace ts {
             function emitParameterProperties(constructorDeclaration: ConstructorDeclaration) {
                 if (constructorDeclaration) {
                     forEach(constructorDeclaration.parameters, param => {
-                        if (param.flags & NodeFlags.AccessibilityModifier) {
+                        if (hasModifier(param, ModifierFlags.AccessibilityModifier)) {
                             emitPropertyDeclaration(param);
                         }
                     });
@@ -1027,7 +1061,7 @@ namespace ts {
 
             emitJsDocComments(node);
             emitModuleElementDeclarationFlags(node);
-            if (node.flags & NodeFlags.Abstract) {
+            if (hasModifier(node, ModifierFlags.Abstract)) {
                 write("abstract ");
             }
 
@@ -1077,7 +1111,7 @@ namespace ts {
             }
 
             emitJsDocComments(node);
-            emitClassMemberDeclarationFlags(node.flags);
+            emitClassMemberDeclarationFlags(getModifierFlags(node));
             emitVariableDeclaration(<VariableDeclaration>node);
             write(";");
             writeLine();
@@ -1102,16 +1136,16 @@ 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);
                     }
                 }
             }
 
-            function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult: SymbolAccessiblityResult) {
+            function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult: SymbolAccessibilityResult) {
                 if (node.kind === SyntaxKind.VariableDeclaration) {
-                    return symbolAccesibilityResult.errorModuleName ?
-                        symbolAccesibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ?
+                    return symbolAccessibilityResult.errorModuleName ?
+                        symbolAccessibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ?
                             Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                             Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_private_module_2 :
                         Diagnostics.Exported_variable_0_has_or_is_using_private_name_1;
@@ -1119,31 +1153,31 @@ 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) {
-                        return symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ?
+                    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 :
                                 Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
                     }
                     else if (node.parent.kind === SyntaxKind.ClassDeclaration) {
-                        return symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ?
+                        return symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ?
                                 Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                 Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             Diagnostics.Public_property_0_of_exported_class_has_or_is_using_private_name_1;
                     }
                     else {
                         // Interfaces cannot have types that cannot be named
-                        return symbolAccesibilityResult.errorModuleName ?
+                        return symbolAccessibilityResult.errorModuleName ?
                             Diagnostics.Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                             Diagnostics.Property_0_of_exported_interface_has_or_is_using_private_name_1;
                     }
                 }
             }
 
-            function getVariableDeclarationTypeVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic {
-                const diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult);
+            function getVariableDeclarationTypeVisibilityError(symbolAccessibilityResult: SymbolAccessibilityResult): SymbolAccessibilityDiagnostic {
+                const diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult);
                 return diagnosticMessage !== undefined ? {
                     diagnosticMessage,
                     errorNode: node,
@@ -1167,8 +1201,8 @@ namespace ts {
             }
 
             function emitBindingElement(bindingElement: BindingElement) {
-                function getBindingElementTypeVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic {
-                    const diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult);
+                function getBindingElementTypeVisibilityError(symbolAccessibilityResult: SymbolAccessibilityResult): SymbolAccessibilityDiagnostic {
+                    const diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult);
                     return diagnosticMessage !== undefined ? {
                         diagnosticMessage,
                         errorNode: bindingElement,
@@ -1230,9 +1264,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) {
@@ -1259,17 +1293,17 @@ namespace ts {
                 }
             }
 
-            function getAccessorDeclarationTypeVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic {
+            function getAccessorDeclarationTypeVisibilityError(symbolAccessibilityResult: SymbolAccessibilityResult): SymbolAccessibilityDiagnostic {
                 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) {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                    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;
                     }
                     else {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1;
                     }
@@ -1281,16 +1315,16 @@ namespace ts {
                     };
                 }
                 else {
-                    if (accessorWithTypeAnnotation.flags & NodeFlags.Static) {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ?
+                    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 :
                                 Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                             Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0;
                     }
                     else {
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ?
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ?
                                 Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
                                 Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                             Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0;
@@ -1316,8 +1350,8 @@ namespace ts {
                 if (node.kind === SyntaxKind.FunctionDeclaration) {
                     emitModuleElementDeclarationFlags(node);
                 }
-                else if (node.kind === SyntaxKind.MethodDeclaration) {
-                    emitClassMemberDeclarationFlags(node.flags);
+                else if (node.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.Constructor) {
+                    emitClassMemberDeclarationFlags(getModifierFlags(node));
                 }
                 if (node.kind === SyntaxKind.FunctionDeclaration) {
                     write("function ");
@@ -1347,7 +1381,7 @@ namespace ts {
 
             if (node.kind === SyntaxKind.IndexSignature) {
                 // Index signature can have readonly modifier
-                emitClassMemberDeclarationFlags(node.flags);
+                emitClassMemberDeclarationFlags(getModifierFlags(node));
                 write("[");
             }
             else {
@@ -1378,7 +1412,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);
             }
 
@@ -1389,57 +1423,57 @@ namespace ts {
                 writeLine();
             }
 
-            function getReturnTypeVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic {
+            function getReturnTypeVisibilityError(symbolAccessibilityResult: SymbolAccessibilityResult): SymbolAccessibilityDiagnostic {
                 let diagnosticMessage: DiagnosticMessage;
                 switch (node.kind) {
                     case SyntaxKind.ConstructSignature:
                         // Interfaces cannot have return types that cannot be named
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                             Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0;
                         break;
 
                     case SyntaxKind.CallSignature:
                         // Interfaces cannot have return types that cannot be named
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                             Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0;
                         break;
 
                     case SyntaxKind.IndexSignature:
                         // Interfaces cannot have return types that cannot be named
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                             Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0;
                         break;
 
                     case SyntaxKind.MethodDeclaration:
                     case SyntaxKind.MethodSignature:
-                        if (node.flags & NodeFlags.Static) {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ?
+                        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 :
                                     Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                                 Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0;
                         }
                         else if (node.parent.kind === SyntaxKind.ClassDeclaration) {
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ?
+                            diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                                symbolAccessibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ?
                                     Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
                                     Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                                 Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0;
                         }
                         else {
                             // Interfaces cannot have return types that cannot be named
-                            diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
+                            diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                                 Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                                 Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
                         }
                         break;
 
                     case SyntaxKind.FunctionDeclaration:
-                        diagnosticMessage = symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ?
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ?
                                 Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
                                 Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1 :
                             Diagnostics.Return_type_of_exported_function_has_or_is_using_private_name_0;
@@ -1481,12 +1515,12 @@ 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);
             }
 
-            function getParameterDeclarationTypeVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic {
-                const diagnosticMessage: DiagnosticMessage = getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult);
+            function getParameterDeclarationTypeVisibilityError(symbolAccessibilityResult: SymbolAccessibilityResult): SymbolAccessibilityDiagnostic {
+                const diagnosticMessage: DiagnosticMessage = getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult);
                 return diagnosticMessage !== undefined ? {
                     diagnosticMessage,
                     errorNode: node,
@@ -1494,53 +1528,53 @@ namespace ts {
                 } : undefined;
             }
 
-            function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult: SymbolAccessiblityResult): DiagnosticMessage {
+            function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult: SymbolAccessibilityResult): DiagnosticMessage {
                 switch (node.parent.kind) {
                     case SyntaxKind.Constructor:
-                        return symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ?
+                        return symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ?
                                 Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                 Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1;
 
                     case SyntaxKind.ConstructSignature:
                         // Interfaces cannot have parameter types that cannot be named
-                        return symbolAccesibilityResult.errorModuleName ?
+                        return symbolAccessibilityResult.errorModuleName ?
                             Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                             Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
 
                     case SyntaxKind.CallSignature:
                         // Interfaces cannot have parameter types that cannot be named
-                        return symbolAccesibilityResult.errorModuleName ?
+                        return symbolAccessibilityResult.errorModuleName ?
                             Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                             Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
 
                     case SyntaxKind.MethodDeclaration:
                     case SyntaxKind.MethodSignature:
-                        if (node.parent.flags & NodeFlags.Static) {
-                            return symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ?
+                        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 :
                                     Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                                 Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                         }
                         else if (node.parent.parent.kind === SyntaxKind.ClassDeclaration) {
-                             return symbolAccesibilityResult.errorModuleName ?
-                                symbolAccesibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ?
+                             return symbolAccessibilityResult.errorModuleName ?
+                                symbolAccessibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ?
                                     Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                     Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                                 Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
                         }
                         else {
                             // Interfaces cannot have parameter types that cannot be named
-                            return symbolAccesibilityResult.errorModuleName ?
+                            return symbolAccessibilityResult.errorModuleName ?
                                 Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                                 Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                         }
 
                     case SyntaxKind.FunctionDeclaration:
-                        return symbolAccesibilityResult.errorModuleName ?
-                            symbolAccesibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ?
+                        return symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ?
                                 Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                                 Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2 :
                             Diagnostics.Parameter_0_of_exported_function_has_or_is_using_private_name_1;
@@ -1682,7 +1716,7 @@ namespace ts {
                     host.getCanonicalFileName,
                     /*isAbsolutePathAnUrl*/ false);
 
-                referencePathsOutput += "/// <reference path=\"" + declFileName + "\" />" + newLine;
+                referencesOutput += `/// <reference path="${declFileName}" />${newLine}`;
             }
             return addedBundledEmitReference;
 
@@ -1704,7 +1738,7 @@ namespace ts {
         const emitDeclarationResult = emitDeclarations(host, resolver, emitterDiagnostics, declarationFilePath, sourceFiles, isBundledEmit);
         const emitSkipped = emitDeclarationResult.reportedDeclarationError || host.isEmitBlocked(declarationFilePath) || host.getCompilerOptions().noEmit;
         if (!emitSkipped) {
-            const declarationOutput = emitDeclarationResult.referencePathsOutput
+            const declarationOutput = emitDeclarationResult.referencesOutput
                 + getDeclarationOutput(emitDeclarationResult.synchronousDeclarationOutput, emitDeclarationResult.moduleElementDeclarationEmitInfo);
             writeFile(host, emitterDiagnostics, declarationFilePath, declarationOutput, host.getCompilerOptions().emitBOM);
         }
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index b8ae833e5ab..9fd19cb2003 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1,4 +1,4 @@
- {
+{
     "Unterminated string literal.": {
         "category": "Error",
         "code": 1002
@@ -447,7 +447,7 @@
         "category": "Error",
         "code": 1147
     },
-    "Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.": {
+    "Cannot compile modules unless the '--module' flag is provided with a valid module type. Consider setting the 'module' compiler option in a 'tsconfig.json' file.": {
         "category": "Error",
         "code": 1148
     },
@@ -687,7 +687,7 @@
         "category": "Error",
         "code": 1218
     },
-    "Experimental support for decorators is a feature that is subject to change in a future release. Specify '--experimentalDecorators' to remove this warning.": {
+    "Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning.": {
         "category": "Error",
         "code": 1219
     },
@@ -723,6 +723,10 @@
         "category": "Error",
         "code": 1227
     },
+    "A type predicate is only allowed in return type position for functions and methods.": {
+        "category": "Error",
+        "code": 1228
+    },
     "A type predicate cannot reference a rest parameter.": {
         "category": "Error",
         "code": 1229
@@ -775,7 +779,7 @@
         "category": "Error",
         "code": 1241
     },
-    "'abstract' modifier can only appear on a class or method declaration.": {
+    "'abstract' modifier can only appear on a class, method, or property declaration.": {
         "category": "Error",
         "code": 1242
     },
@@ -807,6 +811,18 @@
         "category": "Error",
         "code": 1249
     },
+    "Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'.": {
+        "category": "Error",
+        "code": 1250
+    },
+    "Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Class definitions are automatically in strict mode.": {
+        "category": "Error",
+        "code": 1251
+    },
+    "Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Modules are automatically in strict mode.": {
+        "category": "Error",
+        "code": 1252
+    },
     "'with' statements are not allowed in an async function block.": {
         "category": "Error",
         "code": 1300
@@ -827,6 +843,18 @@
         "category": "Error",
         "code": 1313
     },
+    "Global module exports may only appear in module files.": {
+        "category": "Error",
+        "code": 1314
+    },
+    "Global module exports may only appear in declaration files.": {
+        "category": "Error",
+        "code": 1315
+    },
+    "Global module exports may only appear at top level.": {
+        "category": "Error",
+        "code": 1316
+    },
     "Duplicate identifier '{0}'.": {
         "category": "Error",
         "code": 2300
@@ -1031,7 +1059,7 @@
         "category": "Error",
         "code": 2351
     },
-    "Neither type '{0}' nor type '{1}' is assignable to the other.": {
+    "Type '{0}' cannot be converted to type '{1}'.": {
         "category": "Error",
         "code": 2352
     },
@@ -1087,6 +1115,10 @@
         "category": "Error",
         "code": 2365
     },
+    "Function lacks ending return statement and return type does not include 'undefined'.": {
+        "category": "Error",
+        "code": 2366
+    },
     "Type parameter name cannot be '{0}'": {
         "category": "Error",
         "code": 2368
@@ -1147,7 +1179,7 @@
         "category": "Error",
         "code": 2382
     },
-    "Overload signatures must all be exported or not exported.": {
+    "Overload signatures must all be exported or non-exported.": {
         "category": "Error",
         "code": 2383
     },
@@ -1307,7 +1339,7 @@
         "category": "Error",
         "code": 2427
     },
-    "All declarations of an interface must have identical type parameters.": {
+    "All declarations of '{0}' must have identical type parameters.": {
         "category": "Error",
         "code": 2428
     },
@@ -1407,6 +1439,10 @@
         "category": "Error",
         "code": 2453
     },
+    "Variable '{0}' is used before being assigned.": {
+        "category": "Error",
+        "code": 2454
+    },
     "Type argument candidate '{1}' is not a valid type argument because it is not a supertype of candidate '{0}'.": {
         "category": "Error",
         "code": 2455
@@ -1631,7 +1667,7 @@
         "category": "Error",
         "code": 2511
     },
-    "Overload signatures must all be abstract or not abstract.": {
+    "Overload signatures must all be abstract or non-abstract.": {
         "category": "Error",
         "code": 2512
     },
@@ -1699,6 +1735,14 @@
         "category": "Error",
         "code": 2529
     },
+    "Property '{0}' is incompatible with index signature.": {
+        "category": "Error",
+        "code": 2530
+    },
+    "Object is possibly 'null' or 'undefined'.": {
+        "category": "Error",
+        "code": 2531
+    },
     "JSX element attributes type '{0}' may not be a union type.": {
         "category": "Error",
         "code": 2600
@@ -1775,7 +1819,7 @@
         "category": "Error",
         "code": 2660
     },
-    "Cannot re-export name that is not defined in the module.": {
+    "Cannot export '{0}'. Only local declarations can be exported from a module.": {
         "category": "Error",
         "code": 2661
     },
@@ -1819,6 +1863,62 @@
         "category": "Error",
         "code": 2671
     },
+    "Cannot assign a '{0}' constructor type to a '{1}' constructor type.": {
+        "category": "Error",
+        "code": 2672
+    },
+    "Constructor of class '{0}' is private and only accessible within the class declaration.": {
+        "category": "Error",
+        "code": 2673
+    },
+    "Constructor of class '{0}' is protected and only accessible within the class declaration.": {
+        "category": "Error",
+        "code": 2674
+    },
+    "Cannot extend a class '{0}'. Class constructor is marked as private.": {
+        "category": "Error",
+        "code": 2675
+    },
+    "Accessors must both be abstract or non-abstract.": {
+        "category": "Error",
+        "code": 2676
+    },
+    "A type predicate's type must be assignable to its parameter's type.": {
+        "category": "Error",
+        "code": 2677
+    },
+    "Type '{0}' is not comparable to type '{1}'.": {
+        "category": "Error",
+        "code": 2678
+    },
+    "A function that is called with the 'new' keyword cannot have a 'this' type that is 'void'.": {
+        "category": "Error",
+        "code": 2679
+    },
+    "A 'this' parameter must be the first parameter.": {
+        "category": "Error",
+        "code": 2680
+    },
+    "A constructor cannot have a 'this' parameter.": {
+        "category": "Error",
+        "code": 2681
+    },
+    "A setter cannot have a 'this' parameter.": {
+        "category": "Error",
+        "code": 2682
+    },
+    "'this' implicitly has type 'any' because it does not have a type annotation.": {
+        "category": "Error",
+        "code": 2683
+    },
+    "The 'this' context of type '{0}' is not assignable to method's 'this' of type '{1}'.": {
+        "category": "Error",
+        "code": 2684
+    },
+    "The 'this' types of each signature are incompatible.": {
+        "category": "Error",
+        "code": 2685
+    },
     "Import declaration '{0}' is using private name '{1}'.": {
         "category": "Error",
         "code": 4000
@@ -2099,6 +2199,11 @@
         "category": "Error",
         "code": 4082
     },
+    "Conflicting library definitions for '{0}' found at '{1}' and '{2}'. Copy the correct file to the 'typings' folder to resolve this conflict.": {
+        "category": "Message",
+        "code": 4090
+    },
+
     "The current host does not support the '{0}' option.": {
         "category": "Error",
         "code": 5001
@@ -2187,6 +2292,14 @@
         "category": "Error",
         "code": 5062
     },
+    "Substututions for pattern '{0}' should be an array.": {
+        "category": "Error",
+        "code": 5063
+    },
+    "Substitution '{0}' for pattern '{1}' has incorrect type, expected 'string', got '{2}'.": {
+        "category": "Error",
+        "code": 5064
+    },
     "Concatenate and emit output to single file.": {
         "category": "Message",
         "code": 6001
@@ -2195,11 +2308,11 @@
         "category": "Message",
         "code": 6002
     },
-    "Specifies the location where debugger should locate map files instead of generated locations.": {
+    "Specify the location where debugger should locate map files instead of generated locations.": {
         "category": "Message",
         "code": 6003
     },
-    "Specifies the location where debugger should locate TypeScript files instead of source locations.": {
+    "Specify the location where debugger should locate TypeScript files instead of source locations.": {
         "category": "Message",
         "code": 6004
     },
@@ -2231,10 +2344,10 @@
         "category": "Message",
         "code": 6011
     },
-  "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES2015' (experimental)": {
-    "category": "Message",
-    "code": 6015
-  },
+    "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES2015'": {
+        "category": "Message",
+        "code": 6015
+    },
     "Specify module code generation: 'commonjs', 'amd', 'system', 'umd' or 'es2015'": {
         "category": "Message",
         "code": 6016
@@ -2319,14 +2432,10 @@
         "category": "Error",
         "code": 6045
     },
-    "Argument for '--module' option must be 'commonjs', 'amd', 'system', 'umd', or 'es2015'.": {
+    "Argument for '{0}' option must be: {1}": {
         "category": "Error",
         "code": 6046
     },
-    "Argument for '--target' option must be 'ES3', 'ES5', or 'ES2015'.": {
-        "category": "Error",
-        "code": 6047
-    },
     "Locale must be of the form <language> or <language>-<territory>. For example '{0}' or '{1}'.": {
         "category": "Error",
         "code": 6048
@@ -2363,7 +2472,7 @@
         "category": "Message",
         "code": 6056
     },
-    "Specifies the root directory of input files. Use to control the output directory structure with --outDir.": {
+    "Specify the root directory of input files. Use to control the output directory structure with --outDir.": {
         "category": "Message",
         "code": 6058
     },
@@ -2371,7 +2480,7 @@
         "category": "Error",
         "code": 6059
     },
-    "Specifies the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix).": {
+    "Specify the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix).": {
         "category": "Message",
         "code": 6060
     },
@@ -2379,14 +2488,6 @@
         "category": "Message",
         "code": 6061
     },
-    "Argument for '--newLine' option must be 'CRLF' or 'LF'.": {
-        "category": "Error",
-        "code": 6062
-    },
-    "Argument for '--moduleResolution' option must be 'node' or 'classic'.": {
-        "category": "Error",
-        "code": 6063
-    },
     "Option '{0}' can only be specified in 'tsconfig.json' file.": {
         "category": "Error",
         "code": 6064
@@ -2403,7 +2504,7 @@
         "category": "Message",
         "code": 6068
     },
-    "Specifies module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6).": {
+    "Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6).": {
         "category": "Message",
         "code": 6069
     },
@@ -2443,14 +2544,14 @@
         "category": "Message",
         "code": 6078
     },
+    "Specify library files to be included in the compilation: ": {
+        "category": "Message",
+        "code": 6079
+    },
     "Specify JSX code generation: 'preserve' or 'react'": {
         "category": "Message",
         "code": 6080
     },
-    "Argument for '--jsx' must be 'preserve' or 'react'.": {
-        "category": "Message",
-        "code": 6081
-    },
     "Only 'amd' and 'system' modules are supported alongside --{0}.": {
         "category": "Error",
         "code": 6082
@@ -2459,11 +2560,11 @@
         "category": "Message",
         "code": 6083
     },
-    "Specifies the object invoked for createElement and __spread when targeting 'react' JSX emit": {
+    "Specify the object invoked for createElement and __spread when targeting 'react' JSX emit": {
         "category": "Message",
         "code": 6084
     },
-    "Enable tracing of the module resolution process.": {
+    "Enable tracing of the name resolution process.": {
         "category": "Message",
         "code": 6085
     },
@@ -2511,7 +2612,7 @@
         "category": "Message",
         "code": 6096
     },
-    "File '{0}' exist - use it as a module resolution result.": {
+    "File '{0}' exist - use it as a name resolution result.": {
         "category": "Message",
         "code": 6097
     },
@@ -2523,11 +2624,11 @@
         "category": "Message",
         "code": 6099
     },
-    "'package.json' does not have 'typings' field.": {
+    "'package.json' does not have 'types' field.": {
         "category": "Message",
         "code": 6100
     },
-    "'package.json' has 'typings' field '{0}' that references '{1}'.": {
+    "'package.json' has '{0}' field '{1}' that references '{2}'.": {
         "category": "Message",
         "code": 6101
     },
@@ -2543,7 +2644,7 @@
         "category": "Message",
         "code": 6104
     },
-    "Expected type of 'typings' field in 'package.json' to be 'string', got '{0}'.": {
+    "Expected type of '{0}' field in 'package.json' to be 'string', got '{1}'.": {
         "category": "Message",
         "code": 6105
     },
@@ -2571,6 +2672,78 @@
         "category": "Message",
         "code": 6111
     },
+    "Do not emit 'use strict' directives in module output.": {
+        "category": "Message",
+        "code": 6112
+    },
+    "Enable strict null checks.": {
+        "category": "Message",
+        "code": 6113
+    },
+    "Unknown option 'excludes'. Did you mean 'exclude'?": {
+        "category": "Error",
+        "code": 6114
+    },
+    "Raise error on 'this' expressions with an implied 'any' type.": {
+        "category": "Message",
+        "code": 6115
+    },
+    "======== Resolving type reference directive '{0}', containing file '{1}', root directory '{2}'. ========": {
+        "category": "Message",
+        "code": 6116
+    },
+    "Resolving using primary search paths...": {
+        "category": "Message",
+        "code": 6117
+    },
+    "Resolving from node_modules folder...": {
+        "category": "Message",
+        "code": 6118
+    },
+    "======== Type reference directive '{0}' was successfully resolved to '{1}', primary: {2}. ========": {
+        "category": "Message",
+        "code": 6119
+    },
+    "======== Type reference directive '{0}' was not resolved. ========": {
+        "category": "Message",
+        "code": 6120
+    },
+    "Resolving with primary search path '{0}'": {
+        "category": "Message",
+        "code": 6121
+    },
+    "Root directory cannot be determined, skipping primary search paths.": {
+        "category": "Message",
+        "code": 6122
+    },
+    "======== Resolving type reference directive '{0}', containing file '{1}', root directory not set. ========": {
+        "category": "Message",
+        "code": 6123
+    },
+    "Type declaration files to be included in compilation.": {
+        "category": "Message",
+        "code": 6124
+    },
+    "Looking up in 'node_modules' folder, initial location '{0}'": {
+        "category": "Message",
+        "code": 6125
+    },
+    "Containing file is not specified and root directory cannot be determined, skipping lookup in 'node_modules' folder.": {
+        "category": "Message",
+        "code": 6126
+    },
+    "======== Resolving type reference directive '{0}', containing file not set, root directory '{1}'. ========": {
+        "category": "Message",
+        "code": 6127
+    },
+    "======== Resolving type reference directive '{0}', containing file not set, root directory not set. ========": {
+        "category": "Message",
+        "code": 6128
+    },
+    "Use the legacy emitter instead of the transforming emitter.": {
+        "category": "Message",
+        "code": 6129
+    },
     "Variable '{0}' implicitly has an '{1}' type.": {
         "category": "Error",
         "code": 7005
@@ -2659,6 +2832,10 @@
         "category": "Error",
         "code": 7030
     },
+    "Binding element '{0}' implicitly has an '{1}' type.": {
+        "category": "Error",
+        "code": 7031
+    },
     "You cannot rename this element.": {
         "category": "Error",
         "code": 8000
@@ -2723,11 +2900,6 @@
         "category": "Error",
         "code": 8016
     },
-    "'decorators' can only be used in a .ts file.": {
-        "category": "Error",
-        "code": 8017
-    },
-
     "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses.": {
         "category": "Error",
         "code": 9002
@@ -2757,23 +2929,27 @@
         "code": 17004
     },
     "A constructor cannot contain a 'super' call when its class extends 'null'": {
-      "category": "Error",
-      "code": 17005
+        "category": "Error",
+        "code": 17005
     },
     "An unary expression with the '{0}' operator is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses.": {
-      "category": "Error",
-      "code": 17006
+        "category": "Error",
+        "code": 17006
     },
     "A type assertion expression is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses.": {
-      "category": "Error",
-      "code": 17007
+        "category": "Error",
+        "code": 17007
     },
     "JSX element '{0}' has no corresponding closing tag.": {
-      "category": "Error",
-      "code": 17008
+        "category": "Error",
+        "code": 17008
     },
     "'super' must be called before accessing 'this' in the constructor of a derived class.": {
-      "category": "Error",
-      "code": 17009
+        "category": "Error",
+        "code": 17009
+    },
+    "Unknown typing option '{0}'.": {
+        "category": "Error",
+        "code": 17010
     }
 }
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index f04950e7786..03c7cf6390a 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -287,6 +287,54 @@ 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 {
         // emit output for the __extends helper function
@@ -297,6 +345,16 @@ var __extends = (this && this.__extends) || function (d, b) {
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };`;
 
+        const assignHelper = `
+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;
+};`;
+
         // emit output for the __decorate helper function
         const decorateHelper = `
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -332,6 +390,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         const languageVersion = getEmitScriptTarget(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();
@@ -342,6 +401,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         return {
             emitSkipped,
             diagnostics: emitterDiagnostics.getDiagnostics(),
+            emittedFiles: emittedFilesList,
             sourceMaps: sourceMapDataList
         };
 
@@ -359,14 +419,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 
         interface ConvertedLoopState {
             /*
-             * set of labels that occured inside the converted loop
+             * 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 apprear in code
+             * - 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>;
@@ -389,7 +449,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
              * 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 witg 'arguments_1'> }
+             * 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
@@ -419,6 +479,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
              * 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 {
@@ -487,6 +552,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             let convertedLoopState: ConvertedLoopState;
 
             let extendsEmitted: boolean;
+            let assignEmitted: boolean;
             let decorateEmitted: boolean;
             let paramEmitted: boolean;
             let awaiterEmitted: boolean;
@@ -551,7 +617,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                     write(`//# sourceMappingURL=${sourceMappingURL}`);
                 }
 
-                writeEmittedFiles(writer.getText(), jsFilePath, sourceMapFilePath, /*writeByteOrderMark*/ compilerOptions.emitBOM);
+                writeEmittedFiles(writer.getText(), jsFilePath, sourceMapFilePath, /*writeByteOrderMark*/ compilerOptions.emitBOM, sourceFiles);
 
                 // reset the state
                 sourceMap.reset();
@@ -570,6 +636,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 decorateEmitted = false;
                 paramEmitted = false;
                 awaiterEmitted = false;
+                assignEmitted = false;
                 tempFlags = 0;
                 tempVariables = undefined;
                 tempParameters = undefined;
@@ -695,16 +762,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             }
 
             /** Write emitted output to disk */
-            function writeEmittedFiles(emitOutput: string, jsFilePath: string, sourceMapFilePath: string, writeByteOrderMark: boolean) {
+            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);
+                    writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(), /*writeByteOrderMark*/ false, sourceFiles);
                 }
 
                 if (sourceMapDataList) {
                     sourceMapDataList.push(sourceMap.getSourceMapData());
                 }
 
-                writeFile(host, emitterDiagnostics, jsFilePath, emitOutput, writeByteOrderMark);
+                writeFile(host, emitterDiagnostics, jsFilePath, emitOutput, writeByteOrderMark, sourceFiles);
             }
 
             // Create a temporary variable with a unique unused name.
@@ -915,7 +982,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 // 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 ("`"), dolar signs and braces ("${" and "}"),
+                // 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 "${"
@@ -983,7 +1050,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                     return;
                 }
 
-                const emitOuterParens = isPartOfExpression(node.parent)
+                const emitOuterParens = node.parent.kind !== SyntaxKind.ArrowFunction
+                    && isPartOfExpression(node.parent)
                     && templateNeedsParens(node, <Expression>node.parent);
 
                 if (emitOuterParens) {
@@ -1115,9 +1183,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 /// 'Div' for upper-cased or dotted names
                 function emitTagName(name: Identifier | QualifiedName) {
                     if (name.kind === SyntaxKind.Identifier && isIntrinsicJsxName((<Identifier>name).text)) {
-                        write("\"");
+                        write('"');
                         emit(name);
-                        write("\"");
+                        write('"');
                     }
                     else {
                         emit(name);
@@ -1132,9 +1200,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                         emit(name);
                     }
                     else {
-                        write("\"");
+                        write('"');
                         emit(name);
-                        write("\"");
+                        write('"');
                     }
                 }
 
@@ -1169,11 +1237,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                     }
                     else {
                         // Either emit one big object literal (no spread attribs), or
-                        // a call to React.__spread
+                        // a call to the __assign helper
                         const attrs = openingNode.attributes;
                         if (forEach(attrs, attr => attr.kind === SyntaxKind.JsxSpreadAttribute)) {
-                            emitExpressionIdentifier(syntheticReactRef);
-                            write(".__spread(");
+                            write("__assign(");
 
                             let haveOpenedObjectLiteral = false;
                             for (let i = 0; i < attrs.length; i++) {
@@ -1403,7 +1470,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                     emit((<ComputedPropertyName>node).expression);
                 }
                 else {
-                    write("\"");
+                    write('"');
 
                     if (node.kind === SyntaxKind.NumericLiteral) {
                         write((<NumericLiteral>node).text);
@@ -1412,7 +1479,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                         writeTextOfNode(currentText, node);
                     }
 
-                    write("\"");
+                    write('"');
                 }
             }
 
@@ -1443,6 +1510,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                     case SyntaxKind.JsxSpreadAttribute:
                     case SyntaxKind.JsxExpression:
                     case SyntaxKind.NewExpression:
+                    case SyntaxKind.NonNullExpression:
                     case SyntaxKind.ParenthesizedExpression:
                     case SyntaxKind.PostfixUnaryExpression:
                     case SyntaxKind.PrefixUnaryExpression:
@@ -1502,7 +1570,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                             if (declaration.kind === SyntaxKind.ImportClause) {
                                 // Identifier references default import
                                 write(getGeneratedNameForNode(<ImportDeclaration>declaration.parent));
-                                write(languageVersion === ScriptTarget.ES3 ? "[\"default\"]" : ".default");
+                                write(languageVersion === ScriptTarget.ES3 ? '["default"]' : ".default");
                                 return;
                             }
                             else if (declaration.kind === SyntaxKind.ImportSpecifier) {
@@ -1511,7 +1579,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                                 const name =  (<ImportSpecifier>declaration).propertyName || (<ImportSpecifier>declaration).name;
                                 const identifier = getTextOfNodeFromSourceText(currentText, name);
                                 if (languageVersion === ScriptTarget.ES3 && identifier === "default") {
-                                    write(`["default"]`);
+                                    write('["default"]');
                                 }
                                 else {
                                     write(".");
@@ -1986,8 +2054,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             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 = (<AssertionExpression>expr).expression;
+                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
@@ -2047,6 +2117,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 return container && container.kind !== SyntaxKind.SourceFile;
             }
 
+            // 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.
@@ -2060,7 +2136,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 //       let obj = { y };
                 //   }
                 // Here we need to emit obj = { y : m.y } regardless of the output target.
-                if (modulekind !== ModuleKind.ES6 || isNamespaceExportReference(node.name)) {
+                // 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)) || isNamespaceExportReference(node.name) ) {
                     // Emit identifier as an identifier
                     write(": ");
                     emit(node.name);
@@ -2169,41 +2256,49 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 emit(node.right);
             }
 
-            function emitQualifiedNameAsExpression(node: QualifiedName, useFallback: boolean) {
+            function emitQualifiedNameAsExpression(node: QualifiedName, useFallback: boolean, location?: Node) {
                 if (node.left.kind === SyntaxKind.Identifier) {
-                    emitEntityNameAsExpression(node.left, useFallback);
+                    emitEntityNameAsExpression(node.left, useFallback, location);
                 }
                 else if (useFallback) {
                     const temp = createAndRecordTempVariable(TempFlags.Auto);
                     write("(");
                     emitNodeWithoutSourceMap(temp);
                     write(" = ");
-                    emitEntityNameAsExpression(node.left, /*useFallback*/ true);
+                    emitEntityNameAsExpression(node.left, /*useFallback*/ true, location);
                     write(") && ");
                     emitNodeWithoutSourceMap(temp);
                 }
                 else {
-                    emitEntityNameAsExpression(node.left, /*useFallback*/ false);
+                    emitEntityNameAsExpression(node.left, /*useFallback*/ false, location);
                 }
 
                 write(".");
                 emit(node.right);
             }
 
-            function emitEntityNameAsExpression(node: EntityName | Expression, useFallback: boolean) {
+            function emitEntityNameAsExpression(node: EntityName | Expression, useFallback: boolean, location?: Node) {
                 switch (node.kind) {
                     case SyntaxKind.Identifier:
+                        let name = <Identifier>node;
+                        if (location) {
+                            // to resolve the expression to the correct container, create a shallow
+                            // clone of `node` with a new parent.
+                            name = clone(name);
+                            name.parent = location;
+                        }
+
                         if (useFallback) {
                             write("typeof ");
-                            emitExpressionIdentifier(<Identifier>node);
+                            emitExpressionIdentifier(name);
                             write(" !== 'undefined' && ");
                         }
 
-                        emitExpressionIdentifier(<Identifier>node);
+                        emitExpressionIdentifier(name);
                         break;
 
                     case SyntaxKind.QualifiedName:
-                        emitQualifiedNameAsExpression(<QualifiedName>node, useFallback);
+                        emitQualifiedNameAsExpression(<QualifiedName>node, useFallback, location);
                         break;
 
                     default:
@@ -2235,8 +2330,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             }
 
             function skipParenthesesAndAssertions(node: Expression): Expression {
-                while (node.kind === SyntaxKind.ParenthesizedExpression || node.kind === SyntaxKind.TypeAssertionExpression || node.kind === SyntaxKind.AsExpression) {
-                    node = (<ParenthesizedExpression | AssertionExpression>node).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;
             }
@@ -2417,13 +2515,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 // 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) {
-                        let operand = (<TypeAssertion>node.expression).expression;
+                    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 = (<TypeAssertion>operand).expression;
+                        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)
@@ -2579,7 +2681,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 let current = getRootDeclaration(node).parent;
                 while (current) {
                     if (current.kind === SyntaxKind.SourceFile) {
-                        return !isExported || ((getCombinedNodeFlags(node) & NodeFlags.Export) !== 0);
+                        return !isExported || ((getCombinedModifierFlags(node) & ModifierFlags.Export) !== 0);
                     }
                     else if (isDeclaration(current)) {
                         return false;
@@ -2937,11 +3039,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 }
 
                 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) {
-                        collectNames(varDeclaration.name);
+                        processVariableDeclaration(varDeclaration.name);
                     }
                 }
 
@@ -2951,14 +3054,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 writeLine();
                 write(`var ${functionName} = function(${paramList})`);
 
-                if (!bodyIsBlock) {
-                    write(" {");
-                    writeLine();
-                    increaseIndent();
-                }
-
                 const convertedOuterLoopState = convertedLoopState;
-                convertedLoopState = {};
+                convertedLoopState = { loopOutParameters };
 
                 if (convertedOuterLoopState) {
                     // convertedOuterLoopState !== undefined means that this converted loop is nested in another converted loop.
@@ -2982,16 +3079,38 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                     }
                 }
 
-                emitEmbeddedStatement(node.statement);
+                write(" {");
+                writeLine();
+                increaseIndent();
 
-                if (!bodyIsBlock) {
-                    decreaseIndent();
-                    writeLine();
-                    write("}");
+                if (bodyIsBlock) {
+                    emitLines((<Block>node.statement).statements);
                 }
-                write(";");
+                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) {
@@ -3055,14 +3174,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 
                 return { functionName, paramList, state: currentLoopState };
 
-                function collectNames(name: Identifier | BindingPattern): void {
+                function processVariableDeclaration(name: Identifier | BindingPattern): void {
                     if (name.kind === SyntaxKind.Identifier) {
-                        const nameText = isNameOfNestedBlockScopedRedeclarationOrCapturedBinding(<Identifier>name) ? getGeneratedNameForNode(name) : (<Identifier>name).text;
+                        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) {
-                            collectNames(element.name);
+                            processVariableDeclaration(element.name);
                         }
                     }
                 }
@@ -3093,6 +3219,28 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 }
             }
 
+            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(" {");
@@ -3102,8 +3250,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 
                 // 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 &&
+                    !(loop.state.nonLocalJumps & ~Jump.Continue) &&
                     !loop.state.labeledNonLocalBreaks &&
                     !loop.state.labeledNonLocalContinues;
 
@@ -3113,6 +3262,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 }
 
                 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
@@ -3141,13 +3293,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                         writeLine();
                     }
 
-                    if (loop.state.nonLocalJumps & Jump.Continue) {
-                        write(`if (${loopResult} === "continue") continue;`);
-                        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) {
@@ -3433,14 +3581,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                         (!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(`return "break";`);
+                                write(`"break";`);
                             }
                             else {
                                 convertedLoopState.nonLocalJumps |= Jump.Continue;
-                                write(`return "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 {
@@ -3453,7 +3605,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                                 labelMarker = `continue-${node.label.text}`;
                                 setLabeledJump(convertedLoopState, /*isBreak*/ false, node.label.text, labelMarker);
                             }
-                            write(`return "${labelMarker}";`);
+                            write(`"${labelMarker}";`);
                         }
 
                         return;
@@ -3627,7 +3779,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 
             function emitModuleMemberName(node: Declaration) {
                 emitStart(node.name);
-                if (getCombinedNodeFlags(node) & NodeFlags.Export) {
+                if (getCombinedModifierFlags(node) & ModifierFlags.Export) {
                     const container = getContainingModule(node);
                     if (container) {
                         write(getGeneratedNameForNode(container));
@@ -3651,13 +3803,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 
             function emitEs6ExportDefaultCompat(node: Node) {
                 if (node.parent.kind === SyntaxKind.SourceFile) {
-                    Debug.assert(!!(node.flags & NodeFlags.Default) || node.kind === SyntaxKind.ExportAssignment);
+                    Debug.assert(hasModifier(node, ModifierFlags.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 });");
+                                write('Object.defineProperty(exports, "__esModule", { value: true });');
                                 writeLine();
                             }
                             else {
@@ -3670,7 +3822,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             }
 
             function emitExportMemberAssignment(node: FunctionLikeDeclaration | ClassDeclaration) {
-                if (node.flags & NodeFlags.Export) {
+                if (hasModifier(node, ModifierFlags.Export)) {
                     writeLine();
                     emitStart(node);
 
@@ -3679,7 +3831,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                         // emit export default <smth> as
                         // export("default", <smth>)
                         write(`${exportFunctionForFile}("`);
-                        if (node.flags & NodeFlags.Default) {
+                        if (hasModifier(node, ModifierFlags.Default)) {
                             write("default");
                         }
                         else {
@@ -3690,10 +3842,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                         write(")");
                     }
                     else {
-                        if (node.flags & NodeFlags.Default) {
+                        if (hasModifier(node, ModifierFlags.Default)) {
                             emitEs6ExportDefaultCompat(node);
                             if (languageVersion === ScriptTarget.ES3) {
-                                write("exports[\"default\"]");
+                                write('exports["default"]');
                             }
                             else {
                                 write("exports.default");
@@ -3784,7 +3936,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                     write(" = ");
                     emit(value);
                 });
-                emitEnd(nodeForSourceMap, /*stopOverridingSpan*/true);
+                emitEnd(nodeForSourceMap);
+                sourceMap.stopOverridingSpan();
 
                 if (exportChanged) {
                     write(")");
@@ -3821,7 +3974,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 // because actual variable declarations are hoisted
                 let canDefineTempVariablesInPlace = false;
                 if (root.kind === SyntaxKind.VariableDeclaration) {
-                    const isExported = getCombinedNodeFlags(root) & NodeFlags.Export;
+                    const isExported = getCombinedModifierFlags(root) & ModifierFlags.Export;
                     const isSourceLevelForSystemModuleKind = shouldHoistDeclarationInSystemJsModule(root);
                     canDefineTempVariablesInPlace = !isExported && !isSourceLevelForSystemModuleKind;
                 }
@@ -3929,14 +4082,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                     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
+                        // 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 highligh whole property, hence use p as source map node
+                            // Assignment for target = value.propName should highlight whole property, hence use p as source map node
                             emitDestructuringAssignment(target, createPropertyAccessForDestructuringProperty(value, propName), p);
                         }
                     }
@@ -3947,13 +4100,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                     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 hightlight the passed in source map node since thats the one needing this temp assignment
+                        // 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 highligh whole property, hence use e as source map node
+                            // 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);
                             }
@@ -4068,12 +4221,31 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 
             function emitVariableDeclaration(node: VariableDeclaration) {
                 if (isBindingPattern(node.name)) {
-                    if (languageVersion < ScriptTarget.ES6) {
-                        emitDestructuring(node, /*isAssignmentExpressionStatement*/ false);
-                    }
-                    else {
+                    const isExported = getCombinedModifierFlags(node) & ModifierFlags.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 {
@@ -4163,7 +4335,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             }
 
             function isES6ExportedDeclaration(node: Node) {
-                return !!(node.flags & NodeFlags.Export) &&
+                return hasModifier(node, ModifierFlags.Export) &&
                     modulekind === ModuleKind.ES6 &&
                     node.parent.kind === SyntaxKind.SourceFile;
             }
@@ -4171,7 +4343,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             function emitVariableStatement(node: VariableStatement) {
                 let startIsEmitted = false;
 
-                if (node.flags & NodeFlags.Export) {
+                if (hasModifier(node, ModifierFlags.Export)) {
                     if (isES6ExportedDeclaration(node)) {
                         // Exported ES6 module member
                         write("export ");
@@ -4200,7 +4372,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             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)) {
+                if (!hasModifier(node, ModifierFlags.Export)) {
                     return true;
                 }
 
@@ -4295,7 +4467,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             }
 
             function emitRestParameter(node: FunctionLikeDeclaration) {
-                if (languageVersion < ScriptTarget.ES6 && hasRestParameter(node)) {
+                if (languageVersion < ScriptTarget.ES6 && hasDeclaredRestParameter(node)) {
                     const restIndex = node.parameters.length - 1;
                     const restParam = node.parameters[restIndex];
 
@@ -4408,7 +4580,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 if (!shouldEmitAsArrowFunction(node)) {
                     if (isES6ExportedDeclaration(node)) {
                         write("export ");
-                        if (node.flags & NodeFlags.Default) {
+                        if (hasModifier(node, ModifierFlags.Default)) {
                             write("default ");
                         }
                     }
@@ -4430,7 +4602,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 }
 
                 emitEnd(node);
-                if (kind !== SyntaxKind.MethodDeclaration && kind !== SyntaxKind.MethodSignature) {
+                if (kind !== SyntaxKind.MethodDeclaration &&
+                    kind !== SyntaxKind.MethodSignature &&
+                    kind !== SyntaxKind.ArrowFunction) {
                     emitTrailingComments(node);
                 }
             }
@@ -4449,8 +4623,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 write("(");
                 if (node) {
                     const parameters = node.parameters;
-                    const omitCount = languageVersion < ScriptTarget.ES6 && hasRestParameter(node) ? 1 : 0;
-                    emitList(parameters, 0, parameters.length - omitCount, /*multiLine*/ false, /*trailingComma*/ false);
+                    const skipCount = node.parameters.length && (<Identifier>node.parameters[0].name).text === "this" ? 1 : 0;
+                    const omitCount = languageVersion < ScriptTarget.ES6 && hasDeclaredRestParameter(node) ? 1 : 0;
+                    emitList(parameters, skipCount, parameters.length - omitCount - skipCount, /*multiLine*/ false, /*trailingComma*/ false);
                 }
                 write(")");
                 decreaseIndent();
@@ -4661,7 +4836,7 @@ const _super = (function (geti, seti) {
             }
 
             function emitExpressionFunctionBody(node: FunctionLikeDeclaration, body: Expression) {
-                if (languageVersion < ScriptTarget.ES6 || node.flags & NodeFlags.Async) {
+                if (languageVersion < ScriptTarget.ES6 || hasModifier(node, ModifierFlags.Async)) {
                     emitDownLevelExpressionFunctionBody(node, body);
                     return;
                 }
@@ -4760,24 +4935,30 @@ const _super = (function (geti, seti) {
                 emitToken(SyntaxKind.CloseBraceToken, body.statements.end);
             }
 
-            function findInitialSuperCall(ctor: ConstructorDeclaration): ExpressionStatement {
-                if (ctor.body) {
-                    const statement = (<Block>ctor.body).statements[0];
-                    if (statement && statement.kind === SyntaxKind.ExpressionStatement) {
-                        const expr = (<ExpressionStatement>statement).expression;
-                        if (expr && expr.kind === SyntaxKind.CallExpression) {
-                            const func = (<CallExpression>expr).expression;
-                            if (func && func.kind === SyntaxKind.SuperKeyword) {
-                                return <ExpressionStatement>statement;
-                            }
-                        }
-                    }
+            /**
+             * 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.AccessibilityModifier) {
+                    if (hasModifier(param, ModifierFlags.AccessibilityModifier)) {
                         writeLine();
                         emitStart(param);
                         emitStart(param.name);
@@ -4813,7 +4994,7 @@ const _super = (function (geti, seti) {
             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) {
+                    if (member.kind === SyntaxKind.PropertyDeclaration && isStatic === hasModifier(member, ModifierFlags.Static) && (<PropertyDeclaration>member).initializer) {
                         properties.push(<PropertyDeclaration>member);
                     }
                 }
@@ -4836,7 +5017,7 @@ const _super = (function (geti, seti) {
                     emit(receiver);
                 }
                 else {
-                    if (property.flags & NodeFlags.Static) {
+                    if (hasModifier(property, ModifierFlags.Static)) {
                         emitDeclarationName(node);
                     }
                     else {
@@ -4938,7 +5119,7 @@ const _super = (function (geti, seti) {
                         writeLine();
                         emitLeadingComments(member);
                         emitStart(member);
-                        if (member.flags & NodeFlags.Static) {
+                        if (hasModifier(member, ModifierFlags.Static)) {
                             write("static ");
                         }
 
@@ -4996,7 +5177,7 @@ const _super = (function (geti, seti) {
                         emitCommentsOnNotEmittedNode(member);
                     }
                     // Check if there is any non-static property assignment
-                    if (member.kind === SyntaxKind.PropertyDeclaration && (<PropertyDeclaration>member).initializer && (member.flags & NodeFlags.Static) === 0) {
+                    if (member.kind === SyntaxKind.PropertyDeclaration && (<PropertyDeclaration>member).initializer && !hasModifier(member, ModifierFlags.Static)) {
                         hasInstancePropertyWithInitializer = true;
                     }
                 });
@@ -5055,13 +5236,15 @@ const _super = (function (geti, seti) {
                 if (ctor) {
                     emitDefaultValueAssignments(ctor);
                     emitRestParameter(ctor);
+
                     if (baseTypeElement) {
-                        superCall = findInitialSuperCall(ctor);
+                        superCall = getSuperCallAtGivenIndex(ctor, startIndex);
                         if (superCall) {
                             writeLine();
                             emit(superCall);
                         }
                     }
+
                     emitParameterPropertyAssignments(ctor);
                 }
                 else {
@@ -5120,9 +5303,11 @@ const _super = (function (geti, seti) {
 
             function emitClassLikeDeclarationForES6AndHigher(node: ClassLikeDeclaration) {
                 let decoratedClassAlias: string;
-                const thisNodeIsDecorated = nodeIsDecorated(node);
+                const isHoistedDeclarationInSystemModule = shouldHoistDeclarationInSystemJsModule(node);
+                const isDecorated = nodeIsDecorated(node);
+                const rewriteAsClassExpression = isDecorated || isHoistedDeclarationInSystemModule;
                 if (node.kind === SyntaxKind.ClassDeclaration) {
-                    if (thisNodeIsDecorated) {
+                    if (rewriteAsClassExpression) {
                         // When we emit an ES6 class that has a class decorator, we must tailor the
                         // emit to certain specific cases.
                         //
@@ -5203,18 +5388,23 @@ const _super = (function (geti, seti) {
                         //  [Example 4]
                         //
 
-                        if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.DecoratedClassWithSelfReference) {
+                        // 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.DecoratedClassWithSelfReference) {
                             decoratedClassAlias = unescapeIdentifier(makeUniqueName(node.name ? node.name.text : "default"));
                             decoratedClassAliases[getNodeId(node)] = decoratedClassAlias;
                             write(`let ${decoratedClassAlias};`);
                             writeLine();
                         }
 
-                        if (isES6ExportedDeclaration(node) && !(node.flags & NodeFlags.Default)) {
+                        if (isES6ExportedDeclaration(node) && !hasModifier(node, ModifierFlags.Default)) {
                             write("export ");
                         }
 
-                        write("let ");
+                        if (!isHoistedDeclarationInSystemModule) {
+                            write("let ");
+                        }
                         emitDeclarationName(node);
                         if (decoratedClassAlias !== undefined) {
                             write(` = ${decoratedClassAlias}`);
@@ -5224,7 +5414,7 @@ const _super = (function (geti, seti) {
                     }
                     else if (isES6ExportedDeclaration(node)) {
                         write("export ");
-                        if (node.flags & NodeFlags.Default) {
+                        if (hasModifier(node, ModifierFlags.Default)) {
                             write("default ");
                         }
                     }
@@ -5258,7 +5448,7 @@ const _super = (function (geti, seti) {
                 // 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) && !thisNodeIsDecorated)) {
+                if (node.name || (hasModifier(node, ModifierFlags.Default) && (staticProperties.length > 0 || modulekind !== ModuleKind.ES6) && !rewriteAsClassExpression)) {
                     write(" ");
                     emitDeclarationName(node);
                 }
@@ -5278,7 +5468,7 @@ const _super = (function (geti, seti) {
                 writeLine();
                 emitToken(SyntaxKind.CloseBraceToken, node.members.end);
 
-                if (thisNodeIsDecorated) {
+                if (rewriteAsClassExpression) {
                     decoratedClassAliases[getNodeId(node)] = undefined;
                     write(";");
                 }
@@ -5307,7 +5497,7 @@ const _super = (function (geti, seti) {
                     emitDecoratorsOfClass(node, decoratedClassAlias);
                 }
 
-                if (!(node.flags & NodeFlags.Export)) {
+                if (!hasModifier(node, ModifierFlags.Export)) {
                     return;
                 }
                 if (modulekind !== ModuleKind.ES6) {
@@ -5316,9 +5506,9 @@ const _super = (function (geti, seti) {
                 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 (hasModifier(node, ModifierFlags.Default)) {
                         // if this is a top level default export of decorated class, write the export after the declaration.
-                        if (thisNodeIsDecorated) {
+                        if (isDecorated) {
                             writeLine();
                             write("export default ");
                             emitDeclarationName(node);
@@ -5439,14 +5629,14 @@ const _super = (function (geti, seti) {
 
             function emitClassMemberPrefix(node: ClassLikeDeclaration, member: Node) {
                 emitDeclarationName(node);
-                if (!(member.flags & NodeFlags.Static)) {
+                if (!hasModifier(member, ModifierFlags.Static)) {
                     write(".prototype");
                 }
             }
 
             function emitDecoratorsOfClass(node: ClassLikeDeclaration, decoratedClassAlias: string) {
                 emitDecoratorsOfMembers(node, /*staticFlag*/ 0);
-                emitDecoratorsOfMembers(node, NodeFlags.Static);
+                emitDecoratorsOfMembers(node, ModifierFlags.Static);
                 emitDecoratorsOfConstructor(node, decoratedClassAlias);
             }
 
@@ -5500,10 +5690,10 @@ const _super = (function (geti, seti) {
                 writeLine();
             }
 
-            function emitDecoratorsOfMembers(node: ClassLikeDeclaration, staticFlag: NodeFlags) {
+            function emitDecoratorsOfMembers(node: ClassLikeDeclaration, staticFlag: ModifierFlags) {
                 for (const member of node.members) {
                     // only emit members in the correct group
-                    if ((member.flags & NodeFlags.Static) !== staticFlag) {
+                    if ((getModifierFlags(member) & ModifierFlags.Static) !== staticFlag) {
                         continue;
                     }
 
@@ -5787,22 +5977,21 @@ const _super = (function (geti, seti) {
                 }
 
                 // 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);
+                const result = resolver.getTypeReferenceSerializationKind(node.typeName, location);
                 switch (result) {
                     case TypeReferenceSerializationKind.Unknown:
                         let temp = createAndRecordTempVariable(TempFlags.Auto);
                         write("(typeof (");
                         emitNodeWithoutSourceMap(temp);
                         write(" = ");
-                        emitEntityNameAsExpression(typeName, /*useFallback*/ true);
+                        emitEntityNameAsExpression(node.typeName, /*useFallback*/ true, location);
                         write(") === 'function' && ");
                         emitNodeWithoutSourceMap(temp);
                         write(") || Object");
                         break;
 
                     case TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue:
-                        emitEntityNameAsExpression(typeName, /*useFallback*/ false);
+                        emitEntityNameAsExpression(node.typeName, /*useFallback*/ false, location);
                         break;
 
                     case TypeReferenceSerializationKind.VoidType:
@@ -5964,7 +6153,7 @@ const _super = (function (geti, seti) {
                     // 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))) {
+                    if (!hasModifier(node, ModifierFlags.Export) || (isES6ExportedEnum && isFirstDeclarationOfKind(node, node.symbol && node.symbol.declarations, SyntaxKind.EnumDeclaration))) {
                         emitStart(node);
                         if (isES6ExportedEnum) {
                             write("export ");
@@ -5993,7 +6182,7 @@ const _super = (function (geti, seti) {
                 emitModuleMemberName(node);
                 write(" = {}));");
                 emitEnd(node);
-                if (!isES6ExportedDeclaration(node) && node.flags & NodeFlags.Export && !shouldHoistDeclarationInSystemJsModule(node)) {
+                if (!isES6ExportedDeclaration(node) && hasModifier(node, ModifierFlags.Export) && !shouldHoistDeclarationInSystemJsModule(node)) {
                     // do not emit var if variable was already hoisted
                     writeLine();
                     emitStart(node);
@@ -6005,7 +6194,7 @@ const _super = (function (geti, seti) {
                     write(";");
                 }
                 if (modulekind !== ModuleKind.ES6 && node.parent === currentSourceFile) {
-                    if (modulekind === ModuleKind.System && (node.flags & NodeFlags.Export)) {
+                    if (modulekind === ModuleKind.System && hasModifier(node, ModifierFlags.Export)) {
                         // write the call to exporter for enum
                         writeLine();
                         write(`${exportFunctionForFile}("`);
@@ -6127,7 +6316,7 @@ const _super = (function (geti, seti) {
                 }
                 write(")(");
                 // write moduleDecl = containingModule.m only if it is not exported es6 module member
-                if ((node.flags & NodeFlags.Export) && !isES6ExportedDeclaration(node)) {
+                if (hasModifier(node, ModifierFlags.Export) && !isES6ExportedDeclaration(node)) {
                     emit(node.name);
                     write(" = ");
                 }
@@ -6137,7 +6326,7 @@ const _super = (function (geti, seti) {
                 write(" = {}));");
                 emitEnd(node);
                 if (!isES6ExportedDeclaration(node) && node.name.kind === SyntaxKind.Identifier && node.parent === currentSourceFile) {
-                    if (modulekind === ModuleKind.System && (node.flags & NodeFlags.Export)) {
+                    if (modulekind === ModuleKind.System && hasModifier(node, ModifierFlags.Export)) {
                         writeLine();
                         write(`${exportFunctionForFile}("`);
                         emitDeclarationName(node);
@@ -6249,7 +6438,7 @@ const _super = (function (geti, seti) {
 
             function emitExternalImportDeclaration(node: ImportDeclaration | ImportEqualsDeclaration) {
                 if (contains(externalImports, node)) {
-                    const isExportedImport = node.kind === SyntaxKind.ImportEqualsDeclaration && (node.flags & NodeFlags.Export) !== 0;
+                    const isExportedImport = node.kind === SyntaxKind.ImportEqualsDeclaration && hasModifier(node, ModifierFlags.Export);
                     const namespaceDeclaration = getNamespaceDeclarationNode(node);
                     const varOrConst = (languageVersion <= ScriptTarget.ES5) ? "var " : "const ";
 
@@ -6339,7 +6528,7 @@ const _super = (function (geti, seti) {
                             write("export ");
                             write("var ");
                         }
-                        else if (!(node.flags & NodeFlags.Export)) {
+                        else if (!hasModifier(node, ModifierFlags.Export)) {
                             write("var ");
                         }
                     }
@@ -6481,7 +6670,7 @@ const _super = (function (geti, seti) {
                             emitEs6ExportDefaultCompat(node);
                             emitContainingModuleName(node);
                             if (languageVersion === ScriptTarget.ES3) {
-                                write("[\"default\"] = ");
+                                write('["default"] = ');
                             }
                             else {
                                 write(".default = ");
@@ -6628,7 +6817,7 @@ const _super = (function (geti, seti) {
                 // 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.
+                // 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;
@@ -6732,7 +6921,7 @@ const _super = (function (geti, seti) {
                 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) {
+                    if (node.kind !== SyntaxKind.Identifier && hasModifier(node, ModifierFlags.Default)) {
                         return;
                     }
 
@@ -6804,8 +6993,8 @@ const _super = (function (geti, seti) {
                             emit(local);
                         }
 
-                        const flags = getCombinedNodeFlags(local.kind === SyntaxKind.Identifier ? local.parent : local);
-                        if (flags & NodeFlags.Export) {
+                        const flags = getCombinedModifierFlags(local.kind === SyntaxKind.Identifier ? local.parent : local);
+                        if (flags & ModifierFlags.Export) {
                             if (!exportedDeclarations) {
                                 exportedDeclarations = [];
                             }
@@ -6820,7 +7009,7 @@ const _super = (function (geti, seti) {
                         writeLine();
                         emit(f);
 
-                        if (f.flags & NodeFlags.Export) {
+                        if (hasModifier(f, ModifierFlags.Export)) {
                             if (!exportedDeclarations) {
                                 exportedDeclarations = [];
                             }
@@ -6832,7 +7021,7 @@ const _super = (function (geti, seti) {
                 return exportedDeclarations;
 
                 function visit(node: Node): void {
-                    if (node.flags & NodeFlags.Ambient) {
+                    if (hasModifier(node, ModifierFlags.Ambient)) {
                         return;
                     }
 
@@ -7174,7 +7363,7 @@ const _super = (function (geti, seti) {
                 write(`], function(${exportFunctionForFile}, ${contextObjectForFile}) {`);
                 writeLine();
                 increaseIndent();
-                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ true);
+                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict);
                 writeLine();
                 write(`var __moduleName = ${contextObjectForFile} && ${contextObjectForFile}.id;`);
                 writeLine();
@@ -7204,11 +7393,11 @@ const _super = (function (geti, seti) {
                 // Fill in amd-dependency tags
                 for (const amdDependency of node.amdDependencies) {
                     if (amdDependency.name) {
-                        aliasedModuleNames.push("\"" + amdDependency.path + "\"");
+                        aliasedModuleNames.push('"' + amdDependency.path + '"');
                         importAliasNames.push(amdDependency.name);
                     }
                     else {
-                        unaliasedModuleNames.push("\"" + amdDependency.path + "\"");
+                        unaliasedModuleNames.push('"' + amdDependency.path + '"');
                     }
                 }
 
@@ -7250,7 +7439,7 @@ const _super = (function (geti, seti) {
             }
 
             function emitAMDDependencyList({ aliasedModuleNames, unaliasedModuleNames }: AMDDependencyNames) {
-                write("[\"require\", \"exports\"");
+                write('["require", "exports"');
                 if (aliasedModuleNames.length) {
                     write(", ");
                     write(aliasedModuleNames.join(", "));
@@ -7280,26 +7469,26 @@ const _super = (function (geti, seti) {
                 writeModuleName(node, emitRelativePathAsModuleName);
                 emitAMDDependencies(node, /*includeNonAmdDependencies*/ true, emitRelativePathAsModuleName);
                 increaseIndent();
-                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ true);
+                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/!compilerOptions.noImplicitUseStrict);
                 emitExportStarHelper();
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
-                emitTempDeclarations(/*newLine*/ true);
                 emitExportEquals(/*emitAsReturn*/ true);
+                emitTempDeclarations(/*newLine*/ true);
                 decreaseIndent();
                 writeLine();
                 write("});");
             }
 
             function emitCommonJSModule(node: SourceFile) {
-                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false, /*ensureUseStrict*/ true);
+                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict);
                 emitEmitHelpers(node);
                 collectExternalModuleInfo(node);
                 emitExportStarHelper();
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
-                emitTempDeclarations(/*newLine*/ true);
                 emitExportEquals(/*emitAsReturn*/ false);
+                emitTempDeclarations(/*newLine*/ true);
             }
 
             function emitUMDModule(node: SourceFile) {
@@ -7321,12 +7510,12 @@ const _super = (function (geti, seti) {
 })(`);
                 emitAMDFactoryHeader(dependencyNames);
                 increaseIndent();
-                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ true);
+                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict);
                 emitExportStarHelper();
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
-                emitTempDeclarations(/*newLine*/ true);
                 emitExportEquals(/*emitAsReturn*/ true);
+                emitTempDeclarations(/*newLine*/ true);
                 decreaseIndent();
                 writeLine();
                 write("});");
@@ -7384,7 +7573,7 @@ const _super = (function (geti, seti) {
                     if (isLineBreak(c)) {
                         if (firstNonWhitespace !== -1 && (lastNonWhitespace - firstNonWhitespace + 1 > 0)) {
                             const part = text.substr(firstNonWhitespace, lastNonWhitespace - firstNonWhitespace + 1);
-                            result = (result ? result + "\" + ' ' + \"" : "") + escapeString(part);
+                            result = (result ? result + `" + ' ' + "` : "") + escapeString(part);
                         }
                         firstNonWhitespace = -1;
                     }
@@ -7407,7 +7596,7 @@ const _super = (function (geti, seti) {
                         if (entities[m] !== undefined) {
                             const ch = String.fromCharCode(entities[m]);
                             // &quot; needs to be escaped
-                            return ch === "\"" ? "\\\"" : ch;
+                            return ch === '"' ? "\\\"" : ch;
                         }
                         else {
                             return s;
@@ -7451,9 +7640,9 @@ const _super = (function (geti, seti) {
             function emitJsxText(node: JsxText) {
                 switch (compilerOptions.jsx) {
                     case JsxEmit.React:
-                        write("\"");
+                        write('"');
                         write(trimReactWhitespaceAndApplyEntities(node));
-                        write("\"");
+                        write('"');
                         break;
 
                     case JsxEmit.Preserve:
@@ -7480,7 +7669,7 @@ const _super = (function (geti, seti) {
             }
 
             function isUseStrictPrologue(node: ExpressionStatement): boolean {
-                return !!(node.expression as StringLiteral).text.match(/use strict/);
+                return (node.expression as StringLiteral).text === "use strict";
             }
 
             function ensureUseStrictPrologue(startWithNewLine: boolean, writeUseStrict: boolean) {
@@ -7530,11 +7719,16 @@ const _super = (function (geti, seti) {
                 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)) {
+                    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) {
@@ -7596,7 +7790,7 @@ const _super = (function (geti, seti) {
 
             function emitNodeConsideringCommentsOption(node: Node, emitNodeConsideringSourcemap: (node: Node) => void): void {
                 if (node) {
-                    if (node.flags & NodeFlags.Ambient) {
+                    if (hasModifier(node, ModifierFlags.Ambient)) {
                         return emitCommentsOnNotEmittedNode(node);
                     }
 
@@ -7769,9 +7963,9 @@ const _super = (function (geti, seti) {
                     case SyntaxKind.TaggedTemplateExpression:
                         return emitTaggedTemplateExpression(<TaggedTemplateExpression>node);
                     case SyntaxKind.TypeAssertionExpression:
-                        return emit((<TypeAssertion>node).expression);
                     case SyntaxKind.AsExpression:
-                        return emit((<AsExpression>node).expression);
+                    case SyntaxKind.NonNullExpression:
+                        return emit((<AssertionExpression | NonNullExpression>node).expression);
                     case SyntaxKind.ParenthesizedExpression:
                         return emitParenExpression(<ParenthesizedExpression>node);
                     case SyntaxKind.FunctionDeclaration:
@@ -7959,7 +8153,7 @@ const _super = (function (geti, seti) {
                     //      declare var x;
                     //      /// <reference-path ...>
                     //      interface F {}
-                    //  The first /// will NOT be removed while the second one will be removed eventhough both node will not be emitted
+                    //  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);
                     }
@@ -8061,6 +8255,16 @@ const _super = (function (geti, seti) {
             if (declarationFilePath) {
                 emitSkipped = writeDeclarationFile(declarationFilePath, sourceFiles, isBundledEmit, host, resolver, emitterDiagnostics) || emitSkipped;
             }
+
+            if (!emitSkipped && emittedFilesList) {
+                emittedFilesList.push(jsFilePath);
+                if (sourceMapFilePath) {
+                    emittedFilesList.push(sourceMapFilePath);
+                }
+                if (declarationFilePath) {
+                    emittedFilesList.push(declarationFilePath);
+                }
+            }
         }
     }
 }
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index a39919ce681..06a7bb66e71 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -3,10 +3,12 @@
 
 /* @internal */
 namespace ts {
+    const synthesizedLocation: TextRange = { pos: -1, end: -1 };
+
     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 {
+    function createNode(kind: SyntaxKind, location?: TextRange, flags?: NodeFlags, emitOptions?: NodeEmitOptions): Node {
         const ConstructorForKind = kind === SyntaxKind.SourceFile
             ? (SourceFileConstructor || (SourceFileConstructor = objectAllocator.getSourceFileConstructor()))
             : (NodeConstructor || (NodeConstructor = objectAllocator.getNodeConstructor()));
@@ -19,6 +21,10 @@ namespace ts {
             node.flags = flags;
         }
 
+        if (emitOptions) {
+            node.emitOptions = emitOptions;
+        }
+
         return node;
     }
 
@@ -46,55 +52,9 @@ namespace ts {
             array.hasTrailingComma = true;
         }
 
-        array.arrayKind = ArrayKind.NodeArray;
         return array;
     }
 
-    export function createModifiersArray(elements?: Modifier[], location?: TextRange): ModifiersArray {
-        let flags: NodeFlags;
-        if (elements) {
-            if (isModifiersArray(elements)) {
-                return elements;
-            }
-
-            flags = 0;
-            for (const modifier of elements) {
-                flags |= modifierToFlag(modifier.kind);
-            }
-        }
-        else {
-            elements = [];
-            flags = 0;
-        }
-
-        const array = <ModifiersArray>elements;
-        if (location) {
-            array.pos = location.pos;
-            array.end = location.end;
-        }
-        else {
-            array.pos = -1;
-            array.end = -1;
-        }
-
-        array.arrayKind = ArrayKind.ModifiersArray;
-        array.flags = flags;
-        return array;
-    }
-
-    export function setModifiers<T extends Node>(node: T, modifiers: Modifier[]) {
-        if (modifiers) {
-            const array = createModifiersArray(modifiers);
-            node.modifiers = array;
-            node.flags |= array.flags;
-        }
-        else {
-            node.modifiers = undefined;
-        }
-
-        return node;
-    }
-
     export function createSynthesizedNode(kind: SyntaxKind, startsOnNewLine?: boolean): Node {
         const node = createNode(kind, /*location*/ undefined);
         node.startsOnNewLine = startsOnNewLine;
@@ -105,26 +65,16 @@ namespace ts {
         return createNodeArray(elements, /*location*/ undefined);
     }
 
-    export function createSynthesizedModifiersArray(elements?: Modifier[]): ModifiersArray {
-        return createModifiersArray(elements, /*location*/ undefined);
-    }
-
     /**
-     * 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.
-     * @param original An optional pointer to the original source tree node.
+     * Creates a shallow, memberwise clone of a node with no source map location.
      */
-    export function cloneNode<T extends Node>(node: T, location?: TextRange, flags?: NodeFlags, parent?: Node, original?: Node): T {
+    export function getSynthesizedClone<T extends Node>(node: T, emitOptions?: NodeEmitOptions): 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);
+        const clone = <T>createNode(node.kind, /*location*/ undefined, /*flags*/ undefined, emitOptions);
+        clone.flags = node.flags;
+        clone.original = node;
 
         for (const key in node) {
             if (clone.hasOwnProperty(key) || !node.hasOwnProperty(key)) {
@@ -134,66 +84,54 @@ namespace ts {
             (<any>clone)[key] = (<any>node)[key];
         }
 
-        if (flags !== undefined) {
-            clone.flags = flags;
-        }
-
-        if (parent !== undefined) {
-            clone.parent = parent;
-        }
-
-        if (original !== undefined) {
-            clone.original = original;
-        }
-
         return clone;
     }
 
     /**
      * Creates a shallow, memberwise clone of a node for mutation.
      */
-    export function getMutableClone<T extends Node>(node: T): T {
-        return cloneNode(node, /*location*/ node, node.flags, /*parent*/ undefined, /*original*/ node);
+    export function getMutableClone<T extends Node>(node: T, emitOptions?: NodeEmitOptions): T {
+        const clone = getSynthesizedClone(node, emitOptions);
+        clone.pos = node.pos;
+        clone.end = node.end;
+        clone.parent = node.parent;
+        return clone;
     }
 
     /**
-     * Creates a shallow, memberwise clone of a node with no source map location.
+     * Gets a clone of a node with a unique node ID.
      */
-    export function getSynthesizedClone<T extends Node>(node: T): T {
-        return nodeIsSynthesized(node) ? node : cloneNode(node, /*location*/ undefined, node.flags, /*parent*/ undefined, /*original*/ node);
-    }
-
-    /**
-     * Creates a shallow, memberwise clone of a node at the specified source map location.
-     */
-    export function getRelocatedClone<T extends Node>(node: T, location: TextRange): T {
-        return cloneNode(node, location, node.flags, /*parent*/ undefined, /*original*/ node);
-    }
-
-    export function createNodeArrayNode<T extends Node>(elements: T[]): NodeArrayNode<T> {
-        const node = <NodeArrayNode<T>>createSynthesizedNode(SyntaxKind.NodeArrayNode);
-        node.nodes = createNodeArray(elements);
-        return node;
+    export function getUniqueClone<T extends Node>(node: T, emitOptions?: NodeEmitOptions): T {
+        const clone = getMutableClone(node, emitOptions);
+        clone.id = undefined;
+        getNodeId(clone);
+        return clone;
     }
 
     // Literals
 
-    export function createLiteral(value: string, location?: TextRange): StringLiteral;
-    export function createLiteral(value: number, location?: TextRange, trailingComment?: string): NumericLiteral;
-    export function createLiteral(value: string | number | boolean, location?: TextRange): PrimaryExpression;
-    export function createLiteral(value: string | number | boolean, location?: TextRange, trailingComment?: string): PrimaryExpression {
+    export function createLiteral(textSource: StringLiteral | Identifier, location?: TextRange, emitOptions?: NodeEmitOptions): StringLiteral;
+    export function createLiteral(value: string, location?: TextRange, emitOptions?: NodeEmitOptions): StringLiteral;
+    export function createLiteral(value: number, location?: TextRange, emitOptions?: NodeEmitOptions): LiteralExpression;
+    export function createLiteral(value: string | number | boolean, location?: TextRange, emitOptions?: NodeEmitOptions): PrimaryExpression;
+    export function createLiteral(value: string | number | boolean | StringLiteral | Identifier, location?: TextRange, emitOptions?: NodeEmitOptions): PrimaryExpression {
         if (typeof value === "number") {
-            const node = <NumericLiteral>createNode(SyntaxKind.NumericLiteral, location);
+            const node = <LiteralExpression>createNode(SyntaxKind.NumericLiteral, location, /*flags*/ undefined, emitOptions);
             node.text = value.toString();
-            node.trailingComment = trailingComment;
             return node;
         }
         else if (typeof value === "boolean") {
-            return <PrimaryExpression>createNode(value ? SyntaxKind.TrueKeyword : SyntaxKind.FalseKeyword, location);
+            return <PrimaryExpression>createNode(value ? SyntaxKind.TrueKeyword : SyntaxKind.FalseKeyword, location, /*flags*/ undefined, emitOptions);
+        }
+        else if (typeof value === "string") {
+            const node = <StringLiteral>createNode(SyntaxKind.StringLiteral, location, /*flags*/ undefined, emitOptions);
+            node.text = value;
+            return node;
         }
         else {
-            const node = <StringLiteral>createNode(SyntaxKind.StringLiteral, location);
-            node.text = String(value);
+            const node = <StringLiteral>createNode(SyntaxKind.StringLiteral, location, /*flags*/ undefined, emitOptions);
+            node.textSourceNode = value;
+            node.text = value.text;
             return node;
         }
     }
@@ -202,14 +140,18 @@ namespace ts {
 
     export function createIdentifier(text: string, location?: TextRange): Identifier {
         const node = <Identifier>createNode(SyntaxKind.Identifier, location);
-        node.text = text;
+        node.text = escapeIdentifier(text);
+        node.originalKeywordKind = stringToToken(text);
         return node;
     }
 
-    export function createTempVariable(location?: TextRange): Identifier {
+    export function createTempVariable(recordTempVariable: (node: Identifier) => void, location?: TextRange): Identifier {
         const name = <Identifier>createNode(SyntaxKind.Identifier, location);
         name.autoGenerateKind = GeneratedIdentifierKind.Auto;
         getNodeId(name);
+        if (recordTempVariable) {
+            recordTempVariable(name);
+        }
         return name;
     }
 
@@ -263,10 +205,11 @@ namespace ts {
 
     // Type members
 
-    export function createMethod(modifiers: Modifier[], name: string | PropertyName, parameters: ParameterDeclaration[], body: Block, location?: TextRange) {
+    export function createMethod(modifiers: Modifier[], asteriskToken: Node, name: string | PropertyName, parameters: ParameterDeclaration[], body: Block, location?: TextRange) {
         const node = <MethodDeclaration>createNode(SyntaxKind.MethodDeclaration, location);
         node.decorators = undefined;
-        setModifiers(node, modifiers);
+        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
+        node.asteriskToken = asteriskToken;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
         node.typeParameters = undefined;
         node.parameters = createNodeArray(parameters);
@@ -285,33 +228,37 @@ namespace ts {
         return node;
     }
 
-    export function createGetAccessor(modifiers: Modifier[], name: string | PropertyName, body: Block, location?: TextRange) {
+    export function createGetAccessor(modifiers: Modifier[], name: string | PropertyName, parameters: ParameterDeclaration[], body: Block, location?: TextRange) {
         const node = <GetAccessorDeclaration>createNode(SyntaxKind.GetAccessor, location);
         node.decorators = undefined;
-        setModifiers(node, modifiers);
+        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
         node.typeParameters = undefined;
-        node.parameters = createNodeArray<ParameterDeclaration>();
+        node.parameters = createNodeArray(parameters);
         node.body = body;
         return node;
     }
 
-    export function createSetAccessor(modifiers: Modifier[], name: string | PropertyName, parameter: ParameterDeclaration, body: Block, location?: TextRange) {
+    export function createSetAccessor(modifiers: Modifier[], name: string | PropertyName, parameters: ParameterDeclaration[], body: Block, location?: TextRange) {
         const node = <SetAccessorDeclaration>createNode(SyntaxKind.SetAccessor, location);
         node.decorators = undefined;
-        setModifiers(node, modifiers);
+        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
         node.typeParameters = undefined;
-        node.parameters = createNodeArray([parameter]);
+        node.parameters = createNodeArray(parameters);
         node.body = body;
         return node;
     }
 
     export function createParameter(name: string | Identifier | BindingPattern, initializer?: Expression, location?: TextRange) {
+        return createParameterWithDotDotDotToken(/*dotDotDotToken*/ undefined, name, initializer, location);
+    }
+
+    export function createParameterWithDotDotDotToken(dotDotDotToken: Node, name: string | Identifier | BindingPattern, initializer?: Expression, location?: TextRange) {
         const node = <ParameterDeclaration>createNode(SyntaxKind.Parameter, location);
         node.decorators = undefined;
         node.modifiers = undefined;
-        node.dotDotDotToken = undefined;
+        node.dotDotDotToken = dotDotDotToken;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
         node.questionToken = undefined;
         node.type = undefined;
@@ -341,8 +288,8 @@ namespace ts {
         return node;
     }
 
-    export function createPropertyAccess(expression: Expression, name: string | Identifier, location?: TextRange) {
-        const node = <PropertyAccessExpression>createNode(SyntaxKind.PropertyAccessExpression, location);
+    export function createPropertyAccess(expression: Expression, name: string | Identifier, location?: TextRange, emitOptions?: NodeEmitOptions) {
+        const node = <PropertyAccessExpression>createNode(SyntaxKind.PropertyAccessExpression, location, /*flags*/ undefined, emitOptions);
         node.expression = parenthesizeForAccess(expression);
         node.dotToken = createSynthesizedNode(SyntaxKind.DotToken);
         node.name = typeof name === "string" ? createIdentifier(name) : name;
@@ -433,9 +380,9 @@ namespace ts {
 
     export function createBinary(left: Expression, operator: SyntaxKind, right: Expression, location?: TextRange, original?: Node) {
         const node = <BinaryExpression>createNode(SyntaxKind.BinaryExpression, location);
-        node.left = parenthesizeBinaryOperand(operator, left, /*isLeftSideOfBinary*/ true);
+        node.left = parenthesizeBinaryOperand(operator, left, /*isLeftSideOfBinary*/ true, /*leftOperand*/ undefined);
         node.operatorToken = createSynthesizedNode(operator);
-        node.right = parenthesizeBinaryOperand(operator, right, /*isLeftSideOfBinary*/ false);
+        node.right = parenthesizeBinaryOperand(operator, right, /*isLeftSideOfBinary*/ false, node.left);
         if (original) {
             node.original = original;
         }
@@ -476,6 +423,11 @@ namespace ts {
         return node;
     }
 
+    export function createOmittedExpression(location?: TextRange) {
+        const node = <OmittedExpression>createNode(SyntaxKind.OmittedExpression, location);
+        return node;
+    }
+
     export function createExpressionWithTypeArguments(expression: Expression, location?: TextRange) {
         const node = <ExpressionWithTypeArguments>createNode(SyntaxKind.ExpressionWithTypeArguments, location);
         node.typeArguments = undefined;
@@ -495,11 +447,11 @@ namespace ts {
         return block;
     }
 
-    export function createVariableStatement(modifiers: Modifier[], declarationList: VariableDeclarationList, location?: TextRange): VariableStatement {
+    export function createVariableStatement(modifiers: Modifier[], declarationList: VariableDeclarationList | VariableDeclaration[], location?: TextRange): VariableStatement {
         const node = <VariableStatement>createNode(SyntaxKind.VariableStatement, location);
         node.decorators = undefined;
-        setModifiers(node, modifiers);
-        node.declarationList = declarationList;
+        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
+        node.declarationList = isArray(declarationList) ? createVariableDeclarationList(declarationList) : declarationList;
         return node;
     }
 
@@ -534,16 +486,33 @@ namespace ts {
         return node;
     }
 
-    export function createIf(expression: Expression, thenStatement: Statement, elseStatement?: Statement, location?: TextRange) {
+    export function createIf(expression: Expression, thenStatement: Statement, elseStatement?: Statement, location?: TextRange, options?: { startOnNewLine?: boolean; }) {
         const node = <IfStatement>createNode(SyntaxKind.IfStatement, location);
         node.expression = expression;
         node.thenStatement = thenStatement;
         node.elseStatement = elseStatement;
+        if (options && options.startOnNewLine) {
+            node.startsOnNewLine = true;
+        }
+
         return node;
     }
 
-    export function createFor(initializer: ForInitializer, condition: Expression, incrementor: Expression, statement: Statement, location?: TextRange) {
-        const node = <ForStatement>createNode(SyntaxKind.ForStatement, location);
+    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 createCaseBlock(clauses: CaseClause[], location?: TextRange): CaseBlock {
+        const node = <CaseBlock>createNode(SyntaxKind.CaseBlock, location);
+        node.clauses = createNodeArray(clauses);
+        return node;
+    }
+
+    export function createFor(initializer: ForInitializer, condition: Expression, incrementor: Expression, statement: Statement, location?: TextRange, emitOptions?: NodeEmitOptions) {
+        const node = <ForStatement>createNode(SyntaxKind.ForStatement, location, /*flags*/ undefined, emitOptions);
         node.initializer = initializer;
         node.condition = condition;
         node.incrementor = incrementor;
@@ -633,7 +602,7 @@ namespace ts {
     export function createFunctionDeclaration(modifiers: Modifier[], asteriskToken: Node, name: string | Identifier, parameters: ParameterDeclaration[], body: Block, location?: TextRange, original?: Node) {
         const node = <FunctionDeclaration>createNode(SyntaxKind.FunctionDeclaration, location);
         node.decorators = undefined;
-        setModifiers(node, modifiers);
+        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.asteriskToken = asteriskToken;
         node.name = typeof name === "string" ? createIdentifier(name) : name;
         node.typeParameters = undefined;
@@ -649,7 +618,7 @@ namespace ts {
     export function createClassDeclaration(modifiers: Modifier[], name: Identifier, heritageClauses: HeritageClause[], members: ClassElement[], location?: TextRange) {
         const node = <ClassDeclaration>createNode(SyntaxKind.ClassDeclaration, location);
         node.decorators = undefined;
-        setModifiers(node, modifiers);
+        node.modifiers = modifiers ? createNodeArray(modifiers) : undefined;
         node.name = name;
         node.typeParameters = undefined;
         node.heritageClauses = createNodeArray(heritageClauses);
@@ -716,6 +685,35 @@ namespace ts {
         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;
+    }
+
     // Compound nodes
 
     export function createComma(left: Expression, right: Expression) {
@@ -766,15 +764,40 @@ namespace ts {
         return createVoid(createLiteral(0));
     }
 
+    export function createImportDeclaration(importClause: ImportClause, moduleSpecifier?: Expression, location?: TextRange): ImportDeclaration {
+        const node = <ImportDeclaration>createNode(SyntaxKind.ImportDeclaration, location);
+        node.importClause = importClause;
+        node.moduleSpecifier = moduleSpecifier;
+        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 createNamedImports(elements: NodeArray<ImportSpecifier>, location?: TextRange): NamedImports {
+        const node = <NamedImports>createNode(SyntaxKind.NamedImports, location);
+        node.elements = elements;
+        return node;
+    }
+
     export function createMemberAccessForPropertyName(target: Expression, memberName: PropertyName, location?: TextRange): MemberExpression {
-        return isIdentifier(memberName)
-            ? createPropertyAccess(target, cloneNode(memberName), location)
-            : createElementAccess(target, cloneNode(isComputedPropertyName(memberName) ? memberName.expression : memberName), location);
+        if (isIdentifier(memberName)) {
+            return createPropertyAccess(target, memberName, location, { flags: NodeEmitFlags.NoNestedSourceMaps | NodeEmitFlags.Merge });
+        }
+        else if (isComputedPropertyName(memberName)) {
+            return createElementAccess(target, memberName.expression, location);
+        }
+        else {
+            return createElementAccess(target, memberName, location);
+        }
     }
 
     export function createRestParameter(name: string | Identifier) {
-        const node = createParameter(name, /*initializer*/ undefined);
-        node.dotDotDotToken = createSynthesizedNode(SyntaxKind.DotDotDotToken);
+        const node = createParameterWithDotDotDotToken(createSynthesizedNode(SyntaxKind.DotDotDotToken), name, /*initializer*/ undefined);
         return node;
     }
 
@@ -789,6 +812,22 @@ namespace ts {
         );
     }
 
+    export function createBreak(label?: Identifier, location?: TextRange): BreakStatement {
+        const node = <BreakStatement>createNode(SyntaxKind.BreakStatement, location);
+        if (label) {
+            node.label = label;
+        }
+        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 createFunctionApply(func: Expression, thisArg: Expression, argumentsExpression: Expression, location?: TextRange) {
         return createCall(
             createPropertyAccess(func, "apply"),
@@ -824,17 +863,15 @@ namespace ts {
         );
     }
 
-    export function createJsxSpread(reactNamespace: string, segments: Expression[]) {
-        return createCall(
-            createPropertyAccess(
-                createIdentifier(reactNamespace || "React"),
-                "__spread"
-            ),
-            segments
-        );
+    function createReactNamespace(reactNamespace: string, parent: JsxOpeningLikeElement) {
+        // Create an identifier and give it a parent. This allows us to resolve the react
+        // namespace during emit.
+        const react = createIdentifier(reactNamespace || "React");
+        react.parent = parent;
+        return react;
     }
 
-    export function createJsxCreateElement(reactNamespace: string, tagName: Expression, props: Expression, children: Expression[]): LeftHandSideExpression {
+    export function createReactCreateElement(reactNamespace: string, tagName: Expression, props: Expression, children: Expression[], parentElement: JsxOpeningLikeElement, location: TextRange): LeftHandSideExpression {
         const argumentsList = [tagName];
         if (props) {
             argumentsList.push(props);
@@ -845,15 +882,16 @@ namespace ts {
                 argumentsList.push(createNull());
             }
 
-            addRange(argumentsList, children);
+            addNodes(argumentsList, children, /*startOnNewLine*/ children.length > 1);
         }
 
         return createCall(
             createPropertyAccess(
-                createIdentifier(reactNamespace || "React"),
+                createReactNamespace(reactNamespace, parentElement),
                 "createElement"
             ),
-            argumentsList
+            argumentsList,
+            location
         );
     }
 
@@ -869,31 +907,37 @@ namespace ts {
         );
     }
 
-    export function createParamHelper(expression: Expression, parameterOffset: number) {
+    export function createAssignHelper(attributesSegments: Expression[]) {
+        return createCall(
+            createIdentifier("__assign"),
+            attributesSegments
+        );
+    }
+
+    export function createParamHelper(expression: Expression, parameterOffset: number, location?: TextRange) {
         return createCall(
             createIdentifier("__param"),
             [
                 createLiteral(parameterOffset),
                 expression
-            ]
+            ],
+            location
         );
     }
 
-    export function createMetadataHelper(metadataKey: string, metadataValue: Expression, defer?: boolean) {
+    export function createMetadataHelper(metadataKey: string, metadataValue: Expression) {
         return createCall(
             createIdentifier("__metadata"),
             [
                 createLiteral(metadataKey),
-                defer
-                    ? createArrowFunction([], metadataValue)
-                    : metadataValue
+                metadataValue
             ]
         );
     }
 
-    export function createDecorateHelper(decoratorExpressions: Expression[], target: Expression, memberName?: Expression, descriptor?: Expression) {
+    export function createDecorateHelper(decoratorExpressions: Expression[], target: Expression, memberName?: Expression, descriptor?: Expression, location?: TextRange) {
         const argumentsArray: Expression[] = [];
-        argumentsArray.push(createArrayLiteral(decoratorExpressions));
+        argumentsArray.push(createArrayLiteral(decoratorExpressions, /*location*/ undefined, /*multiLine*/ true));
         argumentsArray.push(target);
         if (memberName) {
             argumentsArray.push(memberName);
@@ -902,7 +946,7 @@ namespace ts {
             }
         }
 
-        return createCall(createIdentifier("__decorate"), argumentsArray);
+        return createCall(createIdentifier("__decorate"), argumentsArray, location);
     }
 
     export function createAwaiterHelper(hasLexicalArguments: boolean, promiseConstructor: EntityName | Expression, body: Block) {
@@ -929,56 +973,6 @@ namespace ts {
         );
     }
 
-    function createPropertyDescriptor({ get, set, value, enumerable, configurable, writable }: PropertyDescriptorOptions, preferNewLine?: boolean, location?: TextRange) {
-        const properties: ObjectLiteralElement[] = [];
-        addPropertyAssignment(properties, "get", get, preferNewLine);
-        addPropertyAssignment(properties, "set", set, preferNewLine);
-        addPropertyAssignment(properties, "value", value, preferNewLine);
-        addPropertyAssignment(properties, "enumerable", enumerable, preferNewLine);
-        addPropertyAssignment(properties, "configurable", configurable, preferNewLine);
-        addPropertyAssignment(properties, "writable", writable, preferNewLine);
-        return createObjectLiteral(properties, location);
-    }
-
-    function addPropertyAssignment(properties: ObjectLiteralElement[], name: string, value: boolean | Expression, preferNewLine: boolean) {
-        if (value !== undefined) {
-            const property = createPropertyAssignment(
-                name,
-                typeof value === "boolean" ? createLiteral(value) : value
-            );
-
-            if (preferNewLine) {
-                startOnNewLine(property);
-            }
-
-            properties.push(property);
-        }
-    }
-
-    export interface PropertyDescriptorOptions {
-        get?: Expression;
-        set?: Expression;
-        value?: Expression;
-        enumerable?: boolean | Expression;
-        configurable?: boolean | Expression;
-        writable?: boolean | Expression;
-    }
-
-    export function createObjectDefineProperty(target: Expression, memberName: Expression, descriptor: PropertyDescriptorOptions, preferNewLine?: boolean, location?: TextRange) {
-        return createCall(
-            createPropertyAccess(
-                createIdentifier("Object"),
-                "defineProperty"
-            ),
-            [
-                target,
-                memberName,
-                createPropertyDescriptor(descriptor, preferNewLine)
-            ],
-            location
-        );
-    }
-
     function createObjectCreate(prototype: Expression) {
         return createCall(
             createPropertyAccess(createIdentifier("Object"), "create"),
@@ -1035,6 +1029,7 @@ namespace ts {
         const getter = createGetAccessor(
             /*modifiers*/ undefined,
             "value",
+            [],
             createBlock([
                 createReturn(
                     createCall(
@@ -1049,7 +1044,7 @@ namespace ts {
         const setter = createSetAccessor(
             /*modifiers*/ undefined,
             "value",
-            createParameter("v"),
+            [createParameter("v")],
             createBlock([
                 createStatement(
                     createCall(
@@ -1139,47 +1134,71 @@ namespace ts {
         thisArg: Expression;
     }
 
-    export function createCallBinding(expression: Expression, languageVersion?: ScriptTarget): CallBinding {
-        const callee = skipParentheses(expression);
+    function shouldBeCapturedInTempVariable(node: Expression): boolean {
+        switch (skipParentheses(node).kind) {
+            case SyntaxKind.Identifier:
+            case SyntaxKind.ThisKeyword:
+            case SyntaxKind.NumericLiteral:
+            case SyntaxKind.StringLiteral:
+                return false;
+            default:
+                return true;
+        }
+    }
+
+    export function createCallBinding(expression: Expression, recordTempVariable: (temp: Identifier) => void, languageVersion?: ScriptTarget): CallBinding {
+        const callee = skipOuterExpressions(expression, OuterExpressionKinds.All);
         let thisArg: Expression;
         let target: LeftHandSideExpression;
         if (isSuperProperty(callee)) {
-            thisArg = createThis(/*location*/ callee.expression);
+            thisArg = createThis();
             target = callee;
         }
-        else if (isSuperCall(callee)) {
-            thisArg = createThis(/*location*/ callee);
-            target = languageVersion < ScriptTarget.ES6 ? createIdentifier("_super", /*location*/ callee) : 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: {
-                    // for `a.b()` target is `(_a = a).b` and thisArg is `_a`
-                    thisArg = createTempVariable();
-                    target = createPropertyAccess(
-                        createAssignment(
-                            thisArg,
-                            (<PropertyAccessExpression>callee).expression,
-                            /*location*/ (<PropertyAccessExpression>callee).expression
-                        ),
-                        (<PropertyAccessExpression>callee).name,
-                        /*location*/ callee
-                    );
+                    if (shouldBeCapturedInTempVariable((<PropertyAccessExpression>callee).expression)) {
+                        // 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: {
-                    // for `a[b]()` target is `(_a = a)[b]` and thisArg is `_a`
-                    thisArg = createTempVariable();
-                    target = createElementAccess(
-                        createAssignment(
-                            thisArg,
-                            (<ElementAccessExpression>callee).expression,
-                            /*location*/ (<ElementAccessExpression>callee).expression
-                        ),
-                        (<ElementAccessExpression>callee).argumentExpression,
-                        /*location*/ callee
-                    );
+                    if (shouldBeCapturedInTempVariable((<ElementAccessExpression>callee).expression)) {
+                        // 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;
                 }
@@ -1200,19 +1219,30 @@ namespace ts {
         return reduceLeft(expressions, createComma);
     }
 
-    export function createExpressionFromEntityName(node: EntityName | Expression): Expression {
-        return isQualifiedName(node)
-            ? createPropertyAccess(
-                createExpressionFromEntityName(node.left),
-                cloneNode(node.right)
-            )
-            : cloneNode(node);
+    export function createExpressionFromEntityName(node: EntityName | Expression, emitOptions?: NodeEmitOptions): Expression {
+        if (isQualifiedName(node)) {
+            const left = createExpressionFromEntityName(node.left, emitOptions);
+            const right = getMutableClone(node.right, emitOptions && clone(emitOptions));
+            return createPropertyAccess(left, right, /*location*/ node, emitOptions && clone(emitOptions));
+        }
+        else if (isIdentifier(node)) {
+            return getMutableClone(node, emitOptions && clone(emitOptions));
+        }
+        else {
+            return getMutableClone(node, emitOptions && clone(emitOptions));
+        }
     }
 
-    export function createExpressionForPropertyName(memberName: PropertyName, location?: TextRange): Expression {
-        return isIdentifier(memberName) ? createLiteral(memberName.text, location)
-             : isComputedPropertyName(memberName) ? cloneNode(memberName.expression, location)
-             : cloneNode(memberName, location);
+    export function createExpressionForPropertyName(memberName: PropertyName, emitOptions?: NodeEmitOptions): Expression {
+        if (isIdentifier(memberName)) {
+            return createLiteral(memberName, /*location*/ undefined, emitOptions);
+        }
+        else if (isComputedPropertyName(memberName)) {
+            return getMutableClone(memberName.expression, emitOptions);
+        }
+        else {
+            return getMutableClone(memberName, emitOptions);
+        }
     }
 
     export function createExpressionForObjectLiteralElement(node: ObjectLiteralExpression, property: ObjectLiteralElement, receiver: Expression): Expression {
@@ -1307,6 +1337,43 @@ namespace ts {
 
     // 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
+     */
+    export function addPrologueDirectives(target: Statement[], source: Statement[], ensureUseStrict?: boolean): number {
+        Debug.assert(target.length === 0, "PrologueDirectives should be at the first statement in the target statements array");
+        let foundUseStrict = false;
+        for (let i = 0; i < source.length; i++) {
+            if (isPrologueDirective(source[i])) {
+                if (isUseStrictPrologue(source[i] as ExpressionStatement)) {
+                    foundUseStrict = true;
+                }
+
+                target.push(source[i]);
+            }
+            else {
+                if (ensureUseStrict && !foundUseStrict) {
+                    target.push(startOnNewLine(createStatement(createLiteral("use strict"))));
+                }
+
+                return i;
+            }
+        }
+
+        return source.length;
+    }
+
     /**
      * Wraps the operand to a BinaryExpression in parentheses if they are needed to preserve the intended
      * order of operations.
@@ -1316,13 +1383,15 @@ namespace ts {
      * @param isLeftSideOfBinary A value indicating whether the operand is the left side of the
      *                           BinaryExpression.
      */
-    export function parenthesizeBinaryOperand(binaryOperator: SyntaxKind, operand: Expression, isLeftSideOfBinary: boolean) {
+    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 (operand.kind === SyntaxKind.ParenthesizedExpression) {
+        if (skipped.kind === SyntaxKind.ParenthesizedExpression) {
             return operand;
         }
 
-        return binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary)
+        return binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand)
             ? createParen(operand)
             : operand;
     }
@@ -1335,7 +1404,7 @@ namespace ts {
      * @param isLeftSideOfBinary A value indicating whether the operand is the left side of the
      *                           BinaryExpression.
      */
-    function binaryOperandNeedsParentheses(binaryOperator: SyntaxKind, operand: Expression, isLeftSideOfBinary: boolean) {
+    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
@@ -1354,9 +1423,19 @@ namespace ts {
         // 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 operandPrecedence = getExpressionPrecedence(operand);
+        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:
@@ -1368,37 +1447,50 @@ namespace ts {
                     // 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
-                    const binaryOperatorAssociativity = getOperatorAssociativity(SyntaxKind.BinaryExpression, binaryOperator);
                     return binaryOperatorAssociativity === Associativity.Right;
                 }
                 else {
-                    // 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 (isBinaryExpression(operand)
-                        && operand.operatorToken.kind === binaryOperator
-                        && isMathAssociativeOperator(binaryOperator)) {
-                        return false;
+                    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(operand);
+                    const operandAssociativity = getExpressionAssociativity(emittedOperand);
                     return operandAssociativity === Associativity.Left;
                 }
         }
@@ -1409,7 +1501,7 @@ namespace ts {
      *
      * @param binaryOperator The binary operator.
      */
-    function isMathAssociativeOperator(binaryOperator: SyntaxKind) {
+    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
@@ -1424,6 +1516,41 @@ namespace ts {
             || 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.
@@ -1431,14 +1558,18 @@ namespace ts {
      * @param expression The Expression node.
      */
     export function parenthesizeForNew(expression: Expression): LeftHandSideExpression {
-        const lhs = parenthesizeForAccess(expression);
-        switch (lhs.kind) {
+        const emittedExpression = skipPartiallyEmittedExpressions(expression);
+        switch (emittedExpression.kind) {
             case SyntaxKind.CallExpression:
+                return createParen(expression);
+
             case SyntaxKind.NewExpression:
-                return createParen(lhs);
+                return (<NewExpression>emittedExpression).arguments
+                    ? <LeftHandSideExpression>expression
+                    : createParen(expression);
         }
 
-        return lhs;
+        return parenthesizeForAccess(expression);
     }
 
     /**
@@ -1456,9 +1587,10 @@ namespace ts {
         //    NumericLiteral
         //       1.x            -> not the same as (1).x
         //
-        if (isLeftHandSideExpression(expression) &&
-            expression.kind !== SyntaxKind.NewExpression &&
-            expression.kind !== SyntaxKind.NumericLiteral) {
+        const emittedExpression = skipPartiallyEmittedExpressions(expression);
+        if (isLeftHandSideExpression(emittedExpression)
+            && (emittedExpression.kind !== SyntaxKind.NewExpression || (<NewExpression>emittedExpression).arguments)
+            && emittedExpression.kind !== SyntaxKind.NumericLiteral) {
             return <LeftHandSideExpression>expression;
         }
 
@@ -1498,11 +1630,8 @@ namespace ts {
     }
 
     export function parenthesizeExpressionForList(expression: Expression) {
-        if (expression.kind === SyntaxKind.OmittedExpression) {
-            return expression;
-        }
-
-        const expressionPrecedence = getExpressionPrecedence(expression);
+        const emittedExpression = skipPartiallyEmittedExpressions(expression);
+        const expressionPrecedence = getExpressionPrecedence(emittedExpression);
         const commaPrecedence = getOperatorPrecedence(SyntaxKind.BinaryExpression, SyntaxKind.CommaToken);
         return expressionPrecedence > commaPrecedence
             ? expression
@@ -1510,28 +1639,40 @@ namespace ts {
     }
 
     export function parenthesizeExpressionForExpressionStatement(expression: Expression) {
-        if (isCallExpression(expression)) {
-            const callee = expression.expression;
-            if (callee.kind === SyntaxKind.FunctionExpression
-                || callee.kind === SyntaxKind.ArrowFunction) {
-                const clone = cloneNode(expression, expression, expression.flags, expression.parent, expression);
-                clone.expression = createParen(callee, /*location*/ callee);
-                return clone;
+        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 if (getLeftmostExpression(expression).kind === SyntaxKind.ObjectLiteralExpression) {
-            return createParen(expression, /*location*/ expression);
+        else {
+            const leftmostExpressionKind = getLeftmostExpression(emittedExpression).kind;
+            if (leftmostExpressionKind === SyntaxKind.ObjectLiteralExpression || leftmostExpressionKind === SyntaxKind.FunctionExpression) {
+                return createParen(expression, /*location*/ expression);
+            }
         }
 
         return expression;
     }
 
-    export function parenthesizeConciseBody(body: ConciseBody): ConciseBody {
-        if (body.kind === SyntaxKind.ObjectLiteralExpression) {
-            return createParen(<Expression>body, /*location*/ body);
+    /**
+     * 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 body;
+        return newInnerExpression;
     }
 
     function getLeftmostExpression(node: Expression): Expression {
@@ -1554,17 +1695,81 @@ namespace ts {
                 case SyntaxKind.PropertyAccessExpression:
                     node = (<CallExpression | PropertyAccessExpression | ElementAccessExpression>node).expression;
                     continue;
+
+                case SyntaxKind.PartiallyEmittedExpression:
+                    node = (<PartiallyEmittedExpression>node).expression;
+                    continue;
             }
 
             return node;
         }
     }
 
-    export function skipParentheses(node: Expression): Expression {
-        while (node.kind === SyntaxKind.ParenthesizedExpression
-            || node.kind === SyntaxKind.TypeAssertionExpression
-            || node.kind === SyntaxKind.AsExpression) {
-            node = (<ParenthesizedExpression | AssertionExpression>node).expression;
+    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;
@@ -1602,4 +1807,75 @@ namespace ts {
         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)) {
+            return 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 c4813ac9932..7689055c746 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -178,6 +178,8 @@ namespace ts {
             case SyntaxKind.AsExpression:
                 return visitNode(cbNode, (<AsExpression>node).expression) ||
                     visitNode(cbNode, (<AsExpression>node).type);
+            case SyntaxKind.NonNullExpression:
+                return visitNode(cbNode, (<NonNullExpression>node).expression);
             case SyntaxKind.ConditionalExpression:
                 return visitNode(cbNode, (<ConditionalExpression>node).condition) ||
                     visitNode(cbNode, (<ConditionalExpression>node).questionToken) ||
@@ -302,6 +304,9 @@ namespace ts {
             case SyntaxKind.ImportClause:
                 return visitNode(cbNode, (<ImportClause>node).name) ||
                     visitNode(cbNode, (<ImportClause>node).namedBindings);
+            case SyntaxKind.GlobalModuleExportDeclaration:
+                return visitNode(cbNode, (<GlobalModuleExportDeclaration>node).name);
+
             case SyntaxKind.NamespaceImport:
                 return visitNode(cbNode, (<NamespaceImport>node).name);
             case SyntaxKind.NamedImports:
@@ -397,17 +402,23 @@ namespace ts {
                 return visitNode(cbNode, (<JSDocTypeTag>node).typeExpression);
             case SyntaxKind.JSDocTemplateTag:
                 return visitNodes(cbNodes, (<JSDocTemplateTag>node).typeParameters);
+            case SyntaxKind.PartiallyEmittedExpression:
+                return visitNode(cbNode, (<PartiallyEmittedExpression>node).expression);
         }
     }
 
-    export function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes = false): SourceFile {
+    export function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes = false, scriptKind?: ScriptKind): SourceFile {
         const start = new Date().getTime();
-        const result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes);
+        const result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes, scriptKind);
 
         parseTime += new Date().getTime() - start;
         return result;
     }
 
+    export function isExternalModule(file: SourceFile): boolean {
+        return file.externalModuleIndicator !== undefined;
+    }
+
     // Produces a new SourceFile for the 'newText' provided. The 'textChangeRange' parameter
     // indicates what changed between the 'text' that this SourceFile has and the 'newText'.
     // The SourceFile will be created with the compiler attempting to reuse as many nodes from
@@ -534,23 +545,24 @@ namespace ts {
         // attached to the EOF token.
         let parseErrorBeforeNextFinishedNode = false;
 
-        export function parseSourceFile(fileName: string, _sourceText: string, languageVersion: ScriptTarget, _syntaxCursor: IncrementalParser.SyntaxCursor, setParentNodes?: boolean): SourceFile {
-            const isJavaScriptFile = hasJavaScriptFileExtension(fileName) || _sourceText.lastIndexOf("// @language=javascript", 0) === 0;
-            initializeState(fileName, _sourceText, languageVersion, isJavaScriptFile, _syntaxCursor);
+        export function parseSourceFile(fileName: string, _sourceText: string, languageVersion: ScriptTarget, _syntaxCursor: IncrementalParser.SyntaxCursor, setParentNodes?: boolean, scriptKind?: ScriptKind): SourceFile {
+            scriptKind = ensureScriptKind(fileName, scriptKind);
 
-            const result = parseSourceFileWorker(fileName, languageVersion, setParentNodes);
+            initializeState(fileName, _sourceText, languageVersion, _syntaxCursor, scriptKind);
+
+            const result = parseSourceFileWorker(fileName, languageVersion, setParentNodes, scriptKind);
 
             clearState();
 
             return result;
         }
 
-        function getLanguageVariant(fileName: string) {
+        function getLanguageVariant(scriptKind: ScriptKind) {
             // .tsx and .jsx files are treated as jsx language variant.
-            return fileExtensionIs(fileName, ".tsx") || fileExtensionIs(fileName, ".jsx") || fileExtensionIs(fileName, ".js") ?  LanguageVariant.JSX  : LanguageVariant.Standard;
+            return scriptKind === ScriptKind.TSX || scriptKind === ScriptKind.JSX || scriptKind === ScriptKind.JS ? LanguageVariant.JSX : LanguageVariant.Standard;
         }
 
-        function initializeState(fileName: string, _sourceText: string, languageVersion: ScriptTarget, isJavaScriptFile: boolean, _syntaxCursor: IncrementalParser.SyntaxCursor) {
+        function initializeState(fileName: string, _sourceText: string, languageVersion: ScriptTarget, _syntaxCursor: IncrementalParser.SyntaxCursor, scriptKind: ScriptKind) {
             NodeConstructor = objectAllocator.getNodeConstructor();
             SourceFileConstructor = objectAllocator.getSourceFileConstructor();
 
@@ -563,14 +575,14 @@ namespace ts {
             identifierCount = 0;
             nodeCount = 0;
 
-            contextFlags = isJavaScriptFile ? NodeFlags.JavaScriptFile : NodeFlags.None;
+            contextFlags = scriptKind === ScriptKind.JS || scriptKind === ScriptKind.JSX ? NodeFlags.JavaScriptFile : NodeFlags.None;
             parseErrorBeforeNextFinishedNode = false;
 
             // Initialize and prime the scanner before parsing the source elements.
             scanner.setText(sourceText);
             scanner.setOnError(scanError);
             scanner.setScriptTarget(languageVersion);
-            scanner.setLanguageVariant(getLanguageVariant(fileName));
+            scanner.setLanguageVariant(getLanguageVariant(scriptKind));
         }
 
         function clearState() {
@@ -578,7 +590,7 @@ namespace ts {
             scanner.setText("");
             scanner.setOnError(undefined);
 
-            // Clear any data.  We don't want to accidently hold onto it for too long.
+            // Clear any data.  We don't want to accidentally hold onto it for too long.
             parseDiagnostics = undefined;
             sourceFile = undefined;
             identifiers = undefined;
@@ -586,8 +598,8 @@ namespace ts {
             sourceText = undefined;
         }
 
-        function parseSourceFileWorker(fileName: string, languageVersion: ScriptTarget, setParentNodes: boolean): SourceFile {
-            sourceFile = createSourceFile(fileName, languageVersion);
+        function parseSourceFileWorker(fileName: string, languageVersion: ScriptTarget, setParentNodes: boolean, scriptKind: ScriptKind): SourceFile {
+            sourceFile = createSourceFile(fileName, languageVersion, scriptKind);
             sourceFile.flags = contextFlags;
 
             // Prime the scanner.
@@ -654,7 +666,7 @@ namespace ts {
             }
         }
 
-        function createSourceFile(fileName: string, languageVersion: ScriptTarget): SourceFile {
+        function createSourceFile(fileName: string, languageVersion: ScriptTarget, scriptKind: ScriptKind): SourceFile {
             // code from createNode is inlined here so createNode won't have to deal with special case of creating source files
             // this is quite rare comparing to other nodes and createNode should be as fast as possible
             const sourceFile = <SourceFile>new SourceFileConstructor(SyntaxKind.SourceFile, /*pos*/ 0, /* end */ sourceText.length);
@@ -664,8 +676,9 @@ namespace ts {
             sourceFile.bindDiagnostics = [];
             sourceFile.languageVersion = languageVersion;
             sourceFile.fileName = normalizePath(fileName);
-            sourceFile.languageVariant = getLanguageVariant(sourceFile.fileName);
+            sourceFile.languageVariant = getLanguageVariant(scriptKind);
             sourceFile.isDeclarationFile = fileExtensionIs(sourceFile.fileName, ".d.ts");
+            sourceFile.scriptKind = scriptKind;
 
             return sourceFile;
         }
@@ -997,19 +1010,6 @@ namespace ts {
             }
             array.pos = pos;
             array.end = pos;
-            array.arrayKind = ArrayKind.NodeArray;
-            return array;
-        }
-
-        function createModifiersArray(elements?: Modifier[], pos?: number): ModifiersArray {
-            const array = <ModifiersArray>(elements || []);
-            if (!(pos >= 0)) {
-                pos = getNodePos();
-            }
-            array.pos = pos;
-            array.end = pos;
-            array.arrayKind = ArrayKind.ModifiersArray;
-            array.flags = 0;
             return array;
         }
 
@@ -1143,7 +1143,7 @@ namespace ts {
                 if (token === SyntaxKind.DefaultKeyword) {
                     return lookAhead(nextTokenIsClassOrFunction);
                 }
-                return token !== SyntaxKind.AsteriskToken && token !== SyntaxKind.OpenBraceToken && canFollowModifier();
+                return token !== SyntaxKind.AsteriskToken && token !== SyntaxKind.AsKeyword && token !== SyntaxKind.OpenBraceToken && canFollowModifier();
             }
             if (token === SyntaxKind.DefaultKeyword) {
                 return nextTokenIsClassOrFunction();
@@ -1465,8 +1465,8 @@ namespace ts {
             // We can only reuse a node if it was parsed under the same strict mode that we're
             // currently in.  i.e. if we originally parsed a node in non-strict mode, but then
             // the user added 'using strict' at the top of the file, then we can't use that node
-            // again as the presense of strict mode may cause us to parse the tokens in the file
-            // differetly.
+            // again as the presence of strict mode may cause us to parse the tokens in the file
+            // differently.
             //
             // Note: we *can* reuse tokens when the strict mode changes.  That's because tokens
             // are unaffected by strict mode.  It's just the parser will decide what to do with it
@@ -1479,7 +1479,7 @@ namespace ts {
             }
 
             // Ok, we have a node that looks like it could be reused.  Now verify that it is valid
-            // in the currest list parsing context that we're currently at.
+            // in the current list parsing context that we're currently at.
             if (!canReuseNode(node, parsingContext)) {
                 return undefined;
             }
@@ -1742,7 +1742,7 @@ namespace ts {
         };
 
         // Parses a comma-delimited list of elements
-        function parseDelimitedList<T extends Node>(kind: ParsingContext, parseElement: () => T, considerSemicolonAsDelimeter?: boolean): NodeArray<T> {
+        function parseDelimitedList<T extends Node>(kind: ParsingContext, parseElement: () => T, considerSemicolonAsDelimiter?: boolean): NodeArray<T> {
             const saveParsingContext = parsingContext;
             parsingContext |= 1 << kind;
             const result = createNodeArray<T>();
@@ -1770,7 +1770,7 @@ namespace ts {
                     // parse errors.  For example, this can happen when people do things like use
                     // a semicolon to delimit object literal members.   Note: we'll have already
                     // reported an error when we called parseExpected above.
-                    if (considerSemicolonAsDelimeter && token === SyntaxKind.SemicolonToken && !scanner.hasPrecedingLineBreak()) {
+                    if (considerSemicolonAsDelimiter && token === SyntaxKind.SemicolonToken && !scanner.hasPrecedingLineBreak()) {
                         nextToken();
                     }
                     continue;
@@ -1954,7 +1954,7 @@ namespace ts {
             return finishNode(node);
         }
 
-        function parseTypePredicate(lhs: Identifier | ThisTypeNode): TypePredicateNode {
+        function parseThisTypePredicate(lhs: ThisTypeNode): TypePredicateNode {
             nextToken();
             const node = createNode(SyntaxKind.TypePredicate, lhs.pos) as TypePredicateNode;
             node.parameterName = lhs;
@@ -2016,27 +2016,24 @@ namespace ts {
         }
 
         function isStartOfParameter(): boolean {
-            return token === SyntaxKind.DotDotDotToken || isIdentifierOrPattern() || isModifierKind(token) || token === SyntaxKind.AtToken;
-        }
-
-        function setModifiers(node: Node, modifiers: ModifiersArray) {
-            if (modifiers) {
-                node.flags |= modifiers.flags;
-                node.modifiers = modifiers;
-            }
+            return token === SyntaxKind.DotDotDotToken || isIdentifierOrPattern() || isModifierKind(token) || token === SyntaxKind.AtToken || token === SyntaxKind.ThisKeyword;
         }
 
         function parseParameter(): ParameterDeclaration {
             const node = <ParameterDeclaration>createNode(SyntaxKind.Parameter);
+            if (token === SyntaxKind.ThisKeyword) {
+                node.name = createIdentifier(/*isIdentifier*/true, undefined);
+                node.type = parseParameterType();
+                return finishNode(node);
+            }
+
             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)) {
                 // in cases like
                 // 'use strict'
@@ -2074,11 +2071,11 @@ namespace ts {
         }
 
         function fillSignature(
-                returnToken: SyntaxKind,
-                yieldContext: boolean,
-                awaitContext: boolean,
-                requireCompleteParameterList: boolean,
-                signature: SignatureDeclaration): void {
+            returnToken: SyntaxKind,
+            yieldContext: boolean,
+            awaitContext: boolean,
+            requireCompleteParameterList: boolean,
+            signature: SignatureDeclaration): void {
 
             const returnTokenRequired = returnToken === SyntaxKind.EqualsGreaterThanToken;
             signature.typeParameters = parseTypeParameters();
@@ -2218,27 +2215,27 @@ 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;
 
-                // Method signatues don't exist in expression contexts.  So they have neither
+                // Method signatures don't exist in expression contexts.  So they have neither
                 // [Yield] nor [Await]
                 fillSignature(SyntaxKind.ColonToken, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, method);
                 parseTypeMemberSemicolon();
@@ -2246,7 +2243,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();
@@ -2369,17 +2366,19 @@ namespace ts {
                 case SyntaxKind.NumberKeyword:
                 case SyntaxKind.BooleanKeyword:
                 case SyntaxKind.SymbolKeyword:
+                case SyntaxKind.UndefinedKeyword:
                     // If these are followed by a dot, then parse these out as a dotted type reference instead.
                     const node = tryParse(parseKeywordAndNoDot);
                     return node || parseTypeReference();
                 case SyntaxKind.StringLiteral:
                     return parseStringLiteralTypeNode();
                 case SyntaxKind.VoidKeyword:
+                case SyntaxKind.NullKeyword:
                     return parseTokenNode<TypeNode>();
                 case SyntaxKind.ThisKeyword: {
                     const thisKeyword = parseThisTypeNode();
                     if (token === SyntaxKind.IsKeyword && !scanner.hasPrecedingLineBreak()) {
-                        return parseTypePredicate(thisKeyword);
+                        return parseThisTypePredicate(thisKeyword);
                     }
                     else {
                         return thisKeyword;
@@ -2406,6 +2405,8 @@ namespace ts {
                 case SyntaxKind.BooleanKeyword:
                 case SyntaxKind.SymbolKeyword:
                 case SyntaxKind.VoidKeyword:
+                case SyntaxKind.UndefinedKeyword:
+                case SyntaxKind.NullKeyword:
                 case SyntaxKind.ThisKeyword:
                 case SyntaxKind.TypeOfKeyword:
                 case SyntaxKind.OpenBraceToken:
@@ -2474,7 +2475,7 @@ namespace ts {
                 // Skip modifiers
                 parseModifiers();
             }
-            if (isIdentifier()) {
+            if (isIdentifier() || token === SyntaxKind.ThisKeyword) {
                 nextToken();
                 return true;
             }
@@ -2735,7 +2736,7 @@ namespace ts {
 
         function isYieldExpression(): boolean {
             if (token === SyntaxKind.YieldKeyword) {
-                // If we have a 'yield' keyword, and htis is a context where yield expressions are
+                // If we have a 'yield' keyword, and this is a context where yield expressions are
                 // allowed, then definitely parse out a yield expression.
                 if (inYieldContext()) {
                     return true;
@@ -2754,7 +2755,7 @@ namespace ts {
                 //
                 // for now we just check if the next token is an identifier.  More heuristics
                 // can be added here later as necessary.  We just need to make sure that we
-                // don't accidently consume something legal.
+                // don't accidentally consume something legal.
                 return lookAhead(nextTokenIsIdentifierOrKeywordOrNumberOnSameLine);
             }
 
@@ -2783,7 +2784,7 @@ namespace ts {
             }
             else {
                 // if the next token is not on the same line as yield.  or we don't have an '*' or
-                // the start of an expressin, then this is just a simple "yield" expression.
+                // the start of an expression, then this is just a simple "yield" expression.
                 return finishNode(node);
             }
         }
@@ -2826,7 +2827,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.
@@ -2971,8 +2972,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.
             //
@@ -3075,7 +3076,7 @@ namespace ts {
                 // Check the precedence to see if we should "take" this operator
                 // - For left associative operator (all operator but **), consume the operator,
                 //   recursively call the function below, and parse binaryExpression as a rightOperand
-                //   of the caller if the new precendence of the operator is greater then or equal to the current precendence.
+                //   of the caller if the new precedence of the operator is greater then or equal to the current precedence.
                 //   For example:
                 //      a - b - c;
                 //            ^token; leftOperand = b. Return b to the caller as a rightOperand
@@ -3084,8 +3085,8 @@ namespace ts {
                 //      a - b * c;
                 //            ^token; leftOperand = b. Return b * c to the caller as a rightOperand
                 // - For right associative operator (**), consume the operator, recursively call the function
-                //   and parse binaryExpression as a rightOperand of the caller if the new precendence of
-                //   the operator is strictly grater than the current precendence
+                //   and parse binaryExpression as a rightOperand of the caller if the new precedence of
+                //   the operator is strictly grater than the current precedence
                 //   For example:
                 //      a ** b ** c;
                 //             ^^token; leftOperand = b. Return b ** c to the caller as a rightOperand
@@ -3326,7 +3327,7 @@ namespace ts {
          */
         function isIncrementExpression(): boolean {
             // This function is called inside parseUnaryExpression to decide
-            // whether to call parseSimpleUnaryExpression or call parseIncrmentExpression directly
+            // whether to call parseSimpleUnaryExpression or call parseIncrementExpression directly
             switch (token) {
                 case SyntaxKind.PlusToken:
                 case SyntaxKind.MinusToken:
@@ -3729,6 +3730,14 @@ namespace ts {
                     continue;
                 }
 
+                if (token === SyntaxKind.ExclamationToken && !scanner.hasPrecedingLineBreak()) {
+                    nextToken();
+                    const nonNullExpression = <NonNullExpression>createNode(SyntaxKind.NonNullExpression, expression.pos);
+                    nonNullExpression.expression = expression;
+                    expression = finishNode(nonNullExpression);
+                    continue;
+                }
+
                 // when in the [Decorator] context, we do not parse ElementAccess as it could be part of a ComputedPropertyName
                 if (!inDecoratorContext() && parseOptional(SyntaxKind.OpenBracketToken)) {
                     const indexedAccess = <ElementAccessExpression>createNode(SyntaxKind.ElementAccessExpression, expression.pos);
@@ -3813,7 +3822,7 @@ namespace ts {
                 return undefined;
             }
 
-            // If we have a '<', then only parse this as a arugment list if the type arguments
+            // If we have a '<', then only parse this as a argument list if the type arguments
             // are complete and we have an open paren.  if we don't, rewind and return nothing.
             return typeArguments && canFollowTypeArgumentsInExpression()
                 ? typeArguments
@@ -3942,9 +3951,9 @@ 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 parseAccessorDeclaration(SyntaxKind.GetAccessor, fullStart, decorators, modifiers);
+                return addJSDocComment(parseAccessorDeclaration(SyntaxKind.GetAccessor, fullStart, decorators, modifiers));
             }
             else if (parseContextualModifier(SyntaxKind.SetKeyword)) {
                 return parseAccessorDeclaration(SyntaxKind.SetAccessor, fullStart, decorators, modifiers);
@@ -3990,7 +3999,7 @@ namespace ts {
                     shorthandDeclaration.equalsToken = equalsToken;
                     shorthandDeclaration.objectAssignmentInitializer = allowInAnd(parseAssignmentExpressionOrHigher);
                 }
-                return finishNode(shorthandDeclaration);
+                return addJSDocComment(finishNode(shorthandDeclaration));
             }
             else {
                 const propertyAssignment = <PropertyAssignment>createNode(SyntaxKind.PropertyAssignment, fullStart);
@@ -3999,7 +4008,7 @@ namespace ts {
                 propertyAssignment.questionToken = questionToken;
                 parseExpected(SyntaxKind.ColonToken);
                 propertyAssignment.initializer = allowInAnd(parseAssignmentExpressionOrHigher);
-                return finishNode(propertyAssignment);
+                return addJSDocComment(finishNode(propertyAssignment));
             }
         }
 
@@ -4010,7 +4019,7 @@ namespace ts {
                 node.multiLine = true;
             }
 
-            node.properties = parseDelimitedList(ParsingContext.ObjectLiteralMembers, parseObjectLiteralElement, /*considerSemicolonAsDelimeter*/ true);
+            node.properties = parseDelimitedList(ParsingContext.ObjectLiteralMembers, parseObjectLiteralElement, /*considerSemicolonAsDelimiter*/ true);
             parseExpected(SyntaxKind.CloseBraceToken);
             return finishNode(node);
         }
@@ -4027,12 +4036,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) :
@@ -4412,7 +4421,8 @@ namespace ts {
                         continue;
 
                     case SyntaxKind.GlobalKeyword:
-                        return nextToken() === SyntaxKind.OpenBraceToken;
+                        nextToken();
+                        return token === SyntaxKind.OpenBraceToken || token === SyntaxKind.Identifier || token === SyntaxKind.ExportKeyword;
 
                     case SyntaxKind.ImportKeyword:
                         nextToken();
@@ -4421,7 +4431,8 @@ namespace ts {
                     case SyntaxKind.ExportKeyword:
                         nextToken();
                         if (token === SyntaxKind.EqualsToken || token === SyntaxKind.AsteriskToken ||
-                            token === SyntaxKind.OpenBraceToken || token === SyntaxKind.DefaultKeyword) {
+                            token === SyntaxKind.OpenBraceToken || token === SyntaxKind.DefaultKeyword ||
+                            token === SyntaxKind.AsKeyword) {
                             return true;
                         }
                         continue;
@@ -4605,9 +4616,15 @@ namespace ts {
                     return parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers);
                 case SyntaxKind.ExportKeyword:
                     nextToken();
-                    return token === SyntaxKind.DefaultKeyword || token === SyntaxKind.EqualsToken ?
-                        parseExportAssignment(fullStart, decorators, modifiers) :
-                        parseExportDeclaration(fullStart, decorators, modifiers);
+                    switch (token) {
+                        case SyntaxKind.DefaultKeyword:
+                        case SyntaxKind.EqualsToken:
+                            return parseExportAssignment(fullStart, decorators, modifiers);
+                        case SyntaxKind.AsKeyword:
+                            return parseGlobalModuleExportDeclaration(fullStart, decorators, modifiers);
+                        default:
+                            return parseExportDeclaration(fullStart, decorators, modifiers);
+                    }
                 default:
                     if (decorators || modifiers) {
                         // We reached this point because we encountered decorators and/or modifiers and assumed a declaration
@@ -4615,7 +4632,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);
                     }
             }
@@ -4750,57 +4767,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();
@@ -4810,11 +4827,11 @@ namespace ts {
             // off. The grammar would look something like this:
             //
             //    MemberVariableDeclaration[Yield]:
-            //        AccessibilityModifier_opt   PropertyName   TypeAnnotation_opt   Initialiser_opt[In];
-            //        AccessibilityModifier_opt  static_opt  PropertyName   TypeAnnotation_opt   Initialiser_opt[In, ?Yield];
+            //        AccessibilityModifier_opt   PropertyName   TypeAnnotation_opt   Initializer_opt[In];
+            //        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);
 
@@ -4822,7 +4839,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();
 
@@ -4841,10 +4858,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);
@@ -4963,9 +4980,8 @@ namespace ts {
          *
          * In such situations, 'permitInvalidConstAsModifier' should be set to true.
          */
-        function parseModifiers(permitInvalidConstAsModifier?: boolean): ModifiersArray {
-            let flags = 0;
-            let modifiers: ModifiersArray;
+        function parseModifiers(permitInvalidConstAsModifier?: boolean): NodeArray<Modifier> {
+            let modifiers: NodeArray<Modifier>;
             while (true) {
                 const modifierStart = scanner.getStartPos();
                 const modifierKind = token;
@@ -4983,31 +4999,28 @@ namespace ts {
                     }
                 }
 
-                flags |= modifierToFlag(modifierKind);
                 const modifier = finishNode(createNode(modifierKind, modifierStart));
                 if (!modifiers) {
-                    modifiers = createModifiersArray([modifier], modifierStart);
+                    modifiers = createNodeArray<Modifier>([modifier], modifierStart);
                 }
                 else {
                     modifiers.push(modifier);
                 }
             }
             if (modifiers) {
-                modifiers.flags = flags;
                 modifiers.end = scanner.getStartPos();
             }
             return modifiers;
         }
 
-        function parseModifiersForArrowFunction(): ModifiersArray {
-            let modifiers: ModifiersArray;
+        function parseModifiersForArrowFunction(): NodeArray<Modifier> {
+            let modifiers: NodeArray<Modifier>;
             if (token === SyntaxKind.AsyncKeyword) {
                 const modifierStart = scanner.getStartPos();
                 const modifierKind = token;
                 nextToken();
                 const modifier = finishNode(createNode(modifierKind, modifierStart));
-                modifiers = createModifiersArray([modifier], modifierStart);
-                modifiers.flags = modifierToFlag(modifierKind);
+                modifiers = createNodeArray<Modifier>([modifier], modifierStart);
                 modifiers.end = scanner.getStartPos();
             }
 
@@ -5067,14 +5080,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();
@@ -5149,10 +5162,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();
@@ -5161,10 +5174,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();
@@ -5185,10 +5198,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)) {
@@ -5213,25 +5226,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();
@@ -5244,8 +5257,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);
@@ -5275,7 +5288,21 @@ namespace ts {
             return nextToken() === SyntaxKind.SlashToken;
         }
 
-        function parseImportDeclarationOrImportEqualsDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: ModifiersArray): ImportEqualsDeclaration | ImportDeclaration {
+        function parseGlobalModuleExportDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: NodeArray<Modifier>): GlobalModuleExportDeclaration {
+            const exportDeclaration = <GlobalModuleExportDeclaration>createNode(SyntaxKind.GlobalModuleExportDeclaration, fullStart);
+            exportDeclaration.decorators = decorators;
+            exportDeclaration.modifiers = modifiers;
+            parseExpected(SyntaxKind.AsKeyword);
+            parseExpected(SyntaxKind.NamespaceKeyword);
+
+            exportDeclaration.name = parseIdentifier();
+
+            parseExpected(SyntaxKind.SemicolonToken);
+
+            return finishNode(exportDeclaration);
+        }
+
+        function parseImportDeclarationOrImportEqualsDeclaration(fullStart: number, decorators: NodeArray<Decorator>, modifiers: NodeArray<Modifier>): ImportEqualsDeclaration | ImportDeclaration {
             parseExpected(SyntaxKind.ImportKeyword);
             const afterImportPos = scanner.getStartPos();
 
@@ -5288,7 +5315,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();
@@ -5300,7 +5327,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 ;
@@ -5411,7 +5438,7 @@ namespace ts {
             // ImportSpecifier:
             //   BindingIdentifier
             //   IdentifierName as BindingIdentifier
-            // ExportSpecififer:
+            // ExportSpecifier:
             //   IdentifierName
             //   IdentifierName as IdentifierName
             let checkIdentifierIsKeyword = isKeyword(token) && !isIdentifier();
@@ -5436,10 +5463,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();
@@ -5459,10 +5486,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;
             }
@@ -5477,6 +5504,7 @@ namespace ts {
         function processReferenceComments(sourceFile: SourceFile): void {
             const triviaScanner = createScanner(sourceFile.languageVersion, /*skipTrivia*/false, LanguageVariant.Standard, sourceText);
             const referencedFiles: FileReference[] = [];
+            const typeReferenceDirectives: FileReference[] = [];
             const amdDependencies: { path: string; name: string }[] = [];
             let amdModuleName: string;
 
@@ -5503,7 +5531,12 @@ namespace ts {
                     sourceFile.hasNoDefaultLib = referencePathMatchResult.isNoDefaultLib;
                     const diagnosticMessage = referencePathMatchResult.diagnosticMessage;
                     if (fileReference) {
-                        referencedFiles.push(fileReference);
+                        if (referencePathMatchResult.isTypeReferenceDirective) {
+                            typeReferenceDirectives.push(fileReference);
+                        }
+                        else {
+                            referencedFiles.push(fileReference);
+                        }
                     }
                     if (diagnosticMessage) {
                         parseDiagnostics.push(createFileDiagnostic(sourceFile, range.pos, range.end - range.pos, diagnosticMessage));
@@ -5535,13 +5568,14 @@ namespace ts {
             }
 
             sourceFile.referencedFiles = referencedFiles;
+            sourceFile.typeReferenceDirectives = typeReferenceDirectives;
             sourceFile.amdDependencies = amdDependencies;
             sourceFile.moduleName = amdModuleName;
         }
 
         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
@@ -5606,7 +5640,7 @@ namespace ts {
             }
 
             export function parseJSDocTypeExpressionForTests(content: string, start: number, length: number) {
-                initializeState("file.js", content, ScriptTarget.Latest, /*isJavaScriptFile*/ true, /*_syntaxCursor:*/ undefined);
+                initializeState("file.js", content, ScriptTarget.Latest, /*_syntaxCursor:*/ undefined, ScriptKind.JS);
                 scanner.setText(content, start, length);
                 token = scanner.scan();
                 const jsDocTypeExpression = parseJSDocTypeExpression();
@@ -5760,6 +5794,9 @@ namespace ts {
             function parseJSDocParameter(): ParameterDeclaration {
                 const parameter = <ParameterDeclaration>createNode(SyntaxKind.Parameter);
                 parameter.type = parseJSDocType();
+                if (parseOptional(SyntaxKind.EqualsToken)) {
+                    parameter.questionToken = createNode(SyntaxKind.EqualsToken);
+                }
                 return finishNode(parameter);
             }
 
@@ -5767,16 +5804,22 @@ namespace ts {
                 const result = <JSDocTypeReference>createNode(SyntaxKind.JSDocTypeReference);
                 result.name = parseSimplePropertyName();
 
-                while (parseOptional(SyntaxKind.DotToken)) {
-                    if (token === SyntaxKind.LessThanToken) {
-                        result.typeArguments = parseTypeArguments();
-                        break;
-                    }
-                    else {
-                        result.name = parseQualifiedName(result.name);
+                if (token === SyntaxKind.LessThanToken) {
+                    result.typeArguments = parseTypeArguments();
+                }
+                else {
+                    while (parseOptional(SyntaxKind.DotToken)) {
+                        if (token === SyntaxKind.LessThanToken) {
+                            result.typeArguments = parseTypeArguments();
+                            break;
+                        }
+                        else {
+                            result.name = parseQualifiedName(result.name);
+                        }
                     }
                 }
 
+
                 return finishNode(result);
             }
 
@@ -5914,7 +5957,7 @@ namespace ts {
             }
 
             export function parseIsolatedJSDocComment(content: string, start: number, length: number) {
-                initializeState("file.js", content, ScriptTarget.Latest, /*isJavaScriptFile*/ true, /*_syntaxCursor:*/ undefined);
+                initializeState("file.js", content, ScriptTarget.Latest, /*_syntaxCursor:*/ undefined, ScriptKind.JS);
                 sourceFile = <SourceFile>{ languageVariant: LanguageVariant.Standard, text: content };
                 const jsDocComment = parseJSDocCommentWorker(start, length);
                 const diagnostics = parseDiagnostics;
@@ -6239,11 +6282,11 @@ namespace ts {
             if (sourceFile.statements.length === 0) {
                 // If we don't have any statements in the current source file, then there's no real
                 // way to incrementally parse.  So just do a full parse instead.
-                return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, /*syntaxCursor*/ undefined, /*setParentNodes*/ true);
+                return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, /*syntaxCursor*/ undefined, /*setParentNodes*/ true, sourceFile.scriptKind);
             }
 
             // Make sure we're not trying to incrementally update a source file more than once.  Once
-            // we do an update the original source file is considered unusbale from that point onwards.
+            // we do an update the original source file is considered unusable from that point onwards.
             //
             // This is because we do incremental parsing in-place.  i.e. we take nodes from the old
             // tree and give them new positions and parents.  From that point on, trusting the old
@@ -6303,7 +6346,7 @@ namespace ts {
             // inconsistent tree.  Setting the parents on the new tree should be very fast.  We
             // will immediately bail out of walking any subtrees when we can see that their parents
             // are already correct.
-            const result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, /*setParentNodes*/ true);
+            const result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, /*setParentNodes*/ true, sourceFile.scriptKind);
 
             return result;
         }
@@ -6374,7 +6417,7 @@ namespace ts {
             // We have an element that intersects the change range in some way.  It may have its
             // start, or its end (or both) in the changed range.  We want to adjust any part
             // that intersects such that the final tree is in a consistent state.  i.e. all
-            // chlidren have spans within the span of their parent, and all siblings are ordered
+            // children have spans within the span of their parent, and all siblings are ordered
             // properly.
 
             // We may need to update both the 'pos' and the 'end' of the element.
@@ -6396,7 +6439,7 @@ namespace ts {
             //  -------------------ZZZ-----------------
             //
             // In this case, any element that started in the 'X' range will keep its position.
-            // However any element htat started after that will have their pos adjusted to be
+            // However any element that started after that will have their pos adjusted to be
             // at the end of the new range.  i.e. any node that started in the 'Y' range will
             // be adjusted to have their start at the end of the 'Z' range.
             //
@@ -6421,7 +6464,7 @@ namespace ts {
             //  -------------------ZZZ-----------------
             //
             // In this case, any element that ended in the 'X' range will keep its position.
-            // However any element htat ended after that will have their pos adjusted to be
+            // However any element that ended after that will have their pos adjusted to be
             // at the end of the new range.  i.e. any node that ended in the 'Y' range will
             // be adjusted to have their end at the end of the 'Z' range.
             if (element.end >= changeRangeOldEnd) {
@@ -6751,7 +6794,7 @@ namespace ts {
                         // Position was within this node.  Keep searching deeper to find the node.
                         forEachChild(node, visitNode, visitArray);
 
-                        // don't procede any futher in the search.
+                        // don't proceed any further in the search.
                         return true;
                     }
 
diff --git a/src/compiler/printer.ts b/src/compiler/printer.ts
index 7040362fa8f..83895b27ffe 100644
--- a/src/compiler/printer.ts
+++ b/src/compiler/printer.ts
@@ -6,9 +6,6 @@
 
 /* @internal */
 namespace ts {
-    const delimiters = createDelimiterMap();
-    const brackets = createBracketsMap();
-
     // Flags enum to track count of temp variables and a few dedicated names
     const enum TempFlags {
         Auto      = 0x00000000,  // No preferred name
@@ -18,6 +15,9 @@ namespace ts {
 
     // targetSourceFile is when users only want one file in entire project to be emitted. This is used in compileOnSave feature
     export function printFiles(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) {
@@ -26,6 +26,19 @@ 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++) {
+        s = arguments[i];
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+            t[p] = s[p];
+    }
+    return t;
+};`;
+
         // emit output for the __decorate helper function
         const decorateHelper = `
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -247,6 +260,7 @@ const _super = (function (geti, seti) {
         const languageVersion = getEmitScriptTarget(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;
@@ -257,6 +271,7 @@ const _super = (function (geti, seti) {
         return {
             emitSkipped,
             diagnostics: emitterDiagnostics.getDiagnostics(),
+            emittedFiles: emittedFilesList,
             sourceMaps: sourceMapDataList
         };
 
@@ -272,6 +287,16 @@ const _super = (function (geti, seti) {
             if (declarationFilePath) {
                 emitSkipped = writeDeclarationFile(declarationFilePath, sourceFiles, isBundledEmit, host, resolver, emitterDiagnostics) || emitSkipped;
             }
+
+            if (!emitSkipped && emittedFilesList) {
+                emittedFilesList.push(jsFilePath);
+                if (sourceMapFilePath) {
+                    emittedFilesList.push(sourceMapFilePath);
+                }
+                if (declarationFilePath) {
+                    emittedFilesList.push(declarationFilePath);
+                }
+            }
         }
 
         function createFilePrinter() {
@@ -289,7 +314,8 @@ const _super = (function (geti, seti) {
             const {
                 emitStart,
                 emitEnd,
-                emitPos
+                emitTokenStart,
+                emitTokenEnd
             } = sourceMap;
 
             const comments = createCommentWriter(host, writer, sourceMap);
@@ -299,18 +325,19 @@ const _super = (function (geti, seti) {
                 getTrailingCommentsOfPosition,
                 emitLeadingComments,
                 emitTrailingComments,
-                emitDetachedComments
+                emitLeadingDetachedComments,
+                emitTrailingDetachedComments
             } = comments;
 
             let context: TransformationContext;
-            let startLexicalEnvironment: () => void;
-            let endLexicalEnvironment: () => Statement[];
             let getNodeEmitFlags: (node: Node) => NodeEmitFlags;
             let setNodeEmitFlags: (node: Node, flags: NodeEmitFlags) => void;
-            let isExpressionSubstitutionEnabled: (node: Node) => boolean;
+            let getSourceMapRange: (node: Node) => TextRange;
+            let getTokenSourceMapRange: (node: Node, token: SyntaxKind) => TextRange;
+            let getCommentRange: (node: Node) => TextRange;
+            let isSubstitutionEnabled: (node: Node) => boolean;
             let isEmitNotificationEnabled: (node: Node) => boolean;
-            let expressionSubstitution: (node: Expression) => Expression;
-            let identifierSubstitution: (node: Identifier) => Identifier;
+            let onSubstituteNode: (node: Node, isExpression: boolean) => Node;
             let onEmitNode: (node: Node, emit: (node: Node) => void) => void;
             let nodeToGeneratedName: string[];
             let generatedNameSet: Map<string>;
@@ -319,6 +346,7 @@ const _super = (function (geti, seti) {
             let currentText: string;
             let currentFileIdentifiers: Map<string>;
             let extendsEmitted: boolean;
+            let assignEmitted: boolean;
             let decorateEmitted: boolean;
             let paramEmitted: boolean;
             let awaiterEmitted: boolean;
@@ -365,19 +393,20 @@ const _super = (function (geti, seti) {
                 comments.reset();
                 writer.reset();
 
-                startLexicalEnvironment = undefined;
-                endLexicalEnvironment = undefined;
                 getNodeEmitFlags = undefined;
                 setNodeEmitFlags = undefined;
-                isExpressionSubstitutionEnabled = undefined;
+                getSourceMapRange = undefined;
+                getTokenSourceMapRange = undefined;
+                getCommentRange = undefined;
+                isSubstitutionEnabled = undefined;
                 isEmitNotificationEnabled = undefined;
-                expressionSubstitution = undefined;
-                identifierSubstitution = undefined;
+                onSubstituteNode = undefined;
                 onEmitNode = undefined;
                 tempFlags = TempFlags.Auto;
                 currentSourceFile = undefined;
                 currentText = undefined;
                 extendsEmitted = false;
+                assignEmitted = false;
                 decorateEmitted = false;
                 paramEmitted = false;
                 awaiterEmitted = false;
@@ -386,14 +415,14 @@ const _super = (function (geti, seti) {
 
             function initializePrinter(_context: TransformationContext) {
                 context = _context;
-                startLexicalEnvironment = context.startLexicalEnvironment;
-                endLexicalEnvironment = context.endLexicalEnvironment;
                 getNodeEmitFlags = context.getNodeEmitFlags;
                 setNodeEmitFlags = context.setNodeEmitFlags;
-                isExpressionSubstitutionEnabled = context.isExpressionSubstitutionEnabled;
+                getSourceMapRange = context.getSourceMapRange;
+                getTokenSourceMapRange = context.getTokenSourceMapRange;
+                getCommentRange = context.getCommentRange;
+                isSubstitutionEnabled = context.isSubstitutionEnabled;
                 isEmitNotificationEnabled = context.isEmitNotificationEnabled;
-                expressionSubstitution = context.expressionSubstitution;
-                identifierSubstitution = context.identifierSubstitution;
+                onSubstituteNode = context.onSubstituteNode;
                 onEmitNode = context.onEmitNode;
                 return printSourceFile;
             }
@@ -404,7 +433,7 @@ const _super = (function (geti, seti) {
                 currentFileIdentifiers = node.identifiers;
                 sourceMap.setSourceFile(node);
                 comments.setSourceFile(node);
-                emitWorker(node);
+                emitNodeWithNotificationOption(node, emitWorker);
                 return node;
             }
 
@@ -415,6 +444,26 @@ const _super = (function (geti, seti) {
                 emitNodeWithNotificationOption(node, emitWithoutNotificationOption);
             }
 
+            /**
+             * Emits a node with specialized emit flags.
+             */
+            // TODO(rbuckton): This should be removed once source maps are aligned with the old
+            //                 emitter and new baselines are taken. This exists solely to
+            //                 align with the old emitter.
+            function emitSpecialized(node: Node, flags: NodeEmitFlags) {
+                if (node) {
+                    const flagsToAdd = flags & ~getNodeEmitFlags(node);
+                    if (flagsToAdd) {
+                        setNodeEmitFlags(node, getNodeEmitFlags(node) | flagsToAdd);
+                        emit(node);
+                        setNodeEmitFlags(node, getNodeEmitFlags(node) & ~flagsToAdd);
+                        return;
+                    }
+
+                    emit(node);
+                }
+            }
+
             /**
              * Emits a node without calling onEmitNode.
              * NOTE: Do not call this method directly.
@@ -454,17 +503,83 @@ const _super = (function (geti, seti) {
 
             function emitNodeWithWorker(node: Node, emitWorker: (node: Node) => void) {
                 if (node) {
-                    const leadingComments = getLeadingComments(node, getNotEmittedParent);
-                    const trailingComments = getTrailingComments(node, getNotEmittedParent);
-                    emitLeadingComments(node, leadingComments);
-                    emitStart(node);
+                    const leadingComments = getLeadingComments(/*range*/ node, /*contextNode*/ node, shouldSkipLeadingCommentsForNode, getCommentRange);
+                    const trailingComments = getTrailingComments(/*range*/ node, /*contextNode*/ node, shouldSkipTrailingCommentsForNode, getCommentRange);
+                    emitLeadingComments(/*range*/ node, leadingComments, /*contextNode*/ node, getCommentRange);
+                    emitStart(/*range*/ node, /*contextNode*/ node, shouldSkipLeadingSourceMapForNode, shouldSkipSourceMapForChildren, getSourceMapRange);
                     emitWorker(node);
-                    emitEnd(node);
+                    emitEnd(/*range*/ node, /*contextNode*/ node, shouldSkipTrailingSourceMapForNode, shouldSkipSourceMapForChildren, getSourceMapRange);
                     emitTrailingComments(node, trailingComments);
                 }
             }
 
+            /**
+             * 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)
+                    || (getNodeEmitFlags(node) & NodeEmitFlags.NoLeadingComments) !== 0;
+            }
+
+            /**
+             * Determines whether to skip trailing comment emit for a node.
+             *
+             * We do not emit comments for NotEmittedStatement nodes or any node that has
+             * NodeEmitFlags.NoTrailingComments.
+             *
+             * @param node A Node.
+             */
+            function shouldSkipTrailingCommentsForNode(node: Node) {
+                return isNotEmittedStatement(node)
+                    || (getNodeEmitFlags(node) & NodeEmitFlags.NoTrailingComments) !== 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)
+                    || (getNodeEmitFlags(node) & 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)
+                    || (getNodeEmitFlags(node) & 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 (getNodeEmitFlags(node) & NodeEmitFlags.NoNestedSourceMaps) !== 0;
+            }
+
             function emitWorker(node: Node): void {
+                if (tryEmitSubstitute(node, emitWorker, /*isExpression*/ false)) {
+                    return;
+                }
+
                 const kind = node.kind;
                 switch (kind) {
                     // Pseudo-literals
@@ -475,10 +590,6 @@ const _super = (function (geti, seti) {
 
                     // Identifiers
                     case SyntaxKind.Identifier:
-                        if (tryEmitSubstitute(node, identifierSubstitution)) {
-                            return;
-                        }
-
                         return emitIdentifier(<Identifier>node);
 
                     // Reserved words
@@ -678,12 +789,16 @@ const _super = (function (geti, seti) {
                     // 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:
@@ -710,6 +825,8 @@ const _super = (function (geti, seti) {
                         return emitSourceFile(<SourceFile>node);
 
                     // JSDoc nodes (ignored)
+
+                    // Transformation nodes (ignored)
                 }
 
                 if (isExpression(node)) {
@@ -718,11 +835,11 @@ const _super = (function (geti, seti) {
             }
 
             function emitExpressionWorker(node: Node) {
-                const kind = node.kind;
-                if (isExpressionSubstitutionEnabled(node) && tryEmitSubstitute(node, expressionSubstitution)) {
+                if (tryEmitSubstitute(node, emitExpressionWorker, /*isExpression*/ true)) {
                     return;
                 }
 
+                const kind = node.kind;
                 switch (kind) {
                     // Literals
                     case SyntaxKind.NumericLiteral:
@@ -794,16 +911,18 @@ const _super = (function (geti, seti) {
                         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);
-                    case SyntaxKind.JsxOpeningElement:
-                        return emitJsxOpeningElement(<JsxOpeningElement>node);
-                    case SyntaxKind.JsxExpression:
-                        return emitJsxExpression(<JsxExpression>node);
+
+                    // Transformation nodes
+                    case SyntaxKind.PartiallyEmittedExpression:
+                        return emitPartiallyEmittedExpression(<PartiallyEmittedExpression>node);
                 }
             }
 
@@ -819,7 +938,7 @@ const _super = (function (geti, seti) {
             // SyntaxKind.TemplateMiddle
             // SyntaxKind.TemplateTail
             function emitLiteral(node: LiteralLikeNode) {
-                const text = getLiteralText(node, currentSourceFile, languageVersion);
+                const text = getLiteralTextOfNode(node);
                 if ((compilerOptions.sourceMap || compilerOptions.inlineSourceMap)
                     && (node.kind === SyntaxKind.StringLiteral || isTemplateLiteralKind(node.kind))) {
                     writer.writeLiteral(text);
@@ -1110,9 +1229,18 @@ const _super = (function (geti, seti) {
                     write("{}");
                 }
                 else {
+                    const indentedFlag = getNodeEmitFlags(node) & 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();
+                    }
                 }
             }
 
@@ -1138,7 +1266,7 @@ const _super = (function (geti, seti) {
             function needsDotDotForPropertyAccess(expression: Expression) {
                 if (expression.kind === SyntaxKind.NumericLiteral) {
                     // check if numeric literal was originally written with a dot
-                    const text = getLiteralText(<LiteralExpression>expression, currentSourceFile, languageVersion);
+                    const text = getLiteralTextOfNode(<LiteralExpression>expression);
                     return text.indexOf(tokenToString(SyntaxKind.DotToken)) < 0;
                 }
                 else {
@@ -1168,13 +1296,12 @@ const _super = (function (geti, seti) {
             function emitNewExpression(node: NewExpression) {
                 write("new ");
                 emitExpression(node.expression);
-                if (node.arguments) {
-                    emitExpressionList(node, node.arguments, ListFormat.NewExpressionArguments);
-                }
+                emitExpressionList(node, node.arguments, ListFormat.NewExpressionArguments);
             }
 
             function emitTaggedTemplateExpression(node: TaggedTemplateExpression) {
                 emitExpression(node.tag);
+                write(" ");
                 emitExpression(node.template);
             }
 
@@ -1202,7 +1329,6 @@ const _super = (function (geti, seti) {
                 emitDecorators(node, node.decorators);
                 emitModifiers(node, node.modifiers);
                 emitSignatureAndBody(node, emitArrowFunctionHead);
-
             }
 
             function emitArrowFunctionHead(node: ArrowFunction) {
@@ -1233,7 +1359,7 @@ const _super = (function (geti, seti) {
             }
 
             function emitPrefixUnaryExpression(node: PrefixUnaryExpression) {
-                writeToken(node.operator);
+                writeTokenText(node.operator);
                 if (shouldEmitWhitespaceBeforeOperand(node)) {
                     write(" ");
                 }
@@ -1261,7 +1387,7 @@ const _super = (function (geti, seti) {
 
             function emitPostfixUnaryExpression(node: PostfixUnaryExpression) {
                 emitExpression(node.operand);
-                writeToken(node.operator);
+                writeTokenText(node.operator);
             }
 
             function emitBinaryExpression(node: BinaryExpression) {
@@ -1271,7 +1397,7 @@ const _super = (function (geti, seti) {
 
                 emitExpression(node.left);
                 increaseIndentIf(indentBeforeOperator, isCommaOperator ? " " : undefined);
-                writeTokenNode(node.operatorToken);
+                writeTokenText(node.operatorToken.kind);
                 increaseIndentIf(indentAfterOperator, " ");
                 emitExpression(node.right);
                 decreaseIndentIf(indentBeforeOperator, indentAfterOperator);
@@ -1317,10 +1443,8 @@ const _super = (function (geti, seti) {
             }
 
             function emitExpressionWithTypeArguments(node: ExpressionWithTypeArguments) {
-                emitStart(node);
                 emitExpression(node.expression);
                 emitTypeArguments(node, node.typeArguments);
-                emitEnd(node);
             }
 
             function emitAsExpression(node: AsExpression) {
@@ -1331,6 +1455,11 @@ const _super = (function (geti, seti) {
                 }
             }
 
+            function emitNonNullExpression(node: NonNullExpression) {
+                emitExpression(node.expression);
+                write("!");
+            }
+
             //
             // Misc
             //
@@ -1346,12 +1475,14 @@ const _super = (function (geti, seti) {
 
             function emitBlock(node: Block, format?: ListFormat) {
                 if (isSingleLineEmptyBlock(node)) {
-                    write("{ }");
+                    writeToken(SyntaxKind.OpenBraceToken, node.pos, /*contextNode*/ node);
+                    write(" ");
+                    writeToken(SyntaxKind.CloseBraceToken, node.statements.end, /*contextNode*/ node);
                 }
                 else {
-                    write("{");
+                    writeToken(SyntaxKind.OpenBraceToken, node.pos, /*contextNode*/ node);
                     emitBlockStatements(node);
-                    write("}");
+                    writeToken(SyntaxKind.CloseBraceToken, node.statements.end, /*contextNode*/ node);
                 }
             }
 
@@ -1380,13 +1511,15 @@ const _super = (function (geti, seti) {
             }
 
             function emitIfStatement(node: IfStatement) {
-                write("if (");
+                const openParenPos = writeToken(SyntaxKind.IfKeyword, node.pos, node);
+                write(" ");
+                writeToken(SyntaxKind.OpenParenToken, openParenPos, node);
                 emitExpression(node.expression);
-                write(")");
+                writeToken(SyntaxKind.CloseParenToken, node.expression.end, node);
                 emitEmbeddedStatement(node.thenStatement);
                 if (node.elseStatement) {
                     writeLine();
-                    write("else");
+                    writeToken(SyntaxKind.ElseKeyword, node.thenStatement.end, node);
                     if (node.elseStatement.kind === SyntaxKind.IfStatement) {
                         write(" ");
                         emit(node.elseStatement);
@@ -1420,7 +1553,32 @@ const _super = (function (geti, seti) {
             }
 
             function emitForStatement(node: ForStatement) {
-                write("for (");
+                if (getNodeEmitFlags(node) & NodeEmitFlags.SourceMapAdjustRestParameterLoop) {
+                    // TODO(rbuckton): This should be removed once source maps are aligned with the old
+                    //                 emitter and new baselines are taken. This exists solely to
+                    //                 align with the old emitter.
+                    const openParenPos = writeToken(SyntaxKind.ForKeyword, node.pos);
+                    write(" ");
+                    writeToken(SyntaxKind.OpenParenToken, openParenPos);
+                    setNodeEmitFlags(node.initializer, NodeEmitFlags.NoTrailingSourceMap | getNodeEmitFlags(node.initializer));
+                    emitForBinding(node.initializer);
+                    write(";");
+                    emitEnd(node.initializer);
+                    setNodeEmitFlags(node.condition, NodeEmitFlags.NoTrailingSourceMap | getNodeEmitFlags(node.condition));
+                    write(" ");
+                    emitExpression(node.condition);
+                    write(";");
+                    emitEnd(node.condition);
+                    write(" ");
+                    emitExpression(node.incrementor);
+                    write(")");
+                    emitEmbeddedStatement(node.statement);
+                    return;
+                }
+
+                const openParenPos = writeToken(SyntaxKind.ForKeyword, node.pos);
+                write(" ");
+                writeToken(SyntaxKind.OpenParenToken, openParenPos, /*contextNode*/ node);
                 emitForBinding(node.initializer);
                 write(";");
                 emitExpressionWithPrefix(" ", node.condition);
@@ -1431,20 +1589,24 @@ const _super = (function (geti, seti) {
             }
 
             function emitForInStatement(node: ForInStatement) {
-                write("for (");
+                const openParenPos = writeToken(SyntaxKind.ForKeyword, node.pos);
+                write(" ");
+                writeToken(SyntaxKind.OpenParenToken, openParenPos);
                 emitForBinding(node.initializer);
                 write(" in ");
                 emitExpression(node.expression);
-                write(")");
+                writeToken(SyntaxKind.CloseParenToken, node.expression.end);
                 emitEmbeddedStatement(node.statement);
             }
 
             function emitForOfStatement(node: ForOfStatement) {
-                write("for (");
+                const openParenPos = writeToken(SyntaxKind.ForKeyword, node.pos);
+                write(" ");
+                writeToken(SyntaxKind.OpenParenToken, openParenPos);
                 emitForBinding(node.initializer);
                 write(" of ");
                 emitExpression(node.expression);
-                write(")");
+                writeToken(SyntaxKind.CloseParenToken, node.expression.end);
                 emitEmbeddedStatement(node.statement);
             }
 
@@ -1460,19 +1622,19 @@ const _super = (function (geti, seti) {
             }
 
             function emitContinueStatement(node: ContinueStatement) {
-                write("continue");
+                writeToken(SyntaxKind.ContinueKeyword, node.pos);
                 emitWithPrefix(" ", node.label);
                 write(";");
             }
 
             function emitBreakStatement(node: BreakStatement) {
-                write("break");
+                writeToken(SyntaxKind.BreakKeyword, node.pos);
                 emitWithPrefix(" ", node.label);
                 write(";");
             }
 
             function emitReturnStatement(node: ReturnStatement) {
-                write("return");
+                writeToken(SyntaxKind.ReturnKeyword, node.pos, /*contextNode*/ node);
                 emitExpressionWithPrefix(" ", node.expression);
                 write(";");
             }
@@ -1485,9 +1647,12 @@ const _super = (function (geti, seti) {
             }
 
             function emitSwitchStatement(node: SwitchStatement) {
-                write("switch (");
+                const openParenPos = writeToken(SyntaxKind.SwitchKeyword, node.pos);
+                write(" ");
+                writeToken(SyntaxKind.OpenParenToken, openParenPos);
                 emitExpression(node.expression);
-                write(") ");
+                writeToken(SyntaxKind.CloseParenToken, node.expression.end);
+                write(" ");
                 emit(node.caseBlock);
             }
 
@@ -1515,7 +1680,8 @@ const _super = (function (geti, seti) {
             }
 
             function emitDebuggerStatement(node: DebuggerStatement) {
-                write("debugger;");
+                writeToken(SyntaxKind.DebuggerKeyword, node.pos);
+                write(";");
             }
 
             //
@@ -1540,7 +1706,7 @@ const _super = (function (geti, seti) {
                 emitDecorators(node, node.decorators);
                 emitModifiers(node, node.modifiers);
                 write(node.asteriskToken ? "function* " : "function ");
-                emit(node.name);
+                emitSpecialized(node.name, NodeEmitFlags.NoSourceMap);
                 emitSignatureAndBody(node, emitSignatureHead);
             }
 
@@ -1548,13 +1714,19 @@ const _super = (function (geti, seti) {
                 const body = node.body;
                 if (body) {
                     if (isBlock(body)) {
+                        const indentedFlag = getNodeEmitFlags(node) & NodeEmitFlags.Indented;
+                        if (indentedFlag) {
+                            increaseIndent();
+                        }
+
                         const savedTempFlags = tempFlags;
                         tempFlags = 0;
-                        startLexicalEnvironment();
                         emitSignatureHead(node);
-                        write(" {");
                         emitBlockFunctionBody(node, body);
-                        write("}");
+                        if (indentedFlag) {
+                            decreaseIndent();
+                        }
+
                         tempFlags = savedTempFlags;
                     }
                     else {
@@ -1577,32 +1749,57 @@ const _super = (function (geti, seti) {
             }
 
             function shouldEmitBlockFunctionBodyOnSingleLine(parentNode: Node, body: Block) {
-                const originalNode = getOriginalNode(parentNode);
-                if (isFunctionLike(originalNode) && !nodeIsSynthesized(originalNode)) {
-                    const body = originalNode.body;
-                    if (isBlock(body)) {
-                        if (rangeEndIsOnSameLineAsRangeStart(body, body)) {
-                            for (const statement of body.statements) {
-                                if (synthesizedNodeStartsOnNewLine(statement)) {
-                                    return false;
-                                }
-                            }
+                // We must emit a function body as a single-line body in the following case:
+                // * The body has NodeEmitFlags.SingleLine specified.
 
-                            return true;
-                        }
-                    }
-                    else {
-                        return rangeEndIsOnSameLineAsRangeStart((<ArrowFunction>originalNode).equalsGreaterThanToken, originalNode.body);
-                    }
+                // 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 (getNodeEmitFlags(body) & NodeEmitFlags.SingleLine) {
+                    return true;
                 }
 
-                return false;
+                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) {
-                const startingLine = writer.getLine();
+                // TODO(rbuckton): This should be removed once source maps are aligned with the old
+                //                 emitter and new baselines are taken. This exists solely to
+                //                 align with the old emitter.
+                if (getNodeEmitFlags(body) & NodeEmitFlags.SourceMapEmitOpenBraceAsToken) {
+                    write(" ");
+                    writeToken(SyntaxKind.OpenBraceToken, body.pos);
+                }
+                else {
+                    write(" {");
+                }
+
                 increaseIndent();
-                emitDetachedComments(body.statements);
+                emitLeadingDetachedComments(body.statements, body, shouldSkipLeadingCommentsForNode);
 
                 // Emit all the prologue directives (like "use strict").
                 const statementOffset = emitPrologueDirectives(body.statements, /*startWithNewLine*/ true);
@@ -1617,10 +1814,9 @@ const _super = (function (geti, seti) {
                     emitList(body, body.statements, ListFormat.MultiLineFunctionBodyStatements, statementOffset);
                 }
 
-                const endingLine = writer.getLine();
-                emitLexicalEnvironment(endLexicalEnvironment(), /*newLine*/ startingLine !== endingLine);
-                emitLeadingComments(collapseTextRange(body.statements, TextRangeCollapse.CollapseToEnd));
+                emitTrailingDetachedComments(body.statements, body, shouldSkipTrailingCommentsForNode);
                 decreaseIndent();
+                writeToken(SyntaxKind.CloseBraceToken, body.statements.end, body);
             }
 
             function emitClassDeclaration(node: ClassDeclaration) {
@@ -1631,7 +1827,13 @@ const _super = (function (geti, seti) {
                 emitDecorators(node, node.decorators);
                 emitModifiers(node, node.modifiers);
                 write("class");
-                emitWithPrefix(" ", node.name);
+                emitSpecializedWithPrefix(" ", node.name, NodeEmitFlags.NoSourceMap);
+
+                const indentedFlag = getNodeEmitFlags(node) & NodeEmitFlags.Indented;
+                if (indentedFlag) {
+                    increaseIndent();
+                }
+
                 emitTypeParameters(node, node.typeParameters);
                 emitList(node, node.heritageClauses, ListFormat.ClassHeritageClauses);
 
@@ -1642,6 +1844,10 @@ const _super = (function (geti, seti) {
                 emitList(node, node.members, ListFormat.ClassMembers);
                 write("}");
 
+                if (indentedFlag) {
+                    decreaseIndent();
+                }
+
                 tempFlags = savedTempFlags;
             }
 
@@ -1651,7 +1857,7 @@ const _super = (function (geti, seti) {
                 write("interface ");
                 emit(node.name);
                 emitTypeParameters(node, node.typeParameters);
-                emitList(node, node.heritageClauses, ListFormat.SingleLine);
+                emitList(node, node.heritageClauses, ListFormat.HeritageClauses);
                 write(" {");
                 emitList(node, node.members, ListFormat.InterfaceMembers);
                 write("}");
@@ -1705,24 +1911,18 @@ const _super = (function (geti, seti) {
                 else {
                     const savedTempFlags = tempFlags;
                     tempFlags = 0;
-                    startLexicalEnvironment();
                     write("{");
                     increaseIndent();
-
-                    const startingLine = writer.getLine();
                     emitBlockStatements(node);
-
-                    const endingLine = writer.getLine();
-                    emitLexicalEnvironment(endLexicalEnvironment(), /*newLine*/ startingLine !== endingLine);
                     write("}");
                     tempFlags = savedTempFlags;
                 }
             }
 
             function emitCaseBlock(node: CaseBlock) {
-                write("{");
+                writeToken(SyntaxKind.OpenBraceToken, node.pos);
                 emitList(node, node.clauses, ListFormat.CaseBlockClauses);
-                write("}");
+                writeToken(SyntaxKind.CloseBraceToken, node.clauses.end);
             }
 
             function emitImportEqualsDeclaration(node: ImportEqualsDeclaration) {
@@ -1746,27 +1946,25 @@ const _super = (function (geti, seti) {
             function emitImportDeclaration(node: ImportDeclaration) {
                 emitModifiers(node, node.modifiers);
                 write("import ");
-                emit(node.importClause);
+                if (node.importClause) {
+                    emit(node.importClause);
+                    write(" from ");
+                }
                 emitExpression(node.moduleSpecifier);
                 write(";");
             }
 
             function emitImportClause(node: ImportClause) {
-                emitStart(node);
                 emit(node.name);
                 if (node.name && node.namedBindings) {
                     write(", ");
                 }
                 emit(node.namedBindings);
-                emitEnd(node);
-                write(" from ");
             }
 
             function emitNamespaceImport(node: NamespaceImport) {
-                emitStart(node);
                 write("* as ");
                 emit(node.name);
-                emitEnd(node);
             }
 
             function emitNamedImports(node: NamedImports) {
@@ -1787,12 +1985,14 @@ const _super = (function (geti, seti) {
                 write("export ");
                 if (node.exportClause) {
                     emit(node.exportClause);
-                    write(" from ");
                 }
                 else {
-                    write("* from ");
+                    write("*");
+                }
+                if (node.moduleSpecifier) {
+                    write(" from ");
+                    emitExpression(node.moduleSpecifier);
                 }
-                emitExpression(node.moduleSpecifier);
                 write(";");
             }
 
@@ -1841,7 +2041,7 @@ const _super = (function (geti, seti) {
 
             function emitJsxSelfClosingElement(node: JsxSelfClosingElement) {
                 write("<");
-                emit(node.tagName);
+                emitJsxTagName(node.tagName);
                 write(" ");
                 emitList(node, node.attributes, ListFormat.JsxElementAttributes);
                 write("/>");
@@ -1849,7 +2049,7 @@ const _super = (function (geti, seti) {
 
             function emitJsxOpeningElement(node: JsxOpeningElement) {
                 write("<");
-                emit(node.tagName);
+                emitJsxTagName(node.tagName);
                 writeIfAny(node.attributes, " ");
                 emitList(node, node.attributes, ListFormat.JsxElementAttributes);
                 write(">");
@@ -1861,7 +2061,7 @@ const _super = (function (geti, seti) {
 
             function emitJsxClosingElement(node: JsxClosingElement) {
                 write("</");
-                emit(node.tagName);
+                emitJsxTagName(node.tagName);
                 write(">");
             }
 
@@ -1877,9 +2077,20 @@ const _super = (function (geti, seti) {
             }
 
             function emitJsxExpression(node: JsxExpression) {
-                write("{");
-                emitExpression(node.expression);
-                write("}");
+                if (node.expression) {
+                    write("{");
+                    emitExpression(node.expression);
+                    write("}");
+                }
+            }
+
+            function emitJsxTagName(node: EntityName) {
+                if (node.kind === SyntaxKind.Identifier) {
+                    emitExpression(<Identifier>node);
+                }
+                else {
+                    emit(node);
+                }
             }
 
             //
@@ -1900,7 +2111,16 @@ const _super = (function (geti, seti) {
             }
 
             function emitCaseOrDefaultClauseStatements(parentNode: Node, statements: NodeArray<Statement>) {
-                if (statements.length === 1 && shouldEmitCaseOrDefaultClauseStatementOnSameLine(parentNode, statements[0])) {
+                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]);
                 }
@@ -1918,19 +2138,20 @@ const _super = (function (geti, seti) {
             }
 
             function emitHeritageClause(node: HeritageClause) {
-                emitStart(node);
                 write(" ");
-                writeToken(node.token);
+                writeTokenText(node.token);
                 write(" ");
                 emitList(node, node.types, ListFormat.HeritageClauseTypes);
-                emitEnd(node);
             }
 
             function emitCatchClause(node: CatchClause) {
                 writeLine();
-                write("catch (");
+                const openParenPos = writeToken(SyntaxKind.CatchKeyword, node.pos);
+                write(" ");
+                writeToken(SyntaxKind.OpenParenToken, openParenPos);
                 emit(node.variableDeclaration);
-                write(") ");
+                writeToken(SyntaxKind.CloseParenToken, node.variableDeclaration ? node.variableDeclaration.end : openParenPos);
+                write(" ");
                 emit(node.block);
             }
 
@@ -1948,12 +2169,18 @@ const _super = (function (geti, seti) {
                 //          }
                 // "comment1" is not considered to be leading comment for node.initializer
                 // but rather a trailing comment on the previous node.
-                emitLeadingComments(node.initializer, getTrailingComments(collapseTextRange(node.initializer, TextRangeCollapse.CollapseToStart)));
+                if (!shouldSkipLeadingCommentsForNode(node.initializer)) {
+                    emitLeadingComments(/*range*/ node.initializer, getTrailingComments(collapseRangeToStart(node.initializer)), /*contextNode*/ node.initializer, getCommentRange);
+                }
                 emitExpression(node.initializer);
             }
 
             function emitShorthandPropertyAssignment(node: ShorthandPropertyAssignment) {
                 emit(node.name);
+                if (node.objectAssignmentInitializer) {
+                    write(" = ");
+                    emitExpression(node.objectAssignmentInitializer);
+                }
             }
 
             //
@@ -1972,7 +2199,7 @@ const _super = (function (geti, seti) {
             function emitSourceFile(node: SourceFile) {
                 writeLine();
                 emitShebang();
-                emitDetachedComments(node);
+                emitLeadingDetachedComments(node);
 
                 const statements = node.statements;
                 const statementOffset = emitPrologueDirectives(statements);
@@ -1983,36 +2210,18 @@ const _super = (function (geti, seti) {
                 else {
                     const savedTempFlags = tempFlags;
                     tempFlags = 0;
-                    startLexicalEnvironment();
                     emitHelpers(node);
                     emitList(node, statements, ListFormat.MultiLine, statementOffset);
-                    emitLexicalEnvironment(endLexicalEnvironment(), /*newLine*/ true);
                     tempFlags = savedTempFlags;
                 }
 
-                emitLeadingComments(node.endOfFileToken);
+                emitTrailingDetachedComments(node.statements);
             }
 
-            function emitLexicalEnvironment(declarations: Statement[], newLine: boolean) {
-                if (declarations && declarations.length > 0) {
-                    for (const node of declarations) {
-                        if (newLine) {
-                            writeLine();
-                        }
-                        else {
-                            write(" ");
-                        }
+            // Transformation nodes
 
-                        emit(node);
-                    }
-
-                    if (newLine) {
-                        writeLine();
-                    }
-                    else {
-                        write(" ");
-                    }
-                }
+            function emitPartiallyEmittedExpression(node: PartiallyEmittedExpression) {
+                emitExpression(node.expression);
             }
 
             /**
@@ -2074,6 +2283,11 @@ const _super = (function (geti, seti) {
                         helpersEmitted = 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) {
@@ -2125,12 +2339,13 @@ const _super = (function (geti, seti) {
                 const shebang = getShebang(currentText);
                 if (shebang) {
                     write(shebang);
+                    writeLine();
                 }
             }
 
-            function emitModifiers(node: Node, modifiers: ModifiersArray) {
+            function emitModifiers(node: Node, modifiers: NodeArray<Modifier>) {
                 if (modifiers && modifiers.length) {
-                    emitList(node, modifiers, ListFormat.SingleLine);
+                    emitList(node, modifiers, ListFormat.Modifiers);
                     write(" ");
                 }
             }
@@ -2139,6 +2354,16 @@ const _super = (function (geti, seti) {
                 emitNodeWithPrefix(prefix, node, emit);
             }
 
+            // TODO(rbuckton): This should be removed once source maps are aligned with the old
+            //                 emitter and new baselines are taken. This exists solely to
+            //                 align with the old emitter.
+            function emitSpecializedWithPrefix(prefix: string, node: Node, flags: NodeEmitFlags) {
+                if (node) {
+                    write(prefix);
+                    emitSpecialized(node, flags);
+                }
+            }
+
             function emitExpressionWithPrefix(prefix: string, node: Node) {
                 emitNodeWithPrefix(prefix, node, emitExpression);
             }
@@ -2157,12 +2382,12 @@ const _super = (function (geti, seti) {
                 }
             }
 
-            function tryEmitSubstitute(node: Node, substitution: (node: Node) => Node) {
-                if (substitution && (getNodeEmitFlags(node) & NodeEmitFlags.NoSubstitution) === 0) {
-                    const substitute = substitution(node);
+            function tryEmitSubstitute(node: Node, emitNode: (node: Node) => void, isExpression: boolean) {
+                if (isSubstitutionEnabled(node) && (getNodeEmitFlags(node) & NodeEmitFlags.NoSubstitution) === 0) {
+                    const substitute = onSubstituteNode(node, isExpression);
                     if (substitute !== node) {
-                        setNodeEmitFlags(substitute, NodeEmitFlags.NoSubstitution);
-                        emitWorker(substitute);
+                        setNodeEmitFlags(substitute, NodeEmitFlags.NoSubstitution | getNodeEmitFlags(substitute));
+                        emitNode(substitute);
                         return true;
                     }
                 }
@@ -2282,6 +2507,7 @@ const _super = (function (geti, seti) {
 
                     // 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];
@@ -2292,16 +2518,23 @@ const _super = (function (geti, seti) {
 
                             // 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) {
+                            else if (previousSibling && format & ListFormat.SpaceBetweenSiblings) {
                                 write(" ");
                             }
                         }
 
                         if (shouldEmitInterveningComments) {
-                            emitLeadingComments(child, getTrailingCommentsOfPosition(child.pos));
+                            emitLeadingComments(/*node*/ child, getTrailingCommentsOfPosition(child.pos), /*contextNode*/ child, getCommentRange);
                         }
                         else {
                             shouldEmitInterveningComments = true;
@@ -2310,6 +2543,11 @@ const _super = (function (geti, seti) {
                         // Emit this child.
                         emit(child);
 
+                        if (shouldDecreaseIndentAfterEmit) {
+                            decreaseIndent();
+                            shouldDecreaseIndentAfterEmit = false;
+                        }
+
                         previousSibling = child;
                     }
 
@@ -2350,12 +2588,18 @@ const _super = (function (geti, seti) {
                 }
             }
 
-            function writeToken(token: SyntaxKind, pos?: number) {
-                const tokenStartPos = skipTrivia(currentText, pos);
-                emitPos(tokenStartPos);
-                const tokenEndPos = writeTokenText(token, pos);
-                emitPos(tokenEndPos);
-                return tokenEndPos;
+            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 (getNodeEmitFlags(contextNode) & NodeEmitFlags.NoTokenLeadingSourceMaps) !== 0;
+            }
+
+            function shouldSkipTrailingSourceMapForToken(contextNode: Node) {
+                return (getNodeEmitFlags(contextNode) & NodeEmitFlags.NoTokenTrailingSourceMaps) !== 0;
             }
 
             function writeTokenText(token: SyntaxKind, pos?: number) {
@@ -2366,9 +2610,9 @@ const _super = (function (geti, seti) {
 
             function writeTokenNode(node: Node) {
                 if (node) {
-                    emitStart(node);
+                    emitStart(/*range*/ node, /*contextNode*/ node, shouldSkipLeadingSourceMapForNode, shouldSkipSourceMapForChildren, getSourceMapRange);
                     writeTokenText(node.kind);
-                    emitEnd(node);
+                    emitEnd(/*range*/ node, /*contextNode*/ node, shouldSkipTrailingSourceMapForNode, shouldSkipSourceMapForChildren, getSourceMapRange);
                 }
             }
 
@@ -2399,20 +2643,21 @@ const _super = (function (geti, seti) {
                 if (format & ListFormat.MultiLine) {
                     return true;
                 }
-                else if (format & ListFormat.PreserveLines) {
+
+                if (format & ListFormat.PreserveLines) {
                     if (format & ListFormat.PreferNewLine) {
                         return true;
                     }
 
                     const firstChild = children[0];
                     if (firstChild === undefined) {
-                        return !positionsAreOnSameLine(getStartPos(parentNode), parentNode.end);
+                        return !rangeIsOnSingleLine(parentNode, currentSourceFile);
                     }
                     else if (positionIsSynthesized(parentNode.pos) || nodeIsSynthesized(firstChild)) {
                         return synthesizedNodeStartsOnNewLine(firstChild, format);
                     }
                     else {
-                        return !rangeStartPositionsAreOnSameLine(parentNode, firstChild);
+                        return !rangeStartPositionsAreOnSameLine(parentNode, firstChild, currentSourceFile);
                     }
                 }
                 else {
@@ -2432,11 +2677,11 @@ const _super = (function (geti, seti) {
                         return synthesizedNodeStartsOnNewLine(previousNode, format) || synthesizedNodeStartsOnNewLine(nextNode, format);
                     }
                     else {
-                        return !rangeEndIsOnSameLineAsRangeStart(previousNode, nextNode);
+                        return !rangeEndIsOnSameLineAsRangeStart(previousNode, nextNode, currentSourceFile);
                     }
                 }
                 else {
-                    return false;
+                    return nextNode.startsOnNewLine;
                 }
             }
 
@@ -2451,13 +2696,13 @@ const _super = (function (geti, seti) {
 
                     const lastChild = lastOrUndefined(children);
                     if (lastChild === undefined) {
-                        return !positionsAreOnSameLine(getStartPos(parentNode), parentNode.end);
+                        return !rangeIsOnSingleLine(parentNode, currentSourceFile);
                     }
                     else if (positionIsSynthesized(parentNode.pos) || nodeIsSynthesized(lastChild)) {
                         return synthesizedNodeStartsOnNewLine(lastChild, format);
                     }
                     else {
-                        return !rangeEndPositionsAreOnSameLine(parentNode, lastChild);
+                        return !rangeEndPositionsAreOnSameLine(parentNode, lastChild, currentSourceFile);
                     }
                 }
                 else {
@@ -2474,30 +2719,10 @@ const _super = (function (geti, seti) {
 
                     return startsOnNewLine;
                 }
+
                 return (format & ListFormat.PreferNewLine) !== 0;
             }
 
-            function rangeStartPositionsAreOnSameLine(range1: TextRange, range2: TextRange) {
-                return positionsAreOnSameLine(getStartPos(range1), getStartPos(range2));
-            }
-
-            function rangeEndPositionsAreOnSameLine(range1: TextRange, range2: TextRange) {
-                return positionsAreOnSameLine(range1.end, range2.end);
-            }
-
-            function rangeEndIsOnSameLineAsRangeStart(range1: TextRange, range2: TextRange) {
-                return positionsAreOnSameLine(range1.end, getStartPos(range2));
-            }
-
-            function positionsAreOnSameLine(pos1: number, pos2: number) {
-                return pos1 === pos2 ||
-                    getLineOfLocalPosition(currentSourceFile, pos1) === getLineOfLocalPosition(currentSourceFile, pos2);
-            }
-
-            function getStartPos(range: TextRange) {
-                return range.pos === -1 ? -1 : skipTrivia(currentText, range.pos);
-            }
-
             function needsIndentation(parent: Node, node1: Node, node2: Node): boolean {
                 parent = skipSynthesizedParentheses(parent);
                 node1 = skipSynthesizedParentheses(node1);
@@ -2511,7 +2736,7 @@ const _super = (function (geti, seti) {
                 return !nodeIsSynthesized(parent)
                     && !nodeIsSynthesized(node1)
                     && !nodeIsSynthesized(node2)
-                    && !rangeEndIsOnSameLineAsRangeStart(node1, node2);
+                    && !rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile);
             }
 
             function skipSynthesizedParentheses(node: Node) {
@@ -2522,14 +2747,15 @@ const _super = (function (geti, seti) {
                 return node;
             }
 
-            function getTextOfNode(node: Node, includeTrivia?: boolean) {
-                if (isIdentifier(node)) {
-                    if (node.autoGenerateKind) {
-                        return getGeneratedIdentifier(node);
-                    }
-                    else if (nodeIsSynthesized(node) || !node.parent) {
-                        return node.text;
-                    }
+            function getTextOfNode(node: Node, includeTrivia?: boolean): string {
+                if (isGeneratedIdentifier(node)) {
+                    return getGeneratedIdentifier(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;
@@ -2538,6 +2764,20 @@ const _super = (function (geti, seti) {
                 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;
@@ -2551,18 +2791,7 @@ const _super = (function (geti, seti) {
             function isSingleLineEmptyBlock(block: Block) {
                 return !block.multiLine
                     && block.statements.length === 0
-                    && rangeEndIsOnSameLineAsRangeStart(block, block);
-            }
-
-            function getNotEmittedParent(node: Node): Node {
-                if (getNodeEmitFlags(node) & NodeEmitFlags.EmitCommentsOfNotEmittedParent) {
-                    const parent = getOriginalNode(node).parent;
-                    if (getNodeEmitFlags(parent) & NodeEmitFlags.IsNotEmittedNode) {
-                        return parent;
-                    }
-                }
-
-                return undefined;
+                    && rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile);
             }
 
             function isUniqueName(name: string): boolean {
@@ -2631,7 +2860,7 @@ const _super = (function (geti, seti) {
             }
 
             function generateNameForModuleOrEnum(node: ModuleDeclaration | EnumDeclaration) {
-                const name = node.name.text;
+                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);
             }
@@ -2651,10 +2880,10 @@ const _super = (function (geti, seti) {
                 return makeUniqueName("class");
             }
 
-            function generateNameForNode(node: Node) {
+            function generateNameForNode(node: Node): string {
                 switch (node.kind) {
                     case SyntaxKind.Identifier:
-                        return makeUniqueName((<Identifier>node).text);
+                        return makeUniqueName(getTextOfNode(node));
                     case SyntaxKind.ModuleDeclaration:
                     case SyntaxKind.EnumDeclaration:
                         return generateNameForModuleOrEnum(<ModuleDeclaration | EnumDeclaration>node);
@@ -2681,73 +2910,102 @@ const _super = (function (geti, seti) {
                     case GeneratedIdentifierKind.Unique:
                         return makeUniqueName(node.text);
                     case GeneratedIdentifierKind.Node:
-                        return generateNameForNode(getOriginalNode(node));
+                        return generateNameForNode(getSourceNodeForGeneratedName(node));
                 }
             }
 
             function getGeneratedIdentifier(node: Identifier) {
-                const id = getOriginalNodeId(node);
+                const id = getNodeIdForGeneratedIdentifier(node);
                 return nodeToGeneratedName[id] || (nodeToGeneratedName[id] = unescapeIdentifier(generateIdentifier(node)));
             }
+
+            function getSourceNodeForGeneratedName(name: Identifier) {
+                let node: Node = name;
+                while (node.original !== undefined) {
+                    const nodeId = node.id;
+                    node = node.original;
+                    // If "node" is not the exact clone of "original" identifier, use "original" identifier to generate the name
+                    if (isIdentifier(node) && node.autoGenerateKind === GeneratedIdentifierKind.Node && node.id !== nodeId) {
+                        break;
+                    }
+                }
+
+                return node;
+            }
+
+            function getNodeIdForGeneratedIdentifier(node: Identifier) {
+                switch (node.autoGenerateKind) {
+                    case GeneratedIdentifierKind.Auto:
+                    case GeneratedIdentifierKind.Loop:
+                    case GeneratedIdentifierKind.Unique:
+                        return getNodeId(node);
+                    case GeneratedIdentifierKind.Node:
+                        return getNodeId(getSourceNodeForGeneratedName(node));
+                }
+            }
         }
-    }
 
-    function createDelimiterMap() {
-        const delimiters: string[] = [];
-        delimiters[ListFormat.None] = "";
-        delimiters[ListFormat.CommaDelimited] = ",";
-        delimiters[ListFormat.BarDelimited] = " |";
-        delimiters[ListFormat.AmpersandDelimited] = " &";
-        return delimiters;
-    }
+        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 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 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 getOpeningBracket(format: ListFormat) {
+            return brackets[format & ListFormat.BracketsMask][0];
+        }
 
-    function getClosingBracket(format: ListFormat) {
-        return brackets[format & ListFormat.BracketsMask][1];
+        function getClosingBracket(format: ListFormat) {
+            return brackets[format & ListFormat.BracketsMask][1];
+        }
     }
 
     const enum ListFormat {
         None = 0,
 
         // Line separators
-        SingleLine = 1 << 0,            // Prints the list on a single line (default).
-        MultiLine = 1 << 1,             // Prints the list on multiple lines.
-        PreserveLines = 1 << 2,         // Prints the list using line preservation if possible.
+        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 << 3,          // Each list item is space-and-bar (" |") delimited.
-        AmpersandDelimited = 1 << 4,    // Each list item is space-and-ampersand (" &") delimited.
-        CommaDelimited = 1 << 5,        // Each list item is comma (",") delimited.
-        AllowTrailingComma = 1 << 6,    // Write a trailing comma (",") if present.
+        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 << 7,              // The list should be indented.
-        SpaceBetweenBraces = 1 << 8,    // Inserts a space after the opening brace and before the closing brace.
+        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 "}".
+        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,
@@ -2757,37 +3015,39 @@ const _super = (function (geti, seti) {
         NoTrailingNewLine = 1 << 16,    // Do not emit a trailing NewLine for a MultiLine list.
 
         // Precomputed Formats
+        Modifiers = SingleLine | SpaceBetweenSiblings,
+        HeritageClauses = SingleLine | SpaceBetweenSiblings,
         TypeLiteralMembers = MultiLine | Indented,
-        TupleTypeElements = CommaDelimited | SingleLine | Indented,
-        UnionTypeConstituents = BarDelimited | SingleLine,
-        IntersectionTypeConstituents = AmpersandDelimited | SingleLine,
-        ObjectBindingPatternElements = SingleLine | AllowTrailingComma | SpaceBetweenBraces,
-        ArrayBindingPatternElements = SingleLine | AllowTrailingComma,
-        ObjectLiteralExpressionProperties = PreserveLines | CommaDelimited | SpaceBetweenBraces | Indented | Braces,
-        ArrayLiteralExpressionElements = PreserveLines | CommaDelimited | AllowTrailingComma | Indented | SquareBrackets,
-        CallExpressionArguments = CommaDelimited | SingleLine | Parenthesis,
-        NewExpressionArguments = CommaDelimited | SingleLine | Parenthesis | OptionalIfUndefined,
+        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,
-        SingleLineBlockStatements = SpaceBetweenBraces | SingleLine,
+        SingleLineBlockStatements = SpaceBetweenBraces | SpaceBetweenSiblings | SingleLine,
         MultiLineBlockStatements = Indented | MultiLine,
-        VariableDeclarationList = CommaDelimited | SingleLine,
-        SingleLineFunctionBodyStatements = SingleLine | SpaceBetweenBraces,
+        VariableDeclarationList = CommaDelimited | SpaceBetweenSiblings | SingleLine,
+        SingleLineFunctionBodyStatements = SingleLine | SpaceBetweenSiblings | SpaceBetweenBraces,
         MultiLineFunctionBodyStatements = MultiLine,
-        ClassHeritageClauses = SingleLine,
+        ClassHeritageClauses = SingleLine | SpaceBetweenSiblings,
         ClassMembers = Indented | MultiLine,
         InterfaceMembers = Indented | MultiLine,
         EnumMembers = CommaDelimited | Indented | MultiLine,
         CaseBlockClauses = Indented | MultiLine,
-        NamedImportsOrExportsElements = CommaDelimited | AllowTrailingComma | SingleLine | SpaceBetweenBraces,
+        NamedImportsOrExportsElements = CommaDelimited | SpaceBetweenSiblings | AllowTrailingComma | SingleLine | SpaceBetweenBraces,
         JsxElementChildren = SingleLine,
-        JsxElementAttributes = SingleLine,
+        JsxElementAttributes = SingleLine | SpaceBetweenSiblings,
         CaseOrDefaultClauseStatements = Indented | MultiLine | NoTrailingNewLine | OptionalIfEmpty,
-        HeritageClauseTypes = CommaDelimited | SingleLine,
+        HeritageClauseTypes = CommaDelimited | SpaceBetweenSiblings | SingleLine,
         SourceFileStatements = MultiLine | NoTrailingNewLine,
         Decorators = MultiLine | Optional,
-        TypeArguments = CommaDelimited | SingleLine | Indented | AngleBrackets | Optional,
-        TypeParameters = CommaDelimited | SingleLine | Indented | AngleBrackets | Optional,
-        Parameters = CommaDelimited | SingleLine | Indented | Parenthesis,
-        IndexSignatureParameters = CommaDelimited | SingleLine | Indented | SquareBrackets,
+        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,
     }
 }
\ No newline at end of file
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 87e8775d1f0..bf5b7cb5727 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -13,11 +13,17 @@ namespace ts {
 
     const emptyArray: any[] = [];
 
+    const defaultLibrarySearchPaths = [
+        "types/",
+        "node_modules/",
+        "node_modules/@types/",
+    ];
+
     export const version = "1.9.0";
 
     export function findConfigFile(searchPath: string, fileExists: (fileName: string) => boolean): string {
-        let fileName = "tsconfig.json";
         while (true) {
+            const fileName = combinePaths(searchPath, "tsconfig.json");
             if (fileExists(fileName)) {
                 return fileName;
             }
@@ -26,7 +32,6 @@ namespace ts {
                 break;
             }
             searchPath = parentPath;
-            fileName = "../" + fileName;
         }
         return undefined;
     }
@@ -37,22 +42,58 @@ namespace ts {
         return normalizePath(referencedFileName);
     }
 
+    /* @internal */
+    export function computeCommonSourceDirectoryOfFilenames(fileNames: string[], currentDirectory: string, getCanonicalFileName: (fileName: string) => string): string {
+        let commonPathComponents: string[];
+        const failed = forEach(fileNames, sourceFile => {
+            // Each file contributes into common source file path
+            const sourcePathComponents = getNormalizedPathComponents(sourceFile, currentDirectory);
+            sourcePathComponents.pop(); // The base file name is not part of the common directory path
+
+            if (!commonPathComponents) {
+                // first file
+                commonPathComponents = sourcePathComponents;
+                return;
+            }
+
+            for (let i = 0, n = Math.min(commonPathComponents.length, sourcePathComponents.length); i < n; i++) {
+                if (getCanonicalFileName(commonPathComponents[i]) !== getCanonicalFileName(sourcePathComponents[i])) {
+                    if (i === 0) {
+                        // Failed to find any common path component
+                        return true;
+                    }
+
+                    // New common path found that is 0 -> i-1
+                    commonPathComponents.length = i;
+                    break;
+                }
+            }
+
+            // If the sourcePathComponents was shorter than the commonPathComponents, truncate to the sourcePathComponents
+            if (sourcePathComponents.length < commonPathComponents.length) {
+                commonPathComponents.length = sourcePathComponents.length;
+            }
+        });
+
+        // A common path can not be found when paths span multiple drives on windows, for example
+        if (failed) {
+            return "";
+        }
+
+        if (!commonPathComponents) { // Can happen when all input files are .d.ts files
+            return currentDirectory;
+        }
+
+        return getNormalizedPathFromPathComponents(commonPathComponents);
+    }
+
     function trace(host: ModuleResolutionHost, message: DiagnosticMessage, ...args: any[]): void;
     function trace(host: ModuleResolutionHost, message: DiagnosticMessage): void {
         host.trace(formatMessage.apply(undefined, arguments));
     }
 
     function isTraceEnabled(compilerOptions: CompilerOptions, host: ModuleResolutionHost): boolean {
-        return compilerOptions.traceModuleResolution && host.trace !== undefined;
-    }
-
-    function startsWith(str: string, prefix: string): boolean {
-        return str.lastIndexOf(prefix, 0) === 0;
-    }
-
-    function endsWith(str: string, suffix: string): boolean {
-        const expectedPos = str.length - suffix.length;
-        return str.indexOf(suffix, expectedPos) === expectedPos;
+        return compilerOptions.traceResolution && host.trace !== undefined;
     }
 
     function hasZeroOrOneAsteriskCharacter(str: string): boolean {
@@ -93,6 +134,160 @@ namespace ts {
         skipTsx: boolean;
     }
 
+    function tryReadTypesSection(packageJsonPath: string, baseDirectory: string, state: ModuleResolutionState): string {
+        let jsonContent: { typings?: string, types?: string };
+        try {
+            const jsonText = state.host.readFile(packageJsonPath);
+            jsonContent = jsonText ? <{ typings?: string, types?: string }>JSON.parse(jsonText) : {};
+        }
+        catch (e) {
+            // gracefully handle if readFile fails or returns not JSON
+            jsonContent = {};
+        }
+
+        let typesFile: string;
+        let fieldName: string;
+        // first try to read content of 'typings' section (backward compatibility)
+        if (jsonContent.typings) {
+            if (typeof jsonContent.typings === "string") {
+                fieldName = "typings";
+                typesFile = jsonContent.typings;
+            }
+            else {
+                if (state.traceEnabled) {
+                    trace(state.host, Diagnostics.Expected_type_of_0_field_in_package_json_to_be_string_got_1, "typings", typeof jsonContent.typings);
+                }
+            }
+        }
+        // then read 'types'
+        if (!typesFile && jsonContent.types) {
+            if (typeof jsonContent.types === "string") {
+                fieldName = "types";
+                typesFile = jsonContent.types;
+            }
+            else {
+                if (state.traceEnabled) {
+                    trace(state.host, Diagnostics.Expected_type_of_0_field_in_package_json_to_be_string_got_1, "types", typeof jsonContent.types);
+                }
+            }
+        }
+        if (typesFile) {
+            const typesFilePath = normalizePath(combinePaths(baseDirectory, typesFile));
+            if (state.traceEnabled) {
+                trace(state.host, Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, typesFile, typesFilePath);
+            }
+            return typesFilePath;
+        }
+        return undefined;
+    }
+
+    const typeReferenceExtensions = [".d.ts"];
+
+    /**
+     * @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
+     * is assumed to be the same as root directory of the project.
+     */
+    export function resolveTypeReferenceDirective(typeReferenceDirectiveName: string, containingFile: string, options: CompilerOptions, host: ModuleResolutionHost): ResolvedTypeReferenceDirectiveWithFailedLookupLocations {
+        const traceEnabled = isTraceEnabled(options, host);
+        const moduleResolutionState: ModuleResolutionState = {
+            compilerOptions: options,
+            host: host,
+            skipTsx: true,
+            traceEnabled
+        };
+
+        // use typesRoot and fallback to directory that contains tsconfig if typesRoot is not set
+        const rootDir = options.typesRoot || (options.configFilePath ? getDirectoryPath(options.configFilePath) : undefined);
+
+        if (traceEnabled) {
+            if (containingFile === undefined) {
+                if (rootDir === undefined) {
+                    trace(host, Diagnostics.Resolving_type_reference_directive_0_containing_file_not_set_root_directory_not_set, typeReferenceDirectiveName);
+                }
+                else {
+                    trace(host, Diagnostics.Resolving_type_reference_directive_0_containing_file_not_set_root_directory_1, typeReferenceDirectiveName, rootDir);
+                }
+            }
+            else {
+                if (rootDir === undefined) {
+                    trace(host, Diagnostics.Resolving_type_reference_directive_0_containing_file_1_root_directory_not_set, typeReferenceDirectiveName, containingFile);
+                }
+                else {
+                    trace(host, Diagnostics.Resolving_type_reference_directive_0_containing_file_1_root_directory_2, typeReferenceDirectiveName, containingFile, rootDir);
+                }
+            }
+        }
+
+        const failedLookupLocations: string[] = [];
+
+        // Check primary library paths
+        if (rootDir !== undefined) {
+            const effectivePrimarySearchPaths = options.typesSearchPaths || defaultLibrarySearchPaths;
+            for (const searchPath of effectivePrimarySearchPaths) {
+                const primaryPath = combinePaths(rootDir, searchPath);
+                if (traceEnabled) {
+                    trace(host, Diagnostics.Resolving_with_primary_search_path_0, primaryPath);
+                }
+                const candidate = combinePaths(primaryPath, typeReferenceDirectiveName);
+                const candidateDirectory = getDirectoryPath(candidate);
+                const resolvedFile = loadNodeModuleFromDirectory(typeReferenceExtensions, candidate, failedLookupLocations,
+                    !directoryProbablyExists(candidateDirectory, host), moduleResolutionState);
+
+                if (resolvedFile) {
+                    if (traceEnabled) {
+                        trace(host, Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile, true);
+                    }
+                    return {
+                        resolvedTypeReferenceDirective: { primary: true, resolvedFileName: resolvedFile },
+                        failedLookupLocations
+                    };
+                }
+            }
+        }
+        else {
+            if (traceEnabled) {
+                trace(host, Diagnostics.Root_directory_cannot_be_determined_skipping_primary_search_paths);
+            }
+        }
+
+        let resolvedFile: string;
+        let initialLocationForSecondaryLookup: string;
+        if (containingFile) {
+            initialLocationForSecondaryLookup = getDirectoryPath(containingFile);
+        }
+        else {
+            initialLocationForSecondaryLookup = rootDir;
+        }
+
+        if (initialLocationForSecondaryLookup !== undefined) {
+            // check secondary locations
+            if (traceEnabled) {
+                trace(host, Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
+            }
+            resolvedFile = loadModuleFromNodeModules(typeReferenceDirectiveName, initialLocationForSecondaryLookup, failedLookupLocations, moduleResolutionState);
+            if (traceEnabled) {
+                if (resolvedFile) {
+                    trace(host, Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile, false);
+                }
+                else {
+                    trace(host, Diagnostics.Type_reference_directive_0_was_not_resolved, typeReferenceDirectiveName);
+                }
+            }
+        }
+        else {
+            if (traceEnabled) {
+                trace(host, Diagnostics.Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder);
+            }
+        }
+        return {
+            resolvedTypeReferenceDirective: resolvedFile
+                ? { primary: false, resolvedFileName: resolvedFile }
+                : undefined,
+            failedLookupLocations
+        };
+    }
+
     export function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations {
         const traceEnabled = isTraceEnabled(compilerOptions, host);
         if (traceEnabled) {
@@ -101,7 +296,7 @@ namespace ts {
 
         let moduleResolution = compilerOptions.moduleResolution;
         if (moduleResolution === undefined) {
-            moduleResolution = compilerOptions.module === ModuleKind.CommonJS ? ModuleResolutionKind.NodeJs : ModuleResolutionKind.Classic;
+            moduleResolution = getEmitModuleKind(compilerOptions) === ModuleKind.CommonJS ? ModuleResolutionKind.NodeJs : ModuleResolutionKind.Classic;
             if (traceEnabled) {
                 trace(host, Diagnostics.Module_resolution_kind_is_not_specified_using_0, ModuleResolutionKind[moduleResolution]);
             }
@@ -142,7 +337,7 @@ namespace ts {
      * 'typings' entry or file 'index' with some supported extension
      * - Classic loader will only try to interpret '/a/b/c' as file.
      */
-    type ResolutionKindSpecificLoader = (candidate: string, extensions: string[], failedLookupLocations: string[], onlyRecordFalures: boolean, state: ModuleResolutionState) => string;
+    type ResolutionKindSpecificLoader = (candidate: string, extensions: string[], failedLookupLocations: string[], onlyRecordFailures: boolean, state: ModuleResolutionState) => string;
 
     /**
      * Any module resolution kind can be augmented with optional settings: 'baseUrl', 'paths' and 'rootDirs' - they are used to
@@ -152,7 +347,7 @@ namespace ts {
      * fallback to standard resolution routine.
      *
      * - baseUrl - this setting controls how non-relative module names are resolved. If this setting is specified then non-relative
-     * names will be resolved relative to baseUrl: i.e. if baseUrl is '/a/b' then canditate location to resolve module name 'c/d' will
+     * names will be resolved relative to baseUrl: i.e. if baseUrl is '/a/b' then candidate location to resolve module name 'c/d' will
      * be '/a/b/c/d'
      * - paths - this setting can only be used when baseUrl is specified. allows to tune how non-relative module names
      * will be resolved based on the content of the module name.
@@ -170,7 +365,7 @@ namespace ts {
      * If module name can be matches with multiple patterns then pattern with the longest prefix will be picked.
      * After selecting pattern we'll use list of substitutions to get candidate locations of the module and the try to load module
      * from the candidate location.
-     * Substitiution is a string that can contain zero or one '*'. To get candidate location from substitution we'll pick every
+     * Substitution is a string that can contain zero or one '*'. To get candidate location from substitution we'll pick every
      * substitution in the list and replace '*' with <MatchedStar> string. If candidate location is not rooted it
      * will be converted to absolute using baseUrl.
      * For example:
@@ -198,10 +393,10 @@ namespace ts {
      * 'rootDirs' provides the way to tell compiler that in order to get the whole project it should behave as if content of all
      * root dirs were merged together.
      * I.e. for the example above 'rootDirs' will have two entries: [ '/local/src', '/shared/components/contracts/src' ].
-     * Compiler wil first convert './protocols/file2' into absolute path relative to the location of containing file:
+     * Compiler will first convert './protocols/file2' into absolute path relative to the location of containing file:
      * '/local/src/content/protocols/file2' and try to load it - failure.
      * Then it will search 'rootDirs' looking for a longest matching prefix of this absolute path and if such prefix is found - absolute path will
-     * be converted to a path relative to found rootDir entry './content/protocols/file2' (*). As a last step compiler will check all remainining
+     * be converted to a path relative to found rootDir entry './content/protocols/file2' (*). As a last step compiler will check all remaining
      * entries in 'rootDirs', use them to build absolute path out of (*) and try to resolve module from this location.
      */
     function tryLoadModuleUsingOptionalResolutionSettings(moduleName: string, containingDirectory: string, loader: ResolutionKindSpecificLoader,
@@ -233,7 +428,7 @@ namespace ts {
         for (const rootDir of state.compilerOptions.rootDirs) {
             // rootDirs are expected to be absolute
             // in case of tsconfig.json this will happen automatically - compiler will expand relative names
-            // using locaton of tsconfig.json as base location
+            // using location of tsconfig.json as base location
             let normalizedRoot = normalizePath(rootDir);
             if (!endsWith(normalizedRoot, directorySeparator)) {
                 normalizedRoot += directorySeparator;
@@ -330,7 +525,7 @@ namespace ts {
                     }
                 }
                 else if (pattern === moduleName) {
-                    // pattern was matched as is - no need to seatch further
+                    // pattern was matched as is - no need to search further
                     matchedPattern = pattern;
                     matchedStar = undefined;
                     break;
@@ -372,7 +567,7 @@ namespace ts {
         const traceEnabled = isTraceEnabled(compilerOptions, host);
 
         const failedLookupLocations: string[] = [];
-        const state = {compilerOptions, host, traceEnabled, skipTsx: false};
+        const state = { compilerOptions, host, traceEnabled, skipTsx: false };
         let resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, nodeLoadModuleByRelativeName,
             failedLookupLocations, supportedExtensions, state);
 
@@ -408,7 +603,7 @@ namespace ts {
     }
 
     /* @internal */
-    export function directoryProbablyExists(directoryName: string, host: { directoryExists?: (directoryName: string) => boolean } ): boolean {
+    export function directoryProbablyExists(directoryName: string, host: { directoryExists?: (directoryName: string) => boolean }): boolean {
         // if host does not support 'directoryExists' assume that directory will exist
         return !host.directoryExists || host.directoryExists(directoryName);
     }
@@ -418,6 +613,13 @@ namespace ts {
      * in cases when we know upfront that all load attempts will fail (because containing folder does not exists) however we still need to record all failed lookup locations.
      */
     function loadModuleFromFile(candidate: string, extensions: string[], failedLookupLocation: string[], onlyRecordFailures: boolean, state: ModuleResolutionState): string {
+        if (!onlyRecordFailures) {
+            // check if containig folder exists - if it doesn't then just record failures for all supported extensions without disk probing
+            const directory = getDirectoryPath(candidate);
+            if (directory) {
+                onlyRecordFailures = !directoryProbablyExists(directory, state.host);
+            }
+        }
         return forEach(extensions, tryLoad);
 
         function tryLoad(ext: string): string {
@@ -427,7 +629,7 @@ namespace ts {
             const fileName = fileExtensionIs(candidate, ext) ? candidate : candidate + ext;
             if (!onlyRecordFailures && state.host.fileExists(fileName)) {
                 if (state.traceEnabled) {
-                    trace(state.host, Diagnostics.File_0_exist_use_it_as_a_module_resolution_result, fileName);
+                    trace(state.host, Diagnostics.File_0_exist_use_it_as_a_name_resolution_result, fileName);
                 }
                 return fileName;
             }
@@ -448,36 +650,16 @@ namespace ts {
             if (state.traceEnabled) {
                 trace(state.host, Diagnostics.Found_package_json_at_0, packageJsonPath);
             }
-
-            let jsonContent: { typings?: string };
-
-            try {
-                const jsonText = state.host.readFile(packageJsonPath);
-                jsonContent = jsonText ? <{ typings?: string }>JSON.parse(jsonText) : { typings: undefined };
-            }
-            catch (e) {
-                // gracefully handle if readFile fails or returns not JSON
-                jsonContent = { typings: undefined };
-            }
-
-            if (jsonContent.typings) {
-                if (typeof jsonContent.typings === "string") {
-                    const typingsFile = normalizePath(combinePaths(candidate, jsonContent.typings));
-                    if (state.traceEnabled) {
-                        trace(state.host, Diagnostics.package_json_has_typings_field_0_that_references_1, jsonContent.typings, typingsFile);
-                    }
-                    const result = loadModuleFromFile(typingsFile, extensions, failedLookupLocation, !directoryProbablyExists(getDirectoryPath(typingsFile), state.host), state);
-                    if (result) {
-                        return result;
-                    }
-                }
-                else if (state.traceEnabled) {
-                    trace(state.host, Diagnostics.Expected_type_of_typings_field_in_package_json_to_be_string_got_0, typeof jsonContent.typings);
+            const typesFile = tryReadTypesSection(packageJsonPath, candidate, state);
+            if (typesFile) {
+                const result = loadModuleFromFile(typesFile, extensions, failedLookupLocation, !directoryProbablyExists(getDirectoryPath(typesFile), state.host), state);
+                if (result) {
+                    return result;
                 }
             }
             else {
                 if (state.traceEnabled) {
-                    trace(state.host, Diagnostics.package_json_does_not_have_typings_field);
+                    trace(state.host, Diagnostics.package_json_does_not_have_types_field);
                 }
             }
         }
@@ -492,20 +674,31 @@ namespace ts {
         return loadModuleFromFile(combinePaths(candidate, "index"), extensions, failedLookupLocation, !directoryExists, state);
     }
 
+    function loadModuleFromNodeModulesFolder(moduleName: string, directory: string, failedLookupLocations: string[], state: ModuleResolutionState): string {
+        const nodeModulesFolder = combinePaths(directory, "node_modules");
+        const nodeModulesFolderExists = directoryProbablyExists(nodeModulesFolder, state.host);
+        const candidate = normalizePath(combinePaths(nodeModulesFolder, moduleName));
+        // Load only typescript files irrespective of allowJs option if loading from node modules
+        let result = loadModuleFromFile(candidate, supportedTypeScriptExtensions, failedLookupLocations, !nodeModulesFolderExists, state);
+        if (result) {
+            return result;
+        }
+        result = loadNodeModuleFromDirectory(supportedTypeScriptExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state);
+        if (result) {
+            return result;
+        }
+    }
+
     function loadModuleFromNodeModules(moduleName: string, directory: string, failedLookupLocations: string[], state: ModuleResolutionState): string {
         directory = normalizeSlashes(directory);
         while (true) {
             const baseName = getBaseFileName(directory);
             if (baseName !== "node_modules") {
-                const nodeModulesFolder = combinePaths(directory, "node_modules");
-                const nodeModulesFolderExists = directoryProbablyExists(nodeModulesFolder, state.host);
-                const candidate = normalizePath(combinePaths(nodeModulesFolder, moduleName));
-                // Load only typescript files irrespective of allowJs option if loading from node modules
-                let result = loadModuleFromFile(candidate, supportedTypeScriptExtensions, failedLookupLocations, !nodeModulesFolderExists, state);
-                if (result) {
-                    return result;
-                }
-                result = loadNodeModuleFromDirectory(supportedTypeScriptExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state);
+                const result =
+                    // first: try to load module as-is
+                    loadModuleFromNodeModulesFolder(moduleName, directory, failedLookupLocations, state) ||
+                    // second: try to load module from the scope '@types'
+                    loadModuleFromNodeModulesFolder(combinePaths("@types", moduleName), directory, failedLookupLocations, state);
                 if (result) {
                     return result;
                 }
@@ -534,21 +727,28 @@ namespace ts {
         }
 
         let referencedSourceFile: string;
-        while (true) {
-            const searchName = normalizePath(combinePaths(containingDirectory, moduleName));
-            referencedSourceFile = loadModuleFromFile(searchName, supportedExtensions, failedLookupLocations, /*onlyRecordFailures*/ false, state);
-            if (referencedSourceFile) {
-                break;
+        if (moduleHasNonRelativeName(moduleName)) {
+            while (true) {
+                const searchName = normalizePath(combinePaths(containingDirectory, moduleName));
+                referencedSourceFile = loadModuleFromFile(searchName, supportedExtensions, failedLookupLocations, /*onlyRecordFailures*/ false, state);
+                if (referencedSourceFile) {
+                    break;
+                }
+                const parentPath = getDirectoryPath(containingDirectory);
+                if (parentPath === containingDirectory) {
+                    break;
+                }
+                containingDirectory = parentPath;
             }
-            const parentPath = getDirectoryPath(containingDirectory);
-            if (parentPath === containingDirectory) {
-                break;
-            }
-            containingDirectory = parentPath;
+        }
+        else {
+            const candidate = normalizePath(combinePaths(containingDirectory, moduleName));
+            referencedSourceFile = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, /*onlyRecordFailures*/ false, state);
         }
 
+
         return referencedSourceFile
-            ? { resolvedModule: { resolvedFileName: referencedSourceFile  }, failedLookupLocations }
+            ? { resolvedModule: { resolvedFileName: referencedSourceFile }, failedLookupLocations }
             : { resolvedModule: undefined, failedLookupLocations };
     }
 
@@ -560,6 +760,12 @@ namespace ts {
         sourceMap: false,
     };
 
+    interface OutputFingerprint {
+        hash: string;
+        byteOrderMark: boolean;
+        mtime: Date;
+    }
+
     export function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost {
         const existingDirectories: Map<boolean> = {};
 
@@ -610,11 +816,50 @@ namespace ts {
             }
         }
 
+        let outputFingerprints: Map<OutputFingerprint>;
+
+        function writeFileIfUpdated(fileName: string, data: string, writeByteOrderMark: boolean): void {
+            if (!outputFingerprints) {
+                outputFingerprints = {};
+            }
+
+            const hash = sys.createHash(data);
+            const mtimeBefore = sys.getModifiedTime(fileName);
+
+            if (mtimeBefore && hasProperty(outputFingerprints, fileName)) {
+                const fingerprint = outputFingerprints[fileName];
+
+                // If output has not been changed, and the file has no external modification
+                if (fingerprint.byteOrderMark === writeByteOrderMark &&
+                    fingerprint.hash === hash &&
+                    fingerprint.mtime.getTime() === mtimeBefore.getTime()) {
+                    return;
+                }
+            }
+
+            sys.writeFile(fileName, data, writeByteOrderMark);
+
+            const mtimeAfter = sys.getModifiedTime(fileName);
+
+            outputFingerprints[fileName] = {
+                hash,
+                byteOrderMark: writeByteOrderMark,
+                mtime: mtimeAfter
+            };
+        }
+
         function writeFile(fileName: string, data: string, writeByteOrderMark: boolean, onError?: (message: string) => void) {
             try {
                 const start = new Date().getTime();
                 ensureDirectoriesExist(getDirectoryPath(normalizePath(fileName)));
-                sys.writeFile(fileName, data, writeByteOrderMark);
+
+                if (isWatchSet(options) && sys.createHash && sys.getModifiedTime) {
+                    writeFileIfUpdated(fileName, data, writeByteOrderMark);
+                }
+                else {
+                    sys.writeFile(fileName, data, writeByteOrderMark);
+                }
+
                 ioWriteTime += new Date().getTime() - start;
             }
             catch (e) {
@@ -624,11 +869,16 @@ namespace ts {
             }
         }
 
+        function getDefaultLibLocation(): string {
+            return getDirectoryPath(normalizePath(sys.getExecutingFilePath()));
+        }
+
         const newLine = getNewLineCharacter(options);
 
         return {
             getSourceFile,
-            getDefaultLibFileName: options => combinePaths(getDirectoryPath(normalizePath(sys.getExecutingFilePath())), getDefaultLibFileName(options)),
+            getDefaultLibLocation,
+            getDefaultLibFileName: options => combinePaths(getDefaultLibLocation(), getDefaultLibFileName(options)),
             writeFile,
             getCurrentDirectory: memoize(() => sys.getCurrentDirectory()),
             useCaseSensitiveFileNames: () => sys.useCaseSensitiveFileNames,
@@ -637,15 +887,16 @@ namespace ts {
             fileExists: fileName => sys.fileExists(fileName),
             readFile: fileName => sys.readFile(fileName),
             trace: (s: string) => sys.write(s + newLine),
-            directoryExists: directoryName => sys.directoryExists(directoryName)
+            directoryExists: directoryName => sys.directoryExists(directoryName),
+            getEnvironmentVariable: name => getEnvironmentVariable(name, /*host*/ undefined)
         };
     }
 
     export function getPreEmitDiagnostics(program: Program, sourceFile?: SourceFile, cancellationToken?: CancellationToken): Diagnostic[] {
         let diagnostics = program.getOptionsDiagnostics(cancellationToken).concat(
-                          program.getSyntacticDiagnostics(sourceFile, cancellationToken),
-                          program.getGlobalDiagnostics(cancellationToken),
-                          program.getSemanticDiagnostics(sourceFile, cancellationToken));
+            program.getSyntacticDiagnostics(sourceFile, cancellationToken),
+            program.getGlobalDiagnostics(cancellationToken),
+            program.getSemanticDiagnostics(sourceFile, cancellationToken));
 
         if (program.getCompilerOptions().declaration) {
             diagnostics = diagnostics.concat(program.getDeclarationDiagnostics(sourceFile, cancellationToken));
@@ -680,75 +931,98 @@ namespace ts {
         }
     }
 
+    function loadWithLocalCache<T>(names: string[], containingFile: string, loader: (name: string, containingFile: string) => T): T[] {
+        if (names.length === 0) {
+            return [];
+        }
+        const resolutions: T[] = [];
+        const cache: Map<T> = {};
+        for (const name of names) {
+            let result: T;
+            if (hasProperty(cache, name)) {
+                result = cache[name];
+            }
+            else {
+                result = loader(name, containingFile);
+                cache[name] = result;
+            }
+            resolutions.push(result);
+        }
+        return resolutions;
+    }
+
     export function createProgram(rootNames: string[], options: CompilerOptions, host?: CompilerHost, oldProgram?: Program): Program {
         let program: Program;
         let files: SourceFile[] = [];
-        let fileProcessingDiagnostics = createDiagnosticCollection();
-        const programDiagnostics = createDiagnosticCollection();
-
         let commonSourceDirectory: string;
         let diagnosticsProducingTypeChecker: TypeChecker;
         let noDiagnosticsTypeChecker: TypeChecker;
         let classifiableNames: Map<string>;
 
-        let skipDefaultLib = options.noLib;
-        const supportedExtensions = getSupportedExtensions(options);
+        let resolvedTypeReferenceDirectives: Map<ResolvedTypeReferenceDirective> = {};
+        let fileProcessingDiagnostics = createDiagnosticCollection();
 
         const start = new Date().getTime();
 
         host = host || createCompilerHost(options);
+
+        let skipDefaultLib = options.noLib;
+        const programDiagnostics = createDiagnosticCollection();
+        const currentDirectory = host.getCurrentDirectory();
+        const supportedExtensions = getSupportedExtensions(options);
+
         // Map storing if there is emit blocking diagnostics for given input
         const hasEmitBlockingDiagnostics = createFileMap<boolean>(getCanonicalFileName);
 
-        const currentDirectory = host.getCurrentDirectory();
-        const resolveModuleNamesWorker = host.resolveModuleNames
-            ? ((moduleNames: string[], containingFile: string) => host.resolveModuleNames(moduleNames, containingFile))
-            : ((moduleNames: string[], containingFile: string) => {
-                const resolvedModuleNames: ResolvedModule[] = [];
-                // resolveModuleName does not store any results between calls.
-                // lookup is a local cache to avoid resolving the same module name several times
-                const lookup: Map<ResolvedModule> = {};
-                for (const moduleName of moduleNames) {
-                    let resolvedName: ResolvedModule;
-                    if (hasProperty(lookup, moduleName)) {
-                        resolvedName = lookup[moduleName];
-                    }
-                    else {
-                        resolvedName = resolveModuleName(moduleName, containingFile, options, host).resolvedModule;
-                        lookup[moduleName] = resolvedName;
-                    }
-                    resolvedModuleNames.push(resolvedName);
-                }
-                return resolvedModuleNames;
-            });
+        let resolveModuleNamesWorker: (moduleNames: string[], containingFile: string) => ResolvedModule[];
+        if (host.resolveModuleNames) {
+            resolveModuleNamesWorker = (moduleNames, containingFile) => host.resolveModuleNames(moduleNames, containingFile);
+        }
+        else {
+            const loader = (moduleName: string, containingFile: string) => resolveModuleName(moduleName, containingFile, options, host).resolvedModule;
+            resolveModuleNamesWorker = (moduleNames, containingFile) => loadWithLocalCache(moduleNames, containingFile, loader);
+        }
+
+        let resolveTypeReferenceDirectiveNamesWorker: (typeDirectiveNames: string[], containingFile: string) => ResolvedTypeReferenceDirective[];
+        if (host.resolveTypeReferenceDirectives) {
+            resolveTypeReferenceDirectiveNamesWorker = (typeDirectiveNames, containingFile) => host.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile);
+        }
+        else {
+            const loader = (typesRef: string, containingFile: string) => resolveTypeReferenceDirective(typesRef, containingFile, options, host).resolvedTypeReferenceDirective;
+            resolveTypeReferenceDirectiveNamesWorker = (typeReferenceDirectiveNames, containingFile) => loadWithLocalCache(typeReferenceDirectiveNames, containingFile, loader);
+        }
 
         const filesByName = createFileMap<SourceFile>();
         // stores 'filename -> file association' ignoring case
         // used to track cases when two file names differ only in casing
         const filesByNameIgnoreCase = host.useCaseSensitiveFileNames() ? createFileMap<SourceFile>(fileName => fileName.toLowerCase()) : undefined;
 
-        if (oldProgram) {
-            // check properties that can affect structure of the program or module resolution strategy
-            // if any of these properties has changed - structure cannot be reused
-            const oldOptions = oldProgram.getCompilerOptions();
-            if ((oldOptions.module !== options.module) ||
-                (oldOptions.noResolve !== options.noResolve) ||
-                (oldOptions.target !== options.target) ||
-                (oldOptions.noLib !== options.noLib) ||
-                (oldOptions.jsx !== options.jsx) ||
-                (oldOptions.allowJs !== options.allowJs)) {
-                oldProgram = undefined;
-            }
-        }
-
         if (!tryReuseStructureFromOldProgram()) {
+            // load type declarations specified via 'types' argument
+            if (options.types && options.types.length) {
+                const resolutions = resolveTypeReferenceDirectiveNamesWorker(options.types, /*containingFile*/ undefined);
+                for (let i = 0; i < options.types.length; i++) {
+                    processTypeReferenceDirective(options.types[i], resolutions[i]);
+                }
+            }
+
             forEach(rootNames, name => processRootFile(name, /*isDefaultLib*/ false));
             // Do not process the default library if:
             //  - The '--noLib' flag is used.
             //  - A 'no-default-lib' reference comment is encountered in
             //      processing the root files.
             if (!skipDefaultLib) {
-                processRootFile(host.getDefaultLibFileName(options), /*isDefaultLib*/ true);
+                // If '--lib' is not specified, include default library file according to '--target'
+                // otherwise, using options specified in '--lib' instead of '--target' default library file
+                if (!options.lib) {
+                    processRootFile(host.getDefaultLibFileName(options), /*isDefaultLib*/ true);
+                }
+                else {
+                    const libDirectory = host.getDefaultLibLocation ? host.getDefaultLibLocation() : getDirectoryPath(host.getDefaultLibFileName(options));
+                    forEach(options.lib, libFileName => {
+                        processRootFile(combinePaths(libDirectory, libFileName), /*isDefaultLib*/ true);
+                    });
+                }
             }
         }
 
@@ -775,7 +1049,8 @@ namespace ts {
             getIdentifierCount: () => getDiagnosticsProducingTypeChecker().getIdentifierCount(),
             getSymbolCount: () => getDiagnosticsProducingTypeChecker().getSymbolCount(),
             getTypeCount: () => getDiagnosticsProducingTypeChecker().getTypeCount(),
-            getFileProcessingDiagnostics: () => fileProcessingDiagnostics
+            getFileProcessingDiagnostics: () => fileProcessingDiagnostics,
+            getResolvedTypeReferenceDirectives: () => resolvedTypeReferenceDirectives
         };
 
         verifyCompilerOptions();
@@ -822,6 +1097,21 @@ namespace ts {
                 return false;
             }
 
+            // check properties that can affect structure of the program or module resolution strategy
+            // if any of these properties has changed - structure cannot be reused
+            const oldOptions = oldProgram.getCompilerOptions();
+            if ((oldOptions.module !== options.module) ||
+                (oldOptions.noResolve !== options.noResolve) ||
+                (oldOptions.target !== options.target) ||
+                (oldOptions.noLib !== options.noLib) ||
+                (oldOptions.jsx !== options.jsx) ||
+                (oldOptions.allowJs !== options.allowJs) ||
+                (oldOptions.rootDir !== options.rootDir) ||
+                (oldOptions.typesSearchPaths !== options.typesSearchPaths) ||
+                (oldOptions.configFilePath !== options.configFilePath)) {
+                return false;
+            }
+
             Debug.assert(!oldProgram.structureIsReused);
 
             // there is an old program, check if we can reuse its structure
@@ -830,6 +1120,10 @@ namespace ts {
                 return false;
             }
 
+            if (!arrayIsEqualTo(options.types, oldOptions.types)) {
+                return false;
+            }
+
             // check if program source files has changed in the way that can affect structure of the program
             const newSourceFiles: SourceFile[] = [];
             const filePaths: Path[] = [];
@@ -868,26 +1162,33 @@ namespace ts {
                         return false;
                     }
 
+                    if (!arrayIsEqualTo(oldSourceFile.typeReferenceDirectives, newSourceFile.typeReferenceDirectives, fileReferenceIsEqualTo)) {
+                        // 'types' references has changed
+                        return false;
+                    }
+
+                    const newSourceFilePath = getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory);
                     if (resolveModuleNamesWorker) {
                         const moduleNames = map(concatenate(newSourceFile.imports, newSourceFile.moduleAugmentations), getTextOfLiteral);
-                        const resolutions = resolveModuleNamesWorker(moduleNames, getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory));
+                        const resolutions = resolveModuleNamesWorker(moduleNames, newSourceFilePath);
                         // ensure that module resolution results are still correct
-                        for (let i = 0; i < moduleNames.length; i++) {
-                            const newResolution = resolutions[i];
-                            const oldResolution = getResolvedModule(oldSourceFile, moduleNames[i]);
-                            const resolutionChanged = oldResolution
-                                ? !newResolution ||
-                                  oldResolution.resolvedFileName !== newResolution.resolvedFileName ||
-                                  !!oldResolution.isExternalLibraryImport !== !!newResolution.isExternalLibraryImport
-                                : newResolution;
-
-                            if (resolutionChanged) {
-                                return false;
-                            }
+                        const resolutionsChanged = hasChangesInResolutions(moduleNames, resolutions, oldSourceFile.resolvedModules, moduleResolutionIsEqualTo);
+                        if (resolutionsChanged) {
+                            return false;
                         }
                     }
-                    // pass the cache of module resolutions from the old source file
+                    if (resolveTypeReferenceDirectiveNamesWorker) {
+                        const typesReferenceDirectives = map(newSourceFile.typeReferenceDirectives, x => x.fileName);
+                        const resolutions = resolveTypeReferenceDirectiveNamesWorker(typesReferenceDirectives, newSourceFilePath);
+                        // ensure that types resolutions are still correct
+                        const resolutionsChanged = hasChangesInResolutions(typesReferenceDirectives, resolutions, oldSourceFile.resolvedTypeReferenceDirectiveNames, typeDirectiveIsEqualTo);
+                        if (resolutionsChanged) {
+                            return false;
+                        }
+                    }
+                    // pass the cache of module/types resolutions from the old source file
                     newSourceFile.resolvedModules = oldSourceFile.resolvedModules;
+                    newSourceFile.resolvedTypeReferenceDirectiveNames = oldSourceFile.resolvedTypeReferenceDirectiveNames;
                     modifiedSourceFiles.push(newSourceFile);
                 }
                 else {
@@ -910,6 +1211,7 @@ namespace ts {
             for (const modifiedFile of modifiedSourceFiles) {
                 fileProcessingDiagnostics.reattachFileDiagnostics(modifiedFile);
             }
+            resolvedTypeReferenceDirectives = oldProgram.getResolvedTypeReferenceDirectives();
             oldProgram.structureIsReused = true;
 
             return true;
@@ -925,7 +1227,7 @@ namespace ts {
                 getSourceFile: program.getSourceFile,
                 getSourceFiles: program.getSourceFiles,
                 writeFile: writeFileCallback || (
-                    (fileName, data, writeByteOrderMark, onError) => host.writeFile(fileName, data, writeByteOrderMark, onError)),
+                    (fileName, data, writeByteOrderMark, onError, sourceFiles) => host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles)),
                 isEmitBlocked,
             };
         }
@@ -947,13 +1249,32 @@ namespace ts {
         }
 
         function emitWorker(program: Program, sourceFile: SourceFile, writeFileCallback: WriteFileCallback, cancellationToken: CancellationToken): EmitResult {
+            let declarationDiagnostics: Diagnostic[] = [];
+
+            if (options.noEmit) {
+                return { diagnostics: declarationDiagnostics, sourceMaps: undefined, emittedFiles: undefined, emitSkipped: true };
+            }
+
             // If the noEmitOnError flag is set, then check if we have any errors so far.  If so,
             // immediately bail out.  Note that we pass 'undefined' for 'sourceFile' so that we
             // get any preEmit diagnostics, not just the ones
             if (options.noEmitOnError) {
-                const preEmitDiagnostics = getPreEmitDiagnostics(program, /*sourceFile:*/ undefined, cancellationToken);
-                if (preEmitDiagnostics.length > 0) {
-                    return { diagnostics: preEmitDiagnostics, sourceMaps: undefined, emitSkipped: true };
+                const diagnostics = program.getOptionsDiagnostics(cancellationToken).concat(
+                    program.getSyntacticDiagnostics(sourceFile, cancellationToken),
+                    program.getGlobalDiagnostics(cancellationToken),
+                    program.getSemanticDiagnostics(sourceFile, cancellationToken));
+
+                if (diagnostics.length === 0 && program.getCompilerOptions().declaration) {
+                    declarationDiagnostics = program.getDeclarationDiagnostics(/*sourceFile*/ undefined, cancellationToken);
+                }
+
+                if (diagnostics.length > 0 || declarationDiagnostics.length > 0) {
+                    return {
+                        diagnostics: concatenate(diagnostics, declarationDiagnostics),
+                        sourceMaps: undefined,
+                        emittedFiles: undefined,
+                        emitSkipped: true
+                    };
                 }
             }
 
@@ -969,7 +1290,13 @@ namespace ts {
 
             const start = new Date().getTime();
 
-            const fileEmitter = options.experimentalTransforms ? printFiles : emitFiles;
+            // TODO(rbuckton): remove USE_TRANSFORMS condition when we switch to transforms permanently.
+            let useLegacyEmitter = options.useLegacyEmitter;
+            if (/^(no?|f(alse)?|0|-)$/i.test(getEnvironmentVariable("USE_TRANSFORMS", host))) {
+                useLegacyEmitter = true;
+            }
+
+            const fileEmitter = useLegacyEmitter ? emitFiles : printFiles;
             const emitResult = fileEmitter(
                 emitResolver,
                 getEmitHost(writeFileCallback),
@@ -984,9 +1311,9 @@ namespace ts {
         }
 
         function getDiagnosticsHelper(
-                sourceFile: SourceFile,
-                getDiagnostics: (sourceFile: SourceFile, cancellationToken: CancellationToken) => Diagnostic[],
-                cancellationToken: CancellationToken): Diagnostic[] {
+            sourceFile: SourceFile,
+            getDiagnostics: (sourceFile: SourceFile, cancellationToken: CancellationToken) => Diagnostic[],
+            cancellationToken: CancellationToken): Diagnostic[] {
             if (sourceFile) {
                 return getDiagnostics(sourceFile, cancellationToken);
             }
@@ -1011,7 +1338,14 @@ namespace ts {
         }
 
         function getDeclarationDiagnostics(sourceFile: SourceFile, cancellationToken: CancellationToken): Diagnostic[] {
-            return getDiagnosticsHelper(sourceFile, getDeclarationDiagnosticsForFile, cancellationToken);
+            const options = program.getCompilerOptions();
+            // collect diagnostics from the program only once if either no source file was specified or out/outFile is set (bundled emit)
+            if (!sourceFile || options.out || options.outFile) {
+                return getDeclarationDiagnosticsWorker(sourceFile, cancellationToken);
+            }
+            else {
+                return getDiagnosticsHelper(sourceFile, getDeclarationDiagnosticsForFile, cancellationToken);
+            }
         }
 
         function getSyntacticDiagnosticsForFile(sourceFile: SourceFile, cancellationToken: CancellationToken): Diagnostic[] {
@@ -1027,7 +1361,7 @@ namespace ts {
                     // We were canceled while performing the operation.  Because our type checker
                     // might be a bad state, we need to throw it away.
                     //
-                    // Note: we are overly agressive here.  We do not actually *have* to throw away
+                    // Note: we are overly aggressive here.  We do not actually *have* to throw away
                     // the "noDiagnosticsTypeChecker".  However, for simplicity, i'd like to keep
                     // the lifetimes of these two TypeCheckers the same.  Also, we generally only
                     // cancel when the user has made a change anyways.  And, in that case, we (the
@@ -1171,7 +1505,9 @@ namespace ts {
                             diagnostics.push(createDiagnosticForNode(typeAssertionExpression.type, Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
                             return true;
                         case SyntaxKind.Decorator:
-                            diagnostics.push(createDiagnosticForNode(node, Diagnostics.decorators_can_only_be_used_in_a_ts_file));
+                            if (!options.experimentalDecorators) {
+                                diagnostics.push(createDiagnosticForNode(node, Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning));
+                            }
                             return true;
                     }
 
@@ -1196,7 +1532,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) {
@@ -1223,17 +1559,19 @@ namespace ts {
             });
         }
 
-        function getDeclarationDiagnosticsForFile(sourceFile: SourceFile, cancellationToken: CancellationToken): Diagnostic[] {
+        function getDeclarationDiagnosticsWorker(sourceFile: SourceFile, cancellationToken: CancellationToken): Diagnostic[] {
             return runWithCancellationToken(() => {
-                if (!isDeclarationFile(sourceFile)) {
-                    const resolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile, cancellationToken);
-                    // Don't actually write any files since we're just getting diagnostics.
-                    const writeFile: WriteFileCallback = () => { };
-                    return ts.getDeclarationDiagnostics(getEmitHost(writeFile), resolver, sourceFile);
-                }
+                const resolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile, cancellationToken);
+                // Don't actually write any files since we're just getting diagnostics.
+                const writeFile: WriteFileCallback = () => { };
+                return ts.getDeclarationDiagnostics(getEmitHost(writeFile), resolver, sourceFile);
             });
         }
 
+        function getDeclarationDiagnosticsForFile(sourceFile: SourceFile, cancellationToken: CancellationToken): Diagnostic[] {
+            return isDeclarationFile(sourceFile) ? [] : getDeclarationDiagnosticsWorker(sourceFile, cancellationToken);
+        }
+
         function getOptionsDiagnostics(): Diagnostic[] {
             const allDiagnostics: Diagnostic[] = [];
             addRange(allDiagnostics, fileProcessingDiagnostics.getGlobalDiagnostics());
@@ -1252,7 +1590,7 @@ namespace ts {
         }
 
         function processRootFile(fileName: string, isDefaultLib: boolean) {
-            processSourceFile(normalizePath(fileName), isDefaultLib);
+            processSourceFile(normalizePath(fileName), isDefaultLib, /*isReference*/ true);
         }
 
         function fileReferenceIsEqualTo(a: FileReference, b: FileReference): boolean {
@@ -1311,7 +1649,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:
@@ -1346,7 +1684,10 @@ namespace ts {
             }
         }
 
-        function processSourceFile(fileName: string, isDefaultLib: boolean, refFile?: SourceFile, refPos?: number, refEnd?: number) {
+        /**
+          * 'isReference' indicates whether the file was brought in via a reference directive (rather than an import declaration)
+          */
+        function processSourceFile(fileName: string, isDefaultLib: boolean, isReference: boolean, refFile?: SourceFile, refPos?: number, refEnd?: number) {
             let diagnosticArgument: string[];
             let diagnostic: DiagnosticMessage;
             if (hasExtension(fileName)) {
@@ -1354,7 +1695,7 @@ namespace ts {
                     diagnostic = Diagnostics.File_0_has_unsupported_extension_The_only_supported_extensions_are_1;
                     diagnosticArgument = [fileName, "'" + supportedExtensions.join("', '") + "'"];
                 }
-                else if (!findSourceFile(fileName, toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd)) {
+                else if (!findSourceFile(fileName, toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, isReference, refFile, refPos, refEnd)) {
                     diagnostic = Diagnostics.File_0_not_found;
                     diagnosticArgument = [fileName];
                 }
@@ -1364,13 +1705,13 @@ namespace ts {
                 }
             }
             else {
-                const nonTsFile: SourceFile = options.allowNonTsExtensions && findSourceFile(fileName, toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd);
+                const nonTsFile: SourceFile = options.allowNonTsExtensions && findSourceFile(fileName, toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, isReference, refFile, refPos, refEnd);
                 if (!nonTsFile) {
                     if (options.allowNonTsExtensions) {
                         diagnostic = Diagnostics.File_0_not_found;
                         diagnosticArgument = [fileName];
                     }
-                    else if (!forEach(supportedExtensions, extension => findSourceFile(fileName + extension, toPath(fileName + extension, currentDirectory, getCanonicalFileName), isDefaultLib, refFile, refPos, refEnd))) {
+                    else if (!forEach(supportedExtensions, extension => findSourceFile(fileName + extension, toPath(fileName + extension, currentDirectory, getCanonicalFileName), isDefaultLib, isReference, refFile, refPos, refEnd))) {
                         diagnostic = Diagnostics.File_0_not_found;
                         fileName += ".ts";
                         diagnosticArgument = [fileName];
@@ -1399,7 +1740,7 @@ namespace ts {
         }
 
         // Get source file from normalized fileName
-        function findSourceFile(fileName: string, path: Path, isDefaultLib: boolean, refFile?: SourceFile, refPos?: number, refEnd?: number): SourceFile {
+        function findSourceFile(fileName: string, path: Path, isDefaultLib: boolean, isReference: boolean, refFile?: SourceFile, refPos?: number, refEnd?: number): SourceFile {
             if (filesByName.contains(path)) {
                 const file = filesByName.get(path);
                 // try to check if we've already seen this file but with a different casing in path
@@ -1408,6 +1749,10 @@ namespace ts {
                     reportFileNamesDifferOnlyInCasingError(fileName, file.fileName, refFile, refPos, refEnd);
                 }
 
+                if (file) {
+                    file.wasReferenced = file.wasReferenced || isReference;
+                }
+
                 return file;
             }
 
@@ -1424,6 +1769,7 @@ namespace ts {
 
             filesByName.set(path, file);
             if (file) {
+                file.wasReferenced = file.wasReferenced || isReference;
                 file.path = path;
 
                 if (host.useCaseSensitiveFileNames()) {
@@ -1441,7 +1787,8 @@ namespace ts {
 
                 const basePath = getDirectoryPath(fileName);
                 if (!options.noResolve) {
-                    processReferencedFiles(file, basePath);
+                    processReferencedFiles(file, basePath, isDefaultLib);
+                    processTypeReferenceDirectives(file);
                 }
 
                 // always process imported modules to record module name resolutions
@@ -1458,13 +1805,80 @@ namespace ts {
             return file;
         }
 
-        function processReferencedFiles(file: SourceFile, basePath: string) {
+        function processReferencedFiles(file: SourceFile, basePath: string, isDefaultLib: boolean) {
             forEach(file.referencedFiles, ref => {
                 const referencedFileName = resolveTripleslashReference(ref.fileName, file.fileName);
-                processSourceFile(referencedFileName, /*isDefaultLib*/ false, file, ref.pos, ref.end);
+                processSourceFile(referencedFileName, isDefaultLib, /*isReference*/ true, file, ref.pos, ref.end);
             });
         }
 
+        function processTypeReferenceDirectives(file: SourceFile) {
+            const typeDirectives = map(file.typeReferenceDirectives, l => l.fileName);
+            const resolutions = resolveTypeReferenceDirectiveNamesWorker(typeDirectives, file.fileName);
+
+            for (let i = 0; i < typeDirectives.length; i++) {
+                const ref = file.typeReferenceDirectives[i];
+                const resolvedTypeReferenceDirective = resolutions[i];
+                // store resolved type directive on the file
+                setResolvedTypeReferenceDirective(file, ref.fileName, resolvedTypeReferenceDirective);
+                processTypeReferenceDirective(ref.fileName, resolvedTypeReferenceDirective, file, ref.pos, ref.end);
+            }
+        }
+
+        function processTypeReferenceDirective(typeReferenceDirective: string, resolvedTypeReferenceDirective: ResolvedTypeReferenceDirective,
+            refFile?: SourceFile, refPos?: number, refEnd?: number): void {
+
+            // If we already found this library as a primary reference - nothing to do
+            const previousResolution = resolvedTypeReferenceDirectives[typeReferenceDirective];
+            if (previousResolution && previousResolution.primary) {
+                return;
+            }
+            let saveResolution = true;
+            if (resolvedTypeReferenceDirective) {
+                if (resolvedTypeReferenceDirective.primary) {
+                    // resolved from the primary path
+                    processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, /*isDefaultLib*/ false, /*isReference*/ true, refFile, refPos, refEnd);
+                }
+                else {
+                    // If we already resolved to this file, it must have been a secondary reference. Check file contents
+                    // for sameness and possibly issue an error
+                    if (previousResolution) {
+                        const otherFileText = host.readFile(resolvedTypeReferenceDirective.resolvedFileName);
+                        if (otherFileText !== getSourceFile(previousResolution.resolvedFileName).text) {
+                            fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd,
+                                Diagnostics.Conflicting_library_definitions_for_0_found_at_1_and_2_Copy_the_correct_file_to_the_typings_folder_to_resolve_this_conflict,
+                                typeReferenceDirective,
+                                resolvedTypeReferenceDirective.resolvedFileName,
+                                previousResolution.resolvedFileName
+                            ));
+                        }
+                        // don't overwrite previous resolution result
+                        saveResolution = false;
+                    }
+                    else {
+                        // First resolution of this library
+                        processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, /*isDefaultLib*/ false, /*isReference*/ true, refFile, refPos, refEnd);
+                    }
+                }
+            }
+            else {
+                fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd, Diagnostics.Cannot_find_name_0, typeReferenceDirective));
+            }
+
+            if (saveResolution) {
+                resolvedTypeReferenceDirectives[typeReferenceDirective] = resolvedTypeReferenceDirective;
+            }
+        }
+
+        function createDiagnostic(refFile: SourceFile, refPos: number, refEnd: number, message: DiagnosticMessage, ...args: any[]): Diagnostic {
+            if (refFile === undefined || refPos === undefined || refEnd === undefined) {
+                return createCompilerDiagnostic(message, ...args);
+            }
+            else {
+                return createFileDiagnostic(refFile, refPos, refEnd - refPos, message, ...args);
+            }
+        }
+
         function getCanonicalFileName(fileName: string): string {
             return host.getCanonicalFileName(fileName);
         }
@@ -1479,7 +1893,7 @@ namespace ts {
                     const resolution = resolutions[i];
                     setResolvedModule(file, moduleNames[i], resolution);
                     // add file to program only if:
-                    // - resolution was successfull
+                    // - resolution was successful
                     // - noResolve is falsy
                     // - module name come from the list fo imports
                     const shouldAddFile = resolution &&
@@ -1487,7 +1901,7 @@ namespace ts {
                         i < file.imports.length;
 
                     if (shouldAddFile) {
-                        const importedFile = findSourceFile(resolution.resolvedFileName, toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), /*isDefaultLib*/ false, file, skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
+                        const importedFile = findSourceFile(resolution.resolvedFileName, toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName), /*isDefaultLib*/ false, /*isReference*/ false, file, skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
 
                         if (importedFile && resolution.isExternalLibraryImport) {
                             // Since currently irrespective of allowJs, we only look for supportedTypeScript extension external module files,
@@ -1512,51 +1926,13 @@ namespace ts {
         }
 
         function computeCommonSourceDirectory(sourceFiles: SourceFile[]): string {
-            let commonPathComponents: string[];
-            const failed = forEach(files, sourceFile => {
-                // Each file contributes into common source file path
-                if (isDeclarationFile(sourceFile)) {
-                    return;
+            const fileNames: string[] = [];
+            for (const file of sourceFiles) {
+                if (!file.isDeclarationFile) {
+                    fileNames.push(file.fileName);
                 }
-
-                const sourcePathComponents = getNormalizedPathComponents(sourceFile.fileName, currentDirectory);
-                sourcePathComponents.pop(); // The base file name is not part of the common directory path
-
-                if (!commonPathComponents) {
-                    // first file
-                    commonPathComponents = sourcePathComponents;
-                    return;
-                }
-
-                for (let i = 0, n = Math.min(commonPathComponents.length, sourcePathComponents.length); i < n; i++) {
-                    if (getCanonicalFileName(commonPathComponents[i]) !== getCanonicalFileName(sourcePathComponents[i])) {
-                        if (i === 0) {
-                            // Failed to find any common path component
-                            return true;
-                        }
-
-                        // New common path found that is 0 -> i-1
-                        commonPathComponents.length = i;
-                        break;
-                    }
-                }
-
-                // If the sourcePathComponents was shorter than the commonPathComponents, truncate to the sourcePathComponents
-                if (sourcePathComponents.length < commonPathComponents.length) {
-                    commonPathComponents.length = sourcePathComponents.length;
-                }
-            });
-
-            // A common path can not be found when paths span multiple drives on windows, for example
-            if (failed) {
-                return "";
             }
-
-            if (!commonPathComponents) { // Can happen when all input files are .d.ts files
-                return currentDirectory;
-            }
-
-            return getNormalizedPathFromPathComponents(commonPathComponents);
+            return computeCommonSourceDirectoryOfFilenames(fileNames, currentDirectory, getCanonicalFileName);
         }
 
         function checkSourceFilesBelongToPath(sourceFiles: SourceFile[], rootDirectory: string): boolean {
@@ -1618,11 +1994,22 @@ namespace ts {
                     if (!hasZeroOrOneAsteriskCharacter(key)) {
                         programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Pattern_0_can_have_at_most_one_Asterisk_character, key));
                     }
-                    for (const subst of options.paths[key]) {
-                        if (!hasZeroOrOneAsteriskCharacter(subst)) {
-                            programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character, subst, key));
+                    if (isArray(options.paths[key])) {
+                        for (const subst of options.paths[key]) {
+                            const typeOfSubst = typeof subst;
+                            if (typeOfSubst === "string") {
+                                if (!hasZeroOrOneAsteriskCharacter(subst)) {
+                                    programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character, subst, key));
+                                }
+                            }
+                            else {
+                                programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Substitution_0_for_pattern_1_has_incorrect_type_expected_string_got_2, subst, key, typeOfSubst));
+                            }
                         }
                     }
+                    else {
+                        programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Substututions_for_pattern_0_should_be_an_array, key));
+                    }
                 }
             }
 
@@ -1649,12 +2036,25 @@ namespace ts {
                 }
             }
 
+            if (options.declarationDir) {
+                if (!options.declaration) {
+                    programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "declarationDir", "declaration"));
+                }
+                if (options.out || options.outFile) {
+                    programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "declarationDir", options.out ? "out" : "outFile"));
+                }
+            }
+
+            if (options.lib && options.noLib) {
+                programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "lib", "noLib"));
+            }
+
             const languageVersion = options.target || ScriptTarget.ES3;
             const outFile = options.outFile || options.out;
 
             const firstExternalModuleSourceFile = forEach(files, f => isExternalModule(f) ? f : undefined);
             if (options.isolatedModules) {
-                if (!options.module && languageVersion < ScriptTarget.ES6) {
+                if (options.module === ModuleKind.None && languageVersion < ScriptTarget.ES6) {
                     programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher));
                 }
 
@@ -1664,10 +2064,10 @@ namespace ts {
                     programDiagnostics.add(createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided));
                 }
             }
-            else if (firstExternalModuleSourceFile && languageVersion < ScriptTarget.ES6 && !options.module) {
+            else if (firstExternalModuleSourceFile && languageVersion < ScriptTarget.ES6 && options.module === ModuleKind.None) {
                 // We cannot use createDiagnosticFromNode because nodes do not have parents yet
                 const span = getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator);
-                programDiagnostics.add(createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_modules_unless_the_module_flag_is_provided_Consider_setting_the_module_compiler_option_in_a_tsconfig_json_file));
+                programDiagnostics.add(createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_modules_unless_the_module_flag_is_provided_with_a_valid_module_type_Consider_setting_the_module_compiler_option_in_a_tsconfig_json_file));
             }
 
             // Cannot specify module gen target of es6 when below es6
@@ -1676,7 +2076,10 @@ namespace ts {
             }
 
             // Cannot specify module gen that isn't amd or system with --out
-            if (outFile && options.module && !(options.module === ModuleKind.AMD || options.module === ModuleKind.System)) {
+            // Report this error if user specified --module moduleKind 
+            // or if there is external module in compilation which defaults to commonjs
+            const emitModuleKind = getEmitModuleKind(options);
+            if (outFile && (options.module || firstExternalModuleSourceFile) && !(emitModuleKind === ModuleKind.AMD || emitModuleKind === ModuleKind.System)) {
                 programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Only_amd_and_system_modules_are_supported_alongside_0, options.out ? "out" : "outFile"));
             }
 
@@ -1691,28 +2094,11 @@ namespace ts {
 
                 // If we failed to find a good common directory, but outDir is specified and at least one of our files is on a windows drive/URL/other resource, add a failure
                 if (options.outDir && dir === "" && forEach(files, file => getRootLength(file.fileName) > 1)) {
-                        programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Cannot_find_the_common_subdirectory_path_for_the_input_files));
+                    programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Cannot_find_the_common_subdirectory_path_for_the_input_files));
                 }
             }
 
-            if (options.noEmit) {
-                if (options.out) {
-                    programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "out"));
-                }
-
-                if (options.outFile) {
-                    programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "outFile"));
-                }
-
-                if (options.outDir) {
-                    programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "outDir"));
-                }
-
-                if (options.declaration) {
-                    programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", "declaration"));
-                }
-            }
-            else if (options.allowJs && options.declaration) {
+            if (!options.noEmit && options.allowJs && options.declaration) {
                 programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "allowJs", "declaration"));
             }
 
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index 2ce54b9b9ed..1e280a06cf6 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -114,6 +114,7 @@ namespace ts {
         "try": SyntaxKind.TryKeyword,
         "type": SyntaxKind.TypeKeyword,
         "typeof": SyntaxKind.TypeOfKeyword,
+        "undefined": SyntaxKind.UndefinedKeyword,
         "var": SyntaxKind.VarKeyword,
         "void": SyntaxKind.VoidKeyword,
         "while": SyntaxKind.WhileKeyword,
@@ -509,7 +510,7 @@ namespace ts {
       }
 
       // All conflict markers consist of the same character repeated seven times.  If it is
-      // a <<<<<<< or >>>>>>> marker then it is also followd by a space.
+      // a <<<<<<< or >>>>>>> marker then it is also followed by a space.
     const mergeConflictMarkerLength = "<<<<<<<".length;
 
     function isConflictMarkerTrivia(text: string, pos: number) {
@@ -549,7 +550,7 @@ namespace ts {
         }
         else {
             Debug.assert(ch === CharacterCodes.equals);
-            // Consume everything from the start of the mid-conlict marker to the start of the next
+            // Consume everything from the start of the mid-conflict marker to the start of the next
             // end-conflict marker.
             while (pos < len) {
                 const ch = text.charCodeAt(pos);
diff --git a/src/compiler/sourcemap.ts b/src/compiler/sourcemap.ts
index 967fa0c715f..58df47c770c 100644
--- a/src/compiler/sourcemap.ts
+++ b/src/compiler/sourcemap.ts
@@ -3,22 +3,197 @@
 /* @internal */
 namespace ts {
     export interface SourceMapWriter {
-        getSourceMapData(): SourceMapData;
-        setSourceFile(sourceFile: SourceFile): void;
-        emitPos(pos: number): void;
-        emitStart(range: TextRange): void;
-        emitEnd(range: TextRange): void;
-        /*@deprecated*/ emitEnd(range: TextRange, stopOverridingSpan: boolean): void;
-        /*@deprecated*/ 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;
-        enable(): void;
-        disable(): 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;
     }
 
     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, pos: number) => TextRange): number { return -1; },
+                emitTokenEnd(token: SyntaxKind, end: number, contextNode?: Node, ignoreTokenCallback?: (node: Node) => boolean, getTokenTextRangeCallback?: (node: Node, token: SyntaxKind, pos: number) => 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,
@@ -28,30 +203,10 @@ 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 { },
-                enable(): void { },
-                disable(): void { }
-            };
-        }
-
-        return nullSourceMapWriter;
-    }
-
     export function createSourceMapWriter(host: EmitHost, writer: EmitTextWriter): SourceMapWriter {
         const compilerOptions = host.getCompilerOptions();
         let currentSourceFile: SourceFile;
+        let currentSourceText: string;
         let sourceMapDir: string; // The directory in which sourcemap will be
         let stopOverridingSpan = false;
         let modifyLastSourcePos = false;
@@ -75,26 +230,36 @@ namespace ts {
         let disableDepth: number;
 
         return {
+            initialize,
+            reset,
             getSourceMapData: () => sourceMapData,
             setSourceFile,
             emitPos,
             emitStart,
             emitEnd,
+            emitTokenStart,
+            emitTokenEnd,
             changeEmitSourcePos,
+            stopOverridingSpan: () => stopOverridingSpan = true,
             getText,
             getSourceMappingURL,
-            initialize,
-            reset,
-            enable,
-            disable,
         };
 
+        /**
+         * 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
@@ -154,6 +319,9 @@ namespace ts {
             }
         }
 
+        /**
+         * Reset the SourceMapWriter to an empty state.
+         */
         function reset() {
             currentSourceFile = undefined;
             sourceMapDir = undefined;
@@ -267,6 +435,14 @@ 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 (positionIsSynthesized(pos) || disableDepth > 0) {
                 return;
@@ -313,35 +489,205 @@ namespace ts {
             updateLastEncodedAndRecordedSpans();
         }
 
-        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));
+        function getStartPos(range: TextRange) {
+            return skipTrivia(currentSourceText, range.pos);
+        }
 
-            if (range.disableSourceMap) {
-                disable();
+        /**
+         * 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) {
-            if (range.disableSourceMap) {
-                enable();
+        /**
+         * 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);
             }
 
-            emitPos(range.end);
-            stopOverridingSpan = stopOverridingEnd;
+            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 = sourceFile.text;
 
             // Add the file to tsFilePaths
             // If sourceroot option: Use the relative path corresponding to the common directory path
@@ -368,6 +714,9 @@ namespace ts {
             }
         }
 
+        /**
+         * Gets the text for the source map.
+         */
         function getText() {
             encodeLastRecordedSourceMapSpan();
 
@@ -382,6 +731,9 @@ namespace ts {
             });
         }
 
+        /**
+         * Gets the SourceMappingURL for the source map.
+         */
         function getSourceMappingURL() {
             if (compilerOptions.inlineSourceMap) {
                 // Encode the sourceMap into the sourceMap url
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index f3973e852c6..f302940d1ac 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -1,18 +1,17 @@
 /// <reference path="core.ts"/>
 
 namespace ts {
-    export type FileWatcherCallback = (path: string, removed?: boolean) => void;
-    export type DirectoryWatcherCallback = (path: string) => void;
+    export type FileWatcherCallback = (fileName: string, removed?: boolean) => void;
+    export type DirectoryWatcherCallback = (directoryName: string) => void;
 
     export interface System {
         args: string[];
         newLine: string;
         useCaseSensitiveFileNames: boolean;
-        /*@internal*/ developmentMode?: boolean;
         write(s: string): void;
         readFile(path: string, encoding?: string): string;
         writeFile(path: string, data: string, writeByteOrderMark?: boolean): void;
-        watchFile?(path: Path, callback: FileWatcherCallback): FileWatcher;
+        watchFile?(path: string, callback: FileWatcherCallback): FileWatcher;
         watchDirectory?(path: string, callback: DirectoryWatcherCallback, recursive?: boolean): FileWatcher;
         resolvePath(path: string): string;
         fileExists(path: string): boolean;
@@ -21,13 +20,16 @@ namespace ts {
         getExecutingFilePath(): string;
         getCurrentDirectory(): string;
         readDirectory(path: string, extension?: string, exclude?: string[]): string[];
+        getModifiedTime?(path: string): Date;
+        createHash?(data: string): string;
         getMemoryUsage?(): number;
         exit(exitCode?: number): void;
+        /*@internal*/ getEnvironmentVariable(name: string): string;
         /*@internal*/ tryEnableSourceMapsForHost?(): void;
     }
 
     interface WatchedFile {
-        filePath: Path;
+        fileName: string;
         callback: FileWatcherCallback;
         mtime?: Date;
     }
@@ -37,7 +39,7 @@ namespace ts {
     }
 
     export interface DirectoryWatcher extends FileWatcher {
-        directoryPath: Path;
+        directoryName: string;
         referenceCount: number;
     }
 
@@ -74,6 +76,7 @@ namespace ts {
         readDirectory(path: string, extension?: string, exclude?: string[]): string[];
         watchFile?(path: string, callback: FileWatcherCallback): FileWatcher;
         watchDirectory?(path: string, callback: DirectoryWatcherCallback, recursive?: boolean): FileWatcher;
+        getEnvironmentVariable?(name: string): string;
     };
 
     export var sys: System = (function () {
@@ -213,6 +216,9 @@ namespace ts {
                 getCurrentDirectory() {
                     return new ActiveXObject("WScript.Shell").CurrentDirectory;
                 },
+                getEnvironmentVariable(name: string) {
+                    return new ActiveXObject("WScript.Shell").ExpandEnvironmentStrings(`%${name}%`);
+                },
                 readDirectory,
                 exit(exitCode?: number): void {
                     try {
@@ -228,6 +234,7 @@ namespace ts {
             const _fs = require("fs");
             const _path = require("path");
             const _os = require("os");
+            const _crypto = require("crypto");
 
             // average async stat takes about 30 microseconds
             // set chunk size to do 30 files in < 1 millisecond
@@ -246,13 +253,13 @@ namespace ts {
                         return;
                     }
 
-                    _fs.stat(watchedFile.filePath, (err: any, stats: any) => {
+                    _fs.stat(watchedFile.fileName, (err: any, stats: any) => {
                         if (err) {
-                            watchedFile.callback(watchedFile.filePath);
+                            watchedFile.callback(watchedFile.fileName);
                         }
                         else if (watchedFile.mtime.getTime() !== stats.mtime.getTime()) {
-                            watchedFile.mtime = getModifiedTime(watchedFile.filePath);
-                            watchedFile.callback(watchedFile.filePath, watchedFile.mtime.getTime() === 0);
+                            watchedFile.mtime = getModifiedTime(watchedFile.fileName);
+                            watchedFile.callback(watchedFile.fileName, watchedFile.mtime.getTime() === 0);
                         }
                     });
                 }
@@ -280,11 +287,11 @@ namespace ts {
                     }, interval);
                 }
 
-                function addFile(filePath: Path, callback: FileWatcherCallback): WatchedFile {
+                function addFile(fileName: string, callback: FileWatcherCallback): WatchedFile {
                     const file: WatchedFile = {
-                        filePath,
+                        fileName,
                         callback,
-                        mtime: getModifiedTime(filePath)
+                        mtime: getModifiedTime(fileName)
                     };
 
                     watchedFiles.push(file);
@@ -308,26 +315,26 @@ namespace ts {
             }
 
             function createWatchedFileSet() {
-                const dirWatchers = createFileMap<DirectoryWatcher>();
+                const dirWatchers: Map<DirectoryWatcher> = {};
                 // One file can have multiple watchers
-                const fileWatcherCallbacks = createFileMap<FileWatcherCallback[]>();
+                const fileWatcherCallbacks: Map<FileWatcherCallback[]> = {};
                 return { addFile, removeFile };
 
-                function reduceDirWatcherRefCountForFile(filePath: Path) {
-                    const dirPath = getDirectoryPath(filePath);
-                    if (dirWatchers.contains(dirPath)) {
-                        const watcher = dirWatchers.get(dirPath);
+                function reduceDirWatcherRefCountForFile(fileName: string) {
+                    const dirName = getDirectoryPath(fileName);
+                    if (hasProperty(dirWatchers, dirName)) {
+                        const watcher = dirWatchers[dirName];
                         watcher.referenceCount -= 1;
                         if (watcher.referenceCount <= 0) {
                             watcher.close();
-                            dirWatchers.remove(dirPath);
+                            delete dirWatchers[dirName];
                         }
                     }
                 }
 
-                function addDirWatcher(dirPath: Path): void {
-                    if (dirWatchers.contains(dirPath)) {
-                        const watcher = dirWatchers.get(dirPath);
+                function addDirWatcher(dirPath: string): void {
+                    if (hasProperty(dirWatchers, dirPath)) {
+                        const watcher = dirWatchers[dirPath];
                         watcher.referenceCount += 1;
                         return;
                     }
@@ -338,51 +345,52 @@ namespace ts {
                         (eventName: string, relativeFileName: string) => fileEventHandler(eventName, relativeFileName, dirPath)
                     );
                     watcher.referenceCount = 1;
-                    dirWatchers.set(dirPath, watcher);
+                    dirWatchers[dirPath] = watcher;
                     return;
                 }
 
-                function addFileWatcherCallback(filePath: Path, callback: FileWatcherCallback): void {
-                    if (fileWatcherCallbacks.contains(filePath)) {
-                        fileWatcherCallbacks.get(filePath).push(callback);
+                function addFileWatcherCallback(filePath: string, callback: FileWatcherCallback): void {
+                    if (hasProperty(fileWatcherCallbacks, filePath)) {
+                        fileWatcherCallbacks[filePath].push(callback);
                     }
                     else {
-                        fileWatcherCallbacks.set(filePath, [callback]);
+                        fileWatcherCallbacks[filePath] = [callback];
                     }
                 }
 
-                function addFile(filePath: Path, callback: FileWatcherCallback): WatchedFile {
-                    addFileWatcherCallback(filePath, callback);
-                    addDirWatcher(getDirectoryPath(filePath));
+                function addFile(fileName: string, callback: FileWatcherCallback): WatchedFile {
+                    addFileWatcherCallback(fileName, callback);
+                    addDirWatcher(getDirectoryPath(fileName));
 
-                    return { filePath, callback };
+                    return { fileName, callback };
                 }
 
                 function removeFile(watchedFile: WatchedFile) {
-                    removeFileWatcherCallback(watchedFile.filePath, watchedFile.callback);
-                    reduceDirWatcherRefCountForFile(watchedFile.filePath);
+                    removeFileWatcherCallback(watchedFile.fileName, watchedFile.callback);
+                    reduceDirWatcherRefCountForFile(watchedFile.fileName);
                 }
 
-                function removeFileWatcherCallback(filePath: Path, callback: FileWatcherCallback) {
-                    if (fileWatcherCallbacks.contains(filePath)) {
-                        const newCallbacks = copyListRemovingItem(callback, fileWatcherCallbacks.get(filePath));
+                function removeFileWatcherCallback(filePath: string, callback: FileWatcherCallback) {
+                    if (hasProperty(fileWatcherCallbacks, filePath)) {
+                        const newCallbacks = copyListRemovingItem(callback, fileWatcherCallbacks[filePath]);
                         if (newCallbacks.length === 0) {
-                            fileWatcherCallbacks.remove(filePath);
+                            delete fileWatcherCallbacks[filePath];
                         }
                         else {
-                            fileWatcherCallbacks.set(filePath, newCallbacks);
+                            fileWatcherCallbacks[filePath] = newCallbacks;
                         }
                     }
                 }
 
-                function fileEventHandler(eventName: string, relativeFileName: string, baseDirPath: Path) {
+                function fileEventHandler(eventName: string, relativeFileName: string, baseDirPath: string) {
                     // When files are deleted from disk, the triggered "rename" event would have a relativefileName of "undefined"
-                    const filePath = typeof relativeFileName !== "string"
+                    const fileName = typeof relativeFileName !== "string"
                         ? undefined
-                        : toPath(relativeFileName, baseDirPath, createGetCanonicalFileName(sys.useCaseSensitiveFileNames));
-                    if (eventName === "change" && fileWatcherCallbacks.contains(filePath)) {
-                        for (const fileCallback of fileWatcherCallbacks.get(filePath)) {
-                            fileCallback(filePath);
+                        : ts.getNormalizedAbsolutePath(relativeFileName, baseDirPath);
+                    // Some applications save a working file via rename operations
+                    if ((eventName === "change" || eventName === "rename") && hasProperty(fileWatcherCallbacks, fileName)) {
+                        for (const fileCallback of fileWatcherCallbacks[fileName]) {
+                            fileCallback(fileName);
                         }
                     }
                 }
@@ -413,7 +421,7 @@ namespace ts {
             const useCaseSensitiveFileNames = platform !== "win32" && platform !== "win64" && platform !== "darwin";
 
             function readFile(fileName: string, encoding?: string): string {
-                if (!_fs.existsSync(fileName)) {
+                if (!fileExists(fileName)) {
                     return undefined;
                 }
                 const buffer = _fs.readFileSync(fileName);
@@ -464,6 +472,32 @@ namespace ts {
                 return useCaseSensitiveFileNames ? path : path.toLowerCase();
             }
 
+            const enum FileSystemEntryKind {
+                File,
+                Directory
+            }
+
+            function fileSystemEntryExists(path: string, entryKind: FileSystemEntryKind): boolean {
+                try {
+                    const stat = _fs.statSync(path);
+                    switch (entryKind) {
+                        case FileSystemEntryKind.File: return stat.isFile();
+                        case FileSystemEntryKind.Directory: return stat.isDirectory();
+                    }
+                }
+                catch (e) {
+                    return false;
+                }
+            }
+
+            function fileExists(path: string): boolean {
+                return fileSystemEntryExists(path, FileSystemEntryKind.File);
+            }
+
+            function directoryExists(path: string): boolean {
+                return fileSystemEntryExists(path, FileSystemEntryKind.Directory);
+            }
+
             function readDirectory(path: string, extension?: string, exclude?: string[]): string[] {
                 const result: string[] = [];
                 exclude = map(exclude, s => getCanonicalPath(combinePaths(path, s)));
@@ -473,6 +507,11 @@ namespace ts {
                     const files = _fs.readdirSync(path || ".").sort();
                     const directories: string[] = [];
                     for (const current of files) {
+                        // This is necessary because on some file system node fails to exclude 
+                        // "." and "..". See https://github.com/nodejs/node/issues/4002
+                        if (current === "." || current === "..") {
+                            continue;
+                        }
                         const name = combinePaths(path, current);
                         if (!contains(exclude, getCanonicalPath(name))) {
                             const stat = _fs.statSync(name);
@@ -496,24 +535,23 @@ namespace ts {
                 args: process.argv.slice(2),
                 newLine: _os.EOL,
                 useCaseSensitiveFileNames: useCaseSensitiveFileNames,
-                developmentMode: /^development$/i.test(String(process.env.NODE_ENV)),
                 write(s: string): void {
                     process.stdout.write(s);
                 },
                 readFile,
                 writeFile,
-                watchFile: (filePath, callback) => {
-                    // Node 4.0 stablized the `fs.watch` function on Windows which avoids polling
+                watchFile: (fileName, callback) => {
+                    // Node 4.0 stabilized the `fs.watch` function on Windows which avoids polling
                     // and is more efficient than `fs.watchFile` (ref: https://github.com/nodejs/node/pull/2649
                     // and https://github.com/Microsoft/TypeScript/issues/4643), therefore
                     // if the current node.js version is newer than 4, use `fs.watch` instead.
                     const watchSet = isNode4OrLater() ? watchedFileSet : pollingWatchedFileSet;
-                    const watchedFile =  watchSet.addFile(filePath, callback);
+                    const watchedFile =  watchSet.addFile(fileName, callback);
                     return {
                         close: () => watchSet.removeFile(watchedFile)
                     };
                 },
-                watchDirectory: (path, callback, recursive) => {
+                watchDirectory: (directoryName, callback, recursive) => {
                     // Node 4.0 `fs.watch` function supports the "recursive" option on both OSX and Windows
                     // (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
                     let options: any;
@@ -525,7 +563,7 @@ namespace ts {
                     }
 
                     return _fs.watch(
-                        path,
+                        directoryName,
                         options,
                         (eventName: string, relativeFileName: string) => {
                             // In watchDirectory we only care about adding and removing files (when event name is
@@ -533,7 +571,7 @@ namespace ts {
                             // event name is "change")
                             if (eventName === "rename") {
                                 // When deleting a file, the passed baseFileName is null
-                                callback(!relativeFileName ? relativeFileName : normalizePath(combinePaths(path, relativeFileName)));
+                                callback(!relativeFileName ? relativeFileName : normalizePath(combinePaths(directoryName, relativeFileName)));
                             };
                         }
                     );
@@ -541,12 +579,8 @@ namespace ts {
                 resolvePath: function (path: string): string {
                     return _path.resolve(path);
                 },
-                fileExists(path: string): boolean {
-                    return _fs.existsSync(path);
-                },
-                directoryExists(path: string) {
-                    return _fs.existsSync(path) && _fs.statSync(path).isDirectory();
-                },
+                fileExists,
+                directoryExists,
                 createDirectory(directoryName: string) {
                     if (!this.directoryExists(directoryName)) {
                         _fs.mkdirSync(directoryName);
@@ -558,7 +592,23 @@ namespace ts {
                 getCurrentDirectory() {
                     return process.cwd();
                 },
+                getEnvironmentVariable(name: string) {
+                    return process.env[name] || "";
+                },
                 readDirectory,
+                getModifiedTime(path) {
+                    try {
+                        return _fs.statSync(path).mtime;
+                    }
+                    catch (e) {
+                        return undefined;
+                    }
+                },
+                createHash(data) {
+                    const hash = _crypto.createHash("md5");
+                    hash.update(data);
+                    return hash.digest("hex");
+                },
                 getMemoryUsage() {
                     if (global.gc) {
                         global.gc();
@@ -604,12 +654,16 @@ namespace ts {
                 createDirectory: ChakraHost.createDirectory,
                 getExecutingFilePath: () => ChakraHost.executingFile,
                 getCurrentDirectory: () => ChakraHost.currentDirectory,
+                getEnvironmentVariable: ChakraHost.getEnvironmentVariable || ((name: string) => ""),
                 readDirectory: ChakraHost.readDirectory,
                 exit: ChakraHost.quit,
             };
         }
 
-        if (typeof WScript !== "undefined" && typeof ActiveXObject === "function") {
+        if (typeof ChakraHost !== "undefined") {
+            return getChakraSystem();
+        }
+        else if (typeof WScript !== "undefined" && typeof ActiveXObject === "function") {
             return getWScriptSystem();
         }
         else if (typeof process !== "undefined" && process.nextTick && !process.browser && typeof require !== "undefined") {
@@ -617,9 +671,6 @@ namespace ts {
             // process.browser check excludes webpack and browserify
             return getNodeSystem();
         }
-        else if (typeof ChakraHost !== "undefined") {
-            return getChakraSystem();
-        }
         else {
             return undefined; // Unsupported host
         }
diff --git a/src/compiler/transformer.ts b/src/compiler/transformer.ts
index 39844beb6ab..a02d838801a 100644
--- a/src/compiler/transformer.ts
+++ b/src/compiler/transformer.ts
@@ -20,7 +20,7 @@ namespace ts {
     };
 
     const enum SyntaxKindFeatureFlags {
-        ExpressionSubstitution = 1 << 0,
+        Substitution = 1 << 0,
         EmitNotifications = 1 << 1,
     }
 
@@ -56,7 +56,7 @@ namespace ts {
      * @param transforms An array of Transformers.
      */
     export function transformFiles(resolver: EmitResolver, host: EmitHost, sourceFiles: SourceFile[], transformers: Transformer[]) {
-        const nodeEmitFlags: NodeEmitFlags[] = [];
+        const nodeEmitOptions: NodeEmitOptions[] = [];
         const lexicalEnvironmentVariableDeclarationsStack: VariableDeclaration[][] = [];
         const lexicalEnvironmentFunctionDeclarationsStack: FunctionDeclaration[][] = [];
         const enabledSyntaxKindFeatures = new Array<SyntaxKindFeatureFlags>(SyntaxKind.Count);
@@ -64,25 +64,32 @@ namespace ts {
         let hoistedVariableDeclarations: VariableDeclaration[];
         let hoistedFunctionDeclarations: FunctionDeclaration[];
         let currentSourceFile: SourceFile;
+        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,
-            identifierSubstitution: node => node,
-            expressionSubstitution: node => node,
-            enableExpressionSubstitution,
-            isExpressionSubstitutionEnabled,
-            onEmitNode: (node, emit) => emit(node),
+            onSubstituteNode,
+            enableSubstitution,
+            isSubstitutionEnabled,
+            onEmitNode,
             enableEmitNotification,
-            isEmitNotificationEnabled,
+            isEmitNotificationEnabled
         };
 
         // Chain together and initialize each transformer.
@@ -105,31 +112,94 @@ namespace ts {
             return transformation(sourceFile);
         }
 
-        function enableExpressionSubstitution(kind: SyntaxKind) {
-            enabledSyntaxKindFeatures[kind] |= SyntaxKindFeatureFlags.ExpressionSubstitution;
+        /**
+         * Enables expression substitutions in the pretty printer for the provided SyntaxKind.
+         */
+        function enableSubstitution(kind: SyntaxKind) {
+            enabledSyntaxKindFeatures[kind] |= SyntaxKindFeatureFlags.Substitution;
         }
 
-        function isExpressionSubstitutionEnabled(node: Node) {
-            return (enabledSyntaxKindFeatures[node.kind] & SyntaxKindFeatureFlags.ExpressionSubstitution) !== 0;
+        /**
+         * 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) {
+            // Ensure that lexical environment modifications are disabled during the print phase.
+            if (!lexicalEnvironmentDisabled) {
+                const savedLexicalEnvironmentDisabled = lexicalEnvironmentDisabled;
+                lexicalEnvironmentDisabled = true;
+                emit(node);
+                lexicalEnvironmentDisabled = savedLexicalEnvironmentDisabled;
+                return;
+            }
+
+            emit(node);
+        }
+
+        function getEmitOptions(node: Node, create?: boolean) {
+            let options = isSourceTreeNode(node)
+                ? nodeEmitOptions[getNodeId(node)]
+                : node.emitOptions;
+            if (!options && create) {
+                options = { };
+                if (isSourceTreeNode(node)) {
+                    nodeEmitOptions[getNodeId(node)] = options;
+                }
+                else {
+                    node.emitOptions = options;
+                }
+            }
+            return options;
+        }
+
         /**
          * Gets flags that control emit behavior of a node.
          */
         function getNodeEmitFlags(node: Node) {
             while (node) {
-                const nodeId = getNodeId(node);
-                if (nodeEmitFlags[nodeId] !== undefined) {
-                    return nodeEmitFlags[nodeId];
+                const options = getEmitOptions(node, /*create*/ false);
+                if (options && options.flags !== undefined) {
+                    if (options.flags & NodeEmitFlags.Merge) {
+                        options.flags = (options.flags | getNodeEmitFlags(node.original)) & ~NodeEmitFlags.Merge;
+                    }
+
+                    return options.flags;
                 }
 
                 node = node.original;
@@ -142,7 +212,103 @@ namespace ts {
          * Sets flags that control emit behavior of a node.
          */
         function setNodeEmitFlags<T extends Node>(node: T, flags: NodeEmitFlags) {
-            nodeEmitFlags[getNodeId(node)] = flags;
+            const options = getEmitOptions(node, /*create*/ true);
+            if (flags & NodeEmitFlags.Merge) {
+                flags = options.flags | (flags & ~NodeEmitFlags.Merge);
+            }
+
+            options.flags = flags;
+            return node;
+        }
+
+        /**
+         * Gets a custom text range to use when emitting source maps.
+         */
+        function getSourceMapRange(node: Node) {
+            let current = node;
+            while (current) {
+                const options = getEmitOptions(current);
+                if (options && options.sourceMapRange !== undefined) {
+                    return options.sourceMapRange;
+                }
+
+                current = current.original;
+            }
+
+            return node;
+        }
+
+        /**
+         * Sets a custom text range to use when emitting source maps.
+         */
+        function setSourceMapRange<T extends Node>(node: T, range: TextRange) {
+            getEmitOptions(node, /*create*/ true).sourceMapRange = range;
+            return node;
+        }
+
+        function getTokenSourceMapRanges(node: Node) {
+            let current = node;
+            while (current) {
+                const options = getEmitOptions(current);
+                if (options && options.tokenSourceMapRange) {
+                    return options.tokenSourceMapRange;
+                }
+
+                current = current.original;
+            }
+
+            return undefined;
+        }
+
+        /**
+         * Gets the TextRange to use for source maps for a token of a node.
+         */
+        function getTokenSourceMapRange(node: Node, token: SyntaxKind) {
+            const ranges = getTokenSourceMapRanges(node);
+            if (ranges) {
+                return ranges[token];
+            }
+
+            return undefined;
+        }
+
+        /**
+         * Sets the TextRange to use for source maps for a token of a node.
+         */
+        function setTokenSourceMapRange<T extends Node>(node: T, token: SyntaxKind, range: TextRange) {
+            const options = getEmitOptions(node, /*create*/ true);
+            if (!options.tokenSourceMapRange) {
+                const existingRanges = getTokenSourceMapRanges(node);
+                const ranges = existingRanges ? clone(existingRanges) : { };
+                options.tokenSourceMapRange = ranges;
+            }
+
+            options.tokenSourceMapRange[token] = range;
+            return node;
+        }
+
+        /**
+         * Gets a custom text range to use when emitting comments.
+         */
+        function getCommentRange(node: Node) {
+            let current = node;
+            while (current) {
+                const options = getEmitOptions(current, /*create*/ false);
+                if (options && options.commentRange !== undefined) {
+                    return options.commentRange;
+                }
+
+                current = current.original;
+            }
+
+            return node;
+        }
+
+        /**
+         * Sets a custom text range to use when emitting comments.
+         */
+        function setCommentRange<T extends Node>(node: T, range: TextRange) {
+            getEmitOptions(node, /*create*/ true).commentRange = range;
             return node;
         }
 
@@ -150,6 +316,7 @@ namespace ts {
          * 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];
@@ -163,6 +330,7 @@ namespace ts {
          * 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];
             }
@@ -176,6 +344,8 @@ namespace ts {
          * 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
@@ -192,6 +362,8 @@ namespace ts {
          * 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) {
diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts
index 442201a1f7d..9060b460f9c 100644
--- a/src/compiler/transformers/destructuring.ts
+++ b/src/compiler/transformers/destructuring.ts
@@ -13,13 +13,20 @@ namespace ts {
      * @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) => Node) {
+        visitor?: (node: Node) => VisitResult<Node>): Expression {
 
         if (isEmptyObjectLiteralOrArrayLiteral(node.left)) {
-            return node.right;
+            const right = node.right;
+            if (isDestructuringAssignment(right)) {
+                return flattenDestructuringAssignment(context, right, needsValue, recordTempVariable, visitor);
+            }
+            else {
+                return node.right;
+            }
         }
 
         let location: TextRange = node;
@@ -32,7 +39,7 @@ namespace ts {
             //
             // The source map location for the assignment should point to the entire binary
             // expression.
-            value = ensureIdentifier(node.right, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment);
+            value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, location, emitTempVariableAssignment, visitor);
         }
         else if (nodeIsSynthesized(node)) {
             // Generally, the source map location for a destructuring assignment is the root
@@ -41,10 +48,10 @@ namespace ts {
             // 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 = node.right;
+            location = value;
         }
 
-        flattenDestructuring(node, value, location, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(context, node, value, location, emitAssignment, emitTempVariableAssignment, visitor);
 
         if (needsValue) {
             expressions.push(value);
@@ -56,17 +63,17 @@ namespace ts {
 
         function emitAssignment(name: Identifier, value: Expression, location: TextRange) {
             const expression = createAssignment(name, value, location);
-            if (isSimpleExpression(value)) {
-                expression.disableSourceMap = true;
-            }
+
+            // 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(name);
+            const name = createTempVariable(recordTempVariable);
             emitAssignment(name, value, location);
             return name;
         }
@@ -79,25 +86,30 @@ namespace ts {
      * @param value The rhs value for the binding pattern.
      * @param visitor An optional visitor to use to visit expressions.
      */
-    export function flattenParameterDestructuring(node: ParameterDeclaration, value: Expression, visitor?: (node: Node) => Node) {
+    export function flattenParameterDestructuring(
+        context: TransformationContext,
+        node: ParameterDeclaration,
+        value: Expression,
+        visitor?: (node: Node) => VisitResult<Node>) {
         const declarations: VariableDeclaration[] = [];
 
-        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(context, node, value, node, emitAssignment, emitTempVariableAssignment, visitor);
 
         return declarations;
 
         function emitAssignment(name: Identifier, value: Expression, location: TextRange) {
             const declaration = createVariableDeclaration(name, value, location);
-            if (isSimpleExpression(value)) {
-                declaration.disableSourceMap = true;
-            }
+
+            // 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();
+            const name = createTempVariable(/*recordTempVariable*/ undefined);
             emitAssignment(name, value, location);
             return name;
         }
@@ -110,30 +122,31 @@ namespace ts {
      * @param value An optional rhs value for the binding pattern.
      * @param visitor An optional visitor to use to visit expressions.
      */
-    export function flattenVariableDestructuring(node: VariableDeclaration, value?: Expression, visitor?: (node: Node) => Node) {
+    export function flattenVariableDestructuring(
+        context: TransformationContext,
+        node: VariableDeclaration,
+        value?: Expression,
+        visitor?: (node: Node) => VisitResult<Node>) {
         const declarations: VariableDeclaration[] = [];
 
-        flattenDestructuring(node, value, node, emitAssignment, emitTempVariableAssignment, visitor);
+        flattenDestructuring(context, node, value, node, emitAssignment, emitTempVariableAssignment, visitor);
 
         return declarations;
 
         function emitAssignment(name: Identifier, value: Expression, location: TextRange, original: Node) {
             const declaration = createVariableDeclaration(name, value, location);
-            if (declarations.length === 0) {
-                declaration.pos = -1;
-            }
-
-            if (isSimpleExpression(value)) {
-                declaration.disableSourceMap = true;
-            }
-
             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();
+            const name = createTempVariable(/*recordTempVariable*/ undefined);
             emitAssignment(name, value, location, /*original*/ undefined);
             return name;
         }
@@ -148,14 +161,15 @@ namespace ts {
      * @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) => Node) {
+        visitor?: (node: Node) => VisitResult<Node>) {
 
         const pendingAssignments: Expression[] = [];
 
-        flattenDestructuring(node, /*value*/ undefined, node, emitAssignment, emitTempVariableAssignment);
+        flattenDestructuring(context, node, /*value*/ undefined, node, emitAssignment, emitTempVariableAssignment, visitor);
 
         const expression = inlineExpressions(pendingAssignments);
         aggregateTransformFlags(expression);
@@ -167,31 +181,32 @@ namespace ts {
         }
 
         function emitTempVariableAssignment(value: Expression, location: TextRange) {
-            const name = createTempVariable();
-            recordTempVariable(name);
+            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);
-            if (isSimpleExpression(value)) {
-                expression.disableSourceMap = true;
-            }
-
             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) => Node) {
+        visitor?: (node: Node) => VisitResult<Node>) {
         if (value && visitor) {
             value = visitNode(value, visitor, isExpression);
         }
@@ -236,7 +251,7 @@ namespace ts {
                 emitArrayLiteralAssignment(<ArrayLiteralExpression>target, value, location);
             }
             else {
-                const name = cloneNode(<Identifier>target, /*location*/ target, /*flags*/ undefined, /*parent*/ undefined, /*original*/ target);
+                const name = getSynthesizedClone(<Identifier>target, { sourceMapRange: target, commentRange: target });
                 emitAssignment(name, value, location, /*original*/ undefined);
             }
         }
@@ -326,8 +341,7 @@ namespace ts {
                 }
             }
             else {
-                const clonedName = cloneNode(name, /*location*/ undefined, /*flags*/ undefined, /*parent*/ undefined, /*original*/ name);
-                emitAssignment(clonedName, value, target, target);
+                emitAssignment(name, value, target, target);
             }
         }
 
@@ -354,19 +368,20 @@ namespace ts {
                     ensureIdentifier(propertyName.expression, /*reuseIdentifierExpressions*/ false, /*location*/ propertyName, emitTempVariableAssignment)
                 );
             }
-            else if (isIdentifier(propertyName)) {
-                return createPropertyAccess(
-                    expression,
-                    propertyName.text
-                );
+            else if (isLiteralExpression(propertyName)) {
+                const clone = getSynthesizedClone(propertyName);
+                clone.text = unescapeIdentifier(clone.text);
+                return createElementAccess(expression, clone);
             }
             else {
-                // We create a synthetic copy of the identifier in order to avoid the rewriting that might
-                // otherwise occur when the identifier is emitted.
-                return createElementAccess(
-                    expression,
-                    cloneNode(propertyName)
-                );
+                if (isGeneratedIdentifier(propertyName)) {
+                    const clone = getSynthesizedClone(propertyName);
+                    clone.text = unescapeIdentifier(clone.text);
+                    return createPropertyAccess(expression, clone);
+                }
+                else {
+                    return createPropertyAccess(expression, createIdentifier(unescapeIdentifier(propertyName.text)));
+                }
             }
         }
     }
@@ -381,17 +396,24 @@ namespace ts {
      *                                   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) {
+        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);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/compiler/transformers/es6.ts b/src/compiler/transformers/es6.ts
index a1e370e2394..ae16e87cccf 100644
--- a/src/compiler/transformers/es6.ts
+++ b/src/compiler/transformers/es6.ts
@@ -10,30 +10,167 @@ namespace ts {
         /** 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 previousIdentifierSubstitution = context.identifierSubstitution;
-        const previousExpressionSubstitution = context.expressionSubstitution;
+        const previousOnSubstituteNode = context.onSubstituteNode;
         const previousOnEmitNode = context.onEmitNode;
         context.onEmitNode = onEmitNode;
-        context.identifierSubstitution = substituteIdentifier;
-        context.expressionSubstitution = substituteExpression;
+        context.onSubstituteNode = onSubstituteNode;
 
         let currentSourceFile: SourceFile;
+        let currentText: string;
         let currentParent: Node;
         let currentNode: Node;
         let enclosingBlockScopeContainer: Node;
         let enclosingBlockScopeContainerParent: Node;
         let containingNonArrowFunction: FunctionLikeDeclaration;
 
+        /**
+         * 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
@@ -50,29 +187,53 @@ namespace ts {
 
         function transformSourceFile(node: SourceFile) {
             currentSourceFile = node;
-            return visitEachChild(node, visitor, context);
+            currentText = node.text;
+            return visitNode(node, visitor, isSourceFile);
         }
 
-        function visitor(node: Node): Node {
+        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;
 
-            onBeforeVisitNode(node);
-            node = visitorWorker(node);
+            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 node;
+            return visited;
         }
 
-        function visitorWorker(node: Node): Node {
-            if (node.transformFlags & TransformFlags.ES6) {
+        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) {
@@ -83,8 +244,57 @@ namespace ts {
             }
         }
 
-        function visitJavaScript(node: Node): 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);
 
@@ -104,7 +314,10 @@ namespace ts {
                     return visitFunctionExpression(<FunctionExpression>node);
 
                 case SyntaxKind.VariableDeclaration:
-                    return visitVariableDeclaration(<VariableDeclaration>node);
+                    return visitVariableDeclaration(<VariableDeclaration>node, /*offset*/ undefined);
+
+                case SyntaxKind.Identifier:
+                    return visitIdentifier(<Identifier>node);
 
                 case SyntaxKind.VariableDeclarationList:
                     return visitVariableDeclarationList(<VariableDeclarationList>node);
@@ -169,14 +382,24 @@ namespace ts {
                 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);
             }
 
-            Debug.fail(`Unexpected node kind: ${formatSyntaxKind(node.kind)}.`);
         }
 
         function onBeforeVisitNode(node: Node) {
@@ -203,10 +426,120 @@ namespace ts {
             }
         }
 
+        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.
          *
-         * @parma node A ClassDeclaration node.
+         * @param node A ClassDeclaration node.
          */
         function visitClassDeclaration(node: ClassDeclaration): Statement {
             // [source]
@@ -219,18 +552,20 @@ namespace ts {
             //          return C;
             //      }());
 
-            return startOnNewLine(
-                createVariableStatement(
-                    /*modifiers*/ undefined,
-                    createVariableDeclarationList([
-                        createVariableDeclaration(
-                            getDeclarationName(node),
-                            transformClassLikeDeclarationToExpression(node)
-                        )
-                    ]),
-                    node
-                )
+            const statement = createVariableStatement(
+                /*modifiers*/ undefined,
+                createVariableDeclarationList([
+                    createVariableDeclaration(
+                        getDeclarationName(node, /*allowComments*/ true),
+                        transformClassLikeDeclarationToExpression(node)
+                    )
+                ]),
+                /*location*/ node
             );
+
+            setOriginalNode(statement, node);
+            startOnNewLine(statement);
+            return statement;
         }
 
         /**
@@ -281,17 +616,40 @@ namespace ts {
             //          return C;
             //      }(D))
 
-            const baseTypeNode = getClassExtendsHeritageClauseElement(node);
+            if (node.name) {
+                enableSubstitutionsForBlockScopedBindings();
+            }
+
+            const extendsClauseElement = getClassExtendsHeritageClauseElement(node);
+            const classFunction = createFunctionExpression(
+                /*asteriskToken*/ undefined,
+                /*name*/ undefined,
+                extendsClauseElement ? [createParameter("_super")] : [],
+                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(
-                    createFunctionExpression(
-                        /*asteriskToken*/ undefined,
-                        /*name*/ undefined,
-                        baseTypeNode ? [createParameter("_super")] : [],
-                        transformClassBody(node, baseTypeNode !== undefined)
-                    ),
-                    baseTypeNode
-                        ? [visitNode(baseTypeNode.expression, visitor, isExpression)]
+                    outer,
+                    extendsClauseElement
+                        ? [visitNode(extendsClauseElement.expression, visitor, isExpression)]
                         : []
                 )
             );
@@ -301,17 +659,35 @@ namespace ts {
          * Transforms a ClassExpression or ClassDeclaration into a function body.
          *
          * @param node A ClassExpression or ClassDeclaration node.
-         * @param hasExtendsClause A value indicating whether the class has an `extends` clause.
+         * @param extendsClauseElement The expression for the class `extends` clause.
          */
-        function transformClassBody(node: ClassExpression | ClassDeclaration, hasExtendsClause: boolean): Block {
+        function transformClassBody(node: ClassExpression | ClassDeclaration, extendsClauseElement: ExpressionWithTypeArguments): Block {
             const statements: Statement[] = [];
             startLexicalEnvironment();
-            addExtendsHelperIfNeeded(statements, node, hasExtendsClause);
-            addConstructor(statements, node, hasExtendsClause);
+            addExtendsHelperIfNeeded(statements, node, extendsClauseElement);
+            addConstructor(statements, node, extendsClauseElement);
             addClassMembers(statements, node);
-            statements.push(createReturn(getDeclarationName(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());
-            return createBlock(statements, /*location*/ undefined, /*multiLine*/ true);
+
+            const block = createBlock(createNodeArray(statements, /*location*/ node.members), /*location*/ undefined, /*multiLine*/ true);
+            setNodeEmitFlags(block, NodeEmitFlags.NoComments);
+            return block;
         }
 
         /**
@@ -319,13 +695,14 @@ namespace ts {
          *
          * @param statements The statements of the class body function.
          * @param node The ClassExpression or ClassDeclaration node.
-         * @param hasExtendsClause A value indicating whether the class has an `extends` clause.
+         * @param extendsClauseElement The expression for the class `extends` clause.
          */
-        function addExtendsHelperIfNeeded(statements: Statement[], node: ClassExpression | ClassDeclaration, hasExtendsClause: boolean): void {
-            if (hasExtendsClause) {
+        function addExtendsHelperIfNeeded(statements: Statement[], node: ClassExpression | ClassDeclaration, extendsClauseElement: ExpressionWithTypeArguments): void {
+            if (extendsClauseElement) {
                 statements.push(
                     createStatement(
-                        createExtendsHelper(getDeclarationName(node))
+                        createExtendsHelper(getDeclarationName(node)),
+                        /*location*/ extendsClauseElement
                     )
                 );
             }
@@ -336,19 +713,19 @@ namespace ts {
          *
          * @param statements The statements of the class body function.
          * @param node The ClassExpression or ClassDeclaration node.
-         * @param hasExtendsClause A value indicating whether the class has an `extends` clause.
+         * @param extendsClauseElement The expression for the class `extends` clause.
          */
-        function addConstructor(statements: Statement[], node: ClassExpression | ClassDeclaration, hasExtendsClause: boolean): void {
+        function addConstructor(statements: Statement[], node: ClassExpression | ClassDeclaration, extendsClauseElement: ExpressionWithTypeArguments): void {
             const constructor = getFirstConstructorWithBody(node);
-            const hasSynthesizedSuper = hasSynthesizedDefaultSuperCall(constructor, hasExtendsClause);
+            const hasSynthesizedSuper = hasSynthesizedDefaultSuperCall(constructor, extendsClauseElement !== undefined);
             statements.push(
                 createFunctionDeclaration(
                     /*modifiers*/ undefined,
                     /*asteriskToken*/ undefined,
                     getDeclarationName(node),
                     transformConstructorParameters(constructor, hasSynthesizedSuper),
-                    transformConstructorBody(constructor, hasExtendsClause, hasSynthesizedSuper),
-                    /*location*/ constructor
+                    transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper),
+                    /*location*/ constructor || node
                 )
             );
         }
@@ -377,11 +754,12 @@ namespace ts {
          * Transforms the body of a constructor declaration of a class.
          *
          * @param constructor The constructor for the class.
-         * @param hasExtendsClause A value indicating whether the class has an `extends` clause.
+         * @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, hasExtendsClause: boolean, hasSynthesizedSuper: boolean) {
+        function transformConstructorBody(constructor: ConstructorDeclaration, node: ClassDeclaration | ClassExpression, extendsClauseElement: ExpressionWithTypeArguments, hasSynthesizedSuper: boolean) {
             const statements: Statement[] = [];
             startLexicalEnvironment();
             if (constructor) {
@@ -390,14 +768,36 @@ namespace ts {
                 addRestParameterIfNeeded(statements, constructor, hasSynthesizedSuper);
             }
 
-            addDefaultSuperCallIfNeeded(statements, constructor, hasExtendsClause, hasSynthesizedSuper);
+            addDefaultSuperCallIfNeeded(statements, constructor, extendsClauseElement, hasSynthesizedSuper);
 
             if (constructor) {
-                addRange(statements, visitNodes(constructor.body.statements, visitor, isStatement, hasSynthesizedSuper ? 1 : 0));
+                const body = saveStateAndInvoke(constructor, hasSynthesizedSuper ? transformConstructorBodyWithSynthesizedSuper : transformConstructorBodyWithoutSynthesizedSuper);
+                addRange(statements, body);
             }
 
             addRange(statements, endLexicalEnvironment());
-            return createBlock(statements, /*location*/ constructor && constructor.body, /*multiLine*/ true);
+            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);
         }
 
         /**
@@ -405,24 +805,25 @@ namespace ts {
          *
          * @param statements The statements for the new constructor body.
          * @param constructor The constructor for the class.
-         * @param hasExtendsClause A value indicating whether the class has an `extends` clause.
+         * @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, hasExtendsClause: boolean, hasSynthesizedSuper: boolean) {
+        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 : hasExtendsClause) {
+            if (constructor ? hasSynthesizedSuper : extendsClauseElement) {
                 statements.push(
                     createStatement(
                         createFunctionApply(
                             createIdentifier("_super"),
                             createThis(),
                             createIdentifier("arguments")
-                        )
+                        ),
+                        /*location*/ extendsClauseElement
                     )
                 );
             }
@@ -434,27 +835,33 @@ namespace ts {
          * @param node A ParameterDeclaration node.
          */
         function visitParameter(node: ParameterDeclaration): ParameterDeclaration {
-            if (isBindingPattern(node.name)) {
+            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 createParameter(
-                    getGeneratedNameForNode(node),
-                    /*initializer*/ undefined,
-                    /*location*/ node
+                return setOriginalNode(
+                    createParameter(
+                        getGeneratedNameForNode(node),
+                        /*initializer*/ undefined,
+                        /*location*/ node
+                    ),
+                    /*original*/ node
                 );
             }
             else if (node.initializer) {
                 // Initializers are elided
-                return createParameter(
-                    node.name,
-                    /*initializer*/ undefined,
-                    /*location*/ node
+                return setOriginalNode(
+                    createParameter(
+                        node.name,
+                        /*initializer*/ undefined,
+                        /*location*/ node
+                    ),
+                    /*original*/ node
                 );
             }
-            else if (node.dotDotDotToken) {
-                // rest parameters are elided
-                return undefined;
-            }
             else {
                 return node;
             }
@@ -519,7 +926,7 @@ namespace ts {
                     createVariableStatement(
                         /*modifiers*/ undefined,
                         createVariableDeclarationList(
-                            flattenParameterDestructuring(parameter, temp, visitor)
+                            flattenParameterDestructuring(context, parameter, temp, visitor)
                         )
                     )
                 );
@@ -545,25 +952,30 @@ namespace ts {
          * @param initializer The initializer for the parameter.
          */
         function addDefaultValueAssignmentForInitializer(statements: Statement[], parameter: ParameterDeclaration, name: Identifier, initializer: Expression): void {
-            statements.push(
-                createIf(
-                    createStrictEquality(
-                        getSynthesizedClone(name),
-                        createVoidZero()
-                    ),
-                    setNodeEmitFlags(
-                        createBlock([
-                            createStatement(
-                                createAssignment(
-                                    getSynthesizedClone(name),
-                                    visitNode(initializer, visitor, isExpression)
-                                )
+            const statement = createIf(
+                createStrictEquality(
+                    getSynthesizedClone(name),
+                    createVoidZero()
+                ),
+                setNodeEmitFlags(
+                    createBlock([
+                        createStatement(
+                            createAssignment(
+                                setNodeEmitFlags(getMutableClone(name), NodeEmitFlags.NoSourceMap),
+                                setNodeEmitFlags(visitNode(initializer, visitor, isExpression), NodeEmitFlags.NoSourceMap | NodeEmitFlags.Merge),
+                                /*location*/ parameter
                             )
-                        ]),
-                        NodeEmitFlags.SingleLine
-                    )
-                )
+                        )
+                    ], /*location*/ parameter),
+                    NodeEmitFlags.SingleLine | NodeEmitFlags.NoTrailingSourceMap | NodeEmitFlags.NoTokenSourceMaps
+                ),
+                /*elseStatement*/ undefined,
+                /*location*/ parameter,
+                { startOnNewLine: true }
             );
+
+            setNodeEmitFlags(statement, NodeEmitFlags.NoTokenSourceMaps | NodeEmitFlags.NoTrailingSourceMap);
+            statements.push(statement);
         }
 
         /**
@@ -575,7 +987,7 @@ namespace ts {
          *                                          synthesized call to `super`
          */
         function shouldAddRestParameter(node: ParameterDeclaration, inConstructorWithSynthesizedSuper: boolean) {
-            return node && node.dotDotDotToken && !inConstructorWithSynthesizedSuper;
+            return node && node.dotDotDotToken && node.name.kind === SyntaxKind.Identifier && !inConstructorWithSynthesizedSuper;
         }
 
         /**
@@ -593,7 +1005,12 @@ namespace ts {
                 return;
             }
 
-            const name = getSynthesizedClone(<Identifier>parameter.name);
+            // `declarationName` is the name of the local declaration for the parameter.
+            const declarationName = getUniqueClone(<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();
 
@@ -603,41 +1020,46 @@ namespace ts {
                     /*modifiers*/ undefined,
                     createVariableDeclarationList([
                         createVariableDeclaration(
-                            name,
+                            declarationName,
                             createArrayLiteral([])
                         )
-                    ])
+                    ]),
+                    /*location*/ parameter
                 )
             );
 
             // for (var _i = restIndex; _i < arguments.length; _i++) {
             //   param[_i - restIndex] = arguments[_i];
             // }
-            statements.push(
-                createFor(
-                    createVariableDeclarationList([
-                        createVariableDeclaration(temp, createLiteral(restIndex))
-                    ]),
-                    createLessThan(
-                        temp,
-                        createPropertyAccess(createIdentifier("arguments"), "length")
-                    ),
-                    createPostfixIncrement(temp),
-                    createBlock([
-                        startOnNewLine(
-                            createStatement(
-                                createAssignment(
-                                    createElementAccess(
-                                        name,
-                                        createSubtract(temp, createLiteral(restIndex))
-                                    ),
-                                    createElementAccess(createIdentifier("arguments"), temp)
-                                )
-                            )
+            const forStatement = createFor(
+                createVariableDeclarationList([
+                    createVariableDeclaration(temp, 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.SourceMapAdjustRestParameterLoop);
+            startOnNewLine(forStatement);
+            statements.push(forStatement);
         }
 
         /**
@@ -649,17 +1071,19 @@ namespace ts {
         function addCaptureThisForNodeIfNeeded(statements: Statement[], node: Node): void {
             if (node.transformFlags & TransformFlags.ContainsCapturedLexicalThis && node.kind !== SyntaxKind.ArrowFunction) {
                 enableSubstitutionsForCapturedThis();
-                statements.push(
-                    createVariableStatement(
-                        /*modifiers*/ undefined,
-                        createVariableDeclarationList([
-                            createVariableDeclaration(
-                                "_this",
-                                createThis()
-                            )
-                        ])
-                    )
+                const captureThisStatement = createVariableStatement(
+                    /*modifiers*/ undefined,
+                    createVariableDeclarationList([
+                        createVariableDeclaration(
+                            "_this",
+                            createThis()
+                        )
+                    ])
                 );
+
+                setNodeEmitFlags(captureThisStatement, NodeEmitFlags.NoComments);
+                setSourceMapRange(captureThisStatement, node);
+                statements.push(captureThisStatement);
             }
         }
 
@@ -695,7 +1119,7 @@ namespace ts {
                         break;
 
                     default:
-                        Debug.fail(`Unexpected node kind: ${formatSyntaxKind(node.kind)}.`);
+                        Debug.failBadSyntaxKind(node);
                         break;
                 }
             }
@@ -717,16 +1141,33 @@ namespace ts {
          * @param member The MethodDeclaration node.
          */
         function transformClassMethodDeclarationToStatement(receiver: LeftHandSideExpression, member: MethodDeclaration) {
-            return createStatement(
+            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)
+                        visitNode(member.name, visitor, isPropertyName),
+                        /*location*/ member.name
                     ),
-                    transformFunctionLikeToExpression(member, /*location*/ undefined, /*name*/ undefined)
+                    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;
         }
 
         /**
@@ -736,9 +1177,16 @@ namespace ts {
          * @param accessors The set of related get/set accessors.
          */
         function transformAccessorsToStatement(receiver: LeftHandSideExpression, accessors: AllAccessorDeclarations): Statement {
-            return createStatement(
-                transformAccessorsToExpression(receiver, accessors)
+            const statement = createStatement(
+                transformAccessorsToExpression(receiver, accessors),
+                /*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;
         }
 
         /**
@@ -748,20 +1196,45 @@ namespace ts {
          * @param receiver The receiver for the member.
          */
         function transformAccessorsToExpression(receiver: LeftHandSideExpression, { firstAccessor, getAccessor, setAccessor }: AllAccessorDeclarations): Expression {
-            return createObjectDefineProperty(
-                receiver,
-                createExpressionForPropertyName(
-                    visitNode(firstAccessor.name, visitor, isPropertyName),
-                    /*location*/ firstAccessor.name
-                ),
-                {
-                    get: getAccessor && transformFunctionLikeToExpression(getAccessor, /*location*/ getAccessor, /*name*/ undefined),
-                    set: setAccessor && transformFunctionLikeToExpression(setAccessor, /*location*/ setAccessor, /*name*/ undefined),
-                    enumerable: true,
-                    configurable: true
-                },
-                /*preferNewLine*/ true,
-                /*location*/ firstAccessor
+            // 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))
+            );
+
+            return createCall(
+                createPropertyAccess(createIdentifier("Object"), "defineProperty"),
+                [
+                    target,
+                    propertyName,
+                    createObjectLiteral(properties, /*location*/ undefined, /*multiLine*/ true)
+                ]
             );
         }
 
@@ -775,7 +1248,14 @@ namespace ts {
                 enableSubstitutionsForCapturedThis();
             }
 
-            return transformFunctionLikeToExpression(node, /*location*/ node, /*name*/ undefined);
+            const savedUseCapturedThis = useCapturedThis;
+            useCapturedThis = true;
+
+            const func = transformFunctionLikeToExpression(node, /*location*/ node, /*name*/ undefined);
+
+            useCapturedThis = savedUseCapturedThis;
+            setNodeEmitFlags(func, NodeEmitFlags.CapturesThis);
+            return func;
         }
 
         /**
@@ -818,10 +1298,10 @@ namespace ts {
             }
 
             const expression = createFunctionExpression(
-                /*asteriskToken*/ undefined,
+                node.asteriskToken,
                 name,
                 visitNodes(node.parameters, visitor, isParameter),
-                transformFunctionBody(node),
+                saveStateAndInvoke(node, transformFunctionBody),
                 location,
                 /*original*/ node
             );
@@ -836,25 +1316,88 @@ namespace ts {
          * @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);
+            }
+
             addCaptureThisForNodeIfNeeded(statements, node);
             addDefaultValueAssignmentsIfNeeded(statements, node);
             addRestParameterIfNeeded(statements, node, /*inConstructorWithSynthesizedSuper*/ false);
 
-            const body = node.body;
-            if (isBlock(body)) {
-                addRange(statements, visitNodes(body.statements, visitor, isStatement));
-            }
-            else {
-                const expression = visitNode(body, visitor, isExpression);
-                if (expression) {
-                    statements.push(createReturn(expression, /*location*/ body));
-                }
+            // If we added any generated statements, this must be a multi-line block.
+            if (!multiLine && statements.length > 0) {
+                multiLine = true;
             }
 
-            addRange(statements, endLexicalEnvironment());
-            return createBlock(statements, node.body);
+            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;
         }
 
         /**
@@ -919,7 +1462,36 @@ namespace ts {
         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(node, needsDestructuringValue, hoistVariableDeclaration, visitor);
+            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);
         }
 
         /**
@@ -928,17 +1500,28 @@ namespace ts {
          * @param node A VariableDeclarationList node.
          */
         function visitVariableDeclarationList(node: VariableDeclarationList): VariableDeclarationList {
-            // If we are here it is because the list is defined as `let` or `const`.
-            Debug.assert((node.flags & NodeFlags.BlockScoped) !== 0);
+            if (node.flags & NodeFlags.BlockScoped) {
+                enableSubstitutionsForBlockScopedBindings();
+            }
 
-            enableSubstitutionsForBlockScopedBindings();
-            return setOriginalNode(
-                createVariableDeclarationList(
-                    flattenNodes(map(node.declarations, visitVariableDeclarationInLetDeclarationList)),
-                    /*location*/ node
-                ),
-                node
-            );
+            const declarations = flatten(map(node.declarations, node.flags & NodeFlags.Let
+                ? visitVariableDeclarationInLetDeclarationList
+                : visitVariableDeclaration));
+
+            const declarationList = createVariableDeclarationList(declarations, /*location*/ node);
+            setOriginalNode(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(node, createRange(firstDeclaration.pos, lastDeclaration.end));
+            }
+
+            return declarationList;
         }
 
         /**
@@ -988,10 +1571,7 @@ namespace ts {
             //   * Why loop initializer is excluded?
             //     - Since we've introduced a fresh name it already will be undefined.
 
-            const original = getOriginalNode(node);
-            Debug.assert(isVariableDeclaration(original));
-
-            const flags = resolver.getNodeCheckFlags(original);
+            const flags = resolver.getNodeCheckFlags(node);
             const isCapturedInFunction = flags & NodeCheckFlags.CapturedBlockScopedBinding;
             const isDeclaredInLoop = flags & NodeCheckFlags.BlockScopedBindingInLoop;
             const emittedAsTopLevel =
@@ -1005,7 +1585,7 @@ namespace ts {
                 !emittedAsTopLevel
                 && enclosingBlockScopeContainer.kind !== SyntaxKind.ForInStatement
                 && enclosingBlockScopeContainer.kind !== SyntaxKind.ForOfStatement
-                && (!resolver.isDeclarationWithCollidingName(<Declaration>original)
+                && (!resolver.isDeclarationWithCollidingName(node)
                     || (isDeclaredInLoop
                         && !isCapturedInFunction
                         && !isIterationStatement(enclosingBlockScopeContainer, /*lookInLabeledStatements*/ false)));
@@ -1018,13 +1598,13 @@ namespace ts {
          *
          * @param node A VariableDeclaration node.
          */
-        function visitVariableDeclarationInLetDeclarationList(node: VariableDeclaration) {
+        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);
+                return visitVariableDeclaration(node, offset);
             }
 
             if (!node.initializer && shouldEmitExplicitInitializerForLetDeclaration(node)) {
@@ -1041,38 +1621,52 @@ namespace ts {
          *
          * @param node A VariableDeclaration node.
          */
-        function visitVariableDeclaration(node: VariableDeclaration): OneOrMany<VariableDeclaration> {
+        function visitVariableDeclaration(node: VariableDeclaration, offset: number): VisitResult<VariableDeclaration> {
             // If we are here it is because the name contains a binding pattern.
-            Debug.assert(isBindingPattern(node.name));
+            if (isBindingPattern(node.name)) {
+                return flattenVariableDestructuring(context, node, /*value*/ undefined, visitor);
+            }
 
-            return createNodeArrayNode(
-                flattenVariableDestructuring(node, /*value*/ undefined, visitor)
-            );
+            return visitEachChild(node, visitor, context);
         }
 
-        function visitLabeledStatement(node: LabeledStatement) {
-            // TODO: Convert loop body for block scoped bindings.
-            return visitEachChild(node, visitor, context);
+        function visitLabeledStatement(node: LabeledStatement): VisitResult<Statement> {
+            if (convertedLoopState) {
+                if (!convertedLoopState.labels) {
+                    convertedLoopState.labels = {};
+                }
+                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) {
-            // TODO: Convert loop body for block scoped bindings.
-            return visitEachChild(node, visitor, context);
+            return convertIterationStatementBodyIfNecessary(node);
         }
 
         function visitWhileStatement(node: WhileStatement) {
-            // TODO: Convert loop body for block scoped bindings.
-            return visitEachChild(node, visitor, context);
+            return convertIterationStatementBodyIfNecessary(node);
         }
 
         function visitForStatement(node: ForStatement) {
-            // TODO: Convert loop body for block scoped bindings.
-            return visitEachChild(node, visitor, context);
+            return convertIterationStatementBodyIfNecessary(node);
         }
 
         function visitForInStatement(node: ForInStatement) {
-            // TODO: Convert loop body for block scoped bindings.
-            return visitEachChild(node, visitor, context);
+            return convertIterationStatementBodyIfNecessary(node);
         }
 
         // // TODO(rbuckton): Switch to using __values helper for for..of?
@@ -1193,9 +1787,11 @@ namespace ts {
          *
          * @param node A ForOfStatement.
          */
-        function visitForOfStatement(node: ForOfStatement): Statement {
-            // TODO: Convert loop body for block scoped bindings.
+        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) { }
@@ -1217,7 +1813,7 @@ namespace ts {
             // Note also that because an extra statement is needed to assign to the LHS,
             // for-of bodies are always emitted as blocks.
 
-            const expression = visitNode(node.expression, visitor, isExpression);
+            const expression = node.expression;
             const initializer = node.initializer;
             const statements: Statement[] = [];
 
@@ -1229,26 +1825,39 @@ namespace ts {
             const counter = createLoopVariable();
             const rhsReference = expression.kind === SyntaxKind.Identifier
                 ? createUniqueName((<Identifier>expression).text)
-                : createTempVariable();
+                : createTempVariable(/*recordTempVariable*/ undefined);
 
             // Initialize LHS
             // var v = _a[_i];
             if (isVariableDeclarationList(initializer)) {
-                const firstDeclaration = firstOrUndefined(initializer.declarations);
-                if (firstDeclaration && isBindingPattern(firstDeclaration.name)) {
+                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,
-                            createVariableDeclarationList(
-                                flattenVariableDestructuring(
-                                    firstDeclaration,
-                                    createElementAccess(rhsReference, counter),
-                                    visitor
-                                )
-                            ),
-                            /*location*/ initializer
+                            declarationList
                         )
                     );
                 }
@@ -1260,11 +1869,11 @@ namespace ts {
                             /*modifiers*/ undefined,
                             createVariableDeclarationList([
                                 createVariableDeclaration(
-                                    firstDeclaration ? firstDeclaration.name : createTempVariable(),
+                                    firstOriginalDeclaration ? firstOriginalDeclaration.name : createTempVariable(/*recordTempVariable*/ undefined),
                                     createElementAccess(rhsReference, counter)
                                 )
-                            ]),
-                            /*location*/ initializer
+                            ], /*location*/ moveRangePos(initializer, -1)),
+                            /*location*/ moveRangeEnd(initializer, -1)
                         )
                     );
                 }
@@ -1278,6 +1887,7 @@ namespace ts {
                     statements.push(
                         createStatement(
                             flattenDestructuringAssignment(
+                                context,
                                 assignment,
                                 /*needsValue*/ false,
                                 hoistVariableDeclaration,
@@ -1287,37 +1897,58 @@ namespace ts {
                     );
                 }
                 else {
-                    statements.push(createStatement(assignment, /*location*/ node.initializer));
+                    assignment.end = initializer.end;
+                    statements.push(createStatement(assignment, /*location*/ moveRangeEnd(initializer, -1)));
                 }
             }
 
-            const statement = visitNode(node.statement, visitor, isStatement);
-            if (isBlock(statement)) {
-                addRange(statements, statement.statements);
+            let bodyLocation: TextRange;
+            let statementsLocation: TextRange;
+            if (convertedLoopBodyStatements) {
+                addRange(statements, convertedLoopBodyStatements);
             }
             else {
-                statements.push(statement);
+                const statement = visitNode(node.statement, visitor, isStatement);
+                if (isBlock(statement)) {
+                    addRange(statements, statement.statements);
+                    bodyLocation = statement;
+                    statementsLocation = statement.statements;
+                }
+                else {
+                    statements.push(statement);
+                }
             }
 
-            return createFor(
-                createVariableDeclarationList(
-                    [
-                        createVariableDeclaration(counter, createLiteral(0), /*location*/ node.expression),
-                        createVariableDeclaration(rhsReference, expression, /*location*/ node.expression)
-                    ],
-                    /*location*/ node.expression
-                ),
+            // 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, createLiteral(0), /*location*/ moveRangePos(node.expression, -1)),
+                    createVariableDeclaration(rhsReference, expression, /*location*/ node.expression)
+                ], /*location*/ node.expression),
                 createLessThan(
                     counter,
                     createPropertyAccess(rhsReference, "length"),
-                    /*location*/ initializer
-                ),
-                createPostfixIncrement(counter, /*location*/ initializer),
-                createBlock(
-                    statements
+                    /*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;
         }
 
         /**
@@ -1346,18 +1977,20 @@ namespace ts {
 
             // 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(temp);
+            const temp = createTempVariable(hoistVariableDeclaration);
 
             // Write out the first non-computed properties, then emit the rest through indexing on the temp variable.
             const expressions: Expression[] = [];
             addNode(expressions,
                 createAssignment(
                     temp,
-                    createObjectLiteral(
-                        visitNodes(properties, visitor, isObjectLiteralElement, 0, numInitialProperties),
-                        /*location*/ undefined,
-                        node.multiLine
+                    setNodeEmitFlags(
+                        createObjectLiteral(
+                            visitNodes(properties, visitor, isObjectLiteralElement, 0, numInitialProperties),
+                            /*location*/ undefined,
+                            node.multiLine
+                        ),
+                        NodeEmitFlags.Indented
                     )
                 ),
                 node.multiLine
@@ -1371,6 +2004,377 @@ namespace ts {
             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,
+                                setNodeEmitFlags(
+                                    createFunctionExpression(
+                                        /*asteriskToken*/ undefined,
+                                        /*name*/ undefined,
+                                        loopParameters,
+                                        <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,
+                            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,
+                            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, 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, 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 = {};
+                }
+                state.labeledNonLocalBreaks[labelText] = labelMarker;
+            }
+            else {
+                if (!state.labeledNonLocalContinues) {
+                    state.labeledNonLocalContinues = {};
+                }
+                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.
          *
@@ -1408,7 +2412,7 @@ namespace ts {
                         break;
 
                     default:
-                        Debug.fail(`Unexpected node kind: ${formatSyntaxKind(node.kind)}.`);
+                        Debug.failBadSyntaxKind(node);
                         break;
                 }
             }
@@ -1479,9 +2483,11 @@ namespace ts {
             // 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,
-                transformFunctionLikeToExpression(node, /*location*/ node, /*name*/ undefined),
+                functionExpression,
                 /*location*/ node
             );
         }
@@ -1516,7 +2522,7 @@ namespace ts {
          */
         function visitArrayLiteralExpression(node: ArrayLiteralExpression): Expression {
             // We are here because we contain a SpreadElementExpression.
-            return transformAndSpreadElements(node.elements, /*needsUniqueCopy*/ true, node.multiLine);
+            return transformAndSpreadElements(node.elements, /*needsUniqueCopy*/ true, node.multiLine, /*hasTrailingComma*/ node.elements.hasTrailingComma);
         }
 
         /**
@@ -1528,7 +2534,7 @@ namespace ts {
             // We are here either because SuperKeyword was used somewhere in the expression, or
             // because we contain a SpreadElementExpression.
 
-            const { target, thisArg } = createCallBinding(node.expression);
+            const { target, thisArg } = createCallBinding(node.expression, hoistVariableDeclaration);
             if (node.transformFlags & TransformFlags.ContainsSpreadElementExpression) {
                 // [source]
                 //      f(...a, b)
@@ -1547,7 +2553,7 @@ namespace ts {
                 return createFunctionApply(
                     visitNode(target, visitor, isExpression),
                     visitNode(thisArg, visitor, isExpression),
-                    transformAndSpreadElements(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false)
+                    transformAndSpreadElements(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*hasTrailingComma*/ false)
                 );
             }
             else {
@@ -1585,12 +2591,12 @@ namespace ts {
             // [output]
             //      new ((_a = C).bind.apply(_a, [void 0].concat(a)))()
 
-            const { target, thisArg } = createCallBinding(createPropertyAccess(node.expression, "bind"));
+            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)
+                    transformAndSpreadElements(createNodeArray([createVoidZero(), ...node.arguments]), /*needsUniqueCopy*/ false, /*multiLine*/ false, /*hasTrailingComma*/ false)
                 ),
                 []
             );
@@ -1603,7 +2609,7 @@ namespace ts {
          * @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): Expression {
+        function transformAndSpreadElements(elements: NodeArray<Expression>, needsUniqueCopy: boolean, multiLine: boolean, hasTrailingComma: boolean): Expression {
             // [source]
             //      [a, ...b, c]
             //
@@ -1612,13 +2618,16 @@ namespace ts {
 
             // 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, isSpreadElementExpression, (chunk: Expression[], isSpread: boolean) => isSpread
-                    ? map(chunk, visitExpressionOfSpreadElement)
-                    : createArrayLiteral(visitNodes(createNodeArray(chunk), visitor, isExpression), /*location*/ undefined, multiLine)));
+                spanMap(elements, partitionSpreadElement, (partition, visitPartition, start, end) =>
+                    visitPartition(partition, multiLine, hasTrailingComma && end === numElements)
+                )
+            );
 
             if (segments.length === 1) {
-                return needsUniqueCopy && isSpreadElementExpression(elements[0])
+                const firstElement = elements[0];
+                return needsUniqueCopy && isSpreadElementExpression(firstElement) && firstElement.expression.kind !== SyntaxKind.ArrayLiteralExpression
                     ? createArraySlice(segments[0])
                     : segments[0];
             }
@@ -1627,6 +2636,24 @@ namespace ts {
             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.
          *
@@ -1642,7 +2669,7 @@ namespace ts {
          * @param node A template literal.
          */
         function visitTemplateLiteral(node: LiteralExpression): LeftHandSideExpression {
-            return createLiteral(node.text);
+            return createLiteral(node.text, /*location*/ node);
         }
 
         /**
@@ -1655,8 +2682,7 @@ namespace ts {
             const tag = visitNode(node.tag, visitor, isExpression);
 
             // Allocate storage for the template site object
-            const temp = createTempVariable();
-            hoistVariableDeclaration(temp);
+            const temp = createTempVariable(hoistVariableDeclaration);
 
             // Build up the template arguments and the raw and cooked strings for the template.
             const templateArguments: Expression[] = [temp];
@@ -1677,11 +2703,16 @@ namespace ts {
                 }
             }
 
-            return inlineExpressions([
-                createAssignment(temp, createArrayLiteral(cookedStrings)),
-                createAssignment(createPropertyAccess(temp, "raw"), createArrayLiteral(rawStrings)),
-                createCall(tag, templateArguments)
-            ]);
+            // 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, templateArguments)
+                ])
+            );
         }
 
         /**
@@ -1706,8 +2737,7 @@ namespace ts {
             // 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);
-            return createLiteral(text);
+            return createLiteral(text, /*location*/ node);
         }
 
         /**
@@ -1804,7 +2834,8 @@ namespace ts {
         function visitSuperKeyword(node: PrimaryExpression): LeftHandSideExpression {
             return containingNonArrowFunction
                 && isClassElement(containingNonArrowFunction)
-                && (containingNonArrowFunction.flags & NodeFlags.Static) === 0
+                && !hasModifier(containingNonArrowFunction, ModifierFlags.Static)
+                && currentParent.kind !== SyntaxKind.CallExpression
                     ? createPropertyAccess(createIdentifier("_super"), "prototype")
                     : createIdentifier("_super");
         }
@@ -1817,7 +2848,7 @@ namespace ts {
             addCaptureThisForNodeIfNeeded(statements, node);
             addRange(statements, visitNodes(createNodeArray(remaining), visitor, isStatement));
             addRange(statements, endLexicalEnvironment());
-            const clone = cloneNode(node, node, node.flags, /*parent*/ undefined, node);
+            const clone = getMutableClone(node);
             clone.statements = createNodeArray(statements, /*location*/ node.statements);
             return clone;
         }
@@ -1833,7 +2864,7 @@ namespace ts {
             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 = node.kind === SyntaxKind.ArrowFunction;
+                useCapturedThis = (getNodeEmitFlags(node) & NodeEmitFlags.CapturesThis) !== 0;
             }
 
             previousOnEmitNode(node, emit);
@@ -1848,7 +2879,7 @@ namespace ts {
         function enableSubstitutionsForBlockScopedBindings() {
             if ((enabledSubstitutions & ES6SubstitutionFlags.BlockScopedBindings) === 0) {
                 enabledSubstitutions |= ES6SubstitutionFlags.BlockScopedBindings;
-                context.enableExpressionSubstitution(SyntaxKind.Identifier);
+                context.enableSubstitution(SyntaxKind.Identifier);
             }
         }
 
@@ -1859,7 +2890,7 @@ namespace ts {
         function enableSubstitutionsForCapturedThis() {
             if ((enabledSubstitutions & ES6SubstitutionFlags.CapturedThis) === 0) {
                 enabledSubstitutions |= ES6SubstitutionFlags.CapturedThis;
-                context.enableExpressionSubstitution(SyntaxKind.ThisKeyword);
+                context.enableSubstitution(SyntaxKind.ThisKeyword);
                 context.enableEmitNotification(SyntaxKind.Constructor);
                 context.enableEmitNotification(SyntaxKind.MethodDeclaration);
                 context.enableEmitNotification(SyntaxKind.GetAccessor);
@@ -1870,17 +2901,36 @@ namespace ts {
             }
         }
 
+        /**
+         * 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) {
-            node = previousIdentifierSubstitution(node);
-
             // Only substitute the identifier if we have enabled substitutions for block-scoped
             // bindings.
             if (enabledSubstitutions & ES6SubstitutionFlags.BlockScopedBindings) {
-                const original = getOriginalNode(node);
-                if (isIdentifier(original) && !nodeIsSynthesized(original) && original.parent && isNameOfDeclarationWithCollidingName(original)) {
+                const original = getSourceTreeNodeOfType(node, isIdentifier);
+                if (original && isNameOfDeclarationWithCollidingName(original)) {
                     return getGeneratedNameForNode(original);
                 }
             }
@@ -1913,8 +2963,7 @@ namespace ts {
          *
          * @param node An Expression node.
          */
-        function substituteExpression(node: Expression): Expression {
-            node = previousExpressionSubstitution(node);
+        function substituteExpression(node: Node) {
             switch (node.kind) {
                 case SyntaxKind.Identifier:
                     return substituteExpressionIdentifier(<Identifier>node);
@@ -1933,12 +2982,9 @@ namespace ts {
          */
         function substituteExpressionIdentifier(node: Identifier): Identifier {
             if (enabledSubstitutions & ES6SubstitutionFlags.BlockScopedBindings) {
-                const original = getOriginalNode(node);
-                if (isIdentifier(original)) {
-                    const declaration = resolver.getReferencedDeclarationWithCollidingName(original);
-                    if (declaration) {
-                        return getGeneratedNameForNode(declaration.name);
-                    }
+                const declaration = resolver.getReferencedDeclarationWithCollidingName(node);
+                if (declaration) {
+                    return getGeneratedNameForNode(declaration.name);
                 }
             }
 
@@ -1958,13 +3004,62 @@ namespace ts {
             return node;
         }
 
-        function getDeclarationName(node: ClassExpression | ClassDeclaration | FunctionDeclaration) {
-            return node.name ? getSynthesizedClone(node.name) : 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 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 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 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 getExportName(node: ClassDeclaration | ClassExpression | FunctionDeclaration, allowComments?: boolean, allowSourceMaps?: boolean) {
+            return getDeclarationName(node, allowComments, allowSourceMaps, NodeEmitFlags.ExportName);
+        }
+
+        /**
+         * 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 = getUniqueClone(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 = getDeclarationName(node);
-            return member.flags & NodeFlags.Static ? expression : createPropertyAccess(expression, "prototype");
+            const expression = getLocalName(node);
+            return hasModifier(member, ModifierFlags.Static) ? expression : createPropertyAccess(expression, "prototype");
         }
 
         function hasSynthesizedDefaultSuperCall(constructor: ConstructorDeclaration, hasExtendsClause: boolean) {
diff --git a/src/compiler/transformers/es7.ts b/src/compiler/transformers/es7.ts
index 7be97566c51..5d848bc608b 100644
--- a/src/compiler/transformers/es7.ts
+++ b/src/compiler/transformers/es7.ts
@@ -12,7 +12,7 @@ namespace ts {
             return visitEachChild(node, visitor, context);
         }
 
-        function visitor(node: Node): Node {
+        function visitor(node: Node): VisitResult<Node> {
             if (node.transformFlags & TransformFlags.ES7) {
                 return visitorWorker(node);
             }
@@ -24,13 +24,15 @@ namespace ts {
             }
         }
 
-        function visitorWorker(node: Node) {
+        function visitorWorker(node: Node): VisitResult<Node> {
             switch (node.kind) {
                 case SyntaxKind.BinaryExpression:
                     return visitBinaryExpression(<BinaryExpression>node);
-            }
 
-            Debug.fail(`Unexpected node kind: ${formatSyntaxKind(node.kind)}.`);
+                default:
+                    Debug.failBadSyntaxKind(node);
+                    return visitEachChild(node, visitor, context);
+            }
         }
 
         function visitBinaryExpression(node: BinaryExpression): Expression {
@@ -42,11 +44,9 @@ namespace ts {
                 let value: Expression;
                 if (isElementAccessExpression(left)) {
                     // Transforms `a[x] **= b` into `(_a = a)[_x = x] = Math.pow(_a[_x], b)`
-                    const expressionTemp = createTempVariable();
-                    hoistVariableDeclaration(expressionTemp);
+                    const expressionTemp = createTempVariable(hoistVariableDeclaration);
 
-                    const argumentExpressionTemp = createTempVariable();
-                    hoistVariableDeclaration(argumentExpressionTemp);
+                    const argumentExpressionTemp = createTempVariable(hoistVariableDeclaration);
 
                     target = createElementAccess(
                         createAssignment(expressionTemp, left.expression, /*location*/ left.expression),
@@ -62,8 +62,7 @@ namespace ts {
                 }
                 else if (isPropertyAccessExpression(left)) {
                     // Transforms `a.x **= b` into `(_a = a).x = Math.pow(_a.x, b)`
-                    const expressionTemp = createTempVariable();
-                    hoistVariableDeclaration(expressionTemp);
+                    const expressionTemp = createTempVariable(hoistVariableDeclaration);
 
                     target = createPropertyAccess(
                         createAssignment(expressionTemp, left.expression, /*location*/ left.expression),
@@ -90,7 +89,8 @@ namespace ts {
                 return createMathPow(left, right, /*location*/ node);
             }
             else {
-                Debug.fail(`Unexpected operator kind: ${formatSyntaxKind(node.operatorToken.kind)}.`);
+                Debug.failBadSyntaxKind(node);
+                return visitEachChild(node, visitor, context);
             }
         }
     }
diff --git a/src/compiler/transformers/jsx.ts b/src/compiler/transformers/jsx.ts
index 4dbfabb2f72..6a90fd0ecaf 100644
--- a/src/compiler/transformers/jsx.ts
+++ b/src/compiler/transformers/jsx.ts
@@ -18,7 +18,7 @@ namespace ts {
             return visitEachChild(node, visitor, context);
         }
 
-        function visitor(node: Node): Node {
+        function visitor(node: Node): VisitResult<Node> {
             if (node.transformFlags & TransformFlags.Jsx) {
                 return visitorWorker(node);
             }
@@ -30,16 +30,21 @@ namespace ts {
             }
         }
 
-        function visitorWorker(node: Node): Node {
+        function visitorWorker(node: Node): VisitResult<Node> {
             switch (node.kind) {
                 case SyntaxKind.JsxElement:
-                    return visitJsxElement(<JsxElement>node);
+                    return visitJsxElement(<JsxElement>node, /*isChild*/ false);
 
                 case SyntaxKind.JsxSelfClosingElement:
-                    return visitJsxSelfClosingElement(<JsxSelfClosingElement>node);
-            }
+                    return visitJsxSelfClosingElement(<JsxSelfClosingElement>node, /*isChild*/ false);
 
-            Debug.fail(`Unexpected node kind: ${formatSyntaxKind(node.kind)}.`);
+                case SyntaxKind.JsxExpression:
+                    return visitJsxExpression(<JsxExpression>node);
+
+                default:
+                    Debug.failBadSyntaxKind(node);
+                    return undefined;
+            }
         }
 
         function transformJsxChildToExpression(node: JsxChild): Expression {
@@ -51,24 +56,26 @@ namespace ts {
                     return visitJsxExpression(<JsxExpression>node);
 
                 case SyntaxKind.JsxElement:
-                    return visitJsxElement(<JsxElement>node);
+                    return visitJsxElement(<JsxElement>node, /*isChild*/ true);
 
                 case SyntaxKind.JsxSelfClosingElement:
-                    return visitJsxSelfClosingElement(<JsxSelfClosingElement>node);
+                    return visitJsxSelfClosingElement(<JsxSelfClosingElement>node, /*isChild*/ true);
+
+                default:
+                    Debug.failBadSyntaxKind(node);
+                    return undefined;
             }
-
-            Debug.fail(`Unexpected node kind: ${formatSyntaxKind(node.kind)}.`);
         }
 
-        function visitJsxElement(node: JsxElement) {
-            return visitJsxOpeningLikeElement(node.openingElement, node.children);
+        function visitJsxElement(node: JsxElement, isChild: boolean) {
+            return visitJsxOpeningLikeElement(node.openingElement, node.children, isChild, /*location*/ node);
         }
 
-        function visitJsxSelfClosingElement(node: JsxSelfClosingElement) {
-            return visitJsxOpeningLikeElement(node, /*children*/ undefined);
+        function visitJsxSelfClosingElement(node: JsxSelfClosingElement, isChild: boolean) {
+            return visitJsxOpeningLikeElement(node, /*children*/ undefined, isChild, /*location*/ node);
         }
 
-        function visitJsxOpeningLikeElement(node: JsxOpeningLikeElement, children: JsxChild[]) {
+        function visitJsxOpeningLikeElement(node: JsxOpeningLikeElement, children: JsxChild[], isChild: boolean, location: TextRange) {
             const tagName = getTagName(node);
             let objectProperties: Expression;
             const attrs = node.attributes;
@@ -93,17 +100,25 @@ namespace ts {
                 }
 
                 // Either emit one big object literal (no spread attribs), or
-                // a call to React.__spread
+                // a call to the __assign helper.
                 objectProperties = singleOrUndefined(segments)
-                    || createJsxSpread(compilerOptions.reactNamespace, segments);
+                    || createAssignHelper(segments);
             }
 
-            return createJsxCreateElement(
+            const element = createReactCreateElement(
                 compilerOptions.reactNamespace,
                 tagName,
                 objectProperties,
-                filter(map(children, transformJsxChildToExpression), isDefined)
+                filter(map(children, transformJsxChildToExpression), isDefined),
+                node,
+                location
             );
+
+            if (isChild) {
+                startOnNewLine(element);
+            }
+
+            return element;
         }
 
         function transformJsxSpreadAttributeToExpression(node: JsxSpreadAttribute) {
@@ -112,12 +127,25 @@ namespace ts {
 
         function transformJsxAttributeToObjectLiteralElement(node: JsxAttribute) {
             const name = getAttributeName(node);
-            const expression = node.initializer
-                ? visitNode(node.initializer, visitor, isExpression)
-                : createLiteral(true);
+            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[];
@@ -214,10 +242,10 @@ namespace ts {
         function getAttributeName(node: JsxAttribute): StringLiteral | Identifier {
             const name = node.name;
             if (/^[A-Za-z_]\w*$/.test(name.text)) {
-                return createLiteral(name.text);
+                return name;
             }
             else {
-                return name;
+                return createLiteral(name.text);
             }
         }
 
diff --git a/src/compiler/transformers/module/es6.ts b/src/compiler/transformers/module/es6.ts
index 63b147b6e60..742f208d61c 100644
--- a/src/compiler/transformers/module/es6.ts
+++ b/src/compiler/transformers/module/es6.ts
@@ -4,10 +4,129 @@
 /*@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(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(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
index a1c737fecfd..cd84a68ea49 100644
--- a/src/compiler/transformers/module/module.ts
+++ b/src/compiler/transformers/module/module.ts
@@ -15,22 +15,25 @@ namespace ts {
             startLexicalEnvironment,
             endLexicalEnvironment,
             hoistVariableDeclaration,
-            setNodeEmitFlags
+            setNodeEmitFlags,
+            getNodeEmitFlags,
         } = context;
 
         const compilerOptions = context.getCompilerOptions();
         const resolver = context.getEmitResolver();
+        const host = context.getEmitHost();
         const languageVersion = getEmitScriptTarget(compilerOptions);
         const moduleKind = getEmitModuleKind(compilerOptions);
-        const previousExpressionSubstitution = context.expressionSubstitution;
-        context.enableExpressionSubstitution(SyntaxKind.Identifier);
-        context.expressionSubstitution = substituteExpression;
+        const previousOnSubstituteNode = context.onSubstituteNode;
+        context.onSubstituteNode = onSubstituteNode;
+        context.enableSubstitution(SyntaxKind.Identifier);
+        context.enableSubstitution(SyntaxKind.ShorthandPropertyAssignment);
 
         let currentSourceFile: SourceFile;
         let externalImports: (ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration)[];
         let exportSpecifiers: Map<ExportSpecifier[]>;
         let exportEquals: ExportAssignment;
-        let hasExportStars: boolean;
+        let hasExportStarsToExportValues: boolean;
 
         return transformSourceFile;
 
@@ -44,16 +47,17 @@ namespace ts {
                 currentSourceFile = node;
 
                 // Collect information about the external module.
-                ({ externalImports, exportSpecifiers, exportEquals, hasExportStars } = collectExternalModuleInfo(node, resolver));
+                ({ externalImports, exportSpecifiers, exportEquals, hasExportStarsToExportValues } = collectExternalModuleInfo(node, resolver));
 
                 // Perform the transformation.
                 const updated = transformModuleDelegates[moduleKind](node);
+                aggregateTransformFlags(updated);
 
                 currentSourceFile = undefined;
                 externalImports = undefined;
                 exportSpecifiers = undefined;
                 exportEquals = undefined;
-                hasExportStars = false;
+                hasExportStarsToExportValues = false;
                 return updated;
             }
 
@@ -67,17 +71,19 @@ namespace ts {
          */
         function transformCommonJSModule(node: SourceFile) {
             startLexicalEnvironment();
-            return setNodeEmitFlags(
-                updateSourceFile(
-                    node,
-                    [
-                        ...visitNodes(node.statements, visitor, isStatement),
-                        ...(endLexicalEnvironment() || []),
-                        tryCreateExportEquals(/*emitAsReturn*/ false)
-                    ]
-                ),
-                hasExportStars ? NodeEmitFlags.EmitExportStar : 0
-            );
+
+            const statements: Statement[] = [];
+            const statementOffset = addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict);
+            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;
         }
 
         /**
@@ -87,7 +93,7 @@ namespace ts {
          */
         function transformAMDModule(node: SourceFile) {
             const define = createIdentifier("define");
-            const moduleName = node.moduleName ? createLiteral(node.moduleName) : undefined;
+            const moduleName = tryGetModuleNameFromFile(node, host, compilerOptions);
             return transformAsynchronousModule(node, define, moduleName, /*includeNonAmdDependencies*/ true);
         }
 
@@ -111,10 +117,28 @@ namespace ts {
          * @param includeNonAmdDependencies A value indicating whether to incldue any non-AMD dependencies.
          */
         function transformAsynchronousModule(node: SourceFile, define: Expression, moduleName: Expression, includeNonAmdDependencies: boolean) {
-            // Start the lexical environment for the module body.
-            startLexicalEnvironment();
+            // 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 { importModuleNames, importAliasNames } = collectAsynchronousDependencies(node, includeNonAmdDependencies);
+            const { aliasedModuleNames, unaliasedModuleNames, importAliasNames } = collectAsynchronousDependencies(node, includeNonAmdDependencies);
 
             // Create an updated SourceFile:
             //
@@ -123,57 +147,105 @@ namespace ts {
                 createStatement(
                     createCall(
                         define,
-                        flattenNodes([
+                        [
                             // Add the module name (if provided).
-                            moduleName,
+                            ...(moduleName ? [moduleName] : []),
 
                             // Add the dependency array argument:
                             //
-                            //     ["module1", "module2", ...]
-                            createArrayLiteral(importModuleNames),
+                            //     ["require", "exports", module1", "module2", ...]
+                            createArrayLiteral([
+                                createLiteral("require"),
+                                createLiteral("exports"),
+                                ...aliasedModuleNames,
+                                ...unaliasedModuleNames
+                            ]),
 
                             // Add the module body function argument:
                             //
-                            //     function (module1, module2) ...
+                            //     function (require, exports, module1, module2) ...
                             createFunctionExpression(
                                 /*asteriskToken*/ undefined,
                                 /*name*/ undefined,
-                                importAliasNames,
-                                setNodeEmitFlags(
-                                    setMultiLine(
-                                        createBlock(
-                                            flattenNodes([
-                                                // Visit each statement of the module body.
-                                                ...visitNodes(node.statements, visitor, isStatement),
-
-                                                // End the lexical environment for the module body
-                                                // and merge any new lexical declarations.
-                                                ...(endLexicalEnvironment() || []),
-
-                                                // Append the 'export =' statement if provided.
-                                                tryCreateExportEquals(/*emitAsReturn*/ true)
-                                            ])
-                                        ),
-                                        /*multiLine*/ true
-                                    ),
-
-                                    // If we have any `export * from ...` declarations
-                                    // we need to inform the emitter to add the __export helper.
-                                    hasExportStars ? NodeEmitFlags.EmitExportStar : 0
-                                )
+                                [
+                                    createParameter("require"),
+                                    createParameter("exports"),
+                                    ...importAliasNames
+                                ],
+                                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);
+
+            // 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) {
+        function visitor(node: Node): VisitResult<Node> {
             switch (node.kind) {
                 case SyntaxKind.ImportDeclaration:
                     return visitImportDeclaration(<ImportDeclaration>node);
@@ -196,6 +268,9 @@ namespace ts {
                 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.
@@ -208,202 +283,210 @@ namespace ts {
          *
          * @param node The ImportDeclaration node.
          */
-        function visitImportDeclaration(node: ImportDeclaration): OneOrMany<Statement> {
-            if (contains(externalImports, node)) {
-                const statements: Statement[] = [];
-                const namespaceDeclaration = getNamespaceDeclarationNode(node);
-                if (moduleKind !== ModuleKind.AMD) {
-                    if (!node.importClause) {
-                        // import "mod";
-                        addNode(statements,
-                            createStatement(
-                                createRequireCall(node),
-                                /*location*/ 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),
+                                createRequireCall(node)
                             )
                         );
                     }
                     else {
-                        const variables: VariableDeclaration[] = [];
-                        if (namespaceDeclaration && !isDefaultImport(node)) {
-                            // import * as n from "mod";
-                            addNode(variables,
-                                createVariableDeclaration(
-                                    getSynthesizedClone(namespaceDeclaration.name),
-                                    createRequireCall(node)
-                                )
-                            );
-                        }
-                        else {
-                            // import d from "mod";
-                            // import { x, y } from "mod";
-                            // import d, { x, y } from "mod";
-                            // import d, * as n from "mod";
-                            addNode(variables,
-                                createVariableDeclaration(
-                                    getGeneratedNameForNode(node),
-                                    createRequireCall(node)
-                                )
-                            );
-
-                            if (namespaceDeclaration && isDefaultImport(node)) {
-                                addNode(variables,
-                                    createVariableDeclaration(
-                                        getSynthesizedClone(namespaceDeclaration.name),
-                                        getGeneratedNameForNode(node)
-                                    )
-                                );
-                            }
-                        }
-
-                        addNode(statements,
-                            createVariableStatement(
-                                /*modifiers*/ undefined,
-                                createVariableDeclarationList(variables),
-                                /*location*/ node
+                        // 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),
+                                createRequireCall(node)
                             )
                         );
+
+                        if (namespaceDeclaration && isDefaultImport(node)) {
+                            variables.push(
+                                createVariableDeclaration(
+                                    getSynthesizedClone(namespaceDeclaration.name),
+                                    getGeneratedNameForNode(node)
+                                )
+                            );
+                        }
                     }
+
+                    statements.push(
+                        createVariableStatement(
+                            /*modifiers*/ undefined,
+                            createConstDeclarationList(variables),
+                            /*location*/ node
+                        )
+                    );
                 }
-                else if (namespaceDeclaration && isDefaultImport(node)) {
-                    // import d, * as n from "mod";
-                    addNode(statements,
+            }
+            else if (namespaceDeclaration && isDefaultImport(node)) {
+                // import d, * as n from "mod";
+                statements.push(
+                    createVariableStatement(
+                        /*modifiers*/ undefined,
+                        createVariableDeclarationList([
+                            createVariableDeclaration(
+                                getSynthesizedClone(namespaceDeclaration.name),
+                                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(namespaceDeclaration.name),
-                                    getGeneratedNameForNode(node),
-                                    /*location*/ node
+                                    getSynthesizedClone(node.name),
+                                    createRequireCall(node)
                                 )
-                            ])
+                            ],
+                            /*location*/ undefined,
+                            /*flags*/ languageVersion >= ScriptTarget.ES6 ? NodeFlags.Const : NodeFlags.None),
+                            /*location*/ node
                         )
                     );
                 }
-
-                addExportImportAssignments(statements, node);
-                return createNodeArrayNode(statements);
             }
-
-            return undefined;
-        }
-
-        function visitImportEqualsDeclaration(node: ImportEqualsDeclaration): OneOrMany<Statement> {
-            if (contains(externalImports, node)) {
-                const statements: Statement[] = [];
-                if (moduleKind !== ModuleKind.AMD) {
-                    if (node.flags & NodeFlags.Export) {
-                        addNode(statements,
-                            createStatement(
-                                createExportAssignment(
-                                    node.name,
-                                    createRequireCall(node)
-                                ),
-                                /*location*/ node
-                            )
-                        );
-                    }
-                    else {
-                        addNode(statements,
-                            createVariableStatement(
-                                /*modifiers*/ undefined,
-                                createVariableDeclarationList([
-                                    createVariableDeclaration(
-                                        getSynthesizedClone(node.name),
-                                        createRequireCall(node),
-                                        /*location*/ node
-                                    )
-                                ])
-                            )
-                        );
-                    }
-                }
-                else {
-                    if (node.flags & NodeFlags.Export) {
-                        addNode(statements,
-                            createStatement(
-                                createExportAssignment(node.name, node.name),
-                                /*location*/ node
-                            )
-                        );
-                    }
-                }
-
-                addExportImportAssignments(statements, node);
-                return createNodeArrayNode(statements);
-            }
-
-            return undefined;
-        }
-
-        function visitExportDeclaration(node: ExportDeclaration): OneOrMany<Statement> {
-            if (contains(externalImports, node)) {
-                const generatedName = getGeneratedNameForNode(node);
-                if (node.exportClause) {
-                    const statements: Statement[] = [];
-                    // export { x, y } from "mod";
-                    if (moduleKind !== ModuleKind.AMD) {
-                        addNode(statements,
-                            createVariableStatement(
-                                /*modifiers*/ undefined,
-                                createVariableDeclarationList([
-                                    createVariableDeclaration(
-                                        generatedName,
-                                        createRequireCall(node),
-                                        /*location*/ node
-                                    )
-                                ])
-                            )
-                        );
-                    }
-                    for (const specifier of node.exportClause.elements) {
-                        if (resolver.isValueAliasDeclaration(specifier)) {
-                            const exportedValue = createPropertyAccess(
-                                generatedName,
-                                specifier.propertyName || specifier.name
-                            );
-                            addNode(statements,
-                                createStatement(
-                                    createExportAssignment(specifier.name, exportedValue),
-                                    /*location*/ specifier
-                                )
-                            );
-                        }
-                    }
-
-                    return createNodeArrayNode(statements);
-                }
-                else {
-                    // export * from "mod";
-                    return createStatement(
-                        createCall(
-                            createIdentifier("__export"),
-                            [
-                                moduleKind !== ModuleKind.AMD
-                                    ? createRequireCall(node)
-                                    : generatedName
-                            ]
-                        ),
-                        /*location*/ node
+            else {
+                if (hasModifier(node, ModifierFlags.Export)) {
+                    statements.push(
+                        createStatement(
+                            createExportAssignment(node.name, node.name),
+                            /*location*/ node
+                        )
                     );
                 }
             }
 
-            return undefined;
+            addExportImportAssignments(statements, node);
+            return statements;
         }
 
-        function visitExportAssignment(node: ExportAssignment): OneOrMany<Statement> {
-            if (!node.isExportEquals && resolver.isValueAliasDeclaration(node)) {
+        function visitExportDeclaration(node: ExportDeclaration): VisitResult<Statement> {
+            if (!contains(externalImports, node)) {
+                return undefined;
+            }
+
+            const generatedName = getGeneratedNameForNode(node);
+            if (node.exportClause) {
                 const statements: Statement[] = [];
-                addExportDefault(statements, node.expression, /*location*/ node);
-                return createNodeArrayNode(statements);
+                // export { x, y } from "mod";
+                if (moduleKind !== ModuleKind.AMD) {
+                    statements.push(
+                        createVariableStatement(
+                            /*modifiers*/ undefined,
+                            createVariableDeclarationList([
+                                createVariableDeclaration(
+                                    generatedName,
+                                    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"),
+                        [
+                            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 {
-            addNode(statements, tryCreateExportDefaultCompat());
-            addNode(statements,
+            tryAddExportDefaultCompat(statements);
+
+            statements.push(
                 createStatement(
                     createExportAssignment(
                         createIdentifier("default"),
@@ -414,35 +497,49 @@ namespace ts {
             );
         }
 
-        function tryCreateExportDefaultCompat(): Statement {
+        function tryAddExportDefaultCompat(statements: Statement[]) {
             const original = getOriginalNode(currentSourceFile);
             Debug.assert(original.kind === SyntaxKind.SourceFile);
 
-            if (!(<SourceFile>original).symbol.exports["___esModule"]) {
+            if (!original.symbol.exports["___esModule"]) {
                 if (languageVersion === ScriptTarget.ES3) {
-                    return createStatement(
-                        createExportAssignment(
-                            createIdentifier("__esModule"),
-                            createLiteral(true)
+                    statements.push(
+                        createStatement(
+                            createExportAssignment(
+                                createIdentifier("__esModule"),
+                                createLiteral(true)
+                            )
                         )
                     );
                 }
                 else {
-                    return createStatement(
-                        createObjectDefineProperty(
-                            createIdentifier("exports"),
-                            createLiteral("_esModule"),
-                            { value: createLiteral(true) }
+                    statements.push(
+                        createStatement(
+                            createCall(
+                                createPropertyAccess(createIdentifier("Object"), "defineProperty"),
+                                [
+                                    createIdentifier("exports"),
+                                    createLiteral("__esModule"),
+                                    createObjectLiteral([
+                                        createPropertyAssignment("value", createLiteral(true))
+                                    ])
+                                ]
+                            )
                         )
                     );
                 }
             }
         }
 
-        function addExportImportAssignments(statements: Statement[], node: Node) {
-            const names = reduceEachChild(node, collectExportMembers, []);
-            for (const name of names) {
-                addExportMemberAssignments(statements, name);
+        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);
+                }
             }
         }
 
@@ -460,34 +557,99 @@ namespace ts {
         function addExportMemberAssignments(statements: Statement[], name: Identifier): void {
             if (!exportEquals && exportSpecifiers && hasProperty(exportSpecifiers, name.text)) {
                 for (const specifier of exportSpecifiers[name.text]) {
-                    addNode(statements,
-                        createStatement(
-                            createExportAssignment(specifier.name, name),
-                            /*location*/ specifier.name
+                    statements.push(
+                        startOnNewLine(
+                            createStatement(
+                                createExportAssignment(specifier.name, name),
+                                /*location*/ specifier.name
+                            )
                         )
                     );
                 }
             }
         }
 
-        function visitVariableStatement(node: VariableStatement): OneOrMany<Statement> {
-            const variables = getInitializedVariables(node.declarationList);
-            if (variables.length === 0) {
-                // elide statement if there are no initialized variables
-                return undefined;
+        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
+                );
             }
 
-            return createStatement(
-                inlineExpressions(
-                    map(variables, transformInitializedVariable)
-                )
-            );
+            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) {
+                    let 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 {
+                addExportMemberAssignments(resultStatements, name);
+            }
         }
 
         function transformInitializedVariable(node: VariableDeclaration): Expression {
             const name = node.name;
             if (isBindingPattern(name)) {
                 return flattenVariableDestructuringToExpression(
+                    context,
                     node,
                     hoistVariableDeclaration,
                     getModuleMemberName,
@@ -502,89 +664,162 @@ namespace ts {
             }
         }
 
-        function visitFunctionDeclaration(node: FunctionDeclaration): OneOrMany<Statement> {
+        function visitFunctionDeclaration(node: FunctionDeclaration): VisitResult<Statement> {
             const statements: Statement[] = [];
-            if (node.name) {
-                if (node.flags & NodeFlags.Export) {
-                    addNode(statements,
+            const name = node.name || getGeneratedNameForNode(node);
+            if (hasModifier(node, ModifierFlags.Export)) {
+                statements.push(
+                    setOriginalNode(
                         createFunctionDeclaration(
                             /*modifiers*/ undefined,
                             /*asteriskToken*/ undefined,
-                            node.name,
+                            name,
                             node.parameters,
                             node.body,
                             /*location*/ node
-                        )
-                    );
+                        ),
+                        /*original*/ node
+                    )
+                );
 
-                    if (node.flags & NodeFlags.Default) {
-                        addExportDefault(statements, getSynthesizedClone(node.name), /*location*/ node);
-                    }
-                }
-                else {
-                    addNode(statements, node);
-                }
-
-                addExportMemberAssignments(statements, node.name);
+                addExportMemberAssignment(statements, node);
             }
             else {
-                Debug.assert((node.flags & NodeFlags.Default) !== 0);
-                addExportDefault(statements,
-                    createFunctionExpression(
-                        /*asteriskToken*/ undefined,
-                        /*name*/ undefined,
-                        node.parameters,
-                        node.body,
-                        /*location*/ node
-                    ),
-                    /*location*/ node
-                );
+                statements.push(node);
             }
-            return createNodeArrayNode(statements);
+
+            if (node.name) {
+                addExportMemberAssignments(statements, node.name);
+            }
+
+            return singleOrMany(statements);
         }
 
-        function visitClassDeclaration(node: ClassDeclaration): OneOrMany<Statement> {
+        function visitClassDeclaration(node: ClassDeclaration): VisitResult<Statement> {
             const statements: Statement[] = [];
-            if (node.name) {
-                if (node.flags & NodeFlags.Export) {
-                    addNode(statements,
+            const name = node.name || getGeneratedNameForNode(node);
+            // Set emitFlags on the name of the classDeclaration
+            // This is so that when printer will not substitute the identifier
+            setNodeEmitFlags(name, NodeEmitFlags.NoSubstitution);
+            if (hasModifier(node, ModifierFlags.Export)) {
+                statements.push(
+                    setOriginalNode(
                         createClassDeclaration(
                             /*modifiers*/ undefined,
-                            node.name,
+                            name,
                             node.heritageClauses,
                             node.members,
                             /*location*/ node
-                        )
-                    );
+                        ),
+                        /*original*/ node
+                    )
+                );
 
-                    if (node.flags & NodeFlags.Default) {
-                        addExportDefault(statements, getSynthesizedClone(node.name), /*location*/ node);
-                    }
-                }
-                else {
-                    addNode(statements, node);
-                }
-
-                addExportMemberAssignments(statements, node.name);
+                addExportMemberAssignment(statements, node);
             }
             else {
-                Debug.assert((node.flags & NodeFlags.Default) !== 0);
-                addExportDefault(statements,
-                    createClassExpression(
-                        /*name*/ undefined,
-                        node.heritageClauses,
-                        node.members,
-                        /*location*/ node
-                    ),
-                    /*location*/ node
-                );
+                statements.push(node);
             }
 
-            return createNodeArrayNode(statements);
+            // 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),
+                        createPropertyAccess(createIdentifier("exports"), getDeclarationName(node))
+                    )],
+                    /*location*/ node
+                )
+            );
+        }
+
+        function getDeclarationName(node: DeclarationStatement) {
+            return node.name ? getSynthesizedClone(node.name) : getGeneratedNameForNode(node);
+        }
+
+        /**
+         * 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) {
-            node = previousExpressionSubstitution(node);
             if (isIdentifier(node)) {
                 return substituteExpressionIdentifier(node);
             }
@@ -593,33 +828,68 @@ namespace ts {
         }
 
         function substituteExpressionIdentifier(node: Identifier): Expression {
-            const container = resolver.getReferencedExportContainer(node);
-            if (container && container.kind === SyntaxKind.SourceFile) {
-                return createPropertyAccess(
-                    createIdentifier("exports"),
-                    getSynthesizedClone(node),
-                    /*location*/ node
-                );
-            }
-
-            return node;
+            return trySubstituteExportedName(node)
+                || trySubstituteImportedName(node)
+                || node;
         }
 
-        function tryCreateExportEquals(emitAsReturn: boolean) {
-            if (exportEquals && resolver.isValueAliasDeclaration(exportEquals)) {
-                if (emitAsReturn) {
-                    return createReturn(exportEquals.expression);
+        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
+                        );
+                    }
                 }
-                else {
-                    return createStatement(
-                        createAssignment(
-                            createPropertyAccess(
-                                createIdentifier("module"),
-                                "exports"
-                            ),
-                            exportEquals.expression
-                        )
-                    );
+            }
+
+            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;
@@ -633,51 +903,23 @@ namespace ts {
             );
         }
 
-        function getExternalModuleNameLiteral(importNode: ImportDeclaration | ExportDeclaration | ImportEqualsDeclaration) {
-            const moduleName = getExternalModuleName(importNode);
-            if (moduleName.kind === SyntaxKind.StringLiteral) {
-                return tryRenameExternalModule(<StringLiteral>moduleName)
-                    || 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) {
-            if (currentSourceFile.renamedDependencies && hasProperty(currentSourceFile.renamedDependencies, moduleName.text)) {
-                return createLiteral(currentSourceFile.renamedDependencies[moduleName.text]);
-            }
-            return undefined;
-        }
-
-        function getLocalNameForExternalImport(node: ImportDeclaration | ExportDeclaration | ImportEqualsDeclaration): Identifier {
-            const namespaceDeclaration = getNamespaceDeclarationNode(node);
-            if (namespaceDeclaration && !isDefaultImport(node)) {
-                return createIdentifier(getSourceTextOfNodeFromSourceFile(currentSourceFile, 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 createRequireCall(importNode: ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration) {
-            const moduleName = getExternalModuleNameLiteral(importNode);
-            return createCall(
-                createIdentifier("require"),
-                moduleName ? [moduleName] : []
-            );
+            const moduleName = getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
+            const args: Expression[] = [];
+            if (isDefined(moduleName)) {
+                args.push(moduleName);
+            }
+
+            return createCall(createIdentifier("require"), args);
+        }
+
+        function createExportStatement(name: Identifier, value: Expression, location?: TextRange) {
+            return startOnNewLine(createStatement(createExportAssignment(name, value), location));
         }
 
         function createExportAssignment(name: Identifier, value: Expression) {
             return createAssignment(
-                name.originalKeywordKind && languageVersion === ScriptTarget.ES3
+                name.originalKeywordKind === SyntaxKind.DefaultKeyword && languageVersion === ScriptTarget.ES3
                     ? createElementAccess(
                         createIdentifier("exports"),
                         createLiteral(name.text)
@@ -690,36 +932,29 @@ namespace ts {
             );
         }
 
-        function collectAsynchronousDependencies(node: SourceFile, 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
+        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[] = [];
-            const aliasedModuleNames: Expression[] = [createLiteral("require"), createLiteral("exports") ];
-            const importAliasNames = [createParameter("require"), createParameter("exports")];
 
+            // 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.name));
-                    importAliasNames.push(createParameter(createIdentifier(amdDependency.name)));
+                    aliasedModuleNames.push(createLiteral(amdDependency.path));
+                    importAliasNames.push(createParameter(amdDependency.name));
                 }
                 else {
                     unaliasedModuleNames.push(createLiteral(amdDependency.path));
@@ -728,10 +963,14 @@ namespace ts {
 
             for (const importNode of externalImports) {
                 // Find the name of the external module
-                const externalModuleName = getExternalModuleNameLiteral(importNode);
+                const externalModuleName = getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
+
                 // Find the name of the module alias, if there is one
-                const importAliasName = getLocalNameForExternalImport(importNode);
+                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));
                 }
@@ -740,17 +979,11 @@ namespace ts {
                 }
             }
 
-            return {
-                importModuleNames: [
-                    ...unaliasedModuleNames,
-                    ...aliasedModuleNames
-                ],
-                importAliasNames
-            };
+            return { aliasedModuleNames, unaliasedModuleNames, importAliasNames };
         }
 
         function updateSourceFile(node: SourceFile, statements: Statement[]) {
-            const updated = cloneNode(node, node, node.flags, /*parent*/ undefined, node);
+            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
index e5d3dad0a7d..4da4c7d0ed7 100644
--- a/src/compiler/transformers/module/system.ts
+++ b/src/compiler/transformers/module/system.ts
@@ -5,51 +5,68 @@
 namespace ts {
     export function transformSystemModule(context: TransformationContext) {
         interface DependencyGroup {
-            name: Identifier;
+            name: StringLiteral;
             externalImports: (ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration)[];
         }
 
         const {
+            getNodeEmitFlags,
+            setNodeEmitFlags,
+            getCommentRange,
+            setCommentRange,
+            getSourceMapRange,
+            setSourceMapRange,
             startLexicalEnvironment,
             endLexicalEnvironment,
             hoistVariableDeclaration,
             hoistFunctionDeclaration,
-            setNodeEmitFlags
         } = context;
 
         const compilerOptions = context.getCompilerOptions();
         const resolver = context.getEmitResolver();
+        const host = context.getEmitHost();
         const languageVersion = getEmitScriptTarget(compilerOptions);
-        const previousExpressionSubstitution = context.expressionSubstitution;
-        context.enableExpressionSubstitution(SyntaxKind.Identifier);
-        context.enableExpressionSubstitution(SyntaxKind.BinaryExpression);
-        context.enableExpressionSubstitution(SyntaxKind.PostfixUnaryExpression);
-        context.expressionSubstitution = substituteExpression;
+        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 hasExportStars: boolean;
+        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;
-                hasExportStars = false;
+                hasExportStarsToExportValues = false;
                 exportFunctionForFile = undefined;
                 contextObjectForFile = undefined;
                 exportedLocalNames = undefined;
@@ -76,66 +93,50 @@ namespace ts {
             Debug.assert(!exportFunctionForFile);
 
             // Collect information about the external module and dependency groups.
-            ({ externalImports, exportSpecifiers, exportEquals, hasExportStars } = collectExternalModuleInfo(node, resolver));
+            ({ 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[getNodeId(node)] = exportFunctionForFile;
+
             const dependencyGroups = collectDependencyGroups(externalImports);
 
             const statements: Statement[] = [];
 
-            // Add any prologue directives.
-            const statementOffset = copyPrologueDirectives(node.statements, statements);
+            // Add the body of the module.
+            addSystemModuleBody(statements, node, dependencyGroups);
 
-            // var __moduleName = context_1 && context_1.id;
-            addNode(statements,
-                createVariableStatement(
-                    /*modifiers*/ undefined,
-                    createVariableDeclarationList([
-                        createVariableDeclaration(
-                            "__moduleName",
-                            createLogicalAnd(
-                                contextObjectForFile,
-                                createPropertyAccess(contextObjectForFile, "id")
-                            )
-                        )
-                    ])
+            const moduleName = tryGetModuleNameFromFile(node, host, compilerOptions);
+            const dependencies = createArrayLiteral(map(dependencyGroups, getNameOfDependencyGroup));
+            const body = createFunctionExpression(
+                /*asteriskToken*/ undefined,
+                /*name*/ undefined,
+                [
+                    createParameter(exportFunctionForFile),
+                    createParameter(contextObjectForFile)
+                ],
+                setNodeEmitFlags(
+                    createBlock(statements, /*location*/ undefined, /*multiLine*/ true),
+                    NodeEmitFlags.EmitEmitHelpers
                 )
             );
 
-            // Add the body of the module.
-            addSystemModuleBody(statements, node, dependencyGroups, statementOffset);
-
             // 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"),
-                        [
-                            node.moduleName ? createLiteral(node.moduleName) : undefined,
-                            createArrayLiteral(map(dependencyGroups, getNameOfDependencyGroup)),
-                            createFunctionExpression(
-                                /*asteriskToken*/ undefined,
-                                /*name*/ undefined,
-                                [
-                                    createParameter(exportFunctionForFile),
-                                    createParameter(contextObjectForFile)
-                                ],
-                                setNodeEmitFlags(
-                                    setMultiLine(
-                                        createBlock(statements),
-                                        /*multiLine*/ true
-                                    ),
-                                    NodeEmitFlags.EmitEmitHelpers
-                                )
-                            )
-                        ]
+                        moduleName
+                            ? [moduleName, dependencies, body]
+                            : [dependencies, body]
                     )
                 )
-            ]);
+            ], /*nodeEmitFlags*/ ~NodeEmitFlags.EmitEmitHelpers & getNodeEmitFlags(node));
         }
 
         /**
@@ -145,7 +146,7 @@ namespace ts {
          * @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[], statementOffset: number) {
+        function addSystemModuleBody(statements: Statement[], node: SourceFile, dependencyGroups: DependencyGroup[]) {
             // Shape of the body in system modules:
             //
             //  function (exports) {
@@ -193,6 +194,25 @@ namespace ts {
             // 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);
+
+            // var __moduleName = context_1 && context_1.id;
+            addNode(statements,
+                createVariableStatement(
+                    /*modifiers*/ undefined,
+                    createVariableDeclarationList([
+                        createVariableDeclaration(
+                            "__moduleName",
+                            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
@@ -222,11 +242,13 @@ namespace ts {
                             ),
                             createPropertyAssignment("execute",
                                 createFunctionExpression(
-                                    /*asteriskToken*/ node,
+                                    /*asteriskToken*/ undefined,
                                     /*name*/ undefined,
                                     [],
                                     createBlock(
-                                        executeStatements
+                                        executeStatements,
+                                        /*location*/ undefined,
+                                        /*multiLine*/ true
                                     )
                                 )
                             )
@@ -238,6 +260,9 @@ namespace ts {
         }
 
         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.
@@ -303,7 +328,7 @@ namespace ts {
                     createVariableDeclarationList([
                         createVariableDeclaration(
                             exportedNamesStorageRef,
-                            createObjectLiteral(exportedNames)
+                            createObjectLiteral(exportedNames, /*location*/ undefined, /*multiline*/ true)
                         )
                     ])
                 )
@@ -320,10 +345,11 @@ namespace ts {
             const setters: Expression[] = [];
             for (const group of dependencyGroups) {
                 // derive a unique name for parameter from the first named entry in the group
-                const parameterName = createUniqueName(forEach(group.externalImports, getLocalNameTextForExternalImport) || "");
+                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);
+                    const importVariableName = getLocalNameForExternalImport(entry, currentSourceFile);
                     switch (entry.kind) {
                         case SyntaxKind.ImportDeclaration:
                             if (!(<ImportDeclaration>entry).importClause) {
@@ -371,7 +397,7 @@ namespace ts {
                                     createStatement(
                                         createCall(
                                             exportFunctionForFile,
-                                            [createObjectLiteral(properties)]
+                                            [createObjectLiteral(properties, /*location*/ undefined, /*multiline*/ true)]
                                         )
                                     )
                                 );
@@ -400,15 +426,15 @@ namespace ts {
                         /*asteriskToken*/ undefined,
                         /*name*/ undefined,
                         [createParameter(parameterName)],
-                        createBlock(statements)
+                        createBlock(statements, /*location*/ undefined, /*multiLine*/ true)
                     )
                 );
             }
 
-            return createArrayLiteral(setters);
+            return createArrayLiteral(setters, /*location*/ undefined, /*multiLine*/ true);
         }
 
-        function visitSourceElement(node: Node): Node {
+        function visitSourceElement(node: Node): VisitResult<Node> {
             switch (node.kind) {
                 case SyntaxKind.ImportDeclaration:
                     return visitImportDeclaration(<ImportDeclaration>node);
@@ -427,7 +453,29 @@ namespace ts {
             }
         }
 
-        function visitNestedNode(node: Node): 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);
@@ -480,6 +528,9 @@ namespace ts {
                 case SyntaxKind.Block:
                     return visitBlock(<Block>node);
 
+                case SyntaxKind.ExpressionStatement:
+                    return visitExpressionStatement(<ExpressionStatement>node);
+
                 default:
                     return node;
             }
@@ -487,7 +538,7 @@ namespace ts {
 
         function visitImportDeclaration(node: ImportDeclaration): Node {
             if (node.importClause && contains(externalImports, node)) {
-                hoistVariableDeclaration(getLocalNameForExternalImport(node));
+                hoistVariableDeclaration(getLocalNameForExternalImport(node, currentSourceFile));
             }
 
             return undefined;
@@ -495,18 +546,18 @@ namespace ts {
 
         function visitImportEqualsDeclaration(node: ImportEqualsDeclaration): Node {
             if (contains(externalImports, node)) {
-                hoistVariableDeclaration(getLocalNameForExternalImport(node));
+                hoistVariableDeclaration(getLocalNameForExternalImport(node, currentSourceFile));
             }
 
             // NOTE(rbuckton): Do we support export import = require('') in System?
             return undefined;
         }
 
-        function visitExportDeclaration(node: ExportDeclaration): OneOrMany<Statement> {
+        function visitExportDeclaration(node: ExportDeclaration): VisitResult<Statement> {
             if (!node.moduleSpecifier) {
                 const statements: Statement[] = [];
                 addNodes(statements, map(node.exportClause.elements, visitExportSpecifier));
-                return createNodeArrayNode(statements);
+                return statements;
             }
 
             return undefined;
@@ -525,11 +576,13 @@ namespace ts {
         }
 
         function visitExportAssignment(node: ExportAssignment): Statement {
-            if (!node.isExportEquals && resolver.isValueAliasDeclaration(node)) {
-                return createExportStatement(
-                    createLiteral("default"),
-                    node.expression
-                );
+            if (!node.isExportEquals) {
+                if (nodeIsSynthesized(node) || resolver.isValueAliasDeclaration(node)) {
+                    return createExportStatement(
+                        createLiteral("default"),
+                        node.expression
+                    );
+                }
             }
 
             return undefined;
@@ -541,15 +594,22 @@ namespace ts {
          *
          * @param node The variable statement to visit.
          */
-        function visitVariableStatement(node: VariableStatement): OneOrMany<Statement> {
-            const isExported = (node.flags & NodeFlags.Export) !== 0;
+        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) {
-                addNode(expressions, transformVariable(variable, isExported));
+                addNode(expressions, <Expression>transformVariable(variable, isExported));
             }
 
             if (expressions.length) {
-                return createStatement(inlineExpressions(expressions));
+                return createStatement(inlineExpressions(expressions), node);
             }
 
             return undefined;
@@ -561,7 +621,7 @@ namespace ts {
          * @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): Expression {
+        function transformVariable(node: VariableDeclaration, isExported: boolean): VariableDeclaration | Expression {
             // Hoist any bound names within the declaration.
             hoistBindingElement(node, isExported);
 
@@ -577,7 +637,7 @@ namespace ts {
             }
             else {
                 // If the variable has a BindingPattern, flatten the variable into multiple assignment expressions.
-                return flattenVariableDestructuringToExpression(node, hoistVariableDeclaration);
+                return flattenVariableDestructuringToExpression(context, node, hoistVariableDeclaration);
             }
         }
 
@@ -587,10 +647,10 @@ namespace ts {
          * @param node The function declaration to visit.
          */
         function visitFunctionDeclaration(node: FunctionDeclaration): Node {
-            if (node.flags & NodeFlags.Export) {
+            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);
-                node = createFunctionDeclaration(
+                const newNode = createFunctionDeclaration(
                     /*modifiers*/ undefined,
                     node.asteriskToken,
                     name,
@@ -601,9 +661,12 @@ namespace ts {
                 // Record a declaration export in the outer module body function.
                 recordExportedFunctionDeclaration(node);
 
-                if ((node.flags & NodeFlags.Default) === 0) {
+                if (!hasModifier(node, ModifierFlags.Default)) {
                     recordExportName(name);
                 }
+
+                setOriginalNode(newNode, node);
+                node = newNode;
             }
 
             // Hoist the function declaration to the outer module body function.
@@ -611,12 +674,30 @@ namespace ts {
             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): OneOrMany<Statement> {
+        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);
@@ -640,15 +721,19 @@ namespace ts {
             );
 
             // If the class was exported, write a declaration export to the inner module body function.
-            if (node.flags & NodeFlags.Export) {
-                if ((node.flags & NodeFlags.Default) === 0) {
+            if (hasModifier(node, ModifierFlags.Export)) {
+                if (!hasModifier(node, ModifierFlags.Default)) {
                     recordExportName(name);
                 }
 
                 addNode(statements, createDeclarationExport(node));
             }
 
-            return createNodeArrayNode(statements);
+            return statements;
+        }
+
+        function shouldHoistLoopInitializer(node: VariableDeclarationList | Expression) {
+            return isVariableDeclarationList(node) && (getCombinedNodeFlags(node) & NodeFlags.BlockScoped) === 0;
         }
 
         /**
@@ -658,10 +743,10 @@ namespace ts {
          */
         function visitForStatement(node: ForStatement): ForStatement {
             const initializer = node.initializer;
-            if (isVariableDeclarationList(initializer)) {
+            if (shouldHoistLoopInitializer(initializer)) {
                 const expressions: Expression[] = [];
-                for (const variable of initializer.declarations) {
-                    addNode(expressions, transformVariable(variable, /*isExported*/ false));
+                for (const variable of (<VariableDeclarationList>initializer).declarations) {
+                    addNode(expressions, <Expression>transformVariable(variable, /*isExported*/ false));
                 };
 
                 return createFor(
@@ -691,7 +776,7 @@ namespace ts {
             const name = firstDeclaration.name;
             return isIdentifier(name)
                 ? name
-                : flattenVariableDestructuringToExpression(firstDeclaration, hoistVariableDeclaration);
+                : flattenVariableDestructuringToExpression(context, firstDeclaration, hoistVariableDeclaration);
         }
 
         /**
@@ -701,9 +786,9 @@ namespace ts {
          */
         function visitForInStatement(node: ForInStatement): ForInStatement {
             const initializer = node.initializer;
-            if (isVariableDeclarationList(initializer)) {
+            if (shouldHoistLoopInitializer(initializer)) {
                 const updated = getMutableClone(node);
-                updated.initializer = transformForBinding(initializer);
+                updated.initializer = transformForBinding(<VariableDeclarationList>initializer);
                 updated.statement = visitNode(node.statement, visitNestedNode, isStatement, /*optional*/ false, liftToBlock);
                 return updated;
             }
@@ -719,9 +804,9 @@ namespace ts {
          */
         function visitForOfStatement(node: ForOfStatement): ForOfStatement {
             const initializer = node.initializer;
-            if (isVariableDeclarationList(initializer)) {
+            if (shouldHoistLoopInitializer(initializer)) {
                 const updated = getMutableClone(node);
-                updated.initializer = transformForBinding(initializer);
+                updated.initializer = transformForBinding(<VariableDeclarationList>initializer);
                 updated.statement = visitNode(node.statement, visitNestedNode, isStatement, /*optional*/ false, liftToBlock);
                 return updated;
             }
@@ -881,20 +966,47 @@ namespace ts {
         // Substitutions
         //
 
+        function onEmitNode(node: Node, emit: (node: Node) => void): void {
+            if (node.kind === SyntaxKind.SourceFile) {
+                exportFunctionForFile = exportFunctionForFileMap[getNodeId(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): Expression {
-            node = previousExpressionSubstitution(node);
+        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 substitutePostfixUnaryExpression(<PostfixUnaryExpression>node);
+                    return substituteUnaryExpression(<PrefixUnaryExpression | PostfixUnaryExpression>node);
             }
             return node;
         }
@@ -905,7 +1017,10 @@ namespace ts {
         function substituteExpressionIdentifier(node: Identifier): Expression {
             const importDeclaration = resolver.getReferencedImportDeclaration(node);
             if (importDeclaration) {
-                return createImportBinding(importDeclaration);
+                const importBinding = createImportBinding(importDeclaration);
+                if (importBinding) {
+                    return importBinding;
+                }
             }
 
             return node;
@@ -1026,67 +1141,41 @@ namespace ts {
         }
 
         function substituteDestructuring(node: BinaryExpression) {
-            return flattenDestructuringAssignment(node, /*needsValue*/ true, hoistVariableDeclaration);
+            return flattenDestructuringAssignment(context, node, /*needsValue*/ true, hoistVariableDeclaration);
         }
 
-        function substitutePostfixUnaryExpression(node: PostfixUnaryExpression): Expression {
+        function substituteUnaryExpression(node: PrefixUnaryExpression | PostfixUnaryExpression): Expression {
             const operand = node.operand;
-            if (isIdentifier(operand)) {
-                const exportDeclaration = resolver.getReferencedExportContainer(operand);
-                if (exportDeclaration) {
-                    const exportCall = createExportExpression(
-                        operand,
-                        createPrefix(node.operator, operand, node)
-                    );
+            const operator = node.operator;
+            const substitute =
+                isIdentifier(operand) &&
+                (
+                    node.kind === SyntaxKind.PostfixUnaryExpression ||
+                    (node.kind === SyntaxKind.PrefixUnaryExpression && (operator === SyntaxKind.PlusPlusToken || operator === SyntaxKind.MinusMinusToken))
+                );
 
-                    return node.operator === SyntaxKind.PlusPlusToken
-                        ? createSubtract(exportCall, createLiteral(1))
-                        : createAdd(exportCall, createLiteral(1));
+            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;
         }
 
-        function getExternalModuleNameLiteral(importNode: ImportDeclaration | ExportDeclaration | ImportEqualsDeclaration) {
-            const moduleName = getExternalModuleName(importNode);
-            if (moduleName.kind === SyntaxKind.StringLiteral) {
-                return tryRenameExternalModule(<StringLiteral>moduleName)
-                    || 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) {
-            if (currentSourceFile.renamedDependencies && hasProperty(currentSourceFile.renamedDependencies, moduleName.text)) {
-                return createLiteral(currentSourceFile.renamedDependencies[moduleName.text]);
-            }
-
-            return undefined;
-        }
-
-        function getLocalNameTextForExternalImport(node: ImportDeclaration | ExportDeclaration | ImportEqualsDeclaration): string {
-            const name = getLocalNameForExternalImport(node);
-            return name ? name.text : undefined;
-        }
-
-        function getLocalNameForExternalImport(node: ImportDeclaration | ExportDeclaration | ImportEqualsDeclaration): Identifier {
-            const namespaceDeclaration = getNamespaceDeclarationNode(node);
-            if (namespaceDeclaration && !isDefaultImport(node)) {
-                return createIdentifier(getSourceTextOfNodeFromSourceFile(currentSourceFile, namespaceDeclaration.name));
-            }
-            if (node.kind === SyntaxKind.ImportDeclaration && (<ImportDeclaration>node).importClause) {
-                return getGeneratedNameForNode(node);
-            }
-            if (node.kind === SyntaxKind.ExportDeclaration && (<ExportDeclaration>node).moduleSpecifier) {
-                return getGeneratedNameForNode(node);
-            }
-        }
-
         /**
          * Gets a name to use for a DeclarationStatement.
          * @param node The declaration statement.
@@ -1130,14 +1219,17 @@ namespace ts {
                             ]),
                             m,
                             createBlock([
-                                createIf(
-                                    condition,
-                                    createStatement(
-                                        createAssignment(
-                                            createElementAccess(exports, n),
-                                            createElementAccess(m, n)
+                                setNodeEmitFlags(
+                                    createIf(
+                                        condition,
+                                        createStatement(
+                                            createAssignment(
+                                                createElementAccess(exports, n),
+                                                createElementAccess(m, n)
+                                            )
                                         )
-                                    )
+                                    ),
+                                    NodeEmitFlags.SingleLine
                                 )
                             ])
                         ),
@@ -1147,7 +1239,9 @@ namespace ts {
                                 [exports]
                             )
                         )
-                    ])
+                    ],
+                    /*location*/ undefined,
+                    /*multiline*/ true)
                 )
             );
 
@@ -1179,7 +1273,7 @@ namespace ts {
          */
         function createDeclarationExport(node: DeclarationStatement) {
             const declarationName = getDeclarationName(node);
-            const exportName = node.flags & NodeFlags.Default ? createLiteral("default") : declarationName;
+            const exportName = hasModifier(node, ModifierFlags.Default) ? createLiteral("default") : declarationName;
             return createExportStatement(exportName, declarationName);
         }
 
@@ -1189,12 +1283,14 @@ namespace ts {
             if (isImportClause(importDeclaration)) {
                 importAlias = getGeneratedNameForNode(importDeclaration.parent);
                 name = createIdentifier("default");
-                name.originalKeywordKind = SyntaxKind.DefaultKeyword;
             }
             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));
@@ -1209,7 +1305,7 @@ namespace ts {
             const dependencyGroups: DependencyGroup[] = [];
             for (let i = 0; i < externalImports.length; i++) {
                 const externalImport = externalImports[i];
-                const externalModuleName = getExternalModuleNameLiteral(externalImport);
+                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
@@ -1249,7 +1345,7 @@ namespace ts {
             exportedFunctionDeclarations.push(createDeclarationExport(node));
         }
 
-        function hoistBindingElement(node: VariableDeclaration | BindingElement, isExported: boolean) {
+        function hoistBindingElement(node: VariableDeclaration | BindingElement, isExported: boolean): void {
             const name = node.name;
             if (isIdentifier(name)) {
                 hoistVariableDeclaration(getSynthesizedClone(name));
@@ -1270,9 +1366,10 @@ namespace ts {
             hoistBindingElement(node, /*isExported*/ false);
         }
 
-        function updateSourceFile(node: SourceFile, statements: Statement[]) {
-            const updated = cloneNode(node, node, node.flags, /*parent*/ undefined, node);
+        function updateSourceFile(node: SourceFile, statements: Statement[], nodeEmitFlags: NodeEmitFlags) {
+            const updated = getMutableClone(node);
             updated.statements = createNodeArray(statements, node.statements);
+            setNodeEmitFlags(updated, nodeEmitFlags);
             return updated;
         }
     }
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index c69021ce3f0..abc50d280a6 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -6,6 +6,11 @@
 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. */
         DecoratedClasses = 1 << 0,
@@ -13,11 +18,16 @@ namespace ts {
         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,
@@ -26,22 +36,21 @@ namespace ts {
         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 previousExpressionSubstitution = context.expressionSubstitution;
+        const previousOnSubstituteNode = context.onSubstituteNode;
 
         // Set new transformation hooks.
         context.onEmitNode = onEmitNode;
-        context.expressionSubstitution = substituteExpression;
+        context.onSubstituteNode = onSubstituteNode;
 
         // These variables contain state that changes as we descend into the tree.
         let currentSourceFile: SourceFile;
         let currentNamespace: ModuleDeclaration;
-        let currentNamespaceLocalName: Identifier;
+        let currentNamespaceContainerName: Identifier;
         let currentScope: SourceFile | Block | ModuleBlock | CaseBlock;
-        let currentParent: Node;
-        let currentNode: Node;
 
         /**
          * Keeps track of whether expression substitution has been enabled for specific edge cases.
@@ -65,7 +74,7 @@ namespace ts {
          * Keeps track of whether  we are within any containing namespaces when performing
          * just-in-time substitution while printing an expression identifier.
          */
-        let isEnclosedInNamespace: boolean;
+        let applicableSubstitutions: TypeScriptSubstitutionFlags;
 
         /**
          * This keeps track of containers where `super` is valid, for use with
@@ -82,9 +91,10 @@ namespace ts {
          */
         function transformSourceFile(node: SourceFile) {
             currentSourceFile = node;
-            node = visitEachChild(node, visitor, context);
-            setNodeEmitFlags(node, NodeEmitFlags.EmitEmitHelpers);
-            return node;
+            currentScope = node;
+            const visited = visitEachChild(node, visitor, context);
+            setNodeEmitFlags(visited, NodeEmitFlags.EmitEmitHelpers | getNodeEmitFlags(node));
+            return visited;
         }
 
         /**
@@ -92,25 +102,19 @@ namespace ts {
          *
          * @param node The node to visit.
          */
-        function visitWithStack(node: Node, visitor: (node: Node) => Node): Node {
+        function saveStateAndInvoke<T>(node: Node, f: (node: Node) => T): T {
             // Save state
-            const savedCurrentNamespace = currentNamespace;
             const savedCurrentScope = currentScope;
-            const savedCurrentParent = currentParent;
-            const savedCurrentNode = currentNode;
 
             // Handle state changes before visiting a node.
             onBeforeVisitNode(node);
 
-            node = visitor(node);
+            const visited = f(node);
 
             // Restore state
-            currentNamespace = savedCurrentNamespace;
             currentScope = savedCurrentScope;
-            currentParent = savedCurrentParent;
-            currentNode = savedCurrentNode;
 
-            return node;
+            return visited;
         }
 
         /**
@@ -118,8 +122,8 @@ namespace ts {
          *
          * @param node The node to visit.
          */
-        function visitor(node: Node): Node {
-            return visitWithStack(node, visitorWorker);
+        function visitor(node: Node): VisitResult<Node> {
+            return saveStateAndInvoke(node, visitorWorker);
         }
 
         /**
@@ -127,14 +131,14 @@ namespace ts {
          *
          * @param node The node to visit.
          */
-        function visitorWorker(node: Node): Node {
+        function visitorWorker(node: Node): VisitResult<Node> {
             if (node.transformFlags & TransformFlags.TypeScript) {
                 // This node is explicitly marked as TypeScript, so we should transform the node.
-                node = visitTypeScript(node);
+                return visitTypeScript(node);
             }
             else if (node.transformFlags & TransformFlags.ContainsTypeScript) {
                 // This node contains TypeScript, so we should visit its children.
-                node = visitEachChild(node, visitor, context);
+                return visitEachChild(node, visitor, context);
             }
 
             return node;
@@ -145,8 +149,8 @@ namespace ts {
          *
          * @param node The node to visit.
          */
-        function namespaceElementVisitor(node: Node): Node {
-            return visitWithStack(node, namespaceElementVisitorWorker);
+        function namespaceElementVisitor(node: Node): VisitResult<Node> {
+            return saveStateAndInvoke(node, namespaceElementVisitorWorker);
         }
 
         /**
@@ -154,15 +158,23 @@ namespace ts {
          *
          * @param node The node to visit.
          */
-        function namespaceElementVisitorWorker(node: Node): Node {
-            if (node.transformFlags & TransformFlags.TypeScript || isExported(node)) {
+        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.
-                node = visitTypeScript(node);
+                return visitTypeScript(node);
             }
             else if (node.transformFlags & TransformFlags.ContainsTypeScript) {
                 // This node contains TypeScript, so we should visit its children.
-                node = visitEachChild(node, visitor, context);
+                return visitEachChild(node, visitor, context);
             }
 
             return node;
@@ -173,8 +185,8 @@ namespace ts {
          *
          * @param node The node to visit.
          */
-        function classElementVisitor(node: Node) {
-            return visitWithStack(node, classElementVisitorWorker);
+        function classElementVisitor(node: Node): VisitResult<Node> {
+            return saveStateAndInvoke(node, classElementVisitorWorker);
         }
 
         /**
@@ -182,10 +194,10 @@ namespace ts {
          *
          * @param node The node to visit.
          */
-        function classElementVisitorWorker(node: Node) {
+        function classElementVisitorWorker(node: Node): VisitResult<Node> {
             switch (node.kind) {
                 case SyntaxKind.Constructor:
-                    // TypeScript constructors are transformed in `transformClassDeclaration`.
+                    // 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;
@@ -198,9 +210,12 @@ namespace ts {
                     // Fallback to the default visit behavior.
                     return visitorWorker(node);
 
+                case SyntaxKind.SemicolonClassElement:
+                    return node;
+
                 default:
-                    Debug.fail("Unexpected node.");
-                    break;
+                    Debug.failBadSyntaxKind(node);
+                    return undefined;
             }
         }
 
@@ -209,10 +224,13 @@ namespace ts {
          *
          * @param node The node to visit.
          */
-        function visitTypeScript(node: Node): Node {
-            if (node.flags & NodeFlags.Ambient) {
-                // TypeScript ambient declarations are elided.
-                return undefined;
+        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 isStatement(node)
+                    ? createNotEmittedStatement(node)
+                    : undefined;
             }
 
             switch (node.kind) {
@@ -240,33 +258,39 @@ namespace ts {
                 case SyntaxKind.StringKeyword:
                 case SyntaxKind.NumberKeyword:
                 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.StringLiteralType:
+                case SyntaxKind.ParenthesizedType:
                 case SyntaxKind.ThisType:
+                case SyntaxKind.StringLiteralType:
                     // 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 transformClassDeclaration.
+                    // TypeScript decorators are elided. They will be emitted as part of visitClassDeclaration.
 
-                case SyntaxKind.InterfaceDeclaration:
                 case SyntaxKind.TypeAliasDeclaration:
-                    // TypeScript type-only declarations are elided
+                    // TypeScript type-only declarations are elided.
 
                 case SyntaxKind.PropertyDeclaration:
                     // TypeScript property declarations are elided.
 
                 case SyntaxKind.Constructor:
-                    // TypeScript constructors are transformed in `transformClassDeclaration`.
+                    // 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.
                     //
@@ -337,6 +361,7 @@ namespace ts {
                     // - accessibility modifiers
                     // - the question mark (?) token for optional parameters
                     // - type annotations
+                    // - this parameters
                     return visitParameter(<ParameterDeclaration>node);
 
                 case SyntaxKind.ParenthesizedExpression:
@@ -349,6 +374,10 @@ namespace ts {
                     // 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);
@@ -370,8 +399,8 @@ namespace ts {
                     return visitImportEqualsDeclaration(<ImportEqualsDeclaration>node);
 
                 default:
-                    Debug.fail(`Unexpected node kind: ${formatSyntaxKind(node.kind)}.`);
-                    break;
+                    Debug.failBadSyntaxKind(node);
+                    return visitEachChild(node, visitor, context);
             }
         }
 
@@ -381,9 +410,6 @@ namespace ts {
          * @param node The node to visit.
          */
         function onBeforeVisitNode(node: Node) {
-            currentParent = currentNode;
-            currentNode = node;
-
             switch (node.kind) {
                 case SyntaxKind.SourceFile:
                 case SyntaxKind.CaseBlock:
@@ -394,6 +420,26 @@ namespace ts {
             }
         }
 
+        /**
+         * 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) {
+                for (const parameter of constructor.parameters) {
+                    if (parameter.decorators && parameter.decorators.length > 0) {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
         /**
          * Transforms a class declaration with TypeScript syntax into compatible ES6.
          *
@@ -405,9 +451,11 @@ namespace ts {
          *
          * @param node The node to transform.
          */
-        function visitClassDeclaration(node: ClassDeclaration): NodeArrayNode<Statement> {
+        function visitClassDeclaration(node: ClassDeclaration): VisitResult<Statement> {
             const staticProperties = getInitializedProperties(node, /*isStatic*/ true);
             const hasExtendsClause = getClassExtendsHeritageClauseElement(node) !== undefined;
+            const isDecoratedClass = shouldEmitDecorateCallForClass(node);
+            let decoratedClassAlias: Identifier;
 
             // emit name if
             // - node has a name
@@ -418,24 +466,27 @@ namespace ts {
                 name = getGeneratedNameForNode(node);
             }
 
-            let decoratedClassAlias: Identifier;
             const statements: Statement[] = [];
-            if (!node.decorators) {
+            if (!isDecoratedClass) {
                 //  ${modifiers} class ${name} ${heritageClauses} {
                 //      ${members}
                 //  }
-                addNode(statements,
-                    setOriginalNode(
-                        createClassDeclaration(
-                            visitNodes(node.modifiers, visitor, isModifier),
-                            name,
-                            visitNodes(node.heritageClauses, visitor, isHeritageClause),
-                            transformClassMembers(node, hasExtendsClause),
-                            /*location*/ node
-                        ),
-                        node
-                    )
+                const classDeclaration = createClassDeclaration(
+                    visitNodes(node.modifiers, visitor, isModifier),
+                    name,
+                    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 {
                 decoratedClassAlias = addClassDeclarationHeadWithDecorators(statements, node, name, hasExtendsClause);
@@ -446,29 +497,31 @@ namespace ts {
             // 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.
-            addNodes(statements, generateInitializedPropertyStatements(node, staticProperties, name));
+            if (staticProperties.length) {
+                addInitializedPropertyStatements(statements, node, staticProperties, getLocalName(node, /*noSourceMaps*/ true));
+            }
 
             // Write any decorators of the node.
-            addNodes(statements, generateClassElementDecorationStatements(node, /*isStatic*/ false));
-            addNodes(statements, generateClassElementDecorationStatements(node, /*isStatic*/ true));
-            addNode(statements, generateConstructorDecorationStatement(node, decoratedClassAlias));
+            addClassElementDecorationStatements(statements, node, /*isStatic*/ false);
+            addClassElementDecorationStatements(statements, node, /*isStatic*/ true);
+            addConstructorDecorationStatement(statements, node, decoratedClassAlias);
 
             // 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)) {
-                addNode(statements, createNamespaceExport(name, name));
+                addExportMemberAssignment(statements, node);
             }
-            else if (node.decorators) {
+            else if (isDecoratedClass) {
                 if (isDefaultExternalModuleExport(node)) {
-                    addNode(statements, createExportDefault(name));
+                    statements.push(createExportDefault(getLocalName(node)));
                 }
                 else if (isNamedExternalModuleExport(node)) {
-                    addNode(statements, createExternalModuleExport(name));
+                    statements.push(createExternalModuleExport(name));
                 }
             }
 
-            return createNodeArrayNode(statements);
+            return statements;
         }
 
         /**
@@ -566,6 +619,8 @@ namespace ts {
             //  ---------------------------------------------------------------------
             //
 
+            const location = moveRangePastDecorators(node);
+
             //  ... = class ${name} ${heritageClauses} {
             //      ${members}
             //  }
@@ -574,15 +629,19 @@ namespace ts {
                     name,
                     visitNodes(node.heritageClauses, visitor, isHeritageClause),
                     transformClassMembers(node, hasExtendsClause),
-                    /*location*/ node
+                    /*location*/ location
                 ),
                 node
             );
 
+            if (!name) {
+                name = getGeneratedNameForNode(node);
+            }
+
             // Record an alias to avoid class double-binding.
             let decoratedClassAlias: Identifier;
-            if (resolver.getNodeCheckFlags(getOriginalNode(node)) & NodeCheckFlags.DecoratedClassWithSelfReference) {
-                enableExpressionSubstitutionForDecoratedClasses();
+            if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.DecoratedClassWithSelfReference) {
+                enableSubstitutionForDecoratedClasses();
                 decoratedClassAlias = createUniqueName(node.name && !isGeneratedIdentifier(node.name) ? node.name.text : "default");
                 decoratedClassAliases[getOriginalNodeId(node)] = decoratedClassAlias;
 
@@ -593,11 +652,9 @@ namespace ts {
                 addNode(statements,
                     createVariableStatement(
                         /*modifiers*/ undefined,
-                        createVariableDeclarationList([
+                        createLetDeclarationList([
                             createVariableDeclaration(decoratedClassAlias)
-                        ],
-                        /*location*/ undefined,
-                        NodeFlags.Let)
+                        ])
                     )
                 );
 
@@ -605,21 +662,23 @@ namespace ts {
                 classExpression = createAssignment(
                     decoratedClassAlias,
                     classExpression,
-                    /*location*/ node);
+                    /*location*/ location);
             }
 
             //  let ${name} = ${classExpression};
             addNode(statements,
-                createVariableStatement(
-                    /*modifiers*/ undefined,
-                    createVariableDeclarationList([
-                        createVariableDeclaration(
-                            name,
-                            classExpression
-                        )
-                    ],
-                    /*location*/ undefined,
-                    NodeFlags.Let)
+                setOriginalNode(
+                    createVariableStatement(
+                        /*modifiers*/ undefined,
+                        createLetDeclarationList([
+                            createVariableDeclaration(
+                                getDeclarationName(node, /*allowComments*/ true),
+                                classExpression
+                            )
+                        ]),
+                        /*location*/ location
+                    ),
+                    /*original*/ node
                 )
             );
 
@@ -640,18 +699,9 @@ namespace ts {
             const heritageClauses = visitNodes(node.heritageClauses, visitor, isHeritageClause);
             const members = transformClassMembers(node, heritageClauses !== undefined);
 
-            // emit name if
-            // - node has a name
-            // - node has static initializers
-            //
-            let name = node.name;
-            if (!name && staticProperties.length > 0) {
-                name = getGeneratedNameForNode(node);
-            }
-
             const classExpression = setOriginalNode(
                 createClassExpression(
-                    name,
+                    node.name,
                     heritageClauses,
                     members,
                     /*location*/ node
@@ -661,11 +711,14 @@ namespace ts {
 
             if (staticProperties.length > 0) {
                 const expressions: Expression[] = [];
-                const temp = createTempVariable();
-                hoistVariableDeclaration(temp);
-                addNode(expressions, createAssignment(temp, classExpression));
-                addNodes(expressions, generateInitializedPropertyExpressions(node, staticProperties, temp));
-                addNode(expressions, temp);
+                const temp = createTempVariable(hoistVariableDeclaration);
+
+                // 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));
+                addNode(expressions, createAssignment(temp, classExpression), true);
+                addNodes(expressions, generateInitializedPropertyExpressions(node, staticProperties, temp), true);
+                addNode(expressions, temp, true);
                 return inlineExpressions(expressions);
             }
 
@@ -716,7 +769,7 @@ namespace ts {
                     createConstructor(
                         parameters,
                         body,
-                        /*location*/ constructor
+                        /*location*/ constructor || node
                     ),
                     constructor
                 )
@@ -733,7 +786,7 @@ namespace ts {
         function transformConstructorParameters(constructor: ConstructorDeclaration, hasExtendsClause: boolean) {
             return constructor
                 ? visitNodes(constructor.parameters, visitor, isParameter)
-                : hasExtendsClause ? [createRestParameter(createUniqueName("args"))] : [];
+                : hasExtendsClause ? [createRestParameter("args")] : [];
         }
 
         /**
@@ -746,19 +799,14 @@ namespace ts {
          * @param parameters The transformed parameters for the constructor.
          */
         function transformConstructorBody(node: ClassExpression | ClassDeclaration, constructor: ConstructorDeclaration, hasExtendsClause: boolean, parameters: ParameterDeclaration[]) {
-            let hasSuperCall = false;
             const statements: Statement[] = [];
+            let indexOfFirstStatement = 0;
 
             // The body of a constructor is a new lexical environment
             startLexicalEnvironment();
 
             if (constructor) {
-                const superCall = visitNode(findInitialSuperCall(constructor), visitor, isStatement);
-                if (superCall) {
-                    // Adds the existing super call as the first line of the constructor.
-                    addNode(statements, superCall);
-                    hasSuperCall = true;
-                }
+                indexOfFirstStatement = addPrologueDirectivesAndInitialSuperCall(constructor, statements);
 
                 // Add parameters with property assignments. Transforms this:
                 //
@@ -803,41 +851,53 @@ namespace ts {
             //  }
             //
             const properties = getInitializedProperties(node, /*isStatic*/ false);
-            addNodes(statements, generateInitializedPropertyStatements(node, properties, createThis()));
+            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.
-                addNodes(statements, visitNodes(constructor.body.statements, visitor, isStatement, hasSuperCall ? 1 : 0));
+                addNodes(statements, visitNodes(constructor.body.statements, visitor, isStatement, indexOfFirstStatement));
             }
 
             // End the lexical environment.
             addNodes(statements, endLexicalEnvironment());
             return setMultiLine(
-                createBlock(statements, constructor ? constructor.body : undefined),
+                createBlock(
+                    createNodeArray(
+                        statements,
+                        /*location*/ constructor ? constructor.body.statements : node.members
+                    ),
+                    /*location*/ constructor ? constructor.body : undefined
+                ),
                 true
             );
         }
 
         /**
-         * Finds the initial super-call for a constructor.
+         * 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 findInitialSuperCall(ctor: ConstructorDeclaration): ExpressionStatement {
+        function addPrologueDirectivesAndInitialSuperCall(ctor: ConstructorDeclaration, result: Statement[]): number {
             if (ctor.body) {
                 const statements = ctor.body.statements;
-                const statement = firstOrUndefined(statements);
-                if (statement && statement.kind === SyntaxKind.ExpressionStatement) {
-                    const expression = (<ExpressionStatement>statement).expression;
-                    if (expression.kind === SyntaxKind.CallExpression) {
-                        if ((<CallExpression>expression).expression.kind === SyntaxKind.SuperKeyword) {
-                            return <ExpressionStatement>statement;
-                        }
-                    }
+                // add prologue directives to the list (if any)
+                const index = addPrologueDirectives(result, statements);
+                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 undefined;
+            return 0;
         }
 
         /**
@@ -855,7 +915,7 @@ namespace ts {
          * @param parameter The parameter node.
          */
         function isParameterWithPropertyAssignment(parameter: ParameterDeclaration) {
-            return parameter.flags & NodeFlags.AccessibilityModifier
+            return hasModifier(parameter, ModifierFlags.AccessibilityModifier)
                 && isIdentifier(parameter.name);
         }
 
@@ -866,14 +926,24 @@ namespace ts {
          */
         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);
 
-            const name = cloneNode(<Identifier>node.name);
             return startOnNewLine(
                 createStatement(
                     createAssignment(
-                        createPropertyAccess(createThis(), name),
-                        name
-                    )
+                        createPropertyAccess(
+                            createThis(),
+                            propertyName,
+                            /*location*/ node.name
+                        ),
+                        localName
+                    ),
+                    /*location*/ moveRangePos(node, -1)
                 )
             );
         }
@@ -914,7 +984,7 @@ namespace ts {
          */
         function isInitializedProperty(member: ClassElement, isStatic: boolean) {
             return member.kind === SyntaxKind.PropertyDeclaration
-                && isStatic === ((member.flags & NodeFlags.Static) !== 0)
+                && isStatic === hasModifier(member, ModifierFlags.Static)
                 && (<PropertyDeclaration>member).initializer !== undefined;
         }
 
@@ -925,18 +995,13 @@ namespace ts {
          * @param properties An array of property declarations to transform.
          * @param receiver The receiver on which each property should be assigned.
          */
-        function generateInitializedPropertyStatements(node: ClassExpression | ClassDeclaration, properties: PropertyDeclaration[], receiver: LeftHandSideExpression) {
-            const statements: Statement[] = [];
+        function addInitializedPropertyStatements(statements: Statement[], node: ClassExpression | ClassDeclaration, properties: PropertyDeclaration[], receiver: LeftHandSideExpression) {
             for (const property of properties) {
-                statements.push(
-                    createStatement(
-                        transformInitializedProperty(node, property, receiver),
-                        /*location*/ property
-                    )
-                );
+                const statement = createStatement(transformInitializedProperty(node, property, receiver));
+                setSourceMapRange(statement, moveRangePastModifiers(property));
+                setCommentRange(statement, property);
+                statements.push(statement);
             }
-
-            return statements;
         }
 
         /**
@@ -949,7 +1014,10 @@ namespace ts {
         function generateInitializedPropertyExpressions(node: ClassExpression | ClassDeclaration, properties: PropertyDeclaration[], receiver: LeftHandSideExpression) {
             const expressions: Expression[] = [];
             for (const property of properties) {
-                expressions.push(transformInitializedProperty(node, property, receiver, /*location*/ property));
+                const expression = transformInitializedProperty(node, property, receiver);
+                setSourceMapRange(expression, moveRangePastModifiers(property));
+                setCommentRange(expression, property);
+                expressions.push(expression);
             }
 
             return expressions;
@@ -962,14 +1030,15 @@ namespace ts {
          * @param property The property declaration.
          * @param receiver The object receiving the property assignment.
          */
-        function transformInitializedProperty(node: ClassExpression | ClassDeclaration, property: PropertyDeclaration, receiver: LeftHandSideExpression, location?: TextRange) {
+        function transformInitializedProperty(node: ClassExpression | ClassDeclaration, property: PropertyDeclaration, receiver: LeftHandSideExpression) {
             const propertyName = visitPropertyNameOfClassElement(property);
             const initializer = visitNode(property.initializer, visitor, isExpression);
-            return createAssignment(
-                createMemberAccessForPropertyName(receiver, propertyName),
-                initializer,
-                location
-            );
+            const memberAccess = createMemberAccessForPropertyName(receiver, propertyName, /*location*/ propertyName);
+            if (!isComputedPropertyName(propertyName)) {
+                setNodeEmitFlags(memberAccess, NodeEmitFlags.NoNestedSourceMaps);
+            }
+
+            return createAssignment(memberAccess, initializer);
         }
 
         /**
@@ -1012,7 +1081,7 @@ namespace ts {
          */
         function isDecoratedClassElement(member: ClassElement, isStatic: boolean) {
             return nodeOrChildIsDecorated(member)
-                && isStatic === ((member.flags & NodeFlags.Static) !== 0);
+                && isStatic === hasModifier(member, ModifierFlags.Static);
         }
 
         /**
@@ -1175,8 +1244,8 @@ namespace ts {
          * @param isStatic A value indicating whether to generate statements for static or
          *                 instance members.
          */
-        function generateClassElementDecorationStatements(node: ClassDeclaration, isStatic: boolean) {
-            return map(generateClassElementDecorationExpressions(node, isStatic), expressionToStatement);
+        function addClassElementDecorationStatements(statements: Statement[], node: ClassDeclaration, isStatic: boolean) {
+            addRange(statements, map(generateClassElementDecorationExpressions(node, isStatic), expressionToStatement));
         }
 
         /**
@@ -1249,7 +1318,7 @@ namespace ts {
             //
 
             const prefix = getClassMemberPrefix(node, member);
-            const memberName = getExpressionForPropertyName(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
@@ -1261,12 +1330,16 @@ namespace ts {
                     : createNull()
                 : undefined;
 
-            return createDecorateHelper(
+            const helper = createDecorateHelper(
                 decoratorExpressions,
                 prefix,
                 memberName,
-                descriptor
+                descriptor,
+                moveRangePastDecorators(member)
             );
+
+            setNodeEmitFlags(helper, NodeEmitFlags.NoComments);
+            return helper;
         }
 
         /**
@@ -1274,9 +1347,11 @@ namespace ts {
          *
          * @param node The class node.
          */
-        function generateConstructorDecorationStatement(node: ClassDeclaration, decoratedClassAlias: Identifier) {
+        function addConstructorDecorationStatement(statements: Statement[], node: ClassDeclaration, decoratedClassAlias: Identifier) {
             const expression = generateConstructorDecorationExpression(node, decoratedClassAlias);
-            return expression ? createStatement(expression) : undefined;
+            if (expression) {
+                statements.push(setOriginalNode(createStatement(expression), node));
+            }
         }
 
         /**
@@ -1299,20 +1374,44 @@ namespace ts {
             //
             // The emit for the class is:
             //
+            //   C = C_1 = __decorate([dec], C);
+            //
+            if (decoratedClassAlias) {
+                const expression = createAssignment(
+                    decoratedClassAlias,
+                    createDecorateHelper(
+                        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(
+                        decoratorExpressions,
+                        getDeclarationName(node)
+                    ),
+                    moveRangePastDecorators(node)
+                );
 
-            const expression = createAssignment(
-                getDeclarationName(node),
-                createDecorateHelper(
-                    decoratorExpressions,
-                    getDeclarationName(node)
-                )
-            );
-
-            return decoratedClassAlias
-                ? createAssignment(decoratedClassAlias, expression)
-                : expression;
+                setNodeEmitFlags(result, NodeEmitFlags.NoComments);
+                return result;
+            }
         }
 
         /**
@@ -1335,7 +1434,9 @@ namespace ts {
             if (decorators) {
                 expressions = [];
                 for (const decorator of decorators) {
-                    expressions.push(createParamHelper(transformDecorator(decorator), parameterOffset));
+                    const helper = createParamHelper(transformDecorator(decorator), parameterOffset, /*location*/ decorator.expression);
+                    setNodeEmitFlags(helper, NodeEmitFlags.NoComments);
+                    expressions.push(helper);
                 }
             }
 
@@ -1349,15 +1450,42 @@ namespace ts {
          * @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("design:type", serializeTypeOfNode(node), /*defer*/ true));
+                    decoratorExpressions.push(createMetadataHelper("design:type", serializeTypeOfNode(node)));
                 }
                 if (shouldAddParamTypesMetadata(node)) {
-                    decoratorExpressions.push(createMetadataHelper("design:paramtypes", serializeParameterTypesOfNode(node), /*defer*/ true));
+                    decoratorExpressions.push(createMetadataHelper("design:paramtypes", serializeParameterTypesOfNode(node)));
                 }
                 if (shouldAddReturnTypeMetadata(node)) {
-                    decoratorExpressions.push(createMetadataHelper("design:returntype", serializeReturnTypeOfNode(node), /*defer*/ true));
+                    decoratorExpressions.push(createMetadataHelper("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([], serializeTypeOfNode(node))));
+                }
+                if (shouldAddParamTypesMetadata(node)) {
+                    (properties || (properties = [])).push(createPropertyAssignment("paramTypes", createArrowFunction([], serializeParameterTypesOfNode(node))));
+                }
+                if (shouldAddReturnTypeMetadata(node)) {
+                    (properties || (properties = [])).push(createPropertyAssignment("returnType", createArrowFunction([], serializeReturnTypeOfNode(node))));
+                }
+                if (properties) {
+                    decoratorExpressions.push(createMetadataHelper("design:typeinfo", createObjectLiteral(properties, /*location*/ undefined, /*multiLine*/ true)));
                 }
             }
         }
@@ -1478,11 +1606,11 @@ namespace ts {
          * @param node The node that should have its return type serialized.
          */
         function serializeReturnTypeOfNode(node: Node): Expression {
-            if (isFunctionLike(node)) {
+            if (isFunctionLike(node) && node.type) {
                 return serializeTypeNode(node.type);
             }
 
-            return undefined;
+            return createVoidZero();
         }
 
         /**
@@ -1528,7 +1656,7 @@ namespace ts {
                     return createIdentifier("Boolean");
 
                 case SyntaxKind.StringKeyword:
-                case SyntaxKind.StringLiteral:
+                case SyntaxKind.StringLiteralType:
                     return createIdentifier("String");
 
                 case SyntaxKind.NumberKeyword:
@@ -1547,10 +1675,11 @@ namespace ts {
                 case SyntaxKind.UnionType:
                 case SyntaxKind.IntersectionType:
                 case SyntaxKind.AnyKeyword:
+                case SyntaxKind.ThisType:
                     break;
 
                 default:
-                    Debug.fail(`Unexpected node kind: ${formatSyntaxKind(node.kind)}.`);
+                    Debug.failBadSyntaxKind(node);
                     break;
             }
 
@@ -1564,13 +1693,10 @@ namespace ts {
          * @param node The type reference node.
          */
         function serializeTypeReferenceNode(node: TypeReferenceNode) {
-            // Clone the type name and parent it to a location outside of the current declaration.
-            const typeName = cloneEntityName(node.typeName, currentScope);
-            switch (resolver.getTypeReferenceSerializationKind(typeName)) {
+            switch (resolver.getTypeReferenceSerializationKind(node.typeName, currentScope)) {
                 case TypeReferenceSerializationKind.Unknown:
-                    const serialized = serializeEntityNameAsExpression(typeName, /*useFallback*/ true);
-                    const temp = createTempVariable();
-                    hoistVariableDeclaration(temp);
+                    const serialized = serializeEntityNameAsExpression(node.typeName, /*useFallback*/ true);
+                    const temp = createTempVariable(hoistVariableDeclaration);
                     return createLogicalOr(
                         createLogicalAnd(
                             createStrictEquality(
@@ -1585,7 +1711,7 @@ namespace ts {
                     );
 
                 case TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue:
-                    return serializeEntityNameAsExpression(typeName, /*useFallback*/ false);
+                    return serializeEntityNameAsExpression(node.typeName, /*useFallback*/ false);
 
                 case TypeReferenceSerializationKind.VoidType:
                     return createVoidZero();
@@ -1626,17 +1752,20 @@ namespace ts {
         function serializeEntityNameAsExpression(node: EntityName, useFallback: boolean): Expression {
             switch (node.kind) {
                 case SyntaxKind.Identifier:
+                    const name = getMutableClone(<Identifier>node);
+                    name.original = undefined;
+                    name.parent = currentScope;
                     if (useFallback) {
                         return createLogicalAnd(
                             createStrictInequality(
-                                createTypeOf(<Identifier>node),
+                                createTypeOf(name),
                                 createLiteral("undefined")
                             ),
-                            <Identifier>node
+                            name
                         );
                     }
 
-                    return <Identifier>node;
+                    return name;
 
                 case SyntaxKind.QualifiedName:
                     return serializeQualifiedNameAsExpression(<QualifiedName>node, useFallback);
@@ -1656,8 +1785,7 @@ namespace ts {
                 left = serializeEntityNameAsExpression(node.left, useFallback);
             }
             else if (useFallback) {
-                const temp = createTempVariable();
-                hoistVariableDeclaration(temp);
+                const temp = createTempVariable(hoistVariableDeclaration);
                 left = createLogicalAnd(
                     createAssignment(
                         temp,
@@ -1694,10 +1822,12 @@ namespace ts {
          *
          * @param member The member whose name should be converted into an expression.
          */
-        function getExpressionForPropertyName(member: ClassElement | EnumMember): Expression {
+        function getExpressionForPropertyName(member: ClassElement | EnumMember, generateNameForComputedPropertyName: boolean): Expression {
             const name = member.name;
             if (isComputedPropertyName(name)) {
-                return getGeneratedNameForNode(name);
+                return generateNameForComputedPropertyName
+                    ? getGeneratedNameForNode(name)
+                    : (<ComputedPropertyName>name).expression;
             }
             else if (isIdentifier(name)) {
                 return createLiteral(name.text);
@@ -1730,10 +1860,7 @@ namespace ts {
                 );
             }
             else {
-                return setOriginalNode(
-                    cloneNode(name),
-                    name
-                );
+                return name;
             }
         }
 
@@ -1775,74 +1902,119 @@ namespace ts {
             );
         }
 
+        /**
+         * 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
-         * - The node is marked as async
+         * - 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 (shouldElideFunctionLikeDeclaration(node)) {
+            if (!shouldEmitFunctionLikeDeclaration(node)) {
                 return undefined;
             }
 
-            return createMethod(
+            const method = createMethod(
                 visitNodes(node.modifiers, visitor, isModifier),
+                node.asteriskToken,
                 visitPropertyNameOfClassElement(node),
                 visitNodes(node.parameters, visitor, isParameter),
                 transformFunctionBody(node),
-                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
+         * - 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 (shouldElideFunctionLikeDeclaration(node)) {
+            if (!shouldEmitAccessorDeclaration(node)) {
                 return undefined;
             }
 
-            return createGetAccessor(
+            const accessor = createGetAccessor(
                 visitNodes(node.modifiers, visitor, isModifier),
                 visitPropertyNameOfClassElement(node),
-                visitEachChild(node.body, visitor, context),
-                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 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
+         * - 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 (shouldElideFunctionLikeDeclaration(node)) {
+            if (!shouldEmitAccessorDeclaration(node)) {
                 return undefined;
             }
 
-            return createSetAccessor(
+            const accessor = createSetAccessor(
                 visitNodes(node.modifiers, visitor, isModifier),
                 visitPropertyNameOfClassElement(node),
-                visitNode(firstOrUndefined(node.parameters), visitor, isParameter),
-                visitEachChild(node.body, visitor, context),
-                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;
         }
 
         /**
@@ -1855,9 +2027,9 @@ namespace ts {
          *
          * @param node The function node.
          */
-        function visitFunctionDeclaration(node: FunctionDeclaration): OneOrMany<Statement> {
-            if (shouldElideFunctionLikeDeclaration(node)) {
-                return undefined;
+        function visitFunctionDeclaration(node: FunctionDeclaration): VisitResult<Statement> {
+            if (!shouldEmitFunctionLikeDeclaration(node)) {
+                return createNotEmittedStatement(node);
             }
 
             const func = createFunctionDeclaration(
@@ -1866,14 +2038,14 @@ namespace ts {
                 node.name,
                 visitNodes(node.parameters, visitor, isParameter),
                 transformFunctionBody(node),
-                node
+                /*location*/ node
             );
+            setOriginalNode(func, node);
 
             if (isNamespaceExport(node)) {
-                return createNodeArrayNode([
-                    func,
-                    createNamespaceExport(getSynthesizedClone(node.name), getSynthesizedClone(node.name))
-                ]);
+                const statements: Statement[] = [func];
+                addExportMemberAssignment(statements, node);
+                return statements;
             }
 
             return func;
@@ -1888,24 +2060,21 @@ namespace ts {
          * @param node The function expression node.
          */
         function visitFunctionExpression(node: FunctionExpression) {
-            return createFunctionExpression(
+            if (nodeIsMissing(node.body)) {
+                return createOmittedExpression();
+            }
+
+            const func = createFunctionExpression(
                 node.asteriskToken,
                 node.name,
                 visitNodes(node.parameters, visitor, isParameter),
                 transformFunctionBody(node),
-                node
+                /*location*/ node
             );
-        }
 
-        /**
-         * Determines whether a function-like declaration should be elided. A declaration should
-         * be elided if it is an overload, is abstract, or is an ambient declaration.
-         *
-         * @param node The declaration node.
-         */
-        function shouldElideFunctionLikeDeclaration(node: FunctionLikeDeclaration) {
-            return node.body === undefined
-                || node.flags & (NodeFlags.Abstract | NodeFlags.Ambient);
+            setOriginalNode(func, node);
+
+            return func;
         }
 
         /**
@@ -1914,11 +2083,15 @@ namespace ts {
          * - The node is marked async
          */
         function visitArrowFunction(node: ArrowFunction) {
-            return createArrowFunction(
+            const func = createArrowFunction(
                 visitNodes(node.parameters, visitor, isParameter),
                 transformConciseBody(node),
-                node
+                /*location*/ node
             );
+
+            setOriginalNode(func, node);
+
+            return func;
         }
 
         function transformFunctionBody(node: MethodDeclaration | AccessorDeclaration | FunctionDeclaration | FunctionExpression): FunctionBody {
@@ -1968,7 +2141,7 @@ namespace ts {
         }
 
         function transformAsyncFunctionBody(node: FunctionLikeDeclaration): ConciseBody | FunctionBody {
-            const promiseConstructor = getEntityNameFromTypeNode(node.type);
+            const promiseConstructor = languageVersion < ScriptTarget.ES6 ? getEntityNameFromTypeNode(node.type) : undefined;
             const isArrowFunction = node.kind === SyntaxKind.ArrowFunction;
             const hasLexicalArguments = (resolver.getNodeCheckFlags(node) & NodeCheckFlags.CaptureArguments) !== 0;
 
@@ -1977,77 +2150,12 @@ namespace ts {
             // `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 (!isArrowFunction) {
                 const statements: Statement[] = [];
 
-                addNode(statements,
+                statements.push(
                     createReturn(
                         createAwaiterHelper(
                             hasLexicalArguments,
@@ -2057,17 +2165,17 @@ namespace ts {
                     )
                 );
 
-                const block = createBlock(statements, /*location*/ node.body);
+                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) {
-                        enableExpressionSubstitutionForAsyncMethodsWithSuper();
+                        enableSubstitutionForAsyncMethodsWithSuper();
                         setNodeEmitFlags(block, NodeEmitFlags.EmitAdvancedSuperHelper);
                     }
                     else if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.AsyncMethodWithSuper) {
-                        enableExpressionSubstitutionForAsyncMethodsWithSuper();
+                        enableSubstitutionForAsyncMethodsWithSuper();
                         setNodeEmitFlags(block, NodeEmitFlags.EmitSuperHelper);
                     }
                 }
@@ -2088,15 +2196,31 @@ namespace ts {
          *
          * 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) {
-            Debug.assert(!node.dotDotDotToken);
-            return createParameter(
+            if (node.name && isIdentifier(node.name) && node.name.originalKeywordKind === SyntaxKind.ThisKeyword) {
+                return undefined;
+            }
+
+            const parameter = createParameterWithDotDotDotToken(
+                node.dotDotDotToken,
                 visitNode(node.name, visitor, isBindingName),
-                visitNode(node.initializer, visitor, isExpression)
+                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.
+            setCommentRange(parameter, node);
+            setSourceMapRange(parameter, moveRangePastModifiers(node));
+            setNodeEmitFlags(parameter.name, NodeEmitFlags.NoTrailingSourceMap);
+            setOriginalNode(parameter, node);
+
+            return parameter;
         }
 
         /**
@@ -2105,183 +2229,46 @@ namespace ts {
          * 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) {
-            Debug.assert(isNamespaceExport(node));
+        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;
+                }
 
-            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);
             }
-
-            return createStatement(
-                inlineExpressions(
-                    map(variables, transformInitializedVariable)
-                ),
-                /*location*/ node
-            );
         }
 
         function transformInitializedVariable(node: VariableDeclaration): Expression {
             const name = node.name;
             if (isBindingPattern(name)) {
                 return flattenVariableDestructuringToExpression(
+                    context,
                     node,
                     hoistVariableDeclaration,
-                    getNamespaceMemberName,
+                    getNamespaceMemberNameWithSourceMapsAndWithoutComments,
                     visitor
                 );
             }
             else {
                 return createAssignment(
-                    getNamespaceMemberName(name),
-                    visitNode(node.initializer, visitor, isExpression)
+                    getNamespaceMemberNameWithSourceMapsAndWithoutComments(name),
+                    visitNode(node.initializer, visitor, isExpression),
+                    /*location*/ node
                 );
             }
         }
 
-        /**
-         * 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) {
-            if (shouldElideEnumDeclaration(node)) {
-                return undefined;
-            }
-
-            const savedCurrentNamespaceLocalName = currentNamespaceLocalName;
-            const statements: Statement[] = [];
-
-            let location: TextRange = node;
-            if (!isExported(node) || (isExternalModuleExport(node) && isFirstDeclarationOfKind(node, SyntaxKind.EnumDeclaration))) {
-                // Emit a VariableStatement if the enum is not exported, or is the first enum
-                // with the same name exported from an external module.
-                addNode(statements,
-                    createVariableStatement(
-                        visitNodes(node.modifiers, visitor, isModifier),
-                        createVariableDeclarationList([
-                            createVariableDeclaration(node.name)
-                        ]),
-                        location
-                    )
-                );
-                location = undefined;
-            }
-
-            const name = isNamespaceExport(node)
-                ? getNamespaceMemberName(node.name)
-                : getSynthesizedClone(node.name);
-
-            currentNamespaceLocalName = getGeneratedNameForNode(node);
-            addNode(statements,
-                 createStatement(
-                     createCall(
-                        createParen(
-                            createFunctionExpression(
-                                /*asteriskToken*/ undefined,
-                                /*name*/ undefined,
-                                [createParameter(currentNamespaceLocalName)],
-                                transformEnumBody(node)
-                            )
-                        ),
-                        [createLogicalOr(
-                            name,
-                            createAssignment(
-                                name,
-                                createObjectLiteral()
-                            )
-                        )]
-                     ),
-                    location
-                )
-            );
-
-            if (isNamespaceExport(node)) {
-                addNode(statements,
-                    createVariableStatement(
-                        /*modifiers*/ undefined,
-                        createVariableDeclarationList([
-                            createVariableDeclaration(node.name, name)
-                        ]),
-                        location
-                    )
-                );
-            }
-
-            currentNamespaceLocalName = savedCurrentNamespaceLocalName;
-            return createNodeArrayNode(statements);
-        }
-
-        /**
-         * Transforms the body of an enum declaration.
-         *
-         * @param node The enum declaration node.
-         */
-        function transformEnumBody(node: EnumDeclaration): Block {
-            const statements: Statement[] = [];
-            startLexicalEnvironment();
-            addNodes(statements, map(node.members, transformEnumMember));
-            addNodes(statements, endLexicalEnvironment());
-            return createBlock(statements);
-        }
-
-        /**
-         * Transforms an enum member into a statement.
-         *
-         * @param member The enum member node.
-         */
-        function transformEnumMember(member: EnumMember): Statement {
-            const name = getExpressionForPropertyName(member);
-            return createStatement(
-                createAssignment(
-                    createElementAccess(
-                        currentNamespaceLocalName,
-                        createAssignment(
-                            createElementAccess(
-                                currentNamespaceLocalName,
-                                name
-                            ),
-                            transformEnumMemberDeclarationValue(member)
-                        )
-                    ),
-                    name
-                ),
-                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 if (member.initializer) {
-                return visitNode(member.initializer, visitor, isExpression);
-            }
-            else {
-                return createVoidZero();
-            }
-        }
-
-        /**
-         * Determines whether to elide an enum declaration.
-         *
-         * @param node The enum declaration node.
-         */
-        function shouldElideEnumDeclaration(node: EnumDeclaration) {
-            return isConst(node)
-                && !compilerOptions.preserveConstEnums
-                && !compilerOptions.isolatedModules;
-        }
-
         /**
          * Visits an await expression.
          *
@@ -2306,50 +2293,276 @@ namespace ts {
          * @param node The parenthesized expression node.
          */
         function visitParenthesizedExpression(node: ParenthesizedExpression): Expression {
-            // Make sure we consider all nested cast expressions, e.g.:
-            // (<any><number><any>-A).x;
-            const expression = visitNode(node.expression, visitor, isExpression);
-            if (currentParent.kind !== SyntaxKind.ArrowFunction) {
-                // We have an expression of the form: (<Type>SubExpr)
-                // 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 (expression.kind !== SyntaxKind.PrefixUnaryExpression &&
-                    expression.kind !== SyntaxKind.VoidExpression &&
-                    expression.kind !== SyntaxKind.TypeOfExpression &&
-                    expression.kind !== SyntaxKind.DeleteExpression &&
-                    expression.kind !== SyntaxKind.PostfixUnaryExpression &&
-                    expression.kind !== SyntaxKind.NewExpression &&
-                    !(expression.kind === SyntaxKind.CallExpression && currentParent.kind === SyntaxKind.NewExpression) &&
-                    !(expression.kind === SyntaxKind.FunctionExpression && currentParent.kind === SyntaxKind.CallExpression) &&
-                    !(expression.kind === SyntaxKind.NumericLiteral && currentParent.kind === SyntaxKind.PropertyAccessExpression)) {
-                    return trackChildOfNotEmittedNode(node, expression, node.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 setOriginalNode(
-                createParen(expression, node),
-                node
-            );
+            return visitEachChild(node, visitor, context);
         }
 
         function visitAssertionExpression(node: AssertionExpression): Expression {
-            const expression = visitNode((<TypeAssertion | AsExpression>node).expression, visitor, isExpression);
-            return trackChildOfNotEmittedNode(node, expression, node.expression);
+            const expression = visitNode(node.expression, visitor, isExpression);
+            return createPartiallyEmittedExpression(expression, node);
         }
 
-        function trackChildOfNotEmittedNode<T extends Node>(parent: Node, child: T, original: T) {
-            if (!child.parent && !child.original) {
-                child = cloneNode(child, child, child.flags, child.parent, original);
+        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) {
+            statements.push(
+                createVariableStatement(
+                    /*modifiers*/ undefined,
+                    [createVariableDeclaration(
+                        getDeclarationName(node),
+                        getExportName(node)
+                    )],
+                    /*location*/ node
+                )
+            );
+        }
+
+        /**
+         * 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;
             }
 
-            setNodeEmitFlags(parent, NodeEmitFlags.IsNotEmittedNode);
-            setNodeEmitFlags(child, NodeEmitFlags.EmitCommentsOfNotEmittedParent);
-            return child;
+            const statements: Statement[] = [];
+            if (shouldEmitVarForEnumDeclaration(node)) {
+                addVarForEnumOrModuleDeclaration(statements, node);
+            }
+
+            const innerName = getNamespaceContainerName(node);
+            const paramName = getNamespaceParameterName(node);
+            const exportName = getExportName(node);
+
+            //  (function (x) {
+            //      x[x["y"] = 0] = "y";
+            //      ...
+            //  })(x || (x = {}));
+            statements.push(
+                setNodeEmitFlags(
+                    setOriginalNode(
+                        createStatement(
+                            createCall(
+                                createFunctionExpression(
+                                    /*asteriskToken*/ undefined,
+                                    /*name*/ undefined,
+                                    [createParameter(paramName)],
+                                    transformEnumBody(node, innerName)
+                                ),
+                                [createLogicalOr(
+                                    exportName,
+                                    createAssignment(
+                                        exportName,
+                                        createObjectLiteral()
+                                    )
+                                )]
+                            ),
+                            /*location*/ node
+                        ),
+                        /*original*/ node
+                    ),
+                    NodeEmitFlags.AdviseOnEmitNode
+                )
+            );
+
+            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();
+            addNodes(statements, map(node.members, transformEnumMember));
+            addNodes(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),
+                        /*initializer*/ undefined
+                    )
+                ]
+            );
+
+            // 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);
+            setOriginalNode(statement, /*original*/ node);
+            statements.push(statement);
         }
 
         /**
@@ -2359,53 +2572,48 @@ namespace ts {
          *
          * @param node The module declaration node.
          */
-        function visitModuleDeclaration(node: ModuleDeclaration) {
-            if (shouldElideModuleDeclaration(node)) {
-                return undefined;
+        function visitModuleDeclaration(node: ModuleDeclaration): VisitResult<Statement> {
+            if (!shouldEmitModuleDeclaration(node)) {
+                return createNotEmittedStatement(node);
             }
 
-            Debug.assert(isIdentifier(node.name));
+            Debug.assert(isIdentifier(node.name), "TypeScript module should have an Identifier name.");
+            enableSubstitutionForNamespaceExports();
 
-            enableExpressionSubstitutionForNamespaceExports();
-
-            const savedCurrentNamespaceLocalName = currentNamespaceLocalName;
-            const modifiers = visitNodes(node.modifiers, visitor, isModifier);
             const statements: Statement[] = [];
 
-            let location = node;
-            if (!isModuleMergedWithClass(node)) {
-                // var x;
-                statements.push(
-                    createVariableStatement(
-                        modifiers,
-                        createVariableDeclarationList([
-                            createVariableDeclaration(<Identifier>node.name)
-                        ]),
-                        location
+            if (shouldEmitVarForModuleDeclaration(node)) {
+                addVarForEnumOrModuleDeclaration(statements, node);
+            }
+
+            // `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()
                     )
                 );
-                location = undefined;
+
+            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);
             }
 
-            const name = isNamespaceExport(node)
-                ? getNamespaceMemberName(node.name)
-                : getSynthesizedClone(node.name);
-
-            let moduleParam: Expression = createLogicalOr(
-                name,
-                createAssignment(
-                    name,
-                    createObjectLiteral([])
-                )
-            );
-
-            if (isNamespaceExport(node)) {
-                moduleParam = createAssignment(cloneNode(node.name), moduleParam);
-            }
-
-            currentNamespaceLocalName = getGeneratedNameForNode(node);
-            currentNamespace = node;
-
             //  (function (x_1) {
             //      x_1.y = ...;
             //  })(x || (x = {}));
@@ -2414,25 +2622,23 @@ namespace ts {
                     setOriginalNode(
                         createStatement(
                             createCall(
-                                createParen(
-                                    createFunctionExpression(
-                                        /*asteriskToken*/ undefined,
-                                        /*name*/ undefined,
-                                        [createParameter(currentNamespaceLocalName)],
-                                        transformModuleBody(node)
-                                    )
+                                createFunctionExpression(
+                                    /*asteriskToken*/ undefined,
+                                    /*name*/ undefined,
+                                    [createParameter(parameterName)],
+                                    transformModuleBody(node, containerName)
                                 ),
-                                [moduleParam]
-                            )
+                                [moduleArg]
+                            ),
+                            /*location*/ node
                         ),
-                        node
+                        /*original*/ node
                     ),
                     NodeEmitFlags.AdviseOnEmitNode
                 )
             );
 
-            currentNamespaceLocalName = savedCurrentNamespaceLocalName;
-            return createNodeArrayNode(statements);
+            return statements;
         }
 
         /**
@@ -2440,37 +2646,71 @@ namespace ts {
          *
          * @param node The module declaration node.
          */
-        function transformModuleBody(node: ModuleDeclaration): Block {
+        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) {
                 addNodes(statements, visitNodes((<ModuleBlock>body).statements, namespaceElementVisitor, isStatement));
+                statementsLocation = (<ModuleBlock>body).statements;
+                blockLocation = body;
             }
             else {
                 addNode(statements, visitModuleDeclaration(<ModuleDeclaration>body));
+                const moduleBlock = <ModuleBlock>getInnerMostModuleDeclarationFromDottedModule(node).body;
+                statementsLocation = moveRangePos(moduleBlock.statements, -1);
             }
 
             addNodes(statements, endLexicalEnvironment());
-            return createBlock(statements);
+
+            currentNamespaceContainerName = savedCurrentNamespaceContainerName;
+            currentNamespace = savedCurrentNamespace;
+            const block = createBlock(
+                createNodeArray(
+                    statements,
+                    /*location*/ statementsLocation
+                ),
+                /*location*/ blockLocation,
+                /*multiLine*/ true
+            );
+
+            // TODO(rbuckton): This should be removed once source maps are aligned with the old
+            //                 emitter and new baselines are taken. This exists solely to
+            //                 align with the old emitter.
+            if (body.kind === SyntaxKind.ModuleBlock) {
+                setNodeEmitFlags(block, NodeEmitFlags.SourceMapEmitOpenBraceAsToken);
+            }
+
+            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 elide a module declaration.
+         * Determines whether to emit an import equals declaration.
          *
-         * @param node The module declaration node.
+         * @param node The import equals declaration node.
          */
-        function shouldElideModuleDeclaration(node: ModuleDeclaration) {
-            return !isInstantiatedModule(node, compilerOptions.preserveConstEnums || compilerOptions.isolatedModules);
-        }
-
-        /**
-         * Determines whether a module declaration has a name that merges with a class declaration.
-         *
-         * @param node The module declaration node.
-         */
-        function isModuleMergedWithClass(node: ModuleDeclaration) {
-            return !!(resolver.getNodeCheckFlags(getOriginalNode(node)) & NodeCheckFlags.LexicalModuleMergesWithClass);
+        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));
         }
 
         /**
@@ -2478,13 +2718,16 @@ namespace ts {
          *
          * @param node The import equals declaration node.
          */
-        function visitImportEqualsDeclaration(node: ImportEqualsDeclaration): OneOrMany<Statement> {
-            Debug.assert(!isExternalModuleImportEqualsDeclaration(node));
-            if (shouldElideImportEqualsDeclaration(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);
+            const moduleReference = createExpressionFromEntityName(<EntityName>node.moduleReference, { flags: NodeEmitFlags.NoComments });
             if (isNamedExternalModuleExport(node) || !isNamespaceExport(node)) {
                 //  export var ${name} = ${moduleReference};
                 //  var ${name} = ${moduleReference};
@@ -2492,7 +2735,10 @@ namespace ts {
                     createVariableStatement(
                         visitNodes(node.modifiers, visitor, isModifier),
                         createVariableDeclarationList([
-                            createVariableDeclaration(node.name, moduleReference)
+                            createVariableDeclaration(
+                                node.name,
+                                moduleReference
+                            )
                         ]),
                         node
                     ),
@@ -2503,7 +2749,7 @@ namespace ts {
                 // exports.${name} = ${moduleReference};
                 return setOriginalNode(
                     createNamespaceExport(
-                        getSynthesizedClone(node.name),
+                        node.name,
                         moduleReference,
                         node
                     ),
@@ -2512,35 +2758,13 @@ namespace ts {
             }
         }
 
-        /**
-         * Determines whether to elide an import equals declaration.
-         *
-         * @param node The import equals declaration node.
-         */
-        function shouldElideImportEqualsDeclaration(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));
-        }
-
-        /**
-         * Gets a value indicating whether the node is exported.
-         *
-         * @param node The node to test.
-         */
-        function isExported(node: Node) {
-            return (node.flags & NodeFlags.Export) !== 0;
-        }
-
         /**
          * 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 && isExported(node);
+            return currentNamespace !== undefined && hasModifier(node, ModifierFlags.Export);
         }
 
         /**
@@ -2549,7 +2773,7 @@ namespace ts {
          * @param node The node to test.
          */
         function isExternalModuleExport(node: Node) {
-            return currentNamespace === undefined && isExported(node);
+            return currentNamespace === undefined && hasModifier(node, ModifierFlags.Export);
         }
 
         /**
@@ -2559,7 +2783,7 @@ namespace ts {
          */
         function isNamedExternalModuleExport(node: Node) {
             return isExternalModuleExport(node)
-                && (node.flags & NodeFlags.Default) === 0;
+                && !hasModifier(node, ModifierFlags.Default);
         }
 
         /**
@@ -2569,18 +2793,7 @@ namespace ts {
          */
         function isDefaultExternalModuleExport(node: Node) {
             return isExternalModuleExport(node)
-                && (node.flags & NodeFlags.Default) !== 0;
-        }
-
-        /**
-         * 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.
-         */
-        function isFirstDeclarationOfKind(node: Declaration, kind: SyntaxKind) {
-            const original = getOriginalNode(node);
-            return original.symbol && getDeclarationOfKind(original.symbol, kind) === original;
+                && hasModifier(node, ModifierFlags.Default);
         }
 
         /**
@@ -2590,10 +2803,23 @@ namespace ts {
             return createStatement(expression, /*location*/ undefined);
         }
 
+        function addExportMemberAssignment(statements: Statement[], node: DeclarationStatement) {
+            statements.push(
+                createStatement(
+                    createAssignment(
+                        getExportName(node),
+                        getLocalName(node, /*noSourceMaps*/ true),
+                        /*location*/ createRange(node.name.pos, node.end)
+                    ),
+                    /*location*/ createRange(-1, node.end)
+                )
+            );
+        }
+
         function createNamespaceExport(exportName: Identifier, exportValue: Expression, location?: TextRange) {
             return createStatement(
                 createAssignment(
-                    getNamespaceMemberName(exportName),
+                    getNamespaceMemberName(exportName, /*allowComments*/ false, /*allowSourceMaps*/ true),
                     exportValue
                 ),
                 location
@@ -2608,12 +2834,116 @@ namespace ts {
             );
         }
 
-        function getNamespaceMemberName(name: Identifier): Expression {
-            return createPropertyAccess(currentNamespaceLocalName, getSynthesizedClone(name));
+        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 getDeclarationName(node: ClassExpression | ClassDeclaration | FunctionDeclaration | EnumDeclaration) {
-            return node.name ? getSynthesizedClone(node.name) : getGeneratedNameForNode(node);
+        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 = getUniqueClone(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 getDeclarationNameExpression(node: DeclarationStatement) {
+            const name = getDeclarationName(node);
+            if (isNamespaceExport(node)) {
+                return getNamespaceMemberName(name);
+            }
+            else {
+                // We set the "ExportName" flag to indicate to any module transformer
+                // downstream that any `exports.` prefix should be added.
+                setNodeEmitFlags(name, getNodeEmitFlags(name) | NodeEmitFlags.ExportName);
+                return name;
+            }
         }
 
         function getClassPrototype(node: ClassExpression | ClassDeclaration) {
@@ -2621,11 +2951,66 @@ namespace ts {
         }
 
         function getClassMemberPrefix(node: ClassExpression | ClassDeclaration, member: ClassElement) {
-            return member.flags & NodeFlags.Static
+            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 enableSubstitutionForDecoratedClasses() {
+            if ((enabledSubstitutions & TypeScriptSubstitutionFlags.DecoratedClasses) === 0) {
+                enabledSubstitutions |= TypeScriptSubstitutionFlags.DecoratedClasses;
+
+                // We need to enable substitutions for identifiers. This allows us to
+                // substitute class names inside of a class declaration.
+                context.enableSubstitution(SyntaxKind.Identifier);
+                context.enableEmitNotification(SyntaxKind.Identifier);
+
+                // Keep track of class aliases.
+                decoratedClassAliases = {};
+                currentDecoratedClassAliases = {};
+            }
+        }
+
+        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 isClassWithDecorators(node: Node): node is ClassDeclaration {
             return node.kind === SyntaxKind.ClassDeclaration && node.decorators !== undefined;
         }
@@ -2643,14 +3028,32 @@ namespace ts {
             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 savedIsEnclosedInNamespace = isEnclosedInNamespace;
+            const savedApplicableSubstitutions = applicableSubstitutions;
             const savedCurrentSuperContainer = currentSuperContainer;
 
             // If we need support substitutions for aliases for decorated classes,
             // we should enable it here.
-            if (enabledSubstitutions & TypeScriptSubstitutionFlags.DecoratedClasses && isClassWithDecorators(node)) {
-                currentDecoratedClassAliases[getOriginalNodeId(node)] = decoratedClassAliases[getOriginalNodeId(node)];
+            if (enabledSubstitutions & TypeScriptSubstitutionFlags.DecoratedClasses) {
+                if (isClassWithDecorators(node)) {
+                    currentDecoratedClassAliases[getOriginalNodeId(node)] = decoratedClassAliases[getOriginalNodeId(node)];
+                }
+                else if (node.kind === SyntaxKind.Identifier) {
+                    const declaration = resolver.getReferencedValueDeclaration(<Identifier>node)
+                    if (declaration && isClassWithDecorators(declaration)) {
+                        currentDecoratedClassAliases[getOriginalNodeId(declaration)] = decoratedClassAliases[getOriginalNodeId(declaration)];
+                    }
+                }
             }
 
             // If we need to support substitutions for `super` in an async method,
@@ -2660,7 +3063,10 @@ namespace ts {
             }
 
             if (enabledSubstitutions & TypeScriptSubstitutionFlags.NamespaceExports && isTransformedModuleDeclaration(node)) {
-                isEnclosedInNamespace = true;
+                applicableSubstitutions |= TypeScriptSubstitutionFlags.NamespaceExports;
+            }
+            if (enabledSubstitutions & TypeScriptSubstitutionFlags.NonQualifiedEnumMembers && isTransformedEnumDeclaration(node)) {
+                applicableSubstitutions |= TypeScriptSubstitutionFlags.NonQualifiedEnumMembers;
             }
 
             previousOnEmitNode(node, emit);
@@ -2669,13 +3075,47 @@ namespace ts {
                 currentDecoratedClassAliases[getOriginalNodeId(node)] = undefined;
             }
 
-            isEnclosedInNamespace = savedIsEnclosedInNamespace;
+            applicableSubstitutions = savedApplicableSubstitutions;
             currentSuperContainer = savedCurrentSuperContainer;
         }
 
-        function substituteExpression(node: Expression): Expression {
-            node = previousExpressionSubstitution(node);
+        /**
+         * 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);
@@ -2696,37 +3136,47 @@ namespace ts {
         }
 
         function substituteExpressionIdentifier(node: Identifier): Expression {
+            return trySubstituteDecoratedClassName(node)
+                || trySubstituteNamespaceExportedName(node)
+                || node;
+        }
+
+        function trySubstituteDecoratedClassName(node: Identifier): Expression {
             if (enabledSubstitutions & TypeScriptSubstitutionFlags.DecoratedClasses) {
-                const original = getOriginalNode(node);
-                if (isIdentifier(original)) {
-                    if (resolver.getNodeCheckFlags(original) & NodeCheckFlags.SelfReferenceInDecoratedClass) {
-                        // 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(original);
-                        if (declaration) {
-                            const classAlias = currentDecoratedClassAliases[getNodeId(declaration)];
-                            if (classAlias) {
-                                return cloneNode(classAlias);
-                            }
+                if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.SelfReferenceInDecoratedClass) {
+                    // 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 = currentDecoratedClassAliases[getNodeId(declaration)];
+                        if (classAlias) {
+                            return getSynthesizedClone(classAlias, { sourceMapRange: node, commentRange: node });
                         }
                     }
                 }
             }
 
-            if (enabledSubstitutions & TypeScriptSubstitutionFlags.NamespaceExports && isEnclosedInNamespace) {
+            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 original = getOriginalNode(node);
-                if (isIdentifier(original) && original.parent) {
-                    const container = resolver.getReferencedExportContainer(original);
-                    if (container && container.kind === SyntaxKind.ModuleDeclaration) {
+                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 node;
+            return undefined;
         }
 
         function substituteCallExpression(node: CallExpression): Expression {
@@ -2779,52 +3229,6 @@ namespace ts {
             return node;
         }
 
-        function enableExpressionSubstitutionForAsyncMethodsWithSuper() {
-            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.enableExpressionSubstitution(SyntaxKind.CallExpression);
-                context.enableExpressionSubstitution(SyntaxKind.PropertyAccessExpression);
-                context.enableExpressionSubstitution(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 enableExpressionSubstitutionForDecoratedClasses() {
-            if ((enabledSubstitutions & TypeScriptSubstitutionFlags.DecoratedClasses) === 0) {
-                enabledSubstitutions |= TypeScriptSubstitutionFlags.DecoratedClasses;
-
-                // We need to enable substitutions for identifiers. This allows us to
-                // substitute class names inside of a class declaration.
-                context.enableExpressionSubstitution(SyntaxKind.Identifier);
-
-                // Keep track of class aliases.
-                decoratedClassAliases = {};
-                currentDecoratedClassAliases = {};
-            }
-        }
-
-        function enableExpressionSubstitutionForNamespaceExports() {
-            if ((enabledSubstitutions & TypeScriptSubstitutionFlags.NamespaceExports) === 0) {
-                enabledSubstitutions |= TypeScriptSubstitutionFlags.NamespaceExports;
-
-                // We need to enable substitutions for identifiers. This allows us to
-                // substitute the names of exported members of a namespace.
-                context.enableExpressionSubstitution(SyntaxKind.Identifier);
-
-                // We need to be notified when entering and exiting namespaces.
-                context.enableEmitNotification(SyntaxKind.ModuleDeclaration);
-            }
-        }
-
         function createSuperAccessInAsyncMethod(argumentExpression: Expression, flags: NodeCheckFlags, location: TextRange): LeftHandSideExpression {
             if (flags & NodeCheckFlags.AsyncMethodWithSuperBinding) {
                 return createPropertyAccess(
@@ -2847,7 +3251,7 @@ namespace ts {
 
         function getSuperContainerAsyncMethodFlags() {
             return currentSuperContainer !== undefined
-                && resolver.getNodeCheckFlags(getOriginalNode(currentSuperContainer)) & (NodeCheckFlags.AsyncMethodWithSuper | NodeCheckFlags.AsyncMethodWithSuperBinding);
+                && resolver.getNodeCheckFlags(currentSuperContainer) & (NodeCheckFlags.AsyncMethodWithSuper | NodeCheckFlags.AsyncMethodWithSuperBinding);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
index 398c87aab2b..7c9fae6b632 100644
--- a/src/compiler/tsc.ts
+++ b/src/compiler/tsc.ts
@@ -14,6 +14,20 @@ namespace ts {
         }
     }
 
+    function reportEmittedFiles(files: string[], host: CompilerHost): void {
+        if (!files || files.length == 0) {
+            return;
+        }
+
+        const currentDir = sys.getCurrentDirectory();
+
+        for (const file of files) {
+            const filepath = getNormalizedAbsolutePath(file, currentDir);
+
+            sys.write(`TSFILE: ${filepath}${sys.newLine}`);
+        }
+    }
+
     /**
      * Checks to see if the locale is in the appropriate format,
      * and if it is, attempts to set the appropriate language.
@@ -108,14 +122,13 @@ namespace ts {
         sys.write(output);
     }
 
-
     const redForegroundEscapeSequence = "\u001b[91m";
     const yellowForegroundEscapeSequence = "\u001b[93m";
     const blueForegroundEscapeSequence = "\u001b[93m";
     const gutterStyleSequence = "\u001b[100;30m";
     const gutterSeparator = " ";
     const resetEscapeSequence = "\u001b[0m";
-    const elipsis = "...";
+    const ellipsis = "...";
     const categoryFormatMap: Map<string> = {
         [DiagnosticCategory.Warning]: yellowForegroundEscapeSequence,
         [DiagnosticCategory.Error]: redForegroundEscapeSequence,
@@ -139,7 +152,7 @@ namespace ts {
             const hasMoreThanFiveLines = (lastLine - firstLine) >= 4;
             let gutterWidth = (lastLine + 1 + "").length;
             if (hasMoreThanFiveLines) {
-                gutterWidth = Math.max(elipsis.length, gutterWidth);
+                gutterWidth = Math.max(ellipsis.length, gutterWidth);
             }
 
             output += sys.newLine;
@@ -147,7 +160,7 @@ namespace ts {
                 // If the error spans over 5 lines, we'll only show the first 2 and last 2 lines,
                 // so we'll skip ahead to the second-to-last line.
                 if (hasMoreThanFiveLines && firstLine + 1 < i && i < lastLine - 1) {
-                    output += formatAndReset(padLeft(elipsis, gutterWidth), gutterStyleSequence) + gutterSeparator + sys.newLine;
+                    output += formatAndReset(padLeft(ellipsis, gutterWidth), gutterStyleSequence) + gutterSeparator + sys.newLine;
                     i = lastLine - 1;
                 }
 
@@ -327,21 +340,19 @@ namespace ts {
             return sys.exit(ExitStatus.Success);
         }
 
-        // Firefox has Object.prototype.watch
-        if (commandLine.options.watch && commandLine.options.hasOwnProperty("watch")) {
+        if (isWatchSet(commandLine.options)) {
             if (!sys.watchFile) {
                 reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_current_host_does_not_support_the_0_option, "--watch"), /* compilerHost */ undefined);
                 return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
             }
             if (configFileName) {
-                const configFilePath = toPath(configFileName, sys.getCurrentDirectory(), createGetCanonicalFileName(sys.useCaseSensitiveFileNames));
-                configFileWatcher = sys.watchFile(configFilePath, configFileChanged);
+                configFileWatcher = sys.watchFile(configFileName, configFileChanged);
             }
             if (sys.watchDirectory && configFileName) {
                 const directory = ts.getDirectoryPath(configFileName);
                 directoryWatcher = sys.watchDirectory(
                     // When the configFileName is just "tsconfig.json", the watched directory should be
-                    // the current direcotry; if there is a given "project" parameter, then the configFileName
+                    // the current directory; if there is a given "project" parameter, then the configFileName
                     // is an absolute file name.
                     directory == "" ? "." : directory,
                     watchedDirectoryChanged, /*recursive*/ true);
@@ -376,12 +387,16 @@ namespace ts {
                 sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
                 return;
             }
-            const configParseResult = parseJsonConfigFileContent(configObject, sys, getNormalizedAbsolutePath(getDirectoryPath(configFileName), sys.getCurrentDirectory()), commandLine.options);
+            const configParseResult = parseJsonConfigFileContent(configObject, sys, getNormalizedAbsolutePath(getDirectoryPath(configFileName), sys.getCurrentDirectory()), commandLine.options, configFileName);
             if (configParseResult.errors.length > 0) {
                 reportDiagnostics(configParseResult.errors, /* compilerHost */ undefined);
                 sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
                 return;
             }
+            if (isWatchSet(configParseResult.options) && !sys.watchFile) {
+                reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_current_host_does_not_support_the_0_option, "--watch"), /* compilerHost */ undefined);
+                sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
+            }
             return configParseResult;
         }
 
@@ -415,7 +430,7 @@ namespace ts {
 
             const compileResult = compile(rootFileNames, compilerOptions, compilerHost);
 
-            if (!compilerOptions.watch) {
+            if (!isWatchSet(compilerOptions)) {
                 return sys.exit(compileResult.exitStatus);
             }
 
@@ -441,10 +456,9 @@ namespace ts {
             }
             // Use default host function
             const sourceFile = hostGetSourceFile(fileName, languageVersion, onError);
-            if (sourceFile && compilerOptions.watch) {
+            if (sourceFile && isWatchSet(compilerOptions) && sys.watchFile) {
                 // Attach a file watcher
-                const filePath = toPath(sourceFile.fileName, sys.getCurrentDirectory(), createGetCanonicalFileName(sys.useCaseSensitiveFileNames));
-                sourceFile.fileWatcher = sys.watchFile(filePath, (fileName: string, removed?: boolean) => sourceFileChanged(sourceFile, removed));
+                sourceFile.fileWatcher = sys.watchFile(sourceFile.fileName, (fileName: string, removed?: boolean) => sourceFileChanged(sourceFile, removed));
             }
             return sourceFile;
         }
@@ -486,7 +500,7 @@ namespace ts {
         }
 
         function watchedDirectoryChanged(fileName: string) {
-            if (fileName && !ts.isSupportedSourceFileName(fileName, commandLine.options)) {
+            if (fileName && !ts.isSupportedSourceFileName(fileName, compilerOptions)) {
                 return;
             }
 
@@ -590,30 +604,23 @@ namespace ts {
                 }
             }
 
-            reportDiagnostics(diagnostics, compilerHost);
-
-            // If the user doesn't want us to emit, then we're done at this point.
-            if (compilerOptions.noEmit) {
-                return diagnostics.length
-                    ? ExitStatus.DiagnosticsPresent_OutputsSkipped
-                    : ExitStatus.Success;
-            }
-
             // Otherwise, emit and report any errors we ran into.
             const emitOutput = program.emit();
-            reportDiagnostics(emitOutput.diagnostics, compilerHost);
+            diagnostics = diagnostics.concat(emitOutput.diagnostics);
 
-            // If the emitter didn't emit anything, then pass that value along.
-            if (emitOutput.emitSkipped) {
+            reportDiagnostics(sortAndDeduplicateDiagnostics(diagnostics), compilerHost);
+
+            reportEmittedFiles(emitOutput.emittedFiles, compilerHost);
+
+            if (emitOutput.emitSkipped && diagnostics.length > 0) {
+                // If the emitter didn't emit anything, then pass that value along.
                 return ExitStatus.DiagnosticsPresent_OutputsSkipped;
             }
-
-            // The emitter emitted something, inform the caller if that happened in the presence
-            // of diagnostics or not.
-            if (diagnostics.length > 0 || emitOutput.diagnostics.length > 0) {
+            else if (diagnostics.length > 0) {
+                // The emitter emitted something, inform the caller if that happened in the presence
+                // of diagnostics or not.
                 return ExitStatus.DiagnosticsPresent_OutputsGenerated;
             }
-
             return ExitStatus.Success;
         }
     }
@@ -656,6 +663,8 @@ namespace ts {
         const usageColumn: string[] = []; // Things like "-d, --declaration" go in here.
         const descriptionColumn: string[] = [];
 
+        const optionsDescriptionMap: Map<string[]> = {};  // Map between option.description and list of option.type if it is a kind
+
         for (let i = 0; i < optsList.length; i++) {
             const option = optsList[i];
 
@@ -676,7 +685,22 @@ namespace ts {
             usageText += getParamType(option);
 
             usageColumn.push(usageText);
-            descriptionColumn.push(getDiagnosticText(option.description));
+            let description: string;
+
+            if (option.name === "lib") {
+                description = getDiagnosticText(option.description);
+                const options: string[] = [];
+                const element = (<CommandLineOptionOfListType>option).element;
+                forEachKey(<Map<number | string>>element.type, key => {
+                    options.push(`'${key}'`);
+                });
+                optionsDescriptionMap[description] = options;
+            }
+            else {
+                description = getDiagnosticText(option.description);
+            }
+
+            descriptionColumn.push(description);
 
             // Set the new margin for the description column if necessary.
             marginLength = Math.max(usageText.length, marginLength);
@@ -692,7 +716,16 @@ namespace ts {
         for (let i = 0; i < usageColumn.length; i++) {
             const usage = usageColumn[i];
             const description = descriptionColumn[i];
+            const kindsList = optionsDescriptionMap[description];
             output += usage + makePadding(marginLength - usage.length + 2) + description + sys.newLine;
+
+            if (kindsList) {
+                output += makePadding(marginLength + 4);
+                for (const kind of kindsList) {
+                    output += kind + " ";
+                }
+                output += sys.newLine;
+            }
         }
 
         sys.write(output);
@@ -719,14 +752,19 @@ namespace ts {
         else {
             const compilerOptions = extend(options, defaultInitCompilerOptions);
             const configurations: any = {
-                compilerOptions: serializeCompilerOptions(compilerOptions),
-                exclude: ["node_modules"]
+                compilerOptions: serializeCompilerOptions(compilerOptions)
             };
 
             if (fileNames && fileNames.length) {
                 // only set the files property if we have at least one file
                 configurations.files = fileNames;
             }
+            else {
+                configurations.exclude = ["node_modules"];
+                if (compilerOptions.outDir) {
+                    configurations.exclude.push(compilerOptions.outDir);
+                }
+            }
 
             sys.writeFile(file, JSON.stringify(configurations, undefined, 4));
             reportDiagnostic(createCompilerDiagnostic(Diagnostics.Successfully_created_a_tsconfig_json_file), /* compilerHost */ undefined);
@@ -777,7 +815,7 @@ namespace ts {
     }
 }
 
-if (ts.sys.developmentMode && ts.sys.tryEnableSourceMapsForHost) {
+if (ts.sys.tryEnableSourceMapsForHost && /^development$/i.test(ts.sys.getEnvironmentVariable("NODE_ENV"))) {
     ts.sys.tryEnableSourceMapsForHost();
 }
 
diff --git a/src/compiler/tsconfig.json b/src/compiler/tsconfig.json
index 07b59ab67bd..256a608155f 100644
--- a/src/compiler/tsconfig.json
+++ b/src/compiler/tsconfig.json
@@ -1,6 +1,5 @@
 {
     "compilerOptions": {
-        "module": "commonjs",
         "noImplicitAny": true,
         "removeComments": true,
         "preserveConstEnums": true,
@@ -8,9 +7,9 @@
         "sourceMap": true
     },
     "files": [
+        "types.ts",
         "core.ts",
         "sys.ts",
-        "types.ts",
         "diagnosticInformationMap.generated.ts",
         "scanner.ts",
         "parser.ts",
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 0802dfe8b6d..9e9b9e85fd8 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -1,3 +1,4 @@
+
 namespace ts {
     export interface Map<T> {
         [index: string]: T;
@@ -20,7 +21,6 @@ namespace ts {
     export interface TextRange {
         pos: number;
         end: number;
-        /* @internal */ disableSourceMap?: boolean; // Whether a synthesized text range disables source maps for its contents (used by transforms).
     }
 
     // token > SyntaxKind.Identifer => token is a keyword
@@ -171,6 +171,7 @@ namespace ts {
         StringKeyword,
         SymbolKeyword,
         TypeKeyword,
+        UndefinedKeyword,
         FromKeyword,
         GlobalKeyword,
         OfKeyword, // LastKeyword and LastToken
@@ -240,6 +241,7 @@ namespace ts {
         OmittedExpression,
         ExpressionWithTypeArguments,
         AsExpression,
+        NonNullExpression,
 
         // Misc
         TemplateSpan,
@@ -274,6 +276,7 @@ namespace ts {
         ModuleDeclaration,
         ModuleBlock,
         CaseBlock,
+        GlobalModuleExportDeclaration,
         ImportEqualsDeclaration,
         ImportDeclaration,
         ImportClause,
@@ -342,7 +345,11 @@ namespace ts {
 
         // Synthesized list
         SyntaxList,
-        NodeArrayNode,
+
+        // Transformation nodes
+        NotEmittedStatement,
+        PartiallyEmittedExpression,
+
         // Enum value count
         Count,
         // Markers
@@ -373,18 +380,9 @@ namespace ts {
 
     export const enum NodeFlags {
         None =               0,
-        Export =             1 << 0,  // Declarations
-        Ambient =            1 << 1,  // Declarations
-        Public =             1 << 2,  // Property/Method
-        Private =            1 << 3,  // Property/Method
-        Protected =          1 << 4,  // Property/Method
-        Static =             1 << 5,  // Property/Method
-        Readonly =           1 << 6,  // Property/Method
-        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
+        Let =                1 << 0,   // Variable declaration
+        Const =              1 << 1,   // Variable declaration
+        NestedNamespace =    1 << 2,   // Namespace declaration
         Namespace =          1 << 12,  // Namespace declaration
         ExportContext =      1 << 13,  // Export context (initialized by binding)
         ContainsThis =       1 << 14,  // Interface contains references to "this"
@@ -403,36 +401,50 @@ namespace ts {
         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,
 
-        Modifier = Export | Ambient | Public | Private | Protected | Static | Abstract | Default | Async,
-        AccessibilityModifier = Public | Private | Protected,
         BlockScoped = Let | Const,
 
         ReachabilityCheckFlags = HasImplicitReturn | HasExplicitReturn,
         EmitHelperFlags = HasClassExtends | HasDecorators | HasParamDecorators | HasAsyncFunctions,
 
         // Parsing context flags
-        ContextFlags = DisallowInContext | YieldContext | DecoratorContext | AwaitContext,
+        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
+        Public =             1 << 2,  // Property/Method
+        Private =            1 << 3,  // Property/Method
+        Protected =          1 << 4,  // Property/Method
+        Static =             1 << 5,  // Property/Method
+        Readonly =           1 << 6,  // Property/Method
+        Abstract =           1 << 7,  // Class/Method/ConstructSignature
+        Async =              1 << 8,  // Property/Method/Function
+        Default =            1 << 9,  // Function/Class (export default declaration)
+        Const =              1 << 11, // Variable declaration
+
+        HasComputedFlags =   1 << 31, // Modifier flags have been computed
+
+        AccessibilityModifier = Public | Private | Protected,
+        NonPublicAccessibilityModifier = Private | Protected,
+    }
+
     export const enum JsxFlags {
         None = 0,
         /** An element from a named property of the JSX.IntrinsicElements interface */
         IntrinsicNamedElement = 1 << 0,
         /** An element inferred from the string index signature of the JSX.IntrinsicElements interface */
         IntrinsicIndexedElement = 1 << 1,
-        /** An element backed by a class, class-like, or function value */
-        ValueElement = 1 << 2,
-        /** Element resolution failed */
-        UnknownElement = 1 << 4,
 
         IntrinsicElement = IntrinsicNamedElement | IntrinsicIndexedElement,
     }
 
-
     /* @internal */
     export const enum RelationComparisonResult {
         Succeeded = 1, // Should be truthy
@@ -443,10 +455,11 @@ namespace ts {
     export interface Node extends TextRange {
         kind: SyntaxKind;
         flags: NodeFlags;
+        /* @internal */ modifierFlagsCache?: ModifierFlags;
         /* @internal */ transformFlags?: TransformFlags;
         /* @internal */ excludeTransformFlags?: 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)
         /* @internal */ original?: Node;                // The original node if this is an updated node.
@@ -456,35 +469,13 @@ namespace ts {
         /* @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)
-    }
-
-    export const enum ArrayKind {
-        NodeArray = 1,
-        ModifiersArray = 2,
+        /* @internal */ emitOptions?: NodeEmitOptions;  // Options used to control node emit (used by transforms, should never be set directly on a source tree node)
     }
 
     export interface NodeArray<T extends Node> extends Array<T>, TextRange {
-        arrayKind: ArrayKind;
         hasTrailingComma?: boolean;
     }
 
-    /**
-     * A NodeArrayNode is a transient node used during transformations to indicate that more than
-     * one node will substitute a single node in the source. When the source is a NodeArray (as
-     * part of a call to `visitNodes`), the nodes of a NodeArrayNode will be spread into the
-     * result array. When the source is a Node (as part of a call to `visitNode`), the NodeArrayNode
-     * must be converted into a compatible node via the `lift` callback.
-     */
-    /* @internal */
-    // @kind(SyntaxKind.NodeArrayNode)
-    export interface NodeArrayNode<T extends Node> extends Node {
-        nodes: NodeArray<T>;
-    }
-
-    export interface ModifiersArray extends NodeArray<Modifier> {
-        flags: number;
-    }
-
     // @kind(SyntaxKind.AbstractKeyword)
     // @kind(SyntaxKind.AsyncKeyword)
     // @kind(SyntaxKind.ConstKeyword)
@@ -497,6 +488,7 @@ namespace ts {
     // @kind(SyntaxKind.StaticKeyword)
     export interface Modifier extends Node { }
 
+    /*@internal*/
     export const enum GeneratedIdentifierKind {
         None,   // Not automatically generated.
         Auto,   // Automatically generated identifier.
@@ -507,9 +499,14 @@ namespace ts {
 
     // @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
-        autoGenerateKind?: GeneratedIdentifierKind;    // Specifies whether to auto-generate the text for an identifier.
+        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.
+    }
+
+    // Transient identifier node (marked by id === -1)
+    export interface TransientIdentifier extends Identifier {
+        resolvedSymbol: Symbol;
     }
 
     // @kind(SyntaxKind.QualifiedName)
@@ -820,6 +817,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.
@@ -837,6 +836,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;
     }
@@ -1014,6 +1021,8 @@ namespace ts {
         name: Identifier;
     }
 
+    export type IdentifierOrPropertyAccess = Identifier | PropertyAccessExpression;
+
     // @kind(SyntaxKind.ElementAccessExpression)
     export interface ElementAccessExpression extends MemberExpression {
         expression: LeftHandSideExpression;
@@ -1058,6 +1067,11 @@ namespace ts {
 
     export type AssertionExpression = TypeAssertion | AsExpression;
 
+    // @kind(SyntaxKind.NonNullExpression)
+    export interface NonNullExpression extends LeftHandSideExpression {
+        expression: Expression;
+    }
+
     /// A JSX expression of the form <TagName attrs>...</TagName>
     // @kind(SyntaxKind.JsxElement)
     export interface JsxElement extends PrimaryExpression {
@@ -1089,7 +1103,7 @@ namespace ts {
     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)
@@ -1118,6 +1132,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 { }
 
@@ -1260,6 +1281,8 @@ namespace ts {
         block: Block;
     }
 
+    export type DeclarationWithTypeParameters = SignatureDeclaration | ClassLikeDeclaration | InterfaceDeclaration | TypeAliasDeclaration;
+
     export interface ClassLikeDeclaration extends Declaration {
         name?: Identifier;
         typeParameters?: NodeArray<TypeParameterDeclaration>;
@@ -1382,6 +1405,12 @@ namespace ts {
         name: Identifier;
     }
 
+    // @kind(SyntaxKind.GlobalModuleImport)
+    export interface GlobalModuleExportDeclaration extends DeclarationStatement {
+        name: Identifier;
+        moduleReference: LiteralLikeNode;
+    }
+
     // @kind(SyntaxKind.ExportDeclaration)
     export interface ExportDeclaration extends DeclarationStatement {
         exportClause?: NamedExports;
@@ -1571,6 +1600,7 @@ namespace ts {
         amdDependencies: AmdDependency[];
         moduleName: string;
         referencedFiles: FileReference[];
+        typeReferenceDirectives: FileReference[];
         languageVariant: LanguageVariant;
         isDeclarationFile: boolean;
 
@@ -1589,11 +1619,14 @@ namespace ts {
         hasNoDefaultLib: boolean;
 
         languageVersion: ScriptTarget;
+        /* @internal */ scriptKind: ScriptKind;
 
         // The first node that causes this file to be an external module
         /* @internal */ externalModuleIndicator: Node;
         // The first node that causes this file to be a CommonJS module
         /* @internal */ commonJsModuleIndicator: Node;
+        // True if the file was a root file in a compilation or a /// reference targets
+        /* @internal */ wasReferenced?: boolean;
 
         /* @internal */ identifiers: Map<string>;
         /* @internal */ nodeCount: number;
@@ -1613,8 +1646,9 @@ namespace ts {
         /* @internal */ classifiableNames?: Map<string>;
         // Stores a mapping 'external module reference text' -> 'resolved file name' | undefined
         // It is used to resolve module names in the checker.
-        // Content of this fiels should never be used directly - use getResolvedModuleFileName/setResolvedModuleFileName functions instead
+        // Content of this field should never be used directly - use getResolvedModuleFileName/setResolvedModuleFileName functions instead
         /* @internal */ resolvedModules: Map<ResolvedModule>;
+        /* @internal */ resolvedTypeReferenceDirectiveNames: Map<ResolvedTypeReferenceDirective>;
         /* @internal */ imports: LiteralExpression[];
         /* @internal */ moduleAugmentations: LiteralExpression[];
     }
@@ -1630,7 +1664,7 @@ namespace ts {
     }
 
     export interface WriteFileCallback {
-        (fileName: string, data: string, writeByteOrderMark: boolean, onError?: (message: string) => void): void;
+        (fileName: string, data: string, writeByteOrderMark: boolean, onError?: (message: string) => void, sourceFiles?: SourceFile[]): void;
     }
 
     export class OperationCanceledException { }
@@ -1691,6 +1725,7 @@ namespace ts {
         /* @internal */ getTypeCount(): number;
 
         /* @internal */ getFileProcessingDiagnostics(): DiagnosticCollection;
+        /* @internal */ getResolvedTypeReferenceDirectives(): Map<ResolvedTypeReferenceDirective>;
         // For testing purposes only.
         /* @internal */ structureIsReused?: boolean;
     }
@@ -1739,7 +1774,9 @@ namespace ts {
 
     export interface EmitResult {
         emitSkipped: boolean;
+        /** Contains declaration emit diagnostics */
         diagnostics: Diagnostic[];
+        emittedFiles: string[]; // Array of files the compiler wrote to disk
         /* @internal */ sourceMaps: SourceMapData[];  // Array of sourceMapData if compiler emitted sourcemaps
     }
 
@@ -1749,6 +1786,7 @@ namespace ts {
 
         getSourceFiles(): SourceFile[];
         getSourceFile(fileName: string): SourceFile;
+        getResolvedTypeReferenceDirectives(): Map<ResolvedTypeReferenceDirective>;
     }
 
     export interface TypeChecker {
@@ -1766,6 +1804,7 @@ namespace ts {
         getSymbolsOfParameterPropertyDeclaration(parameter: ParameterDeclaration, parameterName: string): Symbol[];
         getShorthandAssignmentValueSymbol(location: Node): Symbol;
         getExportSpecifierLocalTargetSymbol(location: ExportSpecifier): Symbol;
+        getPropertySymbolOfDestructuringAssignment(location: Identifier): Symbol;
         getTypeAtLocation(node: Node): Type;
         typeToString(type: Type, enclosingDeclaration?: Node, flags?: TypeFormatFlags): string;
         symbolToString(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags): string;
@@ -1807,8 +1846,9 @@ namespace ts {
         buildSignatureDisplay(signatures: Signature, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags, kind?: SignatureKind): void;
         buildParameterDisplay(parameter: Symbol, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
         buildTypeParameterDisplay(tp: TypeParameter, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
-        buildTypeParameterDisplayFromSymbol(symbol: Symbol, writer: SymbolWriter, enclosingDeclaraiton?: Node, flags?: TypeFormatFlags): void;
-        buildDisplayForParametersAndDelimiters(parameters: Symbol[], writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
+        buildTypePredicateDisplay(predicate: TypePredicate, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
+        buildTypeParameterDisplayFromSymbol(symbol: Symbol, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
+        buildDisplayForParametersAndDelimiters(thisType: Type, parameters: Symbol[], writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
         buildDisplayForTypeParametersAndDelimiters(typeParameters: TypeParameter[], writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
         buildReturnTypeDisplay(signature: Signature, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
     }
@@ -1872,22 +1912,24 @@ namespace ts {
         Identifier
     }
 
-    export interface TypePredicate {
+    export interface TypePredicateBase {
         kind: TypePredicateKind;
         type: Type;
     }
 
     // @kind (TypePredicateKind.This)
-    export interface ThisTypePredicate extends TypePredicate {
+    export interface ThisTypePredicate extends TypePredicateBase {
         _thisTypePredicateBrand: any;
     }
 
     // @kind (TypePredicateKind.Identifier)
-    export interface IdentifierTypePredicate extends TypePredicate {
+    export interface IdentifierTypePredicate extends TypePredicateBase {
         parameterName: string;
         parameterIndex: number;
     }
 
+    export type TypePredicate = IdentifierTypePredicate | ThisTypePredicate;
+
     /* @internal */
     export type AnyImportSyntax = ImportDeclaration | ImportEqualsDeclaration;
 
@@ -1900,7 +1942,7 @@ namespace ts {
     }
 
     /* @internal */
-    export interface SymbolAccessiblityResult extends SymbolVisibilityResult {
+    export interface SymbolAccessibilityResult extends SymbolVisibilityResult {
         errorModuleName?: string; // If the symbol is not visible from module, module's name
     }
 
@@ -1928,7 +1970,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;
@@ -1942,16 +1984,19 @@ namespace ts {
         writeTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void;
         writeReturnTypeOfSignatureDeclaration(signatureDeclaration: SignatureDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void;
         writeTypeOfExpression(expr: Expression, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void;
-        isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags): SymbolAccessiblityResult;
+        writeBaseConstructorTypeOfClass(node: ClassLikeDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void;
+        isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags): SymbolAccessibilityResult;
         isEntityNameVisible(entityName: EntityName | Expression, enclosingDeclaration: Node): SymbolVisibilityResult;
         // 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;
         getExternalModuleFileFromDeclaration(declaration: ImportEqualsDeclaration | ImportDeclaration | ExportDeclaration | ModuleDeclaration): SourceFile;
+        getTypeReferenceDirectivesForEntityName(name: EntityName | PropertyAccessExpression): string[];
+        getTypeReferenceDirectivesForSymbol(symbol: Symbol, meaning?: SymbolFlags): string[];
     }
 
     export const enum SymbolFlags {
@@ -2047,6 +2092,7 @@ namespace ts {
 
         members?: SymbolTable;                  // Class, interface or literal instance members
         exports?: SymbolTable;                  // Module exports
+        globalExports?: SymbolTable;            // Conditional global UMD exports
         /* @internal */ id?: number;            // Unique id (used to look up SymbolLinks)
         /* @internal */ mergeId?: number;       // Merge id (used to look up merged symbol)
         /* @internal */ parent?: Symbol;        // Parent symbol
@@ -2067,9 +2113,11 @@ namespace ts {
         containingType?: UnionOrIntersectionType; // Containing union or intersection type for synthetic property
         resolvedExports?: SymbolTable;      // Resolved exports of module
         exportsChecked?: boolean;           // True if exports of external module have been checked
-        isDeclaratonWithCollidingName?: boolean;    // True if symbol is block scoped redeclaration
+        isDeclarationWithCollidingName?: boolean;    // True if symbol is block scoped redeclaration
         bindingElement?: BindingElement;    // Binding element associated with property symbol
-        exportsSomeValue?: boolean;         // true if module exports some value (not just types)
+        exportsSomeValue?: boolean;         // True if module exports some value (not just types)
+        firstAssignmentChecked?: boolean;   // True if first assignment node has been computed
+        firstAssignment?: Node;             // First assignment node (undefined if no assignments)
     }
 
     /* @internal */
@@ -2095,9 +2143,9 @@ namespace ts {
         LoopWithCapturedBlockScopedBinding  = 0x00010000, // Loop that contains block scoped variable captured in closure
         CapturedBlockScopedBinding          = 0x00020000, // Block-scoped binding that is captured in some function
         BlockScopedBindingInLoop            = 0x00040000, // Block-scoped binding with declaration nested inside iteration statement
-        HasSeenSuperCall                    = 0x00080000, // Set during the binding when encounter 'super'
-        DecoratedClassWithSelfReference     = 0x00100000, // Decorated class that contains a binding to itself inside of the class body.
-        SelfReferenceInDecoratedClass       = 0x00200000, // Binding to a decorated class inside of the class's body.
+        DecoratedClassWithSelfReference     = 0x00080000, // Decorated class that contains a binding to itself inside of the class body.
+        SelfReferenceInDecoratedClass       = 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
     }
 
     /* @internal */
@@ -2112,11 +2160,13 @@ namespace ts {
         isVisible?: boolean;              // Is this node visible
         generatedName?: string;           // Generated name for module, enum, or import declaration
         generatedNames?: Map<string>;     // Generated names table for source file
-        assignmentChecks?: Map<boolean>;  // Cache of assignment checks
+        assignmentMap?: Map<boolean>;     // Cached map of references assigned within this node
         hasReportedStatementInAmbientContext?: boolean;  // Cache boolean if we report statements in ambient context
         importOnRightSide?: Symbol;       // for import declarations - import that appear on the right side
-        jsxFlags?: JsxFlags;              // flags for knowning what kind of element/attributes we're dealing with
+        jsxFlags?: JsxFlags;              // flags for knowing what kind of element/attributes we're dealing with
         resolvedJsxType?: Type;           // resolved element attributes type of a JSX openinglike element
+        hasSuperCall?: boolean;           // recorded result when we try to find super-call. We only try to find one if this flag is undefined, indicating that we haven't made an attempt.
+        superCall?: ExpressionStatement;  // Cached first super-call found in the constructor. Used in checking whether super is called before this-accessing
     }
 
     export const enum TypeFlags {
@@ -2144,7 +2194,7 @@ namespace ts {
         /* @internal */
         FreshObjectLiteral      = 0x00100000,  // Fresh object literal type
         /* @internal */
-        ContainsUndefinedOrNull = 0x00200000,  // Type is or contains Undefined or Null type
+        ContainsUndefinedOrNull = 0x00200000,  // Type is or contains undefined or null type
         /* @internal */
         ContainsObjectLiteral   = 0x00400000,  // Type is or contains object literal type
         /* @internal */
@@ -2152,8 +2202,9 @@ namespace ts {
         ESSymbol                = 0x01000000,  // Type of symbol primitive introduced in ES6
         ThisType                = 0x02000000,  // This type
         ObjectLiteralPatternWithComputedProperties = 0x04000000,  // Object literal type implied by binding pattern has computed properties
-        PredicateType           = 0x08000000,  // Predicate types are also Boolean types, but should not be considered Intrinsics - there's no way to capture this with flags
 
+        /* @internal */
+        Nullable = Undefined | Null,
         /* @internal */
         Intrinsic = Any | String | Number | Boolean | ESSymbol | Void | Undefined | Null,
         /* @internal */
@@ -2164,7 +2215,7 @@ namespace ts {
         UnionOrIntersection = Union | Intersection,
         StructuredType = ObjectType | Union | Intersection,
         /* @internal */
-        RequiresWidening = ContainsUndefinedOrNull | ContainsObjectLiteral | PredicateType,
+        RequiresWidening = ContainsUndefinedOrNull | ContainsObjectLiteral,
         /* @internal */
         PropagatingFlags = ContainsUndefinedOrNull | ContainsObjectLiteral | ContainsAnyFunctionType
     }
@@ -2185,11 +2236,6 @@ namespace ts {
         intrinsicName: string;  // Name of intrinsic type
     }
 
-    // Predicate types (TypeFlags.Predicate)
-    export interface PredicateType extends Type {
-        predicate: ThisTypePredicate | IdentifierTypePredicate;
-    }
-
     // String literal types (TypeFlags.StringLiteral)
     export interface StringLiteralType extends Type {
         text: string;  // Text of string literal
@@ -2220,7 +2266,7 @@ namespace ts {
 
     // Type references (TypeFlags.Reference). When a class or interface has type parameters or
     // a "this" type, references to the class or interface are made using type references. The
-    // typeArguments property specififes the types to substitute for the type parameters of the
+    // typeArguments property specifies the types to substitute for the type parameters of the
     // class or interface and optionally includes an extra element that specifies the type to
     // substitute for "this" in the resulting instantiation. When no extra argument is present,
     // the type reference itself is substituted for "this". The typeArguments property is undefined
@@ -2306,6 +2352,7 @@ namespace ts {
         declaration: SignatureDeclaration;  // Originating declaration
         typeParameters: TypeParameter[];    // Type parameters (undefined if non-generic)
         parameters: Symbol[];               // Parameters
+        thisType?: Type;                    // type of this-type
         /* @internal */
         resolvedReturnType: Type;           // Resolved return type
         /* @internal */
@@ -2324,6 +2371,8 @@ namespace ts {
         erasedSignatureCache?: Signature;   // Erased version of signature (deferred)
         /* @internal */
         isolatedSignatureType?: ObjectType; // A manufactured type that just contains the signature for purposes of signature comparison
+        /* @internal */
+        typePredicate?: TypePredicate;
     }
 
     export const enum IndexKind {
@@ -2340,6 +2389,7 @@ namespace ts {
     /* @internal */
     export interface TypeMapper {
         (t: TypeParameter): Type;
+        mappedTypes?: Type[];       // Types mapped by this mapper
         instantiations?: Type[];    // Cache of instantiations created using this type mapper.
         context?: InferenceContext; // The inference context this mapper was created from.
                                     // Only inference mappers have this set (in createInferenceMapper).
@@ -2422,10 +2472,13 @@ namespace ts {
     export type PathSubstitutions = Map<string[]>;
     export type TsConfigOnlyOptions = RootPaths | PathSubstitutions;
 
+    export type CompilerOptionsValue = string | number | boolean | (string | number)[] | TsConfigOnlyOptions;
+
     export interface CompilerOptions {
         allowNonTsExtensions?: boolean;
         charset?: string;
         declaration?: boolean;
+        declarationDir?: string;
         diagnostics?: boolean;
         emitBOM?: boolean;
         help?: boolean;
@@ -2435,6 +2488,7 @@ namespace ts {
         jsx?: JsxEmit;
         reactNamespace?: string;
         listFiles?: boolean;
+        typesSearchPaths?: string[];
         locale?: string;
         mapRoot?: string;
         module?: ModuleKind;
@@ -2444,6 +2498,7 @@ namespace ts {
         noEmitOnError?: boolean;
         noErrorTruncation?: boolean;
         noImplicitAny?: boolean;
+        noImplicitThis?: boolean;
         noLib?: boolean;
         noResolve?: boolean;
         out?: string;
@@ -2473,18 +2528,47 @@ namespace ts {
         baseUrl?: string;
         paths?: PathSubstitutions;
         rootDirs?: RootPaths;
-        traceModuleResolution?: boolean;
+        traceResolution?: boolean;
         allowSyntheticDefaultImports?: boolean;
         allowJs?: boolean;
+        noImplicitUseStrict?: boolean;
+        strictNullChecks?: boolean;
+        listEmittedFiles?: boolean;
+        lib?: string[];
         /* @internal */ stripInternal?: boolean;
-        /* @internal */ experimentalTransforms?: boolean;
+        /* @internal */ useLegacyEmitter?: boolean;
 
         // Skip checking lib.d.ts to help speed up tests.
         /* @internal */ skipDefaultLibCheck?: boolean;
         // Do not perform validation of output file name in transpile scenarios
         /* @internal */ suppressOutputPathCheck?: boolean;
 
-        [option: string]: string | number | boolean | TsConfigOnlyOptions;
+        /* @internal */
+        // When options come from a config file, its path is recorded here
+        configFilePath?: string;
+        /* @internal */
+        // Path used to used to compute primary search locations
+        typesRoot?: string;
+        types?: string[];
+
+        list?: string[];
+        [option: string]: CompilerOptionsValue;
+    }
+
+    export interface TypingOptions {
+        enableAutoDiscovery?: boolean;
+        include?: string[];
+        exclude?: string[];
+        [option: string]: string[] | boolean;
+    }
+
+    export interface DiscoverTypingsInfo {
+        fileNames: string[];                            // The file names that belong to the same project.
+        projectRootPath: string;                        // The path to the project root directory
+        safeListPath: string;                           // The path used to retrieve the safe list
+        packageNameToTypingLocation: Map<string>;       // The map of package names to their cached typing locations
+        typingOptions: TypingOptions;                   // Used to customize the typing inference process
+        compilerOptions: CompilerOptions;               // Used as a source for typing inference
     }
 
     export enum ModuleKind {
@@ -2516,6 +2600,14 @@ namespace ts {
         character: number;
     }
 
+    export const enum ScriptKind {
+        Unknown = 0,
+        JS = 1,
+        JSX = 2,
+        TS = 3,
+        TSX = 4
+    }
+
     export const enum ScriptTarget {
         ES3 = 0,
         ES5 = 1,
@@ -2537,6 +2629,7 @@ namespace ts {
 
     export interface ParsedCommandLine {
         options: CompilerOptions;
+        typingOptions?: TypingOptions;
         fileNames: string[];
         errors: Diagnostic[];
     }
@@ -2544,7 +2637,7 @@ namespace ts {
     /* @internal */
     export interface CommandLineOptionBase {
         name: string;
-        type: "string" | "number" | "boolean" | "object" | Map<number>;    // a value of a primitive type, or an object literal mapping named values to actual values
+        type: "string" | "number" | "boolean" | "object" | "list" | Map<number | string>;    // a value of a primitive type, or an object literal mapping named values to actual values
         isFilePath?: boolean;                                   // True if option value is a path or fileName
         shortName?: string;                                     // A short mnemonic for convenience - for instance, 'h' can be used in place of 'help'
         description?: DiagnosticMessage;                        // The message describing what the command line switch does
@@ -2560,8 +2653,7 @@ namespace ts {
 
     /* @internal */
     export interface CommandLineOptionOfCustomType extends CommandLineOptionBase {
-        type: Map<number>;             // an object literal mapping named values to actual values
-        error: DiagnosticMessage;      // The error given when the argument does not fit a customized 'type'
+        type: Map<number | string>;             // an object literal mapping named values to actual values
     }
 
     /* @internal */
@@ -2570,7 +2662,13 @@ namespace ts {
     }
 
     /* @internal */
-    export type CommandLineOption = CommandLineOptionOfCustomType | CommandLineOptionOfPrimitiveType | TsConfigOnlyOption;
+    export interface CommandLineOptionOfListType extends CommandLineOptionBase {
+        type: "list";
+        element: CommandLineOptionOfCustomType | CommandLineOptionOfPrimitiveType;
+    }
+
+    /* @internal */
+    export type CommandLineOption = CommandLineOptionOfCustomType | CommandLineOptionOfPrimitiveType | TsConfigOnlyOption | CommandLineOptionOfListType;
 
     /* @internal */
     export const enum CharacterCodes {
@@ -2734,10 +2832,23 @@ namespace ts {
         failedLookupLocations: string[];
     }
 
+    export interface ResolvedTypeReferenceDirective {
+        // True if the type declaration file was found in a primary lookup location
+        primary: boolean;
+        // The location of the .d.ts file we located, or undefined if resolution failed
+        resolvedFileName?: string;
+    }
+
+    export interface ResolvedTypeReferenceDirectiveWithFailedLookupLocations {
+        resolvedTypeReferenceDirective: ResolvedTypeReferenceDirective;
+        failedLookupLocations: string[];
+    }
+
     export interface CompilerHost extends ModuleResolutionHost {
         getSourceFile(fileName: string, languageVersion: ScriptTarget, onError?: (message: string) => void): SourceFile;
         getCancellationToken?(): CancellationToken;
         getDefaultLibFileName(options: CompilerOptions): string;
+        getDefaultLibLocation?(): string;
         writeFile: WriteFileCallback;
         getCurrentDirectory(): string;
         getCanonicalFileName(fileName: string): string;
@@ -2747,15 +2858,23 @@ namespace ts {
         /*
          * CompilerHost must either implement resolveModuleNames (in case if it wants to be completely in charge of
          * module name resolution) or provide implementation for methods from ModuleResolutionHost (in this case compiler
-         * will appply built-in module resolution logic and use members of ModuleResolutionHost to ask host specific questions).
+         * will apply built-in module resolution logic and use members of ModuleResolutionHost to ask host specific questions).
          * If resolveModuleNames is implemented then implementation for members from ModuleResolutionHost can be just
          * 'throw new Error("NotImplemented")'
          */
         resolveModuleNames?(moduleNames: string[], containingFile: string): ResolvedModule[];
+
+        /**
+         * 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,
@@ -2775,12 +2894,16 @@ namespace ts {
         ContainsPropertyInitializer = 1 << 11,
         ContainsLexicalThis = 1 << 12,
         ContainsCapturedLexicalThis = 1 << 13,
-        ContainsDefaultValueAssignments = 1 << 14,
-        ContainsParameterPropertyAssignments = 1 << 15,
-        ContainsSpreadElementExpression = 1 << 16,
-        ContainsComputedPropertyName = 1 << 17,
-        ContainsBlockScopedBinding = 1 << 18,
-        ContainsYield = 1 << 19,
+        ContainsLexicalThisInComputedPropertyName = 1 << 14,
+        ContainsDefaultValueAssignments = 1 << 15,
+        ContainsParameterPropertyAssignments = 1 << 16,
+        ContainsSpreadElementExpression = 1 << 17,
+        ContainsComputedPropertyName = 1 << 18,
+        ContainsBlockScopedBinding = 1 << 19,
+        ContainsBindingPattern = 1 << 20,
+	ContainsYield = 1 << 21,
+
+        HasComputedFlags = 1 << 31, // Transform flags have been computed.
 
         // Assertions
         // - Bitmasks that are used to assert facts about the syntax of a node and its subtree.
@@ -2792,16 +2915,18 @@ namespace ts {
         // 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,
+        NodeExcludes = TypeScript | Jsx | ES7 | ES6 | DestructuringAssignment | HasComputedFlags,
         ArrowFunctionExcludes = ContainsDecorators | ContainsDefaultValueAssignments | ContainsLexicalThis | ContainsParameterPropertyAssignments | ContainsBlockScopedBinding | ContainsYield,
         FunctionExcludes = ContainsDecorators | ContainsDefaultValueAssignments | ContainsCapturedLexicalThis | ContainsLexicalThis | ContainsParameterPropertyAssignments | ContainsBlockScopedBinding | ContainsYield,
         ConstructorExcludes = ContainsDefaultValueAssignments | ContainsLexicalThis | ContainsCapturedLexicalThis | ContainsBlockScopedBinding | ContainsYield,
         MethodOrAccessorExcludes = ContainsDefaultValueAssignments | ContainsLexicalThis | ContainsCapturedLexicalThis | ContainsBlockScopedBinding | ContainsYield,
-        ClassExcludes = ContainsDecorators | ContainsPropertyInitializer | ContainsLexicalThis | ContainsCapturedLexicalThis | ContainsComputedPropertyName | ContainsParameterPropertyAssignments,
+        ClassExcludes = ContainsDecorators | ContainsPropertyInitializer | ContainsLexicalThis | ContainsCapturedLexicalThis | ContainsComputedPropertyName | ContainsParameterPropertyAssignments | ContainsLexicalThisInComputedPropertyName,
         ModuleExcludes = ContainsDecorators | ContainsLexicalThis | ContainsCapturedLexicalThis | ContainsBlockScopedBinding,
         TypeExcludes = ~ContainsTypeScript,
-        ObjectLiteralExcludes = ContainsDecorators | ContainsComputedPropertyName,
+        ObjectLiteralExcludes = ContainsDecorators | ContainsComputedPropertyName | ContainsLexicalThisInComputedPropertyName,
         ArrayLiteralOrCallOrNewExcludes = ContainsSpreadElementExpression,
+        VariableDeclarationListExcludes = ContainsBindingPattern,
+        ParameterExcludes = ContainsBindingPattern,
     }
 
     /* @internal */
@@ -2812,14 +2937,55 @@ namespace ts {
         EmitAdvancedSuperHelper = 1 << 3,        // Emit the advanced _super helper for async methods.
         UMDDefine = 1 << 4,                      // This node should be replaced with the UMD define helper.
         NoLexicalEnvironment = 1 << 5,           // A new LexicalEnvironment should *not* be introduced when emitting this node, this is primarily used when printing a SystemJS module.
-        SingleLine = 1 << 6,                     // The contents of this node should be emit on a single line.
-        AdviseOnEmitNode = 1 << 7,               // The node printer should invoke the onBeforeEmitNode and onAfterEmitNode callbacks when printing this node.
-        IsNotEmittedNode = 1 << 8,               // Is a node that is not emitted but whose comments should be preserved if possible.
-        EmitCommentsOfNotEmittedParent = 1 << 9, // Emits comments of missing parent nodes.
-        NoSubstitution = 1 << 10,                // Disables further substitution of an expression.
+        SingleLine = 1 << 6,                     // The contents of this node should be emitted on a single line.
+        AdviseOnEmitNode = 1 << 7,               // The printer should invoke the onEmitNode callback when printing this node.
+        NoSubstitution = 1 << 8,                 // Disables further substitution of an expression.
+        CapturesThis = 1 << 9,                   // The function captures a lexical `this`
+        NoLeadingSourceMap = 1 << 10,            // Do not emit a leading source map location for this node.
+        NoTrailingSourceMap = 1 << 11,           // 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 << 12,            // Do not emit source map locations for children of this node.
+        NoTokenLeadingSourceMaps = 1 << 13,      // Do not emit leading source map location for token nodes.
+        NoTokenTrailingSourceMaps = 1 << 14,     // 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 << 15,             // Do not emit leading comments for this node.
+        NoTrailingComments = 1 << 16,            // Do not emit trailing comments for this node.
+        NoComments = NoLeadingComments | NoTrailingComments, // Do not emit comments for this node.
+        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).
+        Merge = 1 << 20,                         // When getting emit options, merge with existing emit options.
+
+        // SourceMap Specialization.
+        // TODO(rbuckton): These should be removed once source maps are aligned with the old
+        //                 emitter and new baselines are taken. This exists solely to
+        //                 align with the old emitter.
+        SourceMapEmitOpenBraceAsToken = 1 << 21,        // Emits the open brace of a block function body as a source mapped token.
+        SourceMapAdjustRestParameterLoop = 1 << 22,     // Emits adjusted source map positions for a ForStatement generated when transforming a rest parameter for ES5/3.
+    }
+
+    /* @internal */
+    export interface NodeEmitOptions {
+        /**
+         * Specifies a custom range to use when emitting source maps.
+         */
+        sourceMapRange?: TextRange;
+        /**
+         * Specifies a custom range to use when emitting tokens of a node.
+         */
+        tokenSourceMapRange?: Map<TextRange>;
+        /**
+         * Specifies a custom range to use when emitting comments.
+         */
+        commentRange?: TextRange;
+        /**
+         * Specifies flags to use to customize emit.
+         */
+        flags?: NodeEmitFlags;
     }
 
     /** Additional context provided to `visitEachChild` */
+    /* @internal */
     export interface LexicalEnvironment {
         /** Starts a new lexical environment. */
         startLexicalEnvironment(): void;
@@ -2832,44 +2998,83 @@ namespace ts {
     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;
 
         /**
-         * Hook used by transformers to substitute non-expression identifiers
-         * just before theyare emitted by the pretty printer.
+         * Enables expression substitutions in the pretty printer for the provided SyntaxKind.
          */
-        identifierSubstitution?: (node: Identifier) => Identifier;
+        enableSubstitution(kind: SyntaxKind): void;
 
         /**
-         * Enables expression substitutions in the pretty printer for
-         * the provided SyntaxKind.
+         * Determines whether expression substitutions are enabled for the provided node.
          */
-        enableExpressionSubstitution(kind: SyntaxKind): void;
-
-        /**
-         * Determines whether expression substitutions are enabled for the
-         * provided node.
-         */
-        isExpressionSubstitutionEnabled(node: Node): boolean;
+        isSubstitutionEnabled(node: Node): boolean;
 
         /**
          * Hook used by transformers to substitute expressions just before they
          * are emitted by the pretty printer.
          */
-        expressionSubstitution?: (node: Expression) => Expression;
+        onSubstituteNode?: (node: Node, isExpression: boolean) => Node;
 
         /**
-         * Enables before/after emit notifications in the pretty printer for
-         * the provided SyntaxKind.
+         * 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.
+         * Determines whether before/after emit notifications should be raised in the pretty
+         * printer when it emits a node.
          */
         isEmitNotificationEnabled(node: Node): boolean;
 
@@ -2902,7 +3107,7 @@ namespace ts {
         getGlobalDiagnostics(): Diagnostic[];
 
         // If fileName is provided, gets all the diagnostics associated with that file name.
-        // Otherwise, returns all the diagnostics (global and file associated) in this colletion.
+        // Otherwise, returns all the diagnostics (global and file associated) in this collection.
         getDiagnostics(fileName?: string): Diagnostic[];
 
         // Gets a count of how many times this collection has been modified.  This value changes
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index bcdad655fbc..0c2034560fc 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -6,6 +6,7 @@ namespace ts {
         fileReference?: FileReference;
         diagnosticMessage?: DiagnosticMessage;
         isNoDefaultLib?: boolean;
+        isTypeReferenceDirective?: boolean;
     }
 
     export function getDeclarationOfKind(symbol: Symbol, kind: SyntaxKind): Declaration {
@@ -112,6 +113,43 @@ namespace ts {
         sourceFile.resolvedModules[moduleNameText] = resolvedModule;
     }
 
+    export function setResolvedTypeReferenceDirective(sourceFile: SourceFile, typeReferenceDirectiveName: string, resolvedTypeReferenceDirective: ResolvedTypeReferenceDirective): void {
+        if (!sourceFile.resolvedTypeReferenceDirectiveNames) {
+            sourceFile.resolvedTypeReferenceDirectiveNames = {};
+        }
+
+        sourceFile.resolvedTypeReferenceDirectiveNames[typeReferenceDirectiveName] = resolvedTypeReferenceDirective;
+    }
+
+    /* @internal */
+    export function moduleResolutionIsEqualTo(oldResolution: ResolvedModule, newResolution: ResolvedModule): boolean {
+        return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.isExternalLibraryImport === newResolution.isExternalLibraryImport;
+    }
+
+    /* @internal */
+    export function typeDirectiveIsEqualTo(oldResolution: ResolvedTypeReferenceDirective, newResolution: ResolvedTypeReferenceDirective): boolean {
+        return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.primary === newResolution.primary;
+    }
+
+    /* @internal */
+    export function hasChangesInResolutions<T>(names: string[], newResolutions: T[], oldResolutions: Map<T>, comparer: (oldResolution: T, newResolution: T) => boolean): boolean {
+        if (names.length !== newResolutions.length) {
+            return false;
+        }
+        for (let i = 0; i < names.length; i++) {
+            const newResolution = newResolutions[i];
+            const oldResolution = oldResolutions && hasProperty(oldResolutions, names[i]) ? oldResolutions[names[i]] : undefined;
+            const changed =
+                oldResolution
+                    ? !newResolution || !comparer(oldResolution, newResolution)
+                    : newResolution;
+            if (changed) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     // Returns true if this node contains a parse error anywhere underneath it.
     export function containsParseError(node: Node): boolean {
         aggregateChildData(node);
@@ -131,7 +169,7 @@ namespace ts {
                 node.flags |= NodeFlags.ThisNodeOrAnySubNodesHasError;
             }
 
-            // Also mark that we've propogated the child information to this node.  This way we can
+            // Also mark that we've propagated the child information to this node.  This way we can
             // always consult the bit directly on this node without needing to check its children
             // again.
             node.flags |= NodeFlags.HasAggregatedChildData;
@@ -169,6 +207,18 @@ namespace ts {
         return `${ file.fileName }(${ loc.line + 1 },${ loc.character + 1 })`;
     }
 
+    export function getEnvironmentVariable(name: string, host?: CompilerHost) {
+        if (host && host.getEnvironmentVariable) {
+            return host.getEnvironmentVariable(name);
+        }
+
+        if (sys && sys.getEnvironmentVariable) {
+            return sys.getEnvironmentVariable(name);
+        }
+
+        return "";
+    }
+
     export function getStartPosOfNode(node: Node): number {
         return node.pos;
     }
@@ -177,6 +227,33 @@ namespace ts {
         return value !== undefined;
     }
 
+    export function getEndLinePosition(line: number, sourceFile: SourceFile): number {
+        Debug.assert(line >= 0);
+        const lineStarts = getLineStarts(sourceFile);
+
+        const lineIndex = line;
+        const sourceText = sourceFile.text;
+        if (lineIndex + 1 === lineStarts.length) {
+            // last line - return EOF
+            return sourceText.length - 1;
+        }
+        else {
+            // current line start
+            const start = lineStarts[lineIndex];
+            // take the start position of the next line - 1 = it should be some line break
+            let pos = lineStarts[lineIndex + 1] - 1;
+            Debug.assert(isLineBreak(sourceText.charCodeAt(pos)));
+            // walk backwards skipping line breaks, stop the the beginning of current line.
+            // i.e:
+            // <some text>
+            // $ <- end of line for this position should match the start position
+            while (start <= pos && isLineBreak(sourceText.charCodeAt(pos))) {
+                pos--;
+            }
+            return pos;
+        }
+    }
+
     // Returns true if this node is missing from the actual source code. A 'missing' node is different
     // from 'undefined/defined'. When a node is undefined (which can happen for optional nodes
     // in the tree), it is definitely missing. However, a node may be defined, but still be
@@ -190,7 +267,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;
         }
 
@@ -244,7 +321,7 @@ namespace ts {
         // 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, "\"");
+            return getQuotedEscapedLiteralText('"', node.text, '"');
         }
 
         // If we don't need to downlevel and we can reach the original source text using
@@ -261,7 +338,7 @@ namespace ts {
         // or an escaped quoted form of the original text if it's string-like.
         switch (node.kind) {
             case SyntaxKind.StringLiteral:
-                return getQuotedEscapedLiteralText("\"", node.text, "\"");
+                return getQuotedEscapedLiteralText('"', node.text, '"');
             case SyntaxKind.NoSubstitutionTemplateLiteral:
                 return getQuotedEscapedLiteralText("`", node.text, "`");
             case SyntaxKind.TemplateHead:
@@ -426,6 +503,20 @@ namespace ts {
         return createTextSpanFromBounds(start, scanner.getTextPos());
     }
 
+    function getErrorSpanForArrowFunction(sourceFile: SourceFile, node: ArrowFunction): TextSpan {
+        const pos = skipTrivia(sourceFile.text, node.pos);
+        if (node.body && node.body.kind === SyntaxKind.Block) {
+            const { line: startLine } = getLineAndCharacterOfPosition(sourceFile, node.body.pos);
+            const { line: endLine } = getLineAndCharacterOfPosition(sourceFile, node.body.end);
+            if (startLine < endLine) {
+                // The arrow function spans multiple lines,
+                // make the error span be the first line, inclusive.
+                return createTextSpan(pos, getEndLinePosition(startLine, sourceFile) - pos + 1);
+            }
+        }
+        return createTextSpanFromBounds(pos, node.end);
+    }
+
     export function getErrorSpanForNode(sourceFile: SourceFile, node: Node): TextSpan {
         let errorNode = node;
         switch (node.kind) {
@@ -449,9 +540,13 @@ namespace ts {
             case SyntaxKind.FunctionDeclaration:
             case SyntaxKind.FunctionExpression:
             case SyntaxKind.MethodDeclaration:
+            case SyntaxKind.GetAccessor:
+            case SyntaxKind.SetAccessor:
             case SyntaxKind.TypeAliasDeclaration:
                 errorNode = (<Declaration>node).name;
                 break;
+            case SyntaxKind.ArrowFunction:
+                return getErrorSpanForArrowFunction(sourceFile, <ArrowFunction>node);
         }
 
         if (errorNode === undefined) {
@@ -467,10 +562,6 @@ namespace ts {
         return createTextSpanFromBounds(pos, errorNode.end);
     }
 
-    export function isExternalModule(file: SourceFile): boolean {
-        return file.externalModuleIndicator !== undefined;
-    }
-
     export function isExternalOrCommonJsModule(file: SourceFile): boolean {
         return (file.externalModuleIndicator || file.commonJsModuleIndicator) !== undefined;
     }
@@ -491,6 +582,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
@@ -519,13 +629,18 @@ 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 {
         return !!(getCombinedNodeFlags(node) & NodeFlags.Let);
     }
 
+    export function isSuperCallExpression(n: Node): boolean {
+        return n.kind === SyntaxKind.CallExpression && (<CallExpression>n).expression.kind === SyntaxKind.SuperKeyword;
+    }
+
     export function isPrologueDirective(node: Node): boolean {
         return node.kind === SyntaxKind.ExpressionStatement && (<ExpressionStatement>node).expression.kind === SyntaxKind.StringLiteral;
     }
@@ -558,6 +673,7 @@ namespace ts {
     }
 
     export let fullTripleSlashReferencePathRegEx = /^(\/\/\/\s*<reference\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
+    export let fullTripleSlashReferenceTypeReferenceDirectiveRegEx = /^(\/\/\/\s*<reference\s+types\s*=\s*)('|")(.+?)\2.*?\/>/;
     export let fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
 
     export function isPartOfTypeNode(node: Node): boolean {
@@ -571,6 +687,7 @@ namespace ts {
             case SyntaxKind.StringKeyword:
             case SyntaxKind.BooleanKeyword:
             case SyntaxKind.SymbolKeyword:
+            case SyntaxKind.UndefinedKeyword:
                 return true;
             case SyntaxKind.VoidKeyword:
                 return node.parent.kind !== SyntaxKind.VoidExpression;
@@ -777,7 +894,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:
@@ -805,6 +922,10 @@ namespace ts {
         return predicate && predicate.kind === TypePredicateKind.Identifier;
     }
 
+    export function isThisTypePredicate(predicate: TypePredicate): predicate is ThisTypePredicate {
+        return predicate && predicate.kind === TypePredicateKind.This;
+    }
+
     export function getContainingFunction(node: Node): FunctionLikeDeclaration {
         while (true) {
             node = node.parent;
@@ -1024,6 +1145,16 @@ namespace ts {
         }
     }
 
+    export function isJSXTagName(node: Node) {
+        const parent = node.parent;
+        if (parent.kind === SyntaxKind.JsxOpeningElement ||
+            parent.kind === SyntaxKind.JsxSelfClosingElement ||
+            parent.kind === SyntaxKind.JsxClosingElement) {
+            return (<JsxOpeningLikeElement>parent).tagName === node;
+        }
+        return false;
+    }
+
     export function isPartOfExpression(node: Node): boolean {
         switch (node.kind) {
             case SyntaxKind.SuperKeyword:
@@ -1040,6 +1171,7 @@ namespace ts {
             case SyntaxKind.TaggedTemplateExpression:
             case SyntaxKind.AsExpression:
             case SyntaxKind.TypeAssertionExpression:
+            case SyntaxKind.NonNullExpression:
             case SyntaxKind.ParenthesizedExpression:
             case SyntaxKind.FunctionExpression:
             case SyntaxKind.ClassExpression:
@@ -1064,9 +1196,9 @@ namespace ts {
                 while (node.parent.kind === SyntaxKind.QualifiedName) {
                     node = node.parent;
                 }
-                return node.parent.kind === SyntaxKind.TypeQuery;
+                return node.parent.kind === SyntaxKind.TypeQuery || isJSXTagName(node);
             case SyntaxKind.Identifier:
-                if (node.parent.kind === SyntaxKind.TypeQuery) {
+                if (node.parent.kind === SyntaxKind.TypeQuery || isJSXTagName(node)) {
                     return true;
                 }
             // fall through
@@ -1177,6 +1309,9 @@ namespace ts {
     /// Given a BinaryExpression, returns SpecialPropertyAssignmentKind for the various kinds of property
     /// assignments we treat as special in the binder
     export function getSpecialPropertyAssignmentKind(expression: Node): SpecialPropertyAssignmentKind {
+        if (!isInJavaScriptFile(expression)) {
+            return SpecialPropertyAssignmentKind.None;
+        }
         if (expression.kind !== SyntaxKind.BinaryExpression) {
             return SpecialPropertyAssignmentKind.None;
         }
@@ -1307,13 +1442,19 @@ namespace ts {
             }
 
             // Also recognize when the node is the RHS of an assignment expression
+            const parent = node.parent;
             const isSourceOfAssignmentExpressionStatement =
-                node.parent && node.parent.parent &&
-                node.parent.kind === SyntaxKind.BinaryExpression &&
-                (node.parent as BinaryExpression).operatorToken.kind === SyntaxKind.EqualsToken &&
-                node.parent.parent.kind === SyntaxKind.ExpressionStatement;
+                parent && parent.parent &&
+                parent.kind === SyntaxKind.BinaryExpression &&
+                (parent as BinaryExpression).operatorToken.kind === SyntaxKind.EqualsToken &&
+                parent.parent.kind === SyntaxKind.ExpressionStatement;
             if (isSourceOfAssignmentExpressionStatement) {
-                return node.parent.parent.jsDocComment;
+                return parent.parent.jsDocComment;
+            }
+
+            const isPropertyAssignmentExpression = parent && parent.kind === SyntaxKind.PropertyAssignment;
+            if (isPropertyAssignmentExpression) {
+                return parent.jsDocComment;
             }
         }
 
@@ -1359,23 +1500,26 @@ namespace ts {
         return isRestParameter(lastOrUndefined(s.parameters));
     }
 
-    export function isRestParameter(node: ParameterDeclaration) {
-        if (node) {
-            if (node.flags & NodeFlags.JavaScriptFile) {
-                if (node.type && node.type.kind === SyntaxKind.JSDocVariadicType) {
-                    return true;
-                }
+    export function hasDeclaredRestParameter(s: SignatureDeclaration): boolean {
+        return isDeclaredRestParam(lastOrUndefined(s.parameters));
+    }
 
-                const paramTag = getCorrespondingJSDocParameterTag(node);
-                if (paramTag && paramTag.typeExpression) {
-                    return paramTag.typeExpression.type.kind === SyntaxKind.JSDocVariadicType;
-                }
+    export function isRestParameter(node: ParameterDeclaration) {
+        if (node && (node.flags & NodeFlags.JavaScriptFile)) {
+            if (node.type && node.type.kind === SyntaxKind.JSDocVariadicType) {
+                return true;
             }
 
-            return node.dotDotDotToken !== undefined;
+            const paramTag = getCorrespondingJSDocParameterTag(node);
+            if (paramTag && paramTag.typeExpression) {
+                return paramTag.typeExpression.type.kind === SyntaxKind.JSDocVariadicType;
+            }
         }
+        return isDeclaredRestParam(node);
+    }
 
-        return false;
+    export function isDeclaredRestParam(node: ParameterDeclaration) {
+        return node && node.dotDotDotToken !== undefined;
     }
 
 
@@ -1390,7 +1534,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;
@@ -1463,6 +1607,7 @@ namespace ts {
     // export default ...
     export function isAliasSymbolDeclaration(node: Node): boolean {
         return node.kind === SyntaxKind.ImportEqualsDeclaration ||
+            node.kind === SyntaxKind.GlobalModuleExportDeclaration ||
             node.kind === SyntaxKind.ImportClause && !!(<ImportClause>node).name ||
             node.kind === SyntaxKind.NamespaceImport ||
             node.kind === SyntaxKind.ImportSpecifier ||
@@ -1524,25 +1669,26 @@ namespace ts {
                 };
             }
             else {
-                const matchResult = fullTripleSlashReferencePathRegEx.exec(comment);
-                if (matchResult) {
+                const refMatchResult = fullTripleSlashReferencePathRegEx.exec(comment);
+                const refLibResult = !refMatchResult && fullTripleSlashReferenceTypeReferenceDirectiveRegEx.exec(comment);
+                if (refMatchResult || refLibResult) {
                     const start = commentRange.pos;
                     const end = commentRange.end;
                     return {
                         fileReference: {
                             pos: start,
                             end: end,
-                            fileName: matchResult[3]
+                            fileName: (refMatchResult || refLibResult)[3]
                         },
-                        isNoDefaultLib: false
-                    };
-                }
-                else {
-                    return {
-                        diagnosticMessage: Diagnostics.Invalid_reference_directive_syntax,
-                        isNoDefaultLib: false
+                        isNoDefaultLib: false,
+                        isTypeReferenceDirective: !!refLibResult
                     };
                 }
+
+                return {
+                    diagnosticMessage: Diagnostics.Invalid_reference_directive_syntax,
+                    isNoDefaultLib: false
+                };
             }
         }
 
@@ -1558,7 +1704,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 {
@@ -1601,6 +1747,9 @@ namespace ts {
                 const rightHandSideName = (<PropertyAccessExpression>nameExpression).name.text;
                 return getPropertyNameForKnownSymbolName(rightHandSideName);
             }
+            if (isStringOrNumericLiteral(nameExpression.kind)) {
+                return (<LiteralExpression>nameExpression).text;
+            }
         }
 
         return undefined;
@@ -1660,22 +1809,6 @@ namespace ts {
             || kind === SyntaxKind.SourceFile;
     }
 
-    /**
-     * 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 nodeIsSynthesized(node: TextRange): boolean {
         return positionIsSynthesized(node.pos)
             || positionIsSynthesized(node.end);
@@ -1688,13 +1821,35 @@ namespace ts {
     }
 
     export function getOriginalNode(node: Node): Node {
-        while (node.original !== undefined) {
-            node = node.original;
+        if (node) {
+            while (node.original !== undefined) {
+                node = node.original;
+            }
         }
 
         return node;
     }
 
+    export function isSourceTreeNode(node: Node): boolean {
+        return node.original === undefined
+            && (node.parent !== undefined || node.kind === SyntaxKind.SourceFile);
+    }
+
+    export function getSourceTreeNode(node: Node): Node {
+        node = getOriginalNode(node);
+
+        if (node && (node.parent !== undefined || node.kind === SyntaxKind.SourceFile)) {
+            return node;
+        }
+
+        return undefined;
+    }
+
+    export function getSourceTreeNodeOfType<T extends Node>(node: T, nodeTest: (node: Node) => node is T): T {
+        const source = getSourceTreeNode(node);
+        return source && nodeTest(source) ? source : undefined;
+    }
+
     export function getOriginalNodeId(node: Node) {
         node = getOriginalNode(node);
         return node ? getNodeId(node) : 0;
@@ -1787,6 +1942,7 @@ namespace ts {
             case SyntaxKind.NoSubstitutionTemplateLiteral:
             case SyntaxKind.TemplateExpression:
             case SyntaxKind.ParenthesizedExpression:
+            case SyntaxKind.OmittedExpression:
                 return 19;
 
             case SyntaxKind.TaggedTemplateExpression:
@@ -2172,14 +2328,26 @@ namespace ts {
         return emitOutputFilePathWithoutExtension + extension;
     }
 
+    export function getDeclarationEmitOutputFilePath(sourceFile: SourceFile, host: EmitHost) {
+        const options = host.getCompilerOptions();
+        const outputDir = options.declarationDir || options.outDir; // Prefer declaration folder if specified
+
+        if (options.declaration) {
+            const path = outputDir
+                ? getSourceFilePathInNewDir(sourceFile, host, outputDir)
+                : sourceFile.fileName;
+            return removeFileExtension(path) + ".d.ts";
+        }
+    }
+
     export function getEmitScriptTarget(compilerOptions: CompilerOptions) {
         return compilerOptions.target || ScriptTarget.ES3;
     }
 
     export function getEmitModuleKind(compilerOptions: CompilerOptions) {
-        return compilerOptions.module ?
+        return typeof compilerOptions.module === "number" ?
             compilerOptions.module :
-            getEmitScriptTarget(compilerOptions) === ScriptTarget.ES6 ? ModuleKind.ES6 : ModuleKind.None;
+            getEmitScriptTarget(compilerOptions) === ScriptTarget.ES6 ? ModuleKind.ES6 : ModuleKind.CommonJS;
     }
 
     export interface EmitFileNames {
@@ -2206,28 +2374,44 @@ namespace ts {
         }
 
         function onSingleFileEmit(host: EmitHost, sourceFile: SourceFile) {
-            const jsFilePath = getOwnEmitOutputFilePath(sourceFile, host,
-                sourceFile.languageVariant === LanguageVariant.JSX && options.jsx === JsxEmit.Preserve ? ".jsx" : ".js");
+            // 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 emitFileNames: EmitFileNames = {
                 jsFilePath,
                 sourceMapFilePath: getSourceMapFilePath(jsFilePath, options),
-                declarationFilePath: !isSourceFileJavaScript(sourceFile) ? getDeclarationEmitFilePath(jsFilePath, options) : undefined
+                declarationFilePath: !isSourceFileJavaScript(sourceFile) ? getDeclarationEmitOutputFilePath(sourceFile, host) : undefined
             };
             action(emitFileNames, [sourceFile], /*isBundledEmit*/false);
         }
 
         function onBundledEmit(host: EmitHost) {
+            const moduleKind = getEmitModuleKind(options);
+            const moduleEmitEnabled = moduleKind === ModuleKind.AMD || moduleKind === ModuleKind.System;
             // Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified
-            const bundledSources = filter(host.getSourceFiles(),
-                sourceFile => !isDeclarationFile(sourceFile) && // Not a declaration file
-                    (!isExternalModule(sourceFile) || // non module file
-                        (getEmitModuleKind(options) && isExternalModule(sourceFile)))); // module that can emit - note falsy value from getEmitModuleKind means the module kind that shouldn't be emitted
+            const bundledSources = filter(host.getSourceFiles(), sourceFile =>
+                !isDeclarationFile(sourceFile)                                       // Not a declaration file
+                && (!isExternalModule(sourceFile) || moduleEmitEnabled)); // and not a module, unless module emit enabled
+
             if (bundledSources.length) {
                 const jsFilePath = options.outFile || options.out;
                 const emitFileNames: EmitFileNames = {
                     jsFilePath,
                     sourceMapFilePath: getSourceMapFilePath(jsFilePath, options),
-                    declarationFilePath: getDeclarationEmitFilePath(jsFilePath, options)
+                    declarationFilePath: options.declaration ? removeFileExtension(jsFilePath) + ".d.ts" : undefined
                 };
                 action(emitFileNames, bundledSources, /*isBundledEmit*/true);
             }
@@ -2236,10 +2420,6 @@ namespace ts {
         function getSourceMapFilePath(jsFilePath: string, options: CompilerOptions) {
             return options.sourceMap ? jsFilePath + ".map" : undefined;
         }
-
-        function getDeclarationEmitFilePath(jsFilePath: string, options: CompilerOptions) {
-            return options.declaration ? removeFileExtension(jsFilePath) + ".d.ts" : undefined;
-        }
     }
 
     export function getSourceFilePathInNewDir(sourceFile: SourceFile, host: EmitHost, newDirPath: string) {
@@ -2248,10 +2428,10 @@ namespace ts {
         return combinePaths(newDirPath, sourceFilePath);
     }
 
-    export function writeFile(host: EmitHost, diagnostics: DiagnosticCollection, fileName: string, data: string, writeByteOrderMark: boolean) {
+    export function writeFile(host: EmitHost, diagnostics: DiagnosticCollection, fileName: string, data: string, writeByteOrderMark: boolean, sourceFiles?: SourceFile[]) {
         host.writeFile(fileName, data, writeByteOrderMark, hostErrorMessage => {
             diagnostics.add(createCompilerDiagnostic(Diagnostics.Could_not_write_file_0_Colon_1, fileName, hostErrorMessage));
-        });
+        }, sourceFiles);
     }
 
     export function getLineOfLocalPosition(currentSourceFile: SourceFile, pos: number) {
@@ -2301,7 +2481,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) {
@@ -2534,21 +2714,49 @@ 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;
+    export function hasModifiers(node: Node) {
+        return getModifierFlags(node) !== ModifierFlags.None;
+    }
+
+    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;
         }
-        return 0;
+
+        let flags = ModifierFlags.None;
+        if (node.modifiers) {
+            for (const modifier of node.modifiers) {
+                flags |= modifierToFlag(modifier.kind);
+            }
+        }
+
+        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 {
@@ -2614,7 +2822,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) {
@@ -2737,7 +2945,7 @@ namespace ts {
                 byte4 = 64;
             }
 
-            // Write to the ouput
+            // Write to the output
             result += base64Digits.charAt(byte1) + base64Digits.charAt(byte2) + base64Digits.charAt(byte3) + base64Digits.charAt(byte4);
 
             i += 3;
@@ -2824,6 +3032,19 @@ namespace ts {
             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;
@@ -2843,26 +3064,137 @@ namespace ts {
         }
     }
 
-    export const enum TextRangeCollapse {
-        CollapseToStart,
-        CollapseToEnd,
+    /**
+     * 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;
     }
 
-    export function collapseTextRange(range: TextRange, collapse: TextRangeCollapse) {
-        if (range.pos === range.end) {
-            return range;
-        }
+    /**
+     * 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 };
+    }
 
-        return collapse === TextRangeCollapse.CollapseToStart
-            ? { pos: range.pos, end: range.pos }
-            : { pos: range.end, end: range.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: Map<ExportSpecifier[]> = {};
         let exportEquals: ExportAssignment = undefined;
-        let hasExportStars = false;
+        let hasExportStarsToExportValues = false;
         for (const node of sourceFile.statements) {
             switch (node.kind) {
                 case SyntaxKind.ImportDeclaration:
@@ -2887,8 +3219,10 @@ namespace ts {
                     if ((<ExportDeclaration>node).moduleSpecifier) {
                         if (!(<ExportDeclaration>node).exportClause) {
                             // export * from "mod"
-                            externalImports.push(<ExportDeclaration>node);
-                            hasExportStars = true;
+                            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
@@ -2918,20 +3252,7 @@ namespace ts {
             }
         }
 
-        return { externalImports, exportSpecifiers, exportEquals, hasExportStars };
-    }
-
-    export function copyPrologueDirectives(from: Statement[], to: Statement[]): number {
-        for (let i = 0; i < from.length; i++) {
-            if (isPrologueDirective(from[i])) {
-                addNode(to, from[i]);
-            }
-            else {
-                return i;
-            }
-        }
-
-        return from.length;
+        return { externalImports, exportSpecifiers, exportEquals, hasExportStarsToExportValues };
     }
 
     export function getInitializedVariables(node: VariableDeclarationList) {
@@ -2942,6 +3263,31 @@ namespace ts {
         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
@@ -2950,11 +3296,8 @@ namespace ts {
     // Node Arrays
 
     export function isNodeArray<T extends Node>(array: T[]): array is NodeArray<T> {
-        return (<NodeArray<T>>array).arrayKind === ArrayKind.NodeArray;
-    }
-
-    export function isModifiersArray(array: Modifier[]): array is ModifiersArray {
-        return (<ModifiersArray>array).arrayKind === ArrayKind.ModifiersArray;
+        return array.hasOwnProperty("pos")
+            && array.hasOwnProperty("end");
     }
 
     // Literals
@@ -3072,7 +3415,8 @@ namespace ts {
             || kind === SyntaxKind.MethodDeclaration
             || kind === SyntaxKind.GetAccessor
             || kind === SyntaxKind.SetAccessor
-            || kind === SyntaxKind.IndexSignature;
+            || kind === SyntaxKind.IndexSignature
+            || kind === SyntaxKind.SemicolonClassElement;
     }
 
     export function isObjectLiteralElement(node: Node): node is ObjectLiteralElement {
@@ -3159,8 +3503,7 @@ namespace ts {
         return node.kind === SyntaxKind.ExpressionWithTypeArguments;
     }
 
-    export function isLeftHandSideExpression(node: Node): node is LeftHandSideExpression {
-        const kind = node.kind;
+    function isLeftHandSideExpressionKind(kind: SyntaxKind): boolean {
         return kind === SyntaxKind.PropertyAccessExpression
             || kind === SyntaxKind.ElementAccessExpression
             || kind === SyntaxKind.NewExpression
@@ -3183,11 +3526,15 @@ namespace ts {
             || kind === SyntaxKind.NullKeyword
             || kind === SyntaxKind.ThisKeyword
             || kind === SyntaxKind.TrueKeyword
-            || kind === SyntaxKind.SuperKeyword;
+            || kind === SyntaxKind.SuperKeyword
+            || kind === SyntaxKind.NonNullExpression;
     }
 
-    export function isUnaryExpression(node: Node): node is UnaryExpression {
-        const kind = node.kind;
+    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
@@ -3195,11 +3542,14 @@ namespace ts {
             || kind === SyntaxKind.VoidExpression
             || kind === SyntaxKind.AwaitExpression
             || kind === SyntaxKind.TypeAssertionExpression
-            || isLeftHandSideExpression(node);
+            || isLeftHandSideExpressionKind(kind);
     }
 
-    export function isExpression(node: Node): node is Expression {
-        const kind = node.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
@@ -3207,7 +3557,30 @@ namespace ts {
             || kind === SyntaxKind.SpreadElementExpression
             || kind === SyntaxKind.AsExpression
             || kind === SyntaxKind.OmittedExpression
-            || isUnaryExpression(node);
+            || 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
@@ -3254,6 +3627,10 @@ namespace ts {
             || 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;
     }
@@ -3276,6 +3653,10 @@ namespace ts {
         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
@@ -3315,9 +3696,11 @@ namespace ts {
             || kind === SyntaxKind.TypeAliasDeclaration
             || kind === SyntaxKind.EnumDeclaration
             || kind === SyntaxKind.ModuleDeclaration
+            || kind === SyntaxKind.ImportDeclaration
             || kind === SyntaxKind.ImportEqualsDeclaration
             || kind === SyntaxKind.ExportDeclaration
-            || kind === SyntaxKind.ExportAssignment;
+            || kind === SyntaxKind.ExportAssignment
+            || kind === SyntaxKind.GlobalModuleExportDeclaration;
     }
 
     function isStatementKindButNotDeclarationKind(kind: SyntaxKind) {
@@ -3338,7 +3721,8 @@ namespace ts {
             || kind === SyntaxKind.TryStatement
             || kind === SyntaxKind.VariableStatement
             || kind === SyntaxKind.WhileStatement
-            || kind === SyntaxKind.WithStatement;
+            || kind === SyntaxKind.WithStatement
+            || kind === SyntaxKind.NotEmittedStatement;
     }
 
     export function isDeclaration(node: Node): node is Declaration {
@@ -3404,6 +3788,12 @@ namespace ts {
         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 {
@@ -3437,11 +3827,14 @@ namespace ts {
         return node.kind === SyntaxKind.EnumMember;
     }
 
+    // Top-level nodes
+    export function isSourceFile(node: Node): node is SourceFile {
+        return node.kind === SyntaxKind.SourceFile;
+    }
 
-    // Synthesized
-
-    export function isNodeArrayNode<T extends Node>(node: Node): node is NodeArrayNode<T> {
-        return node.kind === SyntaxKind.NodeArrayNode;
+    export function isWatchSet(options: CompilerOptions) {
+        // Firefox has Object.prototype.watch
+        return options.watch && options.hasOwnProperty("watch");
     }
 }
 
@@ -3609,9 +4002,9 @@ namespace ts {
             //                .                    |                                      \
             //      ----------------------------------------------------------------------*--------------------------------
             //
-            // (Note the dots represent the newly inferrred start.
+            // (Note the dots represent the newly inferred start.
             // Determining the new and old end is also pretty simple.  Basically it boils down to paying attention to the
-            // absolute positions at the asterixes, and the relative change between the dollar signs. Basically, we see
+            // absolute positions at the asterisks, and the relative change between the dollar signs. Basically, we see
             // which if the two $'s precedes the other, and we move that one forward until they line up.  in this case that
             // means:
             //
@@ -3634,8 +4027,8 @@ namespace ts {
             // ended with a delta of 20 characters (60 - 40).  Thus, if we go back in time to where the first edit started
             // that's the same as if we started at char 80 instead of 60.
             //
-            // As it so happens, the same logic applies if the second edit precedes the first edit.  In that case rahter
-            // than pusing the first edit forward to match the second, we'll push the second edit forward to match the
+            // As it so happens, the same logic applies if the second edit precedes the first edit.  In that case rather
+            // than pushing the first edit forward to match the second, we'll push the second edit forward to match the
             // first.
             //
             // In this case that means we have { oldStart: 10, oldEnd: 80, newEnd: 70 } or, in TextChangeRange
@@ -3678,6 +4071,15 @@ namespace ts {
     }
 
     export function isParameterPropertyDeclaration(node: ParameterDeclaration): boolean {
-        return node.flags & NodeFlags.AccessibilityModifier && node.parent.kind === SyntaxKind.Constructor && isClassLike(node.parent.parent);
+        return hasModifier(node, ModifierFlags.AccessibilityModifier) && node.parent.kind === SyntaxKind.Constructor && isClassLike(node.parent.parent);
+    }
+
+    export function startsWith(str: string, prefix: string): boolean {
+        return str.lastIndexOf(prefix, 0) === 0;
+    }
+
+    export function endsWith(str: string, suffix: string): boolean {
+        const expectedPos = str.length - suffix.length;
+        return str.indexOf(suffix, expectedPos) === expectedPos;
     }
 }
diff --git a/src/compiler/visitor.ts b/src/compiler/visitor.ts
index 03f6c0efb97..f849b369354 100644
--- a/src/compiler/visitor.ts
+++ b/src/compiler/visitor.ts
@@ -3,7 +3,7 @@
 
 /* @internal */
 namespace ts {
-    export type OneOrMany<T extends Node> = T | NodeArrayNode<T>;
+    export type VisitResult<T extends Node> = T | T[];
 
     /**
      * Describes an edge of a Node, used when traversing a syntax tree.
@@ -46,27 +46,27 @@ namespace ts {
     const nodeEdgeTraversalMap: Map<NodeTraversalPath> = {
         [SyntaxKind.QualifiedName]: [
             { name: "left", test: isEntityName },
-            { name: "right", test: isIdentifier },
+            { name: "right", test: isIdentifier }
         ],
         [SyntaxKind.ComputedPropertyName]: [
-            { name: "expression", test: isExpression },
+            { name: "expression", test: isExpression }
         ],
         [SyntaxKind.Parameter]: [
             { name: "decorators", test: isDecorator },
             { name: "modifiers", test: isModifier },
             { name: "name", test: isBindingName },
             { name: "type", test: isTypeNode, optional: true },
-            { name: "initializer", test: isExpression, optional: true, parenthesize: parenthesizeExpressionForList },
+            { name: "initializer", test: isExpression, optional: true, parenthesize: parenthesizeExpressionForList }
         ],
         [SyntaxKind.Decorator]: [
-            { name: "expression", test: isLeftHandSideExpression },
+            { name: "expression", test: isLeftHandSideExpression }
         ],
         [SyntaxKind.PropertyDeclaration]: [
             { name: "decorators", test: isDecorator },
             { name: "modifiers", test: isModifier },
             { name: "name", test: isPropertyName },
             { name: "type", test: isTypeNode, optional: true },
-            { name: "initializer", test: isExpression, optional: true },
+            { name: "initializer", test: isExpression, optional: true }
         ],
         [SyntaxKind.MethodDeclaration]: [
             { name: "decorators", test: isDecorator },
@@ -75,7 +75,7 @@ namespace ts {
             { name: "typeParameters", test: isTypeParameter },
             { name: "parameters", test: isParameter },
             { name: "type", test: isTypeNode, optional: true },
-            { name: "body", test: isBlock, optional: true },
+            { name: "body", test: isBlock, optional: true }
         ],
         [SyntaxKind.Constructor]: [
             { name: "decorators", test: isDecorator },
@@ -83,7 +83,7 @@ namespace ts {
             { name: "typeParameters", test: isTypeParameter },
             { name: "parameters", test: isParameter },
             { name: "type", test: isTypeNode, optional: true },
-            { name: "body", test: isBlock, optional: true },
+            { name: "body", test: isBlock, optional: true }
         ],
         [SyntaxKind.GetAccessor]: [
             { name: "decorators", test: isDecorator },
@@ -92,7 +92,7 @@ namespace ts {
             { name: "typeParameters", test: isTypeParameter },
             { name: "parameters", test: isParameter },
             { name: "type", test: isTypeNode, optional: true },
-            { name: "body", test: isBlock, optional: true },
+            { name: "body", test: isBlock, optional: true }
         ],
         [SyntaxKind.SetAccessor]: [
             { name: "decorators", test: isDecorator },
@@ -101,53 +101,53 @@ namespace ts {
             { name: "typeParameters", test: isTypeParameter },
             { name: "parameters", test: isParameter },
             { name: "type", test: isTypeNode, optional: true },
-            { name: "body", test: isBlock, optional: true },
+            { name: "body", test: isBlock, optional: true }
         ],
         [SyntaxKind.ObjectBindingPattern]: [
-            { name: "elements", test: isBindingElement },
+            { name: "elements", test: isBindingElement }
         ],
         [SyntaxKind.ArrayBindingPattern]: [
-            { name: "elements", test: isBindingElement },
+            { name: "elements", test: isBindingElement }
         ],
         [SyntaxKind.BindingElement]: [
             { name: "propertyName", test: isPropertyName, optional: true },
             { name: "name", test: isBindingName },
-            { name: "initializer", test: isExpression, optional: true, parenthesize: parenthesizeExpressionForList },
+            { name: "initializer", test: isExpression, optional: true, parenthesize: parenthesizeExpressionForList }
         ],
         [SyntaxKind.ArrayLiteralExpression]: [
-            { name: "elements", test: isExpression, parenthesize: parenthesizeExpressionForList },
+            { name: "elements", test: isExpression, parenthesize: parenthesizeExpressionForList }
         ],
         [SyntaxKind.ObjectLiteralExpression]: [
-            { name: "properties", test: isObjectLiteralElement },
+            { name: "properties", test: isObjectLiteralElement }
         ],
         [SyntaxKind.PropertyAccessExpression]: [
             { name: "expression", test: isLeftHandSideExpression, parenthesize: parenthesizeForAccess },
-            { name: "name", test: isIdentifier },
+            { name: "name", test: isIdentifier }
         ],
         [SyntaxKind.ElementAccessExpression]: [
             { name: "expression", test: isLeftHandSideExpression, parenthesize: parenthesizeForAccess },
-            { name: "argumentExpression", test: isExpression },
+            { name: "argumentExpression", test: isExpression }
         ],
         [SyntaxKind.CallExpression]: [
             { name: "expression", test: isLeftHandSideExpression, parenthesize: parenthesizeForAccess },
             { name: "typeArguments", test: isTypeNode },
-            { name: "arguments", test: isExpression },
+            { name: "arguments", test: isExpression, parenthesize: parenthesizeExpressionForList }
         ],
         [SyntaxKind.NewExpression]: [
             { name: "expression", test: isLeftHandSideExpression, parenthesize: parenthesizeForNew },
             { name: "typeArguments", test: isTypeNode },
-            { name: "arguments", test: isExpression },
+            { name: "arguments", test: isExpression, parenthesize: parenthesizeExpressionForList }
         ],
         [SyntaxKind.TaggedTemplateExpression]: [
             { name: "tag", test: isLeftHandSideExpression, parenthesize: parenthesizeForAccess },
-            { name: "template", test: isTemplate },
+            { name: "template", test: isTemplate }
         ],
         [SyntaxKind.TypeAssertionExpression]: [
             { name: "type", test: isTypeNode },
-            { name: "expression", test: isUnaryExpression },
+            { name: "expression", test: isUnaryExpression }
         ],
         [SyntaxKind.ParenthesizedExpression]: [
-            { name: "expression", test: isExpression },
+            { name: "expression", test: isExpression }
         ],
         [SyntaxKind.FunctionExpression]: [
             { name: "decorators", test: isDecorator },
@@ -156,7 +156,7 @@ namespace ts {
             { name: "typeParameters", test: isTypeParameter },
             { name: "parameters", test: isParameter },
             { name: "type", test: isTypeNode, optional: true },
-            { name: "body", test: isBlock, optional: true },
+            { name: "body", test: isBlock, optional: true }
         ],
         [SyntaxKind.ArrowFunction]: [
             { name: "decorators", test: isDecorator },
@@ -164,44 +164,44 @@ namespace ts {
             { name: "typeParameters", test: isTypeParameter },
             { name: "parameters", test: isParameter },
             { name: "type", test: isTypeNode, optional: true },
-            { name: "body", test: isConciseBody, lift: liftToBlock, parenthesize: parenthesizeConciseBody },
+            { name: "body", test: isConciseBody, lift: liftToBlock, parenthesize: parenthesizeConciseBody }
         ],
         [SyntaxKind.DeleteExpression]: [
-            { name: "expression", test: isUnaryExpression, parenthesize: parenthesizePrefixOperand },
+            { name: "expression", test: isUnaryExpression, parenthesize: parenthesizePrefixOperand }
         ],
         [SyntaxKind.TypeOfExpression]: [
-            { name: "expression", test: isUnaryExpression, parenthesize: parenthesizePrefixOperand },
+            { name: "expression", test: isUnaryExpression, parenthesize: parenthesizePrefixOperand }
         ],
         [SyntaxKind.VoidExpression]: [
-            { name: "expression", test: isUnaryExpression, parenthesize: parenthesizePrefixOperand },
+            { name: "expression", test: isUnaryExpression, parenthesize: parenthesizePrefixOperand }
         ],
         [SyntaxKind.AwaitExpression]: [
-            { name: "expression", test: isUnaryExpression, parenthesize: parenthesizePrefixOperand },
+            { name: "expression", test: isUnaryExpression, parenthesize: parenthesizePrefixOperand }
         ],
         [SyntaxKind.PrefixUnaryExpression]: [
-            { name: "operand", test: isUnaryExpression, parenthesize: parenthesizePrefixOperand },
+            { name: "operand", test: isUnaryExpression, parenthesize: parenthesizePrefixOperand }
         ],
         [SyntaxKind.PostfixUnaryExpression]: [
-            { name: "operand", test: isLeftHandSideExpression, parenthesize: parenthesizePostfixOperand },
+            { name: "operand", test: isLeftHandSideExpression, parenthesize: parenthesizePostfixOperand }
         ],
         [SyntaxKind.BinaryExpression]: [
-            { name: "left", test: isExpression, parenthesize: (node: Expression, parent: BinaryExpression) => parenthesizeBinaryOperand(getOperator(parent), node, true) },
-            { name: "right", test: isExpression, parenthesize: (node: Expression, parent: BinaryExpression) => parenthesizeBinaryOperand(getOperator(parent), node, false) },
+            { name: "left", test: isExpression, parenthesize: (node: Expression, parent: BinaryExpression) => parenthesizeBinaryOperand(getOperator(parent), node, true, /*leftOperand*/ undefined) },
+            { name: "right", test: isExpression, parenthesize: (node: Expression, parent: BinaryExpression) => parenthesizeBinaryOperand(getOperator(parent), node, false, parent.left) }
         ],
         [SyntaxKind.ConditionalExpression]: [
             { name: "condition", test: isExpression },
             { name: "whenTrue", test: isExpression },
-            { name: "whenFalse", test: isExpression },
+            { name: "whenFalse", test: isExpression }
         ],
         [SyntaxKind.TemplateExpression]: [
             { name: "head", test: isTemplateLiteralFragment },
-            { name: "templateSpans", test: isTemplateSpan },
+            { name: "templateSpans", test: isTemplateSpan }
         ],
         [SyntaxKind.YieldExpression]: [
-            { name: "expression", test: isExpression, optional: true },
+            { name: "expression", test: isExpression, optional: true }
         ],
         [SyntaxKind.SpreadElementExpression]: [
-            { name: "expression", test: isExpression, parenthesize: parenthesizeExpressionForList },
+            { name: "expression", test: isExpression, parenthesize: parenthesizeExpressionForList }
         ],
         [SyntaxKind.ClassExpression]: [
             { name: "decorators", test: isDecorator },
@@ -209,96 +209,99 @@ namespace ts {
             { name: "name", test: isIdentifier, optional: true },
             { name: "typeParameters", test: isTypeParameter },
             { name: "heritageClauses", test: isHeritageClause },
-            { name: "members", test: isClassElement },
+            { name: "members", test: isClassElement }
         ],
         [SyntaxKind.ExpressionWithTypeArguments]: [
             { name: "expression", test: isLeftHandSideExpression, parenthesize: parenthesizeForAccess },
-            { name: "typeArguments", test: isTypeNode },
+            { name: "typeArguments", test: isTypeNode }
         ],
         [SyntaxKind.AsExpression]: [
             { name: "expression", test: isExpression },
-            { name: "type", test: isTypeNode },
+            { name: "type", test: isTypeNode }
+        ],
+        [SyntaxKind.NonNullExpression]: [
+            { name: "expression", test: isLeftHandSideExpression }
         ],
         [SyntaxKind.TemplateSpan]: [
             { name: "expression", test: isExpression },
-            { name: "literal", test: isTemplateLiteralFragment },
+            { name: "literal", test: isTemplateLiteralFragment }
         ],
         [SyntaxKind.Block]: [
-            { name: "statements", test: isStatement },
+            { name: "statements", test: isStatement }
         ],
         [SyntaxKind.VariableStatement]: [
             { name: "decorators", test: isDecorator },
             { name: "modifiers", test: isModifier },
-            { name: "declarationList", test: isVariableDeclarationList },
+            { name: "declarationList", test: isVariableDeclarationList }
         ],
         [SyntaxKind.ExpressionStatement]: [
-            { name: "expression", test: isExpression, parenthesize: parenthesizeExpressionForExpressionStatement },
+            { name: "expression", test: isExpression, parenthesize: parenthesizeExpressionForExpressionStatement }
         ],
         [SyntaxKind.IfStatement]: [
             { name: "expression", test: isExpression },
             { name: "thenStatement", test: isStatement, lift: liftToBlock },
-            { name: "elseStatement", test: isStatement, lift: liftToBlock, optional: true },
+            { name: "elseStatement", test: isStatement, lift: liftToBlock, optional: true }
         ],
         [SyntaxKind.DoStatement]: [
             { name: "statement", test: isStatement, lift: liftToBlock },
-            { name: "expression", test: isExpression },
+            { name: "expression", test: isExpression }
         ],
         [SyntaxKind.WhileStatement]: [
             { name: "expression", test: isExpression },
-            { name: "statement", test: isStatement, lift: liftToBlock },
+            { name: "statement", test: isStatement, lift: liftToBlock }
         ],
         [SyntaxKind.ForStatement]: [
             { name: "initializer", test: isForInitializer, optional: true },
             { name: "condition", test: isExpression, optional: true },
             { name: "incrementor", test: isExpression, optional: true },
-            { name: "statement", test: isStatement, lift: liftToBlock },
+            { name: "statement", test: isStatement, lift: liftToBlock }
         ],
         [SyntaxKind.ForInStatement]: [
             { name: "initializer", test: isForInitializer },
             { name: "expression", test: isExpression },
-            { name: "statement", test: isStatement, lift: liftToBlock },
+            { name: "statement", test: isStatement, lift: liftToBlock }
         ],
         [SyntaxKind.ForOfStatement]: [
             { name: "initializer", test: isForInitializer },
             { name: "expression", test: isExpression },
-            { name: "statement", test: isStatement, lift: liftToBlock },
+            { name: "statement", test: isStatement, lift: liftToBlock }
         ],
         [SyntaxKind.ContinueStatement]: [
-            { name: "label", test: isIdentifier, optional: true },
+            { name: "label", test: isIdentifier, optional: true }
         ],
         [SyntaxKind.BreakStatement]: [
-            { name: "label", test: isIdentifier, optional: true },
+            { name: "label", test: isIdentifier, optional: true }
         ],
         [SyntaxKind.ReturnStatement]: [
-            { name: "expression", test: isExpression, optional: true },
+            { name: "expression", test: isExpression, optional: true }
         ],
         [SyntaxKind.WithStatement]: [
             { name: "expression", test: isExpression },
-            { name: "statement", test: isStatement, lift: liftToBlock },
+            { name: "statement", test: isStatement, lift: liftToBlock }
         ],
         [SyntaxKind.SwitchStatement]: [
             { name: "expression", test: isExpression },
-            { name: "caseBlock", test: isCaseBlock },
+            { name: "caseBlock", test: isCaseBlock }
         ],
         [SyntaxKind.LabeledStatement]: [
             { name: "label", test: isIdentifier },
-            { name: "statement", test: isStatement, lift: liftToBlock },
+            { name: "statement", test: isStatement, lift: liftToBlock }
         ],
         [SyntaxKind.ThrowStatement]: [
-            { name: "expression", test: isExpression },
+            { name: "expression", test: isExpression }
         ],
         [SyntaxKind.TryStatement]: [
             { name: "tryBlock", test: isBlock },
             { name: "catchClause", test: isCatchClause, optional: true },
-            { name: "finallyBlock", test: isBlock, optional: true },
+            { name: "finallyBlock", test: isBlock, optional: true }
         ],
         [SyntaxKind.VariableDeclaration]: [
             { name: "name", test: isBindingName },
             { name: "type", test: isTypeNode, optional: true },
-            { name: "initializer", test: isExpression, optional: true, parenthesize: parenthesizeExpressionForList },
+            { name: "initializer", test: isExpression, optional: true, parenthesize: parenthesizeExpressionForList }
         ],
         [SyntaxKind.VariableDeclarationList]: [
-            { name: "declarations", test: isVariableDeclaration },
+            { name: "declarations", test: isVariableDeclaration }
         ],
         [SyntaxKind.FunctionDeclaration]: [
             { name: "decorators", test: isDecorator },
@@ -307,7 +310,7 @@ namespace ts {
             { name: "typeParameters", test: isTypeParameter },
             { name: "parameters", test: isParameter },
             { name: "type", test: isTypeNode, optional: true },
-            { name: "body", test: isBlock, optional: true },
+            { name: "body", test: isBlock, optional: true }
         ],
         [SyntaxKind.ClassDeclaration]: [
             { name: "decorators", test: isDecorator },
@@ -315,128 +318,132 @@ namespace ts {
             { name: "name", test: isIdentifier, optional: true },
             { name: "typeParameters", test: isTypeParameter },
             { name: "heritageClauses", test: isHeritageClause },
-            { name: "members", test: isClassElement },
+            { name: "members", test: isClassElement }
         ],
         [SyntaxKind.EnumDeclaration]: [
             { name: "decorators", test: isDecorator },
             { name: "modifiers", test: isModifier },
             { name: "name", test: isIdentifier },
-            { name: "members", test: isEnumMember },
+            { name: "members", test: isEnumMember }
         ],
         [SyntaxKind.ModuleDeclaration]: [
             { name: "decorators", test: isDecorator },
             { name: "modifiers", test: isModifier },
             { name: "name", test: isModuleName },
-            { name: "body", test: isModuleBody },
+            { name: "body", test: isModuleBody }
         ],
         [SyntaxKind.ModuleBlock]: [
-            { name: "statements", test: isStatement },
+            { name: "statements", test: isStatement }
         ],
         [SyntaxKind.CaseBlock]: [
-            { name: "clauses", test: isCaseOrDefaultClause },
+            { name: "clauses", test: isCaseOrDefaultClause }
         ],
         [SyntaxKind.ImportEqualsDeclaration]: [
             { name: "decorators", test: isDecorator },
             { name: "modifiers", test: isModifier },
             { name: "name", test: isIdentifier },
-            { name: "moduleReference", test: isModuleReference },
+            { name: "moduleReference", test: isModuleReference }
         ],
         [SyntaxKind.ImportDeclaration]: [
             { name: "decorators", test: isDecorator },
             { name: "modifiers", test: isModifier },
             { name: "importClause", test: isImportClause, optional: true },
-            { name: "moduleSpecifier", test: isExpression },
+            { name: "moduleSpecifier", test: isExpression }
         ],
         [SyntaxKind.ImportClause]: [
             { name: "name", test: isIdentifier, optional: true },
-            { name: "namedBindings", test: isNamedImportBindings, optional: true },
+            { name: "namedBindings", test: isNamedImportBindings, optional: true }
         ],
         [SyntaxKind.NamespaceImport]: [
-            { name: "name", test: isIdentifier },
+            { name: "name", test: isIdentifier }
         ],
         [SyntaxKind.NamedImports]: [
-            { name: "elements", test: isImportSpecifier },
+            { name: "elements", test: isImportSpecifier }
         ],
         [SyntaxKind.ImportSpecifier]: [
             { name: "propertyName", test: isIdentifier, optional: true },
-            { name: "name", test: isIdentifier },
+            { name: "name", test: isIdentifier }
         ],
         [SyntaxKind.ExportAssignment]: [
             { name: "decorators", test: isDecorator },
             { name: "modifiers", test: isModifier },
-            { name: "expression", test: isExpression },
+            { name: "expression", test: isExpression }
         ],
         [SyntaxKind.ExportDeclaration]: [
             { name: "decorators", test: isDecorator },
             { name: "modifiers", test: isModifier },
             { name: "exportClause", test: isNamedExports, optional: true },
-            { name: "moduleSpecifier", test: isExpression, optional: true },
+            { name: "moduleSpecifier", test: isExpression, optional: true }
         ],
         [SyntaxKind.NamedExports]: [
-            { name: "elements", test: isExportSpecifier },
+            { name: "elements", test: isExportSpecifier }
         ],
         [SyntaxKind.ExportSpecifier]: [
             { name: "propertyName", test: isIdentifier, optional: true },
-            { name: "name", test: isIdentifier },
+            { name: "name", test: isIdentifier }
         ],
         [SyntaxKind.ExternalModuleReference]: [
-            { name: "expression", test: isExpression, optional: true },
+            { name: "expression", test: isExpression, optional: true }
         ],
         [SyntaxKind.JsxElement]: [
             { name: "openingElement", test: isJsxOpeningElement },
             { name: "children", test: isJsxChild },
-            { name: "closingElement", test: isJsxClosingElement },
+            { name: "closingElement", test: isJsxClosingElement }
         ],
         [SyntaxKind.JsxSelfClosingElement]: [
             { name: "tagName", test: isEntityName },
-            { name: "attributes", test: isJsxAttributeLike },
+            { name: "attributes", test: isJsxAttributeLike }
         ],
         [SyntaxKind.JsxOpeningElement]: [
             { name: "tagName", test: isEntityName },
-            { name: "attributes", test: isJsxAttributeLike },
+            { name: "attributes", test: isJsxAttributeLike }
         ],
         [SyntaxKind.JsxClosingElement]: [
-            { name: "tagName", test: isEntityName },
+            { name: "tagName", test: isEntityName }
         ],
         [SyntaxKind.JsxAttribute]: [
             { name: "name", test: isIdentifier },
-            { name: "initializer", test: isExpression, optional: true },
+            { name: "initializer", test: isStringLiteralOrJsxExpression, optional: true }
         ],
         [SyntaxKind.JsxSpreadAttribute]: [
-            { name: "expression", test: isExpression },
+            { name: "expression", test: isExpression }
         ],
         [SyntaxKind.JsxExpression]: [
-            { name: "expression", test: isExpression, optional: true },
+            { name: "expression", test: isExpression, optional: true }
         ],
         [SyntaxKind.CaseClause]: [
             { name: "expression", test: isExpression, parenthesize: parenthesizeExpressionForList },
-            { name: "statements", test: isStatement },
+            { name: "statements", test: isStatement }
         ],
         [SyntaxKind.DefaultClause]: [
-            { name: "statements", test: isStatement },
+            { name: "statements", test: isStatement }
         ],
         [SyntaxKind.HeritageClause]: [
-            { name: "types", test: isExpressionWithTypeArguments },
+            { name: "types", test: isExpressionWithTypeArguments }
         ],
         [SyntaxKind.CatchClause]: [
             { name: "variableDeclaration", test: isVariableDeclaration },
-            { name: "block", test: isBlock },
+            { name: "block", test: isBlock }
         ],
         [SyntaxKind.PropertyAssignment]: [
             { name: "name", test: isPropertyName },
-            { name: "initializer", test: isExpression, parenthesize: parenthesizeExpressionForList },
+            { name: "initializer", test: isExpression, parenthesize: parenthesizeExpressionForList }
         ],
         [SyntaxKind.ShorthandPropertyAssignment]: [
             { name: "name", test: isIdentifier },
-            { name: "objectAssignmentInitializer", test: isExpression, optional: true },
+            { name: "objectAssignmentInitializer", test: isExpression, optional: true }
         ],
         [SyntaxKind.EnumMember]: [
             { name: "name", test: isPropertyName },
-            { name: "initializer", test: isExpression, optional: true, parenthesize: parenthesizeExpressionForList },
+            { name: "initializer", test: isExpression, optional: true, parenthesize: parenthesizeExpressionForList }
         ],
         [SyntaxKind.SourceFile]: [
-            { name: "statements", test: isStatement },
+            { name: "statements", test: isStatement }
         ],
+        [SyntaxKind.NotEmittedStatement]: [],
+        [SyntaxKind.PartiallyEmittedExpression]: [
+            { name: "expression", test: isExpression }
+        ]
     };
 
     /**
@@ -448,7 +455,7 @@ namespace ts {
      * @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) {
+    export function reduceEachChild<T>(node: Node, f: (memo: T, node: Node) => T, initial: T): T {
         if (node === undefined) {
             return undefined;
         }
@@ -478,7 +485,7 @@ namespace ts {
      * @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) => 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): T {
         return <T>visitNodeWorker(node, visitor, test, optional, lift, /*parenthesize*/ undefined, /*parentNode*/ undefined);
     }
 
@@ -493,32 +500,38 @@ namespace ts {
      * @param parenthesize A callback used to parenthesize the node if needed.
      * @param parentNode A parentNode for the node.
      */
-    function visitNodeWorker(node: Node, visitor: (node: Node) => Node, test: (node: Node) => boolean, optional: boolean, lift: (node: NodeArray<Node>) => Node, parenthesize: (node: Node, parentNode: Node) => Node, parentNode: Node): Node {
+    function visitNodeWorker(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;
         }
 
-        let visited = visitor(node);
+        const visited = visitor(node);
         if (visited === node) {
             return node;
         }
 
-        if (visited !== undefined && isNodeArrayNode(visited)) {
-            visited = (lift || extractSingleNode)((<NodeArrayNode<Node>>visited).nodes);
-        }
-
-        if (parenthesize !== undefined && visited !== undefined) {
-            visited = parenthesize(visited, parentNode);
-        }
-
+        let visitedNode: Node;
         if (visited === undefined) {
-            Debug.assert(optional, "Node not optional.");
+            if (!optional) {
+                Debug.failNotOptional();
+            }
+
             return undefined;
         }
+        else if (isArray(visited)) {
+            visitedNode = (lift || extractSingleNode)(visited);
+        }
+        else {
+            visitedNode = visited;
+        }
 
-        Debug.assert(test === undefined || test(visited), "Wrong node type after visit.");
-        aggregateTransformFlags(visited);
-        return visited;
+        if (parenthesize !== undefined) {
+            visitedNode = parenthesize(visitedNode, parentNode);
+        }
+
+        Debug.assertNode(visitedNode, test);
+        aggregateTransformFlags(visitedNode);
+        return visitedNode;
     }
 
     /**
@@ -530,7 +543,7 @@ namespace ts {
      * @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, TArray extends NodeArray<T>>(nodes: TArray, visitor: (node: Node) => Node, test: (node: Node) => boolean, start?: number, count?: number): TArray {
+    export function visitNodes<T extends Node, TArray extends NodeArray<T>>(nodes: TArray, visitor: (node: Node) => VisitResult<Node>, test: (node: Node) => boolean, start?: number, count?: number): TArray {
         return <TArray>visitNodesWorker(nodes, visitor, test, /*parenthesize*/ undefined, /*parentNode*/ undefined, start, count);
     }
 
@@ -543,12 +556,12 @@ namespace ts {
      * @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.
      */
-    function visitNodesWorker(nodes: NodeArray<Node>, visitor: (node: Node) => Node, test: (node: Node) => boolean, parenthesize: (node: Node, parentNode: Node) => Node, parentNode: Node, start: number, count: number): NodeArray<Node> {
+    function visitNodesWorker(nodes: NodeArray<Node>, visitor: (node: Node) => VisitResult<Node>, test: (node: Node) => boolean, parenthesize: (node: Node, parentNode: Node) => Node, parentNode: Node, start: number, count: number): NodeArray<Node> {
         if (nodes === undefined) {
             return undefined;
         }
 
-        let updated: Node[];
+        let updated: NodeArray<Node>;
 
         // Ensure start and count have valid values
         const length = nodes.length;
@@ -560,9 +573,12 @@ namespace ts {
             count = length - start;
         }
 
-        // If we are not visiting all of the original nodes, we must always create a new array.
         if (start > 0 || count < length) {
-            updated = [];
+            // 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.
@@ -572,20 +588,14 @@ namespace ts {
             if (updated !== undefined || visited === undefined || visited !== node) {
                 if (updated === undefined) {
                     // Ensure we have a copy of `nodes`, up to the current index.
-                    updated = nodes.slice(0, i);
+                    updated = createNodeArray(nodes.slice(0, i), /*location*/ nodes, nodes.hasTrailingComma);
                 }
 
                 addNodeWorker(updated, visited, /*addOnNewLine*/ undefined, test, parenthesize, parentNode, /*isVisiting*/ visited !== node);
             }
         }
 
-        if (updated !== undefined) {
-            return isModifiersArray(nodes)
-                ? createModifiersArray(updated, nodes)
-                : createNodeArray(updated, nodes, nodes.hasTrailingComma);
-        }
-
-        return nodes;
+        return updated || nodes;
     }
 
     /**
@@ -595,8 +605,8 @@ namespace ts {
      * @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) => Node, context: LexicalEnvironment): T;
-    export function visitEachChild<T extends Node>(node: T & Map<any>, visitor: (node: Node) => Node, context: LexicalEnvironment): T {
+    export function visitEachChild<T extends Node>(node: T, visitor: (node: Node) => VisitResult<Node>, context: LexicalEnvironment): T;
+    export function visitEachChild<T extends Node>(node: T & Map<any>, visitor: (node: Node) => VisitResult<Node>, context: LexicalEnvironment): T {
         if (node === undefined) {
             return undefined;
         }
@@ -611,17 +621,12 @@ namespace ts {
 
         const edgeTraversalPath = nodeEdgeTraversalMap[node.kind];
         if (edgeTraversalPath) {
-            let modifiers: NodeFlags;
             for (const edge of edgeTraversalPath) {
                 const value = <Node | NodeArray<Node>>node[edge.name];
                 if (value !== undefined) {
                     let visited: Node | NodeArray<Node>;
                     if (isArray(value)) {
                         const visitedArray = visitNodesWorker(value, visitor, edge.test, edge.parenthesize, node, 0, value.length);
-                        if (isModifiersArray(visitedArray)) {
-                            modifiers = visitedArray.flags;
-                        }
-
                         visited = visitedArray;
                     }
                     else {
@@ -631,12 +636,6 @@ namespace ts {
                     if (updated !== undefined || visited !== value) {
                         if (updated === undefined) {
                             updated = getMutableClone(node);
-                            updated.flags &= ~NodeFlags.Modifier;
-                        }
-
-                        if (modifiers) {
-                            updated.flags |= modifiers;
-                            modifiers = undefined;
                         }
 
                         if (visited !== value) {
@@ -666,33 +665,13 @@ namespace ts {
         return updated;
     }
 
-    /**
-     * Flattens an array of nodes that could contain NodeArrayNodes.
-     */
-    export function flattenNodes<T extends Node>(nodes: OneOrMany<T>[]): T[] {
-        let result: T[];
-        if (nodes) {
-            for (let i = 0; i < nodes.length; i++) {
-                const node = nodes[i];
-                if (result || node === undefined || isNodeArrayNode(node)) {
-                    if (!result) {
-                        result = <T[]>nodes.slice(0, i);
-                    }
-                    addNode(result, node);
-                }
-            }
-        }
-
-        return result || <T[]>nodes;
-    }
-
     /**
      * Appends a node to an array.
      *
      * @param to The destination array.
      * @param from The source Node or NodeArrayNode.
      */
-    export function addNode<T extends Node>(to: T[], from: OneOrMany<T>, startOnNewLine?: boolean) {
+    export function addNode<T extends Node>(to: T[], from: VisitResult<T>, startOnNewLine?: boolean): void {
         addNodeWorker(to, from, startOnNewLine, /*test*/ undefined, /*parenthesize*/ undefined, /*parentNode*/ undefined, /*isVisiting*/ false);
     }
 
@@ -702,36 +681,36 @@ namespace ts {
      * @param to The destination NodeArray.
      * @param from The source array of Node or NodeArrayNode.
      */
-    export function addNodes<T extends Node>(to: T[], from: OneOrMany<T>[], startOnNewLine?: boolean) {
+    export function addNodes<T extends Node>(to: T[], from: VisitResult<T>[], startOnNewLine?: boolean): void {
         addNodesWorker(to, from, startOnNewLine, /*test*/ undefined, /*parenthesize*/ undefined, /*parentNode*/ undefined, /*isVisiting*/ false);
     }
 
-    function addNodeWorker(to: Node[], from: OneOrMany<Node>, startOnNewLine: boolean, test: (node: Node) => boolean, parenthesize: (node: Node, parentNode: Node) => Node, parentNode: Node, isVisiting: boolean) {
+    function addNodeWorker(to: Node[], from: VisitResult<Node>, startOnNewLine: boolean, test: (node: Node) => boolean, parenthesize: (node: Node, parentNode: Node) => Node, parentNode: Node, isVisiting: boolean): void {
         if (to && from) {
-            if (isNodeArrayNode(from)) {
-                addNodesWorker(to, from.nodes, startOnNewLine, test, parenthesize, parentNode, isVisiting);
-                return;
+            if (isArray(from)) {
+                addNodesWorker(to, from, startOnNewLine, test, parenthesize, parentNode, isVisiting);
             }
+            else {
+                const node = parenthesize !== undefined
+                    ? parenthesize(from, parentNode)
+                    : from;
 
-            if (parenthesize !== undefined) {
-                from = parenthesize(from, parentNode);
+                Debug.assertNode(node, test);
+
+                if (startOnNewLine) {
+                    node.startsOnNewLine = true;
+                }
+
+                if (isVisiting) {
+                    aggregateTransformFlags(node);
+                }
+
+                to.push(node);
             }
-
-            Debug.assert(test === undefined || test(from), "Wrong node type after visit.");
-
-            if (startOnNewLine) {
-                from.startsOnNewLine = true;
-            }
-
-            if (isVisiting) {
-                aggregateTransformFlags(from);
-            }
-
-            to.push(from);
         }
     }
 
-    function addNodesWorker(to: Node[], from: OneOrMany<Node>[], startOnNewLine: boolean, test: (node: Node) => boolean, parenthesize: (node: Node, parentNode: Node) => Node, parentNode: Node, isVisiting: boolean) {
+    function addNodesWorker(to: Node[], from: VisitResult<Node>[], startOnNewLine: boolean, test: (node: Node) => boolean, parenthesize: (node: Node, parentNode: Node) => Node, parentNode: Node, isVisiting: boolean): void {
         if (to && from) {
             for (const node of from) {
                 addNodeWorker(to, node, startOnNewLine, test, parenthesize, parentNode, isVisiting);
@@ -772,9 +751,9 @@ namespace ts {
      * @param node The SourceFile node.
      * @param declarations The generated lexical declarations.
      */
-    export function mergeSourceFileLexicalEnvironment(node: SourceFile, declarations: Statement[]) {
+    export function mergeSourceFileLexicalEnvironment(node: SourceFile, declarations: Statement[]): SourceFile {
         if (declarations !== undefined && declarations.length) {
-            const mutableNode = cloneNode(node, /*location*/ node, node.flags, /*parent*/ undefined, /*original*/ node);
+            const mutableNode = getMutableClone(node);
             mutableNode.statements = mergeStatements(mutableNode.statements, declarations);
             return mutableNode;
         }
@@ -788,10 +767,10 @@ namespace ts {
      * @param node The ModuleDeclaration node.
      * @param declarations The generated lexical declarations.
      */
-    export function mergeModuleDeclarationLexicalEnvironment(node: ModuleDeclaration, declarations: Statement[]) {
+    export function mergeModuleDeclarationLexicalEnvironment(node: ModuleDeclaration, declarations: Statement[]): ModuleDeclaration {
         Debug.assert(node.body.kind === SyntaxKind.ModuleBlock);
         if (declarations !== undefined && declarations.length) {
-            const mutableNode = cloneNode(node, /*location*/ node, node.flags, /*parent*/ undefined, /*original*/ node);
+            const mutableNode = getMutableClone(node);
             mutableNode.body = mergeBlockLexicalEnvironment(<ModuleBlock>node.body, declarations);
             return mutableNode;
         }
@@ -805,10 +784,10 @@ namespace ts {
      * @param node The function-like node.
      * @param declarations The generated lexical declarations.
      */
-    function mergeFunctionLikeLexicalEnvironment(node: FunctionLikeDeclaration, declarations: Statement[]) {
+    function mergeFunctionLikeLexicalEnvironment(node: FunctionLikeDeclaration, declarations: Statement[]): FunctionLikeDeclaration {
         Debug.assert(node.body !== undefined);
         if (declarations !== undefined && declarations.length) {
-            const mutableNode = cloneNode(node, /*location*/ node, node.flags, /*parent*/ undefined, /*original*/ node);
+            const mutableNode = getMutableClone(node);
             mutableNode.body = mergeConciseBodyLexicalEnvironment(mutableNode.body, declarations);
             return mutableNode;
         }
@@ -822,7 +801,7 @@ namespace ts {
      * @param node The ConciseBody of an arrow function.
      * @param declarations The lexical declarations to merge.
      */
-    export function mergeFunctionBodyLexicalEnvironment(body: FunctionBody, declarations: Statement[]) {
+    export function mergeFunctionBodyLexicalEnvironment(body: FunctionBody, declarations: Statement[]): FunctionBody {
         if (declarations !== undefined && declarations.length > 0) {
             return mergeBlockLexicalEnvironment(body, declarations);
         }
@@ -836,7 +815,7 @@ namespace ts {
      * @param node The ConciseBody of an arrow function.
      * @param declarations The lexical declarations to merge.
      */
-    export function mergeConciseBodyLexicalEnvironment(body: ConciseBody, declarations: Statement[]) {
+    export function mergeConciseBodyLexicalEnvironment(body: ConciseBody, declarations: Statement[]): ConciseBody {
         if (declarations !== undefined && declarations.length > 0) {
             if (isBlock(body)) {
                 return mergeBlockLexicalEnvironment(body, declarations);
@@ -858,8 +837,8 @@ namespace ts {
      * @param node The block into which to merge lexical declarations.
      * @param declarations The lexical declarations to merge.
      */
-    function mergeBlockLexicalEnvironment<T extends Block>(node: T, declarations: Statement[]) {
-        const mutableNode = cloneNode(node, /*location*/ node, node.flags, /*parent*/ undefined, /*original*/ node);
+    function mergeBlockLexicalEnvironment<T extends Block>(node: T, declarations: Statement[]): T {
+        const mutableNode = getMutableClone(node);
         mutableNode.statements = mergeStatements(node.statements, declarations);
         return mutableNode;
     }
@@ -870,7 +849,7 @@ namespace ts {
      * @param statements The node array to concatentate with the supplied lexical declarations.
      * @param declarations The lexical declarations to merge.
      */
-    function mergeStatements(statements: NodeArray<Statement>, declarations: Statement[]) {
+    function mergeStatements(statements: NodeArray<Statement>, declarations: Statement[]): NodeArray<Statement> {
         return createNodeArray(concatenate(statements, declarations), /*location*/ statements);
     }
 
@@ -879,9 +858,9 @@ namespace ts {
      *
      * @param nodes The NodeArray.
      */
-    export function liftToBlock(nodes: NodeArray<Node>) {
+    export function liftToBlock(nodes: Node[]): Statement {
         Debug.assert(every(nodes, isStatement), "Cannot lift nodes to a Block.");
-        return createBlock(<NodeArray<Statement>>nodes);
+        return <Statement>singleOrUndefined(nodes) || createBlock(<NodeArray<Statement>>nodes);
     }
 
     /**
@@ -889,9 +868,9 @@ namespace ts {
      *
      * @param nodes The NodeArray.
      */
-    function extractSingleNode(nodes: NodeArray<Node>) {
+    function extractSingleNode(nodes: Node[]): Node {
         Debug.assert(nodes.length <= 1, "Too many nodes written to output.");
-        return nodes.length > 0 ? nodes[0] : undefined;
+        return singleOrUndefined(nodes);
     }
 
     /**
@@ -911,15 +890,15 @@ namespace ts {
      */
     function aggregateTransformFlagsForNode(node: Node): TransformFlags {
         if (node === undefined) {
-            return <TransformFlags>0;
+            return TransformFlags.None;
         }
-
-        if (node.transformFlags === undefined) {
+        else if (node.transformFlags & TransformFlags.HasComputedFlags) {
+            return node.transformFlags & ~node.excludeTransformFlags;
+        }
+        else {
             const subtreeFlags = aggregateTransformFlagsForSubtree(node);
             return computeTransformFlagsForNode(node, subtreeFlags);
         }
-
-        return node.transformFlags & ~node.excludeTransformFlags;
     }
 
     /**
@@ -928,12 +907,12 @@ namespace ts {
     function aggregateTransformFlagsForSubtree(node: Node): TransformFlags {
         // We do not transform ambient declarations or types, so there is no need to
         // recursively aggregate transform flags.
-        if (node.flags & NodeFlags.Ambient || isTypeNode(node)) {
-            return <TransformFlags>0;
+        if (hasModifier(node, ModifierFlags.Ambient) || isTypeNode(node)) {
+            return TransformFlags.None;
         }
 
         // Aggregate the transform flags of each child.
-        return reduceEachChild<TransformFlags>(node, aggregateTransformFlagsForChildNode, 0);
+        return reduceEachChild(node, aggregateTransformFlagsForChildNode, TransformFlags.None);
     }
 
     /**
@@ -943,4 +922,43 @@ namespace ts {
     function aggregateTransformFlagsForChildNode(transformFlags: TransformFlags, child: Node): TransformFlags {
         return transformFlags | aggregateTransformFlagsForNode(child);
     }
+
+    export namespace Debug {
+        export function failNotOptional(message?: string) {
+            if (shouldAssert(AssertionLevel.Normal)) {
+                Debug.assert(false, message || "Node not optional.");
+            }
+        }
+
+        export function failBadSyntaxKind(node: Node, message?: string) {
+            if (shouldAssert(AssertionLevel.Normal)) {
+                Debug.assert(false,
+                    message || "Unexpected node.",
+                    () => `Node ${formatSyntaxKind(node.kind)} was unexpected.`);
+            }
+        }
+
+        export function assertNode<T extends Node>(node: Node, test: (node: Node) => boolean, message?: string): void {
+            if (shouldAssert(AssertionLevel.Normal)) {
+                Debug.assert(
+                    test === undefined || test(node),
+                    message || "Unexpected node.",
+                    () => `Node ${formatSyntaxKind(node.kind)} did not pass test '${getFunctionName(test)}'.`);
+            };
+        }
+
+        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 8b199559412..4842fd5a723 100644
--- a/src/harness/compilerRunner.ts
+++ b/src/harness/compilerRunner.ts
@@ -1,7 +1,7 @@
 /// <reference path="harness.ts" />
 /// <reference path="runnerbase.ts" />
 /// <reference path="typeWriter.ts" />
-/* tslint:disable:no-null */
+/* tslint:disable:no-null-keyword */
 
 const enum CompilerTestType {
     Conformance,
@@ -88,7 +88,7 @@ class CompilerBaselineRunner extends RunnerBase {
                 toBeCompiled = [];
                 otherFiles = [];
 
-                if (/require\(/.test(lastUnit.content) || /reference\spath/.test(lastUnit.content)) {
+                if (testCaseContent.settings["noImplicitReferences"] || /require\(/.test(lastUnit.content) || /reference\spath/.test(lastUnit.content)) {
                     toBeCompiled.push({ unitName: this.makeUnitName(lastUnit.name, rootDir), content: lastUnit.content });
                     units.forEach(unit => {
                         if (unit.name !== lastUnit.name) {
@@ -102,6 +102,10 @@ class CompilerBaselineRunner extends RunnerBase {
                     });
                 }
 
+                if (tsConfigOptions && tsConfigOptions.configFilePath !== undefined) {
+                    tsConfigOptions.configFilePath = ts.combinePaths(rootDir, tsConfigOptions.configFilePath);
+                }
+
                 const output = Harness.Compiler.compileFiles(
                     toBeCompiled, otherFiles, harnessSettings, /*options*/ tsConfigOptions, /*currentDirectory*/ undefined);
 
@@ -140,7 +144,7 @@ class CompilerBaselineRunner extends RunnerBase {
             });
 
             it (`Correct module resolution tracing for ${fileName}`, () => {
-                if (options.traceModuleResolution) {
+                if (options.traceResolution) {
                     Harness.Baseline.runBaseline("Correct sourcemap content for " + fileName, justName.replace(/\.tsx?$/, ".trace.json"), () => {
                         return JSON.stringify(result.traceResults || [], undefined, 4);
                     });
@@ -252,125 +256,128 @@ class CompilerBaselineRunner extends RunnerBase {
                 }
 
                 // NEWTODO: Type baselines
-                if (result.errors.length === 0) {
-                    // The full walker simulates the types that you would get from doing a full
-                    // compile.  The pull walker simulates the types you get when you just do
-                    // a type query for a random node (like how the LS would do it).  Most of the
-                    // time, these will be the same.  However, occasionally, they can be different.
-                    // Specifically, when the compiler internally depends on symbol IDs to order
-                    // things, then we may see different results because symbols can be created in a
-                    // different order with 'pull' operations, and thus can produce slightly differing
-                    // output.
-                    //
-                    // For example, with a full type check, we may see a type outputed as: number | string
-                    // But with a pull type check, we may see it as:                       string | number
-                    //
-                    // These types are equivalent, but depend on what order the compiler observed
-                    // certain parts of the program.
-
-                    const program = result.program;
-                    const allFiles = toBeCompiled.concat(otherFiles).filter(file => !!program.getSourceFile(file.unitName));
-
-                    const fullWalker = new TypeWriterWalker(program, /*fullTypeCheck*/ true);
-
-                    const fullResults: ts.Map<TypeWriterResult[]> = {};
-                    const pullResults: ts.Map<TypeWriterResult[]> = {};
-
-                    for (const sourceFile of allFiles) {
-                        fullResults[sourceFile.unitName] = fullWalker.getTypeAndSymbols(sourceFile.unitName);
-                        pullResults[sourceFile.unitName] = fullWalker.getTypeAndSymbols(sourceFile.unitName);
-                    }
-
-                    // Produce baselines.  The first gives the types for all expressions.
-                    // The second gives symbols for all identifiers.
-                    let e1: Error, e2: Error;
-                    try {
-                        checkBaseLines(/*isSymbolBaseLine*/ false);
-                    }
-                    catch (e) {
-                        e1 = e;
-                    }
-
-                    try {
-                        checkBaseLines(/*isSymbolBaseLine*/ true);
-                    }
-                    catch (e) {
-                        e2 = e;
-                    }
-
-                    if (e1 || e2) {
-                        throw e1 || e2;
-                    }
-
+                if (result.errors.length !== 0) {
                     return;
+                }
 
-                    function checkBaseLines(isSymbolBaseLine: boolean) {
-                        const fullBaseLine = generateBaseLine(fullResults, isSymbolBaseLine);
-                        const pullBaseLine = generateBaseLine(pullResults, isSymbolBaseLine);
+                // The full walker simulates the types that you would get from doing a full
+                // compile.  The pull walker simulates the types you get when you just do
+                // a type query for a random node (like how the LS would do it).  Most of the
+                // time, these will be the same.  However, occasionally, they can be different.
+                // Specifically, when the compiler internally depends on symbol IDs to order
+                // things, then we may see different results because symbols can be created in a
+                // different order with 'pull' operations, and thus can produce slightly differing
+                // output.
+                //
+                // For example, with a full type check, we may see a type displayed as: number | string
+                // But with a pull type check, we may see it as:                        string | number
+                //
+                // These types are equivalent, but depend on what order the compiler observed
+                // certain parts of the program.
 
-                        const fullExtension = isSymbolBaseLine ? ".symbols" : ".types";
-                        const pullExtension = isSymbolBaseLine ? ".symbols.pull" : ".types.pull";
+                const program = result.program;
+                const allFiles = toBeCompiled.concat(otherFiles).filter(file => !!program.getSourceFile(file.unitName));
 
-                        if (fullBaseLine !== pullBaseLine) {
-                            Harness.Baseline.runBaseline("Correct full information for " + fileName, justName.replace(/\.tsx?/, fullExtension), () => fullBaseLine);
-                            Harness.Baseline.runBaseline("Correct pull information for " + fileName, justName.replace(/\.tsx?/, pullExtension), () => pullBaseLine);
-                        }
-                        else {
-                            Harness.Baseline.runBaseline("Correct information for " + fileName, justName.replace(/\.tsx?/, fullExtension), () => fullBaseLine);
-                        }
+                const fullWalker = new TypeWriterWalker(program, /*fullTypeCheck*/ true);
+
+                const fullResults: ts.Map<TypeWriterResult[]> = {};
+                const pullResults: ts.Map<TypeWriterResult[]> = {};
+
+                for (const sourceFile of allFiles) {
+                    fullResults[sourceFile.unitName] = fullWalker.getTypeAndSymbols(sourceFile.unitName);
+                    pullResults[sourceFile.unitName] = fullWalker.getTypeAndSymbols(sourceFile.unitName);
+                }
+
+                // Produce baselines.  The first gives the types for all expressions.
+                // The second gives symbols for all identifiers.
+                let e1: Error, e2: Error;
+                try {
+                    checkBaseLines(/*isSymbolBaseLine*/ false);
+                }
+                catch (e) {
+                    e1 = e;
+                }
+
+                try {
+                    checkBaseLines(/*isSymbolBaseLine*/ true);
+                }
+                catch (e) {
+                    e2 = e;
+                }
+
+                if (e1 || e2) {
+                    throw e1 || e2;
+                }
+
+                return;
+
+                function checkBaseLines(isSymbolBaseLine: boolean) {
+                    const fullBaseLine = generateBaseLine(fullResults, isSymbolBaseLine);
+                    const pullBaseLine = generateBaseLine(pullResults, isSymbolBaseLine);
+
+                    const fullExtension = isSymbolBaseLine ? ".symbols" : ".types";
+                    const pullExtension = isSymbolBaseLine ? ".symbols.pull" : ".types.pull";
+
+                    if (fullBaseLine !== pullBaseLine) {
+                        Harness.Baseline.runBaseline("Correct full information for " + fileName, justName.replace(/\.tsx?/, fullExtension), () => fullBaseLine);
+                        Harness.Baseline.runBaseline("Correct pull information for " + fileName, justName.replace(/\.tsx?/, pullExtension), () => pullBaseLine);
                     }
-
-                    function generateBaseLine(typeWriterResults: ts.Map<TypeWriterResult[]>, isSymbolBaseline: boolean): string {
-                        const typeLines: string[] = [];
-                        const typeMap: { [fileName: string]: { [lineNum: number]: string[]; } } = {};
-
-                        allFiles.forEach(file => {
-                            const codeLines = file.content.split("\n");
-                            typeWriterResults[file.unitName].forEach(result => {
-                                if (isSymbolBaseline && !result.symbol) {
-                                    return;
-                                }
-
-                                const typeOrSymbolString = isSymbolBaseline ? result.symbol : result.type;
-                                const formattedLine = result.sourceText.replace(/\r?\n/g, "") + " : " + typeOrSymbolString;
-                                if (!typeMap[file.unitName]) {
-                                    typeMap[file.unitName] = {};
-                                }
-
-                                let typeInfo = [formattedLine];
-                                const existingTypeInfo = typeMap[file.unitName][result.line];
-                                if (existingTypeInfo) {
-                                    typeInfo = existingTypeInfo.concat(typeInfo);
-                                }
-                                typeMap[file.unitName][result.line] = typeInfo;
-                            });
-
-                            typeLines.push("=== " + file.unitName + " ===\r\n");
-                            for (let i = 0; i < codeLines.length; i++) {
-                                const currentCodeLine = codeLines[i];
-                                typeLines.push(currentCodeLine + "\r\n");
-                                if (typeMap[file.unitName]) {
-                                    const typeInfo = typeMap[file.unitName][i];
-                                    if (typeInfo) {
-                                        typeInfo.forEach(ty => {
-                                            typeLines.push(">" + ty + "\r\n");
-                                        });
-                                        if (i + 1 < codeLines.length && (codeLines[i + 1].match(/^\s*[{|}]\s*$/) || codeLines[i + 1].trim() === "")) {
-                                        }
-                                        else {
-                                            typeLines.push("\r\n");
-                                        }
-                                    }
-                                }
-                                else {
-                                    typeLines.push("No type information for this code.");
-                                }
-                            }
-                        });
-
-                        return typeLines.join("");
+                    else {
+                        Harness.Baseline.runBaseline("Correct information for " + fileName, justName.replace(/\.tsx?/, fullExtension), () => fullBaseLine);
                     }
                 }
+
+                function generateBaseLine(typeWriterResults: ts.Map<TypeWriterResult[]>, isSymbolBaseline: boolean): string {
+                    const typeLines: string[] = [];
+                    const typeMap: { [fileName: string]: { [lineNum: number]: string[]; } } = {};
+
+                    allFiles.forEach(file => {
+                        const codeLines = file.content.split("\n");
+                        typeWriterResults[file.unitName].forEach(result => {
+                            if (isSymbolBaseline && !result.symbol) {
+                                return;
+                            }
+
+                            const typeOrSymbolString = isSymbolBaseline ? result.symbol : result.type;
+                            const formattedLine = result.sourceText.replace(/\r?\n/g, "") + " : " + typeOrSymbolString;
+                            if (!typeMap[file.unitName]) {
+                                typeMap[file.unitName] = {};
+                            }
+
+                            let typeInfo = [formattedLine];
+                            const existingTypeInfo = typeMap[file.unitName][result.line];
+                            if (existingTypeInfo) {
+                                typeInfo = existingTypeInfo.concat(typeInfo);
+                            }
+                            typeMap[file.unitName][result.line] = typeInfo;
+                        });
+
+                        typeLines.push("=== " + file.unitName + " ===\r\n");
+                        for (let i = 0; i < codeLines.length; i++) {
+                            const currentCodeLine = codeLines[i];
+                            typeLines.push(currentCodeLine + "\r\n");
+                            if (typeMap[file.unitName]) {
+                                const typeInfo = typeMap[file.unitName][i];
+                                if (typeInfo) {
+                                    typeInfo.forEach(ty => {
+                                        typeLines.push(">" + ty + "\r\n");
+                                    });
+                                    if (i + 1 < codeLines.length && (codeLines[i + 1].match(/^\s*[{|}]\s*$/) || codeLines[i + 1].trim() === "")) {
+                                    }
+                                    else {
+                                        typeLines.push("\r\n");
+                                    }
+                                }
+                            }
+                            else {
+                                typeLines.push("No type information for this code.");
+                            }
+                        }
+                    });
+
+                    return typeLines.join("");
+                }
+
             });
         });
     }
diff --git a/src/harness/external/node.d.ts b/src/harness/external/node.d.ts
index a62e1f6741a..b89174cef7c 100644
--- a/src/harness/external/node.d.ts
+++ b/src/harness/external/node.d.ts
@@ -1073,7 +1073,7 @@ declare module "crypto" {
         update(data: any): void;
         sign(private_key: string, output_format: string): string;
     }
-    export function createVerify(algorith: string): Verify;
+    export function createVerify(algorithm: string): Verify;
     interface Verify {
         update(data: any): void;
         verify(object: string, signature: string, signature_format?: string): boolean;
@@ -1237,7 +1237,7 @@ declare module "assert" {
         export function equal(actual: any, expected: any, message?: string): void;
         export function notEqual(actual: any, expected: any, message?: string): void;
         export function deepEqual(actual: any, expected: any, message?: string): void;
-        export function notDeepEqual(acutal: any, expected: any, message?: string): void;
+        export function notDeepEqual(actual: any, expected: any, message?: string): void;
         export function strictEqual(actual: any, expected: any, message?: string): void;
         export function notStrictEqual(actual: any, expected: any, message?: string): void;
         export var throws: {
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index ee1bf4846df..35748648f41 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -18,7 +18,7 @@
 /// <reference path="harnessLanguageService.ts" />
 /// <reference path="harness.ts" />
 /// <reference path="fourslashRunner.ts" />
-/* tslint:disable:no-null */
+/* tslint:disable:no-null-keyword */
 
 namespace FourSlash {
     ts.disableIncrementalParsing = false;
@@ -221,8 +221,8 @@ namespace FourSlash {
 
             function tryAdd(path: string) {
                 const inputFile = inputFiles[path];
-                if (inputFile && !Harness.isLibraryFile(path)) {
-                    languageServiceAdapterHost.addScript(path, inputFile);
+                if (inputFile && !Harness.isDefaultLibraryFile(path)) {
+                    languageServiceAdapterHost.addScript(path, inputFile, /*isRootFile*/ true);
                     return true;
                 }
             }
@@ -231,13 +231,13 @@ namespace FourSlash {
         private getLanguageServiceAdapter(testType: FourSlashTestType, cancellationToken: TestCancellationToken, compilationOptions: ts.CompilerOptions): Harness.LanguageService.LanguageServiceAdapter {
             switch (testType) {
                 case FourSlashTestType.Native:
-                    return new Harness.LanguageService.NativeLanugageServiceAdapter(cancellationToken, compilationOptions);
+                    return new Harness.LanguageService.NativeLanguageServiceAdapter(cancellationToken, compilationOptions);
                 case FourSlashTestType.Shims:
-                    return new Harness.LanguageService.ShimLanugageServiceAdapter(/*preprocessToResolve*/ false, cancellationToken, compilationOptions);
+                    return new Harness.LanguageService.ShimLanguageServiceAdapter(/*preprocessToResolve*/ false, cancellationToken, compilationOptions);
                 case FourSlashTestType.ShimsWithPreprocess:
-                    return new Harness.LanguageService.ShimLanugageServiceAdapter(/*preprocessToResolve*/ true, cancellationToken, compilationOptions);
+                    return new Harness.LanguageService.ShimLanguageServiceAdapter(/*preprocessToResolve*/ true, cancellationToken, compilationOptions);
                 case FourSlashTestType.Server:
-                    return new Harness.LanguageService.ServerLanugageServiceAdapter(cancellationToken, compilationOptions);
+                    return new Harness.LanguageService.ServerLanguageServiceAdapter(cancellationToken, compilationOptions);
                 default:
                     throw new Error("Unknown FourSlash test type: ");
             }
@@ -247,6 +247,10 @@ namespace FourSlash {
             // Create a new Services Adapter
             this.cancellationToken = new TestCancellationToken();
             const compilationOptions = convertGlobalOptionsToCompilerOptions(this.testData.globalOptions);
+            if (compilationOptions.typesRoot) {
+                compilationOptions.typesRoot = ts.getNormalizedAbsolutePath(compilationOptions.typesRoot, this.basePath);
+            }
+
             const languageServiceAdapter = this.getLanguageServiceAdapter(testType, this.cancellationToken, compilationOptions);
             this.languageServiceAdapterHost = languageServiceAdapter.getHost();
             this.languageService = languageServiceAdapter.getLanguageService();
@@ -268,7 +272,7 @@ namespace FourSlash {
 
             if (startResolveFileRef) {
                 // Add the entry-point file itself into the languageServiceShimHost
-                this.languageServiceAdapterHost.addScript(startResolveFileRef.fileName, startResolveFileRef.content);
+                this.languageServiceAdapterHost.addScript(startResolveFileRef.fileName, startResolveFileRef.content, /*isRootFile*/ true);
 
                 const resolvedResult = languageServiceAdapter.getPreProcessedFileInfo(startResolveFileRef.fileName, startResolveFileRef.content);
                 const referencedFiles: ts.FileReference[] = resolvedResult.referencedFiles;
@@ -291,17 +295,19 @@ namespace FourSlash {
 
                 // Check if no-default-lib flag is false and if so add default library
                 if (!resolvedResult.isLibFile) {
-                    this.languageServiceAdapterHost.addScript(Harness.Compiler.defaultLibFileName, Harness.Compiler.defaultLibSourceFile.text);
+                    this.languageServiceAdapterHost.addScript(Harness.Compiler.defaultLibFileName,
+                        Harness.Compiler.getDefaultLibrarySourceFile().text, /*isRootFile*/ false);
                 }
             }
             else {
                 // resolveReference file-option is not specified then do not resolve any files and include all inputFiles
                 ts.forEachKey(this.inputFiles, fileName => {
-                    if (!Harness.isLibraryFile(fileName)) {
-                        this.languageServiceAdapterHost.addScript(fileName, this.inputFiles[fileName]);
+                    if (!Harness.isDefaultLibraryFile(fileName)) {
+                        this.languageServiceAdapterHost.addScript(fileName, this.inputFiles[fileName], /*isRootFile*/ true);
                     }
                 });
-                this.languageServiceAdapterHost.addScript(Harness.Compiler.defaultLibFileName, Harness.Compiler.defaultLibSourceFile.text);
+                this.languageServiceAdapterHost.addScript(Harness.Compiler.defaultLibFileName,
+                    Harness.Compiler.getDefaultLibrarySourceFile().text, /*isRootFile*/ false);
             }
 
             this.formatCodeOptions = {
@@ -649,7 +655,7 @@ namespace FourSlash {
                 this.assertItemInCompletionList(completions.entries, symbol, text, documentation, kind);
             }
             else {
-                this.raiseError(`No completions at position '${ this.currentCaretPosition }' when looking for '${ symbol }'.`);
+                this.raiseError(`No completions at position '${this.currentCaretPosition}' when looking for '${symbol}'.`);
             }
         }
 
@@ -1279,7 +1285,7 @@ namespace FourSlash {
                     const edits = this.languageService.getFormattingEditsAfterKeystroke(this.activeFile.fileName, offset, ch, this.formatCodeOptions);
                     if (edits.length) {
                         offset += this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true);
-                        // this.checkPostEditInletiants();
+                        // this.checkPostEditInvariants();
                     }
                 }
             }
@@ -1370,7 +1376,7 @@ namespace FourSlash {
                     const edits = this.languageService.getFormattingEditsAfterKeystroke(this.activeFile.fileName, offset, ch, this.formatCodeOptions);
                     if (edits.length) {
                         offset += this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true);
-                        // this.checkPostEditInletiants();
+                        // this.checkPostEditInvariants();
                     }
                 }
             }
@@ -1414,7 +1420,7 @@ namespace FourSlash {
                 return;
             }
 
-            const incrementalSourceFile = this.languageService.getSourceFile(this.activeFile.fileName);
+            const incrementalSourceFile = this.languageService.getNonBoundSourceFile(this.activeFile.fileName);
             Utils.assertInvariants(incrementalSourceFile, /*parent:*/ undefined);
 
             const incrementalSyntaxDiagnostics = incrementalSourceFile.parseDiagnostics;
@@ -1752,13 +1758,13 @@ namespace FourSlash {
                 const actual = (<ts.server.SessionClient>this.languageService).getProjectInfo(
                     this.activeFile.fileName,
                     /* needFileNameList */ true
-                    );
+                );
                 assert.equal(
                     expected.join(","),
-                    actual.fileNames.map( file => {
+                    actual.fileNames.map(file => {
                         return file.replace(this.basePath + "/", "");
-                        }).join(",")
-                    );
+                    }).join(",")
+                );
             }
         }
 
@@ -1844,6 +1850,37 @@ namespace FourSlash {
             });
         }
 
+        public verifyBraceCompletionAtPostion(negative: boolean, openingBrace: string) {
+
+            const openBraceMap: ts.Map<ts.CharacterCodes> = {
+                "(": ts.CharacterCodes.openParen,
+                "{": ts.CharacterCodes.openBrace,
+                "[": ts.CharacterCodes.openBracket,
+                "'": ts.CharacterCodes.singleQuote,
+                '"': ts.CharacterCodes.doubleQuote,
+                "`": ts.CharacterCodes.backtick,
+                "<": ts.CharacterCodes.lessThan
+            };
+
+            const charCode = openBraceMap[openingBrace];
+
+            if (!charCode) {
+                this.raiseError(`Invalid openingBrace '${openingBrace}' specified.`);
+            }
+
+            const position = this.currentCaretPosition;
+
+            const validBraceCompletion = this.languageService.isValidBraceCompletionAtPostion(this.activeFile.fileName, position, charCode);
+
+            if (!negative && !validBraceCompletion) {
+                this.raiseError(`${position} is not a valid brace completion position for ${openingBrace}`);
+            }
+
+            if (negative && validBraceCompletion) {
+                this.raiseError(`${position} is a valid brace completion position for ${openingBrace}`);
+            }
+        }
+
         public verifyMatchingBracePosition(bracePosition: number, expectedMatchPosition: number) {
             const actual = this.languageService.getBraceMatchingAtPosition(this.activeFile.fileName, bracePosition);
 
@@ -2233,7 +2270,7 @@ namespace FourSlash {
         };
 
         const host = Harness.Compiler.createCompilerHost(
-            [ fourslashFile, testFile ],
+            [fourslashFile, testFile],
             (fn, contents) => result = contents,
             ts.ScriptTarget.Latest,
             Harness.IO.useCaseSensitiveFileNames(),
@@ -2245,8 +2282,8 @@ namespace FourSlash {
 
         const diagnostics = ts.getPreEmitDiagnostics(program, sourceFile);
         if (diagnostics.length > 0) {
-            throw new Error(`Error compiling ${fileName}: ` +
-                diagnostics.map(e => ts.flattenDiagnosticMessageText(e.messageText, Harness.IO.newLine())).join("\r\n"));
+            const diagnosticText = diagnostics.map(e => ts.flattenDiagnosticMessageText(e.messageText, Harness.IO.newLine())).join("\r\n");
+            throw new Error(`Error compiling ${fileName}: ${diagnosticText}`);
         }
 
         program.emit(sourceFile);
@@ -2258,7 +2295,7 @@ namespace FourSlash {
     function runCode(code: string, state: TestState): void {
         // Compile and execute the test
         const wrappedCode =
-`(function(test, goTo, verify, edit, debug, format, cancellation, classification, verifyOperationIsCancelled) {
+            `(function(test, goTo, verify, edit, debug, format, cancellation, classification, verifyOperationIsCancelled) {
 ${code}
 })`;
         try {
@@ -2372,7 +2409,7 @@ ${code}
                         }
                     }
                 }
-            // TODO: should be '==='?
+                // TODO: should be '==='?
             }
             else if (line == "" || lineLength === 0) {
                 // Previously blank lines between fourslash content caused it to be considered as 2 files,
@@ -2771,12 +2808,12 @@ namespace FourSlashInterface {
 
         // Verifies the member list contains the specified symbol. The
         // member list is brought up if necessary
-        public memberListContains(symbol: string, text?: string, documenation?: string, kind?: string) {
+        public memberListContains(symbol: string, text?: string, documentation?: string, kind?: string) {
             if (this.negative) {
                 this.state.verifyMemberListDoesNotContain(symbol);
             }
             else {
-                this.state.verifyMemberListContains(symbol, text, documenation, kind);
+                this.state.verifyMemberListContains(symbol, text, documentation, kind);
             }
         }
 
@@ -2864,6 +2901,10 @@ namespace FourSlashInterface {
         public verifyDefinitionsName(name: string, containerName: string) {
             this.state.verifyDefinitionsName(this.negative, name, containerName);
         }
+
+        public isValidBraceCompletionAtPostion(openingBrace: string) {
+            this.state.verifyBraceCompletionAtPostion(this.negative, openingBrace);
+        }
     }
 
     export class Verify extends VerifyNegatable {
@@ -3082,7 +3123,7 @@ namespace FourSlashInterface {
             this.state.getSemanticDiagnostics(expected);
         }
 
-        public ProjectInfo(expected: string []) {
+        public ProjectInfo(expected: string[]) {
             this.state.verifyProjectInfo(expected);
         }
     }
diff --git a/src/harness/fourslashRunner.ts b/src/harness/fourslashRunner.ts
index 84e352359c4..386bd9e340c 100644
--- a/src/harness/fourslashRunner.ts
+++ b/src/harness/fourslashRunner.ts
@@ -1,7 +1,7 @@
 ///<reference path="fourslash.ts" />
 ///<reference path="harness.ts"/>
 ///<reference path="runnerbase.ts" />
-/* tslint:disable:no-null */
+/* tslint:disable:no-null-keyword */
 
 const enum FourSlashTestType {
     Native,
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
index 848b0d4e063..d2ed3664bd7 100644
--- a/src/harness/harness.ts
+++ b/src/harness/harness.ts
@@ -1,7 +1,7 @@
 
 //
 // Copyright (c) Microsoft Corporation.  All rights reserved.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -23,7 +23,7 @@
 /// <reference path="external\chai.d.ts"/>
 /// <reference path="sourceMapRecorder.ts"/>
 /// <reference path="runnerbase.ts"/>
-/* tslint:disable:no-null */
+/* tslint:disable:no-null-keyword */
 
 // Block scoped definitions work poorly for global variables, temporarily enable var
 /* tslint:disable:no-var-keyword */
@@ -65,6 +65,11 @@ namespace Utils {
         return Buffer ? (new Buffer(s)).toString("utf8") : s;
     }
 
+    export function byteLength(s: string, encoding?: string): number {
+        // stub implementation if Buffer is not available (in-browser case)
+        return Buffer ? Buffer.byteLength(s, encoding) : s.length;
+    }
+
     export function evalFile(fileContents: string, fileName: string, nodeContext?: any) {
         const environment = getExecutionEnvironment();
         switch (environment) {
@@ -346,7 +351,7 @@ namespace Utils {
         assert.equal(node1.end, node2.end, "node1.end !== node2.end");
         assert.equal(node1.kind, node2.kind, "node1.kind !== node2.kind");
 
-        // call this on both nodes to ensure all propagated flags have been set (and thus can be 
+        // call this on both nodes to ensure all propagated flags have been set (and thus can be
         // compared).
         assert.equal(ts.containsParseError(node1), ts.containsParseError(node2));
         assert.equal(node1.flags, node2.flags, "node1.flags !== node2.flags");
@@ -391,6 +396,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 {
@@ -426,6 +485,8 @@ namespace Harness {
         getExecutingFilePath(): string;
         exit(exitCode?: number): void;
         readDirectory(path: string, extension?: string, exclude?: string[]): string[];
+        tryEnableSourceMapsForHost?(): void;
+        getEnvironmentVariable?(name: string): string;
     }
     export var IO: IO;
 
@@ -464,6 +525,7 @@ namespace Harness {
             export const fileExists: typeof IO.fileExists = fso.FileExists;
             export const log: typeof IO.log = global.WScript && global.WScript.StdOut.WriteLine;
             export const readDirectory: typeof IO.readDirectory = (path, extension, exclude) => ts.sys.readDirectory(path, extension, exclude);
+            export const getEnvironmentVariable: typeof IO.getEnvironmentVariable = name => ts.sys.getEnvironmentVariable(name);
 
             export function createDirectory(path: string) {
                 if (directoryExists(path)) {
@@ -533,6 +595,13 @@ namespace Harness {
             export const log: typeof IO.log = s => console.log(s);
 
             export const readDirectory: typeof IO.readDirectory = (path, extension, exclude) => ts.sys.readDirectory(path, extension, exclude);
+            export const getEnvironmentVariable: typeof IO.getEnvironmentVariable = name => ts.sys.getEnvironmentVariable(name);
+
+            export function tryEnableSourceMapsForHost() {
+                if (ts.sys.tryEnableSourceMapsForHost) {
+                    ts.sys.tryEnableSourceMapsForHost();
+                }
+            }
 
             export function createDirectory(path: string) {
                 if (!directoryExists(path)) {
@@ -687,7 +756,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 null;
+                }
+            }
 
             export function fileExists(path: string): boolean {
                 const response = Http.getFileFromServerSync(serverRoot + path);
@@ -746,14 +824,16 @@ namespace Harness {
 
 namespace Harness {
     export const libFolder = "built/local/";
-    const tcServicesFileName = ts.combinePaths(libFolder, "typescriptServices.js");
-    export const tcServicesFile = IO.readFile(tcServicesFileName);
+    const tcServicesFileName = ts.combinePaths(libFolder, Utils.getExecutionEnvironment() === Utils.ExecutionEnvironment.Browser ? "typescriptServicesInBrowserTest.js" : "typescriptServices.js");
+    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;
     }
 
-    // Settings 
+    // Settings
     export let userSpecifiedRoot = "";
     export let lightMode = false;
 
@@ -792,7 +872,7 @@ namespace Harness {
             fileName: string,
             sourceText: string,
             languageVersion: ts.ScriptTarget) {
-            // We'll only assert invariants outside of light mode. 
+            // We'll only assert invariants outside of light mode.
             const shouldAssertInvariants = !Harness.lightMode;
 
             // Only set the parent nodes if we're asserting invariants.  We don't need them otherwise.
@@ -809,15 +889,33 @@ namespace Harness {
         const lineFeed = "\n";
 
         export const defaultLibFileName = "lib.d.ts";
-        export const defaultLibSourceFile = createSourceFileAndAssertInvariants(defaultLibFileName, IO.readFile(libFolder + "lib.core.d.ts"), /*languageVersion*/ ts.ScriptTarget.Latest);
-        export const defaultES6LibSourceFile = createSourceFileAndAssertInvariants(defaultLibFileName, IO.readFile(libFolder + "lib.core.es6.d.ts"), /*languageVersion*/ ts.ScriptTarget.Latest);
+        export const es2015DefaultLibFileName = "lib.es2015.d.ts";
+
+        const libFileNameSourceFileMap: ts.Map<ts.SourceFile> = {
+            [defaultLibFileName]: createSourceFileAndAssertInvariants(defaultLibFileName, IO.readFile(libFolder + "lib.es5.d.ts"), /*languageVersion*/ ts.ScriptTarget.Latest)
+        };
+
+        export function getDefaultLibrarySourceFile(fileName = defaultLibFileName): ts.SourceFile {
+            if (!isDefaultLibraryFile(fileName)) {
+                return undefined;
+            }
+
+            if (!libFileNameSourceFileMap[fileName]) {
+                libFileNameSourceFileMap[fileName] = createSourceFileAndAssertInvariants(fileName,  IO.readFile(libFolder + fileName), ts.ScriptTarget.Latest);
+            }
+            return libFileNameSourceFileMap[fileName];
+        }
+
+        export function getDefaultLibFileName(options: ts.CompilerOptions): string {
+            return options.target === ts.ScriptTarget.ES6 ? es2015DefaultLibFileName : defaultLibFileName;
+        }
 
         // Cache these between executions so we don't have to re-parse them for every test
         export const fourslashFileName = "fourslash.ts";
         export let fourslashSourceFile: ts.SourceFile;
 
         export function getCanonicalFileName(fileName: string): string {
-            return Harness.IO.useCaseSensitiveFileNames() ? fileName : fileName.toLowerCase();
+            return fileName;
         }
 
         export function createCompilerHost(
@@ -842,23 +940,21 @@ namespace Harness {
                 }
             }
 
-            function getSourceFile(fn: string, languageVersion: ts.ScriptTarget) {
-                fn = ts.normalizePath(fn);
-                const path = ts.toPath(fn, currentDirectory, getCanonicalFileName);
+            function getSourceFile(fileName: string, languageVersion: ts.ScriptTarget) {
+                fileName = ts.normalizePath(fileName);
+                const path = ts.toPath(fileName, currentDirectory, getCanonicalFileName);
                 if (fileMap.contains(path)) {
                     return fileMap.get(path);
                 }
-                else if (fn === fourslashFileName) {
+                else if (fileName === fourslashFileName) {
                     const tsFn = "tests/cases/fourslash/" + fourslashFileName;
                     fourslashSourceFile = fourslashSourceFile || createSourceFileAndAssertInvariants(tsFn, Harness.IO.readFile(tsFn), scriptTarget);
                     return fourslashSourceFile;
                 }
                 else {
-                    if (fn === defaultLibFileName) {
-                        return languageVersion === ts.ScriptTarget.ES6 ? defaultES6LibSourceFile : defaultLibSourceFile;
-                    }
                     // Don't throw here -- the compiler might be looking for a test that actually doesn't exist as part of the TC
-                    return undefined;
+                    // Return if it is other library file, otherwise return undefined
+                    return getDefaultLibrarySourceFile(fileName);
                 }
             }
 
@@ -867,16 +963,21 @@ namespace Harness {
                     newLineKind === ts.NewLineKind.LineFeed ? lineFeed :
                         Harness.IO.newLine();
 
+
             return {
                 getCurrentDirectory: () => currentDirectory,
                 getSourceFile,
-                getDefaultLibFileName: options => defaultLibFileName,
+                getDefaultLibFileName,
                 writeFile,
                 getCanonicalFileName,
                 useCaseSensitiveFileNames: () => useCaseSensitiveFileNames,
                 getNewLine: () => newLine,
-                fileExists: fileName => getSourceFile(fileName, ts.ScriptTarget.ES5) !== undefined,
-                readFile: (fileName: string): string => { throw new Error("NotYetImplemented"); }
+                fileExists: fileName => {
+                    return fileMap.contains(ts.toPath(fileName, currentDirectory, getCanonicalFileName));
+                },
+                readFile: (fileName: string): string => {
+                    return fileMap.get(ts.toPath(fileName, currentDirectory, getCanonicalFileName)).getText();
+                }
             };
         }
 
@@ -887,7 +988,7 @@ namespace Harness {
             libFiles?: string;
         }
 
-        // Additional options not already in ts.optionDeclarations 
+        // Additional options not already in ts.optionDeclarations
         const harnessOptionDeclarations: ts.CommandLineOption[] = [
             { name: "allowNonTsExtensions", type: "boolean" },
             { name: "useCaseSensitiveFileNames", type: "boolean" },
@@ -895,7 +996,9 @@ namespace Harness {
             { name: "includeBuiltFile", type: "string" },
             { name: "fileName", type: "string" },
             { name: "libFiles", type: "string" },
-            { name: "noErrorTruncation", type: "boolean" }
+            { name: "noErrorTruncation", type: "boolean" },
+            { name: "suppressOutputPathCheck", type: "boolean" },
+            { name: "noImplicitReferences", type: "boolean" }
         ];
 
         let optionsIndex: ts.Map<ts.CommandLineOption>;
@@ -919,6 +1022,7 @@ namespace Harness {
                     }
                     const option = getCommandLineOption(name);
                     if (option) {
+                        const errors: ts.Diagnostic[] = [];
                         switch (option.type) {
                             case "boolean":
                                 options[option.name] = value.toLowerCase() === "true";
@@ -927,15 +1031,16 @@ namespace Harness {
                                 options[option.name] = value;
                                 break;
                             // If not a primitive, the possible types are specified in what is effectively a map of options.
+                            case "list":
+                                options[option.name] = ts.parseListTypeOption(<ts.CommandLineOptionOfListType>option, value, errors);
+                                break;
                             default:
-                                let map = <ts.Map<number>>option.type;
-                                let key = value.toLowerCase();
-                                if (ts.hasProperty(map, key)) {
-                                    options[option.name] = map[key];
-                                }
-                                else {
-                                    throw new Error(`Unknown value '${value}' for compiler option '${name}'.`);
-                                }
+                                options[option.name] = ts.parseCustomTypeOption(<ts.CommandLineOptionOfCustomType>option, value, errors);
+                                break;
+                        }
+
+                        if (errors.length > 0) {
+                            throw new Error(`Unknown value '${value}' for compiler option '${name}'.`);
                         }
                     }
                     else {
@@ -962,10 +1067,8 @@ namespace Harness {
             compilerOptions: ts.CompilerOptions,
             // Current directory is needed for rwcRunner to be able to use currentDirectory defined in json file
             currentDirectory: string): CompilationOutput {
-
             const options: ts.CompilerOptions & HarnessOptions = compilerOptions ? ts.clone(compilerOptions) : { noResolve: false };
             options.target = options.target || ts.ScriptTarget.ES3;
-            options.module = options.module || ts.ModuleKind.None;
             options.newLine = options.newLine || ts.NewLineKind.CarriageReturnLineFeed;
             options.noErrorTruncation = true;
             options.skipDefaultLibCheck = true;
@@ -1015,7 +1118,7 @@ namespace Harness {
                 options.newLine);
 
             let traceResults: string[];
-            if (options.traceModuleResolution) {
+            if (options.traceResolution) {
                 traceResults = [];
                 compilerHost.trace = text => traceResults.push(text);
             }
@@ -1134,11 +1237,11 @@ namespace Harness {
                 errLines.forEach(e => outputLines.push(e));
 
                 // do not count errors from lib.d.ts here, they are computed separately as numLibraryDiagnostics
-                // if lib.d.ts is explicitly included in input files and there are some errors in it (i.e. because of duplicate identifiers) 
+                // if lib.d.ts is explicitly included in input files and there are some errors in it (i.e. because of duplicate identifiers)
                 // then they will be added twice thus triggering 'total errors' assertion with condition
                 // 'totalErrorsReportedInNonLibraryFiles + numLibraryDiagnostics + numTest262HarnessDiagnostics, diagnostics.length
 
-                if (!error.file || !isLibraryFile(error.file.fileName)) {
+                if (!error.file || !isDefaultLibraryFile(error.file.fileName)) {
                     totalErrorsReportedInNonLibraryFiles++;
                 }
             }
@@ -1217,7 +1320,7 @@ namespace Harness {
             });
 
             const numLibraryDiagnostics = ts.countWhere(diagnostics, diagnostic => {
-                return diagnostic.file && (isLibraryFile(diagnostic.file.fileName) || isBuiltFile(diagnostic.file.fileName));
+                return diagnostic.file && (isDefaultLibraryFile(diagnostic.file.fileName) || isBuiltFile(diagnostic.file.fileName));
             });
 
             const numTest262HarnessDiagnostics = ts.countWhere(diagnostics, diagnostic => {
@@ -1330,7 +1433,7 @@ namespace Harness {
 
             public getSourceMapRecord() {
                 if (this.sourceMapData) {
-                    return Harness.SourceMapRecoder.getSourceMapRecord(this.sourceMapData, this.program, this.files);
+                    return Harness.SourceMapRecorder.getSourceMapRecord(this.sourceMapData, this.program, this.files);
                 }
             }
         }
@@ -1444,7 +1547,7 @@ namespace Harness {
             };
             testUnitData.push(newTestFile2);
 
-            // unit tests always list files explicitly 
+            // unit tests always list files explicitly
             const parseConfigHost: ts.ParseConfigHost = {
                 readDirectory: (name) => []
             };
@@ -1461,6 +1564,7 @@ namespace Harness {
                         baseDir = ts.getNormalizedAbsolutePath(baseDir, rootDir);
                     }
                     tsConfig = ts.parseJsonConfigFileContent(configJson.config, parseConfigHost, baseDir);
+                    tsConfig.options.configFilePath = data.name;
 
                     // delete entry from the list
                     testUnitData.splice(i, 1);
@@ -1589,23 +1693,29 @@ namespace Harness {
 
             let actual = <string>undefined;
             const actualFileName = localPath(relativeFileName, opts && opts.Baselinefolder, opts && opts.Subfolder);
+            try {
+                if (runImmediately) {
+                    actual = generateActual(actualFileName, generateContent);
+                    const comparison = compareToBaseline(actual, relativeFileName, opts);
+                    writeComparison(comparison.expected, comparison.actual, relativeFileName, actualFileName, descriptionForDescribe);
+                }
+                else {
+                    actual = generateActual(actualFileName, generateContent);
 
-            if (runImmediately) {
-                actual = generateActual(actualFileName, generateContent);
-                const comparison = compareToBaseline(actual, relativeFileName, opts);
-                writeComparison(comparison.expected, comparison.actual, relativeFileName, actualFileName, descriptionForDescribe);
+                    const comparison = compareToBaseline(actual, relativeFileName, opts);
+                    writeComparison(comparison.expected, comparison.actual, relativeFileName, actualFileName, descriptionForDescribe);
+                }
             }
-            else {
-                actual = generateActual(actualFileName, generateContent);
-
-                const comparison = compareToBaseline(actual, relativeFileName, opts);
-                writeComparison(comparison.expected, comparison.actual, relativeFileName, actualFileName, descriptionForDescribe);
+            catch (e) {
+                throw Utils.filterStack(e);
             }
         }
     }
 
-    export function isLibraryFile(filePath: string): boolean {
-        return (Path.getFileName(filePath) === "lib.d.ts") || (Path.getFileName(filePath) === "lib.core.d.ts");
+    export function isDefaultLibraryFile(filePath: string): boolean {
+        // We need to make sure that the filePath is prefixed with "lib." not just containing "lib." and end with ".d.ts"
+        const fileName = Path.getFileName(filePath);
+        return ts.startsWith(fileName, "lib.") && ts.endsWith(fileName, ".d.ts");
     }
 
     export function isBuiltFile(filePath: string): boolean {
@@ -1613,12 +1723,16 @@ namespace Harness {
     }
 
     export function getDefaultLibraryFile(io: Harness.IO): Harness.Compiler.TestFile {
-        const libFile = Harness.userSpecifiedRoot + Harness.libFolder + "lib.d.ts";
+        const libFile = Harness.userSpecifiedRoot + Harness.libFolder + Harness.Compiler.defaultLibFileName;
         return { unitName: libFile, content: io.readFile(libFile) };
     }
 
     if (Error) (<any>Error).stackTraceLimit = 1;
 }
 
+if (Harness.IO.tryEnableSourceMapsForHost && /^development$/i.test(Harness.IO.getEnvironmentVariable("NODE_ENV"))) {
+    Harness.IO.tryEnableSourceMapsForHost();
+}
+
 // TODO: not sure why Utils.evalFile isn't working with this, eventually will concat it like old compiler instead of eval
 eval(Harness.tcServicesFile);
diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts
index 6ab9cd896c1..ac8fe59316d 100644
--- a/src/harness/harnessLanguageService.ts
+++ b/src/harness/harnessLanguageService.ts
@@ -9,7 +9,7 @@ namespace Harness.LanguageService {
         public editRanges: { length: number; textChangeRange: ts.TextChangeRange; }[] = [];
         private lineMap: number[] = undefined;
 
-        constructor(public fileName: string, public content: string) {
+        constructor(public fileName: string, public content: string, public isRootFile: boolean) {
             this.setContent(content);
         }
 
@@ -135,7 +135,13 @@ namespace Harness.LanguageService {
 
         public getFilenames(): string[] {
             const fileNames: string[] = [];
-            ts.forEachKey(this.fileNameToScript, (fileName) => { fileNames.push(fileName); });
+            ts.forEachValue(this.fileNameToScript, (scriptInfo) => {
+                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;
         }
 
@@ -143,8 +149,8 @@ namespace Harness.LanguageService {
             return ts.lookUp(this.fileNameToScript, fileName);
         }
 
-        public addScript(fileName: string, content: string): void {
-            this.fileNameToScript[fileName] = new ScriptInfo(fileName, content);
+        public addScript(fileName: string, content: string, isRootFile: boolean): void {
+            this.fileNameToScript[fileName] = new ScriptInfo(fileName, content, isRootFile);
         }
 
         public editScript(fileName: string, start: number, end: number, newText: string) {
@@ -177,12 +183,13 @@ namespace Harness.LanguageService {
         getCompilationSettings() { return this.settings; }
         getCancellationToken() { return this.cancellationToken; }
         getCurrentDirectory(): string { return ""; }
-        getDefaultLibFileName(): string { return ""; }
+        getDefaultLibFileName(): string { return Harness.Compiler.defaultLibFileName; }
         getScriptFileNames(): string[] { return this.getFilenames(); }
         getScriptSnapshot(fileName: string): ts.IScriptSnapshot {
             const script = this.getScriptInfo(fileName);
             return script ? new ScriptSnapshot(script) : undefined;
         }
+        getScriptKind(fileName: string): ts.ScriptKind { return ts.ScriptKind.Unknown; }
         getScriptVersion(fileName: string): string {
             const script = this.getScriptInfo(fileName);
             return script ? script.version.toString() : undefined;
@@ -193,7 +200,7 @@ namespace Harness.LanguageService {
         error(s: string): void { }
     }
 
-    export class NativeLanugageServiceAdapter implements LanguageServiceAdapter {
+    export class NativeLanguageServiceAdapter implements LanguageServiceAdapter {
         private host: NativeLanguageServiceHost;
         constructor(cancellationToken?: ts.HostCancellationToken, options?: ts.CompilerOptions) {
             this.host = new NativeLanguageServiceHost(cancellationToken, options);
@@ -209,6 +216,7 @@ namespace Harness.LanguageService {
         private nativeHost: NativeLanguageServiceHost;
 
         public getModuleResolutionsForFile: (fileName: string) => string;
+        public getTypeReferenceDirectiveResolutionsForFile: (fileName: string) => string;
 
         constructor(preprocessToResolve: boolean, cancellationToken?: ts.HostCancellationToken, options?: ts.CompilerOptions) {
             super(cancellationToken, options);
@@ -235,12 +243,25 @@ namespace Harness.LanguageService {
                     }
                     return JSON.stringify(imports);
                 };
+                this.getTypeReferenceDirectiveResolutionsForFile = (fileName) => {
+                    const scriptInfo = this.getScriptInfo(fileName);
+                    const preprocessInfo = ts.preProcessFile(scriptInfo.content, /*readImportFiles*/ false);
+                    const resolutions: ts.Map<ts.ResolvedTypeReferenceDirective> = {};
+                    const settings = this.nativeHost.getCompilationSettings();
+                    for (const typeReferenceDirective of preprocessInfo.typeReferenceDirectives) {
+                        const resolutionInfo = ts.resolveTypeReferenceDirective(typeReferenceDirective.fileName, fileName, settings, moduleResolutionHost);
+                        if (resolutionInfo.resolvedTypeReferenceDirective.resolvedFileName) {
+                            resolutions[typeReferenceDirective.fileName] = resolutionInfo.resolvedTypeReferenceDirective;
+                        }
+                    }
+                    return JSON.stringify(resolutions);
+                };
             }
         }
 
         getFilenames(): string[] { return this.nativeHost.getFilenames(); }
         getScriptInfo(fileName: string): ScriptInfo { return this.nativeHost.getScriptInfo(fileName); }
-        addScript(fileName: string, content: string): void { this.nativeHost.addScript(fileName, content); }
+        addScript(fileName: string, content: string, isRootFile: boolean): void { this.nativeHost.addScript(fileName, content, isRootFile); }
         editScript(fileName: string, start: number, end: number, newText: string): void { this.nativeHost.editScript(fileName, start, end, newText); }
         positionToLineAndCharacter(fileName: string, position: number): ts.LineAndCharacter { return this.nativeHost.positionToLineAndCharacter(fileName, position); }
 
@@ -253,6 +274,7 @@ namespace Harness.LanguageService {
             const nativeScriptSnapshot = this.nativeHost.getScriptSnapshot(fileName);
             return nativeScriptSnapshot && new ScriptSnapshotProxy(nativeScriptSnapshot);
         }
+        getScriptKind(fileName: string): ts.ScriptKind { return this.nativeHost.getScriptKind(fileName); }
         getScriptVersion(fileName: string): string { return this.nativeHost.getScriptVersion(fileName); }
         getLocalizedDiagnosticMessages(): string { return JSON.stringify({}); }
 
@@ -415,19 +437,22 @@ namespace Harness.LanguageService {
         getDocCommentTemplateAtPosition(fileName: string, position: number): ts.TextInsertion {
             return unwrapJSONCallResult(this.shim.getDocCommentTemplateAtPosition(fileName, position));
         }
+        isValidBraceCompletionAtPostion(fileName: string, position: number, openingBrace: number): boolean {
+            return unwrapJSONCallResult(this.shim.isValidBraceCompletionAtPostion(fileName, position, openingBrace));
+        }
         getEmitOutput(fileName: string): ts.EmitOutput {
             return unwrapJSONCallResult(this.shim.getEmitOutput(fileName));
         }
         getProgram(): ts.Program {
             throw new Error("Program can not be marshaled across the shim layer.");
         }
-        getSourceFile(fileName: string): ts.SourceFile {
+        getNonBoundSourceFile(fileName: string): ts.SourceFile {
             throw new Error("SourceFile can not be marshaled across the shim layer.");
         }
         dispose(): void { this.shim.dispose({}); }
     }
 
-    export class ShimLanugageServiceAdapter implements LanguageServiceAdapter {
+    export class ShimLanguageServiceAdapter implements LanguageServiceAdapter {
         private host: ShimLanguageServiceHost;
         private factory: ts.TypeScriptServicesFactory;
         constructor(preprocessToResolve: boolean, cancellationToken?: ts.HostCancellationToken, options?: ts.CompilerOptions) {
@@ -440,6 +465,7 @@ namespace Harness.LanguageService {
         getPreProcessedFileInfo(fileName: string, fileContents: string): ts.PreProcessedFileInfo {
             let shimResult: {
                 referencedFiles: ts.IFileReference[];
+                typeReferenceDirectives: ts.IFileReference[];
                 importedFiles: ts.IFileReference[];
                 isLibFile: boolean;
             };
@@ -451,7 +477,8 @@ namespace Harness.LanguageService {
                 referencedFiles: [],
                 importedFiles: [],
                 ambientExternalModules: [],
-                isLibFile: shimResult.isLibFile
+                isLibFile: shimResult.isLibFile,
+                typeReferenceDirectives: []
             };
 
             ts.forEach(shimResult.referencedFiles, refFile => {
@@ -470,6 +497,13 @@ namespace Harness.LanguageService {
                 });
             });
 
+            ts.forEach(shimResult.typeReferenceDirectives, typeRefDirective => {
+                convertResult.importedFiles.push({
+                    fileName: typeRefDirective.path,
+                    pos: typeRefDirective.position,
+                    end: typeRefDirective.position + typeRefDirective.length
+                });
+            });
             return convertResult;
         }
     }
@@ -566,6 +600,10 @@ namespace Harness.LanguageService {
             return this.host.getCurrentDirectory();
         }
 
+        getEnvironmentVariable(name: string): string {
+            return ts.sys.getEnvironmentVariable(name);
+        }
+
         readDirectory(path: string, extension?: string): string[] {
             throw new Error("Not implemented Yet.");
         }
@@ -609,7 +647,7 @@ namespace Harness.LanguageService {
         }
     }
 
-    export class ServerLanugageServiceAdapter implements LanguageServiceAdapter {
+    export class ServerLanguageServiceAdapter implements LanguageServiceAdapter {
         private host: SessionClientHost;
         private client: ts.server.SessionClient;
         constructor(cancellationToken?: ts.HostCancellationToken, options?: ts.CompilerOptions) {
@@ -642,4 +680,3 @@ namespace Harness.LanguageService {
         getPreProcessedFileInfo(fileName: string, fileContents: string): ts.PreProcessedFileInfo { throw new Error("getPreProcessedFileInfo is not available using the server interface."); }
     }
 }
- 
\ No newline at end of file
diff --git a/src/harness/loggedIO.ts b/src/harness/loggedIO.ts
index 3d51682f745..0002a6af288 100644
--- a/src/harness/loggedIO.ts
+++ b/src/harness/loggedIO.ts
@@ -1,7 +1,7 @@
 /// <reference path="..\..\src\compiler\sys.ts" />
 /// <reference path="..\..\src\harness\harness.ts" />
 /// <reference path="..\..\src\harness\runnerbase.ts" />
-/* tslint:disable:no-null */
+/* tslint:disable:no-null-keyword */
 
 interface FileInformation {
     contents: string;
@@ -136,7 +136,7 @@ namespace Playback {
         };
         wrapper.startReplayFromData = log => {
             replayLog = log;
-            // Remove non-found files from the log (shouldn't really need them, but we still record them for diganostic purposes)
+            // Remove non-found files from the log (shouldn't really need them, but we still record them for diagnostic purposes)
             replayLog.filesRead = replayLog.filesRead.filter(f => f.result.contents !== undefined);
         };
 
@@ -223,11 +223,22 @@ namespace Playback {
                 recordLog.directoriesRead.push(logEntry);
                 return result;
             },
-            (path, extension, exclude) => findResultByPath(wrapper, replayLog.directoriesRead.filter(d => d.extension === extension && ts.arrayIsEqualTo(d.exclude, exclude)), path));
+            (path, extension, exclude) => findResultByPath(wrapper,
+                    replayLog.directoriesRead.filter(
+                        d => {
+                            if (d.extension === extension) {
+                                if (d.exclude) {
+                                    return ts.arrayIsEqualTo(d.exclude, exclude);
+                                }
+                                return true;
+                            }
+                            return false;
+                        }
+                    ), path));
 
         wrapper.writeFile = recordReplay(wrapper.writeFile, underlying)(
-            (path, contents) => callAndRecord(underlying.writeFile(path, contents), recordLog.filesWritten, { path, contents, bom: false }),
-            (path, contents) => noOpReplay("writeFile"));
+            (path: string, contents: string) => callAndRecord(underlying.writeFile(path, contents), recordLog.filesWritten, { path, contents, bom: false }),
+            (path: string, contents: string) => noOpReplay("writeFile"));
 
         wrapper.exit = (exitCode) => {
             if (recordLog !== undefined) {
diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts
index 96fcfedc6b4..9cfd02b4e84 100644
--- a/src/harness/projectsRunner.ts
+++ b/src/harness/projectsRunner.ts
@@ -1,6 +1,6 @@
 ///<reference path="harness.ts" />
 ///<reference path="runnerbase.ts" />
-/* tslint:disable:no-null */
+/* tslint:disable:no-null-keyword */
 
 // Test case is json of below type in tests/cases/project/
 interface ProjectRunnerTestCase {
@@ -156,7 +156,7 @@ class ProjectRunner extends RunnerBase {
             function getSourceFile(fileName: string, languageVersion: ts.ScriptTarget): ts.SourceFile {
                 let sourceFile: ts.SourceFile = undefined;
                 if (fileName === Harness.Compiler.defaultLibFileName) {
-                    sourceFile = languageVersion === ts.ScriptTarget.ES6 ? Harness.Compiler.defaultES6LibSourceFile : Harness.Compiler.defaultLibSourceFile;
+                    sourceFile = Harness.Compiler.getDefaultLibrarySourceFile(Harness.Compiler.getDefaultLibFileName(compilerOptions));
                 }
                 else {
                     const text = getSourceFileText(fileName);
@@ -370,14 +370,14 @@ class ProjectRunner extends RunnerBase {
                     }
 
                     const outputDtsFileName = emitOutputFilePathWithoutExtension + ".d.ts";
-                    const file = findOutpuDtsFile(outputDtsFileName);
+                    const file = findOutputDtsFile(outputDtsFileName);
                     if (file) {
                         allInputFiles.unshift(file);
                     }
                 }
                 else {
                     const outputDtsFileName = ts.removeFileExtension(compilerOptions.outFile || compilerOptions.out) + ".d.ts";
-                    const outputDtsFile = findOutpuDtsFile(outputDtsFileName);
+                    const outputDtsFile = findOutputDtsFile(outputDtsFileName);
                     if (!ts.contains(allInputFiles, outputDtsFile)) {
                         allInputFiles.unshift(outputDtsFile);
                     }
@@ -387,7 +387,7 @@ class ProjectRunner extends RunnerBase {
             // Dont allow config files since we are compiling existing source options
             return compileProjectFiles(compilerResult.moduleKind, getInputFiles, getSourceFileText, writeFile, compilerResult.compilerOptions);
 
-            function findOutpuDtsFile(fileName: string) {
+            function findOutputDtsFile(fileName: string) {
                 return ts.forEach(compilerResult.outputFiles, outputFile => outputFile.emittedFileName === fileName ? outputFile : undefined);
             }
             function getInputFiles() {
@@ -412,7 +412,7 @@ class ProjectRunner extends RunnerBase {
 
         function getErrorsBaseline(compilerResult: CompileProjectFilesResult) {
             const inputFiles = compilerResult.program ? ts.map(ts.filter(compilerResult.program.getSourceFiles(),
-                sourceFile => sourceFile.fileName !== "lib.d.ts"),
+                sourceFile => !Harness.isDefaultLibraryFile(sourceFile.fileName)),
                 sourceFile => {
                     return {
                         unitName: ts.isRootedDiskPath(sourceFile.fileName) ?
@@ -463,32 +463,39 @@ class ProjectRunner extends RunnerBase {
                         }
                     });
 
-
                     it("Baseline of emitted result (" + moduleNameToString(moduleKind) + "): " + testCaseFileName, () => {
                         if (testCase.baselineCheck) {
+                            var lastError: any = undefined;
                             ts.forEach(compilerResult.outputFiles, outputFile => {
-
-                                Harness.Baseline.runBaseline("Baseline of emitted result (" + moduleNameToString(compilerResult.moduleKind) + "): " + testCaseFileName, getBaselineFolder(compilerResult.moduleKind) + outputFile.fileName, () => {
-                                    try {
-                                        return Harness.IO.readFile(getProjectOutputFolder(outputFile.fileName, compilerResult.moduleKind));
-                                    }
-                                    catch (e) {
-                                        return undefined;
-                                    }
-                                });
+                                try {
+                                    Harness.Baseline.runBaseline("Baseline of emitted result (" + moduleNameToString(compilerResult.moduleKind) + "): " + testCaseFileName, getBaselineFolder(compilerResult.moduleKind) + outputFile.fileName, () => {
+                                        try {
+                                            return Harness.IO.readFile(getProjectOutputFolder(outputFile.fileName, compilerResult.moduleKind));
+                                        }
+                                        catch (e) {
+                                            return undefined;
+                                        }
+                                    });
+                                }
+                                catch (e) {
+                                    lastError = e;
+                                }
                             });
+
+                            if (lastError) {
+                                throw lastError;
+                            }
                         }
                     });
 
-
-                    it("SourceMapRecord for (" + moduleNameToString(moduleKind) + "): " + testCaseFileName, () => {
-                        if (compilerResult.sourceMapData) {
-                            Harness.Baseline.runBaseline("SourceMapRecord for (" + moduleNameToString(compilerResult.moduleKind) + "): " + testCaseFileName, getBaselineFolder(compilerResult.moduleKind) + testCaseJustName + ".sourcemap.txt", () => {
-                                return Harness.SourceMapRecoder.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("SourceMapRecord for (" + moduleNameToString(compilerResult.moduleKind) + "): " + testCaseFileName, 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
 
diff --git a/src/harness/runner.ts b/src/harness/runner.ts
index ec8e1105c2f..262980baa9a 100644
--- a/src/harness/runner.ts
+++ b/src/harness/runner.ts
@@ -20,7 +20,7 @@
 /// <reference path="rwcRunner.ts" />
 /// <reference path="harness.ts" />
 
-/* tslint:disable:no-null */
+/* tslint:disable:no-null-keyword */
 
 let runners: RunnerBase[] = [];
 let iterations = 1;
@@ -40,14 +40,27 @@ let testConfigFile =
     Harness.IO.fileExists(mytestconfig) ? Harness.IO.readFile(mytestconfig) :
     (Harness.IO.fileExists(testconfig) ? Harness.IO.readFile(testconfig) : "");
 
+type TestConfig = {
+    tests?: string[];
+    stackTraceLimit?: number | "full";
+    light?: boolean;
+};
+
 if (testConfigFile !== "") {
-    const testConfig = JSON.parse(testConfigFile);
+    const testConfig = <TestConfig>JSON.parse(testConfigFile);
     if (testConfig.light) {
         Harness.lightMode = true;
     }
 
-    if (testConfig.test && testConfig.test.length > 0) {
-        for (const option of testConfig.test) {
+    if (testConfig.stackTraceLimit === "full") {
+        (<any>Error).stackTraceLimit = Infinity;
+    }
+    else if ((+testConfig.stackTraceLimit | 0) > 0) {
+        (<any>Error).stackTraceLimit = testConfig.stackTraceLimit;
+    }
+
+    if (testConfig.tests && testConfig.tests.length > 0) {
+        for (const option of testConfig.tests) {
             if (!option) {
                 continue;
             }
diff --git a/src/harness/rwcRunner.ts b/src/harness/rwcRunner.ts
index ce570a7d6ad..39231435bf5 100644
--- a/src/harness/rwcRunner.ts
+++ b/src/harness/rwcRunner.ts
@@ -2,7 +2,7 @@
 /// <reference path="runnerbase.ts" />
 /// <reference path="loggedIO.ts" />
 /// <reference path="..\compiler\commandLineParser.ts"/>
-/* tslint:disable:no-null */
+/* tslint:disable:no-null-keyword */
 
 namespace RWC {
     function runWithIOLog(ioLog: IOLog, fn: (oldIO: Harness.IO) => void) {
@@ -31,22 +31,20 @@ namespace RWC {
             let otherFiles: Harness.Compiler.TestFile[] = [];
             let compilerResult: Harness.Compiler.CompilerResult;
             let compilerOptions: ts.CompilerOptions;
-            let baselineOpts: Harness.Baseline.BaselineOptions = {
+            const baselineOpts: Harness.Baseline.BaselineOptions = {
                 Subfolder: "rwc",
                 Baselinefolder: "internal/baselines"
             };
-            let baseName = /(.*)\/(.*).json/.exec(ts.normalizeSlashes(jsonPath))[2];
+            const baseName = /(.*)\/(.*).json/.exec(ts.normalizeSlashes(jsonPath))[2];
             let currentDirectory: string;
             let useCustomLibraryFile: boolean;
             after(() => {
                 // Mocha holds onto the closure environment of the describe callback even after the test is done.
                 // Therefore we have to clean out large objects after the test is done.
-                inputFiles = undefined;
-                otherFiles = undefined;
+                inputFiles = [];
+                otherFiles = [];
                 compilerResult = undefined;
                 compilerOptions = undefined;
-                baselineOpts = undefined;
-                baseName = undefined;
                 currentDirectory = undefined;
                 // useCustomLibraryFile is a flag specified in the json object to indicate whether to use built/local/lib.d.ts
                 // or to use lib.d.ts inside the json object. If the flag is true, use the lib.d.ts inside json file
@@ -97,13 +95,13 @@ namespace RWC {
                             continue;
                         }
 
-                        if (!Harness.isLibraryFile(fileRead.path)) {
+                        if (!Harness.isDefaultLibraryFile(fileRead.path)) {
                             if (inInputList) {
                                 continue;
                             }
                             otherFiles.push(getHarnessCompilerInputUnit(fileRead.path));
                         }
-                        else if (!opts.options.noLib && Harness.isLibraryFile(fileRead.path)) {
+                        else if (!opts.options.noLib && Harness.isDefaultLibraryFile(fileRead.path)) {
                             if (!inInputList) {
                                 // If useCustomLibraryFile is true, we will use lib.d.ts from json object
                                 // otherwise use the lib.d.ts from built/local
@@ -192,8 +190,9 @@ namespace RWC {
                     if (compilerResult.errors.length === 0) {
                         return null;
                     }
-
-                    return Harness.Compiler.getErrorBaseline(inputFiles.concat(otherFiles), compilerResult.errors);
+                    // Do not include the library in the baselines to avoid noise
+                    const baselineFiles = inputFiles.concat(otherFiles).filter(f => !Harness.isDefaultLibraryFile(f.unitName));
+                    return Harness.Compiler.getErrorBaseline(baselineFiles, compilerResult.errors);
                 }, false, baselineOpts);
             });
 
diff --git a/src/harness/sourceMapRecorder.ts b/src/harness/sourceMapRecorder.ts
index 806ca7a845d..0ef9f7eb49f 100644
--- a/src/harness/sourceMapRecorder.ts
+++ b/src/harness/sourceMapRecorder.ts
@@ -15,7 +15,7 @@
 
 ///<reference path="harness.ts"/>
 
-namespace Harness.SourceMapRecoder {
+namespace Harness.SourceMapRecorder {
 
     interface SourceMapSpanWithDecodeErrors {
         sourceMapSpan: ts.SourceMapSpan;
@@ -202,7 +202,7 @@ namespace Harness.SourceMapRecoder {
     }
 
     namespace SourceMapSpanWriter {
-        let sourceMapRecoder: Compiler.WriterAggregator;
+        let sourceMapRecorder: Compiler.WriterAggregator;
         let sourceMapSources: string[];
         let sourceMapNames: string[];
 
@@ -216,8 +216,8 @@ namespace Harness.SourceMapRecoder {
         let prevWrittenJsLine: number;
         let spanMarkerContinues: boolean;
 
-        export function intializeSourceMapSpanWriter(sourceMapRecordWriter: Compiler.WriterAggregator, sourceMapData: ts.SourceMapData, currentJsFile: Compiler.GeneratedFile) {
-            sourceMapRecoder = sourceMapRecordWriter;
+        export function initializeSourceMapSpanWriter(sourceMapRecordWriter: Compiler.WriterAggregator, sourceMapData: ts.SourceMapData, currentJsFile: Compiler.GeneratedFile) {
+            sourceMapRecorder = sourceMapRecordWriter;
             sourceMapSources = sourceMapData.sourceMapSources;
             sourceMapNames = sourceMapData.sourceMapNames;
 
@@ -231,15 +231,15 @@ namespace Harness.SourceMapRecoder {
 
             SourceMapDecoder.initializeSourceMapDecoding(sourceMapData);
 
-            sourceMapRecoder.WriteLine("===================================================================");
-            sourceMapRecoder.WriteLine("JsFile: " + sourceMapData.sourceMapFile);
-            sourceMapRecoder.WriteLine("mapUrl: " + sourceMapData.jsSourceMappingURL);
-            sourceMapRecoder.WriteLine("sourceRoot: " + sourceMapData.sourceMapSourceRoot);
-            sourceMapRecoder.WriteLine("sources: " + sourceMapData.sourceMapSources);
+            sourceMapRecorder.WriteLine("===================================================================");
+            sourceMapRecorder.WriteLine("JsFile: " + sourceMapData.sourceMapFile);
+            sourceMapRecorder.WriteLine("mapUrl: " + sourceMapData.jsSourceMappingURL);
+            sourceMapRecorder.WriteLine("sourceRoot: " + sourceMapData.sourceMapSourceRoot);
+            sourceMapRecorder.WriteLine("sources: " + sourceMapData.sourceMapSources);
             if (sourceMapData.sourceMapSourcesContent) {
-                sourceMapRecoder.WriteLine("sourcesContent: " + JSON.stringify(sourceMapData.sourceMapSourcesContent));
+                sourceMapRecorder.WriteLine("sourcesContent: " + JSON.stringify(sourceMapData.sourceMapSourcesContent));
             }
-            sourceMapRecoder.WriteLine("===================================================================");
+            sourceMapRecorder.WriteLine("===================================================================");
         }
 
         function getSourceMapSpanString(mapEntry: ts.SourceMapSpan, getAbsentNameIndex?: boolean) {
@@ -291,10 +291,10 @@ namespace Harness.SourceMapRecoder {
             recordSourceMapSpan(sourceMapSpan);
 
             assert.isTrue(spansOnSingleLine.length === 1);
-            sourceMapRecoder.WriteLine("-------------------------------------------------------------------");
-            sourceMapRecoder.WriteLine("emittedFile:" + jsFile.fileName);
-            sourceMapRecoder.WriteLine("sourceFile:" + sourceMapSources[spansOnSingleLine[0].sourceMapSpan.sourceIndex]);
-            sourceMapRecoder.WriteLine("-------------------------------------------------------------------");
+            sourceMapRecorder.WriteLine("-------------------------------------------------------------------");
+            sourceMapRecorder.WriteLine("emittedFile:" + jsFile.fileName);
+            sourceMapRecorder.WriteLine("sourceFile:" + sourceMapSources[spansOnSingleLine[0].sourceMapSpan.sourceIndex]);
+            sourceMapRecorder.WriteLine("-------------------------------------------------------------------");
 
             tsLineMap = ts.computeLineStarts(newSourceFileCode);
             tsCode = newSourceFileCode;
@@ -306,8 +306,8 @@ namespace Harness.SourceMapRecoder {
             writeRecordedSpans();
 
             if (!SourceMapDecoder.hasCompletedDecoding()) {
-                sourceMapRecoder.WriteLine("!!!! **** There are more source map entries in the sourceMap's mapping than what was encoded");
-                sourceMapRecoder.WriteLine("!!!! **** Remaining decoded string: " + SourceMapDecoder.getRemainingDecodeString());
+                sourceMapRecorder.WriteLine("!!!! **** There are more source map entries in the sourceMap's mapping than what was encoded");
+                sourceMapRecorder.WriteLine("!!!! **** Remaining decoded string: " + SourceMapDecoder.getRemainingDecodeString());
 
             }
 
@@ -323,7 +323,7 @@ namespace Harness.SourceMapRecoder {
 
         function writeJsFileLines(endJsLine: number) {
             for (; prevWrittenJsLine < endJsLine; prevWrittenJsLine++) {
-                sourceMapRecoder.Write(">>>" + getTextOfLine(prevWrittenJsLine, jsLineMap, jsFile.code));
+                sourceMapRecorder.Write(">>>" + getTextOfLine(prevWrittenJsLine, jsLineMap, jsFile.code));
             }
         }
 
@@ -356,9 +356,9 @@ namespace Harness.SourceMapRecoder {
             }
 
             function writeSourceMapIndent(indentLength: number, indentPrefix: string) {
-                sourceMapRecoder.Write(indentPrefix);
+                sourceMapRecorder.Write(indentPrefix);
                 for (let i = 1; i < indentLength; i++) {
-                    sourceMapRecoder.Write(" ");
+                    sourceMapRecorder.Write(" ");
                 }
             }
 
@@ -369,12 +369,12 @@ namespace Harness.SourceMapRecoder {
                 writeSourceMapIndent(prevEmittedCol, markerId);
 
                 for (let i = prevEmittedCol; i < endColumn; i++) {
-                    sourceMapRecoder.Write("^");
+                    sourceMapRecorder.Write("^");
                 }
                 if (endContinues) {
-                    sourceMapRecoder.Write("->");
+                    sourceMapRecorder.Write("->");
                 }
-                sourceMapRecoder.WriteLine("");
+                sourceMapRecorder.WriteLine("");
                 spanMarkerContinues = endContinues;
             }
 
@@ -390,16 +390,16 @@ namespace Harness.SourceMapRecoder {
                     // If there are decode errors, write
                     for (let i = 0; i < currentSpan.decodeErrors.length; i++) {
                         writeSourceMapIndent(prevEmittedCol, markerIds[index]);
-                        sourceMapRecoder.WriteLine(currentSpan.decodeErrors[i]);
+                        sourceMapRecorder.WriteLine(currentSpan.decodeErrors[i]);
                     }
                 }
 
                 const tsCodeLineMap = ts.computeLineStarts(sourceText);
                 for (let i = 0; i < tsCodeLineMap.length; i++) {
                     writeSourceMapIndent(prevEmittedCol, i === 0 ? markerIds[index] : "  >");
-                    sourceMapRecoder.Write(getTextOfLine(i, tsCodeLineMap, sourceText));
+                    sourceMapRecorder.Write(getTextOfLine(i, tsCodeLineMap, sourceText));
                     if (i === tsCodeLineMap.length - 1) {
-                        sourceMapRecoder.WriteLine("");
+                        sourceMapRecorder.WriteLine("");
                     }
                 }
 
@@ -407,7 +407,7 @@ namespace Harness.SourceMapRecoder {
             }
 
             function writeSpanDetails(currentSpan: SourceMapSpanWithDecodeErrors, index: number) {
-                sourceMapRecoder.WriteLine(markerIds[index] + getSourceMapSpanString(currentSpan.sourceMapSpan));
+                sourceMapRecorder.WriteLine(markerIds[index] + getSourceMapSpanString(currentSpan.sourceMapSpan));
             }
 
             if (spansOnSingleLine.length) {
@@ -431,19 +431,19 @@ namespace Harness.SourceMapRecoder {
                 // Emit column number etc
                 iterateSpans(writeSpanDetails);
 
-                sourceMapRecoder.WriteLine("---");
+                sourceMapRecorder.WriteLine("---");
             }
         }
     }
 
     export function getSourceMapRecord(sourceMapDataList: ts.SourceMapData[], program: ts.Program, jsFiles: Compiler.GeneratedFile[]) {
-        const sourceMapRecoder = new Compiler.WriterAggregator();
+        const sourceMapRecorder = new Compiler.WriterAggregator();
 
         for (let i = 0; i < sourceMapDataList.length; i++) {
             const sourceMapData = sourceMapDataList[i];
             let prevSourceFile: ts.SourceFile;
 
-            SourceMapSpanWriter.intializeSourceMapSpanWriter(sourceMapRecoder, sourceMapData, jsFiles[i]);
+            SourceMapSpanWriter.initializeSourceMapSpanWriter(sourceMapRecorder, sourceMapData, jsFiles[i]);
             for (let j = 0; j < sourceMapData.sourceMapDecodedMappings.length; j++) {
                 const decodedSourceMapping = sourceMapData.sourceMapDecodedMappings[j];
                 const currentSourceFile = program.getSourceFile(sourceMapData.inputSourceFileNames[decodedSourceMapping.sourceIndex]);
@@ -457,7 +457,7 @@ namespace Harness.SourceMapRecoder {
             }
             SourceMapSpanWriter.close(); // If the last spans werent emitted, emit them
         }
-        sourceMapRecoder.Close();
-        return sourceMapRecoder.lines.join("\r\n");
+        sourceMapRecorder.Close();
+        return sourceMapRecorder.lines.join("\r\n");
     }
 }
diff --git a/src/harness/test262Runner.ts b/src/harness/test262Runner.ts
index 262145b4764..cc9957c1fac 100644
--- a/src/harness/test262Runner.ts
+++ b/src/harness/test262Runner.ts
@@ -1,6 +1,6 @@
 /// <reference path="harness.ts" />
 /// <reference path="runnerbase.ts" />
-/* tslint:disable:no-null */
+/* tslint:disable:no-null-keyword */
 
 class Test262BaselineRunner extends RunnerBase {
     private static basePath = "internal/cases/test262";
diff --git a/src/lib/dom.generated.d.ts b/src/lib/dom.generated.d.ts
index ec71fa78e8d..f3ced0f6011 100644
--- a/src/lib/dom.generated.d.ts
+++ b/src/lib/dom.generated.d.ts
@@ -1,4 +1,3 @@
-
 /////////////////////////////
 /// IE DOM APIs
 /////////////////////////////
@@ -12,11 +11,6 @@ interface AriaRequestEventInit extends EventInit {
     attributeValue?: string;
 }
 
-interface ClipboardEventInit extends EventInit {
-    data?: string;
-    dataType?: string;
-}
-
 interface CommandEventInit extends EventInit {
     commandName?: string;
     detail?: string;
@@ -30,6 +24,31 @@ interface ConfirmSiteSpecificExceptionsInformation extends ExceptionInformation
     arrayOfDomainStrings?: string[];
 }
 
+interface ConstrainBooleanParameters {
+    exact?: boolean;
+    ideal?: boolean;
+}
+
+interface ConstrainDOMStringParameters {
+    exact?: string | string[];
+    ideal?: string | string[];
+}
+
+interface ConstrainDoubleRange extends DoubleRange {
+    exact?: number;
+    ideal?: number;
+}
+
+interface ConstrainLongRange extends LongRange {
+    exact?: number;
+    ideal?: number;
+}
+
+interface ConstrainVideoFacingModeParameters {
+    exact?: string | string[];
+    ideal?: string | string[];
+}
+
 interface CustomEventInit extends EventInit {
     detail?: any;
 }
@@ -40,17 +59,44 @@ interface DeviceAccelerationDict {
     z?: number;
 }
 
+interface DeviceLightEventInit extends EventInit {
+    value?: number;
+}
+
 interface DeviceRotationRateDict {
     alpha?: number;
     beta?: number;
     gamma?: number;
 }
 
+interface DoubleRange {
+    max?: number;
+    min?: number;
+}
+
 interface EventInit {
     bubbles?: boolean;
     cancelable?: boolean;
 }
 
+interface EventModifierInit extends UIEventInit {
+    ctrlKey?: boolean;
+    shiftKey?: boolean;
+    altKey?: boolean;
+    metaKey?: boolean;
+    modifierAltGraph?: boolean;
+    modifierCapsLock?: boolean;
+    modifierFn?: boolean;
+    modifierFnLock?: boolean;
+    modifierHyper?: boolean;
+    modifierNumLock?: boolean;
+    modifierOS?: boolean;
+    modifierScrollLock?: boolean;
+    modifierSuper?: boolean;
+    modifierSymbol?: boolean;
+    modifierSymbolLock?: boolean;
+}
+
 interface ExceptionInformation {
     domain?: string;
 }
@@ -64,17 +110,415 @@ interface HashChangeEventInit extends EventInit {
     oldURL?: string;
 }
 
+interface IDBIndexParameters {
+    multiEntry?: boolean;
+    unique?: boolean;
+}
+
+interface IDBObjectStoreParameters {
+    autoIncrement?: boolean;
+    keyPath?: IDBKeyPath;
+}
+
 interface KeyAlgorithm {
     name?: string;
 }
 
-interface KeyboardEventInit extends SharedKeyboardAndMouseEventInit {
+interface KeyboardEventInit extends EventModifierInit {
     key?: string;
     location?: number;
     repeat?: boolean;
 }
 
-interface MouseEventInit extends SharedKeyboardAndMouseEventInit {
+interface LongRange {
+    max?: number;
+    min?: number;
+}
+
+interface MSAccountInfo {
+    rpDisplayName?: string;
+    userDisplayName?: string;
+    accountName?: string;
+    userId?: string;
+    accountImageUri?: string;
+}
+
+interface MSAudioLocalClientEvent extends MSLocalClientEventBase {
+    networkSendQualityEventRatio?: number;
+    networkDelayEventRatio?: number;
+    cpuInsufficientEventRatio?: number;
+    deviceHalfDuplexAECEventRatio?: number;
+    deviceRenderNotFunctioningEventRatio?: number;
+    deviceCaptureNotFunctioningEventRatio?: number;
+    deviceGlitchesEventRatio?: number;
+    deviceLowSNREventRatio?: number;
+    deviceLowSpeechLevelEventRatio?: number;
+    deviceClippingEventRatio?: number;
+    deviceEchoEventRatio?: number;
+    deviceNearEndToEchoRatioEventRatio?: number;
+    deviceRenderZeroVolumeEventRatio?: number;
+    deviceRenderMuteEventRatio?: number;
+    deviceMultipleEndpointsEventCount?: number;
+    deviceHowlingEventCount?: number;
+}
+
+interface MSAudioRecvPayload extends MSPayloadBase {
+    samplingRate?: number;
+    signal?: MSAudioRecvSignal;
+    packetReorderRatio?: number;
+    packetReorderDepthAvg?: number;
+    packetReorderDepthMax?: number;
+    burstLossLength1?: number;
+    burstLossLength2?: number;
+    burstLossLength3?: number;
+    burstLossLength4?: number;
+    burstLossLength5?: number;
+    burstLossLength6?: number;
+    burstLossLength7?: number;
+    burstLossLength8OrHigher?: number;
+    fecRecvDistance1?: number;
+    fecRecvDistance2?: number;
+    fecRecvDistance3?: number;
+    ratioConcealedSamplesAvg?: number;
+    ratioStretchedSamplesAvg?: number;
+    ratioCompressedSamplesAvg?: number;
+}
+
+interface MSAudioRecvSignal {
+    initialSignalLevelRMS?: number;
+    recvSignalLevelCh1?: number;
+    recvNoiseLevelCh1?: number;
+    renderSignalLevel?: number;
+    renderNoiseLevel?: number;
+    renderLoopbackSignalLevel?: number;
+}
+
+interface MSAudioSendPayload extends MSPayloadBase {
+    samplingRate?: number;
+    signal?: MSAudioSendSignal;
+    audioFECUsed?: boolean;
+    sendMutePercent?: number;
+}
+
+interface MSAudioSendSignal {
+    noiseLevel?: number;
+    sendSignalLevelCh1?: number;
+    sendNoiseLevelCh1?: number;
+}
+
+interface MSConnectivity {
+    iceType?: string;
+    iceWarningFlags?: MSIceWarningFlags;
+    relayAddress?: MSRelayAddress;
+}
+
+interface MSCredentialFilter {
+    accept?: MSCredentialSpec[];
+}
+
+interface MSCredentialParameters {
+    type?: string;
+}
+
+interface MSCredentialSpec {
+    type?: string;
+    id?: string;
+}
+
+interface MSDelay {
+    roundTrip?: number;
+    roundTripMax?: number;
+}
+
+interface MSDescription extends RTCStats {
+    connectivity?: MSConnectivity;
+    transport?: string;
+    networkconnectivity?: MSNetworkConnectivityInfo;
+    localAddr?: MSIPAddressInfo;
+    remoteAddr?: MSIPAddressInfo;
+    deviceDevName?: string;
+    reflexiveLocalIPAddr?: MSIPAddressInfo;
+}
+
+interface MSFIDOCredentialParameters extends MSCredentialParameters {
+    algorithm?: string | Algorithm;
+    authenticators?: AAGUID[];
+}
+
+interface MSIPAddressInfo {
+    ipAddr?: string;
+    port?: number;
+    manufacturerMacAddrMask?: string;
+}
+
+interface MSIceWarningFlags {
+    turnTcpTimedOut?: boolean;
+    turnUdpAllocateFailed?: boolean;
+    turnUdpSendFailed?: boolean;
+    turnTcpAllocateFailed?: boolean;
+    turnTcpSendFailed?: boolean;
+    udpLocalConnectivityFailed?: boolean;
+    udpNatConnectivityFailed?: boolean;
+    udpRelayConnectivityFailed?: boolean;
+    tcpNatConnectivityFailed?: boolean;
+    tcpRelayConnectivityFailed?: boolean;
+    connCheckMessageIntegrityFailed?: boolean;
+    allocationMessageIntegrityFailed?: boolean;
+    connCheckOtherError?: boolean;
+    turnAuthUnknownUsernameError?: boolean;
+    noRelayServersConfigured?: boolean;
+    multipleRelayServersAttempted?: boolean;
+    portRangeExhausted?: boolean;
+    alternateServerReceived?: boolean;
+    pseudoTLSFailure?: boolean;
+    turnTurnTcpConnectivityFailed?: boolean;
+    useCandidateChecksFailed?: boolean;
+    fipsAllocationFailure?: boolean;
+}
+
+interface MSJitter {
+    interArrival?: number;
+    interArrivalMax?: number;
+    interArrivalSD?: number;
+}
+
+interface MSLocalClientEventBase extends RTCStats {
+    networkReceiveQualityEventRatio?: number;
+    networkBandwidthLowEventRatio?: number;
+}
+
+interface MSNetwork extends RTCStats {
+    jitter?: MSJitter;
+    delay?: MSDelay;
+    packetLoss?: MSPacketLoss;
+    utilization?: MSUtilization;
+}
+
+interface MSNetworkConnectivityInfo {
+    vpn?: boolean;
+    linkspeed?: number;
+    networkConnectionDetails?: string;
+}
+
+interface MSNetworkInterfaceType {
+    interfaceTypeEthernet?: boolean;
+    interfaceTypeWireless?: boolean;
+    interfaceTypePPP?: boolean;
+    interfaceTypeTunnel?: boolean;
+    interfaceTypeWWAN?: boolean;
+}
+
+interface MSOutboundNetwork extends MSNetwork {
+    appliedBandwidthLimit?: number;
+}
+
+interface MSPacketLoss {
+    lossRate?: number;
+    lossRateMax?: number;
+}
+
+interface MSPayloadBase extends RTCStats {
+    payloadDescription?: string;
+}
+
+interface MSRelayAddress {
+    relayAddress?: string;
+    port?: number;
+}
+
+interface MSSignatureParameters {
+    userPrompt?: string;
+}
+
+interface MSTransportDiagnosticsStats extends RTCStats {
+    baseAddress?: string;
+    localAddress?: string;
+    localSite?: string;
+    networkName?: string;
+    remoteAddress?: string;
+    remoteSite?: string;
+    localMR?: string;
+    remoteMR?: string;
+    iceWarningFlags?: MSIceWarningFlags;
+    portRangeMin?: number;
+    portRangeMax?: number;
+    localMRTCPPort?: number;
+    remoteMRTCPPort?: number;
+    stunVer?: number;
+    numConsentReqSent?: number;
+    numConsentReqReceived?: number;
+    numConsentRespSent?: number;
+    numConsentRespReceived?: number;
+    interfaces?: MSNetworkInterfaceType;
+    baseInterface?: MSNetworkInterfaceType;
+    protocol?: string;
+    localInterface?: MSNetworkInterfaceType;
+    localAddrType?: string;
+    remoteAddrType?: string;
+    iceRole?: string;
+    rtpRtcpMux?: boolean;
+    allocationTimeInMs?: number;
+    msRtcEngineVersion?: string;
+}
+
+interface MSUtilization {
+    packets?: number;
+    bandwidthEstimation?: number;
+    bandwidthEstimationMin?: number;
+    bandwidthEstimationMax?: number;
+    bandwidthEstimationStdDev?: number;
+    bandwidthEstimationAvg?: number;
+}
+
+interface MSVideoPayload extends MSPayloadBase {
+    resoluton?: string;
+    videoBitRateAvg?: number;
+    videoBitRateMax?: number;
+    videoFrameRateAvg?: number;
+    videoPacketLossRate?: number;
+    durationSeconds?: number;
+}
+
+interface MSVideoRecvPayload extends MSVideoPayload {
+    videoFrameLossRate?: number;
+    recvCodecType?: string;
+    recvResolutionWidth?: number;
+    recvResolutionHeight?: number;
+    videoResolutions?: MSVideoResolutionDistribution;
+    recvFrameRateAverage?: number;
+    recvBitRateMaximum?: number;
+    recvBitRateAverage?: number;
+    recvVideoStreamsMax?: number;
+    recvVideoStreamsMin?: number;
+    recvVideoStreamsMode?: number;
+    videoPostFECPLR?: number;
+    lowBitRateCallPercent?: number;
+    lowFrameRateCallPercent?: number;
+    reorderBufferTotalPackets?: number;
+    recvReorderBufferReorderedPackets?: number;
+    recvReorderBufferPacketsDroppedDueToBufferExhaustion?: number;
+    recvReorderBufferMaxSuccessfullyOrderedExtent?: number;
+    recvReorderBufferMaxSuccessfullyOrderedLateTime?: number;
+    recvReorderBufferPacketsDroppedDueToTimeout?: number;
+    recvFpsHarmonicAverage?: number;
+    recvNumResSwitches?: number;
+}
+
+interface MSVideoResolutionDistribution {
+    cifQuality?: number;
+    vgaQuality?: number;
+    h720Quality?: number;
+    h1080Quality?: number;
+    h1440Quality?: number;
+    h2160Quality?: number;
+}
+
+interface MSVideoSendPayload extends MSVideoPayload {
+    sendFrameRateAverage?: number;
+    sendBitRateMaximum?: number;
+    sendBitRateAverage?: number;
+    sendVideoStreamsMax?: number;
+    sendResolutionWidth?: number;
+    sendResolutionHeight?: number;
+}
+
+interface MediaEncryptedEventInit extends EventInit {
+    initDataType?: string;
+    initData?: ArrayBuffer;
+}
+
+interface MediaKeyMessageEventInit extends EventInit {
+    messageType?: string;
+    message?: ArrayBuffer;
+}
+
+interface MediaKeySystemConfiguration {
+    initDataTypes?: string[];
+    audioCapabilities?: MediaKeySystemMediaCapability[];
+    videoCapabilities?: MediaKeySystemMediaCapability[];
+    distinctiveIdentifier?: string;
+    persistentState?: string;
+}
+
+interface MediaKeySystemMediaCapability {
+    contentType?: string;
+    robustness?: string;
+}
+
+interface MediaStreamConstraints {
+    video?: boolean | MediaTrackConstraints;
+    audio?: boolean | MediaTrackConstraints;
+}
+
+interface MediaStreamErrorEventInit extends EventInit {
+    error?: MediaStreamError;
+}
+
+interface MediaStreamTrackEventInit extends EventInit {
+    track?: MediaStreamTrack;
+}
+
+interface MediaTrackCapabilities {
+    width?: number | LongRange;
+    height?: number | LongRange;
+    aspectRatio?: number | DoubleRange;
+    frameRate?: number | DoubleRange;
+    facingMode?: string;
+    volume?: number | DoubleRange;
+    sampleRate?: number | LongRange;
+    sampleSize?: number | LongRange;
+    echoCancellation?: boolean[];
+    deviceId?: string;
+    groupId?: string;
+}
+
+interface MediaTrackConstraintSet {
+    width?: number | ConstrainLongRange;
+    height?: number | ConstrainLongRange;
+    aspectRatio?: number | ConstrainDoubleRange;
+    frameRate?: number | ConstrainDoubleRange;
+    facingMode?: string | string[] | ConstrainDOMStringParameters;
+    volume?: number | ConstrainDoubleRange;
+    sampleRate?: number | ConstrainLongRange;
+    sampleSize?: number | ConstrainLongRange;
+    echoCancelation?: boolean | ConstrainBooleanParameters;
+    deviceId?: string | string[] | ConstrainDOMStringParameters;
+    groupId?: string | string[] | ConstrainDOMStringParameters;
+}
+
+interface MediaTrackConstraints extends MediaTrackConstraintSet {
+    advanced?: MediaTrackConstraintSet[];
+}
+
+interface MediaTrackSettings {
+    width?: number;
+    height?: number;
+    aspectRatio?: number;
+    frameRate?: number;
+    facingMode?: string;
+    volume?: number;
+    sampleRate?: number;
+    sampleSize?: number;
+    echoCancellation?: boolean;
+    deviceId?: string;
+    groupId?: string;
+}
+
+interface MediaTrackSupportedConstraints {
+    width?: boolean;
+    height?: boolean;
+    aspectRatio?: boolean;
+    frameRate?: boolean;
+    facingMode?: boolean;
+    volume?: boolean;
+    sampleRate?: boolean;
+    sampleSize?: boolean;
+    echoCancellation?: boolean;
+    deviceId?: boolean;
+    groupId?: boolean;
+}
+
+interface MouseEventInit extends EventModifierInit {
     screenX?: number;
     screenY?: number;
     clientX?: number;
@@ -107,6 +551,10 @@ interface ObjectURLOptions {
     oneTimeOnly?: boolean;
 }
 
+interface PeriodicWaveConstraints {
+    disableNormalization?: boolean;
+}
+
 interface PointerEventInit extends MouseEventInit {
     pointerId?: number;
     width?: number;
@@ -124,22 +572,266 @@ interface PositionOptions {
     maximumAge?: number;
 }
 
-interface SharedKeyboardAndMouseEventInit extends UIEventInit {
-    ctrlKey?: boolean;
-    shiftKey?: boolean;
-    altKey?: boolean;
-    metaKey?: boolean;
-    keyModifierStateAltGraph?: boolean;
-    keyModifierStateCapsLock?: boolean;
-    keyModifierStateFn?: boolean;
-    keyModifierStateFnLock?: boolean;
-    keyModifierStateHyper?: boolean;
-    keyModifierStateNumLock?: boolean;
-    keyModifierStateOS?: boolean;
-    keyModifierStateScrollLock?: boolean;
-    keyModifierStateSuper?: boolean;
-    keyModifierStateSymbol?: boolean;
-    keyModifierStateSymbolLock?: boolean;
+interface RTCDTMFToneChangeEventInit extends EventInit {
+    tone?: string;
+}
+
+interface RTCDtlsFingerprint {
+    algorithm?: string;
+    value?: string;
+}
+
+interface RTCDtlsParameters {
+    role?: string;
+    fingerprints?: RTCDtlsFingerprint[];
+}
+
+interface RTCIceCandidate {
+    foundation?: string;
+    priority?: number;
+    ip?: string;
+    protocol?: string;
+    port?: number;
+    type?: string;
+    tcpType?: string;
+    relatedAddress?: string;
+    relatedPort?: number;
+}
+
+interface RTCIceCandidateAttributes extends RTCStats {
+    ipAddress?: string;
+    portNumber?: number;
+    transport?: string;
+    candidateType?: string;
+    priority?: number;
+    addressSourceUrl?: string;
+}
+
+interface RTCIceCandidateComplete {
+}
+
+interface RTCIceCandidatePair {
+    local?: RTCIceCandidate;
+    remote?: RTCIceCandidate;
+}
+
+interface RTCIceCandidatePairStats extends RTCStats {
+    transportId?: string;
+    localCandidateId?: string;
+    remoteCandidateId?: string;
+    state?: string;
+    priority?: number;
+    nominated?: boolean;
+    writable?: boolean;
+    readable?: boolean;
+    bytesSent?: number;
+    bytesReceived?: number;
+    roundTripTime?: number;
+    availableOutgoingBitrate?: number;
+    availableIncomingBitrate?: number;
+}
+
+interface RTCIceGatherOptions {
+    gatherPolicy?: string;
+    iceservers?: RTCIceServer[];
+}
+
+interface RTCIceParameters {
+    usernameFragment?: string;
+    password?: string;
+}
+
+interface RTCIceServer {
+    urls?: any;
+    username?: string;
+    credential?: string;
+}
+
+interface RTCInboundRTPStreamStats extends RTCRTPStreamStats {
+    packetsReceived?: number;
+    bytesReceived?: number;
+    packetsLost?: number;
+    jitter?: number;
+    fractionLost?: number;
+}
+
+interface RTCMediaStreamTrackStats extends RTCStats {
+    trackIdentifier?: string;
+    remoteSource?: boolean;
+    ssrcIds?: string[];
+    frameWidth?: number;
+    frameHeight?: number;
+    framesPerSecond?: number;
+    framesSent?: number;
+    framesReceived?: number;
+    framesDecoded?: number;
+    framesDropped?: number;
+    framesCorrupted?: number;
+    audioLevel?: number;
+    echoReturnLoss?: number;
+    echoReturnLossEnhancement?: number;
+}
+
+interface RTCOutboundRTPStreamStats extends RTCRTPStreamStats {
+    packetsSent?: number;
+    bytesSent?: number;
+    targetBitrate?: number;
+    roundTripTime?: number;
+}
+
+interface RTCRTPStreamStats extends RTCStats {
+    ssrc?: string;
+    associateStatsId?: string;
+    isRemote?: boolean;
+    mediaTrackId?: string;
+    transportId?: string;
+    codecId?: string;
+    firCount?: number;
+    pliCount?: number;
+    nackCount?: number;
+    sliCount?: number;
+}
+
+interface RTCRtcpFeedback {
+    type?: string;
+    parameter?: string;
+}
+
+interface RTCRtcpParameters {
+    ssrc?: number;
+    cname?: string;
+    reducedSize?: boolean;
+    mux?: boolean;
+}
+
+interface RTCRtpCapabilities {
+    codecs?: RTCRtpCodecCapability[];
+    headerExtensions?: RTCRtpHeaderExtension[];
+    fecMechanisms?: string[];
+}
+
+interface RTCRtpCodecCapability {
+    name?: string;
+    kind?: string;
+    clockRate?: number;
+    preferredPayloadType?: number;
+    maxptime?: number;
+    numChannels?: number;
+    rtcpFeedback?: RTCRtcpFeedback[];
+    parameters?: any;
+    options?: any;
+    maxTemporalLayers?: number;
+    maxSpatialLayers?: number;
+    svcMultiStreamSupport?: boolean;
+}
+
+interface RTCRtpCodecParameters {
+    name?: string;
+    payloadType?: any;
+    clockRate?: number;
+    maxptime?: number;
+    numChannels?: number;
+    rtcpFeedback?: RTCRtcpFeedback[];
+    parameters?: any;
+}
+
+interface RTCRtpContributingSource {
+    timestamp?: number;
+    csrc?: number;
+    audioLevel?: number;
+}
+
+interface RTCRtpEncodingParameters {
+    ssrc?: number;
+    codecPayloadType?: number;
+    fec?: RTCRtpFecParameters;
+    rtx?: RTCRtpRtxParameters;
+    priority?: number;
+    maxBitrate?: number;
+    minQuality?: number;
+    framerateBias?: number;
+    resolutionScale?: number;
+    framerateScale?: number;
+    active?: boolean;
+    encodingId?: string;
+    dependencyEncodingIds?: string[];
+    ssrcRange?: RTCSsrcRange;
+}
+
+interface RTCRtpFecParameters {
+    ssrc?: number;
+    mechanism?: string;
+}
+
+interface RTCRtpHeaderExtension {
+    kind?: string;
+    uri?: string;
+    preferredId?: number;
+    preferredEncrypt?: boolean;
+}
+
+interface RTCRtpHeaderExtensionParameters {
+    uri?: string;
+    id?: number;
+    encrypt?: boolean;
+}
+
+interface RTCRtpParameters {
+    muxId?: string;
+    codecs?: RTCRtpCodecParameters[];
+    headerExtensions?: RTCRtpHeaderExtensionParameters[];
+    encodings?: RTCRtpEncodingParameters[];
+    rtcp?: RTCRtcpParameters;
+}
+
+interface RTCRtpRtxParameters {
+    ssrc?: number;
+}
+
+interface RTCRtpUnhandled {
+    ssrc?: number;
+    payloadType?: number;
+    muxId?: string;
+}
+
+interface RTCSrtpKeyParam {
+    keyMethod?: string;
+    keySalt?: string;
+    lifetime?: string;
+    mkiValue?: number;
+    mkiLength?: number;
+}
+
+interface RTCSrtpSdesParameters {
+    tag?: number;
+    cryptoSuite?: string;
+    keyParams?: RTCSrtpKeyParam[];
+    sessionParams?: string[];
+}
+
+interface RTCSsrcRange {
+    min?: number;
+    max?: number;
+}
+
+interface RTCStats {
+    timestamp?: number;
+    type?: string;
+    id?: string;
+    msType?: string;
+}
+
+interface RTCStatsReport {
+}
+
+interface RTCTransportStats extends RTCStats {
+    bytesSent?: number;
+    bytesReceived?: number;
+    rtcpTransportStatsId?: string;
+    activeConnection?: boolean;
+    selectedCandidatePairId?: string;
+    localCertificateId?: string;
+    remoteCertificateId?: string;
 }
 
 interface StoreExceptionsInformation extends ExceptionInformation {
@@ -185,18 +877,18 @@ interface ANGLE_instanced_arrays {
     drawArraysInstancedANGLE(mode: number, first: number, count: number, primcount: number): void;
     drawElementsInstancedANGLE(mode: number, count: number, type: number, offset: number, primcount: number): void;
     vertexAttribDivisorANGLE(index: number, divisor: number): void;
-    VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE: number;
+    readonly VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE: number;
 }
 
 declare var ANGLE_instanced_arrays: {
     prototype: ANGLE_instanced_arrays;
     new(): ANGLE_instanced_arrays;
-    VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE: number;
+    readonly VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE: number;
 }
 
 interface AnalyserNode extends AudioNode {
     fftSize: number;
-    frequencyBinCount: number;
+    readonly frequencyBinCount: number;
     maxDecibels: number;
     minDecibels: number;
     smoothingTimeConstant: number;
@@ -212,8 +904,8 @@ declare var AnalyserNode: {
 }
 
 interface AnimationEvent extends Event {
-    animationName: string;
-    elapsedTime: number;
+    readonly animationName: string;
+    readonly elapsedTime: number;
     initAnimationEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, animationNameArg: string, elapsedTimeArg: number): void;
 }
 
@@ -231,16 +923,16 @@ interface ApplicationCache extends EventTarget {
     onobsolete: (ev: Event) => any;
     onprogress: (ev: ProgressEvent) => any;
     onupdateready: (ev: Event) => any;
-    status: number;
+    readonly status: number;
     abort(): void;
     swapCache(): void;
     update(): void;
-    CHECKING: number;
-    DOWNLOADING: number;
-    IDLE: number;
-    OBSOLETE: number;
-    UNCACHED: number;
-    UPDATEREADY: number;
+    readonly CHECKING: number;
+    readonly DOWNLOADING: number;
+    readonly IDLE: number;
+    readonly OBSOLETE: number;
+    readonly UNCACHED: number;
+    readonly UPDATEREADY: number;
     addEventListener(type: "cached", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "checking", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "downloading", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -255,16 +947,16 @@ interface ApplicationCache extends EventTarget {
 declare var ApplicationCache: {
     prototype: ApplicationCache;
     new(): ApplicationCache;
-    CHECKING: number;
-    DOWNLOADING: number;
-    IDLE: number;
-    OBSOLETE: number;
-    UNCACHED: number;
-    UPDATEREADY: number;
+    readonly CHECKING: number;
+    readonly DOWNLOADING: number;
+    readonly IDLE: number;
+    readonly OBSOLETE: number;
+    readonly UNCACHED: number;
+    readonly UPDATEREADY: number;
 }
 
 interface AriaRequestEvent extends Event {
-    attributeName: string;
+    readonly attributeName: string;
     attributeValue: string;
 }
 
@@ -274,9 +966,10 @@ declare var AriaRequestEvent: {
 }
 
 interface Attr extends Node {
-    name: string;
-    ownerElement: Element;
-    specified: boolean;
+    readonly name: string;
+    readonly ownerElement: Element;
+    readonly prefix: string;
+    readonly specified: boolean;
     value: string;
 }
 
@@ -286,10 +979,12 @@ declare var Attr: {
 }
 
 interface AudioBuffer {
-    duration: number;
-    length: number;
-    numberOfChannels: number;
-    sampleRate: number;
+    readonly duration: number;
+    readonly length: number;
+    readonly numberOfChannels: number;
+    readonly sampleRate: number;
+    copyFromChannel(destination: Float32Array, channelNumber: number, startInChannel?: number): void;
+    copyToChannel(source: Float32Array, channelNumber: number, startInChannel?: number): void;
     getChannelData(channel: number): Float32Array;
 }
 
@@ -300,14 +995,15 @@ declare var AudioBuffer: {
 
 interface AudioBufferSourceNode extends AudioNode {
     buffer: AudioBuffer;
+    readonly detune: AudioParam;
     loop: boolean;
     loopEnd: number;
     loopStart: number;
-    onended: (ev: Event) => any;
-    playbackRate: AudioParam;
+    onended: (ev: MediaStreamErrorEvent) => any;
+    readonly playbackRate: AudioParam;
     start(when?: number, offset?: number, duration?: number): void;
     stop(when?: number): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -317,10 +1013,10 @@ declare var AudioBufferSourceNode: {
 }
 
 interface AudioContext extends EventTarget {
-    currentTime: number;
-    destination: AudioDestinationNode;
-    listener: AudioListener;
-    sampleRate: number;
+    readonly currentTime: number;
+    readonly destination: AudioDestinationNode;
+    readonly listener: AudioListener;
+    readonly sampleRate: number;
     state: string;
     createAnalyser(): AnalyserNode;
     createBiquadFilter(): BiquadFilterNode;
@@ -333,13 +1029,14 @@ interface AudioContext extends EventTarget {
     createDynamicsCompressor(): DynamicsCompressorNode;
     createGain(): GainNode;
     createMediaElementSource(mediaElement: HTMLMediaElement): MediaElementAudioSourceNode;
+    createMediaStreamSource(mediaStream: MediaStream): MediaStreamAudioSourceNode;
     createOscillator(): OscillatorNode;
     createPanner(): PannerNode;
-    createPeriodicWave(real: Float32Array, imag: Float32Array): PeriodicWave;
+    createPeriodicWave(real: Float32Array, imag: Float32Array, constraints?: PeriodicWaveConstraints): PeriodicWave;
     createScriptProcessor(bufferSize?: number, numberOfInputChannels?: number, numberOfOutputChannels?: number): ScriptProcessorNode;
     createStereoPanner(): StereoPannerNode;
     createWaveShaper(): WaveShaperNode;
-    decodeAudioData(audioData: ArrayBuffer, successCallback: DecodeSuccessCallback, errorCallback?: DecodeErrorCallback): void;
+    decodeAudioData(audioData: ArrayBuffer, successCallback?: DecodeSuccessCallback, errorCallback?: DecodeErrorCallback): PromiseLike<AudioBuffer>;
 }
 
 declare var AudioContext: {
@@ -348,7 +1045,7 @@ declare var AudioContext: {
 }
 
 interface AudioDestinationNode extends AudioNode {
-    maxChannelCount: number;
+    readonly maxChannelCount: number;
 }
 
 declare var AudioDestinationNode: {
@@ -373,9 +1070,9 @@ interface AudioNode extends EventTarget {
     channelCount: number;
     channelCountMode: string;
     channelInterpretation: string;
-    context: AudioContext;
-    numberOfInputs: number;
-    numberOfOutputs: number;
+    readonly context: AudioContext;
+    readonly numberOfInputs: number;
+    readonly numberOfOutputs: number;
     connect(destination: AudioNode, output?: number, input?: number): void;
     disconnect(output?: number): void;
     disconnect(destination: AudioNode, output?: number, input?: number): void;
@@ -388,7 +1085,7 @@ declare var AudioNode: {
 }
 
 interface AudioParam {
-    defaultValue: number;
+    readonly defaultValue: number;
     value: number;
     cancelScheduledValues(startTime: number): void;
     exponentialRampToValueAtTime(value: number, endTime: number): void;
@@ -404,9 +1101,9 @@ declare var AudioParam: {
 }
 
 interface AudioProcessingEvent extends Event {
-    inputBuffer: AudioBuffer;
-    outputBuffer: AudioBuffer;
-    playbackTime: number;
+    readonly inputBuffer: AudioBuffer;
+    readonly outputBuffer: AudioBuffer;
+    readonly playbackTime: number;
 }
 
 declare var AudioProcessingEvent: {
@@ -416,11 +1113,11 @@ declare var AudioProcessingEvent: {
 
 interface AudioTrack {
     enabled: boolean;
-    id: string;
+    readonly id: string;
     kind: string;
-    label: string;
+    readonly label: string;
     language: string;
-    sourceBuffer: SourceBuffer;
+    readonly sourceBuffer: SourceBuffer;
 }
 
 declare var AudioTrack: {
@@ -429,7 +1126,7 @@ declare var AudioTrack: {
 }
 
 interface AudioTrackList extends EventTarget {
-    length: number;
+    readonly length: number;
     onaddtrack: (ev: TrackEvent) => any;
     onchange: (ev: Event) => any;
     onremovetrack: (ev: TrackEvent) => any;
@@ -448,7 +1145,7 @@ declare var AudioTrackList: {
 }
 
 interface BarProp {
-    visible: boolean;
+    readonly visible: boolean;
 }
 
 declare var BarProp: {
@@ -466,10 +1163,10 @@ declare var BeforeUnloadEvent: {
 }
 
 interface BiquadFilterNode extends AudioNode {
-    Q: AudioParam;
-    detune: AudioParam;
-    frequency: AudioParam;
-    gain: AudioParam;
+    readonly Q: AudioParam;
+    readonly detune: AudioParam;
+    readonly frequency: AudioParam;
+    readonly gain: AudioParam;
     type: string;
     getFrequencyResponse(frequencyHz: Float32Array, magResponse: Float32Array, phaseResponse: Float32Array): void;
 }
@@ -480,8 +1177,8 @@ declare var BiquadFilterNode: {
 }
 
 interface Blob {
-    size: number;
-    type: string;
+    readonly size: number;
+    readonly type: string;
     msClose(): void;
     msDetachStream(): any;
     slice(start?: number, end?: number, contentType?: string): Blob;
@@ -515,7 +1212,7 @@ declare var CSSConditionRule: {
 }
 
 interface CSSFontFaceRule extends CSSRule {
-    style: CSSStyleDeclaration;
+    readonly style: CSSStyleDeclaration;
 }
 
 declare var CSSFontFaceRule: {
@@ -524,9 +1221,9 @@ declare var CSSFontFaceRule: {
 }
 
 interface CSSGroupingRule extends CSSRule {
-    cssRules: CSSRuleList;
-    deleteRule(index?: number): void;
-    insertRule(rule: string, index?: number): number;
+    readonly cssRules: CSSRuleList;
+    deleteRule(index: number): void;
+    insertRule(rule: string, index: number): number;
 }
 
 declare var CSSGroupingRule: {
@@ -535,9 +1232,9 @@ declare var CSSGroupingRule: {
 }
 
 interface CSSImportRule extends CSSRule {
-    href: string;
-    media: MediaList;
-    styleSheet: CSSStyleSheet;
+    readonly href: string;
+    readonly media: MediaList;
+    readonly styleSheet: CSSStyleSheet;
 }
 
 declare var CSSImportRule: {
@@ -547,7 +1244,7 @@ declare var CSSImportRule: {
 
 interface CSSKeyframeRule extends CSSRule {
     keyText: string;
-    style: CSSStyleDeclaration;
+    readonly style: CSSStyleDeclaration;
 }
 
 declare var CSSKeyframeRule: {
@@ -556,7 +1253,7 @@ declare var CSSKeyframeRule: {
 }
 
 interface CSSKeyframesRule extends CSSRule {
-    cssRules: CSSRuleList;
+    readonly cssRules: CSSRuleList;
     name: string;
     appendRule(rule: string): void;
     deleteRule(rule: string): void;
@@ -569,7 +1266,7 @@ declare var CSSKeyframesRule: {
 }
 
 interface CSSMediaRule extends CSSConditionRule {
-    media: MediaList;
+    readonly media: MediaList;
 }
 
 declare var CSSMediaRule: {
@@ -578,8 +1275,8 @@ declare var CSSMediaRule: {
 }
 
 interface CSSNamespaceRule extends CSSRule {
-    namespaceURI: string;
-    prefix: string;
+    readonly namespaceURI: string;
+    readonly prefix: string;
 }
 
 declare var CSSNamespaceRule: {
@@ -588,10 +1285,10 @@ declare var CSSNamespaceRule: {
 }
 
 interface CSSPageRule extends CSSRule {
-    pseudoClass: string;
-    selector: string;
+    readonly pseudoClass: string;
+    readonly selector: string;
     selectorText: string;
-    style: CSSStyleDeclaration;
+    readonly style: CSSStyleDeclaration;
 }
 
 declare var CSSPageRule: {
@@ -601,42 +1298,42 @@ declare var CSSPageRule: {
 
 interface CSSRule {
     cssText: string;
-    parentRule: CSSRule;
-    parentStyleSheet: CSSStyleSheet;
-    type: number;
-    CHARSET_RULE: number;
-    FONT_FACE_RULE: number;
-    IMPORT_RULE: number;
-    KEYFRAMES_RULE: number;
-    KEYFRAME_RULE: number;
-    MEDIA_RULE: number;
-    NAMESPACE_RULE: number;
-    PAGE_RULE: number;
-    STYLE_RULE: number;
-    SUPPORTS_RULE: number;
-    UNKNOWN_RULE: number;
-    VIEWPORT_RULE: number;
+    readonly parentRule: CSSRule;
+    readonly parentStyleSheet: CSSStyleSheet;
+    readonly type: number;
+    readonly CHARSET_RULE: number;
+    readonly FONT_FACE_RULE: number;
+    readonly IMPORT_RULE: number;
+    readonly KEYFRAMES_RULE: number;
+    readonly KEYFRAME_RULE: number;
+    readonly MEDIA_RULE: number;
+    readonly NAMESPACE_RULE: number;
+    readonly PAGE_RULE: number;
+    readonly STYLE_RULE: number;
+    readonly SUPPORTS_RULE: number;
+    readonly UNKNOWN_RULE: number;
+    readonly VIEWPORT_RULE: number;
 }
 
 declare var CSSRule: {
     prototype: CSSRule;
     new(): CSSRule;
-    CHARSET_RULE: number;
-    FONT_FACE_RULE: number;
-    IMPORT_RULE: number;
-    KEYFRAMES_RULE: number;
-    KEYFRAME_RULE: number;
-    MEDIA_RULE: number;
-    NAMESPACE_RULE: number;
-    PAGE_RULE: number;
-    STYLE_RULE: number;
-    SUPPORTS_RULE: number;
-    UNKNOWN_RULE: number;
-    VIEWPORT_RULE: number;
+    readonly CHARSET_RULE: number;
+    readonly FONT_FACE_RULE: number;
+    readonly IMPORT_RULE: number;
+    readonly KEYFRAMES_RULE: number;
+    readonly KEYFRAME_RULE: number;
+    readonly MEDIA_RULE: number;
+    readonly NAMESPACE_RULE: number;
+    readonly PAGE_RULE: number;
+    readonly STYLE_RULE: number;
+    readonly SUPPORTS_RULE: number;
+    readonly UNKNOWN_RULE: number;
+    readonly VIEWPORT_RULE: number;
 }
 
 interface CSSRuleList {
-    length: number;
+    readonly length: number;
     item(index: number): CSSRule;
     [index: number]: CSSRule;
 }
@@ -769,7 +1466,7 @@ interface CSSStyleDeclaration {
     justifyContent: string;
     kerning: string;
     left: string;
-    length: number;
+    readonly length: number;
     letterSpacing: string;
     lightingColor: string;
     lineHeight: string;
@@ -856,7 +1553,7 @@ interface CSSStyleDeclaration {
     pageBreakAfter: string;
     pageBreakBefore: string;
     pageBreakInside: string;
-    parentRule: CSSRule;
+    readonly parentRule: CSSRule;
     perspective: string;
     perspectiveOrigin: string;
     pointerEvents: string;
@@ -881,7 +1578,6 @@ interface CSSStyleDeclaration {
     textAlignLast: string;
     textAnchor: string;
     textDecoration: string;
-    textFillColor: string;
     textIndent: string;
     textJustify: string;
     textKashida: string;
@@ -917,25 +1613,12 @@ interface CSSStyleDeclaration {
     webkitAnimationTimingFunction: string;
     webkitAppearance: string;
     webkitBackfaceVisibility: string;
-    webkitBackground: string;
-    webkitBackgroundAttachment: string;
     webkitBackgroundClip: string;
-    webkitBackgroundColor: string;
-    webkitBackgroundImage: string;
     webkitBackgroundOrigin: string;
-    webkitBackgroundPosition: string;
-    webkitBackgroundPositionX: string;
-    webkitBackgroundPositionY: string;
-    webkitBackgroundRepeat: string;
     webkitBackgroundSize: string;
     webkitBorderBottomLeftRadius: string;
     webkitBorderBottomRightRadius: string;
     webkitBorderImage: string;
-    webkitBorderImageOutset: string;
-    webkitBorderImageRepeat: string;
-    webkitBorderImageSlice: string;
-    webkitBorderImageSource: string;
-    webkitBorderImageWidth: string;
     webkitBorderRadius: string;
     webkitBorderTopLeftRadius: string;
     webkitBorderTopRightRadius: string;
@@ -981,6 +1664,7 @@ interface CSSStyleDeclaration {
     webkitTransitionDuration: string;
     webkitTransitionProperty: string;
     webkitTransitionTimingFunction: string;
+    webkitUserModify: string;
     webkitUserSelect: string;
     webkitWritingMode: string;
     whiteSpace: string;
@@ -1006,9 +1690,9 @@ declare var CSSStyleDeclaration: {
 }
 
 interface CSSStyleRule extends CSSRule {
-    readOnly: boolean;
+    readonly readOnly: boolean;
     selectorText: string;
-    style: CSSStyleDeclaration;
+    readonly style: CSSStyleDeclaration;
 }
 
 declare var CSSStyleRule: {
@@ -1017,18 +1701,18 @@ declare var CSSStyleRule: {
 }
 
 interface CSSStyleSheet extends StyleSheet {
-    cssRules: CSSRuleList;
+    readonly cssRules: CSSRuleList;
     cssText: string;
-    href: string;
-    id: string;
-    imports: StyleSheetList;
-    isAlternate: boolean;
-    isPrefAlternate: boolean;
-    ownerRule: CSSRule;
-    owningElement: Element;
-    pages: StyleSheetPageList;
-    readOnly: boolean;
-    rules: CSSRuleList;
+    readonly href: string;
+    readonly id: string;
+    readonly imports: StyleSheetList;
+    readonly isAlternate: boolean;
+    readonly isPrefAlternate: boolean;
+    readonly ownerRule: CSSRule;
+    readonly owningElement: Element;
+    readonly pages: StyleSheetPageList;
+    readonly readOnly: boolean;
+    readonly rules: CSSRuleList;
     addImport(bstrURL: string, lIndex?: number): number;
     addPageRule(bstrSelector: string, bstrStyle: string, lIndex?: number): number;
     addRule(bstrSelector: string, bstrStyle?: string, lIndex?: number): number;
@@ -1068,8 +1752,8 @@ declare var CanvasPattern: {
     new(): CanvasPattern;
 }
 
-interface CanvasRenderingContext2D {
-    canvas: HTMLCanvasElement;
+interface CanvasRenderingContext2D extends Object, CanvasPathMethods {
+    readonly canvas: HTMLCanvasElement;
     fillStyle: string | CanvasGradient | CanvasPattern;
     font: string;
     globalAlpha: number;
@@ -1088,13 +1772,9 @@ interface CanvasRenderingContext2D {
     strokeStyle: string | CanvasGradient | CanvasPattern;
     textAlign: string;
     textBaseline: string;
-    arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void;
-    arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void;
     beginPath(): void;
-    bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void;
     clearRect(x: number, y: number, w: number, h: number): void;
     clip(fillRule?: string): void;
-    closePath(): void;
     createImageData(imageDataOrSw: number | ImageData, sh?: number): ImageData;
     createLinearGradient(x0: number, y0: number, x1: number, y1: number): CanvasGradient;
     createPattern(image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, repetition: string): CanvasPattern;
@@ -1106,12 +1786,8 @@ interface CanvasRenderingContext2D {
     getImageData(sx: number, sy: number, sw: number, sh: number): ImageData;
     getLineDash(): number[];
     isPointInPath(x: number, y: number, fillRule?: string): boolean;
-    lineTo(x: number, y: number): void;
     measureText(text: string): TextMetrics;
-    moveTo(x: number, y: number): void;
     putImageData(imagedata: ImageData, dx: number, dy: number, dirtyX?: number, dirtyY?: number, dirtyWidth?: number, dirtyHeight?: number): void;
-    quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
-    rect(x: number, y: number, w: number, h: number): void;
     restore(): void;
     rotate(angle: number): void;
     save(): void;
@@ -1148,7 +1824,7 @@ declare var ChannelSplitterNode: {
 
 interface CharacterData extends Node, ChildNode {
     data: string;
-    length: number;
+    readonly length: number;
     appendData(arg: string): void;
     deleteData(offset: number, count: number): void;
     insertData(offset: number, arg: string): void;
@@ -1164,11 +1840,11 @@ declare var CharacterData: {
 
 interface ClientRect {
     bottom: number;
-    height: number;
+    readonly height: number;
     left: number;
     right: number;
     top: number;
-    width: number;
+    readonly width: number;
 }
 
 declare var ClientRect: {
@@ -1177,7 +1853,7 @@ declare var ClientRect: {
 }
 
 interface ClientRectList {
-    length: number;
+    readonly length: number;
     item(index: number): ClientRect;
     [index: number]: ClientRect;
 }
@@ -1188,7 +1864,7 @@ declare var ClientRectList: {
 }
 
 interface ClipboardEvent extends Event {
-    clipboardData: DataTransfer;
+    readonly clipboardData: DataTransfer;
 }
 
 declare var ClipboardEvent: {
@@ -1197,9 +1873,9 @@ declare var ClipboardEvent: {
 }
 
 interface CloseEvent extends Event {
-    code: number;
-    reason: string;
-    wasClean: boolean;
+    readonly code: number;
+    readonly reason: string;
+    readonly wasClean: boolean;
     initCloseEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, wasCleanArg: boolean, codeArg: number, reasonArg: string): void;
 }
 
@@ -1209,8 +1885,8 @@ declare var CloseEvent: {
 }
 
 interface CommandEvent extends Event {
-    commandName: string;
-    detail: string;
+    readonly commandName: string;
+    readonly detail: string;
 }
 
 declare var CommandEvent: {
@@ -1228,8 +1904,8 @@ declare var Comment: {
 }
 
 interface CompositionEvent extends UIEvent {
-    data: string;
-    locale: string;
+    readonly data: string;
+    readonly locale: string;
     initCompositionEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, dataArg: string, locale: string): void;
 }
 
@@ -1246,6 +1922,7 @@ interface Console {
     dir(value?: any, ...optionalParams: any[]): void;
     dirxml(value: any): void;
     error(message?: any, ...optionalParams: any[]): void;
+    exception(message?: string, ...optionalParams: any[]): void;
     group(groupTitle?: string): void;
     groupCollapsed(groupTitle?: string): void;
     groupEnd(): void;
@@ -1255,6 +1932,7 @@ interface Console {
     profile(reportName?: string): void;
     profileEnd(): void;
     select(element: Element): void;
+    table(...data: any[]): void;
     time(timerName?: string): void;
     timeEnd(timerName?: string): void;
     trace(message?: any, ...optionalParams: any[]): void;
@@ -1277,13 +1955,13 @@ declare var ConvolverNode: {
 }
 
 interface Coordinates {
-    accuracy: number;
-    altitude: number;
-    altitudeAccuracy: number;
-    heading: number;
-    latitude: number;
-    longitude: number;
-    speed: number;
+    readonly accuracy: number;
+    readonly altitude: number;
+    readonly altitudeAccuracy: number;
+    readonly heading: number;
+    readonly latitude: number;
+    readonly longitude: number;
+    readonly speed: number;
 }
 
 declare var Coordinates: {
@@ -1292,7 +1970,7 @@ declare var Coordinates: {
 }
 
 interface Crypto extends Object, RandomSource {
-    subtle: SubtleCrypto;
+    readonly subtle: SubtleCrypto;
 }
 
 declare var Crypto: {
@@ -1301,10 +1979,10 @@ declare var Crypto: {
 }
 
 interface CryptoKey {
-    algorithm: KeyAlgorithm;
-    extractable: boolean;
-    type: string;
-    usages: string[];
+    readonly algorithm: KeyAlgorithm;
+    readonly extractable: boolean;
+    readonly type: string;
+    readonly usages: string[];
 }
 
 declare var CryptoKey: {
@@ -1323,7 +2001,7 @@ declare var CryptoKeyPair: {
 }
 
 interface CustomEvent extends Event {
-    detail: any;
+    readonly detail: any;
     initCustomEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, detailArg: any): void;
 }
 
@@ -1333,7 +2011,7 @@ declare var CustomEvent: {
 }
 
 interface DOMError {
-    name: string;
+    readonly name: string;
     toString(): string;
 }
 
@@ -1343,69 +2021,69 @@ declare var DOMError: {
 }
 
 interface DOMException {
-    code: number;
-    message: string;
-    name: string;
+    readonly code: number;
+    readonly message: string;
+    readonly name: string;
     toString(): string;
-    ABORT_ERR: number;
-    DATA_CLONE_ERR: number;
-    DOMSTRING_SIZE_ERR: number;
-    HIERARCHY_REQUEST_ERR: number;
-    INDEX_SIZE_ERR: number;
-    INUSE_ATTRIBUTE_ERR: number;
-    INVALID_ACCESS_ERR: number;
-    INVALID_CHARACTER_ERR: number;
-    INVALID_MODIFICATION_ERR: number;
-    INVALID_NODE_TYPE_ERR: number;
-    INVALID_STATE_ERR: number;
-    NAMESPACE_ERR: number;
-    NETWORK_ERR: number;
-    NOT_FOUND_ERR: number;
-    NOT_SUPPORTED_ERR: number;
-    NO_DATA_ALLOWED_ERR: number;
-    NO_MODIFICATION_ALLOWED_ERR: number;
-    PARSE_ERR: number;
-    QUOTA_EXCEEDED_ERR: number;
-    SECURITY_ERR: number;
-    SERIALIZE_ERR: number;
-    SYNTAX_ERR: number;
-    TIMEOUT_ERR: number;
-    TYPE_MISMATCH_ERR: number;
-    URL_MISMATCH_ERR: number;
-    VALIDATION_ERR: number;
-    WRONG_DOCUMENT_ERR: number;
+    readonly ABORT_ERR: number;
+    readonly DATA_CLONE_ERR: number;
+    readonly DOMSTRING_SIZE_ERR: number;
+    readonly HIERARCHY_REQUEST_ERR: number;
+    readonly INDEX_SIZE_ERR: number;
+    readonly INUSE_ATTRIBUTE_ERR: number;
+    readonly INVALID_ACCESS_ERR: number;
+    readonly INVALID_CHARACTER_ERR: number;
+    readonly INVALID_MODIFICATION_ERR: number;
+    readonly INVALID_NODE_TYPE_ERR: number;
+    readonly INVALID_STATE_ERR: number;
+    readonly NAMESPACE_ERR: number;
+    readonly NETWORK_ERR: number;
+    readonly NOT_FOUND_ERR: number;
+    readonly NOT_SUPPORTED_ERR: number;
+    readonly NO_DATA_ALLOWED_ERR: number;
+    readonly NO_MODIFICATION_ALLOWED_ERR: number;
+    readonly PARSE_ERR: number;
+    readonly QUOTA_EXCEEDED_ERR: number;
+    readonly SECURITY_ERR: number;
+    readonly SERIALIZE_ERR: number;
+    readonly SYNTAX_ERR: number;
+    readonly TIMEOUT_ERR: number;
+    readonly TYPE_MISMATCH_ERR: number;
+    readonly URL_MISMATCH_ERR: number;
+    readonly VALIDATION_ERR: number;
+    readonly WRONG_DOCUMENT_ERR: number;
 }
 
 declare var DOMException: {
     prototype: DOMException;
     new(): DOMException;
-    ABORT_ERR: number;
-    DATA_CLONE_ERR: number;
-    DOMSTRING_SIZE_ERR: number;
-    HIERARCHY_REQUEST_ERR: number;
-    INDEX_SIZE_ERR: number;
-    INUSE_ATTRIBUTE_ERR: number;
-    INVALID_ACCESS_ERR: number;
-    INVALID_CHARACTER_ERR: number;
-    INVALID_MODIFICATION_ERR: number;
-    INVALID_NODE_TYPE_ERR: number;
-    INVALID_STATE_ERR: number;
-    NAMESPACE_ERR: number;
-    NETWORK_ERR: number;
-    NOT_FOUND_ERR: number;
-    NOT_SUPPORTED_ERR: number;
-    NO_DATA_ALLOWED_ERR: number;
-    NO_MODIFICATION_ALLOWED_ERR: number;
-    PARSE_ERR: number;
-    QUOTA_EXCEEDED_ERR: number;
-    SECURITY_ERR: number;
-    SERIALIZE_ERR: number;
-    SYNTAX_ERR: number;
-    TIMEOUT_ERR: number;
-    TYPE_MISMATCH_ERR: number;
-    URL_MISMATCH_ERR: number;
-    VALIDATION_ERR: number;
-    WRONG_DOCUMENT_ERR: number;
+    readonly ABORT_ERR: number;
+    readonly DATA_CLONE_ERR: number;
+    readonly DOMSTRING_SIZE_ERR: number;
+    readonly HIERARCHY_REQUEST_ERR: number;
+    readonly INDEX_SIZE_ERR: number;
+    readonly INUSE_ATTRIBUTE_ERR: number;
+    readonly INVALID_ACCESS_ERR: number;
+    readonly INVALID_CHARACTER_ERR: number;
+    readonly INVALID_MODIFICATION_ERR: number;
+    readonly INVALID_NODE_TYPE_ERR: number;
+    readonly INVALID_STATE_ERR: number;
+    readonly NAMESPACE_ERR: number;
+    readonly NETWORK_ERR: number;
+    readonly NOT_FOUND_ERR: number;
+    readonly NOT_SUPPORTED_ERR: number;
+    readonly NO_DATA_ALLOWED_ERR: number;
+    readonly NO_MODIFICATION_ALLOWED_ERR: number;
+    readonly PARSE_ERR: number;
+    readonly QUOTA_EXCEEDED_ERR: number;
+    readonly SECURITY_ERR: number;
+    readonly SERIALIZE_ERR: number;
+    readonly SYNTAX_ERR: number;
+    readonly TIMEOUT_ERR: number;
+    readonly TYPE_MISMATCH_ERR: number;
+    readonly URL_MISMATCH_ERR: number;
+    readonly VALIDATION_ERR: number;
+    readonly WRONG_DOCUMENT_ERR: number;
 }
 
 interface DOMImplementation {
@@ -1439,7 +2117,7 @@ declare var DOMSettableTokenList: {
 }
 
 interface DOMStringList {
-    length: number;
+    readonly length: number;
     contains(str: string): boolean;
     item(index: number): string;
     [index: number]: string;
@@ -1460,7 +2138,7 @@ declare var DOMStringMap: {
 }
 
 interface DOMTokenList {
-    length: number;
+    readonly length: number;
     add(...token: string[]): void;
     contains(token: string): boolean;
     item(index: number): string;
@@ -1487,9 +2165,9 @@ declare var DataCue: {
 interface DataTransfer {
     dropEffect: string;
     effectAllowed: string;
-    files: FileList;
-    items: DataTransferItemList;
-    types: DOMStringList;
+    readonly files: FileList;
+    readonly items: DataTransferItemList;
+    readonly types: DOMStringList;
     clearData(format?: string): boolean;
     getData(format: string): string;
     setData(format: string, data: string): boolean;
@@ -1501,8 +2179,8 @@ declare var DataTransfer: {
 }
 
 interface DataTransferItem {
-    kind: string;
-    type: string;
+    readonly kind: string;
+    readonly type: string;
     getAsFile(): File;
     getAsString(_callback: FunctionStringCallback): void;
 }
@@ -1513,7 +2191,7 @@ declare var DataTransferItem: {
 }
 
 interface DataTransferItemList {
-    length: number;
+    readonly length: number;
     add(data: File): DataTransferItem;
     clear(): void;
     item(index: number): DataTransferItem;
@@ -1527,9 +2205,9 @@ declare var DataTransferItemList: {
 }
 
 interface DeferredPermissionRequest {
-    id: number;
-    type: string;
-    uri: string;
+    readonly id: number;
+    readonly type: string;
+    readonly uri: string;
     allow(): void;
     deny(): void;
 }
@@ -1540,7 +2218,7 @@ declare var DeferredPermissionRequest: {
 }
 
 interface DelayNode extends AudioNode {
-    delayTime: AudioParam;
+    readonly delayTime: AudioParam;
 }
 
 declare var DelayNode: {
@@ -1549,9 +2227,9 @@ declare var DelayNode: {
 }
 
 interface DeviceAcceleration {
-    x: number;
-    y: number;
-    z: number;
+    readonly x: number;
+    readonly y: number;
+    readonly z: number;
 }
 
 declare var DeviceAcceleration: {
@@ -1559,11 +2237,20 @@ declare var DeviceAcceleration: {
     new(): DeviceAcceleration;
 }
 
+interface DeviceLightEvent extends Event {
+    readonly value: number;
+}
+
+declare var DeviceLightEvent: {
+    prototype: DeviceLightEvent;
+    new(type: string, eventInitDict?: DeviceLightEventInit): DeviceLightEvent;
+}
+
 interface DeviceMotionEvent extends Event {
-    acceleration: DeviceAcceleration;
-    accelerationIncludingGravity: DeviceAcceleration;
-    interval: number;
-    rotationRate: DeviceRotationRate;
+    readonly acceleration: DeviceAcceleration;
+    readonly accelerationIncludingGravity: DeviceAcceleration;
+    readonly interval: number;
+    readonly rotationRate: DeviceRotationRate;
     initDeviceMotionEvent(type: string, bubbles: boolean, cancelable: boolean, acceleration: DeviceAccelerationDict, accelerationIncludingGravity: DeviceAccelerationDict, rotationRate: DeviceRotationRateDict, interval: number): void;
 }
 
@@ -1573,10 +2260,10 @@ declare var DeviceMotionEvent: {
 }
 
 interface DeviceOrientationEvent extends Event {
-    absolute: boolean;
-    alpha: number;
-    beta: number;
-    gamma: number;
+    readonly absolute: boolean;
+    readonly alpha: number;
+    readonly beta: number;
+    readonly gamma: number;
     initDeviceOrientationEvent(type: string, bubbles: boolean, cancelable: boolean, alpha: number, beta: number, gamma: number, absolute: boolean): void;
 }
 
@@ -1586,9 +2273,9 @@ declare var DeviceOrientationEvent: {
 }
 
 interface DeviceRotationRate {
-    alpha: number;
-    beta: number;
-    gamma: number;
+    readonly alpha: number;
+    readonly beta: number;
+    readonly gamma: number;
 }
 
 declare var DeviceRotationRate: {
@@ -1600,15 +2287,15 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Sets or gets the URL for the current document. 
       */
-    URL: string;
+    readonly URL: string;
     /**
       * Gets the URL for the document, stripped of any character encoding.
       */
-    URLUnencoded: string;
+    readonly URLUnencoded: string;
     /**
       * Gets the object that has the focus when the parent document has focus.
       */
-    activeElement: Element;
+    readonly activeElement: Element;
     /**
       * Sets or gets the color of all active links in the document.
       */
@@ -1616,15 +2303,15 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Returns a reference to the collection of elements contained by the object.
       */
-    all: HTMLCollection;
+    readonly all: HTMLAllCollection;
     /**
       * Retrieves a collection of all a objects that have a name and/or id property. Objects in this collection are in HTML source order.
       */
-    anchors: HTMLCollection;
+    anchors: HTMLCollectionOf<HTMLAnchorElement>;
     /**
       * Retrieves a collection of all applet objects in the document.
       */
-    applets: HTMLCollection;
+    applets: HTMLCollectionOf<HTMLAppletElement>;
     /**
       * Deprecated. Sets or retrieves a value that indicates the background color behind the object. 
       */
@@ -1633,7 +2320,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Specifies the beginning and end of the document body.
       */
     body: HTMLElement;
-    characterSet: string;
+    readonly characterSet: string;
     /**
       * Gets or sets the character set used to encode the object.
       */
@@ -1641,13 +2328,14 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Gets a value that indicates whether standards-compliant mode is switched on for the object.
       */
-    compatMode: string;
+    readonly compatMode: string;
     cookie: string;
+    readonly currentScript: HTMLScriptElement | SVGScriptElement;
     /**
       * Gets the default character set from the current regional language settings.
       */
-    defaultCharset: string;
-    defaultView: Window;
+    readonly defaultCharset: string;
+    readonly defaultView: Window;
     /**
       * Sets or gets a value that indicates whether the document can be edited.
       */
@@ -1659,7 +2347,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Gets an object representing the document type declaration associated with the current document. 
       */
-    doctype: DocumentType;
+    readonly doctype: DocumentType;
     /**
       * Gets a reference to the root node of the document. 
       */
@@ -1671,7 +2359,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Retrieves a collection of all embed objects in the document.
       */
-    embeds: HTMLCollection;
+    embeds: HTMLCollectionOf<HTMLEmbedElement>;
     /**
       * Sets or gets the foreground (text) color of the document.
       */
@@ -1679,27 +2367,27 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Retrieves a collection, in source order, of all form objects in the document.
       */
-    forms: HTMLCollection;
-    fullscreenElement: Element;
-    fullscreenEnabled: boolean;
-    head: HTMLHeadElement;
-    hidden: boolean;
+    forms: HTMLCollectionOf<HTMLFormElement>;
+    readonly fullscreenElement: Element;
+    readonly fullscreenEnabled: boolean;
+    readonly head: HTMLHeadElement;
+    readonly hidden: boolean;
     /**
       * Retrieves a collection, in source order, of img objects in the document.
       */
-    images: HTMLCollection;
+    images: HTMLCollectionOf<HTMLImageElement>;
     /**
       * Gets the implementation object of the current document. 
       */
-    implementation: DOMImplementation;
+    readonly implementation: DOMImplementation;
     /**
       * Returns the character encoding used to create the webpage that is loaded into the document object.
       */
-    inputEncoding: string;
+    readonly inputEncoding: string;
     /**
       * Gets the date that the page was last modified, if the page supplies one. 
       */
-    lastModified: string;
+    readonly lastModified: string;
     /**
       * Sets or gets the color of the document links. 
       */
@@ -1707,16 +2395,13 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     /**
       * Retrieves a collection of all a objects that specify the href property and all area objects in the document.
       */
-    links: HTMLCollection;
+    links: HTMLCollectionOf<HTMLAnchorElement | HTMLAreaElement>;
     /**
       * Contains information about the current URL. 
       */
-    location: Location;
-    media: string;
+    readonly location: Location;
     msCSSOMElementFloatMetrics: boolean;
     msCapsLockWarningOff: boolean;
-    msHidden: boolean;
-    msVisibilityState: string;
     /**
       * Fires when the user aborts the download.
       * @param ev The event.
@@ -1818,7 +2503,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Occurs when the end of playback is reached. 
       * @param ev The event
       */
-    onended: (ev: Event) => any;
+    onended: (ev: MediaStreamErrorEvent) => any;
     /**
       * Fires when an error occurs during object loading.
       * @param ev The event.
@@ -1832,6 +2517,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     onfullscreenchange: (ev: Event) => any;
     onfullscreenerror: (ev: Event) => any;
     oninput: (ev: Event) => any;
+    oninvalid: (ev: Event) => any;
     /**
       * Fires when the user presses a key.
       * @param ev The keyboard event
@@ -1896,7 +2582,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Fires when the wheel button is rotated. 
       * @param ev The mouse event
       */
-    onmousewheel: (ev: MouseWheelEvent) => any;
+    onmousewheel: (ev: WheelEvent) => any;
     onmscontentzoom: (ev: UIEvent) => any;
     onmsgesturechange: (ev: MSGestureEvent) => any;
     onmsgesturedoubletap: (ev: MSGestureEvent) => any;
@@ -1981,6 +2667,11 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * @param ev The event.
       */
     onselect: (ev: UIEvent) => any;
+    /**
+      * Fires when the selection state of a document changes.
+      * @param ev The event.
+      */
+    onselectionchange: (ev: Event) => any;
     onselectstart: (ev: Event) => any;
     /**
       * Occurs when the download has stopped. 
@@ -2019,51 +2710,51 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     onwaiting: (ev: Event) => any;
     onwebkitfullscreenchange: (ev: Event) => any;
     onwebkitfullscreenerror: (ev: Event) => any;
-    plugins: HTMLCollection;
-    pointerLockElement: Element;
+    plugins: HTMLCollectionOf<HTMLEmbedElement>;
+    readonly pointerLockElement: Element;
     /**
       * Retrieves a value that indicates the current state of the object.
       */
-    readyState: string;
+    readonly readyState: string;
     /**
       * Gets the URL of the location that referred the user to the current page.
       */
-    referrer: string;
+    readonly referrer: string;
     /**
       * Gets the root svg element in the document hierarchy.
       */
-    rootElement: SVGSVGElement;
+    readonly rootElement: SVGSVGElement;
     /**
       * Retrieves a collection of all script objects in the document.
       */
-    scripts: HTMLCollection;
-    security: string;
+    scripts: HTMLCollectionOf<HTMLScriptElement>;
+    readonly scrollingElement: Element;
     /**
       * Retrieves a collection of styleSheet objects representing the style sheets that correspond to each instance of a link or style object in the document.
       */
-    styleSheets: StyleSheetList;
+    readonly styleSheets: StyleSheetList;
     /**
       * Contains the title of the document.
       */
     title: string;
-    visibilityState: string;
+    readonly visibilityState: string;
     /** 
       * Sets or gets the color of the links that the user has visited.
       */
     vlinkColor: string;
-    webkitCurrentFullScreenElement: Element;
-    webkitFullscreenElement: Element;
-    webkitFullscreenEnabled: boolean;
-    webkitIsFullScreen: boolean;
-    xmlEncoding: string;
+    readonly webkitCurrentFullScreenElement: Element;
+    readonly webkitFullscreenElement: Element;
+    readonly webkitFullscreenEnabled: boolean;
+    readonly webkitIsFullScreen: boolean;
+    readonly xmlEncoding: string;
     xmlStandalone: boolean;
     /**
       * Gets or sets the version attribute specified in the declaration of an XML document.
       */
     xmlVersion: string;
-    currentScript: HTMLScriptElement;
     adoptNode(source: Node): Node;
     captureEvents(): void;
+    caretRangeFromPoint(x: number, y: number): Range;
     clear(): void;
     /**
       * Closes an output stream and forces the sent data to display.
@@ -2090,37 +2781,24 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * @param tagName The name of an element.
       */
     createElement(tagName: "a"): HTMLAnchorElement;
-    createElement(tagName: "abbr"): HTMLPhraseElement;
-    createElement(tagName: "acronym"): HTMLPhraseElement;
-    createElement(tagName: "address"): HTMLBlockElement;
     createElement(tagName: "applet"): HTMLAppletElement;
     createElement(tagName: "area"): HTMLAreaElement;
     createElement(tagName: "audio"): HTMLAudioElement;
-    createElement(tagName: "b"): HTMLPhraseElement;
     createElement(tagName: "base"): HTMLBaseElement;
     createElement(tagName: "basefont"): HTMLBaseFontElement;
-    createElement(tagName: "bdo"): HTMLPhraseElement;
-    createElement(tagName: "big"): HTMLPhraseElement;
-    createElement(tagName: "blockquote"): HTMLBlockElement;
+    createElement(tagName: "blockquote"): HTMLQuoteElement;
     createElement(tagName: "body"): HTMLBodyElement;
     createElement(tagName: "br"): HTMLBRElement;
     createElement(tagName: "button"): HTMLButtonElement;
     createElement(tagName: "canvas"): HTMLCanvasElement;
     createElement(tagName: "caption"): HTMLTableCaptionElement;
-    createElement(tagName: "center"): HTMLBlockElement;
-    createElement(tagName: "cite"): HTMLPhraseElement;
-    createElement(tagName: "code"): HTMLPhraseElement;
     createElement(tagName: "col"): HTMLTableColElement;
     createElement(tagName: "colgroup"): HTMLTableColElement;
     createElement(tagName: "datalist"): HTMLDataListElement;
-    createElement(tagName: "dd"): HTMLDDElement;
     createElement(tagName: "del"): HTMLModElement;
-    createElement(tagName: "dfn"): HTMLPhraseElement;
     createElement(tagName: "dir"): HTMLDirectoryElement;
     createElement(tagName: "div"): HTMLDivElement;
     createElement(tagName: "dl"): HTMLDListElement;
-    createElement(tagName: "dt"): HTMLDTElement;
-    createElement(tagName: "em"): HTMLPhraseElement;
     createElement(tagName: "embed"): HTMLEmbedElement;
     createElement(tagName: "fieldset"): HTMLFieldSetElement;
     createElement(tagName: "font"): HTMLFontElement;
@@ -2136,52 +2814,41 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     createElement(tagName: "head"): HTMLHeadElement;
     createElement(tagName: "hr"): HTMLHRElement;
     createElement(tagName: "html"): HTMLHtmlElement;
-    createElement(tagName: "i"): HTMLPhraseElement;
     createElement(tagName: "iframe"): HTMLIFrameElement;
     createElement(tagName: "img"): HTMLImageElement;
     createElement(tagName: "input"): HTMLInputElement;
     createElement(tagName: "ins"): HTMLModElement;
-    createElement(tagName: "isindex"): HTMLIsIndexElement;
-    createElement(tagName: "kbd"): HTMLPhraseElement;
-    createElement(tagName: "keygen"): HTMLBlockElement;
+    createElement(tagName: "isindex"): HTMLUnknownElement;
     createElement(tagName: "label"): HTMLLabelElement;
     createElement(tagName: "legend"): HTMLLegendElement;
     createElement(tagName: "li"): HTMLLIElement;
     createElement(tagName: "link"): HTMLLinkElement;
-    createElement(tagName: "listing"): HTMLBlockElement;
+    createElement(tagName: "listing"): HTMLPreElement;
     createElement(tagName: "map"): HTMLMapElement;
     createElement(tagName: "marquee"): HTMLMarqueeElement;
     createElement(tagName: "menu"): HTMLMenuElement;
     createElement(tagName: "meta"): HTMLMetaElement;
-    createElement(tagName: "nextid"): HTMLNextIdElement;
-    createElement(tagName: "nobr"): HTMLPhraseElement;
+    createElement(tagName: "meter"): HTMLMeterElement;
+    createElement(tagName: "nextid"): HTMLUnknownElement;
     createElement(tagName: "object"): HTMLObjectElement;
     createElement(tagName: "ol"): HTMLOListElement;
     createElement(tagName: "optgroup"): HTMLOptGroupElement;
     createElement(tagName: "option"): HTMLOptionElement;
     createElement(tagName: "p"): HTMLParagraphElement;
     createElement(tagName: "param"): HTMLParamElement;
-    createElement(tagName: "plaintext"): HTMLBlockElement;
+    createElement(tagName: "picture"): HTMLPictureElement;
     createElement(tagName: "pre"): HTMLPreElement;
     createElement(tagName: "progress"): HTMLProgressElement;
     createElement(tagName: "q"): HTMLQuoteElement;
-    createElement(tagName: "rt"): HTMLPhraseElement;
-    createElement(tagName: "ruby"): HTMLPhraseElement;
-    createElement(tagName: "s"): HTMLPhraseElement;
-    createElement(tagName: "samp"): HTMLPhraseElement;
     createElement(tagName: "script"): HTMLScriptElement;
     createElement(tagName: "select"): HTMLSelectElement;
-    createElement(tagName: "small"): HTMLPhraseElement;
     createElement(tagName: "source"): HTMLSourceElement;
     createElement(tagName: "span"): HTMLSpanElement;
-    createElement(tagName: "strike"): HTMLPhraseElement;
-    createElement(tagName: "strong"): HTMLPhraseElement;
     createElement(tagName: "style"): HTMLStyleElement;
-    createElement(tagName: "sub"): HTMLPhraseElement;
-    createElement(tagName: "sup"): HTMLPhraseElement;
     createElement(tagName: "table"): HTMLTableElement;
     createElement(tagName: "tbody"): HTMLTableSectionElement;
     createElement(tagName: "td"): HTMLTableDataCellElement;
+    createElement(tagName: "template"): HTMLTemplateElement;
     createElement(tagName: "textarea"): HTMLTextAreaElement;
     createElement(tagName: "tfoot"): HTMLTableSectionElement;
     createElement(tagName: "th"): HTMLTableHeaderCellElement;
@@ -2189,13 +2856,10 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     createElement(tagName: "title"): HTMLTitleElement;
     createElement(tagName: "tr"): HTMLTableRowElement;
     createElement(tagName: "track"): HTMLTrackElement;
-    createElement(tagName: "tt"): HTMLPhraseElement;
-    createElement(tagName: "u"): HTMLPhraseElement;
     createElement(tagName: "ul"): HTMLUListElement;
-    createElement(tagName: "var"): HTMLPhraseElement;
     createElement(tagName: "video"): HTMLVideoElement;
     createElement(tagName: "x-ms-webview"): MSHTMLWebViewElement;
-    createElement(tagName: "xmp"): HTMLBlockElement;
+    createElement(tagName: "xmp"): HTMLPreElement;
     createElement(tagName: string): HTMLElement;
     createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "a"): SVGAElement
     createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "circle"): SVGCircleElement
@@ -2280,7 +2944,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * @param data String that specifies the nodeValue property of the text node.
       */
     createTextNode(data: string): Text;
-    createTouch(view: any, target: EventTarget, identifier: number, pageX: number, pageY: number, screenX: number, screenY: number): Touch;
+    createTouch(view: Window, target: EventTarget, identifier: number, pageX: number, pageY: number, screenX: number, screenY: number): Touch;
     createTouchList(...touches: Touch[]): TouchList;
     /**
       * Creates a TreeWalker object that you can use to traverse filtered lists of nodes or elements in a document.
@@ -2331,44 +2995,44 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * @param name Specifies the name of an element.
       */
     getElementsByTagName(tagname: "a"): NodeListOf<HTMLAnchorElement>;
-    getElementsByTagName(tagname: "abbr"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "acronym"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "address"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "abbr"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "acronym"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "address"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "applet"): NodeListOf<HTMLAppletElement>;
     getElementsByTagName(tagname: "area"): NodeListOf<HTMLAreaElement>;
     getElementsByTagName(tagname: "article"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "aside"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "audio"): NodeListOf<HTMLAudioElement>;
-    getElementsByTagName(tagname: "b"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "b"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "base"): NodeListOf<HTMLBaseElement>;
     getElementsByTagName(tagname: "basefont"): NodeListOf<HTMLBaseFontElement>;
-    getElementsByTagName(tagname: "bdo"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "big"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "blockquote"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "bdo"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "big"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "blockquote"): NodeListOf<HTMLQuoteElement>;
     getElementsByTagName(tagname: "body"): NodeListOf<HTMLBodyElement>;
     getElementsByTagName(tagname: "br"): NodeListOf<HTMLBRElement>;
     getElementsByTagName(tagname: "button"): NodeListOf<HTMLButtonElement>;
     getElementsByTagName(tagname: "canvas"): NodeListOf<HTMLCanvasElement>;
     getElementsByTagName(tagname: "caption"): NodeListOf<HTMLTableCaptionElement>;
-    getElementsByTagName(tagname: "center"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "center"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "circle"): NodeListOf<SVGCircleElement>;
-    getElementsByTagName(tagname: "cite"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "cite"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "clippath"): NodeListOf<SVGClipPathElement>;
-    getElementsByTagName(tagname: "code"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "code"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "col"): NodeListOf<HTMLTableColElement>;
     getElementsByTagName(tagname: "colgroup"): NodeListOf<HTMLTableColElement>;
     getElementsByTagName(tagname: "datalist"): NodeListOf<HTMLDataListElement>;
-    getElementsByTagName(tagname: "dd"): NodeListOf<HTMLDDElement>;
+    getElementsByTagName(tagname: "dd"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "defs"): NodeListOf<SVGDefsElement>;
     getElementsByTagName(tagname: "del"): NodeListOf<HTMLModElement>;
     getElementsByTagName(tagname: "desc"): NodeListOf<SVGDescElement>;
-    getElementsByTagName(tagname: "dfn"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "dfn"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "dir"): NodeListOf<HTMLDirectoryElement>;
     getElementsByTagName(tagname: "div"): NodeListOf<HTMLDivElement>;
     getElementsByTagName(tagname: "dl"): NodeListOf<HTMLDListElement>;
-    getElementsByTagName(tagname: "dt"): NodeListOf<HTMLDTElement>;
+    getElementsByTagName(tagname: "dt"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "ellipse"): NodeListOf<SVGEllipseElement>;
-    getElementsByTagName(tagname: "em"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "em"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "embed"): NodeListOf<HTMLEmbedElement>;
     getElementsByTagName(tagname: "feblend"): NodeListOf<SVGFEBlendElement>;
     getElementsByTagName(tagname: "fecolormatrix"): NodeListOf<SVGFEColorMatrixElement>;
@@ -2416,22 +3080,22 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     getElementsByTagName(tagname: "hgroup"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "hr"): NodeListOf<HTMLHRElement>;
     getElementsByTagName(tagname: "html"): NodeListOf<HTMLHtmlElement>;
-    getElementsByTagName(tagname: "i"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "i"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "iframe"): NodeListOf<HTMLIFrameElement>;
     getElementsByTagName(tagname: "image"): NodeListOf<SVGImageElement>;
     getElementsByTagName(tagname: "img"): NodeListOf<HTMLImageElement>;
     getElementsByTagName(tagname: "input"): NodeListOf<HTMLInputElement>;
     getElementsByTagName(tagname: "ins"): NodeListOf<HTMLModElement>;
-    getElementsByTagName(tagname: "isindex"): NodeListOf<HTMLIsIndexElement>;
-    getElementsByTagName(tagname: "kbd"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "keygen"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "isindex"): NodeListOf<HTMLUnknownElement>;
+    getElementsByTagName(tagname: "kbd"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "keygen"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "label"): NodeListOf<HTMLLabelElement>;
     getElementsByTagName(tagname: "legend"): NodeListOf<HTMLLegendElement>;
     getElementsByTagName(tagname: "li"): NodeListOf<HTMLLIElement>;
     getElementsByTagName(tagname: "line"): NodeListOf<SVGLineElement>;
     getElementsByTagName(tagname: "lineargradient"): NodeListOf<SVGLinearGradientElement>;
     getElementsByTagName(tagname: "link"): NodeListOf<HTMLLinkElement>;
-    getElementsByTagName(tagname: "listing"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "listing"): NodeListOf<HTMLPreElement>;
     getElementsByTagName(tagname: "map"): NodeListOf<HTMLMapElement>;
     getElementsByTagName(tagname: "mark"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "marker"): NodeListOf<SVGMarkerElement>;
@@ -2440,9 +3104,10 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     getElementsByTagName(tagname: "menu"): NodeListOf<HTMLMenuElement>;
     getElementsByTagName(tagname: "meta"): NodeListOf<HTMLMetaElement>;
     getElementsByTagName(tagname: "metadata"): NodeListOf<SVGMetadataElement>;
+    getElementsByTagName(tagname: "meter"): NodeListOf<HTMLMeterElement>;
     getElementsByTagName(tagname: "nav"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "nextid"): NodeListOf<HTMLNextIdElement>;
-    getElementsByTagName(tagname: "nobr"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "nextid"): NodeListOf<HTMLUnknownElement>;
+    getElementsByTagName(tagname: "nobr"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "noframes"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "noscript"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "object"): NodeListOf<HTMLObjectElement>;
@@ -2453,7 +3118,8 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     getElementsByTagName(tagname: "param"): NodeListOf<HTMLParamElement>;
     getElementsByTagName(tagname: "path"): NodeListOf<SVGPathElement>;
     getElementsByTagName(tagname: "pattern"): NodeListOf<SVGPatternElement>;
-    getElementsByTagName(tagname: "plaintext"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "picture"): NodeListOf<HTMLPictureElement>;
+    getElementsByTagName(tagname: "plaintext"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "polygon"): NodeListOf<SVGPolygonElement>;
     getElementsByTagName(tagname: "polyline"): NodeListOf<SVGPolylineElement>;
     getElementsByTagName(tagname: "pre"): NodeListOf<HTMLPreElement>;
@@ -2461,28 +3127,29 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     getElementsByTagName(tagname: "q"): NodeListOf<HTMLQuoteElement>;
     getElementsByTagName(tagname: "radialgradient"): NodeListOf<SVGRadialGradientElement>;
     getElementsByTagName(tagname: "rect"): NodeListOf<SVGRectElement>;
-    getElementsByTagName(tagname: "rt"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "ruby"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "s"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "samp"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "rt"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "ruby"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "s"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "samp"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "script"): NodeListOf<HTMLScriptElement>;
     getElementsByTagName(tagname: "section"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "select"): NodeListOf<HTMLSelectElement>;
-    getElementsByTagName(tagname: "small"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "small"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "source"): NodeListOf<HTMLSourceElement>;
     getElementsByTagName(tagname: "span"): NodeListOf<HTMLSpanElement>;
     getElementsByTagName(tagname: "stop"): NodeListOf<SVGStopElement>;
-    getElementsByTagName(tagname: "strike"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "strong"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "strike"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "strong"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "style"): NodeListOf<HTMLStyleElement>;
-    getElementsByTagName(tagname: "sub"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "sup"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "sub"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "sup"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "svg"): NodeListOf<SVGSVGElement>;
     getElementsByTagName(tagname: "switch"): NodeListOf<SVGSwitchElement>;
     getElementsByTagName(tagname: "symbol"): NodeListOf<SVGSymbolElement>;
     getElementsByTagName(tagname: "table"): NodeListOf<HTMLTableElement>;
     getElementsByTagName(tagname: "tbody"): NodeListOf<HTMLTableSectionElement>;
     getElementsByTagName(tagname: "td"): NodeListOf<HTMLTableDataCellElement>;
+    getElementsByTagName(tagname: "template"): NodeListOf<HTMLTemplateElement>;
     getElementsByTagName(tagname: "text"): NodeListOf<SVGTextElement>;
     getElementsByTagName(tagname: "textpath"): NodeListOf<SVGTextPathElement>;
     getElementsByTagName(tagname: "textarea"): NodeListOf<HTMLTextAreaElement>;
@@ -2493,16 +3160,16 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     getElementsByTagName(tagname: "tr"): NodeListOf<HTMLTableRowElement>;
     getElementsByTagName(tagname: "track"): NodeListOf<HTMLTrackElement>;
     getElementsByTagName(tagname: "tspan"): NodeListOf<SVGTSpanElement>;
-    getElementsByTagName(tagname: "tt"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(tagname: "u"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "tt"): NodeListOf<HTMLElement>;
+    getElementsByTagName(tagname: "u"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "ul"): NodeListOf<HTMLUListElement>;
     getElementsByTagName(tagname: "use"): NodeListOf<SVGUseElement>;
-    getElementsByTagName(tagname: "var"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(tagname: "var"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "video"): NodeListOf<HTMLVideoElement>;
     getElementsByTagName(tagname: "view"): NodeListOf<SVGViewElement>;
     getElementsByTagName(tagname: "wbr"): NodeListOf<HTMLElement>;
     getElementsByTagName(tagname: "x-ms-webview"): NodeListOf<MSHTMLWebViewElement>;
-    getElementsByTagName(tagname: "xmp"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(tagname: "xmp"): NodeListOf<HTMLPreElement>;
     getElementsByTagName(tagname: string): NodeListOf<Element>;
     getElementsByTagNameNS(namespaceURI: string, localName: string): NodeListOf<Element>;
     /**
@@ -2514,8 +3181,8 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       */
     hasFocus(): boolean;
     importNode(importedNode: Node, deep: boolean): Node;
-    msElementsFromPoint(x: number, y: number): NodeList;
-    msElementsFromRect(left: number, top: number, width: number, height: number): NodeList;
+    msElementsFromPoint(x: number, y: number): NodeListOf<Element>;
+    msElementsFromRect(left: number, top: number, width: number, height: number): NodeListOf<Element>;
     /**
       * Opens a new window and loads a document specified by a given URL. Also, opens a new window that uses the url parameter and the name parameter to collect the output of the write method and the writeln method.
       * @param url Specifies a MIME type for the document.
@@ -2611,12 +3278,13 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "fullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "fullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -2629,7 +3297,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mssitemodejumplistitemremoved", listener: (ev: MSSiteModeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "msthumbnailclick", listener: (ev: MSSiteModeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -2653,6 +3321,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
     addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "selectionchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "selectstart", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "stop", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -2686,12 +3355,12 @@ declare var DocumentFragment: {
 }
 
 interface DocumentType extends Node, ChildNode {
-    entities: NamedNodeMap;
-    internalSubset: string;
-    name: string;
-    notations: NamedNodeMap;
-    publicId: string;
-    systemId: string;
+    readonly entities: NamedNodeMap;
+    readonly internalSubset: string;
+    readonly name: string;
+    readonly notations: NamedNodeMap;
+    readonly publicId: string;
+    readonly systemId: string;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -2701,7 +3370,7 @@ declare var DocumentType: {
 }
 
 interface DragEvent extends MouseEvent {
-    dataTransfer: DataTransfer;
+    readonly dataTransfer: DataTransfer;
     initDragEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget, dataTransferArg: DataTransfer): void;
     msConvertURL(file: File, targetType: string, targetURL?: string): void;
 }
@@ -2712,12 +3381,12 @@ declare var DragEvent: {
 }
 
 interface DynamicsCompressorNode extends AudioNode {
-    attack: AudioParam;
-    knee: AudioParam;
-    ratio: AudioParam;
-    reduction: AudioParam;
-    release: AudioParam;
-    threshold: AudioParam;
+    readonly attack: AudioParam;
+    readonly knee: AudioParam;
+    readonly ratio: AudioParam;
+    readonly reduction: AudioParam;
+    readonly release: AudioParam;
+    readonly threshold: AudioParam;
 }
 
 declare var DynamicsCompressorNode: {
@@ -2725,26 +3394,36 @@ declare var DynamicsCompressorNode: {
     new(): DynamicsCompressorNode;
 }
 
+interface EXT_frag_depth {
+}
+
+declare var EXT_frag_depth: {
+    prototype: EXT_frag_depth;
+    new(): EXT_frag_depth;
+}
+
 interface EXT_texture_filter_anisotropic {
-    MAX_TEXTURE_MAX_ANISOTROPY_EXT: number;
-    TEXTURE_MAX_ANISOTROPY_EXT: number;
+    readonly MAX_TEXTURE_MAX_ANISOTROPY_EXT: number;
+    readonly TEXTURE_MAX_ANISOTROPY_EXT: number;
 }
 
 declare var EXT_texture_filter_anisotropic: {
     prototype: EXT_texture_filter_anisotropic;
     new(): EXT_texture_filter_anisotropic;
-    MAX_TEXTURE_MAX_ANISOTROPY_EXT: number;
-    TEXTURE_MAX_ANISOTROPY_EXT: number;
+    readonly MAX_TEXTURE_MAX_ANISOTROPY_EXT: number;
+    readonly TEXTURE_MAX_ANISOTROPY_EXT: number;
 }
 
 interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelector, ChildNode {
-    classList: DOMTokenList;
-    clientHeight: number;
-    clientLeft: number;
-    clientTop: number;
-    clientWidth: number;
+    readonly classList: DOMTokenList;
+    className: string;
+    readonly clientHeight: number;
+    readonly clientLeft: number;
+    readonly clientTop: number;
+    readonly clientWidth: number;
+    id: string;
     msContentZoomFactor: number;
-    msRegionOverflow: string;
+    readonly msRegionOverflow: string;
     onariarequest: (ev: AriaRequestEvent) => any;
     oncommand: (ev: CommandEvent) => any;
     ongotpointercapture: (ev: PointerEvent) => any;
@@ -2772,13 +3451,12 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     ontouchstart: (ev: TouchEvent) => any;
     onwebkitfullscreenchange: (ev: Event) => any;
     onwebkitfullscreenerror: (ev: Event) => any;
-    scrollHeight: number;
+    readonly prefix: string;
+    readonly scrollHeight: number;
     scrollLeft: number;
     scrollTop: number;
-    scrollWidth: number;
-    tagName: string;
-    id: string;
-    className: string;
+    readonly scrollWidth: number;
+    readonly tagName: string;
     innerHTML: string;
     getAttribute(name?: string): string;
     getAttributeNS(namespaceURI: string, localName: string): string;
@@ -2787,44 +3465,44 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     getBoundingClientRect(): ClientRect;
     getClientRects(): ClientRectList;
     getElementsByTagName(name: "a"): NodeListOf<HTMLAnchorElement>;
-    getElementsByTagName(name: "abbr"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "acronym"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "address"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "abbr"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "acronym"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "address"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "applet"): NodeListOf<HTMLAppletElement>;
     getElementsByTagName(name: "area"): NodeListOf<HTMLAreaElement>;
     getElementsByTagName(name: "article"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "aside"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "audio"): NodeListOf<HTMLAudioElement>;
-    getElementsByTagName(name: "b"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "b"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "base"): NodeListOf<HTMLBaseElement>;
     getElementsByTagName(name: "basefont"): NodeListOf<HTMLBaseFontElement>;
-    getElementsByTagName(name: "bdo"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "big"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "blockquote"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "bdo"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "big"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "blockquote"): NodeListOf<HTMLQuoteElement>;
     getElementsByTagName(name: "body"): NodeListOf<HTMLBodyElement>;
     getElementsByTagName(name: "br"): NodeListOf<HTMLBRElement>;
     getElementsByTagName(name: "button"): NodeListOf<HTMLButtonElement>;
     getElementsByTagName(name: "canvas"): NodeListOf<HTMLCanvasElement>;
     getElementsByTagName(name: "caption"): NodeListOf<HTMLTableCaptionElement>;
-    getElementsByTagName(name: "center"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "center"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "circle"): NodeListOf<SVGCircleElement>;
-    getElementsByTagName(name: "cite"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "cite"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "clippath"): NodeListOf<SVGClipPathElement>;
-    getElementsByTagName(name: "code"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "code"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "col"): NodeListOf<HTMLTableColElement>;
     getElementsByTagName(name: "colgroup"): NodeListOf<HTMLTableColElement>;
     getElementsByTagName(name: "datalist"): NodeListOf<HTMLDataListElement>;
-    getElementsByTagName(name: "dd"): NodeListOf<HTMLDDElement>;
+    getElementsByTagName(name: "dd"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "defs"): NodeListOf<SVGDefsElement>;
     getElementsByTagName(name: "del"): NodeListOf<HTMLModElement>;
     getElementsByTagName(name: "desc"): NodeListOf<SVGDescElement>;
-    getElementsByTagName(name: "dfn"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "dfn"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "dir"): NodeListOf<HTMLDirectoryElement>;
     getElementsByTagName(name: "div"): NodeListOf<HTMLDivElement>;
     getElementsByTagName(name: "dl"): NodeListOf<HTMLDListElement>;
-    getElementsByTagName(name: "dt"): NodeListOf<HTMLDTElement>;
+    getElementsByTagName(name: "dt"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "ellipse"): NodeListOf<SVGEllipseElement>;
-    getElementsByTagName(name: "em"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "em"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "embed"): NodeListOf<HTMLEmbedElement>;
     getElementsByTagName(name: "feblend"): NodeListOf<SVGFEBlendElement>;
     getElementsByTagName(name: "fecolormatrix"): NodeListOf<SVGFEColorMatrixElement>;
@@ -2872,22 +3550,22 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     getElementsByTagName(name: "hgroup"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "hr"): NodeListOf<HTMLHRElement>;
     getElementsByTagName(name: "html"): NodeListOf<HTMLHtmlElement>;
-    getElementsByTagName(name: "i"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "i"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "iframe"): NodeListOf<HTMLIFrameElement>;
     getElementsByTagName(name: "image"): NodeListOf<SVGImageElement>;
     getElementsByTagName(name: "img"): NodeListOf<HTMLImageElement>;
     getElementsByTagName(name: "input"): NodeListOf<HTMLInputElement>;
     getElementsByTagName(name: "ins"): NodeListOf<HTMLModElement>;
-    getElementsByTagName(name: "isindex"): NodeListOf<HTMLIsIndexElement>;
-    getElementsByTagName(name: "kbd"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "keygen"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "isindex"): NodeListOf<HTMLUnknownElement>;
+    getElementsByTagName(name: "kbd"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "keygen"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "label"): NodeListOf<HTMLLabelElement>;
     getElementsByTagName(name: "legend"): NodeListOf<HTMLLegendElement>;
     getElementsByTagName(name: "li"): NodeListOf<HTMLLIElement>;
     getElementsByTagName(name: "line"): NodeListOf<SVGLineElement>;
     getElementsByTagName(name: "lineargradient"): NodeListOf<SVGLinearGradientElement>;
     getElementsByTagName(name: "link"): NodeListOf<HTMLLinkElement>;
-    getElementsByTagName(name: "listing"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "listing"): NodeListOf<HTMLPreElement>;
     getElementsByTagName(name: "map"): NodeListOf<HTMLMapElement>;
     getElementsByTagName(name: "mark"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "marker"): NodeListOf<SVGMarkerElement>;
@@ -2896,9 +3574,10 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     getElementsByTagName(name: "menu"): NodeListOf<HTMLMenuElement>;
     getElementsByTagName(name: "meta"): NodeListOf<HTMLMetaElement>;
     getElementsByTagName(name: "metadata"): NodeListOf<SVGMetadataElement>;
+    getElementsByTagName(name: "meter"): NodeListOf<HTMLMeterElement>;
     getElementsByTagName(name: "nav"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "nextid"): NodeListOf<HTMLNextIdElement>;
-    getElementsByTagName(name: "nobr"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "nextid"): NodeListOf<HTMLUnknownElement>;
+    getElementsByTagName(name: "nobr"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "noframes"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "noscript"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "object"): NodeListOf<HTMLObjectElement>;
@@ -2909,7 +3588,8 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     getElementsByTagName(name: "param"): NodeListOf<HTMLParamElement>;
     getElementsByTagName(name: "path"): NodeListOf<SVGPathElement>;
     getElementsByTagName(name: "pattern"): NodeListOf<SVGPatternElement>;
-    getElementsByTagName(name: "plaintext"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "picture"): NodeListOf<HTMLPictureElement>;
+    getElementsByTagName(name: "plaintext"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "polygon"): NodeListOf<SVGPolygonElement>;
     getElementsByTagName(name: "polyline"): NodeListOf<SVGPolylineElement>;
     getElementsByTagName(name: "pre"): NodeListOf<HTMLPreElement>;
@@ -2917,28 +3597,29 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     getElementsByTagName(name: "q"): NodeListOf<HTMLQuoteElement>;
     getElementsByTagName(name: "radialgradient"): NodeListOf<SVGRadialGradientElement>;
     getElementsByTagName(name: "rect"): NodeListOf<SVGRectElement>;
-    getElementsByTagName(name: "rt"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "ruby"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "s"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "samp"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "rt"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "ruby"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "s"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "samp"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "script"): NodeListOf<HTMLScriptElement>;
     getElementsByTagName(name: "section"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "select"): NodeListOf<HTMLSelectElement>;
-    getElementsByTagName(name: "small"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "small"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "source"): NodeListOf<HTMLSourceElement>;
     getElementsByTagName(name: "span"): NodeListOf<HTMLSpanElement>;
     getElementsByTagName(name: "stop"): NodeListOf<SVGStopElement>;
-    getElementsByTagName(name: "strike"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "strong"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "strike"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "strong"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "style"): NodeListOf<HTMLStyleElement>;
-    getElementsByTagName(name: "sub"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "sup"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "sub"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "sup"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "svg"): NodeListOf<SVGSVGElement>;
     getElementsByTagName(name: "switch"): NodeListOf<SVGSwitchElement>;
     getElementsByTagName(name: "symbol"): NodeListOf<SVGSymbolElement>;
     getElementsByTagName(name: "table"): NodeListOf<HTMLTableElement>;
     getElementsByTagName(name: "tbody"): NodeListOf<HTMLTableSectionElement>;
     getElementsByTagName(name: "td"): NodeListOf<HTMLTableDataCellElement>;
+    getElementsByTagName(name: "template"): NodeListOf<HTMLTemplateElement>;
     getElementsByTagName(name: "text"): NodeListOf<SVGTextElement>;
     getElementsByTagName(name: "textpath"): NodeListOf<SVGTextPathElement>;
     getElementsByTagName(name: "textarea"): NodeListOf<HTMLTextAreaElement>;
@@ -2949,16 +3630,16 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     getElementsByTagName(name: "tr"): NodeListOf<HTMLTableRowElement>;
     getElementsByTagName(name: "track"): NodeListOf<HTMLTrackElement>;
     getElementsByTagName(name: "tspan"): NodeListOf<SVGTSpanElement>;
-    getElementsByTagName(name: "tt"): NodeListOf<HTMLPhraseElement>;
-    getElementsByTagName(name: "u"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "tt"): NodeListOf<HTMLElement>;
+    getElementsByTagName(name: "u"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "ul"): NodeListOf<HTMLUListElement>;
     getElementsByTagName(name: "use"): NodeListOf<SVGUseElement>;
-    getElementsByTagName(name: "var"): NodeListOf<HTMLPhraseElement>;
+    getElementsByTagName(name: "var"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "video"): NodeListOf<HTMLVideoElement>;
     getElementsByTagName(name: "view"): NodeListOf<SVGViewElement>;
     getElementsByTagName(name: "wbr"): NodeListOf<HTMLElement>;
     getElementsByTagName(name: "x-ms-webview"): NodeListOf<MSHTMLWebViewElement>;
-    getElementsByTagName(name: "xmp"): NodeListOf<HTMLBlockElement>;
+    getElementsByTagName(name: "xmp"): NodeListOf<HTMLPreElement>;
     getElementsByTagName(name: string): NodeListOf<Element>;
     getElementsByTagNameNS(namespaceURI: string, localName: string): NodeListOf<Element>;
     hasAttribute(name: string): boolean;
@@ -3031,11 +3712,11 @@ declare var Element: {
 }
 
 interface ErrorEvent extends Event {
-    colno: number;
-    error: any;
-    filename: string;
-    lineno: number;
-    message: string;
+    readonly colno: number;
+    readonly error: any;
+    readonly filename: string;
+    readonly lineno: number;
+    readonly message: string;
     initErrorEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, messageArg: string, filenameArg: string, linenoArg: number): void;
 }
 
@@ -3045,39 +3726,39 @@ declare var ErrorEvent: {
 }
 
 interface Event {
-    bubbles: boolean;
+    readonly bubbles: boolean;
     cancelBubble: boolean;
-    cancelable: boolean;
-    currentTarget: EventTarget;
-    defaultPrevented: boolean;
-    eventPhase: number;
-    isTrusted: boolean;
+    readonly cancelable: boolean;
+    readonly currentTarget: EventTarget;
+    readonly defaultPrevented: boolean;
+    readonly eventPhase: number;
+    readonly isTrusted: boolean;
     returnValue: boolean;
-    srcElement: Element;
-    target: EventTarget;
-    timeStamp: number;
-    type: string;
+    readonly srcElement: Element;
+    readonly target: EventTarget;
+    readonly timeStamp: number;
+    readonly type: string;
     initEvent(eventTypeArg: string, canBubbleArg: boolean, cancelableArg: boolean): void;
     preventDefault(): void;
     stopImmediatePropagation(): void;
     stopPropagation(): void;
-    AT_TARGET: number;
-    BUBBLING_PHASE: number;
-    CAPTURING_PHASE: number;
+    readonly AT_TARGET: number;
+    readonly BUBBLING_PHASE: number;
+    readonly CAPTURING_PHASE: number;
 }
 
 declare var Event: {
     prototype: Event;
     new(type: string, eventInitDict?: EventInit): Event;
-    AT_TARGET: number;
-    BUBBLING_PHASE: number;
-    CAPTURING_PHASE: number;
+    readonly AT_TARGET: number;
+    readonly BUBBLING_PHASE: number;
+    readonly CAPTURING_PHASE: number;
 }
 
 interface EventTarget {
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
     dispatchEvent(evt: Event): boolean;
-    removeEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var EventTarget: {
@@ -3094,8 +3775,9 @@ declare var External: {
 }
 
 interface File extends Blob {
-    lastModifiedDate: any;
-    name: string;
+    readonly lastModifiedDate: any;
+    readonly name: string;
+    readonly webkitRelativePath: string;
 }
 
 declare var File: {
@@ -3104,7 +3786,7 @@ declare var File: {
 }
 
 interface FileList {
-    length: number;
+    readonly length: number;
     item(index: number): File;
     [index: number]: File;
 }
@@ -3115,7 +3797,7 @@ declare var FileList: {
 }
 
 interface FileReader extends EventTarget, MSBaseReader {
-    error: DOMError;
+    readonly error: DOMError;
     readAsArrayBuffer(blob: Blob): void;
     readAsBinaryString(blob: Blob): void;
     readAsDataURL(blob: Blob): void;
@@ -3129,7 +3811,7 @@ declare var FileReader: {
 }
 
 interface FocusEvent extends UIEvent {
-    relatedTarget: EventTarget;
+    readonly relatedTarget: EventTarget;
     initFocusEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, relatedTargetArg: EventTarget): void;
 }
 
@@ -3148,7 +3830,7 @@ declare var FormData: {
 }
 
 interface GainNode extends AudioNode {
-    gain: AudioParam;
+    readonly gain: AudioParam;
 }
 
 declare var GainNode: {
@@ -3157,13 +3839,13 @@ declare var GainNode: {
 }
 
 interface Gamepad {
-    axes: number[];
-    buttons: GamepadButton[];
-    connected: boolean;
-    id: string;
-    index: number;
-    mapping: string;
-    timestamp: number;
+    readonly axes: number[];
+    readonly buttons: GamepadButton[];
+    readonly connected: boolean;
+    readonly id: string;
+    readonly index: number;
+    readonly mapping: string;
+    readonly timestamp: number;
 }
 
 declare var Gamepad: {
@@ -3172,8 +3854,8 @@ declare var Gamepad: {
 }
 
 interface GamepadButton {
-    pressed: boolean;
-    value: number;
+    readonly pressed: boolean;
+    readonly value: number;
 }
 
 declare var GamepadButton: {
@@ -3182,7 +3864,7 @@ declare var GamepadButton: {
 }
 
 interface GamepadEvent extends Event {
-    gamepad: Gamepad;
+    readonly gamepad: Gamepad;
 }
 
 declare var GamepadEvent: {
@@ -3220,6 +3902,7 @@ interface HTMLAnchorElement extends HTMLElement {
       * Sets or retrieves the coordinates of the object.
       */
     coords: string;
+    download: string;
     /**
       * Contains the anchor portion of the URL including the hash sign (#).
       */
@@ -3240,12 +3923,12 @@ interface HTMLAnchorElement extends HTMLElement {
       * Sets or retrieves the language code of the object.
       */
     hreflang: string;
-    mimeType: string;
+    readonly mimeType: string;
     /**
       * Sets or retrieves the shape of the object.
       */
     name: string;
-    nameProp: string;
+    readonly nameProp: string;
     /**
       * Contains the pathname of the URL.
       */
@@ -3258,7 +3941,7 @@ interface HTMLAnchorElement extends HTMLElement {
       * Contains the protocol of the URL.
       */
     protocol: string;
-    protocolLong: string;
+    readonly protocolLong: string;
     /**
       * Sets or retrieves the relationship between the object and the destination of the link.
       */
@@ -3300,7 +3983,7 @@ interface HTMLAppletElement extends HTMLElement {
     /**
       * Retrieves a string of the URL where the object tag can be found. This is often the href of the document that the object is in, or the value set by a base element.
       */
-    BaseHref: string;
+    readonly BaseHref: string;
     align: string;
     /**
       * Sets or retrieves a text alternative to the graphic.
@@ -3327,7 +4010,7 @@ interface HTMLAppletElement extends HTMLElement {
     /**
       * Address of a pointer to the document this page or frame contains. If there is no document, then null will be returned.
       */
-    contentDocument: Document;
+    readonly contentDocument: Document;
     /**
       * Sets or retrieves the URL that references the data of the object.
       */
@@ -3336,7 +4019,7 @@ interface HTMLAppletElement extends HTMLElement {
       * Sets or retrieves a character string that can be used to implement your own declare functionality for the object.
       */
     declare: boolean;
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the height of the object.
       */
@@ -3377,6 +4060,7 @@ interface HTMLAreaElement extends HTMLElement {
       * Sets or retrieves the coordinates of the object.
       */
     coords: string;
+    download: string;
     /**
       * Sets or retrieves the subsection of the href property that follows the number sign (#).
       */
@@ -3502,23 +4186,6 @@ declare var HTMLBaseFontElement: {
     new(): HTMLBaseFontElement;
 }
 
-interface HTMLBlockElement extends HTMLElement {
-    /**
-      * Sets or retrieves reference information about the object.
-      */
-    cite: string;
-    clear: string;
-    /**
-      * Sets or retrieves the width of the object.
-      */
-    width: number;
-}
-
-declare var HTMLBlockElement: {
-    prototype: HTMLBlockElement;
-    new(): HTMLBlockElement;
-}
-
 interface HTMLBodyElement extends HTMLElement {
     aLink: any;
     background: string;
@@ -3546,7 +4213,6 @@ interface HTMLBodyElement extends HTMLElement {
     onunload: (ev: Event) => any;
     text: any;
     vLink: any;
-    createTextRange(): TextRange;
     addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -3571,10 +4237,10 @@ interface HTMLBodyElement extends HTMLElement {
     addEventListener(type: "afterprint", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeprint", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeunload", listener: (ev: BeforeUnloadEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
@@ -3585,9 +4251,9 @@ interface HTMLBodyElement extends HTMLElement {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -3599,7 +4265,7 @@ interface HTMLBodyElement extends HTMLElement {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
@@ -3607,6 +4273,7 @@ interface HTMLBodyElement extends HTMLElement {
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "hashchange", listener: (ev: HashChangeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -3624,13 +4291,13 @@ interface HTMLBodyElement extends HTMLElement {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "offline", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "online", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "orientationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "pagehide", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pageshow", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -3684,7 +4351,7 @@ interface HTMLButtonElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Overrides the action attribute (where the data on a form is sent) on the parent form element.
       */
@@ -3717,11 +4384,11 @@ interface HTMLButtonElement extends HTMLElement {
     /**
       * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
       */
-    validationMessage: string;
+    readonly validationMessage: string;
     /**
       * Returns a  ValidityState object that represents the validity states of an element.
       */
-    validity: ValidityState;
+    readonly validity: ValidityState;
     /** 
       * Sets or retrieves the default or selected value of the control.
       */
@@ -3729,15 +4396,11 @@ interface HTMLButtonElement extends HTMLElement {
     /**
       * Returns whether an element will successfully validate based on forms validation rules and constraints.
       */
-    willValidate: boolean;
+    readonly willValidate: boolean;
     /**
       * Returns whether a form will validate when it is submitted, without having to submit it.
       */
     checkValidity(): boolean;
-    /**
-      * Creates a TextRange object for the element.
-      */
-    createTextRange(): TextRange;
     /**
       * Sets a custom error message that is displayed when a form is submitted.
       * @param error Sets a custom error message that is displayed when a form is submitted.
@@ -3787,11 +4450,11 @@ interface HTMLCollection {
     /**
       * Sets or retrieves the number of objects in a collection.
       */
-    length: number;
+    readonly length: number;
     /**
       * Retrieves an object from various collections.
       */
-    item(nameOrIndex?: any, optionalIndex?: any): Element;
+    item(index: number): Element;
     /**
       * Retrieves a select object or an object from an options collection.
       */
@@ -3804,18 +4467,6 @@ declare var HTMLCollection: {
     new(): HTMLCollection;
 }
 
-interface HTMLDDElement extends HTMLElement {
-    /**
-      * Sets or retrieves whether the browser automatically performs wordwrap.
-      */
-    noWrap: boolean;
-}
-
-declare var HTMLDDElement: {
-    prototype: HTMLDDElement;
-    new(): HTMLDDElement;
-}
-
 interface HTMLDListElement extends HTMLElement {
     compact: boolean;
 }
@@ -3825,20 +4476,8 @@ declare var HTMLDListElement: {
     new(): HTMLDListElement;
 }
 
-interface HTMLDTElement extends HTMLElement {
-    /**
-      * Sets or retrieves whether the browser automatically performs wordwrap.
-      */
-    noWrap: boolean;
-}
-
-declare var HTMLDTElement: {
-    prototype: HTMLDTElement;
-    new(): HTMLDTElement;
-}
-
 interface HTMLDataListElement extends HTMLElement {
-    options: HTMLCollection;
+    options: HTMLCollectionOf<HTMLOptionElement>;
 }
 
 declare var HTMLDataListElement: {
@@ -3881,38 +4520,38 @@ declare var HTMLDocument: {
 
 interface HTMLElement extends Element {
     accessKey: string;
-    children: HTMLCollection;
+    readonly children: HTMLCollection;
     contentEditable: string;
-    dataset: DOMStringMap;
+    readonly dataset: DOMStringMap;
     dir: string;
     draggable: boolean;
     hidden: boolean;
     hideFocus: boolean;
     innerHTML: string;
     innerText: string;
-    isContentEditable: boolean;
+    readonly isContentEditable: boolean;
     lang: string;
-    offsetHeight: number;
-    offsetLeft: number;
-    offsetParent: Element;
-    offsetTop: number;
-    offsetWidth: number;
+    readonly offsetHeight: number;
+    readonly offsetLeft: number;
+    readonly offsetParent: Element;
+    readonly offsetTop: number;
+    readonly offsetWidth: number;
     onabort: (ev: Event) => any;
     onactivate: (ev: UIEvent) => any;
     onbeforeactivate: (ev: UIEvent) => any;
-    onbeforecopy: (ev: DragEvent) => any;
-    onbeforecut: (ev: DragEvent) => any;
+    onbeforecopy: (ev: ClipboardEvent) => any;
+    onbeforecut: (ev: ClipboardEvent) => any;
     onbeforedeactivate: (ev: UIEvent) => any;
-    onbeforepaste: (ev: DragEvent) => any;
+    onbeforepaste: (ev: ClipboardEvent) => any;
     onblur: (ev: FocusEvent) => any;
     oncanplay: (ev: Event) => any;
     oncanplaythrough: (ev: Event) => any;
     onchange: (ev: Event) => any;
     onclick: (ev: MouseEvent) => any;
     oncontextmenu: (ev: PointerEvent) => any;
-    oncopy: (ev: DragEvent) => any;
+    oncopy: (ev: ClipboardEvent) => any;
     oncuechange: (ev: Event) => any;
-    oncut: (ev: DragEvent) => any;
+    oncut: (ev: ClipboardEvent) => any;
     ondblclick: (ev: MouseEvent) => any;
     ondeactivate: (ev: UIEvent) => any;
     ondrag: (ev: DragEvent) => any;
@@ -3924,10 +4563,11 @@ interface HTMLElement extends Element {
     ondrop: (ev: DragEvent) => any;
     ondurationchange: (ev: Event) => any;
     onemptied: (ev: Event) => any;
-    onended: (ev: Event) => any;
+    onended: (ev: MediaStreamErrorEvent) => any;
     onerror: (ev: Event) => any;
     onfocus: (ev: FocusEvent) => any;
     oninput: (ev: Event) => any;
+    oninvalid: (ev: Event) => any;
     onkeydown: (ev: KeyboardEvent) => any;
     onkeypress: (ev: KeyboardEvent) => any;
     onkeyup: (ev: KeyboardEvent) => any;
@@ -3942,10 +4582,10 @@ interface HTMLElement extends Element {
     onmouseout: (ev: MouseEvent) => any;
     onmouseover: (ev: MouseEvent) => any;
     onmouseup: (ev: MouseEvent) => any;
-    onmousewheel: (ev: MouseWheelEvent) => any;
+    onmousewheel: (ev: WheelEvent) => any;
     onmscontentzoom: (ev: UIEvent) => any;
     onmsmanipulationstatechanged: (ev: MSManipulationEvent) => any;
-    onpaste: (ev: DragEvent) => any;
+    onpaste: (ev: ClipboardEvent) => any;
     onpause: (ev: Event) => any;
     onplay: (ev: Event) => any;
     onplaying: (ev: Event) => any;
@@ -3966,7 +4606,7 @@ interface HTMLElement extends Element {
     outerHTML: string;
     outerText: string;
     spellcheck: boolean;
-    style: CSSStyleDeclaration;
+    readonly style: CSSStyleDeclaration;
     tabIndex: number;
     title: string;
     blur(): void;
@@ -4002,10 +4642,10 @@ interface HTMLElement extends Element {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -4013,9 +4653,9 @@ interface HTMLElement extends Element {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -4027,11 +4667,12 @@ interface HTMLElement extends Element {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -4047,8 +4688,8 @@ interface HTMLElement extends Element {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -4110,7 +4751,7 @@ interface HTMLEmbedElement extends HTMLElement, GetSVGDocument {
     /**
       * Gets the source associated with the media element for use by the PlayToManager.
       */
-    msPlayToSource: any;
+    readonly msPlayToSource: any;
     /**
       * Sets or retrieves the name of the object.
       */
@@ -4118,12 +4759,12 @@ interface HTMLEmbedElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves the palette used for the embedded document.
       */
-    palette: string;
+    readonly palette: string;
     /**
       * Retrieves the URL of the plug-in used to view an embedded document.
       */
-    pluginspage: string;
-    readyState: string;
+    readonly pluginspage: string;
+    readonly readyState: string;
     /**
       * Sets or retrieves a URL to be loaded by the object.
       */
@@ -4153,19 +4794,19 @@ interface HTMLFieldSetElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
       */
-    validationMessage: string;
+    readonly validationMessage: string;
     /**
       * Returns a  ValidityState object that represents the validity states of an element.
       */
-    validity: ValidityState;
+    readonly validity: ValidityState;
     /**
       * Returns whether an element will successfully validate based on forms validation rules and constraints.
       */
-    willValidate: boolean;
+    readonly willValidate: boolean;
     /**
       * Returns whether a form will validate when it is submitted, without having to submit it.
       */
@@ -4211,7 +4852,7 @@ interface HTMLFormElement extends HTMLElement {
     /**
       * Retrieves a collection, in source order, of all controls in a given form.
       */
-    elements: HTMLCollection;
+    readonly elements: HTMLCollection;
     /**
       * Sets or retrieves the MIME encoding for the form.
       */
@@ -4223,7 +4864,7 @@ interface HTMLFormElement extends HTMLElement {
     /**
       * Sets or retrieves the number of objects in a collection.
       */
-    length: number;
+    readonly length: number;
     /**
       * Sets or retrieves how to send the form data to the server.
       */
@@ -4282,11 +4923,11 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves the document object of the page or frame.
       */
-    contentDocument: Document;
+    readonly contentDocument: Document;
     /**
       * Retrieves the object of the specified.
       */
-    contentWindow: Window;
+    readonly contentWindow: Window;
     /**
       * Sets or retrieves whether to display a border for the frame.
       */
@@ -4327,10 +4968,6 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
       * Sets or retrieves whether the frame can be scrolled.
       */
     scrolling: string;
-    /**
-      * Sets the value indicating whether the source file of a frame or iframe has specific security restrictions applied.
-      */
-    security: any;
     /**
       * Sets or retrieves a URL to be loaded by the object.
       */
@@ -4362,10 +4999,10 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -4373,9 +5010,9 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -4387,11 +5024,12 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -4408,8 +5046,8 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -4519,10 +5157,10 @@ interface HTMLFrameSetElement extends HTMLElement {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeprint", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeunload", listener: (ev: BeforeUnloadEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
@@ -4533,9 +5171,9 @@ interface HTMLFrameSetElement extends HTMLElement {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -4547,7 +5185,7 @@ interface HTMLFrameSetElement extends HTMLElement {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
@@ -4555,6 +5193,7 @@ interface HTMLFrameSetElement extends HTMLElement {
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "hashchange", listener: (ev: HashChangeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -4572,13 +5211,13 @@ interface HTMLFrameSetElement extends HTMLElement {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "offline", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "online", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "orientationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "pagehide", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pageshow", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -4657,7 +5296,6 @@ interface HTMLHeadingElement extends HTMLElement {
       * Sets or retrieves a value that indicates the table alignment.
       */
     align: string;
-    clear: string;
 }
 
 declare var HTMLHeadingElement: {
@@ -4690,11 +5328,11 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves the document object of the page or frame.
       */
-    contentDocument: Document;
+    readonly contentDocument: Document;
     /**
       * Retrieves the object of the specified.
       */
-    contentWindow: Window;
+    readonly contentWindow: Window;
     /**
       * Sets or retrieves whether to display a border for the frame.
       */
@@ -4735,15 +5373,11 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
       * Raised when the object has been completely received from the server.
       */
     onload: (ev: Event) => any;
-    sandbox: DOMSettableTokenList;
+    readonly sandbox: DOMSettableTokenList;
     /**
       * Sets or retrieves whether the frame can be scrolled.
       */
     scrolling: string;
-    /**
-      * Sets the value indicating whether the source file of a frame or iframe has specific security restrictions applied.
-      */
-    security: any;
     /**
       * Sets or retrieves a URL to be loaded by the object.
       */
@@ -4779,10 +5413,10 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -4790,9 +5424,9 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -4804,11 +5438,12 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -4825,8 +5460,8 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -4883,9 +5518,9 @@ interface HTMLImageElement extends HTMLElement {
     /**
       * Retrieves whether the object is fully loaded.
       */
-    complete: boolean;
+    readonly complete: boolean;
     crossOrigin: string;
-    currentSrc: string;
+    readonly currentSrc: string;
     /**
       * Sets or retrieves the height of the object.
       */
@@ -4902,6 +5537,7 @@ interface HTMLImageElement extends HTMLElement {
       * Sets or retrieves a Uniform Resource Identifier (URI) to a long description of the object.
       */
     longDesc: string;
+    lowsrc: string;
     /**
       * Gets or sets whether the DLNA PlayTo device is available.
       */
@@ -4914,7 +5550,7 @@ interface HTMLImageElement extends HTMLElement {
     /**
       * Gets the source associated with the media element for use by the PlayToManager.
       */
-    msPlayToSource: any;
+    readonly msPlayToSource: any;
     /**
       * Sets or retrieves the name of the object.
       */
@@ -4922,11 +5558,12 @@ interface HTMLImageElement extends HTMLElement {
     /**
       * The original height of the image resource before sizing.
       */
-    naturalHeight: number;
+    readonly naturalHeight: number;
     /**
       * The original width of the image resource before sizing.
       */
-    naturalWidth: number;
+    readonly naturalWidth: number;
+    sizes: string;
     /**
       * The address or URL of the a media resource that is to be considered.
       */
@@ -4944,8 +5581,8 @@ interface HTMLImageElement extends HTMLElement {
       * Sets or retrieves the width of the object.
       */
     width: number;
-    x: number;
-    y: number;
+    readonly x: number;
+    readonly y: number;
     msGetAsCastingSource(): any;
 }
 
@@ -4987,7 +5624,7 @@ interface HTMLInputElement extends HTMLElement {
     /**
       * Retrieves whether the object is fully loaded.
       */
-    complete: boolean;
+    readonly complete: boolean;
     /**
       * Sets or retrieves the state of the check box or radio button.
       */
@@ -5000,11 +5637,11 @@ interface HTMLInputElement extends HTMLElement {
     /**
       * Returns a FileList object on a file type input object.
       */
-    files: FileList;
+    readonly files: FileList;
     /**
       * Retrieves a reference to the form that the object is embedded in. 
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Overrides the action attribute (where the data on a form is sent) on the parent form element.
       */
@@ -5037,7 +5674,7 @@ interface HTMLInputElement extends HTMLElement {
     /**
       * Specifies the ID of a pre-defined datalist of options for an input element.
       */
-    list: HTMLElement;
+    readonly list: HTMLElement;
     /**
       * Defines the maximum acceptable value for an input element with type="number".When used with the min and step attributes, lets you control the range and increment (such as only even numbers) that the user can enter into an input field.
       */
@@ -5071,6 +5708,7 @@ interface HTMLInputElement extends HTMLElement {
       * When present, marks an element that can't be submitted without a value.
       */
     required: boolean;
+    selectionDirection: string;
     /**
       * Gets or sets the end position or offset of a text selection.
       */
@@ -5100,11 +5738,11 @@ interface HTMLInputElement extends HTMLElement {
     /**
       * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
       */
-    validationMessage: string;
+    readonly validationMessage: string;
     /**
       * Returns a  ValidityState object that represents the validity states of an element.
       */
-    validity: ValidityState;
+    readonly validity: ValidityState;
     /**
       * Returns the value of the data at the cursor's current position.
       */
@@ -5118,6 +5756,7 @@ interface HTMLInputElement extends HTMLElement {
       * Sets or retrieves the vertical margin for the object.
       */
     vspace: number;
+    webkitdirectory: boolean;
     /**
       * Sets or retrieves the width of the object.
       */
@@ -5125,15 +5764,12 @@ interface HTMLInputElement extends HTMLElement {
     /**
       * Returns whether an element will successfully validate based on forms validation rules and constraints.
       */
-    willValidate: boolean;
+    readonly willValidate: boolean;
+    minLength: number;
     /**
       * Returns whether a form will validate when it is submitted, without having to submit it.
       */
     checkValidity(): boolean;
-    /**
-      * Creates a TextRange object for the element.
-      */
-    createTextRange(): TextRange;
     /**
       * Makes the selection equal to the current object.
       */
@@ -5148,7 +5784,7 @@ interface HTMLInputElement extends HTMLElement {
       * @param start The offset into the text field for the start of the selection.
       * @param end The offset into the text field for the end of the selection.
       */
-    setSelectionRange(start: number, end: number): void;
+    setSelectionRange(start?: number, end?: number, direction?: string): void;
     /**
       * Decrements a range input control's value by the value given by the Step attribute. If the optional parameter is used, it will decrement the input control's step value multiplied by the parameter's value.
       * @param n Value to decrement the value by.
@@ -5166,23 +5802,6 @@ declare var HTMLInputElement: {
     new(): HTMLInputElement;
 }
 
-interface HTMLIsIndexElement extends HTMLElement {
-    /**
-      * Sets or retrieves the URL to which the form content is sent for processing.
-      */
-    action: string;
-    /**
-      * Retrieves a reference to the form that the object is embedded in. 
-      */
-    form: HTMLFormElement;
-    prompt: string;
-}
-
-declare var HTMLIsIndexElement: {
-    prototype: HTMLIsIndexElement;
-    new(): HTMLIsIndexElement;
-}
-
 interface HTMLLIElement extends HTMLElement {
     type: string;
     /**
@@ -5200,7 +5819,7 @@ interface HTMLLabelElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the object to which the given label object is assigned.
       */
@@ -5220,7 +5839,7 @@ interface HTMLLegendElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
 }
 
 declare var HTMLLegendElement: {
@@ -5262,6 +5881,7 @@ interface HTMLLinkElement extends HTMLElement, LinkStyle {
       * Sets or retrieves the MIME type of the object.
       */
     type: string;
+    import?: Document;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5274,7 +5894,7 @@ interface HTMLMapElement extends HTMLElement {
     /**
       * Retrieves a collection of the area objects defined for the given map object.
       */
-    areas: HTMLAreasCollection;
+    readonly areas: HTMLAreasCollection;
     /**
       * Sets or retrieves the name of the object.
       */
@@ -5326,10 +5946,10 @@ interface HTMLMarqueeElement extends HTMLElement {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "bounce", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -5338,9 +5958,9 @@ interface HTMLMarqueeElement extends HTMLElement {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -5352,12 +5972,13 @@ interface HTMLMarqueeElement extends HTMLElement {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "finish", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -5373,8 +5994,8 @@ interface HTMLMarqueeElement extends HTMLElement {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -5420,7 +6041,7 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Returns an AudioTrackList object with the audio tracks for a given video element.
       */
-    audioTracks: AudioTrackList;
+    readonly audioTracks: AudioTrackList;
     /**
       * Gets or sets a value that indicates whether to start playing the media automatically.
       */
@@ -5428,15 +6049,16 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Gets a collection of buffered time ranges.
       */
-    buffered: TimeRanges;
+    readonly buffered: TimeRanges;
     /**
       * Gets or sets a flag that indicates whether the client provides a set of controls for the media (in case the developer does not include controls for the player).
       */
     controls: boolean;
+    crossOrigin: string;
     /**
       * Gets the address or URL of the current media resource that is selected by IHTMLMediaElement.
       */
-    currentSrc: string;
+    readonly currentSrc: string;
     /**
       * Gets or sets the current playback position, in seconds.
       */
@@ -5449,19 +6071,20 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Returns the duration in seconds of the current media resource. A NaN value is returned if duration is not available, or Infinity if the media resource is streaming.
       */
-    duration: number;
+    readonly duration: number;
     /**
       * Gets information about whether the playback has ended or not.
       */
-    ended: boolean;
+    readonly ended: boolean;
     /**
       * Returns an object representing the current error state of the audio or video element.
       */
-    error: MediaError;
+    readonly error: MediaError;
     /**
       * Gets or sets a flag to specify whether playback should restart after it completes.
       */
     loop: boolean;
+    readonly mediaKeys: MediaKeys;
     /**
       * Specifies the purpose of the audio or video media, such as background audio or alerts.
       */
@@ -5470,11 +6093,11 @@ interface HTMLMediaElement extends HTMLElement {
       * Specifies the output device id that the audio will be sent to.
       */
     msAudioDeviceType: string;
-    msGraphicsTrustStatus: MSGraphicsTrust;
+    readonly msGraphicsTrustStatus: MSGraphicsTrust;
     /**
       * Gets the MSMediaKeys object, which is used for decrypting media data, that is associated with this media element.
       */
-    msKeys: MSMediaKeys;
+    readonly msKeys: MSMediaKeys;
     /**
       * Gets or sets whether the DLNA PlayTo device is available.
       */
@@ -5490,7 +6113,7 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Gets the source associated with the media element for use by the PlayToManager.
       */
-    msPlayToSource: any;
+    readonly msPlayToSource: any;
     /**
       * Specifies whether or not to enable low-latency playback on the media element.
       */
@@ -5502,12 +6125,13 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Gets the current network activity for the element.
       */
-    networkState: number;
+    readonly networkState: number;
+    onencrypted: (ev: MediaEncryptedEvent) => any;
     onmsneedkey: (ev: MSMediaKeyNeededEvent) => any;
     /**
       * Gets a flag that specifies whether playback is paused.
       */
-    paused: boolean;
+    readonly paused: boolean;
     /**
       * Gets or sets the current rate of speed for the media resource to play. This speed is expressed as a multiple of the normal speed of the media resource.
       */
@@ -5515,7 +6139,7 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Gets TimeRanges for the current media resource that has been played.
       */
-    played: TimeRanges;
+    readonly played: TimeRanges;
     /**
       * Gets or sets the current playback position, in seconds.
       */
@@ -5524,17 +6148,18 @@ interface HTMLMediaElement extends HTMLElement {
     /**
       * Returns a TimeRanges object that represents the ranges of the current media resource that can be seeked.
       */
-    seekable: TimeRanges;
+    readonly seekable: TimeRanges;
     /**
       * Gets a flag that indicates whether the the client is currently moving to a new playback position in the media resource.
       */
-    seeking: boolean;
+    readonly seeking: boolean;
     /**
       * The address or URL of the a media resource that is to be considered.
       */
     src: string;
-    textTracks: TextTrackList;
-    videoTracks: VideoTrackList;
+    srcObject: MediaStream;
+    readonly textTracks: TextTrackList;
+    readonly videoTracks: VideoTrackList;
     /**
       * Gets or sets the volume level for audio portions of the media element.
       */
@@ -5570,15 +6195,16 @@ interface HTMLMediaElement extends HTMLElement {
       * Loads and starts playback of a media resource.
       */
     play(): void;
-    HAVE_CURRENT_DATA: number;
-    HAVE_ENOUGH_DATA: number;
-    HAVE_FUTURE_DATA: number;
-    HAVE_METADATA: number;
-    HAVE_NOTHING: number;
-    NETWORK_EMPTY: number;
-    NETWORK_IDLE: number;
-    NETWORK_LOADING: number;
-    NETWORK_NO_SOURCE: number;
+    setMediaKeys(mediaKeys: MediaKeys): PromiseLike<void>;
+    readonly HAVE_CURRENT_DATA: number;
+    readonly HAVE_ENOUGH_DATA: number;
+    readonly HAVE_FUTURE_DATA: number;
+    readonly HAVE_METADATA: number;
+    readonly HAVE_NOTHING: number;
+    readonly NETWORK_EMPTY: number;
+    readonly NETWORK_IDLE: number;
+    readonly NETWORK_LOADING: number;
+    readonly NETWORK_NO_SOURCE: number;
     addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -5602,10 +6228,10 @@ interface HTMLMediaElement extends HTMLElement {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -5613,9 +6239,9 @@ interface HTMLMediaElement extends HTMLElement {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -5627,11 +6253,13 @@ interface HTMLMediaElement extends HTMLElement {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "encrypted", listener: (ev: MediaEncryptedEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -5647,9 +6275,9 @@ interface HTMLMediaElement extends HTMLElement {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "msneedkey", listener: (ev: MSMediaKeyNeededEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -5688,15 +6316,15 @@ interface HTMLMediaElement extends HTMLElement {
 declare var HTMLMediaElement: {
     prototype: HTMLMediaElement;
     new(): HTMLMediaElement;
-    HAVE_CURRENT_DATA: number;
-    HAVE_ENOUGH_DATA: number;
-    HAVE_FUTURE_DATA: number;
-    HAVE_METADATA: number;
-    HAVE_NOTHING: number;
-    NETWORK_EMPTY: number;
-    NETWORK_IDLE: number;
-    NETWORK_LOADING: number;
-    NETWORK_NO_SOURCE: number;
+    readonly HAVE_CURRENT_DATA: number;
+    readonly HAVE_ENOUGH_DATA: number;
+    readonly HAVE_FUTURE_DATA: number;
+    readonly HAVE_METADATA: number;
+    readonly HAVE_NOTHING: number;
+    readonly NETWORK_EMPTY: number;
+    readonly NETWORK_IDLE: number;
+    readonly NETWORK_LOADING: number;
+    readonly NETWORK_NO_SOURCE: number;
 }
 
 interface HTMLMenuElement extends HTMLElement {
@@ -5741,6 +6369,20 @@ declare var HTMLMetaElement: {
     new(): HTMLMetaElement;
 }
 
+interface HTMLMeterElement extends HTMLElement {
+    high: number;
+    low: number;
+    max: number;
+    min: number;
+    optimum: number;
+    value: number;
+}
+
+declare var HTMLMeterElement: {
+    prototype: HTMLMeterElement;
+    new(): HTMLMeterElement;
+}
+
 interface HTMLModElement extends HTMLElement {
     /**
       * Sets or retrieves reference information about the object.
@@ -5757,15 +6399,6 @@ declare var HTMLModElement: {
     new(): HTMLModElement;
 }
 
-interface HTMLNextIdElement extends HTMLElement {
-    n: string;
-}
-
-declare var HTMLNextIdElement: {
-    prototype: HTMLNextIdElement;
-    new(): HTMLNextIdElement;
-}
-
 interface HTMLOListElement extends HTMLElement {
     compact: boolean;
     /**
@@ -5784,7 +6417,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves a string of the URL where the object tag can be found. This is often the href of the document that the object is in, or the value set by a base element.
       */
-    BaseHref: string;
+    readonly BaseHref: string;
     align: string;
     /**
       * Sets or retrieves a text alternative to the graphic.
@@ -5814,7 +6447,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves the document object of the page or frame.
       */
-    contentDocument: Document;
+    readonly contentDocument: Document;
     /**
       * Sets or retrieves the URL that references the data of the object.
       */
@@ -5823,7 +6456,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the height of the object.
       */
@@ -5844,7 +6477,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Gets the source associated with the media element for use by the PlayToManager.
       */
-    msPlayToSource: any;
+    readonly msPlayToSource: any;
     /**
       * Sets or retrieves the name of the object.
       */
@@ -5852,8 +6485,8 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Retrieves the contained object.
       */
-    object: any;
-    readyState: number;
+    readonly object: any;
+    readonly readyState: number;
     /**
       * Sets or retrieves a message to be displayed while an object is loading.
       */
@@ -5869,11 +6502,11 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
       */
-    validationMessage: string;
+    readonly validationMessage: string;
     /**
       * Returns a  ValidityState object that represents the validity states of an element.
       */
-    validity: ValidityState;
+    readonly validity: ValidityState;
     vspace: number;
     /**
       * Sets or retrieves the width of the object.
@@ -5882,7 +6515,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
     /**
       * Returns whether an element will successfully validate based on forms validation rules and constraints.
       */
-    willValidate: boolean;
+    readonly willValidate: boolean;
     /**
       * Returns whether a form will validate when it is submitted, without having to submit it.
       */
@@ -5909,11 +6542,11 @@ interface HTMLOptGroupElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the ordinal position of an option in a list box.
       */
-    index: number;
+    readonly index: number;
     /**
       * Sets or retrieves a value that you can use to implement your own label functionality for the object.
       */
@@ -5925,7 +6558,7 @@ interface HTMLOptGroupElement extends HTMLElement {
     /**
       * Sets or retrieves the text string specified by the option tag.
       */
-    text: string;
+    readonly text: string;
     /**
       * Sets or retrieves the value which is returned to the server when the form control is submitted.
       */
@@ -5946,11 +6579,11 @@ interface HTMLOptionElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the ordinal position of an option in a list box.
       */
-    index: number;
+    readonly index: number;
     /**
       * Sets or retrieves a value that you can use to implement your own label functionality for the object.
       */
@@ -5975,6 +6608,18 @@ declare var HTMLOptionElement: {
     create(): HTMLOptionElement;
 }
 
+interface HTMLOptionsCollection extends HTMLCollection {
+    length: number;
+    selectedIndex: number;
+    add(element: HTMLOptionElement | HTMLOptGroupElement, before?: HTMLElement | number): void;
+    remove(index: number): void;
+}
+
+declare var HTMLOptionsCollection: {
+    prototype: HTMLOptionsCollection;
+    new(): HTMLOptionsCollection;
+}
+
 interface HTMLParagraphElement extends HTMLElement {
     /**
       * Sets or retrieves how the object is aligned with adjacent text. 
@@ -6012,28 +6657,15 @@ declare var HTMLParamElement: {
     new(): HTMLParamElement;
 }
 
-interface HTMLPhraseElement extends HTMLElement {
-    /**
-      * Sets or retrieves reference information about the object.
-      */
-    cite: string;
-    /**
-      * Sets or retrieves the date and time of a modification to the object.
-      */
-    dateTime: string;
+interface HTMLPictureElement extends HTMLElement {
 }
 
-declare var HTMLPhraseElement: {
-    prototype: HTMLPhraseElement;
-    new(): HTMLPhraseElement;
+declare var HTMLPictureElement: {
+    prototype: HTMLPictureElement;
+    new(): HTMLPictureElement;
 }
 
 interface HTMLPreElement extends HTMLElement {
-    /**
-      * Indicates a citation by rendering text in italic type.
-      */
-    cite: string;
-    clear: string;
     /**
       * Sets or gets a value that you can use to implement your own width functionality for the object.
       */
@@ -6049,7 +6681,7 @@ interface HTMLProgressElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Defines the maximum, or "done" value for a progress element.
       */
@@ -6057,7 +6689,7 @@ interface HTMLProgressElement extends HTMLElement {
     /**
       * Returns the quotient of value/max when the value attribute is set (determinate progress bar), or -1 when the value attribute is missing (indeterminate progress bar).
       */
-    position: number;
+    readonly position: number;
     /**
       * Sets or gets the current value of a progress element. The value must be a non-negative number between 0 and the max value.
       */
@@ -6074,10 +6706,6 @@ interface HTMLQuoteElement extends HTMLElement {
       * Sets or retrieves reference information about the object.
       */
     cite: string;
-    /**
-      * Sets or retrieves the date and time of a modification to the object.
-      */
-    dateTime: string;
 }
 
 declare var HTMLQuoteElement: {
@@ -6131,7 +6759,7 @@ interface HTMLSelectElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in. 
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the number of objects in a collection.
       */
@@ -6144,7 +6772,7 @@ interface HTMLSelectElement extends HTMLElement {
       * Sets or retrieves the name of the object.
       */
     name: string;
-    options: HTMLCollection;
+    options: HTMLCollectionOf<HTMLOptionElement>;
     /**
       * When present, marks an element that can't be submitted without a value.
       */
@@ -6153,6 +6781,7 @@ interface HTMLSelectElement extends HTMLElement {
       * Sets or retrieves the index of the selected option in a select object.
       */
     selectedIndex: number;
+    selectedOptions: HTMLCollectionOf<HTMLOptionElement>;
     /**
       * Sets or retrieves the number of rows in the list box. 
       */
@@ -6160,15 +6789,15 @@ interface HTMLSelectElement extends HTMLElement {
     /**
       * Retrieves the type of select control based on the value of the MULTIPLE attribute.
       */
-    type: string;
+    readonly type: string;
     /**
       * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
       */
-    validationMessage: string;
+    readonly validationMessage: string;
     /**
       * Returns a  ValidityState object that represents the validity states of an element.
       */
-    validity: ValidityState;
+    readonly validity: ValidityState;
     /**
       * Sets or retrieves the value which is returned to the server when the form control is submitted.
       */
@@ -6176,8 +6805,7 @@ interface HTMLSelectElement extends HTMLElement {
     /**
       * Returns whether an element will successfully validate based on forms validation rules and constraints.
       */
-    willValidate: boolean;
-    selectedOptions: HTMLCollection;
+    readonly willValidate: boolean;
     /**
       * Adds an element to the areas, controlRange, or options collection.
       * @param element Variant of type Number that specifies the index position in the collection where the element is placed. If no value is given, the method places the element at the end of the collection.
@@ -6223,10 +6851,12 @@ interface HTMLSourceElement extends HTMLElement {
      */
     media: string;
     msKeySystem: string;
+    sizes: string;
     /**
       * The address or URL of the a media resource that is to be considered.
       */
     src: string;
+    srcset: string;
     /**
      * Gets or sets the MIME type of a media resource.
      */
@@ -6247,6 +6877,7 @@ declare var HTMLSpanElement: {
 }
 
 interface HTMLStyleElement extends HTMLElement, LinkStyle {
+    disabled: boolean;
     /**
       * Sets or retrieves the media type.
       */
@@ -6296,7 +6927,7 @@ interface HTMLTableCellElement extends HTMLElement, HTMLTableAlignment {
     /**
       * Retrieves the position of the object in the cells collection of a row.
       */
-    cellIndex: number;
+    readonly cellIndex: number;
     /**
       * Sets or retrieves the number columns in the table that the object should span.
       */
@@ -6403,7 +7034,7 @@ interface HTMLTableElement extends HTMLElement {
     /**
       * Sets or retrieves the number of horizontal rows contained in the object.
       */
-    rows: HTMLCollection;
+    rows: HTMLCollectionOf<HTMLTableRowElement>;
     /**
       * Sets or retrieves which dividing lines (inner borders) are displayed.
       */
@@ -6415,7 +7046,7 @@ interface HTMLTableElement extends HTMLElement {
     /**
       * Retrieves a collection of all tBody objects in the table. Objects in this collection are in source order.
       */
-    tBodies: HTMLCollection;
+    tBodies: HTMLCollectionOf<HTMLTableSectionElement>;
     /**
       * Retrieves the tFoot object of the table.
       */
@@ -6494,7 +7125,7 @@ interface HTMLTableRowElement extends HTMLElement, HTMLTableAlignment {
     /**
       * Retrieves a collection of all cells in the table row.
       */
-    cells: HTMLCollection;
+    cells: HTMLCollectionOf<HTMLTableDataCellElement | HTMLTableHeaderCellElement>;
     /**
       * Sets or retrieves the height of the object.
       */
@@ -6502,11 +7133,11 @@ interface HTMLTableRowElement extends HTMLElement, HTMLTableAlignment {
     /**
       * Retrieves the position of the object in the rows collection for the table.
       */
-    rowIndex: number;
+    readonly rowIndex: number;
     /**
       * Retrieves the position of the object in the collection.
       */
-    sectionRowIndex: number;
+    readonly sectionRowIndex: number;
     /**
       * Removes the specified cell from the table row, as well as from the cells collection.
       * @param index Number that specifies the zero-based position of the cell to remove from the table row. If no value is provided, the last cell in the cells collection is deleted.
@@ -6516,7 +7147,7 @@ interface HTMLTableRowElement extends HTMLElement, HTMLTableAlignment {
       * Creates a new cell in the table row, and adds the cell to the cells collection.
       * @param index Number that specifies where to insert the cell in the tr. The default value is -1, which appends the new cell to the end of the cells collection.
       */
-    insertCell(index?: number): HTMLTableCellElement;
+    insertCell(index?: number): HTMLTableDataCellElement;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6533,7 +7164,7 @@ interface HTMLTableSectionElement extends HTMLElement, HTMLTableAlignment {
     /**
       * Sets or retrieves the number of horizontal rows contained in the object.
       */
-    rows: HTMLCollection;
+    rows: HTMLCollectionOf<HTMLTableRowElement>;
     /**
       * Removes the specified row (tr) from the element and from the rows collection.
       * @param index Number that specifies the zero-based position in the rows collection of the row to remove.
@@ -6552,6 +7183,15 @@ declare var HTMLTableSectionElement: {
     new(): HTMLTableSectionElement;
 }
 
+interface HTMLTemplateElement extends HTMLElement {
+    readonly content: DocumentFragment;
+}
+
+declare var HTMLTemplateElement: {
+    prototype: HTMLTemplateElement;
+    new(): HTMLTemplateElement;
+}
+
 interface HTMLTextAreaElement extends HTMLElement {
     /**
       * Provides a way to direct a user to a specific field when a document loads. This can provide both direction and convenience for a user, reducing the need to click or tab to a field when a page opens. This attribute is true when present on an element, and false when missing.
@@ -6569,7 +7209,7 @@ interface HTMLTextAreaElement extends HTMLElement {
     /**
       * Retrieves a reference to the form that the object is embedded in.
       */
-    form: HTMLFormElement;
+    readonly form: HTMLFormElement;
     /**
       * Sets or retrieves the maximum number of characters that the user can enter in a text control.
       */
@@ -6609,15 +7249,15 @@ interface HTMLTextAreaElement extends HTMLElement {
     /**
       * Retrieves the type of control.
       */
-    type: string;
+    readonly type: string;
     /**
       * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
       */
-    validationMessage: string;
+    readonly validationMessage: string;
     /**
       * Returns a  ValidityState object that represents the validity states of an element.
       */
-    validity: ValidityState;
+    readonly validity: ValidityState;
     /**
       * Retrieves or sets the text in the entry field of the textArea element.
       */
@@ -6625,19 +7265,16 @@ interface HTMLTextAreaElement extends HTMLElement {
     /**
       * Returns whether an element will successfully validate based on forms validation rules and constraints.
       */
-    willValidate: boolean;
+    readonly willValidate: boolean;
     /**
       * Sets or retrieves how to handle wordwrapping in the object.
       */
     wrap: string;
+    minLength: number;
     /**
       * Returns whether a form will validate when it is submitted, without having to submit it.
       */
     checkValidity(): boolean;
-    /**
-      * Creates a TextRange object for the element.
-      */
-    createTextRange(): TextRange;
     /**
       * Highlights the input area of a form element.
       */
@@ -6676,23 +7313,23 @@ interface HTMLTrackElement extends HTMLElement {
     default: boolean;
     kind: string;
     label: string;
-    readyState: number;
+    readonly readyState: number;
     src: string;
     srclang: string;
-    track: TextTrack;
-    ERROR: number;
-    LOADED: number;
-    LOADING: number;
-    NONE: number;
+    readonly track: TextTrack;
+    readonly ERROR: number;
+    readonly LOADED: number;
+    readonly LOADING: number;
+    readonly NONE: number;
 }
 
 declare var HTMLTrackElement: {
     prototype: HTMLTrackElement;
     new(): HTMLTrackElement;
-    ERROR: number;
-    LOADED: number;
-    LOADING: number;
-    NONE: number;
+    readonly ERROR: number;
+    readonly LOADED: number;
+    readonly LOADING: number;
+    readonly NONE: number;
 }
 
 interface HTMLUListElement extends HTMLElement {
@@ -6719,8 +7356,8 @@ interface HTMLVideoElement extends HTMLMediaElement {
       */
     height: number;
     msHorizontalMirror: boolean;
-    msIsLayoutOptimalForPlayback: boolean;
-    msIsStereo3D: boolean;
+    readonly msIsLayoutOptimalForPlayback: boolean;
+    readonly msIsStereo3D: boolean;
     msStereo3DPackingMode: string;
     msStereo3DRenderMode: string;
     msZoom: boolean;
@@ -6734,13 +7371,13 @@ interface HTMLVideoElement extends HTMLMediaElement {
     /**
       * Gets the intrinsic height of a video in CSS pixels, or zero if the dimensions are not known.
       */
-    videoHeight: number;
+    readonly videoHeight: number;
     /**
       * Gets the intrinsic width of a video in CSS pixels, or zero if the dimensions are not known.
       */
-    videoWidth: number;
-    webkitDisplayingFullscreen: boolean;
-    webkitSupportsFullscreen: boolean;
+    readonly videoWidth: number;
+    readonly webkitDisplayingFullscreen: boolean;
+    readonly webkitSupportsFullscreen: boolean;
     /**
       * Gets or sets the width of the video element.
       */
@@ -6779,10 +7416,10 @@ interface HTMLVideoElement extends HTMLMediaElement {
     addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecopy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforecut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "beforepaste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -6790,9 +7427,9 @@ interface HTMLVideoElement extends HTMLMediaElement {
     addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "copy", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "cut", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -6804,11 +7441,13 @@ interface HTMLVideoElement extends HTMLMediaElement {
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "encrypted", listener: (ev: MediaEncryptedEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -6824,9 +7463,9 @@ interface HTMLVideoElement extends HTMLMediaElement {
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "msneedkey", listener: (ev: MSMediaKeyNeededEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "paste", listener: (ev: ClipboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -6868,8 +7507,8 @@ declare var HTMLVideoElement: {
 }
 
 interface HashChangeEvent extends Event {
-    newURL: string;
-    oldURL: string;
+    readonly newURL: string;
+    readonly oldURL: string;
 }
 
 declare var HashChangeEvent: {
@@ -6878,8 +7517,8 @@ declare var HashChangeEvent: {
 }
 
 interface History {
-    length: number;
-    state: any;
+    readonly length: number;
+    readonly state: any;
     back(distance?: any): void;
     forward(distance?: any): void;
     go(delta?: any): void;
@@ -6893,31 +7532,31 @@ declare var History: {
 }
 
 interface IDBCursor {
-    direction: string;
-    key: any;
-    primaryKey: any;
+    readonly direction: string;
+    key: IDBKeyRange | IDBValidKey;
+    readonly primaryKey: any;
     source: IDBObjectStore | IDBIndex;
     advance(count: number): void;
-    continue(key?: any): void;
+    continue(key?: IDBKeyRange | IDBValidKey): void;
     delete(): IDBRequest;
     update(value: any): IDBRequest;
-    NEXT: string;
-    NEXT_NO_DUPLICATE: string;
-    PREV: string;
-    PREV_NO_DUPLICATE: string;
+    readonly NEXT: string;
+    readonly NEXT_NO_DUPLICATE: string;
+    readonly PREV: string;
+    readonly PREV_NO_DUPLICATE: string;
 }
 
 declare var IDBCursor: {
     prototype: IDBCursor;
     new(): IDBCursor;
-    NEXT: string;
-    NEXT_NO_DUPLICATE: string;
-    PREV: string;
-    PREV_NO_DUPLICATE: string;
+    readonly NEXT: string;
+    readonly NEXT_NO_DUPLICATE: string;
+    readonly PREV: string;
+    readonly PREV_NO_DUPLICATE: string;
 }
 
 interface IDBCursorWithValue extends IDBCursor {
-    value: any;
+    readonly value: any;
 }
 
 declare var IDBCursorWithValue: {
@@ -6926,15 +7565,17 @@ declare var IDBCursorWithValue: {
 }
 
 interface IDBDatabase extends EventTarget {
-    name: string;
-    objectStoreNames: DOMStringList;
+    readonly name: string;
+    readonly objectStoreNames: DOMStringList;
     onabort: (ev: Event) => any;
     onerror: (ev: Event) => any;
     version: number;
+    onversionchange: (ev: IDBVersionChangeEvent) => any;
     close(): void;
     createObjectStore(name: string, optionalParameters?: IDBObjectStoreParameters): IDBObjectStore;
     deleteObjectStore(name: string): void;
     transaction(storeNames: string | string[], mode?: string): IDBTransaction;
+    addEventListener(type: "versionchange", listener: (ev: IDBVersionChangeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -6958,15 +7599,15 @@ declare var IDBFactory: {
 
 interface IDBIndex {
     keyPath: string | string[];
-    name: string;
-    objectStore: IDBObjectStore;
-    unique: boolean;
+    readonly name: string;
+    readonly objectStore: IDBObjectStore;
+    readonly unique: boolean;
     multiEntry: boolean;
-    count(key?: any): IDBRequest;
-    get(key: any): IDBRequest;
-    getKey(key: any): IDBRequest;
-    openCursor(range?: IDBKeyRange, direction?: string): IDBRequest;
-    openKeyCursor(range?: IDBKeyRange, direction?: string): IDBRequest;
+    count(key?: IDBKeyRange | IDBValidKey): IDBRequest;
+    get(key: IDBKeyRange | IDBValidKey): IDBRequest;
+    getKey(key: IDBKeyRange | IDBValidKey): IDBRequest;
+    openCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest;
+    openKeyCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest;
 }
 
 declare var IDBIndex: {
@@ -6975,37 +7616,37 @@ declare var IDBIndex: {
 }
 
 interface IDBKeyRange {
-    lower: any;
-    lowerOpen: boolean;
-    upper: any;
-    upperOpen: boolean;
+    readonly lower: any;
+    readonly lowerOpen: boolean;
+    readonly upper: any;
+    readonly upperOpen: boolean;
 }
 
 declare var IDBKeyRange: {
     prototype: IDBKeyRange;
     new(): IDBKeyRange;
     bound(lower: any, upper: any, lowerOpen?: boolean, upperOpen?: boolean): IDBKeyRange;
-    lowerBound(bound: any, open?: boolean): IDBKeyRange;
+    lowerBound(lower: any, open?: boolean): IDBKeyRange;
     only(value: any): IDBKeyRange;
-    upperBound(bound: any, open?: boolean): IDBKeyRange;
+    upperBound(upper: any, open?: boolean): IDBKeyRange;
 }
 
 interface IDBObjectStore {
-    indexNames: DOMStringList;
+    readonly indexNames: DOMStringList;
     keyPath: string | string[];
-    name: string;
-    transaction: IDBTransaction;
+    readonly name: string;
+    readonly transaction: IDBTransaction;
     autoIncrement: boolean;
-    add(value: any, key?: any): IDBRequest;
+    add(value: any, key?: IDBKeyRange | IDBValidKey): IDBRequest;
     clear(): IDBRequest;
-    count(key?: any): IDBRequest;
+    count(key?: IDBKeyRange | IDBValidKey): IDBRequest;
     createIndex(name: string, keyPath: string | string[], optionalParameters?: IDBIndexParameters): IDBIndex;
-    delete(key: any): IDBRequest;
+    delete(key: IDBKeyRange | IDBValidKey): IDBRequest;
     deleteIndex(indexName: string): void;
     get(key: any): IDBRequest;
     index(name: string): IDBIndex;
-    openCursor(range?: any, direction?: string): IDBRequest;
-    put(value: any, key?: any): IDBRequest;
+    openCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest;
+    put(value: any, key?: IDBKeyRange | IDBValidKey): IDBRequest;
 }
 
 declare var IDBObjectStore: {
@@ -7029,13 +7670,13 @@ declare var IDBOpenDBRequest: {
 }
 
 interface IDBRequest extends EventTarget {
-    error: DOMError;
+    readonly error: DOMError;
     onerror: (ev: Event) => any;
     onsuccess: (ev: Event) => any;
-    readyState: string;
-    result: any;
+    readonly readyState: string;
+    readonly result: any;
     source: IDBObjectStore | IDBIndex | IDBCursor;
-    transaction: IDBTransaction;
+    readonly transaction: IDBTransaction;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "success", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -7047,17 +7688,17 @@ declare var IDBRequest: {
 }
 
 interface IDBTransaction extends EventTarget {
-    db: IDBDatabase;
-    error: DOMError;
-    mode: string;
+    readonly db: IDBDatabase;
+    readonly error: DOMError;
+    readonly mode: string;
     onabort: (ev: Event) => any;
     oncomplete: (ev: Event) => any;
     onerror: (ev: Event) => any;
     abort(): void;
     objectStore(name: string): IDBObjectStore;
-    READ_ONLY: string;
-    READ_WRITE: string;
-    VERSION_CHANGE: string;
+    readonly READ_ONLY: string;
+    readonly READ_WRITE: string;
+    readonly VERSION_CHANGE: string;
     addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
@@ -7067,14 +7708,14 @@ interface IDBTransaction extends EventTarget {
 declare var IDBTransaction: {
     prototype: IDBTransaction;
     new(): IDBTransaction;
-    READ_ONLY: string;
-    READ_WRITE: string;
-    VERSION_CHANGE: string;
+    readonly READ_ONLY: string;
+    readonly READ_WRITE: string;
+    readonly VERSION_CHANGE: string;
 }
 
 interface IDBVersionChangeEvent extends Event {
-    newVersion: number;
-    oldVersion: number;
+    readonly newVersion: number;
+    readonly oldVersion: number;
 }
 
 declare var IDBVersionChangeEvent: {
@@ -7084,8 +7725,8 @@ declare var IDBVersionChangeEvent: {
 
 interface ImageData {
     data: Uint8ClampedArray;
-    height: number;
-    width: number;
+    readonly height: number;
+    readonly width: number;
 }
 
 declare var ImageData: {
@@ -7095,37 +7736,47 @@ declare var ImageData: {
 }
 
 interface KeyboardEvent extends UIEvent {
-    altKey: boolean;
-    char: string;
-    charCode: number;
-    ctrlKey: boolean;
-    key: string;
-    keyCode: number;
-    locale: string;
-    location: number;
-    metaKey: boolean;
-    repeat: boolean;
-    shiftKey: boolean;
-    which: number;
+    readonly altKey: boolean;
+    readonly char: string;
+    readonly charCode: number;
+    readonly ctrlKey: boolean;
+    readonly key: string;
+    readonly keyCode: number;
+    readonly locale: string;
+    readonly location: number;
+    readonly metaKey: boolean;
+    readonly repeat: boolean;
+    readonly shiftKey: boolean;
+    readonly which: number;
     getModifierState(keyArg: string): boolean;
     initKeyboardEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, keyArg: string, locationArg: number, modifiersListArg: string, repeat: boolean, locale: string): void;
-    DOM_KEY_LOCATION_JOYSTICK: number;
-    DOM_KEY_LOCATION_LEFT: number;
-    DOM_KEY_LOCATION_MOBILE: number;
-    DOM_KEY_LOCATION_NUMPAD: number;
-    DOM_KEY_LOCATION_RIGHT: number;
-    DOM_KEY_LOCATION_STANDARD: number;
+    readonly DOM_KEY_LOCATION_JOYSTICK: number;
+    readonly DOM_KEY_LOCATION_LEFT: number;
+    readonly DOM_KEY_LOCATION_MOBILE: number;
+    readonly DOM_KEY_LOCATION_NUMPAD: number;
+    readonly DOM_KEY_LOCATION_RIGHT: number;
+    readonly DOM_KEY_LOCATION_STANDARD: number;
 }
 
 declare var KeyboardEvent: {
     prototype: KeyboardEvent;
     new(typeArg: string, eventInitDict?: KeyboardEventInit): KeyboardEvent;
-    DOM_KEY_LOCATION_JOYSTICK: number;
-    DOM_KEY_LOCATION_LEFT: number;
-    DOM_KEY_LOCATION_MOBILE: number;
-    DOM_KEY_LOCATION_NUMPAD: number;
-    DOM_KEY_LOCATION_RIGHT: number;
-    DOM_KEY_LOCATION_STANDARD: number;
+    readonly DOM_KEY_LOCATION_JOYSTICK: number;
+    readonly DOM_KEY_LOCATION_LEFT: number;
+    readonly DOM_KEY_LOCATION_MOBILE: number;
+    readonly DOM_KEY_LOCATION_NUMPAD: number;
+    readonly DOM_KEY_LOCATION_RIGHT: number;
+    readonly DOM_KEY_LOCATION_STANDARD: number;
+}
+
+interface ListeningStateChangedEvent extends Event {
+    readonly label: string;
+    readonly state: string;
+}
+
+declare var ListeningStateChangedEvent: {
+    prototype: ListeningStateChangedEvent;
+    new(): ListeningStateChangedEvent;
 }
 
 interface Location {
@@ -7133,7 +7784,7 @@ interface Location {
     host: string;
     hostname: string;
     href: string;
-    origin: string;
+    readonly origin: string;
     pathname: string;
     port: string;
     protocol: string;
@@ -7150,7 +7801,7 @@ declare var Location: {
 }
 
 interface LongRunningScriptDetectedEvent extends Event {
-    executionTime: number;
+    readonly executionTime: number;
     stopPageScriptExecution: boolean;
 }
 
@@ -7169,29 +7820,29 @@ interface MSApp {
     execAsyncAtPriority(asynchronousCallback: MSExecAtPriorityFunctionCallback, priority: string, ...args: any[]): void;
     execAtPriority(synchronousCallback: MSExecAtPriorityFunctionCallback, priority: string, ...args: any[]): any;
     getCurrentPriority(): string;
-    getHtmlPrintDocumentSourceAsync(htmlDoc: any): any;
+    getHtmlPrintDocumentSourceAsync(htmlDoc: any): PromiseLike<any>;
     getViewId(view: any): any;
     isTaskScheduledAtPriorityOrHigher(priority: string): boolean;
     pageHandlesAllApplicationActivations(enabled: boolean): void;
     suppressSubdownloadCredentialPrompts(suppress: boolean): void;
     terminateApp(exceptionObject: any): void;
-    CURRENT: string;
-    HIGH: string;
-    IDLE: string;
-    NORMAL: string;
+    readonly CURRENT: string;
+    readonly HIGH: string;
+    readonly IDLE: string;
+    readonly NORMAL: string;
 }
 declare var MSApp: MSApp;
 
 interface MSAppAsyncOperation extends EventTarget {
-    error: DOMError;
+    readonly error: DOMError;
     oncomplete: (ev: Event) => any;
     onerror: (ev: Event) => any;
-    readyState: number;
-    result: any;
+    readonly readyState: number;
+    readonly result: any;
     start(): void;
-    COMPLETED: number;
-    ERROR: number;
-    STARTED: number;
+    readonly COMPLETED: number;
+    readonly ERROR: number;
+    readonly STARTED: number;
     addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -7200,9 +7851,19 @@ interface MSAppAsyncOperation extends EventTarget {
 declare var MSAppAsyncOperation: {
     prototype: MSAppAsyncOperation;
     new(): MSAppAsyncOperation;
-    COMPLETED: number;
-    ERROR: number;
-    STARTED: number;
+    readonly COMPLETED: number;
+    readonly ERROR: number;
+    readonly STARTED: number;
+}
+
+interface MSAssertion {
+    readonly id: string;
+    readonly type: string;
+}
+
+declare var MSAssertion: {
+    prototype: MSAssertion;
+    new(): MSAssertion;
 }
 
 interface MSBlobBuilder {
@@ -7215,44 +7876,46 @@ declare var MSBlobBuilder: {
     new(): MSBlobBuilder;
 }
 
-interface MSCSSMatrix {
-    a: number;
-    b: number;
-    c: number;
-    d: number;
-    e: number;
-    f: number;
-    m11: number;
-    m12: number;
-    m13: number;
-    m14: number;
-    m21: number;
-    m22: number;
-    m23: number;
-    m24: number;
-    m31: number;
-    m32: number;
-    m33: number;
-    m34: number;
-    m41: number;
-    m42: number;
-    m43: number;
-    m44: number;
-    inverse(): MSCSSMatrix;
-    multiply(secondMatrix: MSCSSMatrix): MSCSSMatrix;
-    rotate(angleX: number, angleY?: number, angleZ?: number): MSCSSMatrix;
-    rotateAxisAngle(x: number, y: number, z: number, angle: number): MSCSSMatrix;
-    scale(scaleX: number, scaleY?: number, scaleZ?: number): MSCSSMatrix;
-    setMatrixValue(value: string): void;
-    skewX(angle: number): MSCSSMatrix;
-    skewY(angle: number): MSCSSMatrix;
-    toString(): string;
-    translate(x: number, y: number, z?: number): MSCSSMatrix;
+interface MSCredentials {
+    getAssertion(challenge: string, filter?: MSCredentialFilter, params?: MSSignatureParameters): PromiseLike<MSAssertion>;
+    makeCredential(accountInfo: MSAccountInfo, params: MSCredentialParameters[], challenge?: string): PromiseLike<MSAssertion>;
 }
 
-declare var MSCSSMatrix: {
-    prototype: MSCSSMatrix;
-    new(text?: string): MSCSSMatrix;
+declare var MSCredentials: {
+    prototype: MSCredentials;
+    new(): MSCredentials;
+}
+
+interface MSFIDOCredentialAssertion extends MSAssertion {
+    readonly algorithm: string | Algorithm;
+    readonly attestation: any;
+    readonly publicKey: string;
+    readonly transportHints: string[];
+}
+
+declare var MSFIDOCredentialAssertion: {
+    prototype: MSFIDOCredentialAssertion;
+    new(): MSFIDOCredentialAssertion;
+}
+
+interface MSFIDOSignature {
+    readonly authnrData: string;
+    readonly clientData: string;
+    readonly signature: string;
+}
+
+declare var MSFIDOSignature: {
+    prototype: MSFIDOSignature;
+    new(): MSFIDOSignature;
+}
+
+interface MSFIDOSignatureAssertion extends MSAssertion {
+    readonly signature: MSFIDOSignature;
+}
+
+declare var MSFIDOSignatureAssertion: {
+    prototype: MSFIDOSignatureAssertion;
+    new(): MSFIDOSignatureAssertion;
 }
 
 interface MSGesture {
@@ -7267,44 +7930,44 @@ declare var MSGesture: {
 }
 
 interface MSGestureEvent extends UIEvent {
-    clientX: number;
-    clientY: number;
-    expansion: number;
-    gestureObject: any;
-    hwTimestamp: number;
-    offsetX: number;
-    offsetY: number;
-    rotation: number;
-    scale: number;
-    screenX: number;
-    screenY: number;
-    translationX: number;
-    translationY: number;
-    velocityAngular: number;
-    velocityExpansion: number;
-    velocityX: number;
-    velocityY: number;
+    readonly clientX: number;
+    readonly clientY: number;
+    readonly expansion: number;
+    readonly gestureObject: any;
+    readonly hwTimestamp: number;
+    readonly offsetX: number;
+    readonly offsetY: number;
+    readonly rotation: number;
+    readonly scale: number;
+    readonly screenX: number;
+    readonly screenY: number;
+    readonly translationX: number;
+    readonly translationY: number;
+    readonly velocityAngular: number;
+    readonly velocityExpansion: number;
+    readonly velocityX: number;
+    readonly velocityY: number;
     initGestureEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, offsetXArg: number, offsetYArg: number, translationXArg: number, translationYArg: number, scaleArg: number, expansionArg: number, rotationArg: number, velocityXArg: number, velocityYArg: number, velocityExpansionArg: number, velocityAngularArg: number, hwTimestampArg: number): void;
-    MSGESTURE_FLAG_BEGIN: number;
-    MSGESTURE_FLAG_CANCEL: number;
-    MSGESTURE_FLAG_END: number;
-    MSGESTURE_FLAG_INERTIA: number;
-    MSGESTURE_FLAG_NONE: number;
+    readonly MSGESTURE_FLAG_BEGIN: number;
+    readonly MSGESTURE_FLAG_CANCEL: number;
+    readonly MSGESTURE_FLAG_END: number;
+    readonly MSGESTURE_FLAG_INERTIA: number;
+    readonly MSGESTURE_FLAG_NONE: number;
 }
 
 declare var MSGestureEvent: {
     prototype: MSGestureEvent;
     new(): MSGestureEvent;
-    MSGESTURE_FLAG_BEGIN: number;
-    MSGESTURE_FLAG_CANCEL: number;
-    MSGESTURE_FLAG_END: number;
-    MSGESTURE_FLAG_INERTIA: number;
-    MSGESTURE_FLAG_NONE: number;
+    readonly MSGESTURE_FLAG_BEGIN: number;
+    readonly MSGESTURE_FLAG_CANCEL: number;
+    readonly MSGESTURE_FLAG_END: number;
+    readonly MSGESTURE_FLAG_INERTIA: number;
+    readonly MSGESTURE_FLAG_NONE: number;
 }
 
 interface MSGraphicsTrust {
-    constrictionActive: boolean;
-    status: string;
+    readonly constrictionActive: boolean;
+    readonly status: string;
 }
 
 declare var MSGraphicsTrust: {
@@ -7313,12 +7976,12 @@ declare var MSGraphicsTrust: {
 }
 
 interface MSHTMLWebViewElement extends HTMLElement {
-    canGoBack: boolean;
-    canGoForward: boolean;
-    containsFullScreenElement: boolean;
-    documentTitle: string;
+    readonly canGoBack: boolean;
+    readonly canGoForward: boolean;
+    readonly containsFullScreenElement: boolean;
+    readonly documentTitle: string;
     height: number;
-    settings: MSWebViewSettings;
+    readonly settings: MSWebViewSettings;
     src: string;
     width: number;
     addWebAllowedObject(name: string, applicationObject: any): void;
@@ -7344,12 +8007,12 @@ declare var MSHTMLWebViewElement: {
 }
 
 interface MSInputMethodContext extends EventTarget {
-    compositionEndOffset: number;
-    compositionStartOffset: number;
+    readonly compositionEndOffset: number;
+    readonly compositionStartOffset: number;
     oncandidatewindowhide: (ev: Event) => any;
     oncandidatewindowshow: (ev: Event) => any;
     oncandidatewindowupdate: (ev: Event) => any;
-    target: HTMLElement;
+    readonly target: HTMLElement;
     getCandidateWindowClientRect(): ClientRect;
     getCompositionAlternatives(): string[];
     hasComposition(): boolean;
@@ -7366,59 +8029,59 @@ declare var MSInputMethodContext: {
 }
 
 interface MSManipulationEvent extends UIEvent {
-    currentState: number;
-    inertiaDestinationX: number;
-    inertiaDestinationY: number;
-    lastState: number;
+    readonly currentState: number;
+    readonly inertiaDestinationX: number;
+    readonly inertiaDestinationY: number;
+    readonly lastState: number;
     initMSManipulationEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, lastState: number, currentState: number): void;
-    MS_MANIPULATION_STATE_ACTIVE: number;
-    MS_MANIPULATION_STATE_CANCELLED: number;
-    MS_MANIPULATION_STATE_COMMITTED: number;
-    MS_MANIPULATION_STATE_DRAGGING: number;
-    MS_MANIPULATION_STATE_INERTIA: number;
-    MS_MANIPULATION_STATE_PRESELECT: number;
-    MS_MANIPULATION_STATE_SELECTING: number;
-    MS_MANIPULATION_STATE_STOPPED: number;
+    readonly MS_MANIPULATION_STATE_ACTIVE: number;
+    readonly MS_MANIPULATION_STATE_CANCELLED: number;
+    readonly MS_MANIPULATION_STATE_COMMITTED: number;
+    readonly MS_MANIPULATION_STATE_DRAGGING: number;
+    readonly MS_MANIPULATION_STATE_INERTIA: number;
+    readonly MS_MANIPULATION_STATE_PRESELECT: number;
+    readonly MS_MANIPULATION_STATE_SELECTING: number;
+    readonly MS_MANIPULATION_STATE_STOPPED: number;
 }
 
 declare var MSManipulationEvent: {
     prototype: MSManipulationEvent;
     new(): MSManipulationEvent;
-    MS_MANIPULATION_STATE_ACTIVE: number;
-    MS_MANIPULATION_STATE_CANCELLED: number;
-    MS_MANIPULATION_STATE_COMMITTED: number;
-    MS_MANIPULATION_STATE_DRAGGING: number;
-    MS_MANIPULATION_STATE_INERTIA: number;
-    MS_MANIPULATION_STATE_PRESELECT: number;
-    MS_MANIPULATION_STATE_SELECTING: number;
-    MS_MANIPULATION_STATE_STOPPED: number;
+    readonly MS_MANIPULATION_STATE_ACTIVE: number;
+    readonly MS_MANIPULATION_STATE_CANCELLED: number;
+    readonly MS_MANIPULATION_STATE_COMMITTED: number;
+    readonly MS_MANIPULATION_STATE_DRAGGING: number;
+    readonly MS_MANIPULATION_STATE_INERTIA: number;
+    readonly MS_MANIPULATION_STATE_PRESELECT: number;
+    readonly MS_MANIPULATION_STATE_SELECTING: number;
+    readonly MS_MANIPULATION_STATE_STOPPED: number;
 }
 
 interface MSMediaKeyError {
-    code: number;
-    systemCode: number;
-    MS_MEDIA_KEYERR_CLIENT: number;
-    MS_MEDIA_KEYERR_DOMAIN: number;
-    MS_MEDIA_KEYERR_HARDWARECHANGE: number;
-    MS_MEDIA_KEYERR_OUTPUT: number;
-    MS_MEDIA_KEYERR_SERVICE: number;
-    MS_MEDIA_KEYERR_UNKNOWN: number;
+    readonly code: number;
+    readonly systemCode: number;
+    readonly MS_MEDIA_KEYERR_CLIENT: number;
+    readonly MS_MEDIA_KEYERR_DOMAIN: number;
+    readonly MS_MEDIA_KEYERR_HARDWARECHANGE: number;
+    readonly MS_MEDIA_KEYERR_OUTPUT: number;
+    readonly MS_MEDIA_KEYERR_SERVICE: number;
+    readonly MS_MEDIA_KEYERR_UNKNOWN: number;
 }
 
 declare var MSMediaKeyError: {
     prototype: MSMediaKeyError;
     new(): MSMediaKeyError;
-    MS_MEDIA_KEYERR_CLIENT: number;
-    MS_MEDIA_KEYERR_DOMAIN: number;
-    MS_MEDIA_KEYERR_HARDWARECHANGE: number;
-    MS_MEDIA_KEYERR_OUTPUT: number;
-    MS_MEDIA_KEYERR_SERVICE: number;
-    MS_MEDIA_KEYERR_UNKNOWN: number;
+    readonly MS_MEDIA_KEYERR_CLIENT: number;
+    readonly MS_MEDIA_KEYERR_DOMAIN: number;
+    readonly MS_MEDIA_KEYERR_HARDWARECHANGE: number;
+    readonly MS_MEDIA_KEYERR_OUTPUT: number;
+    readonly MS_MEDIA_KEYERR_SERVICE: number;
+    readonly MS_MEDIA_KEYERR_UNKNOWN: number;
 }
 
 interface MSMediaKeyMessageEvent extends Event {
-    destinationURL: string;
-    message: Uint8Array;
+    readonly destinationURL: string;
+    readonly message: Uint8Array;
 }
 
 declare var MSMediaKeyMessageEvent: {
@@ -7427,7 +8090,7 @@ declare var MSMediaKeyMessageEvent: {
 }
 
 interface MSMediaKeyNeededEvent extends Event {
-    initData: Uint8Array;
+    readonly initData: Uint8Array;
 }
 
 declare var MSMediaKeyNeededEvent: {
@@ -7436,9 +8099,9 @@ declare var MSMediaKeyNeededEvent: {
 }
 
 interface MSMediaKeySession extends EventTarget {
-    error: MSMediaKeyError;
-    keySystem: string;
-    sessionId: string;
+    readonly error: MSMediaKeyError;
+    readonly keySystem: string;
+    readonly sessionId: string;
     close(): void;
     update(key: Uint8Array): void;
 }
@@ -7449,7 +8112,7 @@ declare var MSMediaKeySession: {
 }
 
 interface MSMediaKeys {
-    keySystem: string;
+    readonly keySystem: string;
     createSession(type: string, initData: Uint8Array, cdmData?: Uint8Array): MSMediaKeySession;
 }
 
@@ -7457,40 +8120,22 @@ declare var MSMediaKeys: {
     prototype: MSMediaKeys;
     new(keySystem: string): MSMediaKeys;
     isTypeSupported(keySystem: string, type?: string): boolean;
-}
-
-interface MSMimeTypesCollection {
-    length: number;
-}
-
-declare var MSMimeTypesCollection: {
-    prototype: MSMimeTypesCollection;
-    new(): MSMimeTypesCollection;
-}
-
-interface MSPluginsCollection {
-    length: number;
-    refresh(reload?: boolean): void;
-}
-
-declare var MSPluginsCollection: {
-    prototype: MSPluginsCollection;
-    new(): MSPluginsCollection;
+    isTypeSupportedWithFeatures(keySystem: string, type?: string): string;
 }
 
 interface MSPointerEvent extends MouseEvent {
-    currentPoint: any;
-    height: number;
-    hwTimestamp: number;
-    intermediatePoints: any;
-    isPrimary: boolean;
-    pointerId: number;
-    pointerType: any;
-    pressure: number;
-    rotation: number;
-    tiltX: number;
-    tiltY: number;
-    width: number;
+    readonly currentPoint: any;
+    readonly height: number;
+    readonly hwTimestamp: number;
+    readonly intermediatePoints: any;
+    readonly isPrimary: boolean;
+    readonly pointerId: number;
+    readonly pointerType: any;
+    readonly pressure: number;
+    readonly rotation: number;
+    readonly tiltX: number;
+    readonly tiltY: number;
+    readonly width: number;
     getCurrentPoint(element: Element): void;
     getIntermediatePoints(element: Element): void;
     initPointerEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget, offsetXArg: number, offsetYArg: number, widthArg: number, heightArg: number, pressure: number, rotation: number, tiltX: number, tiltY: number, pointerIdArg: number, pointerType: any, hwTimestampArg: number, isPrimary: boolean): void;
@@ -7502,7 +8147,7 @@ declare var MSPointerEvent: {
 }
 
 interface MSRangeCollection {
-    length: number;
+    readonly length: number;
     item(index: number): Range;
     [index: number]: Range;
 }
@@ -7513,8 +8158,8 @@ declare var MSRangeCollection: {
 }
 
 interface MSSiteModeEvent extends Event {
-    actionURL: string;
-    buttonID: number;
+    readonly actionURL: string;
+    readonly buttonID: number;
 }
 
 declare var MSSiteModeEvent: {
@@ -7523,7 +8168,7 @@ declare var MSSiteModeEvent: {
 }
 
 interface MSStream {
-    type: string;
+    readonly type: string;
     msClose(): void;
     msDetachStream(): any;
 }
@@ -7534,7 +8179,7 @@ declare var MSStream: {
 }
 
 interface MSStreamReader extends EventTarget, MSBaseReader {
-    error: DOMError;
+    readonly error: DOMError;
     readAsArrayBuffer(stream: MSStream, size?: number): void;
     readAsBinaryString(stream: MSStream, size?: number): void;
     readAsBlob(stream: MSStream, size?: number): void;
@@ -7549,20 +8194,20 @@ declare var MSStreamReader: {
 }
 
 interface MSWebViewAsyncOperation extends EventTarget {
-    error: DOMError;
+    readonly error: DOMError;
     oncomplete: (ev: Event) => any;
     onerror: (ev: Event) => any;
-    readyState: number;
-    result: any;
-    target: MSHTMLWebViewElement;
-    type: number;
+    readonly readyState: number;
+    readonly result: any;
+    readonly target: MSHTMLWebViewElement;
+    readonly type: number;
     start(): void;
-    COMPLETED: number;
-    ERROR: number;
-    STARTED: number;
-    TYPE_CAPTURE_PREVIEW_TO_RANDOM_ACCESS_STREAM: number;
-    TYPE_CREATE_DATA_PACKAGE_FROM_SELECTION: number;
-    TYPE_INVOKE_SCRIPT: number;
+    readonly COMPLETED: number;
+    readonly ERROR: number;
+    readonly STARTED: number;
+    readonly TYPE_CAPTURE_PREVIEW_TO_RANDOM_ACCESS_STREAM: number;
+    readonly TYPE_CREATE_DATA_PACKAGE_FROM_SELECTION: number;
+    readonly TYPE_INVOKE_SCRIPT: number;
     addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -7571,12 +8216,12 @@ interface MSWebViewAsyncOperation extends EventTarget {
 declare var MSWebViewAsyncOperation: {
     prototype: MSWebViewAsyncOperation;
     new(): MSWebViewAsyncOperation;
-    COMPLETED: number;
-    ERROR: number;
-    STARTED: number;
-    TYPE_CAPTURE_PREVIEW_TO_RANDOM_ACCESS_STREAM: number;
-    TYPE_CREATE_DATA_PACKAGE_FROM_SELECTION: number;
-    TYPE_INVOKE_SCRIPT: number;
+    readonly COMPLETED: number;
+    readonly ERROR: number;
+    readonly STARTED: number;
+    readonly TYPE_CAPTURE_PREVIEW_TO_RANDOM_ACCESS_STREAM: number;
+    readonly TYPE_CREATE_DATA_PACKAGE_FROM_SELECTION: number;
+    readonly TYPE_INVOKE_SCRIPT: number;
 }
 
 interface MSWebViewSettings {
@@ -7589,6 +8234,32 @@ declare var MSWebViewSettings: {
     new(): MSWebViewSettings;
 }
 
+interface MediaDeviceInfo {
+    readonly deviceId: string;
+    readonly groupId: string;
+    readonly kind: string;
+    readonly label: string;
+}
+
+declare var MediaDeviceInfo: {
+    prototype: MediaDeviceInfo;
+    new(): MediaDeviceInfo;
+}
+
+interface MediaDevices extends EventTarget {
+    ondevicechange: (ev: Event) => any;
+    enumerateDevices(): any;
+    getSupportedConstraints(): MediaTrackSupportedConstraints;
+    getUserMedia(constraints: MediaStreamConstraints): PromiseLike<MediaStream>;
+    addEventListener(type: "devicechange", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var MediaDevices: {
+    prototype: MediaDevices;
+    new(): MediaDevices;
+}
+
 interface MediaElementAudioSourceNode extends AudioNode {
 }
 
@@ -7597,28 +8268,98 @@ declare var MediaElementAudioSourceNode: {
     new(): MediaElementAudioSourceNode;
 }
 
+interface MediaEncryptedEvent extends Event {
+    readonly initData: ArrayBuffer;
+    readonly initDataType: string;
+}
+
+declare var MediaEncryptedEvent: {
+    prototype: MediaEncryptedEvent;
+    new(type: string, eventInitDict?: MediaEncryptedEventInit): MediaEncryptedEvent;
+}
+
 interface MediaError {
-    code: number;
-    msExtendedCode: number;
-    MEDIA_ERR_ABORTED: number;
-    MEDIA_ERR_DECODE: number;
-    MEDIA_ERR_NETWORK: number;
-    MEDIA_ERR_SRC_NOT_SUPPORTED: number;
-    MS_MEDIA_ERR_ENCRYPTED: number;
+    readonly code: number;
+    readonly msExtendedCode: number;
+    readonly MEDIA_ERR_ABORTED: number;
+    readonly MEDIA_ERR_DECODE: number;
+    readonly MEDIA_ERR_NETWORK: number;
+    readonly MEDIA_ERR_SRC_NOT_SUPPORTED: number;
+    readonly MS_MEDIA_ERR_ENCRYPTED: number;
 }
 
 declare var MediaError: {
     prototype: MediaError;
     new(): MediaError;
-    MEDIA_ERR_ABORTED: number;
-    MEDIA_ERR_DECODE: number;
-    MEDIA_ERR_NETWORK: number;
-    MEDIA_ERR_SRC_NOT_SUPPORTED: number;
-    MS_MEDIA_ERR_ENCRYPTED: number;
+    readonly MEDIA_ERR_ABORTED: number;
+    readonly MEDIA_ERR_DECODE: number;
+    readonly MEDIA_ERR_NETWORK: number;
+    readonly MEDIA_ERR_SRC_NOT_SUPPORTED: number;
+    readonly MS_MEDIA_ERR_ENCRYPTED: number;
+}
+
+interface MediaKeyMessageEvent extends Event {
+    readonly message: ArrayBuffer;
+    readonly messageType: string;
+}
+
+declare var MediaKeyMessageEvent: {
+    prototype: MediaKeyMessageEvent;
+    new(type: string, eventInitDict?: MediaKeyMessageEventInit): MediaKeyMessageEvent;
+}
+
+interface MediaKeySession extends EventTarget {
+    readonly closed: PromiseLike<void>;
+    readonly expiration: number;
+    readonly keyStatuses: MediaKeyStatusMap;
+    readonly sessionId: string;
+    close(): PromiseLike<void>;
+    generateRequest(initDataType: string, initData: any): PromiseLike<void>;
+    load(sessionId: string): PromiseLike<boolean>;
+    remove(): PromiseLike<void>;
+    update(response: any): PromiseLike<void>;
+}
+
+declare var MediaKeySession: {
+    prototype: MediaKeySession;
+    new(): MediaKeySession;
+}
+
+interface MediaKeyStatusMap {
+    readonly size: number;
+    forEach(callback: ForEachCallback): void;
+    get(keyId: any): string;
+    has(keyId: any): boolean;
+}
+
+declare var MediaKeyStatusMap: {
+    prototype: MediaKeyStatusMap;
+    new(): MediaKeyStatusMap;
+}
+
+interface MediaKeySystemAccess {
+    readonly keySystem: string;
+    createMediaKeys(): PromiseLike<MediaKeys>;
+    getConfiguration(): MediaKeySystemConfiguration;
+}
+
+declare var MediaKeySystemAccess: {
+    prototype: MediaKeySystemAccess;
+    new(): MediaKeySystemAccess;
+}
+
+interface MediaKeys {
+    createSession(sessionType?: string): MediaKeySession;
+    setServerCertificate(serverCertificate: any): PromiseLike<void>;
+}
+
+declare var MediaKeys: {
+    prototype: MediaKeys;
+    new(): MediaKeys;
 }
 
 interface MediaList {
-    length: number;
+    readonly length: number;
     mediaText: string;
     appendMedium(newMedium: string): void;
     deleteMedium(oldMedium: string): void;
@@ -7633,8 +8374,8 @@ declare var MediaList: {
 }
 
 interface MediaQueryList {
-    matches: boolean;
-    media: string;
+    readonly matches: boolean;
+    readonly media: string;
     addListener(listener: MediaQueryListListener): void;
     removeListener(listener: MediaQueryListListener): void;
 }
@@ -7645,10 +8386,10 @@ declare var MediaQueryList: {
 }
 
 interface MediaSource extends EventTarget {
-    activeSourceBuffers: SourceBufferList;
+    readonly activeSourceBuffers: SourceBufferList;
     duration: number;
-    readyState: string;
-    sourceBuffers: SourceBufferList;
+    readonly readyState: string;
+    readonly sourceBuffers: SourceBufferList;
     addSourceBuffer(type: string): SourceBuffer;
     endOfStream(error?: number): void;
     removeSourceBuffer(sourceBuffer: SourceBuffer): void;
@@ -7660,9 +8401,104 @@ declare var MediaSource: {
     isTypeSupported(type: string): boolean;
 }
 
+interface MediaStream extends EventTarget {
+    readonly active: boolean;
+    readonly id: string;
+    onactive: (ev: Event) => any;
+    onaddtrack: (ev: TrackEvent) => any;
+    oninactive: (ev: Event) => any;
+    onremovetrack: (ev: TrackEvent) => any;
+    addTrack(track: MediaStreamTrack): void;
+    clone(): MediaStream;
+    getAudioTracks(): MediaStreamTrack[];
+    getTrackById(trackId: string): MediaStreamTrack;
+    getTracks(): MediaStreamTrack[];
+    getVideoTracks(): MediaStreamTrack[];
+    removeTrack(track: MediaStreamTrack): void;
+    stop(): void;
+    addEventListener(type: "active", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "addtrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "inactive", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "removetrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var MediaStream: {
+    prototype: MediaStream;
+    new(streamOrTracks?: MediaStream | MediaStreamTrack[]): MediaStream;
+}
+
+interface MediaStreamAudioSourceNode extends AudioNode {
+}
+
+declare var MediaStreamAudioSourceNode: {
+    prototype: MediaStreamAudioSourceNode;
+    new(): MediaStreamAudioSourceNode;
+}
+
+interface MediaStreamError {
+    readonly constraintName: string;
+    readonly message: string;
+    readonly name: string;
+}
+
+declare var MediaStreamError: {
+    prototype: MediaStreamError;
+    new(): MediaStreamError;
+}
+
+interface MediaStreamErrorEvent extends Event {
+    readonly error: MediaStreamError;
+}
+
+declare var MediaStreamErrorEvent: {
+    prototype: MediaStreamErrorEvent;
+    new(type: string, eventInitDict?: MediaStreamErrorEventInit): MediaStreamErrorEvent;
+}
+
+interface MediaStreamTrack extends EventTarget {
+    enabled: boolean;
+    readonly id: string;
+    readonly kind: string;
+    readonly label: string;
+    readonly muted: boolean;
+    onended: (ev: MediaStreamErrorEvent) => any;
+    onmute: (ev: Event) => any;
+    onoverconstrained: (ev: MediaStreamErrorEvent) => any;
+    onunmute: (ev: Event) => any;
+    readonly readonly: boolean;
+    readonly readyState: string;
+    readonly remote: boolean;
+    applyConstraints(constraints: MediaTrackConstraints): PromiseLike<void>;
+    clone(): MediaStreamTrack;
+    getCapabilities(): MediaTrackCapabilities;
+    getConstraints(): MediaTrackConstraints;
+    getSettings(): MediaTrackSettings;
+    stop(): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mute", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "overconstrained", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "unmute", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var MediaStreamTrack: {
+    prototype: MediaStreamTrack;
+    new(): MediaStreamTrack;
+}
+
+interface MediaStreamTrackEvent extends Event {
+    readonly track: MediaStreamTrack;
+}
+
+declare var MediaStreamTrackEvent: {
+    prototype: MediaStreamTrackEvent;
+    new(type: string, eventInitDict?: MediaStreamTrackEventInit): MediaStreamTrackEvent;
+}
+
 interface MessageChannel {
-    port1: MessagePort;
-    port2: MessagePort;
+    readonly port1: MessagePort;
+    readonly port2: MessagePort;
 }
 
 declare var MessageChannel: {
@@ -7671,10 +8507,10 @@ declare var MessageChannel: {
 }
 
 interface MessageEvent extends Event {
-    data: any;
-    origin: string;
-    ports: any;
-    source: Window;
+    readonly data: any;
+    readonly origin: string;
+    readonly ports: any;
+    readonly source: Window;
     initMessageEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, dataArg: any, originArg: string, lastEventIdArg: string, sourceArg: Window): void;
 }
 
@@ -7698,10 +8534,10 @@ declare var MessagePort: {
 }
 
 interface MimeType {
-    description: string;
-    enabledPlugin: Plugin;
-    suffixes: string;
-    type: string;
+    readonly description: string;
+    readonly enabledPlugin: Plugin;
+    readonly suffixes: string;
+    readonly type: string;
 }
 
 declare var MimeType: {
@@ -7710,7 +8546,7 @@ declare var MimeType: {
 }
 
 interface MimeTypeArray {
-    length: number;
+    readonly length: number;
     item(index: number): Plugin;
     namedItem(type: string): Plugin;
     [index: number]: Plugin;
@@ -7722,30 +8558,30 @@ declare var MimeTypeArray: {
 }
 
 interface MouseEvent extends UIEvent {
-    altKey: boolean;
-    button: number;
-    buttons: number;
-    clientX: number;
-    clientY: number;
-    ctrlKey: boolean;
-    fromElement: Element;
-    layerX: number;
-    layerY: number;
-    metaKey: boolean;
-    movementX: number;
-    movementY: number;
-    offsetX: number;
-    offsetY: number;
-    pageX: number;
-    pageY: number;
-    relatedTarget: EventTarget;
-    screenX: number;
-    screenY: number;
-    shiftKey: boolean;
-    toElement: Element;
-    which: number;
-    x: number;
-    y: number;
+    readonly altKey: boolean;
+    readonly button: number;
+    readonly buttons: number;
+    readonly clientX: number;
+    readonly clientY: number;
+    readonly ctrlKey: boolean;
+    readonly fromElement: Element;
+    readonly layerX: number;
+    readonly layerY: number;
+    readonly metaKey: boolean;
+    readonly movementX: number;
+    readonly movementY: number;
+    readonly offsetX: number;
+    readonly offsetY: number;
+    readonly pageX: number;
+    readonly pageY: number;
+    readonly relatedTarget: EventTarget;
+    readonly screenX: number;
+    readonly screenY: number;
+    readonly shiftKey: boolean;
+    readonly toElement: Element;
+    readonly which: number;
+    readonly x: number;
+    readonly y: number;
     getModifierState(keyArg: string): boolean;
     initMouseEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget): void;
 }
@@ -7755,36 +8591,24 @@ declare var MouseEvent: {
     new(typeArg: string, eventInitDict?: MouseEventInit): MouseEvent;
 }
 
-interface MouseWheelEvent extends MouseEvent {
-    wheelDelta: number;
-    wheelDeltaX: number;
-    wheelDeltaY: number;
-    initMouseWheelEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, buttonArg: number, relatedTargetArg: EventTarget, modifiersListArg: string, wheelDeltaArg: number): void;
-}
-
-declare var MouseWheelEvent: {
-    prototype: MouseWheelEvent;
-    new(): MouseWheelEvent;
-}
-
 interface MutationEvent extends Event {
-    attrChange: number;
-    attrName: string;
-    newValue: string;
-    prevValue: string;
-    relatedNode: Node;
+    readonly attrChange: number;
+    readonly attrName: string;
+    readonly newValue: string;
+    readonly prevValue: string;
+    readonly relatedNode: Node;
     initMutationEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, relatedNodeArg: Node, prevValueArg: string, newValueArg: string, attrNameArg: string, attrChangeArg: number): void;
-    ADDITION: number;
-    MODIFICATION: number;
-    REMOVAL: number;
+    readonly ADDITION: number;
+    readonly MODIFICATION: number;
+    readonly REMOVAL: number;
 }
 
 declare var MutationEvent: {
     prototype: MutationEvent;
     new(): MutationEvent;
-    ADDITION: number;
-    MODIFICATION: number;
-    REMOVAL: number;
+    readonly ADDITION: number;
+    readonly MODIFICATION: number;
+    readonly REMOVAL: number;
 }
 
 interface MutationObserver {
@@ -7799,15 +8623,15 @@ declare var MutationObserver: {
 }
 
 interface MutationRecord {
-    addedNodes: NodeList;
-    attributeName: string;
-    attributeNamespace: string;
-    nextSibling: Node;
-    oldValue: string;
-    previousSibling: Node;
-    removedNodes: NodeList;
-    target: Node;
-    type: string;
+    readonly addedNodes: NodeList;
+    readonly attributeName: string;
+    readonly attributeNamespace: string;
+    readonly nextSibling: Node;
+    readonly oldValue: string;
+    readonly previousSibling: Node;
+    readonly removedNodes: NodeList;
+    readonly target: Node;
+    readonly type: string;
 }
 
 declare var MutationRecord: {
@@ -7816,7 +8640,7 @@ declare var MutationRecord: {
 }
 
 interface NamedNodeMap {
-    length: number;
+    readonly length: number;
     getNamedItem(name: string): Attr;
     getNamedItemNS(namespaceURI: string, localName: string): Attr;
     item(index: number): Attr;
@@ -7833,8 +8657,8 @@ declare var NamedNodeMap: {
 }
 
 interface NavigationCompletedEvent extends NavigationEvent {
-    isSuccess: boolean;
-    webErrorStatus: number;
+    readonly isSuccess: boolean;
+    readonly webErrorStatus: number;
 }
 
 declare var NavigationCompletedEvent: {
@@ -7843,7 +8667,7 @@ declare var NavigationCompletedEvent: {
 }
 
 interface NavigationEvent extends Event {
-    uri: string;
+    readonly uri: string;
 }
 
 declare var NavigationEvent: {
@@ -7852,7 +8676,7 @@ declare var NavigationEvent: {
 }
 
 interface NavigationEventWithReferrer extends NavigationEvent {
-    referer: string;
+    readonly referer: string;
 }
 
 declare var NavigationEventWithReferrer: {
@@ -7860,27 +8684,22 @@ declare var NavigationEventWithReferrer: {
     new(): NavigationEventWithReferrer;
 }
 
-interface Navigator extends Object, NavigatorID, NavigatorOnLine, NavigatorContentUtils, NavigatorStorageUtils, NavigatorGeolocation, MSNavigatorDoNotTrack, MSFileSaver {
-    appCodeName: string;
-    appMinorVersion: string;
-    browserLanguage: string;
-    connectionSpeed: number;
-    cookieEnabled: boolean;
-    cpuClass: string;
-    language: string;
-    maxTouchPoints: number;
-    mimeTypes: MSMimeTypesCollection;
-    msManipulationViewsEnabled: boolean;
-    msMaxTouchPoints: number;
-    msPointerEnabled: boolean;
-    plugins: MSPluginsCollection;
-    pointerEnabled: boolean;
-    systemLanguage: string;
-    userLanguage: string;
-    webdriver: boolean;
+interface Navigator extends Object, NavigatorID, NavigatorOnLine, NavigatorContentUtils, NavigatorStorageUtils, NavigatorGeolocation, MSNavigatorDoNotTrack, MSFileSaver, NavigatorUserMedia {
+    readonly appCodeName: string;
+    readonly cookieEnabled: boolean;
+    readonly language: string;
+    readonly maxTouchPoints: number;
+    readonly mimeTypes: MimeTypeArray;
+    readonly msManipulationViewsEnabled: boolean;
+    readonly msMaxTouchPoints: number;
+    readonly msPointerEnabled: boolean;
+    readonly plugins: PluginArray;
+    readonly pointerEnabled: boolean;
+    readonly webdriver: boolean;
     getGamepads(): Gamepad[];
     javaEnabled(): boolean;
     msLaunchUri(uri: string, successCallback?: MSLaunchUriCallback, noHandlerCallback?: MSLaunchUriCallback): void;
+    requestMediaKeySystemAccess(keySystem: string, supportedConfigurations: MediaKeySystemConfiguration[]): PromiseLike<MediaKeySystemAccess>;
     vibrate(pattern: number | number[]): boolean;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
@@ -7891,26 +8710,26 @@ declare var Navigator: {
 }
 
 interface Node extends EventTarget {
-    attributes: NamedNodeMap;
-    baseURI: string;
-    childNodes: NodeList;
-    firstChild: Node;
-    lastChild: Node;
-    localName: string;
-    namespaceURI: string;
-    nextSibling: Node;
-    nodeName: string;
-    nodeType: number;
+    readonly attributes: NamedNodeMap;
+    readonly baseURI: string;
+    readonly childNodes: NodeList;
+    readonly firstChild: Node;
+    readonly lastChild: Node;
+    readonly localName: string;
+    readonly namespaceURI: string;
+    readonly nextSibling: Node;
+    readonly nodeName: string;
+    readonly nodeType: number;
     nodeValue: string;
-    ownerDocument: Document;
-    parentElement: HTMLElement;
-    parentNode: Node;
-    prefix: string;
-    previousSibling: Node;
+    readonly ownerDocument: Document;
+    readonly parentElement: HTMLElement;
+    readonly parentNode: Node;
+    readonly previousSibling: Node;
     textContent: string;
     appendChild(newChild: Node): Node;
     cloneNode(deep?: boolean): Node;
     compareDocumentPosition(other: Node): number;
+    contains(child: Node): boolean;
     hasAttributes(): boolean;
     hasChildNodes(): boolean;
     insertBefore(newChild: Node, refChild?: Node): Node;
@@ -7923,47 +8742,47 @@ interface Node extends EventTarget {
     removeChild(oldChild: Node): Node;
     replaceChild(newChild: Node, oldChild: Node): Node;
     contains(node: Node): boolean;
-    ATTRIBUTE_NODE: number;
-    CDATA_SECTION_NODE: number;
-    COMMENT_NODE: number;
-    DOCUMENT_FRAGMENT_NODE: number;
-    DOCUMENT_NODE: number;
-    DOCUMENT_POSITION_CONTAINED_BY: number;
-    DOCUMENT_POSITION_CONTAINS: number;
-    DOCUMENT_POSITION_DISCONNECTED: number;
-    DOCUMENT_POSITION_FOLLOWING: number;
-    DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number;
-    DOCUMENT_POSITION_PRECEDING: number;
-    DOCUMENT_TYPE_NODE: number;
-    ELEMENT_NODE: number;
-    ENTITY_NODE: number;
-    ENTITY_REFERENCE_NODE: number;
-    NOTATION_NODE: number;
-    PROCESSING_INSTRUCTION_NODE: number;
-    TEXT_NODE: number;
+    readonly ATTRIBUTE_NODE: number;
+    readonly CDATA_SECTION_NODE: number;
+    readonly COMMENT_NODE: number;
+    readonly DOCUMENT_FRAGMENT_NODE: number;
+    readonly DOCUMENT_NODE: number;
+    readonly DOCUMENT_POSITION_CONTAINED_BY: number;
+    readonly DOCUMENT_POSITION_CONTAINS: number;
+    readonly DOCUMENT_POSITION_DISCONNECTED: number;
+    readonly DOCUMENT_POSITION_FOLLOWING: number;
+    readonly DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number;
+    readonly DOCUMENT_POSITION_PRECEDING: number;
+    readonly DOCUMENT_TYPE_NODE: number;
+    readonly ELEMENT_NODE: number;
+    readonly ENTITY_NODE: number;
+    readonly ENTITY_REFERENCE_NODE: number;
+    readonly NOTATION_NODE: number;
+    readonly PROCESSING_INSTRUCTION_NODE: number;
+    readonly TEXT_NODE: number;
 }
 
 declare var Node: {
     prototype: Node;
     new(): Node;
-    ATTRIBUTE_NODE: number;
-    CDATA_SECTION_NODE: number;
-    COMMENT_NODE: number;
-    DOCUMENT_FRAGMENT_NODE: number;
-    DOCUMENT_NODE: number;
-    DOCUMENT_POSITION_CONTAINED_BY: number;
-    DOCUMENT_POSITION_CONTAINS: number;
-    DOCUMENT_POSITION_DISCONNECTED: number;
-    DOCUMENT_POSITION_FOLLOWING: number;
-    DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number;
-    DOCUMENT_POSITION_PRECEDING: number;
-    DOCUMENT_TYPE_NODE: number;
-    ELEMENT_NODE: number;
-    ENTITY_NODE: number;
-    ENTITY_REFERENCE_NODE: number;
-    NOTATION_NODE: number;
-    PROCESSING_INSTRUCTION_NODE: number;
-    TEXT_NODE: number;
+    readonly ATTRIBUTE_NODE: number;
+    readonly CDATA_SECTION_NODE: number;
+    readonly COMMENT_NODE: number;
+    readonly DOCUMENT_FRAGMENT_NODE: number;
+    readonly DOCUMENT_NODE: number;
+    readonly DOCUMENT_POSITION_CONTAINED_BY: number;
+    readonly DOCUMENT_POSITION_CONTAINS: number;
+    readonly DOCUMENT_POSITION_DISCONNECTED: number;
+    readonly DOCUMENT_POSITION_FOLLOWING: number;
+    readonly DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number;
+    readonly DOCUMENT_POSITION_PRECEDING: number;
+    readonly DOCUMENT_TYPE_NODE: number;
+    readonly ELEMENT_NODE: number;
+    readonly ENTITY_NODE: number;
+    readonly ENTITY_REFERENCE_NODE: number;
+    readonly NOTATION_NODE: number;
+    readonly PROCESSING_INSTRUCTION_NODE: number;
+    readonly TEXT_NODE: number;
 }
 
 interface NodeFilter {
@@ -7971,29 +8790,29 @@ interface NodeFilter {
 }
 
 declare var NodeFilter: {
-    FILTER_ACCEPT: number;
-    FILTER_REJECT: number;
-    FILTER_SKIP: number;
-    SHOW_ALL: number;
-    SHOW_ATTRIBUTE: number;
-    SHOW_CDATA_SECTION: number;
-    SHOW_COMMENT: number;
-    SHOW_DOCUMENT: number;
-    SHOW_DOCUMENT_FRAGMENT: number;
-    SHOW_DOCUMENT_TYPE: number;
-    SHOW_ELEMENT: number;
-    SHOW_ENTITY: number;
-    SHOW_ENTITY_REFERENCE: number;
-    SHOW_NOTATION: number;
-    SHOW_PROCESSING_INSTRUCTION: number;
-    SHOW_TEXT: number;
+    readonly FILTER_ACCEPT: number;
+    readonly FILTER_REJECT: number;
+    readonly FILTER_SKIP: number;
+    readonly SHOW_ALL: number;
+    readonly SHOW_ATTRIBUTE: number;
+    readonly SHOW_CDATA_SECTION: number;
+    readonly SHOW_COMMENT: number;
+    readonly SHOW_DOCUMENT: number;
+    readonly SHOW_DOCUMENT_FRAGMENT: number;
+    readonly SHOW_DOCUMENT_TYPE: number;
+    readonly SHOW_ELEMENT: number;
+    readonly SHOW_ENTITY: number;
+    readonly SHOW_ENTITY_REFERENCE: number;
+    readonly SHOW_NOTATION: number;
+    readonly SHOW_PROCESSING_INSTRUCTION: number;
+    readonly SHOW_TEXT: number;
 }
 
 interface NodeIterator {
-    expandEntityReferences: boolean;
-    filter: NodeFilter;
-    root: Node;
-    whatToShow: number;
+    readonly expandEntityReferences: boolean;
+    readonly filter: NodeFilter;
+    readonly root: Node;
+    readonly whatToShow: number;
     detach(): void;
     nextNode(): Node;
     previousNode(): Node;
@@ -8005,7 +8824,7 @@ declare var NodeIterator: {
 }
 
 interface NodeList {
-    length: number;
+    readonly length: number;
     item(index: number): Node;
     [index: number]: Node;
 }
@@ -8024,13 +8843,13 @@ declare var OES_element_index_uint: {
 }
 
 interface OES_standard_derivatives {
-    FRAGMENT_SHADER_DERIVATIVE_HINT_OES: number;
+    readonly FRAGMENT_SHADER_DERIVATIVE_HINT_OES: number;
 }
 
 declare var OES_standard_derivatives: {
     prototype: OES_standard_derivatives;
     new(): OES_standard_derivatives;
-    FRAGMENT_SHADER_DERIVATIVE_HINT_OES: number;
+    readonly FRAGMENT_SHADER_DERIVATIVE_HINT_OES: number;
 }
 
 interface OES_texture_float {
@@ -8050,7 +8869,7 @@ declare var OES_texture_float_linear: {
 }
 
 interface OfflineAudioCompletionEvent extends Event {
-    renderedBuffer: AudioBuffer;
+    readonly renderedBuffer: AudioBuffer;
 }
 
 declare var OfflineAudioCompletionEvent: {
@@ -8060,7 +8879,7 @@ declare var OfflineAudioCompletionEvent: {
 
 interface OfflineAudioContext extends AudioContext {
     oncomplete: (ev: Event) => any;
-    startRendering(): void;
+    startRendering(): PromiseLike<AudioBuffer>;
     addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
@@ -8071,14 +8890,14 @@ declare var OfflineAudioContext: {
 }
 
 interface OscillatorNode extends AudioNode {
-    detune: AudioParam;
-    frequency: AudioParam;
-    onended: (ev: Event) => any;
+    readonly detune: AudioParam;
+    readonly frequency: AudioParam;
+    onended: (ev: MediaStreamErrorEvent) => any;
     type: string;
     setPeriodicWave(periodicWave: PeriodicWave): void;
     start(when?: number): void;
     stop(when?: number): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8087,8 +8906,25 @@ declare var OscillatorNode: {
     new(): OscillatorNode;
 }
 
+interface OverflowEvent extends UIEvent {
+    readonly horizontalOverflow: boolean;
+    readonly orient: number;
+    readonly verticalOverflow: boolean;
+    readonly BOTH: number;
+    readonly HORIZONTAL: number;
+    readonly VERTICAL: number;
+}
+
+declare var OverflowEvent: {
+    prototype: OverflowEvent;
+    new(): OverflowEvent;
+    readonly BOTH: number;
+    readonly HORIZONTAL: number;
+    readonly VERTICAL: number;
+}
+
 interface PageTransitionEvent extends Event {
-    persisted: boolean;
+    readonly persisted: boolean;
 }
 
 declare var PageTransitionEvent: {
@@ -8116,17 +8952,17 @@ declare var PannerNode: {
 }
 
 interface PerfWidgetExternal {
-    activeNetworkRequestCount: number;
-    averageFrameTime: number;
-    averagePaintTime: number;
-    extraInformationEnabled: boolean;
-    independentRenderingEnabled: boolean;
-    irDisablingContentString: string;
-    irStatusAvailable: boolean;
-    maxCpuSpeed: number;
-    paintRequestsPerSecond: number;
-    performanceCounter: number;
-    performanceCounterFrequency: number;
+    readonly activeNetworkRequestCount: number;
+    readonly averageFrameTime: number;
+    readonly averagePaintTime: number;
+    readonly extraInformationEnabled: boolean;
+    readonly independentRenderingEnabled: boolean;
+    readonly irDisablingContentString: string;
+    readonly irStatusAvailable: boolean;
+    readonly maxCpuSpeed: number;
+    readonly paintRequestsPerSecond: number;
+    readonly performanceCounter: number;
+    readonly performanceCounterFrequency: number;
     addEventListener(eventType: string, callback: Function): void;
     getMemoryUsage(): number;
     getProcessCpuUsage(): number;
@@ -8145,8 +8981,8 @@ declare var PerfWidgetExternal: {
 }
 
 interface Performance {
-    navigation: PerformanceNavigation;
-    timing: PerformanceTiming;
+    readonly navigation: PerformanceNavigation;
+    readonly timing: PerformanceTiming;
     clearMarks(markName?: string): void;
     clearMeasures(measureName?: string): void;
     clearResourceTimings(): void;
@@ -8168,10 +9004,10 @@ declare var Performance: {
 }
 
 interface PerformanceEntry {
-    duration: number;
-    entryType: string;
-    name: string;
-    startTime: number;
+    readonly duration: number;
+    readonly entryType: string;
+    readonly name: string;
+    readonly startTime: number;
 }
 
 declare var PerformanceEntry: {
@@ -8196,47 +9032,47 @@ declare var PerformanceMeasure: {
 }
 
 interface PerformanceNavigation {
-    redirectCount: number;
-    type: number;
+    readonly redirectCount: number;
+    readonly type: number;
     toJSON(): any;
-    TYPE_BACK_FORWARD: number;
-    TYPE_NAVIGATE: number;
-    TYPE_RELOAD: number;
-    TYPE_RESERVED: number;
+    readonly TYPE_BACK_FORWARD: number;
+    readonly TYPE_NAVIGATE: number;
+    readonly TYPE_RELOAD: number;
+    readonly TYPE_RESERVED: number;
 }
 
 declare var PerformanceNavigation: {
     prototype: PerformanceNavigation;
     new(): PerformanceNavigation;
-    TYPE_BACK_FORWARD: number;
-    TYPE_NAVIGATE: number;
-    TYPE_RELOAD: number;
-    TYPE_RESERVED: number;
+    readonly TYPE_BACK_FORWARD: number;
+    readonly TYPE_NAVIGATE: number;
+    readonly TYPE_RELOAD: number;
+    readonly TYPE_RESERVED: number;
 }
 
 interface PerformanceNavigationTiming extends PerformanceEntry {
-    connectEnd: number;
-    connectStart: number;
-    domComplete: number;
-    domContentLoadedEventEnd: number;
-    domContentLoadedEventStart: number;
-    domInteractive: number;
-    domLoading: number;
-    domainLookupEnd: number;
-    domainLookupStart: number;
-    fetchStart: number;
-    loadEventEnd: number;
-    loadEventStart: number;
-    navigationStart: number;
-    redirectCount: number;
-    redirectEnd: number;
-    redirectStart: number;
-    requestStart: number;
-    responseEnd: number;
-    responseStart: number;
-    type: string;
-    unloadEventEnd: number;
-    unloadEventStart: number;
+    readonly connectEnd: number;
+    readonly connectStart: number;
+    readonly domComplete: number;
+    readonly domContentLoadedEventEnd: number;
+    readonly domContentLoadedEventStart: number;
+    readonly domInteractive: number;
+    readonly domLoading: number;
+    readonly domainLookupEnd: number;
+    readonly domainLookupStart: number;
+    readonly fetchStart: number;
+    readonly loadEventEnd: number;
+    readonly loadEventStart: number;
+    readonly navigationStart: number;
+    readonly redirectCount: number;
+    readonly redirectEnd: number;
+    readonly redirectStart: number;
+    readonly requestStart: number;
+    readonly responseEnd: number;
+    readonly responseStart: number;
+    readonly type: string;
+    readonly unloadEventEnd: number;
+    readonly unloadEventStart: number;
 }
 
 declare var PerformanceNavigationTiming: {
@@ -8245,17 +9081,17 @@ declare var PerformanceNavigationTiming: {
 }
 
 interface PerformanceResourceTiming extends PerformanceEntry {
-    connectEnd: number;
-    connectStart: number;
-    domainLookupEnd: number;
-    domainLookupStart: number;
-    fetchStart: number;
-    initiatorType: string;
-    redirectEnd: number;
-    redirectStart: number;
-    requestStart: number;
-    responseEnd: number;
-    responseStart: number;
+    readonly connectEnd: number;
+    readonly connectStart: number;
+    readonly domainLookupEnd: number;
+    readonly domainLookupStart: number;
+    readonly fetchStart: number;
+    readonly initiatorType: string;
+    readonly redirectEnd: number;
+    readonly redirectStart: number;
+    readonly requestStart: number;
+    readonly responseEnd: number;
+    readonly responseStart: number;
 }
 
 declare var PerformanceResourceTiming: {
@@ -8264,27 +9100,27 @@ declare var PerformanceResourceTiming: {
 }
 
 interface PerformanceTiming {
-    connectEnd: number;
-    connectStart: number;
-    domComplete: number;
-    domContentLoadedEventEnd: number;
-    domContentLoadedEventStart: number;
-    domInteractive: number;
-    domLoading: number;
-    domainLookupEnd: number;
-    domainLookupStart: number;
-    fetchStart: number;
-    loadEventEnd: number;
-    loadEventStart: number;
-    msFirstPaint: number;
-    navigationStart: number;
-    redirectEnd: number;
-    redirectStart: number;
-    requestStart: number;
-    responseEnd: number;
-    responseStart: number;
-    unloadEventEnd: number;
-    unloadEventStart: number;
+    readonly connectEnd: number;
+    readonly connectStart: number;
+    readonly domComplete: number;
+    readonly domContentLoadedEventEnd: number;
+    readonly domContentLoadedEventStart: number;
+    readonly domInteractive: number;
+    readonly domLoading: number;
+    readonly domainLookupEnd: number;
+    readonly domainLookupStart: number;
+    readonly fetchStart: number;
+    readonly loadEventEnd: number;
+    readonly loadEventStart: number;
+    readonly msFirstPaint: number;
+    readonly navigationStart: number;
+    readonly redirectEnd: number;
+    readonly redirectStart: number;
+    readonly requestStart: number;
+    readonly responseEnd: number;
+    readonly responseStart: number;
+    readonly unloadEventEnd: number;
+    readonly unloadEventStart: number;
     toJSON(): any;
 }
 
@@ -8302,7 +9138,7 @@ declare var PeriodicWave: {
 }
 
 interface PermissionRequest extends DeferredPermissionRequest {
-    state: string;
+    readonly state: string;
     defer(): void;
 }
 
@@ -8312,7 +9148,7 @@ declare var PermissionRequest: {
 }
 
 interface PermissionRequestedEvent extends Event {
-    permissionRequest: PermissionRequest;
+    readonly permissionRequest: PermissionRequest;
 }
 
 declare var PermissionRequestedEvent: {
@@ -8321,11 +9157,11 @@ declare var PermissionRequestedEvent: {
 }
 
 interface Plugin {
-    description: string;
-    filename: string;
-    length: number;
-    name: string;
-    version: string;
+    readonly description: string;
+    readonly filename: string;
+    readonly length: number;
+    readonly name: string;
+    readonly version: string;
     item(index: number): MimeType;
     namedItem(type: string): MimeType;
     [index: number]: MimeType;
@@ -8337,7 +9173,7 @@ declare var Plugin: {
 }
 
 interface PluginArray {
-    length: number;
+    readonly length: number;
     item(index: number): Plugin;
     namedItem(name: string): Plugin;
     refresh(reload?: boolean): void;
@@ -8350,18 +9186,18 @@ declare var PluginArray: {
 }
 
 interface PointerEvent extends MouseEvent {
-    currentPoint: any;
-    height: number;
-    hwTimestamp: number;
-    intermediatePoints: any;
-    isPrimary: boolean;
-    pointerId: number;
-    pointerType: any;
-    pressure: number;
-    rotation: number;
-    tiltX: number;
-    tiltY: number;
-    width: number;
+    readonly currentPoint: any;
+    readonly height: number;
+    readonly hwTimestamp: number;
+    readonly intermediatePoints: any;
+    readonly isPrimary: boolean;
+    readonly pointerId: number;
+    readonly pointerType: any;
+    readonly pressure: number;
+    readonly rotation: number;
+    readonly tiltX: number;
+    readonly tiltY: number;
+    readonly width: number;
     getCurrentPoint(element: Element): void;
     getIntermediatePoints(element: Element): void;
     initPointerEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget, offsetXArg: number, offsetYArg: number, widthArg: number, heightArg: number, pressure: number, rotation: number, tiltX: number, tiltY: number, pointerIdArg: number, pointerType: any, hwTimestampArg: number, isPrimary: boolean): void;
@@ -8373,7 +9209,7 @@ declare var PointerEvent: {
 }
 
 interface PopStateEvent extends Event {
-    state: any;
+    readonly state: any;
     initPopStateEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, stateArg: any): void;
 }
 
@@ -8383,8 +9219,8 @@ declare var PopStateEvent: {
 }
 
 interface Position {
-    coords: Coordinates;
-    timestamp: number;
+    readonly coords: Coordinates;
+    readonly timestamp: number;
 }
 
 declare var Position: {
@@ -8393,24 +9229,24 @@ declare var Position: {
 }
 
 interface PositionError {
-    code: number;
-    message: string;
+    readonly code: number;
+    readonly message: string;
     toString(): string;
-    PERMISSION_DENIED: number;
-    POSITION_UNAVAILABLE: number;
-    TIMEOUT: number;
+    readonly PERMISSION_DENIED: number;
+    readonly POSITION_UNAVAILABLE: number;
+    readonly TIMEOUT: number;
 }
 
 declare var PositionError: {
     prototype: PositionError;
     new(): PositionError;
-    PERMISSION_DENIED: number;
-    POSITION_UNAVAILABLE: number;
-    TIMEOUT: number;
+    readonly PERMISSION_DENIED: number;
+    readonly POSITION_UNAVAILABLE: number;
+    readonly TIMEOUT: number;
 }
 
 interface ProcessingInstruction extends CharacterData {
-    target: string;
+    readonly target: string;
 }
 
 declare var ProcessingInstruction: {
@@ -8419,9 +9255,9 @@ declare var ProcessingInstruction: {
 }
 
 interface ProgressEvent extends Event {
-    lengthComputable: boolean;
-    loaded: number;
-    total: number;
+    readonly lengthComputable: boolean;
+    readonly loaded: number;
+    readonly total: number;
     initProgressEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, lengthComputableArg: boolean, loadedArg: number, totalArg: number): void;
 }
 
@@ -8430,13 +9266,210 @@ declare var ProgressEvent: {
     new(type: string, eventInitDict?: ProgressEventInit): ProgressEvent;
 }
 
+interface RTCDTMFToneChangeEvent extends Event {
+    readonly tone: string;
+}
+
+declare var RTCDTMFToneChangeEvent: {
+    prototype: RTCDTMFToneChangeEvent;
+    new(type: string, eventInitDict: RTCDTMFToneChangeEventInit): RTCDTMFToneChangeEvent;
+}
+
+interface RTCDtlsTransport extends RTCStatsProvider {
+    ondtlsstatechange: (ev: RTCDtlsTransportStateChangedEvent) => any;
+    onerror: (ev: Event) => any;
+    readonly state: string;
+    readonly transport: RTCIceTransport;
+    getLocalParameters(): RTCDtlsParameters;
+    getRemoteCertificates(): ArrayBuffer[];
+    getRemoteParameters(): RTCDtlsParameters;
+    start(remoteParameters: RTCDtlsParameters): void;
+    stop(): void;
+    addEventListener(type: "dtlsstatechange", listener: (ev: RTCDtlsTransportStateChangedEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCDtlsTransport: {
+    prototype: RTCDtlsTransport;
+    new(transport: RTCIceTransport): RTCDtlsTransport;
+}
+
+interface RTCDtlsTransportStateChangedEvent extends Event {
+    readonly state: string;
+}
+
+declare var RTCDtlsTransportStateChangedEvent: {
+    prototype: RTCDtlsTransportStateChangedEvent;
+    new(): RTCDtlsTransportStateChangedEvent;
+}
+
+interface RTCDtmfSender extends EventTarget {
+    readonly canInsertDTMF: boolean;
+    readonly duration: number;
+    readonly interToneGap: number;
+    ontonechange: (ev: RTCDTMFToneChangeEvent) => any;
+    readonly sender: RTCRtpSender;
+    readonly toneBuffer: string;
+    insertDTMF(tones: string, duration?: number, interToneGap?: number): void;
+    addEventListener(type: "tonechange", listener: (ev: RTCDTMFToneChangeEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCDtmfSender: {
+    prototype: RTCDtmfSender;
+    new(sender: RTCRtpSender): RTCDtmfSender;
+}
+
+interface RTCIceCandidatePairChangedEvent extends Event {
+    readonly pair: RTCIceCandidatePair;
+}
+
+declare var RTCIceCandidatePairChangedEvent: {
+    prototype: RTCIceCandidatePairChangedEvent;
+    new(): RTCIceCandidatePairChangedEvent;
+}
+
+interface RTCIceGatherer extends RTCStatsProvider {
+    readonly component: string;
+    onerror: (ev: Event) => any;
+    onlocalcandidate: (ev: RTCIceGathererEvent) => any;
+    createAssociatedGatherer(): RTCIceGatherer;
+    getLocalCandidates(): RTCIceCandidate[];
+    getLocalParameters(): RTCIceParameters;
+    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "localcandidate", listener: (ev: RTCIceGathererEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCIceGatherer: {
+    prototype: RTCIceGatherer;
+    new(options: RTCIceGatherOptions): RTCIceGatherer;
+}
+
+interface RTCIceGathererEvent extends Event {
+    readonly candidate: RTCIceCandidate | RTCIceCandidateComplete;
+}
+
+declare var RTCIceGathererEvent: {
+    prototype: RTCIceGathererEvent;
+    new(): RTCIceGathererEvent;
+}
+
+interface RTCIceTransport extends RTCStatsProvider {
+    readonly component: string;
+    readonly iceGatherer: RTCIceGatherer;
+    oncandidatepairchange: (ev: RTCIceCandidatePairChangedEvent) => any;
+    onicestatechange: (ev: RTCIceTransportStateChangedEvent) => any;
+    readonly role: string;
+    readonly state: string;
+    addRemoteCandidate(remoteCandidate: RTCIceCandidate | RTCIceCandidateComplete): void;
+    createAssociatedTransport(): RTCIceTransport;
+    getNominatedCandidatePair(): RTCIceCandidatePair;
+    getRemoteCandidates(): RTCIceCandidate[];
+    getRemoteParameters(): RTCIceParameters;
+    setRemoteCandidates(remoteCandidates: RTCIceCandidate[]): void;
+    start(gatherer: RTCIceGatherer, remoteParameters: RTCIceParameters, role?: string): void;
+    stop(): void;
+    addEventListener(type: "candidatepairchange", listener: (ev: RTCIceCandidatePairChangedEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "icestatechange", listener: (ev: RTCIceTransportStateChangedEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCIceTransport: {
+    prototype: RTCIceTransport;
+    new(): RTCIceTransport;
+}
+
+interface RTCIceTransportStateChangedEvent extends Event {
+    readonly state: string;
+}
+
+declare var RTCIceTransportStateChangedEvent: {
+    prototype: RTCIceTransportStateChangedEvent;
+    new(): RTCIceTransportStateChangedEvent;
+}
+
+interface RTCRtpReceiver extends RTCStatsProvider {
+    onerror: (ev: Event) => any;
+    readonly rtcpTransport: RTCDtlsTransport;
+    readonly track: MediaStreamTrack;
+    readonly transport: RTCDtlsTransport | RTCSrtpSdesTransport;
+    getContributingSources(): RTCRtpContributingSource[];
+    receive(parameters: RTCRtpParameters): void;
+    requestSendCSRC(csrc: number): void;
+    setTransport(transport: RTCDtlsTransport | RTCSrtpSdesTransport, rtcpTransport?: RTCDtlsTransport): void;
+    stop(): void;
+    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCRtpReceiver: {
+    prototype: RTCRtpReceiver;
+    new(transport: RTCDtlsTransport | RTCSrtpSdesTransport, kind: string, rtcpTransport?: RTCDtlsTransport): RTCRtpReceiver;
+    getCapabilities(kind?: string): RTCRtpCapabilities;
+}
+
+interface RTCRtpSender extends RTCStatsProvider {
+    onerror: (ev: Event) => any;
+    onssrcconflict: (ev: RTCSsrcConflictEvent) => any;
+    readonly rtcpTransport: RTCDtlsTransport;
+    readonly track: MediaStreamTrack;
+    readonly transport: RTCDtlsTransport | RTCSrtpSdesTransport;
+    send(parameters: RTCRtpParameters): void;
+    setTrack(track: MediaStreamTrack): void;
+    setTransport(transport: RTCDtlsTransport | RTCSrtpSdesTransport, rtcpTransport?: RTCDtlsTransport): void;
+    stop(): void;
+    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "ssrcconflict", listener: (ev: RTCSsrcConflictEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCRtpSender: {
+    prototype: RTCRtpSender;
+    new(track: MediaStreamTrack, transport: RTCDtlsTransport | RTCSrtpSdesTransport, rtcpTransport?: RTCDtlsTransport): RTCRtpSender;
+    getCapabilities(kind?: string): RTCRtpCapabilities;
+}
+
+interface RTCSrtpSdesTransport extends EventTarget {
+    onerror: (ev: Event) => any;
+    readonly transport: RTCIceTransport;
+    addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+}
+
+declare var RTCSrtpSdesTransport: {
+    prototype: RTCSrtpSdesTransport;
+    new(transport: RTCIceTransport, encryptParameters: RTCSrtpSdesParameters, decryptParameters: RTCSrtpSdesParameters): RTCSrtpSdesTransport;
+    getLocalParameters(): RTCSrtpSdesParameters[];
+}
+
+interface RTCSsrcConflictEvent extends Event {
+    readonly ssrc: number;
+}
+
+declare var RTCSsrcConflictEvent: {
+    prototype: RTCSsrcConflictEvent;
+    new(): RTCSsrcConflictEvent;
+}
+
+interface RTCStatsProvider extends EventTarget {
+    getStats(): PromiseLike<RTCStatsReport>;
+    msGetStats(): PromiseLike<RTCStatsReport>;
+}
+
+declare var RTCStatsProvider: {
+    prototype: RTCStatsProvider;
+    new(): RTCStatsProvider;
+}
+
 interface Range {
-    collapsed: boolean;
-    commonAncestorContainer: Node;
-    endContainer: Node;
-    endOffset: number;
-    startContainer: Node;
-    startOffset: number;
+    readonly collapsed: boolean;
+    readonly commonAncestorContainer: Node;
+    readonly endContainer: Node;
+    readonly endOffset: number;
+    readonly startContainer: Node;
+    readonly startOffset: number;
     cloneContents(): DocumentFragment;
     cloneRange(): Range;
     collapse(toStart: boolean): void;
@@ -8459,23 +9492,23 @@ interface Range {
     setStartBefore(refNode: Node): void;
     surroundContents(newParent: Node): void;
     toString(): string;
-    END_TO_END: number;
-    END_TO_START: number;
-    START_TO_END: number;
-    START_TO_START: number;
+    readonly END_TO_END: number;
+    readonly END_TO_START: number;
+    readonly START_TO_END: number;
+    readonly START_TO_START: number;
 }
 
 declare var Range: {
     prototype: Range;
     new(): Range;
-    END_TO_END: number;
-    END_TO_START: number;
-    START_TO_END: number;
-    START_TO_START: number;
+    readonly END_TO_END: number;
+    readonly END_TO_START: number;
+    readonly START_TO_END: number;
+    readonly START_TO_START: number;
 }
 
 interface SVGAElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference {
-    target: SVGAnimatedString;
+    readonly target: SVGAnimatedString;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8485,32 +9518,32 @@ declare var SVGAElement: {
 }
 
 interface SVGAngle {
-    unitType: number;
+    readonly unitType: number;
     value: number;
     valueAsString: string;
     valueInSpecifiedUnits: number;
     convertToSpecifiedUnits(unitType: number): void;
     newValueSpecifiedUnits(unitType: number, valueInSpecifiedUnits: number): void;
-    SVG_ANGLETYPE_DEG: number;
-    SVG_ANGLETYPE_GRAD: number;
-    SVG_ANGLETYPE_RAD: number;
-    SVG_ANGLETYPE_UNKNOWN: number;
-    SVG_ANGLETYPE_UNSPECIFIED: number;
+    readonly SVG_ANGLETYPE_DEG: number;
+    readonly SVG_ANGLETYPE_GRAD: number;
+    readonly SVG_ANGLETYPE_RAD: number;
+    readonly SVG_ANGLETYPE_UNKNOWN: number;
+    readonly SVG_ANGLETYPE_UNSPECIFIED: number;
 }
 
 declare var SVGAngle: {
     prototype: SVGAngle;
     new(): SVGAngle;
-    SVG_ANGLETYPE_DEG: number;
-    SVG_ANGLETYPE_GRAD: number;
-    SVG_ANGLETYPE_RAD: number;
-    SVG_ANGLETYPE_UNKNOWN: number;
-    SVG_ANGLETYPE_UNSPECIFIED: number;
+    readonly SVG_ANGLETYPE_DEG: number;
+    readonly SVG_ANGLETYPE_GRAD: number;
+    readonly SVG_ANGLETYPE_RAD: number;
+    readonly SVG_ANGLETYPE_UNKNOWN: number;
+    readonly SVG_ANGLETYPE_UNSPECIFIED: number;
 }
 
 interface SVGAnimatedAngle {
-    animVal: SVGAngle;
-    baseVal: SVGAngle;
+    readonly animVal: SVGAngle;
+    readonly baseVal: SVGAngle;
 }
 
 declare var SVGAnimatedAngle: {
@@ -8519,7 +9552,7 @@ declare var SVGAnimatedAngle: {
 }
 
 interface SVGAnimatedBoolean {
-    animVal: boolean;
+    readonly animVal: boolean;
     baseVal: boolean;
 }
 
@@ -8529,7 +9562,7 @@ declare var SVGAnimatedBoolean: {
 }
 
 interface SVGAnimatedEnumeration {
-    animVal: number;
+    readonly animVal: number;
     baseVal: number;
 }
 
@@ -8539,7 +9572,7 @@ declare var SVGAnimatedEnumeration: {
 }
 
 interface SVGAnimatedInteger {
-    animVal: number;
+    readonly animVal: number;
     baseVal: number;
 }
 
@@ -8549,8 +9582,8 @@ declare var SVGAnimatedInteger: {
 }
 
 interface SVGAnimatedLength {
-    animVal: SVGLength;
-    baseVal: SVGLength;
+    readonly animVal: SVGLength;
+    readonly baseVal: SVGLength;
 }
 
 declare var SVGAnimatedLength: {
@@ -8559,8 +9592,8 @@ declare var SVGAnimatedLength: {
 }
 
 interface SVGAnimatedLengthList {
-    animVal: SVGLengthList;
-    baseVal: SVGLengthList;
+    readonly animVal: SVGLengthList;
+    readonly baseVal: SVGLengthList;
 }
 
 declare var SVGAnimatedLengthList: {
@@ -8569,7 +9602,7 @@ declare var SVGAnimatedLengthList: {
 }
 
 interface SVGAnimatedNumber {
-    animVal: number;
+    readonly animVal: number;
     baseVal: number;
 }
 
@@ -8579,8 +9612,8 @@ declare var SVGAnimatedNumber: {
 }
 
 interface SVGAnimatedNumberList {
-    animVal: SVGNumberList;
-    baseVal: SVGNumberList;
+    readonly animVal: SVGNumberList;
+    readonly baseVal: SVGNumberList;
 }
 
 declare var SVGAnimatedNumberList: {
@@ -8589,8 +9622,8 @@ declare var SVGAnimatedNumberList: {
 }
 
 interface SVGAnimatedPreserveAspectRatio {
-    animVal: SVGPreserveAspectRatio;
-    baseVal: SVGPreserveAspectRatio;
+    readonly animVal: SVGPreserveAspectRatio;
+    readonly baseVal: SVGPreserveAspectRatio;
 }
 
 declare var SVGAnimatedPreserveAspectRatio: {
@@ -8599,8 +9632,8 @@ declare var SVGAnimatedPreserveAspectRatio: {
 }
 
 interface SVGAnimatedRect {
-    animVal: SVGRect;
-    baseVal: SVGRect;
+    readonly animVal: SVGRect;
+    readonly baseVal: SVGRect;
 }
 
 declare var SVGAnimatedRect: {
@@ -8609,7 +9642,7 @@ declare var SVGAnimatedRect: {
 }
 
 interface SVGAnimatedString {
-    animVal: string;
+    readonly animVal: string;
     baseVal: string;
 }
 
@@ -8619,8 +9652,8 @@ declare var SVGAnimatedString: {
 }
 
 interface SVGAnimatedTransformList {
-    animVal: SVGTransformList;
-    baseVal: SVGTransformList;
+    readonly animVal: SVGTransformList;
+    readonly baseVal: SVGTransformList;
 }
 
 declare var SVGAnimatedTransformList: {
@@ -8629,9 +9662,9 @@ declare var SVGAnimatedTransformList: {
 }
 
 interface SVGCircleElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    cx: SVGAnimatedLength;
-    cy: SVGAnimatedLength;
-    r: SVGAnimatedLength;
+    readonly cx: SVGAnimatedLength;
+    readonly cy: SVGAnimatedLength;
+    readonly r: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8641,7 +9674,7 @@ declare var SVGCircleElement: {
 }
 
 interface SVGClipPathElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGUnitTypes {
-    clipPathUnits: SVGAnimatedEnumeration;
+    readonly clipPathUnits: SVGAnimatedEnumeration;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8651,30 +9684,30 @@ declare var SVGClipPathElement: {
 }
 
 interface SVGComponentTransferFunctionElement extends SVGElement {
-    amplitude: SVGAnimatedNumber;
-    exponent: SVGAnimatedNumber;
-    intercept: SVGAnimatedNumber;
-    offset: SVGAnimatedNumber;
-    slope: SVGAnimatedNumber;
-    tableValues: SVGAnimatedNumberList;
-    type: SVGAnimatedEnumeration;
-    SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_GAMMA: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_LINEAR: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_TABLE: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number;
+    readonly amplitude: SVGAnimatedNumber;
+    readonly exponent: SVGAnimatedNumber;
+    readonly intercept: SVGAnimatedNumber;
+    readonly offset: SVGAnimatedNumber;
+    readonly slope: SVGAnimatedNumber;
+    readonly tableValues: SVGAnimatedNumberList;
+    readonly type: SVGAnimatedEnumeration;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_GAMMA: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_LINEAR: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_TABLE: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number;
 }
 
 declare var SVGComponentTransferFunctionElement: {
     prototype: SVGComponentTransferFunctionElement;
     new(): SVGComponentTransferFunctionElement;
-    SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_GAMMA: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_LINEAR: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_TABLE: number;
-    SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_GAMMA: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_LINEAR: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_TABLE: number;
+    readonly SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number;
 }
 
 interface SVGDefsElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
@@ -8696,7 +9729,6 @@ declare var SVGDescElement: {
 }
 
 interface SVGElement extends Element {
-    id: string;
     onclick: (ev: MouseEvent) => any;
     ondblclick: (ev: MouseEvent) => any;
     onfocusin: (ev: FocusEvent) => any;
@@ -8707,8 +9739,8 @@ interface SVGElement extends Element {
     onmouseout: (ev: MouseEvent) => any;
     onmouseover: (ev: MouseEvent) => any;
     onmouseup: (ev: MouseEvent) => any;
-    ownerSVGElement: SVGSVGElement;
-    viewportElement: SVGElement;
+    readonly ownerSVGElement: SVGSVGElement;
+    readonly viewportElement: SVGElement;
     xmlbase: string;
     className: any;
     addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -8766,14 +9798,14 @@ declare var SVGElement: {
 }
 
 interface SVGElementInstance extends EventTarget {
-    childNodes: SVGElementInstanceList;
-    correspondingElement: SVGElement;
-    correspondingUseElement: SVGUseElement;
-    firstChild: SVGElementInstance;
-    lastChild: SVGElementInstance;
-    nextSibling: SVGElementInstance;
-    parentNode: SVGElementInstance;
-    previousSibling: SVGElementInstance;
+    readonly childNodes: SVGElementInstanceList;
+    readonly correspondingElement: SVGElement;
+    readonly correspondingUseElement: SVGUseElement;
+    readonly firstChild: SVGElementInstance;
+    readonly lastChild: SVGElementInstance;
+    readonly nextSibling: SVGElementInstance;
+    readonly parentNode: SVGElementInstance;
+    readonly previousSibling: SVGElementInstance;
 }
 
 declare var SVGElementInstance: {
@@ -8782,7 +9814,7 @@ declare var SVGElementInstance: {
 }
 
 interface SVGElementInstanceList {
-    length: number;
+    readonly length: number;
     item(index: number): SVGElementInstance;
 }
 
@@ -8792,10 +9824,10 @@ declare var SVGElementInstanceList: {
 }
 
 interface SVGEllipseElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    cx: SVGAnimatedLength;
-    cy: SVGAnimatedLength;
-    rx: SVGAnimatedLength;
-    ry: SVGAnimatedLength;
+    readonly cx: SVGAnimatedLength;
+    readonly cy: SVGAnimatedLength;
+    readonly rx: SVGAnimatedLength;
+    readonly ry: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8805,75 +9837,75 @@ declare var SVGEllipseElement: {
 }
 
 interface SVGFEBlendElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    in2: SVGAnimatedString;
-    mode: SVGAnimatedEnumeration;
-    SVG_FEBLEND_MODE_COLOR: number;
-    SVG_FEBLEND_MODE_COLOR_BURN: number;
-    SVG_FEBLEND_MODE_COLOR_DODGE: number;
-    SVG_FEBLEND_MODE_DARKEN: number;
-    SVG_FEBLEND_MODE_DIFFERENCE: number;
-    SVG_FEBLEND_MODE_EXCLUSION: number;
-    SVG_FEBLEND_MODE_HARD_LIGHT: number;
-    SVG_FEBLEND_MODE_HUE: number;
-    SVG_FEBLEND_MODE_LIGHTEN: number;
-    SVG_FEBLEND_MODE_LUMINOSITY: number;
-    SVG_FEBLEND_MODE_MULTIPLY: number;
-    SVG_FEBLEND_MODE_NORMAL: number;
-    SVG_FEBLEND_MODE_OVERLAY: number;
-    SVG_FEBLEND_MODE_SATURATION: number;
-    SVG_FEBLEND_MODE_SCREEN: number;
-    SVG_FEBLEND_MODE_SOFT_LIGHT: number;
-    SVG_FEBLEND_MODE_UNKNOWN: number;
+    readonly in1: SVGAnimatedString;
+    readonly in2: SVGAnimatedString;
+    readonly mode: SVGAnimatedEnumeration;
+    readonly SVG_FEBLEND_MODE_COLOR: number;
+    readonly SVG_FEBLEND_MODE_COLOR_BURN: number;
+    readonly SVG_FEBLEND_MODE_COLOR_DODGE: number;
+    readonly SVG_FEBLEND_MODE_DARKEN: number;
+    readonly SVG_FEBLEND_MODE_DIFFERENCE: number;
+    readonly SVG_FEBLEND_MODE_EXCLUSION: number;
+    readonly SVG_FEBLEND_MODE_HARD_LIGHT: number;
+    readonly SVG_FEBLEND_MODE_HUE: number;
+    readonly SVG_FEBLEND_MODE_LIGHTEN: number;
+    readonly SVG_FEBLEND_MODE_LUMINOSITY: number;
+    readonly SVG_FEBLEND_MODE_MULTIPLY: number;
+    readonly SVG_FEBLEND_MODE_NORMAL: number;
+    readonly SVG_FEBLEND_MODE_OVERLAY: number;
+    readonly SVG_FEBLEND_MODE_SATURATION: number;
+    readonly SVG_FEBLEND_MODE_SCREEN: number;
+    readonly SVG_FEBLEND_MODE_SOFT_LIGHT: number;
+    readonly SVG_FEBLEND_MODE_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEBlendElement: {
     prototype: SVGFEBlendElement;
     new(): SVGFEBlendElement;
-    SVG_FEBLEND_MODE_COLOR: number;
-    SVG_FEBLEND_MODE_COLOR_BURN: number;
-    SVG_FEBLEND_MODE_COLOR_DODGE: number;
-    SVG_FEBLEND_MODE_DARKEN: number;
-    SVG_FEBLEND_MODE_DIFFERENCE: number;
-    SVG_FEBLEND_MODE_EXCLUSION: number;
-    SVG_FEBLEND_MODE_HARD_LIGHT: number;
-    SVG_FEBLEND_MODE_HUE: number;
-    SVG_FEBLEND_MODE_LIGHTEN: number;
-    SVG_FEBLEND_MODE_LUMINOSITY: number;
-    SVG_FEBLEND_MODE_MULTIPLY: number;
-    SVG_FEBLEND_MODE_NORMAL: number;
-    SVG_FEBLEND_MODE_OVERLAY: number;
-    SVG_FEBLEND_MODE_SATURATION: number;
-    SVG_FEBLEND_MODE_SCREEN: number;
-    SVG_FEBLEND_MODE_SOFT_LIGHT: number;
-    SVG_FEBLEND_MODE_UNKNOWN: number;
+    readonly SVG_FEBLEND_MODE_COLOR: number;
+    readonly SVG_FEBLEND_MODE_COLOR_BURN: number;
+    readonly SVG_FEBLEND_MODE_COLOR_DODGE: number;
+    readonly SVG_FEBLEND_MODE_DARKEN: number;
+    readonly SVG_FEBLEND_MODE_DIFFERENCE: number;
+    readonly SVG_FEBLEND_MODE_EXCLUSION: number;
+    readonly SVG_FEBLEND_MODE_HARD_LIGHT: number;
+    readonly SVG_FEBLEND_MODE_HUE: number;
+    readonly SVG_FEBLEND_MODE_LIGHTEN: number;
+    readonly SVG_FEBLEND_MODE_LUMINOSITY: number;
+    readonly SVG_FEBLEND_MODE_MULTIPLY: number;
+    readonly SVG_FEBLEND_MODE_NORMAL: number;
+    readonly SVG_FEBLEND_MODE_OVERLAY: number;
+    readonly SVG_FEBLEND_MODE_SATURATION: number;
+    readonly SVG_FEBLEND_MODE_SCREEN: number;
+    readonly SVG_FEBLEND_MODE_SOFT_LIGHT: number;
+    readonly SVG_FEBLEND_MODE_UNKNOWN: number;
 }
 
 interface SVGFEColorMatrixElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    type: SVGAnimatedEnumeration;
-    values: SVGAnimatedNumberList;
-    SVG_FECOLORMATRIX_TYPE_HUEROTATE: number;
-    SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA: number;
-    SVG_FECOLORMATRIX_TYPE_MATRIX: number;
-    SVG_FECOLORMATRIX_TYPE_SATURATE: number;
-    SVG_FECOLORMATRIX_TYPE_UNKNOWN: number;
+    readonly in1: SVGAnimatedString;
+    readonly type: SVGAnimatedEnumeration;
+    readonly values: SVGAnimatedNumberList;
+    readonly SVG_FECOLORMATRIX_TYPE_HUEROTATE: number;
+    readonly SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA: number;
+    readonly SVG_FECOLORMATRIX_TYPE_MATRIX: number;
+    readonly SVG_FECOLORMATRIX_TYPE_SATURATE: number;
+    readonly SVG_FECOLORMATRIX_TYPE_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEColorMatrixElement: {
     prototype: SVGFEColorMatrixElement;
     new(): SVGFEColorMatrixElement;
-    SVG_FECOLORMATRIX_TYPE_HUEROTATE: number;
-    SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA: number;
-    SVG_FECOLORMATRIX_TYPE_MATRIX: number;
-    SVG_FECOLORMATRIX_TYPE_SATURATE: number;
-    SVG_FECOLORMATRIX_TYPE_UNKNOWN: number;
+    readonly SVG_FECOLORMATRIX_TYPE_HUEROTATE: number;
+    readonly SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA: number;
+    readonly SVG_FECOLORMATRIX_TYPE_MATRIX: number;
+    readonly SVG_FECOLORMATRIX_TYPE_SATURATE: number;
+    readonly SVG_FECOLORMATRIX_TYPE_UNKNOWN: number;
 }
 
 interface SVGFEComponentTransferElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
+    readonly in1: SVGAnimatedString;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8883,70 +9915,70 @@ declare var SVGFEComponentTransferElement: {
 }
 
 interface SVGFECompositeElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    in2: SVGAnimatedString;
-    k1: SVGAnimatedNumber;
-    k2: SVGAnimatedNumber;
-    k3: SVGAnimatedNumber;
-    k4: SVGAnimatedNumber;
-    operator: SVGAnimatedEnumeration;
-    SVG_FECOMPOSITE_OPERATOR_ARITHMETIC: number;
-    SVG_FECOMPOSITE_OPERATOR_ATOP: number;
-    SVG_FECOMPOSITE_OPERATOR_IN: number;
-    SVG_FECOMPOSITE_OPERATOR_OUT: number;
-    SVG_FECOMPOSITE_OPERATOR_OVER: number;
-    SVG_FECOMPOSITE_OPERATOR_UNKNOWN: number;
-    SVG_FECOMPOSITE_OPERATOR_XOR: number;
+    readonly in1: SVGAnimatedString;
+    readonly in2: SVGAnimatedString;
+    readonly k1: SVGAnimatedNumber;
+    readonly k2: SVGAnimatedNumber;
+    readonly k3: SVGAnimatedNumber;
+    readonly k4: SVGAnimatedNumber;
+    readonly operator: SVGAnimatedEnumeration;
+    readonly SVG_FECOMPOSITE_OPERATOR_ARITHMETIC: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_ATOP: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_IN: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_OUT: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_OVER: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_UNKNOWN: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_XOR: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFECompositeElement: {
     prototype: SVGFECompositeElement;
     new(): SVGFECompositeElement;
-    SVG_FECOMPOSITE_OPERATOR_ARITHMETIC: number;
-    SVG_FECOMPOSITE_OPERATOR_ATOP: number;
-    SVG_FECOMPOSITE_OPERATOR_IN: number;
-    SVG_FECOMPOSITE_OPERATOR_OUT: number;
-    SVG_FECOMPOSITE_OPERATOR_OVER: number;
-    SVG_FECOMPOSITE_OPERATOR_UNKNOWN: number;
-    SVG_FECOMPOSITE_OPERATOR_XOR: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_ARITHMETIC: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_ATOP: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_IN: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_OUT: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_OVER: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_UNKNOWN: number;
+    readonly SVG_FECOMPOSITE_OPERATOR_XOR: number;
 }
 
 interface SVGFEConvolveMatrixElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    bias: SVGAnimatedNumber;
-    divisor: SVGAnimatedNumber;
-    edgeMode: SVGAnimatedEnumeration;
-    in1: SVGAnimatedString;
-    kernelMatrix: SVGAnimatedNumberList;
-    kernelUnitLengthX: SVGAnimatedNumber;
-    kernelUnitLengthY: SVGAnimatedNumber;
-    orderX: SVGAnimatedInteger;
-    orderY: SVGAnimatedInteger;
-    preserveAlpha: SVGAnimatedBoolean;
-    targetX: SVGAnimatedInteger;
-    targetY: SVGAnimatedInteger;
-    SVG_EDGEMODE_DUPLICATE: number;
-    SVG_EDGEMODE_NONE: number;
-    SVG_EDGEMODE_UNKNOWN: number;
-    SVG_EDGEMODE_WRAP: number;
+    readonly bias: SVGAnimatedNumber;
+    readonly divisor: SVGAnimatedNumber;
+    readonly edgeMode: SVGAnimatedEnumeration;
+    readonly in1: SVGAnimatedString;
+    readonly kernelMatrix: SVGAnimatedNumberList;
+    readonly kernelUnitLengthX: SVGAnimatedNumber;
+    readonly kernelUnitLengthY: SVGAnimatedNumber;
+    readonly orderX: SVGAnimatedInteger;
+    readonly orderY: SVGAnimatedInteger;
+    readonly preserveAlpha: SVGAnimatedBoolean;
+    readonly targetX: SVGAnimatedInteger;
+    readonly targetY: SVGAnimatedInteger;
+    readonly SVG_EDGEMODE_DUPLICATE: number;
+    readonly SVG_EDGEMODE_NONE: number;
+    readonly SVG_EDGEMODE_UNKNOWN: number;
+    readonly SVG_EDGEMODE_WRAP: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEConvolveMatrixElement: {
     prototype: SVGFEConvolveMatrixElement;
     new(): SVGFEConvolveMatrixElement;
-    SVG_EDGEMODE_DUPLICATE: number;
-    SVG_EDGEMODE_NONE: number;
-    SVG_EDGEMODE_UNKNOWN: number;
-    SVG_EDGEMODE_WRAP: number;
+    readonly SVG_EDGEMODE_DUPLICATE: number;
+    readonly SVG_EDGEMODE_NONE: number;
+    readonly SVG_EDGEMODE_UNKNOWN: number;
+    readonly SVG_EDGEMODE_WRAP: number;
 }
 
 interface SVGFEDiffuseLightingElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    diffuseConstant: SVGAnimatedNumber;
-    in1: SVGAnimatedString;
-    kernelUnitLengthX: SVGAnimatedNumber;
-    kernelUnitLengthY: SVGAnimatedNumber;
-    surfaceScale: SVGAnimatedNumber;
+    readonly diffuseConstant: SVGAnimatedNumber;
+    readonly in1: SVGAnimatedString;
+    readonly kernelUnitLengthX: SVGAnimatedNumber;
+    readonly kernelUnitLengthY: SVGAnimatedNumber;
+    readonly surfaceScale: SVGAnimatedNumber;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8956,32 +9988,32 @@ declare var SVGFEDiffuseLightingElement: {
 }
 
 interface SVGFEDisplacementMapElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    in2: SVGAnimatedString;
-    scale: SVGAnimatedNumber;
-    xChannelSelector: SVGAnimatedEnumeration;
-    yChannelSelector: SVGAnimatedEnumeration;
-    SVG_CHANNEL_A: number;
-    SVG_CHANNEL_B: number;
-    SVG_CHANNEL_G: number;
-    SVG_CHANNEL_R: number;
-    SVG_CHANNEL_UNKNOWN: number;
+    readonly in1: SVGAnimatedString;
+    readonly in2: SVGAnimatedString;
+    readonly scale: SVGAnimatedNumber;
+    readonly xChannelSelector: SVGAnimatedEnumeration;
+    readonly yChannelSelector: SVGAnimatedEnumeration;
+    readonly SVG_CHANNEL_A: number;
+    readonly SVG_CHANNEL_B: number;
+    readonly SVG_CHANNEL_G: number;
+    readonly SVG_CHANNEL_R: number;
+    readonly SVG_CHANNEL_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEDisplacementMapElement: {
     prototype: SVGFEDisplacementMapElement;
     new(): SVGFEDisplacementMapElement;
-    SVG_CHANNEL_A: number;
-    SVG_CHANNEL_B: number;
-    SVG_CHANNEL_G: number;
-    SVG_CHANNEL_R: number;
-    SVG_CHANNEL_UNKNOWN: number;
+    readonly SVG_CHANNEL_A: number;
+    readonly SVG_CHANNEL_B: number;
+    readonly SVG_CHANNEL_G: number;
+    readonly SVG_CHANNEL_R: number;
+    readonly SVG_CHANNEL_UNKNOWN: number;
 }
 
 interface SVGFEDistantLightElement extends SVGElement {
-    azimuth: SVGAnimatedNumber;
-    elevation: SVGAnimatedNumber;
+    readonly azimuth: SVGAnimatedNumber;
+    readonly elevation: SVGAnimatedNumber;
 }
 
 declare var SVGFEDistantLightElement: {
@@ -9031,9 +10063,9 @@ declare var SVGFEFuncRElement: {
 }
 
 interface SVGFEGaussianBlurElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    stdDeviationX: SVGAnimatedNumber;
-    stdDeviationY: SVGAnimatedNumber;
+    readonly in1: SVGAnimatedString;
+    readonly stdDeviationX: SVGAnimatedNumber;
+    readonly stdDeviationY: SVGAnimatedNumber;
     setStdDeviation(stdDeviationX: number, stdDeviationY: number): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
@@ -9044,7 +10076,7 @@ declare var SVGFEGaussianBlurElement: {
 }
 
 interface SVGFEImageElement extends SVGElement, SVGFilterPrimitiveStandardAttributes, SVGLangSpace, SVGURIReference, SVGExternalResourcesRequired {
-    preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
+    readonly preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9063,7 +10095,7 @@ declare var SVGFEMergeElement: {
 }
 
 interface SVGFEMergeNodeElement extends SVGElement {
-    in1: SVGAnimatedString;
+    readonly in1: SVGAnimatedString;
 }
 
 declare var SVGFEMergeNodeElement: {
@@ -9072,28 +10104,28 @@ declare var SVGFEMergeNodeElement: {
 }
 
 interface SVGFEMorphologyElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    operator: SVGAnimatedEnumeration;
-    radiusX: SVGAnimatedNumber;
-    radiusY: SVGAnimatedNumber;
-    SVG_MORPHOLOGY_OPERATOR_DILATE: number;
-    SVG_MORPHOLOGY_OPERATOR_ERODE: number;
-    SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number;
+    readonly in1: SVGAnimatedString;
+    readonly operator: SVGAnimatedEnumeration;
+    readonly radiusX: SVGAnimatedNumber;
+    readonly radiusY: SVGAnimatedNumber;
+    readonly SVG_MORPHOLOGY_OPERATOR_DILATE: number;
+    readonly SVG_MORPHOLOGY_OPERATOR_ERODE: number;
+    readonly SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEMorphologyElement: {
     prototype: SVGFEMorphologyElement;
     new(): SVGFEMorphologyElement;
-    SVG_MORPHOLOGY_OPERATOR_DILATE: number;
-    SVG_MORPHOLOGY_OPERATOR_ERODE: number;
-    SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number;
+    readonly SVG_MORPHOLOGY_OPERATOR_DILATE: number;
+    readonly SVG_MORPHOLOGY_OPERATOR_ERODE: number;
+    readonly SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number;
 }
 
 interface SVGFEOffsetElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    dx: SVGAnimatedNumber;
-    dy: SVGAnimatedNumber;
-    in1: SVGAnimatedString;
+    readonly dx: SVGAnimatedNumber;
+    readonly dy: SVGAnimatedNumber;
+    readonly in1: SVGAnimatedString;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9103,9 +10135,9 @@ declare var SVGFEOffsetElement: {
 }
 
 interface SVGFEPointLightElement extends SVGElement {
-    x: SVGAnimatedNumber;
-    y: SVGAnimatedNumber;
-    z: SVGAnimatedNumber;
+    readonly x: SVGAnimatedNumber;
+    readonly y: SVGAnimatedNumber;
+    readonly z: SVGAnimatedNumber;
 }
 
 declare var SVGFEPointLightElement: {
@@ -9114,12 +10146,12 @@ declare var SVGFEPointLightElement: {
 }
 
 interface SVGFESpecularLightingElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
-    kernelUnitLengthX: SVGAnimatedNumber;
-    kernelUnitLengthY: SVGAnimatedNumber;
-    specularConstant: SVGAnimatedNumber;
-    specularExponent: SVGAnimatedNumber;
-    surfaceScale: SVGAnimatedNumber;
+    readonly in1: SVGAnimatedString;
+    readonly kernelUnitLengthX: SVGAnimatedNumber;
+    readonly kernelUnitLengthY: SVGAnimatedNumber;
+    readonly specularConstant: SVGAnimatedNumber;
+    readonly specularExponent: SVGAnimatedNumber;
+    readonly surfaceScale: SVGAnimatedNumber;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9129,14 +10161,14 @@ declare var SVGFESpecularLightingElement: {
 }
 
 interface SVGFESpotLightElement extends SVGElement {
-    limitingConeAngle: SVGAnimatedNumber;
-    pointsAtX: SVGAnimatedNumber;
-    pointsAtY: SVGAnimatedNumber;
-    pointsAtZ: SVGAnimatedNumber;
-    specularExponent: SVGAnimatedNumber;
-    x: SVGAnimatedNumber;
-    y: SVGAnimatedNumber;
-    z: SVGAnimatedNumber;
+    readonly limitingConeAngle: SVGAnimatedNumber;
+    readonly pointsAtX: SVGAnimatedNumber;
+    readonly pointsAtY: SVGAnimatedNumber;
+    readonly pointsAtZ: SVGAnimatedNumber;
+    readonly specularExponent: SVGAnimatedNumber;
+    readonly x: SVGAnimatedNumber;
+    readonly y: SVGAnimatedNumber;
+    readonly z: SVGAnimatedNumber;
 }
 
 declare var SVGFESpotLightElement: {
@@ -9145,7 +10177,7 @@ declare var SVGFESpotLightElement: {
 }
 
 interface SVGFETileElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    in1: SVGAnimatedString;
+    readonly in1: SVGAnimatedString;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9155,41 +10187,41 @@ declare var SVGFETileElement: {
 }
 
 interface SVGFETurbulenceElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
-    baseFrequencyX: SVGAnimatedNumber;
-    baseFrequencyY: SVGAnimatedNumber;
-    numOctaves: SVGAnimatedInteger;
-    seed: SVGAnimatedNumber;
-    stitchTiles: SVGAnimatedEnumeration;
-    type: SVGAnimatedEnumeration;
-    SVG_STITCHTYPE_NOSTITCH: number;
-    SVG_STITCHTYPE_STITCH: number;
-    SVG_STITCHTYPE_UNKNOWN: number;
-    SVG_TURBULENCE_TYPE_FRACTALNOISE: number;
-    SVG_TURBULENCE_TYPE_TURBULENCE: number;
-    SVG_TURBULENCE_TYPE_UNKNOWN: number;
+    readonly baseFrequencyX: SVGAnimatedNumber;
+    readonly baseFrequencyY: SVGAnimatedNumber;
+    readonly numOctaves: SVGAnimatedInteger;
+    readonly seed: SVGAnimatedNumber;
+    readonly stitchTiles: SVGAnimatedEnumeration;
+    readonly type: SVGAnimatedEnumeration;
+    readonly SVG_STITCHTYPE_NOSTITCH: number;
+    readonly SVG_STITCHTYPE_STITCH: number;
+    readonly SVG_STITCHTYPE_UNKNOWN: number;
+    readonly SVG_TURBULENCE_TYPE_FRACTALNOISE: number;
+    readonly SVG_TURBULENCE_TYPE_TURBULENCE: number;
+    readonly SVG_TURBULENCE_TYPE_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFETurbulenceElement: {
     prototype: SVGFETurbulenceElement;
     new(): SVGFETurbulenceElement;
-    SVG_STITCHTYPE_NOSTITCH: number;
-    SVG_STITCHTYPE_STITCH: number;
-    SVG_STITCHTYPE_UNKNOWN: number;
-    SVG_TURBULENCE_TYPE_FRACTALNOISE: number;
-    SVG_TURBULENCE_TYPE_TURBULENCE: number;
-    SVG_TURBULENCE_TYPE_UNKNOWN: number;
+    readonly SVG_STITCHTYPE_NOSTITCH: number;
+    readonly SVG_STITCHTYPE_STITCH: number;
+    readonly SVG_STITCHTYPE_UNKNOWN: number;
+    readonly SVG_TURBULENCE_TYPE_FRACTALNOISE: number;
+    readonly SVG_TURBULENCE_TYPE_TURBULENCE: number;
+    readonly SVG_TURBULENCE_TYPE_UNKNOWN: number;
 }
 
 interface SVGFilterElement extends SVGElement, SVGUnitTypes, SVGStylable, SVGLangSpace, SVGURIReference, SVGExternalResourcesRequired {
-    filterResX: SVGAnimatedInteger;
-    filterResY: SVGAnimatedInteger;
-    filterUnits: SVGAnimatedEnumeration;
-    height: SVGAnimatedLength;
-    primitiveUnits: SVGAnimatedEnumeration;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly filterResX: SVGAnimatedInteger;
+    readonly filterResY: SVGAnimatedInteger;
+    readonly filterUnits: SVGAnimatedEnumeration;
+    readonly height: SVGAnimatedLength;
+    readonly primitiveUnits: SVGAnimatedEnumeration;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     setFilterRes(filterResX: number, filterResY: number): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
@@ -9200,10 +10232,10 @@ declare var SVGFilterElement: {
 }
 
 interface SVGForeignObjectElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    height: SVGAnimatedLength;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly height: SVGAnimatedLength;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9222,31 +10254,31 @@ declare var SVGGElement: {
 }
 
 interface SVGGradientElement extends SVGElement, SVGStylable, SVGExternalResourcesRequired, SVGURIReference, SVGUnitTypes {
-    gradientTransform: SVGAnimatedTransformList;
-    gradientUnits: SVGAnimatedEnumeration;
-    spreadMethod: SVGAnimatedEnumeration;
-    SVG_SPREADMETHOD_PAD: number;
-    SVG_SPREADMETHOD_REFLECT: number;
-    SVG_SPREADMETHOD_REPEAT: number;
-    SVG_SPREADMETHOD_UNKNOWN: number;
+    readonly gradientTransform: SVGAnimatedTransformList;
+    readonly gradientUnits: SVGAnimatedEnumeration;
+    readonly spreadMethod: SVGAnimatedEnumeration;
+    readonly SVG_SPREADMETHOD_PAD: number;
+    readonly SVG_SPREADMETHOD_REFLECT: number;
+    readonly SVG_SPREADMETHOD_REPEAT: number;
+    readonly SVG_SPREADMETHOD_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGGradientElement: {
     prototype: SVGGradientElement;
     new(): SVGGradientElement;
-    SVG_SPREADMETHOD_PAD: number;
-    SVG_SPREADMETHOD_REFLECT: number;
-    SVG_SPREADMETHOD_REPEAT: number;
-    SVG_SPREADMETHOD_UNKNOWN: number;
+    readonly SVG_SPREADMETHOD_PAD: number;
+    readonly SVG_SPREADMETHOD_REFLECT: number;
+    readonly SVG_SPREADMETHOD_REPEAT: number;
+    readonly SVG_SPREADMETHOD_UNKNOWN: number;
 }
 
 interface SVGImageElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference {
-    height: SVGAnimatedLength;
-    preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly height: SVGAnimatedLength;
+    readonly preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9256,43 +10288,43 @@ declare var SVGImageElement: {
 }
 
 interface SVGLength {
-    unitType: number;
+    readonly unitType: number;
     value: number;
     valueAsString: string;
     valueInSpecifiedUnits: number;
     convertToSpecifiedUnits(unitType: number): void;
     newValueSpecifiedUnits(unitType: number, valueInSpecifiedUnits: number): void;
-    SVG_LENGTHTYPE_CM: number;
-    SVG_LENGTHTYPE_EMS: number;
-    SVG_LENGTHTYPE_EXS: number;
-    SVG_LENGTHTYPE_IN: number;
-    SVG_LENGTHTYPE_MM: number;
-    SVG_LENGTHTYPE_NUMBER: number;
-    SVG_LENGTHTYPE_PC: number;
-    SVG_LENGTHTYPE_PERCENTAGE: number;
-    SVG_LENGTHTYPE_PT: number;
-    SVG_LENGTHTYPE_PX: number;
-    SVG_LENGTHTYPE_UNKNOWN: number;
+    readonly SVG_LENGTHTYPE_CM: number;
+    readonly SVG_LENGTHTYPE_EMS: number;
+    readonly SVG_LENGTHTYPE_EXS: number;
+    readonly SVG_LENGTHTYPE_IN: number;
+    readonly SVG_LENGTHTYPE_MM: number;
+    readonly SVG_LENGTHTYPE_NUMBER: number;
+    readonly SVG_LENGTHTYPE_PC: number;
+    readonly SVG_LENGTHTYPE_PERCENTAGE: number;
+    readonly SVG_LENGTHTYPE_PT: number;
+    readonly SVG_LENGTHTYPE_PX: number;
+    readonly SVG_LENGTHTYPE_UNKNOWN: number;
 }
 
 declare var SVGLength: {
     prototype: SVGLength;
     new(): SVGLength;
-    SVG_LENGTHTYPE_CM: number;
-    SVG_LENGTHTYPE_EMS: number;
-    SVG_LENGTHTYPE_EXS: number;
-    SVG_LENGTHTYPE_IN: number;
-    SVG_LENGTHTYPE_MM: number;
-    SVG_LENGTHTYPE_NUMBER: number;
-    SVG_LENGTHTYPE_PC: number;
-    SVG_LENGTHTYPE_PERCENTAGE: number;
-    SVG_LENGTHTYPE_PT: number;
-    SVG_LENGTHTYPE_PX: number;
-    SVG_LENGTHTYPE_UNKNOWN: number;
+    readonly SVG_LENGTHTYPE_CM: number;
+    readonly SVG_LENGTHTYPE_EMS: number;
+    readonly SVG_LENGTHTYPE_EXS: number;
+    readonly SVG_LENGTHTYPE_IN: number;
+    readonly SVG_LENGTHTYPE_MM: number;
+    readonly SVG_LENGTHTYPE_NUMBER: number;
+    readonly SVG_LENGTHTYPE_PC: number;
+    readonly SVG_LENGTHTYPE_PERCENTAGE: number;
+    readonly SVG_LENGTHTYPE_PT: number;
+    readonly SVG_LENGTHTYPE_PX: number;
+    readonly SVG_LENGTHTYPE_UNKNOWN: number;
 }
 
 interface SVGLengthList {
-    numberOfItems: number;
+    readonly numberOfItems: number;
     appendItem(newItem: SVGLength): SVGLength;
     clear(): void;
     getItem(index: number): SVGLength;
@@ -9308,10 +10340,10 @@ declare var SVGLengthList: {
 }
 
 interface SVGLineElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    x1: SVGAnimatedLength;
-    x2: SVGAnimatedLength;
-    y1: SVGAnimatedLength;
-    y2: SVGAnimatedLength;
+    readonly x1: SVGAnimatedLength;
+    readonly x2: SVGAnimatedLength;
+    readonly y1: SVGAnimatedLength;
+    readonly y2: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9321,10 +10353,10 @@ declare var SVGLineElement: {
 }
 
 interface SVGLinearGradientElement extends SVGGradientElement {
-    x1: SVGAnimatedLength;
-    x2: SVGAnimatedLength;
-    y1: SVGAnimatedLength;
-    y2: SVGAnimatedLength;
+    readonly x1: SVGAnimatedLength;
+    readonly x2: SVGAnimatedLength;
+    readonly y1: SVGAnimatedLength;
+    readonly y2: SVGAnimatedLength;
 }
 
 declare var SVGLinearGradientElement: {
@@ -9333,42 +10365,42 @@ declare var SVGLinearGradientElement: {
 }
 
 interface SVGMarkerElement extends SVGElement, SVGStylable, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox {
-    markerHeight: SVGAnimatedLength;
-    markerUnits: SVGAnimatedEnumeration;
-    markerWidth: SVGAnimatedLength;
-    orientAngle: SVGAnimatedAngle;
-    orientType: SVGAnimatedEnumeration;
-    refX: SVGAnimatedLength;
-    refY: SVGAnimatedLength;
+    readonly markerHeight: SVGAnimatedLength;
+    readonly markerUnits: SVGAnimatedEnumeration;
+    readonly markerWidth: SVGAnimatedLength;
+    readonly orientAngle: SVGAnimatedAngle;
+    readonly orientType: SVGAnimatedEnumeration;
+    readonly refX: SVGAnimatedLength;
+    readonly refY: SVGAnimatedLength;
     setOrientToAngle(angle: SVGAngle): void;
     setOrientToAuto(): void;
-    SVG_MARKERUNITS_STROKEWIDTH: number;
-    SVG_MARKERUNITS_UNKNOWN: number;
-    SVG_MARKERUNITS_USERSPACEONUSE: number;
-    SVG_MARKER_ORIENT_ANGLE: number;
-    SVG_MARKER_ORIENT_AUTO: number;
-    SVG_MARKER_ORIENT_UNKNOWN: number;
+    readonly SVG_MARKERUNITS_STROKEWIDTH: number;
+    readonly SVG_MARKERUNITS_UNKNOWN: number;
+    readonly SVG_MARKERUNITS_USERSPACEONUSE: number;
+    readonly SVG_MARKER_ORIENT_ANGLE: number;
+    readonly SVG_MARKER_ORIENT_AUTO: number;
+    readonly SVG_MARKER_ORIENT_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGMarkerElement: {
     prototype: SVGMarkerElement;
     new(): SVGMarkerElement;
-    SVG_MARKERUNITS_STROKEWIDTH: number;
-    SVG_MARKERUNITS_UNKNOWN: number;
-    SVG_MARKERUNITS_USERSPACEONUSE: number;
-    SVG_MARKER_ORIENT_ANGLE: number;
-    SVG_MARKER_ORIENT_AUTO: number;
-    SVG_MARKER_ORIENT_UNKNOWN: number;
+    readonly SVG_MARKERUNITS_STROKEWIDTH: number;
+    readonly SVG_MARKERUNITS_UNKNOWN: number;
+    readonly SVG_MARKERUNITS_USERSPACEONUSE: number;
+    readonly SVG_MARKER_ORIENT_ANGLE: number;
+    readonly SVG_MARKER_ORIENT_AUTO: number;
+    readonly SVG_MARKER_ORIENT_UNKNOWN: number;
 }
 
 interface SVGMaskElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGUnitTypes {
-    height: SVGAnimatedLength;
-    maskContentUnits: SVGAnimatedEnumeration;
-    maskUnits: SVGAnimatedEnumeration;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly height: SVGAnimatedLength;
+    readonly maskContentUnits: SVGAnimatedEnumeration;
+    readonly maskUnits: SVGAnimatedEnumeration;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9420,7 +10452,7 @@ declare var SVGNumber: {
 }
 
 interface SVGNumberList {
-    numberOfItems: number;
+    readonly numberOfItems: number;
     appendItem(newItem: SVGNumber): SVGNumber;
     clear(): void;
     getItem(index: number): SVGNumber;
@@ -9467,53 +10499,53 @@ declare var SVGPathElement: {
 }
 
 interface SVGPathSeg {
-    pathSegType: number;
-    pathSegTypeAsLetter: string;
-    PATHSEG_ARC_ABS: number;
-    PATHSEG_ARC_REL: number;
-    PATHSEG_CLOSEPATH: number;
-    PATHSEG_CURVETO_CUBIC_ABS: number;
-    PATHSEG_CURVETO_CUBIC_REL: number;
-    PATHSEG_CURVETO_CUBIC_SMOOTH_ABS: number;
-    PATHSEG_CURVETO_CUBIC_SMOOTH_REL: number;
-    PATHSEG_CURVETO_QUADRATIC_ABS: number;
-    PATHSEG_CURVETO_QUADRATIC_REL: number;
-    PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS: number;
-    PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL: number;
-    PATHSEG_LINETO_ABS: number;
-    PATHSEG_LINETO_HORIZONTAL_ABS: number;
-    PATHSEG_LINETO_HORIZONTAL_REL: number;
-    PATHSEG_LINETO_REL: number;
-    PATHSEG_LINETO_VERTICAL_ABS: number;
-    PATHSEG_LINETO_VERTICAL_REL: number;
-    PATHSEG_MOVETO_ABS: number;
-    PATHSEG_MOVETO_REL: number;
-    PATHSEG_UNKNOWN: number;
+    readonly pathSegType: number;
+    readonly pathSegTypeAsLetter: string;
+    readonly PATHSEG_ARC_ABS: number;
+    readonly PATHSEG_ARC_REL: number;
+    readonly PATHSEG_CLOSEPATH: number;
+    readonly PATHSEG_CURVETO_CUBIC_ABS: number;
+    readonly PATHSEG_CURVETO_CUBIC_REL: number;
+    readonly PATHSEG_CURVETO_CUBIC_SMOOTH_ABS: number;
+    readonly PATHSEG_CURVETO_CUBIC_SMOOTH_REL: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_ABS: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_REL: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL: number;
+    readonly PATHSEG_LINETO_ABS: number;
+    readonly PATHSEG_LINETO_HORIZONTAL_ABS: number;
+    readonly PATHSEG_LINETO_HORIZONTAL_REL: number;
+    readonly PATHSEG_LINETO_REL: number;
+    readonly PATHSEG_LINETO_VERTICAL_ABS: number;
+    readonly PATHSEG_LINETO_VERTICAL_REL: number;
+    readonly PATHSEG_MOVETO_ABS: number;
+    readonly PATHSEG_MOVETO_REL: number;
+    readonly PATHSEG_UNKNOWN: number;
 }
 
 declare var SVGPathSeg: {
     prototype: SVGPathSeg;
     new(): SVGPathSeg;
-    PATHSEG_ARC_ABS: number;
-    PATHSEG_ARC_REL: number;
-    PATHSEG_CLOSEPATH: number;
-    PATHSEG_CURVETO_CUBIC_ABS: number;
-    PATHSEG_CURVETO_CUBIC_REL: number;
-    PATHSEG_CURVETO_CUBIC_SMOOTH_ABS: number;
-    PATHSEG_CURVETO_CUBIC_SMOOTH_REL: number;
-    PATHSEG_CURVETO_QUADRATIC_ABS: number;
-    PATHSEG_CURVETO_QUADRATIC_REL: number;
-    PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS: number;
-    PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL: number;
-    PATHSEG_LINETO_ABS: number;
-    PATHSEG_LINETO_HORIZONTAL_ABS: number;
-    PATHSEG_LINETO_HORIZONTAL_REL: number;
-    PATHSEG_LINETO_REL: number;
-    PATHSEG_LINETO_VERTICAL_ABS: number;
-    PATHSEG_LINETO_VERTICAL_REL: number;
-    PATHSEG_MOVETO_ABS: number;
-    PATHSEG_MOVETO_REL: number;
-    PATHSEG_UNKNOWN: number;
+    readonly PATHSEG_ARC_ABS: number;
+    readonly PATHSEG_ARC_REL: number;
+    readonly PATHSEG_CLOSEPATH: number;
+    readonly PATHSEG_CURVETO_CUBIC_ABS: number;
+    readonly PATHSEG_CURVETO_CUBIC_REL: number;
+    readonly PATHSEG_CURVETO_CUBIC_SMOOTH_ABS: number;
+    readonly PATHSEG_CURVETO_CUBIC_SMOOTH_REL: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_ABS: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_REL: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS: number;
+    readonly PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL: number;
+    readonly PATHSEG_LINETO_ABS: number;
+    readonly PATHSEG_LINETO_HORIZONTAL_ABS: number;
+    readonly PATHSEG_LINETO_HORIZONTAL_REL: number;
+    readonly PATHSEG_LINETO_REL: number;
+    readonly PATHSEG_LINETO_VERTICAL_ABS: number;
+    readonly PATHSEG_LINETO_VERTICAL_REL: number;
+    readonly PATHSEG_MOVETO_ABS: number;
+    readonly PATHSEG_MOVETO_REL: number;
+    readonly PATHSEG_UNKNOWN: number;
 }
 
 interface SVGPathSegArcAbs extends SVGPathSeg {
@@ -9707,7 +10739,7 @@ declare var SVGPathSegLinetoVerticalRel: {
 }
 
 interface SVGPathSegList {
-    numberOfItems: number;
+    readonly numberOfItems: number;
     appendItem(newItem: SVGPathSeg): SVGPathSeg;
     clear(): void;
     getItem(index: number): SVGPathSeg;
@@ -9743,13 +10775,13 @@ declare var SVGPathSegMovetoRel: {
 }
 
 interface SVGPatternElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox, SVGURIReference, SVGUnitTypes {
-    height: SVGAnimatedLength;
-    patternContentUnits: SVGAnimatedEnumeration;
-    patternTransform: SVGAnimatedTransformList;
-    patternUnits: SVGAnimatedEnumeration;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly height: SVGAnimatedLength;
+    readonly patternContentUnits: SVGAnimatedEnumeration;
+    readonly patternTransform: SVGAnimatedTransformList;
+    readonly patternUnits: SVGAnimatedEnumeration;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9770,7 +10802,7 @@ declare var SVGPoint: {
 }
 
 interface SVGPointList {
-    numberOfItems: number;
+    readonly numberOfItems: number;
     appendItem(newItem: SVGPoint): SVGPoint;
     clear(): void;
     getItem(index: number): SVGPoint;
@@ -9806,47 +10838,47 @@ declare var SVGPolylineElement: {
 interface SVGPreserveAspectRatio {
     align: number;
     meetOrSlice: number;
-    SVG_MEETORSLICE_MEET: number;
-    SVG_MEETORSLICE_SLICE: number;
-    SVG_MEETORSLICE_UNKNOWN: number;
-    SVG_PRESERVEASPECTRATIO_NONE: number;
-    SVG_PRESERVEASPECTRATIO_UNKNOWN: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMIN: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMIN: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMIN: number;
+    readonly SVG_MEETORSLICE_MEET: number;
+    readonly SVG_MEETORSLICE_SLICE: number;
+    readonly SVG_MEETORSLICE_UNKNOWN: number;
+    readonly SVG_PRESERVEASPECTRATIO_NONE: number;
+    readonly SVG_PRESERVEASPECTRATIO_UNKNOWN: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMAXYMAX: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMAXYMID: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMAXYMIN: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMIDYMAX: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMIDYMID: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMIDYMIN: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMINYMAX: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMINYMID: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMINYMIN: number;
 }
 
 declare var SVGPreserveAspectRatio: {
     prototype: SVGPreserveAspectRatio;
     new(): SVGPreserveAspectRatio;
-    SVG_MEETORSLICE_MEET: number;
-    SVG_MEETORSLICE_SLICE: number;
-    SVG_MEETORSLICE_UNKNOWN: number;
-    SVG_PRESERVEASPECTRATIO_NONE: number;
-    SVG_PRESERVEASPECTRATIO_UNKNOWN: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMAXYMIN: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMIDYMIN: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMAX: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMID: number;
-    SVG_PRESERVEASPECTRATIO_XMINYMIN: number;
+    readonly SVG_MEETORSLICE_MEET: number;
+    readonly SVG_MEETORSLICE_SLICE: number;
+    readonly SVG_MEETORSLICE_UNKNOWN: number;
+    readonly SVG_PRESERVEASPECTRATIO_NONE: number;
+    readonly SVG_PRESERVEASPECTRATIO_UNKNOWN: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMAXYMAX: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMAXYMID: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMAXYMIN: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMIDYMAX: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMIDYMID: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMIDYMIN: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMINYMAX: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMINYMID: number;
+    readonly SVG_PRESERVEASPECTRATIO_XMINYMIN: number;
 }
 
 interface SVGRadialGradientElement extends SVGGradientElement {
-    cx: SVGAnimatedLength;
-    cy: SVGAnimatedLength;
-    fx: SVGAnimatedLength;
-    fy: SVGAnimatedLength;
-    r: SVGAnimatedLength;
+    readonly cx: SVGAnimatedLength;
+    readonly cy: SVGAnimatedLength;
+    readonly fx: SVGAnimatedLength;
+    readonly fy: SVGAnimatedLength;
+    readonly r: SVGAnimatedLength;
 }
 
 declare var SVGRadialGradientElement: {
@@ -9867,12 +10899,12 @@ declare var SVGRect: {
 }
 
 interface SVGRectElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    height: SVGAnimatedLength;
-    rx: SVGAnimatedLength;
-    ry: SVGAnimatedLength;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly height: SVGAnimatedLength;
+    readonly rx: SVGAnimatedLength;
+    readonly ry: SVGAnimatedLength;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9885,22 +10917,22 @@ interface SVGSVGElement extends SVGElement, DocumentEvent, SVGLocatable, SVGTest
     contentScriptType: string;
     contentStyleType: string;
     currentScale: number;
-    currentTranslate: SVGPoint;
-    height: SVGAnimatedLength;
+    readonly currentTranslate: SVGPoint;
+    readonly height: SVGAnimatedLength;
     onabort: (ev: Event) => any;
     onerror: (ev: Event) => any;
     onresize: (ev: UIEvent) => any;
     onscroll: (ev: UIEvent) => any;
     onunload: (ev: Event) => any;
     onzoom: (ev: SVGZoomEvent) => any;
-    pixelUnitToMillimeterX: number;
-    pixelUnitToMillimeterY: number;
-    screenPixelToMillimeterX: number;
-    screenPixelToMillimeterY: number;
-    viewport: SVGRect;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly pixelUnitToMillimeterX: number;
+    readonly pixelUnitToMillimeterY: number;
+    readonly screenPixelToMillimeterX: number;
+    readonly screenPixelToMillimeterY: number;
+    readonly viewport: SVGRect;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     checkEnclosure(element: SVGElement, rect: SVGRect): boolean;
     checkIntersection(element: SVGElement, rect: SVGRect): boolean;
     createSVGAngle(): SVGAngle;
@@ -9916,8 +10948,8 @@ interface SVGSVGElement extends SVGElement, DocumentEvent, SVGLocatable, SVGTest
     getComputedStyle(elt: Element, pseudoElt?: string): CSSStyleDeclaration;
     getCurrentTime(): number;
     getElementById(elementId: string): Element;
-    getEnclosureList(rect: SVGRect, referenceElement: SVGElement): NodeList;
-    getIntersectionList(rect: SVGRect, referenceElement: SVGElement): NodeList;
+    getEnclosureList(rect: SVGRect, referenceElement: SVGElement): NodeListOf<SVGCircleElement | SVGEllipseElement | SVGImageElement | SVGLineElement | SVGPathElement | SVGPolygonElement | SVGPolylineElement | SVGRectElement | SVGTextElement | SVGUseElement>;
+    getIntersectionList(rect: SVGRect, referenceElement: SVGElement): NodeListOf<SVGCircleElement | SVGEllipseElement | SVGImageElement | SVGLineElement | SVGPathElement | SVGPolygonElement | SVGPolylineElement | SVGRectElement | SVGTextElement | SVGUseElement>;
     pauseAnimations(): void;
     setCurrentTime(seconds: number): void;
     suspendRedraw(maxWaitMilliseconds: number): number;
@@ -9995,7 +11027,7 @@ declare var SVGScriptElement: {
 }
 
 interface SVGStopElement extends SVGElement, SVGStylable {
-    offset: SVGAnimatedNumber;
+    readonly offset: SVGAnimatedNumber;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10005,7 +11037,7 @@ declare var SVGStopElement: {
 }
 
 interface SVGStringList {
-    numberOfItems: number;
+    readonly numberOfItems: number;
     appendItem(newItem: string): string;
     clear(): void;
     getItem(index: number): string;
@@ -10021,6 +11053,7 @@ declare var SVGStringList: {
 }
 
 interface SVGStyleElement extends SVGElement, SVGLangSpace {
+    disabled: boolean;
     media: string;
     title: string;
     type: string;
@@ -10059,8 +11092,8 @@ declare var SVGTSpanElement: {
 }
 
 interface SVGTextContentElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
-    lengthAdjust: SVGAnimatedEnumeration;
-    textLength: SVGAnimatedLength;
+    readonly lengthAdjust: SVGAnimatedEnumeration;
+    readonly textLength: SVGAnimatedLength;
     getCharNumAtPosition(point: SVGPoint): number;
     getComputedTextLength(): number;
     getEndPositionOfChar(charnum: number): SVGPoint;
@@ -10070,18 +11103,18 @@ interface SVGTextContentElement extends SVGElement, SVGStylable, SVGTests, SVGLa
     getStartPositionOfChar(charnum: number): SVGPoint;
     getSubStringLength(charnum: number, nchars: number): number;
     selectSubString(charnum: number, nchars: number): void;
-    LENGTHADJUST_SPACING: number;
-    LENGTHADJUST_SPACINGANDGLYPHS: number;
-    LENGTHADJUST_UNKNOWN: number;
+    readonly LENGTHADJUST_SPACING: number;
+    readonly LENGTHADJUST_SPACINGANDGLYPHS: number;
+    readonly LENGTHADJUST_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGTextContentElement: {
     prototype: SVGTextContentElement;
     new(): SVGTextContentElement;
-    LENGTHADJUST_SPACING: number;
-    LENGTHADJUST_SPACINGANDGLYPHS: number;
-    LENGTHADJUST_UNKNOWN: number;
+    readonly LENGTHADJUST_SPACING: number;
+    readonly LENGTHADJUST_SPACINGANDGLYPHS: number;
+    readonly LENGTHADJUST_UNKNOWN: number;
 }
 
 interface SVGTextElement extends SVGTextPositioningElement, SVGTransformable {
@@ -10094,35 +11127,35 @@ declare var SVGTextElement: {
 }
 
 interface SVGTextPathElement extends SVGTextContentElement, SVGURIReference {
-    method: SVGAnimatedEnumeration;
-    spacing: SVGAnimatedEnumeration;
-    startOffset: SVGAnimatedLength;
-    TEXTPATH_METHODTYPE_ALIGN: number;
-    TEXTPATH_METHODTYPE_STRETCH: number;
-    TEXTPATH_METHODTYPE_UNKNOWN: number;
-    TEXTPATH_SPACINGTYPE_AUTO: number;
-    TEXTPATH_SPACINGTYPE_EXACT: number;
-    TEXTPATH_SPACINGTYPE_UNKNOWN: number;
+    readonly method: SVGAnimatedEnumeration;
+    readonly spacing: SVGAnimatedEnumeration;
+    readonly startOffset: SVGAnimatedLength;
+    readonly TEXTPATH_METHODTYPE_ALIGN: number;
+    readonly TEXTPATH_METHODTYPE_STRETCH: number;
+    readonly TEXTPATH_METHODTYPE_UNKNOWN: number;
+    readonly TEXTPATH_SPACINGTYPE_AUTO: number;
+    readonly TEXTPATH_SPACINGTYPE_EXACT: number;
+    readonly TEXTPATH_SPACINGTYPE_UNKNOWN: number;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGTextPathElement: {
     prototype: SVGTextPathElement;
     new(): SVGTextPathElement;
-    TEXTPATH_METHODTYPE_ALIGN: number;
-    TEXTPATH_METHODTYPE_STRETCH: number;
-    TEXTPATH_METHODTYPE_UNKNOWN: number;
-    TEXTPATH_SPACINGTYPE_AUTO: number;
-    TEXTPATH_SPACINGTYPE_EXACT: number;
-    TEXTPATH_SPACINGTYPE_UNKNOWN: number;
+    readonly TEXTPATH_METHODTYPE_ALIGN: number;
+    readonly TEXTPATH_METHODTYPE_STRETCH: number;
+    readonly TEXTPATH_METHODTYPE_UNKNOWN: number;
+    readonly TEXTPATH_SPACINGTYPE_AUTO: number;
+    readonly TEXTPATH_SPACINGTYPE_EXACT: number;
+    readonly TEXTPATH_SPACINGTYPE_UNKNOWN: number;
 }
 
 interface SVGTextPositioningElement extends SVGTextContentElement {
-    dx: SVGAnimatedLengthList;
-    dy: SVGAnimatedLengthList;
-    rotate: SVGAnimatedNumberList;
-    x: SVGAnimatedLengthList;
-    y: SVGAnimatedLengthList;
+    readonly dx: SVGAnimatedLengthList;
+    readonly dy: SVGAnimatedLengthList;
+    readonly rotate: SVGAnimatedNumberList;
+    readonly x: SVGAnimatedLengthList;
+    readonly y: SVGAnimatedLengthList;
 }
 
 declare var SVGTextPositioningElement: {
@@ -10140,38 +11173,38 @@ declare var SVGTitleElement: {
 }
 
 interface SVGTransform {
-    angle: number;
-    matrix: SVGMatrix;
-    type: number;
+    readonly angle: number;
+    readonly matrix: SVGMatrix;
+    readonly type: number;
     setMatrix(matrix: SVGMatrix): void;
     setRotate(angle: number, cx: number, cy: number): void;
     setScale(sx: number, sy: number): void;
     setSkewX(angle: number): void;
     setSkewY(angle: number): void;
     setTranslate(tx: number, ty: number): void;
-    SVG_TRANSFORM_MATRIX: number;
-    SVG_TRANSFORM_ROTATE: number;
-    SVG_TRANSFORM_SCALE: number;
-    SVG_TRANSFORM_SKEWX: number;
-    SVG_TRANSFORM_SKEWY: number;
-    SVG_TRANSFORM_TRANSLATE: number;
-    SVG_TRANSFORM_UNKNOWN: number;
+    readonly SVG_TRANSFORM_MATRIX: number;
+    readonly SVG_TRANSFORM_ROTATE: number;
+    readonly SVG_TRANSFORM_SCALE: number;
+    readonly SVG_TRANSFORM_SKEWX: number;
+    readonly SVG_TRANSFORM_SKEWY: number;
+    readonly SVG_TRANSFORM_TRANSLATE: number;
+    readonly SVG_TRANSFORM_UNKNOWN: number;
 }
 
 declare var SVGTransform: {
     prototype: SVGTransform;
     new(): SVGTransform;
-    SVG_TRANSFORM_MATRIX: number;
-    SVG_TRANSFORM_ROTATE: number;
-    SVG_TRANSFORM_SCALE: number;
-    SVG_TRANSFORM_SKEWX: number;
-    SVG_TRANSFORM_SKEWY: number;
-    SVG_TRANSFORM_TRANSLATE: number;
-    SVG_TRANSFORM_UNKNOWN: number;
+    readonly SVG_TRANSFORM_MATRIX: number;
+    readonly SVG_TRANSFORM_ROTATE: number;
+    readonly SVG_TRANSFORM_SCALE: number;
+    readonly SVG_TRANSFORM_SKEWX: number;
+    readonly SVG_TRANSFORM_SKEWY: number;
+    readonly SVG_TRANSFORM_TRANSLATE: number;
+    readonly SVG_TRANSFORM_UNKNOWN: number;
 }
 
 interface SVGTransformList {
-    numberOfItems: number;
+    readonly numberOfItems: number;
     appendItem(newItem: SVGTransform): SVGTransform;
     clear(): void;
     consolidate(): SVGTransform;
@@ -10189,19 +11222,19 @@ declare var SVGTransformList: {
 }
 
 interface SVGUnitTypes {
-    SVG_UNIT_TYPE_OBJECTBOUNDINGBOX: number;
-    SVG_UNIT_TYPE_UNKNOWN: number;
-    SVG_UNIT_TYPE_USERSPACEONUSE: number;
+    readonly SVG_UNIT_TYPE_OBJECTBOUNDINGBOX: number;
+    readonly SVG_UNIT_TYPE_UNKNOWN: number;
+    readonly SVG_UNIT_TYPE_USERSPACEONUSE: number;
 }
 declare var SVGUnitTypes: SVGUnitTypes;
 
 interface SVGUseElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference {
-    animatedInstanceRoot: SVGElementInstance;
-    height: SVGAnimatedLength;
-    instanceRoot: SVGElementInstance;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly animatedInstanceRoot: SVGElementInstance;
+    readonly height: SVGAnimatedLength;
+    readonly instanceRoot: SVGElementInstance;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10211,7 +11244,7 @@ declare var SVGUseElement: {
 }
 
 interface SVGViewElement extends SVGElement, SVGExternalResourcesRequired, SVGFitToViewBox, SVGZoomAndPan {
-    viewTarget: SVGStringList;
+    readonly viewTarget: SVGStringList;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10221,21 +11254,21 @@ declare var SVGViewElement: {
 }
 
 interface SVGZoomAndPan {
-    zoomAndPan: number;
+    readonly zoomAndPan: number;
 }
 
 declare var SVGZoomAndPan: {
-    SVG_ZOOMANDPAN_DISABLE: number;
-    SVG_ZOOMANDPAN_MAGNIFY: number;
-    SVG_ZOOMANDPAN_UNKNOWN: number;
+    readonly SVG_ZOOMANDPAN_DISABLE: number;
+    readonly SVG_ZOOMANDPAN_MAGNIFY: number;
+    readonly SVG_ZOOMANDPAN_UNKNOWN: number;
 }
 
 interface SVGZoomEvent extends UIEvent {
-    newScale: number;
-    newTranslate: SVGPoint;
-    previousScale: number;
-    previousTranslate: SVGPoint;
-    zoomRectScreen: SVGRect;
+    readonly newScale: number;
+    readonly newTranslate: SVGPoint;
+    readonly previousScale: number;
+    readonly previousTranslate: SVGPoint;
+    readonly zoomRectScreen: SVGRect;
 }
 
 declare var SVGZoomEvent: {
@@ -10244,22 +11277,22 @@ declare var SVGZoomEvent: {
 }
 
 interface Screen extends EventTarget {
-    availHeight: number;
-    availWidth: number;
+    readonly availHeight: number;
+    readonly availWidth: number;
     bufferDepth: number;
-    colorDepth: number;
-    deviceXDPI: number;
-    deviceYDPI: number;
-    fontSmoothingEnabled: boolean;
-    height: number;
-    logicalXDPI: number;
-    logicalYDPI: number;
-    msOrientation: string;
+    readonly colorDepth: number;
+    readonly deviceXDPI: number;
+    readonly deviceYDPI: number;
+    readonly fontSmoothingEnabled: boolean;
+    readonly height: number;
+    readonly logicalXDPI: number;
+    readonly logicalYDPI: number;
+    readonly msOrientation: string;
     onmsorientationchange: (ev: Event) => any;
-    pixelDepth: number;
-    systemXDPI: number;
-    systemYDPI: number;
-    width: number;
+    readonly pixelDepth: number;
+    readonly systemXDPI: number;
+    readonly systemYDPI: number;
+    readonly width: number;
     msLockOrientation(orientations: string | string[]): boolean;
     msUnlockOrientation(): void;
     addEventListener(type: "MSOrientationChange", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -10272,8 +11305,8 @@ declare var Screen: {
 }
 
 interface ScriptNotifyEvent extends Event {
-    callingUri: string;
-    value: string;
+    readonly callingUri: string;
+    readonly value: string;
 }
 
 declare var ScriptNotifyEvent: {
@@ -10282,7 +11315,7 @@ declare var ScriptNotifyEvent: {
 }
 
 interface ScriptProcessorNode extends AudioNode {
-    bufferSize: number;
+    readonly bufferSize: number;
     onaudioprocess: (ev: AudioProcessingEvent) => any;
     addEventListener(type: "audioprocess", listener: (ev: AudioProcessingEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -10294,13 +11327,13 @@ declare var ScriptProcessorNode: {
 }
 
 interface Selection {
-    anchorNode: Node;
-    anchorOffset: number;
-    focusNode: Node;
-    focusOffset: number;
-    isCollapsed: boolean;
-    rangeCount: number;
-    type: string;
+    readonly anchorNode: Node;
+    readonly anchorOffset: number;
+    readonly focusNode: Node;
+    readonly focusOffset: number;
+    readonly isCollapsed: boolean;
+    readonly rangeCount: number;
+    readonly type: string;
     addRange(range: Range): void;
     collapse(parentNode: Node, offset: number): void;
     collapseToEnd(): void;
@@ -10325,12 +11358,12 @@ declare var Selection: {
 interface SourceBuffer extends EventTarget {
     appendWindowEnd: number;
     appendWindowStart: number;
-    audioTracks: AudioTrackList;
-    buffered: TimeRanges;
+    readonly audioTracks: AudioTrackList;
+    readonly buffered: TimeRanges;
     mode: string;
     timestampOffset: number;
-    updating: boolean;
-    videoTracks: VideoTrackList;
+    readonly updating: boolean;
+    readonly videoTracks: VideoTrackList;
     abort(): void;
     appendBuffer(data: ArrayBuffer | ArrayBufferView): void;
     appendStream(stream: MSStream, maxSize?: number): void;
@@ -10343,7 +11376,7 @@ declare var SourceBuffer: {
 }
 
 interface SourceBufferList extends EventTarget {
-    length: number;
+    readonly length: number;
     item(index: number): SourceBuffer;
     [index: number]: SourceBuffer;
 }
@@ -10354,7 +11387,7 @@ declare var SourceBufferList: {
 }
 
 interface StereoPannerNode extends AudioNode {
-    pan: AudioParam;
+    readonly pan: AudioParam;
 }
 
 declare var StereoPannerNode: {
@@ -10363,9 +11396,9 @@ declare var StereoPannerNode: {
 }
 
 interface Storage {
-    length: number;
+    readonly length: number;
     clear(): void;
-    getItem(key: string): any;
+    getItem(key: string): string;
     key(index: number): string;
     removeItem(key: string): void;
     setItem(key: string, data: string): void;
@@ -10379,7 +11412,7 @@ declare var Storage: {
 }
 
 interface StorageEvent extends Event {
-    url: string;
+    readonly url: string;
     key?: string;
     oldValue?: string;
     newValue?: string;
@@ -10392,7 +11425,7 @@ declare var StorageEvent: {
 }
 
 interface StyleMedia {
-    type: string;
+    readonly type: string;
     matchMedium(mediaquery: string): boolean;
 }
 
@@ -10403,12 +11436,12 @@ declare var StyleMedia: {
 
 interface StyleSheet {
     disabled: boolean;
-    href: string;
-    media: MediaList;
-    ownerNode: Node;
-    parentStyleSheet: StyleSheet;
-    title: string;
-    type: string;
+    readonly href: string;
+    readonly media: MediaList;
+    readonly ownerNode: Node;
+    readonly parentStyleSheet: StyleSheet;
+    readonly title: string;
+    readonly type: string;
 }
 
 declare var StyleSheet: {
@@ -10417,7 +11450,7 @@ declare var StyleSheet: {
 }
 
 interface StyleSheetList {
-    length: number;
+    readonly length: number;
     item(index?: number): StyleSheet;
     [index: number]: StyleSheet;
 }
@@ -10428,7 +11461,7 @@ declare var StyleSheetList: {
 }
 
 interface StyleSheetPageList {
-    length: number;
+    readonly length: number;
     item(index: number): CSSPageRule;
     [index: number]: CSSPageRule;
 }
@@ -10439,18 +11472,18 @@ declare var StyleSheetPageList: {
 }
 
 interface SubtleCrypto {
-    decrypt(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): any;
-    deriveBits(algorithm: string | Algorithm, baseKey: CryptoKey, length: number): any;
-    deriveKey(algorithm: string | Algorithm, baseKey: CryptoKey, derivedKeyType: string | Algorithm, extractable: boolean, keyUsages: string[]): any;
-    digest(algorithm: string | Algorithm, data: ArrayBufferView): any;
-    encrypt(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): any;
-    exportKey(format: string, key: CryptoKey): any;
-    generateKey(algorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): any;
-    importKey(format: string, keyData: ArrayBufferView, algorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): any;
-    sign(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): any;
-    unwrapKey(format: string, wrappedKey: ArrayBufferView, unwrappingKey: CryptoKey, unwrapAlgorithm: string | Algorithm, unwrappedKeyAlgorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): any;
-    verify(algorithm: string | Algorithm, key: CryptoKey, signature: ArrayBufferView, data: ArrayBufferView): any;
-    wrapKey(format: string, key: CryptoKey, wrappingKey: CryptoKey, wrapAlgorithm: string | Algorithm): any;
+    decrypt(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): PromiseLike<any>;
+    deriveBits(algorithm: string | Algorithm, baseKey: CryptoKey, length: number): PromiseLike<any>;
+    deriveKey(algorithm: string | Algorithm, baseKey: CryptoKey, derivedKeyType: string | Algorithm, extractable: boolean, keyUsages: string[]): PromiseLike<any>;
+    digest(algorithm: string | Algorithm, data: ArrayBufferView): PromiseLike<any>;
+    encrypt(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): PromiseLike<any>;
+    exportKey(format: string, key: CryptoKey): PromiseLike<any>;
+    generateKey(algorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): PromiseLike<any>;
+    importKey(format: string, keyData: ArrayBufferView, algorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): PromiseLike<any>;
+    sign(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): PromiseLike<any>;
+    unwrapKey(format: string, wrappedKey: ArrayBufferView, unwrappingKey: CryptoKey, unwrapAlgorithm: string | Algorithm, unwrappedKeyAlgorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): PromiseLike<any>;
+    verify(algorithm: string | Algorithm, key: CryptoKey, signature: ArrayBufferView, data: ArrayBufferView): PromiseLike<any>;
+    wrapKey(format: string, key: CryptoKey, wrappingKey: CryptoKey, wrapAlgorithm: string | Algorithm): PromiseLike<any>;
 }
 
 declare var SubtleCrypto: {
@@ -10459,8 +11492,7 @@ declare var SubtleCrypto: {
 }
 
 interface Text extends CharacterData {
-    wholeText: string;
-    replaceWholeText(content: string): Text;
+    readonly wholeText: string;
     splitText(offset: number): Text;
 }
 
@@ -10470,39 +11502,39 @@ declare var Text: {
 }
 
 interface TextEvent extends UIEvent {
-    data: string;
-    inputMethod: number;
-    locale: string;
+    readonly data: string;
+    readonly inputMethod: number;
+    readonly locale: string;
     initTextEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, dataArg: string, inputMethod: number, locale: string): void;
-    DOM_INPUT_METHOD_DROP: number;
-    DOM_INPUT_METHOD_HANDWRITING: number;
-    DOM_INPUT_METHOD_IME: number;
-    DOM_INPUT_METHOD_KEYBOARD: number;
-    DOM_INPUT_METHOD_MULTIMODAL: number;
-    DOM_INPUT_METHOD_OPTION: number;
-    DOM_INPUT_METHOD_PASTE: number;
-    DOM_INPUT_METHOD_SCRIPT: number;
-    DOM_INPUT_METHOD_UNKNOWN: number;
-    DOM_INPUT_METHOD_VOICE: number;
+    readonly DOM_INPUT_METHOD_DROP: number;
+    readonly DOM_INPUT_METHOD_HANDWRITING: number;
+    readonly DOM_INPUT_METHOD_IME: number;
+    readonly DOM_INPUT_METHOD_KEYBOARD: number;
+    readonly DOM_INPUT_METHOD_MULTIMODAL: number;
+    readonly DOM_INPUT_METHOD_OPTION: number;
+    readonly DOM_INPUT_METHOD_PASTE: number;
+    readonly DOM_INPUT_METHOD_SCRIPT: number;
+    readonly DOM_INPUT_METHOD_UNKNOWN: number;
+    readonly DOM_INPUT_METHOD_VOICE: number;
 }
 
 declare var TextEvent: {
     prototype: TextEvent;
     new(): TextEvent;
-    DOM_INPUT_METHOD_DROP: number;
-    DOM_INPUT_METHOD_HANDWRITING: number;
-    DOM_INPUT_METHOD_IME: number;
-    DOM_INPUT_METHOD_KEYBOARD: number;
-    DOM_INPUT_METHOD_MULTIMODAL: number;
-    DOM_INPUT_METHOD_OPTION: number;
-    DOM_INPUT_METHOD_PASTE: number;
-    DOM_INPUT_METHOD_SCRIPT: number;
-    DOM_INPUT_METHOD_UNKNOWN: number;
-    DOM_INPUT_METHOD_VOICE: number;
+    readonly DOM_INPUT_METHOD_DROP: number;
+    readonly DOM_INPUT_METHOD_HANDWRITING: number;
+    readonly DOM_INPUT_METHOD_IME: number;
+    readonly DOM_INPUT_METHOD_KEYBOARD: number;
+    readonly DOM_INPUT_METHOD_MULTIMODAL: number;
+    readonly DOM_INPUT_METHOD_OPTION: number;
+    readonly DOM_INPUT_METHOD_PASTE: number;
+    readonly DOM_INPUT_METHOD_SCRIPT: number;
+    readonly DOM_INPUT_METHOD_UNKNOWN: number;
+    readonly DOM_INPUT_METHOD_VOICE: number;
 }
 
 interface TextMetrics {
-    width: number;
+    readonly width: number;
 }
 
 declare var TextMetrics: {
@@ -10510,83 +11542,27 @@ declare var TextMetrics: {
     new(): TextMetrics;
 }
 
-interface TextRange {
-    boundingHeight: number;
-    boundingLeft: number;
-    boundingTop: number;
-    boundingWidth: number;
-    htmlText: string;
-    offsetLeft: number;
-    offsetTop: number;
-    text: string;
-    collapse(start?: boolean): void;
-    compareEndPoints(how: string, sourceRange: TextRange): number;
-    duplicate(): TextRange;
-    execCommand(cmdID: string, showUI?: boolean, value?: any): boolean;
-    execCommandShowHelp(cmdID: string): boolean;
-    expand(Unit: string): boolean;
-    findText(string: string, count?: number, flags?: number): boolean;
-    getBookmark(): string;
-    getBoundingClientRect(): ClientRect;
-    getClientRects(): ClientRectList;
-    inRange(range: TextRange): boolean;
-    isEqual(range: TextRange): boolean;
-    move(unit: string, count?: number): number;
-    moveEnd(unit: string, count?: number): number;
-    moveStart(unit: string, count?: number): number;
-    moveToBookmark(bookmark: string): boolean;
-    moveToElementText(element: Element): void;
-    moveToPoint(x: number, y: number): void;
-    parentElement(): Element;
-    pasteHTML(html: string): void;
-    queryCommandEnabled(cmdID: string): boolean;
-    queryCommandIndeterm(cmdID: string): boolean;
-    queryCommandState(cmdID: string): boolean;
-    queryCommandSupported(cmdID: string): boolean;
-    queryCommandText(cmdID: string): string;
-    queryCommandValue(cmdID: string): any;
-    scrollIntoView(fStart?: boolean): void;
-    select(): void;
-    setEndPoint(how: string, SourceRange: TextRange): void;
-}
-
-declare var TextRange: {
-    prototype: TextRange;
-    new(): TextRange;
-}
-
-interface TextRangeCollection {
-    length: number;
-    item(index: number): TextRange;
-    [index: number]: TextRange;
-}
-
-declare var TextRangeCollection: {
-    prototype: TextRangeCollection;
-    new(): TextRangeCollection;
-}
-
 interface TextTrack extends EventTarget {
-    activeCues: TextTrackCueList;
-    cues: TextTrackCueList;
-    inBandMetadataTrackDispatchType: string;
-    kind: string;
-    label: string;
-    language: string;
+    readonly activeCues: TextTrackCueList;
+    readonly cues: TextTrackCueList;
+    readonly inBandMetadataTrackDispatchType: string;
+    readonly kind: string;
+    readonly label: string;
+    readonly language: string;
     mode: any;
     oncuechange: (ev: Event) => any;
     onerror: (ev: Event) => any;
     onload: (ev: Event) => any;
-    readyState: number;
+    readonly readyState: number;
     addCue(cue: TextTrackCue): void;
     removeCue(cue: TextTrackCue): void;
-    DISABLED: number;
-    ERROR: number;
-    HIDDEN: number;
-    LOADED: number;
-    LOADING: number;
-    NONE: number;
-    SHOWING: number;
+    readonly DISABLED: number;
+    readonly ERROR: number;
+    readonly HIDDEN: number;
+    readonly LOADED: number;
+    readonly LOADING: number;
+    readonly NONE: number;
+    readonly SHOWING: number;
     addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -10596,13 +11572,13 @@ interface TextTrack extends EventTarget {
 declare var TextTrack: {
     prototype: TextTrack;
     new(): TextTrack;
-    DISABLED: number;
-    ERROR: number;
-    HIDDEN: number;
-    LOADED: number;
-    LOADING: number;
-    NONE: number;
-    SHOWING: number;
+    readonly DISABLED: number;
+    readonly ERROR: number;
+    readonly HIDDEN: number;
+    readonly LOADED: number;
+    readonly LOADING: number;
+    readonly NONE: number;
+    readonly SHOWING: number;
 }
 
 interface TextTrackCue extends EventTarget {
@@ -10613,7 +11589,7 @@ interface TextTrackCue extends EventTarget {
     pauseOnExit: boolean;
     startTime: number;
     text: string;
-    track: TextTrack;
+    readonly track: TextTrack;
     getCueAsHTML(): DocumentFragment;
     addEventListener(type: "enter", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "exit", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -10626,7 +11602,7 @@ declare var TextTrackCue: {
 }
 
 interface TextTrackCueList {
-    length: number;
+    readonly length: number;
     getCueById(id: string): TextTrackCue;
     item(index: number): TextTrackCue;
     [index: number]: TextTrackCue;
@@ -10638,7 +11614,7 @@ declare var TextTrackCueList: {
 }
 
 interface TextTrackList extends EventTarget {
-    length: number;
+    readonly length: number;
     onaddtrack: (ev: TrackEvent) => any;
     item(index: number): TextTrack;
     addEventListener(type: "addtrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void;
@@ -10652,7 +11628,7 @@ declare var TextTrackList: {
 }
 
 interface TimeRanges {
-    length: number;
+    readonly length: number;
     end(index: number): number;
     start(index: number): number;
 }
@@ -10663,14 +11639,14 @@ declare var TimeRanges: {
 }
 
 interface Touch {
-    clientX: number;
-    clientY: number;
-    identifier: number;
-    pageX: number;
-    pageY: number;
-    screenX: number;
-    screenY: number;
-    target: EventTarget;
+    readonly clientX: number;
+    readonly clientY: number;
+    readonly identifier: number;
+    readonly pageX: number;
+    readonly pageY: number;
+    readonly screenX: number;
+    readonly screenY: number;
+    readonly target: EventTarget;
 }
 
 declare var Touch: {
@@ -10679,13 +11655,13 @@ declare var Touch: {
 }
 
 interface TouchEvent extends UIEvent {
-    altKey: boolean;
-    changedTouches: TouchList;
-    ctrlKey: boolean;
-    metaKey: boolean;
-    shiftKey: boolean;
-    targetTouches: TouchList;
-    touches: TouchList;
+    readonly altKey: boolean;
+    readonly changedTouches: TouchList;
+    readonly ctrlKey: boolean;
+    readonly metaKey: boolean;
+    readonly shiftKey: boolean;
+    readonly targetTouches: TouchList;
+    readonly touches: TouchList;
 }
 
 declare var TouchEvent: {
@@ -10694,7 +11670,7 @@ declare var TouchEvent: {
 }
 
 interface TouchList {
-    length: number;
+    readonly length: number;
     item(index: number): Touch;
     [index: number]: Touch;
 }
@@ -10705,7 +11681,7 @@ declare var TouchList: {
 }
 
 interface TrackEvent extends Event {
-    track: any;
+    readonly track: any;
 }
 
 declare var TrackEvent: {
@@ -10714,8 +11690,8 @@ declare var TrackEvent: {
 }
 
 interface TransitionEvent extends Event {
-    elapsedTime: number;
-    propertyName: string;
+    readonly elapsedTime: number;
+    readonly propertyName: string;
     initTransitionEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, propertyNameArg: string, elapsedTimeArg: number): void;
 }
 
@@ -10726,10 +11702,10 @@ declare var TransitionEvent: {
 
 interface TreeWalker {
     currentNode: Node;
-    expandEntityReferences: boolean;
-    filter: NodeFilter;
-    root: Node;
-    whatToShow: number;
+    readonly expandEntityReferences: boolean;
+    readonly filter: NodeFilter;
+    readonly root: Node;
+    readonly whatToShow: number;
     firstChild(): Node;
     lastChild(): Node;
     nextNode(): Node;
@@ -10745,8 +11721,8 @@ declare var TreeWalker: {
 }
 
 interface UIEvent extends Event {
-    detail: number;
-    view: Window;
+    readonly detail: number;
+    readonly view: Window;
     initUIEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number): void;
 }
 
@@ -10756,13 +11732,29 @@ declare var UIEvent: {
 }
 
 interface URL {
+    hash: string;
+    host: string;
+    hostname: string;
+    href: string;
+    readonly origin: string;
+    password: string;
+    pathname: string;
+    port: string;
+    protocol: string;
+    search: string;
+    username: string;
+    toString(): string;
+}
+
+declare var URL: {
+    prototype: URL;
+    new(url: string, base?: string): URL;
     createObjectURL(object: any, options?: ObjectURLOptions): string;
     revokeObjectURL(url: string): void;
 }
-declare var URL: URL;
 
 interface UnviewableContentIdentifiedEvent extends NavigationEventWithReferrer {
-    mediaType: string;
+    readonly mediaType: string;
 }
 
 declare var UnviewableContentIdentifiedEvent: {
@@ -10771,16 +11763,16 @@ declare var UnviewableContentIdentifiedEvent: {
 }
 
 interface ValidityState {
-    badInput: boolean;
-    customError: boolean;
-    patternMismatch: boolean;
-    rangeOverflow: boolean;
-    rangeUnderflow: boolean;
-    stepMismatch: boolean;
-    tooLong: boolean;
-    typeMismatch: boolean;
-    valid: boolean;
-    valueMissing: boolean;
+    readonly badInput: boolean;
+    readonly customError: boolean;
+    readonly patternMismatch: boolean;
+    readonly rangeOverflow: boolean;
+    readonly rangeUnderflow: boolean;
+    readonly stepMismatch: boolean;
+    readonly tooLong: boolean;
+    readonly typeMismatch: boolean;
+    readonly valid: boolean;
+    readonly valueMissing: boolean;
 }
 
 declare var ValidityState: {
@@ -10789,11 +11781,11 @@ declare var ValidityState: {
 }
 
 interface VideoPlaybackQuality {
-    corruptedVideoFrames: number;
-    creationTime: number;
-    droppedVideoFrames: number;
-    totalFrameDelay: number;
-    totalVideoFrames: number;
+    readonly corruptedVideoFrames: number;
+    readonly creationTime: number;
+    readonly droppedVideoFrames: number;
+    readonly totalFrameDelay: number;
+    readonly totalVideoFrames: number;
 }
 
 declare var VideoPlaybackQuality: {
@@ -10802,12 +11794,12 @@ declare var VideoPlaybackQuality: {
 }
 
 interface VideoTrack {
-    id: string;
+    readonly id: string;
     kind: string;
-    label: string;
+    readonly label: string;
     language: string;
     selected: boolean;
-    sourceBuffer: SourceBuffer;
+    readonly sourceBuffer: SourceBuffer;
 }
 
 declare var VideoTrack: {
@@ -10816,11 +11808,11 @@ declare var VideoTrack: {
 }
 
 interface VideoTrackList extends EventTarget {
-    length: number;
+    readonly length: number;
     onaddtrack: (ev: TrackEvent) => any;
     onchange: (ev: Event) => any;
     onremovetrack: (ev: TrackEvent) => any;
-    selectedIndex: number;
+    readonly selectedIndex: number;
     getTrackById(id: string): VideoTrack;
     item(index: number): VideoTrack;
     addEventListener(type: "addtrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void;
@@ -10836,41 +11828,41 @@ declare var VideoTrackList: {
 }
 
 interface WEBGL_compressed_texture_s3tc {
-    COMPRESSED_RGBA_S3TC_DXT1_EXT: number;
-    COMPRESSED_RGBA_S3TC_DXT3_EXT: number;
-    COMPRESSED_RGBA_S3TC_DXT5_EXT: number;
-    COMPRESSED_RGB_S3TC_DXT1_EXT: number;
+    readonly COMPRESSED_RGBA_S3TC_DXT1_EXT: number;
+    readonly COMPRESSED_RGBA_S3TC_DXT3_EXT: number;
+    readonly COMPRESSED_RGBA_S3TC_DXT5_EXT: number;
+    readonly COMPRESSED_RGB_S3TC_DXT1_EXT: number;
 }
 
 declare var WEBGL_compressed_texture_s3tc: {
     prototype: WEBGL_compressed_texture_s3tc;
     new(): WEBGL_compressed_texture_s3tc;
-    COMPRESSED_RGBA_S3TC_DXT1_EXT: number;
-    COMPRESSED_RGBA_S3TC_DXT3_EXT: number;
-    COMPRESSED_RGBA_S3TC_DXT5_EXT: number;
-    COMPRESSED_RGB_S3TC_DXT1_EXT: number;
+    readonly COMPRESSED_RGBA_S3TC_DXT1_EXT: number;
+    readonly COMPRESSED_RGBA_S3TC_DXT3_EXT: number;
+    readonly COMPRESSED_RGBA_S3TC_DXT5_EXT: number;
+    readonly COMPRESSED_RGB_S3TC_DXT1_EXT: number;
 }
 
 interface WEBGL_debug_renderer_info {
-    UNMASKED_RENDERER_WEBGL: number;
-    UNMASKED_VENDOR_WEBGL: number;
+    readonly UNMASKED_RENDERER_WEBGL: number;
+    readonly UNMASKED_VENDOR_WEBGL: number;
 }
 
 declare var WEBGL_debug_renderer_info: {
     prototype: WEBGL_debug_renderer_info;
     new(): WEBGL_debug_renderer_info;
-    UNMASKED_RENDERER_WEBGL: number;
-    UNMASKED_VENDOR_WEBGL: number;
+    readonly UNMASKED_RENDERER_WEBGL: number;
+    readonly UNMASKED_VENDOR_WEBGL: number;
 }
 
 interface WEBGL_depth_texture {
-    UNSIGNED_INT_24_8_WEBGL: number;
+    readonly UNSIGNED_INT_24_8_WEBGL: number;
 }
 
 declare var WEBGL_depth_texture: {
     prototype: WEBGL_depth_texture;
     new(): WEBGL_depth_texture;
-    UNSIGNED_INT_24_8_WEBGL: number;
+    readonly UNSIGNED_INT_24_8_WEBGL: number;
 }
 
 interface WaveShaperNode extends AudioNode {
@@ -10884,9 +11876,9 @@ declare var WaveShaperNode: {
 }
 
 interface WebGLActiveInfo {
-    name: string;
-    size: number;
-    type: number;
+    readonly name: string;
+    readonly size: number;
+    readonly type: number;
 }
 
 declare var WebGLActiveInfo: {
@@ -10903,12 +11895,12 @@ declare var WebGLBuffer: {
 }
 
 interface WebGLContextEvent extends Event {
-    statusMessage: string;
+    readonly statusMessage: string;
 }
 
 declare var WebGLContextEvent: {
     prototype: WebGLContextEvent;
-    new(): WebGLContextEvent;
+    new(type: string, eventInitDict?: WebGLContextEventInit): WebGLContextEvent;
 }
 
 interface WebGLFramebuffer extends WebGLObject {
@@ -10944,9 +11936,9 @@ declare var WebGLRenderbuffer: {
 }
 
 interface WebGLRenderingContext {
-    canvas: HTMLCanvasElement;
-    drawingBufferHeight: number;
-    drawingBufferWidth: number;
+    readonly canvas: HTMLCanvasElement;
+    readonly drawingBufferHeight: number;
+    readonly drawingBufferWidth: number;
     activeTexture(texture: number): void;
     attachShader(program: WebGLProgram, shader: WebGLShader): void;
     bindAttribLocation(program: WebGLProgram, index: number, name: string): void;
@@ -11061,635 +12053,635 @@ interface WebGLRenderingContext {
     texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, video: HTMLVideoElement): void;
     texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, pixels: ImageData): void;
     uniform1f(location: WebGLUniformLocation, x: number): void;
-    uniform1fv(location: WebGLUniformLocation, v: Float32Array): void;
+    uniform1fv(location: WebGLUniformLocation, v: Float32Array | number[]): void;
     uniform1i(location: WebGLUniformLocation, x: number): void;
-    uniform1iv(location: WebGLUniformLocation, v: Int32Array): void;
+    uniform1iv(location: WebGLUniformLocation, v: Int32Array | number[]): void;
     uniform2f(location: WebGLUniformLocation, x: number, y: number): void;
-    uniform2fv(location: WebGLUniformLocation, v: Float32Array): void;
+    uniform2fv(location: WebGLUniformLocation, v: Float32Array | number[]): void;
     uniform2i(location: WebGLUniformLocation, x: number, y: number): void;
-    uniform2iv(location: WebGLUniformLocation, v: Int32Array): void;
+    uniform2iv(location: WebGLUniformLocation, v: Int32Array | number[]): void;
     uniform3f(location: WebGLUniformLocation, x: number, y: number, z: number): void;
-    uniform3fv(location: WebGLUniformLocation, v: Float32Array): void;
+    uniform3fv(location: WebGLUniformLocation, v: Float32Array | number[]): void;
     uniform3i(location: WebGLUniformLocation, x: number, y: number, z: number): void;
-    uniform3iv(location: WebGLUniformLocation, v: Int32Array): void;
+    uniform3iv(location: WebGLUniformLocation, v: Int32Array | number[]): void;
     uniform4f(location: WebGLUniformLocation, x: number, y: number, z: number, w: number): void;
-    uniform4fv(location: WebGLUniformLocation, v: Float32Array): void;
+    uniform4fv(location: WebGLUniformLocation, v: Float32Array | number[]): void;
     uniform4i(location: WebGLUniformLocation, x: number, y: number, z: number, w: number): void;
-    uniform4iv(location: WebGLUniformLocation, v: Int32Array): void;
-    uniformMatrix2fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array): void;
-    uniformMatrix3fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array): void;
-    uniformMatrix4fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array): void;
+    uniform4iv(location: WebGLUniformLocation, v: Int32Array | number[]): void;
+    uniformMatrix2fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | number[]): void;
+    uniformMatrix3fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | number[]): void;
+    uniformMatrix4fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | number[]): void;
     useProgram(program: WebGLProgram): void;
     validateProgram(program: WebGLProgram): void;
     vertexAttrib1f(indx: number, x: number): void;
-    vertexAttrib1fv(indx: number, values: Float32Array): void;
+    vertexAttrib1fv(indx: number, values: Float32Array | number[]): void;
     vertexAttrib2f(indx: number, x: number, y: number): void;
-    vertexAttrib2fv(indx: number, values: Float32Array): void;
+    vertexAttrib2fv(indx: number, values: Float32Array | number[]): void;
     vertexAttrib3f(indx: number, x: number, y: number, z: number): void;
-    vertexAttrib3fv(indx: number, values: Float32Array): void;
+    vertexAttrib3fv(indx: number, values: Float32Array | number[]): void;
     vertexAttrib4f(indx: number, x: number, y: number, z: number, w: number): void;
-    vertexAttrib4fv(indx: number, values: Float32Array): void;
+    vertexAttrib4fv(indx: number, values: Float32Array | number[]): void;
     vertexAttribPointer(indx: number, size: number, type: number, normalized: boolean, stride: number, offset: number): void;
     viewport(x: number, y: number, width: number, height: number): void;
-    ACTIVE_ATTRIBUTES: number;
-    ACTIVE_TEXTURE: number;
-    ACTIVE_UNIFORMS: number;
-    ALIASED_LINE_WIDTH_RANGE: number;
-    ALIASED_POINT_SIZE_RANGE: number;
-    ALPHA: number;
-    ALPHA_BITS: number;
-    ALWAYS: number;
-    ARRAY_BUFFER: number;
-    ARRAY_BUFFER_BINDING: number;
-    ATTACHED_SHADERS: number;
-    BACK: number;
-    BLEND: number;
-    BLEND_COLOR: number;
-    BLEND_DST_ALPHA: number;
-    BLEND_DST_RGB: number;
-    BLEND_EQUATION: number;
-    BLEND_EQUATION_ALPHA: number;
-    BLEND_EQUATION_RGB: number;
-    BLEND_SRC_ALPHA: number;
-    BLEND_SRC_RGB: number;
-    BLUE_BITS: number;
-    BOOL: number;
-    BOOL_VEC2: number;
-    BOOL_VEC3: number;
-    BOOL_VEC4: number;
-    BROWSER_DEFAULT_WEBGL: number;
-    BUFFER_SIZE: number;
-    BUFFER_USAGE: number;
-    BYTE: number;
-    CCW: number;
-    CLAMP_TO_EDGE: number;
-    COLOR_ATTACHMENT0: number;
-    COLOR_BUFFER_BIT: number;
-    COLOR_CLEAR_VALUE: number;
-    COLOR_WRITEMASK: number;
-    COMPILE_STATUS: number;
-    COMPRESSED_TEXTURE_FORMATS: number;
-    CONSTANT_ALPHA: number;
-    CONSTANT_COLOR: number;
-    CONTEXT_LOST_WEBGL: number;
-    CULL_FACE: number;
-    CULL_FACE_MODE: number;
-    CURRENT_PROGRAM: number;
-    CURRENT_VERTEX_ATTRIB: number;
-    CW: number;
-    DECR: number;
-    DECR_WRAP: number;
-    DELETE_STATUS: number;
-    DEPTH_ATTACHMENT: number;
-    DEPTH_BITS: number;
-    DEPTH_BUFFER_BIT: number;
-    DEPTH_CLEAR_VALUE: number;
-    DEPTH_COMPONENT: number;
-    DEPTH_COMPONENT16: number;
-    DEPTH_FUNC: number;
-    DEPTH_RANGE: number;
-    DEPTH_STENCIL: number;
-    DEPTH_STENCIL_ATTACHMENT: number;
-    DEPTH_TEST: number;
-    DEPTH_WRITEMASK: number;
-    DITHER: number;
-    DONT_CARE: number;
-    DST_ALPHA: number;
-    DST_COLOR: number;
-    DYNAMIC_DRAW: number;
-    ELEMENT_ARRAY_BUFFER: number;
-    ELEMENT_ARRAY_BUFFER_BINDING: number;
-    EQUAL: number;
-    FASTEST: number;
-    FLOAT: number;
-    FLOAT_MAT2: number;
-    FLOAT_MAT3: number;
-    FLOAT_MAT4: number;
-    FLOAT_VEC2: number;
-    FLOAT_VEC3: number;
-    FLOAT_VEC4: number;
-    FRAGMENT_SHADER: number;
-    FRAMEBUFFER: number;
-    FRAMEBUFFER_ATTACHMENT_OBJECT_NAME: number;
-    FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE: number;
-    FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE: number;
-    FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL: number;
-    FRAMEBUFFER_BINDING: number;
-    FRAMEBUFFER_COMPLETE: number;
-    FRAMEBUFFER_INCOMPLETE_ATTACHMENT: number;
-    FRAMEBUFFER_INCOMPLETE_DIMENSIONS: number;
-    FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: number;
-    FRAMEBUFFER_UNSUPPORTED: number;
-    FRONT: number;
-    FRONT_AND_BACK: number;
-    FRONT_FACE: number;
-    FUNC_ADD: number;
-    FUNC_REVERSE_SUBTRACT: number;
-    FUNC_SUBTRACT: number;
-    GENERATE_MIPMAP_HINT: number;
-    GEQUAL: number;
-    GREATER: number;
-    GREEN_BITS: number;
-    HIGH_FLOAT: number;
-    HIGH_INT: number;
-    IMPLEMENTATION_COLOR_READ_FORMAT: number;
-    IMPLEMENTATION_COLOR_READ_TYPE: number;
-    INCR: number;
-    INCR_WRAP: number;
-    INT: number;
-    INT_VEC2: number;
-    INT_VEC3: number;
-    INT_VEC4: number;
-    INVALID_ENUM: number;
-    INVALID_FRAMEBUFFER_OPERATION: number;
-    INVALID_OPERATION: number;
-    INVALID_VALUE: number;
-    INVERT: number;
-    KEEP: number;
-    LEQUAL: number;
-    LESS: number;
-    LINEAR: number;
-    LINEAR_MIPMAP_LINEAR: number;
-    LINEAR_MIPMAP_NEAREST: number;
-    LINES: number;
-    LINE_LOOP: number;
-    LINE_STRIP: number;
-    LINE_WIDTH: number;
-    LINK_STATUS: number;
-    LOW_FLOAT: number;
-    LOW_INT: number;
-    LUMINANCE: number;
-    LUMINANCE_ALPHA: number;
-    MAX_COMBINED_TEXTURE_IMAGE_UNITS: number;
-    MAX_CUBE_MAP_TEXTURE_SIZE: number;
-    MAX_FRAGMENT_UNIFORM_VECTORS: number;
-    MAX_RENDERBUFFER_SIZE: number;
-    MAX_TEXTURE_IMAGE_UNITS: number;
-    MAX_TEXTURE_SIZE: number;
-    MAX_VARYING_VECTORS: number;
-    MAX_VERTEX_ATTRIBS: number;
-    MAX_VERTEX_TEXTURE_IMAGE_UNITS: number;
-    MAX_VERTEX_UNIFORM_VECTORS: number;
-    MAX_VIEWPORT_DIMS: number;
-    MEDIUM_FLOAT: number;
-    MEDIUM_INT: number;
-    MIRRORED_REPEAT: number;
-    NEAREST: number;
-    NEAREST_MIPMAP_LINEAR: number;
-    NEAREST_MIPMAP_NEAREST: number;
-    NEVER: number;
-    NICEST: number;
-    NONE: number;
-    NOTEQUAL: number;
-    NO_ERROR: number;
-    ONE: number;
-    ONE_MINUS_CONSTANT_ALPHA: number;
-    ONE_MINUS_CONSTANT_COLOR: number;
-    ONE_MINUS_DST_ALPHA: number;
-    ONE_MINUS_DST_COLOR: number;
-    ONE_MINUS_SRC_ALPHA: number;
-    ONE_MINUS_SRC_COLOR: number;
-    OUT_OF_MEMORY: number;
-    PACK_ALIGNMENT: number;
-    POINTS: number;
-    POLYGON_OFFSET_FACTOR: number;
-    POLYGON_OFFSET_FILL: number;
-    POLYGON_OFFSET_UNITS: number;
-    RED_BITS: number;
-    RENDERBUFFER: number;
-    RENDERBUFFER_ALPHA_SIZE: number;
-    RENDERBUFFER_BINDING: number;
-    RENDERBUFFER_BLUE_SIZE: number;
-    RENDERBUFFER_DEPTH_SIZE: number;
-    RENDERBUFFER_GREEN_SIZE: number;
-    RENDERBUFFER_HEIGHT: number;
-    RENDERBUFFER_INTERNAL_FORMAT: number;
-    RENDERBUFFER_RED_SIZE: number;
-    RENDERBUFFER_STENCIL_SIZE: number;
-    RENDERBUFFER_WIDTH: number;
-    RENDERER: number;
-    REPEAT: number;
-    REPLACE: number;
-    RGB: number;
-    RGB565: number;
-    RGB5_A1: number;
-    RGBA: number;
-    RGBA4: number;
-    SAMPLER_2D: number;
-    SAMPLER_CUBE: number;
-    SAMPLES: number;
-    SAMPLE_ALPHA_TO_COVERAGE: number;
-    SAMPLE_BUFFERS: number;
-    SAMPLE_COVERAGE: number;
-    SAMPLE_COVERAGE_INVERT: number;
-    SAMPLE_COVERAGE_VALUE: number;
-    SCISSOR_BOX: number;
-    SCISSOR_TEST: number;
-    SHADER_TYPE: number;
-    SHADING_LANGUAGE_VERSION: number;
-    SHORT: number;
-    SRC_ALPHA: number;
-    SRC_ALPHA_SATURATE: number;
-    SRC_COLOR: number;
-    STATIC_DRAW: number;
-    STENCIL_ATTACHMENT: number;
-    STENCIL_BACK_FAIL: number;
-    STENCIL_BACK_FUNC: number;
-    STENCIL_BACK_PASS_DEPTH_FAIL: number;
-    STENCIL_BACK_PASS_DEPTH_PASS: number;
-    STENCIL_BACK_REF: number;
-    STENCIL_BACK_VALUE_MASK: number;
-    STENCIL_BACK_WRITEMASK: number;
-    STENCIL_BITS: number;
-    STENCIL_BUFFER_BIT: number;
-    STENCIL_CLEAR_VALUE: number;
-    STENCIL_FAIL: number;
-    STENCIL_FUNC: number;
-    STENCIL_INDEX: number;
-    STENCIL_INDEX8: number;
-    STENCIL_PASS_DEPTH_FAIL: number;
-    STENCIL_PASS_DEPTH_PASS: number;
-    STENCIL_REF: number;
-    STENCIL_TEST: number;
-    STENCIL_VALUE_MASK: number;
-    STENCIL_WRITEMASK: number;
-    STREAM_DRAW: number;
-    SUBPIXEL_BITS: number;
-    TEXTURE: number;
-    TEXTURE0: number;
-    TEXTURE1: number;
-    TEXTURE10: number;
-    TEXTURE11: number;
-    TEXTURE12: number;
-    TEXTURE13: number;
-    TEXTURE14: number;
-    TEXTURE15: number;
-    TEXTURE16: number;
-    TEXTURE17: number;
-    TEXTURE18: number;
-    TEXTURE19: number;
-    TEXTURE2: number;
-    TEXTURE20: number;
-    TEXTURE21: number;
-    TEXTURE22: number;
-    TEXTURE23: number;
-    TEXTURE24: number;
-    TEXTURE25: number;
-    TEXTURE26: number;
-    TEXTURE27: number;
-    TEXTURE28: number;
-    TEXTURE29: number;
-    TEXTURE3: number;
-    TEXTURE30: number;
-    TEXTURE31: number;
-    TEXTURE4: number;
-    TEXTURE5: number;
-    TEXTURE6: number;
-    TEXTURE7: number;
-    TEXTURE8: number;
-    TEXTURE9: number;
-    TEXTURE_2D: number;
-    TEXTURE_BINDING_2D: number;
-    TEXTURE_BINDING_CUBE_MAP: number;
-    TEXTURE_CUBE_MAP: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_X: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_Y: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_Z: number;
-    TEXTURE_CUBE_MAP_POSITIVE_X: number;
-    TEXTURE_CUBE_MAP_POSITIVE_Y: number;
-    TEXTURE_CUBE_MAP_POSITIVE_Z: number;
-    TEXTURE_MAG_FILTER: number;
-    TEXTURE_MIN_FILTER: number;
-    TEXTURE_WRAP_S: number;
-    TEXTURE_WRAP_T: number;
-    TRIANGLES: number;
-    TRIANGLE_FAN: number;
-    TRIANGLE_STRIP: number;
-    UNPACK_ALIGNMENT: number;
-    UNPACK_COLORSPACE_CONVERSION_WEBGL: number;
-    UNPACK_FLIP_Y_WEBGL: number;
-    UNPACK_PREMULTIPLY_ALPHA_WEBGL: number;
-    UNSIGNED_BYTE: number;
-    UNSIGNED_INT: number;
-    UNSIGNED_SHORT: number;
-    UNSIGNED_SHORT_4_4_4_4: number;
-    UNSIGNED_SHORT_5_5_5_1: number;
-    UNSIGNED_SHORT_5_6_5: number;
-    VALIDATE_STATUS: number;
-    VENDOR: number;
-    VERSION: number;
-    VERTEX_ATTRIB_ARRAY_BUFFER_BINDING: number;
-    VERTEX_ATTRIB_ARRAY_ENABLED: number;
-    VERTEX_ATTRIB_ARRAY_NORMALIZED: number;
-    VERTEX_ATTRIB_ARRAY_POINTER: number;
-    VERTEX_ATTRIB_ARRAY_SIZE: number;
-    VERTEX_ATTRIB_ARRAY_STRIDE: number;
-    VERTEX_ATTRIB_ARRAY_TYPE: number;
-    VERTEX_SHADER: number;
-    VIEWPORT: number;
-    ZERO: number;
+    readonly ACTIVE_ATTRIBUTES: number;
+    readonly ACTIVE_TEXTURE: number;
+    readonly ACTIVE_UNIFORMS: number;
+    readonly ALIASED_LINE_WIDTH_RANGE: number;
+    readonly ALIASED_POINT_SIZE_RANGE: number;
+    readonly ALPHA: number;
+    readonly ALPHA_BITS: number;
+    readonly ALWAYS: number;
+    readonly ARRAY_BUFFER: number;
+    readonly ARRAY_BUFFER_BINDING: number;
+    readonly ATTACHED_SHADERS: number;
+    readonly BACK: number;
+    readonly BLEND: number;
+    readonly BLEND_COLOR: number;
+    readonly BLEND_DST_ALPHA: number;
+    readonly BLEND_DST_RGB: number;
+    readonly BLEND_EQUATION: number;
+    readonly BLEND_EQUATION_ALPHA: number;
+    readonly BLEND_EQUATION_RGB: number;
+    readonly BLEND_SRC_ALPHA: number;
+    readonly BLEND_SRC_RGB: number;
+    readonly BLUE_BITS: number;
+    readonly BOOL: number;
+    readonly BOOL_VEC2: number;
+    readonly BOOL_VEC3: number;
+    readonly BOOL_VEC4: number;
+    readonly BROWSER_DEFAULT_WEBGL: number;
+    readonly BUFFER_SIZE: number;
+    readonly BUFFER_USAGE: number;
+    readonly BYTE: number;
+    readonly CCW: number;
+    readonly CLAMP_TO_EDGE: number;
+    readonly COLOR_ATTACHMENT0: number;
+    readonly COLOR_BUFFER_BIT: number;
+    readonly COLOR_CLEAR_VALUE: number;
+    readonly COLOR_WRITEMASK: number;
+    readonly COMPILE_STATUS: number;
+    readonly COMPRESSED_TEXTURE_FORMATS: number;
+    readonly CONSTANT_ALPHA: number;
+    readonly CONSTANT_COLOR: number;
+    readonly CONTEXT_LOST_WEBGL: number;
+    readonly CULL_FACE: number;
+    readonly CULL_FACE_MODE: number;
+    readonly CURRENT_PROGRAM: number;
+    readonly CURRENT_VERTEX_ATTRIB: number;
+    readonly CW: number;
+    readonly DECR: number;
+    readonly DECR_WRAP: number;
+    readonly DELETE_STATUS: number;
+    readonly DEPTH_ATTACHMENT: number;
+    readonly DEPTH_BITS: number;
+    readonly DEPTH_BUFFER_BIT: number;
+    readonly DEPTH_CLEAR_VALUE: number;
+    readonly DEPTH_COMPONENT: number;
+    readonly DEPTH_COMPONENT16: number;
+    readonly DEPTH_FUNC: number;
+    readonly DEPTH_RANGE: number;
+    readonly DEPTH_STENCIL: number;
+    readonly DEPTH_STENCIL_ATTACHMENT: number;
+    readonly DEPTH_TEST: number;
+    readonly DEPTH_WRITEMASK: number;
+    readonly DITHER: number;
+    readonly DONT_CARE: number;
+    readonly DST_ALPHA: number;
+    readonly DST_COLOR: number;
+    readonly DYNAMIC_DRAW: number;
+    readonly ELEMENT_ARRAY_BUFFER: number;
+    readonly ELEMENT_ARRAY_BUFFER_BINDING: number;
+    readonly EQUAL: number;
+    readonly FASTEST: number;
+    readonly FLOAT: number;
+    readonly FLOAT_MAT2: number;
+    readonly FLOAT_MAT3: number;
+    readonly FLOAT_MAT4: number;
+    readonly FLOAT_VEC2: number;
+    readonly FLOAT_VEC3: number;
+    readonly FLOAT_VEC4: number;
+    readonly FRAGMENT_SHADER: number;
+    readonly FRAMEBUFFER: number;
+    readonly FRAMEBUFFER_ATTACHMENT_OBJECT_NAME: number;
+    readonly FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE: number;
+    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE: number;
+    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL: number;
+    readonly FRAMEBUFFER_BINDING: number;
+    readonly FRAMEBUFFER_COMPLETE: number;
+    readonly FRAMEBUFFER_INCOMPLETE_ATTACHMENT: number;
+    readonly FRAMEBUFFER_INCOMPLETE_DIMENSIONS: number;
+    readonly FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: number;
+    readonly FRAMEBUFFER_UNSUPPORTED: number;
+    readonly FRONT: number;
+    readonly FRONT_AND_BACK: number;
+    readonly FRONT_FACE: number;
+    readonly FUNC_ADD: number;
+    readonly FUNC_REVERSE_SUBTRACT: number;
+    readonly FUNC_SUBTRACT: number;
+    readonly GENERATE_MIPMAP_HINT: number;
+    readonly GEQUAL: number;
+    readonly GREATER: number;
+    readonly GREEN_BITS: number;
+    readonly HIGH_FLOAT: number;
+    readonly HIGH_INT: number;
+    readonly IMPLEMENTATION_COLOR_READ_FORMAT: number;
+    readonly IMPLEMENTATION_COLOR_READ_TYPE: number;
+    readonly INCR: number;
+    readonly INCR_WRAP: number;
+    readonly INT: number;
+    readonly INT_VEC2: number;
+    readonly INT_VEC3: number;
+    readonly INT_VEC4: number;
+    readonly INVALID_ENUM: number;
+    readonly INVALID_FRAMEBUFFER_OPERATION: number;
+    readonly INVALID_OPERATION: number;
+    readonly INVALID_VALUE: number;
+    readonly INVERT: number;
+    readonly KEEP: number;
+    readonly LEQUAL: number;
+    readonly LESS: number;
+    readonly LINEAR: number;
+    readonly LINEAR_MIPMAP_LINEAR: number;
+    readonly LINEAR_MIPMAP_NEAREST: number;
+    readonly LINES: number;
+    readonly LINE_LOOP: number;
+    readonly LINE_STRIP: number;
+    readonly LINE_WIDTH: number;
+    readonly LINK_STATUS: number;
+    readonly LOW_FLOAT: number;
+    readonly LOW_INT: number;
+    readonly LUMINANCE: number;
+    readonly LUMINANCE_ALPHA: number;
+    readonly MAX_COMBINED_TEXTURE_IMAGE_UNITS: number;
+    readonly MAX_CUBE_MAP_TEXTURE_SIZE: number;
+    readonly MAX_FRAGMENT_UNIFORM_VECTORS: number;
+    readonly MAX_RENDERBUFFER_SIZE: number;
+    readonly MAX_TEXTURE_IMAGE_UNITS: number;
+    readonly MAX_TEXTURE_SIZE: number;
+    readonly MAX_VARYING_VECTORS: number;
+    readonly MAX_VERTEX_ATTRIBS: number;
+    readonly MAX_VERTEX_TEXTURE_IMAGE_UNITS: number;
+    readonly MAX_VERTEX_UNIFORM_VECTORS: number;
+    readonly MAX_VIEWPORT_DIMS: number;
+    readonly MEDIUM_FLOAT: number;
+    readonly MEDIUM_INT: number;
+    readonly MIRRORED_REPEAT: number;
+    readonly NEAREST: number;
+    readonly NEAREST_MIPMAP_LINEAR: number;
+    readonly NEAREST_MIPMAP_NEAREST: number;
+    readonly NEVER: number;
+    readonly NICEST: number;
+    readonly NONE: number;
+    readonly NOTEQUAL: number;
+    readonly NO_ERROR: number;
+    readonly ONE: number;
+    readonly ONE_MINUS_CONSTANT_ALPHA: number;
+    readonly ONE_MINUS_CONSTANT_COLOR: number;
+    readonly ONE_MINUS_DST_ALPHA: number;
+    readonly ONE_MINUS_DST_COLOR: number;
+    readonly ONE_MINUS_SRC_ALPHA: number;
+    readonly ONE_MINUS_SRC_COLOR: number;
+    readonly OUT_OF_MEMORY: number;
+    readonly PACK_ALIGNMENT: number;
+    readonly POINTS: number;
+    readonly POLYGON_OFFSET_FACTOR: number;
+    readonly POLYGON_OFFSET_FILL: number;
+    readonly POLYGON_OFFSET_UNITS: number;
+    readonly RED_BITS: number;
+    readonly RENDERBUFFER: number;
+    readonly RENDERBUFFER_ALPHA_SIZE: number;
+    readonly RENDERBUFFER_BINDING: number;
+    readonly RENDERBUFFER_BLUE_SIZE: number;
+    readonly RENDERBUFFER_DEPTH_SIZE: number;
+    readonly RENDERBUFFER_GREEN_SIZE: number;
+    readonly RENDERBUFFER_HEIGHT: number;
+    readonly RENDERBUFFER_INTERNAL_FORMAT: number;
+    readonly RENDERBUFFER_RED_SIZE: number;
+    readonly RENDERBUFFER_STENCIL_SIZE: number;
+    readonly RENDERBUFFER_WIDTH: number;
+    readonly RENDERER: number;
+    readonly REPEAT: number;
+    readonly REPLACE: number;
+    readonly RGB: number;
+    readonly RGB565: number;
+    readonly RGB5_A1: number;
+    readonly RGBA: number;
+    readonly RGBA4: number;
+    readonly SAMPLER_2D: number;
+    readonly SAMPLER_CUBE: number;
+    readonly SAMPLES: number;
+    readonly SAMPLE_ALPHA_TO_COVERAGE: number;
+    readonly SAMPLE_BUFFERS: number;
+    readonly SAMPLE_COVERAGE: number;
+    readonly SAMPLE_COVERAGE_INVERT: number;
+    readonly SAMPLE_COVERAGE_VALUE: number;
+    readonly SCISSOR_BOX: number;
+    readonly SCISSOR_TEST: number;
+    readonly SHADER_TYPE: number;
+    readonly SHADING_LANGUAGE_VERSION: number;
+    readonly SHORT: number;
+    readonly SRC_ALPHA: number;
+    readonly SRC_ALPHA_SATURATE: number;
+    readonly SRC_COLOR: number;
+    readonly STATIC_DRAW: number;
+    readonly STENCIL_ATTACHMENT: number;
+    readonly STENCIL_BACK_FAIL: number;
+    readonly STENCIL_BACK_FUNC: number;
+    readonly STENCIL_BACK_PASS_DEPTH_FAIL: number;
+    readonly STENCIL_BACK_PASS_DEPTH_PASS: number;
+    readonly STENCIL_BACK_REF: number;
+    readonly STENCIL_BACK_VALUE_MASK: number;
+    readonly STENCIL_BACK_WRITEMASK: number;
+    readonly STENCIL_BITS: number;
+    readonly STENCIL_BUFFER_BIT: number;
+    readonly STENCIL_CLEAR_VALUE: number;
+    readonly STENCIL_FAIL: number;
+    readonly STENCIL_FUNC: number;
+    readonly STENCIL_INDEX: number;
+    readonly STENCIL_INDEX8: number;
+    readonly STENCIL_PASS_DEPTH_FAIL: number;
+    readonly STENCIL_PASS_DEPTH_PASS: number;
+    readonly STENCIL_REF: number;
+    readonly STENCIL_TEST: number;
+    readonly STENCIL_VALUE_MASK: number;
+    readonly STENCIL_WRITEMASK: number;
+    readonly STREAM_DRAW: number;
+    readonly SUBPIXEL_BITS: number;
+    readonly TEXTURE: number;
+    readonly TEXTURE0: number;
+    readonly TEXTURE1: number;
+    readonly TEXTURE10: number;
+    readonly TEXTURE11: number;
+    readonly TEXTURE12: number;
+    readonly TEXTURE13: number;
+    readonly TEXTURE14: number;
+    readonly TEXTURE15: number;
+    readonly TEXTURE16: number;
+    readonly TEXTURE17: number;
+    readonly TEXTURE18: number;
+    readonly TEXTURE19: number;
+    readonly TEXTURE2: number;
+    readonly TEXTURE20: number;
+    readonly TEXTURE21: number;
+    readonly TEXTURE22: number;
+    readonly TEXTURE23: number;
+    readonly TEXTURE24: number;
+    readonly TEXTURE25: number;
+    readonly TEXTURE26: number;
+    readonly TEXTURE27: number;
+    readonly TEXTURE28: number;
+    readonly TEXTURE29: number;
+    readonly TEXTURE3: number;
+    readonly TEXTURE30: number;
+    readonly TEXTURE31: number;
+    readonly TEXTURE4: number;
+    readonly TEXTURE5: number;
+    readonly TEXTURE6: number;
+    readonly TEXTURE7: number;
+    readonly TEXTURE8: number;
+    readonly TEXTURE9: number;
+    readonly TEXTURE_2D: number;
+    readonly TEXTURE_BINDING_2D: number;
+    readonly TEXTURE_BINDING_CUBE_MAP: number;
+    readonly TEXTURE_CUBE_MAP: number;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_X: number;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_Y: number;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_Z: number;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_X: number;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_Y: number;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_Z: number;
+    readonly TEXTURE_MAG_FILTER: number;
+    readonly TEXTURE_MIN_FILTER: number;
+    readonly TEXTURE_WRAP_S: number;
+    readonly TEXTURE_WRAP_T: number;
+    readonly TRIANGLES: number;
+    readonly TRIANGLE_FAN: number;
+    readonly TRIANGLE_STRIP: number;
+    readonly UNPACK_ALIGNMENT: number;
+    readonly UNPACK_COLORSPACE_CONVERSION_WEBGL: number;
+    readonly UNPACK_FLIP_Y_WEBGL: number;
+    readonly UNPACK_PREMULTIPLY_ALPHA_WEBGL: number;
+    readonly UNSIGNED_BYTE: number;
+    readonly UNSIGNED_INT: number;
+    readonly UNSIGNED_SHORT: number;
+    readonly UNSIGNED_SHORT_4_4_4_4: number;
+    readonly UNSIGNED_SHORT_5_5_5_1: number;
+    readonly UNSIGNED_SHORT_5_6_5: number;
+    readonly VALIDATE_STATUS: number;
+    readonly VENDOR: number;
+    readonly VERSION: number;
+    readonly VERTEX_ATTRIB_ARRAY_BUFFER_BINDING: number;
+    readonly VERTEX_ATTRIB_ARRAY_ENABLED: number;
+    readonly VERTEX_ATTRIB_ARRAY_NORMALIZED: number;
+    readonly VERTEX_ATTRIB_ARRAY_POINTER: number;
+    readonly VERTEX_ATTRIB_ARRAY_SIZE: number;
+    readonly VERTEX_ATTRIB_ARRAY_STRIDE: number;
+    readonly VERTEX_ATTRIB_ARRAY_TYPE: number;
+    readonly VERTEX_SHADER: number;
+    readonly VIEWPORT: number;
+    readonly ZERO: number;
 }
 
 declare var WebGLRenderingContext: {
     prototype: WebGLRenderingContext;
     new(): WebGLRenderingContext;
-    ACTIVE_ATTRIBUTES: number;
-    ACTIVE_TEXTURE: number;
-    ACTIVE_UNIFORMS: number;
-    ALIASED_LINE_WIDTH_RANGE: number;
-    ALIASED_POINT_SIZE_RANGE: number;
-    ALPHA: number;
-    ALPHA_BITS: number;
-    ALWAYS: number;
-    ARRAY_BUFFER: number;
-    ARRAY_BUFFER_BINDING: number;
-    ATTACHED_SHADERS: number;
-    BACK: number;
-    BLEND: number;
-    BLEND_COLOR: number;
-    BLEND_DST_ALPHA: number;
-    BLEND_DST_RGB: number;
-    BLEND_EQUATION: number;
-    BLEND_EQUATION_ALPHA: number;
-    BLEND_EQUATION_RGB: number;
-    BLEND_SRC_ALPHA: number;
-    BLEND_SRC_RGB: number;
-    BLUE_BITS: number;
-    BOOL: number;
-    BOOL_VEC2: number;
-    BOOL_VEC3: number;
-    BOOL_VEC4: number;
-    BROWSER_DEFAULT_WEBGL: number;
-    BUFFER_SIZE: number;
-    BUFFER_USAGE: number;
-    BYTE: number;
-    CCW: number;
-    CLAMP_TO_EDGE: number;
-    COLOR_ATTACHMENT0: number;
-    COLOR_BUFFER_BIT: number;
-    COLOR_CLEAR_VALUE: number;
-    COLOR_WRITEMASK: number;
-    COMPILE_STATUS: number;
-    COMPRESSED_TEXTURE_FORMATS: number;
-    CONSTANT_ALPHA: number;
-    CONSTANT_COLOR: number;
-    CONTEXT_LOST_WEBGL: number;
-    CULL_FACE: number;
-    CULL_FACE_MODE: number;
-    CURRENT_PROGRAM: number;
-    CURRENT_VERTEX_ATTRIB: number;
-    CW: number;
-    DECR: number;
-    DECR_WRAP: number;
-    DELETE_STATUS: number;
-    DEPTH_ATTACHMENT: number;
-    DEPTH_BITS: number;
-    DEPTH_BUFFER_BIT: number;
-    DEPTH_CLEAR_VALUE: number;
-    DEPTH_COMPONENT: number;
-    DEPTH_COMPONENT16: number;
-    DEPTH_FUNC: number;
-    DEPTH_RANGE: number;
-    DEPTH_STENCIL: number;
-    DEPTH_STENCIL_ATTACHMENT: number;
-    DEPTH_TEST: number;
-    DEPTH_WRITEMASK: number;
-    DITHER: number;
-    DONT_CARE: number;
-    DST_ALPHA: number;
-    DST_COLOR: number;
-    DYNAMIC_DRAW: number;
-    ELEMENT_ARRAY_BUFFER: number;
-    ELEMENT_ARRAY_BUFFER_BINDING: number;
-    EQUAL: number;
-    FASTEST: number;
-    FLOAT: number;
-    FLOAT_MAT2: number;
-    FLOAT_MAT3: number;
-    FLOAT_MAT4: number;
-    FLOAT_VEC2: number;
-    FLOAT_VEC3: number;
-    FLOAT_VEC4: number;
-    FRAGMENT_SHADER: number;
-    FRAMEBUFFER: number;
-    FRAMEBUFFER_ATTACHMENT_OBJECT_NAME: number;
-    FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE: number;
-    FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE: number;
-    FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL: number;
-    FRAMEBUFFER_BINDING: number;
-    FRAMEBUFFER_COMPLETE: number;
-    FRAMEBUFFER_INCOMPLETE_ATTACHMENT: number;
-    FRAMEBUFFER_INCOMPLETE_DIMENSIONS: number;
-    FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: number;
-    FRAMEBUFFER_UNSUPPORTED: number;
-    FRONT: number;
-    FRONT_AND_BACK: number;
-    FRONT_FACE: number;
-    FUNC_ADD: number;
-    FUNC_REVERSE_SUBTRACT: number;
-    FUNC_SUBTRACT: number;
-    GENERATE_MIPMAP_HINT: number;
-    GEQUAL: number;
-    GREATER: number;
-    GREEN_BITS: number;
-    HIGH_FLOAT: number;
-    HIGH_INT: number;
-    IMPLEMENTATION_COLOR_READ_FORMAT: number;
-    IMPLEMENTATION_COLOR_READ_TYPE: number;
-    INCR: number;
-    INCR_WRAP: number;
-    INT: number;
-    INT_VEC2: number;
-    INT_VEC3: number;
-    INT_VEC4: number;
-    INVALID_ENUM: number;
-    INVALID_FRAMEBUFFER_OPERATION: number;
-    INVALID_OPERATION: number;
-    INVALID_VALUE: number;
-    INVERT: number;
-    KEEP: number;
-    LEQUAL: number;
-    LESS: number;
-    LINEAR: number;
-    LINEAR_MIPMAP_LINEAR: number;
-    LINEAR_MIPMAP_NEAREST: number;
-    LINES: number;
-    LINE_LOOP: number;
-    LINE_STRIP: number;
-    LINE_WIDTH: number;
-    LINK_STATUS: number;
-    LOW_FLOAT: number;
-    LOW_INT: number;
-    LUMINANCE: number;
-    LUMINANCE_ALPHA: number;
-    MAX_COMBINED_TEXTURE_IMAGE_UNITS: number;
-    MAX_CUBE_MAP_TEXTURE_SIZE: number;
-    MAX_FRAGMENT_UNIFORM_VECTORS: number;
-    MAX_RENDERBUFFER_SIZE: number;
-    MAX_TEXTURE_IMAGE_UNITS: number;
-    MAX_TEXTURE_SIZE: number;
-    MAX_VARYING_VECTORS: number;
-    MAX_VERTEX_ATTRIBS: number;
-    MAX_VERTEX_TEXTURE_IMAGE_UNITS: number;
-    MAX_VERTEX_UNIFORM_VECTORS: number;
-    MAX_VIEWPORT_DIMS: number;
-    MEDIUM_FLOAT: number;
-    MEDIUM_INT: number;
-    MIRRORED_REPEAT: number;
-    NEAREST: number;
-    NEAREST_MIPMAP_LINEAR: number;
-    NEAREST_MIPMAP_NEAREST: number;
-    NEVER: number;
-    NICEST: number;
-    NONE: number;
-    NOTEQUAL: number;
-    NO_ERROR: number;
-    ONE: number;
-    ONE_MINUS_CONSTANT_ALPHA: number;
-    ONE_MINUS_CONSTANT_COLOR: number;
-    ONE_MINUS_DST_ALPHA: number;
-    ONE_MINUS_DST_COLOR: number;
-    ONE_MINUS_SRC_ALPHA: number;
-    ONE_MINUS_SRC_COLOR: number;
-    OUT_OF_MEMORY: number;
-    PACK_ALIGNMENT: number;
-    POINTS: number;
-    POLYGON_OFFSET_FACTOR: number;
-    POLYGON_OFFSET_FILL: number;
-    POLYGON_OFFSET_UNITS: number;
-    RED_BITS: number;
-    RENDERBUFFER: number;
-    RENDERBUFFER_ALPHA_SIZE: number;
-    RENDERBUFFER_BINDING: number;
-    RENDERBUFFER_BLUE_SIZE: number;
-    RENDERBUFFER_DEPTH_SIZE: number;
-    RENDERBUFFER_GREEN_SIZE: number;
-    RENDERBUFFER_HEIGHT: number;
-    RENDERBUFFER_INTERNAL_FORMAT: number;
-    RENDERBUFFER_RED_SIZE: number;
-    RENDERBUFFER_STENCIL_SIZE: number;
-    RENDERBUFFER_WIDTH: number;
-    RENDERER: number;
-    REPEAT: number;
-    REPLACE: number;
-    RGB: number;
-    RGB565: number;
-    RGB5_A1: number;
-    RGBA: number;
-    RGBA4: number;
-    SAMPLER_2D: number;
-    SAMPLER_CUBE: number;
-    SAMPLES: number;
-    SAMPLE_ALPHA_TO_COVERAGE: number;
-    SAMPLE_BUFFERS: number;
-    SAMPLE_COVERAGE: number;
-    SAMPLE_COVERAGE_INVERT: number;
-    SAMPLE_COVERAGE_VALUE: number;
-    SCISSOR_BOX: number;
-    SCISSOR_TEST: number;
-    SHADER_TYPE: number;
-    SHADING_LANGUAGE_VERSION: number;
-    SHORT: number;
-    SRC_ALPHA: number;
-    SRC_ALPHA_SATURATE: number;
-    SRC_COLOR: number;
-    STATIC_DRAW: number;
-    STENCIL_ATTACHMENT: number;
-    STENCIL_BACK_FAIL: number;
-    STENCIL_BACK_FUNC: number;
-    STENCIL_BACK_PASS_DEPTH_FAIL: number;
-    STENCIL_BACK_PASS_DEPTH_PASS: number;
-    STENCIL_BACK_REF: number;
-    STENCIL_BACK_VALUE_MASK: number;
-    STENCIL_BACK_WRITEMASK: number;
-    STENCIL_BITS: number;
-    STENCIL_BUFFER_BIT: number;
-    STENCIL_CLEAR_VALUE: number;
-    STENCIL_FAIL: number;
-    STENCIL_FUNC: number;
-    STENCIL_INDEX: number;
-    STENCIL_INDEX8: number;
-    STENCIL_PASS_DEPTH_FAIL: number;
-    STENCIL_PASS_DEPTH_PASS: number;
-    STENCIL_REF: number;
-    STENCIL_TEST: number;
-    STENCIL_VALUE_MASK: number;
-    STENCIL_WRITEMASK: number;
-    STREAM_DRAW: number;
-    SUBPIXEL_BITS: number;
-    TEXTURE: number;
-    TEXTURE0: number;
-    TEXTURE1: number;
-    TEXTURE10: number;
-    TEXTURE11: number;
-    TEXTURE12: number;
-    TEXTURE13: number;
-    TEXTURE14: number;
-    TEXTURE15: number;
-    TEXTURE16: number;
-    TEXTURE17: number;
-    TEXTURE18: number;
-    TEXTURE19: number;
-    TEXTURE2: number;
-    TEXTURE20: number;
-    TEXTURE21: number;
-    TEXTURE22: number;
-    TEXTURE23: number;
-    TEXTURE24: number;
-    TEXTURE25: number;
-    TEXTURE26: number;
-    TEXTURE27: number;
-    TEXTURE28: number;
-    TEXTURE29: number;
-    TEXTURE3: number;
-    TEXTURE30: number;
-    TEXTURE31: number;
-    TEXTURE4: number;
-    TEXTURE5: number;
-    TEXTURE6: number;
-    TEXTURE7: number;
-    TEXTURE8: number;
-    TEXTURE9: number;
-    TEXTURE_2D: number;
-    TEXTURE_BINDING_2D: number;
-    TEXTURE_BINDING_CUBE_MAP: number;
-    TEXTURE_CUBE_MAP: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_X: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_Y: number;
-    TEXTURE_CUBE_MAP_NEGATIVE_Z: number;
-    TEXTURE_CUBE_MAP_POSITIVE_X: number;
-    TEXTURE_CUBE_MAP_POSITIVE_Y: number;
-    TEXTURE_CUBE_MAP_POSITIVE_Z: number;
-    TEXTURE_MAG_FILTER: number;
-    TEXTURE_MIN_FILTER: number;
-    TEXTURE_WRAP_S: number;
-    TEXTURE_WRAP_T: number;
-    TRIANGLES: number;
-    TRIANGLE_FAN: number;
-    TRIANGLE_STRIP: number;
-    UNPACK_ALIGNMENT: number;
-    UNPACK_COLORSPACE_CONVERSION_WEBGL: number;
-    UNPACK_FLIP_Y_WEBGL: number;
-    UNPACK_PREMULTIPLY_ALPHA_WEBGL: number;
-    UNSIGNED_BYTE: number;
-    UNSIGNED_INT: number;
-    UNSIGNED_SHORT: number;
-    UNSIGNED_SHORT_4_4_4_4: number;
-    UNSIGNED_SHORT_5_5_5_1: number;
-    UNSIGNED_SHORT_5_6_5: number;
-    VALIDATE_STATUS: number;
-    VENDOR: number;
-    VERSION: number;
-    VERTEX_ATTRIB_ARRAY_BUFFER_BINDING: number;
-    VERTEX_ATTRIB_ARRAY_ENABLED: number;
-    VERTEX_ATTRIB_ARRAY_NORMALIZED: number;
-    VERTEX_ATTRIB_ARRAY_POINTER: number;
-    VERTEX_ATTRIB_ARRAY_SIZE: number;
-    VERTEX_ATTRIB_ARRAY_STRIDE: number;
-    VERTEX_ATTRIB_ARRAY_TYPE: number;
-    VERTEX_SHADER: number;
-    VIEWPORT: number;
-    ZERO: number;
+    readonly ACTIVE_ATTRIBUTES: number;
+    readonly ACTIVE_TEXTURE: number;
+    readonly ACTIVE_UNIFORMS: number;
+    readonly ALIASED_LINE_WIDTH_RANGE: number;
+    readonly ALIASED_POINT_SIZE_RANGE: number;
+    readonly ALPHA: number;
+    readonly ALPHA_BITS: number;
+    readonly ALWAYS: number;
+    readonly ARRAY_BUFFER: number;
+    readonly ARRAY_BUFFER_BINDING: number;
+    readonly ATTACHED_SHADERS: number;
+    readonly BACK: number;
+    readonly BLEND: number;
+    readonly BLEND_COLOR: number;
+    readonly BLEND_DST_ALPHA: number;
+    readonly BLEND_DST_RGB: number;
+    readonly BLEND_EQUATION: number;
+    readonly BLEND_EQUATION_ALPHA: number;
+    readonly BLEND_EQUATION_RGB: number;
+    readonly BLEND_SRC_ALPHA: number;
+    readonly BLEND_SRC_RGB: number;
+    readonly BLUE_BITS: number;
+    readonly BOOL: number;
+    readonly BOOL_VEC2: number;
+    readonly BOOL_VEC3: number;
+    readonly BOOL_VEC4: number;
+    readonly BROWSER_DEFAULT_WEBGL: number;
+    readonly BUFFER_SIZE: number;
+    readonly BUFFER_USAGE: number;
+    readonly BYTE: number;
+    readonly CCW: number;
+    readonly CLAMP_TO_EDGE: number;
+    readonly COLOR_ATTACHMENT0: number;
+    readonly COLOR_BUFFER_BIT: number;
+    readonly COLOR_CLEAR_VALUE: number;
+    readonly COLOR_WRITEMASK: number;
+    readonly COMPILE_STATUS: number;
+    readonly COMPRESSED_TEXTURE_FORMATS: number;
+    readonly CONSTANT_ALPHA: number;
+    readonly CONSTANT_COLOR: number;
+    readonly CONTEXT_LOST_WEBGL: number;
+    readonly CULL_FACE: number;
+    readonly CULL_FACE_MODE: number;
+    readonly CURRENT_PROGRAM: number;
+    readonly CURRENT_VERTEX_ATTRIB: number;
+    readonly CW: number;
+    readonly DECR: number;
+    readonly DECR_WRAP: number;
+    readonly DELETE_STATUS: number;
+    readonly DEPTH_ATTACHMENT: number;
+    readonly DEPTH_BITS: number;
+    readonly DEPTH_BUFFER_BIT: number;
+    readonly DEPTH_CLEAR_VALUE: number;
+    readonly DEPTH_COMPONENT: number;
+    readonly DEPTH_COMPONENT16: number;
+    readonly DEPTH_FUNC: number;
+    readonly DEPTH_RANGE: number;
+    readonly DEPTH_STENCIL: number;
+    readonly DEPTH_STENCIL_ATTACHMENT: number;
+    readonly DEPTH_TEST: number;
+    readonly DEPTH_WRITEMASK: number;
+    readonly DITHER: number;
+    readonly DONT_CARE: number;
+    readonly DST_ALPHA: number;
+    readonly DST_COLOR: number;
+    readonly DYNAMIC_DRAW: number;
+    readonly ELEMENT_ARRAY_BUFFER: number;
+    readonly ELEMENT_ARRAY_BUFFER_BINDING: number;
+    readonly EQUAL: number;
+    readonly FASTEST: number;
+    readonly FLOAT: number;
+    readonly FLOAT_MAT2: number;
+    readonly FLOAT_MAT3: number;
+    readonly FLOAT_MAT4: number;
+    readonly FLOAT_VEC2: number;
+    readonly FLOAT_VEC3: number;
+    readonly FLOAT_VEC4: number;
+    readonly FRAGMENT_SHADER: number;
+    readonly FRAMEBUFFER: number;
+    readonly FRAMEBUFFER_ATTACHMENT_OBJECT_NAME: number;
+    readonly FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE: number;
+    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE: number;
+    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL: number;
+    readonly FRAMEBUFFER_BINDING: number;
+    readonly FRAMEBUFFER_COMPLETE: number;
+    readonly FRAMEBUFFER_INCOMPLETE_ATTACHMENT: number;
+    readonly FRAMEBUFFER_INCOMPLETE_DIMENSIONS: number;
+    readonly FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: number;
+    readonly FRAMEBUFFER_UNSUPPORTED: number;
+    readonly FRONT: number;
+    readonly FRONT_AND_BACK: number;
+    readonly FRONT_FACE: number;
+    readonly FUNC_ADD: number;
+    readonly FUNC_REVERSE_SUBTRACT: number;
+    readonly FUNC_SUBTRACT: number;
+    readonly GENERATE_MIPMAP_HINT: number;
+    readonly GEQUAL: number;
+    readonly GREATER: number;
+    readonly GREEN_BITS: number;
+    readonly HIGH_FLOAT: number;
+    readonly HIGH_INT: number;
+    readonly IMPLEMENTATION_COLOR_READ_FORMAT: number;
+    readonly IMPLEMENTATION_COLOR_READ_TYPE: number;
+    readonly INCR: number;
+    readonly INCR_WRAP: number;
+    readonly INT: number;
+    readonly INT_VEC2: number;
+    readonly INT_VEC3: number;
+    readonly INT_VEC4: number;
+    readonly INVALID_ENUM: number;
+    readonly INVALID_FRAMEBUFFER_OPERATION: number;
+    readonly INVALID_OPERATION: number;
+    readonly INVALID_VALUE: number;
+    readonly INVERT: number;
+    readonly KEEP: number;
+    readonly LEQUAL: number;
+    readonly LESS: number;
+    readonly LINEAR: number;
+    readonly LINEAR_MIPMAP_LINEAR: number;
+    readonly LINEAR_MIPMAP_NEAREST: number;
+    readonly LINES: number;
+    readonly LINE_LOOP: number;
+    readonly LINE_STRIP: number;
+    readonly LINE_WIDTH: number;
+    readonly LINK_STATUS: number;
+    readonly LOW_FLOAT: number;
+    readonly LOW_INT: number;
+    readonly LUMINANCE: number;
+    readonly LUMINANCE_ALPHA: number;
+    readonly MAX_COMBINED_TEXTURE_IMAGE_UNITS: number;
+    readonly MAX_CUBE_MAP_TEXTURE_SIZE: number;
+    readonly MAX_FRAGMENT_UNIFORM_VECTORS: number;
+    readonly MAX_RENDERBUFFER_SIZE: number;
+    readonly MAX_TEXTURE_IMAGE_UNITS: number;
+    readonly MAX_TEXTURE_SIZE: number;
+    readonly MAX_VARYING_VECTORS: number;
+    readonly MAX_VERTEX_ATTRIBS: number;
+    readonly MAX_VERTEX_TEXTURE_IMAGE_UNITS: number;
+    readonly MAX_VERTEX_UNIFORM_VECTORS: number;
+    readonly MAX_VIEWPORT_DIMS: number;
+    readonly MEDIUM_FLOAT: number;
+    readonly MEDIUM_INT: number;
+    readonly MIRRORED_REPEAT: number;
+    readonly NEAREST: number;
+    readonly NEAREST_MIPMAP_LINEAR: number;
+    readonly NEAREST_MIPMAP_NEAREST: number;
+    readonly NEVER: number;
+    readonly NICEST: number;
+    readonly NONE: number;
+    readonly NOTEQUAL: number;
+    readonly NO_ERROR: number;
+    readonly ONE: number;
+    readonly ONE_MINUS_CONSTANT_ALPHA: number;
+    readonly ONE_MINUS_CONSTANT_COLOR: number;
+    readonly ONE_MINUS_DST_ALPHA: number;
+    readonly ONE_MINUS_DST_COLOR: number;
+    readonly ONE_MINUS_SRC_ALPHA: number;
+    readonly ONE_MINUS_SRC_COLOR: number;
+    readonly OUT_OF_MEMORY: number;
+    readonly PACK_ALIGNMENT: number;
+    readonly POINTS: number;
+    readonly POLYGON_OFFSET_FACTOR: number;
+    readonly POLYGON_OFFSET_FILL: number;
+    readonly POLYGON_OFFSET_UNITS: number;
+    readonly RED_BITS: number;
+    readonly RENDERBUFFER: number;
+    readonly RENDERBUFFER_ALPHA_SIZE: number;
+    readonly RENDERBUFFER_BINDING: number;
+    readonly RENDERBUFFER_BLUE_SIZE: number;
+    readonly RENDERBUFFER_DEPTH_SIZE: number;
+    readonly RENDERBUFFER_GREEN_SIZE: number;
+    readonly RENDERBUFFER_HEIGHT: number;
+    readonly RENDERBUFFER_INTERNAL_FORMAT: number;
+    readonly RENDERBUFFER_RED_SIZE: number;
+    readonly RENDERBUFFER_STENCIL_SIZE: number;
+    readonly RENDERBUFFER_WIDTH: number;
+    readonly RENDERER: number;
+    readonly REPEAT: number;
+    readonly REPLACE: number;
+    readonly RGB: number;
+    readonly RGB565: number;
+    readonly RGB5_A1: number;
+    readonly RGBA: number;
+    readonly RGBA4: number;
+    readonly SAMPLER_2D: number;
+    readonly SAMPLER_CUBE: number;
+    readonly SAMPLES: number;
+    readonly SAMPLE_ALPHA_TO_COVERAGE: number;
+    readonly SAMPLE_BUFFERS: number;
+    readonly SAMPLE_COVERAGE: number;
+    readonly SAMPLE_COVERAGE_INVERT: number;
+    readonly SAMPLE_COVERAGE_VALUE: number;
+    readonly SCISSOR_BOX: number;
+    readonly SCISSOR_TEST: number;
+    readonly SHADER_TYPE: number;
+    readonly SHADING_LANGUAGE_VERSION: number;
+    readonly SHORT: number;
+    readonly SRC_ALPHA: number;
+    readonly SRC_ALPHA_SATURATE: number;
+    readonly SRC_COLOR: number;
+    readonly STATIC_DRAW: number;
+    readonly STENCIL_ATTACHMENT: number;
+    readonly STENCIL_BACK_FAIL: number;
+    readonly STENCIL_BACK_FUNC: number;
+    readonly STENCIL_BACK_PASS_DEPTH_FAIL: number;
+    readonly STENCIL_BACK_PASS_DEPTH_PASS: number;
+    readonly STENCIL_BACK_REF: number;
+    readonly STENCIL_BACK_VALUE_MASK: number;
+    readonly STENCIL_BACK_WRITEMASK: number;
+    readonly STENCIL_BITS: number;
+    readonly STENCIL_BUFFER_BIT: number;
+    readonly STENCIL_CLEAR_VALUE: number;
+    readonly STENCIL_FAIL: number;
+    readonly STENCIL_FUNC: number;
+    readonly STENCIL_INDEX: number;
+    readonly STENCIL_INDEX8: number;
+    readonly STENCIL_PASS_DEPTH_FAIL: number;
+    readonly STENCIL_PASS_DEPTH_PASS: number;
+    readonly STENCIL_REF: number;
+    readonly STENCIL_TEST: number;
+    readonly STENCIL_VALUE_MASK: number;
+    readonly STENCIL_WRITEMASK: number;
+    readonly STREAM_DRAW: number;
+    readonly SUBPIXEL_BITS: number;
+    readonly TEXTURE: number;
+    readonly TEXTURE0: number;
+    readonly TEXTURE1: number;
+    readonly TEXTURE10: number;
+    readonly TEXTURE11: number;
+    readonly TEXTURE12: number;
+    readonly TEXTURE13: number;
+    readonly TEXTURE14: number;
+    readonly TEXTURE15: number;
+    readonly TEXTURE16: number;
+    readonly TEXTURE17: number;
+    readonly TEXTURE18: number;
+    readonly TEXTURE19: number;
+    readonly TEXTURE2: number;
+    readonly TEXTURE20: number;
+    readonly TEXTURE21: number;
+    readonly TEXTURE22: number;
+    readonly TEXTURE23: number;
+    readonly TEXTURE24: number;
+    readonly TEXTURE25: number;
+    readonly TEXTURE26: number;
+    readonly TEXTURE27: number;
+    readonly TEXTURE28: number;
+    readonly TEXTURE29: number;
+    readonly TEXTURE3: number;
+    readonly TEXTURE30: number;
+    readonly TEXTURE31: number;
+    readonly TEXTURE4: number;
+    readonly TEXTURE5: number;
+    readonly TEXTURE6: number;
+    readonly TEXTURE7: number;
+    readonly TEXTURE8: number;
+    readonly TEXTURE9: number;
+    readonly TEXTURE_2D: number;
+    readonly TEXTURE_BINDING_2D: number;
+    readonly TEXTURE_BINDING_CUBE_MAP: number;
+    readonly TEXTURE_CUBE_MAP: number;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_X: number;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_Y: number;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_Z: number;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_X: number;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_Y: number;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_Z: number;
+    readonly TEXTURE_MAG_FILTER: number;
+    readonly TEXTURE_MIN_FILTER: number;
+    readonly TEXTURE_WRAP_S: number;
+    readonly TEXTURE_WRAP_T: number;
+    readonly TRIANGLES: number;
+    readonly TRIANGLE_FAN: number;
+    readonly TRIANGLE_STRIP: number;
+    readonly UNPACK_ALIGNMENT: number;
+    readonly UNPACK_COLORSPACE_CONVERSION_WEBGL: number;
+    readonly UNPACK_FLIP_Y_WEBGL: number;
+    readonly UNPACK_PREMULTIPLY_ALPHA_WEBGL: number;
+    readonly UNSIGNED_BYTE: number;
+    readonly UNSIGNED_INT: number;
+    readonly UNSIGNED_SHORT: number;
+    readonly UNSIGNED_SHORT_4_4_4_4: number;
+    readonly UNSIGNED_SHORT_5_5_5_1: number;
+    readonly UNSIGNED_SHORT_5_6_5: number;
+    readonly VALIDATE_STATUS: number;
+    readonly VENDOR: number;
+    readonly VERSION: number;
+    readonly VERTEX_ATTRIB_ARRAY_BUFFER_BINDING: number;
+    readonly VERTEX_ATTRIB_ARRAY_ENABLED: number;
+    readonly VERTEX_ATTRIB_ARRAY_NORMALIZED: number;
+    readonly VERTEX_ATTRIB_ARRAY_POINTER: number;
+    readonly VERTEX_ATTRIB_ARRAY_SIZE: number;
+    readonly VERTEX_ATTRIB_ARRAY_STRIDE: number;
+    readonly VERTEX_ATTRIB_ARRAY_TYPE: number;
+    readonly VERTEX_SHADER: number;
+    readonly VIEWPORT: number;
+    readonly ZERO: number;
 }
 
 interface WebGLShader extends WebGLObject {
@@ -11701,9 +12693,9 @@ declare var WebGLShader: {
 }
 
 interface WebGLShaderPrecisionFormat {
-    precision: number;
-    rangeMax: number;
-    rangeMin: number;
+    readonly precision: number;
+    readonly rangeMax: number;
+    readonly rangeMin: number;
 }
 
 declare var WebGLShaderPrecisionFormat: {
@@ -11779,21 +12771,21 @@ declare var WebKitPoint: {
 
 interface WebSocket extends EventTarget {
     binaryType: string;
-    bufferedAmount: number;
-    extensions: string;
+    readonly bufferedAmount: number;
+    readonly extensions: string;
     onclose: (ev: CloseEvent) => any;
     onerror: (ev: Event) => any;
     onmessage: (ev: MessageEvent) => any;
     onopen: (ev: Event) => any;
-    protocol: string;
-    readyState: number;
-    url: string;
+    readonly protocol: string;
+    readonly readyState: number;
+    readonly url: string;
     close(code?: number, reason?: string): void;
     send(data: any): void;
-    CLOSED: number;
-    CLOSING: number;
-    CONNECTING: number;
-    OPEN: number;
+    readonly CLOSED: number;
+    readonly CLOSING: number;
+    readonly CONNECTING: number;
+    readonly OPEN: number;
     addEventListener(type: "close", listener: (ev: CloseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "message", listener: (ev: MessageEvent) => any, useCapture?: boolean): void;
@@ -11804,56 +12796,58 @@ interface WebSocket extends EventTarget {
 declare var WebSocket: {
     prototype: WebSocket;
     new(url: string, protocols?: string | string[]): WebSocket;
-    CLOSED: number;
-    CLOSING: number;
-    CONNECTING: number;
-    OPEN: number;
+    readonly CLOSED: number;
+    readonly CLOSING: number;
+    readonly CONNECTING: number;
+    readonly OPEN: number;
 }
 
 interface WheelEvent extends MouseEvent {
-    deltaMode: number;
-    deltaX: number;
-    deltaY: number;
-    deltaZ: number;
+    readonly deltaMode: number;
+    readonly deltaX: number;
+    readonly deltaY: number;
+    readonly deltaZ: number;
+    readonly wheelDelta: number;
+    readonly wheelDeltaX: number;
+    readonly wheelDeltaY: number;
     getCurrentPoint(element: Element): void;
     initWheelEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, buttonArg: number, relatedTargetArg: EventTarget, modifiersListArg: string, deltaXArg: number, deltaYArg: number, deltaZArg: number, deltaMode: number): void;
-    DOM_DELTA_LINE: number;
-    DOM_DELTA_PAGE: number;
-    DOM_DELTA_PIXEL: number;
+    readonly DOM_DELTA_LINE: number;
+    readonly DOM_DELTA_PAGE: number;
+    readonly DOM_DELTA_PIXEL: number;
 }
 
 declare var WheelEvent: {
     prototype: WheelEvent;
     new(typeArg: string, eventInitDict?: WheelEventInit): WheelEvent;
-    DOM_DELTA_LINE: number;
-    DOM_DELTA_PAGE: number;
-    DOM_DELTA_PIXEL: number;
+    readonly DOM_DELTA_LINE: number;
+    readonly DOM_DELTA_PAGE: number;
+    readonly DOM_DELTA_PIXEL: number;
 }
 
 interface Window extends EventTarget, WindowTimers, WindowSessionStorage, WindowLocalStorage, WindowConsole, GlobalEventHandlers, IDBEnvironment, WindowBase64 {
-    animationStartTime: number;
-    applicationCache: ApplicationCache;
-    clientInformation: Navigator;
-    closed: boolean;
-    crypto: Crypto;
+    readonly applicationCache: ApplicationCache;
+    readonly clientInformation: Navigator;
+    readonly closed: boolean;
+    readonly crypto: Crypto;
     defaultStatus: string;
-    devicePixelRatio: number;
-    doNotTrack: string;
-    document: Document;
+    readonly devicePixelRatio: number;
+    readonly doNotTrack: string;
+    readonly document: Document;
     event: Event;
-    external: External;
-    frameElement: Element;
-    frames: Window;
-    history: History;
-    innerHeight: number;
-    innerWidth: number;
-    length: number;
-    location: Location;
-    locationbar: BarProp;
-    menubar: BarProp;
-    msAnimationStartTime: number;
+    readonly external: External;
+    readonly frameElement: Element;
+    readonly frames: Window;
+    readonly history: History;
+    readonly innerHeight: number;
+    readonly innerWidth: number;
+    readonly length: number;
+    readonly location: Location;
+    readonly locationbar: BarProp;
+    readonly menubar: BarProp;
+    readonly msCredentials: MSCredentials;
     name: string;
-    navigator: Navigator;
+    readonly navigator: Navigator;
     offscreenBuffering: string | boolean;
     onabort: (ev: Event) => any;
     onafterprint: (ev: Event) => any;
@@ -11867,6 +12861,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     oncompassneedscalibration: (ev: Event) => any;
     oncontextmenu: (ev: PointerEvent) => any;
     ondblclick: (ev: MouseEvent) => any;
+    ondevicelight: (ev: DeviceLightEvent) => any;
     ondevicemotion: (ev: DeviceMotionEvent) => any;
     ondeviceorientation: (ev: DeviceOrientationEvent) => any;
     ondrag: (ev: DragEvent) => any;
@@ -11878,11 +12873,12 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     ondrop: (ev: DragEvent) => any;
     ondurationchange: (ev: Event) => any;
     onemptied: (ev: Event) => any;
-    onended: (ev: Event) => any;
+    onended: (ev: MediaStreamErrorEvent) => any;
     onerror: ErrorEventHandler;
     onfocus: (ev: FocusEvent) => any;
     onhashchange: (ev: HashChangeEvent) => any;
     oninput: (ev: Event) => any;
+    oninvalid: (ev: Event) => any;
     onkeydown: (ev: KeyboardEvent) => any;
     onkeypress: (ev: KeyboardEvent) => any;
     onkeyup: (ev: KeyboardEvent) => any;
@@ -11898,7 +12894,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     onmouseout: (ev: MouseEvent) => any;
     onmouseover: (ev: MouseEvent) => any;
     onmouseup: (ev: MouseEvent) => any;
-    onmousewheel: (ev: MouseWheelEvent) => any;
+    onmousewheel: (ev: WheelEvent) => any;
     onmsgesturechange: (ev: MSGestureEvent) => any;
     onmsgesturedoubletap: (ev: MSGestureEvent) => any;
     onmsgestureend: (ev: MSGestureEvent) => any;
@@ -11937,38 +12933,38 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     onsubmit: (ev: Event) => any;
     onsuspend: (ev: Event) => any;
     ontimeupdate: (ev: Event) => any;
-    ontouchcancel: any;
-    ontouchend: any;
-    ontouchmove: any;
-    ontouchstart: any;
+    ontouchcancel: (ev: TouchEvent) => any;
+    ontouchend: (ev: TouchEvent) => any;
+    ontouchmove: (ev: TouchEvent) => any;
+    ontouchstart: (ev: TouchEvent) => any;
     onunload: (ev: Event) => any;
     onvolumechange: (ev: Event) => any;
     onwaiting: (ev: Event) => any;
-    opener: Window;
+    readonly opener: Window;
     orientation: string | number;
-    outerHeight: number;
-    outerWidth: number;
-    pageXOffset: number;
-    pageYOffset: number;
-    parent: Window;
-    performance: Performance;
-    personalbar: BarProp;
-    screen: Screen;
-    screenLeft: number;
-    screenTop: number;
-    screenX: number;
-    screenY: number;
-    scrollX: number;
-    scrollY: number;
-    scrollbars: BarProp;
-    self: Window;
+    readonly outerHeight: number;
+    readonly outerWidth: number;
+    readonly pageXOffset: number;
+    readonly pageYOffset: number;
+    readonly parent: Window;
+    readonly performance: Performance;
+    readonly personalbar: BarProp;
+    readonly screen: Screen;
+    readonly screenLeft: number;
+    readonly screenTop: number;
+    readonly screenX: number;
+    readonly screenY: number;
+    readonly scrollX: number;
+    readonly scrollY: number;
+    readonly scrollbars: BarProp;
+    readonly self: Window;
     status: string;
-    statusbar: BarProp;
-    styleMedia: StyleMedia;
-    toolbar: BarProp;
-    top: Window;
-    window: Window;
-    URL: URL;
+    readonly statusbar: BarProp;
+    readonly styleMedia: StyleMedia;
+    readonly toolbar: BarProp;
+    readonly top: Window;
+    readonly window: Window;
+    URL: typeof URL;
     alert(message?: any): void;
     blur(): void;
     cancelAnimationFrame(handle: number): void;
@@ -11982,12 +12978,9 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     matchMedia(mediaQuery: string): MediaQueryList;
     moveBy(x?: number, y?: number): void;
     moveTo(x?: number, y?: number): void;
-    msCancelRequestAnimationFrame(handle: number): void;
-    msMatchMedia(mediaQuery: string): MediaQueryList;
-    msRequestAnimationFrame(callback: FrameRequestCallback): number;
     msWriteProfilerMark(profilerMarkName: string): void;
     open(url?: string, target?: string, features?: string, replace?: boolean): Window;
-    postMessage(message: any, targetOrigin: string, ports?: any): void;
+    postMessage(message: any, targetOrigin: string, transfer?: any[]): void;
     print(): void;
     prompt(message?: string, _default?: string): string;
     releaseEvents(): void;
@@ -11997,8 +12990,10 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     scroll(x?: number, y?: number): void;
     scrollBy(x?: number, y?: number): void;
     scrollTo(x?: number, y?: number): void;
+    webkitCancelAnimationFrame(handle: number): void;
     webkitConvertPointFromNodeToPage(node: Node, pt: WebKitPoint): WebKitPoint;
     webkitConvertPointFromPageToNode(node: Node, pt: WebKitPoint): WebKitPoint;
+    webkitRequestAnimationFrame(callback: FrameRequestCallback): number;
     addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -12026,6 +13021,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     addEventListener(type: "compassneedscalibration", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "devicelight", listener: (ev: DeviceLightEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "devicemotion", listener: (ev: DeviceMotionEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "deviceorientation", listener: (ev: DeviceOrientationEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -12037,10 +13033,11 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "hashchange", listener: (ev: HashChangeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -12056,7 +13053,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+    addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "offline", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "online", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "orientationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -12126,16 +13123,15 @@ declare var XMLDocument: {
 interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
     msCaching: string;
     onreadystatechange: (ev: ProgressEvent) => any;
-    readyState: number;
-    response: any;
-    responseBody: any;
-    responseText: string;
+    readonly readyState: number;
+    readonly response: any;
+    readonly responseText: string;
     responseType: string;
-    responseXML: any;
-    status: number;
-    statusText: string;
+    readonly responseXML: any;
+    readonly status: number;
+    readonly statusText: string;
     timeout: number;
-    upload: XMLHttpRequestUpload;
+    readonly upload: XMLHttpRequestUpload;
     withCredentials: boolean;
     abort(): void;
     getAllResponseHeaders(): string;
@@ -12147,11 +13143,11 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
     send(data?: string): void;
     send(data?: any): void;
     setRequestHeader(header: string, value: string): void;
-    DONE: number;
-    HEADERS_RECEIVED: number;
-    LOADING: number;
-    OPENED: number;
-    UNSENT: number;
+    readonly DONE: number;
+    readonly HEADERS_RECEIVED: number;
+    readonly LOADING: number;
+    readonly OPENED: number;
+    readonly UNSENT: number;
     addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -12166,11 +13162,11 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
 declare var XMLHttpRequest: {
     prototype: XMLHttpRequest;
     new(): XMLHttpRequest;
-    DONE: number;
-    HEADERS_RECEIVED: number;
-    LOADING: number;
-    OPENED: number;
-    UNSENT: number;
+    readonly DONE: number;
+    readonly HEADERS_RECEIVED: number;
+    readonly LOADING: number;
+    readonly OPENED: number;
+    readonly UNSENT: number;
     create(): XMLHttpRequest;
 }
 
@@ -12222,40 +13218,40 @@ declare var XPathNSResolver: {
 }
 
 interface XPathResult {
-    booleanValue: boolean;
-    invalidIteratorState: boolean;
-    numberValue: number;
-    resultType: number;
-    singleNodeValue: Node;
-    snapshotLength: number;
-    stringValue: string;
+    readonly booleanValue: boolean;
+    readonly invalidIteratorState: boolean;
+    readonly numberValue: number;
+    readonly resultType: number;
+    readonly singleNodeValue: Node;
+    readonly snapshotLength: number;
+    readonly stringValue: string;
     iterateNext(): Node;
     snapshotItem(index: number): Node;
-    ANY_TYPE: number;
-    ANY_UNORDERED_NODE_TYPE: number;
-    BOOLEAN_TYPE: number;
-    FIRST_ORDERED_NODE_TYPE: number;
-    NUMBER_TYPE: number;
-    ORDERED_NODE_ITERATOR_TYPE: number;
-    ORDERED_NODE_SNAPSHOT_TYPE: number;
-    STRING_TYPE: number;
-    UNORDERED_NODE_ITERATOR_TYPE: number;
-    UNORDERED_NODE_SNAPSHOT_TYPE: number;
+    readonly ANY_TYPE: number;
+    readonly ANY_UNORDERED_NODE_TYPE: number;
+    readonly BOOLEAN_TYPE: number;
+    readonly FIRST_ORDERED_NODE_TYPE: number;
+    readonly NUMBER_TYPE: number;
+    readonly ORDERED_NODE_ITERATOR_TYPE: number;
+    readonly ORDERED_NODE_SNAPSHOT_TYPE: number;
+    readonly STRING_TYPE: number;
+    readonly UNORDERED_NODE_ITERATOR_TYPE: number;
+    readonly UNORDERED_NODE_SNAPSHOT_TYPE: number;
 }
 
 declare var XPathResult: {
     prototype: XPathResult;
     new(): XPathResult;
-    ANY_TYPE: number;
-    ANY_UNORDERED_NODE_TYPE: number;
-    BOOLEAN_TYPE: number;
-    FIRST_ORDERED_NODE_TYPE: number;
-    NUMBER_TYPE: number;
-    ORDERED_NODE_ITERATOR_TYPE: number;
-    ORDERED_NODE_SNAPSHOT_TYPE: number;
-    STRING_TYPE: number;
-    UNORDERED_NODE_ITERATOR_TYPE: number;
-    UNORDERED_NODE_SNAPSHOT_TYPE: number;
+    readonly ANY_TYPE: number;
+    readonly ANY_UNORDERED_NODE_TYPE: number;
+    readonly BOOLEAN_TYPE: number;
+    readonly FIRST_ORDERED_NODE_TYPE: number;
+    readonly NUMBER_TYPE: number;
+    readonly ORDERED_NODE_ITERATOR_TYPE: number;
+    readonly ORDERED_NODE_SNAPSHOT_TYPE: number;
+    readonly STRING_TYPE: number;
+    readonly UNORDERED_NODE_ITERATOR_TYPE: number;
+    readonly UNORDERED_NODE_SNAPSHOT_TYPE: number;
 }
 
 interface XSLTProcessor {
@@ -12280,6 +13276,18 @@ interface AbstractWorker {
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
+interface CanvasPathMethods {
+    arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void;
+    arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void;
+    bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void;
+    closePath(): void;
+    ellipse(x: number, y: number, radiusX: number, radiusY: number, rotation: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void;
+    lineTo(x: number, y: number): void;
+    moveTo(x: number, y: number): void;
+    quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
+    rect(x: number, y: number, w: number, h: number): void;
+}
+
 interface ChildNode {
     remove(): void;
 }
@@ -12302,6 +13310,7 @@ interface DocumentEvent {
     createEvent(eventInterface:"CommandEvent"): CommandEvent;
     createEvent(eventInterface:"CompositionEvent"): CompositionEvent;
     createEvent(eventInterface:"CustomEvent"): CustomEvent;
+    createEvent(eventInterface:"DeviceLightEvent"): DeviceLightEvent;
     createEvent(eventInterface:"DeviceMotionEvent"): DeviceMotionEvent;
     createEvent(eventInterface:"DeviceOrientationEvent"): DeviceOrientationEvent;
     createEvent(eventInterface:"DragEvent"): DragEvent;
@@ -12313,6 +13322,7 @@ interface DocumentEvent {
     createEvent(eventInterface:"HashChangeEvent"): HashChangeEvent;
     createEvent(eventInterface:"IDBVersionChangeEvent"): IDBVersionChangeEvent;
     createEvent(eventInterface:"KeyboardEvent"): KeyboardEvent;
+    createEvent(eventInterface:"ListeningStateChangedEvent"): ListeningStateChangedEvent;
     createEvent(eventInterface:"LongRunningScriptDetectedEvent"): LongRunningScriptDetectedEvent;
     createEvent(eventInterface:"MSGestureEvent"): MSGestureEvent;
     createEvent(eventInterface:"MSManipulationEvent"): MSManipulationEvent;
@@ -12320,21 +13330,31 @@ interface DocumentEvent {
     createEvent(eventInterface:"MSMediaKeyNeededEvent"): MSMediaKeyNeededEvent;
     createEvent(eventInterface:"MSPointerEvent"): MSPointerEvent;
     createEvent(eventInterface:"MSSiteModeEvent"): MSSiteModeEvent;
+    createEvent(eventInterface:"MediaEncryptedEvent"): MediaEncryptedEvent;
+    createEvent(eventInterface:"MediaKeyMessageEvent"): MediaKeyMessageEvent;
+    createEvent(eventInterface:"MediaStreamErrorEvent"): MediaStreamErrorEvent;
+    createEvent(eventInterface:"MediaStreamTrackEvent"): MediaStreamTrackEvent;
     createEvent(eventInterface:"MessageEvent"): MessageEvent;
     createEvent(eventInterface:"MouseEvent"): MouseEvent;
     createEvent(eventInterface:"MouseEvents"): MouseEvent;
-    createEvent(eventInterface:"MouseWheelEvent"): MouseWheelEvent;
     createEvent(eventInterface:"MutationEvent"): MutationEvent;
     createEvent(eventInterface:"MutationEvents"): MutationEvent;
     createEvent(eventInterface:"NavigationCompletedEvent"): NavigationCompletedEvent;
     createEvent(eventInterface:"NavigationEvent"): NavigationEvent;
     createEvent(eventInterface:"NavigationEventWithReferrer"): NavigationEventWithReferrer;
     createEvent(eventInterface:"OfflineAudioCompletionEvent"): OfflineAudioCompletionEvent;
+    createEvent(eventInterface:"OverflowEvent"): OverflowEvent;
     createEvent(eventInterface:"PageTransitionEvent"): PageTransitionEvent;
     createEvent(eventInterface:"PermissionRequestedEvent"): PermissionRequestedEvent;
     createEvent(eventInterface:"PointerEvent"): PointerEvent;
     createEvent(eventInterface:"PopStateEvent"): PopStateEvent;
     createEvent(eventInterface:"ProgressEvent"): ProgressEvent;
+    createEvent(eventInterface:"RTCDTMFToneChangeEvent"): RTCDTMFToneChangeEvent;
+    createEvent(eventInterface:"RTCDtlsTransportStateChangedEvent"): RTCDtlsTransportStateChangedEvent;
+    createEvent(eventInterface:"RTCIceCandidatePairChangedEvent"): RTCIceCandidatePairChangedEvent;
+    createEvent(eventInterface:"RTCIceGathererEvent"): RTCIceGathererEvent;
+    createEvent(eventInterface:"RTCIceTransportStateChangedEvent"): RTCIceTransportStateChangedEvent;
+    createEvent(eventInterface:"RTCSsrcConflictEvent"): RTCSsrcConflictEvent;
     createEvent(eventInterface:"SVGZoomEvent"): SVGZoomEvent;
     createEvent(eventInterface:"SVGZoomEvents"): SVGZoomEvent;
     createEvent(eventInterface:"ScriptNotifyEvent"): ScriptNotifyEvent;
@@ -12352,11 +13372,11 @@ interface DocumentEvent {
 }
 
 interface ElementTraversal {
-    childElementCount: number;
-    firstElementChild: Element;
-    lastElementChild: Element;
-    nextElementSibling: Element;
-    previousElementSibling: Element;
+    readonly childElementCount: number;
+    readonly firstElementChild: Element;
+    readonly lastElementChild: Element;
+    readonly nextElementSibling: Element;
+    readonly previousElementSibling: Element;
 }
 
 interface GetSVGDocument {
@@ -12401,12 +13421,11 @@ interface HTMLTableAlignment {
 }
 
 interface IDBEnvironment {
-    indexedDB: IDBFactory;
-    msIndexedDB: IDBFactory;
+    readonly indexedDB: IDBFactory;
 }
 
 interface LinkStyle {
-    sheet: StyleSheet;
+    readonly sheet: StyleSheet;
 }
 
 interface MSBaseReader {
@@ -12416,12 +13435,12 @@ interface MSBaseReader {
     onloadend: (ev: ProgressEvent) => any;
     onloadstart: (ev: Event) => any;
     onprogress: (ev: ProgressEvent) => any;
-    readyState: number;
-    result: any;
+    readonly readyState: number;
+    readonly result: any;
     abort(): void;
-    DONE: number;
-    EMPTY: number;
-    LOADING: number;
+    readonly DONE: number;
+    readonly EMPTY: number;
+    readonly LOADING: number;
     addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -12449,27 +13468,32 @@ interface NavigatorContentUtils {
 }
 
 interface NavigatorGeolocation {
-    geolocation: Geolocation;
+    readonly geolocation: Geolocation;
 }
 
 interface NavigatorID {
-    appName: string;
-    appVersion: string;
-    platform: string;
-    product: string;
-    productSub: string;
-    userAgent: string;
-    vendor: string;
-    vendorSub: string;
+    readonly appName: string;
+    readonly appVersion: string;
+    readonly platform: string;
+    readonly product: string;
+    readonly productSub: string;
+    readonly userAgent: string;
+    readonly vendor: string;
+    readonly vendorSub: string;
 }
 
 interface NavigatorOnLine {
-    onLine: boolean;
+    readonly onLine: boolean;
 }
 
 interface NavigatorStorageUtils {
 }
 
+interface NavigatorUserMedia {
+    readonly mediaDevices: MediaDevices;
+    getUserMedia(constraints: MediaStreamConstraints, successCallback: NavigatorUserMediaSuccessCallback, errorCallback: NavigatorUserMediaErrorCallback): void;
+}
+
 interface NodeSelector {
     querySelector(selectors: string): Element;
     querySelectorAll(selectors: string): NodeListOf<Element>;
@@ -12480,29 +13504,29 @@ interface RandomSource {
 }
 
 interface SVGAnimatedPathData {
-    pathSegList: SVGPathSegList;
+    readonly pathSegList: SVGPathSegList;
 }
 
 interface SVGAnimatedPoints {
-    animatedPoints: SVGPointList;
-    points: SVGPointList;
+    readonly animatedPoints: SVGPointList;
+    readonly points: SVGPointList;
 }
 
 interface SVGExternalResourcesRequired {
-    externalResourcesRequired: SVGAnimatedBoolean;
+    readonly externalResourcesRequired: SVGAnimatedBoolean;
 }
 
 interface SVGFilterPrimitiveStandardAttributes extends SVGStylable {
-    height: SVGAnimatedLength;
-    result: SVGAnimatedString;
-    width: SVGAnimatedLength;
-    x: SVGAnimatedLength;
-    y: SVGAnimatedLength;
+    readonly height: SVGAnimatedLength;
+    readonly result: SVGAnimatedString;
+    readonly width: SVGAnimatedLength;
+    readonly x: SVGAnimatedLength;
+    readonly y: SVGAnimatedLength;
 }
 
 interface SVGFitToViewBox {
-    preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
-    viewBox: SVGAnimatedRect;
+    readonly preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
+    readonly viewBox: SVGAnimatedRect;
 }
 
 interface SVGLangSpace {
@@ -12511,8 +13535,8 @@ interface SVGLangSpace {
 }
 
 interface SVGLocatable {
-    farthestViewportElement: SVGElement;
-    nearestViewportElement: SVGElement;
+    readonly farthestViewportElement: SVGElement;
+    readonly nearestViewportElement: SVGElement;
     getBBox(): SVGRect;
     getCTM(): SVGMatrix;
     getScreenCTM(): SVGMatrix;
@@ -12521,22 +13545,22 @@ interface SVGLocatable {
 
 interface SVGStylable {
     className: any;
-    style: CSSStyleDeclaration;
+    readonly style: CSSStyleDeclaration;
 }
 
 interface SVGTests {
-    requiredExtensions: SVGStringList;
-    requiredFeatures: SVGStringList;
-    systemLanguage: SVGStringList;
+    readonly requiredExtensions: SVGStringList;
+    readonly requiredFeatures: SVGStringList;
+    readonly systemLanguage: SVGStringList;
     hasExtension(extension: string): boolean;
 }
 
 interface SVGTransformable extends SVGLocatable {
-    transform: SVGAnimatedTransformList;
+    readonly transform: SVGAnimatedTransformList;
 }
 
 interface SVGURIReference {
-    href: SVGAnimatedString;
+    readonly href: SVGAnimatedString;
 }
 
 interface WindowBase64 {
@@ -12545,15 +13569,15 @@ interface WindowBase64 {
 }
 
 interface WindowConsole {
-    console: Console;
+    readonly console: Console;
 }
 
 interface WindowLocalStorage {
-    localStorage: Storage;
+    readonly localStorage: Storage;
 }
 
 interface WindowSessionStorage {
-    sessionStorage: Storage;
+    readonly sessionStorage: Storage;
 }
 
 interface WindowTimers extends Object, WindowTimersExtension {
@@ -12565,8 +13589,6 @@ interface WindowTimers extends Object, WindowTimersExtension {
 
 interface WindowTimersExtension {
     clearImmediate(handle: number): void;
-    msClearImmediate(handle: number): void;
-    msSetImmediate(expression: any, ...args: any[]): number;
     setImmediate(expression: any, ...args: any[]): number;
 }
 
@@ -12596,22 +13618,18 @@ interface StorageEventInit extends EventInit {
     storageArea?: Storage;
 }
 
-interface IDBObjectStoreParameters {
-    keyPath?: string | string[];
-    autoIncrement?: boolean;
-}
-
-interface IDBIndexParameters {
-    unique?: boolean;
-    multiEntry?: boolean;
-}
-
 interface NodeListOf<TNode extends Node> extends NodeList {
     length: number;
     item(index: number): TNode;
     [index: number]: TNode;
 }
 
+interface HTMLCollectionOf<T extends Element> extends HTMLCollection {
+    item(index: number): T;
+    namedItem(name: string): T;
+    [index: number]: T;
+}
+
 interface BlobPropertyBag {
     type?: string;
     endings?: string;
@@ -12641,15 +13659,6 @@ interface ProgressEventInit extends EventInit {
     total?: number;
 }
 
-interface HTMLTemplateElement extends HTMLElement {
-    content: DocumentFragment;
-}
-
-declare var HTMLTemplateElement: {
-    prototype: HTMLTemplateElement;
-    new(): HTMLTemplateElement;
-}
-
 interface HTMLPictureElement extends HTMLElement {
 }
 
@@ -12658,6 +13667,14 @@ declare var HTMLPictureElement: {
     new(): HTMLPictureElement;
 }
 
+interface ClipboardEventInit extends EventInit {
+    data?: string;
+    dataType?: string;
+}
+
+interface IDBArrayKey extends Array<IDBValidKey> {
+}
+
 declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
 
 interface ErrorEventHandler {
@@ -12696,10 +13713,18 @@ interface DecodeErrorCallback {
 interface FunctionStringCallback {
     (data: string): void;
 }
+interface NavigatorUserMediaSuccessCallback {
+    (stream: MediaStream): void;
+}
+interface NavigatorUserMediaErrorCallback {
+    (error: MediaStreamError): void;
+}
+interface ForEachCallback {
+    (keyId: any, status: string): void;
+}
 declare var Audio: {new(src?: string): HTMLAudioElement; };
 declare var Image: {new(width?: number, height?: number): HTMLImageElement; };
 declare var Option: {new(text?: string, value?: string, defaultSelected?: boolean, selected?: boolean): HTMLOptionElement; };
-declare var animationStartTime: number;
 declare var applicationCache: ApplicationCache;
 declare var clientInformation: Navigator;
 declare var closed: boolean;
@@ -12719,7 +13744,7 @@ declare var length: number;
 declare var location: Location;
 declare var locationbar: BarProp;
 declare var menubar: BarProp;
-declare var msAnimationStartTime: number;
+declare var msCredentials: MSCredentials;
 declare var name: string;
 declare var navigator: Navigator;
 declare var offscreenBuffering: string | boolean;
@@ -12735,6 +13760,7 @@ declare var onclick: (ev: MouseEvent) => any;
 declare var oncompassneedscalibration: (ev: Event) => any;
 declare var oncontextmenu: (ev: PointerEvent) => any;
 declare var ondblclick: (ev: MouseEvent) => any;
+declare var ondevicelight: (ev: DeviceLightEvent) => any;
 declare var ondevicemotion: (ev: DeviceMotionEvent) => any;
 declare var ondeviceorientation: (ev: DeviceOrientationEvent) => any;
 declare var ondrag: (ev: DragEvent) => any;
@@ -12746,11 +13772,12 @@ declare var ondragstart: (ev: DragEvent) => any;
 declare var ondrop: (ev: DragEvent) => any;
 declare var ondurationchange: (ev: Event) => any;
 declare var onemptied: (ev: Event) => any;
-declare var onended: (ev: Event) => any;
+declare var onended: (ev: MediaStreamErrorEvent) => any;
 declare var onerror: ErrorEventHandler;
 declare var onfocus: (ev: FocusEvent) => any;
 declare var onhashchange: (ev: HashChangeEvent) => any;
 declare var oninput: (ev: Event) => any;
+declare var oninvalid: (ev: Event) => any;
 declare var onkeydown: (ev: KeyboardEvent) => any;
 declare var onkeypress: (ev: KeyboardEvent) => any;
 declare var onkeyup: (ev: KeyboardEvent) => any;
@@ -12766,7 +13793,7 @@ declare var onmousemove: (ev: MouseEvent) => any;
 declare var onmouseout: (ev: MouseEvent) => any;
 declare var onmouseover: (ev: MouseEvent) => any;
 declare var onmouseup: (ev: MouseEvent) => any;
-declare var onmousewheel: (ev: MouseWheelEvent) => any;
+declare var onmousewheel: (ev: WheelEvent) => any;
 declare var onmsgesturechange: (ev: MSGestureEvent) => any;
 declare var onmsgesturedoubletap: (ev: MSGestureEvent) => any;
 declare var onmsgestureend: (ev: MSGestureEvent) => any;
@@ -12805,10 +13832,10 @@ declare var onstorage: (ev: StorageEvent) => any;
 declare var onsubmit: (ev: Event) => any;
 declare var onsuspend: (ev: Event) => any;
 declare var ontimeupdate: (ev: Event) => any;
-declare var ontouchcancel: any;
-declare var ontouchend: any;
-declare var ontouchmove: any;
-declare var ontouchstart: any;
+declare var ontouchcancel: (ev: TouchEvent) => any;
+declare var ontouchend: (ev: TouchEvent) => any;
+declare var ontouchmove: (ev: TouchEvent) => any;
+declare var ontouchstart: (ev: TouchEvent) => any;
 declare var onunload: (ev: Event) => any;
 declare var onvolumechange: (ev: Event) => any;
 declare var onwaiting: (ev: Event) => any;
@@ -12836,7 +13863,6 @@ declare var styleMedia: StyleMedia;
 declare var toolbar: BarProp;
 declare var top: Window;
 declare var window: Window;
-declare var URL: URL;
 declare function alert(message?: any): void;
 declare function blur(): void;
 declare function cancelAnimationFrame(handle: number): void;
@@ -12850,12 +13876,9 @@ declare function getSelection(): Selection;
 declare function matchMedia(mediaQuery: string): MediaQueryList;
 declare function moveBy(x?: number, y?: number): void;
 declare function moveTo(x?: number, y?: number): void;
-declare function msCancelRequestAnimationFrame(handle: number): void;
-declare function msMatchMedia(mediaQuery: string): MediaQueryList;
-declare function msRequestAnimationFrame(callback: FrameRequestCallback): number;
 declare function msWriteProfilerMark(profilerMarkName: string): void;
 declare function open(url?: string, target?: string, features?: string, replace?: boolean): Window;
-declare function postMessage(message: any, targetOrigin: string, ports?: any): void;
+declare function postMessage(message: any, targetOrigin: string, transfer?: any[]): void;
 declare function print(): void;
 declare function prompt(message?: string, _default?: string): string;
 declare function releaseEvents(): void;
@@ -12865,19 +13888,19 @@ declare function resizeTo(x?: number, y?: number): void;
 declare function scroll(x?: number, y?: number): void;
 declare function scrollBy(x?: number, y?: number): void;
 declare function scrollTo(x?: number, y?: number): void;
+declare function webkitCancelAnimationFrame(handle: number): void;
 declare function webkitConvertPointFromNodeToPage(node: Node, pt: WebKitPoint): WebKitPoint;
 declare function webkitConvertPointFromPageToNode(node: Node, pt: WebKitPoint): WebKitPoint;
+declare function webkitRequestAnimationFrame(callback: FrameRequestCallback): number;
 declare function toString(): string;
-declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+declare function addEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 declare function dispatchEvent(evt: Event): boolean;
-declare function removeEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+declare function removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 declare function clearInterval(handle: number): void;
 declare function clearTimeout(handle: number): void;
 declare function setInterval(handler: any, timeout?: any, ...args: any[]): number;
 declare function setTimeout(handler: any, timeout?: any, ...args: any[]): number;
 declare function clearImmediate(handle: number): void;
-declare function msClearImmediate(handle: number): void;
-declare function msSetImmediate(expression: any, ...args: any[]): number;
 declare function setImmediate(expression: any, ...args: any[]): number;
 declare var sessionStorage: Storage;
 declare var localStorage: Storage;
@@ -12892,7 +13915,6 @@ declare var onpointerover: (ev: PointerEvent) => any;
 declare var onpointerup: (ev: PointerEvent) => any;
 declare var onwheel: (ev: WheelEvent) => any;
 declare var indexedDB: IDBFactory;
-declare var msIndexedDB: IDBFactory;
 declare function atob(encodedString: string): string;
 declare function btoa(rawString: string): string;
 declare function addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -12922,6 +13944,7 @@ declare function addEventListener(type: "click", listener: (ev: MouseEvent) => a
 declare function addEventListener(type: "compassneedscalibration", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
+declare function addEventListener(type: "devicelight", listener: (ev: DeviceLightEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "devicemotion", listener: (ev: DeviceMotionEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "deviceorientation", listener: (ev: DeviceOrientationEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
@@ -12933,10 +13956,11 @@ declare function addEventListener(type: "dragstart", listener: (ev: DragEvent) =
 declare function addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void;
+declare function addEventListener(type: "ended", listener: (ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "hashchange", listener: (ev: HashChangeEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void;
+declare function addEventListener(type: "invalid", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void;
@@ -12952,7 +13976,7 @@ declare function addEventListener(type: "mousemove", listener: (ev: MouseEvent)
 declare function addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void;
+declare function addEventListener(type: "mousewheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "offline", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "online", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "orientationchange", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -12988,4 +14012,36 @@ declare function addEventListener(type: "unload", listener: (ev: Event) => any,
 declare function addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
\ No newline at end of file
+declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+type AAGUID = string;
+type AlgorithmIdentifier = string | Algorithm;
+type ConstrainBoolean = boolean | ConstrainBooleanParameters;
+type ConstrainDOMString = string | string[] | ConstrainDOMStringParameters;
+type ConstrainDouble = number | ConstrainDoubleRange;
+type ConstrainLong = number | ConstrainLongRange;
+type CryptoOperationData = ArrayBufferView;
+type GLbitfield = number;
+type GLboolean = boolean;
+type GLbyte = number;
+type GLclampf = number;
+type GLenum = number;
+type GLfloat = number;
+type GLint = number;
+type GLintptr = number;
+type GLshort = number;
+type GLsizei = number;
+type GLsizeiptr = number;
+type GLubyte = number;
+type GLuint = number;
+type GLushort = number;
+type IDBKeyPath = string;
+type KeyFormat = string;
+type KeyType = string;
+type KeyUsage = string;
+type MSInboundPayload = MSVideoRecvPayload | MSAudioRecvPayload;
+type MSLocalClientEvent = MSLocalClientEventBase | MSAudioLocalClientEvent;
+type MSOutboundPayload = MSVideoSendPayload | MSAudioSendPayload;
+type RTCIceGatherCandidate = RTCIceCandidate | RTCIceCandidateComplete;
+type RTCTransport = RTCDtlsTransport | RTCSrtpSdesTransport;
+type payloadtype = number;
+type IDBValidKey = number | string | Date | IDBArrayKey;
\ No newline at end of file
diff --git a/src/lib/dom.es6.d.ts b/src/lib/dom.iterable.d.ts
similarity index 79%
rename from src/lib/dom.es6.d.ts
rename to src/lib/dom.iterable.d.ts
index e83b8531011..4f6378f038e 100644
--- a/src/lib/dom.es6.d.ts
+++ b/src/lib/dom.iterable.d.ts
@@ -1,3 +1,5 @@
+/// <reference path="lib.dom.generated.d.ts" />
+
 interface DOMTokenList {
     [Symbol.iterator](): IterableIterator<string>;
 }
diff --git a/src/lib/es2015.collection.d.ts b/src/lib/es2015.collection.d.ts
new file mode 100644
index 00000000000..717c9bb9c04
--- /dev/null
+++ b/src/lib/es2015.collection.d.ts
@@ -0,0 +1,70 @@
+interface Map<K, V> {
+    clear(): void;
+    delete(key: K): boolean;
+    forEach(callbackfn: (value: V, index: K, map: Map<K, V>) => void, thisArg?: any): void;
+    get(key: K): V | undefined;
+    has(key: K): boolean;
+    set(key: K, value?: V): Map<K, V>;
+    readonly size: number;
+}
+
+interface MapConstructor {
+    new (): Map<any, any>;
+    new <K, V>(): Map<K, V>;
+    readonly prototype: Map<any, any>;
+}
+declare var Map: MapConstructor;
+
+interface WeakMap<K, V> {
+    clear(): void;
+    delete(key: K): boolean;
+    get(key: K): V | undefined;
+    has(key: K): boolean;
+    set(key: K, value?: V): WeakMap<K, V>;
+
+}
+
+interface WeakMapConstructor {
+    new (): WeakMap<any, any>;
+    new <K, V>(): WeakMap<K, V>;
+    readonly prototype: WeakMap<any, any>;
+}
+declare var WeakMap: WeakMapConstructor;
+
+interface Set<T> {
+    add(value: T): Set<T>;
+    clear(): void;
+    delete(value: T): boolean;
+    entries(): IterableIterator<[T, T]>;
+    forEach(callbackfn: (value: T, index: T, set: Set<T>) => void, thisArg?: any): void;
+    has(value: T): boolean;
+    keys(): IterableIterator<T>;
+    readonly size: number;
+    values(): IterableIterator<T>;
+    [Symbol.iterator]():IterableIterator<T>;
+    readonly [Symbol.toStringTag]: "Set";
+}
+
+interface SetConstructor {
+    new (): Set<any>;
+    new <T>(): Set<T>;
+    new <T>(iterable: Iterable<T>): Set<T>;
+    readonly prototype: Set<any>;
+}
+declare var Set: SetConstructor;
+
+interface WeakSet<T> {
+    add(value: T): WeakSet<T>;
+    clear(): void;
+    delete(value: T): boolean;
+    has(value: T): boolean;
+    readonly [Symbol.toStringTag]: "WeakSet";
+}
+
+interface WeakSetConstructor {
+    new (): WeakSet<any>;
+    new <T>(): WeakSet<T>;
+    new <T>(iterable: Iterable<T>): WeakSet<T>;
+    readonly prototype: WeakSet<any>;
+}
+declare var WeakSet: WeakSetConstructor;
diff --git a/src/lib/es2015.core.d.ts b/src/lib/es2015.core.d.ts
new file mode 100644
index 00000000000..fc93847f8af
--- /dev/null
+++ b/src/lib/es2015.core.d.ts
@@ -0,0 +1,483 @@
+declare type PropertyKey = string | number | symbol;
+
+interface Array<T> {
+    /** 
+      * Returns the value of the first element in the array where predicate is true, and undefined 
+      * otherwise.
+      * @param predicate find calls predicate once for each element of the array, in ascending 
+      * order, until it finds one where predicate returns true. If such an element is found, find 
+      * immediately returns that element value. Otherwise, find returns undefined.
+      * @param thisArg If provided, it will be used as the this value for each invocation of 
+      * predicate. If it is not provided, undefined is used instead.
+      */
+    find(predicate: (value: T, index: number, obj: Array<T>) => boolean, thisArg?: any): T | undefined;
+
+    /** 
+      * Returns the index of the first element in the array where predicate is true, and undefined 
+      * otherwise.
+      * @param predicate find calls predicate once for each element of the array, in ascending 
+      * order, until it finds one where predicate returns true. If such an element is found, find 
+      * immediately returns that element value. Otherwise, find returns undefined.
+      * @param thisArg If provided, it will be used as the this value for each invocation of 
+      * predicate. If it is not provided, undefined is used instead.
+      */
+    findIndex(predicate: (value: T) => boolean, thisArg?: any): number | undefined;
+
+    /**
+      * Returns the this object after filling the section identified by start and end with value
+      * @param value value to fill array section with
+      * @param start index to start filling the array at. If start is negative, it is treated as 
+      * length+start where length is the length of the array. 
+      * @param end index to stop filling the array at. If end is negative, it is treated as 
+      * length+end.
+      */
+    fill(value: T, start?: number, end?: number): T[];
+
+    /** 
+      * Returns the this object after copying a section of the array identified by start and end
+      * to the same array starting at position target
+      * @param target If target is negative, it is treated as length+target where length is the 
+      * length of the array. 
+      * @param start If start is negative, it is treated as length+start. If end is negative, it 
+      * is treated as length+end.
+      * @param end If not specified, length of the this object is used as its default value. 
+      */
+    copyWithin(target: number, start: number, end?: number): T[];
+}
+
+interface ArrayConstructor {
+    /**
+      * Creates an array from an array-like object.
+      * @param arrayLike An array-like object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from<T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): Array<U>;
+
+
+    /**
+      * Creates an array from an array-like object.
+      * @param arrayLike An array-like object to convert to an array.
+      */
+    from<T>(arrayLike: ArrayLike<T>): Array<T>;
+
+    /**
+      * Returns a new array from a set of elements.
+      * @param items A set of elements to include in the new array object.
+      */
+    of<T>(...items: T[]): Array<T>;
+}
+
+interface Function {
+    /**
+      * Returns the name of the function. Function names are read-only and can not be changed.
+      */
+    readonly name: string;
+}
+
+interface Math {
+    /**
+      * Returns the number of leading zero bits in the 32-bit binary representation of a number.
+      * @param x A numeric expression.
+      */
+    clz32(x: number): number;
+
+    /**
+      * Returns the result of 32-bit multiplication of two numbers.
+      * @param x First number
+      * @param y Second number
+      */
+    imul(x: number, y: number): number;
+
+    /**
+      * Returns the sign of the x, indicating whether x is positive, negative or zero.
+      * @param x The numeric expression to test
+      */
+    sign(x: number): number;
+
+    /**
+      * Returns the base 10 logarithm of a number.
+      * @param x A numeric expression.
+      */
+    log10(x: number): number;
+
+    /**
+      * Returns the base 2 logarithm of a number.
+      * @param x A numeric expression.
+      */
+    log2(x: number): number;
+
+    /**
+      * Returns the natural logarithm of 1 + x.
+      * @param x A numeric expression.
+      */
+    log1p(x: number): number;
+
+    /**
+      * Returns the result of (e^x - 1) of x (e raised to the power of x, where e is the base of 
+      * the natural logarithms).
+      * @param x A numeric expression.
+      */
+    expm1(x: number): number;
+
+    /**
+      * Returns the hyperbolic cosine of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    cosh(x: number): number;
+
+    /**
+      * Returns the hyperbolic sine of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    sinh(x: number): number;
+
+    /**
+      * Returns the hyperbolic tangent of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    tanh(x: number): number;
+
+    /**
+      * Returns the inverse hyperbolic cosine of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    acosh(x: number): number;
+
+    /**
+      * Returns the inverse hyperbolic sine of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    asinh(x: number): number;
+
+    /**
+      * Returns the inverse hyperbolic tangent of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    atanh(x: number): number;
+
+    /**
+      * Returns the square root of the sum of squares of its arguments.
+      * @param values Values to compute the square root for.
+      *     If no arguments are passed, the result is +0.
+      *     If there is only one argument, the result is the absolute value.
+      *     If any argument is +Infinity or -Infinity, the result is +Infinity.
+      *     If any argument is NaN, the result is NaN.
+      *     If all arguments are either +0 or −0, the result is +0.
+      */
+    hypot(...values: number[] ): number;
+
+    /**
+      * Returns the integral part of the a numeric expression, x, removing any fractional digits.
+      * If x is already an integer, the result is x.
+      * @param x A numeric expression.
+      */
+    trunc(x: number): number;
+
+    /**
+      * Returns the nearest single precision float representation of a number.
+      * @param x A numeric expression.
+      */
+    fround(x: number): number;
+
+    /**
+      * Returns an implementation-dependent approximation to the cube root of number.
+      * @param x A numeric expression.
+      */
+    cbrt(x: number): number;
+}
+
+interface NumberConstructor {
+    /**
+      * The value of Number.EPSILON is the difference between 1 and the smallest value greater than 1
+      * that is representable as a Number value, which is approximately: 
+      * 2.2204460492503130808472633361816 x 10‍−‍16.
+      */
+    readonly EPSILON: number;
+
+    /**
+      * Returns true if passed value is finite.
+      * Unlike the global isFininte, Number.isFinite doesn't forcibly convert the parameter to a 
+      * number. Only finite values of the type number, result in true.
+      * @param number A numeric value.
+      */
+    isFinite(number: number): boolean;
+
+    /**
+      * Returns true if the value passed is an integer, false otherwise.
+      * @param number A numeric value.
+      */
+    isInteger(number: number): boolean;
+
+    /**
+      * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a 
+      * number). Unlike the global isNaN(), Number.isNaN() doesn't forcefully convert the parameter
+      * to a number. Only values of the type number, that are also NaN, result in true.
+      * @param number A numeric value.
+      */
+    isNaN(number: number): boolean;
+
+    /**
+      * Returns true if the value passed is a safe integer.
+      * @param number A numeric value.
+      */
+    isSafeInteger(number: number): boolean;
+
+    /** 
+      * The value of the largest integer n such that n and n + 1 are both exactly representable as 
+      * a Number value. 
+      * The value of Number.MIN_SAFE_INTEGER is 9007199254740991 2^53 − 1.
+      */
+    readonly MAX_SAFE_INTEGER: number;
+
+    /** 
+      * The value of the smallest integer n such that n and n − 1 are both exactly representable as 
+      * a Number value. 
+      * The value of Number.MIN_SAFE_INTEGER is −9007199254740991 (−(2^53 − 1)).
+      */
+    readonly MIN_SAFE_INTEGER: number;
+
+    /**
+      * Converts a string to a floating-point number. 
+      * @param string A string that contains a floating-point number. 
+      */
+    parseFloat(string: string): number;
+
+    /**
+      * Converts A string to an integer.
+      * @param s A string to convert into a number.
+      * @param radix A value between 2 and 36 that specifies the base of the number in numString. 
+      * If this argument is not supplied, strings with a prefix of '0x' are considered hexadecimal.
+      * All other strings are considered decimal.
+      */
+    parseInt(string: string, radix?: number): number;
+}
+
+interface Object {
+    /**
+      * Determines whether an object has a property with the specified name. 
+      * @param v A property name.
+      */
+    hasOwnProperty(v: PropertyKey): boolean
+
+    /** 
+      * Determines whether a specified property is enumerable.
+      * @param v A property name.
+      */
+    propertyIsEnumerable(v: PropertyKey): boolean;
+}
+
+interface ObjectConstructor {
+    /**
+      * Copy the values of all of the enumerable own properties from one or more source objects to a 
+      * target object. Returns the target object.
+      * @param target The target object to copy to.
+      * @param source The source object from which to copy properties.
+      */
+    assign<T, U>(target: T, source: U): T & U;
+
+    /**
+      * Copy the values of all of the enumerable own properties from one or more source objects to a 
+      * target object. Returns the target object.
+      * @param target The target object to copy to.
+      * @param source1 The first source object from which to copy properties.
+      * @param source2 The second source object from which to copy properties.
+      */
+    assign<T, U, V>(target: T, source1: U, source2: V): T & U & V;
+
+    /**
+      * Copy the values of all of the enumerable own properties from one or more source objects to a 
+      * target object. Returns the target object.
+      * @param target The target object to copy to.
+      * @param source1 The first source object from which to copy properties.
+      * @param source2 The second source object from which to copy properties.
+      * @param source3 The third source object from which to copy properties.
+      */
+    assign<T, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W;
+
+    /**
+      * Copy the values of all of the enumerable own properties from one or more source objects to a 
+      * target object. Returns the target object.
+      * @param target The target object to copy to.
+      * @param sources One or more source objects from which to copy properties
+      */
+    assign(target: any, ...sources: any[]): any;
+
+    /**
+      * Returns an array of all symbol properties found directly on object o.
+      * @param o Object to retrieve the symbols from.
+      */
+    getOwnPropertySymbols(o: any): symbol[];
+
+    /**
+      * Returns true if the values are the same value, false otherwise.
+      * @param value1 The first value.
+      * @param value2 The second value.
+      */
+    is(value1: any, value2: any): boolean;
+
+    /**
+      * Sets the prototype of a specified object o to  object proto or null. Returns the object o.
+      * @param o The object to change its prototype.
+      * @param proto The value of the new prototype or null.
+      */
+    setPrototypeOf(o: any, proto: any): any;
+
+    /**
+      * Gets the own property descriptor of the specified object. 
+      * An own property descriptor is one that is defined directly on the object and is not 
+      * inherited from the object's prototype. 
+      * @param o Object that contains the property.
+      * @param p Name of the property.
+    */
+    getOwnPropertyDescriptor(o: any, propertyKey: PropertyKey): PropertyDescriptor;
+
+    /**
+      * Adds a property to an object, or modifies attributes of an existing property. 
+      * @param o Object on which to add or modify the property. This can be a native JavaScript 
+      * object (that is, a user-defined object or a built in object) or a DOM object.
+      * @param p The property name.
+      * @param attributes Descriptor for the property. It can be for a data property or an accessor
+      *  property.
+      */
+    defineProperty(o: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): any;
+}
+
+interface RegExp {
+    /**
+      * Returns a string indicating the flags of the regular expression in question. This field is read-only.
+      * The characters in this string are sequenced and concatenated in the following order:
+      *
+      *    - "g" for global
+      *    - "i" for ignoreCase
+      *    - "m" for multiline
+      *    - "u" for unicode
+      *    - "y" for sticky
+      *
+      * If no flags are set, the value is the empty string.
+      */
+    readonly flags: string;
+
+    /** 
+      * Returns a Boolean value indicating the state of the sticky flag (y) used with a regular 
+      * expression. Default is false. Read-only. 
+      */
+    readonly sticky: boolean;
+
+    /** 
+      * Returns a Boolean value indicating the state of the Unicode flag (u) used with a regular 
+      * expression. Default is false. Read-only. 
+      */
+    readonly unicode: boolean;
+}
+
+interface String {
+    /**
+      * Returns a nonnegative integer Number less than 1114112 (0x110000) that is the code point 
+      * value of the UTF-16 encoded code point starting at the string element at position pos in 
+      * the String resulting from converting this object to a String. 
+      * If there is no element at that position, the result is undefined. 
+      * If a valid UTF-16 surrogate pair does not begin at pos, the result is the code unit at pos.
+      */
+    codePointAt(pos: number): number | undefined;
+
+    /**
+      * Returns true if searchString appears as a substring of the result of converting this 
+      * object to a String, at one or more positions that are 
+      * greater than or equal to position; otherwise, returns false.
+      * @param searchString search string 
+      * @param position If position is undefined, 0 is assumed, so as to search all of the String.
+      */
+    includes(searchString: string, position?: number): boolean;
+
+    /**
+      * Returns true if the sequence of elements of searchString converted to a String is the 
+      * same as the corresponding elements of this object (converted to a String) starting at 
+      * endPosition – length(this). Otherwise returns false.
+      */
+    endsWith(searchString: string, endPosition?: number): boolean;
+
+    /**
+      * Returns the String value result of normalizing the string into the normalization form 
+      * named by form as specified in Unicode Standard Annex #15, Unicode Normalization Forms.
+      * @param form Applicable values: "NFC", "NFD", "NFKC", or "NFKD", If not specified default
+      * is "NFC"
+      */
+    normalize(form?: string): string;
+
+    /**
+      * Returns a String value that is made from count copies appended together. If count is 0, 
+      * T is the empty String is returned.
+      * @param count number of copies to append
+      */
+    repeat(count: number): string;
+
+    /**
+      * Returns true if the sequence of elements of searchString converted to a String is the 
+      * same as the corresponding elements of this object (converted to a String) starting at 
+      * position. Otherwise returns false.
+      */
+    startsWith(searchString: string, position?: number): boolean;
+
+    /**
+      * Returns an <a> HTML anchor element and sets the name attribute to the text value
+      * @param name
+      */
+    anchor(name: string): string;
+
+    /** Returns a <big> HTML element */
+    big(): string;
+
+    /** Returns a <blink> HTML element */
+    blink(): string;
+
+    /** Returns a <b> HTML element */
+    bold(): string;
+
+    /** Returns a <tt> HTML element */
+    fixed(): string
+
+    /** Returns a <font> HTML element and sets the color attribute value */
+    fontcolor(color: string): string
+
+    /** Returns a <font> HTML element and sets the size attribute value */
+    fontsize(size: number): string;
+
+    /** Returns a <font> HTML element and sets the size attribute value */
+    fontsize(size: string): string;
+
+    /** Returns an <i> HTML element */
+    italics(): string;
+
+    /** Returns an <a> HTML element and sets the href attribute value */
+    link(url: string): string;
+
+    /** Returns a <small> HTML element */
+    small(): string;
+
+    /** Returns a <strike> HTML element */
+    strike(): string;
+
+    /** Returns a <sub> HTML element */
+    sub(): string;
+
+    /** Returns a <sup> HTML element */
+    sup(): string;
+}
+
+interface StringConstructor {
+    /**
+      * Return the String value whose elements are, in order, the elements in the List elements.
+      * If length is 0, the empty string is returned.
+      */
+    fromCodePoint(...codePoints: number[]): string;
+
+    /**
+      * String.raw is intended for use as a tag function of a Tagged Template String. When called
+      * as such the first argument will be a well formed template call site object and the rest 
+      * parameter will contain the substitution values.
+      * @param template A well-formed template string call site representation.
+      * @param substitutions A set of substitution values.
+      */
+    raw(template: TemplateStringsArray, ...substitutions: any[]): string;
+}
\ No newline at end of file
diff --git a/src/lib/es2015.d.ts b/src/lib/es2015.d.ts
new file mode 100644
index 00000000000..ba30ea74669
--- /dev/null
+++ b/src/lib/es2015.d.ts
@@ -0,0 +1,10 @@
+/// <reference path="lib.es2015.core.d.ts" />
+/// <reference path="lib.es2015.collection.d.ts" />
+/// <reference path="lib.es2015.generator.d.ts" />
+/// <reference path="lib.es2015.iterable.d.ts" />
+/// <reference path="lib.es2015.promise.d.ts" />
+/// <reference path="lib.es2015.proxy.d.ts" />
+/// <reference path="lib.es2015.reflect.d.ts" />
+/// <reference path="lib.es2015.symbol.d.ts" />
+/// <reference path="lib.es2015.symbol.wellknown.d.ts" />
+/// <reference path="lib.es5.d.ts" />
\ No newline at end of file
diff --git a/src/lib/es2015.generator.d.ts b/src/lib/es2015.generator.d.ts
new file mode 100644
index 00000000000..2f522ad8770
--- /dev/null
+++ b/src/lib/es2015.generator.d.ts
@@ -0,0 +1,12 @@
+interface GeneratorFunction extends Function { }
+
+interface GeneratorFunctionConstructor {
+    /**
+      * Creates a new Generator function.
+      * @param args A list of arguments the function accepts.
+      */
+    new (...args: string[]): GeneratorFunction;
+    (...args: string[]): GeneratorFunction;
+    readonly prototype: GeneratorFunction;
+}
+declare var GeneratorFunction: GeneratorFunctionConstructor;
diff --git a/src/lib/es2015.iterable.d.ts b/src/lib/es2015.iterable.d.ts
new file mode 100644
index 00000000000..85c95a73bb0
--- /dev/null
+++ b/src/lib/es2015.iterable.d.ts
@@ -0,0 +1,373 @@
+/// <reference path="lib.es2015.symbol.d.ts" />
+
+interface IteratorResult<T> {
+    done: boolean;
+    value?: T;
+}
+
+interface Iterator<T> {
+    next(value?: any): IteratorResult<T>;
+    return?(value?: any): IteratorResult<T>;
+    throw?(e?: any): IteratorResult<T>;
+}
+
+interface Iterable<T> { }
+
+interface IterableIterator<T> extends Iterator<T> { }
+
+interface Array<T> {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, T]>;
+
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<T>;
+}
+
+interface ArrayConstructor {
+    /**
+      * Creates an array from an iterable object.
+      * @param iterable An iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from<T, U>(iterable: Iterable<T>, mapfn: (v: T, k: number) => U, thisArg?: any): Array<U>;
+    
+    /**
+      * Creates an array from an iterable object.
+      * @param iterable An iterable object to convert to an array.
+      */
+    from<T>(iterable: Iterable<T>): Array<T>;
+}
+
+interface Map<K, V> {
+    entries(): IterableIterator<[K, V]>;
+    keys(): IterableIterator<K>;
+    values(): IterableIterator<V>;
+}
+
+interface MapConstructor {
+    new <K, V>(iterable: Iterable<[K, V]>): Map<K, V>;
+}
+
+interface WeakMap<K, V> { }
+
+interface WeakMapConstructor {
+    new <K, V>(iterable: Iterable<[K, V]>): WeakMap<K, V>;
+}
+
+interface Promise<T> { }
+
+interface PromiseConstructor {
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises 
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<TAll>(values: Iterable<TAll | PromiseLike<TAll>>): Promise<TAll[]>;
+    
+    /**
+     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved 
+     * or rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    race<T>(values: Iterable<T | PromiseLike<T>>): Promise<T>;
+}
+
+declare namespace Reflect {
+    function enumerate(target: any): IterableIterator<any>;
+}
+
+/**
+  * A typed array of 8-bit integer values. The contents are initialized to 0. If the requested 
+  * number of bytes could not be allocated an exception is raised.
+  */
+interface Int8Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Int8ArrayConstructor {
+    new (elements: Iterable<number>): Int8Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int8Array;
+}
+
+/**
+  * A typed array of 8-bit unsigned integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint8Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Uint8ArrayConstructor {
+    new (elements: Iterable<number>): Uint8Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8Array;
+}
+
+/**
+  * A typed array of 8-bit unsigned integer (clamped) values. The contents are initialized to 0. 
+  * If the requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint8ClampedArray {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Uint8ClampedArrayConstructor {
+    new (elements: Iterable<number>): Uint8ClampedArray;
+
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8ClampedArray;
+}
+
+/**
+  * A typed array of 16-bit signed integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Int16Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Int16ArrayConstructor {
+    new (elements: Iterable<number>): Int16Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int16Array;
+}
+
+/**
+  * A typed array of 16-bit unsigned integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint16Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Uint16ArrayConstructor {
+    new (elements: Iterable<number>): Uint16Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint16Array;
+}
+
+/**
+  * A typed array of 32-bit signed integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Int32Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Int32ArrayConstructor {
+    new (elements: Iterable<number>): Int32Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int32Array;
+}
+
+/**
+  * A typed array of 32-bit unsigned integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint32Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Uint32ArrayConstructor {
+    new (elements: Iterable<number>): Uint32Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint32Array;
+}
+
+/**
+  * A typed array of 32-bit float values. The contents are initialized to 0. If the requested number
+  * of bytes could not be allocated an exception is raised.
+  */
+interface Float32Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Float32ArrayConstructor {
+    new (elements: Iterable<number>): Float32Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float32Array;
+}
+
+/**
+  * A typed array of 64-bit float values. The contents are initialized to 0. If the requested 
+  * number of bytes could not be allocated an exception is raised.
+  */
+interface Float64Array {
+    /** 
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /** 
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /** 
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Float64ArrayConstructor {
+    new (elements: Iterable<number>): Float64Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float64Array;
+}
\ No newline at end of file
diff --git a/src/lib/es2015.promise.d.ts b/src/lib/es2015.promise.d.ts
new file mode 100644
index 00000000000..6ade205dc42
--- /dev/null
+++ b/src/lib/es2015.promise.d.ts
@@ -0,0 +1,81 @@
+/**
+ * Represents the completion of an asynchronous operation
+ */
+interface Promise<T> {
+    /**
+    * Attaches callbacks for the resolution and/or rejection of the Promise.
+    * @param onfulfilled The callback to execute when the Promise is resolved.
+    * @param onrejected The callback to execute when the Promise is rejected.
+    * @returns A Promise for the completion of which ever callback is executed.
+    */
+    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>;
+    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): Promise<TResult>;
+
+    /**
+     * Attaches a callback for only the rejection of the Promise.
+     * @param onrejected The callback to execute when the Promise is rejected.
+     * @returns A Promise for the completion of the callback.
+     */
+    catch(onrejected?: (reason: any) => T | PromiseLike<T>): Promise<T>;
+    catch(onrejected?: (reason: any) => void): Promise<T>;
+}
+
+interface PromiseConstructor {
+    /** 
+      * A reference to the prototype. 
+      */
+    readonly prototype: Promise<any>;
+
+    /**
+     * Creates a new Promise.
+     * @param executor A callback used to initialize the promise. This callback is passed two arguments: 
+     * a resolve callback used resolve the promise with a value or the result of another promise, 
+     * and a reject callback used to reject the promise with a provided reason or error.
+     */
+    new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
+
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises 
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>, T10 | PromiseLike<T10>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>;
+    all<T1, T2, T3, T4, T5, T6, T7, T8, T9>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>;
+    all<T1, T2, T3, T4, T5, T6, T7, T8>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8]>;
+    all<T1, T2, T3, T4, T5, T6, T7>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>]): Promise<[T1, T2, T3, T4, T5, T6, T7]>;
+    all<T1, T2, T3, T4, T5, T6>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>]): Promise<[T1, T2, T3, T4, T5, T6]>;
+    all<T1, T2, T3, T4, T5>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>]): Promise<[T1, T2, T3, T4, T5]>;
+    all<T1, T2, T3, T4>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>]): Promise<[T1, T2, T3, T4]>;
+    all<T1, T2, T3>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>]): Promise<[T1, T2, T3]>;
+    all<T1, T2>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>]): Promise<[T1, T2]>;
+
+    /**
+     * Creates a new rejected promise for the provided reason.
+     * @param reason The reason the promise was rejected.
+     * @returns A new rejected Promise.
+     */
+    reject(reason: any): Promise<void>;
+
+    /**
+     * Creates a new rejected promise for the provided reason.
+     * @param reason The reason the promise was rejected.
+     * @returns A new rejected Promise.
+     */
+    reject<T>(reason: any): Promise<T>;
+
+    /**
+      * Creates a new resolved promise for the provided value.
+      * @param value A promise.
+      * @returns A promise whose internal state matches the provided promise.
+      */
+    resolve<T>(value: T | PromiseLike<T>): Promise<T>;
+
+    /**
+     * Creates a new resolved promise .
+     * @returns A resolved promise.
+     */
+    resolve(): Promise<void>;
+}
+
+declare var Promise: PromiseConstructor;
\ No newline at end of file
diff --git a/src/lib/es2015.proxy.d.ts b/src/lib/es2015.proxy.d.ts
new file mode 100644
index 00000000000..c37e8fb0f59
--- /dev/null
+++ b/src/lib/es2015.proxy.d.ts
@@ -0,0 +1,22 @@
+interface ProxyHandler<T> {
+    getPrototypeOf? (target: T): any;
+    setPrototypeOf? (target: T, v: any): boolean;
+    isExtensible? (target: T): boolean;
+    preventExtensions? (target: T): boolean;
+    getOwnPropertyDescriptor? (target: T, p: PropertyKey): PropertyDescriptor;
+    has? (target: T, p: PropertyKey): boolean;
+    get? (target: T, p: PropertyKey, receiver: any): any;
+    set? (target: T, p: PropertyKey, value: any, receiver: any): boolean;
+    deleteProperty? (target: T, p: PropertyKey): boolean;
+    defineProperty? (target: T, p: PropertyKey, attributes: PropertyDescriptor): boolean;
+    enumerate? (target: T): PropertyKey[];
+    ownKeys? (target: T): PropertyKey[];
+    apply? (target: T, thisArg: any, argArray?: any): any;
+    construct? (target: T, thisArg: any, argArray?: any): any;
+}
+
+interface ProxyConstructor {
+    revocable<T>(target: T, handler: ProxyHandler<T>): { proxy: T; revoke: () => void; };
+    new <T>(target: T, handler: ProxyHandler<T>): T
+}
+declare var Proxy: ProxyConstructor;
\ No newline at end of file
diff --git a/src/lib/es2015.reflect.d.ts b/src/lib/es2015.reflect.d.ts
new file mode 100644
index 00000000000..eda8d352263
--- /dev/null
+++ b/src/lib/es2015.reflect.d.ts
@@ -0,0 +1,16 @@
+declare namespace Reflect {
+    function apply(target: Function, thisArgument: any, argumentsList: ArrayLike<any>): any;
+    function construct(target: Function, argumentsList: ArrayLike<any>, newTarget?: any): any;
+    function defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean;
+    function deleteProperty(target: any, propertyKey: PropertyKey): boolean;
+    function get(target: any, propertyKey: PropertyKey, receiver?: any): any;
+    function getOwnPropertyDescriptor(target: any, propertyKey: PropertyKey): PropertyDescriptor;
+    function getPrototypeOf(target: any): any;
+    function has(target: any, propertyKey: string): boolean;
+    function has(target: any, propertyKey: symbol): boolean;
+    function isExtensible(target: any): boolean;
+    function ownKeys(target: any): Array<PropertyKey>;
+    function preventExtensions(target: any): boolean;
+    function set(target: any, propertyKey: PropertyKey, value: any, receiver?: any): boolean;
+    function setPrototypeOf(target: any, proto: any): boolean;
+}
\ No newline at end of file
diff --git a/src/lib/es2015.symbol.d.ts b/src/lib/es2015.symbol.d.ts
new file mode 100644
index 00000000000..cd7e45595f0
--- /dev/null
+++ b/src/lib/es2015.symbol.d.ts
@@ -0,0 +1,36 @@
+interface Symbol {
+    /** Returns a string representation of an object. */
+    toString(): string;
+
+    /** Returns the primitive value of the specified object. */
+    valueOf(): Object;
+}
+
+interface SymbolConstructor {
+    /** 
+      * A reference to the prototype. 
+      */
+    readonly prototype: Symbol;
+
+    /**
+      * Returns a new unique Symbol value.
+      * @param  description Description of the new Symbol object.
+      */
+    (description?: string|number): symbol;
+
+    /**
+      * Returns a Symbol object from the global symbol registry matching the given key if found. 
+      * Otherwise, returns a new symbol with this key.
+      * @param key key to search for.
+      */
+    for(key: string): symbol;
+
+    /**
+      * Returns a key from the global symbol registry matching the given Symbol if found. 
+      * Otherwise, returns a undefined.
+      * @param sym Symbol to find the key for.
+      */
+    keyFor(sym: symbol): string | undefined;
+}
+
+declare var Symbol: SymbolConstructor;
\ No newline at end of file
diff --git a/src/lib/es2015.symbol.wellknown.d.ts b/src/lib/es2015.symbol.wellknown.d.ts
new file mode 100644
index 00000000000..110657e78b1
--- /dev/null
+++ b/src/lib/es2015.symbol.wellknown.d.ts
@@ -0,0 +1,356 @@
+/// <reference path="lib.es2015.symbol.d.ts" />
+
+interface SymbolConstructor {
+    /** 
+      * A method that determines if a constructor object recognizes an object as one of the 
+      * constructor’s instances. Called by the semantics of the instanceof operator. 
+      */
+    readonly hasInstance: symbol;
+
+    /** 
+      * A Boolean value that if true indicates that an object should flatten to its array elements
+      * by Array.prototype.concat.
+      */
+    readonly isConcatSpreadable: symbol;
+
+    /** 
+      * A method that returns the default iterator for an object. Called by the semantics of the 
+      * for-of statement.
+      */
+    readonly iterator: symbol;
+
+    /**
+      * A regular expression method that matches the regular expression against a string. Called 
+      * by the String.prototype.match method. 
+      */
+    readonly match: symbol;
+
+    /** 
+      * A regular expression method that replaces matched substrings of a string. Called by the 
+      * String.prototype.replace method.
+      */
+    readonly replace: symbol;
+
+    /**
+      * A regular expression method that returns the index within a string that matches the 
+      * regular expression. Called by the String.prototype.search method.
+      */
+    readonly search: symbol;
+
+    /** 
+      * A function valued property that is the constructor function that is used to create 
+      * derived objects.
+      */
+    readonly species: symbol;
+
+    /**
+      * A regular expression method that splits a string at the indices that match the regular 
+      * expression. Called by the String.prototype.split method.
+      */
+    readonly split: symbol;
+
+    /** 
+      * A method that converts an object to a corresponding primitive value.
+      * Called by the ToPrimitive abstract operation.
+      */
+    readonly toPrimitive: symbol;
+
+    /** 
+      * A String value that is used in the creation of the default string description of an object.
+      * Called by the built-in method Object.prototype.toString.
+      */
+    readonly toStringTag: symbol;
+
+    /**
+      * An Object whose own property names are property names that are excluded from the 'with'
+      * environment bindings of the associated objects.
+      */
+    readonly unscopables: symbol;
+}
+
+interface Symbol {
+    readonly [Symbol.toStringTag]: "Symbol";
+}
+
+interface Array<T> {
+    /** Iterator */
+    [Symbol.iterator](): IterableIterator<T>;
+
+    /**
+     * Returns an object whose properties have the value 'true'
+     * when they will be absent when used in a 'with' statement.
+     */
+    [Symbol.unscopables](): {
+        copyWithin: boolean;
+        entries: boolean;
+        fill: boolean;
+        find: boolean;
+        findIndex: boolean;
+        keys: boolean;
+        values: boolean;
+    };
+}
+
+interface Date {
+    /**
+     * Converts a Date object to a string.
+     */
+    [Symbol.toPrimitive](hint: "default"): string;
+    /**
+     * Converts a Date object to a string.
+     */
+    [Symbol.toPrimitive](hint: "string"): string;
+    /**
+     * Converts a Date object to a number.
+     */
+    [Symbol.toPrimitive](hint: "number"): number;
+    /**
+     * Converts a Date object to a string or number.
+     *
+     * @param hint The strings "number", "string", or "default" to specify what primitive to return.
+     *
+     * @throws {TypeError} If 'hint' was given something other than "number", "string", or "default".
+     * @returns A number if 'hint' was "number", a string if 'hint' was "string" or "default".
+     */
+    [Symbol.toPrimitive](hint: string): string | number;
+}
+
+interface Map<K, V> {
+    [Symbol.iterator]():IterableIterator<[K,V]>;
+    readonly [Symbol.toStringTag]: "Map";
+}
+
+interface WeakMap<K, V>{
+    readonly [Symbol.toStringTag]: "WeakMap";
+}
+
+interface JSON {
+    readonly [Symbol.toStringTag]: "JSON";
+}
+
+interface Function {
+    /**
+     * Determines whether the given value inherits from this function if this function was used
+     * as a constructor function.
+     *
+     * A constructor function can control which objects are recognized as its instances by
+     * 'instanceof' by overriding this method.
+     */
+    [Symbol.hasInstance](value: any): boolean;
+}
+
+interface GeneratorFunction extends Function {
+    readonly [Symbol.toStringTag]: "GeneratorFunction";
+}
+
+interface IArguments {
+    /** Iterator */
+    [Symbol.iterator](): IterableIterator<any>;
+}
+
+interface Iterator<T> { }
+
+interface Iterable<T> {
+    [Symbol.iterator](): Iterator<T>;
+}
+
+interface IterableIterator<T> extends Iterator<T> {
+    [Symbol.iterator](): IterableIterator<T>;
+}
+
+interface Math {
+    readonly [Symbol.toStringTag]: "Math";
+}
+
+interface Promise<T> {
+    readonly [Symbol.toStringTag]: "Promise";
+}
+
+interface PromiseConstructor {
+    readonly [Symbol.species]: Function;
+}
+
+interface RegExp {
+        /**
+      * Matches a string with this regular expression, and returns an array containing the results of
+      * that search.
+      * @param string A string to search within.
+      */
+    [Symbol.match](string: string): RegExpMatchArray | null;
+
+    /**
+      * Replaces text in a string, using this regular expression.
+      * @param string A String object or string literal whose contents matching against
+      *               this regular expression will be replaced
+      * @param replaceValue A String object or string literal containing the text to replace for every 
+      *                     successful match of this regular expression.
+      */
+    [Symbol.replace](string: string, replaceValue: string): string;
+
+    /**
+      * Replaces text in a string, using this regular expression.
+      * @param string A String object or string literal whose contents matching against
+      *               this regular expression will be replaced
+      * @param replacer A function that returns the replacement text.
+      */
+    [Symbol.replace](string: string, replacer: (substring: string, ...args: any[]) => string): string;
+
+    /**
+      * Finds the position beginning first substring match in a regular expression search
+      * using this regular expression.
+      *
+      * @param string The string to search within.
+      */
+    [Symbol.search](string: string): number;
+
+    /**
+      * Returns an array of substrings that were delimited by strings in the original input that
+      * match against this regular expression.
+      *
+      * If the regular expression contains capturing parentheses, then each time this
+      * regular expression matches, the results (including any undefined results) of the
+      * capturing parentheses are spliced.
+      *
+      * @param string string value to split
+      * @param limit if not undefined, the output array is truncated so that it contains no more
+      * than 'limit' elements.
+      */
+    [Symbol.split](string: string, limit?: number): string[];
+}
+
+interface RegExpConstructor {
+    [Symbol.species](): RegExpConstructor;
+}
+
+interface String {
+    /** Iterator */
+    [Symbol.iterator](): IterableIterator<string>;
+   
+    /**
+      * Matches a string an object that supports being matched against, and returns an array containing the results of that search.
+      * @param matcher An object that supports being matched against.
+      */
+    match(matcher: { [Symbol.match](string: string): RegExpMatchArray | null; }): RegExpMatchArray | null;
+
+    /**
+      * Replaces text in a string, using an object that supports replacement within a string.
+      * @param searchValue A object can search for and replace matches within a string.
+      * @param replaceValue A string containing the text to replace for every successful match of searchValue in this string.
+      */
+    replace(searchValue: { [Symbol.replace](string: string, replaceValue: string): string; }, replaceValue: string): string;
+
+    /**
+      * Replaces text in a string, using an object that supports replacement within a string.
+      * @param searchValue A object can search for and replace matches within a string.
+      * @param replacer A function that returns the replacement text.
+      */
+    replace(searchValue: { [Symbol.replace](string: string, replacer: (substring: string, ...args: any[]) => string): string; }, replacer: (substring: string, ...args: any[]) => string): string;
+
+    /**
+      * Finds the first substring match in a regular expression search.
+      * @param searcher An object which supports searching within a string.
+      */
+    search(searcher: { [Symbol.search](string: string): number; }): number;
+
+    /**
+      * Split a string into substrings using the specified separator and return them as an array.
+      * @param splitter An object that can split a string.
+      * @param limit A value used to limit the number of elements returned in the array.
+      */
+    split(splitter: { [Symbol.split](string: string, limit?: number): string[]; }, limit?: number): string[];
+}
+
+/**
+  * Represents a raw buffer of binary data, which is used to store data for the 
+  * different typed arrays. ArrayBuffers cannot be read from or written to directly, 
+  * but can be passed to a typed array or DataView Object to interpret the raw 
+  * buffer as needed. 
+  */
+interface ArrayBuffer {
+    readonly [Symbol.toStringTag]: "ArrayBuffer";
+}
+
+interface DataView {
+    readonly [Symbol.toStringTag]: "DataView";
+}
+
+/**
+  * A typed array of 8-bit integer values. The contents are initialized to 0. If the requested 
+  * number of bytes could not be allocated an exception is raised.
+  */
+interface Int8Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "Int8Array";
+}
+
+/**
+  * A typed array of 8-bit unsigned integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint8Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "UInt8Array";
+}
+
+/**
+  * A typed array of 8-bit unsigned integer (clamped) values. The contents are initialized to 0. 
+  * If the requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint8ClampedArray {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "Uint8ClampedArray";
+}
+
+/**
+  * A typed array of 16-bit signed integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Int16Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "Int16Array";
+}
+
+/**
+  * A typed array of 16-bit unsigned integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint16Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "Uint16Array";
+}
+
+/**
+  * A typed array of 32-bit signed integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Int32Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "Int32Array";
+}
+
+/**
+  * A typed array of 32-bit unsigned integer values. The contents are initialized to 0. If the 
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint32Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "Uint32Array";
+}
+
+/**
+  * A typed array of 32-bit float values. The contents are initialized to 0. If the requested number
+  * of bytes could not be allocated an exception is raised.
+  */
+interface Float32Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "Float32Array";
+}
+
+/**
+  * A typed array of 64-bit float values. The contents are initialized to 0. If the requested 
+  * number of bytes could not be allocated an exception is raised.
+  */
+interface Float64Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    readonly [Symbol.toStringTag]: "Float64Array";
+}
\ No newline at end of file
diff --git a/src/lib/es7.d.ts b/src/lib/es2016.array.include.d.ts
similarity index 100%
rename from src/lib/es7.d.ts
rename to src/lib/es2016.array.include.d.ts
diff --git a/src/lib/es2016.d.ts b/src/lib/es2016.d.ts
new file mode 100644
index 00000000000..34f833d621b
--- /dev/null
+++ b/src/lib/es2016.d.ts
@@ -0,0 +1,2 @@
+/// <reference path="lib.es2015.d.ts" />
+/// <reference path="lib.es2016.array.include.d.ts" />
\ No newline at end of file
diff --git a/src/lib/core.d.ts b/src/lib/es5.d.ts
similarity index 92%
rename from src/lib/core.d.ts
rename to src/lib/es5.d.ts
index 31cf0ca3136..1bcf528640b 100644
--- a/src/lib/core.d.ts
+++ b/src/lib/es5.d.ts
@@ -215,14 +215,16 @@ interface Function {
       * @param thisArg The object to be used as the this object.
       * @param argArray A set of arguments to be passed to the function.
       */
-    apply(thisArg: any, argArray?: any): any;
+    apply<T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U;
+    apply(this: Function, thisArg: any, argArray?: any): any;
 
     /**
       * Calls a method of an object, substituting another object for the current object.
       * @param thisArg The object to be used as the current object.
       * @param argArray A list of arguments to be passed to the method.
       */
-    call(thisArg: any, ...argArray: any[]): any;
+    call<T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): U;
+    call(this: Function, thisArg: any, ...argArray: any[]): any;
 
     /**
       * For a given function, creates a bound function that has the same body as the original function. 
@@ -230,7 +232,8 @@ interface Function {
       * @param thisArg An object to which the this keyword can refer inside the new function.
       * @param argArray A list of arguments to be passed to the new function.
       */
-    bind(thisArg: any, ...argArray: any[]): any;
+    bind<T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): (this: void, ...argArray: any[]) => U;
+    bind(this: Function, thisArg: any, ...argArray: any[]): any;
 
     prototype: any;
     readonly length: number;
@@ -304,13 +307,13 @@ interface String {
       * Matches a string with a regular expression, and returns an array containing the results of that search.
       * @param regexp A variable name or string literal containing the regular expression pattern and flags.
       */
-    match(regexp: string): RegExpMatchArray;
+    match(regexp: string): RegExpMatchArray | null;
 
     /** 
       * Matches a string with a regular expression, and returns an array containing the results of that search.
       * @param regexp A regular expression object that contains the regular expression pattern and applicable flags. 
       */
-    match(regexp: RegExp): RegExpMatchArray;
+    match(regexp: RegExp): RegExpMatchArray | null;
 
     /**
       * Replaces text in a string, using a regular expression or search string.
@@ -813,7 +816,7 @@ interface RegExp {
       * Executes a search on a string using a regular expression pattern, and returns an array containing the results of that search.
       * @param string The String object or string literal on which to perform the search.
       */
-    exec(string: string): RegExpExecArray;
+    exec(string: string): RegExpExecArray | null;
 
     /** 
       * Returns a Boolean value that indicates whether or not a pattern exists in a searched string.
@@ -836,7 +839,7 @@ interface RegExp {
     lastIndex: number;
 
     // Non-standard extensions
-    compile(): RegExp;
+    compile(): this;
 }
 
 interface RegExpConstructor {
@@ -1108,17 +1111,12 @@ interface Array<T> {
     /**
       * Removes the last element from an array and returns it.
       */
-    pop(): T;
+    pop(): T | undefined;
     /**
       * Combines two or more arrays.
       * @param items Additional items to add to the end of array1.
       */
-    concat<U extends T[]>(...items: U[]): T[];
-    /**
-      * Combines two or more arrays.
-      * @param items Additional items to add to the end of array1.
-      */
-    concat(...items: T[]): T[];
+    concat(...items: (T | T[])[]): T[];
     /**
       * Adds all the elements of an array separated by the specified separator string.
       * @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma.
@@ -1131,7 +1129,7 @@ interface Array<T> {
     /**
       * Removes the first element from an array and returns it.
       */
-    shift(): T;
+    shift(): T | undefined;
     /** 
       * Returns a section of an array.
       * @param start The beginning of the specified portion of the array.
@@ -1524,7 +1522,7 @@ interface Int8Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -1535,7 +1533,7 @@ interface Int8Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -1797,7 +1795,7 @@ interface Uint8Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -1808,7 +1806,7 @@ interface Uint8Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -2071,7 +2069,7 @@ interface Uint8ClampedArray {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -2082,7 +2080,7 @@ interface Uint8ClampedArray {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -2344,7 +2342,7 @@ interface Int16Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -2355,7 +2353,7 @@ interface Int16Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -2618,7 +2616,7 @@ interface Uint16Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -2629,7 +2627,7 @@ interface Uint16Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -2891,7 +2889,7 @@ interface Int32Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -2902,7 +2900,7 @@ interface Int32Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -3164,7 +3162,7 @@ interface Uint32Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -3175,7 +3173,7 @@ interface Uint32Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -3437,7 +3435,7 @@ interface Float32Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -3448,7 +3446,7 @@ interface Float32Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -3711,7 +3709,7 @@ interface Float64Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number;
+    find(predicate: (value: number, index: number, obj: Array<number>) => boolean, thisArg?: any): number | undefined;
 
     /** 
       * Returns the index of the first element in the array where predicate is true, and undefined 
@@ -3722,7 +3720,7 @@ interface Float64Array {
       * @param thisArg If provided, it will be used as the this value for each invocation of 
       * predicate. If it is not provided, undefined is used instead.
       */
-    findIndex(predicate: (value: number) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: number) => boolean, thisArg?: any): number | undefined;
 
     /**
       * Performs the specified action for each element in an array.
@@ -3909,3 +3907,204 @@ interface Float64ArrayConstructor {
     from(arrayLike: ArrayLike<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float64Array;
 }
 declare const Float64Array: Float64ArrayConstructor;
+
+/////////////////////////////
+/// ECMAScript Internationalization API 
+/////////////////////////////
+
+declare module Intl {
+    interface CollatorOptions {
+        usage?: string;
+        localeMatcher?: string;
+        numeric?: boolean;
+        caseFirst?: string;
+        sensitivity?: string;
+        ignorePunctuation?: boolean;
+    }
+
+    interface ResolvedCollatorOptions {
+        locale: string;
+        usage: string;
+        sensitivity: string;
+        ignorePunctuation: boolean;
+        collation: string;
+        caseFirst: string;
+        numeric: boolean;
+    }
+
+    interface Collator {
+        compare(x: string, y: string): number;
+        resolvedOptions(): ResolvedCollatorOptions;
+    }
+    var Collator: {
+        new (locales?: string[], options?: CollatorOptions): Collator;
+        new (locale?: string, options?: CollatorOptions): Collator;
+        (locales?: string[], options?: CollatorOptions): Collator;
+        (locale?: string, options?: CollatorOptions): Collator;
+        supportedLocalesOf(locales: string[], options?: CollatorOptions): string[];
+        supportedLocalesOf(locale: string, options?: CollatorOptions): string[];
+    }
+
+    interface NumberFormatOptions {
+        localeMatcher?: string;
+        style?: string;
+        currency?: string;
+        currencyDisplay?: string;
+        useGrouping?: boolean;
+        minimumIntegerDigits?: number;
+        minimumFractionDigits?: number;
+        maximumFractionDigits?: number;
+        minimumSignificantDigits?: number;
+        maximumSignificantDigits?: number;
+    }
+
+    interface ResolvedNumberFormatOptions {
+        locale: string;
+        numberingSystem: string;
+        style: string;
+        currency?: string;
+        currencyDisplay?: string;
+        minimumIntegerDigits: number;
+        minimumFractionDigits: number;
+        maximumFractionDigits: number;
+        minimumSignificantDigits?: number;
+        maximumSignificantDigits?: number;
+        useGrouping: boolean;
+    }
+
+    interface NumberFormat {
+        format(value: number): string;
+        resolvedOptions(): ResolvedNumberFormatOptions;
+    }
+    var NumberFormat: {
+        new (locales?: string[], options?: NumberFormatOptions): NumberFormat;
+        new (locale?: string, options?: NumberFormatOptions): NumberFormat;
+        (locales?: string[], options?: NumberFormatOptions): NumberFormat;
+        (locale?: string, options?: NumberFormatOptions): NumberFormat;
+        supportedLocalesOf(locales: string[], options?: NumberFormatOptions): string[];
+        supportedLocalesOf(locale: string, options?: NumberFormatOptions): string[];
+    }
+
+    interface DateTimeFormatOptions {
+        localeMatcher?: string;
+        weekday?: string;
+        era?: string;
+        year?: string;
+        month?: string;
+        day?: string;
+        hour?: string;
+        minute?: string;
+        second?: string;
+        timeZoneName?: string;
+        formatMatcher?: string;
+        hour12?: boolean;
+        timeZone?: string;
+    }
+
+    interface ResolvedDateTimeFormatOptions {
+        locale: string;
+        calendar: string;
+        numberingSystem: string;
+        timeZone: string;
+        hour12?: boolean;
+        weekday?: string;
+        era?: string;
+        year?: string;
+        month?: string;
+        day?: string;
+        hour?: string;
+        minute?: string;
+        second?: string;
+        timeZoneName?: string;
+    }
+
+    interface DateTimeFormat {
+        format(date?: Date | number): string;
+        resolvedOptions(): ResolvedDateTimeFormatOptions;
+    }
+    var DateTimeFormat: {
+        new (locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
+        new (locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
+        (locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
+        (locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
+        supportedLocalesOf(locales: string[], options?: DateTimeFormatOptions): string[];
+        supportedLocalesOf(locale: string, options?: DateTimeFormatOptions): string[];
+    }
+}
+
+interface String {
+    /**
+      * Determines whether two strings are equivalent in the current locale.
+      * @param that String to compare to target string
+      * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used. This parameter must conform to BCP 47 standards; see the Intl.Collator object for details.
+      * @param options An object that contains one or more properties that specify comparison options. see the Intl.Collator object for details.
+      */
+    localeCompare(that: string, locales: string[], options?: Intl.CollatorOptions): number;
+
+    /**
+      * Determines whether two strings are equivalent in the current locale.
+      * @param that String to compare to target string
+      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used. This parameter must conform to BCP 47 standards; see the Intl.Collator object for details.
+      * @param options An object that contains one or more properties that specify comparison options. see the Intl.Collator object for details.
+      */
+    localeCompare(that: string, locale: string, options?: Intl.CollatorOptions): number;
+}
+
+interface Number {
+    /**
+      * Converts a number to a string by using the current or specified locale. 
+      * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used.
+      * @param options An object that contains one or more properties that specify comparison options.
+      */
+    toLocaleString(locales?: string[], options?: Intl.NumberFormatOptions): string;
+
+    /**
+      * Converts a number to a string by using the current or specified locale. 
+      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
+      * @param options An object that contains one or more properties that specify comparison options.
+      */
+    toLocaleString(locale?: string, options?: Intl.NumberFormatOptions): string;
+}
+
+interface Date {
+    /**
+      * Converts a date and time to a string by using the current or specified locale.  
+      * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used.
+      * @param options An object that contains one or more properties that specify comparison options.
+      */
+    toLocaleString(locales?: string[], options?: Intl.DateTimeFormatOptions): string;
+    /**
+      * Converts a date to a string by using the current or specified locale.  
+      * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used.
+      * @param options An object that contains one or more properties that specify comparison options.
+      */
+    toLocaleDateString(locales?: string[], options?: Intl.DateTimeFormatOptions): string;
+
+    /**
+      * Converts a time to a string by using the current or specified locale.  
+      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
+      * @param options An object that contains one or more properties that specify comparison options.
+      */
+    toLocaleTimeString(locale?: string[], options?: Intl.DateTimeFormatOptions): string;
+    
+    /**
+      * Converts a date and time to a string by using the current or specified locale.  
+      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
+      * @param options An object that contains one or more properties that specify comparison options.
+      */
+    toLocaleString(locale?: string, options?: Intl.DateTimeFormatOptions): string;
+    
+    /**
+      * Converts a date to a string by using the current or specified locale.  
+      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
+      * @param options An object that contains one or more properties that specify comparison options.
+      */
+    toLocaleDateString(locale?: string, options?: Intl.DateTimeFormatOptions): string;
+
+    /**
+      * Converts a time to a string by using the current or specified locale.  
+      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
+      * @param options An object that contains one or more properties that specify comparison options.
+      */
+    toLocaleTimeString(locale?: string, options?: Intl.DateTimeFormatOptions): string;
+}
diff --git a/src/lib/es6.d.ts b/src/lib/es6.d.ts
deleted file mode 100644
index 5d71fba2b0b..00000000000
--- a/src/lib/es6.d.ts
+++ /dev/null
@@ -1,1333 +0,0 @@
-declare type PropertyKey = string | number | symbol;
-
-interface Symbol {
-    /** Returns a string representation of an object. */
-    toString(): string;
-
-    /** Returns the primitive value of the specified object. */
-    valueOf(): Object;
-
-    readonly [Symbol.toStringTag]: "Symbol";
-}
-
-interface SymbolConstructor {
-    /** 
-      * A reference to the prototype. 
-      */
-    readonly prototype: Symbol;
-
-    /**
-      * Returns a new unique Symbol value.
-      * @param  description Description of the new Symbol object.
-      */
-    (description?: string|number): symbol;
-
-    /**
-      * Returns a Symbol object from the global symbol registry matching the given key if found. 
-      * Otherwise, returns a new symbol with this key.
-      * @param key key to search for.
-      */
-    for(key: string): symbol;
-
-    /**
-      * Returns a key from the global symbol registry matching the given Symbol if found. 
-      * Otherwise, returns a undefined.
-      * @param sym Symbol to find the key for.
-      */
-    keyFor(sym: symbol): string;
-
-    // Well-known Symbols
-
-    /** 
-      * A method that determines if a constructor object recognizes an object as one of the 
-      * constructor’s instances. Called by the semantics of the instanceof operator. 
-      */
-    readonly hasInstance: symbol;
-
-    /** 
-      * A Boolean value that if true indicates that an object should flatten to its array elements
-      * by Array.prototype.concat.
-      */
-    readonly isConcatSpreadable: symbol;
-
-    /** 
-      * A method that returns the default iterator for an object. Called by the semantics of the 
-      * for-of statement.
-      */
-    readonly iterator: symbol;
-
-    /**
-      * A regular expression method that matches the regular expression against a string. Called 
-      * by the String.prototype.match method. 
-      */
-    readonly match: symbol;
-
-    /** 
-      * A regular expression method that replaces matched substrings of a string. Called by the 
-      * String.prototype.replace method.
-      */
-    readonly replace: symbol;
-
-    /**
-      * A regular expression method that returns the index within a string that matches the 
-      * regular expression. Called by the String.prototype.search method.
-      */
-    readonly search: symbol;
-
-    /** 
-      * A function valued property that is the constructor function that is used to create 
-      * derived objects.
-      */
-    readonly species: symbol;
-
-    /**
-      * A regular expression method that splits a string at the indices that match the regular 
-      * expression. Called by the String.prototype.split method.
-      */
-    readonly split: symbol;
-
-    /** 
-      * A method that converts an object to a corresponding primitive value.
-      * Called by the ToPrimitive abstract operation.
-      */
-    readonly toPrimitive: symbol;
-
-    /** 
-      * A String value that is used in the creation of the default string description of an object.
-      * Called by the built-in method Object.prototype.toString.
-      */
-    readonly toStringTag: symbol;
-
-    /**
-      * An Object whose own property names are property names that are excluded from the 'with'
-      * environment bindings of the associated objects.
-      */
-    readonly unscopables: symbol;
-}
-declare var Symbol: SymbolConstructor;
-
-interface Object {
-    /**
-      * Determines whether an object has a property with the specified name. 
-      * @param v A property name.
-      */
-    hasOwnProperty(v: PropertyKey): boolean;
-
-    /** 
-      * Determines whether a specified property is enumerable.
-      * @param v A property name.
-      */
-    propertyIsEnumerable(v: PropertyKey): boolean;
-}
-
-interface ObjectConstructor {
-    /**
-      * Copy the values of all of the enumerable own properties from one or more source objects to a 
-      * target object. Returns the target object.
-      * @param target The target object to copy to.
-      * @param source The source object from which to copy properties.
-      */
-    assign<T, U>(target: T, source: U): T & U;
-
-    /**
-      * Copy the values of all of the enumerable own properties from one or more source objects to a 
-      * target object. Returns the target object.
-      * @param target The target object to copy to.
-      * @param source1 The first source object from which to copy properties.
-      * @param source2 The second source object from which to copy properties.
-      */
-    assign<T, U, V>(target: T, source1: U, source2: V): T & U & V;
-
-    /**
-      * Copy the values of all of the enumerable own properties from one or more source objects to a 
-      * target object. Returns the target object.
-      * @param target The target object to copy to.
-      * @param source1 The first source object from which to copy properties.
-      * @param source2 The second source object from which to copy properties.
-      * @param source3 The third source object from which to copy properties.
-      */
-    assign<T, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W;
-
-    /**
-      * Copy the values of all of the enumerable own properties from one or more source objects to a 
-      * target object. Returns the target object.
-      * @param target The target object to copy to.
-      * @param sources One or more source objects from which to copy properties
-      */
-    assign(target: any, ...sources: any[]): any;
-
-    /**
-      * Returns an array of all symbol properties found directly on object o.
-      * @param o Object to retrieve the symbols from.
-      */
-    getOwnPropertySymbols(o: any): symbol[];
-
-    /**
-      * Returns true if the values are the same value, false otherwise.
-      * @param value1 The first value.
-      * @param value2 The second value.
-      */
-    is(value1: any, value2: any): boolean;
-
-    /**
-      * Sets the prototype of a specified object o to  object proto or null. Returns the object o.
-      * @param o The object to change its prototype.
-      * @param proto The value of the new prototype or null.
-      */
-    setPrototypeOf(o: any, proto: any): any;
-
-    /**
-      * Gets the own property descriptor of the specified object. 
-      * An own property descriptor is one that is defined directly on the object and is not 
-      * inherited from the object's prototype. 
-      * @param o Object that contains the property.
-      * @param p Name of the property.
-    */
-    getOwnPropertyDescriptor(o: any, propertyKey: PropertyKey): PropertyDescriptor;
-
-    /**
-      * Adds a property to an object, or modifies attributes of an existing property. 
-      * @param o Object on which to add or modify the property. This can be a native JavaScript 
-      * object (that is, a user-defined object or a built in object) or a DOM object.
-      * @param p The property name.
-      * @param attributes Descriptor for the property. It can be for a data property or an accessor
-      *  property.
-      */
-    defineProperty(o: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): any;
-}
-
-interface Function {
-    /**
-      * Returns the name of the function. Function names are read-only and can not be changed.
-      */
-    readonly name: string;
-
-    /**
-     * Determines whether the given value inherits from this function if this function was used
-     * as a constructor function.
-     *
-     * A constructor function can control which objects are recognized as its instances by
-     * 'instanceof' by overriding this method.
-     */
-    [Symbol.hasInstance](value: any): boolean;
-}
-
-interface NumberConstructor {
-    /**
-      * The value of Number.EPSILON is the difference between 1 and the smallest value greater than 1
-      * that is representable as a Number value, which is approximately: 
-      * 2.2204460492503130808472633361816 x 10‍−‍16.
-      */
-    readonly EPSILON: number;
-
-    /**
-      * Returns true if passed value is finite.
-      * Unlike the global isFininte, Number.isFinite doesn't forcibly convert the parameter to a 
-      * number. Only finite values of the type number, result in true.
-      * @param number A numeric value.
-      */
-    isFinite(number: number): boolean;
-
-    /**
-      * Returns true if the value passed is an integer, false otherwise.
-      * @param number A numeric value.
-      */
-    isInteger(number: number): boolean;
-
-    /**
-      * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a 
-      * number). Unlike the global isNaN(), Number.isNaN() doesn't forcefully convert the parameter
-      * to a number. Only values of the type number, that are also NaN, result in true.
-      * @param number A numeric value.
-      */
-    isNaN(number: number): boolean;
-
-    /**
-      * Returns true if the value passed is a safe integer.
-      * @param number A numeric value.
-      */
-    isSafeInteger(number: number): boolean;
-
-    /** 
-      * The value of the largest integer n such that n and n + 1 are both exactly representable as 
-      * a Number value. 
-      * The value of Number.MIN_SAFE_INTEGER is 9007199254740991 2^53 − 1.
-      */
-    readonly MAX_SAFE_INTEGER: number;
-
-    /** 
-      * The value of the smallest integer n such that n and n − 1 are both exactly representable as 
-      * a Number value. 
-      * The value of Number.MIN_SAFE_INTEGER is −9007199254740991 (−(2^53 − 1)).
-      */
-    readonly MIN_SAFE_INTEGER: number;
-
-    /**
-      * Converts a string to a floating-point number. 
-      * @param string A string that contains a floating-point number. 
-      */
-    parseFloat(string: string): number;
-
-    /**
-      * Converts A string to an integer.
-      * @param s A string to convert into a number.
-      * @param radix A value between 2 and 36 that specifies the base of the number in numString. 
-      * If this argument is not supplied, strings with a prefix of '0x' are considered hexadecimal.
-      * All other strings are considered decimal.
-      */
-    parseInt(string: string, radix?: number): number;
-}
-
-interface Array<T> {
-    /** Iterator */
-    [Symbol.iterator](): IterableIterator<T>;
-
-    /**
-     * Returns an object whose properties have the value 'true'
-     * when they will be absent when used in a 'with' statement.
-     */
-    [Symbol.unscopables](): {
-        copyWithin: boolean;
-        entries: boolean;
-        fill: boolean;
-        find: boolean;
-        findIndex: boolean;
-        keys: boolean;
-        values: boolean;
-    };
-
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, T]>;
-
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<T>;
-
-    /** 
-      * Returns the value of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    find(predicate: (value: T, index: number, obj: Array<T>) => boolean, thisArg?: any): T;
-
-    /** 
-      * Returns the index of the first element in the array where predicate is true, and undefined 
-      * otherwise.
-      * @param predicate find calls predicate once for each element of the array, in ascending 
-      * order, until it finds one where predicate returns true. If such an element is found, find 
-      * immediately returns that element value. Otherwise, find returns undefined.
-      * @param thisArg If provided, it will be used as the this value for each invocation of 
-      * predicate. If it is not provided, undefined is used instead.
-      */
-    findIndex(predicate: (value: T) => boolean, thisArg?: any): number;
-
-    /**
-      * Returns the this object after filling the section identified by start and end with value
-      * @param value value to fill array section with
-      * @param start index to start filling the array at. If start is negative, it is treated as 
-      * length+start where length is the length of the array. 
-      * @param end index to stop filling the array at. If end is negative, it is treated as 
-      * length+end.
-      */
-    fill(value: T, start?: number, end?: number): T[];
-
-    /** 
-      * Returns the this object after copying a section of the array identified by start and end
-      * to the same array starting at position target
-      * @param target If target is negative, it is treated as length+target where length is the 
-      * length of the array. 
-      * @param start If start is negative, it is treated as length+start. If end is negative, it 
-      * is treated as length+end.
-      * @param end If not specified, length of the this object is used as its default value. 
-      */
-    copyWithin(target: number, start: number, end?: number): T[];
-}
-
-interface IArguments {
-    /** Iterator */
-    [Symbol.iterator](): IterableIterator<any>;
-}
-
-interface ArrayConstructor {
-    /**
-      * Creates an array from an array-like object.
-      * @param arrayLike An array-like object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from<T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): Array<U>;
-
-    /**
-      * Creates an array from an iterable object.
-      * @param iterable An iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from<T, U>(iterable: Iterable<T>, mapfn: (v: T, k: number) => U, thisArg?: any): Array<U>;
-
-    /**
-      * Creates an array from an array-like object.
-      * @param arrayLike An array-like object to convert to an array.
-      */
-    from<T>(arrayLike: ArrayLike<T>): Array<T>;
-
-    /**
-      * Creates an array from an iterable object.
-      * @param iterable An iterable object to convert to an array.
-      */
-    from<T>(iterable: Iterable<T>): Array<T>;
-
-    /**
-      * Returns a new array from a set of elements.
-      * @param items A set of elements to include in the new array object.
-      */
-    of<T>(...items: T[]): Array<T>;
-}
-
-interface String {
-    /** Iterator */
-    [Symbol.iterator](): IterableIterator<string>;
-
-    /**
-      * Returns a nonnegative integer Number less than 1114112 (0x110000) that is the code point 
-      * value of the UTF-16 encoded code point starting at the string element at position pos in 
-      * the String resulting from converting this object to a String. 
-      * If there is no element at that position, the result is undefined. 
-      * If a valid UTF-16 surrogate pair does not begin at pos, the result is the code unit at pos.
-      */
-    codePointAt(pos: number): number;
-
-    /**
-      * Returns true if searchString appears as a substring of the result of converting this 
-      * object to a String, at one or more positions that are 
-      * greater than or equal to position; otherwise, returns false.
-      * @param searchString search string 
-      * @param position If position is undefined, 0 is assumed, so as to search all of the String.
-      */
-    includes(searchString: string, position?: number): boolean;
-
-    /**
-      * Returns true if the sequence of elements of searchString converted to a String is the 
-      * same as the corresponding elements of this object (converted to a String) starting at 
-      * endPosition – length(this). Otherwise returns false.
-      */
-    endsWith(searchString: string, endPosition?: number): boolean;
-
-    /**
-      * Returns the String value result of normalizing the string into the normalization form 
-      * named by form as specified in Unicode Standard Annex #15, Unicode Normalization Forms.
-      * @param form Applicable values: "NFC", "NFD", "NFKC", or "NFKD", If not specified default
-      * is "NFC"
-      */
-    normalize(form?: string): string;
-
-    /**
-      * Returns a String value that is made from count copies appended together. If count is 0, 
-      * T is the empty String is returned.
-      * @param count number of copies to append
-      */
-    repeat(count: number): string;
-
-    /**
-      * Returns true if the sequence of elements of searchString converted to a String is the 
-      * same as the corresponding elements of this object (converted to a String) starting at 
-      * position. Otherwise returns false.
-      */
-    startsWith(searchString: string, position?: number): boolean;
-
-    // Overloads for objects with methods of well-known symbols.
-
-    /**
-      * Matches a string an object that supports being matched against, and returns an array containing the results of that search.
-      * @param matcher An object that supports being matched against.
-      */
-    match(matcher: { [Symbol.match](string: string): RegExpMatchArray; }): RegExpMatchArray;
-
-    /**
-      * Replaces text in a string, using an object that supports replacement within a string.
-      * @param searchValue A object can search for and replace matches within a string.
-      * @param replaceValue A string containing the text to replace for every successful match of searchValue in this string.
-      */
-    replace(searchValue: { [Symbol.replace](string: string, replaceValue: string): string; }, replaceValue: string): string;
-
-    /**
-      * Replaces text in a string, using an object that supports replacement within a string.
-      * @param searchValue A object can search for and replace matches within a string.
-      * @param replacer A function that returns the replacement text.
-      */
-    replace(searchValue: { [Symbol.replace](string: string, replacer: (substring: string, ...args: any[]) => string): string; }, replacer: (substring: string, ...args: any[]) => string): string;
-
-    /**
-      * Finds the first substring match in a regular expression search.
-      * @param searcher An object which supports searching within a string.
-      */
-    search(searcher: { [Symbol.search](string: string): number; }): number;
-
-    /**
-      * Split a string into substrings using the specified separator and return them as an array.
-      * @param splitter An object that can split a string.
-      * @param limit A value used to limit the number of elements returned in the array.
-      */
-    split(splitter: { [Symbol.split](string: string, limit?: number): string[]; }, limit?: number): string[];
-
-    /**
-      * Returns an <a> HTML anchor element and sets the name attribute to the text value
-      * @param name
-      */
-    anchor(name: string): string;
-
-    /** Returns a <big> HTML element */
-    big(): string;
-
-    /** Returns a <blink> HTML element */
-    blink(): string;
-
-    /** Returns a <b> HTML element */
-    bold(): string;
-
-    /** Returns a <tt> HTML element */
-    fixed(): string
-
-    /** Returns a <font> HTML element and sets the color attribute value */
-    fontcolor(color: string): string
-
-    /** Returns a <font> HTML element and sets the size attribute value */
-    fontsize(size: number): string;
-
-    /** Returns a <font> HTML element and sets the size attribute value */
-    fontsize(size: string): string;
-
-    /** Returns an <i> HTML element */
-    italics(): string;
-
-    /** Returns an <a> HTML element and sets the href attribute value */
-    link(url: string): string;
-
-    /** Returns a <small> HTML element */
-    small(): string;
-
-    /** Returns a <strike> HTML element */
-    strike(): string;
-
-    /** Returns a <sub> HTML element */
-    sub(): string;
-
-    /** Returns a <sup> HTML element */
-    sup(): string;
-}
-
-interface StringConstructor {
-    /**
-      * Return the String value whose elements are, in order, the elements in the List elements.
-      * If length is 0, the empty string is returned.
-      */
-    fromCodePoint(...codePoints: number[]): string;
-
-    /**
-      * String.raw is intended for use as a tag function of a Tagged Template String. When called
-      * as such the first argument will be a well formed template call site object and the rest 
-      * parameter will contain the substitution values.
-      * @param template A well-formed template string call site representation.
-      * @param substitutions A set of substitution values.
-      */
-    raw(template: TemplateStringsArray, ...substitutions: any[]): string;
-}
-
-interface IteratorResult<T> {
-    done: boolean;
-    value?: T;
-}
-
-interface Iterator<T> {
-    next(value?: any): IteratorResult<T>;
-    return?(value?: any): IteratorResult<T>;
-    throw?(e?: any): IteratorResult<T>;
-}
-
-interface Iterable<T> {
-    [Symbol.iterator](): Iterator<T>;
-}
-
-interface IterableIterator<T> extends Iterator<T> {
-    [Symbol.iterator](): IterableIterator<T>;
-}
-
-interface GeneratorFunction extends Function {
-    readonly [Symbol.toStringTag]: "GeneratorFunction";
-}
-
-interface GeneratorFunctionConstructor {
-    /**
-      * Creates a new Generator function.
-      * @param args A list of arguments the function accepts.
-      */
-    new (...args: string[]): GeneratorFunction;
-    (...args: string[]): GeneratorFunction;
-    readonly prototype: GeneratorFunction;
-}
-declare var GeneratorFunction: GeneratorFunctionConstructor;
-
-interface Math {
-    /**
-      * Returns the number of leading zero bits in the 32-bit binary representation of a number.
-      * @param x A numeric expression.
-      */
-    clz32(x: number): number;
-
-    /**
-      * Returns the result of 32-bit multiplication of two numbers.
-      * @param x First number
-      * @param y Second number
-      */
-    imul(x: number, y: number): number;
-
-    /**
-      * Returns the sign of the x, indicating whether x is positive, negative or zero.
-      * @param x The numeric expression to test
-      */
-    sign(x: number): number;
-
-    /**
-      * Returns the base 10 logarithm of a number.
-      * @param x A numeric expression.
-      */
-    log10(x: number): number;
-
-    /**
-      * Returns the base 2 logarithm of a number.
-      * @param x A numeric expression.
-      */
-    log2(x: number): number;
-
-    /**
-      * Returns the natural logarithm of 1 + x.
-      * @param x A numeric expression.
-      */
-    log1p(x: number): number;
-
-    /**
-      * Returns the result of (e^x - 1) of x (e raised to the power of x, where e is the base of 
-      * the natural logarithms).
-      * @param x A numeric expression.
-      */
-    expm1(x: number): number;
-
-    /**
-      * Returns the hyperbolic cosine of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    cosh(x: number): number;
-
-    /**
-      * Returns the hyperbolic sine of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    sinh(x: number): number;
-
-    /**
-      * Returns the hyperbolic tangent of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    tanh(x: number): number;
-
-    /**
-      * Returns the inverse hyperbolic cosine of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    acosh(x: number): number;
-
-    /**
-      * Returns the inverse hyperbolic sine of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    asinh(x: number): number;
-
-    /**
-      * Returns the inverse hyperbolic tangent of a number.
-      * @param x A numeric expression that contains an angle measured in radians.
-      */
-    atanh(x: number): number;
-
-    /**
-      * Returns the square root of the sum of squares of its arguments.
-      * @param values Values to compute the square root for.
-      *     If no arguments are passed, the result is +0.
-      *     If there is only one argument, the result is the absolute value.
-      *     If any argument is +Infinity or -Infinity, the result is +Infinity.
-      *     If any argument is NaN, the result is NaN.
-      *     If all arguments are either +0 or −0, the result is +0.
-      */
-    hypot(...values: number[] ): number;
-
-    /**
-      * Returns the integral part of the a numeric expression, x, removing any fractional digits.
-      * If x is already an integer, the result is x.
-      * @param x A numeric expression.
-      */
-    trunc(x: number): number;
-
-    /**
-      * Returns the nearest single precision float representation of a number.
-      * @param x A numeric expression.
-      */
-    fround(x: number): number;
-
-    /**
-      * Returns an implementation-dependent approximation to the cube root of number.
-      * @param x A numeric expression.
-      */
-    cbrt(x: number): number;
-
-    readonly [Symbol.toStringTag]: "Math";
-}
-
-interface Date {
-    /**
-     * Converts a Date object to a string.
-     */
-    [Symbol.toPrimitive](hint: "default"): string;
-    /**
-     * Converts a Date object to a string.
-     */
-    [Symbol.toPrimitive](hint: "string"): string;
-    /**
-     * Converts a Date object to a number.
-     */
-    [Symbol.toPrimitive](hint: "number"): number;
-    /**
-     * Converts a Date object to a string or number.
-     *
-     * @param hint The strings "number", "string", or "default" to specify what primitive to return.
-     *
-     * @throws {TypeError} If 'hint' was given something other than "number", "string", or "default".
-     * @returns A number if 'hint' was "number", a string if 'hint' was "string" or "default".
-     */
-    [Symbol.toPrimitive](hint: string): string | number;
-}
-
-interface RegExp {
-    /**
-      * Matches a string with this regular expression, and returns an array containing the results of
-      * that search.
-      * @param string A string to search within.
-      */
-    [Symbol.match](string: string): RegExpMatchArray;
-
-    /**
-      * Replaces text in a string, using this regular expression.
-      * @param string A String object or string literal whose contents matching against
-      *               this regular expression will be replaced
-      * @param replaceValue A String object or string literal containing the text to replace for every 
-      *                     successful match of this regular expression.
-      */
-    [Symbol.replace](string: string, replaceValue: string): string;
-
-    /**
-      * Replaces text in a string, using this regular expression.
-      * @param string A String object or string literal whose contents matching against
-      *               this regular expression will be replaced
-      * @param replacer A function that returns the replacement text.
-      */
-    [Symbol.replace](string: string, replacer: (substring: string, ...args: any[]) => string): string;
-
-    /**
-      * Finds the position beginning first substring match in a regular expression search
-      * using this regular expression.
-      *
-      * @param string The string to search within.
-      */
-    [Symbol.search](string: string): number;
-
-    /**
-      * Returns an array of substrings that were delimited by strings in the original input that
-      * match against this regular expression.
-      *
-      * If the regular expression contains capturing parentheses, then each time this
-      * regular expression matches, the results (including any undefined results) of the
-      * capturing parentheses are spliced.
-      *
-      * @param string string value to split
-      * @param limit if not undefined, the output array is truncated so that it contains no more
-      * than 'limit' elements.
-      */
-    [Symbol.split](string: string, limit?: number): string[];
-
-    /**
-      * Returns a string indicating the flags of the regular expression in question. This field is read-only.
-      * The characters in this string are sequenced and concatenated in the following order:
-      *
-      *    - "g" for global
-      *    - "i" for ignoreCase
-      *    - "m" for multiline
-      *    - "u" for unicode
-      *    - "y" for sticky
-      *
-      * If no flags are set, the value is the empty string.
-      */
-    readonly flags: string;
-
-    /** 
-      * Returns a Boolean value indicating the state of the sticky flag (y) used with a regular 
-      * expression. Default is false. Read-only. 
-      */
-    readonly sticky: boolean;
-
-    /** 
-      * Returns a Boolean value indicating the state of the Unicode flag (u) used with a regular 
-      * expression. Default is false. Read-only. 
-      */
-    readonly unicode: boolean;
-}
-
-interface RegExpConstructor {
-    [Symbol.species](): RegExpConstructor;
-}
-
-interface Map<K, V> {
-    clear(): void;
-    delete(key: K): boolean;
-    entries(): IterableIterator<[K, V]>;
-    forEach(callbackfn: (value: V, index: K, map: Map<K, V>) => void, thisArg?: any): void;
-    get(key: K): V;
-    has(key: K): boolean;
-    keys(): IterableIterator<K>;
-    set(key: K, value?: V): Map<K, V>;
-    readonly size: number;
-    values(): IterableIterator<V>;
-    [Symbol.iterator]():IterableIterator<[K,V]>;
-    readonly [Symbol.toStringTag]: "Map";
-}
-
-interface MapConstructor {
-    new (): Map<any, any>;
-    new <K, V>(): Map<K, V>;
-    new <K, V>(iterable: Iterable<[K, V]>): Map<K, V>;
-    readonly prototype: Map<any, any>;
-}
-declare var Map: MapConstructor;
-
-interface WeakMap<K, V> {
-    clear(): void;
-    delete(key: K): boolean;
-    get(key: K): V;
-    has(key: K): boolean;
-    set(key: K, value?: V): WeakMap<K, V>;
-    readonly [Symbol.toStringTag]: "WeakMap";
-}
-
-interface WeakMapConstructor {
-    new (): WeakMap<any, any>;
-    new <K, V>(): WeakMap<K, V>;
-    new <K, V>(iterable: Iterable<[K, V]>): WeakMap<K, V>;
-    readonly prototype: WeakMap<any, any>;
-}
-declare var WeakMap: WeakMapConstructor;
-
-interface Set<T> {
-    add(value: T): Set<T>;
-    clear(): void;
-    delete(value: T): boolean;
-    entries(): IterableIterator<[T, T]>;
-    forEach(callbackfn: (value: T, index: T, set: Set<T>) => void, thisArg?: any): void;
-    has(value: T): boolean;
-    keys(): IterableIterator<T>;
-    readonly size: number;
-    values(): IterableIterator<T>;
-    [Symbol.iterator]():IterableIterator<T>;
-    readonly [Symbol.toStringTag]: "Set";
-}
-
-interface SetConstructor {
-    new (): Set<any>;
-    new <T>(): Set<T>;
-    new <T>(iterable: Iterable<T>): Set<T>;
-    readonly prototype: Set<any>;
-}
-declare var Set: SetConstructor;
-
-interface WeakSet<T> {
-    add(value: T): WeakSet<T>;
-    clear(): void;
-    delete(value: T): boolean;
-    has(value: T): boolean;
-    readonly [Symbol.toStringTag]: "WeakSet";
-}
-
-interface WeakSetConstructor {
-    new (): WeakSet<any>;
-    new <T>(): WeakSet<T>;
-    new <T>(iterable: Iterable<T>): WeakSet<T>;
-    readonly prototype: WeakSet<any>;
-}
-declare var WeakSet: WeakSetConstructor;
-
-interface JSON {
-    readonly [Symbol.toStringTag]: "JSON";
-}
-
-/**
-  * Represents a raw buffer of binary data, which is used to store data for the 
-  * different typed arrays. ArrayBuffers cannot be read from or written to directly, 
-  * but can be passed to a typed array or DataView Object to interpret the raw 
-  * buffer as needed. 
-  */
-interface ArrayBuffer {
-    readonly [Symbol.toStringTag]: "ArrayBuffer";
-}
-
-interface DataView {
-    readonly [Symbol.toStringTag]: "DataView";
-}
-
-/**
-  * A typed array of 8-bit integer values. The contents are initialized to 0. If the requested 
-  * number of bytes could not be allocated an exception is raised.
-  */
-interface Int8Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-    readonly [Symbol.toStringTag]: "Int8Array";
-}
-
-interface Int8ArrayConstructor {
-    new (elements: Iterable<number>): Int8Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int8Array;
-}
-
-/**
-  * A typed array of 8-bit unsigned integer values. The contents are initialized to 0. If the 
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Uint8Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-    readonly [Symbol.toStringTag]: "UInt8Array";
-}
-
-interface Uint8ArrayConstructor {
-    new (elements: Iterable<number>): Uint8Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8Array;
-}
-
-/**
-  * A typed array of 8-bit unsigned integer (clamped) values. The contents are initialized to 0. 
-  * If the requested number of bytes could not be allocated an exception is raised.
-  */
-interface Uint8ClampedArray {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-
-    [Symbol.iterator](): IterableIterator<number>;
-    readonly [Symbol.toStringTag]: "Uint8ClampedArray";
-}
-
-interface Uint8ClampedArrayConstructor {
-    new (elements: Iterable<number>): Uint8ClampedArray;
-
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8ClampedArray;
-}
-
-/**
-  * A typed array of 16-bit signed integer values. The contents are initialized to 0. If the 
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Int16Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-
-
-    [Symbol.iterator](): IterableIterator<number>;
-    readonly [Symbol.toStringTag]: "Int16Array";
-}
-
-interface Int16ArrayConstructor {
-    new (elements: Iterable<number>): Int16Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int16Array;
-}
-
-/**
-  * A typed array of 16-bit unsigned integer values. The contents are initialized to 0. If the 
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Uint16Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-    readonly [Symbol.toStringTag]: "Uint16Array";
-}
-
-interface Uint16ArrayConstructor {
-    new (elements: Iterable<number>): Uint16Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint16Array;
-}
-
-/**
-  * A typed array of 32-bit signed integer values. The contents are initialized to 0. If the 
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Int32Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-    readonly [Symbol.toStringTag]: "Int32Array";
-}
-
-interface Int32ArrayConstructor {
-    new (elements: Iterable<number>): Int32Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int32Array;
-}
-
-/**
-  * A typed array of 32-bit unsigned integer values. The contents are initialized to 0. If the 
-  * requested number of bytes could not be allocated an exception is raised.
-  */
-interface Uint32Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-    readonly [Symbol.toStringTag]: "Uint32Array";
-}
-
-interface Uint32ArrayConstructor {
-    new (elements: Iterable<number>): Uint32Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint32Array;
-}
-
-/**
-  * A typed array of 32-bit float values. The contents are initialized to 0. If the requested number
-  * of bytes could not be allocated an exception is raised.
-  */
-interface Float32Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-    readonly [Symbol.toStringTag]: "Float32Array";
-}
-
-interface Float32ArrayConstructor {
-    new (elements: Iterable<number>): Float32Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float32Array;
-}
-
-/**
-  * A typed array of 64-bit float values. The contents are initialized to 0. If the requested 
-  * number of bytes could not be allocated an exception is raised.
-  */
-interface Float64Array {
-    /** 
-      * Returns an array of key, value pairs for every entry in the array
-      */
-    entries(): IterableIterator<[number, number]>;
-    /** 
-      * Returns an list of keys in the array
-      */
-    keys(): IterableIterator<number>;
-    /** 
-      * Returns an list of values in the array
-      */
-    values(): IterableIterator<number>;
-    [Symbol.iterator](): IterableIterator<number>;
-    readonly [Symbol.toStringTag]: "Float64Array";
-}
-
-interface Float64ArrayConstructor {
-    new (elements: Iterable<number>): Float64Array;
-
-    /**
-      * Creates an array from an array-like or iterable object.
-      * @param arrayLike An array-like or iterable object to convert to an array.
-      * @param mapfn A mapping function to call on every element of the array.
-      * @param thisArg Value of 'this' used to invoke the mapfn.
-      */
-    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float64Array;
-}
-
-interface ProxyHandler<T> {
-    getPrototypeOf? (target: T): any;
-    setPrototypeOf? (target: T, v: any): boolean;
-    isExtensible? (target: T): boolean;
-    preventExtensions? (target: T): boolean;
-    getOwnPropertyDescriptor? (target: T, p: PropertyKey): PropertyDescriptor;
-    has? (target: T, p: PropertyKey): boolean;
-    get? (target: T, p: PropertyKey, receiver: any): any;
-    set? (target: T, p: PropertyKey, value: any, receiver: any): boolean;
-    deleteProperty? (target: T, p: PropertyKey): boolean;
-    defineProperty? (target: T, p: PropertyKey, attributes: PropertyDescriptor): boolean;
-    enumerate? (target: T): PropertyKey[];
-    ownKeys? (target: T): PropertyKey[];
-    apply? (target: T, thisArg: any, argArray?: any): any;
-    construct? (target: T, thisArg: any, argArray?: any): any;
-}
-
-interface ProxyConstructor {
-    revocable<T>(target: T, handler: ProxyHandler<T>): { proxy: T; revoke: () => void; };
-    new <T>(target: T, handler: ProxyHandler<T>): T
-}
-declare var Proxy: ProxyConstructor;
-
-declare namespace Reflect {
-    function apply(target: Function, thisArgument: any, argumentsList: ArrayLike<any>): any;
-    function construct(target: Function, argumentsList: ArrayLike<any>, newTarget?: any): any;
-    function defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean;
-    function deleteProperty(target: any, propertyKey: PropertyKey): boolean;
-    function enumerate(target: any): IterableIterator<any>;
-    function get(target: any, propertyKey: PropertyKey, receiver?: any): any;
-    function getOwnPropertyDescriptor(target: any, propertyKey: PropertyKey): PropertyDescriptor;
-    function getPrototypeOf(target: any): any;
-    function has(target: any, propertyKey: string): boolean;
-    function has(target: any, propertyKey: symbol): boolean;
-    function isExtensible(target: any): boolean;
-    function ownKeys(target: any): Array<PropertyKey>;
-    function preventExtensions(target: any): boolean;
-    function set(target: any, propertyKey: PropertyKey, value: any, receiver?: any): boolean;
-    function setPrototypeOf(target: any, proto: any): boolean;
-}
-
-/**
- * Represents the completion of an asynchronous operation
- */
-interface Promise<T> {
-    /**
-    * Attaches callbacks for the resolution and/or rejection of the Promise.
-    * @param onfulfilled The callback to execute when the Promise is resolved.
-    * @param onrejected The callback to execute when the Promise is rejected.
-    * @returns A Promise for the completion of which ever callback is executed.
-    */
-    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>;
-    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): Promise<TResult>;
-
-    /**
-     * Attaches a callback for only the rejection of the Promise.
-     * @param onrejected The callback to execute when the Promise is rejected.
-     * @returns A Promise for the completion of the callback.
-     */
-    catch(onrejected?: (reason: any) => T | PromiseLike<T>): Promise<T>;
-    catch(onrejected?: (reason: any) => void): Promise<T>;
-
-    readonly [Symbol.toStringTag]: "Promise";
-}
-
-interface PromiseConstructor {
-    /** 
-      * A reference to the prototype. 
-      */
-    readonly prototype: Promise<any>;
-
-    /**
-     * Creates a new Promise.
-     * @param executor A callback used to initialize the promise. This callback is passed two arguments: 
-     * a resolve callback used resolve the promise with a value or the result of another promise, 
-     * and a reject callback used to reject the promise with a provided reason or error.
-     */
-    new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
-
-    /**
-     * Creates a Promise that is resolved with an array of results when all of the provided Promises 
-     * resolve, or rejected when any Promise is rejected.
-     * @param values An array of Promises.
-     * @returns A new Promise.
-     */
-    all<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>, T10 | PromiseLike<T10>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>;
-    all<T1, T2, T3, T4, T5, T6, T7, T8, T9>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>;
-    all<T1, T2, T3, T4, T5, T6, T7, T8>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8]>;
-    all<T1, T2, T3, T4, T5, T6, T7>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>]): Promise<[T1, T2, T3, T4, T5, T6, T7]>;
-    all<T1, T2, T3, T4, T5, T6>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>]): Promise<[T1, T2, T3, T4, T5, T6]>;
-    all<T1, T2, T3, T4, T5>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>]): Promise<[T1, T2, T3, T4, T5]>;
-    all<T1, T2, T3, T4>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>]): Promise<[T1, T2, T3, T4]>;
-    all<T1, T2, T3>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>]): Promise<[T1, T2, T3]>;
-    all<T1, T2>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>]): Promise<[T1, T2]>;
-    all<TAll>(values: Iterable<TAll | PromiseLike<TAll>>): Promise<TAll[]>;
-
-    /**
-     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved 
-     * or rejected.
-     * @param values An array of Promises.
-     * @returns A new Promise.
-     */
-    race<T>(values: Iterable<T | PromiseLike<T>>): Promise<T>;
-
-    /**
-     * Creates a new rejected promise for the provided reason.
-     * @param reason The reason the promise was rejected.
-     * @returns A new rejected Promise.
-     */
-    reject(reason: any): Promise<void>;
-
-    /**
-     * Creates a new rejected promise for the provided reason.
-     * @param reason The reason the promise was rejected.
-     * @returns A new rejected Promise.
-     */
-    reject<T>(reason: any): Promise<T>;
-
-    /**
-      * Creates a new resolved promise for the provided value.
-      * @param value A promise.
-      * @returns A promise whose internal state matches the provided promise.
-      */
-    resolve<T>(value: T | PromiseLike<T>): Promise<T>;
-
-    /**
-     * Creates a new resolved promise .
-     * @returns A resolved promise.
-     */
-    resolve(): Promise<void>;
-
-    readonly [Symbol.species]: Function;
-}
-
-declare var Promise: PromiseConstructor;
diff --git a/src/lib/importcore.d.ts b/src/lib/importcore.d.ts
deleted file mode 100644
index 94e599fb842..00000000000
--- a/src/lib/importcore.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-/// <reference path="lib.core.d.ts" />
diff --git a/src/lib/importes5.d.ts b/src/lib/importes5.d.ts
new file mode 100644
index 00000000000..872bf0a1bed
--- /dev/null
+++ b/src/lib/importes5.d.ts
@@ -0,0 +1 @@
+/// <reference path="lib.es5.d.ts" />
diff --git a/src/lib/intl.d.ts b/src/lib/intl.d.ts
deleted file mode 100644
index 53894587259..00000000000
--- a/src/lib/intl.d.ts
+++ /dev/null
@@ -1,201 +0,0 @@
-/////////////////////////////
-/// ECMAScript Internationalization API 
-/////////////////////////////
-
-declare module Intl {
-    interface CollatorOptions {
-        usage?: string;
-        localeMatcher?: string;
-        numeric?: boolean;
-        caseFirst?: string;
-        sensitivity?: string;
-        ignorePunctuation?: boolean;
-    }
-
-    interface ResolvedCollatorOptions {
-        locale: string;
-        usage: string;
-        sensitivity: string;
-        ignorePunctuation: boolean;
-        collation: string;
-        caseFirst: string;
-        numeric: boolean;
-    }
-
-    interface Collator {
-        compare(x: string, y: string): number;
-        resolvedOptions(): ResolvedCollatorOptions;
-    }
-    var Collator: {
-        new (locales?: string[], options?: CollatorOptions): Collator;
-        new (locale?: string, options?: CollatorOptions): Collator;
-        (locales?: string[], options?: CollatorOptions): Collator;
-        (locale?: string, options?: CollatorOptions): Collator;
-        supportedLocalesOf(locales: string[], options?: CollatorOptions): string[];
-        supportedLocalesOf(locale: string, options?: CollatorOptions): string[];
-    }
-
-    interface NumberFormatOptions {
-        localeMatcher?: string;
-        style?: string;
-        currency?: string;
-        currencyDisplay?: string;
-        useGrouping?: boolean;
-        minimumIntegerDigits?: number;
-        minimumFractionDigits?: number;
-        maximumFractionDigits?: number;
-        minimumSignificantDigits?: number;
-        maximumSignificantDigits?: number;
-    }
-
-    interface ResolvedNumberFormatOptions {
-        locale: string;
-        numberingSystem: string;
-        style: string;
-        currency?: string;
-        currencyDisplay?: string;
-        minimumIntegerDigits: number;
-        minimumFractionDigits: number;
-        maximumFractionDigits: number;
-        minimumSignificantDigits?: number;
-        maximumSignificantDigits?: number;
-        useGrouping: boolean;
-    }
-
-    interface NumberFormat {
-        format(value: number): string;
-        resolvedOptions(): ResolvedNumberFormatOptions;
-    }
-    var NumberFormat: {
-        new (locales?: string[], options?: NumberFormatOptions): NumberFormat;
-        new (locale?: string, options?: NumberFormatOptions): NumberFormat;
-        (locales?: string[], options?: NumberFormatOptions): NumberFormat;
-        (locale?: string, options?: NumberFormatOptions): NumberFormat;
-        supportedLocalesOf(locales: string[], options?: NumberFormatOptions): string[];
-        supportedLocalesOf(locale: string, options?: NumberFormatOptions): string[];
-    }
-
-    interface DateTimeFormatOptions {
-        localeMatcher?: string;
-        weekday?: string;
-        era?: string;
-        year?: string;
-        month?: string;
-        day?: string;
-        hour?: string;
-        minute?: string;
-        second?: string;
-        timeZoneName?: string;
-        formatMatcher?: string;
-        hour12?: boolean;
-        timeZone?: string;
-    }
-
-    interface ResolvedDateTimeFormatOptions {
-        locale: string;
-        calendar: string;
-        numberingSystem: string;
-        timeZone: string;
-        hour12?: boolean;
-        weekday?: string;
-        era?: string;
-        year?: string;
-        month?: string;
-        day?: string;
-        hour?: string;
-        minute?: string;
-        second?: string;
-        timeZoneName?: string;
-    }
-
-    interface DateTimeFormat {
-        format(date?: Date | number): string;
-        resolvedOptions(): ResolvedDateTimeFormatOptions;
-    }
-    var DateTimeFormat: {
-        new (locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
-        new (locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
-        (locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
-        (locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
-        supportedLocalesOf(locales: string[], options?: DateTimeFormatOptions): string[];
-        supportedLocalesOf(locale: string, options?: DateTimeFormatOptions): string[];
-    }
-}
-
-interface String {
-    /**
-      * Determines whether two strings are equivalent in the current locale.
-      * @param that String to compare to target string
-      * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used. This parameter must conform to BCP 47 standards; see the Intl.Collator object for details.
-      * @param options An object that contains one or more properties that specify comparison options. see the Intl.Collator object for details.
-      */
-    localeCompare(that: string, locales: string[], options?: Intl.CollatorOptions): number;
-
-    /**
-      * Determines whether two strings are equivalent in the current locale.
-      * @param that String to compare to target string
-      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used. This parameter must conform to BCP 47 standards; see the Intl.Collator object for details.
-      * @param options An object that contains one or more properties that specify comparison options. see the Intl.Collator object for details.
-      */
-    localeCompare(that: string, locale: string, options?: Intl.CollatorOptions): number;
-}
-
-interface Number {
-    /**
-      * Converts a number to a string by using the current or specified locale. 
-      * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleString(locales?: string[], options?: Intl.NumberFormatOptions): string;
-
-    /**
-      * Converts a number to a string by using the current or specified locale. 
-      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleString(locale?: string, options?: Intl.NumberFormatOptions): string;
-}
-
-interface Date {
-    /**
-      * Converts a date and time to a string by using the current or specified locale.  
-      * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleString(locales?: string[], options?: Intl.DateTimeFormatOptions): string;
-    /**
-      * Converts a date to a string by using the current or specified locale.  
-      * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleDateString(locales?: string[], options?: Intl.DateTimeFormatOptions): string;
-
-    /**
-      * Converts a time to a string by using the current or specified locale.  
-      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleTimeString(locale?: string[], options?: Intl.DateTimeFormatOptions): string;
-    
-    /**
-      * Converts a date and time to a string by using the current or specified locale.  
-      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleString(locale?: string, options?: Intl.DateTimeFormatOptions): string;
-    
-    /**
-      * Converts a date to a string by using the current or specified locale.  
-      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleDateString(locale?: string, options?: Intl.DateTimeFormatOptions): string;
-
-    /**
-      * Converts a time to a string by using the current or specified locale.  
-      * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used.
-      * @param options An object that contains one or more properties that specify comparison options.
-      */
-    toLocaleTimeString(locale?: string, options?: Intl.DateTimeFormatOptions): string;
-}
-
diff --git a/src/lib/scriptHost.d.ts b/src/lib/scripthost.d.ts
similarity index 100%
rename from src/lib/scriptHost.d.ts
rename to src/lib/scripthost.d.ts
diff --git a/src/lib/webworker.generated.d.ts b/src/lib/webworker.generated.d.ts
index cd49a565f12..2b302dea6a2 100644
--- a/src/lib/webworker.generated.d.ts
+++ b/src/lib/webworker.generated.d.ts
@@ -13,10 +13,12 @@ interface EventListener {
 }
 
 interface AudioBuffer {
-    duration: number;
-    length: number;
-    numberOfChannels: number;
-    sampleRate: number;
+    readonly duration: number;
+    readonly length: number;
+    readonly numberOfChannels: number;
+    readonly sampleRate: number;
+    copyFromChannel(destination: Float32Array, channelNumber: number, startInChannel?: number): void;
+    copyToChannel(source: Float32Array, channelNumber: number, startInChannel?: number): void;
     getChannelData(channel: number): Float32Array;
 }
 
@@ -26,8 +28,8 @@ declare var AudioBuffer: {
 }
 
 interface Blob {
-    size: number;
-    type: string;
+    readonly size: number;
+    readonly type: string;
     msClose(): void;
     msDetachStream(): any;
     slice(start?: number, end?: number, contentType?: string): Blob;
@@ -39,9 +41,9 @@ declare var Blob: {
 }
 
 interface CloseEvent extends Event {
-    code: number;
-    reason: string;
-    wasClean: boolean;
+    readonly code: number;
+    readonly reason: string;
+    readonly wasClean: boolean;
     initCloseEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, wasCleanArg: boolean, codeArg: number, reasonArg: string): void;
 }
 
@@ -58,6 +60,7 @@ interface Console {
     dir(value?: any, ...optionalParams: any[]): void;
     dirxml(value: any): void;
     error(message?: any, ...optionalParams: any[]): void;
+    exception(message?: string, ...optionalParams: any[]): void;
     group(groupTitle?: string): void;
     groupCollapsed(groupTitle?: string): void;
     groupEnd(): void;
@@ -67,6 +70,7 @@ interface Console {
     profile(reportName?: string): void;
     profileEnd(): void;
     select(element: any): void;
+    table(...data: any[]): void;
     time(timerName?: string): void;
     timeEnd(timerName?: string): void;
     trace(message?: any, ...optionalParams: any[]): void;
@@ -79,13 +83,13 @@ declare var Console: {
 }
 
 interface Coordinates {
-    accuracy: number;
-    altitude: number;
-    altitudeAccuracy: number;
-    heading: number;
-    latitude: number;
-    longitude: number;
-    speed: number;
+    readonly accuracy: number;
+    readonly altitude: number;
+    readonly altitudeAccuracy: number;
+    readonly heading: number;
+    readonly latitude: number;
+    readonly longitude: number;
+    readonly speed: number;
 }
 
 declare var Coordinates: {
@@ -94,7 +98,7 @@ declare var Coordinates: {
 }
 
 interface DOMError {
-    name: string;
+    readonly name: string;
     toString(): string;
 }
 
@@ -104,73 +108,73 @@ declare var DOMError: {
 }
 
 interface DOMException {
-    code: number;
-    message: string;
-    name: string;
+    readonly code: number;
+    readonly message: string;
+    readonly name: string;
     toString(): string;
-    ABORT_ERR: number;
-    DATA_CLONE_ERR: number;
-    DOMSTRING_SIZE_ERR: number;
-    HIERARCHY_REQUEST_ERR: number;
-    INDEX_SIZE_ERR: number;
-    INUSE_ATTRIBUTE_ERR: number;
-    INVALID_ACCESS_ERR: number;
-    INVALID_CHARACTER_ERR: number;
-    INVALID_MODIFICATION_ERR: number;
-    INVALID_NODE_TYPE_ERR: number;
-    INVALID_STATE_ERR: number;
-    NAMESPACE_ERR: number;
-    NETWORK_ERR: number;
-    NOT_FOUND_ERR: number;
-    NOT_SUPPORTED_ERR: number;
-    NO_DATA_ALLOWED_ERR: number;
-    NO_MODIFICATION_ALLOWED_ERR: number;
-    PARSE_ERR: number;
-    QUOTA_EXCEEDED_ERR: number;
-    SECURITY_ERR: number;
-    SERIALIZE_ERR: number;
-    SYNTAX_ERR: number;
-    TIMEOUT_ERR: number;
-    TYPE_MISMATCH_ERR: number;
-    URL_MISMATCH_ERR: number;
-    VALIDATION_ERR: number;
-    WRONG_DOCUMENT_ERR: number;
+    readonly ABORT_ERR: number;
+    readonly DATA_CLONE_ERR: number;
+    readonly DOMSTRING_SIZE_ERR: number;
+    readonly HIERARCHY_REQUEST_ERR: number;
+    readonly INDEX_SIZE_ERR: number;
+    readonly INUSE_ATTRIBUTE_ERR: number;
+    readonly INVALID_ACCESS_ERR: number;
+    readonly INVALID_CHARACTER_ERR: number;
+    readonly INVALID_MODIFICATION_ERR: number;
+    readonly INVALID_NODE_TYPE_ERR: number;
+    readonly INVALID_STATE_ERR: number;
+    readonly NAMESPACE_ERR: number;
+    readonly NETWORK_ERR: number;
+    readonly NOT_FOUND_ERR: number;
+    readonly NOT_SUPPORTED_ERR: number;
+    readonly NO_DATA_ALLOWED_ERR: number;
+    readonly NO_MODIFICATION_ALLOWED_ERR: number;
+    readonly PARSE_ERR: number;
+    readonly QUOTA_EXCEEDED_ERR: number;
+    readonly SECURITY_ERR: number;
+    readonly SERIALIZE_ERR: number;
+    readonly SYNTAX_ERR: number;
+    readonly TIMEOUT_ERR: number;
+    readonly TYPE_MISMATCH_ERR: number;
+    readonly URL_MISMATCH_ERR: number;
+    readonly VALIDATION_ERR: number;
+    readonly WRONG_DOCUMENT_ERR: number;
 }
 
 declare var DOMException: {
     prototype: DOMException;
     new(): DOMException;
-    ABORT_ERR: number;
-    DATA_CLONE_ERR: number;
-    DOMSTRING_SIZE_ERR: number;
-    HIERARCHY_REQUEST_ERR: number;
-    INDEX_SIZE_ERR: number;
-    INUSE_ATTRIBUTE_ERR: number;
-    INVALID_ACCESS_ERR: number;
-    INVALID_CHARACTER_ERR: number;
-    INVALID_MODIFICATION_ERR: number;
-    INVALID_NODE_TYPE_ERR: number;
-    INVALID_STATE_ERR: number;
-    NAMESPACE_ERR: number;
-    NETWORK_ERR: number;
-    NOT_FOUND_ERR: number;
-    NOT_SUPPORTED_ERR: number;
-    NO_DATA_ALLOWED_ERR: number;
-    NO_MODIFICATION_ALLOWED_ERR: number;
-    PARSE_ERR: number;
-    QUOTA_EXCEEDED_ERR: number;
-    SECURITY_ERR: number;
-    SERIALIZE_ERR: number;
-    SYNTAX_ERR: number;
-    TIMEOUT_ERR: number;
-    TYPE_MISMATCH_ERR: number;
-    URL_MISMATCH_ERR: number;
-    VALIDATION_ERR: number;
-    WRONG_DOCUMENT_ERR: number;
+    readonly ABORT_ERR: number;
+    readonly DATA_CLONE_ERR: number;
+    readonly DOMSTRING_SIZE_ERR: number;
+    readonly HIERARCHY_REQUEST_ERR: number;
+    readonly INDEX_SIZE_ERR: number;
+    readonly INUSE_ATTRIBUTE_ERR: number;
+    readonly INVALID_ACCESS_ERR: number;
+    readonly INVALID_CHARACTER_ERR: number;
+    readonly INVALID_MODIFICATION_ERR: number;
+    readonly INVALID_NODE_TYPE_ERR: number;
+    readonly INVALID_STATE_ERR: number;
+    readonly NAMESPACE_ERR: number;
+    readonly NETWORK_ERR: number;
+    readonly NOT_FOUND_ERR: number;
+    readonly NOT_SUPPORTED_ERR: number;
+    readonly NO_DATA_ALLOWED_ERR: number;
+    readonly NO_MODIFICATION_ALLOWED_ERR: number;
+    readonly PARSE_ERR: number;
+    readonly QUOTA_EXCEEDED_ERR: number;
+    readonly SECURITY_ERR: number;
+    readonly SERIALIZE_ERR: number;
+    readonly SYNTAX_ERR: number;
+    readonly TIMEOUT_ERR: number;
+    readonly TYPE_MISMATCH_ERR: number;
+    readonly URL_MISMATCH_ERR: number;
+    readonly VALIDATION_ERR: number;
+    readonly WRONG_DOCUMENT_ERR: number;
 }
 
 interface DOMStringList {
-    length: number;
+    readonly length: number;
     contains(str: string): boolean;
     item(index: number): string;
     [index: number]: string;
@@ -182,11 +186,11 @@ declare var DOMStringList: {
 }
 
 interface ErrorEvent extends Event {
-    colno: number;
-    error: any;
-    filename: string;
-    lineno: number;
-    message: string;
+    readonly colno: number;
+    readonly error: any;
+    readonly filename: string;
+    readonly lineno: number;
+    readonly message: string;
     initErrorEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, messageArg: string, filenameArg: string, linenoArg: number): void;
 }
 
@@ -196,39 +200,39 @@ declare var ErrorEvent: {
 }
 
 interface Event {
-    bubbles: boolean;
+    readonly bubbles: boolean;
     cancelBubble: boolean;
-    cancelable: boolean;
-    currentTarget: EventTarget;
-    defaultPrevented: boolean;
-    eventPhase: number;
-    isTrusted: boolean;
+    readonly cancelable: boolean;
+    readonly currentTarget: EventTarget;
+    readonly defaultPrevented: boolean;
+    readonly eventPhase: number;
+    readonly isTrusted: boolean;
     returnValue: boolean;
-    srcElement: any;
-    target: EventTarget;
-    timeStamp: number;
-    type: string;
+    readonly srcElement: any;
+    readonly target: EventTarget;
+    readonly timeStamp: number;
+    readonly type: string;
     initEvent(eventTypeArg: string, canBubbleArg: boolean, cancelableArg: boolean): void;
     preventDefault(): void;
     stopImmediatePropagation(): void;
     stopPropagation(): void;
-    AT_TARGET: number;
-    BUBBLING_PHASE: number;
-    CAPTURING_PHASE: number;
+    readonly AT_TARGET: number;
+    readonly BUBBLING_PHASE: number;
+    readonly CAPTURING_PHASE: number;
 }
 
 declare var Event: {
     prototype: Event;
     new(type: string, eventInitDict?: EventInit): Event;
-    AT_TARGET: number;
-    BUBBLING_PHASE: number;
-    CAPTURING_PHASE: number;
+    readonly AT_TARGET: number;
+    readonly BUBBLING_PHASE: number;
+    readonly CAPTURING_PHASE: number;
 }
 
 interface EventTarget {
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    addEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
     dispatchEvent(evt: Event): boolean;
-    removeEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var EventTarget: {
@@ -237,8 +241,9 @@ declare var EventTarget: {
 }
 
 interface File extends Blob {
-    lastModifiedDate: any;
-    name: string;
+    readonly lastModifiedDate: any;
+    readonly name: string;
+    readonly webkitRelativePath: string;
 }
 
 declare var File: {
@@ -247,7 +252,7 @@ declare var File: {
 }
 
 interface FileList {
-    length: number;
+    readonly length: number;
     item(index: number): File;
     [index: number]: File;
 }
@@ -258,7 +263,7 @@ declare var FileList: {
 }
 
 interface FileReader extends EventTarget, MSBaseReader {
-    error: DOMError;
+    readonly error: DOMError;
     readAsArrayBuffer(blob: Blob): void;
     readAsBinaryString(blob: Blob): void;
     readAsDataURL(blob: Blob): void;
@@ -272,31 +277,31 @@ declare var FileReader: {
 }
 
 interface IDBCursor {
-    direction: string;
-    key: any;
-    primaryKey: any;
+    readonly direction: string;
+    key: IDBKeyRange | IDBValidKey;
+    readonly primaryKey: any;
     source: IDBObjectStore | IDBIndex;
     advance(count: number): void;
-    continue(key?: any): void;
+    continue(key?: IDBKeyRange | IDBValidKey): void;
     delete(): IDBRequest;
     update(value: any): IDBRequest;
-    NEXT: string;
-    NEXT_NO_DUPLICATE: string;
-    PREV: string;
-    PREV_NO_DUPLICATE: string;
+    readonly NEXT: string;
+    readonly NEXT_NO_DUPLICATE: string;
+    readonly PREV: string;
+    readonly PREV_NO_DUPLICATE: string;
 }
 
 declare var IDBCursor: {
     prototype: IDBCursor;
     new(): IDBCursor;
-    NEXT: string;
-    NEXT_NO_DUPLICATE: string;
-    PREV: string;
-    PREV_NO_DUPLICATE: string;
+    readonly NEXT: string;
+    readonly NEXT_NO_DUPLICATE: string;
+    readonly PREV: string;
+    readonly PREV_NO_DUPLICATE: string;
 }
 
 interface IDBCursorWithValue extends IDBCursor {
-    value: any;
+    readonly value: any;
 }
 
 declare var IDBCursorWithValue: {
@@ -305,15 +310,17 @@ declare var IDBCursorWithValue: {
 }
 
 interface IDBDatabase extends EventTarget {
-    name: string;
-    objectStoreNames: DOMStringList;
+    readonly name: string;
+    readonly objectStoreNames: DOMStringList;
     onabort: (ev: Event) => any;
     onerror: (ev: Event) => any;
     version: number;
+    onversionchange: (ev: IDBVersionChangeEvent) => any;
     close(): void;
     createObjectStore(name: string, optionalParameters?: IDBObjectStoreParameters): IDBObjectStore;
     deleteObjectStore(name: string): void;
     transaction(storeNames: string | string[], mode?: string): IDBTransaction;
+    addEventListener(type: "versionchange", listener: (ev: IDBVersionChangeEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -337,15 +344,15 @@ declare var IDBFactory: {
 
 interface IDBIndex {
     keyPath: string | string[];
-    name: string;
-    objectStore: IDBObjectStore;
-    unique: boolean;
+    readonly name: string;
+    readonly objectStore: IDBObjectStore;
+    readonly unique: boolean;
     multiEntry: boolean;
-    count(key?: any): IDBRequest;
-    get(key: any): IDBRequest;
-    getKey(key: any): IDBRequest;
-    openCursor(range?: IDBKeyRange, direction?: string): IDBRequest;
-    openKeyCursor(range?: IDBKeyRange, direction?: string): IDBRequest;
+    count(key?: IDBKeyRange | IDBValidKey): IDBRequest;
+    get(key: IDBKeyRange | IDBValidKey): IDBRequest;
+    getKey(key: IDBKeyRange | IDBValidKey): IDBRequest;
+    openCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest;
+    openKeyCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest;
 }
 
 declare var IDBIndex: {
@@ -354,37 +361,37 @@ declare var IDBIndex: {
 }
 
 interface IDBKeyRange {
-    lower: any;
-    lowerOpen: boolean;
-    upper: any;
-    upperOpen: boolean;
+    readonly lower: any;
+    readonly lowerOpen: boolean;
+    readonly upper: any;
+    readonly upperOpen: boolean;
 }
 
 declare var IDBKeyRange: {
     prototype: IDBKeyRange;
     new(): IDBKeyRange;
     bound(lower: any, upper: any, lowerOpen?: boolean, upperOpen?: boolean): IDBKeyRange;
-    lowerBound(bound: any, open?: boolean): IDBKeyRange;
+    lowerBound(lower: any, open?: boolean): IDBKeyRange;
     only(value: any): IDBKeyRange;
-    upperBound(bound: any, open?: boolean): IDBKeyRange;
+    upperBound(upper: any, open?: boolean): IDBKeyRange;
 }
 
 interface IDBObjectStore {
-    indexNames: DOMStringList;
+    readonly indexNames: DOMStringList;
     keyPath: string | string[];
-    name: string;
-    transaction: IDBTransaction;
+    readonly name: string;
+    readonly transaction: IDBTransaction;
     autoIncrement: boolean;
-    add(value: any, key?: any): IDBRequest;
+    add(value: any, key?: IDBKeyRange | IDBValidKey): IDBRequest;
     clear(): IDBRequest;
-    count(key?: any): IDBRequest;
+    count(key?: IDBKeyRange | IDBValidKey): IDBRequest;
     createIndex(name: string, keyPath: string | string[], optionalParameters?: IDBIndexParameters): IDBIndex;
-    delete(key: any): IDBRequest;
+    delete(key: IDBKeyRange | IDBValidKey): IDBRequest;
     deleteIndex(indexName: string): void;
     get(key: any): IDBRequest;
     index(name: string): IDBIndex;
-    openCursor(range?: any, direction?: string): IDBRequest;
-    put(value: any, key?: any): IDBRequest;
+    openCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest;
+    put(value: any, key?: IDBKeyRange | IDBValidKey): IDBRequest;
 }
 
 declare var IDBObjectStore: {
@@ -408,13 +415,13 @@ declare var IDBOpenDBRequest: {
 }
 
 interface IDBRequest extends EventTarget {
-    error: DOMError;
+    readonly error: DOMError;
     onerror: (ev: Event) => any;
     onsuccess: (ev: Event) => any;
-    readyState: string;
-    result: any;
+    readonly readyState: string;
+    readonly result: any;
     source: IDBObjectStore | IDBIndex | IDBCursor;
-    transaction: IDBTransaction;
+    readonly transaction: IDBTransaction;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "success", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -426,17 +433,17 @@ declare var IDBRequest: {
 }
 
 interface IDBTransaction extends EventTarget {
-    db: IDBDatabase;
-    error: DOMError;
-    mode: string;
+    readonly db: IDBDatabase;
+    readonly error: DOMError;
+    readonly mode: string;
     onabort: (ev: Event) => any;
     oncomplete: (ev: Event) => any;
     onerror: (ev: Event) => any;
     abort(): void;
     objectStore(name: string): IDBObjectStore;
-    READ_ONLY: string;
-    READ_WRITE: string;
-    VERSION_CHANGE: string;
+    readonly READ_ONLY: string;
+    readonly READ_WRITE: string;
+    readonly VERSION_CHANGE: string;
     addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
@@ -446,14 +453,14 @@ interface IDBTransaction extends EventTarget {
 declare var IDBTransaction: {
     prototype: IDBTransaction;
     new(): IDBTransaction;
-    READ_ONLY: string;
-    READ_WRITE: string;
-    VERSION_CHANGE: string;
+    readonly READ_ONLY: string;
+    readonly READ_WRITE: string;
+    readonly VERSION_CHANGE: string;
 }
 
 interface IDBVersionChangeEvent extends Event {
-    newVersion: number;
-    oldVersion: number;
+    readonly newVersion: number;
+    readonly oldVersion: number;
 }
 
 declare var IDBVersionChangeEvent: {
@@ -463,8 +470,8 @@ declare var IDBVersionChangeEvent: {
 
 interface ImageData {
     data: Uint8ClampedArray;
-    height: number;
-    width: number;
+    readonly height: number;
+    readonly width: number;
 }
 
 declare var ImageData: {
@@ -483,29 +490,29 @@ interface MSApp {
     execAsyncAtPriority(asynchronousCallback: MSExecAtPriorityFunctionCallback, priority: string, ...args: any[]): void;
     execAtPriority(synchronousCallback: MSExecAtPriorityFunctionCallback, priority: string, ...args: any[]): any;
     getCurrentPriority(): string;
-    getHtmlPrintDocumentSourceAsync(htmlDoc: any): any;
+    getHtmlPrintDocumentSourceAsync(htmlDoc: any): PromiseLike<any>;
     getViewId(view: any): any;
     isTaskScheduledAtPriorityOrHigher(priority: string): boolean;
     pageHandlesAllApplicationActivations(enabled: boolean): void;
     suppressSubdownloadCredentialPrompts(suppress: boolean): void;
     terminateApp(exceptionObject: any): void;
-    CURRENT: string;
-    HIGH: string;
-    IDLE: string;
-    NORMAL: string;
+    readonly CURRENT: string;
+    readonly HIGH: string;
+    readonly IDLE: string;
+    readonly NORMAL: string;
 }
 declare var MSApp: MSApp;
 
 interface MSAppAsyncOperation extends EventTarget {
-    error: DOMError;
+    readonly error: DOMError;
     oncomplete: (ev: Event) => any;
     onerror: (ev: Event) => any;
-    readyState: number;
-    result: any;
+    readonly readyState: number;
+    readonly result: any;
     start(): void;
-    COMPLETED: number;
-    ERROR: number;
-    STARTED: number;
+    readonly COMPLETED: number;
+    readonly ERROR: number;
+    readonly STARTED: number;
     addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
@@ -514,9 +521,9 @@ interface MSAppAsyncOperation extends EventTarget {
 declare var MSAppAsyncOperation: {
     prototype: MSAppAsyncOperation;
     new(): MSAppAsyncOperation;
-    COMPLETED: number;
-    ERROR: number;
-    STARTED: number;
+    readonly COMPLETED: number;
+    readonly ERROR: number;
+    readonly STARTED: number;
 }
 
 interface MSBlobBuilder {
@@ -530,7 +537,7 @@ declare var MSBlobBuilder: {
 }
 
 interface MSStream {
-    type: string;
+    readonly type: string;
     msClose(): void;
     msDetachStream(): any;
 }
@@ -541,7 +548,7 @@ declare var MSStream: {
 }
 
 interface MSStreamReader extends EventTarget, MSBaseReader {
-    error: DOMError;
+    readonly error: DOMError;
     readAsArrayBuffer(stream: MSStream, size?: number): void;
     readAsBinaryString(stream: MSStream, size?: number): void;
     readAsBlob(stream: MSStream, size?: number): void;
@@ -556,8 +563,8 @@ declare var MSStreamReader: {
 }
 
 interface MediaQueryList {
-    matches: boolean;
-    media: string;
+    readonly matches: boolean;
+    readonly media: string;
     addListener(listener: MediaQueryListListener): void;
     removeListener(listener: MediaQueryListListener): void;
 }
@@ -568,8 +575,8 @@ declare var MediaQueryList: {
 }
 
 interface MessageChannel {
-    port1: MessagePort;
-    port2: MessagePort;
+    readonly port1: MessagePort;
+    readonly port2: MessagePort;
 }
 
 declare var MessageChannel: {
@@ -578,10 +585,10 @@ declare var MessageChannel: {
 }
 
 interface MessageEvent extends Event {
-    data: any;
-    origin: string;
-    ports: any;
-    source: any;
+    readonly data: any;
+    readonly origin: string;
+    readonly ports: any;
+    readonly source: any;
     initMessageEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, dataArg: any, originArg: string, lastEventIdArg: string, sourceArg: any): void;
 }
 
@@ -605,8 +612,8 @@ declare var MessagePort: {
 }
 
 interface Position {
-    coords: Coordinates;
-    timestamp: number;
+    readonly coords: Coordinates;
+    readonly timestamp: number;
 }
 
 declare var Position: {
@@ -615,26 +622,26 @@ declare var Position: {
 }
 
 interface PositionError {
-    code: number;
-    message: string;
+    readonly code: number;
+    readonly message: string;
     toString(): string;
-    PERMISSION_DENIED: number;
-    POSITION_UNAVAILABLE: number;
-    TIMEOUT: number;
+    readonly PERMISSION_DENIED: number;
+    readonly POSITION_UNAVAILABLE: number;
+    readonly TIMEOUT: number;
 }
 
 declare var PositionError: {
     prototype: PositionError;
     new(): PositionError;
-    PERMISSION_DENIED: number;
-    POSITION_UNAVAILABLE: number;
-    TIMEOUT: number;
+    readonly PERMISSION_DENIED: number;
+    readonly POSITION_UNAVAILABLE: number;
+    readonly TIMEOUT: number;
 }
 
 interface ProgressEvent extends Event {
-    lengthComputable: boolean;
-    loaded: number;
-    total: number;
+    readonly lengthComputable: boolean;
+    readonly loaded: number;
+    readonly total: number;
     initProgressEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, lengthComputableArg: boolean, loadedArg: number, totalArg: number): void;
 }
 
@@ -645,21 +652,21 @@ declare var ProgressEvent: {
 
 interface WebSocket extends EventTarget {
     binaryType: string;
-    bufferedAmount: number;
-    extensions: string;
+    readonly bufferedAmount: number;
+    readonly extensions: string;
     onclose: (ev: CloseEvent) => any;
     onerror: (ev: Event) => any;
     onmessage: (ev: MessageEvent) => any;
     onopen: (ev: Event) => any;
-    protocol: string;
-    readyState: number;
-    url: string;
+    readonly protocol: string;
+    readonly readyState: number;
+    readonly url: string;
     close(code?: number, reason?: string): void;
     send(data: any): void;
-    CLOSED: number;
-    CLOSING: number;
-    CONNECTING: number;
-    OPEN: number;
+    readonly CLOSED: number;
+    readonly CLOSING: number;
+    readonly CONNECTING: number;
+    readonly OPEN: number;
     addEventListener(type: "close", listener: (ev: CloseEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "message", listener: (ev: MessageEvent) => any, useCapture?: boolean): void;
@@ -670,10 +677,10 @@ interface WebSocket extends EventTarget {
 declare var WebSocket: {
     prototype: WebSocket;
     new(url: string, protocols?: string | string[]): WebSocket;
-    CLOSED: number;
-    CLOSING: number;
-    CONNECTING: number;
-    OPEN: number;
+    readonly CLOSED: number;
+    readonly CLOSING: number;
+    readonly CONNECTING: number;
+    readonly OPEN: number;
 }
 
 interface Worker extends EventTarget, AbstractWorker {
@@ -693,16 +700,15 @@ declare var Worker: {
 interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
     msCaching: string;
     onreadystatechange: (ev: ProgressEvent) => any;
-    readyState: number;
-    response: any;
-    responseBody: any;
-    responseText: string;
+    readonly readyState: number;
+    readonly response: any;
+    readonly responseText: string;
     responseType: string;
-    responseXML: any;
-    status: number;
-    statusText: string;
+    readonly responseXML: any;
+    readonly status: number;
+    readonly statusText: string;
     timeout: number;
-    upload: XMLHttpRequestUpload;
+    readonly upload: XMLHttpRequestUpload;
     withCredentials: boolean;
     abort(): void;
     getAllResponseHeaders(): string;
@@ -713,11 +719,11 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
     send(data?: string): void;
     send(data?: any): void;
     setRequestHeader(header: string, value: string): void;
-    DONE: number;
-    HEADERS_RECEIVED: number;
-    LOADING: number;
-    OPENED: number;
-    UNSENT: number;
+    readonly DONE: number;
+    readonly HEADERS_RECEIVED: number;
+    readonly LOADING: number;
+    readonly OPENED: number;
+    readonly UNSENT: number;
     addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -732,11 +738,11 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
 declare var XMLHttpRequest: {
     prototype: XMLHttpRequest;
     new(): XMLHttpRequest;
-    DONE: number;
-    HEADERS_RECEIVED: number;
-    LOADING: number;
-    OPENED: number;
-    UNSENT: number;
+    readonly DONE: number;
+    readonly HEADERS_RECEIVED: number;
+    readonly LOADING: number;
+    readonly OPENED: number;
+    readonly UNSENT: number;
     create(): XMLHttpRequest;
 }
 
@@ -762,12 +768,12 @@ interface MSBaseReader {
     onloadend: (ev: ProgressEvent) => any;
     onloadstart: (ev: Event) => any;
     onprogress: (ev: ProgressEvent) => any;
-    readyState: number;
-    result: any;
+    readonly readyState: number;
+    readonly result: any;
     abort(): void;
-    DONE: number;
-    EMPTY: number;
-    LOADING: number;
+    readonly DONE: number;
+    readonly EMPTY: number;
+    readonly LOADING: number;
     addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
     addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void;
@@ -778,18 +784,18 @@ interface MSBaseReader {
 }
 
 interface NavigatorID {
-    appName: string;
-    appVersion: string;
-    platform: string;
-    product: string;
-    productSub: string;
-    userAgent: string;
-    vendor: string;
-    vendorSub: string;
+    readonly appName: string;
+    readonly appVersion: string;
+    readonly platform: string;
+    readonly product: string;
+    readonly productSub: string;
+    readonly userAgent: string;
+    readonly vendor: string;
+    readonly vendorSub: string;
 }
 
 interface NavigatorOnLine {
-    onLine: boolean;
+    readonly onLine: boolean;
 }
 
 interface WindowBase64 {
@@ -798,7 +804,7 @@ interface WindowBase64 {
 }
 
 interface WindowConsole {
-    console: Console;
+    readonly console: Console;
 }
 
 interface XMLHttpRequestEventTarget {
@@ -832,9 +838,9 @@ declare var FileReaderSync: {
 }
 
 interface WorkerGlobalScope extends EventTarget, WorkerUtils, DedicatedWorkerGlobalScope, WindowConsole {
-    location: WorkerLocation;
+    readonly location: WorkerLocation;
     onerror: (ev: Event) => any;
-    self: WorkerGlobalScope;
+    readonly self: WorkerGlobalScope;
     close(): void;
     msWriteProfilerMark(profilerMarkName: string): void;
     toString(): string;
@@ -849,14 +855,14 @@ declare var WorkerGlobalScope: {
 }
 
 interface WorkerLocation {
-    hash: string;
-    host: string;
-    hostname: string;
-    href: string;
-    pathname: string;
-    port: string;
-    protocol: string;
-    search: string;
+    readonly hash: string;
+    readonly host: string;
+    readonly hostname: string;
+    readonly href: string;
+    readonly pathname: string;
+    readonly port: string;
+    readonly protocol: string;
+    readonly search: string;
     toString(): string;
 }
 
@@ -882,9 +888,9 @@ interface DedicatedWorkerGlobalScope {
 }
 
 interface WorkerUtils extends Object, WindowBase64 {
-    indexedDB: IDBFactory;
-    msIndexedDB: IDBFactory;
-    navigator: WorkerNavigator;
+    readonly indexedDB: IDBFactory;
+    readonly msIndexedDB: IDBFactory;
+    readonly navigator: WorkerNavigator;
     clearImmediate(handle: number): void;
     clearInterval(handle: number): void;
     clearTimeout(handle: number): void;
@@ -894,16 +900,6 @@ interface WorkerUtils extends Object, WindowBase64 {
     setTimeout(handler: any, timeout?: any, ...args: any[]): number;
 }
 
-interface IDBObjectStoreParameters {
-    keyPath?: string | string[];
-    autoIncrement?: boolean;
-}
-
-interface IDBIndexParameters {
-    unique?: boolean;
-    multiEntry?: boolean;
-}
-
 interface BlobPropertyBag {
     type?: string;
     endings?: string;
@@ -933,6 +929,9 @@ interface ProgressEventInit extends EventInit {
     total?: number;
 }
 
+interface IDBArrayKey extends Array<IDBValidKey> {
+}
+
 declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
 
 interface ErrorEventHandler {
@@ -971,9 +970,9 @@ declare var self: WorkerGlobalScope;
 declare function close(): void;
 declare function msWriteProfilerMark(profilerMarkName: string): void;
 declare function toString(): string;
-declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+declare function addEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 declare function dispatchEvent(evt: Event): boolean;
-declare function removeEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+declare function removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 declare var indexedDB: IDBFactory;
 declare var msIndexedDB: IDBFactory;
 declare var navigator: WorkerNavigator;
@@ -991,4 +990,5 @@ declare function postMessage(data: any): void;
 declare var console: Console;
 declare function addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "message", listener: (ev: MessageEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
\ No newline at end of file
+declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+type IDBValidKey = number | string | Date | IDBArrayKey;
\ No newline at end of file
diff --git a/src/server/client.ts b/src/server/client.ts
index 08939b2b44a..e8122b39055 100644
--- a/src/server/client.ts
+++ b/src/server/client.ts
@@ -83,7 +83,7 @@ namespace ts.server {
 
         private processResponse<T extends protocol.Response>(request: protocol.Request): T {
             var lastMessage = this.messages.shift();
-            Debug.assert(!!lastMessage, "Did not recieve any responses.");
+            Debug.assert(!!lastMessage, "Did not receive any responses.");
 
             // Read the content length
             var contentLengthPrefix = "Content-Length: ";
@@ -108,7 +108,7 @@ namespace ts.server {
             }
 
             // verify the sequence numbers
-            Debug.assert(response.request_seq === request.seq, "Malformed response: response sequance number did not match request sequence number.");
+            Debug.assert(response.request_seq === request.seq, "Malformed response: response sequence number did not match request sequence number.");
             
             // unmarshal errors
             if (!response.success) {
@@ -568,6 +568,10 @@ namespace ts.server {
             throw new Error("Not Implemented Yet."); 
         }
 
+        isValidBraceCompletionAtPostion(fileName: string, position: number, openingBrace: number): boolean {
+            throw new Error("Not Implemented Yet."); 
+        }
+
         getBraceMatchingAtPosition(fileName: string, position: number): TextSpan[] {
             var lineOffset = this.positionToOneBasedLineOffset(fileName, position);
             var args: protocol.FileLocationRequestArgs = {
@@ -613,7 +617,7 @@ namespace ts.server {
             throw new Error("SourceFile objects are not serializable through the server protocol.");
         }
 
-        getSourceFile(fileName: string): SourceFile {
+        getNonBoundSourceFile(fileName: string): SourceFile {
             throw new Error("SourceFile objects are not serializable through the server protocol.");
         }
 
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index e2ec5cc159f..4c054664a18 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -81,8 +81,14 @@ namespace ts.server {
         }
     }
 
-    interface TimestampedResolvedModule extends ResolvedModuleWithFailedLookupLocations {
-        lastCheckTime: number;
+    interface Timestamped {
+        lastCheckTime?: number;
+    }
+
+    interface TimestampedResolvedModule extends ResolvedModuleWithFailedLookupLocations, Timestamped {
+    }
+
+    interface TimestampedResolvedTypeReferenceDirective extends ResolvedTypeReferenceDirectiveWithFailedLookupLocations, Timestamped {
     }
 
     export class LSHost implements ts.LanguageServiceHost {
@@ -90,13 +96,16 @@ namespace ts.server {
         compilationSettings: ts.CompilerOptions;
         filenameToScript: ts.FileMap<ScriptInfo>;
         roots: ScriptInfo[] = [];
+
         private resolvedModuleNames: ts.FileMap<Map<TimestampedResolvedModule>>;
+        private resolvedTypeReferenceDirectives: ts.FileMap<Map<TimestampedResolvedTypeReferenceDirective>>;
         private moduleResolutionHost: ts.ModuleResolutionHost;
         private getCanonicalFileName: (fileName: string) => string;
 
         constructor(public host: ServerHost, public project: Project) {
             this.getCanonicalFileName = createGetCanonicalFileName(host.useCaseSensitiveFileNames);
             this.resolvedModuleNames = createFileMap<Map<TimestampedResolvedModule>>();
+            this.resolvedTypeReferenceDirectives = createFileMap<Map<TimestampedResolvedTypeReferenceDirective>>();
             this.filenameToScript = createFileMap<ScriptInfo>();
             this.moduleResolutionHost = {
                 fileExists: fileName => this.fileExists(fileName),
@@ -105,46 +114,51 @@ namespace ts.server {
             };
         }
 
-        resolveModuleNames(moduleNames: string[], containingFile: string): ResolvedModule[] {
+        private resolveNamesWithLocalCache<T extends Timestamped & { failedLookupLocations: string[] }, R>(
+            names: string[],
+            containingFile: string,
+            cache: ts.FileMap<Map<T>>,
+            loader: (name: string, containingFile: string, options: CompilerOptions, host: ModuleResolutionHost) => T,
+            getResult: (s: T) => R): R[] {
+
             const path = toPath(containingFile, this.host.getCurrentDirectory(), this.getCanonicalFileName);
-            const currentResolutionsInFile = this.resolvedModuleNames.get(path);
-
-            const newResolutions: Map<TimestampedResolvedModule> = {};
-            const resolvedModules: ResolvedModule[] = [];
+            const currentResolutionsInFile = cache.get(path);
 
+            const newResolutions: Map<T> = {};
+            const resolvedModules: R[] = [];
             const compilerOptions = this.getCompilationSettings();
 
-            for (const moduleName of moduleNames) {
+            for (const name of names) {
                 // check if this is a duplicate entry in the list
-                let resolution = lookUp(newResolutions, moduleName);
+                let resolution = lookUp(newResolutions, name);
                 if (!resolution) {
-                    const existingResolution = currentResolutionsInFile && ts.lookUp(currentResolutionsInFile, moduleName);
+                    const existingResolution = currentResolutionsInFile && ts.lookUp(currentResolutionsInFile, name);
                     if (moduleResolutionIsValid(existingResolution)) {
-                        // ok, it is safe to use existing module resolution results
+                        // ok, it is safe to use existing name resolution results
                         resolution = existingResolution;
                     }
                     else {
-                        resolution = <TimestampedResolvedModule>resolveModuleName(moduleName, containingFile, compilerOptions, this.moduleResolutionHost);
+                        resolution = loader(name, containingFile, compilerOptions, this.moduleResolutionHost);
                         resolution.lastCheckTime = Date.now();
-                        newResolutions[moduleName] = resolution;
+                        newResolutions[name] = resolution;
                     }
                 }
 
                 ts.Debug.assert(resolution !== undefined);
 
-                resolvedModules.push(resolution.resolvedModule);
+                resolvedModules.push(getResult(resolution));
             }
 
             // replace old results with a new one
-            this.resolvedModuleNames.set(path, newResolutions);
+            cache.set(path, newResolutions);
             return resolvedModules;
 
-            function moduleResolutionIsValid(resolution: TimestampedResolvedModule): boolean {
+            function moduleResolutionIsValid(resolution: T): boolean {
                 if (!resolution) {
                     return false;
                 }
 
-                if (resolution.resolvedModule) {
+                if (getResult(resolution)) {
                     // TODO: consider checking failedLookupLocations
                     // TODO: use lastCheckTime to track expiration for module name resolution
                     return true;
@@ -156,6 +170,14 @@ namespace ts.server {
             }
         }
 
+        resolveTypeReferenceDirectives(typeDirectiveNames: string[], containingFile: string): ResolvedTypeReferenceDirective[] {
+            return this.resolveNamesWithLocalCache(typeDirectiveNames, containingFile, this.resolvedTypeReferenceDirectives, resolveTypeReferenceDirective, m => m.resolvedTypeReferenceDirective);
+        }
+
+        resolveModuleNames(moduleNames: string[], containingFile: string): ResolvedModule[] {
+            return this.resolveNamesWithLocalCache(moduleNames, containingFile, this.resolvedModuleNames, resolveModuleName, m => m.resolvedModule);
+        }
+
         getDefaultLibFileName() {
             const nodeModuleBinDir = ts.getDirectoryPath(ts.normalizePath(this.host.getExecutingFilePath()));
             return ts.combinePaths(nodeModuleBinDir, ts.getDefaultLibFileName(this.compilationSettings));
@@ -172,6 +194,7 @@ namespace ts.server {
             this.compilationSettings = opt;
             // conservatively assume that changing compiler options might affect module resolution strategy
             this.resolvedModuleNames.clear();
+            this.resolvedTypeReferenceDirectives.clear();
         }
 
         lineAffectsRefs(filename: string, line: number) {
@@ -192,6 +215,10 @@ namespace ts.server {
             return this.roots.map(root => root.fileName);
         }
 
+        getScriptKind() {
+            return ScriptKind.Unknown;
+        }
+
         getScriptVersion(filename: string) {
             return this.getScriptInfo(filename).svc.latestVersion().toString();
         }
@@ -208,6 +235,7 @@ namespace ts.server {
             if (!info.isOpen) {
                 this.filenameToScript.remove(info.path);
                 this.resolvedModuleNames.remove(info.path);
+                this.resolvedTypeReferenceDirectives.remove(info.path);
             }
         }
 
@@ -235,6 +263,7 @@ namespace ts.server {
                 this.filenameToScript.remove(info.path);
                 this.roots = copyListRemovingItem(info, this.roots);
                 this.resolvedModuleNames.remove(info.path);
+                this.resolvedTypeReferenceDirectives.remove(info.path);
             }
         }
 
@@ -1002,9 +1031,7 @@ namespace ts.server {
                     info.setFormatOptions(this.getFormatCodeOptions());
                     this.filenameToScriptInfo[fileName] = info;
                     if (!info.isOpen) {
-                        info.fileWatcher = this.host.watchFile(
-                            toPath(fileName, fileName, createGetCanonicalFileName(sys.useCaseSensitiveFileNames)),
-                            _ => { this.watchedFileChanged(fileName); });
+                        info.fileWatcher = this.host.watchFile(fileName, _ => { this.watchedFileChanged(fileName); });
                     }
                 }
             }
@@ -1223,9 +1250,7 @@ namespace ts.server {
                     }
                 }
                 project.finishGraph();
-                project.projectFileWatcher = this.host.watchFile(
-                    toPath(configFilename, configFilename, createGetCanonicalFileName(sys.useCaseSensitiveFileNames)),
-                    _ => this.watchedProjectConfigFileChanged(project));
+                project.projectFileWatcher = this.host.watchFile(configFilename, _ => this.watchedProjectConfigFileChanged(project));
                 this.log("Add recursive watcher for: " + ts.getDirectoryPath(configFilename));
                 project.directoryWatcher = this.host.watchDirectory(
                     ts.getDirectoryPath(configFilename),
@@ -1313,6 +1338,7 @@ namespace ts.server {
             else {
                 const defaultOpts = ts.getDefaultCompilerOptions();
                 defaultOpts.allowNonTsExtensions = true;
+                defaultOpts.allowJs = true;
                 this.setCompilerOptions(defaultOpts);
             }
             this.languageService = ts.createLanguageService(this.host, this.documentRegistry);
@@ -1325,7 +1351,7 @@ namespace ts.server {
         }
 
         isExternalModule(filename: string): boolean {
-            const sourceFile = this.languageService.getSourceFile(filename);
+            const sourceFile = this.languageService.getNonBoundSourceFile(filename);
             return ts.isExternalModule(sourceFile);
         }
 
diff --git a/src/server/protocol.d.ts b/src/server/protocol.d.ts
index 19ede892daf..887da47ea65 100644
--- a/src/server/protocol.d.ts
+++ b/src/server/protocol.d.ts
@@ -444,7 +444,7 @@ declare namespace ts.server.protocol {
         /** Defines space handling after a comma delimiter. Default value is true. */
         insertSpaceAfterCommaDelimiter?: boolean;
 
-        /** Defines space handling after a semicolon in a for statemen. Default value is true */
+        /** Defines space handling after a semicolon in a for statement. Default value is true */
         insertSpaceAfterSemicolonInForStatements?: boolean;
 
         /** Defines space handling after a binary operator. Default value is true. */
@@ -835,7 +835,7 @@ declare namespace ts.server.protocol {
         prefixDisplayParts: SymbolDisplayPart[];
 
         /**
-         * The suffix disaply parts.
+         * The suffix display parts.
          */
         suffixDisplayParts: SymbolDisplayPart[];
 
@@ -903,7 +903,7 @@ declare namespace ts.server.protocol {
     }
 
     /**
-     * Repsonse object for a SignatureHelpRequest.
+     * Response object for a SignatureHelpRequest.
      */
     export interface SignatureHelpResponse extends Response {
         body?: SignatureHelpItems;
@@ -970,7 +970,7 @@ declare namespace ts.server.protocol {
       */
     export interface Diagnostic {
         /**
-          * Starting file location at which text appies.
+          * Starting file location at which text applies.
           */
         start: Location;
 
@@ -1179,7 +1179,7 @@ declare namespace ts.server.protocol {
     }
 
     /**
-      * NavBar itesm request; value of command field is "navbar".
+      * NavBar items request; value of command field is "navbar".
       * Return response giving the list of navigation bar entries
       * extracted from the requested file.
       */
diff --git a/src/server/server.ts b/src/server/server.ts
index d9f078ac0eb..3ffd64fe07d 100644
--- a/src/server/server.ts
+++ b/src/server/server.ts
@@ -1,7 +1,7 @@
 /// <reference path="node.d.ts" />
 /// <reference path="session.ts" />
 // used in fs.writeSync
-/* tslint:disable:no-null */
+/* tslint:disable:no-null-keyword */
 
 namespace ts.server {
     const readline: NodeJS.ReadLine = require("readline");
diff --git a/src/server/session.ts b/src/server/session.ts
index c1bafdf5ba8..f0975a3f947 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -603,7 +603,7 @@ namespace ts.server {
             // Check whether we should auto-indent. This will be when
             // the position is on a line containing only whitespace.
             // This should leave the edits returned from
-            // getFormattingEditsAfterKeytroke either empty or pertaining
+            // getFormattingEditsAfterKeystroke either empty or pertaining
             // only to the previous line.  If all this is true, then
             // add edits necessary to properly indent the current line.
             if ((key == "\n") && ((!edits) || (edits.length === 0) || allEditsBeforePos(edits, position))) {
diff --git a/src/server/tsconfig.json b/src/server/tsconfig.json
index 2c8538c61e3..0772210cb15 100644
--- a/src/server/tsconfig.json
+++ b/src/server/tsconfig.json
@@ -1,6 +1,5 @@
 {
     "compilerOptions": {
-        "module": "commonjs",
         "noImplicitAny": true,
         "removeComments": true,
         "preserveConstEnums": true,
diff --git a/src/services/breakpoints.ts b/src/services/breakpoints.ts
index 6f20093c7da..ab3a7644e92 100644
--- a/src/services/breakpoints.ts
+++ b/src/services/breakpoints.ts
@@ -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);
             }
 
@@ -490,17 +490,17 @@ namespace ts.BreakpointResolver {
                 return spanInNode(block.statements[0]);
             }
 
-            function spanInInitializerOfForLike(forLikeStaement: ForStatement | ForOfStatement | ForInStatement): TextSpan {
-                if (forLikeStaement.initializer.kind === SyntaxKind.VariableDeclarationList) {
+            function spanInInitializerOfForLike(forLikeStatement: ForStatement | ForOfStatement | ForInStatement): TextSpan {
+                if (forLikeStatement.initializer.kind === SyntaxKind.VariableDeclarationList) {
                     // declaration list, set breakpoint in first declaration
-                    let variableDeclarationList = <VariableDeclarationList>forLikeStaement.initializer;
+                    let variableDeclarationList = <VariableDeclarationList>forLikeStatement.initializer;
                     if (variableDeclarationList.declarations.length > 0) {
                         return spanInNode(variableDeclarationList.declarations[0]);
                     }
                 }
                 else {
                     // Expression - set breakpoint in it
-                    return spanInNode(forLikeStaement.initializer);
+                    return spanInNode(forLikeStatement.initializer);
                 }
             }
 
diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts
index 53a8c2b4307..066bcf7cda6 100644
--- a/src/services/formatting/formatting.ts
+++ b/src/services/formatting/formatting.ts
@@ -72,12 +72,20 @@ namespace ts.formatting {
         if (line === 0) {
             return [];
         }
-        // get the span for the previous\current line
+        // After the enter key, the cursor is now at a new line. The new line may or may not contain non-whitespace characters.
+        // If the new line has only whitespaces, we won't want to format this line, because that would remove the indentation as
+        // trailing whitespaces. So the end of the formatting span should be the later one between:
+        //  1. the end of the previous line
+        //  2. the last non-whitespace character in the current line
+        let endOfFormatSpan = getEndLinePosition(line, sourceFile);
+        while (isWhiteSpace(sourceFile.text.charCodeAt(endOfFormatSpan)) && !isLineBreak(sourceFile.text.charCodeAt(endOfFormatSpan))) {
+            endOfFormatSpan--;
+        }
         let span = {
             // get start position for the previous line
             pos: getStartPositionOfLine(line - 1, sourceFile),
-            // get end position for the current line (end value is exclusive so add 1 to the result)
-            end: getEndLinePosition(line, sourceFile) + 1
+            // end value is exclusive so add 1 to the result
+            end: endOfFormatSpan + 1
         }
         return formatSpan(span, sourceFile, options, rulesProvider, FormattingRequestKind.FormatOnEnter);
     }
@@ -256,7 +264,7 @@ namespace ts.formatting {
             return enclosingNode.pos;
         }
 
-        // preceding token ends after the start of original range (i.e when originaRange.pos falls in the middle of literal)
+        // preceding token ends after the start of original range (i.e when originalRange.pos falls in the middle of literal)
         // start from the beginning of enclosingNode to handle the entire 'originalRange'
         if (precedingToken.end >= originalRange.pos) {
             return enclosingNode.pos;
diff --git a/src/services/formatting/formattingScanner.ts b/src/services/formatting/formattingScanner.ts
index 7a4cb0924d8..5b869f12096 100644
--- a/src/services/formatting/formattingScanner.ts
+++ b/src/services/formatting/formattingScanner.ts
@@ -181,7 +181,7 @@ namespace ts.formatting {
                 // readTokenInfo was called before with the same expected scan action.
                 // No need to re-scan text, return existing 'lastTokenInfo'
                 // it is ok to call fixTokenKind here since it does not affect
-                // what portion of text is consumed. In opposize rescanning can change it,
+                // what portion of text is consumed. In contrast rescanning can change it,
                 // i.e. for '>=' when originally scanner eats just one character
                 // and rescanning forces it to consume more.
                 return fixTokenKind(lastTokenInfo, n);
diff --git a/src/services/formatting/rules.ts b/src/services/formatting/rules.ts
index 4bc0ad70ad3..3b69fdd7e0d 100644
--- a/src/services/formatting/rules.ts
+++ b/src/services/formatting/rules.ts
@@ -235,29 +235,29 @@ namespace ts.formatting {
             this.IgnoreAfterLineComment = new Rule(RuleDescriptor.create3(SyntaxKind.SingleLineCommentTrivia, Shared.TokenRange.Any), RuleOperation.create1(RuleAction.Ignore));
 
             // Space after keyword but not before ; or : or ?
-            this.NoSpaceBeforeSemicolon = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.SemicolonToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
-            this.NoSpaceBeforeColon = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.ColonToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), RuleAction.Delete));
-            this.NoSpaceBeforeQuestionMark = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.QuestionToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), RuleAction.Delete));
-            this.SpaceAfterColon = new Rule(RuleDescriptor.create3(SyntaxKind.ColonToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), RuleAction.Space));
-            this.SpaceAfterQuestionMarkInConditionalOperator = new Rule(RuleDescriptor.create3(SyntaxKind.QuestionToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsConditionalOperatorContext), RuleAction.Space));
-            this.NoSpaceAfterQuestionMark = new Rule(RuleDescriptor.create3(SyntaxKind.QuestionToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
-            this.SpaceAfterSemicolon = new Rule(RuleDescriptor.create3(SyntaxKind.SemicolonToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Space));
+            this.NoSpaceBeforeSemicolon = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.SemicolonToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
+            this.NoSpaceBeforeColon = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.ColonToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBinaryOpContext), RuleAction.Delete));
+            this.NoSpaceBeforeQuestionMark = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.QuestionToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBinaryOpContext), RuleAction.Delete));
+            this.SpaceAfterColon = new Rule(RuleDescriptor.create3(SyntaxKind.ColonToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBinaryOpContext), RuleAction.Space));
+            this.SpaceAfterQuestionMarkInConditionalOperator = new Rule(RuleDescriptor.create3(SyntaxKind.QuestionToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsConditionalOperatorContext), RuleAction.Space));
+            this.NoSpaceAfterQuestionMark = new Rule(RuleDescriptor.create3(SyntaxKind.QuestionToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
+            this.SpaceAfterSemicolon = new Rule(RuleDescriptor.create3(SyntaxKind.SemicolonToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Space));
 
             // Space after }.
-            this.SpaceAfterCloseBrace = new Rule(RuleDescriptor.create3(SyntaxKind.CloseBraceToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsAfterCodeBlockContext), RuleAction.Space));
+            this.SpaceAfterCloseBrace = new Rule(RuleDescriptor.create3(SyntaxKind.CloseBraceToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsAfterCodeBlockContext), RuleAction.Space));
 
             // Special case for (}, else) and (}, while) since else & while tokens are not part of the tree which makes SpaceAfterCloseBrace rule not applied
-            this.SpaceBetweenCloseBraceAndElse = new Rule(RuleDescriptor.create1(SyntaxKind.CloseBraceToken, SyntaxKind.ElseKeyword), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Space));
-            this.SpaceBetweenCloseBraceAndWhile = new Rule(RuleDescriptor.create1(SyntaxKind.CloseBraceToken, SyntaxKind.WhileKeyword), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Space));
-            this.NoSpaceAfterCloseBrace = new Rule(RuleDescriptor.create3(SyntaxKind.CloseBraceToken, Shared.TokenRange.FromTokens([SyntaxKind.CloseParenToken, SyntaxKind.CloseBracketToken, SyntaxKind.CommaToken, SyntaxKind.SemicolonToken])), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
+            this.SpaceBetweenCloseBraceAndElse = new Rule(RuleDescriptor.create1(SyntaxKind.CloseBraceToken, SyntaxKind.ElseKeyword), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Space));
+            this.SpaceBetweenCloseBraceAndWhile = new Rule(RuleDescriptor.create1(SyntaxKind.CloseBraceToken, SyntaxKind.WhileKeyword), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Space));
+            this.NoSpaceAfterCloseBrace = new Rule(RuleDescriptor.create3(SyntaxKind.CloseBraceToken, Shared.TokenRange.FromTokens([SyntaxKind.CloseParenToken, SyntaxKind.CloseBracketToken, SyntaxKind.CommaToken, SyntaxKind.SemicolonToken])), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
 
             // No space for dot
-            this.NoSpaceBeforeDot = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.DotToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
-            this.NoSpaceAfterDot = new Rule(RuleDescriptor.create3(SyntaxKind.DotToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
+            this.NoSpaceBeforeDot = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.DotToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
+            this.NoSpaceAfterDot = new Rule(RuleDescriptor.create3(SyntaxKind.DotToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
 
             // No space before and after indexer
-            this.NoSpaceBeforeOpenBracket = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.OpenBracketToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
-            this.NoSpaceAfterCloseBracket = new Rule(RuleDescriptor.create3(SyntaxKind.CloseBracketToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBeforeBlockInFunctionDeclarationContext), RuleAction.Delete));
+            this.NoSpaceBeforeOpenBracket = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.OpenBracketToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
+            this.NoSpaceAfterCloseBracket = new Rule(RuleDescriptor.create3(SyntaxKind.CloseBracketToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBeforeBlockInFunctionDeclarationContext), RuleAction.Delete));
 
             // Place a space before open brace in a function declaration
             this.FunctionOpenBraceLeftTokenRange = Shared.TokenRange.AnyIncludingMultilineComments;
@@ -274,7 +274,7 @@ 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.NoSpaceBetweenEmptyBraceBrackets = new Rule(RuleDescriptor.create1(SyntaxKind.OpenBraceToken, SyntaxKind.CloseBraceToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsObjectContext), 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.
             this.NewLineAfterOpenBraceInBlockContext = new Rule(RuleDescriptor.create3(SyntaxKind.OpenBraceToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsMultilineBlockContext), RuleAction.NewLine));
@@ -285,100 +285,100 @@ namespace ts.formatting {
             // Special handling of unary operators.
             // Prefix operators generally shouldn't have a space between
             // them and their target unary expression.
-            this.NoSpaceAfterUnaryPrefixOperator = new Rule(RuleDescriptor.create4(Shared.TokenRange.UnaryPrefixOperators, Shared.TokenRange.UnaryPrefixExpressions), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), RuleAction.Delete));
-            this.NoSpaceAfterUnaryPreincrementOperator = new Rule(RuleDescriptor.create3(SyntaxKind.PlusPlusToken, Shared.TokenRange.UnaryPreincrementExpressions), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
-            this.NoSpaceAfterUnaryPredecrementOperator = new Rule(RuleDescriptor.create3(SyntaxKind.MinusMinusToken, Shared.TokenRange.UnaryPredecrementExpressions), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
-            this.NoSpaceBeforeUnaryPostincrementOperator = new Rule(RuleDescriptor.create2(Shared.TokenRange.UnaryPostincrementExpressions, SyntaxKind.PlusPlusToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
-            this.NoSpaceBeforeUnaryPostdecrementOperator = new Rule(RuleDescriptor.create2(Shared.TokenRange.UnaryPostdecrementExpressions, SyntaxKind.MinusMinusToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
+            this.NoSpaceAfterUnaryPrefixOperator = new Rule(RuleDescriptor.create4(Shared.TokenRange.UnaryPrefixOperators, Shared.TokenRange.UnaryPrefixExpressions), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBinaryOpContext), RuleAction.Delete));
+            this.NoSpaceAfterUnaryPreincrementOperator = new Rule(RuleDescriptor.create3(SyntaxKind.PlusPlusToken, Shared.TokenRange.UnaryPreincrementExpressions), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
+            this.NoSpaceAfterUnaryPredecrementOperator = new Rule(RuleDescriptor.create3(SyntaxKind.MinusMinusToken, Shared.TokenRange.UnaryPredecrementExpressions), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
+            this.NoSpaceBeforeUnaryPostincrementOperator = new Rule(RuleDescriptor.create2(Shared.TokenRange.UnaryPostincrementExpressions, SyntaxKind.PlusPlusToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
+            this.NoSpaceBeforeUnaryPostdecrementOperator = new Rule(RuleDescriptor.create2(Shared.TokenRange.UnaryPostdecrementExpressions, SyntaxKind.MinusMinusToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
 
             // More unary operator special-casing.
             // DevDiv 181814:  Be careful when removing leading whitespace
             // around unary operators.  Examples:
             //      1 - -2  --X-->  1--2
             //      a + ++b --X-->  a+++b
-            this.SpaceAfterPostincrementWhenFollowedByAdd = new Rule(RuleDescriptor.create1(SyntaxKind.PlusPlusToken, SyntaxKind.PlusToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), RuleAction.Space));
-            this.SpaceAfterAddWhenFollowedByUnaryPlus = new Rule(RuleDescriptor.create1(SyntaxKind.PlusToken, SyntaxKind.PlusToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), RuleAction.Space));
-            this.SpaceAfterAddWhenFollowedByPreincrement = new Rule(RuleDescriptor.create1(SyntaxKind.PlusToken, SyntaxKind.PlusPlusToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), RuleAction.Space));
-            this.SpaceAfterPostdecrementWhenFollowedBySubtract = new Rule(RuleDescriptor.create1(SyntaxKind.MinusMinusToken, SyntaxKind.MinusToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), RuleAction.Space));
-            this.SpaceAfterSubtractWhenFollowedByUnaryMinus = new Rule(RuleDescriptor.create1(SyntaxKind.MinusToken, SyntaxKind.MinusToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), RuleAction.Space));
-            this.SpaceAfterSubtractWhenFollowedByPredecrement = new Rule(RuleDescriptor.create1(SyntaxKind.MinusToken, SyntaxKind.MinusMinusToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), RuleAction.Space));
+            this.SpaceAfterPostincrementWhenFollowedByAdd = new Rule(RuleDescriptor.create1(SyntaxKind.PlusPlusToken, SyntaxKind.PlusToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), RuleAction.Space));
+            this.SpaceAfterAddWhenFollowedByUnaryPlus = new Rule(RuleDescriptor.create1(SyntaxKind.PlusToken, SyntaxKind.PlusToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), RuleAction.Space));
+            this.SpaceAfterAddWhenFollowedByPreincrement = new Rule(RuleDescriptor.create1(SyntaxKind.PlusToken, SyntaxKind.PlusPlusToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), RuleAction.Space));
+            this.SpaceAfterPostdecrementWhenFollowedBySubtract = new Rule(RuleDescriptor.create1(SyntaxKind.MinusMinusToken, SyntaxKind.MinusToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), RuleAction.Space));
+            this.SpaceAfterSubtractWhenFollowedByUnaryMinus = new Rule(RuleDescriptor.create1(SyntaxKind.MinusToken, SyntaxKind.MinusToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), RuleAction.Space));
+            this.SpaceAfterSubtractWhenFollowedByPredecrement = new Rule(RuleDescriptor.create1(SyntaxKind.MinusToken, SyntaxKind.MinusMinusToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), RuleAction.Space));
 
-            this.NoSpaceBeforeComma = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.CommaToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
+            this.NoSpaceBeforeComma = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.CommaToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
 
-            this.SpaceAfterCertainKeywords = new Rule(RuleDescriptor.create4(Shared.TokenRange.FromTokens([SyntaxKind.VarKeyword, SyntaxKind.ThrowKeyword, SyntaxKind.NewKeyword, SyntaxKind.DeleteKeyword, SyntaxKind.ReturnKeyword, SyntaxKind.TypeOfKeyword, SyntaxKind.AwaitKeyword]), Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Space));
-            this.SpaceAfterLetConstInVariableDeclaration = new Rule(RuleDescriptor.create4(Shared.TokenRange.FromTokens([SyntaxKind.LetKeyword, SyntaxKind.ConstKeyword]), Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsStartOfVariableDeclarationList), RuleAction.Space));
-            this.NoSpaceBeforeOpenParenInFuncCall = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.OpenParenToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsFunctionCallOrNewContext, Rules.IsPreviousTokenNotComma), RuleAction.Delete));
+            this.SpaceAfterCertainKeywords = new Rule(RuleDescriptor.create4(Shared.TokenRange.FromTokens([SyntaxKind.VarKeyword, SyntaxKind.ThrowKeyword, SyntaxKind.NewKeyword, SyntaxKind.DeleteKeyword, SyntaxKind.ReturnKeyword, SyntaxKind.TypeOfKeyword, SyntaxKind.AwaitKeyword]), Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Space));
+            this.SpaceAfterLetConstInVariableDeclaration = new Rule(RuleDescriptor.create4(Shared.TokenRange.FromTokens([SyntaxKind.LetKeyword, SyntaxKind.ConstKeyword]), Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsStartOfVariableDeclarationList), RuleAction.Space));
+            this.NoSpaceBeforeOpenParenInFuncCall = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.OpenParenToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsFunctionCallOrNewContext, Rules.IsPreviousTokenNotComma), RuleAction.Delete));
             this.SpaceAfterFunctionInFuncDecl = new Rule(RuleDescriptor.create3(SyntaxKind.FunctionKeyword, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsFunctionDeclContext), RuleAction.Space));
-            this.NoSpaceBeforeOpenParenInFuncDecl = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.OpenParenToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsFunctionDeclContext), RuleAction.Delete));
-            this.SpaceAfterVoidOperator = new Rule(RuleDescriptor.create3(SyntaxKind.VoidKeyword, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsVoidOpContext), RuleAction.Space));
+            this.NoSpaceBeforeOpenParenInFuncDecl = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.OpenParenToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsFunctionDeclContext), RuleAction.Delete));
+            this.SpaceAfterVoidOperator = new Rule(RuleDescriptor.create3(SyntaxKind.VoidKeyword, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsVoidOpContext), RuleAction.Space));
 
-            this.NoSpaceBetweenReturnAndSemicolon = new Rule(RuleDescriptor.create1(SyntaxKind.ReturnKeyword, SyntaxKind.SemicolonToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
+            this.NoSpaceBetweenReturnAndSemicolon = new Rule(RuleDescriptor.create1(SyntaxKind.ReturnKeyword, SyntaxKind.SemicolonToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
 
             // Add a space between statements. All keywords except (do,else,case) has open/close parens after them.
             // So, we have a rule to add a space for [),Any], [do,Any], [else,Any], and [case,Any]
-            this.SpaceBetweenStatements = new Rule(RuleDescriptor.create4(Shared.TokenRange.FromTokens([SyntaxKind.CloseParenToken, SyntaxKind.DoKeyword, SyntaxKind.ElseKeyword, SyntaxKind.CaseKeyword]), Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotForContext), RuleAction.Space));
+            this.SpaceBetweenStatements = new Rule(RuleDescriptor.create4(Shared.TokenRange.FromTokens([SyntaxKind.CloseParenToken, SyntaxKind.DoKeyword, SyntaxKind.ElseKeyword, SyntaxKind.CaseKeyword]), Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotForContext), RuleAction.Space));
 
             // This low-pri rule takes care of "try {" and "finally {" in case the rule SpaceBeforeOpenBraceInControl didn't execute on FormatOnEnter.
-            this.SpaceAfterTryFinally = new Rule(RuleDescriptor.create2(Shared.TokenRange.FromTokens([SyntaxKind.TryKeyword, SyntaxKind.FinallyKeyword]), SyntaxKind.OpenBraceToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Space));
+            this.SpaceAfterTryFinally = new Rule(RuleDescriptor.create2(Shared.TokenRange.FromTokens([SyntaxKind.TryKeyword, SyntaxKind.FinallyKeyword]), SyntaxKind.OpenBraceToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Space));
 
             //      get x() {}
             //      set x(val) {}
             this.SpaceAfterGetSetInMember = new Rule(RuleDescriptor.create2(Shared.TokenRange.FromTokens([SyntaxKind.GetKeyword, SyntaxKind.SetKeyword]), SyntaxKind.Identifier), RuleOperation.create2(new RuleOperationContext(Rules.IsFunctionDeclContext), RuleAction.Space));
 
             // Special case for binary operators (that are keywords). For these we have to add a space and shouldn't follow any user options.
-            this.SpaceBeforeBinaryKeywordOperator = new Rule(RuleDescriptor.create4(Shared.TokenRange.Any, Shared.TokenRange.BinaryKeywordOperators), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), RuleAction.Space));
-            this.SpaceAfterBinaryKeywordOperator = new Rule(RuleDescriptor.create4(Shared.TokenRange.BinaryKeywordOperators, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), RuleAction.Space));
+            this.SpaceBeforeBinaryKeywordOperator = new Rule(RuleDescriptor.create4(Shared.TokenRange.Any, Shared.TokenRange.BinaryKeywordOperators), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), RuleAction.Space));
+            this.SpaceAfterBinaryKeywordOperator = new Rule(RuleDescriptor.create4(Shared.TokenRange.BinaryKeywordOperators, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), RuleAction.Space));
 
             // TypeScript-specific higher priority rules
 
             // Treat constructor as an identifier in a function declaration, and remove spaces between constructor and following left parentheses
-            this.NoSpaceAfterConstructor = new Rule(RuleDescriptor.create1(SyntaxKind.ConstructorKeyword, SyntaxKind.OpenParenToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
+            this.NoSpaceAfterConstructor = new Rule(RuleDescriptor.create1(SyntaxKind.ConstructorKeyword, SyntaxKind.OpenParenToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
 
             // Use of module as a function call. e.g.: import m2 = module("m2");
-            this.NoSpaceAfterModuleImport = new Rule(RuleDescriptor.create2(Shared.TokenRange.FromTokens([SyntaxKind.ModuleKeyword, SyntaxKind.RequireKeyword]), SyntaxKind.OpenParenToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
+            this.NoSpaceAfterModuleImport = new Rule(RuleDescriptor.create2(Shared.TokenRange.FromTokens([SyntaxKind.ModuleKeyword, SyntaxKind.RequireKeyword]), SyntaxKind.OpenParenToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
 
             // Add a space around certain TypeScript keywords
-            this.SpaceAfterCertainTypeScriptKeywords = new Rule(RuleDescriptor.create4(Shared.TokenRange.FromTokens([SyntaxKind.AbstractKeyword, SyntaxKind.ClassKeyword, SyntaxKind.DeclareKeyword, SyntaxKind.DefaultKeyword, SyntaxKind.EnumKeyword, SyntaxKind.ExportKeyword, SyntaxKind.ExtendsKeyword, SyntaxKind.GetKeyword, SyntaxKind.ImplementsKeyword, SyntaxKind.ImportKeyword, SyntaxKind.InterfaceKeyword, SyntaxKind.ModuleKeyword, SyntaxKind.NamespaceKeyword, SyntaxKind.PrivateKeyword, SyntaxKind.PublicKeyword, SyntaxKind.ProtectedKeyword, SyntaxKind.SetKeyword, SyntaxKind.StaticKeyword, SyntaxKind.TypeKeyword]), Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Space));
-            this.SpaceBeforeCertainTypeScriptKeywords = new Rule(RuleDescriptor.create4(Shared.TokenRange.Any, Shared.TokenRange.FromTokens([SyntaxKind.ExtendsKeyword, SyntaxKind.ImplementsKeyword])), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Space));
+            this.SpaceAfterCertainTypeScriptKeywords = new Rule(RuleDescriptor.create4(Shared.TokenRange.FromTokens([SyntaxKind.AbstractKeyword, SyntaxKind.ClassKeyword, SyntaxKind.DeclareKeyword, SyntaxKind.DefaultKeyword, SyntaxKind.EnumKeyword, SyntaxKind.ExportKeyword, SyntaxKind.ExtendsKeyword, SyntaxKind.GetKeyword, SyntaxKind.ImplementsKeyword, SyntaxKind.ImportKeyword, SyntaxKind.InterfaceKeyword, SyntaxKind.ModuleKeyword, SyntaxKind.NamespaceKeyword, SyntaxKind.PrivateKeyword, SyntaxKind.PublicKeyword, SyntaxKind.ProtectedKeyword, SyntaxKind.SetKeyword, SyntaxKind.StaticKeyword, SyntaxKind.TypeKeyword]), Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Space));
+            this.SpaceBeforeCertainTypeScriptKeywords = new Rule(RuleDescriptor.create4(Shared.TokenRange.Any, Shared.TokenRange.FromTokens([SyntaxKind.ExtendsKeyword, SyntaxKind.ImplementsKeyword])), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Space));
 
             // Treat string literals in module names as identifiers, and add a space between the literal and the opening Brace braces, e.g.: module "m2" {
             this.SpaceAfterModuleName = new Rule(RuleDescriptor.create1(SyntaxKind.StringLiteral, SyntaxKind.OpenBraceToken), RuleOperation.create2(new RuleOperationContext(Rules.IsModuleDeclContext), RuleAction.Space));
 
             // Lambda expressions
-            this.SpaceBeforeArrow = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.EqualsGreaterThanToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Space));
-            this.SpaceAfterArrow = new Rule(RuleDescriptor.create3(SyntaxKind.EqualsGreaterThanToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Space));
+            this.SpaceBeforeArrow = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.EqualsGreaterThanToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Space));
+            this.SpaceAfterArrow = new Rule(RuleDescriptor.create3(SyntaxKind.EqualsGreaterThanToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Space));
 
             // Optional parameters and let args
-            this.NoSpaceAfterEllipsis = new Rule(RuleDescriptor.create1(SyntaxKind.DotDotDotToken, SyntaxKind.Identifier), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
-            this.NoSpaceAfterOptionalParameters = new Rule(RuleDescriptor.create3(SyntaxKind.QuestionToken, Shared.TokenRange.FromTokens([SyntaxKind.CloseParenToken, SyntaxKind.CommaToken])), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNotBinaryOpContext), RuleAction.Delete));
+            this.NoSpaceAfterEllipsis = new Rule(RuleDescriptor.create1(SyntaxKind.DotDotDotToken, SyntaxKind.Identifier), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
+            this.NoSpaceAfterOptionalParameters = new Rule(RuleDescriptor.create3(SyntaxKind.QuestionToken, Shared.TokenRange.FromTokens([SyntaxKind.CloseParenToken, SyntaxKind.CommaToken])), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBinaryOpContext), RuleAction.Delete));
 
             // generics and type assertions
-            this.NoSpaceBeforeOpenAngularBracket = new Rule(RuleDescriptor.create2(Shared.TokenRange.TypeNames, SyntaxKind.LessThanToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), RuleAction.Delete));
-            this.NoSpaceBetweenCloseParenAndAngularBracket = new Rule(RuleDescriptor.create1(SyntaxKind.CloseParenToken, SyntaxKind.LessThanToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), RuleAction.Delete));
-            this.NoSpaceAfterOpenAngularBracket = new Rule(RuleDescriptor.create3(SyntaxKind.LessThanToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), RuleAction.Delete));
-            this.NoSpaceBeforeCloseAngularBracket = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.GreaterThanToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), RuleAction.Delete));
-            this.NoSpaceAfterCloseAngularBracket = new Rule(RuleDescriptor.create3(SyntaxKind.GreaterThanToken, Shared.TokenRange.FromTokens([SyntaxKind.OpenParenToken, SyntaxKind.OpenBracketToken, SyntaxKind.GreaterThanToken, SyntaxKind.CommaToken])), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), RuleAction.Delete));
-            this.NoSpaceAfterTypeAssertion = new Rule(RuleDescriptor.create3(SyntaxKind.GreaterThanToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsTypeAssertionContext), RuleAction.Delete));
+            this.NoSpaceBeforeOpenAngularBracket = new Rule(RuleDescriptor.create2(Shared.TokenRange.TypeNames, SyntaxKind.LessThanToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), RuleAction.Delete));
+            this.NoSpaceBetweenCloseParenAndAngularBracket = new Rule(RuleDescriptor.create1(SyntaxKind.CloseParenToken, SyntaxKind.LessThanToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), RuleAction.Delete));
+            this.NoSpaceAfterOpenAngularBracket = new Rule(RuleDescriptor.create3(SyntaxKind.LessThanToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), RuleAction.Delete));
+            this.NoSpaceBeforeCloseAngularBracket = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.GreaterThanToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), RuleAction.Delete));
+            this.NoSpaceAfterCloseAngularBracket = new Rule(RuleDescriptor.create3(SyntaxKind.GreaterThanToken, Shared.TokenRange.FromTokens([SyntaxKind.OpenParenToken, SyntaxKind.OpenBracketToken, SyntaxKind.GreaterThanToken, SyntaxKind.CommaToken])), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), RuleAction.Delete));
+            this.NoSpaceAfterTypeAssertion = new Rule(RuleDescriptor.create3(SyntaxKind.GreaterThanToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeAssertionContext), RuleAction.Delete));
 
             // Remove spaces in empty interface literals. e.g.: x: {}
-            this.NoSpaceBetweenEmptyInterfaceBraceBrackets = new Rule(RuleDescriptor.create1(SyntaxKind.OpenBraceToken, SyntaxKind.CloseBraceToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsObjectTypeContext), RuleAction.Delete));
+            this.NoSpaceBetweenEmptyInterfaceBraceBrackets = new Rule(RuleDescriptor.create1(SyntaxKind.OpenBraceToken, SyntaxKind.CloseBraceToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsObjectTypeContext), RuleAction.Delete));
 
             // decorators
-            this.SpaceBeforeAt = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.AtToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Space));
-            this.NoSpaceAfterAt = new Rule(RuleDescriptor.create3(SyntaxKind.AtToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
+            this.SpaceBeforeAt = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.AtToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Space));
+            this.NoSpaceAfterAt = new Rule(RuleDescriptor.create3(SyntaxKind.AtToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
             this.SpaceAfterDecorator = new Rule(RuleDescriptor.create4(Shared.TokenRange.Any, Shared.TokenRange.FromTokens([SyntaxKind.AbstractKeyword, SyntaxKind.Identifier, SyntaxKind.ExportKeyword, SyntaxKind.DefaultKeyword, SyntaxKind.ClassKeyword, SyntaxKind.StaticKeyword, SyntaxKind.PublicKeyword, SyntaxKind.PrivateKeyword, SyntaxKind.ProtectedKeyword, SyntaxKind.GetKeyword, SyntaxKind.SetKeyword, SyntaxKind.OpenBracketToken, SyntaxKind.AsteriskToken])), RuleOperation.create2(new RuleOperationContext(Rules.IsEndOfDecoratorContextOnSameLine), RuleAction.Space));
 
             this.NoSpaceBetweenFunctionKeywordAndStar = new Rule(RuleDescriptor.create1(SyntaxKind.FunctionKeyword, SyntaxKind.AsteriskToken), RuleOperation.create2(new RuleOperationContext(Rules.IsFunctionDeclarationOrFunctionExpressionContext), RuleAction.Delete));
             this.SpaceAfterStarInGeneratorDeclaration = new Rule(RuleDescriptor.create3(SyntaxKind.AsteriskToken, Shared.TokenRange.FromTokens([SyntaxKind.Identifier, SyntaxKind.OpenParenToken])), RuleOperation.create2(new RuleOperationContext(Rules.IsFunctionDeclarationOrFunctionExpressionContext), RuleAction.Space));
-            this.NoSpaceBetweenYieldKeywordAndStar = new Rule(RuleDescriptor.create1(SyntaxKind.YieldKeyword, SyntaxKind.AsteriskToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsYieldOrYieldStarWithOperand), RuleAction.Delete));
-            this.SpaceBetweenYieldOrYieldStarAndOperand = new Rule(RuleDescriptor.create4(Shared.TokenRange.FromTokens([SyntaxKind.YieldKeyword, SyntaxKind.AsteriskToken]), Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsYieldOrYieldStarWithOperand), RuleAction.Space));
+            this.NoSpaceBetweenYieldKeywordAndStar = new Rule(RuleDescriptor.create1(SyntaxKind.YieldKeyword, SyntaxKind.AsteriskToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsYieldOrYieldStarWithOperand), RuleAction.Delete));
+            this.SpaceBetweenYieldOrYieldStarAndOperand = new Rule(RuleDescriptor.create4(Shared.TokenRange.FromTokens([SyntaxKind.YieldKeyword, SyntaxKind.AsteriskToken]), Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsYieldOrYieldStarWithOperand), RuleAction.Space));
 
             // Async-await
-            this.SpaceBetweenAsyncAndOpenParen = new Rule(RuleDescriptor.create1(SyntaxKind.AsyncKeyword, SyntaxKind.OpenParenToken), RuleOperation.create2(new RuleOperationContext(Rules.IsArrowFunctionContext, Rules.IsSameLineTokenContext), RuleAction.Space));
-            this.SpaceBetweenAsyncAndFunctionKeyword = new Rule(RuleDescriptor.create1(SyntaxKind.AsyncKeyword, SyntaxKind.FunctionKeyword), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Space));
+            this.SpaceBetweenAsyncAndOpenParen = new Rule(RuleDescriptor.create1(SyntaxKind.AsyncKeyword, SyntaxKind.OpenParenToken), RuleOperation.create2(new RuleOperationContext(Rules.IsArrowFunctionContext, Rules.IsNonJsxSameLineTokenContext), RuleAction.Space));
+            this.SpaceBetweenAsyncAndFunctionKeyword = new Rule(RuleDescriptor.create1(SyntaxKind.AsyncKeyword, SyntaxKind.FunctionKeyword), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Space));
 
             // template string
-            this.NoSpaceBetweenTagAndTemplateString = new Rule(RuleDescriptor.create3(SyntaxKind.Identifier, Shared.TokenRange.FromTokens([SyntaxKind.NoSubstitutionTemplateLiteral, SyntaxKind.TemplateHead])), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
+            this.NoSpaceBetweenTagAndTemplateString = new Rule(RuleDescriptor.create3(SyntaxKind.Identifier, Shared.TokenRange.FromTokens([SyntaxKind.NoSubstitutionTemplateLiteral, SyntaxKind.TemplateHead])), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
 
             // These rules are higher in priority than user-configurable rules.
             this.HighPriorityCommonRules = [
@@ -444,14 +444,14 @@ namespace ts.formatting {
             ///
 
             // Insert space after comma delimiter
-            this.SpaceAfterComma = new Rule(RuleDescriptor.create3(SyntaxKind.CommaToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsNextTokenNotCloseBracket), RuleAction.Space));
-            this.NoSpaceAfterComma = new Rule(RuleDescriptor.create3(SyntaxKind.CommaToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
+            this.SpaceAfterComma = new Rule(RuleDescriptor.create3(SyntaxKind.CommaToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNextTokenNotCloseBracket), RuleAction.Space));
+            this.NoSpaceAfterComma = new Rule(RuleDescriptor.create3(SyntaxKind.CommaToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
 
             // Insert space before and after binary operators
-            this.SpaceBeforeBinaryOperator = new Rule(RuleDescriptor.create4(Shared.TokenRange.Any, Shared.TokenRange.BinaryOperators), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), RuleAction.Space));
-            this.SpaceAfterBinaryOperator = new Rule(RuleDescriptor.create4(Shared.TokenRange.BinaryOperators, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), RuleAction.Space));
-            this.NoSpaceBeforeBinaryOperator = new Rule(RuleDescriptor.create4(Shared.TokenRange.Any, Shared.TokenRange.BinaryOperators), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), RuleAction.Delete));
-            this.NoSpaceAfterBinaryOperator = new Rule(RuleDescriptor.create4(Shared.TokenRange.BinaryOperators, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsBinaryOpContext), RuleAction.Delete));
+            this.SpaceBeforeBinaryOperator = new Rule(RuleDescriptor.create4(Shared.TokenRange.Any, Shared.TokenRange.BinaryOperators), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), RuleAction.Space));
+            this.SpaceAfterBinaryOperator = new Rule(RuleDescriptor.create4(Shared.TokenRange.BinaryOperators, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), RuleAction.Space));
+            this.NoSpaceBeforeBinaryOperator = new Rule(RuleDescriptor.create4(Shared.TokenRange.Any, Shared.TokenRange.BinaryOperators), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), RuleAction.Delete));
+            this.NoSpaceAfterBinaryOperator = new Rule(RuleDescriptor.create4(Shared.TokenRange.BinaryOperators, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), RuleAction.Delete));
 
             // Insert space after keywords in control flow statements
             this.SpaceAfterKeywordInControl = new Rule(RuleDescriptor.create2(Shared.TokenRange.Keywords, SyntaxKind.OpenParenToken), RuleOperation.create2(new RuleOperationContext(Rules.IsControlDeclContext), RuleAction.Space));
@@ -468,28 +468,28 @@ namespace ts.formatting {
             this.NewLineBeforeOpenBraceInControl = new Rule(RuleDescriptor.create2(this.ControlOpenBraceLeftTokenRange, SyntaxKind.OpenBraceToken), RuleOperation.create2(new RuleOperationContext(Rules.IsControlDeclContext, Rules.IsBeforeMultilineBlockContext), RuleAction.NewLine), RuleFlags.CanDeleteNewLines);
 
             // Insert space after semicolon in for statement
-            this.SpaceAfterSemicolonInFor = new Rule(RuleDescriptor.create3(SyntaxKind.SemicolonToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsForContext), RuleAction.Space));
-            this.NoSpaceAfterSemicolonInFor = new Rule(RuleDescriptor.create3(SyntaxKind.SemicolonToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext, Rules.IsForContext), RuleAction.Delete));
+            this.SpaceAfterSemicolonInFor = new Rule(RuleDescriptor.create3(SyntaxKind.SemicolonToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsForContext), RuleAction.Space));
+            this.NoSpaceAfterSemicolonInFor = new Rule(RuleDescriptor.create3(SyntaxKind.SemicolonToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsForContext), RuleAction.Delete));
 
             // Insert space after opening and before closing nonempty parenthesis
-            this.SpaceAfterOpenParen = new Rule(RuleDescriptor.create3(SyntaxKind.OpenParenToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Space));
-            this.SpaceBeforeCloseParen = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.CloseParenToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Space));
-            this.NoSpaceBetweenParens = new Rule(RuleDescriptor.create1(SyntaxKind.OpenParenToken, SyntaxKind.CloseParenToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
-            this.NoSpaceAfterOpenParen = new Rule(RuleDescriptor.create3(SyntaxKind.OpenParenToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
-            this.NoSpaceBeforeCloseParen = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.CloseParenToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
+            this.SpaceAfterOpenParen = new Rule(RuleDescriptor.create3(SyntaxKind.OpenParenToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Space));
+            this.SpaceBeforeCloseParen = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.CloseParenToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Space));
+            this.NoSpaceBetweenParens = new Rule(RuleDescriptor.create1(SyntaxKind.OpenParenToken, SyntaxKind.CloseParenToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
+            this.NoSpaceAfterOpenParen = new Rule(RuleDescriptor.create3(SyntaxKind.OpenParenToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
+            this.NoSpaceBeforeCloseParen = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.CloseParenToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
 
             // Insert space after opening and before closing nonempty brackets
-            this.SpaceAfterOpenBracket = new Rule(RuleDescriptor.create3(SyntaxKind.OpenBracketToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Space));
-            this.SpaceBeforeCloseBracket = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.CloseBracketToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Space));
-            this.NoSpaceBetweenBrackets = new Rule(RuleDescriptor.create1(SyntaxKind.OpenBracketToken, SyntaxKind.CloseBracketToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
-            this.NoSpaceAfterOpenBracket = new Rule(RuleDescriptor.create3(SyntaxKind.OpenBracketToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
-            this.NoSpaceBeforeCloseBracket = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.CloseBracketToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
+            this.SpaceAfterOpenBracket = new Rule(RuleDescriptor.create3(SyntaxKind.OpenBracketToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Space));
+            this.SpaceBeforeCloseBracket = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.CloseBracketToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Space));
+            this.NoSpaceBetweenBrackets = new Rule(RuleDescriptor.create1(SyntaxKind.OpenBracketToken, SyntaxKind.CloseBracketToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
+            this.NoSpaceAfterOpenBracket = new Rule(RuleDescriptor.create3(SyntaxKind.OpenBracketToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
+            this.NoSpaceBeforeCloseBracket = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.CloseBracketToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
 
             // Insert space after opening and before closing template string braces
-            this.NoSpaceAfterTemplateHeadAndMiddle = new Rule(RuleDescriptor.create4(Shared.TokenRange.FromTokens([SyntaxKind.TemplateHead, SyntaxKind.TemplateMiddle]), Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
-            this.SpaceAfterTemplateHeadAndMiddle = new Rule(RuleDescriptor.create4(Shared.TokenRange.FromTokens([SyntaxKind.TemplateHead, SyntaxKind.TemplateMiddle]), Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Space));
-            this.NoSpaceBeforeTemplateMiddleAndTail = new Rule(RuleDescriptor.create4(Shared.TokenRange.Any, Shared.TokenRange.FromTokens([SyntaxKind.TemplateMiddle, SyntaxKind.TemplateTail])), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
-            this.SpaceBeforeTemplateMiddleAndTail = new Rule(RuleDescriptor.create4(Shared.TokenRange.Any, Shared.TokenRange.FromTokens([SyntaxKind.TemplateMiddle, SyntaxKind.TemplateTail])), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Space));
+            this.NoSpaceAfterTemplateHeadAndMiddle = new Rule(RuleDescriptor.create4(Shared.TokenRange.FromTokens([SyntaxKind.TemplateHead, SyntaxKind.TemplateMiddle]), Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
+            this.SpaceAfterTemplateHeadAndMiddle = new Rule(RuleDescriptor.create4(Shared.TokenRange.FromTokens([SyntaxKind.TemplateHead, SyntaxKind.TemplateMiddle]), Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Space));
+            this.NoSpaceBeforeTemplateMiddleAndTail = new Rule(RuleDescriptor.create4(Shared.TokenRange.Any, Shared.TokenRange.FromTokens([SyntaxKind.TemplateMiddle, SyntaxKind.TemplateTail])), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
+            this.SpaceBeforeTemplateMiddleAndTail = new Rule(RuleDescriptor.create4(Shared.TokenRange.Any, Shared.TokenRange.FromTokens([SyntaxKind.TemplateMiddle, SyntaxKind.TemplateTail])), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Space));
 
             // Insert space after function keyword for anonymous functions
             this.SpaceAfterAnonymousFunctionKeyword = new Rule(RuleDescriptor.create1(SyntaxKind.FunctionKeyword, SyntaxKind.OpenParenToken), RuleOperation.create2(new RuleOperationContext(Rules.IsFunctionDeclContext), RuleAction.Space));
@@ -561,13 +561,13 @@ namespace ts.formatting {
             //// Ex:
             //// if (1)
             //// { ... }
-            ////      * ) and { are on differnet lines. We only need to format if the block is multiline context. So in this case we don't format.
+            ////      * ) and { are on different lines. We only need to format if the block is multiline context. So in this case we don't format.
             ////
             //// Ex:
             //// if (1)
             //// { ...
             //// }
-            ////      * ) and { are on differnet lines. We only need to format if the block is multiline context. So in this case we format.
+            ////      * ) and { are on different lines. We only need to format if the block is multiline context. So in this case we format.
 
             return context.TokensAreOnSameLine() || Rules.IsBeforeMultilineBlockContext(context);
         }
@@ -719,8 +719,8 @@ namespace ts.formatting {
             return context.contextNode.kind === SyntaxKind.ArrowFunction;
         }
 
-        static IsSameLineTokenContext(context: FormattingContext): boolean {
-            return context.TokensAreOnSameLine();
+        static IsNonJsxSameLineTokenContext(context: FormattingContext): boolean {
+            return context.TokensAreOnSameLine() && context.contextNode.kind !== SyntaxKind.JsxText;
         }
 
         static IsNotBeforeBlockInFunctionDeclarationContext(context: FormattingContext): boolean {
diff --git a/src/services/jsTyping.ts b/src/services/jsTyping.ts
new file mode 100644
index 00000000000..943693bf52e
--- /dev/null
+++ b/src/services/jsTyping.ts
@@ -0,0 +1,227 @@
+// Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0.
+// See LICENSE.txt in the project root for complete license information.
+
+/// <reference path='services.ts' />
+
+/* @internal */
+namespace ts.JsTyping {
+
+    export interface TypingResolutionHost {
+        directoryExists: (path: string) => boolean;
+        fileExists: (fileName: string) => boolean;
+        readFile: (path: string, encoding?: string) => string;
+        readDirectory: (path: string, extension?: string, exclude?: string[], depth?: number) => string[];
+    };
+
+    interface PackageJson {
+        _requiredBy?: string[];
+        dependencies?: Map<string>;
+        devDependencies?: Map<string>;
+        name?: string;
+        optionalDependencies?: Map<string>;
+        peerDependencies?: Map<string>;
+        typings?: string;
+    };
+
+    // A map of loose file names to library names
+    // that we are confident require typings
+    let safeList: Map<string>;
+
+    /**
+     * @param host is the object providing I/O related operations.
+     * @param fileNames are the file names that belong to the same project
+     * @param projectRootPath is the path to the project root directory
+     * @param safeListPath is the path used to retrieve the safe list
+     * @param packageNameToTypingLocation is the map of package names to their cached typing locations
+     * @param typingOptions are used to customize the typing inference process
+     * @param compilerOptions are used as a source for typing inference
+     */
+    export function discoverTypings(
+        host: TypingResolutionHost,
+        fileNames: string[],
+        projectRootPath: Path,
+        safeListPath: Path,
+        packageNameToTypingLocation: Map<string>,
+        typingOptions: TypingOptions,
+        compilerOptions: CompilerOptions):
+        { cachedTypingPaths: string[], newTypingNames: string[], filesToWatch: string[] } {
+
+        // A typing name to typing file path mapping
+        const inferredTypings: Map<string> = {};
+
+        if (!typingOptions || !typingOptions.enableAutoDiscovery) {
+            return { cachedTypingPaths: [], newTypingNames: [], filesToWatch: [] };
+        }
+
+        // Only infer typings for .js and .jsx files
+        fileNames = filter(map(fileNames, normalizePath), f => scriptKindIs(f, /*LanguageServiceHost*/ undefined, ScriptKind.JS, ScriptKind.JSX));
+
+        if (!safeList) {
+            const result = readConfigFile(safeListPath, (path: string) => host.readFile(path));
+            if (result.config) {
+                safeList = result.config;
+            }
+            else {
+                safeList = {};
+            };
+        }
+
+        const filesToWatch: string[] = [];
+        // Directories to search for package.json, bower.json and other typing information
+        let searchDirs: string[] = [];
+        let exclude: string[] = [];
+
+        mergeTypings(typingOptions.include);
+        exclude = typingOptions.exclude || [];
+
+        const possibleSearchDirs = map(fileNames, getDirectoryPath);
+        if (projectRootPath !== undefined) {
+            possibleSearchDirs.push(projectRootPath);
+        }
+        searchDirs = deduplicate(possibleSearchDirs);
+        for (const searchDir of searchDirs) {
+            const packageJsonPath = combinePaths(searchDir, "package.json");
+            getTypingNamesFromJson(packageJsonPath, filesToWatch);
+
+            const bowerJsonPath = combinePaths(searchDir, "bower.json");
+            getTypingNamesFromJson(bowerJsonPath, filesToWatch);
+
+            const nodeModulesPath = combinePaths(searchDir, "node_modules");
+            getTypingNamesFromNodeModuleFolder(nodeModulesPath);
+        }
+        getTypingNamesFromSourceFileNames(fileNames);
+
+        // Add the cached typing locations for inferred typings that are already installed
+        for (const name in packageNameToTypingLocation) {
+            if (hasProperty(inferredTypings, name) && !inferredTypings[name]) {
+                inferredTypings[name] = packageNameToTypingLocation[name];
+            }
+        }
+
+        // Remove typings that the user has added to the exclude list
+        for (const excludeTypingName of exclude) {
+            delete inferredTypings[excludeTypingName];
+        }
+
+        const newTypingNames: string[] = [];
+        const cachedTypingPaths: string[] = [];
+        for (const typing in inferredTypings) {
+            if (inferredTypings[typing] !== undefined) {
+                cachedTypingPaths.push(inferredTypings[typing]);
+            }
+            else {
+                newTypingNames.push(typing);
+            }
+        }
+        return { cachedTypingPaths, newTypingNames, filesToWatch };
+
+        /**
+         * Merge a given list of typingNames to the inferredTypings map
+         */
+        function mergeTypings(typingNames: string[]) {
+            if (!typingNames) {
+                return;
+            }
+
+            for (const typing of typingNames) {
+                if (!hasProperty(inferredTypings, typing)) {
+                    inferredTypings[typing] = undefined;
+                }
+            }
+        }
+
+        /**
+         * Get the typing info from common package manager json files like package.json or bower.json
+         */
+        function getTypingNamesFromJson(jsonPath: string, filesToWatch: string[]) {
+            const result = readConfigFile(jsonPath, (path: string) => host.readFile(path));
+            if (result.config) {
+                const jsonConfig: PackageJson = result.config;
+                filesToWatch.push(jsonPath);
+                if (jsonConfig.dependencies) {
+                    mergeTypings(getKeys(jsonConfig.dependencies));
+                }
+                if (jsonConfig.devDependencies) {
+                    mergeTypings(getKeys(jsonConfig.devDependencies));
+                }
+                if (jsonConfig.optionalDependencies) {
+                    mergeTypings(getKeys(jsonConfig.optionalDependencies));
+                }
+                if (jsonConfig.peerDependencies) {
+                    mergeTypings(getKeys(jsonConfig.peerDependencies));
+                }
+            }
+        }
+
+        /**
+         * Infer typing names from given file names. For example, the file name "jquery-min.2.3.4.js"
+         * should be inferred to the 'jquery' typing name; and "angular-route.1.2.3.js" should be inferred
+         * to the 'angular-route' typing name.
+         * @param fileNames are the names for source files in the project
+         */
+        function getTypingNamesFromSourceFileNames(fileNames: string[]) {
+            const jsFileNames = filter(fileNames, hasJavaScriptFileExtension);
+            const inferredTypingNames = map(jsFileNames, f => removeFileExtension(getBaseFileName(f.toLowerCase())));
+            const cleanedTypingNames = map(inferredTypingNames, f => f.replace(/((?:\.|-)min(?=\.|$))|((?:-|\.)\d+)/g, ""));
+            if (safeList === undefined) {
+                mergeTypings(cleanedTypingNames);
+            }
+            else {
+                mergeTypings(filter(cleanedTypingNames, f => hasProperty(safeList, f)));
+            }
+
+            const hasJsxFile = forEach(fileNames, f => scriptKindIs(f, /*LanguageServiceHost*/ undefined, ScriptKind.JSX));
+            if (hasJsxFile) {
+                mergeTypings(["react"]);
+            }
+        }
+
+        /**
+         * Infer typing names from node_module folder
+         * @param nodeModulesPath is the path to the "node_modules" folder
+         */
+        function getTypingNamesFromNodeModuleFolder(nodeModulesPath: string) {
+            // Todo: add support for ModuleResolutionHost too
+            if (!host.directoryExists(nodeModulesPath)) {
+                return;
+            }
+
+            const typingNames: string[] = [];
+            const fileNames = host.readDirectory(nodeModulesPath, "*.json", /*exclude*/ undefined, /*depth*/ 2);
+            for (const fileName of fileNames) {
+                const normalizedFileName = normalizePath(fileName);
+                if (getBaseFileName(normalizedFileName) !== "package.json") {
+                    continue;
+                }
+                const result = readConfigFile(normalizedFileName, (path: string) => host.readFile(path));
+                if (!result.config) {
+                    continue;
+                }
+                const packageJson: PackageJson = result.config;
+
+                // npm 3's package.json contains a "_requiredBy" field
+                // we should include all the top level module names for npm 2, and only module names whose
+                // "_requiredBy" field starts with "#" or equals "/" for npm 3.
+                if (packageJson._requiredBy &&
+                    filter(packageJson._requiredBy, (r: string) => r[0] === "#" || r === "/").length === 0) {
+                    continue;
+                }
+
+                // If the package has its own d.ts typings, those will take precedence. Otherwise the package name will be used
+                // to download d.ts files from DefinitelyTyped
+                if (!packageJson.name) {
+                    continue;
+                }
+                if (packageJson.typings) {
+                    const absolutePath = getNormalizedAbsolutePath(packageJson.typings, getDirectoryPath(normalizedFileName));
+                    inferredTypings[packageJson.name] = absolutePath;
+                }
+                else {
+                    typingNames.push(packageJson.name);
+                }
+            }
+            mergeTypings(typingNames);
+        }
+
+    }
+}
diff --git a/src/services/navigationBar.ts b/src/services/navigationBar.ts
index f62c6cb1700..57cc471b545 100644
--- a/src/services/navigationBar.ts
+++ b/src/services/navigationBar.ts
@@ -3,6 +3,12 @@
 /* @internal */
 namespace ts.NavigationBar {
     export function getNavigationBarItems(sourceFile: SourceFile, compilerOptions: CompilerOptions): ts.NavigationBarItem[]  {
+        // TODO: Handle JS files differently in 'navbar' calls for now, but ideally we should unify
+        // the 'navbar' and 'navto' logic for TypeScript and JavaScript.
+        if (isSourceFileJavaScript(sourceFile)) {
+            return getJsNavigationBarItems(sourceFile, compilerOptions);
+        }
+
         // If the source file has any child items, then it included in the tree
         // and takes lexical ownership of all other top-level items.
         let hasGlobalNode = false;
@@ -130,7 +136,7 @@ namespace ts.NavigationBar {
 
             return topLevelNodes;
         }
-         
+
         function sortNodes(nodes: Node[]): Node[] {
             return nodes.slice(0).sort((n1: Declaration, n2: Declaration) => {
                 if (n1.name && n2.name) {
@@ -147,13 +153,27 @@ namespace ts.NavigationBar {
                 }
             });
         }
-        
+
         function addTopLevelNodes(nodes: Node[], topLevelNodes: Node[]): void {
             nodes = sortNodes(nodes);
 
             for (let node of nodes) {
                 switch (node.kind) {
                     case SyntaxKind.ClassDeclaration:
+                        topLevelNodes.push(node);
+                        for (const member of (<ClassDeclaration>node).members) {
+                            if (member.kind === SyntaxKind.MethodDeclaration || member.kind === SyntaxKind.Constructor) {
+                                type FunctionLikeMember = MethodDeclaration | ConstructorDeclaration;
+                                if ((<FunctionLikeMember>member).body) {
+                                    // We do not include methods that does not have child functions in it, because of duplications.
+                                    if (hasNamedFunctionDeclarations((<Block>(<FunctionLikeMember>member).body).statements)) {
+                                        topLevelNodes.push(member);
+                                    }
+                                    addTopLevelNodes((<Block>(<MethodDeclaration>member).body).statements, topLevelNodes);
+                                }
+                            }
+                        }
+                        break;
                     case SyntaxKind.EnumDeclaration:
                     case SyntaxKind.InterfaceDeclaration:
                         topLevelNodes.push(node);
@@ -176,29 +196,46 @@ namespace ts.NavigationBar {
             }
         }
 
-        function isTopLevelFunctionDeclaration(functionDeclaration: FunctionLikeDeclaration) {
+        function hasNamedFunctionDeclarations(nodes: NodeArray<Statement>): boolean {
+            for (let s of nodes) {
+                if (s.kind === SyntaxKind.FunctionDeclaration && !isEmpty((<FunctionDeclaration>s).name.text)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        function isTopLevelFunctionDeclaration(functionDeclaration: FunctionLikeDeclaration): boolean {
             if (functionDeclaration.kind === SyntaxKind.FunctionDeclaration) {
-                // A function declaration is 'top level' if it contains any function declarations 
-                // within it. 
+                // A function declaration is 'top level' if it contains any function declarations
+                // within it.
                 if (functionDeclaration.body && functionDeclaration.body.kind === SyntaxKind.Block) {
                     // Proper function declarations can only have identifier names
-                    if (forEach((<Block>functionDeclaration.body).statements,
-                        s => s.kind === SyntaxKind.FunctionDeclaration && !isEmpty((<FunctionDeclaration>s).name.text))) {
-
+                    if (hasNamedFunctionDeclarations((<Block>functionDeclaration.body).statements)) {
                         return true;
                     }
 
-                    // Or if it is not parented by another function.  i.e all functions
-                    // at module scope are 'top level'.
+                    // Or if it is not parented by another function. I.e all functions at module scope are 'top level'.
                     if (!isFunctionBlock(functionDeclaration.parent)) {
                         return true;
                     }
+
+                    // Or if it is nested inside class methods and constructors.
+                    else {
+                        // We have made sure that a grand parent node exists with 'isFunctionBlock()' above.
+                        const grandParentKind = functionDeclaration.parent.parent.kind;
+                        if (grandParentKind === SyntaxKind.MethodDeclaration ||
+                            grandParentKind === SyntaxKind.Constructor) {
+
+                            return true;
+                        }
+                    }
                 }
             }
 
             return false;
         }
-        
+
         function getItemsWorker(nodes: Node[], createItem: (n: Node) => ts.NavigationBarItem): ts.NavigationBarItem[] {
             let items: ts.NavigationBarItem[] = [];
 
@@ -258,7 +295,7 @@ namespace ts.NavigationBar {
                     if (isBindingPattern((<ParameterDeclaration>node).name)) {
                         break;
                     }
-                    if ((node.flags & NodeFlags.Modifier) === 0) {
+                    if (!hasModifiers(node)) {
                         return undefined;
                     }
                     return createItem(node, getTextOfNode((<ParameterDeclaration>node).name), ts.ScriptElementKind.memberVariableElement);
@@ -370,11 +407,15 @@ namespace ts.NavigationBar {
                 case SyntaxKind.ClassDeclaration:
                     return createClassItem(<ClassDeclaration>node);
 
+                case SyntaxKind.MethodDeclaration:
+                case SyntaxKind.Constructor:
+                    return createMemberFunctionLikeItem(<MethodDeclaration | ConstructorDeclaration>node);
+
                 case SyntaxKind.EnumDeclaration:
                     return createEnumItem(<EnumDeclaration>node);
 
                 case SyntaxKind.InterfaceDeclaration:
-                    return createIterfaceItem(<InterfaceDeclaration>node);
+                    return createInterfaceItem(<InterfaceDeclaration>node);
 
                 case SyntaxKind.ModuleDeclaration:
                     return createModuleItem(<ModuleDeclaration>node);
@@ -395,19 +436,19 @@ namespace ts.NavigationBar {
                 let result: string[] = [];
 
                 result.push(moduleDeclaration.name.text);
-                
+
                 while (moduleDeclaration.body && moduleDeclaration.body.kind === SyntaxKind.ModuleDeclaration) {
                     moduleDeclaration = <ModuleDeclaration>moduleDeclaration.body;
 
                     result.push(moduleDeclaration.name.text);
-                } 
+                }
 
                 return result.join(".");
             }
 
             function createModuleItem(node: ModuleDeclaration): NavigationBarItem {
                 let moduleName = getModuleName(node);
-                
+
                 let childItems = getItemsWorker(getChildNodes((<Block>getInnermostModule(node).body).statements), createChildItem);
 
                 return getNavigationBarItem(moduleName,
@@ -418,11 +459,11 @@ namespace ts.NavigationBar {
                     getIndent(node));
             }
 
-            function createFunctionItem(node: FunctionDeclaration) {
+            function createFunctionItem(node: FunctionDeclaration): ts.NavigationBarItem  {
                 if (node.body && node.body.kind === SyntaxKind.Block) {
                     let childItems = getItemsWorker(sortNodes((<Block>node.body).statements), createChildItem);
 
-                    return getNavigationBarItem(!node.name ? "default": node.name.text ,
+                    return getNavigationBarItem(!node.name ? "default": node.name.text,
                         ts.ScriptElementKind.functionElement,
                         getNodeModifiers(node),
                         [getNodeSpan(node)],
@@ -433,6 +474,31 @@ namespace ts.NavigationBar {
                 return undefined;
             }
 
+            function createMemberFunctionLikeItem(node: MethodDeclaration | ConstructorDeclaration): ts.NavigationBarItem  {
+                if (node.body && node.body.kind === SyntaxKind.Block) {
+                    let childItems = getItemsWorker(sortNodes((<Block>node.body).statements), createChildItem);
+                    let scriptElementKind: string;
+                    let memberFunctionName: string;
+                    if (node.kind === SyntaxKind.MethodDeclaration) {
+                        memberFunctionName = getPropertyNameForPropertyNameNode(node.name);
+                        scriptElementKind = ts.ScriptElementKind.memberFunctionElement;
+                    }
+                    else {
+                        memberFunctionName = "constructor";
+                        scriptElementKind = ts.ScriptElementKind.constructorImplementationElement;
+                    }
+
+                    return getNavigationBarItem(memberFunctionName,
+                        scriptElementKind,
+                        getNodeModifiers(node),
+                        [getNodeSpan(node)],
+                        childItems,
+                        getIndent(node));
+                }
+
+                return undefined;
+            }
+
             function createSourceFileItem(node: SourceFile): ts.NavigationBarItem {
                 let childItems = getItemsWorker(getChildNodes(node.statements), createChildItem);
 
@@ -493,7 +559,7 @@ namespace ts.NavigationBar {
                     getIndent(node));
             }
 
-            function createIterfaceItem(node: InterfaceDeclaration): ts.NavigationBarItem {
+            function createInterfaceItem(node: InterfaceDeclaration): ts.NavigationBarItem {
                 let childItems = getItemsWorker(sortNodes(removeDynamicallyNamedProperties(node)), createChildItem);
                 return getNavigationBarItem(
                     node.name.text,
@@ -534,4 +600,206 @@ namespace ts.NavigationBar {
             return getTextOfNodeFromSourceText(sourceFile.text, node);
         }
     }
-}
\ No newline at end of file
+
+    export function getJsNavigationBarItems(sourceFile: SourceFile, compilerOptions: CompilerOptions): NavigationBarItem[] {
+        const anonFnText = "<function>";
+        const anonClassText = "<class>";
+        let indent = 0;
+
+        let rootName = isExternalModule(sourceFile) ?
+            "\"" + escapeString(getBaseFileName(removeFileExtension(normalizePath(sourceFile.fileName)))) + "\""
+            : "<global>";
+
+        let sourceFileItem = getNavBarItem(rootName, ScriptElementKind.moduleElement, [getNodeSpan(sourceFile)]);
+        let topItem = sourceFileItem;
+
+        // Walk the whole file, because we want to also find function expressions - which may be in variable initializer,
+        // call arguments, expressions, etc...
+        forEachChild(sourceFile, visitNode);
+
+        function visitNode(node: Node) {
+            const newItem = createNavBarItem(node);
+
+            if (newItem) {
+                topItem.childItems.push(newItem);
+            }
+
+            // Add a level if traversing into a container
+            if (newItem && (isFunctionLike(node) || isClassLike(node))) {
+                const lastTop = topItem;
+                indent++;
+                topItem = newItem;
+                forEachChild(node, visitNode);
+                topItem = lastTop;
+                indent--;
+
+                // If the last item added was an anonymous function expression, and it had no children, discard it.
+                if (newItem && newItem.text === anonFnText && newItem.childItems.length === 0) {
+                    topItem.childItems.pop();
+                }
+            }
+            else {
+                forEachChild(node, visitNode);
+            }
+        }
+
+        function createNavBarItem(node: Node) : NavigationBarItem {
+            switch (node.kind) {
+                case SyntaxKind.VariableDeclaration:
+                    // Only add to the navbar if at the top-level of the file
+                    // Note: "const" and "let" are also SyntaxKind.VariableDeclarations
+                    if(node.parent/*VariableDeclarationList*/.parent/*VariableStatement*/
+                           .parent/*SourceFile*/.kind !== SyntaxKind.SourceFile) {
+                        return undefined;
+                    }
+                    // If it is initialized with a function expression, handle it when we reach the function expression node
+                    const varDecl = node as VariableDeclaration;
+                    if (varDecl.initializer && (varDecl.initializer.kind === SyntaxKind.FunctionExpression ||
+                                                varDecl.initializer.kind === SyntaxKind.ArrowFunction ||
+                                                varDecl.initializer.kind === SyntaxKind.ClassExpression)) {
+                        return undefined;
+                    }
+                    // Fall through
+                case SyntaxKind.FunctionDeclaration:
+                case SyntaxKind.ClassDeclaration:
+                case SyntaxKind.Constructor:
+                case SyntaxKind.GetAccessor:
+                case SyntaxKind.SetAccessor:
+                    // "export default function().." looks just like a regular function/class declaration, except with the 'default' flag
+                    const name = hasModifier(node, ModifierFlags.Default) && !(node as (Declaration)).name ? "default" :
+                            node.kind === SyntaxKind.Constructor ? "constructor" :
+                            declarationNameToString((node as (Declaration)).name);
+                    return getNavBarItem(name, getScriptKindForElementKind(node.kind), [getNodeSpan(node)]);
+                case SyntaxKind.FunctionExpression:
+                case SyntaxKind.ArrowFunction:
+                case SyntaxKind.ClassExpression:
+                    return getDefineModuleItem(node) || getFunctionOrClassExpressionItem(node);
+                case SyntaxKind.MethodDeclaration:
+                    const methodDecl = node as MethodDeclaration;
+                    return getNavBarItem(declarationNameToString(methodDecl.name),
+                                         ScriptElementKind.memberFunctionElement,
+                                         [getNodeSpan(node)]);
+                case SyntaxKind.ExportAssignment:
+                    // e.g. "export default <expr>"
+                    return getNavBarItem("default", ScriptElementKind.variableElement, [getNodeSpan(node)]);
+                case SyntaxKind.ImportClause:    // e.g. 'def' in: import def from 'mod' (in ImportDeclaration)
+                    if (!(node as ImportClause).name) {
+                        // No default import (this node is still a parent of named & namespace imports, which are handled below)
+                        return undefined;
+                    }
+                    // fall through
+                case SyntaxKind.ImportSpecifier: // e.g. 'id' in: import {id} from 'mod' (in NamedImports, in ImportClause)
+                case SyntaxKind.NamespaceImport: // e.g. '* as ns' in: import * as ns from 'mod' (in ImportClause)
+                case SyntaxKind.ExportSpecifier: // e.g. 'a' or 'b'  in: export {a, foo as b} from 'mod'
+                    // Export specifiers are only interesting if they are reexports from another module, or renamed, else they are already globals
+                    if (node.kind === SyntaxKind.ExportSpecifier) {
+                        if (!(node.parent.parent as ExportDeclaration).moduleSpecifier && !(node as ExportSpecifier).propertyName) {
+                            return undefined;
+                        }
+                    }
+                    const decl = node as (ImportSpecifier | ImportClause | NamespaceImport | ExportSpecifier);
+                    if (!decl.name) {
+                        return undefined;
+                    }
+                    const declName = declarationNameToString(decl.name);
+                    return getNavBarItem(declName, ScriptElementKind.constElement, [getNodeSpan(node)]);
+                default:
+                    return undefined;
+            }
+        }
+
+        function getNavBarItem(text: string, kind: string, spans: TextSpan[], kindModifiers = ScriptElementKindModifier.none): NavigationBarItem {
+            return {
+                text, kind, kindModifiers, spans, childItems: [], indent, bolded: false, grayed: false
+            }
+        }
+
+        function getDefineModuleItem(node: Node): NavigationBarItem {
+            if (node.kind !== SyntaxKind.FunctionExpression && node.kind !== SyntaxKind.ArrowFunction) {
+                return undefined;
+            }
+
+            // No match if this is not a call expression to an identifier named 'define'
+            if (node.parent.kind !== SyntaxKind.CallExpression) {
+                return undefined;
+            }
+            const callExpr = node.parent as CallExpression;
+            if (callExpr.expression.kind !== SyntaxKind.Identifier || callExpr.expression.getText() !== 'define') {
+                return undefined;
+            }
+
+            // Return a module of either the given text in the first argument, or of the source file path
+            let defaultName = node.getSourceFile().fileName;
+            if (callExpr.arguments[0].kind === SyntaxKind.StringLiteral) {
+                defaultName = ((callExpr.arguments[0]) as StringLiteral).text;
+            }
+            return getNavBarItem(defaultName, ScriptElementKind.moduleElement, [getNodeSpan(node.parent)]);
+        }
+
+        function getFunctionOrClassExpressionItem(node: Node): NavigationBarItem {
+            if (node.kind !== SyntaxKind.FunctionExpression &&
+                    node.kind !== SyntaxKind.ArrowFunction &&
+                    node.kind !== SyntaxKind.ClassExpression) {
+                return undefined;
+            }
+
+            const fnExpr = node as FunctionExpression | ArrowFunction | ClassExpression;
+            let fnName: string;
+            if (fnExpr.name && getFullWidth(fnExpr.name) > 0) {
+                // The expression has an identifier, so use that as the name
+                fnName = declarationNameToString(fnExpr.name);
+            }
+            else {
+                // See if it is a var initializer. If so, use the var name.
+                if (fnExpr.parent.kind === SyntaxKind.VariableDeclaration) {
+                    fnName = declarationNameToString((fnExpr.parent as VariableDeclaration).name);
+                }
+                // See if it is of the form "<expr> = function(){...}". If so, use the text from the left-hand side.
+                else if (fnExpr.parent.kind === SyntaxKind.BinaryExpression &&
+                         (fnExpr.parent as BinaryExpression).operatorToken.kind === SyntaxKind.EqualsToken) {
+                    fnName = (fnExpr.parent as BinaryExpression).left.getText();
+                    if (fnName.length > 20) {
+                        fnName = fnName.substring(0, 17) + "...";
+                    }
+                }
+                // See if it is a property assignment, and if so use the property name
+                else if (fnExpr.parent.kind === SyntaxKind.PropertyAssignment &&
+                         (fnExpr.parent as PropertyAssignment).name) {
+                    fnName = (fnExpr.parent as PropertyAssignment).name.getText();
+                }
+                else {
+                    fnName = node.kind === SyntaxKind.ClassExpression ? anonClassText : anonFnText;
+                }
+            }
+            const scriptKind = node.kind === SyntaxKind.ClassExpression ? ScriptElementKind.classElement : ScriptElementKind.functionElement;
+            return getNavBarItem(fnName, scriptKind, [getNodeSpan(node)]);
+        }
+
+        function getNodeSpan(node: Node) {
+            return node.kind === SyntaxKind.SourceFile
+                ? createTextSpanFromBounds(node.getFullStart(), node.getEnd())
+                : createTextSpanFromBounds(node.getStart(), node.getEnd());
+        }
+
+        function getScriptKindForElementKind(kind: SyntaxKind) {
+            switch (kind) {
+                case SyntaxKind.VariableDeclaration:
+                    return ScriptElementKind.variableElement;
+                case SyntaxKind.FunctionDeclaration:
+                    return ScriptElementKind.functionElement;
+                case SyntaxKind.ClassDeclaration:
+                    return ScriptElementKind.classElement;
+                case SyntaxKind.Constructor:
+                    return ScriptElementKind.constructorImplementationElement;
+                case SyntaxKind.GetAccessor:
+                    return ScriptElementKind.memberGetAccessorElement;
+                case SyntaxKind.SetAccessor:
+                    return ScriptElementKind.memberSetAccessorElement;
+                default:
+                    return "unknown";
+            }
+        }
+
+        return sourceFileItem.childItems;
+    }
+}
diff --git a/src/services/outliningElementsCollector.ts b/src/services/outliningElementsCollector.ts
index fa4f46b5010..dc2e4a59773 100644
--- a/src/services/outliningElementsCollector.ts
+++ b/src/services/outliningElementsCollector.ts
@@ -100,7 +100,7 @@ namespace ts.OutliningElementsCollector {
                         const closeBrace = findChildOfKind(n, SyntaxKind.CloseBraceToken, sourceFile);
 
                         // Check if the block is standalone, or 'attached' to some parent statement.
-                        // If the latter, we want to collaps the block, but consider its hint span
+                        // If the latter, we want to collapse the block, but consider its hint span
                         // to be the entire span of the parent.
                         if (parent.kind === SyntaxKind.DoStatement ||
                             parent.kind === SyntaxKind.ForInStatement ||
diff --git a/src/services/services.ts b/src/services/services.ts
index 61b68f78dd8..bc1195266d5 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -7,6 +7,7 @@
 /// <reference path='patternMatcher.ts' />
 /// <reference path='signatureHelp.ts' />
 /// <reference path='utilities.ts' />
+/// <reference path='jsTyping.ts' />
 /// <reference path='formatting\formatting.ts' />
 /// <reference path='formatting\smartIndenter.ts' />
 
@@ -124,6 +125,7 @@ namespace ts {
     }
     export interface PreProcessedFileInfo {
         referencedFiles: FileReference[];
+        typeReferenceDirectives: FileReference[];
         importedFiles: FileReference[];
         ambientExternalModules: string[];
         isLibFile: boolean;
@@ -508,7 +510,7 @@ namespace ts {
                         spacesToRemoveAfterAsterisk = 0;
                     }
 
-                    // Analyse text on this line
+                    // Analyze text on this line
                     while (pos < end && !isLineBreak(sourceFile.text.charCodeAt(pos))) {
                         const ch = sourceFile.text.charAt(pos);
                         if (ch === "@") {
@@ -647,7 +649,7 @@ namespace ts {
                             paramHelpStringMargin = undefined;
                         }
 
-                        // If this is the start of another tag, continue with the loop in seach of param tag with symbol name
+                        // If this is the start of another tag, continue with the loop in search of param tag with symbol name
                         if (sourceFile.text.charCodeAt(pos) === CharacterCodes.at) {
                             continue;
                         }
@@ -746,6 +748,7 @@ namespace ts {
         declaration: SignatureDeclaration;
         typeParameters: TypeParameter[];
         parameters: Symbol[];
+        thisType: Type;
         resolvedReturnType: Type;
         minArgumentCount: number;
         hasRestParameter: boolean;
@@ -797,6 +800,7 @@ namespace ts {
         public amdDependencies: { name: string; path: string }[];
         public moduleName: string;
         public referencedFiles: FileReference[];
+        public typeReferenceDirectives: FileReference[];
 
         public syntacticDiagnostics: Diagnostic[];
         public referenceDiagnostics: Diagnostic[];
@@ -812,11 +816,13 @@ namespace ts {
         public identifierCount: number;
         public symbolCount: number;
         public version: string;
+        public scriptKind: ScriptKind;
         public languageVersion: ScriptTarget;
         public languageVariant: LanguageVariant;
         public identifiers: Map<string>;
         public nameTable: Map<number>;
         public resolvedModules: Map<ResolvedModule>;
+        public resolvedTypeReferenceDirectiveNames: Map<ResolvedTypeReferenceDirective>;
         public imports: LiteralExpression[];
         public moduleAugmentations: LiteralExpression[];
         private namedDeclarations: Map<Declaration[]>;
@@ -962,7 +968,7 @@ namespace ts {
 
                     case SyntaxKind.Parameter:
                         // Only consider properties defined as constructor parameters
-                        if (!(node.flags & NodeFlags.AccessibilityModifier)) {
+                        if (!(getModifierFlags(node) & ModifierFlags.AccessibilityModifier)) {
                             break;
                         }
                     // fall through
@@ -1025,6 +1031,7 @@ namespace ts {
         getNewLine?(): string;
         getProjectVersion?(): string;
         getScriptFileNames(): string[];
+        getScriptKind?(fileName: string): ScriptKind;
         getScriptVersion(fileName: string): string;
         getScriptSnapshot(fileName: string): IScriptSnapshot;
         getLocalizedDiagnosticMessages?(): any;
@@ -1042,6 +1049,7 @@ namespace ts {
          * host specific questions using 'getScriptSnapshot'.
          */
         resolveModuleNames?(moduleNames: string[], containingFile: string): ResolvedModule[];
+        resolveTypeReferenceDirectives?(typeDirectiveNames: string[], containingFile: string): ResolvedTypeReferenceDirective[];
         directoryExists?(directoryName: string): boolean;
     }
 
@@ -1111,11 +1119,13 @@ namespace ts {
 
         getDocCommentTemplateAtPosition(fileName: string, position: number): TextInsertion;
 
+        isValidBraceCompletionAtPostion(fileName: string, position: number, openingBrace: number): boolean;
+
         getEmitOutput(fileName: string): EmitOutput;
 
         getProgram(): Program;
 
-        getSourceFile(fileName: string): SourceFile;
+        /* @internal */ getNonBoundSourceFile(fileName: string): SourceFile;
 
         dispose(): void;
     }
@@ -1474,7 +1484,8 @@ namespace ts {
             fileName: string,
             compilationSettings: CompilerOptions,
             scriptSnapshot: IScriptSnapshot,
-            version: string): SourceFile;
+            version: string,
+            scriptKind?: ScriptKind): SourceFile;
 
         /**
           * Request an updated version of an already existing SourceFile with a given fileName
@@ -1492,7 +1503,8 @@ namespace ts {
             fileName: string,
             compilationSettings: CompilerOptions,
             scriptSnapshot: IScriptSnapshot,
-            version: string): SourceFile;
+            version: string,
+            scriptKind?: ScriptKind): SourceFile;
 
         /**
           * Informs the DocumentRegistry that a file is not needed any longer.
@@ -1663,6 +1675,7 @@ namespace ts {
         hostFileName: string;
         version: string;
         scriptSnapshot: IScriptSnapshot;
+        scriptKind: ScriptKind;
     }
 
     interface DocumentRegistryEntry {
@@ -1719,7 +1732,6 @@ namespace ts {
         // Always default to "ScriptTarget.ES5" for the language service
         return {
             target: ScriptTarget.ES5,
-            module: ModuleKind.None,
             jsx: JsxEmit.Preserve
         };
     }
@@ -1758,7 +1770,8 @@ namespace ts {
                 entry = {
                     hostFileName: fileName,
                     version: this.host.getScriptVersion(fileName),
-                    scriptSnapshot: scriptSnapshot
+                    scriptSnapshot: scriptSnapshot,
+                    scriptKind: getScriptKind(fileName, this.host)
                 };
             }
 
@@ -1824,12 +1837,13 @@ namespace ts {
                 throw new Error("Could not find file: '" + fileName + "'.");
             }
 
+            const scriptKind = getScriptKind(fileName, this.host);
             const version = this.host.getScriptVersion(fileName);
             let sourceFile: SourceFile;
 
             if (this.currentFileName !== fileName) {
                 // This is a new file, just parse it
-                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, ScriptTarget.Latest, version, /*setNodeParents*/ true);
+                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, ScriptTarget.Latest, version, /*setNodeParents*/ true, scriptKind);
             }
             else if (this.currentFileVersion !== version) {
                 // This is the same file, just a newer version. Incrementally parse the file.
@@ -1960,9 +1974,9 @@ namespace ts {
         return output.outputText;
     }
 
-    export function createLanguageServiceSourceFile(fileName: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, setNodeParents: boolean): SourceFile {
+    export function createLanguageServiceSourceFile(fileName: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, setNodeParents: boolean, scriptKind?: ScriptKind): SourceFile {
         const text = scriptSnapshot.getText(0, scriptSnapshot.getLength());
-        const sourceFile = createSourceFile(fileName, text, scriptTarget, setNodeParents);
+        const sourceFile = createSourceFile(fileName, text, scriptTarget, setNodeParents, scriptKind);
         setSourceFileFields(sourceFile, scriptSnapshot, version);
         return sourceFile;
     }
@@ -2024,7 +2038,7 @@ namespace ts {
         }
 
         // Otherwise, just create a new source file.
-        return createLanguageServiceSourceFile(sourceFile.fileName, scriptSnapshot, sourceFile.languageVersion, version, /*setNodeParents*/ true);
+        return createLanguageServiceSourceFile(sourceFile.fileName, scriptSnapshot, sourceFile.languageVersion, version, /*setNodeParents*/ true, sourceFile.scriptKind);
     }
 
     export function createDocumentRegistry(useCaseSensitiveFileNames?: boolean, currentDirectory = ""): DocumentRegistry {
@@ -2066,12 +2080,12 @@ namespace ts {
             return JSON.stringify(bucketInfoArray, undefined, 2);
         }
 
-        function acquireDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string): SourceFile {
-            return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring*/ true);
+        function acquireDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string, scriptKind?: ScriptKind): SourceFile {
+            return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring*/ true, scriptKind);
         }
 
-        function updateDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string): SourceFile {
-            return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring*/ false);
+        function updateDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string, scriptKind?: ScriptKind): SourceFile {
+            return acquireOrUpdateDocument(fileName, compilationSettings, scriptSnapshot, version, /*acquiring*/ false, scriptKind);
         }
 
         function acquireOrUpdateDocument(
@@ -2079,7 +2093,8 @@ namespace ts {
             compilationSettings: CompilerOptions,
             scriptSnapshot: IScriptSnapshot,
             version: string,
-            acquiring: boolean): SourceFile {
+            acquiring: boolean,
+            scriptKind?: ScriptKind): SourceFile {
 
             const bucket = getBucketForCompilationSettings(compilationSettings, /*createIfMissing*/ true);
             const path = toPath(fileName, currentDirectory, getCanonicalFileName);
@@ -2088,7 +2103,7 @@ namespace ts {
                 Debug.assert(acquiring, "How could we be trying to update a document that the registry doesn't have?");
 
                 // Have never seen this file with these settings.  Create a new source file for it.
-                const sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, compilationSettings.target, version, /*setNodeParents*/ false);
+                const sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, compilationSettings.target, version, /*setNodeParents*/ false, scriptKind);
 
                 entry = {
                     sourceFile: sourceFile,
@@ -2144,9 +2159,25 @@ namespace ts {
 
     export function preProcessFile(sourceText: string, readImportFiles = true, detectJavaScriptImports = false): PreProcessedFileInfo {
         const referencedFiles: FileReference[] = [];
+        const typeReferenceDirectives: FileReference[] = [];
         const importedFiles: FileReference[] = [];
-        let ambientExternalModules: string[];
+        let ambientExternalModules: { ref: FileReference, depth: number }[];
         let isNoDefaultLib = false;
+        let braceNesting = 0;
+        // assume that text represent an external module if it contains at least one top level import/export
+        // ambient modules that are found inside external modules are interpreted as module augmentations
+        let externalModule = false;
+
+        function nextToken() {
+            const token = scanner.scan();
+            if (token === SyntaxKind.OpenBraceToken) {
+                braceNesting++;
+            }
+            else if (token === SyntaxKind.CloseBraceToken) {
+                braceNesting--;
+            }
+            return token;
+        }
 
         function processTripleSlashDirectives(): void {
             const commentRanges = getLeadingCommentRanges(sourceText, 0);
@@ -2157,27 +2188,43 @@ namespace ts {
                     isNoDefaultLib = referencePathMatchResult.isNoDefaultLib;
                     const fileReference = referencePathMatchResult.fileReference;
                     if (fileReference) {
-                        referencedFiles.push(fileReference);
+                        const collection = referencePathMatchResult.isTypeReferenceDirective
+                            ? typeReferenceDirectives
+                            : referencedFiles;
+
+                        collection.push(fileReference);
                     }
                 }
             });
         }
 
+        function getFileReference() {
+            const file = scanner.getTokenValue();
+            const pos = scanner.getTokenPos();
+            return {
+                fileName: file,
+                pos: pos,
+                end: pos + file.length
+            };
+        }
+
         function recordAmbientExternalModule(): void {
             if (!ambientExternalModules) {
                 ambientExternalModules = [];
             }
-            ambientExternalModules.push(scanner.getTokenValue());
+            ambientExternalModules.push({ ref: getFileReference(), depth: braceNesting });
         }
 
         function recordModuleName() {
-            const importPath = scanner.getTokenValue();
-            const pos = scanner.getTokenPos();
-            importedFiles.push({
-                fileName: importPath,
-                pos: pos,
-                end: pos + importPath.length
-            });
+            importedFiles.push(getFileReference());
+
+            markAsExternalModuleIfTopLevel();
+        }
+
+        function markAsExternalModuleIfTopLevel() {
+            if (braceNesting === 0) {
+                externalModule = true;
+            }
         }
 
         /**
@@ -2187,9 +2234,9 @@ namespace ts {
             let token = scanner.getToken();
             if (token === SyntaxKind.DeclareKeyword) {
                 // declare module "mod"
-                token = scanner.scan();
+                token = nextToken();
                 if (token === SyntaxKind.ModuleKeyword) {
-                    token = scanner.scan();
+                    token = nextToken();
                     if (token === SyntaxKind.StringLiteral) {
                         recordAmbientExternalModule();
                     }
@@ -2206,7 +2253,8 @@ namespace ts {
         function tryConsumeImport(): boolean {
             let token = scanner.getToken();
             if (token === SyntaxKind.ImportKeyword) {
-                token = scanner.scan();
+
+                token = nextToken();
                 if (token === SyntaxKind.StringLiteral) {
                     // import "mod";
                     recordModuleName();
@@ -2214,9 +2262,9 @@ namespace ts {
                 }
                 else {
                     if (token === SyntaxKind.Identifier || isKeyword(token)) {
-                        token = scanner.scan();
+                        token = nextToken();
                         if (token === SyntaxKind.FromKeyword) {
-                            token = scanner.scan();
+                            token = nextToken();
                             if (token === SyntaxKind.StringLiteral) {
                                 // import d from "mod";
                                 recordModuleName();
@@ -2230,7 +2278,7 @@ namespace ts {
                         }
                         else if (token === SyntaxKind.CommaToken) {
                             // consume comma and keep going
-                            token = scanner.scan();
+                            token = nextToken();
                         }
                         else {
                             // unknown syntax
@@ -2239,17 +2287,17 @@ namespace ts {
                     }
 
                     if (token === SyntaxKind.OpenBraceToken) {
-                        token = scanner.scan();
+                        token = nextToken();
                         // consume "{ a as B, c, d as D}" clauses
                         // make sure that it stops on EOF
                         while (token !== SyntaxKind.CloseBraceToken && token !== SyntaxKind.EndOfFileToken) {
-                            token = scanner.scan();
+                            token = nextToken();
                         }
 
                         if (token === SyntaxKind.CloseBraceToken) {
-                            token = scanner.scan();
+                            token = nextToken();
                             if (token === SyntaxKind.FromKeyword) {
-                                token = scanner.scan();
+                                token = nextToken();
                                 if (token === SyntaxKind.StringLiteral) {
                                     // import {a as A} from "mod";
                                     // import d, {a, b as B} from "mod"
@@ -2259,13 +2307,13 @@ namespace ts {
                         }
                     }
                     else if (token === SyntaxKind.AsteriskToken) {
-                        token = scanner.scan();
+                        token = nextToken();
                         if (token === SyntaxKind.AsKeyword) {
-                            token = scanner.scan();
+                            token = nextToken();
                             if (token === SyntaxKind.Identifier || isKeyword(token)) {
-                                token = scanner.scan();
+                                token = nextToken();
                                 if (token === SyntaxKind.FromKeyword) {
-                                    token = scanner.scan();
+                                    token = nextToken();
                                     if (token === SyntaxKind.StringLiteral) {
                                         // import * as NS from "mod"
                                         // import d, * as NS from "mod"
@@ -2286,19 +2334,20 @@ namespace ts {
         function tryConsumeExport(): boolean {
             let token = scanner.getToken();
             if (token === SyntaxKind.ExportKeyword) {
-                token = scanner.scan();
+                markAsExternalModuleIfTopLevel();
+                token = nextToken();
                 if (token === SyntaxKind.OpenBraceToken) {
-                    token = scanner.scan();
+                    token = nextToken();
                     // consume "{ a as B, c, d as D}" clauses
                     // make sure it stops on EOF
                     while (token !== SyntaxKind.CloseBraceToken && token !== SyntaxKind.EndOfFileToken) {
-                        token = scanner.scan();
+                        token = nextToken();
                     }
 
                     if (token === SyntaxKind.CloseBraceToken) {
-                        token = scanner.scan();
+                        token = nextToken();
                         if (token === SyntaxKind.FromKeyword) {
-                            token = scanner.scan();
+                            token = nextToken();
                             if (token === SyntaxKind.StringLiteral) {
                                 // export {a as A} from "mod";
                                 // export {a, b as B} from "mod"
@@ -2308,9 +2357,9 @@ namespace ts {
                     }
                 }
                 else if (token === SyntaxKind.AsteriskToken) {
-                    token = scanner.scan();
+                    token = nextToken();
                     if (token === SyntaxKind.FromKeyword) {
-                        token = scanner.scan();
+                        token = nextToken();
                         if (token === SyntaxKind.StringLiteral) {
                             // export * from "mod"
                             recordModuleName();
@@ -2318,9 +2367,9 @@ namespace ts {
                     }
                 }
                 else if (token === SyntaxKind.ImportKeyword) {
-                    token = scanner.scan();
+                    token = nextToken();
                     if (token === SyntaxKind.Identifier || isKeyword(token)) {
-                        token = scanner.scan();
+                        token = nextToken();
                         if (token === SyntaxKind.EqualsToken) {
                             if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) {
                                 return true;
@@ -2336,11 +2385,11 @@ namespace ts {
         }
 
         function tryConsumeRequireCall(skipCurrentToken: boolean): boolean {
-            let token = skipCurrentToken ? scanner.scan() : scanner.getToken();
+            let token = skipCurrentToken ? nextToken() : scanner.getToken();
             if (token === SyntaxKind.RequireKeyword) {
-                token = scanner.scan();
+                token = nextToken();
                 if (token === SyntaxKind.OpenParenToken) {
-                    token = scanner.scan();
+                    token = nextToken();
                     if (token === SyntaxKind.StringLiteral) {
                         //  require("mod");
                         recordModuleName();
@@ -2354,17 +2403,17 @@ namespace ts {
         function tryConsumeDefine(): boolean {
             let token = scanner.getToken();
             if (token === SyntaxKind.Identifier && scanner.getTokenValue() === "define") {
-                token = scanner.scan();
+                token = nextToken();
                 if (token !== SyntaxKind.OpenParenToken) {
                     return true;
                 }
 
-                token = scanner.scan();
+                token = nextToken();
                 if (token === SyntaxKind.StringLiteral) {
                     // looks like define ("modname", ... - skip string literal and comma
-                    token = scanner.scan();
+                    token = nextToken();
                     if (token === SyntaxKind.CommaToken) {
-                        token = scanner.scan();
+                        token = nextToken();
                     }
                     else {
                         // unexpected token
@@ -2378,7 +2427,7 @@ namespace ts {
                 }
 
                 // skip open bracket
-                token = scanner.scan();
+                token = nextToken();
                 let i = 0;
                 // scan until ']' or EOF
                 while (token !== SyntaxKind.CloseBracketToken && token !== SyntaxKind.EndOfFileToken) {
@@ -2388,7 +2437,7 @@ namespace ts {
                         i++;
                     }
 
-                    token = scanner.scan();
+                    token = nextToken();
                 }
                 return true;
 
@@ -2398,7 +2447,7 @@ namespace ts {
 
         function processImports(): void {
             scanner.setText(sourceText);
-            scanner.scan();
+            nextToken();
             // Look for:
             //    import "mod";
             //    import d from "mod"
@@ -2425,7 +2474,7 @@ namespace ts {
                     continue;
                 }
                 else {
-                    scanner.scan();
+                    nextToken();
                 }
             }
 
@@ -2436,7 +2485,34 @@ namespace ts {
             processImports();
         }
         processTripleSlashDirectives();
-        return { referencedFiles, importedFiles, isLibFile: isNoDefaultLib, ambientExternalModules };
+        if (externalModule) {
+            // for external modules module all nested ambient modules are augmentations
+            if (ambientExternalModules) {
+                // move all detected ambient modules to imported files since they need to be resolved
+                for (const decl of ambientExternalModules) {
+                    importedFiles.push(decl.ref);
+                }
+            }
+            return { referencedFiles, typeReferenceDirectives, importedFiles, isLibFile: isNoDefaultLib, ambientExternalModules: undefined };
+        }
+        else {
+            // for global scripts ambient modules still can have augmentations - look for ambient modules with depth > 0
+            let ambientModuleNames: string[];
+            if (ambientExternalModules) {
+                for (const decl of ambientExternalModules) {
+                    if (decl.depth === 0) {
+                        if (!ambientModuleNames) {
+                            ambientModuleNames = [];
+                        }
+                        ambientModuleNames.push(decl.ref.fileName);
+                    }
+                    else {
+                        importedFiles.push(decl.ref);
+                    }
+                }
+            }
+            return { referencedFiles, typeReferenceDirectives, importedFiles, isLibFile: isNoDefaultLib, ambientExternalModules: ambientModuleNames };
+        }
     }
 
     /// Helpers
@@ -2655,7 +2731,7 @@ namespace ts {
             case SyntaxKind.Constructor: return ScriptElementKind.constructorImplementationElement;
             case SyntaxKind.TypeParameter: return ScriptElementKind.typeParameterElement;
             case SyntaxKind.EnumMember: return ScriptElementKind.variableElement;
-            case SyntaxKind.Parameter: return (node.flags & NodeFlags.AccessibilityModifier) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement;
+            case SyntaxKind.Parameter: return (getModifierFlags(node) & ModifierFlags.AccessibilityModifier) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement;
             case SyntaxKind.ImportEqualsDeclaration:
             case SyntaxKind.ImportSpecifier:
             case SyntaxKind.ImportClause:
@@ -2772,7 +2848,7 @@ namespace ts {
                 getCurrentDirectory: () => currentDirectory,
                 fileExists: (fileName): boolean => {
                     // stub missing host functionality
-                    Debug.assert(!host.resolveModuleNames);
+                    Debug.assert(!host.resolveModuleNames || !host.resolveTypeReferenceDirectives);
                     return hostCache.getOrCreateEntry(fileName) !== undefined;
                 },
                 readFile: (fileName): string => {
@@ -2781,7 +2857,7 @@ namespace ts {
                     return entry && entry.scriptSnapshot.getText(0, entry.scriptSnapshot.getLength());
                 },
                 directoryExists: directoryName => {
-                    Debug.assert(!host.resolveModuleNames);
+                    Debug.assert(!host.resolveModuleNames || !host.resolveTypeReferenceDirectives);
                     return directoryProbablyExists(directoryName, host);
                 }
             };
@@ -2792,6 +2868,11 @@ namespace ts {
             if (host.resolveModuleNames) {
                 compilerHost.resolveModuleNames = (moduleNames, containingFile) => host.resolveModuleNames(moduleNames, containingFile);
             }
+            if (host.resolveTypeReferenceDirectives) {
+                compilerHost.resolveTypeReferenceDirectives = (typeReferenceDirectiveNames, containingFile) => {
+                    return host.resolveTypeReferenceDirectives(typeReferenceDirectiveNames, containingFile);
+                };
+            }
 
             const newProgram = createProgram(hostCache.getRootFileNames(), newSettings, compilerHost, program);
 
@@ -2828,7 +2909,7 @@ namespace ts {
                 }
 
                 // Check if the language version has changed since we last created a program; if they are the same,
-                // it is safe to reuse the souceFiles; if not, then the shape of the AST can change, and the oldSourceFile
+                // it is safe to reuse the sourceFiles; if not, then the shape of the AST can change, and the oldSourceFile
                 // can not be reused. we have to dump all syntax trees and create new ones.
                 if (!changesInCompilationSettingsAffectSyntax) {
                     // Check if the old program had this file already
@@ -2836,7 +2917,7 @@ namespace ts {
                     if (oldSourceFile) {
                         // We already had a source file for this file name.  Go to the registry to
                         // ensure that we get the right up to date version of it.  We need this to
-                        // address the following 'race'.  Specifically, say we have the following:
+                        // address the following race-condition.  Specifically, say we have the following:
                         //
                         //      LS1
                         //          \
@@ -2855,14 +2936,20 @@ namespace ts {
                         // it's source file any more, and instead defers to DocumentRegistry to get
                         // either version 1, version 2 (or some other version) depending on what the
                         // host says should be used.
-                        return documentRegistry.updateDocument(fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version);
+
+                        // We do not support the scenario where a host can modify a registered
+                        // file's script kind, i.e. in one project some file is treated as ".ts"
+                        // and in another as ".js"
+                        Debug.assert(hostFileInformation.scriptKind === oldSourceFile.scriptKind, "Registered script kind (" + oldSourceFile.scriptKind + ") should match new script kind (" + hostFileInformation.scriptKind + ") for file: " + fileName);
+
+                        return documentRegistry.updateDocument(fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version, hostFileInformation.scriptKind);
                     }
 
                     // We didn't already have the file.  Fall through and acquire it from the registry.
                 }
 
                 // Could not find this file in the old program, create a new SourceFile for it.
-                return documentRegistry.acquireDocument(fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version);
+                return documentRegistry.acquireDocument(fileName, newSettings, hostFileInformation.scriptSnapshot, hostFileInformation.version, hostFileInformation.scriptKind);
             }
 
             function sourceFileUpToDate(sourceFile: SourceFile): boolean {
@@ -2922,7 +3009,7 @@ namespace ts {
         }
 
         /**
-         * getSemanticDiagnostiscs return array of Diagnostics. If '-d' is not enabled, only report semantic errors
+         * getSemanticDiagnostics return array of Diagnostics. If '-d' is not enabled, only report semantic errors
          * If '-d' enabled, report both semantic and emitter errors
          */
         function getSemanticDiagnostics(fileName: string): Diagnostic[] {
@@ -3126,7 +3213,7 @@ namespace ts {
             else if (isRightOfOpenTag) {
                 const tagSymbols = typeChecker.getJsxIntrinsicTagNames();
                 if (tryGetGlobalSymbols()) {
-                    symbols = tagSymbols.concat(symbols.filter(s => !!(s.flags & SymbolFlags.Value)));
+                    symbols = tagSymbols.concat(symbols.filter(s => !!(s.flags & (SymbolFlags.Value | SymbolFlags.Alias))));
                 }
                 else {
                     symbols = tagSymbols;
@@ -3440,7 +3527,18 @@ namespace ts {
                         // We don't want to complete using the type acquired by the shape
                         // of the binding pattern; we are only interested in types acquired
                         // through type declaration or inference.
-                        if (rootDeclaration.initializer || rootDeclaration.type) {
+                        // Also proceed if rootDeclaration is parameter and if its containing function expression\arrow function is contextually typed -
+                        // type of parameter will flow in from the contextual type of the function
+                        let canGetType = !!(rootDeclaration.initializer || rootDeclaration.type);
+                        if (!canGetType && rootDeclaration.kind === SyntaxKind.Parameter) {
+                            if (isExpression(rootDeclaration.parent)) {
+                                canGetType = !!typeChecker.getContextualType(<Expression>rootDeclaration.parent);
+                            }
+                            else if (rootDeclaration.parent.kind === SyntaxKind.MethodDeclaration || rootDeclaration.parent.kind === SyntaxKind.SetAccessor) {
+                                canGetType = isExpression(rootDeclaration.parent.parent) && !!typeChecker.getContextualType(<Expression>rootDeclaration.parent.parent);
+                            }
+                        }
+                        if (canGetType) {
                             typeForObject = typeChecker.getTypeAtLocation(objectLikeContainer);
                             existingMembers = (<BindingPattern>objectLikeContainer).elements;
                         }
@@ -3731,7 +3829,7 @@ namespace ts {
              *          do not occur at the current position and have not otherwise been typed.
              */
             function filterNamedImportOrExportCompletionItems(exportsOfModule: Symbol[], namedImportsOrExports: ImportOrExportSpecifier[]): Symbol[] {
-                const exisingImportsOrExports: Map<boolean> = {};
+                const existingImportsOrExports: Map<boolean> = {};
 
                 for (const element of namedImportsOrExports) {
                     // If this is the current item we are editing right now, do not filter it out
@@ -3740,14 +3838,14 @@ namespace ts {
                     }
 
                     const name = element.propertyName || element.name;
-                    exisingImportsOrExports[name.text] = true;
+                    existingImportsOrExports[name.text] = true;
                 }
 
-                if (isEmpty(exisingImportsOrExports)) {
-                    return exportsOfModule;
+                if (isEmpty(existingImportsOrExports)) {
+                    return filter(exportsOfModule, e => e.name !== "default");
                 }
 
-                return filter(exportsOfModule, e => !lookUp(exisingImportsOrExports, e.name));
+                return filter(exportsOfModule, e => e.name !== "default" && !lookUp(existingImportsOrExports, e.name));
             }
 
             /**
@@ -3829,7 +3927,7 @@ namespace ts {
                 return undefined;
             }
 
-            const { symbols, isMemberCompletion, isNewIdentifierLocation, location, isRightOfDot, isJsDocTagName } = completionData;
+            const { symbols, isMemberCompletion, isNewIdentifierLocation, location, isJsDocTagName } = completionData;
 
             if (isJsDocTagName) {
                 // If the current position is a jsDoc tag name, only tag names should be provided for completion
@@ -3840,7 +3938,7 @@ namespace ts {
 
             const entries: CompletionEntry[] = [];
 
-            if (isRightOfDot && isSourceFileJavaScript(sourceFile)) {
+            if (isSourceFileJavaScript(sourceFile)) {
                 const uniqueNames = getCompletionEntriesFromSymbols(symbols, entries);
                 addRange(entries, getJavaScriptCompletionEntries(sourceFile, location.pos, uniqueNames));
             }
@@ -4034,6 +4132,9 @@ namespace ts {
             if (typeChecker.isArgumentsSymbol(symbol)) {
                 return ScriptElementKind.localVariableElement;
             }
+            if (location.kind === SyntaxKind.ThisKeyword && isExpression(location)) {
+                return ScriptElementKind.parameterElement;
+            }
             if (flags & SymbolFlags.Variable) {
                 if (isFirstDeclarationOfSymbolParameter(symbol)) {
                     return ScriptElementKind.parameterElement;
@@ -4096,6 +4197,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);
             let type: Type;
 
             // Class at constructor site need to be shown as constructor apart from property,method, vars
@@ -4106,7 +4208,7 @@ namespace ts {
                 }
 
                 let signature: Signature;
-                type = typeChecker.getTypeOfSymbolAtLocation(symbol, location);
+                type = isThisExpression ? typeChecker.getTypeAtLocation(location) : typeChecker.getTypeOfSymbolAtLocation(symbol, location);
                 if (type) {
                     if (location.parent && location.parent.kind === SyntaxKind.PropertyAccessExpression) {
                         const right = (<PropertyAccessExpression>location.parent).name;
@@ -4217,7 +4319,7 @@ namespace ts {
                     }
                 }
             }
-            if (symbolFlags & SymbolFlags.Class && !hasAddedSymbolInfo) {
+            if (symbolFlags & SymbolFlags.Class && !hasAddedSymbolInfo && !isThisExpression) {
                 if (getDeclarationOfKind(symbol, SyntaxKind.ClassExpression)) {
                     // Special case for class expressions because we would like to indicate that
                     // the class name is local to the class body (similar to function expression)
@@ -4359,11 +4461,19 @@ namespace ts {
             if (!hasAddedSymbolInfo) {
                 if (symbolKind !== ScriptElementKind.unknown) {
                     if (type) {
-                        addPrefixForAnyFunctionOrVar(symbol, symbolKind);
+                        if (isThisExpression) {
+                            addNewLineIfDisplayPartsExist();
+                            displayParts.push(keywordPart(SyntaxKind.ThisKeyword));
+                        }
+                        else {
+                            addPrefixForAnyFunctionOrVar(symbol, symbolKind);
+                        }
+
                         // For properties, variables and local vars: show the type
                         if (symbolKind === ScriptElementKind.memberVariableElement ||
                             symbolFlags & SymbolFlags.Variable ||
-                            symbolKind === ScriptElementKind.localVariableElement) {
+                            symbolKind === ScriptElementKind.localVariableElement ||
+                            isThisExpression) {
                             displayParts.push(punctuationPart(SyntaxKind.ColonToken));
                             displayParts.push(spacePart());
                             // If the type is type parameter, format it specially
@@ -4595,6 +4705,26 @@ namespace ts {
             }
         }
 
+        function findReferenceInPosition(refs: FileReference[], pos: number): FileReference {
+            for (const ref of refs) {
+                if (ref.pos <= pos && pos < ref.end) {
+                    return ref;
+                }
+            }
+            return undefined;
+        }
+
+        function getDefinitionInfoForFileReference(name: string, targetFileName: string): DefinitionInfo {
+            return {
+                fileName: targetFileName,
+                textSpan: createTextSpanFromBounds(0, 0),
+                kind: ScriptElementKind.scriptElement,
+                name: name,
+                containerName: undefined,
+                containerKind: undefined
+            };
+        }
+
         /// Goto definition
         function getDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[] {
             synchronizeHostData();
@@ -4614,18 +4744,20 @@ namespace ts {
             }
 
             /// Triple slash reference comments
-            const comment = forEach(sourceFile.referencedFiles, r => (r.pos <= position && position < r.end) ? r : undefined);
+            const comment = findReferenceInPosition(sourceFile.referencedFiles, position);
             if (comment) {
                 const referenceFile = tryResolveScriptReference(program, sourceFile, comment);
                 if (referenceFile) {
-                    return [{
-                        fileName: referenceFile.fileName,
-                        textSpan: createTextSpanFromBounds(0, 0),
-                        kind: ScriptElementKind.scriptElement,
-                        name: comment.fileName,
-                        containerName: undefined,
-                        containerKind: undefined
-                    }];
+                    return [getDefinitionInfoForFileReference(comment.fileName, referenceFile.fileName)];
+                }
+                return undefined;
+            }
+            // Type reference directives
+            const typeReferenceDirective = findReferenceInPosition(sourceFile.typeReferenceDirectives, position);
+            if (typeReferenceDirective) {
+                const referenceFile = lookUp(program.getResolvedTypeReferenceDirectives(), typeReferenceDirective.fileName);
+                if (referenceFile && referenceFile.resolvedFileName) {
+                    return [getDefinitionInfoForFileReference(typeReferenceDirective.fileName, referenceFile.resolvedFileName)];
                 }
                 return undefined;
             }
@@ -4645,7 +4777,16 @@ namespace ts {
             // to jump to the implementation directly.
             if (symbol.flags & SymbolFlags.Alias) {
                 const declaration = symbol.declarations[0];
-                if (node.kind === SyntaxKind.Identifier && node.parent === declaration) {
+
+                // Go to the original declaration for cases:
+                //
+                //   (1) when the aliased symbol was declared in the location(parent).
+                //   (2) when the aliased symbol is originating from a named import.
+                //
+                if (node.kind === SyntaxKind.Identifier &&
+                    (node.parent === declaration ||
+                    (declaration.kind === SyntaxKind.ImportSpecifier && declaration.parent && declaration.parent.kind === SyntaxKind.NamedImports))) {
+
                     symbol = typeChecker.getAliasedSymbol(symbol);
                 }
             }
@@ -5046,14 +5187,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 {
@@ -5070,7 +5211,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;
                                 });
@@ -5079,7 +5220,7 @@ namespace ts {
                                     nodes = nodes.concat(constructor.parameters);
                                 }
                             }
-                            else if (modifierFlag & NodeFlags.Abstract) {
+                            else if (modifierFlag & ModifierFlags.Abstract) {
                                 nodes = nodes.concat(container);
                             }
                             break;
@@ -5088,7 +5229,7 @@ namespace ts {
                     }
 
                     forEach(nodes, node => {
-                        if (node.modifiers && node.flags & modifierFlag) {
+                        if (getModifierFlags(node) & modifierFlag) {
                             forEach(node.modifiers, child => pushKeywordIf(keywords, child, modifier));
                         }
                     });
@@ -5098,19 +5239,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();
                         }
@@ -5527,8 +5668,51 @@ namespace ts {
                 };
             }
 
-            function isImportSpecifierSymbol(symbol: Symbol) {
-                return (symbol.flags & SymbolFlags.Alias) && !!getDeclarationOfKind(symbol, SyntaxKind.ImportSpecifier);
+            function getAliasSymbolForPropertyNameSymbol(symbol: Symbol, location: Node): Symbol {
+                if (symbol.flags & SymbolFlags.Alias) {
+                    // Default import get alias
+                    const defaultImport = getDeclarationOfKind(symbol, SyntaxKind.ImportClause);
+                    if (defaultImport) {
+                        return typeChecker.getAliasedSymbol(symbol);
+                    }
+
+                    const importOrExportSpecifier = <ImportOrExportSpecifier>forEach(symbol.declarations,
+                        declaration => (declaration.kind === SyntaxKind.ImportSpecifier ||
+                            declaration.kind === SyntaxKind.ExportSpecifier) ? declaration : undefined);
+                    if (importOrExportSpecifier &&
+                        // export { a }
+                        (!importOrExportSpecifier.propertyName ||
+                            // export {a as class } where a is location
+                            importOrExportSpecifier.propertyName === location)) {
+                        // If Import specifier -> get alias
+                        // else Export specifier -> get local target
+                        return importOrExportSpecifier.kind === SyntaxKind.ImportSpecifier ?
+                            typeChecker.getAliasedSymbol(symbol) :
+                            typeChecker.getExportSpecifierLocalTargetSymbol(importOrExportSpecifier);
+                    }
+                }
+                return undefined;
+            }
+
+            function getPropertySymbolOfDestructuringAssignment(location: Node) {
+                return isArrayLiteralOrObjectLiteralDestructuringPattern(location.parent.parent) &&
+                    typeChecker.getPropertySymbolOfDestructuringAssignment(<Identifier>location);
+            }
+
+            function isObjectBindingPatternElementWithoutPropertyName(symbol: Symbol) {
+                const bindingElement = <BindingElement>getDeclarationOfKind(symbol, SyntaxKind.BindingElement);
+                return bindingElement &&
+                    bindingElement.parent.kind === SyntaxKind.ObjectBindingPattern &&
+                    !bindingElement.propertyName;
+            }
+
+            function getPropertySymbolOfObjectBindingPatternWithoutPropertyName(symbol: Symbol) {
+                if (isObjectBindingPatternElementWithoutPropertyName(symbol)) {
+                    const bindingElement = <BindingElement>getDeclarationOfKind(symbol, SyntaxKind.BindingElement);
+                    const typeOfPattern = typeChecker.getTypeAtLocation(bindingElement.parent);
+                    return typeOfPattern && typeChecker.getPropertyOfType(typeOfPattern, (<Identifier>bindingElement.name).text);
+                }
+                return undefined;
             }
 
             function getInternedName(symbol: Symbol, location: Node, declarations: Declaration[]): string {
@@ -5564,18 +5748,24 @@ 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);
                     }
                 }
 
                 // If the symbol is an import we would like to find it if we are looking for what it imports.
-                // So consider it visibile outside its declaration scope.
+                // So consider it visible outside its declaration scope.
                 if (symbol.flags & SymbolFlags.Alias) {
                     return undefined;
                 }
 
+                // If symbol is of object binding pattern element without property name we would want to
+                // look for property too and that could be anywhere
+                if (isObjectBindingPatternElementWithoutPropertyName(symbol)) {
+                    return undefined;
+                }
+
                 // if this symbol is visible from its parent container, e.g. exported, then bail out
                 // if symbol correspond to the union property - bail out
                 if (symbol.parent || (symbol.flags & SymbolFlags.SyntheticProperty)) {
@@ -5819,7 +6009,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:
@@ -5829,7 +6019,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:
@@ -5854,7 +6044,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));
                     }
                 });
@@ -5867,7 +6057,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:
@@ -5881,7 +6071,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:
@@ -5953,7 +6143,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;
@@ -5971,18 +6161,30 @@ namespace ts {
                 // The search set contains at least the current symbol
                 let result = [symbol];
 
-                // If the symbol is an alias, add what it alaises to the list
-                if (isImportSpecifierSymbol(symbol)) {
-                     result.push(typeChecker.getAliasedSymbol(symbol));
+                // If the location is name of property symbol from object literal destructuring pattern
+                // Search the property symbol
+                //      for ( { property: p2 } of elems) { }
+                if (isNameOfPropertyAssignment(location) && location.parent.kind !== SyntaxKind.ShorthandPropertyAssignment) {
+                    const propertySymbol = getPropertySymbolOfDestructuringAssignment(location);
+                    if (propertySymbol) {
+                        result.push(propertySymbol);
+                    }
                 }
 
-                // For export specifiers, the exported name can be refering to a local symbol, e.g.:
+                // If the symbol is an alias, add what it aliases to the list
                 //     import {a} from "mod";
-                //     export {a as somethingElse}
-                // We want the *local* declaration of 'a' as declared in the import,
-                // *not* as declared within "mod" (or farther)
-                if (location.parent.kind === SyntaxKind.ExportSpecifier) {
-                    result.push(typeChecker.getExportSpecifierLocalTargetSymbol(<ExportSpecifier>location.parent));
+                //     export {a}
+                // If the symbol is an alias to default declaration, add what it aliases to the list
+                //     declare "mod" { export default class B { } }
+                //     import B from "mod";
+                //// For export specifiers, the exported name can be referring to a local symbol, e.g.:
+                ////     import {a} from "mod";
+                ////     export {a as somethingElse}
+                //// We want the *local* declaration of 'a' as declared in the import,
+                //// *not* as declared within "mod" (or farther)
+                const aliasSymbol = getAliasSymbolForPropertyNameSymbol(symbol, location);
+                if (aliasSymbol) {
+                    result = result.concat(populateSearchSymbolSet(aliasSymbol, location));
                 }
 
                 // If the location is in a context sensitive location (i.e. in an object literal) try
@@ -6012,13 +6214,20 @@ namespace ts {
 
                 // If the symbol.valueDeclaration is a property parameter declaration,
                 // we should include both parameter declaration symbol and property declaration symbol
-                // Parameter Declaration symbol is only visible within function scope, so the symbol is stored in contructor.locals.
+                // Parameter Declaration symbol is only visible within function scope, so the symbol is stored in constructor.locals.
                 // Property Declaration symbol is a member of the class, so the symbol is stored in its class Declaration.symbol.members
                 if (symbol.valueDeclaration && symbol.valueDeclaration.kind === SyntaxKind.Parameter &&
                     isParameterPropertyDeclaration(<ParameterDeclaration>symbol.valueDeclaration)) {
                     result = result.concat(typeChecker.getSymbolsOfParameterPropertyDeclaration(<ParameterDeclaration>symbol.valueDeclaration, symbol.name));
                 }
 
+                // If this is symbol of binding element without propertyName declaration in Object binding pattern
+                // Include the property in the search
+                const bindingElementPropertySymbol = getPropertySymbolOfObjectBindingPatternWithoutPropertyName(symbol);
+                if (bindingElementPropertySymbol) {
+                    result.push(bindingElementPropertySymbol);
+                }
+
                 // If this is a union property, add all the symbols from all its source symbols in all unioned types.
                 // If the symbol is an instantiation from a another symbol (e.g. widened symbol) , add the root the list
                 forEach(typeChecker.getRootSymbols(symbol), rootSymbol => {
@@ -6038,9 +6247,9 @@ namespace ts {
             /**
              * Find symbol of the given property-name and add the symbol to the given result array
              * @param symbol a symbol to start searching for the given propertyName
-             * @param propertyName a name of property to serach for
+             * @param propertyName a name of property to search for
              * @param result an array of symbol of found property symbols
-             * @param previousIterationSymbolsCache a cache of symbol from previous iterations of calling this function to prevent infinite revisitng of the same symbol.
+             * @param previousIterationSymbolsCache a cache of symbol from previous iterations of calling this function to prevent infinite revisiting of the same symbol.
              *                                The value of previousIterationSymbol is undefined when the function is first called.
              */
             function getPropertySymbolsFromBaseTypes(symbol: Symbol, propertyName: string, result: Symbol[],
@@ -6066,7 +6275,7 @@ namespace ts {
 
                 if (symbol.flags & (SymbolFlags.Class | SymbolFlags.Interface)) {
                     forEach(symbol.getDeclarations(), declaration => {
-                        if (declaration.kind === SyntaxKind.ClassDeclaration) {
+                        if (isClassLike(declaration)) {
                             getPropertySymbolFromTypeReference(getClassExtendsHeritageClauseElement(<ClassDeclaration>declaration));
                             forEach(getClassImplementsHeritageClauseElements(<ClassDeclaration>declaration), getPropertySymbolFromTypeReference);
                         }
@@ -6100,32 +6309,40 @@ namespace ts {
                 }
 
                 // If the reference symbol is an alias, check if what it is aliasing is one of the search
-                // symbols.
-                if (isImportSpecifierSymbol(referenceSymbol)) {
-                    const aliasedSymbol = typeChecker.getAliasedSymbol(referenceSymbol);
-                    if (searchSymbols.indexOf(aliasedSymbol) >= 0) {
-                        return aliasedSymbol;
-                    }
-                }
-
-                // For export specifiers, it can be a local symbol, e.g.
-                //     import {a} from "mod";
-                //     export {a as somethingElse}
-                // We want the local target of the export (i.e. the import symbol) and not the final target (i.e. "mod".a)
-                if (referenceLocation.parent.kind === SyntaxKind.ExportSpecifier) {
-                    const aliasedSymbol = typeChecker.getExportSpecifierLocalTargetSymbol(<ExportSpecifier>referenceLocation.parent);
-                    if (searchSymbols.indexOf(aliasedSymbol) >= 0) {
-                        return aliasedSymbol;
-                    }
+                // 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);
                 }
 
                 // If the reference location is in an object literal, try to get the contextual type for the
                 // object literal, lookup the property symbol in the contextual type, and use this symbol to
                 // compare to our searchSymbol
                 if (isNameOfPropertyAssignment(referenceLocation)) {
-                    return forEach(getPropertySymbolsFromContextualType(referenceLocation), contextualSymbol => {
+                    const contextualSymbol = forEach(getPropertySymbolsFromContextualType(referenceLocation), contextualSymbol => {
                         return forEach(typeChecker.getRootSymbols(contextualSymbol), s => searchSymbols.indexOf(s) >= 0 ? s : undefined);
                     });
+
+                    if (contextualSymbol) {
+                        return contextualSymbol;
+                    }
+
+                    // If the reference location is the name of property from object literal destructuring pattern
+                    // Get the property symbol from the object literal's type and look if thats the search symbol
+                    // In below eg. get 'property' from type of elems iterating type
+                    //      for ( { property: p2 } of elems) { }
+                    const propertySymbol = getPropertySymbolOfDestructuringAssignment(referenceLocation);
+                    if (propertySymbol && searchSymbols.indexOf(propertySymbol) >= 0) {
+                        return propertySymbol;
+                    }
+                }
+
+                // If the reference location is the binding element and doesn't have property name
+                // then include the binding element in the related symbols
+                //      let { a } : { a };
+                const bindingElementPropertySymbol = getPropertySymbolOfObjectBindingPatternWithoutPropertyName(referenceSymbol);
+                if (bindingElementPropertySymbol && searchSymbols.indexOf(bindingElementPropertySymbol) >= 0) {
+                    return bindingElementPropertySymbol;
                 }
 
                 // Unwrap symbols to get to the root (e.g. transient symbols as a result of widening)
@@ -6444,7 +6661,7 @@ namespace ts {
         }
 
         /// Syntactic features
-        function getSourceFile(fileName: string): SourceFile {
+        function getNonBoundSourceFile(fileName: string): SourceFile {
             return syntaxTreeCache.getCurrentSourceFile(fileName);
         }
 
@@ -7237,6 +7454,36 @@ namespace ts {
             return { newText: result, caretOffset: preamble.length };
         }
 
+        function isValidBraceCompletionAtPostion(fileName: string, position: number, openingBrace: number): boolean {
+
+            // '<' is currently not supported, figuring out if we're in a Generic Type vs. a comparison is too 
+            // expensive to do during typing scenarios
+            // i.e. whether we're dealing with:
+            //      var x = new foo<| ( with class foo<T>{} )
+            // or 
+            //      var y = 3 <|
+            if (openingBrace === CharacterCodes.lessThan) {
+                return false;
+            }
+
+            const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
+
+            // Check if in a context where we don't want to perform any insertion
+            if (isInString(sourceFile, position) || isInComment(sourceFile, position)) {
+                return false;
+            }
+
+            if (isInsideJsxElementOrAttribute(sourceFile, position)) {
+                return openingBrace === CharacterCodes.openBrace;
+            }
+
+            if (isInTemplateString(sourceFile, position)) {
+                return false;
+            }
+
+            return true;
+        }
+
         function getParametersForJsDocOwningNode(commentOwner: Node): ParameterDeclaration[] {
             if (isFunctionLike(commentOwner)) {
                 return commentOwner.parameters;
@@ -7383,12 +7630,12 @@ namespace ts {
                 // comment portion.
                 const singleLineCommentStart = /(?:\/\/+\s*)/.source;
                 const multiLineCommentStart = /(?:\/\*+\s*)/.source;
-                const anyNumberOfSpacesAndAsterixesAtStartOfLine = /(?:^(?:\s|\*)*)/.source;
+                const anyNumberOfSpacesAndAsterisksAtStartOfLine = /(?:^(?:\s|\*)*)/.source;
 
                 // Match any of the above three TODO comment start regexps.
                 // Note that the outermost group *is* a capture group.  We want to capture the preamble
                 // so that we can determine the starting position of the TODO comment match.
-                const preamble = "(" + anyNumberOfSpacesAndAsterixesAtStartOfLine + "|" + singleLineCommentStart + "|" + multiLineCommentStart + ")";
+                const preamble = "(" + anyNumberOfSpacesAndAsterisksAtStartOfLine + "|" + singleLineCommentStart + "|" + multiLineCommentStart + ")";
 
                 // Takes the descriptors and forms a regexp that matches them as if they were literals.
                 // For example, if the descriptors are "TODO(jason)" and "HACK", then this will be:
@@ -7531,8 +7778,9 @@ namespace ts {
             getFormattingEditsForDocument,
             getFormattingEditsAfterKeystroke,
             getDocCommentTemplateAtPosition,
+            isValidBraceCompletionAtPostion,
             getEmitOutput,
-            getSourceFile,
+            getNonBoundSourceFile,
             getProgram
         };
     }
diff --git a/src/services/shims.ts b/src/services/shims.ts
index a4190d6752b..b849407ebab 100644
--- a/src/services/shims.ts
+++ b/src/services/shims.ts
@@ -19,7 +19,7 @@
 let debugObjectHost = (<any>this);
 
 // We need to use 'null' to interface with the managed side.
-/* tslint:disable:no-null */
+/* tslint:disable:no-null-keyword */
 /* tslint:disable:no-in-operator */
 
 /* @internal */
@@ -55,6 +55,7 @@ namespace ts {
 
         /** Returns a JSON-encoded value of the type: string[] */
         getScriptFileNames(): string;
+        getScriptKind?(fileName: string): ScriptKind;
         getScriptVersion(fileName: string): string;
         getScriptSnapshot(fileName: string): ScriptSnapshotShim;
         getLocalizedDiagnosticMessages(): string;
@@ -66,6 +67,7 @@ namespace ts {
         useCaseSensitiveFileNames?(): boolean;
 
         getModuleResolutionsForFile?(fileName: string): string;
+        getTypeReferenceDirectiveResolutionsForFile?(fileName: string): string;
         directoryExists(directoryName: string): boolean;
     }
 
@@ -77,7 +79,7 @@ namespace ts {
          * @param exclude A JSON encoded string[] containing the paths to exclude
          *  when enumerating the directory.
          */
-        readDirectory(rootDir: string, extension: string, exclude?: string): string;
+        readDirectory(rootDir: string, extension: string, exclude?: string, depth?: number): string;
 
         trace(s: string): void;
     }
@@ -219,6 +221,13 @@ namespace ts {
          */
         getDocCommentTemplateAtPosition(fileName: string, position: number): string;
 
+        /**
+         * Returns JSON-encoded boolean to indicate whether we should support brace location
+         * at the current position.
+         * E.g. we don't want brace completion inside string-literals, comments, etc.
+         */
+        isValidBraceCompletionAtPostion(fileName: string, position: number, openingBrace: number): string;
+
         getEmitOutput(fileName: string): string;
     }
 
@@ -231,6 +240,7 @@ namespace ts {
         getPreProcessedFileInfo(fileName: string, sourceText: IScriptSnapshot): string;
         getTSConfigFileInfo(fileName: string, sourceText: IScriptSnapshot): string;
         getDefaultCompilationSettings(): string;
+        discoverTypings(discoverTypingsJson: string): string;
     }
 
     function logInternalError(logger: Logger, err: Error) {
@@ -279,6 +289,7 @@ namespace ts {
         private tracingEnabled = false;
 
         public resolveModuleNames: (moduleName: string[], containingFile: string) => ResolvedModule[];
+        public resolveTypeReferenceDirectives: (typeDirectiveNames: string[], containingFile: string) => ResolvedTypeReferenceDirective[];
         public directoryExists: (directoryName: string) => boolean;
 
         constructor(private shimHost: LanguageServiceShimHost) {
@@ -296,6 +307,12 @@ namespace ts {
             if ("directoryExists" in this.shimHost) {
                 this.directoryExists = directoryName => this.shimHost.directoryExists(directoryName);
             }
+            if ("getTypeReferenceDirectiveResolutionsForFile" in this.shimHost) {
+                this.resolveTypeReferenceDirectives = (typeDirectiveNames: string[], containingFile: string) => {
+                    const typeDirectivesForFile = <Map<ResolvedTypeReferenceDirective>>JSON.parse(this.shimHost.getTypeReferenceDirectiveResolutionsForFile(containingFile));
+                    return map(typeDirectiveNames, name => lookUp(typeDirectivesForFile, name));
+                };
+            }
         }
 
         public log(s: string): void {
@@ -346,6 +363,15 @@ namespace ts {
             return scriptSnapshot && new ScriptSnapshotShimAdapter(scriptSnapshot);
         }
 
+        public getScriptKind(fileName: string): ScriptKind {
+            if ("getScriptKind" in this.shimHost) {
+                return this.shimHost.getScriptKind(fileName);
+            }
+            else {
+                return ScriptKind.Unknown;
+            }
+        }
+
         public getScriptVersion(fileName: string): string {
             return this.shimHost.getScriptVersion(fileName);
         }
@@ -412,8 +438,16 @@ namespace ts {
             }
         }
 
-        public readDirectory(rootDir: string, extension: string, exclude: string[]): string[] {
-            const encoded = this.shimHost.readDirectory(rootDir, extension, JSON.stringify(exclude));
+        public readDirectory(rootDir: string, extension: string, exclude: string[], depth?: number): string[] {
+            // Wrap the API changes for 2.0 release. This try/catch
+            // should be removed once TypeScript 2.0 has shipped.
+            let encoded: string;
+            try {
+                encoded = this.shimHost.readDirectory(rootDir, extension, JSON.stringify(exclude), depth);
+            }
+            catch (e) {
+                encoded = this.shimHost.readDirectory(rootDir, extension, JSON.stringify(exclude));
+            }
             return JSON.parse(encoded);
         }
 
@@ -706,6 +740,13 @@ namespace ts {
             );
         }
 
+        public isValidBraceCompletionAtPostion(fileName: string, position: number, openingBrace: number): string {
+            return this.forwardJSONCall(
+                `isValidBraceCompletionAtPostion('${fileName}', ${position}, ${openingBrace})`,
+                () => this.languageService.isValidBraceCompletionAtPostion(fileName, position, openingBrace)
+            );
+        }
+
         /// GET SMART INDENT
         public getIndentationAtPosition(fileName: string, position: number, options: string /*Services.EditorOptions*/): string {
             return this.forwardJSONCall(
@@ -744,7 +785,7 @@ namespace ts {
                 `getDocumentHighlights('${fileName}', ${position})`,
                 () => {
                     const results = this.languageService.getDocumentHighlights(fileName, position, JSON.parse(filesToSearch));
-                    // workaround for VS document higlighting issue - keep only items from the initial file
+                    // workaround for VS document highlighting issue - keep only items from the initial file
                     const normalizedName = normalizeSlashes(fileName).toLowerCase();
                     return filter(results, r => normalizeSlashes(r.fileName).toLowerCase() === normalizedName);
                 });
@@ -900,38 +941,49 @@ namespace ts {
             });
         }
 
+        public resolveTypeReferenceDirective(fileName: string, typeReferenceDirective: string, compilerOptionsJson: string): string {
+            return this.forwardJSONCall(`resolveTypeReferenceDirective(${fileName})`, () => {
+                const compilerOptions = <CompilerOptions>JSON.parse(compilerOptionsJson);
+                const result = resolveTypeReferenceDirective(typeReferenceDirective, normalizeSlashes(fileName), compilerOptions, this.host);
+                return {
+                    resolvedFileName: result.resolvedTypeReferenceDirective ? result.resolvedTypeReferenceDirective.resolvedFileName : undefined,
+                    primary: result.resolvedTypeReferenceDirective ? result.resolvedTypeReferenceDirective.primary : true,
+                    failedLookupLocations: result.failedLookupLocations
+                };
+            });
+        }
+
         public getPreProcessedFileInfo(fileName: string, sourceTextSnapshot: IScriptSnapshot): string {
             return this.forwardJSONCall(
                 "getPreProcessedFileInfo('" + fileName + "')",
                 () => {
                     // for now treat files as JavaScript 
                     const result = preProcessFile(sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength()), /* readImportFiles */ true, /* detectJavaScriptImports */ true);
-                    const convertResult = {
-                        referencedFiles: <IFileReference[]>[],
-                        importedFiles: <IFileReference[]>[],
+                    return {
+                        referencedFiles: this.convertFileReferences(result.referencedFiles),
+                        importedFiles: this.convertFileReferences(result.importedFiles),
                         ambientExternalModules: result.ambientExternalModules,
-                        isLibFile: result.isLibFile
+                        isLibFile: result.isLibFile,
+                        typeReferenceDirectives: this.convertFileReferences(result.typeReferenceDirectives)
                     };
-
-                    forEach(result.referencedFiles, refFile => {
-                        convertResult.referencedFiles.push({
-                            path: normalizePath(refFile.fileName),
-                            position: refFile.pos,
-                            length: refFile.end - refFile.pos
-                        });
-                    });
-
-                    forEach(result.importedFiles, importedFile => {
-                        convertResult.importedFiles.push({
-                            path: normalizeSlashes(importedFile.fileName),
-                            position: importedFile.pos,
-                            length: importedFile.end - importedFile.pos
-                        });
-                    });
-                    return convertResult;
                 });
         }
 
+        private convertFileReferences(refs: FileReference[]): IFileReference[] {
+            if (!refs) {
+                return undefined;
+            }
+            const result: IFileReference[] = [];
+            for (const ref of refs) {
+                result.push({
+                    path: normalizeSlashes(ref.fileName),
+                    position: ref.pos,
+                    length: ref.end - ref.pos
+                });
+            }
+            return result;
+        }
+
         public getTSConfigFileInfo(fileName: string, sourceTextSnapshot: IScriptSnapshot): string {
             return this.forwardJSONCall(
                 `getTSConfigFileInfo('${fileName}')`,
@@ -943,6 +995,7 @@ namespace ts {
                     if (result.error) {
                         return {
                             options: {},
+                            typingOptions: {},
                             files: [],
                             errors: [realizeDiagnostic(result.error, "\r\n")]
                         };
@@ -953,6 +1006,7 @@ namespace ts {
 
                     return {
                         options: configFile.options,
+                        typingOptions: configFile.typingOptions,
                         files: configFile.fileNames,
                         errors: realizeDiagnostics(configFile.errors, "\r\n")
                     };
@@ -965,6 +1019,21 @@ namespace ts {
                 () => getDefaultCompilerOptions()
             );
         }
+
+        public discoverTypings(discoverTypingsJson: string): string {
+            const getCanonicalFileName = createGetCanonicalFileName(/*useCaseSensitivefileNames:*/ false);
+            return this.forwardJSONCall("discoverTypings()", () => {
+                const info = <DiscoverTypingsInfo>JSON.parse(discoverTypingsJson);
+                return ts.JsTyping.discoverTypings(
+                    this.host,
+                    info.fileNames,
+                    toPath(info.projectRootPath, info.projectRootPath, getCanonicalFileName),
+                    toPath(info.safeListPath, info.safeListPath, getCanonicalFileName),
+                    info.packageNameToTypingLocation,
+                    info.typingOptions,
+                    info.compilerOptions);
+            });
+        }
     }
 
     export class TypeScriptServicesFactory implements ShimFactory {
diff --git a/src/services/signatureHelp.ts b/src/services/signatureHelp.ts
index 02e36e185a5..9e8a2f14ed8 100644
--- a/src/services/signatureHelp.ts
+++ b/src/services/signatureHelp.ts
@@ -50,7 +50,7 @@ namespace ts.SignatureHelp {
     //            case TypeScript.SyntaxKind.GreaterThanGreaterThanGreaterThanToken:
     //                stack++;
 
-    //            // Intentaion fall through
+    //            // Intentional fall through
     //            case TypeScript.SyntaxKind.GreaterThanToken:
     //                stack++;
     //                break;
@@ -76,7 +76,7 @@ namespace ts.SignatureHelp {
     //                break;
 
     //            case TypeScript.SyntaxKind.EqualsGreaterThanToken:
-    //                // This can be a function type or a constructor type. In either case, we want to skip the function defintion
+    //                // This can be a function type or a constructor type. In either case, we want to skip the function definition
     //                token = previousToken(token, /*includeSkippedTokens*/ true);
 
     //                if (token && token.kind() === TypeScript.SyntaxKind.CloseParenToken) {
@@ -99,7 +99,7 @@ namespace ts.SignatureHelp {
     //                    }
     //                }
     //                else {
-    //                    // This is not a funtion type. exit the main loop
+    //                    // This is not a function type. exit the main loop
     //                    break whileLoop;
     //                }
 
@@ -559,7 +559,7 @@ namespace ts.SignatureHelp {
                     signatureHelpParameters = typeParameters && typeParameters.length > 0 ? map(typeParameters, createSignatureHelpParameterForTypeParameter) : emptyArray;
                     suffixDisplayParts.push(punctuationPart(SyntaxKind.GreaterThanToken));
                     let parameterParts = mapToDisplayParts(writer =>
-                        typeChecker.getSymbolDisplayBuilder().buildDisplayForParametersAndDelimiters(candidateSignature.parameters, writer, invocation));
+                        typeChecker.getSymbolDisplayBuilder().buildDisplayForParametersAndDelimiters(candidateSignature.thisType, candidateSignature.parameters, writer, invocation));
                     addRange(suffixDisplayParts, parameterParts);
                 }
                 else {
diff --git a/src/services/tsconfig.json b/src/services/tsconfig.json
index 5dcee789243..6aa7e61391b 100644
--- a/src/services/tsconfig.json
+++ b/src/services/tsconfig.json
@@ -1,6 +1,5 @@
 {
     "compilerOptions": {
-        "module": "commonjs",
         "noImplicitAny": true,
         "removeComments": true,
         "preserveConstEnums": true,
@@ -30,6 +29,7 @@
         "shims.ts",
         "signatureHelp.ts",
         "utilities.ts",
+        "jsTyping.ts",
         "formatting/formatting.ts",
         "formatting/formattingContext.ts",
         "formatting/formattingRequestKind.ts",
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index afdc85fffd8..b1101026cdb 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -6,32 +6,6 @@ namespace ts {
         list: Node;
     }
 
-    export function getEndLinePosition(line: number, sourceFile: SourceFile): number {
-        Debug.assert(line >= 0);
-        let lineStarts = sourceFile.getLineStarts();
-
-        let lineIndex = line;
-        if (lineIndex + 1 === lineStarts.length) {
-            // last line - return EOF
-            return sourceFile.text.length - 1;
-        }
-        else {
-            // current line start
-            let start = lineStarts[lineIndex];
-            // take the start position of the next line -1 = it should be some line break
-            let pos = lineStarts[lineIndex + 1] - 1;
-            Debug.assert(isLineBreak(sourceFile.text.charCodeAt(pos)));
-            // walk backwards skipping line breaks, stop the the beginning of current line.
-            // i.e:
-            // <some text>
-            // $ <- end of line for this position should match the start position
-            while (start <= pos && isLineBreak(sourceFile.text.charCodeAt(pos))) {
-                pos--;
-            }
-            return pos;
-        }
-    }
-
     export function getLineStartPositionForPosition(position: number, sourceFile: SourceFile): number {
         let lineStarts = sourceFile.getLineStarts();
         let line = sourceFile.getLineAndCharacterOfPosition(position).line;
@@ -147,7 +121,7 @@ namespace ts {
 
             case SyntaxKind.CaseClause:
             case SyntaxKind.DefaultClause:
-                // there is no such thing as terminator token for CaseClause/DefaultClause so for simplicitly always consider them non-completed
+                // there is no such thing as terminator token for CaseClause/DefaultClause so for simplicity always consider them non-completed
                 return false;
 
             case SyntaxKind.ForStatement:
@@ -265,7 +239,7 @@ namespace ts {
     }
 
     /* Gets the token whose text has range [start, end) and position >= start
-     * and (position < end or (position === end && token is keyword or identifier or numeric\string litera))
+     * and (position < end or (position === end && token is keyword or identifier or numeric/string literal))
      */
     export function getTouchingPropertyName(sourceFile: SourceFile, position: number): Node {
         return getTouchingToken(sourceFile, position, n => isPropertyName(n.kind));
@@ -429,13 +403,53 @@ namespace ts {
 
     export function isInString(sourceFile: SourceFile, position: number) {
         let token = getTokenAtPosition(sourceFile, position);
-        return token && (token.kind === SyntaxKind.StringLiteral || token.kind === SyntaxKind.StringLiteralType) && position > token.getStart();
+        return token && (token.kind === SyntaxKind.StringLiteral || token.kind === SyntaxKind.StringLiteralType) && position > token.getStart(sourceFile);
     }
 
     export function isInComment(sourceFile: SourceFile, position: number) {
         return isInCommentHelper(sourceFile, position, /*predicate*/ undefined);
     }
 
+    /**
+     * returns true if the position is in between the open and close elements of an JSX expression.
+     */
+    export function isInsideJsxElementOrAttribute(sourceFile: SourceFile, position: number) {
+        let token = getTokenAtPosition(sourceFile, position);
+
+        if (!token) {
+            return false;
+        }
+
+        // <div>Hello |</div>
+        if (token.kind === SyntaxKind.LessThanToken && token.parent.kind === SyntaxKind.JsxText) {
+            return true;
+        }
+
+        // <div> { | </div> or <div a={| </div>
+        if (token.kind === SyntaxKind.LessThanToken && token.parent.kind === SyntaxKind.JsxExpression) {
+            return true;
+        }
+
+        // <div> { 
+        // |
+        // } < /div>
+        if (token && token.kind === SyntaxKind.CloseBraceToken && token.parent.kind === SyntaxKind.JsxExpression) {
+            return true;
+        }
+
+        // <div>|</div>
+        if (token.kind === SyntaxKind.LessThanToken && token.parent.kind === SyntaxKind.JsxClosingElement) {
+            return true;
+        }
+
+        return false;
+    }
+
+    export function isInTemplateString(sourceFile: SourceFile, position: number) {
+        let token = getTokenAtPosition(sourceFile, position);
+        return isTemplateLiteralKind(token.kind) && position > token.getStart(sourceFile);
+    }
+
     /**
      * Returns true if the cursor at position in sourceFile is within a comment that additionally
      * satisfies predicate, and false otherwise.
@@ -443,7 +457,7 @@ namespace ts {
     export function isInCommentHelper(sourceFile: SourceFile, position: number, predicate?: (c: CommentRange) => boolean): boolean {
         let token = getTokenAtPosition(sourceFile, position);
 
-        if (token && position <= token.getStart()) {
+        if (token && position <= token.getStart(sourceFile)) {
             let commentRanges = getLeadingCommentRanges(sourceFile.text, token.pos);
 
             // The end marker of a single-line comment does not include the newline character.
@@ -521,15 +535,15 @@ namespace ts {
     }
 
     export function getNodeModifiers(node: Node): string {
-        let flags = getCombinedNodeFlags(node);
+        let flags = getCombinedModifierFlags(node);
         let 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;
@@ -615,7 +629,7 @@ namespace ts {
             // [a,b,c] from:
             // [a, b, c] = someExpression;
             if (node.parent.kind === SyntaxKind.BinaryExpression &&
-                (<BinaryExpression>node.parent).left === node && 
+                (<BinaryExpression>node.parent).left === node &&
                 (<BinaryExpression>node.parent).operatorToken.kind === SyntaxKind.EqualsToken) {
                 return true;
             }
@@ -629,7 +643,7 @@ namespace ts {
 
             // [a, b, c] of
             // [x, [a, b, c] ] = someExpression
-            // or 
+            // or
             // {x, a: {a, b, c} } = someExpression
             if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === SyntaxKind.PropertyAssignment ? node.parent.parent : node.parent)) {
                 return true;
@@ -837,4 +851,19 @@ namespace ts {
         };
         return name;
     }
+
+    export function scriptKindIs(fileName: string, host: LanguageServiceHost, ...scriptKinds: ScriptKind[]): boolean {
+        const scriptKind = getScriptKind(fileName, host);
+        return forEach(scriptKinds, k => k === scriptKind);
+    }
+
+    export function getScriptKind(fileName: string, host?: LanguageServiceHost): ScriptKind {
+        // First check to see if the script kind can be determined from the file name
+        var scriptKind = getScriptKindFromFileName(fileName);
+        if (scriptKind === ScriptKind.Unknown && host && host.getScriptKind) {
+            // Next check to see if the host can resolve the script kind
+            scriptKind = host.getScriptKind(fileName);
+        }
+        return ensureScriptKind(fileName, scriptKind);
+    }
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/1.0lib-noErrors.symbols b/tests/baselines/reference/1.0lib-noErrors.symbols
index 789018598d1..adedbdb9aa2 100644
--- a/tests/baselines/reference/1.0lib-noErrors.symbols
+++ b/tests/baselines/reference/1.0lib-noErrors.symbols
@@ -106,22 +106,22 @@ interface PropertyDescriptor {
 >PropertyDescriptor : Symbol(PropertyDescriptor, Decl(1.0lib-noErrors.ts, 79, 66))
 
     configurable?: boolean;
->configurable : Symbol(configurable, Decl(1.0lib-noErrors.ts, 81, 30))
+>configurable : Symbol(PropertyDescriptor.configurable, Decl(1.0lib-noErrors.ts, 81, 30))
 
     enumerable?: boolean;
->enumerable : Symbol(enumerable, Decl(1.0lib-noErrors.ts, 82, 27))
+>enumerable : Symbol(PropertyDescriptor.enumerable, Decl(1.0lib-noErrors.ts, 82, 27))
 
     value?: any;
->value : Symbol(value, Decl(1.0lib-noErrors.ts, 83, 25))
+>value : Symbol(PropertyDescriptor.value, Decl(1.0lib-noErrors.ts, 83, 25))
 
     writable?: boolean;
->writable : Symbol(writable, Decl(1.0lib-noErrors.ts, 84, 16))
+>writable : Symbol(PropertyDescriptor.writable, Decl(1.0lib-noErrors.ts, 84, 16))
 
     get?(): any;
->get : Symbol(get, Decl(1.0lib-noErrors.ts, 85, 23))
+>get : Symbol(PropertyDescriptor.get, Decl(1.0lib-noErrors.ts, 85, 23))
 
     set?(v: any): void;
->set : Symbol(set, Decl(1.0lib-noErrors.ts, 86, 16))
+>set : Symbol(PropertyDescriptor.set, Decl(1.0lib-noErrors.ts, 86, 16))
 >v : Symbol(v, Decl(1.0lib-noErrors.ts, 87, 9))
 }
 
@@ -138,20 +138,20 @@ interface Object {
 
     /** The initial value of Object.prototype.constructor is the standard built-in Object constructor. */
     constructor: Function;
->constructor : Symbol(constructor, Decl(1.0lib-noErrors.ts, 94, 18))
+>constructor : Symbol(Object.constructor, Decl(1.0lib-noErrors.ts, 94, 18))
 >Function : Symbol(Function, Decl(1.0lib-noErrors.ts, 221, 1), Decl(1.0lib-noErrors.ts, 257, 11))
 
     /** Returns a string representation of an object. */
     toString(): string;
->toString : Symbol(toString, Decl(1.0lib-noErrors.ts, 96, 26))
+>toString : Symbol(Object.toString, Decl(1.0lib-noErrors.ts, 96, 26))
 
     /** Returns a date converted to a string using the current locale. */
     toLocaleString(): string;
->toLocaleString : Symbol(toLocaleString, Decl(1.0lib-noErrors.ts, 99, 23))
+>toLocaleString : Symbol(Object.toLocaleString, Decl(1.0lib-noErrors.ts, 99, 23))
 
     /** Returns the primitive value of the specified object. */
     valueOf(): Object;
->valueOf : Symbol(valueOf, Decl(1.0lib-noErrors.ts, 102, 29))
+>valueOf : Symbol(Object.valueOf, Decl(1.0lib-noErrors.ts, 102, 29))
 >Object : Symbol(Object, Decl(1.0lib-noErrors.ts, 92, 1), Decl(1.0lib-noErrors.ts, 129, 11))
 
     /**
@@ -159,7 +159,7 @@ interface Object {
       * @param v A property name.
       */
     hasOwnProperty(v: string): boolean;
->hasOwnProperty : Symbol(hasOwnProperty, Decl(1.0lib-noErrors.ts, 105, 22))
+>hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(1.0lib-noErrors.ts, 105, 22))
 >v : Symbol(v, Decl(1.0lib-noErrors.ts, 111, 19))
 
     /**
@@ -167,7 +167,7 @@ interface Object {
       * @param v Another object whose prototype chain is to be checked.
       */
     isPrototypeOf(v: Object): boolean;
->isPrototypeOf : Symbol(isPrototypeOf, Decl(1.0lib-noErrors.ts, 111, 39))
+>isPrototypeOf : Symbol(Object.isPrototypeOf, Decl(1.0lib-noErrors.ts, 111, 39))
 >v : Symbol(v, Decl(1.0lib-noErrors.ts, 117, 18))
 >Object : Symbol(Object, Decl(1.0lib-noErrors.ts, 92, 1), Decl(1.0lib-noErrors.ts, 129, 11))
 
@@ -176,7 +176,7 @@ interface Object {
       * @param v A property name.
       */
     propertyIsEnumerable(v: string): boolean;
->propertyIsEnumerable : Symbol(propertyIsEnumerable, Decl(1.0lib-noErrors.ts, 117, 38))
+>propertyIsEnumerable : Symbol(Object.propertyIsEnumerable, Decl(1.0lib-noErrors.ts, 117, 38))
 >v : Symbol(v, Decl(1.0lib-noErrors.ts, 123, 25))
 }
 
@@ -332,7 +332,7 @@ interface Function {
       * @param argArray A set of arguments to be passed to the function.
       */
     apply(thisArg: any, argArray?: any): any;
->apply : Symbol(apply, Decl(1.0lib-noErrors.ts, 226, 20))
+>apply : Symbol(Function.apply, Decl(1.0lib-noErrors.ts, 226, 20))
 >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 232, 10))
 >argArray : Symbol(argArray, Decl(1.0lib-noErrors.ts, 232, 23))
 
@@ -342,7 +342,7 @@ interface Function {
       * @param argArray A list of arguments to be passed to the method.
       */
     call(thisArg: any, ...argArray: any[]): any;
->call : Symbol(call, Decl(1.0lib-noErrors.ts, 232, 45))
+>call : Symbol(Function.call, Decl(1.0lib-noErrors.ts, 232, 45))
 >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 239, 9))
 >argArray : Symbol(argArray, Decl(1.0lib-noErrors.ts, 239, 22))
 
@@ -353,22 +353,22 @@ interface Function {
       * @param argArray A list of arguments to be passed to the new function.
       */
     bind(thisArg: any, ...argArray: any[]): any;
->bind : Symbol(bind, Decl(1.0lib-noErrors.ts, 239, 48))
+>bind : Symbol(Function.bind, Decl(1.0lib-noErrors.ts, 239, 48))
 >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 247, 9))
 >argArray : Symbol(argArray, Decl(1.0lib-noErrors.ts, 247, 22))
 
     prototype: any;
->prototype : Symbol(prototype, Decl(1.0lib-noErrors.ts, 247, 48))
+>prototype : Symbol(Function.prototype, Decl(1.0lib-noErrors.ts, 247, 48))
 
     length: number;
->length : Symbol(length, Decl(1.0lib-noErrors.ts, 249, 19))
+>length : Symbol(Function.length, Decl(1.0lib-noErrors.ts, 249, 19))
 
     // Non-standard extensions
     arguments: any;
->arguments : Symbol(arguments, Decl(1.0lib-noErrors.ts, 250, 19))
+>arguments : Symbol(Function.arguments, Decl(1.0lib-noErrors.ts, 250, 19))
 
     caller: Function;
->caller : Symbol(caller, Decl(1.0lib-noErrors.ts, 253, 19))
+>caller : Symbol(Function.caller, Decl(1.0lib-noErrors.ts, 253, 19))
 >Function : Symbol(Function, Decl(1.0lib-noErrors.ts, 221, 1), Decl(1.0lib-noErrors.ts, 257, 11))
 }
 
@@ -399,10 +399,10 @@ interface IArguments {
 >index : Symbol(index, Decl(1.0lib-noErrors.ts, 268, 5))
 
     length: number;
->length : Symbol(length, Decl(1.0lib-noErrors.ts, 268, 25))
+>length : Symbol(IArguments.length, Decl(1.0lib-noErrors.ts, 268, 25))
 
     callee: Function;
->callee : Symbol(callee, Decl(1.0lib-noErrors.ts, 269, 19))
+>callee : Symbol(IArguments.callee, Decl(1.0lib-noErrors.ts, 269, 19))
 >Function : Symbol(Function, Decl(1.0lib-noErrors.ts, 221, 1), Decl(1.0lib-noErrors.ts, 257, 11))
 }
 
@@ -411,14 +411,14 @@ interface String {
 
     /** Returns a string representation of a string. */
     toString(): string;
->toString : Symbol(toString, Decl(1.0lib-noErrors.ts, 273, 18))
+>toString : Symbol(String.toString, Decl(1.0lib-noErrors.ts, 273, 18))
 
     /**
       * Returns the character at the specified index.
       * @param pos The zero-based index of the desired character.
       */
     charAt(pos: number): string;
->charAt : Symbol(charAt, Decl(1.0lib-noErrors.ts, 275, 23))
+>charAt : Symbol(String.charAt, Decl(1.0lib-noErrors.ts, 275, 23))
 >pos : Symbol(pos, Decl(1.0lib-noErrors.ts, 281, 11))
 
     /** 
@@ -426,7 +426,7 @@ interface String {
       * @param index The zero-based index of the desired character. If there is no character at the specified index, NaN is returned.
       */
     charCodeAt(index: number): number;
->charCodeAt : Symbol(charCodeAt, Decl(1.0lib-noErrors.ts, 281, 32))
+>charCodeAt : Symbol(String.charCodeAt, Decl(1.0lib-noErrors.ts, 281, 32))
 >index : Symbol(index, Decl(1.0lib-noErrors.ts, 287, 15))
 
     /**
@@ -434,7 +434,7 @@ interface String {
       * @param strings The strings to append to the end of the string.  
       */
     concat(...strings: string[]): string;
->concat : Symbol(concat, Decl(1.0lib-noErrors.ts, 287, 38))
+>concat : Symbol(String.concat, Decl(1.0lib-noErrors.ts, 287, 38))
 >strings : Symbol(strings, Decl(1.0lib-noErrors.ts, 293, 11))
 
     /**
@@ -443,7 +443,7 @@ interface String {
       * @param position The index at which to begin searching the String object. If omitted, search starts at the beginning of the string.
       */
     indexOf(searchString: string, position?: number): number;
->indexOf : Symbol(indexOf, Decl(1.0lib-noErrors.ts, 293, 41))
+>indexOf : Symbol(String.indexOf, Decl(1.0lib-noErrors.ts, 293, 41))
 >searchString : Symbol(searchString, Decl(1.0lib-noErrors.ts, 300, 12))
 >position : Symbol(position, Decl(1.0lib-noErrors.ts, 300, 33))
 
@@ -453,7 +453,7 @@ interface String {
       * @param position The index at which to begin searching. If omitted, the search begins at the end of the string.
       */
     lastIndexOf(searchString: string, position?: number): number;
->lastIndexOf : Symbol(lastIndexOf, Decl(1.0lib-noErrors.ts, 300, 61))
+>lastIndexOf : Symbol(String.lastIndexOf, Decl(1.0lib-noErrors.ts, 300, 61))
 >searchString : Symbol(searchString, Decl(1.0lib-noErrors.ts, 307, 16))
 >position : Symbol(position, Decl(1.0lib-noErrors.ts, 307, 37))
 
@@ -462,7 +462,7 @@ interface String {
       * @param that String to compare to target string
       */
     localeCompare(that: string): number;
->localeCompare : Symbol(localeCompare, Decl(1.0lib-noErrors.ts, 307, 65))
+>localeCompare : Symbol(String.localeCompare, Decl(1.0lib-noErrors.ts, 307, 65))
 >that : Symbol(that, Decl(1.0lib-noErrors.ts, 313, 18))
 
     /** 
@@ -470,7 +470,7 @@ interface String {
       * @param regexp A variable name or string literal containing the regular expression pattern and flags.
       */
     match(regexp: string): string[];
->match : Symbol(match, Decl(1.0lib-noErrors.ts, 313, 40), Decl(1.0lib-noErrors.ts, 319, 36))
+>match : Symbol(String.match, Decl(1.0lib-noErrors.ts, 313, 40), Decl(1.0lib-noErrors.ts, 319, 36))
 >regexp : Symbol(regexp, Decl(1.0lib-noErrors.ts, 319, 10))
 
     /** 
@@ -478,7 +478,7 @@ interface String {
       * @param regexp A regular expression object that contains the regular expression pattern and applicable flags. 
       */
     match(regexp: RegExp): string[];
->match : Symbol(match, Decl(1.0lib-noErrors.ts, 313, 40), Decl(1.0lib-noErrors.ts, 319, 36))
+>match : Symbol(String.match, Decl(1.0lib-noErrors.ts, 313, 40), Decl(1.0lib-noErrors.ts, 319, 36))
 >regexp : Symbol(regexp, Decl(1.0lib-noErrors.ts, 325, 10))
 >RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 822, 1), Decl(1.0lib-noErrors.ts, 855, 11))
 
@@ -488,7 +488,7 @@ interface String {
       * @param replaceValue A String object or string literal containing the text to replace for every successful match of rgExp in stringObj.
       */
     replace(searchValue: string, replaceValue: string): string;
->replace : Symbol(replace, Decl(1.0lib-noErrors.ts, 325, 36), Decl(1.0lib-noErrors.ts, 332, 63), Decl(1.0lib-noErrors.ts, 339, 102), Decl(1.0lib-noErrors.ts, 346, 63))
+>replace : Symbol(String.replace, Decl(1.0lib-noErrors.ts, 325, 36), Decl(1.0lib-noErrors.ts, 332, 63), Decl(1.0lib-noErrors.ts, 339, 102), Decl(1.0lib-noErrors.ts, 346, 63))
 >searchValue : Symbol(searchValue, Decl(1.0lib-noErrors.ts, 332, 12))
 >replaceValue : Symbol(replaceValue, Decl(1.0lib-noErrors.ts, 332, 32))
 
@@ -498,7 +498,7 @@ interface String {
       * @param replaceValue A function that returns the replacement text.
       */
     replace(searchValue: string, replaceValue: (substring: string, ...args: any[]) => string): string;
->replace : Symbol(replace, Decl(1.0lib-noErrors.ts, 325, 36), Decl(1.0lib-noErrors.ts, 332, 63), Decl(1.0lib-noErrors.ts, 339, 102), Decl(1.0lib-noErrors.ts, 346, 63))
+>replace : Symbol(String.replace, Decl(1.0lib-noErrors.ts, 325, 36), Decl(1.0lib-noErrors.ts, 332, 63), Decl(1.0lib-noErrors.ts, 339, 102), Decl(1.0lib-noErrors.ts, 346, 63))
 >searchValue : Symbol(searchValue, Decl(1.0lib-noErrors.ts, 339, 12))
 >replaceValue : Symbol(replaceValue, Decl(1.0lib-noErrors.ts, 339, 32))
 >substring : Symbol(substring, Decl(1.0lib-noErrors.ts, 339, 48))
@@ -510,7 +510,7 @@ interface String {
       * @param replaceValue A String object or string literal containing the text to replace for every successful match of rgExp in stringObj.
       */
     replace(searchValue: RegExp, replaceValue: string): string;
->replace : Symbol(replace, Decl(1.0lib-noErrors.ts, 325, 36), Decl(1.0lib-noErrors.ts, 332, 63), Decl(1.0lib-noErrors.ts, 339, 102), Decl(1.0lib-noErrors.ts, 346, 63))
+>replace : Symbol(String.replace, Decl(1.0lib-noErrors.ts, 325, 36), Decl(1.0lib-noErrors.ts, 332, 63), Decl(1.0lib-noErrors.ts, 339, 102), Decl(1.0lib-noErrors.ts, 346, 63))
 >searchValue : Symbol(searchValue, Decl(1.0lib-noErrors.ts, 346, 12))
 >RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 822, 1), Decl(1.0lib-noErrors.ts, 855, 11))
 >replaceValue : Symbol(replaceValue, Decl(1.0lib-noErrors.ts, 346, 32))
@@ -521,7 +521,7 @@ interface String {
       * @param replaceValue A function that returns the replacement text.
       */
     replace(searchValue: RegExp, replaceValue: (substring: string, ...args: any[]) => string): string;
->replace : Symbol(replace, Decl(1.0lib-noErrors.ts, 325, 36), Decl(1.0lib-noErrors.ts, 332, 63), Decl(1.0lib-noErrors.ts, 339, 102), Decl(1.0lib-noErrors.ts, 346, 63))
+>replace : Symbol(String.replace, Decl(1.0lib-noErrors.ts, 325, 36), Decl(1.0lib-noErrors.ts, 332, 63), Decl(1.0lib-noErrors.ts, 339, 102), Decl(1.0lib-noErrors.ts, 346, 63))
 >searchValue : Symbol(searchValue, Decl(1.0lib-noErrors.ts, 353, 12))
 >RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 822, 1), Decl(1.0lib-noErrors.ts, 855, 11))
 >replaceValue : Symbol(replaceValue, Decl(1.0lib-noErrors.ts, 353, 32))
@@ -533,7 +533,7 @@ interface String {
       * @param regexp The regular expression pattern and applicable flags. 
       */
     search(regexp: string): number;
->search : Symbol(search, Decl(1.0lib-noErrors.ts, 353, 102), Decl(1.0lib-noErrors.ts, 359, 35))
+>search : Symbol(String.search, Decl(1.0lib-noErrors.ts, 353, 102), Decl(1.0lib-noErrors.ts, 359, 35))
 >regexp : Symbol(regexp, Decl(1.0lib-noErrors.ts, 359, 11))
 
     /**
@@ -541,7 +541,7 @@ interface String {
       * @param regexp The regular expression pattern and applicable flags. 
       */
     search(regexp: RegExp): number;
->search : Symbol(search, Decl(1.0lib-noErrors.ts, 353, 102), Decl(1.0lib-noErrors.ts, 359, 35))
+>search : Symbol(String.search, Decl(1.0lib-noErrors.ts, 353, 102), Decl(1.0lib-noErrors.ts, 359, 35))
 >regexp : Symbol(regexp, Decl(1.0lib-noErrors.ts, 365, 11))
 >RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 822, 1), Decl(1.0lib-noErrors.ts, 855, 11))
 
@@ -552,7 +552,7 @@ interface String {
       * If this value is not specified, the substring continues to the end of stringObj.
       */
     slice(start?: number, end?: number): string;
->slice : Symbol(slice, Decl(1.0lib-noErrors.ts, 365, 35))
+>slice : Symbol(String.slice, Decl(1.0lib-noErrors.ts, 365, 35))
 >start : Symbol(start, Decl(1.0lib-noErrors.ts, 373, 10))
 >end : Symbol(end, Decl(1.0lib-noErrors.ts, 373, 25))
 
@@ -562,7 +562,7 @@ interface String {
       * @param limit A value used to limit the number of elements returned in the array.
       */
     split(separator: string, limit?: number): string[];
->split : Symbol(split, Decl(1.0lib-noErrors.ts, 373, 48), Decl(1.0lib-noErrors.ts, 380, 55))
+>split : Symbol(String.split, Decl(1.0lib-noErrors.ts, 373, 48), Decl(1.0lib-noErrors.ts, 380, 55))
 >separator : Symbol(separator, Decl(1.0lib-noErrors.ts, 380, 10))
 >limit : Symbol(limit, Decl(1.0lib-noErrors.ts, 380, 28))
 
@@ -572,7 +572,7 @@ interface String {
       * @param limit A value used to limit the number of elements returned in the array.
       */
     split(separator: RegExp, limit?: number): string[];
->split : Symbol(split, Decl(1.0lib-noErrors.ts, 373, 48), Decl(1.0lib-noErrors.ts, 380, 55))
+>split : Symbol(String.split, Decl(1.0lib-noErrors.ts, 373, 48), Decl(1.0lib-noErrors.ts, 380, 55))
 >separator : Symbol(separator, Decl(1.0lib-noErrors.ts, 387, 10))
 >RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 822, 1), Decl(1.0lib-noErrors.ts, 855, 11))
 >limit : Symbol(limit, Decl(1.0lib-noErrors.ts, 387, 28))
@@ -584,33 +584,33 @@ interface String {
       * If end is omitted, the characters from start through the end of the original string are returned.
       */
     substring(start: number, end?: number): string;
->substring : Symbol(substring, Decl(1.0lib-noErrors.ts, 387, 55))
+>substring : Symbol(String.substring, Decl(1.0lib-noErrors.ts, 387, 55))
 >start : Symbol(start, Decl(1.0lib-noErrors.ts, 395, 14))
 >end : Symbol(end, Decl(1.0lib-noErrors.ts, 395, 28))
 
     /** Converts all the alphabetic characters in a string to lowercase. */
     toLowerCase(): string;
->toLowerCase : Symbol(toLowerCase, Decl(1.0lib-noErrors.ts, 395, 51))
+>toLowerCase : Symbol(String.toLowerCase, Decl(1.0lib-noErrors.ts, 395, 51))
 
     /** Converts all alphabetic characters to lowercase, taking into account the host environment's current locale. */
     toLocaleLowerCase(): string;
->toLocaleLowerCase : Symbol(toLocaleLowerCase, Decl(1.0lib-noErrors.ts, 398, 26))
+>toLocaleLowerCase : Symbol(String.toLocaleLowerCase, Decl(1.0lib-noErrors.ts, 398, 26))
 
     /** Converts all the alphabetic characters in a string to uppercase. */
     toUpperCase(): string;
->toUpperCase : Symbol(toUpperCase, Decl(1.0lib-noErrors.ts, 401, 32))
+>toUpperCase : Symbol(String.toUpperCase, Decl(1.0lib-noErrors.ts, 401, 32))
 
     /** Returns a string where all alphabetic characters have been converted to uppercase, taking into account the host environment's current locale. */
     toLocaleUpperCase(): string;
->toLocaleUpperCase : Symbol(toLocaleUpperCase, Decl(1.0lib-noErrors.ts, 404, 26))
+>toLocaleUpperCase : Symbol(String.toLocaleUpperCase, Decl(1.0lib-noErrors.ts, 404, 26))
 
     /** Removes the leading and trailing white space and line terminator characters from a string. */
     trim(): string;
->trim : Symbol(trim, Decl(1.0lib-noErrors.ts, 407, 32))
+>trim : Symbol(String.trim, Decl(1.0lib-noErrors.ts, 407, 32))
 
     /** Returns the length of a String object. */
     length: number;
->length : Symbol(length, Decl(1.0lib-noErrors.ts, 410, 19))
+>length : Symbol(String.length, Decl(1.0lib-noErrors.ts, 410, 19))
 
     // IE extensions
     /**
@@ -619,7 +619,7 @@ interface String {
       * @param length The number of characters to include in the returned substring.
       */
     substr(from: number, length?: number): string;
->substr : Symbol(substr, Decl(1.0lib-noErrors.ts, 413, 19))
+>substr : Symbol(String.substr, Decl(1.0lib-noErrors.ts, 413, 19))
 >from : Symbol(from, Decl(1.0lib-noErrors.ts, 421, 11))
 >length : Symbol(length, Decl(1.0lib-noErrors.ts, 421, 24))
 
@@ -675,7 +675,7 @@ interface Number {
       * @param radix Specifies a radix for converting numeric values to strings. This value is only used for numbers.
       */
     toString(radix?: number): string;
->toString : Symbol(toString, Decl(1.0lib-noErrors.ts, 444, 18))
+>toString : Symbol(Number.toString, Decl(1.0lib-noErrors.ts, 444, 18))
 >radix : Symbol(radix, Decl(1.0lib-noErrors.ts, 449, 13))
 
     /** 
@@ -683,7 +683,7 @@ interface Number {
       * @param fractionDigits Number of digits after the decimal point. Must be in the range 0 - 20, inclusive.
       */
     toFixed(fractionDigits?: number): string;
->toFixed : Symbol(toFixed, Decl(1.0lib-noErrors.ts, 449, 37))
+>toFixed : Symbol(Number.toFixed, Decl(1.0lib-noErrors.ts, 449, 37))
 >fractionDigits : Symbol(fractionDigits, Decl(1.0lib-noErrors.ts, 455, 12))
 
     /**
@@ -691,7 +691,7 @@ interface Number {
       * @param fractionDigits Number of digits after the decimal point. Must be in the range 0 - 20, inclusive.
       */
     toExponential(fractionDigits?: number): string;
->toExponential : Symbol(toExponential, Decl(1.0lib-noErrors.ts, 455, 45))
+>toExponential : Symbol(Number.toExponential, Decl(1.0lib-noErrors.ts, 455, 45))
 >fractionDigits : Symbol(fractionDigits, Decl(1.0lib-noErrors.ts, 461, 18))
 
     /**
@@ -699,7 +699,7 @@ interface Number {
       * @param precision Number of significant digits. Must be in the range 1 - 21, inclusive.
       */
     toPrecision(precision?: number): string;
->toPrecision : Symbol(toPrecision, Decl(1.0lib-noErrors.ts, 461, 51))
+>toPrecision : Symbol(Number.toPrecision, Decl(1.0lib-noErrors.ts, 461, 51))
 >precision : Symbol(precision, Decl(1.0lib-noErrors.ts, 467, 16))
 }
 
@@ -753,35 +753,35 @@ interface Math {
 
     /** The mathematical constant e. This is Euler's number, the base of natural logarithms. */
     E: number;
->E : Symbol(E, Decl(1.0lib-noErrors.ts, 501, 16))
+>E : Symbol(Math.E, Decl(1.0lib-noErrors.ts, 501, 16))
 
     /** The natural logarithm of 10. */
     LN10: number;
->LN10 : Symbol(LN10, Decl(1.0lib-noErrors.ts, 503, 14))
+>LN10 : Symbol(Math.LN10, Decl(1.0lib-noErrors.ts, 503, 14))
 
     /** The natural logarithm of 2. */
     LN2: number;
->LN2 : Symbol(LN2, Decl(1.0lib-noErrors.ts, 505, 17))
+>LN2 : Symbol(Math.LN2, Decl(1.0lib-noErrors.ts, 505, 17))
 
     /** The base-2 logarithm of e. */
     LOG2E: number;
->LOG2E : Symbol(LOG2E, Decl(1.0lib-noErrors.ts, 507, 16))
+>LOG2E : Symbol(Math.LOG2E, Decl(1.0lib-noErrors.ts, 507, 16))
 
     /** The base-10 logarithm of e. */
     LOG10E: number;
->LOG10E : Symbol(LOG10E, Decl(1.0lib-noErrors.ts, 509, 18))
+>LOG10E : Symbol(Math.LOG10E, Decl(1.0lib-noErrors.ts, 509, 18))
 
     /** Pi. This is the ratio of the circumference of a circle to its diameter. */
     PI: number;
->PI : Symbol(PI, Decl(1.0lib-noErrors.ts, 511, 19))
+>PI : Symbol(Math.PI, Decl(1.0lib-noErrors.ts, 511, 19))
 
     /** The square root of 0.5, or, equivalently, one divided by the square root of 2. */
     SQRT1_2: number;
->SQRT1_2 : Symbol(SQRT1_2, Decl(1.0lib-noErrors.ts, 513, 15))
+>SQRT1_2 : Symbol(Math.SQRT1_2, Decl(1.0lib-noErrors.ts, 513, 15))
 
     /** The square root of 2. */
     SQRT2: number;
->SQRT2 : Symbol(SQRT2, Decl(1.0lib-noErrors.ts, 515, 20))
+>SQRT2 : Symbol(Math.SQRT2, Decl(1.0lib-noErrors.ts, 515, 20))
 
     /**
       * Returns the absolute value of a number (the value without regard to whether it is positive or negative). 
@@ -789,7 +789,7 @@ interface Math {
       * @param x A numeric expression for which the absolute value is needed.
       */
     abs(x: number): number;
->abs : Symbol(abs, Decl(1.0lib-noErrors.ts, 517, 18))
+>abs : Symbol(Math.abs, Decl(1.0lib-noErrors.ts, 517, 18))
 >x : Symbol(x, Decl(1.0lib-noErrors.ts, 523, 8))
 
     /**
@@ -797,7 +797,7 @@ interface Math {
       * @param x A numeric expression.
       */
     acos(x: number): number;
->acos : Symbol(acos, Decl(1.0lib-noErrors.ts, 523, 27))
+>acos : Symbol(Math.acos, Decl(1.0lib-noErrors.ts, 523, 27))
 >x : Symbol(x, Decl(1.0lib-noErrors.ts, 528, 9))
 
     /** 
@@ -805,7 +805,7 @@ interface Math {
       * @param x A numeric expression.
       */
     asin(x: number): number;
->asin : Symbol(asin, Decl(1.0lib-noErrors.ts, 528, 28))
+>asin : Symbol(Math.asin, Decl(1.0lib-noErrors.ts, 528, 28))
 >x : Symbol(x, Decl(1.0lib-noErrors.ts, 533, 9))
 
     /**
@@ -813,7 +813,7 @@ interface Math {
       * @param x A numeric expression for which the arctangent is needed.
       */
     atan(x: number): number;
->atan : Symbol(atan, Decl(1.0lib-noErrors.ts, 533, 28))
+>atan : Symbol(Math.atan, Decl(1.0lib-noErrors.ts, 533, 28))
 >x : Symbol(x, Decl(1.0lib-noErrors.ts, 538, 9))
 
     /**
@@ -822,7 +822,7 @@ interface Math {
       * @param x A numeric expression representing the cartesian x-coordinate.
       */
     atan2(y: number, x: number): number;
->atan2 : Symbol(atan2, Decl(1.0lib-noErrors.ts, 538, 28))
+>atan2 : Symbol(Math.atan2, Decl(1.0lib-noErrors.ts, 538, 28))
 >y : Symbol(y, Decl(1.0lib-noErrors.ts, 544, 10))
 >x : Symbol(x, Decl(1.0lib-noErrors.ts, 544, 20))
 
@@ -831,7 +831,7 @@ interface Math {
       * @param x A numeric expression.
       */
     ceil(x: number): number;
->ceil : Symbol(ceil, Decl(1.0lib-noErrors.ts, 544, 40))
+>ceil : Symbol(Math.ceil, Decl(1.0lib-noErrors.ts, 544, 40))
 >x : Symbol(x, Decl(1.0lib-noErrors.ts, 549, 9))
 
     /**
@@ -839,7 +839,7 @@ interface Math {
       * @param x A numeric expression that contains an angle measured in radians.
       */
     cos(x: number): number;
->cos : Symbol(cos, Decl(1.0lib-noErrors.ts, 549, 28))
+>cos : Symbol(Math.cos, Decl(1.0lib-noErrors.ts, 549, 28))
 >x : Symbol(x, Decl(1.0lib-noErrors.ts, 554, 8))
 
     /**
@@ -847,7 +847,7 @@ interface Math {
       * @param x A numeric expression representing the power of e.
       */
     exp(x: number): number;
->exp : Symbol(exp, Decl(1.0lib-noErrors.ts, 554, 27))
+>exp : Symbol(Math.exp, Decl(1.0lib-noErrors.ts, 554, 27))
 >x : Symbol(x, Decl(1.0lib-noErrors.ts, 559, 8))
 
     /**
@@ -855,7 +855,7 @@ interface Math {
       * @param x A numeric expression.
       */
     floor(x: number): number;
->floor : Symbol(floor, Decl(1.0lib-noErrors.ts, 559, 27))
+>floor : Symbol(Math.floor, Decl(1.0lib-noErrors.ts, 559, 27))
 >x : Symbol(x, Decl(1.0lib-noErrors.ts, 564, 10))
 
     /**
@@ -863,7 +863,7 @@ interface Math {
       * @param x A numeric expression.
       */
     log(x: number): number;
->log : Symbol(log, Decl(1.0lib-noErrors.ts, 564, 29))
+>log : Symbol(Math.log, Decl(1.0lib-noErrors.ts, 564, 29))
 >x : Symbol(x, Decl(1.0lib-noErrors.ts, 569, 8))
 
     /**
@@ -871,7 +871,7 @@ interface Math {
       * @param values Numeric expressions to be evaluated.
       */
     max(...values: number[]): number;
->max : Symbol(max, Decl(1.0lib-noErrors.ts, 569, 27))
+>max : Symbol(Math.max, Decl(1.0lib-noErrors.ts, 569, 27))
 >values : Symbol(values, Decl(1.0lib-noErrors.ts, 574, 8))
 
     /**
@@ -879,7 +879,7 @@ interface Math {
       * @param values Numeric expressions to be evaluated.
       */
     min(...values: number[]): number;
->min : Symbol(min, Decl(1.0lib-noErrors.ts, 574, 37))
+>min : Symbol(Math.min, Decl(1.0lib-noErrors.ts, 574, 37))
 >values : Symbol(values, Decl(1.0lib-noErrors.ts, 579, 8))
 
     /**
@@ -888,20 +888,20 @@ interface Math {
       * @param y The exponent value of the expression.
       */
     pow(x: number, y: number): number;
->pow : Symbol(pow, Decl(1.0lib-noErrors.ts, 579, 37))
+>pow : Symbol(Math.pow, Decl(1.0lib-noErrors.ts, 579, 37))
 >x : Symbol(x, Decl(1.0lib-noErrors.ts, 585, 8))
 >y : Symbol(y, Decl(1.0lib-noErrors.ts, 585, 18))
 
     /** Returns a pseudorandom number between 0 and 1. */
     random(): number;
->random : Symbol(random, Decl(1.0lib-noErrors.ts, 585, 38))
+>random : Symbol(Math.random, Decl(1.0lib-noErrors.ts, 585, 38))
 
     /** 
       * Returns a supplied numeric expression rounded to the nearest number.
       * @param x The value to be rounded to the nearest number.
       */
     round(x: number): number;
->round : Symbol(round, Decl(1.0lib-noErrors.ts, 587, 21))
+>round : Symbol(Math.round, Decl(1.0lib-noErrors.ts, 587, 21))
 >x : Symbol(x, Decl(1.0lib-noErrors.ts, 592, 10))
 
     /**
@@ -909,7 +909,7 @@ interface Math {
       * @param x A numeric expression that contains an angle measured in radians.
       */
     sin(x: number): number;
->sin : Symbol(sin, Decl(1.0lib-noErrors.ts, 592, 29))
+>sin : Symbol(Math.sin, Decl(1.0lib-noErrors.ts, 592, 29))
 >x : Symbol(x, Decl(1.0lib-noErrors.ts, 597, 8))
 
     /**
@@ -917,7 +917,7 @@ interface Math {
       * @param x A numeric expression.
       */
     sqrt(x: number): number;
->sqrt : Symbol(sqrt, Decl(1.0lib-noErrors.ts, 597, 27))
+>sqrt : Symbol(Math.sqrt, Decl(1.0lib-noErrors.ts, 597, 27))
 >x : Symbol(x, Decl(1.0lib-noErrors.ts, 602, 9))
 
     /**
@@ -925,7 +925,7 @@ interface Math {
       * @param x A numeric expression that contains an angle measured in radians.
       */
     tan(x: number): number;
->tan : Symbol(tan, Decl(1.0lib-noErrors.ts, 602, 28))
+>tan : Symbol(Math.tan, Decl(1.0lib-noErrors.ts, 602, 28))
 >x : Symbol(x, Decl(1.0lib-noErrors.ts, 607, 8))
 }
 /** An intrinsic object that provides basic mathematics functionality and constants. */
@@ -939,110 +939,110 @@ interface Date {
 
     /** Returns a string representation of a date. The format of the string depends on the locale. */
     toString(): string;
->toString : Symbol(toString, Decl(1.0lib-noErrors.ts, 613, 16))
+>toString : Symbol(Date.toString, Decl(1.0lib-noErrors.ts, 613, 16))
 
     /** Returns a date as a string value. */
     toDateString(): string;
->toDateString : Symbol(toDateString, Decl(1.0lib-noErrors.ts, 615, 23))
+>toDateString : Symbol(Date.toDateString, Decl(1.0lib-noErrors.ts, 615, 23))
 
     /** Returns a time as a string value. */
     toTimeString(): string;
->toTimeString : Symbol(toTimeString, Decl(1.0lib-noErrors.ts, 617, 27))
+>toTimeString : Symbol(Date.toTimeString, Decl(1.0lib-noErrors.ts, 617, 27))
 
     /** Returns a value as a string value appropriate to the host environment's current locale. */
     toLocaleString(): string;
->toLocaleString : Symbol(toLocaleString, Decl(1.0lib-noErrors.ts, 619, 27))
+>toLocaleString : Symbol(Date.toLocaleString, Decl(1.0lib-noErrors.ts, 619, 27))
 
     /** Returns a date as a string value appropriate to the host environment's current locale. */
     toLocaleDateString(): string;
->toLocaleDateString : Symbol(toLocaleDateString, Decl(1.0lib-noErrors.ts, 621, 29))
+>toLocaleDateString : Symbol(Date.toLocaleDateString, Decl(1.0lib-noErrors.ts, 621, 29))
 
     /** Returns a time as a string value appropriate to the host environment's current locale. */
     toLocaleTimeString(): string;
->toLocaleTimeString : Symbol(toLocaleTimeString, Decl(1.0lib-noErrors.ts, 623, 33))
+>toLocaleTimeString : Symbol(Date.toLocaleTimeString, Decl(1.0lib-noErrors.ts, 623, 33))
 
     /** Returns the stored time value in milliseconds since midnight, January 1, 1970 UTC. */
     valueOf(): number;
->valueOf : Symbol(valueOf, Decl(1.0lib-noErrors.ts, 625, 33))
+>valueOf : Symbol(Date.valueOf, Decl(1.0lib-noErrors.ts, 625, 33))
 
     /** Gets the time value in milliseconds. */
     getTime(): number;
->getTime : Symbol(getTime, Decl(1.0lib-noErrors.ts, 627, 22))
+>getTime : Symbol(Date.getTime, Decl(1.0lib-noErrors.ts, 627, 22))
 
     /** Gets the year, using local time. */
     getFullYear(): number;
->getFullYear : Symbol(getFullYear, Decl(1.0lib-noErrors.ts, 629, 22))
+>getFullYear : Symbol(Date.getFullYear, Decl(1.0lib-noErrors.ts, 629, 22))
 
     /** Gets the year using Universal Coordinated Time (UTC). */
     getUTCFullYear(): number;
->getUTCFullYear : Symbol(getUTCFullYear, Decl(1.0lib-noErrors.ts, 631, 26))
+>getUTCFullYear : Symbol(Date.getUTCFullYear, Decl(1.0lib-noErrors.ts, 631, 26))
 
     /** Gets the month, using local time. */
     getMonth(): number;
->getMonth : Symbol(getMonth, Decl(1.0lib-noErrors.ts, 633, 29))
+>getMonth : Symbol(Date.getMonth, Decl(1.0lib-noErrors.ts, 633, 29))
 
     /** Gets the month of a Date object using Universal Coordinated Time (UTC). */
     getUTCMonth(): number;
->getUTCMonth : Symbol(getUTCMonth, Decl(1.0lib-noErrors.ts, 635, 23))
+>getUTCMonth : Symbol(Date.getUTCMonth, Decl(1.0lib-noErrors.ts, 635, 23))
 
     /** Gets the day-of-the-month, using local time. */
     getDate(): number;
->getDate : Symbol(getDate, Decl(1.0lib-noErrors.ts, 637, 26))
+>getDate : Symbol(Date.getDate, Decl(1.0lib-noErrors.ts, 637, 26))
 
     /** Gets the day-of-the-month, using Universal Coordinated Time (UTC). */
     getUTCDate(): number;
->getUTCDate : Symbol(getUTCDate, Decl(1.0lib-noErrors.ts, 639, 22))
+>getUTCDate : Symbol(Date.getUTCDate, Decl(1.0lib-noErrors.ts, 639, 22))
 
     /** Gets the day of the week, using local time. */
     getDay(): number;
->getDay : Symbol(getDay, Decl(1.0lib-noErrors.ts, 641, 25))
+>getDay : Symbol(Date.getDay, Decl(1.0lib-noErrors.ts, 641, 25))
 
     /** Gets the day of the week using Universal Coordinated Time (UTC). */
     getUTCDay(): number;
->getUTCDay : Symbol(getUTCDay, Decl(1.0lib-noErrors.ts, 643, 21))
+>getUTCDay : Symbol(Date.getUTCDay, Decl(1.0lib-noErrors.ts, 643, 21))
 
     /** Gets the hours in a date, using local time. */
     getHours(): number;
->getHours : Symbol(getHours, Decl(1.0lib-noErrors.ts, 645, 24))
+>getHours : Symbol(Date.getHours, Decl(1.0lib-noErrors.ts, 645, 24))
 
     /** Gets the hours value in a Date object using Universal Coordinated Time (UTC). */
     getUTCHours(): number;
->getUTCHours : Symbol(getUTCHours, Decl(1.0lib-noErrors.ts, 647, 23))
+>getUTCHours : Symbol(Date.getUTCHours, Decl(1.0lib-noErrors.ts, 647, 23))
 
     /** Gets the minutes of a Date object, using local time. */
     getMinutes(): number;
->getMinutes : Symbol(getMinutes, Decl(1.0lib-noErrors.ts, 649, 26))
+>getMinutes : Symbol(Date.getMinutes, Decl(1.0lib-noErrors.ts, 649, 26))
 
     /** Gets the minutes of a Date object using Universal Coordinated Time (UTC). */
     getUTCMinutes(): number;
->getUTCMinutes : Symbol(getUTCMinutes, Decl(1.0lib-noErrors.ts, 651, 25))
+>getUTCMinutes : Symbol(Date.getUTCMinutes, Decl(1.0lib-noErrors.ts, 651, 25))
 
     /** Gets the seconds of a Date object, using local time. */
     getSeconds(): number;
->getSeconds : Symbol(getSeconds, Decl(1.0lib-noErrors.ts, 653, 28))
+>getSeconds : Symbol(Date.getSeconds, Decl(1.0lib-noErrors.ts, 653, 28))
 
     /** Gets the seconds of a Date object using Universal Coordinated Time (UTC). */
     getUTCSeconds(): number;
->getUTCSeconds : Symbol(getUTCSeconds, Decl(1.0lib-noErrors.ts, 655, 25))
+>getUTCSeconds : Symbol(Date.getUTCSeconds, Decl(1.0lib-noErrors.ts, 655, 25))
 
     /** Gets the milliseconds of a Date, using local time. */
     getMilliseconds(): number;
->getMilliseconds : Symbol(getMilliseconds, Decl(1.0lib-noErrors.ts, 657, 28))
+>getMilliseconds : Symbol(Date.getMilliseconds, Decl(1.0lib-noErrors.ts, 657, 28))
 
     /** Gets the milliseconds of a Date object using Universal Coordinated Time (UTC). */
     getUTCMilliseconds(): number;
->getUTCMilliseconds : Symbol(getUTCMilliseconds, Decl(1.0lib-noErrors.ts, 659, 30))
+>getUTCMilliseconds : Symbol(Date.getUTCMilliseconds, Decl(1.0lib-noErrors.ts, 659, 30))
 
     /** Gets the difference in minutes between the time on the local computer and Universal Coordinated Time (UTC). */
     getTimezoneOffset(): number;
->getTimezoneOffset : Symbol(getTimezoneOffset, Decl(1.0lib-noErrors.ts, 661, 33))
+>getTimezoneOffset : Symbol(Date.getTimezoneOffset, Decl(1.0lib-noErrors.ts, 661, 33))
 
     /** 
       * Sets the date and time value in the Date object.
       * @param time A numeric value representing the number of elapsed milliseconds since midnight, January 1, 1970 GMT. 
       */
     setTime(time: number): number;
->setTime : Symbol(setTime, Decl(1.0lib-noErrors.ts, 663, 32))
+>setTime : Symbol(Date.setTime, Decl(1.0lib-noErrors.ts, 663, 32))
 >time : Symbol(time, Decl(1.0lib-noErrors.ts, 668, 12))
 
     /**
@@ -1050,7 +1050,7 @@ interface Date {
       * @param ms A numeric value equal to the millisecond value.
       */
     setMilliseconds(ms: number): number;
->setMilliseconds : Symbol(setMilliseconds, Decl(1.0lib-noErrors.ts, 668, 34))
+>setMilliseconds : Symbol(Date.setMilliseconds, Decl(1.0lib-noErrors.ts, 668, 34))
 >ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 673, 20))
 
     /** 
@@ -1058,7 +1058,7 @@ interface Date {
       * @param ms A numeric value equal to the millisecond value. 
       */
     setUTCMilliseconds(ms: number): number;
->setUTCMilliseconds : Symbol(setUTCMilliseconds, Decl(1.0lib-noErrors.ts, 673, 40))
+>setUTCMilliseconds : Symbol(Date.setUTCMilliseconds, Decl(1.0lib-noErrors.ts, 673, 40))
 >ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 678, 23))
 
     /**
@@ -1067,7 +1067,7 @@ interface Date {
       * @param ms A numeric value equal to the milliseconds value.
       */
     setSeconds(sec: number, ms?: number): number;
->setSeconds : Symbol(setSeconds, Decl(1.0lib-noErrors.ts, 678, 43))
+>setSeconds : Symbol(Date.setSeconds, Decl(1.0lib-noErrors.ts, 678, 43))
 >sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 685, 15))
 >ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 685, 27))
 
@@ -1077,7 +1077,7 @@ interface Date {
       * @param ms A numeric value equal to the milliseconds value.
       */
     setUTCSeconds(sec: number, ms?: number): number;
->setUTCSeconds : Symbol(setUTCSeconds, Decl(1.0lib-noErrors.ts, 685, 49))
+>setUTCSeconds : Symbol(Date.setUTCSeconds, Decl(1.0lib-noErrors.ts, 685, 49))
 >sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 691, 18))
 >ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 691, 30))
 
@@ -1088,7 +1088,7 @@ interface Date {
       * @param ms A numeric value equal to the milliseconds value.
       */
     setMinutes(min: number, sec?: number, ms?: number): number;
->setMinutes : Symbol(setMinutes, Decl(1.0lib-noErrors.ts, 691, 52))
+>setMinutes : Symbol(Date.setMinutes, Decl(1.0lib-noErrors.ts, 691, 52))
 >min : Symbol(min, Decl(1.0lib-noErrors.ts, 698, 15))
 >sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 698, 27))
 >ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 698, 41))
@@ -1100,7 +1100,7 @@ interface Date {
       * @param ms A numeric value equal to the milliseconds value.
       */
     setUTCMinutes(min: number, sec?: number, ms?: number): number;
->setUTCMinutes : Symbol(setUTCMinutes, Decl(1.0lib-noErrors.ts, 698, 63))
+>setUTCMinutes : Symbol(Date.setUTCMinutes, Decl(1.0lib-noErrors.ts, 698, 63))
 >min : Symbol(min, Decl(1.0lib-noErrors.ts, 705, 18))
 >sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 705, 30))
 >ms : Symbol(ms, Decl(1.0lib-noErrors.ts, 705, 44))
@@ -1113,7 +1113,7 @@ interface Date {
       * @param ms A numeric value equal to the milliseconds value.
       */
     setHours(hours: number, min?: number, sec?: number, ms?: number): number;
->setHours : Symbol(setHours, Decl(1.0lib-noErrors.ts, 705, 66))
+>setHours : Symbol(Date.setHours, Decl(1.0lib-noErrors.ts, 705, 66))
 >hours : Symbol(hours, Decl(1.0lib-noErrors.ts, 713, 13))
 >min : Symbol(min, Decl(1.0lib-noErrors.ts, 713, 27))
 >sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 713, 41))
@@ -1127,7 +1127,7 @@ interface Date {
       * @param ms A numeric value equal to the milliseconds value.
       */
     setUTCHours(hours: number, min?: number, sec?: number, ms?: number): number;
->setUTCHours : Symbol(setUTCHours, Decl(1.0lib-noErrors.ts, 713, 77))
+>setUTCHours : Symbol(Date.setUTCHours, Decl(1.0lib-noErrors.ts, 713, 77))
 >hours : Symbol(hours, Decl(1.0lib-noErrors.ts, 721, 16))
 >min : Symbol(min, Decl(1.0lib-noErrors.ts, 721, 30))
 >sec : Symbol(sec, Decl(1.0lib-noErrors.ts, 721, 44))
@@ -1138,7 +1138,7 @@ interface Date {
       * @param date A numeric value equal to the day of the month.
       */
     setDate(date: number): number;
->setDate : Symbol(setDate, Decl(1.0lib-noErrors.ts, 721, 80))
+>setDate : Symbol(Date.setDate, Decl(1.0lib-noErrors.ts, 721, 80))
 >date : Symbol(date, Decl(1.0lib-noErrors.ts, 726, 12))
 
     /** 
@@ -1146,7 +1146,7 @@ interface Date {
       * @param date A numeric value equal to the day of the month. 
       */
     setUTCDate(date: number): number;
->setUTCDate : Symbol(setUTCDate, Decl(1.0lib-noErrors.ts, 726, 34))
+>setUTCDate : Symbol(Date.setUTCDate, Decl(1.0lib-noErrors.ts, 726, 34))
 >date : Symbol(date, Decl(1.0lib-noErrors.ts, 731, 15))
 
     /** 
@@ -1155,7 +1155,7 @@ interface Date {
       * @param date A numeric value representing the day of the month. If this value is not supplied, the value from a call to the getDate method is used.
       */
     setMonth(month: number, date?: number): number;
->setMonth : Symbol(setMonth, Decl(1.0lib-noErrors.ts, 731, 37))
+>setMonth : Symbol(Date.setMonth, Decl(1.0lib-noErrors.ts, 731, 37))
 >month : Symbol(month, Decl(1.0lib-noErrors.ts, 737, 13))
 >date : Symbol(date, Decl(1.0lib-noErrors.ts, 737, 27))
 
@@ -1165,7 +1165,7 @@ interface Date {
       * @param date A numeric value representing the day of the month. If it is not supplied, the value from a call to the getUTCDate method is used.
       */
     setUTCMonth(month: number, date?: number): number;
->setUTCMonth : Symbol(setUTCMonth, Decl(1.0lib-noErrors.ts, 737, 51))
+>setUTCMonth : Symbol(Date.setUTCMonth, Decl(1.0lib-noErrors.ts, 737, 51))
 >month : Symbol(month, Decl(1.0lib-noErrors.ts, 743, 16))
 >date : Symbol(date, Decl(1.0lib-noErrors.ts, 743, 30))
 
@@ -1176,7 +1176,7 @@ interface Date {
       * @param date A numeric value equal for the day of the month.
       */
     setFullYear(year: number, month?: number, date?: number): number;
->setFullYear : Symbol(setFullYear, Decl(1.0lib-noErrors.ts, 743, 54))
+>setFullYear : Symbol(Date.setFullYear, Decl(1.0lib-noErrors.ts, 743, 54))
 >year : Symbol(year, Decl(1.0lib-noErrors.ts, 750, 16))
 >month : Symbol(month, Decl(1.0lib-noErrors.ts, 750, 29))
 >date : Symbol(date, Decl(1.0lib-noErrors.ts, 750, 45))
@@ -1188,22 +1188,22 @@ interface Date {
       * @param date A numeric value equal to the day of the month.
       */
     setUTCFullYear(year: number, month?: number, date?: number): number;
->setUTCFullYear : Symbol(setUTCFullYear, Decl(1.0lib-noErrors.ts, 750, 69))
+>setUTCFullYear : Symbol(Date.setUTCFullYear, Decl(1.0lib-noErrors.ts, 750, 69))
 >year : Symbol(year, Decl(1.0lib-noErrors.ts, 757, 19))
 >month : Symbol(month, Decl(1.0lib-noErrors.ts, 757, 32))
 >date : Symbol(date, Decl(1.0lib-noErrors.ts, 757, 48))
 
     /** Returns a date converted to a string using Universal Coordinated Time (UTC). */
     toUTCString(): string;
->toUTCString : Symbol(toUTCString, Decl(1.0lib-noErrors.ts, 757, 72))
+>toUTCString : Symbol(Date.toUTCString, Decl(1.0lib-noErrors.ts, 757, 72))
 
     /** Returns a date as a string value in ISO format. */
     toISOString(): string;
->toISOString : Symbol(toISOString, Decl(1.0lib-noErrors.ts, 759, 26))
+>toISOString : Symbol(Date.toISOString, Decl(1.0lib-noErrors.ts, 759, 26))
 
     /** Used by the JSON.stringify method to enable the transformation of an object's data for JavaScript Object Notation (JSON) serialization. */
     toJSON(key?: any): string;
->toJSON : Symbol(toJSON, Decl(1.0lib-noErrors.ts, 761, 26))
+>toJSON : Symbol(Date.toJSON, Decl(1.0lib-noErrors.ts, 761, 26))
 >key : Symbol(key, Decl(1.0lib-noErrors.ts, 763, 11))
 }
 
@@ -1275,78 +1275,78 @@ interface RegExpExecArray {
 >index : Symbol(index, Decl(1.0lib-noErrors.ts, 793, 5))
 
     length: number;
->length : Symbol(length, Decl(1.0lib-noErrors.ts, 793, 28))
+>length : Symbol(RegExpExecArray.length, Decl(1.0lib-noErrors.ts, 793, 28))
 
     index: number;
->index : Symbol(index, Decl(1.0lib-noErrors.ts, 794, 19))
+>index : Symbol(RegExpExecArray.index, Decl(1.0lib-noErrors.ts, 794, 19))
 
     input: string;
->input : Symbol(input, Decl(1.0lib-noErrors.ts, 796, 18))
+>input : Symbol(RegExpExecArray.input, Decl(1.0lib-noErrors.ts, 796, 18))
 
     toString(): string;
->toString : Symbol(toString, Decl(1.0lib-noErrors.ts, 797, 18))
+>toString : Symbol(RegExpExecArray.toString, Decl(1.0lib-noErrors.ts, 797, 18))
 
     toLocaleString(): string;
->toLocaleString : Symbol(toLocaleString, Decl(1.0lib-noErrors.ts, 799, 23))
+>toLocaleString : Symbol(RegExpExecArray.toLocaleString, Decl(1.0lib-noErrors.ts, 799, 23))
 
     concat(...items: string[][]): string[];
->concat : Symbol(concat, Decl(1.0lib-noErrors.ts, 800, 29))
+>concat : Symbol(RegExpExecArray.concat, Decl(1.0lib-noErrors.ts, 800, 29))
 >items : Symbol(items, Decl(1.0lib-noErrors.ts, 801, 11))
 
     join(separator?: string): string;
->join : Symbol(join, Decl(1.0lib-noErrors.ts, 801, 43))
+>join : Symbol(RegExpExecArray.join, Decl(1.0lib-noErrors.ts, 801, 43))
 >separator : Symbol(separator, Decl(1.0lib-noErrors.ts, 802, 9))
 
     pop(): string;
->pop : Symbol(pop, Decl(1.0lib-noErrors.ts, 802, 37))
+>pop : Symbol(RegExpExecArray.pop, Decl(1.0lib-noErrors.ts, 802, 37))
 
     push(...items: string[]): number;
->push : Symbol(push, Decl(1.0lib-noErrors.ts, 803, 18))
+>push : Symbol(RegExpExecArray.push, Decl(1.0lib-noErrors.ts, 803, 18))
 >items : Symbol(items, Decl(1.0lib-noErrors.ts, 804, 9))
 
     reverse(): string[];
->reverse : Symbol(reverse, Decl(1.0lib-noErrors.ts, 804, 37))
+>reverse : Symbol(RegExpExecArray.reverse, Decl(1.0lib-noErrors.ts, 804, 37))
 
     shift(): string;
->shift : Symbol(shift, Decl(1.0lib-noErrors.ts, 805, 24))
+>shift : Symbol(RegExpExecArray.shift, Decl(1.0lib-noErrors.ts, 805, 24))
 
     slice(start?: number, end?: number): string[];
->slice : Symbol(slice, Decl(1.0lib-noErrors.ts, 806, 20))
+>slice : Symbol(RegExpExecArray.slice, Decl(1.0lib-noErrors.ts, 806, 20))
 >start : Symbol(start, Decl(1.0lib-noErrors.ts, 807, 10))
 >end : Symbol(end, Decl(1.0lib-noErrors.ts, 807, 25))
 
     sort(compareFn?: (a: string, b: string) => number): string[];
->sort : Symbol(sort, Decl(1.0lib-noErrors.ts, 807, 50))
+>sort : Symbol(RegExpExecArray.sort, Decl(1.0lib-noErrors.ts, 807, 50))
 >compareFn : Symbol(compareFn, Decl(1.0lib-noErrors.ts, 808, 9))
 >a : Symbol(a, Decl(1.0lib-noErrors.ts, 808, 22))
 >b : Symbol(b, Decl(1.0lib-noErrors.ts, 808, 32))
 
     splice(start: number): string[];
->splice : Symbol(splice, Decl(1.0lib-noErrors.ts, 808, 65), Decl(1.0lib-noErrors.ts, 809, 36))
+>splice : Symbol(RegExpExecArray.splice, Decl(1.0lib-noErrors.ts, 808, 65), Decl(1.0lib-noErrors.ts, 809, 36))
 >start : Symbol(start, Decl(1.0lib-noErrors.ts, 809, 11))
 
     splice(start: number, deleteCount: number, ...items: string[]): string[];
->splice : Symbol(splice, Decl(1.0lib-noErrors.ts, 808, 65), Decl(1.0lib-noErrors.ts, 809, 36))
+>splice : Symbol(RegExpExecArray.splice, Decl(1.0lib-noErrors.ts, 808, 65), Decl(1.0lib-noErrors.ts, 809, 36))
 >start : Symbol(start, Decl(1.0lib-noErrors.ts, 810, 11))
 >deleteCount : Symbol(deleteCount, Decl(1.0lib-noErrors.ts, 810, 25))
 >items : Symbol(items, Decl(1.0lib-noErrors.ts, 810, 46))
 
     unshift(...items: string[]): number;
->unshift : Symbol(unshift, Decl(1.0lib-noErrors.ts, 810, 77))
+>unshift : Symbol(RegExpExecArray.unshift, Decl(1.0lib-noErrors.ts, 810, 77))
 >items : Symbol(items, Decl(1.0lib-noErrors.ts, 811, 12))
 
     indexOf(searchElement: string, fromIndex?: number): number;
->indexOf : Symbol(indexOf, Decl(1.0lib-noErrors.ts, 811, 40))
+>indexOf : Symbol(RegExpExecArray.indexOf, Decl(1.0lib-noErrors.ts, 811, 40))
 >searchElement : Symbol(searchElement, Decl(1.0lib-noErrors.ts, 813, 12))
 >fromIndex : Symbol(fromIndex, Decl(1.0lib-noErrors.ts, 813, 34))
 
     lastIndexOf(searchElement: string, fromIndex?: number): number;
->lastIndexOf : Symbol(lastIndexOf, Decl(1.0lib-noErrors.ts, 813, 63))
+>lastIndexOf : Symbol(RegExpExecArray.lastIndexOf, Decl(1.0lib-noErrors.ts, 813, 63))
 >searchElement : Symbol(searchElement, Decl(1.0lib-noErrors.ts, 814, 16))
 >fromIndex : Symbol(fromIndex, Decl(1.0lib-noErrors.ts, 814, 38))
 
     every(callbackfn: (value: string, index: number, array: string[]) => boolean, thisArg?: any): boolean;
->every : Symbol(every, Decl(1.0lib-noErrors.ts, 814, 67))
+>every : Symbol(RegExpExecArray.every, Decl(1.0lib-noErrors.ts, 814, 67))
 >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 815, 10))
 >value : Symbol(value, Decl(1.0lib-noErrors.ts, 815, 23))
 >index : Symbol(index, Decl(1.0lib-noErrors.ts, 815, 37))
@@ -1354,7 +1354,7 @@ interface RegExpExecArray {
 >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 815, 81))
 
     some(callbackfn: (value: string, index: number, array: string[]) => boolean, thisArg?: any): boolean;
->some : Symbol(some, Decl(1.0lib-noErrors.ts, 815, 106))
+>some : Symbol(RegExpExecArray.some, Decl(1.0lib-noErrors.ts, 815, 106))
 >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 816, 9))
 >value : Symbol(value, Decl(1.0lib-noErrors.ts, 816, 22))
 >index : Symbol(index, Decl(1.0lib-noErrors.ts, 816, 36))
@@ -1362,7 +1362,7 @@ interface RegExpExecArray {
 >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 816, 80))
 
     forEach(callbackfn: (value: string, index: number, array: string[]) => void, thisArg?: any): void;
->forEach : Symbol(forEach, Decl(1.0lib-noErrors.ts, 816, 105))
+>forEach : Symbol(RegExpExecArray.forEach, Decl(1.0lib-noErrors.ts, 816, 105))
 >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 817, 12))
 >value : Symbol(value, Decl(1.0lib-noErrors.ts, 817, 25))
 >index : Symbol(index, Decl(1.0lib-noErrors.ts, 817, 39))
@@ -1370,7 +1370,7 @@ interface RegExpExecArray {
 >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 817, 80))
 
     map(callbackfn: (value: string, index: number, array: string[]) => any, thisArg?: any): any[];
->map : Symbol(map, Decl(1.0lib-noErrors.ts, 817, 102))
+>map : Symbol(RegExpExecArray.map, Decl(1.0lib-noErrors.ts, 817, 102))
 >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 818, 8))
 >value : Symbol(value, Decl(1.0lib-noErrors.ts, 818, 21))
 >index : Symbol(index, Decl(1.0lib-noErrors.ts, 818, 35))
@@ -1378,7 +1378,7 @@ interface RegExpExecArray {
 >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 818, 75))
 
     filter(callbackfn: (value: string, index: number, array: string[]) => boolean, thisArg?: any): string[];
->filter : Symbol(filter, Decl(1.0lib-noErrors.ts, 818, 98))
+>filter : Symbol(RegExpExecArray.filter, Decl(1.0lib-noErrors.ts, 818, 98))
 >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 819, 11))
 >value : Symbol(value, Decl(1.0lib-noErrors.ts, 819, 24))
 >index : Symbol(index, Decl(1.0lib-noErrors.ts, 819, 38))
@@ -1386,7 +1386,7 @@ interface RegExpExecArray {
 >thisArg : Symbol(thisArg, Decl(1.0lib-noErrors.ts, 819, 82))
 
     reduce(callbackfn: (previousValue: any, currentValue: any, currentIndex: number, array: string[]) => any, initialValue?: any): any;
->reduce : Symbol(reduce, Decl(1.0lib-noErrors.ts, 819, 108))
+>reduce : Symbol(RegExpExecArray.reduce, Decl(1.0lib-noErrors.ts, 819, 108))
 >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 820, 11))
 >previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 820, 24))
 >currentValue : Symbol(currentValue, Decl(1.0lib-noErrors.ts, 820, 43))
@@ -1395,7 +1395,7 @@ interface RegExpExecArray {
 >initialValue : Symbol(initialValue, Decl(1.0lib-noErrors.ts, 820, 109))
 
     reduceRight(callbackfn: (previousValue: any, currentValue: any, currentIndex: number, array: string[]) => any, initialValue?: any): any;
->reduceRight : Symbol(reduceRight, Decl(1.0lib-noErrors.ts, 820, 135))
+>reduceRight : Symbol(RegExpExecArray.reduceRight, Decl(1.0lib-noErrors.ts, 820, 135))
 >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 821, 16))
 >previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 821, 29))
 >currentValue : Symbol(currentValue, Decl(1.0lib-noErrors.ts, 821, 48))
@@ -1413,7 +1413,7 @@ interface RegExp {
       * @param string The String object or string literal on which to perform the search.
       */
     exec(string: string): RegExpExecArray;
->exec : Symbol(exec, Decl(1.0lib-noErrors.ts, 825, 18))
+>exec : Symbol(RegExp.exec, Decl(1.0lib-noErrors.ts, 825, 18))
 >string : Symbol(string, Decl(1.0lib-noErrors.ts, 830, 9))
 >RegExpExecArray : Symbol(RegExpExecArray, Decl(1.0lib-noErrors.ts, 790, 1))
 
@@ -1422,31 +1422,31 @@ interface RegExp {
       * @param string String on which to perform the search.
       */
     test(string: string): boolean;
->test : Symbol(test, Decl(1.0lib-noErrors.ts, 830, 42))
+>test : Symbol(RegExp.test, Decl(1.0lib-noErrors.ts, 830, 42))
 >string : Symbol(string, Decl(1.0lib-noErrors.ts, 836, 9))
 
     /** Returns a copy of the text of the regular expression pattern. Read-only. The rgExp argument is a Regular expression object. It can be a variable name or a literal. */
     source: string;
->source : Symbol(source, Decl(1.0lib-noErrors.ts, 836, 34))
+>source : Symbol(RegExp.source, Decl(1.0lib-noErrors.ts, 836, 34))
 
     /** Returns a Boolean value indicating the state of the global flag (g) used with a regular expression. Default is false. Read-only. */
     global: boolean;
->global : Symbol(global, Decl(1.0lib-noErrors.ts, 839, 19))
+>global : Symbol(RegExp.global, Decl(1.0lib-noErrors.ts, 839, 19))
 
     /** Returns a Boolean value indicating the state of the ignoreCase flag (i) used with a regular expression. Default is false. Read-only. */
     ignoreCase: boolean;
->ignoreCase : Symbol(ignoreCase, Decl(1.0lib-noErrors.ts, 842, 20))
+>ignoreCase : Symbol(RegExp.ignoreCase, Decl(1.0lib-noErrors.ts, 842, 20))
 
     /** Returns a Boolean value indicating the state of the multiline flag (m) used with a regular expression. Default is false. Read-only. */
     multiline: boolean;
->multiline : Symbol(multiline, Decl(1.0lib-noErrors.ts, 845, 24))
+>multiline : Symbol(RegExp.multiline, Decl(1.0lib-noErrors.ts, 845, 24))
 
     lastIndex: number;
->lastIndex : Symbol(lastIndex, Decl(1.0lib-noErrors.ts, 848, 23))
+>lastIndex : Symbol(RegExp.lastIndex, Decl(1.0lib-noErrors.ts, 848, 23))
 
     // Non-standard extensions
     compile(): RegExp;
->compile : Symbol(compile, Decl(1.0lib-noErrors.ts, 850, 22))
+>compile : Symbol(RegExp.compile, Decl(1.0lib-noErrors.ts, 850, 22))
 >RegExp : Symbol(RegExp, Decl(1.0lib-noErrors.ts, 822, 1), Decl(1.0lib-noErrors.ts, 855, 11))
 }
 declare var RegExp: {
@@ -1498,10 +1498,10 @@ interface Error {
 >Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 870, 1), Decl(1.0lib-noErrors.ts, 876, 11))
 
     name: string;
->name : Symbol(name, Decl(1.0lib-noErrors.ts, 872, 17))
+>name : Symbol(Error.name, Decl(1.0lib-noErrors.ts, 872, 17))
 
     message: string;
->message : Symbol(message, Decl(1.0lib-noErrors.ts, 873, 17))
+>message : Symbol(Error.message, Decl(1.0lib-noErrors.ts, 873, 17))
 }
 declare var Error: {
 >Error : Symbol(Error, Decl(1.0lib-noErrors.ts, 870, 1), Decl(1.0lib-noErrors.ts, 876, 11))
@@ -1649,7 +1649,7 @@ interface JSON {
       * If a member contains nested objects, the nested objects are transformed before the parent object is. 
       */
     parse(text: string, reviver?: (key: any, value: any) => any): any;
->parse : Symbol(parse, Decl(1.0lib-noErrors.ts, 930, 16))
+>parse : Symbol(JSON.parse, Decl(1.0lib-noErrors.ts, 930, 16))
 >text : Symbol(text, Decl(1.0lib-noErrors.ts, 937, 10))
 >reviver : Symbol(reviver, Decl(1.0lib-noErrors.ts, 937, 23))
 >key : Symbol(key, Decl(1.0lib-noErrors.ts, 937, 35))
@@ -1660,7 +1660,7 @@ interface JSON {
       * @param value A JavaScript value, usually an object or array, to be converted.
       */
     stringify(value: any): string;
->stringify : Symbol(stringify, Decl(1.0lib-noErrors.ts, 937, 70), Decl(1.0lib-noErrors.ts, 942, 34), Decl(1.0lib-noErrors.ts, 948, 78), Decl(1.0lib-noErrors.ts, 954, 51), Decl(1.0lib-noErrors.ts, 961, 90))
+>stringify : Symbol(JSON.stringify, Decl(1.0lib-noErrors.ts, 937, 70), Decl(1.0lib-noErrors.ts, 942, 34), Decl(1.0lib-noErrors.ts, 948, 78), Decl(1.0lib-noErrors.ts, 954, 51), Decl(1.0lib-noErrors.ts, 961, 90))
 >value : Symbol(value, Decl(1.0lib-noErrors.ts, 942, 14))
 
     /**
@@ -1669,7 +1669,7 @@ interface JSON {
       * @param replacer A function that transforms the results.
       */
     stringify(value: any, replacer: (key: string, value: any) => any): string;
->stringify : Symbol(stringify, Decl(1.0lib-noErrors.ts, 937, 70), Decl(1.0lib-noErrors.ts, 942, 34), Decl(1.0lib-noErrors.ts, 948, 78), Decl(1.0lib-noErrors.ts, 954, 51), Decl(1.0lib-noErrors.ts, 961, 90))
+>stringify : Symbol(JSON.stringify, Decl(1.0lib-noErrors.ts, 937, 70), Decl(1.0lib-noErrors.ts, 942, 34), Decl(1.0lib-noErrors.ts, 948, 78), Decl(1.0lib-noErrors.ts, 954, 51), Decl(1.0lib-noErrors.ts, 961, 90))
 >value : Symbol(value, Decl(1.0lib-noErrors.ts, 948, 14))
 >replacer : Symbol(replacer, Decl(1.0lib-noErrors.ts, 948, 25))
 >key : Symbol(key, Decl(1.0lib-noErrors.ts, 948, 37))
@@ -1681,7 +1681,7 @@ interface JSON {
       * @param replacer Array that transforms the results.
       */
     stringify(value: any, replacer: any[]): string;
->stringify : Symbol(stringify, Decl(1.0lib-noErrors.ts, 937, 70), Decl(1.0lib-noErrors.ts, 942, 34), Decl(1.0lib-noErrors.ts, 948, 78), Decl(1.0lib-noErrors.ts, 954, 51), Decl(1.0lib-noErrors.ts, 961, 90))
+>stringify : Symbol(JSON.stringify, Decl(1.0lib-noErrors.ts, 937, 70), Decl(1.0lib-noErrors.ts, 942, 34), Decl(1.0lib-noErrors.ts, 948, 78), Decl(1.0lib-noErrors.ts, 954, 51), Decl(1.0lib-noErrors.ts, 961, 90))
 >value : Symbol(value, Decl(1.0lib-noErrors.ts, 954, 14))
 >replacer : Symbol(replacer, Decl(1.0lib-noErrors.ts, 954, 25))
 
@@ -1692,7 +1692,7 @@ interface JSON {
       * @param space Adds indentation, white space, and line break characters to the return-value JSON text to make it easier to read.
       */
     stringify(value: any, replacer: (key: string, value: any) => any, space: any): string;
->stringify : Symbol(stringify, Decl(1.0lib-noErrors.ts, 937, 70), Decl(1.0lib-noErrors.ts, 942, 34), Decl(1.0lib-noErrors.ts, 948, 78), Decl(1.0lib-noErrors.ts, 954, 51), Decl(1.0lib-noErrors.ts, 961, 90))
+>stringify : Symbol(JSON.stringify, Decl(1.0lib-noErrors.ts, 937, 70), Decl(1.0lib-noErrors.ts, 942, 34), Decl(1.0lib-noErrors.ts, 948, 78), Decl(1.0lib-noErrors.ts, 954, 51), Decl(1.0lib-noErrors.ts, 961, 90))
 >value : Symbol(value, Decl(1.0lib-noErrors.ts, 961, 14))
 >replacer : Symbol(replacer, Decl(1.0lib-noErrors.ts, 961, 25))
 >key : Symbol(key, Decl(1.0lib-noErrors.ts, 961, 37))
@@ -1706,7 +1706,7 @@ interface JSON {
       * @param space Adds indentation, white space, and line break characters to the return-value JSON text to make it easier to read.
       */
     stringify(value: any, replacer: any[], space: any): string;
->stringify : Symbol(stringify, Decl(1.0lib-noErrors.ts, 937, 70), Decl(1.0lib-noErrors.ts, 942, 34), Decl(1.0lib-noErrors.ts, 948, 78), Decl(1.0lib-noErrors.ts, 954, 51), Decl(1.0lib-noErrors.ts, 961, 90))
+>stringify : Symbol(JSON.stringify, Decl(1.0lib-noErrors.ts, 937, 70), Decl(1.0lib-noErrors.ts, 942, 34), Decl(1.0lib-noErrors.ts, 948, 78), Decl(1.0lib-noErrors.ts, 954, 51), Decl(1.0lib-noErrors.ts, 961, 90))
 >value : Symbol(value, Decl(1.0lib-noErrors.ts, 968, 14))
 >replacer : Symbol(replacer, Decl(1.0lib-noErrors.ts, 968, 25))
 >space : Symbol(space, Decl(1.0lib-noErrors.ts, 968, 42))
@@ -1731,17 +1731,17 @@ interface Array<T> {
       * Returns a string representation of an array.
       */
     toString(): string;
->toString : Symbol(toString, Decl(1.0lib-noErrors.ts, 980, 20))
+>toString : Symbol(Array.toString, Decl(1.0lib-noErrors.ts, 980, 20))
 
     toLocaleString(): string;
->toLocaleString : Symbol(toLocaleString, Decl(1.0lib-noErrors.ts, 984, 23))
+>toLocaleString : Symbol(Array.toLocaleString, Decl(1.0lib-noErrors.ts, 984, 23))
 
     /**
       * Combines two or more arrays.
       * @param items Additional items to add to the end of array1.
       */
     concat<U extends T[]>(...items: U[]): T[];
->concat : Symbol(concat, Decl(1.0lib-noErrors.ts, 985, 29), Decl(1.0lib-noErrors.ts, 990, 46))
+>concat : Symbol(Array.concat, Decl(1.0lib-noErrors.ts, 985, 29), Decl(1.0lib-noErrors.ts, 990, 46))
 >U : Symbol(U, Decl(1.0lib-noErrors.ts, 990, 11))
 >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16))
 >items : Symbol(items, Decl(1.0lib-noErrors.ts, 990, 26))
@@ -1753,7 +1753,7 @@ interface Array<T> {
       * @param items Additional items to add to the end of array1.
       */
     concat(...items: T[]): T[];
->concat : Symbol(concat, Decl(1.0lib-noErrors.ts, 985, 29), Decl(1.0lib-noErrors.ts, 990, 46))
+>concat : Symbol(Array.concat, Decl(1.0lib-noErrors.ts, 985, 29), Decl(1.0lib-noErrors.ts, 990, 46))
 >items : Symbol(items, Decl(1.0lib-noErrors.ts, 995, 11))
 >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16))
 >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16))
@@ -1763,14 +1763,14 @@ interface Array<T> {
       * @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma.
       */
     join(separator?: string): string;
->join : Symbol(join, Decl(1.0lib-noErrors.ts, 995, 31))
+>join : Symbol(Array.join, Decl(1.0lib-noErrors.ts, 995, 31))
 >separator : Symbol(separator, Decl(1.0lib-noErrors.ts, 1000, 9))
 
     /**
       * Removes the last element from an array and returns it.
       */
     pop(): T;
->pop : Symbol(pop, Decl(1.0lib-noErrors.ts, 1000, 37))
+>pop : Symbol(Array.pop, Decl(1.0lib-noErrors.ts, 1000, 37))
 >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16))
 
     /**
@@ -1778,7 +1778,7 @@ interface Array<T> {
       * @param items New elements of the Array.
       */
     push(...items: T[]): number;
->push : Symbol(push, Decl(1.0lib-noErrors.ts, 1004, 13))
+>push : Symbol(Array.push, Decl(1.0lib-noErrors.ts, 1004, 13))
 >items : Symbol(items, Decl(1.0lib-noErrors.ts, 1009, 9))
 >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16))
 
@@ -1786,14 +1786,14 @@ interface Array<T> {
       * Reverses the elements in an Array. 
       */
     reverse(): T[];
->reverse : Symbol(reverse, Decl(1.0lib-noErrors.ts, 1009, 32))
+>reverse : Symbol(Array.reverse, Decl(1.0lib-noErrors.ts, 1009, 32))
 >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16))
 
     /**
       * Removes the first element from an array and returns it.
       */
     shift(): T;
->shift : Symbol(shift, Decl(1.0lib-noErrors.ts, 1013, 19))
+>shift : Symbol(Array.shift, Decl(1.0lib-noErrors.ts, 1013, 19))
 >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16))
 
     /** 
@@ -1802,7 +1802,7 @@ interface Array<T> {
       * @param end The end of the specified portion of the array.
       */
     slice(start?: number, end?: number): T[];
->slice : Symbol(slice, Decl(1.0lib-noErrors.ts, 1017, 15))
+>slice : Symbol(Array.slice, Decl(1.0lib-noErrors.ts, 1017, 15))
 >start : Symbol(start, Decl(1.0lib-noErrors.ts, 1023, 10))
 >end : Symbol(end, Decl(1.0lib-noErrors.ts, 1023, 25))
 >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16))
@@ -1812,7 +1812,7 @@ interface Array<T> {
       * @param compareFn The name of the function used to determine the order of the elements. If omitted, the elements are sorted in ascending, ASCII character order.
       */
     sort(compareFn?: (a: T, b: T) => number): T[];
->sort : Symbol(sort, Decl(1.0lib-noErrors.ts, 1023, 45))
+>sort : Symbol(Array.sort, Decl(1.0lib-noErrors.ts, 1023, 45))
 >compareFn : Symbol(compareFn, Decl(1.0lib-noErrors.ts, 1029, 9))
 >a : Symbol(a, Decl(1.0lib-noErrors.ts, 1029, 22))
 >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16))
@@ -1825,7 +1825,7 @@ interface Array<T> {
       * @param start The zero-based location in the array from which to start removing elements.
       */
     splice(start: number): T[];
->splice : Symbol(splice, Decl(1.0lib-noErrors.ts, 1029, 50), Decl(1.0lib-noErrors.ts, 1035, 31))
+>splice : Symbol(Array.splice, Decl(1.0lib-noErrors.ts, 1029, 50), Decl(1.0lib-noErrors.ts, 1035, 31))
 >start : Symbol(start, Decl(1.0lib-noErrors.ts, 1035, 11))
 >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16))
 
@@ -1836,7 +1836,7 @@ interface Array<T> {
       * @param items Elements to insert into the array in place of the deleted elements.
       */
     splice(start: number, deleteCount: number, ...items: T[]): T[];
->splice : Symbol(splice, Decl(1.0lib-noErrors.ts, 1029, 50), Decl(1.0lib-noErrors.ts, 1035, 31))
+>splice : Symbol(Array.splice, Decl(1.0lib-noErrors.ts, 1029, 50), Decl(1.0lib-noErrors.ts, 1035, 31))
 >start : Symbol(start, Decl(1.0lib-noErrors.ts, 1043, 11))
 >deleteCount : Symbol(deleteCount, Decl(1.0lib-noErrors.ts, 1043, 25))
 >items : Symbol(items, Decl(1.0lib-noErrors.ts, 1043, 46))
@@ -1848,7 +1848,7 @@ interface Array<T> {
       * @param items  Elements to insert at the start of the Array.
       */
     unshift(...items: T[]): number;
->unshift : Symbol(unshift, Decl(1.0lib-noErrors.ts, 1043, 67))
+>unshift : Symbol(Array.unshift, Decl(1.0lib-noErrors.ts, 1043, 67))
 >items : Symbol(items, Decl(1.0lib-noErrors.ts, 1049, 12))
 >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16))
 
@@ -1858,7 +1858,7 @@ interface Array<T> {
       * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at index 0.
       */
     indexOf(searchElement: T, fromIndex?: number): number;
->indexOf : Symbol(indexOf, Decl(1.0lib-noErrors.ts, 1049, 35))
+>indexOf : Symbol(Array.indexOf, Decl(1.0lib-noErrors.ts, 1049, 35))
 >searchElement : Symbol(searchElement, Decl(1.0lib-noErrors.ts, 1056, 12))
 >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16))
 >fromIndex : Symbol(fromIndex, Decl(1.0lib-noErrors.ts, 1056, 29))
@@ -1869,7 +1869,7 @@ interface Array<T> {
       * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at the last index in the array.
       */
     lastIndexOf(searchElement: T, fromIndex?: number): number;
->lastIndexOf : Symbol(lastIndexOf, Decl(1.0lib-noErrors.ts, 1056, 58))
+>lastIndexOf : Symbol(Array.lastIndexOf, Decl(1.0lib-noErrors.ts, 1056, 58))
 >searchElement : Symbol(searchElement, Decl(1.0lib-noErrors.ts, 1063, 16))
 >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16))
 >fromIndex : Symbol(fromIndex, Decl(1.0lib-noErrors.ts, 1063, 33))
@@ -1880,7 +1880,7 @@ interface Array<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.
       */
     every(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
->every : Symbol(every, Decl(1.0lib-noErrors.ts, 1063, 62))
+>every : Symbol(Array.every, Decl(1.0lib-noErrors.ts, 1063, 62))
 >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1070, 10))
 >value : Symbol(value, Decl(1.0lib-noErrors.ts, 1070, 23))
 >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16))
@@ -1895,7 +1895,7 @@ interface Array<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.
       */
     some(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
->some : Symbol(some, Decl(1.0lib-noErrors.ts, 1070, 96))
+>some : Symbol(Array.some, Decl(1.0lib-noErrors.ts, 1070, 96))
 >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1077, 9))
 >value : Symbol(value, Decl(1.0lib-noErrors.ts, 1077, 22))
 >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16))
@@ -1910,7 +1910,7 @@ interface Array<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.
       */
     forEach(callbackfn: (value: T, index: number, array: T[]) => void, thisArg?: any): void;
->forEach : Symbol(forEach, Decl(1.0lib-noErrors.ts, 1077, 95))
+>forEach : Symbol(Array.forEach, Decl(1.0lib-noErrors.ts, 1077, 95))
 >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1084, 12))
 >value : Symbol(value, Decl(1.0lib-noErrors.ts, 1084, 25))
 >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16))
@@ -1925,7 +1925,7 @@ interface Array<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: T[]) => U, thisArg?: any): U[];
->map : Symbol(map, Decl(1.0lib-noErrors.ts, 1084, 92))
+>map : Symbol(Array.map, Decl(1.0lib-noErrors.ts, 1084, 92))
 >U : Symbol(U, Decl(1.0lib-noErrors.ts, 1091, 8))
 >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1091, 11))
 >value : Symbol(value, Decl(1.0lib-noErrors.ts, 1091, 24))
@@ -1943,7 +1943,7 @@ interface Array<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.
       */
     filter(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): T[];
->filter : Symbol(filter, Decl(1.0lib-noErrors.ts, 1091, 87))
+>filter : Symbol(Array.filter, Decl(1.0lib-noErrors.ts, 1091, 87))
 >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1098, 11))
 >value : Symbol(value, Decl(1.0lib-noErrors.ts, 1098, 24))
 >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16))
@@ -1959,7 +1959,7 @@ interface Array<T> {
       * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
       */
     reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T;
->reduce : Symbol(reduce, Decl(1.0lib-noErrors.ts, 1098, 93), Decl(1.0lib-noErrors.ts, 1105, 120))
+>reduce : Symbol(Array.reduce, Decl(1.0lib-noErrors.ts, 1098, 93), Decl(1.0lib-noErrors.ts, 1105, 120))
 >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1105, 11))
 >previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 1105, 24))
 >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16))
@@ -1979,7 +1979,7 @@ interface Array<T> {
       * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
       */
     reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
->reduce : Symbol(reduce, Decl(1.0lib-noErrors.ts, 1098, 93), Decl(1.0lib-noErrors.ts, 1105, 120))
+>reduce : Symbol(Array.reduce, Decl(1.0lib-noErrors.ts, 1098, 93), Decl(1.0lib-noErrors.ts, 1105, 120))
 >U : Symbol(U, Decl(1.0lib-noErrors.ts, 1111, 11))
 >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1111, 14))
 >previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 1111, 27))
@@ -2000,7 +2000,7 @@ interface Array<T> {
       * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
       */
     reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T;
->reduceRight : Symbol(reduceRight, Decl(1.0lib-noErrors.ts, 1111, 122), Decl(1.0lib-noErrors.ts, 1118, 125))
+>reduceRight : Symbol(Array.reduceRight, Decl(1.0lib-noErrors.ts, 1111, 122), Decl(1.0lib-noErrors.ts, 1118, 125))
 >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1118, 16))
 >previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 1118, 29))
 >T : Symbol(T, Decl(1.0lib-noErrors.ts, 980, 16))
@@ -2020,7 +2020,7 @@ interface Array<T> {
       * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
       */
     reduceRight<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
->reduceRight : Symbol(reduceRight, Decl(1.0lib-noErrors.ts, 1111, 122), Decl(1.0lib-noErrors.ts, 1118, 125))
+>reduceRight : Symbol(Array.reduceRight, Decl(1.0lib-noErrors.ts, 1111, 122), Decl(1.0lib-noErrors.ts, 1118, 125))
 >U : Symbol(U, Decl(1.0lib-noErrors.ts, 1124, 16))
 >callbackfn : Symbol(callbackfn, Decl(1.0lib-noErrors.ts, 1124, 19))
 >previousValue : Symbol(previousValue, Decl(1.0lib-noErrors.ts, 1124, 32))
@@ -2039,7 +2039,7 @@ interface Array<T> {
       * Gets or sets the length of the array. This is a number one higher than the highest element defined in an array.
       */
     length: number;
->length : Symbol(length, Decl(1.0lib-noErrors.ts, 1124, 127))
+>length : Symbol(Array.length, Decl(1.0lib-noErrors.ts, 1124, 127))
 
     [n: number]: T;
 >n : Symbol(n, Decl(1.0lib-noErrors.ts, 1131, 5))
diff --git a/tests/baselines/reference/2dArrays.symbols b/tests/baselines/reference/2dArrays.symbols
index a42a40e2b6b..8d6b6b167e6 100644
--- a/tests/baselines/reference/2dArrays.symbols
+++ b/tests/baselines/reference/2dArrays.symbols
@@ -7,28 +7,28 @@ class Ship {
 >Ship : Symbol(Ship, Decl(2dArrays.ts, 1, 1))
 
     isSunk: boolean;
->isSunk : Symbol(isSunk, Decl(2dArrays.ts, 3, 12))
+>isSunk : Symbol(Ship.isSunk, Decl(2dArrays.ts, 3, 12))
 }
 
 class Board {
 >Board : Symbol(Board, Decl(2dArrays.ts, 5, 1))
 
     ships: Ship[];
->ships : Symbol(ships, Decl(2dArrays.ts, 7, 13))
+>ships : Symbol(Board.ships, Decl(2dArrays.ts, 7, 13))
 >Ship : Symbol(Ship, Decl(2dArrays.ts, 1, 1))
 
     cells: Cell[];
->cells : Symbol(cells, Decl(2dArrays.ts, 8, 18))
+>cells : Symbol(Board.cells, Decl(2dArrays.ts, 8, 18))
 >Cell : Symbol(Cell, Decl(2dArrays.ts, 0, 0))
 
     private allShipsSunk() {
->allShipsSunk : Symbol(allShipsSunk, Decl(2dArrays.ts, 9, 18))
+>allShipsSunk : Symbol(Board.allShipsSunk, Decl(2dArrays.ts, 9, 18))
 
         return this.ships.every(function (val) { return val.isSunk; });
 >this.ships.every : Symbol(Array.every, Decl(lib.d.ts, --, --))
->this.ships : Symbol(ships, Decl(2dArrays.ts, 7, 13))
+>this.ships : Symbol(Board.ships, Decl(2dArrays.ts, 7, 13))
 >this : Symbol(Board, Decl(2dArrays.ts, 5, 1))
->ships : Symbol(ships, Decl(2dArrays.ts, 7, 13))
+>ships : Symbol(Board.ships, Decl(2dArrays.ts, 7, 13))
 >every : Symbol(Array.every, Decl(lib.d.ts, --, --))
 >val : Symbol(val, Decl(2dArrays.ts, 12, 42))
 >val.isSunk : Symbol(Ship.isSunk, Decl(2dArrays.ts, 3, 12))
diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js
index 3830e53697c..5f55c04c9f9 100644
--- a/tests/baselines/reference/APISample_compile.js
+++ b/tests/baselines/reference/APISample_compile.js
@@ -16,7 +16,7 @@ export function compile(fileNames: string[], options: ts.CompilerOptions): void
     var program = ts.createProgram(fileNames, options);
     var emitResult = program.emit();
 
-    var allDiagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
+    var allDiagnostics = ts.getPreEmitDiagnostics(program);
 
     allDiagnostics.forEach(diagnostic => {
         var { line, character } = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
@@ -45,7 +45,7 @@ var ts = require("typescript");
 function compile(fileNames, options) {
     var program = ts.createProgram(fileNames, options);
     var emitResult = program.emit();
-    var allDiagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
+    var allDiagnostics = ts.getPreEmitDiagnostics(program);
     allDiagnostics.forEach(function (diagnostic) {
         var _a = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start), line = _a.line, character = _a.character;
         var message = ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
diff --git a/tests/baselines/reference/APISample_parseConfig.js b/tests/baselines/reference/APISample_parseConfig.js
new file mode 100644
index 00000000000..1312f8a4f81
--- /dev/null
+++ b/tests/baselines/reference/APISample_parseConfig.js
@@ -0,0 +1,70 @@
+//// [APISample_parseConfig.ts]
+
+/*
+ * Note: This test is a public API sample. The sample sources can be found 
+         at: https://github.com/Microsoft/TypeScript/wiki/Using-the-Compiler-API#a-minimal-compiler
+ *       Please log a "breaking change" issue for any API breaking change affecting this issue
+ */
+
+declare var process: any;
+declare var console: any;
+declare var os: any;
+
+import ts = require("typescript");
+
+function printError(error: ts.Diagnostic): void {
+    if (!error) {
+        return;
+    }
+    console.log(`${error.file && error.file.fileName}: ${error.messageText}`);
+}
+
+export function createProgram(rootFiles: string[], compilerOptionsJson: string): ts.Program {
+    const { config, error } = ts.parseConfigFileTextToJson("tsconfig.json", compilerOptionsJson)
+    if (error) {
+        printError(error);
+        return undefined;
+    }
+    const basePath: string = process.cwd();
+    const settings = ts.convertCompilerOptionsFromJson(config.config["compilerOptions"], basePath);
+    if (!settings.options) {
+        for (const err of settings.errors) {
+            printError(err);
+        }
+        return undefined;
+    }
+    return ts.createProgram(rootFiles, settings.options);
+}
+
+//// [APISample_parseConfig.js]
+/*
+ * Note: This test is a public API sample. The sample sources can be found
+         at: https://github.com/Microsoft/TypeScript/wiki/Using-the-Compiler-API#a-minimal-compiler
+ *       Please log a "breaking change" issue for any API breaking change affecting this issue
+ */
+"use strict";
+var ts = require("typescript");
+function printError(error) {
+    if (!error) {
+        return;
+    }
+    console.log((error.file && error.file.fileName) + ": " + error.messageText);
+}
+function createProgram(rootFiles, compilerOptionsJson) {
+    var _a = ts.parseConfigFileTextToJson("tsconfig.json", compilerOptionsJson), config = _a.config, error = _a.error;
+    if (error) {
+        printError(error);
+        return undefined;
+    }
+    var basePath = process.cwd();
+    var settings = ts.convertCompilerOptionsFromJson(config.config["compilerOptions"], basePath);
+    if (!settings.options) {
+        for (var _i = 0, _b = settings.errors; _i < _b.length; _i++) {
+            var err = _b[_i];
+            printError(err);
+        }
+        return undefined;
+    }
+    return ts.createProgram(rootFiles, settings.options);
+}
+exports.createProgram = createProgram;
diff --git a/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.symbols b/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.symbols
index 2a24e5df919..3db6d644d98 100644
--- a/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.symbols
+++ b/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.symbols
@@ -29,10 +29,10 @@ declare module A {
 >y : Symbol(y, Decl(class.d.ts, 2, 30))
 
         x: number;
->x : Symbol(x, Decl(class.d.ts, 2, 42))
+>x : Symbol(Point.x, Decl(class.d.ts, 2, 42))
 
         y: number;
->y : Symbol(y, Decl(class.d.ts, 3, 18))
+>y : Symbol(Point.y, Decl(class.d.ts, 3, 18))
     }
 }
 
diff --git a/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.symbols b/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.symbols
index 09762fd1406..8a776358b4c 100644
--- a/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.symbols
+++ b/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.symbols
@@ -25,8 +25,8 @@ module A {
 >Point : Symbol(Point, Decl(module.d.ts, 0, 18), Decl(classPoint.ts, 0, 10))
 
         constructor(public x: number, public y: number) { }
->x : Symbol(x, Decl(classPoint.ts, 2, 20))
->y : Symbol(y, Decl(classPoint.ts, 2, 37))
+>x : Symbol(Point.x, Decl(classPoint.ts, 2, 20))
+>y : Symbol(Point.y, Decl(classPoint.ts, 2, 37))
     }
 }
 
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.errors.txt b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.errors.txt
index 3feee7069d0..d2847665c7c 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.errors.txt
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts(11,16): error TS2341: Property 'sfn' is private and only accessible within class 'clodule<T>'.
+tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts(11,24): error TS2341: Property 'sfn' is private and only accessible within class 'clodule<T>'.
 
 
 ==== tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.ts (1 errors) ====
@@ -13,7 +13,7 @@ tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMer
         // error: duplicate identifier expected
         export function fn<T>(x: T, y: T): number {
             return clodule.sfn('a');
-                   ~~~~~~~~~~~
+                           ~~~
 !!! error TS2341: Property 'sfn' is private and only accessible within class 'clodule<T>'.
         }
     }
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/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.symbols b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.symbols
index 1c75c33a278..14e9ebf6124 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.symbols
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.symbols
@@ -3,8 +3,8 @@ class Point {
 >Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 0, 0), Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 4, 1))
 
     constructor(public x: number, public y: number) { }
->x : Symbol(x, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 1, 16))
->y : Symbol(y, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 1, 33))
+>x : Symbol(Point.x, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 1, 16))
+>y : Symbol(Point.y, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 1, 33))
 
     static Origin(): Point { return { x: 0, y: 0 }; }
 >Origin : Symbol(Point.Origin, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 1, 55))
@@ -28,8 +28,8 @@ module A {
 >Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 16, 5))
 
         constructor(public x: number, public y: number) { }
->x : Symbol(x, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 13, 20))
->y : Symbol(y, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 13, 37))
+>x : Symbol(Point.x, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 13, 20))
+>y : Symbol(Point.y, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 13, 37))
 
         static Origin(): Point { return { x: 0, y: 0 }; }
 >Origin : Symbol(Point.Origin, Decl(ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts, 13, 59))
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.symbols b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.symbols
index 046b92fd6ee..b995c02929f 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.symbols
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.symbols
@@ -3,8 +3,8 @@ class Point {
 >Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 0, 0), Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 4, 1))
 
     constructor(public x: number, public y: number) { }
->x : Symbol(x, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 1, 16))
->y : Symbol(y, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 1, 33))
+>x : Symbol(Point.x, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 1, 16))
+>y : Symbol(Point.y, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 1, 33))
 
     static Origin: Point = { x: 0, y: 0 };
 >Origin : Symbol(Point.Origin, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 1, 55))
@@ -28,8 +28,8 @@ module A {
 >Point : Symbol(Point, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 11, 10), Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 16, 5))
 
         constructor(public x: number, public y: number) { }
->x : Symbol(x, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 13, 20))
->y : Symbol(y, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 13, 37))
+>x : Symbol(Point.x, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 13, 20))
+>y : Symbol(Point.y, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 13, 37))
 
         static Origin: Point = { x: 0, y: 0 };
 >Origin : Symbol(Point.Origin, Decl(ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts, 13, 59))
diff --git a/tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration2.symbols b/tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration2.symbols
index ce0ab000017..69f0d0520e6 100644
--- a/tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration2.symbols
+++ b/tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration2.symbols
@@ -3,8 +3,8 @@ class C {
 >C : Symbol(C, Decl(ClassDeclarationWithInvalidConstOnPropertyDeclaration2.ts, 0, 0))
 
     const
->const : Symbol(const, Decl(ClassDeclarationWithInvalidConstOnPropertyDeclaration2.ts, 0, 9))
+>const : Symbol(C.const, Decl(ClassDeclarationWithInvalidConstOnPropertyDeclaration2.ts, 0, 9))
 
     x = 10;
->x : Symbol(x, Decl(ClassDeclarationWithInvalidConstOnPropertyDeclaration2.ts, 1, 9))
+>x : Symbol(C.x, Decl(ClassDeclarationWithInvalidConstOnPropertyDeclaration2.ts, 1, 9))
 }
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/EnumAndModuleWithSameNameAndCommonRoot.symbols b/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.symbols
index dc97960f71e..30eca163cda 100644
--- a/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.symbols
+++ b/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.symbols
@@ -14,8 +14,8 @@ module enumdule {
 >Point : Symbol(Point, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 4, 17))
 
         constructor(public x: number, public y: number) { }
->x : Symbol(x, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 7, 20))
->y : Symbol(y, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 7, 37))
+>x : Symbol(Point.x, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 7, 20))
+>y : Symbol(Point.y, Decl(EnumAndModuleWithSameNameAndCommonRoot.ts, 7, 37))
     }
 }
 
diff --git a/tests/baselines/reference/ExportAssignment7.errors.txt b/tests/baselines/reference/ExportAssignment7.errors.txt
index fe461785c63..6535428e2e4 100644
--- a/tests/baselines/reference/ExportAssignment7.errors.txt
+++ b/tests/baselines/reference/ExportAssignment7.errors.txt
@@ -1,12 +1,9 @@
-tests/cases/compiler/ExportAssignment7.ts(1,14): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/compiler/ExportAssignment7.ts(4,1): error TS2309: An export assignment cannot be used in a module with other exported elements.
 tests/cases/compiler/ExportAssignment7.ts(4,10): error TS2304: Cannot find name 'B'.
 
 
-==== tests/cases/compiler/ExportAssignment7.ts (3 errors) ====
+==== tests/cases/compiler/ExportAssignment7.ts (2 errors) ====
     export class C {
-                 ~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
     }
     
     export = B;
diff --git a/tests/baselines/reference/ExportAssignment8.errors.txt b/tests/baselines/reference/ExportAssignment8.errors.txt
index 22e32c9c7d0..e346dcbab11 100644
--- a/tests/baselines/reference/ExportAssignment8.errors.txt
+++ b/tests/baselines/reference/ExportAssignment8.errors.txt
@@ -1,13 +1,10 @@
-tests/cases/compiler/ExportAssignment8.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/compiler/ExportAssignment8.ts(1,1): error TS2309: An export assignment cannot be used in a module with other exported elements.
 tests/cases/compiler/ExportAssignment8.ts(1,10): error TS2304: Cannot find name 'B'.
 
 
-==== tests/cases/compiler/ExportAssignment8.ts (3 errors) ====
+==== tests/cases/compiler/ExportAssignment8.ts (2 errors) ====
     export = B;
     ~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-    ~~~~~~~~~~~
 !!! error TS2309: An export assignment cannot be used in a module with other exported elements.
              ~
 !!! error TS2304: Cannot find name 'B'.
diff --git a/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.symbols b/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.symbols
index 8346888d81f..0ff8e694fd5 100644
--- a/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.symbols
+++ b/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.symbols
@@ -6,13 +6,13 @@ module A {
 >Point : Symbol(Point, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 0, 10))
 
         x: number;
->x : Symbol(x, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 2, 21))
+>x : Symbol(Point.x, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 2, 21))
 
         y: number;
->y : Symbol(y, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 3, 18))
+>y : Symbol(Point.y, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 3, 18))
 
         fromOrigin(p: Point): number;
->fromOrigin : Symbol(fromOrigin, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 4, 18))
+>fromOrigin : Symbol(Point.fromOrigin, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 4, 18))
 >p : Symbol(p, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 6, 19))
 >Point : Symbol(Point, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 0, 10))
     }
@@ -22,11 +22,11 @@ module A {
 >Point : Symbol(Point, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 0, 10))
 
         constructor(public x: number, public y: number) { }
->x : Symbol(x, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 10, 20))
->y : Symbol(y, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 10, 37))
+>x : Symbol(Point2d.x, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 10, 20))
+>y : Symbol(Point2d.y, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 10, 37))
 
         fromOrigin(p: Point) {
->fromOrigin : Symbol(fromOrigin, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 10, 59))
+>fromOrigin : Symbol(Point2d.fromOrigin, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 10, 59))
 >p : Symbol(p, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 12, 19))
 >Point : Symbol(Point, Decl(ExportClassWhichExtendsInterfaceWithInaccessibleType.ts, 0, 10))
 
diff --git a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.symbols b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.symbols
index 2802e6aa392..371c740d967 100644
--- a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.symbols
+++ b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.symbols
@@ -6,10 +6,10 @@ module A {
 >Point : Symbol(Point, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 10))
 
         x: number;
->x : Symbol(x, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 2, 24))
+>x : Symbol(Point.x, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 2, 24))
 
         y: number;
->y : Symbol(y, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 3, 18))
+>y : Symbol(Point.y, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 3, 18))
     }
 
     export var Origin: Point = { x: 0, y: 0 };
@@ -23,7 +23,7 @@ module A {
 >Point : Symbol(Point, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 10))
 
         z: number;
->z : Symbol(z, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 9, 40))
+>z : Symbol(Point3d.z, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 9, 40))
     }
 
     export var Origin3d: Point3d = { x: 0, y: 0, z: 0 };
@@ -39,9 +39,9 @@ module A {
 >Point : Symbol(Point, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 10))
 
         constructor(public start: TPoint, public end: TPoint) { }
->start : Symbol(start, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 16, 20))
+>start : Symbol(Line.start, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 16, 20))
 >TPoint : Symbol(TPoint, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 15, 22))
->end : Symbol(end, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 16, 41))
+>end : Symbol(Line.end, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 16, 41))
 >TPoint : Symbol(TPoint, Decl(ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 15, 22))
     }
 }
diff --git a/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.symbols b/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.symbols
index e1e433a8921..b42f561ccf3 100644
--- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.symbols
+++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.symbols
@@ -6,10 +6,10 @@ module A {
 >Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 10))
 
         x: number;
->x : Symbol(x, Decl(ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts, 2, 17))
+>x : Symbol(Point.x, Decl(ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts, 2, 17))
 
         y: number;
->y : Symbol(y, Decl(ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts, 3, 18))
+>y : Symbol(Point.y, Decl(ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts, 3, 18))
     }
 
     export class points {
diff --git a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.symbols b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.symbols
index e1044bd2442..38c97a7e54a 100644
--- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.symbols
+++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.symbols
@@ -6,10 +6,10 @@ module A {
 >Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 10))
 
         x: number;
->x : Symbol(x, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 2, 17))
+>x : Symbol(Point.x, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 2, 17))
 
         y: number;
->y : Symbol(y, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 3, 18))
+>y : Symbol(Point.y, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 3, 18))
     }
 
     export var Origin: Point = { x: 0, y: 0 };
@@ -23,7 +23,7 @@ module A {
 >Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 10))
 
         z: number;
->z : Symbol(z, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 9, 40))
+>z : Symbol(Point3d.z, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 9, 40))
     }
 
     export var Origin3d: Point3d = { x: 0, y: 0, z: 0 };
@@ -39,9 +39,9 @@ module A {
 >Point : Symbol(Point, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 10))
 
         constructor(public start: TPoint, public end: TPoint) { }
->start : Symbol(start, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 16, 20))
+>start : Symbol(Line.start, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 16, 20))
 >TPoint : Symbol(TPoint, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 15, 22))
->end : Symbol(end, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 16, 41))
+>end : Symbol(Line.end, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 16, 41))
 >TPoint : Symbol(TPoint, Decl(ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts, 15, 22))
 
         static fromorigin2d(p: Point): Line<Point>{
diff --git a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.symbols b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.symbols
index 37b6da18c37..4903398db6a 100644
--- a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.symbols
+++ b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.symbols
@@ -6,19 +6,19 @@ module A {
 >Point : Symbol(Point, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 0, 10))
 
         x: number;
->x : Symbol(x, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 2, 24))
+>x : Symbol(Point.x, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 2, 24))
 
         y: number;
->y : Symbol(y, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 3, 18))
+>y : Symbol(Point.y, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 3, 18))
     }
 
     export class Line {
 >Line : Symbol(Line, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 5, 5))
 
         constructor(public start: Point, public end: Point) { }
->start : Symbol(start, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 8, 20))
+>start : Symbol(Line.start, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 8, 20))
 >Point : Symbol(Point, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 0, 10))
->end : Symbol(end, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 8, 40))
+>end : Symbol(Line.end, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 8, 40))
 >Point : Symbol(Point, Decl(ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts, 0, 10))
     }
 
diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.symbols b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.symbols
index 41993ebf48f..2583ddc1163 100644
--- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.symbols
+++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.symbols
@@ -6,19 +6,19 @@ module A {
 >Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 0, 10))
 
         x: number;
->x : Symbol(x, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 2, 17))
+>x : Symbol(Point.x, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 2, 17))
 
         y: number;
->y : Symbol(y, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 3, 18))
+>y : Symbol(Point.y, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 3, 18))
     }
 
     export class Line {
 >Line : Symbol(Line, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 5, 5))
 
         constructor(public start: Point, public end: Point) { }
->start : Symbol(start, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 8, 20))
+>start : Symbol(Line.start, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 8, 20))
 >Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 0, 10))
->end : Symbol(end, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 8, 40))
+>end : Symbol(Line.end, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 8, 40))
 >Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts, 0, 10))
     }
 
diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.symbols b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.symbols
index 77d57215795..b39abaf7305 100644
--- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.symbols
+++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.symbols
@@ -6,19 +6,19 @@ module A {
 >Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 0, 10))
 
         x: number;
->x : Symbol(x, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 2, 24))
+>x : Symbol(Point.x, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 2, 24))
 
         y: number;
->y : Symbol(y, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 3, 18))
+>y : Symbol(Point.y, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 3, 18))
     }
 
     class Line {
 >Line : Symbol(Line, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 5, 5))
 
         constructor(public start: Point, public end: Point) { }
->start : Symbol(start, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 8, 20))
+>start : Symbol(Line.start, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 8, 20))
 >Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 0, 10))
->end : Symbol(end, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 8, 40))
+>end : Symbol(Line.end, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 8, 40))
 >Point : Symbol(Point, Decl(ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts, 0, 10))
     }
 
diff --git a/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.symbols b/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.symbols
index 31b978c85f9..d03c7a4f58f 100644
--- a/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.symbols
+++ b/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.symbols
@@ -6,10 +6,10 @@ module A {
 >Point : Symbol(Point, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 10))
 
         x: number;
->x : Symbol(x, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 2, 28))
+>x : Symbol(Point.x, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 2, 28))
 
         y: number;
->y : Symbol(y, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 3, 18))
+>y : Symbol(Point.y, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 3, 18))
     }
 
     export var Origin: Point = { x: 0, y: 0 };
@@ -23,7 +23,7 @@ module A {
 >Point : Symbol(Point, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 0, 10))
 
         z: number;
->z : Symbol(z, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 9, 44))
+>z : Symbol(Point3d.z, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 9, 44))
     }
 
     export var Origin3d: Point3d = { x: 0, y: 0, z: 0 };
@@ -45,11 +45,11 @@ module A {
 >TPoint : Symbol(TPoint, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 15, 26))
 
         start: TPoint;
->start : Symbol(start, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 16, 41))
+>start : Symbol(Line.start, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 16, 41))
 >TPoint : Symbol(TPoint, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 15, 26))
 
         end: TPoint;
->end : Symbol(end, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 17, 22))
+>end : Symbol(Line.end, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 17, 22))
 >TPoint : Symbol(TPoint, Decl(ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts, 15, 26))
     }
 }
diff --git a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.symbols b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.symbols
index 00f9025aa8c..d92f5ea5366 100644
--- a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.symbols
+++ b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.symbols
@@ -6,10 +6,10 @@ module A {
 >Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts, 0, 10))
 
         x: number;
->x : Symbol(x, Decl(ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts, 2, 21))
+>x : Symbol(Point.x, Decl(ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts, 2, 21))
 
         y: number;
->y : Symbol(y, Decl(ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts, 3, 18))
+>y : Symbol(Point.y, Decl(ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts, 3, 18))
     }
 
     export interface points {
diff --git a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.symbols b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.symbols
index 7ee70a0c77b..1d452b2b496 100644
--- a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.symbols
+++ b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.symbols
@@ -6,10 +6,10 @@ module A {
 >Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 10))
 
         x: number;
->x : Symbol(x, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 2, 21))
+>x : Symbol(Point.x, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 2, 21))
 
         y: number;
->y : Symbol(y, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 3, 18))
+>y : Symbol(Point.y, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 3, 18))
     }
 
     export var Origin: Point = { x: 0, y: 0 };
@@ -23,7 +23,7 @@ module A {
 >Point : Symbol(Point, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 0, 10))
 
         z: number;
->z : Symbol(z, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 9, 44))
+>z : Symbol(Point3d.z, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 9, 44))
     }
 
     export var Origin3d: Point3d = { x: 0, y: 0, z: 0 };
@@ -45,11 +45,11 @@ module A {
 >TPoint : Symbol(TPoint, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 15, 26))
 
         start: TPoint;
->start : Symbol(start, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 16, 41))
+>start : Symbol(Line.start, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 16, 41))
 >TPoint : Symbol(TPoint, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 15, 26))
 
         end: TPoint;
->end : Symbol(end, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 18, 22))
+>end : Symbol(Line.end, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 18, 22))
 >TPoint : Symbol(TPoint, Decl(ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts, 15, 26))
     }
 }
diff --git a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.symbols b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.symbols
index acf6a1caef4..76df3ffd35a 100644
--- a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.symbols
+++ b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.symbols
@@ -6,8 +6,8 @@ module A {
 >Point : Symbol(Point, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 0, 10))
 
         constructor(public x: number, public y: number) { }
->x : Symbol(x, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 3, 20))
->y : Symbol(y, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 3, 37))
+>x : Symbol(Point.x, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 3, 20))
+>y : Symbol(Point.y, Decl(ExportModuleWithAccessibleTypesOnItsExportedMembers.ts, 3, 37))
     }
 
     export module B {
diff --git a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.symbols b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.symbols
index dccc613aca9..2bbedd3ea09 100644
--- a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.symbols
+++ b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.symbols
@@ -6,8 +6,8 @@ module A {
 >Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 0, 10))
 
         constructor(public x: number, public y: number) { }
->x : Symbol(x, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 3, 20))
->y : Symbol(y, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 3, 37))
+>x : Symbol(Point.x, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 3, 20))
+>y : Symbol(Point.y, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts, 3, 37))
     }
 
     export var Origin: Point = { x: 0, y: 0 };
diff --git a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.symbols b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.symbols
index 3c1ca13b616..97ac79dc44d 100644
--- a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.symbols
+++ b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.symbols
@@ -6,8 +6,8 @@ module A {
 >Point : Symbol(Point, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 0, 10))
 
         constructor(public x: number, public y: number) { }
->x : Symbol(x, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 3, 20))
->y : Symbol(y, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 3, 37))
+>x : Symbol(Point.x, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 3, 20))
+>y : Symbol(Point.y, Decl(ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.ts, 3, 37))
     }
 
     export var UnitSquare : {
diff --git a/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.symbols b/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.symbols
index 90f2701b534..e837af939b9 100644
--- a/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.symbols
+++ b/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.symbols
@@ -6,7 +6,7 @@ module A {
 >B : Symbol(B, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 0, 10))
 
         id: number;
->id : Symbol(id, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 1, 13))
+>id : Symbol(B.id, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 1, 13))
     }
 
     export var beez: Array<B>;
diff --git a/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.symbols b/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.symbols
index 55ba5fd0cf3..c32bed24d98 100644
--- a/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.symbols
+++ b/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.symbols
@@ -6,10 +6,10 @@ module A {
 >Point : Symbol(Point, Decl(ExportVariableWithAccessibleTypeInTypeAnnotation.ts, 0, 10))
 
         x: number;
->x : Symbol(x, Decl(ExportVariableWithAccessibleTypeInTypeAnnotation.ts, 2, 28))
+>x : Symbol(Point.x, Decl(ExportVariableWithAccessibleTypeInTypeAnnotation.ts, 2, 28))
 
         y: number;
->y : Symbol(y, Decl(ExportVariableWithAccessibleTypeInTypeAnnotation.ts, 3, 18))
+>y : Symbol(Point.y, Decl(ExportVariableWithAccessibleTypeInTypeAnnotation.ts, 3, 18))
     }
 
     // valid since Point is exported
diff --git a/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.symbols b/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.symbols
index ac43ccea789..ea7806eb0f6 100644
--- a/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.symbols
+++ b/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.symbols
@@ -6,10 +6,10 @@ module A {
 >Point : Symbol(Point, Decl(ExportVariableWithInaccessibleTypeInTypeAnnotation.ts, 0, 10))
 
         x: number;
->x : Symbol(x, Decl(ExportVariableWithInaccessibleTypeInTypeAnnotation.ts, 2, 28))
+>x : Symbol(Point.x, Decl(ExportVariableWithInaccessibleTypeInTypeAnnotation.ts, 2, 28))
 
         y: number;
->y : Symbol(y, Decl(ExportVariableWithInaccessibleTypeInTypeAnnotation.ts, 3, 18))
+>y : Symbol(Point.y, Decl(ExportVariableWithInaccessibleTypeInTypeAnnotation.ts, 3, 18))
     }
 
     // valid since Point is exported
@@ -24,7 +24,7 @@ module A {
 >Point : Symbol(Point, Decl(ExportVariableWithInaccessibleTypeInTypeAnnotation.ts, 0, 10))
 
         z: number;
->z : Symbol(z, Decl(ExportVariableWithInaccessibleTypeInTypeAnnotation.ts, 10, 37))
+>z : Symbol(Point3d.z, Decl(ExportVariableWithInaccessibleTypeInTypeAnnotation.ts, 10, 37))
     }
 
     // invalid Point3d is not exported
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
index fbc795c1cb8..3fe305d4106 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.leadingAsterisk.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.leadingAsterisk.json
@@ -31,7 +31,6 @@
         },
         "length": 1,
         "pos": 8,
-        "end": 22,
-        "arrayKind": 1
+        "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
index fbc795c1cb8..3fe305d4106 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noLeadingAsterisk.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noLeadingAsterisk.json
@@ -31,7 +31,6 @@
         },
         "length": 1,
         "pos": 8,
-        "end": 22,
-        "arrayKind": 1
+        "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
index 118fedcc381..7947de57a58 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noReturnType.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noReturnType.json
@@ -21,7 +21,6 @@
         },
         "length": 1,
         "pos": 8,
-        "end": 15,
-        "arrayKind": 1
+        "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
index 98453fb802e..7a4b97b1336 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noType.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noType.json
@@ -21,7 +21,6 @@
         },
         "length": 1,
         "pos": 8,
-        "end": 13,
-        "arrayKind": 1
+        "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
index d0c036bea74..746c4056f83 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.oneParamTag.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.oneParamTag.json
@@ -37,7 +37,6 @@
         },
         "length": 1,
         "pos": 8,
-        "end": 29,
-        "arrayKind": 1
+        "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
index e05c296e10b..ff4bba576d2 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTag1.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTag1.json
@@ -37,7 +37,6 @@
         },
         "length": 1,
         "pos": 8,
-        "end": 29,
-        "arrayKind": 1
+        "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
index f731abb0a8e..23264572fed 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName1.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName1.json
@@ -38,7 +38,6 @@
         },
         "length": 1,
         "pos": 8,
-        "end": 31,
-        "arrayKind": 1
+        "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
index e230dfcd46c..ceb123b6b34 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName2.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName2.json
@@ -38,7 +38,6 @@
         },
         "length": 1,
         "pos": 8,
-        "end": 36,
-        "arrayKind": 1
+        "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
index 44173787d27..19bab08a77b 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType1.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType1.json
@@ -37,7 +37,6 @@
         },
         "length": 1,
         "pos": 8,
-        "end": 29,
-        "arrayKind": 1
+        "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
index 224eba3501e..5da9084897e 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType2.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType2.json
@@ -37,7 +37,6 @@
         },
         "length": 1,
         "pos": 8,
-        "end": 29,
-        "arrayKind": 1
+        "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
index 0a78384e3e7..293d2a4c212 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramWithoutType.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramWithoutType.json
@@ -27,7 +27,6 @@
         },
         "length": 1,
         "pos": 8,
-        "end": 18,
-        "arrayKind": 1
+        "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
index bac9b2a02ef..a8425d833ae 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag1.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag1.json
@@ -31,7 +31,6 @@
         },
         "length": 1,
         "pos": 8,
-        "end": 24,
-        "arrayKind": 1
+        "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
index 6f7fb02b529..af4fd91964d 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag2.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag2.json
@@ -31,7 +31,6 @@
         },
         "length": 1,
         "pos": 8,
-        "end": 24,
-        "arrayKind": 1
+        "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
index d64b56b0a21..ceca9584a2d 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnsTag1.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnsTag1.json
@@ -31,7 +31,6 @@
         },
         "length": 1,
         "pos": 8,
-        "end": 25,
-        "arrayKind": 1
+        "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
index 6be165c0c76..2804a704ba7 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag.json
@@ -32,13 +32,11 @@
                 },
                 "length": 1,
                 "pos": 17,
-                "end": 19,
-                "arrayKind": 1
+                "end": 19
             }
         },
         "length": 1,
         "pos": 8,
-        "end": 19,
-        "arrayKind": 1
+        "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
index 85485b25143..a55761a52b7 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag2.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag2.json
@@ -43,13 +43,11 @@
                 },
                 "length": 2,
                 "pos": 17,
-                "end": 21,
-                "arrayKind": 1
+                "end": 21
             }
         },
         "length": 1,
         "pos": 8,
-        "end": 21,
-        "arrayKind": 1
+        "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
index e846f5daada..64e6e206e11 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag3.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag3.json
@@ -43,13 +43,11 @@
                 },
                 "length": 2,
                 "pos": 17,
-                "end": 22,
-                "arrayKind": 1
+                "end": 22
             }
         },
         "length": 1,
         "pos": 8,
-        "end": 22,
-        "arrayKind": 1
+        "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
index e846f5daada..64e6e206e11 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag4.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag4.json
@@ -43,13 +43,11 @@
                 },
                 "length": 2,
                 "pos": 17,
-                "end": 22,
-                "arrayKind": 1
+                "end": 22
             }
         },
         "length": 1,
         "pos": 8,
-        "end": 22,
-        "arrayKind": 1
+        "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
index 245ed626980..9b5a4a6c790 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag5.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag5.json
@@ -43,13 +43,11 @@
                 },
                 "length": 2,
                 "pos": 17,
-                "end": 23,
-                "arrayKind": 1
+                "end": 23
             }
         },
         "length": 1,
         "pos": 8,
-        "end": 23,
-        "arrayKind": 1
+        "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
index 323770c644e..d5c1c997b02 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag6.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag6.json
@@ -43,13 +43,11 @@
                 },
                 "length": 2,
                 "pos": 17,
-                "end": 23,
-                "arrayKind": 1
+                "end": 23
             }
         },
         "length": 1,
         "pos": 8,
-        "end": 23,
-        "arrayKind": 1
+        "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
index 95c96531bdf..da465077066 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTag2.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTag2.json
@@ -69,7 +69,6 @@
         },
         "length": 2,
         "pos": 8,
-        "end": 55,
-        "arrayKind": 1
+        "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
index 93b84f00324..c995aa8bf22 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTagOnSameLine.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTagOnSameLine.json
@@ -37,7 +37,6 @@
         },
         "length": 1,
         "pos": 8,
-        "end": 29,
-        "arrayKind": 1
+        "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
index fbc795c1cb8..3fe305d4106 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typeTag.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typeTag.json
@@ -31,7 +31,6 @@
         },
         "length": 1,
         "pos": 8,
-        "end": 22,
-        "arrayKind": 1
+        "end": 22
     }
 }
\ 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
index e02b9ab7dd9..209b9440a87 100644
--- a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.functionReturnType1.json
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.functionReturnType1.json
@@ -25,7 +25,6 @@
         },
         "length": 2,
         "pos": 10,
-        "end": 25,
-        "arrayKind": 1
+        "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
index 94fe0ec2978..d3be94a76ff 100644
--- a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.functionType1.json
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.functionType1.json
@@ -5,7 +5,6 @@
     "parameters": {
         "length": 0,
         "pos": 10,
-        "end": 10,
-        "arrayKind": 1
+        "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
index e02b9ab7dd9..209b9440a87 100644
--- a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.functionType2.json
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.functionType2.json
@@ -25,7 +25,6 @@
         },
         "length": 2,
         "pos": 10,
-        "end": 25,
-        "arrayKind": 1
+        "end": 25
     }
 }
\ 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
index f7624064826..408fb1c6f46 100644
--- a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.keyword3.json
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.keyword3.json
@@ -6,6 +6,7 @@
         "kind": "Identifier",
         "pos": 1,
         "end": 10,
+        "originalKeywordKind": "UndefinedKeyword",
         "text": "undefined"
     }
 }
\ 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
index 929f0046cff..ab9bb050a89 100644
--- a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType1.json
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType1.json
@@ -5,7 +5,6 @@
     "members": {
         "length": 0,
         "pos": 2,
-        "end": 2,
-        "arrayKind": 1
+        "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
index 8e6eb1fa11a..73ff5dbfa60 100644
--- a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType2.json
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType2.json
@@ -16,7 +16,6 @@
         },
         "length": 1,
         "pos": 2,
-        "end": 5,
-        "arrayKind": 1
+        "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
index ce5dedcaf56..0ffac6cba8f 100644
--- a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType3.json
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType3.json
@@ -21,7 +21,6 @@
         },
         "length": 1,
         "pos": 2,
-        "end": 13,
-        "arrayKind": 1
+        "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
index 1192b2a3a3c..f49c2fd22ae 100644
--- a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType4.json
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType4.json
@@ -27,7 +27,6 @@
         },
         "length": 2,
         "pos": 2,
-        "end": 10,
-        "arrayKind": 1
+        "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
index b31585c8e37..4474dba8e21 100644
--- a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType5.json
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType5.json
@@ -32,7 +32,6 @@
         },
         "length": 2,
         "pos": 2,
-        "end": 18,
-        "arrayKind": 1
+        "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
index 81ee5b53451..a88005b0cec 100644
--- a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType6.json
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType6.json
@@ -32,7 +32,6 @@
         },
         "length": 2,
         "pos": 2,
-        "end": 18,
-        "arrayKind": 1
+        "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
index 595798b1a83..e69f9a74682 100644
--- a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType7.json
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType7.json
@@ -37,7 +37,6 @@
         },
         "length": 2,
         "pos": 2,
-        "end": 26,
-        "arrayKind": 1
+        "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
index b4d00c873ce..35701931097 100644
--- a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType8.json
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.recordType8.json
@@ -17,7 +17,6 @@
         },
         "length": 1,
         "pos": 2,
-        "end": 10,
-        "arrayKind": 1
+        "end": 10
     }
 }
\ 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
index dd1b017da00..dd9ef74f8c6 100644
--- a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.topLevelNoParenUnionType.json
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.topLevelNoParenUnionType.json
@@ -15,7 +15,6 @@
         },
         "length": 2,
         "pos": 1,
-        "end": 14,
-        "arrayKind": 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
index dbb6f35ab00..2b5580f7622 100644
--- a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.tupleType0.json
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.tupleType0.json
@@ -5,7 +5,6 @@
     "types": {
         "length": 0,
         "pos": 2,
-        "end": 2,
-        "arrayKind": 1
+        "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
index 1ab9530626d..f741169be4b 100644
--- a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.tupleType1.json
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.tupleType1.json
@@ -10,7 +10,6 @@
         },
         "length": 1,
         "pos": 2,
-        "end": 8,
-        "arrayKind": 1
+        "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
index aaea91528d7..939eec1cb0c 100644
--- a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.tupleType2.json
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.tupleType2.json
@@ -15,7 +15,6 @@
         },
         "length": 2,
         "pos": 2,
-        "end": 15,
-        "arrayKind": 1
+        "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
index a685de86622..50b0a702a84 100644
--- a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.tupleType3.json
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.tupleType3.json
@@ -20,7 +20,6 @@
         },
         "length": 3,
         "pos": 2,
-        "end": 23,
-        "arrayKind": 1
+        "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
index 970c6fe1b13..282bc8c8e64 100644
--- a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.typeReference1.json
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.typeReference1.json
@@ -16,7 +16,6 @@
         },
         "length": 1,
         "pos": 4,
-        "end": 10,
-        "arrayKind": 1
+        "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
index 913ba27897d..570db907956 100644
--- a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.typeReference2.json
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.typeReference2.json
@@ -21,7 +21,6 @@
         },
         "length": 2,
         "pos": 4,
-        "end": 17,
-        "arrayKind": 1
+        "end": 17
     }
 }
\ 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
index aae1d6bc169..f9301d05cc5 100644
--- a/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.unionType.json
+++ b/tests/baselines/reference/JSDocParsing/TypeExpressions.parsesCorrectly.unionType.json
@@ -15,7 +15,6 @@
         },
         "length": 2,
         "pos": 2,
-        "end": 15,
-        "arrayKind": 1
+        "end": 15
     }
 }
\ 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/ModuleAndEnumWithSameNameAndCommonRoot.symbols b/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.symbols
index 72eb0340eb2..7d1358ca927 100644
--- a/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.symbols
+++ b/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.symbols
@@ -6,8 +6,8 @@ module enumdule {
 >Point : Symbol(Point, Decl(ModuleAndEnumWithSameNameAndCommonRoot.ts, 0, 17))
 
         constructor(public x: number, public y: number) { }
->x : Symbol(x, Decl(ModuleAndEnumWithSameNameAndCommonRoot.ts, 3, 20))
->y : Symbol(y, Decl(ModuleAndEnumWithSameNameAndCommonRoot.ts, 3, 37))
+>x : Symbol(Point.x, Decl(ModuleAndEnumWithSameNameAndCommonRoot.ts, 3, 20))
+>y : Symbol(Point.y, Decl(ModuleAndEnumWithSameNameAndCommonRoot.ts, 3, 37))
     }
 }
 
diff --git a/tests/baselines/reference/Protected3.errors.txt b/tests/baselines/reference/Protected3.errors.txt
deleted file mode 100644
index 688422a1e0f..00000000000
--- a/tests/baselines/reference/Protected3.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/parser/ecmascript5/Protected/Protected3.ts(2,3): error TS1089: 'protected' modifier cannot appear on a constructor declaration.
-
-
-==== tests/cases/conformance/parser/ecmascript5/Protected/Protected3.ts (1 errors) ====
-    class C {
-      protected constructor() { }
-      ~~~~~~~~~
-!!! error TS1089: 'protected' modifier cannot appear on a constructor declaration.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/Protected3.symbols b/tests/baselines/reference/Protected3.symbols
new file mode 100644
index 00000000000..a9882189902
--- /dev/null
+++ b/tests/baselines/reference/Protected3.symbols
@@ -0,0 +1,6 @@
+=== tests/cases/conformance/parser/ecmascript5/Protected/Protected3.ts ===
+class C {
+>C : Symbol(C, Decl(Protected3.ts, 0, 0))
+
+  protected constructor() { }
+}
diff --git a/tests/baselines/reference/Protected3.types b/tests/baselines/reference/Protected3.types
new file mode 100644
index 00000000000..d3f938a4431
--- /dev/null
+++ b/tests/baselines/reference/Protected3.types
@@ -0,0 +1,6 @@
+=== tests/cases/conformance/parser/ecmascript5/Protected/Protected3.ts ===
+class C {
+>C : C
+
+  protected constructor() { }
+}
diff --git a/tests/baselines/reference/Protected8.symbols b/tests/baselines/reference/Protected8.symbols
index 502e68bb9c2..eccd4b50f3c 100644
--- a/tests/baselines/reference/Protected8.symbols
+++ b/tests/baselines/reference/Protected8.symbols
@@ -3,8 +3,8 @@ interface I {
 >I : Symbol(I, Decl(Protected8.ts, 0, 0))
 
    protected
->protected : Symbol(protected, Decl(Protected8.ts, 0, 13))
+>protected : Symbol(I.protected, Decl(Protected8.ts, 0, 13))
 
    p
->p : Symbol(p, Decl(Protected8.ts, 1, 12))
+>p : Symbol(I.p, Decl(Protected8.ts, 1, 12))
 }
diff --git a/tests/baselines/reference/Protected9.symbols b/tests/baselines/reference/Protected9.symbols
index 27ce91344e4..9ca97c78f9a 100644
--- a/tests/baselines/reference/Protected9.symbols
+++ b/tests/baselines/reference/Protected9.symbols
@@ -3,5 +3,5 @@ class C {
 >C : Symbol(C, Decl(Protected9.ts, 0, 0))
 
    constructor(protected p) { }
->p : Symbol(p, Decl(Protected9.ts, 1, 15))
+>p : Symbol(C.p, Decl(Protected9.ts, 1, 15))
 }
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.symbols b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.symbols
index c9e2c124e9d..f5830071897 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.symbols
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.symbols
@@ -6,10 +6,10 @@ module A {
 >Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 0, 10))
 
         x: number;
->x : Symbol(x, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 1, 24))
+>x : Symbol(Point.x, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 1, 24))
 
         y: number;
->y : Symbol(y, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 2, 18))
+>y : Symbol(Point.y, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 2, 18))
     }
 }
 
@@ -20,7 +20,7 @@ module A {
 >Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 7, 10))
 
         fromCarthesian(p: A.Point) {
->fromCarthesian : Symbol(fromCarthesian, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 8, 17))
+>fromCarthesian : Symbol(Point.fromCarthesian, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 8, 17))
 >p : Symbol(p, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 9, 23))
 >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 5, 1))
 >Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 0, 10))
@@ -58,7 +58,7 @@ module X.Y.Z {
 >Line : Symbol(Line, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 19, 14))
 
         length: number;
->length : Symbol(length, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 20, 23))
+>length : Symbol(Line.length, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 20, 23))
     }
 }
 
@@ -75,7 +75,7 @@ module X {
 >Line : Symbol(Line, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 27, 25))
 
                 name: string;
->name : Symbol(name, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 28, 24))
+>name : Symbol(Line.name, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts, 28, 24))
             }
         }
     }
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.symbols b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.symbols
index 2fcf3c4b09e..f9237087508 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.symbols
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.symbols
@@ -6,13 +6,13 @@ module A {
 >Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 10))
 
         x: number;
->x : Symbol(x, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 1, 28))
+>x : Symbol(Point.x, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 1, 28))
 
         y: number;
->y : Symbol(y, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 2, 18))
+>y : Symbol(Point.y, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 2, 18))
 
         toCarth(): Point;
->toCarth : Symbol(toCarth, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 3, 18))
+>toCarth : Symbol(Point.toCarth, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 3, 18))
 >Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 10))
     }
 }
@@ -24,7 +24,7 @@ module A {
 >Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 8, 10))
 
         fromCarth(): Point;
->fromCarth : Symbol(fromCarth, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 9, 21))
+>fromCarth : Symbol(Point.fromCarth, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 9, 21))
 >Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 8, 10))
     }
 }
@@ -72,12 +72,12 @@ module X {
 >Line : Symbol(Line, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 25, 23))
 
             start: A.Point;
->start : Symbol(start, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 26, 24))
+>start : Symbol(Line.start, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 26, 24))
 >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 6, 1))
 >Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 10))
 
             end: A.Point;
->end : Symbol(end, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 27, 27))
+>end : Symbol(Line.end, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 27, 27))
 >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 6, 1))
 >Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts, 0, 10))
         }
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.symbols b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.symbols
index b7402952dff..a9de1388dcd 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.symbols
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.symbols
@@ -6,10 +6,10 @@ module A {
 >Point : Symbol(Point, Decl(part1.ts, 0, 10))
 
         x: number;
->x : Symbol(x, Decl(part1.ts, 1, 28))
+>x : Symbol(Point.x, Decl(part1.ts, 1, 28))
 
         y: number;
->y : Symbol(y, Decl(part1.ts, 2, 18))
+>y : Symbol(Point.y, Decl(part1.ts, 2, 18))
     }
 
     export module Utils {
@@ -55,9 +55,9 @@ module A {
 >Plane : Symbol(Plane, Decl(part2.ts, 4, 25))
 
             constructor(public tl: Point, public br: Point) { }
->tl : Symbol(tl, Decl(part2.ts, 6, 24))
+>tl : Symbol(Plane.tl, Decl(part2.ts, 6, 24))
 >Point : Symbol(Point, Decl(part1.ts, 0, 10))
->br : Symbol(br, Decl(part2.ts, 6, 41))
+>br : Symbol(Plane.br, Decl(part2.ts, 6, 41))
 >Point : Symbol(Point, Decl(part1.ts, 0, 10))
         }
     }
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.symbols b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.symbols
index 3e8fa64501f..ba0d0a1888d 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.symbols
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.symbols
@@ -6,13 +6,13 @@ module A {
 >Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 10), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 10))
 
         x: number;
->x : Symbol(x, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 1, 28))
+>x : Symbol(Point.x, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 1, 28))
 
         y: number;
->y : Symbol(y, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 2, 18))
+>y : Symbol(Point.y, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 2, 18))
 
         toCarth(): Point;
->toCarth : Symbol(toCarth, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 3, 18))
+>toCarth : Symbol(Point.toCarth, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 3, 18))
 >Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 10), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 10))
     }
 }
@@ -24,7 +24,7 @@ module A {
 >Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 10), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 10))
 
         fromCarth(): Point;
->fromCarth : Symbol(fromCarth, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 9, 28))
+>fromCarth : Symbol(Point.fromCarth, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 9, 28))
 >Point : Symbol(Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 10), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 10))
     }
 }
@@ -75,12 +75,12 @@ module X {
 >Line : Symbol(Line, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 18, 14), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 25, 23))
 
             start: A.Point;
->start : Symbol(start, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 26, 31))
+>start : Symbol(Line.start, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 26, 31))
 >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 6, 1))
 >Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 10), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 10))
 
             end: A.Point;
->end : Symbol(end, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 27, 27))
+>end : Symbol(Line.end, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 27, 27))
 >A : Symbol(A, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 0), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 6, 1))
 >Point : Symbol(A.Point, Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 0, 10), Decl(TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts, 8, 10))
         }
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.errors.txt b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.errors.txt
index e46805a6a2f..fd048a987a4 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.errors.txt
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.errors.txt
@@ -1,13 +1,10 @@
-tests/cases/conformance/internalModules/DeclarationMerging/part1.ts(1,15): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/conformance/internalModules/DeclarationMerging/part2.ts(3,24): error TS2304: Cannot find name 'Point'.
 tests/cases/conformance/internalModules/DeclarationMerging/part2.ts(7,36): error TS2304: Cannot find name 'Point'.
 tests/cases/conformance/internalModules/DeclarationMerging/part2.ts(7,54): error TS2304: Cannot find name 'Point'.
 
 
-==== tests/cases/conformance/internalModules/DeclarationMerging/part1.ts (1 errors) ====
+==== tests/cases/conformance/internalModules/DeclarationMerging/part1.ts (0 errors) ====
     export module A {
-                  ~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
         export interface Point {
             x: number;
             y: number;
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.symbols b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.symbols
index e8187771695..bf8fd1dc48d 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.symbols
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.symbols
@@ -39,7 +39,7 @@ module X.Y.Z {
 >Line : Symbol(Line, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 14, 14))
 
         length: number;
->length : Symbol(length, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 15, 23))
+>length : Symbol(Line.length, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 15, 23))
     }
 }
 
@@ -56,7 +56,7 @@ module X {
 >Line : Symbol(Line, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 22, 18))
 
                 name: string;
->name : Symbol(name, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 23, 31))
+>name : Symbol(Line.name, Decl(TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts, 23, 31))
             }
         }
     }
diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.symbols b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.symbols
index 5c533273fa6..c76da99ac42 100644
--- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.symbols
+++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.symbols
@@ -9,10 +9,10 @@ module Root {
 >Point : Symbol(Point, Decl(part1.ts, 1, 21))
 
             x: number;
->x : Symbol(x, Decl(part1.ts, 2, 32))
+>x : Symbol(Point.x, Decl(part1.ts, 2, 32))
 
             y: number;
->y : Symbol(y, Decl(part1.ts, 3, 22))
+>y : Symbol(Point.y, Decl(part1.ts, 3, 22))
         }
 
         export module Utils {
@@ -62,11 +62,11 @@ module otherRoot {
 >Plane : Symbol(Plane, Decl(part2.ts, 5, 29))
 
                 constructor(public tl: Root.A.Point, public br: Root.A.Point) { }
->tl : Symbol(tl, Decl(part2.ts, 7, 28))
+>tl : Symbol(Plane.tl, Decl(part2.ts, 7, 28))
 >Root : Symbol(Root, Decl(part1.ts, 0, 0))
 >A : Symbol(Root.A, Decl(part1.ts, 0, 13))
 >Point : Symbol(Root.A.Point, Decl(part1.ts, 1, 21))
->br : Symbol(br, Decl(part2.ts, 7, 52))
+>br : Symbol(Plane.br, Decl(part2.ts, 7, 52))
 >Root : Symbol(Root, Decl(part1.ts, 0, 0))
 >A : Symbol(Root.A, Decl(part1.ts, 0, 13))
 >Point : Symbol(Root.A.Point, Decl(part1.ts, 1, 21))
diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.symbols b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.symbols
index 34abd4ecd65..ada4d20c0be 100644
--- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.symbols
+++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.symbols
@@ -6,10 +6,10 @@ module A {
 >Point : Symbol(Point, Decl(part1.ts, 0, 10))
 
         x: number;
->x : Symbol(x, Decl(part1.ts, 1, 28))
+>x : Symbol(Point.x, Decl(part1.ts, 1, 28))
 
         y: number;
->y : Symbol(y, Decl(part1.ts, 2, 18))
+>y : Symbol(Point.y, Decl(part1.ts, 2, 18))
     }
 
     export module Utils {
@@ -52,9 +52,9 @@ module A {
 >Plane : Symbol(Plane, Decl(part2.ts, 3, 25))
 
             constructor(public tl: Point, public br: Point) { }
->tl : Symbol(tl, Decl(part2.ts, 5, 24))
+>tl : Symbol(Plane.tl, Decl(part2.ts, 5, 24))
 >Point : Symbol(Point, Decl(part1.ts, 0, 10))
->br : Symbol(br, Decl(part2.ts, 5, 41))
+>br : Symbol(Plane.br, Decl(part2.ts, 5, 41))
 >Point : Symbol(Point, Decl(part1.ts, 0, 10))
         }
     }
diff --git a/tests/baselines/reference/TypeGuardWithArrayUnion.symbols b/tests/baselines/reference/TypeGuardWithArrayUnion.symbols
index 2ff91774b83..38d1dcf3e0a 100644
--- a/tests/baselines/reference/TypeGuardWithArrayUnion.symbols
+++ b/tests/baselines/reference/TypeGuardWithArrayUnion.symbols
@@ -3,7 +3,7 @@ class Message {
 >Message : Symbol(Message, Decl(TypeGuardWithArrayUnion.ts, 0, 0))
 
     value: string;
->value : Symbol(value, Decl(TypeGuardWithArrayUnion.ts, 0, 15))
+>value : Symbol(Message.value, Decl(TypeGuardWithArrayUnion.ts, 0, 15))
 }
 
 function saySize(message: Message | Message[]) {
diff --git a/tests/baselines/reference/VariableDeclaration12_es6.js b/tests/baselines/reference/VariableDeclaration12_es6.js
new file mode 100644
index 00000000000..1e7d6d4b363
--- /dev/null
+++ b/tests/baselines/reference/VariableDeclaration12_es6.js
@@ -0,0 +1,7 @@
+//// [VariableDeclaration12_es6.ts]
+
+let
+x
+
+//// [VariableDeclaration12_es6.js]
+let x;
diff --git a/tests/baselines/reference/VariableDeclaration12_es6.symbols b/tests/baselines/reference/VariableDeclaration12_es6.symbols
new file mode 100644
index 00000000000..a2f324502dd
--- /dev/null
+++ b/tests/baselines/reference/VariableDeclaration12_es6.symbols
@@ -0,0 +1,6 @@
+=== tests/cases/conformance/es6/variableDeclarations/VariableDeclaration12_es6.ts ===
+
+let
+x
+>x : Symbol(x, Decl(VariableDeclaration12_es6.ts, 1, 3))
+
diff --git a/tests/baselines/reference/VariableDeclaration12_es6.types b/tests/baselines/reference/VariableDeclaration12_es6.types
new file mode 100644
index 00000000000..14f23f88a7a
--- /dev/null
+++ b/tests/baselines/reference/VariableDeclaration12_es6.types
@@ -0,0 +1,6 @@
+=== tests/cases/conformance/es6/variableDeclarations/VariableDeclaration12_es6.ts ===
+
+let
+x
+>x : any
+
diff --git a/tests/baselines/reference/VariableDeclaration13_es6.errors.txt b/tests/baselines/reference/VariableDeclaration13_es6.errors.txt
new file mode 100644
index 00000000000..a022a4ad52b
--- /dev/null
+++ b/tests/baselines/reference/VariableDeclaration13_es6.errors.txt
@@ -0,0 +1,20 @@
+tests/cases/conformance/es6/variableDeclarations/VariableDeclaration13_es6.ts(5,5): error TS1181: Array element destructuring pattern expected.
+tests/cases/conformance/es6/variableDeclarations/VariableDeclaration13_es6.ts(5,6): error TS1005: ',' expected.
+tests/cases/conformance/es6/variableDeclarations/VariableDeclaration13_es6.ts(5,8): error TS1134: Variable declaration expected.
+tests/cases/conformance/es6/variableDeclarations/VariableDeclaration13_es6.ts(5,10): error TS1134: Variable declaration expected.
+
+
+==== tests/cases/conformance/es6/variableDeclarations/VariableDeclaration13_es6.ts (4 errors) ====
+    
+    // An ExpressionStatement cannot start with the two token sequence `let [` because
+    // that would make it ambiguous with a `let` LexicalDeclaration whose first LexicalBinding was an ArrayBindingPattern.
+    var let: any;
+    let[0] = 100;
+        ~
+!!! error TS1181: Array element destructuring pattern expected.
+         ~
+!!! error TS1005: ',' expected.
+           ~
+!!! error TS1134: Variable declaration expected.
+             ~~~
+!!! error TS1134: Variable declaration expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/VariableDeclaration13_es6.js b/tests/baselines/reference/VariableDeclaration13_es6.js
new file mode 100644
index 00000000000..4ec04b18c3a
--- /dev/null
+++ b/tests/baselines/reference/VariableDeclaration13_es6.js
@@ -0,0 +1,13 @@
+//// [VariableDeclaration13_es6.ts]
+
+// An ExpressionStatement cannot start with the two token sequence `let [` because
+// that would make it ambiguous with a `let` LexicalDeclaration whose first LexicalBinding was an ArrayBindingPattern.
+var let: any;
+let[0] = 100;
+
+//// [VariableDeclaration13_es6.js]
+// An ExpressionStatement cannot start with the two token sequence `let [` because
+// that would make it ambiguous with a `let` LexicalDeclaration whose first LexicalBinding was an ArrayBindingPattern.
+var let;
+let [] = 0;
+100;
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/abstractInterfaceIdentifierName.symbols b/tests/baselines/reference/abstractInterfaceIdentifierName.symbols
index c70cdec8ac9..29a1a361894 100644
--- a/tests/baselines/reference/abstractInterfaceIdentifierName.symbols
+++ b/tests/baselines/reference/abstractInterfaceIdentifierName.symbols
@@ -4,6 +4,6 @@ interface abstract {
 >abstract : Symbol(abstract, Decl(abstractInterfaceIdentifierName.ts, 0, 0))
 
     abstract(): void;
->abstract : Symbol(abstract, Decl(abstractInterfaceIdentifierName.ts, 1, 20))
+>abstract : Symbol(abstract.abstract, Decl(abstractInterfaceIdentifierName.ts, 1, 20))
 }
 
diff --git a/tests/baselines/reference/abstractProperty.js b/tests/baselines/reference/abstractProperty.js
new file mode 100644
index 00000000000..87b5475111b
--- /dev/null
+++ b/tests/baselines/reference/abstractProperty.js
@@ -0,0 +1,50 @@
+//// [abstractProperty.ts]
+interface A {
+    prop: string;
+    raw: string;
+    m(): void;
+}
+abstract class B implements A {
+    abstract prop: string;
+    abstract raw: string;
+    abstract readonly ro: string;
+    abstract get readonlyProp(): string;
+    abstract set readonlyProp(val: string);
+    abstract m(): void;
+}
+class C extends B {
+    get prop() { return "foo"; }
+    set prop(v) { }
+    raw = "edge";
+    readonly ro = "readonly please";
+    readonlyProp: string; // don't have to give a value, in fact
+    m() { }
+}
+
+//// [abstractProperty.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 B = (function () {
+    function B() {
+    }
+    return B;
+}());
+var C = (function (_super) {
+    __extends(C, _super);
+    function C() {
+        _super.apply(this, arguments);
+        this.raw = "edge";
+        this.ro = "readonly please";
+    }
+    Object.defineProperty(C.prototype, "prop", {
+        get: function () { return "foo"; },
+        set: function (v) { },
+        enumerable: true,
+        configurable: true
+    });
+    C.prototype.m = function () { };
+    return C;
+}(B));
diff --git a/tests/baselines/reference/abstractProperty.symbols b/tests/baselines/reference/abstractProperty.symbols
new file mode 100644
index 00000000000..3c69af4ffe9
--- /dev/null
+++ b/tests/baselines/reference/abstractProperty.symbols
@@ -0,0 +1,59 @@
+=== tests/cases/compiler/abstractProperty.ts ===
+interface A {
+>A : Symbol(A, Decl(abstractProperty.ts, 0, 0))
+
+    prop: string;
+>prop : Symbol(A.prop, Decl(abstractProperty.ts, 0, 13))
+
+    raw: string;
+>raw : Symbol(A.raw, Decl(abstractProperty.ts, 1, 17))
+
+    m(): void;
+>m : Symbol(A.m, Decl(abstractProperty.ts, 2, 16))
+}
+abstract class B implements A {
+>B : Symbol(B, Decl(abstractProperty.ts, 4, 1))
+>A : Symbol(A, Decl(abstractProperty.ts, 0, 0))
+
+    abstract prop: string;
+>prop : Symbol(B.prop, Decl(abstractProperty.ts, 5, 31))
+
+    abstract raw: string;
+>raw : Symbol(B.raw, Decl(abstractProperty.ts, 6, 26))
+
+    abstract readonly ro: string;
+>ro : Symbol(B.ro, Decl(abstractProperty.ts, 7, 25))
+
+    abstract get readonlyProp(): string;
+>readonlyProp : Symbol(B.readonlyProp, Decl(abstractProperty.ts, 8, 33), Decl(abstractProperty.ts, 9, 40))
+
+    abstract set readonlyProp(val: string);
+>readonlyProp : Symbol(B.readonlyProp, Decl(abstractProperty.ts, 8, 33), Decl(abstractProperty.ts, 9, 40))
+>val : Symbol(val, Decl(abstractProperty.ts, 10, 30))
+
+    abstract m(): void;
+>m : Symbol(B.m, Decl(abstractProperty.ts, 10, 43))
+}
+class C extends B {
+>C : Symbol(C, Decl(abstractProperty.ts, 12, 1))
+>B : Symbol(B, Decl(abstractProperty.ts, 4, 1))
+
+    get prop() { return "foo"; }
+>prop : Symbol(C.prop, Decl(abstractProperty.ts, 13, 19), Decl(abstractProperty.ts, 14, 32))
+
+    set prop(v) { }
+>prop : Symbol(C.prop, Decl(abstractProperty.ts, 13, 19), Decl(abstractProperty.ts, 14, 32))
+>v : Symbol(v, Decl(abstractProperty.ts, 15, 13))
+
+    raw = "edge";
+>raw : Symbol(C.raw, Decl(abstractProperty.ts, 15, 19))
+
+    readonly ro = "readonly please";
+>ro : Symbol(C.ro, Decl(abstractProperty.ts, 16, 17))
+
+    readonlyProp: string; // don't have to give a value, in fact
+>readonlyProp : Symbol(C.readonlyProp, Decl(abstractProperty.ts, 17, 36))
+
+    m() { }
+>m : Symbol(C.m, Decl(abstractProperty.ts, 18, 25))
+}
diff --git a/tests/baselines/reference/abstractProperty.types b/tests/baselines/reference/abstractProperty.types
new file mode 100644
index 00000000000..b6aff9356cd
--- /dev/null
+++ b/tests/baselines/reference/abstractProperty.types
@@ -0,0 +1,62 @@
+=== tests/cases/compiler/abstractProperty.ts ===
+interface A {
+>A : A
+
+    prop: string;
+>prop : string
+
+    raw: string;
+>raw : string
+
+    m(): void;
+>m : () => void
+}
+abstract class B implements A {
+>B : B
+>A : A
+
+    abstract prop: string;
+>prop : string
+
+    abstract raw: string;
+>raw : string
+
+    abstract readonly ro: string;
+>ro : string
+
+    abstract get readonlyProp(): string;
+>readonlyProp : string
+
+    abstract set readonlyProp(val: string);
+>readonlyProp : string
+>val : string
+
+    abstract m(): void;
+>m : () => void
+}
+class C extends B {
+>C : C
+>B : B
+
+    get prop() { return "foo"; }
+>prop : string
+>"foo" : string
+
+    set prop(v) { }
+>prop : string
+>v : string
+
+    raw = "edge";
+>raw : string
+>"edge" : string
+
+    readonly ro = "readonly please";
+>ro : string
+>"readonly please" : string
+
+    readonlyProp: string; // don't have to give a value, in fact
+>readonlyProp : string
+
+    m() { }
+>m : () => void
+}
diff --git a/tests/baselines/reference/abstractPropertyNegative.errors.txt b/tests/baselines/reference/abstractPropertyNegative.errors.txt
new file mode 100644
index 00000000000..448fb2255e0
--- /dev/null
+++ b/tests/baselines/reference/abstractPropertyNegative.errors.txt
@@ -0,0 +1,106 @@
+tests/cases/compiler/abstractPropertyNegative.ts(10,18): error TS2380: 'get' and 'set' accessor must have the same type.
+tests/cases/compiler/abstractPropertyNegative.ts(11,18): error TS2380: 'get' and 'set' accessor must have the same type.
+tests/cases/compiler/abstractPropertyNegative.ts(13,7): error TS2515: Non-abstract class 'C' does not implement inherited abstract member 'm' from class 'B'.
+tests/cases/compiler/abstractPropertyNegative.ts(13,7): error TS2515: Non-abstract class 'C' does not implement inherited abstract member 'mismatch' from class 'B'.
+tests/cases/compiler/abstractPropertyNegative.ts(13,7): error TS2515: Non-abstract class 'C' does not implement inherited abstract member 'prop' from class 'B'.
+tests/cases/compiler/abstractPropertyNegative.ts(13,7): error TS2515: Non-abstract class 'C' does not implement inherited abstract member 'readonlyProp' from class 'B'.
+tests/cases/compiler/abstractPropertyNegative.ts(15,5): error TS1244: Abstract methods can only appear within an abstract class.
+tests/cases/compiler/abstractPropertyNegative.ts(16,37): error TS1005: '{' expected.
+tests/cases/compiler/abstractPropertyNegative.ts(19,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property.
+tests/cases/compiler/abstractPropertyNegative.ts(24,7): error TS2415: Class 'WrongTypePropertyImpl' incorrectly extends base class 'WrongTypeProperty'.
+  Types of property 'num' are incompatible.
+    Type 'string' is not assignable to type 'number'.
+tests/cases/compiler/abstractPropertyNegative.ts(30,7): error TS2415: Class 'WrongTypeAccessorImpl' incorrectly extends base class 'WrongTypeAccessor'.
+  Types of property 'num' are incompatible.
+    Type 'string' is not assignable to type 'number'.
+tests/cases/compiler/abstractPropertyNegative.ts(33,7): error TS2415: Class 'WrongTypeAccessorImpl2' incorrectly extends base class 'WrongTypeAccessor'.
+  Types of property 'num' are incompatible.
+    Type 'string' is not assignable to type 'number'.
+tests/cases/compiler/abstractPropertyNegative.ts(38,18): error TS2676: Accessors must both be abstract or non-abstract.
+tests/cases/compiler/abstractPropertyNegative.ts(39,9): error TS2676: Accessors must both be abstract or non-abstract.
+tests/cases/compiler/abstractPropertyNegative.ts(40,9): error TS2676: Accessors must both be abstract or non-abstract.
+tests/cases/compiler/abstractPropertyNegative.ts(41,18): error TS2676: Accessors must both be abstract or non-abstract.
+
+
+==== tests/cases/compiler/abstractPropertyNegative.ts (16 errors) ====
+    interface A {
+        prop: string;
+        m(): string;
+    }
+    abstract class B implements A {
+        abstract prop: string;
+        public abstract readonly ro: string;
+        abstract get readonlyProp(): string;
+        abstract m(): string;
+        abstract get mismatch(): string;
+                     ~~~~~~~~
+!!! error TS2380: 'get' and 'set' accessor must have the same type.
+        abstract set mismatch(val: number); // error, not same type
+                     ~~~~~~~~
+!!! error TS2380: 'get' and 'set' accessor must have the same type.
+    }
+    class C extends B {
+          ~
+!!! error TS2515: Non-abstract class 'C' does not implement inherited abstract member 'm' from class 'B'.
+          ~
+!!! error TS2515: Non-abstract class 'C' does not implement inherited abstract member 'mismatch' from class 'B'.
+          ~
+!!! error TS2515: Non-abstract class 'C' does not implement inherited abstract member 'prop' from class 'B'.
+          ~
+!!! error TS2515: Non-abstract class 'C' does not implement inherited abstract member 'readonlyProp' from class 'B'.
+        readonly ro = "readonly please";
+        abstract notAllowed: string;
+        ~~~~~~~~
+!!! error TS1244: Abstract methods can only appear within an abstract class.
+        get concreteWithNoBody(): string;
+                                        ~
+!!! error TS1005: '{' expected.
+    }
+    let c = new C();
+    c.ro = "error: lhs of assignment can't be readonly";
+    ~~~~
+!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property.
+    
+    abstract class WrongTypeProperty {
+        abstract num: number;
+    }
+    class WrongTypePropertyImpl extends WrongTypeProperty {
+          ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2415: Class 'WrongTypePropertyImpl' incorrectly extends base class 'WrongTypeProperty'.
+!!! error TS2415:   Types of property 'num' are incompatible.
+!!! error TS2415:     Type 'string' is not assignable to type 'number'.
+        num = "nope, wrong";
+    }
+    abstract class WrongTypeAccessor {
+        abstract get num(): number;
+    }
+    class WrongTypeAccessorImpl extends WrongTypeAccessor {
+          ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2415: Class 'WrongTypeAccessorImpl' incorrectly extends base class 'WrongTypeAccessor'.
+!!! error TS2415:   Types of property 'num' are incompatible.
+!!! error TS2415:     Type 'string' is not assignable to type 'number'.
+        get num() { return "nope, wrong"; }
+    }
+    class WrongTypeAccessorImpl2 extends WrongTypeAccessor {
+          ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2415: Class 'WrongTypeAccessorImpl2' incorrectly extends base class 'WrongTypeAccessor'.
+!!! error TS2415:   Types of property 'num' are incompatible.
+!!! error TS2415:     Type 'string' is not assignable to type 'number'.
+        num = "nope, wrong";
+    }
+    
+    abstract class AbstractAccessorMismatch {
+        abstract get p1(): string;
+                     ~~
+!!! error TS2676: Accessors must both be abstract or non-abstract.
+        set p1(val: string) { };
+            ~~
+!!! error TS2676: Accessors must both be abstract or non-abstract.
+        get p2(): string { return "should work"; }
+            ~~
+!!! error TS2676: Accessors must both be abstract or non-abstract.
+        abstract set p2(val: string);
+                     ~~
+!!! error TS2676: Accessors must both be abstract or non-abstract.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/abstractPropertyNegative.js b/tests/baselines/reference/abstractPropertyNegative.js
new file mode 100644
index 00000000000..5fc340c58d0
--- /dev/null
+++ b/tests/baselines/reference/abstractPropertyNegative.js
@@ -0,0 +1,125 @@
+//// [abstractPropertyNegative.ts]
+interface A {
+    prop: string;
+    m(): string;
+}
+abstract class B implements A {
+    abstract prop: string;
+    public abstract readonly ro: string;
+    abstract get readonlyProp(): string;
+    abstract m(): string;
+    abstract get mismatch(): string;
+    abstract set mismatch(val: number); // error, not same type
+}
+class C extends B {
+    readonly ro = "readonly please";
+    abstract notAllowed: string;
+    get concreteWithNoBody(): string;
+}
+let c = new C();
+c.ro = "error: lhs of assignment can't be readonly";
+
+abstract class WrongTypeProperty {
+    abstract num: number;
+}
+class WrongTypePropertyImpl extends WrongTypeProperty {
+    num = "nope, wrong";
+}
+abstract class WrongTypeAccessor {
+    abstract get num(): number;
+}
+class WrongTypeAccessorImpl extends WrongTypeAccessor {
+    get num() { return "nope, wrong"; }
+}
+class WrongTypeAccessorImpl2 extends WrongTypeAccessor {
+    num = "nope, wrong";
+}
+
+abstract class AbstractAccessorMismatch {
+    abstract get p1(): string;
+    set p1(val: string) { };
+    get p2(): string { return "should work"; }
+    abstract set p2(val: string);
+}
+
+
+//// [abstractPropertyNegative.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 B = (function () {
+    function B() {
+    }
+    return B;
+}());
+var C = (function (_super) {
+    __extends(C, _super);
+    function C() {
+        _super.apply(this, arguments);
+        this.ro = "readonly please";
+    }
+    Object.defineProperty(C.prototype, "concreteWithNoBody", {
+        get: function () { },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+}(B));
+var c = new C();
+c.ro = "error: lhs of assignment can't be readonly";
+var WrongTypeProperty = (function () {
+    function WrongTypeProperty() {
+    }
+    return WrongTypeProperty;
+}());
+var WrongTypePropertyImpl = (function (_super) {
+    __extends(WrongTypePropertyImpl, _super);
+    function WrongTypePropertyImpl() {
+        _super.apply(this, arguments);
+        this.num = "nope, wrong";
+    }
+    return WrongTypePropertyImpl;
+}(WrongTypeProperty));
+var WrongTypeAccessor = (function () {
+    function WrongTypeAccessor() {
+    }
+    return WrongTypeAccessor;
+}());
+var WrongTypeAccessorImpl = (function (_super) {
+    __extends(WrongTypeAccessorImpl, _super);
+    function WrongTypeAccessorImpl() {
+        _super.apply(this, arguments);
+    }
+    Object.defineProperty(WrongTypeAccessorImpl.prototype, "num", {
+        get: function () { return "nope, wrong"; },
+        enumerable: true,
+        configurable: true
+    });
+    return WrongTypeAccessorImpl;
+}(WrongTypeAccessor));
+var WrongTypeAccessorImpl2 = (function (_super) {
+    __extends(WrongTypeAccessorImpl2, _super);
+    function WrongTypeAccessorImpl2() {
+        _super.apply(this, arguments);
+        this.num = "nope, wrong";
+    }
+    return WrongTypeAccessorImpl2;
+}(WrongTypeAccessor));
+var AbstractAccessorMismatch = (function () {
+    function AbstractAccessorMismatch() {
+    }
+    Object.defineProperty(AbstractAccessorMismatch.prototype, "p1", {
+        set: function (val) { },
+        enumerable: true,
+        configurable: true
+    });
+    ;
+    Object.defineProperty(AbstractAccessorMismatch.prototype, "p2", {
+        get: function () { return "should work"; },
+        enumerable: true,
+        configurable: true
+    });
+    return AbstractAccessorMismatch;
+}());
diff --git a/tests/baselines/reference/accessOverriddenBaseClassMember1.symbols b/tests/baselines/reference/accessOverriddenBaseClassMember1.symbols
index e5e19030afa..edcea5686e7 100644
--- a/tests/baselines/reference/accessOverriddenBaseClassMember1.symbols
+++ b/tests/baselines/reference/accessOverriddenBaseClassMember1.symbols
@@ -3,19 +3,19 @@ class Point {
 >Point : Symbol(Point, Decl(accessOverriddenBaseClassMember1.ts, 0, 0))
 
     constructor(public x: number, public y: number) { }
->x : Symbol(x, Decl(accessOverriddenBaseClassMember1.ts, 1, 16))
->y : Symbol(y, Decl(accessOverriddenBaseClassMember1.ts, 1, 33))
+>x : Symbol(Point.x, Decl(accessOverriddenBaseClassMember1.ts, 1, 16))
+>y : Symbol(Point.y, Decl(accessOverriddenBaseClassMember1.ts, 1, 33))
 
     public toString() {
->toString : Symbol(toString, Decl(accessOverriddenBaseClassMember1.ts, 1, 55))
+>toString : Symbol(Point.toString, Decl(accessOverriddenBaseClassMember1.ts, 1, 55))
 
         return "x=" + this.x + " y=" + this.y;
->this.x : Symbol(x, Decl(accessOverriddenBaseClassMember1.ts, 1, 16))
+>this.x : Symbol(Point.x, Decl(accessOverriddenBaseClassMember1.ts, 1, 16))
 >this : Symbol(Point, Decl(accessOverriddenBaseClassMember1.ts, 0, 0))
->x : Symbol(x, Decl(accessOverriddenBaseClassMember1.ts, 1, 16))
->this.y : Symbol(y, Decl(accessOverriddenBaseClassMember1.ts, 1, 33))
+>x : Symbol(Point.x, Decl(accessOverriddenBaseClassMember1.ts, 1, 16))
+>this.y : Symbol(Point.y, Decl(accessOverriddenBaseClassMember1.ts, 1, 33))
 >this : Symbol(Point, Decl(accessOverriddenBaseClassMember1.ts, 0, 0))
->y : Symbol(y, Decl(accessOverriddenBaseClassMember1.ts, 1, 33))
+>y : Symbol(Point.y, Decl(accessOverriddenBaseClassMember1.ts, 1, 33))
     }
 }
 class ColoredPoint extends Point {
@@ -25,7 +25,7 @@ class ColoredPoint extends Point {
     constructor(x: number, y: number, public color: string) {
 >x : Symbol(x, Decl(accessOverriddenBaseClassMember1.ts, 7, 16))
 >y : Symbol(y, Decl(accessOverriddenBaseClassMember1.ts, 7, 26))
->color : Symbol(color, Decl(accessOverriddenBaseClassMember1.ts, 7, 37))
+>color : Symbol(ColoredPoint.color, Decl(accessOverriddenBaseClassMember1.ts, 7, 37))
 
         super(x, y);
 >super : Symbol(Point, Decl(accessOverriddenBaseClassMember1.ts, 0, 0))
@@ -33,15 +33,15 @@ class ColoredPoint extends Point {
 >y : Symbol(y, Decl(accessOverriddenBaseClassMember1.ts, 7, 26))
     }
     public toString() {
->toString : Symbol(toString, Decl(accessOverriddenBaseClassMember1.ts, 9, 5))
+>toString : Symbol(ColoredPoint.toString, Decl(accessOverriddenBaseClassMember1.ts, 9, 5))
 
         return super.toString() + " color=" + this.color;
 >super.toString : Symbol(Point.toString, Decl(accessOverriddenBaseClassMember1.ts, 1, 55))
 >super : Symbol(Point, Decl(accessOverriddenBaseClassMember1.ts, 0, 0))
 >toString : Symbol(Point.toString, Decl(accessOverriddenBaseClassMember1.ts, 1, 55))
->this.color : Symbol(color, Decl(accessOverriddenBaseClassMember1.ts, 7, 37))
+>this.color : Symbol(ColoredPoint.color, Decl(accessOverriddenBaseClassMember1.ts, 7, 37))
 >this : Symbol(ColoredPoint, Decl(accessOverriddenBaseClassMember1.ts, 5, 1))
->color : Symbol(color, Decl(accessOverriddenBaseClassMember1.ts, 7, 37))
+>color : Symbol(ColoredPoint.color, Decl(accessOverriddenBaseClassMember1.ts, 7, 37))
     }
 }
 
diff --git a/tests/baselines/reference/accessorWithES5.symbols b/tests/baselines/reference/accessorWithES5.symbols
index dccbd8180bb..46e8d6f91da 100644
--- a/tests/baselines/reference/accessorWithES5.symbols
+++ b/tests/baselines/reference/accessorWithES5.symbols
@@ -4,7 +4,7 @@ class C {
 >C : Symbol(C, Decl(accessorWithES5.ts, 0, 0))
 
     get x() {
->x : Symbol(x, Decl(accessorWithES5.ts, 1, 9))
+>x : Symbol(C.x, Decl(accessorWithES5.ts, 1, 9))
 
         return 1;
     }
@@ -14,7 +14,7 @@ class D {
 >D : Symbol(D, Decl(accessorWithES5.ts, 5, 1))
 
     set x(v) {
->x : Symbol(x, Decl(accessorWithES5.ts, 7, 9))
+>x : Symbol(D.x, Decl(accessorWithES5.ts, 7, 9))
 >v : Symbol(v, Decl(accessorWithES5.ts, 8, 10))
     }
 }
diff --git a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.symbols b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.symbols
index bada6c561f1..f95a388c189 100644
--- a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.symbols
+++ b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.symbols
@@ -6,7 +6,7 @@ class C {
 >C : Symbol(C, Decl(additionOperatorWithAnyAndEveryType.ts, 0, 18))
 
     public a: string;
->a : Symbol(a, Decl(additionOperatorWithAnyAndEveryType.ts, 1, 9))
+>a : Symbol(C.a, Decl(additionOperatorWithAnyAndEveryType.ts, 1, 9))
 
     static foo() { }
 >foo : Symbol(C.foo, Decl(additionOperatorWithAnyAndEveryType.ts, 2, 21))
diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.symbols b/tests/baselines/reference/aliasUsageInAccessorsOfClass.symbols
index 62a2396e2b2..45132ea2aa9 100644
--- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.symbols
+++ b/tests/baselines/reference/aliasUsageInAccessorsOfClass.symbols
@@ -9,7 +9,7 @@ interface IHasVisualizationModel {
 >IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsage1_main.ts, 1, 50))
 
     VisualizationModel: typeof Backbone.Model;
->VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsage1_main.ts, 2, 34))
+>VisualizationModel : Symbol(IHasVisualizationModel.VisualizationModel, Decl(aliasUsage1_main.ts, 2, 34))
 >Backbone.Model : Symbol(Backbone.Model, Decl(aliasUsage1_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(aliasUsage1_main.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsage1_backbone.ts, 0, 0))
@@ -18,19 +18,19 @@ class C2 {
 >C2 : Symbol(C2, Decl(aliasUsage1_main.ts, 4, 1))
 
     x: IHasVisualizationModel;
->x : Symbol(x, Decl(aliasUsage1_main.ts, 5, 10))
+>x : Symbol(C2.x, Decl(aliasUsage1_main.ts, 5, 10))
 >IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsage1_main.ts, 1, 50))
 
     get A() {
->A : Symbol(A, Decl(aliasUsage1_main.ts, 6, 30), Decl(aliasUsage1_main.ts, 9, 5))
+>A : Symbol(C2.A, Decl(aliasUsage1_main.ts, 6, 30), Decl(aliasUsage1_main.ts, 9, 5))
 
         return this.x;
->this.x : Symbol(x, Decl(aliasUsage1_main.ts, 5, 10))
+>this.x : Symbol(C2.x, Decl(aliasUsage1_main.ts, 5, 10))
 >this : Symbol(C2, Decl(aliasUsage1_main.ts, 4, 1))
->x : Symbol(x, Decl(aliasUsage1_main.ts, 5, 10))
+>x : Symbol(C2.x, Decl(aliasUsage1_main.ts, 5, 10))
     }
     set A(x) {
->A : Symbol(A, Decl(aliasUsage1_main.ts, 6, 30), Decl(aliasUsage1_main.ts, 9, 5))
+>A : Symbol(C2.A, Decl(aliasUsage1_main.ts, 6, 30), Decl(aliasUsage1_main.ts, 9, 5))
 >x : Symbol(x, Decl(aliasUsage1_main.ts, 10, 10))
 
         x = moduleA;
@@ -43,7 +43,7 @@ export class Model {
 >Model : Symbol(Model, Decl(aliasUsage1_backbone.ts, 0, 0))
 
     public someData: string;
->someData : Symbol(someData, Decl(aliasUsage1_backbone.ts, 0, 20))
+>someData : Symbol(Model.someData, Decl(aliasUsage1_backbone.ts, 0, 20))
 }
 
 === tests/cases/compiler/aliasUsage1_moduleA.ts ===
diff --git a/tests/baselines/reference/aliasUsageInArray.symbols b/tests/baselines/reference/aliasUsageInArray.symbols
index 9bca1bc8864..367cd05545a 100644
--- a/tests/baselines/reference/aliasUsageInArray.symbols
+++ b/tests/baselines/reference/aliasUsageInArray.symbols
@@ -9,7 +9,7 @@ interface IHasVisualizationModel {
 >IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInArray_main.ts, 1, 56))
 
     VisualizationModel: typeof Backbone.Model;
->VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInArray_main.ts, 2, 34))
+>VisualizationModel : Symbol(IHasVisualizationModel.VisualizationModel, Decl(aliasUsageInArray_main.ts, 2, 34))
 >Backbone.Model : Symbol(Backbone.Model, Decl(aliasUsageInArray_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(aliasUsageInArray_main.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsageInArray_backbone.ts, 0, 0))
@@ -30,7 +30,7 @@ export class Model {
 >Model : Symbol(Model, Decl(aliasUsageInArray_backbone.ts, 0, 0))
 
     public someData: string;
->someData : Symbol(someData, Decl(aliasUsageInArray_backbone.ts, 0, 20))
+>someData : Symbol(Model.someData, Decl(aliasUsageInArray_backbone.ts, 0, 20))
 }
 
 === tests/cases/compiler/aliasUsageInArray_moduleA.ts ===
diff --git a/tests/baselines/reference/aliasUsageInFunctionExpression.symbols b/tests/baselines/reference/aliasUsageInFunctionExpression.symbols
index bd791d4d38f..a7a1f5d4593 100644
--- a/tests/baselines/reference/aliasUsageInFunctionExpression.symbols
+++ b/tests/baselines/reference/aliasUsageInFunctionExpression.symbols
@@ -9,7 +9,7 @@ interface IHasVisualizationModel {
 >IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInFunctionExpression_main.ts, 1, 69))
 
     VisualizationModel: typeof Backbone.Model;
->VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInFunctionExpression_main.ts, 2, 34))
+>VisualizationModel : Symbol(IHasVisualizationModel.VisualizationModel, Decl(aliasUsageInFunctionExpression_main.ts, 2, 34))
 >Backbone.Model : Symbol(Backbone.Model, Decl(aliasUsageInFunctionExpression_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(aliasUsageInFunctionExpression_main.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsageInFunctionExpression_backbone.ts, 0, 0))
@@ -30,7 +30,7 @@ export class Model {
 >Model : Symbol(Model, Decl(aliasUsageInFunctionExpression_backbone.ts, 0, 0))
 
     public someData: string;
->someData : Symbol(someData, Decl(aliasUsageInFunctionExpression_backbone.ts, 0, 20))
+>someData : Symbol(Model.someData, Decl(aliasUsageInFunctionExpression_backbone.ts, 0, 20))
 }
 
 === tests/cases/compiler/aliasUsageInFunctionExpression_moduleA.ts ===
diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.symbols b/tests/baselines/reference/aliasUsageInGenericFunction.symbols
index fccf60c3514..e44059e6907 100644
--- a/tests/baselines/reference/aliasUsageInGenericFunction.symbols
+++ b/tests/baselines/reference/aliasUsageInGenericFunction.symbols
@@ -9,7 +9,7 @@ interface IHasVisualizationModel {
 >IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInGenericFunction_main.ts, 1, 66))
 
     VisualizationModel: typeof Backbone.Model;
->VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInGenericFunction_main.ts, 2, 34))
+>VisualizationModel : Symbol(IHasVisualizationModel.VisualizationModel, Decl(aliasUsageInGenericFunction_main.ts, 2, 34))
 >Backbone.Model : Symbol(Backbone.Model, Decl(aliasUsageInGenericFunction_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(aliasUsageInGenericFunction_main.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsageInGenericFunction_backbone.ts, 0, 0))
@@ -42,7 +42,7 @@ export class Model {
 >Model : Symbol(Model, Decl(aliasUsageInGenericFunction_backbone.ts, 0, 0))
 
     public someData: string;
->someData : Symbol(someData, Decl(aliasUsageInGenericFunction_backbone.ts, 0, 20))
+>someData : Symbol(Model.someData, Decl(aliasUsageInGenericFunction_backbone.ts, 0, 20))
 }
 
 === tests/cases/compiler/aliasUsageInGenericFunction_moduleA.ts ===
diff --git a/tests/baselines/reference/aliasUsageInIndexerOfClass.symbols b/tests/baselines/reference/aliasUsageInIndexerOfClass.symbols
index 37529d2ead2..3e13b71ea4f 100644
--- a/tests/baselines/reference/aliasUsageInIndexerOfClass.symbols
+++ b/tests/baselines/reference/aliasUsageInIndexerOfClass.symbols
@@ -9,7 +9,7 @@ interface IHasVisualizationModel {
 >IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInIndexerOfClass_main.ts, 1, 65))
 
     VisualizationModel: typeof Backbone.Model;
->VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInIndexerOfClass_main.ts, 2, 34))
+>VisualizationModel : Symbol(IHasVisualizationModel.VisualizationModel, Decl(aliasUsageInIndexerOfClass_main.ts, 2, 34))
 >Backbone.Model : Symbol(Backbone.Model, Decl(aliasUsageInIndexerOfClass_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(aliasUsageInIndexerOfClass_main.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsageInIndexerOfClass_backbone.ts, 0, 0))
@@ -22,7 +22,7 @@ class N {
 >IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInIndexerOfClass_main.ts, 1, 65))
 
     x = moduleA;
->x : Symbol(x, Decl(aliasUsageInIndexerOfClass_main.ts, 6, 41))
+>x : Symbol(N.x, Decl(aliasUsageInIndexerOfClass_main.ts, 6, 41))
 >moduleA : Symbol(moduleA, Decl(aliasUsageInIndexerOfClass_main.ts, 0, 67))
 }
 class N2 {
@@ -33,7 +33,7 @@ class N2 {
 >moduleA : Symbol(moduleA, Decl(aliasUsageInIndexerOfClass_main.ts, 0, 67))
 
     x: IHasVisualizationModel;
->x : Symbol(x, Decl(aliasUsageInIndexerOfClass_main.ts, 10, 33))
+>x : Symbol(N2.x, Decl(aliasUsageInIndexerOfClass_main.ts, 10, 33))
 >IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInIndexerOfClass_main.ts, 1, 65))
 }
 === tests/cases/compiler/aliasUsageInIndexerOfClass_backbone.ts ===
@@ -41,7 +41,7 @@ export class Model {
 >Model : Symbol(Model, Decl(aliasUsageInIndexerOfClass_backbone.ts, 0, 0))
 
     public someData: string;
->someData : Symbol(someData, Decl(aliasUsageInIndexerOfClass_backbone.ts, 0, 20))
+>someData : Symbol(Model.someData, Decl(aliasUsageInIndexerOfClass_backbone.ts, 0, 20))
 }
 
 === tests/cases/compiler/aliasUsageInIndexerOfClass_moduleA.ts ===
diff --git a/tests/baselines/reference/aliasUsageInObjectLiteral.symbols b/tests/baselines/reference/aliasUsageInObjectLiteral.symbols
index ef94a9037ad..161617e0003 100644
--- a/tests/baselines/reference/aliasUsageInObjectLiteral.symbols
+++ b/tests/baselines/reference/aliasUsageInObjectLiteral.symbols
@@ -9,7 +9,7 @@ interface IHasVisualizationModel {
 >IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInObjectLiteral_main.ts, 1, 64))
 
     VisualizationModel: typeof Backbone.Model;
->VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInObjectLiteral_main.ts, 2, 34))
+>VisualizationModel : Symbol(IHasVisualizationModel.VisualizationModel, Decl(aliasUsageInObjectLiteral_main.ts, 2, 34))
 >Backbone.Model : Symbol(Backbone.Model, Decl(aliasUsageInObjectLiteral_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(aliasUsageInObjectLiteral_main.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsageInObjectLiteral_backbone.ts, 0, 0))
@@ -42,7 +42,7 @@ export class Model {
 >Model : Symbol(Model, Decl(aliasUsageInObjectLiteral_backbone.ts, 0, 0))
 
     public someData: string;
->someData : Symbol(someData, Decl(aliasUsageInObjectLiteral_backbone.ts, 0, 20))
+>someData : Symbol(Model.someData, Decl(aliasUsageInObjectLiteral_backbone.ts, 0, 20))
 }
 
 === tests/cases/compiler/aliasUsageInObjectLiteral_moduleA.ts ===
diff --git a/tests/baselines/reference/aliasUsageInOrExpression.symbols b/tests/baselines/reference/aliasUsageInOrExpression.symbols
index 3d9331b1fa9..2d9f55ec274 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.symbols
+++ b/tests/baselines/reference/aliasUsageInOrExpression.symbols
@@ -9,7 +9,7 @@ interface IHasVisualizationModel {
 >IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 63))
 
     VisualizationModel: typeof Backbone.Model;
->VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 2, 34))
+>VisualizationModel : Symbol(IHasVisualizationModel.VisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 2, 34))
 >Backbone.Model : Symbol(Backbone.Model, Decl(aliasUsageInOrExpression_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(aliasUsageInOrExpression_main.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsageInOrExpression_backbone.ts, 0, 0))
@@ -58,7 +58,7 @@ export class Model {
 >Model : Symbol(Model, Decl(aliasUsageInOrExpression_backbone.ts, 0, 0))
 
     public someData: string;
->someData : Symbol(someData, Decl(aliasUsageInOrExpression_backbone.ts, 0, 20))
+>someData : Symbol(Model.someData, Decl(aliasUsageInOrExpression_backbone.ts, 0, 20))
 }
 
 === tests/cases/compiler/aliasUsageInOrExpression_moduleA.ts ===
diff --git a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.symbols b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.symbols
index 6fc639da2c1..77dbb058371 100644
--- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.symbols
+++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.symbols
@@ -9,7 +9,7 @@ interface IHasVisualizationModel {
 >IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 1, 78))
 
     VisualizationModel: typeof Backbone.Model;
->VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 2, 34))
+>VisualizationModel : Symbol(IHasVisualizationModel.VisualizationModel, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 2, 34))
 >Backbone.Model : Symbol(Backbone.Model, Decl(aliasUsageInTypeArgumentOfExtendsClause_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsageInTypeArgumentOfExtendsClause_backbone.ts, 0, 0))
@@ -20,7 +20,7 @@ class C<T extends IHasVisualizationModel> {
 >IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 1, 78))
 
     x: T;
->x : Symbol(x, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 5, 43))
+>x : Symbol(C.x, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 5, 43))
 >T : Symbol(T, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 5, 8))
 }
 class D extends C<IHasVisualizationModel> {
@@ -29,7 +29,7 @@ class D extends C<IHasVisualizationModel> {
 >IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 1, 78))
 
     x = moduleA;
->x : Symbol(x, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 8, 43))
+>x : Symbol(D.x, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 8, 43))
 >moduleA : Symbol(moduleA, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 0, 80))
 }
 === tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause_backbone.ts ===
@@ -37,7 +37,7 @@ export class Model {
 >Model : Symbol(Model, Decl(aliasUsageInTypeArgumentOfExtendsClause_backbone.ts, 0, 0))
 
     public someData: string;
->someData : Symbol(someData, Decl(aliasUsageInTypeArgumentOfExtendsClause_backbone.ts, 0, 20))
+>someData : Symbol(Model.someData, Decl(aliasUsageInTypeArgumentOfExtendsClause_backbone.ts, 0, 20))
 }
 
 === tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause_moduleA.ts ===
diff --git a/tests/baselines/reference/aliasUsageInVarAssignment.symbols b/tests/baselines/reference/aliasUsageInVarAssignment.symbols
index d0e7f6b7d05..671cbfc3082 100644
--- a/tests/baselines/reference/aliasUsageInVarAssignment.symbols
+++ b/tests/baselines/reference/aliasUsageInVarAssignment.symbols
@@ -9,7 +9,7 @@ interface IHasVisualizationModel {
 >IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInVarAssignment_main.ts, 1, 64))
 
     VisualizationModel: typeof Backbone.Model;
->VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInVarAssignment_main.ts, 2, 34))
+>VisualizationModel : Symbol(IHasVisualizationModel.VisualizationModel, Decl(aliasUsageInVarAssignment_main.ts, 2, 34))
 >Backbone.Model : Symbol(Backbone.Model, Decl(aliasUsageInVarAssignment_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(aliasUsageInVarAssignment_main.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsageInVarAssignment_backbone.ts, 0, 0))
@@ -28,7 +28,7 @@ export class Model {
 >Model : Symbol(Model, Decl(aliasUsageInVarAssignment_backbone.ts, 0, 0))
 
     public someData: string;
->someData : Symbol(someData, Decl(aliasUsageInVarAssignment_backbone.ts, 0, 20))
+>someData : Symbol(Model.someData, Decl(aliasUsageInVarAssignment_backbone.ts, 0, 20))
 }
 
 === tests/cases/compiler/aliasUsageInVarAssignment_moduleA.ts ===
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/allowSyntheticDefaultImports1.symbols b/tests/baselines/reference/allowSyntheticDefaultImports1.symbols
index d88a79e1bf2..ecbe9e4c205 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports1.symbols
+++ b/tests/baselines/reference/allowSyntheticDefaultImports1.symbols
@@ -13,6 +13,6 @@ export class Foo {
 >Foo : Symbol(Foo, Decl(b.ts, 0, 0))
 
 	member: string;
->member : Symbol(member, Decl(b.ts, 0, 18))
+>member : Symbol(Foo.member, Decl(b.ts, 0, 18))
 }
 
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/allowSyntheticDefaultImports2.symbols b/tests/baselines/reference/allowSyntheticDefaultImports2.symbols
index cea6145fbd6..615b1095c66 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports2.symbols
+++ b/tests/baselines/reference/allowSyntheticDefaultImports2.symbols
@@ -13,5 +13,5 @@ export class Foo {
 >Foo : Symbol(Foo, Decl(b.ts, 0, 0))
 
 	member: string;
->member : Symbol(member, Decl(b.ts, 0, 18))
+>member : Symbol(Foo.member, Decl(b.ts, 0, 18))
 }
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/allowSyntheticDefaultImports4.symbols b/tests/baselines/reference/allowSyntheticDefaultImports4.symbols
index 8edad006c2d..22887d48bd9 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports4.symbols
+++ b/tests/baselines/reference/allowSyntheticDefaultImports4.symbols
@@ -3,7 +3,7 @@ declare class Foo {
 >Foo : Symbol(Foo, Decl(b.d.ts, 0, 0))
 
 	member: string;
->member : Symbol(member, Decl(b.d.ts, 0, 19))
+>member : Symbol(Foo.member, Decl(b.d.ts, 0, 19))
 }
 export = Foo;
 >Foo : Symbol(Foo, Decl(b.d.ts, 0, 0))
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/allowSyntheticDefaultImports5.symbols b/tests/baselines/reference/allowSyntheticDefaultImports5.symbols
index 8edad006c2d..22887d48bd9 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports5.symbols
+++ b/tests/baselines/reference/allowSyntheticDefaultImports5.symbols
@@ -3,7 +3,7 @@ declare class Foo {
 >Foo : Symbol(Foo, Decl(b.d.ts, 0, 0))
 
 	member: string;
->member : Symbol(member, Decl(b.d.ts, 0, 19))
+>member : Symbol(Foo.member, Decl(b.d.ts, 0, 19))
 }
 export = Foo;
 >Foo : Symbol(Foo, Decl(b.d.ts, 0, 0))
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/ambientClassDeclarationWithExtends.symbols b/tests/baselines/reference/ambientClassDeclarationWithExtends.symbols
index 023ae6bf582..125bd0d0e5f 100644
--- a/tests/baselines/reference/ambientClassDeclarationWithExtends.symbols
+++ b/tests/baselines/reference/ambientClassDeclarationWithExtends.symbols
@@ -10,7 +10,7 @@ declare class C {
 >C : Symbol(C, Decl(ambientClassDeclarationExtends_singleFile.ts, 1, 29))
 
     public foo;
->foo : Symbol(foo, Decl(ambientClassDeclarationExtends_singleFile.ts, 3, 17))
+>foo : Symbol(C.foo, Decl(ambientClassDeclarationExtends_singleFile.ts, 3, 17))
 }
 namespace D { var x; }
 >D : Symbol(D, Decl(ambientClassDeclarationExtends_singleFile.ts, 5, 1), Decl(ambientClassDeclarationExtends_singleFile.ts, 6, 22))
@@ -31,7 +31,7 @@ declare class E {
 >E : Symbol(E, Decl(ambientClassDeclarationExtends_file1.ts, 0, 0))
 
     public bar;
->bar : Symbol(bar, Decl(ambientClassDeclarationExtends_file1.ts, 1, 17))
+>bar : Symbol(E.bar, Decl(ambientClassDeclarationExtends_file1.ts, 1, 17))
 }
 namespace F { var y; }
 >F : Symbol(F, Decl(ambientClassDeclarationExtends_file1.ts, 3, 1), Decl(ambientClassDeclarationExtends_file2.ts, 0, 0))
diff --git a/tests/baselines/reference/ambientClassMergesOverloadsWithInterface.symbols b/tests/baselines/reference/ambientClassMergesOverloadsWithInterface.symbols
index 9a5eb13d21d..224edf38cee 100644
--- a/tests/baselines/reference/ambientClassMergesOverloadsWithInterface.symbols
+++ b/tests/baselines/reference/ambientClassMergesOverloadsWithInterface.symbols
@@ -3,20 +3,20 @@ declare class C {
 >C : Symbol(C, Decl(ambientClassMergesOverloadsWithInterface.ts, 0, 0), Decl(ambientClassMergesOverloadsWithInterface.ts, 3, 1))
 
     baz(): any;
->baz : Symbol(baz, Decl(ambientClassMergesOverloadsWithInterface.ts, 0, 17))
+>baz : Symbol(C.baz, Decl(ambientClassMergesOverloadsWithInterface.ts, 0, 17))
 
     foo(n: number): any;
->foo : Symbol(foo, Decl(ambientClassMergesOverloadsWithInterface.ts, 1, 15), Decl(ambientClassMergesOverloadsWithInterface.ts, 4, 13))
+>foo : Symbol(C.foo, Decl(ambientClassMergesOverloadsWithInterface.ts, 1, 15), Decl(ambientClassMergesOverloadsWithInterface.ts, 4, 13))
 >n : Symbol(n, Decl(ambientClassMergesOverloadsWithInterface.ts, 2, 8))
 }
 interface C {
 >C : Symbol(C, Decl(ambientClassMergesOverloadsWithInterface.ts, 0, 0), Decl(ambientClassMergesOverloadsWithInterface.ts, 3, 1))
 
     foo(n: number): any;
->foo : Symbol(foo, Decl(ambientClassMergesOverloadsWithInterface.ts, 1, 15), Decl(ambientClassMergesOverloadsWithInterface.ts, 4, 13))
+>foo : Symbol(C.foo, Decl(ambientClassMergesOverloadsWithInterface.ts, 1, 15), Decl(ambientClassMergesOverloadsWithInterface.ts, 4, 13))
 >n : Symbol(n, Decl(ambientClassMergesOverloadsWithInterface.ts, 5, 8))
 
     bar(): any;
->bar : Symbol(bar, Decl(ambientClassMergesOverloadsWithInterface.ts, 5, 24))
+>bar : Symbol(C.bar, Decl(ambientClassMergesOverloadsWithInterface.ts, 5, 24))
 }
 
diff --git a/tests/baselines/reference/ambientDeclarations.symbols b/tests/baselines/reference/ambientDeclarations.symbols
index e5b85ae7c2c..ef5c5403ccf 100644
--- a/tests/baselines/reference/ambientDeclarations.symbols
+++ b/tests/baselines/reference/ambientDeclarations.symbols
@@ -63,7 +63,7 @@ declare class cls {
 
     constructor();
     method(): cls;
->method : Symbol(method, Decl(ambientDeclarations.ts, 26, 18))
+>method : Symbol(cls.method, Decl(ambientDeclarations.ts, 26, 18))
 >cls : Symbol(cls, Decl(ambientDeclarations.ts, 22, 36))
 
     static static(p): number;
@@ -74,7 +74,7 @@ declare class cls {
 >q : Symbol(cls.q, Decl(ambientDeclarations.ts, 28, 29))
 
     private fn();
->fn : Symbol(fn, Decl(ambientDeclarations.ts, 29, 13))
+>fn : Symbol(cls.fn, Decl(ambientDeclarations.ts, 29, 13))
 
     private static fns();
 >fns : Symbol(cls.fns, Decl(ambientDeclarations.ts, 30, 17))
diff --git a/tests/baselines/reference/ambientDeclarationsExternal.errors.txt b/tests/baselines/reference/ambientDeclarationsExternal.errors.txt
deleted file mode 100644
index 2a9b1fe4879..00000000000
--- a/tests/baselines/reference/ambientDeclarationsExternal.errors.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-tests/cases/conformance/ambient/consumer.ts(2,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-
-
-==== tests/cases/conformance/ambient/consumer.ts (1 errors) ====
-    /// <reference path="decls.ts" />
-    import imp1 = require('equ');
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-    
-    
-    // Ambient external module members are always exported with or without export keyword when module lacks export assignment
-    import imp3 = require('equ2');
-    var n = imp3.x;
-    var n: number;
-    
-==== tests/cases/conformance/ambient/decls.ts (0 errors) ====
-    
-    // Ambient external module with export assignment
-    declare module 'equ' {
-        var x;
-        export = x;
-    }
-    
-    declare module 'equ2' {
-        var x: number;
-    }
-    
-    // Ambient external import declaration referencing ambient external module using top level module name
\ No newline at end of file
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/ambientDeclarationsExternal.symbols b/tests/baselines/reference/ambientDeclarationsExternal.symbols
new file mode 100644
index 00000000000..f160751a19b
--- /dev/null
+++ b/tests/baselines/reference/ambientDeclarationsExternal.symbols
@@ -0,0 +1,36 @@
+=== tests/cases/conformance/ambient/consumer.ts ===
+/// <reference path="decls.ts" />
+import imp1 = require('equ');
+>imp1 : Symbol(imp1, Decl(consumer.ts, 0, 0))
+
+
+// Ambient external module members are always exported with or without export keyword when module lacks export assignment
+import imp3 = require('equ2');
+>imp3 : Symbol(imp3, Decl(consumer.ts, 1, 29))
+
+var n = imp3.x;
+>n : Symbol(n, Decl(consumer.ts, 6, 3), Decl(consumer.ts, 7, 3))
+>imp3.x : Symbol(imp3.x, Decl(decls.ts, 8, 7))
+>imp3 : Symbol(imp3, Decl(consumer.ts, 1, 29))
+>x : Symbol(imp3.x, Decl(decls.ts, 8, 7))
+
+var n: number;
+>n : Symbol(n, Decl(consumer.ts, 6, 3), Decl(consumer.ts, 7, 3))
+
+=== tests/cases/conformance/ambient/decls.ts ===
+
+// Ambient external module with export assignment
+declare module 'equ' {
+    var x;
+>x : Symbol(x, Decl(decls.ts, 3, 7))
+
+    export = x;
+>x : Symbol(x, Decl(decls.ts, 3, 7))
+}
+
+declare module 'equ2' {
+    var x: number;
+>x : Symbol(x, Decl(decls.ts, 8, 7))
+}
+
+// Ambient external import declaration referencing ambient external module using top level module name
diff --git a/tests/baselines/reference/ambientDeclarationsExternal.types b/tests/baselines/reference/ambientDeclarationsExternal.types
new file mode 100644
index 00000000000..062e006cf0a
--- /dev/null
+++ b/tests/baselines/reference/ambientDeclarationsExternal.types
@@ -0,0 +1,36 @@
+=== tests/cases/conformance/ambient/consumer.ts ===
+/// <reference path="decls.ts" />
+import imp1 = require('equ');
+>imp1 : any
+
+
+// Ambient external module members are always exported with or without export keyword when module lacks export assignment
+import imp3 = require('equ2');
+>imp3 : typeof imp3
+
+var n = imp3.x;
+>n : number
+>imp3.x : number
+>imp3 : typeof imp3
+>x : number
+
+var n: number;
+>n : number
+
+=== tests/cases/conformance/ambient/decls.ts ===
+
+// Ambient external module with export assignment
+declare module 'equ' {
+    var x;
+>x : any
+
+    export = x;
+>x : any
+}
+
+declare module 'equ2' {
+    var x: number;
+>x : number
+}
+
+// Ambient external import declaration referencing ambient external module using top level module name
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/ambientExternalModuleWithInternalImportDeclaration.symbols b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.symbols
index 3af41f90957..d7e3b5925b1 100644
--- a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.symbols
+++ b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.symbols
@@ -19,7 +19,7 @@ declare module 'M' {
 >C : Symbol(C, Decl(ambientExternalModuleWithInternalImportDeclaration_0.ts, 0, 20), Decl(ambientExternalModuleWithInternalImportDeclaration_0.ts, 3, 5))
 
         foo(): void;
->foo : Symbol(foo, Decl(ambientExternalModuleWithInternalImportDeclaration_0.ts, 4, 13))
+>foo : Symbol(C.foo, Decl(ambientExternalModuleWithInternalImportDeclaration_0.ts, 4, 13))
     }
     import X = C;
 >X : Symbol(X, Decl(ambientExternalModuleWithInternalImportDeclaration_0.ts, 6, 5))
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/ambientExternalModuleWithoutInternalImportDeclaration.symbols b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.symbols
index baf15f22a4a..15ddf4ac488 100644
--- a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.symbols
+++ b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.symbols
@@ -19,7 +19,7 @@ declare module 'M' {
 >C : Symbol(C, Decl(ambientExternalModuleWithoutInternalImportDeclaration_0.ts, 0, 20), Decl(ambientExternalModuleWithoutInternalImportDeclaration_0.ts, 3, 5))
 
         foo(): void;
->foo : Symbol(foo, Decl(ambientExternalModuleWithoutInternalImportDeclaration_0.ts, 4, 13))
+>foo : Symbol(C.foo, Decl(ambientExternalModuleWithoutInternalImportDeclaration_0.ts, 4, 13))
     }
     export = C;
 >C : Symbol(C, Decl(ambientExternalModuleWithoutInternalImportDeclaration_0.ts, 0, 20), Decl(ambientExternalModuleWithoutInternalImportDeclaration_0.ts, 3, 5))
diff --git a/tests/baselines/reference/ambiguousCallsWhereReturnTypesAgree.symbols b/tests/baselines/reference/ambiguousCallsWhereReturnTypesAgree.symbols
index 5d6c34f4d68..9dcf5c515e2 100644
--- a/tests/baselines/reference/ambiguousCallsWhereReturnTypesAgree.symbols
+++ b/tests/baselines/reference/ambiguousCallsWhereReturnTypesAgree.symbols
@@ -3,35 +3,35 @@ class TestClass {
 >TestClass : Symbol(TestClass, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 0, 0))
 
     public bar(x: string): void;
->bar : Symbol(bar, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 0, 17), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 1, 32), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 2, 34))
+>bar : Symbol(TestClass.bar, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 0, 17), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 1, 32), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 2, 34))
 >x : Symbol(x, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 1, 15))
 
     public bar(x: string[]): void;
->bar : Symbol(bar, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 0, 17), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 1, 32), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 2, 34))
+>bar : Symbol(TestClass.bar, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 0, 17), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 1, 32), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 2, 34))
 >x : Symbol(x, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 2, 15))
 
     public bar(x: any): void {
->bar : Symbol(bar, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 0, 17), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 1, 32), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 2, 34))
+>bar : Symbol(TestClass.bar, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 0, 17), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 1, 32), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 2, 34))
 >x : Symbol(x, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 3, 15))
         
     }
  
     public foo(x: string): void;
->foo : Symbol(foo, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 5, 5), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 7, 32), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 8, 34))
+>foo : Symbol(TestClass.foo, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 5, 5), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 7, 32), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 8, 34))
 >x : Symbol(x, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 7, 15))
 
     public foo(x: string[]): void;
->foo : Symbol(foo, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 5, 5), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 7, 32), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 8, 34))
+>foo : Symbol(TestClass.foo, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 5, 5), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 7, 32), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 8, 34))
 >x : Symbol(x, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 8, 15))
 
     public foo(x: any): void {
->foo : Symbol(foo, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 5, 5), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 7, 32), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 8, 34))
+>foo : Symbol(TestClass.foo, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 5, 5), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 7, 32), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 8, 34))
 >x : Symbol(x, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 9, 15))
 
         this.bar(x); // should not error
->this.bar : Symbol(bar, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 0, 17), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 1, 32), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 2, 34))
+>this.bar : Symbol(TestClass.bar, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 0, 17), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 1, 32), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 2, 34))
 >this : Symbol(TestClass, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 0, 0))
->bar : Symbol(bar, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 0, 17), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 1, 32), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 2, 34))
+>bar : Symbol(TestClass.bar, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 0, 17), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 1, 32), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 2, 34))
 >x : Symbol(x, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 9, 15))
     }
 }
@@ -40,36 +40,36 @@ class TestClass2 {
 >TestClass2 : Symbol(TestClass2, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 12, 1))
 
     public bar(x: string): number;
->bar : Symbol(bar, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 14, 18), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 15, 34), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 16, 36))
+>bar : Symbol(TestClass2.bar, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 14, 18), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 15, 34), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 16, 36))
 >x : Symbol(x, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 15, 15))
 
     public bar(x: string[]): number;
->bar : Symbol(bar, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 14, 18), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 15, 34), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 16, 36))
+>bar : Symbol(TestClass2.bar, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 14, 18), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 15, 34), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 16, 36))
 >x : Symbol(x, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 16, 15))
 
     public bar(x: any): number {
->bar : Symbol(bar, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 14, 18), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 15, 34), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 16, 36))
+>bar : Symbol(TestClass2.bar, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 14, 18), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 15, 34), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 16, 36))
 >x : Symbol(x, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 17, 15))
 
         return 0;
     }
  
     public foo(x: string): number;
->foo : Symbol(foo, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 19, 5), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 21, 34), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 22, 36))
+>foo : Symbol(TestClass2.foo, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 19, 5), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 21, 34), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 22, 36))
 >x : Symbol(x, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 21, 15))
 
     public foo(x: string[]): number;
->foo : Symbol(foo, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 19, 5), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 21, 34), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 22, 36))
+>foo : Symbol(TestClass2.foo, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 19, 5), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 21, 34), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 22, 36))
 >x : Symbol(x, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 22, 15))
 
     public foo(x: any): number {
->foo : Symbol(foo, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 19, 5), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 21, 34), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 22, 36))
+>foo : Symbol(TestClass2.foo, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 19, 5), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 21, 34), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 22, 36))
 >x : Symbol(x, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 23, 15))
 
         return this.bar(x); // should not error
->this.bar : Symbol(bar, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 14, 18), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 15, 34), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 16, 36))
+>this.bar : Symbol(TestClass2.bar, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 14, 18), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 15, 34), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 16, 36))
 >this : Symbol(TestClass2, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 12, 1))
->bar : Symbol(bar, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 14, 18), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 15, 34), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 16, 36))
+>bar : Symbol(TestClass2.bar, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 14, 18), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 15, 34), Decl(ambiguousCallsWhereReturnTypesAgree.ts, 16, 36))
 >x : Symbol(x, Decl(ambiguousCallsWhereReturnTypesAgree.ts, 23, 15))
     }
 }
diff --git a/tests/baselines/reference/ambiguousOverloadResolution.symbols b/tests/baselines/reference/ambiguousOverloadResolution.symbols
index 1d848d707de..46711a1d142 100644
--- a/tests/baselines/reference/ambiguousOverloadResolution.symbols
+++ b/tests/baselines/reference/ambiguousOverloadResolution.symbols
@@ -5,7 +5,7 @@ class A { }
 class B extends A { x: number; }
 >B : Symbol(B, Decl(ambiguousOverloadResolution.ts, 0, 11))
 >A : Symbol(A, Decl(ambiguousOverloadResolution.ts, 0, 0))
->x : Symbol(x, Decl(ambiguousOverloadResolution.ts, 1, 19))
+>x : Symbol(B.x, Decl(ambiguousOverloadResolution.ts, 1, 19))
 
 declare function f(p: A, q: B): number;
 >f : Symbol(f, Decl(ambiguousOverloadResolution.ts, 1, 32), Decl(ambiguousOverloadResolution.ts, 3, 39))
diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
index 0739792fddd..b8e9f5346b0 100644
--- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
+++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
@@ -40,8 +40,8 @@ define(["require", "exports"], function (require, exports) {
         }
         return C1;
     }());
-    C1.s1 = true;
     exports.C1 = C1;
+    C1.s1 = true;
     (function (E1) {
         E1[E1["A"] = 0] = "A";
         E1[E1["B"] = 1] = "B";
diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.symbols b/tests/baselines/reference/amdImportNotAsPrimaryExpression.symbols
index 68a852c6165..ae67c0a3175 100644
--- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.symbols
+++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.symbols
@@ -43,7 +43,7 @@ export class C1 {
 >C1 : Symbol(C1, Decl(foo_0.ts, 0, 0))
 
 	m1 = 42;
->m1 : Symbol(m1, Decl(foo_0.ts, 0, 17))
+>m1 : Symbol(C1.m1, Decl(foo_0.ts, 0, 17))
 
 	static s1 = true;
 >s1 : Symbol(C1.s1, Decl(foo_0.ts, 1, 9))
@@ -53,10 +53,10 @@ export interface I1 {
 >I1 : Symbol(I1, Decl(foo_0.ts, 3, 1))
 
 	name: string;
->name : Symbol(name, Decl(foo_0.ts, 5, 21))
+>name : Symbol(I1.name, Decl(foo_0.ts, 5, 21))
 
 	age: number;
->age : Symbol(age, Decl(foo_0.ts, 6, 14))
+>age : Symbol(I1.age, Decl(foo_0.ts, 6, 14))
 }
 
 export module M1 {
@@ -66,7 +66,7 @@ export module M1 {
 >I2 : Symbol(I2, Decl(foo_0.ts, 10, 18))
 
 		foo: string;
->foo : Symbol(foo, Decl(foo_0.ts, 11, 22))
+>foo : Symbol(I2.foo, Decl(foo_0.ts, 11, 22))
 	}
 }
 
diff --git a/tests/baselines/reference/amdModuleName1.symbols b/tests/baselines/reference/amdModuleName1.symbols
index 04f471dc2ad..d6e44acf93a 100644
--- a/tests/baselines/reference/amdModuleName1.symbols
+++ b/tests/baselines/reference/amdModuleName1.symbols
@@ -4,13 +4,13 @@ class Foo {
 >Foo : Symbol(Foo, Decl(amdModuleName1.ts, 0, 0))
 
     x: number;
->x : Symbol(x, Decl(amdModuleName1.ts, 1, 11))
+>x : Symbol(Foo.x, Decl(amdModuleName1.ts, 1, 11))
 
     constructor() {
         this.x = 5;
->this.x : Symbol(x, Decl(amdModuleName1.ts, 1, 11))
+>this.x : Symbol(Foo.x, Decl(amdModuleName1.ts, 1, 11))
 >this : Symbol(Foo, Decl(amdModuleName1.ts, 0, 0))
->x : Symbol(x, Decl(amdModuleName1.ts, 1, 11))
+>x : Symbol(Foo.x, Decl(amdModuleName1.ts, 1, 11))
     }
 }
 export = Foo;
diff --git a/tests/baselines/reference/anonterface.symbols b/tests/baselines/reference/anonterface.symbols
index fccd48043cf..56d6b6a09b8 100644
--- a/tests/baselines/reference/anonterface.symbols
+++ b/tests/baselines/reference/anonterface.symbols
@@ -6,7 +6,7 @@ module M {
 >C : Symbol(C, Decl(anonterface.ts, 0, 10))
 
         m(fn:{ (n:number):string; },n2:number):string {
->m : Symbol(m, Decl(anonterface.ts, 1, 20))
+>m : Symbol(C.m, Decl(anonterface.ts, 1, 20))
 >fn : Symbol(fn, Decl(anonterface.ts, 2, 10))
 >n : Symbol(n, Decl(anonterface.ts, 2, 16))
 >n2 : Symbol(n2, Decl(anonterface.ts, 2, 36))
diff --git a/tests/baselines/reference/anonymousDefaultExportsSystem.js b/tests/baselines/reference/anonymousDefaultExportsSystem.js
index f9ff71dec06..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() {
-            class default_1 {
-            }
+        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/anyAssignabilityInInheritance.symbols b/tests/baselines/reference/anyAssignabilityInInheritance.symbols
index 50148d7df99..d1043256962 100644
--- a/tests/baselines/reference/anyAssignabilityInInheritance.symbols
+++ b/tests/baselines/reference/anyAssignabilityInInheritance.symbols
@@ -8,7 +8,7 @@ interface I {
 >x : Symbol(x, Decl(anyAssignabilityInInheritance.ts, 3, 5))
 
     foo: any; // ok, any identical to itself
->foo : Symbol(foo, Decl(anyAssignabilityInInheritance.ts, 3, 21))
+>foo : Symbol(I.foo, Decl(anyAssignabilityInInheritance.ts, 3, 21))
 }
 
 var a: any;
@@ -56,8 +56,8 @@ var r3 = foo3(a); // any
 declare function foo5(x: Date): Date;
 >foo5 : Symbol(foo5, Decl(anyAssignabilityInInheritance.ts, 19, 17), Decl(anyAssignabilityInInheritance.ts, 21, 37))
 >x : Symbol(x, Decl(anyAssignabilityInInheritance.ts, 21, 22))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 declare function foo5(x: any): any;
 >foo5 : Symbol(foo5, Decl(anyAssignabilityInInheritance.ts, 19, 17), Decl(anyAssignabilityInInheritance.ts, 21, 37))
@@ -113,7 +113,7 @@ var r3 = foo3(a); // any
 
 interface I8 { foo: string }
 >I8 : Symbol(I8, Decl(anyAssignabilityInInheritance.ts, 35, 17))
->foo : Symbol(foo, Decl(anyAssignabilityInInheritance.ts, 37, 14))
+>foo : Symbol(I8.foo, Decl(anyAssignabilityInInheritance.ts, 37, 14))
 
 declare function foo9(x: I8): I8;
 >foo9 : Symbol(foo9, Decl(anyAssignabilityInInheritance.ts, 37, 28), Decl(anyAssignabilityInInheritance.ts, 38, 33))
@@ -132,7 +132,7 @@ var r3 = foo3(a); // any
 
 class A { foo: number; }
 >A : Symbol(A, Decl(anyAssignabilityInInheritance.ts, 40, 17))
->foo : Symbol(foo, Decl(anyAssignabilityInInheritance.ts, 42, 9))
+>foo : Symbol(A.foo, Decl(anyAssignabilityInInheritance.ts, 42, 9))
 
 declare function foo10(x: A): A;
 >foo10 : Symbol(foo10, Decl(anyAssignabilityInInheritance.ts, 42, 24), Decl(anyAssignabilityInInheritance.ts, 43, 32))
@@ -152,7 +152,7 @@ var r3 = foo3(a); // any
 class A2<T> { foo: T; }
 >A2 : Symbol(A2, Decl(anyAssignabilityInInheritance.ts, 45, 17))
 >T : Symbol(T, Decl(anyAssignabilityInInheritance.ts, 47, 9))
->foo : Symbol(foo, Decl(anyAssignabilityInInheritance.ts, 47, 13))
+>foo : Symbol(A2.foo, Decl(anyAssignabilityInInheritance.ts, 47, 13))
 >T : Symbol(T, Decl(anyAssignabilityInInheritance.ts, 47, 9))
 
 declare function foo11(x: A2<string>): A2<string>;
@@ -251,7 +251,7 @@ var r3 = foo3(a); // any
 
 class CC { baz: string }
 >CC : Symbol(CC, Decl(anyAssignabilityInInheritance.ts, 71, 17), Decl(anyAssignabilityInInheritance.ts, 73, 24))
->baz : Symbol(baz, Decl(anyAssignabilityInInheritance.ts, 73, 10))
+>baz : Symbol(CC.baz, Decl(anyAssignabilityInInheritance.ts, 73, 10))
 
 module CC {
 >CC : Symbol(CC, Decl(anyAssignabilityInInheritance.ts, 71, 17), Decl(anyAssignabilityInInheritance.ts, 73, 24))
diff --git a/tests/baselines/reference/anyAssignableToEveryType.symbols b/tests/baselines/reference/anyAssignableToEveryType.symbols
index b1b2f87c050..4995a24a5c2 100644
--- a/tests/baselines/reference/anyAssignableToEveryType.symbols
+++ b/tests/baselines/reference/anyAssignableToEveryType.symbols
@@ -6,7 +6,7 @@ class C {
 >C : Symbol(C, Decl(anyAssignableToEveryType.ts, 0, 11))
 
     foo: string;
->foo : Symbol(foo, Decl(anyAssignableToEveryType.ts, 2, 9))
+>foo : Symbol(C.foo, Decl(anyAssignableToEveryType.ts, 2, 9))
 }
 var ac: C;
 >ac : Symbol(ac, Decl(anyAssignableToEveryType.ts, 5, 3))
@@ -16,7 +16,7 @@ interface I {
 >I : Symbol(I, Decl(anyAssignableToEveryType.ts, 5, 10))
 
     foo: string;
->foo : Symbol(foo, Decl(anyAssignableToEveryType.ts, 6, 13))
+>foo : Symbol(I.foo, Decl(anyAssignableToEveryType.ts, 6, 13))
 }
 var ai: I;
 >ai : Symbol(ai, Decl(anyAssignableToEveryType.ts, 9, 3))
@@ -44,7 +44,7 @@ var d: boolean = a;
 
 var e: Date = a;
 >e : Symbol(e, Decl(anyAssignableToEveryType.ts, 17, 3))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >a : Symbol(a, Decl(anyAssignableToEveryType.ts, 0, 3))
 
 var f: any = a;
@@ -109,12 +109,12 @@ var o: <T>(x: T) => T = a;
 
 var p: Number = a;
 >p : Symbol(p, Decl(anyAssignableToEveryType.ts, 31, 3))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >a : Symbol(a, Decl(anyAssignableToEveryType.ts, 0, 3))
 
 var q: String = a;
 >q : Symbol(q, Decl(anyAssignableToEveryType.ts, 32, 3))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >a : Symbol(a, Decl(anyAssignableToEveryType.ts, 0, 3))
 
 function foo<T, U /*extends T*/, V extends Date>(x: T, y: U, z: V) {
@@ -122,7 +122,7 @@ function foo<T, U /*extends T*/, V extends Date>(x: T, y: U, z: V) {
 >T : Symbol(T, Decl(anyAssignableToEveryType.ts, 34, 13))
 >U : Symbol(U, Decl(anyAssignableToEveryType.ts, 34, 15))
 >V : Symbol(V, Decl(anyAssignableToEveryType.ts, 34, 32))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(anyAssignableToEveryType.ts, 34, 49))
 >T : Symbol(T, Decl(anyAssignableToEveryType.ts, 34, 13))
 >y : Symbol(y, Decl(anyAssignableToEveryType.ts, 34, 54))
diff --git a/tests/baselines/reference/anyAssignableToEveryType2.symbols b/tests/baselines/reference/anyAssignableToEveryType2.symbols
index 9984a3f2fb8..12d380aa368 100644
--- a/tests/baselines/reference/anyAssignableToEveryType2.symbols
+++ b/tests/baselines/reference/anyAssignableToEveryType2.symbols
@@ -8,7 +8,7 @@ interface I {
 >x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 3, 5))
 
     foo: any; // ok, any identical to itself
->foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 3, 21))
+>foo : Symbol(I.foo, Decl(anyAssignableToEveryType2.ts, 3, 21))
 }
 
 
@@ -19,7 +19,7 @@ interface I2 {
 >x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 9, 5))
 
     foo: any;
->foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 9, 24))
+>foo : Symbol(I2.foo, Decl(anyAssignableToEveryType2.ts, 9, 24))
 }
 
 
@@ -30,7 +30,7 @@ interface I3 {
 >x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 15, 5))
 
     foo: any;
->foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 15, 24))
+>foo : Symbol(I3.foo, Decl(anyAssignableToEveryType2.ts, 15, 24))
 }
 
 
@@ -41,7 +41,7 @@ interface I4 {
 >x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 21, 5))
 
     foo: any;
->foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 21, 25))
+>foo : Symbol(I4.foo, Decl(anyAssignableToEveryType2.ts, 21, 25))
 }
 
 
@@ -50,10 +50,10 @@ interface I5 {
 
     [x: string]: Date;
 >x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 27, 5))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     foo: any;
->foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 27, 22))
+>foo : Symbol(I5.foo, Decl(anyAssignableToEveryType2.ts, 27, 22))
 }
 
 
@@ -65,7 +65,7 @@ interface I6 {
 >RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     foo: any;
->foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 33, 24))
+>foo : Symbol(I6.foo, Decl(anyAssignableToEveryType2.ts, 33, 24))
 }
 
 
@@ -77,7 +77,7 @@ interface I7 {
 >bar : Symbol(bar, Decl(anyAssignableToEveryType2.ts, 39, 18))
 
     foo: any;
->foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 39, 33))
+>foo : Symbol(I7.foo, Decl(anyAssignableToEveryType2.ts, 39, 33))
 }
 
 
@@ -88,7 +88,7 @@ interface I8 {
 >x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 45, 5))
 
     foo: any;
->foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 45, 26))
+>foo : Symbol(I8.foo, Decl(anyAssignableToEveryType2.ts, 45, 26))
 }
 
 
@@ -100,12 +100,12 @@ interface I9 {
 >I8 : Symbol(I8, Decl(anyAssignableToEveryType2.ts, 41, 1))
 
     foo: any;
->foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 51, 20))
+>foo : Symbol(I9.foo, Decl(anyAssignableToEveryType2.ts, 51, 20))
 }
 
 class A { foo: number; }
 >A : Symbol(A, Decl(anyAssignableToEveryType2.ts, 53, 1))
->foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 55, 9))
+>foo : Symbol(A.foo, Decl(anyAssignableToEveryType2.ts, 55, 9))
 
 interface I10 {
 >I10 : Symbol(I10, Decl(anyAssignableToEveryType2.ts, 55, 24))
@@ -115,13 +115,13 @@ interface I10 {
 >A : Symbol(A, Decl(anyAssignableToEveryType2.ts, 53, 1))
 
     foo: any;
->foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 57, 19))
+>foo : Symbol(I10.foo, Decl(anyAssignableToEveryType2.ts, 57, 19))
 }
 
 class A2<T> { foo: T; }
 >A2 : Symbol(A2, Decl(anyAssignableToEveryType2.ts, 59, 1))
 >T : Symbol(T, Decl(anyAssignableToEveryType2.ts, 61, 9))
->foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 61, 13))
+>foo : Symbol(A2.foo, Decl(anyAssignableToEveryType2.ts, 61, 13))
 >T : Symbol(T, Decl(anyAssignableToEveryType2.ts, 61, 9))
 
 interface I11 {
@@ -132,7 +132,7 @@ interface I11 {
 >A2 : Symbol(A2, Decl(anyAssignableToEveryType2.ts, 59, 1))
 
     foo: any;
->foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 63, 28))
+>foo : Symbol(I11.foo, Decl(anyAssignableToEveryType2.ts, 63, 28))
 }
 
 
@@ -144,7 +144,7 @@ interface I12 {
 >x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 69, 18))
 
     foo: any;
->foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 69, 31))
+>foo : Symbol(I12.foo, Decl(anyAssignableToEveryType2.ts, 69, 31))
 }
 
 
@@ -159,7 +159,7 @@ interface I13 {
 >T : Symbol(T, Decl(anyAssignableToEveryType2.ts, 75, 18))
 
     foo: any;
->foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 75, 32))
+>foo : Symbol(I13.foo, Decl(anyAssignableToEveryType2.ts, 75, 32))
 }
 
 
@@ -175,7 +175,7 @@ interface I14 {
 >E : Symbol(E, Decl(anyAssignableToEveryType2.ts, 77, 1))
 
     foo: any;
->foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 82, 19))
+>foo : Symbol(I14.foo, Decl(anyAssignableToEveryType2.ts, 82, 19))
 }
 
 
@@ -196,13 +196,13 @@ interface I15 {
 >f : Symbol(f, Decl(anyAssignableToEveryType2.ts, 84, 1), Decl(anyAssignableToEveryType2.ts, 87, 16))
 
     foo: any;
->foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 92, 26))
+>foo : Symbol(I15.foo, Decl(anyAssignableToEveryType2.ts, 92, 26))
 }
 
 
 class c { baz: string }
 >c : Symbol(c, Decl(anyAssignableToEveryType2.ts, 94, 1), Decl(anyAssignableToEveryType2.ts, 97, 23))
->baz : Symbol(baz, Decl(anyAssignableToEveryType2.ts, 97, 9))
+>baz : Symbol(c.baz, Decl(anyAssignableToEveryType2.ts, 97, 9))
 
 module c {
 >c : Symbol(c, Decl(anyAssignableToEveryType2.ts, 94, 1), Decl(anyAssignableToEveryType2.ts, 97, 23))
@@ -218,7 +218,7 @@ interface I16 {
 >c : Symbol(c, Decl(anyAssignableToEveryType2.ts, 94, 1), Decl(anyAssignableToEveryType2.ts, 97, 23))
 
     foo: any;
->foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 102, 26))
+>foo : Symbol(I16.foo, Decl(anyAssignableToEveryType2.ts, 102, 26))
 }
 
 
@@ -231,7 +231,7 @@ interface I17<T> {
 >T : Symbol(T, Decl(anyAssignableToEveryType2.ts, 107, 14))
 
     foo: any;
->foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 108, 19))
+>foo : Symbol(I17.foo, Decl(anyAssignableToEveryType2.ts, 108, 19))
 }
 
 
@@ -246,7 +246,7 @@ interface I18<T, U extends T> {
 >U : Symbol(U, Decl(anyAssignableToEveryType2.ts, 113, 16))
 
     foo: any;
->foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 114, 19))
+>foo : Symbol(I18.foo, Decl(anyAssignableToEveryType2.ts, 114, 19))
 }
 
 
@@ -258,7 +258,7 @@ interface I19 {
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     foo: any;
->foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 120, 24))
+>foo : Symbol(I19.foo, Decl(anyAssignableToEveryType2.ts, 120, 24))
 }
 
 
@@ -269,6 +269,6 @@ interface I20 {
 >x : Symbol(x, Decl(anyAssignableToEveryType2.ts, 126, 5))
 
     foo: any;
->foo : Symbol(foo, Decl(anyAssignableToEveryType2.ts, 126, 20))
+>foo : Symbol(I20.foo, Decl(anyAssignableToEveryType2.ts, 126, 20))
 }
 
diff --git a/tests/baselines/reference/anyIsAssignableToObject.symbols b/tests/baselines/reference/anyIsAssignableToObject.symbols
index a9650fa58b8..15478466d5b 100644
--- a/tests/baselines/reference/anyIsAssignableToObject.symbols
+++ b/tests/baselines/reference/anyIsAssignableToObject.symbols
@@ -3,7 +3,7 @@ interface P {
 >P : Symbol(P, Decl(anyIsAssignableToObject.ts, 0, 0))
 
     p: {};
->p : Symbol(p, Decl(anyIsAssignableToObject.ts, 0, 13))
+>p : Symbol(P.p, Decl(anyIsAssignableToObject.ts, 0, 13))
 }
 
 interface Q extends P { // Check assignability here. Any is assignable to {}
@@ -11,5 +11,5 @@ interface Q extends P { // Check assignability here. Any is assignable to {}
 >P : Symbol(P, Decl(anyIsAssignableToObject.ts, 0, 0))
 
     p: any;
->p : Symbol(p, Decl(anyIsAssignableToObject.ts, 4, 23))
+>p : Symbol(Q.p, Decl(anyIsAssignableToObject.ts, 4, 23))
 }
diff --git a/tests/baselines/reference/anyIsAssignableToVoid.symbols b/tests/baselines/reference/anyIsAssignableToVoid.symbols
index f5ee5ce7b23..50545c05d56 100644
--- a/tests/baselines/reference/anyIsAssignableToVoid.symbols
+++ b/tests/baselines/reference/anyIsAssignableToVoid.symbols
@@ -3,7 +3,7 @@ interface P {
 >P : Symbol(P, Decl(anyIsAssignableToVoid.ts, 0, 0))
 
     p: void;
->p : Symbol(p, Decl(anyIsAssignableToVoid.ts, 0, 13))
+>p : Symbol(P.p, Decl(anyIsAssignableToVoid.ts, 0, 13))
 }
 
 interface Q extends P { // check assignability here. any is assignable to void.
@@ -11,5 +11,5 @@ interface Q extends P { // check assignability here. any is assignable to void.
 >P : Symbol(P, Decl(anyIsAssignableToVoid.ts, 0, 0))
 
     p: any;
->p : Symbol(p, Decl(anyIsAssignableToVoid.ts, 4, 23))
+>p : Symbol(Q.p, Decl(anyIsAssignableToVoid.ts, 4, 23))
 }
diff --git a/tests/baselines/reference/argsInScope.symbols b/tests/baselines/reference/argsInScope.symbols
index 6faf88facd9..1c91e2bdd73 100644
--- a/tests/baselines/reference/argsInScope.symbols
+++ b/tests/baselines/reference/argsInScope.symbols
@@ -3,7 +3,7 @@ class C {
 >C : Symbol(C, Decl(argsInScope.ts, 0, 0))
 
     P(ii:number, j:number, k:number) {
->P : Symbol(P, Decl(argsInScope.ts, 0, 9))
+>P : Symbol(C.P, Decl(argsInScope.ts, 0, 9))
 >ii : Symbol(ii, Decl(argsInScope.ts, 1, 6))
 >j : Symbol(j, Decl(argsInScope.ts, 1, 16))
 >k : Symbol(k, Decl(argsInScope.ts, 1, 26))
diff --git a/tests/baselines/reference/argumentsObjectIterator01_ES6.symbols b/tests/baselines/reference/argumentsObjectIterator01_ES6.symbols
index d2d05cf3132..384b4458b2f 100644
--- a/tests/baselines/reference/argumentsObjectIterator01_ES6.symbols
+++ b/tests/baselines/reference/argumentsObjectIterator01_ES6.symbols
@@ -14,9 +14,9 @@ function doubleAndReturnAsArray(x: number, y: number, z: number): [number, numbe
 >arguments : Symbol(arguments)
 
         result.push(arg + arg);
->result.push : Symbol(Array.push, Decl(lib.d.ts, --, --))
+>result.push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --))
 >result : Symbol(result, Decl(argumentsObjectIterator01_ES6.ts, 2, 7))
->push : Symbol(Array.push, Decl(lib.d.ts, --, --))
+>push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --))
 >arg : Symbol(arg, Decl(argumentsObjectIterator01_ES6.ts, 3, 12))
 >arg : Symbol(arg, Decl(argumentsObjectIterator01_ES6.ts, 3, 12))
     }
diff --git a/tests/baselines/reference/argumentsObjectIterator02_ES6.symbols b/tests/baselines/reference/argumentsObjectIterator02_ES6.symbols
index 7a4e75de66b..1f4fa33067a 100644
--- a/tests/baselines/reference/argumentsObjectIterator02_ES6.symbols
+++ b/tests/baselines/reference/argumentsObjectIterator02_ES6.symbols
@@ -9,9 +9,9 @@ function doubleAndReturnAsArray(x: number, y: number, z: number): [number, numbe
     let blah = arguments[Symbol.iterator];
 >blah : Symbol(blah, Decl(argumentsObjectIterator02_ES6.ts, 2, 7))
 >arguments : Symbol(arguments)
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
     let result = [];
 >result : Symbol(result, Decl(argumentsObjectIterator02_ES6.ts, 4, 7))
@@ -21,9 +21,9 @@ function doubleAndReturnAsArray(x: number, y: number, z: number): [number, numbe
 >blah : Symbol(blah, Decl(argumentsObjectIterator02_ES6.ts, 2, 7))
 
         result.push(arg + arg);
->result.push : Symbol(Array.push, Decl(lib.d.ts, --, --))
+>result.push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --))
 >result : Symbol(result, Decl(argumentsObjectIterator02_ES6.ts, 4, 7))
->push : Symbol(Array.push, Decl(lib.d.ts, --, --))
+>push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --))
 >arg : Symbol(arg, Decl(argumentsObjectIterator02_ES6.ts, 5, 12))
 >arg : Symbol(arg, Decl(argumentsObjectIterator02_ES6.ts, 5, 12))
     }
diff --git a/tests/baselines/reference/arrayAssignmentTest6.symbols b/tests/baselines/reference/arrayAssignmentTest6.symbols
index c4d4ba76a5f..a224f260625 100644
--- a/tests/baselines/reference/arrayAssignmentTest6.symbols
+++ b/tests/baselines/reference/arrayAssignmentTest6.symbols
@@ -9,24 +9,24 @@ module Test {
 >IToken : Symbol(IToken, Decl(arrayAssignmentTest6.ts, 2, 5))
 
         startIndex: number;
->startIndex : Symbol(startIndex, Decl(arrayAssignmentTest6.ts, 3, 22))
+>startIndex : Symbol(IToken.startIndex, Decl(arrayAssignmentTest6.ts, 3, 22))
     }
     interface ILineTokens {
 >ILineTokens : Symbol(ILineTokens, Decl(arrayAssignmentTest6.ts, 5, 5))
 
         tokens: IToken[];
->tokens : Symbol(tokens, Decl(arrayAssignmentTest6.ts, 6, 27))
+>tokens : Symbol(ILineTokens.tokens, Decl(arrayAssignmentTest6.ts, 6, 27))
 >IToken : Symbol(IToken, Decl(arrayAssignmentTest6.ts, 2, 5))
 
         endState: IState;
->endState : Symbol(endState, Decl(arrayAssignmentTest6.ts, 7, 25))
+>endState : Symbol(ILineTokens.endState, Decl(arrayAssignmentTest6.ts, 7, 25))
 >IState : Symbol(IState, Decl(arrayAssignmentTest6.ts, 0, 13))
     }
     interface IMode {
 >IMode : Symbol(IMode, Decl(arrayAssignmentTest6.ts, 9, 5))
 
         tokenize(line:string, state:IState, includeStates:boolean):ILineTokens;
->tokenize : Symbol(tokenize, Decl(arrayAssignmentTest6.ts, 10, 21))
+>tokenize : Symbol(IMode.tokenize, Decl(arrayAssignmentTest6.ts, 10, 21))
 >line : Symbol(line, Decl(arrayAssignmentTest6.ts, 11, 17))
 >state : Symbol(state, Decl(arrayAssignmentTest6.ts, 11, 29))
 >IState : Symbol(IState, Decl(arrayAssignmentTest6.ts, 0, 13))
@@ -38,7 +38,7 @@ module Test {
 >IMode : Symbol(IMode, Decl(arrayAssignmentTest6.ts, 9, 5))
 
         public tokenize(line:string, tokens:IToken[], includeStates:boolean):ILineTokens {
->tokenize : Symbol(tokenize, Decl(arrayAssignmentTest6.ts, 13, 39))
+>tokenize : Symbol(Bug.tokenize, Decl(arrayAssignmentTest6.ts, 13, 39))
 >line : Symbol(line, Decl(arrayAssignmentTest6.ts, 14, 24))
 >tokens : Symbol(tokens, Decl(arrayAssignmentTest6.ts, 14, 36))
 >IToken : Symbol(IToken, Decl(arrayAssignmentTest6.ts, 2, 5))
diff --git a/tests/baselines/reference/arrayAugment.symbols b/tests/baselines/reference/arrayAugment.symbols
index 90a506077ad..5ba92ca07e1 100644
--- a/tests/baselines/reference/arrayAugment.symbols
+++ b/tests/baselines/reference/arrayAugment.symbols
@@ -4,7 +4,7 @@ interface Array<T> {
 >T : Symbol(T, Decl(lib.d.ts, --, --), Decl(arrayAugment.ts, 0, 16))
 
     split: (parts: number) => T[][];
->split : Symbol(split, Decl(arrayAugment.ts, 0, 20))
+>split : Symbol(Array.split, Decl(arrayAugment.ts, 0, 20))
 >parts : Symbol(parts, Decl(arrayAugment.ts, 1, 12))
 >T : Symbol(T, Decl(lib.d.ts, --, --), Decl(arrayAugment.ts, 0, 16))
 }
diff --git a/tests/baselines/reference/arrayBestCommonTypes.symbols b/tests/baselines/reference/arrayBestCommonTypes.symbols
index c4b42f66991..fc7d10261e8 100644
--- a/tests/baselines/reference/arrayBestCommonTypes.symbols
+++ b/tests/baselines/reference/arrayBestCommonTypes.symbols
@@ -22,98 +22,98 @@ module EmptyTypes {
 >f : Symbol(f, Decl(arrayBestCommonTypes.ts, 4, 34))
 
         public voidIfAny(x: boolean, y?: boolean): number;
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 >x : Symbol(x, Decl(arrayBestCommonTypes.ts, 8, 25))
 >y : Symbol(y, Decl(arrayBestCommonTypes.ts, 8, 36))
 
         public voidIfAny(x: string, y?: boolean): number;
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 >x : Symbol(x, Decl(arrayBestCommonTypes.ts, 9, 25))
 >y : Symbol(y, Decl(arrayBestCommonTypes.ts, 9, 35))
 
         public voidIfAny(x: number, y?: boolean): number;
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 >x : Symbol(x, Decl(arrayBestCommonTypes.ts, 10, 25))
 >y : Symbol(y, Decl(arrayBestCommonTypes.ts, 10, 35))
 
         public voidIfAny(x: any, y = false): any { return null; }
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 >x : Symbol(x, Decl(arrayBestCommonTypes.ts, 11, 25))
 >y : Symbol(y, Decl(arrayBestCommonTypes.ts, 11, 32))
 
         public x() {
->x : Symbol(x, Decl(arrayBestCommonTypes.ts, 11, 65))
+>x : Symbol(f.x, Decl(arrayBestCommonTypes.ts, 11, 65))
 
             <number>(this.voidIfAny([4, 2][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 4, 34))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 
             <number>(this.voidIfAny([4, 2, undefined][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 4, 34))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 >undefined : Symbol(undefined)
 
             <number>(this.voidIfAny([undefined, 2, 4][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 4, 34))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 >undefined : Symbol(undefined)
 
             <number>(this.voidIfAny([null, 2, 4][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 4, 34))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 
             <number>(this.voidIfAny([2, 4, null][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 4, 34))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 
             <number>(this.voidIfAny([undefined, 4, null][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 4, 34))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 >undefined : Symbol(undefined)
 
             <number>(this.voidIfAny(['', "q"][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 4, 34))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 
             <number>(this.voidIfAny(['', "q", undefined][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 4, 34))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 >undefined : Symbol(undefined)
 
             <number>(this.voidIfAny([undefined, "q", ''][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 4, 34))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 >undefined : Symbol(undefined)
 
             <number>(this.voidIfAny([null, "q", ''][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 4, 34))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 
             <number>(this.voidIfAny(["q", '', null][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 4, 34))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 
             <number>(this.voidIfAny([undefined, '', null][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 4, 34))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 >undefined : Symbol(undefined)
 
             <number>(this.voidIfAny([[3, 4], [null]][0][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 4, 34))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 7, 13), Decl(arrayBestCommonTypes.ts, 8, 58), Decl(arrayBestCommonTypes.ts, 9, 57), Decl(arrayBestCommonTypes.ts, 10, 57))
 
 
             var t1: { x: number; y: base; }[] = [{ x: 7, y: new derived() }, { x: 5, y: new base() }];
@@ -231,122 +231,122 @@ module NonEmptyTypes {
 
     interface iface { x: string; }
 >iface : Symbol(iface, Decl(arrayBestCommonTypes.ts, 53, 22))
->x : Symbol(x, Decl(arrayBestCommonTypes.ts, 54, 21))
+>x : Symbol(iface.x, Decl(arrayBestCommonTypes.ts, 54, 21))
 
     class base implements iface { x: string; y: string; }
 >base : Symbol(base, Decl(arrayBestCommonTypes.ts, 54, 34))
 >iface : Symbol(iface, Decl(arrayBestCommonTypes.ts, 53, 22))
->x : Symbol(x, Decl(arrayBestCommonTypes.ts, 55, 33))
->y : Symbol(y, Decl(arrayBestCommonTypes.ts, 55, 44))
+>x : Symbol(base.x, Decl(arrayBestCommonTypes.ts, 55, 33))
+>y : Symbol(base.y, Decl(arrayBestCommonTypes.ts, 55, 44))
 
     class base2 implements iface { x: string; z: string; }
 >base2 : Symbol(base2, Decl(arrayBestCommonTypes.ts, 55, 57))
 >iface : Symbol(iface, Decl(arrayBestCommonTypes.ts, 53, 22))
->x : Symbol(x, Decl(arrayBestCommonTypes.ts, 56, 34))
->z : Symbol(z, Decl(arrayBestCommonTypes.ts, 56, 45))
+>x : Symbol(base2.x, Decl(arrayBestCommonTypes.ts, 56, 34))
+>z : Symbol(base2.z, Decl(arrayBestCommonTypes.ts, 56, 45))
 
     class derived extends base { a: string; }
 >derived : Symbol(derived, Decl(arrayBestCommonTypes.ts, 56, 58))
 >base : Symbol(base, Decl(arrayBestCommonTypes.ts, 54, 34))
->a : Symbol(a, Decl(arrayBestCommonTypes.ts, 57, 32))
+>a : Symbol(derived.a, Decl(arrayBestCommonTypes.ts, 57, 32))
 
 
     class f {
 >f : Symbol(f, Decl(arrayBestCommonTypes.ts, 57, 45))
 
         public voidIfAny(x: boolean, y?: boolean): number;
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 >x : Symbol(x, Decl(arrayBestCommonTypes.ts, 61, 25))
 >y : Symbol(y, Decl(arrayBestCommonTypes.ts, 61, 36))
 
         public voidIfAny(x: string, y?: boolean): number;
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 >x : Symbol(x, Decl(arrayBestCommonTypes.ts, 62, 25))
 >y : Symbol(y, Decl(arrayBestCommonTypes.ts, 62, 35))
 
         public voidIfAny(x: number, y?: boolean): number;
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 >x : Symbol(x, Decl(arrayBestCommonTypes.ts, 63, 25))
 >y : Symbol(y, Decl(arrayBestCommonTypes.ts, 63, 35))
 
         public voidIfAny(x: any, y = false): any { return null; }
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 >x : Symbol(x, Decl(arrayBestCommonTypes.ts, 64, 25))
 >y : Symbol(y, Decl(arrayBestCommonTypes.ts, 64, 32))
 
         public x() {
->x : Symbol(x, Decl(arrayBestCommonTypes.ts, 64, 65))
+>x : Symbol(f.x, Decl(arrayBestCommonTypes.ts, 64, 65))
 
             <number>(this.voidIfAny([4, 2][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 57, 45))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 
             <number>(this.voidIfAny([4, 2, undefined][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 57, 45))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 >undefined : Symbol(undefined)
 
             <number>(this.voidIfAny([undefined, 2, 4][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 57, 45))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 >undefined : Symbol(undefined)
 
             <number>(this.voidIfAny([null, 2, 4][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 57, 45))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 
             <number>(this.voidIfAny([2, 4, null][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 57, 45))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 
             <number>(this.voidIfAny([undefined, 4, null][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 57, 45))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 >undefined : Symbol(undefined)
 
             <number>(this.voidIfAny(['', "q"][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 57, 45))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 
             <number>(this.voidIfAny(['', "q", undefined][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 57, 45))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 >undefined : Symbol(undefined)
 
             <number>(this.voidIfAny([undefined, "q", ''][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 57, 45))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 >undefined : Symbol(undefined)
 
             <number>(this.voidIfAny([null, "q", ''][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 57, 45))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 
             <number>(this.voidIfAny(["q", '', null][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 57, 45))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 
             <number>(this.voidIfAny([undefined, '', null][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 57, 45))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 >undefined : Symbol(undefined)
 
             <number>(this.voidIfAny([[3, 4], [null]][0][0]));
->this.voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>this.voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 >this : Symbol(f, Decl(arrayBestCommonTypes.ts, 57, 45))
->voidIfAny : Symbol(voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
+>voidIfAny : Symbol(f.voidIfAny, Decl(arrayBestCommonTypes.ts, 60, 13), Decl(arrayBestCommonTypes.ts, 61, 58), Decl(arrayBestCommonTypes.ts, 62, 57), Decl(arrayBestCommonTypes.ts, 63, 57))
 
 
             var t1: { x: number; y: base; }[] = [{ x: 7, y: new derived() }, { x: 5, y: new base() }];
diff --git a/tests/baselines/reference/arrayBindingPatternOmittedExpressions.types b/tests/baselines/reference/arrayBindingPatternOmittedExpressions.types
index e83aa6a17de..77db8cc250d 100644
--- a/tests/baselines/reference/arrayBindingPatternOmittedExpressions.types
+++ b/tests/baselines/reference/arrayBindingPatternOmittedExpressions.types
@@ -25,7 +25,7 @@ var results: string[];
 
 
 function f([, a, , b, , , , s, , , ] = results) {
->f : ([, a, , b, , , , s, , , ]?: string[]) => void
+>f : ([, a, , b, , , , s, , ,]?: string[]) => void
 > : undefined
 >a : string
 > : undefined
diff --git a/tests/baselines/reference/arrayBufferIsViewNarrowsType.types b/tests/baselines/reference/arrayBufferIsViewNarrowsType.types
index b9d4f3db81b..129b7d601d8 100644
--- a/tests/baselines/reference/arrayBufferIsViewNarrowsType.types
+++ b/tests/baselines/reference/arrayBufferIsViewNarrowsType.types
@@ -4,7 +4,7 @@ var obj: Object;
 >Object : Object
 
 if (ArrayBuffer.isView(obj)) {
->ArrayBuffer.isView(obj) : arg is ArrayBufferView
+>ArrayBuffer.isView(obj) : boolean
 >ArrayBuffer.isView : (arg: any) => arg is ArrayBufferView
 >ArrayBuffer : ArrayBufferConstructor
 >isView : (arg: any) => arg is ArrayBufferView
diff --git a/tests/baselines/reference/arrayCast.errors.txt b/tests/baselines/reference/arrayCast.errors.txt
index 815813ea727..61463e5557b 100644
--- a/tests/baselines/reference/arrayCast.errors.txt
+++ b/tests/baselines/reference/arrayCast.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/compiler/arrayCast.ts(3,23): error TS2352: Neither type '{ foo: string; }[]' nor type '{ id: number; }[]' is assignable to the other.
-  Type '{ foo: string; }' is not assignable to type '{ id: number; }'.
+tests/cases/compiler/arrayCast.ts(3,23): error TS2352: Type '{ foo: string; }[]' cannot be converted to type '{ id: number; }[]'.
+  Type '{ foo: string; }' is not comparable to type '{ id: number; }'.
     Object literal may only specify known properties, and 'foo' does not exist in type '{ id: number; }'.
 
 
@@ -8,8 +8,8 @@ tests/cases/compiler/arrayCast.ts(3,23): error TS2352: Neither type '{ foo: stri
     // has type { foo: string }[], which is not assignable to { id: number }[].
     <{ id: number; }[]>[{ foo: "s" }];
                           ~~~~~~~~
-!!! error TS2352: Neither type '{ foo: string; }[]' nor type '{ id: number; }[]' is assignable to the other.
-!!! error TS2352:   Type '{ foo: string; }' is not assignable to type '{ id: number; }'.
+!!! error TS2352: Type '{ foo: string; }[]' cannot be converted to type '{ id: number; }[]'.
+!!! error TS2352:   Type '{ foo: string; }' is not comparable to type '{ id: number; }'.
 !!! error TS2352:     Object literal may only specify known properties, and 'foo' does not exist in type '{ id: number; }'.
     
     // Should succeed, as the {} element causes the type of the array to be {}[]
diff --git a/tests/baselines/reference/arrayConcat2.symbols b/tests/baselines/reference/arrayConcat2.symbols
index daedee6e9c8..fb84193c113 100644
--- a/tests/baselines/reference/arrayConcat2.symbols
+++ b/tests/baselines/reference/arrayConcat2.symbols
@@ -3,21 +3,21 @@ var a: string[] = [];
 >a : Symbol(a, Decl(arrayConcat2.ts, 0, 3))
 
 a.concat("hello", 'world');
->a.concat : Symbol(Array.concat, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>a.concat : Symbol(Array.concat, Decl(lib.d.ts, --, --))
 >a : Symbol(a, Decl(arrayConcat2.ts, 0, 3))
->concat : Symbol(Array.concat, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>concat : Symbol(Array.concat, Decl(lib.d.ts, --, --))
 
 a.concat('Hello');
->a.concat : Symbol(Array.concat, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>a.concat : Symbol(Array.concat, Decl(lib.d.ts, --, --))
 >a : Symbol(a, Decl(arrayConcat2.ts, 0, 3))
->concat : Symbol(Array.concat, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>concat : Symbol(Array.concat, Decl(lib.d.ts, --, --))
 
 var b = new Array<string>();
 >b : Symbol(b, Decl(arrayConcat2.ts, 5, 3))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 b.concat('hello');
->b.concat : Symbol(Array.concat, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>b.concat : Symbol(Array.concat, Decl(lib.d.ts, --, --))
 >b : Symbol(b, Decl(arrayConcat2.ts, 5, 3))
->concat : Symbol(Array.concat, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>concat : Symbol(Array.concat, Decl(lib.d.ts, --, --))
 
diff --git a/tests/baselines/reference/arrayConcat2.types b/tests/baselines/reference/arrayConcat2.types
index a49046c871f..b7df3749116 100644
--- a/tests/baselines/reference/arrayConcat2.types
+++ b/tests/baselines/reference/arrayConcat2.types
@@ -5,17 +5,17 @@ var a: string[] = [];
 
 a.concat("hello", 'world');
 >a.concat("hello", 'world') : string[]
->a.concat : { <U extends string[]>(...items: U[]): string[]; (...items: string[]): string[]; }
+>a.concat : (...items: (string | string[])[]) => string[]
 >a : string[]
->concat : { <U extends string[]>(...items: U[]): string[]; (...items: string[]): string[]; }
+>concat : (...items: (string | string[])[]) => string[]
 >"hello" : string
 >'world' : string
 
 a.concat('Hello');
 >a.concat('Hello') : string[]
->a.concat : { <U extends string[]>(...items: U[]): string[]; (...items: string[]): string[]; }
+>a.concat : (...items: (string | string[])[]) => string[]
 >a : string[]
->concat : { <U extends string[]>(...items: U[]): string[]; (...items: string[]): string[]; }
+>concat : (...items: (string | string[])[]) => string[]
 >'Hello' : string
 
 var b = new Array<string>();
@@ -25,8 +25,8 @@ var b = new Array<string>();
 
 b.concat('hello');
 >b.concat('hello') : string[]
->b.concat : { <U extends string[]>(...items: U[]): string[]; (...items: string[]): string[]; }
+>b.concat : (...items: (string | string[])[]) => string[]
 >b : string[]
->concat : { <U extends string[]>(...items: U[]): string[]; (...items: string[]): string[]; }
+>concat : (...items: (string | string[])[]) => string[]
 >'hello' : string
 
diff --git a/tests/baselines/reference/arrayConcatMap.symbols b/tests/baselines/reference/arrayConcatMap.symbols
index 5ef9d811723..bde2686e259 100644
--- a/tests/baselines/reference/arrayConcatMap.symbols
+++ b/tests/baselines/reference/arrayConcatMap.symbols
@@ -2,8 +2,8 @@
 var x = [].concat([{ a: 1 }], [{ a: 2 }])
 >x : Symbol(x, Decl(arrayConcatMap.ts, 0, 3))
 >[].concat([{ a: 1 }], [{ a: 2 }])          .map : Symbol(Array.map, Decl(lib.d.ts, --, --))
->[].concat : Symbol(Array.concat, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->concat : Symbol(Array.concat, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>[].concat : Symbol(Array.concat, Decl(lib.d.ts, --, --))
+>concat : Symbol(Array.concat, Decl(lib.d.ts, --, --))
 >a : Symbol(a, Decl(arrayConcatMap.ts, 0, 20))
 >a : Symbol(a, Decl(arrayConcatMap.ts, 0, 32))
 
diff --git a/tests/baselines/reference/arrayConcatMap.types b/tests/baselines/reference/arrayConcatMap.types
index 11342ee848a..38e1a1c49c9 100644
--- a/tests/baselines/reference/arrayConcatMap.types
+++ b/tests/baselines/reference/arrayConcatMap.types
@@ -4,9 +4,9 @@ var x = [].concat([{ a: 1 }], [{ a: 2 }])
 >[].concat([{ a: 1 }], [{ a: 2 }])          .map(b => b.a) : any[]
 >[].concat([{ a: 1 }], [{ a: 2 }])          .map : <U>(callbackfn: (value: any, index: number, array: any[]) => U, thisArg?: any) => U[]
 >[].concat([{ a: 1 }], [{ a: 2 }]) : any[]
->[].concat : { <U extends any[]>(...items: U[]): any[]; (...items: any[]): any[]; }
+>[].concat : (...items: any[]) => any[]
 >[] : undefined[]
->concat : { <U extends any[]>(...items: U[]): any[]; (...items: any[]): any[]; }
+>concat : (...items: any[]) => any[]
 >[{ a: 1 }] : { a: number; }[]
 >{ a: 1 } : { a: number; }
 >a : number
diff --git a/tests/baselines/reference/arrayLiteralContextualType.symbols b/tests/baselines/reference/arrayLiteralContextualType.symbols
index 500c1d522f6..2049ec342ec 100644
--- a/tests/baselines/reference/arrayLiteralContextualType.symbols
+++ b/tests/baselines/reference/arrayLiteralContextualType.symbols
@@ -3,27 +3,27 @@ interface IAnimal {
 >IAnimal : Symbol(IAnimal, Decl(arrayLiteralContextualType.ts, 0, 0))
 
     name: string;
->name : Symbol(name, Decl(arrayLiteralContextualType.ts, 0, 19))
+>name : Symbol(IAnimal.name, Decl(arrayLiteralContextualType.ts, 0, 19))
 }
 
 class Giraffe {
 >Giraffe : Symbol(Giraffe, Decl(arrayLiteralContextualType.ts, 2, 1))
 
     name = "Giraffe";
->name : Symbol(name, Decl(arrayLiteralContextualType.ts, 4, 15))
+>name : Symbol(Giraffe.name, Decl(arrayLiteralContextualType.ts, 4, 15))
 
     neckLength = "3m";
->neckLength : Symbol(neckLength, Decl(arrayLiteralContextualType.ts, 5, 21))
+>neckLength : Symbol(Giraffe.neckLength, Decl(arrayLiteralContextualType.ts, 5, 21))
 }
 
 class Elephant {
 >Elephant : Symbol(Elephant, Decl(arrayLiteralContextualType.ts, 7, 1))
 
     name = "Elephant";
->name : Symbol(name, Decl(arrayLiteralContextualType.ts, 9, 16))
+>name : Symbol(Elephant.name, Decl(arrayLiteralContextualType.ts, 9, 16))
 
     trunkDiameter = "20cm";
->trunkDiameter : Symbol(trunkDiameter, Decl(arrayLiteralContextualType.ts, 10, 22))
+>trunkDiameter : Symbol(Elephant.trunkDiameter, Decl(arrayLiteralContextualType.ts, 10, 22))
 }
 
 function foo(animals: IAnimal[]) { }
diff --git a/tests/baselines/reference/arrayLiteralWidened.types b/tests/baselines/reference/arrayLiteralWidened.types
index 9599db2dff5..83db7046eed 100644
--- a/tests/baselines/reference/arrayLiteralWidened.types
+++ b/tests/baselines/reference/arrayLiteralWidened.types
@@ -19,7 +19,7 @@ var a = [undefined, undefined];
 
 var b = [[], [null, null]]; // any[][]
 >b : any[][]
->[[], [null, null]] : null[][]
+>[[], [null, null]] : undefined[][]
 >[] : undefined[]
 >[null, null] : null[]
 >null : null
diff --git a/tests/baselines/reference/arrayLiterals2ES5.symbols b/tests/baselines/reference/arrayLiterals2ES5.symbols
index 4db8372a601..eea3c78bfc0 100644
--- a/tests/baselines/reference/arrayLiterals2ES5.symbols
+++ b/tests/baselines/reference/arrayLiterals2ES5.symbols
@@ -81,13 +81,13 @@ var temp4 = [];
 interface myArray extends Array<Number> { }
 >myArray : Symbol(myArray, Decl(arrayLiterals2ES5.ts, 42, 15))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 interface myArray2 extends Array<Number|String> { }
 >myArray2 : Symbol(myArray2, Decl(arrayLiterals2ES5.ts, 44, 43))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var d0 = [1, true, ...temp,];  // has type (string|number|boolean)[]
 >d0 : Symbol(d0, Decl(arrayLiterals2ES5.ts, 46, 3))
diff --git a/tests/baselines/reference/arrayLiterals2ES6.symbols b/tests/baselines/reference/arrayLiterals2ES6.symbols
index 0c7dc1495df..407471f76be 100644
--- a/tests/baselines/reference/arrayLiterals2ES6.symbols
+++ b/tests/baselines/reference/arrayLiterals2ES6.symbols
@@ -72,14 +72,14 @@ var temp2: [number[], string[]] = [[1, 2, 3], ["hello", "string"]];
 
 interface myArray extends Array<Number> { }
 >myArray : Symbol(myArray, Decl(arrayLiterals2ES6.ts, 40, 67))
->Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 interface myArray2 extends Array<Number|String> { }
 >myArray2 : Symbol(myArray2, Decl(arrayLiterals2ES6.ts, 42, 43))
->Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>String : Symbol(String, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 
 var d0 = [1, true, ...temp, ];  // has type (string|number|boolean)[]
 >d0 : Symbol(d0, Decl(arrayLiterals2ES6.ts, 44, 3))
diff --git a/tests/baselines/reference/arrayLiterals3.errors.txt b/tests/baselines/reference/arrayLiterals3.errors.txt
index 5409075a55c..f205e90eced 100644
--- a/tests/baselines/reference/arrayLiterals3.errors.txt
+++ b/tests/baselines/reference/arrayLiterals3.errors.txt
@@ -16,8 +16,8 @@ tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(34,5): error
   Types of property 'push' are incompatible.
     Type '(...items: (number | string)[]) => number' is not assignable to type '(...items: Number[]) => number'.
       Types of parameters 'items' and 'items' are incompatible.
-        Type 'number | string' is not assignable to type 'Number'.
-          Type 'string' is not assignable to type 'Number'.
+        Type 'Number' is not assignable to type 'number | string'.
+          Type 'Number' is not assignable to type 'string'.
 
 
 ==== tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts (6 errors) ====
@@ -79,6 +79,6 @@ tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(34,5): error
 !!! error TS2322:   Types of property 'push' are incompatible.
 !!! error TS2322:     Type '(...items: (number | string)[]) => number' is not assignable to type '(...items: Number[]) => number'.
 !!! error TS2322:       Types of parameters 'items' and 'items' are incompatible.
-!!! error TS2322:         Type 'number | string' is not assignable to type 'Number'.
-!!! error TS2322:           Type 'string' is not assignable to type 'Number'.
+!!! error TS2322:         Type 'Number' is not assignable to type 'number | string'.
+!!! error TS2322:           Type 'Number' is not assignable to type 'string'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.symbols b/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.symbols
index cd597dc2b4e..0b3630cac28 100644
--- a/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.symbols
+++ b/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.symbols
@@ -4,11 +4,11 @@ class List<T> {
 >T : Symbol(T, Decl(arrayLiteralsWithRecursiveGenerics.ts, 0, 11))
 
     data: T;
->data : Symbol(data, Decl(arrayLiteralsWithRecursiveGenerics.ts, 0, 15))
+>data : Symbol(List.data, Decl(arrayLiteralsWithRecursiveGenerics.ts, 0, 15))
 >T : Symbol(T, Decl(arrayLiteralsWithRecursiveGenerics.ts, 0, 11))
 
     next: List<List<T>>;
->next : Symbol(next, Decl(arrayLiteralsWithRecursiveGenerics.ts, 1, 12))
+>next : Symbol(List.next, Decl(arrayLiteralsWithRecursiveGenerics.ts, 1, 12))
 >List : Symbol(List, Decl(arrayLiteralsWithRecursiveGenerics.ts, 0, 0))
 >List : Symbol(List, Decl(arrayLiteralsWithRecursiveGenerics.ts, 0, 0))
 >T : Symbol(T, Decl(arrayLiteralsWithRecursiveGenerics.ts, 0, 11))
@@ -21,7 +21,7 @@ class DerivedList<U> extends List<U> {
 >U : Symbol(U, Decl(arrayLiteralsWithRecursiveGenerics.ts, 5, 18))
 
     foo: U;
->foo : Symbol(foo, Decl(arrayLiteralsWithRecursiveGenerics.ts, 5, 38))
+>foo : Symbol(DerivedList.foo, Decl(arrayLiteralsWithRecursiveGenerics.ts, 5, 38))
 >U : Symbol(U, Decl(arrayLiteralsWithRecursiveGenerics.ts, 5, 18))
 
     // next: List<List<U>>
@@ -32,11 +32,11 @@ class MyList<T> {
 >T : Symbol(T, Decl(arrayLiteralsWithRecursiveGenerics.ts, 10, 13))
 
     data: T;
->data : Symbol(data, Decl(arrayLiteralsWithRecursiveGenerics.ts, 10, 17))
+>data : Symbol(MyList.data, Decl(arrayLiteralsWithRecursiveGenerics.ts, 10, 17))
 >T : Symbol(T, Decl(arrayLiteralsWithRecursiveGenerics.ts, 10, 13))
 
     next: MyList<MyList<T>>;
->next : Symbol(next, Decl(arrayLiteralsWithRecursiveGenerics.ts, 11, 12))
+>next : Symbol(MyList.next, Decl(arrayLiteralsWithRecursiveGenerics.ts, 11, 12))
 >MyList : Symbol(MyList, Decl(arrayLiteralsWithRecursiveGenerics.ts, 8, 1))
 >MyList : Symbol(MyList, Decl(arrayLiteralsWithRecursiveGenerics.ts, 8, 1))
 >T : Symbol(T, Decl(arrayLiteralsWithRecursiveGenerics.ts, 10, 13))
diff --git a/tests/baselines/reference/arrayOfExportedClass.symbols b/tests/baselines/reference/arrayOfExportedClass.symbols
index bdcaf98eb0d..acdcbfa398b 100644
--- a/tests/baselines/reference/arrayOfExportedClass.symbols
+++ b/tests/baselines/reference/arrayOfExportedClass.symbols
@@ -7,18 +7,18 @@ class Road {
 >Road : Symbol(Road, Decl(arrayOfExportedClass_1.ts, 1, 49))
 
     public cars: Car[];
->cars : Symbol(cars, Decl(arrayOfExportedClass_1.ts, 3, 12))
+>cars : Symbol(Road.cars, Decl(arrayOfExportedClass_1.ts, 3, 12))
 >Car : Symbol(Car, Decl(arrayOfExportedClass_1.ts, 0, 0))
 
     public AddCars(cars: Car[]) {
->AddCars : Symbol(AddCars, Decl(arrayOfExportedClass_1.ts, 5, 23))
+>AddCars : Symbol(Road.AddCars, Decl(arrayOfExportedClass_1.ts, 5, 23))
 >cars : Symbol(cars, Decl(arrayOfExportedClass_1.ts, 7, 19))
 >Car : Symbol(Car, Decl(arrayOfExportedClass_1.ts, 0, 0))
 
         this.cars = cars;
->this.cars : Symbol(cars, Decl(arrayOfExportedClass_1.ts, 3, 12))
+>this.cars : Symbol(Road.cars, Decl(arrayOfExportedClass_1.ts, 3, 12))
 >this : Symbol(Road, Decl(arrayOfExportedClass_1.ts, 1, 49))
->cars : Symbol(cars, Decl(arrayOfExportedClass_1.ts, 3, 12))
+>cars : Symbol(Road.cars, Decl(arrayOfExportedClass_1.ts, 3, 12))
 >cars : Symbol(cars, Decl(arrayOfExportedClass_1.ts, 7, 19))
     }
 }
@@ -31,7 +31,7 @@ class Car {
 >Car : Symbol(Car, Decl(arrayOfExportedClass_0.ts, 0, 0))
 
     foo: string;
->foo : Symbol(foo, Decl(arrayOfExportedClass_0.ts, 0, 11))
+>foo : Symbol(Car.foo, Decl(arrayOfExportedClass_0.ts, 0, 11))
 }
 
 export = Car;
diff --git a/tests/baselines/reference/arrayOfFunctionTypes3.symbols b/tests/baselines/reference/arrayOfFunctionTypes3.symbols
index d26effeb5b7..9ff5a252d34 100644
--- a/tests/baselines/reference/arrayOfFunctionTypes3.symbols
+++ b/tests/baselines/reference/arrayOfFunctionTypes3.symbols
@@ -12,7 +12,7 @@ class C {
 >C : Symbol(C, Decl(arrayOfFunctionTypes3.ts, 3, 16))
 
     foo: string;
->foo : Symbol(foo, Decl(arrayOfFunctionTypes3.ts, 5, 9))
+>foo : Symbol(C.foo, Decl(arrayOfFunctionTypes3.ts, 5, 9))
 }
 var y = [C, C];
 >y : Symbol(y, Decl(arrayOfFunctionTypes3.ts, 8, 3))
diff --git a/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.symbols b/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.symbols
index d9665e98eb5..018f9ce35c9 100644
--- a/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.symbols
+++ b/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.symbols
@@ -7,7 +7,7 @@ declare module WinJS {
 >T : Symbol(T, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 1, 18))
 
         then<U>(success?: (value: T) => Promise<U>, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>;
->then : Symbol(then, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 1, 22))
+>then : Symbol(Promise.then, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 1, 22))
 >U : Symbol(U, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 2, 13))
 >success : Symbol(success, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 2, 16))
 >value : Symbol(value, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 2, 27))
@@ -32,29 +32,29 @@ declare module Data {
 >T : Symbol(T, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 6, 31))
 
         itemIndex: number;
->itemIndex : Symbol(itemIndex, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 6, 35))
+>itemIndex : Symbol(IListItem.itemIndex, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 6, 35))
 
         key: any;
->key : Symbol(key, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 7, 26))
+>key : Symbol(IListItem.key, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 7, 26))
 
         data: T;
->data : Symbol(data, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 8, 17))
+>data : Symbol(IListItem.data, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 8, 17))
 >T : Symbol(T, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 6, 31))
 
         group: any;
->group : Symbol(group, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 9, 16))
+>group : Symbol(IListItem.group, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 9, 16))
 
         isHeader: boolean;
->isHeader : Symbol(isHeader, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 10, 19))
+>isHeader : Symbol(IListItem.isHeader, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 10, 19))
 
         cached: boolean;
->cached : Symbol(cached, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 11, 26))
+>cached : Symbol(IListItem.cached, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 11, 26))
 
         isNonSourceData: boolean;
->isNonSourceData : Symbol(isNonSourceData, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 12, 24))
+>isNonSourceData : Symbol(IListItem.isNonSourceData, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 12, 24))
 
         preventAugmentation: boolean;
->preventAugmentation : Symbol(preventAugmentation, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 13, 33))
+>preventAugmentation : Symbol(IListItem.preventAugmentation, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 13, 33))
     }
     export interface IVirtualList<T> {
 >IVirtualList : Symbol(IVirtualList, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 15, 5))
@@ -62,7 +62,7 @@ declare module Data {
 
         //removeIndices: WinJS.Promise<IListItem<T>[]>;
         removeIndices(indices: number[], options?: any): WinJS.Promise<IListItem<T>[]>;
->removeIndices : Symbol(removeIndices, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 16, 38))
+>removeIndices : Symbol(IVirtualList.removeIndices, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 16, 38))
 >indices : Symbol(indices, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 18, 22))
 >options : Symbol(options, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 18, 40))
 >WinJS : Symbol(WinJS, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 0, 0))
@@ -78,7 +78,7 @@ declare module Data {
 
         //removeIndices: WinJS.Promise<IListItem<T>[]>;
         public removeIndices(indices: number[], options?: any): WinJS.Promise<IListItem<T>[]>;
->removeIndices : Symbol(removeIndices, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 20, 60))
+>removeIndices : Symbol(VirtualList.removeIndices, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 20, 60))
 >indices : Symbol(indices, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 22, 29))
 >options : Symbol(options, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 22, 47))
 >WinJS : Symbol(WinJS, Decl(arrayTypeInSignatureOfInterfaceAndClass.ts, 0, 0))
diff --git a/tests/baselines/reference/arrayconcat.symbols b/tests/baselines/reference/arrayconcat.symbols
index 4fee1860be6..74cc7ef06c1 100644
--- a/tests/baselines/reference/arrayconcat.symbols
+++ b/tests/baselines/reference/arrayconcat.symbols
@@ -3,46 +3,46 @@ interface IOptions {
 >IOptions : Symbol(IOptions, Decl(arrayconcat.ts, 0, 0))
 
     name?: string;
->name : Symbol(name, Decl(arrayconcat.ts, 0, 20))
+>name : Symbol(IOptions.name, Decl(arrayconcat.ts, 0, 20))
 
     flag?: boolean;
->flag : Symbol(flag, Decl(arrayconcat.ts, 1, 18))
+>flag : Symbol(IOptions.flag, Decl(arrayconcat.ts, 1, 18))
 
     short?: string;
->short : Symbol(short, Decl(arrayconcat.ts, 2, 19))
+>short : Symbol(IOptions.short, Decl(arrayconcat.ts, 2, 19))
 
     usage?: string;
->usage : Symbol(usage, Decl(arrayconcat.ts, 3, 19))
+>usage : Symbol(IOptions.usage, Decl(arrayconcat.ts, 3, 19))
 
     set?: (s: string) => void;
->set : Symbol(set, Decl(arrayconcat.ts, 4, 19))
+>set : Symbol(IOptions.set, Decl(arrayconcat.ts, 4, 19))
 >s : Symbol(s, Decl(arrayconcat.ts, 5, 11))
 
     type?: string;
->type : Symbol(type, Decl(arrayconcat.ts, 5, 30))
+>type : Symbol(IOptions.type, Decl(arrayconcat.ts, 5, 30))
 
     experimental?: boolean;
->experimental : Symbol(experimental, Decl(arrayconcat.ts, 6, 18))
+>experimental : Symbol(IOptions.experimental, Decl(arrayconcat.ts, 6, 18))
 }
 
 class parser {
 >parser : Symbol(parser, Decl(arrayconcat.ts, 8, 1))
 
 	public options: IOptions[];
->options : Symbol(options, Decl(arrayconcat.ts, 10, 14))
+>options : Symbol(parser.options, Decl(arrayconcat.ts, 10, 14))
 >IOptions : Symbol(IOptions, Decl(arrayconcat.ts, 0, 0))
 
 	public m() {
->m : Symbol(m, Decl(arrayconcat.ts, 11, 28))
+>m : Symbol(parser.m, Decl(arrayconcat.ts, 11, 28))
 
 		this.options = this.options.sort(function(a, b) {
->this.options : Symbol(options, Decl(arrayconcat.ts, 10, 14))
+>this.options : Symbol(parser.options, Decl(arrayconcat.ts, 10, 14))
 >this : Symbol(parser, Decl(arrayconcat.ts, 8, 1))
->options : Symbol(options, Decl(arrayconcat.ts, 10, 14))
+>options : Symbol(parser.options, Decl(arrayconcat.ts, 10, 14))
 >this.options.sort : Symbol(Array.sort, Decl(lib.d.ts, --, --))
->this.options : Symbol(options, Decl(arrayconcat.ts, 10, 14))
+>this.options : Symbol(parser.options, Decl(arrayconcat.ts, 10, 14))
 >this : Symbol(parser, Decl(arrayconcat.ts, 8, 1))
->options : Symbol(options, Decl(arrayconcat.ts, 10, 14))
+>options : Symbol(parser.options, Decl(arrayconcat.ts, 10, 14))
 >sort : Symbol(Array.sort, Decl(lib.d.ts, --, --))
 >a : Symbol(a, Decl(arrayconcat.ts, 14, 44))
 >b : Symbol(b, Decl(arrayconcat.ts, 14, 46))
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/arrowFunctionErrorSpan.errors.txt b/tests/baselines/reference/arrowFunctionErrorSpan.errors.txt
new file mode 100644
index 00000000000..e258f56d5ed
--- /dev/null
+++ b/tests/baselines/reference/arrowFunctionErrorSpan.errors.txt
@@ -0,0 +1,111 @@
+tests/cases/compiler/arrowFunctionErrorSpan.ts(4,3): error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
+  Type 'void' is not assignable to type 'number'.
+tests/cases/compiler/arrowFunctionErrorSpan.ts(7,3): error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
+  Type 'void' is not assignable to type 'number'.
+tests/cases/compiler/arrowFunctionErrorSpan.ts(12,3): error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
+  Type 'void' is not assignable to type 'number'.
+tests/cases/compiler/arrowFunctionErrorSpan.ts(17,3): error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
+  Type 'void' is not assignable to type 'number'.
+tests/cases/compiler/arrowFunctionErrorSpan.ts(18,5): error TS1200: Line terminator not permitted before arrow.
+tests/cases/compiler/arrowFunctionErrorSpan.ts(21,3): error TS2345: Argument of type '(a: any, b: any, c: any, d: any) => void' is not assignable to parameter of type '() => number'.
+tests/cases/compiler/arrowFunctionErrorSpan.ts(28,7): error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
+  Type 'void' is not assignable to type 'number'.
+tests/cases/compiler/arrowFunctionErrorSpan.ts(32,7): error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
+  Type 'void' is not assignable to type 'number'.
+tests/cases/compiler/arrowFunctionErrorSpan.ts(36,7): error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
+  Type 'void' is not assignable to type 'number'.
+tests/cases/compiler/arrowFunctionErrorSpan.ts(43,5): error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
+  Type 'void' is not assignable to type 'number'.
+tests/cases/compiler/arrowFunctionErrorSpan.ts(52,3): error TS2345: Argument of type '(_: any) => number' is not assignable to parameter of type '() => number'.
+
+
+==== tests/cases/compiler/arrowFunctionErrorSpan.ts (11 errors) ====
+    function f(a: () => number) { }
+    
+    // oneliner
+    f(() => { });
+      ~~~~~~~~~
+!!! error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
+!!! error TS2345:   Type 'void' is not assignable to type 'number'.
+    
+    // multiline, body
+    f(() => {
+      ~~~~~~~
+!!! error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
+!!! error TS2345:   Type 'void' is not assignable to type 'number'.
+    
+    });
+    
+    // multiline 2, body
+    f(() => {
+      ~~~~~~~
+!!! error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
+!!! error TS2345:   Type 'void' is not assignable to type 'number'.
+    
+    });
+    
+    // multiline 3, arrow on a new line
+    f(()
+      ~~
+        => { });
+    ~~~~~~~~~~
+!!! error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
+!!! error TS2345:   Type 'void' is not assignable to type 'number'.
+        ~~
+!!! error TS1200: Line terminator not permitted before arrow.
+    
+    // multiline 4, arguments
+    f((a,
+      ~~~
+        b,
+    ~~~~~~
+        c,
+    ~~~~~~
+        d) => { });
+    ~~~~~~~~~~~~~
+!!! error TS2345: Argument of type '(a: any, b: any, c: any, d: any) => void' is not assignable to parameter of type '() => number'.
+    
+    // single line with a comment
+    f(/*
+        */() => { });
+          ~~~~~~~~~
+!!! error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
+!!! error TS2345:   Type 'void' is not assignable to type 'number'.
+    
+    // multi line with a comment
+    f(/*
+        */() => { });
+          ~~~~~~~~~
+!!! error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
+!!! error TS2345:   Type 'void' is not assignable to type 'number'.
+    
+    // multi line with a comment 2
+    f(/*
+        */() => { 
+          ~~~~~~~~
+!!! error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
+!!! error TS2345:   Type 'void' is not assignable to type 'number'.
+    
+        });
+    
+    // multi line with a comment 3
+    f(  // comment 1
+        // comment 2
+        () =>
+        ~~~~~
+!!! error TS2345: Argument of type '() => void' is not assignable to parameter of type '() => number'.
+!!! error TS2345:   Type 'void' is not assignable to type 'number'.
+        // comment 3
+        {
+            // comment 4
+        }
+        // comment 5
+    ); 
+    
+    // body is not a block
+    f(_ => 1 +
+      ~~~~~~~~
+        2);
+    ~~~~~
+!!! error TS2345: Argument of type '(_: any) => number' is not assignable to parameter of type '() => number'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/arrowFunctionErrorSpan.js b/tests/baselines/reference/arrowFunctionErrorSpan.js
new file mode 100644
index 00000000000..2557113e89b
--- /dev/null
+++ b/tests/baselines/reference/arrowFunctionErrorSpan.js
@@ -0,0 +1,89 @@
+//// [arrowFunctionErrorSpan.ts]
+function f(a: () => number) { }
+
+// oneliner
+f(() => { });
+
+// multiline, body
+f(() => {
+
+});
+
+// multiline 2, body
+f(() => {
+
+});
+
+// multiline 3, arrow on a new line
+f(()
+    => { });
+
+// multiline 4, arguments
+f((a,
+    b,
+    c,
+    d) => { });
+
+// single line with a comment
+f(/*
+    */() => { });
+
+// multi line with a comment
+f(/*
+    */() => { });
+
+// multi line with a comment 2
+f(/*
+    */() => { 
+
+    });
+
+// multi line with a comment 3
+f(  // comment 1
+    // comment 2
+    () =>
+    // comment 3
+    {
+        // comment 4
+    }
+    // comment 5
+); 
+
+// body is not a block
+f(_ => 1 +
+    2);
+
+
+//// [arrowFunctionErrorSpan.js]
+function f(a) { }
+// oneliner
+f(function () { });
+// multiline, body
+f(function () {
+});
+// multiline 2, body
+f(function () {
+});
+// multiline 3, arrow on a new line
+f(function () { });
+// multiline 4, arguments
+f(function (a, b, c, d) { });
+// single line with a comment
+f(/*
+    */ function () { });
+// multi line with a comment
+f(/*
+    */ function () { });
+// multi line with a comment 2
+f(/*
+    */ function () {
+});
+// multi line with a comment 3
+f(// comment 1
+// comment 2
+function () {
+    // comment 4
+});
+// body is not a block
+f(function (_) { return 1 +
+    2; });
diff --git a/tests/baselines/reference/arrowFunctionExpressions.symbols b/tests/baselines/reference/arrowFunctionExpressions.symbols
index 853c5074580..028d57084a2 100644
--- a/tests/baselines/reference/arrowFunctionExpressions.symbols
+++ b/tests/baselines/reference/arrowFunctionExpressions.symbols
@@ -94,18 +94,18 @@ class MyClass {
 >MyClass : Symbol(MyClass, Decl(arrowFunctionExpressions.ts, 24, 37))
 
     m = (n) => n + 1;
->m : Symbol(m, Decl(arrowFunctionExpressions.ts, 28, 15))
+>m : Symbol(MyClass.m, Decl(arrowFunctionExpressions.ts, 28, 15))
 >n : Symbol(n, Decl(arrowFunctionExpressions.ts, 29, 9))
 >n : Symbol(n, Decl(arrowFunctionExpressions.ts, 29, 9))
 
     p = (n) => n && this;
->p : Symbol(p, Decl(arrowFunctionExpressions.ts, 29, 21))
+>p : Symbol(MyClass.p, Decl(arrowFunctionExpressions.ts, 29, 21))
 >n : Symbol(n, Decl(arrowFunctionExpressions.ts, 30, 9))
 >n : Symbol(n, Decl(arrowFunctionExpressions.ts, 30, 9))
 >this : Symbol(MyClass, Decl(arrowFunctionExpressions.ts, 24, 37))
 
     fn() {
->fn : Symbol(fn, Decl(arrowFunctionExpressions.ts, 30, 25))
+>fn : Symbol(MyClass.fn, Decl(arrowFunctionExpressions.ts, 30, 25))
 
         var m = (n) => n + 1;
 >m : Symbol(m, Decl(arrowFunctionExpressions.ts, 33, 11))
diff --git a/tests/baselines/reference/arrowFunctionExpressions.types b/tests/baselines/reference/arrowFunctionExpressions.types
index eedd20944fe..41344c61cc4 100644
--- a/tests/baselines/reference/arrowFunctionExpressions.types
+++ b/tests/baselines/reference/arrowFunctionExpressions.types
@@ -77,31 +77,31 @@ var p4 = ([, ...a]) => { };
 >a : any[]
 
 var p5 = ([a = 1]) => { };
->p5 : ([a = 1]: [number]) => void
->([a = 1]) => { } : ([a = 1]: [number]) => void
+>p5 : ([a]: [number]) => void
+>([a = 1]) => { } : ([a]: [number]) => void
 >a : number
 >1 : number
 
 var p6 = ({ a }) => { };
->p6 : ({ a }: { a: any; }) => void
->({ a }) => { } : ({ a }: { a: any; }) => void
+>p6 : ({a}: { a: any; }) => void
+>({ a }) => { } : ({a}: { a: any; }) => void
 >a : any
 
 var p7 = ({ a: { b } }) => { };
->p7 : ({ a: { b } }: { a: { b: any; }; }) => void
->({ a: { b } }) => { } : ({ a: { b } }: { a: { b: any; }; }) => void
+>p7 : ({a: {b}}: { a: { b: any; }; }) => void
+>({ a: { b } }) => { } : ({a: {b}}: { a: { b: any; }; }) => void
 >a : any
 >b : any
 
 var p8 = ({ a = 1 }) => { };
->p8 : ({ a = 1 }: { a?: number; }) => void
->({ a = 1 }) => { } : ({ a = 1 }: { a?: number; }) => void
+>p8 : ({a}: { a?: number; }) => void
+>({ a = 1 }) => { } : ({a}: { a?: number; }) => void
 >a : number
 >1 : number
 
 var p9 = ({ a: { b = 1 } = { b: 1 } }) => { };
->p9 : ({ a: { b = 1 } = { b: 1 } }: { a?: { b?: number; }; }) => void
->({ a: { b = 1 } = { b: 1 } }) => { } : ({ a: { b = 1 } = { b: 1 } }: { a?: { b?: number; }; }) => void
+>p9 : ({a: {b}}: { a?: { b?: number; }; }) => void
+>({ a: { b = 1 } = { b: 1 } }) => { } : ({a: {b}}: { a?: { b?: number; }; }) => void
 >a : any
 >b : number
 >1 : number
@@ -110,8 +110,8 @@ var p9 = ({ a: { b = 1 } = { b: 1 } }) => { };
 >1 : number
 
 var p10 = ([{ value, done }]) => { };
->p10 : ([{ value, done }]: [{ value: any; done: any; }]) => void
->([{ value, done }]) => { } : ([{ value, done }]: [{ value: any; done: any; }]) => void
+>p10 : ([{value, done}]: [{ value: any; done: any; }]) => void
+>([{ value, done }]) => { } : ([{value, done}]: [{ value: any; done: any; }]) => void
 >value : any
 >done : any
 
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/arrowFunctionWithObjectLiteralBody6.symbols b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody6.symbols
index 141b0d49880..534f9cc1ea0 100644
--- a/tests/baselines/reference/arrowFunctionWithObjectLiteralBody6.symbols
+++ b/tests/baselines/reference/arrowFunctionWithObjectLiteralBody6.symbols
@@ -1,13 +1,13 @@
 === tests/cases/compiler/arrowFunctionWithObjectLiteralBody6.ts ===
 var a = () => <Error>{ name: "foo", message: "bar" };      
 >a : Symbol(a, Decl(arrowFunctionWithObjectLiteralBody6.ts, 0, 3))
->Error : Symbol(Error, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >name : Symbol(name, Decl(arrowFunctionWithObjectLiteralBody6.ts, 0, 22))
 >message : Symbol(message, Decl(arrowFunctionWithObjectLiteralBody6.ts, 0, 35))
 
 var b = () => (<Error>{ name: "foo", message: "bar" });    
 >b : Symbol(b, Decl(arrowFunctionWithObjectLiteralBody6.ts, 2, 3))
->Error : Symbol(Error, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >name : Symbol(name, Decl(arrowFunctionWithObjectLiteralBody6.ts, 2, 23))
 >message : Symbol(message, Decl(arrowFunctionWithObjectLiteralBody6.ts, 2, 36))
 
@@ -18,7 +18,7 @@ var c = () => ({ name: "foo", message: "bar" });
 
 var d = () => ((<Error>({ name: "foo", message: "bar" })));
 >d : Symbol(d, Decl(arrowFunctionWithObjectLiteralBody6.ts, 6, 3))
->Error : Symbol(Error, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >name : Symbol(name, Decl(arrowFunctionWithObjectLiteralBody6.ts, 6, 25))
 >message : Symbol(message, Decl(arrowFunctionWithObjectLiteralBody6.ts, 6, 38))
 
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/asOperator1.symbols b/tests/baselines/reference/asOperator1.symbols
index 343d3422b5c..83813d26981 100644
--- a/tests/baselines/reference/asOperator1.symbols
+++ b/tests/baselines/reference/asOperator1.symbols
@@ -13,7 +13,7 @@ var y = (null as string).length;
 
 var z = Date as any as string;
 >z : Symbol(z, Decl(asOperator1.ts, 3, 3))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 // Should parse as a union type, not a bitwise 'or' of (32 as number) and 'string'
 var j = 32 as number|string;
diff --git a/tests/baselines/reference/asOperator2.errors.txt b/tests/baselines/reference/asOperator2.errors.txt
index 3b074038c26..92603c25cb0 100644
--- a/tests/baselines/reference/asOperator2.errors.txt
+++ b/tests/baselines/reference/asOperator2.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/expressions/asOperator/asOperator2.ts(1,9): error TS2352: Neither type 'number' nor type 'string' is assignable to the other.
+tests/cases/conformance/expressions/asOperator/asOperator2.ts(1,9): error TS2352: Type 'number' cannot be converted to type 'string'.
 
 
 ==== tests/cases/conformance/expressions/asOperator/asOperator2.ts (1 errors) ====
     var x = 23 as string;
             ~~~~~~~~~~~~
-!!! error TS2352: Neither type 'number' nor type 'string' is assignable to the other.
+!!! error TS2352: Type 'number' cannot be converted to type 'string'.
     
\ No newline at end of file
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/asOperatorContextualType.errors.txt b/tests/baselines/reference/asOperatorContextualType.errors.txt
index c53b407b5cf..9431d6123e2 100644
--- a/tests/baselines/reference/asOperatorContextualType.errors.txt
+++ b/tests/baselines/reference/asOperatorContextualType.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/expressions/asOperator/asOperatorContextualType.ts(2,9): error TS2352: Neither type '(v: number) => number' nor type '(x: number) => string' is assignable to the other.
-  Type 'number' is not assignable to type 'string'.
+tests/cases/conformance/expressions/asOperator/asOperatorContextualType.ts(2,9): error TS2352: Type '(v: number) => number' cannot be converted to type '(x: number) => string'.
+  Type 'number' is not comparable to type 'string'.
 
 
 ==== tests/cases/conformance/expressions/asOperator/asOperatorContextualType.ts (1 errors) ====
     // should error
     var x = (v => v) as (x: number) => string;
             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Neither type '(v: number) => number' nor type '(x: number) => string' is assignable to the other.
-!!! error TS2352:   Type 'number' is not assignable to type 'string'.
\ No newline at end of file
+!!! error TS2352: Type '(v: number) => number' cannot be converted to type '(x: number) => string'.
+!!! error TS2352:   Type 'number' is not comparable to type 'string'.
\ No newline at end of file
diff --git a/tests/baselines/reference/asOperatorNames.errors.txt b/tests/baselines/reference/asOperatorNames.errors.txt
index e3dfaab9884..4f957791a24 100644
--- a/tests/baselines/reference/asOperatorNames.errors.txt
+++ b/tests/baselines/reference/asOperatorNames.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/conformance/expressions/asOperator/asOperatorNames.ts(2,9): error TS2352: Neither type 'number' nor type 'string' is assignable to the other.
+tests/cases/conformance/expressions/asOperator/asOperatorNames.ts(2,9): error TS2352: Type 'number' cannot be converted to type 'string'.
 
 
 ==== tests/cases/conformance/expressions/asOperator/asOperatorNames.ts (1 errors) ====
     var a = 20;
     var b = a as string;
             ~~~~~~~~~~~
-!!! error TS2352: Neither type 'number' nor type 'string' is assignable to the other.
+!!! error TS2352: Type 'number' cannot be converted to type 'string'.
     var as = "hello";
     var as1 = as as string;
     
\ No newline at end of file
diff --git a/tests/baselines/reference/asiInES6Classes.symbols b/tests/baselines/reference/asiInES6Classes.symbols
index e6af356008d..e4b89c19bf0 100644
--- a/tests/baselines/reference/asiInES6Classes.symbols
+++ b/tests/baselines/reference/asiInES6Classes.symbols
@@ -5,7 +5,7 @@ class Foo {
  
 
     defaults = {
->defaults : Symbol(defaults, Decl(asiInES6Classes.ts, 0, 11))
+>defaults : Symbol(Foo.defaults, Decl(asiInES6Classes.ts, 0, 11))
 
         done: false
 >done : Symbol(done, Decl(asiInES6Classes.ts, 4, 16))
@@ -15,7 +15,7 @@ class Foo {
  
 
     bar() {
->bar : Symbol(bar, Decl(asiInES6Classes.ts, 8, 5))
+>bar : Symbol(Foo.bar, Decl(asiInES6Classes.ts, 8, 5))
 
         return 3;
 
diff --git a/tests/baselines/reference/assign1.symbols b/tests/baselines/reference/assign1.symbols
index f434da72670..a8ab57146af 100644
--- a/tests/baselines/reference/assign1.symbols
+++ b/tests/baselines/reference/assign1.symbols
@@ -6,10 +6,10 @@ module M {
 >I : Symbol(I, Decl(assign1.ts, 0, 10))
 
         salt:number;
->salt : Symbol(salt, Decl(assign1.ts, 1, 17))
+>salt : Symbol(I.salt, Decl(assign1.ts, 1, 17))
 
         pepper:number;
->pepper : Symbol(pepper, Decl(assign1.ts, 2, 20))
+>pepper : Symbol(I.pepper, Decl(assign1.ts, 2, 20))
     }
 
     var x:I={salt:2,pepper:0};
diff --git a/tests/baselines/reference/assignEveryTypeToAny.symbols b/tests/baselines/reference/assignEveryTypeToAny.symbols
index 145e19664fd..e94413d4a3b 100644
--- a/tests/baselines/reference/assignEveryTypeToAny.symbols
+++ b/tests/baselines/reference/assignEveryTypeToAny.symbols
@@ -84,7 +84,7 @@ interface I {
 >I : Symbol(I, Decl(assignEveryTypeToAny.ts, 31, 6))
 
     foo: string;
->foo : Symbol(foo, Decl(assignEveryTypeToAny.ts, 33, 13))
+>foo : Symbol(I.foo, Decl(assignEveryTypeToAny.ts, 33, 13))
 }
 
 var g: I;
@@ -99,7 +99,7 @@ class C {
 >C : Symbol(C, Decl(assignEveryTypeToAny.ts, 38, 6))
 
     bar: string;
->bar : Symbol(bar, Decl(assignEveryTypeToAny.ts, 40, 9))
+>bar : Symbol(C.bar, Decl(assignEveryTypeToAny.ts, 40, 9))
 }
 
 var h: C;
diff --git a/tests/baselines/reference/assignToPrototype1.symbols b/tests/baselines/reference/assignToPrototype1.symbols
index ddb8e915043..7e58c92fdcb 100644
--- a/tests/baselines/reference/assignToPrototype1.symbols
+++ b/tests/baselines/reference/assignToPrototype1.symbols
@@ -3,7 +3,7 @@ declare class Point {
 >Point : Symbol(Point, Decl(assignToPrototype1.ts, 0, 0))
 
   add(dx: number, dy: number): void;
->add : Symbol(add, Decl(assignToPrototype1.ts, 0, 21))
+>add : Symbol(Point.add, Decl(assignToPrototype1.ts, 0, 21))
 >dx : Symbol(dx, Decl(assignToPrototype1.ts, 1, 6))
 >dy : Symbol(dy, Decl(assignToPrototype1.ts, 1, 17))
 }
diff --git a/tests/baselines/reference/assignmentCompatBug5.errors.txt b/tests/baselines/reference/assignmentCompatBug5.errors.txt
index 1b5e3d80259..44e28f15d8c 100644
--- a/tests/baselines/reference/assignmentCompatBug5.errors.txt
+++ b/tests/baselines/reference/assignmentCompatBug5.errors.txt
@@ -4,7 +4,7 @@ tests/cases/compiler/assignmentCompatBug5.ts(5,6): error TS2345: Argument of typ
   Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/assignmentCompatBug5.ts(8,6): error TS2345: Argument of type '(s: string) => void' is not assignable to parameter of type '(n: number) => number'.
   Types of parameters 's' and 'n' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/assignmentCompatBug5.ts(9,6): error TS2345: Argument of type '(n: number) => void' is not assignable to parameter of type '(n: number) => number'.
   Type 'void' is not assignable to type 'number'.
 
@@ -27,7 +27,7 @@ tests/cases/compiler/assignmentCompatBug5.ts(9,6): error TS2345: Argument of typ
          ~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(s: string) => void' is not assignable to parameter of type '(n: number) => number'.
 !!! error TS2345:   Types of parameters 's' and 'n' are incompatible.
-!!! error TS2345:     Type 'string' is not assignable to type 'number'.
+!!! error TS2345:     Type 'number' is not assignable to type 'string'.
     foo3((n) => { return; });
          ~~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(n: number) => void' is not assignable to parameter of type '(n: number) => number'.
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures.errors.txt b/tests/baselines/reference/assignmentCompatWithCallSignatures.errors.txt
index 6a221ef144e..c5914e59386 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures.errors.txt
@@ -1,27 +1,27 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures.ts(35,1): error TS2322: Type 'S2' is not assignable to type 'T'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures.ts(36,1): error TS2322: Type '(x: string) => void' is not assignable to type 'T'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures.ts(37,1): error TS2322: Type '(x: string) => number' is not assignable to type 'T'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures.ts(38,1): error TS2322: Type '(x: string) => string' is not assignable to type 'T'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures.ts(39,1): error TS2322: Type 'S2' is not assignable to type '(x: number) => void'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures.ts(40,1): error TS2322: Type '(x: string) => void' is not assignable to type '(x: number) => void'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures.ts(41,1): error TS2322: Type '(x: string) => number' is not assignable to type '(x: number) => void'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures.ts(42,1): error TS2322: Type '(x: string) => string' is not assignable to type '(x: number) => void'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures.ts (8 errors) ====
@@ -63,40 +63,40 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
     ~
 !!! error TS2322: Type 'S2' is not assignable to type 'T'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:     Type 'string' is not assignable to type 'number'.
+!!! error TS2322:     Type 'number' is not assignable to type 'string'.
     t = a3;
     ~
 !!! error TS2322: Type '(x: string) => void' is not assignable to type 'T'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:     Type 'string' is not assignable to type 'number'.
+!!! error TS2322:     Type 'number' is not assignable to type 'string'.
     t = (x: string) => 1;
     ~
 !!! error TS2322: Type '(x: string) => number' is not assignable to type 'T'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:     Type 'string' is not assignable to type 'number'.
+!!! error TS2322:     Type 'number' is not assignable to type 'string'.
     t = function (x: string) { return ''; }
     ~
 !!! error TS2322: Type '(x: string) => string' is not assignable to type 'T'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:     Type 'string' is not assignable to type 'number'.
+!!! error TS2322:     Type 'number' is not assignable to type 'string'.
     a = s2;
     ~
 !!! error TS2322: Type 'S2' is not assignable to type '(x: number) => void'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:     Type 'string' is not assignable to type 'number'.
+!!! error TS2322:     Type 'number' is not assignable to type 'string'.
     a = a3;
     ~
 !!! error TS2322: Type '(x: string) => void' is not assignable to type '(x: number) => void'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:     Type 'string' is not assignable to type 'number'.
+!!! error TS2322:     Type 'number' is not assignable to type 'string'.
     a = (x: string) => 1;
     ~
 !!! error TS2322: Type '(x: string) => number' is not assignable to type '(x: number) => void'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:     Type 'string' is not assignable to type 'number'.
+!!! error TS2322:     Type 'number' is not assignable to type 'string'.
     a = function (x: string) { return ''; }
     ~
 !!! error TS2322: Type '(x: string) => string' is not assignable to type '(x: number) => void'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:     Type 'string' is not assignable to type 'number'.
+!!! error TS2322:     Type 'number' is not assignable to type 'string'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures2.errors.txt b/tests/baselines/reference/assignmentCompatWithCallSignatures2.errors.txt
index e67f0a930c2..ffc0fdcd772 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures2.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures2.errors.txt
@@ -10,12 +10,12 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
   Types of property 'f' are incompatible.
     Type '(x: string) => void' is not assignable to type '(x: number) => void'.
       Types of parameters 'x' and 'x' are incompatible.
-        Type 'string' is not assignable to type 'number'.
+        Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(43,1): error TS2322: Type '{ f(x: string): void; }' is not assignable to type 'T'.
   Types of property 'f' are incompatible.
     Type '(x: string) => void' is not assignable to type '(x: number) => void'.
       Types of parameters 'x' and 'x' are incompatible.
-        Type 'string' is not assignable to type 'number'.
+        Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(44,1): error TS2322: Type '(x: string) => number' is not assignable to type 'T'.
   Property 'f' is missing in type '(x: string) => number'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(45,1): error TS2322: Type '(x: string) => string' is not assignable to type 'T'.
@@ -24,12 +24,12 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
   Types of property 'f' are incompatible.
     Type '(x: string) => void' is not assignable to type '(x: number) => void'.
       Types of parameters 'x' and 'x' are incompatible.
-        Type 'string' is not assignable to type 'number'.
+        Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(47,1): error TS2322: Type '{ f(x: string): void; }' is not assignable to type '{ f(x: number): void; }'.
   Types of property 'f' are incompatible.
     Type '(x: string) => void' is not assignable to type '(x: number) => void'.
       Types of parameters 'x' and 'x' are incompatible.
-        Type 'string' is not assignable to type 'number'.
+        Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(48,1): error TS2322: Type '(x: string) => number' is not assignable to type '{ f(x: number): void; }'.
   Property 'f' is missing in type '(x: string) => number'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures2.ts(49,1): error TS2322: Type '(x: string) => string' is not assignable to type '{ f(x: number): void; }'.
@@ -96,14 +96,14 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322:   Types of property 'f' are incompatible.
 !!! error TS2322:     Type '(x: string) => void' is not assignable to type '(x: number) => void'.
 !!! error TS2322:       Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:         Type 'string' is not assignable to type 'number'.
+!!! error TS2322:         Type 'number' is not assignable to type 'string'.
     t = a3;
     ~
 !!! error TS2322: Type '{ f(x: string): void; }' is not assignable to type 'T'.
 !!! error TS2322:   Types of property 'f' are incompatible.
 !!! error TS2322:     Type '(x: string) => void' is not assignable to type '(x: number) => void'.
 !!! error TS2322:       Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:         Type 'string' is not assignable to type 'number'.
+!!! error TS2322:         Type 'number' is not assignable to type 'string'.
     t = (x: string) => 1;
     ~
 !!! error TS2322: Type '(x: string) => number' is not assignable to type 'T'.
@@ -118,14 +118,14 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
 !!! error TS2322:   Types of property 'f' are incompatible.
 !!! error TS2322:     Type '(x: string) => void' is not assignable to type '(x: number) => void'.
 !!! error TS2322:       Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:         Type 'string' is not assignable to type 'number'.
+!!! error TS2322:         Type 'number' is not assignable to type 'string'.
     a = a3;
     ~
 !!! error TS2322: Type '{ f(x: string): void; }' is not assignable to type '{ f(x: number): void; }'.
 !!! error TS2322:   Types of property 'f' are incompatible.
 !!! error TS2322:     Type '(x: string) => void' is not assignable to type '(x: number) => void'.
 !!! error TS2322:       Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:         Type 'string' is not assignable to type 'number'.
+!!! error TS2322:         Type 'number' is not assignable to type 'string'.
     a = (x: string) => 1;
     ~
 !!! error TS2322: Type '(x: string) => number' is not assignable to type '{ f(x: number): void; }'.
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures3.symbols b/tests/baselines/reference/assignmentCompatWithCallSignatures3.symbols
index ea9440cf1a9..de0a5dc7b28 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures3.symbols
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures3.symbols
@@ -3,22 +3,22 @@
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
->foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures3.ts, 2, 12))
+>foo : Symbol(Base.foo, Decl(assignmentCompatWithCallSignatures3.ts, 2, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures3.ts, 2, 27))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
->bar : Symbol(bar, Decl(assignmentCompatWithCallSignatures3.ts, 3, 28))
+>bar : Symbol(Derived.bar, Decl(assignmentCompatWithCallSignatures3.ts, 3, 28))
 
 class Derived2 extends Derived { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithCallSignatures3.ts, 3, 43))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures3.ts, 2, 27))
->baz : Symbol(baz, Decl(assignmentCompatWithCallSignatures3.ts, 4, 32))
+>baz : Symbol(Derived2.baz, Decl(assignmentCompatWithCallSignatures3.ts, 4, 32))
 
 class OtherDerived extends Base { bing: string; }
 >OtherDerived : Symbol(OtherDerived, Decl(assignmentCompatWithCallSignatures3.ts, 4, 47))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures3.ts, 0, 0))
->bing : Symbol(bing, Decl(assignmentCompatWithCallSignatures3.ts, 5, 33))
+>bing : Symbol(OtherDerived.bing, Decl(assignmentCompatWithCallSignatures3.ts, 5, 33))
 
 var a: (x: number) => number[];
 >a : Symbol(a, Decl(assignmentCompatWithCallSignatures3.ts, 7, 3))
@@ -189,8 +189,8 @@ var a18: {
 
         (a: Date): Date;
 >a : Symbol(a, Decl(assignmentCompatWithCallSignatures3.ts, 40, 9))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     }): any[];
 }
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures4.errors.txt b/tests/baselines/reference/assignmentCompatWithCallSignatures4.errors.txt
index a75b5fafac1..8d184edc085 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures4.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures4.errors.txt
@@ -1,13 +1,13 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures4.ts(52,9): error TS2322: Type '<T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U' is not assignable to type '(x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived'.
   Types of parameters 'y' and 'y' are incompatible.
-    Type '(arg2: { foo: number; }) => any' is not assignable to type '(arg2: Base) => Derived'.
+    Type '(arg2: Base) => Derived' is not assignable to type '(arg2: { foo: number; }) => any'.
       Types of parameters 'arg2' and 'arg2' are incompatible.
         Type '{ foo: number; }' is not assignable to type 'Base'.
           Types of property 'foo' are incompatible.
             Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures4.ts(53,9): error TS2322: Type '(x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived' is not assignable to type '<T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U'.
   Types of parameters 'y' and 'y' are incompatible.
-    Type '(arg2: Base) => Derived' is not assignable to type '(arg2: { foo: number; }) => any'.
+    Type '(arg2: { foo: number; }) => any' is not assignable to type '(arg2: Base) => Derived'.
       Types of parameters 'arg2' and 'arg2' are incompatible.
         Type 'Base' is not assignable to type '{ foo: number; }'.
           Types of property 'foo' are incompatible.
@@ -70,7 +70,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
             ~~
 !!! error TS2322: Type '<T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U' is not assignable to type '(x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived'.
 !!! error TS2322:   Types of parameters 'y' and 'y' are incompatible.
-!!! error TS2322:     Type '(arg2: { foo: number; }) => any' is not assignable to type '(arg2: Base) => Derived'.
+!!! error TS2322:     Type '(arg2: Base) => Derived' is not assignable to type '(arg2: { foo: number; }) => any'.
 !!! error TS2322:       Types of parameters 'arg2' and 'arg2' are incompatible.
 !!! error TS2322:         Type '{ foo: number; }' is not assignable to type 'Base'.
 !!! error TS2322:           Types of property 'foo' are incompatible.
@@ -79,7 +79,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
             ~~
 !!! error TS2322: Type '(x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived' is not assignable to type '<T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U'.
 !!! error TS2322:   Types of parameters 'y' and 'y' are incompatible.
-!!! error TS2322:     Type '(arg2: Base) => Derived' is not assignable to type '(arg2: { foo: number; }) => any'.
+!!! error TS2322:     Type '(arg2: { foo: number; }) => any' is not assignable to type '(arg2: Base) => Derived'.
 !!! error TS2322:       Types of parameters 'arg2' and 'arg2' are incompatible.
 !!! error TS2322:         Type 'Base' is not assignable to type '{ foo: number; }'.
 !!! error TS2322:           Types of property 'foo' are incompatible.
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures5.symbols b/tests/baselines/reference/assignmentCompatWithCallSignatures5.symbols
index e26e95b0c0c..e958922c1de 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures5.symbols
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures5.symbols
@@ -3,22 +3,22 @@
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures5.ts, 0, 0))
->foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures5.ts, 2, 12))
+>foo : Symbol(Base.foo, Decl(assignmentCompatWithCallSignatures5.ts, 2, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures5.ts, 2, 27))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures5.ts, 0, 0))
->bar : Symbol(bar, Decl(assignmentCompatWithCallSignatures5.ts, 3, 28))
+>bar : Symbol(Derived.bar, Decl(assignmentCompatWithCallSignatures5.ts, 3, 28))
 
 class Derived2 extends Derived { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithCallSignatures5.ts, 3, 43))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures5.ts, 2, 27))
->baz : Symbol(baz, Decl(assignmentCompatWithCallSignatures5.ts, 4, 32))
+>baz : Symbol(Derived2.baz, Decl(assignmentCompatWithCallSignatures5.ts, 4, 32))
 
 class OtherDerived extends Base { bing: string; }
 >OtherDerived : Symbol(OtherDerived, Decl(assignmentCompatWithCallSignatures5.ts, 4, 47))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures5.ts, 0, 0))
->bing : Symbol(bing, Decl(assignmentCompatWithCallSignatures5.ts, 5, 33))
+>bing : Symbol(OtherDerived.bing, Decl(assignmentCompatWithCallSignatures5.ts, 5, 33))
 
 var a: <T>(x: T) => T[];
 >a : Symbol(a, Decl(assignmentCompatWithCallSignatures5.ts, 7, 3))
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures6.symbols b/tests/baselines/reference/assignmentCompatWithCallSignatures6.symbols
index b7e6956ef65..008ea5481a9 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures6.symbols
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures6.symbols
@@ -3,47 +3,47 @@
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures6.ts, 0, 0))
->foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures6.ts, 2, 12))
+>foo : Symbol(Base.foo, Decl(assignmentCompatWithCallSignatures6.ts, 2, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures6.ts, 2, 27))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures6.ts, 0, 0))
->bar : Symbol(bar, Decl(assignmentCompatWithCallSignatures6.ts, 3, 28))
+>bar : Symbol(Derived.bar, Decl(assignmentCompatWithCallSignatures6.ts, 3, 28))
 
 class Derived2 extends Derived { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithCallSignatures6.ts, 3, 43))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithCallSignatures6.ts, 2, 27))
->baz : Symbol(baz, Decl(assignmentCompatWithCallSignatures6.ts, 4, 32))
+>baz : Symbol(Derived2.baz, Decl(assignmentCompatWithCallSignatures6.ts, 4, 32))
 
 class OtherDerived extends Base { bing: string; }
 >OtherDerived : Symbol(OtherDerived, Decl(assignmentCompatWithCallSignatures6.ts, 4, 47))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures6.ts, 0, 0))
->bing : Symbol(bing, Decl(assignmentCompatWithCallSignatures6.ts, 5, 33))
+>bing : Symbol(OtherDerived.bing, Decl(assignmentCompatWithCallSignatures6.ts, 5, 33))
 
 interface A {
 >A : Symbol(A, Decl(assignmentCompatWithCallSignatures6.ts, 5, 49))
 
     a: <T>(x: T) => T[];
->a : Symbol(a, Decl(assignmentCompatWithCallSignatures6.ts, 7, 13))
+>a : Symbol(A.a, Decl(assignmentCompatWithCallSignatures6.ts, 7, 13))
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 8, 8))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 8, 11))
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 8, 8))
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 8, 8))
 
     a2: <T>(x: T) => string[];
->a2 : Symbol(a2, Decl(assignmentCompatWithCallSignatures6.ts, 8, 24))
+>a2 : Symbol(A.a2, Decl(assignmentCompatWithCallSignatures6.ts, 8, 24))
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 9, 9))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 9, 12))
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 9, 9))
 
     a3: <T>(x: T) => void;
->a3 : Symbol(a3, Decl(assignmentCompatWithCallSignatures6.ts, 9, 30))
+>a3 : Symbol(A.a3, Decl(assignmentCompatWithCallSignatures6.ts, 9, 30))
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 10, 9))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 10, 12))
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 10, 9))
 
     a4: <T,U>(x: T, y: U) => string;
->a4 : Symbol(a4, Decl(assignmentCompatWithCallSignatures6.ts, 10, 26))
+>a4 : Symbol(A.a4, Decl(assignmentCompatWithCallSignatures6.ts, 10, 26))
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 11, 9))
 >U : Symbol(U, Decl(assignmentCompatWithCallSignatures6.ts, 11, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 11, 14))
@@ -52,7 +52,7 @@ interface A {
 >U : Symbol(U, Decl(assignmentCompatWithCallSignatures6.ts, 11, 11))
 
     a5: <T,U>(x: (arg: T) => U) => T;
->a5 : Symbol(a5, Decl(assignmentCompatWithCallSignatures6.ts, 11, 36))
+>a5 : Symbol(A.a5, Decl(assignmentCompatWithCallSignatures6.ts, 11, 36))
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 12, 9))
 >U : Symbol(U, Decl(assignmentCompatWithCallSignatures6.ts, 12, 11))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 12, 14))
@@ -62,7 +62,7 @@ interface A {
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 12, 9))
 
     a6: <T extends Base>(x: (arg: T) => Derived) => T;
->a6 : Symbol(a6, Decl(assignmentCompatWithCallSignatures6.ts, 12, 37))
+>a6 : Symbol(A.a6, Decl(assignmentCompatWithCallSignatures6.ts, 12, 37))
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 13, 9))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures6.ts, 0, 0))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 13, 25))
@@ -72,7 +72,7 @@ interface A {
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 13, 9))
 
     a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
->a11 : Symbol(a11, Decl(assignmentCompatWithCallSignatures6.ts, 13, 54))
+>a11 : Symbol(A.a11, Decl(assignmentCompatWithCallSignatures6.ts, 13, 54))
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 14, 10))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 14, 13))
 >foo : Symbol(foo, Decl(assignmentCompatWithCallSignatures6.ts, 14, 17))
@@ -85,7 +85,7 @@ interface A {
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures6.ts, 0, 0))
 
     a15: <T>(x: { a: T; b: T }) => T[];
->a15 : Symbol(a15, Decl(assignmentCompatWithCallSignatures6.ts, 14, 59))
+>a15 : Symbol(A.a15, Decl(assignmentCompatWithCallSignatures6.ts, 14, 59))
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 15, 10))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 15, 13))
 >a : Symbol(a, Decl(assignmentCompatWithCallSignatures6.ts, 15, 17))
@@ -95,7 +95,7 @@ interface A {
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 15, 10))
 
     a16: <T extends Base>(x: { a: T; b: T }) => T[];
->a16 : Symbol(a16, Decl(assignmentCompatWithCallSignatures6.ts, 15, 39))
+>a16 : Symbol(A.a16, Decl(assignmentCompatWithCallSignatures6.ts, 15, 39))
 >T : Symbol(T, Decl(assignmentCompatWithCallSignatures6.ts, 16, 10))
 >Base : Symbol(Base, Decl(assignmentCompatWithCallSignatures6.ts, 0, 0))
 >x : Symbol(x, Decl(assignmentCompatWithCallSignatures6.ts, 16, 26))
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithRestParameters.errors.txt b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithRestParameters.errors.txt
index 8eec8503e70..6b563ef2631 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignaturesWithRestParameters.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithCallSignaturesWithRestParameters.errors.txt
@@ -1,30 +1,30 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithRestParameters.ts(13,5): error TS2322: Type '(...args: string[]) => number' is not assignable to type '(...args: number[]) => number'.
   Types of parameters 'args' and 'args' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithRestParameters.ts(17,5): error TS2322: Type '(x?: string) => number' is not assignable to type '(...args: number[]) => number'.
   Types of parameters 'x' and 'args' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithRestParameters.ts(26,5): error TS2322: Type '(x: number, ...args: string[]) => number' is not assignable to type '(x: number, ...z: number[]) => number'.
   Types of parameters 'args' and 'z' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithRestParameters.ts(35,5): error TS2322: Type '(x: number, y?: number, z?: number) => number' is not assignable to type '(x: number, y?: string, ...z: number[]) => number'.
   Types of parameters 'y' and 'y' are incompatible.
-    Type 'number' is not assignable to type 'string'.
+    Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithRestParameters.ts(36,5): error TS2322: Type '(x: number, ...z: number[]) => number' is not assignable to type '(x: number, y?: string, ...z: number[]) => number'.
   Types of parameters 'z' and 'y' are incompatible.
-    Type 'number' is not assignable to type 'string'.
+    Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithRestParameters.ts(37,5): error TS2322: Type '(x: string, y?: string, z?: string) => number' is not assignable to type '(x: number, y?: string, ...z: number[]) => number'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithRestParameters.ts(41,5): error TS2322: Type '(x?: number, y?: number) => number' is not assignable to type '(x?: number, y?: string, ...z: number[]) => number'.
   Types of parameters 'y' and 'y' are incompatible.
-    Type 'number' is not assignable to type 'string'.
+    Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithRestParameters.ts(43,5): error TS2322: Type '(x: number, y?: number) => number' is not assignable to type '(x?: number, y?: string, ...z: number[]) => number'.
   Types of parameters 'y' and 'y' are incompatible.
-    Type 'number' is not assignable to type 'string'.
+    Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithRestParameters.ts(45,5): error TS2322: Type '(x: number, ...args: string[]) => number' is not assignable to type '(x?: number, y?: string, ...z: number[]) => number'.
   Types of parameters 'args' and 'z' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithRestParameters.ts (9 errors) ====
@@ -44,7 +44,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
         ~
 !!! error TS2322: Type '(...args: string[]) => number' is not assignable to type '(...args: number[]) => number'.
 !!! error TS2322:   Types of parameters 'args' and 'args' are incompatible.
-!!! error TS2322:     Type 'string' is not assignable to type 'number'.
+!!! error TS2322:     Type 'number' is not assignable to type 'string'.
         a = (x?: number) => 1; // ok, same number of required params
         a = (x?: number, y?: number, z?: number) => 1; // ok, same number of required params
         a = (x: number) => 1; // ok, rest param corresponds to infinite number of params
@@ -52,7 +52,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
         ~
 !!! error TS2322: Type '(x?: string) => number' is not assignable to type '(...args: number[]) => number'.
 !!! error TS2322:   Types of parameters 'x' and 'args' are incompatible.
-!!! error TS2322:     Type 'string' is not assignable to type 'number'.
+!!! error TS2322:     Type 'number' is not assignable to type 'string'.
     
     
     var a2: (x: number, ...z: number[]) => number;
@@ -65,7 +65,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
         ~~
 !!! error TS2322: Type '(x: number, ...args: string[]) => number' is not assignable to type '(x: number, ...z: number[]) => number'.
 !!! error TS2322:   Types of parameters 'args' and 'z' are incompatible.
-!!! error TS2322:     Type 'string' is not assignable to type 'number'.
+!!! error TS2322:     Type 'number' is not assignable to type 'string'.
         a2 = (x: number, y: number) => 1; // ok, rest param corresponds to infinite number of params
         a2 = (x: number, y?: number) => 1; // ok, same number of required params
     
@@ -78,17 +78,17 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
         ~~
 !!! error TS2322: Type '(x: number, y?: number, z?: number) => number' is not assignable to type '(x: number, y?: string, ...z: number[]) => number'.
 !!! error TS2322:   Types of parameters 'y' and 'y' are incompatible.
-!!! error TS2322:     Type 'number' is not assignable to type 'string'.
+!!! error TS2322:     Type 'string' is not assignable to type 'number'.
         a3 = (x: number, ...z: number[]) => 1;  // error
         ~~
 !!! error TS2322: Type '(x: number, ...z: number[]) => number' is not assignable to type '(x: number, y?: string, ...z: number[]) => number'.
 !!! error TS2322:   Types of parameters 'z' and 'y' are incompatible.
-!!! error TS2322:     Type 'number' is not assignable to type 'string'.
+!!! error TS2322:     Type 'string' is not assignable to type 'number'.
         a3 = (x: string, y?: string, z?: string) => 1;  // error
         ~~
 !!! error TS2322: Type '(x: string, y?: string, z?: string) => number' is not assignable to type '(x: number, y?: string, ...z: number[]) => number'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:     Type 'string' is not assignable to type 'number'.
+!!! error TS2322:     Type 'number' is not assignable to type 'string'.
     
     var a4: (x?: number, y?: string, ...z: number[]) => number;
         a4 = () => 1; // ok, fewer required params
@@ -96,16 +96,16 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
         ~~
 !!! error TS2322: Type '(x?: number, y?: number) => number' is not assignable to type '(x?: number, y?: string, ...z: number[]) => number'.
 !!! error TS2322:   Types of parameters 'y' and 'y' are incompatible.
-!!! error TS2322:     Type 'number' is not assignable to type 'string'.
+!!! error TS2322:     Type 'string' is not assignable to type 'number'.
         a4 = (x: number) => 1; // ok, all present params match
         a4 = (x: number, y?: number) => 1;  // error, second param has type mismatch
         ~~
 !!! error TS2322: Type '(x: number, y?: number) => number' is not assignable to type '(x?: number, y?: string, ...z: number[]) => number'.
 !!! error TS2322:   Types of parameters 'y' and 'y' are incompatible.
-!!! error TS2322:     Type 'number' is not assignable to type 'string'.
+!!! error TS2322:     Type 'string' is not assignable to type 'number'.
         a4 = (x?: number, y?: string) => 1;  // ok, same number of required params with matching types
         a4 = (x: number, ...args: string[]) => 1;  // error, rest params have type mismatch
         ~~
 !!! error TS2322: Type '(x: number, ...args: string[]) => number' is not assignable to type '(x?: number, y?: string, ...z: number[]) => number'.
 !!! error TS2322:   Types of parameters 'args' and 'z' are incompatible.
-!!! error TS2322:     Type 'string' is not assignable to type 'number'.
\ No newline at end of file
+!!! error TS2322:     Type 'number' is not assignable to type 'string'.
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.symbols b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.symbols
index 4ef01deaea8..0e3b0b38332 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.symbols
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.symbols
@@ -3,22 +3,22 @@
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
->foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures3.ts, 2, 12))
+>foo : Symbol(Base.foo, Decl(assignmentCompatWithConstructSignatures3.ts, 2, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures3.ts, 2, 27))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
->bar : Symbol(bar, Decl(assignmentCompatWithConstructSignatures3.ts, 3, 28))
+>bar : Symbol(Derived.bar, Decl(assignmentCompatWithConstructSignatures3.ts, 3, 28))
 
 class Derived2 extends Derived { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithConstructSignatures3.ts, 3, 43))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures3.ts, 2, 27))
->baz : Symbol(baz, Decl(assignmentCompatWithConstructSignatures3.ts, 4, 32))
+>baz : Symbol(Derived2.baz, Decl(assignmentCompatWithConstructSignatures3.ts, 4, 32))
 
 class OtherDerived extends Base { bing: string; }
 >OtherDerived : Symbol(OtherDerived, Decl(assignmentCompatWithConstructSignatures3.ts, 4, 47))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures3.ts, 0, 0))
->bing : Symbol(bing, Decl(assignmentCompatWithConstructSignatures3.ts, 5, 33))
+>bing : Symbol(OtherDerived.bing, Decl(assignmentCompatWithConstructSignatures3.ts, 5, 33))
 
 var a: new (x: number) => number[];
 >a : Symbol(a, Decl(assignmentCompatWithConstructSignatures3.ts, 7, 3))
@@ -189,8 +189,8 @@ var a18: {
 
         new (a: Date): Date;
 >a : Symbol(a, Decl(assignmentCompatWithConstructSignatures3.ts, 40, 13))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     }): any[];
 }
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.errors.txt b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.errors.txt
index da9ffba1ee1..3f8111a3244 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.errors.txt
@@ -1,33 +1,33 @@
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts(52,9): error TS2322: Type 'new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U' is not assignable to type 'new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived'.
   Types of parameters 'y' and 'y' are incompatible.
-    Type '(arg2: { foo: number; }) => any' is not assignable to type '(arg2: Base) => Derived'.
+    Type '(arg2: Base) => Derived' is not assignable to type '(arg2: { foo: number; }) => any'.
       Types of parameters 'arg2' and 'arg2' are incompatible.
         Type '{ foo: number; }' is not assignable to type 'Base'.
           Types of property 'foo' are incompatible.
             Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts(53,9): error TS2322: Type 'new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived' is not assignable to type 'new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U'.
   Types of parameters 'y' and 'y' are incompatible.
-    Type '(arg2: Base) => Derived' is not assignable to type '(arg2: { foo: number; }) => any'.
+    Type '(arg2: { foo: number; }) => any' is not assignable to type '(arg2: Base) => Derived'.
       Types of parameters 'arg2' and 'arg2' are incompatible.
         Type 'Base' is not assignable to type '{ foo: number; }'.
           Types of property 'foo' are incompatible.
             Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts(77,9): error TS2322: Type 'new <T>(x: (a: T) => T) => T[]' is not assignable to type '{ new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }'.
-  Types of parameters 'x' and 'x' are incompatible.
-    Type '(a: any) => any' is not assignable to type '{ new (a: number): number; new (a?: number): number; }'.
-      Type '(a: any) => any' provides no match for the signature 'new (a: number): number'
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts(78,9): error TS2322: Type '{ new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }' is not assignable to type 'new <T>(x: (a: T) => T) => T[]'.
   Types of parameters 'x' and 'x' are incompatible.
     Type '{ new (a: number): number; new (a?: number): number; }' is not assignable to type '(a: any) => any'.
       Type '{ new (a: number): number; new (a?: number): number; }' provides no match for the signature '(a: any): any'
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts(81,9): error TS2322: Type 'new <T>(x: (a: T) => T) => any[]' is not assignable to type '{ new (x: { new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }): any[]; new (x: { new <T extends Derived2>(a: T): T; new <T extends Base>(a: T): T; }): any[]; }'.
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts(78,9): error TS2322: Type '{ new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }' is not assignable to type 'new <T>(x: (a: T) => T) => T[]'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type '(a: any) => any' is not assignable to type '{ new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }'.
-      Type '(a: any) => any' provides no match for the signature 'new <T extends Derived>(a: T): T'
-tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts(82,9): error TS2322: Type '{ new (x: { new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }): any[]; new (x: { new <T extends Derived2>(a: T): T; new <T extends Base>(a: T): T; }): any[]; }' is not assignable to type 'new <T>(x: (a: T) => T) => any[]'.
+    Type '(a: any) => any' is not assignable to type '{ new (a: number): number; new (a?: number): number; }'.
+      Type '(a: any) => any' provides no match for the signature 'new (a: number): number'
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts(81,9): error TS2322: Type 'new <T>(x: (a: T) => T) => any[]' is not assignable to type '{ new (x: { new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }): any[]; new (x: { new <T extends Derived2>(a: T): T; new <T extends Base>(a: T): T; }): any[]; }'.
   Types of parameters 'x' and 'x' are incompatible.
     Type '{ new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }' is not assignable to type '(a: any) => any'.
       Type '{ new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }' provides no match for the signature '(a: any): any'
+tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts(82,9): error TS2322: Type '{ new (x: { new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }): any[]; new (x: { new <T extends Derived2>(a: T): T; new <T extends Base>(a: T): T; }): any[]; }' is not assignable to type 'new <T>(x: (a: T) => T) => any[]'.
+  Types of parameters 'x' and 'x' are incompatible.
+    Type '(a: any) => any' is not assignable to type '{ new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }'.
+      Type '(a: any) => any' provides no match for the signature 'new <T extends Derived>(a: T): T'
 
 
 ==== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithConstructSignatures4.ts (6 errors) ====
@@ -86,7 +86,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
             ~~
 !!! error TS2322: Type 'new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U' is not assignable to type 'new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived'.
 !!! error TS2322:   Types of parameters 'y' and 'y' are incompatible.
-!!! error TS2322:     Type '(arg2: { foo: number; }) => any' is not assignable to type '(arg2: Base) => Derived'.
+!!! error TS2322:     Type '(arg2: Base) => Derived' is not assignable to type '(arg2: { foo: number; }) => any'.
 !!! error TS2322:       Types of parameters 'arg2' and 'arg2' are incompatible.
 !!! error TS2322:         Type '{ foo: number; }' is not assignable to type 'Base'.
 !!! error TS2322:           Types of property 'foo' are incompatible.
@@ -95,7 +95,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
             ~~
 !!! error TS2322: Type 'new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived' is not assignable to type 'new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U'.
 !!! error TS2322:   Types of parameters 'y' and 'y' are incompatible.
-!!! error TS2322:     Type '(arg2: Base) => Derived' is not assignable to type '(arg2: { foo: number; }) => any'.
+!!! error TS2322:     Type '(arg2: { foo: number; }) => any' is not assignable to type '(arg2: Base) => Derived'.
 !!! error TS2322:       Types of parameters 'arg2' and 'arg2' are incompatible.
 !!! error TS2322:         Type 'Base' is not assignable to type '{ foo: number; }'.
 !!! error TS2322:           Types of property 'foo' are incompatible.
@@ -127,28 +127,28 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
             ~~~
 !!! error TS2322: Type 'new <T>(x: (a: T) => T) => T[]' is not assignable to type '{ new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:     Type '(a: any) => any' is not assignable to type '{ new (a: number): number; new (a?: number): number; }'.
-!!! error TS2322:       Type '(a: any) => any' provides no match for the signature 'new (a: number): number'
+!!! error TS2322:     Type '{ new (a: number): number; new (a?: number): number; }' is not assignable to type '(a: any) => any'.
+!!! error TS2322:       Type '{ new (a: number): number; new (a?: number): number; }' provides no match for the signature '(a: any): any'
             b16 = a16; // error
             ~~~
 !!! error TS2322: Type '{ new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }' is not assignable to type 'new <T>(x: (a: T) => T) => T[]'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:     Type '{ new (a: number): number; new (a?: number): number; }' is not assignable to type '(a: any) => any'.
-!!! error TS2322:       Type '{ new (a: number): number; new (a?: number): number; }' provides no match for the signature '(a: any): any'
+!!! error TS2322:     Type '(a: any) => any' is not assignable to type '{ new (a: number): number; new (a?: number): number; }'.
+!!! error TS2322:       Type '(a: any) => any' provides no match for the signature 'new (a: number): number'
     
             var b17: new <T>(x: (a: T) => T) => any[];
             a17 = b17; // error
             ~~~
 !!! error TS2322: Type 'new <T>(x: (a: T) => T) => any[]' is not assignable to type '{ new (x: { new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }): any[]; new (x: { new <T extends Derived2>(a: T): T; new <T extends Base>(a: T): T; }): any[]; }'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:     Type '(a: any) => any' is not assignable to type '{ new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }'.
-!!! error TS2322:       Type '(a: any) => any' provides no match for the signature 'new <T extends Derived>(a: T): T'
+!!! error TS2322:     Type '{ new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }' is not assignable to type '(a: any) => any'.
+!!! error TS2322:       Type '{ new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }' provides no match for the signature '(a: any): any'
             b17 = a17; // error
             ~~~
 !!! error TS2322: Type '{ new (x: { new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }): any[]; new (x: { new <T extends Derived2>(a: T): T; new <T extends Base>(a: T): T; }): any[]; }' is not assignable to type 'new <T>(x: (a: T) => T) => any[]'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:     Type '{ new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }' is not assignable to type '(a: any) => any'.
-!!! error TS2322:       Type '{ new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }' provides no match for the signature '(a: any): any'
+!!! error TS2322:     Type '(a: any) => any' is not assignable to type '{ new <T extends Derived>(a: T): T; new <T extends Base>(a: T): T; }'.
+!!! error TS2322:       Type '(a: any) => any' provides no match for the signature 'new <T extends Derived>(a: T): T'
         }
     
         module WithGenericSignaturesInBaseType {
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures5.symbols b/tests/baselines/reference/assignmentCompatWithConstructSignatures5.symbols
index d2016b247b8..6fa6cc53bcd 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures5.symbols
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures5.symbols
@@ -3,22 +3,22 @@
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures5.ts, 0, 0))
->foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures5.ts, 2, 12))
+>foo : Symbol(Base.foo, Decl(assignmentCompatWithConstructSignatures5.ts, 2, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures5.ts, 2, 27))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures5.ts, 0, 0))
->bar : Symbol(bar, Decl(assignmentCompatWithConstructSignatures5.ts, 3, 28))
+>bar : Symbol(Derived.bar, Decl(assignmentCompatWithConstructSignatures5.ts, 3, 28))
 
 class Derived2 extends Derived { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithConstructSignatures5.ts, 3, 43))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures5.ts, 2, 27))
->baz : Symbol(baz, Decl(assignmentCompatWithConstructSignatures5.ts, 4, 32))
+>baz : Symbol(Derived2.baz, Decl(assignmentCompatWithConstructSignatures5.ts, 4, 32))
 
 class OtherDerived extends Base { bing: string; }
 >OtherDerived : Symbol(OtherDerived, Decl(assignmentCompatWithConstructSignatures5.ts, 4, 47))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures5.ts, 0, 0))
->bing : Symbol(bing, Decl(assignmentCompatWithConstructSignatures5.ts, 5, 33))
+>bing : Symbol(OtherDerived.bing, Decl(assignmentCompatWithConstructSignatures5.ts, 5, 33))
 
 var a: new <T>(x: T) => T[];
 >a : Symbol(a, Decl(assignmentCompatWithConstructSignatures5.ts, 7, 3))
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures6.symbols b/tests/baselines/reference/assignmentCompatWithConstructSignatures6.symbols
index 1850406bfa8..8db5ad09d1d 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures6.symbols
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures6.symbols
@@ -3,47 +3,47 @@
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures6.ts, 0, 0))
->foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures6.ts, 2, 12))
+>foo : Symbol(Base.foo, Decl(assignmentCompatWithConstructSignatures6.ts, 2, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures6.ts, 2, 27))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures6.ts, 0, 0))
->bar : Symbol(bar, Decl(assignmentCompatWithConstructSignatures6.ts, 3, 28))
+>bar : Symbol(Derived.bar, Decl(assignmentCompatWithConstructSignatures6.ts, 3, 28))
 
 class Derived2 extends Derived { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(assignmentCompatWithConstructSignatures6.ts, 3, 43))
 >Derived : Symbol(Derived, Decl(assignmentCompatWithConstructSignatures6.ts, 2, 27))
->baz : Symbol(baz, Decl(assignmentCompatWithConstructSignatures6.ts, 4, 32))
+>baz : Symbol(Derived2.baz, Decl(assignmentCompatWithConstructSignatures6.ts, 4, 32))
 
 class OtherDerived extends Base { bing: string; }
 >OtherDerived : Symbol(OtherDerived, Decl(assignmentCompatWithConstructSignatures6.ts, 4, 47))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures6.ts, 0, 0))
->bing : Symbol(bing, Decl(assignmentCompatWithConstructSignatures6.ts, 5, 33))
+>bing : Symbol(OtherDerived.bing, Decl(assignmentCompatWithConstructSignatures6.ts, 5, 33))
 
 interface A {
 >A : Symbol(A, Decl(assignmentCompatWithConstructSignatures6.ts, 5, 49))
 
     a: new <T>(x: T) => T[];
->a : Symbol(a, Decl(assignmentCompatWithConstructSignatures6.ts, 7, 13))
+>a : Symbol(A.a, Decl(assignmentCompatWithConstructSignatures6.ts, 7, 13))
 >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 8, 12))
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 8, 15))
 >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 8, 12))
 >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 8, 12))
 
     a2: new <T>(x: T) => string[];
->a2 : Symbol(a2, Decl(assignmentCompatWithConstructSignatures6.ts, 8, 28))
+>a2 : Symbol(A.a2, Decl(assignmentCompatWithConstructSignatures6.ts, 8, 28))
 >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 9, 13))
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 9, 16))
 >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 9, 13))
 
     a3: new <T>(x: T) => void;
->a3 : Symbol(a3, Decl(assignmentCompatWithConstructSignatures6.ts, 9, 34))
+>a3 : Symbol(A.a3, Decl(assignmentCompatWithConstructSignatures6.ts, 9, 34))
 >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 10, 13))
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 10, 16))
 >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 10, 13))
 
     a4: new <T, U>(x: T, y: U) => string;
->a4 : Symbol(a4, Decl(assignmentCompatWithConstructSignatures6.ts, 10, 30))
+>a4 : Symbol(A.a4, Decl(assignmentCompatWithConstructSignatures6.ts, 10, 30))
 >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 11, 13))
 >U : Symbol(U, Decl(assignmentCompatWithConstructSignatures6.ts, 11, 15))
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 11, 19))
@@ -52,7 +52,7 @@ interface A {
 >U : Symbol(U, Decl(assignmentCompatWithConstructSignatures6.ts, 11, 15))
 
     a5: new <T, U>(x: (arg: T) => U) => T;
->a5 : Symbol(a5, Decl(assignmentCompatWithConstructSignatures6.ts, 11, 41))
+>a5 : Symbol(A.a5, Decl(assignmentCompatWithConstructSignatures6.ts, 11, 41))
 >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 12, 13))
 >U : Symbol(U, Decl(assignmentCompatWithConstructSignatures6.ts, 12, 15))
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 12, 19))
@@ -62,7 +62,7 @@ interface A {
 >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 12, 13))
 
     a6: new <T extends Base>(x: (arg: T) => Derived) => T;
->a6 : Symbol(a6, Decl(assignmentCompatWithConstructSignatures6.ts, 12, 42))
+>a6 : Symbol(A.a6, Decl(assignmentCompatWithConstructSignatures6.ts, 12, 42))
 >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 13, 13))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures6.ts, 0, 0))
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 13, 29))
@@ -72,7 +72,7 @@ interface A {
 >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 13, 13))
 
     a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
->a11 : Symbol(a11, Decl(assignmentCompatWithConstructSignatures6.ts, 13, 58))
+>a11 : Symbol(A.a11, Decl(assignmentCompatWithConstructSignatures6.ts, 13, 58))
 >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 14, 14))
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 14, 17))
 >foo : Symbol(foo, Decl(assignmentCompatWithConstructSignatures6.ts, 14, 21))
@@ -85,7 +85,7 @@ interface A {
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures6.ts, 0, 0))
 
     a15: new <T>(x: { a: T; b: T }) => T[];
->a15 : Symbol(a15, Decl(assignmentCompatWithConstructSignatures6.ts, 14, 63))
+>a15 : Symbol(A.a15, Decl(assignmentCompatWithConstructSignatures6.ts, 14, 63))
 >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 15, 14))
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 15, 17))
 >a : Symbol(a, Decl(assignmentCompatWithConstructSignatures6.ts, 15, 21))
@@ -95,7 +95,7 @@ interface A {
 >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 15, 14))
 
     a16: new <T extends Base>(x: { a: T; b: T }) => T[];
->a16 : Symbol(a16, Decl(assignmentCompatWithConstructSignatures6.ts, 15, 43))
+>a16 : Symbol(A.a16, Decl(assignmentCompatWithConstructSignatures6.ts, 15, 43))
 >T : Symbol(T, Decl(assignmentCompatWithConstructSignatures6.ts, 16, 14))
 >Base : Symbol(Base, Decl(assignmentCompatWithConstructSignatures6.ts, 0, 0))
 >x : Symbol(x, Decl(assignmentCompatWithConstructSignatures6.ts, 16, 30))
diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.symbols b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.symbols
index bcea8fbbb27..86531a95506 100644
--- a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.symbols
+++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures4.symbols
@@ -6,7 +6,7 @@ interface I2<T> {
 >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignatures4.ts, 2, 13))
 
     p: T
->p : Symbol(p, Decl(assignmentCompatWithGenericCallSignatures4.ts, 2, 17))
+>p : Symbol(I2.p, Decl(assignmentCompatWithGenericCallSignatures4.ts, 2, 17))
 >T : Symbol(T, Decl(assignmentCompatWithGenericCallSignatures4.ts, 2, 13))
 }
 
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers.symbols b/tests/baselines/reference/assignmentCompatWithObjectMembers.symbols
index 181c4db641a..9b84883324d 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers.symbols
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers.symbols
@@ -7,11 +7,11 @@ module SimpleTypes {
 
     class S { foo: string; }
 >S : Symbol(S, Decl(assignmentCompatWithObjectMembers.ts, 3, 20))
->foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers.ts, 4, 13))
+>foo : Symbol(S.foo, Decl(assignmentCompatWithObjectMembers.ts, 4, 13))
 
     class T { foo: string; }
 >T : Symbol(T, Decl(assignmentCompatWithObjectMembers.ts, 4, 28))
->foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers.ts, 5, 13))
+>foo : Symbol(T.foo, Decl(assignmentCompatWithObjectMembers.ts, 5, 13))
 
     var s: S;
 >s : Symbol(s, Decl(assignmentCompatWithObjectMembers.ts, 6, 7))
@@ -23,11 +23,11 @@ module SimpleTypes {
 
     interface S2 { foo: string; }
 >S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembers.ts, 7, 13))
->foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers.ts, 9, 18))
+>foo : Symbol(S2.foo, Decl(assignmentCompatWithObjectMembers.ts, 9, 18))
 
     interface T2 { foo: string; }
 >T2 : Symbol(T2, Decl(assignmentCompatWithObjectMembers.ts, 9, 33))
->foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers.ts, 10, 18))
+>foo : Symbol(T2.foo, Decl(assignmentCompatWithObjectMembers.ts, 10, 18))
 
     var s2: S2;
 >s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers.ts, 11, 7))
@@ -135,12 +135,12 @@ module ObjectTypes {
 
     class S { foo: S; }
 >S : Symbol(S, Decl(assignmentCompatWithObjectMembers.ts, 44, 20))
->foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers.ts, 45, 13))
+>foo : Symbol(S.foo, Decl(assignmentCompatWithObjectMembers.ts, 45, 13))
 >S : Symbol(S, Decl(assignmentCompatWithObjectMembers.ts, 44, 20))
 
     class T { foo: T; }
 >T : Symbol(T, Decl(assignmentCompatWithObjectMembers.ts, 45, 23))
->foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers.ts, 46, 13))
+>foo : Symbol(T.foo, Decl(assignmentCompatWithObjectMembers.ts, 46, 13))
 >T : Symbol(T, Decl(assignmentCompatWithObjectMembers.ts, 45, 23))
 
     var s: S;
@@ -153,12 +153,12 @@ module ObjectTypes {
 
     interface S2 { foo: S2; }
 >S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembers.ts, 48, 13))
->foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers.ts, 50, 18))
+>foo : Symbol(S2.foo, Decl(assignmentCompatWithObjectMembers.ts, 50, 18))
 >S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembers.ts, 48, 13))
 
     interface T2 { foo: T2; }
 >T2 : Symbol(T2, Decl(assignmentCompatWithObjectMembers.ts, 50, 29))
->foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers.ts, 51, 18))
+>foo : Symbol(T2.foo, Decl(assignmentCompatWithObjectMembers.ts, 51, 18))
 >T2 : Symbol(T2, Decl(assignmentCompatWithObjectMembers.ts, 50, 29))
 
     var s2: S2;
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers2.symbols b/tests/baselines/reference/assignmentCompatWithObjectMembers2.symbols
index ab3301c5e93..e0ac6899eaf 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers2.symbols
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers2.symbols
@@ -4,11 +4,11 @@
 
 class S { foo: string; }
 >S : Symbol(S, Decl(assignmentCompatWithObjectMembers2.ts, 0, 0))
->foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers2.ts, 3, 9))
+>foo : Symbol(S.foo, Decl(assignmentCompatWithObjectMembers2.ts, 3, 9))
 
 class T { foo: string; }
 >T : Symbol(T, Decl(assignmentCompatWithObjectMembers2.ts, 3, 24))
->foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers2.ts, 4, 9))
+>foo : Symbol(T.foo, Decl(assignmentCompatWithObjectMembers2.ts, 4, 9))
 
 var s: S;
 >s : Symbol(s, Decl(assignmentCompatWithObjectMembers2.ts, 5, 3))
@@ -20,13 +20,13 @@ var t: T;
 
 interface S2 { foo: string; bar?: string }
 >S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembers2.ts, 6, 9))
->foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers2.ts, 8, 14))
->bar : Symbol(bar, Decl(assignmentCompatWithObjectMembers2.ts, 8, 27))
+>foo : Symbol(S2.foo, Decl(assignmentCompatWithObjectMembers2.ts, 8, 14))
+>bar : Symbol(S2.bar, Decl(assignmentCompatWithObjectMembers2.ts, 8, 27))
 
 interface T2 { foo: string; baz?: string }
 >T2 : Symbol(T2, Decl(assignmentCompatWithObjectMembers2.ts, 8, 42))
->foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers2.ts, 9, 14))
->baz : Symbol(baz, Decl(assignmentCompatWithObjectMembers2.ts, 9, 27))
+>foo : Symbol(T2.foo, Decl(assignmentCompatWithObjectMembers2.ts, 9, 14))
+>baz : Symbol(T2.baz, Decl(assignmentCompatWithObjectMembers2.ts, 9, 27))
 
 var s2: S2;
 >s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers2.ts, 10, 3))
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers3.symbols b/tests/baselines/reference/assignmentCompatWithObjectMembers3.symbols
index 861d38530bb..72151ce6048 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers3.symbols
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers3.symbols
@@ -5,12 +5,12 @@
 class S implements S2 { foo: string; }
 >S : Symbol(S, Decl(assignmentCompatWithObjectMembers3.ts, 0, 0))
 >S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembers3.ts, 6, 9))
->foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers3.ts, 3, 23))
+>foo : Symbol(S.foo, Decl(assignmentCompatWithObjectMembers3.ts, 3, 23))
 
 class T implements T2 { foo: string; }
 >T : Symbol(T, Decl(assignmentCompatWithObjectMembers3.ts, 3, 38))
 >T2 : Symbol(T2, Decl(assignmentCompatWithObjectMembers3.ts, 8, 42))
->foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers3.ts, 4, 23))
+>foo : Symbol(T.foo, Decl(assignmentCompatWithObjectMembers3.ts, 4, 23))
 
 var s: S;
 >s : Symbol(s, Decl(assignmentCompatWithObjectMembers3.ts, 5, 3))
@@ -22,13 +22,13 @@ var t: T;
 
 interface S2 { foo: string; bar?: string }
 >S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembers3.ts, 6, 9))
->foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers3.ts, 8, 14))
->bar : Symbol(bar, Decl(assignmentCompatWithObjectMembers3.ts, 8, 27))
+>foo : Symbol(S2.foo, Decl(assignmentCompatWithObjectMembers3.ts, 8, 14))
+>bar : Symbol(S2.bar, Decl(assignmentCompatWithObjectMembers3.ts, 8, 27))
 
 interface T2 { foo: string; baz?: string }
 >T2 : Symbol(T2, Decl(assignmentCompatWithObjectMembers3.ts, 8, 42))
->foo : Symbol(foo, Decl(assignmentCompatWithObjectMembers3.ts, 9, 14))
->baz : Symbol(baz, Decl(assignmentCompatWithObjectMembers3.ts, 9, 27))
+>foo : Symbol(T2.foo, Decl(assignmentCompatWithObjectMembers3.ts, 9, 14))
+>baz : Symbol(T2.baz, Decl(assignmentCompatWithObjectMembers3.ts, 9, 27))
 
 var s2: S2;
 >s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembers3.ts, 10, 3))
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.symbols b/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.symbols
index e01bcee21c0..ce633683339 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.symbols
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.symbols
@@ -18,11 +18,11 @@ var t: T;
 
 interface S2 { 1: string; bar?: string }
 >S2 : Symbol(S2, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 6, 9))
->bar : Symbol(bar, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 8, 25))
+>bar : Symbol(S2.bar, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 8, 25))
 
 interface T2 { 1.0: string; baz?: string }
 >T2 : Symbol(T2, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 8, 40))
->baz : Symbol(baz, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 9, 27))
+>baz : Symbol(T2.baz, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 9, 27))
 
 var s2: S2;
 >s2 : Symbol(s2, Decl(assignmentCompatWithObjectMembersNumericNames.ts, 10, 3))
diff --git a/tests/baselines/reference/assignmentCompatWithOverloads.errors.txt b/tests/baselines/reference/assignmentCompatWithOverloads.errors.txt
index 3bea0c46716..3773229f516 100644
--- a/tests/baselines/reference/assignmentCompatWithOverloads.errors.txt
+++ b/tests/baselines/reference/assignmentCompatWithOverloads.errors.txt
@@ -2,12 +2,12 @@ tests/cases/compiler/assignmentCompatWithOverloads.ts(17,1): error TS2322: Type
   Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/assignmentCompatWithOverloads.ts(19,1): error TS2322: Type '(x: number) => number' is not assignable to type '(s1: string) => number'.
   Types of parameters 'x' and 's1' are incompatible.
-    Type 'number' is not assignable to type 'string'.
+    Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/assignmentCompatWithOverloads.ts(21,1): error TS2322: Type '{ (x: string): string; (x: number): number; }' is not assignable to type '(s1: string) => number'.
   Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/assignmentCompatWithOverloads.ts(30,1): error TS2322: Type 'typeof C' is not assignable to type 'new (x: number) => void'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 
 
 ==== tests/cases/compiler/assignmentCompatWithOverloads.ts (4 errors) ====
@@ -36,7 +36,7 @@ tests/cases/compiler/assignmentCompatWithOverloads.ts(30,1): error TS2322: Type
     ~
 !!! error TS2322: Type '(x: number) => number' is not assignable to type '(s1: string) => number'.
 !!! error TS2322:   Types of parameters 'x' and 's1' are incompatible.
-!!! error TS2322:     Type 'number' is not assignable to type 'string'.
+!!! error TS2322:     Type 'string' is not assignable to type 'number'.
     
     g = f4; // Error
     ~
@@ -54,4 +54,4 @@ tests/cases/compiler/assignmentCompatWithOverloads.ts(30,1): error TS2322: Type
     ~
 !!! error TS2322: Type 'typeof C' is not assignable to type 'new (x: number) => void'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:     Type 'string' is not assignable to type 'number'.
\ No newline at end of file
+!!! error TS2322:     Type 'number' is not assignable to type 'string'.
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatability1.symbols b/tests/baselines/reference/assignmentCompatability1.symbols
index 07d3cf4c029..15da482c203 100644
--- a/tests/baselines/reference/assignmentCompatability1.symbols
+++ b/tests/baselines/reference/assignmentCompatability1.symbols
@@ -6,9 +6,9 @@ module __test1__ {
 >interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability1.ts, 0, 18))
 >T : Symbol(T, Decl(assignmentCompatability1.ts, 1, 52))
 >U : Symbol(U, Decl(assignmentCompatability1.ts, 1, 54))
->one : Symbol(one, Decl(assignmentCompatability1.ts, 1, 58))
+>one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability1.ts, 1, 58))
 >T : Symbol(T, Decl(assignmentCompatability1.ts, 1, 52))
->two : Symbol(two, Decl(assignmentCompatability1.ts, 1, 66))
+>two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability1.ts, 1, 66))
 >U : Symbol(U, Decl(assignmentCompatability1.ts, 1, 54))
 >obj4 : Symbol(obj4, Decl(assignmentCompatability1.ts, 1, 83))
 >interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability1.ts, 0, 18))
diff --git a/tests/baselines/reference/assignmentCompatability2.symbols b/tests/baselines/reference/assignmentCompatability2.symbols
index 1ed6dd3c639..55ed25fb4ad 100644
--- a/tests/baselines/reference/assignmentCompatability2.symbols
+++ b/tests/baselines/reference/assignmentCompatability2.symbols
@@ -6,9 +6,9 @@ module __test1__ {
 >interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability2.ts, 0, 18))
 >T : Symbol(T, Decl(assignmentCompatability2.ts, 1, 52))
 >U : Symbol(U, Decl(assignmentCompatability2.ts, 1, 54))
->one : Symbol(one, Decl(assignmentCompatability2.ts, 1, 58))
+>one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability2.ts, 1, 58))
 >T : Symbol(T, Decl(assignmentCompatability2.ts, 1, 52))
->two : Symbol(two, Decl(assignmentCompatability2.ts, 1, 66))
+>two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability2.ts, 1, 66))
 >U : Symbol(U, Decl(assignmentCompatability2.ts, 1, 54))
 >obj4 : Symbol(obj4, Decl(assignmentCompatability2.ts, 1, 83))
 >interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability2.ts, 0, 18))
diff --git a/tests/baselines/reference/assignmentCompatability3.symbols b/tests/baselines/reference/assignmentCompatability3.symbols
index c31d69e2f12..49fccff55f0 100644
--- a/tests/baselines/reference/assignmentCompatability3.symbols
+++ b/tests/baselines/reference/assignmentCompatability3.symbols
@@ -6,9 +6,9 @@ module __test1__ {
 >interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability3.ts, 0, 18))
 >T : Symbol(T, Decl(assignmentCompatability3.ts, 1, 52))
 >U : Symbol(U, Decl(assignmentCompatability3.ts, 1, 54))
->one : Symbol(one, Decl(assignmentCompatability3.ts, 1, 58))
+>one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability3.ts, 1, 58))
 >T : Symbol(T, Decl(assignmentCompatability3.ts, 1, 52))
->two : Symbol(two, Decl(assignmentCompatability3.ts, 1, 66))
+>two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability3.ts, 1, 66))
 >U : Symbol(U, Decl(assignmentCompatability3.ts, 1, 54))
 >obj4 : Symbol(obj4, Decl(assignmentCompatability3.ts, 1, 83))
 >interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability3.ts, 0, 18))
diff --git a/tests/baselines/reference/assignmentCompatability36.symbols b/tests/baselines/reference/assignmentCompatability36.symbols
index 4b4b7d75a51..09ebfb67ed8 100644
--- a/tests/baselines/reference/assignmentCompatability36.symbols
+++ b/tests/baselines/reference/assignmentCompatability36.symbols
@@ -6,9 +6,9 @@ module __test1__ {
 >interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability36.ts, 0, 18))
 >T : Symbol(T, Decl(assignmentCompatability36.ts, 1, 52))
 >U : Symbol(U, Decl(assignmentCompatability36.ts, 1, 54))
->one : Symbol(one, Decl(assignmentCompatability36.ts, 1, 58))
+>one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability36.ts, 1, 58))
 >T : Symbol(T, Decl(assignmentCompatability36.ts, 1, 52))
->two : Symbol(two, Decl(assignmentCompatability36.ts, 1, 66))
+>two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability36.ts, 1, 66))
 >U : Symbol(U, Decl(assignmentCompatability36.ts, 1, 54))
 >obj4 : Symbol(obj4, Decl(assignmentCompatability36.ts, 1, 83))
 >interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability36.ts, 0, 18))
diff --git a/tests/baselines/reference/assignmentCompatability4.symbols b/tests/baselines/reference/assignmentCompatability4.symbols
index fe5e4a32dee..cac51957fc8 100644
--- a/tests/baselines/reference/assignmentCompatability4.symbols
+++ b/tests/baselines/reference/assignmentCompatability4.symbols
@@ -6,9 +6,9 @@ module __test1__ {
 >interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability4.ts, 0, 18))
 >T : Symbol(T, Decl(assignmentCompatability4.ts, 1, 52))
 >U : Symbol(U, Decl(assignmentCompatability4.ts, 1, 54))
->one : Symbol(one, Decl(assignmentCompatability4.ts, 1, 58))
+>one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability4.ts, 1, 58))
 >T : Symbol(T, Decl(assignmentCompatability4.ts, 1, 52))
->two : Symbol(two, Decl(assignmentCompatability4.ts, 1, 66))
+>two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability4.ts, 1, 66))
 >U : Symbol(U, Decl(assignmentCompatability4.ts, 1, 54))
 >obj4 : Symbol(obj4, Decl(assignmentCompatability4.ts, 1, 83))
 >interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability4.ts, 0, 18))
diff --git a/tests/baselines/reference/assignmentCompatability5.symbols b/tests/baselines/reference/assignmentCompatability5.symbols
index 15885d07892..9cbfd0dbd8b 100644
--- a/tests/baselines/reference/assignmentCompatability5.symbols
+++ b/tests/baselines/reference/assignmentCompatability5.symbols
@@ -6,9 +6,9 @@ module __test1__ {
 >interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability5.ts, 0, 18))
 >T : Symbol(T, Decl(assignmentCompatability5.ts, 1, 52))
 >U : Symbol(U, Decl(assignmentCompatability5.ts, 1, 54))
->one : Symbol(one, Decl(assignmentCompatability5.ts, 1, 58))
+>one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability5.ts, 1, 58))
 >T : Symbol(T, Decl(assignmentCompatability5.ts, 1, 52))
->two : Symbol(two, Decl(assignmentCompatability5.ts, 1, 66))
+>two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability5.ts, 1, 66))
 >U : Symbol(U, Decl(assignmentCompatability5.ts, 1, 54))
 >obj4 : Symbol(obj4, Decl(assignmentCompatability5.ts, 1, 83))
 >interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability5.ts, 0, 18))
@@ -24,7 +24,7 @@ module __test2__ {
     export                   interface interfaceOne<T> { one: T; };                var obj1: interfaceOne<number> = { one: 1 };;
 >interfaceOne : Symbol(interfaceOne, Decl(assignmentCompatability5.ts, 4, 18))
 >T : Symbol(T, Decl(assignmentCompatability5.ts, 5, 52))
->one : Symbol(one, Decl(assignmentCompatability5.ts, 5, 56))
+>one : Symbol(interfaceOne.one, Decl(assignmentCompatability5.ts, 5, 56))
 >T : Symbol(T, Decl(assignmentCompatability5.ts, 5, 52))
 >obj1 : Symbol(obj1, Decl(assignmentCompatability5.ts, 5, 86))
 >interfaceOne : Symbol(interfaceOne, Decl(assignmentCompatability5.ts, 4, 18))
diff --git a/tests/baselines/reference/assignmentCompatability6.symbols b/tests/baselines/reference/assignmentCompatability6.symbols
index 4ddacd5cd8c..713ca092653 100644
--- a/tests/baselines/reference/assignmentCompatability6.symbols
+++ b/tests/baselines/reference/assignmentCompatability6.symbols
@@ -6,9 +6,9 @@ module __test1__ {
 >interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability6.ts, 0, 18))
 >T : Symbol(T, Decl(assignmentCompatability6.ts, 1, 52))
 >U : Symbol(U, Decl(assignmentCompatability6.ts, 1, 54))
->one : Symbol(one, Decl(assignmentCompatability6.ts, 1, 58))
+>one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability6.ts, 1, 58))
 >T : Symbol(T, Decl(assignmentCompatability6.ts, 1, 52))
->two : Symbol(two, Decl(assignmentCompatability6.ts, 1, 66))
+>two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability6.ts, 1, 66))
 >U : Symbol(U, Decl(assignmentCompatability6.ts, 1, 54))
 >obj4 : Symbol(obj4, Decl(assignmentCompatability6.ts, 1, 83))
 >interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability6.ts, 0, 18))
@@ -24,7 +24,7 @@ module __test2__ {
     export          interface interfaceWithOptional<T> { one?: T; };               var obj3: interfaceWithOptional<number> = { };;
 >interfaceWithOptional : Symbol(interfaceWithOptional, Decl(assignmentCompatability6.ts, 4, 18))
 >T : Symbol(T, Decl(assignmentCompatability6.ts, 5, 52))
->one : Symbol(one, Decl(assignmentCompatability6.ts, 5, 56))
+>one : Symbol(interfaceWithOptional.one, Decl(assignmentCompatability6.ts, 5, 56))
 >T : Symbol(T, Decl(assignmentCompatability6.ts, 5, 52))
 >obj3 : Symbol(obj3, Decl(assignmentCompatability6.ts, 5, 86))
 >interfaceWithOptional : Symbol(interfaceWithOptional, Decl(assignmentCompatability6.ts, 4, 18))
diff --git a/tests/baselines/reference/assignmentCompatability7.symbols b/tests/baselines/reference/assignmentCompatability7.symbols
index 32a5be9f87f..ae66ee04584 100644
--- a/tests/baselines/reference/assignmentCompatability7.symbols
+++ b/tests/baselines/reference/assignmentCompatability7.symbols
@@ -6,9 +6,9 @@ module __test1__ {
 >interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability7.ts, 0, 18))
 >T : Symbol(T, Decl(assignmentCompatability7.ts, 1, 52))
 >U : Symbol(U, Decl(assignmentCompatability7.ts, 1, 54))
->one : Symbol(one, Decl(assignmentCompatability7.ts, 1, 58))
+>one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability7.ts, 1, 58))
 >T : Symbol(T, Decl(assignmentCompatability7.ts, 1, 52))
->two : Symbol(two, Decl(assignmentCompatability7.ts, 1, 66))
+>two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability7.ts, 1, 66))
 >U : Symbol(U, Decl(assignmentCompatability7.ts, 1, 54))
 >obj4 : Symbol(obj4, Decl(assignmentCompatability7.ts, 1, 83))
 >interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability7.ts, 0, 18))
@@ -25,9 +25,9 @@ module __test2__ {
 >interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability7.ts, 4, 18))
 >T : Symbol(T, Decl(assignmentCompatability7.ts, 5, 52))
 >U : Symbol(U, Decl(assignmentCompatability7.ts, 5, 54))
->one : Symbol(one, Decl(assignmentCompatability7.ts, 5, 58))
+>one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability7.ts, 5, 58))
 >T : Symbol(T, Decl(assignmentCompatability7.ts, 5, 52))
->two : Symbol(two, Decl(assignmentCompatability7.ts, 5, 66))
+>two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability7.ts, 5, 66))
 >U : Symbol(U, Decl(assignmentCompatability7.ts, 5, 54))
 >obj4 : Symbol(obj4, Decl(assignmentCompatability7.ts, 5, 83))
 >interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability7.ts, 4, 18))
diff --git a/tests/baselines/reference/assignmentCompatability8.symbols b/tests/baselines/reference/assignmentCompatability8.symbols
index ba30e4fee94..78b74f4ba62 100644
--- a/tests/baselines/reference/assignmentCompatability8.symbols
+++ b/tests/baselines/reference/assignmentCompatability8.symbols
@@ -6,9 +6,9 @@ module __test1__ {
 >interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability8.ts, 0, 18))
 >T : Symbol(T, Decl(assignmentCompatability8.ts, 1, 52))
 >U : Symbol(U, Decl(assignmentCompatability8.ts, 1, 54))
->one : Symbol(one, Decl(assignmentCompatability8.ts, 1, 58))
+>one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability8.ts, 1, 58))
 >T : Symbol(T, Decl(assignmentCompatability8.ts, 1, 52))
->two : Symbol(two, Decl(assignmentCompatability8.ts, 1, 66))
+>two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability8.ts, 1, 66))
 >U : Symbol(U, Decl(assignmentCompatability8.ts, 1, 54))
 >obj4 : Symbol(obj4, Decl(assignmentCompatability8.ts, 1, 83))
 >interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability8.ts, 0, 18))
@@ -24,7 +24,7 @@ module __test2__ {
     export            class classWithPublic<T> { constructor(public one: T) {} }                        var x1 = new classWithPublic(1);;
 >classWithPublic : Symbol(classWithPublic, Decl(assignmentCompatability8.ts, 4, 18))
 >T : Symbol(T, Decl(assignmentCompatability8.ts, 5, 44))
->one : Symbol(one, Decl(assignmentCompatability8.ts, 5, 61))
+>one : Symbol(classWithPublic.one, Decl(assignmentCompatability8.ts, 5, 61))
 >T : Symbol(T, Decl(assignmentCompatability8.ts, 5, 44))
 >x1 : Symbol(x1, Decl(assignmentCompatability8.ts, 5, 107))
 >classWithPublic : Symbol(classWithPublic, Decl(assignmentCompatability8.ts, 4, 18))
diff --git a/tests/baselines/reference/assignmentCompatability9.symbols b/tests/baselines/reference/assignmentCompatability9.symbols
index 7c49da7fea2..3799e8beed0 100644
--- a/tests/baselines/reference/assignmentCompatability9.symbols
+++ b/tests/baselines/reference/assignmentCompatability9.symbols
@@ -6,9 +6,9 @@ module __test1__ {
 >interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability9.ts, 0, 18))
 >T : Symbol(T, Decl(assignmentCompatability9.ts, 1, 52))
 >U : Symbol(U, Decl(assignmentCompatability9.ts, 1, 54))
->one : Symbol(one, Decl(assignmentCompatability9.ts, 1, 58))
+>one : Symbol(interfaceWithPublicAndOptional.one, Decl(assignmentCompatability9.ts, 1, 58))
 >T : Symbol(T, Decl(assignmentCompatability9.ts, 1, 52))
->two : Symbol(two, Decl(assignmentCompatability9.ts, 1, 66))
+>two : Symbol(interfaceWithPublicAndOptional.two, Decl(assignmentCompatability9.ts, 1, 66))
 >U : Symbol(U, Decl(assignmentCompatability9.ts, 1, 54))
 >obj4 : Symbol(obj4, Decl(assignmentCompatability9.ts, 1, 83))
 >interfaceWithPublicAndOptional : Symbol(interfaceWithPublicAndOptional, Decl(assignmentCompatability9.ts, 0, 18))
@@ -24,7 +24,7 @@ module __test2__ {
     export          class classWithOptional<T> { constructor(public one?: T) {} }                       var x3 = new classWithOptional<number>();;
 >classWithOptional : Symbol(classWithOptional, Decl(assignmentCompatability9.ts, 4, 18))
 >T : Symbol(T, Decl(assignmentCompatability9.ts, 5, 44))
->one : Symbol(one, Decl(assignmentCompatability9.ts, 5, 61))
+>one : Symbol(classWithOptional.one, Decl(assignmentCompatability9.ts, 5, 61))
 >T : Symbol(T, Decl(assignmentCompatability9.ts, 5, 44))
 >x3 : Symbol(x3, Decl(assignmentCompatability9.ts, 5, 107))
 >classWithOptional : Symbol(classWithOptional, Decl(assignmentCompatability9.ts, 4, 18))
diff --git a/tests/baselines/reference/assignmentLHSIsValue.js b/tests/baselines/reference/assignmentLHSIsValue.js
index 8a3b4b35d0b..ecc1cded2cc 100644
--- a/tests/baselines/reference/assignmentLHSIsValue.js
+++ b/tests/baselines/reference/assignmentLHSIsValue.js
@@ -113,7 +113,7 @@ false = value;
 }
 value;
 // array literals
-'' = value[0], '' = value[1];
+"" = value[0], "" = value[1];
 // super
 var Derived = (function (_super) {
     __extends(Derived, _super);
diff --git a/tests/baselines/reference/assignmentNonObjectTypeConstraints.symbols b/tests/baselines/reference/assignmentNonObjectTypeConstraints.symbols
index d8bff5df5f2..52596124e42 100644
--- a/tests/baselines/reference/assignmentNonObjectTypeConstraints.symbols
+++ b/tests/baselines/reference/assignmentNonObjectTypeConstraints.symbols
@@ -27,11 +27,11 @@ foo(E.A);
 
 class A { a }
 >A : Symbol(A, Decl(assignmentNonObjectTypeConstraints.ts, 7, 9))
->a : Symbol(a, Decl(assignmentNonObjectTypeConstraints.ts, 9, 9))
+>a : Symbol(A.a, Decl(assignmentNonObjectTypeConstraints.ts, 9, 9))
 
 class B { b }
 >B : Symbol(B, Decl(assignmentNonObjectTypeConstraints.ts, 9, 13))
->b : Symbol(b, Decl(assignmentNonObjectTypeConstraints.ts, 10, 9))
+>b : Symbol(B.b, Decl(assignmentNonObjectTypeConstraints.ts, 10, 9))
 
 function bar<T extends A | B>(x: T) {
 >bar : Symbol(bar, Decl(assignmentNonObjectTypeConstraints.ts, 10, 13))
diff --git a/tests/baselines/reference/assignmentToObjectAndFunction.errors.txt b/tests/baselines/reference/assignmentToObjectAndFunction.errors.txt
index 2e85ee101f5..454ac41b5b8 100644
--- a/tests/baselines/reference/assignmentToObjectAndFunction.errors.txt
+++ b/tests/baselines/reference/assignmentToObjectAndFunction.errors.txt
@@ -5,7 +5,7 @@ tests/cases/compiler/assignmentToObjectAndFunction.ts(8,5): error TS2322: Type '
   Property 'apply' is missing in type '{}'.
 tests/cases/compiler/assignmentToObjectAndFunction.ts(29,5): error TS2322: Type 'typeof bad' is not assignable to type 'Function'.
   Types of property 'apply' are incompatible.
-    Type 'number' is not assignable to type '(thisArg: any, argArray?: any) => any'.
+    Type 'number' is not assignable to type '{ <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }'.
 
 
 ==== tests/cases/compiler/assignmentToObjectAndFunction.ts (3 errors) ====
@@ -48,4 +48,4 @@ tests/cases/compiler/assignmentToObjectAndFunction.ts(29,5): error TS2322: Type
         ~~~~~~~~~~
 !!! error TS2322: Type 'typeof bad' is not assignable to type 'Function'.
 !!! error TS2322:   Types of property 'apply' are incompatible.
-!!! error TS2322:     Type 'number' is not assignable to type '(thisArg: any, argArray?: any) => any'.
\ No newline at end of file
+!!! error TS2322:     Type 'number' is not assignable to type '{ <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }'.
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncAliasReturnType_es6.symbols b/tests/baselines/reference/asyncAliasReturnType_es6.symbols
index 4d6db6a1ef4..61de47e4092 100644
--- a/tests/baselines/reference/asyncAliasReturnType_es6.symbols
+++ b/tests/baselines/reference/asyncAliasReturnType_es6.symbols
@@ -2,7 +2,7 @@
 type PromiseAlias<T> = Promise<T>;
 >PromiseAlias : Symbol(PromiseAlias, Decl(asyncAliasReturnType_es6.ts, 0, 0))
 >T : Symbol(T, Decl(asyncAliasReturnType_es6.ts, 0, 18))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 >T : Symbol(T, Decl(asyncAliasReturnType_es6.ts, 0, 18))
 
 async function f(): PromiseAlias<void> {
diff --git a/tests/baselines/reference/asyncArrowFunction1_es6.symbols b/tests/baselines/reference/asyncArrowFunction1_es6.symbols
index a8a5aef325a..a2f62f82990 100644
--- a/tests/baselines/reference/asyncArrowFunction1_es6.symbols
+++ b/tests/baselines/reference/asyncArrowFunction1_es6.symbols
@@ -2,6 +2,6 @@
 
 var foo = async (): Promise<void> => {
 >foo : Symbol(foo, Decl(asyncArrowFunction1_es6.ts, 1, 3))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 
 };
diff --git a/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es6.symbols b/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es6.symbols
index 2f516d7d758..06999513192 100644
--- a/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es6.symbols
+++ b/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es6.symbols
@@ -3,16 +3,16 @@ class C {
 >C : Symbol(C, Decl(asyncArrowFunctionCapturesArguments_es6.ts, 0, 0))
 
    method() {
->method : Symbol(method, Decl(asyncArrowFunctionCapturesArguments_es6.ts, 0, 9))
+>method : Symbol(C.method, Decl(asyncArrowFunctionCapturesArguments_es6.ts, 0, 9))
 
       function other() {}
 >other : Symbol(other, Decl(asyncArrowFunctionCapturesArguments_es6.ts, 1, 13))
 
       var fn = async () => await other.apply(this, arguments);      
 >fn : Symbol(fn, Decl(asyncArrowFunctionCapturesArguments_es6.ts, 3, 9))
->other.apply : Symbol(Function.apply, Decl(lib.d.ts, --, --))
+>other.apply : Symbol(Function.apply, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >other : Symbol(other, Decl(asyncArrowFunctionCapturesArguments_es6.ts, 1, 13))
->apply : Symbol(Function.apply, Decl(lib.d.ts, --, --))
+>apply : Symbol(Function.apply, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >this : Symbol(C, Decl(asyncArrowFunctionCapturesArguments_es6.ts, 0, 0))
 >arguments : Symbol(arguments)
    }
diff --git a/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es6.types b/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es6.types
index 76853858c5c..18a08ffface 100644
--- a/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es6.types
+++ b/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es6.types
@@ -9,13 +9,13 @@ class C {
 >other : () => void
 
       var fn = async () => await other.apply(this, arguments);      
->fn : () => Promise<any>
->async () => await other.apply(this, arguments) : () => Promise<any>
->await other.apply(this, arguments) : any
->other.apply(this, arguments) : any
->other.apply : (thisArg: any, argArray?: any) => any
+>fn : () => Promise<void>
+>async () => await other.apply(this, arguments) : () => Promise<void>
+>await other.apply(this, arguments) : void
+>other.apply(this, arguments) : void
+>other.apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
 >other : () => void
->apply : (thisArg: any, argArray?: any) => any
+>apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
 >this : this
 >arguments : IArguments
    }
diff --git a/tests/baselines/reference/asyncArrowFunctionCapturesThis_es6.symbols b/tests/baselines/reference/asyncArrowFunctionCapturesThis_es6.symbols
index ae516bb7fe3..17293752672 100644
--- a/tests/baselines/reference/asyncArrowFunctionCapturesThis_es6.symbols
+++ b/tests/baselines/reference/asyncArrowFunctionCapturesThis_es6.symbols
@@ -3,7 +3,7 @@ class C {
 >C : Symbol(C, Decl(asyncArrowFunctionCapturesThis_es6.ts, 0, 0))
 
    method() {
->method : Symbol(method, Decl(asyncArrowFunctionCapturesThis_es6.ts, 0, 9))
+>method : Symbol(C.method, Decl(asyncArrowFunctionCapturesThis_es6.ts, 0, 9))
 
       var fn = async () => await this;      
 >fn : Symbol(fn, Decl(asyncArrowFunctionCapturesThis_es6.ts, 2, 9))
diff --git a/tests/baselines/reference/asyncAwait_es6.symbols b/tests/baselines/reference/asyncAwait_es6.symbols
index 3c668b15b36..26295e72f78 100644
--- a/tests/baselines/reference/asyncAwait_es6.symbols
+++ b/tests/baselines/reference/asyncAwait_es6.symbols
@@ -2,16 +2,16 @@
 type MyPromise<T> = Promise<T>;
 >MyPromise : Symbol(MyPromise, Decl(asyncAwait_es6.ts, 0, 0), Decl(asyncAwait_es6.ts, 1, 11))
 >T : Symbol(T, Decl(asyncAwait_es6.ts, 0, 15))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 >T : Symbol(T, Decl(asyncAwait_es6.ts, 0, 15))
 
 declare var MyPromise: typeof Promise;
 >MyPromise : Symbol(MyPromise, Decl(asyncAwait_es6.ts, 0, 0), Decl(asyncAwait_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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 var p: Promise<number>;
 >p : Symbol(p, Decl(asyncAwait_es6.ts, 2, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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 var mp: MyPromise<number>;
 >mp : Symbol(mp, Decl(asyncAwait_es6.ts, 3, 11))
@@ -22,7 +22,7 @@ async function f0() { }
 
 async function f1(): Promise<void> { }
 >f1 : Symbol(f1, Decl(asyncAwait_es6.ts, 5, 23))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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 f3(): MyPromise<void> { }
 >f3 : Symbol(f3, Decl(asyncAwait_es6.ts, 6, 38))
@@ -33,7 +33,7 @@ let f4 = async function() { }
 
 let f5 = async function(): Promise<void> { }
 >f5 : Symbol(f5, Decl(asyncAwait_es6.ts, 10, 3))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 
 let f6 = async function(): MyPromise<void> { }
 >f6 : Symbol(f6, Decl(asyncAwait_es6.ts, 11, 3))
@@ -44,7 +44,7 @@ let f7 = async () => { };
 
 let f8 = async (): Promise<void> => { };
 >f8 : Symbol(f8, Decl(asyncAwait_es6.ts, 14, 3))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 
 let f9 = async (): MyPromise<void> => { }; 
 >f9 : Symbol(f9, Decl(asyncAwait_es6.ts, 15, 3))
@@ -60,7 +60,7 @@ let f11 = async () => mp;
 
 let f12 = async (): Promise<number> => mp;
 >f12 : Symbol(f12, Decl(asyncAwait_es6.ts, 18, 3))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 >mp : Symbol(mp, Decl(asyncAwait_es6.ts, 3, 11))
 
 let f13 = async (): MyPromise<number> => p;
@@ -76,7 +76,7 @@ let o = {
 
 	async m2(): Promise<void> { },
 >m2 : Symbol(m2, Decl(asyncAwait_es6.ts, 22, 16))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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 m3(): MyPromise<void> { }
 >m3 : Symbol(m3, Decl(asyncAwait_es6.ts, 23, 31))
@@ -88,14 +88,14 @@ class C {
 >C : Symbol(C, Decl(asyncAwait_es6.ts, 25, 2))
 
 	async m1() { }
->m1 : Symbol(m1, Decl(asyncAwait_es6.ts, 27, 9))
+>m1 : Symbol(C.m1, Decl(asyncAwait_es6.ts, 27, 9))
 
 	async m2(): Promise<void> { }
->m2 : Symbol(m2, Decl(asyncAwait_es6.ts, 28, 15))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>m2 : Symbol(C.m2, Decl(asyncAwait_es6.ts, 28, 15))
+>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 m3(): MyPromise<void> { }
->m3 : Symbol(m3, Decl(asyncAwait_es6.ts, 29, 30))
+>m3 : Symbol(C.m3, Decl(asyncAwait_es6.ts, 29, 30))
 >MyPromise : Symbol(MyPromise, Decl(asyncAwait_es6.ts, 0, 0), Decl(asyncAwait_es6.ts, 1, 11))
 
 	static async m4() { }
@@ -103,7 +103,7 @@ class C {
 
 	static async m5(): Promise<void> { }
 >m5 : Symbol(C.m5, Decl(asyncAwait_es6.ts, 31, 22))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 
 	static async m6(): MyPromise<void> { }
 >m6 : Symbol(C.m6, Decl(asyncAwait_es6.ts, 32, 37))
diff --git a/tests/baselines/reference/asyncFunctionDeclaration11_es6.symbols b/tests/baselines/reference/asyncFunctionDeclaration11_es6.symbols
index f1946aa712f..c9288f42763 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration11_es6.symbols
+++ b/tests/baselines/reference/asyncFunctionDeclaration11_es6.symbols
@@ -1,5 +1,5 @@
 === tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration11_es6.ts ===
 async function await(): Promise<void> {
 >await : Symbol(await, Decl(asyncFunctionDeclaration11_es6.ts, 0, 0))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration14_es6.symbols b/tests/baselines/reference/asyncFunctionDeclaration14_es6.symbols
index 34623ded262..d036632ff86 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration14_es6.symbols
+++ b/tests/baselines/reference/asyncFunctionDeclaration14_es6.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration14_es6.ts ===
 async function foo(): Promise<void> {
 >foo : Symbol(foo, Decl(asyncFunctionDeclaration14_es6.ts, 0, 0))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 
   return;
 }
diff --git a/tests/baselines/reference/asyncFunctionDeclaration1_es6.symbols b/tests/baselines/reference/asyncFunctionDeclaration1_es6.symbols
index b1721789f5c..019d2db4f07 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration1_es6.symbols
+++ b/tests/baselines/reference/asyncFunctionDeclaration1_es6.symbols
@@ -1,5 +1,5 @@
 === tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration1_es6.ts ===
 async function foo(): Promise<void> {
 >foo : Symbol(foo, Decl(asyncFunctionDeclaration1_es6.ts, 0, 0))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 }
diff --git a/tests/baselines/reference/asyncMethodWithSuper_es6.symbols b/tests/baselines/reference/asyncMethodWithSuper_es6.symbols
index 37937a061a8..268ad90f203 100644
--- a/tests/baselines/reference/asyncMethodWithSuper_es6.symbols
+++ b/tests/baselines/reference/asyncMethodWithSuper_es6.symbols
@@ -3,7 +3,7 @@ class A {
 >A : Symbol(A, Decl(asyncMethodWithSuper_es6.ts, 0, 0))
 
     x() {
->x : Symbol(x, Decl(asyncMethodWithSuper_es6.ts, 0, 9))
+>x : Symbol(A.x, Decl(asyncMethodWithSuper_es6.ts, 0, 9))
     }
 }
 
@@ -13,7 +13,7 @@ class B extends A {
 
     // async method with only call/get on 'super' does not require a binding
     async simple() {
->simple : Symbol(simple, Decl(asyncMethodWithSuper_es6.ts, 5, 19))
+>simple : Symbol(B.simple, Decl(asyncMethodWithSuper_es6.ts, 5, 19))
 
         // call with property access
         super.x();
@@ -42,7 +42,7 @@ class B extends A {
 
     // async method with assignment/destructuring on 'super' requires a binding
     async advanced() {
->advanced : Symbol(advanced, Decl(asyncMethodWithSuper_es6.ts, 19, 5))
+>advanced : Symbol(B.advanced, Decl(asyncMethodWithSuper_es6.ts, 19, 5))
 
         const f = () => {};
 >f : Symbol(f, Decl(asyncMethodWithSuper_es6.ts, 23, 13))
diff --git a/tests/baselines/reference/augmentExportEquals5.symbols b/tests/baselines/reference/augmentExportEquals5.symbols
index f255bf8c065..37fa00bd8cc 100644
--- a/tests/baselines/reference/augmentExportEquals5.symbols
+++ b/tests/baselines/reference/augmentExportEquals5.symbols
@@ -27,7 +27,7 @@ declare module "express" {
 >IRoute : Symbol(IRoute, Decl(express.d.ts, 10, 17))
 
             all(...handler: RequestHandler[]): IRoute;
->all : Symbol(all, Decl(express.d.ts, 11, 26))
+>all : Symbol(IRoute.all, Decl(express.d.ts, 11, 26))
 >handler : Symbol(handler, Decl(express.d.ts, 12, 16))
 >RequestHandler : Symbol(RequestHandler, Decl(express.d.ts, 40, 9))
 >IRoute : Symbol(IRoute, Decl(express.d.ts, 10, 17))
@@ -51,7 +51,7 @@ declare module "express" {
 >RequestHandler : Symbol(RequestHandler, Decl(express.d.ts, 40, 9))
 
             route(path: string): IRoute;
->route : Symbol(route, Decl(express.d.ts, 19, 53))
+>route : Symbol(IRouter.route, Decl(express.d.ts, 19, 53))
 >path : Symbol(path, Decl(express.d.ts, 20, 18))
 >IRoute : Symbol(IRoute, Decl(express.d.ts, 10, 17))
         }
@@ -78,7 +78,7 @@ declare module "express" {
 >Request : Symbol(Express.Request, Decl(express.d.ts, 2, 24))
 
             get (name: string): string;
->get : Symbol(get, Decl(express.d.ts, 29, 51))
+>get : Symbol(Request.get, Decl(express.d.ts, 29, 51))
 >name : Symbol(name, Decl(express.d.ts, 31, 17))
         }
 
@@ -89,7 +89,7 @@ declare module "express" {
 >Response : Symbol(Express.Response, Decl(express.d.ts, 3, 32))
 
             charset: string;
->charset : Symbol(charset, Decl(express.d.ts, 34, 53))
+>charset : Symbol(Response.charset, Decl(express.d.ts, 34, 53))
         }
 
         interface ErrorRequestHandler {
@@ -143,7 +143,7 @@ declare module "express" {
 >Application : Symbol(Express.Application, Decl(express.d.ts, 4, 33))
 
             routes: any;
->routes : Symbol(routes, Decl(express.d.ts, 52, 81))
+>routes : Symbol(Application.routes, Decl(express.d.ts, 52, 81))
         }
 
         interface Express extends Application {
@@ -151,7 +151,7 @@ declare module "express" {
 >Application : Symbol(Application, Decl(express.d.ts, 50, 9))
 
             createApplication(): Application;
->createApplication : Symbol(createApplication, Decl(express.d.ts, 56, 47))
+>createApplication : Symbol(Express.createApplication, Decl(express.d.ts, 56, 47))
 >Application : Symbol(Application, Decl(express.d.ts, 50, 9))
         }
 
@@ -173,7 +173,7 @@ declare module "express" {
 >Request : Symbol(Request, Decl(express.d.ts, 27, 49), Decl(augmentation.ts, 2, 26))
 
         id: number;
->id : Symbol(id, Decl(augmentation.ts, 3, 23))
+>id : Symbol(Request.id, Decl(augmentation.ts, 3, 23))
     }
 }
 
diff --git a/tests/baselines/reference/augmentExportEquals6.symbols b/tests/baselines/reference/augmentExportEquals6.symbols
index 24f8ef7c903..4af820f24d7 100644
--- a/tests/baselines/reference/augmentExportEquals6.symbols
+++ b/tests/baselines/reference/augmentExportEquals6.symbols
@@ -31,7 +31,7 @@ x.B.b = 1;
 declare module "./file1" {
     interface A { a: number }
 >A : Symbol(A, Decl(file1.ts, 2, 15), Decl(file2.ts, 4, 26))
->a : Symbol(a, Decl(file2.ts, 5, 17))
+>a : Symbol(A.a, Decl(file2.ts, 5, 17))
 
     namespace B {
 >B : Symbol(B, Decl(file1.ts, 3, 21), Decl(file2.ts, 5, 29))
diff --git a/tests/baselines/reference/augmentExportEquals6_1.symbols b/tests/baselines/reference/augmentExportEquals6_1.symbols
index 5c45af00a48..3db6702448e 100644
--- a/tests/baselines/reference/augmentExportEquals6_1.symbols
+++ b/tests/baselines/reference/augmentExportEquals6_1.symbols
@@ -24,7 +24,7 @@ import x = require("file1");
 declare module "file1" {
     interface A { a: number }
 >A : Symbol(A, Decl(file1.d.ts, 3, 19), Decl(file2.ts, 4, 24))
->a : Symbol(a, Decl(file2.ts, 5, 17))
+>a : Symbol(A.a, Decl(file2.ts, 5, 17))
 }
 
 === tests/cases/compiler/file3.ts ===
diff --git a/tests/baselines/reference/augmentedTypeAssignmentCompatIndexSignature.errors.txt b/tests/baselines/reference/augmentedTypeAssignmentCompatIndexSignature.errors.txt
index eb5020e97f9..e99cac7968c 100644
--- a/tests/baselines/reference/augmentedTypeAssignmentCompatIndexSignature.errors.txt
+++ b/tests/baselines/reference/augmentedTypeAssignmentCompatIndexSignature.errors.txt
@@ -1,10 +1,8 @@
-tests/cases/conformance/types/members/augmentedTypeAssignmentCompatIndexSignature.ts(15,5): error TS2322: Type '{}' is not assignable to type '{ [n: number]: Foo; }'.
-  Index signature is missing in type '{}'.
 tests/cases/conformance/types/members/augmentedTypeAssignmentCompatIndexSignature.ts(19,5): error TS2322: Type '() => void' is not assignable to type '{ [n: number]: Bar; }'.
   Index signature is missing in type '() => void'.
 
 
-==== tests/cases/conformance/types/members/augmentedTypeAssignmentCompatIndexSignature.ts (2 errors) ====
+==== tests/cases/conformance/types/members/augmentedTypeAssignmentCompatIndexSignature.ts (1 errors) ====
     interface Foo { a }
     interface Bar { b }
     
@@ -20,9 +18,6 @@ tests/cases/conformance/types/members/augmentedTypeAssignmentCompatIndexSignatur
     var f = () => { };
     
     var v1: {
-        ~~
-!!! error TS2322: Type '{}' is not assignable to type '{ [n: number]: Foo; }'.
-!!! error TS2322:   Index signature is missing in type '{}'.
         [n: number]: Foo
     } = o; // Should be allowed
     
diff --git a/tests/baselines/reference/augmentedTypeBracketAccessIndexSignature.symbols b/tests/baselines/reference/augmentedTypeBracketAccessIndexSignature.symbols
index c3dfe5996b9..9ab4ceb9068 100644
--- a/tests/baselines/reference/augmentedTypeBracketAccessIndexSignature.symbols
+++ b/tests/baselines/reference/augmentedTypeBracketAccessIndexSignature.symbols
@@ -1,11 +1,11 @@
 === tests/cases/conformance/types/members/augmentedTypeBracketAccessIndexSignature.ts ===
 interface Foo { a }
 >Foo : Symbol(Foo, Decl(augmentedTypeBracketAccessIndexSignature.ts, 0, 0))
->a : Symbol(a, Decl(augmentedTypeBracketAccessIndexSignature.ts, 0, 15))
+>a : Symbol(Foo.a, Decl(augmentedTypeBracketAccessIndexSignature.ts, 0, 15))
 
 interface Bar { b }
 >Bar : Symbol(Bar, Decl(augmentedTypeBracketAccessIndexSignature.ts, 0, 19))
->b : Symbol(b, Decl(augmentedTypeBracketAccessIndexSignature.ts, 1, 15))
+>b : Symbol(Bar.b, Decl(augmentedTypeBracketAccessIndexSignature.ts, 1, 15))
 
 interface Object {
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(augmentedTypeBracketAccessIndexSignature.ts, 1, 19))
diff --git a/tests/baselines/reference/augmentedTypeBracketNamedPropertyAccess.symbols b/tests/baselines/reference/augmentedTypeBracketNamedPropertyAccess.symbols
index d12e8e13793..c51c0497ec8 100644
--- a/tests/baselines/reference/augmentedTypeBracketNamedPropertyAccess.symbols
+++ b/tests/baselines/reference/augmentedTypeBracketNamedPropertyAccess.symbols
@@ -3,13 +3,13 @@ interface Object {
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(augmentedTypeBracketNamedPropertyAccess.ts, 0, 0))
 
     data: number;
->data : Symbol(data, Decl(augmentedTypeBracketNamedPropertyAccess.ts, 0, 18))
+>data : Symbol(Object.data, Decl(augmentedTypeBracketNamedPropertyAccess.ts, 0, 18))
 }
 interface Function {
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(augmentedTypeBracketNamedPropertyAccess.ts, 2, 1))
 
     functionData: string;
->functionData : Symbol(functionData, Decl(augmentedTypeBracketNamedPropertyAccess.ts, 3, 20))
+>functionData : Symbol(Function.functionData, Decl(augmentedTypeBracketNamedPropertyAccess.ts, 3, 20))
 }
 var o = {};
 >o : Symbol(o, Decl(augmentedTypeBracketNamedPropertyAccess.ts, 6, 3))
diff --git a/tests/baselines/reference/augmentedTypesClass3.symbols b/tests/baselines/reference/augmentedTypesClass3.symbols
index 62504a56f25..e968ecd61ed 100644
--- a/tests/baselines/reference/augmentedTypesClass3.symbols
+++ b/tests/baselines/reference/augmentedTypesClass3.symbols
@@ -2,14 +2,14 @@
 // class then module
 class c5 { public foo() { } }
 >c5 : Symbol(c5, Decl(augmentedTypesClass3.ts, 0, 0), Decl(augmentedTypesClass3.ts, 1, 29))
->foo : Symbol(foo, Decl(augmentedTypesClass3.ts, 1, 10))
+>foo : Symbol(c5.foo, Decl(augmentedTypesClass3.ts, 1, 10))
 
 module c5 { } // should be ok
 >c5 : Symbol(c5, Decl(augmentedTypesClass3.ts, 0, 0), Decl(augmentedTypesClass3.ts, 1, 29))
 
 class c5a { public foo() { } }
 >c5a : Symbol(c5a, Decl(augmentedTypesClass3.ts, 2, 13), Decl(augmentedTypesClass3.ts, 4, 30))
->foo : Symbol(foo, Decl(augmentedTypesClass3.ts, 4, 11))
+>foo : Symbol(c5a.foo, Decl(augmentedTypesClass3.ts, 4, 11))
 
 module c5a { var y = 2; } // should be ok
 >c5a : Symbol(c5a, Decl(augmentedTypesClass3.ts, 2, 13), Decl(augmentedTypesClass3.ts, 4, 30))
@@ -17,7 +17,7 @@ module c5a { var y = 2; } // should be ok
 
 class c5b { public foo() { } }
 >c5b : Symbol(c5b, Decl(augmentedTypesClass3.ts, 5, 25), Decl(augmentedTypesClass3.ts, 7, 30))
->foo : Symbol(foo, Decl(augmentedTypesClass3.ts, 7, 11))
+>foo : Symbol(c5b.foo, Decl(augmentedTypesClass3.ts, 7, 11))
 
 module c5b { export var y = 2; } // should be ok
 >c5b : Symbol(c5b, Decl(augmentedTypesClass3.ts, 5, 25), Decl(augmentedTypesClass3.ts, 7, 30))
@@ -26,6 +26,6 @@ module c5b { export var y = 2; } // should be ok
 //// class then import
 class c5c { public foo() { } }
 >c5c : Symbol(c5c, Decl(augmentedTypesClass3.ts, 8, 32))
->foo : Symbol(foo, Decl(augmentedTypesClass3.ts, 11, 11))
+>foo : Symbol(c5c.foo, Decl(augmentedTypesClass3.ts, 11, 11))
 
 //import c5c = require('');
diff --git a/tests/baselines/reference/augmentedTypesExternalModule1.symbols b/tests/baselines/reference/augmentedTypesExternalModule1.symbols
index 3a909b91df5..d44d1f213a0 100644
--- a/tests/baselines/reference/augmentedTypesExternalModule1.symbols
+++ b/tests/baselines/reference/augmentedTypesExternalModule1.symbols
@@ -4,7 +4,7 @@ export var a = 1;
 
 class c5 { public foo() { } }
 >c5 : Symbol(c5, Decl(augmentedTypesExternalModule1.ts, 0, 17), Decl(augmentedTypesExternalModule1.ts, 1, 29))
->foo : Symbol(foo, Decl(augmentedTypesExternalModule1.ts, 1, 10))
+>foo : Symbol(c5.foo, Decl(augmentedTypesExternalModule1.ts, 1, 10))
 
 module c5 { } // should be ok everywhere
 >c5 : Symbol(c5, Decl(augmentedTypesExternalModule1.ts, 0, 17), Decl(augmentedTypesExternalModule1.ts, 1, 29))
diff --git a/tests/baselines/reference/augmentedTypesModules3b.symbols b/tests/baselines/reference/augmentedTypesModules3b.symbols
index dd5456e4cf2..abafc4855ca 100644
--- a/tests/baselines/reference/augmentedTypesModules3b.symbols
+++ b/tests/baselines/reference/augmentedTypesModules3b.symbols
@@ -1,7 +1,7 @@
 === tests/cases/compiler/augmentedTypesModules3b.ts ===
 class m3b { foo() { } }
 >m3b : Symbol(m3b, Decl(augmentedTypesModules3b.ts, 0, 0), Decl(augmentedTypesModules3b.ts, 0, 23))
->foo : Symbol(foo, Decl(augmentedTypesModules3b.ts, 0, 11))
+>foo : Symbol(m3b.foo, Decl(augmentedTypesModules3b.ts, 0, 11))
 
 module m3b { var y = 2; }
 >m3b : Symbol(m3b, Decl(augmentedTypesModules3b.ts, 0, 0), Decl(augmentedTypesModules3b.ts, 0, 23))
@@ -9,7 +9,7 @@ module m3b { var y = 2; }
 
 class m3c { foo() { } }
 >m3c : Symbol(m3c, Decl(augmentedTypesModules3b.ts, 1, 25), Decl(augmentedTypesModules3b.ts, 3, 23))
->foo : Symbol(foo, Decl(augmentedTypesModules3b.ts, 3, 11))
+>foo : Symbol(m3c.foo, Decl(augmentedTypesModules3b.ts, 3, 11))
 
 module m3c { export var y = 2; } 
 >m3c : Symbol(m3c, Decl(augmentedTypesModules3b.ts, 1, 25), Decl(augmentedTypesModules3b.ts, 3, 23))
@@ -17,7 +17,7 @@ module m3c { export var y = 2; }
 
 declare class m3d { foo(): void }
 >m3d : Symbol(m3d, Decl(augmentedTypesModules3b.ts, 4, 32), Decl(augmentedTypesModules3b.ts, 6, 33))
->foo : Symbol(foo, Decl(augmentedTypesModules3b.ts, 6, 19))
+>foo : Symbol(m3d.foo, Decl(augmentedTypesModules3b.ts, 6, 19))
 
 module m3d { export var y = 2; } 
 >m3d : Symbol(m3d, Decl(augmentedTypesModules3b.ts, 4, 32), Decl(augmentedTypesModules3b.ts, 6, 33))
@@ -29,23 +29,23 @@ module m3e { export var y = 2; }
 
 declare class m3e { foo(): void } 
 >m3e : Symbol(m3e, Decl(augmentedTypesModules3b.ts, 7, 32), Decl(augmentedTypesModules3b.ts, 9, 32))
->foo : Symbol(foo, Decl(augmentedTypesModules3b.ts, 10, 19))
+>foo : Symbol(m3e.foo, Decl(augmentedTypesModules3b.ts, 10, 19))
 
 declare class m3f { foo(): void }
 >m3f : Symbol(m3f, Decl(augmentedTypesModules3b.ts, 10, 33), Decl(augmentedTypesModules3b.ts, 12, 33))
->foo : Symbol(foo, Decl(augmentedTypesModules3b.ts, 12, 19))
+>foo : Symbol(m3f.foo, Decl(augmentedTypesModules3b.ts, 12, 19))
 
 module m3f { export interface I { foo(): void } }
 >m3f : Symbol(m3f, Decl(augmentedTypesModules3b.ts, 10, 33), Decl(augmentedTypesModules3b.ts, 12, 33))
 >I : Symbol(I, Decl(augmentedTypesModules3b.ts, 13, 12))
->foo : Symbol(foo, Decl(augmentedTypesModules3b.ts, 13, 33))
+>foo : Symbol(I.foo, Decl(augmentedTypesModules3b.ts, 13, 33))
 
 declare class m3g { foo(): void }
 >m3g : Symbol(m3g, Decl(augmentedTypesModules3b.ts, 13, 49), Decl(augmentedTypesModules3b.ts, 15, 33))
->foo : Symbol(foo, Decl(augmentedTypesModules3b.ts, 15, 19))
+>foo : Symbol(m3g.foo, Decl(augmentedTypesModules3b.ts, 15, 19))
 
 module m3g { export class C { foo() { } } }
 >m3g : Symbol(m3g, Decl(augmentedTypesModules3b.ts, 13, 49), Decl(augmentedTypesModules3b.ts, 15, 33))
 >C : Symbol(C, Decl(augmentedTypesModules3b.ts, 16, 12))
->foo : Symbol(foo, Decl(augmentedTypesModules3b.ts, 16, 29))
+>foo : Symbol(C.foo, Decl(augmentedTypesModules3b.ts, 16, 29))
 
diff --git a/tests/baselines/reference/augmentedTypesModules4.symbols b/tests/baselines/reference/augmentedTypesModules4.symbols
index e0cee3e7c3a..8df383141ec 100644
--- a/tests/baselines/reference/augmentedTypesModules4.symbols
+++ b/tests/baselines/reference/augmentedTypesModules4.symbols
@@ -26,7 +26,7 @@ enum m4b { One }
 module m4c { interface I { foo(): void } }
 >m4c : Symbol(m4c, Decl(augmentedTypesModules4.ts, 9, 16), Decl(augmentedTypesModules4.ts, 11, 42))
 >I : Symbol(I, Decl(augmentedTypesModules4.ts, 11, 12))
->foo : Symbol(foo, Decl(augmentedTypesModules4.ts, 11, 26))
+>foo : Symbol(I.foo, Decl(augmentedTypesModules4.ts, 11, 26))
 
 enum m4c { One }
 >m4c : Symbol(m4c, Decl(augmentedTypesModules4.ts, 9, 16), Decl(augmentedTypesModules4.ts, 11, 42))
@@ -35,7 +35,7 @@ enum m4c { One }
 module m4d { class C { foo() { } } }
 >m4d : Symbol(m4d, Decl(augmentedTypesModules4.ts, 12, 16), Decl(augmentedTypesModules4.ts, 14, 36))
 >C : Symbol(C, Decl(augmentedTypesModules4.ts, 14, 12))
->foo : Symbol(foo, Decl(augmentedTypesModules4.ts, 14, 22))
+>foo : Symbol(C.foo, Decl(augmentedTypesModules4.ts, 14, 22))
 
 enum m4d { One }
 >m4d : Symbol(m4d, Decl(augmentedTypesModules4.ts, 12, 16), Decl(augmentedTypesModules4.ts, 14, 36))
@@ -50,5 +50,5 @@ module m5 { export var y = 2; }
 module m5 { export interface I { foo(): void } } // should already be reasonably well covered
 >m5 : Symbol(m5, Decl(augmentedTypesModules4.ts, 15, 16), Decl(augmentedTypesModules4.ts, 19, 31))
 >I : Symbol(I, Decl(augmentedTypesModules4.ts, 20, 11))
->foo : Symbol(foo, Decl(augmentedTypesModules4.ts, 20, 32))
+>foo : Symbol(I.foo, Decl(augmentedTypesModules4.ts, 20, 32))
 
diff --git a/tests/baselines/reference/avoid.symbols b/tests/baselines/reference/avoid.symbols
index 9b9440eea65..e2f9e1c4507 100644
--- a/tests/baselines/reference/avoid.symbols
+++ b/tests/baselines/reference/avoid.symbols
@@ -25,7 +25,7 @@ class C {
 >C : Symbol(C, Decl(avoid.ts, 7, 6))
 
     g() {
->g : Symbol(g, Decl(avoid.ts, 9, 9))
+>g : Symbol(C.g, Decl(avoid.ts, 9, 9))
         
     }
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression1_es6.symbols b/tests/baselines/reference/awaitBinaryExpression1_es6.symbols
index fd532aeca74..aee3dbefe96 100644
--- a/tests/baselines/reference/awaitBinaryExpression1_es6.symbols
+++ b/tests/baselines/reference/awaitBinaryExpression1_es6.symbols
@@ -4,11 +4,11 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitBinaryExpression1_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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(awaitBinaryExpression1_es6.ts, 1, 32))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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;
diff --git a/tests/baselines/reference/awaitBinaryExpression2_es6.symbols b/tests/baselines/reference/awaitBinaryExpression2_es6.symbols
index 3117f62da17..a4ed0ec14bd 100644
--- a/tests/baselines/reference/awaitBinaryExpression2_es6.symbols
+++ b/tests/baselines/reference/awaitBinaryExpression2_es6.symbols
@@ -4,11 +4,11 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitBinaryExpression2_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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(awaitBinaryExpression2_es6.ts, 1, 32))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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;
diff --git a/tests/baselines/reference/awaitBinaryExpression3_es6.symbols b/tests/baselines/reference/awaitBinaryExpression3_es6.symbols
index e50f194bbee..4b3beb9d9a5 100644
--- a/tests/baselines/reference/awaitBinaryExpression3_es6.symbols
+++ b/tests/baselines/reference/awaitBinaryExpression3_es6.symbols
@@ -4,11 +4,11 @@ declare var a: number;
 
 declare var p: Promise<number>;
 >p : Symbol(p, Decl(awaitBinaryExpression3_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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(awaitBinaryExpression3_es6.ts, 1, 31))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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;
diff --git a/tests/baselines/reference/awaitBinaryExpression4_es6.symbols b/tests/baselines/reference/awaitBinaryExpression4_es6.symbols
index 02e05faeab0..1c52cbb48ef 100644
--- a/tests/baselines/reference/awaitBinaryExpression4_es6.symbols
+++ b/tests/baselines/reference/awaitBinaryExpression4_es6.symbols
@@ -4,11 +4,11 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitBinaryExpression4_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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(awaitBinaryExpression4_es6.ts, 1, 32))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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;
diff --git a/tests/baselines/reference/awaitBinaryExpression5_es6.symbols b/tests/baselines/reference/awaitBinaryExpression5_es6.symbols
index 061364240f8..28f96aa55f5 100644
--- a/tests/baselines/reference/awaitBinaryExpression5_es6.symbols
+++ b/tests/baselines/reference/awaitBinaryExpression5_es6.symbols
@@ -4,11 +4,11 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitBinaryExpression5_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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(awaitBinaryExpression5_es6.ts, 1, 32))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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 o: { a: boolean; };
diff --git a/tests/baselines/reference/awaitCallExpression1_es6.symbols b/tests/baselines/reference/awaitCallExpression1_es6.symbols
index debe9180bcc..c4a91817a46 100644
--- a/tests/baselines/reference/awaitCallExpression1_es6.symbols
+++ b/tests/baselines/reference/awaitCallExpression1_es6.symbols
@@ -4,7 +4,7 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitCallExpression1_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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 fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : Symbol(fn, Decl(awaitCallExpression1_es6.ts, 1, 32))
@@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Symbol(pfn, Decl(awaitCallExpression1_es6.ts, 4, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression1_es6.ts, 4, 28))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression1_es6.ts, 4, 42))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression1_es6.ts, 4, 57))
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Symbol(po, Decl(awaitCallExpression1_es6.ts, 5, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 >fn : Symbol(fn, Decl(awaitCallExpression1_es6.ts, 5, 25))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression1_es6.ts, 5, 29))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression1_es6.ts, 5, 43))
@@ -36,7 +36,7 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 
 async function func(): Promise<void> {
 >func : Symbol(func, Decl(awaitCallExpression1_es6.ts, 5, 84))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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 = fn(a, a, a);
diff --git a/tests/baselines/reference/awaitCallExpression2_es6.symbols b/tests/baselines/reference/awaitCallExpression2_es6.symbols
index be9a11410c2..3931e28045d 100644
--- a/tests/baselines/reference/awaitCallExpression2_es6.symbols
+++ b/tests/baselines/reference/awaitCallExpression2_es6.symbols
@@ -4,7 +4,7 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitCallExpression2_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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 fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : Symbol(fn, Decl(awaitCallExpression2_es6.ts, 1, 32))
@@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Symbol(pfn, Decl(awaitCallExpression2_es6.ts, 4, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression2_es6.ts, 4, 28))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression2_es6.ts, 4, 42))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression2_es6.ts, 4, 57))
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Symbol(po, Decl(awaitCallExpression2_es6.ts, 5, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 >fn : Symbol(fn, Decl(awaitCallExpression2_es6.ts, 5, 25))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression2_es6.ts, 5, 29))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression2_es6.ts, 5, 43))
@@ -36,7 +36,7 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 
 async function func(): Promise<void> {
 >func : Symbol(func, Decl(awaitCallExpression2_es6.ts, 5, 84))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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 = fn(await p, a, a);
diff --git a/tests/baselines/reference/awaitCallExpression3_es6.symbols b/tests/baselines/reference/awaitCallExpression3_es6.symbols
index 612e33c456c..2002748c9ba 100644
--- a/tests/baselines/reference/awaitCallExpression3_es6.symbols
+++ b/tests/baselines/reference/awaitCallExpression3_es6.symbols
@@ -4,7 +4,7 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitCallExpression3_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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 fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : Symbol(fn, Decl(awaitCallExpression3_es6.ts, 1, 32))
@@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Symbol(pfn, Decl(awaitCallExpression3_es6.ts, 4, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression3_es6.ts, 4, 28))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression3_es6.ts, 4, 42))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression3_es6.ts, 4, 57))
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Symbol(po, Decl(awaitCallExpression3_es6.ts, 5, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 >fn : Symbol(fn, Decl(awaitCallExpression3_es6.ts, 5, 25))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression3_es6.ts, 5, 29))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression3_es6.ts, 5, 43))
@@ -36,7 +36,7 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 
 async function func(): Promise<void> {
 >func : Symbol(func, Decl(awaitCallExpression3_es6.ts, 5, 84))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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 = fn(a, await p, a);
diff --git a/tests/baselines/reference/awaitCallExpression4_es6.symbols b/tests/baselines/reference/awaitCallExpression4_es6.symbols
index 6925e5a44ea..d31cf100ad4 100644
--- a/tests/baselines/reference/awaitCallExpression4_es6.symbols
+++ b/tests/baselines/reference/awaitCallExpression4_es6.symbols
@@ -4,7 +4,7 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitCallExpression4_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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 fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : Symbol(fn, Decl(awaitCallExpression4_es6.ts, 1, 32))
@@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Symbol(pfn, Decl(awaitCallExpression4_es6.ts, 4, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression4_es6.ts, 4, 28))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression4_es6.ts, 4, 42))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression4_es6.ts, 4, 57))
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Symbol(po, Decl(awaitCallExpression4_es6.ts, 5, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 >fn : Symbol(fn, Decl(awaitCallExpression4_es6.ts, 5, 25))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression4_es6.ts, 5, 29))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression4_es6.ts, 5, 43))
@@ -36,7 +36,7 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 
 async function func(): Promise<void> {
 >func : Symbol(func, Decl(awaitCallExpression4_es6.ts, 5, 84))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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 pfn)(a, a, a);
diff --git a/tests/baselines/reference/awaitCallExpression5_es6.symbols b/tests/baselines/reference/awaitCallExpression5_es6.symbols
index 8bdce5cd12c..d14a966b0b1 100644
--- a/tests/baselines/reference/awaitCallExpression5_es6.symbols
+++ b/tests/baselines/reference/awaitCallExpression5_es6.symbols
@@ -4,7 +4,7 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitCallExpression5_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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 fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : Symbol(fn, Decl(awaitCallExpression5_es6.ts, 1, 32))
@@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Symbol(pfn, Decl(awaitCallExpression5_es6.ts, 4, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression5_es6.ts, 4, 28))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression5_es6.ts, 4, 42))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression5_es6.ts, 4, 57))
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Symbol(po, Decl(awaitCallExpression5_es6.ts, 5, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 >fn : Symbol(fn, Decl(awaitCallExpression5_es6.ts, 5, 25))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression5_es6.ts, 5, 29))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression5_es6.ts, 5, 43))
@@ -36,7 +36,7 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 
 async function func(): Promise<void> {
 >func : Symbol(func, Decl(awaitCallExpression5_es6.ts, 5, 84))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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 = o.fn(a, a, a);
diff --git a/tests/baselines/reference/awaitCallExpression6_es6.symbols b/tests/baselines/reference/awaitCallExpression6_es6.symbols
index ad79f75ab49..afd07fd0185 100644
--- a/tests/baselines/reference/awaitCallExpression6_es6.symbols
+++ b/tests/baselines/reference/awaitCallExpression6_es6.symbols
@@ -4,7 +4,7 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitCallExpression6_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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 fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : Symbol(fn, Decl(awaitCallExpression6_es6.ts, 1, 32))
@@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Symbol(pfn, Decl(awaitCallExpression6_es6.ts, 4, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression6_es6.ts, 4, 28))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression6_es6.ts, 4, 42))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression6_es6.ts, 4, 57))
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Symbol(po, Decl(awaitCallExpression6_es6.ts, 5, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 >fn : Symbol(fn, Decl(awaitCallExpression6_es6.ts, 5, 25))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression6_es6.ts, 5, 29))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression6_es6.ts, 5, 43))
@@ -36,7 +36,7 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 
 async function func(): Promise<void> {
 >func : Symbol(func, Decl(awaitCallExpression6_es6.ts, 5, 84))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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 = o.fn(await p, a, a);
diff --git a/tests/baselines/reference/awaitCallExpression7_es6.symbols b/tests/baselines/reference/awaitCallExpression7_es6.symbols
index 0da1dd16016..bb503d4b3a1 100644
--- a/tests/baselines/reference/awaitCallExpression7_es6.symbols
+++ b/tests/baselines/reference/awaitCallExpression7_es6.symbols
@@ -4,7 +4,7 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitCallExpression7_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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 fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : Symbol(fn, Decl(awaitCallExpression7_es6.ts, 1, 32))
@@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Symbol(pfn, Decl(awaitCallExpression7_es6.ts, 4, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression7_es6.ts, 4, 28))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression7_es6.ts, 4, 42))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression7_es6.ts, 4, 57))
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Symbol(po, Decl(awaitCallExpression7_es6.ts, 5, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 >fn : Symbol(fn, Decl(awaitCallExpression7_es6.ts, 5, 25))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression7_es6.ts, 5, 29))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression7_es6.ts, 5, 43))
@@ -36,7 +36,7 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 
 async function func(): Promise<void> {
 >func : Symbol(func, Decl(awaitCallExpression7_es6.ts, 5, 84))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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 = o.fn(a, await p, a);
diff --git a/tests/baselines/reference/awaitCallExpression8_es6.symbols b/tests/baselines/reference/awaitCallExpression8_es6.symbols
index d2d4fa2264d..9f4df1046f4 100644
--- a/tests/baselines/reference/awaitCallExpression8_es6.symbols
+++ b/tests/baselines/reference/awaitCallExpression8_es6.symbols
@@ -4,7 +4,7 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitCallExpression8_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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 fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : Symbol(fn, Decl(awaitCallExpression8_es6.ts, 1, 32))
@@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Symbol(pfn, Decl(awaitCallExpression8_es6.ts, 4, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression8_es6.ts, 4, 28))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression8_es6.ts, 4, 42))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression8_es6.ts, 4, 57))
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Symbol(po, Decl(awaitCallExpression8_es6.ts, 5, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 >fn : Symbol(fn, Decl(awaitCallExpression8_es6.ts, 5, 25))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression8_es6.ts, 5, 29))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression8_es6.ts, 5, 43))
@@ -36,7 +36,7 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 
 async function func(): Promise<void> {
 >func : Symbol(func, Decl(awaitCallExpression8_es6.ts, 5, 84))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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 po).fn(a, a, a);
diff --git a/tests/baselines/reference/awaitUnion_es6.symbols b/tests/baselines/reference/awaitUnion_es6.symbols
index 48524c4526d..98a229c4148 100644
--- a/tests/baselines/reference/awaitUnion_es6.symbols
+++ b/tests/baselines/reference/awaitUnion_es6.symbols
@@ -4,20 +4,20 @@ declare let a: number | string;
 
 declare let b: PromiseLike<number> | PromiseLike<string>;
 >b : Symbol(b, Decl(awaitUnion_es6.ts, 1, 11))
->PromiseLike : Symbol(PromiseLike, Decl(lib.d.ts, --, --))
->PromiseLike : Symbol(PromiseLike, Decl(lib.d.ts, --, --))
+>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_es6.ts, 2, 11))
->PromiseLike : Symbol(PromiseLike, Decl(lib.d.ts, --, --))
+>PromiseLike : Symbol(PromiseLike, Decl(lib.es5.d.ts, --, --))
 
 declare let d: number | PromiseLike<string>;
 >d : Symbol(d, Decl(awaitUnion_es6.ts, 3, 11))
->PromiseLike : Symbol(PromiseLike, Decl(lib.d.ts, --, --))
+>PromiseLike : Symbol(PromiseLike, Decl(lib.es5.d.ts, --, --))
 
 declare let e: number | PromiseLike<number | string>;
 >e : Symbol(e, Decl(awaitUnion_es6.ts, 4, 11))
->PromiseLike : Symbol(PromiseLike, Decl(lib.d.ts, --, --))
+>PromiseLike : Symbol(PromiseLike, Decl(lib.es5.d.ts, --, --))
 
 async function f() {
 >f : Symbol(f, Decl(awaitUnion_es6.ts, 4, 53))
diff --git a/tests/baselines/reference/badOverloadError.types b/tests/baselines/reference/badOverloadError.types
index b8ae583a73c..198582af2db 100644
--- a/tests/baselines/reference/badOverloadError.types
+++ b/tests/baselines/reference/badOverloadError.types
@@ -6,6 +6,6 @@ function method() {
 >dictionary : { [index: string]: string; }
 ><{ [index: string]: string; }>{} : { [index: string]: string; }
 >index : string
->{} : { [x: string]: undefined; }
+>{} : {}
 }
 
diff --git a/tests/baselines/reference/baseIndexSignatureResolution.symbols b/tests/baselines/reference/baseIndexSignatureResolution.symbols
index 297f6b092f3..a70ad99fc7b 100644
--- a/tests/baselines/reference/baseIndexSignatureResolution.symbols
+++ b/tests/baselines/reference/baseIndexSignatureResolution.symbols
@@ -1,12 +1,12 @@
 === tests/cases/compiler/baseIndexSignatureResolution.ts ===
 class Base { private a: string; }
 >Base : Symbol(Base, Decl(baseIndexSignatureResolution.ts, 0, 0))
->a : Symbol(a, Decl(baseIndexSignatureResolution.ts, 0, 12))
+>a : Symbol(Base.a, Decl(baseIndexSignatureResolution.ts, 0, 12))
 
 class Derived extends Base { private b: string; }
 >Derived : Symbol(Derived, Decl(baseIndexSignatureResolution.ts, 0, 33))
 >Base : Symbol(Base, Decl(baseIndexSignatureResolution.ts, 0, 0))
->b : Symbol(b, Decl(baseIndexSignatureResolution.ts, 1, 28))
+>b : Symbol(Derived.b, Decl(baseIndexSignatureResolution.ts, 1, 28))
 
 // Note - commmenting "extends Foo" prevents the error
 interface Foo {
diff --git a/tests/baselines/reference/baseTypeAfterDerivedType.symbols b/tests/baselines/reference/baseTypeAfterDerivedType.symbols
index b085e0a4152..89d35e21635 100644
--- a/tests/baselines/reference/baseTypeAfterDerivedType.symbols
+++ b/tests/baselines/reference/baseTypeAfterDerivedType.symbols
@@ -4,7 +4,7 @@ interface Derived extends Base {
 >Base : Symbol(Base, Decl(baseTypeAfterDerivedType.ts, 2, 1))
 
     method(...args: any[]): void;
->method : Symbol(method, Decl(baseTypeAfterDerivedType.ts, 0, 32))
+>method : Symbol(Derived.method, Decl(baseTypeAfterDerivedType.ts, 0, 32))
 >args : Symbol(args, Decl(baseTypeAfterDerivedType.ts, 1, 11))
 }
 
@@ -12,7 +12,7 @@ interface Base {
 >Base : Symbol(Base, Decl(baseTypeAfterDerivedType.ts, 2, 1))
 
     method(...args: any[]): void;
->method : Symbol(method, Decl(baseTypeAfterDerivedType.ts, 4, 16))
+>method : Symbol(Base.method, Decl(baseTypeAfterDerivedType.ts, 4, 16))
 >args : Symbol(args, Decl(baseTypeAfterDerivedType.ts, 5, 11))
 }
 
@@ -21,7 +21,7 @@ class Derived2 implements Base2 {
 >Base2 : Symbol(Base2, Decl(baseTypeAfterDerivedType.ts, 10, 1))
 
     method(...args: any[]): void { }
->method : Symbol(method, Decl(baseTypeAfterDerivedType.ts, 8, 33))
+>method : Symbol(Derived2.method, Decl(baseTypeAfterDerivedType.ts, 8, 33))
 >args : Symbol(args, Decl(baseTypeAfterDerivedType.ts, 9, 11))
 }
 
@@ -29,7 +29,7 @@ interface Base2 {
 >Base2 : Symbol(Base2, Decl(baseTypeAfterDerivedType.ts, 10, 1))
 
     method(...args: any[]): void;
->method : Symbol(method, Decl(baseTypeAfterDerivedType.ts, 12, 17))
+>method : Symbol(Base2.method, Decl(baseTypeAfterDerivedType.ts, 12, 17))
 >args : Symbol(args, Decl(baseTypeAfterDerivedType.ts, 13, 11))
 }
 
diff --git a/tests/baselines/reference/baseTypeOrderChecking.symbols b/tests/baselines/reference/baseTypeOrderChecking.symbols
index 05d913f481e..13a926fe278 100644
--- a/tests/baselines/reference/baseTypeOrderChecking.symbols
+++ b/tests/baselines/reference/baseTypeOrderChecking.symbols
@@ -32,7 +32,7 @@ class Class3<T>
 {
 
                public memberVariable: Class2;
->memberVariable : Symbol(memberVariable, Decl(baseTypeOrderChecking.ts, 22, 1))
+>memberVariable : Symbol(Class3.memberVariable, Decl(baseTypeOrderChecking.ts, 22, 1))
 >Class2 : Symbol(Class2, Decl(baseTypeOrderChecking.ts, 8, 1))
 
 }
diff --git a/tests/baselines/reference/baseTypeWrappingInstantiationChain.symbols b/tests/baselines/reference/baseTypeWrappingInstantiationChain.symbols
index 1e8ab089b90..936110ea43a 100644
--- a/tests/baselines/reference/baseTypeWrappingInstantiationChain.symbols
+++ b/tests/baselines/reference/baseTypeWrappingInstantiationChain.symbols
@@ -6,7 +6,7 @@ class C<T1> extends CBase<T1> {
 >T1 : Symbol(T1, Decl(baseTypeWrappingInstantiationChain.ts, 0, 8))
 
     public works() {
->works : Symbol(works, Decl(baseTypeWrappingInstantiationChain.ts, 0, 31))
+>works : Symbol(C.works, Decl(baseTypeWrappingInstantiationChain.ts, 0, 31))
 
         new CBaseBase<Wrapper<T1>>(this);
 >CBaseBase : Symbol(CBaseBase, Decl(baseTypeWrappingInstantiationChain.ts, 13, 1))
@@ -15,7 +15,7 @@ class C<T1> extends CBase<T1> {
 >this : Symbol(C, Decl(baseTypeWrappingInstantiationChain.ts, 0, 0))
     }
     public alsoWorks() {
->alsoWorks : Symbol(alsoWorks, Decl(baseTypeWrappingInstantiationChain.ts, 3, 5))
+>alsoWorks : Symbol(C.alsoWorks, Decl(baseTypeWrappingInstantiationChain.ts, 3, 5))
 
         new CBase<T1>(this); // Should not error, parameter is of type Parameter<Wrapper<T1>>
 >CBase : Symbol(CBase, Decl(baseTypeWrappingInstantiationChain.ts, 9, 1))
@@ -24,7 +24,7 @@ class C<T1> extends CBase<T1> {
     }
 
     public method(t: Wrapper<T1>) { }
->method : Symbol(method, Decl(baseTypeWrappingInstantiationChain.ts, 6, 5))
+>method : Symbol(C.method, Decl(baseTypeWrappingInstantiationChain.ts, 6, 5))
 >t : Symbol(t, Decl(baseTypeWrappingInstantiationChain.ts, 8, 18))
 >Wrapper : Symbol(Wrapper, Decl(baseTypeWrappingInstantiationChain.ts, 21, 1))
 >T1 : Symbol(T1, Decl(baseTypeWrappingInstantiationChain.ts, 0, 8))
@@ -54,7 +54,7 @@ class Parameter<T4> {
 >T4 : Symbol(T4, Decl(baseTypeWrappingInstantiationChain.ts, 19, 16))
 
     method(t: T4) { }
->method : Symbol(method, Decl(baseTypeWrappingInstantiationChain.ts, 19, 21))
+>method : Symbol(Parameter.method, Decl(baseTypeWrappingInstantiationChain.ts, 19, 21))
 >t : Symbol(t, Decl(baseTypeWrappingInstantiationChain.ts, 20, 11))
 >T4 : Symbol(T4, Decl(baseTypeWrappingInstantiationChain.ts, 19, 16))
 }
@@ -64,6 +64,6 @@ class Wrapper<T5> {
 >T5 : Symbol(T5, Decl(baseTypeWrappingInstantiationChain.ts, 23, 14))
 
     property: T5;
->property : Symbol(property, Decl(baseTypeWrappingInstantiationChain.ts, 23, 19))
+>property : Symbol(Wrapper.property, Decl(baseTypeWrappingInstantiationChain.ts, 23, 19))
 >T5 : Symbol(T5, Decl(baseTypeWrappingInstantiationChain.ts, 23, 14))
 }
diff --git a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.symbols b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.symbols
index 626777523ab..1cdb83ea837 100644
--- a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.symbols
+++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.symbols
@@ -14,17 +14,17 @@ var b: { x: number; z?: number };
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(bestCommonTypeOfConditionalExpressions.ts, 4, 33))
->foo : Symbol(foo, Decl(bestCommonTypeOfConditionalExpressions.ts, 6, 12))
+>foo : Symbol(Base.foo, Decl(bestCommonTypeOfConditionalExpressions.ts, 6, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(bestCommonTypeOfConditionalExpressions.ts, 6, 27))
 >Base : Symbol(Base, Decl(bestCommonTypeOfConditionalExpressions.ts, 4, 33))
->bar : Symbol(bar, Decl(bestCommonTypeOfConditionalExpressions.ts, 7, 28))
+>bar : Symbol(Derived.bar, Decl(bestCommonTypeOfConditionalExpressions.ts, 7, 28))
 
 class Derived2 extends Base { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(bestCommonTypeOfConditionalExpressions.ts, 7, 43))
 >Base : Symbol(Base, Decl(bestCommonTypeOfConditionalExpressions.ts, 4, 33))
->baz : Symbol(baz, Decl(bestCommonTypeOfConditionalExpressions.ts, 8, 29))
+>baz : Symbol(Derived2.baz, Decl(bestCommonTypeOfConditionalExpressions.ts, 8, 29))
 
 var base: Base;
 >base : Symbol(base, Decl(bestCommonTypeOfConditionalExpressions.ts, 9, 3))
diff --git a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.symbols b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.symbols
index 68103761051..11a3430a668 100644
--- a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.symbols
+++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.symbols
@@ -4,17 +4,17 @@
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(bestCommonTypeOfConditionalExpressions2.ts, 0, 0))
->foo : Symbol(foo, Decl(bestCommonTypeOfConditionalExpressions2.ts, 3, 12))
+>foo : Symbol(Base.foo, Decl(bestCommonTypeOfConditionalExpressions2.ts, 3, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(bestCommonTypeOfConditionalExpressions2.ts, 3, 27))
 >Base : Symbol(Base, Decl(bestCommonTypeOfConditionalExpressions2.ts, 0, 0))
->bar : Symbol(bar, Decl(bestCommonTypeOfConditionalExpressions2.ts, 4, 28))
+>bar : Symbol(Derived.bar, Decl(bestCommonTypeOfConditionalExpressions2.ts, 4, 28))
 
 class Derived2 extends Base { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(bestCommonTypeOfConditionalExpressions2.ts, 4, 43))
 >Base : Symbol(Base, Decl(bestCommonTypeOfConditionalExpressions2.ts, 0, 0))
->baz : Symbol(baz, Decl(bestCommonTypeOfConditionalExpressions2.ts, 5, 29))
+>baz : Symbol(Derived2.baz, Decl(bestCommonTypeOfConditionalExpressions2.ts, 5, 29))
 
 var base: Base;
 >base : Symbol(base, Decl(bestCommonTypeOfConditionalExpressions2.ts, 6, 3))
diff --git a/tests/baselines/reference/bestCommonTypeOfTuple2.symbols b/tests/baselines/reference/bestCommonTypeOfTuple2.symbols
index 842d07c417c..1e17f253f8a 100644
--- a/tests/baselines/reference/bestCommonTypeOfTuple2.symbols
+++ b/tests/baselines/reference/bestCommonTypeOfTuple2.symbols
@@ -4,39 +4,39 @@ interface base { }
 
 interface base1 { i }
 >base1 : Symbol(base1, Decl(bestCommonTypeOfTuple2.ts, 0, 18))
->i : Symbol(i, Decl(bestCommonTypeOfTuple2.ts, 1, 17))
+>i : Symbol(base1.i, Decl(bestCommonTypeOfTuple2.ts, 1, 17))
 
 class C implements base { c }
 >C : Symbol(C, Decl(bestCommonTypeOfTuple2.ts, 1, 21))
 >base : Symbol(base, Decl(bestCommonTypeOfTuple2.ts, 0, 0))
->c : Symbol(c, Decl(bestCommonTypeOfTuple2.ts, 2, 25))
+>c : Symbol(C.c, Decl(bestCommonTypeOfTuple2.ts, 2, 25))
 
 class D implements base { d }
 >D : Symbol(D, Decl(bestCommonTypeOfTuple2.ts, 2, 29))
 >base : Symbol(base, Decl(bestCommonTypeOfTuple2.ts, 0, 0))
->d : Symbol(d, Decl(bestCommonTypeOfTuple2.ts, 3, 25))
+>d : Symbol(D.d, Decl(bestCommonTypeOfTuple2.ts, 3, 25))
 
 class E implements base { e }
 >E : Symbol(E, Decl(bestCommonTypeOfTuple2.ts, 3, 29))
 >base : Symbol(base, Decl(bestCommonTypeOfTuple2.ts, 0, 0))
->e : Symbol(e, Decl(bestCommonTypeOfTuple2.ts, 4, 25))
+>e : Symbol(E.e, Decl(bestCommonTypeOfTuple2.ts, 4, 25))
 
 class F extends C { f }
 >F : Symbol(F, Decl(bestCommonTypeOfTuple2.ts, 4, 29))
 >C : Symbol(C, Decl(bestCommonTypeOfTuple2.ts, 1, 21))
->f : Symbol(f, Decl(bestCommonTypeOfTuple2.ts, 5, 19))
+>f : Symbol(F.f, Decl(bestCommonTypeOfTuple2.ts, 5, 19))
 
 class C1 implements base1 { i = "foo"; c }
 >C1 : Symbol(C1, Decl(bestCommonTypeOfTuple2.ts, 5, 23))
 >base1 : Symbol(base1, Decl(bestCommonTypeOfTuple2.ts, 0, 18))
->i : Symbol(i, Decl(bestCommonTypeOfTuple2.ts, 7, 27))
->c : Symbol(c, Decl(bestCommonTypeOfTuple2.ts, 7, 38))
+>i : Symbol(C1.i, Decl(bestCommonTypeOfTuple2.ts, 7, 27))
+>c : Symbol(C1.c, Decl(bestCommonTypeOfTuple2.ts, 7, 38))
 
 class D1 extends C1 { i = "bar"; d }
 >D1 : Symbol(D1, Decl(bestCommonTypeOfTuple2.ts, 7, 42))
 >C1 : Symbol(C1, Decl(bestCommonTypeOfTuple2.ts, 5, 23))
->i : Symbol(i, Decl(bestCommonTypeOfTuple2.ts, 8, 21))
->d : Symbol(d, Decl(bestCommonTypeOfTuple2.ts, 8, 32))
+>i : Symbol(D1.i, Decl(bestCommonTypeOfTuple2.ts, 8, 21))
+>d : Symbol(D1.d, Decl(bestCommonTypeOfTuple2.ts, 8, 32))
 
 var t1: [C, base];
 >t1 : Symbol(t1, Decl(bestCommonTypeOfTuple2.ts, 10, 3))
diff --git a/tests/baselines/reference/bestCommonTypeReturnStatement.symbols b/tests/baselines/reference/bestCommonTypeReturnStatement.symbols
index 14e770ae255..db5fb4cfbcd 100644
--- a/tests/baselines/reference/bestCommonTypeReturnStatement.symbols
+++ b/tests/baselines/reference/bestCommonTypeReturnStatement.symbols
@@ -5,7 +5,7 @@ interface IPromise<T> {
 >T : Symbol(T, Decl(bestCommonTypeReturnStatement.ts, 1, 19))
 
     then(successCallback: (promiseValue: T) => any, errorCallback?: (reason: any) => any): IPromise<any>;
->then : Symbol(then, Decl(bestCommonTypeReturnStatement.ts, 1, 23))
+>then : Symbol(IPromise.then, Decl(bestCommonTypeReturnStatement.ts, 1, 23))
 >successCallback : Symbol(successCallback, Decl(bestCommonTypeReturnStatement.ts, 2, 9))
 >promiseValue : Symbol(promiseValue, Decl(bestCommonTypeReturnStatement.ts, 2, 27))
 >T : Symbol(T, Decl(bestCommonTypeReturnStatement.ts, 1, 19))
diff --git a/tests/baselines/reference/bestCommonTypeWithContextualTyping.symbols b/tests/baselines/reference/bestCommonTypeWithContextualTyping.symbols
index cfa5310bd3c..acaab09cb0e 100644
--- a/tests/baselines/reference/bestCommonTypeWithContextualTyping.symbols
+++ b/tests/baselines/reference/bestCommonTypeWithContextualTyping.symbols
@@ -3,20 +3,20 @@ interface Contextual {
 >Contextual : Symbol(Contextual, Decl(bestCommonTypeWithContextualTyping.ts, 0, 0))
 
     dummy;
->dummy : Symbol(dummy, Decl(bestCommonTypeWithContextualTyping.ts, 0, 22))
+>dummy : Symbol(Contextual.dummy, Decl(bestCommonTypeWithContextualTyping.ts, 0, 22))
 
     p?: number;
->p : Symbol(p, Decl(bestCommonTypeWithContextualTyping.ts, 1, 10))
+>p : Symbol(Contextual.p, Decl(bestCommonTypeWithContextualTyping.ts, 1, 10))
 }
 
 interface Ellement {
 >Ellement : Symbol(Ellement, Decl(bestCommonTypeWithContextualTyping.ts, 3, 1))
 
     dummy;
->dummy : Symbol(dummy, Decl(bestCommonTypeWithContextualTyping.ts, 5, 20))
+>dummy : Symbol(Ellement.dummy, Decl(bestCommonTypeWithContextualTyping.ts, 5, 20))
 
     p: any;
->p : Symbol(p, Decl(bestCommonTypeWithContextualTyping.ts, 6, 10))
+>p : Symbol(Ellement.p, Decl(bestCommonTypeWithContextualTyping.ts, 6, 10))
 }
 
 var e: Ellement;
diff --git a/tests/baselines/reference/bestCommonTypeWithContextualTyping.types b/tests/baselines/reference/bestCommonTypeWithContextualTyping.types
index 628fe82012a..5baca43b752 100644
--- a/tests/baselines/reference/bestCommonTypeWithContextualTyping.types
+++ b/tests/baselines/reference/bestCommonTypeWithContextualTyping.types
@@ -36,7 +36,7 @@ var obj: { [s: string]: Contextual } = { s: e }; // { s: Ellement; [s: string]:
 >obj : { [s: string]: Contextual; }
 >s : string
 >Contextual : Contextual
->{ s: e } : { [x: string]: Ellement; s: Ellement; }
+>{ s: e } : { s: Ellement; }
 >s : Ellement
 >e : Ellement
 
diff --git a/tests/baselines/reference/bestCommonTypeWithOptionalProperties.symbols b/tests/baselines/reference/bestCommonTypeWithOptionalProperties.symbols
index 35e9534ddb5..5bb2dc8ecf9 100644
--- a/tests/baselines/reference/bestCommonTypeWithOptionalProperties.symbols
+++ b/tests/baselines/reference/bestCommonTypeWithOptionalProperties.symbols
@@ -1,17 +1,17 @@
 === tests/cases/compiler/bestCommonTypeWithOptionalProperties.ts ===
 interface X { foo: string }
 >X : Symbol(X, Decl(bestCommonTypeWithOptionalProperties.ts, 0, 0))
->foo : Symbol(foo, Decl(bestCommonTypeWithOptionalProperties.ts, 0, 13))
+>foo : Symbol(X.foo, Decl(bestCommonTypeWithOptionalProperties.ts, 0, 13))
 
 interface Y extends X { bar?: number }
 >Y : Symbol(Y, Decl(bestCommonTypeWithOptionalProperties.ts, 0, 27))
 >X : Symbol(X, Decl(bestCommonTypeWithOptionalProperties.ts, 0, 0))
->bar : Symbol(bar, Decl(bestCommonTypeWithOptionalProperties.ts, 1, 23))
+>bar : Symbol(Y.bar, Decl(bestCommonTypeWithOptionalProperties.ts, 1, 23))
 
 interface Z extends X { bar: string }
 >Z : Symbol(Z, Decl(bestCommonTypeWithOptionalProperties.ts, 1, 38))
 >X : Symbol(X, Decl(bestCommonTypeWithOptionalProperties.ts, 0, 0))
->bar : Symbol(bar, Decl(bestCommonTypeWithOptionalProperties.ts, 2, 23))
+>bar : Symbol(Z.bar, Decl(bestCommonTypeWithOptionalProperties.ts, 2, 23))
 
 var x: X;
 >x : Symbol(x, Decl(bestCommonTypeWithOptionalProperties.ts, 4, 3))
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/binopAssignmentShouldHaveType.symbols b/tests/baselines/reference/binopAssignmentShouldHaveType.symbols
index 98f4ffee743..ae7a3c521af 100644
--- a/tests/baselines/reference/binopAssignmentShouldHaveType.symbols
+++ b/tests/baselines/reference/binopAssignmentShouldHaveType.symbols
@@ -10,12 +10,12 @@ module Test {
 >Bug : Symbol(Bug, Decl(binopAssignmentShouldHaveType.ts, 2, 13))
 
   getName():string {
->getName : Symbol(getName, Decl(binopAssignmentShouldHaveType.ts, 3, 19))
+>getName : Symbol(Bug.getName, Decl(binopAssignmentShouldHaveType.ts, 3, 19))
 
    return "name";
   }
   bug() {
->bug : Symbol(bug, Decl(binopAssignmentShouldHaveType.ts, 6, 3))
+>bug : Symbol(Bug.bug, Decl(binopAssignmentShouldHaveType.ts, 6, 3))
 
    var name:string= null;
 >name : Symbol(name, Decl(binopAssignmentShouldHaveType.ts, 8, 6))
@@ -23,9 +23,9 @@ module Test {
    if ((name= this.getName()).length > 0) {
 >(name= this.getName()).length : Symbol(String.length, Decl(lib.d.ts, --, --))
 >name : Symbol(name, Decl(binopAssignmentShouldHaveType.ts, 8, 6))
->this.getName : Symbol(getName, Decl(binopAssignmentShouldHaveType.ts, 3, 19))
+>this.getName : Symbol(Bug.getName, Decl(binopAssignmentShouldHaveType.ts, 3, 19))
 >this : Symbol(Bug, Decl(binopAssignmentShouldHaveType.ts, 2, 13))
->getName : Symbol(getName, Decl(binopAssignmentShouldHaveType.ts, 3, 19))
+>getName : Symbol(Bug.getName, Decl(binopAssignmentShouldHaveType.ts, 3, 19))
 >length : Symbol(String.length, Decl(lib.d.ts, --, --))
 
     console.log(name);
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.symbols b/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.symbols
index d6a29a11980..d52e73ba600 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.symbols
+++ b/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.symbols
@@ -10,7 +10,7 @@ class A {
 >A : Symbol(A, Decl(bitwiseNotOperatorWithBooleanType.ts, 3, 40))
 
     public a: boolean;
->a : Symbol(a, Decl(bitwiseNotOperatorWithBooleanType.ts, 5, 9))
+>a : Symbol(A.a, Decl(bitwiseNotOperatorWithBooleanType.ts, 5, 9))
 
     static foo() { return false; }
 >foo : Symbol(A.foo, Decl(bitwiseNotOperatorWithBooleanType.ts, 6, 22))
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.symbols b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.symbols
index 2cb37660135..f7dd03d78c3 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.symbols
+++ b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.symbols
@@ -13,7 +13,7 @@ class A {
 >A : Symbol(A, Decl(bitwiseNotOperatorWithNumberType.ts, 4, 36))
 
     public a: number;
->a : Symbol(a, Decl(bitwiseNotOperatorWithNumberType.ts, 6, 9))
+>a : Symbol(A.a, Decl(bitwiseNotOperatorWithNumberType.ts, 6, 9))
 
     static foo() { return 1; }
 >foo : Symbol(A.foo, Decl(bitwiseNotOperatorWithNumberType.ts, 7, 21))
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithStringType.symbols b/tests/baselines/reference/bitwiseNotOperatorWithStringType.symbols
index 39c16a701b6..f535acc199b 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithStringType.symbols
+++ b/tests/baselines/reference/bitwiseNotOperatorWithStringType.symbols
@@ -13,7 +13,7 @@ class A {
 >A : Symbol(A, Decl(bitwiseNotOperatorWithStringType.ts, 4, 40))
 
     public a: string;
->a : Symbol(a, Decl(bitwiseNotOperatorWithStringType.ts, 6, 9))
+>a : Symbol(A.a, Decl(bitwiseNotOperatorWithStringType.ts, 6, 9))
 
     static foo() { return ""; }
 >foo : Symbol(A.foo, Decl(bitwiseNotOperatorWithStringType.ts, 7, 21))
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop1.js b/tests/baselines/reference/blockScopedBindingsReassignedInLoop1.js
new file mode 100644
index 00000000000..34c3fcc1961
--- /dev/null
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop1.js
@@ -0,0 +1,22 @@
+//// [blockScopedBindingsReassignedInLoop1.ts]
+declare function use(n: number): void;
+(function () {
+  'use strict'
+  for (let i = 0; i < 9; ++i) {
+    (() => use(++i))();
+  }
+})();
+
+//// [blockScopedBindingsReassignedInLoop1.js]
+(function () {
+    'use strict';
+    var _loop_1 = function (i) {
+        (function () { return use(++i); })();
+        out_i_1 = i;
+    };
+    var out_i_1;
+    for (var i = 0; i < 9; ++i) {
+        _loop_1(i);
+        i = out_i_1;
+    }
+})();
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop1.symbols b/tests/baselines/reference/blockScopedBindingsReassignedInLoop1.symbols
new file mode 100644
index 00000000000..8024124b04e
--- /dev/null
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop1.symbols
@@ -0,0 +1,17 @@
+=== tests/cases/compiler/blockScopedBindingsReassignedInLoop1.ts ===
+declare function use(n: number): void;
+>use : Symbol(use, Decl(blockScopedBindingsReassignedInLoop1.ts, 0, 0))
+>n : Symbol(n, Decl(blockScopedBindingsReassignedInLoop1.ts, 0, 21))
+
+(function () {
+  'use strict'
+  for (let i = 0; i < 9; ++i) {
+>i : Symbol(i, Decl(blockScopedBindingsReassignedInLoop1.ts, 3, 10))
+>i : Symbol(i, Decl(blockScopedBindingsReassignedInLoop1.ts, 3, 10))
+>i : Symbol(i, Decl(blockScopedBindingsReassignedInLoop1.ts, 3, 10))
+
+    (() => use(++i))();
+>use : Symbol(use, Decl(blockScopedBindingsReassignedInLoop1.ts, 0, 0))
+>i : Symbol(i, Decl(blockScopedBindingsReassignedInLoop1.ts, 3, 10))
+  }
+})();
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop1.types b/tests/baselines/reference/blockScopedBindingsReassignedInLoop1.types
new file mode 100644
index 00000000000..7ced53508e6
--- /dev/null
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop1.types
@@ -0,0 +1,32 @@
+=== tests/cases/compiler/blockScopedBindingsReassignedInLoop1.ts ===
+declare function use(n: number): void;
+>use : (n: number) => void
+>n : number
+
+(function () {
+>(function () {  'use strict'  for (let i = 0; i < 9; ++i) {    (() => use(++i))();  }})() : void
+>(function () {  'use strict'  for (let i = 0; i < 9; ++i) {    (() => use(++i))();  }}) : () => void
+>function () {  'use strict'  for (let i = 0; i < 9; ++i) {    (() => use(++i))();  }} : () => void
+
+  'use strict'
+>'use strict' : string
+
+  for (let i = 0; i < 9; ++i) {
+>i : number
+>0 : number
+>i < 9 : boolean
+>i : number
+>9 : number
+>++i : number
+>i : number
+
+    (() => use(++i))();
+>(() => use(++i))() : void
+>(() => use(++i)) : () => void
+>() => use(++i) : () => void
+>use(++i) : void
+>use : (n: number) => void
+>++i : number
+>i : number
+  }
+})();
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop2.js b/tests/baselines/reference/blockScopedBindingsReassignedInLoop2.js
new file mode 100644
index 00000000000..08b869a4f99
--- /dev/null
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop2.js
@@ -0,0 +1,120 @@
+//// [blockScopedBindingsReassignedInLoop2.ts]
+for (let x = 1, y = 2; x < y; ++x, --y) {
+    let a = () => x++ + y++;
+    if (x == 1) {
+        break;
+    }
+    else {
+        y = 5;
+    }
+}
+
+for (let x = 1, y = 2; x < y; ++x, --y) {
+    let a = () => x++ + y++;
+    if (x == 1) {
+        continue;
+    }
+    else {
+        y = 5;
+    }
+}
+
+loop:
+for (let x = 1, y = 2; x < y; ++x, --y) {
+    let a = () => x++ + y++;
+    if (x == 1) {
+        break loop;
+    }
+    else {
+        y = 5;
+    }
+}
+
+loop:
+for (let x = 1, y = 2; x < y; ++x, --y) {
+    let a = () => x++ + y++;
+    if (x == 1) {
+        continue loop;
+    }
+    else {
+        y = 5;
+    }
+}
+
+//// [blockScopedBindingsReassignedInLoop2.js]
+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 {
+        y = 5;
+    }
+    out_x_1 = x;
+    out_y_1 = y;
+};
+var out_x_1, out_y_1;
+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;
+}
+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";
+    }
+    else {
+        y = 5;
+    }
+    out_x_2 = x;
+    out_y_2 = y;
+};
+var out_x_2, out_y_2;
+for (var x = 1, y = 2; x < y; ++x, --y) {
+    _loop_2(x, y);
+    x = out_x_2;
+    y = out_y_2;
+}
+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";
+    }
+    else {
+        y = 5;
+    }
+    out_x_3 = x;
+    out_y_3 = y;
+};
+var out_x_3, out_y_3;
+loop: for (var x = 1, y = 2; x < y; ++x, --y) {
+    var state_2 = _loop_3(x, y);
+    x = out_x_3;
+    y = out_y_3;
+    switch (state_2) {
+        case "break-loop": break loop;
+    }
+}
+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";
+    }
+    else {
+        y = 5;
+    }
+    out_x_4 = x;
+    out_y_4 = y;
+};
+var out_x_4, out_y_4;
+loop: for (var x = 1, y = 2; x < y; ++x, --y) {
+    var state_3 = _loop_4(x, y);
+    x = out_x_4;
+    y = out_y_4;
+    switch (state_3) {
+        case "continue-loop": continue loop;
+    }
+}
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop2.symbols b/tests/baselines/reference/blockScopedBindingsReassignedInLoop2.symbols
new file mode 100644
index 00000000000..fcaea39564f
--- /dev/null
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop2.symbols
@@ -0,0 +1,98 @@
+=== tests/cases/compiler/blockScopedBindingsReassignedInLoop2.ts ===
+for (let x = 1, y = 2; x < y; ++x, --y) {
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop2.ts, 0, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop2.ts, 0, 15))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop2.ts, 0, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop2.ts, 0, 15))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop2.ts, 0, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop2.ts, 0, 15))
+
+    let a = () => x++ + y++;
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop2.ts, 1, 7))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop2.ts, 0, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop2.ts, 0, 15))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop2.ts, 0, 8))
+
+        break;
+    }
+    else {
+        y = 5;
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop2.ts, 0, 15))
+    }
+}
+
+for (let x = 1, y = 2; x < y; ++x, --y) {
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop2.ts, 10, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop2.ts, 10, 15))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop2.ts, 10, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop2.ts, 10, 15))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop2.ts, 10, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop2.ts, 10, 15))
+
+    let a = () => x++ + y++;
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop2.ts, 11, 7))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop2.ts, 10, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop2.ts, 10, 15))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop2.ts, 10, 8))
+
+        continue;
+    }
+    else {
+        y = 5;
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop2.ts, 10, 15))
+    }
+}
+
+loop:
+for (let x = 1, y = 2; x < y; ++x, --y) {
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop2.ts, 21, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop2.ts, 21, 15))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop2.ts, 21, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop2.ts, 21, 15))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop2.ts, 21, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop2.ts, 21, 15))
+
+    let a = () => x++ + y++;
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop2.ts, 22, 7))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop2.ts, 21, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop2.ts, 21, 15))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop2.ts, 21, 8))
+
+        break loop;
+    }
+    else {
+        y = 5;
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop2.ts, 21, 15))
+    }
+}
+
+loop:
+for (let x = 1, y = 2; x < y; ++x, --y) {
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop2.ts, 32, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop2.ts, 32, 15))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop2.ts, 32, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop2.ts, 32, 15))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop2.ts, 32, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop2.ts, 32, 15))
+
+    let a = () => x++ + y++;
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop2.ts, 33, 7))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop2.ts, 32, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop2.ts, 32, 15))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop2.ts, 32, 8))
+
+        continue loop;
+    }
+    else {
+        y = 5;
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop2.ts, 32, 15))
+    }
+}
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop2.types b/tests/baselines/reference/blockScopedBindingsReassignedInLoop2.types
new file mode 100644
index 00000000000..244160dcc6b
--- /dev/null
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop2.types
@@ -0,0 +1,160 @@
+=== tests/cases/compiler/blockScopedBindingsReassignedInLoop2.ts ===
+for (let x = 1, y = 2; x < y; ++x, --y) {
+>x : number
+>1 : number
+>y : number
+>2 : number
+>x < y : boolean
+>x : number
+>y : number
+>++x, --y : number
+>++x : number
+>x : number
+>--y : number
+>y : number
+
+    let a = () => x++ + y++;
+>a : () => number
+>() => x++ + y++ : () => number
+>x++ + y++ : number
+>x++ : number
+>x : number
+>y++ : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    else {
+        y = 5;
+>y = 5 : number
+>y : number
+>5 : number
+    }
+}
+
+for (let x = 1, y = 2; x < y; ++x, --y) {
+>x : number
+>1 : number
+>y : number
+>2 : number
+>x < y : boolean
+>x : number
+>y : number
+>++x, --y : number
+>++x : number
+>x : number
+>--y : number
+>y : number
+
+    let a = () => x++ + y++;
+>a : () => number
+>() => x++ + y++ : () => number
+>x++ + y++ : number
+>x++ : number
+>x : number
+>y++ : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        continue;
+    }
+    else {
+        y = 5;
+>y = 5 : number
+>y : number
+>5 : number
+    }
+}
+
+loop:
+>loop : any
+
+for (let x = 1, y = 2; x < y; ++x, --y) {
+>x : number
+>1 : number
+>y : number
+>2 : number
+>x < y : boolean
+>x : number
+>y : number
+>++x, --y : number
+>++x : number
+>x : number
+>--y : number
+>y : number
+
+    let a = () => x++ + y++;
+>a : () => number
+>() => x++ + y++ : () => number
+>x++ + y++ : number
+>x++ : number
+>x : number
+>y++ : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break loop;
+>loop : any
+    }
+    else {
+        y = 5;
+>y = 5 : number
+>y : number
+>5 : number
+    }
+}
+
+loop:
+>loop : any
+
+for (let x = 1, y = 2; x < y; ++x, --y) {
+>x : number
+>1 : number
+>y : number
+>2 : number
+>x < y : boolean
+>x : number
+>y : number
+>++x, --y : number
+>++x : number
+>x : number
+>--y : number
+>y : number
+
+    let a = () => x++ + y++;
+>a : () => number
+>() => x++ + y++ : () => number
+>x++ + y++ : number
+>x++ : number
+>x : number
+>y++ : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        continue loop;
+>loop : any
+    }
+    else {
+        y = 5;
+>y = 5 : number
+>y : number
+>5 : number
+    }
+}
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop3.js b/tests/baselines/reference/blockScopedBindingsReassignedInLoop3.js
new file mode 100644
index 00000000000..d299aaa8452
--- /dev/null
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop3.js
@@ -0,0 +1,247 @@
+//// [blockScopedBindingsReassignedInLoop3.ts]
+
+for (let x = 1, y = 2; x < y; ++x, --y) {
+    let a = () => x++ + y++;
+    if (x == 1) {
+        break;
+    }
+    else {
+        for (let a = 1; a < 5; --a) {
+            let f = () => a;
+            if (a) {
+                a = x;
+                break;
+            }
+            else {
+                y++;
+            }
+        }
+        
+        y = 5;
+    }
+}
+
+
+for (let x = 1, y = 2; x < y; ++x, --y) {
+    let a = () => x++ + y++;
+    if (x == 1) {
+        continue;
+    }
+    else {
+        for (let a = 1; a < 5; --a) {
+            let f = () => a;
+            if (a) {
+                a = x;
+                continue;
+            }
+            else {
+                y++;
+            }
+        }
+        
+        y = 5;
+    }
+}
+
+loop2:
+for (let x = 1, y = 2; x < y; ++x, --y) {
+    let a = () => x++ + y++;
+    if (x == 1) {
+        break loop2;
+    }
+    else {
+        loop1:
+        for (let a = 1; a < 5; --a) {
+            let f = () => a;
+            if (a) {
+                a = x;
+                break loop1;
+            }
+            else {
+                y++;
+                break loop2
+            }
+        }
+        
+        y = 5;
+    }
+}
+
+loop2:
+for (let x = 1, y = 2; x < y; ++x, --y) {
+    let a = () => x++ + y++;
+    if (x == 1) {
+        continue loop2;
+    }
+    else {
+        loop1:
+        for (let a = 1; a < 5; --a) {
+            let f = () => a;
+            if (a) {
+                a = x;
+                continue loop1;
+            }
+            else {
+                y++;
+                continue loop2
+            }
+        }
+        
+        y = 5;
+    }
+}
+
+
+//// [blockScopedBindingsReassignedInLoop3.js]
+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 f = function () { return a_1; };
+            if (a_1) {
+                a_1 = x;
+                return out_a_1 = a_1, "break";
+            }
+            else {
+                y++;
+            }
+            out_a_1 = a_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;
+            if (state_1 === "break")
+                break;
+        }
+        y = 5;
+    }
+    out_x_1 = x;
+    out_y_1 = y;
+};
+var out_x_1, out_y_1;
+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;
+}
+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 f = function () { return a_2; };
+            if (a_2) {
+                a_2 = x;
+                return out_a_2 = a_2, "continue";
+            }
+            else {
+                y++;
+            }
+            out_a_2 = a_2;
+        };
+        var out_a_2;
+        for (var a_2 = 1; a_2 < 5; --a_2) {
+            _loop_4(a_2);
+            a_2 = out_a_2;
+        }
+        y = 5;
+    }
+    out_x_2 = x;
+    out_y_2 = y;
+};
+var out_x_2, out_y_2;
+for (var x = 1, y = 2; x < y; ++x, --y) {
+    _loop_3(x, y);
+    x = out_x_2;
+    y = out_y_2;
+}
+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 f = function () { return a_3; };
+            if (a_3) {
+                a_3 = x;
+                return out_a_3 = a_3, "break-loop1";
+            }
+            else {
+                y++;
+                return out_a_3 = a_3, "break-loop2";
+            }
+            out_a_3 = a_3;
+        };
+        var out_a_3;
+        loop1: for (var a_3 = 1; a_3 < 5; --a_3) {
+            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_3;
+            }
+        }
+        y = 5;
+    }
+    out_x_3 = x;
+    out_y_3 = y;
+};
+var out_x_3, out_y_3;
+loop2: for (var x = 1, y = 2; x < y; ++x, --y) {
+    var state_4 = _loop_5(x, y);
+    x = out_x_3;
+    y = out_y_3;
+    switch (state_4) {
+        case "break-loop2": break loop2;
+    }
+}
+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 f = function () { return a_4; };
+            if (a_4) {
+                a_4 = x;
+                return out_a_4 = a_4, "continue-loop1";
+            }
+            else {
+                y++;
+                return out_a_4 = a_4, "continue-loop2";
+            }
+            out_a_4 = a_4;
+        };
+        var out_a_4;
+        loop1: for (var a_4 = 1; a_4 < 5; --a_4) {
+            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_5;
+            }
+        }
+        y = 5;
+    }
+    out_x_4 = x;
+    out_y_4 = y;
+};
+var out_x_4, out_y_4;
+loop2: for (var x = 1, y = 2; x < y; ++x, --y) {
+    var state_6 = _loop_7(x, y);
+    x = out_x_4;
+    y = out_y_4;
+    switch (state_6) {
+        case "continue-loop2": continue loop2;
+    }
+}
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop3.symbols b/tests/baselines/reference/blockScopedBindingsReassignedInLoop3.symbols
new file mode 100644
index 00000000000..f78cd684c3a
--- /dev/null
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop3.symbols
@@ -0,0 +1,203 @@
+=== tests/cases/compiler/blockScopedBindingsReassignedInLoop3.ts ===
+
+for (let x = 1, y = 2; x < y; ++x, --y) {
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop3.ts, 1, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop3.ts, 1, 15))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop3.ts, 1, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop3.ts, 1, 15))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop3.ts, 1, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop3.ts, 1, 15))
+
+    let a = () => x++ + y++;
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 2, 7))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop3.ts, 1, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop3.ts, 1, 15))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop3.ts, 1, 8))
+
+        break;
+    }
+    else {
+        for (let a = 1; a < 5; --a) {
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 7, 16))
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 7, 16))
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 7, 16))
+
+            let f = () => a;
+>f : Symbol(f, Decl(blockScopedBindingsReassignedInLoop3.ts, 8, 15))
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 7, 16))
+
+            if (a) {
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 7, 16))
+
+                a = x;
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 7, 16))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop3.ts, 1, 8))
+
+                break;
+            }
+            else {
+                y++;
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop3.ts, 1, 15))
+            }
+        }
+        
+        y = 5;
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop3.ts, 1, 15))
+    }
+}
+
+
+for (let x = 1, y = 2; x < y; ++x, --y) {
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop3.ts, 23, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop3.ts, 23, 15))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop3.ts, 23, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop3.ts, 23, 15))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop3.ts, 23, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop3.ts, 23, 15))
+
+    let a = () => x++ + y++;
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 24, 7))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop3.ts, 23, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop3.ts, 23, 15))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop3.ts, 23, 8))
+
+        continue;
+    }
+    else {
+        for (let a = 1; a < 5; --a) {
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 29, 16))
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 29, 16))
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 29, 16))
+
+            let f = () => a;
+>f : Symbol(f, Decl(blockScopedBindingsReassignedInLoop3.ts, 30, 15))
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 29, 16))
+
+            if (a) {
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 29, 16))
+
+                a = x;
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 29, 16))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop3.ts, 23, 8))
+
+                continue;
+            }
+            else {
+                y++;
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop3.ts, 23, 15))
+            }
+        }
+        
+        y = 5;
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop3.ts, 23, 15))
+    }
+}
+
+loop2:
+for (let x = 1, y = 2; x < y; ++x, --y) {
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop3.ts, 45, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop3.ts, 45, 15))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop3.ts, 45, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop3.ts, 45, 15))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop3.ts, 45, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop3.ts, 45, 15))
+
+    let a = () => x++ + y++;
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 46, 7))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop3.ts, 45, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop3.ts, 45, 15))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop3.ts, 45, 8))
+
+        break loop2;
+    }
+    else {
+        loop1:
+        for (let a = 1; a < 5; --a) {
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 52, 16))
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 52, 16))
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 52, 16))
+
+            let f = () => a;
+>f : Symbol(f, Decl(blockScopedBindingsReassignedInLoop3.ts, 53, 15))
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 52, 16))
+
+            if (a) {
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 52, 16))
+
+                a = x;
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 52, 16))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop3.ts, 45, 8))
+
+                break loop1;
+            }
+            else {
+                y++;
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop3.ts, 45, 15))
+
+                break loop2
+            }
+        }
+        
+        y = 5;
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop3.ts, 45, 15))
+    }
+}
+
+loop2:
+for (let x = 1, y = 2; x < y; ++x, --y) {
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop3.ts, 69, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop3.ts, 69, 15))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop3.ts, 69, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop3.ts, 69, 15))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop3.ts, 69, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop3.ts, 69, 15))
+
+    let a = () => x++ + y++;
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 70, 7))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop3.ts, 69, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop3.ts, 69, 15))
+
+    if (x == 1) {
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop3.ts, 69, 8))
+
+        continue loop2;
+    }
+    else {
+        loop1:
+        for (let a = 1; a < 5; --a) {
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 76, 16))
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 76, 16))
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 76, 16))
+
+            let f = () => a;
+>f : Symbol(f, Decl(blockScopedBindingsReassignedInLoop3.ts, 77, 15))
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 76, 16))
+
+            if (a) {
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 76, 16))
+
+                a = x;
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop3.ts, 76, 16))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop3.ts, 69, 8))
+
+                continue loop1;
+            }
+            else {
+                y++;
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop3.ts, 69, 15))
+
+                continue loop2
+            }
+        }
+        
+        y = 5;
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop3.ts, 69, 15))
+    }
+}
+
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop3.types b/tests/baselines/reference/blockScopedBindingsReassignedInLoop3.types
new file mode 100644
index 00000000000..0753391d5c2
--- /dev/null
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop3.types
@@ -0,0 +1,301 @@
+=== tests/cases/compiler/blockScopedBindingsReassignedInLoop3.ts ===
+
+for (let x = 1, y = 2; x < y; ++x, --y) {
+>x : number
+>1 : number
+>y : number
+>2 : number
+>x < y : boolean
+>x : number
+>y : number
+>++x, --y : number
+>++x : number
+>x : number
+>--y : number
+>y : number
+
+    let a = () => x++ + y++;
+>a : () => number
+>() => x++ + y++ : () => number
+>x++ + y++ : number
+>x++ : number
+>x : number
+>y++ : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    }
+    else {
+        for (let a = 1; a < 5; --a) {
+>a : number
+>1 : number
+>a < 5 : boolean
+>a : number
+>5 : number
+>--a : number
+>a : number
+
+            let f = () => a;
+>f : () => number
+>() => a : () => number
+>a : number
+
+            if (a) {
+>a : number
+
+                a = x;
+>a = x : number
+>a : number
+>x : number
+
+                break;
+            }
+            else {
+                y++;
+>y++ : number
+>y : number
+            }
+        }
+        
+        y = 5;
+>y = 5 : number
+>y : number
+>5 : number
+    }
+}
+
+
+for (let x = 1, y = 2; x < y; ++x, --y) {
+>x : number
+>1 : number
+>y : number
+>2 : number
+>x < y : boolean
+>x : number
+>y : number
+>++x, --y : number
+>++x : number
+>x : number
+>--y : number
+>y : number
+
+    let a = () => x++ + y++;
+>a : () => number
+>() => x++ + y++ : () => number
+>x++ + y++ : number
+>x++ : number
+>x : number
+>y++ : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        continue;
+    }
+    else {
+        for (let a = 1; a < 5; --a) {
+>a : number
+>1 : number
+>a < 5 : boolean
+>a : number
+>5 : number
+>--a : number
+>a : number
+
+            let f = () => a;
+>f : () => number
+>() => a : () => number
+>a : number
+
+            if (a) {
+>a : number
+
+                a = x;
+>a = x : number
+>a : number
+>x : number
+
+                continue;
+            }
+            else {
+                y++;
+>y++ : number
+>y : number
+            }
+        }
+        
+        y = 5;
+>y = 5 : number
+>y : number
+>5 : number
+    }
+}
+
+loop2:
+>loop2 : any
+
+for (let x = 1, y = 2; x < y; ++x, --y) {
+>x : number
+>1 : number
+>y : number
+>2 : number
+>x < y : boolean
+>x : number
+>y : number
+>++x, --y : number
+>++x : number
+>x : number
+>--y : number
+>y : number
+
+    let a = () => x++ + y++;
+>a : () => number
+>() => x++ + y++ : () => number
+>x++ + y++ : number
+>x++ : number
+>x : number
+>y++ : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break loop2;
+>loop2 : any
+    }
+    else {
+        loop1:
+>loop1 : any
+
+        for (let a = 1; a < 5; --a) {
+>a : number
+>1 : number
+>a < 5 : boolean
+>a : number
+>5 : number
+>--a : number
+>a : number
+
+            let f = () => a;
+>f : () => number
+>() => a : () => number
+>a : number
+
+            if (a) {
+>a : number
+
+                a = x;
+>a = x : number
+>a : number
+>x : number
+
+                break loop1;
+>loop1 : any
+            }
+            else {
+                y++;
+>y++ : number
+>y : number
+
+                break loop2
+>loop2 : any
+            }
+        }
+        
+        y = 5;
+>y = 5 : number
+>y : number
+>5 : number
+    }
+}
+
+loop2:
+>loop2 : any
+
+for (let x = 1, y = 2; x < y; ++x, --y) {
+>x : number
+>1 : number
+>y : number
+>2 : number
+>x < y : boolean
+>x : number
+>y : number
+>++x, --y : number
+>++x : number
+>x : number
+>--y : number
+>y : number
+
+    let a = () => x++ + y++;
+>a : () => number
+>() => x++ + y++ : () => number
+>x++ + y++ : number
+>x++ : number
+>x : number
+>y++ : number
+>y : number
+
+    if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        continue loop2;
+>loop2 : any
+    }
+    else {
+        loop1:
+>loop1 : any
+
+        for (let a = 1; a < 5; --a) {
+>a : number
+>1 : number
+>a < 5 : boolean
+>a : number
+>5 : number
+>--a : number
+>a : number
+
+            let f = () => a;
+>f : () => number
+>() => a : () => number
+>a : number
+
+            if (a) {
+>a : number
+
+                a = x;
+>a = x : number
+>a : number
+>x : number
+
+                continue loop1;
+>loop1 : any
+            }
+            else {
+                y++;
+>y++ : number
+>y : number
+
+                continue loop2
+>loop2 : any
+            }
+        }
+        
+        y = 5;
+>y = 5 : number
+>y : number
+>5 : number
+    }
+}
+
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop4.js b/tests/baselines/reference/blockScopedBindingsReassignedInLoop4.js
new file mode 100644
index 00000000000..e3b99991904
--- /dev/null
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop4.js
@@ -0,0 +1,35 @@
+//// [blockScopedBindingsReassignedInLoop4.ts]
+function f1() {
+    for (let x = 1, y = 2; x < y; ++x, --y) {
+        let a = () => x++ + y++;
+        if (x == 1) {
+            return 1;
+        }
+        else {
+            y = 5;
+        }
+    }
+}
+
+//// [blockScopedBindingsReassignedInLoop4.js]
+function f1() {
+    var _loop_1 = function (x, y) {
+        var a = function () { return x++ + y++; };
+        if (x == 1) {
+            return { value: 1 };
+        }
+        else {
+            y = 5;
+        }
+        out_x_1 = x;
+        out_y_1 = y;
+    };
+    var out_x_1, out_y_1;
+    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 (typeof state_1 === "object")
+            return state_1.value;
+    }
+}
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop4.symbols b/tests/baselines/reference/blockScopedBindingsReassignedInLoop4.symbols
new file mode 100644
index 00000000000..90c63914b9f
--- /dev/null
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop4.symbols
@@ -0,0 +1,28 @@
+=== tests/cases/compiler/blockScopedBindingsReassignedInLoop4.ts ===
+function f1() {
+>f1 : Symbol(f1, Decl(blockScopedBindingsReassignedInLoop4.ts, 0, 0))
+
+    for (let x = 1, y = 2; x < y; ++x, --y) {
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop4.ts, 1, 12))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop4.ts, 1, 19))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop4.ts, 1, 12))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop4.ts, 1, 19))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop4.ts, 1, 12))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop4.ts, 1, 19))
+
+        let a = () => x++ + y++;
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop4.ts, 2, 11))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop4.ts, 1, 12))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop4.ts, 1, 19))
+
+        if (x == 1) {
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop4.ts, 1, 12))
+
+            return 1;
+        }
+        else {
+            y = 5;
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop4.ts, 1, 19))
+        }
+    }
+}
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop4.types b/tests/baselines/reference/blockScopedBindingsReassignedInLoop4.types
new file mode 100644
index 00000000000..006f536ccca
--- /dev/null
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop4.types
@@ -0,0 +1,43 @@
+=== tests/cases/compiler/blockScopedBindingsReassignedInLoop4.ts ===
+function f1() {
+>f1 : () => number
+
+    for (let x = 1, y = 2; x < y; ++x, --y) {
+>x : number
+>1 : number
+>y : number
+>2 : number
+>x < y : boolean
+>x : number
+>y : number
+>++x, --y : number
+>++x : number
+>x : number
+>--y : number
+>y : number
+
+        let a = () => x++ + y++;
+>a : () => number
+>() => x++ + y++ : () => number
+>x++ + y++ : number
+>x++ : number
+>x : number
+>y++ : number
+>y : number
+
+        if (x == 1) {
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            return 1;
+>1 : number
+        }
+        else {
+            y = 5;
+>y = 5 : number
+>y : number
+>5 : number
+        }
+    }
+}
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop5.js b/tests/baselines/reference/blockScopedBindingsReassignedInLoop5.js
new file mode 100644
index 00000000000..1ea3f23897a
--- /dev/null
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop5.js
@@ -0,0 +1,28 @@
+//// [blockScopedBindingsReassignedInLoop5.ts]
+for (let x = 1, y = 2; x < y; ++x, --y) {
+    let a = () => x++ + y++;
+    if (x == 1) 
+        break;
+    else 
+        y = 5;
+}
+
+
+//// [blockScopedBindingsReassignedInLoop5.js]
+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
+        y = 5;
+    out_x_1 = x;
+    out_y_1 = y;
+};
+var out_x_1, out_y_1;
+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;
+}
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop5.symbols b/tests/baselines/reference/blockScopedBindingsReassignedInLoop5.symbols
new file mode 100644
index 00000000000..0edc6abe34d
--- /dev/null
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop5.symbols
@@ -0,0 +1,23 @@
+=== tests/cases/compiler/blockScopedBindingsReassignedInLoop5.ts ===
+for (let x = 1, y = 2; x < y; ++x, --y) {
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop5.ts, 0, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop5.ts, 0, 15))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop5.ts, 0, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop5.ts, 0, 15))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop5.ts, 0, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop5.ts, 0, 15))
+
+    let a = () => x++ + y++;
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop5.ts, 1, 7))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop5.ts, 0, 8))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop5.ts, 0, 15))
+
+    if (x == 1) 
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop5.ts, 0, 8))
+
+        break;
+    else 
+        y = 5;
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop5.ts, 0, 15))
+}
+
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop5.types b/tests/baselines/reference/blockScopedBindingsReassignedInLoop5.types
new file mode 100644
index 00000000000..530978dc722
--- /dev/null
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop5.types
@@ -0,0 +1,37 @@
+=== tests/cases/compiler/blockScopedBindingsReassignedInLoop5.ts ===
+for (let x = 1, y = 2; x < y; ++x, --y) {
+>x : number
+>1 : number
+>y : number
+>2 : number
+>x < y : boolean
+>x : number
+>y : number
+>++x, --y : number
+>++x : number
+>x : number
+>--y : number
+>y : number
+
+    let a = () => x++ + y++;
+>a : () => number
+>() => x++ + y++ : () => number
+>x++ + y++ : number
+>x++ : number
+>x : number
+>y++ : number
+>y : number
+
+    if (x == 1) 
+>x == 1 : boolean
+>x : number
+>1 : number
+
+        break;
+    else 
+        y = 5;
+>y = 5 : number
+>y : number
+>5 : number
+}
+
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop6.js b/tests/baselines/reference/blockScopedBindingsReassignedInLoop6.js
new file mode 100644
index 00000000000..584d8b21100
--- /dev/null
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop6.js
@@ -0,0 +1,78 @@
+//// [blockScopedBindingsReassignedInLoop6.ts]
+function f1() {
+    for (let [x, y] = [1, 2]; x < y; ++x, --y) {
+        let a = () => x++ + y++;
+        if (x == 1)
+            break;
+        else if (y == 2)
+            y = 5;
+        else
+            return;
+    }
+}
+
+function f2() {
+    for (let [{a: x, b: {c: y}}] = [{a: 1, b: {c: 2}}]; x < y; ++x, --y) {
+        let a = () => x++ + y++;
+        if (x == 1)
+            break;
+        else if (y == 2)
+            y = 5;
+        else
+            return;
+    }
+}
+
+
+
+
+
+
+
+//// [blockScopedBindingsReassignedInLoop6.js]
+function f1() {
+    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 if (y == 2)
+            y = 5;
+        else
+            return { value: void 0 };
+        out_x_1 = x;
+        out_y_1 = y;
+    };
+    var out_x_1, out_y_1;
+    for (var _a = [1, 2], x = _a[0], y = _a[1]; x < y; ++x, --y) {
+        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;
+    }
+}
+function f2() {
+    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";
+        else if (y == 2)
+            y = 5;
+        else
+            return { value: void 0 };
+        out_x_2 = x;
+        out_y_2 = y;
+    };
+    var out_x_2, out_y_2;
+    for (var _a = [{ a: 1, b: { c: 2 } }][0], x = _a.a, y = _a.b.c; x < y; ++x, --y) {
+        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;
+    }
+}
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop6.symbols b/tests/baselines/reference/blockScopedBindingsReassignedInLoop6.symbols
new file mode 100644
index 00000000000..8dda6eedd47
--- /dev/null
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop6.symbols
@@ -0,0 +1,74 @@
+=== tests/cases/compiler/blockScopedBindingsReassignedInLoop6.ts ===
+function f1() {
+>f1 : Symbol(f1, Decl(blockScopedBindingsReassignedInLoop6.ts, 0, 0))
+
+    for (let [x, y] = [1, 2]; x < y; ++x, --y) {
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop6.ts, 1, 14))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop6.ts, 1, 16))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop6.ts, 1, 14))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop6.ts, 1, 16))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop6.ts, 1, 14))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop6.ts, 1, 16))
+
+        let a = () => x++ + y++;
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop6.ts, 2, 11))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop6.ts, 1, 14))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop6.ts, 1, 16))
+
+        if (x == 1)
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop6.ts, 1, 14))
+
+            break;
+        else if (y == 2)
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop6.ts, 1, 16))
+
+            y = 5;
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop6.ts, 1, 16))
+
+        else
+            return;
+    }
+}
+
+function f2() {
+>f2 : Symbol(f2, Decl(blockScopedBindingsReassignedInLoop6.ts, 10, 1))
+
+    for (let [{a: x, b: {c: y}}] = [{a: 1, b: {c: 2}}]; x < y; ++x, --y) {
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop6.ts, 13, 37))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop6.ts, 13, 15))
+>b : Symbol(b, Decl(blockScopedBindingsReassignedInLoop6.ts, 13, 42))
+>c : Symbol(c, Decl(blockScopedBindingsReassignedInLoop6.ts, 13, 47))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop6.ts, 13, 25))
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop6.ts, 13, 37))
+>b : Symbol(b, Decl(blockScopedBindingsReassignedInLoop6.ts, 13, 42))
+>c : Symbol(c, Decl(blockScopedBindingsReassignedInLoop6.ts, 13, 47))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop6.ts, 13, 15))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop6.ts, 13, 25))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop6.ts, 13, 15))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop6.ts, 13, 25))
+
+        let a = () => x++ + y++;
+>a : Symbol(a, Decl(blockScopedBindingsReassignedInLoop6.ts, 14, 11))
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop6.ts, 13, 15))
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop6.ts, 13, 25))
+
+        if (x == 1)
+>x : Symbol(x, Decl(blockScopedBindingsReassignedInLoop6.ts, 13, 15))
+
+            break;
+        else if (y == 2)
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop6.ts, 13, 25))
+
+            y = 5;
+>y : Symbol(y, Decl(blockScopedBindingsReassignedInLoop6.ts, 13, 25))
+
+        else
+            return;
+    }
+}
+
+
+
+
+
+
diff --git a/tests/baselines/reference/blockScopedBindingsReassignedInLoop6.types b/tests/baselines/reference/blockScopedBindingsReassignedInLoop6.types
new file mode 100644
index 00000000000..673c0788a03
--- /dev/null
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop6.types
@@ -0,0 +1,110 @@
+=== tests/cases/compiler/blockScopedBindingsReassignedInLoop6.ts ===
+function f1() {
+>f1 : () => void
+
+    for (let [x, y] = [1, 2]; x < y; ++x, --y) {
+>x : number
+>y : number
+>[1, 2] : [number, number]
+>1 : number
+>2 : number
+>x < y : boolean
+>x : number
+>y : number
+>++x, --y : number
+>++x : number
+>x : number
+>--y : number
+>y : number
+
+        let a = () => x++ + y++;
+>a : () => number
+>() => x++ + y++ : () => number
+>x++ + y++ : number
+>x++ : number
+>x : number
+>y++ : number
+>y : number
+
+        if (x == 1)
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            break;
+        else if (y == 2)
+>y == 2 : boolean
+>y : number
+>2 : number
+
+            y = 5;
+>y = 5 : number
+>y : number
+>5 : number
+
+        else
+            return;
+    }
+}
+
+function f2() {
+>f2 : () => void
+
+    for (let [{a: x, b: {c: y}}] = [{a: 1, b: {c: 2}}]; x < y; ++x, --y) {
+>a : any
+>x : number
+>b : any
+>c : any
+>y : number
+>[{a: 1, b: {c: 2}}] : [{ a: number; b: { c: number; }; }]
+>{a: 1, b: {c: 2}} : { a: number; b: { c: number; }; }
+>a : number
+>1 : number
+>b : { c: number; }
+>{c: 2} : { c: number; }
+>c : number
+>2 : number
+>x < y : boolean
+>x : number
+>y : number
+>++x, --y : number
+>++x : number
+>x : number
+>--y : number
+>y : number
+
+        let a = () => x++ + y++;
+>a : () => number
+>() => x++ + y++ : () => number
+>x++ + y++ : number
+>x++ : number
+>x : number
+>y++ : number
+>y : number
+
+        if (x == 1)
+>x == 1 : boolean
+>x : number
+>1 : number
+
+            break;
+        else if (y == 2)
+>y == 2 : boolean
+>y : number
+>2 : number
+
+            y = 5;
+>y = 5 : number
+>y : number
+>5 : number
+
+        else
+            return;
+    }
+}
+
+
+
+
+
+
diff --git a/tests/baselines/reference/blockScopedFunctionDeclarationES5.js b/tests/baselines/reference/blockScopedFunctionDeclarationES5.js
new file mode 100644
index 00000000000..066dd07351c
--- /dev/null
+++ b/tests/baselines/reference/blockScopedFunctionDeclarationES5.js
@@ -0,0 +1,13 @@
+//// [blockScopedFunctionDeclarationES5.ts]
+if (true) {
+    function foo() { }
+    foo();
+}
+foo();
+
+//// [blockScopedFunctionDeclarationES5.js]
+if (true) {
+    function foo() { }
+    foo();
+}
+foo();
diff --git a/tests/baselines/reference/blockScopedFunctionDeclarationES5.symbols b/tests/baselines/reference/blockScopedFunctionDeclarationES5.symbols
new file mode 100644
index 00000000000..5c8f82cf0ff
--- /dev/null
+++ b/tests/baselines/reference/blockScopedFunctionDeclarationES5.symbols
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/blockScopedFunctionDeclarationES5.ts ===
+if (true) {
+    function foo() { }
+>foo : Symbol(foo, Decl(blockScopedFunctionDeclarationES5.ts, 0, 11))
+
+    foo();
+>foo : Symbol(foo, Decl(blockScopedFunctionDeclarationES5.ts, 0, 11))
+}
+foo();
+>foo : Symbol(foo, Decl(blockScopedFunctionDeclarationES5.ts, 0, 11))
+
diff --git a/tests/baselines/reference/blockScopedFunctionDeclarationES5.types b/tests/baselines/reference/blockScopedFunctionDeclarationES5.types
new file mode 100644
index 00000000000..b3c4d9b7d73
--- /dev/null
+++ b/tests/baselines/reference/blockScopedFunctionDeclarationES5.types
@@ -0,0 +1,15 @@
+=== tests/cases/compiler/blockScopedFunctionDeclarationES5.ts ===
+if (true) {
+>true : boolean
+
+    function foo() { }
+>foo : () => void
+
+    foo();
+>foo() : void
+>foo : () => void
+}
+foo();
+>foo() : void
+>foo : () => void
+
diff --git a/tests/baselines/reference/blockScopedFunctionDeclarationES6.js b/tests/baselines/reference/blockScopedFunctionDeclarationES6.js
new file mode 100644
index 00000000000..32450cd66f1
--- /dev/null
+++ b/tests/baselines/reference/blockScopedFunctionDeclarationES6.js
@@ -0,0 +1,13 @@
+//// [blockScopedFunctionDeclarationES6.ts]
+if (true) {
+    function foo() { }
+    foo();
+}
+foo();
+
+//// [blockScopedFunctionDeclarationES6.js]
+if (true) {
+    function foo() { }
+    foo();
+}
+foo();
diff --git a/tests/baselines/reference/blockScopedFunctionDeclarationES6.symbols b/tests/baselines/reference/blockScopedFunctionDeclarationES6.symbols
new file mode 100644
index 00000000000..65fb133b446
--- /dev/null
+++ b/tests/baselines/reference/blockScopedFunctionDeclarationES6.symbols
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/blockScopedFunctionDeclarationES6.ts ===
+if (true) {
+    function foo() { }
+>foo : Symbol(foo, Decl(blockScopedFunctionDeclarationES6.ts, 0, 11))
+
+    foo();
+>foo : Symbol(foo, Decl(blockScopedFunctionDeclarationES6.ts, 0, 11))
+}
+foo();
+>foo : Symbol(foo, Decl(blockScopedFunctionDeclarationES6.ts, 0, 11))
+
diff --git a/tests/baselines/reference/blockScopedFunctionDeclarationES6.types b/tests/baselines/reference/blockScopedFunctionDeclarationES6.types
new file mode 100644
index 00000000000..7ab74feb0ed
--- /dev/null
+++ b/tests/baselines/reference/blockScopedFunctionDeclarationES6.types
@@ -0,0 +1,15 @@
+=== tests/cases/compiler/blockScopedFunctionDeclarationES6.ts ===
+if (true) {
+>true : boolean
+
+    function foo() { }
+>foo : () => void
+
+    foo();
+>foo() : void
+>foo : () => void
+}
+foo();
+>foo() : void
+>foo : () => void
+
diff --git a/tests/baselines/reference/blockScopedFunctionDeclarationInStrictClass.errors.txt b/tests/baselines/reference/blockScopedFunctionDeclarationInStrictClass.errors.txt
new file mode 100644
index 00000000000..efedfd097a6
--- /dev/null
+++ b/tests/baselines/reference/blockScopedFunctionDeclarationInStrictClass.errors.txt
@@ -0,0 +1,18 @@
+tests/cases/compiler/blockScopedFunctionDeclarationInStrictClass.ts(4,22): error TS1251: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Class definitions are automatically in strict mode.
+tests/cases/compiler/blockScopedFunctionDeclarationInStrictClass.ts(7,9): error TS2304: Cannot find name 'foo'.
+
+
+==== tests/cases/compiler/blockScopedFunctionDeclarationInStrictClass.ts (2 errors) ====
+    class c {
+        method() {
+            if (true) {
+                function foo() { }
+                         ~~~
+!!! error TS1251: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Class definitions are automatically in strict mode.
+                foo(); // ok
+            }
+            foo(); // not ok
+            ~~~
+!!! error TS2304: Cannot find name 'foo'.
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/blockScopedFunctionDeclarationInStrictClass.js b/tests/baselines/reference/blockScopedFunctionDeclarationInStrictClass.js
new file mode 100644
index 00000000000..70a00a95a41
--- /dev/null
+++ b/tests/baselines/reference/blockScopedFunctionDeclarationInStrictClass.js
@@ -0,0 +1,24 @@
+//// [blockScopedFunctionDeclarationInStrictClass.ts]
+class c {
+    method() {
+        if (true) {
+            function foo() { }
+            foo(); // ok
+        }
+        foo(); // not ok
+    }
+}
+
+//// [blockScopedFunctionDeclarationInStrictClass.js]
+var c = (function () {
+    function c() {
+    }
+    c.prototype.method = function () {
+        if (true) {
+            function foo() { }
+            foo(); // ok
+        }
+        foo(); // not ok
+    };
+    return c;
+}());
diff --git a/tests/baselines/reference/blockScopedFunctionDeclarationInStrictModule.errors.txt b/tests/baselines/reference/blockScopedFunctionDeclarationInStrictModule.errors.txt
new file mode 100644
index 00000000000..3f53ef24b58
--- /dev/null
+++ b/tests/baselines/reference/blockScopedFunctionDeclarationInStrictModule.errors.txt
@@ -0,0 +1,15 @@
+tests/cases/compiler/blockScopedFunctionDeclarationInStrictModule.ts(2,14): error TS1252: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Modules are automatically in strict mode.
+tests/cases/compiler/blockScopedFunctionDeclarationInStrictModule.ts(6,10): error TS2304: Cannot find name 'foo'.
+
+
+==== tests/cases/compiler/blockScopedFunctionDeclarationInStrictModule.ts (2 errors) ====
+    if (true) {
+        function foo() { }
+                 ~~~
+!!! error TS1252: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Modules are automatically in strict mode.
+        foo(); // ok
+    }
+    
+    export = foo; // not ok
+             ~~~
+!!! error TS2304: Cannot find name 'foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/blockScopedFunctionDeclarationInStrictModule.js b/tests/baselines/reference/blockScopedFunctionDeclarationInStrictModule.js
new file mode 100644
index 00000000000..cd118733e3c
--- /dev/null
+++ b/tests/baselines/reference/blockScopedFunctionDeclarationInStrictModule.js
@@ -0,0 +1,16 @@
+//// [blockScopedFunctionDeclarationInStrictModule.ts]
+if (true) {
+    function foo() { }
+    foo(); // ok
+}
+
+export = foo; // not ok
+
+//// [blockScopedFunctionDeclarationInStrictModule.js]
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    if (true) {
+        function foo() { }
+        foo(); // ok
+    }
+});
diff --git a/tests/baselines/reference/blockScopedFunctionDeclarationStrictES5.errors.txt b/tests/baselines/reference/blockScopedFunctionDeclarationStrictES5.errors.txt
new file mode 100644
index 00000000000..f945d0eacbf
--- /dev/null
+++ b/tests/baselines/reference/blockScopedFunctionDeclarationStrictES5.errors.txt
@@ -0,0 +1,15 @@
+tests/cases/compiler/blockScopedFunctionDeclarationStrictES5.ts(3,14): error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'.
+tests/cases/compiler/blockScopedFunctionDeclarationStrictES5.ts(6,1): error TS2304: Cannot find name 'foo'.
+
+
+==== tests/cases/compiler/blockScopedFunctionDeclarationStrictES5.ts (2 errors) ====
+    "use strict";
+    if (true) {
+        function foo() { } // Error to declare function in block scope
+                 ~~~
+!!! error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'.
+        foo(); // This call should be ok
+    }
+    foo(); // Error to find name foo
+    ~~~
+!!! error TS2304: Cannot find name 'foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/blockScopedFunctionDeclarationStrictES5.js b/tests/baselines/reference/blockScopedFunctionDeclarationStrictES5.js
new file mode 100644
index 00000000000..f0926cadf39
--- /dev/null
+++ b/tests/baselines/reference/blockScopedFunctionDeclarationStrictES5.js
@@ -0,0 +1,15 @@
+//// [blockScopedFunctionDeclarationStrictES5.ts]
+"use strict";
+if (true) {
+    function foo() { } // Error to declare function in block scope
+    foo(); // This call should be ok
+}
+foo(); // Error to find name foo
+
+//// [blockScopedFunctionDeclarationStrictES5.js]
+"use strict";
+if (true) {
+    function foo() { } // Error to declare function in block scope
+    foo(); // This call should be ok
+}
+foo(); // Error to find name foo
diff --git a/tests/baselines/reference/blockScopedFunctionDeclarationStrictES6.errors.txt b/tests/baselines/reference/blockScopedFunctionDeclarationStrictES6.errors.txt
new file mode 100644
index 00000000000..6772a29926b
--- /dev/null
+++ b/tests/baselines/reference/blockScopedFunctionDeclarationStrictES6.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/compiler/blockScopedFunctionDeclarationStrictES6.ts(6,1): error TS2304: Cannot find name 'foo'.
+
+
+==== tests/cases/compiler/blockScopedFunctionDeclarationStrictES6.ts (1 errors) ====
+    "use strict";
+    if (true) {
+        function foo() { } // Allowed to declare block scope function
+        foo(); // This call should be ok
+    }
+    foo(); // Cannot find name since foo is block scoped
+    ~~~
+!!! error TS2304: Cannot find name 'foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/blockScopedFunctionDeclarationStrictES6.js b/tests/baselines/reference/blockScopedFunctionDeclarationStrictES6.js
new file mode 100644
index 00000000000..0a1b263875b
--- /dev/null
+++ b/tests/baselines/reference/blockScopedFunctionDeclarationStrictES6.js
@@ -0,0 +1,15 @@
+//// [blockScopedFunctionDeclarationStrictES6.ts]
+"use strict";
+if (true) {
+    function foo() { } // Allowed to declare block scope function
+    foo(); // This call should be ok
+}
+foo(); // Cannot find name since foo is block scoped
+
+//// [blockScopedFunctionDeclarationStrictES6.js]
+"use strict";
+if (true) {
+    function foo() { } // Allowed to declare block scope function
+    foo(); // This call should be ok
+}
+foo(); // Cannot find name since foo is block scoped
diff --git a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES5.errors.txt b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES5.errors.txt
new file mode 100644
index 00000000000..3efa85d1cc7
--- /dev/null
+++ b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES5.errors.txt
@@ -0,0 +1,37 @@
+tests/cases/compiler/blockScopedSameNameFunctionDeclarationES5.ts(3,18): error TS2393: Duplicate function implementation.
+tests/cases/compiler/blockScopedSameNameFunctionDeclarationES5.ts(5,9): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/compiler/blockScopedSameNameFunctionDeclarationES5.ts(8,18): error TS2393: Duplicate function implementation.
+tests/cases/compiler/blockScopedSameNameFunctionDeclarationES5.ts(10,9): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/compiler/blockScopedSameNameFunctionDeclarationES5.ts(12,5): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/compiler/blockScopedSameNameFunctionDeclarationES5.ts(16,1): error TS2346: Supplied parameters do not match any signature of call target.
+
+
+==== tests/cases/compiler/blockScopedSameNameFunctionDeclarationES5.ts (6 errors) ====
+    function foo(a: number) {
+        if (a === 1) {
+            function foo() { } // duplicate function
+                     ~~~
+!!! error TS2393: Duplicate function implementation.
+            foo(); 
+            foo(10); // not ok
+            ~~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+        }
+        else {
+            function foo() { } // duplicate function
+                     ~~~
+!!! error TS2393: Duplicate function implementation.
+            foo(); 
+            foo(10); // not ok
+            ~~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+        }
+        foo(10); // not ok
+        ~~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+        foo(); 
+    }
+    foo(10);
+    foo(); // not ok - needs number
+    ~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
\ No newline at end of file
diff --git a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES5.js b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES5.js
new file mode 100644
index 00000000000..4c7721f9b43
--- /dev/null
+++ b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES5.js
@@ -0,0 +1,35 @@
+//// [blockScopedSameNameFunctionDeclarationES5.ts]
+function foo(a: number) {
+    if (a === 1) {
+        function foo() { } // duplicate function
+        foo(); 
+        foo(10); // not ok
+    }
+    else {
+        function foo() { } // duplicate function
+        foo(); 
+        foo(10); // not ok
+    }
+    foo(10); // not ok
+    foo(); 
+}
+foo(10);
+foo(); // not ok - needs number
+
+//// [blockScopedSameNameFunctionDeclarationES5.js]
+function foo(a) {
+    if (a === 1) {
+        function foo() { } // duplicate function
+        foo();
+        foo(10); // not ok
+    }
+    else {
+        function foo() { } // duplicate function
+        foo();
+        foo(10); // not ok
+    }
+    foo(10); // not ok
+    foo();
+}
+foo(10);
+foo(); // not ok - needs number
diff --git a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES6.errors.txt b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES6.errors.txt
new file mode 100644
index 00000000000..5d15278f098
--- /dev/null
+++ b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES6.errors.txt
@@ -0,0 +1,37 @@
+tests/cases/compiler/blockScopedSameNameFunctionDeclarationES6.ts(3,18): error TS2393: Duplicate function implementation.
+tests/cases/compiler/blockScopedSameNameFunctionDeclarationES6.ts(5,9): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/compiler/blockScopedSameNameFunctionDeclarationES6.ts(8,18): error TS2393: Duplicate function implementation.
+tests/cases/compiler/blockScopedSameNameFunctionDeclarationES6.ts(10,9): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/compiler/blockScopedSameNameFunctionDeclarationES6.ts(12,5): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/compiler/blockScopedSameNameFunctionDeclarationES6.ts(16,1): error TS2346: Supplied parameters do not match any signature of call target.
+
+
+==== tests/cases/compiler/blockScopedSameNameFunctionDeclarationES6.ts (6 errors) ====
+    function foo(a: number) {
+        if (a === 10) {
+            function foo() { } // duplicate
+                     ~~~
+!!! error TS2393: Duplicate function implementation.
+            foo();
+            foo(10); // not ok
+            ~~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+        }
+        else {
+            function foo() { } // duplicate
+                     ~~~
+!!! error TS2393: Duplicate function implementation.
+            foo();
+            foo(10);// not ok
+            ~~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+        }
+        foo(10); // not ok
+        ~~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+        foo(); 
+    }
+    foo(10);
+    foo(); // not ok - needs number
+    ~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
\ No newline at end of file
diff --git a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES6.js b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES6.js
new file mode 100644
index 00000000000..c793b74c60a
--- /dev/null
+++ b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationES6.js
@@ -0,0 +1,35 @@
+//// [blockScopedSameNameFunctionDeclarationES6.ts]
+function foo(a: number) {
+    if (a === 10) {
+        function foo() { } // duplicate
+        foo();
+        foo(10); // not ok
+    }
+    else {
+        function foo() { } // duplicate
+        foo();
+        foo(10);// not ok
+    }
+    foo(10); // not ok
+    foo(); 
+}
+foo(10);
+foo(); // not ok - needs number
+
+//// [blockScopedSameNameFunctionDeclarationES6.js]
+function foo(a) {
+    if (a === 10) {
+        function foo() { } // duplicate
+        foo();
+        foo(10); // not ok
+    }
+    else {
+        function foo() { } // duplicate
+        foo();
+        foo(10); // not ok
+    }
+    foo(10); // not ok
+    foo();
+}
+foo(10);
+foo(); // not ok - needs number
diff --git a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES5.errors.txt b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES5.errors.txt
new file mode 100644
index 00000000000..36ce2d8c488
--- /dev/null
+++ b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES5.errors.txt
@@ -0,0 +1,38 @@
+tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts(4,18): error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'.
+tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts(6,9): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts(9,18): error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'.
+tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts(11,9): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts(14,5): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts(17,1): error TS2346: Supplied parameters do not match any signature of call target.
+
+
+==== tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts (6 errors) ====
+    "use strict";
+    function foo(a: number) {
+        if (a === 1) {
+            function foo() { } // Error to declare function in block scope
+                     ~~~
+!!! error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'.
+            foo();
+            foo(10); // not ok
+            ~~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+        }
+        else {
+            function foo() { } // Error to declare function in block scope
+                     ~~~
+!!! error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'.
+            foo();
+            foo(10); // not ok
+            ~~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+        }
+        foo(10);
+        foo(); // not ok - needs number
+        ~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+    }
+    foo(10);
+    foo(); // not ok - needs number
+    ~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
\ No newline at end of file
diff --git a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES5.js b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES5.js
new file mode 100644
index 00000000000..b51be0493cd
--- /dev/null
+++ b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES5.js
@@ -0,0 +1,37 @@
+//// [blockScopedSameNameFunctionDeclarationStrictES5.ts]
+"use strict";
+function foo(a: number) {
+    if (a === 1) {
+        function foo() { } // Error to declare function in block scope
+        foo();
+        foo(10); // not ok
+    }
+    else {
+        function foo() { } // Error to declare function in block scope
+        foo();
+        foo(10); // not ok
+    }
+    foo(10);
+    foo(); // not ok - needs number
+}
+foo(10);
+foo(); // not ok - needs number
+
+//// [blockScopedSameNameFunctionDeclarationStrictES5.js]
+"use strict";
+function foo(a) {
+    if (a === 1) {
+        function foo() { } // Error to declare function in block scope
+        foo();
+        foo(10); // not ok
+    }
+    else {
+        function foo() { } // Error to declare function in block scope
+        foo();
+        foo(10); // not ok
+    }
+    foo(10);
+    foo(); // not ok - needs number
+}
+foo(10);
+foo(); // not ok - needs number
diff --git a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES6.errors.txt b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES6.errors.txt
new file mode 100644
index 00000000000..7b8834c5594
--- /dev/null
+++ b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES6.errors.txt
@@ -0,0 +1,32 @@
+tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES6.ts(6,9): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES6.ts(11,9): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES6.ts(14,5): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES6.ts(17,1): error TS2346: Supplied parameters do not match any signature of call target.
+
+
+==== tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES6.ts (4 errors) ====
+    "use strict";
+    function foo(a: number) {
+        if (a === 10) {
+            function foo() { }
+            foo();
+            foo(10); // not ok
+            ~~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+        }
+        else {
+            function foo() { } 
+            foo();
+            foo(10); // not ok
+            ~~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+        }
+        foo(10);
+        foo(); // not ok
+        ~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+    }
+    foo(10);
+    foo(); // not ok - needs number
+    ~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
\ No newline at end of file
diff --git a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES6.js b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES6.js
new file mode 100644
index 00000000000..863df86c031
--- /dev/null
+++ b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES6.js
@@ -0,0 +1,37 @@
+//// [blockScopedSameNameFunctionDeclarationStrictES6.ts]
+"use strict";
+function foo(a: number) {
+    if (a === 10) {
+        function foo() { }
+        foo();
+        foo(10); // not ok
+    }
+    else {
+        function foo() { } 
+        foo();
+        foo(10); // not ok
+    }
+    foo(10);
+    foo(); // not ok
+}
+foo(10);
+foo(); // not ok - needs number
+
+//// [blockScopedSameNameFunctionDeclarationStrictES6.js]
+"use strict";
+function foo(a) {
+    if (a === 10) {
+        function foo() { }
+        foo();
+        foo(10); // not ok
+    }
+    else {
+        function foo() { }
+        foo();
+        foo(10); // not ok
+    }
+    foo(10);
+    foo(); // not ok
+}
+foo(10);
+foo(); // not ok - needs number
diff --git a/tests/baselines/reference/bluebirdStaticThis.errors.txt b/tests/baselines/reference/bluebirdStaticThis.errors.txt
new file mode 100644
index 00000000000..6e78a90db4b
--- /dev/null
+++ b/tests/baselines/reference/bluebirdStaticThis.errors.txt
@@ -0,0 +1,164 @@
+tests/cases/compiler/bluebirdStaticThis.ts(5,15): error TS2420: Class 'Promise<R>' incorrectly implements interface 'Thenable<R>'.
+  Property 'then' is missing in type 'Promise<R>'.
+tests/cases/compiler/bluebirdStaticThis.ts(22,51): error TS2305: Module 'Promise' has no exported member 'Resolver'.
+tests/cases/compiler/bluebirdStaticThis.ts(57,109): error TS2305: Module 'Promise' has no exported member 'Inspection'.
+tests/cases/compiler/bluebirdStaticThis.ts(58,91): error TS2305: Module 'Promise' has no exported member 'Inspection'.
+tests/cases/compiler/bluebirdStaticThis.ts(59,91): error TS2305: Module 'Promise' has no exported member 'Inspection'.
+tests/cases/compiler/bluebirdStaticThis.ts(60,73): error TS2305: Module 'Promise' has no exported member 'Inspection'.
+
+
+==== tests/cases/compiler/bluebirdStaticThis.ts (6 errors) ====
+    // This version is reduced from the full d.ts by removing almost all the tests
+    // and all the comments.
+    // Then it adds explicit `this` arguments to the static members.
+    // Tests by: Bart van der Schoor <https://github.com/Bartvds>
+    declare class Promise<R> implements Promise.Thenable<R> {
+                  ~~~~~~~
+!!! error TS2420: Class 'Promise<R>' incorrectly implements interface 'Thenable<R>'.
+!!! error TS2420:   Property 'then' is missing in type 'Promise<R>'.
+    	constructor(callback: (resolve: (thenableOrResult: R | Promise.Thenable<R>) => void, reject: (error: any) => void) => void);
+        static try<R>(dit: typeof Promise, fn: () => Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>;
+        static try<R>(dit: typeof Promise, fn: () => R, args?: any[], ctx?: any): Promise<R>;
+    
+        static attempt<R>(dit: typeof Promise, fn: () => Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>;
+        static attempt<R>(dit: typeof Promise, fn: () => R, args?: any[], ctx?: any): Promise<R>;
+    
+        static method(dit: typeof Promise, fn: Function): Function;
+    
+        static resolve(dit: typeof Promise): Promise<void>;
+        static resolve<R>(dit: typeof Promise, value: Promise.Thenable<R>): Promise<R>;
+        static resolve<R>(dit: typeof Promise, value: R): Promise<R>;
+    
+        static reject(dit: typeof Promise, reason: any): Promise<any>;
+        static reject<R>(dit: typeof Promise, reason: any): Promise<R>;
+    
+        static defer<R>(dit: typeof Promise): Promise.Resolver<R>;
+                                                      ~~~~~~~~
+!!! error TS2305: Module 'Promise' has no exported member 'Resolver'.
+    
+        static cast<R>(dit: typeof Promise, value: Promise.Thenable<R>): Promise<R>;
+        static cast<R>(dit: typeof Promise, value: R): Promise<R>;
+    
+        static bind(dit: typeof Promise, thisArg: any): Promise<void>;
+    
+        static is(dit: typeof Promise, value: any): boolean;
+    
+        static longStackTraces(dit: typeof Promise): void;
+    
+        static delay<R>(dit: typeof Promise, value: Promise.Thenable<R>, ms: number): Promise<R>;
+        static delay<R>(dit: typeof Promise, value: R, ms: number): Promise<R>;
+        static delay(dit: typeof Promise, ms: number): Promise<void>;
+    
+        static promisify(dit: typeof Promise, nodeFunction: Function, receiver?: any): Function;
+    
+        static promisifyAll(dit: typeof Promise, target: Object): Object;
+    
+        static coroutine<R>(dit: typeof Promise, generatorFunction: Function): Function;
+    
+        static spawn<R>(dit: typeof Promise, generatorFunction: Function): Promise<R>;
+    
+        static noConflict(dit: typeof Promise): typeof Promise;
+    
+        static onPossiblyUnhandledRejection(dit: typeof Promise, handler: (reason: any) => any): void;
+    
+        static all<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<R[]>;
+        static all<R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R[]>;
+        static all<R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R[]>;
+        static all<R>(dit: typeof Promise, values: R[]): Promise<R[]>;
+    
+        static props(dit: typeof Promise, object: Promise<Object>): Promise<Object>;
+        static props(dit: typeof Promise, object: Object): Promise<Object>;
+    
+        static settle<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<Promise.Inspection<R>[]>;
+                                                                                                                ~~~~~~~~~~
+!!! error TS2305: Module 'Promise' has no exported member 'Inspection'.
+        static settle<R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<Promise.Inspection<R>[]>;
+                                                                                              ~~~~~~~~~~
+!!! error TS2305: Module 'Promise' has no exported member 'Inspection'.
+        static settle<R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<Promise.Inspection<R>[]>;
+                                                                                              ~~~~~~~~~~
+!!! error TS2305: Module 'Promise' has no exported member 'Inspection'.
+        static settle<R>(dit: typeof Promise, values: R[]): Promise<Promise.Inspection<R>[]>;
+                                                                            ~~~~~~~~~~
+!!! error TS2305: Module 'Promise' has no exported member 'Inspection'.
+    
+        static any<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<R>;
+        static any<R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R>;
+        static any<R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R>;
+        static any<R>(dit: typeof Promise, values: R[]): Promise<R>;
+    
+        static race<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<R>;
+        static race<R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R>;
+        static race<R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R>;
+        static race<R>(dit: typeof Promise, values: R[]): Promise<R>;
+    
+        static some<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, count: number): Promise<R[]>;
+        static some<R>(dit: typeof Promise, values: Promise.Thenable<R[]>, count: number): Promise<R[]>;
+        static some<R>(dit: typeof Promise, values: Promise.Thenable<R>[], count: number): Promise<R[]>;
+        static some<R>(dit: typeof Promise, values: R[], count: number): Promise<R[]>;
+    
+        static join<R>(dit: typeof Promise, ...values: Promise.Thenable<R>[]): Promise<R[]>;
+        static join<R>(dit: typeof Promise, ...values: R[]): Promise<R[]>;
+    
+        static map<R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>;
+        static map<R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>;
+        static map<R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>;
+        static map<R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>;
+        static map<R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>;
+        static map<R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>;
+        static map<R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>;
+        static map<R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>;
+    
+        static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>;
+        static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>;
+    
+        static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>;
+        static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>;
+    
+        static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>;
+        static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>;
+    
+        static reduce<R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>;
+        static reduce<R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>;
+    
+        static filter<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>;
+        static filter<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>;
+        static filter<R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>;
+        static filter<R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>;
+        static filter<R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>;
+        static filter<R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>;
+        static filter<R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>;
+        static filter<R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>;
+    }
+    
+    declare module Promise {
+    	export interface Thenable<R> {
+    		then<U>(onFulfilled: (value: R) => Thenable<U>, onRejected: (error: any) => Thenable<U>): Thenable<U>;
+    		then<U>(onFulfilled: (value: R) => Thenable<U>, onRejected?: (error: any) => U): Thenable<U>;
+    		then<U>(onFulfilled: (value: R) => U, onRejected: (error: any) => Thenable<U>): Thenable<U>;
+    		then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): Thenable<U>;
+    	}
+    
+    }
+    
+    declare module 'bluebird' {
+    	export = Promise;
+    }
+    interface Foo {
+        a: number;
+        b: string;
+    }
+    var x: any;
+    var arr: any[];
+    var foo: Foo;
+    var fooProm: Promise<Foo>;
+    
+    fooProm = Promise.try(Promise, () => {
+    	return foo;
+    });
+    fooProm = Promise.try(Promise, () => {
+    	return foo;
+    }, arr);
+    fooProm = Promise.try(Promise, () => {
+    	return foo;
+    }, arr, x);
\ No newline at end of file
diff --git a/tests/baselines/reference/bluebirdStaticThis.js b/tests/baselines/reference/bluebirdStaticThis.js
new file mode 100644
index 00000000000..301f32319a7
--- /dev/null
+++ b/tests/baselines/reference/bluebirdStaticThis.js
@@ -0,0 +1,157 @@
+//// [bluebirdStaticThis.ts]
+// This version is reduced from the full d.ts by removing almost all the tests
+// and all the comments.
+// Then it adds explicit `this` arguments to the static members.
+// Tests by: Bart van der Schoor <https://github.com/Bartvds>
+declare class Promise<R> implements Promise.Thenable<R> {
+	constructor(callback: (resolve: (thenableOrResult: R | Promise.Thenable<R>) => void, reject: (error: any) => void) => void);
+    static try<R>(dit: typeof Promise, fn: () => Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>;
+    static try<R>(dit: typeof Promise, fn: () => R, args?: any[], ctx?: any): Promise<R>;
+
+    static attempt<R>(dit: typeof Promise, fn: () => Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>;
+    static attempt<R>(dit: typeof Promise, fn: () => R, args?: any[], ctx?: any): Promise<R>;
+
+    static method(dit: typeof Promise, fn: Function): Function;
+
+    static resolve(dit: typeof Promise): Promise<void>;
+    static resolve<R>(dit: typeof Promise, value: Promise.Thenable<R>): Promise<R>;
+    static resolve<R>(dit: typeof Promise, value: R): Promise<R>;
+
+    static reject(dit: typeof Promise, reason: any): Promise<any>;
+    static reject<R>(dit: typeof Promise, reason: any): Promise<R>;
+
+    static defer<R>(dit: typeof Promise): Promise.Resolver<R>;
+
+    static cast<R>(dit: typeof Promise, value: Promise.Thenable<R>): Promise<R>;
+    static cast<R>(dit: typeof Promise, value: R): Promise<R>;
+
+    static bind(dit: typeof Promise, thisArg: any): Promise<void>;
+
+    static is(dit: typeof Promise, value: any): boolean;
+
+    static longStackTraces(dit: typeof Promise): void;
+
+    static delay<R>(dit: typeof Promise, value: Promise.Thenable<R>, ms: number): Promise<R>;
+    static delay<R>(dit: typeof Promise, value: R, ms: number): Promise<R>;
+    static delay(dit: typeof Promise, ms: number): Promise<void>;
+
+    static promisify(dit: typeof Promise, nodeFunction: Function, receiver?: any): Function;
+
+    static promisifyAll(dit: typeof Promise, target: Object): Object;
+
+    static coroutine<R>(dit: typeof Promise, generatorFunction: Function): Function;
+
+    static spawn<R>(dit: typeof Promise, generatorFunction: Function): Promise<R>;
+
+    static noConflict(dit: typeof Promise): typeof Promise;
+
+    static onPossiblyUnhandledRejection(dit: typeof Promise, handler: (reason: any) => any): void;
+
+    static all<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<R[]>;
+    static all<R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R[]>;
+    static all<R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R[]>;
+    static all<R>(dit: typeof Promise, values: R[]): Promise<R[]>;
+
+    static props(dit: typeof Promise, object: Promise<Object>): Promise<Object>;
+    static props(dit: typeof Promise, object: Object): Promise<Object>;
+
+    static settle<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<Promise.Inspection<R>[]>;
+    static settle<R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<Promise.Inspection<R>[]>;
+    static settle<R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<Promise.Inspection<R>[]>;
+    static settle<R>(dit: typeof Promise, values: R[]): Promise<Promise.Inspection<R>[]>;
+
+    static any<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<R>;
+    static any<R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R>;
+    static any<R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R>;
+    static any<R>(dit: typeof Promise, values: R[]): Promise<R>;
+
+    static race<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<R>;
+    static race<R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R>;
+    static race<R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R>;
+    static race<R>(dit: typeof Promise, values: R[]): Promise<R>;
+
+    static some<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, count: number): Promise<R[]>;
+    static some<R>(dit: typeof Promise, values: Promise.Thenable<R[]>, count: number): Promise<R[]>;
+    static some<R>(dit: typeof Promise, values: Promise.Thenable<R>[], count: number): Promise<R[]>;
+    static some<R>(dit: typeof Promise, values: R[], count: number): Promise<R[]>;
+
+    static join<R>(dit: typeof Promise, ...values: Promise.Thenable<R>[]): Promise<R[]>;
+    static join<R>(dit: typeof Promise, ...values: R[]): Promise<R[]>;
+
+    static map<R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>;
+    static map<R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>;
+    static map<R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>;
+    static map<R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>;
+    static map<R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>;
+    static map<R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>;
+    static map<R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>;
+    static map<R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>;
+
+    static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>;
+    static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>;
+
+    static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>;
+    static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>;
+
+    static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>;
+    static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>;
+
+    static reduce<R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>;
+    static reduce<R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>;
+
+    static filter<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>;
+    static filter<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>;
+    static filter<R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>;
+    static filter<R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>;
+    static filter<R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>;
+    static filter<R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>;
+    static filter<R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>;
+    static filter<R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>;
+}
+
+declare module Promise {
+	export interface Thenable<R> {
+		then<U>(onFulfilled: (value: R) => Thenable<U>, onRejected: (error: any) => Thenable<U>): Thenable<U>;
+		then<U>(onFulfilled: (value: R) => Thenable<U>, onRejected?: (error: any) => U): Thenable<U>;
+		then<U>(onFulfilled: (value: R) => U, onRejected: (error: any) => Thenable<U>): Thenable<U>;
+		then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): Thenable<U>;
+	}
+
+}
+
+declare module 'bluebird' {
+	export = Promise;
+}
+interface Foo {
+    a: number;
+    b: string;
+}
+var x: any;
+var arr: any[];
+var foo: Foo;
+var fooProm: Promise<Foo>;
+
+fooProm = Promise.try(Promise, () => {
+	return foo;
+});
+fooProm = Promise.try(Promise, () => {
+	return foo;
+}, arr);
+fooProm = Promise.try(Promise, () => {
+	return foo;
+}, arr, x);
+
+//// [bluebirdStaticThis.js]
+var x;
+var arr;
+var foo;
+var fooProm;
+fooProm = Promise.try(Promise, function () {
+    return foo;
+});
+fooProm = Promise.try(Promise, function () {
+    return foo;
+}, arr);
+fooProm = Promise.try(Promise, function () {
+    return foo;
+}, arr, x);
diff --git a/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.symbols b/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.symbols
index 107650c530e..83f18f2d41d 100644
--- a/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.symbols
+++ b/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.symbols
@@ -38,7 +38,7 @@ class C {
 >C : Symbol(C, Decl(callGenericFunctionWithZeroTypeArguments.ts, 9, 15))
 
     f<T>(x: T): T {
->f : Symbol(f, Decl(callGenericFunctionWithZeroTypeArguments.ts, 11, 9))
+>f : Symbol(C.f, Decl(callGenericFunctionWithZeroTypeArguments.ts, 11, 9))
 >T : Symbol(T, Decl(callGenericFunctionWithZeroTypeArguments.ts, 12, 6))
 >x : Symbol(x, Decl(callGenericFunctionWithZeroTypeArguments.ts, 12, 9))
 >T : Symbol(T, Decl(callGenericFunctionWithZeroTypeArguments.ts, 12, 6))
@@ -57,7 +57,7 @@ interface I {
 >I : Symbol(I, Decl(callGenericFunctionWithZeroTypeArguments.ts, 16, 24))
 
     f<T>(x: T): T;
->f : Symbol(f, Decl(callGenericFunctionWithZeroTypeArguments.ts, 18, 13))
+>f : Symbol(I.f, Decl(callGenericFunctionWithZeroTypeArguments.ts, 18, 13))
 >T : Symbol(T, Decl(callGenericFunctionWithZeroTypeArguments.ts, 19, 6))
 >x : Symbol(x, Decl(callGenericFunctionWithZeroTypeArguments.ts, 19, 9))
 >T : Symbol(T, Decl(callGenericFunctionWithZeroTypeArguments.ts, 19, 6))
@@ -78,7 +78,7 @@ class C2<T> {
 >T : Symbol(T, Decl(callGenericFunctionWithZeroTypeArguments.ts, 24, 9))
 
     f(x: T): T {
->f : Symbol(f, Decl(callGenericFunctionWithZeroTypeArguments.ts, 24, 13))
+>f : Symbol(C2.f, Decl(callGenericFunctionWithZeroTypeArguments.ts, 24, 13))
 >x : Symbol(x, Decl(callGenericFunctionWithZeroTypeArguments.ts, 25, 6))
 >T : Symbol(T, Decl(callGenericFunctionWithZeroTypeArguments.ts, 24, 9))
 >T : Symbol(T, Decl(callGenericFunctionWithZeroTypeArguments.ts, 24, 9))
@@ -97,7 +97,7 @@ interface I2<T> {
 >T : Symbol(T, Decl(callGenericFunctionWithZeroTypeArguments.ts, 31, 13))
 
     f(x: T): T;
->f : Symbol(f, Decl(callGenericFunctionWithZeroTypeArguments.ts, 31, 17))
+>f : Symbol(I2.f, Decl(callGenericFunctionWithZeroTypeArguments.ts, 31, 17))
 >x : Symbol(x, Decl(callGenericFunctionWithZeroTypeArguments.ts, 32, 6))
 >T : Symbol(T, Decl(callGenericFunctionWithZeroTypeArguments.ts, 31, 13))
 >T : Symbol(T, Decl(callGenericFunctionWithZeroTypeArguments.ts, 31, 13))
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance2.symbols b/tests/baselines/reference/callSignatureAssignabilityInInheritance2.symbols
index 12bc165575b..f1fa53d7b6c 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance2.symbols
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance2.symbols
@@ -3,51 +3,51 @@
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance2.ts, 0, 0))
->foo : Symbol(foo, Decl(callSignatureAssignabilityInInheritance2.ts, 2, 12))
+>foo : Symbol(Base.foo, Decl(callSignatureAssignabilityInInheritance2.ts, 2, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance2.ts, 2, 27))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance2.ts, 0, 0))
->bar : Symbol(bar, Decl(callSignatureAssignabilityInInheritance2.ts, 3, 28))
+>bar : Symbol(Derived.bar, Decl(callSignatureAssignabilityInInheritance2.ts, 3, 28))
 
 class Derived2 extends Derived { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(callSignatureAssignabilityInInheritance2.ts, 3, 43))
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance2.ts, 2, 27))
->baz : Symbol(baz, Decl(callSignatureAssignabilityInInheritance2.ts, 4, 32))
+>baz : Symbol(Derived2.baz, Decl(callSignatureAssignabilityInInheritance2.ts, 4, 32))
 
 class OtherDerived extends Base { bing: string; }
 >OtherDerived : Symbol(OtherDerived, Decl(callSignatureAssignabilityInInheritance2.ts, 4, 47))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance2.ts, 0, 0))
->bing : Symbol(bing, Decl(callSignatureAssignabilityInInheritance2.ts, 5, 33))
+>bing : Symbol(OtherDerived.bing, Decl(callSignatureAssignabilityInInheritance2.ts, 5, 33))
 
 interface A { // T
 >A : Symbol(A, Decl(callSignatureAssignabilityInInheritance2.ts, 5, 49))
 
     // M's
     a: (x: number) => number[];
->a : Symbol(a, Decl(callSignatureAssignabilityInInheritance2.ts, 7, 13))
+>a : Symbol(A.a, Decl(callSignatureAssignabilityInInheritance2.ts, 7, 13))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 9, 8))
 
     a2: (x: number) => string[];
->a2 : Symbol(a2, Decl(callSignatureAssignabilityInInheritance2.ts, 9, 31))
+>a2 : Symbol(A.a2, Decl(callSignatureAssignabilityInInheritance2.ts, 9, 31))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 10, 9))
 
     a3: (x: number) => void;
->a3 : Symbol(a3, Decl(callSignatureAssignabilityInInheritance2.ts, 10, 32))
+>a3 : Symbol(A.a3, Decl(callSignatureAssignabilityInInheritance2.ts, 10, 32))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 11, 9))
 
     a4: (x: string, y: number) => string;
->a4 : Symbol(a4, Decl(callSignatureAssignabilityInInheritance2.ts, 11, 28))
+>a4 : Symbol(A.a4, Decl(callSignatureAssignabilityInInheritance2.ts, 11, 28))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 12, 9))
 >y : Symbol(y, Decl(callSignatureAssignabilityInInheritance2.ts, 12, 19))
 
     a5: (x: (arg: string) => number) => string;
->a5 : Symbol(a5, Decl(callSignatureAssignabilityInInheritance2.ts, 12, 41))
+>a5 : Symbol(A.a5, Decl(callSignatureAssignabilityInInheritance2.ts, 12, 41))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 13, 9))
 >arg : Symbol(arg, Decl(callSignatureAssignabilityInInheritance2.ts, 13, 13))
 
     a6: (x: (arg: Base) => Derived) => Base;
->a6 : Symbol(a6, Decl(callSignatureAssignabilityInInheritance2.ts, 13, 47))
+>a6 : Symbol(A.a6, Decl(callSignatureAssignabilityInInheritance2.ts, 13, 47))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 14, 9))
 >arg : Symbol(arg, Decl(callSignatureAssignabilityInInheritance2.ts, 14, 13))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance2.ts, 0, 0))
@@ -55,7 +55,7 @@ interface A { // T
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance2.ts, 0, 0))
 
     a7: (x: (arg: Base) => Derived) => (r: Base) => Derived;
->a7 : Symbol(a7, Decl(callSignatureAssignabilityInInheritance2.ts, 14, 44))
+>a7 : Symbol(A.a7, Decl(callSignatureAssignabilityInInheritance2.ts, 14, 44))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 15, 9))
 >arg : Symbol(arg, Decl(callSignatureAssignabilityInInheritance2.ts, 15, 13))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance2.ts, 0, 0))
@@ -65,7 +65,7 @@ interface A { // T
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance2.ts, 2, 27))
 
     a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
->a8 : Symbol(a8, Decl(callSignatureAssignabilityInInheritance2.ts, 15, 60))
+>a8 : Symbol(A.a8, Decl(callSignatureAssignabilityInInheritance2.ts, 15, 60))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 16, 9))
 >arg : Symbol(arg, Decl(callSignatureAssignabilityInInheritance2.ts, 16, 13))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance2.ts, 0, 0))
@@ -79,7 +79,7 @@ interface A { // T
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance2.ts, 2, 27))
 
     a9: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
->a9 : Symbol(a9, Decl(callSignatureAssignabilityInInheritance2.ts, 16, 88))
+>a9 : Symbol(A.a9, Decl(callSignatureAssignabilityInInheritance2.ts, 16, 88))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 17, 9))
 >arg : Symbol(arg, Decl(callSignatureAssignabilityInInheritance2.ts, 17, 13))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance2.ts, 0, 0))
@@ -93,13 +93,13 @@ interface A { // T
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance2.ts, 2, 27))
 
     a10: (...x: Derived[]) => Derived;
->a10 : Symbol(a10, Decl(callSignatureAssignabilityInInheritance2.ts, 17, 88))
+>a10 : Symbol(A.a10, Decl(callSignatureAssignabilityInInheritance2.ts, 17, 88))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 18, 10))
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance2.ts, 2, 27))
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance2.ts, 2, 27))
 
     a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
->a11 : Symbol(a11, Decl(callSignatureAssignabilityInInheritance2.ts, 18, 38))
+>a11 : Symbol(A.a11, Decl(callSignatureAssignabilityInInheritance2.ts, 18, 38))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 19, 10))
 >foo : Symbol(foo, Decl(callSignatureAssignabilityInInheritance2.ts, 19, 14))
 >y : Symbol(y, Decl(callSignatureAssignabilityInInheritance2.ts, 19, 29))
@@ -108,7 +108,7 @@ interface A { // T
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance2.ts, 0, 0))
 
     a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
->a12 : Symbol(a12, Decl(callSignatureAssignabilityInInheritance2.ts, 19, 71))
+>a12 : Symbol(A.a12, Decl(callSignatureAssignabilityInInheritance2.ts, 19, 71))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 20, 10))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance2.ts, 0, 0))
@@ -119,7 +119,7 @@ interface A { // T
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance2.ts, 2, 27))
 
     a13: (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
->a13 : Symbol(a13, Decl(callSignatureAssignabilityInInheritance2.ts, 20, 64))
+>a13 : Symbol(A.a13, Decl(callSignatureAssignabilityInInheritance2.ts, 20, 64))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 21, 10))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance2.ts, 0, 0))
@@ -130,14 +130,14 @@ interface A { // T
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance2.ts, 2, 27))
 
     a14: (x: { a: string; b: number }) => Object;
->a14 : Symbol(a14, Decl(callSignatureAssignabilityInInheritance2.ts, 21, 63))
+>a14 : Symbol(A.a14, Decl(callSignatureAssignabilityInInheritance2.ts, 21, 63))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 22, 10))
 >a : Symbol(a, Decl(callSignatureAssignabilityInInheritance2.ts, 22, 14))
 >b : Symbol(b, Decl(callSignatureAssignabilityInInheritance2.ts, 22, 25))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     a15: {
->a15 : Symbol(a15, Decl(callSignatureAssignabilityInInheritance2.ts, 22, 49))
+>a15 : Symbol(A.a15, Decl(callSignatureAssignabilityInInheritance2.ts, 22, 49))
 
         (x: number): number[];
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 24, 9))
@@ -147,7 +147,7 @@ interface A { // T
 
     };
     a16: {
->a16 : Symbol(a16, Decl(callSignatureAssignabilityInInheritance2.ts, 26, 6))
+>a16 : Symbol(A.a16, Decl(callSignatureAssignabilityInInheritance2.ts, 26, 6))
 
         <T extends Derived>(x: T): number[];
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 28, 9))
@@ -163,7 +163,7 @@ interface A { // T
 
     };
     a17: {
->a17 : Symbol(a17, Decl(callSignatureAssignabilityInInheritance2.ts, 30, 6))
+>a17 : Symbol(A.a17, Decl(callSignatureAssignabilityInInheritance2.ts, 30, 6))
 
         (x: (a: number) => number): number[];
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 32, 9))
@@ -175,7 +175,7 @@ interface A { // T
 
     };
     a18: {
->a18 : Symbol(a18, Decl(callSignatureAssignabilityInInheritance2.ts, 34, 6))
+>a18 : Symbol(A.a18, Decl(callSignatureAssignabilityInInheritance2.ts, 34, 6))
 
         (x: {
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 36, 9))
@@ -195,8 +195,8 @@ interface A { // T
 
             (a: Date): Date;
 >a : Symbol(a, Decl(callSignatureAssignabilityInInheritance2.ts, 42, 13))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
         }): any[];
     };
@@ -209,27 +209,27 @@ interface I extends A {
 
     // N's
     a: <T>(x: T) => T[]; // ok, instantiation of N is a subtype of M, T is number
->a : Symbol(a, Decl(callSignatureAssignabilityInInheritance2.ts, 48, 23))
+>a : Symbol(I.a, Decl(callSignatureAssignabilityInInheritance2.ts, 48, 23))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 50, 8))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 50, 11))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 50, 8))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 50, 8))
 
     a2: <T>(x: T) => string[]; // ok
->a2 : Symbol(a2, Decl(callSignatureAssignabilityInInheritance2.ts, 50, 24))
+>a2 : Symbol(I.a2, Decl(callSignatureAssignabilityInInheritance2.ts, 50, 24))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 51, 9))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 51, 12))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 51, 9))
 
     a3: <T>(x: T) => T; // ok since Base returns void
->a3 : Symbol(a3, Decl(callSignatureAssignabilityInInheritance2.ts, 51, 30))
+>a3 : Symbol(I.a3, Decl(callSignatureAssignabilityInInheritance2.ts, 51, 30))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 52, 9))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 52, 12))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 52, 9))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 52, 9))
 
     a4: <T, U>(x: T, y: U) => T; // ok, instantiation of N is a subtype of M, T is string, U is number
->a4 : Symbol(a4, Decl(callSignatureAssignabilityInInheritance2.ts, 52, 23))
+>a4 : Symbol(I.a4, Decl(callSignatureAssignabilityInInheritance2.ts, 52, 23))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 53, 9))
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance2.ts, 53, 11))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 53, 15))
@@ -239,7 +239,7 @@ interface I extends A {
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 53, 9))
 
     a5: <T, U>(x: (arg: T) => U) => T; // ok, U is in a parameter position so inferences can be made
->a5 : Symbol(a5, Decl(callSignatureAssignabilityInInheritance2.ts, 53, 32))
+>a5 : Symbol(I.a5, Decl(callSignatureAssignabilityInInheritance2.ts, 53, 32))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 54, 9))
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance2.ts, 54, 11))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 54, 15))
@@ -249,7 +249,7 @@ interface I extends A {
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 54, 9))
 
     a6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; // ok, same as a5 but with object type hierarchy
->a6 : Symbol(a6, Decl(callSignatureAssignabilityInInheritance2.ts, 54, 38))
+>a6 : Symbol(I.a6, Decl(callSignatureAssignabilityInInheritance2.ts, 54, 38))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 55, 9))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance2.ts, 0, 0))
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance2.ts, 55, 24))
@@ -261,7 +261,7 @@ interface I extends A {
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 55, 9))
 
     a7: <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; // ok
->a7 : Symbol(a7, Decl(callSignatureAssignabilityInInheritance2.ts, 55, 67))
+>a7 : Symbol(I.a7, Decl(callSignatureAssignabilityInInheritance2.ts, 55, 67))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 56, 9))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance2.ts, 0, 0))
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance2.ts, 56, 24))
@@ -275,7 +275,7 @@ interface I extends A {
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance2.ts, 56, 24))
 
     a8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U; // ok
->a8 : Symbol(a8, Decl(callSignatureAssignabilityInInheritance2.ts, 56, 77))
+>a8 : Symbol(I.a8, Decl(callSignatureAssignabilityInInheritance2.ts, 56, 77))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 57, 9))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance2.ts, 0, 0))
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance2.ts, 57, 24))
@@ -293,7 +293,7 @@ interface I extends A {
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance2.ts, 57, 24))
 
     a9: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; // ok, same as a8 with compatible object literal
->a9 : Symbol(a9, Decl(callSignatureAssignabilityInInheritance2.ts, 57, 96))
+>a9 : Symbol(I.a9, Decl(callSignatureAssignabilityInInheritance2.ts, 57, 96))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 58, 9))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance2.ts, 0, 0))
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance2.ts, 58, 24))
@@ -312,7 +312,7 @@ interface I extends A {
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance2.ts, 58, 24))
 
     a10: <T extends Derived>(...x: T[]) => T; // ok
->a10 : Symbol(a10, Decl(callSignatureAssignabilityInInheritance2.ts, 58, 124))
+>a10 : Symbol(I.a10, Decl(callSignatureAssignabilityInInheritance2.ts, 58, 124))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 59, 10))
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance2.ts, 2, 27))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 59, 29))
@@ -320,7 +320,7 @@ interface I extends A {
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 59, 10))
 
     a11: <T extends Base>(x: T, y: T) => T; // ok
->a11 : Symbol(a11, Decl(callSignatureAssignabilityInInheritance2.ts, 59, 45))
+>a11 : Symbol(I.a11, Decl(callSignatureAssignabilityInInheritance2.ts, 59, 45))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 60, 10))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance2.ts, 0, 0))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 60, 26))
@@ -330,7 +330,7 @@ interface I extends A {
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 60, 10))
 
     a12: <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; // ok, less specific parameter type
->a12 : Symbol(a12, Decl(callSignatureAssignabilityInInheritance2.ts, 60, 43))
+>a12 : Symbol(I.a12, Decl(callSignatureAssignabilityInInheritance2.ts, 60, 43))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 61, 10))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance2.ts, 0, 0))
@@ -343,7 +343,7 @@ interface I extends A {
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance2.ts, 2, 27))
 
     a13: <T extends Array<Derived>>(x: Array<Base>, y: T) => T; // ok, T = Array<Derived>, satisfies constraint, contextual signature instantiation succeeds
->a13 : Symbol(a13, Decl(callSignatureAssignabilityInInheritance2.ts, 61, 73))
+>a13 : Symbol(I.a13, Decl(callSignatureAssignabilityInInheritance2.ts, 61, 73))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 62, 10))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance2.ts, 2, 27))
@@ -355,7 +355,7 @@ interface I extends A {
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 62, 10))
 
     a14: <T>(x: { a: T; b: T }) => T; // ok, best common type yields T = {} but that's satisfactory for this signature
->a14 : Symbol(a14, Decl(callSignatureAssignabilityInInheritance2.ts, 62, 63))
+>a14 : Symbol(I.a14, Decl(callSignatureAssignabilityInInheritance2.ts, 62, 63))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 63, 10))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 63, 13))
 >a : Symbol(a, Decl(callSignatureAssignabilityInInheritance2.ts, 63, 17))
@@ -365,21 +365,21 @@ interface I extends A {
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 63, 10))
 
     a15: <T>(x: T) => T[]; // ok
->a15 : Symbol(a15, Decl(callSignatureAssignabilityInInheritance2.ts, 63, 37))
+>a15 : Symbol(I.a15, Decl(callSignatureAssignabilityInInheritance2.ts, 63, 37))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 64, 10))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 64, 13))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 64, 10))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 64, 10))
 
     a16: <T extends Base>(x: T) => number[]; // ok
->a16 : Symbol(a16, Decl(callSignatureAssignabilityInInheritance2.ts, 64, 26))
+>a16 : Symbol(I.a16, Decl(callSignatureAssignabilityInInheritance2.ts, 64, 26))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 65, 10))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance2.ts, 0, 0))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 65, 26))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 65, 10))
 
     a17: <T>(x: (a: T) => T) => T[]; // ok
->a17 : Symbol(a17, Decl(callSignatureAssignabilityInInheritance2.ts, 65, 44))
+>a17 : Symbol(I.a17, Decl(callSignatureAssignabilityInInheritance2.ts, 65, 44))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 66, 10))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 66, 13))
 >a : Symbol(a, Decl(callSignatureAssignabilityInInheritance2.ts, 66, 17))
@@ -388,7 +388,7 @@ interface I extends A {
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 66, 10))
 
     a18: <T>(x: (a: T) => T) => T[]; // ok, no inferences for T but assignable to any
->a18 : Symbol(a18, Decl(callSignatureAssignabilityInInheritance2.ts, 66, 36))
+>a18 : Symbol(I.a18, Decl(callSignatureAssignabilityInInheritance2.ts, 66, 36))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance2.ts, 67, 10))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance2.ts, 67, 13))
 >a : Symbol(a, Decl(callSignatureAssignabilityInInheritance2.ts, 67, 17))
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.errors.txt b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.errors.txt
index 7e9d75b1b41..2d7e795d26a 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.errors.txt
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.errors.txt
@@ -2,12 +2,12 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/callSign
   Types of property 'a2' are incompatible.
     Type '(x: T) => U[]' is not assignable to type '(x: number) => string[]'.
       Types of parameters 'x' and 'x' are incompatible.
-        Type 'T' is not assignable to type 'number'.
+        Type 'number' is not assignable to type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance3.ts(60,19): error TS2430: Interface 'I4' incorrectly extends interface 'A'.
   Types of property 'a8' are incompatible.
     Type '<T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U' is not assignable to type '(x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived'.
       Types of parameters 'y' and 'y' are incompatible.
-        Type '(arg2: { foo: number; }) => any' is not assignable to type '(arg2: Base) => Derived'.
+        Type '(arg2: Base) => Derived' is not assignable to type '(arg2: { foo: number; }) => any'.
           Types of parameters 'arg2' and 'arg2' are incompatible.
             Type '{ foo: number; }' is not assignable to type 'Base'.
               Types of property 'foo' are incompatible.
@@ -71,7 +71,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/callSign
 !!! error TS2430:   Types of property 'a2' are incompatible.
 !!! error TS2430:     Type '(x: T) => U[]' is not assignable to type '(x: number) => string[]'.
 !!! error TS2430:       Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2430:         Type 'T' is not assignable to type 'number'.
+!!! error TS2430:         Type 'number' is not assignable to type 'T'.
                 a2: (x: T) => U[]; // error, no contextual signature instantiation since I2.a2 is not generic
             }
     
@@ -86,7 +86,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/callSign
 !!! error TS2430:   Types of property 'a8' are incompatible.
 !!! error TS2430:     Type '<T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U' is not assignable to type '(x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived'.
 !!! error TS2430:       Types of parameters 'y' and 'y' are incompatible.
-!!! error TS2430:         Type '(arg2: { foo: number; }) => any' is not assignable to type '(arg2: Base) => Derived'.
+!!! error TS2430:         Type '(arg2: Base) => Derived' is not assignable to type '(arg2: { foo: number; }) => any'.
 !!! error TS2430:           Types of parameters 'arg2' and 'arg2' are incompatible.
 !!! error TS2430:             Type '{ foo: number; }' is not assignable to type 'Base'.
 !!! error TS2430:               Types of property 'foo' are incompatible.
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance4.symbols b/tests/baselines/reference/callSignatureAssignabilityInInheritance4.symbols
index f45d7f318d2..4261483f451 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance4.symbols
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance4.symbols
@@ -3,48 +3,48 @@
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance4.ts, 0, 0))
->foo : Symbol(foo, Decl(callSignatureAssignabilityInInheritance4.ts, 2, 12))
+>foo : Symbol(Base.foo, Decl(callSignatureAssignabilityInInheritance4.ts, 2, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance4.ts, 2, 27))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance4.ts, 0, 0))
->bar : Symbol(bar, Decl(callSignatureAssignabilityInInheritance4.ts, 3, 28))
+>bar : Symbol(Derived.bar, Decl(callSignatureAssignabilityInInheritance4.ts, 3, 28))
 
 class Derived2 extends Derived { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(callSignatureAssignabilityInInheritance4.ts, 3, 43))
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance4.ts, 2, 27))
->baz : Symbol(baz, Decl(callSignatureAssignabilityInInheritance4.ts, 4, 32))
+>baz : Symbol(Derived2.baz, Decl(callSignatureAssignabilityInInheritance4.ts, 4, 32))
 
 class OtherDerived extends Base { bing: string; }
 >OtherDerived : Symbol(OtherDerived, Decl(callSignatureAssignabilityInInheritance4.ts, 4, 47))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance4.ts, 0, 0))
->bing : Symbol(bing, Decl(callSignatureAssignabilityInInheritance4.ts, 5, 33))
+>bing : Symbol(OtherDerived.bing, Decl(callSignatureAssignabilityInInheritance4.ts, 5, 33))
 
 interface A { // T
 >A : Symbol(A, Decl(callSignatureAssignabilityInInheritance4.ts, 5, 49))
 
     // M's
     a: <T>(x: T) => T[];
->a : Symbol(a, Decl(callSignatureAssignabilityInInheritance4.ts, 7, 13))
+>a : Symbol(A.a, Decl(callSignatureAssignabilityInInheritance4.ts, 7, 13))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 9, 8))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance4.ts, 9, 11))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 9, 8))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 9, 8))
 
     a2: <T>(x: T) => string[];
->a2 : Symbol(a2, Decl(callSignatureAssignabilityInInheritance4.ts, 9, 24))
+>a2 : Symbol(A.a2, Decl(callSignatureAssignabilityInInheritance4.ts, 9, 24))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 10, 9))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance4.ts, 10, 12))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 10, 9))
 
     a3: <T>(x: T) => void;
->a3 : Symbol(a3, Decl(callSignatureAssignabilityInInheritance4.ts, 10, 30))
+>a3 : Symbol(A.a3, Decl(callSignatureAssignabilityInInheritance4.ts, 10, 30))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 11, 9))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance4.ts, 11, 12))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 11, 9))
 
     a4: <T,U>(x: T, y: U) => string;
->a4 : Symbol(a4, Decl(callSignatureAssignabilityInInheritance4.ts, 11, 26))
+>a4 : Symbol(A.a4, Decl(callSignatureAssignabilityInInheritance4.ts, 11, 26))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 12, 9))
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance4.ts, 12, 11))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance4.ts, 12, 14))
@@ -53,7 +53,7 @@ interface A { // T
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance4.ts, 12, 11))
 
     a5: <T,U>(x: (arg: T) => U) => T;
->a5 : Symbol(a5, Decl(callSignatureAssignabilityInInheritance4.ts, 12, 36))
+>a5 : Symbol(A.a5, Decl(callSignatureAssignabilityInInheritance4.ts, 12, 36))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 13, 9))
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance4.ts, 13, 11))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance4.ts, 13, 14))
@@ -63,7 +63,7 @@ interface A { // T
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 13, 9))
 
     a6: <T extends Base>(x: (arg: T) => Derived) => T;
->a6 : Symbol(a6, Decl(callSignatureAssignabilityInInheritance4.ts, 13, 37))
+>a6 : Symbol(A.a6, Decl(callSignatureAssignabilityInInheritance4.ts, 13, 37))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 14, 9))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance4.ts, 0, 0))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance4.ts, 14, 25))
@@ -73,7 +73,7 @@ interface A { // T
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 14, 9))
 
     a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
->a11 : Symbol(a11, Decl(callSignatureAssignabilityInInheritance4.ts, 14, 54))
+>a11 : Symbol(A.a11, Decl(callSignatureAssignabilityInInheritance4.ts, 14, 54))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 15, 10))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance4.ts, 15, 13))
 >foo : Symbol(foo, Decl(callSignatureAssignabilityInInheritance4.ts, 15, 17))
@@ -86,7 +86,7 @@ interface A { // T
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance4.ts, 0, 0))
 
     a15: <T>(x: { a: T; b: T }) => T[];
->a15 : Symbol(a15, Decl(callSignatureAssignabilityInInheritance4.ts, 15, 59))
+>a15 : Symbol(A.a15, Decl(callSignatureAssignabilityInInheritance4.ts, 15, 59))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 16, 10))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance4.ts, 16, 13))
 >a : Symbol(a, Decl(callSignatureAssignabilityInInheritance4.ts, 16, 17))
@@ -96,7 +96,7 @@ interface A { // T
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 16, 10))
 
     a16: <T extends Base>(x: { a: T; b: T }) => T[];
->a16 : Symbol(a16, Decl(callSignatureAssignabilityInInheritance4.ts, 16, 39))
+>a16 : Symbol(A.a16, Decl(callSignatureAssignabilityInInheritance4.ts, 16, 39))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 17, 10))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance4.ts, 0, 0))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance4.ts, 17, 26))
@@ -107,7 +107,7 @@ interface A { // T
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 17, 10))
 
     a17: {
->a17 : Symbol(a17, Decl(callSignatureAssignabilityInInheritance4.ts, 17, 52))
+>a17 : Symbol(A.a17, Decl(callSignatureAssignabilityInInheritance4.ts, 17, 52))
 
         <T extends Derived>(x: (a: T) => T): T[];
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 19, 9))
@@ -129,7 +129,7 @@ interface A { // T
 
     };
     a18: {
->a18 : Symbol(a18, Decl(callSignatureAssignabilityInInheritance4.ts, 21, 6))
+>a18 : Symbol(A.a18, Decl(callSignatureAssignabilityInInheritance4.ts, 21, 6))
 
         (x: {
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance4.ts, 23, 9))
@@ -177,27 +177,27 @@ interface I extends A {
 
     // N's
     a: <T>(x: T) => T[]; // ok, instantiation of N is a subtype of M, T is number
->a : Symbol(a, Decl(callSignatureAssignabilityInInheritance4.ts, 35, 23))
+>a : Symbol(I.a, Decl(callSignatureAssignabilityInInheritance4.ts, 35, 23))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 37, 8))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance4.ts, 37, 11))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 37, 8))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 37, 8))
 
     a2: <T>(x: T) => string[]; // ok
->a2 : Symbol(a2, Decl(callSignatureAssignabilityInInheritance4.ts, 37, 24))
+>a2 : Symbol(I.a2, Decl(callSignatureAssignabilityInInheritance4.ts, 37, 24))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 38, 9))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance4.ts, 38, 12))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 38, 9))
 
     a3: <T>(x: T) => T; // ok since Base returns void
->a3 : Symbol(a3, Decl(callSignatureAssignabilityInInheritance4.ts, 38, 30))
+>a3 : Symbol(I.a3, Decl(callSignatureAssignabilityInInheritance4.ts, 38, 30))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 39, 9))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance4.ts, 39, 12))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 39, 9))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 39, 9))
 
     a4: <T, U>(x: T, y: U) => string; // ok, instantiation of N is a subtype of M, T is string, U is number
->a4 : Symbol(a4, Decl(callSignatureAssignabilityInInheritance4.ts, 39, 23))
+>a4 : Symbol(I.a4, Decl(callSignatureAssignabilityInInheritance4.ts, 39, 23))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 40, 9))
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance4.ts, 40, 11))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance4.ts, 40, 15))
@@ -206,7 +206,7 @@ interface I extends A {
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance4.ts, 40, 11))
 
     a5: <T, U>(x: (arg: T) => U) => T; // ok, U is in a parameter position so inferences can be made
->a5 : Symbol(a5, Decl(callSignatureAssignabilityInInheritance4.ts, 40, 37))
+>a5 : Symbol(I.a5, Decl(callSignatureAssignabilityInInheritance4.ts, 40, 37))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 41, 9))
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance4.ts, 41, 11))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance4.ts, 41, 15))
@@ -216,7 +216,7 @@ interface I extends A {
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 41, 9))
 
     a6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; // ok, same as a5 but with object type hierarchy
->a6 : Symbol(a6, Decl(callSignatureAssignabilityInInheritance4.ts, 41, 38))
+>a6 : Symbol(I.a6, Decl(callSignatureAssignabilityInInheritance4.ts, 41, 38))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 42, 9))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance4.ts, 0, 0))
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance4.ts, 42, 24))
@@ -228,7 +228,7 @@ interface I extends A {
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 42, 9))
 
     a11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; // ok
->a11 : Symbol(a11, Decl(callSignatureAssignabilityInInheritance4.ts, 42, 67))
+>a11 : Symbol(I.a11, Decl(callSignatureAssignabilityInInheritance4.ts, 42, 67))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 43, 10))
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance4.ts, 43, 12))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance4.ts, 43, 16))
@@ -242,7 +242,7 @@ interface I extends A {
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance4.ts, 0, 0))
 
     a15: <U, V>(x: { a: U; b: V; }) => U[]; // ok, T = U, T = V
->a15 : Symbol(a15, Decl(callSignatureAssignabilityInInheritance4.ts, 43, 62))
+>a15 : Symbol(I.a15, Decl(callSignatureAssignabilityInInheritance4.ts, 43, 62))
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance4.ts, 44, 10))
 >V : Symbol(V, Decl(callSignatureAssignabilityInInheritance4.ts, 44, 12))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance4.ts, 44, 16))
@@ -253,7 +253,7 @@ interface I extends A {
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance4.ts, 44, 10))
 
     a16: <T>(x: { a: T; b: T }) => T[]; // ok, more general parameter type
->a16 : Symbol(a16, Decl(callSignatureAssignabilityInInheritance4.ts, 44, 43))
+>a16 : Symbol(I.a16, Decl(callSignatureAssignabilityInInheritance4.ts, 44, 43))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 45, 10))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance4.ts, 45, 13))
 >a : Symbol(a, Decl(callSignatureAssignabilityInInheritance4.ts, 45, 17))
@@ -263,7 +263,7 @@ interface I extends A {
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 45, 10))
 
     a17: <T>(x: (a: T) => T) => T[]; // ok
->a17 : Symbol(a17, Decl(callSignatureAssignabilityInInheritance4.ts, 45, 39))
+>a17 : Symbol(I.a17, Decl(callSignatureAssignabilityInInheritance4.ts, 45, 39))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 46, 10))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance4.ts, 46, 13))
 >a : Symbol(a, Decl(callSignatureAssignabilityInInheritance4.ts, 46, 17))
@@ -272,7 +272,7 @@ interface I extends A {
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 46, 10))
 
     a18: (x: <T>(a: T) => T) => any[]; // ok
->a18 : Symbol(a18, Decl(callSignatureAssignabilityInInheritance4.ts, 46, 36))
+>a18 : Symbol(I.a18, Decl(callSignatureAssignabilityInInheritance4.ts, 46, 36))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance4.ts, 47, 10))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance4.ts, 47, 14))
 >a : Symbol(a, Decl(callSignatureAssignabilityInInheritance4.ts, 47, 17))
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance5.symbols b/tests/baselines/reference/callSignatureAssignabilityInInheritance5.symbols
index 89797dceb70..6f92fa5d5c7 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance5.symbols
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance5.symbols
@@ -4,51 +4,51 @@
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance5.ts, 0, 0))
->foo : Symbol(foo, Decl(callSignatureAssignabilityInInheritance5.ts, 3, 12))
+>foo : Symbol(Base.foo, Decl(callSignatureAssignabilityInInheritance5.ts, 3, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance5.ts, 3, 27))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance5.ts, 0, 0))
->bar : Symbol(bar, Decl(callSignatureAssignabilityInInheritance5.ts, 4, 28))
+>bar : Symbol(Derived.bar, Decl(callSignatureAssignabilityInInheritance5.ts, 4, 28))
 
 class Derived2 extends Derived { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(callSignatureAssignabilityInInheritance5.ts, 4, 43))
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance5.ts, 3, 27))
->baz : Symbol(baz, Decl(callSignatureAssignabilityInInheritance5.ts, 5, 32))
+>baz : Symbol(Derived2.baz, Decl(callSignatureAssignabilityInInheritance5.ts, 5, 32))
 
 class OtherDerived extends Base { bing: string; }
 >OtherDerived : Symbol(OtherDerived, Decl(callSignatureAssignabilityInInheritance5.ts, 5, 47))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance5.ts, 0, 0))
->bing : Symbol(bing, Decl(callSignatureAssignabilityInInheritance5.ts, 6, 33))
+>bing : Symbol(OtherDerived.bing, Decl(callSignatureAssignabilityInInheritance5.ts, 6, 33))
 
 interface A { // T
 >A : Symbol(A, Decl(callSignatureAssignabilityInInheritance5.ts, 6, 49))
 
     // M's
     a: (x: number) => number[];
->a : Symbol(a, Decl(callSignatureAssignabilityInInheritance5.ts, 8, 13))
+>a : Symbol(A.a, Decl(callSignatureAssignabilityInInheritance5.ts, 8, 13))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance5.ts, 10, 8))
 
     a2: (x: number) => string[];
->a2 : Symbol(a2, Decl(callSignatureAssignabilityInInheritance5.ts, 10, 31))
+>a2 : Symbol(A.a2, Decl(callSignatureAssignabilityInInheritance5.ts, 10, 31))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance5.ts, 11, 9))
 
     a3: (x: number) => void;
->a3 : Symbol(a3, Decl(callSignatureAssignabilityInInheritance5.ts, 11, 32))
+>a3 : Symbol(A.a3, Decl(callSignatureAssignabilityInInheritance5.ts, 11, 32))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance5.ts, 12, 9))
 
     a4: (x: string, y: number) => string;
->a4 : Symbol(a4, Decl(callSignatureAssignabilityInInheritance5.ts, 12, 28))
+>a4 : Symbol(A.a4, Decl(callSignatureAssignabilityInInheritance5.ts, 12, 28))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance5.ts, 13, 9))
 >y : Symbol(y, Decl(callSignatureAssignabilityInInheritance5.ts, 13, 19))
 
     a5: (x: (arg: string) => number) => string;
->a5 : Symbol(a5, Decl(callSignatureAssignabilityInInheritance5.ts, 13, 41))
+>a5 : Symbol(A.a5, Decl(callSignatureAssignabilityInInheritance5.ts, 13, 41))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance5.ts, 14, 9))
 >arg : Symbol(arg, Decl(callSignatureAssignabilityInInheritance5.ts, 14, 13))
 
     a6: (x: (arg: Base) => Derived) => Base;
->a6 : Symbol(a6, Decl(callSignatureAssignabilityInInheritance5.ts, 14, 47))
+>a6 : Symbol(A.a6, Decl(callSignatureAssignabilityInInheritance5.ts, 14, 47))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance5.ts, 15, 9))
 >arg : Symbol(arg, Decl(callSignatureAssignabilityInInheritance5.ts, 15, 13))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance5.ts, 0, 0))
@@ -56,7 +56,7 @@ interface A { // T
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance5.ts, 0, 0))
 
     a7: (x: (arg: Base) => Derived) => (r: Base) => Derived;
->a7 : Symbol(a7, Decl(callSignatureAssignabilityInInheritance5.ts, 15, 44))
+>a7 : Symbol(A.a7, Decl(callSignatureAssignabilityInInheritance5.ts, 15, 44))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance5.ts, 16, 9))
 >arg : Symbol(arg, Decl(callSignatureAssignabilityInInheritance5.ts, 16, 13))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance5.ts, 0, 0))
@@ -66,7 +66,7 @@ interface A { // T
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance5.ts, 3, 27))
 
     a8: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
->a8 : Symbol(a8, Decl(callSignatureAssignabilityInInheritance5.ts, 16, 60))
+>a8 : Symbol(A.a8, Decl(callSignatureAssignabilityInInheritance5.ts, 16, 60))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance5.ts, 17, 9))
 >arg : Symbol(arg, Decl(callSignatureAssignabilityInInheritance5.ts, 17, 13))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance5.ts, 0, 0))
@@ -80,7 +80,7 @@ interface A { // T
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance5.ts, 3, 27))
 
     a9: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
->a9 : Symbol(a9, Decl(callSignatureAssignabilityInInheritance5.ts, 17, 88))
+>a9 : Symbol(A.a9, Decl(callSignatureAssignabilityInInheritance5.ts, 17, 88))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance5.ts, 18, 9))
 >arg : Symbol(arg, Decl(callSignatureAssignabilityInInheritance5.ts, 18, 13))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance5.ts, 0, 0))
@@ -94,13 +94,13 @@ interface A { // T
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance5.ts, 3, 27))
 
     a10: (...x: Derived[]) => Derived;
->a10 : Symbol(a10, Decl(callSignatureAssignabilityInInheritance5.ts, 18, 88))
+>a10 : Symbol(A.a10, Decl(callSignatureAssignabilityInInheritance5.ts, 18, 88))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance5.ts, 19, 10))
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance5.ts, 3, 27))
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance5.ts, 3, 27))
 
     a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
->a11 : Symbol(a11, Decl(callSignatureAssignabilityInInheritance5.ts, 19, 38))
+>a11 : Symbol(A.a11, Decl(callSignatureAssignabilityInInheritance5.ts, 19, 38))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance5.ts, 20, 10))
 >foo : Symbol(foo, Decl(callSignatureAssignabilityInInheritance5.ts, 20, 14))
 >y : Symbol(y, Decl(callSignatureAssignabilityInInheritance5.ts, 20, 29))
@@ -109,7 +109,7 @@ interface A { // T
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance5.ts, 0, 0))
 
     a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
->a12 : Symbol(a12, Decl(callSignatureAssignabilityInInheritance5.ts, 20, 71))
+>a12 : Symbol(A.a12, Decl(callSignatureAssignabilityInInheritance5.ts, 20, 71))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance5.ts, 21, 10))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance5.ts, 0, 0))
@@ -120,7 +120,7 @@ interface A { // T
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance5.ts, 3, 27))
 
     a13: (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
->a13 : Symbol(a13, Decl(callSignatureAssignabilityInInheritance5.ts, 21, 64))
+>a13 : Symbol(A.a13, Decl(callSignatureAssignabilityInInheritance5.ts, 21, 64))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance5.ts, 22, 10))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance5.ts, 0, 0))
@@ -131,7 +131,7 @@ interface A { // T
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance5.ts, 3, 27))
 
     a14: (x: { a: string; b: number }) => Object;
->a14 : Symbol(a14, Decl(callSignatureAssignabilityInInheritance5.ts, 22, 63))
+>a14 : Symbol(A.a14, Decl(callSignatureAssignabilityInInheritance5.ts, 22, 63))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance5.ts, 23, 10))
 >a : Symbol(a, Decl(callSignatureAssignabilityInInheritance5.ts, 23, 14))
 >b : Symbol(b, Decl(callSignatureAssignabilityInInheritance5.ts, 23, 25))
@@ -143,7 +143,7 @@ interface B extends A {
 >A : Symbol(A, Decl(callSignatureAssignabilityInInheritance5.ts, 6, 49))
 
     a: <T>(x: T) => T[];
->a : Symbol(a, Decl(callSignatureAssignabilityInInheritance5.ts, 26, 23))
+>a : Symbol(B.a, Decl(callSignatureAssignabilityInInheritance5.ts, 26, 23))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 27, 8))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance5.ts, 27, 11))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 27, 8))
@@ -157,27 +157,27 @@ interface I extends B {
 
     // N's
     a: <T>(x: T) => T[]; // ok, instantiation of N is a subtype of M, T is number
->a : Symbol(a, Decl(callSignatureAssignabilityInInheritance5.ts, 31, 23))
+>a : Symbol(I.a, Decl(callSignatureAssignabilityInInheritance5.ts, 31, 23))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 33, 8))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance5.ts, 33, 11))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 33, 8))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 33, 8))
 
     a2: <T>(x: T) => string[]; // ok
->a2 : Symbol(a2, Decl(callSignatureAssignabilityInInheritance5.ts, 33, 24))
+>a2 : Symbol(I.a2, Decl(callSignatureAssignabilityInInheritance5.ts, 33, 24))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 34, 9))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance5.ts, 34, 12))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 34, 9))
 
     a3: <T>(x: T) => T; // ok since Base returns void
->a3 : Symbol(a3, Decl(callSignatureAssignabilityInInheritance5.ts, 34, 30))
+>a3 : Symbol(I.a3, Decl(callSignatureAssignabilityInInheritance5.ts, 34, 30))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 35, 9))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance5.ts, 35, 12))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 35, 9))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 35, 9))
 
     a4: <T, U>(x: T, y: U) => T; // ok, instantiation of N is a subtype of M, T is string, U is number
->a4 : Symbol(a4, Decl(callSignatureAssignabilityInInheritance5.ts, 35, 23))
+>a4 : Symbol(I.a4, Decl(callSignatureAssignabilityInInheritance5.ts, 35, 23))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 36, 9))
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance5.ts, 36, 11))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance5.ts, 36, 15))
@@ -187,7 +187,7 @@ interface I extends B {
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 36, 9))
 
     a5: <T, U>(x: (arg: T) => U) => T; // ok, U is in a parameter position so inferences can be made
->a5 : Symbol(a5, Decl(callSignatureAssignabilityInInheritance5.ts, 36, 32))
+>a5 : Symbol(I.a5, Decl(callSignatureAssignabilityInInheritance5.ts, 36, 32))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 37, 9))
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance5.ts, 37, 11))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance5.ts, 37, 15))
@@ -197,7 +197,7 @@ interface I extends B {
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 37, 9))
 
     a6: <T extends Base, U extends Derived>(x: (arg: T) => U) => T; // ok, same as a5 but with object type hierarchy
->a6 : Symbol(a6, Decl(callSignatureAssignabilityInInheritance5.ts, 37, 38))
+>a6 : Symbol(I.a6, Decl(callSignatureAssignabilityInInheritance5.ts, 37, 38))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 38, 9))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance5.ts, 0, 0))
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance5.ts, 38, 24))
@@ -209,7 +209,7 @@ interface I extends B {
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 38, 9))
 
     a7: <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; // ok
->a7 : Symbol(a7, Decl(callSignatureAssignabilityInInheritance5.ts, 38, 67))
+>a7 : Symbol(I.a7, Decl(callSignatureAssignabilityInInheritance5.ts, 38, 67))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 39, 9))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance5.ts, 0, 0))
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance5.ts, 39, 24))
@@ -223,7 +223,7 @@ interface I extends B {
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance5.ts, 39, 24))
 
     a8: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U; // ok
->a8 : Symbol(a8, Decl(callSignatureAssignabilityInInheritance5.ts, 39, 77))
+>a8 : Symbol(I.a8, Decl(callSignatureAssignabilityInInheritance5.ts, 39, 77))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 40, 9))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance5.ts, 0, 0))
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance5.ts, 40, 24))
@@ -241,7 +241,7 @@ interface I extends B {
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance5.ts, 40, 24))
 
     a9: <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; // ok, same as a8 with compatible object literal
->a9 : Symbol(a9, Decl(callSignatureAssignabilityInInheritance5.ts, 40, 96))
+>a9 : Symbol(I.a9, Decl(callSignatureAssignabilityInInheritance5.ts, 40, 96))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 41, 9))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance5.ts, 0, 0))
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance5.ts, 41, 24))
@@ -260,7 +260,7 @@ interface I extends B {
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance5.ts, 41, 24))
 
     a10: <T extends Derived>(...x: T[]) => T; // ok
->a10 : Symbol(a10, Decl(callSignatureAssignabilityInInheritance5.ts, 41, 124))
+>a10 : Symbol(I.a10, Decl(callSignatureAssignabilityInInheritance5.ts, 41, 124))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 42, 10))
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance5.ts, 3, 27))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance5.ts, 42, 29))
@@ -268,7 +268,7 @@ interface I extends B {
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 42, 10))
 
     a11: <T extends Base>(x: T, y: T) => T; // ok
->a11 : Symbol(a11, Decl(callSignatureAssignabilityInInheritance5.ts, 42, 45))
+>a11 : Symbol(I.a11, Decl(callSignatureAssignabilityInInheritance5.ts, 42, 45))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 43, 10))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance5.ts, 0, 0))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance5.ts, 43, 26))
@@ -278,7 +278,7 @@ interface I extends B {
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 43, 10))
 
     a12: <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; // ok, less specific parameter type
->a12 : Symbol(a12, Decl(callSignatureAssignabilityInInheritance5.ts, 43, 43))
+>a12 : Symbol(I.a12, Decl(callSignatureAssignabilityInInheritance5.ts, 43, 43))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 44, 10))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance5.ts, 0, 0))
@@ -291,7 +291,7 @@ interface I extends B {
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance5.ts, 3, 27))
 
     a13: <T extends Array<Derived>>(x: Array<Base>, y: T) => T; // ok, T = Array<Derived>, satisfies constraint, contextual signature instantiation succeeds
->a13 : Symbol(a13, Decl(callSignatureAssignabilityInInheritance5.ts, 44, 73))
+>a13 : Symbol(I.a13, Decl(callSignatureAssignabilityInInheritance5.ts, 44, 73))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 45, 10))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance5.ts, 3, 27))
@@ -303,7 +303,7 @@ interface I extends B {
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 45, 10))
 
     a14: <T>(x: { a: T; b: T }) => T; // ok, best common type yields T = {} but that's satisfactory for this signature
->a14 : Symbol(a14, Decl(callSignatureAssignabilityInInheritance5.ts, 45, 63))
+>a14 : Symbol(I.a14, Decl(callSignatureAssignabilityInInheritance5.ts, 45, 63))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance5.ts, 46, 10))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance5.ts, 46, 13))
 >a : Symbol(a, Decl(callSignatureAssignabilityInInheritance5.ts, 46, 17))
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance6.symbols b/tests/baselines/reference/callSignatureAssignabilityInInheritance6.symbols
index 1d4c99d89db..56c7098d408 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance6.symbols
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance6.symbols
@@ -5,48 +5,48 @@
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance6.ts, 0, 0))
->foo : Symbol(foo, Decl(callSignatureAssignabilityInInheritance6.ts, 4, 12))
+>foo : Symbol(Base.foo, Decl(callSignatureAssignabilityInInheritance6.ts, 4, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance6.ts, 4, 27))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance6.ts, 0, 0))
->bar : Symbol(bar, Decl(callSignatureAssignabilityInInheritance6.ts, 5, 28))
+>bar : Symbol(Derived.bar, Decl(callSignatureAssignabilityInInheritance6.ts, 5, 28))
 
 class Derived2 extends Derived { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(callSignatureAssignabilityInInheritance6.ts, 5, 43))
 >Derived : Symbol(Derived, Decl(callSignatureAssignabilityInInheritance6.ts, 4, 27))
->baz : Symbol(baz, Decl(callSignatureAssignabilityInInheritance6.ts, 6, 32))
+>baz : Symbol(Derived2.baz, Decl(callSignatureAssignabilityInInheritance6.ts, 6, 32))
 
 class OtherDerived extends Base { bing: string; }
 >OtherDerived : Symbol(OtherDerived, Decl(callSignatureAssignabilityInInheritance6.ts, 6, 47))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance6.ts, 0, 0))
->bing : Symbol(bing, Decl(callSignatureAssignabilityInInheritance6.ts, 7, 33))
+>bing : Symbol(OtherDerived.bing, Decl(callSignatureAssignabilityInInheritance6.ts, 7, 33))
 
 interface A { // T
 >A : Symbol(A, Decl(callSignatureAssignabilityInInheritance6.ts, 7, 49))
 
     // M's
     a: <T>(x: T) => T[];
->a : Symbol(a, Decl(callSignatureAssignabilityInInheritance6.ts, 9, 13))
+>a : Symbol(A.a, Decl(callSignatureAssignabilityInInheritance6.ts, 9, 13))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance6.ts, 11, 8))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance6.ts, 11, 11))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance6.ts, 11, 8))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance6.ts, 11, 8))
 
     a2: <T>(x: T) => string[];
->a2 : Symbol(a2, Decl(callSignatureAssignabilityInInheritance6.ts, 11, 24))
+>a2 : Symbol(A.a2, Decl(callSignatureAssignabilityInInheritance6.ts, 11, 24))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance6.ts, 12, 9))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance6.ts, 12, 12))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance6.ts, 12, 9))
 
     a3: <T>(x: T) => void;
->a3 : Symbol(a3, Decl(callSignatureAssignabilityInInheritance6.ts, 12, 30))
+>a3 : Symbol(A.a3, Decl(callSignatureAssignabilityInInheritance6.ts, 12, 30))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance6.ts, 13, 9))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance6.ts, 13, 12))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance6.ts, 13, 9))
 
     a4: <T,U>(x: T, y: U) => string;
->a4 : Symbol(a4, Decl(callSignatureAssignabilityInInheritance6.ts, 13, 26))
+>a4 : Symbol(A.a4, Decl(callSignatureAssignabilityInInheritance6.ts, 13, 26))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance6.ts, 14, 9))
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance6.ts, 14, 11))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance6.ts, 14, 14))
@@ -55,7 +55,7 @@ interface A { // T
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance6.ts, 14, 11))
 
     a5: <T,U>(x: (arg: T) => U) => T;
->a5 : Symbol(a5, Decl(callSignatureAssignabilityInInheritance6.ts, 14, 36))
+>a5 : Symbol(A.a5, Decl(callSignatureAssignabilityInInheritance6.ts, 14, 36))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance6.ts, 15, 9))
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance6.ts, 15, 11))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance6.ts, 15, 14))
@@ -65,7 +65,7 @@ interface A { // T
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance6.ts, 15, 9))
 
     a6: <T extends Base>(x: (arg: T) => Derived) => T;
->a6 : Symbol(a6, Decl(callSignatureAssignabilityInInheritance6.ts, 15, 37))
+>a6 : Symbol(A.a6, Decl(callSignatureAssignabilityInInheritance6.ts, 15, 37))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance6.ts, 16, 9))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance6.ts, 0, 0))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance6.ts, 16, 25))
@@ -75,7 +75,7 @@ interface A { // T
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance6.ts, 16, 9))
 
     a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
->a11 : Symbol(a11, Decl(callSignatureAssignabilityInInheritance6.ts, 16, 54))
+>a11 : Symbol(A.a11, Decl(callSignatureAssignabilityInInheritance6.ts, 16, 54))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance6.ts, 17, 10))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance6.ts, 17, 13))
 >foo : Symbol(foo, Decl(callSignatureAssignabilityInInheritance6.ts, 17, 17))
@@ -88,7 +88,7 @@ interface A { // T
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance6.ts, 0, 0))
 
     a15: <T>(x: { a: T; b: T }) => T[];
->a15 : Symbol(a15, Decl(callSignatureAssignabilityInInheritance6.ts, 17, 59))
+>a15 : Symbol(A.a15, Decl(callSignatureAssignabilityInInheritance6.ts, 17, 59))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance6.ts, 18, 10))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance6.ts, 18, 13))
 >a : Symbol(a, Decl(callSignatureAssignabilityInInheritance6.ts, 18, 17))
@@ -98,7 +98,7 @@ interface A { // T
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance6.ts, 18, 10))
 
     a16: <T extends Base>(x: { a: T; b: T }) => T[];
->a16 : Symbol(a16, Decl(callSignatureAssignabilityInInheritance6.ts, 18, 39))
+>a16 : Symbol(A.a16, Decl(callSignatureAssignabilityInInheritance6.ts, 18, 39))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance6.ts, 19, 10))
 >Base : Symbol(Base, Decl(callSignatureAssignabilityInInheritance6.ts, 0, 0))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance6.ts, 19, 26))
@@ -116,7 +116,7 @@ interface I<T> extends A {
 >A : Symbol(A, Decl(callSignatureAssignabilityInInheritance6.ts, 7, 49))
 
     a: (x: T) => T[]; 
->a : Symbol(a, Decl(callSignatureAssignabilityInInheritance6.ts, 23, 26))
+>a : Symbol(I.a, Decl(callSignatureAssignabilityInInheritance6.ts, 23, 26))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance6.ts, 24, 8))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance6.ts, 23, 12))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance6.ts, 23, 12))
@@ -128,7 +128,7 @@ interface I2<T> extends A {
 >A : Symbol(A, Decl(callSignatureAssignabilityInInheritance6.ts, 7, 49))
 
     a2: (x: T) => string[]; 
->a2 : Symbol(a2, Decl(callSignatureAssignabilityInInheritance6.ts, 27, 27))
+>a2 : Symbol(I2.a2, Decl(callSignatureAssignabilityInInheritance6.ts, 27, 27))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance6.ts, 28, 9))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance6.ts, 27, 13))
 }
@@ -139,7 +139,7 @@ interface I3<T> extends A {
 >A : Symbol(A, Decl(callSignatureAssignabilityInInheritance6.ts, 7, 49))
 
     a3: (x: T) => T;
->a3 : Symbol(a3, Decl(callSignatureAssignabilityInInheritance6.ts, 31, 27))
+>a3 : Symbol(I3.a3, Decl(callSignatureAssignabilityInInheritance6.ts, 31, 27))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance6.ts, 32, 9))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance6.ts, 31, 13))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance6.ts, 31, 13))
@@ -151,7 +151,7 @@ interface I4<T> extends A {
 >A : Symbol(A, Decl(callSignatureAssignabilityInInheritance6.ts, 7, 49))
 
     a4: <U>(x: T, y: U) => string; 
->a4 : Symbol(a4, Decl(callSignatureAssignabilityInInheritance6.ts, 35, 27))
+>a4 : Symbol(I4.a4, Decl(callSignatureAssignabilityInInheritance6.ts, 35, 27))
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance6.ts, 36, 9))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance6.ts, 36, 12))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance6.ts, 35, 13))
@@ -165,7 +165,7 @@ interface I5<T> extends A {
 >A : Symbol(A, Decl(callSignatureAssignabilityInInheritance6.ts, 7, 49))
 
     a5: <U>(x: (arg: T) => U) => T; 
->a5 : Symbol(a5, Decl(callSignatureAssignabilityInInheritance6.ts, 39, 27))
+>a5 : Symbol(I5.a5, Decl(callSignatureAssignabilityInInheritance6.ts, 39, 27))
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance6.ts, 40, 9))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance6.ts, 40, 12))
 >arg : Symbol(arg, Decl(callSignatureAssignabilityInInheritance6.ts, 40, 16))
@@ -180,7 +180,7 @@ interface I7<T> extends A {
 >A : Symbol(A, Decl(callSignatureAssignabilityInInheritance6.ts, 7, 49))
 
     a11: <U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
->a11 : Symbol(a11, Decl(callSignatureAssignabilityInInheritance6.ts, 43, 27))
+>a11 : Symbol(I7.a11, Decl(callSignatureAssignabilityInInheritance6.ts, 43, 27))
 >U : Symbol(U, Decl(callSignatureAssignabilityInInheritance6.ts, 44, 10))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance6.ts, 44, 13))
 >foo : Symbol(foo, Decl(callSignatureAssignabilityInInheritance6.ts, 44, 17))
@@ -199,7 +199,7 @@ interface I9<T> extends A {
 >A : Symbol(A, Decl(callSignatureAssignabilityInInheritance6.ts, 7, 49))
 
     a16: (x: { a: T; b: T }) => T[]; 
->a16 : Symbol(a16, Decl(callSignatureAssignabilityInInheritance6.ts, 47, 27))
+>a16 : Symbol(I9.a16, Decl(callSignatureAssignabilityInInheritance6.ts, 47, 27))
 >x : Symbol(x, Decl(callSignatureAssignabilityInInheritance6.ts, 48, 10))
 >a : Symbol(a, Decl(callSignatureAssignabilityInInheritance6.ts, 48, 14))
 >T : Symbol(T, Decl(callSignatureAssignabilityInInheritance6.ts, 47, 13))
diff --git a/tests/baselines/reference/callSignatureWithoutAnnotationsOrBody.symbols b/tests/baselines/reference/callSignatureWithoutAnnotationsOrBody.symbols
index 4b499ec2667..d8a43948fac 100644
--- a/tests/baselines/reference/callSignatureWithoutAnnotationsOrBody.symbols
+++ b/tests/baselines/reference/callSignatureWithoutAnnotationsOrBody.symbols
@@ -14,7 +14,7 @@ interface I {
 
     ();
     f();
->f : Symbol(f, Decl(callSignatureWithoutAnnotationsOrBody.ts, 6, 7))
+>f : Symbol(I.f, Decl(callSignatureWithoutAnnotationsOrBody.ts, 6, 7))
 }
 var i: I;
 >i : Symbol(i, Decl(callSignatureWithoutAnnotationsOrBody.ts, 9, 3))
diff --git a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.symbols b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.symbols
index faba4e427ec..dd302da3671 100644
--- a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.symbols
+++ b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.symbols
@@ -109,7 +109,7 @@ interface I {
 >I : Symbol(I, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 54, 17))
 
     foo: string;
->foo : Symbol(foo, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 56, 13))
+>foo : Symbol(I.foo, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 56, 13))
 }
 function foo9(x: number) {
 >foo9 : Symbol(foo9, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 58, 1))
@@ -130,7 +130,7 @@ class C {
 >C : Symbol(C, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 63, 17))
 
     foo: string;
->foo : Symbol(foo, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 65, 9))
+>foo : Symbol(C.foo, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 65, 9))
 }
 function foo10(x: number) {
 >foo10 : Symbol(foo10, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 67, 1))
@@ -155,7 +155,7 @@ module M {
 
     export class C { foo: string }
 >C : Symbol(C, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 75, 21))
->foo : Symbol(foo, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 76, 20))
+>foo : Symbol(C.foo, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 76, 20))
 }
 function foo11() {
 >foo11 : Symbol(foo11, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 77, 1))
@@ -172,13 +172,13 @@ interface I2 {
 >I2 : Symbol(I2, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 81, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 86, 1))
 
     x: number;
->x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 84, 14))
+>x : Symbol(I2.x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 84, 14))
 }
 interface I2 {
 >I2 : Symbol(I2, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 81, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 86, 1))
 
     y: number;
->y : Symbol(y, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 87, 14))
+>y : Symbol(I2.y, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 87, 14))
 }
 function foo12() {
 >foo12 : Symbol(foo12, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 89, 1))
@@ -215,7 +215,7 @@ class c1 {
 >c1 : Symbol(c1, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 101, 18), Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 106, 1))
 
     foo: string;
->foo : Symbol(foo, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 103, 10))
+>foo : Symbol(c1.foo, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 103, 10))
 
     constructor(x) { }
 >x : Symbol(x, Decl(callSignatureWithoutReturnTypeAnnotationInference.ts, 105, 16))
diff --git a/tests/baselines/reference/callSignaturesWithOptionalParameters.symbols b/tests/baselines/reference/callSignaturesWithOptionalParameters.symbols
index 542bd425fb1..c86adcff927 100644
--- a/tests/baselines/reference/callSignaturesWithOptionalParameters.symbols
+++ b/tests/baselines/reference/callSignaturesWithOptionalParameters.symbols
@@ -37,7 +37,7 @@ class C {
 >C : Symbol(C, Decl(callSignaturesWithOptionalParameters.ts, 11, 9))
 
     foo(x?: number) { }
->foo : Symbol(foo, Decl(callSignaturesWithOptionalParameters.ts, 13, 9))
+>foo : Symbol(C.foo, Decl(callSignaturesWithOptionalParameters.ts, 13, 9))
 >x : Symbol(x, Decl(callSignaturesWithOptionalParameters.ts, 14, 8))
 }
 
@@ -62,7 +62,7 @@ interface I {
 >x : Symbol(x, Decl(callSignaturesWithOptionalParameters.ts, 22, 5))
 
     foo(x: number, y?: number);
->foo : Symbol(foo, Decl(callSignaturesWithOptionalParameters.ts, 22, 17))
+>foo : Symbol(I.foo, Decl(callSignaturesWithOptionalParameters.ts, 22, 17))
 >x : Symbol(x, Decl(callSignaturesWithOptionalParameters.ts, 23, 8))
 >y : Symbol(y, Decl(callSignaturesWithOptionalParameters.ts, 23, 18))
 }
diff --git a/tests/baselines/reference/callSignaturesWithOptionalParameters2.symbols b/tests/baselines/reference/callSignaturesWithOptionalParameters2.symbols
index e8609d66236..7900b86bcb2 100644
--- a/tests/baselines/reference/callSignaturesWithOptionalParameters2.symbols
+++ b/tests/baselines/reference/callSignaturesWithOptionalParameters2.symbols
@@ -39,24 +39,24 @@ class C {
 >C : Symbol(C, Decl(callSignaturesWithOptionalParameters2.ts, 13, 11))
 
     foo(x?: number);
->foo : Symbol(foo, Decl(callSignaturesWithOptionalParameters2.ts, 15, 9), Decl(callSignaturesWithOptionalParameters2.ts, 16, 20))
+>foo : Symbol(C.foo, Decl(callSignaturesWithOptionalParameters2.ts, 15, 9), Decl(callSignaturesWithOptionalParameters2.ts, 16, 20))
 >x : Symbol(x, Decl(callSignaturesWithOptionalParameters2.ts, 16, 8))
 
     foo(x?: number) { }
->foo : Symbol(foo, Decl(callSignaturesWithOptionalParameters2.ts, 15, 9), Decl(callSignaturesWithOptionalParameters2.ts, 16, 20))
+>foo : Symbol(C.foo, Decl(callSignaturesWithOptionalParameters2.ts, 15, 9), Decl(callSignaturesWithOptionalParameters2.ts, 16, 20))
 >x : Symbol(x, Decl(callSignaturesWithOptionalParameters2.ts, 17, 8))
 
     foo2(x: number);
->foo2 : Symbol(foo2, Decl(callSignaturesWithOptionalParameters2.ts, 17, 23), Decl(callSignaturesWithOptionalParameters2.ts, 19, 20), Decl(callSignaturesWithOptionalParameters2.ts, 20, 32))
+>foo2 : Symbol(C.foo2, Decl(callSignaturesWithOptionalParameters2.ts, 17, 23), Decl(callSignaturesWithOptionalParameters2.ts, 19, 20), Decl(callSignaturesWithOptionalParameters2.ts, 20, 32))
 >x : Symbol(x, Decl(callSignaturesWithOptionalParameters2.ts, 19, 9))
 
     foo2(x: number, y?: number);
->foo2 : Symbol(foo2, Decl(callSignaturesWithOptionalParameters2.ts, 17, 23), Decl(callSignaturesWithOptionalParameters2.ts, 19, 20), Decl(callSignaturesWithOptionalParameters2.ts, 20, 32))
+>foo2 : Symbol(C.foo2, Decl(callSignaturesWithOptionalParameters2.ts, 17, 23), Decl(callSignaturesWithOptionalParameters2.ts, 19, 20), Decl(callSignaturesWithOptionalParameters2.ts, 20, 32))
 >x : Symbol(x, Decl(callSignaturesWithOptionalParameters2.ts, 20, 9))
 >y : Symbol(y, Decl(callSignaturesWithOptionalParameters2.ts, 20, 19))
 
     foo2(x: number, y?: number) { }
->foo2 : Symbol(foo2, Decl(callSignaturesWithOptionalParameters2.ts, 17, 23), Decl(callSignaturesWithOptionalParameters2.ts, 19, 20), Decl(callSignaturesWithOptionalParameters2.ts, 20, 32))
+>foo2 : Symbol(C.foo2, Decl(callSignaturesWithOptionalParameters2.ts, 17, 23), Decl(callSignaturesWithOptionalParameters2.ts, 19, 20), Decl(callSignaturesWithOptionalParameters2.ts, 20, 32))
 >x : Symbol(x, Decl(callSignaturesWithOptionalParameters2.ts, 21, 9))
 >y : Symbol(y, Decl(callSignaturesWithOptionalParameters2.ts, 21, 19))
 }
@@ -96,12 +96,12 @@ interface I {
 >y : Symbol(y, Decl(callSignaturesWithOptionalParameters2.ts, 33, 16))
 
     foo(x: number, y?: number);
->foo : Symbol(foo, Decl(callSignaturesWithOptionalParameters2.ts, 33, 29), Decl(callSignaturesWithOptionalParameters2.ts, 34, 31))
+>foo : Symbol(I.foo, Decl(callSignaturesWithOptionalParameters2.ts, 33, 29), Decl(callSignaturesWithOptionalParameters2.ts, 34, 31))
 >x : Symbol(x, Decl(callSignaturesWithOptionalParameters2.ts, 34, 8))
 >y : Symbol(y, Decl(callSignaturesWithOptionalParameters2.ts, 34, 18))
 
     foo(x: number, y?: number, z?: number);
->foo : Symbol(foo, Decl(callSignaturesWithOptionalParameters2.ts, 33, 29), Decl(callSignaturesWithOptionalParameters2.ts, 34, 31))
+>foo : Symbol(I.foo, Decl(callSignaturesWithOptionalParameters2.ts, 33, 29), Decl(callSignaturesWithOptionalParameters2.ts, 34, 31))
 >x : Symbol(x, Decl(callSignaturesWithOptionalParameters2.ts, 35, 8))
 >y : Symbol(y, Decl(callSignaturesWithOptionalParameters2.ts, 35, 18))
 >z : Symbol(z, Decl(callSignaturesWithOptionalParameters2.ts, 35, 30))
diff --git a/tests/baselines/reference/callWithSpread.symbols b/tests/baselines/reference/callWithSpread.symbols
index bc1dd7468c9..bc2d9bfebd9 100644
--- a/tests/baselines/reference/callWithSpread.symbols
+++ b/tests/baselines/reference/callWithSpread.symbols
@@ -3,7 +3,7 @@ interface X {
 >X : Symbol(X, Decl(callWithSpread.ts, 0, 0))
 
     foo(x: number, y: number, ...z: string[]);
->foo : Symbol(foo, Decl(callWithSpread.ts, 0, 13))
+>foo : Symbol(X.foo, Decl(callWithSpread.ts, 0, 13))
 >x : Symbol(x, Decl(callWithSpread.ts, 1, 8))
 >y : Symbol(y, Decl(callWithSpread.ts, 1, 18))
 >z : Symbol(z, Decl(callWithSpread.ts, 1, 29))
@@ -107,22 +107,22 @@ class C {
 >z : Symbol(z, Decl(callWithSpread.ts, 31, 37))
 
         this.foo(x, y);
->this.foo : Symbol(foo, Decl(callWithSpread.ts, 34, 5))
+>this.foo : Symbol(C.foo, Decl(callWithSpread.ts, 34, 5))
 >this : Symbol(C, Decl(callWithSpread.ts, 28, 40))
->foo : Symbol(foo, Decl(callWithSpread.ts, 34, 5))
+>foo : Symbol(C.foo, Decl(callWithSpread.ts, 34, 5))
 >x : Symbol(x, Decl(callWithSpread.ts, 31, 16))
 >y : Symbol(y, Decl(callWithSpread.ts, 31, 26))
 
         this.foo(x, y, ...z);
->this.foo : Symbol(foo, Decl(callWithSpread.ts, 34, 5))
+>this.foo : Symbol(C.foo, Decl(callWithSpread.ts, 34, 5))
 >this : Symbol(C, Decl(callWithSpread.ts, 28, 40))
->foo : Symbol(foo, Decl(callWithSpread.ts, 34, 5))
+>foo : Symbol(C.foo, Decl(callWithSpread.ts, 34, 5))
 >x : Symbol(x, Decl(callWithSpread.ts, 31, 16))
 >y : Symbol(y, Decl(callWithSpread.ts, 31, 26))
 >z : Symbol(z, Decl(callWithSpread.ts, 31, 37))
     }
     foo(x: number, y: number, ...z: string[]) {
->foo : Symbol(foo, Decl(callWithSpread.ts, 34, 5))
+>foo : Symbol(C.foo, Decl(callWithSpread.ts, 34, 5))
 >x : Symbol(x, Decl(callWithSpread.ts, 35, 8))
 >y : Symbol(y, Decl(callWithSpread.ts, 35, 18))
 >z : Symbol(z, Decl(callWithSpread.ts, 35, 29))
@@ -142,7 +142,7 @@ class D extends C {
 >a : Symbol(a, Decl(callWithSpread.ts, 7, 3))
     }
     foo() {
->foo : Symbol(foo, Decl(callWithSpread.ts, 43, 5))
+>foo : Symbol(D.foo, Decl(callWithSpread.ts, 43, 5))
 
         super.foo(1, 2);
 >super.foo : Symbol(C.foo, Decl(callWithSpread.ts, 34, 5))
diff --git a/tests/baselines/reference/callWithSpreadES6.symbols b/tests/baselines/reference/callWithSpreadES6.symbols
index 26dd9b548d5..518b04162b2 100644
--- a/tests/baselines/reference/callWithSpreadES6.symbols
+++ b/tests/baselines/reference/callWithSpreadES6.symbols
@@ -4,7 +4,7 @@ interface X {
 >X : Symbol(X, Decl(callWithSpreadES6.ts, 0, 0))
 
     foo(x: number, y: number, ...z: string[]);
->foo : Symbol(foo, Decl(callWithSpreadES6.ts, 1, 13))
+>foo : Symbol(X.foo, Decl(callWithSpreadES6.ts, 1, 13))
 >x : Symbol(x, Decl(callWithSpreadES6.ts, 2, 8))
 >y : Symbol(y, Decl(callWithSpreadES6.ts, 2, 18))
 >z : Symbol(z, Decl(callWithSpreadES6.ts, 2, 29))
@@ -94,7 +94,7 @@ xa[1].foo(1, 2, ...a, "abc");
 >a : Symbol(a, Decl(callWithSpreadES6.ts, 8, 3))
 
 (<Function>xa[1].foo)(...[1, 2, "abc"]);
->Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.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, --, --))
 >xa[1].foo : Symbol(X.foo, Decl(callWithSpreadES6.ts, 1, 13))
 >xa : Symbol(xa, Decl(callWithSpreadES6.ts, 11, 3))
 >foo : Symbol(X.foo, Decl(callWithSpreadES6.ts, 1, 13))
@@ -108,22 +108,22 @@ class C {
 >z : Symbol(z, Decl(callWithSpreadES6.ts, 32, 37))
 
         this.foo(x, y);
->this.foo : Symbol(foo, Decl(callWithSpreadES6.ts, 35, 5))
+>this.foo : Symbol(C.foo, Decl(callWithSpreadES6.ts, 35, 5))
 >this : Symbol(C, Decl(callWithSpreadES6.ts, 29, 40))
->foo : Symbol(foo, Decl(callWithSpreadES6.ts, 35, 5))
+>foo : Symbol(C.foo, Decl(callWithSpreadES6.ts, 35, 5))
 >x : Symbol(x, Decl(callWithSpreadES6.ts, 32, 16))
 >y : Symbol(y, Decl(callWithSpreadES6.ts, 32, 26))
 
         this.foo(x, y, ...z);
->this.foo : Symbol(foo, Decl(callWithSpreadES6.ts, 35, 5))
+>this.foo : Symbol(C.foo, Decl(callWithSpreadES6.ts, 35, 5))
 >this : Symbol(C, Decl(callWithSpreadES6.ts, 29, 40))
->foo : Symbol(foo, Decl(callWithSpreadES6.ts, 35, 5))
+>foo : Symbol(C.foo, Decl(callWithSpreadES6.ts, 35, 5))
 >x : Symbol(x, Decl(callWithSpreadES6.ts, 32, 16))
 >y : Symbol(y, Decl(callWithSpreadES6.ts, 32, 26))
 >z : Symbol(z, Decl(callWithSpreadES6.ts, 32, 37))
     }
     foo(x: number, y: number, ...z: string[]) {
->foo : Symbol(foo, Decl(callWithSpreadES6.ts, 35, 5))
+>foo : Symbol(C.foo, Decl(callWithSpreadES6.ts, 35, 5))
 >x : Symbol(x, Decl(callWithSpreadES6.ts, 36, 8))
 >y : Symbol(y, Decl(callWithSpreadES6.ts, 36, 18))
 >z : Symbol(z, Decl(callWithSpreadES6.ts, 36, 29))
@@ -143,7 +143,7 @@ class D extends C {
 >a : Symbol(a, Decl(callWithSpreadES6.ts, 8, 3))
     }
     foo() {
->foo : Symbol(foo, Decl(callWithSpreadES6.ts, 44, 5))
+>foo : Symbol(D.foo, Decl(callWithSpreadES6.ts, 44, 5))
 
         super.foo(1, 2);
 >super.foo : Symbol(C.foo, Decl(callWithSpreadES6.ts, 35, 5))
diff --git a/tests/baselines/reference/callbacksDontShareTypes.symbols b/tests/baselines/reference/callbacksDontShareTypes.symbols
index 1d7583cec2d..2eded6b880f 100644
--- a/tests/baselines/reference/callbacksDontShareTypes.symbols
+++ b/tests/baselines/reference/callbacksDontShareTypes.symbols
@@ -4,15 +4,15 @@ interface Collection<T> {
 >T : Symbol(T, Decl(callbacksDontShareTypes.ts, 0, 21))
 
     length: number;
->length : Symbol(length, Decl(callbacksDontShareTypes.ts, 0, 25))
+>length : Symbol(Collection.length, Decl(callbacksDontShareTypes.ts, 0, 25))
 
     add(x: T): void;
->add : Symbol(add, Decl(callbacksDontShareTypes.ts, 1, 19))
+>add : Symbol(Collection.add, Decl(callbacksDontShareTypes.ts, 1, 19))
 >x : Symbol(x, Decl(callbacksDontShareTypes.ts, 2, 8))
 >T : Symbol(T, Decl(callbacksDontShareTypes.ts, 0, 21))
 
     remove(x: T): boolean;
->remove : Symbol(remove, Decl(callbacksDontShareTypes.ts, 2, 20))
+>remove : Symbol(Collection.remove, Decl(callbacksDontShareTypes.ts, 2, 20))
 >x : Symbol(x, Decl(callbacksDontShareTypes.ts, 3, 11))
 >T : Symbol(T, Decl(callbacksDontShareTypes.ts, 0, 21))
 }
@@ -20,7 +20,7 @@ interface Combinators {
 >Combinators : Symbol(Combinators, Decl(callbacksDontShareTypes.ts, 4, 1))
 
     map<T, U>(c: Collection<T>, f: (x: T) => U): Collection<U>;
->map : Symbol(map, Decl(callbacksDontShareTypes.ts, 5, 23), Decl(callbacksDontShareTypes.ts, 6, 63))
+>map : Symbol(Combinators.map, Decl(callbacksDontShareTypes.ts, 5, 23), Decl(callbacksDontShareTypes.ts, 6, 63))
 >T : Symbol(T, Decl(callbacksDontShareTypes.ts, 6, 8))
 >U : Symbol(U, Decl(callbacksDontShareTypes.ts, 6, 10))
 >c : Symbol(c, Decl(callbacksDontShareTypes.ts, 6, 14))
@@ -34,7 +34,7 @@ interface Combinators {
 >U : Symbol(U, Decl(callbacksDontShareTypes.ts, 6, 10))
 
     map<T>(c: Collection<T>, f: (x: T) => any): Collection<any>;
->map : Symbol(map, Decl(callbacksDontShareTypes.ts, 5, 23), Decl(callbacksDontShareTypes.ts, 6, 63))
+>map : Symbol(Combinators.map, Decl(callbacksDontShareTypes.ts, 5, 23), Decl(callbacksDontShareTypes.ts, 6, 63))
 >T : Symbol(T, Decl(callbacksDontShareTypes.ts, 7, 8))
 >c : Symbol(c, Decl(callbacksDontShareTypes.ts, 7, 11))
 >Collection : Symbol(Collection, Decl(callbacksDontShareTypes.ts, 0, 0))
diff --git a/tests/baselines/reference/captureThisInSuperCall.symbols b/tests/baselines/reference/captureThisInSuperCall.symbols
index bf1fd151b3c..84d92c292a9 100644
--- a/tests/baselines/reference/captureThisInSuperCall.symbols
+++ b/tests/baselines/reference/captureThisInSuperCall.symbols
@@ -13,10 +13,10 @@ class B extends A {
     constructor() { super({ test: () => this.someMethod()}); } 
 >super : Symbol(A, Decl(captureThisInSuperCall.ts, 0, 0))
 >test : Symbol(test, Decl(captureThisInSuperCall.ts, 5, 27))
->this.someMethod : Symbol(someMethod, Decl(captureThisInSuperCall.ts, 5, 62))
+>this.someMethod : Symbol(B.someMethod, Decl(captureThisInSuperCall.ts, 5, 62))
 >this : Symbol(B, Decl(captureThisInSuperCall.ts, 2, 1))
->someMethod : Symbol(someMethod, Decl(captureThisInSuperCall.ts, 5, 62))
+>someMethod : Symbol(B.someMethod, Decl(captureThisInSuperCall.ts, 5, 62))
 
     someMethod() {}
->someMethod : Symbol(someMethod, Decl(captureThisInSuperCall.ts, 5, 62))
+>someMethod : Symbol(B.someMethod, Decl(captureThisInSuperCall.ts, 5, 62))
 }
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/capturedLetConstInLoop10.symbols b/tests/baselines/reference/capturedLetConstInLoop10.symbols
index 124874088a8..3ad860b92ae 100644
--- a/tests/baselines/reference/capturedLetConstInLoop10.symbols
+++ b/tests/baselines/reference/capturedLetConstInLoop10.symbols
@@ -3,7 +3,7 @@ class A {
 >A : Symbol(A, Decl(capturedLetConstInLoop10.ts, 0, 0))
 
     foo() {
->foo : Symbol(foo, Decl(capturedLetConstInLoop10.ts, 0, 9))
+>foo : Symbol(A.foo, Decl(capturedLetConstInLoop10.ts, 0, 9))
 
         for (let x of [0]) {
 >x : Symbol(x, Decl(capturedLetConstInLoop10.ts, 2, 16))
@@ -13,19 +13,19 @@ class A {
 >x : Symbol(x, Decl(capturedLetConstInLoop10.ts, 2, 16))
 
             this.bar(f());
->this.bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 6, 5))
+>this.bar : Symbol(A.bar, Decl(capturedLetConstInLoop10.ts, 6, 5))
 >this : Symbol(A, Decl(capturedLetConstInLoop10.ts, 0, 0))
->bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 6, 5))
+>bar : Symbol(A.bar, Decl(capturedLetConstInLoop10.ts, 6, 5))
 >f : Symbol(f, Decl(capturedLetConstInLoop10.ts, 3, 15))
         }
     }
     bar(a: number) {
->bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 6, 5))
+>bar : Symbol(A.bar, Decl(capturedLetConstInLoop10.ts, 6, 5))
 >a : Symbol(a, Decl(capturedLetConstInLoop10.ts, 7, 8))
     }
 
     baz() {
->baz : Symbol(baz, Decl(capturedLetConstInLoop10.ts, 8, 5))
+>baz : Symbol(A.baz, Decl(capturedLetConstInLoop10.ts, 8, 5))
 
         for (let x of [1]) {
 >x : Symbol(x, Decl(capturedLetConstInLoop10.ts, 11, 16))
@@ -42,20 +42,20 @@ class A {
 >y : Symbol(y, Decl(capturedLetConstInLoop10.ts, 13, 20))
 
                 this.bar(b());
->this.bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 6, 5))
+>this.bar : Symbol(A.bar, Decl(capturedLetConstInLoop10.ts, 6, 5))
 >this : Symbol(A, Decl(capturedLetConstInLoop10.ts, 0, 0))
->bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 6, 5))
+>bar : Symbol(A.bar, Decl(capturedLetConstInLoop10.ts, 6, 5))
 >b : Symbol(b, Decl(capturedLetConstInLoop10.ts, 14, 19))
             }
             this.bar(a());
->this.bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 6, 5))
+>this.bar : Symbol(A.bar, Decl(capturedLetConstInLoop10.ts, 6, 5))
 >this : Symbol(A, Decl(capturedLetConstInLoop10.ts, 0, 0))
->bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 6, 5))
+>bar : Symbol(A.bar, Decl(capturedLetConstInLoop10.ts, 6, 5))
 >a : Symbol(a, Decl(capturedLetConstInLoop10.ts, 12, 15))
         }
     }
     baz2() {
->baz2 : Symbol(baz2, Decl(capturedLetConstInLoop10.ts, 19, 5))
+>baz2 : Symbol(A.baz2, Decl(capturedLetConstInLoop10.ts, 19, 5))
 
         for (let x of [1]) {
 >x : Symbol(x, Decl(capturedLetConstInLoop10.ts, 21, 16))
@@ -65,9 +65,9 @@ class A {
 >x : Symbol(x, Decl(capturedLetConstInLoop10.ts, 21, 16))
 
             this.bar(a());
->this.bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 6, 5))
+>this.bar : Symbol(A.bar, Decl(capturedLetConstInLoop10.ts, 6, 5))
 >this : Symbol(A, Decl(capturedLetConstInLoop10.ts, 0, 0))
->bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 6, 5))
+>bar : Symbol(A.bar, Decl(capturedLetConstInLoop10.ts, 6, 5))
 >a : Symbol(a, Decl(capturedLetConstInLoop10.ts, 22, 15))
 
             for (let y of [1]) {
@@ -78,9 +78,9 @@ class A {
 >y : Symbol(y, Decl(capturedLetConstInLoop10.ts, 24, 20))
 
                 this.bar(b());
->this.bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 6, 5))
+>this.bar : Symbol(A.bar, Decl(capturedLetConstInLoop10.ts, 6, 5))
 >this : Symbol(A, Decl(capturedLetConstInLoop10.ts, 0, 0))
->bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 6, 5))
+>bar : Symbol(A.bar, Decl(capturedLetConstInLoop10.ts, 6, 5))
 >b : Symbol(b, Decl(capturedLetConstInLoop10.ts, 25, 19))
             }
         }
@@ -91,7 +91,7 @@ class B {
 >B : Symbol(B, Decl(capturedLetConstInLoop10.ts, 30, 1))
 
     foo() {
->foo : Symbol(foo, Decl(capturedLetConstInLoop10.ts, 32, 9))
+>foo : Symbol(B.foo, Decl(capturedLetConstInLoop10.ts, 32, 9))
 
         let a =
 >a : Symbol(a, Decl(capturedLetConstInLoop10.ts, 34, 11))
@@ -105,15 +105,15 @@ class B {
 >x : Symbol(x, Decl(capturedLetConstInLoop10.ts, 36, 24))
 
                     this.bar(f());
->this.bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 41, 5))
+>this.bar : Symbol(B.bar, Decl(capturedLetConstInLoop10.ts, 41, 5))
 >this : Symbol(B, Decl(capturedLetConstInLoop10.ts, 30, 1))
->bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 41, 5))
+>bar : Symbol(B.bar, Decl(capturedLetConstInLoop10.ts, 41, 5))
 >f : Symbol(f, Decl(capturedLetConstInLoop10.ts, 37, 23))
                 }
             }
     }
     bar(a: number) {
->bar : Symbol(bar, Decl(capturedLetConstInLoop10.ts, 41, 5))
+>bar : Symbol(B.bar, Decl(capturedLetConstInLoop10.ts, 41, 5))
 >a : Symbol(a, Decl(capturedLetConstInLoop10.ts, 42, 8))
     }
 }
diff --git a/tests/baselines/reference/capturedLetConstInLoop10_ES6.symbols b/tests/baselines/reference/capturedLetConstInLoop10_ES6.symbols
index f0cf92ff96b..8ca14c806a3 100644
--- a/tests/baselines/reference/capturedLetConstInLoop10_ES6.symbols
+++ b/tests/baselines/reference/capturedLetConstInLoop10_ES6.symbols
@@ -3,7 +3,7 @@ class A {
 >A : Symbol(A, Decl(capturedLetConstInLoop10_ES6.ts, 0, 0))
 
     foo() {
->foo : Symbol(foo, Decl(capturedLetConstInLoop10_ES6.ts, 0, 9))
+>foo : Symbol(A.foo, Decl(capturedLetConstInLoop10_ES6.ts, 0, 9))
 
         for (let x of [0]) {
 >x : Symbol(x, Decl(capturedLetConstInLoop10_ES6.ts, 2, 16))
@@ -13,19 +13,19 @@ class A {
 >x : Symbol(x, Decl(capturedLetConstInLoop10_ES6.ts, 2, 16))
 
             this.bar(f());
->this.bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5))
+>this.bar : Symbol(A.bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5))
 >this : Symbol(A, Decl(capturedLetConstInLoop10_ES6.ts, 0, 0))
->bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5))
+>bar : Symbol(A.bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5))
 >f : Symbol(f, Decl(capturedLetConstInLoop10_ES6.ts, 3, 15))
         }
     }
     bar(a: number) {
->bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5))
+>bar : Symbol(A.bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5))
 >a : Symbol(a, Decl(capturedLetConstInLoop10_ES6.ts, 7, 8))
     }
 
     baz() {
->baz : Symbol(baz, Decl(capturedLetConstInLoop10_ES6.ts, 8, 5))
+>baz : Symbol(A.baz, Decl(capturedLetConstInLoop10_ES6.ts, 8, 5))
 
         for (let x of [1]) {
 >x : Symbol(x, Decl(capturedLetConstInLoop10_ES6.ts, 11, 16))
@@ -42,20 +42,20 @@ class A {
 >y : Symbol(y, Decl(capturedLetConstInLoop10_ES6.ts, 13, 20))
 
                 this.bar(b());
->this.bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5))
+>this.bar : Symbol(A.bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5))
 >this : Symbol(A, Decl(capturedLetConstInLoop10_ES6.ts, 0, 0))
->bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5))
+>bar : Symbol(A.bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5))
 >b : Symbol(b, Decl(capturedLetConstInLoop10_ES6.ts, 14, 19))
             }
             this.bar(a());
->this.bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5))
+>this.bar : Symbol(A.bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5))
 >this : Symbol(A, Decl(capturedLetConstInLoop10_ES6.ts, 0, 0))
->bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5))
+>bar : Symbol(A.bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5))
 >a : Symbol(a, Decl(capturedLetConstInLoop10_ES6.ts, 12, 15))
         }
     }
     baz2() {
->baz2 : Symbol(baz2, Decl(capturedLetConstInLoop10_ES6.ts, 19, 5))
+>baz2 : Symbol(A.baz2, Decl(capturedLetConstInLoop10_ES6.ts, 19, 5))
 
         for (let x of [1]) {
 >x : Symbol(x, Decl(capturedLetConstInLoop10_ES6.ts, 21, 16))
@@ -65,9 +65,9 @@ class A {
 >x : Symbol(x, Decl(capturedLetConstInLoop10_ES6.ts, 21, 16))
 
             this.bar(a());
->this.bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5))
+>this.bar : Symbol(A.bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5))
 >this : Symbol(A, Decl(capturedLetConstInLoop10_ES6.ts, 0, 0))
->bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5))
+>bar : Symbol(A.bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5))
 >a : Symbol(a, Decl(capturedLetConstInLoop10_ES6.ts, 22, 15))
 
             for (let y of [1]) {
@@ -78,9 +78,9 @@ class A {
 >y : Symbol(y, Decl(capturedLetConstInLoop10_ES6.ts, 24, 20))
 
                 this.bar(b());
->this.bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5))
+>this.bar : Symbol(A.bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5))
 >this : Symbol(A, Decl(capturedLetConstInLoop10_ES6.ts, 0, 0))
->bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5))
+>bar : Symbol(A.bar, Decl(capturedLetConstInLoop10_ES6.ts, 6, 5))
 >b : Symbol(b, Decl(capturedLetConstInLoop10_ES6.ts, 25, 19))
             }
         }
@@ -91,7 +91,7 @@ class B {
 >B : Symbol(B, Decl(capturedLetConstInLoop10_ES6.ts, 30, 1))
 
     foo() {
->foo : Symbol(foo, Decl(capturedLetConstInLoop10_ES6.ts, 32, 9))
+>foo : Symbol(B.foo, Decl(capturedLetConstInLoop10_ES6.ts, 32, 9))
 
         let a =
 >a : Symbol(a, Decl(capturedLetConstInLoop10_ES6.ts, 34, 11))
@@ -105,15 +105,15 @@ class B {
 >x : Symbol(x, Decl(capturedLetConstInLoop10_ES6.ts, 36, 24))
 
                     this.bar(f());
->this.bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 41, 5))
+>this.bar : Symbol(B.bar, Decl(capturedLetConstInLoop10_ES6.ts, 41, 5))
 >this : Symbol(B, Decl(capturedLetConstInLoop10_ES6.ts, 30, 1))
->bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 41, 5))
+>bar : Symbol(B.bar, Decl(capturedLetConstInLoop10_ES6.ts, 41, 5))
 >f : Symbol(f, Decl(capturedLetConstInLoop10_ES6.ts, 37, 23))
                 }
             }
     }
     bar(a: number) {
->bar : Symbol(bar, Decl(capturedLetConstInLoop10_ES6.ts, 41, 5))
+>bar : Symbol(B.bar, Decl(capturedLetConstInLoop10_ES6.ts, 41, 5))
 >a : Symbol(a, Decl(capturedLetConstInLoop10_ES6.ts, 42, 8))
     }
 }
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
new file mode 100644
index 00000000000..1bb691bb72a
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop12.js
@@ -0,0 +1,48 @@
+//// [capturedLetConstInLoop12.ts]
+(function() {
+    "use strict";
+
+    for (let i = 0; i < 4; i++) {
+        (() => [i] = [i + 1])();
+    }
+})();
+
+(function() {
+    "use strict";
+
+    for (let i = 0; i < 4; i++) {
+        (() => ({a:i} = {a:i + 1}))();
+    }
+})();
+
+//// [capturedLetConstInLoop12.js]
+(function () {
+    "use strict";
+    var _loop_1 = function (i) {
+        (function () {
+            return _a = [i + 1], i = _a[0], _a;
+            var _a;
+        })();
+        out_i_1 = i;
+    };
+    var out_i_1;
+    for (var i = 0; i < 4; i++) {
+        _loop_1(i);
+        i = out_i_1;
+    }
+})();
+(function () {
+    "use strict";
+    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;
+    for (var i = 0; i < 4; i++) {
+        _loop_2(i);
+        i = out_i_2;
+    }
+})();
diff --git a/tests/baselines/reference/capturedLetConstInLoop12.symbols b/tests/baselines/reference/capturedLetConstInLoop12.symbols
new file mode 100644
index 00000000000..8c0338ea84e
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop12.symbols
@@ -0,0 +1,30 @@
+=== tests/cases/compiler/capturedLetConstInLoop12.ts ===
+(function() {
+    "use strict";
+
+    for (let i = 0; i < 4; i++) {
+>i : Symbol(i, Decl(capturedLetConstInLoop12.ts, 3, 12))
+>i : Symbol(i, Decl(capturedLetConstInLoop12.ts, 3, 12))
+>i : Symbol(i, Decl(capturedLetConstInLoop12.ts, 3, 12))
+
+        (() => [i] = [i + 1])();
+>i : Symbol(i, Decl(capturedLetConstInLoop12.ts, 3, 12))
+>i : Symbol(i, Decl(capturedLetConstInLoop12.ts, 3, 12))
+    }
+})();
+
+(function() {
+    "use strict";
+
+    for (let i = 0; i < 4; i++) {
+>i : Symbol(i, Decl(capturedLetConstInLoop12.ts, 11, 12))
+>i : Symbol(i, Decl(capturedLetConstInLoop12.ts, 11, 12))
+>i : Symbol(i, Decl(capturedLetConstInLoop12.ts, 11, 12))
+
+        (() => ({a:i} = {a:i + 1}))();
+>a : Symbol(a, Decl(capturedLetConstInLoop12.ts, 12, 17))
+>i : Symbol(i, Decl(capturedLetConstInLoop12.ts, 11, 12))
+>a : Symbol(a, Decl(capturedLetConstInLoop12.ts, 12, 25))
+>i : Symbol(i, Decl(capturedLetConstInLoop12.ts, 11, 12))
+    }
+})();
diff --git a/tests/baselines/reference/capturedLetConstInLoop12.types b/tests/baselines/reference/capturedLetConstInLoop12.types
new file mode 100644
index 00000000000..aee671b4d36
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop12.types
@@ -0,0 +1,65 @@
+=== tests/cases/compiler/capturedLetConstInLoop12.ts ===
+(function() {
+>(function() {    "use strict";    for (let i = 0; i < 4; i++) {        (() => [i] = [i + 1])();    }})() : void
+>(function() {    "use strict";    for (let i = 0; i < 4; i++) {        (() => [i] = [i + 1])();    }}) : () => void
+>function() {    "use strict";    for (let i = 0; i < 4; i++) {        (() => [i] = [i + 1])();    }} : () => void
+
+    "use strict";
+>"use strict" : string
+
+    for (let i = 0; i < 4; i++) {
+>i : number
+>0 : number
+>i < 4 : boolean
+>i : number
+>4 : number
+>i++ : number
+>i : number
+
+        (() => [i] = [i + 1])();
+>(() => [i] = [i + 1])() : [number]
+>(() => [i] = [i + 1]) : () => [number]
+>() => [i] = [i + 1] : () => [number]
+>[i] = [i + 1] : [number]
+>[i] : [number]
+>i : number
+>[i + 1] : [number]
+>i + 1 : number
+>i : number
+>1 : number
+    }
+})();
+
+(function() {
+>(function() {    "use strict";    for (let i = 0; i < 4; i++) {        (() => ({a:i} = {a:i + 1}))();    }})() : void
+>(function() {    "use strict";    for (let i = 0; i < 4; i++) {        (() => ({a:i} = {a:i + 1}))();    }}) : () => void
+>function() {    "use strict";    for (let i = 0; i < 4; i++) {        (() => ({a:i} = {a:i + 1}))();    }} : () => void
+
+    "use strict";
+>"use strict" : string
+
+    for (let i = 0; i < 4; i++) {
+>i : number
+>0 : number
+>i < 4 : boolean
+>i : number
+>4 : number
+>i++ : number
+>i : number
+
+        (() => ({a:i} = {a:i + 1}))();
+>(() => ({a:i} = {a:i + 1}))() : { a: number; }
+>(() => ({a:i} = {a:i + 1})) : () => { a: number; }
+>() => ({a:i} = {a:i + 1}) : () => { a: number; }
+>({a:i} = {a:i + 1}) : { a: number; }
+>{a:i} = {a:i + 1} : { a: number; }
+>{a:i} : { a: number; }
+>a : number
+>i : number
+>{a:i + 1} : { a: number; }
+>a : number
+>i + 1 : number
+>i : number
+>1 : number
+    }
+})();
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/capturedLetConstInLoop2_ES6.symbols b/tests/baselines/reference/capturedLetConstInLoop2_ES6.symbols
index 32812c89370..0dd74bc4b25 100644
--- a/tests/baselines/reference/capturedLetConstInLoop2_ES6.symbols
+++ b/tests/baselines/reference/capturedLetConstInLoop2_ES6.symbols
@@ -10,9 +10,9 @@ function foo0(x) {
 
         let a = arguments.length;
 >a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 4, 11))
->arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments.length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 >arguments : Symbol(arguments)
->length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 
         (function() { return x + a });
 >x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 3, 12))
@@ -33,9 +33,9 @@ function foo0_1(x) {
 
         let a = arguments.length;
 >a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 12, 11))
->arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments.length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 >arguments : Symbol(arguments)
->length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 
         (function() { return x + a });
 >x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 11, 12))
@@ -58,9 +58,9 @@ function foo1(x) {
 
         let a = arguments.length;
 >a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 20, 11))
->arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments.length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 >arguments : Symbol(arguments)
->length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 
         (function() { return x + a });
 >x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 19, 12))
@@ -79,9 +79,9 @@ function foo2(x) {
     while (1 === 1) {
         let a = arguments.length;
 >a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 28, 11))
->arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments.length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 >arguments : Symbol(arguments)
->length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 
         (function() { return x + a });
 >x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 26, 14))
@@ -103,9 +103,9 @@ function foo3(x) {
 
         let a = arguments.length;
 >a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 37, 11))
->arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments.length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 >arguments : Symbol(arguments)
->length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 
         (function() { return x + a });
 >x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 36, 11))
@@ -129,9 +129,9 @@ function foo4(x) {
 
         let a = arguments.length;
 >a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 45, 11))
->arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments.length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 >arguments : Symbol(arguments)
->length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 
         let x = 1;
 >x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 46, 11))
@@ -158,9 +158,9 @@ function foo5(x) {
 
         let a = arguments.length;
 >a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 54, 11))
->arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments.length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 >arguments : Symbol(arguments)
->length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 
         (function() { return x + y + a });
 >x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 53, 12))
@@ -186,9 +186,9 @@ function foo6(x) {
 
         let a = arguments.length;
 >a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 64, 11))
->arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments.length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 >arguments : Symbol(arguments)
->length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 
         (function() { return x + y + a });
 >x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 63, 11))
@@ -213,9 +213,9 @@ function foo7(x) {
 
         let a = arguments.length;
 >a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 73, 11))
->arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments.length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 >arguments : Symbol(arguments)
->length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 
         (function() { return x + y + a });
 >x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 72, 11))
@@ -245,9 +245,9 @@ function foo8(x) {
 
         let a = arguments.length;
 >a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 83, 11))
->arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments.length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 >arguments : Symbol(arguments)
->length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 
         (function() { return x + y + a });
 >x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 82, 11))
@@ -270,9 +270,9 @@ function foo0_c(x) {
 
         const a = arguments.length;
 >a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 91, 13))
->arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments.length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 >arguments : Symbol(arguments)
->length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 
         (function() { return x + a });
 >x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 90, 14))
@@ -293,9 +293,9 @@ function foo0_1_c(x) {
 
         const a = arguments.length;
 >a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 99, 13))
->arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments.length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 >arguments : Symbol(arguments)
->length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 
         (function() { return x + a });
 >x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 98, 14))
@@ -317,9 +317,9 @@ function foo1_c(x) {
 
         const a = arguments.length;
 >a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 107, 13))
->arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments.length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 >arguments : Symbol(arguments)
->length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 
         (function() { return x + a });
 >x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 106, 14))
@@ -338,9 +338,9 @@ function foo2_c(x) {
     while (1 === 1) {
         const a = arguments.length;
 >a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 115, 13))
->arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments.length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 >arguments : Symbol(arguments)
->length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 
         (function() { return x + a });
 >x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 113, 16))
@@ -362,9 +362,9 @@ function foo3_c(x) {
 
         const a = arguments.length;
 >a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 124, 13))
->arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments.length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 >arguments : Symbol(arguments)
->length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 
         (function() { return x + a });
 >x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 123, 13))
@@ -387,9 +387,9 @@ function foo4_c(x) {
 
         const a = arguments.length;
 >a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 132, 13))
->arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments.length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 >arguments : Symbol(arguments)
->length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 
         const x = 1;
 >x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 133, 13))
@@ -415,9 +415,9 @@ function foo5_c(x) {
 
         const a = arguments.length;
 >a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 141, 13))
->arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments.length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 >arguments : Symbol(arguments)
->length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 
         (function() { return x + y + a });
 >x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 140, 14))
@@ -443,9 +443,9 @@ function foo6_c(x) {
 
         const a = arguments.length;
 >a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 151, 13))
->arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments.length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 >arguments : Symbol(arguments)
->length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 
         (function() { return x + y + a });
 >x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 150, 13))
@@ -470,9 +470,9 @@ function foo7_c(x) {
 
         const a = arguments.length;
 >a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 160, 13))
->arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments.length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 >arguments : Symbol(arguments)
->length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 
         (function() { return x + y + a });
 >x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 159, 13))
@@ -501,9 +501,9 @@ function foo8_c(x) {
 
         const a = arguments.length;
 >a : Symbol(a, Decl(capturedLetConstInLoop2_ES6.ts, 170, 13))
->arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments.length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 >arguments : Symbol(arguments)
->length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 
         (function() { return x + y + a });
 >x : Symbol(x, Decl(capturedLetConstInLoop2_ES6.ts, 169, 13))
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 e196950e696..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,13 +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 === "continue") continue;
+    if (state_1 === "break")
+        break;
 }
-var _loop_2 = function(x) {
+var _loop_2 = function (x) {
     (function () { return x; });
     (function () { return x; });
     if (x == "1") {
@@ -268,10 +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 === "continue") continue;
+    if (state_2 === "break")
+        break;
 }
-var _loop_3 = function(x) {
+var _loop_3 = function (x) {
     (function () { return x; });
     (function () { return x; });
     if (x == 1) {
@@ -283,10 +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 === "continue") continue;
+    if (state_3 === "break")
+        break;
 }
-var _loop_4 = function() {
+var _loop_4 = function () {
     var x;
     (function () { return x; });
     (function () { return x; });
@@ -299,10 +299,10 @@ var _loop_4 = function() {
 };
 while (1 === 1) {
     var state_4 = _loop_4();
-    if (state_4 === "break") break;
-    if (state_4 === "continue") continue;
+    if (state_4 === "break")
+        break;
 }
-var _loop_5 = function() {
+var _loop_5 = function () {
     var x;
     (function () { return x; });
     (function () { return x; });
@@ -315,10 +315,10 @@ var _loop_5 = function() {
 };
 do {
     var state_5 = _loop_5();
-    if (state_5 === "break") break;
-    if (state_5 === "continue") continue;
+    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; });
@@ -331,10 +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 === "continue") continue;
+    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) {
@@ -346,10 +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 === "continue") continue;
+    if (state_7 === "break")
+        break;
 }
-var _loop_8 = function() {
+var _loop_8 = function () {
     var x, y;
     (function () { return x + y; });
     (function () { return x + y; });
@@ -362,10 +362,10 @@ var _loop_8 = function() {
 };
 while (1 === 1) {
     var state_8 = _loop_8();
-    if (state_8 === "break") break;
-    if (state_8 === "continue") continue;
+    if (state_8 === "break")
+        break;
 }
-var _loop_9 = function() {
+var _loop_9 = function () {
     var x, y;
     (function () { return x + y; });
     (function () { return x + y; });
@@ -378,10 +378,10 @@ var _loop_9 = function() {
 };
 do {
     var state_9 = _loop_9();
-    if (state_9 === "break") break;
-    if (state_9 === "continue") continue;
+    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; });
@@ -394,11 +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 === "continue") continue;
+    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) {
@@ -408,13 +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 === "continue") continue;
+    if (state_11 === "break")
+        break;
 }
-var _loop_12 = function(x) {
+var _loop_12 = function (x) {
     (function () { return x; });
     (function () { return x; });
     if (x == "1") {
@@ -426,10 +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 === "continue") continue;
+    if (state_12 === "break")
+        break;
 }
-var _loop_13 = function(x) {
+var _loop_13 = function (x) {
     (function () { return x; });
     (function () { return x; });
     if (x == 1) {
@@ -441,10 +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 === "continue") continue;
+    if (state_13 === "break")
+        break;
 }
-var _loop_14 = function() {
+var _loop_14 = function () {
     var x = 1;
     (function () { return x; });
     (function () { return x; });
@@ -457,10 +457,10 @@ var _loop_14 = function() {
 };
 while (1 === 1) {
     var state_14 = _loop_14();
-    if (state_14 === "break") break;
-    if (state_14 === "continue") continue;
+    if (state_14 === "break")
+        break;
 }
-var _loop_15 = function() {
+var _loop_15 = function () {
     var x = 1;
     (function () { return x; });
     (function () { return x; });
@@ -473,10 +473,10 @@ var _loop_15 = function() {
 };
 do {
     var state_15 = _loop_15();
-    if (state_15 === "break") break;
-    if (state_15 === "continue") continue;
+    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; });
@@ -489,10 +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 === "continue") continue;
+    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) {
@@ -504,10 +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 === "continue") continue;
+    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; });
@@ -520,10 +520,10 @@ var _loop_18 = function() {
 };
 while (1 === 1) {
     var state_18 = _loop_18();
-    if (state_18 === "break") break;
-    if (state_18 === "continue") continue;
+    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; });
@@ -536,10 +536,10 @@ var _loop_19 = function() {
 };
 do {
     var state_19 = _loop_19();
-    if (state_19 === "break") break;
-    if (state_19 === "continue") continue;
+    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; });
@@ -552,6 +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 === "continue") continue;
+    if (state_20 === "break")
+        break;
 }
diff --git a/tests/baselines/reference/capturedLetConstInLoop7.js b/tests/baselines/reference/capturedLetConstInLoop7.js
index 8df93bca60f..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,17 +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;
-    if (state_1 === "continue") continue;
-    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") {
@@ -421,14 +421,14 @@ var _loop_2 = function(x) {
 };
 l00: for (var x in []) {
     var state_2 = _loop_2(x);
-    if (state_2 === "break") break;
-    if (state_2 === "continue") continue;
-    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) {
@@ -446,14 +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;
-    if (state_3 === "continue") continue;
-    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; });
@@ -472,14 +472,14 @@ var _loop_4 = function() {
 };
 l2: while (1 === 1) {
     var state_4 = _loop_4();
-    if (state_4 === "break") break;
-    if (state_4 === "continue") continue;
-    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; });
@@ -498,14 +498,14 @@ var _loop_5 = function() {
 };
 l3: do {
     var state_5 = _loop_5();
-    if (state_5 === "break") break;
-    if (state_5 === "continue") continue;
-    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; });
@@ -524,14 +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;
-    if (state_6 === "continue") continue;
-    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) {
@@ -549,14 +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;
-    if (state_7 === "continue") continue;
-    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; });
@@ -575,14 +575,14 @@ var _loop_8 = function() {
 };
 l6: while (1 === 1) {
     var state_8 = _loop_8();
-    if (state_8 === "break") break;
-    if (state_8 === "continue") continue;
-    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; });
@@ -601,14 +601,14 @@ var _loop_9 = function() {
 };
 l7: do {
     var state_9 = _loop_9();
-    if (state_9 === "break") break;
-    if (state_9 === "continue") continue;
-    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; });
@@ -627,15 +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;
-    if (state_10 === "continue") continue;
-    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) {
@@ -651,17 +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;
-    if (state_11 === "continue") continue;
-    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") {
@@ -679,14 +679,14 @@ var _loop_12 = function(x) {
 };
 l00_c: for (var x in []) {
     var state_12 = _loop_12(x);
-    if (state_12 === "break") break;
-    if (state_12 === "continue") continue;
-    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) {
@@ -704,14 +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;
-    if (state_13 === "continue") continue;
-    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; });
@@ -730,14 +730,14 @@ var _loop_14 = function() {
 };
 l2_c: while (1 === 1) {
     var state_14 = _loop_14();
-    if (state_14 === "break") break;
-    if (state_14 === "continue") continue;
-    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; });
@@ -756,14 +756,14 @@ var _loop_15 = function() {
 };
 l3_c: do {
     var state_15 = _loop_15();
-    if (state_15 === "break") break;
-    if (state_15 === "continue") continue;
-    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; });
@@ -782,14 +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;
-    if (state_16 === "continue") continue;
-    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) {
@@ -807,14 +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;
-    if (state_17 === "continue") continue;
-    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; });
@@ -833,14 +833,14 @@ var _loop_18 = function() {
 };
 l6_c: while (1 === 1) {
     var state_18 = _loop_18();
-    if (state_18 === "break") break;
-    if (state_18 === "continue") continue;
-    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; });
@@ -859,14 +859,14 @@ var _loop_19 = function() {
 };
 l7_c: do {
     var state_19 = _loop_19();
-    if (state_19 === "break") break;
-    if (state_19 === "continue") continue;
-    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; });
@@ -885,9 +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;
-    if (state_20 === "continue") continue;
-    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 560b99bb566..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,10 +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;
-                if (state_1 === "continue") continue;
-                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;
@@ -198,10 +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;
-            if (state_2 === "continue") continue;
-            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;
@@ -211,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) {
@@ -245,10 +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;
-                if (state_3 === "continue") continue;
-                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;
@@ -280,10 +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;
-            if (state_4 === "continue") continue;
-            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.symbols b/tests/baselines/reference/capturedLetConstInLoop9.symbols
index 37d1764b41b..2cc1645863e 100644
--- a/tests/baselines/reference/capturedLetConstInLoop9.symbols
+++ b/tests/baselines/reference/capturedLetConstInLoop9.symbols
@@ -53,7 +53,7 @@ for (let x = 0; x < 1; ++x) {
 >A : Symbol(A, Decl(capturedLetConstInLoop9.ts, 24, 5))
 
         m() {
->m : Symbol(m, Decl(capturedLetConstInLoop9.ts, 26, 13))
+>m : Symbol(A.m, Decl(capturedLetConstInLoop9.ts, 26, 13))
 
             return x + 1;
 >x : Symbol(x, Decl(capturedLetConstInLoop9.ts, 1, 7))
@@ -222,10 +222,10 @@ class C {
 >C : Symbol(C, Decl(capturedLetConstInLoop9.ts, 120, 1))
 
     constructor(private N: number) { }
->N : Symbol(N, Decl(capturedLetConstInLoop9.ts, 123, 16))
+>N : Symbol(C.N, Decl(capturedLetConstInLoop9.ts, 123, 16))
 
     foo() {
->foo : Symbol(foo, Decl(capturedLetConstInLoop9.ts, 123, 38))
+>foo : Symbol(C.foo, Decl(capturedLetConstInLoop9.ts, 123, 38))
 
         for (let i = 0; i < 100; i++) {
 >i : Symbol(i, Decl(capturedLetConstInLoop9.ts, 125, 16))
@@ -234,9 +234,9 @@ class C {
 
             let f = () => this.N * i;
 >f : Symbol(f, Decl(capturedLetConstInLoop9.ts, 126, 15))
->this.N : Symbol(N, Decl(capturedLetConstInLoop9.ts, 123, 16))
+>this.N : Symbol(C.N, Decl(capturedLetConstInLoop9.ts, 123, 16))
 >this : Symbol(C, Decl(capturedLetConstInLoop9.ts, 120, 1))
->N : Symbol(N, Decl(capturedLetConstInLoop9.ts, 123, 16))
+>N : Symbol(C.N, Decl(capturedLetConstInLoop9.ts, 123, 16))
 >i : Symbol(i, Decl(capturedLetConstInLoop9.ts, 125, 16))
         }
     }
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/capturedLetConstInLoop9_ES6.symbols b/tests/baselines/reference/capturedLetConstInLoop9_ES6.symbols
index d71a20afe47..c9b8fdb392c 100644
--- a/tests/baselines/reference/capturedLetConstInLoop9_ES6.symbols
+++ b/tests/baselines/reference/capturedLetConstInLoop9_ES6.symbols
@@ -54,7 +54,7 @@ for (let x = 0; x < 1; ++x) {
 >A : Symbol(A, Decl(capturedLetConstInLoop9_ES6.ts, 25, 5))
 
         m() {
->m : Symbol(m, Decl(capturedLetConstInLoop9_ES6.ts, 27, 13))
+>m : Symbol(A.m, Decl(capturedLetConstInLoop9_ES6.ts, 27, 13))
 
             return x + 1;
 >x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 2, 7))
@@ -127,9 +127,9 @@ function foo() {
 >z1 : Symbol(z1, Decl(capturedLetConstInLoop9_ES6.ts, 68, 21))
 >x1 : Symbol(x1, Decl(capturedLetConstInLoop9_ES6.ts, 68, 33))
 >y : Symbol(y, Decl(capturedLetConstInLoop9_ES6.ts, 68, 38))
->arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments.length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 >arguments : Symbol(arguments)
->length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 
             if (b === 1) {
 >b : Symbol(b, Decl(capturedLetConstInLoop9_ES6.ts, 67, 16))
@@ -222,10 +222,10 @@ class C {
 >C : Symbol(C, Decl(capturedLetConstInLoop9_ES6.ts, 120, 1))
 
     constructor(private N: number) { }
->N : Symbol(N, Decl(capturedLetConstInLoop9_ES6.ts, 123, 16))
+>N : Symbol(C.N, Decl(capturedLetConstInLoop9_ES6.ts, 123, 16))
 
     foo() {
->foo : Symbol(foo, Decl(capturedLetConstInLoop9_ES6.ts, 123, 38))
+>foo : Symbol(C.foo, Decl(capturedLetConstInLoop9_ES6.ts, 123, 38))
 
         for (let i = 0; i < 100; i++) {
 >i : Symbol(i, Decl(capturedLetConstInLoop9_ES6.ts, 125, 16))
@@ -234,9 +234,9 @@ class C {
 
             let f = () => this.N * i;
 >f : Symbol(f, Decl(capturedLetConstInLoop9_ES6.ts, 126, 15))
->this.N : Symbol(N, Decl(capturedLetConstInLoop9_ES6.ts, 123, 16))
+>this.N : Symbol(C.N, Decl(capturedLetConstInLoop9_ES6.ts, 123, 16))
 >this : Symbol(C, Decl(capturedLetConstInLoop9_ES6.ts, 120, 1))
->N : Symbol(N, Decl(capturedLetConstInLoop9_ES6.ts, 123, 16))
+>N : Symbol(C.N, Decl(capturedLetConstInLoop9_ES6.ts, 123, 16))
 >i : Symbol(i, Decl(capturedLetConstInLoop9_ES6.ts, 125, 16))
         }
     }
@@ -247,24 +247,24 @@ function foo3 () {
 
     let x = arguments.length;
 >x : Symbol(x, Decl(capturedLetConstInLoop9_ES6.ts, 132, 7))
->arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments.length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 >arguments : Symbol(arguments)
->length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 
     for (let y of []) {
 >y : Symbol(y, Decl(capturedLetConstInLoop9_ES6.ts, 133, 12))
 
         let z = arguments.length;
 >z : Symbol(z, Decl(capturedLetConstInLoop9_ES6.ts, 134, 11))
->arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments.length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 >arguments : Symbol(arguments)
->length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 
         (function() { return y + z + arguments.length; });
 >y : Symbol(y, Decl(capturedLetConstInLoop9_ES6.ts, 133, 12))
 >z : Symbol(z, Decl(capturedLetConstInLoop9_ES6.ts, 134, 11))
->arguments.length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>arguments.length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
 >arguments : Symbol(arguments)
->length : Symbol(IArguments.length, Decl(lib.d.ts, --, --))
+>length : Symbol(IArguments.length, Decl(lib.es5.d.ts, --, --))
     }
 }
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/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/castTest.symbols b/tests/baselines/reference/castTest.symbols
index e0bf154820e..944cc8238e6 100644
--- a/tests/baselines/reference/castTest.symbols
+++ b/tests/baselines/reference/castTest.symbols
@@ -32,19 +32,19 @@ declare class Point
 >Point : Symbol(Point, Decl(castTest.ts, 11, 37))
 {
     x: number;
->x : Symbol(x, Decl(castTest.ts, 14, 1))
+>x : Symbol(Point.x, Decl(castTest.ts, 14, 1))
 
     y: number;
->y : Symbol(y, Decl(castTest.ts, 15, 14))
+>y : Symbol(Point.y, Decl(castTest.ts, 15, 14))
 
     add(dx: number, dy: number): Point;
->add : Symbol(add, Decl(castTest.ts, 16, 14))
+>add : Symbol(Point.add, Decl(castTest.ts, 16, 14))
 >dx : Symbol(dx, Decl(castTest.ts, 17, 8))
 >dy : Symbol(dy, Decl(castTest.ts, 17, 19))
 >Point : Symbol(Point, Decl(castTest.ts, 11, 37))
 
     mult(p: Point): Point;
->mult : Symbol(mult, Decl(castTest.ts, 17, 39))
+>mult : Symbol(Point.mult, Decl(castTest.ts, 17, 39))
 >p : Symbol(p, Decl(castTest.ts, 18, 9))
 >Point : Symbol(Point, Decl(castTest.ts, 11, 37))
 >Point : Symbol(Point, Decl(castTest.ts, 11, 37))
diff --git a/tests/baselines/reference/castingTuple.errors.txt b/tests/baselines/reference/castingTuple.errors.txt
index 62a36c9c156..6d5549c6bf2 100644
--- a/tests/baselines/reference/castingTuple.errors.txt
+++ b/tests/baselines/reference/castingTuple.errors.txt
@@ -1,24 +1,15 @@
-tests/cases/conformance/types/tuple/castingTuple.ts(13,23): error TS2352: Neither type '[number, string]' nor type '[number, string, boolean]' is assignable to the other.
-  Property '2' is missing in type '[number, string]'.
-tests/cases/conformance/types/tuple/castingTuple.ts(16,21): error TS2352: Neither type '[C, D]' nor type '[C, D, A]' is assignable to the other.
-  Property '2' is missing in type '[C, D]'.
-tests/cases/conformance/types/tuple/castingTuple.ts(28,10): error TS2352: Neither type '[number, string]' nor type '[number, number]' is assignable to the other.
+tests/cases/conformance/types/tuple/castingTuple.ts(28,10): error TS2352: Type '[number, string]' cannot be converted to type '[number, number]'.
   Types of property '1' are incompatible.
-    Type 'string' is not assignable to type 'number'.
-tests/cases/conformance/types/tuple/castingTuple.ts(29,10): error TS2352: Neither type '[C, D]' nor type '[A, I]' is assignable to the other.
+    Type 'string' is not comparable to type 'number'.
+tests/cases/conformance/types/tuple/castingTuple.ts(29,10): error TS2352: Type '[C, D]' cannot be converted to type '[A, I]'.
   Types of property '0' are incompatible.
-    Type 'C' is not assignable to type 'A'.
+    Type 'C' is not comparable to type 'A'.
       Property 'a' is missing in type 'C'.
 tests/cases/conformance/types/tuple/castingTuple.ts(30,5): error TS2403: Subsequent variable declarations must have the same type.  Variable 'array1' must be of type '{}[]', but here has type 'number[]'.
-tests/cases/conformance/types/tuple/castingTuple.ts(30,14): error TS2352: Neither type '[number, string]' nor type 'number[]' is assignable to the other.
-  Types of property 'pop' are incompatible.
-    Type '() => number | string' is not assignable to type '() => number'.
-      Type 'number | string' is not assignable to type 'number'.
-        Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/tuple/castingTuple.ts(31,1): error TS2304: Cannot find name 't4'.
 
 
-==== tests/cases/conformance/types/tuple/castingTuple.ts (7 errors) ====
+==== tests/cases/conformance/types/tuple/castingTuple.ts (4 errors) ====
     interface I { }
     class A { a = 10; }
     class C implements I { c };
@@ -32,15 +23,9 @@ tests/cases/conformance/types/tuple/castingTuple.ts(31,1): error TS2304: Cannot
     var numStrTuple: [number, string] = [5, "foo"];
     var emptyObjTuple = <[{}, {}]>numStrTuple;
     var numStrBoolTuple = <[number, string, boolean]>numStrTuple;
-                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Neither type '[number, string]' nor type '[number, string, boolean]' is assignable to the other.
-!!! error TS2352:   Property '2' is missing in type '[number, string]'.
     var classCDTuple: [C, D] = [new C(), new D()];
     var interfaceIITuple = <[I, I]>classCDTuple;
     var classCDATuple = <[C, D, A]>classCDTuple;
-                        ~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Neither type '[C, D]' nor type '[C, D, A]' is assignable to the other.
-!!! error TS2352:   Property '2' is missing in type '[C, D]'.
     var eleFromCDA1 = classCDATuple[2]; // A
     var eleFromCDA2 = classCDATuple[5]; // C | D | A
     var t10: [E1, E2] = [E1.one, E2.one];
@@ -54,24 +39,18 @@ tests/cases/conformance/types/tuple/castingTuple.ts(31,1): error TS2304: Cannot
     // error
     var t3 = <[number, number]>numStrTuple;
              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Neither type '[number, string]' nor type '[number, number]' is assignable to the other.
+!!! error TS2352: Type '[number, string]' cannot be converted to type '[number, number]'.
 !!! error TS2352:   Types of property '1' are incompatible.
-!!! error TS2352:     Type 'string' is not assignable to type 'number'.
+!!! error TS2352:     Type 'string' is not comparable to type 'number'.
     var t9 = <[A, I]>classCDTuple;
              ~~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Neither type '[C, D]' nor type '[A, I]' is assignable to the other.
+!!! error TS2352: Type '[C, D]' cannot be converted to type '[A, I]'.
 !!! error TS2352:   Types of property '0' are incompatible.
-!!! error TS2352:     Type 'C' is not assignable to type 'A'.
+!!! error TS2352:     Type 'C' is not comparable to type 'A'.
 !!! error TS2352:       Property 'a' is missing in type 'C'.
     var array1 = <number[]>numStrTuple;
         ~~~~~~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'array1' must be of type '{}[]', but here has type 'number[]'.
-                 ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Neither type '[number, string]' nor type 'number[]' is assignable to the other.
-!!! error TS2352:   Types of property 'pop' are incompatible.
-!!! error TS2352:     Type '() => number | string' is not assignable to type '() => number'.
-!!! error TS2352:       Type 'number | string' is not assignable to type 'number'.
-!!! error TS2352:         Type 'string' is not assignable to type 'number'.
     t4[2] = 10;
     ~~
 !!! error TS2304: Cannot find name 't4'.
diff --git a/tests/baselines/reference/chainedAssignment2.symbols b/tests/baselines/reference/chainedAssignment2.symbols
index 3335c3cbb43..0f37d41c3be 100644
--- a/tests/baselines/reference/chainedAssignment2.symbols
+++ b/tests/baselines/reference/chainedAssignment2.symbols
@@ -10,7 +10,7 @@ var c: boolean;
 
 var d: Date;
 >d : Symbol(d, Decl(chainedAssignment2.ts, 3, 3))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var e: RegExp;
 >e : Symbol(e, Decl(chainedAssignment2.ts, 4, 3))
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/chainedSpecializationToObjectTypeLiteral.symbols b/tests/baselines/reference/chainedSpecializationToObjectTypeLiteral.symbols
index 8232c44a620..f8fbae6b8b3 100644
--- a/tests/baselines/reference/chainedSpecializationToObjectTypeLiteral.symbols
+++ b/tests/baselines/reference/chainedSpecializationToObjectTypeLiteral.symbols
@@ -4,13 +4,13 @@ interface Sequence<T> {
 >T : Symbol(T, Decl(chainedSpecializationToObjectTypeLiteral.ts, 0, 19))
 
     each(iterator: (value: T) => void): void;
->each : Symbol(each, Decl(chainedSpecializationToObjectTypeLiteral.ts, 0, 23))
+>each : Symbol(Sequence.each, Decl(chainedSpecializationToObjectTypeLiteral.ts, 0, 23))
 >iterator : Symbol(iterator, Decl(chainedSpecializationToObjectTypeLiteral.ts, 1, 9))
 >value : Symbol(value, Decl(chainedSpecializationToObjectTypeLiteral.ts, 1, 20))
 >T : Symbol(T, Decl(chainedSpecializationToObjectTypeLiteral.ts, 0, 19))
 
     map<U>(iterator: (value: T) => U): Sequence<U>;
->map : Symbol(map, Decl(chainedSpecializationToObjectTypeLiteral.ts, 1, 45))
+>map : Symbol(Sequence.map, Decl(chainedSpecializationToObjectTypeLiteral.ts, 1, 45))
 >U : Symbol(U, Decl(chainedSpecializationToObjectTypeLiteral.ts, 2, 8))
 >iterator : Symbol(iterator, Decl(chainedSpecializationToObjectTypeLiteral.ts, 2, 11))
 >value : Symbol(value, Decl(chainedSpecializationToObjectTypeLiteral.ts, 2, 22))
@@ -20,7 +20,7 @@ interface Sequence<T> {
 >U : Symbol(U, Decl(chainedSpecializationToObjectTypeLiteral.ts, 2, 8))
 
     filter(iterator: (value: T) => boolean): Sequence<T>;
->filter : Symbol(filter, Decl(chainedSpecializationToObjectTypeLiteral.ts, 2, 51))
+>filter : Symbol(Sequence.filter, Decl(chainedSpecializationToObjectTypeLiteral.ts, 2, 51))
 >iterator : Symbol(iterator, Decl(chainedSpecializationToObjectTypeLiteral.ts, 3, 11))
 >value : Symbol(value, Decl(chainedSpecializationToObjectTypeLiteral.ts, 3, 22))
 >T : Symbol(T, Decl(chainedSpecializationToObjectTypeLiteral.ts, 0, 19))
@@ -28,7 +28,7 @@ interface Sequence<T> {
 >T : Symbol(T, Decl(chainedSpecializationToObjectTypeLiteral.ts, 0, 19))
 
     groupBy<K>(keySelector: (value: T) => K): Sequence<{ key: K; items: T[]; }>;
->groupBy : Symbol(groupBy, Decl(chainedSpecializationToObjectTypeLiteral.ts, 3, 57))
+>groupBy : Symbol(Sequence.groupBy, Decl(chainedSpecializationToObjectTypeLiteral.ts, 3, 57))
 >K : Symbol(K, Decl(chainedSpecializationToObjectTypeLiteral.ts, 4, 12))
 >keySelector : Symbol(keySelector, Decl(chainedSpecializationToObjectTypeLiteral.ts, 4, 15))
 >value : Symbol(value, Decl(chainedSpecializationToObjectTypeLiteral.ts, 4, 29))
diff --git a/tests/baselines/reference/checkInfiniteExpansionTermination.symbols b/tests/baselines/reference/checkInfiniteExpansionTermination.symbols
index 52ba8ad698e..e6d75d40cee 100644
--- a/tests/baselines/reference/checkInfiniteExpansionTermination.symbols
+++ b/tests/baselines/reference/checkInfiniteExpansionTermination.symbols
@@ -7,7 +7,7 @@ interface IObservable<T> {
 >T : Symbol(T, Decl(checkInfiniteExpansionTermination.ts, 3, 22))
 
     n: IObservable<T[]>; // Needed, must be T[]
->n : Symbol(n, Decl(checkInfiniteExpansionTermination.ts, 3, 26))
+>n : Symbol(IObservable.n, Decl(checkInfiniteExpansionTermination.ts, 3, 26))
 >IObservable : Symbol(IObservable, Decl(checkInfiniteExpansionTermination.ts, 0, 0))
 >T : Symbol(T, Decl(checkInfiniteExpansionTermination.ts, 3, 22))
 }
@@ -21,11 +21,11 @@ interface ISubject<T> extends IObservable<T> { }
 
 interface Foo { x }
 >Foo : Symbol(Foo, Decl(checkInfiniteExpansionTermination.ts, 8, 48))
->x : Symbol(x, Decl(checkInfiniteExpansionTermination.ts, 10, 15))
+>x : Symbol(Foo.x, Decl(checkInfiniteExpansionTermination.ts, 10, 15))
 
 interface Bar { y }
 >Bar : Symbol(Bar, Decl(checkInfiniteExpansionTermination.ts, 10, 19))
->y : Symbol(y, Decl(checkInfiniteExpansionTermination.ts, 11, 15))
+>y : Symbol(Bar.y, Decl(checkInfiniteExpansionTermination.ts, 11, 15))
 
 var values: IObservable<Foo>;
 >values : Symbol(values, Decl(checkInfiniteExpansionTermination.ts, 13, 3))
diff --git a/tests/baselines/reference/checkInfiniteExpansionTermination2.symbols b/tests/baselines/reference/checkInfiniteExpansionTermination2.symbols
index c4fe17a09a6..b7be2445e0d 100644
--- a/tests/baselines/reference/checkInfiniteExpansionTermination2.symbols
+++ b/tests/baselines/reference/checkInfiniteExpansionTermination2.symbols
@@ -7,7 +7,7 @@ interface IObservable<T> {
 >T : Symbol(T, Decl(checkInfiniteExpansionTermination2.ts, 3, 22))
 
     n: IObservable<T[]>;
->n : Symbol(n, Decl(checkInfiniteExpansionTermination2.ts, 3, 26))
+>n : Symbol(IObservable.n, Decl(checkInfiniteExpansionTermination2.ts, 3, 26))
 >IObservable : Symbol(IObservable, Decl(checkInfiniteExpansionTermination2.ts, 0, 0))
 >T : Symbol(T, Decl(checkInfiniteExpansionTermination2.ts, 3, 22))
 }
diff --git a/tests/baselines/reference/checkInterfaceBases.symbols b/tests/baselines/reference/checkInterfaceBases.symbols
index 6b5f987b0bc..57a820dcfaf 100644
--- a/tests/baselines/reference/checkInterfaceBases.symbols
+++ b/tests/baselines/reference/checkInterfaceBases.symbols
@@ -4,7 +4,7 @@ interface SecondEvent {
 >SecondEvent : Symbol(SecondEvent, Decl(app.ts, 0, 0))
 
     data: any;
->data : Symbol(data, Decl(app.ts, 1, 23))
+>data : Symbol(SecondEvent.data, Decl(app.ts, 1, 23))
 }
 interface Third extends JQueryEventObjectTest, SecondEvent {}
 >Third : Symbol(Third, Decl(app.ts, 3, 1))
@@ -16,12 +16,12 @@ interface JQueryEventObjectTest {
 >JQueryEventObjectTest : Symbol(JQueryEventObjectTest, Decl(jquery.d.ts, 0, 0))
 
     data: any;
->data : Symbol(data, Decl(jquery.d.ts, 0, 33))
+>data : Symbol(JQueryEventObjectTest.data, Decl(jquery.d.ts, 0, 33))
 
     which: number;
->which : Symbol(which, Decl(jquery.d.ts, 1, 14))
+>which : Symbol(JQueryEventObjectTest.which, Decl(jquery.d.ts, 1, 14))
 
     metaKey: any;
->metaKey : Symbol(metaKey, Decl(jquery.d.ts, 2, 18))
+>metaKey : Symbol(JQueryEventObjectTest.metaKey, Decl(jquery.d.ts, 2, 18))
 }
 
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.symbols b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.symbols
index 008d1156b56..8ac242b0e48 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.symbols
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.symbols
@@ -7,7 +7,7 @@ class Derived extends Based {
 >Based : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing1.ts, 0, 0))
 
     public x: number;
->x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing1.ts, 1, 29))
+>x : Symbol(Derived.x, Decl(checkSuperCallBeforeThisAccessing1.ts, 1, 29))
 
     constructor() {
         super();
@@ -17,9 +17,9 @@ class Derived extends Based {
 >this : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing1.ts, 0, 15))
 
         this.x = 10;
->this.x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing1.ts, 1, 29))
+>this.x : Symbol(Derived.x, Decl(checkSuperCallBeforeThisAccessing1.ts, 1, 29))
 >this : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing1.ts, 0, 15))
->x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing1.ts, 1, 29))
+>x : Symbol(Derived.x, Decl(checkSuperCallBeforeThisAccessing1.ts, 1, 29))
 
         var that = this;
 >that : Symbol(that, Decl(checkSuperCallBeforeThisAccessing1.ts, 7, 11))
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.symbols b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.symbols
index 8dd68fc3b74..44bbd5949bb 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.symbols
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.symbols
@@ -7,29 +7,29 @@ class Derived extends Based {
 >Based : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing3.ts, 0, 0))
 
     public x: number;
->x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing3.ts, 1, 29))
+>x : Symbol(Derived.x, Decl(checkSuperCallBeforeThisAccessing3.ts, 1, 29))
 
     constructor() {
         class innver {
 >innver : Symbol(innver, Decl(checkSuperCallBeforeThisAccessing3.ts, 3, 19))
 
             public y: boolean;
->y : Symbol(y, Decl(checkSuperCallBeforeThisAccessing3.ts, 4, 22))
+>y : Symbol(innver.y, Decl(checkSuperCallBeforeThisAccessing3.ts, 4, 22))
 
             constructor() {
                 this.y = true;
->this.y : Symbol(y, Decl(checkSuperCallBeforeThisAccessing3.ts, 4, 22))
+>this.y : Symbol(innver.y, Decl(checkSuperCallBeforeThisAccessing3.ts, 4, 22))
 >this : Symbol(innver, Decl(checkSuperCallBeforeThisAccessing3.ts, 3, 19))
->y : Symbol(y, Decl(checkSuperCallBeforeThisAccessing3.ts, 4, 22))
+>y : Symbol(innver.y, Decl(checkSuperCallBeforeThisAccessing3.ts, 4, 22))
             }
         }
         super();
 >super : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing3.ts, 0, 0))
 
         this.x = 10;
->this.x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing3.ts, 1, 29))
+>this.x : Symbol(Derived.x, Decl(checkSuperCallBeforeThisAccessing3.ts, 1, 29))
 >this : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing3.ts, 0, 15))
->x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing3.ts, 1, 29))
+>x : Symbol(Derived.x, Decl(checkSuperCallBeforeThisAccessing3.ts, 1, 29))
 
         var that = this;
 >that : Symbol(that, Decl(checkSuperCallBeforeThisAccessing3.ts, 12, 11))
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.symbols b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.symbols
index 7101280358d..4ea467558df 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.symbols
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.symbols
@@ -7,7 +7,7 @@ class Derived extends Based {
 >Based : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing4.ts, 0, 0))
 
     public x: number;
->x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing4.ts, 1, 29))
+>x : Symbol(Derived.x, Decl(checkSuperCallBeforeThisAccessing4.ts, 1, 29))
 
     constructor() {
         (() => {
@@ -32,9 +32,9 @@ class Derived extends Based {
 >super : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing4.ts, 0, 0))
 
         this.x = 10;
->this.x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing4.ts, 1, 29))
+>this.x : Symbol(Derived.x, Decl(checkSuperCallBeforeThisAccessing4.ts, 1, 29))
 >this : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing4.ts, 0, 15))
->x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing4.ts, 1, 29))
+>x : Symbol(Derived.x, Decl(checkSuperCallBeforeThisAccessing4.ts, 1, 29))
 
         var that = this;
 >that : Symbol(that, Decl(checkSuperCallBeforeThisAccessing4.ts, 16, 11))
diff --git a/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.symbols b/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.symbols
index 6bc994f2a44..2a6ba238b4b 100644
--- a/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.symbols
+++ b/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.symbols
@@ -7,7 +7,7 @@ class A {
 >A : Symbol(A, Decl(checkSwitchStatementIfCaseTypeIsString.ts, 0, 35))
 
     doIt(x: Array<string>): void {
->doIt : Symbol(doIt, Decl(checkSwitchStatementIfCaseTypeIsString.ts, 2, 9))
+>doIt : Symbol(A.doIt, Decl(checkSwitchStatementIfCaseTypeIsString.ts, 2, 9))
 >x : Symbol(x, Decl(checkSwitchStatementIfCaseTypeIsString.ts, 3, 9))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
diff --git a/tests/baselines/reference/circularImportAlias.symbols b/tests/baselines/reference/circularImportAlias.symbols
index 6eaa4a7467e..518766ceb5d 100644
--- a/tests/baselines/reference/circularImportAlias.symbols
+++ b/tests/baselines/reference/circularImportAlias.symbols
@@ -15,7 +15,7 @@ module B {
 >C : Symbol(a.C, Decl(circularImportAlias.ts, 9, 10))
 
         id: number;
->id : Symbol(id, Decl(circularImportAlias.ts, 4, 32))
+>id : Symbol(D.id, Decl(circularImportAlias.ts, 4, 32))
     }
 }
 
@@ -24,7 +24,7 @@ module A {
 
     export class C { name: string }
 >C : Symbol(C, Decl(circularImportAlias.ts, 9, 10))
->name : Symbol(name, Decl(circularImportAlias.ts, 10, 20))
+>name : Symbol(C.name, Decl(circularImportAlias.ts, 10, 20))
 
     export import b = B;
 >b : Symbol(b, Decl(circularImportAlias.ts, 10, 35))
diff --git a/tests/baselines/reference/circularReference.errors.txt b/tests/baselines/reference/circularReference.errors.txt
index 9954944ff1f..8f99c93be1e 100644
--- a/tests/baselines/reference/circularReference.errors.txt
+++ b/tests/baselines/reference/circularReference.errors.txt
@@ -1,4 +1,3 @@
-tests/cases/conformance/externalModules/foo1.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/conformance/externalModules/foo1.ts(9,12): error TS2339: Property 'x' does not exist on type 'C1'.
 tests/cases/conformance/externalModules/foo2.ts(8,12): error TS2339: Property 'y' does not exist on type 'C1'.
 tests/cases/conformance/externalModules/foo2.ts(13,8): error TS2339: Property 'x' does not exist on type 'C1'.
@@ -26,10 +25,8 @@ tests/cases/conformance/externalModules/foo2.ts(13,8): error TS2339: Property 'x
     	}
     }
     
-==== tests/cases/conformance/externalModules/foo1.ts (2 errors) ====
+==== tests/cases/conformance/externalModules/foo1.ts (1 errors) ====
     import foo2 = require('./foo2');
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
     export module M1 {
     	export class C1 {
     		m1: foo2.M1.C1;
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/circularTypeAliasForUnionWithClass.symbols b/tests/baselines/reference/circularTypeAliasForUnionWithClass.symbols
index ecfba63332d..d18711d03da 100644
--- a/tests/baselines/reference/circularTypeAliasForUnionWithClass.symbols
+++ b/tests/baselines/reference/circularTypeAliasForUnionWithClass.symbols
@@ -11,7 +11,7 @@ class I0 {
 >I0 : Symbol(I0, Decl(circularTypeAliasForUnionWithClass.ts, 1, 22))
 
     x: T0;
->x : Symbol(x, Decl(circularTypeAliasForUnionWithClass.ts, 2, 10))
+>x : Symbol(I0.x, Decl(circularTypeAliasForUnionWithClass.ts, 2, 10))
 >T0 : Symbol(T0, Decl(circularTypeAliasForUnionWithClass.ts, 0, 11))
 }
 
diff --git a/tests/baselines/reference/circularTypeAliasForUnionWithInterface.symbols b/tests/baselines/reference/circularTypeAliasForUnionWithInterface.symbols
index 29bc3098d91..ad33c036bf8 100644
--- a/tests/baselines/reference/circularTypeAliasForUnionWithInterface.symbols
+++ b/tests/baselines/reference/circularTypeAliasForUnionWithInterface.symbols
@@ -11,7 +11,7 @@ interface I0 {
 >I0 : Symbol(I0, Decl(circularTypeAliasForUnionWithInterface.ts, 1, 22))
 
     x: T0;
->x : Symbol(x, Decl(circularTypeAliasForUnionWithInterface.ts, 2, 14))
+>x : Symbol(I0.x, Decl(circularTypeAliasForUnionWithInterface.ts, 2, 14))
 >T0 : Symbol(T0, Decl(circularTypeAliasForUnionWithInterface.ts, 0, 11))
 }
 
diff --git a/tests/baselines/reference/classAbstractAsIdentifier.symbols b/tests/baselines/reference/classAbstractAsIdentifier.symbols
index f2ce2ebcab5..5b96a74bb12 100644
--- a/tests/baselines/reference/classAbstractAsIdentifier.symbols
+++ b/tests/baselines/reference/classAbstractAsIdentifier.symbols
@@ -3,7 +3,7 @@ class abstract {
 >abstract : Symbol(abstract, Decl(classAbstractAsIdentifier.ts, 0, 0))
 
     foo() { return 1; }
->foo : Symbol(foo, Decl(classAbstractAsIdentifier.ts, 0, 16))
+>foo : Symbol(abstract.foo, Decl(classAbstractAsIdentifier.ts, 0, 16))
 }
 
 new abstract;
diff --git a/tests/baselines/reference/classAbstractConstructor.errors.txt b/tests/baselines/reference/classAbstractConstructor.errors.txt
index fee9f4cefee..c57d52a018f 100644
--- a/tests/baselines/reference/classAbstractConstructor.errors.txt
+++ b/tests/baselines/reference/classAbstractConstructor.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractConstructor.ts(2,5): error TS1242: 'abstract' modifier can only appear on a class or method declaration.
+tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractConstructor.ts(2,5): error TS1242: 'abstract' modifier can only appear on a class, method, or property declaration.
 
 
 ==== tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractConstructor.ts (1 errors) ====
     abstract class A {
         abstract constructor() {}
         ~~~~~~~~
-!!! error TS1242: 'abstract' modifier can only appear on a class or method declaration.
+!!! error TS1242: 'abstract' modifier can only appear on a class, method, or property declaration.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/classAbstractDeclarations.d.errors.txt b/tests/baselines/reference/classAbstractDeclarations.d.errors.txt
index a1c0e55152c..d71f53118af 100644
--- a/tests/baselines/reference/classAbstractDeclarations.d.errors.txt
+++ b/tests/baselines/reference/classAbstractDeclarations.d.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractDeclarations.d.ts(2,5): error TS1242: 'abstract' modifier can only appear on a class or method declaration.
+tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractDeclarations.d.ts(2,5): error TS1242: 'abstract' modifier can only appear on a class, method, or property declaration.
 tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractDeclarations.d.ts(2,28): error TS1183: An implementation cannot be declared in ambient contexts.
 tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractDeclarations.d.ts(11,15): error TS2515: Non-abstract class 'CC' does not implement inherited abstract member 'foo' from class 'AA'.
 tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractDeclarations.d.ts(13,15): error TS2515: Non-abstract class 'DD' does not implement inherited abstract member 'foo' from class 'BB'.
@@ -9,7 +9,7 @@ tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbst
     declare abstract class A {
         abstract constructor() {}
         ~~~~~~~~
-!!! error TS1242: 'abstract' modifier can only appear on a class or method declaration.
+!!! error TS1242: 'abstract' modifier can only appear on a class, method, or property declaration.
                                ~
 !!! error TS1183: An implementation cannot be declared in ambient contexts.
     }
diff --git a/tests/baselines/reference/classAbstractInstantiations2.errors.txt b/tests/baselines/reference/classAbstractInstantiations2.errors.txt
index 077f87c5050..bf4cd851fb3 100644
--- a/tests/baselines/reference/classAbstractInstantiations2.errors.txt
+++ b/tests/baselines/reference/classAbstractInstantiations2.errors.txt
@@ -5,7 +5,7 @@ tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbst
 tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInstantiations2.ts(21,1): error TS2511: Cannot create an instance of the abstract class 'B'.
 tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInstantiations2.ts(26,7): error TS2515: Non-abstract class 'C' does not implement inherited abstract member 'bar' from class 'B'.
 tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInstantiations2.ts(46,5): error TS2391: Function implementation is missing or not immediately following the declaration.
-tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInstantiations2.ts(46,5): error TS2512: Overload signatures must all be abstract or not abstract.
+tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInstantiations2.ts(46,5): error TS2512: Overload signatures must all be abstract or non-abstract.
 tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInstantiations2.ts(50,5): error TS1244: Abstract methods can only appear within an abstract class.
 
 
@@ -70,7 +70,7 @@ tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbst
         ~~~
 !!! error TS2391: Function implementation is missing or not immediately following the declaration.
         ~~~
-!!! error TS2512: Overload signatures must all be abstract or not abstract.
+!!! error TS2512: Overload signatures must all be abstract or non-abstract.
     }
     
     class H { // error -- not declared abstract
diff --git a/tests/baselines/reference/classAbstractManyKeywords.errors.txt b/tests/baselines/reference/classAbstractManyKeywords.errors.txt
index eec5ac4bc0d..8f9e3fed18e 100644
--- a/tests/baselines/reference/classAbstractManyKeywords.errors.txt
+++ b/tests/baselines/reference/classAbstractManyKeywords.errors.txt
@@ -1,13 +1,10 @@
-tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractManyKeywords.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractManyKeywords.ts(1,25): error TS1005: ';' expected.
 tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractManyKeywords.ts(3,1): error TS1128: Declaration or statement expected.
 tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractManyKeywords.ts(4,17): error TS1005: '=' expected.
 
 
-==== tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractManyKeywords.ts (4 errors) ====
+==== tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractManyKeywords.ts (3 errors) ====
     export default abstract class A {}
-    ~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
                             ~~~~~
 !!! error TS1005: ';' expected.
     export abstract class B {}
diff --git a/tests/baselines/reference/classAbstractOverloads.errors.txt b/tests/baselines/reference/classAbstractOverloads.errors.txt
index 0a1c96bd30a..155a8451a5d 100644
--- a/tests/baselines/reference/classAbstractOverloads.errors.txt
+++ b/tests/baselines/reference/classAbstractOverloads.errors.txt
@@ -1,6 +1,6 @@
-tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractOverloads.ts(7,5): error TS2512: Overload signatures must all be abstract or not abstract.
-tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractOverloads.ts(10,14): error TS2512: Overload signatures must all be abstract or not abstract.
-tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractOverloads.ts(12,14): error TS2512: Overload signatures must all be abstract or not abstract.
+tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractOverloads.ts(7,5): error TS2512: Overload signatures must all be abstract or non-abstract.
+tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractOverloads.ts(10,14): error TS2512: Overload signatures must all be abstract or non-abstract.
+tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractOverloads.ts(12,14): error TS2512: Overload signatures must all be abstract or non-abstract.
 tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractOverloads.ts(15,5): error TS2391: Function implementation is missing or not immediately following the declaration.
 tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractOverloads.ts(20,14): error TS2516: All declarations of an abstract method must be consecutive.
 
@@ -14,16 +14,16 @@ tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbst
         abstract bar();
         bar();
         ~~~
-!!! error TS2512: Overload signatures must all be abstract or not abstract.
+!!! error TS2512: Overload signatures must all be abstract or non-abstract.
         abstract bar();
         
         abstract baz();
                  ~~~
-!!! error TS2512: Overload signatures must all be abstract or not abstract.
+!!! error TS2512: Overload signatures must all be abstract or non-abstract.
         baz();
         abstract baz();
                  ~~~
-!!! error TS2512: Overload signatures must all be abstract or not abstract.
+!!! error TS2512: Overload signatures must all be abstract or non-abstract.
         baz() {}
         
         qux();
diff --git a/tests/baselines/reference/classAbstractProperties.errors.txt b/tests/baselines/reference/classAbstractProperties.errors.txt
index 223a3049825..88c0b587484 100644
--- a/tests/baselines/reference/classAbstractProperties.errors.txt
+++ b/tests/baselines/reference/classAbstractProperties.errors.txt
@@ -1,29 +1,17 @@
-tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractProperties.ts(2,5): error TS1242: 'abstract' modifier can only appear on a class or method declaration.
-tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractProperties.ts(3,12): error TS1242: 'abstract' modifier can only appear on a class or method declaration.
-tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractProperties.ts(4,15): error TS1242: 'abstract' modifier can only appear on a class or method declaration.
-tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractProperties.ts(5,13): error TS1242: 'abstract' modifier can only appear on a class or method declaration.
-tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractProperties.ts(7,5): error TS1242: 'abstract' modifier can only appear on a class or method declaration.
+tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractProperties.ts(5,13): error TS1243: 'private' modifier cannot be used with 'abstract' modifier.
 tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractProperties.ts(12,13): error TS1243: 'private' modifier cannot be used with 'abstract' modifier.
 
 
-==== tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractProperties.ts (6 errors) ====
+==== tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractProperties.ts (2 errors) ====
     abstract class A {
         abstract x : number;
-        ~~~~~~~~
-!!! error TS1242: 'abstract' modifier can only appear on a class or method declaration.
         public abstract y : number;
-               ~~~~~~~~
-!!! error TS1242: 'abstract' modifier can only appear on a class or method declaration.
         protected abstract z : number;
-                  ~~~~~~~~
-!!! error TS1242: 'abstract' modifier can only appear on a class or method declaration.
         private abstract w : number;
                 ~~~~~~~~
-!!! error TS1242: 'abstract' modifier can only appear on a class or method declaration.
+!!! error TS1243: 'private' modifier cannot be used with 'abstract' modifier.
         
         abstract m: () => void; 
-        ~~~~~~~~
-!!! error TS1242: 'abstract' modifier can only appear on a class or method declaration.
         
         abstract foo_x() : number;
         public abstract foo_y() : number;
diff --git a/tests/baselines/reference/classAbstractWithInterface.errors.txt b/tests/baselines/reference/classAbstractWithInterface.errors.txt
index fa0a3d08957..0fe3b3ba342 100644
--- a/tests/baselines/reference/classAbstractWithInterface.errors.txt
+++ b/tests/baselines/reference/classAbstractWithInterface.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractWithInterface.ts(1,1): error TS1242: 'abstract' modifier can only appear on a class or method declaration.
+tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractWithInterface.ts(1,1): error TS1242: 'abstract' modifier can only appear on a class, method, or property declaration.
 
 
 ==== tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractWithInterface.ts (1 errors) ====
     abstract interface I {}
     ~~~~~~~~
-!!! error TS1242: 'abstract' modifier can only appear on a class or method declaration.
\ No newline at end of file
+!!! error TS1242: 'abstract' modifier can only appear on a class, method, or property declaration.
\ No newline at end of file
diff --git a/tests/baselines/reference/classAppearsToHaveMembersOfObject.symbols b/tests/baselines/reference/classAppearsToHaveMembersOfObject.symbols
index 28c31e639a7..6041f2ddf04 100644
--- a/tests/baselines/reference/classAppearsToHaveMembersOfObject.symbols
+++ b/tests/baselines/reference/classAppearsToHaveMembersOfObject.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classAppearsToHaveMembersOfObject.ts ===
 class C { foo: string; }
 >C : Symbol(C, Decl(classAppearsToHaveMembersOfObject.ts, 0, 0))
->foo : Symbol(foo, Decl(classAppearsToHaveMembersOfObject.ts, 0, 9))
+>foo : Symbol(C.foo, Decl(classAppearsToHaveMembersOfObject.ts, 0, 9))
 
 var c: C;
 >c : Symbol(c, Decl(classAppearsToHaveMembersOfObject.ts, 2, 3))
diff --git a/tests/baselines/reference/classConstructorAccessibility.errors.txt b/tests/baselines/reference/classConstructorAccessibility.errors.txt
index c22f3593bc5..c79633ba33d 100644
--- a/tests/baselines/reference/classConstructorAccessibility.errors.txt
+++ b/tests/baselines/reference/classConstructorAccessibility.errors.txt
@@ -1,29 +1,30 @@
-tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility.ts(6,5): error TS1089: 'private' modifier cannot appear on a constructor declaration.
-tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility.ts(10,5): error TS1089: 'protected' modifier cannot appear on a constructor declaration.
-tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility.ts(23,9): error TS1089: 'private' modifier cannot appear on a constructor declaration.
-tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility.ts(27,9): error TS1089: 'protected' modifier cannot appear on a constructor declaration.
+tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility.ts(15,9): error TS2673: Constructor of class 'D' is private and only accessible within the class declaration.
+tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility.ts(16,9): error TS2674: Constructor of class 'E' is protected and only accessible within the class declaration.
+tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility.ts(32,13): error TS2673: Constructor of class 'D<T>' is private and only accessible within the class declaration.
+tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility.ts(33,13): error TS2674: Constructor of class 'E<T>' is protected and only accessible within the class declaration.
 
 
 ==== tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility.ts (4 errors) ====
+    
     class C {
         public constructor(public x: number) { }
     }
     
     class D {
-        private constructor(public x: number) { } // error
-        ~~~~~~~
-!!! error TS1089: 'private' modifier cannot appear on a constructor declaration.
+        private constructor(public x: number) { }
     }
     
     class E {
-        protected constructor(public x: number) { } // error
-        ~~~~~~~~~
-!!! error TS1089: 'protected' modifier cannot appear on a constructor declaration.
+        protected constructor(public x: number) { }
     }
     
     var c = new C(1);
-    var d = new D(1);
-    var e = new E(1);
+    var d = new D(1); // error
+            ~~~~~~~~
+!!! error TS2673: Constructor of class 'D' is private and only accessible within the class declaration.
+    var e = new E(1); // error
+            ~~~~~~~~
+!!! error TS2674: Constructor of class 'E' is protected and only accessible within the class declaration.
     
     module Generic {
         class C<T> {
@@ -31,19 +32,19 @@ tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessib
         }
     
         class D<T> {
-            private constructor(public x: T) { } // error
-            ~~~~~~~
-!!! error TS1089: 'private' modifier cannot appear on a constructor declaration.
+            private constructor(public x: T) { }
         }
     
         class E<T> {
-            protected constructor(public x: T) { } // error
-            ~~~~~~~~~
-!!! error TS1089: 'protected' modifier cannot appear on a constructor declaration.
+            protected constructor(public x: T) { }
         }
     
         var c = new C(1);
-        var d = new D(1);
-        var e = new E(1);
+        var d = new D(1); // error
+                ~~~~~~~~
+!!! error TS2673: Constructor of class 'D<T>' is private and only accessible within the class declaration.
+        var e = new E(1); // error
+                ~~~~~~~~
+!!! error TS2674: Constructor of class 'E<T>' is protected and only accessible within the class declaration.
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/classConstructorAccessibility.js b/tests/baselines/reference/classConstructorAccessibility.js
index fed96385845..efc3f3c273c 100644
--- a/tests/baselines/reference/classConstructorAccessibility.js
+++ b/tests/baselines/reference/classConstructorAccessibility.js
@@ -1,19 +1,20 @@
 //// [classConstructorAccessibility.ts]
+
 class C {
     public constructor(public x: number) { }
 }
 
 class D {
-    private constructor(public x: number) { } // error
+    private constructor(public x: number) { }
 }
 
 class E {
-    protected constructor(public x: number) { } // error
+    protected constructor(public x: number) { }
 }
 
 var c = new C(1);
-var d = new D(1);
-var e = new E(1);
+var d = new D(1); // error
+var e = new E(1); // error
 
 module Generic {
     class C<T> {
@@ -21,16 +22,16 @@ module Generic {
     }
 
     class D<T> {
-        private constructor(public x: T) { } // error
+        private constructor(public x: T) { }
     }
 
     class E<T> {
-        protected constructor(public x: T) { } // error
+        protected constructor(public x: T) { }
     }
 
     var c = new C(1);
-    var d = new D(1);
-    var e = new E(1);
+    var d = new D(1); // error
+    var e = new E(1); // error
 }
 
 
@@ -44,18 +45,18 @@ var C = (function () {
 var D = (function () {
     function D(x) {
         this.x = x;
-    } // error
+    }
     return D;
 }());
 var E = (function () {
     function E(x) {
         this.x = x;
-    } // error
+    }
     return E;
 }());
 var c = new C(1);
-var d = new D(1);
-var e = new E(1);
+var d = new D(1); // error
+var e = new E(1); // error
 var Generic;
 (function (Generic) {
     var C = (function () {
@@ -67,16 +68,36 @@ var Generic;
     var D = (function () {
         function D(x) {
             this.x = x;
-        } // error
+        }
         return D;
     }());
     var E = (function () {
         function E(x) {
             this.x = x;
-        } // error
+        }
         return E;
     }());
     var c = new C(1);
-    var d = new D(1);
-    var e = new E(1);
+    var d = new D(1); // error
+    var e = new E(1); // error
 })(Generic || (Generic = {}));
+
+
+//// [classConstructorAccessibility.d.ts]
+declare class C {
+    x: number;
+    constructor(x: number);
+}
+declare class D {
+    x: number;
+    private constructor(x);
+}
+declare class E {
+    x: number;
+    protected constructor(x: number);
+}
+declare var c: C;
+declare var d: any;
+declare var e: any;
+declare module Generic {
+}
diff --git a/tests/baselines/reference/classConstructorAccessibility2.errors.txt b/tests/baselines/reference/classConstructorAccessibility2.errors.txt
new file mode 100644
index 00000000000..7bd784ac268
--- /dev/null
+++ b/tests/baselines/reference/classConstructorAccessibility2.errors.txt
@@ -0,0 +1,59 @@
+tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts(26,28): error TS2674: Constructor of class 'BaseB' is protected and only accessible within the class declaration.
+tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts(29,24): error TS2675: Cannot extend a class 'BaseC'. Class constructor is marked as private.
+tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts(32,28): error TS2673: Constructor of class 'BaseC' is private and only accessible within the class declaration.
+tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts(36,10): error TS2674: Constructor of class 'BaseB' is protected and only accessible within the class declaration.
+tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts(37,10): error TS2673: Constructor of class 'BaseC' is private and only accessible within the class declaration.
+
+
+==== tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts (5 errors) ====
+    
+    class BaseA {
+        public constructor(public x: number) { }
+        createInstance() { new BaseA(1); }
+    }
+    
+    class BaseB {
+        protected constructor(public x: number) { }
+        createInstance() { new BaseB(1); }
+    }
+    
+    class BaseC {
+         private constructor(public x: number) { }
+         createInstance() { new BaseC(1); }
+    }
+    
+    class DerivedA extends BaseA {
+        constructor(public x: number) { super(x); }
+        createInstance() { new DerivedA(1); }
+        createBaseInstance() { new BaseA(1); }
+    }
+    
+    class DerivedB extends BaseB {
+        constructor(public x: number) { super(x); }
+        createInstance() { new DerivedB(1); }
+        createBaseInstance() { new BaseB(1); } // error
+                               ~~~~~~~~~~~~
+!!! error TS2674: Constructor of class 'BaseB' is protected and only accessible within the class declaration.
+    }
+    
+    class DerivedC extends BaseC { // error
+                           ~~~~~
+!!! error TS2675: Cannot extend a class 'BaseC'. Class constructor is marked as private.
+        constructor(public x: number) { super(x); }
+        createInstance() { new DerivedC(1); }
+        createBaseInstance() { new BaseC(1); } // error
+                               ~~~~~~~~~~~~
+!!! error TS2673: Constructor of class 'BaseC' is private and only accessible within the class declaration.
+    }
+    
+    var ba = new BaseA(1);
+    var bb = new BaseB(1); // error
+             ~~~~~~~~~~~~
+!!! error TS2674: Constructor of class 'BaseB' is protected and only accessible within the class declaration.
+    var bc = new BaseC(1); // error
+             ~~~~~~~~~~~~
+!!! error TS2673: Constructor of class 'BaseC' is private and only accessible within the class declaration.
+    
+    var da = new DerivedA(1);
+    var db = new DerivedB(1);
+    var dc = new DerivedC(1);
\ No newline at end of file
diff --git a/tests/baselines/reference/classConstructorAccessibility2.js b/tests/baselines/reference/classConstructorAccessibility2.js
new file mode 100644
index 00000000000..e19589ece45
--- /dev/null
+++ b/tests/baselines/reference/classConstructorAccessibility2.js
@@ -0,0 +1,148 @@
+//// [classConstructorAccessibility2.ts]
+
+class BaseA {
+    public constructor(public x: number) { }
+    createInstance() { new BaseA(1); }
+}
+
+class BaseB {
+    protected constructor(public x: number) { }
+    createInstance() { new BaseB(1); }
+}
+
+class BaseC {
+     private constructor(public x: number) { }
+     createInstance() { new BaseC(1); }
+}
+
+class DerivedA extends BaseA {
+    constructor(public x: number) { super(x); }
+    createInstance() { new DerivedA(1); }
+    createBaseInstance() { new BaseA(1); }
+}
+
+class DerivedB extends BaseB {
+    constructor(public x: number) { super(x); }
+    createInstance() { new DerivedB(1); }
+    createBaseInstance() { new BaseB(1); } // error
+}
+
+class DerivedC extends BaseC { // error
+    constructor(public x: number) { super(x); }
+    createInstance() { new DerivedC(1); }
+    createBaseInstance() { new BaseC(1); } // error
+}
+
+var ba = new BaseA(1);
+var bb = new BaseB(1); // error
+var bc = new BaseC(1); // error
+
+var da = new DerivedA(1);
+var db = new DerivedB(1);
+var dc = new DerivedC(1);
+
+//// [classConstructorAccessibility2.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 BaseA = (function () {
+    function BaseA(x) {
+        this.x = x;
+    }
+    BaseA.prototype.createInstance = function () { new BaseA(1); };
+    return BaseA;
+}());
+var BaseB = (function () {
+    function BaseB(x) {
+        this.x = x;
+    }
+    BaseB.prototype.createInstance = function () { new BaseB(1); };
+    return BaseB;
+}());
+var BaseC = (function () {
+    function BaseC(x) {
+        this.x = x;
+    }
+    BaseC.prototype.createInstance = function () { new BaseC(1); };
+    return BaseC;
+}());
+var DerivedA = (function (_super) {
+    __extends(DerivedA, _super);
+    function DerivedA(x) {
+        _super.call(this, x);
+        this.x = x;
+    }
+    DerivedA.prototype.createInstance = function () { new DerivedA(1); };
+    DerivedA.prototype.createBaseInstance = function () { new BaseA(1); };
+    return DerivedA;
+}(BaseA));
+var DerivedB = (function (_super) {
+    __extends(DerivedB, _super);
+    function DerivedB(x) {
+        _super.call(this, x);
+        this.x = x;
+    }
+    DerivedB.prototype.createInstance = function () { new DerivedB(1); };
+    DerivedB.prototype.createBaseInstance = function () { new BaseB(1); }; // error
+    return DerivedB;
+}(BaseB));
+var DerivedC = (function (_super) {
+    __extends(DerivedC, _super);
+    function DerivedC(x) {
+        _super.call(this, x);
+        this.x = x;
+    }
+    DerivedC.prototype.createInstance = function () { new DerivedC(1); };
+    DerivedC.prototype.createBaseInstance = function () { new BaseC(1); }; // error
+    return DerivedC;
+}(BaseC));
+var ba = new BaseA(1);
+var bb = new BaseB(1); // error
+var bc = new BaseC(1); // error
+var da = new DerivedA(1);
+var db = new DerivedB(1);
+var dc = new DerivedC(1);
+
+
+//// [classConstructorAccessibility2.d.ts]
+declare class BaseA {
+    x: number;
+    constructor(x: number);
+    createInstance(): void;
+}
+declare class BaseB {
+    x: number;
+    protected constructor(x: number);
+    createInstance(): void;
+}
+declare class BaseC {
+    x: number;
+    private constructor(x);
+    createInstance(): void;
+}
+declare class DerivedA extends BaseA {
+    x: number;
+    constructor(x: number);
+    createInstance(): void;
+    createBaseInstance(): void;
+}
+declare class DerivedB extends BaseB {
+    x: number;
+    constructor(x: number);
+    createInstance(): void;
+    createBaseInstance(): void;
+}
+declare class DerivedC extends BaseC {
+    x: number;
+    constructor(x: number);
+    createInstance(): void;
+    createBaseInstance(): void;
+}
+declare var ba: BaseA;
+declare var bb: any;
+declare var bc: any;
+declare var da: DerivedA;
+declare var db: DerivedB;
+declare var dc: DerivedC;
diff --git a/tests/baselines/reference/classConstructorAccessibility3.errors.txt b/tests/baselines/reference/classConstructorAccessibility3.errors.txt
new file mode 100644
index 00000000000..1b96db289dc
--- /dev/null
+++ b/tests/baselines/reference/classConstructorAccessibility3.errors.txt
@@ -0,0 +1,52 @@
+tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility3.ts(21,1): error TS2322: Type 'typeof Baz' is not assignable to type 'typeof Foo'.
+  Cannot assign a 'protected' constructor type to a 'public' constructor type.
+tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility3.ts(22,1): error TS2322: Type 'typeof Qux' is not assignable to type 'typeof Foo'.
+  Cannot assign a 'private' constructor type to a 'public' constructor type.
+tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility3.ts(28,1): error TS2322: Type 'typeof Qux' is not assignable to type 'typeof Baz'.
+  Cannot assign a 'private' constructor type to a 'protected' constructor type.
+
+
+==== tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility3.ts (3 errors) ====
+    
+    class Foo {
+         constructor(public x: number) { }
+    }
+    
+    class Bar {
+        public constructor(public x: number) { }
+    }
+    
+    class Baz {
+        protected constructor(public x: number) { }
+    }
+    
+    class Qux {
+         private constructor(public x: number) { }
+    }
+    
+    // b is public
+    let a = Foo;
+    a = Bar;
+    a = Baz; // error Baz is protected
+    ~
+!!! error TS2322: Type 'typeof Baz' is not assignable to type 'typeof Foo'.
+!!! error TS2322:   Cannot assign a 'protected' constructor type to a 'public' constructor type.
+    a = Qux; // error Qux is private
+    ~
+!!! error TS2322: Type 'typeof Qux' is not assignable to type 'typeof Foo'.
+!!! error TS2322:   Cannot assign a 'private' constructor type to a 'public' constructor type.
+    
+    // b is protected
+    let b = Baz;
+    b = Foo;
+    b = Bar;
+    b = Qux; // error Qux is private
+    ~
+!!! error TS2322: Type 'typeof Qux' is not assignable to type 'typeof Baz'.
+!!! error TS2322:   Cannot assign a 'private' constructor type to a 'protected' constructor type.
+    
+    // c is private
+    let c = Qux;
+    c = Foo;
+    c = Bar;
+    c = Baz;
\ No newline at end of file
diff --git a/tests/baselines/reference/classConstructorAccessibility3.js b/tests/baselines/reference/classConstructorAccessibility3.js
new file mode 100644
index 00000000000..acc7d38aa55
--- /dev/null
+++ b/tests/baselines/reference/classConstructorAccessibility3.js
@@ -0,0 +1,98 @@
+//// [classConstructorAccessibility3.ts]
+
+class Foo {
+     constructor(public x: number) { }
+}
+
+class Bar {
+    public constructor(public x: number) { }
+}
+
+class Baz {
+    protected constructor(public x: number) { }
+}
+
+class Qux {
+     private constructor(public x: number) { }
+}
+
+// b is public
+let a = Foo;
+a = Bar;
+a = Baz; // error Baz is protected
+a = Qux; // error Qux is private
+
+// b is protected
+let b = Baz;
+b = Foo;
+b = Bar;
+b = Qux; // error Qux is private
+
+// c is private
+let c = Qux;
+c = Foo;
+c = Bar;
+c = Baz;
+
+//// [classConstructorAccessibility3.js]
+var Foo = (function () {
+    function Foo(x) {
+        this.x = x;
+    }
+    return Foo;
+}());
+var Bar = (function () {
+    function Bar(x) {
+        this.x = x;
+    }
+    return Bar;
+}());
+var Baz = (function () {
+    function Baz(x) {
+        this.x = x;
+    }
+    return Baz;
+}());
+var Qux = (function () {
+    function Qux(x) {
+        this.x = x;
+    }
+    return Qux;
+}());
+// b is public
+var a = Foo;
+a = Bar;
+a = Baz; // error Baz is protected
+a = Qux; // error Qux is private
+// b is protected
+var b = Baz;
+b = Foo;
+b = Bar;
+b = Qux; // error Qux is private
+// c is private
+var c = Qux;
+c = Foo;
+c = Bar;
+c = Baz;
+
+
+//// [classConstructorAccessibility3.d.ts]
+declare class Foo {
+    x: number;
+    constructor(x: number);
+}
+declare class Bar {
+    x: number;
+    constructor(x: number);
+}
+declare class Baz {
+    x: number;
+    protected constructor(x: number);
+}
+declare class Qux {
+    x: number;
+    private constructor(x);
+}
+declare let a: typeof Foo;
+declare let b: typeof Baz;
+declare let c: typeof Qux;
diff --git a/tests/baselines/reference/classConstructorAccessibility4.js b/tests/baselines/reference/classConstructorAccessibility4.js
new file mode 100644
index 00000000000..6342facae21
--- /dev/null
+++ b/tests/baselines/reference/classConstructorAccessibility4.js
@@ -0,0 +1,93 @@
+//// [classConstructorAccessibility4.ts]
+
+class A {
+    private constructor() { }
+
+    method() {
+        class B {
+            method() {
+                new A(); // OK
+            }
+        }
+
+        class C extends A { // OK
+        }
+    }
+}
+
+class D {
+    protected constructor() { }
+
+    method() {
+        class E {
+            method() {
+                new D(); // OK
+            }
+        }
+
+        class F extends D { // OK
+        }
+    }
+}
+
+//// [classConstructorAccessibility4.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 A = (function () {
+    function A() {
+    }
+    A.prototype.method = function () {
+        var B = (function () {
+            function B() {
+            }
+            B.prototype.method = function () {
+                new A(); // OK
+            };
+            return B;
+        }());
+        var C = (function (_super) {
+            __extends(C, _super);
+            function C() {
+                _super.apply(this, arguments);
+            }
+            return C;
+        }(A));
+    };
+    return A;
+}());
+var D = (function () {
+    function D() {
+    }
+    D.prototype.method = function () {
+        var E = (function () {
+            function E() {
+            }
+            E.prototype.method = function () {
+                new D(); // OK
+            };
+            return E;
+        }());
+        var F = (function (_super) {
+            __extends(F, _super);
+            function F() {
+                _super.apply(this, arguments);
+            }
+            return F;
+        }(D));
+    };
+    return D;
+}());
+
+
+//// [classConstructorAccessibility4.d.ts]
+declare class A {
+    private constructor();
+    method(): void;
+}
+declare class D {
+    protected constructor();
+    method(): void;
+}
diff --git a/tests/baselines/reference/classConstructorAccessibility4.symbols b/tests/baselines/reference/classConstructorAccessibility4.symbols
new file mode 100644
index 00000000000..66a9bbfabfd
--- /dev/null
+++ b/tests/baselines/reference/classConstructorAccessibility4.symbols
@@ -0,0 +1,53 @@
+=== tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility4.ts ===
+
+class A {
+>A : Symbol(A, Decl(classConstructorAccessibility4.ts, 0, 0))
+
+    private constructor() { }
+
+    method() {
+>method : Symbol(A.method, Decl(classConstructorAccessibility4.ts, 2, 29))
+
+        class B {
+>B : Symbol(B, Decl(classConstructorAccessibility4.ts, 4, 14))
+
+            method() {
+>method : Symbol(B.method, Decl(classConstructorAccessibility4.ts, 5, 17))
+
+                new A(); // OK
+>A : Symbol(A, Decl(classConstructorAccessibility4.ts, 0, 0))
+            }
+        }
+
+        class C extends A { // OK
+>C : Symbol(C, Decl(classConstructorAccessibility4.ts, 9, 9))
+>A : Symbol(A, Decl(classConstructorAccessibility4.ts, 0, 0))
+        }
+    }
+}
+
+class D {
+>D : Symbol(D, Decl(classConstructorAccessibility4.ts, 14, 1))
+
+    protected constructor() { }
+
+    method() {
+>method : Symbol(D.method, Decl(classConstructorAccessibility4.ts, 17, 31))
+
+        class E {
+>E : Symbol(E, Decl(classConstructorAccessibility4.ts, 19, 14))
+
+            method() {
+>method : Symbol(E.method, Decl(classConstructorAccessibility4.ts, 20, 17))
+
+                new D(); // OK
+>D : Symbol(D, Decl(classConstructorAccessibility4.ts, 14, 1))
+            }
+        }
+
+        class F extends D { // OK
+>F : Symbol(F, Decl(classConstructorAccessibility4.ts, 24, 9))
+>D : Symbol(D, Decl(classConstructorAccessibility4.ts, 14, 1))
+        }
+    }
+}
diff --git a/tests/baselines/reference/classConstructorAccessibility4.types b/tests/baselines/reference/classConstructorAccessibility4.types
new file mode 100644
index 00000000000..1eb5a25e220
--- /dev/null
+++ b/tests/baselines/reference/classConstructorAccessibility4.types
@@ -0,0 +1,55 @@
+=== tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility4.ts ===
+
+class A {
+>A : A
+
+    private constructor() { }
+
+    method() {
+>method : () => void
+
+        class B {
+>B : B
+
+            method() {
+>method : () => void
+
+                new A(); // OK
+>new A() : A
+>A : typeof A
+            }
+        }
+
+        class C extends A { // OK
+>C : C
+>A : A
+        }
+    }
+}
+
+class D {
+>D : D
+
+    protected constructor() { }
+
+    method() {
+>method : () => void
+
+        class E {
+>E : E
+
+            method() {
+>method : () => void
+
+                new D(); // OK
+>new D() : D
+>D : typeof D
+            }
+        }
+
+        class F extends D { // OK
+>F : F
+>D : D
+        }
+    }
+}
diff --git a/tests/baselines/reference/classConstructorOverloadsAccessibility.errors.txt b/tests/baselines/reference/classConstructorOverloadsAccessibility.errors.txt
new file mode 100644
index 00000000000..8882b9f0180
--- /dev/null
+++ b/tests/baselines/reference/classConstructorOverloadsAccessibility.errors.txt
@@ -0,0 +1,45 @@
+tests/cases/conformance/classes/constructorDeclarations/classConstructorOverloadsAccessibility.ts(3,2): error TS2385: Overload signatures must all be public, private or protected.
+tests/cases/conformance/classes/constructorDeclarations/classConstructorOverloadsAccessibility.ts(4,2): error TS2385: Overload signatures must all be public, private or protected.
+tests/cases/conformance/classes/constructorDeclarations/classConstructorOverloadsAccessibility.ts(12,2): error TS2385: Overload signatures must all be public, private or protected.
+
+
+==== tests/cases/conformance/classes/constructorDeclarations/classConstructorOverloadsAccessibility.ts (3 errors) ====
+    
+    class A {
+    	public constructor(a: boolean) // error
+    	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2385: Overload signatures must all be public, private or protected.
+    	protected constructor(a: number) // error
+    	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2385: Overload signatures must all be public, private or protected.
+    	private constructor(a: string)
+    	private constructor() { 
+    		
+    	}
+    }
+    
+    class B {
+    	protected constructor(a: number) // error
+    	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2385: Overload signatures must all be public, private or protected.
+    	constructor(a: string)
+    	constructor() { 
+    		
+    	}
+    }
+    
+    class C {
+    	protected constructor(a: number)
+    	protected constructor(a: string)
+    	protected constructor() { 
+    		
+    	}
+    }
+    
+    class D {
+    	constructor(a: number)
+    	constructor(a: string)
+    	public constructor() { 
+    		
+    	}
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/classConstructorOverloadsAccessibility.js b/tests/baselines/reference/classConstructorOverloadsAccessibility.js
new file mode 100644
index 00000000000..3914c29b785
--- /dev/null
+++ b/tests/baselines/reference/classConstructorOverloadsAccessibility.js
@@ -0,0 +1,76 @@
+//// [classConstructorOverloadsAccessibility.ts]
+
+class A {
+	public constructor(a: boolean) // error
+	protected constructor(a: number) // error
+	private constructor(a: string)
+	private constructor() { 
+		
+	}
+}
+
+class B {
+	protected constructor(a: number) // error
+	constructor(a: string)
+	constructor() { 
+		
+	}
+}
+
+class C {
+	protected constructor(a: number)
+	protected constructor(a: string)
+	protected constructor() { 
+		
+	}
+}
+
+class D {
+	constructor(a: number)
+	constructor(a: string)
+	public constructor() { 
+		
+	}
+}
+
+//// [classConstructorOverloadsAccessibility.js]
+var A = (function () {
+    function A() {
+    }
+    return A;
+}());
+var B = (function () {
+    function B() {
+    }
+    return B;
+}());
+var C = (function () {
+    function C() {
+    }
+    return C;
+}());
+var D = (function () {
+    function D() {
+    }
+    return D;
+}());
+
+
+//// [classConstructorOverloadsAccessibility.d.ts]
+declare class A {
+    constructor(a: boolean);
+    protected constructor(a: number);
+    private constructor(a);
+}
+declare class B {
+    protected constructor(a: number);
+    constructor(a: string);
+}
+declare class C {
+    protected constructor(a: number);
+    protected constructor(a: string);
+}
+declare class D {
+    constructor(a: number);
+    constructor(a: string);
+}
diff --git a/tests/baselines/reference/classConstructorParametersAccessibility.errors.txt b/tests/baselines/reference/classConstructorParametersAccessibility.errors.txt
index 029c3fae018..97b8655ab87 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility.errors.txt
+++ b/tests/baselines/reference/classConstructorParametersAccessibility.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/conformance/classes/constructorDeclarations/classConstructorParametersAccessibility.ts(12,1): error TS2341: Property 'p' is private and only accessible within class 'C2'.
-tests/cases/conformance/classes/constructorDeclarations/classConstructorParametersAccessibility.ts(19,1): error TS2445: Property 'p' is protected and only accessible within class 'C3' and its subclasses.
+tests/cases/conformance/classes/constructorDeclarations/classConstructorParametersAccessibility.ts(12,4): error TS2341: Property 'p' is private and only accessible within class 'C2'.
+tests/cases/conformance/classes/constructorDeclarations/classConstructorParametersAccessibility.ts(19,4): error TS2445: Property 'p' is protected and only accessible within class 'C3' and its subclasses.
 
 
 ==== tests/cases/conformance/classes/constructorDeclarations/classConstructorParametersAccessibility.ts (2 errors) ====
@@ -15,7 +15,7 @@ tests/cases/conformance/classes/constructorDeclarations/classConstructorParamete
     }
     var c2: C2;
     c2.p // private, error
-    ~~~~
+       ~
 !!! error TS2341: Property 'p' is private and only accessible within class 'C2'.
     
     
@@ -24,7 +24,7 @@ tests/cases/conformance/classes/constructorDeclarations/classConstructorParamete
     }
     var c3: C3;
     c3.p // protected, error
-    ~~~~
+       ~
 !!! error TS2445: Property 'p' is protected and only accessible within class 'C3' and its subclasses.
     class Derived extends C3 {
         constructor(p: number) {
diff --git a/tests/baselines/reference/classConstructorParametersAccessibility2.errors.txt b/tests/baselines/reference/classConstructorParametersAccessibility2.errors.txt
index 7c95a35e1da..2a27d24b280 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility2.errors.txt
+++ b/tests/baselines/reference/classConstructorParametersAccessibility2.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/conformance/classes/constructorDeclarations/classConstructorParametersAccessibility2.ts(12,1): error TS2341: Property 'p' is private and only accessible within class 'C2'.
-tests/cases/conformance/classes/constructorDeclarations/classConstructorParametersAccessibility2.ts(19,1): error TS2445: Property 'p' is protected and only accessible within class 'C3' and its subclasses.
+tests/cases/conformance/classes/constructorDeclarations/classConstructorParametersAccessibility2.ts(12,4): error TS2341: Property 'p' is private and only accessible within class 'C2'.
+tests/cases/conformance/classes/constructorDeclarations/classConstructorParametersAccessibility2.ts(19,4): error TS2445: Property 'p' is protected and only accessible within class 'C3' and its subclasses.
 
 
 ==== tests/cases/conformance/classes/constructorDeclarations/classConstructorParametersAccessibility2.ts (2 errors) ====
@@ -15,7 +15,7 @@ tests/cases/conformance/classes/constructorDeclarations/classConstructorParamete
     }
     var c2: C2;
     c2.p // private, error
-    ~~~~
+       ~
 !!! error TS2341: Property 'p' is private and only accessible within class 'C2'.
     
     
@@ -24,7 +24,7 @@ tests/cases/conformance/classes/constructorDeclarations/classConstructorParamete
     }
     var c3: C3;
     c3.p // protected, error
-    ~~~~
+       ~
 !!! error TS2445: Property 'p' is protected and only accessible within class 'C3' and its subclasses.
     class Derived extends C3 {
         constructor(p: number) {
diff --git a/tests/baselines/reference/classConstructorParametersAccessibility3.symbols b/tests/baselines/reference/classConstructorParametersAccessibility3.symbols
index b2888528e7e..1e61cffd88b 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility3.symbols
+++ b/tests/baselines/reference/classConstructorParametersAccessibility3.symbols
@@ -3,7 +3,7 @@ class Base {
 >Base : Symbol(Base, Decl(classConstructorParametersAccessibility3.ts, 0, 0))
 
     constructor(protected p: number) { }
->p : Symbol(p, Decl(classConstructorParametersAccessibility3.ts, 1, 16))
+>p : Symbol(Base.p, Decl(classConstructorParametersAccessibility3.ts, 1, 16))
 }
 
 class Derived extends Base {
@@ -11,16 +11,16 @@ class Derived extends Base {
 >Base : Symbol(Base, Decl(classConstructorParametersAccessibility3.ts, 0, 0))
 
     constructor(public p: number) {
->p : Symbol(p, Decl(classConstructorParametersAccessibility3.ts, 5, 16))
+>p : Symbol(Derived.p, Decl(classConstructorParametersAccessibility3.ts, 5, 16))
 
         super(p);
 >super : Symbol(Base, Decl(classConstructorParametersAccessibility3.ts, 0, 0))
 >p : Symbol(p, Decl(classConstructorParametersAccessibility3.ts, 5, 16))
 
         this.p; // OK
->this.p : Symbol(p, Decl(classConstructorParametersAccessibility3.ts, 5, 16))
+>this.p : Symbol(Derived.p, Decl(classConstructorParametersAccessibility3.ts, 5, 16))
 >this : Symbol(Derived, Decl(classConstructorParametersAccessibility3.ts, 2, 1))
->p : Symbol(p, Decl(classConstructorParametersAccessibility3.ts, 5, 16))
+>p : Symbol(Derived.p, Decl(classConstructorParametersAccessibility3.ts, 5, 16))
     }
 }
 
diff --git a/tests/baselines/reference/classDoesNotDependOnPrivateMember.symbols b/tests/baselines/reference/classDoesNotDependOnPrivateMember.symbols
index ca042499c05..5f5a23156ef 100644
--- a/tests/baselines/reference/classDoesNotDependOnPrivateMember.symbols
+++ b/tests/baselines/reference/classDoesNotDependOnPrivateMember.symbols
@@ -9,7 +9,7 @@ module M {
 >C : Symbol(C, Decl(classDoesNotDependOnPrivateMember.ts, 1, 19))
 
         private x: I;
->x : Symbol(x, Decl(classDoesNotDependOnPrivateMember.ts, 2, 20))
+>x : Symbol(C.x, Decl(classDoesNotDependOnPrivateMember.ts, 2, 20))
 >I : Symbol(I, Decl(classDoesNotDependOnPrivateMember.ts, 0, 10))
     }
 }
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 6b3a06cf7c3..254014c9458 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(...args) {
         super(...args);
         this.b = 2;
     }
-}
- {
+} {
     constructor(...args) {
         super(...args);
         this.c = 3;
     }
-}
-;
+};
 let c = new C();
 c.a;
 c.b;
diff --git a/tests/baselines/reference/classExpressionTest1.symbols b/tests/baselines/reference/classExpressionTest1.symbols
index 684ee302895..398a74d7f5f 100644
--- a/tests/baselines/reference/classExpressionTest1.symbols
+++ b/tests/baselines/reference/classExpressionTest1.symbols
@@ -7,7 +7,7 @@ function M() {
 >X : Symbol(X, Decl(classExpressionTest1.ts, 1, 12))
 
         f<T>() {
->f : Symbol(f, Decl(classExpressionTest1.ts, 1, 16))
+>f : Symbol(C.f, Decl(classExpressionTest1.ts, 1, 16))
 >T : Symbol(T, Decl(classExpressionTest1.ts, 2, 10))
 
             var t: T;
diff --git a/tests/baselines/reference/classExtendingBuiltinType.symbols b/tests/baselines/reference/classExtendingBuiltinType.symbols
index 78f2195c8db..fb0814cc0f2 100644
--- a/tests/baselines/reference/classExtendingBuiltinType.symbols
+++ b/tests/baselines/reference/classExtendingBuiltinType.symbols
@@ -9,7 +9,7 @@ class C2 extends Function { }
 
 class C3 extends String { }
 >C3 : Symbol(C3, Decl(classExtendingBuiltinType.ts, 1, 29))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 class C4 extends Boolean { }
 >C4 : Symbol(C4, Decl(classExtendingBuiltinType.ts, 2, 27))
@@ -17,11 +17,11 @@ class C4 extends Boolean { }
 
 class C5 extends Number { }
 >C5 : Symbol(C5, Decl(classExtendingBuiltinType.ts, 3, 28))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 class C6 extends Date { }
 >C6 : Symbol(C6, Decl(classExtendingBuiltinType.ts, 4, 27))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 class C7 extends RegExp { }
 >C7 : Symbol(C7, Decl(classExtendingBuiltinType.ts, 5, 25))
diff --git a/tests/baselines/reference/classExtendingClass.symbols b/tests/baselines/reference/classExtendingClass.symbols
index 3c79887d163..638d595f812 100644
--- a/tests/baselines/reference/classExtendingClass.symbols
+++ b/tests/baselines/reference/classExtendingClass.symbols
@@ -3,10 +3,10 @@ class C {
 >C : Symbol(C, Decl(classExtendingClass.ts, 0, 0))
 
     foo: string;
->foo : Symbol(foo, Decl(classExtendingClass.ts, 0, 9))
+>foo : Symbol(C.foo, Decl(classExtendingClass.ts, 0, 9))
 
     thing() { }
->thing : Symbol(thing, Decl(classExtendingClass.ts, 1, 16))
+>thing : Symbol(C.thing, Decl(classExtendingClass.ts, 1, 16))
 
     static other() { }
 >other : Symbol(C.other, Decl(classExtendingClass.ts, 2, 15))
@@ -17,7 +17,7 @@ class D extends C {
 >C : Symbol(C, Decl(classExtendingClass.ts, 0, 0))
 
     bar: string;
->bar : Symbol(bar, Decl(classExtendingClass.ts, 6, 19))
+>bar : Symbol(D.bar, Decl(classExtendingClass.ts, 6, 19))
 }
 
 var d: D;
@@ -53,11 +53,11 @@ class C2<T> {
 >T : Symbol(T, Decl(classExtendingClass.ts, 16, 9))
 
     foo: T;
->foo : Symbol(foo, Decl(classExtendingClass.ts, 16, 13))
+>foo : Symbol(C2.foo, Decl(classExtendingClass.ts, 16, 13))
 >T : Symbol(T, Decl(classExtendingClass.ts, 16, 9))
 
     thing(x: T) { }
->thing : Symbol(thing, Decl(classExtendingClass.ts, 17, 11))
+>thing : Symbol(C2.thing, Decl(classExtendingClass.ts, 17, 11))
 >x : Symbol(x, Decl(classExtendingClass.ts, 18, 10))
 >T : Symbol(T, Decl(classExtendingClass.ts, 16, 9))
 
@@ -75,7 +75,7 @@ class D2<T> extends C2<T> {
 >T : Symbol(T, Decl(classExtendingClass.ts, 22, 9))
 
     bar: string;
->bar : Symbol(bar, Decl(classExtendingClass.ts, 22, 27))
+>bar : Symbol(D2.bar, Decl(classExtendingClass.ts, 22, 27))
 }
 
 var d2: D2<string>;
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/classExtendsNull.errors.txt b/tests/baselines/reference/classExtendsNull.errors.txt
index 7bb44774826..905c90c42fd 100644
--- a/tests/baselines/reference/classExtendsNull.errors.txt
+++ b/tests/baselines/reference/classExtendsNull.errors.txt
@@ -1,17 +1,14 @@
-tests/cases/compiler/classExtendsNull.ts(2,5): error TS17005: A constructor cannot contain a 'super' call when its class extends 'null'
+tests/cases/compiler/classExtendsNull.ts(3,9): error TS17005: A constructor cannot contain a 'super' call when its class extends 'null'
 
 
 ==== tests/cases/compiler/classExtendsNull.ts (1 errors) ====
     class C extends null {
         constructor() {
-        ~~~~~~~~~~~~~~~
             super();
-    ~~~~~~~~~~~~~~~~
-            return Object.create(null);
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        }
-    ~~~~~
+            ~~~~~~~
 !!! error TS17005: A constructor cannot contain a 'super' call when its class extends 'null'
+            return Object.create(null);
+        }
     }
     
     class D extends null {
diff --git a/tests/baselines/reference/classImplementsClass3.symbols b/tests/baselines/reference/classImplementsClass3.symbols
index a1c565c8d53..66fdd66786c 100644
--- a/tests/baselines/reference/classImplementsClass3.symbols
+++ b/tests/baselines/reference/classImplementsClass3.symbols
@@ -1,14 +1,14 @@
 === tests/cases/compiler/classImplementsClass3.ts ===
 class A { foo(): number { return 1; } }
 >A : Symbol(A, Decl(classImplementsClass3.ts, 0, 0))
->foo : Symbol(foo, Decl(classImplementsClass3.ts, 0, 9))
+>foo : Symbol(A.foo, Decl(classImplementsClass3.ts, 0, 9))
 
 class C implements A {
 >C : Symbol(C, Decl(classImplementsClass3.ts, 0, 39))
 >A : Symbol(A, Decl(classImplementsClass3.ts, 0, 0))
 
     foo() {
->foo : Symbol(foo, Decl(classImplementsClass3.ts, 1, 22))
+>foo : Symbol(C.foo, Decl(classImplementsClass3.ts, 1, 22))
 
         return 1;
     }
diff --git a/tests/baselines/reference/classImplementsImportedInterface.symbols b/tests/baselines/reference/classImplementsImportedInterface.symbols
index a629d3c005d..be06fa6f991 100644
--- a/tests/baselines/reference/classImplementsImportedInterface.symbols
+++ b/tests/baselines/reference/classImplementsImportedInterface.symbols
@@ -6,7 +6,7 @@ module M1 {
 >I : Symbol(I, Decl(classImplementsImportedInterface.ts, 0, 11))
 
         foo();
->foo : Symbol(foo, Decl(classImplementsImportedInterface.ts, 1, 24))
+>foo : Symbol(I.foo, Decl(classImplementsImportedInterface.ts, 1, 24))
     }
 }
 
@@ -23,6 +23,6 @@ module M2 {
 >T : Symbol(T, Decl(classImplementsImportedInterface.ts, 6, 11))
 
         foo() {}
->foo : Symbol(foo, Decl(classImplementsImportedInterface.ts, 8, 26))
+>foo : Symbol(C.foo, Decl(classImplementsImportedInterface.ts, 8, 26))
     }
 }
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.errors.txt b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.errors.txt
index b016952a3aa..6af97590fa8 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.errors.txt
+++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.errors.txt
@@ -1,17 +1,14 @@
-tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts(4,14): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts(8,21): error TS2301: Initializer of instance member variable 'messageHandler' cannot reference identifier 'field1' declared in the constructor.
 
 
 ==== tests/cases/compiler/classMemberInitializerWithLamdaScoping3_0.ts (0 errors) ====
     var field1: string;
     
-==== tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts (2 errors) ====
+==== tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts (1 errors) ====
     declare var console: {
         log(msg?: any): void;
     };
     export class Test1 {
-                 ~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
         constructor(private field1: string) {
         }
         messageHandler = () => {
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.errors.txt b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.errors.txt
index 73fa862e82b..58a660c1ee8 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.errors.txt
+++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.errors.txt
@@ -1,11 +1,8 @@
-tests/cases/compiler/classMemberInitializerWithLamdaScoping3_0.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts(8,21): error TS2304: Cannot find name 'field1'.
 
 
-==== tests/cases/compiler/classMemberInitializerWithLamdaScoping3_0.ts (1 errors) ====
+==== tests/cases/compiler/classMemberInitializerWithLamdaScoping3_0.ts (0 errors) ====
     export var field1: string;
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
     
 ==== tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts (1 errors) ====
     declare var console: {
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.symbols b/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.symbols
index 585bae5b3c3..230f5bcec90 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.symbols
+++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.symbols
@@ -16,7 +16,7 @@ class Greeter {
     }
 
     messageHandler = (message: string) => {
->messageHandler : Symbol(messageHandler, Decl(classMemberInitializerWithLamdaScoping5.ts, 5, 5))
+>messageHandler : Symbol(Greeter.messageHandler, Decl(classMemberInitializerWithLamdaScoping5.ts, 5, 5))
 >message : Symbol(message, Decl(classMemberInitializerWithLamdaScoping5.ts, 7, 22))
 
         console.log(message); // This shouldnt be error
diff --git a/tests/baselines/reference/classOrder1.symbols b/tests/baselines/reference/classOrder1.symbols
index 4f1541ba9cd..02d6fc8ea34 100644
--- a/tests/baselines/reference/classOrder1.symbols
+++ b/tests/baselines/reference/classOrder1.symbols
@@ -3,7 +3,7 @@ class A {
 >A : Symbol(A, Decl(classOrder1.ts, 0, 0))
 
     public foo() {
->foo : Symbol(foo, Decl(classOrder1.ts, 0, 9))
+>foo : Symbol(A.foo, Decl(classOrder1.ts, 0, 9))
 
         /*WScript.Echo("Here!");*/
     }
diff --git a/tests/baselines/reference/classOrder2.symbols b/tests/baselines/reference/classOrder2.symbols
index 4ee49d269a9..8ca6e89e1db 100644
--- a/tests/baselines/reference/classOrder2.symbols
+++ b/tests/baselines/reference/classOrder2.symbols
@@ -5,7 +5,7 @@ class A extends B {
 >B : Symbol(B, Decl(classOrder2.ts, 5, 1))
 
   foo() { this.bar(); }
->foo : Symbol(foo, Decl(classOrder2.ts, 1, 19))
+>foo : Symbol(A.foo, Decl(classOrder2.ts, 1, 19))
 >this.bar : Symbol(B.bar, Decl(classOrder2.ts, 7, 9))
 >this : Symbol(A, Decl(classOrder2.ts, 0, 0))
 >bar : Symbol(B.bar, Decl(classOrder2.ts, 7, 9))
@@ -16,7 +16,7 @@ class B {
 >B : Symbol(B, Decl(classOrder2.ts, 5, 1))
 
   bar() { }
->bar : Symbol(bar, Decl(classOrder2.ts, 7, 9))
+>bar : Symbol(B.bar, Decl(classOrder2.ts, 7, 9))
 
 }
 
diff --git a/tests/baselines/reference/classOrderBug.symbols b/tests/baselines/reference/classOrderBug.symbols
index 9065909180b..bbc78371231 100644
--- a/tests/baselines/reference/classOrderBug.symbols
+++ b/tests/baselines/reference/classOrderBug.symbols
@@ -3,15 +3,15 @@ class bar {
 >bar : Symbol(bar, Decl(classOrderBug.ts, 0, 0))
 
     public baz: foo;
->baz : Symbol(baz, Decl(classOrderBug.ts, 0, 11))
+>baz : Symbol(bar.baz, Decl(classOrderBug.ts, 0, 11))
 >foo : Symbol(foo, Decl(classOrderBug.ts, 10, 12))
 
     constructor() {
 
         this.baz = new foo();
->this.baz : Symbol(baz, Decl(classOrderBug.ts, 0, 11))
+>this.baz : Symbol(bar.baz, Decl(classOrderBug.ts, 0, 11))
 >this : Symbol(bar, Decl(classOrderBug.ts, 0, 0))
->baz : Symbol(baz, Decl(classOrderBug.ts, 0, 11))
+>baz : Symbol(bar.baz, Decl(classOrderBug.ts, 0, 11))
 >foo : Symbol(foo, Decl(classOrderBug.ts, 10, 12))
 
     }
diff --git a/tests/baselines/reference/classPropertyAsPrivate.errors.txt b/tests/baselines/reference/classPropertyAsPrivate.errors.txt
index a5fdffe091a..4cc38cb049f 100644
--- a/tests/baselines/reference/classPropertyAsPrivate.errors.txt
+++ b/tests/baselines/reference/classPropertyAsPrivate.errors.txt
@@ -2,14 +2,14 @@ tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(
 tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(4,17): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(8,24): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(9,24): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(15,1): error TS2341: Property 'x' is private and only accessible within class 'C'.
-tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(16,1): error TS2341: Property 'y' is private and only accessible within class 'C'.
-tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(17,1): error TS2341: Property 'y' is private and only accessible within class 'C'.
-tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(18,1): error TS2341: Property 'foo' is private and only accessible within class 'C'.
-tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(20,1): error TS2341: Property 'a' is private and only accessible within class 'C'.
-tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(21,1): error TS2341: Property 'b' is private and only accessible within class 'C'.
-tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(22,1): error TS2341: Property 'b' is private and only accessible within class 'C'.
-tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(23,1): error TS2341: Property 'foo' is private and only accessible within class 'C'.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(15,3): error TS2341: Property 'x' is private and only accessible within class 'C'.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(16,3): error TS2341: Property 'y' is private and only accessible within class 'C'.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(17,3): error TS2341: Property 'y' is private and only accessible within class 'C'.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(18,3): error TS2341: Property 'foo' is private and only accessible within class 'C'.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(20,3): error TS2341: Property 'a' is private and only accessible within class 'C'.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(21,3): error TS2341: Property 'b' is private and only accessible within class 'C'.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(22,3): error TS2341: Property 'b' is private and only accessible within class 'C'.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(23,3): error TS2341: Property 'foo' is private and only accessible within class 'C'.
 
 
 ==== tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts (12 errors) ====
@@ -36,27 +36,27 @@ tests/cases/conformance/classes/members/accessibility/classPropertyAsPrivate.ts(
     var c: C;
     // all errors
     c.x;
-    ~~~
+      ~
 !!! error TS2341: Property 'x' is private and only accessible within class 'C'.
     c.y;
-    ~~~
+      ~
 !!! error TS2341: Property 'y' is private and only accessible within class 'C'.
     c.y = 1;
-    ~~~
+      ~
 !!! error TS2341: Property 'y' is private and only accessible within class 'C'.
     c.foo();
-    ~~~~~
+      ~~~
 !!! error TS2341: Property 'foo' is private and only accessible within class 'C'.
     
     C.a;
-    ~~~
+      ~
 !!! error TS2341: Property 'a' is private and only accessible within class 'C'.
     C.b();
-    ~~~
+      ~
 !!! error TS2341: Property 'b' is private and only accessible within class 'C'.
     C.b = 1;
-    ~~~
+      ~
 !!! error TS2341: Property 'b' is private and only accessible within class 'C'.
     C.foo();
-    ~~~~~
+      ~~~
 !!! error TS2341: Property 'foo' is private and only accessible within class 'C'.
\ No newline at end of file
diff --git a/tests/baselines/reference/classPropertyAsProtected.errors.txt b/tests/baselines/reference/classPropertyAsProtected.errors.txt
index 570ebc718ac..acfba42f9e3 100644
--- a/tests/baselines/reference/classPropertyAsProtected.errors.txt
+++ b/tests/baselines/reference/classPropertyAsProtected.errors.txt
@@ -2,14 +2,14 @@ tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.t
 tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(4,19): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(8,26): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(9,26): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(15,1): error TS2445: Property 'x' is protected and only accessible within class 'C' and its subclasses.
-tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(16,1): error TS2445: Property 'y' is protected and only accessible within class 'C' and its subclasses.
-tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(17,1): error TS2445: Property 'y' is protected and only accessible within class 'C' and its subclasses.
-tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(18,1): error TS2445: Property 'foo' is protected and only accessible within class 'C' and its subclasses.
-tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(20,1): error TS2445: Property 'a' is protected and only accessible within class 'C' and its subclasses.
-tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(21,1): error TS2445: Property 'b' is protected and only accessible within class 'C' and its subclasses.
-tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(22,1): error TS2445: Property 'b' is protected and only accessible within class 'C' and its subclasses.
-tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(23,1): error TS2445: Property 'foo' is protected and only accessible within class 'C' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(15,3): error TS2445: Property 'x' is protected and only accessible within class 'C' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(16,3): error TS2445: Property 'y' is protected and only accessible within class 'C' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(17,3): error TS2445: Property 'y' is protected and only accessible within class 'C' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(18,3): error TS2445: Property 'foo' is protected and only accessible within class 'C' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(20,3): error TS2445: Property 'a' is protected and only accessible within class 'C' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(21,3): error TS2445: Property 'b' is protected and only accessible within class 'C' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(22,3): error TS2445: Property 'b' is protected and only accessible within class 'C' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(23,3): error TS2445: Property 'foo' is protected and only accessible within class 'C' and its subclasses.
 
 
 ==== tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts (12 errors) ====
@@ -36,27 +36,27 @@ tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.t
     var c: C;
     // all errors
     c.x;
-    ~~~
+      ~
 !!! error TS2445: Property 'x' is protected and only accessible within class 'C' and its subclasses.
     c.y;
-    ~~~
+      ~
 !!! error TS2445: Property 'y' is protected and only accessible within class 'C' and its subclasses.
     c.y = 1;
-    ~~~
+      ~
 !!! error TS2445: Property 'y' is protected and only accessible within class 'C' and its subclasses.
     c.foo();
-    ~~~~~
+      ~~~
 !!! error TS2445: Property 'foo' is protected and only accessible within class 'C' and its subclasses.
     
     C.a;
-    ~~~
+      ~
 !!! error TS2445: Property 'a' is protected and only accessible within class 'C' and its subclasses.
     C.b();
-    ~~~
+      ~
 !!! error TS2445: Property 'b' is protected and only accessible within class 'C' and its subclasses.
     C.b = 1;
-    ~~~
+      ~
 !!! error TS2445: Property 'b' is protected and only accessible within class 'C' and its subclasses.
     C.foo();
-    ~~~~~
+      ~~~
 !!! error TS2445: Property 'foo' is protected and only accessible within class 'C' and its subclasses.
\ No newline at end of file
diff --git a/tests/baselines/reference/classSideInheritance2.symbols b/tests/baselines/reference/classSideInheritance2.symbols
index 697aba99832..b90ae38a4a9 100644
--- a/tests/baselines/reference/classSideInheritance2.symbols
+++ b/tests/baselines/reference/classSideInheritance2.symbols
@@ -3,7 +3,7 @@ interface IText {
 >IText : Symbol(IText, Decl(classSideInheritance2.ts, 0, 0))
 
     foo: number;
->foo : Symbol(foo, Decl(classSideInheritance2.ts, 0, 17))
+>foo : Symbol(IText.foo, Decl(classSideInheritance2.ts, 0, 17))
 }
 
 interface TextSpan {}
@@ -29,10 +29,10 @@ class TextBase implements IText {
 >IText : Symbol(IText, Decl(classSideInheritance2.ts, 0, 0))
 
         public foo: number;
->foo : Symbol(foo, Decl(classSideInheritance2.ts, 13, 33))
+>foo : Symbol(TextBase.foo, Decl(classSideInheritance2.ts, 13, 33))
 
         public subText(span: TextSpan): IText {
->subText : Symbol(subText, Decl(classSideInheritance2.ts, 14, 27))
+>subText : Symbol(TextBase.subText, Decl(classSideInheritance2.ts, 14, 27))
 >span : Symbol(span, Decl(classSideInheritance2.ts, 15, 23))
 >TextSpan : Symbol(TextSpan, Decl(classSideInheritance2.ts, 2, 1))
 >IText : Symbol(IText, Decl(classSideInheritance2.ts, 0, 0))
diff --git a/tests/baselines/reference/classWithNoConstructorOrBaseClass.symbols b/tests/baselines/reference/classWithNoConstructorOrBaseClass.symbols
index 0d26f892dec..efbd022a920 100644
--- a/tests/baselines/reference/classWithNoConstructorOrBaseClass.symbols
+++ b/tests/baselines/reference/classWithNoConstructorOrBaseClass.symbols
@@ -3,7 +3,7 @@ class C {
 >C : Symbol(C, Decl(classWithNoConstructorOrBaseClass.ts, 0, 0))
 
     x: string;
->x : Symbol(x, Decl(classWithNoConstructorOrBaseClass.ts, 0, 9))
+>x : Symbol(C.x, Decl(classWithNoConstructorOrBaseClass.ts, 0, 9))
 }
 
 var c = new C();
@@ -20,11 +20,11 @@ class D<T,U> {
 >U : Symbol(U, Decl(classWithNoConstructorOrBaseClass.ts, 7, 10))
 
     x: T;
->x : Symbol(x, Decl(classWithNoConstructorOrBaseClass.ts, 7, 14))
+>x : Symbol(D.x, Decl(classWithNoConstructorOrBaseClass.ts, 7, 14))
 >T : Symbol(T, Decl(classWithNoConstructorOrBaseClass.ts, 7, 8))
 
     y: U;
->y : Symbol(y, Decl(classWithNoConstructorOrBaseClass.ts, 8, 9))
+>y : Symbol(D.y, Decl(classWithNoConstructorOrBaseClass.ts, 8, 9))
 >U : Symbol(U, Decl(classWithNoConstructorOrBaseClass.ts, 7, 10))
 }
 
diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.symbols b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.symbols
index e30810f5cf9..b09c819cf65 100644
--- a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.symbols
+++ b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.symbols
@@ -5,17 +5,17 @@ class C {
 >C : Symbol(C, Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 0, 0))
 
     public x: string;
->x : Symbol(x, Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 2, 9))
+>x : Symbol(C.x, Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 2, 9))
 
     public y(a: number): number { return null; }
->y : Symbol(y, Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 3, 21))
+>y : Symbol(C.y, Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 3, 21))
 >a : Symbol(a, Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 4, 13))
 
     public get z() { return 1; }
->z : Symbol(z, Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 4, 48), Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 5, 32))
+>z : Symbol(C.z, Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 4, 48), Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 5, 32))
 
     public set z(v) { }
->z : Symbol(z, Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 4, 48), Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 5, 32))
+>z : Symbol(C.z, Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 4, 48), Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 5, 32))
 >v : Symbol(v, Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 6, 17))
 
     [x: string]: Object;
@@ -33,14 +33,14 @@ interface I {
 >I : Symbol(I, Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 10, 1))
 
     x: string;
->x : Symbol(x, Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 12, 13))
+>x : Symbol(I.x, Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 12, 13))
 
     y(b: number): number;
->y : Symbol(y, Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 13, 14))
+>y : Symbol(I.y, Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 13, 14))
 >b : Symbol(b, Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 14, 6))
 
     z: number;
->z : Symbol(z, Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 14, 25))
+>z : Symbol(I.z, Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 14, 25))
 
     [x: string]: Object;
 >x : Symbol(x, Decl(classWithOnlyPublicMembersEquivalentToInterface.ts, 16, 5))
diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.symbols b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.symbols
index 13a716f9e8c..80658b0531c 100644
--- a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.symbols
+++ b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.symbols
@@ -5,17 +5,17 @@ class C {
 >C : Symbol(C, Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 0, 0))
 
     public x: string;
->x : Symbol(x, Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 2, 9))
+>x : Symbol(C.x, Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 2, 9))
 
     public y(a: number): number { return null; }
->y : Symbol(y, Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 3, 21))
+>y : Symbol(C.y, Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 3, 21))
 >a : Symbol(a, Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 4, 13))
 
     public get z() { return 1; }
->z : Symbol(z, Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 4, 48), Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 5, 32))
+>z : Symbol(C.z, Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 4, 48), Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 5, 32))
 
     public set z(v) { }
->z : Symbol(z, Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 4, 48), Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 5, 32))
+>z : Symbol(C.z, Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 4, 48), Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 5, 32))
 >v : Symbol(v, Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 6, 17))
 
     [x: string]: Object;
@@ -36,14 +36,14 @@ interface I {
 >I : Symbol(I, Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 12, 1))
 
     x: string;
->x : Symbol(x, Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 14, 13))
+>x : Symbol(I.x, Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 14, 13))
 
     y(b: number): number;
->y : Symbol(y, Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 15, 14))
+>y : Symbol(I.y, Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 15, 14))
 >b : Symbol(b, Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 16, 6))
 
     z: number;
->z : Symbol(z, Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 16, 25))
+>z : Symbol(I.z, Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 16, 25))
 
     [x: string]: Object;
 >x : Symbol(x, Decl(classWithOnlyPublicMembersEquivalentToInterface2.ts, 18, 5))
diff --git a/tests/baselines/reference/classWithPrivateProperty.errors.txt b/tests/baselines/reference/classWithPrivateProperty.errors.txt
index 93a94e21075..359e5972250 100644
--- a/tests/baselines/reference/classWithPrivateProperty.errors.txt
+++ b/tests/baselines/reference/classWithPrivateProperty.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/conformance/types/members/classWithPrivateProperty.ts(15,18): error TS2341: Property 'x' is private and only accessible within class 'C'.
-tests/cases/conformance/types/members/classWithPrivateProperty.ts(16,18): error TS2341: Property 'a' is private and only accessible within class 'C'.
-tests/cases/conformance/types/members/classWithPrivateProperty.ts(17,18): error TS2341: Property 'b' is private and only accessible within class 'C'.
-tests/cases/conformance/types/members/classWithPrivateProperty.ts(18,18): error TS2341: Property 'c' is private and only accessible within class 'C'.
-tests/cases/conformance/types/members/classWithPrivateProperty.ts(19,18): error TS2341: Property 'd' is private and only accessible within class 'C'.
-tests/cases/conformance/types/members/classWithPrivateProperty.ts(20,18): error TS2341: Property 'e' is private and only accessible within class 'C'.
-tests/cases/conformance/types/members/classWithPrivateProperty.ts(21,18): error TS2341: Property 'f' is private and only accessible within class 'C'.
-tests/cases/conformance/types/members/classWithPrivateProperty.ts(22,18): error TS2341: Property 'g' is private and only accessible within class 'C'.
+tests/cases/conformance/types/members/classWithPrivateProperty.ts(15,20): error TS2341: Property 'x' is private and only accessible within class 'C'.
+tests/cases/conformance/types/members/classWithPrivateProperty.ts(16,20): error TS2341: Property 'a' is private and only accessible within class 'C'.
+tests/cases/conformance/types/members/classWithPrivateProperty.ts(17,20): error TS2341: Property 'b' is private and only accessible within class 'C'.
+tests/cases/conformance/types/members/classWithPrivateProperty.ts(18,20): error TS2341: Property 'c' is private and only accessible within class 'C'.
+tests/cases/conformance/types/members/classWithPrivateProperty.ts(19,20): error TS2341: Property 'd' is private and only accessible within class 'C'.
+tests/cases/conformance/types/members/classWithPrivateProperty.ts(20,20): error TS2341: Property 'e' is private and only accessible within class 'C'.
+tests/cases/conformance/types/members/classWithPrivateProperty.ts(21,20): error TS2341: Property 'f' is private and only accessible within class 'C'.
+tests/cases/conformance/types/members/classWithPrivateProperty.ts(22,20): error TS2341: Property 'g' is private and only accessible within class 'C'.
 
 
 ==== tests/cases/conformance/types/members/classWithPrivateProperty.ts (8 errors) ====
@@ -24,26 +24,26 @@ tests/cases/conformance/types/members/classWithPrivateProperty.ts(22,18): error
     
     var c = new C();
     var r1: string = c.x;
-                     ~~~
+                       ~
 !!! error TS2341: Property 'x' is private and only accessible within class 'C'.
     var r2: string = c.a;
-                     ~~~
+                       ~
 !!! error TS2341: Property 'a' is private and only accessible within class 'C'.
     var r3: string = c.b;
-                     ~~~
+                       ~
 !!! error TS2341: Property 'b' is private and only accessible within class 'C'.
     var r4: string = c.c();
-                     ~~~
+                       ~
 !!! error TS2341: Property 'c' is private and only accessible within class 'C'.
     var r5: string = c.d();
-                     ~~~
+                       ~
 !!! error TS2341: Property 'd' is private and only accessible within class 'C'.
     var r6: string = C.e;
-                     ~~~
+                       ~
 !!! error TS2341: Property 'e' is private and only accessible within class 'C'.
     var r7: string = C.f();
-                     ~~~
+                       ~
 !!! error TS2341: Property 'f' is private and only accessible within class 'C'.
     var r8: string = C.g();
-                     ~~~
+                       ~
 !!! error TS2341: Property 'g' is private and only accessible within class 'C'.
\ No newline at end of file
diff --git a/tests/baselines/reference/classWithProtectedProperty.symbols b/tests/baselines/reference/classWithProtectedProperty.symbols
index 017233081b2..c51b52b4df9 100644
--- a/tests/baselines/reference/classWithProtectedProperty.symbols
+++ b/tests/baselines/reference/classWithProtectedProperty.symbols
@@ -5,19 +5,19 @@ class C {
 >C : Symbol(C, Decl(classWithProtectedProperty.ts, 0, 0))
 
     protected x;
->x : Symbol(x, Decl(classWithProtectedProperty.ts, 2, 9))
+>x : Symbol(C.x, Decl(classWithProtectedProperty.ts, 2, 9))
 
     protected a = '';
->a : Symbol(a, Decl(classWithProtectedProperty.ts, 3, 16))
+>a : Symbol(C.a, Decl(classWithProtectedProperty.ts, 3, 16))
 
     protected b: string = '';
->b : Symbol(b, Decl(classWithProtectedProperty.ts, 4, 21))
+>b : Symbol(C.b, Decl(classWithProtectedProperty.ts, 4, 21))
 
     protected c() { return '' }
->c : Symbol(c, Decl(classWithProtectedProperty.ts, 5, 29))
+>c : Symbol(C.c, Decl(classWithProtectedProperty.ts, 5, 29))
 
     protected d = () => '';
->d : Symbol(d, Decl(classWithProtectedProperty.ts, 6, 31))
+>d : Symbol(C.d, Decl(classWithProtectedProperty.ts, 6, 31))
 
     protected static e;
 >e : Symbol(C.e, Decl(classWithProtectedProperty.ts, 7, 27))
@@ -34,7 +34,7 @@ class D extends C {
 >C : Symbol(C, Decl(classWithProtectedProperty.ts, 0, 0))
 
     method() {
->method : Symbol(method, Decl(classWithProtectedProperty.ts, 13, 19))
+>method : Symbol(D.method, Decl(classWithProtectedProperty.ts, 13, 19))
 
         // No errors
         var d = new D();
diff --git a/tests/baselines/reference/classWithPublicProperty.symbols b/tests/baselines/reference/classWithPublicProperty.symbols
index 0e3aa272e5d..612d50c4694 100644
--- a/tests/baselines/reference/classWithPublicProperty.symbols
+++ b/tests/baselines/reference/classWithPublicProperty.symbols
@@ -3,19 +3,19 @@ class C {
 >C : Symbol(C, Decl(classWithPublicProperty.ts, 0, 0))
 
     public x;
->x : Symbol(x, Decl(classWithPublicProperty.ts, 0, 9))
+>x : Symbol(C.x, Decl(classWithPublicProperty.ts, 0, 9))
 
     public a = '';
->a : Symbol(a, Decl(classWithPublicProperty.ts, 1, 13))
+>a : Symbol(C.a, Decl(classWithPublicProperty.ts, 1, 13))
 
     public b: string = '';
->b : Symbol(b, Decl(classWithPublicProperty.ts, 2, 18))
+>b : Symbol(C.b, Decl(classWithPublicProperty.ts, 2, 18))
 
     public c() { return '' }
->c : Symbol(c, Decl(classWithPublicProperty.ts, 3, 26))
+>c : Symbol(C.c, Decl(classWithPublicProperty.ts, 3, 26))
 
     public d = () => '';
->d : Symbol(d, Decl(classWithPublicProperty.ts, 4, 28))
+>d : Symbol(C.d, Decl(classWithPublicProperty.ts, 4, 28))
 
     public static e;
 >e : Symbol(C.e, Decl(classWithPublicProperty.ts, 5, 24))
diff --git a/tests/baselines/reference/classdecl.symbols b/tests/baselines/reference/classdecl.symbols
index ad355e23517..68c7a632c10 100644
--- a/tests/baselines/reference/classdecl.symbols
+++ b/tests/baselines/reference/classdecl.symbols
@@ -15,18 +15,18 @@ class a {
     }
 
     public pgF() { }
->pgF : Symbol(pgF, Decl(classdecl.ts, 6, 5))
+>pgF : Symbol(a.pgF, Decl(classdecl.ts, 6, 5))
 
     public pv;
->pv : Symbol(pv, Decl(classdecl.ts, 8, 20))
+>pv : Symbol(a.pv, Decl(classdecl.ts, 8, 20))
 
     public get d() {
->d : Symbol(d, Decl(classdecl.ts, 10, 14), Decl(classdecl.ts, 13, 5))
+>d : Symbol(a.d, Decl(classdecl.ts, 10, 14), Decl(classdecl.ts, 13, 5))
 
         return 30;
     }
     public set d(a: number) {
->d : Symbol(d, Decl(classdecl.ts, 10, 14), Decl(classdecl.ts, 13, 5))
+>d : Symbol(a.d, Decl(classdecl.ts, 10, 14), Decl(classdecl.ts, 13, 5))
 >a : Symbol(a, Decl(classdecl.ts, 14, 17))
     }
 
@@ -47,18 +47,18 @@ class a {
         return "string";
     }
     private pv3;
->pv3 : Symbol(pv3, Decl(classdecl.ts, 25, 5))
+>pv3 : Symbol(a.pv3, Decl(classdecl.ts, 25, 5))
 
     private foo(n: number): string;
->foo : Symbol(foo, Decl(classdecl.ts, 26, 16), Decl(classdecl.ts, 28, 35), Decl(classdecl.ts, 29, 35))
+>foo : Symbol(a.foo, Decl(classdecl.ts, 26, 16), Decl(classdecl.ts, 28, 35), Decl(classdecl.ts, 29, 35))
 >n : Symbol(n, Decl(classdecl.ts, 28, 16))
 
     private foo(s: string): string;
->foo : Symbol(foo, Decl(classdecl.ts, 26, 16), Decl(classdecl.ts, 28, 35), Decl(classdecl.ts, 29, 35))
+>foo : Symbol(a.foo, Decl(classdecl.ts, 26, 16), Decl(classdecl.ts, 28, 35), Decl(classdecl.ts, 29, 35))
 >s : Symbol(s, Decl(classdecl.ts, 29, 16))
 
     private foo(ns: any) {
->foo : Symbol(foo, Decl(classdecl.ts, 26, 16), Decl(classdecl.ts, 28, 35), Decl(classdecl.ts, 29, 35))
+>foo : Symbol(a.foo, Decl(classdecl.ts, 26, 16), Decl(classdecl.ts, 28, 35), Decl(classdecl.ts, 29, 35))
 >ns : Symbol(ns, Decl(classdecl.ts, 30, 16))
 
         return ns.toString();
@@ -130,13 +130,13 @@ declare class aAmbient {
 >s : Symbol(s, Decl(classdecl.ts, 67, 17))
 
     public pgF(): void;
->pgF : Symbol(pgF, Decl(classdecl.ts, 67, 28))
+>pgF : Symbol(aAmbient.pgF, Decl(classdecl.ts, 67, 28))
 
     public pv;
->pv : Symbol(pv, Decl(classdecl.ts, 68, 23))
+>pv : Symbol(aAmbient.pv, Decl(classdecl.ts, 68, 23))
 
     public d : number;
->d : Symbol(d, Decl(classdecl.ts, 69, 14))
+>d : Symbol(aAmbient.d, Decl(classdecl.ts, 69, 14))
 
     static p2 : { x: number; y: number; };
 >p2 : Symbol(aAmbient.p2, Decl(classdecl.ts, 70, 22))
@@ -150,10 +150,10 @@ declare class aAmbient {
 >p3 : Symbol(aAmbient.p3, Decl(classdecl.ts, 72, 16))
 
     private pv3;
->pv3 : Symbol(pv3, Decl(classdecl.ts, 73, 14))
+>pv3 : Symbol(aAmbient.pv3, Decl(classdecl.ts, 73, 14))
 
     private foo(s);
->foo : Symbol(foo, Decl(classdecl.ts, 74, 16))
+>foo : Symbol(aAmbient.foo, Decl(classdecl.ts, 74, 16))
 >s : Symbol(s, Decl(classdecl.ts, 75, 16))
 }
 
@@ -161,15 +161,15 @@ class d {
 >d : Symbol(d, Decl(classdecl.ts, 76, 1))
 
     private foo(n: number): string;
->foo : Symbol(foo, Decl(classdecl.ts, 78, 9), Decl(classdecl.ts, 79, 35), Decl(classdecl.ts, 80, 35))
+>foo : Symbol(d.foo, Decl(classdecl.ts, 78, 9), Decl(classdecl.ts, 79, 35), Decl(classdecl.ts, 80, 35))
 >n : Symbol(n, Decl(classdecl.ts, 79, 16))
 
     private foo(s: string): string;
->foo : Symbol(foo, Decl(classdecl.ts, 78, 9), Decl(classdecl.ts, 79, 35), Decl(classdecl.ts, 80, 35))
+>foo : Symbol(d.foo, Decl(classdecl.ts, 78, 9), Decl(classdecl.ts, 79, 35), Decl(classdecl.ts, 80, 35))
 >s : Symbol(s, Decl(classdecl.ts, 80, 16))
 
     private foo(ns: any) {
->foo : Symbol(foo, Decl(classdecl.ts, 78, 9), Decl(classdecl.ts, 79, 35), Decl(classdecl.ts, 80, 35))
+>foo : Symbol(d.foo, Decl(classdecl.ts, 78, 9), Decl(classdecl.ts, 79, 35), Decl(classdecl.ts, 80, 35))
 >ns : Symbol(ns, Decl(classdecl.ts, 81, 16))
 
         return ns.toString();
@@ -181,15 +181,15 @@ class e {
 >e : Symbol(e, Decl(classdecl.ts, 84, 1))
 
     private foo(s: string): string;
->foo : Symbol(foo, Decl(classdecl.ts, 86, 9), Decl(classdecl.ts, 87, 35), Decl(classdecl.ts, 88, 35))
+>foo : Symbol(e.foo, Decl(classdecl.ts, 86, 9), Decl(classdecl.ts, 87, 35), Decl(classdecl.ts, 88, 35))
 >s : Symbol(s, Decl(classdecl.ts, 87, 16))
 
     private foo(n: number): string;
->foo : Symbol(foo, Decl(classdecl.ts, 86, 9), Decl(classdecl.ts, 87, 35), Decl(classdecl.ts, 88, 35))
+>foo : Symbol(e.foo, Decl(classdecl.ts, 86, 9), Decl(classdecl.ts, 87, 35), Decl(classdecl.ts, 88, 35))
 >n : Symbol(n, Decl(classdecl.ts, 88, 16))
 
     private foo(ns: any) {
->foo : Symbol(foo, Decl(classdecl.ts, 86, 9), Decl(classdecl.ts, 87, 35), Decl(classdecl.ts, 88, 35))
+>foo : Symbol(e.foo, Decl(classdecl.ts, 86, 9), Decl(classdecl.ts, 87, 35), Decl(classdecl.ts, 88, 35))
 >ns : Symbol(ns, Decl(classdecl.ts, 89, 16))
 
         return ns.toString();
diff --git a/tests/baselines/reference/clinterfaces.symbols b/tests/baselines/reference/clinterfaces.symbols
index 76c7d74b521..0c0bf5ba3a3 100644
--- a/tests/baselines/reference/clinterfaces.symbols
+++ b/tests/baselines/reference/clinterfaces.symbols
@@ -20,7 +20,7 @@ interface Foo<T> {
 >T : Symbol(T, Decl(clinterfaces.ts, 7, 14), Decl(clinterfaces.ts, 11, 10))
 
     a: string;
->a : Symbol(a, Decl(clinterfaces.ts, 7, 18))
+>a : Symbol(Foo.a, Decl(clinterfaces.ts, 7, 18))
 }
 
 class Foo<T>{
@@ -28,7 +28,7 @@ class Foo<T>{
 >T : Symbol(T, Decl(clinterfaces.ts, 7, 14), Decl(clinterfaces.ts, 11, 10))
 
     b: number;
->b : Symbol(b, Decl(clinterfaces.ts, 11, 13))
+>b : Symbol(Foo.b, Decl(clinterfaces.ts, 11, 13))
 }
 
 class Bar<T>{
@@ -36,7 +36,7 @@ class Bar<T>{
 >T : Symbol(T, Decl(clinterfaces.ts, 15, 10), Decl(clinterfaces.ts, 19, 14))
 
     b: number;
->b : Symbol(b, Decl(clinterfaces.ts, 15, 13))
+>b : Symbol(Bar.b, Decl(clinterfaces.ts, 15, 13))
 }
 
 interface Bar<T> {
@@ -44,7 +44,7 @@ interface Bar<T> {
 >T : Symbol(T, Decl(clinterfaces.ts, 15, 10), Decl(clinterfaces.ts, 19, 14))
 
     a: string;
->a : Symbol(a, Decl(clinterfaces.ts, 19, 18))
+>a : Symbol(Bar.a, Decl(clinterfaces.ts, 19, 18))
 }
 
 export = Foo;
diff --git a/tests/baselines/reference/cloduleAcrossModuleDefinitions.symbols b/tests/baselines/reference/cloduleAcrossModuleDefinitions.symbols
index 7be8383355c..c0821b54c69 100644
--- a/tests/baselines/reference/cloduleAcrossModuleDefinitions.symbols
+++ b/tests/baselines/reference/cloduleAcrossModuleDefinitions.symbols
@@ -6,7 +6,7 @@ module A {
 >B : Symbol(B, Decl(cloduleAcrossModuleDefinitions.ts, 0, 10), Decl(cloduleAcrossModuleDefinitions.ts, 7, 10))
 
         foo() { }
->foo : Symbol(foo, Decl(cloduleAcrossModuleDefinitions.ts, 1, 20))
+>foo : Symbol(B.foo, Decl(cloduleAcrossModuleDefinitions.ts, 1, 20))
 
         static bar() { }
 >bar : Symbol(B.bar, Decl(cloduleAcrossModuleDefinitions.ts, 2, 17))
diff --git a/tests/baselines/reference/cloduleAndTypeParameters.symbols b/tests/baselines/reference/cloduleAndTypeParameters.symbols
index f2d96346495..5a1b5cf18dc 100644
--- a/tests/baselines/reference/cloduleAndTypeParameters.symbols
+++ b/tests/baselines/reference/cloduleAndTypeParameters.symbols
@@ -16,7 +16,7 @@ module Foo {
 >Bar : Symbol(Bar, Decl(cloduleAndTypeParameters.ts, 5, 12))
 
     bar(): void;
->bar : Symbol(bar, Decl(cloduleAndTypeParameters.ts, 6, 24))
+>bar : Symbol(Bar.bar, Decl(cloduleAndTypeParameters.ts, 6, 24))
   }
 
   export class Baz {
diff --git a/tests/baselines/reference/cloduleStaticMembers.errors.txt b/tests/baselines/reference/cloduleStaticMembers.errors.txt
index 914fea72424..a8fe560bac7 100644
--- a/tests/baselines/reference/cloduleStaticMembers.errors.txt
+++ b/tests/baselines/reference/cloduleStaticMembers.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/cloduleStaticMembers.ts(6,13): error TS2341: Property 'x' is private and only accessible within class 'Clod'.
+tests/cases/compiler/cloduleStaticMembers.ts(6,18): error TS2341: Property 'x' is private and only accessible within class 'Clod'.
 tests/cases/compiler/cloduleStaticMembers.ts(7,13): error TS2304: Cannot find name 'x'.
 tests/cases/compiler/cloduleStaticMembers.ts(10,13): error TS2304: Cannot find name 'y'.
 
@@ -10,7 +10,7 @@ tests/cases/compiler/cloduleStaticMembers.ts(10,13): error TS2304: Cannot find n
     }
     module Clod {
         var p = Clod.x;
-                ~~~~~~
+                     ~
 !!! error TS2341: Property 'x' is private and only accessible within class 'Clod'.
         var q = x;
                 ~
diff --git a/tests/baselines/reference/cloduleTest1.symbols b/tests/baselines/reference/cloduleTest1.symbols
index 01759cfa136..11e1967d16f 100644
--- a/tests/baselines/reference/cloduleTest1.symbols
+++ b/tests/baselines/reference/cloduleTest1.symbols
@@ -8,7 +8,7 @@
 >$ : Symbol($, Decl(cloduleTest1.ts, 0, 0), Decl(cloduleTest1.ts, 0, 42), Decl(cloduleTest1.ts, 3, 3))
 
       addClass(className: string): $;
->addClass : Symbol(addClass, Decl(cloduleTest1.ts, 1, 15))
+>addClass : Symbol($.addClass, Decl(cloduleTest1.ts, 1, 15))
 >className : Symbol(className, Decl(cloduleTest1.ts, 2, 15))
 >$ : Symbol($, Decl(cloduleTest1.ts, 0, 0), Decl(cloduleTest1.ts, 0, 42), Decl(cloduleTest1.ts, 3, 3))
   }
diff --git a/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.symbols b/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.symbols
index 7f93d361dd9..be76ccfbfad 100644
--- a/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.symbols
+++ b/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.symbols
@@ -7,7 +7,7 @@ module Moclodule {
 >Someinterface : Symbol(Someinterface, Decl(cloduleWithPriorUninstantiatedModule.ts, 1, 18))
 
         foo(): void;
->foo : Symbol(foo, Decl(cloduleWithPriorUninstantiatedModule.ts, 2, 36))
+>foo : Symbol(Someinterface.foo, Decl(cloduleWithPriorUninstantiatedModule.ts, 2, 36))
     }
 }
 
diff --git a/tests/baselines/reference/collisionArgumentsInterfaceMembers.symbols b/tests/baselines/reference/collisionArgumentsInterfaceMembers.symbols
index a8856c37a4c..f0a82bec521 100644
--- a/tests/baselines/reference/collisionArgumentsInterfaceMembers.symbols
+++ b/tests/baselines/reference/collisionArgumentsInterfaceMembers.symbols
@@ -48,16 +48,16 @@ interface i3 {
 >i3 : Symbol(i3, Decl(collisionArgumentsInterfaceMembers.ts, 20, 1))
 
     foo(i: number, ...arguments); // no error - no code gen
->foo : Symbol(foo, Decl(collisionArgumentsInterfaceMembers.ts, 23, 14))
+>foo : Symbol(i3.foo, Decl(collisionArgumentsInterfaceMembers.ts, 23, 14))
 >i : Symbol(i, Decl(collisionArgumentsInterfaceMembers.ts, 24, 8))
 >arguments : Symbol(arguments, Decl(collisionArgumentsInterfaceMembers.ts, 24, 18))
 
     foo1(arguments: number, ...rest); // no error - no code gen
->foo1 : Symbol(foo1, Decl(collisionArgumentsInterfaceMembers.ts, 24, 33))
+>foo1 : Symbol(i3.foo1, Decl(collisionArgumentsInterfaceMembers.ts, 24, 33))
 >arguments : Symbol(arguments, Decl(collisionArgumentsInterfaceMembers.ts, 25, 9))
 >rest : Symbol(rest, Decl(collisionArgumentsInterfaceMembers.ts, 25, 27))
 
     fooNoError(arguments: number);  // no error
->fooNoError : Symbol(fooNoError, Decl(collisionArgumentsInterfaceMembers.ts, 25, 37))
+>fooNoError : Symbol(i3.fooNoError, Decl(collisionArgumentsInterfaceMembers.ts, 25, 37))
 >arguments : Symbol(arguments, Decl(collisionArgumentsInterfaceMembers.ts, 26, 15))
 }
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.symbols b/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.symbols
index 28665abd098..ce003b9c878 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.symbols
+++ b/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.symbols
@@ -23,7 +23,7 @@ module M {
 >d : Symbol(d, Decl(collisionCodeGenModuleWithConstructorChildren.ts, 8, 10))
 
         constructor(private M, p = x) {
->M : Symbol(M, Decl(collisionCodeGenModuleWithConstructorChildren.ts, 10, 20))
+>M : Symbol(d.M, Decl(collisionCodeGenModuleWithConstructorChildren.ts, 10, 20))
 >p : Symbol(p, Decl(collisionCodeGenModuleWithConstructorChildren.ts, 10, 30))
 >x : Symbol(x, Decl(collisionCodeGenModuleWithConstructorChildren.ts, 1, 14))
         }
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.symbols b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.symbols
index 02105ce42e6..87c90bfb480 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.symbols
+++ b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.symbols
@@ -9,7 +9,7 @@ module M {
 >c : Symbol(c, Decl(collisionCodeGenModuleWithMethodChildren.ts, 1, 21))
 
         fn(M, p = x) { }
->fn : Symbol(fn, Decl(collisionCodeGenModuleWithMethodChildren.ts, 2, 13))
+>fn : Symbol(c.fn, Decl(collisionCodeGenModuleWithMethodChildren.ts, 2, 13))
 >M : Symbol(M, Decl(collisionCodeGenModuleWithMethodChildren.ts, 3, 11))
 >p : Symbol(p, Decl(collisionCodeGenModuleWithMethodChildren.ts, 3, 13))
 >x : Symbol(x, Decl(collisionCodeGenModuleWithMethodChildren.ts, 1, 14))
@@ -23,7 +23,7 @@ module M {
 >d : Symbol(d, Decl(collisionCodeGenModuleWithMethodChildren.ts, 7, 10))
 
         fn2() {
->fn2 : Symbol(fn2, Decl(collisionCodeGenModuleWithMethodChildren.ts, 8, 13))
+>fn2 : Symbol(d.fn2, Decl(collisionCodeGenModuleWithMethodChildren.ts, 8, 13))
 
             var M;
 >M : Symbol(M, Decl(collisionCodeGenModuleWithMethodChildren.ts, 10, 15))
@@ -42,7 +42,7 @@ module M {
 >e : Symbol(e, Decl(collisionCodeGenModuleWithMethodChildren.ts, 16, 10))
 
         fn3() {
->fn3 : Symbol(fn3, Decl(collisionCodeGenModuleWithMethodChildren.ts, 17, 13))
+>fn3 : Symbol(e.fn3, Decl(collisionCodeGenModuleWithMethodChildren.ts, 17, 13))
 
             function M() {
 >M : Symbol(M, Decl(collisionCodeGenModuleWithMethodChildren.ts, 18, 15))
@@ -62,7 +62,7 @@ module M { // Shouldnt bn _M
 >f : Symbol(f, Decl(collisionCodeGenModuleWithMethodChildren.ts, 26, 10))
 
         M() {
->M : Symbol(M, Decl(collisionCodeGenModuleWithMethodChildren.ts, 27, 13))
+>M : Symbol(f.M, Decl(collisionCodeGenModuleWithMethodChildren.ts, 27, 13))
         }
     }
 }
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/collisionRestParameterClassConstructor.symbols b/tests/baselines/reference/collisionRestParameterClassConstructor.symbols
index 895cb0f8df4..4b1f20cc26e 100644
--- a/tests/baselines/reference/collisionRestParameterClassConstructor.symbols
+++ b/tests/baselines/reference/collisionRestParameterClassConstructor.symbols
@@ -45,7 +45,7 @@ class c3 {
 >c3 : Symbol(c3, Decl(collisionRestParameterClassConstructor.ts, 21, 1))
 
     constructor(public _i: number, ...restParameters) { //_i is error
->_i : Symbol(_i, Decl(collisionRestParameterClassConstructor.ts, 24, 16))
+>_i : Symbol(c3._i, Decl(collisionRestParameterClassConstructor.ts, 24, 16))
 >restParameters : Symbol(restParameters, Decl(collisionRestParameterClassConstructor.ts, 24, 34))
 
         var _i = 10; // no error
@@ -56,7 +56,7 @@ class c3NoError {
 >c3NoError : Symbol(c3NoError, Decl(collisionRestParameterClassConstructor.ts, 27, 1))
 
     constructor(public _i: number) { // no error
->_i : Symbol(_i, Decl(collisionRestParameterClassConstructor.ts, 29, 16))
+>_i : Symbol(c3NoError._i, Decl(collisionRestParameterClassConstructor.ts, 29, 16))
 
         var _i = 10; // no error
 >_i : Symbol(_i, Decl(collisionRestParameterClassConstructor.ts, 29, 16), Decl(collisionRestParameterClassConstructor.ts, 30, 11))
diff --git a/tests/baselines/reference/collisionRestParameterClassMethod.symbols b/tests/baselines/reference/collisionRestParameterClassMethod.symbols
index 838736e33ce..e7f975b26b3 100644
--- a/tests/baselines/reference/collisionRestParameterClassMethod.symbols
+++ b/tests/baselines/reference/collisionRestParameterClassMethod.symbols
@@ -3,7 +3,7 @@ class c1 {
 >c1 : Symbol(c1, Decl(collisionRestParameterClassMethod.ts, 0, 0))
 
     public foo(_i: number, ...restParameters) { //_i is error
->foo : Symbol(foo, Decl(collisionRestParameterClassMethod.ts, 0, 10))
+>foo : Symbol(c1.foo, Decl(collisionRestParameterClassMethod.ts, 0, 10))
 >_i : Symbol(_i, Decl(collisionRestParameterClassMethod.ts, 1, 15), Decl(collisionRestParameterClassMethod.ts, 2, 11))
 >restParameters : Symbol(restParameters, Decl(collisionRestParameterClassMethod.ts, 1, 26))
 
@@ -11,24 +11,24 @@ class c1 {
 >_i : Symbol(_i, Decl(collisionRestParameterClassMethod.ts, 1, 15), Decl(collisionRestParameterClassMethod.ts, 2, 11))
     }
     public fooNoError(_i: number) { // no error
->fooNoError : Symbol(fooNoError, Decl(collisionRestParameterClassMethod.ts, 3, 5))
+>fooNoError : Symbol(c1.fooNoError, Decl(collisionRestParameterClassMethod.ts, 3, 5))
 >_i : Symbol(_i, Decl(collisionRestParameterClassMethod.ts, 4, 22), Decl(collisionRestParameterClassMethod.ts, 5, 11))
 
         var _i = 10; // no error
 >_i : Symbol(_i, Decl(collisionRestParameterClassMethod.ts, 4, 22), Decl(collisionRestParameterClassMethod.ts, 5, 11))
     }
     public f4(_i: number, ...rest); // no codegen no error
->f4 : Symbol(f4, Decl(collisionRestParameterClassMethod.ts, 6, 5), Decl(collisionRestParameterClassMethod.ts, 7, 35), Decl(collisionRestParameterClassMethod.ts, 8, 35))
+>f4 : Symbol(c1.f4, Decl(collisionRestParameterClassMethod.ts, 6, 5), Decl(collisionRestParameterClassMethod.ts, 7, 35), Decl(collisionRestParameterClassMethod.ts, 8, 35))
 >_i : Symbol(_i, Decl(collisionRestParameterClassMethod.ts, 7, 14))
 >rest : Symbol(rest, Decl(collisionRestParameterClassMethod.ts, 7, 25))
 
     public f4(_i: string, ...rest); // no codegen no error
->f4 : Symbol(f4, Decl(collisionRestParameterClassMethod.ts, 6, 5), Decl(collisionRestParameterClassMethod.ts, 7, 35), Decl(collisionRestParameterClassMethod.ts, 8, 35))
+>f4 : Symbol(c1.f4, Decl(collisionRestParameterClassMethod.ts, 6, 5), Decl(collisionRestParameterClassMethod.ts, 7, 35), Decl(collisionRestParameterClassMethod.ts, 8, 35))
 >_i : Symbol(_i, Decl(collisionRestParameterClassMethod.ts, 8, 14))
 >rest : Symbol(rest, Decl(collisionRestParameterClassMethod.ts, 8, 25))
 
     public f4(_i: any, ...rest) { // error
->f4 : Symbol(f4, Decl(collisionRestParameterClassMethod.ts, 6, 5), Decl(collisionRestParameterClassMethod.ts, 7, 35), Decl(collisionRestParameterClassMethod.ts, 8, 35))
+>f4 : Symbol(c1.f4, Decl(collisionRestParameterClassMethod.ts, 6, 5), Decl(collisionRestParameterClassMethod.ts, 7, 35), Decl(collisionRestParameterClassMethod.ts, 8, 35))
 >_i : Symbol(_i, Decl(collisionRestParameterClassMethod.ts, 9, 14), Decl(collisionRestParameterClassMethod.ts, 10, 11))
 >rest : Symbol(rest, Decl(collisionRestParameterClassMethod.ts, 9, 22))
 
@@ -37,15 +37,15 @@ class c1 {
     }
 
     public f4NoError(_i: number); // no error
->f4NoError : Symbol(f4NoError, Decl(collisionRestParameterClassMethod.ts, 11, 5), Decl(collisionRestParameterClassMethod.ts, 13, 33), Decl(collisionRestParameterClassMethod.ts, 14, 33))
+>f4NoError : Symbol(c1.f4NoError, Decl(collisionRestParameterClassMethod.ts, 11, 5), Decl(collisionRestParameterClassMethod.ts, 13, 33), Decl(collisionRestParameterClassMethod.ts, 14, 33))
 >_i : Symbol(_i, Decl(collisionRestParameterClassMethod.ts, 13, 21))
 
     public f4NoError(_i: string); // no error
->f4NoError : Symbol(f4NoError, Decl(collisionRestParameterClassMethod.ts, 11, 5), Decl(collisionRestParameterClassMethod.ts, 13, 33), Decl(collisionRestParameterClassMethod.ts, 14, 33))
+>f4NoError : Symbol(c1.f4NoError, Decl(collisionRestParameterClassMethod.ts, 11, 5), Decl(collisionRestParameterClassMethod.ts, 13, 33), Decl(collisionRestParameterClassMethod.ts, 14, 33))
 >_i : Symbol(_i, Decl(collisionRestParameterClassMethod.ts, 14, 21))
 
     public f4NoError(_i: any) { // no error
->f4NoError : Symbol(f4NoError, Decl(collisionRestParameterClassMethod.ts, 11, 5), Decl(collisionRestParameterClassMethod.ts, 13, 33), Decl(collisionRestParameterClassMethod.ts, 14, 33))
+>f4NoError : Symbol(c1.f4NoError, Decl(collisionRestParameterClassMethod.ts, 11, 5), Decl(collisionRestParameterClassMethod.ts, 13, 33), Decl(collisionRestParameterClassMethod.ts, 14, 33))
 >_i : Symbol(_i, Decl(collisionRestParameterClassMethod.ts, 15, 21), Decl(collisionRestParameterClassMethod.ts, 16, 11))
 
         var _i: any; // no error
@@ -57,30 +57,30 @@ declare class c2 {
 >c2 : Symbol(c2, Decl(collisionRestParameterClassMethod.ts, 18, 1))
 
     public foo(_i: number, ...restParameters); // No error - no code gen
->foo : Symbol(foo, Decl(collisionRestParameterClassMethod.ts, 20, 18))
+>foo : Symbol(c2.foo, Decl(collisionRestParameterClassMethod.ts, 20, 18))
 >_i : Symbol(_i, Decl(collisionRestParameterClassMethod.ts, 21, 15))
 >restParameters : Symbol(restParameters, Decl(collisionRestParameterClassMethod.ts, 21, 26))
 
     public fooNoError(_i: number); // no error
->fooNoError : Symbol(fooNoError, Decl(collisionRestParameterClassMethod.ts, 21, 46))
+>fooNoError : Symbol(c2.fooNoError, Decl(collisionRestParameterClassMethod.ts, 21, 46))
 >_i : Symbol(_i, Decl(collisionRestParameterClassMethod.ts, 22, 22))
 
     public f4(_i: number, ...rest); // no codegen no error
->f4 : Symbol(f4, Decl(collisionRestParameterClassMethod.ts, 22, 34), Decl(collisionRestParameterClassMethod.ts, 24, 35))
+>f4 : Symbol(c2.f4, Decl(collisionRestParameterClassMethod.ts, 22, 34), Decl(collisionRestParameterClassMethod.ts, 24, 35))
 >_i : Symbol(_i, Decl(collisionRestParameterClassMethod.ts, 24, 14))
 >rest : Symbol(rest, Decl(collisionRestParameterClassMethod.ts, 24, 25))
 
     public f4(_i: string, ...rest); // no codegen no error
->f4 : Symbol(f4, Decl(collisionRestParameterClassMethod.ts, 22, 34), Decl(collisionRestParameterClassMethod.ts, 24, 35))
+>f4 : Symbol(c2.f4, Decl(collisionRestParameterClassMethod.ts, 22, 34), Decl(collisionRestParameterClassMethod.ts, 24, 35))
 >_i : Symbol(_i, Decl(collisionRestParameterClassMethod.ts, 25, 14))
 >rest : Symbol(rest, Decl(collisionRestParameterClassMethod.ts, 25, 25))
 
     public f4NoError(_i: number); // no error
->f4NoError : Symbol(f4NoError, Decl(collisionRestParameterClassMethod.ts, 25, 35), Decl(collisionRestParameterClassMethod.ts, 26, 33))
+>f4NoError : Symbol(c2.f4NoError, Decl(collisionRestParameterClassMethod.ts, 25, 35), Decl(collisionRestParameterClassMethod.ts, 26, 33))
 >_i : Symbol(_i, Decl(collisionRestParameterClassMethod.ts, 26, 21))
 
     public f4NoError(_i: string); // no error
->f4NoError : Symbol(f4NoError, Decl(collisionRestParameterClassMethod.ts, 25, 35), Decl(collisionRestParameterClassMethod.ts, 26, 33))
+>f4NoError : Symbol(c2.f4NoError, Decl(collisionRestParameterClassMethod.ts, 25, 35), Decl(collisionRestParameterClassMethod.ts, 26, 33))
 >_i : Symbol(_i, Decl(collisionRestParameterClassMethod.ts, 27, 21))
 }
 
@@ -88,14 +88,14 @@ class c3 {
 >c3 : Symbol(c3, Decl(collisionRestParameterClassMethod.ts, 28, 1))
 
     public foo(...restParameters) {
->foo : Symbol(foo, Decl(collisionRestParameterClassMethod.ts, 30, 10))
+>foo : Symbol(c3.foo, Decl(collisionRestParameterClassMethod.ts, 30, 10))
 >restParameters : Symbol(restParameters, Decl(collisionRestParameterClassMethod.ts, 31, 15))
 
         var _i = 10; // no error
 >_i : Symbol(_i, Decl(collisionRestParameterClassMethod.ts, 32, 11))
     }
     public fooNoError() {
->fooNoError : Symbol(fooNoError, Decl(collisionRestParameterClassMethod.ts, 33, 5))
+>fooNoError : Symbol(c3.fooNoError, Decl(collisionRestParameterClassMethod.ts, 33, 5))
 
         var _i = 10; // no error
 >_i : Symbol(_i, Decl(collisionRestParameterClassMethod.ts, 35, 11))
diff --git a/tests/baselines/reference/collisionRestParameterInterfaceMembers.symbols b/tests/baselines/reference/collisionRestParameterInterfaceMembers.symbols
index 448346c0838..4c99c7eec06 100644
--- a/tests/baselines/reference/collisionRestParameterInterfaceMembers.symbols
+++ b/tests/baselines/reference/collisionRestParameterInterfaceMembers.symbols
@@ -34,11 +34,11 @@ interface i3 {
 >i3 : Symbol(i3, Decl(collisionRestParameterInterfaceMembers.ts, 14, 1))
 
     foo (_i: number, ...restParameters); // no error - no code gen
->foo : Symbol(foo, Decl(collisionRestParameterInterfaceMembers.ts, 17, 14))
+>foo : Symbol(i3.foo, Decl(collisionRestParameterInterfaceMembers.ts, 17, 14))
 >_i : Symbol(_i, Decl(collisionRestParameterInterfaceMembers.ts, 18, 9))
 >restParameters : Symbol(restParameters, Decl(collisionRestParameterInterfaceMembers.ts, 18, 20))
 
     fooNoError (_i: number);  // no error
->fooNoError : Symbol(fooNoError, Decl(collisionRestParameterInterfaceMembers.ts, 18, 40))
+>fooNoError : Symbol(i3.fooNoError, Decl(collisionRestParameterInterfaceMembers.ts, 18, 40))
 >_i : Symbol(_i, Decl(collisionRestParameterInterfaceMembers.ts, 19, 16))
 }
diff --git a/tests/baselines/reference/commaOperatorWithSecondOperandObjectType.symbols b/tests/baselines/reference/commaOperatorWithSecondOperandObjectType.symbols
index 3b8473318c0..6df26708078 100644
--- a/tests/baselines/reference/commaOperatorWithSecondOperandObjectType.symbols
+++ b/tests/baselines/reference/commaOperatorWithSecondOperandObjectType.symbols
@@ -19,7 +19,7 @@ class CLASS {
 >CLASS : Symbol(CLASS, Decl(commaOperatorWithSecondOperandObjectType.ts, 4, 19))
 
     num: number;
->num : Symbol(num, Decl(commaOperatorWithSecondOperandObjectType.ts, 6, 13))
+>num : Symbol(CLASS.num, Decl(commaOperatorWithSecondOperandObjectType.ts, 6, 13))
 }
 
 //The second operand type is Object
@@ -82,7 +82,7 @@ true, {}
 >BOOLEAN : Symbol(BOOLEAN, Decl(commaOperatorWithSecondOperandObjectType.ts, 1, 3))
 
 "string", new Date()
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 STRING.toLowerCase(), new CLASS()
 >STRING.toLowerCase : Symbol(String.toLowerCase, Decl(lib.d.ts, --, --))
@@ -110,7 +110,7 @@ var resultIsObject9 = (!BOOLEAN, { a: 1, b: "s" });
 
 var resultIsObject10 = ("string", new Date());
 >resultIsObject10 : Symbol(resultIsObject10, Decl(commaOperatorWithSecondOperandObjectType.ts, 36, 3))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var resultIsObject11 = (STRING.toLowerCase(), new CLASS());
 >resultIsObject11 : Symbol(resultIsObject11, Decl(commaOperatorWithSecondOperandObjectType.ts, 37, 3))
diff --git a/tests/baselines/reference/commaOperatorWithSecondOperandStringType.symbols b/tests/baselines/reference/commaOperatorWithSecondOperandStringType.symbols
index 3c674237a21..2d9fc665a81 100644
--- a/tests/baselines/reference/commaOperatorWithSecondOperandStringType.symbols
+++ b/tests/baselines/reference/commaOperatorWithSecondOperandStringType.symbols
@@ -71,7 +71,7 @@ null, STRING;
 
 ANY = new Date(), STRING;
 >ANY : Symbol(ANY, Decl(commaOperatorWithSecondOperandStringType.ts, 0, 3))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >STRING : Symbol(STRING, Decl(commaOperatorWithSecondOperandStringType.ts, 3, 3))
 
 true, "";
@@ -96,7 +96,7 @@ var resultIsString6 = (null, STRING);
 var resultIsString7 = (ANY = new Date(), STRING);
 >resultIsString7 : Symbol(resultIsString7, Decl(commaOperatorWithSecondOperandStringType.ts, 31, 3))
 >ANY : Symbol(ANY, Decl(commaOperatorWithSecondOperandStringType.ts, 0, 3))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >STRING : Symbol(STRING, Decl(commaOperatorWithSecondOperandStringType.ts, 3, 3))
 
 var resultIsString8 = (true, "");
diff --git a/tests/baselines/reference/commentOnAmbientModule.symbols b/tests/baselines/reference/commentOnAmbientModule.symbols
index e7525e6306f..60d5dfe66fa 100644
--- a/tests/baselines/reference/commentOnAmbientModule.symbols
+++ b/tests/baselines/reference/commentOnAmbientModule.symbols
@@ -10,7 +10,7 @@ declare module E {
 >bar : Symbol(D.bar, Decl(a.ts, 11, 18))
 
         foo();
->foo : Symbol(foo, Decl(b.ts, 2, 32))
+>foo : Symbol(foobar.foo, Decl(b.ts, 2, 32))
     }
 }
 === tests/cases/compiler/a.ts ===
diff --git a/tests/baselines/reference/commentOnClassMethod1.symbols b/tests/baselines/reference/commentOnClassMethod1.symbols
index 18caefb744b..8fdb04c0e10 100644
--- a/tests/baselines/reference/commentOnClassMethod1.symbols
+++ b/tests/baselines/reference/commentOnClassMethod1.symbols
@@ -6,6 +6,6 @@ class WebControls {
      * Render a control
      */
     createControl(): any {
->createControl : Symbol(createControl, Decl(commentOnClassMethod1.ts, 0, 19))
+>createControl : Symbol(WebControls.createControl, Decl(commentOnClassMethod1.ts, 0, 19))
     }
 }
diff --git a/tests/baselines/reference/commentOnSignature1.symbols b/tests/baselines/reference/commentOnSignature1.symbols
index 7f0d48401cd..719544e21e6 100644
--- a/tests/baselines/reference/commentOnSignature1.symbols
+++ b/tests/baselines/reference/commentOnSignature1.symbols
@@ -51,16 +51,16 @@ class c {
 
     // dont keep this comment
     foo(a: string);
->foo : Symbol(foo, Decl(a.ts, 18, 5), Decl(a.ts, 21, 19), Decl(a.ts, 23, 19))
+>foo : Symbol(c.foo, Decl(a.ts, 18, 5), Decl(a.ts, 21, 19), Decl(a.ts, 23, 19))
 >a : Symbol(a, Decl(a.ts, 21, 8))
 
     /*! keep this pinned comment */
     foo(a: number);
->foo : Symbol(foo, Decl(a.ts, 18, 5), Decl(a.ts, 21, 19), Decl(a.ts, 23, 19))
+>foo : Symbol(c.foo, Decl(a.ts, 18, 5), Decl(a.ts, 21, 19), Decl(a.ts, 23, 19))
 >a : Symbol(a, Decl(a.ts, 23, 8))
 
     foo(a: any) {
->foo : Symbol(foo, Decl(a.ts, 18, 5), Decl(a.ts, 21, 19), Decl(a.ts, 23, 19))
+>foo : Symbol(c.foo, Decl(a.ts, 18, 5), Decl(a.ts, 21, 19), Decl(a.ts, 23, 19))
 >a : Symbol(a, Decl(a.ts, 24, 8))
     }
 }
diff --git a/tests/baselines/reference/commentsAfterFunctionExpression1.js b/tests/baselines/reference/commentsAfterFunctionExpression1.js
new file mode 100644
index 00000000000..7a591391052
--- /dev/null
+++ b/tests/baselines/reference/commentsAfterFunctionExpression1.js
@@ -0,0 +1,14 @@
+//// [commentsAfterFunctionExpression1.ts]
+var v = {
+    f: a => 0 /*t1*/,
+    g: (a => 0) /*t2*/,
+    h: (a => 0 /*t3*/)
+}
+
+
+//// [commentsAfterFunctionExpression1.js]
+var v = {
+    f: function (a) { return 0; } /*t1*/,
+    g: (function (a) { return 0; }) /*t2*/,
+    h: (function (a) { return 0; } /*t3*/)
+};
diff --git a/tests/baselines/reference/commentsAfterFunctionExpression1.symbols b/tests/baselines/reference/commentsAfterFunctionExpression1.symbols
new file mode 100644
index 00000000000..450bb990c89
--- /dev/null
+++ b/tests/baselines/reference/commentsAfterFunctionExpression1.symbols
@@ -0,0 +1,17 @@
+=== tests/cases/compiler/commentsAfterFunctionExpression1.ts ===
+var v = {
+>v : Symbol(v, Decl(commentsAfterFunctionExpression1.ts, 0, 3))
+
+    f: a => 0 /*t1*/,
+>f : Symbol(f, Decl(commentsAfterFunctionExpression1.ts, 0, 9))
+>a : Symbol(a, Decl(commentsAfterFunctionExpression1.ts, 1, 6))
+
+    g: (a => 0) /*t2*/,
+>g : Symbol(g, Decl(commentsAfterFunctionExpression1.ts, 1, 21))
+>a : Symbol(a, Decl(commentsAfterFunctionExpression1.ts, 2, 8))
+
+    h: (a => 0 /*t3*/)
+>h : Symbol(h, Decl(commentsAfterFunctionExpression1.ts, 2, 23))
+>a : Symbol(a, Decl(commentsAfterFunctionExpression1.ts, 3, 8))
+}
+
diff --git a/tests/baselines/reference/commentsAfterFunctionExpression1.types b/tests/baselines/reference/commentsAfterFunctionExpression1.types
new file mode 100644
index 00000000000..4a6b12bc210
--- /dev/null
+++ b/tests/baselines/reference/commentsAfterFunctionExpression1.types
@@ -0,0 +1,26 @@
+=== tests/cases/compiler/commentsAfterFunctionExpression1.ts ===
+var v = {
+>v : { f: (a: any) => number; g: (a: any) => number; h: (a: any) => number; }
+>{    f: a => 0 /*t1*/,    g: (a => 0) /*t2*/,    h: (a => 0 /*t3*/)} : { f: (a: any) => number; g: (a: any) => number; h: (a: any) => number; }
+
+    f: a => 0 /*t1*/,
+>f : (a: any) => number
+>a => 0 : (a: any) => number
+>a : any
+>0 : number
+
+    g: (a => 0) /*t2*/,
+>g : (a: any) => number
+>(a => 0) : (a: any) => number
+>a => 0 : (a: any) => number
+>a : any
+>0 : number
+
+    h: (a => 0 /*t3*/)
+>h : (a: any) => number
+>(a => 0 /*t3*/) : (a: any) => number
+>a => 0 : (a: any) => number
+>a : any
+>0 : number
+}
+
diff --git a/tests/baselines/reference/commentsClassMembers.symbols b/tests/baselines/reference/commentsClassMembers.symbols
index dd014611df7..4cbf1292c10 100644
--- a/tests/baselines/reference/commentsClassMembers.symbols
+++ b/tests/baselines/reference/commentsClassMembers.symbols
@@ -6,88 +6,88 @@ class c1 {
 
     /** p1 is property of c1*/
     public p1: number;
->p1 : Symbol(p1, Decl(commentsClassMembers.ts, 2, 10))
+>p1 : Symbol(c1.p1, Decl(commentsClassMembers.ts, 2, 10))
 
     /** sum with property*/
     public p2(/** number to add*/b: number) {
->p2 : Symbol(p2, Decl(commentsClassMembers.ts, 4, 22))
+>p2 : Symbol(c1.p2, Decl(commentsClassMembers.ts, 4, 22))
 >b : Symbol(b, Decl(commentsClassMembers.ts, 6, 14))
 
         return this.p1 + b;
->this.p1 : Symbol(p1, Decl(commentsClassMembers.ts, 2, 10))
+>this.p1 : Symbol(c1.p1, Decl(commentsClassMembers.ts, 2, 10))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->p1 : Symbol(p1, Decl(commentsClassMembers.ts, 2, 10))
+>p1 : Symbol(c1.p1, Decl(commentsClassMembers.ts, 2, 10))
 >b : Symbol(b, Decl(commentsClassMembers.ts, 6, 14))
 
     } /* trailing comment of method*/
     /** getter property*/
     public get p3() {
->p3 : Symbol(p3, Decl(commentsClassMembers.ts, 8, 5), Decl(commentsClassMembers.ts, 12, 5))
+>p3 : Symbol(c1.p3, Decl(commentsClassMembers.ts, 8, 5), Decl(commentsClassMembers.ts, 12, 5))
 
         return this.p2(this.p1);
->this.p2 : Symbol(p2, Decl(commentsClassMembers.ts, 4, 22))
+>this.p2 : Symbol(c1.p2, Decl(commentsClassMembers.ts, 4, 22))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->p2 : Symbol(p2, Decl(commentsClassMembers.ts, 4, 22))
->this.p1 : Symbol(p1, Decl(commentsClassMembers.ts, 2, 10))
+>p2 : Symbol(c1.p2, Decl(commentsClassMembers.ts, 4, 22))
+>this.p1 : Symbol(c1.p1, Decl(commentsClassMembers.ts, 2, 10))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->p1 : Symbol(p1, Decl(commentsClassMembers.ts, 2, 10))
+>p1 : Symbol(c1.p1, Decl(commentsClassMembers.ts, 2, 10))
 
     }// trailing comment Getter
     /** setter property*/
     public set p3(/** this is value*/value: number) {
->p3 : Symbol(p3, Decl(commentsClassMembers.ts, 8, 5), Decl(commentsClassMembers.ts, 12, 5))
+>p3 : Symbol(c1.p3, Decl(commentsClassMembers.ts, 8, 5), Decl(commentsClassMembers.ts, 12, 5))
 >value : Symbol(value, Decl(commentsClassMembers.ts, 14, 18))
 
         this.p1 = this.p2(value);
->this.p1 : Symbol(p1, Decl(commentsClassMembers.ts, 2, 10))
+>this.p1 : Symbol(c1.p1, Decl(commentsClassMembers.ts, 2, 10))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->p1 : Symbol(p1, Decl(commentsClassMembers.ts, 2, 10))
->this.p2 : Symbol(p2, Decl(commentsClassMembers.ts, 4, 22))
+>p1 : Symbol(c1.p1, Decl(commentsClassMembers.ts, 2, 10))
+>this.p2 : Symbol(c1.p2, Decl(commentsClassMembers.ts, 4, 22))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->p2 : Symbol(p2, Decl(commentsClassMembers.ts, 4, 22))
+>p2 : Symbol(c1.p2, Decl(commentsClassMembers.ts, 4, 22))
 >value : Symbol(value, Decl(commentsClassMembers.ts, 14, 18))
 
     }// trailing comment Setter
     /** pp1 is property of c1*/
     private pp1: number;
->pp1 : Symbol(pp1, Decl(commentsClassMembers.ts, 16, 5))
+>pp1 : Symbol(c1.pp1, Decl(commentsClassMembers.ts, 16, 5))
 
     /** sum with property*/
     private pp2(/** number to add*/b: number) {
->pp2 : Symbol(pp2, Decl(commentsClassMembers.ts, 18, 24))
+>pp2 : Symbol(c1.pp2, Decl(commentsClassMembers.ts, 18, 24))
 >b : Symbol(b, Decl(commentsClassMembers.ts, 20, 16))
 
         return this.p1 + b;
->this.p1 : Symbol(p1, Decl(commentsClassMembers.ts, 2, 10))
+>this.p1 : Symbol(c1.p1, Decl(commentsClassMembers.ts, 2, 10))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->p1 : Symbol(p1, Decl(commentsClassMembers.ts, 2, 10))
+>p1 : Symbol(c1.p1, Decl(commentsClassMembers.ts, 2, 10))
 >b : Symbol(b, Decl(commentsClassMembers.ts, 20, 16))
 
     } // trailing comment of method
     /** getter property*/
     private get pp3() {
->pp3 : Symbol(pp3, Decl(commentsClassMembers.ts, 22, 5), Decl(commentsClassMembers.ts, 26, 5))
+>pp3 : Symbol(c1.pp3, Decl(commentsClassMembers.ts, 22, 5), Decl(commentsClassMembers.ts, 26, 5))
 
         return this.pp2(this.pp1);
->this.pp2 : Symbol(pp2, Decl(commentsClassMembers.ts, 18, 24))
+>this.pp2 : Symbol(c1.pp2, Decl(commentsClassMembers.ts, 18, 24))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->pp2 : Symbol(pp2, Decl(commentsClassMembers.ts, 18, 24))
->this.pp1 : Symbol(pp1, Decl(commentsClassMembers.ts, 16, 5))
+>pp2 : Symbol(c1.pp2, Decl(commentsClassMembers.ts, 18, 24))
+>this.pp1 : Symbol(c1.pp1, Decl(commentsClassMembers.ts, 16, 5))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->pp1 : Symbol(pp1, Decl(commentsClassMembers.ts, 16, 5))
+>pp1 : Symbol(c1.pp1, Decl(commentsClassMembers.ts, 16, 5))
     }
     /** setter property*/
     private set pp3( /** this is value*/value: number) {
->pp3 : Symbol(pp3, Decl(commentsClassMembers.ts, 22, 5), Decl(commentsClassMembers.ts, 26, 5))
+>pp3 : Symbol(c1.pp3, Decl(commentsClassMembers.ts, 22, 5), Decl(commentsClassMembers.ts, 26, 5))
 >value : Symbol(value, Decl(commentsClassMembers.ts, 28, 20))
 
         this.pp1 = this.pp2(value);
->this.pp1 : Symbol(pp1, Decl(commentsClassMembers.ts, 16, 5))
+>this.pp1 : Symbol(c1.pp1, Decl(commentsClassMembers.ts, 16, 5))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->pp1 : Symbol(pp1, Decl(commentsClassMembers.ts, 16, 5))
->this.pp2 : Symbol(pp2, Decl(commentsClassMembers.ts, 18, 24))
+>pp1 : Symbol(c1.pp1, Decl(commentsClassMembers.ts, 16, 5))
+>this.pp2 : Symbol(c1.pp2, Decl(commentsClassMembers.ts, 18, 24))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->pp2 : Symbol(pp2, Decl(commentsClassMembers.ts, 18, 24))
+>pp2 : Symbol(c1.pp2, Decl(commentsClassMembers.ts, 18, 24))
 >value : Symbol(value, Decl(commentsClassMembers.ts, 28, 20))
     }
     /** Constructor method*/
@@ -137,77 +137,77 @@ class c1 {
 
     }/*trailing comment 2 */ /*setter*/
     public nc_p1: number;
->nc_p1 : Symbol(nc_p1, Decl(commentsClassMembers.ts, 47, 5))
+>nc_p1 : Symbol(c1.nc_p1, Decl(commentsClassMembers.ts, 47, 5))
 
     public nc_p2(b: number) {
->nc_p2 : Symbol(nc_p2, Decl(commentsClassMembers.ts, 48, 25))
+>nc_p2 : Symbol(c1.nc_p2, Decl(commentsClassMembers.ts, 48, 25))
 >b : Symbol(b, Decl(commentsClassMembers.ts, 49, 17))
 
         return this.nc_p1 + b;
->this.nc_p1 : Symbol(nc_p1, Decl(commentsClassMembers.ts, 47, 5))
+>this.nc_p1 : Symbol(c1.nc_p1, Decl(commentsClassMembers.ts, 47, 5))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->nc_p1 : Symbol(nc_p1, Decl(commentsClassMembers.ts, 47, 5))
+>nc_p1 : Symbol(c1.nc_p1, Decl(commentsClassMembers.ts, 47, 5))
 >b : Symbol(b, Decl(commentsClassMembers.ts, 49, 17))
     }
     public get nc_p3() {
->nc_p3 : Symbol(nc_p3, Decl(commentsClassMembers.ts, 51, 5), Decl(commentsClassMembers.ts, 54, 5))
+>nc_p3 : Symbol(c1.nc_p3, Decl(commentsClassMembers.ts, 51, 5), Decl(commentsClassMembers.ts, 54, 5))
 
         return this.nc_p2(this.nc_p1);
->this.nc_p2 : Symbol(nc_p2, Decl(commentsClassMembers.ts, 48, 25))
+>this.nc_p2 : Symbol(c1.nc_p2, Decl(commentsClassMembers.ts, 48, 25))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->nc_p2 : Symbol(nc_p2, Decl(commentsClassMembers.ts, 48, 25))
->this.nc_p1 : Symbol(nc_p1, Decl(commentsClassMembers.ts, 47, 5))
+>nc_p2 : Symbol(c1.nc_p2, Decl(commentsClassMembers.ts, 48, 25))
+>this.nc_p1 : Symbol(c1.nc_p1, Decl(commentsClassMembers.ts, 47, 5))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->nc_p1 : Symbol(nc_p1, Decl(commentsClassMembers.ts, 47, 5))
+>nc_p1 : Symbol(c1.nc_p1, Decl(commentsClassMembers.ts, 47, 5))
     }
     public set nc_p3(value: number) {
->nc_p3 : Symbol(nc_p3, Decl(commentsClassMembers.ts, 51, 5), Decl(commentsClassMembers.ts, 54, 5))
+>nc_p3 : Symbol(c1.nc_p3, Decl(commentsClassMembers.ts, 51, 5), Decl(commentsClassMembers.ts, 54, 5))
 >value : Symbol(value, Decl(commentsClassMembers.ts, 55, 21))
 
         this.nc_p1 = this.nc_p2(value);
->this.nc_p1 : Symbol(nc_p1, Decl(commentsClassMembers.ts, 47, 5))
+>this.nc_p1 : Symbol(c1.nc_p1, Decl(commentsClassMembers.ts, 47, 5))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->nc_p1 : Symbol(nc_p1, Decl(commentsClassMembers.ts, 47, 5))
->this.nc_p2 : Symbol(nc_p2, Decl(commentsClassMembers.ts, 48, 25))
+>nc_p1 : Symbol(c1.nc_p1, Decl(commentsClassMembers.ts, 47, 5))
+>this.nc_p2 : Symbol(c1.nc_p2, Decl(commentsClassMembers.ts, 48, 25))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->nc_p2 : Symbol(nc_p2, Decl(commentsClassMembers.ts, 48, 25))
+>nc_p2 : Symbol(c1.nc_p2, Decl(commentsClassMembers.ts, 48, 25))
 >value : Symbol(value, Decl(commentsClassMembers.ts, 55, 21))
     }
     private nc_pp1: number;
->nc_pp1 : Symbol(nc_pp1, Decl(commentsClassMembers.ts, 57, 5))
+>nc_pp1 : Symbol(c1.nc_pp1, Decl(commentsClassMembers.ts, 57, 5))
 
     private nc_pp2(b: number) {
->nc_pp2 : Symbol(nc_pp2, Decl(commentsClassMembers.ts, 58, 27))
+>nc_pp2 : Symbol(c1.nc_pp2, Decl(commentsClassMembers.ts, 58, 27))
 >b : Symbol(b, Decl(commentsClassMembers.ts, 59, 19))
 
         return this.nc_pp1 + b;
->this.nc_pp1 : Symbol(nc_pp1, Decl(commentsClassMembers.ts, 57, 5))
+>this.nc_pp1 : Symbol(c1.nc_pp1, Decl(commentsClassMembers.ts, 57, 5))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->nc_pp1 : Symbol(nc_pp1, Decl(commentsClassMembers.ts, 57, 5))
+>nc_pp1 : Symbol(c1.nc_pp1, Decl(commentsClassMembers.ts, 57, 5))
 >b : Symbol(b, Decl(commentsClassMembers.ts, 59, 19))
     }
     private get nc_pp3() {
->nc_pp3 : Symbol(nc_pp3, Decl(commentsClassMembers.ts, 61, 5), Decl(commentsClassMembers.ts, 64, 5))
+>nc_pp3 : Symbol(c1.nc_pp3, Decl(commentsClassMembers.ts, 61, 5), Decl(commentsClassMembers.ts, 64, 5))
 
         return this.nc_pp2(this.nc_pp1);
->this.nc_pp2 : Symbol(nc_pp2, Decl(commentsClassMembers.ts, 58, 27))
+>this.nc_pp2 : Symbol(c1.nc_pp2, Decl(commentsClassMembers.ts, 58, 27))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->nc_pp2 : Symbol(nc_pp2, Decl(commentsClassMembers.ts, 58, 27))
->this.nc_pp1 : Symbol(nc_pp1, Decl(commentsClassMembers.ts, 57, 5))
+>nc_pp2 : Symbol(c1.nc_pp2, Decl(commentsClassMembers.ts, 58, 27))
+>this.nc_pp1 : Symbol(c1.nc_pp1, Decl(commentsClassMembers.ts, 57, 5))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->nc_pp1 : Symbol(nc_pp1, Decl(commentsClassMembers.ts, 57, 5))
+>nc_pp1 : Symbol(c1.nc_pp1, Decl(commentsClassMembers.ts, 57, 5))
     }
     private set nc_pp3(value: number) {
->nc_pp3 : Symbol(nc_pp3, Decl(commentsClassMembers.ts, 61, 5), Decl(commentsClassMembers.ts, 64, 5))
+>nc_pp3 : Symbol(c1.nc_pp3, Decl(commentsClassMembers.ts, 61, 5), Decl(commentsClassMembers.ts, 64, 5))
 >value : Symbol(value, Decl(commentsClassMembers.ts, 65, 23))
 
         this.nc_pp1 = this.nc_pp2(value);
->this.nc_pp1 : Symbol(nc_pp1, Decl(commentsClassMembers.ts, 57, 5))
+>this.nc_pp1 : Symbol(c1.nc_pp1, Decl(commentsClassMembers.ts, 57, 5))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->nc_pp1 : Symbol(nc_pp1, Decl(commentsClassMembers.ts, 57, 5))
->this.nc_pp2 : Symbol(nc_pp2, Decl(commentsClassMembers.ts, 58, 27))
+>nc_pp1 : Symbol(c1.nc_pp1, Decl(commentsClassMembers.ts, 57, 5))
+>this.nc_pp2 : Symbol(c1.nc_pp2, Decl(commentsClassMembers.ts, 58, 27))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->nc_pp2 : Symbol(nc_pp2, Decl(commentsClassMembers.ts, 58, 27))
+>nc_pp2 : Symbol(c1.nc_pp2, Decl(commentsClassMembers.ts, 58, 27))
 >value : Symbol(value, Decl(commentsClassMembers.ts, 65, 23))
     }
     static nc_s1: number;
@@ -250,84 +250,84 @@ class c1 {
 
     // p1 is property of c1
     public a_p1: number;
->a_p1 : Symbol(a_p1, Decl(commentsClassMembers.ts, 77, 5))
+>a_p1 : Symbol(c1.a_p1, Decl(commentsClassMembers.ts, 77, 5))
 
     // sum with property
     public a_p2(b: number) {
->a_p2 : Symbol(a_p2, Decl(commentsClassMembers.ts, 80, 24))
+>a_p2 : Symbol(c1.a_p2, Decl(commentsClassMembers.ts, 80, 24))
 >b : Symbol(b, Decl(commentsClassMembers.ts, 82, 16))
 
         return this.a_p1 + b;
->this.a_p1 : Symbol(a_p1, Decl(commentsClassMembers.ts, 77, 5))
+>this.a_p1 : Symbol(c1.a_p1, Decl(commentsClassMembers.ts, 77, 5))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->a_p1 : Symbol(a_p1, Decl(commentsClassMembers.ts, 77, 5))
+>a_p1 : Symbol(c1.a_p1, Decl(commentsClassMembers.ts, 77, 5))
 >b : Symbol(b, Decl(commentsClassMembers.ts, 82, 16))
     }
     // getter property
     public get a_p3() {
->a_p3 : Symbol(a_p3, Decl(commentsClassMembers.ts, 84, 5), Decl(commentsClassMembers.ts, 88, 5))
+>a_p3 : Symbol(c1.a_p3, Decl(commentsClassMembers.ts, 84, 5), Decl(commentsClassMembers.ts, 88, 5))
 
         return this.a_p2(this.a_p1);
->this.a_p2 : Symbol(a_p2, Decl(commentsClassMembers.ts, 80, 24))
+>this.a_p2 : Symbol(c1.a_p2, Decl(commentsClassMembers.ts, 80, 24))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->a_p2 : Symbol(a_p2, Decl(commentsClassMembers.ts, 80, 24))
->this.a_p1 : Symbol(a_p1, Decl(commentsClassMembers.ts, 77, 5))
+>a_p2 : Symbol(c1.a_p2, Decl(commentsClassMembers.ts, 80, 24))
+>this.a_p1 : Symbol(c1.a_p1, Decl(commentsClassMembers.ts, 77, 5))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->a_p1 : Symbol(a_p1, Decl(commentsClassMembers.ts, 77, 5))
+>a_p1 : Symbol(c1.a_p1, Decl(commentsClassMembers.ts, 77, 5))
     }
     // setter property
     public set a_p3(value: number) {
->a_p3 : Symbol(a_p3, Decl(commentsClassMembers.ts, 84, 5), Decl(commentsClassMembers.ts, 88, 5))
+>a_p3 : Symbol(c1.a_p3, Decl(commentsClassMembers.ts, 84, 5), Decl(commentsClassMembers.ts, 88, 5))
 >value : Symbol(value, Decl(commentsClassMembers.ts, 90, 20))
 
         this.a_p1 = this.a_p2(value);
->this.a_p1 : Symbol(a_p1, Decl(commentsClassMembers.ts, 77, 5))
+>this.a_p1 : Symbol(c1.a_p1, Decl(commentsClassMembers.ts, 77, 5))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->a_p1 : Symbol(a_p1, Decl(commentsClassMembers.ts, 77, 5))
->this.a_p2 : Symbol(a_p2, Decl(commentsClassMembers.ts, 80, 24))
+>a_p1 : Symbol(c1.a_p1, Decl(commentsClassMembers.ts, 77, 5))
+>this.a_p2 : Symbol(c1.a_p2, Decl(commentsClassMembers.ts, 80, 24))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->a_p2 : Symbol(a_p2, Decl(commentsClassMembers.ts, 80, 24))
+>a_p2 : Symbol(c1.a_p2, Decl(commentsClassMembers.ts, 80, 24))
 >value : Symbol(value, Decl(commentsClassMembers.ts, 90, 20))
     }
     // pp1 is property of c1
     private a_pp1: number;
->a_pp1 : Symbol(a_pp1, Decl(commentsClassMembers.ts, 92, 5))
+>a_pp1 : Symbol(c1.a_pp1, Decl(commentsClassMembers.ts, 92, 5))
 
     // sum with property
     private a_pp2(b: number) {
->a_pp2 : Symbol(a_pp2, Decl(commentsClassMembers.ts, 94, 26))
+>a_pp2 : Symbol(c1.a_pp2, Decl(commentsClassMembers.ts, 94, 26))
 >b : Symbol(b, Decl(commentsClassMembers.ts, 96, 18))
 
         return this.a_p1 + b;
->this.a_p1 : Symbol(a_p1, Decl(commentsClassMembers.ts, 77, 5))
+>this.a_p1 : Symbol(c1.a_p1, Decl(commentsClassMembers.ts, 77, 5))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->a_p1 : Symbol(a_p1, Decl(commentsClassMembers.ts, 77, 5))
+>a_p1 : Symbol(c1.a_p1, Decl(commentsClassMembers.ts, 77, 5))
 >b : Symbol(b, Decl(commentsClassMembers.ts, 96, 18))
     }
     // getter property
     private get a_pp3() {
->a_pp3 : Symbol(a_pp3, Decl(commentsClassMembers.ts, 98, 5), Decl(commentsClassMembers.ts, 102, 5))
+>a_pp3 : Symbol(c1.a_pp3, Decl(commentsClassMembers.ts, 98, 5), Decl(commentsClassMembers.ts, 102, 5))
 
         return this.a_pp2(this.a_pp1);
->this.a_pp2 : Symbol(a_pp2, Decl(commentsClassMembers.ts, 94, 26))
+>this.a_pp2 : Symbol(c1.a_pp2, Decl(commentsClassMembers.ts, 94, 26))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->a_pp2 : Symbol(a_pp2, Decl(commentsClassMembers.ts, 94, 26))
->this.a_pp1 : Symbol(a_pp1, Decl(commentsClassMembers.ts, 92, 5))
+>a_pp2 : Symbol(c1.a_pp2, Decl(commentsClassMembers.ts, 94, 26))
+>this.a_pp1 : Symbol(c1.a_pp1, Decl(commentsClassMembers.ts, 92, 5))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->a_pp1 : Symbol(a_pp1, Decl(commentsClassMembers.ts, 92, 5))
+>a_pp1 : Symbol(c1.a_pp1, Decl(commentsClassMembers.ts, 92, 5))
     }
     // setter property
     private set a_pp3(value: number) {
->a_pp3 : Symbol(a_pp3, Decl(commentsClassMembers.ts, 98, 5), Decl(commentsClassMembers.ts, 102, 5))
+>a_pp3 : Symbol(c1.a_pp3, Decl(commentsClassMembers.ts, 98, 5), Decl(commentsClassMembers.ts, 102, 5))
 >value : Symbol(value, Decl(commentsClassMembers.ts, 104, 22))
 
         this.a_pp1 = this.a_pp2(value);
->this.a_pp1 : Symbol(a_pp1, Decl(commentsClassMembers.ts, 92, 5))
+>this.a_pp1 : Symbol(c1.a_pp1, Decl(commentsClassMembers.ts, 92, 5))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->a_pp1 : Symbol(a_pp1, Decl(commentsClassMembers.ts, 92, 5))
->this.a_pp2 : Symbol(a_pp2, Decl(commentsClassMembers.ts, 94, 26))
+>a_pp1 : Symbol(c1.a_pp1, Decl(commentsClassMembers.ts, 92, 5))
+>this.a_pp2 : Symbol(c1.a_pp2, Decl(commentsClassMembers.ts, 94, 26))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->a_pp2 : Symbol(a_pp2, Decl(commentsClassMembers.ts, 94, 26))
+>a_pp2 : Symbol(c1.a_pp2, Decl(commentsClassMembers.ts, 94, 26))
 >value : Symbol(value, Decl(commentsClassMembers.ts, 104, 22))
     }
     
@@ -376,84 +376,84 @@ class c1 {
 
     /** p1 is property of c1 */
     public b_p1: number;
->b_p1 : Symbol(b_p1, Decl(commentsClassMembers.ts, 122, 5))
+>b_p1 : Symbol(c1.b_p1, Decl(commentsClassMembers.ts, 122, 5))
 
     /** sum with property */
     public b_p2(b: number) {
->b_p2 : Symbol(b_p2, Decl(commentsClassMembers.ts, 125, 24))
+>b_p2 : Symbol(c1.b_p2, Decl(commentsClassMembers.ts, 125, 24))
 >b : Symbol(b, Decl(commentsClassMembers.ts, 127, 16))
 
         return this.b_p1 + b;
->this.b_p1 : Symbol(b_p1, Decl(commentsClassMembers.ts, 122, 5))
+>this.b_p1 : Symbol(c1.b_p1, Decl(commentsClassMembers.ts, 122, 5))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->b_p1 : Symbol(b_p1, Decl(commentsClassMembers.ts, 122, 5))
+>b_p1 : Symbol(c1.b_p1, Decl(commentsClassMembers.ts, 122, 5))
 >b : Symbol(b, Decl(commentsClassMembers.ts, 127, 16))
     }
     /** getter property */
     public get b_p3() {
->b_p3 : Symbol(b_p3, Decl(commentsClassMembers.ts, 129, 5), Decl(commentsClassMembers.ts, 133, 5))
+>b_p3 : Symbol(c1.b_p3, Decl(commentsClassMembers.ts, 129, 5), Decl(commentsClassMembers.ts, 133, 5))
 
         return this.b_p2(this.b_p1);
->this.b_p2 : Symbol(b_p2, Decl(commentsClassMembers.ts, 125, 24))
+>this.b_p2 : Symbol(c1.b_p2, Decl(commentsClassMembers.ts, 125, 24))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->b_p2 : Symbol(b_p2, Decl(commentsClassMembers.ts, 125, 24))
->this.b_p1 : Symbol(b_p1, Decl(commentsClassMembers.ts, 122, 5))
+>b_p2 : Symbol(c1.b_p2, Decl(commentsClassMembers.ts, 125, 24))
+>this.b_p1 : Symbol(c1.b_p1, Decl(commentsClassMembers.ts, 122, 5))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->b_p1 : Symbol(b_p1, Decl(commentsClassMembers.ts, 122, 5))
+>b_p1 : Symbol(c1.b_p1, Decl(commentsClassMembers.ts, 122, 5))
     }
     /** setter property */
     public set b_p3(value: number) {
->b_p3 : Symbol(b_p3, Decl(commentsClassMembers.ts, 129, 5), Decl(commentsClassMembers.ts, 133, 5))
+>b_p3 : Symbol(c1.b_p3, Decl(commentsClassMembers.ts, 129, 5), Decl(commentsClassMembers.ts, 133, 5))
 >value : Symbol(value, Decl(commentsClassMembers.ts, 135, 20))
 
         this.b_p1 = this.b_p2(value);
->this.b_p1 : Symbol(b_p1, Decl(commentsClassMembers.ts, 122, 5))
+>this.b_p1 : Symbol(c1.b_p1, Decl(commentsClassMembers.ts, 122, 5))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->b_p1 : Symbol(b_p1, Decl(commentsClassMembers.ts, 122, 5))
->this.b_p2 : Symbol(b_p2, Decl(commentsClassMembers.ts, 125, 24))
+>b_p1 : Symbol(c1.b_p1, Decl(commentsClassMembers.ts, 122, 5))
+>this.b_p2 : Symbol(c1.b_p2, Decl(commentsClassMembers.ts, 125, 24))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->b_p2 : Symbol(b_p2, Decl(commentsClassMembers.ts, 125, 24))
+>b_p2 : Symbol(c1.b_p2, Decl(commentsClassMembers.ts, 125, 24))
 >value : Symbol(value, Decl(commentsClassMembers.ts, 135, 20))
     }
     /** pp1 is property of c1 */
     private b_pp1: number;
->b_pp1 : Symbol(b_pp1, Decl(commentsClassMembers.ts, 137, 5))
+>b_pp1 : Symbol(c1.b_pp1, Decl(commentsClassMembers.ts, 137, 5))
 
     /** sum with property */
     private b_pp2(b: number) {
->b_pp2 : Symbol(b_pp2, Decl(commentsClassMembers.ts, 139, 26))
+>b_pp2 : Symbol(c1.b_pp2, Decl(commentsClassMembers.ts, 139, 26))
 >b : Symbol(b, Decl(commentsClassMembers.ts, 141, 18))
 
         return this.b_p1 + b;
->this.b_p1 : Symbol(b_p1, Decl(commentsClassMembers.ts, 122, 5))
+>this.b_p1 : Symbol(c1.b_p1, Decl(commentsClassMembers.ts, 122, 5))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->b_p1 : Symbol(b_p1, Decl(commentsClassMembers.ts, 122, 5))
+>b_p1 : Symbol(c1.b_p1, Decl(commentsClassMembers.ts, 122, 5))
 >b : Symbol(b, Decl(commentsClassMembers.ts, 141, 18))
     }
     /** getter property */
     private get b_pp3() {
->b_pp3 : Symbol(b_pp3, Decl(commentsClassMembers.ts, 143, 5), Decl(commentsClassMembers.ts, 147, 5))
+>b_pp3 : Symbol(c1.b_pp3, Decl(commentsClassMembers.ts, 143, 5), Decl(commentsClassMembers.ts, 147, 5))
 
         return this.b_pp2(this.b_pp1);
->this.b_pp2 : Symbol(b_pp2, Decl(commentsClassMembers.ts, 139, 26))
+>this.b_pp2 : Symbol(c1.b_pp2, Decl(commentsClassMembers.ts, 139, 26))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->b_pp2 : Symbol(b_pp2, Decl(commentsClassMembers.ts, 139, 26))
->this.b_pp1 : Symbol(b_pp1, Decl(commentsClassMembers.ts, 137, 5))
+>b_pp2 : Symbol(c1.b_pp2, Decl(commentsClassMembers.ts, 139, 26))
+>this.b_pp1 : Symbol(c1.b_pp1, Decl(commentsClassMembers.ts, 137, 5))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->b_pp1 : Symbol(b_pp1, Decl(commentsClassMembers.ts, 137, 5))
+>b_pp1 : Symbol(c1.b_pp1, Decl(commentsClassMembers.ts, 137, 5))
     }
     /** setter property */
     private set b_pp3(value: number) {
->b_pp3 : Symbol(b_pp3, Decl(commentsClassMembers.ts, 143, 5), Decl(commentsClassMembers.ts, 147, 5))
+>b_pp3 : Symbol(c1.b_pp3, Decl(commentsClassMembers.ts, 143, 5), Decl(commentsClassMembers.ts, 147, 5))
 >value : Symbol(value, Decl(commentsClassMembers.ts, 149, 22))
 
         this.b_pp1 = this.b_pp2(value);
->this.b_pp1 : Symbol(b_pp1, Decl(commentsClassMembers.ts, 137, 5))
+>this.b_pp1 : Symbol(c1.b_pp1, Decl(commentsClassMembers.ts, 137, 5))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->b_pp1 : Symbol(b_pp1, Decl(commentsClassMembers.ts, 137, 5))
->this.b_pp2 : Symbol(b_pp2, Decl(commentsClassMembers.ts, 139, 26))
+>b_pp1 : Symbol(c1.b_pp1, Decl(commentsClassMembers.ts, 137, 5))
+>this.b_pp2 : Symbol(c1.b_pp2, Decl(commentsClassMembers.ts, 139, 26))
 >this : Symbol(c1, Decl(commentsClassMembers.ts, 0, 0))
->b_pp2 : Symbol(b_pp2, Decl(commentsClassMembers.ts, 139, 26))
+>b_pp2 : Symbol(c1.b_pp2, Decl(commentsClassMembers.ts, 139, 26))
 >value : Symbol(value, Decl(commentsClassMembers.ts, 149, 22))
     }
     
@@ -635,54 +635,54 @@ class cProperties {
 >cProperties : Symbol(cProperties, Decl(commentsClassMembers.ts, 193, 14))
 
     private val: number;
->val : Symbol(val, Decl(commentsClassMembers.ts, 194, 19))
+>val : Symbol(cProperties.val, Decl(commentsClassMembers.ts, 194, 19))
 
     /** getter only property*/
     public get p1() {
->p1 : Symbol(p1, Decl(commentsClassMembers.ts, 195, 24))
+>p1 : Symbol(cProperties.p1, Decl(commentsClassMembers.ts, 195, 24))
 
         return this.val;
->this.val : Symbol(val, Decl(commentsClassMembers.ts, 194, 19))
+>this.val : Symbol(cProperties.val, Decl(commentsClassMembers.ts, 194, 19))
 >this : Symbol(cProperties, Decl(commentsClassMembers.ts, 193, 14))
->val : Symbol(val, Decl(commentsClassMembers.ts, 194, 19))
+>val : Symbol(cProperties.val, Decl(commentsClassMembers.ts, 194, 19))
 
     } // trailing comment of only getter
     public get nc_p1() {
->nc_p1 : Symbol(nc_p1, Decl(commentsClassMembers.ts, 199, 5))
+>nc_p1 : Symbol(cProperties.nc_p1, Decl(commentsClassMembers.ts, 199, 5))
 
         return this.val;
->this.val : Symbol(val, Decl(commentsClassMembers.ts, 194, 19))
+>this.val : Symbol(cProperties.val, Decl(commentsClassMembers.ts, 194, 19))
 >this : Symbol(cProperties, Decl(commentsClassMembers.ts, 193, 14))
->val : Symbol(val, Decl(commentsClassMembers.ts, 194, 19))
+>val : Symbol(cProperties.val, Decl(commentsClassMembers.ts, 194, 19))
     }
     /**setter only property*/
     public set p2(value: number) {
->p2 : Symbol(p2, Decl(commentsClassMembers.ts, 202, 5))
+>p2 : Symbol(cProperties.p2, Decl(commentsClassMembers.ts, 202, 5))
 >value : Symbol(value, Decl(commentsClassMembers.ts, 204, 18))
 
         this.val = value;
->this.val : Symbol(val, Decl(commentsClassMembers.ts, 194, 19))
+>this.val : Symbol(cProperties.val, Decl(commentsClassMembers.ts, 194, 19))
 >this : Symbol(cProperties, Decl(commentsClassMembers.ts, 193, 14))
->val : Symbol(val, Decl(commentsClassMembers.ts, 194, 19))
+>val : Symbol(cProperties.val, Decl(commentsClassMembers.ts, 194, 19))
 >value : Symbol(value, Decl(commentsClassMembers.ts, 204, 18))
     }
     public set nc_p2(value: number) {
->nc_p2 : Symbol(nc_p2, Decl(commentsClassMembers.ts, 206, 5))
+>nc_p2 : Symbol(cProperties.nc_p2, Decl(commentsClassMembers.ts, 206, 5))
 >value : Symbol(value, Decl(commentsClassMembers.ts, 207, 21))
 
         this.val = value;
->this.val : Symbol(val, Decl(commentsClassMembers.ts, 194, 19))
+>this.val : Symbol(cProperties.val, Decl(commentsClassMembers.ts, 194, 19))
 >this : Symbol(cProperties, Decl(commentsClassMembers.ts, 193, 14))
->val : Symbol(val, Decl(commentsClassMembers.ts, 194, 19))
+>val : Symbol(cProperties.val, Decl(commentsClassMembers.ts, 194, 19))
 >value : Symbol(value, Decl(commentsClassMembers.ts, 207, 21))
 
     } /* trailing comment of setter only*/
 
     public x = 10; /*trailing comment for property*/
->x : Symbol(x, Decl(commentsClassMembers.ts, 209, 5))
+>x : Symbol(cProperties.x, Decl(commentsClassMembers.ts, 209, 5))
 
     private y = 10; // trailing comment of // style
->y : Symbol(y, Decl(commentsClassMembers.ts, 211, 18))
+>y : Symbol(cProperties.y, Decl(commentsClassMembers.ts, 211, 18))
 }
 var cProperties_i = new cProperties();
 >cProperties_i : Symbol(cProperties_i, Decl(commentsClassMembers.ts, 214, 3))
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/commentsInheritance.symbols b/tests/baselines/reference/commentsInheritance.symbols
index f702f40a0d4..288bfdb4280 100644
--- a/tests/baselines/reference/commentsInheritance.symbols
+++ b/tests/baselines/reference/commentsInheritance.symbols
@@ -6,90 +6,90 @@ interface i1 {
 
     /** i1_p1*/
     i1_p1: number;
->i1_p1 : Symbol(i1_p1, Decl(commentsInheritance.ts, 2, 14))
+>i1_p1 : Symbol(i1.i1_p1, Decl(commentsInheritance.ts, 2, 14))
 
     /** i1_f1*/
     i1_f1(): void;
->i1_f1 : Symbol(i1_f1, Decl(commentsInheritance.ts, 4, 18))
+>i1_f1 : Symbol(i1.i1_f1, Decl(commentsInheritance.ts, 4, 18))
 
     /** i1_l1*/
     i1_l1: () => void;
->i1_l1 : Symbol(i1_l1, Decl(commentsInheritance.ts, 6, 18))
+>i1_l1 : Symbol(i1.i1_l1, Decl(commentsInheritance.ts, 6, 18))
 
     // il_nc_p1
     i1_nc_p1: number;
->i1_nc_p1 : Symbol(i1_nc_p1, Decl(commentsInheritance.ts, 8, 22))
+>i1_nc_p1 : Symbol(i1.i1_nc_p1, Decl(commentsInheritance.ts, 8, 22))
 
     i1_nc_f1(): void;
->i1_nc_f1 : Symbol(i1_nc_f1, Decl(commentsInheritance.ts, 10, 21))
+>i1_nc_f1 : Symbol(i1.i1_nc_f1, Decl(commentsInheritance.ts, 10, 21))
 
     i1_nc_l1: () => void;
->i1_nc_l1 : Symbol(i1_nc_l1, Decl(commentsInheritance.ts, 11, 21))
+>i1_nc_l1 : Symbol(i1.i1_nc_l1, Decl(commentsInheritance.ts, 11, 21))
 
     p1: number;
->p1 : Symbol(p1, Decl(commentsInheritance.ts, 12, 25))
+>p1 : Symbol(i1.p1, Decl(commentsInheritance.ts, 12, 25))
 
     f1(): void;
->f1 : Symbol(f1, Decl(commentsInheritance.ts, 13, 15))
+>f1 : Symbol(i1.f1, Decl(commentsInheritance.ts, 13, 15))
 
     l1: () => void;
->l1 : Symbol(l1, Decl(commentsInheritance.ts, 14, 15))
+>l1 : Symbol(i1.l1, Decl(commentsInheritance.ts, 14, 15))
 
     nc_p1: number;
->nc_p1 : Symbol(nc_p1, Decl(commentsInheritance.ts, 15, 19))
+>nc_p1 : Symbol(i1.nc_p1, Decl(commentsInheritance.ts, 15, 19))
 
     nc_f1(): void;
->nc_f1 : Symbol(nc_f1, Decl(commentsInheritance.ts, 16, 18))
+>nc_f1 : Symbol(i1.nc_f1, Decl(commentsInheritance.ts, 16, 18))
 
     nc_l1: () => void;
->nc_l1 : Symbol(nc_l1, Decl(commentsInheritance.ts, 17, 18))
+>nc_l1 : Symbol(i1.nc_l1, Decl(commentsInheritance.ts, 17, 18))
 }
 class c1 implements i1 {
 >c1 : Symbol(c1, Decl(commentsInheritance.ts, 19, 1))
 >i1 : Symbol(i1, Decl(commentsInheritance.ts, 0, 0))
 
     public i1_p1: number;
->i1_p1 : Symbol(i1_p1, Decl(commentsInheritance.ts, 20, 24))
+>i1_p1 : Symbol(c1.i1_p1, Decl(commentsInheritance.ts, 20, 24))
 
     // i1_f1
     public i1_f1() {
->i1_f1 : Symbol(i1_f1, Decl(commentsInheritance.ts, 21, 25))
+>i1_f1 : Symbol(c1.i1_f1, Decl(commentsInheritance.ts, 21, 25))
     }
     public i1_l1: () => void;
->i1_l1 : Symbol(i1_l1, Decl(commentsInheritance.ts, 24, 5))
+>i1_l1 : Symbol(c1.i1_l1, Decl(commentsInheritance.ts, 24, 5))
 
     public i1_nc_p1: number;
->i1_nc_p1 : Symbol(i1_nc_p1, Decl(commentsInheritance.ts, 25, 29))
+>i1_nc_p1 : Symbol(c1.i1_nc_p1, Decl(commentsInheritance.ts, 25, 29))
 
     public i1_nc_f1() {
->i1_nc_f1 : Symbol(i1_nc_f1, Decl(commentsInheritance.ts, 26, 28))
+>i1_nc_f1 : Symbol(c1.i1_nc_f1, Decl(commentsInheritance.ts, 26, 28))
     }
     public i1_nc_l1: () => void;
->i1_nc_l1 : Symbol(i1_nc_l1, Decl(commentsInheritance.ts, 28, 5))
+>i1_nc_l1 : Symbol(c1.i1_nc_l1, Decl(commentsInheritance.ts, 28, 5))
 
     /** c1_p1*/
     public p1: number;
->p1 : Symbol(p1, Decl(commentsInheritance.ts, 29, 32))
+>p1 : Symbol(c1.p1, Decl(commentsInheritance.ts, 29, 32))
 
     /** c1_f1*/
     public f1() {
->f1 : Symbol(f1, Decl(commentsInheritance.ts, 31, 22))
+>f1 : Symbol(c1.f1, Decl(commentsInheritance.ts, 31, 22))
     }
     /** c1_l1*/
     public l1: () => void;
->l1 : Symbol(l1, Decl(commentsInheritance.ts, 34, 5))
+>l1 : Symbol(c1.l1, Decl(commentsInheritance.ts, 34, 5))
 
     /** c1_nc_p1*/
     public nc_p1: number;
->nc_p1 : Symbol(nc_p1, Decl(commentsInheritance.ts, 36, 26))
+>nc_p1 : Symbol(c1.nc_p1, Decl(commentsInheritance.ts, 36, 26))
 
     /** c1_nc_f1*/
     public nc_f1() {
->nc_f1 : Symbol(nc_f1, Decl(commentsInheritance.ts, 38, 25))
+>nc_f1 : Symbol(c1.nc_f1, Decl(commentsInheritance.ts, 38, 25))
     }
     /** c1_nc_l1*/
     public nc_l1: () => void;
->nc_l1 : Symbol(nc_l1, Decl(commentsInheritance.ts, 41, 5))
+>nc_l1 : Symbol(c1.nc_l1, Decl(commentsInheritance.ts, 41, 5))
 }
 var i1_i: i1;
 >i1_i : Symbol(i1_i, Decl(commentsInheritance.ts, 45, 3))
@@ -109,51 +109,51 @@ class c2 {
 
     /** c2 c2_p1*/
     public c2_p1: number;
->c2_p1 : Symbol(c2_p1, Decl(commentsInheritance.ts, 49, 10))
+>c2_p1 : Symbol(c2.c2_p1, Decl(commentsInheritance.ts, 49, 10))
 
     /** c2 c2_f1*/
     public c2_f1() {
->c2_f1 : Symbol(c2_f1, Decl(commentsInheritance.ts, 51, 25))
+>c2_f1 : Symbol(c2.c2_f1, Decl(commentsInheritance.ts, 51, 25))
     }
     /** c2 c2_prop*/
     public get c2_prop() {
->c2_prop : Symbol(c2_prop, Decl(commentsInheritance.ts, 54, 5))
+>c2_prop : Symbol(c2.c2_prop, Decl(commentsInheritance.ts, 54, 5))
 
         return 10;
     }
     public c2_nc_p1: number;
->c2_nc_p1 : Symbol(c2_nc_p1, Decl(commentsInheritance.ts, 58, 5))
+>c2_nc_p1 : Symbol(c2.c2_nc_p1, Decl(commentsInheritance.ts, 58, 5))
 
     public c2_nc_f1() {
->c2_nc_f1 : Symbol(c2_nc_f1, Decl(commentsInheritance.ts, 59, 28))
+>c2_nc_f1 : Symbol(c2.c2_nc_f1, Decl(commentsInheritance.ts, 59, 28))
     }
     public get c2_nc_prop() {
->c2_nc_prop : Symbol(c2_nc_prop, Decl(commentsInheritance.ts, 61, 5))
+>c2_nc_prop : Symbol(c2.c2_nc_prop, Decl(commentsInheritance.ts, 61, 5))
 
         return 10;
     }
     /** c2 p1*/
     public p1: number;
->p1 : Symbol(p1, Decl(commentsInheritance.ts, 64, 5))
+>p1 : Symbol(c2.p1, Decl(commentsInheritance.ts, 64, 5))
 
     /** c2 f1*/
     public f1() {
->f1 : Symbol(f1, Decl(commentsInheritance.ts, 66, 22))
+>f1 : Symbol(c2.f1, Decl(commentsInheritance.ts, 66, 22))
     }
     /** c2 prop*/
     public get prop() {
->prop : Symbol(prop, Decl(commentsInheritance.ts, 69, 5))
+>prop : Symbol(c2.prop, Decl(commentsInheritance.ts, 69, 5))
 
         return 10;
     }
     public nc_p1: number;
->nc_p1 : Symbol(nc_p1, Decl(commentsInheritance.ts, 73, 5))
+>nc_p1 : Symbol(c2.nc_p1, Decl(commentsInheritance.ts, 73, 5))
 
     public nc_f1() {
->nc_f1 : Symbol(nc_f1, Decl(commentsInheritance.ts, 74, 25))
+>nc_f1 : Symbol(c2.nc_f1, Decl(commentsInheritance.ts, 74, 25))
     }
     public get nc_prop() {
->nc_prop : Symbol(nc_prop, Decl(commentsInheritance.ts, 76, 5))
+>nc_prop : Symbol(c2.nc_prop, Decl(commentsInheritance.ts, 76, 5))
 
         return 10;
     }
@@ -162,9 +162,9 @@ class c2 {
 >a : Symbol(a, Decl(commentsInheritance.ts, 81, 16))
 
         this.c2_p1 = a;
->this.c2_p1 : Symbol(c2_p1, Decl(commentsInheritance.ts, 49, 10))
+>this.c2_p1 : Symbol(c2.c2_p1, Decl(commentsInheritance.ts, 49, 10))
 >this : Symbol(c2, Decl(commentsInheritance.ts, 48, 12))
->c2_p1 : Symbol(c2_p1, Decl(commentsInheritance.ts, 49, 10))
+>c2_p1 : Symbol(c2.c2_p1, Decl(commentsInheritance.ts, 49, 10))
 >a : Symbol(a, Decl(commentsInheritance.ts, 81, 16))
     }
 }
@@ -178,26 +178,26 @@ class c3 extends c2 {
     }
     /** c3 p1*/
     public p1: number;
->p1 : Symbol(p1, Decl(commentsInheritance.ts, 88, 5))
+>p1 : Symbol(c3.p1, Decl(commentsInheritance.ts, 88, 5))
 
     /** c3 f1*/
     public f1() {
->f1 : Symbol(f1, Decl(commentsInheritance.ts, 90, 22))
+>f1 : Symbol(c3.f1, Decl(commentsInheritance.ts, 90, 22))
     }
     /** c3 prop*/
     public get prop() {
->prop : Symbol(prop, Decl(commentsInheritance.ts, 93, 5))
+>prop : Symbol(c3.prop, Decl(commentsInheritance.ts, 93, 5))
 
         return 10;
     }
     public nc_p1: number;
->nc_p1 : Symbol(nc_p1, Decl(commentsInheritance.ts, 97, 5))
+>nc_p1 : Symbol(c3.nc_p1, Decl(commentsInheritance.ts, 97, 5))
 
     public nc_f1() {
->nc_f1 : Symbol(nc_f1, Decl(commentsInheritance.ts, 98, 25))
+>nc_f1 : Symbol(c3.nc_f1, Decl(commentsInheritance.ts, 98, 25))
     }
     public get nc_prop() {
->nc_prop : Symbol(nc_prop, Decl(commentsInheritance.ts, 100, 5))
+>nc_prop : Symbol(c3.nc_prop, Decl(commentsInheritance.ts, 100, 5))
 
         return 10;
     }
@@ -228,46 +228,46 @@ interface i2 {
 
     /** i2_p1*/
     i2_p1: number;
->i2_p1 : Symbol(i2_p1, Decl(commentsInheritance.ts, 112, 14))
+>i2_p1 : Symbol(i2.i2_p1, Decl(commentsInheritance.ts, 112, 14))
 
     /** i2_f1*/
     i2_f1(): void;
->i2_f1 : Symbol(i2_f1, Decl(commentsInheritance.ts, 114, 18))
+>i2_f1 : Symbol(i2.i2_f1, Decl(commentsInheritance.ts, 114, 18))
 
     /** i2_l1*/
     i2_l1: () => void;
->i2_l1 : Symbol(i2_l1, Decl(commentsInheritance.ts, 116, 18))
+>i2_l1 : Symbol(i2.i2_l1, Decl(commentsInheritance.ts, 116, 18))
 
     // i2_nc_p1
     i2_nc_p1: number;
->i2_nc_p1 : Symbol(i2_nc_p1, Decl(commentsInheritance.ts, 118, 22))
+>i2_nc_p1 : Symbol(i2.i2_nc_p1, Decl(commentsInheritance.ts, 118, 22))
 
     i2_nc_f1(): void;
->i2_nc_f1 : Symbol(i2_nc_f1, Decl(commentsInheritance.ts, 120, 21))
+>i2_nc_f1 : Symbol(i2.i2_nc_f1, Decl(commentsInheritance.ts, 120, 21))
 
     i2_nc_l1: () => void;
->i2_nc_l1 : Symbol(i2_nc_l1, Decl(commentsInheritance.ts, 121, 21))
+>i2_nc_l1 : Symbol(i2.i2_nc_l1, Decl(commentsInheritance.ts, 121, 21))
 
     /** i2 p1*/
     p1: number;
->p1 : Symbol(p1, Decl(commentsInheritance.ts, 122, 25))
+>p1 : Symbol(i2.p1, Decl(commentsInheritance.ts, 122, 25))
 
     /** i2 f1*/
     f1(): void;
->f1 : Symbol(f1, Decl(commentsInheritance.ts, 124, 15))
+>f1 : Symbol(i2.f1, Decl(commentsInheritance.ts, 124, 15))
 
     /** i2 l1*/
     l1: () => void;
->l1 : Symbol(l1, Decl(commentsInheritance.ts, 126, 15))
+>l1 : Symbol(i2.l1, Decl(commentsInheritance.ts, 126, 15))
 
     nc_p1: number;
->nc_p1 : Symbol(nc_p1, Decl(commentsInheritance.ts, 128, 19))
+>nc_p1 : Symbol(i2.nc_p1, Decl(commentsInheritance.ts, 128, 19))
 
     nc_f1(): void;
->nc_f1 : Symbol(nc_f1, Decl(commentsInheritance.ts, 129, 18))
+>nc_f1 : Symbol(i2.nc_f1, Decl(commentsInheritance.ts, 129, 18))
 
     nc_l1: () => void;
->nc_l1 : Symbol(nc_l1, Decl(commentsInheritance.ts, 130, 18))
+>nc_l1 : Symbol(i2.nc_l1, Decl(commentsInheritance.ts, 130, 18))
 }
 interface i3 extends i2 {
 >i3 : Symbol(i3, Decl(commentsInheritance.ts, 132, 1))
@@ -275,26 +275,26 @@ interface i3 extends i2 {
 
     /** i3 p1 */
     p1: number;
->p1 : Symbol(p1, Decl(commentsInheritance.ts, 133, 25))
+>p1 : Symbol(i3.p1, Decl(commentsInheritance.ts, 133, 25))
 
     /**
     * i3 f1
     */
     f1(): void;
->f1 : Symbol(f1, Decl(commentsInheritance.ts, 135, 15))
+>f1 : Symbol(i3.f1, Decl(commentsInheritance.ts, 135, 15))
 
     /** i3 l1*/
     l1: () => void;
->l1 : Symbol(l1, Decl(commentsInheritance.ts, 139, 15))
+>l1 : Symbol(i3.l1, Decl(commentsInheritance.ts, 139, 15))
 
     nc_p1: number;
->nc_p1 : Symbol(nc_p1, Decl(commentsInheritance.ts, 141, 19))
+>nc_p1 : Symbol(i3.nc_p1, Decl(commentsInheritance.ts, 141, 19))
 
     nc_f1(): void;
->nc_f1 : Symbol(nc_f1, Decl(commentsInheritance.ts, 142, 18))
+>nc_f1 : Symbol(i3.nc_f1, Decl(commentsInheritance.ts, 142, 18))
 
     nc_l1: () => void;
->nc_l1 : Symbol(nc_l1, Decl(commentsInheritance.ts, 143, 18))
+>nc_l1 : Symbol(i3.nc_l1, Decl(commentsInheritance.ts, 143, 18))
 }
 var i2_i: i2;
 >i2_i : Symbol(i2_i, Decl(commentsInheritance.ts, 146, 3))
diff --git a/tests/baselines/reference/commentsInterface.symbols b/tests/baselines/reference/commentsInterface.symbols
index 78d89989ed1..6e3a9e27978 100644
--- a/tests/baselines/reference/commentsInterface.symbols
+++ b/tests/baselines/reference/commentsInterface.symbols
@@ -20,11 +20,11 @@ interface i2 {
 
     /** this is x*/
     x: number;
->x : Symbol(x, Decl(commentsInterface.ts, 8, 14))
+>x : Symbol(i2.x, Decl(commentsInterface.ts, 8, 14))
 
     /** this is foo*/
     foo: (/**param help*/b: number) => string;
->foo : Symbol(foo, Decl(commentsInterface.ts, 10, 14))
+>foo : Symbol(i2.foo, Decl(commentsInterface.ts, 10, 14))
 >b : Symbol(b, Decl(commentsInterface.ts, 12, 10))
 
     /** this is indexer*/
@@ -37,10 +37,10 @@ interface i2 {
 >i1 : Symbol(i1, Decl(commentsInterface.ts, 0, 0))
 
     nc_x: number;
->nc_x : Symbol(nc_x, Decl(commentsInterface.ts, 16, 27))
+>nc_x : Symbol(i2.nc_x, Decl(commentsInterface.ts, 16, 27))
 
     nc_foo: (b: number) => string;
->nc_foo : Symbol(nc_foo, Decl(commentsInterface.ts, 17, 17))
+>nc_foo : Symbol(i2.nc_foo, Decl(commentsInterface.ts, 17, 17))
 >b : Symbol(b, Decl(commentsInterface.ts, 18, 13))
 
     [i: number]: number;
@@ -53,16 +53,16 @@ interface i2 {
 
     /** this is fnfoo*/
     fnfoo(/**param help*/b: number): string;
->fnfoo : Symbol(fnfoo, Decl(commentsInterface.ts, 21, 68))
+>fnfoo : Symbol(i2.fnfoo, Decl(commentsInterface.ts, 21, 68))
 >b : Symbol(b, Decl(commentsInterface.ts, 23, 10))
 
     nc_fnfoo(b: number): string;
->nc_fnfoo : Symbol(nc_fnfoo, Decl(commentsInterface.ts, 23, 44))
+>nc_fnfoo : Symbol(i2.nc_fnfoo, Decl(commentsInterface.ts, 23, 44))
 >b : Symbol(b, Decl(commentsInterface.ts, 24, 13))
 
     // nc_y
     nc_y: number;
->nc_y : Symbol(nc_y, Decl(commentsInterface.ts, 24, 32))
+>nc_y : Symbol(i2.nc_y, Decl(commentsInterface.ts, 24, 32))
 }
 var i2_i: i2;
 >i2_i : Symbol(i2_i, Decl(commentsInterface.ts, 28, 3))
@@ -150,27 +150,27 @@ interface i3 {
 
     /** Comment i3 x*/
     x: number;
->x : Symbol(x, Decl(commentsInterface.ts, 43, 14))
+>x : Symbol(i3.x, Decl(commentsInterface.ts, 43, 14))
 
     /** Function i3 f*/
     f(/**number parameter*/a: number): string;
->f : Symbol(f, Decl(commentsInterface.ts, 45, 14))
+>f : Symbol(i3.f, Decl(commentsInterface.ts, 45, 14))
 >a : Symbol(a, Decl(commentsInterface.ts, 47, 6))
 
     /** i3 l*/
     l: (/**comment i3 l b*/b: number) => string;
->l : Symbol(l, Decl(commentsInterface.ts, 47, 46))
+>l : Symbol(i3.l, Decl(commentsInterface.ts, 47, 46))
 >b : Symbol(b, Decl(commentsInterface.ts, 49, 8))
 
     nc_x: number;
->nc_x : Symbol(nc_x, Decl(commentsInterface.ts, 49, 48))
+>nc_x : Symbol(i3.nc_x, Decl(commentsInterface.ts, 49, 48))
 
     nc_f(a: number): string;
->nc_f : Symbol(nc_f, Decl(commentsInterface.ts, 50, 17))
+>nc_f : Symbol(i3.nc_f, Decl(commentsInterface.ts, 50, 17))
 >a : Symbol(a, Decl(commentsInterface.ts, 51, 9))
 
     nc_l: (b: number) => string;
->nc_l : Symbol(nc_l, Decl(commentsInterface.ts, 51, 28))
+>nc_l : Symbol(i3.nc_l, Decl(commentsInterface.ts, 51, 28))
 >b : Symbol(b, Decl(commentsInterface.ts, 52, 11))
 }
 var i3_i: i3;
diff --git a/tests/baselines/reference/commentsOnObjectLiteral3.symbols b/tests/baselines/reference/commentsOnObjectLiteral3.symbols
index 3d58fe2d6d7..81fa15b6a11 100644
--- a/tests/baselines/reference/commentsOnObjectLiteral3.symbols
+++ b/tests/baselines/reference/commentsOnObjectLiteral3.symbols
@@ -21,6 +21,10 @@ var v = {
 >a : Symbol(a, Decl(commentsOnObjectLiteral3.ts, 8, 13), Decl(commentsOnObjectLiteral3.ts, 12, 18))
 
   return this.prop;
+>this.prop : Symbol(prop, Decl(commentsOnObjectLiteral3.ts, 1, 9))
+>this : Symbol(, Decl(commentsOnObjectLiteral3.ts, 1, 7))
+>prop : Symbol(prop, Decl(commentsOnObjectLiteral3.ts, 1, 9))
+
  } /*trailing 1*/,
  //setter
  set a(value) {
@@ -28,6 +32,9 @@ var v = {
 >value : Symbol(value, Decl(commentsOnObjectLiteral3.ts, 14, 7))
 
   this.prop = value;
+>this.prop : Symbol(prop, Decl(commentsOnObjectLiteral3.ts, 1, 9))
+>this : Symbol(, Decl(commentsOnObjectLiteral3.ts, 1, 7))
+>prop : Symbol(prop, Decl(commentsOnObjectLiteral3.ts, 1, 9))
 >value : Symbol(value, Decl(commentsOnObjectLiteral3.ts, 14, 7))
 
  } // trailing 2
diff --git a/tests/baselines/reference/commentsOnObjectLiteral3.types b/tests/baselines/reference/commentsOnObjectLiteral3.types
index a63920fce0f..26a1e2e4250 100644
--- a/tests/baselines/reference/commentsOnObjectLiteral3.types
+++ b/tests/baselines/reference/commentsOnObjectLiteral3.types
@@ -24,9 +24,9 @@ var v = {
 >a : any
 
   return this.prop;
->this.prop : any
->this : any
->prop : any
+>this.prop : number
+>this : { prop: number; func: () => void; func1(): void; a: any; }
+>prop : number
 
  } /*trailing 1*/,
  //setter
@@ -36,9 +36,9 @@ var v = {
 
   this.prop = value;
 >this.prop = value : any
->this.prop : any
->this : any
->prop : any
+>this.prop : number
+>this : { prop: number; func: () => void; func1(): void; a: any; }
+>prop : number
 >value : any
 
  } // trailing 2
diff --git a/tests/baselines/reference/commentsOnObjectLiteral4.js b/tests/baselines/reference/commentsOnObjectLiteral4.js
index 3b7efefdff4..23e238b8307 100644
--- a/tests/baselines/reference/commentsOnObjectLiteral4.js
+++ b/tests/baselines/reference/commentsOnObjectLiteral4.js
@@ -5,9 +5,10 @@ var v = {
   * @type {number}
   */
  get bar(): number {
-  return this._bar;
+  return 12;
  }
-}
+}
+
 
 //// [commentsOnObjectLiteral4.js]
 var v = {
@@ -15,6 +16,6 @@ var v = {
      * @type {number}
      */
     get bar() {
-        return this._bar;
+        return 12;
     }
 };
diff --git a/tests/baselines/reference/commentsOnObjectLiteral4.symbols b/tests/baselines/reference/commentsOnObjectLiteral4.symbols
index c1762cb75c8..568d6332126 100644
--- a/tests/baselines/reference/commentsOnObjectLiteral4.symbols
+++ b/tests/baselines/reference/commentsOnObjectLiteral4.symbols
@@ -9,6 +9,7 @@ var v = {
  get bar(): number {
 >bar : Symbol(bar, Decl(commentsOnObjectLiteral4.ts, 1, 9))
 
-  return this._bar;
+  return 12;
  }
 }
+
diff --git a/tests/baselines/reference/commentsOnObjectLiteral4.types b/tests/baselines/reference/commentsOnObjectLiteral4.types
index f458d73ae36..5d20d4f79cc 100644
--- a/tests/baselines/reference/commentsOnObjectLiteral4.types
+++ b/tests/baselines/reference/commentsOnObjectLiteral4.types
@@ -2,7 +2,7 @@
 
 var v = {
 >v : { readonly bar: number; }
->{ /**  * @type {number}  */ get bar(): number {  return this._bar; }} : { readonly bar: number; }
+>{ /**  * @type {number}  */ get bar(): number {  return 12; }} : { readonly bar: number; }
 
  /**
   * @type {number}
@@ -10,9 +10,8 @@ var v = {
  get bar(): number {
 >bar : number
 
-  return this._bar;
->this._bar : any
->this : any
->_bar : any
+  return 12;
+>12 : number
  }
 }
+
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/commentsOverloads.symbols b/tests/baselines/reference/commentsOverloads.symbols
index b504e35c5ac..bcdcc32f4c3 100644
--- a/tests/baselines/reference/commentsOverloads.symbols
+++ b/tests/baselines/reference/commentsOverloads.symbols
@@ -97,53 +97,53 @@ interface i1 {
 
     /** foo 1*/
     foo(a: number): number;
->foo : Symbol(foo, Decl(commentsOverloads.ts, 37, 24), Decl(commentsOverloads.ts, 39, 27), Decl(commentsOverloads.ts, 41, 27), Decl(commentsOverloads.ts, 43, 31))
+>foo : Symbol(i1.foo, Decl(commentsOverloads.ts, 37, 24), Decl(commentsOverloads.ts, 39, 27), Decl(commentsOverloads.ts, 41, 27), Decl(commentsOverloads.ts, 43, 31))
 >a : Symbol(a, Decl(commentsOverloads.ts, 39, 8))
 
     /** foo 2*/
     foo(b: string): number;
->foo : Symbol(foo, Decl(commentsOverloads.ts, 37, 24), Decl(commentsOverloads.ts, 39, 27), Decl(commentsOverloads.ts, 41, 27), Decl(commentsOverloads.ts, 43, 31))
+>foo : Symbol(i1.foo, Decl(commentsOverloads.ts, 37, 24), Decl(commentsOverloads.ts, 39, 27), Decl(commentsOverloads.ts, 41, 27), Decl(commentsOverloads.ts, 43, 31))
 >b : Symbol(b, Decl(commentsOverloads.ts, 41, 8))
 
     // foo 3
     foo(arr: number[]): number;
->foo : Symbol(foo, Decl(commentsOverloads.ts, 37, 24), Decl(commentsOverloads.ts, 39, 27), Decl(commentsOverloads.ts, 41, 27), Decl(commentsOverloads.ts, 43, 31))
+>foo : Symbol(i1.foo, Decl(commentsOverloads.ts, 37, 24), Decl(commentsOverloads.ts, 39, 27), Decl(commentsOverloads.ts, 41, 27), Decl(commentsOverloads.ts, 43, 31))
 >arr : Symbol(arr, Decl(commentsOverloads.ts, 43, 8))
 
     /** foo 4 */
     foo(arr: string[]): number;
->foo : Symbol(foo, Decl(commentsOverloads.ts, 37, 24), Decl(commentsOverloads.ts, 39, 27), Decl(commentsOverloads.ts, 41, 27), Decl(commentsOverloads.ts, 43, 31))
+>foo : Symbol(i1.foo, Decl(commentsOverloads.ts, 37, 24), Decl(commentsOverloads.ts, 39, 27), Decl(commentsOverloads.ts, 41, 27), Decl(commentsOverloads.ts, 43, 31))
 >arr : Symbol(arr, Decl(commentsOverloads.ts, 45, 8))
 
     foo2(a: number): number;
->foo2 : Symbol(foo2, Decl(commentsOverloads.ts, 45, 31), Decl(commentsOverloads.ts, 47, 28))
+>foo2 : Symbol(i1.foo2, Decl(commentsOverloads.ts, 45, 31), Decl(commentsOverloads.ts, 47, 28))
 >a : Symbol(a, Decl(commentsOverloads.ts, 47, 9))
 
     /** foo2 2*/
     foo2(b: string): number;
->foo2 : Symbol(foo2, Decl(commentsOverloads.ts, 45, 31), Decl(commentsOverloads.ts, 47, 28))
+>foo2 : Symbol(i1.foo2, Decl(commentsOverloads.ts, 45, 31), Decl(commentsOverloads.ts, 47, 28))
 >b : Symbol(b, Decl(commentsOverloads.ts, 49, 9))
 
     foo3(a: number): number;
->foo3 : Symbol(foo3, Decl(commentsOverloads.ts, 49, 28), Decl(commentsOverloads.ts, 50, 28))
+>foo3 : Symbol(i1.foo3, Decl(commentsOverloads.ts, 49, 28), Decl(commentsOverloads.ts, 50, 28))
 >a : Symbol(a, Decl(commentsOverloads.ts, 50, 9))
 
     foo3(b: string): number;
->foo3 : Symbol(foo3, Decl(commentsOverloads.ts, 49, 28), Decl(commentsOverloads.ts, 50, 28))
+>foo3 : Symbol(i1.foo3, Decl(commentsOverloads.ts, 49, 28), Decl(commentsOverloads.ts, 50, 28))
 >b : Symbol(b, Decl(commentsOverloads.ts, 51, 9))
 
     /** foo4 1*/
     foo4(a: number): number;
->foo4 : Symbol(foo4, Decl(commentsOverloads.ts, 51, 28), Decl(commentsOverloads.ts, 53, 28), Decl(commentsOverloads.ts, 54, 28))
+>foo4 : Symbol(i1.foo4, Decl(commentsOverloads.ts, 51, 28), Decl(commentsOverloads.ts, 53, 28), Decl(commentsOverloads.ts, 54, 28))
 >a : Symbol(a, Decl(commentsOverloads.ts, 53, 9))
 
     foo4(b: string): number;
->foo4 : Symbol(foo4, Decl(commentsOverloads.ts, 51, 28), Decl(commentsOverloads.ts, 53, 28), Decl(commentsOverloads.ts, 54, 28))
+>foo4 : Symbol(i1.foo4, Decl(commentsOverloads.ts, 51, 28), Decl(commentsOverloads.ts, 53, 28), Decl(commentsOverloads.ts, 54, 28))
 >b : Symbol(b, Decl(commentsOverloads.ts, 54, 9))
 
     /** foo4 any */
     foo4(c: any): any;
->foo4 : Symbol(foo4, Decl(commentsOverloads.ts, 51, 28), Decl(commentsOverloads.ts, 53, 28), Decl(commentsOverloads.ts, 54, 28))
+>foo4 : Symbol(i1.foo4, Decl(commentsOverloads.ts, 51, 28), Decl(commentsOverloads.ts, 53, 28), Decl(commentsOverloads.ts, 54, 28))
 >c : Symbol(c, Decl(commentsOverloads.ts, 56, 9))
 
     /// new 1
@@ -220,78 +220,78 @@ class c {
 >c : Symbol(c, Decl(commentsOverloads.ts, 87, 1))
 
     public prop1(a: number): number;
->prop1 : Symbol(prop1, Decl(commentsOverloads.ts, 88, 9), Decl(commentsOverloads.ts, 89, 36), Decl(commentsOverloads.ts, 90, 36))
+>prop1 : Symbol(c.prop1, Decl(commentsOverloads.ts, 88, 9), Decl(commentsOverloads.ts, 89, 36), Decl(commentsOverloads.ts, 90, 36))
 >a : Symbol(a, Decl(commentsOverloads.ts, 89, 17))
 
     public prop1(b: string): number;
->prop1 : Symbol(prop1, Decl(commentsOverloads.ts, 88, 9), Decl(commentsOverloads.ts, 89, 36), Decl(commentsOverloads.ts, 90, 36))
+>prop1 : Symbol(c.prop1, Decl(commentsOverloads.ts, 88, 9), Decl(commentsOverloads.ts, 89, 36), Decl(commentsOverloads.ts, 90, 36))
 >b : Symbol(b, Decl(commentsOverloads.ts, 90, 17))
 
     public prop1(aorb: any) {
->prop1 : Symbol(prop1, Decl(commentsOverloads.ts, 88, 9), Decl(commentsOverloads.ts, 89, 36), Decl(commentsOverloads.ts, 90, 36))
+>prop1 : Symbol(c.prop1, Decl(commentsOverloads.ts, 88, 9), Decl(commentsOverloads.ts, 89, 36), Decl(commentsOverloads.ts, 90, 36))
 >aorb : Symbol(aorb, Decl(commentsOverloads.ts, 91, 17))
 
         return 10;
     }
     /** prop2 1*/
     public prop2(a: number): number;
->prop2 : Symbol(prop2, Decl(commentsOverloads.ts, 93, 5), Decl(commentsOverloads.ts, 95, 36), Decl(commentsOverloads.ts, 96, 36))
+>prop2 : Symbol(c.prop2, Decl(commentsOverloads.ts, 93, 5), Decl(commentsOverloads.ts, 95, 36), Decl(commentsOverloads.ts, 96, 36))
 >a : Symbol(a, Decl(commentsOverloads.ts, 95, 17))
 
     public prop2(b: string): number;
->prop2 : Symbol(prop2, Decl(commentsOverloads.ts, 93, 5), Decl(commentsOverloads.ts, 95, 36), Decl(commentsOverloads.ts, 96, 36))
+>prop2 : Symbol(c.prop2, Decl(commentsOverloads.ts, 93, 5), Decl(commentsOverloads.ts, 95, 36), Decl(commentsOverloads.ts, 96, 36))
 >b : Symbol(b, Decl(commentsOverloads.ts, 96, 17))
 
     public prop2(aorb: any) {
->prop2 : Symbol(prop2, Decl(commentsOverloads.ts, 93, 5), Decl(commentsOverloads.ts, 95, 36), Decl(commentsOverloads.ts, 96, 36))
+>prop2 : Symbol(c.prop2, Decl(commentsOverloads.ts, 93, 5), Decl(commentsOverloads.ts, 95, 36), Decl(commentsOverloads.ts, 96, 36))
 >aorb : Symbol(aorb, Decl(commentsOverloads.ts, 97, 17))
 
         return 10;
     }
     public prop3(a: number): number;
->prop3 : Symbol(prop3, Decl(commentsOverloads.ts, 99, 5), Decl(commentsOverloads.ts, 100, 36), Decl(commentsOverloads.ts, 102, 36))
+>prop3 : Symbol(c.prop3, Decl(commentsOverloads.ts, 99, 5), Decl(commentsOverloads.ts, 100, 36), Decl(commentsOverloads.ts, 102, 36))
 >a : Symbol(a, Decl(commentsOverloads.ts, 100, 17))
 
     /** prop3 2*/
     public prop3(b: string): number;
->prop3 : Symbol(prop3, Decl(commentsOverloads.ts, 99, 5), Decl(commentsOverloads.ts, 100, 36), Decl(commentsOverloads.ts, 102, 36))
+>prop3 : Symbol(c.prop3, Decl(commentsOverloads.ts, 99, 5), Decl(commentsOverloads.ts, 100, 36), Decl(commentsOverloads.ts, 102, 36))
 >b : Symbol(b, Decl(commentsOverloads.ts, 102, 17))
 
     public prop3(aorb: any) {
->prop3 : Symbol(prop3, Decl(commentsOverloads.ts, 99, 5), Decl(commentsOverloads.ts, 100, 36), Decl(commentsOverloads.ts, 102, 36))
+>prop3 : Symbol(c.prop3, Decl(commentsOverloads.ts, 99, 5), Decl(commentsOverloads.ts, 100, 36), Decl(commentsOverloads.ts, 102, 36))
 >aorb : Symbol(aorb, Decl(commentsOverloads.ts, 103, 17))
 
         return 10;
     }
     /** prop4 1*/
     public prop4(a: number): number;
->prop4 : Symbol(prop4, Decl(commentsOverloads.ts, 105, 5), Decl(commentsOverloads.ts, 107, 36), Decl(commentsOverloads.ts, 109, 36))
+>prop4 : Symbol(c.prop4, Decl(commentsOverloads.ts, 105, 5), Decl(commentsOverloads.ts, 107, 36), Decl(commentsOverloads.ts, 109, 36))
 >a : Symbol(a, Decl(commentsOverloads.ts, 107, 17))
 
     /** prop4 2*/
     public prop4(b: string): number;
->prop4 : Symbol(prop4, Decl(commentsOverloads.ts, 105, 5), Decl(commentsOverloads.ts, 107, 36), Decl(commentsOverloads.ts, 109, 36))
+>prop4 : Symbol(c.prop4, Decl(commentsOverloads.ts, 105, 5), Decl(commentsOverloads.ts, 107, 36), Decl(commentsOverloads.ts, 109, 36))
 >b : Symbol(b, Decl(commentsOverloads.ts, 109, 17))
 
     public prop4(aorb: any) {
->prop4 : Symbol(prop4, Decl(commentsOverloads.ts, 105, 5), Decl(commentsOverloads.ts, 107, 36), Decl(commentsOverloads.ts, 109, 36))
+>prop4 : Symbol(c.prop4, Decl(commentsOverloads.ts, 105, 5), Decl(commentsOverloads.ts, 107, 36), Decl(commentsOverloads.ts, 109, 36))
 >aorb : Symbol(aorb, Decl(commentsOverloads.ts, 110, 17))
 
         return 10;
     }
     /** prop5 1*/
     public prop5(a: number): number;
->prop5 : Symbol(prop5, Decl(commentsOverloads.ts, 112, 5), Decl(commentsOverloads.ts, 114, 36), Decl(commentsOverloads.ts, 116, 36))
+>prop5 : Symbol(c.prop5, Decl(commentsOverloads.ts, 112, 5), Decl(commentsOverloads.ts, 114, 36), Decl(commentsOverloads.ts, 116, 36))
 >a : Symbol(a, Decl(commentsOverloads.ts, 114, 17))
 
     /** prop5 2*/
     public prop5(b: string): number;
->prop5 : Symbol(prop5, Decl(commentsOverloads.ts, 112, 5), Decl(commentsOverloads.ts, 114, 36), Decl(commentsOverloads.ts, 116, 36))
+>prop5 : Symbol(c.prop5, Decl(commentsOverloads.ts, 112, 5), Decl(commentsOverloads.ts, 114, 36), Decl(commentsOverloads.ts, 116, 36))
 >b : Symbol(b, Decl(commentsOverloads.ts, 116, 17))
 
     /** Prop5 implementaion*/
     public prop5(aorb: any) {
->prop5 : Symbol(prop5, Decl(commentsOverloads.ts, 112, 5), Decl(commentsOverloads.ts, 114, 36), Decl(commentsOverloads.ts, 116, 36))
+>prop5 : Symbol(c.prop5, Decl(commentsOverloads.ts, 112, 5), Decl(commentsOverloads.ts, 114, 36), Decl(commentsOverloads.ts, 116, 36))
 >aorb : Symbol(aorb, Decl(commentsOverloads.ts, 118, 17))
 
         return 10;
diff --git a/tests/baselines/reference/commentsTypeParameters.symbols b/tests/baselines/reference/commentsTypeParameters.symbols
index 466ca3ff9a9..26041d6b44f 100644
--- a/tests/baselines/reference/commentsTypeParameters.symbols
+++ b/tests/baselines/reference/commentsTypeParameters.symbols
@@ -4,7 +4,7 @@ class C</**docComment for type parameter*/ T> {
 >T : Symbol(T, Decl(commentsTypeParameters.ts, 0, 8))
 
     method</**docComment of method type parameter */ U extends T>(a: U) {
->method : Symbol(method, Decl(commentsTypeParameters.ts, 0, 47))
+>method : Symbol(C.method, Decl(commentsTypeParameters.ts, 0, 47))
 >U : Symbol(U, Decl(commentsTypeParameters.ts, 1, 11))
 >T : Symbol(T, Decl(commentsTypeParameters.ts, 0, 8))
 >a : Symbol(a, Decl(commentsTypeParameters.ts, 1, 66))
@@ -18,7 +18,7 @@ class C</**docComment for type parameter*/ T> {
     }
 
     private privatemethod</**docComment of method type parameter */ U extends T>(a: U) {
->privatemethod : Symbol(privatemethod, Decl(commentsTypeParameters.ts, 4, 5))
+>privatemethod : Symbol(C.privatemethod, Decl(commentsTypeParameters.ts, 4, 5))
 >U : Symbol(U, Decl(commentsTypeParameters.ts, 6, 26))
 >T : Symbol(T, Decl(commentsTypeParameters.ts, 0, 8))
 >a : Symbol(a, Decl(commentsTypeParameters.ts, 6, 81))
diff --git a/tests/baselines/reference/commentsdoNotEmitComments.symbols b/tests/baselines/reference/commentsdoNotEmitComments.symbols
index a7ba4076d9d..01555496dce 100644
--- a/tests/baselines/reference/commentsdoNotEmitComments.symbols
+++ b/tests/baselines/reference/commentsdoNotEmitComments.symbols
@@ -30,53 +30,53 @@ class c {
 
     /** property comment */
     public b = 10;
->b : Symbol(b, Decl(commentsdoNotEmitComments.ts, 17, 5))
+>b : Symbol(c.b, Decl(commentsdoNotEmitComments.ts, 17, 5))
 
     /** function comment */
     public myFoo() {
->myFoo : Symbol(myFoo, Decl(commentsdoNotEmitComments.ts, 20, 18))
+>myFoo : Symbol(c.myFoo, Decl(commentsdoNotEmitComments.ts, 20, 18))
 
         return this.b;
->this.b : Symbol(b, Decl(commentsdoNotEmitComments.ts, 17, 5))
+>this.b : Symbol(c.b, Decl(commentsdoNotEmitComments.ts, 17, 5))
 >this : Symbol(c, Decl(commentsdoNotEmitComments.ts, 11, 9))
->b : Symbol(b, Decl(commentsdoNotEmitComments.ts, 17, 5))
+>b : Symbol(c.b, Decl(commentsdoNotEmitComments.ts, 17, 5))
     }
 
     /** getter comment*/
     public get prop1() {
->prop1 : Symbol(prop1, Decl(commentsdoNotEmitComments.ts, 25, 5), Decl(commentsdoNotEmitComments.ts, 30, 5))
+>prop1 : Symbol(c.prop1, Decl(commentsdoNotEmitComments.ts, 25, 5), Decl(commentsdoNotEmitComments.ts, 30, 5))
 
         return this.b;
->this.b : Symbol(b, Decl(commentsdoNotEmitComments.ts, 17, 5))
+>this.b : Symbol(c.b, Decl(commentsdoNotEmitComments.ts, 17, 5))
 >this : Symbol(c, Decl(commentsdoNotEmitComments.ts, 11, 9))
->b : Symbol(b, Decl(commentsdoNotEmitComments.ts, 17, 5))
+>b : Symbol(c.b, Decl(commentsdoNotEmitComments.ts, 17, 5))
     }
 
     /** setter comment*/
     public set prop1(val: number) {
->prop1 : Symbol(prop1, Decl(commentsdoNotEmitComments.ts, 25, 5), Decl(commentsdoNotEmitComments.ts, 30, 5))
+>prop1 : Symbol(c.prop1, Decl(commentsdoNotEmitComments.ts, 25, 5), Decl(commentsdoNotEmitComments.ts, 30, 5))
 >val : Symbol(val, Decl(commentsdoNotEmitComments.ts, 33, 21))
 
         this.b = val;
->this.b : Symbol(b, Decl(commentsdoNotEmitComments.ts, 17, 5))
+>this.b : Symbol(c.b, Decl(commentsdoNotEmitComments.ts, 17, 5))
 >this : Symbol(c, Decl(commentsdoNotEmitComments.ts, 11, 9))
->b : Symbol(b, Decl(commentsdoNotEmitComments.ts, 17, 5))
+>b : Symbol(c.b, Decl(commentsdoNotEmitComments.ts, 17, 5))
 >val : Symbol(val, Decl(commentsdoNotEmitComments.ts, 33, 21))
     }
 
     /** overload signature1*/
     public foo1(a: number): string;
->foo1 : Symbol(foo1, Decl(commentsdoNotEmitComments.ts, 35, 5), Decl(commentsdoNotEmitComments.ts, 38, 35), Decl(commentsdoNotEmitComments.ts, 40, 35))
+>foo1 : Symbol(c.foo1, Decl(commentsdoNotEmitComments.ts, 35, 5), Decl(commentsdoNotEmitComments.ts, 38, 35), Decl(commentsdoNotEmitComments.ts, 40, 35))
 >a : Symbol(a, Decl(commentsdoNotEmitComments.ts, 38, 16))
 
     /** Overload signature 2*/
     public foo1(b: string): string;
->foo1 : Symbol(foo1, Decl(commentsdoNotEmitComments.ts, 35, 5), Decl(commentsdoNotEmitComments.ts, 38, 35), Decl(commentsdoNotEmitComments.ts, 40, 35))
+>foo1 : Symbol(c.foo1, Decl(commentsdoNotEmitComments.ts, 35, 5), Decl(commentsdoNotEmitComments.ts, 38, 35), Decl(commentsdoNotEmitComments.ts, 40, 35))
 >b : Symbol(b, Decl(commentsdoNotEmitComments.ts, 40, 16))
 
     /** overload implementation signature*/
     public foo1(aOrb) {
->foo1 : Symbol(foo1, Decl(commentsdoNotEmitComments.ts, 35, 5), Decl(commentsdoNotEmitComments.ts, 38, 35), Decl(commentsdoNotEmitComments.ts, 40, 35))
+>foo1 : Symbol(c.foo1, Decl(commentsdoNotEmitComments.ts, 35, 5), Decl(commentsdoNotEmitComments.ts, 38, 35), Decl(commentsdoNotEmitComments.ts, 40, 35))
 >aOrb : Symbol(aOrb, Decl(commentsdoNotEmitComments.ts, 42, 16))
 
         return aOrb.toString();
@@ -107,12 +107,12 @@ interface i1 {
 
     /** function property;*/
     myFoo(/*param prop*/a: number): string;
->myFoo : Symbol(myFoo, Decl(commentsdoNotEmitComments.ts, 59, 24))
+>myFoo : Symbol(i1.myFoo, Decl(commentsdoNotEmitComments.ts, 59, 24))
 >a : Symbol(a, Decl(commentsdoNotEmitComments.ts, 62, 10))
 
     /** prop*/
     prop: string;
->prop : Symbol(prop, Decl(commentsdoNotEmitComments.ts, 62, 43))
+>prop : Symbol(i1.prop, Decl(commentsdoNotEmitComments.ts, 62, 43))
 }
 
 /**interface instance comments*/
@@ -129,7 +129,7 @@ module m1 {
 >b : Symbol(b, Decl(commentsdoNotEmitComments.ts, 72, 11))
 
         constructor(public x: number) {
->x : Symbol(x, Decl(commentsdoNotEmitComments.ts, 75, 20))
+>x : Symbol(b.x, Decl(commentsdoNotEmitComments.ts, 75, 20))
            
         }
     }
diff --git a/tests/baselines/reference/commentsemitComments.symbols b/tests/baselines/reference/commentsemitComments.symbols
index 6c0683d5372..eec41dccec6 100644
--- a/tests/baselines/reference/commentsemitComments.symbols
+++ b/tests/baselines/reference/commentsemitComments.symbols
@@ -30,53 +30,53 @@ class c {
 
     /** property comment */
     public b = 10;
->b : Symbol(b, Decl(commentsemitComments.ts, 17, 5))
+>b : Symbol(c.b, Decl(commentsemitComments.ts, 17, 5))
 
     /** function comment */
     public myFoo() {
->myFoo : Symbol(myFoo, Decl(commentsemitComments.ts, 20, 18))
+>myFoo : Symbol(c.myFoo, Decl(commentsemitComments.ts, 20, 18))
 
         return this.b;
->this.b : Symbol(b, Decl(commentsemitComments.ts, 17, 5))
+>this.b : Symbol(c.b, Decl(commentsemitComments.ts, 17, 5))
 >this : Symbol(c, Decl(commentsemitComments.ts, 11, 9))
->b : Symbol(b, Decl(commentsemitComments.ts, 17, 5))
+>b : Symbol(c.b, Decl(commentsemitComments.ts, 17, 5))
     }
 
     /** getter comment*/
     public get prop1() {
->prop1 : Symbol(prop1, Decl(commentsemitComments.ts, 25, 5), Decl(commentsemitComments.ts, 30, 5))
+>prop1 : Symbol(c.prop1, Decl(commentsemitComments.ts, 25, 5), Decl(commentsemitComments.ts, 30, 5))
 
         return this.b;
->this.b : Symbol(b, Decl(commentsemitComments.ts, 17, 5))
+>this.b : Symbol(c.b, Decl(commentsemitComments.ts, 17, 5))
 >this : Symbol(c, Decl(commentsemitComments.ts, 11, 9))
->b : Symbol(b, Decl(commentsemitComments.ts, 17, 5))
+>b : Symbol(c.b, Decl(commentsemitComments.ts, 17, 5))
     }
 
     /** setter comment*/
     public set prop1(val: number) {
->prop1 : Symbol(prop1, Decl(commentsemitComments.ts, 25, 5), Decl(commentsemitComments.ts, 30, 5))
+>prop1 : Symbol(c.prop1, Decl(commentsemitComments.ts, 25, 5), Decl(commentsemitComments.ts, 30, 5))
 >val : Symbol(val, Decl(commentsemitComments.ts, 33, 21))
 
         this.b = val;
->this.b : Symbol(b, Decl(commentsemitComments.ts, 17, 5))
+>this.b : Symbol(c.b, Decl(commentsemitComments.ts, 17, 5))
 >this : Symbol(c, Decl(commentsemitComments.ts, 11, 9))
->b : Symbol(b, Decl(commentsemitComments.ts, 17, 5))
+>b : Symbol(c.b, Decl(commentsemitComments.ts, 17, 5))
 >val : Symbol(val, Decl(commentsemitComments.ts, 33, 21))
     }
 
     /** overload signature1*/
     public foo1(a: number): string;
->foo1 : Symbol(foo1, Decl(commentsemitComments.ts, 35, 5), Decl(commentsemitComments.ts, 38, 35), Decl(commentsemitComments.ts, 40, 35))
+>foo1 : Symbol(c.foo1, Decl(commentsemitComments.ts, 35, 5), Decl(commentsemitComments.ts, 38, 35), Decl(commentsemitComments.ts, 40, 35))
 >a : Symbol(a, Decl(commentsemitComments.ts, 38, 16))
 
     /** Overload signature 2*/
     public foo1(b: string): string;
->foo1 : Symbol(foo1, Decl(commentsemitComments.ts, 35, 5), Decl(commentsemitComments.ts, 38, 35), Decl(commentsemitComments.ts, 40, 35))
+>foo1 : Symbol(c.foo1, Decl(commentsemitComments.ts, 35, 5), Decl(commentsemitComments.ts, 38, 35), Decl(commentsemitComments.ts, 40, 35))
 >b : Symbol(b, Decl(commentsemitComments.ts, 40, 16))
 
     /** overload implementation signature*/
     public foo1(aOrb) {
->foo1 : Symbol(foo1, Decl(commentsemitComments.ts, 35, 5), Decl(commentsemitComments.ts, 38, 35), Decl(commentsemitComments.ts, 40, 35))
+>foo1 : Symbol(c.foo1, Decl(commentsemitComments.ts, 35, 5), Decl(commentsemitComments.ts, 38, 35), Decl(commentsemitComments.ts, 40, 35))
 >aOrb : Symbol(aOrb, Decl(commentsemitComments.ts, 42, 16))
 
         return aOrb.toString();
@@ -107,12 +107,12 @@ interface i1 {
 
     /** function property;*/
     myFoo(/*param prop*/a: number): string;
->myFoo : Symbol(myFoo, Decl(commentsemitComments.ts, 59, 24))
+>myFoo : Symbol(i1.myFoo, Decl(commentsemitComments.ts, 59, 24))
 >a : Symbol(a, Decl(commentsemitComments.ts, 62, 10))
 
     /** prop*/
     prop: string;
->prop : Symbol(prop, Decl(commentsemitComments.ts, 62, 43))
+>prop : Symbol(i1.prop, Decl(commentsemitComments.ts, 62, 43))
 }
 
 /**interface instance comments*/
@@ -129,7 +129,7 @@ module m1 {
 >b : Symbol(b, Decl(commentsemitComments.ts, 72, 11))
 
         constructor(public x: number) {
->x : Symbol(x, Decl(commentsemitComments.ts, 75, 20))
+>x : Symbol(b.x, Decl(commentsemitComments.ts, 75, 20))
 
         }
     }
diff --git a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
index b8cf42ea762..d22b5b2855b 100644
--- a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
+++ b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
@@ -21,8 +21,8 @@ var C1 = (function () {
     }
     return C1;
 }());
-C1.s1 = true;
 exports.C1 = C1;
+C1.s1 = true;
 //// [foo_1.js]
 "use strict";
 var foo = require("./foo_0");
diff --git a/tests/baselines/reference/commonJSImportAsPrimaryExpression.symbols b/tests/baselines/reference/commonJSImportAsPrimaryExpression.symbols
index b640adc58a4..4871e7993fb 100644
--- a/tests/baselines/reference/commonJSImportAsPrimaryExpression.symbols
+++ b/tests/baselines/reference/commonJSImportAsPrimaryExpression.symbols
@@ -17,7 +17,7 @@ export class C1 {
 >C1 : Symbol(C1, Decl(foo_0.ts, 0, 0))
 
 	m1 = 42;
->m1 : Symbol(m1, Decl(foo_0.ts, 0, 17))
+>m1 : Symbol(C1.m1, Decl(foo_0.ts, 0, 17))
 
 	static s1 = true;
 >s1 : Symbol(C1.s1, Decl(foo_0.ts, 1, 9))
diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
index 34d5c343b3c..e7496f3445f 100644
--- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
+++ b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
@@ -39,8 +39,8 @@ var C1 = (function () {
     }
     return C1;
 }());
-C1.s1 = true;
 exports.C1 = C1;
+C1.s1 = true;
 (function (E1) {
     E1[E1["A"] = 0] = "A";
     E1[E1["B"] = 1] = "B";
diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.symbols b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.symbols
index 68a852c6165..ae67c0a3175 100644
--- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.symbols
+++ b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.symbols
@@ -43,7 +43,7 @@ export class C1 {
 >C1 : Symbol(C1, Decl(foo_0.ts, 0, 0))
 
 	m1 = 42;
->m1 : Symbol(m1, Decl(foo_0.ts, 0, 17))
+>m1 : Symbol(C1.m1, Decl(foo_0.ts, 0, 17))
 
 	static s1 = true;
 >s1 : Symbol(C1.s1, Decl(foo_0.ts, 1, 9))
@@ -53,10 +53,10 @@ export interface I1 {
 >I1 : Symbol(I1, Decl(foo_0.ts, 3, 1))
 
 	name: string;
->name : Symbol(name, Decl(foo_0.ts, 5, 21))
+>name : Symbol(I1.name, Decl(foo_0.ts, 5, 21))
 
 	age: number;
->age : Symbol(age, Decl(foo_0.ts, 6, 14))
+>age : Symbol(I1.age, Decl(foo_0.ts, 6, 14))
 }
 
 export module M1 {
@@ -66,7 +66,7 @@ export module M1 {
 >I2 : Symbol(I2, Decl(foo_0.ts, 10, 18))
 
 		foo: string;
->foo : Symbol(foo, Decl(foo_0.ts, 11, 22))
+>foo : Symbol(I2.foo, Decl(foo_0.ts, 11, 22))
 	}
 }
 
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/comparisonOperatorWithIdenticalObjects.symbols b/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.symbols
index a5acf69be2f..72b111d3540 100644
--- a/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.symbols
+++ b/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.symbols
@@ -3,23 +3,23 @@ class A1 {
 >A1 : Symbol(A1, Decl(comparisonOperatorWithIdenticalObjects.ts, 0, 0))
 
     public a: string;
->a : Symbol(a, Decl(comparisonOperatorWithIdenticalObjects.ts, 0, 10))
+>a : Symbol(A1.a, Decl(comparisonOperatorWithIdenticalObjects.ts, 0, 10))
 
     public b: number;
->b : Symbol(b, Decl(comparisonOperatorWithIdenticalObjects.ts, 1, 21))
+>b : Symbol(A1.b, Decl(comparisonOperatorWithIdenticalObjects.ts, 1, 21))
 
     public c: boolean;
->c : Symbol(c, Decl(comparisonOperatorWithIdenticalObjects.ts, 2, 21))
+>c : Symbol(A1.c, Decl(comparisonOperatorWithIdenticalObjects.ts, 2, 21))
 
     public d: any;
->d : Symbol(d, Decl(comparisonOperatorWithIdenticalObjects.ts, 3, 22))
+>d : Symbol(A1.d, Decl(comparisonOperatorWithIdenticalObjects.ts, 3, 22))
 
     public e: Object;
->e : Symbol(e, Decl(comparisonOperatorWithIdenticalObjects.ts, 4, 18))
+>e : Symbol(A1.e, Decl(comparisonOperatorWithIdenticalObjects.ts, 4, 18))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     public fn(a: string): string {
->fn : Symbol(fn, Decl(comparisonOperatorWithIdenticalObjects.ts, 5, 21))
+>fn : Symbol(A1.fn, Decl(comparisonOperatorWithIdenticalObjects.ts, 5, 21))
 >a : Symbol(a, Decl(comparisonOperatorWithIdenticalObjects.ts, 6, 14))
 
         return null;
@@ -29,23 +29,23 @@ class B1 {
 >B1 : Symbol(B1, Decl(comparisonOperatorWithIdenticalObjects.ts, 9, 1))
 
     public a: string;
->a : Symbol(a, Decl(comparisonOperatorWithIdenticalObjects.ts, 10, 10))
+>a : Symbol(B1.a, Decl(comparisonOperatorWithIdenticalObjects.ts, 10, 10))
 
     public b: number;
->b : Symbol(b, Decl(comparisonOperatorWithIdenticalObjects.ts, 11, 21))
+>b : Symbol(B1.b, Decl(comparisonOperatorWithIdenticalObjects.ts, 11, 21))
 
     public c: boolean;
->c : Symbol(c, Decl(comparisonOperatorWithIdenticalObjects.ts, 12, 21))
+>c : Symbol(B1.c, Decl(comparisonOperatorWithIdenticalObjects.ts, 12, 21))
 
     public d: any;
->d : Symbol(d, Decl(comparisonOperatorWithIdenticalObjects.ts, 13, 22))
+>d : Symbol(B1.d, Decl(comparisonOperatorWithIdenticalObjects.ts, 13, 22))
 
     public e: Object;
->e : Symbol(e, Decl(comparisonOperatorWithIdenticalObjects.ts, 14, 18))
+>e : Symbol(B1.e, Decl(comparisonOperatorWithIdenticalObjects.ts, 14, 18))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     public fn(b: string): string {
->fn : Symbol(fn, Decl(comparisonOperatorWithIdenticalObjects.ts, 15, 21))
+>fn : Symbol(B1.fn, Decl(comparisonOperatorWithIdenticalObjects.ts, 15, 21))
 >b : Symbol(b, Decl(comparisonOperatorWithIdenticalObjects.ts, 16, 14))
 
         return null;
@@ -56,10 +56,10 @@ class Base {
 >Base : Symbol(Base, Decl(comparisonOperatorWithIdenticalObjects.ts, 19, 1))
 
     private a: string;
->a : Symbol(a, Decl(comparisonOperatorWithIdenticalObjects.ts, 21, 12))
+>a : Symbol(Base.a, Decl(comparisonOperatorWithIdenticalObjects.ts, 21, 12))
 
     private fn(b: string): string {
->fn : Symbol(fn, Decl(comparisonOperatorWithIdenticalObjects.ts, 22, 22))
+>fn : Symbol(Base.fn, Decl(comparisonOperatorWithIdenticalObjects.ts, 22, 22))
 >b : Symbol(b, Decl(comparisonOperatorWithIdenticalObjects.ts, 23, 15))
 
         return null;
@@ -75,12 +75,12 @@ class B2 extends Base { }
 
 interface A3 { f(a: number): string; }
 >A3 : Symbol(A3, Decl(comparisonOperatorWithIdenticalObjects.ts, 28, 25))
->f : Symbol(f, Decl(comparisonOperatorWithIdenticalObjects.ts, 30, 14))
+>f : Symbol(A3.f, Decl(comparisonOperatorWithIdenticalObjects.ts, 30, 14))
 >a : Symbol(a, Decl(comparisonOperatorWithIdenticalObjects.ts, 30, 17))
 
 interface B3 { f(a: number): string; }
 >B3 : Symbol(B3, Decl(comparisonOperatorWithIdenticalObjects.ts, 30, 38))
->f : Symbol(f, Decl(comparisonOperatorWithIdenticalObjects.ts, 31, 14))
+>f : Symbol(B3.f, Decl(comparisonOperatorWithIdenticalObjects.ts, 31, 14))
 >a : Symbol(a, Decl(comparisonOperatorWithIdenticalObjects.ts, 31, 17))
 
 interface A4 { new (a: string): A1; }
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.errors.txt b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.errors.txt
index fe608b14379..2efaf2e5ae2 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.errors.txt
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.errors.txt
@@ -1,70 +1,54 @@
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(26,12): error TS2365: Operator '<' cannot be applied to types '{ [a: string]: string; }' and '{ [b: string]: number; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(27,12): error TS2365: Operator '<' cannot be applied to types '{ [index: string]: Base; }' and '{ [index: string]: C; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(28,12): error TS2365: Operator '<' cannot be applied to types '{ [index: number]: Base; }' and '{ [index: number]: C; }'.
-tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(29,12): error TS2365: Operator '<' cannot be applied to types '{ [index: number]: Derived; }' and '{ [index: string]: Base; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(31,12): error TS2365: Operator '<' cannot be applied to types '{ [b: string]: number; }' and '{ [a: string]: string; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(32,12): error TS2365: Operator '<' cannot be applied to types '{ [index: string]: C; }' and '{ [index: string]: Base; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(33,12): error TS2365: Operator '<' cannot be applied to types '{ [index: number]: C; }' and '{ [index: number]: Base; }'.
-tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(34,12): error TS2365: Operator '<' cannot be applied to types '{ [index: string]: Base; }' and '{ [index: number]: Derived; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(37,12): error TS2365: Operator '>' cannot be applied to types '{ [a: string]: string; }' and '{ [b: string]: number; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(38,12): error TS2365: Operator '>' cannot be applied to types '{ [index: string]: Base; }' and '{ [index: string]: C; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(39,12): error TS2365: Operator '>' cannot be applied to types '{ [index: number]: Base; }' and '{ [index: number]: C; }'.
-tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(40,12): error TS2365: Operator '>' cannot be applied to types '{ [index: number]: Derived; }' and '{ [index: string]: Base; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(42,12): error TS2365: Operator '>' cannot be applied to types '{ [b: string]: number; }' and '{ [a: string]: string; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(43,12): error TS2365: Operator '>' cannot be applied to types '{ [index: string]: C; }' and '{ [index: string]: Base; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(44,12): error TS2365: Operator '>' cannot be applied to types '{ [index: number]: C; }' and '{ [index: number]: Base; }'.
-tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(45,12): error TS2365: Operator '>' cannot be applied to types '{ [index: string]: Base; }' and '{ [index: number]: Derived; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(48,12): error TS2365: Operator '<=' cannot be applied to types '{ [a: string]: string; }' and '{ [b: string]: number; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(49,12): error TS2365: Operator '<=' cannot be applied to types '{ [index: string]: Base; }' and '{ [index: string]: C; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(50,12): error TS2365: Operator '<=' cannot be applied to types '{ [index: number]: Base; }' and '{ [index: number]: C; }'.
-tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(51,12): error TS2365: Operator '<=' cannot be applied to types '{ [index: number]: Derived; }' and '{ [index: string]: Base; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(53,12): error TS2365: Operator '<=' cannot be applied to types '{ [b: string]: number; }' and '{ [a: string]: string; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(54,12): error TS2365: Operator '<=' cannot be applied to types '{ [index: string]: C; }' and '{ [index: string]: Base; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(55,12): error TS2365: Operator '<=' cannot be applied to types '{ [index: number]: C; }' and '{ [index: number]: Base; }'.
-tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(56,12): error TS2365: Operator '<=' cannot be applied to types '{ [index: string]: Base; }' and '{ [index: number]: Derived; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(59,12): error TS2365: Operator '>=' cannot be applied to types '{ [a: string]: string; }' and '{ [b: string]: number; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(60,12): error TS2365: Operator '>=' cannot be applied to types '{ [index: string]: Base; }' and '{ [index: string]: C; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(61,12): error TS2365: Operator '>=' cannot be applied to types '{ [index: number]: Base; }' and '{ [index: number]: C; }'.
-tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(62,12): error TS2365: Operator '>=' cannot be applied to types '{ [index: number]: Derived; }' and '{ [index: string]: Base; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(64,12): error TS2365: Operator '>=' cannot be applied to types '{ [b: string]: number; }' and '{ [a: string]: string; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(65,12): error TS2365: Operator '>=' cannot be applied to types '{ [index: string]: C; }' and '{ [index: string]: Base; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(66,12): error TS2365: Operator '>=' cannot be applied to types '{ [index: number]: C; }' and '{ [index: number]: Base; }'.
-tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(67,12): error TS2365: Operator '>=' cannot be applied to types '{ [index: string]: Base; }' and '{ [index: number]: Derived; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(70,12): error TS2365: Operator '==' cannot be applied to types '{ [a: string]: string; }' and '{ [b: string]: number; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(71,12): error TS2365: Operator '==' cannot be applied to types '{ [index: string]: Base; }' and '{ [index: string]: C; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(72,12): error TS2365: Operator '==' cannot be applied to types '{ [index: number]: Base; }' and '{ [index: number]: C; }'.
-tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(73,12): error TS2365: Operator '==' cannot be applied to types '{ [index: number]: Derived; }' and '{ [index: string]: Base; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(75,12): error TS2365: Operator '==' cannot be applied to types '{ [b: string]: number; }' and '{ [a: string]: string; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(76,12): error TS2365: Operator '==' cannot be applied to types '{ [index: string]: C; }' and '{ [index: string]: Base; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(77,12): error TS2365: Operator '==' cannot be applied to types '{ [index: number]: C; }' and '{ [index: number]: Base; }'.
-tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(78,12): error TS2365: Operator '==' cannot be applied to types '{ [index: string]: Base; }' and '{ [index: number]: Derived; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(81,12): error TS2365: Operator '!=' cannot be applied to types '{ [a: string]: string; }' and '{ [b: string]: number; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(82,12): error TS2365: Operator '!=' cannot be applied to types '{ [index: string]: Base; }' and '{ [index: string]: C; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(83,12): error TS2365: Operator '!=' cannot be applied to types '{ [index: number]: Base; }' and '{ [index: number]: C; }'.
-tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(84,12): error TS2365: Operator '!=' cannot be applied to types '{ [index: number]: Derived; }' and '{ [index: string]: Base; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(86,12): error TS2365: Operator '!=' cannot be applied to types '{ [b: string]: number; }' and '{ [a: string]: string; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(87,12): error TS2365: Operator '!=' cannot be applied to types '{ [index: string]: C; }' and '{ [index: string]: Base; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(88,12): error TS2365: Operator '!=' cannot be applied to types '{ [index: number]: C; }' and '{ [index: number]: Base; }'.
-tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(89,12): error TS2365: Operator '!=' cannot be applied to types '{ [index: string]: Base; }' and '{ [index: number]: Derived; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(92,12): error TS2365: Operator '===' cannot be applied to types '{ [a: string]: string; }' and '{ [b: string]: number; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(93,12): error TS2365: Operator '===' cannot be applied to types '{ [index: string]: Base; }' and '{ [index: string]: C; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(94,12): error TS2365: Operator '===' cannot be applied to types '{ [index: number]: Base; }' and '{ [index: number]: C; }'.
-tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(95,12): error TS2365: Operator '===' cannot be applied to types '{ [index: number]: Derived; }' and '{ [index: string]: Base; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(97,12): error TS2365: Operator '===' cannot be applied to types '{ [b: string]: number; }' and '{ [a: string]: string; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(98,12): error TS2365: Operator '===' cannot be applied to types '{ [index: string]: C; }' and '{ [index: string]: Base; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(99,12): error TS2365: Operator '===' cannot be applied to types '{ [index: number]: C; }' and '{ [index: number]: Base; }'.
-tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(100,12): error TS2365: Operator '===' cannot be applied to types '{ [index: string]: Base; }' and '{ [index: number]: Derived; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(103,12): error TS2365: Operator '!==' cannot be applied to types '{ [a: string]: string; }' and '{ [b: string]: number; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(104,12): error TS2365: Operator '!==' cannot be applied to types '{ [index: string]: Base; }' and '{ [index: string]: C; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(105,12): error TS2365: Operator '!==' cannot be applied to types '{ [index: number]: Base; }' and '{ [index: number]: C; }'.
-tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(106,12): error TS2365: Operator '!==' cannot be applied to types '{ [index: number]: Derived; }' and '{ [index: string]: Base; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(108,12): error TS2365: Operator '!==' cannot be applied to types '{ [b: string]: number; }' and '{ [a: string]: string; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(109,12): error TS2365: Operator '!==' cannot be applied to types '{ [index: string]: C; }' and '{ [index: string]: Base; }'.
 tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(110,12): error TS2365: Operator '!==' cannot be applied to types '{ [index: number]: C; }' and '{ [index: number]: Base; }'.
-tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts(111,12): error TS2365: Operator '!==' cannot be applied to types '{ [index: string]: Base; }' and '{ [index: number]: Derived; }'.
 
 
-==== tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts (64 errors) ====
+==== tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.ts (48 errors) ====
     class Base {
         public a: string;
     }
@@ -100,8 +84,6 @@ tests/cases/conformance/expressions/binaryOperators/comparisonOperator/compariso
                ~~~~~~~
 !!! error TS2365: Operator '<' cannot be applied to types '{ [index: number]: Base; }' and '{ [index: number]: C; }'.
     var r1a4 = a4 < b4;
-               ~~~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '{ [index: number]: Derived; }' and '{ [index: string]: Base; }'.
     
     var r1b1 = b1 < a1;
                ~~~~~~~
@@ -113,8 +95,6 @@ tests/cases/conformance/expressions/binaryOperators/comparisonOperator/compariso
                ~~~~~~~
 !!! error TS2365: Operator '<' cannot be applied to types '{ [index: number]: C; }' and '{ [index: number]: Base; }'.
     var r1b4 = b4 < a4;
-               ~~~~~~~
-!!! error TS2365: Operator '<' cannot be applied to types '{ [index: string]: Base; }' and '{ [index: number]: Derived; }'.
     
     // operator >
     var r2a1 = a1 > b1;
@@ -127,8 +107,6 @@ tests/cases/conformance/expressions/binaryOperators/comparisonOperator/compariso
                ~~~~~~~
 !!! error TS2365: Operator '>' cannot be applied to types '{ [index: number]: Base; }' and '{ [index: number]: C; }'.
     var r2a4 = a4 > b4;
-               ~~~~~~~
-!!! error TS2365: Operator '>' cannot be applied to types '{ [index: number]: Derived; }' and '{ [index: string]: Base; }'.
     
     var r2b1 = b1 > a1;
                ~~~~~~~
@@ -140,8 +118,6 @@ tests/cases/conformance/expressions/binaryOperators/comparisonOperator/compariso
                ~~~~~~~
 !!! error TS2365: Operator '>' cannot be applied to types '{ [index: number]: C; }' and '{ [index: number]: Base; }'.
     var r2b4 = b4 > a4;
-               ~~~~~~~
-!!! error TS2365: Operator '>' cannot be applied to types '{ [index: string]: Base; }' and '{ [index: number]: Derived; }'.
     
     // operator <=
     var r3a1 = a1 <= b1;
@@ -154,8 +130,6 @@ tests/cases/conformance/expressions/binaryOperators/comparisonOperator/compariso
                ~~~~~~~~
 !!! error TS2365: Operator '<=' cannot be applied to types '{ [index: number]: Base; }' and '{ [index: number]: C; }'.
     var r3a4 = a4 <= b4;
-               ~~~~~~~~
-!!! error TS2365: Operator '<=' cannot be applied to types '{ [index: number]: Derived; }' and '{ [index: string]: Base; }'.
     
     var r3b1 = b1 <= a1;
                ~~~~~~~~
@@ -167,8 +141,6 @@ tests/cases/conformance/expressions/binaryOperators/comparisonOperator/compariso
                ~~~~~~~~
 !!! error TS2365: Operator '<=' cannot be applied to types '{ [index: number]: C; }' and '{ [index: number]: Base; }'.
     var r3b4 = b4 <= a4;
-               ~~~~~~~~
-!!! error TS2365: Operator '<=' cannot be applied to types '{ [index: string]: Base; }' and '{ [index: number]: Derived; }'.
     
     // operator >=
     var r4a1 = a1 >= b1;
@@ -181,8 +153,6 @@ tests/cases/conformance/expressions/binaryOperators/comparisonOperator/compariso
                ~~~~~~~~
 !!! error TS2365: Operator '>=' cannot be applied to types '{ [index: number]: Base; }' and '{ [index: number]: C; }'.
     var r4a4 = a4 >= b4;
-               ~~~~~~~~
-!!! error TS2365: Operator '>=' cannot be applied to types '{ [index: number]: Derived; }' and '{ [index: string]: Base; }'.
     
     var r4b1 = b1 >= a1;
                ~~~~~~~~
@@ -194,8 +164,6 @@ tests/cases/conformance/expressions/binaryOperators/comparisonOperator/compariso
                ~~~~~~~~
 !!! error TS2365: Operator '>=' cannot be applied to types '{ [index: number]: C; }' and '{ [index: number]: Base; }'.
     var r4b4 = b4 >= a4;
-               ~~~~~~~~
-!!! error TS2365: Operator '>=' cannot be applied to types '{ [index: string]: Base; }' and '{ [index: number]: Derived; }'.
     
     // operator ==
     var r5a1 = a1 == b1;
@@ -208,8 +176,6 @@ tests/cases/conformance/expressions/binaryOperators/comparisonOperator/compariso
                ~~~~~~~~
 !!! error TS2365: Operator '==' cannot be applied to types '{ [index: number]: Base; }' and '{ [index: number]: C; }'.
     var r5a4 = a4 == b4;
-               ~~~~~~~~
-!!! error TS2365: Operator '==' cannot be applied to types '{ [index: number]: Derived; }' and '{ [index: string]: Base; }'.
     
     var r5b1 = b1 == a1;
                ~~~~~~~~
@@ -221,8 +187,6 @@ tests/cases/conformance/expressions/binaryOperators/comparisonOperator/compariso
                ~~~~~~~~
 !!! error TS2365: Operator '==' cannot be applied to types '{ [index: number]: C; }' and '{ [index: number]: Base; }'.
     var r5b4 = b4 == a4;
-               ~~~~~~~~
-!!! error TS2365: Operator '==' cannot be applied to types '{ [index: string]: Base; }' and '{ [index: number]: Derived; }'.
     
     // operator !=
     var r6a1 = a1 != b1;
@@ -235,8 +199,6 @@ tests/cases/conformance/expressions/binaryOperators/comparisonOperator/compariso
                ~~~~~~~~
 !!! error TS2365: Operator '!=' cannot be applied to types '{ [index: number]: Base; }' and '{ [index: number]: C; }'.
     var r6a4 = a4 != b4;
-               ~~~~~~~~
-!!! error TS2365: Operator '!=' cannot be applied to types '{ [index: number]: Derived; }' and '{ [index: string]: Base; }'.
     
     var r6b1 = b1 != a1;
                ~~~~~~~~
@@ -248,8 +210,6 @@ tests/cases/conformance/expressions/binaryOperators/comparisonOperator/compariso
                ~~~~~~~~
 !!! error TS2365: Operator '!=' cannot be applied to types '{ [index: number]: C; }' and '{ [index: number]: Base; }'.
     var r6b4 = b4 != a4;
-               ~~~~~~~~
-!!! error TS2365: Operator '!=' cannot be applied to types '{ [index: string]: Base; }' and '{ [index: number]: Derived; }'.
     
     // operator ===
     var r7a1 = a1 === b1;
@@ -262,8 +222,6 @@ tests/cases/conformance/expressions/binaryOperators/comparisonOperator/compariso
                ~~~~~~~~~
 !!! error TS2365: Operator '===' cannot be applied to types '{ [index: number]: Base; }' and '{ [index: number]: C; }'.
     var r7a4 = a4 === b4;
-               ~~~~~~~~~
-!!! error TS2365: Operator '===' cannot be applied to types '{ [index: number]: Derived; }' and '{ [index: string]: Base; }'.
     
     var r7b1 = b1 === a1;
                ~~~~~~~~~
@@ -275,8 +233,6 @@ tests/cases/conformance/expressions/binaryOperators/comparisonOperator/compariso
                ~~~~~~~~~
 !!! error TS2365: Operator '===' cannot be applied to types '{ [index: number]: C; }' and '{ [index: number]: Base; }'.
     var r7b4 = b4 === a4;
-               ~~~~~~~~~
-!!! error TS2365: Operator '===' cannot be applied to types '{ [index: string]: Base; }' and '{ [index: number]: Derived; }'.
     
     // operator !==
     var r8a1 = a1 !== b1;
@@ -289,8 +245,6 @@ tests/cases/conformance/expressions/binaryOperators/comparisonOperator/compariso
                ~~~~~~~~~
 !!! error TS2365: Operator '!==' cannot be applied to types '{ [index: number]: Base; }' and '{ [index: number]: C; }'.
     var r8a4 = a4 !== b4;
-               ~~~~~~~~~
-!!! error TS2365: Operator '!==' cannot be applied to types '{ [index: number]: Derived; }' and '{ [index: string]: Base; }'.
     
     var r8b1 = b1 !== a1;
                ~~~~~~~~~
@@ -301,6 +255,4 @@ tests/cases/conformance/expressions/binaryOperators/comparisonOperator/compariso
     var r8b3 = b3 !== a3;
                ~~~~~~~~~
 !!! error TS2365: Operator '!==' cannot be applied to types '{ [index: number]: C; }' and '{ [index: number]: Base; }'.
-    var r8b4 = b4 !== a4;
-               ~~~~~~~~~
-!!! error TS2365: Operator '!==' cannot be applied to types '{ [index: string]: Base; }' and '{ [index: number]: Derived; }'.
\ No newline at end of file
+    var r8b4 = b4 !== a4;
\ No newline at end of file
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.symbols b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.symbols
index ef92cdd676a..6dc1e9221f5 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.symbols
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.symbols
@@ -3,7 +3,7 @@ class Base {
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 0, 0))
 
     public a: string;
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 0, 12))
+>a : Symbol(Base.a, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 0, 12))
 }
 
 class Derived extends Base {
@@ -11,14 +11,14 @@ class Derived extends Base {
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 0, 0))
 
     public b: string;
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 4, 28))
+>b : Symbol(Derived.b, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 4, 28))
 }
 
 class C {
 >C : Symbol(C, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 6, 1))
 
     public c: string;
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 8, 9))
+>c : Symbol(C.c, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.ts, 8, 9))
 }
 
 var a1: { fn<T>(x: T): T };
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.symbols b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.symbols
index 08b23dac50a..444e2a06689 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.symbols
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.symbols
@@ -3,7 +3,7 @@ class Base {
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 0, 0))
 
     public a: string;
->a : Symbol(a, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 0, 12))
+>a : Symbol(Base.a, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 0, 12))
 }
 
 class Derived extends Base {
@@ -11,14 +11,14 @@ class Derived extends Base {
 >Base : Symbol(Base, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 0, 0))
 
     public b: string;
->b : Symbol(b, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 4, 28))
+>b : Symbol(Derived.b, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 4, 28))
 }
 
 class C {
 >C : Symbol(C, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 6, 1))
 
     public c: string;
->c : Symbol(c, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 8, 9))
+>c : Symbol(C.c, Decl(comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.ts, 8, 9))
 }
 
 var a1: { new <T>(x: T): T };
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.symbols b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.symbols
index b82a68af007..3d21bd632f2 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.symbols
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.symbols
@@ -3,7 +3,7 @@ class Base {
 >Base : Symbol(Base, Decl(comparisonOperatorWithSubtypeObjectOnCallSignature.ts, 0, 0))
 
     public a: string;
->a : Symbol(a, Decl(comparisonOperatorWithSubtypeObjectOnCallSignature.ts, 0, 12))
+>a : Symbol(Base.a, Decl(comparisonOperatorWithSubtypeObjectOnCallSignature.ts, 0, 12))
 }
 
 class Derived extends Base {
@@ -11,7 +11,7 @@ class Derived extends Base {
 >Base : Symbol(Base, Decl(comparisonOperatorWithSubtypeObjectOnCallSignature.ts, 0, 0))
 
     public b: string;
->b : Symbol(b, Decl(comparisonOperatorWithSubtypeObjectOnCallSignature.ts, 4, 28))
+>b : Symbol(Derived.b, Decl(comparisonOperatorWithSubtypeObjectOnCallSignature.ts, 4, 28))
 }
 
 var a1: { fn(): void };
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.symbols b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.symbols
index 6dd08fc0529..02abd793abd 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.symbols
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.symbols
@@ -3,7 +3,7 @@ class Base {
 >Base : Symbol(Base, Decl(comparisonOperatorWithSubtypeObjectOnConstructorSignature.ts, 0, 0))
 
     public a: string;
->a : Symbol(a, Decl(comparisonOperatorWithSubtypeObjectOnConstructorSignature.ts, 0, 12))
+>a : Symbol(Base.a, Decl(comparisonOperatorWithSubtypeObjectOnConstructorSignature.ts, 0, 12))
 }
 
 class Derived extends Base {
@@ -11,7 +11,7 @@ class Derived extends Base {
 >Base : Symbol(Base, Decl(comparisonOperatorWithSubtypeObjectOnConstructorSignature.ts, 0, 0))
 
     public b: string;
->b : Symbol(b, Decl(comparisonOperatorWithSubtypeObjectOnConstructorSignature.ts, 4, 28))
+>b : Symbol(Derived.b, Decl(comparisonOperatorWithSubtypeObjectOnConstructorSignature.ts, 4, 28))
 }
 
 var a1: { new (): Base };
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.symbols b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.symbols
index be0537baee4..18ed4369fd7 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.symbols
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.symbols
@@ -3,7 +3,7 @@ class Base {
 >Base : Symbol(Base, Decl(comparisonOperatorWithSubtypeObjectOnIndexSignature.ts, 0, 0))
 
     public a: string;
->a : Symbol(a, Decl(comparisonOperatorWithSubtypeObjectOnIndexSignature.ts, 0, 12))
+>a : Symbol(Base.a, Decl(comparisonOperatorWithSubtypeObjectOnIndexSignature.ts, 0, 12))
 }
 
 class Derived extends Base {
@@ -11,7 +11,7 @@ class Derived extends Base {
 >Base : Symbol(Base, Decl(comparisonOperatorWithSubtypeObjectOnIndexSignature.ts, 0, 0))
 
     public b: string;
->b : Symbol(b, Decl(comparisonOperatorWithSubtypeObjectOnIndexSignature.ts, 4, 28))
+>b : Symbol(Derived.b, Decl(comparisonOperatorWithSubtypeObjectOnIndexSignature.ts, 4, 28))
 }
 
 var a1: { [a: string]: string };
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.symbols b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.symbols
index 635f926438f..742e8c9d4e6 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.symbols
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.symbols
@@ -3,7 +3,7 @@ class Base {
 >Base : Symbol(Base, Decl(comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.ts, 0, 0))
 
     public a: string;
->a : Symbol(a, Decl(comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.ts, 0, 12))
+>a : Symbol(Base.a, Decl(comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.ts, 0, 12))
 }
 
 class Derived extends Base {
@@ -11,7 +11,7 @@ class Derived extends Base {
 >Base : Symbol(Base, Decl(comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.ts, 0, 0))
 
     public b: string;
->b : Symbol(b, Decl(comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.ts, 4, 28))
+>b : Symbol(Derived.b, Decl(comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.ts, 4, 28))
 }
 
 var a1: { fn<T>(x: T): T };
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.symbols b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.symbols
index 11f28765873..ce49067a1a8 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.symbols
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.symbols
@@ -3,7 +3,7 @@ class Base {
 >Base : Symbol(Base, Decl(comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.ts, 0, 0))
 
     public a: string;
->a : Symbol(a, Decl(comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.ts, 0, 12))
+>a : Symbol(Base.a, Decl(comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.ts, 0, 12))
 }
 
 class Derived extends Base {
@@ -11,7 +11,7 @@ class Derived extends Base {
 >Base : Symbol(Base, Decl(comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.ts, 0, 0))
 
     public b: string;
->b : Symbol(b, Decl(comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.ts, 4, 28))
+>b : Symbol(Derived.b, Decl(comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.ts, 4, 28))
 }
 
 var a1: { new <T>(x: T): T };
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnOptionalProperty.symbols b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnOptionalProperty.symbols
index 6c6a3fa3ae2..fb85585852b 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnOptionalProperty.symbols
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnOptionalProperty.symbols
@@ -3,17 +3,17 @@ interface I {
 >I : Symbol(I, Decl(comparisonOperatorWithSubtypeObjectOnOptionalProperty.ts, 0, 0))
 
     a: string;
->a : Symbol(a, Decl(comparisonOperatorWithSubtypeObjectOnOptionalProperty.ts, 0, 13))
+>a : Symbol(I.a, Decl(comparisonOperatorWithSubtypeObjectOnOptionalProperty.ts, 0, 13))
 
     b?: number;
->b : Symbol(b, Decl(comparisonOperatorWithSubtypeObjectOnOptionalProperty.ts, 1, 14))
+>b : Symbol(I.b, Decl(comparisonOperatorWithSubtypeObjectOnOptionalProperty.ts, 1, 14))
 }
 
 interface J {
 >J : Symbol(J, Decl(comparisonOperatorWithSubtypeObjectOnOptionalProperty.ts, 3, 1))
 
     a: string;
->a : Symbol(a, Decl(comparisonOperatorWithSubtypeObjectOnOptionalProperty.ts, 5, 13))
+>a : Symbol(J.a, Decl(comparisonOperatorWithSubtypeObjectOnOptionalProperty.ts, 5, 13))
 }
 
 var a: I;
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.symbols b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.symbols
index 52d6e35d65e..96799744c00 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.symbols
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.symbols
@@ -3,7 +3,7 @@ class Base {
 >Base : Symbol(Base, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 0, 0))
 
     public a: string;
->a : Symbol(a, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 0, 12))
+>a : Symbol(Base.a, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 0, 12))
 }
 
 class Derived extends Base {
@@ -11,18 +11,18 @@ class Derived extends Base {
 >Base : Symbol(Base, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 0, 0))
 
     public b: string;
->b : Symbol(b, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 4, 28))
+>b : Symbol(Derived.b, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 4, 28))
 }
 
 class A1 {
 >A1 : Symbol(A1, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 6, 1))
 
     public a: Base;
->a : Symbol(a, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 8, 10))
+>a : Symbol(A1.a, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 8, 10))
 >Base : Symbol(Base, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 0, 0))
 
     public b: Base;
->b : Symbol(b, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 9, 19))
+>b : Symbol(A1.b, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 9, 19))
 >Base : Symbol(Base, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 0, 0))
 }
 
@@ -30,11 +30,11 @@ class B1 {
 >B1 : Symbol(B1, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 11, 1))
 
     public a: Base;
->a : Symbol(a, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 13, 10))
+>a : Symbol(B1.a, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 13, 10))
 >Base : Symbol(Base, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 0, 0))
 
     public b: Derived;
->b : Symbol(b, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 14, 19))
+>b : Symbol(B1.b, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 14, 19))
 >Derived : Symbol(Derived, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 2, 1))
 }
 
@@ -42,7 +42,7 @@ class A2 {
 >A2 : Symbol(A2, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 16, 1))
 
     private a;
->a : Symbol(a, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 18, 10))
+>a : Symbol(A2.a, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 18, 10))
 }
 
 class B2 extends A2 {
@@ -50,7 +50,7 @@ class B2 extends A2 {
 >A2 : Symbol(A2, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 16, 1))
 
     private b;
->b : Symbol(b, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 22, 21))
+>b : Symbol(B2.b, Decl(comparisonOperatorWithSubtypeObjectOnProperty.ts, 22, 21))
 }
 
 var a1: A1;
diff --git a/tests/baselines/reference/compilerOptionsDeclarationAndNoEmit.symbols b/tests/baselines/reference/compilerOptionsDeclarationAndNoEmit.symbols
new file mode 100644
index 00000000000..4448defa95e
--- /dev/null
+++ b/tests/baselines/reference/compilerOptionsDeclarationAndNoEmit.symbols
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/a.ts ===
+
+class c {
+>c : Symbol(c, Decl(a.ts, 0, 0))
+}
+
diff --git a/tests/baselines/reference/compilerOptionsDeclarationAndNoEmit.types b/tests/baselines/reference/compilerOptionsDeclarationAndNoEmit.types
new file mode 100644
index 00000000000..6f5caf9d48b
--- /dev/null
+++ b/tests/baselines/reference/compilerOptionsDeclarationAndNoEmit.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/a.ts ===
+
+class c {
+>c : c
+}
+
diff --git a/tests/baselines/reference/compilerOptionsOutAndNoEmit.symbols b/tests/baselines/reference/compilerOptionsOutAndNoEmit.symbols
new file mode 100644
index 00000000000..4448defa95e
--- /dev/null
+++ b/tests/baselines/reference/compilerOptionsOutAndNoEmit.symbols
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/a.ts ===
+
+class c {
+>c : Symbol(c, Decl(a.ts, 0, 0))
+}
+
diff --git a/tests/baselines/reference/compilerOptionsOutAndNoEmit.types b/tests/baselines/reference/compilerOptionsOutAndNoEmit.types
new file mode 100644
index 00000000000..6f5caf9d48b
--- /dev/null
+++ b/tests/baselines/reference/compilerOptionsOutAndNoEmit.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/a.ts ===
+
+class c {
+>c : c
+}
+
diff --git a/tests/baselines/reference/compilerOptionsOutDirAndNoEmit.symbols b/tests/baselines/reference/compilerOptionsOutDirAndNoEmit.symbols
new file mode 100644
index 00000000000..4448defa95e
--- /dev/null
+++ b/tests/baselines/reference/compilerOptionsOutDirAndNoEmit.symbols
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/a.ts ===
+
+class c {
+>c : Symbol(c, Decl(a.ts, 0, 0))
+}
+
diff --git a/tests/baselines/reference/compilerOptionsOutDirAndNoEmit.types b/tests/baselines/reference/compilerOptionsOutDirAndNoEmit.types
new file mode 100644
index 00000000000..6f5caf9d48b
--- /dev/null
+++ b/tests/baselines/reference/compilerOptionsOutDirAndNoEmit.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/a.ts ===
+
+class c {
+>c : c
+}
+
diff --git a/tests/baselines/reference/compilerOptionsOutFileAndNoEmit.symbols b/tests/baselines/reference/compilerOptionsOutFileAndNoEmit.symbols
new file mode 100644
index 00000000000..4448defa95e
--- /dev/null
+++ b/tests/baselines/reference/compilerOptionsOutFileAndNoEmit.symbols
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/a.ts ===
+
+class c {
+>c : Symbol(c, Decl(a.ts, 0, 0))
+}
+
diff --git a/tests/baselines/reference/compilerOptionsOutFileAndNoEmit.types b/tests/baselines/reference/compilerOptionsOutFileAndNoEmit.types
new file mode 100644
index 00000000000..6f5caf9d48b
--- /dev/null
+++ b/tests/baselines/reference/compilerOptionsOutFileAndNoEmit.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/a.ts ===
+
+class c {
+>c : c
+}
+
diff --git a/tests/baselines/reference/complexClassRelationships.symbols b/tests/baselines/reference/complexClassRelationships.symbols
index 533c5171cf8..9f6b3adf98d 100644
--- a/tests/baselines/reference/complexClassRelationships.symbols
+++ b/tests/baselines/reference/complexClassRelationships.symbols
@@ -37,7 +37,7 @@ class Base {
 >Base : Symbol(Base, Decl(complexClassRelationships.ts, 11, 1))
 
     ownerCollection: BaseCollection<Base>;
->ownerCollection : Symbol(ownerCollection, Decl(complexClassRelationships.ts, 12, 12))
+>ownerCollection : Symbol(Base.ownerCollection, Decl(complexClassRelationships.ts, 12, 12))
 >BaseCollection : Symbol(BaseCollection, Decl(complexClassRelationships.ts, 6, 1))
 >Base : Symbol(Base, Decl(complexClassRelationships.ts, 11, 1))
 }
@@ -46,7 +46,7 @@ class Thing {
 >Thing : Symbol(Thing, Decl(complexClassRelationships.ts, 14, 1))
 
     public get Components(): ComponentCollection<any> { return null }
->Components : Symbol(Components, Decl(complexClassRelationships.ts, 16, 13))
+>Components : Symbol(Thing.Components, Decl(complexClassRelationships.ts, 16, 13))
 >ComponentCollection : Symbol(ComponentCollection, Decl(complexClassRelationships.ts, 18, 1))
 }
 
@@ -70,22 +70,22 @@ class Foo {
 >Foo : Symbol(Foo, Decl(complexClassRelationships.ts, 24, 1))
 
     public get prop1() {
->prop1 : Symbol(prop1, Decl(complexClassRelationships.ts, 26, 11))
+>prop1 : Symbol(Foo.prop1, Decl(complexClassRelationships.ts, 26, 11))
 
         return new GenericType<string>(this);
 >GenericType : Symbol(GenericType, Decl(complexClassRelationships.ts, 36, 1))
 >this : Symbol(Foo, Decl(complexClassRelationships.ts, 24, 1))
     }
     public populate() {
->populate : Symbol(populate, Decl(complexClassRelationships.ts, 29, 5))
+>populate : Symbol(Foo.populate, Decl(complexClassRelationships.ts, 29, 5))
 
         this.prop2;
->this.prop2 : Symbol(prop2, Decl(complexClassRelationships.ts, 32, 5))
+>this.prop2 : Symbol(Foo.prop2, Decl(complexClassRelationships.ts, 32, 5))
 >this : Symbol(Foo, Decl(complexClassRelationships.ts, 24, 1))
->prop2 : Symbol(prop2, Decl(complexClassRelationships.ts, 32, 5))
+>prop2 : Symbol(Foo.prop2, Decl(complexClassRelationships.ts, 32, 5))
     }
     public get prop2(): BaseCollection<Derived> {
->prop2 : Symbol(prop2, Decl(complexClassRelationships.ts, 32, 5))
+>prop2 : Symbol(Foo.prop2, Decl(complexClassRelationships.ts, 32, 5))
 >BaseCollection : Symbol(BaseCollection, Decl(complexClassRelationships.ts, 6, 1))
 >Derived : Symbol(Derived, Decl(complexClassRelationships.ts, 0, 0))
 
@@ -111,7 +111,7 @@ class FooBase {
 >FooBase : Symbol(FooBase, Decl(complexClassRelationships.ts, 40, 1))
 
     public populate() {
->populate : Symbol(populate, Decl(complexClassRelationships.ts, 42, 15))
+>populate : Symbol(FooBase.populate, Decl(complexClassRelationships.ts, 42, 15))
 
     }
 }
diff --git a/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.types b/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.types
index 92835611c6d..e40422450b4 100644
--- a/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.types
+++ b/tests/baselines/reference/compoundAdditionAssignmentLHSCanBeAssigned.types
@@ -98,7 +98,7 @@ x2 += E.a;
 x2 += {};
 >x2 += {} : string
 >x2 : string
->{} : { [x: number]: undefined; }
+>{} : {}
 
 x2 += null;
 >x2 += null : string
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..cf4ad26ffe6 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.types b/tests/baselines/reference/computedPropertyNames10_ES5.types
index 9dea9cfca93..b9d999397ab 100644
--- a/tests/baselines/reference/computedPropertyNames10_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames10_ES5.types
@@ -9,8 +9,8 @@ var a: any;
 >a : any
 
 var v = {
->v : { [0](): void; [""](): void; }
->{    [s]() { },    [n]() { },    [s + s]() { },    [s + n]() { },    [+s]() { },    [""]() { },    [0]() { },    [a]() { },    [<any>true]() { },    [`hello bye`]() { },    [`hello ${a} bye`]() { }} : { [0](): void; [""](): void; }
+>v : { [x: string]: () => void; [x: number]: () => void; [0](): void; [""](): void; }
+>{    [s]() { },    [n]() { },    [s + s]() { },    [s + n]() { },    [+s]() { },    [""]() { },    [0]() { },    [a]() { },    [<any>true]() { },    [`hello bye`]() { },    [`hello ${a} bye`]() { }} : { [x: string]: () => void; [x: number]: () => void; [0](): void; [""](): void; }
 
     [s]() { },
 >s : string
diff --git a/tests/baselines/reference/computedPropertyNames10_ES6.types b/tests/baselines/reference/computedPropertyNames10_ES6.types
index d2faa138980..1883febb39b 100644
--- a/tests/baselines/reference/computedPropertyNames10_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames10_ES6.types
@@ -9,8 +9,8 @@ var a: any;
 >a : any
 
 var v = {
->v : { [0](): void; [""](): void; }
->{    [s]() { },    [n]() { },    [s + s]() { },    [s + n]() { },    [+s]() { },    [""]() { },    [0]() { },    [a]() { },    [<any>true]() { },    [`hello bye`]() { },    [`hello ${a} bye`]() { }} : { [0](): void; [""](): void; }
+>v : { [x: string]: () => void; [x: number]: () => void; [0](): void; [""](): void; }
+>{    [s]() { },    [n]() { },    [s + s]() { },    [s + n]() { },    [+s]() { },    [""]() { },    [0]() { },    [a]() { },    [<any>true]() { },    [`hello bye`]() { },    [`hello ${a} bye`]() { }} : { [x: string]: () => void; [x: number]: () => void; [0](): void; [""](): void; }
 
     [s]() { },
 >s : string
diff --git a/tests/baselines/reference/computedPropertyNames11_ES5.js b/tests/baselines/reference/computedPropertyNames11_ES5.js
index 4fc74b30cbe..568cce441e1 100644
--- a/tests/baselines/reference/computedPropertyNames11_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames11_ES5.js
@@ -46,8 +46,16 @@ var v = (_a = {},
         enumerable: true,
         configurable: true
     }),
-    ,
-    ,
+    Object.defineProperty(_a, "", {
+        set: function (v) { },
+        enumerable: true,
+        configurable: true
+    }),
+    Object.defineProperty(_a, 0, {
+        get: function () { return 0; },
+        enumerable: true,
+        configurable: true
+    }),
     Object.defineProperty(_a, a, {
         set: function (v) { },
         enumerable: true,
diff --git a/tests/baselines/reference/computedPropertyNames11_ES5.types b/tests/baselines/reference/computedPropertyNames11_ES5.types
index ae626ec3cba..e15b46cc6c1 100644
--- a/tests/baselines/reference/computedPropertyNames11_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames11_ES5.types
@@ -9,8 +9,8 @@ var a: any;
 >a : any
 
 var v = {
->v : { readonly [0]: number; [""]: any; }
->{    get [s]() { return 0; },    set [n](v) { },    get [s + s]() { return 0; },    set [s + n](v) { },    get [+s]() { return 0; },    set [""](v) { },    get [0]() { return 0; },    set [a](v) { },    get [<any>true]() { return 0; },    set [`hello bye`](v) { },    get [`hello ${a} bye`]() { return 0; }} : { readonly [0]: number; [""]: any; }
+>v : { [x: string]: any; [x: number]: any; readonly [0]: number; [""]: any; }
+>{    get [s]() { return 0; },    set [n](v) { },    get [s + s]() { return 0; },    set [s + n](v) { },    get [+s]() { return 0; },    set [""](v) { },    get [0]() { return 0; },    set [a](v) { },    get [<any>true]() { return 0; },    set [`hello bye`](v) { },    get [`hello ${a} bye`]() { return 0; }} : { [x: string]: any; [x: number]: any; readonly [0]: number; [""]: any; }
 
     get [s]() { return 0; },
 >s : string
diff --git a/tests/baselines/reference/computedPropertyNames11_ES6.types b/tests/baselines/reference/computedPropertyNames11_ES6.types
index 06dc26e9843..eb5fc105a7a 100644
--- a/tests/baselines/reference/computedPropertyNames11_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames11_ES6.types
@@ -9,8 +9,8 @@ var a: any;
 >a : any
 
 var v = {
->v : { readonly [0]: number; [""]: any; }
->{    get [s]() { return 0; },    set [n](v) { },    get [s + s]() { return 0; },    set [s + n](v) { },    get [+s]() { return 0; },    set [""](v) { },    get [0]() { return 0; },    set [a](v) { },    get [<any>true]() { return 0; },    set [`hello bye`](v) { },    get [`hello ${a} bye`]() { return 0; }} : { readonly [0]: number; [""]: any; }
+>v : { [x: string]: any; [x: number]: any; readonly [0]: number; [""]: any; }
+>{    get [s]() { return 0; },    set [n](v) { },    get [s + s]() { return 0; },    set [s + n](v) { },    get [+s]() { return 0; },    set [""](v) { },    get [0]() { return 0; },    set [a](v) { },    get [<any>true]() { return 0; },    set [`hello bye`](v) { },    get [`hello ${a} bye`]() { return 0; }} : { [x: string]: any; [x: number]: any; readonly [0]: number; [""]: any; }
 
     get [s]() { return 0; },
 >s : string
diff --git a/tests/baselines/reference/computedPropertyNames16_ES5.js b/tests/baselines/reference/computedPropertyNames16_ES5.js
index 5d8471e6560..92b98ecb1ba 100644
--- a/tests/baselines/reference/computedPropertyNames16_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames16_ES5.js
@@ -48,6 +48,16 @@ var C = (function () {
         enumerable: true,
         configurable: true
     });
+    Object.defineProperty(C, "", {
+        set: function (v) { },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, 0, {
+        get: function () { return 0; },
+        enumerable: true,
+        configurable: true
+    });
     Object.defineProperty(C.prototype, a, {
         set: function (v) { },
         enumerable: true,
diff --git a/tests/baselines/reference/computedPropertyNames18_ES5.types b/tests/baselines/reference/computedPropertyNames18_ES5.types
index c60ab32d3f8..d6808a8edc0 100644
--- a/tests/baselines/reference/computedPropertyNames18_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames18_ES5.types
@@ -3,8 +3,8 @@ function foo() {
 >foo : () => void
 
     var obj = {
->obj : {}
->{        [this.bar]: 0    } : {}
+>obj : { [x: number]: number; }
+>{        [this.bar]: 0    } : { [x: number]: number; }
 
         [this.bar]: 0
 >this.bar : any
diff --git a/tests/baselines/reference/computedPropertyNames18_ES6.types b/tests/baselines/reference/computedPropertyNames18_ES6.types
index 33a15b6c5a9..11d58e48c69 100644
--- a/tests/baselines/reference/computedPropertyNames18_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames18_ES6.types
@@ -3,8 +3,8 @@ function foo() {
 >foo : () => void
 
     var obj = {
->obj : {}
->{        [this.bar]: 0    } : {}
+>obj : { [x: number]: number; }
+>{        [this.bar]: 0    } : { [x: number]: number; }
 
         [this.bar]: 0
 >this.bar : any
diff --git a/tests/baselines/reference/computedPropertyNames1_ES5.types b/tests/baselines/reference/computedPropertyNames1_ES5.types
index 6c94c846f30..bcff3b34177 100644
--- a/tests/baselines/reference/computedPropertyNames1_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames1_ES5.types
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNames1_ES5.ts ===
 var v = {
->v : {}
->{    get [0 + 1]() { return 0 },    set [0 + 1](v: string) { } //No error} : {}
+>v : { [x: number]: number | string; }
+>{    get [0 + 1]() { return 0 },    set [0 + 1](v: string) { } //No error} : { [x: number]: number | string; }
 
     get [0 + 1]() { return 0 },
 >0 + 1 : number
diff --git a/tests/baselines/reference/computedPropertyNames1_ES6.types b/tests/baselines/reference/computedPropertyNames1_ES6.types
index 95e5a011ea2..df2237a463f 100644
--- a/tests/baselines/reference/computedPropertyNames1_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames1_ES6.types
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNames1_ES6.ts ===
 var v = {
->v : {}
->{    get [0 + 1]() { return 0 },    set [0 + 1](v: string) { } //No error} : {}
+>v : { [x: number]: number | string; }
+>{    get [0 + 1]() { return 0 },    set [0 + 1](v: string) { } //No error} : { [x: number]: number | string; }
 
     get [0 + 1]() { return 0 },
 >0 + 1 : number
diff --git a/tests/baselines/reference/computedPropertyNames20_ES5.types b/tests/baselines/reference/computedPropertyNames20_ES5.types
index 91cc2c42963..65ee55be379 100644
--- a/tests/baselines/reference/computedPropertyNames20_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames20_ES5.types
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNames20_ES5.ts ===
 var obj = {
->obj : {}
->{    [this.bar]: 0} : {}
+>obj : { [x: number]: number; }
+>{    [this.bar]: 0} : { [x: number]: number; }
 
     [this.bar]: 0
 >this.bar : any
diff --git a/tests/baselines/reference/computedPropertyNames20_ES6.types b/tests/baselines/reference/computedPropertyNames20_ES6.types
index 4ef6f675cce..91e5c8d7843 100644
--- a/tests/baselines/reference/computedPropertyNames20_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames20_ES6.types
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNames20_ES6.ts ===
 var obj = {
->obj : {}
->{    [this.bar]: 0} : {}
+>obj : { [x: number]: number; }
+>{    [this.bar]: 0} : { [x: number]: number; }
 
     [this.bar]: 0
 >this.bar : any
diff --git a/tests/baselines/reference/computedPropertyNames22_ES5.symbols b/tests/baselines/reference/computedPropertyNames22_ES5.symbols
index a1e08e5f487..2e2b07473dd 100644
--- a/tests/baselines/reference/computedPropertyNames22_ES5.symbols
+++ b/tests/baselines/reference/computedPropertyNames22_ES5.symbols
@@ -3,15 +3,15 @@ class C {
 >C : Symbol(C, Decl(computedPropertyNames22_ES5.ts, 0, 0))
 
     bar() {
->bar : Symbol(bar, Decl(computedPropertyNames22_ES5.ts, 0, 9))
+>bar : Symbol(C.bar, Decl(computedPropertyNames22_ES5.ts, 0, 9))
 
         var obj = {
 >obj : Symbol(obj, Decl(computedPropertyNames22_ES5.ts, 2, 11))
 
             [this.bar()]() { }
->this.bar : Symbol(bar, Decl(computedPropertyNames22_ES5.ts, 0, 9))
+>this.bar : Symbol(C.bar, Decl(computedPropertyNames22_ES5.ts, 0, 9))
 >this : Symbol(C, Decl(computedPropertyNames22_ES5.ts, 0, 0))
->bar : Symbol(bar, Decl(computedPropertyNames22_ES5.ts, 0, 9))
+>bar : Symbol(C.bar, Decl(computedPropertyNames22_ES5.ts, 0, 9))
 
         };
         return 0;
diff --git a/tests/baselines/reference/computedPropertyNames22_ES5.types b/tests/baselines/reference/computedPropertyNames22_ES5.types
index ca59250825c..eeec22d2e61 100644
--- a/tests/baselines/reference/computedPropertyNames22_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames22_ES5.types
@@ -6,8 +6,8 @@ class C {
 >bar : () => number
 
         var obj = {
->obj : {}
->{            [this.bar()]() { }        } : {}
+>obj : { [x: number]: () => void; }
+>{            [this.bar()]() { }        } : { [x: number]: () => void; }
 
             [this.bar()]() { }
 >this.bar() : number
diff --git a/tests/baselines/reference/computedPropertyNames22_ES6.symbols b/tests/baselines/reference/computedPropertyNames22_ES6.symbols
index 5940bfb4cfb..39e3acb265c 100644
--- a/tests/baselines/reference/computedPropertyNames22_ES6.symbols
+++ b/tests/baselines/reference/computedPropertyNames22_ES6.symbols
@@ -3,15 +3,15 @@ class C {
 >C : Symbol(C, Decl(computedPropertyNames22_ES6.ts, 0, 0))
 
     bar() {
->bar : Symbol(bar, Decl(computedPropertyNames22_ES6.ts, 0, 9))
+>bar : Symbol(C.bar, Decl(computedPropertyNames22_ES6.ts, 0, 9))
 
         var obj = {
 >obj : Symbol(obj, Decl(computedPropertyNames22_ES6.ts, 2, 11))
 
             [this.bar()]() { }
->this.bar : Symbol(bar, Decl(computedPropertyNames22_ES6.ts, 0, 9))
+>this.bar : Symbol(C.bar, Decl(computedPropertyNames22_ES6.ts, 0, 9))
 >this : Symbol(C, Decl(computedPropertyNames22_ES6.ts, 0, 0))
->bar : Symbol(bar, Decl(computedPropertyNames22_ES6.ts, 0, 9))
+>bar : Symbol(C.bar, Decl(computedPropertyNames22_ES6.ts, 0, 9))
 
         };
         return 0;
diff --git a/tests/baselines/reference/computedPropertyNames22_ES6.types b/tests/baselines/reference/computedPropertyNames22_ES6.types
index d5fbce29f7d..af9ef9d3a31 100644
--- a/tests/baselines/reference/computedPropertyNames22_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames22_ES6.types
@@ -6,8 +6,8 @@ class C {
 >bar : () => number
 
         var obj = {
->obj : {}
->{            [this.bar()]() { }        } : {}
+>obj : { [x: number]: () => void; }
+>{            [this.bar()]() { }        } : { [x: number]: () => void; }
 
             [this.bar()]() { }
 >this.bar() : number
diff --git a/tests/baselines/reference/computedPropertyNames25_ES5.symbols b/tests/baselines/reference/computedPropertyNames25_ES5.symbols
index e11753857cc..896ba223099 100644
--- a/tests/baselines/reference/computedPropertyNames25_ES5.symbols
+++ b/tests/baselines/reference/computedPropertyNames25_ES5.symbols
@@ -3,7 +3,7 @@ class Base {
 >Base : Symbol(Base, Decl(computedPropertyNames25_ES5.ts, 0, 0))
 
     bar() {
->bar : Symbol(bar, Decl(computedPropertyNames25_ES5.ts, 0, 12))
+>bar : Symbol(Base.bar, Decl(computedPropertyNames25_ES5.ts, 0, 12))
 
         return 0;
     }
@@ -13,7 +13,7 @@ class C extends Base {
 >Base : Symbol(Base, Decl(computedPropertyNames25_ES5.ts, 0, 0))
 
     foo() {
->foo : Symbol(foo, Decl(computedPropertyNames25_ES5.ts, 5, 22))
+>foo : Symbol(C.foo, Decl(computedPropertyNames25_ES5.ts, 5, 22))
 
         var obj = {
 >obj : Symbol(obj, Decl(computedPropertyNames25_ES5.ts, 7, 11))
diff --git a/tests/baselines/reference/computedPropertyNames25_ES5.types b/tests/baselines/reference/computedPropertyNames25_ES5.types
index 6ca67cce410..f1acc296709 100644
--- a/tests/baselines/reference/computedPropertyNames25_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames25_ES5.types
@@ -17,8 +17,8 @@ class C extends Base {
 >foo : () => number
 
         var obj = {
->obj : {}
->{            [super.bar()]() { }        } : {}
+>obj : { [x: number]: () => void; }
+>{            [super.bar()]() { }        } : { [x: number]: () => void; }
 
             [super.bar()]() { }
 >super.bar() : number
diff --git a/tests/baselines/reference/computedPropertyNames25_ES6.symbols b/tests/baselines/reference/computedPropertyNames25_ES6.symbols
index 8eb7393c6ac..dcb6177b0ea 100644
--- a/tests/baselines/reference/computedPropertyNames25_ES6.symbols
+++ b/tests/baselines/reference/computedPropertyNames25_ES6.symbols
@@ -3,7 +3,7 @@ class Base {
 >Base : Symbol(Base, Decl(computedPropertyNames25_ES6.ts, 0, 0))
 
     bar() {
->bar : Symbol(bar, Decl(computedPropertyNames25_ES6.ts, 0, 12))
+>bar : Symbol(Base.bar, Decl(computedPropertyNames25_ES6.ts, 0, 12))
 
         return 0;
     }
@@ -13,7 +13,7 @@ class C extends Base {
 >Base : Symbol(Base, Decl(computedPropertyNames25_ES6.ts, 0, 0))
 
     foo() {
->foo : Symbol(foo, Decl(computedPropertyNames25_ES6.ts, 5, 22))
+>foo : Symbol(C.foo, Decl(computedPropertyNames25_ES6.ts, 5, 22))
 
         var obj = {
 >obj : Symbol(obj, Decl(computedPropertyNames25_ES6.ts, 7, 11))
diff --git a/tests/baselines/reference/computedPropertyNames25_ES6.types b/tests/baselines/reference/computedPropertyNames25_ES6.types
index 1c093ebc59f..26c38013906 100644
--- a/tests/baselines/reference/computedPropertyNames25_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames25_ES6.types
@@ -17,8 +17,8 @@ class C extends Base {
 >foo : () => number
 
         var obj = {
->obj : {}
->{            [super.bar()]() { }        } : {}
+>obj : { [x: number]: () => void; }
+>{            [super.bar()]() { }        } : { [x: number]: () => void; }
 
             [super.bar()]() { }
 >super.bar() : number
diff --git a/tests/baselines/reference/computedPropertyNames28_ES5.types b/tests/baselines/reference/computedPropertyNames28_ES5.types
index 273dcd426d8..89a2a7ac017 100644
--- a/tests/baselines/reference/computedPropertyNames28_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames28_ES5.types
@@ -12,8 +12,8 @@ class C extends Base {
 >super : typeof Base
 
         var obj = {
->obj : {}
->{            [(super(), "prop")]() { }        } : {}
+>obj : { [x: string]: () => void; }
+>{            [(super(), "prop")]() { }        } : { [x: string]: () => void; }
 
             [(super(), "prop")]() { }
 >(super(), "prop") : string
diff --git a/tests/baselines/reference/computedPropertyNames28_ES6.types b/tests/baselines/reference/computedPropertyNames28_ES6.types
index a34fb33f6c7..df020c9a5ff 100644
--- a/tests/baselines/reference/computedPropertyNames28_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames28_ES6.types
@@ -12,8 +12,8 @@ class C extends Base {
 >super : typeof Base
 
         var obj = {
->obj : {}
->{            [(super(), "prop")]() { }        } : {}
+>obj : { [x: string]: () => void; }
+>{            [(super(), "prop")]() { }        } : { [x: string]: () => void; }
 
             [(super(), "prop")]() { }
 >(super(), "prop") : string
diff --git a/tests/baselines/reference/computedPropertyNames29_ES5.js b/tests/baselines/reference/computedPropertyNames29_ES5.js
index af6f93c8ad9..966081ae035 100644
--- a/tests/baselines/reference/computedPropertyNames29_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames29_ES5.js
@@ -18,7 +18,8 @@ var C = (function () {
         var _this = this;
         (function () {
             var obj = (_a = {},
-                _a[_this.bar()] = function () { },
+                _a[_this.bar()] = function () { } // needs capture
+            ,
                 _a);
             var _a;
         });
diff --git a/tests/baselines/reference/computedPropertyNames29_ES5.symbols b/tests/baselines/reference/computedPropertyNames29_ES5.symbols
index c33a7390ce8..b78b4d0955c 100644
--- a/tests/baselines/reference/computedPropertyNames29_ES5.symbols
+++ b/tests/baselines/reference/computedPropertyNames29_ES5.symbols
@@ -3,16 +3,16 @@ class C {
 >C : Symbol(C, Decl(computedPropertyNames29_ES5.ts, 0, 0))
 
     bar() {
->bar : Symbol(bar, Decl(computedPropertyNames29_ES5.ts, 0, 9))
+>bar : Symbol(C.bar, Decl(computedPropertyNames29_ES5.ts, 0, 9))
 
         () => {
             var obj = {
 >obj : Symbol(obj, Decl(computedPropertyNames29_ES5.ts, 3, 15))
 
                 [this.bar()]() { } // needs capture
->this.bar : Symbol(bar, Decl(computedPropertyNames29_ES5.ts, 0, 9))
+>this.bar : Symbol(C.bar, Decl(computedPropertyNames29_ES5.ts, 0, 9))
 >this : Symbol(C, Decl(computedPropertyNames29_ES5.ts, 0, 0))
->bar : Symbol(bar, Decl(computedPropertyNames29_ES5.ts, 0, 9))
+>bar : Symbol(C.bar, Decl(computedPropertyNames29_ES5.ts, 0, 9))
 
             };
         }
diff --git a/tests/baselines/reference/computedPropertyNames29_ES5.types b/tests/baselines/reference/computedPropertyNames29_ES5.types
index f3448f10857..d2f89ef6b18 100644
--- a/tests/baselines/reference/computedPropertyNames29_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames29_ES5.types
@@ -9,8 +9,8 @@ class C {
 >() => {            var obj = {                [this.bar()]() { } // needs capture            };        } : () => void
 
             var obj = {
->obj : {}
->{                [this.bar()]() { } // needs capture            } : {}
+>obj : { [x: number]: () => void; }
+>{                [this.bar()]() { } // needs capture            } : { [x: number]: () => void; }
 
                 [this.bar()]() { } // needs capture
 >this.bar() : number
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/computedPropertyNames29_ES6.symbols b/tests/baselines/reference/computedPropertyNames29_ES6.symbols
index 41631ea63bb..fe54d1a0325 100644
--- a/tests/baselines/reference/computedPropertyNames29_ES6.symbols
+++ b/tests/baselines/reference/computedPropertyNames29_ES6.symbols
@@ -3,16 +3,16 @@ class C {
 >C : Symbol(C, Decl(computedPropertyNames29_ES6.ts, 0, 0))
 
     bar() {
->bar : Symbol(bar, Decl(computedPropertyNames29_ES6.ts, 0, 9))
+>bar : Symbol(C.bar, Decl(computedPropertyNames29_ES6.ts, 0, 9))
 
         () => {
             var obj = {
 >obj : Symbol(obj, Decl(computedPropertyNames29_ES6.ts, 3, 15))
 
                 [this.bar()]() { } // needs capture
->this.bar : Symbol(bar, Decl(computedPropertyNames29_ES6.ts, 0, 9))
+>this.bar : Symbol(C.bar, Decl(computedPropertyNames29_ES6.ts, 0, 9))
 >this : Symbol(C, Decl(computedPropertyNames29_ES6.ts, 0, 0))
->bar : Symbol(bar, Decl(computedPropertyNames29_ES6.ts, 0, 9))
+>bar : Symbol(C.bar, Decl(computedPropertyNames29_ES6.ts, 0, 9))
 
             };
         }
diff --git a/tests/baselines/reference/computedPropertyNames29_ES6.types b/tests/baselines/reference/computedPropertyNames29_ES6.types
index cd01d37556a..bb324b2b382 100644
--- a/tests/baselines/reference/computedPropertyNames29_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames29_ES6.types
@@ -9,8 +9,8 @@ class C {
 >() => {            var obj = {                [this.bar()]() { } // needs capture            };        } : () => void
 
             var obj = {
->obj : {}
->{                [this.bar()]() { } // needs capture            } : {}
+>obj : { [x: number]: () => void; }
+>{                [this.bar()]() { } // needs capture            } : { [x: number]: () => void; }
 
                 [this.bar()]() { } // needs capture
 >this.bar() : number
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 86fb6655a27..2e38e2a131f 100644
--- a/tests/baselines/reference/computedPropertyNames31_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames31_ES5.js
@@ -38,7 +38,8 @@ var C = (function (_super) {
         var _this = this;
         (function () {
             var obj = (_a = {},
-                _a[_super.prototype.bar.call(_this)] = function () { },
+                _a[_super.prototype.bar.call(_this)] = function () { } // needs capture
+            ,
                 _a);
             var _a;
         });
diff --git a/tests/baselines/reference/computedPropertyNames31_ES5.symbols b/tests/baselines/reference/computedPropertyNames31_ES5.symbols
index 82a6acb286c..9cb1b0184f7 100644
--- a/tests/baselines/reference/computedPropertyNames31_ES5.symbols
+++ b/tests/baselines/reference/computedPropertyNames31_ES5.symbols
@@ -3,7 +3,7 @@ class Base {
 >Base : Symbol(Base, Decl(computedPropertyNames31_ES5.ts, 0, 0))
 
     bar() {
->bar : Symbol(bar, Decl(computedPropertyNames31_ES5.ts, 0, 12))
+>bar : Symbol(Base.bar, Decl(computedPropertyNames31_ES5.ts, 0, 12))
 
         return 0;
     }
@@ -13,7 +13,7 @@ class C extends Base {
 >Base : Symbol(Base, Decl(computedPropertyNames31_ES5.ts, 0, 0))
 
     foo() {
->foo : Symbol(foo, Decl(computedPropertyNames31_ES5.ts, 5, 22))
+>foo : Symbol(C.foo, Decl(computedPropertyNames31_ES5.ts, 5, 22))
 
         () => {
             var obj = {
diff --git a/tests/baselines/reference/computedPropertyNames31_ES5.types b/tests/baselines/reference/computedPropertyNames31_ES5.types
index 6c0f2572a06..832b2bc067a 100644
--- a/tests/baselines/reference/computedPropertyNames31_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames31_ES5.types
@@ -20,8 +20,8 @@ class C extends Base {
 >() => {            var obj = {                [super.bar()]() { } // needs capture            };        } : () => void
 
             var obj = {
->obj : {}
->{                [super.bar()]() { } // needs capture            } : {}
+>obj : { [x: number]: () => void; }
+>{                [super.bar()]() { } // needs capture            } : { [x: number]: () => void; }
 
                 [super.bar()]() { } // needs capture
 >super.bar() : number
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/computedPropertyNames31_ES6.symbols b/tests/baselines/reference/computedPropertyNames31_ES6.symbols
index 778293bbb88..19cc6cd1bcd 100644
--- a/tests/baselines/reference/computedPropertyNames31_ES6.symbols
+++ b/tests/baselines/reference/computedPropertyNames31_ES6.symbols
@@ -3,7 +3,7 @@ class Base {
 >Base : Symbol(Base, Decl(computedPropertyNames31_ES6.ts, 0, 0))
 
     bar() {
->bar : Symbol(bar, Decl(computedPropertyNames31_ES6.ts, 0, 12))
+>bar : Symbol(Base.bar, Decl(computedPropertyNames31_ES6.ts, 0, 12))
 
         return 0;
     }
@@ -13,7 +13,7 @@ class C extends Base {
 >Base : Symbol(Base, Decl(computedPropertyNames31_ES6.ts, 0, 0))
 
     foo() {
->foo : Symbol(foo, Decl(computedPropertyNames31_ES6.ts, 5, 22))
+>foo : Symbol(C.foo, Decl(computedPropertyNames31_ES6.ts, 5, 22))
 
         () => {
             var obj = {
diff --git a/tests/baselines/reference/computedPropertyNames31_ES6.types b/tests/baselines/reference/computedPropertyNames31_ES6.types
index eaddc036812..4f59b1e8c6d 100644
--- a/tests/baselines/reference/computedPropertyNames31_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames31_ES6.types
@@ -20,8 +20,8 @@ class C extends Base {
 >() => {            var obj = {                [super.bar()]() { } // needs capture            };        } : () => void
 
             var obj = {
->obj : {}
->{                [super.bar()]() { } // needs capture            } : {}
+>obj : { [x: number]: () => void; }
+>{                [super.bar()]() { } // needs capture            } : { [x: number]: () => void; }
 
                 [super.bar()]() { } // needs capture
 >super.bar() : number
diff --git a/tests/baselines/reference/computedPropertyNames33_ES5.symbols b/tests/baselines/reference/computedPropertyNames33_ES5.symbols
index ae6dd01e7bc..90734fd07a0 100644
--- a/tests/baselines/reference/computedPropertyNames33_ES5.symbols
+++ b/tests/baselines/reference/computedPropertyNames33_ES5.symbols
@@ -8,7 +8,7 @@ class C<T> {
 >T : Symbol(T, Decl(computedPropertyNames33_ES5.ts, 1, 8))
 
     bar() {
->bar : Symbol(bar, Decl(computedPropertyNames33_ES5.ts, 1, 12))
+>bar : Symbol(C.bar, Decl(computedPropertyNames33_ES5.ts, 1, 12))
 
         var obj = {
 >obj : Symbol(obj, Decl(computedPropertyNames33_ES5.ts, 3, 11))
diff --git a/tests/baselines/reference/computedPropertyNames33_ES5.types b/tests/baselines/reference/computedPropertyNames33_ES5.types
index f44ac3ca769..7031981481f 100644
--- a/tests/baselines/reference/computedPropertyNames33_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames33_ES5.types
@@ -12,8 +12,8 @@ class C<T> {
 >bar : () => number
 
         var obj = {
->obj : {}
->{            [foo<T>()]() { }        } : {}
+>obj : { [x: string]: () => void; }
+>{            [foo<T>()]() { }        } : { [x: string]: () => void; }
 
             [foo<T>()]() { }
 >foo<T>() : string
diff --git a/tests/baselines/reference/computedPropertyNames33_ES6.symbols b/tests/baselines/reference/computedPropertyNames33_ES6.symbols
index cf0b3abde96..f51764af561 100644
--- a/tests/baselines/reference/computedPropertyNames33_ES6.symbols
+++ b/tests/baselines/reference/computedPropertyNames33_ES6.symbols
@@ -8,7 +8,7 @@ class C<T> {
 >T : Symbol(T, Decl(computedPropertyNames33_ES6.ts, 1, 8))
 
     bar() {
->bar : Symbol(bar, Decl(computedPropertyNames33_ES6.ts, 1, 12))
+>bar : Symbol(C.bar, Decl(computedPropertyNames33_ES6.ts, 1, 12))
 
         var obj = {
 >obj : Symbol(obj, Decl(computedPropertyNames33_ES6.ts, 3, 11))
diff --git a/tests/baselines/reference/computedPropertyNames33_ES6.types b/tests/baselines/reference/computedPropertyNames33_ES6.types
index 3081337c8bb..3c57daf2ace 100644
--- a/tests/baselines/reference/computedPropertyNames33_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames33_ES6.types
@@ -12,8 +12,8 @@ class C<T> {
 >bar : () => number
 
         var obj = {
->obj : {}
->{            [foo<T>()]() { }        } : {}
+>obj : { [x: string]: () => void; }
+>{            [foo<T>()]() { }        } : { [x: string]: () => void; }
 
             [foo<T>()]() { }
 >foo<T>() : string
diff --git a/tests/baselines/reference/computedPropertyNames36_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames36_ES5.errors.txt
index 6c38043c8e0..506a9ca15d1 100644
--- a/tests/baselines/reference/computedPropertyNames36_ES5.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames36_ES5.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames36_ES5.ts(8,5): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames36_ES5.ts(8,9): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
 
 
 ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames36_ES5.ts (1 errors) ====
@@ -10,7 +10,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames36_ES5.ts(8,
     
         // Computed properties
         get ["get1"]() { return new Foo }
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            ~~~~~~~~
 !!! error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
         set ["set1"](p: Foo2) { }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames36_ES5.js b/tests/baselines/reference/computedPropertyNames36_ES5.js
index 884e425e25b..ec5643db26a 100644
--- a/tests/baselines/reference/computedPropertyNames36_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames36_ES5.js
@@ -27,6 +27,10 @@ var C = (function () {
     Object.defineProperty(C.prototype, "get1", {
         // Computed properties
         get: function () { return new Foo; },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, "set1", {
         set: function (p) { },
         enumerable: true,
         configurable: true
diff --git a/tests/baselines/reference/computedPropertyNames36_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames36_ES6.errors.txt
index 8127898fde4..cf50807ac54 100644
--- a/tests/baselines/reference/computedPropertyNames36_ES6.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames36_ES6.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames36_ES6.ts(8,5): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames36_ES6.ts(8,9): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
 
 
 ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames36_ES6.ts (1 errors) ====
@@ -10,7 +10,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames36_ES6.ts(8,
     
         // Computed properties
         get ["get1"]() { return new Foo }
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            ~~~~~~~~
 !!! error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
         set ["set1"](p: Foo2) { }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames37_ES5.js b/tests/baselines/reference/computedPropertyNames37_ES5.js
index 8cdc0af30e7..914fd9a898e 100644
--- a/tests/baselines/reference/computedPropertyNames37_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames37_ES5.js
@@ -27,6 +27,10 @@ var C = (function () {
     Object.defineProperty(C.prototype, "get1", {
         // Computed properties
         get: function () { return new Foo; },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C.prototype, "set1", {
         set: function (p) { },
         enumerable: true,
         configurable: true
diff --git a/tests/baselines/reference/computedPropertyNames37_ES5.symbols b/tests/baselines/reference/computedPropertyNames37_ES5.symbols
index 7932b2c8fdc..62e92ee6efc 100644
--- a/tests/baselines/reference/computedPropertyNames37_ES5.symbols
+++ b/tests/baselines/reference/computedPropertyNames37_ES5.symbols
@@ -1,12 +1,12 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNames37_ES5.ts ===
 class Foo { x }
 >Foo : Symbol(Foo, Decl(computedPropertyNames37_ES5.ts, 0, 0))
->x : Symbol(x, Decl(computedPropertyNames37_ES5.ts, 0, 11))
+>x : Symbol(Foo.x, Decl(computedPropertyNames37_ES5.ts, 0, 11))
 
 class Foo2 { x; y }
 >Foo2 : Symbol(Foo2, Decl(computedPropertyNames37_ES5.ts, 0, 15))
->x : Symbol(x, Decl(computedPropertyNames37_ES5.ts, 1, 12))
->y : Symbol(y, Decl(computedPropertyNames37_ES5.ts, 1, 15))
+>x : Symbol(Foo2.x, Decl(computedPropertyNames37_ES5.ts, 1, 12))
+>y : Symbol(Foo2.y, Decl(computedPropertyNames37_ES5.ts, 1, 15))
 
 class C {
 >C : Symbol(C, Decl(computedPropertyNames37_ES5.ts, 1, 19))
diff --git a/tests/baselines/reference/computedPropertyNames37_ES6.symbols b/tests/baselines/reference/computedPropertyNames37_ES6.symbols
index f4439ef4f92..7221614581a 100644
--- a/tests/baselines/reference/computedPropertyNames37_ES6.symbols
+++ b/tests/baselines/reference/computedPropertyNames37_ES6.symbols
@@ -1,12 +1,12 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNames37_ES6.ts ===
 class Foo { x }
 >Foo : Symbol(Foo, Decl(computedPropertyNames37_ES6.ts, 0, 0))
->x : Symbol(x, Decl(computedPropertyNames37_ES6.ts, 0, 11))
+>x : Symbol(Foo.x, Decl(computedPropertyNames37_ES6.ts, 0, 11))
 
 class Foo2 { x; y }
 >Foo2 : Symbol(Foo2, Decl(computedPropertyNames37_ES6.ts, 0, 15))
->x : Symbol(x, Decl(computedPropertyNames37_ES6.ts, 1, 12))
->y : Symbol(y, Decl(computedPropertyNames37_ES6.ts, 1, 15))
+>x : Symbol(Foo2.x, Decl(computedPropertyNames37_ES6.ts, 1, 12))
+>y : Symbol(Foo2.y, Decl(computedPropertyNames37_ES6.ts, 1, 15))
 
 class C {
 >C : Symbol(C, Decl(computedPropertyNames37_ES6.ts, 1, 19))
diff --git a/tests/baselines/reference/computedPropertyNames38_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames38_ES5.errors.txt
index acc08ee5527..2e5313caa41 100644
--- a/tests/baselines/reference/computedPropertyNames38_ES5.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames38_ES5.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames38_ES5.ts(8,5): error TS2411: Property '[1 << 6]' of type 'Foo' is not assignable to string index type 'Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames38_ES5.ts(8,9): error TS2411: Property '[1 << 6]' of type 'Foo' is not assignable to string index type 'Foo2'.
 
 
 ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames38_ES5.ts (1 errors) ====
@@ -10,7 +10,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames38_ES5.ts(8,
     
         // Computed properties
         get [1 << 6]() { return new Foo }
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            ~~~~~~~~
 !!! error TS2411: Property '[1 << 6]' of type 'Foo' is not assignable to string index type 'Foo2'.
         set [1 << 6](p: Foo2) { }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames38_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames38_ES6.errors.txt
index 0a95b37f9a9..4c6e78c5b04 100644
--- a/tests/baselines/reference/computedPropertyNames38_ES6.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames38_ES6.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames38_ES6.ts(8,5): error TS2411: Property '[1 << 6]' of type 'Foo' is not assignable to string index type 'Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames38_ES6.ts(8,9): error TS2411: Property '[1 << 6]' of type 'Foo' is not assignable to string index type 'Foo2'.
 
 
 ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames38_ES6.ts (1 errors) ====
@@ -10,7 +10,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames38_ES6.ts(8,
     
         // Computed properties
         get [1 << 6]() { return new Foo }
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            ~~~~~~~~
 !!! error TS2411: Property '[1 << 6]' of type 'Foo' is not assignable to string index type 'Foo2'.
         set [1 << 6](p: Foo2) { }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames39_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames39_ES5.errors.txt
index 669314676f9..a204ef4ae34 100644
--- a/tests/baselines/reference/computedPropertyNames39_ES5.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames39_ES5.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames39_ES5.ts(8,5): error TS2412: Property '[1 << 6]' of type 'Foo' is not assignable to numeric index type 'Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames39_ES5.ts(8,9): error TS2412: Property '[1 << 6]' of type 'Foo' is not assignable to numeric index type 'Foo2'.
 
 
 ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames39_ES5.ts (1 errors) ====
@@ -10,7 +10,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames39_ES5.ts(8,
     
         // Computed properties
         get [1 << 6]() { return new Foo }
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            ~~~~~~~~
 !!! error TS2412: Property '[1 << 6]' of type 'Foo' is not assignable to numeric index type 'Foo2'.
         set [1 << 6](p: Foo2) { }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames39_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames39_ES6.errors.txt
index 38f432162d5..d2e2494c87a 100644
--- a/tests/baselines/reference/computedPropertyNames39_ES6.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames39_ES6.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames39_ES6.ts(8,5): error TS2412: Property '[1 << 6]' of type 'Foo' is not assignable to numeric index type 'Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames39_ES6.ts(8,9): error TS2412: Property '[1 << 6]' of type 'Foo' is not assignable to numeric index type 'Foo2'.
 
 
 ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames39_ES6.ts (1 errors) ====
@@ -10,7 +10,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames39_ES6.ts(8,
     
         // Computed properties
         get [1 << 6]() { return new Foo }
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            ~~~~~~~~
 !!! error TS2412: Property '[1 << 6]' of type 'Foo' is not assignable to numeric index type 'Foo2'.
         set [1 << 6](p: Foo2) { }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames41_ES5.symbols b/tests/baselines/reference/computedPropertyNames41_ES5.symbols
index e1438568f24..3db1cf16a2b 100644
--- a/tests/baselines/reference/computedPropertyNames41_ES5.symbols
+++ b/tests/baselines/reference/computedPropertyNames41_ES5.symbols
@@ -1,12 +1,12 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNames41_ES5.ts ===
 class Foo { x }
 >Foo : Symbol(Foo, Decl(computedPropertyNames41_ES5.ts, 0, 0))
->x : Symbol(x, Decl(computedPropertyNames41_ES5.ts, 0, 11))
+>x : Symbol(Foo.x, Decl(computedPropertyNames41_ES5.ts, 0, 11))
 
 class Foo2 { x; y }
 >Foo2 : Symbol(Foo2, Decl(computedPropertyNames41_ES5.ts, 0, 15))
->x : Symbol(x, Decl(computedPropertyNames41_ES5.ts, 1, 12))
->y : Symbol(y, Decl(computedPropertyNames41_ES5.ts, 1, 15))
+>x : Symbol(Foo2.x, Decl(computedPropertyNames41_ES5.ts, 1, 12))
+>y : Symbol(Foo2.y, Decl(computedPropertyNames41_ES5.ts, 1, 15))
 
 class C {
 >C : Symbol(C, Decl(computedPropertyNames41_ES5.ts, 1, 19))
diff --git a/tests/baselines/reference/computedPropertyNames41_ES6.symbols b/tests/baselines/reference/computedPropertyNames41_ES6.symbols
index 3f4a7dff621..bedbf7953f7 100644
--- a/tests/baselines/reference/computedPropertyNames41_ES6.symbols
+++ b/tests/baselines/reference/computedPropertyNames41_ES6.symbols
@@ -1,12 +1,12 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNames41_ES6.ts ===
 class Foo { x }
 >Foo : Symbol(Foo, Decl(computedPropertyNames41_ES6.ts, 0, 0))
->x : Symbol(x, Decl(computedPropertyNames41_ES6.ts, 0, 11))
+>x : Symbol(Foo.x, Decl(computedPropertyNames41_ES6.ts, 0, 11))
 
 class Foo2 { x; y }
 >Foo2 : Symbol(Foo2, Decl(computedPropertyNames41_ES6.ts, 0, 15))
->x : Symbol(x, Decl(computedPropertyNames41_ES6.ts, 1, 12))
->y : Symbol(y, Decl(computedPropertyNames41_ES6.ts, 1, 15))
+>x : Symbol(Foo2.x, Decl(computedPropertyNames41_ES6.ts, 1, 12))
+>y : Symbol(Foo2.y, Decl(computedPropertyNames41_ES6.ts, 1, 15))
 
 class C {
 >C : Symbol(C, Decl(computedPropertyNames41_ES6.ts, 1, 19))
diff --git a/tests/baselines/reference/computedPropertyNames43_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames43_ES5.errors.txt
index 62c239a5a54..d777ae659de 100644
--- a/tests/baselines/reference/computedPropertyNames43_ES5.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames43_ES5.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames43_ES5.ts(10,5): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames43_ES5.ts(10,9): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
 
 
 ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames43_ES5.ts (1 errors) ====
@@ -12,7 +12,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames43_ES5.ts(10
     class D extends C {
         // Computed properties
         get ["get1"]() { return new Foo }
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            ~~~~~~~~
 !!! error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
         set ["set1"](p: Foo2) { }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames43_ES5.js b/tests/baselines/reference/computedPropertyNames43_ES5.js
index 9690d0b8196..c79a4d8d6d1 100644
--- a/tests/baselines/reference/computedPropertyNames43_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames43_ES5.js
@@ -41,6 +41,10 @@ var D = (function (_super) {
     Object.defineProperty(D.prototype, "get1", {
         // Computed properties
         get: function () { return new Foo; },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(D.prototype, "set1", {
         set: function (p) { },
         enumerable: true,
         configurable: true
diff --git a/tests/baselines/reference/computedPropertyNames43_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames43_ES6.errors.txt
index 0efe0ba39ec..6af43ebfa5c 100644
--- a/tests/baselines/reference/computedPropertyNames43_ES6.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames43_ES6.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames43_ES6.ts(10,5): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames43_ES6.ts(10,9): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
 
 
 ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames43_ES6.ts (1 errors) ====
@@ -12,7 +12,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames43_ES6.ts(10
     class D extends C {
         // Computed properties
         get ["get1"]() { return new Foo }
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            ~~~~~~~~
 !!! error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
         set ["set1"](p: Foo2) { }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames44_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames44_ES5.errors.txt
index 35ab422e093..43801ab3d62 100644
--- a/tests/baselines/reference/computedPropertyNames44_ES5.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames44_ES5.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames44_ES5.ts(6,5): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames44_ES5.ts(10,5): error TS2411: Property '["set1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames44_ES5.ts(6,9): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames44_ES5.ts(10,9): error TS2411: Property '["set1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
 
 
 ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames44_ES5.ts (2 errors) ====
@@ -9,12 +9,12 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames44_ES5.ts(10
     class C {
         [s: string]: Foo2;
         get ["get1"]() { return new Foo }
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            ~~~~~~~~
 !!! error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
     }
     
     class D extends C {
         set ["set1"](p: Foo) { }
-        ~~~~~~~~~~~~~~~~~~~~~~~~
+            ~~~~~~~~
 !!! error TS2411: Property '["set1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames44_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames44_ES6.errors.txt
index 5170746395c..28b861347a3 100644
--- a/tests/baselines/reference/computedPropertyNames44_ES6.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames44_ES6.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames44_ES6.ts(6,5): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames44_ES6.ts(10,5): error TS2411: Property '["set1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames44_ES6.ts(6,9): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames44_ES6.ts(10,9): error TS2411: Property '["set1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
 
 
 ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames44_ES6.ts (2 errors) ====
@@ -9,12 +9,12 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames44_ES6.ts(10
     class C {
         [s: string]: Foo2;
         get ["get1"]() { return new Foo }
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            ~~~~~~~~
 !!! error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
     }
     
     class D extends C {
         set ["set1"](p: Foo) { }
-        ~~~~~~~~~~~~~~~~~~~~~~~~
+            ~~~~~~~~
 !!! error TS2411: Property '["set1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames45_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames45_ES5.errors.txt
index 8baae68f337..f06d199ba5a 100644
--- a/tests/baselines/reference/computedPropertyNames45_ES5.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames45_ES5.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES5.ts(5,5): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES5.ts(11,5): error TS2411: Property '["set1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES5.ts(5,9): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES5.ts(11,9): error TS2411: Property '["set1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
 
 
 ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES5.ts (2 errors) ====
@@ -8,7 +8,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES5.ts(11
     
     class C {
         get ["get1"]() { return new Foo }
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            ~~~~~~~~
 !!! error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
     }
     
@@ -16,6 +16,6 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES5.ts(11
         // No error when the indexer is in a class more derived than the computed property
         [s: string]: Foo2;
         set ["set1"](p: Foo) { }
-        ~~~~~~~~~~~~~~~~~~~~~~~~
+            ~~~~~~~~
 !!! error TS2411: Property '["set1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames45_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames45_ES6.errors.txt
index e329785f4cf..626ed14ad1a 100644
--- a/tests/baselines/reference/computedPropertyNames45_ES6.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames45_ES6.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES6.ts(5,5): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES6.ts(11,5): error TS2411: Property '["set1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES6.ts(5,9): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES6.ts(11,9): error TS2411: Property '["set1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
 
 
 ==== tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES6.ts (2 errors) ====
@@ -8,7 +8,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES6.ts(11
     
     class C {
         get ["get1"]() { return new Foo }
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            ~~~~~~~~
 !!! error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
     }
     
@@ -16,6 +16,6 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES6.ts(11
         // No error when the indexer is in a class more derived than the computed property
         [s: string]: Foo2;
         set ["set1"](p: Foo) { }
-        ~~~~~~~~~~~~~~~~~~~~~~~~
+            ~~~~~~~~
 !!! error TS2411: Property '["set1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames46_ES5.types b/tests/baselines/reference/computedPropertyNames46_ES5.types
index 394b22bd904..b8df0d56e13 100644
--- a/tests/baselines/reference/computedPropertyNames46_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames46_ES5.types
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNames46_ES5.ts ===
 var o = {
->o : {}
->{    ["" || 0]: 0} : {}
+>o : { [x: string]: number; }
+>{    ["" || 0]: 0} : { [x: string]: number; }
 
     ["" || 0]: 0
 >"" || 0 : string | number
diff --git a/tests/baselines/reference/computedPropertyNames46_ES6.types b/tests/baselines/reference/computedPropertyNames46_ES6.types
index 864fd81321d..a786eca200c 100644
--- a/tests/baselines/reference/computedPropertyNames46_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames46_ES6.types
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNames46_ES6.ts ===
 var o = {
->o : {}
->{    ["" || 0]: 0} : {}
+>o : { [x: string]: number; }
+>{    ["" || 0]: 0} : { [x: string]: number; }
 
     ["" || 0]: 0
 >"" || 0 : string | number
diff --git a/tests/baselines/reference/computedPropertyNames47_ES5.types b/tests/baselines/reference/computedPropertyNames47_ES5.types
index 6aa841ffd62..cdc2c3301f6 100644
--- a/tests/baselines/reference/computedPropertyNames47_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames47_ES5.types
@@ -8,8 +8,8 @@ enum E2 { x }
 >x : E2
 
 var o = {
->o : {}
->{    [E1.x || E2.x]: 0} : {}
+>o : { [x: number]: number; }
+>{    [E1.x || E2.x]: 0} : { [x: number]: number; }
 
     [E1.x || E2.x]: 0
 >E1.x || E2.x : E1 | E2
diff --git a/tests/baselines/reference/computedPropertyNames47_ES6.types b/tests/baselines/reference/computedPropertyNames47_ES6.types
index f038b172ca1..a923e934d66 100644
--- a/tests/baselines/reference/computedPropertyNames47_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames47_ES6.types
@@ -8,8 +8,8 @@ enum E2 { x }
 >x : E2
 
 var o = {
->o : {}
->{    [E1.x || E2.x]: 0} : {}
+>o : { [x: number]: number; }
+>{    [E1.x || E2.x]: 0} : { [x: number]: number; }
 
     [E1.x || E2.x]: 0
 >E1.x || E2.x : E1 | E2
diff --git a/tests/baselines/reference/computedPropertyNames48_ES5.types b/tests/baselines/reference/computedPropertyNames48_ES5.types
index 2b9131a11c8..12752d8abeb 100644
--- a/tests/baselines/reference/computedPropertyNames48_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames48_ES5.types
@@ -39,9 +39,9 @@ extractIndexer({
 }); // Should return string
 
 extractIndexer({
->extractIndexer({    ["" || 0]: ""}) : any
+>extractIndexer({    ["" || 0]: ""}) : string
 >extractIndexer : <T>(p: { [n: number]: T; }) => T
->{    ["" || 0]: ""} : { [x: number]: undefined; }
+>{    ["" || 0]: ""} : { [x: string]: string; }
 
     ["" || 0]: ""
 >"" || 0 : string | number
diff --git a/tests/baselines/reference/computedPropertyNames48_ES6.types b/tests/baselines/reference/computedPropertyNames48_ES6.types
index 2b803b19bd6..832bc3c7025 100644
--- a/tests/baselines/reference/computedPropertyNames48_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames48_ES6.types
@@ -39,9 +39,9 @@ extractIndexer({
 }); // Should return string
 
 extractIndexer({
->extractIndexer({    ["" || 0]: ""}) : any
+>extractIndexer({    ["" || 0]: ""}) : string
 >extractIndexer : <T>(p: { [n: number]: T; }) => T
->{    ["" || 0]: ""} : { [x: number]: undefined; }
+>{    ["" || 0]: ""} : { [x: string]: string; }
 
     ["" || 0]: ""
 >"" || 0 : string | number
diff --git a/tests/baselines/reference/computedPropertyNames49_ES5.js b/tests/baselines/reference/computedPropertyNames49_ES5.js
index 12c3430fbe9..d4eb26a08a5 100644
--- a/tests/baselines/reference/computedPropertyNames49_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames49_ES5.js
@@ -60,7 +60,6 @@ var x = (_a = {
         enumerable: true,
         configurable: true
     }),
-    ,
     _a.p2 = 20,
     _a);
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNames4_ES5.types b/tests/baselines/reference/computedPropertyNames4_ES5.types
index 6984d2e69b8..3c5f884640f 100644
--- a/tests/baselines/reference/computedPropertyNames4_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames4_ES5.types
@@ -9,8 +9,8 @@ var a: any;
 >a : any
 
 var v = {
->v : { [0]: number; [""]: number; }
->{    [s]: 0,    [n]: n,    [s + s]: 1,    [s + n]: 2,    [+s]: s,    [""]: 0,    [0]: 0,    [a]: 1,    [<any>true]: 0,    [`hello bye`]: 0,    [`hello ${a} bye`]: 0} : { [0]: number; [""]: number; }
+>v : { [x: string]: number | string; [x: number]: number | string; [0]: number; [""]: number; }
+>{    [s]: 0,    [n]: n,    [s + s]: 1,    [s + n]: 2,    [+s]: s,    [""]: 0,    [0]: 0,    [a]: 1,    [<any>true]: 0,    [`hello bye`]: 0,    [`hello ${a} bye`]: 0} : { [x: string]: number | string; [x: number]: number | string; [0]: number; [""]: number; }
 
     [s]: 0,
 >s : string
diff --git a/tests/baselines/reference/computedPropertyNames4_ES6.types b/tests/baselines/reference/computedPropertyNames4_ES6.types
index 1fece561f5a..335c2415bd0 100644
--- a/tests/baselines/reference/computedPropertyNames4_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames4_ES6.types
@@ -9,8 +9,8 @@ var a: any;
 >a : any
 
 var v = {
->v : { [0]: number; [""]: number; }
->{    [s]: 0,    [n]: n,    [s + s]: 1,    [s + n]: 2,    [+s]: s,    [""]: 0,    [0]: 0,    [a]: 1,    [<any>true]: 0,    [`hello bye`]: 0,    [`hello ${a} bye`]: 0} : { [0]: number; [""]: number; }
+>v : { [x: string]: number | string; [x: number]: number | string; [0]: number; [""]: number; }
+>{    [s]: 0,    [n]: n,    [s + s]: 1,    [s + n]: 2,    [+s]: s,    [""]: 0,    [0]: 0,    [a]: 1,    [<any>true]: 0,    [`hello bye`]: 0,    [`hello ${a} bye`]: 0} : { [x: string]: number | string; [x: number]: number | string; [0]: number; [""]: number; }
 
     [s]: 0,
 >s : string
diff --git a/tests/baselines/reference/computedPropertyNames50_ES5.js b/tests/baselines/reference/computedPropertyNames50_ES5.js
index db9a03578df..0c6f1798c93 100644
--- a/tests/baselines/reference/computedPropertyNames50_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames50_ES5.js
@@ -56,7 +56,6 @@ var x = (_a = {
         enumerable: true,
         configurable: true
     }),
-    ,
     _a.p2 = 20,
     _a);
 var _a;
diff --git a/tests/baselines/reference/computedPropertyNames7_ES5.types b/tests/baselines/reference/computedPropertyNames7_ES5.types
index 8ebd4d75668..3411198b590 100644
--- a/tests/baselines/reference/computedPropertyNames7_ES5.types
+++ b/tests/baselines/reference/computedPropertyNames7_ES5.types
@@ -6,8 +6,8 @@ enum E {
 >member : E
 }
 var v = {
->v : {}
->{    [E.member]: 0} : {}
+>v : { [x: number]: number; }
+>{    [E.member]: 0} : { [x: number]: number; }
 
     [E.member]: 0
 >E.member : E
diff --git a/tests/baselines/reference/computedPropertyNames7_ES6.types b/tests/baselines/reference/computedPropertyNames7_ES6.types
index 3a78b9c0ec6..eb72d546dbc 100644
--- a/tests/baselines/reference/computedPropertyNames7_ES6.types
+++ b/tests/baselines/reference/computedPropertyNames7_ES6.types
@@ -6,8 +6,8 @@ enum E {
 >member : E
 }
 var v = {
->v : {}
->{    [E.member]: 0} : {}
+>v : { [x: number]: number; }
+>{    [E.member]: 0} : { [x: number]: number; }
 
     [E.member]: 0
 >E.member : E
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType1_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType1_ES5.types
index bea7267d7d1..09cad594624 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType1_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType1_ES5.types
@@ -14,7 +14,7 @@ interface I {
 var o: I = {
 >o : I
 >I : I
->{    ["" + 0](y) { return y.length; },    ["" + 1]: y => y.length} : { [x: string]: (y: string) => number; [x: number]: undefined; }
+>{    ["" + 0](y) { return y.length; },    ["" + 1]: y => y.length} : { [x: string]: (y: string) => number; }
 
     ["" + 0](y) { return y.length; },
 >"" + 0 : string
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType1_ES6.symbols b/tests/baselines/reference/computedPropertyNamesContextualType1_ES6.symbols
index 56da1f91a5e..ef5d519c3a0 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType1_ES6.symbols
+++ b/tests/baselines/reference/computedPropertyNamesContextualType1_ES6.symbols
@@ -17,13 +17,13 @@ var o: I = {
 
     ["" + 0](y) { return y.length; },
 >y : Symbol(y, Decl(computedPropertyNamesContextualType1_ES6.ts, 6, 13))
->y.length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>y.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 >y : Symbol(y, Decl(computedPropertyNamesContextualType1_ES6.ts, 6, 13))
->length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 
     ["" + 1]: y => y.length
 >y : Symbol(y, Decl(computedPropertyNamesContextualType1_ES6.ts, 7, 13))
->y.length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>y.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 >y : Symbol(y, Decl(computedPropertyNamesContextualType1_ES6.ts, 7, 13))
->length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType1_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType1_ES6.types
index c8d0be6e833..d9e9970ebec 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType1_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType1_ES6.types
@@ -14,7 +14,7 @@ interface I {
 var o: I = {
 >o : I
 >I : I
->{    ["" + 0](y) { return y.length; },    ["" + 1]: y => y.length} : { [x: string]: (y: string) => number; [x: number]: undefined; }
+>{    ["" + 0](y) { return y.length; },    ["" + 1]: y => y.length} : { [x: string]: (y: string) => number; }
 
     ["" + 0](y) { return y.length; },
 >"" + 0 : string
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType2_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType2_ES5.types
index 52de216b803..5a5c48f2536 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType2_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType2_ES5.types
@@ -14,7 +14,7 @@ interface I {
 var o: I = {
 >o : I
 >I : I
->{    [+"foo"](y) { return y.length; },    [+"bar"]: y => y.length} : { [x: string]: (y: string) => number; [x: number]: (y: string) => number; }
+>{    [+"foo"](y) { return y.length; },    [+"bar"]: y => y.length} : { [x: number]: (y: string) => number; }
 
     [+"foo"](y) { return y.length; },
 >+"foo" : number
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType2_ES6.symbols b/tests/baselines/reference/computedPropertyNamesContextualType2_ES6.symbols
index 9412a9c8c34..d8cab4c4a52 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType2_ES6.symbols
+++ b/tests/baselines/reference/computedPropertyNamesContextualType2_ES6.symbols
@@ -17,13 +17,13 @@ var o: I = {
 
     [+"foo"](y) { return y.length; },
 >y : Symbol(y, Decl(computedPropertyNamesContextualType2_ES6.ts, 6, 13))
->y.length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>y.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 >y : Symbol(y, Decl(computedPropertyNamesContextualType2_ES6.ts, 6, 13))
->length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 
     [+"bar"]: y => y.length
 >y : Symbol(y, Decl(computedPropertyNamesContextualType2_ES6.ts, 7, 13))
->y.length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>y.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 >y : Symbol(y, Decl(computedPropertyNamesContextualType2_ES6.ts, 7, 13))
->length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType2_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType2_ES6.types
index cbbe0edc6a1..330351790ca 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType2_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType2_ES6.types
@@ -14,7 +14,7 @@ interface I {
 var o: I = {
 >o : I
 >I : I
->{    [+"foo"](y) { return y.length; },    [+"bar"]: y => y.length} : { [x: string]: (y: string) => number; [x: number]: (y: string) => number; }
+>{    [+"foo"](y) { return y.length; },    [+"bar"]: y => y.length} : { [x: number]: (y: string) => number; }
 
     [+"foo"](y) { return y.length; },
 >+"foo" : number
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType3_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType3_ES5.types
index 5f647fb4c1b..faff27c9154 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType3_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType3_ES5.types
@@ -10,7 +10,7 @@ interface I {
 var o: I = {
 >o : I
 >I : I
->{    [+"foo"](y) { return y.length; },    [+"bar"]: y => y.length} : { [x: string]: (y: string) => number; }
+>{    [+"foo"](y) { return y.length; },    [+"bar"]: y => y.length} : { [x: number]: (y: string) => number; }
 
     [+"foo"](y) { return y.length; },
 >+"foo" : number
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType3_ES6.symbols b/tests/baselines/reference/computedPropertyNamesContextualType3_ES6.symbols
index 0b53cf3bfe4..deea9bff3df 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType3_ES6.symbols
+++ b/tests/baselines/reference/computedPropertyNamesContextualType3_ES6.symbols
@@ -13,13 +13,13 @@ var o: I = {
 
     [+"foo"](y) { return y.length; },
 >y : Symbol(y, Decl(computedPropertyNamesContextualType3_ES6.ts, 5, 13))
->y.length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>y.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 >y : Symbol(y, Decl(computedPropertyNamesContextualType3_ES6.ts, 5, 13))
->length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 
     [+"bar"]: y => y.length
 >y : Symbol(y, Decl(computedPropertyNamesContextualType3_ES6.ts, 6, 13))
->y.length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>y.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 >y : Symbol(y, Decl(computedPropertyNamesContextualType3_ES6.ts, 6, 13))
->length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType3_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType3_ES6.types
index e872df6f1b2..18c32957944 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType3_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType3_ES6.types
@@ -10,7 +10,7 @@ interface I {
 var o: I = {
 >o : I
 >I : I
->{    [+"foo"](y) { return y.length; },    [+"bar"]: y => y.length} : { [x: string]: (y: string) => number; }
+>{    [+"foo"](y) { return y.length; },    [+"bar"]: y => y.length} : { [x: number]: (y: string) => number; }
 
     [+"foo"](y) { return y.length; },
 >+"foo" : number
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType4_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType4_ES5.types
index e5a57363ca0..6f75f1a3633 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType4_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType4_ES5.types
@@ -12,7 +12,7 @@ interface I {
 var o: I = {
 >o : I
 >I : I
->{    [""+"foo"]: "",    [""+"bar"]: 0} : { [x: string]: string | number; [x: number]: undefined; }
+>{    [""+"foo"]: "",    [""+"bar"]: 0} : { [x: string]: string | number; }
 
     [""+"foo"]: "",
 >""+"foo" : string
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType4_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType4_ES6.types
index bdfa569752b..9ee84176237 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType4_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType4_ES6.types
@@ -12,7 +12,7 @@ interface I {
 var o: I = {
 >o : I
 >I : I
->{    [""+"foo"]: "",    [""+"bar"]: 0} : { [x: string]: string | number; [x: number]: undefined; }
+>{    [""+"foo"]: "",    [""+"bar"]: 0} : { [x: string]: string | number; }
 
     [""+"foo"]: "",
 >""+"foo" : string
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType5_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType5_ES5.types
index e142fe937b9..38594f756ab 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType5_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType5_ES5.types
@@ -12,7 +12,7 @@ interface I {
 var o: I = {
 >o : I
 >I : I
->{    [+"foo"]: "",    [+"bar"]: 0} : { [x: string]: string | number; [x: number]: string | number; }
+>{    [+"foo"]: "",    [+"bar"]: 0} : { [x: number]: string | number; }
 
     [+"foo"]: "",
 >+"foo" : number
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType5_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType5_ES6.types
index 7b385b36770..a07b2e8cd95 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType5_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType5_ES6.types
@@ -12,7 +12,7 @@ interface I {
 var o: I = {
 >o : I
 >I : I
->{    [+"foo"]: "",    [+"bar"]: 0} : { [x: string]: string | number; [x: number]: string | number; }
+>{    [+"foo"]: "",    [+"bar"]: 0} : { [x: number]: string | number; }
 
     [+"foo"]: "",
 >+"foo" : number
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types
index a3a393fba0c..b49724ccded 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType6_ES5.types
@@ -19,7 +19,7 @@ declare function foo<T>(obj: I<T>): T
 foo({
 >foo({    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]}) : string | (() => void) | boolean | number | number[]
 >foo : <T>(obj: I<T>) => T
->{    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]} : { [x: string]: string | (() => void) | boolean | number | number[]; 0: () => void; p: string; }
+>{    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]} : { [x: string]: string | (() => void) | boolean | number | number[]; [x: number]: (() => void) | number | number[]; 0: () => void; p: string; }
 
     p: "",
 >p : string
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types
index 4abefe44843..e88959d7cdc 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType6_ES6.types
@@ -19,7 +19,7 @@ declare function foo<T>(obj: I<T>): T
 foo({
 >foo({    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]}) : string | (() => void) | boolean | number | number[]
 >foo : <T>(obj: I<T>) => T
->{    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]} : { [x: string]: string | (() => void) | boolean | number | number[]; 0: () => void; p: string; }
+>{    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]} : { [x: string]: string | (() => void) | boolean | number | number[]; [x: number]: (() => void) | number | number[]; 0: () => void; p: string; }
 
     p: "",
 >p : string
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.types b/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.types
index ae1004c9819..083388ba975 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.types
@@ -19,7 +19,7 @@ declare function foo<T>(obj: I<T>): T
 foo({
 >foo({    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]}) : (() => void) | number | number[]
 >foo : <T>(obj: I<T>) => T
->{    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]} : { [x: number]: (() => void) | number | number[]; 0: () => void; p: string; }
+>{    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]} : { [x: string]: string | (() => void) | boolean | number | number[]; [x: number]: (() => void) | number | number[]; 0: () => void; p: string; }
 
     p: "",
 >p : string
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.types b/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.types
index e98e0fb8941..bc6ae72fb4f 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesContextualType7_ES6.types
@@ -19,7 +19,7 @@ declare function foo<T>(obj: I<T>): T
 foo({
 >foo({    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]}) : (() => void) | number | number[]
 >foo : <T>(obj: I<T>) => T
->{    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]} : { [x: number]: (() => void) | number | number[]; 0: () => void; p: string; }
+>{    p: "",    0: () => { },    ["hi" + "bye"]: true,    [0 + 1]: 0,    [+"hi"]: [0]} : { [x: string]: string | (() => void) | boolean | number | number[]; [x: number]: (() => void) | number | number[]; 0: () => void; p: string; }
 
     p: "",
 >p : string
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType8_ES5.errors.txt b/tests/baselines/reference/computedPropertyNamesContextualType8_ES5.errors.txt
index 3376243e370..ee36609095a 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType8_ES5.errors.txt
+++ b/tests/baselines/reference/computedPropertyNamesContextualType8_ES5.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType8_ES5.ts(6,5): error TS2322: Type '{ [x: string]: string | number; [x: number]: undefined; }' is not assignable to type 'I'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType8_ES5.ts(6,5): error TS2322: Type '{ [x: string]: string | number; }' is not assignable to type 'I'.
   Index signatures are incompatible.
     Type 'string | number' is not assignable to type 'boolean'.
       Type 'string' is not assignable to type 'boolean'.
@@ -12,7 +12,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualTy
     
     var o: I = {
         ~
-!!! error TS2322: Type '{ [x: string]: string | number; [x: number]: undefined; }' is not assignable to type 'I'.
+!!! error TS2322: Type '{ [x: string]: string | number; }' is not assignable to type 'I'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Type 'string | number' is not assignable to type 'boolean'.
 !!! error TS2322:       Type 'string' is not assignable to type 'boolean'.
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType8_ES6.errors.txt b/tests/baselines/reference/computedPropertyNamesContextualType8_ES6.errors.txt
index e4540337ed4..1048fd2e119 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType8_ES6.errors.txt
+++ b/tests/baselines/reference/computedPropertyNamesContextualType8_ES6.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType8_ES6.ts(6,5): error TS2322: Type '{ [x: string]: string | number; [x: number]: undefined; }' is not assignable to type 'I'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType8_ES6.ts(6,5): error TS2322: Type '{ [x: string]: string | number; }' is not assignable to type 'I'.
   Index signatures are incompatible.
     Type 'string | number' is not assignable to type 'boolean'.
       Type 'string' is not assignable to type 'boolean'.
@@ -12,7 +12,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualTy
     
     var o: I = {
         ~
-!!! error TS2322: Type '{ [x: string]: string | number; [x: number]: undefined; }' is not assignable to type 'I'.
+!!! error TS2322: Type '{ [x: string]: string | number; }' is not assignable to type 'I'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Type 'string | number' is not assignable to type 'boolean'.
 !!! error TS2322:       Type 'string' is not assignable to type 'boolean'.
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType9_ES5.errors.txt b/tests/baselines/reference/computedPropertyNamesContextualType9_ES5.errors.txt
index d4085a37e60..e76b3a704dc 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType9_ES5.errors.txt
+++ b/tests/baselines/reference/computedPropertyNamesContextualType9_ES5.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType9_ES5.ts(6,5): error TS2322: Type '{ [x: string]: string | number; [x: number]: string | number; }' is not assignable to type 'I'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType9_ES5.ts(6,5): error TS2322: Type '{ [x: number]: string | number; }' is not assignable to type 'I'.
   Index signatures are incompatible.
     Type 'string | number' is not assignable to type 'boolean'.
       Type 'string' is not assignable to type 'boolean'.
@@ -12,7 +12,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualTy
     
     var o: I = {
         ~
-!!! error TS2322: Type '{ [x: string]: string | number; [x: number]: string | number; }' is not assignable to type 'I'.
+!!! error TS2322: Type '{ [x: number]: string | number; }' is not assignable to type 'I'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Type 'string | number' is not assignable to type 'boolean'.
 !!! error TS2322:       Type 'string' is not assignable to type 'boolean'.
diff --git a/tests/baselines/reference/computedPropertyNamesContextualType9_ES6.errors.txt b/tests/baselines/reference/computedPropertyNamesContextualType9_ES6.errors.txt
index eca1360c26f..468ad400c26 100644
--- a/tests/baselines/reference/computedPropertyNamesContextualType9_ES6.errors.txt
+++ b/tests/baselines/reference/computedPropertyNamesContextualType9_ES6.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType9_ES6.ts(6,5): error TS2322: Type '{ [x: string]: string | number; [x: number]: string | number; }' is not assignable to type 'I'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType9_ES6.ts(6,5): error TS2322: Type '{ [x: number]: string | number; }' is not assignable to type 'I'.
   Index signatures are incompatible.
     Type 'string | number' is not assignable to type 'boolean'.
       Type 'string' is not assignable to type 'boolean'.
@@ -12,7 +12,7 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualTy
     
     var o: I = {
         ~
-!!! error TS2322: Type '{ [x: string]: string | number; [x: number]: string | number; }' is not assignable to type 'I'.
+!!! error TS2322: Type '{ [x: number]: string | number; }' is not assignable to type 'I'.
 !!! error TS2322:   Index signatures are incompatible.
 !!! error TS2322:     Type 'string | number' is not assignable to type 'boolean'.
 !!! error TS2322:       Type 'string' is not assignable to type 'boolean'.
diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES5.js b/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES5.js
index c903b864829..bf589768b72 100644
--- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES5.js
+++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES5.js
@@ -25,4 +25,6 @@ var _a;
 
 
 //// [computedPropertyNamesDeclarationEmit5_ES5.d.ts]
-declare var v: {};
+declare var v: {
+    [x: string]: any;
+};
diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES5.types b/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES5.types
index 62faa5c2716..0653059b535 100644
--- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES5.types
+++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES5.types
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit5_ES5.ts ===
 var v = {
->v : {}
->{    ["" + ""]: 0,    ["" + ""]() { },    get ["" + ""]() { return 0; },    set ["" + ""](x) { }} : {}
+>v : { [x: string]: any; }
+>{    ["" + ""]: 0,    ["" + ""]() { },    get ["" + ""]() { return 0; },    set ["" + ""](x) { }} : { [x: string]: any; }
 
     ["" + ""]: 0,
 >"" + "" : string
diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES6.js b/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES6.js
index e19ac43656e..de1f8c65d7f 100644
--- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES6.js
+++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES6.js
@@ -16,4 +16,6 @@ var v = {
 
 
 //// [computedPropertyNamesDeclarationEmit5_ES6.d.ts]
-declare var v: {};
+declare var v: {
+    [x: string]: any;
+};
diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES6.types b/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES6.types
index 3eb313d2687..45d1e74f24a 100644
--- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES6.types
+++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES6.types
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/computedProperties/computedPropertyNamesDeclarationEmit5_ES6.ts ===
 var v = {
->v : {}
->{    ["" + ""]: 0,    ["" + ""]() { },    get ["" + ""]() { return 0; },    set ["" + ""](x) { }} : {}
+>v : { [x: string]: any; }
+>{    ["" + ""]: 0,    ["" + ""]() { },    get ["" + ""]() { return 0; },    set ["" + ""](x) { }} : { [x: string]: any; }
 
     ["" + ""]: 0,
 >"" + "" : string
diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.js.map b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.js.map
index 9ec6d18cc72..8f7eed4fa9b 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;IACb,CAAC;AACL,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;IACb,CAAC;CACJ"}
\ 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 b589b7ad8ee..56fa39ceaac 100644
--- a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.sourcemap.txt
+++ b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.sourcemap.txt
@@ -52,17 +52,10 @@ sourceFile:computedPropertyNamesSourceMap1_ES6.ts
 2 >Emitted(4, 6) Source(4, 6) + SourceIndex(0)
 ---
 >>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >^
+2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-  >
-2 >}
-1 >Emitted(5, 1) Source(5, 1) + SourceIndex(0)
-2 >Emitted(5, 2) Source(5, 2) + SourceIndex(0)
+  >}
+1 >Emitted(5, 2) Source(5, 2) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=computedPropertyNamesSourceMap1_ES6.js.map1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-1->Emitted(6, 1) Source(5, 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/concatError.symbols b/tests/baselines/reference/concatError.symbols
index d4f04531fc7..23cc55c85be 100644
--- a/tests/baselines/reference/concatError.symbols
+++ b/tests/baselines/reference/concatError.symbols
@@ -14,15 +14,15 @@ var fa: number[];
 
 fa = fa.concat([0]);
 >fa : Symbol(fa, Decl(concatError.ts, 8, 3))
->fa.concat : Symbol(Array.concat, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>fa.concat : Symbol(Array.concat, Decl(lib.d.ts, --, --))
 >fa : Symbol(fa, Decl(concatError.ts, 8, 3))
->concat : Symbol(Array.concat, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>concat : Symbol(Array.concat, Decl(lib.d.ts, --, --))
 
 fa = fa.concat(0);
 >fa : Symbol(fa, Decl(concatError.ts, 8, 3))
->fa.concat : Symbol(Array.concat, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>fa.concat : Symbol(Array.concat, Decl(lib.d.ts, --, --))
 >fa : Symbol(fa, Decl(concatError.ts, 8, 3))
->concat : Symbol(Array.concat, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>concat : Symbol(Array.concat, Decl(lib.d.ts, --, --))
 
 
 
diff --git a/tests/baselines/reference/concatError.types b/tests/baselines/reference/concatError.types
index c264e0b0204..21a5cc5d089 100644
--- a/tests/baselines/reference/concatError.types
+++ b/tests/baselines/reference/concatError.types
@@ -16,9 +16,9 @@ fa = fa.concat([0]);
 >fa = fa.concat([0]) : number[]
 >fa : number[]
 >fa.concat([0]) : number[]
->fa.concat : { <U extends number[]>(...items: U[]): number[]; (...items: number[]): number[]; }
+>fa.concat : (...items: (number | number[])[]) => number[]
 >fa : number[]
->concat : { <U extends number[]>(...items: U[]): number[]; (...items: number[]): number[]; }
+>concat : (...items: (number | number[])[]) => number[]
 >[0] : number[]
 >0 : number
 
@@ -26,9 +26,9 @@ fa = fa.concat(0);
 >fa = fa.concat(0) : number[]
 >fa : number[]
 >fa.concat(0) : number[]
->fa.concat : { <U extends number[]>(...items: U[]): number[]; (...items: number[]): number[]; }
+>fa.concat : (...items: (number | number[])[]) => number[]
 >fa : number[]
->concat : { <U extends number[]>(...items: U[]): number[]; (...items: number[]): number[]; }
+>concat : (...items: (number | number[])[]) => number[]
 >0 : number
 
 
diff --git a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.symbols b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.symbols
index 0867a708770..2c000f17bf6 100644
--- a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.symbols
+++ b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.symbols
@@ -120,7 +120,7 @@ foo() ? exprAny1 : exprAny2;
 >exprAny2 : Symbol(exprAny2, Decl(conditionalOperatorConditionIsObjectType.ts, 9, 3))
 
 new Date() ? exprBoolean1 : exprBoolean2;
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 3))
 >exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsObjectType.ts, 10, 3))
 
@@ -144,7 +144,7 @@ condObject.valueOf() ? exprIsObject1 : exprIsObject2;
 >exprIsObject2 : Symbol(exprIsObject2, Decl(conditionalOperatorConditionIsObjectType.ts, 13, 3))
 
 new Date() ? exprString1 : exprBoolean1; // union
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >exprString1 : Symbol(exprString1, Decl(conditionalOperatorConditionIsObjectType.ts, 6, 3))
 >exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 3))
 
@@ -237,7 +237,7 @@ var resultIsAny3 = foo() ? exprAny1 : exprAny2;
 
 var resultIsBoolean3 = new Date() ? exprBoolean1 : exprBoolean2;
 >resultIsBoolean3 : Symbol(resultIsBoolean3, Decl(conditionalOperatorConditionIsObjectType.ts, 58, 3))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >exprBoolean1 : Symbol(exprBoolean1, Decl(conditionalOperatorConditionIsObjectType.ts, 4, 3))
 >exprBoolean2 : Symbol(exprBoolean2, Decl(conditionalOperatorConditionIsObjectType.ts, 10, 3))
 
diff --git a/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.symbols b/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.symbols
index e4c2e43013d..0453539b1aa 100644
--- a/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.symbols
+++ b/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.symbols
@@ -2,19 +2,19 @@
 //Cond ? Expr1 : Expr2,  Expr1 and Expr2 have identical best common type
 class X { propertyX: any; propertyX1: number; propertyX2: string };
 >X : Symbol(X, Decl(conditionalOperatorWithIdenticalBCT.ts, 0, 0))
->propertyX : Symbol(propertyX, Decl(conditionalOperatorWithIdenticalBCT.ts, 1, 9))
->propertyX1 : Symbol(propertyX1, Decl(conditionalOperatorWithIdenticalBCT.ts, 1, 25))
->propertyX2 : Symbol(propertyX2, Decl(conditionalOperatorWithIdenticalBCT.ts, 1, 45))
+>propertyX : Symbol(X.propertyX, Decl(conditionalOperatorWithIdenticalBCT.ts, 1, 9))
+>propertyX1 : Symbol(X.propertyX1, Decl(conditionalOperatorWithIdenticalBCT.ts, 1, 25))
+>propertyX2 : Symbol(X.propertyX2, Decl(conditionalOperatorWithIdenticalBCT.ts, 1, 45))
 
 class A extends X { propertyA: number };
 >A : Symbol(A, Decl(conditionalOperatorWithIdenticalBCT.ts, 1, 67))
 >X : Symbol(X, Decl(conditionalOperatorWithIdenticalBCT.ts, 0, 0))
->propertyA : Symbol(propertyA, Decl(conditionalOperatorWithIdenticalBCT.ts, 2, 19))
+>propertyA : Symbol(A.propertyA, Decl(conditionalOperatorWithIdenticalBCT.ts, 2, 19))
 
 class B extends X { propertyB: string };
 >B : Symbol(B, Decl(conditionalOperatorWithIdenticalBCT.ts, 2, 40))
 >X : Symbol(X, Decl(conditionalOperatorWithIdenticalBCT.ts, 0, 0))
->propertyB : Symbol(propertyB, Decl(conditionalOperatorWithIdenticalBCT.ts, 3, 19))
+>propertyB : Symbol(B.propertyB, Decl(conditionalOperatorWithIdenticalBCT.ts, 3, 19))
 
 var x: X;
 >x : Symbol(x, Decl(conditionalOperatorWithIdenticalBCT.ts, 5, 3))
diff --git a/tests/baselines/reference/constDeclarationShadowedByVarDeclaration3.symbols b/tests/baselines/reference/constDeclarationShadowedByVarDeclaration3.symbols
index cca4cb6e12c..9867f80ba40 100644
--- a/tests/baselines/reference/constDeclarationShadowedByVarDeclaration3.symbols
+++ b/tests/baselines/reference/constDeclarationShadowedByVarDeclaration3.symbols
@@ -4,20 +4,20 @@ class Rule {
 >Rule : Symbol(Rule, Decl(constDeclarationShadowedByVarDeclaration3.ts, 0, 0))
 
     public regex: RegExp = new RegExp('');
->regex : Symbol(regex, Decl(constDeclarationShadowedByVarDeclaration3.ts, 1, 12))
+>regex : Symbol(Rule.regex, Decl(constDeclarationShadowedByVarDeclaration3.ts, 1, 12))
 >RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     public name: string = '';
->name : Symbol(name, Decl(constDeclarationShadowedByVarDeclaration3.ts, 2, 42))
+>name : Symbol(Rule.name, Decl(constDeclarationShadowedByVarDeclaration3.ts, 2, 42))
 
     constructor(name: string) {
 >name : Symbol(name, Decl(constDeclarationShadowedByVarDeclaration3.ts, 5, 16))
 
         this.name = name;
->this.name : Symbol(name, Decl(constDeclarationShadowedByVarDeclaration3.ts, 2, 42))
+>this.name : Symbol(Rule.name, Decl(constDeclarationShadowedByVarDeclaration3.ts, 2, 42))
 >this : Symbol(Rule, Decl(constDeclarationShadowedByVarDeclaration3.ts, 0, 0))
->name : Symbol(name, Decl(constDeclarationShadowedByVarDeclaration3.ts, 2, 42))
+>name : Symbol(Rule.name, Decl(constDeclarationShadowedByVarDeclaration3.ts, 2, 42))
 >name : Symbol(name, Decl(constDeclarationShadowedByVarDeclaration3.ts, 5, 16))
     }
 }
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/constEnumPropertyAccess1.types b/tests/baselines/reference/constEnumPropertyAccess1.types
index 5ed2b932bd0..f0e00fe7717 100644
--- a/tests/baselines/reference/constEnumPropertyAccess1.types
+++ b/tests/baselines/reference/constEnumPropertyAccess1.types
@@ -35,7 +35,7 @@ var o: {
 >idx : number
 
 } = {
->{        1: true    } : { [x: number]: boolean; 1: boolean; }
+>{        1: true    } : { 1: boolean; }
 
         1: true
 >true : boolean
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/constantOverloadFunction.symbols b/tests/baselines/reference/constantOverloadFunction.symbols
index 60234623ed6..6c894602f71 100644
--- a/tests/baselines/reference/constantOverloadFunction.symbols
+++ b/tests/baselines/reference/constantOverloadFunction.symbols
@@ -1,22 +1,22 @@
 === tests/cases/compiler/constantOverloadFunction.ts ===
 class Base { foo() { } }
 >Base : Symbol(Base, Decl(constantOverloadFunction.ts, 0, 0))
->foo : Symbol(foo, Decl(constantOverloadFunction.ts, 0, 12))
+>foo : Symbol(Base.foo, Decl(constantOverloadFunction.ts, 0, 12))
 
 class Derived1 extends Base { bar() { } }
 >Derived1 : Symbol(Derived1, Decl(constantOverloadFunction.ts, 0, 24))
 >Base : Symbol(Base, Decl(constantOverloadFunction.ts, 0, 0))
->bar : Symbol(bar, Decl(constantOverloadFunction.ts, 1, 29))
+>bar : Symbol(Derived1.bar, Decl(constantOverloadFunction.ts, 1, 29))
 
 class Derived2 extends Base { baz() { } }
 >Derived2 : Symbol(Derived2, Decl(constantOverloadFunction.ts, 1, 41))
 >Base : Symbol(Base, Decl(constantOverloadFunction.ts, 0, 0))
->baz : Symbol(baz, Decl(constantOverloadFunction.ts, 2, 29))
+>baz : Symbol(Derived2.baz, Decl(constantOverloadFunction.ts, 2, 29))
 
 class Derived3 extends Base { biz() { } }
 >Derived3 : Symbol(Derived3, Decl(constantOverloadFunction.ts, 2, 41))
 >Base : Symbol(Base, Decl(constantOverloadFunction.ts, 0, 0))
->biz : Symbol(biz, Decl(constantOverloadFunction.ts, 3, 29))
+>biz : Symbol(Derived3.biz, Decl(constantOverloadFunction.ts, 3, 29))
 
 function foo(tagName: 'canvas'): Derived1;
 >foo : Symbol(foo, Decl(constantOverloadFunction.ts, 3, 41), Decl(constantOverloadFunction.ts, 5, 42), Decl(constantOverloadFunction.ts, 6, 40), Decl(constantOverloadFunction.ts, 7, 40), Decl(constantOverloadFunction.ts, 8, 36))
diff --git a/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.symbols b/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.symbols
index 3a604e4b30e..a978214d4c3 100644
--- a/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.symbols
+++ b/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.symbols
@@ -1,22 +1,22 @@
 === tests/cases/compiler/constantOverloadFunctionNoSubtypeError.ts ===
 class Base { foo() { } }
 >Base : Symbol(Base, Decl(constantOverloadFunctionNoSubtypeError.ts, 0, 0))
->foo : Symbol(foo, Decl(constantOverloadFunctionNoSubtypeError.ts, 0, 12))
+>foo : Symbol(Base.foo, Decl(constantOverloadFunctionNoSubtypeError.ts, 0, 12))
 
 class Derived1 extends Base { bar() { } }
 >Derived1 : Symbol(Derived1, Decl(constantOverloadFunctionNoSubtypeError.ts, 0, 24))
 >Base : Symbol(Base, Decl(constantOverloadFunctionNoSubtypeError.ts, 0, 0))
->bar : Symbol(bar, Decl(constantOverloadFunctionNoSubtypeError.ts, 1, 29))
+>bar : Symbol(Derived1.bar, Decl(constantOverloadFunctionNoSubtypeError.ts, 1, 29))
 
 class Derived2 extends Base { baz() { } }
 >Derived2 : Symbol(Derived2, Decl(constantOverloadFunctionNoSubtypeError.ts, 1, 41))
 >Base : Symbol(Base, Decl(constantOverloadFunctionNoSubtypeError.ts, 0, 0))
->baz : Symbol(baz, Decl(constantOverloadFunctionNoSubtypeError.ts, 2, 29))
+>baz : Symbol(Derived2.baz, Decl(constantOverloadFunctionNoSubtypeError.ts, 2, 29))
 
 class Derived3 extends Base { biz() { } }
 >Derived3 : Symbol(Derived3, Decl(constantOverloadFunctionNoSubtypeError.ts, 2, 41))
 >Base : Symbol(Base, Decl(constantOverloadFunctionNoSubtypeError.ts, 0, 0))
->biz : Symbol(biz, Decl(constantOverloadFunctionNoSubtypeError.ts, 3, 29))
+>biz : Symbol(Derived3.biz, Decl(constantOverloadFunctionNoSubtypeError.ts, 3, 29))
 
 function foo(tagName: 'canvas'): Derived3;
 >foo : Symbol(foo, Decl(constantOverloadFunctionNoSubtypeError.ts, 3, 41), Decl(constantOverloadFunctionNoSubtypeError.ts, 5, 42), Decl(constantOverloadFunctionNoSubtypeError.ts, 6, 40), Decl(constantOverloadFunctionNoSubtypeError.ts, 7, 40), Decl(constantOverloadFunctionNoSubtypeError.ts, 8, 36))
diff --git a/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.symbols b/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.symbols
index ad63e11b7ed..ee19c63ffe8 100644
--- a/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.symbols
+++ b/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.symbols
@@ -4,7 +4,7 @@ class Constraint {
 >Constraint : Symbol(Constraint, Decl(constraintCheckInGenericBaseTypeReference.ts, 0, 0))
 
     public method() { }
->method : Symbol(method, Decl(constraintCheckInGenericBaseTypeReference.ts, 1, 18))
+>method : Symbol(Constraint.method, Decl(constraintCheckInGenericBaseTypeReference.ts, 1, 18))
 }
 class GenericBase<T extends Constraint> {
 >GenericBase : Symbol(GenericBase, Decl(constraintCheckInGenericBaseTypeReference.ts, 3, 1))
@@ -12,7 +12,7 @@ class GenericBase<T extends Constraint> {
 >Constraint : Symbol(Constraint, Decl(constraintCheckInGenericBaseTypeReference.ts, 0, 0))
 
     public items: any;
->items : Symbol(items, Decl(constraintCheckInGenericBaseTypeReference.ts, 4, 41))
+>items : Symbol(GenericBase.items, Decl(constraintCheckInGenericBaseTypeReference.ts, 4, 41))
 }
 class Derived extends GenericBase<TypeArg> {
 >Derived : Symbol(Derived, Decl(constraintCheckInGenericBaseTypeReference.ts, 6, 1))
@@ -24,7 +24,7 @@ class TypeArg {
 >TypeArg : Symbol(TypeArg, Decl(constraintCheckInGenericBaseTypeReference.ts, 9, 1))
 
     public method() {
->method : Symbol(method, Decl(constraintCheckInGenericBaseTypeReference.ts, 10, 15))
+>method : Symbol(TypeArg.method, Decl(constraintCheckInGenericBaseTypeReference.ts, 10, 15))
 
         Container.People.items;
 >Container.People.items : Symbol(GenericBase.items, Decl(constraintCheckInGenericBaseTypeReference.ts, 4, 41))
diff --git a/tests/baselines/reference/constraintReferencingTypeParameterFromSameTypeParameterList.symbols b/tests/baselines/reference/constraintReferencingTypeParameterFromSameTypeParameterList.symbols
index ec987116a43..4793aa63149 100644
--- a/tests/baselines/reference/constraintReferencingTypeParameterFromSameTypeParameterList.symbols
+++ b/tests/baselines/reference/constraintReferencingTypeParameterFromSameTypeParameterList.symbols
@@ -41,7 +41,7 @@ interface I3<T, U extends string> {
 >U : Symbol(U, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 16, 15))
 
     method1<X, Y extends T>();
->method1 : Symbol(method1, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 16, 35))
+>method1 : Symbol(I3.method1, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 16, 35))
 >X : Symbol(X, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 17, 12))
 >Y : Symbol(Y, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 17, 14))
 >T : Symbol(T, Decl(constraintReferencingTypeParameterFromSameTypeParameterList.ts, 16, 13))
diff --git a/tests/baselines/reference/constraintSatisfactionWithAny.symbols b/tests/baselines/reference/constraintSatisfactionWithAny.symbols
index 52cfe211cff..824035a185c 100644
--- a/tests/baselines/reference/constraintSatisfactionWithAny.symbols
+++ b/tests/baselines/reference/constraintSatisfactionWithAny.symbols
@@ -4,7 +4,7 @@
 function foo<T extends String>(x: T): T { return null; }
 >foo : Symbol(foo, Decl(constraintSatisfactionWithAny.ts, 0, 0))
 >T : Symbol(T, Decl(constraintSatisfactionWithAny.ts, 2, 13))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(constraintSatisfactionWithAny.ts, 2, 31))
 >T : Symbol(T, Decl(constraintSatisfactionWithAny.ts, 2, 13))
 >T : Symbol(T, Decl(constraintSatisfactionWithAny.ts, 2, 13))
@@ -67,10 +67,10 @@ foo4<any>(b);
 class C<T extends String> {
 >C : Symbol(C, Decl(constraintSatisfactionWithAny.ts, 16, 13))
 >T : Symbol(T, Decl(constraintSatisfactionWithAny.ts, 22, 8))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     constructor(public x: T) { }
->x : Symbol(x, Decl(constraintSatisfactionWithAny.ts, 23, 16))
+>x : Symbol(C.x, Decl(constraintSatisfactionWithAny.ts, 23, 16))
 >T : Symbol(T, Decl(constraintSatisfactionWithAny.ts, 22, 8))
 }
 
@@ -90,7 +90,7 @@ class C2<T extends { x: number }> {
 >x : Symbol(x, Decl(constraintSatisfactionWithAny.ts, 29, 20))
 
     constructor(public x: T) { }
->x : Symbol(x, Decl(constraintSatisfactionWithAny.ts, 30, 16))
+>x : Symbol(C2.x, Decl(constraintSatisfactionWithAny.ts, 30, 16))
 >T : Symbol(T, Decl(constraintSatisfactionWithAny.ts, 29, 9))
 }
 
@@ -120,7 +120,7 @@ class C4<T extends <T>(x:T) => T> {
 >T : Symbol(T, Decl(constraintSatisfactionWithAny.ts, 43, 20))
 
     constructor(public x: T) { }
->x : Symbol(x, Decl(constraintSatisfactionWithAny.ts, 44, 16))
+>x : Symbol(C4.x, Decl(constraintSatisfactionWithAny.ts, 44, 16))
 >T : Symbol(T, Decl(constraintSatisfactionWithAny.ts, 43, 9))
 }
 
diff --git a/tests/baselines/reference/constraintSatisfactionWithEmptyObject.symbols b/tests/baselines/reference/constraintSatisfactionWithEmptyObject.symbols
index d53e51b6623..a766234e6aa 100644
--- a/tests/baselines/reference/constraintSatisfactionWithEmptyObject.symbols
+++ b/tests/baselines/reference/constraintSatisfactionWithEmptyObject.symbols
@@ -26,7 +26,7 @@ class C<T extends Object> {
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     constructor(public x: T) { }
->x : Symbol(x, Decl(constraintSatisfactionWithEmptyObject.ts, 9, 16))
+>x : Symbol(C.x, Decl(constraintSatisfactionWithEmptyObject.ts, 9, 16))
 >T : Symbol(T, Decl(constraintSatisfactionWithEmptyObject.ts, 8, 8))
 }
 
@@ -40,7 +40,7 @@ interface I<T extends Object> {
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     x: T;
->x : Symbol(x, Decl(constraintSatisfactionWithEmptyObject.ts, 14, 31))
+>x : Symbol(I.x, Decl(constraintSatisfactionWithEmptyObject.ts, 14, 31))
 >T : Symbol(T, Decl(constraintSatisfactionWithEmptyObject.ts, 14, 12))
 }
 var i: I<{}>;
@@ -70,7 +70,7 @@ class C2<T extends {}> {
 >T : Symbol(T, Decl(constraintSatisfactionWithEmptyObject.ts, 25, 9))
 
     constructor(public x: T) { }
->x : Symbol(x, Decl(constraintSatisfactionWithEmptyObject.ts, 26, 16))
+>x : Symbol(C2.x, Decl(constraintSatisfactionWithEmptyObject.ts, 26, 16))
 >T : Symbol(T, Decl(constraintSatisfactionWithEmptyObject.ts, 25, 9))
 }
 
@@ -83,7 +83,7 @@ interface I2<T extends {}> {
 >T : Symbol(T, Decl(constraintSatisfactionWithEmptyObject.ts, 31, 13))
 
     x: T;
->x : Symbol(x, Decl(constraintSatisfactionWithEmptyObject.ts, 31, 28))
+>x : Symbol(I2.x, Decl(constraintSatisfactionWithEmptyObject.ts, 31, 28))
 >T : Symbol(T, Decl(constraintSatisfactionWithEmptyObject.ts, 31, 13))
 }
 var i2: I2<{}>;
diff --git a/tests/baselines/reference/constraintsThatReferenceOtherContstraints1.symbols b/tests/baselines/reference/constraintsThatReferenceOtherContstraints1.symbols
index fa754b23dea..38d163b947b 100644
--- a/tests/baselines/reference/constraintsThatReferenceOtherContstraints1.symbols
+++ b/tests/baselines/reference/constraintsThatReferenceOtherContstraints1.symbols
@@ -16,7 +16,7 @@ class Bar<T extends Object, U extends T> {
 >T : Symbol(T, Decl(constraintsThatReferenceOtherContstraints1.ts, 3, 10))
 
     data: Foo<Object, Object>; // Error 1 Type 'Object' does not satisfy the constraint 'T' for type parameter 'U extends T'.
->data : Symbol(data, Decl(constraintsThatReferenceOtherContstraints1.ts, 3, 42))
+>data : Symbol(Bar.data, Decl(constraintsThatReferenceOtherContstraints1.ts, 3, 42))
 >Foo : Symbol(Foo, Decl(constraintsThatReferenceOtherContstraints1.ts, 0, 20))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(constraintsThatReferenceOtherContstraints1.ts, 0, 0))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(constraintsThatReferenceOtherContstraints1.ts, 0, 0))
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.symbols b/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.symbols
index 8a6ec113423..4d63a7f2db4 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.symbols
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.symbols
@@ -3,51 +3,51 @@
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance2.ts, 0, 0))
->foo : Symbol(foo, Decl(constructSignatureAssignabilityInInheritance2.ts, 2, 12))
+>foo : Symbol(Base.foo, Decl(constructSignatureAssignabilityInInheritance2.ts, 2, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance2.ts, 2, 27))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance2.ts, 0, 0))
->bar : Symbol(bar, Decl(constructSignatureAssignabilityInInheritance2.ts, 3, 28))
+>bar : Symbol(Derived.bar, Decl(constructSignatureAssignabilityInInheritance2.ts, 3, 28))
 
 class Derived2 extends Derived { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(constructSignatureAssignabilityInInheritance2.ts, 3, 43))
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance2.ts, 2, 27))
->baz : Symbol(baz, Decl(constructSignatureAssignabilityInInheritance2.ts, 4, 32))
+>baz : Symbol(Derived2.baz, Decl(constructSignatureAssignabilityInInheritance2.ts, 4, 32))
 
 class OtherDerived extends Base { bing: string; }
 >OtherDerived : Symbol(OtherDerived, Decl(constructSignatureAssignabilityInInheritance2.ts, 4, 47))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance2.ts, 0, 0))
->bing : Symbol(bing, Decl(constructSignatureAssignabilityInInheritance2.ts, 5, 33))
+>bing : Symbol(OtherDerived.bing, Decl(constructSignatureAssignabilityInInheritance2.ts, 5, 33))
 
 interface A { // T
 >A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance2.ts, 5, 49))
 
     // M's
     a: new (x: number) => number[];
->a : Symbol(a, Decl(constructSignatureAssignabilityInInheritance2.ts, 7, 13))
+>a : Symbol(A.a, Decl(constructSignatureAssignabilityInInheritance2.ts, 7, 13))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 9, 12))
 
     a2: new (x: number) => string[];
->a2 : Symbol(a2, Decl(constructSignatureAssignabilityInInheritance2.ts, 9, 35))
+>a2 : Symbol(A.a2, Decl(constructSignatureAssignabilityInInheritance2.ts, 9, 35))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 10, 13))
 
     a3: new (x: number) => void;
->a3 : Symbol(a3, Decl(constructSignatureAssignabilityInInheritance2.ts, 10, 36))
+>a3 : Symbol(A.a3, Decl(constructSignatureAssignabilityInInheritance2.ts, 10, 36))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 11, 13))
 
     a4: new (x: string, y: number) => string;
->a4 : Symbol(a4, Decl(constructSignatureAssignabilityInInheritance2.ts, 11, 32))
+>a4 : Symbol(A.a4, Decl(constructSignatureAssignabilityInInheritance2.ts, 11, 32))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 12, 13))
 >y : Symbol(y, Decl(constructSignatureAssignabilityInInheritance2.ts, 12, 23))
 
     a5: new (x: (arg: string) => number) => string;
->a5 : Symbol(a5, Decl(constructSignatureAssignabilityInInheritance2.ts, 12, 45))
+>a5 : Symbol(A.a5, Decl(constructSignatureAssignabilityInInheritance2.ts, 12, 45))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 13, 13))
 >arg : Symbol(arg, Decl(constructSignatureAssignabilityInInheritance2.ts, 13, 17))
 
     a6: new (x: (arg: Base) => Derived) => Base;
->a6 : Symbol(a6, Decl(constructSignatureAssignabilityInInheritance2.ts, 13, 51))
+>a6 : Symbol(A.a6, Decl(constructSignatureAssignabilityInInheritance2.ts, 13, 51))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 14, 13))
 >arg : Symbol(arg, Decl(constructSignatureAssignabilityInInheritance2.ts, 14, 17))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance2.ts, 0, 0))
@@ -55,7 +55,7 @@ interface A { // T
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance2.ts, 0, 0))
 
     a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived;
->a7 : Symbol(a7, Decl(constructSignatureAssignabilityInInheritance2.ts, 14, 48))
+>a7 : Symbol(A.a7, Decl(constructSignatureAssignabilityInInheritance2.ts, 14, 48))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 15, 13))
 >arg : Symbol(arg, Decl(constructSignatureAssignabilityInInheritance2.ts, 15, 17))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance2.ts, 0, 0))
@@ -65,7 +65,7 @@ interface A { // T
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance2.ts, 2, 27))
 
     a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
->a8 : Symbol(a8, Decl(constructSignatureAssignabilityInInheritance2.ts, 15, 64))
+>a8 : Symbol(A.a8, Decl(constructSignatureAssignabilityInInheritance2.ts, 15, 64))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 16, 13))
 >arg : Symbol(arg, Decl(constructSignatureAssignabilityInInheritance2.ts, 16, 17))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance2.ts, 0, 0))
@@ -79,7 +79,7 @@ interface A { // T
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance2.ts, 2, 27))
 
     a9: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
->a9 : Symbol(a9, Decl(constructSignatureAssignabilityInInheritance2.ts, 16, 92))
+>a9 : Symbol(A.a9, Decl(constructSignatureAssignabilityInInheritance2.ts, 16, 92))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 17, 13))
 >arg : Symbol(arg, Decl(constructSignatureAssignabilityInInheritance2.ts, 17, 17))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance2.ts, 0, 0))
@@ -93,13 +93,13 @@ interface A { // T
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance2.ts, 2, 27))
 
     a10: new (...x: Derived[]) => Derived;
->a10 : Symbol(a10, Decl(constructSignatureAssignabilityInInheritance2.ts, 17, 92))
+>a10 : Symbol(A.a10, Decl(constructSignatureAssignabilityInInheritance2.ts, 17, 92))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 18, 14))
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance2.ts, 2, 27))
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance2.ts, 2, 27))
 
     a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
->a11 : Symbol(a11, Decl(constructSignatureAssignabilityInInheritance2.ts, 18, 42))
+>a11 : Symbol(A.a11, Decl(constructSignatureAssignabilityInInheritance2.ts, 18, 42))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 19, 14))
 >foo : Symbol(foo, Decl(constructSignatureAssignabilityInInheritance2.ts, 19, 18))
 >y : Symbol(y, Decl(constructSignatureAssignabilityInInheritance2.ts, 19, 33))
@@ -108,7 +108,7 @@ interface A { // T
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance2.ts, 0, 0))
 
     a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
->a12 : Symbol(a12, Decl(constructSignatureAssignabilityInInheritance2.ts, 19, 75))
+>a12 : Symbol(A.a12, Decl(constructSignatureAssignabilityInInheritance2.ts, 19, 75))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 20, 14))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance2.ts, 0, 0))
@@ -119,7 +119,7 @@ interface A { // T
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance2.ts, 2, 27))
 
     a13: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
->a13 : Symbol(a13, Decl(constructSignatureAssignabilityInInheritance2.ts, 20, 68))
+>a13 : Symbol(A.a13, Decl(constructSignatureAssignabilityInInheritance2.ts, 20, 68))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 21, 14))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance2.ts, 0, 0))
@@ -130,14 +130,14 @@ interface A { // T
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance2.ts, 2, 27))
 
     a14: new (x: { a: string; b: number }) => Object;
->a14 : Symbol(a14, Decl(constructSignatureAssignabilityInInheritance2.ts, 21, 67))
+>a14 : Symbol(A.a14, Decl(constructSignatureAssignabilityInInheritance2.ts, 21, 67))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 22, 14))
 >a : Symbol(a, Decl(constructSignatureAssignabilityInInheritance2.ts, 22, 18))
 >b : Symbol(b, Decl(constructSignatureAssignabilityInInheritance2.ts, 22, 29))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     a15: {
->a15 : Symbol(a15, Decl(constructSignatureAssignabilityInInheritance2.ts, 22, 53))
+>a15 : Symbol(A.a15, Decl(constructSignatureAssignabilityInInheritance2.ts, 22, 53))
 
         new (x: number): number[];
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 24, 13))
@@ -147,7 +147,7 @@ interface A { // T
 
     };
     a16: {
->a16 : Symbol(a16, Decl(constructSignatureAssignabilityInInheritance2.ts, 26, 6))
+>a16 : Symbol(A.a16, Decl(constructSignatureAssignabilityInInheritance2.ts, 26, 6))
 
         new <T extends Derived>(x: T): number[];
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 28, 13))
@@ -163,7 +163,7 @@ interface A { // T
 
     };
     a17: {
->a17 : Symbol(a17, Decl(constructSignatureAssignabilityInInheritance2.ts, 30, 6))
+>a17 : Symbol(A.a17, Decl(constructSignatureAssignabilityInInheritance2.ts, 30, 6))
 
         new (x: new (a: number) => number): number[];
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 32, 13))
@@ -175,7 +175,7 @@ interface A { // T
 
     };
     a18: {
->a18 : Symbol(a18, Decl(constructSignatureAssignabilityInInheritance2.ts, 34, 6))
+>a18 : Symbol(A.a18, Decl(constructSignatureAssignabilityInInheritance2.ts, 34, 6))
 
         new (x: {
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 36, 13))
@@ -195,8 +195,8 @@ interface A { // T
 
             new (a: Date): Date;
 >a : Symbol(a, Decl(constructSignatureAssignabilityInInheritance2.ts, 42, 17))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
         }): any[];
     };
@@ -209,27 +209,27 @@ interface I extends A {
 
     // N's
     a: new <T>(x: T) => T[]; // ok, instantiation of N is a subtype of M, T is number
->a : Symbol(a, Decl(constructSignatureAssignabilityInInheritance2.ts, 48, 23))
+>a : Symbol(I.a, Decl(constructSignatureAssignabilityInInheritance2.ts, 48, 23))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 50, 12))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 50, 15))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 50, 12))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 50, 12))
 
     a2: new <T>(x: T) => string[]; // ok
->a2 : Symbol(a2, Decl(constructSignatureAssignabilityInInheritance2.ts, 50, 28))
+>a2 : Symbol(I.a2, Decl(constructSignatureAssignabilityInInheritance2.ts, 50, 28))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 51, 13))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 51, 16))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 51, 13))
 
     a3: new <T>(x: T) => T; // ok since Base returns void
->a3 : Symbol(a3, Decl(constructSignatureAssignabilityInInheritance2.ts, 51, 34))
+>a3 : Symbol(I.a3, Decl(constructSignatureAssignabilityInInheritance2.ts, 51, 34))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 52, 13))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 52, 16))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 52, 13))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 52, 13))
 
     a4: new <T, U>(x: T, y: U) => T; // ok, instantiation of N is a subtype of M, T is string, U is number
->a4 : Symbol(a4, Decl(constructSignatureAssignabilityInInheritance2.ts, 52, 27))
+>a4 : Symbol(I.a4, Decl(constructSignatureAssignabilityInInheritance2.ts, 52, 27))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 53, 13))
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance2.ts, 53, 15))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 53, 19))
@@ -239,7 +239,7 @@ interface I extends A {
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 53, 13))
 
     a5: new <T, U>(x: (arg: T) => U) => T; // ok, U is in a parameter position so inferences can be made
->a5 : Symbol(a5, Decl(constructSignatureAssignabilityInInheritance2.ts, 53, 36))
+>a5 : Symbol(I.a5, Decl(constructSignatureAssignabilityInInheritance2.ts, 53, 36))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 54, 13))
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance2.ts, 54, 15))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 54, 19))
@@ -249,7 +249,7 @@ interface I extends A {
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 54, 13))
 
     a6: new <T extends Base, U extends Derived>(x: (arg: T) => U) => T; // ok, same as a5 but with object type hierarchy
->a6 : Symbol(a6, Decl(constructSignatureAssignabilityInInheritance2.ts, 54, 42))
+>a6 : Symbol(I.a6, Decl(constructSignatureAssignabilityInInheritance2.ts, 54, 42))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 55, 13))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance2.ts, 0, 0))
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance2.ts, 55, 28))
@@ -261,7 +261,7 @@ interface I extends A {
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 55, 13))
 
     a7: new <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; // ok
->a7 : Symbol(a7, Decl(constructSignatureAssignabilityInInheritance2.ts, 55, 71))
+>a7 : Symbol(I.a7, Decl(constructSignatureAssignabilityInInheritance2.ts, 55, 71))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 56, 13))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance2.ts, 0, 0))
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance2.ts, 56, 28))
@@ -275,7 +275,7 @@ interface I extends A {
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance2.ts, 56, 28))
 
     a8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U; // ok
->a8 : Symbol(a8, Decl(constructSignatureAssignabilityInInheritance2.ts, 56, 81))
+>a8 : Symbol(I.a8, Decl(constructSignatureAssignabilityInInheritance2.ts, 56, 81))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 57, 13))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance2.ts, 0, 0))
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance2.ts, 57, 28))
@@ -293,7 +293,7 @@ interface I extends A {
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance2.ts, 57, 28))
 
     a9: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; // ok, same as a8 with compatible object literal
->a9 : Symbol(a9, Decl(constructSignatureAssignabilityInInheritance2.ts, 57, 100))
+>a9 : Symbol(I.a9, Decl(constructSignatureAssignabilityInInheritance2.ts, 57, 100))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 58, 13))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance2.ts, 0, 0))
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance2.ts, 58, 28))
@@ -312,7 +312,7 @@ interface I extends A {
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance2.ts, 58, 28))
 
     a10: new <T extends Derived>(...x: T[]) => T; // ok
->a10 : Symbol(a10, Decl(constructSignatureAssignabilityInInheritance2.ts, 58, 128))
+>a10 : Symbol(I.a10, Decl(constructSignatureAssignabilityInInheritance2.ts, 58, 128))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 59, 14))
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance2.ts, 2, 27))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 59, 33))
@@ -320,7 +320,7 @@ interface I extends A {
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 59, 14))
 
     a11: new <T extends Base>(x: T, y: T) => T; // ok
->a11 : Symbol(a11, Decl(constructSignatureAssignabilityInInheritance2.ts, 59, 49))
+>a11 : Symbol(I.a11, Decl(constructSignatureAssignabilityInInheritance2.ts, 59, 49))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 60, 14))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance2.ts, 0, 0))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 60, 30))
@@ -330,7 +330,7 @@ interface I extends A {
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 60, 14))
 
     a12: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; // ok, less specific parameter type
->a12 : Symbol(a12, Decl(constructSignatureAssignabilityInInheritance2.ts, 60, 47))
+>a12 : Symbol(I.a12, Decl(constructSignatureAssignabilityInInheritance2.ts, 60, 47))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 61, 14))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance2.ts, 0, 0))
@@ -343,7 +343,7 @@ interface I extends A {
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance2.ts, 2, 27))
 
     a13: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T; // ok, T = Array<Derived>, satisfies constraint, contextual signature instantiation succeeds
->a13 : Symbol(a13, Decl(constructSignatureAssignabilityInInheritance2.ts, 61, 77))
+>a13 : Symbol(I.a13, Decl(constructSignatureAssignabilityInInheritance2.ts, 61, 77))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 62, 14))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance2.ts, 2, 27))
@@ -355,7 +355,7 @@ interface I extends A {
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 62, 14))
 
     a14: new <T>(x: { a: T; b: T }) => T; // ok, best common type yields T = {} but that's satisfactory for this signature
->a14 : Symbol(a14, Decl(constructSignatureAssignabilityInInheritance2.ts, 62, 67))
+>a14 : Symbol(I.a14, Decl(constructSignatureAssignabilityInInheritance2.ts, 62, 67))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 63, 14))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 63, 17))
 >a : Symbol(a, Decl(constructSignatureAssignabilityInInheritance2.ts, 63, 21))
@@ -365,21 +365,21 @@ interface I extends A {
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 63, 14))
 
     a15: new <T>(x: T) => T[]; // ok
->a15 : Symbol(a15, Decl(constructSignatureAssignabilityInInheritance2.ts, 63, 41))
+>a15 : Symbol(I.a15, Decl(constructSignatureAssignabilityInInheritance2.ts, 63, 41))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 64, 14))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 64, 17))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 64, 14))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 64, 14))
 
     a16: new <T extends Base>(x: T) => number[]; // ok
->a16 : Symbol(a16, Decl(constructSignatureAssignabilityInInheritance2.ts, 64, 30))
+>a16 : Symbol(I.a16, Decl(constructSignatureAssignabilityInInheritance2.ts, 64, 30))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 65, 14))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance2.ts, 0, 0))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 65, 30))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 65, 14))
 
     a17: new <T>(x: new (a: T) => T) => T[]; // ok
->a17 : Symbol(a17, Decl(constructSignatureAssignabilityInInheritance2.ts, 65, 48))
+>a17 : Symbol(I.a17, Decl(constructSignatureAssignabilityInInheritance2.ts, 65, 48))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 66, 14))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 66, 17))
 >a : Symbol(a, Decl(constructSignatureAssignabilityInInheritance2.ts, 66, 25))
@@ -388,7 +388,7 @@ interface I extends A {
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 66, 14))
 
     a18: new <T>(x: new (a: T) => T) => T[]; // ok, no inferences for T but assignable to any
->a18 : Symbol(a18, Decl(constructSignatureAssignabilityInInheritance2.ts, 66, 44))
+>a18 : Symbol(I.a18, Decl(constructSignatureAssignabilityInInheritance2.ts, 66, 44))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance2.ts, 67, 14))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance2.ts, 67, 17))
 >a : Symbol(a, Decl(constructSignatureAssignabilityInInheritance2.ts, 67, 25))
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.errors.txt b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.errors.txt
index 8d6273804f7..086372aac17 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.errors.txt
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.errors.txt
@@ -2,12 +2,12 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/construc
   Types of property 'a2' are incompatible.
     Type 'new (x: T) => U[]' is not assignable to type 'new (x: number) => string[]'.
       Types of parameters 'x' and 'x' are incompatible.
-        Type 'T' is not assignable to type 'number'.
+        Type 'number' is not assignable to type 'T'.
 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance3.ts(50,19): error TS2430: Interface 'I4' incorrectly extends interface 'A'.
   Types of property 'a8' are incompatible.
     Type 'new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U' is not assignable to type 'new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived'.
       Types of parameters 'y' and 'y' are incompatible.
-        Type '(arg2: { foo: number; }) => any' is not assignable to type '(arg2: Base) => Derived'.
+        Type '(arg2: Base) => Derived' is not assignable to type '(arg2: { foo: number; }) => any'.
           Types of parameters 'arg2' and 'arg2' are incompatible.
             Type '{ foo: number; }' is not assignable to type 'Base'.
               Types of property 'foo' are incompatible.
@@ -61,7 +61,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/construc
 !!! error TS2430:   Types of property 'a2' are incompatible.
 !!! error TS2430:     Type 'new (x: T) => U[]' is not assignable to type 'new (x: number) => string[]'.
 !!! error TS2430:       Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2430:         Type 'T' is not assignable to type 'number'.
+!!! error TS2430:         Type 'number' is not assignable to type 'T'.
                 a2: new (x: T) => U[]; // error, no contextual signature instantiation since I2.a2 is not generic
             }
     
@@ -76,7 +76,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/construc
 !!! error TS2430:   Types of property 'a8' are incompatible.
 !!! error TS2430:     Type 'new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U' is not assignable to type 'new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived'.
 !!! error TS2430:       Types of parameters 'y' and 'y' are incompatible.
-!!! error TS2430:         Type '(arg2: { foo: number; }) => any' is not assignable to type '(arg2: Base) => Derived'.
+!!! error TS2430:         Type '(arg2: Base) => Derived' is not assignable to type '(arg2: { foo: number; }) => any'.
 !!! error TS2430:           Types of parameters 'arg2' and 'arg2' are incompatible.
 !!! error TS2430:             Type '{ foo: number; }' is not assignable to type 'Base'.
 !!! error TS2430:               Types of property 'foo' are incompatible.
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.symbols b/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.symbols
index 33ae7e0f6d6..e26a33bba4e 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.symbols
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.symbols
@@ -3,48 +3,48 @@
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance4.ts, 0, 0))
->foo : Symbol(foo, Decl(constructSignatureAssignabilityInInheritance4.ts, 2, 12))
+>foo : Symbol(Base.foo, Decl(constructSignatureAssignabilityInInheritance4.ts, 2, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance4.ts, 2, 27))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance4.ts, 0, 0))
->bar : Symbol(bar, Decl(constructSignatureAssignabilityInInheritance4.ts, 3, 28))
+>bar : Symbol(Derived.bar, Decl(constructSignatureAssignabilityInInheritance4.ts, 3, 28))
 
 class Derived2 extends Derived { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(constructSignatureAssignabilityInInheritance4.ts, 3, 43))
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance4.ts, 2, 27))
->baz : Symbol(baz, Decl(constructSignatureAssignabilityInInheritance4.ts, 4, 32))
+>baz : Symbol(Derived2.baz, Decl(constructSignatureAssignabilityInInheritance4.ts, 4, 32))
 
 class OtherDerived extends Base { bing: string; }
 >OtherDerived : Symbol(OtherDerived, Decl(constructSignatureAssignabilityInInheritance4.ts, 4, 47))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance4.ts, 0, 0))
->bing : Symbol(bing, Decl(constructSignatureAssignabilityInInheritance4.ts, 5, 33))
+>bing : Symbol(OtherDerived.bing, Decl(constructSignatureAssignabilityInInheritance4.ts, 5, 33))
 
 interface A { // T
 >A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance4.ts, 5, 49))
 
     // M's
     a: new <T>(x: T) => T[];
->a : Symbol(a, Decl(constructSignatureAssignabilityInInheritance4.ts, 7, 13))
+>a : Symbol(A.a, Decl(constructSignatureAssignabilityInInheritance4.ts, 7, 13))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 9, 12))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance4.ts, 9, 15))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 9, 12))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 9, 12))
 
     a2: new <T>(x: T) => string[];
->a2 : Symbol(a2, Decl(constructSignatureAssignabilityInInheritance4.ts, 9, 28))
+>a2 : Symbol(A.a2, Decl(constructSignatureAssignabilityInInheritance4.ts, 9, 28))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 10, 13))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance4.ts, 10, 16))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 10, 13))
 
     a3: new <T>(x: T) => void;
->a3 : Symbol(a3, Decl(constructSignatureAssignabilityInInheritance4.ts, 10, 34))
+>a3 : Symbol(A.a3, Decl(constructSignatureAssignabilityInInheritance4.ts, 10, 34))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 11, 13))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance4.ts, 11, 16))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 11, 13))
 
     a4: new <T, U>(x: T, y: U) => string;
->a4 : Symbol(a4, Decl(constructSignatureAssignabilityInInheritance4.ts, 11, 30))
+>a4 : Symbol(A.a4, Decl(constructSignatureAssignabilityInInheritance4.ts, 11, 30))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 12, 13))
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance4.ts, 12, 15))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance4.ts, 12, 19))
@@ -53,7 +53,7 @@ interface A { // T
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance4.ts, 12, 15))
 
     a5: new <T, U>(x: (arg: T) => U) => T;
->a5 : Symbol(a5, Decl(constructSignatureAssignabilityInInheritance4.ts, 12, 41))
+>a5 : Symbol(A.a5, Decl(constructSignatureAssignabilityInInheritance4.ts, 12, 41))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 13, 13))
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance4.ts, 13, 15))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance4.ts, 13, 19))
@@ -63,7 +63,7 @@ interface A { // T
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 13, 13))
 
     a6: new <T extends Base>(x: (arg: T) => Derived) => T;
->a6 : Symbol(a6, Decl(constructSignatureAssignabilityInInheritance4.ts, 13, 42))
+>a6 : Symbol(A.a6, Decl(constructSignatureAssignabilityInInheritance4.ts, 13, 42))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 14, 13))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance4.ts, 0, 0))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance4.ts, 14, 29))
@@ -73,7 +73,7 @@ interface A { // T
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 14, 13))
 
     a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
->a11 : Symbol(a11, Decl(constructSignatureAssignabilityInInheritance4.ts, 14, 58))
+>a11 : Symbol(A.a11, Decl(constructSignatureAssignabilityInInheritance4.ts, 14, 58))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 15, 14))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance4.ts, 15, 17))
 >foo : Symbol(foo, Decl(constructSignatureAssignabilityInInheritance4.ts, 15, 21))
@@ -86,7 +86,7 @@ interface A { // T
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance4.ts, 0, 0))
 
     a15: new <T>(x: { a: T; b: T }) => T[];
->a15 : Symbol(a15, Decl(constructSignatureAssignabilityInInheritance4.ts, 15, 63))
+>a15 : Symbol(A.a15, Decl(constructSignatureAssignabilityInInheritance4.ts, 15, 63))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 16, 14))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance4.ts, 16, 17))
 >a : Symbol(a, Decl(constructSignatureAssignabilityInInheritance4.ts, 16, 21))
@@ -96,7 +96,7 @@ interface A { // T
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 16, 14))
 
     a16: new <T extends Base>(x: { a: T; b: T }) => T[];
->a16 : Symbol(a16, Decl(constructSignatureAssignabilityInInheritance4.ts, 16, 43))
+>a16 : Symbol(A.a16, Decl(constructSignatureAssignabilityInInheritance4.ts, 16, 43))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 17, 14))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance4.ts, 0, 0))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance4.ts, 17, 30))
@@ -107,7 +107,7 @@ interface A { // T
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 17, 14))
 
     a17: {
->a17 : Symbol(a17, Decl(constructSignatureAssignabilityInInheritance4.ts, 17, 56))
+>a17 : Symbol(A.a17, Decl(constructSignatureAssignabilityInInheritance4.ts, 17, 56))
 
         new <T extends Base>(x: T): T[];
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 19, 13))
@@ -125,7 +125,7 @@ interface A { // T
 
     };
     a18: {
->a18 : Symbol(a18, Decl(constructSignatureAssignabilityInInheritance4.ts, 21, 6))
+>a18 : Symbol(A.a18, Decl(constructSignatureAssignabilityInInheritance4.ts, 21, 6))
 
         new <T extends Derived>(x: T): number[];
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 23, 13))
@@ -141,7 +141,7 @@ interface A { // T
 
     };
     a19: {
->a19 : Symbol(a19, Decl(constructSignatureAssignabilityInInheritance4.ts, 25, 6))
+>a19 : Symbol(A.a19, Decl(constructSignatureAssignabilityInInheritance4.ts, 25, 6))
 
         new <T extends Derived>(x: new (a: T) => T): T[];
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 27, 13))
@@ -163,7 +163,7 @@ interface A { // T
 
     };
     a20: {
->a20 : Symbol(a20, Decl(constructSignatureAssignabilityInInheritance4.ts, 29, 6))
+>a20 : Symbol(A.a20, Decl(constructSignatureAssignabilityInInheritance4.ts, 29, 6))
 
         new (x: {
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance4.ts, 31, 13))
@@ -211,27 +211,27 @@ interface I extends A {
 
     // N's
     a: new <T>(x: T) => T[]; // ok, instantiation of N is a subtype of M, T is number
->a : Symbol(a, Decl(constructSignatureAssignabilityInInheritance4.ts, 43, 23))
+>a : Symbol(I.a, Decl(constructSignatureAssignabilityInInheritance4.ts, 43, 23))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 45, 12))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance4.ts, 45, 15))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 45, 12))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 45, 12))
 
     a2: new <T>(x: T) => string[]; // ok
->a2 : Symbol(a2, Decl(constructSignatureAssignabilityInInheritance4.ts, 45, 28))
+>a2 : Symbol(I.a2, Decl(constructSignatureAssignabilityInInheritance4.ts, 45, 28))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 46, 13))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance4.ts, 46, 16))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 46, 13))
 
     a3: new <T>(x: T) => T; // ok since Base returns void
->a3 : Symbol(a3, Decl(constructSignatureAssignabilityInInheritance4.ts, 46, 34))
+>a3 : Symbol(I.a3, Decl(constructSignatureAssignabilityInInheritance4.ts, 46, 34))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 47, 13))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance4.ts, 47, 16))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 47, 13))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 47, 13))
 
     a4: new <T, U>(x: T, y: U) => string; // ok, instantiation of N is a subtype of M, T is string, U is number
->a4 : Symbol(a4, Decl(constructSignatureAssignabilityInInheritance4.ts, 47, 27))
+>a4 : Symbol(I.a4, Decl(constructSignatureAssignabilityInInheritance4.ts, 47, 27))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 48, 13))
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance4.ts, 48, 15))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance4.ts, 48, 19))
@@ -240,7 +240,7 @@ interface I extends A {
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance4.ts, 48, 15))
 
     a5: new <T, U>(x: (arg: T) => U) => T; // ok, U is in a parameter position so inferences can be made
->a5 : Symbol(a5, Decl(constructSignatureAssignabilityInInheritance4.ts, 48, 41))
+>a5 : Symbol(I.a5, Decl(constructSignatureAssignabilityInInheritance4.ts, 48, 41))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 49, 13))
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance4.ts, 49, 15))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance4.ts, 49, 19))
@@ -250,7 +250,7 @@ interface I extends A {
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 49, 13))
 
     a6: new <T extends Base, U extends Derived>(x: (arg: T) => U) => T; // ok, same as a5 but with object type hierarchy
->a6 : Symbol(a6, Decl(constructSignatureAssignabilityInInheritance4.ts, 49, 42))
+>a6 : Symbol(I.a6, Decl(constructSignatureAssignabilityInInheritance4.ts, 49, 42))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 50, 13))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance4.ts, 0, 0))
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance4.ts, 50, 28))
@@ -262,7 +262,7 @@ interface I extends A {
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 50, 13))
 
     a11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; // ok
->a11 : Symbol(a11, Decl(constructSignatureAssignabilityInInheritance4.ts, 50, 71))
+>a11 : Symbol(I.a11, Decl(constructSignatureAssignabilityInInheritance4.ts, 50, 71))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 51, 14))
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance4.ts, 51, 16))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance4.ts, 51, 20))
@@ -276,7 +276,7 @@ interface I extends A {
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance4.ts, 0, 0))
 
     a15: new <U, V>(x: { a: U; b: V; }) => U[]; // ok, T = U, T = V
->a15 : Symbol(a15, Decl(constructSignatureAssignabilityInInheritance4.ts, 51, 66))
+>a15 : Symbol(I.a15, Decl(constructSignatureAssignabilityInInheritance4.ts, 51, 66))
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance4.ts, 52, 14))
 >V : Symbol(V, Decl(constructSignatureAssignabilityInInheritance4.ts, 52, 16))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance4.ts, 52, 20))
@@ -287,7 +287,7 @@ interface I extends A {
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance4.ts, 52, 14))
 
     a16: new <T>(x: { a: T; b: T }) => T[]; // ok, more general parameter type
->a16 : Symbol(a16, Decl(constructSignatureAssignabilityInInheritance4.ts, 52, 47))
+>a16 : Symbol(I.a16, Decl(constructSignatureAssignabilityInInheritance4.ts, 52, 47))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 53, 14))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance4.ts, 53, 17))
 >a : Symbol(a, Decl(constructSignatureAssignabilityInInheritance4.ts, 53, 21))
@@ -297,7 +297,7 @@ interface I extends A {
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 53, 14))
 
     a17: new <T extends Base>(x: T) => T[]; // ok, more general parameter type
->a17 : Symbol(a17, Decl(constructSignatureAssignabilityInInheritance4.ts, 53, 43))
+>a17 : Symbol(I.a17, Decl(constructSignatureAssignabilityInInheritance4.ts, 53, 43))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 54, 14))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance4.ts, 0, 0))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance4.ts, 54, 30))
@@ -305,14 +305,14 @@ interface I extends A {
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 54, 14))
 
     a18: new <T extends Base>(x: T) => number[]; // ok, more general parameter type
->a18 : Symbol(a18, Decl(constructSignatureAssignabilityInInheritance4.ts, 54, 43))
+>a18 : Symbol(I.a18, Decl(constructSignatureAssignabilityInInheritance4.ts, 54, 43))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 55, 14))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance4.ts, 0, 0))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance4.ts, 55, 30))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 55, 14))
 
     a19: new <T extends Base>(x: new (a: T) => T) => T[]; // ok
->a19 : Symbol(a19, Decl(constructSignatureAssignabilityInInheritance4.ts, 55, 48))
+>a19 : Symbol(I.a19, Decl(constructSignatureAssignabilityInInheritance4.ts, 55, 48))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 56, 14))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance4.ts, 0, 0))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance4.ts, 56, 30))
@@ -322,7 +322,7 @@ interface I extends A {
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 56, 14))
 
     a20: new (x: new <T extends Base>(a: T) => T) => any[]; // ok
->a20 : Symbol(a20, Decl(constructSignatureAssignabilityInInheritance4.ts, 56, 57))
+>a20 : Symbol(I.a20, Decl(constructSignatureAssignabilityInInheritance4.ts, 56, 57))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance4.ts, 57, 14))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance4.ts, 57, 22))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance4.ts, 0, 0))
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.symbols b/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.symbols
index 1b35cd0c896..ec2c71160c5 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.symbols
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.symbols
@@ -4,51 +4,51 @@
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance5.ts, 0, 0))
->foo : Symbol(foo, Decl(constructSignatureAssignabilityInInheritance5.ts, 3, 12))
+>foo : Symbol(Base.foo, Decl(constructSignatureAssignabilityInInheritance5.ts, 3, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance5.ts, 3, 27))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance5.ts, 0, 0))
->bar : Symbol(bar, Decl(constructSignatureAssignabilityInInheritance5.ts, 4, 28))
+>bar : Symbol(Derived.bar, Decl(constructSignatureAssignabilityInInheritance5.ts, 4, 28))
 
 class Derived2 extends Derived { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(constructSignatureAssignabilityInInheritance5.ts, 4, 43))
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance5.ts, 3, 27))
->baz : Symbol(baz, Decl(constructSignatureAssignabilityInInheritance5.ts, 5, 32))
+>baz : Symbol(Derived2.baz, Decl(constructSignatureAssignabilityInInheritance5.ts, 5, 32))
 
 class OtherDerived extends Base { bing: string; }
 >OtherDerived : Symbol(OtherDerived, Decl(constructSignatureAssignabilityInInheritance5.ts, 5, 47))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance5.ts, 0, 0))
->bing : Symbol(bing, Decl(constructSignatureAssignabilityInInheritance5.ts, 6, 33))
+>bing : Symbol(OtherDerived.bing, Decl(constructSignatureAssignabilityInInheritance5.ts, 6, 33))
 
 interface A { // T
 >A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance5.ts, 6, 49))
 
     // M's
     a: new (x: number) => number[];
->a : Symbol(a, Decl(constructSignatureAssignabilityInInheritance5.ts, 8, 13))
+>a : Symbol(A.a, Decl(constructSignatureAssignabilityInInheritance5.ts, 8, 13))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance5.ts, 10, 12))
 
     a2: new (x: number) => string[];
->a2 : Symbol(a2, Decl(constructSignatureAssignabilityInInheritance5.ts, 10, 35))
+>a2 : Symbol(A.a2, Decl(constructSignatureAssignabilityInInheritance5.ts, 10, 35))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance5.ts, 11, 13))
 
     a3: new (x: number) => void;
->a3 : Symbol(a3, Decl(constructSignatureAssignabilityInInheritance5.ts, 11, 36))
+>a3 : Symbol(A.a3, Decl(constructSignatureAssignabilityInInheritance5.ts, 11, 36))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance5.ts, 12, 13))
 
     a4: new (x: string, y: number) => string;
->a4 : Symbol(a4, Decl(constructSignatureAssignabilityInInheritance5.ts, 12, 32))
+>a4 : Symbol(A.a4, Decl(constructSignatureAssignabilityInInheritance5.ts, 12, 32))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance5.ts, 13, 13))
 >y : Symbol(y, Decl(constructSignatureAssignabilityInInheritance5.ts, 13, 23))
 
     a5: new (x: (arg: string) => number) => string;
->a5 : Symbol(a5, Decl(constructSignatureAssignabilityInInheritance5.ts, 13, 45))
+>a5 : Symbol(A.a5, Decl(constructSignatureAssignabilityInInheritance5.ts, 13, 45))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance5.ts, 14, 13))
 >arg : Symbol(arg, Decl(constructSignatureAssignabilityInInheritance5.ts, 14, 17))
 
     a6: new (x: (arg: Base) => Derived) => Base;
->a6 : Symbol(a6, Decl(constructSignatureAssignabilityInInheritance5.ts, 14, 51))
+>a6 : Symbol(A.a6, Decl(constructSignatureAssignabilityInInheritance5.ts, 14, 51))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance5.ts, 15, 13))
 >arg : Symbol(arg, Decl(constructSignatureAssignabilityInInheritance5.ts, 15, 17))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance5.ts, 0, 0))
@@ -56,7 +56,7 @@ interface A { // T
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance5.ts, 0, 0))
 
     a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived;
->a7 : Symbol(a7, Decl(constructSignatureAssignabilityInInheritance5.ts, 15, 48))
+>a7 : Symbol(A.a7, Decl(constructSignatureAssignabilityInInheritance5.ts, 15, 48))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance5.ts, 16, 13))
 >arg : Symbol(arg, Decl(constructSignatureAssignabilityInInheritance5.ts, 16, 17))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance5.ts, 0, 0))
@@ -66,7 +66,7 @@ interface A { // T
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance5.ts, 3, 27))
 
     a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
->a8 : Symbol(a8, Decl(constructSignatureAssignabilityInInheritance5.ts, 16, 64))
+>a8 : Symbol(A.a8, Decl(constructSignatureAssignabilityInInheritance5.ts, 16, 64))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance5.ts, 17, 13))
 >arg : Symbol(arg, Decl(constructSignatureAssignabilityInInheritance5.ts, 17, 17))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance5.ts, 0, 0))
@@ -80,7 +80,7 @@ interface A { // T
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance5.ts, 3, 27))
 
     a9: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
->a9 : Symbol(a9, Decl(constructSignatureAssignabilityInInheritance5.ts, 17, 92))
+>a9 : Symbol(A.a9, Decl(constructSignatureAssignabilityInInheritance5.ts, 17, 92))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance5.ts, 18, 13))
 >arg : Symbol(arg, Decl(constructSignatureAssignabilityInInheritance5.ts, 18, 17))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance5.ts, 0, 0))
@@ -94,13 +94,13 @@ interface A { // T
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance5.ts, 3, 27))
 
     a10: new (...x: Derived[]) => Derived;
->a10 : Symbol(a10, Decl(constructSignatureAssignabilityInInheritance5.ts, 18, 92))
+>a10 : Symbol(A.a10, Decl(constructSignatureAssignabilityInInheritance5.ts, 18, 92))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance5.ts, 19, 14))
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance5.ts, 3, 27))
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance5.ts, 3, 27))
 
     a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
->a11 : Symbol(a11, Decl(constructSignatureAssignabilityInInheritance5.ts, 19, 42))
+>a11 : Symbol(A.a11, Decl(constructSignatureAssignabilityInInheritance5.ts, 19, 42))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance5.ts, 20, 14))
 >foo : Symbol(foo, Decl(constructSignatureAssignabilityInInheritance5.ts, 20, 18))
 >y : Symbol(y, Decl(constructSignatureAssignabilityInInheritance5.ts, 20, 33))
@@ -109,7 +109,7 @@ interface A { // T
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance5.ts, 0, 0))
 
     a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
->a12 : Symbol(a12, Decl(constructSignatureAssignabilityInInheritance5.ts, 20, 75))
+>a12 : Symbol(A.a12, Decl(constructSignatureAssignabilityInInheritance5.ts, 20, 75))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance5.ts, 21, 14))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance5.ts, 0, 0))
@@ -120,7 +120,7 @@ interface A { // T
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance5.ts, 3, 27))
 
     a13: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
->a13 : Symbol(a13, Decl(constructSignatureAssignabilityInInheritance5.ts, 21, 68))
+>a13 : Symbol(A.a13, Decl(constructSignatureAssignabilityInInheritance5.ts, 21, 68))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance5.ts, 22, 14))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance5.ts, 0, 0))
@@ -131,7 +131,7 @@ interface A { // T
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance5.ts, 3, 27))
 
     a14: new (x: { a: string; b: number }) => Object;
->a14 : Symbol(a14, Decl(constructSignatureAssignabilityInInheritance5.ts, 22, 67))
+>a14 : Symbol(A.a14, Decl(constructSignatureAssignabilityInInheritance5.ts, 22, 67))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance5.ts, 23, 14))
 >a : Symbol(a, Decl(constructSignatureAssignabilityInInheritance5.ts, 23, 18))
 >b : Symbol(b, Decl(constructSignatureAssignabilityInInheritance5.ts, 23, 29))
@@ -143,7 +143,7 @@ interface B extends A {
 >A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance5.ts, 6, 49))
 
     a: new <T>(x: T) => T[];
->a : Symbol(a, Decl(constructSignatureAssignabilityInInheritance5.ts, 26, 23))
+>a : Symbol(B.a, Decl(constructSignatureAssignabilityInInheritance5.ts, 26, 23))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 27, 12))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance5.ts, 27, 15))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 27, 12))
@@ -157,27 +157,27 @@ interface I extends B {
 
     // N's
     a: new <T>(x: T) => T[]; // ok, instantiation of N is a subtype of M, T is number
->a : Symbol(a, Decl(constructSignatureAssignabilityInInheritance5.ts, 31, 23))
+>a : Symbol(I.a, Decl(constructSignatureAssignabilityInInheritance5.ts, 31, 23))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 33, 12))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance5.ts, 33, 15))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 33, 12))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 33, 12))
 
     a2: new <T>(x: T) => string[]; // ok
->a2 : Symbol(a2, Decl(constructSignatureAssignabilityInInheritance5.ts, 33, 28))
+>a2 : Symbol(I.a2, Decl(constructSignatureAssignabilityInInheritance5.ts, 33, 28))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 34, 13))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance5.ts, 34, 16))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 34, 13))
 
     a3: new <T>(x: T) => T; // ok since Base returns void
->a3 : Symbol(a3, Decl(constructSignatureAssignabilityInInheritance5.ts, 34, 34))
+>a3 : Symbol(I.a3, Decl(constructSignatureAssignabilityInInheritance5.ts, 34, 34))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 35, 13))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance5.ts, 35, 16))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 35, 13))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 35, 13))
 
     a4: new <T, U>(x: T, y: U) => T; // ok, instantiation of N is a subtype of M, T is string, U is number
->a4 : Symbol(a4, Decl(constructSignatureAssignabilityInInheritance5.ts, 35, 27))
+>a4 : Symbol(I.a4, Decl(constructSignatureAssignabilityInInheritance5.ts, 35, 27))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 36, 13))
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance5.ts, 36, 15))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance5.ts, 36, 19))
@@ -187,7 +187,7 @@ interface I extends B {
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 36, 13))
 
     a5: new <T, U>(x: (arg: T) => U) => T; // ok, U is in a parameter position so inferences can be made
->a5 : Symbol(a5, Decl(constructSignatureAssignabilityInInheritance5.ts, 36, 36))
+>a5 : Symbol(I.a5, Decl(constructSignatureAssignabilityInInheritance5.ts, 36, 36))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 37, 13))
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance5.ts, 37, 15))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance5.ts, 37, 19))
@@ -197,7 +197,7 @@ interface I extends B {
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 37, 13))
 
     a6: new <T extends Base, U extends Derived>(x: (arg: T) => U) => T; // ok, same as a5 but with object type hierarchy
->a6 : Symbol(a6, Decl(constructSignatureAssignabilityInInheritance5.ts, 37, 42))
+>a6 : Symbol(I.a6, Decl(constructSignatureAssignabilityInInheritance5.ts, 37, 42))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 38, 13))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance5.ts, 0, 0))
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance5.ts, 38, 28))
@@ -209,7 +209,7 @@ interface I extends B {
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 38, 13))
 
     a7: new <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; // ok
->a7 : Symbol(a7, Decl(constructSignatureAssignabilityInInheritance5.ts, 38, 71))
+>a7 : Symbol(I.a7, Decl(constructSignatureAssignabilityInInheritance5.ts, 38, 71))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 39, 13))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance5.ts, 0, 0))
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance5.ts, 39, 28))
@@ -223,7 +223,7 @@ interface I extends B {
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance5.ts, 39, 28))
 
     a8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U; // ok
->a8 : Symbol(a8, Decl(constructSignatureAssignabilityInInheritance5.ts, 39, 81))
+>a8 : Symbol(I.a8, Decl(constructSignatureAssignabilityInInheritance5.ts, 39, 81))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 40, 13))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance5.ts, 0, 0))
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance5.ts, 40, 28))
@@ -241,7 +241,7 @@ interface I extends B {
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance5.ts, 40, 28))
 
     a9: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; // ok, same as a8 with compatible object literal
->a9 : Symbol(a9, Decl(constructSignatureAssignabilityInInheritance5.ts, 40, 100))
+>a9 : Symbol(I.a9, Decl(constructSignatureAssignabilityInInheritance5.ts, 40, 100))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 41, 13))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance5.ts, 0, 0))
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance5.ts, 41, 28))
@@ -260,7 +260,7 @@ interface I extends B {
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance5.ts, 41, 28))
 
     a10: new <T extends Derived>(...x: T[]) => T; // ok
->a10 : Symbol(a10, Decl(constructSignatureAssignabilityInInheritance5.ts, 41, 128))
+>a10 : Symbol(I.a10, Decl(constructSignatureAssignabilityInInheritance5.ts, 41, 128))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 42, 14))
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance5.ts, 3, 27))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance5.ts, 42, 33))
@@ -268,7 +268,7 @@ interface I extends B {
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 42, 14))
 
     a11: new <T extends Base>(x: T, y: T) => T; // ok
->a11 : Symbol(a11, Decl(constructSignatureAssignabilityInInheritance5.ts, 42, 49))
+>a11 : Symbol(I.a11, Decl(constructSignatureAssignabilityInInheritance5.ts, 42, 49))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 43, 14))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance5.ts, 0, 0))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance5.ts, 43, 30))
@@ -278,7 +278,7 @@ interface I extends B {
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 43, 14))
 
     a12: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; // ok, less specific parameter type
->a12 : Symbol(a12, Decl(constructSignatureAssignabilityInInheritance5.ts, 43, 47))
+>a12 : Symbol(I.a12, Decl(constructSignatureAssignabilityInInheritance5.ts, 43, 47))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 44, 14))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance5.ts, 0, 0))
@@ -291,7 +291,7 @@ interface I extends B {
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance5.ts, 3, 27))
 
     a13: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T; // ok, T = Array<Derived>, satisfies constraint, contextual signature instantiation succeeds
->a13 : Symbol(a13, Decl(constructSignatureAssignabilityInInheritance5.ts, 44, 77))
+>a13 : Symbol(I.a13, Decl(constructSignatureAssignabilityInInheritance5.ts, 44, 77))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 45, 14))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance5.ts, 3, 27))
@@ -303,7 +303,7 @@ interface I extends B {
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 45, 14))
 
     a14: new <T>(x: { a: T; b: T }) => T; // ok, best common type yields T = {} but that's satisfactory for this signature
->a14 : Symbol(a14, Decl(constructSignatureAssignabilityInInheritance5.ts, 45, 67))
+>a14 : Symbol(I.a14, Decl(constructSignatureAssignabilityInInheritance5.ts, 45, 67))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance5.ts, 46, 14))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance5.ts, 46, 17))
 >a : Symbol(a, Decl(constructSignatureAssignabilityInInheritance5.ts, 46, 21))
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.symbols b/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.symbols
index 6f80b15484c..bf1a70e1651 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.symbols
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.symbols
@@ -5,48 +5,48 @@
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance6.ts, 0, 0))
->foo : Symbol(foo, Decl(constructSignatureAssignabilityInInheritance6.ts, 4, 12))
+>foo : Symbol(Base.foo, Decl(constructSignatureAssignabilityInInheritance6.ts, 4, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance6.ts, 4, 27))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance6.ts, 0, 0))
->bar : Symbol(bar, Decl(constructSignatureAssignabilityInInheritance6.ts, 5, 28))
+>bar : Symbol(Derived.bar, Decl(constructSignatureAssignabilityInInheritance6.ts, 5, 28))
 
 class Derived2 extends Derived { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(constructSignatureAssignabilityInInheritance6.ts, 5, 43))
 >Derived : Symbol(Derived, Decl(constructSignatureAssignabilityInInheritance6.ts, 4, 27))
->baz : Symbol(baz, Decl(constructSignatureAssignabilityInInheritance6.ts, 6, 32))
+>baz : Symbol(Derived2.baz, Decl(constructSignatureAssignabilityInInheritance6.ts, 6, 32))
 
 class OtherDerived extends Base { bing: string; }
 >OtherDerived : Symbol(OtherDerived, Decl(constructSignatureAssignabilityInInheritance6.ts, 6, 47))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance6.ts, 0, 0))
->bing : Symbol(bing, Decl(constructSignatureAssignabilityInInheritance6.ts, 7, 33))
+>bing : Symbol(OtherDerived.bing, Decl(constructSignatureAssignabilityInInheritance6.ts, 7, 33))
 
 interface A { // T
 >A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance6.ts, 7, 49))
 
     // M's
     a: new <T>(x: T) => T[];
->a : Symbol(a, Decl(constructSignatureAssignabilityInInheritance6.ts, 9, 13))
+>a : Symbol(A.a, Decl(constructSignatureAssignabilityInInheritance6.ts, 9, 13))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance6.ts, 11, 12))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance6.ts, 11, 15))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance6.ts, 11, 12))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance6.ts, 11, 12))
 
     a2: new <T>(x: T) => string[];
->a2 : Symbol(a2, Decl(constructSignatureAssignabilityInInheritance6.ts, 11, 28))
+>a2 : Symbol(A.a2, Decl(constructSignatureAssignabilityInInheritance6.ts, 11, 28))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance6.ts, 12, 13))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance6.ts, 12, 16))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance6.ts, 12, 13))
 
     a3: new <T>(x: T) => void;
->a3 : Symbol(a3, Decl(constructSignatureAssignabilityInInheritance6.ts, 12, 34))
+>a3 : Symbol(A.a3, Decl(constructSignatureAssignabilityInInheritance6.ts, 12, 34))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance6.ts, 13, 13))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance6.ts, 13, 16))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance6.ts, 13, 13))
 
     a4: new <T, U>(x: T, y: U) => string;
->a4 : Symbol(a4, Decl(constructSignatureAssignabilityInInheritance6.ts, 13, 30))
+>a4 : Symbol(A.a4, Decl(constructSignatureAssignabilityInInheritance6.ts, 13, 30))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance6.ts, 14, 13))
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance6.ts, 14, 15))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance6.ts, 14, 19))
@@ -55,7 +55,7 @@ interface A { // T
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance6.ts, 14, 15))
 
     a5: new <T, U>(x: (arg: T) => U) => T;
->a5 : Symbol(a5, Decl(constructSignatureAssignabilityInInheritance6.ts, 14, 41))
+>a5 : Symbol(A.a5, Decl(constructSignatureAssignabilityInInheritance6.ts, 14, 41))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance6.ts, 15, 13))
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance6.ts, 15, 15))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance6.ts, 15, 19))
@@ -65,7 +65,7 @@ interface A { // T
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance6.ts, 15, 13))
 
     a6: new <T extends Base>(x: (arg: T) => Derived) => T;
->a6 : Symbol(a6, Decl(constructSignatureAssignabilityInInheritance6.ts, 15, 42))
+>a6 : Symbol(A.a6, Decl(constructSignatureAssignabilityInInheritance6.ts, 15, 42))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance6.ts, 16, 13))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance6.ts, 0, 0))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance6.ts, 16, 29))
@@ -75,7 +75,7 @@ interface A { // T
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance6.ts, 16, 13))
 
     a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
->a11 : Symbol(a11, Decl(constructSignatureAssignabilityInInheritance6.ts, 16, 58))
+>a11 : Symbol(A.a11, Decl(constructSignatureAssignabilityInInheritance6.ts, 16, 58))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance6.ts, 17, 14))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance6.ts, 17, 17))
 >foo : Symbol(foo, Decl(constructSignatureAssignabilityInInheritance6.ts, 17, 21))
@@ -88,7 +88,7 @@ interface A { // T
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance6.ts, 0, 0))
 
     a15: new <T>(x: { a: T; b: T }) => T[];
->a15 : Symbol(a15, Decl(constructSignatureAssignabilityInInheritance6.ts, 17, 63))
+>a15 : Symbol(A.a15, Decl(constructSignatureAssignabilityInInheritance6.ts, 17, 63))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance6.ts, 18, 14))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance6.ts, 18, 17))
 >a : Symbol(a, Decl(constructSignatureAssignabilityInInheritance6.ts, 18, 21))
@@ -98,7 +98,7 @@ interface A { // T
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance6.ts, 18, 14))
 
     a16: new <T extends Base>(x: { a: T; b: T }) => T[];
->a16 : Symbol(a16, Decl(constructSignatureAssignabilityInInheritance6.ts, 18, 43))
+>a16 : Symbol(A.a16, Decl(constructSignatureAssignabilityInInheritance6.ts, 18, 43))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance6.ts, 19, 14))
 >Base : Symbol(Base, Decl(constructSignatureAssignabilityInInheritance6.ts, 0, 0))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance6.ts, 19, 30))
@@ -116,7 +116,7 @@ interface I<T> extends A {
 >A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance6.ts, 7, 49))
 
     a: new (x: T) => T[]; 
->a : Symbol(a, Decl(constructSignatureAssignabilityInInheritance6.ts, 23, 26))
+>a : Symbol(I.a, Decl(constructSignatureAssignabilityInInheritance6.ts, 23, 26))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance6.ts, 24, 12))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance6.ts, 23, 12))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance6.ts, 23, 12))
@@ -128,7 +128,7 @@ interface I2<T> extends A {
 >A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance6.ts, 7, 49))
 
     a2: new (x: T) => string[]; 
->a2 : Symbol(a2, Decl(constructSignatureAssignabilityInInheritance6.ts, 27, 27))
+>a2 : Symbol(I2.a2, Decl(constructSignatureAssignabilityInInheritance6.ts, 27, 27))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance6.ts, 28, 13))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance6.ts, 27, 13))
 }
@@ -139,7 +139,7 @@ interface I3<T> extends A {
 >A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance6.ts, 7, 49))
 
     a3: new (x: T) => T;
->a3 : Symbol(a3, Decl(constructSignatureAssignabilityInInheritance6.ts, 31, 27))
+>a3 : Symbol(I3.a3, Decl(constructSignatureAssignabilityInInheritance6.ts, 31, 27))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance6.ts, 32, 13))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance6.ts, 31, 13))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance6.ts, 31, 13))
@@ -151,7 +151,7 @@ interface I4<T> extends A {
 >A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance6.ts, 7, 49))
 
     a4: new <U>(x: T, y: U) => string; 
->a4 : Symbol(a4, Decl(constructSignatureAssignabilityInInheritance6.ts, 35, 27))
+>a4 : Symbol(I4.a4, Decl(constructSignatureAssignabilityInInheritance6.ts, 35, 27))
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance6.ts, 36, 13))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance6.ts, 36, 16))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance6.ts, 35, 13))
@@ -165,7 +165,7 @@ interface I5<T> extends A {
 >A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance6.ts, 7, 49))
 
     a5: new <U>(x: (arg: T) => U) => T; 
->a5 : Symbol(a5, Decl(constructSignatureAssignabilityInInheritance6.ts, 39, 27))
+>a5 : Symbol(I5.a5, Decl(constructSignatureAssignabilityInInheritance6.ts, 39, 27))
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance6.ts, 40, 13))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance6.ts, 40, 16))
 >arg : Symbol(arg, Decl(constructSignatureAssignabilityInInheritance6.ts, 40, 20))
@@ -180,7 +180,7 @@ interface I7<T> extends A {
 >A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance6.ts, 7, 49))
 
     a11: new <U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
->a11 : Symbol(a11, Decl(constructSignatureAssignabilityInInheritance6.ts, 43, 27))
+>a11 : Symbol(I7.a11, Decl(constructSignatureAssignabilityInInheritance6.ts, 43, 27))
 >U : Symbol(U, Decl(constructSignatureAssignabilityInInheritance6.ts, 44, 14))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance6.ts, 44, 17))
 >foo : Symbol(foo, Decl(constructSignatureAssignabilityInInheritance6.ts, 44, 21))
@@ -199,7 +199,7 @@ interface I9<T> extends A {
 >A : Symbol(A, Decl(constructSignatureAssignabilityInInheritance6.ts, 7, 49))
 
     a16: new (x: { a: T; b: T }) => T[]; 
->a16 : Symbol(a16, Decl(constructSignatureAssignabilityInInheritance6.ts, 47, 27))
+>a16 : Symbol(I9.a16, Decl(constructSignatureAssignabilityInInheritance6.ts, 47, 27))
 >x : Symbol(x, Decl(constructSignatureAssignabilityInInheritance6.ts, 48, 14))
 >a : Symbol(a, Decl(constructSignatureAssignabilityInInheritance6.ts, 48, 18))
 >T : Symbol(T, Decl(constructSignatureAssignabilityInInheritance6.ts, 47, 13))
diff --git a/tests/baselines/reference/constructSignaturesWithOverloads2.errors.txt b/tests/baselines/reference/constructSignaturesWithOverloads2.errors.txt
index ceb828dd061..617f7b1502f 100644
--- a/tests/baselines/reference/constructSignaturesWithOverloads2.errors.txt
+++ b/tests/baselines/reference/constructSignaturesWithOverloads2.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads2.ts(32,11): error TS2428: All declarations of an interface must have identical type parameters.
+tests/cases/conformance/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads2.ts(32,11): error TS2428: All declarations of 'I' must have identical type parameters.
 
 
 ==== tests/cases/conformance/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads2.ts (1 errors) ====
@@ -35,7 +35,7 @@ tests/cases/conformance/types/objectTypeLiteral/constructSignatures/constructSig
     
     interface I<T> {
               ~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'I' must have identical type parameters.
         new (x: T, y?: number): C2<T>;
         new (x: T, y: number): C2<T>;
     }
diff --git a/tests/baselines/reference/constructorArgs.symbols b/tests/baselines/reference/constructorArgs.symbols
index 083a094a4cd..ef21795b66f 100644
--- a/tests/baselines/reference/constructorArgs.symbols
+++ b/tests/baselines/reference/constructorArgs.symbols
@@ -3,7 +3,7 @@ interface Options {
 >Options : Symbol(Options, Decl(constructorArgs.ts, 0, 0))
 
  value: number;
->value : Symbol(value, Decl(constructorArgs.ts, 0, 19))
+>value : Symbol(Options.value, Decl(constructorArgs.ts, 0, 19))
 }
 
 class Super {
@@ -19,7 +19,7 @@ class Sub extends Super {
 >Super : Symbol(Super, Decl(constructorArgs.ts, 2, 1))
 
  constructor(public options:Options) {
->options : Symbol(options, Decl(constructorArgs.ts, 10, 13))
+>options : Symbol(Sub.options, Decl(constructorArgs.ts, 10, 13))
 >Options : Symbol(Options, Decl(constructorArgs.ts, 0, 0))
 
   super(options.value);
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/constructorHasPrototypeProperty.symbols b/tests/baselines/reference/constructorHasPrototypeProperty.symbols
index 0a90834ac51..b3f610db6dc 100644
--- a/tests/baselines/reference/constructorHasPrototypeProperty.symbols
+++ b/tests/baselines/reference/constructorHasPrototypeProperty.symbols
@@ -6,7 +6,7 @@ module NonGeneric {
 >C : Symbol(C, Decl(constructorHasPrototypeProperty.ts, 0, 19))
 
         foo: string;
->foo : Symbol(foo, Decl(constructorHasPrototypeProperty.ts, 1, 13))
+>foo : Symbol(C.foo, Decl(constructorHasPrototypeProperty.ts, 1, 13))
     }
 
     class D extends C {
@@ -14,7 +14,7 @@ module NonGeneric {
 >C : Symbol(C, Decl(constructorHasPrototypeProperty.ts, 0, 19))
 
         bar: string;
->bar : Symbol(bar, Decl(constructorHasPrototypeProperty.ts, 5, 23))
+>bar : Symbol(D.bar, Decl(constructorHasPrototypeProperty.ts, 5, 23))
     }
 
     var r = C.prototype;
@@ -49,11 +49,11 @@ module Generic {
 >U : Symbol(U, Decl(constructorHasPrototypeProperty.ts, 16, 14))
 
         foo: T;
->foo : Symbol(foo, Decl(constructorHasPrototypeProperty.ts, 16, 18))
+>foo : Symbol(C.foo, Decl(constructorHasPrototypeProperty.ts, 16, 18))
 >T : Symbol(T, Decl(constructorHasPrototypeProperty.ts, 16, 12))
 
         bar: U;
->bar : Symbol(bar, Decl(constructorHasPrototypeProperty.ts, 17, 15))
+>bar : Symbol(C.bar, Decl(constructorHasPrototypeProperty.ts, 17, 15))
 >U : Symbol(U, Decl(constructorHasPrototypeProperty.ts, 16, 14))
     }
 
@@ -66,11 +66,11 @@ module Generic {
 >U : Symbol(U, Decl(constructorHasPrototypeProperty.ts, 21, 14))
 
         baz: T;
->baz : Symbol(baz, Decl(constructorHasPrototypeProperty.ts, 21, 33))
+>baz : Symbol(D.baz, Decl(constructorHasPrototypeProperty.ts, 21, 33))
 >T : Symbol(T, Decl(constructorHasPrototypeProperty.ts, 21, 12))
 
         bing: U;
->bing : Symbol(bing, Decl(constructorHasPrototypeProperty.ts, 22, 15))
+>bing : Symbol(D.bing, Decl(constructorHasPrototypeProperty.ts, 22, 15))
 >U : Symbol(U, Decl(constructorHasPrototypeProperty.ts, 21, 14))
     }
 
diff --git a/tests/baselines/reference/constructorImplementationWithDefaultValues.symbols b/tests/baselines/reference/constructorImplementationWithDefaultValues.symbols
index a96e053132e..7403c126f45 100644
--- a/tests/baselines/reference/constructorImplementationWithDefaultValues.symbols
+++ b/tests/baselines/reference/constructorImplementationWithDefaultValues.symbols
@@ -34,7 +34,7 @@ class D<T> {
 class E<T extends Date> {
 >E : Symbol(E, Decl(constructorImplementationWithDefaultValues.ts, 12, 1))
 >T : Symbol(T, Decl(constructorImplementationWithDefaultValues.ts, 14, 8))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     constructor(x);
 >x : Symbol(x, Decl(constructorImplementationWithDefaultValues.ts, 15, 16))
diff --git a/tests/baselines/reference/constructorOverloads2.symbols b/tests/baselines/reference/constructorOverloads2.symbols
index b2b9db6eda3..d2c5acf3b67 100644
--- a/tests/baselines/reference/constructorOverloads2.symbols
+++ b/tests/baselines/reference/constructorOverloads2.symbols
@@ -12,7 +12,7 @@ class FooBase {
 >x : Symbol(x, Decl(constructorOverloads2.ts, 3, 16))
     }
     bar1() {  /*WScript.Echo("base bar1");*/ }
->bar1 : Symbol(bar1, Decl(constructorOverloads2.ts, 4, 5))
+>bar1 : Symbol(FooBase.bar1, Decl(constructorOverloads2.ts, 4, 5))
 }
 
 class Foo extends FooBase {
@@ -37,7 +37,7 @@ class Foo extends FooBase {
 >x : Symbol(x, Decl(constructorOverloads2.ts, 12, 16))
     }
     bar1() {  /*WScript.Echo("bar1");*/ }
->bar1 : Symbol(bar1, Decl(constructorOverloads2.ts, 14, 5))
+>bar1 : Symbol(Foo.bar1, Decl(constructorOverloads2.ts, 14, 5))
 }
 
 var f1 = new Foo("hey");
diff --git a/tests/baselines/reference/constructorOverloadsWithOptionalParameters.symbols b/tests/baselines/reference/constructorOverloadsWithOptionalParameters.symbols
index 68cecd8f912..08404ab84e7 100644
--- a/tests/baselines/reference/constructorOverloadsWithOptionalParameters.symbols
+++ b/tests/baselines/reference/constructorOverloadsWithOptionalParameters.symbols
@@ -3,7 +3,7 @@ class C {
 >C : Symbol(C, Decl(constructorOverloadsWithOptionalParameters.ts, 0, 0))
 
     foo: string;
->foo : Symbol(foo, Decl(constructorOverloadsWithOptionalParameters.ts, 0, 9))
+>foo : Symbol(C.foo, Decl(constructorOverloadsWithOptionalParameters.ts, 0, 9))
 
     constructor(x?, y?: any[]); 
 >x : Symbol(x, Decl(constructorOverloadsWithOptionalParameters.ts, 2, 16))
@@ -18,7 +18,7 @@ class D<T> {
 >T : Symbol(T, Decl(constructorOverloadsWithOptionalParameters.ts, 7, 8))
 
     foo: string;
->foo : Symbol(foo, Decl(constructorOverloadsWithOptionalParameters.ts, 7, 12))
+>foo : Symbol(D.foo, Decl(constructorOverloadsWithOptionalParameters.ts, 7, 12))
 
     constructor(x?, y?: any[]); 
 >x : Symbol(x, Decl(constructorOverloadsWithOptionalParameters.ts, 9, 16))
diff --git a/tests/baselines/reference/constructorParameterProperties.errors.txt b/tests/baselines/reference/constructorParameterProperties.errors.txt
index ab9bebe9d2d..2bc8aaad02b 100644
--- a/tests/baselines/reference/constructorParameterProperties.errors.txt
+++ b/tests/baselines/reference/constructorParameterProperties.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts(8,10): error TS2341: Property 'x' is private and only accessible within class 'C'.
-tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts(9,10): error TS2445: Property 'z' is protected and only accessible within class 'C' and its subclasses.
-tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts(18,10): error TS2341: Property 'x' is private and only accessible within class 'D<T>'.
+tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts(8,12): error TS2341: Property 'x' is private and only accessible within class 'C'.
+tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts(9,12): error TS2445: Property 'z' is protected and only accessible within class 'C' and its subclasses.
+tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts(18,12): error TS2341: Property 'x' is private and only accessible within class 'D<T>'.
 tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts(19,12): error TS2339: Property 'a' does not exist on type 'D<string>'.
-tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts(20,10): error TS2445: Property 'z' is protected and only accessible within class 'D<T>' and its subclasses.
+tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts(20,12): error TS2445: Property 'z' is protected and only accessible within class 'D<T>' and its subclasses.
 
 
 ==== tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts (5 errors) ====
@@ -14,10 +14,10 @@ tests/cases/conformance/classes/constructorDeclarations/constructorParameters/co
     var c: C;
     var r = c.y;
     var r2 = c.x; // error
-             ~~~
+               ~
 !!! error TS2341: Property 'x' is private and only accessible within class 'C'.
     var r3 = c.z; // error
-             ~~~
+               ~
 !!! error TS2445: Property 'z' is protected and only accessible within class 'C' and its subclasses.
     
     class D<T> {
@@ -28,12 +28,12 @@ tests/cases/conformance/classes/constructorDeclarations/constructorParameters/co
     var d: D<string>;
     var r = d.y;
     var r2 = d.x; // error
-             ~~~
+               ~
 !!! error TS2341: Property 'x' is private and only accessible within class 'D<T>'.
     var r3 = d.a; // error
                ~
 !!! error TS2339: Property 'a' does not exist on type 'D<string>'.
     var r4 = d.z; // error
-             ~~~
+               ~
 !!! error TS2445: Property 'z' is protected and only accessible within class 'D<T>' and its subclasses.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/constructorWithExpressionLessReturn.symbols b/tests/baselines/reference/constructorWithExpressionLessReturn.symbols
index 0d6f06a91a4..3424e53c51a 100644
--- a/tests/baselines/reference/constructorWithExpressionLessReturn.symbols
+++ b/tests/baselines/reference/constructorWithExpressionLessReturn.symbols
@@ -11,7 +11,7 @@ class D {
 >D : Symbol(D, Decl(constructorWithExpressionLessReturn.ts, 4, 1))
 
     x: number;
->x : Symbol(x, Decl(constructorWithExpressionLessReturn.ts, 6, 9))
+>x : Symbol(D.x, Decl(constructorWithExpressionLessReturn.ts, 6, 9))
 
     constructor() {
         return;
@@ -22,7 +22,7 @@ class E {
 >E : Symbol(E, Decl(constructorWithExpressionLessReturn.ts, 11, 1))
 
     constructor(public x: number) {
->x : Symbol(x, Decl(constructorWithExpressionLessReturn.ts, 14, 16))
+>x : Symbol(E.x, Decl(constructorWithExpressionLessReturn.ts, 14, 16))
 
         return;
     }
@@ -33,7 +33,7 @@ class F<T> {
 >T : Symbol(T, Decl(constructorWithExpressionLessReturn.ts, 19, 8))
 
     constructor(public x: T) {
->x : Symbol(x, Decl(constructorWithExpressionLessReturn.ts, 20, 16))
+>x : Symbol(F.x, Decl(constructorWithExpressionLessReturn.ts, 20, 16))
 >T : Symbol(T, Decl(constructorWithExpressionLessReturn.ts, 19, 8))
 
         return;
diff --git a/tests/baselines/reference/contextualSignatureInstatiationContravariance.symbols b/tests/baselines/reference/contextualSignatureInstatiationContravariance.symbols
index c19c61cdbb0..37a0c4adb02 100644
--- a/tests/baselines/reference/contextualSignatureInstatiationContravariance.symbols
+++ b/tests/baselines/reference/contextualSignatureInstatiationContravariance.symbols
@@ -1,17 +1,17 @@
 === tests/cases/compiler/contextualSignatureInstatiationContravariance.ts ===
 interface Animal { x }
 >Animal : Symbol(Animal, Decl(contextualSignatureInstatiationContravariance.ts, 0, 0))
->x : Symbol(x, Decl(contextualSignatureInstatiationContravariance.ts, 0, 18))
+>x : Symbol(Animal.x, Decl(contextualSignatureInstatiationContravariance.ts, 0, 18))
 
 interface Giraffe extends Animal { y }
 >Giraffe : Symbol(Giraffe, Decl(contextualSignatureInstatiationContravariance.ts, 0, 22))
 >Animal : Symbol(Animal, Decl(contextualSignatureInstatiationContravariance.ts, 0, 0))
->y : Symbol(y, Decl(contextualSignatureInstatiationContravariance.ts, 1, 34))
+>y : Symbol(Giraffe.y, Decl(contextualSignatureInstatiationContravariance.ts, 1, 34))
 
 interface Elephant extends Animal { y2 }
 >Elephant : Symbol(Elephant, Decl(contextualSignatureInstatiationContravariance.ts, 1, 38))
 >Animal : Symbol(Animal, Decl(contextualSignatureInstatiationContravariance.ts, 0, 0))
->y2 : Symbol(y2, Decl(contextualSignatureInstatiationContravariance.ts, 2, 35))
+>y2 : Symbol(Elephant.y2, Decl(contextualSignatureInstatiationContravariance.ts, 2, 35))
 
 var f2: <T extends Animal>(x: T, y: T) => void;
 >f2 : Symbol(f2, Decl(contextualSignatureInstatiationContravariance.ts, 4, 3))
diff --git a/tests/baselines/reference/contextualSignatureInstatiationCovariance.symbols b/tests/baselines/reference/contextualSignatureInstatiationCovariance.symbols
index 9b1b4c0c5f0..ff8582bb26a 100644
--- a/tests/baselines/reference/contextualSignatureInstatiationCovariance.symbols
+++ b/tests/baselines/reference/contextualSignatureInstatiationCovariance.symbols
@@ -1,17 +1,17 @@
 === tests/cases/compiler/contextualSignatureInstatiationCovariance.ts ===
 interface Animal { x }
 >Animal : Symbol(Animal, Decl(contextualSignatureInstatiationCovariance.ts, 0, 0))
->x : Symbol(x, Decl(contextualSignatureInstatiationCovariance.ts, 0, 18))
+>x : Symbol(Animal.x, Decl(contextualSignatureInstatiationCovariance.ts, 0, 18))
 
 interface TallThing { x2 }
 >TallThing : Symbol(TallThing, Decl(contextualSignatureInstatiationCovariance.ts, 0, 22))
->x2 : Symbol(x2, Decl(contextualSignatureInstatiationCovariance.ts, 1, 21))
+>x2 : Symbol(TallThing.x2, Decl(contextualSignatureInstatiationCovariance.ts, 1, 21))
 
 interface Giraffe extends Animal, TallThing { y }
 >Giraffe : Symbol(Giraffe, Decl(contextualSignatureInstatiationCovariance.ts, 1, 26))
 >Animal : Symbol(Animal, Decl(contextualSignatureInstatiationCovariance.ts, 0, 0))
 >TallThing : Symbol(TallThing, Decl(contextualSignatureInstatiationCovariance.ts, 0, 22))
->y : Symbol(y, Decl(contextualSignatureInstatiationCovariance.ts, 2, 45))
+>y : Symbol(Giraffe.y, Decl(contextualSignatureInstatiationCovariance.ts, 2, 45))
 
 var f2: <T extends Giraffe>(x: T, y: T) => void;
 >f2 : Symbol(f2, Decl(contextualSignatureInstatiationCovariance.ts, 4, 3))
diff --git a/tests/baselines/reference/contextualThisType.symbols b/tests/baselines/reference/contextualThisType.symbols
index 5030a9bbcde..b5f4a7d7bb7 100644
--- a/tests/baselines/reference/contextualThisType.symbols
+++ b/tests/baselines/reference/contextualThisType.symbols
@@ -3,7 +3,7 @@ interface X {
 >X : Symbol(X, Decl(contextualThisType.ts, 0, 0))
 
     a: (p: this) => this;
->a : Symbol(a, Decl(contextualThisType.ts, 0, 13))
+>a : Symbol(X.a, Decl(contextualThisType.ts, 0, 13))
 >p : Symbol(p, Decl(contextualThisType.ts, 1, 8))
 }
 
diff --git a/tests/baselines/reference/contextualTypeAny.errors.txt b/tests/baselines/reference/contextualTypeAny.errors.txt
new file mode 100644
index 00000000000..09970be986d
--- /dev/null
+++ b/tests/baselines/reference/contextualTypeAny.errors.txt
@@ -0,0 +1,15 @@
+tests/cases/compiler/contextualTypeAny.ts(3,5): error TS2322: Type '{ p: string; q: any; }' is not assignable to type '{ [s: string]: number; }'.
+  Property 'p' is incompatible with index signature.
+    Type 'string' is not assignable to type 'number'.
+
+
+==== tests/cases/compiler/contextualTypeAny.ts (1 errors) ====
+    var x: any;
+    
+    var obj: { [s: string]: number } = { p: "", q: x };
+        ~~~
+!!! error TS2322: Type '{ p: string; q: any; }' is not assignable to type '{ [s: string]: number; }'.
+!!! error TS2322:   Property 'p' is incompatible with index signature.
+!!! error TS2322:     Type 'string' is not assignable to type 'number'.
+    
+    var arr: number[] = ["", x];
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTypeAny.symbols b/tests/baselines/reference/contextualTypeAny.symbols
deleted file mode 100644
index 5132c948a2e..00000000000
--- a/tests/baselines/reference/contextualTypeAny.symbols
+++ /dev/null
@@ -1,15 +0,0 @@
-=== tests/cases/compiler/contextualTypeAny.ts ===
-var x: any;
->x : Symbol(x, Decl(contextualTypeAny.ts, 0, 3))
-
-var obj: { [s: string]: number } = { p: "", q: x };
->obj : Symbol(obj, Decl(contextualTypeAny.ts, 2, 3))
->s : Symbol(s, Decl(contextualTypeAny.ts, 2, 12))
->p : Symbol(p, Decl(contextualTypeAny.ts, 2, 36))
->q : Symbol(q, Decl(contextualTypeAny.ts, 2, 43))
->x : Symbol(x, Decl(contextualTypeAny.ts, 0, 3))
-
-var arr: number[] = ["", x];
->arr : Symbol(arr, Decl(contextualTypeAny.ts, 4, 3))
->x : Symbol(x, Decl(contextualTypeAny.ts, 0, 3))
-
diff --git a/tests/baselines/reference/contextualTypeAny.types b/tests/baselines/reference/contextualTypeAny.types
deleted file mode 100644
index cace92d6567..00000000000
--- a/tests/baselines/reference/contextualTypeAny.types
+++ /dev/null
@@ -1,19 +0,0 @@
-=== tests/cases/compiler/contextualTypeAny.ts ===
-var x: any;
->x : any
-
-var obj: { [s: string]: number } = { p: "", q: x };
->obj : { [s: string]: number; }
->s : string
->{ p: "", q: x } : { [x: string]: any; p: string; q: any; }
->p : string
->"" : string
->q : any
->x : any
-
-var arr: number[] = ["", x];
->arr : number[]
->["", x] : any[]
->"" : string
->x : any
-
diff --git a/tests/baselines/reference/contextualTypeAppliedToVarArgs.symbols b/tests/baselines/reference/contextualTypeAppliedToVarArgs.symbols
index bf8774cc7f0..4c87eef268c 100644
--- a/tests/baselines/reference/contextualTypeAppliedToVarArgs.symbols
+++ b/tests/baselines/reference/contextualTypeAppliedToVarArgs.symbols
@@ -15,7 +15,7 @@ class Foo{
 
 
     Bar() {
->Bar : Symbol(Bar, Decl(contextualTypeAppliedToVarArgs.ts, 4, 10))
+>Bar : Symbol(Foo.Bar, Decl(contextualTypeAppliedToVarArgs.ts, 4, 10))
 
         delegate(this, function (source, args2)
 >delegate : Symbol(delegate, Decl(contextualTypeAppliedToVarArgs.ts, 0, 0))
diff --git a/tests/baselines/reference/contextualTypeArrayReturnType.symbols b/tests/baselines/reference/contextualTypeArrayReturnType.symbols
index ed0e22d698c..2982a1ce893 100644
--- a/tests/baselines/reference/contextualTypeArrayReturnType.symbols
+++ b/tests/baselines/reference/contextualTypeArrayReturnType.symbols
@@ -3,7 +3,7 @@ interface IBookStyle {
 >IBookStyle : Symbol(IBookStyle, Decl(contextualTypeArrayReturnType.ts, 0, 0))
 
     initialLeftPageTransforms?: (width: number) => NamedTransform[];
->initialLeftPageTransforms : Symbol(initialLeftPageTransforms, Decl(contextualTypeArrayReturnType.ts, 0, 22))
+>initialLeftPageTransforms : Symbol(IBookStyle.initialLeftPageTransforms, Decl(contextualTypeArrayReturnType.ts, 0, 22))
 >width : Symbol(width, Decl(contextualTypeArrayReturnType.ts, 1, 33))
 >NamedTransform : Symbol(NamedTransform, Decl(contextualTypeArrayReturnType.ts, 2, 1))
 }
@@ -20,7 +20,7 @@ interface Transform3D {
 >Transform3D : Symbol(Transform3D, Decl(contextualTypeArrayReturnType.ts, 6, 1))
 
     cachedCss: string;
->cachedCss : Symbol(cachedCss, Decl(contextualTypeArrayReturnType.ts, 8, 23))
+>cachedCss : Symbol(Transform3D.cachedCss, Decl(contextualTypeArrayReturnType.ts, 8, 23))
 }
 
 var style: IBookStyle = {
diff --git a/tests/baselines/reference/contextualTypeArrayReturnType.types b/tests/baselines/reference/contextualTypeArrayReturnType.types
index f270b33f568..6c91fd7b8b9 100644
--- a/tests/baselines/reference/contextualTypeArrayReturnType.types
+++ b/tests/baselines/reference/contextualTypeArrayReturnType.types
@@ -26,18 +26,18 @@ interface Transform3D {
 var style: IBookStyle = {
 >style : IBookStyle
 >IBookStyle : IBookStyle
->{    initialLeftPageTransforms: (width: number) => {        return [            {'ry': null }        ];    }} : { initialLeftPageTransforms: (width: number) => { [x: string]: any; 'ry': any; }[]; }
+>{    initialLeftPageTransforms: (width: number) => {        return [            {'ry': null }        ];    }} : { initialLeftPageTransforms: (width: number) => { 'ry': any; }[]; }
 
     initialLeftPageTransforms: (width: number) => {
->initialLeftPageTransforms : (width: number) => { [x: string]: any; 'ry': any; }[]
->(width: number) => {        return [            {'ry': null }        ];    } : (width: number) => { [x: string]: any; 'ry': any; }[]
+>initialLeftPageTransforms : (width: number) => { 'ry': any; }[]
+>(width: number) => {        return [            {'ry': null }        ];    } : (width: number) => { 'ry': any; }[]
 >width : number
 
         return [
->[            {'ry': null }        ] : { [x: string]: null; 'ry': null; }[]
+>[            {'ry': null }        ] : { 'ry': null; }[]
 
             {'ry': null }
->{'ry': null } : { [x: string]: null; 'ry': null; }
+>{'ry': null } : { 'ry': null; }
 >null : null
 
         ];
diff --git a/tests/baselines/reference/contextualTypeWithTuple.errors.txt b/tests/baselines/reference/contextualTypeWithTuple.errors.txt
index e447ed62b39..a2d3b224ddc 100644
--- a/tests/baselines/reference/contextualTypeWithTuple.errors.txt
+++ b/tests/baselines/reference/contextualTypeWithTuple.errors.txt
@@ -3,7 +3,6 @@ tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(3,5): error TS232
     Type '() => number | string | boolean' is not assignable to type '() => number | string'.
       Type 'number | string | boolean' is not assignable to type 'number | string'.
         Type 'boolean' is not assignable to type 'number | string'.
-          Type 'boolean' is not assignable to type 'string'.
 tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(15,1): error TS2322: Type '[number, string, boolean]' is not assignable to type '[number, string]'.
 tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(18,1): error TS2322: Type '[{}, number]' is not assignable to type '[{ a: string; }, number]'.
   Types of property '0' are incompatible.
@@ -34,7 +33,6 @@ tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(25,1): error TS23
 !!! error TS2322:     Type '() => number | string | boolean' is not assignable to type '() => number | string'.
 !!! error TS2322:       Type 'number | string | boolean' is not assignable to type 'number | string'.
 !!! error TS2322:         Type 'boolean' is not assignable to type 'number | string'.
-!!! error TS2322:           Type 'boolean' is not assignable to type 'string'.
     var numStrBoolTuple: [number, string, boolean] = [5, "foo", true];
     var objNumTuple: [{ a: string }, number] = [{ a: "world" }, 5];
     var strTupleTuple: [string, [number, {}]] = ["bar", [5, { x: 1, y: 1 }]];
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/contextualTypeWithUnionTypeCallSignatures.symbols b/tests/baselines/reference/contextualTypeWithUnionTypeCallSignatures.symbols
index 13f95623fd5..530779be29d 100644
--- a/tests/baselines/reference/contextualTypeWithUnionTypeCallSignatures.symbols
+++ b/tests/baselines/reference/contextualTypeWithUnionTypeCallSignatures.symbols
@@ -10,7 +10,7 @@ interface IWithNoCallSignatures {
 >IWithNoCallSignatures : Symbol(IWithNoCallSignatures, Decl(contextualTypeWithUnionTypeCallSignatures.ts, 0, 0))
 
     foo: string;
->foo : Symbol(foo, Decl(contextualTypeWithUnionTypeCallSignatures.ts, 7, 33))
+>foo : Symbol(IWithNoCallSignatures.foo, Decl(contextualTypeWithUnionTypeCallSignatures.ts, 7, 33))
 }
 interface IWithCallSignatures {
 >IWithCallSignatures : Symbol(IWithCallSignatures, Decl(contextualTypeWithUnionTypeCallSignatures.ts, 9, 1))
diff --git a/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.symbols b/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.symbols
index 14b595f8b33..985bb52f243 100644
--- a/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.symbols
+++ b/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.symbols
@@ -18,7 +18,7 @@ interface IWithNoStringIndexSignature {
 >IWithNoStringIndexSignature : Symbol(IWithNoStringIndexSignature, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 7, 1))
 
     foo: string;
->foo : Symbol(foo, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 9, 39))
+>foo : Symbol(IWithNoStringIndexSignature.foo, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 9, 39))
 }
 interface IWithNoNumberIndexSignature {
 >IWithNoNumberIndexSignature : Symbol(IWithNoNumberIndexSignature, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 11, 1))
diff --git a/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.types b/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.types
index 2f24ad08227..965e4d21d99 100644
--- a/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.types
+++ b/tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.types
@@ -69,7 +69,7 @@ var x: IWithNoStringIndexSignature | IWithStringIndexSignature1 = { z: a => a };
 >x : IWithNoStringIndexSignature | IWithStringIndexSignature1
 >IWithNoStringIndexSignature : IWithNoStringIndexSignature
 >IWithStringIndexSignature1 : IWithStringIndexSignature1
->{ z: a => a } : { [x: string]: (a: number) => number; z: (a: number) => number; }
+>{ z: a => a } : { z: (a: number) => number; }
 >z : (a: number) => number
 >a => a : (a: number) => number
 >a : number
@@ -79,7 +79,7 @@ var x: IWithNoStringIndexSignature | IWithStringIndexSignature1 = { foo: a => a
 >x : IWithNoStringIndexSignature | IWithStringIndexSignature1
 >IWithNoStringIndexSignature : IWithNoStringIndexSignature
 >IWithStringIndexSignature1 : IWithStringIndexSignature1
->{ foo: a => a } : { [x: string]: (a: any) => any; foo: (a: any) => any; }
+>{ foo: a => a } : { foo: (a: any) => any; }
 >foo : (a: any) => any
 >a => a : (a: any) => any
 >a : any
@@ -89,7 +89,7 @@ var x: IWithNoStringIndexSignature | IWithStringIndexSignature1 = { foo: "hello"
 >x : IWithNoStringIndexSignature | IWithStringIndexSignature1
 >IWithNoStringIndexSignature : IWithNoStringIndexSignature
 >IWithStringIndexSignature1 : IWithStringIndexSignature1
->{ foo: "hello" } : { [x: string]: string; foo: string; }
+>{ foo: "hello" } : { foo: string; }
 >foo : string
 >"hello" : string
 
@@ -97,7 +97,7 @@ var x2: IWithStringIndexSignature1 | IWithStringIndexSignature2 = { z: a => a.to
 >x2 : IWithStringIndexSignature1 | IWithStringIndexSignature2
 >IWithStringIndexSignature1 : IWithStringIndexSignature1
 >IWithStringIndexSignature2 : IWithStringIndexSignature2
->{ z: a => a.toString() } : { [x: string]: (a: number) => string; z: (a: number) => string; }
+>{ z: a => a.toString() } : { z: (a: number) => string; }
 >z : (a: number) => string
 >a => a.toString() : (a: number) => string
 >a : number
@@ -110,7 +110,7 @@ var x2: IWithStringIndexSignature1 | IWithStringIndexSignature2 = { z: a => a };
 >x2 : IWithStringIndexSignature1 | IWithStringIndexSignature2
 >IWithStringIndexSignature1 : IWithStringIndexSignature1
 >IWithStringIndexSignature2 : IWithStringIndexSignature2
->{ z: a => a } : { [x: string]: (a: number) => number; z: (a: number) => number; }
+>{ z: a => a } : { z: (a: number) => number; }
 >z : (a: number) => number
 >a => a : (a: number) => number
 >a : number
@@ -124,7 +124,7 @@ var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 1: a => a }
 >x3 : IWithNoNumberIndexSignature | IWithNumberIndexSignature1
 >IWithNoNumberIndexSignature : IWithNoNumberIndexSignature
 >IWithNumberIndexSignature1 : IWithNumberIndexSignature1
->{ 1: a => a } : { [x: number]: (a: number) => number; 1: (a: number) => number; }
+>{ 1: a => a } : { 1: (a: number) => number; }
 >a => a : (a: number) => number
 >a : number
 >a : number
@@ -133,7 +133,7 @@ var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 0: a => a }
 >x3 : IWithNoNumberIndexSignature | IWithNumberIndexSignature1
 >IWithNoNumberIndexSignature : IWithNoNumberIndexSignature
 >IWithNumberIndexSignature1 : IWithNumberIndexSignature1
->{ 0: a => a } : { [x: number]: (a: any) => any; 0: (a: any) => any; }
+>{ 0: a => a } : { 0: (a: any) => any; }
 >a => a : (a: any) => any
 >a : any
 >a : any
@@ -142,14 +142,14 @@ var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 0: "hello"
 >x3 : IWithNoNumberIndexSignature | IWithNumberIndexSignature1
 >IWithNoNumberIndexSignature : IWithNoNumberIndexSignature
 >IWithNumberIndexSignature1 : IWithNumberIndexSignature1
->{ 0: "hello" } : { [x: number]: string; 0: string; }
+>{ 0: "hello" } : { 0: string; }
 >"hello" : string
 
 var x4: IWithNumberIndexSignature1 | IWithNumberIndexSignature2 = { 1: a => a.toString() }; // a should be number
 >x4 : IWithNumberIndexSignature1 | IWithNumberIndexSignature2
 >IWithNumberIndexSignature1 : IWithNumberIndexSignature1
 >IWithNumberIndexSignature2 : IWithNumberIndexSignature2
->{ 1: a => a.toString() } : { [x: number]: (a: number) => string; 1: (a: number) => string; }
+>{ 1: a => a.toString() } : { 1: (a: number) => string; }
 >a => a.toString() : (a: number) => string
 >a : number
 >a.toString() : string
@@ -161,7 +161,7 @@ var x4: IWithNumberIndexSignature1 | IWithNumberIndexSignature2 = { 1: a => a };
 >x4 : IWithNumberIndexSignature1 | IWithNumberIndexSignature2
 >IWithNumberIndexSignature1 : IWithNumberIndexSignature1
 >IWithNumberIndexSignature2 : IWithNumberIndexSignature2
->{ 1: a => a } : { [x: number]: (a: number) => number; 1: (a: number) => number; }
+>{ 1: a => a } : { 1: (a: number) => number; }
 >a => a : (a: number) => number
 >a : number
 >a : number
diff --git a/tests/baselines/reference/contextualTypeWithUnionTypeMembers.symbols b/tests/baselines/reference/contextualTypeWithUnionTypeMembers.symbols
index 5a0891c3b88..2b5eb35aa07 100644
--- a/tests/baselines/reference/contextualTypeWithUnionTypeMembers.symbols
+++ b/tests/baselines/reference/contextualTypeWithUnionTypeMembers.symbols
@@ -6,48 +6,48 @@ interface I1<T> {
 >T : Symbol(T, Decl(contextualTypeWithUnionTypeMembers.ts, 2, 13))
 
     commonMethodType(a: string): string;
->commonMethodType : Symbol(commonMethodType, Decl(contextualTypeWithUnionTypeMembers.ts, 2, 17))
+>commonMethodType : Symbol(I1.commonMethodType, Decl(contextualTypeWithUnionTypeMembers.ts, 2, 17))
 >a : Symbol(a, Decl(contextualTypeWithUnionTypeMembers.ts, 3, 21))
 
     commonPropertyType: string;
->commonPropertyType : Symbol(commonPropertyType, Decl(contextualTypeWithUnionTypeMembers.ts, 3, 40))
+>commonPropertyType : Symbol(I1.commonPropertyType, Decl(contextualTypeWithUnionTypeMembers.ts, 3, 40))
 
     commonMethodWithTypeParameter(a: T): T;
->commonMethodWithTypeParameter : Symbol(commonMethodWithTypeParameter, Decl(contextualTypeWithUnionTypeMembers.ts, 4, 31))
+>commonMethodWithTypeParameter : Symbol(I1.commonMethodWithTypeParameter, Decl(contextualTypeWithUnionTypeMembers.ts, 4, 31))
 >a : Symbol(a, Decl(contextualTypeWithUnionTypeMembers.ts, 5, 34))
 >T : Symbol(T, Decl(contextualTypeWithUnionTypeMembers.ts, 2, 13))
 >T : Symbol(T, Decl(contextualTypeWithUnionTypeMembers.ts, 2, 13))
 
     methodOnlyInI1(a: string): string;
->methodOnlyInI1 : Symbol(methodOnlyInI1, Decl(contextualTypeWithUnionTypeMembers.ts, 5, 43))
+>methodOnlyInI1 : Symbol(I1.methodOnlyInI1, Decl(contextualTypeWithUnionTypeMembers.ts, 5, 43))
 >a : Symbol(a, Decl(contextualTypeWithUnionTypeMembers.ts, 7, 19))
 
     propertyOnlyInI1: string;
->propertyOnlyInI1 : Symbol(propertyOnlyInI1, Decl(contextualTypeWithUnionTypeMembers.ts, 7, 38))
+>propertyOnlyInI1 : Symbol(I1.propertyOnlyInI1, Decl(contextualTypeWithUnionTypeMembers.ts, 7, 38))
 }
 interface I2<T> {
 >I2 : Symbol(I2, Decl(contextualTypeWithUnionTypeMembers.ts, 9, 1))
 >T : Symbol(T, Decl(contextualTypeWithUnionTypeMembers.ts, 10, 13))
 
     commonMethodType(a: string): string;
->commonMethodType : Symbol(commonMethodType, Decl(contextualTypeWithUnionTypeMembers.ts, 10, 17))
+>commonMethodType : Symbol(I2.commonMethodType, Decl(contextualTypeWithUnionTypeMembers.ts, 10, 17))
 >a : Symbol(a, Decl(contextualTypeWithUnionTypeMembers.ts, 11, 21))
 
     commonPropertyType: string;
->commonPropertyType : Symbol(commonPropertyType, Decl(contextualTypeWithUnionTypeMembers.ts, 11, 40))
+>commonPropertyType : Symbol(I2.commonPropertyType, Decl(contextualTypeWithUnionTypeMembers.ts, 11, 40))
 
     commonMethodWithTypeParameter(a: T): T;
->commonMethodWithTypeParameter : Symbol(commonMethodWithTypeParameter, Decl(contextualTypeWithUnionTypeMembers.ts, 12, 31))
+>commonMethodWithTypeParameter : Symbol(I2.commonMethodWithTypeParameter, Decl(contextualTypeWithUnionTypeMembers.ts, 12, 31))
 >a : Symbol(a, Decl(contextualTypeWithUnionTypeMembers.ts, 13, 34))
 >T : Symbol(T, Decl(contextualTypeWithUnionTypeMembers.ts, 10, 13))
 >T : Symbol(T, Decl(contextualTypeWithUnionTypeMembers.ts, 10, 13))
 
     methodOnlyInI2(a: string): string;
->methodOnlyInI2 : Symbol(methodOnlyInI2, Decl(contextualTypeWithUnionTypeMembers.ts, 13, 43))
+>methodOnlyInI2 : Symbol(I2.methodOnlyInI2, Decl(contextualTypeWithUnionTypeMembers.ts, 13, 43))
 >a : Symbol(a, Decl(contextualTypeWithUnionTypeMembers.ts, 15, 19))
 
     propertyOnlyInI2: string;
->propertyOnlyInI2 : Symbol(propertyOnlyInI2, Decl(contextualTypeWithUnionTypeMembers.ts, 15, 38))
+>propertyOnlyInI2 : Symbol(I2.propertyOnlyInI2, Decl(contextualTypeWithUnionTypeMembers.ts, 15, 38))
 }
 
 // Let S be the set of types in U that has a property P.
@@ -250,23 +250,23 @@ interface I11 {
 >I11 : Symbol(I11, Decl(contextualTypeWithUnionTypeMembers.ts, 74, 7))
 
     commonMethodDifferentReturnType(a: string, b: number): string;
->commonMethodDifferentReturnType : Symbol(commonMethodDifferentReturnType, Decl(contextualTypeWithUnionTypeMembers.ts, 76, 15))
+>commonMethodDifferentReturnType : Symbol(I11.commonMethodDifferentReturnType, Decl(contextualTypeWithUnionTypeMembers.ts, 76, 15))
 >a : Symbol(a, Decl(contextualTypeWithUnionTypeMembers.ts, 77, 36))
 >b : Symbol(b, Decl(contextualTypeWithUnionTypeMembers.ts, 77, 46))
 
     commonPropertyDifferentType: string;
->commonPropertyDifferentType : Symbol(commonPropertyDifferentType, Decl(contextualTypeWithUnionTypeMembers.ts, 77, 66))
+>commonPropertyDifferentType : Symbol(I11.commonPropertyDifferentType, Decl(contextualTypeWithUnionTypeMembers.ts, 77, 66))
 }
 interface I21 {
 >I21 : Symbol(I21, Decl(contextualTypeWithUnionTypeMembers.ts, 79, 1))
 
     commonMethodDifferentReturnType(a: string, b: number): number;
->commonMethodDifferentReturnType : Symbol(commonMethodDifferentReturnType, Decl(contextualTypeWithUnionTypeMembers.ts, 80, 15))
+>commonMethodDifferentReturnType : Symbol(I21.commonMethodDifferentReturnType, Decl(contextualTypeWithUnionTypeMembers.ts, 80, 15))
 >a : Symbol(a, Decl(contextualTypeWithUnionTypeMembers.ts, 81, 36))
 >b : Symbol(b, Decl(contextualTypeWithUnionTypeMembers.ts, 81, 46))
 
     commonPropertyDifferentType: number;
->commonPropertyDifferentType : Symbol(commonPropertyDifferentType, Decl(contextualTypeWithUnionTypeMembers.ts, 81, 66))
+>commonPropertyDifferentType : Symbol(I21.commonPropertyDifferentType, Decl(contextualTypeWithUnionTypeMembers.ts, 81, 66))
 }
 var i11: I11;
 >i11 : Symbol(i11, Decl(contextualTypeWithUnionTypeMembers.ts, 84, 3))
diff --git a/tests/baselines/reference/contextualTyping10.symbols b/tests/baselines/reference/contextualTyping10.symbols
index 130116264e0..33e40d73bff 100644
--- a/tests/baselines/reference/contextualTyping10.symbols
+++ b/tests/baselines/reference/contextualTyping10.symbols
@@ -1,7 +1,7 @@
 === tests/cases/compiler/contextualTyping10.ts ===
 class foo { public bar:{id:number;}[] = [{id:1}, {id:2}]; }
 >foo : Symbol(foo, Decl(contextualTyping10.ts, 0, 0))
->bar : Symbol(bar, Decl(contextualTyping10.ts, 0, 11))
+>bar : Symbol(foo.bar, Decl(contextualTyping10.ts, 0, 11))
 >id : Symbol(id, Decl(contextualTyping10.ts, 0, 24))
 >id : Symbol(id, Decl(contextualTyping10.ts, 0, 42))
 >id : Symbol(id, Decl(contextualTyping10.ts, 0, 50))
diff --git a/tests/baselines/reference/contextualTyping14.symbols b/tests/baselines/reference/contextualTyping14.symbols
index 7de67445ca8..1480db7d2cd 100644
--- a/tests/baselines/reference/contextualTyping14.symbols
+++ b/tests/baselines/reference/contextualTyping14.symbols
@@ -1,7 +1,7 @@
 === tests/cases/compiler/contextualTyping14.ts ===
 class foo { public bar:(a:number)=>number = function(a){return a}; }
 >foo : Symbol(foo, Decl(contextualTyping14.ts, 0, 0))
->bar : Symbol(bar, Decl(contextualTyping14.ts, 0, 11))
+>bar : Symbol(foo.bar, Decl(contextualTyping14.ts, 0, 11))
 >a : Symbol(a, Decl(contextualTyping14.ts, 0, 24))
 >a : Symbol(a, Decl(contextualTyping14.ts, 0, 53))
 >a : Symbol(a, Decl(contextualTyping14.ts, 0, 53))
diff --git a/tests/baselines/reference/contextualTyping15.symbols b/tests/baselines/reference/contextualTyping15.symbols
index 902fb03dc70..f2ba2bf6768 100644
--- a/tests/baselines/reference/contextualTyping15.symbols
+++ b/tests/baselines/reference/contextualTyping15.symbols
@@ -1,6 +1,6 @@
 === tests/cases/compiler/contextualTyping15.ts ===
 class foo { public bar: { (): number; (i: number): number; } = function() { return 1 }; }
 >foo : Symbol(foo, Decl(contextualTyping15.ts, 0, 0))
->bar : Symbol(bar, Decl(contextualTyping15.ts, 0, 11))
+>bar : Symbol(foo.bar, Decl(contextualTyping15.ts, 0, 11))
 >i : Symbol(i, Decl(contextualTyping15.ts, 0, 39))
 
diff --git a/tests/baselines/reference/contextualTyping24.errors.txt b/tests/baselines/reference/contextualTyping24.errors.txt
index a172600e1c5..ea973050625 100644
--- a/tests/baselines/reference/contextualTyping24.errors.txt
+++ b/tests/baselines/reference/contextualTyping24.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/compiler/contextualTyping24.ts(1,55): error TS2322: Type '(a: string) => number' is not assignable to type '(a: { (): number; (i: number): number; }) => number'.
+tests/cases/compiler/contextualTyping24.ts(1,55): error TS2322: Type '(this: void, a: string) => number' is not assignable to type '(a: { (): number; (i: number): number; }) => number'.
   Types of parameters 'a' and 'a' are incompatible.
-    Type 'string' is not assignable to type '{ (): number; (i: number): number; }'.
+    Type '{ (): number; (i: number): number; }' is not assignable to type 'string'.
 
 
 ==== tests/cases/compiler/contextualTyping24.ts (1 errors) ====
-    var foo:(a:{():number; (i:number):number; })=>number; foo = function(a:string){return 5};
+    var foo:(a:{():number; (i:number):number; })=>number; foo = function(this: void, a:string){return 5};
                                                           ~~~
-!!! error TS2322: Type '(a: string) => number' is not assignable to type '(a: { (): number; (i: number): number; }) => number'.
+!!! error TS2322: Type '(this: void, a: string) => number' is not assignable to type '(a: { (): number; (i: number): number; }) => number'.
 !!! error TS2322:   Types of parameters 'a' and 'a' are incompatible.
-!!! error TS2322:     Type 'string' is not assignable to type '{ (): number; (i: number): number; }'.
\ No newline at end of file
+!!! error TS2322:     Type '{ (): number; (i: number): number; }' is not assignable to type 'string'.
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTyping24.js b/tests/baselines/reference/contextualTyping24.js
index 04c4ecba21b..14c1feeb031 100644
--- a/tests/baselines/reference/contextualTyping24.js
+++ b/tests/baselines/reference/contextualTyping24.js
@@ -1,5 +1,5 @@
 //// [contextualTyping24.ts]
-var foo:(a:{():number; (i:number):number; })=>number; foo = function(a:string){return 5};
+var foo:(a:{():number; (i:number):number; })=>number; foo = function(this: void, a:string){return 5};
 
 //// [contextualTyping24.js]
 var foo;
diff --git a/tests/baselines/reference/contextualTyping3.symbols b/tests/baselines/reference/contextualTyping3.symbols
index 584c399e4da..f685e0a0690 100644
--- a/tests/baselines/reference/contextualTyping3.symbols
+++ b/tests/baselines/reference/contextualTyping3.symbols
@@ -1,7 +1,7 @@
 === tests/cases/compiler/contextualTyping3.ts ===
 class foo { public bar:{id:number;} = {id:5}; }
 >foo : Symbol(foo, Decl(contextualTyping3.ts, 0, 0))
->bar : Symbol(bar, Decl(contextualTyping3.ts, 0, 11))
+>bar : Symbol(foo.bar, Decl(contextualTyping3.ts, 0, 11))
 >id : Symbol(id, Decl(contextualTyping3.ts, 0, 24))
 >id : Symbol(id, Decl(contextualTyping3.ts, 0, 39))
 
diff --git a/tests/baselines/reference/contextualTyping39.errors.txt b/tests/baselines/reference/contextualTyping39.errors.txt
index e43624fbead..9081480f4ba 100644
--- a/tests/baselines/reference/contextualTyping39.errors.txt
+++ b/tests/baselines/reference/contextualTyping39.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/compiler/contextualTyping39.ts(1,11): error TS2352: Neither type '() => string' nor type '() => number' is assignable to the other.
-  Type 'string' is not assignable to type 'number'.
+tests/cases/compiler/contextualTyping39.ts(1,11): error TS2352: Type '() => string' cannot be converted to type '() => number'.
+  Type 'string' is not comparable to type 'number'.
 
 
 ==== tests/cases/compiler/contextualTyping39.ts (1 errors) ====
     var foo = <{ (): number; }> function() { return "err"; };
               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Neither type '() => string' nor type '() => number' is assignable to the other.
-!!! error TS2352:   Type 'string' is not assignable to type 'number'.
\ No newline at end of file
+!!! error TS2352: Type '() => string' cannot be converted to type '() => number'.
+!!! error TS2352:   Type 'string' is not comparable to type 'number'.
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTyping41.errors.txt b/tests/baselines/reference/contextualTyping41.errors.txt
index 1ed6da1b782..418d435e7fe 100644
--- a/tests/baselines/reference/contextualTyping41.errors.txt
+++ b/tests/baselines/reference/contextualTyping41.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/compiler/contextualTyping41.ts(1,11): error TS2352: Neither type '() => string' nor type '{ (): number; (i: number): number; }' is assignable to the other.
-  Type 'string' is not assignable to type 'number'.
+tests/cases/compiler/contextualTyping41.ts(1,11): error TS2352: Type '() => string' cannot be converted to type '{ (): number; (i: number): number; }'.
+  Type 'string' is not comparable to type 'number'.
 
 
 ==== tests/cases/compiler/contextualTyping41.ts (1 errors) ====
     var foo = <{():number; (i:number):number; }> (function(){return "err";});
               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Neither type '() => string' nor type '{ (): number; (i: number): number; }' is assignable to the other.
-!!! error TS2352:   Type 'string' is not assignable to type 'number'.
\ No newline at end of file
+!!! error TS2352: Type '() => string' cannot be converted to type '{ (): number; (i: number): number; }'.
+!!! error TS2352:   Type 'string' is not comparable to type 'number'.
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTypingArrayOfLambdas.symbols b/tests/baselines/reference/contextualTypingArrayOfLambdas.symbols
index 79355e0a7c6..b049c498f11 100644
--- a/tests/baselines/reference/contextualTypingArrayOfLambdas.symbols
+++ b/tests/baselines/reference/contextualTypingArrayOfLambdas.symbols
@@ -3,7 +3,7 @@ class A {
 >A : Symbol(A, Decl(contextualTypingArrayOfLambdas.ts, 0, 0))
 
     foo: string;
->foo : Symbol(foo, Decl(contextualTypingArrayOfLambdas.ts, 0, 9))
+>foo : Symbol(A.foo, Decl(contextualTypingArrayOfLambdas.ts, 0, 9))
 }
 
 class B extends A {
@@ -11,7 +11,7 @@ class B extends A {
 >A : Symbol(A, Decl(contextualTypingArrayOfLambdas.ts, 0, 0))
 
     bar: string;
->bar : Symbol(bar, Decl(contextualTypingArrayOfLambdas.ts, 4, 19))
+>bar : Symbol(B.bar, Decl(contextualTypingArrayOfLambdas.ts, 4, 19))
 }
 
 class C extends A {
@@ -19,7 +19,7 @@ class C extends A {
 >A : Symbol(A, Decl(contextualTypingArrayOfLambdas.ts, 0, 0))
 
     baz: string;
->baz : Symbol(baz, Decl(contextualTypingArrayOfLambdas.ts, 8, 19))
+>baz : Symbol(C.baz, Decl(contextualTypingArrayOfLambdas.ts, 8, 19))
 }
 
 var xs = [(x: A) => { }, (x: B) => { }, (x: C) => { }];
diff --git a/tests/baselines/reference/contextualTypingOfConditionalExpression.symbols b/tests/baselines/reference/contextualTypingOfConditionalExpression.symbols
index 1f8ad9f9c68..c0bd5e51561 100644
--- a/tests/baselines/reference/contextualTypingOfConditionalExpression.symbols
+++ b/tests/baselines/reference/contextualTypingOfConditionalExpression.symbols
@@ -15,21 +15,21 @@ class A {
 >A : Symbol(A, Decl(contextualTypingOfConditionalExpression.ts, 0, 82))
 
     foo: number;
->foo : Symbol(foo, Decl(contextualTypingOfConditionalExpression.ts, 2, 9))
+>foo : Symbol(A.foo, Decl(contextualTypingOfConditionalExpression.ts, 2, 9))
 }
 class B extends A {
 >B : Symbol(B, Decl(contextualTypingOfConditionalExpression.ts, 4, 1))
 >A : Symbol(A, Decl(contextualTypingOfConditionalExpression.ts, 0, 82))
 
     bar: number;
->bar : Symbol(bar, Decl(contextualTypingOfConditionalExpression.ts, 5, 19))
+>bar : Symbol(B.bar, Decl(contextualTypingOfConditionalExpression.ts, 5, 19))
 }
 class C extends A {
 >C : Symbol(C, Decl(contextualTypingOfConditionalExpression.ts, 7, 1))
 >A : Symbol(A, Decl(contextualTypingOfConditionalExpression.ts, 0, 82))
 
     baz: number;
->baz : Symbol(baz, Decl(contextualTypingOfConditionalExpression.ts, 8, 19))
+>baz : Symbol(C.baz, Decl(contextualTypingOfConditionalExpression.ts, 8, 19))
 }
 
 var x2: (a: A) => void = true ? (a) => a.foo : (b) => b.foo;
diff --git a/tests/baselines/reference/contextualTypingOfConditionalExpression2.errors.txt b/tests/baselines/reference/contextualTypingOfConditionalExpression2.errors.txt
index be49b7b5249..4f2adf9921e 100644
--- a/tests/baselines/reference/contextualTypingOfConditionalExpression2.errors.txt
+++ b/tests/baselines/reference/contextualTypingOfConditionalExpression2.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/contextualTypingOfConditionalExpression2.ts(11,5): error TS2322: Type '((a: C) => number) | ((b: number) => void)' is not assignable to type '(a: A) => void'.
   Type '(b: number) => void' is not assignable to type '(a: A) => void'.
     Types of parameters 'b' and 'a' are incompatible.
-      Type 'number' is not assignable to type 'A'.
+      Type 'A' is not assignable to type 'number'.
 
 
 ==== tests/cases/compiler/contextualTypingOfConditionalExpression2.ts (1 errors) ====
@@ -20,5 +20,5 @@ tests/cases/compiler/contextualTypingOfConditionalExpression2.ts(11,5): error TS
 !!! error TS2322: Type '((a: C) => number) | ((b: number) => void)' is not assignable to type '(a: A) => void'.
 !!! error TS2322:   Type '(b: number) => void' is not assignable to type '(a: A) => void'.
 !!! error TS2322:     Types of parameters 'b' and 'a' are incompatible.
-!!! error TS2322:       Type 'number' is not assignable to type 'A'.
+!!! error TS2322:       Type 'A' is not assignable to type 'number'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTypingOfLambdaWithMultipleSignatures.symbols b/tests/baselines/reference/contextualTypingOfLambdaWithMultipleSignatures.symbols
index 3a0c8e5db97..a7a2730456a 100644
--- a/tests/baselines/reference/contextualTypingOfLambdaWithMultipleSignatures.symbols
+++ b/tests/baselines/reference/contextualTypingOfLambdaWithMultipleSignatures.symbols
@@ -3,11 +3,11 @@ interface Foo {
 >Foo : Symbol(Foo, Decl(contextualTypingOfLambdaWithMultipleSignatures.ts, 0, 0))
 
     getFoo(n: number): void;
->getFoo : Symbol(getFoo, Decl(contextualTypingOfLambdaWithMultipleSignatures.ts, 0, 15), Decl(contextualTypingOfLambdaWithMultipleSignatures.ts, 1, 28))
+>getFoo : Symbol(Foo.getFoo, Decl(contextualTypingOfLambdaWithMultipleSignatures.ts, 0, 15), Decl(contextualTypingOfLambdaWithMultipleSignatures.ts, 1, 28))
 >n : Symbol(n, Decl(contextualTypingOfLambdaWithMultipleSignatures.ts, 1, 11))
 
     getFoo(s: string): void;
->getFoo : Symbol(getFoo, Decl(contextualTypingOfLambdaWithMultipleSignatures.ts, 0, 15), Decl(contextualTypingOfLambdaWithMultipleSignatures.ts, 1, 28))
+>getFoo : Symbol(Foo.getFoo, Decl(contextualTypingOfLambdaWithMultipleSignatures.ts, 0, 15), Decl(contextualTypingOfLambdaWithMultipleSignatures.ts, 1, 28))
 >s : Symbol(s, Decl(contextualTypingOfLambdaWithMultipleSignatures.ts, 2, 11))
 }
 
diff --git a/tests/baselines/reference/contextualTypingOfObjectLiterals.errors.txt b/tests/baselines/reference/contextualTypingOfObjectLiterals.errors.txt
deleted file mode 100644
index ac8063a4378..00000000000
--- a/tests/baselines/reference/contextualTypingOfObjectLiterals.errors.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-tests/cases/compiler/contextualTypingOfObjectLiterals.ts(4,1): error TS2322: Type '{ x: string; }' is not assignable to type '{ [x: string]: string; }'.
-  Index signature is missing in type '{ x: string; }'.
-tests/cases/compiler/contextualTypingOfObjectLiterals.ts(10,3): error TS2345: Argument of type '{ x: string; }' is not assignable to parameter of type '{ [s: string]: string; }'.
-  Index signature is missing in type '{ x: string; }'.
-
-
-==== tests/cases/compiler/contextualTypingOfObjectLiterals.ts (2 errors) ====
-    var obj1: { [x: string]: string; };
-    var obj2 = {x: ""};
-    obj1 = {}; // Ok
-    obj1 = obj2; // Error - indexer doesn't match
-    ~~~~
-!!! error TS2322: Type '{ x: string; }' is not assignable to type '{ [x: string]: string; }'.
-!!! error TS2322:   Index signature is missing in type '{ x: string; }'.
-    
-    function f(x: { [s: string]: string }) { }
-    
-    f({}); // Ok
-    f(obj1); // Ok
-    f(obj2); // Error - indexer doesn't match
-      ~~~~
-!!! error TS2345: Argument of type '{ x: string; }' is not assignable to parameter of type '{ [s: string]: string; }'.
-!!! error TS2345:   Index signature is missing in type '{ x: string; }'.
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTypingOfObjectLiterals.symbols b/tests/baselines/reference/contextualTypingOfObjectLiterals.symbols
new file mode 100644
index 00000000000..afa34cfe481
--- /dev/null
+++ b/tests/baselines/reference/contextualTypingOfObjectLiterals.symbols
@@ -0,0 +1,32 @@
+=== tests/cases/compiler/contextualTypingOfObjectLiterals.ts ===
+var obj1: { [x: string]: string; };
+>obj1 : Symbol(obj1, Decl(contextualTypingOfObjectLiterals.ts, 0, 3))
+>x : Symbol(x, Decl(contextualTypingOfObjectLiterals.ts, 0, 13))
+
+var obj2 = {x: ""};
+>obj2 : Symbol(obj2, Decl(contextualTypingOfObjectLiterals.ts, 1, 3))
+>x : Symbol(x, Decl(contextualTypingOfObjectLiterals.ts, 1, 12))
+
+obj1 = {}; // Ok
+>obj1 : Symbol(obj1, Decl(contextualTypingOfObjectLiterals.ts, 0, 3))
+
+obj1 = obj2; // Error - indexer doesn't match
+>obj1 : Symbol(obj1, Decl(contextualTypingOfObjectLiterals.ts, 0, 3))
+>obj2 : Symbol(obj2, Decl(contextualTypingOfObjectLiterals.ts, 1, 3))
+
+function f(x: { [s: string]: string }) { }
+>f : Symbol(f, Decl(contextualTypingOfObjectLiterals.ts, 3, 12))
+>x : Symbol(x, Decl(contextualTypingOfObjectLiterals.ts, 5, 11))
+>s : Symbol(s, Decl(contextualTypingOfObjectLiterals.ts, 5, 17))
+
+f({}); // Ok
+>f : Symbol(f, Decl(contextualTypingOfObjectLiterals.ts, 3, 12))
+
+f(obj1); // Ok
+>f : Symbol(f, Decl(contextualTypingOfObjectLiterals.ts, 3, 12))
+>obj1 : Symbol(obj1, Decl(contextualTypingOfObjectLiterals.ts, 0, 3))
+
+f(obj2); // Error - indexer doesn't match
+>f : Symbol(f, Decl(contextualTypingOfObjectLiterals.ts, 3, 12))
+>obj2 : Symbol(obj2, Decl(contextualTypingOfObjectLiterals.ts, 1, 3))
+
diff --git a/tests/baselines/reference/contextualTypingOfObjectLiterals.types b/tests/baselines/reference/contextualTypingOfObjectLiterals.types
new file mode 100644
index 00000000000..a99fb2f39af
--- /dev/null
+++ b/tests/baselines/reference/contextualTypingOfObjectLiterals.types
@@ -0,0 +1,41 @@
+=== tests/cases/compiler/contextualTypingOfObjectLiterals.ts ===
+var obj1: { [x: string]: string; };
+>obj1 : { [x: string]: string; }
+>x : string
+
+var obj2 = {x: ""};
+>obj2 : { x: string; }
+>{x: ""} : { x: string; }
+>x : string
+>"" : string
+
+obj1 = {}; // Ok
+>obj1 = {} : {}
+>obj1 : { [x: string]: string; }
+>{} : {}
+
+obj1 = obj2; // Error - indexer doesn't match
+>obj1 = obj2 : { x: string; }
+>obj1 : { [x: string]: string; }
+>obj2 : { x: string; }
+
+function f(x: { [s: string]: string }) { }
+>f : (x: { [s: string]: string; }) => void
+>x : { [s: string]: string; }
+>s : string
+
+f({}); // Ok
+>f({}) : void
+>f : (x: { [s: string]: string; }) => void
+>{} : {}
+
+f(obj1); // Ok
+>f(obj1) : void
+>f : (x: { [s: string]: string; }) => void
+>obj1 : { [x: string]: string; }
+
+f(obj2); // Error - indexer doesn't match
+>f(obj2) : void
+>f : (x: { [s: string]: string; }) => void
+>obj2 : { x: string; }
+
diff --git a/tests/baselines/reference/contextuallyTypedBindingInitializer.js b/tests/baselines/reference/contextuallyTypedBindingInitializer.js
new file mode 100644
index 00000000000..f2424ce55d7
--- /dev/null
+++ b/tests/baselines/reference/contextuallyTypedBindingInitializer.js
@@ -0,0 +1,51 @@
+//// [contextuallyTypedBindingInitializer.ts]
+interface Show {
+    show: (x: number) => string;
+}
+function f({ show = v => v.toString() }: Show) {}
+function f2({ "show": showRename = v => v.toString() }: Show) {}
+function f3({ ["show"]: showRename = v => v.toString() }: Show) {}
+
+interface Nested {
+    nested: Show
+}
+function ff({ nested = { show: v => v.toString() } }: Nested) {}
+
+interface Tuples {
+    prop: [string, number];
+}
+function g({ prop = ["hello", 1234] }: Tuples) {}
+
+interface StringUnion {
+    prop: "foo" | "bar";
+}
+function h({ prop = "foo" }: StringUnion) {}
+
+interface StringIdentity {
+    stringIdentity(s: string): string;
+}
+let { stringIdentity: id = arg => arg }: StringIdentity = { stringIdentity: x => x};
+
+
+
+
+//// [contextuallyTypedBindingInitializer.js]
+function f(_a) {
+    var _b = _a.show, show = _b === void 0 ? function (v) { return v.toString(); } : _b;
+}
+function f2(_a) {
+    var _b = _a["show"], showRename = _b === void 0 ? function (v) { return v.toString(); } : _b;
+}
+function f3(_a) {
+    var _b = "show", _c = _a[_b], showRename = _c === void 0 ? function (v) { return v.toString(); } : _c;
+}
+function ff(_a) {
+    var _b = _a.nested, nested = _b === void 0 ? { show: function (v) { return v.toString(); } } : _b;
+}
+function g(_a) {
+    var _b = _a.prop, prop = _b === void 0 ? ["hello", 1234] : _b;
+}
+function h(_a) {
+    var _b = _a.prop, prop = _b === void 0 ? "foo" : _b;
+}
+var _a = { stringIdentity: function (x) { return x; } }.stringIdentity, id = _a === void 0 ? function (arg) { return arg; } : _a;
diff --git a/tests/baselines/reference/contextuallyTypedBindingInitializer.symbols b/tests/baselines/reference/contextuallyTypedBindingInitializer.symbols
new file mode 100644
index 00000000000..8a3b4cc79c2
--- /dev/null
+++ b/tests/baselines/reference/contextuallyTypedBindingInitializer.symbols
@@ -0,0 +1,93 @@
+=== tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializer.ts ===
+interface Show {
+>Show : Symbol(Show, Decl(contextuallyTypedBindingInitializer.ts, 0, 0))
+
+    show: (x: number) => string;
+>show : Symbol(Show.show, Decl(contextuallyTypedBindingInitializer.ts, 0, 16))
+>x : Symbol(x, Decl(contextuallyTypedBindingInitializer.ts, 1, 11))
+}
+function f({ show = v => v.toString() }: Show) {}
+>f : Symbol(f, Decl(contextuallyTypedBindingInitializer.ts, 2, 1))
+>show : Symbol(show, Decl(contextuallyTypedBindingInitializer.ts, 3, 12))
+>v : Symbol(v, Decl(contextuallyTypedBindingInitializer.ts, 3, 19))
+>v.toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+>v : Symbol(v, Decl(contextuallyTypedBindingInitializer.ts, 3, 19))
+>toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+>Show : Symbol(Show, Decl(contextuallyTypedBindingInitializer.ts, 0, 0))
+
+function f2({ "show": showRename = v => v.toString() }: Show) {}
+>f2 : Symbol(f2, Decl(contextuallyTypedBindingInitializer.ts, 3, 49))
+>showRename : Symbol(showRename, Decl(contextuallyTypedBindingInitializer.ts, 4, 13))
+>v : Symbol(v, Decl(contextuallyTypedBindingInitializer.ts, 4, 34))
+>v.toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+>v : Symbol(v, Decl(contextuallyTypedBindingInitializer.ts, 4, 34))
+>toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+>Show : Symbol(Show, Decl(contextuallyTypedBindingInitializer.ts, 0, 0))
+
+function f3({ ["show"]: showRename = v => v.toString() }: Show) {}
+>f3 : Symbol(f3, Decl(contextuallyTypedBindingInitializer.ts, 4, 64))
+>showRename : Symbol(showRename, Decl(contextuallyTypedBindingInitializer.ts, 5, 13))
+>v : Symbol(v, Decl(contextuallyTypedBindingInitializer.ts, 5, 36))
+>v.toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+>v : Symbol(v, Decl(contextuallyTypedBindingInitializer.ts, 5, 36))
+>toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+>Show : Symbol(Show, Decl(contextuallyTypedBindingInitializer.ts, 0, 0))
+
+interface Nested {
+>Nested : Symbol(Nested, Decl(contextuallyTypedBindingInitializer.ts, 5, 66))
+
+    nested: Show
+>nested : Symbol(Nested.nested, Decl(contextuallyTypedBindingInitializer.ts, 7, 18))
+>Show : Symbol(Show, Decl(contextuallyTypedBindingInitializer.ts, 0, 0))
+}
+function ff({ nested = { show: v => v.toString() } }: Nested) {}
+>ff : Symbol(ff, Decl(contextuallyTypedBindingInitializer.ts, 9, 1))
+>nested : Symbol(nested, Decl(contextuallyTypedBindingInitializer.ts, 10, 13))
+>show : Symbol(show, Decl(contextuallyTypedBindingInitializer.ts, 10, 24))
+>v : Symbol(v, Decl(contextuallyTypedBindingInitializer.ts, 10, 30))
+>v.toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+>v : Symbol(v, Decl(contextuallyTypedBindingInitializer.ts, 10, 30))
+>toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+>Nested : Symbol(Nested, Decl(contextuallyTypedBindingInitializer.ts, 5, 66))
+
+interface Tuples {
+>Tuples : Symbol(Tuples, Decl(contextuallyTypedBindingInitializer.ts, 10, 64))
+
+    prop: [string, number];
+>prop : Symbol(Tuples.prop, Decl(contextuallyTypedBindingInitializer.ts, 12, 18))
+}
+function g({ prop = ["hello", 1234] }: Tuples) {}
+>g : Symbol(g, Decl(contextuallyTypedBindingInitializer.ts, 14, 1))
+>prop : Symbol(prop, Decl(contextuallyTypedBindingInitializer.ts, 15, 12))
+>Tuples : Symbol(Tuples, Decl(contextuallyTypedBindingInitializer.ts, 10, 64))
+
+interface StringUnion {
+>StringUnion : Symbol(StringUnion, Decl(contextuallyTypedBindingInitializer.ts, 15, 49))
+
+    prop: "foo" | "bar";
+>prop : Symbol(StringUnion.prop, Decl(contextuallyTypedBindingInitializer.ts, 17, 23))
+}
+function h({ prop = "foo" }: StringUnion) {}
+>h : Symbol(h, Decl(contextuallyTypedBindingInitializer.ts, 19, 1))
+>prop : Symbol(prop, Decl(contextuallyTypedBindingInitializer.ts, 20, 12))
+>StringUnion : Symbol(StringUnion, Decl(contextuallyTypedBindingInitializer.ts, 15, 49))
+
+interface StringIdentity {
+>StringIdentity : Symbol(StringIdentity, Decl(contextuallyTypedBindingInitializer.ts, 20, 44))
+
+    stringIdentity(s: string): string;
+>stringIdentity : Symbol(StringIdentity.stringIdentity, Decl(contextuallyTypedBindingInitializer.ts, 22, 26))
+>s : Symbol(s, Decl(contextuallyTypedBindingInitializer.ts, 23, 19))
+}
+let { stringIdentity: id = arg => arg }: StringIdentity = { stringIdentity: x => x};
+>stringIdentity : Symbol(StringIdentity.stringIdentity, Decl(contextuallyTypedBindingInitializer.ts, 22, 26))
+>id : Symbol(id, Decl(contextuallyTypedBindingInitializer.ts, 25, 5))
+>arg : Symbol(arg, Decl(contextuallyTypedBindingInitializer.ts, 25, 26))
+>arg : Symbol(arg, Decl(contextuallyTypedBindingInitializer.ts, 25, 26))
+>StringIdentity : Symbol(StringIdentity, Decl(contextuallyTypedBindingInitializer.ts, 20, 44))
+>stringIdentity : Symbol(stringIdentity, Decl(contextuallyTypedBindingInitializer.ts, 25, 59))
+>x : Symbol(x, Decl(contextuallyTypedBindingInitializer.ts, 25, 75))
+>x : Symbol(x, Decl(contextuallyTypedBindingInitializer.ts, 25, 75))
+
+
+
diff --git a/tests/baselines/reference/contextuallyTypedBindingInitializer.types b/tests/baselines/reference/contextuallyTypedBindingInitializer.types
new file mode 100644
index 00000000000..0d4dfcdd5d9
--- /dev/null
+++ b/tests/baselines/reference/contextuallyTypedBindingInitializer.types
@@ -0,0 +1,110 @@
+=== tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializer.ts ===
+interface Show {
+>Show : Show
+
+    show: (x: number) => string;
+>show : (x: number) => string
+>x : number
+}
+function f({ show = v => v.toString() }: Show) {}
+>f : ({show}: Show) => void
+>show : (x: number) => string
+>v => v.toString() : (v: number) => string
+>v : number
+>v.toString() : string
+>v.toString : (radix?: number) => string
+>v : number
+>toString : (radix?: number) => string
+>Show : Show
+
+function f2({ "show": showRename = v => v.toString() }: Show) {}
+>f2 : ({"show": showRename}: Show) => void
+>showRename : (x: number) => string
+>v => v.toString() : (v: number) => string
+>v : number
+>v.toString() : string
+>v.toString : (radix?: number) => string
+>v : number
+>toString : (radix?: number) => string
+>Show : Show
+
+function f3({ ["show"]: showRename = v => v.toString() }: Show) {}
+>f3 : ({["show"]: showRename}: Show) => void
+>"show" : string
+>showRename : (x: number) => string
+>v => v.toString() : (v: number) => string
+>v : number
+>v.toString() : string
+>v.toString : (radix?: number) => string
+>v : number
+>toString : (radix?: number) => string
+>Show : Show
+
+interface Nested {
+>Nested : Nested
+
+    nested: Show
+>nested : Show
+>Show : Show
+}
+function ff({ nested = { show: v => v.toString() } }: Nested) {}
+>ff : ({nested}: Nested) => void
+>nested : Show
+>{ show: v => v.toString() } : { show: (v: number) => string; }
+>show : (v: number) => string
+>v => v.toString() : (v: number) => string
+>v : number
+>v.toString() : string
+>v.toString : (radix?: number) => string
+>v : number
+>toString : (radix?: number) => string
+>Nested : Nested
+
+interface Tuples {
+>Tuples : Tuples
+
+    prop: [string, number];
+>prop : [string, number]
+}
+function g({ prop = ["hello", 1234] }: Tuples) {}
+>g : ({prop}: Tuples) => void
+>prop : [string, number]
+>["hello", 1234] : [string, number]
+>"hello" : string
+>1234 : number
+>Tuples : Tuples
+
+interface StringUnion {
+>StringUnion : StringUnion
+
+    prop: "foo" | "bar";
+>prop : "foo" | "bar"
+}
+function h({ prop = "foo" }: StringUnion) {}
+>h : ({prop}: StringUnion) => void
+>prop : "foo" | "bar"
+>"foo" : "foo"
+>StringUnion : StringUnion
+
+interface StringIdentity {
+>StringIdentity : StringIdentity
+
+    stringIdentity(s: string): string;
+>stringIdentity : (s: string) => string
+>s : string
+}
+let { stringIdentity: id = arg => arg }: StringIdentity = { stringIdentity: x => x};
+>stringIdentity : any
+>id : (s: string) => string
+>arg => arg : (arg: string) => string
+>arg : string
+>arg : string
+>StringIdentity : StringIdentity
+>{ stringIdentity: x => x} : { stringIdentity: (x: string) => string; }
+>stringIdentity : (x: string) => string
+>x => x : (x: string) => string
+>x : string
+>x : string
+
+
+
diff --git a/tests/baselines/reference/contextuallyTypedBindingInitializerNegative.errors.txt b/tests/baselines/reference/contextuallyTypedBindingInitializerNegative.errors.txt
new file mode 100644
index 00000000000..42d617887e0
--- /dev/null
+++ b/tests/baselines/reference/contextuallyTypedBindingInitializerNegative.errors.txt
@@ -0,0 +1,69 @@
+tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts(4,20): error TS2322: Type '(v: number) => number' is not assignable to type '(x: number) => string'.
+  Type 'number' is not assignable to type 'string'.
+tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts(5,23): error TS2322: Type '(v: number) => number' is not assignable to type '(x: number) => string'.
+  Type 'number' is not assignable to type 'string'.
+tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts(6,25): error TS2322: Type '(v: number) => number' is not assignable to type '(x: number) => string'.
+  Type 'number' is not assignable to type 'string'.
+tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts(11,23): error TS2322: Type '{ show: (v: number) => number; }' is not assignable to type 'Show'.
+  Types of property 'show' are incompatible.
+    Type '(v: number) => number' is not assignable to type '(x: number) => string'.
+      Type 'number' is not assignable to type 'string'.
+tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts(16,23): error TS2322: Type '(arg: string) => number' is not assignable to type '(s: string) => string'.
+  Type 'number' is not assignable to type 'string'.
+tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts(21,14): error TS2322: Type '[number, number]' is not assignable to type '[string, number]'.
+  Types of property '0' are incompatible.
+    Type 'number' is not assignable to type 'string'.
+tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts(26,14): error TS2322: Type '"baz"' is not assignable to type '"foo" | "bar"'.
+
+
+==== tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts (7 errors) ====
+    interface Show {
+        show: (x: number) => string;
+    }
+    function f({ show: showRename = v => v }: Show) {}
+                       ~~~~~~~~~~
+!!! error TS2322: Type '(v: number) => number' is not assignable to type '(x: number) => string'.
+!!! error TS2322:   Type 'number' is not assignable to type 'string'.
+    function f2({ "show": showRename = v => v }: Show) {}
+                          ~~~~~~~~~~
+!!! error TS2322: Type '(v: number) => number' is not assignable to type '(x: number) => string'.
+!!! error TS2322:   Type 'number' is not assignable to type 'string'.
+    function f3({ ["show"]: showRename = v => v }: Show) {}
+                            ~~~~~~~~~~
+!!! error TS2322: Type '(v: number) => number' is not assignable to type '(x: number) => string'.
+!!! error TS2322:   Type 'number' is not assignable to type 'string'.
+    
+    interface Nested {
+        nested: Show
+    }
+    function ff({ nested: nestedRename = { show: v => v } }: Nested) {}
+                          ~~~~~~~~~~~~
+!!! error TS2322: Type '{ show: (v: number) => number; }' is not assignable to type 'Show'.
+!!! error TS2322:   Types of property 'show' are incompatible.
+!!! error TS2322:     Type '(v: number) => number' is not assignable to type '(x: number) => string'.
+!!! error TS2322:       Type 'number' is not assignable to type 'string'.
+    
+    interface StringIdentity {
+        stringIdentity(s: string): string;
+    }
+    let { stringIdentity: id = arg => arg.length }: StringIdentity = { stringIdentity: x => x};
+                          ~~
+!!! error TS2322: Type '(arg: string) => number' is not assignable to type '(s: string) => string'.
+!!! error TS2322:   Type 'number' is not assignable to type 'string'.
+    
+    interface Tuples {
+        prop: [string, number];
+    }
+    function g({ prop = [101, 1234] }: Tuples) {}
+                 ~~~~
+!!! error TS2322: Type '[number, number]' is not assignable to type '[string, number]'.
+!!! error TS2322:   Types of property '0' are incompatible.
+!!! error TS2322:     Type 'number' is not assignable to type 'string'.
+    
+    interface StringUnion {
+        prop: "foo" | "bar";
+    }
+    function h({ prop = "baz" }: StringUnion) {}
+                 ~~~~
+!!! error TS2322: Type '"baz"' is not assignable to type '"foo" | "bar"'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/contextuallyTypedBindingInitializerNegative.js b/tests/baselines/reference/contextuallyTypedBindingInitializerNegative.js
new file mode 100644
index 00000000000..3f1ed156fdb
--- /dev/null
+++ b/tests/baselines/reference/contextuallyTypedBindingInitializerNegative.js
@@ -0,0 +1,49 @@
+//// [contextuallyTypedBindingInitializerNegative.ts]
+interface Show {
+    show: (x: number) => string;
+}
+function f({ show: showRename = v => v }: Show) {}
+function f2({ "show": showRename = v => v }: Show) {}
+function f3({ ["show"]: showRename = v => v }: Show) {}
+
+interface Nested {
+    nested: Show
+}
+function ff({ nested: nestedRename = { show: v => v } }: Nested) {}
+
+interface StringIdentity {
+    stringIdentity(s: string): string;
+}
+let { stringIdentity: id = arg => arg.length }: StringIdentity = { stringIdentity: x => x};
+
+interface Tuples {
+    prop: [string, number];
+}
+function g({ prop = [101, 1234] }: Tuples) {}
+
+interface StringUnion {
+    prop: "foo" | "bar";
+}
+function h({ prop = "baz" }: StringUnion) {}
+
+
+//// [contextuallyTypedBindingInitializerNegative.js]
+function f(_a) {
+    var _b = _a.show, showRename = _b === void 0 ? function (v) { return v; } : _b;
+}
+function f2(_a) {
+    var _b = _a["show"], showRename = _b === void 0 ? function (v) { return v; } : _b;
+}
+function f3(_a) {
+    var _b = "show", _c = _a[_b], showRename = _c === void 0 ? function (v) { return v; } : _c;
+}
+function ff(_a) {
+    var _b = _a.nested, nestedRename = _b === void 0 ? { show: function (v) { return v; } } : _b;
+}
+var _a = { stringIdentity: function (x) { return x; } }.stringIdentity, id = _a === void 0 ? function (arg) { return arg.length; } : _a;
+function g(_a) {
+    var _b = _a.prop, prop = _b === void 0 ? [101, 1234] : _b;
+}
+function h(_a) {
+    var _b = _a.prop, prop = _b === void 0 ? "baz" : _b;
+}
diff --git a/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration01.js b/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration01.js
index 2c8efdd424a..a6eaa048093 100644
--- a/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration01.js
+++ b/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration01.js
@@ -61,7 +61,7 @@ function getFoo1() {
     }());
 }
 function getFoo2() {
-    return (_a = (function () {
+    return _a = (function () {
             function class_2() {
             }
             return class_2;
@@ -72,11 +72,11 @@ function getFoo2() {
         _a.method2 = function (arg) {
             arg.strProp = "hello";
         },
-        _a);
+        _a;
     var _a;
 }
 function getFoo3() {
-    return (_a = (function () {
+    return _a = (function () {
             function class_3() {
             }
             return class_3;
@@ -87,6 +87,6 @@ function getFoo3() {
         _a.method2 = function (arg) {
             arg.strProp = "hello";
         },
-        _a);
+        _a;
     var _a;
 }
diff --git a/tests/baselines/reference/contextuallyTypedObjectLiteralMethodDeclaration01.symbols b/tests/baselines/reference/contextuallyTypedObjectLiteralMethodDeclaration01.symbols
index 3c26110157a..c240af42b91 100644
--- a/tests/baselines/reference/contextuallyTypedObjectLiteralMethodDeclaration01.symbols
+++ b/tests/baselines/reference/contextuallyTypedObjectLiteralMethodDeclaration01.symbols
@@ -4,26 +4,26 @@ interface A {
 >A : Symbol(A, Decl(contextuallyTypedObjectLiteralMethodDeclaration01.ts, 0, 0))
 
     numProp: number;
->numProp : Symbol(numProp, Decl(contextuallyTypedObjectLiteralMethodDeclaration01.ts, 1, 13))
+>numProp : Symbol(A.numProp, Decl(contextuallyTypedObjectLiteralMethodDeclaration01.ts, 1, 13))
 }
 
 interface B  {
 >B : Symbol(B, Decl(contextuallyTypedObjectLiteralMethodDeclaration01.ts, 3, 1))
 
     strProp: string;
->strProp : Symbol(strProp, Decl(contextuallyTypedObjectLiteralMethodDeclaration01.ts, 5, 14))
+>strProp : Symbol(B.strProp, Decl(contextuallyTypedObjectLiteralMethodDeclaration01.ts, 5, 14))
 }
 
 interface Foo {
 >Foo : Symbol(Foo, Decl(contextuallyTypedObjectLiteralMethodDeclaration01.ts, 7, 1))
 
     method1(arg: A): void;
->method1 : Symbol(method1, Decl(contextuallyTypedObjectLiteralMethodDeclaration01.ts, 9, 15))
+>method1 : Symbol(Foo.method1, Decl(contextuallyTypedObjectLiteralMethodDeclaration01.ts, 9, 15))
 >arg : Symbol(arg, Decl(contextuallyTypedObjectLiteralMethodDeclaration01.ts, 10, 12))
 >A : Symbol(A, Decl(contextuallyTypedObjectLiteralMethodDeclaration01.ts, 0, 0))
 
     method2(arg: B): void;
->method2 : Symbol(method2, Decl(contextuallyTypedObjectLiteralMethodDeclaration01.ts, 10, 26))
+>method2 : Symbol(Foo.method2, Decl(contextuallyTypedObjectLiteralMethodDeclaration01.ts, 10, 26))
 >arg : Symbol(arg, Decl(contextuallyTypedObjectLiteralMethodDeclaration01.ts, 11, 12))
 >B : Symbol(B, Decl(contextuallyTypedObjectLiteralMethodDeclaration01.ts, 3, 1))
 }
diff --git a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes01.errors.txt b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes01.errors.txt
index b5d4e01b677..48e11fb1221 100644
--- a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes01.errors.txt
+++ b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes01.errors.txt
@@ -1,15 +1,16 @@
-tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes01.tsx(13,15): error TS2322: Type '"f"' is not assignable to type '"A" | "B" | "C"'.
-  Type '"f"' is not assignable to type '"C"'.
-tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes01.tsx(14,15): error TS2322: Type '"f"' is not assignable to type '"A" | "B" | "C"'.
-  Type '"f"' is not assignable to type '"C"'.
+tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes01.tsx(16,15): error TS2322: Type '"f"' is not assignable to type '"A" | "B" | "C"'.
+tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes01.tsx(17,15): error TS2322: Type '"f"' is not assignable to type '"A" | "B" | "C"'.
 
 
 ==== tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes01.tsx (2 errors) ====
     
     namespace JSX {
-        interface IntrinsicElements {
+        export interface IntrinsicElements {
             span: {};
         }
+        export interface Element {
+    		something?: any;
+        }
     }
     
     const FooComponent = (props: { foo: "A" | "B" | "C" }) => <span>{props.foo}</span>;
@@ -20,8 +21,6 @@ tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStr
     <FooComponent foo={"f"} />;
                   ~~~~~~~~~
 !!! error TS2322: Type '"f"' is not assignable to type '"A" | "B" | "C"'.
-!!! error TS2322:   Type '"f"' is not assignable to type '"C"'.
     <FooComponent foo="f"   />;
                   ~~~~~~~
-!!! error TS2322: Type '"f"' is not assignable to type '"A" | "B" | "C"'.
-!!! error TS2322:   Type '"f"' is not assignable to type '"C"'.
\ No newline at end of file
+!!! error TS2322: Type '"f"' is not assignable to type '"A" | "B" | "C"'.
\ No newline at end of file
diff --git a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes01.js b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes01.js
index c21247c2835..d1b2ebf5ae5 100644
--- a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes01.js
+++ b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes01.js
@@ -1,9 +1,12 @@
 //// [contextuallyTypedStringLiteralsInJsxAttributes01.tsx]
 
 namespace JSX {
-    interface IntrinsicElements {
+    export interface IntrinsicElements {
         span: {};
     }
+    export interface Element {
+		something?: any;
+    }
 }
 
 const FooComponent = (props: { foo: "A" | "B" | "C" }) => <span>{props.foo}</span>;
@@ -24,7 +27,13 @@ var FooComponent = function (props) { return <span>{props.foo}</span>; };
 
 //// [contextuallyTypedStringLiteralsInJsxAttributes01.d.ts]
 declare namespace JSX {
+    interface IntrinsicElements {
+        span: {};
+    }
+    interface Element {
+        something?: any;
+    }
 }
 declare const FooComponent: (props: {
     foo: "A" | "B" | "C";
-}) => any;
+}) => JSX.Element;
diff --git a/tests/baselines/reference/continueInLoopsWithCapturedBlockScopedBindings1.js b/tests/baselines/reference/continueInLoopsWithCapturedBlockScopedBindings1.js
new file mode 100644
index 00000000000..774869310ab
--- /dev/null
+++ b/tests/baselines/reference/continueInLoopsWithCapturedBlockScopedBindings1.js
@@ -0,0 +1,30 @@
+//// [continueInLoopsWithCapturedBlockScopedBindings1.ts]
+function foo() {
+    for (const i of [0, 1]) {
+        if (i === 0) {
+            continue;
+        }
+
+        // Trigger non-simple-loop emit
+        (() => {
+            return i;
+        })();
+    }
+}
+
+//// [continueInLoopsWithCapturedBlockScopedBindings1.js]
+function foo() {
+    var _loop_1 = function (i) {
+        if (i === 0) {
+            return "continue";
+        }
+        // Trigger non-simple-loop emit
+        (function () {
+            return i;
+        })();
+    };
+    for (var _i = 0, _a = [0, 1]; _i < _a.length; _i++) {
+        var i = _a[_i];
+        _loop_1(i);
+    }
+}
diff --git a/tests/baselines/reference/continueInLoopsWithCapturedBlockScopedBindings1.symbols b/tests/baselines/reference/continueInLoopsWithCapturedBlockScopedBindings1.symbols
new file mode 100644
index 00000000000..bce177ca818
--- /dev/null
+++ b/tests/baselines/reference/continueInLoopsWithCapturedBlockScopedBindings1.symbols
@@ -0,0 +1,21 @@
+=== tests/cases/compiler/continueInLoopsWithCapturedBlockScopedBindings1.ts ===
+function foo() {
+>foo : Symbol(foo, Decl(continueInLoopsWithCapturedBlockScopedBindings1.ts, 0, 0))
+
+    for (const i of [0, 1]) {
+>i : Symbol(i, Decl(continueInLoopsWithCapturedBlockScopedBindings1.ts, 1, 14))
+
+        if (i === 0) {
+>i : Symbol(i, Decl(continueInLoopsWithCapturedBlockScopedBindings1.ts, 1, 14))
+
+            continue;
+        }
+
+        // Trigger non-simple-loop emit
+        (() => {
+            return i;
+>i : Symbol(i, Decl(continueInLoopsWithCapturedBlockScopedBindings1.ts, 1, 14))
+
+        })();
+    }
+}
diff --git a/tests/baselines/reference/continueInLoopsWithCapturedBlockScopedBindings1.types b/tests/baselines/reference/continueInLoopsWithCapturedBlockScopedBindings1.types
new file mode 100644
index 00000000000..2aeb286d604
--- /dev/null
+++ b/tests/baselines/reference/continueInLoopsWithCapturedBlockScopedBindings1.types
@@ -0,0 +1,30 @@
+=== tests/cases/compiler/continueInLoopsWithCapturedBlockScopedBindings1.ts ===
+function foo() {
+>foo : () => void
+
+    for (const i of [0, 1]) {
+>i : number
+>[0, 1] : number[]
+>0 : number
+>1 : number
+
+        if (i === 0) {
+>i === 0 : boolean
+>i : number
+>0 : number
+
+            continue;
+        }
+
+        // Trigger non-simple-loop emit
+        (() => {
+>(() => {            return i;        })() : number
+>(() => {            return i;        }) : () => number
+>() => {            return i;        } : () => number
+
+            return i;
+>i : number
+
+        })();
+    }
+}
diff --git a/tests/baselines/reference/covariance1.symbols b/tests/baselines/reference/covariance1.symbols
index db055e20bc6..8a9b39e0124 100644
--- a/tests/baselines/reference/covariance1.symbols
+++ b/tests/baselines/reference/covariance1.symbols
@@ -4,16 +4,16 @@ module M {
 
     interface X { m1:number; }
 >X : Symbol(X, Decl(covariance1.ts, 0, 10))
->m1 : Symbol(m1, Decl(covariance1.ts, 2, 17))
+>m1 : Symbol(X.m1, Decl(covariance1.ts, 2, 17))
 
     export class XX implements X { constructor(public m1:number) { } }
 >XX : Symbol(XX, Decl(covariance1.ts, 2, 30))
 >X : Symbol(X, Decl(covariance1.ts, 0, 10))
->m1 : Symbol(m1, Decl(covariance1.ts, 3, 47))
+>m1 : Symbol(XX.m1, Decl(covariance1.ts, 3, 47))
 
     interface Y { x:X; }
 >Y : Symbol(Y, Decl(covariance1.ts, 3, 70))
->x : Symbol(x, Decl(covariance1.ts, 5, 17))
+>x : Symbol(Y.x, Decl(covariance1.ts, 5, 17))
 >X : Symbol(X, Decl(covariance1.ts, 0, 10))
 
     export function f(y:Y) { }
diff --git a/tests/baselines/reference/crashInResolveInterface.symbols b/tests/baselines/reference/crashInResolveInterface.symbols
index c10bf0b26a8..52faf374c6c 100644
--- a/tests/baselines/reference/crashInResolveInterface.symbols
+++ b/tests/baselines/reference/crashInResolveInterface.symbols
@@ -8,14 +8,14 @@ interface C {
 >C : Symbol(C, Decl(file2.ts, 1, 17), Decl(file2.ts, 4, 1))
 
     count(countTitle?: string): void;
->count : Symbol(count, Decl(file2.ts, 2, 13))
+>count : Symbol(C.count, Decl(file2.ts, 2, 13))
 >countTitle : Symbol(countTitle, Decl(file2.ts, 3, 10))
 }
 interface C {
 >C : Symbol(C, Decl(file2.ts, 1, 17), Decl(file2.ts, 4, 1))
 
     log(message?: any, ...optionalParams: any[]): void;
->log : Symbol(log, Decl(file2.ts, 5, 13))
+>log : Symbol(C.log, Decl(file2.ts, 5, 13))
 >message : Symbol(message, Decl(file2.ts, 6, 8))
 >optionalParams : Symbol(optionalParams, Decl(file2.ts, 6, 22))
 }
@@ -26,7 +26,7 @@ interface Q<T> {
 >T : Symbol(T, Decl(file1.ts, 0, 12))
 
     each(action: (item: T, index: number) => void): void;
->each : Symbol(each, Decl(file1.ts, 0, 16))
+>each : Symbol(Q.each, Decl(file1.ts, 0, 16))
 >action : Symbol(action, Decl(file1.ts, 1, 9))
 >item : Symbol(item, Decl(file1.ts, 1, 18))
 >T : Symbol(T, Decl(file1.ts, 0, 12))
diff --git a/tests/baselines/reference/crashInresolveReturnStatement.symbols b/tests/baselines/reference/crashInresolveReturnStatement.symbols
index 359a62c7842..7df76ff49c2 100644
--- a/tests/baselines/reference/crashInresolveReturnStatement.symbols
+++ b/tests/baselines/reference/crashInresolveReturnStatement.symbols
@@ -3,7 +3,7 @@ class WorkItemToolbar {
 >WorkItemToolbar : Symbol(WorkItemToolbar, Decl(crashInresolveReturnStatement.ts, 0, 0))
 
     public onToolbarItemClick() {
->onToolbarItemClick : Symbol(onToolbarItemClick, Decl(crashInresolveReturnStatement.ts, 0, 23))
+>onToolbarItemClick : Symbol(WorkItemToolbar.onToolbarItemClick, Decl(crashInresolveReturnStatement.ts, 0, 23))
 
         WITDialogs.createCopyOfWorkItem();
 >WITDialogs.createCopyOfWorkItem : Symbol(WITDialogs.createCopyOfWorkItem, Decl(crashInresolveReturnStatement.ts, 12, 18))
@@ -15,7 +15,7 @@ class CreateCopyOfWorkItemDialog {
 >CreateCopyOfWorkItemDialog : Symbol(CreateCopyOfWorkItemDialog, Decl(crashInresolveReturnStatement.ts, 4, 1))
 
     public getDialogResult() {
->getDialogResult : Symbol(getDialogResult, Decl(crashInresolveReturnStatement.ts, 5, 34))
+>getDialogResult : Symbol(CreateCopyOfWorkItemDialog.getDialogResult, Decl(crashInresolveReturnStatement.ts, 5, 34))
 
         return null;
     }
diff --git a/tests/baselines/reference/cyclicModuleImport.symbols b/tests/baselines/reference/cyclicModuleImport.symbols
index 86337812aad..14bdf2d47d3 100644
--- a/tests/baselines/reference/cyclicModuleImport.symbols
+++ b/tests/baselines/reference/cyclicModuleImport.symbols
@@ -10,10 +10,10 @@ declare module "SubModule" {
 >StaticVar : Symbol(SubModule.StaticVar, Decl(cyclicModuleImport.ts, 2, 21))
 
         public InstanceVar: number;
->InstanceVar : Symbol(InstanceVar, Decl(cyclicModuleImport.ts, 3, 40))
+>InstanceVar : Symbol(SubModule.InstanceVar, Decl(cyclicModuleImport.ts, 3, 40))
 
         public main: MainModule;
->main : Symbol(main, Decl(cyclicModuleImport.ts, 4, 35))
+>main : Symbol(SubModule.main, Decl(cyclicModuleImport.ts, 4, 35))
 >MainModule : Symbol(MainModule, Decl(cyclicModuleImport.ts, 0, 28))
 
         constructor();
@@ -29,7 +29,7 @@ declare module "MainModule" {
 >MainModule : Symbol(MainModule, Decl(cyclicModuleImport.ts, 11, 44))
 
         public SubModule: SubModule;
->SubModule : Symbol(SubModule, Decl(cyclicModuleImport.ts, 12, 22))
+>SubModule : Symbol(MainModule.SubModule, Decl(cyclicModuleImport.ts, 12, 22))
 >SubModule : Symbol(SubModule, Decl(cyclicModuleImport.ts, 10, 29))
 
         constructor();
diff --git a/tests/baselines/reference/declFileAccessors.symbols b/tests/baselines/reference/declFileAccessors.symbols
index 7275dd8c191..3de90051ec4 100644
--- a/tests/baselines/reference/declFileAccessors.symbols
+++ b/tests/baselines/reference/declFileAccessors.symbols
@@ -6,24 +6,24 @@ export class c1 {
 
     /** getter property*/
     public get p3() {
->p3 : Symbol(p3, Decl(declFileAccessors_0.ts, 2, 17), Decl(declFileAccessors_0.ts, 6, 5))
+>p3 : Symbol(c1.p3, Decl(declFileAccessors_0.ts, 2, 17), Decl(declFileAccessors_0.ts, 6, 5))
 
         return 10;
     }
     /** setter property*/
     public set p3(/** this is value*/value: number) {
->p3 : Symbol(p3, Decl(declFileAccessors_0.ts, 2, 17), Decl(declFileAccessors_0.ts, 6, 5))
+>p3 : Symbol(c1.p3, Decl(declFileAccessors_0.ts, 2, 17), Decl(declFileAccessors_0.ts, 6, 5))
 >value : Symbol(value, Decl(declFileAccessors_0.ts, 8, 18))
     }
     /** private getter property*/
     private get pp3() {
->pp3 : Symbol(pp3, Decl(declFileAccessors_0.ts, 9, 5), Decl(declFileAccessors_0.ts, 13, 5))
+>pp3 : Symbol(c1.pp3, Decl(declFileAccessors_0.ts, 9, 5), Decl(declFileAccessors_0.ts, 13, 5))
 
         return 10;
     }
     /** private setter property*/
     private set pp3(/** this is value*/value: number) {
->pp3 : Symbol(pp3, Decl(declFileAccessors_0.ts, 9, 5), Decl(declFileAccessors_0.ts, 13, 5))
+>pp3 : Symbol(c1.pp3, Decl(declFileAccessors_0.ts, 9, 5), Decl(declFileAccessors_0.ts, 13, 5))
 >value : Symbol(value, Decl(declFileAccessors_0.ts, 15, 20))
     }
     /** static getter property*/
@@ -38,21 +38,21 @@ export class c1 {
 >value : Symbol(value, Decl(declFileAccessors_0.ts, 22, 18))
     }
     public get nc_p3() {
->nc_p3 : Symbol(nc_p3, Decl(declFileAccessors_0.ts, 23, 5), Decl(declFileAccessors_0.ts, 26, 5))
+>nc_p3 : Symbol(c1.nc_p3, Decl(declFileAccessors_0.ts, 23, 5), Decl(declFileAccessors_0.ts, 26, 5))
 
         return 10;
     }
     public set nc_p3(value: number) {
->nc_p3 : Symbol(nc_p3, Decl(declFileAccessors_0.ts, 23, 5), Decl(declFileAccessors_0.ts, 26, 5))
+>nc_p3 : Symbol(c1.nc_p3, Decl(declFileAccessors_0.ts, 23, 5), Decl(declFileAccessors_0.ts, 26, 5))
 >value : Symbol(value, Decl(declFileAccessors_0.ts, 27, 21))
     }
     private get nc_pp3() {
->nc_pp3 : Symbol(nc_pp3, Decl(declFileAccessors_0.ts, 28, 5), Decl(declFileAccessors_0.ts, 31, 5))
+>nc_pp3 : Symbol(c1.nc_pp3, Decl(declFileAccessors_0.ts, 28, 5), Decl(declFileAccessors_0.ts, 31, 5))
 
         return 10;
     }
     private set nc_pp3(value: number) {
->nc_pp3 : Symbol(nc_pp3, Decl(declFileAccessors_0.ts, 28, 5), Decl(declFileAccessors_0.ts, 31, 5))
+>nc_pp3 : Symbol(c1.nc_pp3, Decl(declFileAccessors_0.ts, 28, 5), Decl(declFileAccessors_0.ts, 31, 5))
 >value : Symbol(value, Decl(declFileAccessors_0.ts, 32, 23))
     }
     static get nc_s3() {
@@ -67,14 +67,14 @@ export class c1 {
 
     // Only getter property
     public get onlyGetter() {
->onlyGetter : Symbol(onlyGetter, Decl(declFileAccessors_0.ts, 38, 5))
+>onlyGetter : Symbol(c1.onlyGetter, Decl(declFileAccessors_0.ts, 38, 5))
 
         return 10;
     }
 
     // Only setter property
     public set onlySetter(value: number) {
->onlySetter : Symbol(onlySetter, Decl(declFileAccessors_0.ts, 43, 5))
+>onlySetter : Symbol(c1.onlySetter, Decl(declFileAccessors_0.ts, 43, 5))
 >value : Symbol(value, Decl(declFileAccessors_0.ts, 46, 26))
     }
 }
@@ -86,24 +86,24 @@ class c2 {
 
     /** getter property*/
     public get p3() {
->p3 : Symbol(p3, Decl(declFileAccessors_1.ts, 1, 10), Decl(declFileAccessors_1.ts, 5, 5))
+>p3 : Symbol(c2.p3, Decl(declFileAccessors_1.ts, 1, 10), Decl(declFileAccessors_1.ts, 5, 5))
 
         return 10;
     }
     /** setter property*/
     public set p3(/** this is value*/value: number) {
->p3 : Symbol(p3, Decl(declFileAccessors_1.ts, 1, 10), Decl(declFileAccessors_1.ts, 5, 5))
+>p3 : Symbol(c2.p3, Decl(declFileAccessors_1.ts, 1, 10), Decl(declFileAccessors_1.ts, 5, 5))
 >value : Symbol(value, Decl(declFileAccessors_1.ts, 7, 18))
     }
     /** private getter property*/
     private get pp3() {
->pp3 : Symbol(pp3, Decl(declFileAccessors_1.ts, 8, 5), Decl(declFileAccessors_1.ts, 12, 5))
+>pp3 : Symbol(c2.pp3, Decl(declFileAccessors_1.ts, 8, 5), Decl(declFileAccessors_1.ts, 12, 5))
 
         return 10;
     }
     /** private setter property*/
     private set pp3(/** this is value*/value: number) {
->pp3 : Symbol(pp3, Decl(declFileAccessors_1.ts, 8, 5), Decl(declFileAccessors_1.ts, 12, 5))
+>pp3 : Symbol(c2.pp3, Decl(declFileAccessors_1.ts, 8, 5), Decl(declFileAccessors_1.ts, 12, 5))
 >value : Symbol(value, Decl(declFileAccessors_1.ts, 14, 20))
     }
     /** static getter property*/
@@ -118,21 +118,21 @@ class c2 {
 >value : Symbol(value, Decl(declFileAccessors_1.ts, 21, 18))
     }
     public get nc_p3() {
->nc_p3 : Symbol(nc_p3, Decl(declFileAccessors_1.ts, 22, 5), Decl(declFileAccessors_1.ts, 25, 5))
+>nc_p3 : Symbol(c2.nc_p3, Decl(declFileAccessors_1.ts, 22, 5), Decl(declFileAccessors_1.ts, 25, 5))
 
         return 10;
     }
     public set nc_p3(value: number) {
->nc_p3 : Symbol(nc_p3, Decl(declFileAccessors_1.ts, 22, 5), Decl(declFileAccessors_1.ts, 25, 5))
+>nc_p3 : Symbol(c2.nc_p3, Decl(declFileAccessors_1.ts, 22, 5), Decl(declFileAccessors_1.ts, 25, 5))
 >value : Symbol(value, Decl(declFileAccessors_1.ts, 26, 21))
     }
     private get nc_pp3() {
->nc_pp3 : Symbol(nc_pp3, Decl(declFileAccessors_1.ts, 27, 5), Decl(declFileAccessors_1.ts, 30, 5))
+>nc_pp3 : Symbol(c2.nc_pp3, Decl(declFileAccessors_1.ts, 27, 5), Decl(declFileAccessors_1.ts, 30, 5))
 
         return 10;
     }
     private set nc_pp3(value: number) {
->nc_pp3 : Symbol(nc_pp3, Decl(declFileAccessors_1.ts, 27, 5), Decl(declFileAccessors_1.ts, 30, 5))
+>nc_pp3 : Symbol(c2.nc_pp3, Decl(declFileAccessors_1.ts, 27, 5), Decl(declFileAccessors_1.ts, 30, 5))
 >value : Symbol(value, Decl(declFileAccessors_1.ts, 31, 23))
     }
     static get nc_s3() {
@@ -147,14 +147,14 @@ class c2 {
 
     // Only getter property
     public get onlyGetter() {
->onlyGetter : Symbol(onlyGetter, Decl(declFileAccessors_1.ts, 37, 5))
+>onlyGetter : Symbol(c2.onlyGetter, Decl(declFileAccessors_1.ts, 37, 5))
 
         return 10;
     }
 
     // Only setter property
     public set onlySetter(value: number) {
->onlySetter : Symbol(onlySetter, Decl(declFileAccessors_1.ts, 42, 5))
+>onlySetter : Symbol(c2.onlySetter, Decl(declFileAccessors_1.ts, 42, 5))
 >value : Symbol(value, Decl(declFileAccessors_1.ts, 45, 26))
     }
 }
diff --git a/tests/baselines/reference/declFileConstructors.symbols b/tests/baselines/reference/declFileConstructors.symbols
index 1190c889dbf..ad86b6a721f 100644
--- a/tests/baselines/reference/declFileConstructors.symbols
+++ b/tests/baselines/reference/declFileConstructors.symbols
@@ -57,7 +57,7 @@ export class ConstructorWithPublicParameterProperty {
 >ConstructorWithPublicParameterProperty : Symbol(ConstructorWithPublicParameterProperty, Decl(declFileConstructors_0.ts, 26, 1))
 
     constructor(public x: string) {
->x : Symbol(x, Decl(declFileConstructors_0.ts, 29, 16))
+>x : Symbol(ConstructorWithPublicParameterProperty.x, Decl(declFileConstructors_0.ts, 29, 16))
     }
 }
 
@@ -65,7 +65,7 @@ export class ConstructorWithPrivateParameterProperty {
 >ConstructorWithPrivateParameterProperty : Symbol(ConstructorWithPrivateParameterProperty, Decl(declFileConstructors_0.ts, 31, 1))
 
     constructor(private x: string) {
->x : Symbol(x, Decl(declFileConstructors_0.ts, 34, 16))
+>x : Symbol(ConstructorWithPrivateParameterProperty.x, Decl(declFileConstructors_0.ts, 34, 16))
     }
 }
 
@@ -73,7 +73,7 @@ export class ConstructorWithOptionalParameterProperty {
 >ConstructorWithOptionalParameterProperty : Symbol(ConstructorWithOptionalParameterProperty, Decl(declFileConstructors_0.ts, 36, 1))
 
     constructor(public x?: string) {
->x : Symbol(x, Decl(declFileConstructors_0.ts, 39, 16))
+>x : Symbol(ConstructorWithOptionalParameterProperty.x, Decl(declFileConstructors_0.ts, 39, 16))
     }
 }
 
@@ -81,7 +81,7 @@ export class ConstructorWithParameterInitializer {
 >ConstructorWithParameterInitializer : Symbol(ConstructorWithParameterInitializer, Decl(declFileConstructors_0.ts, 41, 1))
 
     constructor(public x = "hello") {
->x : Symbol(x, Decl(declFileConstructors_0.ts, 44, 16))
+>x : Symbol(ConstructorWithParameterInitializer.x, Decl(declFileConstructors_0.ts, 44, 16))
     }
 }
 
@@ -143,7 +143,7 @@ class GlobalConstructorWithPublicParameterProperty {
 >GlobalConstructorWithPublicParameterProperty : Symbol(GlobalConstructorWithPublicParameterProperty, Decl(declFileConstructors_1.ts, 25, 1))
 
     constructor(public x: string) {
->x : Symbol(x, Decl(declFileConstructors_1.ts, 28, 16))
+>x : Symbol(GlobalConstructorWithPublicParameterProperty.x, Decl(declFileConstructors_1.ts, 28, 16))
     }
 }
 
@@ -151,7 +151,7 @@ class GlobalConstructorWithPrivateParameterProperty {
 >GlobalConstructorWithPrivateParameterProperty : Symbol(GlobalConstructorWithPrivateParameterProperty, Decl(declFileConstructors_1.ts, 30, 1))
 
     constructor(private x: string) {
->x : Symbol(x, Decl(declFileConstructors_1.ts, 33, 16))
+>x : Symbol(GlobalConstructorWithPrivateParameterProperty.x, Decl(declFileConstructors_1.ts, 33, 16))
     }
 }
 
@@ -159,7 +159,7 @@ class GlobalConstructorWithOptionalParameterProperty {
 >GlobalConstructorWithOptionalParameterProperty : Symbol(GlobalConstructorWithOptionalParameterProperty, Decl(declFileConstructors_1.ts, 35, 1))
 
     constructor(public x?: string) {
->x : Symbol(x, Decl(declFileConstructors_1.ts, 38, 16))
+>x : Symbol(GlobalConstructorWithOptionalParameterProperty.x, Decl(declFileConstructors_1.ts, 38, 16))
     }
 }
 
@@ -167,6 +167,6 @@ class GlobalConstructorWithParameterInitializer {
 >GlobalConstructorWithParameterInitializer : Symbol(GlobalConstructorWithParameterInitializer, Decl(declFileConstructors_1.ts, 40, 1))
 
     constructor(public x = "hello") {
->x : Symbol(x, Decl(declFileConstructors_1.ts, 43, 16))
+>x : Symbol(GlobalConstructorWithParameterInitializer.x, Decl(declFileConstructors_1.ts, 43, 16))
     }
 }
diff --git a/tests/baselines/reference/declFileExportAssignmentImportInternalModule.symbols b/tests/baselines/reference/declFileExportAssignmentImportInternalModule.symbols
index 5953d446478..dc5382cbef6 100644
--- a/tests/baselines/reference/declFileExportAssignmentImportInternalModule.symbols
+++ b/tests/baselines/reference/declFileExportAssignmentImportInternalModule.symbols
@@ -17,13 +17,13 @@ module m3 {
 >connectExport : Symbol(connectExport, Decl(declFileExportAssignmentImportInternalModule.ts, 4, 9))
 
             use: (mod: connectModule) => connectExport;
->use : Symbol(use, Decl(declFileExportAssignmentImportInternalModule.ts, 5, 40))
+>use : Symbol(connectExport.use, Decl(declFileExportAssignmentImportInternalModule.ts, 5, 40))
 >mod : Symbol(mod, Decl(declFileExportAssignmentImportInternalModule.ts, 6, 18))
 >connectModule : Symbol(connectModule, Decl(declFileExportAssignmentImportInternalModule.ts, 1, 22))
 >connectExport : Symbol(connectExport, Decl(declFileExportAssignmentImportInternalModule.ts, 4, 9))
 
             listen: (port: number) => void;
->listen : Symbol(listen, Decl(declFileExportAssignmentImportInternalModule.ts, 6, 55))
+>listen : Symbol(connectExport.listen, Decl(declFileExportAssignmentImportInternalModule.ts, 6, 55))
 >port : Symbol(port, Decl(declFileExportAssignmentImportInternalModule.ts, 7, 21))
         }
 
diff --git a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.symbols b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.symbols
index d8801ff3fe3..34b1cbff341 100644
--- a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.symbols
+++ b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.symbols
@@ -19,7 +19,7 @@ interface Foo<T> {
 >T : Symbol(T, Decl(declFileExportAssignmentOfGenericInterface_0.ts, 1, 14))
 
     a: string;
->a : Symbol(a, Decl(declFileExportAssignmentOfGenericInterface_0.ts, 1, 18))
+>a : Symbol(Foo.a, Decl(declFileExportAssignmentOfGenericInterface_0.ts, 1, 18))
 }
 export = Foo;
 >Foo : Symbol(Foo, Decl(declFileExportAssignmentOfGenericInterface_0.ts, 0, 0))
diff --git a/tests/baselines/reference/declFileForClassWithMultipleBaseClasses.symbols b/tests/baselines/reference/declFileForClassWithMultipleBaseClasses.symbols
index e20542996b2..92c82d6ed41 100644
--- a/tests/baselines/reference/declFileForClassWithMultipleBaseClasses.symbols
+++ b/tests/baselines/reference/declFileForClassWithMultipleBaseClasses.symbols
@@ -4,28 +4,28 @@ class A {
 >A : Symbol(A, Decl(declFileForClassWithMultipleBaseClasses.ts, 0, 0))
 
     foo() { }
->foo : Symbol(foo, Decl(declFileForClassWithMultipleBaseClasses.ts, 1, 9))
+>foo : Symbol(A.foo, Decl(declFileForClassWithMultipleBaseClasses.ts, 1, 9))
 }
 
 class B {
 >B : Symbol(B, Decl(declFileForClassWithMultipleBaseClasses.ts, 3, 1))
 
     bar() { }
->bar : Symbol(bar, Decl(declFileForClassWithMultipleBaseClasses.ts, 5, 9))
+>bar : Symbol(B.bar, Decl(declFileForClassWithMultipleBaseClasses.ts, 5, 9))
 }
 
 interface I {
 >I : Symbol(I, Decl(declFileForClassWithMultipleBaseClasses.ts, 7, 1), Decl(declFileForClassWithMultipleBaseClasses.ts, 23, 1))
 
     baz();
->baz : Symbol(baz, Decl(declFileForClassWithMultipleBaseClasses.ts, 9, 13))
+>baz : Symbol(I.baz, Decl(declFileForClassWithMultipleBaseClasses.ts, 9, 13))
 }
 
 interface J {
 >J : Symbol(J, Decl(declFileForClassWithMultipleBaseClasses.ts, 11, 1))
 
     bat();
->bat : Symbol(bat, Decl(declFileForClassWithMultipleBaseClasses.ts, 13, 13))
+>bat : Symbol(J.bat, Decl(declFileForClassWithMultipleBaseClasses.ts, 13, 13))
 }
 
 
@@ -35,16 +35,16 @@ class D implements I, J {
 >J : Symbol(J, Decl(declFileForClassWithMultipleBaseClasses.ts, 11, 1))
 
     baz() { }
->baz : Symbol(baz, Decl(declFileForClassWithMultipleBaseClasses.ts, 18, 25))
+>baz : Symbol(D.baz, Decl(declFileForClassWithMultipleBaseClasses.ts, 18, 25))
 
     bat() { }
->bat : Symbol(bat, Decl(declFileForClassWithMultipleBaseClasses.ts, 19, 13))
+>bat : Symbol(D.bat, Decl(declFileForClassWithMultipleBaseClasses.ts, 19, 13))
 
     foo() { }
->foo : Symbol(foo, Decl(declFileForClassWithMultipleBaseClasses.ts, 20, 13))
+>foo : Symbol(D.foo, Decl(declFileForClassWithMultipleBaseClasses.ts, 20, 13))
 
     bar() { }
->bar : Symbol(bar, Decl(declFileForClassWithMultipleBaseClasses.ts, 21, 13))
+>bar : Symbol(D.bar, Decl(declFileForClassWithMultipleBaseClasses.ts, 21, 13))
 }
 
 interface I extends A, B {
diff --git a/tests/baselines/reference/declFileForClassWithPrivateOverloadedFunction.symbols b/tests/baselines/reference/declFileForClassWithPrivateOverloadedFunction.symbols
index f28a8c2bfc7..69bf3db2cb3 100644
--- a/tests/baselines/reference/declFileForClassWithPrivateOverloadedFunction.symbols
+++ b/tests/baselines/reference/declFileForClassWithPrivateOverloadedFunction.symbols
@@ -4,14 +4,14 @@ class C {
 >C : Symbol(C, Decl(declFileForClassWithPrivateOverloadedFunction.ts, 0, 0))
 
     private foo(x: number);
->foo : Symbol(foo, Decl(declFileForClassWithPrivateOverloadedFunction.ts, 1, 9), Decl(declFileForClassWithPrivateOverloadedFunction.ts, 2, 27), Decl(declFileForClassWithPrivateOverloadedFunction.ts, 3, 27))
+>foo : Symbol(C.foo, Decl(declFileForClassWithPrivateOverloadedFunction.ts, 1, 9), Decl(declFileForClassWithPrivateOverloadedFunction.ts, 2, 27), Decl(declFileForClassWithPrivateOverloadedFunction.ts, 3, 27))
 >x : Symbol(x, Decl(declFileForClassWithPrivateOverloadedFunction.ts, 2, 16))
 
     private foo(x: string);
->foo : Symbol(foo, Decl(declFileForClassWithPrivateOverloadedFunction.ts, 1, 9), Decl(declFileForClassWithPrivateOverloadedFunction.ts, 2, 27), Decl(declFileForClassWithPrivateOverloadedFunction.ts, 3, 27))
+>foo : Symbol(C.foo, Decl(declFileForClassWithPrivateOverloadedFunction.ts, 1, 9), Decl(declFileForClassWithPrivateOverloadedFunction.ts, 2, 27), Decl(declFileForClassWithPrivateOverloadedFunction.ts, 3, 27))
 >x : Symbol(x, Decl(declFileForClassWithPrivateOverloadedFunction.ts, 3, 16))
 
     private foo(x: any) { }
->foo : Symbol(foo, Decl(declFileForClassWithPrivateOverloadedFunction.ts, 1, 9), Decl(declFileForClassWithPrivateOverloadedFunction.ts, 2, 27), Decl(declFileForClassWithPrivateOverloadedFunction.ts, 3, 27))
+>foo : Symbol(C.foo, Decl(declFileForClassWithPrivateOverloadedFunction.ts, 1, 9), Decl(declFileForClassWithPrivateOverloadedFunction.ts, 2, 27), Decl(declFileForClassWithPrivateOverloadedFunction.ts, 3, 27))
 >x : Symbol(x, Decl(declFileForClassWithPrivateOverloadedFunction.ts, 4, 16))
 }
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/declFileForInterfaceWithOptionalFunction.symbols b/tests/baselines/reference/declFileForInterfaceWithOptionalFunction.symbols
index bcec395c80d..a6a3e272c94 100644
--- a/tests/baselines/reference/declFileForInterfaceWithOptionalFunction.symbols
+++ b/tests/baselines/reference/declFileForInterfaceWithOptionalFunction.symbols
@@ -4,10 +4,10 @@ interface I {
 >I : Symbol(I, Decl(declFileForInterfaceWithOptionalFunction.ts, 0, 0))
 
     foo? (x?);
->foo : Symbol(foo, Decl(declFileForInterfaceWithOptionalFunction.ts, 1, 13))
+>foo : Symbol(I.foo, Decl(declFileForInterfaceWithOptionalFunction.ts, 1, 13))
 >x : Symbol(x, Decl(declFileForInterfaceWithOptionalFunction.ts, 2, 10))
 
     foo2? (x?: number): number;
->foo2 : Symbol(foo2, Decl(declFileForInterfaceWithOptionalFunction.ts, 2, 14))
+>foo2 : Symbol(I.foo2, Decl(declFileForInterfaceWithOptionalFunction.ts, 2, 14))
 >x : Symbol(x, Decl(declFileForInterfaceWithOptionalFunction.ts, 3, 11))
 }
diff --git a/tests/baselines/reference/declFileForInterfaceWithRestParams.symbols b/tests/baselines/reference/declFileForInterfaceWithRestParams.symbols
index 9a0fb4a71da..bccb096eb6c 100644
--- a/tests/baselines/reference/declFileForInterfaceWithRestParams.symbols
+++ b/tests/baselines/reference/declFileForInterfaceWithRestParams.symbols
@@ -4,18 +4,18 @@ interface I {
 >I : Symbol(I, Decl(declFileForInterfaceWithRestParams.ts, 0, 0))
 
     foo(...x): typeof x;
->foo : Symbol(foo, Decl(declFileForInterfaceWithRestParams.ts, 1, 13))
+>foo : Symbol(I.foo, Decl(declFileForInterfaceWithRestParams.ts, 1, 13))
 >x : Symbol(x, Decl(declFileForInterfaceWithRestParams.ts, 2, 8))
 >x : Symbol(x, Decl(declFileForInterfaceWithRestParams.ts, 2, 8))
 
     foo2(a: number, ...x): typeof x;
->foo2 : Symbol(foo2, Decl(declFileForInterfaceWithRestParams.ts, 2, 24))
+>foo2 : Symbol(I.foo2, Decl(declFileForInterfaceWithRestParams.ts, 2, 24))
 >a : Symbol(a, Decl(declFileForInterfaceWithRestParams.ts, 3, 9))
 >x : Symbol(x, Decl(declFileForInterfaceWithRestParams.ts, 3, 19))
 >x : Symbol(x, Decl(declFileForInterfaceWithRestParams.ts, 3, 19))
 
     foo3(b: string, ...x: string[]): typeof x;
->foo3 : Symbol(foo3, Decl(declFileForInterfaceWithRestParams.ts, 3, 36))
+>foo3 : Symbol(I.foo3, Decl(declFileForInterfaceWithRestParams.ts, 3, 36))
 >b : Symbol(b, Decl(declFileForInterfaceWithRestParams.ts, 4, 9))
 >x : Symbol(x, Decl(declFileForInterfaceWithRestParams.ts, 4, 19))
 >x : Symbol(x, Decl(declFileForInterfaceWithRestParams.ts, 4, 19))
diff --git a/tests/baselines/reference/declFileForTypeParameters.symbols b/tests/baselines/reference/declFileForTypeParameters.symbols
index 41c567d89df..8838c3cdd05 100644
--- a/tests/baselines/reference/declFileForTypeParameters.symbols
+++ b/tests/baselines/reference/declFileForTypeParameters.symbols
@@ -5,18 +5,18 @@ class C<T> {
 >T : Symbol(T, Decl(declFileForTypeParameters.ts, 1, 8))
 
     x: T;
->x : Symbol(x, Decl(declFileForTypeParameters.ts, 1, 12))
+>x : Symbol(C.x, Decl(declFileForTypeParameters.ts, 1, 12))
 >T : Symbol(T, Decl(declFileForTypeParameters.ts, 1, 8))
 
     foo(a: T): T {
->foo : Symbol(foo, Decl(declFileForTypeParameters.ts, 2, 9))
+>foo : Symbol(C.foo, Decl(declFileForTypeParameters.ts, 2, 9))
 >a : Symbol(a, Decl(declFileForTypeParameters.ts, 3, 8))
 >T : Symbol(T, Decl(declFileForTypeParameters.ts, 1, 8))
 >T : Symbol(T, Decl(declFileForTypeParameters.ts, 1, 8))
 
         return this.x;
->this.x : Symbol(x, Decl(declFileForTypeParameters.ts, 1, 12))
+>this.x : Symbol(C.x, Decl(declFileForTypeParameters.ts, 1, 12))
 >this : Symbol(C, Decl(declFileForTypeParameters.ts, 0, 0))
->x : Symbol(x, Decl(declFileForTypeParameters.ts, 1, 12))
+>x : Symbol(C.x, Decl(declFileForTypeParameters.ts, 1, 12))
     }
 }
diff --git a/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.symbols b/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.symbols
index c732a6ad233..5d98c76ffa1 100644
--- a/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.symbols
+++ b/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.symbols
@@ -3,7 +3,7 @@ interface IFoo {
 >IFoo : Symbol(IFoo, Decl(declFileGenericClassWithGenericExtendedClass.ts, 0, 0))
 
     baz: Baz;
->baz : Symbol(baz, Decl(declFileGenericClassWithGenericExtendedClass.ts, 0, 16))
+>baz : Symbol(IFoo.baz, Decl(declFileGenericClassWithGenericExtendedClass.ts, 0, 16))
 >Baz : Symbol(Baz, Decl(declFileGenericClassWithGenericExtendedClass.ts, 7, 1))
 }
 class Base<T> { }
@@ -21,7 +21,7 @@ interface IBar<T> {
 >T : Symbol(T, Decl(declFileGenericClassWithGenericExtendedClass.ts, 5, 15))
 
     derived: Derived<T>;
->derived : Symbol(derived, Decl(declFileGenericClassWithGenericExtendedClass.ts, 5, 19))
+>derived : Symbol(IBar.derived, Decl(declFileGenericClassWithGenericExtendedClass.ts, 5, 19))
 >Derived : Symbol(Derived, Decl(declFileGenericClassWithGenericExtendedClass.ts, 3, 17))
 >T : Symbol(T, Decl(declFileGenericClassWithGenericExtendedClass.ts, 5, 15))
 }
@@ -31,7 +31,7 @@ class Baz implements IBar<Baz> {
 >Baz : Symbol(Baz, Decl(declFileGenericClassWithGenericExtendedClass.ts, 7, 1))
 
     derived: Derived<Baz>;
->derived : Symbol(derived, Decl(declFileGenericClassWithGenericExtendedClass.ts, 8, 32))
+>derived : Symbol(Baz.derived, Decl(declFileGenericClassWithGenericExtendedClass.ts, 8, 32))
 >Derived : Symbol(Derived, Decl(declFileGenericClassWithGenericExtendedClass.ts, 3, 17))
 >Baz : Symbol(Baz, Decl(declFileGenericClassWithGenericExtendedClass.ts, 7, 1))
 }
diff --git a/tests/baselines/reference/declFileGenericType.symbols b/tests/baselines/reference/declFileGenericType.symbols
index b98e0df59ac..608c1e20145 100644
--- a/tests/baselines/reference/declFileGenericType.symbols
+++ b/tests/baselines/reference/declFileGenericType.symbols
@@ -69,7 +69,7 @@ export module C {
 >T : Symbol(T, Decl(declFileGenericType.ts, 13, 19))
 
         constructor(public val: T) { }
->val : Symbol(val, Decl(declFileGenericType.ts, 15, 20))
+>val : Symbol(D.val, Decl(declFileGenericType.ts, 15, 20))
 >T : Symbol(T, Decl(declFileGenericType.ts, 13, 19))
 
     }
diff --git a/tests/baselines/reference/declFileGenericType2.symbols b/tests/baselines/reference/declFileGenericType2.symbols
index fa1b63a2ac4..60ced2992d4 100644
--- a/tests/baselines/reference/declFileGenericType2.symbols
+++ b/tests/baselines/reference/declFileGenericType2.symbols
@@ -48,7 +48,7 @@ declare module templa.mvc.composite {
 >IModel : Symbol(IModel, Decl(declFileGenericType2.ts, 1, 27))
 
         getControllers(): mvc.IController<mvc.IModel>[];
->getControllers : Symbol(getControllers, Decl(declFileGenericType2.ts, 14, 60))
+>getControllers : Symbol(ICompositeControllerModel.getControllers, Decl(declFileGenericType2.ts, 14, 60))
 >mvc : Symbol(mvc, Decl(declFileGenericType2.ts, 1, 22), Decl(declFileGenericType2.ts, 5, 22), Decl(declFileGenericType2.ts, 9, 22), Decl(declFileGenericType2.ts, 13, 22))
 >IController : Symbol(IController, Decl(declFileGenericType2.ts, 5, 27))
 >mvc : Symbol(mvc, Decl(declFileGenericType2.ts, 1, 22), Decl(declFileGenericType2.ts, 5, 22), Decl(declFileGenericType2.ts, 9, 22), Decl(declFileGenericType2.ts, 13, 22))
@@ -125,7 +125,7 @@ module templa.dom.mvc.composite {
 >ModelType : Symbol(ModelType, Decl(declFileGenericType2.ts, 33, 52))
 
         public _controllers: templa.mvc.IController<templa.mvc.IModel>[];
->_controllers : Symbol(_controllers, Decl(declFileGenericType2.ts, 33, 179))
+>_controllers : Symbol(AbstractCompositeElementController._controllers, Decl(declFileGenericType2.ts, 33, 179))
 >templa : Symbol(templa, Decl(declFileGenericType2.ts, 0, 0), Decl(declFileGenericType2.ts, 4, 1), Decl(declFileGenericType2.ts, 8, 1), Decl(declFileGenericType2.ts, 12, 1), Decl(declFileGenericType2.ts, 17, 1), Decl(declFileGenericType2.ts, 21, 1), Decl(declFileGenericType2.ts, 30, 1))
 >mvc : Symbol(mvc, Decl(declFileGenericType2.ts, 1, 22), Decl(declFileGenericType2.ts, 5, 22), Decl(declFileGenericType2.ts, 9, 22), Decl(declFileGenericType2.ts, 13, 22))
 >IController : Symbol(templa.mvc.IController, Decl(declFileGenericType2.ts, 5, 27))
@@ -138,9 +138,9 @@ module templa.dom.mvc.composite {
 >super : Symbol(AbstractElementController, Decl(declFileGenericType2.ts, 23, 23))
 
             this._controllers = [];
->this._controllers : Symbol(_controllers, Decl(declFileGenericType2.ts, 33, 179))
+>this._controllers : Symbol(AbstractCompositeElementController._controllers, Decl(declFileGenericType2.ts, 33, 179))
 >this : Symbol(AbstractCompositeElementController, Decl(declFileGenericType2.ts, 32, 33))
->_controllers : Symbol(_controllers, Decl(declFileGenericType2.ts, 33, 179))
+>_controllers : Symbol(AbstractCompositeElementController._controllers, Decl(declFileGenericType2.ts, 33, 179))
         }
     }
 }
diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.symbols b/tests/baselines/reference/declFileImportModuleWithExportAssignment.symbols
index a33e0fef758..1681dfa2782 100644
--- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.symbols
+++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.symbols
@@ -29,13 +29,13 @@ module m2 {
 >connectExport : Symbol(connectExport, Decl(declFileImportModuleWithExportAssignment_0.ts, 4, 5))
 
         use: (mod: connectModule) => connectExport;
->use : Symbol(use, Decl(declFileImportModuleWithExportAssignment_0.ts, 5, 36))
+>use : Symbol(connectExport.use, Decl(declFileImportModuleWithExportAssignment_0.ts, 5, 36))
 >mod : Symbol(mod, Decl(declFileImportModuleWithExportAssignment_0.ts, 6, 14))
 >connectModule : Symbol(connectModule, Decl(declFileImportModuleWithExportAssignment_0.ts, 1, 11))
 >connectExport : Symbol(connectExport, Decl(declFileImportModuleWithExportAssignment_0.ts, 4, 5))
 
         listen: (port: number) => void;
->listen : Symbol(listen, Decl(declFileImportModuleWithExportAssignment_0.ts, 6, 51))
+>listen : Symbol(connectExport.listen, Decl(declFileImportModuleWithExportAssignment_0.ts, 6, 51))
 >port : Symbol(port, Decl(declFileImportModuleWithExportAssignment_0.ts, 7, 17))
     }
 
diff --git a/tests/baselines/reference/declFileMethods.symbols b/tests/baselines/reference/declFileMethods.symbols
index 845f3044dae..723065c62e4 100644
--- a/tests/baselines/reference/declFileMethods.symbols
+++ b/tests/baselines/reference/declFileMethods.symbols
@@ -5,11 +5,11 @@ export class c1 {
 
     /** This comment should appear for foo*/
     public foo() {
->foo : Symbol(foo, Decl(declFileMethods_0.ts, 1, 17))
+>foo : Symbol(c1.foo, Decl(declFileMethods_0.ts, 1, 17))
     }
     /** This is comment for function signature*/
     public fooWithParameters(/** this is comment about a*/a: string,
->fooWithParameters : Symbol(fooWithParameters, Decl(declFileMethods_0.ts, 4, 5))
+>fooWithParameters : Symbol(c1.fooWithParameters, Decl(declFileMethods_0.ts, 4, 5))
 >a : Symbol(a, Decl(declFileMethods_0.ts, 6, 29))
 
         /** this is comment for b*/
@@ -21,7 +21,7 @@ export class c1 {
 >a : Symbol(a, Decl(declFileMethods_0.ts, 6, 29))
     }
     public fooWithRestParameters(a: string, ...rests: string[]) {
->fooWithRestParameters : Symbol(fooWithRestParameters, Decl(declFileMethods_0.ts, 10, 5))
+>fooWithRestParameters : Symbol(c1.fooWithRestParameters, Decl(declFileMethods_0.ts, 10, 5))
 >a : Symbol(a, Decl(declFileMethods_0.ts, 11, 33))
 >rests : Symbol(rests, Decl(declFileMethods_0.ts, 11, 43))
 
@@ -33,15 +33,15 @@ export class c1 {
     }
 
     public fooWithOverloads(a: string): string;
->fooWithOverloads : Symbol(fooWithOverloads, Decl(declFileMethods_0.ts, 13, 5), Decl(declFileMethods_0.ts, 15, 47), Decl(declFileMethods_0.ts, 16, 47))
+>fooWithOverloads : Symbol(c1.fooWithOverloads, Decl(declFileMethods_0.ts, 13, 5), Decl(declFileMethods_0.ts, 15, 47), Decl(declFileMethods_0.ts, 16, 47))
 >a : Symbol(a, Decl(declFileMethods_0.ts, 15, 28))
 
     public fooWithOverloads(a: number): number;
->fooWithOverloads : Symbol(fooWithOverloads, Decl(declFileMethods_0.ts, 13, 5), Decl(declFileMethods_0.ts, 15, 47), Decl(declFileMethods_0.ts, 16, 47))
+>fooWithOverloads : Symbol(c1.fooWithOverloads, Decl(declFileMethods_0.ts, 13, 5), Decl(declFileMethods_0.ts, 15, 47), Decl(declFileMethods_0.ts, 16, 47))
 >a : Symbol(a, Decl(declFileMethods_0.ts, 16, 28))
 
     public fooWithOverloads(a: any): any {
->fooWithOverloads : Symbol(fooWithOverloads, Decl(declFileMethods_0.ts, 13, 5), Decl(declFileMethods_0.ts, 15, 47), Decl(declFileMethods_0.ts, 16, 47))
+>fooWithOverloads : Symbol(c1.fooWithOverloads, Decl(declFileMethods_0.ts, 13, 5), Decl(declFileMethods_0.ts, 15, 47), Decl(declFileMethods_0.ts, 16, 47))
 >a : Symbol(a, Decl(declFileMethods_0.ts, 17, 28))
 
         return a;
@@ -51,11 +51,11 @@ export class c1 {
 
     /** This comment should appear for privateFoo*/
     private privateFoo() {
->privateFoo : Symbol(privateFoo, Decl(declFileMethods_0.ts, 19, 5))
+>privateFoo : Symbol(c1.privateFoo, Decl(declFileMethods_0.ts, 19, 5))
     }
     /** This is comment for function signature*/
     private privateFooWithParameters(/** this is comment about a*/a: string,
->privateFooWithParameters : Symbol(privateFooWithParameters, Decl(declFileMethods_0.ts, 24, 5))
+>privateFooWithParameters : Symbol(c1.privateFooWithParameters, Decl(declFileMethods_0.ts, 24, 5))
 >a : Symbol(a, Decl(declFileMethods_0.ts, 26, 37))
 
         /** this is comment for b*/
@@ -67,7 +67,7 @@ export class c1 {
 >a : Symbol(a, Decl(declFileMethods_0.ts, 26, 37))
     }
     private privateFooWithRestParameters(a: string, ...rests: string[]) {
->privateFooWithRestParameters : Symbol(privateFooWithRestParameters, Decl(declFileMethods_0.ts, 30, 5))
+>privateFooWithRestParameters : Symbol(c1.privateFooWithRestParameters, Decl(declFileMethods_0.ts, 30, 5))
 >a : Symbol(a, Decl(declFileMethods_0.ts, 31, 41))
 >rests : Symbol(rests, Decl(declFileMethods_0.ts, 31, 51))
 
@@ -78,15 +78,15 @@ export class c1 {
 >join : Symbol(Array.join, Decl(lib.d.ts, --, --))
     }
     private privateFooWithOverloads(a: string): string;
->privateFooWithOverloads : Symbol(privateFooWithOverloads, Decl(declFileMethods_0.ts, 33, 5), Decl(declFileMethods_0.ts, 34, 55), Decl(declFileMethods_0.ts, 35, 55))
+>privateFooWithOverloads : Symbol(c1.privateFooWithOverloads, Decl(declFileMethods_0.ts, 33, 5), Decl(declFileMethods_0.ts, 34, 55), Decl(declFileMethods_0.ts, 35, 55))
 >a : Symbol(a, Decl(declFileMethods_0.ts, 34, 36))
 
     private privateFooWithOverloads(a: number): number;
->privateFooWithOverloads : Symbol(privateFooWithOverloads, Decl(declFileMethods_0.ts, 33, 5), Decl(declFileMethods_0.ts, 34, 55), Decl(declFileMethods_0.ts, 35, 55))
+>privateFooWithOverloads : Symbol(c1.privateFooWithOverloads, Decl(declFileMethods_0.ts, 33, 5), Decl(declFileMethods_0.ts, 34, 55), Decl(declFileMethods_0.ts, 35, 55))
 >a : Symbol(a, Decl(declFileMethods_0.ts, 35, 36))
 
     private privateFooWithOverloads(a: any): any {
->privateFooWithOverloads : Symbol(privateFooWithOverloads, Decl(declFileMethods_0.ts, 33, 5), Decl(declFileMethods_0.ts, 34, 55), Decl(declFileMethods_0.ts, 35, 55))
+>privateFooWithOverloads : Symbol(c1.privateFooWithOverloads, Decl(declFileMethods_0.ts, 33, 5), Decl(declFileMethods_0.ts, 34, 55), Decl(declFileMethods_0.ts, 35, 55))
 >a : Symbol(a, Decl(declFileMethods_0.ts, 36, 36))
 
         return a;
@@ -189,11 +189,11 @@ export interface I1 {
 
     /** This comment should appear for foo*/
     foo(): string;
->foo : Symbol(foo, Decl(declFileMethods_0.ts, 79, 21))
+>foo : Symbol(I1.foo, Decl(declFileMethods_0.ts, 79, 21))
 
     /** This is comment for function signature*/
     fooWithParameters(/** this is comment about a*/a: string,
->fooWithParameters : Symbol(fooWithParameters, Decl(declFileMethods_0.ts, 81, 18))
+>fooWithParameters : Symbol(I1.fooWithParameters, Decl(declFileMethods_0.ts, 81, 18))
 >a : Symbol(a, Decl(declFileMethods_0.ts, 84, 22))
 
         /** this is comment for b*/
@@ -201,16 +201,16 @@ export interface I1 {
 >b : Symbol(b, Decl(declFileMethods_0.ts, 84, 61))
 
     fooWithRestParameters(a: string, ...rests: string[]): string;
->fooWithRestParameters : Symbol(fooWithRestParameters, Decl(declFileMethods_0.ts, 86, 25))
+>fooWithRestParameters : Symbol(I1.fooWithRestParameters, Decl(declFileMethods_0.ts, 86, 25))
 >a : Symbol(a, Decl(declFileMethods_0.ts, 88, 26))
 >rests : Symbol(rests, Decl(declFileMethods_0.ts, 88, 36))
 
     fooWithOverloads(a: string): string;
->fooWithOverloads : Symbol(fooWithOverloads, Decl(declFileMethods_0.ts, 88, 65), Decl(declFileMethods_0.ts, 90, 40))
+>fooWithOverloads : Symbol(I1.fooWithOverloads, Decl(declFileMethods_0.ts, 88, 65), Decl(declFileMethods_0.ts, 90, 40))
 >a : Symbol(a, Decl(declFileMethods_0.ts, 90, 21))
 
     fooWithOverloads(a: number): number;
->fooWithOverloads : Symbol(fooWithOverloads, Decl(declFileMethods_0.ts, 88, 65), Decl(declFileMethods_0.ts, 90, 40))
+>fooWithOverloads : Symbol(I1.fooWithOverloads, Decl(declFileMethods_0.ts, 88, 65), Decl(declFileMethods_0.ts, 90, 40))
 >a : Symbol(a, Decl(declFileMethods_0.ts, 91, 21))
 }
 
@@ -220,11 +220,11 @@ class c2 {
 
     /** This comment should appear for foo*/
     public foo() {
->foo : Symbol(foo, Decl(declFileMethods_1.ts, 0, 10))
+>foo : Symbol(c2.foo, Decl(declFileMethods_1.ts, 0, 10))
     }
     /** This is comment for function signature*/
     public fooWithParameters(/** this is comment about a*/a: string,
->fooWithParameters : Symbol(fooWithParameters, Decl(declFileMethods_1.ts, 3, 5))
+>fooWithParameters : Symbol(c2.fooWithParameters, Decl(declFileMethods_1.ts, 3, 5))
 >a : Symbol(a, Decl(declFileMethods_1.ts, 5, 29))
 
         /** this is comment for b*/
@@ -236,7 +236,7 @@ class c2 {
 >a : Symbol(a, Decl(declFileMethods_1.ts, 5, 29))
     }
     public fooWithRestParameters(a: string, ...rests: string[]) {
->fooWithRestParameters : Symbol(fooWithRestParameters, Decl(declFileMethods_1.ts, 9, 5))
+>fooWithRestParameters : Symbol(c2.fooWithRestParameters, Decl(declFileMethods_1.ts, 9, 5))
 >a : Symbol(a, Decl(declFileMethods_1.ts, 10, 33))
 >rests : Symbol(rests, Decl(declFileMethods_1.ts, 10, 43))
 
@@ -248,15 +248,15 @@ class c2 {
     }
 
     public fooWithOverloads(a: string): string;
->fooWithOverloads : Symbol(fooWithOverloads, Decl(declFileMethods_1.ts, 12, 5), Decl(declFileMethods_1.ts, 14, 47), Decl(declFileMethods_1.ts, 15, 47))
+>fooWithOverloads : Symbol(c2.fooWithOverloads, Decl(declFileMethods_1.ts, 12, 5), Decl(declFileMethods_1.ts, 14, 47), Decl(declFileMethods_1.ts, 15, 47))
 >a : Symbol(a, Decl(declFileMethods_1.ts, 14, 28))
 
     public fooWithOverloads(a: number): number;
->fooWithOverloads : Symbol(fooWithOverloads, Decl(declFileMethods_1.ts, 12, 5), Decl(declFileMethods_1.ts, 14, 47), Decl(declFileMethods_1.ts, 15, 47))
+>fooWithOverloads : Symbol(c2.fooWithOverloads, Decl(declFileMethods_1.ts, 12, 5), Decl(declFileMethods_1.ts, 14, 47), Decl(declFileMethods_1.ts, 15, 47))
 >a : Symbol(a, Decl(declFileMethods_1.ts, 15, 28))
 
     public fooWithOverloads(a: any): any {
->fooWithOverloads : Symbol(fooWithOverloads, Decl(declFileMethods_1.ts, 12, 5), Decl(declFileMethods_1.ts, 14, 47), Decl(declFileMethods_1.ts, 15, 47))
+>fooWithOverloads : Symbol(c2.fooWithOverloads, Decl(declFileMethods_1.ts, 12, 5), Decl(declFileMethods_1.ts, 14, 47), Decl(declFileMethods_1.ts, 15, 47))
 >a : Symbol(a, Decl(declFileMethods_1.ts, 16, 28))
 
         return a;
@@ -266,11 +266,11 @@ class c2 {
 
     /** This comment should appear for privateFoo*/
     private privateFoo() {
->privateFoo : Symbol(privateFoo, Decl(declFileMethods_1.ts, 18, 5))
+>privateFoo : Symbol(c2.privateFoo, Decl(declFileMethods_1.ts, 18, 5))
     }
     /** This is comment for function signature*/
     private privateFooWithParameters(/** this is comment about a*/a: string,
->privateFooWithParameters : Symbol(privateFooWithParameters, Decl(declFileMethods_1.ts, 23, 5))
+>privateFooWithParameters : Symbol(c2.privateFooWithParameters, Decl(declFileMethods_1.ts, 23, 5))
 >a : Symbol(a, Decl(declFileMethods_1.ts, 25, 37))
 
         /** this is comment for b*/
@@ -282,7 +282,7 @@ class c2 {
 >a : Symbol(a, Decl(declFileMethods_1.ts, 25, 37))
     }
     private privateFooWithRestParameters(a: string, ...rests: string[]) {
->privateFooWithRestParameters : Symbol(privateFooWithRestParameters, Decl(declFileMethods_1.ts, 29, 5))
+>privateFooWithRestParameters : Symbol(c2.privateFooWithRestParameters, Decl(declFileMethods_1.ts, 29, 5))
 >a : Symbol(a, Decl(declFileMethods_1.ts, 30, 41))
 >rests : Symbol(rests, Decl(declFileMethods_1.ts, 30, 51))
 
@@ -293,15 +293,15 @@ class c2 {
 >join : Symbol(Array.join, Decl(lib.d.ts, --, --))
     }
     private privateFooWithOverloads(a: string): string;
->privateFooWithOverloads : Symbol(privateFooWithOverloads, Decl(declFileMethods_1.ts, 32, 5), Decl(declFileMethods_1.ts, 33, 55), Decl(declFileMethods_1.ts, 34, 55))
+>privateFooWithOverloads : Symbol(c2.privateFooWithOverloads, Decl(declFileMethods_1.ts, 32, 5), Decl(declFileMethods_1.ts, 33, 55), Decl(declFileMethods_1.ts, 34, 55))
 >a : Symbol(a, Decl(declFileMethods_1.ts, 33, 36))
 
     private privateFooWithOverloads(a: number): number;
->privateFooWithOverloads : Symbol(privateFooWithOverloads, Decl(declFileMethods_1.ts, 32, 5), Decl(declFileMethods_1.ts, 33, 55), Decl(declFileMethods_1.ts, 34, 55))
+>privateFooWithOverloads : Symbol(c2.privateFooWithOverloads, Decl(declFileMethods_1.ts, 32, 5), Decl(declFileMethods_1.ts, 33, 55), Decl(declFileMethods_1.ts, 34, 55))
 >a : Symbol(a, Decl(declFileMethods_1.ts, 34, 36))
 
     private privateFooWithOverloads(a: any): any {
->privateFooWithOverloads : Symbol(privateFooWithOverloads, Decl(declFileMethods_1.ts, 32, 5), Decl(declFileMethods_1.ts, 33, 55), Decl(declFileMethods_1.ts, 34, 55))
+>privateFooWithOverloads : Symbol(c2.privateFooWithOverloads, Decl(declFileMethods_1.ts, 32, 5), Decl(declFileMethods_1.ts, 33, 55), Decl(declFileMethods_1.ts, 34, 55))
 >a : Symbol(a, Decl(declFileMethods_1.ts, 35, 36))
 
         return a;
@@ -404,11 +404,11 @@ interface I2 {
 
     /** This comment should appear for foo*/
     foo(): string;
->foo : Symbol(foo, Decl(declFileMethods_1.ts, 78, 14))
+>foo : Symbol(I2.foo, Decl(declFileMethods_1.ts, 78, 14))
 
     /** This is comment for function signature*/
     fooWithParameters(/** this is comment about a*/a: string,
->fooWithParameters : Symbol(fooWithParameters, Decl(declFileMethods_1.ts, 80, 18))
+>fooWithParameters : Symbol(I2.fooWithParameters, Decl(declFileMethods_1.ts, 80, 18))
 >a : Symbol(a, Decl(declFileMethods_1.ts, 83, 22))
 
         /** this is comment for b*/
@@ -416,16 +416,16 @@ interface I2 {
 >b : Symbol(b, Decl(declFileMethods_1.ts, 83, 61))
 
     fooWithRestParameters(a: string, ...rests: string[]): string;
->fooWithRestParameters : Symbol(fooWithRestParameters, Decl(declFileMethods_1.ts, 85, 25))
+>fooWithRestParameters : Symbol(I2.fooWithRestParameters, Decl(declFileMethods_1.ts, 85, 25))
 >a : Symbol(a, Decl(declFileMethods_1.ts, 87, 26))
 >rests : Symbol(rests, Decl(declFileMethods_1.ts, 87, 36))
 
     fooWithOverloads(a: string): string;
->fooWithOverloads : Symbol(fooWithOverloads, Decl(declFileMethods_1.ts, 87, 65), Decl(declFileMethods_1.ts, 89, 40))
+>fooWithOverloads : Symbol(I2.fooWithOverloads, Decl(declFileMethods_1.ts, 87, 65), Decl(declFileMethods_1.ts, 89, 40))
 >a : Symbol(a, Decl(declFileMethods_1.ts, 89, 21))
 
     fooWithOverloads(a: number): number;
->fooWithOverloads : Symbol(fooWithOverloads, Decl(declFileMethods_1.ts, 87, 65), Decl(declFileMethods_1.ts, 89, 40))
+>fooWithOverloads : Symbol(I2.fooWithOverloads, Decl(declFileMethods_1.ts, 87, 65), Decl(declFileMethods_1.ts, 89, 40))
 >a : Symbol(a, Decl(declFileMethods_1.ts, 90, 21))
 }
 
diff --git a/tests/baselines/reference/declFileObjectLiteralWithAccessors.symbols b/tests/baselines/reference/declFileObjectLiteralWithAccessors.symbols
index 862b0b3781e..9b3599da674 100644
--- a/tests/baselines/reference/declFileObjectLiteralWithAccessors.symbols
+++ b/tests/baselines/reference/declFileObjectLiteralWithAccessors.symbols
@@ -15,6 +15,9 @@ function /*1*/makePoint(x: number) {
         set x(a: number) { this.b = a; }
 >x : Symbol(x, Decl(declFileObjectLiteralWithAccessors.ts, 3, 14), Decl(declFileObjectLiteralWithAccessors.ts, 4, 30))
 >a : Symbol(a, Decl(declFileObjectLiteralWithAccessors.ts, 5, 14))
+>this.b : Symbol(b, Decl(declFileObjectLiteralWithAccessors.ts, 2, 12))
+>this : Symbol(, Decl(declFileObjectLiteralWithAccessors.ts, 2, 10))
+>b : Symbol(b, Decl(declFileObjectLiteralWithAccessors.ts, 2, 12))
 >a : Symbol(a, Decl(declFileObjectLiteralWithAccessors.ts, 5, 14))
 
     };
diff --git a/tests/baselines/reference/declFileObjectLiteralWithAccessors.types b/tests/baselines/reference/declFileObjectLiteralWithAccessors.types
index f7bb57b0e1e..1bf012605c1 100644
--- a/tests/baselines/reference/declFileObjectLiteralWithAccessors.types
+++ b/tests/baselines/reference/declFileObjectLiteralWithAccessors.types
@@ -19,9 +19,9 @@ function /*1*/makePoint(x: number) {
 >x : number
 >a : number
 >this.b = a : number
->this.b : any
->this : any
->b : any
+>this.b : number
+>this : { b: number; x: number; }
+>b : number
 >a : number
 
     };
diff --git a/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.symbols b/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.symbols
index f7474466140..89b7b9dd747 100644
--- a/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.symbols
+++ b/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.symbols
@@ -11,6 +11,9 @@ function /*1*/makePoint(x: number) {
         set x(a: number) { this.b = a; }
 >x : Symbol(x, Decl(declFileObjectLiteralWithOnlySetter.ts, 3, 14))
 >a : Symbol(a, Decl(declFileObjectLiteralWithOnlySetter.ts, 4, 14))
+>this.b : Symbol(b, Decl(declFileObjectLiteralWithOnlySetter.ts, 2, 12))
+>this : Symbol(, Decl(declFileObjectLiteralWithOnlySetter.ts, 2, 10))
+>b : Symbol(b, Decl(declFileObjectLiteralWithOnlySetter.ts, 2, 12))
 >a : Symbol(a, Decl(declFileObjectLiteralWithOnlySetter.ts, 4, 14))
 
     };
diff --git a/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.types b/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.types
index 2b9b98a8963..1bce86915ad 100644
--- a/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.types
+++ b/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.types
@@ -15,9 +15,9 @@ function /*1*/makePoint(x: number) {
 >x : number
 >a : number
 >this.b = a : number
->this.b : any
->this : any
->b : any
+>this.b : number
+>this : { b: number; x: number; }
+>b : number
 >a : number
 
     };
diff --git a/tests/baselines/reference/declFileOptionalInterfaceMethod.symbols b/tests/baselines/reference/declFileOptionalInterfaceMethod.symbols
index 2bf0c640fe5..ff6af2fd101 100644
--- a/tests/baselines/reference/declFileOptionalInterfaceMethod.symbols
+++ b/tests/baselines/reference/declFileOptionalInterfaceMethod.symbols
@@ -3,7 +3,7 @@ interface X {
 >X : Symbol(X, Decl(declFileOptionalInterfaceMethod.ts, 0, 0))
 
     f? <T>();
->f : Symbol(f, Decl(declFileOptionalInterfaceMethod.ts, 0, 13))
+>f : Symbol(X.f, Decl(declFileOptionalInterfaceMethod.ts, 0, 13))
 >T : Symbol(T, Decl(declFileOptionalInterfaceMethod.ts, 1, 8))
 }
 
diff --git a/tests/baselines/reference/declFilePrivateMethodOverloads.symbols b/tests/baselines/reference/declFilePrivateMethodOverloads.symbols
index becc01438c2..6471ee7f5e7 100644
--- a/tests/baselines/reference/declFilePrivateMethodOverloads.symbols
+++ b/tests/baselines/reference/declFilePrivateMethodOverloads.symbols
@@ -4,13 +4,13 @@ interface IContext {
 >IContext : Symbol(IContext, Decl(declFilePrivateMethodOverloads.ts, 0, 0))
 
     someMethod();
->someMethod : Symbol(someMethod, Decl(declFilePrivateMethodOverloads.ts, 1, 20))
+>someMethod : Symbol(IContext.someMethod, Decl(declFilePrivateMethodOverloads.ts, 1, 20))
 }
 class c1 {
 >c1 : Symbol(c1, Decl(declFilePrivateMethodOverloads.ts, 3, 1))
 
     private _forEachBindingContext(bindingContext: IContext, fn: (bindingContext: IContext) => void);
->_forEachBindingContext : Symbol(_forEachBindingContext, Decl(declFilePrivateMethodOverloads.ts, 4, 10), Decl(declFilePrivateMethodOverloads.ts, 5, 101), Decl(declFilePrivateMethodOverloads.ts, 6, 113))
+>_forEachBindingContext : Symbol(c1._forEachBindingContext, Decl(declFilePrivateMethodOverloads.ts, 4, 10), Decl(declFilePrivateMethodOverloads.ts, 5, 101), Decl(declFilePrivateMethodOverloads.ts, 6, 113))
 >bindingContext : Symbol(bindingContext, Decl(declFilePrivateMethodOverloads.ts, 5, 35))
 >IContext : Symbol(IContext, Decl(declFilePrivateMethodOverloads.ts, 0, 0))
 >fn : Symbol(fn, Decl(declFilePrivateMethodOverloads.ts, 5, 60))
@@ -18,7 +18,7 @@ class c1 {
 >IContext : Symbol(IContext, Decl(declFilePrivateMethodOverloads.ts, 0, 0))
 
     private _forEachBindingContext(bindingContextArray: Array<IContext>, fn: (bindingContext: IContext) => void);
->_forEachBindingContext : Symbol(_forEachBindingContext, Decl(declFilePrivateMethodOverloads.ts, 4, 10), Decl(declFilePrivateMethodOverloads.ts, 5, 101), Decl(declFilePrivateMethodOverloads.ts, 6, 113))
+>_forEachBindingContext : Symbol(c1._forEachBindingContext, Decl(declFilePrivateMethodOverloads.ts, 4, 10), Decl(declFilePrivateMethodOverloads.ts, 5, 101), Decl(declFilePrivateMethodOverloads.ts, 6, 113))
 >bindingContextArray : Symbol(bindingContextArray, Decl(declFilePrivateMethodOverloads.ts, 6, 35))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >IContext : Symbol(IContext, Decl(declFilePrivateMethodOverloads.ts, 0, 0))
@@ -27,7 +27,7 @@ class c1 {
 >IContext : Symbol(IContext, Decl(declFilePrivateMethodOverloads.ts, 0, 0))
 
     private _forEachBindingContext(context, fn: (bindingContext: IContext) => void): void {
->_forEachBindingContext : Symbol(_forEachBindingContext, Decl(declFilePrivateMethodOverloads.ts, 4, 10), Decl(declFilePrivateMethodOverloads.ts, 5, 101), Decl(declFilePrivateMethodOverloads.ts, 6, 113))
+>_forEachBindingContext : Symbol(c1._forEachBindingContext, Decl(declFilePrivateMethodOverloads.ts, 4, 10), Decl(declFilePrivateMethodOverloads.ts, 5, 101), Decl(declFilePrivateMethodOverloads.ts, 6, 113))
 >context : Symbol(context, Decl(declFilePrivateMethodOverloads.ts, 7, 35))
 >fn : Symbol(fn, Decl(declFilePrivateMethodOverloads.ts, 7, 43))
 >bindingContext : Symbol(bindingContext, Decl(declFilePrivateMethodOverloads.ts, 7, 49))
@@ -37,12 +37,12 @@ class c1 {
     }
 
     private overloadWithArityDifference(bindingContext: IContext);
->overloadWithArityDifference : Symbol(overloadWithArityDifference, Decl(declFilePrivateMethodOverloads.ts, 9, 5), Decl(declFilePrivateMethodOverloads.ts, 11, 66), Decl(declFilePrivateMethodOverloads.ts, 12, 118))
+>overloadWithArityDifference : Symbol(c1.overloadWithArityDifference, Decl(declFilePrivateMethodOverloads.ts, 9, 5), Decl(declFilePrivateMethodOverloads.ts, 11, 66), Decl(declFilePrivateMethodOverloads.ts, 12, 118))
 >bindingContext : Symbol(bindingContext, Decl(declFilePrivateMethodOverloads.ts, 11, 40))
 >IContext : Symbol(IContext, Decl(declFilePrivateMethodOverloads.ts, 0, 0))
 
     private overloadWithArityDifference(bindingContextArray: Array<IContext>, fn: (bindingContext: IContext) => void);
->overloadWithArityDifference : Symbol(overloadWithArityDifference, Decl(declFilePrivateMethodOverloads.ts, 9, 5), Decl(declFilePrivateMethodOverloads.ts, 11, 66), Decl(declFilePrivateMethodOverloads.ts, 12, 118))
+>overloadWithArityDifference : Symbol(c1.overloadWithArityDifference, Decl(declFilePrivateMethodOverloads.ts, 9, 5), Decl(declFilePrivateMethodOverloads.ts, 11, 66), Decl(declFilePrivateMethodOverloads.ts, 12, 118))
 >bindingContextArray : Symbol(bindingContextArray, Decl(declFilePrivateMethodOverloads.ts, 12, 40))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >IContext : Symbol(IContext, Decl(declFilePrivateMethodOverloads.ts, 0, 0))
@@ -51,7 +51,7 @@ class c1 {
 >IContext : Symbol(IContext, Decl(declFilePrivateMethodOverloads.ts, 0, 0))
 
     private overloadWithArityDifference(context): void {
->overloadWithArityDifference : Symbol(overloadWithArityDifference, Decl(declFilePrivateMethodOverloads.ts, 9, 5), Decl(declFilePrivateMethodOverloads.ts, 11, 66), Decl(declFilePrivateMethodOverloads.ts, 12, 118))
+>overloadWithArityDifference : Symbol(c1.overloadWithArityDifference, Decl(declFilePrivateMethodOverloads.ts, 9, 5), Decl(declFilePrivateMethodOverloads.ts, 11, 66), Decl(declFilePrivateMethodOverloads.ts, 12, 118))
 >context : Symbol(context, Decl(declFilePrivateMethodOverloads.ts, 13, 40))
 
         // Function here
@@ -61,16 +61,16 @@ declare class c2 {
 >c2 : Symbol(c2, Decl(declFilePrivateMethodOverloads.ts, 16, 1))
 
     private overload1(context, fn);
->overload1 : Symbol(overload1, Decl(declFilePrivateMethodOverloads.ts, 17, 18))
+>overload1 : Symbol(c2.overload1, Decl(declFilePrivateMethodOverloads.ts, 17, 18))
 >context : Symbol(context, Decl(declFilePrivateMethodOverloads.ts, 18, 22))
 >fn : Symbol(fn, Decl(declFilePrivateMethodOverloads.ts, 18, 30))
 
     private overload2(context);
->overload2 : Symbol(overload2, Decl(declFilePrivateMethodOverloads.ts, 18, 35), Decl(declFilePrivateMethodOverloads.ts, 20, 31))
+>overload2 : Symbol(c2.overload2, Decl(declFilePrivateMethodOverloads.ts, 18, 35), Decl(declFilePrivateMethodOverloads.ts, 20, 31))
 >context : Symbol(context, Decl(declFilePrivateMethodOverloads.ts, 20, 22))
 
     private overload2(context, fn);
->overload2 : Symbol(overload2, Decl(declFilePrivateMethodOverloads.ts, 18, 35), Decl(declFilePrivateMethodOverloads.ts, 20, 31))
+>overload2 : Symbol(c2.overload2, Decl(declFilePrivateMethodOverloads.ts, 18, 35), Decl(declFilePrivateMethodOverloads.ts, 20, 31))
 >context : Symbol(context, Decl(declFilePrivateMethodOverloads.ts, 21, 22))
 >fn : Symbol(fn, Decl(declFilePrivateMethodOverloads.ts, 21, 30))
 }
diff --git a/tests/baselines/reference/declFileTypeAnnotationParenType.symbols b/tests/baselines/reference/declFileTypeAnnotationParenType.symbols
index bc5668b70bd..7186da48fd7 100644
--- a/tests/baselines/reference/declFileTypeAnnotationParenType.symbols
+++ b/tests/baselines/reference/declFileTypeAnnotationParenType.symbols
@@ -4,7 +4,7 @@ class c {
 >c : Symbol(c, Decl(declFileTypeAnnotationParenType.ts, 0, 0))
 
     private p: string;
->p : Symbol(p, Decl(declFileTypeAnnotationParenType.ts, 1, 9))
+>p : Symbol(c.p, Decl(declFileTypeAnnotationParenType.ts, 1, 9))
 }
 
 var x: (() => c)[] = [() => new c()];
diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeAlias.symbols b/tests/baselines/reference/declFileTypeAnnotationTypeAlias.symbols
index 27507817a77..d12902b6f19 100644
--- a/tests/baselines/reference/declFileTypeAnnotationTypeAlias.symbols
+++ b/tests/baselines/reference/declFileTypeAnnotationTypeAlias.symbols
@@ -40,7 +40,7 @@ interface Window {
 >Window : Symbol(Window, Decl(declFileTypeAnnotationTypeAlias.ts, 18, 1))
 
     someMethod();
->someMethod : Symbol(someMethod, Decl(declFileTypeAnnotationTypeAlias.ts, 20, 18))
+>someMethod : Symbol(Window.someMethod, Decl(declFileTypeAnnotationTypeAlias.ts, 20, 18))
 }
 
 module M {
diff --git a/tests/baselines/reference/declFileTypeAnnotationUnionType.symbols b/tests/baselines/reference/declFileTypeAnnotationUnionType.symbols
index f57df197579..ac4884326eb 100644
--- a/tests/baselines/reference/declFileTypeAnnotationUnionType.symbols
+++ b/tests/baselines/reference/declFileTypeAnnotationUnionType.symbols
@@ -4,7 +4,7 @@ class c {
 >c : Symbol(c, Decl(declFileTypeAnnotationUnionType.ts, 0, 0))
 
     private p: string;
->p : Symbol(p, Decl(declFileTypeAnnotationUnionType.ts, 1, 9))
+>p : Symbol(c.p, Decl(declFileTypeAnnotationUnionType.ts, 1, 9))
 }
 module m {
 >m : Symbol(m, Decl(declFileTypeAnnotationUnionType.ts, 3, 1))
@@ -13,14 +13,14 @@ module m {
 >c : Symbol(c, Decl(declFileTypeAnnotationUnionType.ts, 4, 10))
 
         private q: string;
->q : Symbol(q, Decl(declFileTypeAnnotationUnionType.ts, 5, 20))
+>q : Symbol(c.q, Decl(declFileTypeAnnotationUnionType.ts, 5, 20))
     }
     export class g<T> {
 >g : Symbol(g, Decl(declFileTypeAnnotationUnionType.ts, 7, 5))
 >T : Symbol(T, Decl(declFileTypeAnnotationUnionType.ts, 8, 19))
 
         private r: string;
->r : Symbol(r, Decl(declFileTypeAnnotationUnionType.ts, 8, 23))
+>r : Symbol(g.r, Decl(declFileTypeAnnotationUnionType.ts, 8, 23))
     }
 }
 class g<T> {
@@ -28,7 +28,7 @@ class g<T> {
 >T : Symbol(T, Decl(declFileTypeAnnotationUnionType.ts, 12, 8))
 
     private s: string;
->s : Symbol(s, Decl(declFileTypeAnnotationUnionType.ts, 12, 12))
+>s : Symbol(g.s, Decl(declFileTypeAnnotationUnionType.ts, 12, 12))
 }
 
 // Just the name
diff --git a/tests/baselines/reference/declFileTypeofClass.symbols b/tests/baselines/reference/declFileTypeofClass.symbols
index 26adfcc8ee4..0594edeef77 100644
--- a/tests/baselines/reference/declFileTypeofClass.symbols
+++ b/tests/baselines/reference/declFileTypeofClass.symbols
@@ -10,10 +10,10 @@ class c {
 >y : Symbol(c.y, Decl(declFileTypeofClass.ts, 2, 22))
 
     private x3: string;
->x3 : Symbol(x3, Decl(declFileTypeofClass.ts, 3, 29))
+>x3 : Symbol(c.x3, Decl(declFileTypeofClass.ts, 3, 29))
 
     public y3: number;
->y3 : Symbol(y3, Decl(declFileTypeofClass.ts, 4, 23))
+>y3 : Symbol(c.y3, Decl(declFileTypeofClass.ts, 4, 23))
 }
 
 var x: c;
diff --git a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.symbols b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.symbols
index d2548af7c4f..dd591277cd3 100644
--- a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.symbols
+++ b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.symbols
@@ -9,7 +9,7 @@ declare module A.B.Base {
 >W : Symbol(W, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 1, 25))
 
         id: number;
->id : Symbol(id, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 2, 20))
+>id : Symbol(W.id, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 2, 20))
     }
 }
 module X.Y.base {
@@ -28,7 +28,7 @@ module X.Y.base {
 >W : Symbol(A.B.Base.W, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 1, 25))
 
         name: string;
->name : Symbol(name, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 8, 39))
+>name : Symbol(W.name, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 8, 39))
     }
 }
 
@@ -50,7 +50,7 @@ module X.Y.base.Z {
 >W : Symbol(W, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 6, 17))
 
         value: boolean;
->value : Symbol(value, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 15, 47))
+>value : Symbol(W.value, Decl(declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts, 15, 47))
     }
 }
 
diff --git a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.symbols b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.symbols
index e5016ec9baa..552a4a44b35 100644
--- a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.symbols
+++ b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.symbols
@@ -18,7 +18,7 @@ module A.B {
 >EventManager : Symbol(EventManager, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 6, 12))
 
         id: number;
->id : Symbol(id, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 7, 31))
+>id : Symbol(EventManager.id, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 7, 31))
 
     }
 }
@@ -33,6 +33,6 @@ module A.B.C {
 >EventManager : Symbol(EventManager, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 6, 12))
 
         name: string;
->name : Symbol(name, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 14, 51))
+>name : Symbol(ContextMenu.name, Decl(declFileWithExtendsClauseThatHasItsContainerNameConflict.ts, 14, 51))
     }
 }
diff --git a/tests/baselines/reference/declInput.symbols b/tests/baselines/reference/declInput.symbols
index 90f075218c0..6faede31601 100644
--- a/tests/baselines/reference/declInput.symbols
+++ b/tests/baselines/reference/declInput.symbols
@@ -8,10 +8,10 @@ class bar {
 >bar : Symbol(bar, Decl(declInput.ts, 0, 0), Decl(declInput.ts, 2, 1))
 
   public f() { return ''; }
->f : Symbol(f, Decl(declInput.ts, 4, 11))
+>f : Symbol(bar.f, Decl(declInput.ts, 4, 11))
 
   public g() { return {a: <bar>null, b: undefined, c: void 4 }; }
->g : Symbol(g, Decl(declInput.ts, 5, 27))
+>g : Symbol(bar.g, Decl(declInput.ts, 5, 27))
 >a : Symbol(a, Decl(declInput.ts, 6, 23))
 >bar : Symbol(bar, Decl(declInput.ts, 0, 0), Decl(declInput.ts, 2, 1))
 >b : Symbol(b, Decl(declInput.ts, 6, 36))
@@ -19,7 +19,7 @@ class bar {
 >c : Symbol(c, Decl(declInput.ts, 6, 50))
 
   public h(x = 4, y = null, z = '') { x++; }
->h : Symbol(h, Decl(declInput.ts, 6, 65))
+>h : Symbol(bar.h, Decl(declInput.ts, 6, 65))
 >x : Symbol(x, Decl(declInput.ts, 7, 11))
 >y : Symbol(y, Decl(declInput.ts, 7, 17))
 >z : Symbol(z, Decl(declInput.ts, 7, 27))
diff --git a/tests/baselines/reference/declInput3.symbols b/tests/baselines/reference/declInput3.symbols
index 06f35db0164..c4097dd4b63 100644
--- a/tests/baselines/reference/declInput3.symbols
+++ b/tests/baselines/reference/declInput3.symbols
@@ -8,10 +8,10 @@ class bar {
 >bar : Symbol(bar, Decl(declInput3.ts, 2, 1))
 
   public f() { return ''; }
->f : Symbol(f, Decl(declInput3.ts, 4, 11))
+>f : Symbol(bar.f, Decl(declInput3.ts, 4, 11))
 
   public g() { return {a: <bar>null, b: undefined, c: void 4 }; }
->g : Symbol(g, Decl(declInput3.ts, 5, 27))
+>g : Symbol(bar.g, Decl(declInput3.ts, 5, 27))
 >a : Symbol(a, Decl(declInput3.ts, 6, 23))
 >bar : Symbol(bar, Decl(declInput3.ts, 2, 1))
 >b : Symbol(b, Decl(declInput3.ts, 6, 36))
@@ -19,7 +19,7 @@ class bar {
 >c : Symbol(c, Decl(declInput3.ts, 6, 50))
 
   public h(x = 4, y = null, z = '') { x++; }
->h : Symbol(h, Decl(declInput3.ts, 6, 65))
+>h : Symbol(bar.h, Decl(declInput3.ts, 6, 65))
 >x : Symbol(x, Decl(declInput3.ts, 7, 11))
 >y : Symbol(y, Decl(declInput3.ts, 7, 17))
 >z : Symbol(z, Decl(declInput3.ts, 7, 27))
diff --git a/tests/baselines/reference/declInput4.symbols b/tests/baselines/reference/declInput4.symbols
index 01af5987a7d..6420ad0916c 100644
--- a/tests/baselines/reference/declInput4.symbols
+++ b/tests/baselines/reference/declInput4.symbols
@@ -18,29 +18,29 @@ module M {
 >D : Symbol(D, Decl(declInput4.ts, 4, 19))
 
         public m1: number;
->m1 : Symbol(m1, Decl(declInput4.ts, 5, 20))
+>m1 : Symbol(D.m1, Decl(declInput4.ts, 5, 20))
 
         public m2: string;
->m2 : Symbol(m2, Decl(declInput4.ts, 6, 26))
+>m2 : Symbol(D.m2, Decl(declInput4.ts, 6, 26))
 
         public m23: E;
->m23 : Symbol(m23, Decl(declInput4.ts, 7, 26))
+>m23 : Symbol(D.m23, Decl(declInput4.ts, 7, 26))
 >E : Symbol(E, Decl(declInput4.ts, 1, 15))
 
         public m24: I1;
->m24 : Symbol(m24, Decl(declInput4.ts, 8, 22))
+>m24 : Symbol(D.m24, Decl(declInput4.ts, 8, 22))
 >I1 : Symbol(I1, Decl(declInput4.ts, 2, 21))
 
         public m232(): E { return null;}
->m232 : Symbol(m232, Decl(declInput4.ts, 9, 23))
+>m232 : Symbol(D.m232, Decl(declInput4.ts, 9, 23))
 >E : Symbol(E, Decl(declInput4.ts, 1, 15))
 
         public m242(): I1 { return null; }
->m242 : Symbol(m242, Decl(declInput4.ts, 10, 40))
+>m242 : Symbol(D.m242, Decl(declInput4.ts, 10, 40))
 >I1 : Symbol(I1, Decl(declInput4.ts, 2, 21))
 
         public m26(i:I1) {}
->m26 : Symbol(m26, Decl(declInput4.ts, 11, 42))
+>m26 : Symbol(D.m26, Decl(declInput4.ts, 11, 42))
 >i : Symbol(i, Decl(declInput4.ts, 12, 19))
 >I1 : Symbol(I1, Decl(declInput4.ts, 2, 21))
     }
diff --git a/tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.js b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.js
new file mode 100644
index 00000000000..643f9a8c889
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.js
@@ -0,0 +1,19 @@
+//// [pi.ts]
+export default 3.14159;
+
+//// [pi.js]
+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);
+        }
+    };
+});
+
+
+//// [pi.d.ts]
+declare var _default: number;
+export default _default;
diff --git a/tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.symbols b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.symbols
new file mode 100644
index 00000000000..a45ecb2e47e
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.symbols
@@ -0,0 +1,3 @@
+=== tests/cases/compiler/pi.ts ===
+export default 3.14159;
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.types b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.types
new file mode 100644
index 00000000000..a45ecb2e47e
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.types
@@ -0,0 +1,3 @@
+=== tests/cases/compiler/pi.ts ===
+export default 3.14159;
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.js b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.js
new file mode 100644
index 00000000000..35bdf2f9ecc
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.js
@@ -0,0 +1,22 @@
+//// [pi.ts]
+
+export default 3.14159;
+
+//// [app.js]
+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);
+        }
+    };
+});
+
+
+//// [app.d.ts]
+declare module "pi" {
+    var _default: number;
+    export default _default;
+}
diff --git a/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.symbols b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.symbols
new file mode 100644
index 00000000000..82f52e818e3
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.symbols
@@ -0,0 +1,4 @@
+=== tests/cases/compiler/pi.ts ===
+
+No type information for this code.export default 3.14159;
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.types b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.types
new file mode 100644
index 00000000000..82f52e818e3
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.types
@@ -0,0 +1,4 @@
+=== tests/cases/compiler/pi.ts ===
+
+No type information for this code.export default 3.14159;
+No type information for this code.
\ No newline at end of file
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/declarationEmitDestructuring5.types b/tests/baselines/reference/declarationEmitDestructuring5.types
index f09b1ebf50c..961dea62bcb 100644
--- a/tests/baselines/reference/declarationEmitDestructuring5.types
+++ b/tests/baselines/reference/declarationEmitDestructuring5.types
@@ -1,23 +1,23 @@
 === tests/cases/compiler/declarationEmitDestructuring5.ts ===
 function baz([, z, , ]) { }
->baz : ([, z, , ]: [any, any, any]) => void
+>baz : ([, z, ,]: [any, any, any]) => void
 > : undefined
 >z : any
 > : undefined
 
 function foo([, b, ]: [any, any]): void { }
->foo : ([, b, ]: [any, any]) => void
+>foo : ([, b,]: [any, any]) => void
 > : undefined
 >b : any
 
 function bar([z, , , ]) { }
->bar : ([z, , , ]: [any, any, any]) => void
+>bar : ([z, , ,]: [any, any, any]) => void
 >z : any
 > : undefined
 > : undefined
 
 function bar1([z, , , ] = [1, 3, 4, 6, 7]) { }
->bar1 : ([z, , , ]?: [number, number, number, number, number]) => void
+>bar1 : ([z, , ,]?: [number, number, number, number, number]) => void
 >z : number
 > : undefined
 > : undefined
@@ -29,7 +29,7 @@ function bar1([z, , , ] = [1, 3, 4, 6, 7]) { }
 >7 : number
 
 function bar2([,,z, , , ]) { }
->bar2 : ([,,z, , , ]: [any, any, any, any, any]) => void
+>bar2 : ([, , z, , ,]: [any, any, any, any, any]) => void
 > : undefined
 > : undefined
 >z : any
diff --git a/tests/baselines/reference/declarationEmitDestructuringOptionalBindingParametersInOverloads.types b/tests/baselines/reference/declarationEmitDestructuringOptionalBindingParametersInOverloads.types
index 1c75466f0c3..9eabfebe877 100644
--- a/tests/baselines/reference/declarationEmitDestructuringOptionalBindingParametersInOverloads.types
+++ b/tests/baselines/reference/declarationEmitDestructuringOptionalBindingParametersInOverloads.types
@@ -12,7 +12,7 @@ function foo(...rest: any[]) {
 }
 
 function foo2( { x, y, z }?: { x: string; y: number; z: boolean });
->foo2 : ({ x, y, z }?: { x: string; y: number; z: boolean; }) => any
+>foo2 : ({x, y, z}?: { x: string; y: number; z: boolean; }) => any
 >x : string
 >y : number
 >z : boolean
@@ -21,7 +21,7 @@ function foo2( { x, y, z }?: { x: string; y: number; z: boolean });
 >z : boolean
 
 function foo2(...rest: any[]) {
->foo2 : ({ x, y, z }?: { x: string; y: number; z: boolean; }) => any
+>foo2 : ({x, y, z}?: { x: string; y: number; z: boolean; }) => any
 >rest : any[]
 
 }
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/declarationEmitIdentifierPredicates01.js b/tests/baselines/reference/declarationEmitIdentifierPredicates01.js
new file mode 100644
index 00000000000..73141eb9af9
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitIdentifierPredicates01.js
@@ -0,0 +1,16 @@
+//// [declarationEmitIdentifierPredicates01.ts]
+
+export function f(x: any): x is number {
+    return typeof x === "number";
+}
+
+//// [declarationEmitIdentifierPredicates01.js]
+"use strict";
+function f(x) {
+    return typeof x === "number";
+}
+exports.f = f;
+
+
+//// [declarationEmitIdentifierPredicates01.d.ts]
+export declare function f(x: any): x is number;
diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicates01.symbols b/tests/baselines/reference/declarationEmitIdentifierPredicates01.symbols
new file mode 100644
index 00000000000..eb8b1151ceb
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitIdentifierPredicates01.symbols
@@ -0,0 +1,10 @@
+=== tests/cases/conformance/declarationEmit/typePredicates/declarationEmitIdentifierPredicates01.ts ===
+
+export function f(x: any): x is number {
+>f : Symbol(f, Decl(declarationEmitIdentifierPredicates01.ts, 0, 0))
+>x : Symbol(x, Decl(declarationEmitIdentifierPredicates01.ts, 1, 18))
+>x : Symbol(x, Decl(declarationEmitIdentifierPredicates01.ts, 1, 18))
+
+    return typeof x === "number";
+>x : Symbol(x, Decl(declarationEmitIdentifierPredicates01.ts, 1, 18))
+}
diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicates01.types b/tests/baselines/reference/declarationEmitIdentifierPredicates01.types
new file mode 100644
index 00000000000..7d8a5668265
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitIdentifierPredicates01.types
@@ -0,0 +1,13 @@
+=== tests/cases/conformance/declarationEmit/typePredicates/declarationEmitIdentifierPredicates01.ts ===
+
+export function f(x: any): x is number {
+>f : (x: any) => x is number
+>x : any
+>x : any
+
+    return typeof x === "number";
+>typeof x === "number" : boolean
+>typeof x : string
+>x : any
+>"number" : string
+}
diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.errors.txt b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.errors.txt
new file mode 100644
index 00000000000..e9084c45490
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.errors.txt
@@ -0,0 +1,14 @@
+tests/cases/conformance/declarationEmit/typePredicates/declarationEmitIdentifierPredicatesWithPrivateName01.ts(6,33): error TS4060: Return type of exported function has or is using private name 'I'.
+
+
+==== tests/cases/conformance/declarationEmit/typePredicates/declarationEmitIdentifierPredicatesWithPrivateName01.ts (1 errors) ====
+    
+    interface I {
+        a: number;
+    }
+    
+    export function f(x: any): x is I {
+                                    ~
+!!! error TS4060: Return type of exported function has or is using private name 'I'.
+        return typeof x.a === "number";
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js
new file mode 100644
index 00000000000..234542d8d99
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js
@@ -0,0 +1,16 @@
+//// [declarationEmitIdentifierPredicatesWithPrivateName01.ts]
+
+interface I {
+    a: number;
+}
+
+export function f(x: any): x is I {
+    return typeof x.a === "number";
+}
+
+//// [declarationEmitIdentifierPredicatesWithPrivateName01.js]
+"use strict";
+function f(x) {
+    return typeof x.a === "number";
+}
+exports.f = f;
diff --git a/tests/baselines/reference/declarationEmitThisPredicates01.js b/tests/baselines/reference/declarationEmitThisPredicates01.js
new file mode 100644
index 00000000000..d05b5c46dad
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitThisPredicates01.js
@@ -0,0 +1,43 @@
+//// [declarationEmitThisPredicates01.ts]
+
+export class C {
+    m(): this is D {
+        return this instanceof D;
+    }
+}
+
+export class D extends C {
+}
+
+//// [declarationEmitThisPredicates01.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 C = (function () {
+    function C() {
+    }
+    C.prototype.m = function () {
+        return this instanceof D;
+    };
+    return C;
+}());
+exports.C = C;
+var D = (function (_super) {
+    __extends(D, _super);
+    function D() {
+        _super.apply(this, arguments);
+    }
+    return D;
+}(C));
+exports.D = D;
+
+
+//// [declarationEmitThisPredicates01.d.ts]
+export declare class C {
+    m(): this is D;
+}
+export declare class D extends C {
+}
diff --git a/tests/baselines/reference/declarationEmitThisPredicates01.symbols b/tests/baselines/reference/declarationEmitThisPredicates01.symbols
new file mode 100644
index 00000000000..af5da751b8c
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitThisPredicates01.symbols
@@ -0,0 +1,19 @@
+=== tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicates01.ts ===
+
+export class C {
+>C : Symbol(C, Decl(declarationEmitThisPredicates01.ts, 0, 0))
+
+    m(): this is D {
+>m : Symbol(C.m, Decl(declarationEmitThisPredicates01.ts, 1, 16))
+>D : Symbol(D, Decl(declarationEmitThisPredicates01.ts, 5, 1))
+
+        return this instanceof D;
+>this : Symbol(C, Decl(declarationEmitThisPredicates01.ts, 0, 0))
+>D : Symbol(D, Decl(declarationEmitThisPredicates01.ts, 5, 1))
+    }
+}
+
+export class D extends C {
+>D : Symbol(D, Decl(declarationEmitThisPredicates01.ts, 5, 1))
+>C : Symbol(C, Decl(declarationEmitThisPredicates01.ts, 0, 0))
+}
diff --git a/tests/baselines/reference/declarationEmitThisPredicates01.types b/tests/baselines/reference/declarationEmitThisPredicates01.types
new file mode 100644
index 00000000000..9d801a40965
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitThisPredicates01.types
@@ -0,0 +1,20 @@
+=== tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicates01.ts ===
+
+export class C {
+>C : C
+
+    m(): this is D {
+>m : () => this is D
+>D : D
+
+        return this instanceof D;
+>this instanceof D : boolean
+>this : this
+>D : typeof D
+    }
+}
+
+export class D extends C {
+>D : D
+>C : C
+}
diff --git a/tests/baselines/reference/declarationEmitThisPredicates02.errors.txt b/tests/baselines/reference/declarationEmitThisPredicates02.errors.txt
new file mode 100644
index 00000000000..d3597ad2507
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitThisPredicates02.errors.txt
@@ -0,0 +1,24 @@
+tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicates02.ts(9,10): error TS2526: A 'this' type is available only in a non-static member of a class or interface.
+tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicates02.ts(10,19): error TS2352: Type '{ m(): this is Foo; }' cannot be converted to type 'Foo'.
+  Property 'a' is missing in type '{ m(): this is Foo; }'.
+
+
+==== tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicates02.ts (2 errors) ====
+    
+    export interface Foo {
+        a: string;
+        b: number;
+        c: boolean;
+    }
+    
+    export const obj = {
+        m(): this is Foo {
+             ~~~~
+!!! error TS2526: A 'this' type is available only in a non-static member of a class or interface.
+            let dis = this as Foo;
+                      ~~~~~~~~~~~
+!!! error TS2352: Type '{ m(): this is Foo; }' cannot be converted to type 'Foo'.
+!!! error TS2352:   Property 'a' is missing in type '{ m(): this is Foo; }'.
+            return dis.a != null && dis.b != null && dis.c != null;
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitThisPredicates02.js b/tests/baselines/reference/declarationEmitThisPredicates02.js
new file mode 100644
index 00000000000..e938a615b6d
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitThisPredicates02.js
@@ -0,0 +1,34 @@
+//// [declarationEmitThisPredicates02.ts]
+
+export interface Foo {
+    a: string;
+    b: number;
+    c: boolean;
+}
+
+export const obj = {
+    m(): this is Foo {
+        let dis = this as Foo;
+        return dis.a != null && dis.b != null && dis.c != null;
+    }
+}
+
+//// [declarationEmitThisPredicates02.js]
+"use strict";
+exports.obj = {
+    m: function () {
+        var dis = this;
+        return dis.a != null && dis.b != null && dis.c != null;
+    }
+};
+
+
+//// [declarationEmitThisPredicates02.d.ts]
+export interface Foo {
+    a: string;
+    b: number;
+    c: boolean;
+}
+export declare const obj: {
+    m(): this is Foo;
+};
diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.errors.txt b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.errors.txt
new file mode 100644
index 00000000000..67c76283f80
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.errors.txt
@@ -0,0 +1,15 @@
+tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName01.ts(3,18): error TS4055: Return type of public method from exported class has or is using private name 'D'.
+
+
+==== tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName01.ts (1 errors) ====
+    
+    export class C {
+        m(): this is D {
+                     ~
+!!! error TS4055: Return type of public method from exported class has or is using private name 'D'.
+            return this instanceof D;
+        }
+    }
+    
+    class D extends C {
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
new file mode 100644
index 00000000000..e34dcc9810f
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
@@ -0,0 +1,34 @@
+//// [declarationEmitThisPredicatesWithPrivateName01.ts]
+
+export class C {
+    m(): this is D {
+        return this instanceof D;
+    }
+}
+
+class D extends C {
+}
+
+//// [declarationEmitThisPredicatesWithPrivateName01.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 C = (function () {
+    function C() {
+    }
+    C.prototype.m = function () {
+        return this instanceof D;
+    };
+    return C;
+}());
+exports.C = C;
+var D = (function (_super) {
+    __extends(D, _super);
+    function D() {
+        _super.apply(this, arguments);
+    }
+    return D;
+}(C));
diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.errors.txt b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.errors.txt
new file mode 100644
index 00000000000..7a4716a92e0
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.errors.txt
@@ -0,0 +1,27 @@
+tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName02.ts(8,14): error TS4025: Exported variable 'obj' has or is using private name 'Foo'.
+tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName02.ts(9,10): error TS2526: A 'this' type is available only in a non-static member of a class or interface.
+tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName02.ts(10,19): error TS2352: Type '{ m(): this is Foo; }' cannot be converted to type 'Foo'.
+  Property 'a' is missing in type '{ m(): this is Foo; }'.
+
+
+==== tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName02.ts (3 errors) ====
+    
+    interface Foo {
+        a: string;
+        b: number;
+        c: boolean;
+    }
+    
+    export const obj = {
+                 ~~~
+!!! error TS4025: Exported variable 'obj' has or is using private name 'Foo'.
+        m(): this is Foo {
+             ~~~~
+!!! error TS2526: A 'this' type is available only in a non-static member of a class or interface.
+            let dis = this as Foo;
+                      ~~~~~~~~~~~
+!!! error TS2352: Type '{ m(): this is Foo; }' cannot be converted to type 'Foo'.
+!!! error TS2352:   Property 'a' is missing in type '{ m(): this is Foo; }'.
+            return dis.a != null && dis.b != null && dis.c != null;
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js
new file mode 100644
index 00000000000..df0d5b7903a
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js
@@ -0,0 +1,23 @@
+//// [declarationEmitThisPredicatesWithPrivateName02.ts]
+
+interface Foo {
+    a: string;
+    b: number;
+    c: boolean;
+}
+
+export const obj = {
+    m(): this is Foo {
+        let dis = this as Foo;
+        return dis.a != null && dis.b != null && dis.c != null;
+    }
+}
+
+//// [declarationEmitThisPredicatesWithPrivateName02.js]
+"use strict";
+exports.obj = {
+    m: function () {
+        var dis = this;
+        return dis.a != null && dis.b != null && dis.c != null;
+    }
+};
diff --git a/tests/baselines/reference/declarationEmit_UnknownImport2.js b/tests/baselines/reference/declarationEmit_UnknownImport2.js
index 213b4fc7369..09fa4718614 100644
--- a/tests/baselines/reference/declarationEmit_UnknownImport2.js
+++ b/tests/baselines/reference/declarationEmit_UnknownImport2.js
@@ -4,5 +4,5 @@ import Foo From './Foo'; // Syntax error
 export default Foo
 
 //// [declarationEmit_UnknownImport2.js]
-"use strict";
 './Foo'; // Syntax error
+"use strict";
diff --git a/tests/baselines/reference/declarationEmit_bindingPatterns.js b/tests/baselines/reference/declarationEmit_bindingPatterns.js
new file mode 100644
index 00000000000..8cc52af53b8
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_bindingPatterns.js
@@ -0,0 +1,26 @@
+//// [declarationEmit_bindingPatterns.ts]
+
+const k = ({x: z = 'y'}) => { }
+
+var a;
+function f({} = a, [] = a, { p: {} = a} = a) {
+}
+
+//// [declarationEmit_bindingPatterns.js]
+var k = function (_a) {
+    var _b = _a.x, z = _b === void 0 ? 'y' : _b;
+};
+var a;
+function f(_a, _b, _c) {
+    _a = a;
+    _b = a;
+    var _d = (_c === void 0 ? a : _c).p, _e = _d === void 0 ? a : _d;
+}
+
+
+//// [declarationEmit_bindingPatterns.d.ts]
+declare const k: ({x: z}: {
+    x?: string;
+}) => void;
+declare var a: any;
+declare function f({}?: any, []?: any, {p: {}}?: any): void;
diff --git a/tests/baselines/reference/declarationEmit_bindingPatterns.symbols b/tests/baselines/reference/declarationEmit_bindingPatterns.symbols
new file mode 100644
index 00000000000..b39aca17ea3
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_bindingPatterns.symbols
@@ -0,0 +1,17 @@
+=== tests/cases/compiler/declarationEmit_bindingPatterns.ts ===
+
+const k = ({x: z = 'y'}) => { }
+>k : Symbol(k, Decl(declarationEmit_bindingPatterns.ts, 1, 5))
+>x : Symbol(x)
+>z : Symbol(z, Decl(declarationEmit_bindingPatterns.ts, 1, 12))
+
+var a;
+>a : Symbol(a, Decl(declarationEmit_bindingPatterns.ts, 3, 3))
+
+function f({} = a, [] = a, { p: {} = a} = a) {
+>f : Symbol(f, Decl(declarationEmit_bindingPatterns.ts, 3, 6))
+>a : Symbol(a, Decl(declarationEmit_bindingPatterns.ts, 3, 3))
+>a : Symbol(a, Decl(declarationEmit_bindingPatterns.ts, 3, 3))
+>a : Symbol(a, Decl(declarationEmit_bindingPatterns.ts, 3, 3))
+>a : Symbol(a, Decl(declarationEmit_bindingPatterns.ts, 3, 3))
+}
diff --git a/tests/baselines/reference/declarationEmit_bindingPatterns.types b/tests/baselines/reference/declarationEmit_bindingPatterns.types
new file mode 100644
index 00000000000..eff2d4bd4a3
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_bindingPatterns.types
@@ -0,0 +1,20 @@
+=== tests/cases/compiler/declarationEmit_bindingPatterns.ts ===
+
+const k = ({x: z = 'y'}) => { }
+>k : ({x: z}: { x?: string; }) => void
+>({x: z = 'y'}) => { } : ({x: z}: { x?: string; }) => void
+>x : any
+>z : string
+>'y' : string
+
+var a;
+>a : any
+
+function f({} = a, [] = a, { p: {} = a} = a) {
+>f : ({}?: any, []?: any, {p: {}}?: any) => void
+>a : any
+>a : any
+>p : any
+>a : any
+>a : any
+}
diff --git a/tests/baselines/reference/declarationEmit_classMemberNameConflict.js b/tests/baselines/reference/declarationEmit_classMemberNameConflict.js
new file mode 100644
index 00000000000..55acb13d2b9
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_classMemberNameConflict.js
@@ -0,0 +1,112 @@
+//// [declarationEmit_classMemberNameConflict.ts]
+
+export class C1 {
+    C1() { } // has to be the same as the class name
+
+    bar() {
+        return function (t: typeof C1) {
+        };
+    }
+}
+
+export class C2 {
+    C2: any // has to be the same as the class name
+
+    bar() {
+        return function (t: typeof C2) {
+        };
+    }
+}
+
+export class C3 {
+    get C3() { return 0; } // has to be the same as the class name
+
+    bar() {
+        return function (t: typeof C3) {
+        };
+    }
+}
+
+export class C4 {
+    set C4(v) { } // has to be the same as the class name
+
+    bar() {
+        return function (t: typeof C4) {
+        };
+    }
+}
+
+//// [declarationEmit_classMemberNameConflict.js]
+"use strict";
+var C1 = (function () {
+    function C1() {
+    }
+    C1.prototype.C1 = function () { }; // has to be the same as the class name
+    C1.prototype.bar = function () {
+        return function (t) {
+        };
+    };
+    return C1;
+}());
+exports.C1 = C1;
+var C2 = (function () {
+    function C2() {
+    }
+    C2.prototype.bar = function () {
+        return function (t) {
+        };
+    };
+    return C2;
+}());
+exports.C2 = C2;
+var C3 = (function () {
+    function C3() {
+    }
+    Object.defineProperty(C3.prototype, "C3", {
+        get: function () { return 0; } // has to be the same as the class name
+        ,
+        enumerable: true,
+        configurable: true
+    });
+    C3.prototype.bar = function () {
+        return function (t) {
+        };
+    };
+    return C3;
+}());
+exports.C3 = C3;
+var C4 = (function () {
+    function C4() {
+    }
+    Object.defineProperty(C4.prototype, "C4", {
+        set: function (v) { } // has to be the same as the class name
+        ,
+        enumerable: true,
+        configurable: true
+    });
+    C4.prototype.bar = function () {
+        return function (t) {
+        };
+    };
+    return C4;
+}());
+exports.C4 = C4;
+
+
+//// [declarationEmit_classMemberNameConflict.d.ts]
+export declare class C1 {
+    C1(): void;
+    bar(): (t: typeof C1) => void;
+}
+export declare class C2 {
+    C2: any;
+    bar(): (t: typeof C2) => void;
+}
+export declare class C3 {
+    readonly C3: number;
+    bar(): (t: typeof C3) => void;
+}
+export declare class C4 {
+    C4: any;
+    bar(): (t: typeof C4) => void;
+}
diff --git a/tests/baselines/reference/declarationEmit_classMemberNameConflict.symbols b/tests/baselines/reference/declarationEmit_classMemberNameConflict.symbols
new file mode 100644
index 00000000000..2b8959289a8
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_classMemberNameConflict.symbols
@@ -0,0 +1,70 @@
+=== tests/cases/compiler/declarationEmit_classMemberNameConflict.ts ===
+
+export class C1 {
+>C1 : Symbol(C1, Decl(declarationEmit_classMemberNameConflict.ts, 0, 0))
+
+    C1() { } // has to be the same as the class name
+>C1 : Symbol(C1.C1, Decl(declarationEmit_classMemberNameConflict.ts, 1, 17))
+
+    bar() {
+>bar : Symbol(C1.bar, Decl(declarationEmit_classMemberNameConflict.ts, 2, 12))
+
+        return function (t: typeof C1) {
+>t : Symbol(t, Decl(declarationEmit_classMemberNameConflict.ts, 5, 25))
+>C1 : Symbol(C1, Decl(declarationEmit_classMemberNameConflict.ts, 0, 0))
+
+        };
+    }
+}
+
+export class C2 {
+>C2 : Symbol(C2, Decl(declarationEmit_classMemberNameConflict.ts, 8, 1))
+
+    C2: any // has to be the same as the class name
+>C2 : Symbol(C2.C2, Decl(declarationEmit_classMemberNameConflict.ts, 10, 17))
+
+    bar() {
+>bar : Symbol(C2.bar, Decl(declarationEmit_classMemberNameConflict.ts, 11, 11))
+
+        return function (t: typeof C2) {
+>t : Symbol(t, Decl(declarationEmit_classMemberNameConflict.ts, 14, 25))
+>C2 : Symbol(C2, Decl(declarationEmit_classMemberNameConflict.ts, 8, 1))
+
+        };
+    }
+}
+
+export class C3 {
+>C3 : Symbol(C3, Decl(declarationEmit_classMemberNameConflict.ts, 17, 1))
+
+    get C3() { return 0; } // has to be the same as the class name
+>C3 : Symbol(C3.C3, Decl(declarationEmit_classMemberNameConflict.ts, 19, 17))
+
+    bar() {
+>bar : Symbol(C3.bar, Decl(declarationEmit_classMemberNameConflict.ts, 20, 26))
+
+        return function (t: typeof C3) {
+>t : Symbol(t, Decl(declarationEmit_classMemberNameConflict.ts, 23, 25))
+>C3 : Symbol(C3, Decl(declarationEmit_classMemberNameConflict.ts, 17, 1))
+
+        };
+    }
+}
+
+export class C4 {
+>C4 : Symbol(C4, Decl(declarationEmit_classMemberNameConflict.ts, 26, 1))
+
+    set C4(v) { } // has to be the same as the class name
+>C4 : Symbol(C4.C4, Decl(declarationEmit_classMemberNameConflict.ts, 28, 17))
+>v : Symbol(v, Decl(declarationEmit_classMemberNameConflict.ts, 29, 11))
+
+    bar() {
+>bar : Symbol(C4.bar, Decl(declarationEmit_classMemberNameConflict.ts, 29, 17))
+
+        return function (t: typeof C4) {
+>t : Symbol(t, Decl(declarationEmit_classMemberNameConflict.ts, 32, 25))
+>C4 : Symbol(C4, Decl(declarationEmit_classMemberNameConflict.ts, 26, 1))
+
+        };
+    }
+}
diff --git a/tests/baselines/reference/declarationEmit_classMemberNameConflict.types b/tests/baselines/reference/declarationEmit_classMemberNameConflict.types
new file mode 100644
index 00000000000..c76072413e5
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_classMemberNameConflict.types
@@ -0,0 +1,75 @@
+=== tests/cases/compiler/declarationEmit_classMemberNameConflict.ts ===
+
+export class C1 {
+>C1 : C1
+
+    C1() { } // has to be the same as the class name
+>C1 : () => void
+
+    bar() {
+>bar : () => (t: typeof C1) => void
+
+        return function (t: typeof C1) {
+>function (t: typeof C1) {        } : (t: typeof C1) => void
+>t : typeof C1
+>C1 : typeof C1
+
+        };
+    }
+}
+
+export class C2 {
+>C2 : C2
+
+    C2: any // has to be the same as the class name
+>C2 : any
+
+    bar() {
+>bar : () => (t: typeof C2) => void
+
+        return function (t: typeof C2) {
+>function (t: typeof C2) {        } : (t: typeof C2) => void
+>t : typeof C2
+>C2 : typeof C2
+
+        };
+    }
+}
+
+export class C3 {
+>C3 : C3
+
+    get C3() { return 0; } // has to be the same as the class name
+>C3 : number
+>0 : number
+
+    bar() {
+>bar : () => (t: typeof C3) => void
+
+        return function (t: typeof C3) {
+>function (t: typeof C3) {        } : (t: typeof C3) => void
+>t : typeof C3
+>C3 : typeof C3
+
+        };
+    }
+}
+
+export class C4 {
+>C4 : C4
+
+    set C4(v) { } // has to be the same as the class name
+>C4 : any
+>v : any
+
+    bar() {
+>bar : () => (t: typeof C4) => void
+
+        return function (t: typeof C4) {
+>function (t: typeof C4) {        } : (t: typeof C4) => void
+>t : typeof C4
+>C4 : typeof C4
+
+        };
+    }
+}
diff --git a/tests/baselines/reference/declarationEmit_classMemberNameConflict2.js b/tests/baselines/reference/declarationEmit_classMemberNameConflict2.js
new file mode 100644
index 00000000000..03dc5cdbafd
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_classMemberNameConflict2.js
@@ -0,0 +1,59 @@
+//// [declarationEmit_classMemberNameConflict2.ts]
+
+const Bar = 'bar';
+
+enum Hello {
+    World
+}
+
+enum Hello1 {
+    World1
+}
+
+class Foo {
+    // Same names + string => OK
+    Bar = Bar;
+
+    // Same names + enum => OK
+    Hello = Hello;
+
+    // Different names + enum => OK
+    Hello2 = Hello1;
+}
+
+//// [declarationEmit_classMemberNameConflict2.js]
+var Bar = 'bar';
+var Hello;
+(function (Hello) {
+    Hello[Hello["World"] = 0] = "World";
+})(Hello || (Hello = {}));
+var Hello1;
+(function (Hello1) {
+    Hello1[Hello1["World1"] = 0] = "World1";
+})(Hello1 || (Hello1 = {}));
+var Foo = (function () {
+    function Foo() {
+        // Same names + string => OK
+        this.Bar = Bar;
+        // Same names + enum => OK
+        this.Hello = Hello;
+        // Different names + enum => OK
+        this.Hello2 = Hello1;
+    }
+    return Foo;
+}());
+
+
+//// [declarationEmit_classMemberNameConflict2.d.ts]
+declare const Bar: string;
+declare enum Hello {
+    World = 0,
+}
+declare enum Hello1 {
+    World1 = 0,
+}
+declare class Foo {
+    Bar: string;
+    Hello: typeof Hello;
+    Hello2: typeof Hello1;
+}
diff --git a/tests/baselines/reference/declarationEmit_classMemberNameConflict2.symbols b/tests/baselines/reference/declarationEmit_classMemberNameConflict2.symbols
new file mode 100644
index 00000000000..e7c4b6f060c
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_classMemberNameConflict2.symbols
@@ -0,0 +1,37 @@
+=== tests/cases/compiler/declarationEmit_classMemberNameConflict2.ts ===
+
+const Bar = 'bar';
+>Bar : Symbol(Bar, Decl(declarationEmit_classMemberNameConflict2.ts, 1, 5))
+
+enum Hello {
+>Hello : Symbol(Hello, Decl(declarationEmit_classMemberNameConflict2.ts, 1, 18))
+
+    World
+>World : Symbol(Hello.World, Decl(declarationEmit_classMemberNameConflict2.ts, 3, 12))
+}
+
+enum Hello1 {
+>Hello1 : Symbol(Hello1, Decl(declarationEmit_classMemberNameConflict2.ts, 5, 1))
+
+    World1
+>World1 : Symbol(Hello1.World1, Decl(declarationEmit_classMemberNameConflict2.ts, 7, 13))
+}
+
+class Foo {
+>Foo : Symbol(Foo, Decl(declarationEmit_classMemberNameConflict2.ts, 9, 1))
+
+    // Same names + string => OK
+    Bar = Bar;
+>Bar : Symbol(Foo.Bar, Decl(declarationEmit_classMemberNameConflict2.ts, 11, 11))
+>Bar : Symbol(Bar, Decl(declarationEmit_classMemberNameConflict2.ts, 1, 5))
+
+    // Same names + enum => OK
+    Hello = Hello;
+>Hello : Symbol(Foo.Hello, Decl(declarationEmit_classMemberNameConflict2.ts, 13, 14))
+>Hello : Symbol(Hello, Decl(declarationEmit_classMemberNameConflict2.ts, 1, 18))
+
+    // Different names + enum => OK
+    Hello2 = Hello1;
+>Hello2 : Symbol(Foo.Hello2, Decl(declarationEmit_classMemberNameConflict2.ts, 16, 18))
+>Hello1 : Symbol(Hello1, Decl(declarationEmit_classMemberNameConflict2.ts, 5, 1))
+}
diff --git a/tests/baselines/reference/declarationEmit_classMemberNameConflict2.types b/tests/baselines/reference/declarationEmit_classMemberNameConflict2.types
new file mode 100644
index 00000000000..9f8ddd8a2d5
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_classMemberNameConflict2.types
@@ -0,0 +1,38 @@
+=== tests/cases/compiler/declarationEmit_classMemberNameConflict2.ts ===
+
+const Bar = 'bar';
+>Bar : string
+>'bar' : string
+
+enum Hello {
+>Hello : Hello
+
+    World
+>World : Hello
+}
+
+enum Hello1 {
+>Hello1 : Hello1
+
+    World1
+>World1 : Hello1
+}
+
+class Foo {
+>Foo : Foo
+
+    // Same names + string => OK
+    Bar = Bar;
+>Bar : string
+>Bar : string
+
+    // Same names + enum => OK
+    Hello = Hello;
+>Hello : typeof Hello
+>Hello : typeof Hello
+
+    // Different names + enum => OK
+    Hello2 = Hello1;
+>Hello2 : typeof Hello1
+>Hello1 : typeof Hello1
+}
diff --git a/tests/baselines/reference/declarationEmit_expressionInExtends.js b/tests/baselines/reference/declarationEmit_expressionInExtends.js
new file mode 100644
index 00000000000..061042aa34b
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_expressionInExtends.js
@@ -0,0 +1,49 @@
+//// [declarationEmit_expressionInExtends.ts]
+
+var x: {
+    new<T>(s: any): Q;
+}
+
+class Q {
+    s: string;    
+}
+
+class B extends x<string> {    
+}
+
+var q: B;
+q.s;
+
+//// [declarationEmit_expressionInExtends.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 x;
+var Q = (function () {
+    function Q() {
+    }
+    return Q;
+}());
+var B = (function (_super) {
+    __extends(B, _super);
+    function B() {
+        _super.apply(this, arguments);
+    }
+    return B;
+}(x));
+var q;
+q.s;
+
+
+//// [declarationEmit_expressionInExtends.d.ts]
+declare var x: {
+    new <T>(s: any): Q;
+};
+declare class Q {
+    s: string;
+}
+declare class B extends x<string> {
+}
+declare var q: B;
diff --git a/tests/baselines/reference/declarationEmit_expressionInExtends.symbols b/tests/baselines/reference/declarationEmit_expressionInExtends.symbols
new file mode 100644
index 00000000000..319914702ac
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_expressionInExtends.symbols
@@ -0,0 +1,32 @@
+=== tests/cases/compiler/declarationEmit_expressionInExtends.ts ===
+
+var x: {
+>x : Symbol(x, Decl(declarationEmit_expressionInExtends.ts, 1, 3))
+
+    new<T>(s: any): Q;
+>T : Symbol(T, Decl(declarationEmit_expressionInExtends.ts, 2, 8))
+>s : Symbol(s, Decl(declarationEmit_expressionInExtends.ts, 2, 11))
+>Q : Symbol(Q, Decl(declarationEmit_expressionInExtends.ts, 3, 1))
+}
+
+class Q {
+>Q : Symbol(Q, Decl(declarationEmit_expressionInExtends.ts, 3, 1))
+
+    s: string;    
+>s : Symbol(Q.s, Decl(declarationEmit_expressionInExtends.ts, 5, 9))
+}
+
+class B extends x<string> {    
+>B : Symbol(B, Decl(declarationEmit_expressionInExtends.ts, 7, 1))
+>x : Symbol(x, Decl(declarationEmit_expressionInExtends.ts, 1, 3))
+}
+
+var q: B;
+>q : Symbol(q, Decl(declarationEmit_expressionInExtends.ts, 12, 3))
+>B : Symbol(B, Decl(declarationEmit_expressionInExtends.ts, 7, 1))
+
+q.s;
+>q.s : Symbol(Q.s, Decl(declarationEmit_expressionInExtends.ts, 5, 9))
+>q : Symbol(q, Decl(declarationEmit_expressionInExtends.ts, 12, 3))
+>s : Symbol(Q.s, Decl(declarationEmit_expressionInExtends.ts, 5, 9))
+
diff --git a/tests/baselines/reference/declarationEmit_expressionInExtends.types b/tests/baselines/reference/declarationEmit_expressionInExtends.types
new file mode 100644
index 00000000000..2e810fccf68
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_expressionInExtends.types
@@ -0,0 +1,32 @@
+=== tests/cases/compiler/declarationEmit_expressionInExtends.ts ===
+
+var x: {
+>x : new <T>(s: any) => Q
+
+    new<T>(s: any): Q;
+>T : T
+>s : any
+>Q : Q
+}
+
+class Q {
+>Q : Q
+
+    s: string;    
+>s : string
+}
+
+class B extends x<string> {    
+>B : B
+>x : Q
+}
+
+var q: B;
+>q : B
+>B : B
+
+q.s;
+>q.s : string
+>q : B
+>s : string
+
diff --git a/tests/baselines/reference/declarationEmit_expressionInExtends2.js b/tests/baselines/reference/declarationEmit_expressionInExtends2.js
new file mode 100644
index 00000000000..da0478e26d0
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_expressionInExtends2.js
@@ -0,0 +1,45 @@
+//// [declarationEmit_expressionInExtends2.ts]
+
+class C<T, U> {
+    x: T;
+    y: U;
+}
+
+function getClass<T>(c: T) {
+    return C;
+}
+
+class MyClass extends getClass(2) <string, number> {
+}
+
+//// [declarationEmit_expressionInExtends2.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 C = (function () {
+    function C() {
+    }
+    return C;
+}());
+function getClass(c) {
+    return C;
+}
+var MyClass = (function (_super) {
+    __extends(MyClass, _super);
+    function MyClass() {
+        _super.apply(this, arguments);
+    }
+    return MyClass;
+}(getClass(2)));
+
+
+//// [declarationEmit_expressionInExtends2.d.ts]
+declare class C<T, U> {
+    x: T;
+    y: U;
+}
+declare function getClass<T>(c: T): typeof C;
+declare class MyClass extends C<string, number> {
+}
diff --git a/tests/baselines/reference/declarationEmit_expressionInExtends2.symbols b/tests/baselines/reference/declarationEmit_expressionInExtends2.symbols
new file mode 100644
index 00000000000..03a36a49b15
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_expressionInExtends2.symbols
@@ -0,0 +1,30 @@
+=== tests/cases/compiler/declarationEmit_expressionInExtends2.ts ===
+
+class C<T, U> {
+>C : Symbol(C, Decl(declarationEmit_expressionInExtends2.ts, 0, 0))
+>T : Symbol(T, Decl(declarationEmit_expressionInExtends2.ts, 1, 8))
+>U : Symbol(U, Decl(declarationEmit_expressionInExtends2.ts, 1, 10))
+
+    x: T;
+>x : Symbol(C.x, Decl(declarationEmit_expressionInExtends2.ts, 1, 15))
+>T : Symbol(T, Decl(declarationEmit_expressionInExtends2.ts, 1, 8))
+
+    y: U;
+>y : Symbol(C.y, Decl(declarationEmit_expressionInExtends2.ts, 2, 9))
+>U : Symbol(U, Decl(declarationEmit_expressionInExtends2.ts, 1, 10))
+}
+
+function getClass<T>(c: T) {
+>getClass : Symbol(getClass, Decl(declarationEmit_expressionInExtends2.ts, 4, 1))
+>T : Symbol(T, Decl(declarationEmit_expressionInExtends2.ts, 6, 18))
+>c : Symbol(c, Decl(declarationEmit_expressionInExtends2.ts, 6, 21))
+>T : Symbol(T, Decl(declarationEmit_expressionInExtends2.ts, 6, 18))
+
+    return C;
+>C : Symbol(C, Decl(declarationEmit_expressionInExtends2.ts, 0, 0))
+}
+
+class MyClass extends getClass(2) <string, number> {
+>MyClass : Symbol(MyClass, Decl(declarationEmit_expressionInExtends2.ts, 8, 1))
+>getClass : Symbol(getClass, Decl(declarationEmit_expressionInExtends2.ts, 4, 1))
+}
diff --git a/tests/baselines/reference/declarationEmit_expressionInExtends2.types b/tests/baselines/reference/declarationEmit_expressionInExtends2.types
new file mode 100644
index 00000000000..77a1539267d
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_expressionInExtends2.types
@@ -0,0 +1,32 @@
+=== tests/cases/compiler/declarationEmit_expressionInExtends2.ts ===
+
+class C<T, U> {
+>C : C<T, U>
+>T : T
+>U : U
+
+    x: T;
+>x : T
+>T : T
+
+    y: U;
+>y : U
+>U : U
+}
+
+function getClass<T>(c: T) {
+>getClass : <T>(c: T) => typeof C
+>T : T
+>c : T
+>T : T
+
+    return C;
+>C : typeof C
+}
+
+class MyClass extends getClass(2) <string, number> {
+>MyClass : MyClass
+>getClass(2) : C<string, number>
+>getClass : <T>(c: T) => typeof C
+>2 : number
+}
diff --git a/tests/baselines/reference/declarationEmit_expressionInExtends3.errors.txt b/tests/baselines/reference/declarationEmit_expressionInExtends3.errors.txt
new file mode 100644
index 00000000000..2783810c568
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_expressionInExtends3.errors.txt
@@ -0,0 +1,52 @@
+tests/cases/compiler/declarationEmit_expressionInExtends3.ts(29,30): error TS4020: Extends clause of exported class 'MyClass' has or is using private name 'LocalClass'.
+tests/cases/compiler/declarationEmit_expressionInExtends3.ts(37,31): error TS4020: Extends clause of exported class 'MyClass3' has or is using private name 'LocalInterface'.
+
+
+==== tests/cases/compiler/declarationEmit_expressionInExtends3.ts (2 errors) ====
+    
+    export class ExportedClass<T> {
+    	x: T;
+    }
+    
+    class LocalClass<T, U> {
+        x: T;
+        y: U;
+    }
+    
+    export interface ExportedInterface {
+        x: number;
+    }
+    
+    interface LocalInterface {
+        x: number;
+    }
+    
+    function getLocalClass<T>(c: T) {
+        return LocalClass;
+    }
+    
+    function getExportedClass<T>(c: T) {
+        return ExportedClass;
+    }
+    
+    
+    
+    export class MyClass extends getLocalClass<LocalInterface>(undefined)<string, number> { // error LocalClass is inaccisible
+                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS4020: Extends clause of exported class 'MyClass' has or is using private name 'LocalClass'.
+    }
+    
+    
+    export class MyClass2 extends getExportedClass<LocalInterface>(undefined)<string> { // OK
+    }
+    
+    
+    export class MyClass3 extends getExportedClass<LocalInterface>(undefined)<LocalInterface> { // Error LocalInterface is inaccisble
+                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS4020: Extends clause of exported class 'MyClass3' has or is using private name 'LocalInterface'.
+    }
+    
+    
+    export class MyClass4 extends getExportedClass<LocalInterface>(undefined)<ExportedInterface> { // OK
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmit_expressionInExtends3.js b/tests/baselines/reference/declarationEmit_expressionInExtends3.js
new file mode 100644
index 00000000000..10ef42d6838
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_expressionInExtends3.js
@@ -0,0 +1,101 @@
+//// [declarationEmit_expressionInExtends3.ts]
+
+export class ExportedClass<T> {
+	x: T;
+}
+
+class LocalClass<T, U> {
+    x: T;
+    y: U;
+}
+
+export interface ExportedInterface {
+    x: number;
+}
+
+interface LocalInterface {
+    x: number;
+}
+
+function getLocalClass<T>(c: T) {
+    return LocalClass;
+}
+
+function getExportedClass<T>(c: T) {
+    return ExportedClass;
+}
+
+
+
+export class MyClass extends getLocalClass<LocalInterface>(undefined)<string, number> { // error LocalClass is inaccisible
+}
+
+
+export class MyClass2 extends getExportedClass<LocalInterface>(undefined)<string> { // OK
+}
+
+
+export class MyClass3 extends getExportedClass<LocalInterface>(undefined)<LocalInterface> { // Error LocalInterface is inaccisble
+}
+
+
+export class MyClass4 extends getExportedClass<LocalInterface>(undefined)<ExportedInterface> { // OK
+}
+
+
+//// [declarationEmit_expressionInExtends3.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 ExportedClass = (function () {
+    function ExportedClass() {
+    }
+    return ExportedClass;
+}());
+exports.ExportedClass = ExportedClass;
+var LocalClass = (function () {
+    function LocalClass() {
+    }
+    return LocalClass;
+}());
+function getLocalClass(c) {
+    return LocalClass;
+}
+function getExportedClass(c) {
+    return ExportedClass;
+}
+var MyClass = (function (_super) {
+    __extends(MyClass, _super);
+    function MyClass() {
+        _super.apply(this, arguments);
+    }
+    return MyClass;
+}(getLocalClass(undefined)));
+exports.MyClass = MyClass;
+var MyClass2 = (function (_super) {
+    __extends(MyClass2, _super);
+    function MyClass2() {
+        _super.apply(this, arguments);
+    }
+    return MyClass2;
+}(getExportedClass(undefined)));
+exports.MyClass2 = MyClass2;
+var MyClass3 = (function (_super) {
+    __extends(MyClass3, _super);
+    function MyClass3() {
+        _super.apply(this, arguments);
+    }
+    return MyClass3;
+}(getExportedClass(undefined)));
+exports.MyClass3 = MyClass3;
+var MyClass4 = (function (_super) {
+    __extends(MyClass4, _super);
+    function MyClass4() {
+        _super.apply(this, arguments);
+    }
+    return MyClass4;
+}(getExportedClass(undefined)));
+exports.MyClass4 = MyClass4;
diff --git a/tests/baselines/reference/declarationEmit_expressionInExtends4.errors.txt b/tests/baselines/reference/declarationEmit_expressionInExtends4.errors.txt
new file mode 100644
index 00000000000..df3a6533260
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_expressionInExtends4.errors.txt
@@ -0,0 +1,35 @@
+tests/cases/compiler/declarationEmit_expressionInExtends4.ts(2,10): error TS4060: Return type of exported function has or is using private name 'D'.
+tests/cases/compiler/declarationEmit_expressionInExtends4.ts(6,17): error TS2315: Type 'D' is not generic.
+tests/cases/compiler/declarationEmit_expressionInExtends4.ts(10,18): error TS2304: Cannot find name 'SomeUndefinedFunction'.
+tests/cases/compiler/declarationEmit_expressionInExtends4.ts(15,18): error TS2304: Cannot find name 'SomeUndefinedFunction'.
+tests/cases/compiler/declarationEmit_expressionInExtends4.ts(15,18): error TS4020: Extends clause of exported class 'C3' has or is using private name 'SomeUndefinedFunction'.
+
+
+==== tests/cases/compiler/declarationEmit_expressionInExtends4.ts (5 errors) ====
+    
+    function getSomething() {
+             ~~~~~~~~~~~~
+!!! error TS4060: Return type of exported function has or is using private name 'D'.
+        return class D { }
+    }
+    
+    class C extends getSomething()<number, string> {
+                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2315: Type 'D' is not generic.
+    
+    }
+    
+    class C2 extends SomeUndefinedFunction()<number, string> {
+                     ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2304: Cannot find name 'SomeUndefinedFunction'.
+    
+    }
+    
+    
+    class C3 extends SomeUndefinedFunction {
+                     ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2304: Cannot find name 'SomeUndefinedFunction'.
+                     ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS4020: Extends clause of exported class 'C3' has or is using private name 'SomeUndefinedFunction'.
+    
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmit_expressionInExtends4.js b/tests/baselines/reference/declarationEmit_expressionInExtends4.js
new file mode 100644
index 00000000000..39ee7ce1e69
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_expressionInExtends4.js
@@ -0,0 +1,53 @@
+//// [declarationEmit_expressionInExtends4.ts]
+
+function getSomething() {
+    return class D { }
+}
+
+class C extends getSomething()<number, string> {
+
+}
+
+class C2 extends SomeUndefinedFunction()<number, string> {
+
+}
+
+
+class C3 extends SomeUndefinedFunction {
+
+}
+
+//// [declarationEmit_expressionInExtends4.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 __());
+};
+function getSomething() {
+    return (function () {
+        function D() {
+        }
+        return D;
+    }());
+}
+var C = (function (_super) {
+    __extends(C, _super);
+    function C() {
+        _super.apply(this, arguments);
+    }
+    return C;
+}(getSomething()));
+var C2 = (function (_super) {
+    __extends(C2, _super);
+    function C2() {
+        _super.apply(this, arguments);
+    }
+    return C2;
+}(SomeUndefinedFunction()));
+var C3 = (function (_super) {
+    __extends(C3, _super);
+    function C3() {
+        _super.apply(this, arguments);
+    }
+    return C3;
+}(SomeUndefinedFunction));
diff --git a/tests/baselines/reference/declarationEmit_inferedDefaultExportType.js b/tests/baselines/reference/declarationEmit_inferedDefaultExportType.js
new file mode 100644
index 00000000000..4fa998f86b8
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_inferedDefaultExportType.js
@@ -0,0 +1,27 @@
+//// [declarationEmit_inferedDefaultExportType.ts]
+
+// test.ts
+export default {
+  foo: [],
+  bar: undefined,
+  baz: null
+}
+
+//// [declarationEmit_inferedDefaultExportType.js]
+"use strict";
+exports.__esModule = true;
+// test.ts
+exports["default"] = {
+    foo: [],
+    bar: undefined,
+    baz: null
+};
+
+
+//// [declarationEmit_inferedDefaultExportType.d.ts]
+declare var _default: {
+    foo: any[];
+    bar: any;
+    baz: any;
+};
+export default _default;
diff --git a/tests/baselines/reference/declarationEmit_inferedDefaultExportType.symbols b/tests/baselines/reference/declarationEmit_inferedDefaultExportType.symbols
new file mode 100644
index 00000000000..7e8cdea2c75
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_inferedDefaultExportType.symbols
@@ -0,0 +1,14 @@
+=== tests/cases/compiler/declarationEmit_inferedDefaultExportType.ts ===
+
+// test.ts
+export default {
+  foo: [],
+>foo : Symbol(foo, Decl(declarationEmit_inferedDefaultExportType.ts, 2, 16))
+
+  bar: undefined,
+>bar : Symbol(bar, Decl(declarationEmit_inferedDefaultExportType.ts, 3, 10))
+>undefined : Symbol(undefined)
+
+  baz: null
+>baz : Symbol(baz, Decl(declarationEmit_inferedDefaultExportType.ts, 4, 17))
+}
diff --git a/tests/baselines/reference/declarationEmit_inferedDefaultExportType.types b/tests/baselines/reference/declarationEmit_inferedDefaultExportType.types
new file mode 100644
index 00000000000..0f5d0ceed91
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_inferedDefaultExportType.types
@@ -0,0 +1,18 @@
+=== tests/cases/compiler/declarationEmit_inferedDefaultExportType.ts ===
+
+// test.ts
+export default {
+>{  foo: [],  bar: undefined,  baz: null} : { foo: undefined[]; bar: undefined; baz: null; }
+
+  foo: [],
+>foo : undefined[]
+>[] : undefined[]
+
+  bar: undefined,
+>bar : undefined
+>undefined : undefined
+
+  baz: null
+>baz : null
+>null : null
+}
diff --git a/tests/baselines/reference/declarationEmit_inferedDefaultExportType2.js b/tests/baselines/reference/declarationEmit_inferedDefaultExportType2.js
new file mode 100644
index 00000000000..617d4a9966b
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_inferedDefaultExportType2.js
@@ -0,0 +1,25 @@
+//// [declarationEmit_inferedDefaultExportType2.ts]
+
+// test.ts
+export = {
+  foo: [],
+  bar: undefined,
+  baz: null
+}
+
+//// [declarationEmit_inferedDefaultExportType2.js]
+"use strict";
+module.exports = {
+    foo: [],
+    bar: undefined,
+    baz: null
+};
+
+
+//// [declarationEmit_inferedDefaultExportType2.d.ts]
+declare var _default: {
+    foo: any[];
+    bar: any;
+    baz: any;
+};
+export = _default;
diff --git a/tests/baselines/reference/declarationEmit_inferedDefaultExportType2.symbols b/tests/baselines/reference/declarationEmit_inferedDefaultExportType2.symbols
new file mode 100644
index 00000000000..d04c50c0d7c
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_inferedDefaultExportType2.symbols
@@ -0,0 +1,14 @@
+=== tests/cases/compiler/declarationEmit_inferedDefaultExportType2.ts ===
+
+// test.ts
+export = {
+  foo: [],
+>foo : Symbol(foo, Decl(declarationEmit_inferedDefaultExportType2.ts, 2, 10))
+
+  bar: undefined,
+>bar : Symbol(bar, Decl(declarationEmit_inferedDefaultExportType2.ts, 3, 10))
+>undefined : Symbol(undefined)
+
+  baz: null
+>baz : Symbol(baz, Decl(declarationEmit_inferedDefaultExportType2.ts, 4, 17))
+}
diff --git a/tests/baselines/reference/declarationEmit_inferedDefaultExportType2.types b/tests/baselines/reference/declarationEmit_inferedDefaultExportType2.types
new file mode 100644
index 00000000000..5c8cbbb158c
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_inferedDefaultExportType2.types
@@ -0,0 +1,18 @@
+=== tests/cases/compiler/declarationEmit_inferedDefaultExportType2.ts ===
+
+// test.ts
+export = {
+>{  foo: [],  bar: undefined,  baz: null} : { foo: undefined[]; bar: undefined; baz: null; }
+
+  foo: [],
+>foo : undefined[]
+>[] : undefined[]
+
+  bar: undefined,
+>bar : undefined
+>undefined : undefined
+
+  baz: null
+>baz : null
+>null : null
+}
diff --git a/tests/baselines/reference/declarationEmit_invalidExport.errors.txt b/tests/baselines/reference/declarationEmit_invalidExport.errors.txt
new file mode 100644
index 00000000000..19d650d6d6f
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_invalidExport.errors.txt
@@ -0,0 +1,19 @@
+tests/cases/compiler/declarationEmit_invalidExport.ts(3,3): error TS7027: Unreachable code detected.
+tests/cases/compiler/declarationEmit_invalidExport.ts(5,30): error TS4081: Exported type alias 'MyClass' has or is using private name 'myClass'.
+tests/cases/compiler/declarationEmit_invalidExport.ts(6,1): error TS1128: Declaration or statement expected.
+
+
+==== tests/cases/compiler/declarationEmit_invalidExport.ts (3 errors) ====
+    
+    if (false) {
+      export var myClass = 0;
+      ~~~~~~
+!!! error TS7027: Unreachable code detected.
+    }
+    export type MyClass = typeof myClass;
+                                 ~~~~~~~
+!!! error TS4081: Exported type alias 'MyClass' has or is using private name 'myClass'.
+    }
+    ~
+!!! error TS1128: Declaration or statement expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmit_invalidExport.js b/tests/baselines/reference/declarationEmit_invalidExport.js
new file mode 100644
index 00000000000..74b5bfd8019
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_invalidExport.js
@@ -0,0 +1,14 @@
+//// [declarationEmit_invalidExport.ts]
+
+if (false) {
+  export var myClass = 0;
+}
+export type MyClass = typeof myClass;
+}
+
+
+//// [declarationEmit_invalidExport.js]
+"use strict";
+if (false) {
+    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/declarationEmit_protectedMembers.symbols b/tests/baselines/reference/declarationEmit_protectedMembers.symbols
index cbf3db094ea..ee9f5ce199d 100644
--- a/tests/baselines/reference/declarationEmit_protectedMembers.symbols
+++ b/tests/baselines/reference/declarationEmit_protectedMembers.symbols
@@ -5,23 +5,23 @@ class C1 {
 >C1 : Symbol(C1, Decl(declarationEmit_protectedMembers.ts, 0, 0))
 
     protected x: number;
->x : Symbol(x, Decl(declarationEmit_protectedMembers.ts, 2, 10))
+>x : Symbol(C1.x, Decl(declarationEmit_protectedMembers.ts, 2, 10))
 
     protected f() {
->f : Symbol(f, Decl(declarationEmit_protectedMembers.ts, 3, 24))
+>f : Symbol(C1.f, Decl(declarationEmit_protectedMembers.ts, 3, 24))
 
         return this.x;
->this.x : Symbol(x, Decl(declarationEmit_protectedMembers.ts, 2, 10))
+>this.x : Symbol(C1.x, Decl(declarationEmit_protectedMembers.ts, 2, 10))
 >this : Symbol(C1, Decl(declarationEmit_protectedMembers.ts, 0, 0))
->x : Symbol(x, Decl(declarationEmit_protectedMembers.ts, 2, 10))
+>x : Symbol(C1.x, Decl(declarationEmit_protectedMembers.ts, 2, 10))
     }
 
     protected set accessor(a: number) { }
->accessor : Symbol(accessor, Decl(declarationEmit_protectedMembers.ts, 7, 5), Decl(declarationEmit_protectedMembers.ts, 9, 41))
+>accessor : Symbol(C1.accessor, Decl(declarationEmit_protectedMembers.ts, 7, 5), Decl(declarationEmit_protectedMembers.ts, 9, 41))
 >a : Symbol(a, Decl(declarationEmit_protectedMembers.ts, 9, 27))
 
     protected get accessor() { return 0; }
->accessor : Symbol(accessor, Decl(declarationEmit_protectedMembers.ts, 7, 5), Decl(declarationEmit_protectedMembers.ts, 9, 41))
+>accessor : Symbol(C1.accessor, Decl(declarationEmit_protectedMembers.ts, 7, 5), Decl(declarationEmit_protectedMembers.ts, 9, 41))
 
     protected static sx: number;
 >sx : Symbol(C1.sx, Decl(declarationEmit_protectedMembers.ts, 10, 42))
@@ -49,7 +49,7 @@ class C2 extends C1 {
 >C1 : Symbol(C1, Decl(declarationEmit_protectedMembers.ts, 0, 0))
 
     protected f() {
->f : Symbol(f, Decl(declarationEmit_protectedMembers.ts, 23, 21))
+>f : Symbol(C2.f, Decl(declarationEmit_protectedMembers.ts, 23, 21))
 
         return super.f() + this.x;
 >super.f : Symbol(C1.f, Decl(declarationEmit_protectedMembers.ts, 3, 24))
@@ -78,13 +78,13 @@ class C3 extends C2 {
 >C2 : Symbol(C2, Decl(declarationEmit_protectedMembers.ts, 20, 1))
 
     x: number;
->x : Symbol(x, Decl(declarationEmit_protectedMembers.ts, 33, 21))
+>x : Symbol(C3.x, Decl(declarationEmit_protectedMembers.ts, 33, 21))
 
     static sx: number;
 >sx : Symbol(C3.sx, Decl(declarationEmit_protectedMembers.ts, 34, 14))
 
     f() {
->f : Symbol(f, Decl(declarationEmit_protectedMembers.ts, 35, 22))
+>f : Symbol(C3.f, Decl(declarationEmit_protectedMembers.ts, 35, 22))
 
         return super.f();
 >super.f : Symbol(C2.f, Decl(declarationEmit_protectedMembers.ts, 23, 21))
@@ -109,6 +109,6 @@ class C4 {
 >C4 : Symbol(C4, Decl(declarationEmit_protectedMembers.ts, 44, 1))
 
     constructor(protected a: number, protected b) { }
->a : Symbol(a, Decl(declarationEmit_protectedMembers.ts, 48, 16))
->b : Symbol(b, Decl(declarationEmit_protectedMembers.ts, 48, 36))
+>a : Symbol(C4.a, Decl(declarationEmit_protectedMembers.ts, 48, 16))
+>b : Symbol(C4.b, Decl(declarationEmit_protectedMembers.ts, 48, 36))
 }
diff --git a/tests/baselines/reference/declarationMerging1.symbols b/tests/baselines/reference/declarationMerging1.symbols
index 08fe0d4c1fd..7c15b18c5e2 100644
--- a/tests/baselines/reference/declarationMerging1.symbols
+++ b/tests/baselines/reference/declarationMerging1.symbols
@@ -3,13 +3,13 @@ class A {
 >A : Symbol(A, Decl(file1.ts, 0, 0), Decl(file2.ts, 0, 0))
 
     protected _f: number;
->_f : Symbol(_f, Decl(file1.ts, 0, 9))
+>_f : Symbol(A._f, Decl(file1.ts, 0, 9))
 
     getF() { return this._f; }
->getF : Symbol(getF, Decl(file1.ts, 1, 25))
->this._f : Symbol(_f, Decl(file1.ts, 0, 9))
+>getF : Symbol(A.getF, Decl(file1.ts, 1, 25))
+>this._f : Symbol(A._f, Decl(file1.ts, 0, 9))
 >this : Symbol(A, Decl(file1.ts, 0, 0), Decl(file2.ts, 0, 0))
->_f : Symbol(_f, Decl(file1.ts, 0, 9))
+>_f : Symbol(A._f, Decl(file1.ts, 0, 9))
 }
 
 === tests/cases/compiler/file2.ts ===
@@ -17,5 +17,5 @@ interface A {
 >A : Symbol(A, Decl(file1.ts, 0, 0), Decl(file2.ts, 0, 0))
 
     run();
->run : Symbol(run, Decl(file2.ts, 0, 13))
+>run : Symbol(A.run, Decl(file2.ts, 0, 13))
 }
diff --git a/tests/baselines/reference/declarationMerging2.symbols b/tests/baselines/reference/declarationMerging2.symbols
index b3891374d32..050b5414da5 100644
--- a/tests/baselines/reference/declarationMerging2.symbols
+++ b/tests/baselines/reference/declarationMerging2.symbols
@@ -4,13 +4,13 @@ export class A {
 >A : Symbol(A, Decl(a.ts, 0, 0), Decl(b.ts, 1, 22))
 
     protected _f: number;
->_f : Symbol(_f, Decl(a.ts, 1, 16))
+>_f : Symbol(A._f, Decl(a.ts, 1, 16))
 
     getF() { return this._f; }
->getF : Symbol(getF, Decl(a.ts, 2, 25))
->this._f : Symbol(_f, Decl(a.ts, 1, 16))
+>getF : Symbol(A.getF, Decl(a.ts, 2, 25))
+>this._f : Symbol(A._f, Decl(a.ts, 1, 16))
 >this : Symbol(A, Decl(a.ts, 0, 0), Decl(b.ts, 1, 22))
->_f : Symbol(_f, Decl(a.ts, 1, 16))
+>_f : Symbol(A._f, Decl(a.ts, 1, 16))
 }
 
 === tests/cases/compiler/b.ts ===
@@ -20,6 +20,6 @@ declare module "./a" {
 >A : Symbol(A, Decl(a.ts, 0, 0), Decl(b.ts, 1, 22))
 
         run();
->run : Symbol(run, Decl(b.ts, 2, 17))
+>run : Symbol(A.run, Decl(b.ts, 2, 17))
     }
 }
diff --git a/tests/baselines/reference/declarationsAndAssignments.errors.txt b/tests/baselines/reference/declarationsAndAssignments.errors.txt
index 7c4671022ea..517eaafe4ab 100644
--- a/tests/baselines/reference/declarationsAndAssignments.errors.txt
+++ b/tests/baselines/reference/declarationsAndAssignments.errors.txt
@@ -11,8 +11,8 @@ tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(62,13):
 tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(62,16): error TS2525: Initializer provides no value for this binding element and the binding element has no default value.
 tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(63,13): error TS2525: Initializer provides no value for this binding element and the binding element has no default value.
 tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(63,16): error TS2525: Initializer provides no value for this binding element and the binding element has no default value.
-tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(67,9): error TS2461: Type '{ [x: number]: undefined; }' is not an array type.
-tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(68,9): error TS2461: Type '{ [x: number]: number; 0: number; 1: number; }' is not an array type.
+tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(67,9): error TS2461: Type '{}' is not an array type.
+tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(68,9): error TS2461: Type '{ 0: number; 1: number; }' is not an array type.
 tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(73,11): error TS2525: Initializer provides no value for this binding element and the binding element has no default value.
 tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(73,14): error TS2525: Initializer provides no value for this binding element and the binding element has no default value.
 tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(74,11): error TS2459: Type 'undefined[]' has no property 'a' and no string index signature.
@@ -122,10 +122,10 @@ tests/cases/conformance/es6/destructuring/declarationsAndAssignments.ts(138,9):
     function f9() {
         var [a, b] = {};                // Error, not array type
             ~~~~~~
-!!! error TS2461: Type '{ [x: number]: undefined; }' is not an array type.
+!!! error TS2461: Type '{}' is not an array type.
         var [c, d] = { 0: 10, 1: 20 };  // Error, not array type
             ~~~~~~
-!!! error TS2461: Type '{ [x: number]: number; 0: number; 1: number; }' is not an array type.
+!!! error TS2461: Type '{ 0: number; 1: number; }' is not an array type.
         var [e, f] = [10, 20];
     }
     
diff --git a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.symbols b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.symbols
index 0b1b06cc99e..af691ce828c 100644
--- a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.symbols
+++ b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.symbols
@@ -16,12 +16,12 @@ declare module "express" {
 >ExpressServer : Symbol(ExpressServer, Decl(declareExternalModuleWithExportAssignedFundule.ts, 6, 20))
 
             enable(name: string): ExpressServer;
->enable : Symbol(enable, Decl(declareExternalModuleWithExportAssignedFundule.ts, 8, 40))
+>enable : Symbol(ExpressServer.enable, Decl(declareExternalModuleWithExportAssignedFundule.ts, 8, 40))
 >name : Symbol(name, Decl(declareExternalModuleWithExportAssignedFundule.ts, 10, 19))
 >ExpressServer : Symbol(ExpressServer, Decl(declareExternalModuleWithExportAssignedFundule.ts, 6, 20))
 
             post(path: RegExp, handler: (req: Function) => void ): void;
->post : Symbol(post, Decl(declareExternalModuleWithExportAssignedFundule.ts, 10, 48))
+>post : Symbol(ExpressServer.post, Decl(declareExternalModuleWithExportAssignedFundule.ts, 10, 48))
 >path : Symbol(path, Decl(declareExternalModuleWithExportAssignedFundule.ts, 12, 17))
 >RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >handler : Symbol(handler, Decl(declareExternalModuleWithExportAssignedFundule.ts, 12, 30))
diff --git a/tests/baselines/reference/declareFileExportAssignment.symbols b/tests/baselines/reference/declareFileExportAssignment.symbols
index bb626e9eeab..012b5db24b1 100644
--- a/tests/baselines/reference/declareFileExportAssignment.symbols
+++ b/tests/baselines/reference/declareFileExportAssignment.symbols
@@ -14,13 +14,13 @@ module m2 {
 >connectExport : Symbol(connectExport, Decl(declareFileExportAssignment.ts, 3, 5))
 
         use: (mod: connectModule) => connectExport;
->use : Symbol(use, Decl(declareFileExportAssignment.ts, 4, 36))
+>use : Symbol(connectExport.use, Decl(declareFileExportAssignment.ts, 4, 36))
 >mod : Symbol(mod, Decl(declareFileExportAssignment.ts, 5, 14))
 >connectModule : Symbol(connectModule, Decl(declareFileExportAssignment.ts, 0, 11))
 >connectExport : Symbol(connectExport, Decl(declareFileExportAssignment.ts, 3, 5))
 
         listen: (port: number) => void;
->listen : Symbol(listen, Decl(declareFileExportAssignment.ts, 5, 51))
+>listen : Symbol(connectExport.listen, Decl(declareFileExportAssignment.ts, 5, 51))
 >port : Symbol(port, Decl(declareFileExportAssignment.ts, 6, 17))
     }
 
diff --git a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.symbols b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.symbols
index e829c3d2f92..e757604a920 100644
--- a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.symbols
+++ b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.symbols
@@ -14,13 +14,13 @@ module m2 {
 >connectExport : Symbol(connectExport, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 3, 5))
 
         use: (mod: connectModule) => connectExport;
->use : Symbol(use, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 4, 36))
+>use : Symbol(connectExport.use, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 4, 36))
 >mod : Symbol(mod, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 5, 14))
 >connectModule : Symbol(connectModule, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 0, 11))
 >connectExport : Symbol(connectExport, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 3, 5))
 
         listen: (port: number) => void;
->listen : Symbol(listen, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 5, 51))
+>listen : Symbol(connectExport.listen, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 5, 51))
 >port : Symbol(port, Decl(declareFileExportAssignmentWithVarFromVariableStatement.ts, 6, 17))
     }
 
diff --git a/tests/baselines/reference/declaredExternalModule.symbols b/tests/baselines/reference/declaredExternalModule.symbols
index e6fde33f2d0..fb331ecf011 100644
--- a/tests/baselines/reference/declaredExternalModule.symbols
+++ b/tests/baselines/reference/declaredExternalModule.symbols
@@ -15,13 +15,13 @@ declare module 'connect' {
 >connectExport : Symbol(connectExport, Decl(declaredExternalModule.ts, 6, 5))
 
         use: (mod: connectModule) => connectExport;
->use : Symbol(use, Decl(declaredExternalModule.ts, 8, 29))
+>use : Symbol(connectExport.use, Decl(declaredExternalModule.ts, 8, 29))
 >mod : Symbol(mod, Decl(declaredExternalModule.ts, 10, 14))
 >connectModule : Symbol(connectModule, Decl(declaredExternalModule.ts, 0, 26))
 >connectExport : Symbol(connectExport, Decl(declaredExternalModule.ts, 6, 5))
 
         listen: (port: number) => void;
->listen : Symbol(listen, Decl(declaredExternalModule.ts, 10, 51))
+>listen : Symbol(connectExport.listen, Decl(declaredExternalModule.ts, 10, 51))
 >port : Symbol(port, Decl(declaredExternalModule.ts, 12, 17))
 
     }
diff --git a/tests/baselines/reference/declaredExternalModuleWithExportAssignment.symbols b/tests/baselines/reference/declaredExternalModuleWithExportAssignment.symbols
index 360f57d7a9a..efba0c20c41 100644
--- a/tests/baselines/reference/declaredExternalModuleWithExportAssignment.symbols
+++ b/tests/baselines/reference/declaredExternalModuleWithExportAssignment.symbols
@@ -13,13 +13,13 @@ declare module 'connect' {
 >connectExport : Symbol(connectExport, Decl(declaredExternalModuleWithExportAssignment.ts, 3, 5))
 
         use: (mod: connectModule) => connectExport;
->use : Symbol(use, Decl(declaredExternalModuleWithExportAssignment.ts, 5, 29))
+>use : Symbol(connectExport.use, Decl(declaredExternalModuleWithExportAssignment.ts, 5, 29))
 >mod : Symbol(mod, Decl(declaredExternalModuleWithExportAssignment.ts, 6, 14))
 >connectModule : Symbol(connectModule, Decl(declaredExternalModuleWithExportAssignment.ts, 0, 26))
 >connectExport : Symbol(connectExport, Decl(declaredExternalModuleWithExportAssignment.ts, 3, 5))
 
         listen: (port: number) => void;
->listen : Symbol(listen, Decl(declaredExternalModuleWithExportAssignment.ts, 6, 51))
+>listen : Symbol(connectExport.listen, Decl(declaredExternalModuleWithExportAssignment.ts, 6, 51))
 >port : Symbol(port, Decl(declaredExternalModuleWithExportAssignment.ts, 7, 17))
     }
 
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.symbols b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.symbols
index 4414fd9ef87..3e7ec568927 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.symbols
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/moduleExportsAmd/a.ts ===
 var decorator: ClassDecorator;
 >decorator : Symbol(decorator, Decl(a.ts, 0, 3))
->ClassDecorator : Symbol(ClassDecorator, Decl(lib.d.ts, --, --))
+>ClassDecorator : Symbol(ClassDecorator, Decl(lib.es5.d.ts, --, --))
 
 @decorator
 >decorator : Symbol(decorator, Decl(a.ts, 0, 3))
@@ -12,7 +12,7 @@ export default class Foo {}
 === tests/cases/conformance/es6/moduleExportsAmd/b.ts ===
 var decorator: ClassDecorator;
 >decorator : Symbol(decorator, Decl(b.ts, 0, 3))
->ClassDecorator : Symbol(ClassDecorator, Decl(lib.d.ts, --, --))
+>ClassDecorator : Symbol(ClassDecorator, Decl(lib.es5.d.ts, --, --))
 
 @decorator
 >decorator : Symbol(decorator, Decl(b.ts, 0, 3))
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.symbols b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.symbols
index 4eafc337573..383d7d2c0d2 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.symbols
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/moduleExportsCommonjs/a.ts ===
 var decorator: ClassDecorator;
 >decorator : Symbol(decorator, Decl(a.ts, 0, 3))
->ClassDecorator : Symbol(ClassDecorator, Decl(lib.d.ts, --, --))
+>ClassDecorator : Symbol(ClassDecorator, Decl(lib.es5.d.ts, --, --))
 
 @decorator
 >decorator : Symbol(decorator, Decl(a.ts, 0, 3))
@@ -12,7 +12,7 @@ export default class Foo {}
 === tests/cases/conformance/es6/moduleExportsCommonjs/b.ts ===
 var decorator: ClassDecorator;
 >decorator : Symbol(decorator, Decl(b.ts, 0, 3))
->ClassDecorator : Symbol(ClassDecorator, Decl(lib.d.ts, --, --))
+>ClassDecorator : Symbol(ClassDecorator, Decl(lib.es5.d.ts, --, --))
 
 @decorator
 >decorator : Symbol(decorator, Decl(b.ts, 0, 3))
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js
index e2d9d0f0a6d..4628fc5e81c 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js
@@ -13,48 +13,48 @@ 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() {
-            let Foo = class Foo {
+        setters: [],
+        execute: function () {
+            Foo = class Foo {
             };
             Foo = __decorate([
                 decorator
             ], 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() {
-            let default_1 = class {
+        setters: [],
+        execute: function () {
+            default_1 = class {
             };
             default_1 = __decorate([
                 decorator
             ], default_1);
             exports_1("default", default_1);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.symbols b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.symbols
index 3751c992fa5..73898da76c4 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.symbols
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/moduleExportsSystem/a.ts ===
 var decorator: ClassDecorator;
 >decorator : Symbol(decorator, Decl(a.ts, 0, 3))
->ClassDecorator : Symbol(ClassDecorator, Decl(lib.d.ts, --, --))
+>ClassDecorator : Symbol(ClassDecorator, Decl(lib.es5.d.ts, --, --))
 
 @decorator
 >decorator : Symbol(decorator, Decl(a.ts, 0, 3))
@@ -12,7 +12,7 @@ export default class Foo {}
 === tests/cases/conformance/es6/moduleExportsSystem/b.ts ===
 var decorator: ClassDecorator;
 >decorator : Symbol(decorator, Decl(b.ts, 0, 3))
->ClassDecorator : Symbol(ClassDecorator, Decl(lib.d.ts, --, --))
+>ClassDecorator : Symbol(ClassDecorator, Decl(lib.es5.d.ts, --, --))
 
 @decorator
 >decorator : Symbol(decorator, Decl(b.ts, 0, 3))
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/decoratedDefaultExportsGetExportedUmd.symbols b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.symbols
index 5ea35d450d0..f93e5411306 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.symbols
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/moduleExportsUmd/a.ts ===
 var decorator: ClassDecorator;
 >decorator : Symbol(decorator, Decl(a.ts, 0, 3))
->ClassDecorator : Symbol(ClassDecorator, Decl(lib.d.ts, --, --))
+>ClassDecorator : Symbol(ClassDecorator, Decl(lib.es5.d.ts, --, --))
 
 @decorator
 >decorator : Symbol(decorator, Decl(a.ts, 0, 3))
@@ -12,7 +12,7 @@ export default class Foo {}
 === tests/cases/conformance/es6/moduleExportsUmd/b.ts ===
 var decorator: ClassDecorator;
 >decorator : Symbol(decorator, Decl(b.ts, 0, 3))
->ClassDecorator : Symbol(ClassDecorator, Decl(lib.d.ts, --, --))
+>ClassDecorator : Symbol(ClassDecorator, Decl(lib.es5.d.ts, --, --))
 
 @decorator
 >decorator : Symbol(decorator, Decl(b.ts, 0, 3))
diff --git a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
index 28b620a3e8c..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) {
         // ...
diff --git a/tests/baselines/reference/decoratorMetadata.js b/tests/baselines/reference/decoratorMetadata.js
index d95658c7f18..cb253d43c16 100644
--- a/tests/baselines/reference/decoratorMetadata.js
+++ b/tests/baselines/reference/decoratorMetadata.js
@@ -48,12 +48,12 @@ var MyComponent = (function () {
     return MyComponent;
 }());
 __decorate([
-    decorator, 
-    __metadata('design:type', Function), 
-    __metadata('design:paramtypes', [Object]), 
-    __metadata('design:returntype', void 0)
+    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])
+    decorator,
+    __metadata("design:paramtypes", [service_1.default])
 ], MyComponent);
diff --git a/tests/baselines/reference/decoratorMetadata.symbols b/tests/baselines/reference/decoratorMetadata.symbols
index 842982286d4..ab0ae42dbb3 100644
--- a/tests/baselines/reference/decoratorMetadata.symbols
+++ b/tests/baselines/reference/decoratorMetadata.symbols
@@ -16,7 +16,7 @@ class MyComponent {
 >MyComponent : Symbol(MyComponent, Decl(component.ts, 2, 27))
 
     constructor(public Service: Service) {
->Service : Symbol(Service, Decl(component.ts, 6, 16))
+>Service : Symbol(MyComponent.Service, Decl(component.ts, 6, 16))
 >Service : Symbol(Service, Decl(component.ts, 0, 6))
     }
 
@@ -24,7 +24,7 @@ class MyComponent {
 >decorator : Symbol(decorator, Decl(component.ts, 2, 11))
 
     method(x: this) {
->method : Symbol(method, Decl(component.ts, 7, 5))
+>method : Symbol(MyComponent.method, Decl(component.ts, 7, 5))
 >x : Symbol(x, Decl(component.ts, 10, 11))
     }
 }
diff --git a/tests/baselines/reference/decoratorMetadataForMethodWithNoReturnTypeAnnotation01.js b/tests/baselines/reference/decoratorMetadataForMethodWithNoReturnTypeAnnotation01.js
index e5127987d53..970447efae0 100644
--- a/tests/baselines/reference/decoratorMetadataForMethodWithNoReturnTypeAnnotation01.js
+++ b/tests/baselines/reference/decoratorMetadataForMethodWithNoReturnTypeAnnotation01.js
@@ -23,8 +23,8 @@ var MyClass = (function () {
     return MyClass;
 }());
 __decorate([
-    decorator, 
-    __metadata('design:type', Function), 
-    __metadata('design:paramtypes', []), 
-    __metadata('design:returntype', void 0)
+    decorator,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
 ], MyClass.prototype, "doSomething", null);
diff --git a/tests/baselines/reference/decoratorMetadataForMethodWithNoReturnTypeAnnotation01.symbols b/tests/baselines/reference/decoratorMetadataForMethodWithNoReturnTypeAnnotation01.symbols
index 79c6fcbf24f..cf550fb26e1 100644
--- a/tests/baselines/reference/decoratorMetadataForMethodWithNoReturnTypeAnnotation01.symbols
+++ b/tests/baselines/reference/decoratorMetadataForMethodWithNoReturnTypeAnnotation01.symbols
@@ -16,7 +16,7 @@ class MyClass {
 >decorator : Symbol(decorator, Decl(decoratorMetadataForMethodWithNoReturnTypeAnnotation01.ts, 1, 11))
 
     doSomething() {
->doSomething : Symbol(doSomething, Decl(decoratorMetadataForMethodWithNoReturnTypeAnnotation01.ts, 6, 5))
+>doSomething : Symbol(MyClass.doSomething, Decl(decoratorMetadataForMethodWithNoReturnTypeAnnotation01.ts, 6, 5))
 
     }
 }
diff --git a/tests/baselines/reference/decoratorMetadataOnInferredType.js b/tests/baselines/reference/decoratorMetadataOnInferredType.js
index 47b6c45e806..0c63bcf49da 100644
--- a/tests/baselines/reference/decoratorMetadataOnInferredType.js
+++ b/tests/baselines/reference/decoratorMetadataOnInferredType.js
@@ -33,8 +33,8 @@ var B = (function () {
     }
     return B;
 }());
-__decorate([
-    decorator, 
-    __metadata('design:type', Object)
-], B.prototype, "x", void 0);
 exports.B = B;
+__decorate([
+    decorator,
+    __metadata("design:type", Object)
+], B.prototype, "x", void 0);
diff --git a/tests/baselines/reference/decoratorMetadataOnInferredType.symbols b/tests/baselines/reference/decoratorMetadataOnInferredType.symbols
index 09530f9cecf..5e0568a44a2 100644
--- a/tests/baselines/reference/decoratorMetadataOnInferredType.symbols
+++ b/tests/baselines/reference/decoratorMetadataOnInferredType.symbols
@@ -32,7 +32,7 @@ export class B {
 >decorator : Symbol(decorator, Decl(decoratorMetadataOnInferredType.ts, 7, 1))
 
     x = new A();
->x : Symbol(x, Decl(decoratorMetadataOnInferredType.ts, 12, 16))
+>x : Symbol(B.x, Decl(decoratorMetadataOnInferredType.ts, 12, 16))
 >A : Symbol(A, Decl(decoratorMetadataOnInferredType.ts, 3, 2))
 }
 
diff --git a/tests/baselines/reference/decoratorMetadataWithConstructorType.js b/tests/baselines/reference/decoratorMetadataWithConstructorType.js
index 0559e62754c..49b72e39a09 100644
--- a/tests/baselines/reference/decoratorMetadataWithConstructorType.js
+++ b/tests/baselines/reference/decoratorMetadataWithConstructorType.js
@@ -33,8 +33,8 @@ var B = (function () {
     }
     return B;
 }());
-__decorate([
-    decorator, 
-    __metadata('design:type', A)
-], B.prototype, "x", void 0);
 exports.B = B;
+__decorate([
+    decorator,
+    __metadata("design:type", A)
+], B.prototype, "x", void 0);
diff --git a/tests/baselines/reference/decoratorMetadataWithConstructorType.symbols b/tests/baselines/reference/decoratorMetadataWithConstructorType.symbols
index db1c388f206..5ee6edd1aee 100644
--- a/tests/baselines/reference/decoratorMetadataWithConstructorType.symbols
+++ b/tests/baselines/reference/decoratorMetadataWithConstructorType.symbols
@@ -32,7 +32,7 @@ export class B {
 >decorator : Symbol(decorator, Decl(decoratorMetadataWithConstructorType.ts, 7, 1))
 
     x: A = new A();
->x : Symbol(x, Decl(decoratorMetadataWithConstructorType.ts, 12, 16))
+>x : Symbol(B.x, Decl(decoratorMetadataWithConstructorType.ts, 12, 16))
 >A : Symbol(A, Decl(decoratorMetadataWithConstructorType.ts, 3, 2))
 >A : Symbol(A, Decl(decoratorMetadataWithConstructorType.ts, 3, 2))
 }
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
index a0bc68bd8d8..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;
 }
@@ -47,7 +47,7 @@ var MyClass = (function () {
     return MyClass;
 }());
 MyClass = __decorate([
-    someDecorator, 
-    __metadata('design:paramtypes', [db_1.db])
+    someDecorator,
+    __metadata("design:paramtypes", [db_1.db])
 ], MyClass);
 exports.MyClass = MyClass;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.symbols b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.symbols
index c967239df99..20b77b7550f 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.symbols
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.symbols
@@ -3,7 +3,7 @@ export class db {
 >db : Symbol(db, Decl(db.ts, 0, 0))
 
     public doSomething() {
->doSomething : Symbol(doSomething, Decl(db.ts, 0, 17))
+>doSomething : Symbol(db.doSomething, Decl(db.ts, 0, 17))
     }
 }
 
@@ -25,7 +25,7 @@ class MyClass {
 >MyClass : Symbol(MyClass, Decl(service.ts, 3, 1))
 
     db: db;
->db : Symbol(db, Decl(service.ts, 5, 15))
+>db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >db : Symbol(db, Decl(service.ts, 0, 8))
 
     constructor(db: db) {
@@ -33,16 +33,16 @@ class MyClass {
 >db : Symbol(db, Decl(service.ts, 0, 8))
 
         this.db = db;
->this.db : Symbol(db, Decl(service.ts, 5, 15))
+>this.db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >this : Symbol(MyClass, Decl(service.ts, 3, 1))
->db : Symbol(db, Decl(service.ts, 5, 15))
+>db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >db : Symbol(db, Decl(service.ts, 8, 16))
 
         this.db.doSomething();
 >this.db.doSomething : Symbol(db.doSomething, Decl(db.ts, 0, 17))
->this.db : Symbol(db, Decl(service.ts, 5, 15))
+>this.db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >this : Symbol(MyClass, Decl(service.ts, 3, 1))
->db : Symbol(db, Decl(service.ts, 5, 15))
+>db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >doSomething : Symbol(db.doSomething, Decl(db.ts, 0, 17))
     }
 }
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
index 49a2983ce70..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;
 }
@@ -47,7 +47,7 @@ var MyClass = (function () {
     return MyClass;
 }());
 MyClass = __decorate([
-    someDecorator, 
-    __metadata('design:paramtypes', [db_1.db])
+    someDecorator,
+    __metadata("design:paramtypes", [db_1.db])
 ], MyClass);
 exports.MyClass = MyClass;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.symbols b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.symbols
index d79b05f68f6..b25eaf73fbd 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.symbols
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.symbols
@@ -3,7 +3,7 @@ export class db {
 >db : Symbol(db, Decl(db.ts, 0, 0))
 
     public doSomething() {
->doSomething : Symbol(doSomething, Decl(db.ts, 0, 17))
+>doSomething : Symbol(db.doSomething, Decl(db.ts, 0, 17))
     }
 }
 
@@ -26,7 +26,7 @@ class MyClass {
 >MyClass : Symbol(MyClass, Decl(service.ts, 3, 1))
 
     db: Database;
->db : Symbol(db, Decl(service.ts, 5, 15))
+>db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >Database : Symbol(Database, Decl(service.ts, 0, 8))
 
     constructor(db: Database) { // no collision
@@ -34,16 +34,16 @@ class MyClass {
 >Database : Symbol(Database, Decl(service.ts, 0, 8))
 
         this.db = db;
->this.db : Symbol(db, Decl(service.ts, 5, 15))
+>this.db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >this : Symbol(MyClass, Decl(service.ts, 3, 1))
->db : Symbol(db, Decl(service.ts, 5, 15))
+>db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >db : Symbol(db, Decl(service.ts, 8, 16))
 
         this.db.doSomething();
 >this.db.doSomething : Symbol(Database.doSomething, Decl(db.ts, 0, 17))
->this.db : Symbol(db, Decl(service.ts, 5, 15))
+>this.db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >this : Symbol(MyClass, Decl(service.ts, 3, 1))
->db : Symbol(db, Decl(service.ts, 5, 15))
+>db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >doSomething : Symbol(Database.doSomething, Decl(db.ts, 0, 17))
     }
 }
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
index f3c1d1b5da5..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;
 }
@@ -47,7 +47,7 @@ var MyClass = (function () {
     return MyClass;
 }());
 MyClass = __decorate([
-    someDecorator, 
-    __metadata('design:paramtypes', [db.db])
+    someDecorator,
+    __metadata("design:paramtypes", [db.db])
 ], MyClass);
 exports.MyClass = MyClass;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.symbols b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.symbols
index b34468c7bd5..867b519a166 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.symbols
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.symbols
@@ -16,7 +16,7 @@ class MyClass {
 >MyClass : Symbol(MyClass, Decl(service.ts, 3, 1))
 
     db: db.db;
->db : Symbol(db, Decl(service.ts, 5, 15))
+>db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >db : Symbol(db, Decl(service.ts, 0, 0))
 >db : Symbol(db.db, Decl(db.ts, 0, 0))
 
@@ -26,16 +26,16 @@ class MyClass {
 >db : Symbol(db.db, Decl(db.ts, 0, 0))
 
         this.db = db;
->this.db : Symbol(db, Decl(service.ts, 5, 15))
+>this.db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >this : Symbol(MyClass, Decl(service.ts, 3, 1))
->db : Symbol(db, Decl(service.ts, 5, 15))
+>db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >db : Symbol(db, Decl(service.ts, 8, 16))
 
         this.db.doSomething();
 >this.db.doSomething : Symbol(db.db.doSomething, Decl(db.ts, 0, 17))
->this.db : Symbol(db, Decl(service.ts, 5, 15))
+>this.db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >this : Symbol(MyClass, Decl(service.ts, 3, 1))
->db : Symbol(db, Decl(service.ts, 5, 15))
+>db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >doSomething : Symbol(db.db.doSomething, Decl(db.ts, 0, 17))
     }
 }
@@ -47,7 +47,7 @@ export class db {
 >db : Symbol(db, Decl(db.ts, 0, 0))
 
     public doSomething() {
->doSomething : Symbol(doSomething, Decl(db.ts, 0, 17))
+>doSomething : Symbol(db.doSomething, Decl(db.ts, 0, 17))
     }
 }
 
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
index 3448352eaaf..73ae697f396 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;
 }
@@ -47,7 +47,7 @@ var MyClass = (function () {
     return MyClass;
 }());
 MyClass = __decorate([
-    someDecorator, 
-    __metadata('design:paramtypes', [Object])
+    someDecorator,
+    __metadata("design:paramtypes", [Object])
 ], MyClass);
 exports.MyClass = MyClass;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
index 8eae92ec4d1..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;
 }
@@ -48,7 +48,7 @@ var MyClass = (function () {
     return MyClass;
 }());
 MyClass = __decorate([
-    someDecorator, 
-    __metadata('design:paramtypes', [db_1.default])
+    someDecorator,
+    __metadata("design:paramtypes", [db_1.default])
 ], MyClass);
 exports.MyClass = MyClass;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.symbols b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.symbols
index 6047d7f2882..dbf9d93654b 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.symbols
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.symbols
@@ -3,7 +3,7 @@ export default class db {
 >db : Symbol(db, Decl(db.ts, 0, 0))
 
     public doSomething() {
->doSomething : Symbol(doSomething, Decl(db.ts, 0, 25))
+>doSomething : Symbol(db.doSomething, Decl(db.ts, 0, 25))
     }
 }
 
@@ -25,7 +25,7 @@ class MyClass {
 >MyClass : Symbol(MyClass, Decl(service.ts, 3, 1))
 
     db: db;
->db : Symbol(db, Decl(service.ts, 5, 15))
+>db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >db : Symbol(db, Decl(service.ts, 0, 6))
 
     constructor(db: db) { // collision
@@ -33,16 +33,16 @@ class MyClass {
 >db : Symbol(db, Decl(service.ts, 0, 6))
 
         this.db = db;
->this.db : Symbol(db, Decl(service.ts, 5, 15))
+>this.db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >this : Symbol(MyClass, Decl(service.ts, 3, 1))
->db : Symbol(db, Decl(service.ts, 5, 15))
+>db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >db : Symbol(db, Decl(service.ts, 8, 16))
 
         this.db.doSomething();
 >this.db.doSomething : Symbol(db.doSomething, Decl(db.ts, 0, 25))
->this.db : Symbol(db, Decl(service.ts, 5, 15))
+>this.db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >this : Symbol(MyClass, Decl(service.ts, 3, 1))
->db : Symbol(db, Decl(service.ts, 5, 15))
+>db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >doSomething : Symbol(db.doSomething, Decl(db.ts, 0, 25))
     }
 }
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
index 26e714c16a1..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;
 }
@@ -48,7 +48,7 @@ var MyClass = (function () {
     return MyClass;
 }());
 MyClass = __decorate([
-    someDecorator, 
-    __metadata('design:paramtypes', [db_1.default])
+    someDecorator,
+    __metadata("design:paramtypes", [db_1.default])
 ], MyClass);
 exports.MyClass = MyClass;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.symbols b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.symbols
index 27f807503bf..9225cdd1212 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.symbols
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.symbols
@@ -3,7 +3,7 @@ export default class db {
 >db : Symbol(db, Decl(db.ts, 0, 0))
 
     public doSomething() {
->doSomething : Symbol(doSomething, Decl(db.ts, 0, 25))
+>doSomething : Symbol(db.doSomething, Decl(db.ts, 0, 25))
     }
 }
 
@@ -25,7 +25,7 @@ class MyClass {
 >MyClass : Symbol(MyClass, Decl(service.ts, 3, 1))
 
     db: database;
->db : Symbol(db, Decl(service.ts, 5, 15))
+>db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >database : Symbol(database, Decl(service.ts, 0, 6))
 
     constructor(db: database) { // no collision
@@ -33,16 +33,16 @@ class MyClass {
 >database : Symbol(database, Decl(service.ts, 0, 6))
 
         this.db = db;
->this.db : Symbol(db, Decl(service.ts, 5, 15))
+>this.db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >this : Symbol(MyClass, Decl(service.ts, 3, 1))
->db : Symbol(db, Decl(service.ts, 5, 15))
+>db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >db : Symbol(db, Decl(service.ts, 8, 16))
 
         this.db.doSomething();
 >this.db.doSomething : Symbol(database.doSomething, Decl(db.ts, 0, 25))
->this.db : Symbol(db, Decl(service.ts, 5, 15))
+>this.db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >this : Symbol(MyClass, Decl(service.ts, 3, 1))
->db : Symbol(db, Decl(service.ts, 5, 15))
+>db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >doSomething : Symbol(database.doSomething, Decl(db.ts, 0, 25))
     }
 }
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
index 1d3b8a92349..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;
 }
@@ -48,7 +48,7 @@ var MyClass = (function () {
     return MyClass;
 }());
 MyClass = __decorate([
-    someDecorator, 
-    __metadata('design:paramtypes', [Object])
+    someDecorator,
+    __metadata("design:paramtypes", [Object])
 ], MyClass);
 exports.MyClass = MyClass;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
index 910008b9c27..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;
 }
@@ -47,7 +47,7 @@ var MyClass = (function () {
     return MyClass;
 }());
 MyClass = __decorate([
-    someDecorator, 
-    __metadata('design:paramtypes', [database.db])
+    someDecorator,
+    __metadata("design:paramtypes", [database.db])
 ], MyClass);
 exports.MyClass = MyClass;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.symbols b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.symbols
index 1b73ea2e9a3..079c9c8ee91 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.symbols
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.symbols
@@ -16,7 +16,7 @@ class MyClass {
 >MyClass : Symbol(MyClass, Decl(service.ts, 3, 1))
 
     db: database.db;
->db : Symbol(db, Decl(service.ts, 5, 15))
+>db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >database : Symbol(database, Decl(service.ts, 0, 0))
 >db : Symbol(database.db, Decl(db.ts, 0, 0))
 
@@ -26,16 +26,16 @@ class MyClass {
 >db : Symbol(database.db, Decl(db.ts, 0, 0))
 
         this.db = db;
->this.db : Symbol(db, Decl(service.ts, 5, 15))
+>this.db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >this : Symbol(MyClass, Decl(service.ts, 3, 1))
->db : Symbol(db, Decl(service.ts, 5, 15))
+>db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >db : Symbol(db, Decl(service.ts, 8, 16))
 
         this.db.doSomething();
 >this.db.doSomething : Symbol(database.db.doSomething, Decl(db.ts, 0, 17))
->this.db : Symbol(db, Decl(service.ts, 5, 15))
+>this.db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >this : Symbol(MyClass, Decl(service.ts, 3, 1))
->db : Symbol(db, Decl(service.ts, 5, 15))
+>db : Symbol(MyClass.db, Decl(service.ts, 5, 15))
 >doSomething : Symbol(database.db.doSomething, Decl(db.ts, 0, 17))
     }
 }
@@ -47,7 +47,7 @@ export class db {
 >db : Symbol(db, Decl(db.ts, 0, 0))
 
     public doSomething() {
->doSomething : Symbol(doSomething, Decl(db.ts, 0, 17))
+>doSomething : Symbol(db.doSomething, Decl(db.ts, 0, 17))
     }
 }
 
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/decoratorOnClass6.es6.js b/tests/baselines/reference/decoratorOnClass6.es6.js
index 03b8ace2b5b..d8330a57ef6 100644
--- a/tests/baselines/reference/decoratorOnClass6.es6.js
+++ b/tests/baselines/reference/decoratorOnClass6.es6.js
@@ -17,11 +17,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 let C_1;
-export let C = C_1 = class C {
+let C = C_1 = class C {
     static x() { return C_1.y; }
 };
 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/decoratorOnClassAccessor1.symbols b/tests/baselines/reference/decoratorOnClassAccessor1.symbols
index 6b8e3a16c18..54fe1c7345d 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor1.symbols
+++ b/tests/baselines/reference/decoratorOnClassAccessor1.symbols
@@ -15,5 +15,5 @@ class C {
 
     @dec get accessor() { return 1; }
 >dec : Symbol(dec, Decl(decoratorOnClassAccessor1.ts, 0, 0))
->accessor : Symbol(accessor, Decl(decoratorOnClassAccessor1.ts, 2, 9))
+>accessor : Symbol(C.accessor, Decl(decoratorOnClassAccessor1.ts, 2, 9))
 }
diff --git a/tests/baselines/reference/decoratorOnClassAccessor2.symbols b/tests/baselines/reference/decoratorOnClassAccessor2.symbols
index 936afa14de9..cb85e3b261c 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor2.symbols
+++ b/tests/baselines/reference/decoratorOnClassAccessor2.symbols
@@ -15,5 +15,5 @@ class C {
 
     @dec public get accessor() { return 1; }
 >dec : Symbol(dec, Decl(decoratorOnClassAccessor2.ts, 0, 0))
->accessor : Symbol(accessor, Decl(decoratorOnClassAccessor2.ts, 2, 9))
+>accessor : Symbol(C.accessor, Decl(decoratorOnClassAccessor2.ts, 2, 9))
 }
diff --git a/tests/baselines/reference/decoratorOnClassAccessor4.symbols b/tests/baselines/reference/decoratorOnClassAccessor4.symbols
index 0acd491abed..47776e58aa5 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor4.symbols
+++ b/tests/baselines/reference/decoratorOnClassAccessor4.symbols
@@ -15,6 +15,6 @@ class C {
 
     @dec set accessor(value: number) { }
 >dec : Symbol(dec, Decl(decoratorOnClassAccessor4.ts, 0, 0))
->accessor : Symbol(accessor, Decl(decoratorOnClassAccessor4.ts, 2, 9))
+>accessor : Symbol(C.accessor, Decl(decoratorOnClassAccessor4.ts, 2, 9))
 >value : Symbol(value, Decl(decoratorOnClassAccessor4.ts, 3, 22))
 }
diff --git a/tests/baselines/reference/decoratorOnClassAccessor5.symbols b/tests/baselines/reference/decoratorOnClassAccessor5.symbols
index 0585cff96b6..d35e97ece50 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor5.symbols
+++ b/tests/baselines/reference/decoratorOnClassAccessor5.symbols
@@ -15,6 +15,6 @@ class C {
 
     @dec public set accessor(value: number) { }
 >dec : Symbol(dec, Decl(decoratorOnClassAccessor5.ts, 0, 0))
->accessor : Symbol(accessor, Decl(decoratorOnClassAccessor5.ts, 2, 9))
+>accessor : Symbol(C.accessor, Decl(decoratorOnClassAccessor5.ts, 2, 9))
 >value : Symbol(value, Decl(decoratorOnClassAccessor5.ts, 3, 29))
 }
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/decoratorOnClassMethod1.symbols b/tests/baselines/reference/decoratorOnClassMethod1.symbols
index 8a92ad7b01b..bc2143f72a9 100644
--- a/tests/baselines/reference/decoratorOnClassMethod1.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethod1.symbols
@@ -15,5 +15,5 @@ class C {
 
     @dec method() {}
 >dec : Symbol(dec, Decl(decoratorOnClassMethod1.ts, 0, 0))
->method : Symbol(method, Decl(decoratorOnClassMethod1.ts, 2, 9))
+>method : Symbol(C.method, Decl(decoratorOnClassMethod1.ts, 2, 9))
 }
diff --git a/tests/baselines/reference/decoratorOnClassMethod13.symbols b/tests/baselines/reference/decoratorOnClassMethod13.symbols
index 6dfcd15d040..389b45e5679 100644
--- a/tests/baselines/reference/decoratorOnClassMethod13.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethod13.symbols
@@ -5,9 +5,9 @@ declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPrope
 >target : Symbol(target, Decl(decoratorOnClassMethod13.ts, 0, 24))
 >propertyKey : Symbol(propertyKey, Decl(decoratorOnClassMethod13.ts, 0, 36))
 >descriptor : Symbol(descriptor, Decl(decoratorOnClassMethod13.ts, 0, 57))
->TypedPropertyDescriptor : Symbol(TypedPropertyDescriptor, Decl(lib.d.ts, --, --))
+>TypedPropertyDescriptor : Symbol(TypedPropertyDescriptor, Decl(lib.es5.d.ts, --, --))
 >T : Symbol(T, Decl(decoratorOnClassMethod13.ts, 0, 21))
->TypedPropertyDescriptor : Symbol(TypedPropertyDescriptor, Decl(lib.d.ts, --, --))
+>TypedPropertyDescriptor : Symbol(TypedPropertyDescriptor, Decl(lib.es5.d.ts, --, --))
 >T : Symbol(T, Decl(decoratorOnClassMethod13.ts, 0, 21))
 
 class C {
diff --git a/tests/baselines/reference/decoratorOnClassMethod2.symbols b/tests/baselines/reference/decoratorOnClassMethod2.symbols
index ebab8905469..addfdb70d40 100644
--- a/tests/baselines/reference/decoratorOnClassMethod2.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethod2.symbols
@@ -15,5 +15,5 @@ class C {
 
     @dec public method() {}
 >dec : Symbol(dec, Decl(decoratorOnClassMethod2.ts, 0, 0))
->method : Symbol(method, Decl(decoratorOnClassMethod2.ts, 2, 9))
+>method : Symbol(C.method, Decl(decoratorOnClassMethod2.ts, 2, 9))
 }
diff --git a/tests/baselines/reference/decoratorOnClassMethod4.symbols b/tests/baselines/reference/decoratorOnClassMethod4.symbols
index 745fb8c4ce7..909fcd7f424 100644
--- a/tests/baselines/reference/decoratorOnClassMethod4.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethod4.symbols
@@ -5,9 +5,9 @@ declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPrope
 >target : Symbol(target, Decl(decoratorOnClassMethod4.ts, 0, 24))
 >propertyKey : Symbol(propertyKey, Decl(decoratorOnClassMethod4.ts, 0, 36))
 >descriptor : Symbol(descriptor, Decl(decoratorOnClassMethod4.ts, 0, 57))
->TypedPropertyDescriptor : Symbol(TypedPropertyDescriptor, Decl(lib.d.ts, --, --))
+>TypedPropertyDescriptor : Symbol(TypedPropertyDescriptor, Decl(lib.es5.d.ts, --, --))
 >T : Symbol(T, Decl(decoratorOnClassMethod4.ts, 0, 21))
->TypedPropertyDescriptor : Symbol(TypedPropertyDescriptor, Decl(lib.d.ts, --, --))
+>TypedPropertyDescriptor : Symbol(TypedPropertyDescriptor, Decl(lib.es5.d.ts, --, --))
 >T : Symbol(T, Decl(decoratorOnClassMethod4.ts, 0, 21))
 
 class C {
diff --git a/tests/baselines/reference/decoratorOnClassMethod5.symbols b/tests/baselines/reference/decoratorOnClassMethod5.symbols
index 124ace783fe..a9780c1efa4 100644
--- a/tests/baselines/reference/decoratorOnClassMethod5.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethod5.symbols
@@ -5,9 +5,9 @@ declare function dec(): <T>(target: any, propertyKey: string, descriptor: TypedP
 >target : Symbol(target, Decl(decoratorOnClassMethod5.ts, 0, 28))
 >propertyKey : Symbol(propertyKey, Decl(decoratorOnClassMethod5.ts, 0, 40))
 >descriptor : Symbol(descriptor, Decl(decoratorOnClassMethod5.ts, 0, 61))
->TypedPropertyDescriptor : Symbol(TypedPropertyDescriptor, Decl(lib.d.ts, --, --))
+>TypedPropertyDescriptor : Symbol(TypedPropertyDescriptor, Decl(lib.es5.d.ts, --, --))
 >T : Symbol(T, Decl(decoratorOnClassMethod5.ts, 0, 25))
->TypedPropertyDescriptor : Symbol(TypedPropertyDescriptor, Decl(lib.d.ts, --, --))
+>TypedPropertyDescriptor : Symbol(TypedPropertyDescriptor, Decl(lib.es5.d.ts, --, --))
 >T : Symbol(T, Decl(decoratorOnClassMethod5.ts, 0, 25))
 
 class C {
diff --git a/tests/baselines/reference/decoratorOnClassMethod7.symbols b/tests/baselines/reference/decoratorOnClassMethod7.symbols
index e870a798559..3837816f79b 100644
--- a/tests/baselines/reference/decoratorOnClassMethod7.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethod7.symbols
@@ -5,9 +5,9 @@ declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPrope
 >target : Symbol(target, Decl(decoratorOnClassMethod7.ts, 0, 24))
 >propertyKey : Symbol(propertyKey, Decl(decoratorOnClassMethod7.ts, 0, 36))
 >descriptor : Symbol(descriptor, Decl(decoratorOnClassMethod7.ts, 0, 57))
->TypedPropertyDescriptor : Symbol(TypedPropertyDescriptor, Decl(lib.d.ts, --, --))
+>TypedPropertyDescriptor : Symbol(TypedPropertyDescriptor, Decl(lib.es5.d.ts, --, --))
 >T : Symbol(T, Decl(decoratorOnClassMethod7.ts, 0, 21))
->TypedPropertyDescriptor : Symbol(TypedPropertyDescriptor, Decl(lib.d.ts, --, --))
+>TypedPropertyDescriptor : Symbol(TypedPropertyDescriptor, Decl(lib.es5.d.ts, --, --))
 >T : Symbol(T, Decl(decoratorOnClassMethod7.ts, 0, 21))
 
 class C {
diff --git a/tests/baselines/reference/decoratorOnClassMethodOverload2.symbols b/tests/baselines/reference/decoratorOnClassMethodOverload2.symbols
index f05dd624345..71f5c5f8479 100644
--- a/tests/baselines/reference/decoratorOnClassMethodOverload2.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethodOverload2.symbols
@@ -14,11 +14,11 @@ class C {
 >C : Symbol(C, Decl(decoratorOnClassMethodOverload2.ts, 0, 126))
 
     method()
->method : Symbol(method, Decl(decoratorOnClassMethodOverload2.ts, 2, 9), Decl(decoratorOnClassMethodOverload2.ts, 3, 12))
+>method : Symbol(C.method, Decl(decoratorOnClassMethodOverload2.ts, 2, 9), Decl(decoratorOnClassMethodOverload2.ts, 3, 12))
 
     @dec
 >dec : Symbol(dec, Decl(decoratorOnClassMethodOverload2.ts, 0, 0))
 
     method() { }
->method : Symbol(method, Decl(decoratorOnClassMethodOverload2.ts, 2, 9), Decl(decoratorOnClassMethodOverload2.ts, 3, 12))
+>method : Symbol(C.method, Decl(decoratorOnClassMethodOverload2.ts, 2, 9), Decl(decoratorOnClassMethodOverload2.ts, 3, 12))
 }
diff --git a/tests/baselines/reference/decoratorOnClassMethodParameter1.symbols b/tests/baselines/reference/decoratorOnClassMethodParameter1.symbols
index 1358343a9c5..8ce7338dde8 100644
--- a/tests/baselines/reference/decoratorOnClassMethodParameter1.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethodParameter1.symbols
@@ -10,7 +10,7 @@ class C {
 >C : Symbol(C, Decl(decoratorOnClassMethodParameter1.ts, 0, 97))
 
     method(@dec p: number) {}
->method : Symbol(method, Decl(decoratorOnClassMethodParameter1.ts, 2, 9))
+>method : Symbol(C.method, Decl(decoratorOnClassMethodParameter1.ts, 2, 9))
 >dec : Symbol(dec, Decl(decoratorOnClassMethodParameter1.ts, 0, 0))
 >p : Symbol(p, Decl(decoratorOnClassMethodParameter1.ts, 3, 11))
 }
diff --git a/tests/baselines/reference/decoratorOnClassProperty1.symbols b/tests/baselines/reference/decoratorOnClassProperty1.symbols
index 1cf97d5ec3b..3cf25a6fbf1 100644
--- a/tests/baselines/reference/decoratorOnClassProperty1.symbols
+++ b/tests/baselines/reference/decoratorOnClassProperty1.symbols
@@ -9,5 +9,5 @@ class C {
 
     @dec prop;
 >dec : Symbol(dec, Decl(decoratorOnClassProperty1.ts, 0, 0))
->prop : Symbol(prop, Decl(decoratorOnClassProperty1.ts, 2, 9))
+>prop : Symbol(C.prop, Decl(decoratorOnClassProperty1.ts, 2, 9))
 }
diff --git a/tests/baselines/reference/decoratorOnClassProperty10.symbols b/tests/baselines/reference/decoratorOnClassProperty10.symbols
index 22af0bd8b50..ef207c95b84 100644
--- a/tests/baselines/reference/decoratorOnClassProperty10.symbols
+++ b/tests/baselines/reference/decoratorOnClassProperty10.symbols
@@ -10,5 +10,5 @@ class C {
 
     @dec() prop;
 >dec : Symbol(dec, Decl(decoratorOnClassProperty10.ts, 0, 0))
->prop : Symbol(prop, Decl(decoratorOnClassProperty10.ts, 2, 9))
+>prop : Symbol(C.prop, Decl(decoratorOnClassProperty10.ts, 2, 9))
 }
diff --git a/tests/baselines/reference/decoratorOnClassProperty2.symbols b/tests/baselines/reference/decoratorOnClassProperty2.symbols
index 3383fb1418a..dc86a331166 100644
--- a/tests/baselines/reference/decoratorOnClassProperty2.symbols
+++ b/tests/baselines/reference/decoratorOnClassProperty2.symbols
@@ -9,5 +9,5 @@ class C {
 
     @dec public prop;
 >dec : Symbol(dec, Decl(decoratorOnClassProperty2.ts, 0, 0))
->prop : Symbol(prop, Decl(decoratorOnClassProperty2.ts, 2, 9))
+>prop : Symbol(C.prop, Decl(decoratorOnClassProperty2.ts, 2, 9))
 }
diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherType.symbols b/tests/baselines/reference/decrementOperatorWithAnyOtherType.symbols
index 594e6d50ac4..cbef7442578 100644
--- a/tests/baselines/reference/decrementOperatorWithAnyOtherType.symbols
+++ b/tests/baselines/reference/decrementOperatorWithAnyOtherType.symbols
@@ -19,7 +19,7 @@ class A {
 >A : Symbol(A, Decl(decrementOperatorWithAnyOtherType.ts, 5, 23))
 
     public a: any;
->a : Symbol(a, Decl(decrementOperatorWithAnyOtherType.ts, 6, 9))
+>a : Symbol(A.a, Decl(decrementOperatorWithAnyOtherType.ts, 6, 9))
 }
 module M {
 >M : Symbol(M, Decl(decrementOperatorWithAnyOtherType.ts, 8, 1))
diff --git a/tests/baselines/reference/decrementOperatorWithNumberType.symbols b/tests/baselines/reference/decrementOperatorWithNumberType.symbols
index 40d9a67735e..eeb1f8e8fb2 100644
--- a/tests/baselines/reference/decrementOperatorWithNumberType.symbols
+++ b/tests/baselines/reference/decrementOperatorWithNumberType.symbols
@@ -10,7 +10,7 @@ class A {
 >A : Symbol(A, Decl(decrementOperatorWithNumberType.ts, 2, 31))
 
     public a: number;
->a : Symbol(a, Decl(decrementOperatorWithNumberType.ts, 4, 9))
+>a : Symbol(A.a, Decl(decrementOperatorWithNumberType.ts, 4, 9))
 }
 module M {
 >M : Symbol(M, Decl(decrementOperatorWithNumberType.ts, 6, 1))
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/defaultArgsInFunctionExpressions.errors.txt b/tests/baselines/reference/defaultArgsInFunctionExpressions.errors.txt
index 156fdcc4c7a..60a9e92bc95 100644
--- a/tests/baselines/reference/defaultArgsInFunctionExpressions.errors.txt
+++ b/tests/baselines/reference/defaultArgsInFunctionExpressions.errors.txt
@@ -2,9 +2,9 @@ tests/cases/compiler/defaultArgsInFunctionExpressions.ts(4,19): error TS2345: Ar
 tests/cases/compiler/defaultArgsInFunctionExpressions.ts(5,1): error TS2322: Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/defaultArgsInFunctionExpressions.ts(8,20): error TS2322: Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/defaultArgsInFunctionExpressions.ts(11,1): error TS2322: Type 'string' is not assignable to type 'number'.
-tests/cases/compiler/defaultArgsInFunctionExpressions.ts(14,51): error TS2352: Neither type 'string' nor type 'number' is assignable to the other.
+tests/cases/compiler/defaultArgsInFunctionExpressions.ts(14,51): error TS2352: Type 'string' cannot be converted to type 'number'.
 tests/cases/compiler/defaultArgsInFunctionExpressions.ts(17,41): error TS2322: Type 'string' is not assignable to type 'number'.
-tests/cases/compiler/defaultArgsInFunctionExpressions.ts(20,62): error TS2352: Neither type 'string' nor type 'number' is assignable to the other.
+tests/cases/compiler/defaultArgsInFunctionExpressions.ts(20,62): error TS2352: Type 'string' cannot be converted to type 'number'.
 tests/cases/compiler/defaultArgsInFunctionExpressions.ts(28,15): error TS2304: Cannot find name 'T'.
 
 
@@ -32,7 +32,7 @@ tests/cases/compiler/defaultArgsInFunctionExpressions.ts(28,15): error TS2304: C
     // Contextually type the default arg with the type annotation
     var f3 = function (a: (s: string) => any = (s) => <number>s) { };
                                                       ~~~~~~~~~
-!!! error TS2352: Neither type 'string' nor type 'number' is assignable to the other.
+!!! error TS2352: Type 'string' cannot be converted to type 'number'.
     
     // Type check using the function's contextual type
     var f4: (a: number) => void = function (a = "") { };
@@ -42,7 +42,7 @@ tests/cases/compiler/defaultArgsInFunctionExpressions.ts(28,15): error TS2304: C
     // Contextually type the default arg using the function's contextual type
     var f5: (a: (s: string) => any) => void = function (a = s => <number>s) { };
                                                                  ~~~~~~~~~
-!!! error TS2352: Neither type 'string' nor type 'number' is assignable to the other.
+!!! error TS2352: Type 'string' cannot be converted to type 'number'.
     
     // Instantiated module
     module T { }
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression01.js b/tests/baselines/reference/defaultExportInAwaitExpression01.js
new file mode 100644
index 00000000000..b57b6237d7a
--- /dev/null
+++ b/tests/baselines/reference/defaultExportInAwaitExpression01.js
@@ -0,0 +1,53 @@
+//// [tests/cases/conformance/es6/modules/defaultExportInAwaitExpression01.ts] ////
+
+//// [a.ts]
+const x = new Promise( ( resolve, reject ) => { resolve( {} ); } );
+export default x;
+
+//// [b.ts]
+import x from './a';
+
+( async function() {
+    const value = await x;
+}() );
+
+
+//// [a.js]
+(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);
+    }
+})(["require", "exports"], function (require, exports) {
+    "use strict";
+    const x = new Promise((resolve, reject) => { resolve({}); });
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.default = x;
+});
+//// [b.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 (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);
+    }
+})(["require", "exports", "./a"], function (require, exports) {
+    "use strict";
+    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/defaultExportInAwaitExpression01.symbols b/tests/baselines/reference/defaultExportInAwaitExpression01.symbols
new file mode 100644
index 00000000000..eb833f63895
--- /dev/null
+++ b/tests/baselines/reference/defaultExportInAwaitExpression01.symbols
@@ -0,0 +1,22 @@
+=== tests/cases/conformance/es6/modules/a.ts ===
+const x = new Promise( ( resolve, reject ) => { resolve( {} ); } );
+>x : Symbol(x, Decl(a.ts, 0, 5))
+>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, --, --))
+>resolve : Symbol(resolve, Decl(a.ts, 0, 24))
+>reject : Symbol(reject, Decl(a.ts, 0, 33))
+>resolve : Symbol(resolve, Decl(a.ts, 0, 24))
+
+export default x;
+>x : Symbol(x, Decl(a.ts, 0, 5))
+
+=== tests/cases/conformance/es6/modules/b.ts ===
+import x from './a';
+>x : Symbol(x, Decl(b.ts, 0, 6))
+
+( async function() {
+    const value = await x;
+>value : Symbol(value, Decl(b.ts, 3, 9))
+>x : Symbol(x, Decl(b.ts, 0, 6))
+
+}() );
+
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression01.types b/tests/baselines/reference/defaultExportInAwaitExpression01.types
new file mode 100644
index 00000000000..1f7de76b90e
--- /dev/null
+++ b/tests/baselines/reference/defaultExportInAwaitExpression01.types
@@ -0,0 +1,31 @@
+=== tests/cases/conformance/es6/modules/a.ts ===
+const x = new Promise( ( resolve, reject ) => { resolve( {} ); } );
+>x : Promise<{}>
+>new Promise( ( resolve, reject ) => { resolve( {} ); } ) : Promise<{}>
+>Promise : PromiseConstructor
+>( resolve, reject ) => { resolve( {} ); } : (resolve: (value?: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
+>resolve : (value?: {} | PromiseLike<{}>) => void
+>reject : (reason?: any) => void
+>resolve( {} ) : void
+>resolve : (value?: {} | PromiseLike<{}>) => void
+>{} : {}
+
+export default x;
+>x : Promise<{}>
+
+=== tests/cases/conformance/es6/modules/b.ts ===
+import x from './a';
+>x : Promise<{}>
+
+( async function() {
+>( async function() {    const value = await x;}() ) : Promise<void>
+>async function() {    const value = await x;}() : Promise<void>
+>async function() {    const value = await x;} : () => Promise<void>
+
+    const value = await x;
+>value : {}
+>await x : {}
+>x : Promise<{}>
+
+}() );
+
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression02.js b/tests/baselines/reference/defaultExportInAwaitExpression02.js
new file mode 100644
index 00000000000..db2150c66f1
--- /dev/null
+++ b/tests/baselines/reference/defaultExportInAwaitExpression02.js
@@ -0,0 +1,35 @@
+//// [tests/cases/conformance/es6/modules/defaultExportInAwaitExpression02.ts] ////
+
+//// [a.ts]
+const x = new Promise( ( resolve, reject ) => { resolve( {} ); } );
+export default x;
+
+//// [b.ts]
+import x from './a';
+
+( async function() {
+    const value = await x;
+}() );
+
+
+//// [a.js]
+"use strict";
+const x = new Promise((resolve, reject) => { resolve({}); });
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = x;
+//// [b.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());
+    });
+};
+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.symbols b/tests/baselines/reference/defaultExportInAwaitExpression02.symbols
new file mode 100644
index 00000000000..eb833f63895
--- /dev/null
+++ b/tests/baselines/reference/defaultExportInAwaitExpression02.symbols
@@ -0,0 +1,22 @@
+=== tests/cases/conformance/es6/modules/a.ts ===
+const x = new Promise( ( resolve, reject ) => { resolve( {} ); } );
+>x : Symbol(x, Decl(a.ts, 0, 5))
+>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, --, --))
+>resolve : Symbol(resolve, Decl(a.ts, 0, 24))
+>reject : Symbol(reject, Decl(a.ts, 0, 33))
+>resolve : Symbol(resolve, Decl(a.ts, 0, 24))
+
+export default x;
+>x : Symbol(x, Decl(a.ts, 0, 5))
+
+=== tests/cases/conformance/es6/modules/b.ts ===
+import x from './a';
+>x : Symbol(x, Decl(b.ts, 0, 6))
+
+( async function() {
+    const value = await x;
+>value : Symbol(value, Decl(b.ts, 3, 9))
+>x : Symbol(x, Decl(b.ts, 0, 6))
+
+}() );
+
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression02.types b/tests/baselines/reference/defaultExportInAwaitExpression02.types
new file mode 100644
index 00000000000..1f7de76b90e
--- /dev/null
+++ b/tests/baselines/reference/defaultExportInAwaitExpression02.types
@@ -0,0 +1,31 @@
+=== tests/cases/conformance/es6/modules/a.ts ===
+const x = new Promise( ( resolve, reject ) => { resolve( {} ); } );
+>x : Promise<{}>
+>new Promise( ( resolve, reject ) => { resolve( {} ); } ) : Promise<{}>
+>Promise : PromiseConstructor
+>( resolve, reject ) => { resolve( {} ); } : (resolve: (value?: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
+>resolve : (value?: {} | PromiseLike<{}>) => void
+>reject : (reason?: any) => void
+>resolve( {} ) : void
+>resolve : (value?: {} | PromiseLike<{}>) => void
+>{} : {}
+
+export default x;
+>x : Promise<{}>
+
+=== tests/cases/conformance/es6/modules/b.ts ===
+import x from './a';
+>x : Promise<{}>
+
+( async function() {
+>( async function() {    const value = await x;}() ) : Promise<void>
+>async function() {    const value = await x;}() : Promise<void>
+>async function() {    const value = await x;} : () => Promise<void>
+
+    const value = await x;
+>value : {}
+>await x : {}
+>x : Promise<{}>
+
+}() );
+
diff --git a/tests/baselines/reference/defaultExportsGetExportedSystem.js b/tests/baselines/reference/defaultExportsGetExportedSystem.js
index eac3d3c7c43..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() {
-            class Foo {
-            }
+        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/defaultIndexProps1.symbols b/tests/baselines/reference/defaultIndexProps1.symbols
index e294b9e7dba..ac1220688a5 100644
--- a/tests/baselines/reference/defaultIndexProps1.symbols
+++ b/tests/baselines/reference/defaultIndexProps1.symbols
@@ -3,7 +3,7 @@ class Foo {
 >Foo : Symbol(Foo, Decl(defaultIndexProps1.ts, 0, 0))
 
 	public v = "Yo";
->v : Symbol(v, Decl(defaultIndexProps1.ts, 0, 11))
+>v : Symbol(Foo.v, Decl(defaultIndexProps1.ts, 0, 11))
 }
 
 var f = new Foo();
diff --git a/tests/baselines/reference/defaultIndexProps2.symbols b/tests/baselines/reference/defaultIndexProps2.symbols
index 53d433351c3..5c9880c55f3 100644
--- a/tests/baselines/reference/defaultIndexProps2.symbols
+++ b/tests/baselines/reference/defaultIndexProps2.symbols
@@ -3,7 +3,7 @@ class Foo {
 >Foo : Symbol(Foo, Decl(defaultIndexProps2.ts, 0, 0))
 
 	public v = "Yo";
->v : Symbol(v, Decl(defaultIndexProps2.ts, 0, 11))
+>v : Symbol(Foo.v, Decl(defaultIndexProps2.ts, 0, 11))
 }
 
 var f = new Foo();
diff --git a/tests/baselines/reference/deleteOperatorWithBooleanType.symbols b/tests/baselines/reference/deleteOperatorWithBooleanType.symbols
index 71cb78760f6..e3ecfc3f0b1 100644
--- a/tests/baselines/reference/deleteOperatorWithBooleanType.symbols
+++ b/tests/baselines/reference/deleteOperatorWithBooleanType.symbols
@@ -10,7 +10,7 @@ class A {
 >A : Symbol(A, Decl(deleteOperatorWithBooleanType.ts, 3, 40))
 
     public a: boolean;
->a : Symbol(a, Decl(deleteOperatorWithBooleanType.ts, 5, 9))
+>a : Symbol(A.a, Decl(deleteOperatorWithBooleanType.ts, 5, 9))
 
     static foo() { return false; }
 >foo : Symbol(A.foo, Decl(deleteOperatorWithBooleanType.ts, 6, 22))
diff --git a/tests/baselines/reference/deleteOperatorWithNumberType.symbols b/tests/baselines/reference/deleteOperatorWithNumberType.symbols
index 589b1f91db2..4d59a0ba7bf 100644
--- a/tests/baselines/reference/deleteOperatorWithNumberType.symbols
+++ b/tests/baselines/reference/deleteOperatorWithNumberType.symbols
@@ -13,7 +13,7 @@ class A {
 >A : Symbol(A, Decl(deleteOperatorWithNumberType.ts, 4, 36))
 
     public a: number;
->a : Symbol(a, Decl(deleteOperatorWithNumberType.ts, 6, 9))
+>a : Symbol(A.a, Decl(deleteOperatorWithNumberType.ts, 6, 9))
 
     static foo() { return 1; }
 >foo : Symbol(A.foo, Decl(deleteOperatorWithNumberType.ts, 7, 21))
diff --git a/tests/baselines/reference/deleteOperatorWithStringType.symbols b/tests/baselines/reference/deleteOperatorWithStringType.symbols
index 204aac0123b..e3f7fd30d7c 100644
--- a/tests/baselines/reference/deleteOperatorWithStringType.symbols
+++ b/tests/baselines/reference/deleteOperatorWithStringType.symbols
@@ -13,7 +13,7 @@ class A {
 >A : Symbol(A, Decl(deleteOperatorWithStringType.ts, 4, 40))
 
     public a: string;
->a : Symbol(a, Decl(deleteOperatorWithStringType.ts, 6, 9))
+>a : Symbol(A.a, Decl(deleteOperatorWithStringType.ts, 6, 9))
 
     static foo() { return ""; }
 >foo : Symbol(A.foo, Decl(deleteOperatorWithStringType.ts, 7, 21))
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/derivedClassOverridesProtectedMembers.symbols b/tests/baselines/reference/derivedClassOverridesProtectedMembers.symbols
index 3c826325b91..690916db87c 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers.symbols
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers.symbols
@@ -13,25 +13,25 @@ class Base {
 >Base : Symbol(Base, Decl(derivedClassOverridesProtectedMembers.ts, 2, 36))
 
     protected a: typeof x;
->a : Symbol(a, Decl(derivedClassOverridesProtectedMembers.ts, 4, 12))
+>a : Symbol(Base.a, Decl(derivedClassOverridesProtectedMembers.ts, 4, 12))
 >x : Symbol(x, Decl(derivedClassOverridesProtectedMembers.ts, 1, 3))
 
     protected b(a: typeof x) { }
->b : Symbol(b, Decl(derivedClassOverridesProtectedMembers.ts, 5, 26))
+>b : Symbol(Base.b, Decl(derivedClassOverridesProtectedMembers.ts, 5, 26))
 >a : Symbol(a, Decl(derivedClassOverridesProtectedMembers.ts, 6, 16))
 >x : Symbol(x, Decl(derivedClassOverridesProtectedMembers.ts, 1, 3))
 
     protected get c() { return x; }
->c : Symbol(c, Decl(derivedClassOverridesProtectedMembers.ts, 6, 32), Decl(derivedClassOverridesProtectedMembers.ts, 7, 35))
+>c : Symbol(Base.c, Decl(derivedClassOverridesProtectedMembers.ts, 6, 32), Decl(derivedClassOverridesProtectedMembers.ts, 7, 35))
 >x : Symbol(x, Decl(derivedClassOverridesProtectedMembers.ts, 1, 3))
 
     protected set c(v: typeof x) { }
->c : Symbol(c, Decl(derivedClassOverridesProtectedMembers.ts, 6, 32), Decl(derivedClassOverridesProtectedMembers.ts, 7, 35))
+>c : Symbol(Base.c, Decl(derivedClassOverridesProtectedMembers.ts, 6, 32), Decl(derivedClassOverridesProtectedMembers.ts, 7, 35))
 >v : Symbol(v, Decl(derivedClassOverridesProtectedMembers.ts, 8, 20))
 >x : Symbol(x, Decl(derivedClassOverridesProtectedMembers.ts, 1, 3))
 
     protected d: (a: typeof x) => void;
->d : Symbol(d, Decl(derivedClassOverridesProtectedMembers.ts, 8, 36))
+>d : Symbol(Base.d, Decl(derivedClassOverridesProtectedMembers.ts, 8, 36))
 >a : Symbol(a, Decl(derivedClassOverridesProtectedMembers.ts, 9, 18))
 >x : Symbol(x, Decl(derivedClassOverridesProtectedMembers.ts, 1, 3))
 
@@ -68,25 +68,25 @@ class Derived extends Base {
 >Base : Symbol(Base, Decl(derivedClassOverridesProtectedMembers.ts, 2, 36))
 
     protected a: typeof y;
->a : Symbol(a, Decl(derivedClassOverridesProtectedMembers.ts, 20, 28))
+>a : Symbol(Derived.a, Decl(derivedClassOverridesProtectedMembers.ts, 20, 28))
 >y : Symbol(y, Decl(derivedClassOverridesProtectedMembers.ts, 2, 3))
 
     protected b(a: typeof y) { }
->b : Symbol(b, Decl(derivedClassOverridesProtectedMembers.ts, 21, 26))
+>b : Symbol(Derived.b, Decl(derivedClassOverridesProtectedMembers.ts, 21, 26))
 >a : Symbol(a, Decl(derivedClassOverridesProtectedMembers.ts, 22, 16))
 >y : Symbol(y, Decl(derivedClassOverridesProtectedMembers.ts, 2, 3))
 
     protected get c() { return y; }
->c : Symbol(c, Decl(derivedClassOverridesProtectedMembers.ts, 22, 32), Decl(derivedClassOverridesProtectedMembers.ts, 23, 35))
+>c : Symbol(Derived.c, Decl(derivedClassOverridesProtectedMembers.ts, 22, 32), Decl(derivedClassOverridesProtectedMembers.ts, 23, 35))
 >y : Symbol(y, Decl(derivedClassOverridesProtectedMembers.ts, 2, 3))
 
     protected set c(v: typeof y) { }
->c : Symbol(c, Decl(derivedClassOverridesProtectedMembers.ts, 22, 32), Decl(derivedClassOverridesProtectedMembers.ts, 23, 35))
+>c : Symbol(Derived.c, Decl(derivedClassOverridesProtectedMembers.ts, 22, 32), Decl(derivedClassOverridesProtectedMembers.ts, 23, 35))
 >v : Symbol(v, Decl(derivedClassOverridesProtectedMembers.ts, 24, 20))
 >y : Symbol(y, Decl(derivedClassOverridesProtectedMembers.ts, 2, 3))
 
     protected d: (a: typeof y) => void;
->d : Symbol(d, Decl(derivedClassOverridesProtectedMembers.ts, 24, 36))
+>d : Symbol(Derived.d, Decl(derivedClassOverridesProtectedMembers.ts, 24, 36))
 >a : Symbol(a, Decl(derivedClassOverridesProtectedMembers.ts, 25, 18))
 >y : Symbol(y, Decl(derivedClassOverridesProtectedMembers.ts, 2, 3))
 
diff --git a/tests/baselines/reference/derivedClassOverridesProtectedMembers2.symbols b/tests/baselines/reference/derivedClassOverridesProtectedMembers2.symbols
index b1160328160..d6f70480844 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers2.symbols
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers2.symbols
@@ -12,25 +12,25 @@ class Base {
 >Base : Symbol(Base, Decl(derivedClassOverridesProtectedMembers2.ts, 1, 36))
 
     protected a: typeof x;
->a : Symbol(a, Decl(derivedClassOverridesProtectedMembers2.ts, 3, 12))
+>a : Symbol(Base.a, Decl(derivedClassOverridesProtectedMembers2.ts, 3, 12))
 >x : Symbol(x, Decl(derivedClassOverridesProtectedMembers2.ts, 0, 3))
 
     protected b(a: typeof x) { }
->b : Symbol(b, Decl(derivedClassOverridesProtectedMembers2.ts, 4, 26))
+>b : Symbol(Base.b, Decl(derivedClassOverridesProtectedMembers2.ts, 4, 26))
 >a : Symbol(a, Decl(derivedClassOverridesProtectedMembers2.ts, 5, 16))
 >x : Symbol(x, Decl(derivedClassOverridesProtectedMembers2.ts, 0, 3))
 
     protected get c() { return x; }
->c : Symbol(c, Decl(derivedClassOverridesProtectedMembers2.ts, 5, 32), Decl(derivedClassOverridesProtectedMembers2.ts, 6, 35))
+>c : Symbol(Base.c, Decl(derivedClassOverridesProtectedMembers2.ts, 5, 32), Decl(derivedClassOverridesProtectedMembers2.ts, 6, 35))
 >x : Symbol(x, Decl(derivedClassOverridesProtectedMembers2.ts, 0, 3))
 
     protected set c(v: typeof x) { }
->c : Symbol(c, Decl(derivedClassOverridesProtectedMembers2.ts, 5, 32), Decl(derivedClassOverridesProtectedMembers2.ts, 6, 35))
+>c : Symbol(Base.c, Decl(derivedClassOverridesProtectedMembers2.ts, 5, 32), Decl(derivedClassOverridesProtectedMembers2.ts, 6, 35))
 >v : Symbol(v, Decl(derivedClassOverridesProtectedMembers2.ts, 7, 20))
 >x : Symbol(x, Decl(derivedClassOverridesProtectedMembers2.ts, 0, 3))
 
     protected d: (a: typeof x) => void ;
->d : Symbol(d, Decl(derivedClassOverridesProtectedMembers2.ts, 7, 36))
+>d : Symbol(Base.d, Decl(derivedClassOverridesProtectedMembers2.ts, 7, 36))
 >a : Symbol(a, Decl(derivedClassOverridesProtectedMembers2.ts, 8, 18))
 >x : Symbol(x, Decl(derivedClassOverridesProtectedMembers2.ts, 0, 3))
 
@@ -68,25 +68,25 @@ class Derived extends Base {
 >Base : Symbol(Base, Decl(derivedClassOverridesProtectedMembers2.ts, 1, 36))
 
     a: typeof y;
->a : Symbol(a, Decl(derivedClassOverridesProtectedMembers2.ts, 20, 28))
+>a : Symbol(Derived.a, Decl(derivedClassOverridesProtectedMembers2.ts, 20, 28))
 >y : Symbol(y, Decl(derivedClassOverridesProtectedMembers2.ts, 1, 3))
 
     b(a: typeof y) { }
->b : Symbol(b, Decl(derivedClassOverridesProtectedMembers2.ts, 21, 16))
+>b : Symbol(Derived.b, Decl(derivedClassOverridesProtectedMembers2.ts, 21, 16))
 >a : Symbol(a, Decl(derivedClassOverridesProtectedMembers2.ts, 22, 6))
 >y : Symbol(y, Decl(derivedClassOverridesProtectedMembers2.ts, 1, 3))
 
     get c() { return y; }
->c : Symbol(c, Decl(derivedClassOverridesProtectedMembers2.ts, 22, 22), Decl(derivedClassOverridesProtectedMembers2.ts, 23, 25))
+>c : Symbol(Derived.c, Decl(derivedClassOverridesProtectedMembers2.ts, 22, 22), Decl(derivedClassOverridesProtectedMembers2.ts, 23, 25))
 >y : Symbol(y, Decl(derivedClassOverridesProtectedMembers2.ts, 1, 3))
 
     set c(v: typeof y) { }
->c : Symbol(c, Decl(derivedClassOverridesProtectedMembers2.ts, 22, 22), Decl(derivedClassOverridesProtectedMembers2.ts, 23, 25))
+>c : Symbol(Derived.c, Decl(derivedClassOverridesProtectedMembers2.ts, 22, 22), Decl(derivedClassOverridesProtectedMembers2.ts, 23, 25))
 >v : Symbol(v, Decl(derivedClassOverridesProtectedMembers2.ts, 24, 10))
 >y : Symbol(y, Decl(derivedClassOverridesProtectedMembers2.ts, 1, 3))
 
     d: (a: typeof y) => void;
->d : Symbol(d, Decl(derivedClassOverridesProtectedMembers2.ts, 24, 26))
+>d : Symbol(Derived.d, Decl(derivedClassOverridesProtectedMembers2.ts, 24, 26))
 >a : Symbol(a, Decl(derivedClassOverridesProtectedMembers2.ts, 25, 8))
 >y : Symbol(y, Decl(derivedClassOverridesProtectedMembers2.ts, 1, 3))
 
diff --git a/tests/baselines/reference/derivedClassOverridesWithoutSubtype.symbols b/tests/baselines/reference/derivedClassOverridesWithoutSubtype.symbols
index 452da91f034..67d5354cd5f 100644
--- a/tests/baselines/reference/derivedClassOverridesWithoutSubtype.symbols
+++ b/tests/baselines/reference/derivedClassOverridesWithoutSubtype.symbols
@@ -3,7 +3,7 @@ class Base {
 >Base : Symbol(Base, Decl(derivedClassOverridesWithoutSubtype.ts, 0, 0))
 
     x: {
->x : Symbol(x, Decl(derivedClassOverridesWithoutSubtype.ts, 0, 12))
+>x : Symbol(Base.x, Decl(derivedClassOverridesWithoutSubtype.ts, 0, 12))
 
         foo: string;
 >foo : Symbol(foo, Decl(derivedClassOverridesWithoutSubtype.ts, 1, 8))
@@ -15,7 +15,7 @@ class Derived extends Base {
 >Base : Symbol(Base, Decl(derivedClassOverridesWithoutSubtype.ts, 0, 0))
 
     x: {
->x : Symbol(x, Decl(derivedClassOverridesWithoutSubtype.ts, 6, 28))
+>x : Symbol(Derived.x, Decl(derivedClassOverridesWithoutSubtype.ts, 6, 28))
 
         foo: any;
 >foo : Symbol(foo, Decl(derivedClassOverridesWithoutSubtype.ts, 7, 8))
diff --git a/tests/baselines/reference/derivedClassTransitivity.errors.txt b/tests/baselines/reference/derivedClassTransitivity.errors.txt
index c6b620beb18..5be930fa5da 100644
--- a/tests/baselines/reference/derivedClassTransitivity.errors.txt
+++ b/tests/baselines/reference/derivedClassTransitivity.errors.txt
@@ -2,7 +2,7 @@ tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTra
   Types of property 'foo' are incompatible.
     Type '(x?: string) => void' is not assignable to type '(x: number) => void'.
       Types of parameters 'x' and 'x' are incompatible.
-        Type 'string' is not assignable to type 'number'.
+        Type 'number' is not assignable to type 'string'.
 
 
 ==== tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTransitivity.ts (1 errors) ====
@@ -29,6 +29,6 @@ tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTra
 !!! error TS2322:   Types of property 'foo' are incompatible.
 !!! error TS2322:     Type '(x?: string) => void' is not assignable to type '(x: number) => void'.
 !!! error TS2322:       Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:         Type 'string' is not assignable to type 'number'.
+!!! error TS2322:         Type 'number' is not assignable to type 'string'.
     var r = c.foo(1);
     var r2 = e.foo('');
\ No newline at end of file
diff --git a/tests/baselines/reference/derivedClassTransitivity2.errors.txt b/tests/baselines/reference/derivedClassTransitivity2.errors.txt
index a8d2003c876..e5f09911f55 100644
--- a/tests/baselines/reference/derivedClassTransitivity2.errors.txt
+++ b/tests/baselines/reference/derivedClassTransitivity2.errors.txt
@@ -2,7 +2,7 @@ tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTra
   Types of property 'foo' are incompatible.
     Type '(x: number, y?: string) => void' is not assignable to type '(x: number, y: number) => void'.
       Types of parameters 'y' and 'y' are incompatible.
-        Type 'string' is not assignable to type 'number'.
+        Type 'number' is not assignable to type 'string'.
 
 
 ==== tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTransitivity2.ts (1 errors) ====
@@ -29,6 +29,6 @@ tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTra
 !!! error TS2322:   Types of property 'foo' are incompatible.
 !!! error TS2322:     Type '(x: number, y?: string) => void' is not assignable to type '(x: number, y: number) => void'.
 !!! error TS2322:       Types of parameters 'y' and 'y' are incompatible.
-!!! error TS2322:         Type 'string' is not assignable to type 'number'.
+!!! error TS2322:         Type 'number' is not assignable to type 'string'.
     var r = c.foo(1, 1);
     var r2 = e.foo(1, '');
\ No newline at end of file
diff --git a/tests/baselines/reference/derivedClassTransitivity3.errors.txt b/tests/baselines/reference/derivedClassTransitivity3.errors.txt
index 9d301255dfd..b3e59a0bf4c 100644
--- a/tests/baselines/reference/derivedClassTransitivity3.errors.txt
+++ b/tests/baselines/reference/derivedClassTransitivity3.errors.txt
@@ -2,7 +2,7 @@ tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTra
   Types of property 'foo' are incompatible.
     Type '(x: string, y?: number) => void' is not assignable to type '(x: string, y: string) => void'.
       Types of parameters 'y' and 'y' are incompatible.
-        Type 'number' is not assignable to type 'string'.
+        Type 'string' is not assignable to type 'number'.
 
 
 ==== tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTransitivity3.ts (1 errors) ====
@@ -29,6 +29,6 @@ tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTra
 !!! error TS2322:   Types of property 'foo' are incompatible.
 !!! error TS2322:     Type '(x: string, y?: number) => void' is not assignable to type '(x: string, y: string) => void'.
 !!! error TS2322:       Types of parameters 'y' and 'y' are incompatible.
-!!! error TS2322:         Type 'number' is not assignable to type 'string'.
+!!! error TS2322:         Type 'string' is not assignable to type 'number'.
     var r = c.foo('', '');
     var r2 = e.foo('', 1);
\ No newline at end of file
diff --git a/tests/baselines/reference/derivedClassTransitivity4.errors.txt b/tests/baselines/reference/derivedClassTransitivity4.errors.txt
index c1a80e0a1d7..06319b16317 100644
--- a/tests/baselines/reference/derivedClassTransitivity4.errors.txt
+++ b/tests/baselines/reference/derivedClassTransitivity4.errors.txt
@@ -2,8 +2,8 @@ tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTra
   Types of property 'foo' are incompatible.
     Type '(x?: string) => void' is not assignable to type '(x: number) => void'.
       Types of parameters 'x' and 'x' are incompatible.
-        Type 'string' is not assignable to type 'number'.
-tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTransitivity4.ts(19,9): error TS2445: Property 'foo' is protected and only accessible within class 'C' and its subclasses.
+        Type 'number' is not assignable to type 'string'.
+tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTransitivity4.ts(19,11): error TS2445: Property 'foo' is protected and only accessible within class 'C' and its subclasses.
 
 
 ==== tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTransitivity4.ts (2 errors) ====
@@ -30,8 +30,8 @@ tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassTra
 !!! error TS2322:   Types of property 'foo' are incompatible.
 !!! error TS2322:     Type '(x?: string) => void' is not assignable to type '(x: number) => void'.
 !!! error TS2322:       Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:         Type 'string' is not assignable to type 'number'.
+!!! error TS2322:         Type 'number' is not assignable to type 'string'.
     var r = c.foo(1);
-            ~~~~~
+              ~~~
 !!! error TS2445: Property 'foo' is protected and only accessible within class 'C' and its subclasses.
     var r2 = e.foo('');
\ No newline at end of file
diff --git a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.errors.txt b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.errors.txt
index 2e5d6f57c86..88ec9eb44a8 100644
--- a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.errors.txt
+++ b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.errors.txt
@@ -4,10 +4,10 @@ tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWit
   Property 'x' is private in type 'typeof Derived' but not in type 'typeof Base'.
 tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic.ts(19,24): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic.ts(20,24): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic.ts(24,10): error TS2341: Property 'x' is private and only accessible within class 'Derived'.
-tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic.ts(27,10): error TS2341: Property 'fn' is private and only accessible within class 'Derived'.
-tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic.ts(32,10): error TS2341: Property 'a' is private and only accessible within class 'Derived'.
-tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic.ts(33,1): error TS2341: Property 'a' is private and only accessible within class 'Derived'.
+tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic.ts(24,18): error TS2341: Property 'x' is private and only accessible within class 'Derived'.
+tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic.ts(27,18): error TS2341: Property 'fn' is private and only accessible within class 'Derived'.
+tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic.ts(32,18): error TS2341: Property 'a' is private and only accessible within class 'Derived'.
+tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic.ts(33,9): error TS2341: Property 'a' is private and only accessible within class 'Derived'.
 
 
 ==== tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWithPrivateStaticShadowingPublicStatic.ts (9 errors) ====
@@ -46,20 +46,20 @@ tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassWit
     
     var r = Base.x; // ok
     var r2 = Derived.x; // error
-             ~~~~~~~~~
+                     ~
 !!! error TS2341: Property 'x' is private and only accessible within class 'Derived'.
     
     var r3 = Base.fn(); // ok
     var r4 = Derived.fn(); // error
-             ~~~~~~~~~~
+                     ~~
 !!! error TS2341: Property 'fn' is private and only accessible within class 'Derived'.
     
     var r5 = Base.a; // ok
     Base.a = 2; // ok
     
     var r6 = Derived.a; // error
-             ~~~~~~~~~
+                     ~
 !!! error TS2341: Property 'a' is private and only accessible within class 'Derived'.
     Derived.a = 2; // error
-    ~~~~~~~~~
+            ~
 !!! error TS2341: Property 'a' is private and only accessible within class 'Derived'.
\ No newline at end of file
diff --git a/tests/baselines/reference/derivedClasses.symbols b/tests/baselines/reference/derivedClasses.symbols
index f265c2dce53..61f4d7b81dc 100644
--- a/tests/baselines/reference/derivedClasses.symbols
+++ b/tests/baselines/reference/derivedClasses.symbols
@@ -4,7 +4,7 @@ class Red extends Color {
 >Color : Symbol(Color, Decl(derivedClasses.ts, 5, 1))
 
     public shade() { 
->shade : Symbol(shade, Decl(derivedClasses.ts, 0, 25))
+>shade : Symbol(Red.shade, Decl(derivedClasses.ts, 0, 25))
 
     	var getHue = () => { return this.hue(); };
 >getHue : Symbol(getHue, Decl(derivedClasses.ts, 2, 8))
@@ -21,10 +21,10 @@ class Color {
 >Color : Symbol(Color, Decl(derivedClasses.ts, 5, 1))
 
     public shade() { return "some shade"; }
->shade : Symbol(shade, Decl(derivedClasses.ts, 7, 13))
+>shade : Symbol(Color.shade, Decl(derivedClasses.ts, 7, 13))
 
     public hue() { return "some hue"; }
->hue : Symbol(hue, Decl(derivedClasses.ts, 8, 43))
+>hue : Symbol(Color.hue, Decl(derivedClasses.ts, 8, 43))
 }
 
 class Blue extends Color {
@@ -32,7 +32,7 @@ class Blue extends Color {
 >Color : Symbol(Color, Decl(derivedClasses.ts, 5, 1))
     
     public shade() { 
->shade : Symbol(shade, Decl(derivedClasses.ts, 12, 26))
+>shade : Symbol(Blue.shade, Decl(derivedClasses.ts, 12, 26))
 
     	var getHue = () => { return this.hue(); };
 >getHue : Symbol(getHue, Decl(derivedClasses.ts, 15, 8))
diff --git a/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.symbols b/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.symbols
index e0f41b72f76..ef62a0fe7c5 100644
--- a/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.symbols
+++ b/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.symbols
@@ -3,17 +3,17 @@ class Base {
 >Base : Symbol(Base, Decl(derivedTypeDoesNotRequireExtendsClause.ts, 0, 0))
 
     foo: string;
->foo : Symbol(foo, Decl(derivedTypeDoesNotRequireExtendsClause.ts, 0, 12))
+>foo : Symbol(Base.foo, Decl(derivedTypeDoesNotRequireExtendsClause.ts, 0, 12))
 }
 
 class Derived {
 >Derived : Symbol(Derived, Decl(derivedTypeDoesNotRequireExtendsClause.ts, 2, 1))
 
     foo: string;
->foo : Symbol(foo, Decl(derivedTypeDoesNotRequireExtendsClause.ts, 4, 15))
+>foo : Symbol(Derived.foo, Decl(derivedTypeDoesNotRequireExtendsClause.ts, 4, 15))
 
     bar: number;
->bar : Symbol(bar, Decl(derivedTypeDoesNotRequireExtendsClause.ts, 5, 16))
+>bar : Symbol(Derived.bar, Decl(derivedTypeDoesNotRequireExtendsClause.ts, 5, 16))
 }
 
 class Derived2 extends Base {
@@ -21,7 +21,7 @@ class Derived2 extends Base {
 >Base : Symbol(Base, Decl(derivedTypeDoesNotRequireExtendsClause.ts, 0, 0))
 
     bar: string;
->bar : Symbol(bar, Decl(derivedTypeDoesNotRequireExtendsClause.ts, 9, 29))
+>bar : Symbol(Derived2.bar, Decl(derivedTypeDoesNotRequireExtendsClause.ts, 9, 29))
 }
 
 var b: Base;
diff --git a/tests/baselines/reference/destructuringInFunctionType.symbols b/tests/baselines/reference/destructuringInFunctionType.symbols
index 8b573905b76..d73215a2ce6 100644
--- a/tests/baselines/reference/destructuringInFunctionType.symbols
+++ b/tests/baselines/reference/destructuringInFunctionType.symbols
@@ -2,15 +2,15 @@
 
 interface a { a }
 >a : Symbol(a, Decl(destructuringInFunctionType.ts, 0, 0))
->a : Symbol(a, Decl(destructuringInFunctionType.ts, 1, 13))
+>a : Symbol(a.a, Decl(destructuringInFunctionType.ts, 1, 13))
 
 interface b { b }
 >b : Symbol(b, Decl(destructuringInFunctionType.ts, 1, 17))
->b : Symbol(b, Decl(destructuringInFunctionType.ts, 2, 13))
+>b : Symbol(b.b, Decl(destructuringInFunctionType.ts, 2, 13))
 
 interface c { c }
 >c : Symbol(c, Decl(destructuringInFunctionType.ts, 2, 17))
->c : Symbol(c, Decl(destructuringInFunctionType.ts, 3, 13))
+>c : Symbol(c.c, Decl(destructuringInFunctionType.ts, 3, 13))
 
 type T1 = ([a, b, c]);
 >T1 : Symbol(T1, Decl(destructuringInFunctionType.ts, 3, 17))
diff --git a/tests/baselines/reference/destructuringInFunctionType.types b/tests/baselines/reference/destructuringInFunctionType.types
index 8786bbd0bb9..0cf057e06a3 100644
--- a/tests/baselines/reference/destructuringInFunctionType.types
+++ b/tests/baselines/reference/destructuringInFunctionType.types
@@ -29,7 +29,7 @@ type T2 = ({ a });
 >a : any
 
 type F2 = ({ a }) => void;
->F2 : ({ a }: { a: any; }) => void
+>F2 : ({a}: { a: any; }) => void
 >a : any
 
 type T3 = ([{ a: b }, { b: a }]);
@@ -40,7 +40,7 @@ type T3 = ([{ a: b }, { b: a }]);
 >a : a
 
 type F3 = ([{ a: b }, { b: a }]) => void;
->F3 : ([{ a: b }, { b: a }]: [{ a: any; }, { b: any; }]) => void
+>F3 : ([{a: b}, {b: a}]: [{ a: any; }, { b: any; }]) => void
 >a : any
 >b : any
 >b : any
@@ -53,13 +53,13 @@ type T4 = ([{ a: [b, c] }]);
 >c : c
 
 type F4 = ([{ a: [b, c] }]) => void;
->F4 : ([{ a: [b, c] }]: [{ a: [any, any]; }]) => void
+>F4 : ([{a: [b, c]}]: [{ a: [any, any]; }]) => void
 >a : any
 >b : any
 >c : any
 
 type C1 = new ([{ a: [b, c] }]) => void;
->C1 : new ([{ a: [b, c] }]: [{ a: [any, any]; }]) => void
+>C1 : new ([{a: [b, c]}]: [{ a: [any, any]; }]) => void
 >a : any
 >b : any
 >c : any
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations1.js b/tests/baselines/reference/destructuringInVariableDeclarations1.js
new file mode 100644
index 00000000000..707218b41e2
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations1.js
@@ -0,0 +1,13 @@
+//// [destructuringInVariableDeclarations1.ts]
+export let { toString } = 1;
+{
+    let { toFixed } = 1;
+}
+
+
+//// [destructuringInVariableDeclarations1.js]
+"use strict";
+exports.toString = (1).toString;
+{
+    let { toFixed } = 1;
+}
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations1.symbols b/tests/baselines/reference/destructuringInVariableDeclarations1.symbols
new file mode 100644
index 00000000000..4043bcc734d
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations1.symbols
@@ -0,0 +1,8 @@
+=== tests/cases/compiler/destructuringInVariableDeclarations1.ts ===
+export let { toString } = 1;
+>toString : Symbol(toString, Decl(destructuringInVariableDeclarations1.ts, 0, 12))
+{
+    let { toFixed } = 1;
+>toFixed : Symbol(toFixed, Decl(destructuringInVariableDeclarations1.ts, 2, 9))
+}
+
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations1.types b/tests/baselines/reference/destructuringInVariableDeclarations1.types
new file mode 100644
index 00000000000..84a60c844a3
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations1.types
@@ -0,0 +1,10 @@
+=== tests/cases/compiler/destructuringInVariableDeclarations1.ts ===
+export let { toString } = 1;
+>toString : (radix?: number) => string
+>1 : number
+{
+    let { toFixed } = 1;
+>toFixed : (fractionDigits?: number) => string
+>1 : number
+}
+
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations2.js b/tests/baselines/reference/destructuringInVariableDeclarations2.js
new file mode 100644
index 00000000000..9c1366bd8e0
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations2.js
@@ -0,0 +1,14 @@
+//// [destructuringInVariableDeclarations2.ts]
+let { toString } = 1;
+{
+    let { toFixed } = 1;
+}
+export {};
+
+
+//// [destructuringInVariableDeclarations2.js]
+"use strict";
+let { toString } = 1;
+{
+    let { toFixed } = 1;
+}
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations2.symbols b/tests/baselines/reference/destructuringInVariableDeclarations2.symbols
new file mode 100644
index 00000000000..f05ddf0c758
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations2.symbols
@@ -0,0 +1,9 @@
+=== tests/cases/compiler/destructuringInVariableDeclarations2.ts ===
+let { toString } = 1;
+>toString : Symbol(toString, Decl(destructuringInVariableDeclarations2.ts, 0, 5))
+{
+    let { toFixed } = 1;
+>toFixed : Symbol(toFixed, Decl(destructuringInVariableDeclarations2.ts, 2, 9))
+}
+export {};
+
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations2.types b/tests/baselines/reference/destructuringInVariableDeclarations2.types
new file mode 100644
index 00000000000..b7456d30285
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations2.types
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/destructuringInVariableDeclarations2.ts ===
+let { toString } = 1;
+>toString : (radix?: number) => string
+>1 : number
+{
+    let { toFixed } = 1;
+>toFixed : (fractionDigits?: number) => string
+>1 : number
+}
+export {};
+
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations3.js b/tests/baselines/reference/destructuringInVariableDeclarations3.js
new file mode 100644
index 00000000000..8da039fe98e
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations3.js
@@ -0,0 +1,15 @@
+//// [destructuringInVariableDeclarations3.ts]
+export let { toString } = 1;
+{
+    let { toFixed } = 1;
+}
+
+
+//// [destructuringInVariableDeclarations3.js]
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    exports.toString = (1).toString;
+    {
+        let { toFixed } = 1;
+    }
+});
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations3.symbols b/tests/baselines/reference/destructuringInVariableDeclarations3.symbols
new file mode 100644
index 00000000000..84b131a8ad0
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations3.symbols
@@ -0,0 +1,8 @@
+=== tests/cases/compiler/destructuringInVariableDeclarations3.ts ===
+export let { toString } = 1;
+>toString : Symbol(toString, Decl(destructuringInVariableDeclarations3.ts, 0, 12))
+{
+    let { toFixed } = 1;
+>toFixed : Symbol(toFixed, Decl(destructuringInVariableDeclarations3.ts, 2, 9))
+}
+
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations3.types b/tests/baselines/reference/destructuringInVariableDeclarations3.types
new file mode 100644
index 00000000000..970d6deb1ed
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations3.types
@@ -0,0 +1,10 @@
+=== tests/cases/compiler/destructuringInVariableDeclarations3.ts ===
+export let { toString } = 1;
+>toString : (radix?: number) => string
+>1 : number
+{
+    let { toFixed } = 1;
+>toFixed : (fractionDigits?: number) => string
+>1 : number
+}
+
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations4.js b/tests/baselines/reference/destructuringInVariableDeclarations4.js
new file mode 100644
index 00000000000..d4b30405143
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations4.js
@@ -0,0 +1,16 @@
+//// [destructuringInVariableDeclarations4.ts]
+let { toString } = 1;
+{
+    let { toFixed } = 1;
+}
+export {};
+
+
+//// [destructuringInVariableDeclarations4.js]
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    let { toString } = 1;
+    {
+        let { toFixed } = 1;
+    }
+});
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations4.symbols b/tests/baselines/reference/destructuringInVariableDeclarations4.symbols
new file mode 100644
index 00000000000..e599d7c5793
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations4.symbols
@@ -0,0 +1,9 @@
+=== tests/cases/compiler/destructuringInVariableDeclarations4.ts ===
+let { toString } = 1;
+>toString : Symbol(toString, Decl(destructuringInVariableDeclarations4.ts, 0, 5))
+{
+    let { toFixed } = 1;
+>toFixed : Symbol(toFixed, Decl(destructuringInVariableDeclarations4.ts, 2, 9))
+}
+export {};
+
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations4.types b/tests/baselines/reference/destructuringInVariableDeclarations4.types
new file mode 100644
index 00000000000..628fe7a9562
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations4.types
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/destructuringInVariableDeclarations4.ts ===
+let { toString } = 1;
+>toString : (radix?: number) => string
+>1 : number
+{
+    let { toFixed } = 1;
+>toFixed : (fractionDigits?: number) => string
+>1 : number
+}
+export {};
+
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations5.js b/tests/baselines/reference/destructuringInVariableDeclarations5.js
new file mode 100644
index 00000000000..48053fdbc4f
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations5.js
@@ -0,0 +1,22 @@
+//// [destructuringInVariableDeclarations5.ts]
+export let { toString } = 1;
+{
+    let { toFixed } = 1;
+}
+
+
+//// [destructuringInVariableDeclarations5.js]
+(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);
+    }
+})(["require", "exports"], function (require, exports) {
+    "use strict";
+    exports.toString = (1).toString;
+    {
+        let { toFixed } = 1;
+    }
+});
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations5.symbols b/tests/baselines/reference/destructuringInVariableDeclarations5.symbols
new file mode 100644
index 00000000000..60719928617
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations5.symbols
@@ -0,0 +1,8 @@
+=== tests/cases/compiler/destructuringInVariableDeclarations5.ts ===
+export let { toString } = 1;
+>toString : Symbol(toString, Decl(destructuringInVariableDeclarations5.ts, 0, 12))
+{
+    let { toFixed } = 1;
+>toFixed : Symbol(toFixed, Decl(destructuringInVariableDeclarations5.ts, 2, 9))
+}
+
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations5.types b/tests/baselines/reference/destructuringInVariableDeclarations5.types
new file mode 100644
index 00000000000..9a890916d17
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations5.types
@@ -0,0 +1,10 @@
+=== tests/cases/compiler/destructuringInVariableDeclarations5.ts ===
+export let { toString } = 1;
+>toString : (radix?: number) => string
+>1 : number
+{
+    let { toFixed } = 1;
+>toFixed : (fractionDigits?: number) => string
+>1 : number
+}
+
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations6.js b/tests/baselines/reference/destructuringInVariableDeclarations6.js
new file mode 100644
index 00000000000..479d4ee34af
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations6.js
@@ -0,0 +1,23 @@
+//// [destructuringInVariableDeclarations6.ts]
+let { toString } = 1;
+{
+    let { toFixed } = 1;
+}
+export {};
+
+
+//// [destructuringInVariableDeclarations6.js]
+(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);
+    }
+})(["require", "exports"], function (require, exports) {
+    "use strict";
+    let { toString } = 1;
+    {
+        let { toFixed } = 1;
+    }
+});
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations6.symbols b/tests/baselines/reference/destructuringInVariableDeclarations6.symbols
new file mode 100644
index 00000000000..71072de351e
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations6.symbols
@@ -0,0 +1,9 @@
+=== tests/cases/compiler/destructuringInVariableDeclarations6.ts ===
+let { toString } = 1;
+>toString : Symbol(toString, Decl(destructuringInVariableDeclarations6.ts, 0, 5))
+{
+    let { toFixed } = 1;
+>toFixed : Symbol(toFixed, Decl(destructuringInVariableDeclarations6.ts, 2, 9))
+}
+export {};
+
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations6.types b/tests/baselines/reference/destructuringInVariableDeclarations6.types
new file mode 100644
index 00000000000..cf1105b575a
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations6.types
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/destructuringInVariableDeclarations6.ts ===
+let { toString } = 1;
+>toString : (radix?: number) => string
+>1 : number
+{
+    let { toFixed } = 1;
+>toFixed : (fractionDigits?: number) => string
+>1 : number
+}
+export {};
+
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations7.js b/tests/baselines/reference/destructuringInVariableDeclarations7.js
new file mode 100644
index 00000000000..e7e4f803b77
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations7.js
@@ -0,0 +1,22 @@
+//// [destructuringInVariableDeclarations7.ts]
+export let { toString } = 1;
+{
+    let { toFixed } = 1;
+}
+
+
+//// [destructuringInVariableDeclarations7.js]
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var __moduleName = context_1 && context_1.id;
+    var toString;
+    return {
+        setters: [],
+        execute: function () {
+            exports_1("toString", toString = (1).toString);
+            {
+                let { toFixed } = 1;
+            }
+        }
+    };
+});
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations7.symbols b/tests/baselines/reference/destructuringInVariableDeclarations7.symbols
new file mode 100644
index 00000000000..7fde898296b
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations7.symbols
@@ -0,0 +1,8 @@
+=== tests/cases/compiler/destructuringInVariableDeclarations7.ts ===
+export let { toString } = 1;
+>toString : Symbol(toString, Decl(destructuringInVariableDeclarations7.ts, 0, 12))
+{
+    let { toFixed } = 1;
+>toFixed : Symbol(toFixed, Decl(destructuringInVariableDeclarations7.ts, 2, 9))
+}
+
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations7.types b/tests/baselines/reference/destructuringInVariableDeclarations7.types
new file mode 100644
index 00000000000..c0c1b571215
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations7.types
@@ -0,0 +1,10 @@
+=== tests/cases/compiler/destructuringInVariableDeclarations7.ts ===
+export let { toString } = 1;
+>toString : (radix?: number) => string
+>1 : number
+{
+    let { toFixed } = 1;
+>toFixed : (fractionDigits?: number) => string
+>1 : number
+}
+
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations8.js b/tests/baselines/reference/destructuringInVariableDeclarations8.js
new file mode 100644
index 00000000000..12340433bf4
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations8.js
@@ -0,0 +1,23 @@
+//// [destructuringInVariableDeclarations8.ts]
+let { toString } = 1;
+{
+    let { toFixed } = 1;
+}
+export {};
+
+
+//// [destructuringInVariableDeclarations8.js]
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var __moduleName = context_1 && context_1.id;
+    var toString;
+    return {
+        setters: [],
+        execute: function () {
+            toString = (1).toString;
+            {
+                let { toFixed } = 1;
+            }
+        }
+    };
+});
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations8.symbols b/tests/baselines/reference/destructuringInVariableDeclarations8.symbols
new file mode 100644
index 00000000000..887ea4ffa4c
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations8.symbols
@@ -0,0 +1,9 @@
+=== tests/cases/compiler/destructuringInVariableDeclarations8.ts ===
+let { toString } = 1;
+>toString : Symbol(toString, Decl(destructuringInVariableDeclarations8.ts, 0, 5))
+{
+    let { toFixed } = 1;
+>toFixed : Symbol(toFixed, Decl(destructuringInVariableDeclarations8.ts, 2, 9))
+}
+export {};
+
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations8.types b/tests/baselines/reference/destructuringInVariableDeclarations8.types
new file mode 100644
index 00000000000..ef376563551
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations8.types
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/destructuringInVariableDeclarations8.ts ===
+let { toString } = 1;
+>toString : (radix?: number) => string
+>1 : number
+{
+    let { toFixed } = 1;
+>toFixed : (fractionDigits?: number) => string
+>1 : number
+}
+export {};
+
diff --git a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.types b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.types
index 476b5bee0cc..cb6052d93fd 100644
--- a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.types
+++ b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.types
@@ -69,7 +69,7 @@ function foo(): F {
 >F : F
 
     return {
->{        1: true    } : { [x: number]: boolean; 1: boolean; }
+>{        1: true    } : { 1: boolean; }
 
         1: true
 >true : boolean
@@ -82,7 +82,7 @@ function bar(): F {
 >F : F
 
     return {
->{        2: true    } : { [x: number]: boolean; 2: boolean; }
+>{        2: true    } : { 2: boolean; }
 
         2: true
 >true : boolean
@@ -114,7 +114,7 @@ function foo1(): F1 {
 >F1 : F1
 
     return {
->{        "prop1": 2    } : { [x: string]: number; "prop1": number; }
+>{        "prop1": 2    } : { "prop1": number; }
 
         "prop1": 2
 >2 : number
diff --git a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.types b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.types
index 7a7f631eddf..2d77c20f65b 100644
--- a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.types
+++ b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.types
@@ -69,7 +69,7 @@ function foo(): F {
 >F : F
 
     return {
->{        1: true    } : { [x: number]: boolean; 1: boolean; }
+>{        1: true    } : { 1: boolean; }
 
         1: true
 >true : boolean
@@ -82,7 +82,7 @@ function bar(): F {
 >F : F
 
     return {
->{        2: true    } : { [x: number]: boolean; 2: boolean; }
+>{        2: true    } : { 2: boolean; }
 
         2: true
 >true : boolean
@@ -114,7 +114,7 @@ function foo1(): F1 {
 >F1 : F1
 
     return {
->{        "prop1": 2    } : { [x: string]: number; "prop1": number; }
+>{        "prop1": 2    } : { "prop1": number; }
 
         "prop1": 2
 >2 : number
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/destructuringParameterDeclaration2.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt
index 8c0781571e4..d68220c8308 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration2.errors.txt
@@ -7,7 +7,6 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(
     Type '() => number | string[][] | string' is not assignable to type '() => number | string[][]'.
       Type 'number | string[][] | string' is not assignable to type 'number | string[][]'.
         Type 'string' is not assignable to type 'number | string[][]'.
-          Type 'string' is not assignable to type 'string[][]'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(16,8): error TS2371: A parameter initializer is only allowed in a function or constructor implementation.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(16,16): error TS2371: A parameter initializer is only allowed in a function or constructor implementation.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(23,14): error TS2345: Argument of type '{ x: string; y: boolean; }' is not assignable to parameter of type '{ x: number; y: any; }'.
@@ -29,7 +28,6 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(38,4): error TS2345: Argument of type '{ b: boolean; }' is not assignable to parameter of type '{ b: number | string; }'.
   Types of property 'b' are incompatible.
     Type 'boolean' is not assignable to type 'number | string'.
-      Type 'boolean' is not assignable to type 'string'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(39,4): error TS2345: Argument of type '[number, number, boolean, boolean]' is not assignable to parameter of type '[any, any, [[any]]]'.
   Types of property '2' are incompatible.
     Type 'boolean' is not assignable to type '[[any]]'.
@@ -46,8 +44,8 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(
   Types of property 'd4' are incompatible.
     Type '({x, y, c}: { x: any; y: any; c: any; }) => void' is not assignable to type '({x, y, z}?: { x: any; y: any; z: any; }) => any'.
       Types of parameters '__0' and '__0' are incompatible.
-        Type '{ x: any; y: any; c: any; }' is not assignable to type '{ x: any; y: any; z: any; }'.
-          Property 'z' is missing in type '{ x: any; y: any; c: any; }'.
+        Type '{ x: any; y: any; z: any; }' is not assignable to type '{ x: any; y: any; c: any; }'.
+          Property 'c' is missing in type '{ x: any; y: any; z: any; }'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(56,8): error TS2463: A binding pattern parameter cannot be optional in an implementation signature.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(65,18): error TS2300: Duplicate identifier 'number'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(65,26): error TS2300: Duplicate identifier 'number'.
@@ -75,7 +73,6 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(
 !!! error TS2345:     Type '() => number | string[][] | string' is not assignable to type '() => number | string[][]'.
 !!! error TS2345:       Type 'number | string[][] | string' is not assignable to type 'number | string[][]'.
 !!! error TS2345:         Type 'string' is not assignable to type 'number | string[][]'.
-!!! error TS2345:           Type 'string' is not assignable to type 'string[][]'.
     
     
     // If the declaration includes an initializer expression (which is permitted only
@@ -137,7 +134,6 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(
 !!! error TS2345: Argument of type '{ b: boolean; }' is not assignable to parameter of type '{ b: number | string; }'.
 !!! error TS2345:   Types of property 'b' are incompatible.
 !!! error TS2345:     Type 'boolean' is not assignable to type 'number | string'.
-!!! error TS2345:       Type 'boolean' is not assignable to type 'string'.
     c5([1, 2, false, true]);   // Error, implied type is [any, any, [[any]]]
        ~~~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '[number, number, boolean, boolean]' is not assignable to parameter of type '[any, any, [[any]]]'.
@@ -176,8 +172,8 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(
 !!! error TS2420:   Types of property 'd4' are incompatible.
 !!! error TS2420:     Type '({x, y, c}: { x: any; y: any; c: any; }) => void' is not assignable to type '({x, y, z}?: { x: any; y: any; z: any; }) => any'.
 !!! error TS2420:       Types of parameters '__0' and '__0' are incompatible.
-!!! error TS2420:         Type '{ x: any; y: any; c: any; }' is not assignable to type '{ x: any; y: any; z: any; }'.
-!!! error TS2420:           Property 'z' is missing in type '{ x: any; y: any; c: any; }'.
+!!! error TS2420:         Type '{ x: any; y: any; z: any; }' is not assignable to type '{ x: any; y: any; c: any; }'.
+!!! error TS2420:           Property 'c' is missing in type '{ x: any; y: any; z: any; }'.
         d3([a, b, c]?) { }  // Error, binding pattern can't be optional in implementation signature
            ~~~~~~~~~~
 !!! error TS2463: A binding pattern parameter cannot be optional in an implementation signature.
diff --git a/tests/baselines/reference/destructuringParameterDeclaration3ES5.symbols b/tests/baselines/reference/destructuringParameterDeclaration3ES5.symbols
index c4dc8fd0f79..d08dc0a89fa 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration3ES5.symbols
+++ b/tests/baselines/reference/destructuringParameterDeclaration3ES5.symbols
@@ -8,19 +8,19 @@
 
 type arrayString = Array<String>
 >arrayString : Symbol(arrayString, Decl(destructuringParameterDeclaration3ES5.ts, 0, 0))
->Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>String : Symbol(String, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 
 type someArray = Array<String> | number[];
 >someArray : Symbol(someArray, Decl(destructuringParameterDeclaration3ES5.ts, 7, 32))
->Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>String : Symbol(String, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 
 type stringOrNumArray = Array<String|Number>;
 >stringOrNumArray : Symbol(stringOrNumArray, Decl(destructuringParameterDeclaration3ES5.ts, 8, 42))
->Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>String : Symbol(String, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 function a1(...x: (number|string)[]) { }
 >a1 : Symbol(a1, Decl(destructuringParameterDeclaration3ES5.ts, 9, 45))
@@ -33,8 +33,8 @@ function a2(...a) { }
 function a3(...a: Array<String>) { }
 >a3 : Symbol(a3, Decl(destructuringParameterDeclaration3ES5.ts, 12, 21))
 >a : Symbol(a, Decl(destructuringParameterDeclaration3ES5.ts, 13, 12))
->Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>String : Symbol(String, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 
 function a4(...a: arrayString) { }
 >a4 : Symbol(a4, Decl(destructuringParameterDeclaration3ES5.ts, 13, 36))
@@ -122,7 +122,7 @@ const enum E1 { a, b }
 function foo1<T extends Number>(...a: T[]) { }
 >foo1 : Symbol(foo1, Decl(destructuringParameterDeclaration3ES5.ts, 39, 22))
 >T : Symbol(T, Decl(destructuringParameterDeclaration3ES5.ts, 40, 14))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >a : Symbol(a, Decl(destructuringParameterDeclaration3ES5.ts, 40, 32))
 >T : Symbol(T, Decl(destructuringParameterDeclaration3ES5.ts, 40, 14))
 
diff --git a/tests/baselines/reference/destructuringParameterDeclaration3ES6.symbols b/tests/baselines/reference/destructuringParameterDeclaration3ES6.symbols
index 46682802e2a..dd07a528ec8 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration3ES6.symbols
+++ b/tests/baselines/reference/destructuringParameterDeclaration3ES6.symbols
@@ -8,19 +8,19 @@
 
 type arrayString = Array<String>
 >arrayString : Symbol(arrayString, Decl(destructuringParameterDeclaration3ES6.ts, 0, 0))
->Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>String : Symbol(String, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 
 type someArray = Array<String> | number[];
 >someArray : Symbol(someArray, Decl(destructuringParameterDeclaration3ES6.ts, 7, 32))
->Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>String : Symbol(String, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 
 type stringOrNumArray = Array<String|Number>;
 >stringOrNumArray : Symbol(stringOrNumArray, Decl(destructuringParameterDeclaration3ES6.ts, 8, 42))
->Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>String : Symbol(String, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 function a1(...x: (number|string)[]) { }
 >a1 : Symbol(a1, Decl(destructuringParameterDeclaration3ES6.ts, 9, 45))
@@ -33,8 +33,8 @@ function a2(...a) { }
 function a3(...a: Array<String>) { }
 >a3 : Symbol(a3, Decl(destructuringParameterDeclaration3ES6.ts, 12, 21))
 >a : Symbol(a, Decl(destructuringParameterDeclaration3ES6.ts, 13, 12))
->Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>String : Symbol(String, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 
 function a4(...a: arrayString) { }
 >a4 : Symbol(a4, Decl(destructuringParameterDeclaration3ES6.ts, 13, 36))
@@ -122,7 +122,7 @@ const enum E1 { a, b }
 function foo1<T extends Number>(...a: T[]) { }
 >foo1 : Symbol(foo1, Decl(destructuringParameterDeclaration3ES6.ts, 39, 22))
 >T : Symbol(T, Decl(destructuringParameterDeclaration3ES6.ts, 40, 14))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >a : Symbol(a, Decl(destructuringParameterDeclaration3ES6.ts, 40, 32))
 >T : Symbol(T, Decl(destructuringParameterDeclaration3ES6.ts, 40, 14))
 
diff --git a/tests/baselines/reference/destructuringParameterDeclaration4.errors.txt b/tests/baselines/reference/destructuringParameterDeclaration4.errors.txt
index b08c5b942d8..aa5a8e8daea 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration4.errors.txt
+++ b/tests/baselines/reference/destructuringParameterDeclaration4.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(11,13): error TS2370: A rest parameter must be of an array type.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(13,13): error TS2370: A rest parameter must be of an array type.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(20,19): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'number | string'.
-  Type 'boolean' is not assignable to type 'string'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(21,7): error TS2304: Cannot find name 'array2'.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(22,4): error TS2345: Argument of type '[number, number, string, boolean, boolean]' is not assignable to parameter of type '[any, any, [[any]]]'.
   Types of property '2' are incompatible.
@@ -43,7 +42,6 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration4.ts(
     a1(1, 2, "hello", true);  // Error, parameter type is (number|string)[]
                       ~~~~
 !!! error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'number | string'.
-!!! error TS2345:   Type 'boolean' is not assignable to type 'string'.
     a1(...array2);            // Error parameter type is (number|string)[]
           ~~~~~~
 !!! error TS2304: Cannot find name 'array2'.
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/destructuringWithGenericParameter.symbols b/tests/baselines/reference/destructuringWithGenericParameter.symbols
index 0c489cf1ef2..9a795cb5441 100644
--- a/tests/baselines/reference/destructuringWithGenericParameter.symbols
+++ b/tests/baselines/reference/destructuringWithGenericParameter.symbols
@@ -4,7 +4,7 @@ class GenericClass<T> {
 >T : Symbol(T, Decl(destructuringWithGenericParameter.ts, 0, 19))
 
     payload: T;
->payload : Symbol(payload, Decl(destructuringWithGenericParameter.ts, 0, 23))
+>payload : Symbol(GenericClass.payload, Decl(destructuringWithGenericParameter.ts, 0, 23))
 >T : Symbol(T, Decl(destructuringWithGenericParameter.ts, 0, 19))
 }
 
diff --git a/tests/baselines/reference/destructuringWithLiteralInitializers.types b/tests/baselines/reference/destructuringWithLiteralInitializers.types
index da1e4bfd6f3..9b970679f74 100644
--- a/tests/baselines/reference/destructuringWithLiteralInitializers.types
+++ b/tests/baselines/reference/destructuringWithLiteralInitializers.types
@@ -1,13 +1,13 @@
 === tests/cases/conformance/es6/destructuring/destructuringWithLiteralInitializers.ts ===
 // (arg: { x: any, y: any }) => void
 function f1({ x, y }) { }
->f1 : ({ x, y }: { x: any; y: any; }) => void
+>f1 : ({x, y}: { x: any; y: any; }) => void
 >x : any
 >y : any
 
 f1({ x: 1, y: 1 });
 >f1({ x: 1, y: 1 }) : void
->f1 : ({ x, y }: { x: any; y: any; }) => void
+>f1 : ({x, y}: { x: any; y: any; }) => void
 >{ x: 1, y: 1 } : { x: number; y: number; }
 >x : number
 >1 : number
@@ -16,21 +16,21 @@ f1({ x: 1, y: 1 });
 
 // (arg: { x: any, y?: number }) => void
 function f2({ x, y = 0 }) { }
->f2 : ({ x, y = 0 }: { x: any; y?: number; }) => void
+>f2 : ({x, y}: { x: any; y?: number; }) => void
 >x : any
 >y : number
 >0 : number
 
 f2({ x: 1 });
 >f2({ x: 1 }) : void
->f2 : ({ x, y = 0 }: { x: any; y?: number; }) => void
+>f2 : ({x, y}: { x: any; y?: number; }) => void
 >{ x: 1 } : { x: number; }
 >x : number
 >1 : number
 
 f2({ x: 1, y: 1 });
 >f2({ x: 1, y: 1 }) : void
->f2 : ({ x, y = 0 }: { x: any; y?: number; }) => void
+>f2 : ({x, y}: { x: any; y?: number; }) => void
 >{ x: 1, y: 1 } : { x: number; y: number; }
 >x : number
 >1 : number
@@ -39,7 +39,7 @@ f2({ x: 1, y: 1 });
 
 // (arg: { x?: number, y?: number }) => void
 function f3({ x = 0, y = 0 }) { }
->f3 : ({ x = 0, y = 0 }: { x?: number; y?: number; }) => void
+>f3 : ({x, y}: { x?: number; y?: number; }) => void
 >x : number
 >0 : number
 >y : number
@@ -47,26 +47,26 @@ function f3({ x = 0, y = 0 }) { }
 
 f3({});
 >f3({}) : void
->f3 : ({ x = 0, y = 0 }: { x?: number; y?: number; }) => void
+>f3 : ({x, y}: { x?: number; y?: number; }) => void
 >{} : {}
 
 f3({ x: 1 });
 >f3({ x: 1 }) : void
->f3 : ({ x = 0, y = 0 }: { x?: number; y?: number; }) => void
+>f3 : ({x, y}: { x?: number; y?: number; }) => void
 >{ x: 1 } : { x: number; }
 >x : number
 >1 : number
 
 f3({ y: 1 });
 >f3({ y: 1 }) : void
->f3 : ({ x = 0, y = 0 }: { x?: number; y?: number; }) => void
+>f3 : ({x, y}: { x?: number; y?: number; }) => void
 >{ y: 1 } : { y: number; }
 >y : number
 >1 : number
 
 f3({ x: 1, y: 1 });
 >f3({ x: 1, y: 1 }) : void
->f3 : ({ x = 0, y = 0 }: { x?: number; y?: number; }) => void
+>f3 : ({x, y}: { x?: number; y?: number; }) => void
 >{ x: 1, y: 1 } : { x: number; y: number; }
 >x : number
 >1 : number
@@ -75,7 +75,7 @@ f3({ x: 1, y: 1 });
 
 // (arg?: { x: number, y: number }) => void
 function f4({ x, y } = { x: 0, y: 0 }) { }
->f4 : ({ x, y }?: { x: number; y: number; }) => void
+>f4 : ({x, y}?: { x: number; y: number; }) => void
 >x : number
 >y : number
 >{ x: 0, y: 0 } : { x: number; y: number; }
@@ -86,11 +86,11 @@ function f4({ x, y } = { x: 0, y: 0 }) { }
 
 f4();
 >f4() : void
->f4 : ({ x, y }?: { x: number; y: number; }) => void
+>f4 : ({x, y}?: { x: number; y: number; }) => void
 
 f4({ x: 1, y: 1 });
 >f4({ x: 1, y: 1 }) : void
->f4 : ({ x, y }?: { x: number; y: number; }) => void
+>f4 : ({x, y}?: { x: number; y: number; }) => void
 >{ x: 1, y: 1 } : { x: number; y: number; }
 >x : number
 >1 : number
@@ -99,7 +99,7 @@ f4({ x: 1, y: 1 });
 
 // (arg?: { x: number, y?: number }) => void
 function f5({ x, y = 0 } = { x: 0 }) { }
->f5 : ({ x, y = 0 }?: { x: number; y?: number; }) => void
+>f5 : ({x, y}?: { x: number; y?: number; }) => void
 >x : number
 >y : number
 >0 : number
@@ -109,18 +109,18 @@ function f5({ x, y = 0 } = { x: 0 }) { }
 
 f5();
 >f5() : void
->f5 : ({ x, y = 0 }?: { x: number; y?: number; }) => void
+>f5 : ({x, y}?: { x: number; y?: number; }) => void
 
 f5({ x: 1 });
 >f5({ x: 1 }) : void
->f5 : ({ x, y = 0 }?: { x: number; y?: number; }) => void
+>f5 : ({x, y}?: { x: number; y?: number; }) => void
 >{ x: 1 } : { x: number; }
 >x : number
 >1 : number
 
 f5({ x: 1, y: 1 });
 >f5({ x: 1, y: 1 }) : void
->f5 : ({ x, y = 0 }?: { x: number; y?: number; }) => void
+>f5 : ({x, y}?: { x: number; y?: number; }) => void
 >{ x: 1, y: 1 } : { x: number; y: number; }
 >x : number
 >1 : number
@@ -129,7 +129,7 @@ f5({ x: 1, y: 1 });
 
 // (arg?: { x?: number, y?: number }) => void
 function f6({ x = 0, y = 0 } = {}) { }
->f6 : ({ x = 0, y = 0 }?: { x?: number; y?: number; }) => void
+>f6 : ({x, y}?: { x?: number; y?: number; }) => void
 >x : number
 >0 : number
 >y : number
@@ -138,30 +138,30 @@ function f6({ x = 0, y = 0 } = {}) { }
 
 f6();
 >f6() : void
->f6 : ({ x = 0, y = 0 }?: { x?: number; y?: number; }) => void
+>f6 : ({x, y}?: { x?: number; y?: number; }) => void
 
 f6({});
 >f6({}) : void
->f6 : ({ x = 0, y = 0 }?: { x?: number; y?: number; }) => void
+>f6 : ({x, y}?: { x?: number; y?: number; }) => void
 >{} : {}
 
 f6({ x: 1 });
 >f6({ x: 1 }) : void
->f6 : ({ x = 0, y = 0 }?: { x?: number; y?: number; }) => void
+>f6 : ({x, y}?: { x?: number; y?: number; }) => void
 >{ x: 1 } : { x: number; }
 >x : number
 >1 : number
 
 f6({ y: 1 });
 >f6({ y: 1 }) : void
->f6 : ({ x = 0, y = 0 }?: { x?: number; y?: number; }) => void
+>f6 : ({x, y}?: { x?: number; y?: number; }) => void
 >{ y: 1 } : { y: number; }
 >y : number
 >1 : number
 
 f6({ x: 1, y: 1 });
 >f6({ x: 1, y: 1 }) : void
->f6 : ({ x = 0, y = 0 }?: { x?: number; y?: number; }) => void
+>f6 : ({x, y}?: { x?: number; y?: number; }) => void
 >{ x: 1, y: 1 } : { x: number; y: number; }
 >x : number
 >1 : number
@@ -170,7 +170,7 @@ f6({ x: 1, y: 1 });
 
 // (arg?: { a: { x?: number, y?: number } }) => void
 function f7({ a: { x = 0, y = 0 } } = { a: {} }) { }
->f7 : ({ a: { x = 0, y = 0 } }?: { a: { x?: number; y?: number; }; }) => void
+>f7 : ({a: {x, y}}?: { a: { x?: number; y?: number; }; }) => void
 >a : any
 >x : number
 >0 : number
@@ -182,18 +182,18 @@ function f7({ a: { x = 0, y = 0 } } = { a: {} }) { }
 
 f7();
 >f7() : void
->f7 : ({ a: { x = 0, y = 0 } }?: { a: { x?: number; y?: number; }; }) => void
+>f7 : ({a: {x, y}}?: { a: { x?: number; y?: number; }; }) => void
 
 f7({ a: {} });
 >f7({ a: {} }) : void
->f7 : ({ a: { x = 0, y = 0 } }?: { a: { x?: number; y?: number; }; }) => void
+>f7 : ({a: {x, y}}?: { a: { x?: number; y?: number; }; }) => void
 >{ a: {} } : { a: {}; }
 >a : {}
 >{} : {}
 
 f7({ a: { x: 1 } });
 >f7({ a: { x: 1 } }) : void
->f7 : ({ a: { x = 0, y = 0 } }?: { a: { x?: number; y?: number; }; }) => void
+>f7 : ({a: {x, y}}?: { a: { x?: number; y?: number; }; }) => void
 >{ a: { x: 1 } } : { a: { x: number; }; }
 >a : { x: number; }
 >{ x: 1 } : { x: number; }
@@ -202,7 +202,7 @@ f7({ a: { x: 1 } });
 
 f7({ a: { y: 1 } });
 >f7({ a: { y: 1 } }) : void
->f7 : ({ a: { x = 0, y = 0 } }?: { a: { x?: number; y?: number; }; }) => void
+>f7 : ({a: {x, y}}?: { a: { x?: number; y?: number; }; }) => void
 >{ a: { y: 1 } } : { a: { y: number; }; }
 >a : { y: number; }
 >{ y: 1 } : { y: number; }
@@ -211,7 +211,7 @@ f7({ a: { y: 1 } });
 
 f7({ a: { x: 1, y: 1 } });
 >f7({ a: { x: 1, y: 1 } }) : void
->f7 : ({ a: { x = 0, y = 0 } }?: { a: { x?: number; y?: number; }; }) => void
+>f7 : ({a: {x, y}}?: { a: { x?: number; y?: number; }; }) => void
 >{ a: { x: 1, y: 1 } } : { a: { x: number; y: number; }; }
 >a : { x: number; y: number; }
 >{ x: 1, y: 1 } : { x: number; y: number; }
@@ -235,7 +235,7 @@ g1([1, 1]);
 
 // (arg: [number, number]) => void
 function g2([x = 0, y = 0]) { }
->g2 : ([x = 0, y = 0]: [number, number]) => void
+>g2 : ([x, y]: [number, number]) => void
 >x : number
 >0 : number
 >y : number
@@ -243,7 +243,7 @@ function g2([x = 0, y = 0]) { }
 
 g2([1, 1]);
 >g2([1, 1]) : void
->g2 : ([x = 0, y = 0]: [number, number]) => void
+>g2 : ([x, y]: [number, number]) => void
 >[1, 1] : [number, number]
 >1 : number
 >1 : number
@@ -270,7 +270,7 @@ g3([1, 1]);
 
 // (arg?: [number, number]) => void
 function g4([x, y = 0] = [0]) { }
->g4 : ([x, y = 0]?: [number, number]) => void
+>g4 : ([x, y]?: [number, number]) => void
 >x : number
 >y : number
 >0 : number
@@ -279,18 +279,18 @@ function g4([x, y = 0] = [0]) { }
 
 g4();
 >g4() : void
->g4 : ([x, y = 0]?: [number, number]) => void
+>g4 : ([x, y]?: [number, number]) => void
 
 g4([1, 1]);
 >g4([1, 1]) : void
->g4 : ([x, y = 0]?: [number, number]) => void
+>g4 : ([x, y]?: [number, number]) => void
 >[1, 1] : [number, number]
 >1 : number
 >1 : number
 
 // (arg?: [number, number]) => void
 function g5([x = 0, y = 0] = []) { }
->g5 : ([x = 0, y = 0]?: [number, number]) => void
+>g5 : ([x, y]?: [number, number]) => void
 >x : number
 >0 : number
 >y : number
@@ -299,11 +299,11 @@ function g5([x = 0, y = 0] = []) { }
 
 g5();
 >g5() : void
->g5 : ([x = 0, y = 0]?: [number, number]) => void
+>g5 : ([x, y]?: [number, number]) => void
 
 g5([1, 1]);
 >g5([1, 1]) : void
->g5 : ([x = 0, y = 0]?: [number, number]) => void
+>g5 : ([x, y]?: [number, number]) => void
 >[1, 1] : [number, number]
 >1 : number
 >1 : number
diff --git a/tests/baselines/reference/destructuringWithNewExpression.symbols b/tests/baselines/reference/destructuringWithNewExpression.symbols
index c7dce468485..1f2bb93530f 100644
--- a/tests/baselines/reference/destructuringWithNewExpression.symbols
+++ b/tests/baselines/reference/destructuringWithNewExpression.symbols
@@ -3,7 +3,7 @@ class C {
 >C : Symbol(C, Decl(destructuringWithNewExpression.ts, 0, 0))
 
     x = 0;
->x : Symbol(x, Decl(destructuringWithNewExpression.ts, 0, 9))
+>x : Symbol(C.x, Decl(destructuringWithNewExpression.ts, 0, 9))
 }
 
 var { x } = new C;
diff --git a/tests/baselines/reference/detachedCommentAtStartOfConstructor1.symbols b/tests/baselines/reference/detachedCommentAtStartOfConstructor1.symbols
index 9590abaa460..d8531e9ff02 100644
--- a/tests/baselines/reference/detachedCommentAtStartOfConstructor1.symbols
+++ b/tests/baselines/reference/detachedCommentAtStartOfConstructor1.symbols
@@ -3,10 +3,10 @@ class TestFile {
 >TestFile : Symbol(TestFile, Decl(detachedCommentAtStartOfConstructor1.ts, 0, 0))
 
     public message: string;
->message : Symbol(message, Decl(detachedCommentAtStartOfConstructor1.ts, 0, 16))
+>message : Symbol(TestFile.message, Decl(detachedCommentAtStartOfConstructor1.ts, 0, 16))
 
     public name;
->name : Symbol(name, Decl(detachedCommentAtStartOfConstructor1.ts, 1, 27))
+>name : Symbol(TestFile.name, Decl(detachedCommentAtStartOfConstructor1.ts, 1, 27))
 
     constructor(message: string) {
 >message : Symbol(message, Decl(detachedCommentAtStartOfConstructor1.ts, 3, 16))
@@ -16,14 +16,14 @@ class TestFile {
         var getMessage = () => message + this.name;
 >getMessage : Symbol(getMessage, Decl(detachedCommentAtStartOfConstructor1.ts, 6, 11))
 >message : Symbol(message, Decl(detachedCommentAtStartOfConstructor1.ts, 3, 16))
->this.name : Symbol(name, Decl(detachedCommentAtStartOfConstructor1.ts, 1, 27))
+>this.name : Symbol(TestFile.name, Decl(detachedCommentAtStartOfConstructor1.ts, 1, 27))
 >this : Symbol(TestFile, Decl(detachedCommentAtStartOfConstructor1.ts, 0, 0))
->name : Symbol(name, Decl(detachedCommentAtStartOfConstructor1.ts, 1, 27))
+>name : Symbol(TestFile.name, Decl(detachedCommentAtStartOfConstructor1.ts, 1, 27))
 
         this.message = getMessage();
->this.message : Symbol(message, Decl(detachedCommentAtStartOfConstructor1.ts, 0, 16))
+>this.message : Symbol(TestFile.message, Decl(detachedCommentAtStartOfConstructor1.ts, 0, 16))
 >this : Symbol(TestFile, Decl(detachedCommentAtStartOfConstructor1.ts, 0, 0))
->message : Symbol(message, Decl(detachedCommentAtStartOfConstructor1.ts, 0, 16))
+>message : Symbol(TestFile.message, Decl(detachedCommentAtStartOfConstructor1.ts, 0, 16))
 >getMessage : Symbol(getMessage, Decl(detachedCommentAtStartOfConstructor1.ts, 6, 11))
     }
 }
diff --git a/tests/baselines/reference/detachedCommentAtStartOfConstructor2.symbols b/tests/baselines/reference/detachedCommentAtStartOfConstructor2.symbols
index 78af9430034..a8af5379524 100644
--- a/tests/baselines/reference/detachedCommentAtStartOfConstructor2.symbols
+++ b/tests/baselines/reference/detachedCommentAtStartOfConstructor2.symbols
@@ -3,10 +3,10 @@ class TestFile {
 >TestFile : Symbol(TestFile, Decl(detachedCommentAtStartOfConstructor2.ts, 0, 0))
 
     public message: string;
->message : Symbol(message, Decl(detachedCommentAtStartOfConstructor2.ts, 0, 16))
+>message : Symbol(TestFile.message, Decl(detachedCommentAtStartOfConstructor2.ts, 0, 16))
 
     public name: string;
->name : Symbol(name, Decl(detachedCommentAtStartOfConstructor2.ts, 1, 27))
+>name : Symbol(TestFile.name, Decl(detachedCommentAtStartOfConstructor2.ts, 1, 27))
 
     constructor(message: string) {
 >message : Symbol(message, Decl(detachedCommentAtStartOfConstructor2.ts, 3, 16))
@@ -17,14 +17,14 @@ class TestFile {
         var getMessage = () => message + this.name;
 >getMessage : Symbol(getMessage, Decl(detachedCommentAtStartOfConstructor2.ts, 7, 11))
 >message : Symbol(message, Decl(detachedCommentAtStartOfConstructor2.ts, 3, 16))
->this.name : Symbol(name, Decl(detachedCommentAtStartOfConstructor2.ts, 1, 27))
+>this.name : Symbol(TestFile.name, Decl(detachedCommentAtStartOfConstructor2.ts, 1, 27))
 >this : Symbol(TestFile, Decl(detachedCommentAtStartOfConstructor2.ts, 0, 0))
->name : Symbol(name, Decl(detachedCommentAtStartOfConstructor2.ts, 1, 27))
+>name : Symbol(TestFile.name, Decl(detachedCommentAtStartOfConstructor2.ts, 1, 27))
 
         this.message = getMessage();
->this.message : Symbol(message, Decl(detachedCommentAtStartOfConstructor2.ts, 0, 16))
+>this.message : Symbol(TestFile.message, Decl(detachedCommentAtStartOfConstructor2.ts, 0, 16))
 >this : Symbol(TestFile, Decl(detachedCommentAtStartOfConstructor2.ts, 0, 0))
->message : Symbol(message, Decl(detachedCommentAtStartOfConstructor2.ts, 0, 16))
+>message : Symbol(TestFile.message, Decl(detachedCommentAtStartOfConstructor2.ts, 0, 16))
 >getMessage : Symbol(getMessage, Decl(detachedCommentAtStartOfConstructor2.ts, 7, 11))
     }
 }
diff --git a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.symbols b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.symbols
index aa34885d79b..8eb7fc137b1 100644
--- a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.symbols
+++ b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.symbols
@@ -3,10 +3,10 @@ class TestFile {
 >TestFile : Symbol(TestFile, Decl(detachedCommentAtStartOfLambdaFunction1.ts, 0, 0))
 
     name: string;
->name : Symbol(name, Decl(detachedCommentAtStartOfLambdaFunction1.ts, 0, 16))
+>name : Symbol(TestFile.name, Decl(detachedCommentAtStartOfLambdaFunction1.ts, 0, 16))
 
     foo(message: string): () => string {
->foo : Symbol(foo, Decl(detachedCommentAtStartOfLambdaFunction1.ts, 1, 17))
+>foo : Symbol(TestFile.foo, Decl(detachedCommentAtStartOfLambdaFunction1.ts, 1, 17))
 >message : Symbol(message, Decl(detachedCommentAtStartOfLambdaFunction1.ts, 2, 8))
 
         return (...x: string[]) =>
@@ -17,8 +17,8 @@ class TestFile {
             /// <returns type="Function" />
             message + this.name;
 >message : Symbol(message, Decl(detachedCommentAtStartOfLambdaFunction1.ts, 2, 8))
->this.name : Symbol(name, Decl(detachedCommentAtStartOfLambdaFunction1.ts, 0, 16))
+>this.name : Symbol(TestFile.name, Decl(detachedCommentAtStartOfLambdaFunction1.ts, 0, 16))
 >this : Symbol(TestFile, Decl(detachedCommentAtStartOfLambdaFunction1.ts, 0, 0))
->name : Symbol(name, Decl(detachedCommentAtStartOfLambdaFunction1.ts, 0, 16))
+>name : Symbol(TestFile.name, Decl(detachedCommentAtStartOfLambdaFunction1.ts, 0, 16))
     }
 }
diff --git a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.symbols b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.symbols
index 29cef430c3a..72178fd3059 100644
--- a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.symbols
+++ b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.symbols
@@ -3,10 +3,10 @@ class TestFile {
 >TestFile : Symbol(TestFile, Decl(detachedCommentAtStartOfLambdaFunction2.ts, 0, 0))
 
     name: string;
->name : Symbol(name, Decl(detachedCommentAtStartOfLambdaFunction2.ts, 0, 16))
+>name : Symbol(TestFile.name, Decl(detachedCommentAtStartOfLambdaFunction2.ts, 0, 16))
 
     foo(message: string): () => string {
->foo : Symbol(foo, Decl(detachedCommentAtStartOfLambdaFunction2.ts, 1, 17))
+>foo : Symbol(TestFile.foo, Decl(detachedCommentAtStartOfLambdaFunction2.ts, 1, 17))
 >message : Symbol(message, Decl(detachedCommentAtStartOfLambdaFunction2.ts, 2, 8))
 
         return (...x: string[]) =>
@@ -18,8 +18,8 @@ class TestFile {
 
             message + this.name;
 >message : Symbol(message, Decl(detachedCommentAtStartOfLambdaFunction2.ts, 2, 8))
->this.name : Symbol(name, Decl(detachedCommentAtStartOfLambdaFunction2.ts, 0, 16))
+>this.name : Symbol(TestFile.name, Decl(detachedCommentAtStartOfLambdaFunction2.ts, 0, 16))
 >this : Symbol(TestFile, Decl(detachedCommentAtStartOfLambdaFunction2.ts, 0, 0))
->name : Symbol(name, Decl(detachedCommentAtStartOfLambdaFunction2.ts, 0, 16))
+>name : Symbol(TestFile.name, Decl(detachedCommentAtStartOfLambdaFunction2.ts, 0, 16))
     }
 }
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/doNotEmitPinnedCommentOnNotEmittedNode.symbols b/tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNode.symbols
index c733d886ff3..bd6f35e406f 100644
--- a/tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNode.symbols
+++ b/tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNode.symbols
@@ -5,12 +5,12 @@ class C {
 
     /*! remove pinned comment anywhere else */
     public foo(x: string, y: any)
->foo : Symbol(foo, Decl(file1.ts, 1, 9), Decl(file1.ts, 3, 33))
+>foo : Symbol(C.foo, Decl(file1.ts, 1, 9), Decl(file1.ts, 3, 33))
 >x : Symbol(x, Decl(file1.ts, 3, 15))
 >y : Symbol(y, Decl(file1.ts, 3, 25))
 
     public foo(x: string, y: number) { }
->foo : Symbol(foo, Decl(file1.ts, 1, 9), Decl(file1.ts, 3, 33))
+>foo : Symbol(C.foo, Decl(file1.ts, 1, 9), Decl(file1.ts, 3, 33))
 >x : Symbol(x, Decl(file1.ts, 4, 15))
 >y : Symbol(y, Decl(file1.ts, 4, 25))
 }
diff --git a/tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNodets.symbols b/tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNodets.symbols
index dcd27478115..7b96fc028b1 100644
--- a/tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNodets.symbols
+++ b/tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNodets.symbols
@@ -5,12 +5,12 @@ class C {
 
     /*! remove pinned comment anywhere else */
     public foo(x: string, y: any)
->foo : Symbol(foo, Decl(doNotEmitPinnedCommentOnNotEmittedNodets.ts, 1, 9), Decl(doNotEmitPinnedCommentOnNotEmittedNodets.ts, 3, 33))
+>foo : Symbol(C.foo, Decl(doNotEmitPinnedCommentOnNotEmittedNodets.ts, 1, 9), Decl(doNotEmitPinnedCommentOnNotEmittedNodets.ts, 3, 33))
 >x : Symbol(x, Decl(doNotEmitPinnedCommentOnNotEmittedNodets.ts, 3, 15))
 >y : Symbol(y, Decl(doNotEmitPinnedCommentOnNotEmittedNodets.ts, 3, 25))
 
     public foo(x: string, y: number) { }
->foo : Symbol(foo, Decl(doNotEmitPinnedCommentOnNotEmittedNodets.ts, 1, 9), Decl(doNotEmitPinnedCommentOnNotEmittedNodets.ts, 3, 33))
+>foo : Symbol(C.foo, Decl(doNotEmitPinnedCommentOnNotEmittedNodets.ts, 1, 9), Decl(doNotEmitPinnedCommentOnNotEmittedNodets.ts, 3, 33))
 >x : Symbol(x, Decl(doNotEmitPinnedCommentOnNotEmittedNodets.ts, 4, 15))
 >y : Symbol(y, Decl(doNotEmitPinnedCommentOnNotEmittedNodets.ts, 4, 25))
 }
diff --git a/tests/baselines/reference/doNotWidenAtObjectLiteralPropertyAssignment.symbols b/tests/baselines/reference/doNotWidenAtObjectLiteralPropertyAssignment.symbols
index 7aaf3b98f4a..7a1073d6ebf 100644
--- a/tests/baselines/reference/doNotWidenAtObjectLiteralPropertyAssignment.symbols
+++ b/tests/baselines/reference/doNotWidenAtObjectLiteralPropertyAssignment.symbols
@@ -3,18 +3,18 @@ interface ITestEventInterval {
 >ITestEventInterval : Symbol(ITestEventInterval, Decl(doNotWidenAtObjectLiteralPropertyAssignment.ts, 0, 0))
 
     begin: number;
->begin : Symbol(begin, Decl(doNotWidenAtObjectLiteralPropertyAssignment.ts, 0, 30))
+>begin : Symbol(ITestEventInterval.begin, Decl(doNotWidenAtObjectLiteralPropertyAssignment.ts, 0, 30))
 }
 
 interface IIntervalTreeNode {
 >IIntervalTreeNode : Symbol(IIntervalTreeNode, Decl(doNotWidenAtObjectLiteralPropertyAssignment.ts, 2, 1))
 
     interval: ITestEventInterval;
->interval : Symbol(interval, Decl(doNotWidenAtObjectLiteralPropertyAssignment.ts, 4, 29))
+>interval : Symbol(IIntervalTreeNode.interval, Decl(doNotWidenAtObjectLiteralPropertyAssignment.ts, 4, 29))
 >ITestEventInterval : Symbol(ITestEventInterval, Decl(doNotWidenAtObjectLiteralPropertyAssignment.ts, 0, 0))
 
     children?: IIntervalTreeNode[];
->children : Symbol(children, Decl(doNotWidenAtObjectLiteralPropertyAssignment.ts, 5, 33))
+>children : Symbol(IIntervalTreeNode.children, Decl(doNotWidenAtObjectLiteralPropertyAssignment.ts, 5, 33))
 >IIntervalTreeNode : Symbol(IIntervalTreeNode, Decl(doNotWidenAtObjectLiteralPropertyAssignment.ts, 2, 1))
 }
 
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/dottedSymbolResolution1.symbols b/tests/baselines/reference/dottedSymbolResolution1.symbols
index 25ff8a6fe92..e5e866fe0c9 100644
--- a/tests/baselines/reference/dottedSymbolResolution1.symbols
+++ b/tests/baselines/reference/dottedSymbolResolution1.symbols
@@ -3,7 +3,7 @@ interface JQuery {
 >JQuery : Symbol(JQuery, Decl(dottedSymbolResolution1.ts, 0, 0))
 
     find(selector: string): JQuery;
->find : Symbol(find, Decl(dottedSymbolResolution1.ts, 0, 18))
+>find : Symbol(JQuery.find, Decl(dottedSymbolResolution1.ts, 0, 18))
 >selector : Symbol(selector, Decl(dottedSymbolResolution1.ts, 1, 9))
 >JQuery : Symbol(JQuery, Decl(dottedSymbolResolution1.ts, 0, 0))
 }
@@ -23,7 +23,7 @@ interface JQueryStatic {
 
 class Base { foo() { } }
 >Base : Symbol(Base, Decl(dottedSymbolResolution1.ts, 8, 1))
->foo : Symbol(foo, Decl(dottedSymbolResolution1.ts, 10, 12))
+>foo : Symbol(Base.foo, Decl(dottedSymbolResolution1.ts, 10, 12))
 
 function each(collection: string, callback: (indexInArray: any, valueOfElement: any) => any): any;
 >each : Symbol(each, Decl(dottedSymbolResolution1.ts, 10, 24), Decl(dottedSymbolResolution1.ts, 12, 98), Decl(dottedSymbolResolution1.ts, 13, 102))
diff --git a/tests/baselines/reference/downlevelLetConst18.errors.txt b/tests/baselines/reference/downlevelLetConst18.errors.txt
new file mode 100644
index 00000000000..5b91498f173
--- /dev/null
+++ b/tests/baselines/reference/downlevelLetConst18.errors.txt
@@ -0,0 +1,40 @@
+tests/cases/compiler/downlevelLetConst18.ts(5,14): error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'.
+tests/cases/compiler/downlevelLetConst18.ts(9,14): error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'.
+
+
+==== tests/cases/compiler/downlevelLetConst18.ts (2 errors) ====
+    
+    'use strict'
+    
+    for (let x; ;) {
+        function foo() { x };
+                 ~~~
+!!! error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'.
+    }
+    
+    for (let x; ;) {
+        function foo1() { x };
+                 ~~~~
+!!! error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'.
+    }
+    
+    for (let x; ;) {
+        (() => { x })();
+    }
+    
+    for (const x = 1; ;) {
+        (() => { x })();
+    }
+    
+    for (let x; ;) {
+        ({ foo() { x }})
+    }
+    
+    for (let x; ;) {
+        ({ get foo() { return x } })
+    }
+    
+    for (let x; ;) {
+        ({ set foo(v) { x } })
+    }
+    
\ No newline at end of file
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/downlevelLetConst18.symbols b/tests/baselines/reference/downlevelLetConst18.symbols
deleted file mode 100644
index a1df0dc6ae9..00000000000
--- a/tests/baselines/reference/downlevelLetConst18.symbols
+++ /dev/null
@@ -1,59 +0,0 @@
-=== tests/cases/compiler/downlevelLetConst18.ts ===
-
-'use strict'
-
-for (let x; ;) {
->x : Symbol(x, Decl(downlevelLetConst18.ts, 3, 8))
-
-    function foo() { x };
->foo : Symbol(foo, Decl(downlevelLetConst18.ts, 3, 16))
->x : Symbol(x, Decl(downlevelLetConst18.ts, 3, 8))
-}
-
-for (let x; ;) {
->x : Symbol(x, Decl(downlevelLetConst18.ts, 7, 8))
-
-    function foo1() { x };
->foo1 : Symbol(foo1, Decl(downlevelLetConst18.ts, 7, 16))
->x : Symbol(x, Decl(downlevelLetConst18.ts, 7, 8))
-}
-
-for (let x; ;) {
->x : Symbol(x, Decl(downlevelLetConst18.ts, 11, 8))
-
-    (() => { x })();
->x : Symbol(x, Decl(downlevelLetConst18.ts, 11, 8))
-}
-
-for (const x = 1; ;) {
->x : Symbol(x, Decl(downlevelLetConst18.ts, 15, 10))
-
-    (() => { x })();
->x : Symbol(x, Decl(downlevelLetConst18.ts, 15, 10))
-}
-
-for (let x; ;) {
->x : Symbol(x, Decl(downlevelLetConst18.ts, 19, 8))
-
-    ({ foo() { x }})
->foo : Symbol(foo, Decl(downlevelLetConst18.ts, 20, 6))
->x : Symbol(x, Decl(downlevelLetConst18.ts, 19, 8))
-}
-
-for (let x; ;) {
->x : Symbol(x, Decl(downlevelLetConst18.ts, 23, 8))
-
-    ({ get foo() { return x } })
->foo : Symbol(foo, Decl(downlevelLetConst18.ts, 24, 6))
->x : Symbol(x, Decl(downlevelLetConst18.ts, 23, 8))
-}
-
-for (let x; ;) {
->x : Symbol(x, Decl(downlevelLetConst18.ts, 27, 8))
-
-    ({ set foo(v) { x } })
->foo : Symbol(foo, Decl(downlevelLetConst18.ts, 28, 6))
->v : Symbol(v, Decl(downlevelLetConst18.ts, 28, 15))
->x : Symbol(x, Decl(downlevelLetConst18.ts, 27, 8))
-}
-
diff --git a/tests/baselines/reference/downlevelLetConst18.types b/tests/baselines/reference/downlevelLetConst18.types
deleted file mode 100644
index 1f7be616124..00000000000
--- a/tests/baselines/reference/downlevelLetConst18.types
+++ /dev/null
@@ -1,73 +0,0 @@
-=== tests/cases/compiler/downlevelLetConst18.ts ===
-
-'use strict'
->'use strict' : string
-
-for (let x; ;) {
->x : any
-
-    function foo() { x };
->foo : () => void
->x : any
-}
-
-for (let x; ;) {
->x : any
-
-    function foo1() { x };
->foo1 : () => void
->x : any
-}
-
-for (let x; ;) {
->x : any
-
-    (() => { x })();
->(() => { x })() : void
->(() => { x }) : () => void
->() => { x } : () => void
->x : any
-}
-
-for (const x = 1; ;) {
->x : number
->1 : number
-
-    (() => { x })();
->(() => { x })() : void
->(() => { x }) : () => void
->() => { x } : () => void
->x : number
-}
-
-for (let x; ;) {
->x : any
-
-    ({ foo() { x }})
->({ foo() { x }}) : { foo(): void; }
->{ foo() { x }} : { foo(): void; }
->foo : () => void
->x : any
-}
-
-for (let x; ;) {
->x : any
-
-    ({ get foo() { return x } })
->({ get foo() { return x } }) : { readonly foo: any; }
->{ get foo() { return x } } : { readonly foo: any; }
->foo : any
->x : any
-}
-
-for (let x; ;) {
->x : any
-
-    ({ set foo(v) { x } })
->({ set foo(v) { x } }) : { foo: any; }
->{ set foo(v) { x } } : { foo: any; }
->foo : any
->v : any
->x : any
-}
-
diff --git a/tests/baselines/reference/downlevelLetConst19.errors.txt b/tests/baselines/reference/downlevelLetConst19.errors.txt
new file mode 100644
index 00000000000..ef8583347bd
--- /dev/null
+++ b/tests/baselines/reference/downlevelLetConst19.errors.txt
@@ -0,0 +1,25 @@
+tests/cases/compiler/downlevelLetConst19.ts(9,14): error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'.
+
+
+==== tests/cases/compiler/downlevelLetConst19.ts (1 errors) ====
+    'use strict'
+    declare function use(a: any);
+    var x;
+    function a() {
+      {
+        let x;
+        use(x);
+    
+        function b() {
+                 ~
+!!! error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'.
+            {
+                let x;
+                use(x);
+            }
+            use(x);
+        }
+      }
+      use(x)
+    }
+    use(x)
\ No newline at end of file
diff --git a/tests/baselines/reference/downlevelLetConst19.symbols b/tests/baselines/reference/downlevelLetConst19.symbols
deleted file mode 100644
index 9ed23e43447..00000000000
--- a/tests/baselines/reference/downlevelLetConst19.symbols
+++ /dev/null
@@ -1,42 +0,0 @@
-=== tests/cases/compiler/downlevelLetConst19.ts ===
-'use strict'
-declare function use(a: any);
->use : Symbol(use, Decl(downlevelLetConst19.ts, 0, 12))
->a : Symbol(a, Decl(downlevelLetConst19.ts, 1, 21))
-
-var x;
->x : Symbol(x, Decl(downlevelLetConst19.ts, 2, 3))
-
-function a() {
->a : Symbol(a, Decl(downlevelLetConst19.ts, 2, 6))
-  {
-    let x;
->x : Symbol(x, Decl(downlevelLetConst19.ts, 5, 7))
-
-    use(x);
->use : Symbol(use, Decl(downlevelLetConst19.ts, 0, 12))
->x : Symbol(x, Decl(downlevelLetConst19.ts, 5, 7))
-
-    function b() {
->b : Symbol(b, Decl(downlevelLetConst19.ts, 6, 11))
-        {
-            let x;
->x : Symbol(x, Decl(downlevelLetConst19.ts, 10, 15))
-
-            use(x);
->use : Symbol(use, Decl(downlevelLetConst19.ts, 0, 12))
->x : Symbol(x, Decl(downlevelLetConst19.ts, 10, 15))
-        }
-        use(x);
->use : Symbol(use, Decl(downlevelLetConst19.ts, 0, 12))
->x : Symbol(x, Decl(downlevelLetConst19.ts, 5, 7))
-    }
-  }
-  use(x)
->use : Symbol(use, Decl(downlevelLetConst19.ts, 0, 12))
->x : Symbol(x, Decl(downlevelLetConst19.ts, 2, 3))
-}
-use(x)
->use : Symbol(use, Decl(downlevelLetConst19.ts, 0, 12))
->x : Symbol(x, Decl(downlevelLetConst19.ts, 2, 3))
-
diff --git a/tests/baselines/reference/downlevelLetConst19.types b/tests/baselines/reference/downlevelLetConst19.types
deleted file mode 100644
index 687033c195a..00000000000
--- a/tests/baselines/reference/downlevelLetConst19.types
+++ /dev/null
@@ -1,49 +0,0 @@
-=== tests/cases/compiler/downlevelLetConst19.ts ===
-'use strict'
->'use strict' : string
-
-declare function use(a: any);
->use : (a: any) => any
->a : any
-
-var x;
->x : any
-
-function a() {
->a : () => void
-  {
-    let x;
->x : any
-
-    use(x);
->use(x) : any
->use : (a: any) => any
->x : any
-
-    function b() {
->b : () => void
-        {
-            let x;
->x : any
-
-            use(x);
->use(x) : any
->use : (a: any) => any
->x : any
-        }
-        use(x);
->use(x) : any
->use : (a: any) => any
->x : any
-    }
-  }
-  use(x)
->use(x) : any
->use : (a: any) => any
->x : any
-}
-use(x)
->use(x) : any
->use : (a: any) => any
->x : any
-
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/duplicateExportAssignments.errors.txt b/tests/baselines/reference/duplicateExportAssignments.errors.txt
index a76513133b9..17ad0a39847 100644
--- a/tests/baselines/reference/duplicateExportAssignments.errors.txt
+++ b/tests/baselines/reference/duplicateExportAssignments.errors.txt
@@ -1,4 +1,3 @@
-tests/cases/conformance/externalModules/foo1.ts(3,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/conformance/externalModules/foo1.ts(3,1): error TS2300: Duplicate identifier 'export='.
 tests/cases/conformance/externalModules/foo1.ts(4,1): error TS2300: Duplicate identifier 'export='.
 tests/cases/conformance/externalModules/foo2.ts(3,1): error TS2300: Duplicate identifier 'export='.
@@ -12,13 +11,11 @@ tests/cases/conformance/externalModules/foo5.ts(5,1): error TS2300: Duplicate id
 tests/cases/conformance/externalModules/foo5.ts(6,1): error TS2300: Duplicate identifier 'export='.
 
 
-==== tests/cases/conformance/externalModules/foo1.ts (3 errors) ====
+==== tests/cases/conformance/externalModules/foo1.ts (2 errors) ====
     var x = 10;
     var y = 20;
     export = x;
     ~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-    ~~~~~~~~~~~
 !!! error TS2300: Duplicate identifier 'export='.
     export = y;
     ~~~~~~~~~~~
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/duplicateLocalVariable1.errors.txt b/tests/baselines/reference/duplicateLocalVariable1.errors.txt
index 90c5974cd2b..b264574ea09 100644
--- a/tests/baselines/reference/duplicateLocalVariable1.errors.txt
+++ b/tests/baselines/reference/duplicateLocalVariable1.errors.txt
@@ -1,13 +1,12 @@
 tests/cases/compiler/duplicateLocalVariable1.ts(2,4): error TS1005: ';' expected.
 tests/cases/compiler/duplicateLocalVariable1.ts(2,11): error TS1146: Declaration expected.
 tests/cases/compiler/duplicateLocalVariable1.ts(2,13): error TS2304: Cannot find name 'commonjs'.
-tests/cases/compiler/duplicateLocalVariable1.ts(12,14): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/compiler/duplicateLocalVariable1.ts(187,22): error TS2403: Subsequent variable declarations must have the same type.  Variable 'i' must be of type 'string', but here has type 'number'.
 tests/cases/compiler/duplicateLocalVariable1.ts(187,29): error TS2365: Operator '<' cannot be applied to types 'string' and 'number'.
 tests/cases/compiler/duplicateLocalVariable1.ts(187,37): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
 
 
-==== tests/cases/compiler/duplicateLocalVariable1.ts (7 errors) ====
+==== tests/cases/compiler/duplicateLocalVariable1.ts (6 errors) ====
     
     / /@module: commonjs
        ~
@@ -26,8 +25,6 @@ tests/cases/compiler/duplicateLocalVariable1.ts(187,37): error TS2356: An arithm
     var TestFileDir = ".\\TempTestFiles";
     
     export class TestCase {
-                 ~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
         constructor (public name: string, public test: ()=>boolean, public errorMessageRegEx?: string) {
         }
     }
diff --git a/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.symbols b/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.symbols
index a1c083fbc15..02589e011c4 100644
--- a/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.symbols
+++ b/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.symbols
@@ -4,7 +4,7 @@ interface Array<T> {
 >T : Symbol(T, Decl(lib.d.ts, --, --), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16))
 
     reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T,
->reduce : Symbol(reduce, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 20), Decl(duplicateOverloadInTypeAugmentation1.ts, 2, 29))
+>reduce : Symbol(Array.reduce, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 20), Decl(duplicateOverloadInTypeAugmentation1.ts, 2, 29))
 >callbackfn : Symbol(callbackfn, Decl(duplicateOverloadInTypeAugmentation1.ts, 1, 11))
 >previousValue : Symbol(previousValue, Decl(duplicateOverloadInTypeAugmentation1.ts, 1, 24))
 >T : Symbol(T, Decl(lib.d.ts, --, --), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16))
@@ -21,7 +21,7 @@ interface Array<T> {
 >T : Symbol(T, Decl(lib.d.ts, --, --), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 16))
 
     reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U,
->reduce : Symbol(reduce, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 20), Decl(duplicateOverloadInTypeAugmentation1.ts, 2, 29))
+>reduce : Symbol(Array.reduce, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(duplicateOverloadInTypeAugmentation1.ts, 0, 20), Decl(duplicateOverloadInTypeAugmentation1.ts, 2, 29))
 >U : Symbol(U, Decl(duplicateOverloadInTypeAugmentation1.ts, 3, 11))
 >callbackfn : Symbol(callbackfn, Decl(duplicateOverloadInTypeAugmentation1.ts, 3, 14))
 >previousValue : Symbol(previousValue, Decl(duplicateOverloadInTypeAugmentation1.ts, 3, 27))
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/duplicateVariablesByScope.symbols b/tests/baselines/reference/duplicateVariablesByScope.symbols
index 9dd280d2756..88eb44d0181 100644
--- a/tests/baselines/reference/duplicateVariablesByScope.symbols
+++ b/tests/baselines/reference/duplicateVariablesByScope.symbols
@@ -41,7 +41,7 @@ class C {
 >C : Symbol(C, Decl(duplicateVariablesByScope.ts, 20, 1))
 
     foo() {
->foo : Symbol(foo, Decl(duplicateVariablesByScope.ts, 22, 9))
+>foo : Symbol(C.foo, Decl(duplicateVariablesByScope.ts, 22, 9))
 
         try {
             var x = 1;
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/emitArrowFunctionES6.types b/tests/baselines/reference/emitArrowFunctionES6.types
index cc48cecd96a..d37c08f855c 100644
--- a/tests/baselines/reference/emitArrowFunctionES6.types
+++ b/tests/baselines/reference/emitArrowFunctionES6.types
@@ -64,31 +64,31 @@ var p4 = ([, ...a]) => { };
 >a : any[]
 
 var p5 = ([a = 1]) => { };
->p5 : ([a = 1]: [number]) => void
->([a = 1]) => { } : ([a = 1]: [number]) => void
+>p5 : ([a]: [number]) => void
+>([a = 1]) => { } : ([a]: [number]) => void
 >a : number
 >1 : number
 
 var p6 = ({ a }) => { };
->p6 : ({ a }: { a: any; }) => void
->({ a }) => { } : ({ a }: { a: any; }) => void
+>p6 : ({a}: { a: any; }) => void
+>({ a }) => { } : ({a}: { a: any; }) => void
 >a : any
 
 var p7 = ({ a: { b } }) => { };
->p7 : ({ a: { b } }: { a: { b: any; }; }) => void
->({ a: { b } }) => { } : ({ a: { b } }: { a: { b: any; }; }) => void
+>p7 : ({a: {b}}: { a: { b: any; }; }) => void
+>({ a: { b } }) => { } : ({a: {b}}: { a: { b: any; }; }) => void
 >a : any
 >b : any
 
 var p8 = ({ a = 1 }) => { };
->p8 : ({ a = 1 }: { a?: number; }) => void
->({ a = 1 }) => { } : ({ a = 1 }: { a?: number; }) => void
+>p8 : ({a}: { a?: number; }) => void
+>({ a = 1 }) => { } : ({a}: { a?: number; }) => void
 >a : number
 >1 : number
 
 var p9 = ({ a: { b = 1 } = { b: 1 } }) => { };
->p9 : ({ a: { b = 1 } = { b: 1 } }: { a?: { b?: number; }; }) => void
->({ a: { b = 1 } = { b: 1 } }) => { } : ({ a: { b = 1 } = { b: 1 } }: { a?: { b?: number; }; }) => void
+>p9 : ({a: {b}}: { a?: { b?: number; }; }) => void
+>({ a: { b = 1 } = { b: 1 } }) => { } : ({a: {b}}: { a?: { b?: number; }; }) => void
 >a : any
 >b : number
 >1 : number
@@ -97,8 +97,8 @@ var p9 = ({ a: { b = 1 } = { b: 1 } }) => { };
 >1 : number
 
 var p10 = ([{ value, done }]) => { };
->p10 : ([{ value, done }]: [{ value: any; done: any; }]) => void
->([{ value, done }]) => { } : ([{ value, done }]: [{ value: any; done: any; }]) => void
+>p10 : ([{value, done}]: [{ value: any; done: any; }]) => void
+>([{ value, done }]) => { } : ([{value, done}]: [{ value: any; done: any; }]) => void
 >value : any
 >done : any
 
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/emitArrowFunctionWhenUsingArguments14_ES6.symbols b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments14_ES6.symbols
index f5846be3738..fe6788b31f5 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments14_ES6.symbols
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments14_ES6.symbols
@@ -4,9 +4,9 @@ function f() {
 >f : Symbol(f, Decl(emitArrowFunctionWhenUsingArguments14_ES6.ts, 0, 0))
 
     if (Math.random()) {
->Math.random : Symbol(Math.random, Decl(lib.d.ts, --, --))
->Math : Symbol(Math, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->random : Symbol(Math.random, Decl(lib.d.ts, --, --))
+>Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))
+>Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))
 
         let arguments = 100;
 >arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments14_ES6.ts, 3, 11))
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments15_ES6.symbols b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments15_ES6.symbols
index 648f04b0814..63ee68f0aa7 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments15_ES6.symbols
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments15_ES6.symbols
@@ -7,9 +7,9 @@ function f() {
 >arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments15_ES6.ts, 2, 7))
 
     if (Math.random()) {
->Math.random : Symbol(Math.random, Decl(lib.d.ts, --, --))
->Math : Symbol(Math, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->random : Symbol(Math.random, Decl(lib.d.ts, --, --))
+>Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))
+>Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))
 
         const arguments = 100;
 >arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments15_ES6.ts, 4, 13))
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments16_ES6.symbols b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments16_ES6.symbols
index bc9fcbfa159..6ea3019f1e6 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments16_ES6.symbols
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments16_ES6.symbols
@@ -7,9 +7,9 @@ function f() {
 >arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments16_ES6.ts, 2, 7), Decl(emitArrowFunctionWhenUsingArguments16_ES6.ts, 6, 7))
 
     if (Math.random()) {
->Math.random : Symbol(Math.random, Decl(lib.d.ts, --, --))
->Math : Symbol(Math, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->random : Symbol(Math.random, Decl(lib.d.ts, --, --))
+>Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))
+>Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))
 
         return () => arguments[0];
 >arguments : Symbol(arguments)
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments17_ES6.symbols b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments17_ES6.symbols
index 65f4e121d10..a7d5e457056 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments17_ES6.symbols
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments17_ES6.symbols
@@ -8,9 +8,9 @@ function f() {
 >arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments17_ES6.ts, 2, 25))
 
     if (Math.random()) {
->Math.random : Symbol(Math.random, Decl(lib.d.ts, --, --))
->Math : Symbol(Math, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->random : Symbol(Math.random, Decl(lib.d.ts, --, --))
+>Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))
+>Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))
 
         return () => arguments[0];
 >arguments : Symbol(arguments)
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments18_ES6.symbols b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments18_ES6.symbols
index a15a10c29d8..e59ed6b8537 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments18_ES6.symbols
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments18_ES6.symbols
@@ -9,9 +9,9 @@ function f() {
 >arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments18_ES6.ts, 2, 31))
 
     if (Math.random()) {
->Math.random : Symbol(Math.random, Decl(lib.d.ts, --, --))
->Math : Symbol(Math, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->random : Symbol(Math.random, Decl(lib.d.ts, --, --))
+>Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))
+>Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))
 
         return () => arguments;
 >arguments : Symbol(arguments)
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/emitClassDeclarationWithConstructorInES6.symbols b/tests/baselines/reference/emitClassDeclarationWithConstructorInES6.symbols
index 8186b029471..72de9b39dda 100644
--- a/tests/baselines/reference/emitClassDeclarationWithConstructorInES6.symbols
+++ b/tests/baselines/reference/emitClassDeclarationWithConstructorInES6.symbols
@@ -3,30 +3,30 @@ class A {
 >A : Symbol(A, Decl(emitClassDeclarationWithConstructorInES6.ts, 0, 0))
 
     y: number;
->y : Symbol(y, Decl(emitClassDeclarationWithConstructorInES6.ts, 0, 9))
+>y : Symbol(A.y, Decl(emitClassDeclarationWithConstructorInES6.ts, 0, 9))
 
     constructor(x: number) {
 >x : Symbol(x, Decl(emitClassDeclarationWithConstructorInES6.ts, 2, 16))
     }
     foo(a: any);
->foo : Symbol(foo, Decl(emitClassDeclarationWithConstructorInES6.ts, 3, 5), Decl(emitClassDeclarationWithConstructorInES6.ts, 4, 16))
+>foo : Symbol(A.foo, Decl(emitClassDeclarationWithConstructorInES6.ts, 3, 5), Decl(emitClassDeclarationWithConstructorInES6.ts, 4, 16))
 >a : Symbol(a, Decl(emitClassDeclarationWithConstructorInES6.ts, 4, 8))
 
     foo() { }
->foo : Symbol(foo, Decl(emitClassDeclarationWithConstructorInES6.ts, 3, 5), Decl(emitClassDeclarationWithConstructorInES6.ts, 4, 16))
+>foo : Symbol(A.foo, Decl(emitClassDeclarationWithConstructorInES6.ts, 3, 5), Decl(emitClassDeclarationWithConstructorInES6.ts, 4, 16))
 }
 
 class B {
 >B : Symbol(B, Decl(emitClassDeclarationWithConstructorInES6.ts, 6, 1))
 
     y: number;
->y : Symbol(y, Decl(emitClassDeclarationWithConstructorInES6.ts, 8, 9))
+>y : Symbol(B.y, Decl(emitClassDeclarationWithConstructorInES6.ts, 8, 9))
 
     x: string = "hello";
->x : Symbol(x, Decl(emitClassDeclarationWithConstructorInES6.ts, 9, 14))
+>x : Symbol(B.x, Decl(emitClassDeclarationWithConstructorInES6.ts, 9, 14))
 
     _bar: string;
->_bar : Symbol(_bar, Decl(emitClassDeclarationWithConstructorInES6.ts, 10, 24))
+>_bar : Symbol(B._bar, Decl(emitClassDeclarationWithConstructorInES6.ts, 10, 24))
 
     constructor(x: number, z = "hello", ...args) {
 >x : Symbol(x, Decl(emitClassDeclarationWithConstructorInES6.ts, 13, 16))
@@ -34,23 +34,23 @@ class B {
 >args : Symbol(args, Decl(emitClassDeclarationWithConstructorInES6.ts, 13, 39))
 
         this.y = 10;
->this.y : Symbol(y, Decl(emitClassDeclarationWithConstructorInES6.ts, 8, 9))
+>this.y : Symbol(B.y, Decl(emitClassDeclarationWithConstructorInES6.ts, 8, 9))
 >this : Symbol(B, Decl(emitClassDeclarationWithConstructorInES6.ts, 6, 1))
->y : Symbol(y, Decl(emitClassDeclarationWithConstructorInES6.ts, 8, 9))
+>y : Symbol(B.y, Decl(emitClassDeclarationWithConstructorInES6.ts, 8, 9))
     }
     baz(...args): string;
->baz : Symbol(baz, Decl(emitClassDeclarationWithConstructorInES6.ts, 15, 5), Decl(emitClassDeclarationWithConstructorInES6.ts, 16, 25))
+>baz : Symbol(B.baz, Decl(emitClassDeclarationWithConstructorInES6.ts, 15, 5), Decl(emitClassDeclarationWithConstructorInES6.ts, 16, 25))
 >args : Symbol(args, Decl(emitClassDeclarationWithConstructorInES6.ts, 16, 8))
 
     baz(z: string, v: number): string {
->baz : Symbol(baz, Decl(emitClassDeclarationWithConstructorInES6.ts, 15, 5), Decl(emitClassDeclarationWithConstructorInES6.ts, 16, 25))
+>baz : Symbol(B.baz, Decl(emitClassDeclarationWithConstructorInES6.ts, 15, 5), Decl(emitClassDeclarationWithConstructorInES6.ts, 16, 25))
 >z : Symbol(z, Decl(emitClassDeclarationWithConstructorInES6.ts, 17, 8))
 >v : Symbol(v, Decl(emitClassDeclarationWithConstructorInES6.ts, 17, 18))
 
         return this._bar;
->this._bar : Symbol(_bar, Decl(emitClassDeclarationWithConstructorInES6.ts, 10, 24))
+>this._bar : Symbol(B._bar, Decl(emitClassDeclarationWithConstructorInES6.ts, 10, 24))
 >this : Symbol(B, Decl(emitClassDeclarationWithConstructorInES6.ts, 6, 1))
->_bar : Symbol(_bar, Decl(emitClassDeclarationWithConstructorInES6.ts, 10, 24))
+>_bar : Symbol(B._bar, Decl(emitClassDeclarationWithConstructorInES6.ts, 10, 24))
     } 
 }
 
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/emitClassDeclarationWithExtensionInES6.symbols b/tests/baselines/reference/emitClassDeclarationWithExtensionInES6.symbols
index 586a924a260..799c5a8b3bb 100644
--- a/tests/baselines/reference/emitClassDeclarationWithExtensionInES6.symbols
+++ b/tests/baselines/reference/emitClassDeclarationWithExtensionInES6.symbols
@@ -3,7 +3,7 @@ class B {
 >B : Symbol(B, Decl(emitClassDeclarationWithExtensionInES6.ts, 0, 0))
 
     baz(a: string, y = 10) { }
->baz : Symbol(baz, Decl(emitClassDeclarationWithExtensionInES6.ts, 0, 9))
+>baz : Symbol(B.baz, Decl(emitClassDeclarationWithExtensionInES6.ts, 0, 9))
 >a : Symbol(a, Decl(emitClassDeclarationWithExtensionInES6.ts, 1, 8))
 >y : Symbol(y, Decl(emitClassDeclarationWithExtensionInES6.ts, 1, 18))
 }
@@ -12,10 +12,10 @@ class C extends B {
 >B : Symbol(B, Decl(emitClassDeclarationWithExtensionInES6.ts, 0, 0))
 
     foo() { }
->foo : Symbol(foo, Decl(emitClassDeclarationWithExtensionInES6.ts, 3, 19))
+>foo : Symbol(C.foo, Decl(emitClassDeclarationWithExtensionInES6.ts, 3, 19))
 
     baz(a: string, y:number) {
->baz : Symbol(baz, Decl(emitClassDeclarationWithExtensionInES6.ts, 4, 13))
+>baz : Symbol(C.baz, Decl(emitClassDeclarationWithExtensionInES6.ts, 4, 13))
 >a : Symbol(a, Decl(emitClassDeclarationWithExtensionInES6.ts, 5, 8))
 >y : Symbol(y, Decl(emitClassDeclarationWithExtensionInES6.ts, 5, 18))
 
@@ -37,7 +37,7 @@ class D extends C {
     }
 
     foo() {
->foo : Symbol(foo, Decl(emitClassDeclarationWithExtensionInES6.ts, 12, 5))
+>foo : Symbol(D.foo, Decl(emitClassDeclarationWithExtensionInES6.ts, 12, 5))
 
         super.foo();
 >super.foo : Symbol(C.foo, Decl(emitClassDeclarationWithExtensionInES6.ts, 3, 19))
@@ -46,7 +46,7 @@ class D extends C {
     }
 
     baz() {
->baz : Symbol(baz, Decl(emitClassDeclarationWithExtensionInES6.ts, 16, 5))
+>baz : Symbol(D.baz, Decl(emitClassDeclarationWithExtensionInES6.ts, 16, 5))
 
         super.baz("hello", 10);
 >super.baz : Symbol(C.baz, Decl(emitClassDeclarationWithExtensionInES6.ts, 4, 13))
diff --git a/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.symbols b/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.symbols
index b2b1a000dc9..c48cc1d6f85 100644
--- a/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.symbols
+++ b/tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.symbols
@@ -3,15 +3,15 @@ class C {
 >C : Symbol(C, Decl(emitClassDeclarationWithGetterSetterInES6.ts, 0, 0))
 
     _name: string;
->_name : Symbol(_name, Decl(emitClassDeclarationWithGetterSetterInES6.ts, 0, 9))
+>_name : Symbol(C._name, Decl(emitClassDeclarationWithGetterSetterInES6.ts, 0, 9))
 
     get name(): string {
->name : Symbol(name, Decl(emitClassDeclarationWithGetterSetterInES6.ts, 1, 18))
+>name : Symbol(C.name, Decl(emitClassDeclarationWithGetterSetterInES6.ts, 1, 18))
 
         return this._name;
->this._name : Symbol(_name, Decl(emitClassDeclarationWithGetterSetterInES6.ts, 0, 9))
+>this._name : Symbol(C._name, Decl(emitClassDeclarationWithGetterSetterInES6.ts, 0, 9))
 >this : Symbol(C, Decl(emitClassDeclarationWithGetterSetterInES6.ts, 0, 0))
->_name : Symbol(_name, Decl(emitClassDeclarationWithGetterSetterInES6.ts, 0, 9))
+>_name : Symbol(C._name, Decl(emitClassDeclarationWithGetterSetterInES6.ts, 0, 9))
     }
     static get name2(): string {
 >name2 : Symbol(C.name2, Decl(emitClassDeclarationWithGetterSetterInES6.ts, 4, 5))
@@ -36,7 +36,7 @@ class C {
     }
 
     set foo(a: string) { }
->foo : Symbol(foo, Decl(emitClassDeclarationWithGetterSetterInES6.ts, 21, 5))
+>foo : Symbol(C.foo, Decl(emitClassDeclarationWithGetterSetterInES6.ts, 21, 5))
 >a : Symbol(a, Decl(emitClassDeclarationWithGetterSetterInES6.ts, 23, 12))
 
     static set bar(b: number) { }
diff --git a/tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.symbols b/tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.symbols
index fdceb9831c1..cb716163d6a 100644
--- a/tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.symbols
+++ b/tests/baselines/reference/emitClassDeclarationWithLiteralPropertyNameInES6.symbols
@@ -10,7 +10,7 @@ class B {
     0b1110() {}
     11() { }
     interface() { }
->interface : Symbol(interface, Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 7, 12))
+>interface : Symbol(B.interface, Decl(emitClassDeclarationWithLiteralPropertyNameInES6.ts, 7, 12))
 
     static "hi" = 10000;
     static 22 = "twenty-two";
diff --git a/tests/baselines/reference/emitClassDeclarationWithMethodInES6.symbols b/tests/baselines/reference/emitClassDeclarationWithMethodInES6.symbols
index 970076f6b78..45990c6e628 100644
--- a/tests/baselines/reference/emitClassDeclarationWithMethodInES6.symbols
+++ b/tests/baselines/reference/emitClassDeclarationWithMethodInES6.symbols
@@ -3,10 +3,10 @@ class D {
 >D : Symbol(D, Decl(emitClassDeclarationWithMethodInES6.ts, 0, 0))
 
     _bar: string;
->_bar : Symbol(_bar, Decl(emitClassDeclarationWithMethodInES6.ts, 0, 9))
+>_bar : Symbol(D._bar, Decl(emitClassDeclarationWithMethodInES6.ts, 0, 9))
 
     foo() { }
->foo : Symbol(foo, Decl(emitClassDeclarationWithMethodInES6.ts, 1, 17))
+>foo : Symbol(D.foo, Decl(emitClassDeclarationWithMethodInES6.ts, 1, 17))
 
     ["computedName1"]() { }
     ["computedName2"](a: string) { }
@@ -16,15 +16,15 @@ class D {
 >a : Symbol(a, Decl(emitClassDeclarationWithMethodInES6.ts, 5, 22))
 
     bar(): string {
->bar : Symbol(bar, Decl(emitClassDeclarationWithMethodInES6.ts, 5, 54))
+>bar : Symbol(D.bar, Decl(emitClassDeclarationWithMethodInES6.ts, 5, 54))
 
         return this._bar;
->this._bar : Symbol(_bar, Decl(emitClassDeclarationWithMethodInES6.ts, 0, 9))
+>this._bar : Symbol(D._bar, Decl(emitClassDeclarationWithMethodInES6.ts, 0, 9))
 >this : Symbol(D, Decl(emitClassDeclarationWithMethodInES6.ts, 0, 0))
->_bar : Symbol(_bar, Decl(emitClassDeclarationWithMethodInES6.ts, 0, 9))
+>_bar : Symbol(D._bar, Decl(emitClassDeclarationWithMethodInES6.ts, 0, 9))
     } 
     baz(a: any, x: string): string {
->baz : Symbol(baz, Decl(emitClassDeclarationWithMethodInES6.ts, 8, 5))
+>baz : Symbol(D.baz, Decl(emitClassDeclarationWithMethodInES6.ts, 8, 5))
 >a : Symbol(a, Decl(emitClassDeclarationWithMethodInES6.ts, 9, 8))
 >x : Symbol(x, Decl(emitClassDeclarationWithMethodInES6.ts, 9, 15))
 
diff --git a/tests/baselines/reference/emitClassDeclarationWithPropertyAssignmentInES6.symbols b/tests/baselines/reference/emitClassDeclarationWithPropertyAssignmentInES6.symbols
index 67878625bda..c7c17891f14 100644
--- a/tests/baselines/reference/emitClassDeclarationWithPropertyAssignmentInES6.symbols
+++ b/tests/baselines/reference/emitClassDeclarationWithPropertyAssignmentInES6.symbols
@@ -3,23 +3,23 @@ class C {
 >C : Symbol(C, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 0, 0))
 
     x: string = "Hello world";
->x : Symbol(x, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 0, 9))
+>x : Symbol(C.x, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 0, 9))
 }
 
 class D {
 >D : Symbol(D, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 2, 1))
 
     x: string = "Hello world";
->x : Symbol(x, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 4, 9))
+>x : Symbol(D.x, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 4, 9))
 
     y: number;
->y : Symbol(y, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 5, 30))
+>y : Symbol(D.y, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 5, 30))
 
     constructor() {
         this.y = 10;
->this.y : Symbol(y, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 5, 30))
+>this.y : Symbol(D.y, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 5, 30))
 >this : Symbol(D, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 2, 1))
->y : Symbol(y, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 5, 30))
+>y : Symbol(D.y, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 5, 30))
     }
 }
 
@@ -28,7 +28,7 @@ class E extends D{
 >D : Symbol(D, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 2, 1))
 
     z: boolean = true;
->z : Symbol(z, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 12, 18))
+>z : Symbol(E.z, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 12, 18))
 }
 
 class F extends D{
@@ -36,18 +36,18 @@ class F extends D{
 >D : Symbol(D, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 2, 1))
 
     z: boolean = true;
->z : Symbol(z, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 16, 18))
+>z : Symbol(F.z, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 16, 18))
 
     j: string;
->j : Symbol(j, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 17, 22))
+>j : Symbol(F.j, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 17, 22))
 
     constructor() {
         super();
 >super : Symbol(D, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 2, 1))
 
         this.j = "HI";
->this.j : Symbol(j, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 17, 22))
+>this.j : Symbol(F.j, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 17, 22))
 >this : Symbol(F, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 14, 1))
->j : Symbol(j, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 17, 22))
+>j : Symbol(F.j, Decl(emitClassDeclarationWithPropertyAssignmentInES6.ts, 17, 22))
     }
 }
diff --git a/tests/baselines/reference/emitClassDeclarationWithStaticPropertyAssignmentInES6.symbols b/tests/baselines/reference/emitClassDeclarationWithStaticPropertyAssignmentInES6.symbols
index 1b64646f788..268ab96f2ec 100644
--- a/tests/baselines/reference/emitClassDeclarationWithStaticPropertyAssignmentInES6.symbols
+++ b/tests/baselines/reference/emitClassDeclarationWithStaticPropertyAssignmentInES6.symbols
@@ -10,7 +10,7 @@ class D {
 >D : Symbol(D, Decl(emitClassDeclarationWithStaticPropertyAssignmentInES6.ts, 2, 1))
 
     x = 20000;
->x : Symbol(x, Decl(emitClassDeclarationWithStaticPropertyAssignmentInES6.ts, 4, 9))
+>x : Symbol(D.x, Decl(emitClassDeclarationWithStaticPropertyAssignmentInES6.ts, 4, 9))
 
     static b = true;
 >b : Symbol(D.b, Decl(emitClassDeclarationWithStaticPropertyAssignmentInES6.ts, 5, 14))
diff --git a/tests/baselines/reference/emitClassDeclarationWithSuperMethodCall01.symbols b/tests/baselines/reference/emitClassDeclarationWithSuperMethodCall01.symbols
index 13ce54e0641..dc749161623 100644
--- a/tests/baselines/reference/emitClassDeclarationWithSuperMethodCall01.symbols
+++ b/tests/baselines/reference/emitClassDeclarationWithSuperMethodCall01.symbols
@@ -4,7 +4,7 @@ class Parent {
 >Parent : Symbol(Parent, Decl(emitClassDeclarationWithSuperMethodCall01.ts, 0, 0))
 
     foo() {
->foo : Symbol(foo, Decl(emitClassDeclarationWithSuperMethodCall01.ts, 1, 14))
+>foo : Symbol(Parent.foo, Decl(emitClassDeclarationWithSuperMethodCall01.ts, 1, 14))
     }
 }
 
@@ -13,7 +13,7 @@ class Foo extends Parent {
 >Parent : Symbol(Parent, Decl(emitClassDeclarationWithSuperMethodCall01.ts, 0, 0))
 
     foo() {
->foo : Symbol(foo, Decl(emitClassDeclarationWithSuperMethodCall01.ts, 6, 26))
+>foo : Symbol(Foo.foo, Decl(emitClassDeclarationWithSuperMethodCall01.ts, 6, 26))
 
         var x = () => super.foo();
 >x : Symbol(x, Decl(emitClassDeclarationWithSuperMethodCall01.ts, 8, 11))
diff --git a/tests/baselines/reference/emitClassDeclarationWithThisKeywordInES6.symbols b/tests/baselines/reference/emitClassDeclarationWithThisKeywordInES6.symbols
index 32220451b9c..9690894a2eb 100644
--- a/tests/baselines/reference/emitClassDeclarationWithThisKeywordInES6.symbols
+++ b/tests/baselines/reference/emitClassDeclarationWithThisKeywordInES6.symbols
@@ -3,47 +3,47 @@ class B {
 >B : Symbol(B, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 0, 0))
 
     x = 10;
->x : Symbol(x, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 0, 9))
+>x : Symbol(B.x, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 0, 9))
 
     constructor() {
         this.x = 10;
->this.x : Symbol(x, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 0, 9))
+>this.x : Symbol(B.x, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 0, 9))
 >this : Symbol(B, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 0, 0))
->x : Symbol(x, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 0, 9))
+>x : Symbol(B.x, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 0, 9))
     }
     static log(a: number) { }
 >log : Symbol(B.log, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 4, 5))
 >a : Symbol(a, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 5, 15))
 
     foo() {
->foo : Symbol(foo, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 5, 29))
+>foo : Symbol(B.foo, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 5, 29))
 
         B.log(this.x);
 >B.log : Symbol(B.log, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 4, 5))
 >B : Symbol(B, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 0, 0))
 >log : Symbol(B.log, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 4, 5))
->this.x : Symbol(x, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 0, 9))
+>this.x : Symbol(B.x, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 0, 9))
 >this : Symbol(B, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 0, 0))
->x : Symbol(x, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 0, 9))
+>x : Symbol(B.x, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 0, 9))
     }
 
     get X() {
->X : Symbol(X, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 8, 5))
+>X : Symbol(B.X, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 8, 5))
 
         return this.x;
->this.x : Symbol(x, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 0, 9))
+>this.x : Symbol(B.x, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 0, 9))
 >this : Symbol(B, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 0, 0))
->x : Symbol(x, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 0, 9))
+>x : Symbol(B.x, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 0, 9))
     }
 
     set bX(y: number) {
->bX : Symbol(bX, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 12, 5))
+>bX : Symbol(B.bX, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 12, 5))
 >y : Symbol(y, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 14, 11))
 
         this.x = y;
->this.x : Symbol(x, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 0, 9))
+>this.x : Symbol(B.x, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 0, 9))
 >this : Symbol(B, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 0, 0))
->x : Symbol(x, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 0, 9))
+>x : Symbol(B.x, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 0, 9))
 >y : Symbol(y, Decl(emitClassDeclarationWithThisKeywordInES6.ts, 14, 11))
     }
 }
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/emitClassDeclarationWithTypeArgumentAndOverloadInES6.symbols b/tests/baselines/reference/emitClassDeclarationWithTypeArgumentAndOverloadInES6.symbols
index 092dbf10c7b..d87213d5651 100644
--- a/tests/baselines/reference/emitClassDeclarationWithTypeArgumentAndOverloadInES6.symbols
+++ b/tests/baselines/reference/emitClassDeclarationWithTypeArgumentAndOverloadInES6.symbols
@@ -4,11 +4,11 @@ class B<T> {
 >T : Symbol(T, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 0, 8))
 
     x: T;
->x : Symbol(x, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 0, 12))
+>x : Symbol(B.x, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 0, 12))
 >T : Symbol(T, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 0, 8))
 
     B: T;
->B : Symbol(B, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 1, 9))
+>B : Symbol(B.B, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 1, 9))
 >T : Symbol(T, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 0, 8))
 
     constructor(a: any)
@@ -22,52 +22,52 @@ class B<T> {
     constructor(a: T) { this.B = a;}
 >a : Symbol(a, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 6, 16))
 >T : Symbol(T, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 0, 8))
->this.B : Symbol(B, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 1, 9))
+>this.B : Symbol(B.B, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 1, 9))
 >this : Symbol(B, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 0, 0))
->B : Symbol(B, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 1, 9))
+>B : Symbol(B.B, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 1, 9))
 >a : Symbol(a, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 6, 16))
 
     foo(a: T)
->foo : Symbol(foo, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 6, 36), Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 8, 13), Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 9, 15), Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 10, 18))
+>foo : Symbol(B.foo, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 6, 36), Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 8, 13), Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 9, 15), Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 10, 18))
 >a : Symbol(a, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 8, 8))
 >T : Symbol(T, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 0, 8))
 
     foo(a: any)
->foo : Symbol(foo, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 6, 36), Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 8, 13), Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 9, 15), Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 10, 18))
+>foo : Symbol(B.foo, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 6, 36), Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 8, 13), Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 9, 15), Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 10, 18))
 >a : Symbol(a, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 9, 8))
 
     foo(b: string)
->foo : Symbol(foo, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 6, 36), Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 8, 13), Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 9, 15), Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 10, 18))
+>foo : Symbol(B.foo, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 6, 36), Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 8, 13), Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 9, 15), Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 10, 18))
 >b : Symbol(b, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 10, 8))
 
     foo(): T {
->foo : Symbol(foo, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 6, 36), Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 8, 13), Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 9, 15), Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 10, 18))
+>foo : Symbol(B.foo, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 6, 36), Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 8, 13), Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 9, 15), Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 10, 18))
 >T : Symbol(T, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 0, 8))
 
         return this.x;
->this.x : Symbol(x, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 0, 12))
+>this.x : Symbol(B.x, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 0, 12))
 >this : Symbol(B, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 0, 0))
->x : Symbol(x, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 0, 12))
+>x : Symbol(B.x, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 0, 12))
     }
 
     get BB(): T {
->BB : Symbol(BB, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 13, 5))
+>BB : Symbol(B.BB, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 13, 5))
 >T : Symbol(T, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 0, 8))
 
         return this.B;
->this.B : Symbol(B, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 1, 9))
+>this.B : Symbol(B.B, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 1, 9))
 >this : Symbol(B, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 0, 0))
->B : Symbol(B, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 1, 9))
+>B : Symbol(B.B, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 1, 9))
     }
     set BBWith(c: T) {
->BBWith : Symbol(BBWith, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 17, 5))
+>BBWith : Symbol(B.BBWith, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 17, 5))
 >c : Symbol(c, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 18, 15))
 >T : Symbol(T, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 0, 8))
 
         this.B = c;
->this.B : Symbol(B, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 1, 9))
+>this.B : Symbol(B.B, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 1, 9))
 >this : Symbol(B, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 0, 0))
->B : Symbol(B, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 1, 9))
+>B : Symbol(B.B, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 1, 9))
 >c : Symbol(c, Decl(emitClassDeclarationWithTypeArgumentAndOverloadInES6.ts, 18, 15))
     }
 }
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/emitClassDeclarationWithTypeArgumentInES6.symbols b/tests/baselines/reference/emitClassDeclarationWithTypeArgumentInES6.symbols
index 58f44b69f01..5db5fb703ae 100644
--- a/tests/baselines/reference/emitClassDeclarationWithTypeArgumentInES6.symbols
+++ b/tests/baselines/reference/emitClassDeclarationWithTypeArgumentInES6.symbols
@@ -4,48 +4,48 @@ class B<T> {
 >T : Symbol(T, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 0, 8))
 
     x: T;
->x : Symbol(x, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 0, 12))
+>x : Symbol(B.x, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 0, 12))
 >T : Symbol(T, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 0, 8))
 
     B: T;
->B : Symbol(B, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 1, 9))
+>B : Symbol(B.B, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 1, 9))
 >T : Symbol(T, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 0, 8))
 
     constructor(a: T) { this.B = a;}
 >a : Symbol(a, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 3, 16))
 >T : Symbol(T, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 0, 8))
->this.B : Symbol(B, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 1, 9))
+>this.B : Symbol(B.B, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 1, 9))
 >this : Symbol(B, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 0, 0))
->B : Symbol(B, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 1, 9))
+>B : Symbol(B.B, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 1, 9))
 >a : Symbol(a, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 3, 16))
 
     foo(): T {
->foo : Symbol(foo, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 3, 36))
+>foo : Symbol(B.foo, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 3, 36))
 >T : Symbol(T, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 0, 8))
 
         return this.x;
->this.x : Symbol(x, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 0, 12))
+>this.x : Symbol(B.x, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 0, 12))
 >this : Symbol(B, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 0, 0))
->x : Symbol(x, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 0, 12))
+>x : Symbol(B.x, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 0, 12))
     }
     get BB(): T {
->BB : Symbol(BB, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 6, 5))
+>BB : Symbol(B.BB, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 6, 5))
 >T : Symbol(T, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 0, 8))
 
         return this.B;
->this.B : Symbol(B, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 1, 9))
+>this.B : Symbol(B.B, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 1, 9))
 >this : Symbol(B, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 0, 0))
->B : Symbol(B, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 1, 9))
+>B : Symbol(B.B, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 1, 9))
     }
     set BBWith(c: T) {
->BBWith : Symbol(BBWith, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 9, 5))
+>BBWith : Symbol(B.BBWith, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 9, 5))
 >c : Symbol(c, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 10, 15))
 >T : Symbol(T, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 0, 8))
 
         this.B = c;
->this.B : Symbol(B, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 1, 9))
+>this.B : Symbol(B.B, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 1, 9))
 >this : Symbol(B, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 0, 0))
->B : Symbol(B, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 1, 9))
+>B : Symbol(B.B, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 1, 9))
 >c : Symbol(c, Decl(emitClassDeclarationWithTypeArgumentInES6.ts, 10, 15))
     }
 }
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/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.symbols b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.symbols
index dbd5aa150dc..4da659c4a1a 100644
--- a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.symbols
+++ b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.symbols
@@ -8,11 +8,18 @@ var object = {
 
     get 0() {
         return this._0;
+>this._0 : Symbol(_0, Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS3.ts, 1, 14))
+>this : Symbol(, Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS3.ts, 1, 12))
+>_0 : Symbol(_0, Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS3.ts, 1, 14))
+
     },
     set 0(x: number) {
 >x : Symbol(x, Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS3.ts, 6, 10))
 
         this._0 = x;
+>this._0 : Symbol(_0, Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS3.ts, 1, 14))
+>this : Symbol(, Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS3.ts, 1, 12))
+>_0 : Symbol(_0, Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS3.ts, 1, 14))
 >x : Symbol(x, Decl(emitCompoundExponentiationAssignmentWithIndexingOnLHS3.ts, 6, 10))
 
     },
diff --git a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.types b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.types
index 1877f391207..b47c88f3de3 100644
--- a/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.types
+++ b/tests/baselines/reference/emitCompoundExponentiationAssignmentWithIndexingOnLHS3.types
@@ -10,9 +10,9 @@ var object = {
 
     get 0() {
         return this._0;
->this._0 : any
->this : any
->_0 : any
+>this._0 : number
+>this : { 0: number; _0: number; }
+>_0 : number
 
     },
     set 0(x: number) {
@@ -20,9 +20,9 @@ var object = {
 
         this._0 = x;
 >this._0 = x : number
->this._0 : any
->this : any
->_0 : any
+>this._0 : number
+>this : { 0: number; _0: number; }
+>_0 : number
 >x : number
 
     },
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/emitDefaultParametersMethod.symbols b/tests/baselines/reference/emitDefaultParametersMethod.symbols
index 866380e2dd5..df316896d5c 100644
--- a/tests/baselines/reference/emitDefaultParametersMethod.symbols
+++ b/tests/baselines/reference/emitDefaultParametersMethod.symbols
@@ -9,22 +9,22 @@ class C {
 >y : Symbol(y, Decl(emitDefaultParametersMethod.ts, 1, 49))
 
     public foo(x: string, t = false) { }
->foo : Symbol(foo, Decl(emitDefaultParametersMethod.ts, 1, 66))
+>foo : Symbol(C.foo, Decl(emitDefaultParametersMethod.ts, 1, 66))
 >x : Symbol(x, Decl(emitDefaultParametersMethod.ts, 3, 15))
 >t : Symbol(t, Decl(emitDefaultParametersMethod.ts, 3, 25))
 
     public foo1(x: string, t = false, ...rest) { }
->foo1 : Symbol(foo1, Decl(emitDefaultParametersMethod.ts, 3, 40))
+>foo1 : Symbol(C.foo1, Decl(emitDefaultParametersMethod.ts, 3, 40))
 >x : Symbol(x, Decl(emitDefaultParametersMethod.ts, 4, 16))
 >t : Symbol(t, Decl(emitDefaultParametersMethod.ts, 4, 26))
 >rest : Symbol(rest, Decl(emitDefaultParametersMethod.ts, 4, 37))
 
     public bar(t = false) { }
->bar : Symbol(bar, Decl(emitDefaultParametersMethod.ts, 4, 50))
+>bar : Symbol(C.bar, Decl(emitDefaultParametersMethod.ts, 4, 50))
 >t : Symbol(t, Decl(emitDefaultParametersMethod.ts, 5, 15))
 
     public boo(t = false, ...rest) { }
->boo : Symbol(boo, Decl(emitDefaultParametersMethod.ts, 5, 29))
+>boo : Symbol(C.boo, Decl(emitDefaultParametersMethod.ts, 5, 29))
 >t : Symbol(t, Decl(emitDefaultParametersMethod.ts, 6, 15))
 >rest : Symbol(rest, Decl(emitDefaultParametersMethod.ts, 6, 25))
 }
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/emitDefaultParametersMethodES6.symbols b/tests/baselines/reference/emitDefaultParametersMethodES6.symbols
index ce23b016bcf..e15937c1af6 100644
--- a/tests/baselines/reference/emitDefaultParametersMethodES6.symbols
+++ b/tests/baselines/reference/emitDefaultParametersMethodES6.symbols
@@ -9,22 +9,22 @@ class C {
 >y : Symbol(y, Decl(emitDefaultParametersMethodES6.ts, 1, 49))
 
     public foo(x: string, t = false) { }
->foo : Symbol(foo, Decl(emitDefaultParametersMethodES6.ts, 1, 66))
+>foo : Symbol(C.foo, Decl(emitDefaultParametersMethodES6.ts, 1, 66))
 >x : Symbol(x, Decl(emitDefaultParametersMethodES6.ts, 3, 15))
 >t : Symbol(t, Decl(emitDefaultParametersMethodES6.ts, 3, 25))
 
     public foo1(x: string, t = false, ...rest) { }
->foo1 : Symbol(foo1, Decl(emitDefaultParametersMethodES6.ts, 3, 40))
+>foo1 : Symbol(C.foo1, Decl(emitDefaultParametersMethodES6.ts, 3, 40))
 >x : Symbol(x, Decl(emitDefaultParametersMethodES6.ts, 4, 16))
 >t : Symbol(t, Decl(emitDefaultParametersMethodES6.ts, 4, 26))
 >rest : Symbol(rest, Decl(emitDefaultParametersMethodES6.ts, 4, 37))
 
     public bar(t = false) { }
->bar : Symbol(bar, Decl(emitDefaultParametersMethodES6.ts, 4, 50))
+>bar : Symbol(C.bar, Decl(emitDefaultParametersMethodES6.ts, 4, 50))
 >t : Symbol(t, Decl(emitDefaultParametersMethodES6.ts, 5, 15))
 
     public boo(t = false, ...rest) { }
->boo : Symbol(boo, Decl(emitDefaultParametersMethodES6.ts, 5, 29))
+>boo : Symbol(C.boo, Decl(emitDefaultParametersMethodES6.ts, 5, 29))
 >t : Symbol(t, Decl(emitDefaultParametersMethodES6.ts, 6, 15))
 >rest : Symbol(rest, Decl(emitDefaultParametersMethodES6.ts, 6, 25))
 }
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/emitMemberAccessExpression.symbols b/tests/baselines/reference/emitMemberAccessExpression.symbols
index 64302521706..ac0f8852d2a 100644
--- a/tests/baselines/reference/emitMemberAccessExpression.symbols
+++ b/tests/baselines/reference/emitMemberAccessExpression.symbols
@@ -29,7 +29,7 @@ module Microsoft.PeopleAtWork.Model {
 >_Person : Symbol(_Person, Decl(emitMemberAccessExpression_file2.ts, 2, 37))
 
         public populate(raw: any) {
->populate : Symbol(populate, Decl(emitMemberAccessExpression_file2.ts, 3, 26))
+>populate : Symbol(_Person.populate, Decl(emitMemberAccessExpression_file2.ts, 3, 26))
 >raw : Symbol(raw, Decl(emitMemberAccessExpression_file2.ts, 4, 24))
 
             var res = Model.KnockoutExtentions;
diff --git a/tests/baselines/reference/emitRestParametersMethod.symbols b/tests/baselines/reference/emitRestParametersMethod.symbols
index 2bfbda925bf..b07c410d02c 100644
--- a/tests/baselines/reference/emitRestParametersMethod.symbols
+++ b/tests/baselines/reference/emitRestParametersMethod.symbols
@@ -7,11 +7,11 @@ class C {
 >rest : Symbol(rest, Decl(emitRestParametersMethod.ts, 1, 29))
 
     public bar(...rest) { }
->bar : Symbol(bar, Decl(emitRestParametersMethod.ts, 1, 42))
+>bar : Symbol(C.bar, Decl(emitRestParametersMethod.ts, 1, 42))
 >rest : Symbol(rest, Decl(emitRestParametersMethod.ts, 3, 15))
 
     public foo(x: number, ...rest) { }
->foo : Symbol(foo, Decl(emitRestParametersMethod.ts, 3, 27))
+>foo : Symbol(C.foo, Decl(emitRestParametersMethod.ts, 3, 27))
 >x : Symbol(x, Decl(emitRestParametersMethod.ts, 4, 15))
 >rest : Symbol(rest, Decl(emitRestParametersMethod.ts, 4, 25))
 }
@@ -23,11 +23,11 @@ class D {
 >rest : Symbol(rest, Decl(emitRestParametersMethod.ts, 8, 16))
 
     public bar(...rest) { }
->bar : Symbol(bar, Decl(emitRestParametersMethod.ts, 8, 28))
+>bar : Symbol(D.bar, Decl(emitRestParametersMethod.ts, 8, 28))
 >rest : Symbol(rest, Decl(emitRestParametersMethod.ts, 10, 15))
 
     public foo(x: number, ...rest) { }
->foo : Symbol(foo, Decl(emitRestParametersMethod.ts, 10, 27))
+>foo : Symbol(D.foo, Decl(emitRestParametersMethod.ts, 10, 27))
 >x : Symbol(x, Decl(emitRestParametersMethod.ts, 11, 15))
 >rest : Symbol(rest, Decl(emitRestParametersMethod.ts, 11, 25))
 }
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/emitRestParametersMethodES6.symbols b/tests/baselines/reference/emitRestParametersMethodES6.symbols
index e79ab9bb26e..0968d3e4585 100644
--- a/tests/baselines/reference/emitRestParametersMethodES6.symbols
+++ b/tests/baselines/reference/emitRestParametersMethodES6.symbols
@@ -7,11 +7,11 @@ class C {
 >rest : Symbol(rest, Decl(emitRestParametersMethodES6.ts, 1, 29))
 
     public bar(...rest) { }
->bar : Symbol(bar, Decl(emitRestParametersMethodES6.ts, 1, 42))
+>bar : Symbol(C.bar, Decl(emitRestParametersMethodES6.ts, 1, 42))
 >rest : Symbol(rest, Decl(emitRestParametersMethodES6.ts, 3, 15))
 
     public foo(x: number, ...rest) { }
->foo : Symbol(foo, Decl(emitRestParametersMethodES6.ts, 3, 27))
+>foo : Symbol(C.foo, Decl(emitRestParametersMethodES6.ts, 3, 27))
 >x : Symbol(x, Decl(emitRestParametersMethodES6.ts, 4, 15))
 >rest : Symbol(rest, Decl(emitRestParametersMethodES6.ts, 4, 25))
 }
@@ -23,11 +23,11 @@ class D {
 >rest : Symbol(rest, Decl(emitRestParametersMethodES6.ts, 8, 16))
 
     public bar(...rest) { }
->bar : Symbol(bar, Decl(emitRestParametersMethodES6.ts, 8, 28))
+>bar : Symbol(D.bar, Decl(emitRestParametersMethodES6.ts, 8, 28))
 >rest : Symbol(rest, Decl(emitRestParametersMethodES6.ts, 10, 15))
 
     public foo(x: number, ...rest) { }
->foo : Symbol(foo, Decl(emitRestParametersMethodES6.ts, 10, 27))
+>foo : Symbol(D.foo, Decl(emitRestParametersMethodES6.ts, 10, 27))
 >x : Symbol(x, Decl(emitRestParametersMethodES6.ts, 11, 15))
 >rest : Symbol(rest, Decl(emitRestParametersMethodES6.ts, 11, 25))
 }
diff --git a/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1.js b/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1.js
new file mode 100644
index 00000000000..88ce3f1418b
--- /dev/null
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1.js
@@ -0,0 +1,37 @@
+//// [emitSuperCallBeforeEmitParameterPropertyDeclaration1.ts]
+class A {
+    blub = 6;
+}
+
+
+class B extends A {
+    constructor(public x: number) {
+        "use strict";
+        'someStringForEgngInject';
+        super()
+    }
+}
+
+
+//// [emitSuperCallBeforeEmitParameterPropertyDeclaration1.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 A = (function () {
+    function A() {
+        this.blub = 6;
+    }
+    return A;
+}());
+var B = (function (_super) {
+    __extends(B, _super);
+    function B(x) {
+        "use strict";
+        'someStringForEgngInject';
+        _super.call(this);
+        this.x = x;
+    }
+    return B;
+}(A));
diff --git a/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1.symbols b/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1.symbols
new file mode 100644
index 00000000000..95f21be3b2d
--- /dev/null
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1.symbols
@@ -0,0 +1,23 @@
+=== tests/cases/compiler/emitSuperCallBeforeEmitParameterPropertyDeclaration1.ts ===
+class A {
+>A : Symbol(A, Decl(emitSuperCallBeforeEmitParameterPropertyDeclaration1.ts, 0, 0))
+
+    blub = 6;
+>blub : Symbol(A.blub, Decl(emitSuperCallBeforeEmitParameterPropertyDeclaration1.ts, 0, 9))
+}
+
+
+class B extends A {
+>B : Symbol(B, Decl(emitSuperCallBeforeEmitParameterPropertyDeclaration1.ts, 2, 1))
+>A : Symbol(A, Decl(emitSuperCallBeforeEmitParameterPropertyDeclaration1.ts, 0, 0))
+
+    constructor(public x: number) {
+>x : Symbol(B.x, Decl(emitSuperCallBeforeEmitParameterPropertyDeclaration1.ts, 6, 16))
+
+        "use strict";
+        'someStringForEgngInject';
+        super()
+>super : Symbol(A, Decl(emitSuperCallBeforeEmitParameterPropertyDeclaration1.ts, 0, 0))
+    }
+}
+
diff --git a/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1.types b/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1.types
new file mode 100644
index 00000000000..cfdf0af0300
--- /dev/null
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1.types
@@ -0,0 +1,29 @@
+=== tests/cases/compiler/emitSuperCallBeforeEmitParameterPropertyDeclaration1.ts ===
+class A {
+>A : A
+
+    blub = 6;
+>blub : number
+>6 : number
+}
+
+
+class B extends A {
+>B : B
+>A : A
+
+    constructor(public x: number) {
+>x : number
+
+        "use strict";
+>"use strict" : string
+
+        'someStringForEgngInject';
+>'someStringForEgngInject' : string
+
+        super()
+>super() : void
+>super : typeof A
+    }
+}
+
diff --git a/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1ES6.js b/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1ES6.js
new file mode 100644
index 00000000000..2e594dba0ec
--- /dev/null
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1ES6.js
@@ -0,0 +1,29 @@
+//// [emitSuperCallBeforeEmitParameterPropertyDeclaration1ES6.ts]
+class A {
+    blub = 6;
+}
+
+
+class B extends A {
+    constructor(public x: number) {
+        "use strict";
+        'someStringForEgngInject';
+        super()
+    }
+}
+
+
+//// [emitSuperCallBeforeEmitParameterPropertyDeclaration1ES6.js]
+class A {
+    constructor() {
+        this.blub = 6;
+    }
+}
+class B extends A {
+    constructor(x) {
+        "use strict";
+        'someStringForEgngInject';
+        super();
+        this.x = x;
+    }
+}
diff --git a/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1ES6.symbols b/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1ES6.symbols
new file mode 100644
index 00000000000..0b11b7079e5
--- /dev/null
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1ES6.symbols
@@ -0,0 +1,23 @@
+=== tests/cases/compiler/emitSuperCallBeforeEmitParameterPropertyDeclaration1ES6.ts ===
+class A {
+>A : Symbol(A, Decl(emitSuperCallBeforeEmitParameterPropertyDeclaration1ES6.ts, 0, 0))
+
+    blub = 6;
+>blub : Symbol(A.blub, Decl(emitSuperCallBeforeEmitParameterPropertyDeclaration1ES6.ts, 0, 9))
+}
+
+
+class B extends A {
+>B : Symbol(B, Decl(emitSuperCallBeforeEmitParameterPropertyDeclaration1ES6.ts, 2, 1))
+>A : Symbol(A, Decl(emitSuperCallBeforeEmitParameterPropertyDeclaration1ES6.ts, 0, 0))
+
+    constructor(public x: number) {
+>x : Symbol(B.x, Decl(emitSuperCallBeforeEmitParameterPropertyDeclaration1ES6.ts, 6, 16))
+
+        "use strict";
+        'someStringForEgngInject';
+        super()
+>super : Symbol(A, Decl(emitSuperCallBeforeEmitParameterPropertyDeclaration1ES6.ts, 0, 0))
+    }
+}
+
diff --git a/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1ES6.types b/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1ES6.types
new file mode 100644
index 00000000000..4424042c241
--- /dev/null
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1ES6.types
@@ -0,0 +1,29 @@
+=== tests/cases/compiler/emitSuperCallBeforeEmitParameterPropertyDeclaration1ES6.ts ===
+class A {
+>A : A
+
+    blub = 6;
+>blub : number
+>6 : number
+}
+
+
+class B extends A {
+>B : B
+>A : A
+
+    constructor(public x: number) {
+>x : number
+
+        "use strict";
+>"use strict" : string
+
+        'someStringForEgngInject';
+>'someStringForEgngInject' : string
+
+        super()
+>super() : void
+>super : typeof A
+    }
+}
+
diff --git a/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1.js b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1.js
new file mode 100644
index 00000000000..920ad1f7bda
--- /dev/null
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1.js
@@ -0,0 +1,39 @@
+//// [emitSuperCallBeforeEmitPropertyDeclaration1.ts]
+class A {
+    blub = 6;
+}
+
+
+class B extends A {
+
+    blub = 12;
+
+    constructor() {
+        "use strict";
+        'someStringForEgngInject';
+        super()
+    }
+}
+
+//// [emitSuperCallBeforeEmitPropertyDeclaration1.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 A = (function () {
+    function A() {
+        this.blub = 6;
+    }
+    return A;
+}());
+var B = (function (_super) {
+    __extends(B, _super);
+    function B() {
+        "use strict";
+        'someStringForEgngInject';
+        _super.call(this);
+        this.blub = 12;
+    }
+    return B;
+}(A));
diff --git a/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1.symbols b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1.symbols
new file mode 100644
index 00000000000..d4101787c83
--- /dev/null
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1.symbols
@@ -0,0 +1,23 @@
+=== tests/cases/compiler/emitSuperCallBeforeEmitPropertyDeclaration1.ts ===
+class A {
+>A : Symbol(A, Decl(emitSuperCallBeforeEmitPropertyDeclaration1.ts, 0, 0))
+
+    blub = 6;
+>blub : Symbol(A.blub, Decl(emitSuperCallBeforeEmitPropertyDeclaration1.ts, 0, 9))
+}
+
+
+class B extends A {
+>B : Symbol(B, Decl(emitSuperCallBeforeEmitPropertyDeclaration1.ts, 2, 1))
+>A : Symbol(A, Decl(emitSuperCallBeforeEmitPropertyDeclaration1.ts, 0, 0))
+
+    blub = 12;
+>blub : Symbol(B.blub, Decl(emitSuperCallBeforeEmitPropertyDeclaration1.ts, 5, 19))
+
+    constructor() {
+        "use strict";
+        'someStringForEgngInject';
+        super()
+>super : Symbol(A, Decl(emitSuperCallBeforeEmitPropertyDeclaration1.ts, 0, 0))
+    }
+}
diff --git a/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1.types b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1.types
new file mode 100644
index 00000000000..2d16fed121d
--- /dev/null
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1.types
@@ -0,0 +1,30 @@
+=== tests/cases/compiler/emitSuperCallBeforeEmitPropertyDeclaration1.ts ===
+class A {
+>A : A
+
+    blub = 6;
+>blub : number
+>6 : number
+}
+
+
+class B extends A {
+>B : B
+>A : A
+
+    blub = 12;
+>blub : number
+>12 : number
+
+    constructor() {
+        "use strict";
+>"use strict" : string
+
+        'someStringForEgngInject';
+>'someStringForEgngInject' : string
+
+        super()
+>super() : void
+>super : typeof A
+    }
+}
diff --git a/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1ES6.js b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1ES6.js
new file mode 100644
index 00000000000..4b3e9e73b9f
--- /dev/null
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1ES6.js
@@ -0,0 +1,29 @@
+//// [emitSuperCallBeforeEmitPropertyDeclaration1ES6.ts]
+class A {
+    blub = 6;
+}
+
+
+class B extends A {
+
+    blub = 12;
+
+    constructor() {
+        'someStringForEgngInject';
+        super()
+    }
+}
+
+//// [emitSuperCallBeforeEmitPropertyDeclaration1ES6.js]
+class A {
+    constructor() {
+        this.blub = 6;
+    }
+}
+class B extends A {
+    constructor() {
+        'someStringForEgngInject';
+        super();
+        this.blub = 12;
+    }
+}
diff --git a/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1ES6.symbols b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1ES6.symbols
new file mode 100644
index 00000000000..4018bfa664c
--- /dev/null
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1ES6.symbols
@@ -0,0 +1,22 @@
+=== tests/cases/compiler/emitSuperCallBeforeEmitPropertyDeclaration1ES6.ts ===
+class A {
+>A : Symbol(A, Decl(emitSuperCallBeforeEmitPropertyDeclaration1ES6.ts, 0, 0))
+
+    blub = 6;
+>blub : Symbol(A.blub, Decl(emitSuperCallBeforeEmitPropertyDeclaration1ES6.ts, 0, 9))
+}
+
+
+class B extends A {
+>B : Symbol(B, Decl(emitSuperCallBeforeEmitPropertyDeclaration1ES6.ts, 2, 1))
+>A : Symbol(A, Decl(emitSuperCallBeforeEmitPropertyDeclaration1ES6.ts, 0, 0))
+
+    blub = 12;
+>blub : Symbol(B.blub, Decl(emitSuperCallBeforeEmitPropertyDeclaration1ES6.ts, 5, 19))
+
+    constructor() {
+        'someStringForEgngInject';
+        super()
+>super : Symbol(A, Decl(emitSuperCallBeforeEmitPropertyDeclaration1ES6.ts, 0, 0))
+    }
+}
diff --git a/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1ES6.types b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1ES6.types
new file mode 100644
index 00000000000..39e8f885777
--- /dev/null
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1ES6.types
@@ -0,0 +1,27 @@
+=== tests/cases/compiler/emitSuperCallBeforeEmitPropertyDeclaration1ES6.ts ===
+class A {
+>A : A
+
+    blub = 6;
+>blub : number
+>6 : number
+}
+
+
+class B extends A {
+>B : B
+>A : A
+
+    blub = 12;
+>blub : number
+>12 : number
+
+    constructor() {
+        'someStringForEgngInject';
+>'someStringForEgngInject' : string
+
+        super()
+>super() : void
+>super : typeof A
+    }
+}
diff --git a/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.js b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.js
new file mode 100644
index 00000000000..3fa18140034
--- /dev/null
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.js
@@ -0,0 +1,38 @@
+//// [emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.ts]
+class A {
+    blub = 6;
+}
+
+
+class B extends A {
+    blah = 2;
+    constructor(public x: number) {
+        "use strict";
+        'someStringForEgngInject';
+        super()
+    }
+}
+
+//// [emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.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 A = (function () {
+    function A() {
+        this.blub = 6;
+    }
+    return A;
+}());
+var B = (function (_super) {
+    __extends(B, _super);
+    function B(x) {
+        "use strict";
+        'someStringForEgngInject';
+        _super.call(this);
+        this.x = x;
+        this.blah = 2;
+    }
+    return B;
+}(A));
diff --git a/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.symbols b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.symbols
new file mode 100644
index 00000000000..0904aeaf477
--- /dev/null
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.symbols
@@ -0,0 +1,25 @@
+=== tests/cases/compiler/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.ts ===
+class A {
+>A : Symbol(A, Decl(emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.ts, 0, 0))
+
+    blub = 6;
+>blub : Symbol(A.blub, Decl(emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.ts, 0, 9))
+}
+
+
+class B extends A {
+>B : Symbol(B, Decl(emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.ts, 2, 1))
+>A : Symbol(A, Decl(emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.ts, 0, 0))
+
+    blah = 2;
+>blah : Symbol(B.blah, Decl(emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.ts, 5, 19))
+
+    constructor(public x: number) {
+>x : Symbol(B.x, Decl(emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.ts, 7, 16))
+
+        "use strict";
+        'someStringForEgngInject';
+        super()
+>super : Symbol(A, Decl(emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.ts, 0, 0))
+    }
+}
diff --git a/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.types b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.types
new file mode 100644
index 00000000000..acb5703581a
--- /dev/null
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.types
@@ -0,0 +1,32 @@
+=== tests/cases/compiler/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.ts ===
+class A {
+>A : A
+
+    blub = 6;
+>blub : number
+>6 : number
+}
+
+
+class B extends A {
+>B : B
+>A : A
+
+    blah = 2;
+>blah : number
+>2 : number
+
+    constructor(public x: number) {
+>x : number
+
+        "use strict";
+>"use strict" : string
+
+        'someStringForEgngInject';
+>'someStringForEgngInject' : string
+
+        super()
+>super() : void
+>super : typeof A
+    }
+}
diff --git a/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1ES6.js b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1ES6.js
new file mode 100644
index 00000000000..5e27acf8d9a
--- /dev/null
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1ES6.js
@@ -0,0 +1,30 @@
+//// [emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1ES6.ts]
+class A {
+    blub = 6;
+}
+
+
+class B extends A {
+    blah = 2;
+    constructor(public x: number) {
+        "use strict";
+        'someStringForEgngInject';
+        super()
+    }
+}
+
+//// [emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1ES6.js]
+class A {
+    constructor() {
+        this.blub = 6;
+    }
+}
+class B extends A {
+    constructor(x) {
+        "use strict";
+        'someStringForEgngInject';
+        super();
+        this.x = x;
+        this.blah = 2;
+    }
+}
diff --git a/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1ES6.symbols b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1ES6.symbols
new file mode 100644
index 00000000000..ed0089cdbe2
--- /dev/null
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1ES6.symbols
@@ -0,0 +1,25 @@
+=== tests/cases/compiler/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1ES6.ts ===
+class A {
+>A : Symbol(A, Decl(emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1ES6.ts, 0, 0))
+
+    blub = 6;
+>blub : Symbol(A.blub, Decl(emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1ES6.ts, 0, 9))
+}
+
+
+class B extends A {
+>B : Symbol(B, Decl(emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1ES6.ts, 2, 1))
+>A : Symbol(A, Decl(emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1ES6.ts, 0, 0))
+
+    blah = 2;
+>blah : Symbol(B.blah, Decl(emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1ES6.ts, 5, 19))
+
+    constructor(public x: number) {
+>x : Symbol(B.x, Decl(emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1ES6.ts, 7, 16))
+
+        "use strict";
+        'someStringForEgngInject';
+        super()
+>super : Symbol(A, Decl(emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1ES6.ts, 0, 0))
+    }
+}
diff --git a/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1ES6.types b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1ES6.types
new file mode 100644
index 00000000000..96fc1fc2dc3
--- /dev/null
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1ES6.types
@@ -0,0 +1,32 @@
+=== tests/cases/compiler/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1ES6.ts ===
+class A {
+>A : A
+
+    blub = 6;
+>blub : number
+>6 : number
+}
+
+
+class B extends A {
+>B : B
+>A : A
+
+    blah = 2;
+>blah : number
+>2 : number
+
+    constructor(public x: number) {
+>x : number
+
+        "use strict";
+>"use strict" : string
+
+        'someStringForEgngInject';
+>'someStringForEgngInject' : string
+
+        super()
+>super() : void
+>super : typeof A
+    }
+}
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/emptyIndexer.symbols b/tests/baselines/reference/emptyIndexer.symbols
index 6c3bad02349..3fe3844eb81 100644
--- a/tests/baselines/reference/emptyIndexer.symbols
+++ b/tests/baselines/reference/emptyIndexer.symbols
@@ -3,7 +3,7 @@ interface I1 {
 >I1 : Symbol(I1, Decl(emptyIndexer.ts, 0, 0))
 
 	m(): number;
->m : Symbol(m, Decl(emptyIndexer.ts, 0, 14))
+>m : Symbol(I1.m, Decl(emptyIndexer.ts, 0, 14))
 }
 
 interface I2 {
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_ES5.types b/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES5.types
index ed6b935db0f..3640d468a59 100644
--- a/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES5.types
+++ b/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES5.types
@@ -62,7 +62,7 @@
     }
 
     function f({} = a, [] = a, { p: {} = a} = a) {
->f : ({}?: any, []?: any, { p: {} = a}?: any) => ({}?: any, []?: any, { p: {} = a }?: any) => any
+>f : ({}?: any, []?: any, {p: {}}?: any) => ({}?: any, []?: any, {p: {}}?: any) => any
 >a : any
 >a : any
 >p : any
@@ -70,7 +70,7 @@
 >a : any
 
         return ({} = a, [] = a, { p: {} = a } = a) => a;
->({} = a, [] = a, { p: {} = a } = a) => a : ({}?: any, []?: any, { p: {} = a }?: any) => any
+>({} = a, [] = a, { p: {} = a } = a) => a : ({}?: any, []?: any, {p: {}}?: any) => any
 >a : any
 >a : any
 >p : any
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/emptyVariableDeclarationBindingPatterns01_ES6.types b/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES6.types
index fcb48048148..20b7d5ec2b6 100644
--- a/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES6.types
+++ b/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES6.types
@@ -62,7 +62,7 @@
     }
 
     function f({} = a, [] = a, { p: {} = a} = a) {
->f : ({}?: any, []?: any, { p: {} = a}?: any) => ({}?: any, []?: any, { p: {} = a }?: any) => any
+>f : ({}?: any, []?: any, {p: {}}?: any) => ({}?: any, []?: any, {p: {}}?: any) => any
 >a : any
 >a : any
 >p : any
@@ -70,7 +70,7 @@
 >a : any
 
         return ({} = a, [] = a, { p: {} = a } = a) => a;
->({} = a, [] = a, { p: {} = a } = a) => a : ({}?: any, []?: any, { p: {} = a }?: any) => any
+>({} = a, [] = a, { p: {} = a } = a) => a : ({}?: any, []?: any, {p: {}}?: any) => any
 >a : any
 >a : any
 >p : any
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/enumAssignmentCompat4.js b/tests/baselines/reference/enumAssignmentCompat4.js
new file mode 100644
index 00000000000..ad28324ce0f
--- /dev/null
+++ b/tests/baselines/reference/enumAssignmentCompat4.js
@@ -0,0 +1,51 @@
+//// [enumAssignmentCompat4.ts]
+namespace M {
+    export enum MyEnum {
+        BAR
+    }
+    export var object2 = {
+        foo: MyEnum.BAR
+    };
+}
+
+namespace N {
+    export enum MyEnum {
+        FOO
+    };
+    export var object1 = {
+        foo: MyEnum.FOO
+    };
+}
+
+let broken = [
+    N.object1,
+    M.object2
+];
+
+
+//// [enumAssignmentCompat4.js]
+var M;
+(function (M) {
+    (function (MyEnum) {
+        MyEnum[MyEnum["BAR"] = 0] = "BAR";
+    })(M.MyEnum || (M.MyEnum = {}));
+    var MyEnum = M.MyEnum;
+    M.object2 = {
+        foo: MyEnum.BAR
+    };
+})(M || (M = {}));
+var N;
+(function (N) {
+    (function (MyEnum) {
+        MyEnum[MyEnum["FOO"] = 0] = "FOO";
+    })(N.MyEnum || (N.MyEnum = {}));
+    var MyEnum = N.MyEnum;
+    ;
+    N.object1 = {
+        foo: MyEnum.FOO
+    };
+})(N || (N = {}));
+var broken = [
+    N.object1,
+    M.object2
+];
diff --git a/tests/baselines/reference/enumAssignmentCompat4.symbols b/tests/baselines/reference/enumAssignmentCompat4.symbols
new file mode 100644
index 00000000000..a3a80731610
--- /dev/null
+++ b/tests/baselines/reference/enumAssignmentCompat4.symbols
@@ -0,0 +1,59 @@
+=== tests/cases/compiler/enumAssignmentCompat4.ts ===
+namespace M {
+>M : Symbol(M, Decl(enumAssignmentCompat4.ts, 0, 0))
+
+    export enum MyEnum {
+>MyEnum : Symbol(MyEnum, Decl(enumAssignmentCompat4.ts, 0, 13))
+
+        BAR
+>BAR : Symbol(MyEnum.BAR, Decl(enumAssignmentCompat4.ts, 1, 24))
+    }
+    export var object2 = {
+>object2 : Symbol(object2, Decl(enumAssignmentCompat4.ts, 4, 14))
+
+        foo: MyEnum.BAR
+>foo : Symbol(foo, Decl(enumAssignmentCompat4.ts, 4, 26))
+>MyEnum.BAR : Symbol(MyEnum.BAR, Decl(enumAssignmentCompat4.ts, 1, 24))
+>MyEnum : Symbol(MyEnum, Decl(enumAssignmentCompat4.ts, 0, 13))
+>BAR : Symbol(MyEnum.BAR, Decl(enumAssignmentCompat4.ts, 1, 24))
+
+    };
+}
+
+namespace N {
+>N : Symbol(N, Decl(enumAssignmentCompat4.ts, 7, 1))
+
+    export enum MyEnum {
+>MyEnum : Symbol(MyEnum, Decl(enumAssignmentCompat4.ts, 9, 13))
+
+        FOO
+>FOO : Symbol(MyEnum.FOO, Decl(enumAssignmentCompat4.ts, 10, 24))
+
+    };
+    export var object1 = {
+>object1 : Symbol(object1, Decl(enumAssignmentCompat4.ts, 13, 14))
+
+        foo: MyEnum.FOO
+>foo : Symbol(foo, Decl(enumAssignmentCompat4.ts, 13, 26))
+>MyEnum.FOO : Symbol(MyEnum.FOO, Decl(enumAssignmentCompat4.ts, 10, 24))
+>MyEnum : Symbol(MyEnum, Decl(enumAssignmentCompat4.ts, 9, 13))
+>FOO : Symbol(MyEnum.FOO, Decl(enumAssignmentCompat4.ts, 10, 24))
+
+    };
+}
+
+let broken = [
+>broken : Symbol(broken, Decl(enumAssignmentCompat4.ts, 18, 3))
+
+    N.object1,
+>N.object1 : Symbol(N.object1, Decl(enumAssignmentCompat4.ts, 13, 14))
+>N : Symbol(N, Decl(enumAssignmentCompat4.ts, 7, 1))
+>object1 : Symbol(N.object1, Decl(enumAssignmentCompat4.ts, 13, 14))
+
+    M.object2
+>M.object2 : Symbol(M.object2, Decl(enumAssignmentCompat4.ts, 4, 14))
+>M : Symbol(M, Decl(enumAssignmentCompat4.ts, 0, 0))
+>object2 : Symbol(M.object2, Decl(enumAssignmentCompat4.ts, 4, 14))
+
+];
+
diff --git a/tests/baselines/reference/enumAssignmentCompat4.types b/tests/baselines/reference/enumAssignmentCompat4.types
new file mode 100644
index 00000000000..db7f5ce8ba2
--- /dev/null
+++ b/tests/baselines/reference/enumAssignmentCompat4.types
@@ -0,0 +1,62 @@
+=== tests/cases/compiler/enumAssignmentCompat4.ts ===
+namespace M {
+>M : typeof M
+
+    export enum MyEnum {
+>MyEnum : MyEnum
+
+        BAR
+>BAR : MyEnum
+    }
+    export var object2 = {
+>object2 : { foo: MyEnum; }
+>{        foo: MyEnum.BAR    } : { foo: MyEnum; }
+
+        foo: MyEnum.BAR
+>foo : MyEnum
+>MyEnum.BAR : MyEnum
+>MyEnum : typeof MyEnum
+>BAR : MyEnum
+
+    };
+}
+
+namespace N {
+>N : typeof N
+
+    export enum MyEnum {
+>MyEnum : MyEnum
+
+        FOO
+>FOO : MyEnum
+
+    };
+    export var object1 = {
+>object1 : { foo: MyEnum; }
+>{        foo: MyEnum.FOO    } : { foo: MyEnum; }
+
+        foo: MyEnum.FOO
+>foo : MyEnum
+>MyEnum.FOO : MyEnum
+>MyEnum : typeof MyEnum
+>FOO : MyEnum
+
+    };
+}
+
+let broken = [
+>broken : ({ foo: N.MyEnum; } | { foo: M.MyEnum; })[]
+>[    N.object1,    M.object2] : ({ foo: N.MyEnum; } | { foo: M.MyEnum; })[]
+
+    N.object1,
+>N.object1 : { foo: N.MyEnum; }
+>N : typeof N
+>object1 : { foo: N.MyEnum; }
+
+    M.object2
+>M.object2 : { foo: M.MyEnum; }
+>M : typeof M
+>object2 : { foo: M.MyEnum; }
+
+];
+
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/equalityWithIntersectionTypes01.errors.txt b/tests/baselines/reference/equalityWithIntersectionTypes01.errors.txt
new file mode 100644
index 00000000000..8bffff2218b
--- /dev/null
+++ b/tests/baselines/reference/equalityWithIntersectionTypes01.errors.txt
@@ -0,0 +1,51 @@
+tests/cases/conformance/types/typeRelationships/comparable/equalityWithIntersectionTypes01.ts(17,5): error TS2365: Operator '===' cannot be applied to types 'I1 & I3' and 'I2'.
+tests/cases/conformance/types/typeRelationships/comparable/equalityWithIntersectionTypes01.ts(17,16): error TS2365: Operator '===' cannot be applied to types 'I2' and 'I1 & I3'.
+tests/cases/conformance/types/typeRelationships/comparable/equalityWithIntersectionTypes01.ts(19,10): error TS2365: Operator '!==' cannot be applied to types 'I1 & I3' and 'I2'.
+tests/cases/conformance/types/typeRelationships/comparable/equalityWithIntersectionTypes01.ts(19,21): error TS2365: Operator '!==' cannot be applied to types 'I2' and 'I1 & I3'.
+tests/cases/conformance/types/typeRelationships/comparable/equalityWithIntersectionTypes01.ts(21,10): error TS2365: Operator '==' cannot be applied to types 'I1 & I3' and 'I2'.
+tests/cases/conformance/types/typeRelationships/comparable/equalityWithIntersectionTypes01.ts(21,20): error TS2365: Operator '==' cannot be applied to types 'I2' and 'I1 & I3'.
+tests/cases/conformance/types/typeRelationships/comparable/equalityWithIntersectionTypes01.ts(23,10): error TS2365: Operator '!=' cannot be applied to types 'I1 & I3' and 'I2'.
+tests/cases/conformance/types/typeRelationships/comparable/equalityWithIntersectionTypes01.ts(23,20): error TS2365: Operator '!=' cannot be applied to types 'I2' and 'I1 & I3'.
+
+
+==== tests/cases/conformance/types/typeRelationships/comparable/equalityWithIntersectionTypes01.ts (8 errors) ====
+    interface I1 {
+        p1: number
+    }
+    
+    interface I2 extends I1 {
+        p2: number;
+    }
+    
+    interface I3 {
+        p3: number;
+    }
+    
+    var x = { p1: 10, p2: 20, p3: 30 };
+    var y: I1 & I3 = x;
+    var z: I2 = x;
+    
+    if (y === z || z === y) {
+        ~~~~~~~
+!!! error TS2365: Operator '===' cannot be applied to types 'I1 & I3' and 'I2'.
+                   ~~~~~~~
+!!! error TS2365: Operator '===' cannot be applied to types 'I2' and 'I1 & I3'.
+    }
+    else if (y !== z || z !== y) {
+             ~~~~~~~
+!!! error TS2365: Operator '!==' cannot be applied to types 'I1 & I3' and 'I2'.
+                        ~~~~~~~
+!!! error TS2365: Operator '!==' cannot be applied to types 'I2' and 'I1 & I3'.
+    }
+    else if (y == z || z == y) {
+             ~~~~~~
+!!! error TS2365: Operator '==' cannot be applied to types 'I1 & I3' and 'I2'.
+                       ~~~~~~
+!!! error TS2365: Operator '==' cannot be applied to types 'I2' and 'I1 & I3'.
+    }
+    else if (y != z || z != y) {
+             ~~~~~~
+!!! error TS2365: Operator '!=' cannot be applied to types 'I1 & I3' and 'I2'.
+                       ~~~~~~
+!!! error TS2365: Operator '!=' cannot be applied to types 'I2' and 'I1 & I3'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/equalityWithIntersectionTypes01.js b/tests/baselines/reference/equalityWithIntersectionTypes01.js
new file mode 100644
index 00000000000..151809bb6f8
--- /dev/null
+++ b/tests/baselines/reference/equalityWithIntersectionTypes01.js
@@ -0,0 +1,38 @@
+//// [equalityWithIntersectionTypes01.ts]
+interface I1 {
+    p1: number
+}
+
+interface I2 extends I1 {
+    p2: number;
+}
+
+interface I3 {
+    p3: number;
+}
+
+var x = { p1: 10, p2: 20, p3: 30 };
+var y: I1 & I3 = x;
+var z: I2 = x;
+
+if (y === z || z === y) {
+}
+else if (y !== z || z !== y) {
+}
+else if (y == z || z == y) {
+}
+else if (y != z || z != y) {
+}
+
+//// [equalityWithIntersectionTypes01.js]
+var x = { p1: 10, p2: 20, p3: 30 };
+var y = x;
+var z = x;
+if (y === z || z === y) {
+}
+else if (y !== z || z !== y) {
+}
+else if (y == z || z == y) {
+}
+else if (y != z || z != y) {
+}
diff --git a/tests/baselines/reference/equalityWithUnionTypes01.js b/tests/baselines/reference/equalityWithUnionTypes01.js
new file mode 100644
index 00000000000..05e9f25cd69
--- /dev/null
+++ b/tests/baselines/reference/equalityWithUnionTypes01.js
@@ -0,0 +1,34 @@
+//// [equalityWithUnionTypes01.ts]
+interface I1 {
+    p1: number
+}
+
+interface I2 extends I1 {
+    p2: number;
+}
+
+var x = { p1: 10, p2: 20 };
+var y: number | I2 = x;
+var z: I1 = x;
+
+if (y === z || z === y) {
+}
+else if (y !== z || z !== y) {
+}
+else if (y == z || z == y) {
+}
+else if (y != z || z != y) {
+}
+
+//// [equalityWithUnionTypes01.js]
+var x = { p1: 10, p2: 20 };
+var y = x;
+var z = x;
+if (y === z || z === y) {
+}
+else if (y !== z || z !== y) {
+}
+else if (y == z || z == y) {
+}
+else if (y != z || z != y) {
+}
diff --git a/tests/baselines/reference/equalityWithUnionTypes01.symbols b/tests/baselines/reference/equalityWithUnionTypes01.symbols
new file mode 100644
index 00000000000..0b1a6892517
--- /dev/null
+++ b/tests/baselines/reference/equalityWithUnionTypes01.symbols
@@ -0,0 +1,55 @@
+=== tests/cases/conformance/types/typeRelationships/comparable/equalityWithUnionTypes01.ts ===
+interface I1 {
+>I1 : Symbol(I1, Decl(equalityWithUnionTypes01.ts, 0, 0))
+
+    p1: number
+>p1 : Symbol(I1.p1, Decl(equalityWithUnionTypes01.ts, 0, 14))
+}
+
+interface I2 extends I1 {
+>I2 : Symbol(I2, Decl(equalityWithUnionTypes01.ts, 2, 1))
+>I1 : Symbol(I1, Decl(equalityWithUnionTypes01.ts, 0, 0))
+
+    p2: number;
+>p2 : Symbol(I2.p2, Decl(equalityWithUnionTypes01.ts, 4, 25))
+}
+
+var x = { p1: 10, p2: 20 };
+>x : Symbol(x, Decl(equalityWithUnionTypes01.ts, 8, 3))
+>p1 : Symbol(p1, Decl(equalityWithUnionTypes01.ts, 8, 9))
+>p2 : Symbol(p2, Decl(equalityWithUnionTypes01.ts, 8, 17))
+
+var y: number | I2 = x;
+>y : Symbol(y, Decl(equalityWithUnionTypes01.ts, 9, 3))
+>I2 : Symbol(I2, Decl(equalityWithUnionTypes01.ts, 2, 1))
+>x : Symbol(x, Decl(equalityWithUnionTypes01.ts, 8, 3))
+
+var z: I1 = x;
+>z : Symbol(z, Decl(equalityWithUnionTypes01.ts, 10, 3))
+>I1 : Symbol(I1, Decl(equalityWithUnionTypes01.ts, 0, 0))
+>x : Symbol(x, Decl(equalityWithUnionTypes01.ts, 8, 3))
+
+if (y === z || z === y) {
+>y : Symbol(y, Decl(equalityWithUnionTypes01.ts, 9, 3))
+>z : Symbol(z, Decl(equalityWithUnionTypes01.ts, 10, 3))
+>z : Symbol(z, Decl(equalityWithUnionTypes01.ts, 10, 3))
+>y : Symbol(y, Decl(equalityWithUnionTypes01.ts, 9, 3))
+}
+else if (y !== z || z !== y) {
+>y : Symbol(y, Decl(equalityWithUnionTypes01.ts, 9, 3))
+>z : Symbol(z, Decl(equalityWithUnionTypes01.ts, 10, 3))
+>z : Symbol(z, Decl(equalityWithUnionTypes01.ts, 10, 3))
+>y : Symbol(y, Decl(equalityWithUnionTypes01.ts, 9, 3))
+}
+else if (y == z || z == y) {
+>y : Symbol(y, Decl(equalityWithUnionTypes01.ts, 9, 3))
+>z : Symbol(z, Decl(equalityWithUnionTypes01.ts, 10, 3))
+>z : Symbol(z, Decl(equalityWithUnionTypes01.ts, 10, 3))
+>y : Symbol(y, Decl(equalityWithUnionTypes01.ts, 9, 3))
+}
+else if (y != z || z != y) {
+>y : Symbol(y, Decl(equalityWithUnionTypes01.ts, 9, 3))
+>z : Symbol(z, Decl(equalityWithUnionTypes01.ts, 10, 3))
+>z : Symbol(z, Decl(equalityWithUnionTypes01.ts, 10, 3))
+>y : Symbol(y, Decl(equalityWithUnionTypes01.ts, 9, 3))
+}
diff --git a/tests/baselines/reference/equalityWithUnionTypes01.types b/tests/baselines/reference/equalityWithUnionTypes01.types
new file mode 100644
index 00000000000..27bf01c048b
--- /dev/null
+++ b/tests/baselines/reference/equalityWithUnionTypes01.types
@@ -0,0 +1,70 @@
+=== tests/cases/conformance/types/typeRelationships/comparable/equalityWithUnionTypes01.ts ===
+interface I1 {
+>I1 : I1
+
+    p1: number
+>p1 : number
+}
+
+interface I2 extends I1 {
+>I2 : I2
+>I1 : I1
+
+    p2: number;
+>p2 : number
+}
+
+var x = { p1: 10, p2: 20 };
+>x : { p1: number; p2: number; }
+>{ p1: 10, p2: 20 } : { p1: number; p2: number; }
+>p1 : number
+>10 : number
+>p2 : number
+>20 : number
+
+var y: number | I2 = x;
+>y : number | I2
+>I2 : I2
+>x : { p1: number; p2: number; }
+
+var z: I1 = x;
+>z : I1
+>I1 : I1
+>x : { p1: number; p2: number; }
+
+if (y === z || z === y) {
+>y === z || z === y : boolean
+>y === z : boolean
+>y : number | I2
+>z : I1
+>z === y : boolean
+>z : I1
+>y : number | I2
+}
+else if (y !== z || z !== y) {
+>y !== z || z !== y : boolean
+>y !== z : boolean
+>y : number | I2
+>z : I1
+>z !== y : boolean
+>z : I1
+>y : number | I2
+}
+else if (y == z || z == y) {
+>y == z || z == y : boolean
+>y == z : boolean
+>y : number | I2
+>z : I1
+>z == y : boolean
+>z : I1
+>y : number | I2
+}
+else if (y != z || z != y) {
+>y != z || z != y : boolean
+>y != z : boolean
+>y : number | I2
+>z : I1
+>z != y : boolean
+>z : I1
+>y : number | I2
+}
diff --git a/tests/baselines/reference/errorMessagesIntersectionTypes01.errors.txt b/tests/baselines/reference/errorMessagesIntersectionTypes01.errors.txt
new file mode 100644
index 00000000000..6b36f29a63e
--- /dev/null
+++ b/tests/baselines/reference/errorMessagesIntersectionTypes01.errors.txt
@@ -0,0 +1,26 @@
+tests/cases/compiler/errorMessagesIntersectionTypes01.ts(14,5): error TS2322: Type '{ fooProp: string; } & Bar' is not assignable to type 'FooBar'.
+  Types of property 'fooProp' are incompatible.
+    Type 'string' is not assignable to type 'boolean'.
+
+
+==== tests/cases/compiler/errorMessagesIntersectionTypes01.ts (1 errors) ====
+    interface Foo {
+        fooProp: boolean;
+    }
+    
+    interface Bar {
+        barProp: string;
+    }
+    
+    interface FooBar extends Foo, Bar {
+    }
+    
+    declare function mixBar<T>(obj: T): T & Bar;
+    
+    let fooBar: FooBar = mixBar({
+        ~~~~~~
+!!! error TS2322: Type '{ fooProp: string; } & Bar' is not assignable to type 'FooBar'.
+!!! error TS2322:   Types of property 'fooProp' are incompatible.
+!!! error TS2322:     Type 'string' is not assignable to type 'boolean'.
+        fooProp: "frizzlebizzle"
+    });
\ No newline at end of file
diff --git a/tests/baselines/reference/errorMessagesIntersectionTypes01.js b/tests/baselines/reference/errorMessagesIntersectionTypes01.js
new file mode 100644
index 00000000000..d0cd23ac53d
--- /dev/null
+++ b/tests/baselines/reference/errorMessagesIntersectionTypes01.js
@@ -0,0 +1,22 @@
+//// [errorMessagesIntersectionTypes01.ts]
+interface Foo {
+    fooProp: boolean;
+}
+
+interface Bar {
+    barProp: string;
+}
+
+interface FooBar extends Foo, Bar {
+}
+
+declare function mixBar<T>(obj: T): T & Bar;
+
+let fooBar: FooBar = mixBar({
+    fooProp: "frizzlebizzle"
+});
+
+//// [errorMessagesIntersectionTypes01.js]
+var fooBar = mixBar({
+    fooProp: "frizzlebizzle"
+});
diff --git a/tests/baselines/reference/errorMessagesIntersectionTypes02.errors.txt b/tests/baselines/reference/errorMessagesIntersectionTypes02.errors.txt
new file mode 100644
index 00000000000..6a9dd26706c
--- /dev/null
+++ b/tests/baselines/reference/errorMessagesIntersectionTypes02.errors.txt
@@ -0,0 +1,26 @@
+tests/cases/compiler/errorMessagesIntersectionTypes02.ts(14,5): error TS2322: Type '{ fooProp: string; } & Bar' is not assignable to type 'FooBar'.
+  Types of property 'fooProp' are incompatible.
+    Type 'string' is not assignable to type '"hello" | "world"'.
+
+
+==== tests/cases/compiler/errorMessagesIntersectionTypes02.ts (1 errors) ====
+    interface Foo {
+        fooProp: "hello" | "world";
+    }
+    
+    interface Bar {
+        barProp: string;
+    }
+    
+    interface FooBar extends Foo, Bar {
+    }
+    
+    declare function mixBar<T>(obj: T): T & Bar;
+    
+    let fooBar: FooBar = mixBar({
+        ~~~~~~
+!!! error TS2322: Type '{ fooProp: string; } & Bar' is not assignable to type 'FooBar'.
+!!! error TS2322:   Types of property 'fooProp' are incompatible.
+!!! error TS2322:     Type 'string' is not assignable to type '"hello" | "world"'.
+        fooProp: "frizzlebizzle"
+    });
\ No newline at end of file
diff --git a/tests/baselines/reference/errorMessagesIntersectionTypes02.js b/tests/baselines/reference/errorMessagesIntersectionTypes02.js
new file mode 100644
index 00000000000..c5c24031877
--- /dev/null
+++ b/tests/baselines/reference/errorMessagesIntersectionTypes02.js
@@ -0,0 +1,22 @@
+//// [errorMessagesIntersectionTypes02.ts]
+interface Foo {
+    fooProp: "hello" | "world";
+}
+
+interface Bar {
+    barProp: string;
+}
+
+interface FooBar extends Foo, Bar {
+}
+
+declare function mixBar<T>(obj: T): T & Bar;
+
+let fooBar: FooBar = mixBar({
+    fooProp: "frizzlebizzle"
+});
+
+//// [errorMessagesIntersectionTypes02.js]
+var fooBar = mixBar({
+    fooProp: "frizzlebizzle"
+});
diff --git a/tests/baselines/reference/errorMessagesIntersectionTypes03.errors.txt b/tests/baselines/reference/errorMessagesIntersectionTypes03.errors.txt
new file mode 100644
index 00000000000..e37ff82aa7b
--- /dev/null
+++ b/tests/baselines/reference/errorMessagesIntersectionTypes03.errors.txt
@@ -0,0 +1,42 @@
+tests/cases/compiler/errorMessagesIntersectionTypes03.ts(17,5): error TS2322: Type 'A & B' is not assignable to type 'T'.
+tests/cases/compiler/errorMessagesIntersectionTypes03.ts(18,5): error TS2322: Type 'A & B' is not assignable to type 'U'.
+tests/cases/compiler/errorMessagesIntersectionTypes03.ts(19,5): error TS2322: Type 'A & B' is not assignable to type 'V'.
+tests/cases/compiler/errorMessagesIntersectionTypes03.ts(22,5): error TS2322: Type 'T & B' is not assignable to type 'U'.
+tests/cases/compiler/errorMessagesIntersectionTypes03.ts(23,5): error TS2322: Type 'T & B' is not assignable to type 'V'.
+
+
+==== tests/cases/compiler/errorMessagesIntersectionTypes03.ts (5 errors) ====
+    interface A {
+        a;
+    }
+    
+    interface B {
+        b;
+    }
+    
+    function f<T, U extends A, V extends U>(): void {
+        let t: T;
+        let u: U;
+        let v: V;
+    
+        let a_and_b: A & B;
+        let t_and_b: T & B;
+    
+        t = a_and_b;
+        ~
+!!! error TS2322: Type 'A & B' is not assignable to type 'T'.
+        u = a_and_b;
+        ~
+!!! error TS2322: Type 'A & B' is not assignable to type 'U'.
+        v = a_and_b;
+        ~
+!!! error TS2322: Type 'A & B' is not assignable to type 'V'.
+    
+        t = t_and_b;
+        u = t_and_b;
+        ~
+!!! error TS2322: Type 'T & B' is not assignable to type 'U'.
+        v = t_and_b;
+        ~
+!!! error TS2322: Type 'T & B' is not assignable to type 'V'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/errorMessagesIntersectionTypes03.js b/tests/baselines/reference/errorMessagesIntersectionTypes03.js
new file mode 100644
index 00000000000..278b81a329a
--- /dev/null
+++ b/tests/baselines/reference/errorMessagesIntersectionTypes03.js
@@ -0,0 +1,40 @@
+//// [errorMessagesIntersectionTypes03.ts]
+interface A {
+    a;
+}
+
+interface B {
+    b;
+}
+
+function f<T, U extends A, V extends U>(): void {
+    let t: T;
+    let u: U;
+    let v: V;
+
+    let a_and_b: A & B;
+    let t_and_b: T & B;
+
+    t = a_and_b;
+    u = a_and_b;
+    v = a_and_b;
+
+    t = t_and_b;
+    u = t_and_b;
+    v = t_and_b;
+}
+
+//// [errorMessagesIntersectionTypes03.js]
+function f() {
+    var t;
+    var u;
+    var v;
+    var a_and_b;
+    var t_and_b;
+    t = a_and_b;
+    u = a_and_b;
+    v = a_and_b;
+    t = t_and_b;
+    u = t_and_b;
+    v = t_and_b;
+}
diff --git a/tests/baselines/reference/errorMessagesIntersectionTypes04.errors.txt b/tests/baselines/reference/errorMessagesIntersectionTypes04.errors.txt
new file mode 100644
index 00000000000..7582c68ecec
--- /dev/null
+++ b/tests/baselines/reference/errorMessagesIntersectionTypes04.errors.txt
@@ -0,0 +1,37 @@
+tests/cases/compiler/errorMessagesIntersectionTypes04.ts(17,5): error TS2322: Type 'A & B' is not assignable to type 'number'.
+tests/cases/compiler/errorMessagesIntersectionTypes04.ts(18,5): error TS2322: Type 'A & B' is not assignable to type 'boolean'.
+tests/cases/compiler/errorMessagesIntersectionTypes04.ts(19,5): error TS2322: Type 'A & B' is not assignable to type 'string'.
+tests/cases/compiler/errorMessagesIntersectionTypes04.ts(21,5): error TS2322: Type 'number & boolean' is not assignable to type 'string'.
+
+
+==== tests/cases/compiler/errorMessagesIntersectionTypes04.ts (4 errors) ====
+    interface A {
+        a;
+    }
+    
+    interface B {
+        b;
+    }
+    
+    function f<T, U extends A, V extends U>(): void {
+        let num: number;
+        let bool: boolean;
+        let str: string;
+    
+        let a_and_b: A & B;
+        let num_and_bool: number & boolean;
+    
+        num = a_and_b;
+        ~~~
+!!! error TS2322: Type 'A & B' is not assignable to type 'number'.
+        bool = a_and_b;
+        ~~~~
+!!! error TS2322: Type 'A & B' is not assignable to type 'boolean'.
+        str = a_and_b;
+        ~~~
+!!! error TS2322: Type 'A & B' is not assignable to type 'string'.
+    
+        str = num_and_bool;
+        ~~~
+!!! error TS2322: Type 'number & boolean' is not assignable to type 'string'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/errorMessagesIntersectionTypes04.js b/tests/baselines/reference/errorMessagesIntersectionTypes04.js
new file mode 100644
index 00000000000..f663e1a7907
--- /dev/null
+++ b/tests/baselines/reference/errorMessagesIntersectionTypes04.js
@@ -0,0 +1,36 @@
+//// [errorMessagesIntersectionTypes04.ts]
+interface A {
+    a;
+}
+
+interface B {
+    b;
+}
+
+function f<T, U extends A, V extends U>(): void {
+    let num: number;
+    let bool: boolean;
+    let str: string;
+
+    let a_and_b: A & B;
+    let num_and_bool: number & boolean;
+
+    num = a_and_b;
+    bool = a_and_b;
+    str = a_and_b;
+
+    str = num_and_bool;
+}
+
+//// [errorMessagesIntersectionTypes04.js]
+function f() {
+    var num;
+    var bool;
+    var str;
+    var a_and_b;
+    var num_and_bool;
+    num = a_and_b;
+    bool = a_and_b;
+    str = a_and_b;
+    str = num_and_bool;
+}
diff --git a/tests/baselines/reference/errorSuperCalls.js b/tests/baselines/reference/errorSuperCalls.js
index 097b16b3024..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 () {
diff --git a/tests/baselines/reference/errorSuperPropertyAccess.errors.txt b/tests/baselines/reference/errorSuperPropertyAccess.errors.txt
index c54ace99f17..7fd6e467eaf 100644
--- a/tests/baselines/reference/errorSuperPropertyAccess.errors.txt
+++ b/tests/baselines/reference/errorSuperPropertyAccess.errors.txt
@@ -25,15 +25,15 @@ tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess
 tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(99,19): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
 tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(109,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
 tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(110,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(111,9): error TS2341: Property 'privateStaticFunc' is private and only accessible within class 'SomeBase'.
+tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(111,15): error TS2341: Property 'privateStaticFunc' is private and only accessible within class 'SomeBase'.
 tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(113,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(114,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
 tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(115,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(116,9): error TS2341: Property 'privateStaticFunc' is private and only accessible within class 'SomeBase'.
+tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(116,15): error TS2341: Property 'privateStaticFunc' is private and only accessible within class 'SomeBase'.
 tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(119,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(120,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
 tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(121,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(122,9): error TS2341: Property 'privateStaticFunc' is private and only accessible within class 'SomeBase'.
+tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(122,15): error TS2341: Property 'privateStaticFunc' is private and only accessible within class 'SomeBase'.
 tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(127,16): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions.
 tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess.ts(127,30): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions.
 
@@ -204,7 +204,7 @@ tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess
                   ~~~~~~~~~~~~~~~~~~~
 !!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
             super.privateStaticFunc();
-            ~~~~~~~~~~~~~~~~~~~~~~~
+                  ~~~~~~~~~~~~~~~~~
 !!! error TS2341: Property 'privateStaticFunc' is private and only accessible within class 'SomeBase'.
         }
         static get a() {
@@ -217,7 +217,7 @@ tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess
                   ~~~~~~~~~~~~~~~~~~~
 !!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
             super.privateStaticFunc();
-            ~~~~~~~~~~~~~~~~~~~~~~~
+                  ~~~~~~~~~~~~~~~~~
 !!! error TS2341: Property 'privateStaticFunc' is private and only accessible within class 'SomeBase'.
             return '';
         }
@@ -231,7 +231,7 @@ tests/cases/conformance/expressions/superPropertyAccess/errorSuperPropertyAccess
                   ~~~~~~~~~~~~~~~~~~~
 !!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
             super.privateStaticFunc();
-            ~~~~~~~~~~~~~~~~~~~~~~~
+                  ~~~~~~~~~~~~~~~~~
 !!! error TS2341: Property 'privateStaticFunc' is private and only accessible within class 'SomeBase'.
         }
     }
diff --git a/tests/baselines/reference/es2015modulekind.symbols b/tests/baselines/reference/es2015modulekind.symbols
index 227443ac06b..8a772e31895 100644
--- a/tests/baselines/reference/es2015modulekind.symbols
+++ b/tests/baselines/reference/es2015modulekind.symbols
@@ -9,7 +9,7 @@ export default class A
     }
 
     public B()
->B : Symbol(B, Decl(es2015modulekind.ts, 6, 5))
+>B : Symbol(A.B, Decl(es2015modulekind.ts, 6, 5))
     {
         return 42;
     }
diff --git a/tests/baselines/reference/es2015modulekindWithES6Target.symbols b/tests/baselines/reference/es2015modulekindWithES6Target.symbols
index 2ff208ac704..4a7c6469ca5 100644
--- a/tests/baselines/reference/es2015modulekindWithES6Target.symbols
+++ b/tests/baselines/reference/es2015modulekindWithES6Target.symbols
@@ -9,7 +9,7 @@ export default class A
     }
 
     public B()
->B : Symbol(B, Decl(es2015modulekindWithES6Target.ts, 6, 5))
+>B : Symbol(A.B, Decl(es2015modulekindWithES6Target.ts, 6, 5))
     {
         return 42;
     }
diff --git a/tests/baselines/reference/es3-amd.symbols b/tests/baselines/reference/es3-amd.symbols
index f6d1211ad4e..1f9efe3e590 100644
--- a/tests/baselines/reference/es3-amd.symbols
+++ b/tests/baselines/reference/es3-amd.symbols
@@ -9,7 +9,7 @@ class A
     }
 
     public B()
->B : Symbol(B, Decl(es3-amd.ts, 6, 5))
+>B : Symbol(A.B, Decl(es3-amd.ts, 6, 5))
     {
         return 42;
     }
diff --git a/tests/baselines/reference/es3-declaration-amd.symbols b/tests/baselines/reference/es3-declaration-amd.symbols
index aec4af2bb60..5930b908e2f 100644
--- a/tests/baselines/reference/es3-declaration-amd.symbols
+++ b/tests/baselines/reference/es3-declaration-amd.symbols
@@ -9,7 +9,7 @@ class A
     }
 
     public B()
->B : Symbol(B, Decl(es3-declaration-amd.ts, 6, 5))
+>B : Symbol(A.B, Decl(es3-declaration-amd.ts, 6, 5))
     {
         return 42;
     }
diff --git a/tests/baselines/reference/es3-sourcemap-amd.symbols b/tests/baselines/reference/es3-sourcemap-amd.symbols
index ca20348a0f5..919e2cfa46c 100644
--- a/tests/baselines/reference/es3-sourcemap-amd.symbols
+++ b/tests/baselines/reference/es3-sourcemap-amd.symbols
@@ -9,7 +9,7 @@ class A
     }
 
     public B()
->B : Symbol(B, Decl(es3-sourcemap-amd.ts, 6, 5))
+>B : Symbol(A.B, Decl(es3-sourcemap-amd.ts, 6, 5))
     {
         return 42;
     }
diff --git a/tests/baselines/reference/es3defaultAliasIsQuoted.js b/tests/baselines/reference/es3defaultAliasIsQuoted.js
index 89fd0c47a7e..2ce6113b4fe 100644
--- a/tests/baselines/reference/es3defaultAliasIsQuoted.js
+++ b/tests/baselines/reference/es3defaultAliasIsQuoted.js
@@ -21,8 +21,8 @@ var Foo = (function () {
     }
     return Foo;
 }());
-Foo.CONSTANT = "Foo";
 exports.Foo = Foo;
+Foo.CONSTANT = "Foo";
 function assert(value) {
     if (!value)
         throw new Error("Assertion failed!");
diff --git a/tests/baselines/reference/es5-amd.symbols b/tests/baselines/reference/es5-amd.symbols
index cf99349fc1d..33ed9bc6423 100644
--- a/tests/baselines/reference/es5-amd.symbols
+++ b/tests/baselines/reference/es5-amd.symbols
@@ -9,7 +9,7 @@ class A
     }
 
     public B()
->B : Symbol(B, Decl(es5-amd.ts, 6, 5))
+>B : Symbol(A.B, Decl(es5-amd.ts, 6, 5))
     {
         return 42;
     }
diff --git a/tests/baselines/reference/es5-commonjs.symbols b/tests/baselines/reference/es5-commonjs.symbols
index 41e4484afcd..a2319b14ce7 100644
--- a/tests/baselines/reference/es5-commonjs.symbols
+++ b/tests/baselines/reference/es5-commonjs.symbols
@@ -9,7 +9,7 @@ export default class A
     }
 
     public B()
->B : Symbol(B, Decl(es5-commonjs.ts, 6, 5))
+>B : Symbol(A.B, Decl(es5-commonjs.ts, 6, 5))
     {
         return 42;
     }
diff --git a/tests/baselines/reference/es5-commonjs4.symbols b/tests/baselines/reference/es5-commonjs4.symbols
index 22d41128d74..83006bd9aa5 100644
--- a/tests/baselines/reference/es5-commonjs4.symbols
+++ b/tests/baselines/reference/es5-commonjs4.symbols
@@ -9,7 +9,7 @@ export default class A
     }
 
     public B()
->B : Symbol(B, Decl(es5-commonjs4.ts, 6, 5))
+>B : Symbol(A.B, Decl(es5-commonjs4.ts, 6, 5))
     {
         return 42;
     }
diff --git a/tests/baselines/reference/es5-declaration-amd.symbols b/tests/baselines/reference/es5-declaration-amd.symbols
index a2504a0ea84..0df2ad428f0 100644
--- a/tests/baselines/reference/es5-declaration-amd.symbols
+++ b/tests/baselines/reference/es5-declaration-amd.symbols
@@ -9,7 +9,7 @@ class A
     }
 
     public B()
->B : Symbol(B, Decl(es5-declaration-amd.ts, 6, 5))
+>B : Symbol(A.B, Decl(es5-declaration-amd.ts, 6, 5))
     {
         return 42;
     }
diff --git a/tests/baselines/reference/es5-souremap-amd.symbols b/tests/baselines/reference/es5-souremap-amd.symbols
index 14b22cc74c6..c725434096d 100644
--- a/tests/baselines/reference/es5-souremap-amd.symbols
+++ b/tests/baselines/reference/es5-souremap-amd.symbols
@@ -9,7 +9,7 @@ class A
     }
 
     public B()
->B : Symbol(B, Decl(es5-souremap-amd.ts, 6, 5))
+>B : Symbol(A.B, Decl(es5-souremap-amd.ts, 6, 5))
     {
         return 42;
     }
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-system.symbols b/tests/baselines/reference/es5-system.symbols
index 5211e3c4259..f2c4b38aba2 100644
--- a/tests/baselines/reference/es5-system.symbols
+++ b/tests/baselines/reference/es5-system.symbols
@@ -9,7 +9,7 @@ export default class A
     }
 
     public B()
->B : Symbol(B, Decl(es5-system.ts, 6, 5))
+>B : Symbol(A.B, Decl(es5-system.ts, 6, 5))
     {
         return 42;
     }
diff --git a/tests/baselines/reference/es5-umd.symbols b/tests/baselines/reference/es5-umd.symbols
index f570afd9548..73dd7ebbe5b 100644
--- a/tests/baselines/reference/es5-umd.symbols
+++ b/tests/baselines/reference/es5-umd.symbols
@@ -9,7 +9,7 @@ class A
     }
 
     public B()
->B : Symbol(B, Decl(es5-umd.ts, 6, 5))
+>B : Symbol(A.B, Decl(es5-umd.ts, 6, 5))
     {
         return 42;
     }
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-umd2.symbols b/tests/baselines/reference/es5-umd2.symbols
index 3b911d7e6f0..f017c6b72db 100644
--- a/tests/baselines/reference/es5-umd2.symbols
+++ b/tests/baselines/reference/es5-umd2.symbols
@@ -9,7 +9,7 @@ export class A
     }
 
     public B()
->B : Symbol(B, Decl(es5-umd2.ts, 6, 5))
+>B : Symbol(A.B, Decl(es5-umd2.ts, 6, 5))
     {
         return 42;
     }
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-umd3.symbols b/tests/baselines/reference/es5-umd3.symbols
index 3f830ae3637..ca0203b029c 100644
--- a/tests/baselines/reference/es5-umd3.symbols
+++ b/tests/baselines/reference/es5-umd3.symbols
@@ -9,7 +9,7 @@ export default class A
     }
 
     public B()
->B : Symbol(B, Decl(es5-umd3.ts, 6, 5))
+>B : Symbol(A.B, Decl(es5-umd3.ts, 6, 5))
     {
         return 42;
     }
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/es5-umd4.symbols b/tests/baselines/reference/es5-umd4.symbols
index cdf1e135cf7..790c8cccb97 100644
--- a/tests/baselines/reference/es5-umd4.symbols
+++ b/tests/baselines/reference/es5-umd4.symbols
@@ -9,7 +9,7 @@ class A
     }
 
     public B()
->B : Symbol(B, Decl(es5-umd4.ts, 6, 5))
+>B : Symbol(A.B, Decl(es5-umd4.ts, 6, 5))
     {
         return 42;
     }
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration.symbols b/tests/baselines/reference/es5ExportDefaultClassDeclaration.symbols
index 24196766dfa..8aaa8a4e532 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration.symbols
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration.symbols
@@ -4,6 +4,6 @@ export default class C {
 >C : Symbol(C, Decl(es5ExportDefaultClassDeclaration.ts, 0, 0))
 
     method() { }
->method : Symbol(method, Decl(es5ExportDefaultClassDeclaration.ts, 1, 24))
+>method : Symbol(C.method, Decl(es5ExportDefaultClassDeclaration.ts, 1, 24))
 }
 
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.symbols b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.symbols
index 0780ff7a3c8..05947d5a557 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.symbols
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.symbols
@@ -2,6 +2,6 @@
 
 export default class {
     method() { }
->method : Symbol(method, Decl(es5ExportDefaultClassDeclaration2.ts, 1, 22))
+>method : Symbol(default.method, Decl(es5ExportDefaultClassDeclaration2.ts, 1, 22))
 }
 
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.symbols b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.symbols
index b5262b94688..d5c8243161b 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.symbols
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.symbols
@@ -9,7 +9,7 @@ export default class C {
 >C : Symbol(C, Decl(es5ExportDefaultClassDeclaration3.ts, 1, 24))
 
     method(): C {
->method : Symbol(method, Decl(es5ExportDefaultClassDeclaration3.ts, 3, 24))
+>method : Symbol(C.method, Decl(es5ExportDefaultClassDeclaration3.ts, 3, 24))
 >C : Symbol(C, Decl(es5ExportDefaultClassDeclaration3.ts, 1, 24))
 
         return new C();
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration4.symbols b/tests/baselines/reference/es5ExportDefaultClassDeclaration4.symbols
index 6c30ffed858..15faf638ca1 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration4.symbols
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration4.symbols
@@ -9,7 +9,7 @@ declare module "foo" {
 >C : Symbol(C, Decl(es5ExportDefaultClassDeclaration4.ts, 2, 25))
 
         method(): C;
->method : Symbol(method, Decl(es5ExportDefaultClassDeclaration4.ts, 4, 28))
+>method : Symbol(C.method, Decl(es5ExportDefaultClassDeclaration4.ts, 4, 28))
 >C : Symbol(C, Decl(es5ExportDefaultClassDeclaration4.ts, 2, 25))
     }
 
diff --git a/tests/baselines/reference/es5ExportEqualsDts.symbols b/tests/baselines/reference/es5ExportEqualsDts.symbols
index 52bf357d177..46bc29b58dd 100644
--- a/tests/baselines/reference/es5ExportEqualsDts.symbols
+++ b/tests/baselines/reference/es5ExportEqualsDts.symbols
@@ -4,7 +4,7 @@ class A {
 >A : Symbol(A, Decl(es5ExportEqualsDts.ts, 0, 0), Decl(es5ExportEqualsDts.ts, 6, 1))
 
     foo() {
->foo : Symbol(foo, Decl(es5ExportEqualsDts.ts, 1, 9))
+>foo : Symbol(A.foo, Decl(es5ExportEqualsDts.ts, 1, 9))
 
         var aVal: A.B;
 >aVal : Symbol(aVal, Decl(es5ExportEqualsDts.ts, 3, 11))
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/es5ModuleWithModuleGenAmd.symbols b/tests/baselines/reference/es5ModuleWithModuleGenAmd.symbols
index 1a853eb37d0..b9df217a403 100644
--- a/tests/baselines/reference/es5ModuleWithModuleGenAmd.symbols
+++ b/tests/baselines/reference/es5ModuleWithModuleGenAmd.symbols
@@ -7,7 +7,7 @@ export class A
     }
 
     public B()
->B : Symbol(B, Decl(es5ModuleWithModuleGenAmd.ts, 4, 5))
+>B : Symbol(A.B, Decl(es5ModuleWithModuleGenAmd.ts, 4, 5))
     {
         return 42;
     }
diff --git a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.symbols b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.symbols
index a69ce05f1ae..9917d5c3713 100644
--- a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.symbols
+++ b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.symbols
@@ -7,7 +7,7 @@ export class A
     }
 
     public B()
->B : Symbol(B, Decl(es5ModuleWithModuleGenCommonjs.ts, 4, 5))
+>B : Symbol(A.B, Decl(es5ModuleWithModuleGenCommonjs.ts, 4, 5))
     {
         return 42;
     }
diff --git a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.errors.txt b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.errors.txt
deleted file mode 100644
index 90f10087194..00000000000
--- a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-tests/cases/compiler/es5ModuleWithoutModuleGenTarget.ts(1,14): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-
-
-==== tests/cases/compiler/es5ModuleWithoutModuleGenTarget.ts (1 errors) ====
-    export class A
-                 ~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-    {
-        constructor ()
-        {
-        }
-    
-        public B()
-        {
-            return 42;
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.symbols b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.symbols
new file mode 100644
index 00000000000..436e4a5351a
--- /dev/null
+++ b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.symbols
@@ -0,0 +1,14 @@
+=== tests/cases/compiler/es5ModuleWithoutModuleGenTarget.ts ===
+export class A
+>A : Symbol(A, Decl(es5ModuleWithoutModuleGenTarget.ts, 0, 0))
+{
+    constructor ()
+    {
+    }
+
+    public B()
+>B : Symbol(A.B, Decl(es5ModuleWithoutModuleGenTarget.ts, 4, 5))
+    {
+        return 42;
+    }
+}
diff --git a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.types b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.types
new file mode 100644
index 00000000000..251e2be25a9
--- /dev/null
+++ b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.types
@@ -0,0 +1,15 @@
+=== tests/cases/compiler/es5ModuleWithoutModuleGenTarget.ts ===
+export class A
+>A : A
+{
+    constructor ()
+    {
+    }
+
+    public B()
+>B : () => number
+    {
+        return 42;
+>42 : number
+    }
+}
diff --git a/tests/baselines/reference/es5andes6module.js b/tests/baselines/reference/es5andes6module.js
index a6ca59befbf..148464a212a 100644
--- a/tests/baselines/reference/es5andes6module.js
+++ b/tests/baselines/reference/es5andes6module.js
@@ -23,4 +23,3 @@ var A = (function () {
     };
     return A;
 }());
-exports.default = A;
diff --git a/tests/baselines/reference/es6-amd.symbols b/tests/baselines/reference/es6-amd.symbols
index ad5cf38e7cd..fb9b1c57b27 100644
--- a/tests/baselines/reference/es6-amd.symbols
+++ b/tests/baselines/reference/es6-amd.symbols
@@ -9,7 +9,7 @@ class A
     }
 
     public B()
->B : Symbol(B, Decl(es6-amd.ts, 6, 5))
+>B : Symbol(A.B, Decl(es6-amd.ts, 6, 5))
     {
         return 42;
     }
diff --git a/tests/baselines/reference/es6-declaration-amd.symbols b/tests/baselines/reference/es6-declaration-amd.symbols
index f1a728396cc..6811dfe793d 100644
--- a/tests/baselines/reference/es6-declaration-amd.symbols
+++ b/tests/baselines/reference/es6-declaration-amd.symbols
@@ -9,7 +9,7 @@ class A
     }
 
     public B()
->B : Symbol(B, Decl(es6-declaration-amd.ts, 6, 5))
+>B : Symbol(A.B, Decl(es6-declaration-amd.ts, 6, 5))
     {
         return 42;
     }
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-sourcemap-amd.symbols b/tests/baselines/reference/es6-sourcemap-amd.symbols
index 13be6367ba0..e5f731234f3 100644
--- a/tests/baselines/reference/es6-sourcemap-amd.symbols
+++ b/tests/baselines/reference/es6-sourcemap-amd.symbols
@@ -9,7 +9,7 @@ class A
     }
 
     public B()
->B : Symbol(B, Decl(es6-sourcemap-amd.ts, 6, 5))
+>B : Symbol(A.B, Decl(es6-sourcemap-amd.ts, 6, 5))
     {
         return 42;
     }
diff --git a/tests/baselines/reference/es6-umd.symbols b/tests/baselines/reference/es6-umd.symbols
index f7c57215ea6..50584887fb3 100644
--- a/tests/baselines/reference/es6-umd.symbols
+++ b/tests/baselines/reference/es6-umd.symbols
@@ -9,7 +9,7 @@ class A
     }
 
     public B()
->B : Symbol(B, Decl(es6-umd.ts, 6, 5))
+>B : Symbol(A.B, Decl(es6-umd.ts, 6, 5))
     {
         return 42;
     }
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/es6-umd2.symbols b/tests/baselines/reference/es6-umd2.symbols
index 88acf127279..d998e4b68ee 100644
--- a/tests/baselines/reference/es6-umd2.symbols
+++ b/tests/baselines/reference/es6-umd2.symbols
@@ -9,7 +9,7 @@ export class A
     }
 
     public B()
->B : Symbol(B, Decl(es6-umd2.ts, 6, 5))
+>B : Symbol(A.B, Decl(es6-umd2.ts, 6, 5))
     {
         return 42;
     }
diff --git a/tests/baselines/reference/es6ClassTest3.symbols b/tests/baselines/reference/es6ClassTest3.symbols
index cf2284e95ee..94404b6777a 100644
--- a/tests/baselines/reference/es6ClassTest3.symbols
+++ b/tests/baselines/reference/es6ClassTest3.symbols
@@ -6,30 +6,30 @@ module M {
 >Visibility : Symbol(Visibility, Decl(es6ClassTest3.ts, 0, 10))
 
 	    public foo() { };
->foo : Symbol(foo, Decl(es6ClassTest3.ts, 1, 19))
+>foo : Symbol(Visibility.foo, Decl(es6ClassTest3.ts, 1, 19))
 
 	    private bar() { };
->bar : Symbol(bar, Decl(es6ClassTest3.ts, 2, 22))
+>bar : Symbol(Visibility.bar, Decl(es6ClassTest3.ts, 2, 22))
 
         private x: number;
->x : Symbol(x, Decl(es6ClassTest3.ts, 3, 23))
+>x : Symbol(Visibility.x, Decl(es6ClassTest3.ts, 3, 23))
 
 	    public y: number;
->y : Symbol(y, Decl(es6ClassTest3.ts, 4, 26))
+>y : Symbol(Visibility.y, Decl(es6ClassTest3.ts, 4, 26))
 
 	    public z: number;
->z : Symbol(z, Decl(es6ClassTest3.ts, 5, 22))
+>z : Symbol(Visibility.z, Decl(es6ClassTest3.ts, 5, 22))
 
 	    constructor() {
 	        this.x = 1;
->this.x : Symbol(x, Decl(es6ClassTest3.ts, 3, 23))
+>this.x : Symbol(Visibility.x, Decl(es6ClassTest3.ts, 3, 23))
 >this : Symbol(Visibility, Decl(es6ClassTest3.ts, 0, 10))
->x : Symbol(x, Decl(es6ClassTest3.ts, 3, 23))
+>x : Symbol(Visibility.x, Decl(es6ClassTest3.ts, 3, 23))
 
 	        this.y = 2;
->this.y : Symbol(y, Decl(es6ClassTest3.ts, 4, 26))
+>this.y : Symbol(Visibility.y, Decl(es6ClassTest3.ts, 4, 26))
 >this : Symbol(Visibility, Decl(es6ClassTest3.ts, 0, 10))
->y : Symbol(y, Decl(es6ClassTest3.ts, 4, 26))
+>y : Symbol(Visibility.y, Decl(es6ClassTest3.ts, 4, 26))
 	    }
 	}
 }
diff --git a/tests/baselines/reference/es6ClassTest4.symbols b/tests/baselines/reference/es6ClassTest4.symbols
index 41a329a3d51..e9dd7513fed 100644
--- a/tests/baselines/reference/es6ClassTest4.symbols
+++ b/tests/baselines/reference/es6ClassTest4.symbols
@@ -3,19 +3,19 @@ declare class Point
 >Point : Symbol(Point, Decl(es6ClassTest4.ts, 0, 0))
 {
     x: number;
->x : Symbol(x, Decl(es6ClassTest4.ts, 1, 1))
+>x : Symbol(Point.x, Decl(es6ClassTest4.ts, 1, 1))
 
     y: number;
->y : Symbol(y, Decl(es6ClassTest4.ts, 2, 14))
+>y : Symbol(Point.y, Decl(es6ClassTest4.ts, 2, 14))
 
     add(dx: number, dy: number): Point;
->add : Symbol(add, Decl(es6ClassTest4.ts, 3, 14))
+>add : Symbol(Point.add, Decl(es6ClassTest4.ts, 3, 14))
 >dx : Symbol(dx, Decl(es6ClassTest4.ts, 4, 8))
 >dy : Symbol(dy, Decl(es6ClassTest4.ts, 4, 19))
 >Point : Symbol(Point, Decl(es6ClassTest4.ts, 0, 0))
 
     mult(p: Point): Point;
->mult : Symbol(mult, Decl(es6ClassTest4.ts, 4, 39))
+>mult : Symbol(Point.mult, Decl(es6ClassTest4.ts, 4, 39))
 >p : Symbol(p, Decl(es6ClassTest4.ts, 5, 9))
 >Point : Symbol(Point, Decl(es6ClassTest4.ts, 0, 0))
 >Point : Symbol(Point, Decl(es6ClassTest4.ts, 0, 0))
diff --git a/tests/baselines/reference/es6ClassTest5.symbols b/tests/baselines/reference/es6ClassTest5.symbols
index 89c6921e163..063265e0dad 100644
--- a/tests/baselines/reference/es6ClassTest5.symbols
+++ b/tests/baselines/reference/es6ClassTest5.symbols
@@ -3,7 +3,7 @@ class C1T5 {
 >C1T5 : Symbol(C1T5, Decl(es6ClassTest5.ts, 0, 0))
 
     foo: (i: number, s: string) => number = 
->foo : Symbol(foo, Decl(es6ClassTest5.ts, 0, 12))
+>foo : Symbol(C1T5.foo, Decl(es6ClassTest5.ts, 0, 12))
 >i : Symbol(i, Decl(es6ClassTest5.ts, 1, 10))
 >s : Symbol(s, Decl(es6ClassTest5.ts, 1, 20))
 
@@ -21,6 +21,6 @@ class  bigClass {
 >bigClass : Symbol(bigClass, Decl(es6ClassTest5.ts, 6, 14))
 
      public break = 1;
->break : Symbol(break, Decl(es6ClassTest5.ts, 8, 17))
+>break : Symbol(bigClass.break, Decl(es6ClassTest5.ts, 8, 17))
 }
 
diff --git a/tests/baselines/reference/es6ClassTest8.symbols b/tests/baselines/reference/es6ClassTest8.symbols
index b02b80e7017..3894b884a1f 100644
--- a/tests/baselines/reference/es6ClassTest8.symbols
+++ b/tests/baselines/reference/es6ClassTest8.symbols
@@ -58,13 +58,13 @@ class Vector {
 >Vector : Symbol(Vector, Decl(es6ClassTest8.ts, 10, 1))
 
     constructor(public x: number,
->x : Symbol(x, Decl(es6ClassTest8.ts, 18, 16))
+>x : Symbol(Vector.x, Decl(es6ClassTest8.ts, 18, 16))
 
                 public y: number,
->y : Symbol(y, Decl(es6ClassTest8.ts, 18, 33))
+>y : Symbol(Vector.y, Decl(es6ClassTest8.ts, 18, 33))
 
                 public z: number) { 
->z : Symbol(z, Decl(es6ClassTest8.ts, 19, 33))
+>z : Symbol(Vector.z, Decl(es6ClassTest8.ts, 19, 33))
     }
 
     static dot(v1:Vector, v2:Vector):Vector {return null;}    
@@ -81,19 +81,19 @@ class Camera {
 >Camera : Symbol(Camera, Decl(es6ClassTest8.ts, 25, 1))
 
     public forward: Vector;
->forward : Symbol(forward, Decl(es6ClassTest8.ts, 27, 14))
+>forward : Symbol(Camera.forward, Decl(es6ClassTest8.ts, 27, 14))
 >Vector : Symbol(Vector, Decl(es6ClassTest8.ts, 10, 1))
 
     public right: Vector;
->right : Symbol(right, Decl(es6ClassTest8.ts, 28, 27))
+>right : Symbol(Camera.right, Decl(es6ClassTest8.ts, 28, 27))
 >Vector : Symbol(Vector, Decl(es6ClassTest8.ts, 10, 1))
 
     public up: Vector;
->up : Symbol(up, Decl(es6ClassTest8.ts, 29, 25))
+>up : Symbol(Camera.up, Decl(es6ClassTest8.ts, 29, 25))
 >Vector : Symbol(Vector, Decl(es6ClassTest8.ts, 10, 1))
 
     constructor(public pos: Vector, lookAt: Vector) { 
->pos : Symbol(pos, Decl(es6ClassTest8.ts, 31, 16))
+>pos : Symbol(Camera.pos, Decl(es6ClassTest8.ts, 31, 16))
 >Vector : Symbol(Vector, Decl(es6ClassTest8.ts, 10, 1))
 >lookAt : Symbol(lookAt, Decl(es6ClassTest8.ts, 31, 35))
 >Vector : Symbol(Vector, Decl(es6ClassTest8.ts, 10, 1))
@@ -103,9 +103,9 @@ class Camera {
 >Vector : Symbol(Vector, Decl(es6ClassTest8.ts, 10, 1))
 
         this.forward = Vector.norm(Vector.minus(lookAt,this.pos));
->this.forward : Symbol(forward, Decl(es6ClassTest8.ts, 27, 14))
+>this.forward : Symbol(Camera.forward, Decl(es6ClassTest8.ts, 27, 14))
 >this : Symbol(Camera, Decl(es6ClassTest8.ts, 25, 1))
->forward : Symbol(forward, Decl(es6ClassTest8.ts, 27, 14))
+>forward : Symbol(Camera.forward, Decl(es6ClassTest8.ts, 27, 14))
 >Vector.norm : Symbol(Vector.norm, Decl(es6ClassTest8.ts, 12, 14))
 >Vector : Symbol(Vector, Decl(es6ClassTest8.ts, 10, 1))
 >norm : Symbol(Vector.norm, Decl(es6ClassTest8.ts, 12, 14))
@@ -113,14 +113,14 @@ class Camera {
 >Vector : Symbol(Vector, Decl(es6ClassTest8.ts, 10, 1))
 >minus : Symbol(Vector.minus, Decl(es6ClassTest8.ts, 13, 47))
 >lookAt : Symbol(lookAt, Decl(es6ClassTest8.ts, 31, 35))
->this.pos : Symbol(pos, Decl(es6ClassTest8.ts, 31, 16))
+>this.pos : Symbol(Camera.pos, Decl(es6ClassTest8.ts, 31, 16))
 >this : Symbol(Camera, Decl(es6ClassTest8.ts, 25, 1))
->pos : Symbol(pos, Decl(es6ClassTest8.ts, 31, 16))
+>pos : Symbol(Camera.pos, Decl(es6ClassTest8.ts, 31, 16))
 
         this.right = Vector.times(down, Vector.norm(Vector.cross(this.forward, down)));
->this.right : Symbol(right, Decl(es6ClassTest8.ts, 28, 27))
+>this.right : Symbol(Camera.right, Decl(es6ClassTest8.ts, 28, 27))
 >this : Symbol(Camera, Decl(es6ClassTest8.ts, 25, 1))
->right : Symbol(right, Decl(es6ClassTest8.ts, 28, 27))
+>right : Symbol(Camera.right, Decl(es6ClassTest8.ts, 28, 27))
 >Vector.times : Symbol(Vector.times, Decl(es6ClassTest8.ts, 14, 60))
 >Vector : Symbol(Vector, Decl(es6ClassTest8.ts, 10, 1))
 >times : Symbol(Vector.times, Decl(es6ClassTest8.ts, 14, 60))
@@ -131,15 +131,15 @@ class Camera {
 >Vector.cross : Symbol(Vector.cross, Decl(es6ClassTest8.ts, 15, 60))
 >Vector : Symbol(Vector, Decl(es6ClassTest8.ts, 10, 1))
 >cross : Symbol(Vector.cross, Decl(es6ClassTest8.ts, 15, 60))
->this.forward : Symbol(forward, Decl(es6ClassTest8.ts, 27, 14))
+>this.forward : Symbol(Camera.forward, Decl(es6ClassTest8.ts, 27, 14))
 >this : Symbol(Camera, Decl(es6ClassTest8.ts, 25, 1))
->forward : Symbol(forward, Decl(es6ClassTest8.ts, 27, 14))
+>forward : Symbol(Camera.forward, Decl(es6ClassTest8.ts, 27, 14))
 >down : Symbol(down, Decl(es6ClassTest8.ts, 32, 11))
 
         this.up = Vector.times(down, Vector.norm(Vector.cross(this.forward, this.right)));    
->this.up : Symbol(up, Decl(es6ClassTest8.ts, 29, 25))
+>this.up : Symbol(Camera.up, Decl(es6ClassTest8.ts, 29, 25))
 >this : Symbol(Camera, Decl(es6ClassTest8.ts, 25, 1))
->up : Symbol(up, Decl(es6ClassTest8.ts, 29, 25))
+>up : Symbol(Camera.up, Decl(es6ClassTest8.ts, 29, 25))
 >Vector.times : Symbol(Vector.times, Decl(es6ClassTest8.ts, 14, 60))
 >Vector : Symbol(Vector, Decl(es6ClassTest8.ts, 10, 1))
 >times : Symbol(Vector.times, Decl(es6ClassTest8.ts, 14, 60))
@@ -150,12 +150,12 @@ class Camera {
 >Vector.cross : Symbol(Vector.cross, Decl(es6ClassTest8.ts, 15, 60))
 >Vector : Symbol(Vector, Decl(es6ClassTest8.ts, 10, 1))
 >cross : Symbol(Vector.cross, Decl(es6ClassTest8.ts, 15, 60))
->this.forward : Symbol(forward, Decl(es6ClassTest8.ts, 27, 14))
+>this.forward : Symbol(Camera.forward, Decl(es6ClassTest8.ts, 27, 14))
 >this : Symbol(Camera, Decl(es6ClassTest8.ts, 25, 1))
->forward : Symbol(forward, Decl(es6ClassTest8.ts, 27, 14))
->this.right : Symbol(right, Decl(es6ClassTest8.ts, 28, 27))
+>forward : Symbol(Camera.forward, Decl(es6ClassTest8.ts, 27, 14))
+>this.right : Symbol(Camera.right, Decl(es6ClassTest8.ts, 28, 27))
 >this : Symbol(Camera, Decl(es6ClassTest8.ts, 25, 1))
->right : Symbol(right, Decl(es6ClassTest8.ts, 28, 27))
+>right : Symbol(Camera.right, Decl(es6ClassTest8.ts, 28, 27))
     }
 }
 
diff --git a/tests/baselines/reference/es6ExportDefaultClassDeclaration.symbols b/tests/baselines/reference/es6ExportDefaultClassDeclaration.symbols
index 02aa5575190..3e5ce34c7d7 100644
--- a/tests/baselines/reference/es6ExportDefaultClassDeclaration.symbols
+++ b/tests/baselines/reference/es6ExportDefaultClassDeclaration.symbols
@@ -4,6 +4,6 @@ export default class C {
 >C : Symbol(C, Decl(es6ExportDefaultClassDeclaration.ts, 0, 0))
 
     method() { }
->method : Symbol(method, Decl(es6ExportDefaultClassDeclaration.ts, 1, 24))
+>method : Symbol(C.method, Decl(es6ExportDefaultClassDeclaration.ts, 1, 24))
 }
 
diff --git a/tests/baselines/reference/es6ExportDefaultClassDeclaration2.symbols b/tests/baselines/reference/es6ExportDefaultClassDeclaration2.symbols
index 168c402d3e4..a52c754c581 100644
--- a/tests/baselines/reference/es6ExportDefaultClassDeclaration2.symbols
+++ b/tests/baselines/reference/es6ExportDefaultClassDeclaration2.symbols
@@ -2,6 +2,6 @@
 
 export default class {
     method() { }
->method : Symbol(method, Decl(es6ExportDefaultClassDeclaration2.ts, 1, 22))
+>method : Symbol(default.method, Decl(es6ExportDefaultClassDeclaration2.ts, 1, 22))
 }
 
diff --git a/tests/baselines/reference/es6ExportEqualsInterop.js b/tests/baselines/reference/es6ExportEqualsInterop.js
index 1ad4222d222..158bb1e3de7 100644
--- a/tests/baselines/reference/es6ExportEqualsInterop.js
+++ b/tests/baselines/reference/es6ExportEqualsInterop.js
@@ -274,7 +274,6 @@ function_1.a;
 function_module_1.a;
 class_1.a;
 class_module_1.a;
-// named export
 var variable_2 = require("variable");
 exports.a2 = variable_2.a;
 var interface_variable_2 = require("interface-variable");
@@ -289,7 +288,6 @@ var function_module_2 = require("function-module");
 exports.a8 = function_module_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/es6ImportNamedImportWithTypesAndValues.symbols b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.symbols
index cff0406b220..5abd8c88867 100644
--- a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.symbols
+++ b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.symbols
@@ -4,27 +4,27 @@ export interface I {
 >I : Symbol(I, Decl(server.ts, 0, 0))
 
     prop: string;
->prop : Symbol(prop, Decl(server.ts, 1, 20))
+>prop : Symbol(I.prop, Decl(server.ts, 1, 20))
 }
 export interface I2 {
 >I2 : Symbol(I2, Decl(server.ts, 3, 1))
 
     prop2: string;
->prop2 : Symbol(prop2, Decl(server.ts, 4, 21))
+>prop2 : Symbol(I2.prop2, Decl(server.ts, 4, 21))
 }
 export class C implements I {
 >C : Symbol(C, Decl(server.ts, 6, 1))
 >I : Symbol(I, Decl(server.ts, 0, 0))
 
     prop = "hello";
->prop : Symbol(prop, Decl(server.ts, 7, 29))
+>prop : Symbol(C.prop, Decl(server.ts, 7, 29))
 }
 export class C2 implements I2 {
 >C2 : Symbol(C2, Decl(server.ts, 9, 1))
 >I2 : Symbol(I2, Decl(server.ts, 3, 1))
 
     prop2 = "world";
->prop2 : Symbol(prop2, Decl(server.ts, 10, 31))
+>prop2 : Symbol(C2.prop2, Decl(server.ts, 10, 31))
 }
 
 === tests/cases/compiler/client.ts ===
diff --git a/tests/baselines/reference/es6ImportWithoutFromClause.js b/tests/baselines/reference/es6ImportWithoutFromClause.js
index 9666409b924..cc8509baade 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClause.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClause.js
@@ -17,3 +17,4 @@ import "es6ImportWithoutFromClause_0";
 //// [es6ImportWithoutFromClause_0.d.ts]
 export declare var a: number;
 //// [es6ImportWithoutFromClause_1.d.ts]
+import "es6ImportWithoutFromClause_0";
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
index 39b6b04464c..ea533a9a963 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
@@ -36,3 +36,5 @@ export declare var a: number;
 //// [es6ImportWithoutFromClauseAmd_1.d.ts]
 export declare var b: number;
 //// [es6ImportWithoutFromClauseAmd_2.d.ts]
+import "es6ImportWithoutFromClauseAmd_0";
+import "es6ImportWithoutFromClauseAmd_2";
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js
index c39cd1172a0..d0f7c9fbe65 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js
@@ -18,3 +18,4 @@ require("es6ImportWithoutFromClauseInEs5_0");
 //// [es6ImportWithoutFromClauseInEs5_0.d.ts]
 export declare var a: number;
 //// [es6ImportWithoutFromClauseInEs5_1.d.ts]
+import "es6ImportWithoutFromClauseInEs5_0";
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseNonInstantiatedModule.js b/tests/baselines/reference/es6ImportWithoutFromClauseNonInstantiatedModule.js
index e63dd4bb53a..51bb0f3338d 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseNonInstantiatedModule.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseNonInstantiatedModule.js
@@ -17,3 +17,4 @@ import "es6ImportWithoutFromClauseNonInstantiatedModule_0";
 export interface i {
 }
 //// [es6ImportWithoutFromClauseNonInstantiatedModule_1.d.ts]
+import "es6ImportWithoutFromClauseNonInstantiatedModule_0";
diff --git a/tests/baselines/reference/es6Module.symbols b/tests/baselines/reference/es6Module.symbols
index 8887adfff37..6849e2904da 100644
--- a/tests/baselines/reference/es6Module.symbols
+++ b/tests/baselines/reference/es6Module.symbols
@@ -7,7 +7,7 @@ export class A
     }
 
     public B()
->B : Symbol(B, Decl(es6Module.ts, 4, 5))
+>B : Symbol(A.B, Decl(es6Module.ts, 4, 5))
     {
         return 42;
     }
diff --git a/tests/baselines/reference/es6ModuleClassDeclaration.symbols b/tests/baselines/reference/es6ModuleClassDeclaration.symbols
index 5ad84b94f0a..424a7245587 100644
--- a/tests/baselines/reference/es6ModuleClassDeclaration.symbols
+++ b/tests/baselines/reference/es6ModuleClassDeclaration.symbols
@@ -5,10 +5,10 @@ export class c {
     constructor() {
     }
     private x = 10;
->x : Symbol(x, Decl(es6ModuleClassDeclaration.ts, 2, 5))
+>x : Symbol(c.x, Decl(es6ModuleClassDeclaration.ts, 2, 5))
 
     public y = 30;
->y : Symbol(y, Decl(es6ModuleClassDeclaration.ts, 3, 19))
+>y : Symbol(c.y, Decl(es6ModuleClassDeclaration.ts, 3, 19))
 
     static k = 20;
 >k : Symbol(c.k, Decl(es6ModuleClassDeclaration.ts, 4, 18))
@@ -17,10 +17,10 @@ export class c {
 >l : Symbol(c.l, Decl(es6ModuleClassDeclaration.ts, 5, 18))
 
     private method1() {
->method1 : Symbol(method1, Decl(es6ModuleClassDeclaration.ts, 6, 26))
+>method1 : Symbol(c.method1, Decl(es6ModuleClassDeclaration.ts, 6, 26))
     }
     public method2() {
->method2 : Symbol(method2, Decl(es6ModuleClassDeclaration.ts, 8, 5))
+>method2 : Symbol(c.method2, Decl(es6ModuleClassDeclaration.ts, 8, 5))
     }
     static method3() {
 >method3 : Symbol(c.method3, Decl(es6ModuleClassDeclaration.ts, 10, 5))
@@ -35,10 +35,10 @@ class c2 {
     constructor() {
     }
     private x = 10;
->x : Symbol(x, Decl(es6ModuleClassDeclaration.ts, 18, 5))
+>x : Symbol(c2.x, Decl(es6ModuleClassDeclaration.ts, 18, 5))
 
     public y = 30;
->y : Symbol(y, Decl(es6ModuleClassDeclaration.ts, 19, 19))
+>y : Symbol(c2.y, Decl(es6ModuleClassDeclaration.ts, 19, 19))
 
     static k = 20;
 >k : Symbol(c2.k, Decl(es6ModuleClassDeclaration.ts, 20, 18))
@@ -47,10 +47,10 @@ class c2 {
 >l : Symbol(c2.l, Decl(es6ModuleClassDeclaration.ts, 21, 18))
 
     private method1() {
->method1 : Symbol(method1, Decl(es6ModuleClassDeclaration.ts, 22, 26))
+>method1 : Symbol(c2.method1, Decl(es6ModuleClassDeclaration.ts, 22, 26))
     }
     public method2() {
->method2 : Symbol(method2, Decl(es6ModuleClassDeclaration.ts, 24, 5))
+>method2 : Symbol(c2.method2, Decl(es6ModuleClassDeclaration.ts, 24, 5))
     }
     static method3() {
 >method3 : Symbol(c2.method3, Decl(es6ModuleClassDeclaration.ts, 26, 5))
@@ -74,10 +74,10 @@ export module m1 {
         constructor() {
         }
         private x = 10;
->x : Symbol(x, Decl(es6ModuleClassDeclaration.ts, 38, 9))
+>x : Symbol(c3.x, Decl(es6ModuleClassDeclaration.ts, 38, 9))
 
         public y = 30;
->y : Symbol(y, Decl(es6ModuleClassDeclaration.ts, 39, 23))
+>y : Symbol(c3.y, Decl(es6ModuleClassDeclaration.ts, 39, 23))
 
         static k = 20;
 >k : Symbol(c3.k, Decl(es6ModuleClassDeclaration.ts, 40, 22))
@@ -86,10 +86,10 @@ export module m1 {
 >l : Symbol(c3.l, Decl(es6ModuleClassDeclaration.ts, 41, 22))
 
         private method1() {
->method1 : Symbol(method1, Decl(es6ModuleClassDeclaration.ts, 42, 30))
+>method1 : Symbol(c3.method1, Decl(es6ModuleClassDeclaration.ts, 42, 30))
         }
         public method2() {
->method2 : Symbol(method2, Decl(es6ModuleClassDeclaration.ts, 44, 9))
+>method2 : Symbol(c3.method2, Decl(es6ModuleClassDeclaration.ts, 44, 9))
         }
         static method3() {
 >method3 : Symbol(c3.method3, Decl(es6ModuleClassDeclaration.ts, 46, 9))
@@ -104,10 +104,10 @@ export module m1 {
         constructor() {
         }
         private x = 10;
->x : Symbol(x, Decl(es6ModuleClassDeclaration.ts, 54, 9))
+>x : Symbol(c4.x, Decl(es6ModuleClassDeclaration.ts, 54, 9))
 
         public y = 30;
->y : Symbol(y, Decl(es6ModuleClassDeclaration.ts, 55, 23))
+>y : Symbol(c4.y, Decl(es6ModuleClassDeclaration.ts, 55, 23))
 
         static k = 20;
 >k : Symbol(c4.k, Decl(es6ModuleClassDeclaration.ts, 56, 22))
@@ -116,10 +116,10 @@ export module m1 {
 >l : Symbol(c4.l, Decl(es6ModuleClassDeclaration.ts, 57, 22))
 
         private method1() {
->method1 : Symbol(method1, Decl(es6ModuleClassDeclaration.ts, 58, 30))
+>method1 : Symbol(c4.method1, Decl(es6ModuleClassDeclaration.ts, 58, 30))
         }
         public method2() {
->method2 : Symbol(method2, Decl(es6ModuleClassDeclaration.ts, 60, 9))
+>method2 : Symbol(c4.method2, Decl(es6ModuleClassDeclaration.ts, 60, 9))
         }
         static method3() {
 >method3 : Symbol(c4.method3, Decl(es6ModuleClassDeclaration.ts, 62, 9))
@@ -149,10 +149,10 @@ module m2 {
         constructor() {
         }
         private x = 10;
->x : Symbol(x, Decl(es6ModuleClassDeclaration.ts, 76, 9))
+>x : Symbol(c3.x, Decl(es6ModuleClassDeclaration.ts, 76, 9))
 
         public y = 30;
->y : Symbol(y, Decl(es6ModuleClassDeclaration.ts, 77, 23))
+>y : Symbol(c3.y, Decl(es6ModuleClassDeclaration.ts, 77, 23))
 
         static k = 20;
 >k : Symbol(c3.k, Decl(es6ModuleClassDeclaration.ts, 78, 22))
@@ -161,10 +161,10 @@ module m2 {
 >l : Symbol(c3.l, Decl(es6ModuleClassDeclaration.ts, 79, 22))
 
         private method1() {
->method1 : Symbol(method1, Decl(es6ModuleClassDeclaration.ts, 80, 30))
+>method1 : Symbol(c3.method1, Decl(es6ModuleClassDeclaration.ts, 80, 30))
         }
         public method2() {
->method2 : Symbol(method2, Decl(es6ModuleClassDeclaration.ts, 82, 9))
+>method2 : Symbol(c3.method2, Decl(es6ModuleClassDeclaration.ts, 82, 9))
         }
         static method3() {
 >method3 : Symbol(c3.method3, Decl(es6ModuleClassDeclaration.ts, 84, 9))
@@ -179,10 +179,10 @@ module m2 {
         constructor() {
         }
         private x = 10;
->x : Symbol(x, Decl(es6ModuleClassDeclaration.ts, 92, 9))
+>x : Symbol(c4.x, Decl(es6ModuleClassDeclaration.ts, 92, 9))
 
         public y = 30;
->y : Symbol(y, Decl(es6ModuleClassDeclaration.ts, 93, 23))
+>y : Symbol(c4.y, Decl(es6ModuleClassDeclaration.ts, 93, 23))
 
         static k = 20;
 >k : Symbol(c4.k, Decl(es6ModuleClassDeclaration.ts, 94, 22))
@@ -191,10 +191,10 @@ module m2 {
 >l : Symbol(c4.l, Decl(es6ModuleClassDeclaration.ts, 95, 22))
 
         private method1() {
->method1 : Symbol(method1, Decl(es6ModuleClassDeclaration.ts, 96, 30))
+>method1 : Symbol(c4.method1, Decl(es6ModuleClassDeclaration.ts, 96, 30))
         }
         public method2() {
->method2 : Symbol(method2, Decl(es6ModuleClassDeclaration.ts, 98, 9))
+>method2 : Symbol(c4.method2, Decl(es6ModuleClassDeclaration.ts, 98, 9))
         }
         static method3() {
 >method3 : Symbol(c4.method3, Decl(es6ModuleClassDeclaration.ts, 100, 9))
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/es6ModuleWithModuleGenTargetAmd.symbols b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.symbols
index 24367cc28ad..fd566b39990 100644
--- a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.symbols
+++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.symbols
@@ -7,7 +7,7 @@ export class A
     }
 
     public B()
->B : Symbol(B, Decl(es6ModuleWithModuleGenTargetAmd.ts, 4, 5))
+>B : Symbol(A.B, Decl(es6ModuleWithModuleGenTargetAmd.ts, 4, 5))
     {
         return 42;
     }
diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.symbols b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.symbols
index 4a84c00c48f..a143a75f988 100644
--- a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.symbols
+++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.symbols
@@ -7,7 +7,7 @@ export class A
     }
 
     public B()
->B : Symbol(B, Decl(es6ModuleWithModuleGenTargetCommonjs.ts, 4, 5))
+>B : Symbol(A.B, Decl(es6ModuleWithModuleGenTargetCommonjs.ts, 4, 5))
     {
         return 42;
     }
diff --git a/tests/baselines/reference/es6modulekind.symbols b/tests/baselines/reference/es6modulekind.symbols
index 0b5eeb2a6fb..877199729e6 100644
--- a/tests/baselines/reference/es6modulekind.symbols
+++ b/tests/baselines/reference/es6modulekind.symbols
@@ -9,7 +9,7 @@ export default class A
     }
 
     public B()
->B : Symbol(B, Decl(es6modulekind.ts, 6, 5))
+>B : Symbol(A.B, Decl(es6modulekind.ts, 6, 5))
     {
         return 42;
     }
diff --git a/tests/baselines/reference/es6modulekindWithES2015Target.symbols b/tests/baselines/reference/es6modulekindWithES2015Target.symbols
index 98b91a0411b..2b6f8a03aa7 100644
--- a/tests/baselines/reference/es6modulekindWithES2015Target.symbols
+++ b/tests/baselines/reference/es6modulekindWithES2015Target.symbols
@@ -9,7 +9,7 @@ export default class A
     }
 
     public B()
->B : Symbol(B, Decl(es6modulekindWithES2015Target.ts, 6, 5))
+>B : Symbol(A.B, Decl(es6modulekindWithES2015Target.ts, 6, 5))
     {
         return 42;
     }
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/escapedIdentifiers.symbols b/tests/baselines/reference/escapedIdentifiers.symbols
index a99e067b898..735dede00e2 100644
--- a/tests/baselines/reference/escapedIdentifiers.symbols
+++ b/tests/baselines/reference/escapedIdentifiers.symbols
@@ -70,13 +70,13 @@ class classType1 {
 >classType1 : Symbol(classType1, Decl(escapedIdentifiers.ts, 32, 26))
 
     public foo1: number;
->foo1 : Symbol(foo1, Decl(escapedIdentifiers.ts, 36, 18))
+>foo1 : Symbol(classType1.foo1, Decl(escapedIdentifiers.ts, 36, 18))
 }
 class classType\u0032 { 
 >classType\u0032 : Symbol(classType\u0032, Decl(escapedIdentifiers.ts, 38, 1))
 
     public foo2: number;
->foo2 : Symbol(foo2, Decl(escapedIdentifiers.ts, 39, 23))
+>foo2 : Symbol(classType\u0032.foo2, Decl(escapedIdentifiers.ts, 39, 23))
 }
 
 var classType1Object1 = new classType1();
@@ -120,13 +120,13 @@ interface interfaceType1 {
 >interfaceType1 : Symbol(interfaceType1, Decl(escapedIdentifiers.ts, 50, 27))
 
     bar1: number;
->bar1 : Symbol(bar1, Decl(escapedIdentifiers.ts, 53, 26))
+>bar1 : Symbol(interfaceType1.bar1, Decl(escapedIdentifiers.ts, 53, 26))
 }
 interface interfaceType\u0032 { 
 >interfaceType\u0032 : Symbol(interfaceType\u0032, Decl(escapedIdentifiers.ts, 55, 1))
 
     bar2: number;
->bar2 : Symbol(bar2, Decl(escapedIdentifiers.ts, 56, 31))
+>bar2 : Symbol(interfaceType\u0032.bar2, Decl(escapedIdentifiers.ts, 56, 31))
 }
 
 var interfaceType1Object1 = <interfaceType1>{ bar1: 0 };
@@ -175,7 +175,7 @@ class testClass {
 >testClass : Symbol(testClass, Decl(escapedIdentifiers.ts, 67, 31))
 
     public func(arg1: number, arg\u0032: string, arg\u0033: boolean, arg4: number) { 
->func : Symbol(func, Decl(escapedIdentifiers.ts, 71, 17))
+>func : Symbol(testClass.func, Decl(escapedIdentifiers.ts, 71, 17))
 >arg1 : Symbol(arg1, Decl(escapedIdentifiers.ts, 72, 16))
 >arg\u0032 : Symbol(arg\u0032, Decl(escapedIdentifiers.ts, 72, 29))
 >arg\u0033 : Symbol(arg\u0033, Decl(escapedIdentifiers.ts, 72, 48))
@@ -200,10 +200,10 @@ class constructorTestClass {
 >constructorTestClass : Symbol(constructorTestClass, Decl(escapedIdentifiers.ts, 78, 1))
 
     constructor (public arg1: number,public arg\u0032: string,public arg\u0033: boolean,public arg4: number) { 
->arg1 : Symbol(arg1, Decl(escapedIdentifiers.ts, 82, 17))
->arg\u0032 : Symbol(arg\u0032, Decl(escapedIdentifiers.ts, 82, 37))
->arg\u0033 : Symbol(arg\u0033, Decl(escapedIdentifiers.ts, 82, 62))
->arg4 : Symbol(arg4, Decl(escapedIdentifiers.ts, 82, 88))
+>arg1 : Symbol(constructorTestClass.arg1, Decl(escapedIdentifiers.ts, 82, 17))
+>arg\u0032 : Symbol(constructorTestClass.arg\u0032, Decl(escapedIdentifiers.ts, 82, 37))
+>arg\u0033 : Symbol(constructorTestClass.arg\u0033, Decl(escapedIdentifiers.ts, 82, 62))
+>arg4 : Symbol(constructorTestClass.arg4, Decl(escapedIdentifiers.ts, 82, 88))
     }
 }
 var constructorTestObject = new constructorTestClass(1, 'string', true, 2);
diff --git a/tests/baselines/reference/everyTypeAssignableToAny.symbols b/tests/baselines/reference/everyTypeAssignableToAny.symbols
index be88c481ece..caf8c5e47d6 100644
--- a/tests/baselines/reference/everyTypeAssignableToAny.symbols
+++ b/tests/baselines/reference/everyTypeAssignableToAny.symbols
@@ -6,7 +6,7 @@ class C {
 >C : Symbol(C, Decl(everyTypeAssignableToAny.ts, 0, 11))
 
     foo: string;
->foo : Symbol(foo, Decl(everyTypeAssignableToAny.ts, 2, 9))
+>foo : Symbol(C.foo, Decl(everyTypeAssignableToAny.ts, 2, 9))
 }
 var ac: C;
 >ac : Symbol(ac, Decl(everyTypeAssignableToAny.ts, 5, 3))
@@ -16,7 +16,7 @@ interface I {
 >I : Symbol(I, Decl(everyTypeAssignableToAny.ts, 5, 10))
 
     foo: string;
->foo : Symbol(foo, Decl(everyTypeAssignableToAny.ts, 6, 13))
+>foo : Symbol(I.foo, Decl(everyTypeAssignableToAny.ts, 6, 13))
 }
 var ai: I;
 >ai : Symbol(ai, Decl(everyTypeAssignableToAny.ts, 9, 3))
@@ -41,7 +41,7 @@ var d: boolean;
 
 var e: Date;
 >e : Symbol(e, Decl(everyTypeAssignableToAny.ts, 17, 3))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var f: any;
 >f : Symbol(f, Decl(everyTypeAssignableToAny.ts, 18, 3))
@@ -83,11 +83,11 @@ var o: <T>(x: T) => T;
 
 var p: Number;
 >p : Symbol(p, Decl(everyTypeAssignableToAny.ts, 28, 3))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var q: String;
 >q : Symbol(q, Decl(everyTypeAssignableToAny.ts, 29, 3))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 a = b;
 >a : Symbol(a, Decl(everyTypeAssignableToAny.ts, 0, 3))
@@ -166,7 +166,7 @@ function foo<T, U /*extends T*/, V extends Date>(x: T, y: U, z: V) {
 >T : Symbol(T, Decl(everyTypeAssignableToAny.ts, 50, 13))
 >U : Symbol(U, Decl(everyTypeAssignableToAny.ts, 50, 15))
 >V : Symbol(V, Decl(everyTypeAssignableToAny.ts, 50, 32))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(everyTypeAssignableToAny.ts, 50, 49))
 >T : Symbol(T, Decl(everyTypeAssignableToAny.ts, 50, 13))
 >y : Symbol(y, Decl(everyTypeAssignableToAny.ts, 50, 54))
diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.symbols b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.symbols
index e76b3784e8a..8667507fb51 100644
--- a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.symbols
+++ b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.symbols
@@ -3,7 +3,7 @@ interface I {
 >I : Symbol(I, Decl(everyTypeWithAnnotationAndInitializer.ts, 0, 0))
 
     id: number;
->id : Symbol(id, Decl(everyTypeWithAnnotationAndInitializer.ts, 0, 13))
+>id : Symbol(I.id, Decl(everyTypeWithAnnotationAndInitializer.ts, 0, 13))
 }
 
 class C implements I {
@@ -11,7 +11,7 @@ class C implements I {
 >I : Symbol(I, Decl(everyTypeWithAnnotationAndInitializer.ts, 0, 0))
 
     id: number;
->id : Symbol(id, Decl(everyTypeWithAnnotationAndInitializer.ts, 4, 22))
+>id : Symbol(C.id, Decl(everyTypeWithAnnotationAndInitializer.ts, 4, 22))
 }
 
 class D<T>{
@@ -19,16 +19,16 @@ class D<T>{
 >T : Symbol(T, Decl(everyTypeWithAnnotationAndInitializer.ts, 8, 8))
 
     source: T;
->source : Symbol(source, Decl(everyTypeWithAnnotationAndInitializer.ts, 8, 11))
+>source : Symbol(D.source, Decl(everyTypeWithAnnotationAndInitializer.ts, 8, 11))
 >T : Symbol(T, Decl(everyTypeWithAnnotationAndInitializer.ts, 8, 8))
 
     recurse: D<T>;
->recurse : Symbol(recurse, Decl(everyTypeWithAnnotationAndInitializer.ts, 9, 14))
+>recurse : Symbol(D.recurse, Decl(everyTypeWithAnnotationAndInitializer.ts, 9, 14))
 >D : Symbol(D, Decl(everyTypeWithAnnotationAndInitializer.ts, 6, 1))
 >T : Symbol(T, Decl(everyTypeWithAnnotationAndInitializer.ts, 8, 8))
 
     wrapped: D<D<T>>
->wrapped : Symbol(wrapped, Decl(everyTypeWithAnnotationAndInitializer.ts, 10, 18))
+>wrapped : Symbol(D.wrapped, Decl(everyTypeWithAnnotationAndInitializer.ts, 10, 18))
 >D : Symbol(D, Decl(everyTypeWithAnnotationAndInitializer.ts, 6, 1))
 >D : Symbol(D, Decl(everyTypeWithAnnotationAndInitializer.ts, 6, 1))
 >T : Symbol(T, Decl(everyTypeWithAnnotationAndInitializer.ts, 8, 8))
@@ -45,7 +45,7 @@ module M {
 >A : Symbol(A, Decl(everyTypeWithAnnotationAndInitializer.ts, 16, 10))
 
         name: string;
->name : Symbol(name, Decl(everyTypeWithAnnotationAndInitializer.ts, 17, 20))
+>name : Symbol(A.name, Decl(everyTypeWithAnnotationAndInitializer.ts, 17, 20))
     }
 
     export function F2(x: number): string { return x.toString(); }
@@ -64,8 +64,8 @@ var aString: string = 'this is a string';
 
 var aDate: Date = new Date(12);
 >aDate : Symbol(aDate, Decl(everyTypeWithAnnotationAndInitializer.ts, 26, 3))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var anObject: Object = new Object();
 >anObject : Symbol(anObject, Decl(everyTypeWithAnnotationAndInitializer.ts, 27, 3))
diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt
index fc1bcaa545a..13c2058b657 100644
--- a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt
+++ b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.errors.txt
@@ -16,10 +16,10 @@ tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAnd
     Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(46,5): error TS2322: Type '(x: number) => boolean' is not assignable to type '(x: string) => number'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type 'number' is not assignable to type 'string'.
+    Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(47,5): error TS2322: Type '(x: number) => boolean' is not assignable to type '(x: string) => number'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type 'number' is not assignable to type 'string'.
+    Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(48,5): error TS2322: Type '(x: string) => string' is not assignable to type '(x: string) => number'.
   Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAndInvalidInitializer.ts(50,5): error TS2322: Type 'typeof N' is not assignable to type 'typeof M'.
@@ -107,12 +107,12 @@ tests/cases/conformance/statements/VariableStatements/everyTypeWithAnnotationAnd
         ~~~~~~~~~
 !!! error TS2322: Type '(x: number) => boolean' is not assignable to type '(x: string) => number'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:     Type 'number' is not assignable to type 'string'.
+!!! error TS2322:     Type 'string' is not assignable to type 'number'.
     var anOtherFunction: (x: string) => number = F2;
         ~~~~~~~~~~~~~~~
 !!! error TS2322: Type '(x: number) => boolean' is not assignable to type '(x: string) => number'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:     Type 'number' is not assignable to type 'string'.
+!!! error TS2322:     Type 'string' is not assignable to type 'number'.
     var aLambda: typeof F = (x) => 'a string';
         ~~~~~~~
 !!! error TS2322: Type '(x: string) => string' is not assignable to type '(x: string) => number'.
diff --git a/tests/baselines/reference/everyTypeWithInitializer.symbols b/tests/baselines/reference/everyTypeWithInitializer.symbols
index 078f2e305d1..ba269fbc536 100644
--- a/tests/baselines/reference/everyTypeWithInitializer.symbols
+++ b/tests/baselines/reference/everyTypeWithInitializer.symbols
@@ -3,7 +3,7 @@ interface I {
 >I : Symbol(I, Decl(everyTypeWithInitializer.ts, 0, 0))
 
     id: number;
->id : Symbol(id, Decl(everyTypeWithInitializer.ts, 0, 13))
+>id : Symbol(I.id, Decl(everyTypeWithInitializer.ts, 0, 13))
 }
 
 class C implements I {
@@ -11,7 +11,7 @@ class C implements I {
 >I : Symbol(I, Decl(everyTypeWithInitializer.ts, 0, 0))
 
     id: number;
->id : Symbol(id, Decl(everyTypeWithInitializer.ts, 4, 22))
+>id : Symbol(C.id, Decl(everyTypeWithInitializer.ts, 4, 22))
 }
 
 class D<T>{
@@ -19,16 +19,16 @@ class D<T>{
 >T : Symbol(T, Decl(everyTypeWithInitializer.ts, 8, 8))
 
     source: T;
->source : Symbol(source, Decl(everyTypeWithInitializer.ts, 8, 11))
+>source : Symbol(D.source, Decl(everyTypeWithInitializer.ts, 8, 11))
 >T : Symbol(T, Decl(everyTypeWithInitializer.ts, 8, 8))
 
     recurse: D<T>;
->recurse : Symbol(recurse, Decl(everyTypeWithInitializer.ts, 9, 14))
+>recurse : Symbol(D.recurse, Decl(everyTypeWithInitializer.ts, 9, 14))
 >D : Symbol(D, Decl(everyTypeWithInitializer.ts, 6, 1))
 >T : Symbol(T, Decl(everyTypeWithInitializer.ts, 8, 8))
 
     wrapped: D<D<T>>
->wrapped : Symbol(wrapped, Decl(everyTypeWithInitializer.ts, 10, 18))
+>wrapped : Symbol(D.wrapped, Decl(everyTypeWithInitializer.ts, 10, 18))
 >D : Symbol(D, Decl(everyTypeWithInitializer.ts, 6, 1))
 >D : Symbol(D, Decl(everyTypeWithInitializer.ts, 6, 1))
 >T : Symbol(T, Decl(everyTypeWithInitializer.ts, 8, 8))
@@ -45,7 +45,7 @@ module M {
 >A : Symbol(A, Decl(everyTypeWithInitializer.ts, 16, 10))
 
         name: string;
->name : Symbol(name, Decl(everyTypeWithInitializer.ts, 17, 20))
+>name : Symbol(A.name, Decl(everyTypeWithInitializer.ts, 17, 20))
     }
 
     export function F2(x: number): string { return x.toString(); }
@@ -64,7 +64,7 @@ var aString = 'this is a string';
 
 var aDate = new Date(12);
 >aDate : Symbol(aDate, Decl(everyTypeWithInitializer.ts, 26, 3))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var anObject = new Object();
 >anObject : Symbol(anObject, Decl(everyTypeWithInitializer.ts, 27, 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/exportAssignClassAndModule.symbols b/tests/baselines/reference/exportAssignClassAndModule.symbols
index 016e91f79a2..6f0141a82ff 100644
--- a/tests/baselines/reference/exportAssignClassAndModule.symbols
+++ b/tests/baselines/reference/exportAssignClassAndModule.symbols
@@ -22,7 +22,7 @@ class Foo {
 >Foo : Symbol(Foo, Decl(exportAssignClassAndModule_0.ts, 0, 0), Decl(exportAssignClassAndModule_0.ts, 2, 1))
 
     x: Foo.Bar;
->x : Symbol(x, Decl(exportAssignClassAndModule_0.ts, 0, 11))
+>x : Symbol(Foo.x, Decl(exportAssignClassAndModule_0.ts, 0, 11))
 >Foo : Symbol(Foo, Decl(exportAssignClassAndModule_0.ts, 0, 0), Decl(exportAssignClassAndModule_0.ts, 2, 1))
 >Bar : Symbol(Foo.Bar, Decl(exportAssignClassAndModule_0.ts, 3, 12))
 }
diff --git a/tests/baselines/reference/exportAssignDottedName.errors.txt b/tests/baselines/reference/exportAssignDottedName.errors.txt
deleted file mode 100644
index 3ed4f3c888f..00000000000
--- a/tests/baselines/reference/exportAssignDottedName.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-tests/cases/conformance/externalModules/foo1.ts(1,17): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-
-
-==== tests/cases/conformance/externalModules/foo2.ts (0 errors) ====
-    import foo1 = require('./foo1');
-    export = foo1.x; // Ok
-    
-==== tests/cases/conformance/externalModules/foo1.ts (1 errors) ====
-    export function x(){
-                    ~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-    	return true;
-    }
-    
\ No newline at end of file
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/exportAssignDottedName.symbols b/tests/baselines/reference/exportAssignDottedName.symbols
new file mode 100644
index 00000000000..b7503380452
--- /dev/null
+++ b/tests/baselines/reference/exportAssignDottedName.symbols
@@ -0,0 +1,16 @@
+=== tests/cases/conformance/externalModules/foo2.ts ===
+import foo1 = require('./foo1');
+>foo1 : Symbol(foo1, Decl(foo2.ts, 0, 0))
+
+export = foo1.x; // Ok
+>foo1.x : Symbol(foo1.x, Decl(foo1.ts, 0, 0))
+>foo1 : Symbol(foo1, Decl(foo2.ts, 0, 0))
+>x : Symbol(foo1.x, Decl(foo1.ts, 0, 0))
+
+=== tests/cases/conformance/externalModules/foo1.ts ===
+export function x(){
+>x : Symbol(x, Decl(foo1.ts, 0, 0))
+
+	return true;
+}
+
diff --git a/tests/baselines/reference/exportAssignDottedName.types b/tests/baselines/reference/exportAssignDottedName.types
new file mode 100644
index 00000000000..6fceb21231c
--- /dev/null
+++ b/tests/baselines/reference/exportAssignDottedName.types
@@ -0,0 +1,17 @@
+=== tests/cases/conformance/externalModules/foo2.ts ===
+import foo1 = require('./foo1');
+>foo1 : typeof foo1
+
+export = foo1.x; // Ok
+>foo1.x : () => boolean
+>foo1 : typeof foo1
+>x : () => boolean
+
+=== tests/cases/conformance/externalModules/foo1.ts ===
+export function x(){
+>x : () => boolean
+
+	return true;
+>true : boolean
+}
+
diff --git a/tests/baselines/reference/exportAssignImportedIdentifier.errors.txt b/tests/baselines/reference/exportAssignImportedIdentifier.errors.txt
deleted file mode 100644
index 167c0baca3d..00000000000
--- a/tests/baselines/reference/exportAssignImportedIdentifier.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tests/cases/conformance/externalModules/foo1.ts(1,17): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-
-
-==== tests/cases/conformance/externalModules/foo3.ts (0 errors) ====
-    import foo2 = require('./foo2');
-    var x = foo2(); // should be boolean
-==== tests/cases/conformance/externalModules/foo1.ts (1 errors) ====
-    export function x(){
-                    ~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-    	return true;
-    }
-    
-==== tests/cases/conformance/externalModules/foo2.ts (0 errors) ====
-    import foo1 = require('./foo1');
-    var x = foo1.x;
-    export = x;
-    
\ No newline at end of file
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/exportAssignImportedIdentifier.symbols b/tests/baselines/reference/exportAssignImportedIdentifier.symbols
new file mode 100644
index 00000000000..8089e498250
--- /dev/null
+++ b/tests/baselines/reference/exportAssignImportedIdentifier.symbols
@@ -0,0 +1,28 @@
+=== tests/cases/conformance/externalModules/foo3.ts ===
+import foo2 = require('./foo2');
+>foo2 : Symbol(foo2, Decl(foo3.ts, 0, 0))
+
+var x = foo2(); // should be boolean
+>x : Symbol(x, Decl(foo3.ts, 1, 3))
+>foo2 : Symbol(foo2, Decl(foo3.ts, 0, 0))
+
+=== tests/cases/conformance/externalModules/foo1.ts ===
+export function x(){
+>x : Symbol(x, Decl(foo1.ts, 0, 0))
+
+	return true;
+}
+
+=== tests/cases/conformance/externalModules/foo2.ts ===
+import foo1 = require('./foo1');
+>foo1 : Symbol(foo1, Decl(foo2.ts, 0, 0))
+
+var x = foo1.x;
+>x : Symbol(x, Decl(foo2.ts, 1, 3))
+>foo1.x : Symbol(foo1.x, Decl(foo1.ts, 0, 0))
+>foo1 : Symbol(foo1, Decl(foo2.ts, 0, 0))
+>x : Symbol(foo1.x, Decl(foo1.ts, 0, 0))
+
+export = x;
+>x : Symbol(x, Decl(foo2.ts, 1, 3))
+
diff --git a/tests/baselines/reference/exportAssignImportedIdentifier.types b/tests/baselines/reference/exportAssignImportedIdentifier.types
new file mode 100644
index 00000000000..e70de693624
--- /dev/null
+++ b/tests/baselines/reference/exportAssignImportedIdentifier.types
@@ -0,0 +1,30 @@
+=== tests/cases/conformance/externalModules/foo3.ts ===
+import foo2 = require('./foo2');
+>foo2 : () => boolean
+
+var x = foo2(); // should be boolean
+>x : boolean
+>foo2() : boolean
+>foo2 : () => boolean
+
+=== tests/cases/conformance/externalModules/foo1.ts ===
+export function x(){
+>x : () => boolean
+
+	return true;
+>true : boolean
+}
+
+=== tests/cases/conformance/externalModules/foo2.ts ===
+import foo1 = require('./foo1');
+>foo1 : typeof foo1
+
+var x = foo1.x;
+>x : () => boolean
+>foo1.x : () => boolean
+>foo1 : typeof foo1
+>x : () => boolean
+
+export = x;
+>x : () => boolean
+
diff --git a/tests/baselines/reference/exportAssignNonIdentifier.errors.txt b/tests/baselines/reference/exportAssignNonIdentifier.errors.txt
index 9e8bfa8d747..df227ff6c0b 100644
--- a/tests/baselines/reference/exportAssignNonIdentifier.errors.txt
+++ b/tests/baselines/reference/exportAssignNonIdentifier.errors.txt
@@ -1,12 +1,9 @@
-tests/cases/conformance/externalModules/foo1.ts(2,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/conformance/externalModules/foo6.ts(1,14): error TS1109: Expression expected.
 
 
-==== tests/cases/conformance/externalModules/foo1.ts (1 errors) ====
+==== tests/cases/conformance/externalModules/foo1.ts (0 errors) ====
     var x = 10;
     export = typeof x; // Ok
-    ~~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
     
 ==== tests/cases/conformance/externalModules/foo2.ts (0 errors) ====
     export = "sausages"; // Ok
diff --git a/tests/baselines/reference/exportAssignTypes.errors.txt b/tests/baselines/reference/exportAssignTypes.errors.txt
deleted file mode 100644
index 9d39f48fec8..00000000000
--- a/tests/baselines/reference/exportAssignTypes.errors.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-tests/cases/conformance/externalModules/expString.ts(2,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-
-
-==== tests/cases/conformance/externalModules/consumer.ts (0 errors) ====
-    import iString = require('./expString');
-    var v1: string = iString;
-    
-    import iNumber = require('./expNumber');
-    var v2: number = iNumber;
-    
-    import iBoolean = require('./expBoolean');
-    var v3: boolean = iBoolean;
-    
-    import iArray = require('./expArray');
-    var v4: Array<number> = iArray;
-    
-    import iObject = require('./expObject');
-    var v5: Object = iObject;
-    
-    import iAny = require('./expAny');
-    var v6 = iAny;
-    
-    import iGeneric = require('./expGeneric');
-    var v7: {<x>(p1: x): x} = iGeneric;
-    
-==== tests/cases/conformance/externalModules/expString.ts (1 errors) ====
-    var x = "test";
-    export = x;
-    ~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-    
-==== tests/cases/conformance/externalModules/expNumber.ts (0 errors) ====
-    var x = 42;
-    export = x;
-    
-==== tests/cases/conformance/externalModules/expBoolean.ts (0 errors) ====
-    var x = true;
-    export = x;
-    
-==== tests/cases/conformance/externalModules/expArray.ts (0 errors) ====
-    var x = [1,2];
-    export = x;
-    
-==== tests/cases/conformance/externalModules/expObject.ts (0 errors) ====
-    var x = { answer: 42, when: 1776};
-    export = x;
-    
-==== tests/cases/conformance/externalModules/expAny.ts (0 errors) ====
-    var x;
-    export = x;
-    
-==== tests/cases/conformance/externalModules/expGeneric.ts (0 errors) ====
-    function x<T>(a: T){
-    	return a;
-    }
-    export = x;
-    
\ No newline at end of file
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/exportAssignTypes.symbols b/tests/baselines/reference/exportAssignTypes.symbols
new file mode 100644
index 00000000000..4936d7388fe
--- /dev/null
+++ b/tests/baselines/reference/exportAssignTypes.symbols
@@ -0,0 +1,113 @@
+=== tests/cases/conformance/externalModules/consumer.ts ===
+import iString = require('./expString');
+>iString : Symbol(iString, Decl(consumer.ts, 0, 0))
+
+var v1: string = iString;
+>v1 : Symbol(v1, Decl(consumer.ts, 1, 3))
+>iString : Symbol(iString, Decl(consumer.ts, 0, 0))
+
+import iNumber = require('./expNumber');
+>iNumber : Symbol(iNumber, Decl(consumer.ts, 1, 25))
+
+var v2: number = iNumber;
+>v2 : Symbol(v2, Decl(consumer.ts, 4, 3))
+>iNumber : Symbol(iNumber, Decl(consumer.ts, 1, 25))
+
+import iBoolean = require('./expBoolean');
+>iBoolean : Symbol(iBoolean, Decl(consumer.ts, 4, 25))
+
+var v3: boolean = iBoolean;
+>v3 : Symbol(v3, Decl(consumer.ts, 7, 3))
+>iBoolean : Symbol(iBoolean, Decl(consumer.ts, 4, 25))
+
+import iArray = require('./expArray');
+>iArray : Symbol(iArray, Decl(consumer.ts, 7, 27))
+
+var v4: Array<number> = iArray;
+>v4 : Symbol(v4, Decl(consumer.ts, 10, 3))
+>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>iArray : Symbol(iArray, Decl(consumer.ts, 7, 27))
+
+import iObject = require('./expObject');
+>iObject : Symbol(iObject, Decl(consumer.ts, 10, 31))
+
+var v5: Object = iObject;
+>v5 : Symbol(v5, Decl(consumer.ts, 13, 3))
+>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>iObject : Symbol(iObject, Decl(consumer.ts, 10, 31))
+
+import iAny = require('./expAny');
+>iAny : Symbol(iAny, Decl(consumer.ts, 13, 25))
+
+var v6 = iAny;
+>v6 : Symbol(v6, Decl(consumer.ts, 16, 3))
+>iAny : Symbol(iAny, Decl(consumer.ts, 13, 25))
+
+import iGeneric = require('./expGeneric');
+>iGeneric : Symbol(iGeneric, Decl(consumer.ts, 16, 14))
+
+var v7: {<x>(p1: x): x} = iGeneric;
+>v7 : Symbol(v7, Decl(consumer.ts, 19, 3))
+>x : Symbol(x, Decl(consumer.ts, 19, 10))
+>p1 : Symbol(p1, Decl(consumer.ts, 19, 13))
+>x : Symbol(x, Decl(consumer.ts, 19, 10))
+>x : Symbol(x, Decl(consumer.ts, 19, 10))
+>iGeneric : Symbol(iGeneric, Decl(consumer.ts, 16, 14))
+
+=== tests/cases/conformance/externalModules/expString.ts ===
+var x = "test";
+>x : Symbol(x, Decl(expString.ts, 0, 3))
+
+export = x;
+>x : Symbol(x, Decl(expString.ts, 0, 3))
+
+=== tests/cases/conformance/externalModules/expNumber.ts ===
+var x = 42;
+>x : Symbol(x, Decl(expNumber.ts, 0, 3))
+
+export = x;
+>x : Symbol(x, Decl(expNumber.ts, 0, 3))
+
+=== tests/cases/conformance/externalModules/expBoolean.ts ===
+var x = true;
+>x : Symbol(x, Decl(expBoolean.ts, 0, 3))
+
+export = x;
+>x : Symbol(x, Decl(expBoolean.ts, 0, 3))
+
+=== tests/cases/conformance/externalModules/expArray.ts ===
+var x = [1,2];
+>x : Symbol(x, Decl(expArray.ts, 0, 3))
+
+export = x;
+>x : Symbol(x, Decl(expArray.ts, 0, 3))
+
+=== tests/cases/conformance/externalModules/expObject.ts ===
+var x = { answer: 42, when: 1776};
+>x : Symbol(x, Decl(expObject.ts, 0, 3))
+>answer : Symbol(answer, Decl(expObject.ts, 0, 9))
+>when : Symbol(when, Decl(expObject.ts, 0, 21))
+
+export = x;
+>x : Symbol(x, Decl(expObject.ts, 0, 3))
+
+=== tests/cases/conformance/externalModules/expAny.ts ===
+var x;
+>x : Symbol(x, Decl(expAny.ts, 0, 3))
+
+export = x;
+>x : Symbol(x, Decl(expAny.ts, 0, 3))
+
+=== tests/cases/conformance/externalModules/expGeneric.ts ===
+function x<T>(a: T){
+>x : Symbol(x, Decl(expGeneric.ts, 0, 0))
+>T : Symbol(T, Decl(expGeneric.ts, 0, 11))
+>a : Symbol(a, Decl(expGeneric.ts, 0, 14))
+>T : Symbol(T, Decl(expGeneric.ts, 0, 11))
+
+	return a;
+>a : Symbol(a, Decl(expGeneric.ts, 0, 14))
+}
+export = x;
+>x : Symbol(x, Decl(expGeneric.ts, 0, 0))
+
diff --git a/tests/baselines/reference/exportAssignTypes.types b/tests/baselines/reference/exportAssignTypes.types
new file mode 100644
index 00000000000..dc99d1512f1
--- /dev/null
+++ b/tests/baselines/reference/exportAssignTypes.types
@@ -0,0 +1,122 @@
+=== tests/cases/conformance/externalModules/consumer.ts ===
+import iString = require('./expString');
+>iString : string
+
+var v1: string = iString;
+>v1 : string
+>iString : string
+
+import iNumber = require('./expNumber');
+>iNumber : number
+
+var v2: number = iNumber;
+>v2 : number
+>iNumber : number
+
+import iBoolean = require('./expBoolean');
+>iBoolean : boolean
+
+var v3: boolean = iBoolean;
+>v3 : boolean
+>iBoolean : boolean
+
+import iArray = require('./expArray');
+>iArray : number[]
+
+var v4: Array<number> = iArray;
+>v4 : number[]
+>Array : T[]
+>iArray : number[]
+
+import iObject = require('./expObject');
+>iObject : { answer: number; when: number; }
+
+var v5: Object = iObject;
+>v5 : Object
+>Object : Object
+>iObject : { answer: number; when: number; }
+
+import iAny = require('./expAny');
+>iAny : any
+
+var v6 = iAny;
+>v6 : any
+>iAny : any
+
+import iGeneric = require('./expGeneric');
+>iGeneric : <T>(a: T) => T
+
+var v7: {<x>(p1: x): x} = iGeneric;
+>v7 : <x>(p1: x) => x
+>x : x
+>p1 : x
+>x : x
+>x : x
+>iGeneric : <T>(a: T) => T
+
+=== tests/cases/conformance/externalModules/expString.ts ===
+var x = "test";
+>x : string
+>"test" : string
+
+export = x;
+>x : string
+
+=== tests/cases/conformance/externalModules/expNumber.ts ===
+var x = 42;
+>x : number
+>42 : number
+
+export = x;
+>x : number
+
+=== tests/cases/conformance/externalModules/expBoolean.ts ===
+var x = true;
+>x : boolean
+>true : boolean
+
+export = x;
+>x : boolean
+
+=== tests/cases/conformance/externalModules/expArray.ts ===
+var x = [1,2];
+>x : number[]
+>[1,2] : number[]
+>1 : number
+>2 : number
+
+export = x;
+>x : number[]
+
+=== tests/cases/conformance/externalModules/expObject.ts ===
+var x = { answer: 42, when: 1776};
+>x : { answer: number; when: number; }
+>{ answer: 42, when: 1776} : { answer: number; when: number; }
+>answer : number
+>42 : number
+>when : number
+>1776 : number
+
+export = x;
+>x : { answer: number; when: number; }
+
+=== tests/cases/conformance/externalModules/expAny.ts ===
+var x;
+>x : any
+
+export = x;
+>x : any
+
+=== tests/cases/conformance/externalModules/expGeneric.ts ===
+function x<T>(a: T){
+>x : <T>(a: T) => T
+>T : T
+>a : T
+>T : T
+
+	return a;
+>a : T
+}
+export = x;
+>x : <T>(a: T) => T
+
diff --git a/tests/baselines/reference/exportAssignValueAndType.symbols b/tests/baselines/reference/exportAssignValueAndType.symbols
index faca2c6ffd0..3d5495b4874 100644
--- a/tests/baselines/reference/exportAssignValueAndType.symbols
+++ b/tests/baselines/reference/exportAssignValueAndType.symbols
@@ -4,7 +4,7 @@ declare module http {
 
 	export interface Server { openPort: number; }
 >Server : Symbol(Server, Decl(exportAssignValueAndType.ts, 0, 21))
->openPort : Symbol(openPort, Decl(exportAssignValueAndType.ts, 1, 26))
+>openPort : Symbol(Server.openPort, Decl(exportAssignValueAndType.ts, 1, 26))
 }
 
 interface server {
@@ -15,8 +15,8 @@ interface server {
 >Server : Symbol(http.Server, Decl(exportAssignValueAndType.ts, 0, 21))
 
     startTime: Date;
->startTime : Symbol(startTime, Decl(exportAssignValueAndType.ts, 5, 20))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>startTime : Symbol(server.startTime, Decl(exportAssignValueAndType.ts, 5, 20))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
  
 var x = 5;
@@ -24,7 +24,7 @@ var x = 5;
 
 var server = new Date();
 >server : Symbol(server, Decl(exportAssignValueAndType.ts, 2, 1), Decl(exportAssignValueAndType.ts, 10, 3))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 export = server;
 >server : Symbol(server, Decl(exportAssignValueAndType.ts, 2, 1), Decl(exportAssignValueAndType.ts, 10, 3))
diff --git a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.symbols b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.symbols
index e79faf36f35..79392369c3f 100644
--- a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.symbols
+++ b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.symbols
@@ -13,10 +13,10 @@ interface x {
 >x : Symbol(x, Decl(exportAssignedTypeAsTypeAnnotation_0.ts, 0, 0))
 
     (): Date;
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     foo: string;
->foo : Symbol(foo, Decl(exportAssignedTypeAsTypeAnnotation_0.ts, 2, 13))
+>foo : Symbol(x.foo, Decl(exportAssignedTypeAsTypeAnnotation_0.ts, 2, 13))
 }
 export = x;
 >x : Symbol(x, Decl(exportAssignedTypeAsTypeAnnotation_0.ts, 0, 0))
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/exportAssignmentClass.symbols b/tests/baselines/reference/exportAssignmentClass.symbols
index d0935ca8f8c..73a16572d65 100644
--- a/tests/baselines/reference/exportAssignmentClass.symbols
+++ b/tests/baselines/reference/exportAssignmentClass.symbols
@@ -15,7 +15,7 @@ var x = d.p;
 === tests/cases/compiler/exportAssignmentClass_A.ts ===
 class C { public p = 0; }
 >C : Symbol(C, Decl(exportAssignmentClass_A.ts, 0, 0))
->p : Symbol(p, Decl(exportAssignmentClass_A.ts, 0, 9))
+>p : Symbol(C.p, Decl(exportAssignmentClass_A.ts, 0, 9))
 
 export = C;
 >C : Symbol(C, Decl(exportAssignmentClass_A.ts, 0, 0))
diff --git a/tests/baselines/reference/exportAssignmentGenericType.symbols b/tests/baselines/reference/exportAssignmentGenericType.symbols
index ca228e7092e..7bf0ac178b5 100644
--- a/tests/baselines/reference/exportAssignmentGenericType.symbols
+++ b/tests/baselines/reference/exportAssignmentGenericType.symbols
@@ -18,7 +18,7 @@ class Foo<T>{
 >T : Symbol(T, Decl(foo_0.ts, 0, 10))
 
 	test: T;
->test : Symbol(test, Decl(foo_0.ts, 0, 13))
+>test : Symbol(Foo.test, Decl(foo_0.ts, 0, 13))
 >T : Symbol(T, Decl(foo_0.ts, 0, 10))
 }
 export = Foo;
diff --git a/tests/baselines/reference/exportAssignmentInterface.symbols b/tests/baselines/reference/exportAssignmentInterface.symbols
index 22f344a2cb9..d76c78303e8 100644
--- a/tests/baselines/reference/exportAssignmentInterface.symbols
+++ b/tests/baselines/reference/exportAssignmentInterface.symbols
@@ -17,7 +17,7 @@ interface A {
 >A : Symbol(A, Decl(exportAssignmentInterface_A.ts, 0, 0))
 
 	p1: number;
->p1 : Symbol(p1, Decl(exportAssignmentInterface_A.ts, 0, 13))
+>p1 : Symbol(A.p1, Decl(exportAssignmentInterface_A.ts, 0, 13))
 }
 
 export = A;
diff --git a/tests/baselines/reference/exportAssignmentMergedInterface.symbols b/tests/baselines/reference/exportAssignmentMergedInterface.symbols
index a199ed4e6c5..2eb5593aa44 100644
--- a/tests/baselines/reference/exportAssignmentMergedInterface.symbols
+++ b/tests/baselines/reference/exportAssignmentMergedInterface.symbols
@@ -42,7 +42,7 @@ interface Foo {
 >a : Symbol(a, Decl(foo_0.ts, 1, 2))
 
 	b: string;
->b : Symbol(b, Decl(foo_0.ts, 1, 19))
+>b : Symbol(Foo.b, Decl(foo_0.ts, 1, 19))
 }
 interface Foo {
 >Foo : Symbol(Foo, Decl(foo_0.ts, 0, 0), Decl(foo_0.ts, 3, 1))
@@ -51,10 +51,10 @@ interface Foo {
 >a : Symbol(a, Decl(foo_0.ts, 5, 2))
 
 	c: boolean;
->c : Symbol(c, Decl(foo_0.ts, 5, 21))
+>c : Symbol(Foo.c, Decl(foo_0.ts, 5, 21))
 
 	d: {x: number; y: number};
->d : Symbol(d, Decl(foo_0.ts, 6, 12))
+>d : Symbol(Foo.d, Decl(foo_0.ts, 6, 12))
 >x : Symbol(x, Decl(foo_0.ts, 7, 5))
 >y : Symbol(y, Decl(foo_0.ts, 7, 15))
 }
diff --git a/tests/baselines/reference/exportAssignmentOfGenericType1.symbols b/tests/baselines/reference/exportAssignmentOfGenericType1.symbols
index 8ae7dbc73a9..263d7e5f6af 100644
--- a/tests/baselines/reference/exportAssignmentOfGenericType1.symbols
+++ b/tests/baselines/reference/exportAssignmentOfGenericType1.symbols
@@ -24,6 +24,6 @@ export = T;
 class T<X> { foo: X; }
 >T : Symbol(T, Decl(exportAssignmentOfGenericType1_0.ts, 0, 11))
 >X : Symbol(X, Decl(exportAssignmentOfGenericType1_0.ts, 1, 8))
->foo : Symbol(foo, Decl(exportAssignmentOfGenericType1_0.ts, 1, 12))
+>foo : Symbol(T.foo, Decl(exportAssignmentOfGenericType1_0.ts, 1, 12))
 >X : Symbol(X, Decl(exportAssignmentOfGenericType1_0.ts, 1, 8))
 
diff --git a/tests/baselines/reference/exportAssignmentTopLevelClodule.symbols b/tests/baselines/reference/exportAssignmentTopLevelClodule.symbols
index d672457f451..c024b8d51e2 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelClodule.symbols
+++ b/tests/baselines/reference/exportAssignmentTopLevelClodule.symbols
@@ -17,7 +17,7 @@ class Foo {
 >Foo : Symbol(Foo, Decl(foo_0.ts, 0, 0), Decl(foo_0.ts, 2, 1))
 
 	test = "test";
->test : Symbol(test, Decl(foo_0.ts, 0, 11))
+>test : Symbol(Foo.test, Decl(foo_0.ts, 0, 11))
 }
 module Foo {
 >Foo : Symbol(Foo, Decl(foo_0.ts, 0, 0), Decl(foo_0.ts, 2, 1))
diff --git a/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.symbols b/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.symbols
index 80a48dff3ad..30ef72d18bf 100644
--- a/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.symbols
+++ b/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.symbols
@@ -14,13 +14,13 @@ module m2 {
 >connectExport : Symbol(connectExport, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 3, 5))
 
         use: (mod: connectModule) => connectExport;
->use : Symbol(use, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 4, 36))
+>use : Symbol(connectExport.use, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 4, 36))
 >mod : Symbol(mod, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 5, 14))
 >connectModule : Symbol(connectModule, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 0, 11))
 >connectExport : Symbol(connectExport, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 3, 5))
 
         listen: (port: number) => void;
->listen : Symbol(listen, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 5, 51))
+>listen : Symbol(connectExport.listen, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 5, 51))
 >port : Symbol(port, Decl(exportAssignmentWithImportStatementPrivacyError.ts, 6, 17))
     }
 
diff --git a/tests/baselines/reference/exportAssignmentWithPrivacyError.symbols b/tests/baselines/reference/exportAssignmentWithPrivacyError.symbols
index f69a4e00823..35807a4edea 100644
--- a/tests/baselines/reference/exportAssignmentWithPrivacyError.symbols
+++ b/tests/baselines/reference/exportAssignmentWithPrivacyError.symbols
@@ -11,13 +11,13 @@ interface connectexport {
 >connectexport : Symbol(connectexport, Decl(exportAssignmentWithPrivacyError.ts, 2, 1))
 
     use: (mod: connectmodule) => connectexport;
->use : Symbol(use, Decl(exportAssignmentWithPrivacyError.ts, 3, 25))
+>use : Symbol(connectexport.use, Decl(exportAssignmentWithPrivacyError.ts, 3, 25))
 >mod : Symbol(mod, Decl(exportAssignmentWithPrivacyError.ts, 4, 10))
 >connectmodule : Symbol(connectmodule, Decl(exportAssignmentWithPrivacyError.ts, 0, 0))
 >connectexport : Symbol(connectexport, Decl(exportAssignmentWithPrivacyError.ts, 2, 1))
 
     listen: (port: number) => void;
->listen : Symbol(listen, Decl(exportAssignmentWithPrivacyError.ts, 4, 47))
+>listen : Symbol(connectexport.listen, Decl(exportAssignmentWithPrivacyError.ts, 4, 47))
 >port : Symbol(port, Decl(exportAssignmentWithPrivacyError.ts, 5, 13))
 }
 
diff --git a/tests/baselines/reference/exportCodeGen.symbols b/tests/baselines/reference/exportCodeGen.symbols
index fbc70cf8324..b664704d049 100644
--- a/tests/baselines/reference/exportCodeGen.symbols
+++ b/tests/baselines/reference/exportCodeGen.symbols
@@ -66,11 +66,11 @@ module E {
 
     export interface I { id: number }
 >I : Symbol(I, Decl(exportCodeGen.ts, 35, 28))
->id : Symbol(id, Decl(exportCodeGen.ts, 36, 24))
+>id : Symbol(I.id, Decl(exportCodeGen.ts, 36, 24))
 
     export class C { name: string }
 >C : Symbol(C, Decl(exportCodeGen.ts, 36, 37))
->name : Symbol(name, Decl(exportCodeGen.ts, 37, 20))
+>name : Symbol(C.name, Decl(exportCodeGen.ts, 37, 20))
 
     export module M {
 >M : Symbol(M, Decl(exportCodeGen.ts, 37, 35))
@@ -94,11 +94,11 @@ module F {
 
     interface I { id: number }
 >I : Symbol(I, Decl(exportCodeGen.ts, 47, 21))
->id : Symbol(id, Decl(exportCodeGen.ts, 48, 17))
+>id : Symbol(I.id, Decl(exportCodeGen.ts, 48, 17))
 
     class C { name: string }
 >C : Symbol(C, Decl(exportCodeGen.ts, 48, 30))
->name : Symbol(name, Decl(exportCodeGen.ts, 49, 13))
+>name : Symbol(C.name, Decl(exportCodeGen.ts, 49, 13))
 
     module M {
 >M : Symbol(M, Decl(exportCodeGen.ts, 49, 28))
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.errors.txt b/tests/baselines/reference/exportDeclaredModule.errors.txt
deleted file mode 100644
index c235d4c448f..00000000000
--- a/tests/baselines/reference/exportDeclaredModule.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-tests/cases/conformance/externalModules/foo1.ts(6,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-
-
-==== tests/cases/conformance/externalModules/foo2.ts (0 errors) ====
-    import foo1 = require('./foo1');
-    var x: number = foo1.b();
-==== tests/cases/conformance/externalModules/foo1.ts (1 errors) ====
-    
-    declare module M1 {
-    	export var a: string; 
-    	export function b(): number;
-    }
-    export = M1;
-    ~~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-    
\ No newline at end of file
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/exportDeclaredModule.symbols b/tests/baselines/reference/exportDeclaredModule.symbols
new file mode 100644
index 00000000000..a5259f795d9
--- /dev/null
+++ b/tests/baselines/reference/exportDeclaredModule.symbols
@@ -0,0 +1,24 @@
+=== tests/cases/conformance/externalModules/foo2.ts ===
+import foo1 = require('./foo1');
+>foo1 : Symbol(foo1, Decl(foo2.ts, 0, 0))
+
+var x: number = foo1.b();
+>x : Symbol(x, Decl(foo2.ts, 1, 3))
+>foo1.b : Symbol(foo1.b, Decl(foo1.ts, 2, 22))
+>foo1 : Symbol(foo1, Decl(foo2.ts, 0, 0))
+>b : Symbol(foo1.b, Decl(foo1.ts, 2, 22))
+
+=== tests/cases/conformance/externalModules/foo1.ts ===
+
+declare module M1 {
+>M1 : Symbol(M1, Decl(foo1.ts, 0, 0))
+
+	export var a: string; 
+>a : Symbol(a, Decl(foo1.ts, 2, 11))
+
+	export function b(): number;
+>b : Symbol(b, Decl(foo1.ts, 2, 22))
+}
+export = M1;
+>M1 : Symbol(M1, Decl(foo1.ts, 0, 0))
+
diff --git a/tests/baselines/reference/exportDeclaredModule.types b/tests/baselines/reference/exportDeclaredModule.types
new file mode 100644
index 00000000000..00bb50ffa09
--- /dev/null
+++ b/tests/baselines/reference/exportDeclaredModule.types
@@ -0,0 +1,25 @@
+=== tests/cases/conformance/externalModules/foo2.ts ===
+import foo1 = require('./foo1');
+>foo1 : typeof foo1
+
+var x: number = foo1.b();
+>x : number
+>foo1.b() : number
+>foo1.b : () => number
+>foo1 : typeof foo1
+>b : () => number
+
+=== tests/cases/conformance/externalModules/foo1.ts ===
+
+declare module M1 {
+>M1 : typeof M1
+
+	export var a: string; 
+>a : string
+
+	export function b(): number;
+>b : () => number
+}
+export = M1;
+>M1 : typeof M1
+
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/exportEqualNamespaces.symbols b/tests/baselines/reference/exportEqualNamespaces.symbols
index 1773883c68b..0c2890b028a 100644
--- a/tests/baselines/reference/exportEqualNamespaces.symbols
+++ b/tests/baselines/reference/exportEqualNamespaces.symbols
@@ -15,8 +15,8 @@ interface server {
 >Server : Symbol(server.Server, Decl(exportEqualNamespaces.ts, 0, 23))
 
     startTime: Date;
->startTime : Symbol(startTime, Decl(exportEqualNamespaces.ts, 5, 22))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>startTime : Symbol(server.startTime, Decl(exportEqualNamespaces.ts, 5, 22))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
  
 var x = 5;
@@ -24,7 +24,7 @@ var x = 5;
 
 var server = new Date();
 >server : Symbol(server, Decl(exportEqualNamespaces.ts, 0, 0), Decl(exportEqualNamespaces.ts, 2, 1), Decl(exportEqualNamespaces.ts, 10, 3))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 export = server;
 >server : Symbol(server, Decl(exportEqualNamespaces.ts, 0, 0), Decl(exportEqualNamespaces.ts, 2, 1), Decl(exportEqualNamespaces.ts, 10, 3))
diff --git a/tests/baselines/reference/exportEqualsAmd.js b/tests/baselines/reference/exportEqualsAmd.js
new file mode 100644
index 00000000000..a0f029589d6
--- /dev/null
+++ b/tests/baselines/reference/exportEqualsAmd.js
@@ -0,0 +1,9 @@
+//// [exportEqualsAmd.ts]
+export = { ["hi"]: "there" };
+
+//// [exportEqualsAmd.js]
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    return (_a = {}, _a["hi"] = "there", _a);
+    var _a;
+});
diff --git a/tests/baselines/reference/exportEqualsAmd.symbols b/tests/baselines/reference/exportEqualsAmd.symbols
new file mode 100644
index 00000000000..db087c56786
--- /dev/null
+++ b/tests/baselines/reference/exportEqualsAmd.symbols
@@ -0,0 +1,3 @@
+=== tests/cases/compiler/exportEqualsAmd.ts ===
+export = { ["hi"]: "there" };
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/exportEqualsAmd.types b/tests/baselines/reference/exportEqualsAmd.types
new file mode 100644
index 00000000000..f5b1bb49910
--- /dev/null
+++ b/tests/baselines/reference/exportEqualsAmd.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/exportEqualsAmd.ts ===
+export = { ["hi"]: "there" };
+>{ ["hi"]: "there" } : { ["hi"]: string; }
+>"hi" : string
+>"there" : string
+
diff --git a/tests/baselines/reference/exportEqualsCommonJs.js b/tests/baselines/reference/exportEqualsCommonJs.js
new file mode 100644
index 00000000000..01b7a43b310
--- /dev/null
+++ b/tests/baselines/reference/exportEqualsCommonJs.js
@@ -0,0 +1,7 @@
+//// [exportEqualsCommonJs.ts]
+export = { ["hi"]: "there" };
+
+//// [exportEqualsCommonJs.js]
+"use strict";
+module.exports = (_a = {}, _a["hi"] = "there", _a);
+var _a;
diff --git a/tests/baselines/reference/exportEqualsCommonJs.symbols b/tests/baselines/reference/exportEqualsCommonJs.symbols
new file mode 100644
index 00000000000..1c92a34bbc2
--- /dev/null
+++ b/tests/baselines/reference/exportEqualsCommonJs.symbols
@@ -0,0 +1,3 @@
+=== tests/cases/compiler/exportEqualsCommonJs.ts ===
+export = { ["hi"]: "there" };
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/exportEqualsCommonJs.types b/tests/baselines/reference/exportEqualsCommonJs.types
new file mode 100644
index 00000000000..13b968595be
--- /dev/null
+++ b/tests/baselines/reference/exportEqualsCommonJs.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/exportEqualsCommonJs.ts ===
+export = { ["hi"]: "there" };
+>{ ["hi"]: "there" } : { ["hi"]: string; }
+>"hi" : string
+>"there" : string
+
diff --git a/tests/baselines/reference/exportEqualsDefaultProperty.js b/tests/baselines/reference/exportEqualsDefaultProperty.js
new file mode 100644
index 00000000000..6d75ef5d95d
--- /dev/null
+++ b/tests/baselines/reference/exportEqualsDefaultProperty.js
@@ -0,0 +1,27 @@
+//// [tests/cases/compiler/exportEqualsDefaultProperty.ts] ////
+
+//// [exp.ts]
+
+var x = {
+    "greeting": "hello, world",
+    "default": 42
+};
+
+export = x
+
+//// [imp.ts]
+import foo from "./exp";
+foo.toExponential(2);
+
+
+//// [exp.js]
+"use strict";
+var x = {
+    "greeting": "hello, world",
+    "default": 42
+};
+module.exports = x;
+//// [imp.js]
+"use strict";
+var exp_1 = require("./exp");
+exp_1["default"].toExponential(2);
diff --git a/tests/baselines/reference/exportEqualsDefaultProperty.symbols b/tests/baselines/reference/exportEqualsDefaultProperty.symbols
new file mode 100644
index 00000000000..54bbbde6956
--- /dev/null
+++ b/tests/baselines/reference/exportEqualsDefaultProperty.symbols
@@ -0,0 +1,21 @@
+=== tests/cases/compiler/exp.ts ===
+
+var x = {
+>x : Symbol(x, Decl(exp.ts, 1, 3))
+
+    "greeting": "hello, world",
+    "default": 42
+};
+
+export = x
+>x : Symbol(x, Decl(exp.ts, 1, 3))
+
+=== tests/cases/compiler/imp.ts ===
+import foo from "./exp";
+>foo : Symbol(foo, Decl(imp.ts, 0, 6))
+
+foo.toExponential(2);
+>foo.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --))
+>foo : Symbol(foo, Decl(imp.ts, 0, 6))
+>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --))
+
diff --git a/tests/baselines/reference/exportEqualsDefaultProperty.types b/tests/baselines/reference/exportEqualsDefaultProperty.types
new file mode 100644
index 00000000000..31a6c8052f9
--- /dev/null
+++ b/tests/baselines/reference/exportEqualsDefaultProperty.types
@@ -0,0 +1,28 @@
+=== tests/cases/compiler/exp.ts ===
+
+var x = {
+>x : { "greeting": string; "default": number; }
+>{    "greeting": "hello, world",    "default": 42} : { "greeting": string; "default": number; }
+
+    "greeting": "hello, world",
+>"hello, world" : string
+
+    "default": 42
+>42 : number
+
+};
+
+export = x
+>x : { "greeting": string; "default": number; }
+
+=== tests/cases/compiler/imp.ts ===
+import foo from "./exp";
+>foo : number
+
+foo.toExponential(2);
+>foo.toExponential(2) : string
+>foo.toExponential : (fractionDigits?: number) => string
+>foo : number
+>toExponential : (fractionDigits?: number) => string
+>2 : number
+
diff --git a/tests/baselines/reference/exportEqualsUmd.js b/tests/baselines/reference/exportEqualsUmd.js
new file mode 100644
index 00000000000..a9b75978d06
--- /dev/null
+++ b/tests/baselines/reference/exportEqualsUmd.js
@@ -0,0 +1,16 @@
+//// [exportEqualsUmd.ts]
+export = { ["hi"]: "there" };
+
+//// [exportEqualsUmd.js]
+(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);
+    }
+})(["require", "exports"], function (require, exports) {
+    "use strict";
+    return (_a = {}, _a["hi"] = "there", _a);
+    var _a;
+});
diff --git a/tests/baselines/reference/exportEqualsUmd.symbols b/tests/baselines/reference/exportEqualsUmd.symbols
new file mode 100644
index 00000000000..480b8389030
--- /dev/null
+++ b/tests/baselines/reference/exportEqualsUmd.symbols
@@ -0,0 +1,3 @@
+=== tests/cases/compiler/exportEqualsUmd.ts ===
+export = { ["hi"]: "there" };
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/exportEqualsUmd.types b/tests/baselines/reference/exportEqualsUmd.types
new file mode 100644
index 00000000000..ab456f0ae48
--- /dev/null
+++ b/tests/baselines/reference/exportEqualsUmd.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/exportEqualsUmd.ts ===
+export = { ["hi"]: "there" };
+>{ ["hi"]: "there" } : { ["hi"]: string; }
+>"hi" : string
+>"there" : string
+
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/exportImport.symbols b/tests/baselines/reference/exportImport.symbols
index 02132338834..9f76955b9e6 100644
--- a/tests/baselines/reference/exportImport.symbols
+++ b/tests/baselines/reference/exportImport.symbols
@@ -19,7 +19,7 @@ export = Widget1
 
 class Widget1 { name = 'one'; }
 >Widget1 : Symbol(Widget1, Decl(w1.ts, 1, 16))
->name : Symbol(name, Decl(w1.ts, 2, 15))
+>name : Symbol(Widget1.name, Decl(w1.ts, 2, 15))
 
 === tests/cases/compiler/exporter.ts ===
 export import w = require('./w1');
diff --git a/tests/baselines/reference/exportImportAlias.symbols b/tests/baselines/reference/exportImportAlias.symbols
index 131f53919ab..0f74969e591 100644
--- a/tests/baselines/reference/exportImportAlias.symbols
+++ b/tests/baselines/reference/exportImportAlias.symbols
@@ -11,8 +11,8 @@ module A {
 >Point : Symbol(Point, Decl(exportImportAlias.ts, 4, 32))
 
         constructor(public x: number, public y: number) { }
->x : Symbol(x, Decl(exportImportAlias.ts, 6, 20))
->y : Symbol(y, Decl(exportImportAlias.ts, 6, 37))
+>x : Symbol(Point.x, Decl(exportImportAlias.ts, 6, 20))
+>y : Symbol(Point.y, Decl(exportImportAlias.ts, 6, 37))
     }
     export module B {
 >B : Symbol(B, Decl(exportImportAlias.ts, 7, 5))
@@ -21,7 +21,7 @@ module A {
 >Id : Symbol(Id, Decl(exportImportAlias.ts, 8, 21))
 
             name: string;
->name : Symbol(name, Decl(exportImportAlias.ts, 9, 29))
+>name : Symbol(Id.name, Decl(exportImportAlias.ts, 9, 29))
         }
     }
 }
@@ -79,8 +79,8 @@ module X {
 >Point : Symbol(Point, Decl(exportImportAlias.ts, 29, 21))
 
             constructor(public x: number, public y: number) { }
->x : Symbol(x, Decl(exportImportAlias.ts, 31, 24))
->y : Symbol(y, Decl(exportImportAlias.ts, 31, 41))
+>x : Symbol(Point.x, Decl(exportImportAlias.ts, 31, 24))
+>y : Symbol(Point.y, Decl(exportImportAlias.ts, 31, 41))
         }
     }
 }
@@ -118,7 +118,7 @@ module K {
 >L : Symbol(L, Decl(exportImportAlias.ts, 45, 10), Decl(exportImportAlias.ts, 48, 5))
 
         constructor(public name: string) { }
->name : Symbol(name, Decl(exportImportAlias.ts, 47, 20))
+>name : Symbol(L.name, Decl(exportImportAlias.ts, 47, 20))
     }
 
     export module L {
@@ -131,10 +131,10 @@ module K {
 >Point : Symbol(Point, Decl(exportImportAlias.ts, 51, 26))
 
             x: number;
->x : Symbol(x, Decl(exportImportAlias.ts, 52, 32))
+>x : Symbol(Point.x, Decl(exportImportAlias.ts, 52, 32))
 
             y: number;
->y : Symbol(y, Decl(exportImportAlias.ts, 53, 22))
+>y : Symbol(Point.y, Decl(exportImportAlias.ts, 53, 22))
         }
     }
 }
diff --git a/tests/baselines/reference/exportImportAndClodule.symbols b/tests/baselines/reference/exportImportAndClodule.symbols
index 23995243bf9..1c6cbc6b784 100644
--- a/tests/baselines/reference/exportImportAndClodule.symbols
+++ b/tests/baselines/reference/exportImportAndClodule.symbols
@@ -6,7 +6,7 @@ module K {
 >L : Symbol(L, Decl(exportImportAndClodule.ts, 0, 10), Decl(exportImportAndClodule.ts, 3, 5))
 
         constructor(public name: string) { }
->name : Symbol(name, Decl(exportImportAndClodule.ts, 2, 20))
+>name : Symbol(L.name, Decl(exportImportAndClodule.ts, 2, 20))
     }
     export module L {
 >L : Symbol(L, Decl(exportImportAndClodule.ts, 0, 10), Decl(exportImportAndClodule.ts, 3, 5))
@@ -18,10 +18,10 @@ module K {
 >Point : Symbol(Point, Decl(exportImportAndClodule.ts, 5, 26))
 
             x: number;
->x : Symbol(x, Decl(exportImportAndClodule.ts, 6, 32))
+>x : Symbol(Point.x, Decl(exportImportAndClodule.ts, 6, 32))
 
             y: number;
->y : Symbol(y, Decl(exportImportAndClodule.ts, 7, 22))
+>y : Symbol(Point.y, Decl(exportImportAndClodule.ts, 7, 22))
         }
     }
 }
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/exportImportNonInstantiatedModule.symbols b/tests/baselines/reference/exportImportNonInstantiatedModule.symbols
index 6e044368bfb..1556427e09e 100644
--- a/tests/baselines/reference/exportImportNonInstantiatedModule.symbols
+++ b/tests/baselines/reference/exportImportNonInstantiatedModule.symbols
@@ -4,7 +4,7 @@ module A {
 
     export interface I { x: number }
 >I : Symbol(I, Decl(exportImportNonInstantiatedModule.ts, 0, 10))
->x : Symbol(x, Decl(exportImportNonInstantiatedModule.ts, 1, 24))
+>x : Symbol(I.x, Decl(exportImportNonInstantiatedModule.ts, 1, 24))
 }
 
 module B {
diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule2.symbols b/tests/baselines/reference/exportImportNonInstantiatedModule2.symbols
index 02ccf97b161..148fd03b828 100644
--- a/tests/baselines/reference/exportImportNonInstantiatedModule2.symbols
+++ b/tests/baselines/reference/exportImportNonInstantiatedModule2.symbols
@@ -17,7 +17,7 @@ export = Widget1
 
 interface Widget1 { name: string; }
 >Widget1 : Symbol(Widget1, Decl(w1.ts, 1, 16))
->name : Symbol(name, Decl(w1.ts, 2, 19))
+>name : Symbol(Widget1.name, Decl(w1.ts, 2, 19))
 
 === tests/cases/compiler/exporter.ts ===
 export import w = require('./w1');
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/exportNonVisibleType.errors.txt b/tests/baselines/reference/exportNonVisibleType.errors.txt
deleted file mode 100644
index bc4dac4ca58..00000000000
--- a/tests/baselines/reference/exportNonVisibleType.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-tests/cases/conformance/externalModules/foo1.ts(7,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-
-
-==== tests/cases/conformance/externalModules/foo1.ts (1 errors) ====
-    interface I1 {
-    	a: string;
-    	b: number;
-    }
-    
-    var x: I1 = {a: "test", b: 42};
-    export = x; // Should fail, I1 not exported.
-    ~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-    
-    
-==== tests/cases/conformance/externalModules/foo2.ts (0 errors) ====
-    interface I1 {
-    	a: string;
-    	b: number;
-    }
-    
-    class C1 {
-    	m1: I1;
-    }
-    
-    export = C1; // Should fail, type I1 of visible member C1.m1 not exported.
-    
-==== tests/cases/conformance/externalModules/foo3.ts (0 errors) ====
-    interface I1 {
-    	a: string;
-    	b: number;
-    }
-    
-    class C1 {
-    	private m1: I1;
-    }
-    
-    export = C1; // Should work, private type I1 of visible class C1 only used in private member m1.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportNonVisibleType.symbols b/tests/baselines/reference/exportNonVisibleType.symbols
new file mode 100644
index 00000000000..6d08b3cf447
--- /dev/null
+++ b/tests/baselines/reference/exportNonVisibleType.symbols
@@ -0,0 +1,65 @@
+=== tests/cases/conformance/externalModules/foo1.ts ===
+interface I1 {
+>I1 : Symbol(I1, Decl(foo1.ts, 0, 0))
+
+	a: string;
+>a : Symbol(I1.a, Decl(foo1.ts, 0, 14))
+
+	b: number;
+>b : Symbol(I1.b, Decl(foo1.ts, 1, 11))
+}
+
+var x: I1 = {a: "test", b: 42};
+>x : Symbol(x, Decl(foo1.ts, 5, 3))
+>I1 : Symbol(I1, Decl(foo1.ts, 0, 0))
+>a : Symbol(a, Decl(foo1.ts, 5, 13))
+>b : Symbol(b, Decl(foo1.ts, 5, 23))
+
+export = x; // Should fail, I1 not exported.
+>x : Symbol(x, Decl(foo1.ts, 5, 3))
+
+
+=== tests/cases/conformance/externalModules/foo2.ts ===
+interface I1 {
+>I1 : Symbol(I1, Decl(foo2.ts, 0, 0))
+
+	a: string;
+>a : Symbol(I1.a, Decl(foo2.ts, 0, 14))
+
+	b: number;
+>b : Symbol(I1.b, Decl(foo2.ts, 1, 11))
+}
+
+class C1 {
+>C1 : Symbol(C1, Decl(foo2.ts, 3, 1))
+
+	m1: I1;
+>m1 : Symbol(C1.m1, Decl(foo2.ts, 5, 10))
+>I1 : Symbol(I1, Decl(foo2.ts, 0, 0))
+}
+
+export = C1; // Should fail, type I1 of visible member C1.m1 not exported.
+>C1 : Symbol(C1, Decl(foo2.ts, 3, 1))
+
+=== tests/cases/conformance/externalModules/foo3.ts ===
+interface I1 {
+>I1 : Symbol(I1, Decl(foo3.ts, 0, 0))
+
+	a: string;
+>a : Symbol(I1.a, Decl(foo3.ts, 0, 14))
+
+	b: number;
+>b : Symbol(I1.b, Decl(foo3.ts, 1, 11))
+}
+
+class C1 {
+>C1 : Symbol(C1, Decl(foo3.ts, 3, 1))
+
+	private m1: I1;
+>m1 : Symbol(C1.m1, Decl(foo3.ts, 5, 10))
+>I1 : Symbol(I1, Decl(foo3.ts, 0, 0))
+}
+
+export = C1; // Should work, private type I1 of visible class C1 only used in private member m1.
+>C1 : Symbol(C1, Decl(foo3.ts, 3, 1))
+
diff --git a/tests/baselines/reference/exportNonVisibleType.types b/tests/baselines/reference/exportNonVisibleType.types
new file mode 100644
index 00000000000..2ad420ac531
--- /dev/null
+++ b/tests/baselines/reference/exportNonVisibleType.types
@@ -0,0 +1,68 @@
+=== tests/cases/conformance/externalModules/foo1.ts ===
+interface I1 {
+>I1 : I1
+
+	a: string;
+>a : string
+
+	b: number;
+>b : number
+}
+
+var x: I1 = {a: "test", b: 42};
+>x : I1
+>I1 : I1
+>{a: "test", b: 42} : { a: string; b: number; }
+>a : string
+>"test" : string
+>b : number
+>42 : number
+
+export = x; // Should fail, I1 not exported.
+>x : I1
+
+
+=== tests/cases/conformance/externalModules/foo2.ts ===
+interface I1 {
+>I1 : I1
+
+	a: string;
+>a : string
+
+	b: number;
+>b : number
+}
+
+class C1 {
+>C1 : C1
+
+	m1: I1;
+>m1 : I1
+>I1 : I1
+}
+
+export = C1; // Should fail, type I1 of visible member C1.m1 not exported.
+>C1 : C1
+
+=== tests/cases/conformance/externalModules/foo3.ts ===
+interface I1 {
+>I1 : I1
+
+	a: string;
+>a : string
+
+	b: number;
+>b : number
+}
+
+class C1 {
+>C1 : C1
+
+	private m1: I1;
+>m1 : I1
+>I1 : I1
+}
+
+export = C1; // Should work, private type I1 of visible class C1 only used in private member m1.
+>C1 : C1
+
diff --git a/tests/baselines/reference/exportPrivateType.symbols b/tests/baselines/reference/exportPrivateType.symbols
index ecb71869b39..a955870e99d 100644
--- a/tests/baselines/reference/exportPrivateType.symbols
+++ b/tests/baselines/reference/exportPrivateType.symbols
@@ -6,10 +6,10 @@ module foo {
 >C1 : Symbol(C1, Decl(exportPrivateType.ts, 0, 12))
 
         x: string;
->x : Symbol(x, Decl(exportPrivateType.ts, 1, 14))
+>x : Symbol(C1.x, Decl(exportPrivateType.ts, 1, 14))
 
         y: C1;
->y : Symbol(y, Decl(exportPrivateType.ts, 2, 18))
+>y : Symbol(C1.y, Decl(exportPrivateType.ts, 2, 18))
 >C1 : Symbol(C1, Decl(exportPrivateType.ts, 0, 12))
     }
  
@@ -17,7 +17,7 @@ module foo {
 >C2 : Symbol(C2, Decl(exportPrivateType.ts, 4, 5))
 
         test() { return true; }
->test : Symbol(test, Decl(exportPrivateType.ts, 6, 14))
+>test : Symbol(C2.test, Decl(exportPrivateType.ts, 6, 14))
     }
  
     interface I1 {
@@ -37,10 +37,10 @@ module foo {
 >I2 : Symbol(I2, Decl(exportPrivateType.ts, 13, 5))
 
         x: string;
->x : Symbol(x, Decl(exportPrivateType.ts, 15, 18))
+>x : Symbol(I2.x, Decl(exportPrivateType.ts, 15, 18))
 
         y: number;
->y : Symbol(y, Decl(exportPrivateType.ts, 16, 18))
+>y : Symbol(I2.y, Decl(exportPrivateType.ts, 16, 18))
     }
  
     // None of the types are exported, so per section 10.3, should all be errors
diff --git a/tests/baselines/reference/exportRedeclarationTypeAliases.js b/tests/baselines/reference/exportRedeclarationTypeAliases.js
new file mode 100644
index 00000000000..b1e2e200634
--- /dev/null
+++ b/tests/baselines/reference/exportRedeclarationTypeAliases.js
@@ -0,0 +1,9 @@
+//// [exportRedeclarationTypeAliases.ts]
+export type Foo = number;
+export function Foo(): number;
+export function Foo(): any {}
+
+//// [exportRedeclarationTypeAliases.js]
+"use strict";
+function Foo() { }
+exports.Foo = Foo;
diff --git a/tests/baselines/reference/exportRedeclarationTypeAliases.symbols b/tests/baselines/reference/exportRedeclarationTypeAliases.symbols
new file mode 100644
index 00000000000..6561692e307
--- /dev/null
+++ b/tests/baselines/reference/exportRedeclarationTypeAliases.symbols
@@ -0,0 +1,10 @@
+=== tests/cases/compiler/exportRedeclarationTypeAliases.ts ===
+export type Foo = number;
+>Foo : Symbol(Foo, Decl(exportRedeclarationTypeAliases.ts, 0, 0), Decl(exportRedeclarationTypeAliases.ts, 0, 25), Decl(exportRedeclarationTypeAliases.ts, 1, 30))
+
+export function Foo(): number;
+>Foo : Symbol(Foo, Decl(exportRedeclarationTypeAliases.ts, 0, 0), Decl(exportRedeclarationTypeAliases.ts, 0, 25), Decl(exportRedeclarationTypeAliases.ts, 1, 30))
+
+export function Foo(): any {}
+>Foo : Symbol(Foo, Decl(exportRedeclarationTypeAliases.ts, 0, 0), Decl(exportRedeclarationTypeAliases.ts, 0, 25), Decl(exportRedeclarationTypeAliases.ts, 1, 30))
+
diff --git a/tests/baselines/reference/exportRedeclarationTypeAliases.types b/tests/baselines/reference/exportRedeclarationTypeAliases.types
new file mode 100644
index 00000000000..f5c987373b6
--- /dev/null
+++ b/tests/baselines/reference/exportRedeclarationTypeAliases.types
@@ -0,0 +1,10 @@
+=== tests/cases/compiler/exportRedeclarationTypeAliases.ts ===
+export type Foo = number;
+>Foo : number
+
+export function Foo(): number;
+>Foo : () => number
+
+export function Foo(): any {}
+>Foo : () => number
+
diff --git a/tests/baselines/reference/exportSpecifierForAGlobal.errors.txt b/tests/baselines/reference/exportSpecifierForAGlobal.errors.txt
index 6df9c6de1ef..559b9d5fbfe 100644
--- a/tests/baselines/reference/exportSpecifierForAGlobal.errors.txt
+++ b/tests/baselines/reference/exportSpecifierForAGlobal.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/b.ts(1,9): error TS2661: Cannot re-export name that is not defined in the module.
+tests/cases/compiler/b.ts(1,9): error TS2661: Cannot export 'X'. Only local declarations can be exported from a module.
 
 
 ==== tests/cases/compiler/a.d.ts (0 errors) ====
@@ -8,7 +8,7 @@ tests/cases/compiler/b.ts(1,9): error TS2661: Cannot re-export name that is not
 ==== tests/cases/compiler/b.ts (1 errors) ====
     export {X};
             ~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'X'. Only local declarations can be exported from a module.
     export function f() {
         var x: X;
         return x;
diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.errors.txt b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.errors.txt
index 7eb095b05f0..6ff2e71d26e 100644
--- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.errors.txt
+++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/exportSpecifierReferencingOuterDeclaration1.ts(3,14): error TS2661: Cannot re-export name that is not defined in the module.
+tests/cases/compiler/exportSpecifierReferencingOuterDeclaration1.ts(3,14): error TS2661: Cannot export 'X'. Only local declarations can be exported from a module.
 
 
 ==== tests/cases/compiler/exportSpecifierReferencingOuterDeclaration1.ts (1 errors) ====
@@ -6,6 +6,6 @@ tests/cases/compiler/exportSpecifierReferencingOuterDeclaration1.ts(3,14): error
     declare module "m" {
         export { X };
                  ~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'X'. Only local declarations can be exported from a module.
         export function foo(): X.bar;
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.errors.txt b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.errors.txt
index 00118010785..83b8366d40c 100644
--- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.errors.txt
+++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration2.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2_B.ts(1,10): error TS2661: Cannot re-export name that is not defined in the module.
+tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2_B.ts(1,10): error TS2661: Cannot export 'X'. Only local declarations can be exported from a module.
 
 
 ==== tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2_A.ts (0 errors) ====
@@ -7,5 +7,5 @@ tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2_B.ts(1,10): err
 ==== tests/cases/compiler/exportSpecifierReferencingOuterDeclaration2_B.ts (1 errors) ====
     export { X };
              ~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'X'. Only local declarations can be exported from a module.
     export declare function foo(): X.bar;
\ No newline at end of file
diff --git a/tests/baselines/reference/exportStarForValues.symbols b/tests/baselines/reference/exportStarForValues.symbols
index 6694afecdc6..343c7b23a14 100644
--- a/tests/baselines/reference/exportStarForValues.symbols
+++ b/tests/baselines/reference/exportStarForValues.symbols
@@ -2,7 +2,7 @@
 
 export interface Foo { x }
 >Foo : Symbol(Foo, Decl(file1.ts, 0, 0))
->x : Symbol(x, Decl(file1.ts, 1, 22))
+>x : Symbol(Foo.x, Decl(file1.ts, 1, 22))
 
 === tests/cases/compiler/file2.ts ===
 export * from "file1"
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/exportStarForValues10.symbols b/tests/baselines/reference/exportStarForValues10.symbols
index 2de35864d27..d1dc20f9140 100644
--- a/tests/baselines/reference/exportStarForValues10.symbols
+++ b/tests/baselines/reference/exportStarForValues10.symbols
@@ -6,7 +6,7 @@ export var v = 1;
 === tests/cases/compiler/file1.ts ===
 export interface Foo { x }
 >Foo : Symbol(Foo, Decl(file1.ts, 0, 0))
->x : Symbol(x, Decl(file1.ts, 0, 22))
+>x : Symbol(Foo.x, Decl(file1.ts, 0, 22))
 
 === tests/cases/compiler/file2.ts ===
 export * from "file0";
diff --git a/tests/baselines/reference/exportStarForValues2.symbols b/tests/baselines/reference/exportStarForValues2.symbols
index 0fa739f5431..fe5529b0f6d 100644
--- a/tests/baselines/reference/exportStarForValues2.symbols
+++ b/tests/baselines/reference/exportStarForValues2.symbols
@@ -2,7 +2,7 @@
 
 export interface Foo { x }
 >Foo : Symbol(Foo, Decl(file1.ts, 0, 0))
->x : Symbol(x, Decl(file1.ts, 1, 22))
+>x : Symbol(Foo.x, Decl(file1.ts, 1, 22))
 
 === tests/cases/compiler/file2.ts ===
 export * from "file1"
diff --git a/tests/baselines/reference/exportStarForValues3.symbols b/tests/baselines/reference/exportStarForValues3.symbols
index a79aeb36588..5a9cc5f8d52 100644
--- a/tests/baselines/reference/exportStarForValues3.symbols
+++ b/tests/baselines/reference/exportStarForValues3.symbols
@@ -2,12 +2,12 @@
 
 export interface Foo { x }
 >Foo : Symbol(Foo, Decl(file1.ts, 0, 0))
->x : Symbol(x, Decl(file1.ts, 1, 22))
+>x : Symbol(Foo.x, Decl(file1.ts, 1, 22))
 
 === tests/cases/compiler/file2.ts ===
 export interface A { x }
 >A : Symbol(A, Decl(file2.ts, 0, 0))
->x : Symbol(x, Decl(file2.ts, 0, 20))
+>x : Symbol(A.x, Decl(file2.ts, 0, 20))
 
 export * from "file1"
 var x = 1;
@@ -16,7 +16,7 @@ var x = 1;
 === tests/cases/compiler/file3.ts ===
 export interface B { x }
 >B : Symbol(B, Decl(file3.ts, 0, 0))
->x : Symbol(x, Decl(file3.ts, 0, 20))
+>x : Symbol(B.x, Decl(file3.ts, 0, 20))
 
 export * from "file1"
 var x = 1;
@@ -25,7 +25,7 @@ var x = 1;
 === tests/cases/compiler/file4.ts ===
 export interface C { x }
 >C : Symbol(C, Decl(file4.ts, 0, 0))
->x : Symbol(x, Decl(file4.ts, 0, 20))
+>x : Symbol(C.x, Decl(file4.ts, 0, 20))
 
 export * from "file2"
 export * from "file3"
diff --git a/tests/baselines/reference/exportStarForValues4.symbols b/tests/baselines/reference/exportStarForValues4.symbols
index 465d6ed3237..a6812b72952 100644
--- a/tests/baselines/reference/exportStarForValues4.symbols
+++ b/tests/baselines/reference/exportStarForValues4.symbols
@@ -2,12 +2,12 @@
 
 export interface Foo { x }
 >Foo : Symbol(Foo, Decl(file1.ts, 0, 0))
->x : Symbol(x, Decl(file1.ts, 1, 22))
+>x : Symbol(Foo.x, Decl(file1.ts, 1, 22))
 
 === tests/cases/compiler/file2.ts ===
 export interface A { x }
 >A : Symbol(A, Decl(file2.ts, 0, 0))
->x : Symbol(x, Decl(file2.ts, 0, 20))
+>x : Symbol(A.x, Decl(file2.ts, 0, 20))
 
 export * from "file1"
 export * from "file3"
@@ -17,7 +17,7 @@ var x = 1;
 === tests/cases/compiler/file3.ts ===
 export interface B { x }
 >B : Symbol(B, Decl(file3.ts, 0, 0))
->x : Symbol(x, Decl(file3.ts, 0, 20))
+>x : Symbol(B.x, Decl(file3.ts, 0, 20))
 
 export * from "file2"
 var x = 1;
diff --git a/tests/baselines/reference/exportStarForValues5.symbols b/tests/baselines/reference/exportStarForValues5.symbols
index a2950afa73f..06e6a859e23 100644
--- a/tests/baselines/reference/exportStarForValues5.symbols
+++ b/tests/baselines/reference/exportStarForValues5.symbols
@@ -2,7 +2,7 @@
 
 export interface Foo { x }
 >Foo : Symbol(Foo, Decl(file1.ts, 0, 0))
->x : Symbol(x, Decl(file1.ts, 1, 22))
+>x : Symbol(Foo.x, Decl(file1.ts, 1, 22))
 
 === tests/cases/compiler/file2.ts ===
 export * from "file1"
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/exportStarForValues6.symbols b/tests/baselines/reference/exportStarForValues6.symbols
index c57baf301dd..1eba5698be5 100644
--- a/tests/baselines/reference/exportStarForValues6.symbols
+++ b/tests/baselines/reference/exportStarForValues6.symbols
@@ -2,7 +2,7 @@
 
 export interface Foo { x }
 >Foo : Symbol(Foo, Decl(file1.ts, 0, 0))
->x : Symbol(x, Decl(file1.ts, 1, 22))
+>x : Symbol(Foo.x, Decl(file1.ts, 1, 22))
 
 === tests/cases/compiler/file2.ts ===
 export * from "file1"
diff --git a/tests/baselines/reference/exportStarForValues7.symbols b/tests/baselines/reference/exportStarForValues7.symbols
index b59f2890047..952b7e3eff5 100644
--- a/tests/baselines/reference/exportStarForValues7.symbols
+++ b/tests/baselines/reference/exportStarForValues7.symbols
@@ -2,7 +2,7 @@
 
 export interface Foo { x }
 >Foo : Symbol(Foo, Decl(file1.ts, 0, 0))
->x : Symbol(x, Decl(file1.ts, 1, 22))
+>x : Symbol(Foo.x, Decl(file1.ts, 1, 22))
 
 === tests/cases/compiler/file2.ts ===
 export * from "file1"
diff --git a/tests/baselines/reference/exportStarForValues8.symbols b/tests/baselines/reference/exportStarForValues8.symbols
index be958ecabe8..3b893dfa42b 100644
--- a/tests/baselines/reference/exportStarForValues8.symbols
+++ b/tests/baselines/reference/exportStarForValues8.symbols
@@ -2,12 +2,12 @@
 
 export interface Foo { x }
 >Foo : Symbol(Foo, Decl(file1.ts, 0, 0))
->x : Symbol(x, Decl(file1.ts, 1, 22))
+>x : Symbol(Foo.x, Decl(file1.ts, 1, 22))
 
 === tests/cases/compiler/file2.ts ===
 export interface A { x }
 >A : Symbol(A, Decl(file2.ts, 0, 0))
->x : Symbol(x, Decl(file2.ts, 0, 20))
+>x : Symbol(A.x, Decl(file2.ts, 0, 20))
 
 export * from "file1"
 export var x = 1;
@@ -16,7 +16,7 @@ export var x = 1;
 === tests/cases/compiler/file3.ts ===
 export interface B { x }
 >B : Symbol(B, Decl(file3.ts, 0, 0))
->x : Symbol(x, Decl(file3.ts, 0, 20))
+>x : Symbol(B.x, Decl(file3.ts, 0, 20))
 
 export * from "file1"
 export var x = 1;
@@ -25,7 +25,7 @@ export var x = 1;
 === tests/cases/compiler/file4.ts ===
 export interface C { x }
 >C : Symbol(C, Decl(file4.ts, 0, 0))
->x : Symbol(x, Decl(file4.ts, 0, 20))
+>x : Symbol(C.x, Decl(file4.ts, 0, 20))
 
 export * from "file2"
 export * from "file3"
diff --git a/tests/baselines/reference/exportStarForValues9.symbols b/tests/baselines/reference/exportStarForValues9.symbols
index 0684c9e7b7c..e311f661a00 100644
--- a/tests/baselines/reference/exportStarForValues9.symbols
+++ b/tests/baselines/reference/exportStarForValues9.symbols
@@ -2,12 +2,12 @@
 
 export interface Foo { x }
 >Foo : Symbol(Foo, Decl(file1.ts, 0, 0))
->x : Symbol(x, Decl(file1.ts, 1, 22))
+>x : Symbol(Foo.x, Decl(file1.ts, 1, 22))
 
 === tests/cases/compiler/file2.ts ===
 export interface A { x }
 >A : Symbol(A, Decl(file2.ts, 0, 0))
->x : Symbol(x, Decl(file2.ts, 0, 20))
+>x : Symbol(A.x, Decl(file2.ts, 0, 20))
 
 export * from "file1"
 export * from "file3"
@@ -17,7 +17,7 @@ export var x = 1;
 === tests/cases/compiler/file3.ts ===
 export interface B { x }
 >B : Symbol(B, Decl(file3.ts, 0, 0))
->x : Symbol(x, Decl(file3.ts, 0, 20))
+>x : Symbol(B.x, Decl(file3.ts, 0, 20))
 
 export * from "file2"
 export var 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/exportStarForValuesInSystem.symbols b/tests/baselines/reference/exportStarForValuesInSystem.symbols
index c9ef9830c60..d4ffe0eeaa2 100644
--- a/tests/baselines/reference/exportStarForValuesInSystem.symbols
+++ b/tests/baselines/reference/exportStarForValuesInSystem.symbols
@@ -2,7 +2,7 @@
 
 export interface Foo { x }
 >Foo : Symbol(Foo, Decl(file1.ts, 0, 0))
->x : Symbol(x, Decl(file1.ts, 1, 22))
+>x : Symbol(Foo.x, Decl(file1.ts, 1, 22))
 
 === tests/cases/compiler/file2.ts ===
 export * from "file1"
diff --git a/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.symbols b/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.symbols
index 3127de7b6a2..2df8685b830 100644
--- a/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.symbols
+++ b/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.symbols
@@ -24,7 +24,7 @@ export declare class TPromise<V> {
 	
     // removing this method fixes the error squiggle.....
 	public then<U>(success?: (value:V)=>TPromise<U>, error?: (err:any)=>TPromise<U>, progress?:ProgressCallback): TPromise<U>;
->then : Symbol(then, Decl(exportedInterfaceInaccessibleInCallbackInModule.ts, 7, 119))
+>then : Symbol(TPromise.then, Decl(exportedInterfaceInaccessibleInCallbackInModule.ts, 7, 119))
 >U : Symbol(U, Decl(exportedInterfaceInaccessibleInCallbackInModule.ts, 10, 13))
 >success : Symbol(success, Decl(exportedInterfaceInaccessibleInCallbackInModule.ts, 10, 16))
 >value : Symbol(value, Decl(exportedInterfaceInaccessibleInCallbackInModule.ts, 10, 27))
diff --git a/tests/baselines/reference/extBaseClass1.symbols b/tests/baselines/reference/extBaseClass1.symbols
index 416fa910f31..cf7781df07d 100644
--- a/tests/baselines/reference/extBaseClass1.symbols
+++ b/tests/baselines/reference/extBaseClass1.symbols
@@ -6,7 +6,7 @@ module M {
 >B : Symbol(B, Decl(extBaseClass1.ts, 0, 10))
 
 	    public x=10;
->x : Symbol(x, Decl(extBaseClass1.ts, 1, 20))
+>x : Symbol(B.x, Decl(extBaseClass1.ts, 1, 20))
     }
 
     export class C extends B {
diff --git a/tests/baselines/reference/extendAndImplementTheSameBaseType.symbols b/tests/baselines/reference/extendAndImplementTheSameBaseType.symbols
index c211fa4955b..45f25090af8 100644
--- a/tests/baselines/reference/extendAndImplementTheSameBaseType.symbols
+++ b/tests/baselines/reference/extendAndImplementTheSameBaseType.symbols
@@ -3,10 +3,10 @@ class C {
 >C : Symbol(C, Decl(extendAndImplementTheSameBaseType.ts, 0, 0))
 
     foo: number
->foo : Symbol(foo, Decl(extendAndImplementTheSameBaseType.ts, 0, 9))
+>foo : Symbol(C.foo, Decl(extendAndImplementTheSameBaseType.ts, 0, 9))
 
     bar() {}
->bar : Symbol(bar, Decl(extendAndImplementTheSameBaseType.ts, 1, 15))
+>bar : Symbol(C.bar, Decl(extendAndImplementTheSameBaseType.ts, 1, 15))
 }
 class D extends C implements C {
 >D : Symbol(D, Decl(extendAndImplementTheSameBaseType.ts, 3, 1))
@@ -14,7 +14,7 @@ class D extends C implements C {
 >C : Symbol(C, Decl(extendAndImplementTheSameBaseType.ts, 0, 0))
 
     baz() { }
->baz : Symbol(baz, Decl(extendAndImplementTheSameBaseType.ts, 4, 32))
+>baz : Symbol(D.baz, Decl(extendAndImplementTheSameBaseType.ts, 4, 32))
 }
 
 var c: C;
diff --git a/tests/baselines/reference/extendBaseClassBeforeItsDeclared.symbols b/tests/baselines/reference/extendBaseClassBeforeItsDeclared.symbols
index 88aca935113..ab122b43c90 100644
--- a/tests/baselines/reference/extendBaseClassBeforeItsDeclared.symbols
+++ b/tests/baselines/reference/extendBaseClassBeforeItsDeclared.symbols
@@ -5,5 +5,5 @@ class derived extends base { }
  
 class base { constructor (public n: number) { } }
 >base : Symbol(base, Decl(extendBaseClassBeforeItsDeclared.ts, 0, 30))
->n : Symbol(n, Decl(extendBaseClassBeforeItsDeclared.ts, 2, 26))
+>n : Symbol(base.n, Decl(extendBaseClassBeforeItsDeclared.ts, 2, 26))
 
diff --git a/tests/baselines/reference/extendBooleanInterface.symbols b/tests/baselines/reference/extendBooleanInterface.symbols
index be2fb30226d..9ae4c46e3c7 100644
--- a/tests/baselines/reference/extendBooleanInterface.symbols
+++ b/tests/baselines/reference/extendBooleanInterface.symbols
@@ -3,10 +3,10 @@ interface Boolean {
 >Boolean : Symbol(Boolean, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(extendBooleanInterface.ts, 0, 0))
 
     doStuff(): string;
->doStuff : Symbol(doStuff, Decl(extendBooleanInterface.ts, 0, 19))
+>doStuff : Symbol(Boolean.doStuff, Decl(extendBooleanInterface.ts, 0, 19))
 
     doOtherStuff<T>(x: T): T;
->doOtherStuff : Symbol(doOtherStuff, Decl(extendBooleanInterface.ts, 1, 22))
+>doOtherStuff : Symbol(Boolean.doOtherStuff, Decl(extendBooleanInterface.ts, 1, 22))
 >T : Symbol(T, Decl(extendBooleanInterface.ts, 2, 17))
 >x : Symbol(x, Decl(extendBooleanInterface.ts, 2, 20))
 >T : Symbol(T, Decl(extendBooleanInterface.ts, 2, 17))
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/extendNonClassSymbol1.symbols b/tests/baselines/reference/extendNonClassSymbol1.symbols
index 7c03ef3a97f..2b171308823 100644
--- a/tests/baselines/reference/extendNonClassSymbol1.symbols
+++ b/tests/baselines/reference/extendNonClassSymbol1.symbols
@@ -1,7 +1,7 @@
 === tests/cases/compiler/extendNonClassSymbol1.ts ===
 class A { foo() { } }
 >A : Symbol(A, Decl(extendNonClassSymbol1.ts, 0, 0))
->foo : Symbol(foo, Decl(extendNonClassSymbol1.ts, 0, 9))
+>foo : Symbol(A.foo, Decl(extendNonClassSymbol1.ts, 0, 9))
 
 var x = A;
 >x : Symbol(x, Decl(extendNonClassSymbol1.ts, 1, 3))
diff --git a/tests/baselines/reference/extendNumberInterface.symbols b/tests/baselines/reference/extendNumberInterface.symbols
index 218f0f41cb2..febe4993e2a 100644
--- a/tests/baselines/reference/extendNumberInterface.symbols
+++ b/tests/baselines/reference/extendNumberInterface.symbols
@@ -1,12 +1,12 @@
 === tests/cases/conformance/types/primitives/number/extendNumberInterface.ts ===
 interface Number {
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(extendNumberInterface.ts, 0, 0))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(extendNumberInterface.ts, 0, 0))
 
     doStuff(): string;
->doStuff : Symbol(doStuff, Decl(extendNumberInterface.ts, 0, 18))
+>doStuff : Symbol(Number.doStuff, Decl(extendNumberInterface.ts, 0, 18))
 
     doOtherStuff<T>(x:T): T;
->doOtherStuff : Symbol(doOtherStuff, Decl(extendNumberInterface.ts, 1, 22))
+>doOtherStuff : Symbol(Number.doOtherStuff, Decl(extendNumberInterface.ts, 1, 22))
 >T : Symbol(T, Decl(extendNumberInterface.ts, 2, 17))
 >x : Symbol(x, Decl(extendNumberInterface.ts, 2, 20))
 >T : Symbol(T, Decl(extendNumberInterface.ts, 2, 17))
diff --git a/tests/baselines/reference/extendStringInterface.symbols b/tests/baselines/reference/extendStringInterface.symbols
index aa20b2e2c15..67773fa30bd 100644
--- a/tests/baselines/reference/extendStringInterface.symbols
+++ b/tests/baselines/reference/extendStringInterface.symbols
@@ -1,12 +1,12 @@
 === tests/cases/conformance/types/primitives/string/extendStringInterface.ts ===
 interface String {
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(extendStringInterface.ts, 0, 0))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(extendStringInterface.ts, 0, 0))
 
     doStuff(): string;
->doStuff : Symbol(doStuff, Decl(extendStringInterface.ts, 0, 18))
+>doStuff : Symbol(String.doStuff, Decl(extendStringInterface.ts, 0, 18))
 
     doOtherStuff<T>(x:T): T;
->doOtherStuff : Symbol(doOtherStuff, Decl(extendStringInterface.ts, 1, 22))
+>doOtherStuff : Symbol(String.doOtherStuff, Decl(extendStringInterface.ts, 1, 22))
 >T : Symbol(T, Decl(extendStringInterface.ts, 2, 17))
 >x : Symbol(x, Decl(extendStringInterface.ts, 2, 20))
 >T : Symbol(T, Decl(extendStringInterface.ts, 2, 17))
diff --git a/tests/baselines/reference/extendedInterfaceGenericType.symbols b/tests/baselines/reference/extendedInterfaceGenericType.symbols
index 47e17b1e6a1..334981bc56d 100644
--- a/tests/baselines/reference/extendedInterfaceGenericType.symbols
+++ b/tests/baselines/reference/extendedInterfaceGenericType.symbols
@@ -4,14 +4,14 @@ interface Alpha<T> {
 >T : Symbol(T, Decl(extendedInterfaceGenericType.ts, 0, 16))
 
     takesArgOfT(arg: T): Alpha<T>;
->takesArgOfT : Symbol(takesArgOfT, Decl(extendedInterfaceGenericType.ts, 0, 20))
+>takesArgOfT : Symbol(Alpha.takesArgOfT, Decl(extendedInterfaceGenericType.ts, 0, 20))
 >arg : Symbol(arg, Decl(extendedInterfaceGenericType.ts, 1, 16))
 >T : Symbol(T, Decl(extendedInterfaceGenericType.ts, 0, 16))
 >Alpha : Symbol(Alpha, Decl(extendedInterfaceGenericType.ts, 0, 0))
 >T : Symbol(T, Decl(extendedInterfaceGenericType.ts, 0, 16))
 
     makeBetaOfNumber(): Beta<number>;
->makeBetaOfNumber : Symbol(makeBetaOfNumber, Decl(extendedInterfaceGenericType.ts, 1, 34))
+>makeBetaOfNumber : Symbol(Alpha.makeBetaOfNumber, Decl(extendedInterfaceGenericType.ts, 1, 34))
 >Beta : Symbol(Beta, Decl(extendedInterfaceGenericType.ts, 3, 1))
 }
 interface Beta<T> extends Alpha<T> {
diff --git a/tests/baselines/reference/extendedInterfacesWithDuplicateTypeParameters.errors.txt b/tests/baselines/reference/extendedInterfacesWithDuplicateTypeParameters.errors.txt
index 7d7fea1b2c6..7b47fee05af 100644
--- a/tests/baselines/reference/extendedInterfacesWithDuplicateTypeParameters.errors.txt
+++ b/tests/baselines/reference/extendedInterfacesWithDuplicateTypeParameters.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/extendedInterfacesWithDuplicateTypeParameters.ts(1,42): error TS2300: Duplicate identifier 'A'.
-tests/cases/compiler/extendedInterfacesWithDuplicateTypeParameters.ts(9,11): error TS2428: All declarations of an interface must have identical type parameters.
+tests/cases/compiler/extendedInterfacesWithDuplicateTypeParameters.ts(9,11): error TS2428: All declarations of 'InterfaceWithSomeTypars' must have identical type parameters.
 tests/cases/compiler/extendedInterfacesWithDuplicateTypeParameters.ts(9,38): error TS2300: Duplicate identifier 'C'.
 
 
@@ -16,7 +16,7 @@ tests/cases/compiler/extendedInterfacesWithDuplicateTypeParameters.ts(9,38): err
     
     interface InterfaceWithSomeTypars<C, C> { // should error
               ~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'InterfaceWithSomeTypars' must have identical type parameters.
                                          ~
 !!! error TS2300: Duplicate identifier 'C'.
     	bar2(): void;
diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.symbols b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.symbols
index 33e0c226e67..fcf5a71330a 100644
--- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.symbols
+++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.symbols
@@ -12,7 +12,7 @@ interface IHasVisualizationModel {
 >IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 2, 79))
 
     VisualizationModel: typeof Backbone.Model;
->VisualizationModel : Symbol(VisualizationModel, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 3, 34))
+>VisualizationModel : Symbol(IHasVisualizationModel.VisualizationModel, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 3, 34))
 >Backbone.Model : Symbol(Backbone.Model, Decl(extendingClassFromAliasAndUsageInIndexer_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(extendingClassFromAliasAndUsageInIndexer_backbone.ts, 0, 0))
@@ -49,7 +49,7 @@ export class Model {
 >Model : Symbol(Model, Decl(extendingClassFromAliasAndUsageInIndexer_backbone.ts, 0, 0))
 
     public someData: string;
->someData : Symbol(someData, Decl(extendingClassFromAliasAndUsageInIndexer_backbone.ts, 0, 20))
+>someData : Symbol(Model.someData, Decl(extendingClassFromAliasAndUsageInIndexer_backbone.ts, 0, 20))
 }
 
 === tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_moduleA.ts ===
diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types
index e1bfd195698..9825a75a220 100644
--- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types
+++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types
@@ -26,7 +26,7 @@ var moduleMap: { [key: string]: IHasVisualizationModel } = {
 >moduleMap : { [key: string]: IHasVisualizationModel; }
 >key : string
 >IHasVisualizationModel : IHasVisualizationModel
->{    "moduleA": moduleA,    "moduleB": moduleB} : { [x: string]: typeof moduleA; "moduleA": typeof moduleA; "moduleB": typeof moduleB; }
+>{    "moduleA": moduleA,    "moduleB": moduleB} : { "moduleA": typeof moduleA; "moduleB": typeof moduleB; }
 
     "moduleA": moduleA,
 >moduleA : typeof moduleA
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/externModuleClobber.symbols b/tests/baselines/reference/externModuleClobber.symbols
index af4b19ad7c9..ad965a15879 100644
--- a/tests/baselines/reference/externModuleClobber.symbols
+++ b/tests/baselines/reference/externModuleClobber.symbols
@@ -9,7 +9,7 @@ declare module EM {
 >EC : Symbol(EC, Decl(externModuleClobber.ts, 1, 26))
 
 		public getPosition() : EM.Position;
->getPosition : Symbol(getPosition, Decl(externModuleClobber.ts, 3, 18))
+>getPosition : Symbol(EC.getPosition, Decl(externModuleClobber.ts, 3, 18))
 >EM : Symbol(EM, Decl(externModuleClobber.ts, 0, 0))
 >Position : Symbol(Position, Decl(externModuleClobber.ts, 0, 19))
 	}
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/externalModuleAssignToVar.symbols b/tests/baselines/reference/externalModuleAssignToVar.symbols
index 373dd3f793e..9e049b0bda6 100644
--- a/tests/baselines/reference/externalModuleAssignToVar.symbols
+++ b/tests/baselines/reference/externalModuleAssignToVar.symbols
@@ -41,7 +41,7 @@ y3 = ext3; // ok
 === tests/cases/compiler/externalModuleAssignToVar_ext.ts ===
 class D { foo: string; }
 >D : Symbol(D, Decl(externalModuleAssignToVar_ext.ts, 0, 0))
->foo : Symbol(foo, Decl(externalModuleAssignToVar_ext.ts, 0, 9))
+>foo : Symbol(D.foo, Decl(externalModuleAssignToVar_ext.ts, 0, 9))
 
 export = D;
 >D : Symbol(D, Decl(externalModuleAssignToVar_ext.ts, 0, 0))
@@ -49,12 +49,12 @@ export = D;
 === tests/cases/compiler/externalModuleAssignToVar_core_require.ts ===
 export class C { bar: string; }
 >C : Symbol(C, Decl(externalModuleAssignToVar_core_require.ts, 0, 0))
->bar : Symbol(bar, Decl(externalModuleAssignToVar_core_require.ts, 0, 16))
+>bar : Symbol(C.bar, Decl(externalModuleAssignToVar_core_require.ts, 0, 16))
 
 === tests/cases/compiler/externalModuleAssignToVar_core_require2.ts ===
 class C { baz: string; }
 >C : Symbol(C, Decl(externalModuleAssignToVar_core_require2.ts, 0, 0))
->baz : Symbol(baz, Decl(externalModuleAssignToVar_core_require2.ts, 0, 9))
+>baz : Symbol(C.baz, Decl(externalModuleAssignToVar_core_require2.ts, 0, 9))
 
 export = C;
 >C : Symbol(C, Decl(externalModuleAssignToVar_core_require2.ts, 0, 0))
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/externalModuleQualification.symbols b/tests/baselines/reference/externalModuleQualification.symbols
index dc056802c76..002a680a610 100644
--- a/tests/baselines/reference/externalModuleQualification.symbols
+++ b/tests/baselines/reference/externalModuleQualification.symbols
@@ -9,7 +9,7 @@ export class DiffEditor<A, B, C> {
 >C : Symbol(C, Decl(externalModuleQualification.ts, 1, 29))
 
     private previousDiffAction: NavigateAction;
->previousDiffAction : Symbol(previousDiffAction, Decl(externalModuleQualification.ts, 1, 34))
+>previousDiffAction : Symbol(DiffEditor.previousDiffAction, Decl(externalModuleQualification.ts, 1, 34))
 >NavigateAction : Symbol(NavigateAction, Decl(externalModuleQualification.ts, 5, 1))
 
     constructor(id: string = ID) {
@@ -21,7 +21,7 @@ class NavigateAction {
 >NavigateAction : Symbol(NavigateAction, Decl(externalModuleQualification.ts, 5, 1))
 
     f(editor: DiffEditor<any, any, any>) {
->f : Symbol(f, Decl(externalModuleQualification.ts, 6, 22))
+>f : Symbol(NavigateAction.f, Decl(externalModuleQualification.ts, 6, 22))
 >editor : Symbol(editor, Decl(externalModuleQualification.ts, 7, 6))
 >DiffEditor : Symbol(DiffEditor, Decl(externalModuleQualification.ts, 0, 23))
     }
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/externalModuleWithoutCompilerFlag1.errors.txt b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.errors.txt
deleted file mode 100644
index e2ffd4ec372..00000000000
--- a/tests/baselines/reference/externalModuleWithoutCompilerFlag1.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-tests/cases/compiler/externalModuleWithoutCompilerFlag1.ts(3,17): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-
-
-==== tests/cases/compiler/externalModuleWithoutCompilerFlag1.ts (1 errors) ====
-    
-    // Not on line 0 because we want to verify the error is placed in the appropriate location.
-      export module M {
-                    ~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/externalModuleWithoutCompilerFlag1.symbols b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.symbols
new file mode 100644
index 00000000000..21426e15e5d
--- /dev/null
+++ b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.symbols
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/externalModuleWithoutCompilerFlag1.ts ===
+
+// Not on line 0 because we want to verify the error is placed in the appropriate location.
+  export module M {
+>M : Symbol(M, Decl(externalModuleWithoutCompilerFlag1.ts, 0, 0))
+}
diff --git a/tests/baselines/reference/externalModuleWithoutCompilerFlag1.types b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.types
new file mode 100644
index 00000000000..26d360d63a9
--- /dev/null
+++ b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/externalModuleWithoutCompilerFlag1.ts ===
+
+// Not on line 0 because we want to verify the error is placed in the appropriate location.
+  export module M {
+>M : any
+}
diff --git a/tests/baselines/reference/fallFromLastCase1.js b/tests/baselines/reference/fallFromLastCase1.js
new file mode 100644
index 00000000000..3c2461db514
--- /dev/null
+++ b/tests/baselines/reference/fallFromLastCase1.js
@@ -0,0 +1,44 @@
+//// [fallFromLastCase1.ts]
+
+declare function use(a: string);
+
+function foo1(a: number) {
+    switch (a) {
+        case 1:
+            use("1");
+            break;
+        case 2:
+            use("2");
+    }
+}
+
+
+function foo2(a: number) {
+    switch (a) {
+        case 1:
+            use("1");
+            break;
+        default:
+            use("2");
+    }
+}
+
+//// [fallFromLastCase1.js]
+function foo1(a) {
+    switch (a) {
+        case 1:
+            use("1");
+            break;
+        case 2:
+            use("2");
+    }
+}
+function foo2(a) {
+    switch (a) {
+        case 1:
+            use("1");
+            break;
+        default:
+            use("2");
+    }
+}
diff --git a/tests/baselines/reference/fallFromLastCase1.symbols b/tests/baselines/reference/fallFromLastCase1.symbols
new file mode 100644
index 00000000000..c4967e5e775
--- /dev/null
+++ b/tests/baselines/reference/fallFromLastCase1.symbols
@@ -0,0 +1,42 @@
+=== tests/cases/compiler/fallFromLastCase1.ts ===
+
+declare function use(a: string);
+>use : Symbol(use, Decl(fallFromLastCase1.ts, 0, 0))
+>a : Symbol(a, Decl(fallFromLastCase1.ts, 1, 21))
+
+function foo1(a: number) {
+>foo1 : Symbol(foo1, Decl(fallFromLastCase1.ts, 1, 32))
+>a : Symbol(a, Decl(fallFromLastCase1.ts, 3, 14))
+
+    switch (a) {
+>a : Symbol(a, Decl(fallFromLastCase1.ts, 3, 14))
+
+        case 1:
+            use("1");
+>use : Symbol(use, Decl(fallFromLastCase1.ts, 0, 0))
+
+            break;
+        case 2:
+            use("2");
+>use : Symbol(use, Decl(fallFromLastCase1.ts, 0, 0))
+    }
+}
+
+
+function foo2(a: number) {
+>foo2 : Symbol(foo2, Decl(fallFromLastCase1.ts, 11, 1))
+>a : Symbol(a, Decl(fallFromLastCase1.ts, 14, 14))
+
+    switch (a) {
+>a : Symbol(a, Decl(fallFromLastCase1.ts, 14, 14))
+
+        case 1:
+            use("1");
+>use : Symbol(use, Decl(fallFromLastCase1.ts, 0, 0))
+
+            break;
+        default:
+            use("2");
+>use : Symbol(use, Decl(fallFromLastCase1.ts, 0, 0))
+    }
+}
diff --git a/tests/baselines/reference/fallFromLastCase1.types b/tests/baselines/reference/fallFromLastCase1.types
new file mode 100644
index 00000000000..47e444ee17d
--- /dev/null
+++ b/tests/baselines/reference/fallFromLastCase1.types
@@ -0,0 +1,56 @@
+=== tests/cases/compiler/fallFromLastCase1.ts ===
+
+declare function use(a: string);
+>use : (a: string) => any
+>a : string
+
+function foo1(a: number) {
+>foo1 : (a: number) => void
+>a : number
+
+    switch (a) {
+>a : number
+
+        case 1:
+>1 : number
+
+            use("1");
+>use("1") : any
+>use : (a: string) => any
+>"1" : string
+
+            break;
+        case 2:
+>2 : number
+
+            use("2");
+>use("2") : any
+>use : (a: string) => any
+>"2" : string
+    }
+}
+
+
+function foo2(a: number) {
+>foo2 : (a: number) => void
+>a : number
+
+    switch (a) {
+>a : number
+
+        case 1:
+>1 : number
+
+            use("1");
+>use("1") : any
+>use : (a: string) => any
+>"1" : string
+
+            break;
+        default:
+            use("2");
+>use("2") : any
+>use : (a: string) => any
+>"2" : string
+    }
+}
diff --git a/tests/baselines/reference/fallFromLastCase2.errors.txt b/tests/baselines/reference/fallFromLastCase2.errors.txt
new file mode 100644
index 00000000000..ccf7f6ebc1b
--- /dev/null
+++ b/tests/baselines/reference/fallFromLastCase2.errors.txt
@@ -0,0 +1,36 @@
+tests/cases/compiler/fallFromLastCase2.ts(9,9): error TS7029: Fallthrough case in switch.
+tests/cases/compiler/fallFromLastCase2.ts(22,9): error TS7029: Fallthrough case in switch.
+
+
+==== tests/cases/compiler/fallFromLastCase2.ts (2 errors) ====
+    
+    declare function use(a: string);
+    
+    function foo1(a: number) {
+        switch (a) {
+            case 1:
+                use("1");
+                break;
+            case 2:
+            ~~~~
+!!! error TS7029: Fallthrough case in switch.
+                use("2");
+            case 3:
+                use("3");
+        }
+    }
+    
+    
+    function foo2(a: number) {
+        switch (a) {
+            case 1:
+                use("1");
+                break;
+            default:
+            ~~~~~~~
+!!! error TS7029: Fallthrough case in switch.
+                use("2");
+            case 2:
+                use("3");
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/fallFromLastCase2.js b/tests/baselines/reference/fallFromLastCase2.js
new file mode 100644
index 00000000000..fd1d7c20d07
--- /dev/null
+++ b/tests/baselines/reference/fallFromLastCase2.js
@@ -0,0 +1,52 @@
+//// [fallFromLastCase2.ts]
+
+declare function use(a: string);
+
+function foo1(a: number) {
+    switch (a) {
+        case 1:
+            use("1");
+            break;
+        case 2:
+            use("2");
+        case 3:
+            use("3");
+    }
+}
+
+
+function foo2(a: number) {
+    switch (a) {
+        case 1:
+            use("1");
+            break;
+        default:
+            use("2");
+        case 2:
+            use("3");
+    }
+}
+
+//// [fallFromLastCase2.js]
+function foo1(a) {
+    switch (a) {
+        case 1:
+            use("1");
+            break;
+        case 2:
+            use("2");
+        case 3:
+            use("3");
+    }
+}
+function foo2(a) {
+    switch (a) {
+        case 1:
+            use("1");
+            break;
+        default:
+            use("2");
+        case 2:
+            use("3");
+    }
+}
diff --git a/tests/baselines/reference/fatArrowSelf.symbols b/tests/baselines/reference/fatArrowSelf.symbols
index 4008b648ae6..df9c912e292 100644
--- a/tests/baselines/reference/fatArrowSelf.symbols
+++ b/tests/baselines/reference/fatArrowSelf.symbols
@@ -12,7 +12,7 @@ module Events {
 >EventEmitter : Symbol(EventEmitter, Decl(fatArrowSelf.ts, 3, 5))
 
          public addListener(type:string, listener:ListenerCallback) {
->addListener : Symbol(addListener, Decl(fatArrowSelf.ts, 4, 31))
+>addListener : Symbol(EventEmitter.addListener, Decl(fatArrowSelf.ts, 4, 31))
 >type : Symbol(type, Decl(fatArrowSelf.ts, 5, 28))
 >listener : Symbol(listener, Decl(fatArrowSelf.ts, 5, 40))
 >ListenerCallback : Symbol(ListenerCallback, Decl(fatArrowSelf.ts, 0, 15))
@@ -27,31 +27,31 @@ module Consumer {
 >EventEmitterConsummer : Symbol(EventEmitterConsummer, Decl(fatArrowSelf.ts, 10, 17))
 
         constructor (private emitter: Events.EventEmitter) { }
->emitter : Symbol(emitter, Decl(fatArrowSelf.ts, 12, 21))
+>emitter : Symbol(EventEmitterConsummer.emitter, Decl(fatArrowSelf.ts, 12, 21))
 >Events : Symbol(Events, Decl(fatArrowSelf.ts, 0, 0))
 >EventEmitter : Symbol(Events.EventEmitter, Decl(fatArrowSelf.ts, 3, 5))
 
         private register() {
->register : Symbol(register, Decl(fatArrowSelf.ts, 12, 62))
+>register : Symbol(EventEmitterConsummer.register, Decl(fatArrowSelf.ts, 12, 62))
 
             this.emitter.addListener('change', (e) => {
 >this.emitter.addListener : Symbol(Events.EventEmitter.addListener, Decl(fatArrowSelf.ts, 4, 31))
->this.emitter : Symbol(emitter, Decl(fatArrowSelf.ts, 12, 21))
+>this.emitter : Symbol(EventEmitterConsummer.emitter, Decl(fatArrowSelf.ts, 12, 21))
 >this : Symbol(EventEmitterConsummer, Decl(fatArrowSelf.ts, 10, 17))
->emitter : Symbol(emitter, Decl(fatArrowSelf.ts, 12, 21))
+>emitter : Symbol(EventEmitterConsummer.emitter, Decl(fatArrowSelf.ts, 12, 21))
 >addListener : Symbol(Events.EventEmitter.addListener, Decl(fatArrowSelf.ts, 4, 31))
 >e : Symbol(e, Decl(fatArrowSelf.ts, 15, 48))
 
                 this.changed();
->this.changed : Symbol(changed, Decl(fatArrowSelf.ts, 18, 9))
+>this.changed : Symbol(EventEmitterConsummer.changed, Decl(fatArrowSelf.ts, 18, 9))
 >this : Symbol(EventEmitterConsummer, Decl(fatArrowSelf.ts, 10, 17))
->changed : Symbol(changed, Decl(fatArrowSelf.ts, 18, 9))
+>changed : Symbol(EventEmitterConsummer.changed, Decl(fatArrowSelf.ts, 18, 9))
 
             });
         }      
 
         private changed() {
->changed : Symbol(changed, Decl(fatArrowSelf.ts, 18, 9))
+>changed : Symbol(EventEmitterConsummer.changed, Decl(fatArrowSelf.ts, 18, 9))
         }
     }
 }
diff --git a/tests/baselines/reference/fatarrowfunctionsInFunctionParameterDefaults.symbols b/tests/baselines/reference/fatarrowfunctionsInFunctionParameterDefaults.symbols
index ea0ed9a605c..b836bc88573 100644
--- a/tests/baselines/reference/fatarrowfunctionsInFunctionParameterDefaults.symbols
+++ b/tests/baselines/reference/fatarrowfunctionsInFunctionParameterDefaults.symbols
@@ -12,7 +12,7 @@ function fn(x = () => this, y = x()) {
 }
 
 fn.call(4); // Should be 4
->fn.call : Symbol(Function.call, Decl(lib.d.ts, --, --))
+>fn.call : Symbol(Function.call, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >fn : Symbol(fn, Decl(fatarrowfunctionsInFunctionParameterDefaults.ts, 0, 0))
->call : Symbol(Function.call, Decl(lib.d.ts, --, --))
+>call : Symbol(Function.call, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
diff --git a/tests/baselines/reference/fatarrowfunctionsInFunctionParameterDefaults.types b/tests/baselines/reference/fatarrowfunctionsInFunctionParameterDefaults.types
index 55d72e854d3..58c576bf24e 100644
--- a/tests/baselines/reference/fatarrowfunctionsInFunctionParameterDefaults.types
+++ b/tests/baselines/reference/fatarrowfunctionsInFunctionParameterDefaults.types
@@ -16,8 +16,8 @@ function fn(x = () => this, y = x()) {
 
 fn.call(4); // Should be 4
 >fn.call(4) : any
->fn.call : (thisArg: any, ...argArray: any[]) => any
+>fn.call : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): U; (this: Function, thisArg: any, ...argArray: any[]): any; }
 >fn : (x?: () => any, y?: any) => any
->call : (thisArg: any, ...argArray: any[]) => any
+>call : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): U; (this: Function, thisArg: any, ...argArray: any[]): any; }
 >4 : number
 
diff --git a/tests/baselines/reference/fillInMissingTypeArgsOnConstructCalls.symbols b/tests/baselines/reference/fillInMissingTypeArgsOnConstructCalls.symbols
index 97d485c4b56..e3ad22f6a05 100644
--- a/tests/baselines/reference/fillInMissingTypeArgsOnConstructCalls.symbols
+++ b/tests/baselines/reference/fillInMissingTypeArgsOnConstructCalls.symbols
@@ -5,7 +5,7 @@ class A<T extends Object>{
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
       list: T ;
->list : Symbol(list, Decl(fillInMissingTypeArgsOnConstructCalls.ts, 0, 26))
+>list : Symbol(A.list, Decl(fillInMissingTypeArgsOnConstructCalls.ts, 0, 26))
 >T : Symbol(T, Decl(fillInMissingTypeArgsOnConstructCalls.ts, 0, 8))
 }
 var a = new A();
diff --git a/tests/baselines/reference/fixingTypeParametersRepeatedly3.symbols b/tests/baselines/reference/fixingTypeParametersRepeatedly3.symbols
index a849adb6235..c08fa6d9694 100644
--- a/tests/baselines/reference/fixingTypeParametersRepeatedly3.symbols
+++ b/tests/baselines/reference/fixingTypeParametersRepeatedly3.symbols
@@ -3,14 +3,14 @@ interface Base {
 >Base : Symbol(Base, Decl(fixingTypeParametersRepeatedly3.ts, 0, 0))
 
     baseProp;
->baseProp : Symbol(baseProp, Decl(fixingTypeParametersRepeatedly3.ts, 0, 16))
+>baseProp : Symbol(Base.baseProp, Decl(fixingTypeParametersRepeatedly3.ts, 0, 16))
 }
 interface Derived extends Base {
 >Derived : Symbol(Derived, Decl(fixingTypeParametersRepeatedly3.ts, 2, 1))
 >Base : Symbol(Base, Decl(fixingTypeParametersRepeatedly3.ts, 0, 0))
 
     toBase?(): Base;
->toBase : Symbol(toBase, Decl(fixingTypeParametersRepeatedly3.ts, 3, 32))
+>toBase : Symbol(Derived.toBase, Decl(fixingTypeParametersRepeatedly3.ts, 3, 32))
 >Base : Symbol(Base, Decl(fixingTypeParametersRepeatedly3.ts, 0, 0))
 }
 
diff --git a/tests/baselines/reference/fluentClasses.symbols b/tests/baselines/reference/fluentClasses.symbols
index 3125235b6b1..d33bd8697ce 100644
--- a/tests/baselines/reference/fluentClasses.symbols
+++ b/tests/baselines/reference/fluentClasses.symbols
@@ -3,7 +3,7 @@ class A {
 >A : Symbol(A, Decl(fluentClasses.ts, 0, 0))
 
     foo() {
->foo : Symbol(foo, Decl(fluentClasses.ts, 0, 9))
+>foo : Symbol(A.foo, Decl(fluentClasses.ts, 0, 9))
 
         return this;
 >this : Symbol(A, Decl(fluentClasses.ts, 0, 0))
@@ -14,7 +14,7 @@ class B extends A {
 >A : Symbol(A, Decl(fluentClasses.ts, 0, 0))
 
     bar() {
->bar : Symbol(bar, Decl(fluentClasses.ts, 5, 19))
+>bar : Symbol(B.bar, Decl(fluentClasses.ts, 5, 19))
 
         return this;
 >this : Symbol(B, Decl(fluentClasses.ts, 4, 1))
@@ -25,7 +25,7 @@ class C extends B {
 >B : Symbol(B, Decl(fluentClasses.ts, 4, 1))
 
     baz() {
->baz : Symbol(baz, Decl(fluentClasses.ts, 10, 19))
+>baz : Symbol(C.baz, Decl(fluentClasses.ts, 10, 19))
 
         return this;
 >this : Symbol(C, Decl(fluentClasses.ts, 9, 1))
diff --git a/tests/baselines/reference/fluentInterfaces.symbols b/tests/baselines/reference/fluentInterfaces.symbols
index e059cdc127e..d3bc1020f52 100644
--- a/tests/baselines/reference/fluentInterfaces.symbols
+++ b/tests/baselines/reference/fluentInterfaces.symbols
@@ -3,21 +3,21 @@ interface A {
 >A : Symbol(A, Decl(fluentInterfaces.ts, 0, 0))
 
     foo(): this;
->foo : Symbol(foo, Decl(fluentInterfaces.ts, 0, 13))
+>foo : Symbol(A.foo, Decl(fluentInterfaces.ts, 0, 13))
 }
 interface B extends A {
 >B : Symbol(B, Decl(fluentInterfaces.ts, 2, 1))
 >A : Symbol(A, Decl(fluentInterfaces.ts, 0, 0))
 
     bar(): this;
->bar : Symbol(bar, Decl(fluentInterfaces.ts, 3, 23))
+>bar : Symbol(B.bar, Decl(fluentInterfaces.ts, 3, 23))
 }
 interface C extends B {
 >C : Symbol(C, Decl(fluentInterfaces.ts, 5, 1))
 >B : Symbol(B, Decl(fluentInterfaces.ts, 2, 1))
 
     baz(): this;
->baz : Symbol(baz, Decl(fluentInterfaces.ts, 6, 23))
+>baz : Symbol(C.baz, Decl(fluentInterfaces.ts, 6, 23))
 }
 var c: C;
 >c : Symbol(c, Decl(fluentInterfaces.ts, 9, 3))
diff --git a/tests/baselines/reference/for-inStatementsArray.symbols b/tests/baselines/reference/for-inStatementsArray.symbols
index 5b6ea9385cd..0d594c193cb 100644
--- a/tests/baselines/reference/for-inStatementsArray.symbols
+++ b/tests/baselines/reference/for-inStatementsArray.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/statements/for-inStatements/for-inStatementsArray.ts ===
 let a: Date[];
 >a : Symbol(a, Decl(for-inStatementsArray.ts, 0, 3))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 let b: boolean[];
 >b : Symbol(b, Decl(for-inStatementsArray.ts, 1, 3))
diff --git a/tests/baselines/reference/for-of13.symbols b/tests/baselines/reference/for-of13.symbols
index bcfc3f981bd..d257ed5290a 100644
--- a/tests/baselines/reference/for-of13.symbols
+++ b/tests/baselines/reference/for-of13.symbols
@@ -4,6 +4,6 @@ var v: string;
 
 for (v of [""].values()) { }
 >v : Symbol(v, Decl(for-of13.ts, 0, 3))
->[""].values : Symbol(Array.values, Decl(lib.d.ts, --, --))
->values : Symbol(Array.values, Decl(lib.d.ts, --, --))
+>[""].values : Symbol(Array.values, Decl(lib.es2015.iterable.d.ts, --, --))
+>values : Symbol(Array.values, Decl(lib.es2015.iterable.d.ts, --, --))
 
diff --git a/tests/baselines/reference/for-of18.symbols b/tests/baselines/reference/for-of18.symbols
index 34e11d3d388..191b33e858e 100644
--- a/tests/baselines/reference/for-of18.symbols
+++ b/tests/baselines/reference/for-of18.symbols
@@ -10,7 +10,7 @@ class StringIterator {
 >StringIterator : Symbol(StringIterator, Decl(for-of18.ts, 1, 33))
 
     next() {
->next : Symbol(next, Decl(for-of18.ts, 3, 22))
+>next : Symbol(StringIterator.next, Decl(for-of18.ts, 3, 22))
 
         return {
             value: "",
@@ -22,9 +22,9 @@ class StringIterator {
         };
     }
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(StringIterator, Decl(for-of18.ts, 1, 33))
diff --git a/tests/baselines/reference/for-of19.symbols b/tests/baselines/reference/for-of19.symbols
index 81aafd32d13..a11ee1da53b 100644
--- a/tests/baselines/reference/for-of19.symbols
+++ b/tests/baselines/reference/for-of19.symbols
@@ -14,7 +14,7 @@ class FooIterator {
 >FooIterator : Symbol(FooIterator, Decl(for-of19.ts, 4, 13))
 
     next() {
->next : Symbol(next, Decl(for-of19.ts, 5, 19))
+>next : Symbol(FooIterator.next, Decl(for-of19.ts, 5, 19))
 
         return {
             value: new Foo,
@@ -27,9 +27,9 @@ class FooIterator {
         };
     }
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(FooIterator, Decl(for-of19.ts, 4, 13))
diff --git a/tests/baselines/reference/for-of20.symbols b/tests/baselines/reference/for-of20.symbols
index 727b69e3c9d..9ec6d4edea1 100644
--- a/tests/baselines/reference/for-of20.symbols
+++ b/tests/baselines/reference/for-of20.symbols
@@ -14,7 +14,7 @@ class FooIterator {
 >FooIterator : Symbol(FooIterator, Decl(for-of20.ts, 4, 13))
 
     next() {
->next : Symbol(next, Decl(for-of20.ts, 5, 19))
+>next : Symbol(FooIterator.next, Decl(for-of20.ts, 5, 19))
 
         return {
             value: new Foo,
@@ -27,9 +27,9 @@ class FooIterator {
         };
     }
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(FooIterator, Decl(for-of20.ts, 4, 13))
diff --git a/tests/baselines/reference/for-of21.symbols b/tests/baselines/reference/for-of21.symbols
index 1464a42aab2..3e9d50ac041 100644
--- a/tests/baselines/reference/for-of21.symbols
+++ b/tests/baselines/reference/for-of21.symbols
@@ -14,7 +14,7 @@ class FooIterator {
 >FooIterator : Symbol(FooIterator, Decl(for-of21.ts, 4, 13))
 
     next() {
->next : Symbol(next, Decl(for-of21.ts, 5, 19))
+>next : Symbol(FooIterator.next, Decl(for-of21.ts, 5, 19))
 
         return {
             value: new Foo,
@@ -27,9 +27,9 @@ class FooIterator {
         };
     }
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(FooIterator, Decl(for-of21.ts, 4, 13))
diff --git a/tests/baselines/reference/for-of22.symbols b/tests/baselines/reference/for-of22.symbols
index 1aac39dae6e..6ce5fe1181a 100644
--- a/tests/baselines/reference/for-of22.symbols
+++ b/tests/baselines/reference/for-of22.symbols
@@ -15,7 +15,7 @@ class FooIterator {
 >FooIterator : Symbol(FooIterator, Decl(for-of22.ts, 5, 13))
 
     next() {
->next : Symbol(next, Decl(for-of22.ts, 6, 19))
+>next : Symbol(FooIterator.next, Decl(for-of22.ts, 6, 19))
 
         return {
             value: new Foo,
@@ -28,9 +28,9 @@ class FooIterator {
         };
     }
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(FooIterator, Decl(for-of22.ts, 5, 13))
diff --git a/tests/baselines/reference/for-of23.symbols b/tests/baselines/reference/for-of23.symbols
index f4f34fcef93..ce20bb81b79 100644
--- a/tests/baselines/reference/for-of23.symbols
+++ b/tests/baselines/reference/for-of23.symbols
@@ -14,7 +14,7 @@ class FooIterator {
 >FooIterator : Symbol(FooIterator, Decl(for-of23.ts, 4, 13))
 
     next() {
->next : Symbol(next, Decl(for-of23.ts, 5, 19))
+>next : Symbol(FooIterator.next, Decl(for-of23.ts, 5, 19))
 
         return {
             value: new Foo,
@@ -27,9 +27,9 @@ class FooIterator {
         };
     }
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(FooIterator, Decl(for-of23.ts, 4, 13))
diff --git a/tests/baselines/reference/for-of25.symbols b/tests/baselines/reference/for-of25.symbols
index dfa358da0bd..6c80a560efa 100644
--- a/tests/baselines/reference/for-of25.symbols
+++ b/tests/baselines/reference/for-of25.symbols
@@ -10,9 +10,9 @@ class StringIterator {
 >StringIterator : Symbol(StringIterator, Decl(for-of25.ts, 1, 37))
 
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return x;
 >x : Symbol(x, Decl(for-of25.ts, 0, 3))
diff --git a/tests/baselines/reference/for-of26.symbols b/tests/baselines/reference/for-of26.symbols
index 9f4d1455c3f..9970dea754b 100644
--- a/tests/baselines/reference/for-of26.symbols
+++ b/tests/baselines/reference/for-of26.symbols
@@ -10,15 +10,15 @@ class StringIterator {
 >StringIterator : Symbol(StringIterator, Decl(for-of26.ts, 1, 37))
 
     next() {
->next : Symbol(next, Decl(for-of26.ts, 3, 22))
+>next : Symbol(StringIterator.next, Decl(for-of26.ts, 3, 22))
 
         return x;
 >x : Symbol(x, Decl(for-of26.ts, 0, 3))
     }
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(StringIterator, Decl(for-of26.ts, 1, 37))
diff --git a/tests/baselines/reference/for-of27.symbols b/tests/baselines/reference/for-of27.symbols
index 57148c53f13..12452b2ee77 100644
--- a/tests/baselines/reference/for-of27.symbols
+++ b/tests/baselines/reference/for-of27.symbols
@@ -7,7 +7,7 @@ class StringIterator {
 >StringIterator : Symbol(StringIterator, Decl(for-of27.ts, 0, 37))
 
     [Symbol.iterator]: any;
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/for-of28.symbols b/tests/baselines/reference/for-of28.symbols
index 91081d3abdf..94c8a1041d1 100644
--- a/tests/baselines/reference/for-of28.symbols
+++ b/tests/baselines/reference/for-of28.symbols
@@ -7,12 +7,12 @@ class StringIterator {
 >StringIterator : Symbol(StringIterator, Decl(for-of28.ts, 0, 37))
 
     next: any;
->next : Symbol(next, Decl(for-of28.ts, 2, 22))
+>next : Symbol(StringIterator.next, Decl(for-of28.ts, 2, 22))
 
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(StringIterator, Decl(for-of28.ts, 0, 37))
diff --git a/tests/baselines/reference/for-of37.symbols b/tests/baselines/reference/for-of37.symbols
index b8ce9da9ce2..c9c5c627b8a 100644
--- a/tests/baselines/reference/for-of37.symbols
+++ b/tests/baselines/reference/for-of37.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/for-ofStatements/for-of37.ts ===
 var map = new Map([["", true]]);
 >map : Symbol(map, Decl(for-of37.ts, 0, 3))
->Map : Symbol(Map, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Map : Symbol(Map, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --))
 
 for (var v of map) {
 >v : Symbol(v, Decl(for-of37.ts, 1, 8))
diff --git a/tests/baselines/reference/for-of38.symbols b/tests/baselines/reference/for-of38.symbols
index 18d2dda6db8..d1df1afea3b 100644
--- a/tests/baselines/reference/for-of38.symbols
+++ b/tests/baselines/reference/for-of38.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/for-ofStatements/for-of38.ts ===
 var map = new Map([["", true]]);
 >map : Symbol(map, Decl(for-of38.ts, 0, 3))
->Map : Symbol(Map, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Map : Symbol(Map, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --))
 
 for (var [k, v] of map) {
 >k : Symbol(k, Decl(for-of38.ts, 1, 10))
diff --git a/tests/baselines/reference/for-of40.symbols b/tests/baselines/reference/for-of40.symbols
index a9177d12435..37fff144559 100644
--- a/tests/baselines/reference/for-of40.symbols
+++ b/tests/baselines/reference/for-of40.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/for-ofStatements/for-of40.ts ===
 var map = new Map([["", true]]);
 >map : Symbol(map, Decl(for-of40.ts, 0, 3))
->Map : Symbol(Map, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Map : Symbol(Map, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --))
 
 for (var [k = "", v = false] of map) {
 >k : Symbol(k, Decl(for-of40.ts, 1, 10))
diff --git a/tests/baselines/reference/for-of44.symbols b/tests/baselines/reference/for-of44.symbols
index d7057da0ee2..fb951a6ef8a 100644
--- a/tests/baselines/reference/for-of44.symbols
+++ b/tests/baselines/reference/for-of44.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/for-ofStatements/for-of44.ts ===
 var array: [number, string | boolean | symbol][] = [[0, ""], [0, true], [1, Symbol()]]
 >array : Symbol(array, Decl(for-of44.ts, 0, 3))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
 
 for (var [num, strBoolSym] of array) {
 >num : Symbol(num, Decl(for-of44.ts, 1, 10))
diff --git a/tests/baselines/reference/for-of45.symbols b/tests/baselines/reference/for-of45.symbols
index 7d8ffd4ba86..3a0968069c8 100644
--- a/tests/baselines/reference/for-of45.symbols
+++ b/tests/baselines/reference/for-of45.symbols
@@ -5,7 +5,7 @@ var k: string, v: boolean;
 
 var map = new Map([["", true]]);
 >map : Symbol(map, Decl(for-of45.ts, 1, 3))
->Map : Symbol(Map, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Map : Symbol(Map, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --))
 
 for ([k = "", v = false] of map) {
 >k : Symbol(k, Decl(for-of45.ts, 0, 3))
diff --git a/tests/baselines/reference/for-of50.symbols b/tests/baselines/reference/for-of50.symbols
index 435390f2a6e..ad9b06d48a9 100644
--- a/tests/baselines/reference/for-of50.symbols
+++ b/tests/baselines/reference/for-of50.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/for-ofStatements/for-of50.ts ===
 var map = new Map([["", true]]);
 >map : Symbol(map, Decl(for-of50.ts, 0, 3))
->Map : Symbol(Map, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Map : Symbol(Map, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --))
 
 for (const [k, v] of map) {
 >k : Symbol(k, Decl(for-of50.ts, 1, 12))
diff --git a/tests/baselines/reference/for-of57.symbols b/tests/baselines/reference/for-of57.symbols
index 191377bdd47..e510b4f9afa 100644
--- a/tests/baselines/reference/for-of57.symbols
+++ b/tests/baselines/reference/for-of57.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/for-ofStatements/for-of57.ts ===
 var iter: Iterable<number>;
 >iter : Symbol(iter, Decl(for-of57.ts, 0, 3))
->Iterable : Symbol(Iterable, Decl(lib.d.ts, --, --))
+>Iterable : Symbol(Iterable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
 for (let num of iter) { }
 >num : Symbol(num, Decl(for-of57.ts, 1, 8))
diff --git a/tests/baselines/reference/forStatements.symbols b/tests/baselines/reference/forStatements.symbols
index 2d5250217f9..84cd7dc70d1 100644
--- a/tests/baselines/reference/forStatements.symbols
+++ b/tests/baselines/reference/forStatements.symbols
@@ -4,7 +4,7 @@ interface I {
 >I : Symbol(I, Decl(forStatements.ts, 0, 0))
 
     id: number;
->id : Symbol(id, Decl(forStatements.ts, 1, 13))
+>id : Symbol(I.id, Decl(forStatements.ts, 1, 13))
 }
 
 class C implements I {
@@ -12,7 +12,7 @@ class C implements I {
 >I : Symbol(I, Decl(forStatements.ts, 0, 0))
 
     id: number;
->id : Symbol(id, Decl(forStatements.ts, 5, 22))
+>id : Symbol(C.id, Decl(forStatements.ts, 5, 22))
 }
 
 class D<T>{
@@ -20,16 +20,16 @@ class D<T>{
 >T : Symbol(T, Decl(forStatements.ts, 9, 8))
 
     source: T;
->source : Symbol(source, Decl(forStatements.ts, 9, 11))
+>source : Symbol(D.source, Decl(forStatements.ts, 9, 11))
 >T : Symbol(T, Decl(forStatements.ts, 9, 8))
 
     recurse: D<T>;
->recurse : Symbol(recurse, Decl(forStatements.ts, 10, 14))
+>recurse : Symbol(D.recurse, Decl(forStatements.ts, 10, 14))
 >D : Symbol(D, Decl(forStatements.ts, 7, 1))
 >T : Symbol(T, Decl(forStatements.ts, 9, 8))
 
     wrapped: D<D<T>>
->wrapped : Symbol(wrapped, Decl(forStatements.ts, 11, 18))
+>wrapped : Symbol(D.wrapped, Decl(forStatements.ts, 11, 18))
 >D : Symbol(D, Decl(forStatements.ts, 7, 1))
 >D : Symbol(D, Decl(forStatements.ts, 7, 1))
 >T : Symbol(T, Decl(forStatements.ts, 9, 8))
@@ -46,7 +46,7 @@ module M {
 >A : Symbol(A, Decl(forStatements.ts, 17, 10))
 
         name: string;
->name : Symbol(name, Decl(forStatements.ts, 18, 20))
+>name : Symbol(A.name, Decl(forStatements.ts, 18, 20))
     }
 
     export function F2(x: number): string { return x.toString(); }
@@ -65,8 +65,8 @@ for(var aString: string = 'this is a string';;){}
 
 for(var aDate: Date = new Date(12);;){}
 >aDate : Symbol(aDate, Decl(forStatements.ts, 27, 7))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 for(var anObject: Object = new Object();;){}
 >anObject : Symbol(anObject, Decl(forStatements.ts, 28, 7))
diff --git a/tests/baselines/reference/forStatementsMultipleValidDecl.symbols b/tests/baselines/reference/forStatementsMultipleValidDecl.symbols
index d2d8ac01003..89e36c4a8f5 100644
--- a/tests/baselines/reference/forStatementsMultipleValidDecl.symbols
+++ b/tests/baselines/reference/forStatementsMultipleValidDecl.symbols
@@ -21,8 +21,8 @@ function declSpace() {
 }
 interface Point { x: number; y: number; }
 >Point : Symbol(Point, Decl(forStatementsMultipleValidDecl.ts, 10, 1))
->x : Symbol(x, Decl(forStatementsMultipleValidDecl.ts, 11, 17))
->y : Symbol(y, Decl(forStatementsMultipleValidDecl.ts, 11, 28))
+>x : Symbol(Point.x, Decl(forStatementsMultipleValidDecl.ts, 11, 17))
+>y : Symbol(Point.y, Decl(forStatementsMultipleValidDecl.ts, 11, 28))
 
 for (var p: Point; ;) { }
 >p : Symbol(p, Decl(forStatementsMultipleValidDecl.ts, 13, 8), Decl(forStatementsMultipleValidDecl.ts, 14, 8), Decl(forStatementsMultipleValidDecl.ts, 15, 8), Decl(forStatementsMultipleValidDecl.ts, 16, 8), Decl(forStatementsMultipleValidDecl.ts, 17, 8), Decl(forStatementsMultipleValidDecl.ts, 18, 8), Decl(forStatementsMultipleValidDecl.ts, 19, 8))
diff --git a/tests/baselines/reference/functionAndImportNameConflict.errors.txt b/tests/baselines/reference/functionAndImportNameConflict.errors.txt
new file mode 100644
index 00000000000..4ca496cfb65
--- /dev/null
+++ b/tests/baselines/reference/functionAndImportNameConflict.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/compiler/f2.ts(1,9): error TS2440: Import declaration conflicts with local declaration of 'f'
+
+
+==== tests/cases/compiler/f1.ts (0 errors) ====
+    export function f() {
+    }
+    
+==== tests/cases/compiler/f2.ts (1 errors) ====
+    import {f} from './f1';
+            ~
+!!! error TS2440: Import declaration conflicts with local declaration of 'f'
+    export function f() {
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/functionAndImportNameConflict.js b/tests/baselines/reference/functionAndImportNameConflict.js
new file mode 100644
index 00000000000..8391823aa3a
--- /dev/null
+++ b/tests/baselines/reference/functionAndImportNameConflict.js
@@ -0,0 +1,21 @@
+//// [tests/cases/compiler/functionAndImportNameConflict.ts] ////
+
+//// [f1.ts]
+export function f() {
+}
+
+//// [f2.ts]
+import {f} from './f1';
+export function f() {
+}
+
+//// [f1.js]
+"use strict";
+function f() {
+}
+exports.f = f;
+//// [f2.js]
+"use strict";
+function f() {
+}
+exports.f = f;
diff --git a/tests/baselines/reference/functionCall5.symbols b/tests/baselines/reference/functionCall5.symbols
index de166231204..e06c801eba8 100644
--- a/tests/baselines/reference/functionCall5.symbols
+++ b/tests/baselines/reference/functionCall5.symbols
@@ -2,7 +2,7 @@
 module m1 { export class c1 { public a; }} 
 >m1 : Symbol(m1, Decl(functionCall5.ts, 0, 0))
 >c1 : Symbol(c1, Decl(functionCall5.ts, 0, 11))
->a : Symbol(a, Decl(functionCall5.ts, 0, 29))
+>a : Symbol(c1.a, Decl(functionCall5.ts, 0, 29))
 
 function foo():m1.c1{return new m1.c1();}; 
 >foo : Symbol(foo, Decl(functionCall5.ts, 0, 42))
diff --git a/tests/baselines/reference/functionConstraintSatisfaction.symbols b/tests/baselines/reference/functionConstraintSatisfaction.symbols
index 969ac928374..6c7ca5f7713 100644
--- a/tests/baselines/reference/functionConstraintSatisfaction.symbols
+++ b/tests/baselines/reference/functionConstraintSatisfaction.symbols
@@ -23,7 +23,7 @@ class C {
 >C : Symbol(C, Decl(functionConstraintSatisfaction.ts, 7, 9))
 
     foo: string;
->foo : Symbol(foo, Decl(functionConstraintSatisfaction.ts, 9, 9))
+>foo : Symbol(C.foo, Decl(functionConstraintSatisfaction.ts, 9, 9))
 }
 
 var a: { (): string };
@@ -103,7 +103,7 @@ class C2<T> {
 >T : Symbol(T, Decl(functionConstraintSatisfaction.ts, 32, 9))
 
     foo: T;
->foo : Symbol(foo, Decl(functionConstraintSatisfaction.ts, 32, 13))
+>foo : Symbol(C2.foo, Decl(functionConstraintSatisfaction.ts, 32, 13))
 >T : Symbol(T, Decl(functionConstraintSatisfaction.ts, 32, 9))
 }
 
@@ -154,7 +154,7 @@ var r11 = foo(<U extends Date>(x: U) => x);
 >r11 : Symbol(r11, Decl(functionConstraintSatisfaction.ts, 42, 3))
 >foo : Symbol(foo, Decl(functionConstraintSatisfaction.ts, 0, 0))
 >U : Symbol(U, Decl(functionConstraintSatisfaction.ts, 42, 15))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(functionConstraintSatisfaction.ts, 42, 31))
 >U : Symbol(U, Decl(functionConstraintSatisfaction.ts, 42, 15))
 >x : Symbol(x, Decl(functionConstraintSatisfaction.ts, 42, 31))
@@ -193,7 +193,7 @@ var r16 = foo(c2);
 interface F2 extends Function { foo: string; }
 >F2 : Symbol(F2, Decl(functionConstraintSatisfaction.ts, 47, 18))
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->foo : Symbol(foo, Decl(functionConstraintSatisfaction.ts, 49, 31))
+>foo : Symbol(F2.foo, Decl(functionConstraintSatisfaction.ts, 49, 31))
 
 var f2: F2;
 >f2 : Symbol(f2, Decl(functionConstraintSatisfaction.ts, 50, 3))
diff --git a/tests/baselines/reference/functionConstraintSatisfaction2.errors.txt b/tests/baselines/reference/functionConstraintSatisfaction2.errors.txt
index d2299894c59..7d3fa793ec8 100644
--- a/tests/baselines/reference/functionConstraintSatisfaction2.errors.txt
+++ b/tests/baselines/reference/functionConstraintSatisfaction2.errors.txt
@@ -5,7 +5,7 @@ tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstrain
   Type 'Function' provides no match for the signature '(x: string): string'
 tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts(24,15): error TS2345: Argument of type '(x: string[]) => string[]' is not assignable to parameter of type '(x: string) => string'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type 'string[]' is not assignable to type 'string'.
+    Type 'string' is not assignable to type 'string[]'.
 tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts(25,15): error TS2345: Argument of type 'typeof C' is not assignable to parameter of type '(x: string) => string'.
   Type 'typeof C' provides no match for the signature '(x: string): string'
 tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction2.ts(26,15): error TS2345: Argument of type 'new (x: string) => string' is not assignable to parameter of type '(x: string) => string'.
@@ -63,7 +63,7 @@ tests/cases/conformance/types/typeParameters/typeArgumentLists/functionConstrain
                   ~~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: string[]) => string[]' is not assignable to parameter of type '(x: string) => string'.
 !!! error TS2345:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2345:     Type 'string[]' is not assignable to type 'string'.
+!!! error TS2345:     Type 'string' is not assignable to type 'string[]'.
     var r6 = foo2(C);
                   ~
 !!! error TS2345: Argument of type 'typeof C' is not assignable to parameter of type '(x: string) => string'.
diff --git a/tests/baselines/reference/functionConstraintSatisfaction3.symbols b/tests/baselines/reference/functionConstraintSatisfaction3.symbols
index 74f3a65aa8e..70f71602c06 100644
--- a/tests/baselines/reference/functionConstraintSatisfaction3.symbols
+++ b/tests/baselines/reference/functionConstraintSatisfaction3.symbols
@@ -23,7 +23,7 @@ class C {
 >C : Symbol(C, Decl(functionConstraintSatisfaction3.ts, 7, 9))
 
     foo: string;
->foo : Symbol(foo, Decl(functionConstraintSatisfaction3.ts, 9, 9))
+>foo : Symbol(C.foo, Decl(functionConstraintSatisfaction3.ts, 9, 9))
 }
 
 var a: { (): string };
@@ -88,7 +88,7 @@ class C2<T> {
 >T : Symbol(T, Decl(functionConstraintSatisfaction3.ts, 29, 9))
 
     foo: T;
->foo : Symbol(foo, Decl(functionConstraintSatisfaction3.ts, 29, 13))
+>foo : Symbol(C2.foo, Decl(functionConstraintSatisfaction3.ts, 29, 13))
 >T : Symbol(T, Decl(functionConstraintSatisfaction3.ts, 29, 9))
 }
 
diff --git a/tests/baselines/reference/functionExpressionContextualTyping1.symbols b/tests/baselines/reference/functionExpressionContextualTyping1.symbols
index 736fa86b9ca..7d4b0ccbb6b 100644
--- a/tests/baselines/reference/functionExpressionContextualTyping1.symbols
+++ b/tests/baselines/reference/functionExpressionContextualTyping1.symbols
@@ -30,14 +30,14 @@ class Class<T> {
 >T : Symbol(T, Decl(functionExpressionContextualTyping1.ts, 13, 12))
 
     foo() { }
->foo : Symbol(foo, Decl(functionExpressionContextualTyping1.ts, 13, 16))
+>foo : Symbol(Class.foo, Decl(functionExpressionContextualTyping1.ts, 13, 16))
 }
 
 var a1: (c: Class<Number>) => number = (a1) => {
 >a1 : Symbol(a1, Decl(functionExpressionContextualTyping1.ts, 17, 3))
 >c : Symbol(c, Decl(functionExpressionContextualTyping1.ts, 17, 9))
 >Class : Symbol(Class, Decl(functionExpressionContextualTyping1.ts, 11, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >a1 : Symbol(a1, Decl(functionExpressionContextualTyping1.ts, 17, 40))
 
     a1.foo();
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/functionImplementationErrors.errors.txt b/tests/baselines/reference/functionImplementationErrors.errors.txt
index 86ecb6a6057..dc5ad5a2747 100644
--- a/tests/baselines/reference/functionImplementationErrors.errors.txt
+++ b/tests/baselines/reference/functionImplementationErrors.errors.txt
@@ -30,13 +30,10 @@ tests/cases/conformance/functions/functionImplementationErrors.ts(70,11): error
     };
     var f3 = () => {
              ~~~~~~~
-        return '';
-    ~~~~~~~~~~~~~~
-        return 3;
-    ~~~~~~~~~~~~~
-    };
-    ~
 !!! error TS2354: No best common type exists among return expressions.
+        return '';
+        return 3;
+    };
     
     // FunctionExpression with no return type annotation with return branch of number[] and other of string[]
     var f4 = function () {
@@ -94,13 +91,10 @@ tests/cases/conformance/functions/functionImplementationErrors.ts(70,11): error
     };
     var f10 = () => {
               ~~~~~~~
-        return new Derived1();
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~
-        return new Derived2();
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~
-    };
-    ~
 !!! error TS2354: No best common type exists among return expressions.
+        return new Derived1();
+        return new Derived2();
+    };
     function f11() {
              ~~~
 !!! error TS2354: No best common type exists among return expressions.
@@ -115,11 +109,8 @@ tests/cases/conformance/functions/functionImplementationErrors.ts(70,11): error
     };
     var f13 = () => {
               ~~~~~~~
-        return new Base();
-    ~~~~~~~~~~~~~~~~~~~~~~
-        return new AnotherClass();
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    };
-    ~
 !!! error TS2354: No best common type exists among return expressions.
+        return new Base();
+        return new AnotherClass();
+    };
     
\ No newline at end of file
diff --git a/tests/baselines/reference/functionImplementations.symbols b/tests/baselines/reference/functionImplementations.symbols
index 07945b5f765..1d8c5b2618b 100644
--- a/tests/baselines/reference/functionImplementations.symbols
+++ b/tests/baselines/reference/functionImplementations.symbols
@@ -150,12 +150,12 @@ var n = function () {
 // FunctionExpression with no return type annotation with multiple return statements with subtype relation between returns
 class Base { private m; }
 >Base : Symbol(Base, Decl(functionImplementations.ts, 70, 4))
->m : Symbol(m, Decl(functionImplementations.ts, 77, 12))
+>m : Symbol(Base.m, Decl(functionImplementations.ts, 77, 12))
 
 class Derived extends Base { private q; }
 >Derived : Symbol(Derived, Decl(functionImplementations.ts, 77, 25))
 >Base : Symbol(Base, Decl(functionImplementations.ts, 70, 4))
->q : Symbol(q, Decl(functionImplementations.ts, 78, 28))
+>q : Symbol(Derived.q, Decl(functionImplementations.ts, 78, 28))
 
 var b: Base;
 >b : Symbol(b, Decl(functionImplementations.ts, 79, 3), Decl(functionImplementations.ts, 80, 3))
@@ -261,11 +261,11 @@ function f6(): number {
 class Derived2 extends Base { private r: string; }
 >Derived2 : Symbol(Derived2, Decl(functionImplementations.ts, 124, 1))
 >Base : Symbol(Base, Decl(functionImplementations.ts, 70, 4))
->r : Symbol(r, Decl(functionImplementations.ts, 126, 29))
+>r : Symbol(Derived2.r, Decl(functionImplementations.ts, 126, 29))
 
 class AnotherClass { private x }
 >AnotherClass : Symbol(AnotherClass, Decl(functionImplementations.ts, 126, 50))
->x : Symbol(x, Decl(functionImplementations.ts, 127, 20))
+>x : Symbol(AnotherClass.x, Decl(functionImplementations.ts, 127, 20))
 
 // if f is a contextually typed function expression, the inferred return type is the union type
 // of the types of the return statement expressions in the function body, 
diff --git a/tests/baselines/reference/functionOverloadErrors.errors.txt b/tests/baselines/reference/functionOverloadErrors.errors.txt
index ae1dfeae4d1..1ec0344ac62 100644
--- a/tests/baselines/reference/functionOverloadErrors.errors.txt
+++ b/tests/baselines/reference/functionOverloadErrors.errors.txt
@@ -4,8 +4,8 @@ tests/cases/conformance/functions/functionOverloadErrors.ts(50,25): error TS2304
 tests/cases/conformance/functions/functionOverloadErrors.ts(51,32): error TS2304: Cannot find name 'window'.
 tests/cases/conformance/functions/functionOverloadErrors.ts(65,13): error TS2385: Overload signatures must all be public, private or protected.
 tests/cases/conformance/functions/functionOverloadErrors.ts(68,13): error TS2385: Overload signatures must all be public, private or protected.
-tests/cases/conformance/functions/functionOverloadErrors.ts(75,21): error TS2383: Overload signatures must all be exported or not exported.
-tests/cases/conformance/functions/functionOverloadErrors.ts(79,14): error TS2383: Overload signatures must all be exported or not exported.
+tests/cases/conformance/functions/functionOverloadErrors.ts(75,21): error TS2383: Overload signatures must all be exported or non-exported.
+tests/cases/conformance/functions/functionOverloadErrors.ts(79,14): error TS2383: Overload signatures must all be exported or non-exported.
 tests/cases/conformance/functions/functionOverloadErrors.ts(85,18): error TS2384: Overload signatures must all be ambient or non-ambient.
 tests/cases/conformance/functions/functionOverloadErrors.ts(90,18): error TS2384: Overload signatures must all be ambient or non-ambient.
 tests/cases/conformance/functions/functionOverloadErrors.ts(94,10): error TS2394: Overload signature is not compatible with function implementation.
@@ -103,13 +103,13 @@ tests/cases/conformance/functions/functionOverloadErrors.ts(116,19): error TS237
     module M {
         export function fn1();
                         ~~~
-!!! error TS2383: Overload signatures must all be exported or not exported.
+!!! error TS2383: Overload signatures must all be exported or non-exported.
         function fn1(n: string);
         function fn1() { } 
     
         function fn2(n: string);
                  ~~~
-!!! error TS2383: Overload signatures must all be exported or not exported.
+!!! error TS2383: Overload signatures must all be exported or non-exported.
         export function fn2();
         export function fn2() { } 
     }
diff --git a/tests/baselines/reference/functionOverloads44.symbols b/tests/baselines/reference/functionOverloads44.symbols
index 3520777a835..9b1ef6c93a8 100644
--- a/tests/baselines/reference/functionOverloads44.symbols
+++ b/tests/baselines/reference/functionOverloads44.symbols
@@ -1,17 +1,17 @@
 === tests/cases/compiler/functionOverloads44.ts ===
 interface Animal { animal }
 >Animal : Symbol(Animal, Decl(functionOverloads44.ts, 0, 0))
->animal : Symbol(animal, Decl(functionOverloads44.ts, 0, 18))
+>animal : Symbol(Animal.animal, Decl(functionOverloads44.ts, 0, 18))
 
 interface Dog extends Animal { dog }
 >Dog : Symbol(Dog, Decl(functionOverloads44.ts, 0, 27))
 >Animal : Symbol(Animal, Decl(functionOverloads44.ts, 0, 0))
->dog : Symbol(dog, Decl(functionOverloads44.ts, 1, 30))
+>dog : Symbol(Dog.dog, Decl(functionOverloads44.ts, 1, 30))
 
 interface Cat extends Animal { cat }
 >Cat : Symbol(Cat, Decl(functionOverloads44.ts, 1, 36))
 >Animal : Symbol(Animal, Decl(functionOverloads44.ts, 0, 0))
->cat : Symbol(cat, Decl(functionOverloads44.ts, 2, 30))
+>cat : Symbol(Cat.cat, Decl(functionOverloads44.ts, 2, 30))
 
 function foo1(bar: { a:number }[]): Dog;
 >foo1 : Symbol(foo1, Decl(functionOverloads44.ts, 2, 36), Decl(functionOverloads44.ts, 4, 40), Decl(functionOverloads44.ts, 5, 43))
diff --git a/tests/baselines/reference/functionOverloads45.symbols b/tests/baselines/reference/functionOverloads45.symbols
index 28599339099..628ab14e3d1 100644
--- a/tests/baselines/reference/functionOverloads45.symbols
+++ b/tests/baselines/reference/functionOverloads45.symbols
@@ -1,17 +1,17 @@
 === tests/cases/compiler/functionOverloads45.ts ===
 interface Animal { animal }
 >Animal : Symbol(Animal, Decl(functionOverloads45.ts, 0, 0))
->animal : Symbol(animal, Decl(functionOverloads45.ts, 0, 18))
+>animal : Symbol(Animal.animal, Decl(functionOverloads45.ts, 0, 18))
 
 interface Dog extends Animal { dog }
 >Dog : Symbol(Dog, Decl(functionOverloads45.ts, 0, 27))
 >Animal : Symbol(Animal, Decl(functionOverloads45.ts, 0, 0))
->dog : Symbol(dog, Decl(functionOverloads45.ts, 1, 30))
+>dog : Symbol(Dog.dog, Decl(functionOverloads45.ts, 1, 30))
 
 interface Cat extends Animal { cat }
 >Cat : Symbol(Cat, Decl(functionOverloads45.ts, 1, 36))
 >Animal : Symbol(Animal, Decl(functionOverloads45.ts, 0, 0))
->cat : Symbol(cat, Decl(functionOverloads45.ts, 2, 30))
+>cat : Symbol(Cat.cat, Decl(functionOverloads45.ts, 2, 30))
 
 function foo1(bar: { a:number }[]): Cat;
 >foo1 : Symbol(foo1, Decl(functionOverloads45.ts, 2, 36), Decl(functionOverloads45.ts, 4, 40), Decl(functionOverloads45.ts, 5, 40))
diff --git a/tests/baselines/reference/functionOverloads7.symbols b/tests/baselines/reference/functionOverloads7.symbols
index 1d2fe3ea6a2..f1b29f951e7 100644
--- a/tests/baselines/reference/functionOverloads7.symbols
+++ b/tests/baselines/reference/functionOverloads7.symbols
@@ -3,30 +3,30 @@ class foo {
 >foo : Symbol(foo, Decl(functionOverloads7.ts, 0, 0))
 
    private bar();
->bar : Symbol(bar, Decl(functionOverloads7.ts, 0, 11), Decl(functionOverloads7.ts, 1, 17), Decl(functionOverloads7.ts, 2, 28))
+>bar : Symbol(foo.bar, Decl(functionOverloads7.ts, 0, 11), Decl(functionOverloads7.ts, 1, 17), Decl(functionOverloads7.ts, 2, 28))
 
    private bar(foo: string);
->bar : Symbol(bar, Decl(functionOverloads7.ts, 0, 11), Decl(functionOverloads7.ts, 1, 17), Decl(functionOverloads7.ts, 2, 28))
+>bar : Symbol(foo.bar, Decl(functionOverloads7.ts, 0, 11), Decl(functionOverloads7.ts, 1, 17), Decl(functionOverloads7.ts, 2, 28))
 >foo : Symbol(foo, Decl(functionOverloads7.ts, 2, 15))
 
    private bar(foo?: any){ return "foo" }
->bar : Symbol(bar, Decl(functionOverloads7.ts, 0, 11), Decl(functionOverloads7.ts, 1, 17), Decl(functionOverloads7.ts, 2, 28))
+>bar : Symbol(foo.bar, Decl(functionOverloads7.ts, 0, 11), Decl(functionOverloads7.ts, 1, 17), Decl(functionOverloads7.ts, 2, 28))
 >foo : Symbol(foo, Decl(functionOverloads7.ts, 3, 15))
 
    public n() {
->n : Symbol(n, Decl(functionOverloads7.ts, 3, 41))
+>n : Symbol(foo.n, Decl(functionOverloads7.ts, 3, 41))
 
      var foo = this.bar();
 >foo : Symbol(foo, Decl(functionOverloads7.ts, 5, 8))
->this.bar : Symbol(bar, Decl(functionOverloads7.ts, 0, 11), Decl(functionOverloads7.ts, 1, 17), Decl(functionOverloads7.ts, 2, 28))
+>this.bar : Symbol(foo.bar, Decl(functionOverloads7.ts, 0, 11), Decl(functionOverloads7.ts, 1, 17), Decl(functionOverloads7.ts, 2, 28))
 >this : Symbol(foo, Decl(functionOverloads7.ts, 0, 0))
->bar : Symbol(bar, Decl(functionOverloads7.ts, 0, 11), Decl(functionOverloads7.ts, 1, 17), Decl(functionOverloads7.ts, 2, 28))
+>bar : Symbol(foo.bar, Decl(functionOverloads7.ts, 0, 11), Decl(functionOverloads7.ts, 1, 17), Decl(functionOverloads7.ts, 2, 28))
 
      foo = this.bar("test");
 >foo : Symbol(foo, Decl(functionOverloads7.ts, 5, 8))
->this.bar : Symbol(bar, Decl(functionOverloads7.ts, 0, 11), Decl(functionOverloads7.ts, 1, 17), Decl(functionOverloads7.ts, 2, 28))
+>this.bar : Symbol(foo.bar, Decl(functionOverloads7.ts, 0, 11), Decl(functionOverloads7.ts, 1, 17), Decl(functionOverloads7.ts, 2, 28))
 >this : Symbol(foo, Decl(functionOverloads7.ts, 0, 0))
->bar : Symbol(bar, Decl(functionOverloads7.ts, 0, 11), Decl(functionOverloads7.ts, 1, 17), Decl(functionOverloads7.ts, 2, 28))
+>bar : Symbol(foo.bar, Decl(functionOverloads7.ts, 0, 11), Decl(functionOverloads7.ts, 1, 17), Decl(functionOverloads7.ts, 2, 28))
    }
 }
 
diff --git a/tests/baselines/reference/functionOverloadsOnGenericArity1.symbols b/tests/baselines/reference/functionOverloadsOnGenericArity1.symbols
index d4721e5ec08..57c1edcd8f0 100644
--- a/tests/baselines/reference/functionOverloadsOnGenericArity1.symbols
+++ b/tests/baselines/reference/functionOverloadsOnGenericArity1.symbols
@@ -4,11 +4,11 @@ interface C {
 >C : Symbol(C, Decl(functionOverloadsOnGenericArity1.ts, 0, 0))
 
    f<T>(): string;
->f : Symbol(f, Decl(functionOverloadsOnGenericArity1.ts, 1, 13), Decl(functionOverloadsOnGenericArity1.ts, 2, 18))
+>f : Symbol(C.f, Decl(functionOverloadsOnGenericArity1.ts, 1, 13), Decl(functionOverloadsOnGenericArity1.ts, 2, 18))
 >T : Symbol(T, Decl(functionOverloadsOnGenericArity1.ts, 2, 5))
 
    f<T, U>(): string; 
->f : Symbol(f, Decl(functionOverloadsOnGenericArity1.ts, 1, 13), Decl(functionOverloadsOnGenericArity1.ts, 2, 18))
+>f : Symbol(C.f, Decl(functionOverloadsOnGenericArity1.ts, 1, 13), Decl(functionOverloadsOnGenericArity1.ts, 2, 18))
 >T : Symbol(T, Decl(functionOverloadsOnGenericArity1.ts, 3, 5))
 >U : Symbol(U, Decl(functionOverloadsOnGenericArity1.ts, 3, 7))
  
diff --git a/tests/baselines/reference/functionOverloadsOnGenericArity2.symbols b/tests/baselines/reference/functionOverloadsOnGenericArity2.symbols
index 0dda3ba81a8..750da358d67 100644
--- a/tests/baselines/reference/functionOverloadsOnGenericArity2.symbols
+++ b/tests/baselines/reference/functionOverloadsOnGenericArity2.symbols
@@ -3,18 +3,18 @@ interface I {
 >I : Symbol(I, Decl(functionOverloadsOnGenericArity2.ts, 0, 0))
 
     then(p: string): string;
->then : Symbol(then, Decl(functionOverloadsOnGenericArity2.ts, 0, 13), Decl(functionOverloadsOnGenericArity2.ts, 1, 28), Decl(functionOverloadsOnGenericArity2.ts, 2, 31))
+>then : Symbol(I.then, Decl(functionOverloadsOnGenericArity2.ts, 0, 13), Decl(functionOverloadsOnGenericArity2.ts, 1, 28), Decl(functionOverloadsOnGenericArity2.ts, 2, 31))
 >p : Symbol(p, Decl(functionOverloadsOnGenericArity2.ts, 1, 9))
 
     then<U>(p: string): string;
->then : Symbol(then, Decl(functionOverloadsOnGenericArity2.ts, 0, 13), Decl(functionOverloadsOnGenericArity2.ts, 1, 28), Decl(functionOverloadsOnGenericArity2.ts, 2, 31))
+>then : Symbol(I.then, Decl(functionOverloadsOnGenericArity2.ts, 0, 13), Decl(functionOverloadsOnGenericArity2.ts, 1, 28), Decl(functionOverloadsOnGenericArity2.ts, 2, 31))
 >U : Symbol(U, Decl(functionOverloadsOnGenericArity2.ts, 2, 9))
 >p : Symbol(p, Decl(functionOverloadsOnGenericArity2.ts, 2, 12))
 
     then<U, T>(p: string): Date;
->then : Symbol(then, Decl(functionOverloadsOnGenericArity2.ts, 0, 13), Decl(functionOverloadsOnGenericArity2.ts, 1, 28), Decl(functionOverloadsOnGenericArity2.ts, 2, 31))
+>then : Symbol(I.then, Decl(functionOverloadsOnGenericArity2.ts, 0, 13), Decl(functionOverloadsOnGenericArity2.ts, 1, 28), Decl(functionOverloadsOnGenericArity2.ts, 2, 31))
 >U : Symbol(U, Decl(functionOverloadsOnGenericArity2.ts, 3, 9))
 >T : Symbol(T, Decl(functionOverloadsOnGenericArity2.ts, 3, 11))
 >p : Symbol(p, Decl(functionOverloadsOnGenericArity2.ts, 3, 15))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.symbols b/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.symbols
index 42ed87e64d1..67f6545d387 100644
--- a/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.symbols
+++ b/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.symbols
@@ -4,7 +4,7 @@ class B<V>{
 >V : Symbol(V, Decl(functionOverloadsRecursiveGenericReturnType.ts, 0, 8))
 
     private id: V;
->id : Symbol(id, Decl(functionOverloadsRecursiveGenericReturnType.ts, 0, 11))
+>id : Symbol(B.id, Decl(functionOverloadsRecursiveGenericReturnType.ts, 0, 11))
 >V : Symbol(V, Decl(functionOverloadsRecursiveGenericReturnType.ts, 0, 8))
 }
 
@@ -13,7 +13,7 @@ class A<U>{
 >U : Symbol(U, Decl(functionOverloadsRecursiveGenericReturnType.ts, 4, 8))
 
     GetEnumerator: () => B<U>;
->GetEnumerator : Symbol(GetEnumerator, Decl(functionOverloadsRecursiveGenericReturnType.ts, 4, 11))
+>GetEnumerator : Symbol(A.GetEnumerator, Decl(functionOverloadsRecursiveGenericReturnType.ts, 4, 11))
 >B : Symbol(B, Decl(functionOverloadsRecursiveGenericReturnType.ts, 0, 0))
 >U : Symbol(U, Decl(functionOverloadsRecursiveGenericReturnType.ts, 4, 8))
 }
diff --git a/tests/baselines/reference/functionSignatureAssignmentCompat1.errors.txt b/tests/baselines/reference/functionSignatureAssignmentCompat1.errors.txt
index 86c4728dda2..f91a4f91547 100644
--- a/tests/baselines/reference/functionSignatureAssignmentCompat1.errors.txt
+++ b/tests/baselines/reference/functionSignatureAssignmentCompat1.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/functionSignatureAssignmentCompat1.ts(10,5): error TS2322: Type '(delimiter?: string) => ParserFunc' is not assignable to type 'ParserFunc'.
   Types of parameters 'delimiter' and 'eventEmitter' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 
 
 ==== tests/cases/compiler/functionSignatureAssignmentCompat1.ts (1 errors) ====
@@ -17,5 +17,5 @@ tests/cases/compiler/functionSignatureAssignmentCompat1.ts(10,5): error TS2322:
         ~
 !!! error TS2322: Type '(delimiter?: string) => ParserFunc' is not assignable to type 'ParserFunc'.
 !!! error TS2322:   Types of parameters 'delimiter' and 'eventEmitter' are incompatible.
-!!! error TS2322:     Type 'string' is not assignable to type 'number'.
+!!! error TS2322:     Type 'number' is not assignable to type 'string'.
     var e: ParserFunc = parsers.readline(); // ok
\ No newline at end of file
diff --git a/tests/baselines/reference/functionSubtypingOfVarArgs.symbols b/tests/baselines/reference/functionSubtypingOfVarArgs.symbols
index 3aa266ec030..b77b48590e8 100644
--- a/tests/baselines/reference/functionSubtypingOfVarArgs.symbols
+++ b/tests/baselines/reference/functionSubtypingOfVarArgs.symbols
@@ -3,18 +3,18 @@ class EventBase {
 >EventBase : Symbol(EventBase, Decl(functionSubtypingOfVarArgs.ts, 0, 0))
 
     private _listeners = [];
->_listeners : Symbol(_listeners, Decl(functionSubtypingOfVarArgs.ts, 0, 17))
+>_listeners : Symbol(EventBase._listeners, Decl(functionSubtypingOfVarArgs.ts, 0, 17))
 
     add(listener: (...args: any[]) => void): void {
->add : Symbol(add, Decl(functionSubtypingOfVarArgs.ts, 1, 28))
+>add : Symbol(EventBase.add, Decl(functionSubtypingOfVarArgs.ts, 1, 28))
 >listener : Symbol(listener, Decl(functionSubtypingOfVarArgs.ts, 3, 8))
 >args : Symbol(args, Decl(functionSubtypingOfVarArgs.ts, 3, 19))
 
         this._listeners.push(listener);
 >this._listeners.push : Symbol(Array.push, Decl(lib.d.ts, --, --))
->this._listeners : Symbol(_listeners, Decl(functionSubtypingOfVarArgs.ts, 0, 17))
+>this._listeners : Symbol(EventBase._listeners, Decl(functionSubtypingOfVarArgs.ts, 0, 17))
 >this : Symbol(EventBase, Decl(functionSubtypingOfVarArgs.ts, 0, 0))
->_listeners : Symbol(_listeners, Decl(functionSubtypingOfVarArgs.ts, 0, 17))
+>_listeners : Symbol(EventBase._listeners, Decl(functionSubtypingOfVarArgs.ts, 0, 17))
 >push : Symbol(Array.push, Decl(lib.d.ts, --, --))
 >listener : Symbol(listener, Decl(functionSubtypingOfVarArgs.ts, 3, 8))
     }
@@ -25,7 +25,7 @@ class StringEvent extends EventBase { // should work
 >EventBase : Symbol(EventBase, Decl(functionSubtypingOfVarArgs.ts, 0, 0))
 
     add(listener: (items: string) => void ) { // valid, items is subtype of args
->add : Symbol(add, Decl(functionSubtypingOfVarArgs.ts, 8, 37))
+>add : Symbol(StringEvent.add, Decl(functionSubtypingOfVarArgs.ts, 8, 37))
 >listener : Symbol(listener, Decl(functionSubtypingOfVarArgs.ts, 9, 8))
 >items : Symbol(items, Decl(functionSubtypingOfVarArgs.ts, 9, 19))
 
diff --git a/tests/baselines/reference/functionSubtypingOfVarArgs2.symbols b/tests/baselines/reference/functionSubtypingOfVarArgs2.symbols
index c2f77199e28..f624730fd0c 100644
--- a/tests/baselines/reference/functionSubtypingOfVarArgs2.symbols
+++ b/tests/baselines/reference/functionSubtypingOfVarArgs2.symbols
@@ -3,19 +3,19 @@ class EventBase {
 >EventBase : Symbol(EventBase, Decl(functionSubtypingOfVarArgs2.ts, 0, 0))
 
     private _listeners: { (...args: any[]): void; }[] = [];
->_listeners : Symbol(_listeners, Decl(functionSubtypingOfVarArgs2.ts, 0, 17))
+>_listeners : Symbol(EventBase._listeners, Decl(functionSubtypingOfVarArgs2.ts, 0, 17))
 >args : Symbol(args, Decl(functionSubtypingOfVarArgs2.ts, 1, 27))
 
     add(listener: (...args: any[]) => void): void {
->add : Symbol(add, Decl(functionSubtypingOfVarArgs2.ts, 1, 59))
+>add : Symbol(EventBase.add, Decl(functionSubtypingOfVarArgs2.ts, 1, 59))
 >listener : Symbol(listener, Decl(functionSubtypingOfVarArgs2.ts, 3, 8))
 >args : Symbol(args, Decl(functionSubtypingOfVarArgs2.ts, 3, 19))
 
         this._listeners.push(listener);
 >this._listeners.push : Symbol(Array.push, Decl(lib.d.ts, --, --))
->this._listeners : Symbol(_listeners, Decl(functionSubtypingOfVarArgs2.ts, 0, 17))
+>this._listeners : Symbol(EventBase._listeners, Decl(functionSubtypingOfVarArgs2.ts, 0, 17))
 >this : Symbol(EventBase, Decl(functionSubtypingOfVarArgs2.ts, 0, 0))
->_listeners : Symbol(_listeners, Decl(functionSubtypingOfVarArgs2.ts, 0, 17))
+>_listeners : Symbol(EventBase._listeners, Decl(functionSubtypingOfVarArgs2.ts, 0, 17))
 >push : Symbol(Array.push, Decl(lib.d.ts, --, --))
 >listener : Symbol(listener, Decl(functionSubtypingOfVarArgs2.ts, 3, 8))
     }
@@ -26,7 +26,7 @@ class StringEvent extends EventBase {
 >EventBase : Symbol(EventBase, Decl(functionSubtypingOfVarArgs2.ts, 0, 0))
 
     add(listener: (items: string, moreitems: number) => void ) {
->add : Symbol(add, Decl(functionSubtypingOfVarArgs2.ts, 8, 37))
+>add : Symbol(StringEvent.add, Decl(functionSubtypingOfVarArgs2.ts, 8, 37))
 >listener : Symbol(listener, Decl(functionSubtypingOfVarArgs2.ts, 9, 8))
 >items : Symbol(items, Decl(functionSubtypingOfVarArgs2.ts, 9, 19))
 >moreitems : Symbol(moreitems, Decl(functionSubtypingOfVarArgs2.ts, 9, 33))
diff --git a/tests/baselines/reference/functionType.symbols b/tests/baselines/reference/functionType.symbols
index 30a5a7cc447..65347d39b5a 100644
--- a/tests/baselines/reference/functionType.symbols
+++ b/tests/baselines/reference/functionType.symbols
@@ -3,9 +3,9 @@ function salt() {}
 >salt : Symbol(salt, Decl(functionType.ts, 0, 0))
 
 salt.apply("hello", []);
->salt.apply : Symbol(Function.apply, Decl(lib.d.ts, --, --))
+>salt.apply : Symbol(Function.apply, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >salt : Symbol(salt, Decl(functionType.ts, 0, 0))
->apply : Symbol(Function.apply, Decl(lib.d.ts, --, --))
+>apply : Symbol(Function.apply, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 (new Function("return 5"))();
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
diff --git a/tests/baselines/reference/functionType.types b/tests/baselines/reference/functionType.types
index e7ea7a47edf..9183ec4a13e 100644
--- a/tests/baselines/reference/functionType.types
+++ b/tests/baselines/reference/functionType.types
@@ -3,10 +3,10 @@ function salt() {}
 >salt : () => void
 
 salt.apply("hello", []);
->salt.apply("hello", []) : any
->salt.apply : (thisArg: any, argArray?: any) => any
+>salt.apply("hello", []) : void
+>salt.apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
 >salt : () => void
->apply : (thisArg: any, argArray?: any) => any
+>apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
 >"hello" : string
 >[] : undefined[]
 
diff --git a/tests/baselines/reference/functionTypeArgumentArrayAssignment.symbols b/tests/baselines/reference/functionTypeArgumentArrayAssignment.symbols
index 4b597bea9ae..33bf258606e 100644
--- a/tests/baselines/reference/functionTypeArgumentArrayAssignment.symbols
+++ b/tests/baselines/reference/functionTypeArgumentArrayAssignment.symbols
@@ -7,11 +7,11 @@ module test {
 >T : Symbol(T, Decl(functionTypeArgumentArrayAssignment.ts, 1, 20))
 
         foo: T;
->foo : Symbol(foo, Decl(functionTypeArgumentArrayAssignment.ts, 1, 24))
+>foo : Symbol(Array.foo, Decl(functionTypeArgumentArrayAssignment.ts, 1, 24))
 >T : Symbol(T, Decl(functionTypeArgumentArrayAssignment.ts, 1, 20))
 
         length: number;
->length : Symbol(length, Decl(functionTypeArgumentArrayAssignment.ts, 2, 15))
+>length : Symbol(Array.length, Decl(functionTypeArgumentArrayAssignment.ts, 2, 15))
     }
 
     function map<U>() {
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/funduleUsedAcrossFileBoundary.symbols b/tests/baselines/reference/funduleUsedAcrossFileBoundary.symbols
index e0ca752d307..b094ebbfe8c 100644
--- a/tests/baselines/reference/funduleUsedAcrossFileBoundary.symbols
+++ b/tests/baselines/reference/funduleUsedAcrossFileBoundary.symbols
@@ -13,7 +13,7 @@ declare module Q {
 >T : Symbol(T, Decl(funduleUsedAcrossFileBoundary_file1.ts, 2, 22))
 
         foo: string;
->foo : Symbol(foo, Decl(funduleUsedAcrossFileBoundary_file1.ts, 2, 26))
+>foo : Symbol(Promise.foo, Decl(funduleUsedAcrossFileBoundary_file1.ts, 2, 26))
     }
     export function defer<T>(): string;
 >defer : Symbol(defer, Decl(funduleUsedAcrossFileBoundary_file1.ts, 4, 5))
diff --git a/tests/baselines/reference/fuzzy.errors.txt b/tests/baselines/reference/fuzzy.errors.txt
index 0aa8207ff98..344a3865fb2 100644
--- a/tests/baselines/reference/fuzzy.errors.txt
+++ b/tests/baselines/reference/fuzzy.errors.txt
@@ -5,7 +5,7 @@ tests/cases/compiler/fuzzy.ts(21,20): error TS2322: Type '{ anything: number; on
     Type 'this' is not assignable to type 'I'.
       Type 'C' is not assignable to type 'I'.
         Property 'alsoWorks' is missing in type 'C'.
-tests/cases/compiler/fuzzy.ts(25,20): error TS2352: Neither type '{ oneI: this; }' nor type 'R' is assignable to the other.
+tests/cases/compiler/fuzzy.ts(25,20): error TS2352: Type '{ oneI: this; }' cannot be converted to type 'R'.
   Property 'anything' is missing in type '{ oneI: this; }'.
 
 
@@ -45,7 +45,7 @@ tests/cases/compiler/fuzzy.ts(25,20): error TS2352: Neither type '{ oneI: this;
             worksToo():R {
                 return <R>({ oneI: this });
                        ~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Neither type '{ oneI: this; }' nor type 'R' is assignable to the other.
+!!! error TS2352: Type '{ oneI: this; }' cannot be converted to type 'R'.
 !!! error TS2352:   Property 'anything' is missing in type '{ oneI: this; }'.
             }
         }
diff --git a/tests/baselines/reference/generatedContextualTyping.symbols b/tests/baselines/reference/generatedContextualTyping.symbols
index bc50fcc25c6..a31e38e8648 100644
--- a/tests/baselines/reference/generatedContextualTyping.symbols
+++ b/tests/baselines/reference/generatedContextualTyping.symbols
@@ -2,22 +2,22 @@
 
 class Base { private p; }
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->p : Symbol(p, Decl(generatedContextualTyping.ts, 1, 12))
+>p : Symbol(Base.p, Decl(generatedContextualTyping.ts, 1, 12))
 
 class Derived1 extends Base { private m; }
 >Derived1 : Symbol(Derived1, Decl(generatedContextualTyping.ts, 1, 25))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->m : Symbol(m, Decl(generatedContextualTyping.ts, 2, 29))
+>m : Symbol(Derived1.m, Decl(generatedContextualTyping.ts, 2, 29))
 
 class Derived2 extends Base { private n; }
 >Derived2 : Symbol(Derived2, Decl(generatedContextualTyping.ts, 2, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
->n : Symbol(n, Decl(generatedContextualTyping.ts, 3, 29))
+>n : Symbol(Derived2.n, Decl(generatedContextualTyping.ts, 3, 29))
 
 interface Genric<T> { func(n: T[]); }
 >Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >T : Symbol(T, Decl(generatedContextualTyping.ts, 4, 17))
->func : Symbol(func, Decl(generatedContextualTyping.ts, 4, 21))
+>func : Symbol(Genric.func, Decl(generatedContextualTyping.ts, 4, 21))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 4, 27))
 >T : Symbol(T, Decl(generatedContextualTyping.ts, 4, 17))
 
@@ -114,21 +114,21 @@ var x12: Genric<Base> = { func: n => { return [d1, d2]; } };
 
 class x13 { member: () => Base[] = () => [d1, d2] }
 >x13 : Symbol(x13, Decl(generatedContextualTyping.ts, 17, 60))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 18, 11))
+>member : Symbol(x13.member, Decl(generatedContextualTyping.ts, 18, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
 >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x14 { member: () => Base[] = function() { return [d1, d2] } }
 >x14 : Symbol(x14, Decl(generatedContextualTyping.ts, 18, 51))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 19, 11))
+>member : Symbol(x14.member, Decl(generatedContextualTyping.ts, 19, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
 >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x15 { member: () => Base[] = function named() { return [d1, d2] } }
 >x15 : Symbol(x15, Decl(generatedContextualTyping.ts, 19, 67))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 20, 11))
+>member : Symbol(x15.member, Decl(generatedContextualTyping.ts, 20, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >named : Symbol(named, Decl(generatedContextualTyping.ts, 20, 34))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
@@ -136,21 +136,21 @@ class x15 { member: () => Base[] = function named() { return [d1, d2] } }
 
 class x16 { member: { (): Base[]; } = () => [d1, d2] }
 >x16 : Symbol(x16, Decl(generatedContextualTyping.ts, 20, 73))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 21, 11))
+>member : Symbol(x16.member, Decl(generatedContextualTyping.ts, 21, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
 >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x17 { member: { (): Base[]; } = function() { return [d1, d2] } }
 >x17 : Symbol(x17, Decl(generatedContextualTyping.ts, 21, 54))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 22, 11))
+>member : Symbol(x17.member, Decl(generatedContextualTyping.ts, 22, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
 >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x18 { member: { (): Base[]; } = function named() { return [d1, d2] } }
 >x18 : Symbol(x18, Decl(generatedContextualTyping.ts, 22, 70))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 23, 11))
+>member : Symbol(x18.member, Decl(generatedContextualTyping.ts, 23, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >named : Symbol(named, Decl(generatedContextualTyping.ts, 23, 37))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
@@ -158,14 +158,14 @@ class x18 { member: { (): Base[]; } = function named() { return [d1, d2] } }
 
 class x19 { member: Base[] = [d1, d2] }
 >x19 : Symbol(x19, Decl(generatedContextualTyping.ts, 23, 76))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 24, 11))
+>member : Symbol(x19.member, Decl(generatedContextualTyping.ts, 24, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
 >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x20 { member: Array<Base> = [d1, d2] }
 >x20 : Symbol(x20, Decl(generatedContextualTyping.ts, 24, 39))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 25, 11))
+>member : Symbol(x20.member, Decl(generatedContextualTyping.ts, 25, 11))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
@@ -173,7 +173,7 @@ class x20 { member: Array<Base> = [d1, d2] }
 
 class x21 { member: { [n: number]: Base; } = [d1, d2] }
 >x21 : Symbol(x21, Decl(generatedContextualTyping.ts, 25, 44))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 26, 11))
+>member : Symbol(x21.member, Decl(generatedContextualTyping.ts, 26, 11))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 26, 23))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
@@ -181,7 +181,7 @@ class x21 { member: { [n: number]: Base; } = [d1, d2] }
 
 class x22 { member: {n: Base[]; }  = { n: [d1, d2] } }
 >x22 : Symbol(x22, Decl(generatedContextualTyping.ts, 26, 55))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 27, 11))
+>member : Symbol(x22.member, Decl(generatedContextualTyping.ts, 27, 11))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 27, 21))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 27, 38))
@@ -190,7 +190,7 @@ class x22 { member: {n: Base[]; }  = { n: [d1, d2] } }
 
 class x23 { member: (s: Base[]) => any = n => { var n: Base[]; return null; } }
 >x23 : Symbol(x23, Decl(generatedContextualTyping.ts, 27, 54))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 28, 11))
+>member : Symbol(x23.member, Decl(generatedContextualTyping.ts, 28, 11))
 >s : Symbol(s, Decl(generatedContextualTyping.ts, 28, 21))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 28, 40), Decl(generatedContextualTyping.ts, 28, 51))
@@ -199,7 +199,7 @@ class x23 { member: (s: Base[]) => any = n => { var n: Base[]; return null; } }
 
 class x24 { member: Genric<Base> = { func: n => { return [d1, d2]; } } }
 >x24 : Symbol(x24, Decl(generatedContextualTyping.ts, 28, 79))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 29, 11))
+>member : Symbol(x24.member, Decl(generatedContextualTyping.ts, 29, 11))
 >Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >func : Symbol(func, Decl(generatedContextualTyping.ts, 29, 36))
@@ -209,21 +209,21 @@ class x24 { member: Genric<Base> = { func: n => { return [d1, d2]; } } }
 
 class x25 { private member: () => Base[] = () => [d1, d2] }
 >x25 : Symbol(x25, Decl(generatedContextualTyping.ts, 29, 72))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 30, 11))
+>member : Symbol(x25.member, Decl(generatedContextualTyping.ts, 30, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
 >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x26 { private member: () => Base[] = function() { return [d1, d2] } }
 >x26 : Symbol(x26, Decl(generatedContextualTyping.ts, 30, 59))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 31, 11))
+>member : Symbol(x26.member, Decl(generatedContextualTyping.ts, 31, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
 >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x27 { private member: () => Base[] = function named() { return [d1, d2] } }
 >x27 : Symbol(x27, Decl(generatedContextualTyping.ts, 31, 75))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 32, 11))
+>member : Symbol(x27.member, Decl(generatedContextualTyping.ts, 32, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >named : Symbol(named, Decl(generatedContextualTyping.ts, 32, 42))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
@@ -231,21 +231,21 @@ class x27 { private member: () => Base[] = function named() { return [d1, d2] }
 
 class x28 { private member: { (): Base[]; } = () => [d1, d2] }
 >x28 : Symbol(x28, Decl(generatedContextualTyping.ts, 32, 81))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 33, 11))
+>member : Symbol(x28.member, Decl(generatedContextualTyping.ts, 33, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
 >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x29 { private member: { (): Base[]; } = function() { return [d1, d2] } }
 >x29 : Symbol(x29, Decl(generatedContextualTyping.ts, 33, 62))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 34, 11))
+>member : Symbol(x29.member, Decl(generatedContextualTyping.ts, 34, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
 >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x30 { private member: { (): Base[]; } = function named() { return [d1, d2] } }
 >x30 : Symbol(x30, Decl(generatedContextualTyping.ts, 34, 78))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 35, 11))
+>member : Symbol(x30.member, Decl(generatedContextualTyping.ts, 35, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >named : Symbol(named, Decl(generatedContextualTyping.ts, 35, 45))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
@@ -253,14 +253,14 @@ class x30 { private member: { (): Base[]; } = function named() { return [d1, d2]
 
 class x31 { private member: Base[] = [d1, d2] }
 >x31 : Symbol(x31, Decl(generatedContextualTyping.ts, 35, 84))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 36, 11))
+>member : Symbol(x31.member, Decl(generatedContextualTyping.ts, 36, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
 >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x32 { private member: Array<Base> = [d1, d2] }
 >x32 : Symbol(x32, Decl(generatedContextualTyping.ts, 36, 47))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 37, 11))
+>member : Symbol(x32.member, Decl(generatedContextualTyping.ts, 37, 11))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
@@ -268,7 +268,7 @@ class x32 { private member: Array<Base> = [d1, d2] }
 
 class x33 { private member: { [n: number]: Base; } = [d1, d2] }
 >x33 : Symbol(x33, Decl(generatedContextualTyping.ts, 37, 52))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 38, 11))
+>member : Symbol(x33.member, Decl(generatedContextualTyping.ts, 38, 11))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 38, 31))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
@@ -276,7 +276,7 @@ class x33 { private member: { [n: number]: Base; } = [d1, d2] }
 
 class x34 { private member: {n: Base[]; }  = { n: [d1, d2] } }
 >x34 : Symbol(x34, Decl(generatedContextualTyping.ts, 38, 63))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 39, 11))
+>member : Symbol(x34.member, Decl(generatedContextualTyping.ts, 39, 11))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 39, 29))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 39, 46))
@@ -285,7 +285,7 @@ class x34 { private member: {n: Base[]; }  = { n: [d1, d2] } }
 
 class x35 { private member: (s: Base[]) => any = n => { var n: Base[]; return null; } }
 >x35 : Symbol(x35, Decl(generatedContextualTyping.ts, 39, 62))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 40, 11))
+>member : Symbol(x35.member, Decl(generatedContextualTyping.ts, 40, 11))
 >s : Symbol(s, Decl(generatedContextualTyping.ts, 40, 29))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 40, 48), Decl(generatedContextualTyping.ts, 40, 59))
@@ -294,7 +294,7 @@ class x35 { private member: (s: Base[]) => any = n => { var n: Base[]; return nu
 
 class x36 { private member: Genric<Base> = { func: n => { return [d1, d2]; } } }
 >x36 : Symbol(x36, Decl(generatedContextualTyping.ts, 40, 87))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 41, 11))
+>member : Symbol(x36.member, Decl(generatedContextualTyping.ts, 41, 11))
 >Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >func : Symbol(func, Decl(generatedContextualTyping.ts, 41, 44))
@@ -304,21 +304,21 @@ class x36 { private member: Genric<Base> = { func: n => { return [d1, d2]; } } }
 
 class x37 { public member: () => Base[] = () => [d1, d2] }
 >x37 : Symbol(x37, Decl(generatedContextualTyping.ts, 41, 80))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 42, 11))
+>member : Symbol(x37.member, Decl(generatedContextualTyping.ts, 42, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
 >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x38 { public member: () => Base[] = function() { return [d1, d2] } }
 >x38 : Symbol(x38, Decl(generatedContextualTyping.ts, 42, 58))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 43, 11))
+>member : Symbol(x38.member, Decl(generatedContextualTyping.ts, 43, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
 >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x39 { public member: () => Base[] = function named() { return [d1, d2] } }
 >x39 : Symbol(x39, Decl(generatedContextualTyping.ts, 43, 74))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 44, 11))
+>member : Symbol(x39.member, Decl(generatedContextualTyping.ts, 44, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >named : Symbol(named, Decl(generatedContextualTyping.ts, 44, 41))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
@@ -326,21 +326,21 @@ class x39 { public member: () => Base[] = function named() { return [d1, d2] } }
 
 class x40 { public member: { (): Base[]; } = () => [d1, d2] }
 >x40 : Symbol(x40, Decl(generatedContextualTyping.ts, 44, 80))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 45, 11))
+>member : Symbol(x40.member, Decl(generatedContextualTyping.ts, 45, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
 >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x41 { public member: { (): Base[]; } = function() { return [d1, d2] } }
 >x41 : Symbol(x41, Decl(generatedContextualTyping.ts, 45, 61))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 46, 11))
+>member : Symbol(x41.member, Decl(generatedContextualTyping.ts, 46, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
 >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x42 { public member: { (): Base[]; } = function named() { return [d1, d2] } }
 >x42 : Symbol(x42, Decl(generatedContextualTyping.ts, 46, 77))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 47, 11))
+>member : Symbol(x42.member, Decl(generatedContextualTyping.ts, 47, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >named : Symbol(named, Decl(generatedContextualTyping.ts, 47, 44))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
@@ -348,14 +348,14 @@ class x42 { public member: { (): Base[]; } = function named() { return [d1, d2]
 
 class x43 { public member: Base[] = [d1, d2] }
 >x43 : Symbol(x43, Decl(generatedContextualTyping.ts, 47, 83))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 48, 11))
+>member : Symbol(x43.member, Decl(generatedContextualTyping.ts, 48, 11))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
 >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x44 { public member: Array<Base> = [d1, d2] }
 >x44 : Symbol(x44, Decl(generatedContextualTyping.ts, 48, 46))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 49, 11))
+>member : Symbol(x44.member, Decl(generatedContextualTyping.ts, 49, 11))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
@@ -363,7 +363,7 @@ class x44 { public member: Array<Base> = [d1, d2] }
 
 class x45 { public member: { [n: number]: Base; } = [d1, d2] }
 >x45 : Symbol(x45, Decl(generatedContextualTyping.ts, 49, 51))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 50, 11))
+>member : Symbol(x45.member, Decl(generatedContextualTyping.ts, 50, 11))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 50, 30))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
@@ -371,7 +371,7 @@ class x45 { public member: { [n: number]: Base; } = [d1, d2] }
 
 class x46 { public member: {n: Base[]; }  = { n: [d1, d2] } }
 >x46 : Symbol(x46, Decl(generatedContextualTyping.ts, 50, 62))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 51, 11))
+>member : Symbol(x46.member, Decl(generatedContextualTyping.ts, 51, 11))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 51, 28))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 51, 45))
@@ -380,7 +380,7 @@ class x46 { public member: {n: Base[]; }  = { n: [d1, d2] } }
 
 class x47 { public member: (s: Base[]) => any = n => { var n: Base[]; return null; } }
 >x47 : Symbol(x47, Decl(generatedContextualTyping.ts, 51, 61))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 52, 11))
+>member : Symbol(x47.member, Decl(generatedContextualTyping.ts, 52, 11))
 >s : Symbol(s, Decl(generatedContextualTyping.ts, 52, 28))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 52, 47), Decl(generatedContextualTyping.ts, 52, 58))
@@ -389,7 +389,7 @@ class x47 { public member: (s: Base[]) => any = n => { var n: Base[]; return nul
 
 class x48 { public member: Genric<Base> = { func: n => { return [d1, d2]; } } }
 >x48 : Symbol(x48, Decl(generatedContextualTyping.ts, 52, 86))
->member : Symbol(member, Decl(generatedContextualTyping.ts, 53, 11))
+>member : Symbol(x48.member, Decl(generatedContextualTyping.ts, 53, 11))
 >Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >func : Symbol(func, Decl(generatedContextualTyping.ts, 53, 43))
@@ -779,21 +779,21 @@ class x96 { constructor(parm: Genric<Base> = { func: n => { return [d1, d2]; } }
 
 class x97 { constructor(public parm: () => Base[] = () => [d1, d2]) { } }
 >x97 : Symbol(x97, Decl(generatedContextualTyping.ts, 101, 87))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 102, 24))
+>parm : Symbol(x97.parm, Decl(generatedContextualTyping.ts, 102, 24))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
 >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x98 { constructor(public parm: () => Base[] = function() { return [d1, d2] }) { } }
 >x98 : Symbol(x98, Decl(generatedContextualTyping.ts, 102, 73))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 103, 24))
+>parm : Symbol(x98.parm, Decl(generatedContextualTyping.ts, 103, 24))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
 >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x99 { constructor(public parm: () => Base[] = function named() { return [d1, d2] }) { } }
 >x99 : Symbol(x99, Decl(generatedContextualTyping.ts, 103, 89))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 104, 24))
+>parm : Symbol(x99.parm, Decl(generatedContextualTyping.ts, 104, 24))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >named : Symbol(named, Decl(generatedContextualTyping.ts, 104, 51))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
@@ -801,21 +801,21 @@ class x99 { constructor(public parm: () => Base[] = function named() { return [d
 
 class x100 { constructor(public parm: { (): Base[]; } = () => [d1, d2]) { } }
 >x100 : Symbol(x100, Decl(generatedContextualTyping.ts, 104, 95))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 105, 25))
+>parm : Symbol(x100.parm, Decl(generatedContextualTyping.ts, 105, 25))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
 >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x101 { constructor(public parm: { (): Base[]; } = function() { return [d1, d2] }) { } }
 >x101 : Symbol(x101, Decl(generatedContextualTyping.ts, 105, 77))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 106, 25))
+>parm : Symbol(x101.parm, Decl(generatedContextualTyping.ts, 106, 25))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
 >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x102 { constructor(public parm: { (): Base[]; } = function named() { return [d1, d2] }) { } }
 >x102 : Symbol(x102, Decl(generatedContextualTyping.ts, 106, 93))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 107, 25))
+>parm : Symbol(x102.parm, Decl(generatedContextualTyping.ts, 107, 25))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >named : Symbol(named, Decl(generatedContextualTyping.ts, 107, 55))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
@@ -823,14 +823,14 @@ class x102 { constructor(public parm: { (): Base[]; } = function named() { retur
 
 class x103 { constructor(public parm: Base[] = [d1, d2]) { } }
 >x103 : Symbol(x103, Decl(generatedContextualTyping.ts, 107, 99))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 108, 25))
+>parm : Symbol(x103.parm, Decl(generatedContextualTyping.ts, 108, 25))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
 >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x104 { constructor(public parm: Array<Base> = [d1, d2]) { } }
 >x104 : Symbol(x104, Decl(generatedContextualTyping.ts, 108, 62))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 109, 25))
+>parm : Symbol(x104.parm, Decl(generatedContextualTyping.ts, 109, 25))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
@@ -838,7 +838,7 @@ class x104 { constructor(public parm: Array<Base> = [d1, d2]) { } }
 
 class x105 { constructor(public parm: { [n: number]: Base; } = [d1, d2]) { } }
 >x105 : Symbol(x105, Decl(generatedContextualTyping.ts, 109, 67))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 110, 25))
+>parm : Symbol(x105.parm, Decl(generatedContextualTyping.ts, 110, 25))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 110, 41))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
@@ -846,7 +846,7 @@ class x105 { constructor(public parm: { [n: number]: Base; } = [d1, d2]) { } }
 
 class x106 { constructor(public parm: {n: Base[]; }  = { n: [d1, d2] }) { } }
 >x106 : Symbol(x106, Decl(generatedContextualTyping.ts, 110, 78))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 111, 25))
+>parm : Symbol(x106.parm, Decl(generatedContextualTyping.ts, 111, 25))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 111, 39))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 111, 56))
@@ -855,7 +855,7 @@ class x106 { constructor(public parm: {n: Base[]; }  = { n: [d1, d2] }) { } }
 
 class x107 { constructor(public parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) { } }
 >x107 : Symbol(x107, Decl(generatedContextualTyping.ts, 111, 77))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 112, 25))
+>parm : Symbol(x107.parm, Decl(generatedContextualTyping.ts, 112, 25))
 >s : Symbol(s, Decl(generatedContextualTyping.ts, 112, 39))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 112, 58), Decl(generatedContextualTyping.ts, 112, 69))
@@ -864,7 +864,7 @@ class x107 { constructor(public parm: (s: Base[]) => any = n => { var n: Base[];
 
 class x108 { constructor(public parm: Genric<Base> = { func: n => { return [d1, d2]; } }) { } }
 >x108 : Symbol(x108, Decl(generatedContextualTyping.ts, 112, 102))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 113, 25))
+>parm : Symbol(x108.parm, Decl(generatedContextualTyping.ts, 113, 25))
 >Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >func : Symbol(func, Decl(generatedContextualTyping.ts, 113, 54))
@@ -874,21 +874,21 @@ class x108 { constructor(public parm: Genric<Base> = { func: n => { return [d1,
 
 class x109 { constructor(private parm: () => Base[] = () => [d1, d2]) { } }
 >x109 : Symbol(x109, Decl(generatedContextualTyping.ts, 113, 95))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 114, 25))
+>parm : Symbol(x109.parm, Decl(generatedContextualTyping.ts, 114, 25))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
 >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x110 { constructor(private parm: () => Base[] = function() { return [d1, d2] }) { } }
 >x110 : Symbol(x110, Decl(generatedContextualTyping.ts, 114, 75))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 115, 25))
+>parm : Symbol(x110.parm, Decl(generatedContextualTyping.ts, 115, 25))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
 >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x111 { constructor(private parm: () => Base[] = function named() { return [d1, d2] }) { } }
 >x111 : Symbol(x111, Decl(generatedContextualTyping.ts, 115, 91))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 116, 25))
+>parm : Symbol(x111.parm, Decl(generatedContextualTyping.ts, 116, 25))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >named : Symbol(named, Decl(generatedContextualTyping.ts, 116, 53))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
@@ -896,21 +896,21 @@ class x111 { constructor(private parm: () => Base[] = function named() { return
 
 class x112 { constructor(private parm: { (): Base[]; } = () => [d1, d2]) { } }
 >x112 : Symbol(x112, Decl(generatedContextualTyping.ts, 116, 97))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 117, 25))
+>parm : Symbol(x112.parm, Decl(generatedContextualTyping.ts, 117, 25))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
 >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x113 { constructor(private parm: { (): Base[]; } = function() { return [d1, d2] }) { } }
 >x113 : Symbol(x113, Decl(generatedContextualTyping.ts, 117, 78))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 118, 25))
+>parm : Symbol(x113.parm, Decl(generatedContextualTyping.ts, 118, 25))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
 >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x114 { constructor(private parm: { (): Base[]; } = function named() { return [d1, d2] }) { } }
 >x114 : Symbol(x114, Decl(generatedContextualTyping.ts, 118, 94))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 119, 25))
+>parm : Symbol(x114.parm, Decl(generatedContextualTyping.ts, 119, 25))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >named : Symbol(named, Decl(generatedContextualTyping.ts, 119, 56))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
@@ -918,14 +918,14 @@ class x114 { constructor(private parm: { (): Base[]; } = function named() { retu
 
 class x115 { constructor(private parm: Base[] = [d1, d2]) { } }
 >x115 : Symbol(x115, Decl(generatedContextualTyping.ts, 119, 100))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 120, 25))
+>parm : Symbol(x115.parm, Decl(generatedContextualTyping.ts, 120, 25))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
 >d2 : Symbol(d2, Decl(generatedContextualTyping.ts, 5, 40))
 
 class x116 { constructor(private parm: Array<Base> = [d1, d2]) { } }
 >x116 : Symbol(x116, Decl(generatedContextualTyping.ts, 120, 63))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 121, 25))
+>parm : Symbol(x116.parm, Decl(generatedContextualTyping.ts, 121, 25))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
@@ -933,7 +933,7 @@ class x116 { constructor(private parm: Array<Base> = [d1, d2]) { } }
 
 class x117 { constructor(private parm: { [n: number]: Base; } = [d1, d2]) { } }
 >x117 : Symbol(x117, Decl(generatedContextualTyping.ts, 121, 68))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 122, 25))
+>parm : Symbol(x117.parm, Decl(generatedContextualTyping.ts, 122, 25))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 122, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >d1 : Symbol(d1, Decl(generatedContextualTyping.ts, 5, 19))
@@ -941,7 +941,7 @@ class x117 { constructor(private parm: { [n: number]: Base; } = [d1, d2]) { } }
 
 class x118 { constructor(private parm: {n: Base[]; }  = { n: [d1, d2] }) { } }
 >x118 : Symbol(x118, Decl(generatedContextualTyping.ts, 122, 79))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 123, 25))
+>parm : Symbol(x118.parm, Decl(generatedContextualTyping.ts, 123, 25))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 123, 40))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 123, 57))
@@ -950,7 +950,7 @@ class x118 { constructor(private parm: {n: Base[]; }  = { n: [d1, d2] }) { } }
 
 class x119 { constructor(private parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) { } }
 >x119 : Symbol(x119, Decl(generatedContextualTyping.ts, 123, 78))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 124, 25))
+>parm : Symbol(x119.parm, Decl(generatedContextualTyping.ts, 124, 25))
 >s : Symbol(s, Decl(generatedContextualTyping.ts, 124, 40))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >n : Symbol(n, Decl(generatedContextualTyping.ts, 124, 59), Decl(generatedContextualTyping.ts, 124, 70))
@@ -959,7 +959,7 @@ class x119 { constructor(private parm: (s: Base[]) => any = n => { var n: Base[]
 
 class x120 { constructor(private parm: Genric<Base> = { func: n => { return [d1, d2]; } }) { } }
 >x120 : Symbol(x120, Decl(generatedContextualTyping.ts, 124, 103))
->parm : Symbol(parm, Decl(generatedContextualTyping.ts, 125, 25))
+>parm : Symbol(x120.parm, Decl(generatedContextualTyping.ts, 125, 25))
 >Genric : Symbol(Genric, Decl(generatedContextualTyping.ts, 3, 42))
 >Base : Symbol(Base, Decl(generatedContextualTyping.ts, 0, 0))
 >func : Symbol(func, Decl(generatedContextualTyping.ts, 125, 55))
diff --git a/tests/baselines/reference/generativeRecursionWithTypeOf.symbols b/tests/baselines/reference/generativeRecursionWithTypeOf.symbols
index 630923d2c59..5f8f4b78af4 100644
--- a/tests/baselines/reference/generativeRecursionWithTypeOf.symbols
+++ b/tests/baselines/reference/generativeRecursionWithTypeOf.symbols
@@ -8,7 +8,7 @@ class C<T> {
 >x : Symbol(x, Decl(generativeRecursionWithTypeOf.ts, 1, 15))
 
     type: T;
->type : Symbol(type, Decl(generativeRecursionWithTypeOf.ts, 1, 29))
+>type : Symbol(C.type, Decl(generativeRecursionWithTypeOf.ts, 1, 29))
 >T : Symbol(T, Decl(generativeRecursionWithTypeOf.ts, 0, 8))
 }
 
diff --git a/tests/baselines/reference/generatorES6_2.symbols b/tests/baselines/reference/generatorES6_2.symbols
index a64b1304692..2b4d93ca940 100644
--- a/tests/baselines/reference/generatorES6_2.symbols
+++ b/tests/baselines/reference/generatorES6_2.symbols
@@ -3,7 +3,7 @@ class C {
 >C : Symbol(C, Decl(generatorES6_2.ts, 0, 0))
 
     public * foo() {
->foo : Symbol(foo, Decl(generatorES6_2.ts, 0, 9))
+>foo : Symbol(C.foo, Decl(generatorES6_2.ts, 0, 9))
 
         yield 1
     }
diff --git a/tests/baselines/reference/generatorES6_6.symbols b/tests/baselines/reference/generatorES6_6.symbols
index 96b8b861c8b..3ae6ef318e8 100644
--- a/tests/baselines/reference/generatorES6_6.symbols
+++ b/tests/baselines/reference/generatorES6_6.symbols
@@ -3,9 +3,9 @@ class C {
 >C : Symbol(C, Decl(generatorES6_6.ts, 0, 0))
 
   *[Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
     let a = yield 1;
 >a : Symbol(a, Decl(generatorES6_6.ts, 2, 7))
diff --git a/tests/baselines/reference/generatorInAmbientContext5.symbols b/tests/baselines/reference/generatorInAmbientContext5.symbols
index 78139a7e597..df432c2a67d 100644
--- a/tests/baselines/reference/generatorInAmbientContext5.symbols
+++ b/tests/baselines/reference/generatorInAmbientContext5.symbols
@@ -3,5 +3,5 @@ class C {
 >C : Symbol(C, Decl(generatorInAmbientContext5.ts, 0, 0))
 
     *generator(): any { }
->generator : Symbol(generator, Decl(generatorInAmbientContext5.ts, 0, 9))
+>generator : Symbol(C.generator, Decl(generatorInAmbientContext5.ts, 0, 9))
 }
diff --git a/tests/baselines/reference/generatorOverloads4.symbols b/tests/baselines/reference/generatorOverloads4.symbols
index 341ba9c4a0d..ecc0afe6109 100644
--- a/tests/baselines/reference/generatorOverloads4.symbols
+++ b/tests/baselines/reference/generatorOverloads4.symbols
@@ -3,17 +3,17 @@ class C {
 >C : Symbol(C, Decl(generatorOverloads4.ts, 0, 0))
 
     f(s: string): Iterable<any>;
->f : Symbol(f, Decl(generatorOverloads4.ts, 0, 9), Decl(generatorOverloads4.ts, 1, 32), Decl(generatorOverloads4.ts, 2, 32))
+>f : Symbol(C.f, Decl(generatorOverloads4.ts, 0, 9), Decl(generatorOverloads4.ts, 1, 32), Decl(generatorOverloads4.ts, 2, 32))
 >s : Symbol(s, Decl(generatorOverloads4.ts, 1, 6))
->Iterable : Symbol(Iterable, Decl(lib.d.ts, --, --))
+>Iterable : Symbol(Iterable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
     f(s: number): Iterable<any>;
->f : Symbol(f, Decl(generatorOverloads4.ts, 0, 9), Decl(generatorOverloads4.ts, 1, 32), Decl(generatorOverloads4.ts, 2, 32))
+>f : Symbol(C.f, Decl(generatorOverloads4.ts, 0, 9), Decl(generatorOverloads4.ts, 1, 32), Decl(generatorOverloads4.ts, 2, 32))
 >s : Symbol(s, Decl(generatorOverloads4.ts, 2, 6))
->Iterable : Symbol(Iterable, Decl(lib.d.ts, --, --))
+>Iterable : Symbol(Iterable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
     *f(s: any): Iterable<any> { }
->f : Symbol(f, Decl(generatorOverloads4.ts, 0, 9), Decl(generatorOverloads4.ts, 1, 32), Decl(generatorOverloads4.ts, 2, 32))
+>f : Symbol(C.f, Decl(generatorOverloads4.ts, 0, 9), Decl(generatorOverloads4.ts, 1, 32), Decl(generatorOverloads4.ts, 2, 32))
 >s : Symbol(s, Decl(generatorOverloads4.ts, 3, 7))
->Iterable : Symbol(Iterable, Decl(lib.d.ts, --, --))
+>Iterable : Symbol(Iterable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/generatorOverloads5.symbols b/tests/baselines/reference/generatorOverloads5.symbols
index 07de0c87f51..a93e9156a6e 100644
--- a/tests/baselines/reference/generatorOverloads5.symbols
+++ b/tests/baselines/reference/generatorOverloads5.symbols
@@ -5,15 +5,15 @@ module M {
     function f(s: string): Iterable<any>;
 >f : Symbol(f, Decl(generatorOverloads5.ts, 0, 10), Decl(generatorOverloads5.ts, 1, 41), Decl(generatorOverloads5.ts, 2, 41))
 >s : Symbol(s, Decl(generatorOverloads5.ts, 1, 15))
->Iterable : Symbol(Iterable, Decl(lib.d.ts, --, --))
+>Iterable : Symbol(Iterable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
     function f(s: number): Iterable<any>;
 >f : Symbol(f, Decl(generatorOverloads5.ts, 0, 10), Decl(generatorOverloads5.ts, 1, 41), Decl(generatorOverloads5.ts, 2, 41))
 >s : Symbol(s, Decl(generatorOverloads5.ts, 2, 15))
->Iterable : Symbol(Iterable, Decl(lib.d.ts, --, --))
+>Iterable : Symbol(Iterable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
     function* f(s: any): Iterable<any> { }
 >f : Symbol(f, Decl(generatorOverloads5.ts, 0, 10), Decl(generatorOverloads5.ts, 1, 41), Decl(generatorOverloads5.ts, 2, 41))
 >s : Symbol(s, Decl(generatorOverloads5.ts, 3, 16))
->Iterable : Symbol(Iterable, Decl(lib.d.ts, --, --))
+>Iterable : Symbol(Iterable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/generatorTypeCheck1.symbols b/tests/baselines/reference/generatorTypeCheck1.symbols
index b9456ccba48..cc61c5b9803 100644
--- a/tests/baselines/reference/generatorTypeCheck1.symbols
+++ b/tests/baselines/reference/generatorTypeCheck1.symbols
@@ -1,5 +1,5 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck1.ts ===
 function* g1(): Iterator<string> { }
 >g1 : Symbol(g1, Decl(generatorTypeCheck1.ts, 0, 0))
->Iterator : Symbol(Iterator, Decl(lib.d.ts, --, --))
+>Iterator : Symbol(Iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
diff --git a/tests/baselines/reference/generatorTypeCheck10.symbols b/tests/baselines/reference/generatorTypeCheck10.symbols
index 2112a9b1ebc..582693e7336 100644
--- a/tests/baselines/reference/generatorTypeCheck10.symbols
+++ b/tests/baselines/reference/generatorTypeCheck10.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck10.ts ===
 function* g(): IterableIterator<any> {
 >g : Symbol(g, Decl(generatorTypeCheck10.ts, 0, 0))
->IterableIterator : Symbol(IterableIterator, Decl(lib.d.ts, --, --))
+>IterableIterator : Symbol(IterableIterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
     return;
 }
diff --git a/tests/baselines/reference/generatorTypeCheck11.symbols b/tests/baselines/reference/generatorTypeCheck11.symbols
index 439b97caa7f..ce8f2f5f065 100644
--- a/tests/baselines/reference/generatorTypeCheck11.symbols
+++ b/tests/baselines/reference/generatorTypeCheck11.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck11.ts ===
 function* g(): IterableIterator<number> {
 >g : Symbol(g, Decl(generatorTypeCheck11.ts, 0, 0))
->IterableIterator : Symbol(IterableIterator, Decl(lib.d.ts, --, --))
+>IterableIterator : Symbol(IterableIterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
     return 0;
 }
diff --git a/tests/baselines/reference/generatorTypeCheck12.symbols b/tests/baselines/reference/generatorTypeCheck12.symbols
index 1c7661a06cf..052f35a5f5f 100644
--- a/tests/baselines/reference/generatorTypeCheck12.symbols
+++ b/tests/baselines/reference/generatorTypeCheck12.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck12.ts ===
 function* g(): IterableIterator<number> {
 >g : Symbol(g, Decl(generatorTypeCheck12.ts, 0, 0))
->IterableIterator : Symbol(IterableIterator, Decl(lib.d.ts, --, --))
+>IterableIterator : Symbol(IterableIterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
     return "";
 }
diff --git a/tests/baselines/reference/generatorTypeCheck13.symbols b/tests/baselines/reference/generatorTypeCheck13.symbols
index 7d9587e5ac9..ceaea53dacf 100644
--- a/tests/baselines/reference/generatorTypeCheck13.symbols
+++ b/tests/baselines/reference/generatorTypeCheck13.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck13.ts ===
 function* g(): IterableIterator<number> {
 >g : Symbol(g, Decl(generatorTypeCheck13.ts, 0, 0))
->IterableIterator : Symbol(IterableIterator, Decl(lib.d.ts, --, --))
+>IterableIterator : Symbol(IterableIterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
     yield 0;
     return "";
diff --git a/tests/baselines/reference/generatorTypeCheck17.symbols b/tests/baselines/reference/generatorTypeCheck17.symbols
index 523579dd47b..6f082994488 100644
--- a/tests/baselines/reference/generatorTypeCheck17.symbols
+++ b/tests/baselines/reference/generatorTypeCheck17.symbols
@@ -1,16 +1,16 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck17.ts ===
 class Foo { x: number }
 >Foo : Symbol(Foo, Decl(generatorTypeCheck17.ts, 0, 0))
->x : Symbol(x, Decl(generatorTypeCheck17.ts, 0, 11))
+>x : Symbol(Foo.x, Decl(generatorTypeCheck17.ts, 0, 11))
 
 class Bar extends Foo { y: string }
 >Bar : Symbol(Bar, Decl(generatorTypeCheck17.ts, 0, 23))
 >Foo : Symbol(Foo, Decl(generatorTypeCheck17.ts, 0, 0))
->y : Symbol(y, Decl(generatorTypeCheck17.ts, 1, 23))
+>y : Symbol(Bar.y, Decl(generatorTypeCheck17.ts, 1, 23))
 
 function* g(): IterableIterator<Foo> {
 >g : Symbol(g, Decl(generatorTypeCheck17.ts, 1, 35))
->IterableIterator : Symbol(IterableIterator, Decl(lib.d.ts, --, --))
+>IterableIterator : Symbol(IterableIterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >Foo : Symbol(Foo, Decl(generatorTypeCheck17.ts, 0, 0))
 
     yield;
diff --git a/tests/baselines/reference/generatorTypeCheck19.symbols b/tests/baselines/reference/generatorTypeCheck19.symbols
index b74b5f727a6..af506d275cf 100644
--- a/tests/baselines/reference/generatorTypeCheck19.symbols
+++ b/tests/baselines/reference/generatorTypeCheck19.symbols
@@ -1,16 +1,16 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck19.ts ===
 class Foo { x: number }
 >Foo : Symbol(Foo, Decl(generatorTypeCheck19.ts, 0, 0))
->x : Symbol(x, Decl(generatorTypeCheck19.ts, 0, 11))
+>x : Symbol(Foo.x, Decl(generatorTypeCheck19.ts, 0, 11))
 
 class Bar extends Foo { y: string }
 >Bar : Symbol(Bar, Decl(generatorTypeCheck19.ts, 0, 23))
 >Foo : Symbol(Foo, Decl(generatorTypeCheck19.ts, 0, 0))
->y : Symbol(y, Decl(generatorTypeCheck19.ts, 1, 23))
+>y : Symbol(Bar.y, Decl(generatorTypeCheck19.ts, 1, 23))
 
 function* g(): IterableIterator<Foo> {
 >g : Symbol(g, Decl(generatorTypeCheck19.ts, 1, 35))
->IterableIterator : Symbol(IterableIterator, Decl(lib.d.ts, --, --))
+>IterableIterator : Symbol(IterableIterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >Foo : Symbol(Foo, Decl(generatorTypeCheck19.ts, 0, 0))
 
     yield;
diff --git a/tests/baselines/reference/generatorTypeCheck2.symbols b/tests/baselines/reference/generatorTypeCheck2.symbols
index 5741e089d1b..63150081c18 100644
--- a/tests/baselines/reference/generatorTypeCheck2.symbols
+++ b/tests/baselines/reference/generatorTypeCheck2.symbols
@@ -1,5 +1,5 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck2.ts ===
 function* g1(): Iterable<string> { }
 >g1 : Symbol(g1, Decl(generatorTypeCheck2.ts, 0, 0))
->Iterable : Symbol(Iterable, Decl(lib.d.ts, --, --))
+>Iterable : Symbol(Iterable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
diff --git a/tests/baselines/reference/generatorTypeCheck26.symbols b/tests/baselines/reference/generatorTypeCheck26.symbols
index 2f2c27d2810..0680c0680e1 100644
--- a/tests/baselines/reference/generatorTypeCheck26.symbols
+++ b/tests/baselines/reference/generatorTypeCheck26.symbols
@@ -1,20 +1,20 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck26.ts ===
 function* g(): IterableIterator<(x: string) => number> {
 >g : Symbol(g, Decl(generatorTypeCheck26.ts, 0, 0))
->IterableIterator : Symbol(IterableIterator, Decl(lib.d.ts, --, --))
+>IterableIterator : Symbol(IterableIterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >x : Symbol(x, Decl(generatorTypeCheck26.ts, 0, 33))
 
     yield x => x.length;
 >x : Symbol(x, Decl(generatorTypeCheck26.ts, 1, 9))
->x.length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>x.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 >x : Symbol(x, Decl(generatorTypeCheck26.ts, 1, 9))
->length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 
     yield *[x => x.length];
 >x : Symbol(x, Decl(generatorTypeCheck26.ts, 2, 12))
->x.length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>x.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 >x : Symbol(x, Decl(generatorTypeCheck26.ts, 2, 12))
->length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 
     return x => x.length;
 >x : Symbol(x, Decl(generatorTypeCheck26.ts, 3, 10))
diff --git a/tests/baselines/reference/generatorTypeCheck27.symbols b/tests/baselines/reference/generatorTypeCheck27.symbols
index 27c5cbf5db8..e8d630804f8 100644
--- a/tests/baselines/reference/generatorTypeCheck27.symbols
+++ b/tests/baselines/reference/generatorTypeCheck27.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck27.ts ===
 function* g(): IterableIterator<(x: string) => number> {
 >g : Symbol(g, Decl(generatorTypeCheck27.ts, 0, 0))
->IterableIterator : Symbol(IterableIterator, Decl(lib.d.ts, --, --))
+>IterableIterator : Symbol(IterableIterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >x : Symbol(x, Decl(generatorTypeCheck27.ts, 0, 33))
 
     yield * function* () {
diff --git a/tests/baselines/reference/generatorTypeCheck28.symbols b/tests/baselines/reference/generatorTypeCheck28.symbols
index a7e799679d7..9031e6413c9 100644
--- a/tests/baselines/reference/generatorTypeCheck28.symbols
+++ b/tests/baselines/reference/generatorTypeCheck28.symbols
@@ -1,20 +1,20 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck28.ts ===
 function* g(): IterableIterator<(x: string) => number> {
 >g : Symbol(g, Decl(generatorTypeCheck28.ts, 0, 0))
->IterableIterator : Symbol(IterableIterator, Decl(lib.d.ts, --, --))
+>IterableIterator : Symbol(IterableIterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >x : Symbol(x, Decl(generatorTypeCheck28.ts, 0, 33))
 
     yield * {
         *[Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
             yield x => x.length;
 >x : Symbol(x, Decl(generatorTypeCheck28.ts, 3, 17))
->x.length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>x.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 >x : Symbol(x, Decl(generatorTypeCheck28.ts, 3, 17))
->length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
         }
     };
 }
diff --git a/tests/baselines/reference/generatorTypeCheck29.symbols b/tests/baselines/reference/generatorTypeCheck29.symbols
index 4b332f6c86b..105d16377f2 100644
--- a/tests/baselines/reference/generatorTypeCheck29.symbols
+++ b/tests/baselines/reference/generatorTypeCheck29.symbols
@@ -1,8 +1,8 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck29.ts ===
 function* g2(): Iterator<Iterable<(x: string) => number>> {
 >g2 : Symbol(g2, Decl(generatorTypeCheck29.ts, 0, 0))
->Iterator : Symbol(Iterator, Decl(lib.d.ts, --, --))
->Iterable : Symbol(Iterable, Decl(lib.d.ts, --, --))
+>Iterator : Symbol(Iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Iterable : Symbol(Iterable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >x : Symbol(x, Decl(generatorTypeCheck29.ts, 0, 35))
 
     yield function* () {
diff --git a/tests/baselines/reference/generatorTypeCheck3.symbols b/tests/baselines/reference/generatorTypeCheck3.symbols
index 6e97cd6f280..e61980735d8 100644
--- a/tests/baselines/reference/generatorTypeCheck3.symbols
+++ b/tests/baselines/reference/generatorTypeCheck3.symbols
@@ -1,5 +1,5 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck3.ts ===
 function* g1(): IterableIterator<string> { }
 >g1 : Symbol(g1, Decl(generatorTypeCheck3.ts, 0, 0))
->IterableIterator : Symbol(IterableIterator, Decl(lib.d.ts, --, --))
+>IterableIterator : Symbol(IterableIterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
diff --git a/tests/baselines/reference/generatorTypeCheck30.symbols b/tests/baselines/reference/generatorTypeCheck30.symbols
index 3c56fde9039..fd83f551575 100644
--- a/tests/baselines/reference/generatorTypeCheck30.symbols
+++ b/tests/baselines/reference/generatorTypeCheck30.symbols
@@ -1,8 +1,8 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck30.ts ===
 function* g2(): Iterator<Iterable<(x: string) => number>> {
 >g2 : Symbol(g2, Decl(generatorTypeCheck30.ts, 0, 0))
->Iterator : Symbol(Iterator, Decl(lib.d.ts, --, --))
->Iterable : Symbol(Iterable, Decl(lib.d.ts, --, --))
+>Iterator : Symbol(Iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Iterable : Symbol(Iterable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >x : Symbol(x, Decl(generatorTypeCheck30.ts, 0, 35))
 
     yield function* () {
diff --git a/tests/baselines/reference/generatorTypeCheck39.errors.txt b/tests/baselines/reference/generatorTypeCheck39.errors.txt
index ae24837f712..aabb5a47a35 100644
--- a/tests/baselines/reference/generatorTypeCheck39.errors.txt
+++ b/tests/baselines/reference/generatorTypeCheck39.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck39.ts(5,16): error TS1163: A 'yield' expression is only allowed in a generator body.
-tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck39.ts(6,11): error TS1219: Experimental support for decorators is a feature that is subject to change in a future release. Specify '--experimentalDecorators' to remove this warning.
+tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck39.ts(6,11): error TS1219: Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning.
 tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck39.ts(7,13): error TS1163: A 'yield' expression is only allowed in a generator body.
 
 
@@ -13,7 +13,7 @@ tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck39.ts(7,13): erro
 !!! error TS1163: A 'yield' expression is only allowed in a generator body.
         class C {
               ~
-!!! error TS1219: Experimental support for decorators is a feature that is subject to change in a future release. Specify '--experimentalDecorators' to remove this warning.
+!!! error TS1219: Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning.
             x = yield 0;
                 ~~~~~
 !!! error TS1163: A 'yield' expression is only allowed in a generator body.
diff --git a/tests/baselines/reference/generatorTypeCheck41.types b/tests/baselines/reference/generatorTypeCheck41.types
index 926aef95ce5..0bed082dc43 100644
--- a/tests/baselines/reference/generatorTypeCheck41.types
+++ b/tests/baselines/reference/generatorTypeCheck41.types
@@ -3,8 +3,8 @@ function* g() {
 >g : () => IterableIterator<number>
 
     let x = {
->x : {}
->{        [yield 0]: 0    } : {}
+>x : { [x: number]: number; }
+>{        [yield 0]: 0    } : { [x: number]: number; }
 
         [yield 0]: 0
 >yield 0 : any
diff --git a/tests/baselines/reference/generatorTypeCheck42.types b/tests/baselines/reference/generatorTypeCheck42.types
index 855c4697f40..7538b8f2499 100644
--- a/tests/baselines/reference/generatorTypeCheck42.types
+++ b/tests/baselines/reference/generatorTypeCheck42.types
@@ -3,8 +3,8 @@ function* g() {
 >g : () => IterableIterator<number>
 
     let x = {
->x : {}
->{        [yield 0]() {        }    } : {}
+>x : { [x: number]: () => void; }
+>{        [yield 0]() {        }    } : { [x: number]: () => void; }
 
         [yield 0]() {
 >yield 0 : any
diff --git a/tests/baselines/reference/generatorTypeCheck43.types b/tests/baselines/reference/generatorTypeCheck43.types
index 50fc7e30c86..a132dfcb015 100644
--- a/tests/baselines/reference/generatorTypeCheck43.types
+++ b/tests/baselines/reference/generatorTypeCheck43.types
@@ -3,8 +3,8 @@ function* g() {
 >g : () => IterableIterator<number>
 
     let x = {
->x : {}
->{        *[yield 0]() {        }    } : {}
+>x : { [x: number]: () => IterableIterator<any>; }
+>{        *[yield 0]() {        }    } : { [x: number]: () => IterableIterator<any>; }
 
         *[yield 0]() {
 >yield 0 : any
diff --git a/tests/baselines/reference/generatorTypeCheck44.types b/tests/baselines/reference/generatorTypeCheck44.types
index 2fc67f90556..5c432e41cbe 100644
--- a/tests/baselines/reference/generatorTypeCheck44.types
+++ b/tests/baselines/reference/generatorTypeCheck44.types
@@ -3,8 +3,8 @@ function* g() {
 >g : () => IterableIterator<number>
 
     let x = {
->x : {}
->{        get [yield 0]() {            return 0;        }    } : {}
+>x : { [x: number]: number; }
+>{        get [yield 0]() {            return 0;        }    } : { [x: number]: number; }
 
         get [yield 0]() {
 >yield 0 : any
diff --git a/tests/baselines/reference/generatorTypeCheck45.symbols b/tests/baselines/reference/generatorTypeCheck45.symbols
index a637f154dc4..e62c0b54f46 100644
--- a/tests/baselines/reference/generatorTypeCheck45.symbols
+++ b/tests/baselines/reference/generatorTypeCheck45.symbols
@@ -6,7 +6,7 @@ declare function foo<T, U>(x: T, fun: () => Iterator<(x: T) => U>, fun2: (y: U)
 >x : Symbol(x, Decl(generatorTypeCheck45.ts, 0, 27))
 >T : Symbol(T, Decl(generatorTypeCheck45.ts, 0, 21))
 >fun : Symbol(fun, Decl(generatorTypeCheck45.ts, 0, 32))
->Iterator : Symbol(Iterator, Decl(lib.d.ts, --, --))
+>Iterator : Symbol(Iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >x : Symbol(x, Decl(generatorTypeCheck45.ts, 0, 54))
 >T : Symbol(T, Decl(generatorTypeCheck45.ts, 0, 21))
 >U : Symbol(U, Decl(generatorTypeCheck45.ts, 0, 23))
@@ -19,9 +19,9 @@ declare function foo<T, U>(x: T, fun: () => Iterator<(x: T) => U>, fun2: (y: U)
 foo("", function* () { yield x => x.length }, p => undefined); // T is fixed, should be string
 >foo : Symbol(foo, Decl(generatorTypeCheck45.ts, 0, 0))
 >x : Symbol(x, Decl(generatorTypeCheck45.ts, 2, 28))
->x.length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>x.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 >x : Symbol(x, Decl(generatorTypeCheck45.ts, 2, 28))
->length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 >p : Symbol(p, Decl(generatorTypeCheck45.ts, 2, 45))
 >undefined : Symbol(undefined)
 
diff --git a/tests/baselines/reference/generatorTypeCheck46.symbols b/tests/baselines/reference/generatorTypeCheck46.symbols
index abb170b12a7..23f9f77d406 100644
--- a/tests/baselines/reference/generatorTypeCheck46.symbols
+++ b/tests/baselines/reference/generatorTypeCheck46.symbols
@@ -6,7 +6,7 @@ declare function foo<T, U>(x: T, fun: () => Iterable<(x: T) => U>, fun2: (y: U)
 >x : Symbol(x, Decl(generatorTypeCheck46.ts, 0, 27))
 >T : Symbol(T, Decl(generatorTypeCheck46.ts, 0, 21))
 >fun : Symbol(fun, Decl(generatorTypeCheck46.ts, 0, 32))
->Iterable : Symbol(Iterable, Decl(lib.d.ts, --, --))
+>Iterable : Symbol(Iterable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >x : Symbol(x, Decl(generatorTypeCheck46.ts, 0, 54))
 >T : Symbol(T, Decl(generatorTypeCheck46.ts, 0, 21))
 >U : Symbol(U, Decl(generatorTypeCheck46.ts, 0, 23))
@@ -21,15 +21,15 @@ foo("", function* () {
 
     yield* {
         *[Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
             yield x => x.length
 >x : Symbol(x, Decl(generatorTypeCheck46.ts, 5, 17))
->x.length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>x.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 >x : Symbol(x, Decl(generatorTypeCheck46.ts, 5, 17))
->length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
         }
     }
 }, p => undefined); // T is fixed, should be string
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/generatorTypeCheck59.errors.txt b/tests/baselines/reference/generatorTypeCheck59.errors.txt
index d8179803821..cba90154701 100644
--- a/tests/baselines/reference/generatorTypeCheck59.errors.txt
+++ b/tests/baselines/reference/generatorTypeCheck59.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck59.ts(3,11): error TS1163: A 'yield' expression is only allowed in a generator body.
-tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck59.ts(4,9): error TS1219: Experimental support for decorators is a feature that is subject to change in a future release. Specify '--experimentalDecorators' to remove this warning.
+tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck59.ts(4,9): error TS1219: Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning.
 
 
 ==== tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck59.ts (2 errors) ====
@@ -10,6 +10,6 @@ tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck59.ts(4,9): error
 !!! error TS1163: A 'yield' expression is only allowed in a generator body.
             m() { }
             ~
-!!! error TS1219: Experimental support for decorators is a feature that is subject to change in a future release. Specify '--experimentalDecorators' to remove this warning.
+!!! error TS1219: Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning.
         };
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/generatorTypeCheck61.errors.txt b/tests/baselines/reference/generatorTypeCheck61.errors.txt
index b38e96d31ce..ccc99f7ffbd 100644
--- a/tests/baselines/reference/generatorTypeCheck61.errors.txt
+++ b/tests/baselines/reference/generatorTypeCheck61.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck61.ts(2,7): error TS1163: A 'yield' expression is only allowed in a generator body.
-tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck61.ts(3,11): error TS1219: Experimental support for decorators is a feature that is subject to change in a future release. Specify '--experimentalDecorators' to remove this warning.
+tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck61.ts(3,11): error TS1219: Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning.
 
 
 ==== tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck61.ts (2 errors) ====
@@ -9,5 +9,5 @@ tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck61.ts(3,11): erro
 !!! error TS1163: A 'yield' expression is only allowed in a generator body.
         class C {};
               ~
-!!! error TS1219: Experimental support for decorators is a feature that is subject to change in a future release. Specify '--experimentalDecorators' to remove this warning.
+!!! error TS1219: Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName.errors.txt b/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName.errors.txt
index 4c3245b11f7..8d9ebb8d276 100644
--- a/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName.errors.txt
+++ b/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName.errors.txt
@@ -1,6 +1,6 @@
-tests/cases/conformance/interfaces/declarationMerging/genericAndNonGenericInterfaceWithTheSameName.ts(7,11): error TS2428: All declarations of an interface must have identical type parameters.
-tests/cases/conformance/interfaces/declarationMerging/genericAndNonGenericInterfaceWithTheSameName.ts(16,15): error TS2428: All declarations of an interface must have identical type parameters.
-tests/cases/conformance/interfaces/declarationMerging/genericAndNonGenericInterfaceWithTheSameName.ts(40,22): error TS2428: All declarations of an interface must have identical type parameters.
+tests/cases/conformance/interfaces/declarationMerging/genericAndNonGenericInterfaceWithTheSameName.ts(7,11): error TS2428: All declarations of 'A' must have identical type parameters.
+tests/cases/conformance/interfaces/declarationMerging/genericAndNonGenericInterfaceWithTheSameName.ts(16,15): error TS2428: All declarations of 'A' must have identical type parameters.
+tests/cases/conformance/interfaces/declarationMerging/genericAndNonGenericInterfaceWithTheSameName.ts(40,22): error TS2428: All declarations of 'A' must have identical type parameters.
 
 
 ==== tests/cases/conformance/interfaces/declarationMerging/genericAndNonGenericInterfaceWithTheSameName.ts (3 errors) ====
@@ -12,7 +12,7 @@ tests/cases/conformance/interfaces/declarationMerging/genericAndNonGenericInterf
     
     interface A<T> { // error
               ~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'A' must have identical type parameters.
         bar: T;
     }
     
@@ -23,7 +23,7 @@ tests/cases/conformance/interfaces/declarationMerging/genericAndNonGenericInterf
     
         interface A { // error
                   ~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'A' must have identical type parameters.
             foo: string;
         }
     }
@@ -49,7 +49,7 @@ tests/cases/conformance/interfaces/declarationMerging/genericAndNonGenericInterf
     module M3 {
         export interface A<T> { // error
                          ~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'A' must have identical type parameters.
             bar: T;
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName2.symbols b/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName2.symbols
index 05b131090c0..e0d66e64854 100644
--- a/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName2.symbols
+++ b/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName2.symbols
@@ -9,7 +9,7 @@ module M {
 >T : Symbol(T, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 3, 16))
 
         bar: T;
->bar : Symbol(bar, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 3, 20))
+>bar : Symbol(A.bar, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 3, 20))
 >T : Symbol(T, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 3, 16))
     }
 }
@@ -21,7 +21,7 @@ module M2 {
 >A : Symbol(A, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 8, 11))
 
         foo: string;
->foo : Symbol(foo, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 9, 17))
+>foo : Symbol(A.foo, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 9, 17))
     }
 }
 
@@ -36,7 +36,7 @@ module N {
 >T : Symbol(T, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 16, 20))
 
             bar: T;
->bar : Symbol(bar, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 16, 24))
+>bar : Symbol(A.bar, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 16, 24))
 >T : Symbol(T, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 16, 20))
         }
     }
@@ -48,7 +48,7 @@ module N {
 >A : Symbol(A, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 21, 15))
 
             foo: string;
->foo : Symbol(foo, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 22, 21))
+>foo : Symbol(A.foo, Decl(genericAndNonGenericInterfaceWithTheSameName2.ts, 22, 21))
         }
     }
 }
diff --git a/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.symbols b/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.symbols
index b38008c38ce..0b09ec06a64 100644
--- a/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.symbols
+++ b/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.symbols
@@ -19,7 +19,7 @@ module Underscore {
 >Static : Symbol(Static, Decl(genericArgumentCallSigAssignmentCompat.ts, 3, 5))
 
         all<T>(list: T[], iterator?: Iterator<T, boolean>, context?: any): boolean;
->all : Symbol(all, Decl(genericArgumentCallSigAssignmentCompat.ts, 5, 29))
+>all : Symbol(Static.all, Decl(genericArgumentCallSigAssignmentCompat.ts, 5, 29))
 >T : Symbol(T, Decl(genericArgumentCallSigAssignmentCompat.ts, 6, 12))
 >list : Symbol(list, Decl(genericArgumentCallSigAssignmentCompat.ts, 6, 15))
 >T : Symbol(T, Decl(genericArgumentCallSigAssignmentCompat.ts, 6, 12))
@@ -29,7 +29,7 @@ module Underscore {
 >context : Symbol(context, Decl(genericArgumentCallSigAssignmentCompat.ts, 6, 58))
 
         identity<T>(value: T): T;
->identity : Symbol(identity, Decl(genericArgumentCallSigAssignmentCompat.ts, 6, 83))
+>identity : Symbol(Static.identity, Decl(genericArgumentCallSigAssignmentCompat.ts, 6, 83))
 >T : Symbol(T, Decl(genericArgumentCallSigAssignmentCompat.ts, 7, 17))
 >value : Symbol(value, Decl(genericArgumentCallSigAssignmentCompat.ts, 7, 20))
 >T : Symbol(T, Decl(genericArgumentCallSigAssignmentCompat.ts, 7, 17))
diff --git a/tests/baselines/reference/genericArrayExtenstions.errors.txt b/tests/baselines/reference/genericArrayExtenstions.errors.txt
index 7b332366fed..ac0b4072849 100644
--- a/tests/baselines/reference/genericArrayExtenstions.errors.txt
+++ b/tests/baselines/reference/genericArrayExtenstions.errors.txt
@@ -1,13 +1,10 @@
-tests/cases/compiler/genericArrayExtenstions.ts(1,22): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/compiler/genericArrayExtenstions.ts(1,22): error TS2420: Class 'ObservableArray<T>' incorrectly implements interface 'T[]'.
   Property 'length' is missing in type 'ObservableArray<T>'.
 
 
-==== tests/cases/compiler/genericArrayExtenstions.ts (2 errors) ====
+==== tests/cases/compiler/genericArrayExtenstions.ts (1 errors) ====
     export declare class ObservableArray<T> implements Array<T> { // MS.Entertainment.ObservableArray
                          ~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-                         ~~~~~~~~~~~~~~~
 !!! error TS2420: Class 'ObservableArray<T>' incorrectly implements interface 'T[]'.
 !!! error TS2420:   Property 'length' is missing in type 'ObservableArray<T>'.
     concat<U extends T[]>(...items: U[]): T[];
diff --git a/tests/baselines/reference/genericAssignmentCompatWithInterfaces1.errors.txt b/tests/baselines/reference/genericAssignmentCompatWithInterfaces1.errors.txt
index f335319cafd..63679ff03b7 100644
--- a/tests/baselines/reference/genericAssignmentCompatWithInterfaces1.errors.txt
+++ b/tests/baselines/reference/genericAssignmentCompatWithInterfaces1.errors.txt
@@ -4,7 +4,7 @@ tests/cases/compiler/genericAssignmentCompatWithInterfaces1.ts(12,5): error TS23
       Types of property 'compareTo' are incompatible.
         Type '(other: number) => number' is not assignable to type '(other: string) => number'.
           Types of parameters 'other' and 'other' are incompatible.
-            Type 'number' is not assignable to type 'string'.
+            Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/genericAssignmentCompatWithInterfaces1.ts(13,5): error TS2322: Type '{ x: A<number>; }' is not assignable to type 'I<string>'.
   Types of property 'x' are incompatible.
     Type 'A<number>' is not assignable to type 'Comparable<string>'.
@@ -36,7 +36,7 @@ tests/cases/compiler/genericAssignmentCompatWithInterfaces1.ts(17,5): error TS23
 !!! error TS2322:       Types of property 'compareTo' are incompatible.
 !!! error TS2322:         Type '(other: number) => number' is not assignable to type '(other: string) => number'.
 !!! error TS2322:           Types of parameters 'other' and 'other' are incompatible.
-!!! error TS2322:             Type 'number' is not assignable to type 'string'.
+!!! error TS2322:             Type 'string' is not assignable to type 'number'.
     var a2: I<string> = function (): { x: A<number> } {
         ~~
 !!! error TS2322: Type '{ x: A<number>; }' is not assignable to type 'I<string>'.
diff --git a/tests/baselines/reference/genericBaseClassLiteralProperty.symbols b/tests/baselines/reference/genericBaseClassLiteralProperty.symbols
index f499e243eaa..c03aaa631ff 100644
--- a/tests/baselines/reference/genericBaseClassLiteralProperty.symbols
+++ b/tests/baselines/reference/genericBaseClassLiteralProperty.symbols
@@ -4,11 +4,11 @@ class BaseClass<T> {
 >T : Symbol(T, Decl(genericBaseClassLiteralProperty.ts, 0, 16))
 
     public _getValue1: { (): T; };
->_getValue1 : Symbol(_getValue1, Decl(genericBaseClassLiteralProperty.ts, 0, 20))
+>_getValue1 : Symbol(BaseClass._getValue1, Decl(genericBaseClassLiteralProperty.ts, 0, 20))
 >T : Symbol(T, Decl(genericBaseClassLiteralProperty.ts, 0, 16))
 
     public _getValue2: () => T;
->_getValue2 : Symbol(_getValue2, Decl(genericBaseClassLiteralProperty.ts, 1, 34))
+>_getValue2 : Symbol(BaseClass._getValue2, Decl(genericBaseClassLiteralProperty.ts, 1, 34))
 >T : Symbol(T, Decl(genericBaseClassLiteralProperty.ts, 0, 16))
 }
 
@@ -17,7 +17,7 @@ class SubClass extends BaseClass<number> {
 >BaseClass : Symbol(BaseClass, Decl(genericBaseClassLiteralProperty.ts, 0, 0))
 
     public Error(): void {
->Error : Symbol(Error, Decl(genericBaseClassLiteralProperty.ts, 5, 42))
+>Error : Symbol(SubClass.Error, Decl(genericBaseClassLiteralProperty.ts, 5, 42))
 
         var x : number = this._getValue1();
 >x : Symbol(x, Decl(genericBaseClassLiteralProperty.ts, 8, 11))
diff --git a/tests/baselines/reference/genericBaseClassLiteralProperty2.symbols b/tests/baselines/reference/genericBaseClassLiteralProperty2.symbols
index 5ddccd40e38..2fa917493d2 100644
--- a/tests/baselines/reference/genericBaseClassLiteralProperty2.symbols
+++ b/tests/baselines/reference/genericBaseClassLiteralProperty2.symbols
@@ -8,15 +8,15 @@ class BaseCollection2<TItem extends CollectionItem2> {
 >CollectionItem2 : Symbol(CollectionItem2, Decl(genericBaseClassLiteralProperty2.ts, 0, 0))
 
     _itemsByKey: { [key: string]: TItem; };
->_itemsByKey : Symbol(_itemsByKey, Decl(genericBaseClassLiteralProperty2.ts, 2, 54))
+>_itemsByKey : Symbol(BaseCollection2._itemsByKey, Decl(genericBaseClassLiteralProperty2.ts, 2, 54))
 >key : Symbol(key, Decl(genericBaseClassLiteralProperty2.ts, 3, 20))
 >TItem : Symbol(TItem, Decl(genericBaseClassLiteralProperty2.ts, 2, 22))
 
     constructor() {
         this._itemsByKey = {};
->this._itemsByKey : Symbol(_itemsByKey, Decl(genericBaseClassLiteralProperty2.ts, 2, 54))
+>this._itemsByKey : Symbol(BaseCollection2._itemsByKey, Decl(genericBaseClassLiteralProperty2.ts, 2, 54))
 >this : Symbol(BaseCollection2, Decl(genericBaseClassLiteralProperty2.ts, 0, 25))
->_itemsByKey : Symbol(_itemsByKey, Decl(genericBaseClassLiteralProperty2.ts, 2, 54))
+>_itemsByKey : Symbol(BaseCollection2._itemsByKey, Decl(genericBaseClassLiteralProperty2.ts, 2, 54))
     }
 }
 
@@ -26,7 +26,7 @@ class DataView2 extends BaseCollection2<CollectionItem2> {
 >CollectionItem2 : Symbol(CollectionItem2, Decl(genericBaseClassLiteralProperty2.ts, 0, 0))
 
     fillItems(item: CollectionItem2) {
->fillItems : Symbol(fillItems, Decl(genericBaseClassLiteralProperty2.ts, 9, 58))
+>fillItems : Symbol(DataView2.fillItems, Decl(genericBaseClassLiteralProperty2.ts, 9, 58))
 >item : Symbol(item, Decl(genericBaseClassLiteralProperty2.ts, 10, 14))
 >CollectionItem2 : Symbol(CollectionItem2, Decl(genericBaseClassLiteralProperty2.ts, 0, 0))
 
diff --git a/tests/baselines/reference/genericBaseClassLiteralProperty2.types b/tests/baselines/reference/genericBaseClassLiteralProperty2.types
index d7d512165f0..3e320824925 100644
--- a/tests/baselines/reference/genericBaseClassLiteralProperty2.types
+++ b/tests/baselines/reference/genericBaseClassLiteralProperty2.types
@@ -14,11 +14,11 @@ class BaseCollection2<TItem extends CollectionItem2> {
 
     constructor() {
         this._itemsByKey = {};
->this._itemsByKey = {} : { [x: string]: undefined; }
+>this._itemsByKey = {} : {}
 >this._itemsByKey : { [key: string]: TItem; }
 >this : this
 >_itemsByKey : { [key: string]: TItem; }
->{} : { [x: string]: undefined; }
+>{} : {}
     }
 }
 
diff --git a/tests/baselines/reference/genericCallTypeArgumentInference.symbols b/tests/baselines/reference/genericCallTypeArgumentInference.symbols
index 2e86bda4ca4..ac802fa3641 100644
--- a/tests/baselines/reference/genericCallTypeArgumentInference.symbols
+++ b/tests/baselines/reference/genericCallTypeArgumentInference.symbols
@@ -57,14 +57,14 @@ class C<T, U> {
 >U : Symbol(U, Decl(genericCallTypeArgumentInference.ts, 20, 10))
 
     constructor(public t: T, public u: U) {
->t : Symbol(t, Decl(genericCallTypeArgumentInference.ts, 21, 16))
+>t : Symbol(C.t, Decl(genericCallTypeArgumentInference.ts, 21, 16))
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 20, 8))
->u : Symbol(u, Decl(genericCallTypeArgumentInference.ts, 21, 28))
+>u : Symbol(C.u, Decl(genericCallTypeArgumentInference.ts, 21, 28))
 >U : Symbol(U, Decl(genericCallTypeArgumentInference.ts, 20, 10))
     }
 
     foo(t: T, u: U) {
->foo : Symbol(foo, Decl(genericCallTypeArgumentInference.ts, 22, 5))
+>foo : Symbol(C.foo, Decl(genericCallTypeArgumentInference.ts, 22, 5))
 >t : Symbol(t, Decl(genericCallTypeArgumentInference.ts, 24, 8))
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 20, 8))
 >u : Symbol(u, Decl(genericCallTypeArgumentInference.ts, 24, 13))
@@ -75,7 +75,7 @@ class C<T, U> {
     }
 
     foo2(t: T, u: U) {
->foo2 : Symbol(foo2, Decl(genericCallTypeArgumentInference.ts, 26, 5))
+>foo2 : Symbol(C.foo2, Decl(genericCallTypeArgumentInference.ts, 26, 5))
 >t : Symbol(t, Decl(genericCallTypeArgumentInference.ts, 28, 9))
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 20, 8))
 >u : Symbol(u, Decl(genericCallTypeArgumentInference.ts, 28, 14))
@@ -86,7 +86,7 @@ class C<T, U> {
     }
 
     foo3<T>(t: T, u: U) {
->foo3 : Symbol(foo3, Decl(genericCallTypeArgumentInference.ts, 30, 5))
+>foo3 : Symbol(C.foo3, Decl(genericCallTypeArgumentInference.ts, 30, 5))
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 32, 9))
 >t : Symbol(t, Decl(genericCallTypeArgumentInference.ts, 32, 12))
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 32, 9))
@@ -98,7 +98,7 @@ class C<T, U> {
     }
 
     foo4<U>(t: T, u: U) {
->foo4 : Symbol(foo4, Decl(genericCallTypeArgumentInference.ts, 34, 5))
+>foo4 : Symbol(C.foo4, Decl(genericCallTypeArgumentInference.ts, 34, 5))
 >U : Symbol(U, Decl(genericCallTypeArgumentInference.ts, 36, 9))
 >t : Symbol(t, Decl(genericCallTypeArgumentInference.ts, 36, 12))
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 20, 8))
@@ -110,7 +110,7 @@ class C<T, U> {
     }
 
     foo5<T,U>(t: T, u: U) {
->foo5 : Symbol(foo5, Decl(genericCallTypeArgumentInference.ts, 38, 5))
+>foo5 : Symbol(C.foo5, Decl(genericCallTypeArgumentInference.ts, 38, 5))
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 40, 9))
 >U : Symbol(U, Decl(genericCallTypeArgumentInference.ts, 40, 11))
 >t : Symbol(t, Decl(genericCallTypeArgumentInference.ts, 40, 14))
@@ -123,7 +123,7 @@ class C<T, U> {
     }
 
     foo6<T, U>() {
->foo6 : Symbol(foo6, Decl(genericCallTypeArgumentInference.ts, 42, 5))
+>foo6 : Symbol(C.foo6, Decl(genericCallTypeArgumentInference.ts, 42, 5))
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 44, 9))
 >U : Symbol(U, Decl(genericCallTypeArgumentInference.ts, 44, 11))
 
@@ -136,7 +136,7 @@ class C<T, U> {
     }
 
     foo7<T, U>(u: U) {
->foo7 : Symbol(foo7, Decl(genericCallTypeArgumentInference.ts, 47, 5))
+>foo7 : Symbol(C.foo7, Decl(genericCallTypeArgumentInference.ts, 47, 5))
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 49, 9))
 >U : Symbol(U, Decl(genericCallTypeArgumentInference.ts, 49, 11))
 >u : Symbol(u, Decl(genericCallTypeArgumentInference.ts, 49, 15))
@@ -151,7 +151,7 @@ class C<T, U> {
     }
 
     foo8<T, U>() {
->foo8 : Symbol(foo8, Decl(genericCallTypeArgumentInference.ts, 52, 5))
+>foo8 : Symbol(C.foo8, Decl(genericCallTypeArgumentInference.ts, 52, 5))
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 54, 9))
 >U : Symbol(U, Decl(genericCallTypeArgumentInference.ts, 54, 11))
 
@@ -228,7 +228,7 @@ interface I<T, U> {
 >U : Symbol(U, Decl(genericCallTypeArgumentInference.ts, 70, 14))
 
     foo(t: T, u: U): T;
->foo : Symbol(foo, Decl(genericCallTypeArgumentInference.ts, 71, 21))
+>foo : Symbol(I.foo, Decl(genericCallTypeArgumentInference.ts, 71, 21))
 >t : Symbol(t, Decl(genericCallTypeArgumentInference.ts, 72, 8))
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 70, 12))
 >u : Symbol(u, Decl(genericCallTypeArgumentInference.ts, 72, 13))
@@ -236,7 +236,7 @@ interface I<T, U> {
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 70, 12))
 
     foo2(t: T, u: U): U;
->foo2 : Symbol(foo2, Decl(genericCallTypeArgumentInference.ts, 72, 23))
+>foo2 : Symbol(I.foo2, Decl(genericCallTypeArgumentInference.ts, 72, 23))
 >t : Symbol(t, Decl(genericCallTypeArgumentInference.ts, 73, 9))
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 70, 12))
 >u : Symbol(u, Decl(genericCallTypeArgumentInference.ts, 73, 14))
@@ -244,7 +244,7 @@ interface I<T, U> {
 >U : Symbol(U, Decl(genericCallTypeArgumentInference.ts, 70, 14))
 
     foo3<T>(t: T, u: U): T;
->foo3 : Symbol(foo3, Decl(genericCallTypeArgumentInference.ts, 73, 24))
+>foo3 : Symbol(I.foo3, Decl(genericCallTypeArgumentInference.ts, 73, 24))
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 74, 9))
 >t : Symbol(t, Decl(genericCallTypeArgumentInference.ts, 74, 12))
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 74, 9))
@@ -253,7 +253,7 @@ interface I<T, U> {
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 74, 9))
 
     foo4<U>(t: T, u: U): T;
->foo4 : Symbol(foo4, Decl(genericCallTypeArgumentInference.ts, 74, 27))
+>foo4 : Symbol(I.foo4, Decl(genericCallTypeArgumentInference.ts, 74, 27))
 >U : Symbol(U, Decl(genericCallTypeArgumentInference.ts, 75, 9))
 >t : Symbol(t, Decl(genericCallTypeArgumentInference.ts, 75, 12))
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 70, 12))
@@ -262,7 +262,7 @@ interface I<T, U> {
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 70, 12))
 
     foo5<T, U>(t: T, u: U): T;
->foo5 : Symbol(foo5, Decl(genericCallTypeArgumentInference.ts, 75, 27))
+>foo5 : Symbol(I.foo5, Decl(genericCallTypeArgumentInference.ts, 75, 27))
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 76, 9))
 >U : Symbol(U, Decl(genericCallTypeArgumentInference.ts, 76, 11))
 >t : Symbol(t, Decl(genericCallTypeArgumentInference.ts, 76, 15))
@@ -272,13 +272,13 @@ interface I<T, U> {
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 76, 9))
 
     foo6<T, U>(): T;
->foo6 : Symbol(foo6, Decl(genericCallTypeArgumentInference.ts, 76, 30))
+>foo6 : Symbol(I.foo6, Decl(genericCallTypeArgumentInference.ts, 76, 30))
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 77, 9))
 >U : Symbol(U, Decl(genericCallTypeArgumentInference.ts, 77, 11))
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 77, 9))
 
     foo7<T, U>(u: U): T;
->foo7 : Symbol(foo7, Decl(genericCallTypeArgumentInference.ts, 77, 20))
+>foo7 : Symbol(I.foo7, Decl(genericCallTypeArgumentInference.ts, 77, 20))
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 78, 9))
 >U : Symbol(U, Decl(genericCallTypeArgumentInference.ts, 78, 11))
 >u : Symbol(u, Decl(genericCallTypeArgumentInference.ts, 78, 15))
@@ -286,7 +286,7 @@ interface I<T, U> {
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 78, 9))
 
     foo8<T, U>(): T;    
->foo8 : Symbol(foo8, Decl(genericCallTypeArgumentInference.ts, 78, 24))
+>foo8 : Symbol(I.foo8, Decl(genericCallTypeArgumentInference.ts, 78, 24))
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 79, 9))
 >U : Symbol(U, Decl(genericCallTypeArgumentInference.ts, 79, 11))
 >T : Symbol(T, Decl(genericCallTypeArgumentInference.ts, 79, 9))
diff --git a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.symbols b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.symbols
index 5d419b8f992..ec209ed0ece 100644
--- a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.symbols
+++ b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.symbols
@@ -3,17 +3,17 @@
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 0, 0))
->foo : Symbol(foo, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 2, 12))
+>foo : Symbol(Base.foo, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 2, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 2, 27))
 >Base : Symbol(Base, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 0, 0))
->bar : Symbol(bar, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 3, 28))
+>bar : Symbol(Derived.bar, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 3, 28))
 
 class Derived2 extends Derived { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 3, 43))
 >Derived : Symbol(Derived, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 2, 27))
->baz : Symbol(baz, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 4, 32))
+>baz : Symbol(Derived2.baz, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 4, 32))
 
 var b: Base;
 >b : Symbol(b, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 5, 3))
@@ -112,14 +112,14 @@ class C<T extends Base, U extends Derived> {
 >Derived : Symbol(Derived, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 2, 27))
 
     constructor(public t: T, public u: U) {
->t : Symbol(t, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 34, 16))
+>t : Symbol(C.t, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 34, 16))
 >T : Symbol(T, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 33, 8))
->u : Symbol(u, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 34, 28))
+>u : Symbol(C.u, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 34, 28))
 >U : Symbol(U, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 33, 23))
     }
 
     foo(t: T, u: U) {
->foo : Symbol(foo, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 35, 5))
+>foo : Symbol(C.foo, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 35, 5))
 >t : Symbol(t, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 37, 8))
 >T : Symbol(T, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 33, 8))
 >u : Symbol(u, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 37, 13))
@@ -130,7 +130,7 @@ class C<T extends Base, U extends Derived> {
     }
 
     foo2(t: T, u: U) {
->foo2 : Symbol(foo2, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 39, 5))
+>foo2 : Symbol(C.foo2, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 39, 5))
 >t : Symbol(t, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 41, 9))
 >T : Symbol(T, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 33, 8))
 >u : Symbol(u, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 41, 14))
@@ -141,7 +141,7 @@ class C<T extends Base, U extends Derived> {
     }
 
     foo3<T extends Derived>(t: T, u: U) {
->foo3 : Symbol(foo3, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 43, 5))
+>foo3 : Symbol(C.foo3, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 43, 5))
 >T : Symbol(T, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 45, 9))
 >Derived : Symbol(Derived, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 2, 27))
 >t : Symbol(t, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 45, 28))
@@ -154,7 +154,7 @@ class C<T extends Base, U extends Derived> {
     }
 
     foo4<U extends Derived2>(t: T, u: U) {
->foo4 : Symbol(foo4, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 47, 5))
+>foo4 : Symbol(C.foo4, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 47, 5))
 >U : Symbol(U, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 49, 9))
 >Derived2 : Symbol(Derived2, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 3, 43))
 >t : Symbol(t, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 49, 29))
@@ -167,7 +167,7 @@ class C<T extends Base, U extends Derived> {
     }
 
     foo5<T extends Derived, U extends Derived2>(t: T, u: U) {
->foo5 : Symbol(foo5, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 51, 5))
+>foo5 : Symbol(C.foo5, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 51, 5))
 >T : Symbol(T, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 53, 9))
 >Derived : Symbol(Derived, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 2, 27))
 >U : Symbol(U, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 53, 27))
@@ -182,7 +182,7 @@ class C<T extends Base, U extends Derived> {
     }
 
     foo6<T extends Derived, U extends Derived2>() {
->foo6 : Symbol(foo6, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 55, 5))
+>foo6 : Symbol(C.foo6, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 55, 5))
 >T : Symbol(T, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 57, 9))
 >Derived : Symbol(Derived, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 2, 27))
 >U : Symbol(U, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 57, 27))
@@ -197,7 +197,7 @@ class C<T extends Base, U extends Derived> {
     }
 
     foo7<T extends Base, U extends Derived>(u: U) {
->foo7 : Symbol(foo7, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 60, 5))
+>foo7 : Symbol(C.foo7, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 60, 5))
 >T : Symbol(T, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 62, 9))
 >Base : Symbol(Base, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 0, 0))
 >U : Symbol(U, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 62, 24))
@@ -214,7 +214,7 @@ class C<T extends Base, U extends Derived> {
     }
 
     foo8<T extends Base, U extends Derived>() {
->foo8 : Symbol(foo8, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 65, 5))
+>foo8 : Symbol(C.foo8, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 65, 5))
 >T : Symbol(T, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 67, 9))
 >Base : Symbol(Base, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 0, 0))
 >U : Symbol(U, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 67, 24))
@@ -316,7 +316,7 @@ interface I<T extends Base, U extends Derived> {
 >U : Symbol(U, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 84, 27))
 
     foo(t: T, u: U): T;
->foo : Symbol(foo, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 85, 21))
+>foo : Symbol(I.foo, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 85, 21))
 >t : Symbol(t, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 86, 8))
 >T : Symbol(T, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 84, 12))
 >u : Symbol(u, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 86, 13))
@@ -324,7 +324,7 @@ interface I<T extends Base, U extends Derived> {
 >T : Symbol(T, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 84, 12))
 
     foo2(t: T, u: U): U;
->foo2 : Symbol(foo2, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 86, 23))
+>foo2 : Symbol(I.foo2, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 86, 23))
 >t : Symbol(t, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 87, 9))
 >T : Symbol(T, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 84, 12))
 >u : Symbol(u, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 87, 14))
@@ -332,7 +332,7 @@ interface I<T extends Base, U extends Derived> {
 >U : Symbol(U, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 84, 27))
 
     foo3<T extends Derived>(t: T, u: U): T;
->foo3 : Symbol(foo3, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 87, 24))
+>foo3 : Symbol(I.foo3, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 87, 24))
 >T : Symbol(T, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 88, 9))
 >Derived : Symbol(Derived, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 2, 27))
 >t : Symbol(t, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 88, 28))
@@ -342,7 +342,7 @@ interface I<T extends Base, U extends Derived> {
 >T : Symbol(T, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 88, 9))
 
     foo4<U extends Derived2>(t: T, u: U): T;
->foo4 : Symbol(foo4, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 88, 43))
+>foo4 : Symbol(I.foo4, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 88, 43))
 >U : Symbol(U, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 89, 9))
 >Derived2 : Symbol(Derived2, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 3, 43))
 >t : Symbol(t, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 89, 29))
@@ -352,7 +352,7 @@ interface I<T extends Base, U extends Derived> {
 >T : Symbol(T, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 84, 12))
 
     foo5<T extends Derived, U extends Derived2>(t: T, u: U): T;
->foo5 : Symbol(foo5, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 89, 44))
+>foo5 : Symbol(I.foo5, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 89, 44))
 >T : Symbol(T, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 90, 9))
 >Derived : Symbol(Derived, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 2, 27))
 >U : Symbol(U, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 90, 27))
@@ -364,7 +364,7 @@ interface I<T extends Base, U extends Derived> {
 >T : Symbol(T, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 90, 9))
 
     foo6<T extends Derived, U extends Derived2>(): T;
->foo6 : Symbol(foo6, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 90, 63))
+>foo6 : Symbol(I.foo6, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 90, 63))
 >T : Symbol(T, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 91, 9))
 >Derived : Symbol(Derived, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 2, 27))
 >U : Symbol(U, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 91, 27))
@@ -372,7 +372,7 @@ interface I<T extends Base, U extends Derived> {
 >T : Symbol(T, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 91, 9))
 
     foo7<T extends Base, U extends Derived>(u: U): T;
->foo7 : Symbol(foo7, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 91, 53))
+>foo7 : Symbol(I.foo7, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 91, 53))
 >T : Symbol(T, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 92, 9))
 >Base : Symbol(Base, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 0, 0))
 >U : Symbol(U, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 92, 24))
@@ -382,7 +382,7 @@ interface I<T extends Base, U extends Derived> {
 >T : Symbol(T, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 92, 9))
 
     foo8<T extends Base, U extends Derived>(): T;
->foo8 : Symbol(foo8, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 92, 53))
+>foo8 : Symbol(I.foo8, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 92, 53))
 >T : Symbol(T, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 93, 9))
 >Base : Symbol(Base, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 0, 0))
 >U : Symbol(U, Decl(genericCallWithConstraintsTypeArgumentInference.ts, 93, 24))
diff --git a/tests/baselines/reference/genericCallWithFixedArguments.symbols b/tests/baselines/reference/genericCallWithFixedArguments.symbols
index c47c5ef8f06..6eaa789f9e4 100644
--- a/tests/baselines/reference/genericCallWithFixedArguments.symbols
+++ b/tests/baselines/reference/genericCallWithFixedArguments.symbols
@@ -1,11 +1,11 @@
 === tests/cases/compiler/genericCallWithFixedArguments.ts ===
 class A { foo() { } }
 >A : Symbol(A, Decl(genericCallWithFixedArguments.ts, 0, 0))
->foo : Symbol(foo, Decl(genericCallWithFixedArguments.ts, 0, 9))
+>foo : Symbol(A.foo, Decl(genericCallWithFixedArguments.ts, 0, 9))
 
 class B { bar() { }} 
 >B : Symbol(B, Decl(genericCallWithFixedArguments.ts, 0, 21))
->bar : Symbol(bar, Decl(genericCallWithFixedArguments.ts, 1, 9))
+>bar : Symbol(B.bar, Decl(genericCallWithFixedArguments.ts, 1, 9))
 
 function g<T, U>(x) { }
 >g : Symbol(g, Decl(genericCallWithFixedArguments.ts, 1, 20))
diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments4.symbols b/tests/baselines/reference/genericCallWithFunctionTypedArguments4.symbols
index 9aa87c28240..2c0fa9e3765 100644
--- a/tests/baselines/reference/genericCallWithFunctionTypedArguments4.symbols
+++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments4.symbols
@@ -3,11 +3,11 @@
 
 class C { foo: string }
 >C : Symbol(C, Decl(genericCallWithFunctionTypedArguments4.ts, 0, 0))
->foo : Symbol(foo, Decl(genericCallWithFunctionTypedArguments4.ts, 2, 9))
+>foo : Symbol(C.foo, Decl(genericCallWithFunctionTypedArguments4.ts, 2, 9))
 
 class D { bar: string }
 >D : Symbol(D, Decl(genericCallWithFunctionTypedArguments4.ts, 2, 23))
->bar : Symbol(bar, Decl(genericCallWithFunctionTypedArguments4.ts, 3, 9))
+>bar : Symbol(D.bar, Decl(genericCallWithFunctionTypedArguments4.ts, 3, 9))
 
 var a: {
 >a : Symbol(a, Decl(genericCallWithFunctionTypedArguments4.ts, 4, 3))
diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.errors.txt b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.errors.txt
index c264058ad9f..e3da7eaeaec 100644
--- a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.errors.txt
+++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.errors.txt
@@ -4,17 +4,14 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGen
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts(16,22): error TS2345: Argument of type 'number' is not assignable to parameter of type 'T'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts(25,23): error TS2345: Argument of type '(a: T) => T' is not assignable to parameter of type '(x: Date) => Date'.
   Types of parameters 'a' and 'x' are incompatible.
-    Type 'T' is not assignable to type 'Date'.
-      Type 'RegExp' is not assignable to type 'Date'.
-        Property 'toDateString' is missing in type 'RegExp'.
+    Type 'Date' is not assignable to type 'T'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts(37,36): error TS2345: Argument of type '(x: E) => F' is not assignable to parameter of type '(x: E) => E'.
   Type 'F' is not assignable to type 'E'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts(50,21): error TS2345: Argument of type 'Date' is not assignable to parameter of type 'T'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts(51,22): error TS2345: Argument of type 'number' is not assignable to parameter of type 'T'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts(60,23): error TS2345: Argument of type '(a: T) => T' is not assignable to parameter of type '(x: Date) => Date'.
   Types of parameters 'a' and 'x' are incompatible.
-    Type 'T' is not assignable to type 'Date'.
-      Type 'RegExp' is not assignable to type 'Date'.
+    Type 'Date' is not assignable to type 'T'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts(67,51): error TS2304: Cannot find name 'U'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGenericSignatureArguments2.ts(67,57): error TS2304: Cannot find name 'U'.
 
@@ -55,9 +52,7 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGen
                           ~~~~~~~~~~~
 !!! error TS2345: Argument of type '(a: T) => T' is not assignable to parameter of type '(x: Date) => Date'.
 !!! error TS2345:   Types of parameters 'a' and 'x' are incompatible.
-!!! error TS2345:     Type 'T' is not assignable to type 'Date'.
-!!! error TS2345:       Type 'RegExp' is not assignable to type 'Date'.
-!!! error TS2345:         Property 'toDateString' is missing in type 'RegExp'.
+!!! error TS2345:     Type 'Date' is not assignable to type 'T'.
             var r7b = foo2((a) => a, (b) => b); // valid, T is inferred to be Date
         }
     
@@ -103,8 +98,7 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithGen
                           ~~~~~~~~~~~
 !!! error TS2345: Argument of type '(a: T) => T' is not assignable to parameter of type '(x: Date) => Date'.
 !!! error TS2345:   Types of parameters 'a' and 'x' are incompatible.
-!!! error TS2345:     Type 'T' is not assignable to type 'Date'.
-!!! error TS2345:       Type 'RegExp' is not assignable to type 'Date'.
+!!! error TS2345:     Type 'Date' is not assignable to type 'T'.
             var r7b = foo2((a) => a, (b) => b); 
         }
     
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgs2.symbols b/tests/baselines/reference/genericCallWithObjectTypeArgs2.symbols
index f567499d4c9..3a5e2d948ba 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgs2.symbols
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgs2.symbols
@@ -3,21 +3,21 @@ class Base {
 >Base : Symbol(Base, Decl(genericCallWithObjectTypeArgs2.ts, 0, 0))
 
     x: string;
->x : Symbol(x, Decl(genericCallWithObjectTypeArgs2.ts, 0, 12))
+>x : Symbol(Base.x, Decl(genericCallWithObjectTypeArgs2.ts, 0, 12))
 }
 class Derived extends Base {
 >Derived : Symbol(Derived, Decl(genericCallWithObjectTypeArgs2.ts, 2, 1))
 >Base : Symbol(Base, Decl(genericCallWithObjectTypeArgs2.ts, 0, 0))
 
     y: string;
->y : Symbol(y, Decl(genericCallWithObjectTypeArgs2.ts, 3, 28))
+>y : Symbol(Derived.y, Decl(genericCallWithObjectTypeArgs2.ts, 3, 28))
 }
 class Derived2 extends Base {
 >Derived2 : Symbol(Derived2, Decl(genericCallWithObjectTypeArgs2.ts, 5, 1))
 >Base : Symbol(Base, Decl(genericCallWithObjectTypeArgs2.ts, 0, 0))
 
     z: string;
->z : Symbol(z, Decl(genericCallWithObjectTypeArgs2.ts, 6, 29))
+>z : Symbol(Derived2.z, Decl(genericCallWithObjectTypeArgs2.ts, 6, 29))
 }
 
 // returns {}[]
@@ -93,11 +93,11 @@ interface I<T, U> {
 >U : Symbol(U, Decl(genericCallWithObjectTypeArgs2.ts, 25, 14))
 
     x: T;
->x : Symbol(x, Decl(genericCallWithObjectTypeArgs2.ts, 25, 19))
+>x : Symbol(I.x, Decl(genericCallWithObjectTypeArgs2.ts, 25, 19))
 >T : Symbol(T, Decl(genericCallWithObjectTypeArgs2.ts, 25, 12))
 
     y: U;
->y : Symbol(y, Decl(genericCallWithObjectTypeArgs2.ts, 26, 9))
+>y : Symbol(I.y, Decl(genericCallWithObjectTypeArgs2.ts, 26, 9))
 >U : Symbol(U, Decl(genericCallWithObjectTypeArgs2.ts, 25, 14))
 }
 
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.symbols b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.symbols
index 50f20f55bea..20e04f26340 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.symbols
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.symbols
@@ -6,17 +6,17 @@ class C {
 >C : Symbol(C, Decl(genericCallWithObjectTypeArgsAndConstraints.ts, 0, 0))
 
     x: string;
->x : Symbol(x, Decl(genericCallWithObjectTypeArgsAndConstraints.ts, 3, 9))
+>x : Symbol(C.x, Decl(genericCallWithObjectTypeArgsAndConstraints.ts, 3, 9))
 }
 
 class D {
 >D : Symbol(D, Decl(genericCallWithObjectTypeArgsAndConstraints.ts, 5, 1))
 
     x: string;
->x : Symbol(x, Decl(genericCallWithObjectTypeArgsAndConstraints.ts, 7, 9))
+>x : Symbol(D.x, Decl(genericCallWithObjectTypeArgsAndConstraints.ts, 7, 9))
 
     y: string;
->y : Symbol(y, Decl(genericCallWithObjectTypeArgsAndConstraints.ts, 8, 14))
+>y : Symbol(D.y, Decl(genericCallWithObjectTypeArgsAndConstraints.ts, 8, 14))
 }
 
 class X<T> {
@@ -24,7 +24,7 @@ class X<T> {
 >T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndConstraints.ts, 12, 8))
 
     x: T;
->x : Symbol(x, Decl(genericCallWithObjectTypeArgsAndConstraints.ts, 12, 12))
+>x : Symbol(X.x, Decl(genericCallWithObjectTypeArgsAndConstraints.ts, 12, 12))
 >T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndConstraints.ts, 12, 8))
 }
 
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.symbols b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.symbols
index 864927a3a8c..27c015ffcff 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.symbols
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.symbols
@@ -6,14 +6,14 @@ class Base {
 >Base : Symbol(Base, Decl(genericCallWithObjectTypeArgsAndConstraints2.ts, 0, 0))
 
     x: string;
->x : Symbol(x, Decl(genericCallWithObjectTypeArgsAndConstraints2.ts, 3, 12))
+>x : Symbol(Base.x, Decl(genericCallWithObjectTypeArgsAndConstraints2.ts, 3, 12))
 }
 class Derived extends Base {
 >Derived : Symbol(Derived, Decl(genericCallWithObjectTypeArgsAndConstraints2.ts, 5, 1))
 >Base : Symbol(Base, Decl(genericCallWithObjectTypeArgsAndConstraints2.ts, 0, 0))
 
     y: string;
->y : Symbol(y, Decl(genericCallWithObjectTypeArgsAndConstraints2.ts, 6, 28))
+>y : Symbol(Derived.y, Decl(genericCallWithObjectTypeArgsAndConstraints2.ts, 6, 28))
 }
 
 function f<T extends Base>(x: { foo: T; bar: T }) {
@@ -55,7 +55,7 @@ interface I<T> {
 >T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndConstraints2.ts, 18, 12))
 
     a: T;
->a : Symbol(a, Decl(genericCallWithObjectTypeArgsAndConstraints2.ts, 18, 16))
+>a : Symbol(I.a, Decl(genericCallWithObjectTypeArgsAndConstraints2.ts, 18, 16))
 >T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndConstraints2.ts, 18, 12))
 }
 function f2<T extends Base>(x: I<T>) {
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexers.symbols b/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexers.symbols
index 3824029dfec..4aa4807b637 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexers.symbols
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexers.symbols
@@ -20,7 +20,7 @@ var a: {
 
     [x: number]: Date;
 >x : Symbol(x, Decl(genericCallWithObjectTypeArgsAndIndexers.ts, 8, 5))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 };
 var r = foo(a);
@@ -31,7 +31,7 @@ var r = foo(a);
 function other<T extends Date>(arg: T) {
 >other : Symbol(other, Decl(genericCallWithObjectTypeArgsAndIndexers.ts, 10, 15))
 >T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndIndexers.ts, 12, 15))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >arg : Symbol(arg, Decl(genericCallWithObjectTypeArgsAndIndexers.ts, 12, 31))
 >T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndIndexers.ts, 12, 15))
 
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexersErrors.symbols b/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexersErrors.symbols
index 0f3fe58da01..e8371f0cf76 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexersErrors.symbols
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexersErrors.symbols
@@ -40,7 +40,7 @@ function other3<T extends U, U extends Date>(arg: T) {
 >T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 14, 16))
 >U : Symbol(U, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 14, 28))
 >U : Symbol(U, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 14, 28))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >arg : Symbol(arg, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 14, 45))
 >T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndIndexersErrors.ts, 14, 16))
 
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndNumericIndexer.symbols b/tests/baselines/reference/genericCallWithObjectTypeArgsAndNumericIndexer.symbols
index 4e7622d3d81..58d9d2a3770 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndNumericIndexer.symbols
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndNumericIndexer.symbols
@@ -14,7 +14,7 @@ function foo<T>(x: T) {
 var a: { [x: number]: Date };
 >a : Symbol(a, Decl(genericCallWithObjectTypeArgsAndNumericIndexer.ts, 6, 3))
 >x : Symbol(x, Decl(genericCallWithObjectTypeArgsAndNumericIndexer.ts, 6, 10))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var r = foo(a);
 >r : Symbol(r, Decl(genericCallWithObjectTypeArgsAndNumericIndexer.ts, 7, 3))
@@ -41,7 +41,7 @@ function other<T>(arg: T) {
 function other2<T extends Date>(arg: T) {
 >other2 : Symbol(other2, Decl(genericCallWithObjectTypeArgsAndNumericIndexer.ts, 12, 1))
 >T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndNumericIndexer.ts, 14, 16))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >arg : Symbol(arg, Decl(genericCallWithObjectTypeArgsAndNumericIndexer.ts, 14, 32))
 >T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndNumericIndexer.ts, 14, 16))
 
@@ -63,9 +63,9 @@ function other2<T extends Date>(arg: T) {
 function other3<T extends Date, U extends Date>(arg: T) {
 >other3 : Symbol(other3, Decl(genericCallWithObjectTypeArgsAndNumericIndexer.ts, 18, 1))
 >T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndNumericIndexer.ts, 20, 16))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >U : Symbol(U, Decl(genericCallWithObjectTypeArgsAndNumericIndexer.ts, 20, 31))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >arg : Symbol(arg, Decl(genericCallWithObjectTypeArgsAndNumericIndexer.ts, 20, 48))
 >T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndNumericIndexer.ts, 20, 16))
 
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndStringIndexer.symbols b/tests/baselines/reference/genericCallWithObjectTypeArgsAndStringIndexer.symbols
index 932cedf148e..56f1015f620 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndStringIndexer.symbols
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndStringIndexer.symbols
@@ -14,7 +14,7 @@ function foo<T>(x: T) {
 var a: { [x: string]: Date };
 >a : Symbol(a, Decl(genericCallWithObjectTypeArgsAndStringIndexer.ts, 6, 3))
 >x : Symbol(x, Decl(genericCallWithObjectTypeArgsAndStringIndexer.ts, 6, 10))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var r = foo(a);
 >r : Symbol(r, Decl(genericCallWithObjectTypeArgsAndStringIndexer.ts, 7, 3))
@@ -41,7 +41,7 @@ function other<T>(arg: T) {
 function other2<T extends Date>(arg: T) {
 >other2 : Symbol(other2, Decl(genericCallWithObjectTypeArgsAndStringIndexer.ts, 12, 1))
 >T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndStringIndexer.ts, 14, 16))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >arg : Symbol(arg, Decl(genericCallWithObjectTypeArgsAndStringIndexer.ts, 14, 32))
 >T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndStringIndexer.ts, 14, 16))
 
@@ -57,16 +57,16 @@ function other2<T extends Date>(arg: T) {
 
     var d: Date = r2['hm']; // ok
 >d : Symbol(d, Decl(genericCallWithObjectTypeArgsAndStringIndexer.ts, 17, 7))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >r2 : Symbol(r2, Decl(genericCallWithObjectTypeArgsAndStringIndexer.ts, 16, 7))
 }
 
 function other3<T extends Date, U extends Date>(arg: T) {
 >other3 : Symbol(other3, Decl(genericCallWithObjectTypeArgsAndStringIndexer.ts, 18, 1))
 >T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndStringIndexer.ts, 20, 16))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >U : Symbol(U, Decl(genericCallWithObjectTypeArgsAndStringIndexer.ts, 20, 31))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >arg : Symbol(arg, Decl(genericCallWithObjectTypeArgsAndStringIndexer.ts, 20, 48))
 >T : Symbol(T, Decl(genericCallWithObjectTypeArgsAndStringIndexer.ts, 20, 16))
 
@@ -82,7 +82,7 @@ function other3<T extends Date, U extends Date>(arg: T) {
 
     var d: Date = r2['hm']; // ok
 >d : Symbol(d, Decl(genericCallWithObjectTypeArgsAndStringIndexer.ts, 23, 7))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >r2 : Symbol(r2, Decl(genericCallWithObjectTypeArgsAndStringIndexer.ts, 22, 7))
 
     // BUG 821629
diff --git a/tests/baselines/reference/genericCallWithTupleType.errors.txt b/tests/baselines/reference/genericCallWithTupleType.errors.txt
index d03f8d5e68a..24e0505d009 100644
--- a/tests/baselines/reference/genericCallWithTupleType.errors.txt
+++ b/tests/baselines/reference/genericCallWithTupleType.errors.txt
@@ -3,15 +3,14 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTup
     Type '() => string | number | boolean' is not assignable to type '() => string | number'.
       Type 'string | number | boolean' is not assignable to type 'string | number'.
         Type 'boolean' is not assignable to type 'string | number'.
-          Type 'boolean' is not assignable to type 'number'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTupleType.ts(14,1): error TS2322: Type '{ a: string; }' is not assignable to type 'string | number'.
   Type '{ a: string; }' is not assignable to type 'number'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTupleType.ts(22,1): error TS2322: Type '[number, string]' is not assignable to type '[string, number]'.
   Types of property '0' are incompatible.
     Type 'number' is not assignable to type 'string'.
-tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTupleType.ts(23,1): error TS2322: Type '[{ [x: number]: undefined; }, {}]' is not assignable to type '[string, number]'.
+tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTupleType.ts(23,1): error TS2322: Type '[{}, {}]' is not assignable to type '[string, number]'.
   Types of property '0' are incompatible.
-    Type '{ [x: number]: undefined; }' is not assignable to type 'string'.
+    Type '{}' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTupleType.ts(24,1): error TS2322: Type '[{}]' is not assignable to type '[{}, {}]'.
   Property '1' is missing in type '[{}]'.
 
@@ -35,7 +34,6 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTup
 !!! error TS2322:     Type '() => string | number | boolean' is not assignable to type '() => string | number'.
 !!! error TS2322:       Type 'string | number | boolean' is not assignable to type 'string | number'.
 !!! error TS2322:         Type 'boolean' is not assignable to type 'string | number'.
-!!! error TS2322:           Type 'boolean' is not assignable to type 'number'.
     var e3 = i1.tuple1[2];  // {}
     i1.tuple1[3] = { a: "string" };
     ~~~~~~~~~~~~
@@ -55,9 +53,9 @@ tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithTup
 !!! error TS2322:     Type 'number' is not assignable to type 'string'.
     i1.tuple1 = [{}, {}];
     ~~~~~~~~~
-!!! error TS2322: Type '[{ [x: number]: undefined; }, {}]' is not assignable to type '[string, number]'.
+!!! error TS2322: Type '[{}, {}]' is not assignable to type '[string, number]'.
 !!! error TS2322:   Types of property '0' are incompatible.
-!!! error TS2322:     Type '{ [x: number]: undefined; }' is not assignable to type 'string'.
+!!! error TS2322:     Type '{}' is not assignable to type 'string'.
     i2.tuple1 = [{}];
     ~~~~~~~~~
 !!! error TS2322: Type '[{}]' is not assignable to type '[{}, {}]'.
diff --git a/tests/baselines/reference/genericCallbacksAndClassHierarchy.symbols b/tests/baselines/reference/genericCallbacksAndClassHierarchy.symbols
index be46c49a9ca..bd833c6f235 100644
--- a/tests/baselines/reference/genericCallbacksAndClassHierarchy.symbols
+++ b/tests/baselines/reference/genericCallbacksAndClassHierarchy.symbols
@@ -7,7 +7,7 @@ module M {
 >T : Symbol(T, Decl(genericCallbacksAndClassHierarchy.ts, 1, 23))
 
         subscribe(callback: (newValue: T) => void ): any;
->subscribe : Symbol(subscribe, Decl(genericCallbacksAndClassHierarchy.ts, 1, 27))
+>subscribe : Symbol(I.subscribe, Decl(genericCallbacksAndClassHierarchy.ts, 1, 27))
 >callback : Symbol(callback, Decl(genericCallbacksAndClassHierarchy.ts, 2, 18))
 >newValue : Symbol(newValue, Decl(genericCallbacksAndClassHierarchy.ts, 2, 29))
 >T : Symbol(T, Decl(genericCallbacksAndClassHierarchy.ts, 1, 23))
@@ -17,7 +17,7 @@ module M {
 >T : Symbol(T, Decl(genericCallbacksAndClassHierarchy.ts, 4, 20))
 
         public value: I<T>;
->value : Symbol(value, Decl(genericCallbacksAndClassHierarchy.ts, 4, 24))
+>value : Symbol(C1.value, Decl(genericCallbacksAndClassHierarchy.ts, 4, 24))
 >I : Symbol(I, Decl(genericCallbacksAndClassHierarchy.ts, 0, 10))
 >T : Symbol(T, Decl(genericCallbacksAndClassHierarchy.ts, 4, 20))
     }
@@ -26,7 +26,7 @@ module M {
 >T : Symbol(T, Decl(genericCallbacksAndClassHierarchy.ts, 7, 19))
 
         public dummy: any;
->dummy : Symbol(dummy, Decl(genericCallbacksAndClassHierarchy.ts, 7, 23))
+>dummy : Symbol(A.dummy, Decl(genericCallbacksAndClassHierarchy.ts, 7, 23))
     }
     export class B<T> extends C1<A<T>> { }
 >B : Symbol(B, Decl(genericCallbacksAndClassHierarchy.ts, 9, 5))
@@ -40,7 +40,7 @@ module M {
 >T : Symbol(T, Decl(genericCallbacksAndClassHierarchy.ts, 11, 19))
 
         _subscribe(viewModel: B<T>): void {
->_subscribe : Symbol(_subscribe, Decl(genericCallbacksAndClassHierarchy.ts, 11, 23))
+>_subscribe : Symbol(D._subscribe, Decl(genericCallbacksAndClassHierarchy.ts, 11, 23))
 >viewModel : Symbol(viewModel, Decl(genericCallbacksAndClassHierarchy.ts, 12, 19))
 >B : Symbol(B, Decl(genericCallbacksAndClassHierarchy.ts, 9, 5))
 >T : Symbol(T, Decl(genericCallbacksAndClassHierarchy.ts, 11, 19))
diff --git a/tests/baselines/reference/genericClassExpressionInFunction.symbols b/tests/baselines/reference/genericClassExpressionInFunction.symbols
index b5a6b8c6c70..2384cd2ed47 100644
--- a/tests/baselines/reference/genericClassExpressionInFunction.symbols
+++ b/tests/baselines/reference/genericClassExpressionInFunction.symbols
@@ -4,7 +4,7 @@ class A<T> {
 >T : Symbol(T, Decl(genericClassExpressionInFunction.ts, 0, 8))
 
     genericVar: T
->genericVar : Symbol(genericVar, Decl(genericClassExpressionInFunction.ts, 0, 12))
+>genericVar : Symbol(A.genericVar, Decl(genericClassExpressionInFunction.ts, 0, 12))
 >T : Symbol(T, Decl(genericClassExpressionInFunction.ts, 0, 8))
 }
 function B1<U>() {
@@ -21,7 +21,7 @@ class B2<V> {
 >V : Symbol(V, Decl(genericClassExpressionInFunction.ts, 7, 9))
 
     anon = class extends A<V> { }
->anon : Symbol(anon, Decl(genericClassExpressionInFunction.ts, 7, 13))
+>anon : Symbol(B2.anon, Decl(genericClassExpressionInFunction.ts, 7, 13))
 >A : Symbol(A, Decl(genericClassExpressionInFunction.ts, 0, 0))
 >V : Symbol(V, Decl(genericClassExpressionInFunction.ts, 7, 9))
 }
@@ -41,7 +41,7 @@ class K extends B1<number>() {
 >B1 : Symbol(B1, Decl(genericClassExpressionInFunction.ts, 2, 1))
 
     namae: string;
->namae : Symbol(namae, Decl(genericClassExpressionInFunction.ts, 14, 30))
+>namae : Symbol(K.namae, Decl(genericClassExpressionInFunction.ts, 14, 30))
 }
 class C extends (new B2<number>().anon) {
 >C : Symbol(C, Decl(genericClassExpressionInFunction.ts, 16, 1))
@@ -50,7 +50,7 @@ class C extends (new B2<number>().anon) {
 >anon : Symbol(B2.anon, Decl(genericClassExpressionInFunction.ts, 7, 13))
 
     name: string;
->name : Symbol(name, Decl(genericClassExpressionInFunction.ts, 17, 41))
+>name : Symbol(C.name, Decl(genericClassExpressionInFunction.ts, 17, 41))
 }
 let b3Number = B3<number>();
 >b3Number : Symbol(b3Number, Decl(genericClassExpressionInFunction.ts, 20, 3))
@@ -61,7 +61,7 @@ class S extends b3Number<string> {
 >b3Number : Symbol(b3Number, Decl(genericClassExpressionInFunction.ts, 20, 3))
 
     nom: string;
->nom : Symbol(nom, Decl(genericClassExpressionInFunction.ts, 21, 34))
+>nom : Symbol(S.nom, Decl(genericClassExpressionInFunction.ts, 21, 34))
 }
 var c = new C();
 >c : Symbol(c, Decl(genericClassExpressionInFunction.ts, 24, 3))
diff --git a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.symbols b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.symbols
index 291f439c9a9..f0f3fdd4713 100644
--- a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.symbols
+++ b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.symbols
@@ -4,7 +4,7 @@ interface KnockoutObservableBase<T> {
 >T : Symbol(T, Decl(genericClassPropertyInheritanceSpecialization.ts, 0, 33))
 
     peek(): T;
->peek : Symbol(peek, Decl(genericClassPropertyInheritanceSpecialization.ts, 0, 37))
+>peek : Symbol(KnockoutObservableBase.peek, Decl(genericClassPropertyInheritanceSpecialization.ts, 0, 37))
 >T : Symbol(T, Decl(genericClassPropertyInheritanceSpecialization.ts, 0, 33))
 
     (): T;
@@ -22,17 +22,17 @@ interface KnockoutObservable<T> extends KnockoutObservableBase<T> {
 >T : Symbol(T, Decl(genericClassPropertyInheritanceSpecialization.ts, 6, 29))
 
     equalityComparer(a: T, b: T): boolean;
->equalityComparer : Symbol(equalityComparer, Decl(genericClassPropertyInheritanceSpecialization.ts, 6, 67))
+>equalityComparer : Symbol(KnockoutObservable.equalityComparer, Decl(genericClassPropertyInheritanceSpecialization.ts, 6, 67))
 >a : Symbol(a, Decl(genericClassPropertyInheritanceSpecialization.ts, 7, 21))
 >T : Symbol(T, Decl(genericClassPropertyInheritanceSpecialization.ts, 6, 29))
 >b : Symbol(b, Decl(genericClassPropertyInheritanceSpecialization.ts, 7, 26))
 >T : Symbol(T, Decl(genericClassPropertyInheritanceSpecialization.ts, 6, 29))
 
     valueHasMutated(): void;
->valueHasMutated : Symbol(valueHasMutated, Decl(genericClassPropertyInheritanceSpecialization.ts, 7, 42))
+>valueHasMutated : Symbol(KnockoutObservable.valueHasMutated, Decl(genericClassPropertyInheritanceSpecialization.ts, 7, 42))
 
     valueWillMutate(): void;
->valueWillMutate : Symbol(valueWillMutate, Decl(genericClassPropertyInheritanceSpecialization.ts, 8, 28))
+>valueWillMutate : Symbol(KnockoutObservable.valueWillMutate, Decl(genericClassPropertyInheritanceSpecialization.ts, 8, 28))
 }
 
 interface KnockoutObservableArray<T> extends KnockoutObservable<T[]> {
@@ -42,19 +42,19 @@ interface KnockoutObservableArray<T> extends KnockoutObservable<T[]> {
 >T : Symbol(T, Decl(genericClassPropertyInheritanceSpecialization.ts, 12, 34))
 
     indexOf(searchElement: T, fromIndex?: number): number;
->indexOf : Symbol(indexOf, Decl(genericClassPropertyInheritanceSpecialization.ts, 12, 70))
+>indexOf : Symbol(KnockoutObservableArray.indexOf, Decl(genericClassPropertyInheritanceSpecialization.ts, 12, 70))
 >searchElement : Symbol(searchElement, Decl(genericClassPropertyInheritanceSpecialization.ts, 13, 12))
 >T : Symbol(T, Decl(genericClassPropertyInheritanceSpecialization.ts, 12, 34))
 >fromIndex : Symbol(fromIndex, Decl(genericClassPropertyInheritanceSpecialization.ts, 13, 29))
 
     slice(start: number, end?: number): T[];
->slice : Symbol(slice, Decl(genericClassPropertyInheritanceSpecialization.ts, 13, 58))
+>slice : Symbol(KnockoutObservableArray.slice, Decl(genericClassPropertyInheritanceSpecialization.ts, 13, 58))
 >start : Symbol(start, Decl(genericClassPropertyInheritanceSpecialization.ts, 14, 10))
 >end : Symbol(end, Decl(genericClassPropertyInheritanceSpecialization.ts, 14, 24))
 >T : Symbol(T, Decl(genericClassPropertyInheritanceSpecialization.ts, 12, 34))
 
     splice(start: number, deleteCount?: number, ...items: T[]): T[];
->splice : Symbol(splice, Decl(genericClassPropertyInheritanceSpecialization.ts, 14, 44))
+>splice : Symbol(KnockoutObservableArray.splice, Decl(genericClassPropertyInheritanceSpecialization.ts, 14, 44))
 >start : Symbol(start, Decl(genericClassPropertyInheritanceSpecialization.ts, 15, 11))
 >deleteCount : Symbol(deleteCount, Decl(genericClassPropertyInheritanceSpecialization.ts, 15, 25))
 >items : Symbol(items, Decl(genericClassPropertyInheritanceSpecialization.ts, 15, 47))
@@ -62,29 +62,29 @@ interface KnockoutObservableArray<T> extends KnockoutObservable<T[]> {
 >T : Symbol(T, Decl(genericClassPropertyInheritanceSpecialization.ts, 12, 34))
 
     pop(): T;
->pop : Symbol(pop, Decl(genericClassPropertyInheritanceSpecialization.ts, 15, 68))
+>pop : Symbol(KnockoutObservableArray.pop, Decl(genericClassPropertyInheritanceSpecialization.ts, 15, 68))
 >T : Symbol(T, Decl(genericClassPropertyInheritanceSpecialization.ts, 12, 34))
 
     push(...items: T[]): void;
->push : Symbol(push, Decl(genericClassPropertyInheritanceSpecialization.ts, 16, 13))
+>push : Symbol(KnockoutObservableArray.push, Decl(genericClassPropertyInheritanceSpecialization.ts, 16, 13))
 >items : Symbol(items, Decl(genericClassPropertyInheritanceSpecialization.ts, 17, 9))
 >T : Symbol(T, Decl(genericClassPropertyInheritanceSpecialization.ts, 12, 34))
 
     shift(): T;
->shift : Symbol(shift, Decl(genericClassPropertyInheritanceSpecialization.ts, 17, 30))
+>shift : Symbol(KnockoutObservableArray.shift, Decl(genericClassPropertyInheritanceSpecialization.ts, 17, 30))
 >T : Symbol(T, Decl(genericClassPropertyInheritanceSpecialization.ts, 12, 34))
 
     unshift(...items: T[]): number;
->unshift : Symbol(unshift, Decl(genericClassPropertyInheritanceSpecialization.ts, 18, 15))
+>unshift : Symbol(KnockoutObservableArray.unshift, Decl(genericClassPropertyInheritanceSpecialization.ts, 18, 15))
 >items : Symbol(items, Decl(genericClassPropertyInheritanceSpecialization.ts, 19, 12))
 >T : Symbol(T, Decl(genericClassPropertyInheritanceSpecialization.ts, 12, 34))
 
     reverse(): T[];
->reverse : Symbol(reverse, Decl(genericClassPropertyInheritanceSpecialization.ts, 19, 35))
+>reverse : Symbol(KnockoutObservableArray.reverse, Decl(genericClassPropertyInheritanceSpecialization.ts, 19, 35))
 >T : Symbol(T, Decl(genericClassPropertyInheritanceSpecialization.ts, 12, 34))
 
     sort(compareFunction?: (a: T, b: T) => number): void;
->sort : Symbol(sort, Decl(genericClassPropertyInheritanceSpecialization.ts, 20, 19))
+>sort : Symbol(KnockoutObservableArray.sort, Decl(genericClassPropertyInheritanceSpecialization.ts, 20, 19))
 >compareFunction : Symbol(compareFunction, Decl(genericClassPropertyInheritanceSpecialization.ts, 21, 9))
 >a : Symbol(a, Decl(genericClassPropertyInheritanceSpecialization.ts, 21, 28))
 >T : Symbol(T, Decl(genericClassPropertyInheritanceSpecialization.ts, 12, 34))
@@ -92,31 +92,31 @@ interface KnockoutObservableArray<T> extends KnockoutObservable<T[]> {
 >T : Symbol(T, Decl(genericClassPropertyInheritanceSpecialization.ts, 12, 34))
 
     replace(oldItem: T, newItem: T): void;
->replace : Symbol(replace, Decl(genericClassPropertyInheritanceSpecialization.ts, 21, 57))
+>replace : Symbol(KnockoutObservableArray.replace, Decl(genericClassPropertyInheritanceSpecialization.ts, 21, 57))
 >oldItem : Symbol(oldItem, Decl(genericClassPropertyInheritanceSpecialization.ts, 22, 12))
 >T : Symbol(T, Decl(genericClassPropertyInheritanceSpecialization.ts, 12, 34))
 >newItem : Symbol(newItem, Decl(genericClassPropertyInheritanceSpecialization.ts, 22, 23))
 >T : Symbol(T, Decl(genericClassPropertyInheritanceSpecialization.ts, 12, 34))
 
     remove(item: T): T[];
->remove : Symbol(remove, Decl(genericClassPropertyInheritanceSpecialization.ts, 22, 42))
+>remove : Symbol(KnockoutObservableArray.remove, Decl(genericClassPropertyInheritanceSpecialization.ts, 22, 42))
 >item : Symbol(item, Decl(genericClassPropertyInheritanceSpecialization.ts, 23, 11))
 >T : Symbol(T, Decl(genericClassPropertyInheritanceSpecialization.ts, 12, 34))
 >T : Symbol(T, Decl(genericClassPropertyInheritanceSpecialization.ts, 12, 34))
 
     removeAll(items?: T[]): T[];
->removeAll : Symbol(removeAll, Decl(genericClassPropertyInheritanceSpecialization.ts, 23, 25))
+>removeAll : Symbol(KnockoutObservableArray.removeAll, Decl(genericClassPropertyInheritanceSpecialization.ts, 23, 25))
 >items : Symbol(items, Decl(genericClassPropertyInheritanceSpecialization.ts, 24, 14))
 >T : Symbol(T, Decl(genericClassPropertyInheritanceSpecialization.ts, 12, 34))
 >T : Symbol(T, Decl(genericClassPropertyInheritanceSpecialization.ts, 12, 34))
 
     destroy(item: T): void;
->destroy : Symbol(destroy, Decl(genericClassPropertyInheritanceSpecialization.ts, 24, 32))
+>destroy : Symbol(KnockoutObservableArray.destroy, Decl(genericClassPropertyInheritanceSpecialization.ts, 24, 32))
 >item : Symbol(item, Decl(genericClassPropertyInheritanceSpecialization.ts, 25, 12))
 >T : Symbol(T, Decl(genericClassPropertyInheritanceSpecialization.ts, 12, 34))
 
     destroyAll(items?: T[]): void;
->destroyAll : Symbol(destroyAll, Decl(genericClassPropertyInheritanceSpecialization.ts, 25, 27))
+>destroyAll : Symbol(KnockoutObservableArray.destroyAll, Decl(genericClassPropertyInheritanceSpecialization.ts, 25, 27))
 >items : Symbol(items, Decl(genericClassPropertyInheritanceSpecialization.ts, 26, 15))
 >T : Symbol(T, Decl(genericClassPropertyInheritanceSpecialization.ts, 12, 34))
 }
@@ -125,7 +125,7 @@ interface KnockoutObservableArrayStatic {
 >KnockoutObservableArrayStatic : Symbol(KnockoutObservableArrayStatic, Decl(genericClassPropertyInheritanceSpecialization.ts, 27, 1))
 
     fn: KnockoutObservableArray<any>;
->fn : Symbol(fn, Decl(genericClassPropertyInheritanceSpecialization.ts, 29, 41))
+>fn : Symbol(KnockoutObservableArrayStatic.fn, Decl(genericClassPropertyInheritanceSpecialization.ts, 29, 41))
 >KnockoutObservableArray : Symbol(KnockoutObservableArray, Decl(genericClassPropertyInheritanceSpecialization.ts, 10, 1))
 
     <T>(value?: T[]): KnockoutObservableArray<T>;
@@ -154,18 +154,18 @@ module Portal.Controls.Validators {
 >TValue : Symbol(TValue, Decl(genericClassPropertyInheritanceSpecialization.ts, 41, 27))
 
         private _subscription;
->_subscription : Symbol(_subscription, Decl(genericClassPropertyInheritanceSpecialization.ts, 41, 36))
+>_subscription : Symbol(Validator._subscription, Decl(genericClassPropertyInheritanceSpecialization.ts, 41, 36))
 
         public message: KnockoutObservable<string>;
->message : Symbol(message, Decl(genericClassPropertyInheritanceSpecialization.ts, 42, 30))
+>message : Symbol(Validator.message, Decl(genericClassPropertyInheritanceSpecialization.ts, 42, 30))
 >KnockoutObservable : Symbol(KnockoutObservable, Decl(genericClassPropertyInheritanceSpecialization.ts, 4, 1))
 
         public validationState: KnockoutObservable<number>;
->validationState : Symbol(validationState, Decl(genericClassPropertyInheritanceSpecialization.ts, 43, 51))
+>validationState : Symbol(Validator.validationState, Decl(genericClassPropertyInheritanceSpecialization.ts, 43, 51))
 >KnockoutObservable : Symbol(KnockoutObservable, Decl(genericClassPropertyInheritanceSpecialization.ts, 4, 1))
 
         public validate: KnockoutObservable<TValue>;
->validate : Symbol(validate, Decl(genericClassPropertyInheritanceSpecialization.ts, 44, 59))
+>validate : Symbol(Validator.validate, Decl(genericClassPropertyInheritanceSpecialization.ts, 44, 59))
 >KnockoutObservable : Symbol(KnockoutObservable, Decl(genericClassPropertyInheritanceSpecialization.ts, 4, 1))
 >TValue : Symbol(TValue, Decl(genericClassPropertyInheritanceSpecialization.ts, 41, 27))
 
@@ -173,10 +173,10 @@ module Portal.Controls.Validators {
 >message : Symbol(message, Decl(genericClassPropertyInheritanceSpecialization.ts, 46, 20))
 
         public destroy(): void { }
->destroy : Symbol(destroy, Decl(genericClassPropertyInheritanceSpecialization.ts, 46, 41))
+>destroy : Symbol(Validator.destroy, Decl(genericClassPropertyInheritanceSpecialization.ts, 46, 41))
 
         public _validate(value: TValue): number {return 0 }
->_validate : Symbol(_validate, Decl(genericClassPropertyInheritanceSpecialization.ts, 47, 34))
+>_validate : Symbol(Validator._validate, Decl(genericClassPropertyInheritanceSpecialization.ts, 47, 34))
 >value : Symbol(value, Decl(genericClassPropertyInheritanceSpecialization.ts, 48, 25))
 >TValue : Symbol(TValue, Decl(genericClassPropertyInheritanceSpecialization.ts, 41, 27))
     }
@@ -216,7 +216,7 @@ interface Contract<TValue> {
 >TValue : Symbol(TValue, Decl(genericClassPropertyInheritanceSpecialization.ts, 63, 19))
 
     validators: KnockoutObservableArray<PortalFx.ViewModels.Controls.Validators.Validator<TValue>>;
->validators : Symbol(validators, Decl(genericClassPropertyInheritanceSpecialization.ts, 63, 28))
+>validators : Symbol(Contract.validators, Decl(genericClassPropertyInheritanceSpecialization.ts, 63, 28))
 >KnockoutObservableArray : Symbol(KnockoutObservableArray, Decl(genericClassPropertyInheritanceSpecialization.ts, 10, 1))
 >PortalFx : Symbol(PortalFx, Decl(genericClassPropertyInheritanceSpecialization.ts, 50, 1))
 >ViewModels : Symbol(PortalFx.ViewModels, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 16))
@@ -234,7 +234,7 @@ class ViewModel<TValue> implements Contract<TValue> {
 >TValue : Symbol(TValue, Decl(genericClassPropertyInheritanceSpecialization.ts, 69, 16))
 
     public validators: KnockoutObservableArray<PortalFx.ViewModels.Controls.Validators.Validator<TValue>> = ko.observableArray<PortalFx.ViewModels.Controls.Validators.Validator<TValue>>();
->validators : Symbol(validators, Decl(genericClassPropertyInheritanceSpecialization.ts, 69, 53))
+>validators : Symbol(ViewModel.validators, Decl(genericClassPropertyInheritanceSpecialization.ts, 69, 53))
 >KnockoutObservableArray : Symbol(KnockoutObservableArray, Decl(genericClassPropertyInheritanceSpecialization.ts, 10, 1))
 >PortalFx : Symbol(PortalFx, Decl(genericClassPropertyInheritanceSpecialization.ts, 50, 1))
 >ViewModels : Symbol(PortalFx.ViewModels, Decl(genericClassPropertyInheritanceSpecialization.ts, 52, 16))
diff --git a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.symbols b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.symbols
index a178f5b97e8..c7d369987c9 100644
--- a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.symbols
+++ b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.symbols
@@ -6,17 +6,17 @@ class C {
 >C : Symbol(C, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 0, 0))
 
     x: string;
->x : Symbol(x, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 3, 9))
+>x : Symbol(C.x, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 3, 9))
 }
 
 class D {
 >D : Symbol(D, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 5, 1))
 
     x: string;
->x : Symbol(x, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 7, 9))
+>x : Symbol(D.x, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 7, 9))
 
     y: string;
->y : Symbol(y, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 8, 14))
+>y : Symbol(D.y, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 8, 14))
 }
 
 class X<T> {
@@ -24,7 +24,7 @@ class X<T> {
 >T : Symbol(T, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 12, 8))
 
     x: T;
->x : Symbol(x, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 12, 12))
+>x : Symbol(X.x, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 12, 12))
 >T : Symbol(T, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 12, 8))
 }
 
@@ -37,7 +37,7 @@ module Class {
 >x : Symbol(x, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 17, 23))
 
         foo<T extends { x: string }>(t: X<T>, t2: X<T>) {
->foo : Symbol(foo, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 17, 38))
+>foo : Symbol(G.foo, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 17, 38))
 >T : Symbol(T, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 18, 12))
 >x : Symbol(x, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 18, 23))
 >t : Symbol(t, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 18, 37))
@@ -94,7 +94,7 @@ module Class {
 >C : Symbol(C, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 0, 0))
 
         foo2<T extends C>(t: X<T>, t2: X<T>) {
->foo2 : Symbol(foo2, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 30, 27))
+>foo2 : Symbol(G2.foo2, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 30, 27))
 >T : Symbol(T, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 31, 13))
 >C : Symbol(C, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 0, 0))
 >t : Symbol(t, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 31, 26))
@@ -143,7 +143,7 @@ module Interface {
 >x : Symbol(x, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 42, 27))
 
         foo<T extends { x: string }>(t: X<T>, t2: X<T>): T;
->foo : Symbol(foo, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 42, 42))
+>foo : Symbol(G.foo, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 42, 42))
 >T : Symbol(T, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 43, 12))
 >x : Symbol(x, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 43, 23))
 >t : Symbol(t, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 43, 37))
@@ -193,7 +193,7 @@ module Interface {
 >C : Symbol(C, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 0, 0))
 
         foo2<T extends C>(t: X<T>, t2: X<T>): T;
->foo2 : Symbol(foo2, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 52, 31))
+>foo2 : Symbol(G2.foo2, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 52, 31))
 >T : Symbol(T, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 53, 13))
 >C : Symbol(C, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 0, 0))
 >t : Symbol(t, Decl(genericClassWithObjectTypeArgsAndConstraints.ts, 53, 26))
diff --git a/tests/baselines/reference/genericClassWithStaticFactory.symbols b/tests/baselines/reference/genericClassWithStaticFactory.symbols
index 47b7f5f736b..eb4c58ab3cc 100644
--- a/tests/baselines/reference/genericClassWithStaticFactory.symbols
+++ b/tests/baselines/reference/genericClassWithStaticFactory.symbols
@@ -7,36 +7,36 @@ module Editor {
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22))
 
         public next: List<T>;
->next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22))
 
         public prev: List<T>;
->prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22))
 
         private listFactory: ListFactory<T>;
->listFactory : Symbol(listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
+>listFactory : Symbol(List.listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
 >ListFactory : Symbol(ListFactory, Decl(genericClassWithStaticFactory.ts, 106, 5))
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22))
 
         constructor(public isHead: boolean, public data: T) {
->isHead : Symbol(isHead, Decl(genericClassWithStaticFactory.ts, 7, 20))
->data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 7, 43))
+>isHead : Symbol(List.isHead, Decl(genericClassWithStaticFactory.ts, 7, 20))
+>data : Symbol(List.data, Decl(genericClassWithStaticFactory.ts, 7, 43))
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22))
 
             this.listFactory = new ListFactory<T>();
->this.listFactory : Symbol(listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
+>this.listFactory : Symbol(List.listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->listFactory : Symbol(listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
+>listFactory : Symbol(List.listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
 >ListFactory : Symbol(ListFactory, Decl(genericClassWithStaticFactory.ts, 106, 5))
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22))
            
         }
 
         public add(data: T): List<T> {
->add : Symbol(add, Decl(genericClassWithStaticFactory.ts, 10, 9))
+>add : Symbol(List.add, Decl(genericClassWithStaticFactory.ts, 10, 9))
 >data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 12, 19))
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22))
 >List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
@@ -45,17 +45,17 @@ module Editor {
             var entry = this.listFactory.MakeEntry(data);
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 13, 15))
 >this.listFactory.MakeEntry : Symbol(ListFactory.MakeEntry, Decl(genericClassWithStaticFactory.ts, 115, 9))
->this.listFactory : Symbol(listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
+>this.listFactory : Symbol(List.listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->listFactory : Symbol(listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
+>listFactory : Symbol(List.listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
 >MakeEntry : Symbol(ListFactory.MakeEntry, Decl(genericClassWithStaticFactory.ts, 115, 9))
 >data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 12, 19))
             
             this.prev.next = entry;
 >this.prev.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
->this.prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>this.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 13, 15))
 
@@ -69,14 +69,14 @@ module Editor {
 >entry.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 13, 15))
 >prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
->this.prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>this.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 
             this.prev = entry;
->this.prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>this.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 13, 15))
 
             return entry;
@@ -84,7 +84,7 @@ module Editor {
         }
 
         public count(): number {
->count : Symbol(count, Decl(genericClassWithStaticFactory.ts, 20, 9))
+>count : Symbol(List.count, Decl(genericClassWithStaticFactory.ts, 20, 9))
 
             var entry: List<T>;
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 23, 15))
@@ -96,9 +96,9 @@ module Editor {
 
             entry = this.next;
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 23, 15))
->this.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>this.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 
             for (i = 0; !(entry.isHead); i++) {
 >i : Symbol(i, Decl(genericClassWithStaticFactory.ts, 24, 15))
@@ -119,29 +119,29 @@ module Editor {
         }
 
         public isEmpty(): boolean {
->isEmpty : Symbol(isEmpty, Decl(genericClassWithStaticFactory.ts, 32, 9))
+>isEmpty : Symbol(List.isEmpty, Decl(genericClassWithStaticFactory.ts, 32, 9))
 
             return (this.next == this);
->this.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>this.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
         }
 
         public first(): T {
->first : Symbol(first, Decl(genericClassWithStaticFactory.ts, 36, 9))
+>first : Symbol(List.first, Decl(genericClassWithStaticFactory.ts, 36, 9))
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22))
 
             if (this.isEmpty())
->this.isEmpty : Symbol(isEmpty, Decl(genericClassWithStaticFactory.ts, 32, 9))
+>this.isEmpty : Symbol(List.isEmpty, Decl(genericClassWithStaticFactory.ts, 32, 9))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->isEmpty : Symbol(isEmpty, Decl(genericClassWithStaticFactory.ts, 32, 9))
+>isEmpty : Symbol(List.isEmpty, Decl(genericClassWithStaticFactory.ts, 32, 9))
             {
                 return this.next.data;
 >this.next.data : Symbol(List.data, Decl(genericClassWithStaticFactory.ts, 7, 43))
->this.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>this.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >data : Symbol(List.data, Decl(genericClassWithStaticFactory.ts, 7, 43))
             }
             else {
@@ -150,7 +150,7 @@ module Editor {
         }
 
         public pushEntry(entry: List<T>): void {
->pushEntry : Symbol(pushEntry, Decl(genericClassWithStaticFactory.ts, 46, 9))
+>pushEntry : Symbol(List.pushEntry, Decl(genericClassWithStaticFactory.ts, 46, 9))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 48, 25))
 >List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22))
@@ -164,9 +164,9 @@ module Editor {
 >entry.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 48, 25))
 >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
->this.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>this.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 
             entry.prev = this;
 >entry.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
@@ -175,9 +175,9 @@ module Editor {
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 
             this.next = entry;
->this.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>this.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 48, 25))
 
             entry.next.prev = entry; // entry.next.prev does not show intellisense, but entry.prev.prev does
@@ -190,16 +190,16 @@ module Editor {
         }
 
         public push(data: T): void {
->push : Symbol(push, Decl(genericClassWithStaticFactory.ts, 54, 9))
+>push : Symbol(List.push, Decl(genericClassWithStaticFactory.ts, 54, 9))
 >data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 56, 20))
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22))
 
             var entry = this.listFactory.MakeEntry(data);
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 57, 15))
 >this.listFactory.MakeEntry : Symbol(ListFactory.MakeEntry, Decl(genericClassWithStaticFactory.ts, 115, 9))
->this.listFactory : Symbol(listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
+>this.listFactory : Symbol(List.listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->listFactory : Symbol(listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
+>listFactory : Symbol(List.listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
 >MakeEntry : Symbol(ListFactory.MakeEntry, Decl(genericClassWithStaticFactory.ts, 115, 9))
 >data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 56, 20))
 
@@ -218,9 +218,9 @@ module Editor {
 >entry.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 57, 15))
 >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
->this.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>this.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 
             entry.prev = this;
 >entry.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
@@ -229,9 +229,9 @@ module Editor {
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 
             this.next = entry;
->this.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>this.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 57, 15))
 
             entry.next.prev = entry;  // entry.next.prev does not show intellisense, but entry.prev.prev does
@@ -244,7 +244,7 @@ module Editor {
         }
 
         public popEntry(head: List<T>): List<T> {
->popEntry : Symbol(popEntry, Decl(genericClassWithStaticFactory.ts, 64, 9))
+>popEntry : Symbol(List.popEntry, Decl(genericClassWithStaticFactory.ts, 64, 9))
 >head : Symbol(head, Decl(genericClassWithStaticFactory.ts, 66, 24))
 >List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22))
@@ -253,9 +253,9 @@ module Editor {
 
             if (this.next.isHead) {
 >this.next.isHead : Symbol(List.isHead, Decl(genericClassWithStaticFactory.ts, 7, 20))
->this.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>this.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >isHead : Symbol(List.isHead, Decl(genericClassWithStaticFactory.ts, 7, 20))
 
                 return null;
@@ -263,18 +263,18 @@ module Editor {
             else {
                 return this.listFactory.RemoveEntry(this.next);
 >this.listFactory.RemoveEntry : Symbol(ListFactory.RemoveEntry, Decl(genericClassWithStaticFactory.ts, 122, 9))
->this.listFactory : Symbol(listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
+>this.listFactory : Symbol(List.listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->listFactory : Symbol(listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
+>listFactory : Symbol(List.listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
 >RemoveEntry : Symbol(ListFactory.RemoveEntry, Decl(genericClassWithStaticFactory.ts, 122, 9))
->this.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>this.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
             }
         }
 
         public insertEntry(entry: List<T>): List<T> {
->insertEntry : Symbol(insertEntry, Decl(genericClassWithStaticFactory.ts, 73, 9))
+>insertEntry : Symbol(List.insertEntry, Decl(genericClassWithStaticFactory.ts, 73, 9))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 75, 27))
 >List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22))
@@ -288,9 +288,9 @@ module Editor {
 
             this.prev.next = entry;
 >this.prev.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
->this.prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>this.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 75, 27))
 
@@ -304,14 +304,14 @@ module Editor {
 >entry.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 75, 27))
 >prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
->this.prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>this.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 
             this.prev = entry;
->this.prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>this.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 75, 27))
 
             return entry;
@@ -319,7 +319,7 @@ module Editor {
         }
 
         public insertAfter(data: T): List<T> {
->insertAfter : Symbol(insertAfter, Decl(genericClassWithStaticFactory.ts, 82, 9))
+>insertAfter : Symbol(List.insertAfter, Decl(genericClassWithStaticFactory.ts, 82, 9))
 >data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 84, 27))
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22))
 >List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
@@ -330,9 +330,9 @@ module Editor {
 >List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22))
 >this.listFactory.MakeEntry : Symbol(ListFactory.MakeEntry, Decl(genericClassWithStaticFactory.ts, 115, 9))
->this.listFactory : Symbol(listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
+>this.listFactory : Symbol(List.listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->listFactory : Symbol(listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
+>listFactory : Symbol(List.listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
 >MakeEntry : Symbol(ListFactory.MakeEntry, Decl(genericClassWithStaticFactory.ts, 115, 9))
 >data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 84, 27))
 
@@ -340,9 +340,9 @@ module Editor {
 >entry.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 85, 15))
 >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
->this.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>this.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 
             entry.prev = this;
 >entry.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
@@ -351,9 +351,9 @@ module Editor {
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 
             this.next = entry;
->this.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>this.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 85, 15))
 
             entry.next.prev = entry;// entry.next.prev does not show intellisense, but entry.prev.prev does
@@ -369,7 +369,7 @@ module Editor {
         }
 
         public insertEntryBefore(entry: List<T>): List<T> {
->insertEntryBefore : Symbol(insertEntryBefore, Decl(genericClassWithStaticFactory.ts, 91, 9))
+>insertEntryBefore : Symbol(List.insertEntryBefore, Decl(genericClassWithStaticFactory.ts, 91, 9))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 93, 33))
 >List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22))
@@ -378,9 +378,9 @@ module Editor {
 
             this.prev.next = entry;
 >this.prev.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
->this.prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>this.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 93, 33))
 
@@ -394,14 +394,14 @@ module Editor {
 >entry.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 93, 33))
 >prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
->this.prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>this.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 
             this.prev = entry;
->this.prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>this.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 93, 33))
 
             return entry;
@@ -409,7 +409,7 @@ module Editor {
         }
 
         public insertBefore(data: T): List<T> {
->insertBefore : Symbol(insertBefore, Decl(genericClassWithStaticFactory.ts, 100, 9))
+>insertBefore : Symbol(List.insertBefore, Decl(genericClassWithStaticFactory.ts, 100, 9))
 >data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 102, 28))
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22))
 >List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
@@ -418,16 +418,16 @@ module Editor {
             var entry = this.listFactory.MakeEntry(data);
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 103, 15))
 >this.listFactory.MakeEntry : Symbol(ListFactory.MakeEntry, Decl(genericClassWithStaticFactory.ts, 115, 9))
->this.listFactory : Symbol(listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
+>this.listFactory : Symbol(List.listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->listFactory : Symbol(listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
+>listFactory : Symbol(List.listFactory, Decl(genericClassWithStaticFactory.ts, 4, 29))
 >MakeEntry : Symbol(ListFactory.MakeEntry, Decl(genericClassWithStaticFactory.ts, 115, 9))
 >data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 102, 28))
 
             return this.insertEntryBefore(entry);
->this.insertEntryBefore : Symbol(insertEntryBefore, Decl(genericClassWithStaticFactory.ts, 91, 9))
+>this.insertEntryBefore : Symbol(List.insertEntryBefore, Decl(genericClassWithStaticFactory.ts, 91, 9))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
->insertEntryBefore : Symbol(insertEntryBefore, Decl(genericClassWithStaticFactory.ts, 91, 9))
+>insertEntryBefore : Symbol(List.insertEntryBefore, Decl(genericClassWithStaticFactory.ts, 91, 9))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 103, 15))
         }
     }
@@ -437,7 +437,7 @@ module Editor {
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 108, 29))
 
         public MakeHead<T>(): List<T> {
->MakeHead : Symbol(MakeHead, Decl(genericClassWithStaticFactory.ts, 108, 33))
+>MakeHead : Symbol(ListFactory.MakeHead, Decl(genericClassWithStaticFactory.ts, 108, 33))
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 110, 24))
 >List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 110, 24))
@@ -466,7 +466,7 @@ module Editor {
         }
 
         public MakeEntry<T>(data: T): List<T> {
->MakeEntry : Symbol(MakeEntry, Decl(genericClassWithStaticFactory.ts, 115, 9))
+>MakeEntry : Symbol(ListFactory.MakeEntry, Decl(genericClassWithStaticFactory.ts, 115, 9))
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 117, 25))
 >data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 117, 28))
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 117, 25))
@@ -498,7 +498,7 @@ module Editor {
         }
 
         public RemoveEntry<T>(entry: List<T>): List<T> {
->RemoveEntry : Symbol(RemoveEntry, Decl(genericClassWithStaticFactory.ts, 122, 9))
+>RemoveEntry : Symbol(ListFactory.RemoveEntry, Decl(genericClassWithStaticFactory.ts, 122, 9))
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 124, 27))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 124, 30))
 >List : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
diff --git a/tests/baselines/reference/genericClasses0.symbols b/tests/baselines/reference/genericClasses0.symbols
index 764cd04c962..57fbb65056f 100644
--- a/tests/baselines/reference/genericClasses0.symbols
+++ b/tests/baselines/reference/genericClasses0.symbols
@@ -4,7 +4,7 @@ class C<T> {
 >T : Symbol(T, Decl(genericClasses0.ts, 0, 8))
 
 	public x: T;
->x : Symbol(x, Decl(genericClasses0.ts, 0, 12))
+>x : Symbol(C.x, Decl(genericClasses0.ts, 0, 12))
 >T : Symbol(T, Decl(genericClasses0.ts, 0, 8))
 }
 
diff --git a/tests/baselines/reference/genericClasses1.symbols b/tests/baselines/reference/genericClasses1.symbols
index d2100b5e3b3..fbbd3110cdf 100644
--- a/tests/baselines/reference/genericClasses1.symbols
+++ b/tests/baselines/reference/genericClasses1.symbols
@@ -4,7 +4,7 @@ class C<T> {
 >T : Symbol(T, Decl(genericClasses1.ts, 0, 8))
 
 	public x: T;
->x : Symbol(x, Decl(genericClasses1.ts, 0, 12))
+>x : Symbol(C.x, Decl(genericClasses1.ts, 0, 12))
 >T : Symbol(T, Decl(genericClasses1.ts, 0, 8))
 }
 
diff --git a/tests/baselines/reference/genericClasses2.symbols b/tests/baselines/reference/genericClasses2.symbols
index e9af0c44941..a5153a26fc3 100644
--- a/tests/baselines/reference/genericClasses2.symbols
+++ b/tests/baselines/reference/genericClasses2.symbols
@@ -4,7 +4,7 @@ interface Foo<T> {
 >T : Symbol(T, Decl(genericClasses2.ts, 0, 14))
 
 	a: T;
->a : Symbol(a, Decl(genericClasses2.ts, 0, 18))
+>a : Symbol(Foo.a, Decl(genericClasses2.ts, 0, 18))
 >T : Symbol(T, Decl(genericClasses2.ts, 0, 14))
 }
 
@@ -13,16 +13,16 @@ class C<T> {
 >T : Symbol(T, Decl(genericClasses2.ts, 4, 8))
 
 	public x: T;
->x : Symbol(x, Decl(genericClasses2.ts, 4, 12))
+>x : Symbol(C.x, Decl(genericClasses2.ts, 4, 12))
 >T : Symbol(T, Decl(genericClasses2.ts, 4, 8))
 
 	public y: Foo<T>;
->y : Symbol(y, Decl(genericClasses2.ts, 5, 13))
+>y : Symbol(C.y, Decl(genericClasses2.ts, 5, 13))
 >Foo : Symbol(Foo, Decl(genericClasses2.ts, 0, 0))
 >T : Symbol(T, Decl(genericClasses2.ts, 4, 8))
 
 	public z: Foo<number>;
->z : Symbol(z, Decl(genericClasses2.ts, 6, 18))
+>z : Symbol(C.z, Decl(genericClasses2.ts, 6, 18))
 >Foo : Symbol(Foo, Decl(genericClasses2.ts, 0, 0))
 }
 
diff --git a/tests/baselines/reference/genericClasses3.symbols b/tests/baselines/reference/genericClasses3.symbols
index 06b0d8437d5..31b99b4247d 100644
--- a/tests/baselines/reference/genericClasses3.symbols
+++ b/tests/baselines/reference/genericClasses3.symbols
@@ -4,11 +4,11 @@ class B<T> {
 >T : Symbol(T, Decl(genericClasses3.ts, 0, 8))
 
     a: T;
->a : Symbol(a, Decl(genericClasses3.ts, 0, 12))
+>a : Symbol(B.a, Decl(genericClasses3.ts, 0, 12))
 >T : Symbol(T, Decl(genericClasses3.ts, 0, 8))
 
     b: T;
->b : Symbol(b, Decl(genericClasses3.ts, 1, 9))
+>b : Symbol(B.b, Decl(genericClasses3.ts, 1, 9))
 >T : Symbol(T, Decl(genericClasses3.ts, 0, 8))
 }
 
@@ -19,7 +19,7 @@ class C<T> extends B<T> {
 >T : Symbol(T, Decl(genericClasses3.ts, 5, 8))
 
     public x: T;
->x : Symbol(x, Decl(genericClasses3.ts, 5, 25))
+>x : Symbol(C.x, Decl(genericClasses3.ts, 5, 25))
 >T : Symbol(T, Decl(genericClasses3.ts, 5, 8))
 }
 
diff --git a/tests/baselines/reference/genericClasses4.symbols b/tests/baselines/reference/genericClasses4.symbols
index d910cbc152d..651d61528b5 100644
--- a/tests/baselines/reference/genericClasses4.symbols
+++ b/tests/baselines/reference/genericClasses4.symbols
@@ -5,13 +5,13 @@ class Vec2_T<A>
 >A : Symbol(A, Decl(genericClasses4.ts, 1, 13))
 {
     constructor(public x: A, public y: A) { }
->x : Symbol(x, Decl(genericClasses4.ts, 3, 16))
+>x : Symbol(Vec2_T.x, Decl(genericClasses4.ts, 3, 16))
 >A : Symbol(A, Decl(genericClasses4.ts, 1, 13))
->y : Symbol(y, Decl(genericClasses4.ts, 3, 28))
+>y : Symbol(Vec2_T.y, Decl(genericClasses4.ts, 3, 28))
 >A : Symbol(A, Decl(genericClasses4.ts, 1, 13))
 
     fmap<B>(f: (a: A) => B): Vec2_T<B> {
->fmap : Symbol(fmap, Decl(genericClasses4.ts, 3, 45))
+>fmap : Symbol(Vec2_T.fmap, Decl(genericClasses4.ts, 3, 45))
 >B : Symbol(B, Decl(genericClasses4.ts, 4, 9))
 >f : Symbol(f, Decl(genericClasses4.ts, 4, 12))
 >a : Symbol(a, Decl(genericClasses4.ts, 4, 16))
@@ -24,17 +24,17 @@ class Vec2_T<A>
 >x : Symbol(x, Decl(genericClasses4.ts, 5, 11))
 >B : Symbol(B, Decl(genericClasses4.ts, 4, 9))
 >f : Symbol(f, Decl(genericClasses4.ts, 4, 12))
->this.x : Symbol(x, Decl(genericClasses4.ts, 3, 16))
+>this.x : Symbol(Vec2_T.x, Decl(genericClasses4.ts, 3, 16))
 >this : Symbol(Vec2_T, Decl(genericClasses4.ts, 0, 0))
->x : Symbol(x, Decl(genericClasses4.ts, 3, 16))
+>x : Symbol(Vec2_T.x, Decl(genericClasses4.ts, 3, 16))
 
         var y:B = f(this.y);
 >y : Symbol(y, Decl(genericClasses4.ts, 6, 11))
 >B : Symbol(B, Decl(genericClasses4.ts, 4, 9))
 >f : Symbol(f, Decl(genericClasses4.ts, 4, 12))
->this.y : Symbol(y, Decl(genericClasses4.ts, 3, 28))
+>this.y : Symbol(Vec2_T.y, Decl(genericClasses4.ts, 3, 28))
 >this : Symbol(Vec2_T, Decl(genericClasses4.ts, 0, 0))
->y : Symbol(y, Decl(genericClasses4.ts, 3, 28))
+>y : Symbol(Vec2_T.y, Decl(genericClasses4.ts, 3, 28))
 
         var retval: Vec2_T<B> = new Vec2_T(x, y);
 >retval : Symbol(retval, Decl(genericClasses4.ts, 7, 11))
@@ -48,7 +48,7 @@ class Vec2_T<A>
 >retval : Symbol(retval, Decl(genericClasses4.ts, 7, 11))
     }
     apply<B>(f: Vec2_T<(a: A) => B>): Vec2_T<B> {
->apply : Symbol(apply, Decl(genericClasses4.ts, 9, 5))
+>apply : Symbol(Vec2_T.apply, Decl(genericClasses4.ts, 9, 5))
 >B : Symbol(B, Decl(genericClasses4.ts, 10, 10))
 >f : Symbol(f, Decl(genericClasses4.ts, 10, 13))
 >Vec2_T : Symbol(Vec2_T, Decl(genericClasses4.ts, 0, 0))
@@ -64,9 +64,9 @@ class Vec2_T<A>
 >f.x : Symbol(Vec2_T.x, Decl(genericClasses4.ts, 3, 16))
 >f : Symbol(f, Decl(genericClasses4.ts, 10, 13))
 >x : Symbol(Vec2_T.x, Decl(genericClasses4.ts, 3, 16))
->this.x : Symbol(x, Decl(genericClasses4.ts, 3, 16))
+>this.x : Symbol(Vec2_T.x, Decl(genericClasses4.ts, 3, 16))
 >this : Symbol(Vec2_T, Decl(genericClasses4.ts, 0, 0))
->x : Symbol(x, Decl(genericClasses4.ts, 3, 16))
+>x : Symbol(Vec2_T.x, Decl(genericClasses4.ts, 3, 16))
 
         var y:B = f.y(this.y);
 >y : Symbol(y, Decl(genericClasses4.ts, 12, 11))
@@ -74,9 +74,9 @@ class Vec2_T<A>
 >f.y : Symbol(Vec2_T.y, Decl(genericClasses4.ts, 3, 28))
 >f : Symbol(f, Decl(genericClasses4.ts, 10, 13))
 >y : Symbol(Vec2_T.y, Decl(genericClasses4.ts, 3, 28))
->this.y : Symbol(y, Decl(genericClasses4.ts, 3, 28))
+>this.y : Symbol(Vec2_T.y, Decl(genericClasses4.ts, 3, 28))
 >this : Symbol(Vec2_T, Decl(genericClasses4.ts, 0, 0))
->y : Symbol(y, Decl(genericClasses4.ts, 3, 28))
+>y : Symbol(Vec2_T.y, Decl(genericClasses4.ts, 3, 28))
 
         var retval: Vec2_T<B> = new Vec2_T(x, y);
 >retval : Symbol(retval, Decl(genericClasses4.ts, 13, 11))
diff --git a/tests/baselines/reference/genericClassesInModule2.symbols b/tests/baselines/reference/genericClassesInModule2.symbols
index a767d64de07..764b5b66462 100644
--- a/tests/baselines/reference/genericClassesInModule2.symbols
+++ b/tests/baselines/reference/genericClassesInModule2.symbols
@@ -4,7 +4,7 @@ export class A<T1>{
 >T1 : Symbol(T1, Decl(genericClassesInModule2.ts, 0, 15))
 
     constructor( public callback: (self: A<T1>) => void) {
->callback : Symbol(callback, Decl(genericClassesInModule2.ts, 1, 16))
+>callback : Symbol(A.callback, Decl(genericClassesInModule2.ts, 1, 16))
 >self : Symbol(self, Decl(genericClassesInModule2.ts, 1, 35))
 >A : Symbol(A, Decl(genericClassesInModule2.ts, 0, 0))
 >T1 : Symbol(T1, Decl(genericClassesInModule2.ts, 0, 15))
@@ -15,7 +15,7 @@ export class A<T1>{
 >this : Symbol(A, Decl(genericClassesInModule2.ts, 0, 0))
     }
     AAA( callback: (self: A<T1>) => void) {
->AAA : Symbol(AAA, Decl(genericClassesInModule2.ts, 3, 5))
+>AAA : Symbol(A.AAA, Decl(genericClassesInModule2.ts, 3, 5))
 >callback : Symbol(callback, Decl(genericClassesInModule2.ts, 4, 8))
 >self : Symbol(self, Decl(genericClassesInModule2.ts, 4, 20))
 >A : Symbol(A, Decl(genericClassesInModule2.ts, 0, 0))
@@ -33,7 +33,7 @@ export interface C<T1>{
 >T1 : Symbol(T1, Decl(genericClassesInModule2.ts, 9, 19))
 
     child: B<T1>;
->child : Symbol(child, Decl(genericClassesInModule2.ts, 9, 23))
+>child : Symbol(C.child, Decl(genericClassesInModule2.ts, 9, 23))
 >B : Symbol(B, Decl(genericClassesInModule2.ts, 13, 1))
 >T1 : Symbol(T1, Decl(genericClassesInModule2.ts, 9, 19))
 
@@ -54,7 +54,7 @@ export class B<T2> {
 >T2 : Symbol(T2, Decl(genericClassesInModule2.ts, 15, 15))
 
     constructor(public parent: T2) { }
->parent : Symbol(parent, Decl(genericClassesInModule2.ts, 16, 16))
+>parent : Symbol(B.parent, Decl(genericClassesInModule2.ts, 16, 16))
 >T2 : Symbol(T2, Decl(genericClassesInModule2.ts, 15, 15))
 }
 
diff --git a/tests/baselines/reference/genericCloduleInModule.symbols b/tests/baselines/reference/genericCloduleInModule.symbols
index 0becc7469a1..34b48f1539e 100644
--- a/tests/baselines/reference/genericCloduleInModule.symbols
+++ b/tests/baselines/reference/genericCloduleInModule.symbols
@@ -7,7 +7,7 @@ module A {
 >T : Symbol(T, Decl(genericCloduleInModule.ts, 1, 19))
 
         foo() { }
->foo : Symbol(foo, Decl(genericCloduleInModule.ts, 1, 23))
+>foo : Symbol(B.foo, Decl(genericCloduleInModule.ts, 1, 23))
 
         static bar() { }
 >bar : Symbol(B.bar, Decl(genericCloduleInModule.ts, 2, 17))
diff --git a/tests/baselines/reference/genericConstraint3.symbols b/tests/baselines/reference/genericConstraint3.symbols
index 57cb9d03115..6a22a0996c0 100644
--- a/tests/baselines/reference/genericConstraint3.symbols
+++ b/tests/baselines/reference/genericConstraint3.symbols
@@ -2,7 +2,7 @@
 interface C<P> { x: P; }
 >C : Symbol(C, Decl(genericConstraint3.ts, 0, 0))
 >P : Symbol(P, Decl(genericConstraint3.ts, 0, 12))
->x : Symbol(x, Decl(genericConstraint3.ts, 0, 16))
+>x : Symbol(C.x, Decl(genericConstraint3.ts, 0, 16))
 >P : Symbol(P, Decl(genericConstraint3.ts, 0, 12))
 
 interface A<T, U extends C<T>> { x: U; }
@@ -11,7 +11,7 @@ interface A<T, U extends C<T>> { x: U; }
 >U : Symbol(U, Decl(genericConstraint3.ts, 1, 14))
 >C : Symbol(C, Decl(genericConstraint3.ts, 0, 0))
 >T : Symbol(T, Decl(genericConstraint3.ts, 1, 12))
->x : Symbol(x, Decl(genericConstraint3.ts, 1, 32))
+>x : Symbol(A.x, Decl(genericConstraint3.ts, 1, 32))
 >U : Symbol(U, Decl(genericConstraint3.ts, 1, 14))
 
 interface B extends A<{}, { x: {} }> { } // Should not produce an error
diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.symbols b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.symbols
index 68df4a89b36..57c0e6d0a21 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.symbols
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.symbols
@@ -6,12 +6,12 @@ declare module EndGate {
 >ICloneable : Symbol(ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 0, 24))
 
         Clone(): any;
->Clone : Symbol(Clone, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 1, 33))
+>Clone : Symbol(ICloneable.Clone, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 1, 33))
     }
 }
 
 interface Number extends EndGate.ICloneable { }
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(genericConstraintOnExtendedBuiltinTypes.ts, 4, 1))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(genericConstraintOnExtendedBuiltinTypes.ts, 4, 1))
 >EndGate.ICloneable : Symbol(EndGate.ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 0, 24))
 >EndGate : Symbol(EndGate, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 0, 0), Decl(genericConstraintOnExtendedBuiltinTypes.ts, 6, 47), Decl(genericConstraintOnExtendedBuiltinTypes.ts, 17, 1))
 >ICloneable : Symbol(EndGate.ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 0, 24))
@@ -26,7 +26,7 @@ module EndGate.Tweening {
 >ICloneable : Symbol(ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 0, 24))
 
         private _from: T;
->_from : Symbol(_from, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 9, 45))
+>_from : Symbol(Tween._from, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 9, 45))
 >T : Symbol(T, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 9, 23))
 
 
@@ -35,9 +35,9 @@ module EndGate.Tweening {
 >T : Symbol(T, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 9, 23))
 
             this._from = from.Clone();
->this._from : Symbol(_from, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 9, 45))
+>this._from : Symbol(Tween._from, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 9, 45))
 >this : Symbol(Tween, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 8, 25))
->_from : Symbol(_from, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 9, 45))
+>_from : Symbol(Tween._from, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 9, 45))
 >from.Clone : Symbol(ICloneable.Clone, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 1, 33))
 >from : Symbol(from, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 13, 20))
 >Clone : Symbol(ICloneable.Clone, Decl(genericConstraintOnExtendedBuiltinTypes.ts, 1, 33))
diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.symbols b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.symbols
index c5e9f0a79f5..63251ba000d 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.symbols
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.symbols
@@ -6,12 +6,12 @@ module EndGate {
 >ICloneable : Symbol(ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 0, 16))
 
         Clone(): any;
->Clone : Symbol(Clone, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 1, 33))
+>Clone : Symbol(ICloneable.Clone, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 1, 33))
     }
 }
 
 interface Number extends EndGate.ICloneable { }
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 4, 1))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 4, 1))
 >EndGate.ICloneable : Symbol(EndGate.ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 0, 16))
 >EndGate : Symbol(EndGate, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 0, 0), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 6, 47), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 16, 1))
 >ICloneable : Symbol(EndGate.ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 0, 16))
@@ -26,7 +26,7 @@ module EndGate.Tweening {
 >ICloneable : Symbol(ICloneable, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 0, 16))
 
         private _from: T;
->_from : Symbol(_from, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 9, 45))
+>_from : Symbol(Tween._from, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 9, 45))
 >T : Symbol(T, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 9, 23))
 
         constructor(from: T) {
@@ -34,9 +34,9 @@ module EndGate.Tweening {
 >T : Symbol(T, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 9, 23))
 
             this._from = from.Clone();
->this._from : Symbol(_from, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 9, 45))
+>this._from : Symbol(Tween._from, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 9, 45))
 >this : Symbol(Tween, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 8, 25))
->_from : Symbol(_from, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 9, 45))
+>_from : Symbol(Tween._from, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 9, 45))
 >from.Clone : Symbol(ICloneable.Clone, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 1, 33))
 >from : Symbol(from, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 12, 20))
 >Clone : Symbol(ICloneable.Clone, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 1, 33))
@@ -51,7 +51,7 @@ module EndGate.Tweening {
     export class NumberTween extends Tween<Number>{
 >NumberTween : Symbol(NumberTween, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 18, 25))
 >Tween : Symbol(Tween, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 8, 25))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 4, 1))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 4, 1))
 
         constructor(from: number) {
 >from : Symbol(from, Decl(genericConstraintOnExtendedBuiltinTypes2.ts, 20, 20))
diff --git a/tests/baselines/reference/genericFunctionSpecializations1.symbols b/tests/baselines/reference/genericFunctionSpecializations1.symbols
index aaf607cbd47..717e07455f4 100644
--- a/tests/baselines/reference/genericFunctionSpecializations1.symbols
+++ b/tests/baselines/reference/genericFunctionSpecializations1.symbols
@@ -18,7 +18,7 @@ function foo4<T>(test: string); // valid
 function foo4<T extends String>(test: T) { }
 >foo4 : Symbol(foo4, Decl(genericFunctionSpecializations1.ts, 1, 29), Decl(genericFunctionSpecializations1.ts, 3, 31))
 >T : Symbol(T, Decl(genericFunctionSpecializations1.ts, 4, 14))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >test : Symbol(test, Decl(genericFunctionSpecializations1.ts, 4, 32))
 >T : Symbol(T, Decl(genericFunctionSpecializations1.ts, 4, 14))
 
diff --git a/tests/baselines/reference/genericFunctions3.symbols b/tests/baselines/reference/genericFunctions3.symbols
index 8b257500325..bf071722b29 100644
--- a/tests/baselines/reference/genericFunctions3.symbols
+++ b/tests/baselines/reference/genericFunctions3.symbols
@@ -4,7 +4,7 @@ interface Query<T> {
 >T : Symbol(T, Decl(genericFunctions3.ts, 0, 16))
 
     foo(x: string): Query<T[]>;
->foo : Symbol(foo, Decl(genericFunctions3.ts, 0, 20))
+>foo : Symbol(Query.foo, Decl(genericFunctions3.ts, 0, 20))
 >x : Symbol(x, Decl(genericFunctions3.ts, 1, 8))
 >Query : Symbol(Query, Decl(genericFunctions3.ts, 0, 0))
 >T : Symbol(T, Decl(genericFunctions3.ts, 0, 16))
diff --git a/tests/baselines/reference/genericFunctionsWithOptionalParameters1.symbols b/tests/baselines/reference/genericFunctionsWithOptionalParameters1.symbols
index fd79d736ffd..e8d3e904ae0 100644
--- a/tests/baselines/reference/genericFunctionsWithOptionalParameters1.symbols
+++ b/tests/baselines/reference/genericFunctionsWithOptionalParameters1.symbols
@@ -3,7 +3,7 @@ interface Utils {
 >Utils : Symbol(Utils, Decl(genericFunctionsWithOptionalParameters1.ts, 0, 0))
 
    fold<T, S>(c?: Array<T>, folder?: (s: S, t: T) => T, init?: S): T;
->fold : Symbol(fold, Decl(genericFunctionsWithOptionalParameters1.ts, 0, 17))
+>fold : Symbol(Utils.fold, Decl(genericFunctionsWithOptionalParameters1.ts, 0, 17))
 >T : Symbol(T, Decl(genericFunctionsWithOptionalParameters1.ts, 1, 8))
 >S : Symbol(S, Decl(genericFunctionsWithOptionalParameters1.ts, 1, 10))
 >c : Symbol(c, Decl(genericFunctionsWithOptionalParameters1.ts, 1, 14))
diff --git a/tests/baselines/reference/genericFunctionsWithOptionalParameters3.symbols b/tests/baselines/reference/genericFunctionsWithOptionalParameters3.symbols
index d033f7b66bb..398c3a0e71f 100644
--- a/tests/baselines/reference/genericFunctionsWithOptionalParameters3.symbols
+++ b/tests/baselines/reference/genericFunctionsWithOptionalParameters3.symbols
@@ -4,7 +4,7 @@ class Collection<T> {
 >T : Symbol(T, Decl(genericFunctionsWithOptionalParameters3.ts, 0, 17))
 
     public add(x: T) { }
->add : Symbol(add, Decl(genericFunctionsWithOptionalParameters3.ts, 0, 21))
+>add : Symbol(Collection.add, Decl(genericFunctionsWithOptionalParameters3.ts, 0, 21))
 >x : Symbol(x, Decl(genericFunctionsWithOptionalParameters3.ts, 1, 15))
 >T : Symbol(T, Decl(genericFunctionsWithOptionalParameters3.ts, 0, 17))
 }
@@ -12,7 +12,7 @@ interface Utils {
 >Utils : Symbol(Utils, Decl(genericFunctionsWithOptionalParameters3.ts, 2, 1))
 
     fold<T, S>(c?: Collection<T>, folder?: (s: S, t: T) => T, init?: S): T;
->fold : Symbol(fold, Decl(genericFunctionsWithOptionalParameters3.ts, 3, 17))
+>fold : Symbol(Utils.fold, Decl(genericFunctionsWithOptionalParameters3.ts, 3, 17))
 >T : Symbol(T, Decl(genericFunctionsWithOptionalParameters3.ts, 4, 9))
 >S : Symbol(S, Decl(genericFunctionsWithOptionalParameters3.ts, 4, 11))
 >c : Symbol(c, Decl(genericFunctionsWithOptionalParameters3.ts, 4, 15))
@@ -29,7 +29,7 @@ interface Utils {
 >T : Symbol(T, Decl(genericFunctionsWithOptionalParameters3.ts, 4, 9))
 
     mapReduce<T, U, V>(c: Collection<T>, mapper: (x: T) => U, reducer: (y: U) => V): Collection<V>;
->mapReduce : Symbol(mapReduce, Decl(genericFunctionsWithOptionalParameters3.ts, 4, 75))
+>mapReduce : Symbol(Utils.mapReduce, Decl(genericFunctionsWithOptionalParameters3.ts, 4, 75))
 >T : Symbol(T, Decl(genericFunctionsWithOptionalParameters3.ts, 5, 14))
 >U : Symbol(U, Decl(genericFunctionsWithOptionalParameters3.ts, 5, 16))
 >V : Symbol(V, Decl(genericFunctionsWithOptionalParameters3.ts, 5, 19))
@@ -63,7 +63,7 @@ var r3 = utils.mapReduce(c, (x) => { return 1 }, (y) => { return new Date() });
 >c : Symbol(c, Decl(genericFunctionsWithOptionalParameters3.ts, 8, 3))
 >x : Symbol(x, Decl(genericFunctionsWithOptionalParameters3.ts, 9, 29))
 >y : Symbol(y, Decl(genericFunctionsWithOptionalParameters3.ts, 9, 50))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var r4 = utils.mapReduce(c, (x: string) => { return 1 }, (y: number) => { return new Date() });
 >r4 : Symbol(r4, Decl(genericFunctionsWithOptionalParameters3.ts, 10, 3))
@@ -73,7 +73,7 @@ var r4 = utils.mapReduce(c, (x: string) => { return 1 }, (y: number) => { return
 >c : Symbol(c, Decl(genericFunctionsWithOptionalParameters3.ts, 8, 3))
 >x : Symbol(x, Decl(genericFunctionsWithOptionalParameters3.ts, 10, 29))
 >y : Symbol(y, Decl(genericFunctionsWithOptionalParameters3.ts, 10, 58))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var f1 = (x: string) => { return 1 };
 >f1 : Symbol(f1, Decl(genericFunctionsWithOptionalParameters3.ts, 11, 3))
@@ -82,7 +82,7 @@ var f1 = (x: string) => { return 1 };
 var f2 = (y: number) => { return new Date() };
 >f2 : Symbol(f2, Decl(genericFunctionsWithOptionalParameters3.ts, 12, 3))
 >y : Symbol(y, Decl(genericFunctionsWithOptionalParameters3.ts, 12, 10))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var r5 = utils.mapReduce(c, f1, f2);
 >r5 : Symbol(r5, Decl(genericFunctionsWithOptionalParameters3.ts, 13, 3))
diff --git a/tests/baselines/reference/genericImplements.symbols b/tests/baselines/reference/genericImplements.symbols
index b3bffdc1b6d..21d56ab08f1 100644
--- a/tests/baselines/reference/genericImplements.symbols
+++ b/tests/baselines/reference/genericImplements.symbols
@@ -1,17 +1,17 @@
 === tests/cases/compiler/genericImplements.ts ===
 class A { a; };
 >A : Symbol(A, Decl(genericImplements.ts, 0, 0))
->a : Symbol(a, Decl(genericImplements.ts, 0, 9))
+>a : Symbol(A.a, Decl(genericImplements.ts, 0, 9))
 
 class B { b; };
 >B : Symbol(B, Decl(genericImplements.ts, 0, 15))
->b : Symbol(b, Decl(genericImplements.ts, 1, 9))
+>b : Symbol(B.b, Decl(genericImplements.ts, 1, 9))
 
 interface I {
 >I : Symbol(I, Decl(genericImplements.ts, 1, 15))
 
     f<T extends A>(): T;
->f : Symbol(f, Decl(genericImplements.ts, 2, 13))
+>f : Symbol(I.f, Decl(genericImplements.ts, 2, 13))
 >T : Symbol(T, Decl(genericImplements.ts, 3, 6))
 >A : Symbol(A, Decl(genericImplements.ts, 0, 0))
 >T : Symbol(T, Decl(genericImplements.ts, 3, 6))
@@ -24,7 +24,7 @@ class X implements I {
 >I : Symbol(I, Decl(genericImplements.ts, 1, 15))
 
     f<T extends B>(): T { return undefined; }
->f : Symbol(f, Decl(genericImplements.ts, 7, 22))
+>f : Symbol(X.f, Decl(genericImplements.ts, 7, 22))
 >T : Symbol(T, Decl(genericImplements.ts, 8, 6))
 >B : Symbol(B, Decl(genericImplements.ts, 0, 15))
 >T : Symbol(T, Decl(genericImplements.ts, 8, 6))
@@ -38,7 +38,7 @@ class Y implements I {
 >I : Symbol(I, Decl(genericImplements.ts, 1, 15))
 
     f<T extends A>(): T { return undefined; }
->f : Symbol(f, Decl(genericImplements.ts, 12, 22))
+>f : Symbol(Y.f, Decl(genericImplements.ts, 12, 22))
 >T : Symbol(T, Decl(genericImplements.ts, 13, 6))
 >A : Symbol(A, Decl(genericImplements.ts, 0, 0))
 >T : Symbol(T, Decl(genericImplements.ts, 13, 6))
@@ -52,7 +52,7 @@ class Z implements I {
 >I : Symbol(I, Decl(genericImplements.ts, 1, 15))
 
     f<T>(): T { return undefined; }
->f : Symbol(f, Decl(genericImplements.ts, 17, 22))
+>f : Symbol(Z.f, Decl(genericImplements.ts, 17, 22))
 >T : Symbol(T, Decl(genericImplements.ts, 18, 6))
 >T : Symbol(T, Decl(genericImplements.ts, 18, 6))
 >undefined : Symbol(undefined)
diff --git a/tests/baselines/reference/genericInference2.symbols b/tests/baselines/reference/genericInference2.symbols
index 52b80747cb9..3389bf3a97b 100644
--- a/tests/baselines/reference/genericInference2.symbols
+++ b/tests/baselines/reference/genericInference2.symbols
@@ -14,13 +14,13 @@
 >T : Symbol(T, Decl(genericInference2.ts, 1, 35))
 
            N: number; 
->N : Symbol(N, Decl(genericInference2.ts, 3, 27))
+>N : Symbol(Observable.N, Decl(genericInference2.ts, 3, 27))
 
            g: boolean; 
->g : Symbol(g, Decl(genericInference2.ts, 4, 21))
+>g : Symbol(Observable.g, Decl(genericInference2.ts, 4, 21))
 
            r: T; 
->r : Symbol(r, Decl(genericInference2.ts, 5, 22))
+>r : Symbol(Observable.r, Decl(genericInference2.ts, 5, 22))
 >T : Symbol(T, Decl(genericInference2.ts, 1, 35))
        } 
        export function observable<T>(value: T): Observable<T>; 
diff --git a/tests/baselines/reference/genericInstanceOf.symbols b/tests/baselines/reference/genericInstanceOf.symbols
index c1636724892..83242a198e1 100644
--- a/tests/baselines/reference/genericInstanceOf.symbols
+++ b/tests/baselines/reference/genericInstanceOf.symbols
@@ -10,21 +10,21 @@ class C<T> {
 >T : Symbol(T, Decl(genericInstanceOf.ts, 4, 8))
 
     constructor(public a: T, public b: F) {}
->a : Symbol(a, Decl(genericInstanceOf.ts, 5, 16))
+>a : Symbol(C.a, Decl(genericInstanceOf.ts, 5, 16))
 >T : Symbol(T, Decl(genericInstanceOf.ts, 4, 8))
->b : Symbol(b, Decl(genericInstanceOf.ts, 5, 28))
+>b : Symbol(C.b, Decl(genericInstanceOf.ts, 5, 28))
 >F : Symbol(F, Decl(genericInstanceOf.ts, 0, 0))
 
     foo() {
->foo : Symbol(foo, Decl(genericInstanceOf.ts, 5, 44))
+>foo : Symbol(C.foo, Decl(genericInstanceOf.ts, 5, 44))
 
         if (this.a instanceof this.b) {
->this.a : Symbol(a, Decl(genericInstanceOf.ts, 5, 16))
+>this.a : Symbol(C.a, Decl(genericInstanceOf.ts, 5, 16))
 >this : Symbol(C, Decl(genericInstanceOf.ts, 2, 1))
->a : Symbol(a, Decl(genericInstanceOf.ts, 5, 16))
->this.b : Symbol(b, Decl(genericInstanceOf.ts, 5, 28))
+>a : Symbol(C.a, Decl(genericInstanceOf.ts, 5, 16))
+>this.b : Symbol(C.b, Decl(genericInstanceOf.ts, 5, 28))
 >this : Symbol(C, Decl(genericInstanceOf.ts, 2, 1))
->b : Symbol(b, Decl(genericInstanceOf.ts, 5, 28))
+>b : Symbol(C.b, Decl(genericInstanceOf.ts, 5, 28))
         }
     }
 }
diff --git a/tests/baselines/reference/genericInstantiationEquivalentToObjectLiteral.symbols b/tests/baselines/reference/genericInstantiationEquivalentToObjectLiteral.symbols
index 51579bad2d5..b65224cd0c8 100644
--- a/tests/baselines/reference/genericInstantiationEquivalentToObjectLiteral.symbols
+++ b/tests/baselines/reference/genericInstantiationEquivalentToObjectLiteral.symbols
@@ -3,9 +3,9 @@ interface Pair<T1, T2> { first: T1; second: T2; }
 >Pair : Symbol(Pair, Decl(genericInstantiationEquivalentToObjectLiteral.ts, 0, 0))
 >T1 : Symbol(T1, Decl(genericInstantiationEquivalentToObjectLiteral.ts, 0, 15))
 >T2 : Symbol(T2, Decl(genericInstantiationEquivalentToObjectLiteral.ts, 0, 18))
->first : Symbol(first, Decl(genericInstantiationEquivalentToObjectLiteral.ts, 0, 24))
+>first : Symbol(Pair.first, Decl(genericInstantiationEquivalentToObjectLiteral.ts, 0, 24))
 >T1 : Symbol(T1, Decl(genericInstantiationEquivalentToObjectLiteral.ts, 0, 15))
->second : Symbol(second, Decl(genericInstantiationEquivalentToObjectLiteral.ts, 0, 35))
+>second : Symbol(Pair.second, Decl(genericInstantiationEquivalentToObjectLiteral.ts, 0, 35))
 >T2 : Symbol(T2, Decl(genericInstantiationEquivalentToObjectLiteral.ts, 0, 18))
 
 var x: Pair<string, number>
diff --git a/tests/baselines/reference/genericInterfaceImplementation.symbols b/tests/baselines/reference/genericInterfaceImplementation.symbols
index 5816396081f..0b9ef1b90ae 100644
--- a/tests/baselines/reference/genericInterfaceImplementation.symbols
+++ b/tests/baselines/reference/genericInterfaceImplementation.symbols
@@ -4,11 +4,11 @@ interface IOption<A> {
 >A : Symbol(A, Decl(genericInterfaceImplementation.ts, 0, 18))
 
     get(): A;
->get : Symbol(get, Decl(genericInterfaceImplementation.ts, 0, 22))
+>get : Symbol(IOption.get, Decl(genericInterfaceImplementation.ts, 0, 22))
 >A : Symbol(A, Decl(genericInterfaceImplementation.ts, 0, 18))
 
     flatten<B>(): IOption<B>;
->flatten : Symbol(flatten, Decl(genericInterfaceImplementation.ts, 1, 13))
+>flatten : Symbol(IOption.flatten, Decl(genericInterfaceImplementation.ts, 1, 13))
 >B : Symbol(B, Decl(genericInterfaceImplementation.ts, 3, 12))
 >IOption : Symbol(IOption, Decl(genericInterfaceImplementation.ts, 0, 0))
 >B : Symbol(B, Decl(genericInterfaceImplementation.ts, 3, 12))
@@ -21,14 +21,14 @@ class None<T> implements IOption<T>{
 >T : Symbol(T, Decl(genericInterfaceImplementation.ts, 6, 11))
 
     get(): T {
->get : Symbol(get, Decl(genericInterfaceImplementation.ts, 6, 36))
+>get : Symbol(None.get, Decl(genericInterfaceImplementation.ts, 6, 36))
 >T : Symbol(T, Decl(genericInterfaceImplementation.ts, 6, 11))
 
         throw null;
     }
 
     flatten<U>() : IOption<U> {
->flatten : Symbol(flatten, Decl(genericInterfaceImplementation.ts, 9, 5))
+>flatten : Symbol(None.flatten, Decl(genericInterfaceImplementation.ts, 9, 5))
 >U : Symbol(U, Decl(genericInterfaceImplementation.ts, 11, 12))
 >IOption : Symbol(IOption, Decl(genericInterfaceImplementation.ts, 0, 0))
 >U : Symbol(U, Decl(genericInterfaceImplementation.ts, 11, 12))
diff --git a/tests/baselines/reference/genericInterfaceTypeCall.symbols b/tests/baselines/reference/genericInterfaceTypeCall.symbols
index e28ce8f8d80..fe640fd2e53 100644
--- a/tests/baselines/reference/genericInterfaceTypeCall.symbols
+++ b/tests/baselines/reference/genericInterfaceTypeCall.symbols
@@ -4,7 +4,7 @@ interface Foo<T> {
 >T : Symbol(T, Decl(genericInterfaceTypeCall.ts, 0, 14))
 
     reject(arg: T): void;
->reject : Symbol(reject, Decl(genericInterfaceTypeCall.ts, 0, 18))
+>reject : Symbol(Foo.reject, Decl(genericInterfaceTypeCall.ts, 0, 18))
 >arg : Symbol(arg, Decl(genericInterfaceTypeCall.ts, 1, 11))
 >T : Symbol(T, Decl(genericInterfaceTypeCall.ts, 0, 14))
 }
@@ -17,13 +17,13 @@ interface bar<T> {
 >T : Symbol(T, Decl(genericInterfaceTypeCall.ts, 5, 14))
 
     fail(func: (arg: T) => void ): void;
->fail : Symbol(fail, Decl(genericInterfaceTypeCall.ts, 5, 18))
+>fail : Symbol(bar.fail, Decl(genericInterfaceTypeCall.ts, 5, 18))
 >func : Symbol(func, Decl(genericInterfaceTypeCall.ts, 6, 9))
 >arg : Symbol(arg, Decl(genericInterfaceTypeCall.ts, 6, 16))
 >T : Symbol(T, Decl(genericInterfaceTypeCall.ts, 5, 14))
 
     fail2(func2: { (arg: T): void; }): void;
->fail2 : Symbol(fail2, Decl(genericInterfaceTypeCall.ts, 6, 40))
+>fail2 : Symbol(bar.fail2, Decl(genericInterfaceTypeCall.ts, 6, 40))
 >func2 : Symbol(func2, Decl(genericInterfaceTypeCall.ts, 7, 10))
 >arg : Symbol(arg, Decl(genericInterfaceTypeCall.ts, 7, 20))
 >T : Symbol(T, Decl(genericInterfaceTypeCall.ts, 5, 14))
diff --git a/tests/baselines/reference/genericMethodOverspecialization.symbols b/tests/baselines/reference/genericMethodOverspecialization.symbols
index 808addf068c..329ca2de675 100644
--- a/tests/baselines/reference/genericMethodOverspecialization.symbols
+++ b/tests/baselines/reference/genericMethodOverspecialization.symbols
@@ -6,10 +6,10 @@ interface HTMLElement {
 >HTMLElement : Symbol(HTMLElement, Decl(genericMethodOverspecialization.ts, 0, 62))
 
     clientWidth: number;
->clientWidth : Symbol(clientWidth, Decl(genericMethodOverspecialization.ts, 2, 23))
+>clientWidth : Symbol(HTMLElement.clientWidth, Decl(genericMethodOverspecialization.ts, 2, 23))
 
     isDisabled: boolean;
->isDisabled : Symbol(isDisabled, Decl(genericMethodOverspecialization.ts, 3, 24))
+>isDisabled : Symbol(HTMLElement.isDisabled, Decl(genericMethodOverspecialization.ts, 3, 24))
 }
 
 declare var document: Document;
@@ -20,7 +20,7 @@ interface Document {
 >Document : Symbol(Document, Decl(genericMethodOverspecialization.ts, 7, 31))
 
     getElementById(elementId: string): HTMLElement;
->getElementById : Symbol(getElementById, Decl(genericMethodOverspecialization.ts, 8, 20))
+>getElementById : Symbol(Document.getElementById, Decl(genericMethodOverspecialization.ts, 8, 20))
 >elementId : Symbol(elementId, Decl(genericMethodOverspecialization.ts, 9, 19))
 >HTMLElement : Symbol(HTMLElement, Decl(genericMethodOverspecialization.ts, 0, 62))
 }
diff --git a/tests/baselines/reference/genericObjectLitReturnType.symbols b/tests/baselines/reference/genericObjectLitReturnType.symbols
index f3253bdf810..8dacec9a8c5 100644
--- a/tests/baselines/reference/genericObjectLitReturnType.symbols
+++ b/tests/baselines/reference/genericObjectLitReturnType.symbols
@@ -4,7 +4,7 @@ class X<T>
 >T : Symbol(T, Decl(genericObjectLitReturnType.ts, 0, 8))
 {
     f(t: T) { return { a: t }; }
->f : Symbol(f, Decl(genericObjectLitReturnType.ts, 1, 1))
+>f : Symbol(X.f, Decl(genericObjectLitReturnType.ts, 1, 1))
 >t : Symbol(t, Decl(genericObjectLitReturnType.ts, 2, 6))
 >T : Symbol(T, Decl(genericObjectLitReturnType.ts, 0, 8))
 >a : Symbol(a, Decl(genericObjectLitReturnType.ts, 2, 22))
diff --git a/tests/baselines/reference/genericOfACloduleType1.symbols b/tests/baselines/reference/genericOfACloduleType1.symbols
index b2bb95a8ef1..07a677b60c0 100644
--- a/tests/baselines/reference/genericOfACloduleType1.symbols
+++ b/tests/baselines/reference/genericOfACloduleType1.symbols
@@ -2,7 +2,7 @@
 class G<T>{ bar(x: T) { return x; } }
 >G : Symbol(G, Decl(genericOfACloduleType1.ts, 0, 0))
 >T : Symbol(T, Decl(genericOfACloduleType1.ts, 0, 8))
->bar : Symbol(bar, Decl(genericOfACloduleType1.ts, 0, 11))
+>bar : Symbol(G.bar, Decl(genericOfACloduleType1.ts, 0, 11))
 >x : Symbol(x, Decl(genericOfACloduleType1.ts, 0, 16))
 >T : Symbol(T, Decl(genericOfACloduleType1.ts, 0, 8))
 >x : Symbol(x, Decl(genericOfACloduleType1.ts, 0, 16))
@@ -12,7 +12,7 @@ module M {
 
     export class C { foo() { } }
 >C : Symbol(C, Decl(genericOfACloduleType1.ts, 1, 10), Decl(genericOfACloduleType1.ts, 2, 32))
->foo : Symbol(foo, Decl(genericOfACloduleType1.ts, 2, 20))
+>foo : Symbol(C.foo, Decl(genericOfACloduleType1.ts, 2, 20))
 
     export module C {
 >C : Symbol(C, Decl(genericOfACloduleType1.ts, 1, 10), Decl(genericOfACloduleType1.ts, 2, 32))
diff --git a/tests/baselines/reference/genericOfACloduleType2.symbols b/tests/baselines/reference/genericOfACloduleType2.symbols
index 2f4fe34818c..4999d227bbc 100644
--- a/tests/baselines/reference/genericOfACloduleType2.symbols
+++ b/tests/baselines/reference/genericOfACloduleType2.symbols
@@ -2,7 +2,7 @@
 class G<T>{ bar(x: T) { return x; } }
 >G : Symbol(G, Decl(genericOfACloduleType2.ts, 0, 0))
 >T : Symbol(T, Decl(genericOfACloduleType2.ts, 0, 8))
->bar : Symbol(bar, Decl(genericOfACloduleType2.ts, 0, 11))
+>bar : Symbol(G.bar, Decl(genericOfACloduleType2.ts, 0, 11))
 >x : Symbol(x, Decl(genericOfACloduleType2.ts, 0, 16))
 >T : Symbol(T, Decl(genericOfACloduleType2.ts, 0, 8))
 >x : Symbol(x, Decl(genericOfACloduleType2.ts, 0, 16))
@@ -12,7 +12,7 @@ module M {
 
     export class C { foo() { } }
 >C : Symbol(C, Decl(genericOfACloduleType2.ts, 1, 10), Decl(genericOfACloduleType2.ts, 2, 32))
->foo : Symbol(foo, Decl(genericOfACloduleType2.ts, 2, 20))
+>foo : Symbol(C.foo, Decl(genericOfACloduleType2.ts, 2, 20))
 
     export module C {
 >C : Symbol(C, Decl(genericOfACloduleType2.ts, 1, 10), Decl(genericOfACloduleType2.ts, 2, 32))
diff --git a/tests/baselines/reference/genericOverloadSignatures.symbols b/tests/baselines/reference/genericOverloadSignatures.symbols
index 76343fb1898..148aead0616 100644
--- a/tests/baselines/reference/genericOverloadSignatures.symbols
+++ b/tests/baselines/reference/genericOverloadSignatures.symbols
@@ -33,13 +33,13 @@ interface I2 {
 >I2 : Symbol(I2, Decl(genericOverloadSignatures.ts, 7, 17))
 
     f<T>(x: T): number;
->f : Symbol(f, Decl(genericOverloadSignatures.ts, 9, 14), Decl(genericOverloadSignatures.ts, 10, 23))
+>f : Symbol(I2.f, Decl(genericOverloadSignatures.ts, 9, 14), Decl(genericOverloadSignatures.ts, 10, 23))
 >T : Symbol(T, Decl(genericOverloadSignatures.ts, 10, 6))
 >x : Symbol(x, Decl(genericOverloadSignatures.ts, 10, 9))
 >T : Symbol(T, Decl(genericOverloadSignatures.ts, 10, 6))
 
     f<T>(x: T): string;
->f : Symbol(f, Decl(genericOverloadSignatures.ts, 9, 14), Decl(genericOverloadSignatures.ts, 10, 23))
+>f : Symbol(I2.f, Decl(genericOverloadSignatures.ts, 9, 14), Decl(genericOverloadSignatures.ts, 10, 23))
 >T : Symbol(T, Decl(genericOverloadSignatures.ts, 11, 6))
 >x : Symbol(x, Decl(genericOverloadSignatures.ts, 11, 9))
 >T : Symbol(T, Decl(genericOverloadSignatures.ts, 11, 6))
@@ -50,12 +50,12 @@ interface I3<T> {
 >T : Symbol(T, Decl(genericOverloadSignatures.ts, 14, 13))
 
     f(x: T): number;
->f : Symbol(f, Decl(genericOverloadSignatures.ts, 14, 17), Decl(genericOverloadSignatures.ts, 15, 20))
+>f : Symbol(I3.f, Decl(genericOverloadSignatures.ts, 14, 17), Decl(genericOverloadSignatures.ts, 15, 20))
 >x : Symbol(x, Decl(genericOverloadSignatures.ts, 15, 6))
 >T : Symbol(T, Decl(genericOverloadSignatures.ts, 14, 13))
 
     f(x: T): string;
->f : Symbol(f, Decl(genericOverloadSignatures.ts, 14, 17), Decl(genericOverloadSignatures.ts, 15, 20))
+>f : Symbol(I3.f, Decl(genericOverloadSignatures.ts, 14, 17), Decl(genericOverloadSignatures.ts, 15, 20))
 >x : Symbol(x, Decl(genericOverloadSignatures.ts, 16, 6))
 >T : Symbol(T, Decl(genericOverloadSignatures.ts, 14, 13))
 }
diff --git a/tests/baselines/reference/genericPrototypeProperty.symbols b/tests/baselines/reference/genericPrototypeProperty.symbols
index ca2fe000dce..130d9669327 100644
--- a/tests/baselines/reference/genericPrototypeProperty.symbols
+++ b/tests/baselines/reference/genericPrototypeProperty.symbols
@@ -4,11 +4,11 @@ class C<T> {
 >T : Symbol(T, Decl(genericPrototypeProperty.ts, 0, 8))
 
     x: T;
->x : Symbol(x, Decl(genericPrototypeProperty.ts, 0, 12))
+>x : Symbol(C.x, Decl(genericPrototypeProperty.ts, 0, 12))
 >T : Symbol(T, Decl(genericPrototypeProperty.ts, 0, 8))
 
     foo(x: T): T { return null; }
->foo : Symbol(foo, Decl(genericPrototypeProperty.ts, 1, 9))
+>foo : Symbol(C.foo, Decl(genericPrototypeProperty.ts, 1, 9))
 >x : Symbol(x, Decl(genericPrototypeProperty.ts, 2, 8))
 >T : Symbol(T, Decl(genericPrototypeProperty.ts, 0, 8))
 >T : Symbol(T, Decl(genericPrototypeProperty.ts, 0, 8))
diff --git a/tests/baselines/reference/genericPrototypeProperty2.symbols b/tests/baselines/reference/genericPrototypeProperty2.symbols
index f7d55162154..71709239cef 100644
--- a/tests/baselines/reference/genericPrototypeProperty2.symbols
+++ b/tests/baselines/reference/genericPrototypeProperty2.symbols
@@ -1,13 +1,13 @@
 === tests/cases/compiler/genericPrototypeProperty2.ts ===
 interface EventTarget { x } 
 >EventTarget : Symbol(EventTarget, Decl(genericPrototypeProperty2.ts, 0, 0))
->x : Symbol(x, Decl(genericPrototypeProperty2.ts, 0, 23))
+>x : Symbol(EventTarget.x, Decl(genericPrototypeProperty2.ts, 0, 23))
 
 class BaseEvent {
 >BaseEvent : Symbol(BaseEvent, Decl(genericPrototypeProperty2.ts, 0, 27))
 
     target: EventTarget;
->target : Symbol(target, Decl(genericPrototypeProperty2.ts, 1, 17))
+>target : Symbol(BaseEvent.target, Decl(genericPrototypeProperty2.ts, 1, 17))
 >EventTarget : Symbol(EventTarget, Decl(genericPrototypeProperty2.ts, 0, 0))
 }
 
@@ -18,14 +18,14 @@ class MyEvent<T extends EventTarget> extends BaseEvent {
 >BaseEvent : Symbol(BaseEvent, Decl(genericPrototypeProperty2.ts, 0, 27))
 
     target: T;
->target : Symbol(target, Decl(genericPrototypeProperty2.ts, 5, 56))
+>target : Symbol(MyEvent.target, Decl(genericPrototypeProperty2.ts, 5, 56))
 >T : Symbol(T, Decl(genericPrototypeProperty2.ts, 5, 14))
 }
 class BaseEventWrapper {
 >BaseEventWrapper : Symbol(BaseEventWrapper, Decl(genericPrototypeProperty2.ts, 7, 1))
 
     t: BaseEvent;
->t : Symbol(t, Decl(genericPrototypeProperty2.ts, 8, 24))
+>t : Symbol(BaseEventWrapper.t, Decl(genericPrototypeProperty2.ts, 8, 24))
 >BaseEvent : Symbol(BaseEvent, Decl(genericPrototypeProperty2.ts, 0, 27))
 }
 
@@ -34,6 +34,6 @@ class MyEventWrapper extends BaseEventWrapper {
 >BaseEventWrapper : Symbol(BaseEventWrapper, Decl(genericPrototypeProperty2.ts, 7, 1))
 
     t: MyEvent<any>; // any satisfies constraint and passes assignability check between 'target' properties
->t : Symbol(t, Decl(genericPrototypeProperty2.ts, 12, 47))
+>t : Symbol(MyEventWrapper.t, Decl(genericPrototypeProperty2.ts, 12, 47))
 >MyEvent : Symbol(MyEvent, Decl(genericPrototypeProperty2.ts, 3, 1))
 }
diff --git a/tests/baselines/reference/genericPrototypeProperty3.symbols b/tests/baselines/reference/genericPrototypeProperty3.symbols
index fb28fbcc89d..7f8c57ff2ea 100644
--- a/tests/baselines/reference/genericPrototypeProperty3.symbols
+++ b/tests/baselines/reference/genericPrototypeProperty3.symbols
@@ -3,7 +3,7 @@ class BaseEvent {
 >BaseEvent : Symbol(BaseEvent, Decl(genericPrototypeProperty3.ts, 0, 0))
 
     target: {};
->target : Symbol(target, Decl(genericPrototypeProperty3.ts, 0, 17))
+>target : Symbol(BaseEvent.target, Decl(genericPrototypeProperty3.ts, 0, 17))
 }
 
 class MyEvent<T> extends BaseEvent { // T is instantiated to any in the prototype, which is assignable to {}
@@ -12,14 +12,14 @@ class MyEvent<T> extends BaseEvent { // T is instantiated to any in the prototyp
 >BaseEvent : Symbol(BaseEvent, Decl(genericPrototypeProperty3.ts, 0, 0))
 
     target: T;
->target : Symbol(target, Decl(genericPrototypeProperty3.ts, 4, 36))
+>target : Symbol(MyEvent.target, Decl(genericPrototypeProperty3.ts, 4, 36))
 >T : Symbol(T, Decl(genericPrototypeProperty3.ts, 4, 14))
 }
 class BaseEventWrapper {
 >BaseEventWrapper : Symbol(BaseEventWrapper, Decl(genericPrototypeProperty3.ts, 6, 1))
 
     t: BaseEvent;
->t : Symbol(t, Decl(genericPrototypeProperty3.ts, 7, 24))
+>t : Symbol(BaseEventWrapper.t, Decl(genericPrototypeProperty3.ts, 7, 24))
 >BaseEvent : Symbol(BaseEvent, Decl(genericPrototypeProperty3.ts, 0, 0))
 }
 
@@ -28,6 +28,6 @@ class MyEventWrapper extends BaseEventWrapper {
 >BaseEventWrapper : Symbol(BaseEventWrapper, Decl(genericPrototypeProperty3.ts, 6, 1))
 
     t: MyEvent<any>;
->t : Symbol(t, Decl(genericPrototypeProperty3.ts, 11, 47))
+>t : Symbol(MyEventWrapper.t, Decl(genericPrototypeProperty3.ts, 11, 47))
 >MyEvent : Symbol(MyEvent, Decl(genericPrototypeProperty3.ts, 2, 1))
 }
diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.symbols b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.symbols
index ff8d19ff6e6..16171917561 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.symbols
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.symbols
@@ -32,7 +32,7 @@ module TypeScript2 {
     }
     // link methods
     public addOutgoingLink<A,B,C>(linkTo: PullSymbol, kind: SymbolLinkKind) {
->addOutgoingLink : Symbol(addOutgoingLink, Decl(genericRecursiveImplicitConstructorErrors2.ts, 12, 5))
+>addOutgoingLink : Symbol(PullSymbol.addOutgoingLink, Decl(genericRecursiveImplicitConstructorErrors2.ts, 12, 5))
 >A : Symbol(A, Decl(genericRecursiveImplicitConstructorErrors2.ts, 14, 27))
 >B : Symbol(B, Decl(genericRecursiveImplicitConstructorErrors2.ts, 14, 29))
 >C : Symbol(C, Decl(genericRecursiveImplicitConstructorErrors2.ts, 14, 31))
@@ -44,7 +44,7 @@ module TypeScript2 {
     }
 
     public getType<A,B,C>(): PullTypeSymbol<A,B,C> {
->getType : Symbol(getType, Decl(genericRecursiveImplicitConstructorErrors2.ts, 16, 5))
+>getType : Symbol(PullSymbol.getType, Decl(genericRecursiveImplicitConstructorErrors2.ts, 16, 5))
 >A : Symbol(A, Decl(genericRecursiveImplicitConstructorErrors2.ts, 18, 19))
 >B : Symbol(B, Decl(genericRecursiveImplicitConstructorErrors2.ts, 18, 21))
 >C : Symbol(C, Decl(genericRecursiveImplicitConstructorErrors2.ts, 18, 23))
diff --git a/tests/baselines/reference/genericReversingTypeParameters.symbols b/tests/baselines/reference/genericReversingTypeParameters.symbols
index 05eb102f36b..2a77e5496be 100644
--- a/tests/baselines/reference/genericReversingTypeParameters.symbols
+++ b/tests/baselines/reference/genericReversingTypeParameters.symbols
@@ -5,19 +5,19 @@ class BiMap<K, V> {
 >V : Symbol(V, Decl(genericReversingTypeParameters.ts, 0, 14))
 
     private inverseBiMap: BiMap<V, K>;
->inverseBiMap : Symbol(inverseBiMap, Decl(genericReversingTypeParameters.ts, 0, 19))
+>inverseBiMap : Symbol(BiMap.inverseBiMap, Decl(genericReversingTypeParameters.ts, 0, 19))
 >BiMap : Symbol(BiMap, Decl(genericReversingTypeParameters.ts, 0, 0))
 >V : Symbol(V, Decl(genericReversingTypeParameters.ts, 0, 14))
 >K : Symbol(K, Decl(genericReversingTypeParameters.ts, 0, 12))
 
     public get(key: K): V { return null; }
->get : Symbol(get, Decl(genericReversingTypeParameters.ts, 1, 38))
+>get : Symbol(BiMap.get, Decl(genericReversingTypeParameters.ts, 1, 38))
 >key : Symbol(key, Decl(genericReversingTypeParameters.ts, 2, 15))
 >K : Symbol(K, Decl(genericReversingTypeParameters.ts, 0, 12))
 >V : Symbol(V, Decl(genericReversingTypeParameters.ts, 0, 14))
 
     public inverse(): BiMap<V, K> { return null; }
->inverse : Symbol(inverse, Decl(genericReversingTypeParameters.ts, 2, 42))
+>inverse : Symbol(BiMap.inverse, Decl(genericReversingTypeParameters.ts, 2, 42))
 >BiMap : Symbol(BiMap, Decl(genericReversingTypeParameters.ts, 0, 0))
 >V : Symbol(V, Decl(genericReversingTypeParameters.ts, 0, 14))
 >K : Symbol(K, Decl(genericReversingTypeParameters.ts, 0, 12))
diff --git a/tests/baselines/reference/genericReversingTypeParameters2.symbols b/tests/baselines/reference/genericReversingTypeParameters2.symbols
index d33dbd3a64b..43f6db8ecba 100644
--- a/tests/baselines/reference/genericReversingTypeParameters2.symbols
+++ b/tests/baselines/reference/genericReversingTypeParameters2.symbols
@@ -5,19 +5,19 @@ class BiMap<K, V> {
 >V : Symbol(V, Decl(genericReversingTypeParameters2.ts, 0, 14))
 
     private inverseBiMap: BiMap<V, K>;
->inverseBiMap : Symbol(inverseBiMap, Decl(genericReversingTypeParameters2.ts, 0, 19))
+>inverseBiMap : Symbol(BiMap.inverseBiMap, Decl(genericReversingTypeParameters2.ts, 0, 19))
 >BiMap : Symbol(BiMap, Decl(genericReversingTypeParameters2.ts, 0, 0))
 >V : Symbol(V, Decl(genericReversingTypeParameters2.ts, 0, 14))
 >K : Symbol(K, Decl(genericReversingTypeParameters2.ts, 0, 12))
 
     public get(key: K): V { return null; }
->get : Symbol(get, Decl(genericReversingTypeParameters2.ts, 1, 38))
+>get : Symbol(BiMap.get, Decl(genericReversingTypeParameters2.ts, 1, 38))
 >key : Symbol(key, Decl(genericReversingTypeParameters2.ts, 2, 15))
 >K : Symbol(K, Decl(genericReversingTypeParameters2.ts, 0, 12))
 >V : Symbol(V, Decl(genericReversingTypeParameters2.ts, 0, 14))
 
     public inverse(): BiMap<V, K> { return null; }
->inverse : Symbol(inverse, Decl(genericReversingTypeParameters2.ts, 2, 42))
+>inverse : Symbol(BiMap.inverse, Decl(genericReversingTypeParameters2.ts, 2, 42))
 >BiMap : Symbol(BiMap, Decl(genericReversingTypeParameters2.ts, 0, 0))
 >V : Symbol(V, Decl(genericReversingTypeParameters2.ts, 0, 14))
 >K : Symbol(K, Decl(genericReversingTypeParameters2.ts, 0, 12))
diff --git a/tests/baselines/reference/genericSignatureIdentity.symbols b/tests/baselines/reference/genericSignatureIdentity.symbols
index afd12ec266a..b5caa87b0a5 100644
--- a/tests/baselines/reference/genericSignatureIdentity.symbols
+++ b/tests/baselines/reference/genericSignatureIdentity.symbols
@@ -9,7 +9,7 @@ var x: {
 
     <T extends Date>(x: T): T;
 >T : Symbol(T, Decl(genericSignatureIdentity.ts, 6, 5))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(genericSignatureIdentity.ts, 6, 21))
 >T : Symbol(T, Decl(genericSignatureIdentity.ts, 6, 5))
 >T : Symbol(T, Decl(genericSignatureIdentity.ts, 6, 5))
diff --git a/tests/baselines/reference/genericSpecializationToTypeLiteral1.symbols b/tests/baselines/reference/genericSpecializationToTypeLiteral1.symbols
index 78203ddacf6..057b6ec6548 100644
--- a/tests/baselines/reference/genericSpecializationToTypeLiteral1.symbols
+++ b/tests/baselines/reference/genericSpecializationToTypeLiteral1.symbols
@@ -4,7 +4,7 @@ interface IEnumerable<T> {
 >T : Symbol(T, Decl(genericSpecializationToTypeLiteral1.ts, 0, 22))
 
     zip<TResult>(second: IEnumerable<T>, resultSelector: (first: T, second: T, index: number) => TResult): IEnumerable<TResult>;
->zip : Symbol(zip, Decl(genericSpecializationToTypeLiteral1.ts, 0, 26), Decl(genericSpecializationToTypeLiteral1.ts, 2, 128), Decl(genericSpecializationToTypeLiteral1.ts, 3, 117))
+>zip : Symbol(IEnumerable.zip, Decl(genericSpecializationToTypeLiteral1.ts, 0, 26), Decl(genericSpecializationToTypeLiteral1.ts, 2, 128), Decl(genericSpecializationToTypeLiteral1.ts, 3, 117))
 >TResult : Symbol(TResult, Decl(genericSpecializationToTypeLiteral1.ts, 2, 8))
 >second : Symbol(second, Decl(genericSpecializationToTypeLiteral1.ts, 2, 17))
 >IEnumerable : Symbol(IEnumerable, Decl(genericSpecializationToTypeLiteral1.ts, 0, 0))
@@ -20,7 +20,7 @@ interface IEnumerable<T> {
 >TResult : Symbol(TResult, Decl(genericSpecializationToTypeLiteral1.ts, 2, 8))
 
     zip<TResult>(second: T[], resultSelector: (first: T, second: T, index: number) => TResult): IEnumerable<TResult>;
->zip : Symbol(zip, Decl(genericSpecializationToTypeLiteral1.ts, 0, 26), Decl(genericSpecializationToTypeLiteral1.ts, 2, 128), Decl(genericSpecializationToTypeLiteral1.ts, 3, 117))
+>zip : Symbol(IEnumerable.zip, Decl(genericSpecializationToTypeLiteral1.ts, 0, 26), Decl(genericSpecializationToTypeLiteral1.ts, 2, 128), Decl(genericSpecializationToTypeLiteral1.ts, 3, 117))
 >TResult : Symbol(TResult, Decl(genericSpecializationToTypeLiteral1.ts, 3, 8))
 >second : Symbol(second, Decl(genericSpecializationToTypeLiteral1.ts, 3, 17))
 >T : Symbol(T, Decl(genericSpecializationToTypeLiteral1.ts, 0, 22))
@@ -35,14 +35,14 @@ interface IEnumerable<T> {
 >TResult : Symbol(TResult, Decl(genericSpecializationToTypeLiteral1.ts, 3, 8))
 
     zip<TResult>(...params: any[]): IEnumerable<TResult>; // last one is selector
->zip : Symbol(zip, Decl(genericSpecializationToTypeLiteral1.ts, 0, 26), Decl(genericSpecializationToTypeLiteral1.ts, 2, 128), Decl(genericSpecializationToTypeLiteral1.ts, 3, 117))
+>zip : Symbol(IEnumerable.zip, Decl(genericSpecializationToTypeLiteral1.ts, 0, 26), Decl(genericSpecializationToTypeLiteral1.ts, 2, 128), Decl(genericSpecializationToTypeLiteral1.ts, 3, 117))
 >TResult : Symbol(TResult, Decl(genericSpecializationToTypeLiteral1.ts, 4, 8))
 >params : Symbol(params, Decl(genericSpecializationToTypeLiteral1.ts, 4, 17))
 >IEnumerable : Symbol(IEnumerable, Decl(genericSpecializationToTypeLiteral1.ts, 0, 0))
 >TResult : Symbol(TResult, Decl(genericSpecializationToTypeLiteral1.ts, 4, 8))
 
     merge<TResult>(...params: IEnumerable<T>[]): IEnumerable<T>;
->merge : Symbol(merge, Decl(genericSpecializationToTypeLiteral1.ts, 4, 57), Decl(genericSpecializationToTypeLiteral1.ts, 6, 64))
+>merge : Symbol(IEnumerable.merge, Decl(genericSpecializationToTypeLiteral1.ts, 4, 57), Decl(genericSpecializationToTypeLiteral1.ts, 6, 64))
 >TResult : Symbol(TResult, Decl(genericSpecializationToTypeLiteral1.ts, 6, 10))
 >params : Symbol(params, Decl(genericSpecializationToTypeLiteral1.ts, 6, 19))
 >IEnumerable : Symbol(IEnumerable, Decl(genericSpecializationToTypeLiteral1.ts, 0, 0))
@@ -51,7 +51,7 @@ interface IEnumerable<T> {
 >T : Symbol(T, Decl(genericSpecializationToTypeLiteral1.ts, 0, 22))
 
     merge<TResult>(...params: T[][]): IEnumerable<T>;
->merge : Symbol(merge, Decl(genericSpecializationToTypeLiteral1.ts, 4, 57), Decl(genericSpecializationToTypeLiteral1.ts, 6, 64))
+>merge : Symbol(IEnumerable.merge, Decl(genericSpecializationToTypeLiteral1.ts, 4, 57), Decl(genericSpecializationToTypeLiteral1.ts, 6, 64))
 >TResult : Symbol(TResult, Decl(genericSpecializationToTypeLiteral1.ts, 7, 10))
 >params : Symbol(params, Decl(genericSpecializationToTypeLiteral1.ts, 7, 19))
 >T : Symbol(T, Decl(genericSpecializationToTypeLiteral1.ts, 0, 22))
@@ -60,7 +60,7 @@ interface IEnumerable<T> {
 
 
     concat(...sequences: IEnumerable<T>[]): IEnumerable<T>;
->concat : Symbol(concat, Decl(genericSpecializationToTypeLiteral1.ts, 7, 53), Decl(genericSpecializationToTypeLiteral1.ts, 10, 59))
+>concat : Symbol(IEnumerable.concat, Decl(genericSpecializationToTypeLiteral1.ts, 7, 53), Decl(genericSpecializationToTypeLiteral1.ts, 10, 59))
 >sequences : Symbol(sequences, Decl(genericSpecializationToTypeLiteral1.ts, 10, 11))
 >IEnumerable : Symbol(IEnumerable, Decl(genericSpecializationToTypeLiteral1.ts, 0, 0))
 >T : Symbol(T, Decl(genericSpecializationToTypeLiteral1.ts, 0, 22))
@@ -68,14 +68,14 @@ interface IEnumerable<T> {
 >T : Symbol(T, Decl(genericSpecializationToTypeLiteral1.ts, 0, 22))
 
     concat(...sequences: T[]): IEnumerable<T>;
->concat : Symbol(concat, Decl(genericSpecializationToTypeLiteral1.ts, 7, 53), Decl(genericSpecializationToTypeLiteral1.ts, 10, 59))
+>concat : Symbol(IEnumerable.concat, Decl(genericSpecializationToTypeLiteral1.ts, 7, 53), Decl(genericSpecializationToTypeLiteral1.ts, 10, 59))
 >sequences : Symbol(sequences, Decl(genericSpecializationToTypeLiteral1.ts, 11, 11))
 >T : Symbol(T, Decl(genericSpecializationToTypeLiteral1.ts, 0, 22))
 >IEnumerable : Symbol(IEnumerable, Decl(genericSpecializationToTypeLiteral1.ts, 0, 0))
 >T : Symbol(T, Decl(genericSpecializationToTypeLiteral1.ts, 0, 22))
 
     insert(index: number, second: IEnumerable<T>): IEnumerable<T>;
->insert : Symbol(insert, Decl(genericSpecializationToTypeLiteral1.ts, 11, 46))
+>insert : Symbol(IEnumerable.insert, Decl(genericSpecializationToTypeLiteral1.ts, 11, 46))
 >index : Symbol(index, Decl(genericSpecializationToTypeLiteral1.ts, 13, 11))
 >second : Symbol(second, Decl(genericSpecializationToTypeLiteral1.ts, 13, 25))
 >IEnumerable : Symbol(IEnumerable, Decl(genericSpecializationToTypeLiteral1.ts, 0, 0))
@@ -84,13 +84,13 @@ interface IEnumerable<T> {
 >T : Symbol(T, Decl(genericSpecializationToTypeLiteral1.ts, 0, 22))
 
     sequenceEqual(second: IEnumerable<T>): boolean;
->sequenceEqual : Symbol(sequenceEqual, Decl(genericSpecializationToTypeLiteral1.ts, 13, 66), Decl(genericSpecializationToTypeLiteral1.ts, 15, 51), Decl(genericSpecializationToTypeLiteral1.ts, 16, 104), Decl(genericSpecializationToTypeLiteral1.ts, 17, 40))
+>sequenceEqual : Symbol(IEnumerable.sequenceEqual, Decl(genericSpecializationToTypeLiteral1.ts, 13, 66), Decl(genericSpecializationToTypeLiteral1.ts, 15, 51), Decl(genericSpecializationToTypeLiteral1.ts, 16, 104), Decl(genericSpecializationToTypeLiteral1.ts, 17, 40))
 >second : Symbol(second, Decl(genericSpecializationToTypeLiteral1.ts, 15, 18))
 >IEnumerable : Symbol(IEnumerable, Decl(genericSpecializationToTypeLiteral1.ts, 0, 0))
 >T : Symbol(T, Decl(genericSpecializationToTypeLiteral1.ts, 0, 22))
 
     sequenceEqual<TCompare>(second: IEnumerable<T>, compareSelector: (element: T) => TCompare): boolean;
->sequenceEqual : Symbol(sequenceEqual, Decl(genericSpecializationToTypeLiteral1.ts, 13, 66), Decl(genericSpecializationToTypeLiteral1.ts, 15, 51), Decl(genericSpecializationToTypeLiteral1.ts, 16, 104), Decl(genericSpecializationToTypeLiteral1.ts, 17, 40))
+>sequenceEqual : Symbol(IEnumerable.sequenceEqual, Decl(genericSpecializationToTypeLiteral1.ts, 13, 66), Decl(genericSpecializationToTypeLiteral1.ts, 15, 51), Decl(genericSpecializationToTypeLiteral1.ts, 16, 104), Decl(genericSpecializationToTypeLiteral1.ts, 17, 40))
 >TCompare : Symbol(TCompare, Decl(genericSpecializationToTypeLiteral1.ts, 16, 18))
 >second : Symbol(second, Decl(genericSpecializationToTypeLiteral1.ts, 16, 28))
 >IEnumerable : Symbol(IEnumerable, Decl(genericSpecializationToTypeLiteral1.ts, 0, 0))
@@ -101,12 +101,12 @@ interface IEnumerable<T> {
 >TCompare : Symbol(TCompare, Decl(genericSpecializationToTypeLiteral1.ts, 16, 18))
 
     sequenceEqual(second: T[]): boolean;
->sequenceEqual : Symbol(sequenceEqual, Decl(genericSpecializationToTypeLiteral1.ts, 13, 66), Decl(genericSpecializationToTypeLiteral1.ts, 15, 51), Decl(genericSpecializationToTypeLiteral1.ts, 16, 104), Decl(genericSpecializationToTypeLiteral1.ts, 17, 40))
+>sequenceEqual : Symbol(IEnumerable.sequenceEqual, Decl(genericSpecializationToTypeLiteral1.ts, 13, 66), Decl(genericSpecializationToTypeLiteral1.ts, 15, 51), Decl(genericSpecializationToTypeLiteral1.ts, 16, 104), Decl(genericSpecializationToTypeLiteral1.ts, 17, 40))
 >second : Symbol(second, Decl(genericSpecializationToTypeLiteral1.ts, 17, 18))
 >T : Symbol(T, Decl(genericSpecializationToTypeLiteral1.ts, 0, 22))
 
     sequenceEqual<TCompare>(second: T[], compareSelector: (element: T) => TCompare): boolean;   
->sequenceEqual : Symbol(sequenceEqual, Decl(genericSpecializationToTypeLiteral1.ts, 13, 66), Decl(genericSpecializationToTypeLiteral1.ts, 15, 51), Decl(genericSpecializationToTypeLiteral1.ts, 16, 104), Decl(genericSpecializationToTypeLiteral1.ts, 17, 40))
+>sequenceEqual : Symbol(IEnumerable.sequenceEqual, Decl(genericSpecializationToTypeLiteral1.ts, 13, 66), Decl(genericSpecializationToTypeLiteral1.ts, 15, 51), Decl(genericSpecializationToTypeLiteral1.ts, 16, 104), Decl(genericSpecializationToTypeLiteral1.ts, 17, 40))
 >TCompare : Symbol(TCompare, Decl(genericSpecializationToTypeLiteral1.ts, 18, 18))
 >second : Symbol(second, Decl(genericSpecializationToTypeLiteral1.ts, 18, 28))
 >T : Symbol(T, Decl(genericSpecializationToTypeLiteral1.ts, 0, 22))
@@ -116,7 +116,7 @@ interface IEnumerable<T> {
 >TCompare : Symbol(TCompare, Decl(genericSpecializationToTypeLiteral1.ts, 18, 18))
     
     toDictionary<TKey>(keySelector: (element: T) => TKey): IDictionary<TKey, any>;
->toDictionary : Symbol(toDictionary, Decl(genericSpecializationToTypeLiteral1.ts, 18, 93), Decl(genericSpecializationToTypeLiteral1.ts, 20, 82), Decl(genericSpecializationToTypeLiteral1.ts, 21, 134))
+>toDictionary : Symbol(IEnumerable.toDictionary, Decl(genericSpecializationToTypeLiteral1.ts, 18, 93), Decl(genericSpecializationToTypeLiteral1.ts, 20, 82), Decl(genericSpecializationToTypeLiteral1.ts, 21, 134))
 >TKey : Symbol(TKey, Decl(genericSpecializationToTypeLiteral1.ts, 20, 17))
 >keySelector : Symbol(keySelector, Decl(genericSpecializationToTypeLiteral1.ts, 20, 23))
 >element : Symbol(element, Decl(genericSpecializationToTypeLiteral1.ts, 20, 37))
@@ -126,7 +126,7 @@ interface IEnumerable<T> {
 >TKey : Symbol(TKey, Decl(genericSpecializationToTypeLiteral1.ts, 20, 17))
 
     toDictionary<TKey, TValue>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TValue): IDictionary<TKey, TValue>;
->toDictionary : Symbol(toDictionary, Decl(genericSpecializationToTypeLiteral1.ts, 18, 93), Decl(genericSpecializationToTypeLiteral1.ts, 20, 82), Decl(genericSpecializationToTypeLiteral1.ts, 21, 134))
+>toDictionary : Symbol(IEnumerable.toDictionary, Decl(genericSpecializationToTypeLiteral1.ts, 18, 93), Decl(genericSpecializationToTypeLiteral1.ts, 20, 82), Decl(genericSpecializationToTypeLiteral1.ts, 21, 134))
 >TKey : Symbol(TKey, Decl(genericSpecializationToTypeLiteral1.ts, 21, 17))
 >TValue : Symbol(TValue, Decl(genericSpecializationToTypeLiteral1.ts, 21, 22))
 >keySelector : Symbol(keySelector, Decl(genericSpecializationToTypeLiteral1.ts, 21, 31))
@@ -142,7 +142,7 @@ interface IEnumerable<T> {
 >TValue : Symbol(TValue, Decl(genericSpecializationToTypeLiteral1.ts, 21, 22))
 
     toDictionary<TKey, TValue, TCompare>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TValue, compareSelector: (key: TKey) => TCompare): IDictionary<TKey, TValue>;
->toDictionary : Symbol(toDictionary, Decl(genericSpecializationToTypeLiteral1.ts, 18, 93), Decl(genericSpecializationToTypeLiteral1.ts, 20, 82), Decl(genericSpecializationToTypeLiteral1.ts, 21, 134))
+>toDictionary : Symbol(IEnumerable.toDictionary, Decl(genericSpecializationToTypeLiteral1.ts, 18, 93), Decl(genericSpecializationToTypeLiteral1.ts, 20, 82), Decl(genericSpecializationToTypeLiteral1.ts, 21, 134))
 >TKey : Symbol(TKey, Decl(genericSpecializationToTypeLiteral1.ts, 22, 17))
 >TValue : Symbol(TValue, Decl(genericSpecializationToTypeLiteral1.ts, 22, 22))
 >TCompare : Symbol(TCompare, Decl(genericSpecializationToTypeLiteral1.ts, 22, 30))
@@ -169,7 +169,7 @@ interface IDictionary<TKey, TValue> {
 >TValue : Symbol(TValue, Decl(genericSpecializationToTypeLiteral1.ts, 25, 27))
 
     toEnumerable(): IEnumerable<{ key: TKey; value: TValue }>;
->toEnumerable : Symbol(toEnumerable, Decl(genericSpecializationToTypeLiteral1.ts, 25, 37))
+>toEnumerable : Symbol(IDictionary.toEnumerable, Decl(genericSpecializationToTypeLiteral1.ts, 25, 37))
 >IEnumerable : Symbol(IEnumerable, Decl(genericSpecializationToTypeLiteral1.ts, 0, 0))
 >key : Symbol(key, Decl(genericSpecializationToTypeLiteral1.ts, 26, 33))
 >TKey : Symbol(TKey, Decl(genericSpecializationToTypeLiteral1.ts, 25, 22))
diff --git a/tests/baselines/reference/genericSpecializations1.symbols b/tests/baselines/reference/genericSpecializations1.symbols
index 87f31276b3f..79e591d3186 100644
--- a/tests/baselines/reference/genericSpecializations1.symbols
+++ b/tests/baselines/reference/genericSpecializations1.symbols
@@ -4,7 +4,7 @@ interface IFoo<T> {
 >T : Symbol(T, Decl(genericSpecializations1.ts, 0, 15))
 
     foo<T>(x: T): T; // no error on implementors because IFoo's T is different from foo's T
->foo : Symbol(foo, Decl(genericSpecializations1.ts, 0, 19))
+>foo : Symbol(IFoo.foo, Decl(genericSpecializations1.ts, 0, 19))
 >T : Symbol(T, Decl(genericSpecializations1.ts, 1, 8))
 >x : Symbol(x, Decl(genericSpecializations1.ts, 1, 11))
 >T : Symbol(T, Decl(genericSpecializations1.ts, 1, 8))
@@ -16,7 +16,7 @@ class IntFooBad implements IFoo<number> {
 >IFoo : Symbol(IFoo, Decl(genericSpecializations1.ts, 0, 0))
 
     foo(x: string): string { return null; }
->foo : Symbol(foo, Decl(genericSpecializations1.ts, 4, 41))
+>foo : Symbol(IntFooBad.foo, Decl(genericSpecializations1.ts, 4, 41))
 >x : Symbol(x, Decl(genericSpecializations1.ts, 5, 8))
 }
 
@@ -25,7 +25,7 @@ class StringFoo2 implements IFoo<string> {
 >IFoo : Symbol(IFoo, Decl(genericSpecializations1.ts, 0, 0))
 
     foo(x: string): string { return null; }
->foo : Symbol(foo, Decl(genericSpecializations1.ts, 8, 42))
+>foo : Symbol(StringFoo2.foo, Decl(genericSpecializations1.ts, 8, 42))
 >x : Symbol(x, Decl(genericSpecializations1.ts, 9, 8))
 }
 
@@ -34,7 +34,7 @@ class StringFoo3 implements IFoo<string> {
 >IFoo : Symbol(IFoo, Decl(genericSpecializations1.ts, 0, 0))
 
     foo<T>(x: T): T { return null; }
->foo : Symbol(foo, Decl(genericSpecializations1.ts, 12, 42))
+>foo : Symbol(StringFoo3.foo, Decl(genericSpecializations1.ts, 12, 42))
 >T : Symbol(T, Decl(genericSpecializations1.ts, 13, 8))
 >x : Symbol(x, Decl(genericSpecializations1.ts, 13, 11))
 >T : Symbol(T, Decl(genericSpecializations1.ts, 13, 8))
diff --git a/tests/baselines/reference/genericSpecializations3.errors.txt b/tests/baselines/reference/genericSpecializations3.errors.txt
index ccaa839f9d0..87a7d5bcce7 100644
--- a/tests/baselines/reference/genericSpecializations3.errors.txt
+++ b/tests/baselines/reference/genericSpecializations3.errors.txt
@@ -2,17 +2,17 @@ tests/cases/compiler/genericSpecializations3.ts(8,7): error TS2420: Class 'IntFo
   Types of property 'foo' are incompatible.
     Type '(x: string) => string' is not assignable to type '(x: number) => number'.
       Types of parameters 'x' and 'x' are incompatible.
-        Type 'string' is not assignable to type 'number'.
+        Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/genericSpecializations3.ts(28,1): error TS2322: Type 'StringFoo2' is not assignable to type 'IntFoo'.
   Types of property 'foo' are incompatible.
     Type '(x: string) => string' is not assignable to type '(x: number) => number'.
       Types of parameters 'x' and 'x' are incompatible.
-        Type 'string' is not assignable to type 'number'.
+        Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/genericSpecializations3.ts(29,1): error TS2322: Type 'IntFoo' is not assignable to type 'StringFoo2'.
   Types of property 'foo' are incompatible.
     Type '(x: number) => number' is not assignable to type '(x: string) => string'.
       Types of parameters 'x' and 'x' are incompatible.
-        Type 'number' is not assignable to type 'string'.
+        Type 'string' is not assignable to type 'number'.
 
 
 ==== tests/cases/compiler/genericSpecializations3.ts (3 errors) ====
@@ -29,7 +29,7 @@ tests/cases/compiler/genericSpecializations3.ts(29,1): error TS2322: Type 'IntFo
 !!! error TS2420:   Types of property 'foo' are incompatible.
 !!! error TS2420:     Type '(x: string) => string' is not assignable to type '(x: number) => number'.
 !!! error TS2420:       Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2420:         Type 'string' is not assignable to type 'number'.
+!!! error TS2420:         Type 'number' is not assignable to type 'string'.
         foo(x: string): string { return null; }
     }
     
@@ -55,14 +55,14 @@ tests/cases/compiler/genericSpecializations3.ts(29,1): error TS2322: Type 'IntFo
 !!! error TS2322:   Types of property 'foo' are incompatible.
 !!! error TS2322:     Type '(x: string) => string' is not assignable to type '(x: number) => number'.
 !!! error TS2322:       Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:         Type 'string' is not assignable to type 'number'.
+!!! error TS2322:         Type 'number' is not assignable to type 'string'.
     stringFoo2 = intFoo; // error
     ~~~~~~~~~~
 !!! error TS2322: Type 'IntFoo' is not assignable to type 'StringFoo2'.
 !!! error TS2322:   Types of property 'foo' are incompatible.
 !!! error TS2322:     Type '(x: number) => number' is not assignable to type '(x: string) => string'.
 !!! error TS2322:       Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:         Type 'number' is not assignable to type 'string'.
+!!! error TS2322:         Type 'string' is not assignable to type 'number'.
     
     
     class StringFoo3 implements IFoo<string> { // error
diff --git a/tests/baselines/reference/genericTypeAliases.symbols b/tests/baselines/reference/genericTypeAliases.symbols
index 1a1d0e51487..d5f68ec0615 100644
--- a/tests/baselines/reference/genericTypeAliases.symbols
+++ b/tests/baselines/reference/genericTypeAliases.symbols
@@ -130,11 +130,11 @@ interface Tuple<A, B> {
 >B : Symbol(B, Decl(genericTypeAliases.ts, 41, 18))
 
     a: A;
->a : Symbol(a, Decl(genericTypeAliases.ts, 41, 23))
+>a : Symbol(Tuple.a, Decl(genericTypeAliases.ts, 41, 23))
 >A : Symbol(A, Decl(genericTypeAliases.ts, 41, 16))
 
     b: B;
->b : Symbol(b, Decl(genericTypeAliases.ts, 42, 9))
+>b : Symbol(Tuple.b, Decl(genericTypeAliases.ts, 42, 9))
 >B : Symbol(B, Decl(genericTypeAliases.ts, 41, 18))
 }
 
@@ -152,7 +152,7 @@ interface TaggedPair<T> extends Pair<T> {
 >T : Symbol(T, Decl(genericTypeAliases.ts, 48, 21))
 
     tag: string;
->tag : Symbol(tag, Decl(genericTypeAliases.ts, 48, 41))
+>tag : Symbol(TaggedPair.tag, Decl(genericTypeAliases.ts, 48, 41))
 }
 
 var p: TaggedPair<number>;
diff --git a/tests/baselines/reference/genericTypeArgumentInference1.symbols b/tests/baselines/reference/genericTypeArgumentInference1.symbols
index 7b88a84337e..da48fc7919d 100644
--- a/tests/baselines/reference/genericTypeArgumentInference1.symbols
+++ b/tests/baselines/reference/genericTypeArgumentInference1.symbols
@@ -18,7 +18,7 @@ module Underscore {
 >Static : Symbol(Static, Decl(genericTypeArgumentInference1.ts, 3, 5))
 
         all<T>(list: T[], iterator?: Iterator<T, boolean>, context?: any): T;
->all : Symbol(all, Decl(genericTypeArgumentInference1.ts, 4, 29))
+>all : Symbol(Static.all, Decl(genericTypeArgumentInference1.ts, 4, 29))
 >T : Symbol(T, Decl(genericTypeArgumentInference1.ts, 5, 12))
 >list : Symbol(list, Decl(genericTypeArgumentInference1.ts, 5, 15))
 >T : Symbol(T, Decl(genericTypeArgumentInference1.ts, 5, 12))
@@ -29,7 +29,7 @@ module Underscore {
 >T : Symbol(T, Decl(genericTypeArgumentInference1.ts, 5, 12))
 
         identity<T>(value: T): T;
->identity : Symbol(identity, Decl(genericTypeArgumentInference1.ts, 5, 77))
+>identity : Symbol(Static.identity, Decl(genericTypeArgumentInference1.ts, 5, 77))
 >T : Symbol(T, Decl(genericTypeArgumentInference1.ts, 6, 17))
 >value : Symbol(value, Decl(genericTypeArgumentInference1.ts, 6, 20))
 >T : Symbol(T, Decl(genericTypeArgumentInference1.ts, 6, 17))
diff --git a/tests/baselines/reference/genericTypeAssertions1.errors.txt b/tests/baselines/reference/genericTypeAssertions1.errors.txt
index 5479c5f948e..aa5f14f5da8 100644
--- a/tests/baselines/reference/genericTypeAssertions1.errors.txt
+++ b/tests/baselines/reference/genericTypeAssertions1.errors.txt
@@ -2,8 +2,8 @@ tests/cases/compiler/genericTypeAssertions1.ts(3,5): error TS2322: Type 'A<numbe
   Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/genericTypeAssertions1.ts(4,5): error TS2322: Type 'A<A<number>>' is not assignable to type 'A<number>'.
   Type 'A<number>' is not assignable to type 'number'.
-tests/cases/compiler/genericTypeAssertions1.ts(4,21): error TS2352: Neither type 'A<number>' nor type 'A<A<number>>' is assignable to the other.
-  Type 'number' is not assignable to type 'A<number>'.
+tests/cases/compiler/genericTypeAssertions1.ts(4,21): error TS2352: Type 'A<number>' cannot be converted to type 'A<A<number>>'.
+  Type 'number' is not comparable to type 'A<number>'.
 
 
 ==== tests/cases/compiler/genericTypeAssertions1.ts (3 errors) ====
@@ -18,5 +18,5 @@ tests/cases/compiler/genericTypeAssertions1.ts(4,21): error TS2352: Neither type
 !!! error TS2322: Type 'A<A<number>>' is not assignable to type 'A<number>'.
 !!! error TS2322:   Type 'A<number>' is not assignable to type 'number'.
                         ~~~~~~~~~~~~~~~~~
-!!! error TS2352: Neither type 'A<number>' nor type 'A<A<number>>' is assignable to the other.
-!!! error TS2352:   Type 'number' is not assignable to type 'A<number>'.
\ No newline at end of file
+!!! error TS2352: Type 'A<number>' cannot be converted to type 'A<A<number>>'.
+!!! error TS2352:   Type 'number' is not comparable to type 'A<number>'.
\ No newline at end of file
diff --git a/tests/baselines/reference/genericTypeAssertions2.errors.txt b/tests/baselines/reference/genericTypeAssertions2.errors.txt
index eda4c83646c..756690f1783 100644
--- a/tests/baselines/reference/genericTypeAssertions2.errors.txt
+++ b/tests/baselines/reference/genericTypeAssertions2.errors.txt
@@ -2,10 +2,10 @@ tests/cases/compiler/genericTypeAssertions2.ts(10,5): error TS2322: Type 'B<stri
   Types of property 'foo' are incompatible.
     Type '(x: string) => void' is not assignable to type '(x: number) => void'.
       Types of parameters 'x' and 'x' are incompatible.
-        Type 'string' is not assignable to type 'number'.
+        Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/genericTypeAssertions2.ts(11,5): error TS2322: Type 'A<number>' is not assignable to type 'B<number>'.
   Property 'bar' is missing in type 'A<number>'.
-tests/cases/compiler/genericTypeAssertions2.ts(13,21): error TS2352: Neither type 'undefined[]' nor type 'A<number>' is assignable to the other.
+tests/cases/compiler/genericTypeAssertions2.ts(13,21): error TS2352: Type 'undefined[]' cannot be converted to type 'A<number>'.
   Property 'foo' is missing in type 'undefined[]'.
 
 
@@ -25,7 +25,7 @@ tests/cases/compiler/genericTypeAssertions2.ts(13,21): error TS2352: Neither typ
 !!! error TS2322:   Types of property 'foo' are incompatible.
 !!! error TS2322:     Type '(x: string) => void' is not assignable to type '(x: number) => void'.
 !!! error TS2322:       Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:         Type 'string' is not assignable to type 'number'.
+!!! error TS2322:         Type 'number' is not assignable to type 'string'.
     var r3: B<number> = <A<number>>new B(); // error
         ~~
 !!! error TS2322: Type 'A<number>' is not assignable to type 'B<number>'.
@@ -33,5 +33,5 @@ tests/cases/compiler/genericTypeAssertions2.ts(13,21): error TS2352: Neither typ
     var r4: A<number> = <A<number>>new A();
     var r5: A<number> = <A<number>>[]; // error
                         ~~~~~~~~~~~~~
-!!! error TS2352: Neither type 'undefined[]' nor type 'A<number>' is assignable to the other.
+!!! error TS2352: Type 'undefined[]' cannot be converted to type 'A<number>'.
 !!! error TS2352:   Property 'foo' is missing in type 'undefined[]'.
\ No newline at end of file
diff --git a/tests/baselines/reference/genericTypeAssertions4.errors.txt b/tests/baselines/reference/genericTypeAssertions4.errors.txt
index 055de774b39..401834930f3 100644
--- a/tests/baselines/reference/genericTypeAssertions4.errors.txt
+++ b/tests/baselines/reference/genericTypeAssertions4.errors.txt
@@ -1,8 +1,8 @@
 tests/cases/compiler/genericTypeAssertions4.ts(19,5): error TS2322: Type 'A' is not assignable to type 'T'.
 tests/cases/compiler/genericTypeAssertions4.ts(20,5): error TS2322: Type 'B' is not assignable to type 'T'.
 tests/cases/compiler/genericTypeAssertions4.ts(21,5): error TS2322: Type 'C' is not assignable to type 'T'.
-tests/cases/compiler/genericTypeAssertions4.ts(23,9): error TS2352: Neither type 'B' nor type 'T' is assignable to the other.
-tests/cases/compiler/genericTypeAssertions4.ts(24,9): error TS2352: Neither type 'C' nor type 'T' is assignable to the other.
+tests/cases/compiler/genericTypeAssertions4.ts(23,9): error TS2352: Type 'B' cannot be converted to type 'T'.
+tests/cases/compiler/genericTypeAssertions4.ts(24,9): error TS2352: Type 'C' cannot be converted to type 'T'.
 
 
 ==== tests/cases/compiler/genericTypeAssertions4.ts (5 errors) ====
@@ -36,8 +36,8 @@ tests/cases/compiler/genericTypeAssertions4.ts(24,9): error TS2352: Neither type
         y = <T>a;
         y = <T>b; // error: cannot convert B to T
             ~~~~
-!!! error TS2352: Neither type 'B' nor type 'T' is assignable to the other.
+!!! error TS2352: Type 'B' cannot be converted to type 'T'.
         y = <T>c; // error: cannot convert C to T
             ~~~~
-!!! error TS2352: Neither type 'C' nor type 'T' is assignable to the other.
+!!! error TS2352: Type 'C' cannot be converted to type 'T'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/genericTypeAssertions5.errors.txt b/tests/baselines/reference/genericTypeAssertions5.errors.txt
index e315a7f122a..45f76073363 100644
--- a/tests/baselines/reference/genericTypeAssertions5.errors.txt
+++ b/tests/baselines/reference/genericTypeAssertions5.errors.txt
@@ -1,8 +1,8 @@
 tests/cases/compiler/genericTypeAssertions5.ts(19,5): error TS2322: Type 'A' is not assignable to type 'T'.
 tests/cases/compiler/genericTypeAssertions5.ts(20,5): error TS2322: Type 'B' is not assignable to type 'T'.
 tests/cases/compiler/genericTypeAssertions5.ts(21,5): error TS2322: Type 'C' is not assignable to type 'T'.
-tests/cases/compiler/genericTypeAssertions5.ts(23,9): error TS2352: Neither type 'B' nor type 'T' is assignable to the other.
-tests/cases/compiler/genericTypeAssertions5.ts(24,9): error TS2352: Neither type 'C' nor type 'T' is assignable to the other.
+tests/cases/compiler/genericTypeAssertions5.ts(23,9): error TS2352: Type 'B' cannot be converted to type 'T'.
+tests/cases/compiler/genericTypeAssertions5.ts(24,9): error TS2352: Type 'C' cannot be converted to type 'T'.
 
 
 ==== tests/cases/compiler/genericTypeAssertions5.ts (5 errors) ====
@@ -36,8 +36,8 @@ tests/cases/compiler/genericTypeAssertions5.ts(24,9): error TS2352: Neither type
         y = <T>a;
         y = <T>b; // error: cannot convert B to T
             ~~~~
-!!! error TS2352: Neither type 'B' nor type 'T' is assignable to the other.
+!!! error TS2352: Type 'B' cannot be converted to type 'T'.
         y = <T>c; // error: cannot convert C to T
             ~~~~
-!!! error TS2352: Neither type 'C' nor type 'T' is assignable to the other.
+!!! error TS2352: Type 'C' cannot be converted to type 'T'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/genericTypeAssertions6.errors.txt b/tests/baselines/reference/genericTypeAssertions6.errors.txt
index 29ca99ecb1a..1bda683b88a 100644
--- a/tests/baselines/reference/genericTypeAssertions6.errors.txt
+++ b/tests/baselines/reference/genericTypeAssertions6.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/compiler/genericTypeAssertions6.ts(8,13): error TS2352: Neither type 'U' nor type 'T' is assignable to the other.
-tests/cases/compiler/genericTypeAssertions6.ts(9,13): error TS2352: Neither type 'T' nor type 'U' is assignable to the other.
-tests/cases/compiler/genericTypeAssertions6.ts(19,17): error TS2352: Neither type 'U' nor type 'T' is assignable to the other.
-  Type 'Date' is not assignable to type 'T'.
+tests/cases/compiler/genericTypeAssertions6.ts(8,13): error TS2352: Type 'U' cannot be converted to type 'T'.
+tests/cases/compiler/genericTypeAssertions6.ts(9,13): error TS2352: Type 'T' cannot be converted to type 'U'.
+tests/cases/compiler/genericTypeAssertions6.ts(19,17): error TS2352: Type 'U' cannot be converted to type 'T'.
+  Type 'Date' is not comparable to type 'T'.
 
 
 ==== tests/cases/compiler/genericTypeAssertions6.ts (3 errors) ====
@@ -14,10 +14,10 @@ tests/cases/compiler/genericTypeAssertions6.ts(19,17): error TS2352: Neither typ
         f(x: T, y: U) {
             x = <T>y;
                 ~~~~
-!!! error TS2352: Neither type 'U' nor type 'T' is assignable to the other.
+!!! error TS2352: Type 'U' cannot be converted to type 'T'.
             y = <U>x;
                 ~~~~
-!!! error TS2352: Neither type 'T' nor type 'U' is assignable to the other.
+!!! error TS2352: Type 'T' cannot be converted to type 'U'.
         }
     }
     
@@ -29,8 +29,8 @@ tests/cases/compiler/genericTypeAssertions6.ts(19,17): error TS2352: Neither typ
             var d = <U>new Date();
             var e = <T><U>new Date();
                     ~~~~~~~~~~~~~~~~
-!!! error TS2352: Neither type 'U' nor type 'T' is assignable to the other.
-!!! error TS2352:   Type 'Date' is not assignable to type 'T'.
+!!! error TS2352: Type 'U' cannot be converted to type 'T'.
+!!! error TS2352:   Type 'Date' is not comparable to type 'T'.
         }
     }
     
diff --git a/tests/baselines/reference/genericTypeParameterEquivalence2.symbols b/tests/baselines/reference/genericTypeParameterEquivalence2.symbols
index cd558fdd10a..1aa22b1e994 100644
--- a/tests/baselines/reference/genericTypeParameterEquivalence2.symbols
+++ b/tests/baselines/reference/genericTypeParameterEquivalence2.symbols
@@ -24,9 +24,9 @@ function compose<A, B, C>(f: (b: B) => C, g: (a:A) => B): (a:A) => C {
 
         return f(g.apply(null, a));
 >f : Symbol(f, Decl(genericTypeParameterEquivalence2.ts, 1, 26))
->g.apply : Symbol(Function.apply, Decl(lib.d.ts, --, --))
+>g.apply : Symbol(Function.apply, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >g : Symbol(g, Decl(genericTypeParameterEquivalence2.ts, 1, 41))
->apply : Symbol(Function.apply, Decl(lib.d.ts, --, --))
+>apply : Symbol(Function.apply, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >a : Symbol(a, Decl(genericTypeParameterEquivalence2.ts, 2, 21))
 
     };
diff --git a/tests/baselines/reference/genericTypeParameterEquivalence2.types b/tests/baselines/reference/genericTypeParameterEquivalence2.types
index 3b2c533543d..9fdb03b0fbe 100644
--- a/tests/baselines/reference/genericTypeParameterEquivalence2.types
+++ b/tests/baselines/reference/genericTypeParameterEquivalence2.types
@@ -26,10 +26,10 @@ function compose<A, B, C>(f: (b: B) => C, g: (a:A) => B): (a:A) => C {
         return f(g.apply(null, a));
 >f(g.apply(null, a)) : C
 >f : (b: B) => C
->g.apply(null, a) : any
->g.apply : (thisArg: any, argArray?: any) => any
+>g.apply(null, a) : B
+>g.apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
 >g : (a: A) => B
->apply : (thisArg: any, argArray?: any) => any
+>apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
 >null : null
 >a : A
 
diff --git a/tests/baselines/reference/genericTypeWithCallableMembers.symbols b/tests/baselines/reference/genericTypeWithCallableMembers.symbols
index f162ddf64cc..810f67316d4 100644
--- a/tests/baselines/reference/genericTypeWithCallableMembers.symbols
+++ b/tests/baselines/reference/genericTypeWithCallableMembers.symbols
@@ -12,25 +12,25 @@ class C<T extends Constructable> {
 >Constructable : Symbol(Constructable, Decl(genericTypeWithCallableMembers.ts, 0, 0))
 
     constructor(public data: T, public data2: Constructable) { }
->data : Symbol(data, Decl(genericTypeWithCallableMembers.ts, 5, 16))
+>data : Symbol(C.data, Decl(genericTypeWithCallableMembers.ts, 5, 16))
 >T : Symbol(T, Decl(genericTypeWithCallableMembers.ts, 4, 8))
->data2 : Symbol(data2, Decl(genericTypeWithCallableMembers.ts, 5, 31))
+>data2 : Symbol(C.data2, Decl(genericTypeWithCallableMembers.ts, 5, 31))
 >Constructable : Symbol(Constructable, Decl(genericTypeWithCallableMembers.ts, 0, 0))
 
     create() {
->create : Symbol(create, Decl(genericTypeWithCallableMembers.ts, 5, 64))
+>create : Symbol(C.create, Decl(genericTypeWithCallableMembers.ts, 5, 64))
 
         var x = new this.data(); // no error
 >x : Symbol(x, Decl(genericTypeWithCallableMembers.ts, 7, 11))
->this.data : Symbol(data, Decl(genericTypeWithCallableMembers.ts, 5, 16))
+>this.data : Symbol(C.data, Decl(genericTypeWithCallableMembers.ts, 5, 16))
 >this : Symbol(C, Decl(genericTypeWithCallableMembers.ts, 2, 1))
->data : Symbol(data, Decl(genericTypeWithCallableMembers.ts, 5, 16))
+>data : Symbol(C.data, Decl(genericTypeWithCallableMembers.ts, 5, 16))
 
         var x2 = new this.data2(); // was error, shouldn't be
 >x2 : Symbol(x2, Decl(genericTypeWithCallableMembers.ts, 8, 11))
->this.data2 : Symbol(data2, Decl(genericTypeWithCallableMembers.ts, 5, 31))
+>this.data2 : Symbol(C.data2, Decl(genericTypeWithCallableMembers.ts, 5, 31))
 >this : Symbol(C, Decl(genericTypeWithCallableMembers.ts, 2, 1))
->data2 : Symbol(data2, Decl(genericTypeWithCallableMembers.ts, 5, 31))
+>data2 : Symbol(C.data2, Decl(genericTypeWithCallableMembers.ts, 5, 31))
     }
 }
 
diff --git a/tests/baselines/reference/genericTypeWithMultipleBases1.symbols b/tests/baselines/reference/genericTypeWithMultipleBases1.symbols
index f38f47e9038..87a6e9a75ca 100644
--- a/tests/baselines/reference/genericTypeWithMultipleBases1.symbols
+++ b/tests/baselines/reference/genericTypeWithMultipleBases1.symbols
@@ -3,14 +3,14 @@ export interface I1 {
 >I1 : Symbol(I1, Decl(genericTypeWithMultipleBases1.ts, 0, 0))
 
     m1: () => void;
->m1 : Symbol(m1, Decl(genericTypeWithMultipleBases1.ts, 0, 21))
+>m1 : Symbol(I1.m1, Decl(genericTypeWithMultipleBases1.ts, 0, 21))
 }
  
 export interface I2 {
 >I2 : Symbol(I2, Decl(genericTypeWithMultipleBases1.ts, 2, 1))
 
     m2: () => void;
->m2 : Symbol(m2, Decl(genericTypeWithMultipleBases1.ts, 4, 21))
+>m2 : Symbol(I2.m2, Decl(genericTypeWithMultipleBases1.ts, 4, 21))
 }
  
 export interface I3<T> extends I1, I2 {
@@ -21,7 +21,7 @@ export interface I3<T> extends I1, I2 {
 
 //export interface I3<T> extends I2, I1 {
     p1: T;
->p1 : Symbol(p1, Decl(genericTypeWithMultipleBases1.ts, 8, 39))
+>p1 : Symbol(I3.p1, Decl(genericTypeWithMultipleBases1.ts, 8, 39))
 >T : Symbol(T, Decl(genericTypeWithMultipleBases1.ts, 8, 20))
 }
  
diff --git a/tests/baselines/reference/genericTypeWithMultipleBases2.symbols b/tests/baselines/reference/genericTypeWithMultipleBases2.symbols
index e5b97ce73fa..c15e1820f4b 100644
--- a/tests/baselines/reference/genericTypeWithMultipleBases2.symbols
+++ b/tests/baselines/reference/genericTypeWithMultipleBases2.symbols
@@ -3,14 +3,14 @@ export interface I1 {
 >I1 : Symbol(I1, Decl(genericTypeWithMultipleBases2.ts, 0, 0))
 
     m1: () => void;
->m1 : Symbol(m1, Decl(genericTypeWithMultipleBases2.ts, 0, 21))
+>m1 : Symbol(I1.m1, Decl(genericTypeWithMultipleBases2.ts, 0, 21))
 }
  
 export interface I2 {
 >I2 : Symbol(I2, Decl(genericTypeWithMultipleBases2.ts, 2, 1))
 
     m2: () => void;
->m2 : Symbol(m2, Decl(genericTypeWithMultipleBases2.ts, 4, 21))
+>m2 : Symbol(I2.m2, Decl(genericTypeWithMultipleBases2.ts, 4, 21))
 }
  
 export interface I3<T> extends I2, I1 {
@@ -20,7 +20,7 @@ export interface I3<T> extends I2, I1 {
 >I1 : Symbol(I1, Decl(genericTypeWithMultipleBases2.ts, 0, 0))
 
     p1: T;
->p1 : Symbol(p1, Decl(genericTypeWithMultipleBases2.ts, 8, 39))
+>p1 : Symbol(I3.p1, Decl(genericTypeWithMultipleBases2.ts, 8, 39))
 >T : Symbol(T, Decl(genericTypeWithMultipleBases2.ts, 8, 20))
 }
  
diff --git a/tests/baselines/reference/genericTypeWithMultipleBases3.symbols b/tests/baselines/reference/genericTypeWithMultipleBases3.symbols
index 024ddcdf374..d645c829a35 100644
--- a/tests/baselines/reference/genericTypeWithMultipleBases3.symbols
+++ b/tests/baselines/reference/genericTypeWithMultipleBases3.symbols
@@ -4,7 +4,7 @@ interface IA<T> {
 >T : Symbol(T, Decl(genericTypeWithMultipleBases3.ts, 0, 13))
 
 foo(x: T): T;
->foo : Symbol(foo, Decl(genericTypeWithMultipleBases3.ts, 0, 17))
+>foo : Symbol(IA.foo, Decl(genericTypeWithMultipleBases3.ts, 0, 17))
 >x : Symbol(x, Decl(genericTypeWithMultipleBases3.ts, 2, 4))
 >T : Symbol(T, Decl(genericTypeWithMultipleBases3.ts, 0, 13))
 >T : Symbol(T, Decl(genericTypeWithMultipleBases3.ts, 0, 13))
@@ -16,7 +16,7 @@ interface IB<T> {
 >T : Symbol(T, Decl(genericTypeWithMultipleBases3.ts, 6, 13))
 
 bar(x: T): T;
->bar : Symbol(bar, Decl(genericTypeWithMultipleBases3.ts, 6, 17))
+>bar : Symbol(IB.bar, Decl(genericTypeWithMultipleBases3.ts, 6, 17))
 >x : Symbol(x, Decl(genericTypeWithMultipleBases3.ts, 8, 4))
 >T : Symbol(T, Decl(genericTypeWithMultipleBases3.ts, 6, 13))
 >T : Symbol(T, Decl(genericTypeWithMultipleBases3.ts, 6, 13))
diff --git a/tests/baselines/reference/genericTypeWithNonGenericBaseMisMatch.errors.txt b/tests/baselines/reference/genericTypeWithNonGenericBaseMisMatch.errors.txt
index 0fe15afcf33..3ec6fa5e9f6 100644
--- a/tests/baselines/reference/genericTypeWithNonGenericBaseMisMatch.errors.txt
+++ b/tests/baselines/reference/genericTypeWithNonGenericBaseMisMatch.errors.txt
@@ -2,17 +2,14 @@ tests/cases/compiler/genericTypeWithNonGenericBaseMisMatch.ts(4,7): error TS2420
   Types of property 'f' are incompatible.
     Type '(a: T) => void' is not assignable to type '(a: { a: number; }) => void'.
       Types of parameters 'a' and 'a' are incompatible.
-        Type 'T' is not assignable to type '{ a: number; }'.
-          Type '{ a: string; }' is not assignable to type '{ a: number; }'.
-            Types of property 'a' are incompatible.
-              Type 'string' is not assignable to type 'number'.
+        Type '{ a: number; }' is not assignable to type 'T'.
 tests/cases/compiler/genericTypeWithNonGenericBaseMisMatch.ts(8,5): error TS2322: Type 'X<{ a: string; }>' is not assignable to type 'I'.
   Types of property 'f' are incompatible.
     Type '(a: { a: string; }) => void' is not assignable to type '(a: { a: number; }) => void'.
       Types of parameters 'a' and 'a' are incompatible.
-        Type '{ a: string; }' is not assignable to type '{ a: number; }'.
+        Type '{ a: number; }' is not assignable to type '{ a: string; }'.
           Types of property 'a' are incompatible.
-            Type 'string' is not assignable to type 'number'.
+            Type 'number' is not assignable to type 'string'.
 
 
 ==== tests/cases/compiler/genericTypeWithNonGenericBaseMisMatch.ts (2 errors) ====
@@ -25,10 +22,7 @@ tests/cases/compiler/genericTypeWithNonGenericBaseMisMatch.ts(8,5): error TS2322
 !!! error TS2420:   Types of property 'f' are incompatible.
 !!! error TS2420:     Type '(a: T) => void' is not assignable to type '(a: { a: number; }) => void'.
 !!! error TS2420:       Types of parameters 'a' and 'a' are incompatible.
-!!! error TS2420:         Type 'T' is not assignable to type '{ a: number; }'.
-!!! error TS2420:           Type '{ a: string; }' is not assignable to type '{ a: number; }'.
-!!! error TS2420:             Types of property 'a' are incompatible.
-!!! error TS2420:               Type 'string' is not assignable to type 'number'.
+!!! error TS2420:         Type '{ a: number; }' is not assignable to type 'T'.
     	f(a: T): void { }
     }
     var x = new X<{ a: string }>();
@@ -38,7 +32,7 @@ tests/cases/compiler/genericTypeWithNonGenericBaseMisMatch.ts(8,5): error TS2322
 !!! error TS2322:   Types of property 'f' are incompatible.
 !!! error TS2322:     Type '(a: { a: string; }) => void' is not assignable to type '(a: { a: number; }) => void'.
 !!! error TS2322:       Types of parameters 'a' and 'a' are incompatible.
-!!! error TS2322:         Type '{ a: string; }' is not assignable to type '{ a: number; }'.
+!!! error TS2322:         Type '{ a: number; }' is not assignable to type '{ a: string; }'.
 !!! error TS2322:           Types of property 'a' are incompatible.
-!!! error TS2322:             Type 'string' is not assignable to type 'number'.
+!!! error TS2322:             Type 'number' is not assignable to type 'string'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/genericWithCallSignatureReturningSpecialization.symbols b/tests/baselines/reference/genericWithCallSignatureReturningSpecialization.symbols
index 02e73f4819e..3de80ba3f1c 100644
--- a/tests/baselines/reference/genericWithCallSignatureReturningSpecialization.symbols
+++ b/tests/baselines/reference/genericWithCallSignatureReturningSpecialization.symbols
@@ -4,7 +4,7 @@ interface B<T> {
 >T : Symbol(T, Decl(genericWithCallSignatureReturningSpecialization.ts, 0, 12))
 
     f(): B<number>;
->f : Symbol(f, Decl(genericWithCallSignatureReturningSpecialization.ts, 0, 16))
+>f : Symbol(B.f, Decl(genericWithCallSignatureReturningSpecialization.ts, 0, 16))
 >B : Symbol(B, Decl(genericWithCallSignatureReturningSpecialization.ts, 0, 0))
 
     (value: T): void;
diff --git a/tests/baselines/reference/genericWithCallSignatures1.symbols b/tests/baselines/reference/genericWithCallSignatures1.symbols
index d791308b46e..de20c7c14aa 100644
--- a/tests/baselines/reference/genericWithCallSignatures1.symbols
+++ b/tests/baselines/reference/genericWithCallSignatures1.symbols
@@ -4,17 +4,17 @@ class MyClass {
 >MyClass : Symbol(MyClass, Decl(genericWithCallSignatures_1.ts, 0, 0))
 
     public callableThing: CallableExtention<string>;
->callableThing : Symbol(callableThing, Decl(genericWithCallSignatures_1.ts, 1, 15))
+>callableThing : Symbol(MyClass.callableThing, Decl(genericWithCallSignatures_1.ts, 1, 15))
 >CallableExtention : Symbol(CallableExtention, Decl(genericWithCallSignatures_0.ts, 3, 1))
 
     public myMethod() {
->myMethod : Symbol(myMethod, Decl(genericWithCallSignatures_1.ts, 2, 52))
+>myMethod : Symbol(MyClass.myMethod, Decl(genericWithCallSignatures_1.ts, 2, 52))
 
         var x = <string> this.callableThing();
 >x : Symbol(x, Decl(genericWithCallSignatures_1.ts, 5, 11))
->this.callableThing : Symbol(callableThing, Decl(genericWithCallSignatures_1.ts, 1, 15))
+>this.callableThing : Symbol(MyClass.callableThing, Decl(genericWithCallSignatures_1.ts, 1, 15))
 >this : Symbol(MyClass, Decl(genericWithCallSignatures_1.ts, 0, 0))
->callableThing : Symbol(callableThing, Decl(genericWithCallSignatures_1.ts, 1, 15))
+>callableThing : Symbol(MyClass.callableThing, Decl(genericWithCallSignatures_1.ts, 1, 15))
     }
 }
 === tests/cases/compiler/genericWithCallSignatures_0.ts ===
diff --git a/tests/baselines/reference/genericWithIndexerOfTypeParameterType1.symbols b/tests/baselines/reference/genericWithIndexerOfTypeParameterType1.symbols
index 26918e9ebfb..ac7abff8d52 100644
--- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType1.symbols
+++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType1.symbols
@@ -4,17 +4,17 @@ class LazyArray<T> {
 >T : Symbol(T, Decl(genericWithIndexerOfTypeParameterType1.ts, 0, 16))
 
     private objects = <{ [objectId: string]: T; }>{};
->objects : Symbol(objects, Decl(genericWithIndexerOfTypeParameterType1.ts, 0, 20))
+>objects : Symbol(LazyArray.objects, Decl(genericWithIndexerOfTypeParameterType1.ts, 0, 20))
 >objectId : Symbol(objectId, Decl(genericWithIndexerOfTypeParameterType1.ts, 1, 26))
 >T : Symbol(T, Decl(genericWithIndexerOfTypeParameterType1.ts, 0, 16))
 
     array() {
->array : Symbol(array, Decl(genericWithIndexerOfTypeParameterType1.ts, 1, 53))
+>array : Symbol(LazyArray.array, Decl(genericWithIndexerOfTypeParameterType1.ts, 1, 53))
 
         return this.objects;
->this.objects : Symbol(objects, Decl(genericWithIndexerOfTypeParameterType1.ts, 0, 20))
+>this.objects : Symbol(LazyArray.objects, Decl(genericWithIndexerOfTypeParameterType1.ts, 0, 20))
 >this : Symbol(LazyArray, Decl(genericWithIndexerOfTypeParameterType1.ts, 0, 0))
->objects : Symbol(objects, Decl(genericWithIndexerOfTypeParameterType1.ts, 0, 20))
+>objects : Symbol(LazyArray.objects, Decl(genericWithIndexerOfTypeParameterType1.ts, 0, 20))
     }
 }
 var lazyArray = new LazyArray<string>();
diff --git a/tests/baselines/reference/genericWithIndexerOfTypeParameterType1.types b/tests/baselines/reference/genericWithIndexerOfTypeParameterType1.types
index 337993dc2a6..a316773e5c8 100644
--- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType1.types
+++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType1.types
@@ -8,7 +8,7 @@ class LazyArray<T> {
 ><{ [objectId: string]: T; }>{} : { [objectId: string]: T; }
 >objectId : string
 >T : T
->{} : { [x: string]: undefined; }
+>{} : {}
 
     array() {
 >array : () => { [objectId: string]: T; }
diff --git a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.symbols b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.symbols
index d09abef57be..d029796b2b1 100644
--- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.symbols
+++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.symbols
@@ -5,7 +5,7 @@ export class Collection<TItem extends CollectionItem> {
 >CollectionItem : Symbol(CollectionItem, Decl(genericWithIndexerOfTypeParameterType2.ts, 6, 1))
 
     _itemsByKey: { [key: string]: TItem; };
->_itemsByKey : Symbol(_itemsByKey, Decl(genericWithIndexerOfTypeParameterType2.ts, 0, 55))
+>_itemsByKey : Symbol(Collection._itemsByKey, Decl(genericWithIndexerOfTypeParameterType2.ts, 0, 55))
 >key : Symbol(key, Decl(genericWithIndexerOfTypeParameterType2.ts, 1, 20))
 >TItem : Symbol(TItem, Decl(genericWithIndexerOfTypeParameterType2.ts, 0, 24))
 }
@@ -16,7 +16,7 @@ export class List extends Collection<ListItem>{
 >ListItem : Symbol(ListItem, Decl(genericWithIndexerOfTypeParameterType2.ts, 8, 30))
 
     Bar() {}
->Bar : Symbol(Bar, Decl(genericWithIndexerOfTypeParameterType2.ts, 4, 47))
+>Bar : Symbol(List.Bar, Decl(genericWithIndexerOfTypeParameterType2.ts, 4, 47))
 }
 
 export class CollectionItem {}
@@ -27,6 +27,6 @@ export class ListItem extends CollectionItem {
 >CollectionItem : Symbol(CollectionItem, Decl(genericWithIndexerOfTypeParameterType2.ts, 6, 1))
 
     __isNew: boolean;
->__isNew : Symbol(__isNew, Decl(genericWithIndexerOfTypeParameterType2.ts, 10, 46))
+>__isNew : Symbol(ListItem.__isNew, Decl(genericWithIndexerOfTypeParameterType2.ts, 10, 46))
 }
 
diff --git a/tests/baselines/reference/generics0.symbols b/tests/baselines/reference/generics0.symbols
index 801b56fe718..9d23b667790 100644
--- a/tests/baselines/reference/generics0.symbols
+++ b/tests/baselines/reference/generics0.symbols
@@ -4,7 +4,7 @@ interface G<T> {
 >T : Symbol(T, Decl(generics0.ts, 0, 12))
 
     x: T;
->x : Symbol(x, Decl(generics0.ts, 0, 16))
+>x : Symbol(G.x, Decl(generics0.ts, 0, 16))
 >T : Symbol(T, Decl(generics0.ts, 0, 12))
 }
 
diff --git a/tests/baselines/reference/generics1NoError.symbols b/tests/baselines/reference/generics1NoError.symbols
index fcf820f79c4..12d6bac9459 100644
--- a/tests/baselines/reference/generics1NoError.symbols
+++ b/tests/baselines/reference/generics1NoError.symbols
@@ -1,17 +1,17 @@
 === tests/cases/compiler/generics1NoError.ts ===
 interface A { a: string; }
 >A : Symbol(A, Decl(generics1NoError.ts, 0, 0))
->a : Symbol(a, Decl(generics1NoError.ts, 0, 13))
+>a : Symbol(A.a, Decl(generics1NoError.ts, 0, 13))
 
 interface B extends A { b: string; }
 >B : Symbol(B, Decl(generics1NoError.ts, 0, 26))
 >A : Symbol(A, Decl(generics1NoError.ts, 0, 0))
->b : Symbol(b, Decl(generics1NoError.ts, 1, 23))
+>b : Symbol(B.b, Decl(generics1NoError.ts, 1, 23))
 
 interface C extends B { c: string; }
 >C : Symbol(C, Decl(generics1NoError.ts, 1, 36))
 >B : Symbol(B, Decl(generics1NoError.ts, 0, 26))
->c : Symbol(c, Decl(generics1NoError.ts, 2, 23))
+>c : Symbol(C.c, Decl(generics1NoError.ts, 2, 23))
 
 interface G<T, U extends B> {
 >G : Symbol(G, Decl(generics1NoError.ts, 2, 36))
@@ -20,11 +20,11 @@ interface G<T, U extends B> {
 >B : Symbol(B, Decl(generics1NoError.ts, 0, 26))
 
     x: T;
->x : Symbol(x, Decl(generics1NoError.ts, 3, 29))
+>x : Symbol(G.x, Decl(generics1NoError.ts, 3, 29))
 >T : Symbol(T, Decl(generics1NoError.ts, 3, 12))
 
     y: U;
->y : Symbol(y, Decl(generics1NoError.ts, 4, 9))
+>y : Symbol(G.y, Decl(generics1NoError.ts, 4, 9))
 >U : Symbol(U, Decl(generics1NoError.ts, 3, 14))
 }
 var v1: G<A, C>;               // Ok
diff --git a/tests/baselines/reference/generics2NoError.symbols b/tests/baselines/reference/generics2NoError.symbols
index 165eb435a50..6c7f00bdcbe 100644
--- a/tests/baselines/reference/generics2NoError.symbols
+++ b/tests/baselines/reference/generics2NoError.symbols
@@ -1,17 +1,17 @@
 === tests/cases/compiler/generics2NoError.ts ===
 interface A { a: string; }
 >A : Symbol(A, Decl(generics2NoError.ts, 0, 0))
->a : Symbol(a, Decl(generics2NoError.ts, 0, 13))
+>a : Symbol(A.a, Decl(generics2NoError.ts, 0, 13))
 
 interface B extends A { b: string; }
 >B : Symbol(B, Decl(generics2NoError.ts, 0, 26))
 >A : Symbol(A, Decl(generics2NoError.ts, 0, 0))
->b : Symbol(b, Decl(generics2NoError.ts, 1, 23))
+>b : Symbol(B.b, Decl(generics2NoError.ts, 1, 23))
 
 interface C extends B { c: string; }
 >C : Symbol(C, Decl(generics2NoError.ts, 1, 36))
 >B : Symbol(B, Decl(generics2NoError.ts, 0, 26))
->c : Symbol(c, Decl(generics2NoError.ts, 2, 23))
+>c : Symbol(C.c, Decl(generics2NoError.ts, 2, 23))
 
 interface G<T, U extends B> {
 >G : Symbol(G, Decl(generics2NoError.ts, 2, 36))
@@ -20,11 +20,11 @@ interface G<T, U extends B> {
 >B : Symbol(B, Decl(generics2NoError.ts, 0, 26))
 
     x: T;
->x : Symbol(x, Decl(generics2NoError.ts, 3, 29))
+>x : Symbol(G.x, Decl(generics2NoError.ts, 3, 29))
 >T : Symbol(T, Decl(generics2NoError.ts, 3, 12))
 
     y: U;
->y : Symbol(y, Decl(generics2NoError.ts, 4, 9))
+>y : Symbol(G.y, Decl(generics2NoError.ts, 4, 9))
 >U : Symbol(U, Decl(generics2NoError.ts, 3, 14))
 }
 
diff --git a/tests/baselines/reference/generics3.symbols b/tests/baselines/reference/generics3.symbols
index be9c583ff5f..c5e882b221a 100644
--- a/tests/baselines/reference/generics3.symbols
+++ b/tests/baselines/reference/generics3.symbols
@@ -2,16 +2,16 @@
 class C<T> { private x: T; }
 >C : Symbol(C, Decl(generics3.ts, 0, 0))
 >T : Symbol(T, Decl(generics3.ts, 0, 8))
->x : Symbol(x, Decl(generics3.ts, 0, 12))
+>x : Symbol(C.x, Decl(generics3.ts, 0, 12))
 >T : Symbol(T, Decl(generics3.ts, 0, 8))
 
 interface X { f(): string; }
 >X : Symbol(X, Decl(generics3.ts, 0, 28))
->f : Symbol(f, Decl(generics3.ts, 1, 13))
+>f : Symbol(X.f, Decl(generics3.ts, 1, 13))
 
 interface Y { f(): string; }
 >Y : Symbol(Y, Decl(generics3.ts, 1, 28))
->f : Symbol(f, Decl(generics3.ts, 2, 13))
+>f : Symbol(Y.f, Decl(generics3.ts, 2, 13))
 
 var a: C<X>;
 >a : Symbol(a, Decl(generics3.ts, 3, 3))
diff --git a/tests/baselines/reference/generics4NoError.symbols b/tests/baselines/reference/generics4NoError.symbols
index 9ea547d4db9..dd7eca8d2b4 100644
--- a/tests/baselines/reference/generics4NoError.symbols
+++ b/tests/baselines/reference/generics4NoError.symbols
@@ -2,16 +2,16 @@
 class C<T> { private x: T; }
 >C : Symbol(C, Decl(generics4NoError.ts, 0, 0))
 >T : Symbol(T, Decl(generics4NoError.ts, 0, 8))
->x : Symbol(x, Decl(generics4NoError.ts, 0, 12))
+>x : Symbol(C.x, Decl(generics4NoError.ts, 0, 12))
 >T : Symbol(T, Decl(generics4NoError.ts, 0, 8))
 
 interface X { f(): string; }
 >X : Symbol(X, Decl(generics4NoError.ts, 0, 28))
->f : Symbol(f, Decl(generics4NoError.ts, 1, 13))
+>f : Symbol(X.f, Decl(generics4NoError.ts, 1, 13))
 
 interface Y { f(): boolean; }
 >Y : Symbol(Y, Decl(generics4NoError.ts, 1, 28))
->f : Symbol(f, Decl(generics4NoError.ts, 2, 13))
+>f : Symbol(Y.f, Decl(generics4NoError.ts, 2, 13))
 
 var a: C<X>;
 >a : Symbol(a, Decl(generics4NoError.ts, 3, 3))
diff --git a/tests/baselines/reference/getAndSetNotIdenticalType.errors.txt b/tests/baselines/reference/getAndSetNotIdenticalType.errors.txt
index 6c55f966eee..a16cbfe7b37 100644
--- a/tests/baselines/reference/getAndSetNotIdenticalType.errors.txt
+++ b/tests/baselines/reference/getAndSetNotIdenticalType.errors.txt
@@ -1,23 +1,21 @@
-tests/cases/compiler/getAndSetNotIdenticalType.ts(2,5): error TS2380: 'get' and 'set' accessor must have the same type.
 tests/cases/compiler/getAndSetNotIdenticalType.ts(2,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-tests/cases/compiler/getAndSetNotIdenticalType.ts(5,5): error TS2380: 'get' and 'set' accessor must have the same type.
+tests/cases/compiler/getAndSetNotIdenticalType.ts(2,9): error TS2380: 'get' and 'set' accessor must have the same type.
 tests/cases/compiler/getAndSetNotIdenticalType.ts(5,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+tests/cases/compiler/getAndSetNotIdenticalType.ts(5,9): error TS2380: 'get' and 'set' accessor must have the same type.
 
 
 ==== tests/cases/compiler/getAndSetNotIdenticalType.ts (4 errors) ====
     class C {
         get x(): number {
-        ~~~~~~~~~~~~~~~~~
             ~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+            ~
+!!! error TS2380: 'get' and 'set' accessor must have the same type.
             return 1;
-    ~~~~~~~~~~~~~~~~~
         }
-    ~~~~~
-!!! error TS2380: 'get' and 'set' accessor must have the same type.
         set x(v: string) { }
-        ~~~~~~~~~~~~~~~~~~~~
-!!! error TS2380: 'get' and 'set' accessor must have the same type.
             ~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+            ~
+!!! error TS2380: 'get' and 'set' accessor must have the same type.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/getAndSetNotIdenticalType2.errors.txt b/tests/baselines/reference/getAndSetNotIdenticalType2.errors.txt
index 5cdb9b3a36f..c9fae8cc89c 100644
--- a/tests/baselines/reference/getAndSetNotIdenticalType2.errors.txt
+++ b/tests/baselines/reference/getAndSetNotIdenticalType2.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/compiler/getAndSetNotIdenticalType2.ts(5,5): error TS2380: 'get' and 'set' accessor must have the same type.
 tests/cases/compiler/getAndSetNotIdenticalType2.ts(5,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-tests/cases/compiler/getAndSetNotIdenticalType2.ts(8,5): error TS2380: 'get' and 'set' accessor must have the same type.
+tests/cases/compiler/getAndSetNotIdenticalType2.ts(5,9): error TS2380: 'get' and 'set' accessor must have the same type.
 tests/cases/compiler/getAndSetNotIdenticalType2.ts(8,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+tests/cases/compiler/getAndSetNotIdenticalType2.ts(8,9): error TS2380: 'get' and 'set' accessor must have the same type.
 tests/cases/compiler/getAndSetNotIdenticalType2.ts(9,9): error TS2322: Type 'A<string>' is not assignable to type 'A<T>'.
   Type 'string' is not assignable to type 'T'.
 
@@ -12,26 +12,22 @@ tests/cases/compiler/getAndSetNotIdenticalType2.ts(9,9): error TS2322: Type 'A<s
     class C<T> {
         data: A<T>;
         get x(): A<T> {
-        ~~~~~~~~~~~~~~~
             ~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-            return this.data;
-    ~~~~~~~~~~~~~~~~~~~~~~~~~
-        }
-    ~~~~~
+            ~
 !!! error TS2380: 'get' and 'set' accessor must have the same type.
+            return this.data;
+        }
         set x(v: A<string>) {
-        ~~~~~~~~~~~~~~~~~~~~~
             ~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+            ~
+!!! error TS2380: 'get' and 'set' accessor must have the same type.
             this.data = v;
-    ~~~~~~~~~~~~~~~~~~~~~~
             ~~~~~~~~~
 !!! error TS2322: Type 'A<string>' is not assignable to type 'A<T>'.
 !!! error TS2322:   Type 'string' is not assignable to type 'T'.
         }
-    ~~~~~
-!!! error TS2380: 'get' and 'set' accessor must have the same type.
     }
     
     var x = new C();
diff --git a/tests/baselines/reference/getAndSetNotIdenticalType3.errors.txt b/tests/baselines/reference/getAndSetNotIdenticalType3.errors.txt
index 0aac384f7c3..3fb17d65a40 100644
--- a/tests/baselines/reference/getAndSetNotIdenticalType3.errors.txt
+++ b/tests/baselines/reference/getAndSetNotIdenticalType3.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/compiler/getAndSetNotIdenticalType3.ts(5,5): error TS2380: 'get' and 'set' accessor must have the same type.
 tests/cases/compiler/getAndSetNotIdenticalType3.ts(5,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-tests/cases/compiler/getAndSetNotIdenticalType3.ts(8,5): error TS2380: 'get' and 'set' accessor must have the same type.
+tests/cases/compiler/getAndSetNotIdenticalType3.ts(5,9): error TS2380: 'get' and 'set' accessor must have the same type.
 tests/cases/compiler/getAndSetNotIdenticalType3.ts(8,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+tests/cases/compiler/getAndSetNotIdenticalType3.ts(8,9): error TS2380: 'get' and 'set' accessor must have the same type.
 tests/cases/compiler/getAndSetNotIdenticalType3.ts(9,9): error TS2322: Type 'A<string>' is not assignable to type 'A<number>'.
   Type 'string' is not assignable to type 'number'.
 
@@ -12,26 +12,22 @@ tests/cases/compiler/getAndSetNotIdenticalType3.ts(9,9): error TS2322: Type 'A<s
     class C<T> {
         data: A<number>;
         get x(): A<number> {
-        ~~~~~~~~~~~~~~~~~~~~
             ~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-            return this.data;
-    ~~~~~~~~~~~~~~~~~~~~~~~~~
-        }
-    ~~~~~
+            ~
 !!! error TS2380: 'get' and 'set' accessor must have the same type.
+            return this.data;
+        }
         set x(v: A<string>) {
-        ~~~~~~~~~~~~~~~~~~~~~
             ~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+            ~
+!!! error TS2380: 'get' and 'set' accessor must have the same type.
             this.data = v;
-    ~~~~~~~~~~~~~~~~~~~~~~
             ~~~~~~~~~
 !!! error TS2322: Type 'A<string>' is not assignable to type 'A<number>'.
 !!! error TS2322:   Type 'string' is not assignable to type 'number'.
         }
-    ~~~~~
-!!! error TS2380: 'get' and 'set' accessor must have the same type.
     }
     
     var x = new C();
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/getEmitOutputTsxFile_React.baseline b/tests/baselines/reference/getEmitOutputTsxFile_React.baseline
index 5b668fd65e8..c92edaed88e 100644
--- a/tests/baselines/reference/getEmitOutputTsxFile_React.baseline
+++ b/tests/baselines/reference/getEmitOutputTsxFile_React.baseline
@@ -19,7 +19,7 @@ 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
 var y = "my div";
-var x = React.createElement("div", {name: y});
+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;
diff --git a/tests/baselines/reference/heterogeneousArrayLiterals.symbols b/tests/baselines/reference/heterogeneousArrayLiterals.symbols
index c1d98b5873a..e74a037703b 100644
--- a/tests/baselines/reference/heterogeneousArrayLiterals.symbols
+++ b/tests/baselines/reference/heterogeneousArrayLiterals.symbols
@@ -52,17 +52,17 @@ var n = [[() => 1], [() => '']]; // {}[]
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(heterogeneousArrayLiterals.ts, 18, 32))
->foo : Symbol(foo, Decl(heterogeneousArrayLiterals.ts, 20, 12))
+>foo : Symbol(Base.foo, Decl(heterogeneousArrayLiterals.ts, 20, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(heterogeneousArrayLiterals.ts, 20, 27), Decl(heterogeneousArrayLiterals.ts, 25, 23))
 >Base : Symbol(Base, Decl(heterogeneousArrayLiterals.ts, 18, 32))
->bar : Symbol(bar, Decl(heterogeneousArrayLiterals.ts, 21, 28))
+>bar : Symbol(Derived.bar, Decl(heterogeneousArrayLiterals.ts, 21, 28))
 
 class Derived2 extends Base { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(heterogeneousArrayLiterals.ts, 21, 43))
 >Base : Symbol(Base, Decl(heterogeneousArrayLiterals.ts, 18, 32))
->baz : Symbol(baz, Decl(heterogeneousArrayLiterals.ts, 22, 29))
+>baz : Symbol(Derived2.baz, Decl(heterogeneousArrayLiterals.ts, 22, 29))
 
 var base: Base;
 >base : Symbol(base, Decl(heterogeneousArrayLiterals.ts, 23, 3))
diff --git a/tests/baselines/reference/icomparable.symbols b/tests/baselines/reference/icomparable.symbols
index 03eac6b5bec..5d3621ce178 100644
--- a/tests/baselines/reference/icomparable.symbols
+++ b/tests/baselines/reference/icomparable.symbols
@@ -4,7 +4,7 @@
 >T : Symbol(T, Decl(icomparable.ts, 0, 26))
 
        compareTo(other: T);
->compareTo : Symbol(compareTo, Decl(icomparable.ts, 0, 30))
+>compareTo : Symbol(IComparable.compareTo, Decl(icomparable.ts, 0, 30))
 >other : Symbol(other, Decl(icomparable.ts, 1, 17))
 >T : Symbol(T, Decl(icomparable.ts, 0, 26))
     }
diff --git a/tests/baselines/reference/ifDoWhileStatements.symbols b/tests/baselines/reference/ifDoWhileStatements.symbols
index 80c8fc7f1d8..b0ec471aa48 100644
--- a/tests/baselines/reference/ifDoWhileStatements.symbols
+++ b/tests/baselines/reference/ifDoWhileStatements.symbols
@@ -4,7 +4,7 @@ interface I {
 >I : Symbol(I, Decl(ifDoWhileStatements.ts, 0, 0))
 
     id: number;
->id : Symbol(id, Decl(ifDoWhileStatements.ts, 1, 13))
+>id : Symbol(I.id, Decl(ifDoWhileStatements.ts, 1, 13))
 }
 
 class C implements I {
@@ -12,10 +12,10 @@ class C implements I {
 >I : Symbol(I, Decl(ifDoWhileStatements.ts, 0, 0))
 
     id: number;
->id : Symbol(id, Decl(ifDoWhileStatements.ts, 5, 22))
+>id : Symbol(C.id, Decl(ifDoWhileStatements.ts, 5, 22))
 
     name: string;
->name : Symbol(name, Decl(ifDoWhileStatements.ts, 6, 15))
+>name : Symbol(C.name, Decl(ifDoWhileStatements.ts, 6, 15))
 }
 
 class C2 extends C {
@@ -23,7 +23,7 @@ class C2 extends C {
 >C : Symbol(C, Decl(ifDoWhileStatements.ts, 3, 1))
 
     valid: boolean;
->valid : Symbol(valid, Decl(ifDoWhileStatements.ts, 10, 20))
+>valid : Symbol(C2.valid, Decl(ifDoWhileStatements.ts, 10, 20))
 }
 
 class D<T>{
@@ -31,16 +31,16 @@ class D<T>{
 >T : Symbol(T, Decl(ifDoWhileStatements.ts, 14, 8))
 
     source: T;
->source : Symbol(source, Decl(ifDoWhileStatements.ts, 14, 11))
+>source : Symbol(D.source, Decl(ifDoWhileStatements.ts, 14, 11))
 >T : Symbol(T, Decl(ifDoWhileStatements.ts, 14, 8))
 
     recurse: D<T>;
->recurse : Symbol(recurse, Decl(ifDoWhileStatements.ts, 15, 14))
+>recurse : Symbol(D.recurse, Decl(ifDoWhileStatements.ts, 15, 14))
 >D : Symbol(D, Decl(ifDoWhileStatements.ts, 12, 1))
 >T : Symbol(T, Decl(ifDoWhileStatements.ts, 14, 8))
 
     wrapped: D<D<T>>
->wrapped : Symbol(wrapped, Decl(ifDoWhileStatements.ts, 16, 18))
+>wrapped : Symbol(D.wrapped, Decl(ifDoWhileStatements.ts, 16, 18))
 >D : Symbol(D, Decl(ifDoWhileStatements.ts, 12, 1))
 >D : Symbol(D, Decl(ifDoWhileStatements.ts, 12, 1))
 >T : Symbol(T, Decl(ifDoWhileStatements.ts, 14, 8))
@@ -62,7 +62,7 @@ module M {
 >A : Symbol(A, Decl(ifDoWhileStatements.ts, 23, 10))
 
         name: string;
->name : Symbol(name, Decl(ifDoWhileStatements.ts, 24, 20))
+>name : Symbol(A.name, Decl(ifDoWhileStatements.ts, 24, 20))
     }
 
     export function F2(x: number): string { return x.toString(); }
@@ -80,7 +80,7 @@ module N {
 >A : Symbol(A, Decl(ifDoWhileStatements.ts, 31, 10))
 
         id: number;
->id : Symbol(id, Decl(ifDoWhileStatements.ts, 32, 20))
+>id : Symbol(A.id, Decl(ifDoWhileStatements.ts, 32, 20))
     }
 
     export function F2(x: number): string { return x.toString(); }
diff --git a/tests/baselines/reference/illegalGenericWrapping1.symbols b/tests/baselines/reference/illegalGenericWrapping1.symbols
index f4ab78ceb69..ca197cf341e 100644
--- a/tests/baselines/reference/illegalGenericWrapping1.symbols
+++ b/tests/baselines/reference/illegalGenericWrapping1.symbols
@@ -4,13 +4,13 @@ interface Sequence<T> {
 >T : Symbol(T, Decl(illegalGenericWrapping1.ts, 0, 19))
 
     each(iterator: (value: T) => void ): void;
->each : Symbol(each, Decl(illegalGenericWrapping1.ts, 0, 23))
+>each : Symbol(Sequence.each, Decl(illegalGenericWrapping1.ts, 0, 23))
 >iterator : Symbol(iterator, Decl(illegalGenericWrapping1.ts, 1, 9))
 >value : Symbol(value, Decl(illegalGenericWrapping1.ts, 1, 20))
 >T : Symbol(T, Decl(illegalGenericWrapping1.ts, 0, 19))
 
     map<U>(iterator: (value: T) => U): Sequence<U>;
->map : Symbol(map, Decl(illegalGenericWrapping1.ts, 1, 46))
+>map : Symbol(Sequence.map, Decl(illegalGenericWrapping1.ts, 1, 46))
 >U : Symbol(U, Decl(illegalGenericWrapping1.ts, 2, 8))
 >iterator : Symbol(iterator, Decl(illegalGenericWrapping1.ts, 2, 11))
 >value : Symbol(value, Decl(illegalGenericWrapping1.ts, 2, 22))
@@ -20,7 +20,7 @@ interface Sequence<T> {
 >U : Symbol(U, Decl(illegalGenericWrapping1.ts, 2, 8))
 
     filter(iterator: (value: T) => boolean): Sequence<T>;
->filter : Symbol(filter, Decl(illegalGenericWrapping1.ts, 2, 51))
+>filter : Symbol(Sequence.filter, Decl(illegalGenericWrapping1.ts, 2, 51))
 >iterator : Symbol(iterator, Decl(illegalGenericWrapping1.ts, 3, 11))
 >value : Symbol(value, Decl(illegalGenericWrapping1.ts, 3, 22))
 >T : Symbol(T, Decl(illegalGenericWrapping1.ts, 0, 19))
@@ -28,7 +28,7 @@ interface Sequence<T> {
 >T : Symbol(T, Decl(illegalGenericWrapping1.ts, 0, 19))
 
     groupBy<K>(keySelector: (value: T) => K): Sequence<{ key: K; items: Sequence<T>; }>;
->groupBy : Symbol(groupBy, Decl(illegalGenericWrapping1.ts, 3, 57))
+>groupBy : Symbol(Sequence.groupBy, Decl(illegalGenericWrapping1.ts, 3, 57))
 >K : Symbol(K, Decl(illegalGenericWrapping1.ts, 4, 12))
 >keySelector : Symbol(keySelector, Decl(illegalGenericWrapping1.ts, 4, 15))
 >value : Symbol(value, Decl(illegalGenericWrapping1.ts, 4, 29))
diff --git a/tests/baselines/reference/implementArrayInterface.symbols b/tests/baselines/reference/implementArrayInterface.symbols
index 5a671d41de3..0491f282f75 100644
--- a/tests/baselines/reference/implementArrayInterface.symbols
+++ b/tests/baselines/reference/implementArrayInterface.symbols
@@ -6,13 +6,13 @@ declare class MyArray<T> implements Array<T> {
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
 
     toString(): string;
->toString : Symbol(toString, Decl(implementArrayInterface.ts, 0, 46))
+>toString : Symbol(MyArray.toString, Decl(implementArrayInterface.ts, 0, 46))
 
     toLocaleString(): string;
->toLocaleString : Symbol(toLocaleString, Decl(implementArrayInterface.ts, 1, 23))
+>toLocaleString : Symbol(MyArray.toLocaleString, Decl(implementArrayInterface.ts, 1, 23))
 
     concat<U extends T[]>(...items: U[]): T[];
->concat : Symbol(concat, Decl(implementArrayInterface.ts, 2, 29), Decl(implementArrayInterface.ts, 3, 46))
+>concat : Symbol(MyArray.concat, Decl(implementArrayInterface.ts, 2, 29), Decl(implementArrayInterface.ts, 3, 46))
 >U : Symbol(U, Decl(implementArrayInterface.ts, 3, 11))
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
 >items : Symbol(items, Decl(implementArrayInterface.ts, 3, 26))
@@ -20,40 +20,40 @@ declare class MyArray<T> implements Array<T> {
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
 
     concat(...items: T[]): T[];
->concat : Symbol(concat, Decl(implementArrayInterface.ts, 2, 29), Decl(implementArrayInterface.ts, 3, 46))
+>concat : Symbol(MyArray.concat, Decl(implementArrayInterface.ts, 2, 29), Decl(implementArrayInterface.ts, 3, 46))
 >items : Symbol(items, Decl(implementArrayInterface.ts, 4, 11))
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
 
     join(separator?: string): string;
->join : Symbol(join, Decl(implementArrayInterface.ts, 4, 31))
+>join : Symbol(MyArray.join, Decl(implementArrayInterface.ts, 4, 31))
 >separator : Symbol(separator, Decl(implementArrayInterface.ts, 5, 9))
 
     pop(): T;
->pop : Symbol(pop, Decl(implementArrayInterface.ts, 5, 37))
+>pop : Symbol(MyArray.pop, Decl(implementArrayInterface.ts, 5, 37))
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
 
     push(...items: T[]): number;
->push : Symbol(push, Decl(implementArrayInterface.ts, 6, 13))
+>push : Symbol(MyArray.push, Decl(implementArrayInterface.ts, 6, 13))
 >items : Symbol(items, Decl(implementArrayInterface.ts, 7, 9))
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
 
     reverse(): T[];
->reverse : Symbol(reverse, Decl(implementArrayInterface.ts, 7, 32))
+>reverse : Symbol(MyArray.reverse, Decl(implementArrayInterface.ts, 7, 32))
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
 
     shift(): T;
->shift : Symbol(shift, Decl(implementArrayInterface.ts, 8, 19))
+>shift : Symbol(MyArray.shift, Decl(implementArrayInterface.ts, 8, 19))
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
 
     slice(start?: number, end?: number): T[];
->slice : Symbol(slice, Decl(implementArrayInterface.ts, 9, 15))
+>slice : Symbol(MyArray.slice, Decl(implementArrayInterface.ts, 9, 15))
 >start : Symbol(start, Decl(implementArrayInterface.ts, 10, 10))
 >end : Symbol(end, Decl(implementArrayInterface.ts, 10, 25))
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
 
     sort(compareFn?: (a: T, b: T) => number): T[];
->sort : Symbol(sort, Decl(implementArrayInterface.ts, 10, 45))
+>sort : Symbol(MyArray.sort, Decl(implementArrayInterface.ts, 10, 45))
 >compareFn : Symbol(compareFn, Decl(implementArrayInterface.ts, 11, 9))
 >a : Symbol(a, Decl(implementArrayInterface.ts, 11, 22))
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
@@ -62,12 +62,12 @@ declare class MyArray<T> implements Array<T> {
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
 
     splice(start: number): T[];
->splice : Symbol(splice, Decl(implementArrayInterface.ts, 11, 50), Decl(implementArrayInterface.ts, 12, 31))
+>splice : Symbol(MyArray.splice, Decl(implementArrayInterface.ts, 11, 50), Decl(implementArrayInterface.ts, 12, 31))
 >start : Symbol(start, Decl(implementArrayInterface.ts, 12, 11))
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
 
     splice(start: number, deleteCount: number, ...items: T[]): T[];
->splice : Symbol(splice, Decl(implementArrayInterface.ts, 11, 50), Decl(implementArrayInterface.ts, 12, 31))
+>splice : Symbol(MyArray.splice, Decl(implementArrayInterface.ts, 11, 50), Decl(implementArrayInterface.ts, 12, 31))
 >start : Symbol(start, Decl(implementArrayInterface.ts, 13, 11))
 >deleteCount : Symbol(deleteCount, Decl(implementArrayInterface.ts, 13, 25))
 >items : Symbol(items, Decl(implementArrayInterface.ts, 13, 46))
@@ -75,24 +75,24 @@ declare class MyArray<T> implements Array<T> {
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
 
     unshift(...items: T[]): number;
->unshift : Symbol(unshift, Decl(implementArrayInterface.ts, 13, 67))
+>unshift : Symbol(MyArray.unshift, Decl(implementArrayInterface.ts, 13, 67))
 >items : Symbol(items, Decl(implementArrayInterface.ts, 14, 12))
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
 
     indexOf(searchElement: T, fromIndex?: number): number;
->indexOf : Symbol(indexOf, Decl(implementArrayInterface.ts, 14, 35))
+>indexOf : Symbol(MyArray.indexOf, Decl(implementArrayInterface.ts, 14, 35))
 >searchElement : Symbol(searchElement, Decl(implementArrayInterface.ts, 16, 12))
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
 >fromIndex : Symbol(fromIndex, Decl(implementArrayInterface.ts, 16, 29))
 
     lastIndexOf(searchElement: T, fromIndex?: number): number;
->lastIndexOf : Symbol(lastIndexOf, Decl(implementArrayInterface.ts, 16, 58))
+>lastIndexOf : Symbol(MyArray.lastIndexOf, Decl(implementArrayInterface.ts, 16, 58))
 >searchElement : Symbol(searchElement, Decl(implementArrayInterface.ts, 17, 16))
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
 >fromIndex : Symbol(fromIndex, Decl(implementArrayInterface.ts, 17, 33))
 
     every(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
->every : Symbol(every, Decl(implementArrayInterface.ts, 17, 62))
+>every : Symbol(MyArray.every, Decl(implementArrayInterface.ts, 17, 62))
 >callbackfn : Symbol(callbackfn, Decl(implementArrayInterface.ts, 18, 10))
 >value : Symbol(value, Decl(implementArrayInterface.ts, 18, 23))
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
@@ -102,7 +102,7 @@ declare class MyArray<T> implements Array<T> {
 >thisArg : Symbol(thisArg, Decl(implementArrayInterface.ts, 18, 71))
 
     some(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
->some : Symbol(some, Decl(implementArrayInterface.ts, 18, 96))
+>some : Symbol(MyArray.some, Decl(implementArrayInterface.ts, 18, 96))
 >callbackfn : Symbol(callbackfn, Decl(implementArrayInterface.ts, 19, 9))
 >value : Symbol(value, Decl(implementArrayInterface.ts, 19, 22))
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
@@ -112,7 +112,7 @@ declare class MyArray<T> implements Array<T> {
 >thisArg : Symbol(thisArg, Decl(implementArrayInterface.ts, 19, 70))
 
     forEach(callbackfn: (value: T, index: number, array: T[]) => void, thisArg?: any): void;
->forEach : Symbol(forEach, Decl(implementArrayInterface.ts, 19, 95))
+>forEach : Symbol(MyArray.forEach, Decl(implementArrayInterface.ts, 19, 95))
 >callbackfn : Symbol(callbackfn, Decl(implementArrayInterface.ts, 20, 12))
 >value : Symbol(value, Decl(implementArrayInterface.ts, 20, 25))
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
@@ -122,7 +122,7 @@ declare class MyArray<T> implements Array<T> {
 >thisArg : Symbol(thisArg, Decl(implementArrayInterface.ts, 20, 70))
 
     map<U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any): U[];
->map : Symbol(map, Decl(implementArrayInterface.ts, 20, 92))
+>map : Symbol(MyArray.map, Decl(implementArrayInterface.ts, 20, 92))
 >U : Symbol(U, Decl(implementArrayInterface.ts, 21, 8))
 >callbackfn : Symbol(callbackfn, Decl(implementArrayInterface.ts, 21, 11))
 >value : Symbol(value, Decl(implementArrayInterface.ts, 21, 24))
@@ -135,7 +135,7 @@ declare class MyArray<T> implements Array<T> {
 >U : Symbol(U, Decl(implementArrayInterface.ts, 21, 8))
 
     filter(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): T[];
->filter : Symbol(filter, Decl(implementArrayInterface.ts, 21, 87))
+>filter : Symbol(MyArray.filter, Decl(implementArrayInterface.ts, 21, 87))
 >callbackfn : Symbol(callbackfn, Decl(implementArrayInterface.ts, 22, 11))
 >value : Symbol(value, Decl(implementArrayInterface.ts, 22, 24))
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
@@ -146,7 +146,7 @@ declare class MyArray<T> implements Array<T> {
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
 
     reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T;
->reduce : Symbol(reduce, Decl(implementArrayInterface.ts, 22, 93), Decl(implementArrayInterface.ts, 23, 120))
+>reduce : Symbol(MyArray.reduce, Decl(implementArrayInterface.ts, 22, 93), Decl(implementArrayInterface.ts, 23, 120))
 >callbackfn : Symbol(callbackfn, Decl(implementArrayInterface.ts, 23, 11))
 >previousValue : Symbol(previousValue, Decl(implementArrayInterface.ts, 23, 24))
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
@@ -161,7 +161,7 @@ declare class MyArray<T> implements Array<T> {
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
 
     reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
->reduce : Symbol(reduce, Decl(implementArrayInterface.ts, 22, 93), Decl(implementArrayInterface.ts, 23, 120))
+>reduce : Symbol(MyArray.reduce, Decl(implementArrayInterface.ts, 22, 93), Decl(implementArrayInterface.ts, 23, 120))
 >U : Symbol(U, Decl(implementArrayInterface.ts, 24, 11))
 >callbackfn : Symbol(callbackfn, Decl(implementArrayInterface.ts, 24, 14))
 >previousValue : Symbol(previousValue, Decl(implementArrayInterface.ts, 24, 27))
@@ -177,7 +177,7 @@ declare class MyArray<T> implements Array<T> {
 >U : Symbol(U, Decl(implementArrayInterface.ts, 24, 11))
 
     reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T;
->reduceRight : Symbol(reduceRight, Decl(implementArrayInterface.ts, 24, 122), Decl(implementArrayInterface.ts, 25, 125))
+>reduceRight : Symbol(MyArray.reduceRight, Decl(implementArrayInterface.ts, 24, 122), Decl(implementArrayInterface.ts, 25, 125))
 >callbackfn : Symbol(callbackfn, Decl(implementArrayInterface.ts, 25, 16))
 >previousValue : Symbol(previousValue, Decl(implementArrayInterface.ts, 25, 29))
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
@@ -192,7 +192,7 @@ declare class MyArray<T> implements Array<T> {
 >T : Symbol(T, Decl(implementArrayInterface.ts, 0, 22))
 
     reduceRight<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
->reduceRight : Symbol(reduceRight, Decl(implementArrayInterface.ts, 24, 122), Decl(implementArrayInterface.ts, 25, 125))
+>reduceRight : Symbol(MyArray.reduceRight, Decl(implementArrayInterface.ts, 24, 122), Decl(implementArrayInterface.ts, 25, 125))
 >U : Symbol(U, Decl(implementArrayInterface.ts, 26, 16))
 >callbackfn : Symbol(callbackfn, Decl(implementArrayInterface.ts, 26, 19))
 >previousValue : Symbol(previousValue, Decl(implementArrayInterface.ts, 26, 32))
@@ -208,7 +208,7 @@ declare class MyArray<T> implements Array<T> {
 >U : Symbol(U, Decl(implementArrayInterface.ts, 26, 16))
 
     length: number;
->length : Symbol(length, Decl(implementArrayInterface.ts, 26, 127))
+>length : Symbol(MyArray.length, Decl(implementArrayInterface.ts, 26, 127))
 
     [n: number]: T;
 >n : Symbol(n, Decl(implementArrayInterface.ts, 30, 5))
diff --git a/tests/baselines/reference/implementGenericWithMismatchedTypes.errors.txt b/tests/baselines/reference/implementGenericWithMismatchedTypes.errors.txt
index 7a128b87764..4652acc8d10 100644
--- a/tests/baselines/reference/implementGenericWithMismatchedTypes.errors.txt
+++ b/tests/baselines/reference/implementGenericWithMismatchedTypes.errors.txt
@@ -2,7 +2,7 @@ tests/cases/compiler/implementGenericWithMismatchedTypes.ts(7,7): error TS2420:
   Types of property 'foo' are incompatible.
     Type '(x: string) => number' is not assignable to type '(x: T) => T'.
       Types of parameters 'x' and 'x' are incompatible.
-        Type 'string' is not assignable to type 'T'.
+        Type 'T' is not assignable to type 'string'.
 tests/cases/compiler/implementGenericWithMismatchedTypes.ts(16,7): error TS2420: Class 'C2<T>' incorrectly implements interface 'IFoo2<T>'.
   Types of property 'foo' are incompatible.
     Type '<Tstring>(x: Tstring) => number' is not assignable to type '(x: T) => T'.
@@ -22,7 +22,7 @@ tests/cases/compiler/implementGenericWithMismatchedTypes.ts(16,7): error TS2420:
 !!! error TS2420:   Types of property 'foo' are incompatible.
 !!! error TS2420:     Type '(x: string) => number' is not assignable to type '(x: T) => T'.
 !!! error TS2420:       Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2420:         Type 'string' is not assignable to type 'T'.
+!!! error TS2420:         Type 'T' is not assignable to type 'string'.
         foo(x: string): number {
             return null;
         }
diff --git a/tests/baselines/reference/implementInterfaceAnyMemberWithVoid.symbols b/tests/baselines/reference/implementInterfaceAnyMemberWithVoid.symbols
index bf53a92dcd3..7cc8e6f92ac 100644
--- a/tests/baselines/reference/implementInterfaceAnyMemberWithVoid.symbols
+++ b/tests/baselines/reference/implementInterfaceAnyMemberWithVoid.symbols
@@ -3,7 +3,7 @@ interface I {
 >I : Symbol(I, Decl(implementInterfaceAnyMemberWithVoid.ts, 0, 0))
 
     foo(value: number);
->foo : Symbol(foo, Decl(implementInterfaceAnyMemberWithVoid.ts, 0, 13))
+>foo : Symbol(I.foo, Decl(implementInterfaceAnyMemberWithVoid.ts, 0, 13))
 >value : Symbol(value, Decl(implementInterfaceAnyMemberWithVoid.ts, 1, 8))
 }
 
@@ -12,7 +12,7 @@ class Bug implements I {
 >I : Symbol(I, Decl(implementInterfaceAnyMemberWithVoid.ts, 0, 0))
 
     public foo(value: number) {
->foo : Symbol(foo, Decl(implementInterfaceAnyMemberWithVoid.ts, 4, 24))
+>foo : Symbol(Bug.foo, Decl(implementInterfaceAnyMemberWithVoid.ts, 4, 24))
 >value : Symbol(value, Decl(implementInterfaceAnyMemberWithVoid.ts, 5, 15))
     }
 }
diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.errors.txt b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.errors.txt
index c6c0be3896c..ec5c1eba68c 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.errors.txt
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.errors.txt
@@ -16,7 +16,7 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
   Property 'z' is missing in type 'Bar3'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(67,11): error TS2420: Class 'Bar' incorrectly implements interface 'I'.
   Property 'y' is missing in type 'Bar'.
-tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(73,14): error TS2341: Property 'x' is private and only accessible within class 'Foo'.
+tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(73,16): error TS2341: Property 'x' is private and only accessible within class 'Foo'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(74,16): error TS2339: Property 'y' does not exist on type 'Bar'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithPrivates2.ts(76,11): error TS2415: Class 'Bar2' incorrectly extends base class 'Foo'.
   Property 'x' is private in type 'Foo' but not in type 'Bar2'.
@@ -129,7 +129,7 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInte
         var b: Bar;
         var r1 = b.z;
         var r2 = b.x; // error
-                 ~~~
+                   ~
 !!! error TS2341: Property 'x' is private and only accessible within class 'Foo'.
         var r3 = b.y; // error
                    ~
diff --git a/tests/baselines/reference/implementsInClassExpression.symbols b/tests/baselines/reference/implementsInClassExpression.symbols
index f65c3456320..48a44d91e9c 100644
--- a/tests/baselines/reference/implementsInClassExpression.symbols
+++ b/tests/baselines/reference/implementsInClassExpression.symbols
@@ -3,7 +3,7 @@ interface Foo {
 >Foo : Symbol(Foo, Decl(implementsInClassExpression.ts, 0, 0))
 
     doThing(): void;
->doThing : Symbol(doThing, Decl(implementsInClassExpression.ts, 0, 15))
+>doThing : Symbol(Foo.doThing, Decl(implementsInClassExpression.ts, 0, 15))
 }
 
 let cls = class implements Foo {
diff --git a/tests/baselines/reference/implicitAnyAnyReturningFunction.symbols b/tests/baselines/reference/implicitAnyAnyReturningFunction.symbols
index 73e91853255..4571820db7b 100644
--- a/tests/baselines/reference/implicitAnyAnyReturningFunction.symbols
+++ b/tests/baselines/reference/implicitAnyAnyReturningFunction.symbols
@@ -19,13 +19,13 @@ class C {
 >C : Symbol(C, Decl(implicitAnyAnyReturningFunction.ts, 7, 1))
 
     public A() {
->A : Symbol(A, Decl(implicitAnyAnyReturningFunction.ts, 9, 9))
+>A : Symbol(C.A, Decl(implicitAnyAnyReturningFunction.ts, 9, 9))
 
         return <any>"";
     }
 
     public B() {
->B : Symbol(B, Decl(implicitAnyAnyReturningFunction.ts, 12, 5))
+>B : Symbol(C.B, Decl(implicitAnyAnyReturningFunction.ts, 12, 5))
 
         var someLocal: any = {};
 >someLocal : Symbol(someLocal, Decl(implicitAnyAnyReturningFunction.ts, 15, 11))
diff --git a/tests/baselines/reference/implicitAnyFromCircularInference.errors.txt b/tests/baselines/reference/implicitAnyFromCircularInference.errors.txt
index 36538aef4f3..bb43d96b003 100644
--- a/tests/baselines/reference/implicitAnyFromCircularInference.errors.txt
+++ b/tests/baselines/reference/implicitAnyFromCircularInference.errors.txt
@@ -8,7 +8,7 @@ tests/cases/compiler/implicitAnyFromCircularInference.ts(23,10): error TS7024: F
 tests/cases/compiler/implicitAnyFromCircularInference.ts(26,10): error TS7023: 'h' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions.
 tests/cases/compiler/implicitAnyFromCircularInference.ts(28,14): error TS7023: 'foo' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions.
 tests/cases/compiler/implicitAnyFromCircularInference.ts(41,5): error TS7022: 's' implicitly has type 'any' because it does not have a type annotation and is referenced directly or indirectly in its own initializer.
-tests/cases/compiler/implicitAnyFromCircularInference.ts(46,5): error TS7023: 'x' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions.
+tests/cases/compiler/implicitAnyFromCircularInference.ts(46,9): error TS7023: 'x' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions.
 
 
 ==== tests/cases/compiler/implicitAnyFromCircularInference.ts (11 errors) ====
@@ -78,11 +78,9 @@ tests/cases/compiler/implicitAnyFromCircularInference.ts(46,5): error TS7023: 'x
     class D {
         // Error expected
         get x() {
-        ~~~~~~~~~
-            return this.x;
-    ~~~~~~~~~~~~~~~~~~~~~~
-        }
-    ~~~~~
+            ~
 !!! error TS7023: 'x' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions.
+            return this.x;
+        }
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/implicitAnyGenerics.symbols b/tests/baselines/reference/implicitAnyGenerics.symbols
index 865f48fdd59..22718f1b9d4 100644
--- a/tests/baselines/reference/implicitAnyGenerics.symbols
+++ b/tests/baselines/reference/implicitAnyGenerics.symbols
@@ -5,7 +5,7 @@ class C<T> {
 >T : Symbol(T, Decl(implicitAnyGenerics.ts, 1, 8))
 
     x: T;
->x : Symbol(x, Decl(implicitAnyGenerics.ts, 1, 12))
+>x : Symbol(C.x, Decl(implicitAnyGenerics.ts, 1, 12))
 >T : Symbol(T, Decl(implicitAnyGenerics.ts, 1, 8))
 }
 
diff --git a/tests/baselines/reference/implicitAnyGetAndSetAccessorWithAnyReturnType.errors.txt b/tests/baselines/reference/implicitAnyGetAndSetAccessorWithAnyReturnType.errors.txt
index 4d9008cd56a..460ff97b10e 100644
--- a/tests/baselines/reference/implicitAnyGetAndSetAccessorWithAnyReturnType.errors.txt
+++ b/tests/baselines/reference/implicitAnyGetAndSetAccessorWithAnyReturnType.errors.txt
@@ -1,11 +1,11 @@
 tests/cases/compiler/implicitAnyGetAndSetAccessorWithAnyReturnType.ts(3,5): error TS7008: Member 'getAndSet' implicitly has an 'any' type.
 tests/cases/compiler/implicitAnyGetAndSetAccessorWithAnyReturnType.ts(4,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/implicitAnyGetAndSetAccessorWithAnyReturnType.ts(9,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-tests/cases/compiler/implicitAnyGetAndSetAccessorWithAnyReturnType.ts(15,5): error TS7016: Property 'haveOnlySet' implicitly has type 'any', because its 'set' accessor lacks a type annotation.
 tests/cases/compiler/implicitAnyGetAndSetAccessorWithAnyReturnType.ts(15,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+tests/cases/compiler/implicitAnyGetAndSetAccessorWithAnyReturnType.ts(15,16): error TS7016: Property 'haveOnlySet' implicitly has type 'any', because its 'set' accessor lacks a type annotation.
 tests/cases/compiler/implicitAnyGetAndSetAccessorWithAnyReturnType.ts(15,28): error TS7006: Parameter 'newXValue' implicitly has an 'any' type.
-tests/cases/compiler/implicitAnyGetAndSetAccessorWithAnyReturnType.ts(20,5): error TS7010: 'haveOnlyGet', which lacks return-type annotation, implicitly has an 'any' return type.
 tests/cases/compiler/implicitAnyGetAndSetAccessorWithAnyReturnType.ts(20,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+tests/cases/compiler/implicitAnyGetAndSetAccessorWithAnyReturnType.ts(20,16): error TS7010: 'haveOnlyGet', which lacks return-type annotation, implicitly has an 'any' return type.
 
 
 ==== tests/cases/compiler/implicitAnyGetAndSetAccessorWithAnyReturnType.ts (8 errors) ====
@@ -30,24 +30,21 @@ tests/cases/compiler/implicitAnyGetAndSetAccessorWithAnyReturnType.ts(20,16): er
     
     class SetterOnly {
         public set haveOnlySet(newXValue) {  // error at "haveOnlySet, newXValue"
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                    ~~~~~~~~~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+                   ~~~~~~~~~~~
+!!! error TS7016: Property 'haveOnlySet' implicitly has type 'any', because its 'set' accessor lacks a type annotation.
                                ~~~~~~~~~
 !!! error TS7006: Parameter 'newXValue' implicitly has an 'any' type.
         }
-    ~~~~~
-!!! error TS7016: Property 'haveOnlySet' implicitly has type 'any', because its 'set' accessor lacks a type annotation.
     }
     
     class GetterOnly {
         public get haveOnlyGet() {  // error at "haveOnlyGet"
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                    ~~~~~~~~~~~
 !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-            return null;
-    ~~~~~~~~~~~~~~~~~~~~
-        }
-    ~~~~~
+                   ~~~~~~~~~~~
 !!! error TS7010: 'haveOnlyGet', which lacks return-type annotation, implicitly has an 'any' return type.
+            return null;
+        }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/implicitAnyInAmbientDeclaration.errors.txt b/tests/baselines/reference/implicitAnyInAmbientDeclaration.errors.txt
index 1e66f26d0d2..493fc13db04 100644
--- a/tests/baselines/reference/implicitAnyInAmbientDeclaration.errors.txt
+++ b/tests/baselines/reference/implicitAnyInAmbientDeclaration.errors.txt
@@ -1,10 +1,9 @@
 tests/cases/compiler/implicitAnyInAmbientDeclaration.ts(3,9): error TS7008: Member 'publicMember' implicitly has an 'any' type.
 tests/cases/compiler/implicitAnyInAmbientDeclaration.ts(6,16): error TS7010: 'publicFunction', which lacks return-type annotation, implicitly has an 'any' return type.
 tests/cases/compiler/implicitAnyInAmbientDeclaration.ts(6,31): error TS7006: Parameter 'x' implicitly has an 'any' type.
-tests/cases/compiler/implicitAnyInAmbientDeclaration.ts(8,9): error TS1089: 'private' modifier cannot appear on a constructor declaration.
 
 
-==== tests/cases/compiler/implicitAnyInAmbientDeclaration.ts (4 errors) ====
+==== tests/cases/compiler/implicitAnyInAmbientDeclaration.ts (3 errors) ====
     module Test {
         declare class C {
             public publicMember;  // this should be an error
@@ -19,7 +18,5 @@ tests/cases/compiler/implicitAnyInAmbientDeclaration.ts(8,9): error TS1089: 'pri
 !!! error TS7006: Parameter 'x' implicitly has an 'any' type.
             private privateFunction(privateParam);  // this should not be an error
             private constructor(privateParam);
-            ~~~~~~~
-!!! error TS1089: 'private' modifier cannot appear on a constructor declaration.
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/implicitAnyInAmbientDeclaration2.d.errors.txt b/tests/baselines/reference/implicitAnyInAmbientDeclaration2.d.errors.txt
index 54fe39e2efe..03de82c731d 100644
--- a/tests/baselines/reference/implicitAnyInAmbientDeclaration2.d.errors.txt
+++ b/tests/baselines/reference/implicitAnyInAmbientDeclaration2.d.errors.txt
@@ -4,11 +4,10 @@ tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts(2,13): error TS7005:
 tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts(4,5): error TS7008: Member 'publicMember' implicitly has an 'any' type.
 tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts(7,12): error TS7010: 'publicFunction', which lacks return-type annotation, implicitly has an 'any' return type.
 tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts(7,27): error TS7006: Parameter 'x' implicitly has an 'any' type.
-tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts(9,5): error TS1089: 'private' modifier cannot appear on a constructor declaration.
 tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts(13,24): error TS7006: Parameter 'publicConsParam' implicitly has an 'any' type.
 
 
-==== tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts (8 errors) ====
+==== tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts (7 errors) ====
     declare function foo(x);  // this should be an error
                      ~~~
 !!! error TS7010: 'foo', which lacks return-type annotation, implicitly has an 'any' return type.
@@ -30,8 +29,6 @@ tests/cases/compiler/implicitAnyInAmbientDeclaration2.d.ts(13,24): error TS7006:
 !!! error TS7006: Parameter 'x' implicitly has an 'any' type.
         private privateFunction(privateParam);  // this should not be an error
         private constructor(privateParam);  // this should not be an error
-        ~~~~~~~
-!!! error TS1089: 'private' modifier cannot appear on a constructor declaration.
     }
     
     declare class D {
diff --git a/tests/baselines/reference/implicitAnyInCatch.symbols b/tests/baselines/reference/implicitAnyInCatch.symbols
index e576593da82..7ce3ac40f36 100644
--- a/tests/baselines/reference/implicitAnyInCatch.symbols
+++ b/tests/baselines/reference/implicitAnyInCatch.symbols
@@ -13,7 +13,7 @@ class C {
 >C : Symbol(C, Decl(implicitAnyInCatch.ts, 4, 25))
 
     public temp() {
->temp : Symbol(temp, Decl(implicitAnyInCatch.ts, 6, 9))
+>temp : Symbol(C.temp, Decl(implicitAnyInCatch.ts, 6, 9))
 
         for (var x in this) {
 >x : Symbol(x, Decl(implicitAnyInCatch.ts, 8, 16))
diff --git a/tests/baselines/reference/implicitIndexSignatures.js b/tests/baselines/reference/implicitIndexSignatures.js
new file mode 100644
index 00000000000..6403f1f1543
--- /dev/null
+++ b/tests/baselines/reference/implicitIndexSignatures.js
@@ -0,0 +1,85 @@
+//// [implicitIndexSignatures.ts]
+type StringMap = { [x: string]: string };
+
+const empty1 = {};
+let empty2: {};
+const names1 = { a: "foo", b: "bar" };
+let names2: { a: string, b: string };
+let map: StringMap;
+map = { x: "xxx", y: "yyy" };
+map = empty1;
+map = empty2;
+map = names1;
+map = names2;
+
+declare function getStringIndexValue<T>(map: { [x: string]: T }): T;
+declare function getNumberIndexValue<T>(map: { [x: number]: T }): T;
+
+function f1() {
+    const o1 = { a: 1, b: 2 };
+    let o2: { a: number, b: number };
+    const v1 = getStringIndexValue(o1);
+    const v2 = getStringIndexValue(o2);
+}
+
+function f2() {
+    const o1 = { a: "1", b: "2" };
+    let o2: { a: string, b: string };
+    const v1 = getStringIndexValue(o1);
+    const v2 = getStringIndexValue(o2);
+}
+
+function f3() {
+    const o1 = { a: 1, b: "2" };
+    let o2: { a: number, b: string };
+    const v1 = getStringIndexValue(o1);
+    const v2 = getStringIndexValue(o2);
+}
+
+function f4() {
+    const o1 = { 0: "0", 1: "1", count: 2 };
+    let o2: { 0: string, 1: string, count: number };    
+    const v1 = getStringIndexValue(o1);
+    const v2 = getStringIndexValue(o2);
+    const v3 = getNumberIndexValue(o1);
+    const v4 = getNumberIndexValue(o2);
+}
+
+
+//// [implicitIndexSignatures.js]
+var empty1 = {};
+var empty2;
+var names1 = { a: "foo", b: "bar" };
+var names2;
+var map;
+map = { x: "xxx", y: "yyy" };
+map = empty1;
+map = empty2;
+map = names1;
+map = names2;
+function f1() {
+    var o1 = { a: 1, b: 2 };
+    var o2;
+    var v1 = getStringIndexValue(o1);
+    var v2 = getStringIndexValue(o2);
+}
+function f2() {
+    var o1 = { a: "1", b: "2" };
+    var o2;
+    var v1 = getStringIndexValue(o1);
+    var v2 = getStringIndexValue(o2);
+}
+function f3() {
+    var o1 = { a: 1, b: "2" };
+    var o2;
+    var v1 = getStringIndexValue(o1);
+    var v2 = getStringIndexValue(o2);
+}
+function f4() {
+    var o1 = { 0: "0", 1: "1", count: 2 };
+    var o2;
+    var v1 = getStringIndexValue(o1);
+    var v2 = getStringIndexValue(o2);
+    var v3 = getNumberIndexValue(o1);
+    var v4 = getNumberIndexValue(o2);
+}
diff --git a/tests/baselines/reference/implicitIndexSignatures.symbols b/tests/baselines/reference/implicitIndexSignatures.symbols
new file mode 100644
index 00000000000..a014e7e942c
--- /dev/null
+++ b/tests/baselines/reference/implicitIndexSignatures.symbols
@@ -0,0 +1,166 @@
+=== tests/cases/compiler/implicitIndexSignatures.ts ===
+type StringMap = { [x: string]: string };
+>StringMap : Symbol(StringMap, Decl(implicitIndexSignatures.ts, 0, 0))
+>x : Symbol(x, Decl(implicitIndexSignatures.ts, 0, 20))
+
+const empty1 = {};
+>empty1 : Symbol(empty1, Decl(implicitIndexSignatures.ts, 2, 5))
+
+let empty2: {};
+>empty2 : Symbol(empty2, Decl(implicitIndexSignatures.ts, 3, 3))
+
+const names1 = { a: "foo", b: "bar" };
+>names1 : Symbol(names1, Decl(implicitIndexSignatures.ts, 4, 5))
+>a : Symbol(a, Decl(implicitIndexSignatures.ts, 4, 16))
+>b : Symbol(b, Decl(implicitIndexSignatures.ts, 4, 26))
+
+let names2: { a: string, b: string };
+>names2 : Symbol(names2, Decl(implicitIndexSignatures.ts, 5, 3))
+>a : Symbol(a, Decl(implicitIndexSignatures.ts, 5, 13))
+>b : Symbol(b, Decl(implicitIndexSignatures.ts, 5, 24))
+
+let map: StringMap;
+>map : Symbol(map, Decl(implicitIndexSignatures.ts, 6, 3))
+>StringMap : Symbol(StringMap, Decl(implicitIndexSignatures.ts, 0, 0))
+
+map = { x: "xxx", y: "yyy" };
+>map : Symbol(map, Decl(implicitIndexSignatures.ts, 6, 3))
+>x : Symbol(x, Decl(implicitIndexSignatures.ts, 7, 7))
+>y : Symbol(y, Decl(implicitIndexSignatures.ts, 7, 17))
+
+map = empty1;
+>map : Symbol(map, Decl(implicitIndexSignatures.ts, 6, 3))
+>empty1 : Symbol(empty1, Decl(implicitIndexSignatures.ts, 2, 5))
+
+map = empty2;
+>map : Symbol(map, Decl(implicitIndexSignatures.ts, 6, 3))
+>empty2 : Symbol(empty2, Decl(implicitIndexSignatures.ts, 3, 3))
+
+map = names1;
+>map : Symbol(map, Decl(implicitIndexSignatures.ts, 6, 3))
+>names1 : Symbol(names1, Decl(implicitIndexSignatures.ts, 4, 5))
+
+map = names2;
+>map : Symbol(map, Decl(implicitIndexSignatures.ts, 6, 3))
+>names2 : Symbol(names2, Decl(implicitIndexSignatures.ts, 5, 3))
+
+declare function getStringIndexValue<T>(map: { [x: string]: T }): T;
+>getStringIndexValue : Symbol(getStringIndexValue, Decl(implicitIndexSignatures.ts, 11, 13))
+>T : Symbol(T, Decl(implicitIndexSignatures.ts, 13, 37))
+>map : Symbol(map, Decl(implicitIndexSignatures.ts, 13, 40))
+>x : Symbol(x, Decl(implicitIndexSignatures.ts, 13, 48))
+>T : Symbol(T, Decl(implicitIndexSignatures.ts, 13, 37))
+>T : Symbol(T, Decl(implicitIndexSignatures.ts, 13, 37))
+
+declare function getNumberIndexValue<T>(map: { [x: number]: T }): T;
+>getNumberIndexValue : Symbol(getNumberIndexValue, Decl(implicitIndexSignatures.ts, 13, 68))
+>T : Symbol(T, Decl(implicitIndexSignatures.ts, 14, 37))
+>map : Symbol(map, Decl(implicitIndexSignatures.ts, 14, 40))
+>x : Symbol(x, Decl(implicitIndexSignatures.ts, 14, 48))
+>T : Symbol(T, Decl(implicitIndexSignatures.ts, 14, 37))
+>T : Symbol(T, Decl(implicitIndexSignatures.ts, 14, 37))
+
+function f1() {
+>f1 : Symbol(f1, Decl(implicitIndexSignatures.ts, 14, 68))
+
+    const o1 = { a: 1, b: 2 };
+>o1 : Symbol(o1, Decl(implicitIndexSignatures.ts, 17, 9))
+>a : Symbol(a, Decl(implicitIndexSignatures.ts, 17, 16))
+>b : Symbol(b, Decl(implicitIndexSignatures.ts, 17, 22))
+
+    let o2: { a: number, b: number };
+>o2 : Symbol(o2, Decl(implicitIndexSignatures.ts, 18, 7))
+>a : Symbol(a, Decl(implicitIndexSignatures.ts, 18, 13))
+>b : Symbol(b, Decl(implicitIndexSignatures.ts, 18, 24))
+
+    const v1 = getStringIndexValue(o1);
+>v1 : Symbol(v1, Decl(implicitIndexSignatures.ts, 19, 9))
+>getStringIndexValue : Symbol(getStringIndexValue, Decl(implicitIndexSignatures.ts, 11, 13))
+>o1 : Symbol(o1, Decl(implicitIndexSignatures.ts, 17, 9))
+
+    const v2 = getStringIndexValue(o2);
+>v2 : Symbol(v2, Decl(implicitIndexSignatures.ts, 20, 9))
+>getStringIndexValue : Symbol(getStringIndexValue, Decl(implicitIndexSignatures.ts, 11, 13))
+>o2 : Symbol(o2, Decl(implicitIndexSignatures.ts, 18, 7))
+}
+
+function f2() {
+>f2 : Symbol(f2, Decl(implicitIndexSignatures.ts, 21, 1))
+
+    const o1 = { a: "1", b: "2" };
+>o1 : Symbol(o1, Decl(implicitIndexSignatures.ts, 24, 9))
+>a : Symbol(a, Decl(implicitIndexSignatures.ts, 24, 16))
+>b : Symbol(b, Decl(implicitIndexSignatures.ts, 24, 24))
+
+    let o2: { a: string, b: string };
+>o2 : Symbol(o2, Decl(implicitIndexSignatures.ts, 25, 7))
+>a : Symbol(a, Decl(implicitIndexSignatures.ts, 25, 13))
+>b : Symbol(b, Decl(implicitIndexSignatures.ts, 25, 24))
+
+    const v1 = getStringIndexValue(o1);
+>v1 : Symbol(v1, Decl(implicitIndexSignatures.ts, 26, 9))
+>getStringIndexValue : Symbol(getStringIndexValue, Decl(implicitIndexSignatures.ts, 11, 13))
+>o1 : Symbol(o1, Decl(implicitIndexSignatures.ts, 24, 9))
+
+    const v2 = getStringIndexValue(o2);
+>v2 : Symbol(v2, Decl(implicitIndexSignatures.ts, 27, 9))
+>getStringIndexValue : Symbol(getStringIndexValue, Decl(implicitIndexSignatures.ts, 11, 13))
+>o2 : Symbol(o2, Decl(implicitIndexSignatures.ts, 25, 7))
+}
+
+function f3() {
+>f3 : Symbol(f3, Decl(implicitIndexSignatures.ts, 28, 1))
+
+    const o1 = { a: 1, b: "2" };
+>o1 : Symbol(o1, Decl(implicitIndexSignatures.ts, 31, 9))
+>a : Symbol(a, Decl(implicitIndexSignatures.ts, 31, 16))
+>b : Symbol(b, Decl(implicitIndexSignatures.ts, 31, 22))
+
+    let o2: { a: number, b: string };
+>o2 : Symbol(o2, Decl(implicitIndexSignatures.ts, 32, 7))
+>a : Symbol(a, Decl(implicitIndexSignatures.ts, 32, 13))
+>b : Symbol(b, Decl(implicitIndexSignatures.ts, 32, 24))
+
+    const v1 = getStringIndexValue(o1);
+>v1 : Symbol(v1, Decl(implicitIndexSignatures.ts, 33, 9))
+>getStringIndexValue : Symbol(getStringIndexValue, Decl(implicitIndexSignatures.ts, 11, 13))
+>o1 : Symbol(o1, Decl(implicitIndexSignatures.ts, 31, 9))
+
+    const v2 = getStringIndexValue(o2);
+>v2 : Symbol(v2, Decl(implicitIndexSignatures.ts, 34, 9))
+>getStringIndexValue : Symbol(getStringIndexValue, Decl(implicitIndexSignatures.ts, 11, 13))
+>o2 : Symbol(o2, Decl(implicitIndexSignatures.ts, 32, 7))
+}
+
+function f4() {
+>f4 : Symbol(f4, Decl(implicitIndexSignatures.ts, 35, 1))
+
+    const o1 = { 0: "0", 1: "1", count: 2 };
+>o1 : Symbol(o1, Decl(implicitIndexSignatures.ts, 38, 9))
+>count : Symbol(count, Decl(implicitIndexSignatures.ts, 38, 32))
+
+    let o2: { 0: string, 1: string, count: number };    
+>o2 : Symbol(o2, Decl(implicitIndexSignatures.ts, 39, 7))
+>count : Symbol(count, Decl(implicitIndexSignatures.ts, 39, 35))
+
+    const v1 = getStringIndexValue(o1);
+>v1 : Symbol(v1, Decl(implicitIndexSignatures.ts, 40, 9))
+>getStringIndexValue : Symbol(getStringIndexValue, Decl(implicitIndexSignatures.ts, 11, 13))
+>o1 : Symbol(o1, Decl(implicitIndexSignatures.ts, 38, 9))
+
+    const v2 = getStringIndexValue(o2);
+>v2 : Symbol(v2, Decl(implicitIndexSignatures.ts, 41, 9))
+>getStringIndexValue : Symbol(getStringIndexValue, Decl(implicitIndexSignatures.ts, 11, 13))
+>o2 : Symbol(o2, Decl(implicitIndexSignatures.ts, 39, 7))
+
+    const v3 = getNumberIndexValue(o1);
+>v3 : Symbol(v3, Decl(implicitIndexSignatures.ts, 42, 9))
+>getNumberIndexValue : Symbol(getNumberIndexValue, Decl(implicitIndexSignatures.ts, 13, 68))
+>o1 : Symbol(o1, Decl(implicitIndexSignatures.ts, 38, 9))
+
+    const v4 = getNumberIndexValue(o2);
+>v4 : Symbol(v4, Decl(implicitIndexSignatures.ts, 43, 9))
+>getNumberIndexValue : Symbol(getNumberIndexValue, Decl(implicitIndexSignatures.ts, 13, 68))
+>o2 : Symbol(o2, Decl(implicitIndexSignatures.ts, 39, 7))
+}
+
diff --git a/tests/baselines/reference/implicitIndexSignatures.types b/tests/baselines/reference/implicitIndexSignatures.types
new file mode 100644
index 00000000000..7d335c00491
--- /dev/null
+++ b/tests/baselines/reference/implicitIndexSignatures.types
@@ -0,0 +1,201 @@
+=== tests/cases/compiler/implicitIndexSignatures.ts ===
+type StringMap = { [x: string]: string };
+>StringMap : { [x: string]: string; }
+>x : string
+
+const empty1 = {};
+>empty1 : {}
+>{} : {}
+
+let empty2: {};
+>empty2 : {}
+
+const names1 = { a: "foo", b: "bar" };
+>names1 : { a: string; b: string; }
+>{ a: "foo", b: "bar" } : { a: string; b: string; }
+>a : string
+>"foo" : string
+>b : string
+>"bar" : string
+
+let names2: { a: string, b: string };
+>names2 : { a: string; b: string; }
+>a : string
+>b : string
+
+let map: StringMap;
+>map : { [x: string]: string; }
+>StringMap : { [x: string]: string; }
+
+map = { x: "xxx", y: "yyy" };
+>map = { x: "xxx", y: "yyy" } : { x: string; y: string; }
+>map : { [x: string]: string; }
+>{ x: "xxx", y: "yyy" } : { x: string; y: string; }
+>x : string
+>"xxx" : string
+>y : string
+>"yyy" : string
+
+map = empty1;
+>map = empty1 : {}
+>map : { [x: string]: string; }
+>empty1 : {}
+
+map = empty2;
+>map = empty2 : {}
+>map : { [x: string]: string; }
+>empty2 : {}
+
+map = names1;
+>map = names1 : { a: string; b: string; }
+>map : { [x: string]: string; }
+>names1 : { a: string; b: string; }
+
+map = names2;
+>map = names2 : { a: string; b: string; }
+>map : { [x: string]: string; }
+>names2 : { a: string; b: string; }
+
+declare function getStringIndexValue<T>(map: { [x: string]: T }): T;
+>getStringIndexValue : <T>(map: { [x: string]: T; }) => T
+>T : T
+>map : { [x: string]: T; }
+>x : string
+>T : T
+>T : T
+
+declare function getNumberIndexValue<T>(map: { [x: number]: T }): T;
+>getNumberIndexValue : <T>(map: { [x: number]: T; }) => T
+>T : T
+>map : { [x: number]: T; }
+>x : number
+>T : T
+>T : T
+
+function f1() {
+>f1 : () => void
+
+    const o1 = { a: 1, b: 2 };
+>o1 : { a: number; b: number; }
+>{ a: 1, b: 2 } : { a: number; b: number; }
+>a : number
+>1 : number
+>b : number
+>2 : number
+
+    let o2: { a: number, b: number };
+>o2 : { a: number; b: number; }
+>a : number
+>b : number
+
+    const v1 = getStringIndexValue(o1);
+>v1 : number
+>getStringIndexValue(o1) : number
+>getStringIndexValue : <T>(map: { [x: string]: T; }) => T
+>o1 : { a: number; b: number; }
+
+    const v2 = getStringIndexValue(o2);
+>v2 : number
+>getStringIndexValue(o2) : number
+>getStringIndexValue : <T>(map: { [x: string]: T; }) => T
+>o2 : { a: number; b: number; }
+}
+
+function f2() {
+>f2 : () => void
+
+    const o1 = { a: "1", b: "2" };
+>o1 : { a: string; b: string; }
+>{ a: "1", b: "2" } : { a: string; b: string; }
+>a : string
+>"1" : string
+>b : string
+>"2" : string
+
+    let o2: { a: string, b: string };
+>o2 : { a: string; b: string; }
+>a : string
+>b : string
+
+    const v1 = getStringIndexValue(o1);
+>v1 : string
+>getStringIndexValue(o1) : string
+>getStringIndexValue : <T>(map: { [x: string]: T; }) => T
+>o1 : { a: string; b: string; }
+
+    const v2 = getStringIndexValue(o2);
+>v2 : string
+>getStringIndexValue(o2) : string
+>getStringIndexValue : <T>(map: { [x: string]: T; }) => T
+>o2 : { a: string; b: string; }
+}
+
+function f3() {
+>f3 : () => void
+
+    const o1 = { a: 1, b: "2" };
+>o1 : { a: number; b: string; }
+>{ a: 1, b: "2" } : { a: number; b: string; }
+>a : number
+>1 : number
+>b : string
+>"2" : string
+
+    let o2: { a: number, b: string };
+>o2 : { a: number; b: string; }
+>a : number
+>b : string
+
+    const v1 = getStringIndexValue(o1);
+>v1 : number | string
+>getStringIndexValue(o1) : number | string
+>getStringIndexValue : <T>(map: { [x: string]: T; }) => T
+>o1 : { a: number; b: string; }
+
+    const v2 = getStringIndexValue(o2);
+>v2 : number | string
+>getStringIndexValue(o2) : number | string
+>getStringIndexValue : <T>(map: { [x: string]: T; }) => T
+>o2 : { a: number; b: string; }
+}
+
+function f4() {
+>f4 : () => void
+
+    const o1 = { 0: "0", 1: "1", count: 2 };
+>o1 : { 0: string; 1: string; count: number; }
+>{ 0: "0", 1: "1", count: 2 } : { 0: string; 1: string; count: number; }
+>"0" : string
+>"1" : string
+>count : number
+>2 : number
+
+    let o2: { 0: string, 1: string, count: number };    
+>o2 : { 0: string; 1: string; count: number; }
+>count : number
+
+    const v1 = getStringIndexValue(o1);
+>v1 : string | number
+>getStringIndexValue(o1) : string | number
+>getStringIndexValue : <T>(map: { [x: string]: T; }) => T
+>o1 : { 0: string; 1: string; count: number; }
+
+    const v2 = getStringIndexValue(o2);
+>v2 : string | number
+>getStringIndexValue(o2) : string | number
+>getStringIndexValue : <T>(map: { [x: string]: T; }) => T
+>o2 : { 0: string; 1: string; count: number; }
+
+    const v3 = getNumberIndexValue(o1);
+>v3 : string
+>getNumberIndexValue(o1) : string
+>getNumberIndexValue : <T>(map: { [x: number]: T; }) => T
+>o1 : { 0: string; 1: string; count: number; }
+
+    const v4 = getNumberIndexValue(o2);
+>v4 : string
+>getNumberIndexValue(o2) : string
+>getNumberIndexValue : <T>(map: { [x: number]: T; }) => T
+>o2 : { 0: string; 1: string; count: number; }
+}
+
diff --git a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.errors.txt b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.errors.txt
deleted file mode 100644
index 56d1549f853..00000000000
--- a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule_file0.ts(1,15): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-
-
-==== tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule_file1.ts (0 errors) ====
-    import r = require('importAliasAnExternalModuleInsideAnInternalModule_file0');
-    module m_private {
-        //import r2 = require('m'); // would be error
-        export import C = r; // no error
-        C.m.foo();
-    }
-    
-==== tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule_file0.ts (1 errors) ====
-    export module m {
-                  ~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-        export function foo() { }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js
index 81b0d2fdac9..c7dd59f9ab7 100644
--- a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js
+++ b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js
@@ -6,7 +6,7 @@ export module m {
 }
 
 //// [importAliasAnExternalModuleInsideAnInternalModule_file1.ts]
-import r = require('importAliasAnExternalModuleInsideAnInternalModule_file0');
+import r = require('./importAliasAnExternalModuleInsideAnInternalModule_file0');
 module m_private {
     //import r2 = require('m'); // would be error
     export import C = r; // no error
@@ -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/importAliasAnExternalModuleInsideAnInternalModule.symbols b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.symbols
new file mode 100644
index 00000000000..ffaca4a0ec5
--- /dev/null
+++ b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.symbols
@@ -0,0 +1,28 @@
+=== tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule_file1.ts ===
+import r = require('./importAliasAnExternalModuleInsideAnInternalModule_file0');
+>r : Symbol(r, Decl(importAliasAnExternalModuleInsideAnInternalModule_file1.ts, 0, 0))
+
+module m_private {
+>m_private : Symbol(m_private, Decl(importAliasAnExternalModuleInsideAnInternalModule_file1.ts, 0, 80))
+
+    //import r2 = require('m'); // would be error
+    export import C = r; // no error
+>C : Symbol(C, Decl(importAliasAnExternalModuleInsideAnInternalModule_file1.ts, 1, 18))
+>r : Symbol(C, Decl(importAliasAnExternalModuleInsideAnInternalModule_file0.ts, 0, 0))
+
+    C.m.foo();
+>C.m.foo : Symbol(C.m.foo, Decl(importAliasAnExternalModuleInsideAnInternalModule_file0.ts, 0, 17))
+>C.m : Symbol(C.m, Decl(importAliasAnExternalModuleInsideAnInternalModule_file0.ts, 0, 0))
+>C : Symbol(C, Decl(importAliasAnExternalModuleInsideAnInternalModule_file1.ts, 1, 18))
+>m : Symbol(C.m, Decl(importAliasAnExternalModuleInsideAnInternalModule_file0.ts, 0, 0))
+>foo : Symbol(C.m.foo, Decl(importAliasAnExternalModuleInsideAnInternalModule_file0.ts, 0, 17))
+}
+
+=== tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule_file0.ts ===
+export module m {
+>m : Symbol(m, Decl(importAliasAnExternalModuleInsideAnInternalModule_file0.ts, 0, 0))
+
+    export function foo() { }
+>foo : Symbol(foo, Decl(importAliasAnExternalModuleInsideAnInternalModule_file0.ts, 0, 17))
+}
+
diff --git a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.types b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.types
new file mode 100644
index 00000000000..34b71829d38
--- /dev/null
+++ b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.types
@@ -0,0 +1,29 @@
+=== tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule_file1.ts ===
+import r = require('./importAliasAnExternalModuleInsideAnInternalModule_file0');
+>r : typeof r
+
+module m_private {
+>m_private : typeof m_private
+
+    //import r2 = require('m'); // would be error
+    export import C = r; // no error
+>C : typeof C
+>r : typeof C
+
+    C.m.foo();
+>C.m.foo() : void
+>C.m.foo : () => void
+>C.m : typeof C.m
+>C : typeof C
+>m : typeof C.m
+>foo : () => void
+}
+
+=== tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule_file0.ts ===
+export module m {
+>m : typeof m
+
+    export function foo() { }
+>foo : () => void
+}
+
diff --git a/tests/baselines/reference/importAliasIdentifiers.symbols b/tests/baselines/reference/importAliasIdentifiers.symbols
index 3b2ba0ea46a..c299aef9142 100644
--- a/tests/baselines/reference/importAliasIdentifiers.symbols
+++ b/tests/baselines/reference/importAliasIdentifiers.symbols
@@ -6,8 +6,8 @@ module moduleA {
 >Point : Symbol(Point, Decl(importAliasIdentifiers.ts, 0, 16))
 
         constructor(public x: number, public y: number) { }
->x : Symbol(x, Decl(importAliasIdentifiers.ts, 2, 20))
->y : Symbol(y, Decl(importAliasIdentifiers.ts, 2, 37))
+>x : Symbol(Point.x, Decl(importAliasIdentifiers.ts, 2, 20))
+>y : Symbol(Point.y, Decl(importAliasIdentifiers.ts, 2, 37))
     }
 }
 
@@ -34,7 +34,7 @@ class clodule {
 >clodule : Symbol(clodule, Decl(importAliasIdentifiers.ts, 10, 33), Decl(importAliasIdentifiers.ts, 14, 1))
 
     name: string;
->name : Symbol(name, Decl(importAliasIdentifiers.ts, 12, 15))
+>name : Symbol(clodule.name, Decl(importAliasIdentifiers.ts, 12, 15))
 }
 
 module clodule {
@@ -44,8 +44,8 @@ module clodule {
 >Point : Symbol(Point, Decl(importAliasIdentifiers.ts, 16, 16))
 
         x: number; y: number;
->x : Symbol(x, Decl(importAliasIdentifiers.ts, 17, 28))
->y : Symbol(y, Decl(importAliasIdentifiers.ts, 18, 18))
+>x : Symbol(Point.x, Decl(importAliasIdentifiers.ts, 17, 28))
+>y : Symbol(Point.y, Decl(importAliasIdentifiers.ts, 18, 18))
     }
     var Point: Point = { x: 0, y: 0 };
 >Point : Symbol(Point, Decl(importAliasIdentifiers.ts, 16, 16), Decl(importAliasIdentifiers.ts, 20, 7))
@@ -89,8 +89,8 @@ module fundule {
 >Point : Symbol(Point, Decl(importAliasIdentifiers.ts, 34, 16))
 
         x: number; y: number;
->x : Symbol(x, Decl(importAliasIdentifiers.ts, 35, 28))
->y : Symbol(y, Decl(importAliasIdentifiers.ts, 36, 18))
+>x : Symbol(Point.x, Decl(importAliasIdentifiers.ts, 35, 28))
+>y : Symbol(Point.y, Decl(importAliasIdentifiers.ts, 36, 18))
     }
     var Point: Point = { x: 0, y: 0 };
 >Point : Symbol(Point, Decl(importAliasIdentifiers.ts, 34, 16), Decl(importAliasIdentifiers.ts, 38, 7))
diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict2.symbols b/tests/baselines/reference/importAndVariableDeclarationConflict2.symbols
index 570bb5e2b98..d8d9b1d7f4c 100644
--- a/tests/baselines/reference/importAndVariableDeclarationConflict2.symbols
+++ b/tests/baselines/reference/importAndVariableDeclarationConflict2.symbols
@@ -15,7 +15,7 @@ class C {
 >C : Symbol(C, Decl(importAndVariableDeclarationConflict2.ts, 4, 15))
 
   public foo() {
->foo : Symbol(foo, Decl(importAndVariableDeclarationConflict2.ts, 6, 9))
+>foo : Symbol(C.foo, Decl(importAndVariableDeclarationConflict2.ts, 6, 9))
 
     var x = '';
 >x : Symbol(x, Decl(importAndVariableDeclarationConflict2.ts, 8, 7))
diff --git a/tests/baselines/reference/importDecl.symbols b/tests/baselines/reference/importDecl.symbols
index 32b9f3bb2a7..91df857ae98 100644
--- a/tests/baselines/reference/importDecl.symbols
+++ b/tests/baselines/reference/importDecl.symbols
@@ -154,7 +154,7 @@ export class d {
 >d : Symbol(d, Decl(importDecl_require.ts, 0, 0))
 
     foo: string;
->foo : Symbol(foo, Decl(importDecl_require.ts, 0, 16))
+>foo : Symbol(d.foo, Decl(importDecl_require.ts, 0, 16))
 }
 export var x: d;
 >x : Symbol(x, Decl(importDecl_require.ts, 3, 10))
@@ -169,7 +169,7 @@ export class d {
 >d : Symbol(d, Decl(importDecl_require1.ts, 0, 0))
 
     bar: string;
->bar : Symbol(bar, Decl(importDecl_require1.ts, 0, 16))
+>bar : Symbol(d.bar, Decl(importDecl_require1.ts, 0, 16))
 }
 var x: d;
 >x : Symbol(x, Decl(importDecl_require1.ts, 3, 3))
@@ -184,7 +184,7 @@ export class d {
 >d : Symbol(d, Decl(importDecl_require2.ts, 0, 0))
 
     baz: string;
->baz : Symbol(baz, Decl(importDecl_require2.ts, 0, 16))
+>baz : Symbol(d.baz, Decl(importDecl_require2.ts, 0, 16))
 }
 export var x: d;
 >x : Symbol(x, Decl(importDecl_require2.ts, 3, 10))
@@ -199,7 +199,7 @@ export class d {
 >d : Symbol(d, Decl(importDecl_require3.ts, 0, 0))
 
     bing: string;
->bing : Symbol(bing, Decl(importDecl_require3.ts, 0, 16))
+>bing : Symbol(d.bing, Decl(importDecl_require3.ts, 0, 16))
 }
 export var x: d;
 >x : Symbol(x, Decl(importDecl_require3.ts, 3, 10))
diff --git a/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.errors.txt b/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.errors.txt
index 5d70b32aa16..4bfe02c0467 100644
--- a/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.errors.txt
+++ b/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.errors.txt
@@ -1,13 +1,10 @@
-tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(1,20): error TS2307: Cannot find module 'externalModule'.
 tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(2,16): error TS2664: Invalid module name in augmentation, module 'm1' cannot be found.
 tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(3,26): error TS2307: Cannot find module 'externalModule'.
 
 
-==== tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts (4 errors) ====
+==== tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts (3 errors) ====
     import b = require("externalModule");
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
                        ~~~~~~~~~~~~~~~~
 !!! error TS2307: Cannot find module 'externalModule'.
     declare module "m1" {
diff --git a/tests/baselines/reference/importDeclWithDeclareModifier.errors.txt b/tests/baselines/reference/importDeclWithDeclareModifier.errors.txt
index 9e3d012aeb6..cad498a8409 100644
--- a/tests/baselines/reference/importDeclWithDeclareModifier.errors.txt
+++ b/tests/baselines/reference/importDeclWithDeclareModifier.errors.txt
@@ -1,16 +1,13 @@
-tests/cases/compiler/importDeclWithDeclareModifier.ts(5,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/compiler/importDeclWithDeclareModifier.ts(5,9): error TS1029: 'export' modifier must precede 'declare' modifier.
 tests/cases/compiler/importDeclWithDeclareModifier.ts(5,29): error TS2305: Module 'x' has no exported member 'c'.
 
 
-==== tests/cases/compiler/importDeclWithDeclareModifier.ts (3 errors) ====
+==== tests/cases/compiler/importDeclWithDeclareModifier.ts (2 errors) ====
     module x {
         interface c {
         }
     }
     declare export import a = x.c;
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
             ~~~~~~
 !!! error TS1029: 'export' modifier must precede 'declare' modifier.
                                 ~
diff --git a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.symbols b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.symbols
index 0cd2498e2af..b0eedcddc62 100644
--- a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.symbols
+++ b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.symbols
@@ -12,6 +12,6 @@ export class B {
 >B : Symbol(B, Decl(importDeclarationUsedAsTypeQuery_require.ts, 0, 0))
 
     id: number;
->id : Symbol(id, Decl(importDeclarationUsedAsTypeQuery_require.ts, 0, 16))
+>id : Symbol(B.id, Decl(importDeclarationUsedAsTypeQuery_require.ts, 0, 16))
 }
 
diff --git a/tests/baselines/reference/importImportOnlyModule.js b/tests/baselines/reference/importImportOnlyModule.js
index 013999321f9..38ffc08d65e 100644
--- a/tests/baselines/reference/importImportOnlyModule.js
+++ b/tests/baselines/reference/importImportOnlyModule.js
@@ -24,8 +24,8 @@ define(["require", "exports"], function (require, exports) {
         }
         return C1;
     }());
-    C1.s1 = true;
     exports.C1 = C1;
+    C1.s1 = true;
 });
 //// [foo_1.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/importImportOnlyModule.symbols b/tests/baselines/reference/importImportOnlyModule.symbols
index 902f1b45a68..a56fe3752e2 100644
--- a/tests/baselines/reference/importImportOnlyModule.symbols
+++ b/tests/baselines/reference/importImportOnlyModule.symbols
@@ -11,7 +11,7 @@ export class C1 {
 >C1 : Symbol(C1, Decl(foo_0.ts, 0, 0))
 
 	m1 = 42;
->m1 : Symbol(m1, Decl(foo_0.ts, 0, 17))
+>m1 : Symbol(C1.m1, Decl(foo_0.ts, 0, 17))
 
 	static s1 = true;
 >s1 : Symbol(C1.s1, Decl(foo_0.ts, 1, 9))
diff --git a/tests/baselines/reference/importInTypePosition.symbols b/tests/baselines/reference/importInTypePosition.symbols
index 08f55093c50..93a4908b7a8 100644
--- a/tests/baselines/reference/importInTypePosition.symbols
+++ b/tests/baselines/reference/importInTypePosition.symbols
@@ -6,8 +6,8 @@ module A {
 >Point : Symbol(Point, Decl(importInTypePosition.ts, 0, 10))
 
         constructor(public x: number, public y: number) { }
->x : Symbol(x, Decl(importInTypePosition.ts, 2, 20))
->y : Symbol(y, Decl(importInTypePosition.ts, 2, 37))
+>x : Symbol(Point.x, Decl(importInTypePosition.ts, 2, 20))
+>y : Symbol(Point.y, Decl(importInTypePosition.ts, 2, 37))
     }
     export var Origin = new Point(0, 0);
 >Origin : Symbol(Origin, Decl(importInTypePosition.ts, 4, 14))
diff --git a/tests/baselines/reference/importOnAliasedIdentifiers.symbols b/tests/baselines/reference/importOnAliasedIdentifiers.symbols
index 7717799d4db..0ee0e83db80 100644
--- a/tests/baselines/reference/importOnAliasedIdentifiers.symbols
+++ b/tests/baselines/reference/importOnAliasedIdentifiers.symbols
@@ -4,7 +4,7 @@ module A {
 
     export interface X { s: string }
 >X : Symbol(X, Decl(importOnAliasedIdentifiers.ts, 0, 10), Decl(importOnAliasedIdentifiers.ts, 2, 14))
->s : Symbol(s, Decl(importOnAliasedIdentifiers.ts, 1, 24))
+>s : Symbol(X.s, Decl(importOnAliasedIdentifiers.ts, 1, 24))
 
     export var X: X;
 >X : Symbol(X, Decl(importOnAliasedIdentifiers.ts, 0, 10), Decl(importOnAliasedIdentifiers.ts, 2, 14))
@@ -15,7 +15,7 @@ module B {
 
     interface A { n: number }
 >A : Symbol(A, Decl(importOnAliasedIdentifiers.ts, 4, 10))
->n : Symbol(n, Decl(importOnAliasedIdentifiers.ts, 5, 17))
+>n : Symbol(A.n, Decl(importOnAliasedIdentifiers.ts, 5, 17))
 
     import Y = A; // Alias only for module A
 >Y : Symbol(Y, Decl(importOnAliasedIdentifiers.ts, 5, 29))
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/importStatements.symbols b/tests/baselines/reference/importStatements.symbols
index b160dcf2888..3a5a4ff2a31 100644
--- a/tests/baselines/reference/importStatements.symbols
+++ b/tests/baselines/reference/importStatements.symbols
@@ -6,8 +6,8 @@ module A {
 >Point : Symbol(Point, Decl(importStatements.ts, 0, 10))
 
         constructor(public x: number, public y: number) { }
->x : Symbol(x, Decl(importStatements.ts, 2, 20))
->y : Symbol(y, Decl(importStatements.ts, 2, 37))
+>x : Symbol(Point.x, Decl(importStatements.ts, 2, 20))
+>y : Symbol(Point.y, Decl(importStatements.ts, 2, 37))
     }
 
     export var Origin = new Point(0, 0);
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/importUsedInExtendsList1.symbols b/tests/baselines/reference/importUsedInExtendsList1.symbols
index 263b4f50ed8..4ee60e8d670 100644
--- a/tests/baselines/reference/importUsedInExtendsList1.symbols
+++ b/tests/baselines/reference/importUsedInExtendsList1.symbols
@@ -22,5 +22,5 @@ var r: string = s.foo;
 === tests/cases/compiler/importUsedInExtendsList1_require.ts ===
 export class Super { foo: string; }
 >Super : Symbol(Super, Decl(importUsedInExtendsList1_require.ts, 0, 0))
->foo : Symbol(foo, Decl(importUsedInExtendsList1_require.ts, 0, 20))
+>foo : Symbol(Super.foo, Decl(importUsedInExtendsList1_require.ts, 0, 20))
 
diff --git a/tests/baselines/reference/import_reference-exported-alias.symbols b/tests/baselines/reference/import_reference-exported-alias.symbols
index 424bb4bc8b4..5a7e8b8c5c7 100644
--- a/tests/baselines/reference/import_reference-exported-alias.symbols
+++ b/tests/baselines/reference/import_reference-exported-alias.symbols
@@ -29,7 +29,7 @@ module App {
 >UserServices : Symbol(UserServices, Decl(file1.ts, 1, 28))
 
             public getUserName(): string {
->getUserName : Symbol(getUserName, Decl(file1.ts, 2, 35))
+>getUserName : Symbol(UserServices.getUserName, Decl(file1.ts, 2, 35))
 
                 return "Bill Gates";
             }
diff --git a/tests/baselines/reference/import_reference-to-type-alias.symbols b/tests/baselines/reference/import_reference-to-type-alias.symbols
index 2fef0714a3a..6d096c1cba3 100644
--- a/tests/baselines/reference/import_reference-to-type-alias.symbols
+++ b/tests/baselines/reference/import_reference-to-type-alias.symbols
@@ -27,7 +27,7 @@ export module App {
 >UserServices : Symbol(UserServices, Decl(file1.ts, 1, 28))
 
             public getUserName(): string {
->getUserName : Symbol(getUserName, Decl(file1.ts, 2, 35))
+>getUserName : Symbol(UserServices.getUserName, Decl(file1.ts, 2, 35))
 
                 return "Bill Gates";
             }
diff --git a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.symbols b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.symbols
index bfc29cd8032..c8de5db1707 100644
--- a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.symbols
+++ b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.symbols
@@ -19,7 +19,7 @@ declare module "ITest" {
 >Name : Symbol(Name, Decl(b.ts, 0, 24))
 
         name: string;
->name : Symbol(name, Decl(b.ts, 1, 20))
+>name : Symbol(Name.name, Decl(b.ts, 1, 20))
     }
     export = Name;
 >Name : Symbol(Name, Decl(b.ts, 0, 24))
diff --git a/tests/baselines/reference/importedAliasesInTypePositions.symbols b/tests/baselines/reference/importedAliasesInTypePositions.symbols
index 50a6b582655..1d28900c22f 100644
--- a/tests/baselines/reference/importedAliasesInTypePositions.symbols
+++ b/tests/baselines/reference/importedAliasesInTypePositions.symbols
@@ -18,7 +18,7 @@ export module ImportingModule {
 >UsesReferredType : Symbol(UsesReferredType, Decl(file2.ts, 3, 31))
 
         constructor(private referred: ReferredTo) { }
->referred : Symbol(referred, Decl(file2.ts, 5, 20))
+>referred : Symbol(UsesReferredType.referred, Decl(file2.ts, 5, 20))
 >ReferredTo : Symbol(ReferredTo, Decl(file2.ts, 0, 35))
     }
 }
@@ -33,7 +33,7 @@ export module elaborate.nested.mod.name {
 >ReferredTo : Symbol(ReferredTo, Decl(file1.ts, 0, 41))
 
         doSomething(): void {
->doSomething : Symbol(doSomething, Decl(file1.ts, 1, 29))
+>doSomething : Symbol(ReferredTo.doSomething, Decl(file1.ts, 1, 29))
         }
     }
 }
diff --git a/tests/baselines/reference/inOperatorWithGeneric.symbols b/tests/baselines/reference/inOperatorWithGeneric.symbols
index 7a84d7dce6b..0088fef0fa3 100644
--- a/tests/baselines/reference/inOperatorWithGeneric.symbols
+++ b/tests/baselines/reference/inOperatorWithGeneric.symbols
@@ -4,7 +4,7 @@ class C<T> {
 >T : Symbol(T, Decl(inOperatorWithGeneric.ts, 0, 8))
 
     foo(x:T) {
->foo : Symbol(foo, Decl(inOperatorWithGeneric.ts, 0, 12))
+>foo : Symbol(C.foo, Decl(inOperatorWithGeneric.ts, 0, 12))
 >x : Symbol(x, Decl(inOperatorWithGeneric.ts, 1, 8))
 >T : Symbol(T, Decl(inOperatorWithGeneric.ts, 0, 8))
 
diff --git a/tests/baselines/reference/inOperatorWithValidOperands.symbols b/tests/baselines/reference/inOperatorWithValidOperands.symbols
index 07e0bd4f6de..75e561989e7 100644
--- a/tests/baselines/reference/inOperatorWithValidOperands.symbols
+++ b/tests/baselines/reference/inOperatorWithValidOperands.symbols
@@ -61,11 +61,11 @@ function foo<T>(t: T) {
 
 interface X { x: number }
 >X : Symbol(X, Decl(inOperatorWithValidOperands.ts, 22, 1))
->x : Symbol(x, Decl(inOperatorWithValidOperands.ts, 24, 13))
+>x : Symbol(X.x, Decl(inOperatorWithValidOperands.ts, 24, 13))
 
 interface Y { y: number }
 >Y : Symbol(Y, Decl(inOperatorWithValidOperands.ts, 24, 25))
->y : Symbol(y, Decl(inOperatorWithValidOperands.ts, 25, 13))
+>y : Symbol(Y.y, Decl(inOperatorWithValidOperands.ts, 25, 13))
 
 var c1: X | Y;
 >c1 : Symbol(c1, Decl(inOperatorWithValidOperands.ts, 27, 3))
diff --git a/tests/baselines/reference/incompatibleTypes.errors.txt b/tests/baselines/reference/incompatibleTypes.errors.txt
index e612600a7f8..cb6de6576b2 100644
--- a/tests/baselines/reference/incompatibleTypes.errors.txt
+++ b/tests/baselines/reference/incompatibleTypes.errors.txt
@@ -6,7 +6,7 @@ tests/cases/compiler/incompatibleTypes.ts(15,7): error TS2420: Class 'C2' incorr
   Types of property 'p1' are incompatible.
     Type '(n: number) => number' is not assignable to type '(s: string) => number'.
       Types of parameters 'n' and 's' are incompatible.
-        Type 'number' is not assignable to type 'string'.
+        Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/incompatibleTypes.ts(25,7): error TS2420: Class 'C3' incorrectly implements interface 'IFoo3'.
   Types of property 'p1' are incompatible.
     Type 'number' is not assignable to type 'string'.
@@ -52,7 +52,7 @@ tests/cases/compiler/incompatibleTypes.ts(74,5): error TS2322: Type '(a: any) =>
 !!! error TS2420:   Types of property 'p1' are incompatible.
 !!! error TS2420:     Type '(n: number) => number' is not assignable to type '(s: string) => number'.
 !!! error TS2420:       Types of parameters 'n' and 's' are incompatible.
-!!! error TS2420:         Type 'number' is not assignable to type 'string'.
+!!! error TS2420:         Type 'string' is not assignable to type 'number'.
         public p1(n:number) {
             return 0;
         }
diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherType.symbols b/tests/baselines/reference/incrementOperatorWithAnyOtherType.symbols
index d0af700ea8e..338ab905064 100644
--- a/tests/baselines/reference/incrementOperatorWithAnyOtherType.symbols
+++ b/tests/baselines/reference/incrementOperatorWithAnyOtherType.symbols
@@ -19,7 +19,7 @@ class A {
 >A : Symbol(A, Decl(incrementOperatorWithAnyOtherType.ts, 5, 23))
 
     public a: any;
->a : Symbol(a, Decl(incrementOperatorWithAnyOtherType.ts, 6, 9))
+>a : Symbol(A.a, Decl(incrementOperatorWithAnyOtherType.ts, 6, 9))
 }
 module M {
 >M : Symbol(M, Decl(incrementOperatorWithAnyOtherType.ts, 8, 1))
diff --git a/tests/baselines/reference/incrementOperatorWithNumberType.symbols b/tests/baselines/reference/incrementOperatorWithNumberType.symbols
index 3523e15135c..b7e67e5dfec 100644
--- a/tests/baselines/reference/incrementOperatorWithNumberType.symbols
+++ b/tests/baselines/reference/incrementOperatorWithNumberType.symbols
@@ -10,7 +10,7 @@ class A {
 >A : Symbol(A, Decl(incrementOperatorWithNumberType.ts, 2, 31))
 
     public a: number;
->a : Symbol(a, Decl(incrementOperatorWithNumberType.ts, 4, 9))
+>a : Symbol(A.a, Decl(incrementOperatorWithNumberType.ts, 4, 9))
 }
 module M {
 >M : Symbol(M, Decl(incrementOperatorWithNumberType.ts, 6, 1))
diff --git a/tests/baselines/reference/indexSignaturesInferentialTyping.types b/tests/baselines/reference/indexSignaturesInferentialTyping.types
index 328dbc18e4f..8545a7d4ca9 100644
--- a/tests/baselines/reference/indexSignaturesInferentialTyping.types
+++ b/tests/baselines/reference/indexSignaturesInferentialTyping.types
@@ -21,15 +21,15 @@ var x1 = foo({ 0: 0, 1: 1 });       // type should be number
 >x1 : number
 >foo({ 0: 0, 1: 1 }) : number
 >foo : <T>(items: { [index: number]: T; }) => T
->{ 0: 0, 1: 1 } : { [x: number]: number; 0: number; 1: number; }
+>{ 0: 0, 1: 1 } : { 0: number; 1: number; }
 >0 : number
 >1 : number
 
 var x2 = foo({ zero: 0, one: 1 });
->x2 : any
->foo({ zero: 0, one: 1 }) : any
+>x2 : {}
+>foo({ zero: 0, one: 1 }) : {}
 >foo : <T>(items: { [index: number]: T; }) => T
->{ zero: 0, one: 1 } : { [x: number]: undefined; zero: number; one: number; }
+>{ zero: 0, one: 1 } : { zero: number; one: number; }
 >zero : number
 >0 : number
 >one : number
@@ -39,7 +39,7 @@ var x3 = bar({ 0: 0, 1: 1 });
 >x3 : number
 >bar({ 0: 0, 1: 1 }) : number
 >bar : <T>(items: { [index: string]: T; }) => T
->{ 0: 0, 1: 1 } : { [x: string]: number; 0: number; 1: number; }
+>{ 0: 0, 1: 1 } : { 0: number; 1: number; }
 >0 : number
 >1 : number
 
@@ -47,7 +47,7 @@ var x4 = bar({ zero: 0, one: 1 });  // type should be number
 >x4 : number
 >bar({ zero: 0, one: 1 }) : number
 >bar : <T>(items: { [index: string]: T; }) => T
->{ zero: 0, one: 1 } : { [x: string]: number; zero: number; one: number; }
+>{ zero: 0, one: 1 } : { zero: number; one: number; }
 >zero : number
 >0 : number
 >one : number
diff --git a/tests/baselines/reference/indexer.symbols b/tests/baselines/reference/indexer.symbols
index 409bd8092d6..a713beadccd 100644
--- a/tests/baselines/reference/indexer.symbols
+++ b/tests/baselines/reference/indexer.symbols
@@ -3,7 +3,7 @@ interface JQueryElement {
 >JQueryElement : Symbol(JQueryElement, Decl(indexer.ts, 0, 0))
 
     id:string;
->id : Symbol(id, Decl(indexer.ts, 0, 25))
+>id : Symbol(JQueryElement.id, Decl(indexer.ts, 0, 25))
 }
 
 interface JQuery {
diff --git a/tests/baselines/reference/indexer.types b/tests/baselines/reference/indexer.types
index a0142bb9383..f24c90f6ea1 100644
--- a/tests/baselines/reference/indexer.types
+++ b/tests/baselines/reference/indexer.types
@@ -17,7 +17,7 @@ interface JQuery {
 var jq:JQuery={ 0: { id : "a" }, 1: { id : "b" } };
 >jq : JQuery
 >JQuery : JQuery
->{ 0: { id : "a" }, 1: { id : "b" } } : { [x: number]: { id: string; }; 0: { id: string; }; 1: { id: string; }; }
+>{ 0: { id : "a" }, 1: { id : "b" } } : { 0: { id: string; }; 1: { id: string; }; }
 >{ id : "a" } : { id: string; }
 >id : string
 >"a" : string
diff --git a/tests/baselines/reference/indexer2.symbols b/tests/baselines/reference/indexer2.symbols
index c23debb925c..77c024fc8cb 100644
--- a/tests/baselines/reference/indexer2.symbols
+++ b/tests/baselines/reference/indexer2.symbols
@@ -6,7 +6,7 @@ interface IDirectChildrenMap {
 >IDirectChildrenMap : Symbol(IDirectChildrenMap, Decl(indexer2.ts, 0, 32))
 
         hasOwnProperty(objectId: number) : boolean; 
->hasOwnProperty : Symbol(hasOwnProperty, Decl(indexer2.ts, 1, 30))
+>hasOwnProperty : Symbol(IDirectChildrenMap.hasOwnProperty, Decl(indexer2.ts, 1, 30))
 >objectId : Symbol(objectId, Decl(indexer2.ts, 2, 23))
 
         [objectId: number] : IHeapObjectProperty[]; 
diff --git a/tests/baselines/reference/indexer2.types b/tests/baselines/reference/indexer2.types
index 7f1ccd41cb5..ff82707edd3 100644
--- a/tests/baselines/reference/indexer2.types
+++ b/tests/baselines/reference/indexer2.types
@@ -17,5 +17,5 @@ var directChildrenMap = <IDirectChildrenMap>{};
 >directChildrenMap : IDirectChildrenMap
 ><IDirectChildrenMap>{} : IDirectChildrenMap
 >IDirectChildrenMap : IDirectChildrenMap
->{} : { [x: number]: undefined; }
+>{} : {}
 
diff --git a/tests/baselines/reference/indexer3.symbols b/tests/baselines/reference/indexer3.symbols
index fa6f905def6..03b055b343f 100644
--- a/tests/baselines/reference/indexer3.symbols
+++ b/tests/baselines/reference/indexer3.symbols
@@ -2,10 +2,10 @@
 var dateMap: { [x: string]: Date; } = {}
 >dateMap : Symbol(dateMap, Decl(indexer3.ts, 0, 3))
 >x : Symbol(x, Decl(indexer3.ts, 0, 16))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var r: Date = dateMap["hello"] // result type includes indexer using BCT
 >r : Symbol(r, Decl(indexer3.ts, 1, 3))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >dateMap : Symbol(dateMap, Decl(indexer3.ts, 0, 3))
 
diff --git a/tests/baselines/reference/indexer3.types b/tests/baselines/reference/indexer3.types
index 8f0582f782a..28bcd9cab0c 100644
--- a/tests/baselines/reference/indexer3.types
+++ b/tests/baselines/reference/indexer3.types
@@ -3,7 +3,7 @@ var dateMap: { [x: string]: Date; } = {}
 >dateMap : { [x: string]: Date; }
 >x : string
 >Date : Date
->{} : { [x: string]: undefined; }
+>{} : {}
 
 var r: Date = dateMap["hello"] // result type includes indexer using BCT
 >r : Date
diff --git a/tests/baselines/reference/indexerA.symbols b/tests/baselines/reference/indexerA.symbols
index d549c3359d9..b254618673a 100644
--- a/tests/baselines/reference/indexerA.symbols
+++ b/tests/baselines/reference/indexerA.symbols
@@ -3,7 +3,7 @@ class JQueryElement {
 >JQueryElement : Symbol(JQueryElement, Decl(indexerA.ts, 0, 0))
 
     id:string;
->id : Symbol(id, Decl(indexerA.ts, 0, 21))
+>id : Symbol(JQueryElement.id, Decl(indexerA.ts, 0, 21))
 }
 
 class JQuery {
diff --git a/tests/baselines/reference/indexerA.types b/tests/baselines/reference/indexerA.types
index c6ff81b3a26..ee6351eae33 100644
--- a/tests/baselines/reference/indexerA.types
+++ b/tests/baselines/reference/indexerA.types
@@ -17,7 +17,7 @@ class JQuery {
 var jq:JQuery={ 0: { id : "a" }, 1: { id : "b" } };
 >jq : JQuery
 >JQuery : JQuery
->{ 0: { id : "a" }, 1: { id : "b" } } : { [x: number]: { id: string; }; 0: { id: string; }; 1: { id: string; }; }
+>{ 0: { id : "a" }, 1: { id : "b" } } : { 0: { id: string; }; 1: { id: string; }; }
 >{ id : "a" } : { id: string; }
 >id : string
 >"a" : string
diff --git a/tests/baselines/reference/indexerAssignability.errors.txt b/tests/baselines/reference/indexerAssignability.errors.txt
deleted file mode 100644
index 44c2184517e..00000000000
--- a/tests/baselines/reference/indexerAssignability.errors.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-tests/cases/compiler/indexerAssignability.ts(5,1): error TS2322: Type '{ [n: number]: string; }' is not assignable to type '{ [s: string]: string; }'.
-  Index signature is missing in type '{ [n: number]: string; }'.
-tests/cases/compiler/indexerAssignability.ts(6,1): error TS2322: Type '{}' is not assignable to type '{ [s: string]: string; }'.
-  Index signature is missing in type '{}'.
-tests/cases/compiler/indexerAssignability.ts(8,1): error TS2322: Type '{}' is not assignable to type '{ [n: number]: string; }'.
-  Index signature is missing in type '{}'.
-
-
-==== tests/cases/compiler/indexerAssignability.ts (3 errors) ====
-    var a: { [s: string]: string; };
-    var b: { [n: number]: string; };
-    var c: {};
-    
-    a = b;
-    ~
-!!! error TS2322: Type '{ [n: number]: string; }' is not assignable to type '{ [s: string]: string; }'.
-!!! error TS2322:   Index signature is missing in type '{ [n: number]: string; }'.
-    a = c;
-    ~
-!!! error TS2322: Type '{}' is not assignable to type '{ [s: string]: string; }'.
-!!! error TS2322:   Index signature is missing in type '{}'.
-    b = a;
-    b = c;
-    ~
-!!! error TS2322: Type '{}' is not assignable to type '{ [n: number]: string; }'.
-!!! error TS2322:   Index signature is missing in type '{}'.
-    c = a;
-    c = b;
\ No newline at end of file
diff --git a/tests/baselines/reference/indexerAssignability.symbols b/tests/baselines/reference/indexerAssignability.symbols
new file mode 100644
index 00000000000..379a2885e2c
--- /dev/null
+++ b/tests/baselines/reference/indexerAssignability.symbols
@@ -0,0 +1,36 @@
+=== tests/cases/compiler/indexerAssignability.ts ===
+var a: { [s: string]: string; };
+>a : Symbol(a, Decl(indexerAssignability.ts, 0, 3))
+>s : Symbol(s, Decl(indexerAssignability.ts, 0, 10))
+
+var b: { [n: number]: string; };
+>b : Symbol(b, Decl(indexerAssignability.ts, 1, 3))
+>n : Symbol(n, Decl(indexerAssignability.ts, 1, 10))
+
+var c: {};
+>c : Symbol(c, Decl(indexerAssignability.ts, 2, 3))
+
+a = b;
+>a : Symbol(a, Decl(indexerAssignability.ts, 0, 3))
+>b : Symbol(b, Decl(indexerAssignability.ts, 1, 3))
+
+a = c;
+>a : Symbol(a, Decl(indexerAssignability.ts, 0, 3))
+>c : Symbol(c, Decl(indexerAssignability.ts, 2, 3))
+
+b = a;
+>b : Symbol(b, Decl(indexerAssignability.ts, 1, 3))
+>a : Symbol(a, Decl(indexerAssignability.ts, 0, 3))
+
+b = c;
+>b : Symbol(b, Decl(indexerAssignability.ts, 1, 3))
+>c : Symbol(c, Decl(indexerAssignability.ts, 2, 3))
+
+c = a;
+>c : Symbol(c, Decl(indexerAssignability.ts, 2, 3))
+>a : Symbol(a, Decl(indexerAssignability.ts, 0, 3))
+
+c = b;
+>c : Symbol(c, Decl(indexerAssignability.ts, 2, 3))
+>b : Symbol(b, Decl(indexerAssignability.ts, 1, 3))
+
diff --git a/tests/baselines/reference/indexerAssignability.types b/tests/baselines/reference/indexerAssignability.types
new file mode 100644
index 00000000000..bd301b59224
--- /dev/null
+++ b/tests/baselines/reference/indexerAssignability.types
@@ -0,0 +1,42 @@
+=== tests/cases/compiler/indexerAssignability.ts ===
+var a: { [s: string]: string; };
+>a : { [s: string]: string; }
+>s : string
+
+var b: { [n: number]: string; };
+>b : { [n: number]: string; }
+>n : number
+
+var c: {};
+>c : {}
+
+a = b;
+>a = b : { [n: number]: string; }
+>a : { [s: string]: string; }
+>b : { [n: number]: string; }
+
+a = c;
+>a = c : {}
+>a : { [s: string]: string; }
+>c : {}
+
+b = a;
+>b = a : { [s: string]: string; }
+>b : { [n: number]: string; }
+>a : { [s: string]: string; }
+
+b = c;
+>b = c : {}
+>b : { [n: number]: string; }
+>c : {}
+
+c = a;
+>c = a : { [s: string]: string; }
+>c : {}
+>a : { [s: string]: string; }
+
+c = b;
+>c = b : { [n: number]: string; }
+>c : {}
+>b : { [n: number]: string; }
+
diff --git a/tests/baselines/reference/indexerReturningTypeParameter1.symbols b/tests/baselines/reference/indexerReturningTypeParameter1.symbols
index 0bb1e305c80..b9c2e7a4c16 100644
--- a/tests/baselines/reference/indexerReturningTypeParameter1.symbols
+++ b/tests/baselines/reference/indexerReturningTypeParameter1.symbols
@@ -3,7 +3,7 @@ interface f {
 >f : Symbol(f, Decl(indexerReturningTypeParameter1.ts, 0, 0))
 
     groupBy<T>(): { [key: string]: T[]; };
->groupBy : Symbol(groupBy, Decl(indexerReturningTypeParameter1.ts, 0, 13))
+>groupBy : Symbol(f.groupBy, Decl(indexerReturningTypeParameter1.ts, 0, 13))
 >T : Symbol(T, Decl(indexerReturningTypeParameter1.ts, 1, 12))
 >key : Symbol(key, Decl(indexerReturningTypeParameter1.ts, 1, 21))
 >T : Symbol(T, Decl(indexerReturningTypeParameter1.ts, 1, 12))
@@ -22,7 +22,7 @@ class c {
 >c : Symbol(c, Decl(indexerReturningTypeParameter1.ts, 4, 20))
 
     groupBy<T>(): { [key: string]: T[]; } {
->groupBy : Symbol(groupBy, Decl(indexerReturningTypeParameter1.ts, 6, 9))
+>groupBy : Symbol(c.groupBy, Decl(indexerReturningTypeParameter1.ts, 6, 9))
 >T : Symbol(T, Decl(indexerReturningTypeParameter1.ts, 7, 12))
 >key : Symbol(key, Decl(indexerReturningTypeParameter1.ts, 7, 21))
 >T : Symbol(T, Decl(indexerReturningTypeParameter1.ts, 7, 12))
diff --git a/tests/baselines/reference/indexersInClassType.symbols b/tests/baselines/reference/indexersInClassType.symbols
index 0852463c37d..27c64845e92 100644
--- a/tests/baselines/reference/indexersInClassType.symbols
+++ b/tests/baselines/reference/indexersInClassType.symbols
@@ -4,19 +4,19 @@ class C {
 
     [x: number]: Date;
 >x : Symbol(x, Decl(indexersInClassType.ts, 1, 5))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     [x: string]: Object;
 >x : Symbol(x, Decl(indexersInClassType.ts, 2, 5))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     1: Date;
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     'a': {}
 
     fn() {
->fn : Symbol(fn, Decl(indexersInClassType.ts, 4, 11))
+>fn : Symbol(C.fn, Decl(indexersInClassType.ts, 4, 11))
 
         return this;
 >this : Symbol(C, Decl(indexersInClassType.ts, 0, 0))
diff --git a/tests/baselines/reference/inferSecondaryParameter.symbols b/tests/baselines/reference/inferSecondaryParameter.symbols
index 5522770c02f..b6817d8fd52 100644
--- a/tests/baselines/reference/inferSecondaryParameter.symbols
+++ b/tests/baselines/reference/inferSecondaryParameter.symbols
@@ -3,7 +3,7 @@
 
 interface Ib { m(test: string, fn: Function); }
 >Ib : Symbol(Ib, Decl(inferSecondaryParameter.ts, 0, 0))
->m : Symbol(m, Decl(inferSecondaryParameter.ts, 2, 14))
+>m : Symbol(Ib.m, Decl(inferSecondaryParameter.ts, 2, 14))
 >test : Symbol(test, Decl(inferSecondaryParameter.ts, 2, 17))
 >fn : Symbol(fn, Decl(inferSecondaryParameter.ts, 2, 30))
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
diff --git a/tests/baselines/reference/inferenceLimit.js b/tests/baselines/reference/inferenceLimit.js
new file mode 100644
index 00000000000..a3fa5226830
--- /dev/null
+++ b/tests/baselines/reference/inferenceLimit.js
@@ -0,0 +1,81 @@
+//// [tests/cases/compiler/inferenceLimit.ts] ////
+
+//// [file1.ts]
+"use strict";
+import * as MyModule from "./mymodule";
+
+export class BrokenClass {
+
+  constructor() {}
+
+  public brokenMethod(field: string, value: string) {
+  return new Promise<Array<MyModule.MyModel>>((resolve, reject) => {
+
+    let result: Array<MyModule.MyModel> = [];
+
+    let populateItems = (order) => {
+      return new Promise((resolve, reject) => {
+        this.doStuff(order.id)
+          .then((items) => {
+            order.items = items;
+            resolve(order);
+          });
+      });
+    };
+
+    return Promise.all(result.map(populateItems))
+      .then((orders: Array<MyModule.MyModel>) => {
+        resolve(orders);
+      });
+    });
+  }
+
+  public async doStuff(id: number) {
+    return;
+  }
+}
+
+//// [mymodule.ts]
+export interface MyModel {
+    id: number;
+}
+
+//// [mymodule.js]
+"use strict";
+//// [file1.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());
+    });
+};
+class BrokenClass {
+    constructor() { }
+    brokenMethod(field, value) {
+        return new Promise((resolve, reject) => {
+            let result = [];
+            let populateItems = (order) => {
+                return new Promise((resolve, reject) => {
+                    this.doStuff(order.id)
+                        .then((items) => {
+                        order.items = items;
+                        resolve(order);
+                    });
+                });
+            };
+            return Promise.all(result.map(populateItems))
+                .then((orders) => {
+                resolve(orders);
+            });
+        });
+    }
+    doStuff(id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return;
+        });
+    }
+}
+exports.BrokenClass = BrokenClass;
diff --git a/tests/baselines/reference/inferenceLimit.symbols b/tests/baselines/reference/inferenceLimit.symbols
new file mode 100644
index 00000000000..bedea9ce1f0
--- /dev/null
+++ b/tests/baselines/reference/inferenceLimit.symbols
@@ -0,0 +1,101 @@
+=== tests/cases/compiler/file1.ts ===
+"use strict";
+import * as MyModule from "./mymodule";
+>MyModule : Symbol(MyModule, Decl(file1.ts, 1, 6))
+
+export class BrokenClass {
+>BrokenClass : Symbol(BrokenClass, Decl(file1.ts, 1, 39))
+
+  constructor() {}
+
+  public brokenMethod(field: string, value: string) {
+>brokenMethod : Symbol(BrokenClass.brokenMethod, Decl(file1.ts, 5, 18))
+>field : Symbol(field, Decl(file1.ts, 7, 22))
+>value : Symbol(value, Decl(file1.ts, 7, 36))
+
+  return new Promise<Array<MyModule.MyModel>>((resolve, reject) => {
+>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, --, --))
+>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>MyModule : Symbol(MyModule, Decl(file1.ts, 1, 6))
+>MyModel : Symbol(MyModule.MyModel, Decl(mymodule.ts, 0, 0))
+>resolve : Symbol(resolve, Decl(file1.ts, 8, 47))
+>reject : Symbol(reject, Decl(file1.ts, 8, 55))
+
+    let result: Array<MyModule.MyModel> = [];
+>result : Symbol(result, Decl(file1.ts, 10, 7))
+>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>MyModule : Symbol(MyModule, Decl(file1.ts, 1, 6))
+>MyModel : Symbol(MyModule.MyModel, Decl(mymodule.ts, 0, 0))
+
+    let populateItems = (order) => {
+>populateItems : Symbol(populateItems, Decl(file1.ts, 12, 7))
+>order : Symbol(order, Decl(file1.ts, 12, 25))
+
+      return new Promise((resolve, reject) => {
+>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, --, --))
+>resolve : Symbol(resolve, Decl(file1.ts, 13, 26))
+>reject : Symbol(reject, Decl(file1.ts, 13, 34))
+
+        this.doStuff(order.id)
+>this.doStuff(order.id)          .then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>this.doStuff : Symbol(BrokenClass.doStuff, Decl(file1.ts, 27, 3))
+>this : Symbol(BrokenClass, Decl(file1.ts, 1, 39))
+>doStuff : Symbol(BrokenClass.doStuff, Decl(file1.ts, 27, 3))
+>order : Symbol(order, Decl(file1.ts, 12, 25))
+
+          .then((items) => {
+>then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>items : Symbol(items, Decl(file1.ts, 15, 17))
+
+            order.items = items;
+>order : Symbol(order, Decl(file1.ts, 12, 25))
+>items : Symbol(items, Decl(file1.ts, 15, 17))
+
+            resolve(order);
+>resolve : Symbol(resolve, Decl(file1.ts, 13, 26))
+>order : Symbol(order, Decl(file1.ts, 12, 25))
+
+          });
+      });
+    };
+
+    return Promise.all(result.map(populateItems))
+>Promise.all(result.map(populateItems))      .then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise.all : Symbol(PromiseConstructor.all, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>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, --, --))
+>all : Symbol(PromiseConstructor.all, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>result.map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --))
+>result : Symbol(result, Decl(file1.ts, 10, 7))
+>map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --))
+>populateItems : Symbol(populateItems, Decl(file1.ts, 12, 7))
+
+      .then((orders: Array<MyModule.MyModel>) => {
+>then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>orders : Symbol(orders, Decl(file1.ts, 23, 13))
+>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>MyModule : Symbol(MyModule, Decl(file1.ts, 1, 6))
+>MyModel : Symbol(MyModule.MyModel, Decl(mymodule.ts, 0, 0))
+
+        resolve(orders);
+>resolve : Symbol(resolve, Decl(file1.ts, 8, 47))
+>orders : Symbol(orders, Decl(file1.ts, 23, 13))
+
+      });
+    });
+  }
+
+  public async doStuff(id: number) {
+>doStuff : Symbol(BrokenClass.doStuff, Decl(file1.ts, 27, 3))
+>id : Symbol(id, Decl(file1.ts, 29, 23))
+
+    return;
+  }
+}
+
+=== tests/cases/compiler/mymodule.ts ===
+export interface MyModel {
+>MyModel : Symbol(MyModel, Decl(mymodule.ts, 0, 0))
+
+    id: number;
+>id : Symbol(MyModel.id, Decl(mymodule.ts, 0, 26))
+}
diff --git a/tests/baselines/reference/inferenceLimit.types b/tests/baselines/reference/inferenceLimit.types
new file mode 100644
index 00000000000..58f9b1e4ae0
--- /dev/null
+++ b/tests/baselines/reference/inferenceLimit.types
@@ -0,0 +1,123 @@
+=== tests/cases/compiler/file1.ts ===
+"use strict";
+>"use strict" : string
+
+import * as MyModule from "./mymodule";
+>MyModule : typeof MyModule
+
+export class BrokenClass {
+>BrokenClass : BrokenClass
+
+  constructor() {}
+
+  public brokenMethod(field: string, value: string) {
+>brokenMethod : (field: string, value: string) => Promise<MyModule.MyModel[]>
+>field : string
+>value : string
+
+  return new Promise<Array<MyModule.MyModel>>((resolve, reject) => {
+>new Promise<Array<MyModule.MyModel>>((resolve, reject) => {    let result: Array<MyModule.MyModel> = [];    let populateItems = (order) => {      return new Promise((resolve, reject) => {        this.doStuff(order.id)          .then((items) => {            order.items = items;            resolve(order);          });      });    };    return Promise.all(result.map(populateItems))      .then((orders: Array<MyModule.MyModel>) => {        resolve(orders);      });    }) : Promise<MyModule.MyModel[]>
+>Promise : PromiseConstructor
+>Array : T[]
+>MyModule : any
+>MyModel : MyModule.MyModel
+>(resolve, reject) => {    let result: Array<MyModule.MyModel> = [];    let populateItems = (order) => {      return new Promise((resolve, reject) => {        this.doStuff(order.id)          .then((items) => {            order.items = items;            resolve(order);          });      });    };    return Promise.all(result.map(populateItems))      .then((orders: Array<MyModule.MyModel>) => {        resolve(orders);      });    } : (resolve: (value?: MyModule.MyModel[] | PromiseLike<MyModule.MyModel[]>) => void, reject: (reason?: any) => void) => Promise<void>
+>resolve : (value?: MyModule.MyModel[] | PromiseLike<MyModule.MyModel[]>) => void
+>reject : (reason?: any) => void
+
+    let result: Array<MyModule.MyModel> = [];
+>result : MyModule.MyModel[]
+>Array : T[]
+>MyModule : any
+>MyModel : MyModule.MyModel
+>[] : undefined[]
+
+    let populateItems = (order) => {
+>populateItems : (order: any) => Promise<{}>
+>(order) => {      return new Promise((resolve, reject) => {        this.doStuff(order.id)          .then((items) => {            order.items = items;            resolve(order);          });      });    } : (order: any) => Promise<{}>
+>order : any
+
+      return new Promise((resolve, reject) => {
+>new Promise((resolve, reject) => {        this.doStuff(order.id)          .then((items) => {            order.items = items;            resolve(order);          });      }) : Promise<{}>
+>Promise : PromiseConstructor
+>(resolve, reject) => {        this.doStuff(order.id)          .then((items) => {            order.items = items;            resolve(order);          });      } : (resolve: (value?: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
+>resolve : (value?: {} | PromiseLike<{}>) => void
+>reject : (reason?: any) => void
+
+        this.doStuff(order.id)
+>this.doStuff(order.id)          .then((items) => {            order.items = items;            resolve(order);          }) : Promise<void>
+>this.doStuff(order.id)          .then : { <TResult>(onfulfilled?: (value: void) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>; <TResult>(onfulfilled?: (value: void) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): Promise<TResult>; }
+>this.doStuff(order.id) : Promise<void>
+>this.doStuff : (id: number) => Promise<void>
+>this : this
+>doStuff : (id: number) => Promise<void>
+>order.id : any
+>order : any
+>id : any
+
+          .then((items) => {
+>then : { <TResult>(onfulfilled?: (value: void) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>; <TResult>(onfulfilled?: (value: void) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): Promise<TResult>; }
+>(items) => {            order.items = items;            resolve(order);          } : (items: void) => void
+>items : void
+
+            order.items = items;
+>order.items = items : void
+>order.items : any
+>order : any
+>items : any
+>items : void
+
+            resolve(order);
+>resolve(order) : void
+>resolve : (value?: {} | PromiseLike<{}>) => void
+>order : any
+
+          });
+      });
+    };
+
+    return Promise.all(result.map(populateItems))
+>Promise.all(result.map(populateItems))      .then((orders: Array<MyModule.MyModel>) => {        resolve(orders);      }) : Promise<void>
+>Promise.all(result.map(populateItems))      .then : { <TResult>(onfulfilled?: (value: {}[]) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>; <TResult>(onfulfilled?: (value: {}[]) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): Promise<TResult>; }
+>Promise.all(result.map(populateItems)) : Promise<{}[]>
+>Promise.all : { <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>, T10 | PromiseLike<T10>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>; <T1, T2, T3, T4, T5, T6, T7, T8, T9>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>; <T1, T2, T3, T4, T5, T6, T7, T8>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8]>; <T1, T2, T3, T4, T5, T6, T7>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>]): Promise<[T1, T2, T3, T4, T5, T6, T7]>; <T1, T2, T3, T4, T5, T6>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>]): Promise<[T1, T2, T3, T4, T5, T6]>; <T1, T2, T3, T4, T5>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>]): Promise<[T1, T2, T3, T4, T5]>; <T1, T2, T3, T4>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>]): Promise<[T1, T2, T3, T4]>; <T1, T2, T3>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>]): Promise<[T1, T2, T3]>; <T1, T2>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>]): Promise<[T1, T2]>; <TAll>(values: Iterable<TAll | PromiseLike<TAll>>): Promise<TAll[]>; }
+>Promise : PromiseConstructor
+>all : { <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>, T10 | PromiseLike<T10>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>; <T1, T2, T3, T4, T5, T6, T7, T8, T9>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>; <T1, T2, T3, T4, T5, T6, T7, T8>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8]>; <T1, T2, T3, T4, T5, T6, T7>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>]): Promise<[T1, T2, T3, T4, T5, T6, T7]>; <T1, T2, T3, T4, T5, T6>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>]): Promise<[T1, T2, T3, T4, T5, T6]>; <T1, T2, T3, T4, T5>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>]): Promise<[T1, T2, T3, T4, T5]>; <T1, T2, T3, T4>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>]): Promise<[T1, T2, T3, T4]>; <T1, T2, T3>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>]): Promise<[T1, T2, T3]>; <T1, T2>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>]): Promise<[T1, T2]>; <TAll>(values: Iterable<TAll | PromiseLike<TAll>>): Promise<TAll[]>; }
+>result.map(populateItems) : Promise<{}>[]
+>result.map : <U>(callbackfn: (value: MyModule.MyModel, index: number, array: MyModule.MyModel[]) => U, thisArg?: any) => U[]
+>result : MyModule.MyModel[]
+>map : <U>(callbackfn: (value: MyModule.MyModel, index: number, array: MyModule.MyModel[]) => U, thisArg?: any) => U[]
+>populateItems : (order: any) => Promise<{}>
+
+      .then((orders: Array<MyModule.MyModel>) => {
+>then : { <TResult>(onfulfilled?: (value: {}[]) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>; <TResult>(onfulfilled?: (value: {}[]) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): Promise<TResult>; }
+>(orders: Array<MyModule.MyModel>) => {        resolve(orders);      } : (orders: MyModule.MyModel[]) => void
+>orders : MyModule.MyModel[]
+>Array : T[]
+>MyModule : any
+>MyModel : MyModule.MyModel
+
+        resolve(orders);
+>resolve(orders) : void
+>resolve : (value?: MyModule.MyModel[] | PromiseLike<MyModule.MyModel[]>) => void
+>orders : MyModule.MyModel[]
+
+      });
+    });
+  }
+
+  public async doStuff(id: number) {
+>doStuff : (id: number) => Promise<void>
+>id : number
+
+    return;
+  }
+}
+
+=== tests/cases/compiler/mymodule.ts ===
+export interface MyModel {
+>MyModel : MyModel
+
+    id: number;
+>id : number
+}
diff --git a/tests/baselines/reference/inferentialTypingObjectLiteralMethod1.symbols b/tests/baselines/reference/inferentialTypingObjectLiteralMethod1.symbols
index 07812704840..37e58850d4f 100644
--- a/tests/baselines/reference/inferentialTypingObjectLiteralMethod1.symbols
+++ b/tests/baselines/reference/inferentialTypingObjectLiteralMethod1.symbols
@@ -5,7 +5,7 @@ interface Int<T, U> {
 >U : Symbol(U, Decl(inferentialTypingObjectLiteralMethod1.ts, 0, 16))
 
     method(x: T): U;
->method : Symbol(method, Decl(inferentialTypingObjectLiteralMethod1.ts, 0, 21))
+>method : Symbol(Int.method, Decl(inferentialTypingObjectLiteralMethod1.ts, 0, 21))
 >x : Symbol(x, Decl(inferentialTypingObjectLiteralMethod1.ts, 1, 11))
 >T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod1.ts, 0, 14))
 >U : Symbol(U, Decl(inferentialTypingObjectLiteralMethod1.ts, 0, 16))
diff --git a/tests/baselines/reference/inferentialTypingObjectLiteralMethod2.types b/tests/baselines/reference/inferentialTypingObjectLiteralMethod2.types
index be937410cef..f70305739b8 100644
--- a/tests/baselines/reference/inferentialTypingObjectLiteralMethod2.types
+++ b/tests/baselines/reference/inferentialTypingObjectLiteralMethod2.types
@@ -30,13 +30,13 @@ foo("", { method(p1) { return p1.length } }, { method(p2) { return undefined } }
 >foo("", { method(p1) { return p1.length } }, { method(p2) { return undefined } }) : string
 >foo : <T, U>(x: T, y: Int<T, U>, z: Int<U, T>) => T
 >"" : string
->{ method(p1) { return p1.length } } : { [x: string]: (p1: string) => number; method(p1: string): number; }
+>{ method(p1) { return p1.length } } : { method(p1: string): number; }
 >method : (p1: string) => number
 >p1 : string
 >p1.length : number
 >p1 : string
 >length : number
->{ method(p2) { return undefined } } : { [x: string]: (p2: number) => any; method(p2: number): any; }
+>{ method(p2) { return undefined } } : { method(p2: number): any; }
 >method : (p2: number) => any
 >p2 : number
 >undefined : undefined
diff --git a/tests/baselines/reference/inferentialTypingUsingApparentType3.symbols b/tests/baselines/reference/inferentialTypingUsingApparentType3.symbols
index ac3058e8649..f5f73420fe3 100644
--- a/tests/baselines/reference/inferentialTypingUsingApparentType3.symbols
+++ b/tests/baselines/reference/inferentialTypingUsingApparentType3.symbols
@@ -4,7 +4,7 @@ interface Field<T> {
 >T : Symbol(T, Decl(inferentialTypingUsingApparentType3.ts, 0, 16))
 
     clean(input: T): T
->clean : Symbol(clean, Decl(inferentialTypingUsingApparentType3.ts, 0, 20))
+>clean : Symbol(Field.clean, Decl(inferentialTypingUsingApparentType3.ts, 0, 20))
 >input : Symbol(input, Decl(inferentialTypingUsingApparentType3.ts, 1, 10))
 >T : Symbol(T, Decl(inferentialTypingUsingApparentType3.ts, 0, 16))
 >T : Symbol(T, Decl(inferentialTypingUsingApparentType3.ts, 0, 16))
@@ -15,7 +15,7 @@ class CharField implements Field<string> {
 >Field : Symbol(Field, Decl(inferentialTypingUsingApparentType3.ts, 0, 0))
 
     clean(input: string) {
->clean : Symbol(clean, Decl(inferentialTypingUsingApparentType3.ts, 4, 42))
+>clean : Symbol(CharField.clean, Decl(inferentialTypingUsingApparentType3.ts, 4, 42))
 >input : Symbol(input, Decl(inferentialTypingUsingApparentType3.ts, 5, 10))
 
         return "Yup";
@@ -27,7 +27,7 @@ class NumberField implements Field<number> {
 >Field : Symbol(Field, Decl(inferentialTypingUsingApparentType3.ts, 0, 0))
 
     clean(input: number) {
->clean : Symbol(clean, Decl(inferentialTypingUsingApparentType3.ts, 10, 44))
+>clean : Symbol(NumberField.clean, Decl(inferentialTypingUsingApparentType3.ts, 10, 44))
 >input : Symbol(input, Decl(inferentialTypingUsingApparentType3.ts, 11, 10))
 
         return 123;
@@ -42,7 +42,7 @@ class ObjectField<A, T extends { [name: string]: Field<any> }> {
 >Field : Symbol(Field, Decl(inferentialTypingUsingApparentType3.ts, 0, 0))
 
     constructor(public fields: T) { }
->fields : Symbol(fields, Decl(inferentialTypingUsingApparentType3.ts, 17, 16))
+>fields : Symbol(ObjectField.fields, Decl(inferentialTypingUsingApparentType3.ts, 17, 16))
 >T : Symbol(T, Decl(inferentialTypingUsingApparentType3.ts, 16, 20))
 }
 
diff --git a/tests/baselines/reference/inferentialTypingUsingApparentType3.types b/tests/baselines/reference/inferentialTypingUsingApparentType3.types
index 9e0a4ceaea6..e375fe981e8 100644
--- a/tests/baselines/reference/inferentialTypingUsingApparentType3.types
+++ b/tests/baselines/reference/inferentialTypingUsingApparentType3.types
@@ -49,10 +49,10 @@ class ObjectField<A, T extends { [name: string]: Field<any> }> {
 }
 
 var person = new ObjectField({
->person : ObjectField<{}, { [x: string]: NumberField | CharField; id: NumberField; name: CharField; }>
->new ObjectField({    id: new NumberField(),    name: new CharField()}) : ObjectField<{}, { [x: string]: NumberField | CharField; id: NumberField; name: CharField; }>
+>person : ObjectField<{}, { id: NumberField; name: CharField; }>
+>new ObjectField({    id: new NumberField(),    name: new CharField()}) : ObjectField<{}, { id: NumberField; name: CharField; }>
 >ObjectField : typeof ObjectField
->{    id: new NumberField(),    name: new CharField()} : { [x: string]: NumberField | CharField; id: NumberField; name: CharField; }
+>{    id: new NumberField(),    name: new CharField()} : { id: NumberField; name: CharField; }
 
     id: new NumberField(),
 >id : NumberField
@@ -68,8 +68,8 @@ var person = new ObjectField({
 
 person.fields.id;
 >person.fields.id : NumberField
->person.fields : { [x: string]: NumberField | CharField; id: NumberField; name: CharField; }
->person : ObjectField<{}, { [x: string]: NumberField | CharField; id: NumberField; name: CharField; }>
->fields : { [x: string]: NumberField | CharField; id: NumberField; name: CharField; }
+>person.fields : { id: NumberField; name: CharField; }
+>person : ObjectField<{}, { id: NumberField; name: CharField; }>
+>fields : { id: NumberField; name: CharField; }
 >id : NumberField
 
diff --git a/tests/baselines/reference/infiniteExpandingTypeThroughInheritanceInstantiation.symbols b/tests/baselines/reference/infiniteExpandingTypeThroughInheritanceInstantiation.symbols
index 2640ec367dc..802d9c7af4f 100644
--- a/tests/baselines/reference/infiniteExpandingTypeThroughInheritanceInstantiation.symbols
+++ b/tests/baselines/reference/infiniteExpandingTypeThroughInheritanceInstantiation.symbols
@@ -4,7 +4,7 @@ interface A<T>
 >T : Symbol(T, Decl(infiniteExpandingTypeThroughInheritanceInstantiation.ts, 0, 12))
 {
    x: A<B<T>>
->x : Symbol(x, Decl(infiniteExpandingTypeThroughInheritanceInstantiation.ts, 1, 1))
+>x : Symbol(A.x, Decl(infiniteExpandingTypeThroughInheritanceInstantiation.ts, 1, 1))
 >A : Symbol(A, Decl(infiniteExpandingTypeThroughInheritanceInstantiation.ts, 0, 0))
 >B : Symbol(B, Decl(infiniteExpandingTypeThroughInheritanceInstantiation.ts, 3, 1))
 >T : Symbol(T, Decl(infiniteExpandingTypeThroughInheritanceInstantiation.ts, 0, 12))
@@ -17,7 +17,7 @@ interface B<T> extends A<T> // error
 >T : Symbol(T, Decl(infiniteExpandingTypeThroughInheritanceInstantiation.ts, 5, 12))
 {
    x: B<A<T>>
->x : Symbol(x, Decl(infiniteExpandingTypeThroughInheritanceInstantiation.ts, 6, 1))
+>x : Symbol(B.x, Decl(infiniteExpandingTypeThroughInheritanceInstantiation.ts, 6, 1))
 >B : Symbol(B, Decl(infiniteExpandingTypeThroughInheritanceInstantiation.ts, 3, 1))
 >A : Symbol(A, Decl(infiniteExpandingTypeThroughInheritanceInstantiation.ts, 0, 0))
 >T : Symbol(T, Decl(infiniteExpandingTypeThroughInheritanceInstantiation.ts, 5, 12))
diff --git a/tests/baselines/reference/infiniteExpansionThroughInstantiation2.symbols b/tests/baselines/reference/infiniteExpansionThroughInstantiation2.symbols
index 0c5b0cf5a65..37d2151feba 100644
--- a/tests/baselines/reference/infiniteExpansionThroughInstantiation2.symbols
+++ b/tests/baselines/reference/infiniteExpansionThroughInstantiation2.symbols
@@ -9,7 +9,7 @@ interface AA<T extends AA<T>> // now an error due to referencing type parameter
 >T : Symbol(T, Decl(infiniteExpansionThroughInstantiation2.ts, 3, 13))
 {
     x: T
->x : Symbol(x, Decl(infiniteExpansionThroughInstantiation2.ts, 4, 1))
+>x : Symbol(AA.x, Decl(infiniteExpansionThroughInstantiation2.ts, 4, 1))
 >T : Symbol(T, Decl(infiniteExpansionThroughInstantiation2.ts, 3, 13))
 }
 
diff --git a/tests/baselines/reference/infiniteExpansionThroughTypeInference.symbols b/tests/baselines/reference/infiniteExpansionThroughTypeInference.symbols
index ba90d5c74a8..db6ec796be3 100644
--- a/tests/baselines/reference/infiniteExpansionThroughTypeInference.symbols
+++ b/tests/baselines/reference/infiniteExpansionThroughTypeInference.symbols
@@ -4,13 +4,13 @@ interface G<T> {
 >T : Symbol(T, Decl(infiniteExpansionThroughTypeInference.ts, 0, 12))
 
     x: G<G<T>> // infinitely expanding type reference
->x : Symbol(x, Decl(infiniteExpansionThroughTypeInference.ts, 0, 16))
+>x : Symbol(G.x, Decl(infiniteExpansionThroughTypeInference.ts, 0, 16))
 >G : Symbol(G, Decl(infiniteExpansionThroughTypeInference.ts, 0, 0))
 >G : Symbol(G, Decl(infiniteExpansionThroughTypeInference.ts, 0, 0))
 >T : Symbol(T, Decl(infiniteExpansionThroughTypeInference.ts, 0, 12))
 
     y: T
->y : Symbol(y, Decl(infiniteExpansionThroughTypeInference.ts, 1, 14))
+>y : Symbol(G.y, Decl(infiniteExpansionThroughTypeInference.ts, 1, 14))
 >T : Symbol(T, Decl(infiniteExpansionThroughTypeInference.ts, 0, 12))
 }
 
diff --git a/tests/baselines/reference/infinitelyExpandingBaseTypes1.symbols b/tests/baselines/reference/infinitelyExpandingBaseTypes1.symbols
index dc3456602bb..2491583471a 100644
--- a/tests/baselines/reference/infinitelyExpandingBaseTypes1.symbols
+++ b/tests/baselines/reference/infinitelyExpandingBaseTypes1.symbols
@@ -4,7 +4,7 @@ interface A<T>
 >T : Symbol(T, Decl(infinitelyExpandingBaseTypes1.ts, 0, 12))
 {
     x : A<A<T>>
->x : Symbol(x, Decl(infinitelyExpandingBaseTypes1.ts, 1, 1))
+>x : Symbol(A.x, Decl(infinitelyExpandingBaseTypes1.ts, 1, 1))
 >A : Symbol(A, Decl(infinitelyExpandingBaseTypes1.ts, 0, 0))
 >A : Symbol(A, Decl(infinitelyExpandingBaseTypes1.ts, 0, 0))
 >T : Symbol(T, Decl(infinitelyExpandingBaseTypes1.ts, 0, 12))
@@ -15,7 +15,7 @@ interface B<T>
 >T : Symbol(T, Decl(infinitelyExpandingBaseTypes1.ts, 5, 12))
 {
     x : B<T>
->x : Symbol(x, Decl(infinitelyExpandingBaseTypes1.ts, 6, 1))
+>x : Symbol(B.x, Decl(infinitelyExpandingBaseTypes1.ts, 6, 1))
 >B : Symbol(B, Decl(infinitelyExpandingBaseTypes1.ts, 3, 1))
 >T : Symbol(T, Decl(infinitelyExpandingBaseTypes1.ts, 5, 12))
 }
diff --git a/tests/baselines/reference/infinitelyExpandingBaseTypes2.symbols b/tests/baselines/reference/infinitelyExpandingBaseTypes2.symbols
index 8379ea16878..7a5d41201c8 100644
--- a/tests/baselines/reference/infinitelyExpandingBaseTypes2.symbols
+++ b/tests/baselines/reference/infinitelyExpandingBaseTypes2.symbols
@@ -4,7 +4,7 @@ interface A<T>
 >T : Symbol(T, Decl(infinitelyExpandingBaseTypes2.ts, 0, 12))
 {
    x : A<()=>T>
->x : Symbol(x, Decl(infinitelyExpandingBaseTypes2.ts, 1, 1))
+>x : Symbol(A.x, Decl(infinitelyExpandingBaseTypes2.ts, 1, 1))
 >A : Symbol(A, Decl(infinitelyExpandingBaseTypes2.ts, 0, 0))
 >T : Symbol(T, Decl(infinitelyExpandingBaseTypes2.ts, 0, 12))
 }
@@ -14,7 +14,7 @@ interface B<T>
 >T : Symbol(T, Decl(infinitelyExpandingBaseTypes2.ts, 5, 12))
 {
    x : B<()=>T>
->x : Symbol(x, Decl(infinitelyExpandingBaseTypes2.ts, 6, 1))
+>x : Symbol(B.x, Decl(infinitelyExpandingBaseTypes2.ts, 6, 1))
 >B : Symbol(B, Decl(infinitelyExpandingBaseTypes2.ts, 3, 1))
 >T : Symbol(T, Decl(infinitelyExpandingBaseTypes2.ts, 5, 12))
 }
diff --git a/tests/baselines/reference/infinitelyExpandingTypeAssignability.symbols b/tests/baselines/reference/infinitelyExpandingTypeAssignability.symbols
index 1907ff33cf6..75274353304 100644
--- a/tests/baselines/reference/infinitelyExpandingTypeAssignability.symbols
+++ b/tests/baselines/reference/infinitelyExpandingTypeAssignability.symbols
@@ -4,7 +4,7 @@ interface A<T> {
 >T : Symbol(T, Decl(infinitelyExpandingTypeAssignability.ts, 0, 12))
 
    x : T
->x : Symbol(x, Decl(infinitelyExpandingTypeAssignability.ts, 0, 16))
+>x : Symbol(A.x, Decl(infinitelyExpandingTypeAssignability.ts, 0, 16))
 >T : Symbol(T, Decl(infinitelyExpandingTypeAssignability.ts, 0, 12))
 }
  
diff --git a/tests/baselines/reference/infinitelyExpandingTypes3.symbols b/tests/baselines/reference/infinitelyExpandingTypes3.symbols
index fbc14afc80f..18aed686442 100644
--- a/tests/baselines/reference/infinitelyExpandingTypes3.symbols
+++ b/tests/baselines/reference/infinitelyExpandingTypes3.symbols
@@ -4,16 +4,16 @@ interface List<T> {
 >T : Symbol(T, Decl(infinitelyExpandingTypes3.ts, 0, 15))
 
     data: T;
->data : Symbol(data, Decl(infinitelyExpandingTypes3.ts, 0, 19))
+>data : Symbol(List.data, Decl(infinitelyExpandingTypes3.ts, 0, 19))
 >T : Symbol(T, Decl(infinitelyExpandingTypes3.ts, 0, 15))
 
     next: List<T>; // will be recursive reference when OwnerList is expanded
->next : Symbol(next, Decl(infinitelyExpandingTypes3.ts, 1, 12))
+>next : Symbol(List.next, Decl(infinitelyExpandingTypes3.ts, 1, 12))
 >List : Symbol(List, Decl(infinitelyExpandingTypes3.ts, 0, 0))
 >T : Symbol(T, Decl(infinitelyExpandingTypes3.ts, 0, 15))
 
     owner: OwnerList<T>;
->owner : Symbol(owner, Decl(infinitelyExpandingTypes3.ts, 2, 18))
+>owner : Symbol(List.owner, Decl(infinitelyExpandingTypes3.ts, 2, 18))
 >OwnerList : Symbol(OwnerList, Decl(infinitelyExpandingTypes3.ts, 4, 1))
 >T : Symbol(T, Decl(infinitelyExpandingTypes3.ts, 0, 15))
 }
@@ -26,7 +26,7 @@ interface OwnerList<U> extends List<List<U>> {
 >U : Symbol(U, Decl(infinitelyExpandingTypes3.ts, 6, 20))
 
     name: string;
->name : Symbol(name, Decl(infinitelyExpandingTypes3.ts, 6, 46))
+>name : Symbol(OwnerList.name, Decl(infinitelyExpandingTypes3.ts, 6, 46))
 }
 
 interface OwnerList2<U> extends List<List<U>> {
@@ -37,7 +37,7 @@ interface OwnerList2<U> extends List<List<U>> {
 >U : Symbol(U, Decl(infinitelyExpandingTypes3.ts, 10, 21))
 
     name: string;
->name : Symbol(name, Decl(infinitelyExpandingTypes3.ts, 10, 47))
+>name : Symbol(OwnerList2.name, Decl(infinitelyExpandingTypes3.ts, 10, 47))
 }
 
 var o1: OwnerList<number>;
diff --git a/tests/baselines/reference/infinitelyExpandingTypes4.symbols b/tests/baselines/reference/infinitelyExpandingTypes4.symbols
index af0aee01216..e394c612171 100644
--- a/tests/baselines/reference/infinitelyExpandingTypes4.symbols
+++ b/tests/baselines/reference/infinitelyExpandingTypes4.symbols
@@ -5,7 +5,7 @@ interface Query<T> {
 
     // ...
     groupBy<K>(keySelector: (item: T) => K): Query<Grouping<K, T>>;
->groupBy : Symbol(groupBy, Decl(infinitelyExpandingTypes4.ts, 0, 20))
+>groupBy : Symbol(Query.groupBy, Decl(infinitelyExpandingTypes4.ts, 0, 20))
 >K : Symbol(K, Decl(infinitelyExpandingTypes4.ts, 2, 12))
 >keySelector : Symbol(keySelector, Decl(infinitelyExpandingTypes4.ts, 2, 15))
 >item : Symbol(item, Decl(infinitelyExpandingTypes4.ts, 2, 29))
@@ -25,7 +25,7 @@ interface QueryEnumerator<T> {
 
     // ...
     groupBy<K>(keySelector: (item: T) => K): QueryEnumerator<Grouping<K, T>>;
->groupBy : Symbol(groupBy, Decl(infinitelyExpandingTypes4.ts, 6, 30))
+>groupBy : Symbol(QueryEnumerator.groupBy, Decl(infinitelyExpandingTypes4.ts, 6, 30))
 >K : Symbol(K, Decl(infinitelyExpandingTypes4.ts, 8, 12))
 >keySelector : Symbol(keySelector, Decl(infinitelyExpandingTypes4.ts, 8, 15))
 >item : Symbol(item, Decl(infinitelyExpandingTypes4.ts, 8, 29))
@@ -47,7 +47,7 @@ interface Grouping<K, T> extends Query<T> {
 >T : Symbol(T, Decl(infinitelyExpandingTypes4.ts, 12, 21))
 
     key(): K;
->key : Symbol(key, Decl(infinitelyExpandingTypes4.ts, 12, 43))
+>key : Symbol(Grouping.key, Decl(infinitelyExpandingTypes4.ts, 12, 43))
 >K : Symbol(K, Decl(infinitelyExpandingTypes4.ts, 12, 19))
 }
 
diff --git a/tests/baselines/reference/infinitelyExpandingTypes5.symbols b/tests/baselines/reference/infinitelyExpandingTypes5.symbols
index d67d605559e..32283da9c5d 100644
--- a/tests/baselines/reference/infinitelyExpandingTypes5.symbols
+++ b/tests/baselines/reference/infinitelyExpandingTypes5.symbols
@@ -4,7 +4,7 @@ interface Query<T> {
 >T : Symbol(T, Decl(infinitelyExpandingTypes5.ts, 0, 16))
 
     foo(x: T): Query<T[]>;
->foo : Symbol(foo, Decl(infinitelyExpandingTypes5.ts, 0, 20))
+>foo : Symbol(Query.foo, Decl(infinitelyExpandingTypes5.ts, 0, 20))
 >x : Symbol(x, Decl(infinitelyExpandingTypes5.ts, 1, 8))
 >T : Symbol(T, Decl(infinitelyExpandingTypes5.ts, 0, 16))
 >Query : Symbol(Query, Decl(infinitelyExpandingTypes5.ts, 0, 0))
diff --git a/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.symbols b/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.symbols
index dfa5d6e03ed..7c54dd7c12c 100644
--- a/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.symbols
+++ b/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.symbols
@@ -4,7 +4,7 @@ class Functionality<V> {
 >V : Symbol(V, Decl(infinitelyExpandingTypesNonGenericBase.ts, 0, 20))
 
     property: Options<V>;
->property : Symbol(property, Decl(infinitelyExpandingTypesNonGenericBase.ts, 0, 24))
+>property : Symbol(Functionality.property, Decl(infinitelyExpandingTypesNonGenericBase.ts, 0, 24))
 >Options : Symbol(Options, Decl(infinitelyExpandingTypesNonGenericBase.ts, 13, 1))
 >V : Symbol(V, Decl(infinitelyExpandingTypesNonGenericBase.ts, 0, 20))
 }
@@ -19,7 +19,7 @@ class A<T> extends Base {
 >Base : Symbol(Base, Decl(infinitelyExpandingTypesNonGenericBase.ts, 2, 1))
 
     options: Options<Functionality<T>[]>;
->options : Symbol(options, Decl(infinitelyExpandingTypesNonGenericBase.ts, 7, 25))
+>options : Symbol(A.options, Decl(infinitelyExpandingTypesNonGenericBase.ts, 7, 25))
 >Options : Symbol(Options, Decl(infinitelyExpandingTypesNonGenericBase.ts, 13, 1))
 >Functionality : Symbol(Functionality, Decl(infinitelyExpandingTypesNonGenericBase.ts, 0, 0))
 >T : Symbol(T, Decl(infinitelyExpandingTypesNonGenericBase.ts, 7, 8))
@@ -30,7 +30,7 @@ interface OptionsBase<T> {
 >T : Symbol(T, Decl(infinitelyExpandingTypesNonGenericBase.ts, 11, 22))
 
     Options: Options<T>;
->Options : Symbol(Options, Decl(infinitelyExpandingTypesNonGenericBase.ts, 11, 26))
+>Options : Symbol(OptionsBase.Options, Decl(infinitelyExpandingTypesNonGenericBase.ts, 11, 26))
 >Options : Symbol(Options, Decl(infinitelyExpandingTypesNonGenericBase.ts, 13, 1))
 >T : Symbol(T, Decl(infinitelyExpandingTypesNonGenericBase.ts, 11, 22))
 }
diff --git a/tests/baselines/reference/infinitelyGenerativeInheritance1.symbols b/tests/baselines/reference/infinitelyGenerativeInheritance1.symbols
index 54ecd9c965b..8b8e05c444a 100644
--- a/tests/baselines/reference/infinitelyGenerativeInheritance1.symbols
+++ b/tests/baselines/reference/infinitelyGenerativeInheritance1.symbols
@@ -4,11 +4,11 @@ interface Stack<T> {
 >T : Symbol(T, Decl(infinitelyGenerativeInheritance1.ts, 0, 16))
 
       pop(): T
->pop : Symbol(pop, Decl(infinitelyGenerativeInheritance1.ts, 0, 20))
+>pop : Symbol(Stack.pop, Decl(infinitelyGenerativeInheritance1.ts, 0, 20))
 >T : Symbol(T, Decl(infinitelyGenerativeInheritance1.ts, 0, 16))
 
       zip<S>(a: Stack<S>): Stack<{ x: T; y: S }>
->zip : Symbol(zip, Decl(infinitelyGenerativeInheritance1.ts, 1, 14))
+>zip : Symbol(Stack.zip, Decl(infinitelyGenerativeInheritance1.ts, 1, 14))
 >S : Symbol(S, Decl(infinitelyGenerativeInheritance1.ts, 2, 10))
 >a : Symbol(a, Decl(infinitelyGenerativeInheritance1.ts, 2, 13))
 >Stack : Symbol(Stack, Decl(infinitelyGenerativeInheritance1.ts, 0, 0))
@@ -27,7 +27,7 @@ interface MyStack<T> extends Stack<T> {
 >T : Symbol(T, Decl(infinitelyGenerativeInheritance1.ts, 5, 18))
 
       zip<S>(a: Stack<S>): Stack<{ x: T; y: S }>
->zip : Symbol(zip, Decl(infinitelyGenerativeInheritance1.ts, 5, 39))
+>zip : Symbol(MyStack.zip, Decl(infinitelyGenerativeInheritance1.ts, 5, 39))
 >S : Symbol(S, Decl(infinitelyGenerativeInheritance1.ts, 6, 10))
 >a : Symbol(a, Decl(infinitelyGenerativeInheritance1.ts, 6, 13))
 >Stack : Symbol(Stack, Decl(infinitelyGenerativeInheritance1.ts, 0, 0))
diff --git a/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.symbols b/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.symbols
index 55655889ca4..d7904335010 100644
--- a/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.symbols
+++ b/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.symbols
@@ -3,7 +3,7 @@ class B {
 >B : Symbol(B, Decl(inheritSameNamePrivatePropertiesFromSameOrigin.ts, 0, 0))
 
     private x: number;
->x : Symbol(x, Decl(inheritSameNamePrivatePropertiesFromSameOrigin.ts, 0, 9))
+>x : Symbol(B.x, Decl(inheritSameNamePrivatePropertiesFromSameOrigin.ts, 0, 9))
 }
 class C extends B { }
 >C : Symbol(C, Decl(inheritSameNamePrivatePropertiesFromSameOrigin.ts, 2, 1))
@@ -19,5 +19,5 @@ interface A extends C, C2 { // ok
 >C2 : Symbol(C2, Decl(inheritSameNamePrivatePropertiesFromSameOrigin.ts, 3, 21))
 
     y: string;
->y : Symbol(y, Decl(inheritSameNamePrivatePropertiesFromSameOrigin.ts, 7, 27))
+>y : Symbol(A.y, Decl(inheritSameNamePrivatePropertiesFromSameOrigin.ts, 7, 27))
 }
diff --git a/tests/baselines/reference/inheritanceMemberFuncOverridingMethod.symbols b/tests/baselines/reference/inheritanceMemberFuncOverridingMethod.symbols
index 4c496fcc240..696ac88cd78 100644
--- a/tests/baselines/reference/inheritanceMemberFuncOverridingMethod.symbols
+++ b/tests/baselines/reference/inheritanceMemberFuncOverridingMethod.symbols
@@ -3,7 +3,7 @@ class a {
 >a : Symbol(a, Decl(inheritanceMemberFuncOverridingMethod.ts, 0, 0))
 
     x() {
->x : Symbol(x, Decl(inheritanceMemberFuncOverridingMethod.ts, 0, 9))
+>x : Symbol(a.x, Decl(inheritanceMemberFuncOverridingMethod.ts, 0, 9))
 
         return "10";
     }
@@ -14,7 +14,7 @@ class b extends a {
 >a : Symbol(a, Decl(inheritanceMemberFuncOverridingMethod.ts, 0, 0))
 
     x() {
->x : Symbol(x, Decl(inheritanceMemberFuncOverridingMethod.ts, 6, 19))
+>x : Symbol(b.x, Decl(inheritanceMemberFuncOverridingMethod.ts, 6, 19))
 
         return "20";
     }
diff --git a/tests/baselines/reference/inheritanceMemberPropertyOverridingProperty.symbols b/tests/baselines/reference/inheritanceMemberPropertyOverridingProperty.symbols
index bf755882165..6a3f8e50206 100644
--- a/tests/baselines/reference/inheritanceMemberPropertyOverridingProperty.symbols
+++ b/tests/baselines/reference/inheritanceMemberPropertyOverridingProperty.symbols
@@ -3,7 +3,7 @@ class a {
 >a : Symbol(a, Decl(inheritanceMemberPropertyOverridingProperty.ts, 0, 0))
 
     x: () => string;
->x : Symbol(x, Decl(inheritanceMemberPropertyOverridingProperty.ts, 0, 9))
+>x : Symbol(a.x, Decl(inheritanceMemberPropertyOverridingProperty.ts, 0, 9))
 }
 
 class b extends a {
@@ -11,5 +11,5 @@ class b extends a {
 >a : Symbol(a, Decl(inheritanceMemberPropertyOverridingProperty.ts, 0, 0))
 
     x: () => string;
->x : Symbol(x, Decl(inheritanceMemberPropertyOverridingProperty.ts, 4, 19))
+>x : Symbol(b.x, Decl(inheritanceMemberPropertyOverridingProperty.ts, 4, 19))
 }
diff --git a/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.symbols b/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.symbols
index 108170e8895..dad2ac6f886 100644
--- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.symbols
+++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.symbols
@@ -12,7 +12,7 @@ class B<T> extends A<T> {}
 var a = new A<Date>();
 >a : Symbol(a, Decl(inheritanceOfGenericConstructorMethod1.ts, 2, 3))
 >A : Symbol(A, Decl(inheritanceOfGenericConstructorMethod1.ts, 0, 0))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var b1 = new B(); // no error
 >b1 : Symbol(b1, Decl(inheritanceOfGenericConstructorMethod1.ts, 3, 3))
@@ -21,12 +21,12 @@ var b1 = new B(); // no error
 var b2: B<Date> = new B<Date>(); // no error
 >b2 : Symbol(b2, Decl(inheritanceOfGenericConstructorMethod1.ts, 4, 3))
 >B : Symbol(B, Decl(inheritanceOfGenericConstructorMethod1.ts, 0, 14))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >B : Symbol(B, Decl(inheritanceOfGenericConstructorMethod1.ts, 0, 14))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var b3 = new B<Date>(); // error, could not select overload for 'new' expression
 >b3 : Symbol(b3, Decl(inheritanceOfGenericConstructorMethod1.ts, 5, 3))
 >B : Symbol(B, Decl(inheritanceOfGenericConstructorMethod1.ts, 0, 14))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
diff --git a/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.symbols b/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.symbols
index bf2f3d3aa15..8c0be543d99 100644
--- a/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.symbols
+++ b/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.symbols
@@ -3,7 +3,7 @@ class a {
 >a : Symbol(a, Decl(inheritanceStaticFunctionOverridingInstanceProperty.ts, 0, 0))
 
     x: string;
->x : Symbol(x, Decl(inheritanceStaticFunctionOverridingInstanceProperty.ts, 0, 9))
+>x : Symbol(a.x, Decl(inheritanceStaticFunctionOverridingInstanceProperty.ts, 0, 9))
 }
 
 class b extends a {
diff --git a/tests/baselines/reference/inheritedGenericCallSignature.symbols b/tests/baselines/reference/inheritedGenericCallSignature.symbols
index f70e4c7d75f..57469f4dad8 100644
--- a/tests/baselines/reference/inheritedGenericCallSignature.symbols
+++ b/tests/baselines/reference/inheritedGenericCallSignature.symbols
@@ -24,7 +24,7 @@ interface I2<T> extends I1<T[]> {
 >T : Symbol(T, Decl(inheritedGenericCallSignature.ts, 12, 13))
 
     b: T;
->b : Symbol(b, Decl(inheritedGenericCallSignature.ts, 12, 33))
+>b : Symbol(I2.b, Decl(inheritedGenericCallSignature.ts, 12, 33))
 >T : Symbol(T, Decl(inheritedGenericCallSignature.ts, 12, 13))
 
 }
@@ -34,7 +34,7 @@ interface I2<T> extends I1<T[]> {
 var x: I2<Date>;
 >x : Symbol(x, Decl(inheritedGenericCallSignature.ts, 20, 3))
 >I2 : Symbol(I2, Decl(inheritedGenericCallSignature.ts, 8, 19))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
  
 
diff --git a/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases2.symbols b/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases2.symbols
index 2cc31a14f7f..167cdaff838 100644
--- a/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases2.symbols
+++ b/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases2.symbols
@@ -12,7 +12,7 @@ interface B {
 >B : Symbol(B, Decl(inheritedMembersAndIndexSignaturesFromDifferentBases2.ts, 2, 1))
 
     foo: number;
->foo : Symbol(foo, Decl(inheritedMembersAndIndexSignaturesFromDifferentBases2.ts, 4, 13))
+>foo : Symbol(B.foo, Decl(inheritedMembersAndIndexSignaturesFromDifferentBases2.ts, 4, 13))
 }
 
 interface C extends B, A<string> { } // Should succeed
diff --git a/tests/baselines/reference/innerAliases2.symbols b/tests/baselines/reference/innerAliases2.symbols
index 541fc03ffbd..31198f9276c 100644
--- a/tests/baselines/reference/innerAliases2.symbols
+++ b/tests/baselines/reference/innerAliases2.symbols
@@ -6,7 +6,7 @@ module _provider {
 >UsefulClass : Symbol(UsefulClass, Decl(innerAliases2.ts, 0, 18))
 
                                 public foo() {
->foo : Symbol(foo, Decl(innerAliases2.ts, 1, 42))
+>foo : Symbol(UsefulClass.foo, Decl(innerAliases2.ts, 1, 42))
                                 }
                 }
 }
diff --git a/tests/baselines/reference/innerBoundLambdaEmit.symbols b/tests/baselines/reference/innerBoundLambdaEmit.symbols
index 48bbe1fad4b..8d886cc433a 100644
--- a/tests/baselines/reference/innerBoundLambdaEmit.symbols
+++ b/tests/baselines/reference/innerBoundLambdaEmit.symbols
@@ -13,7 +13,7 @@ interface Array<T> {
 >T : Symbol(T, Decl(lib.d.ts, --, --), Decl(innerBoundLambdaEmit.ts, 5, 16))
 
     toFoo(): M.Foo
->toFoo : Symbol(toFoo, Decl(innerBoundLambdaEmit.ts, 5, 20))
+>toFoo : Symbol(Array.toFoo, Decl(innerBoundLambdaEmit.ts, 5, 20))
 >M : Symbol(M, Decl(innerBoundLambdaEmit.ts, 0, 0))
 >Foo : Symbol(M.Foo, Decl(innerBoundLambdaEmit.ts, 0, 10))
 }
diff --git a/tests/baselines/reference/innerExtern.symbols b/tests/baselines/reference/innerExtern.symbols
index 142af91a46f..9a56f4eed12 100644
--- a/tests/baselines/reference/innerExtern.symbols
+++ b/tests/baselines/reference/innerExtern.symbols
@@ -15,7 +15,7 @@ module A {
 >C : Symbol(C, Decl(innerExtern.ts, 4, 21))
 
             x = BB.Elephant.X;
->x : Symbol(x, Decl(innerExtern.ts, 5, 24))
+>x : Symbol(C.x, Decl(innerExtern.ts, 5, 24))
 >BB.Elephant : Symbol(BB.Elephant, Decl(innerExtern.ts, 2, 18))
 >BB : Symbol(BB, Decl(innerExtern.ts, 0, 10))
 >Elephant : Symbol(BB.Elephant, Decl(innerExtern.ts, 2, 18))
diff --git a/tests/baselines/reference/innerTypeParameterShadowingOuterOne.symbols b/tests/baselines/reference/innerTypeParameterShadowingOuterOne.symbols
index 36502a9988d..d3488b4db72 100644
--- a/tests/baselines/reference/innerTypeParameterShadowingOuterOne.symbols
+++ b/tests/baselines/reference/innerTypeParameterShadowingOuterOne.symbols
@@ -5,12 +5,12 @@
 function f<T extends Date>() {
 >f : Symbol(f, Decl(innerTypeParameterShadowingOuterOne.ts, 0, 0))
 >T : Symbol(T, Decl(innerTypeParameterShadowingOuterOne.ts, 3, 11))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     function g<T extends Number>() {
 >g : Symbol(g, Decl(innerTypeParameterShadowingOuterOne.ts, 3, 30))
 >T : Symbol(T, Decl(innerTypeParameterShadowingOuterOne.ts, 4, 15))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
         var x: T;
 >x : Symbol(x, Decl(innerTypeParameterShadowingOuterOne.ts, 5, 11))
@@ -34,16 +34,16 @@ function f<T extends Date>() {
 function f2<T extends Date, U extends Date>() {
 >f2 : Symbol(f2, Decl(innerTypeParameterShadowingOuterOne.ts, 10, 1))
 >T : Symbol(T, Decl(innerTypeParameterShadowingOuterOne.ts, 12, 12))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >U : Symbol(U, Decl(innerTypeParameterShadowingOuterOne.ts, 12, 27))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     function g<T extends Number, U extends Number>() {
 >g : Symbol(g, Decl(innerTypeParameterShadowingOuterOne.ts, 12, 47))
 >T : Symbol(T, Decl(innerTypeParameterShadowingOuterOne.ts, 13, 15))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >U : Symbol(U, Decl(innerTypeParameterShadowingOuterOne.ts, 13, 32))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
         var x: U;
 >x : Symbol(x, Decl(innerTypeParameterShadowingOuterOne.ts, 14, 11))
diff --git a/tests/baselines/reference/innerTypeParameterShadowingOuterOne2.symbols b/tests/baselines/reference/innerTypeParameterShadowingOuterOne2.symbols
index e19ab7aad28..1a54ab4024a 100644
--- a/tests/baselines/reference/innerTypeParameterShadowingOuterOne2.symbols
+++ b/tests/baselines/reference/innerTypeParameterShadowingOuterOne2.symbols
@@ -5,12 +5,12 @@
 class C<T extends Date> {
 >C : Symbol(C, Decl(innerTypeParameterShadowingOuterOne2.ts, 0, 0))
 >T : Symbol(T, Decl(innerTypeParameterShadowingOuterOne2.ts, 3, 8))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     g<T extends Number>() {
->g : Symbol(g, Decl(innerTypeParameterShadowingOuterOne2.ts, 3, 25))
+>g : Symbol(C.g, Decl(innerTypeParameterShadowingOuterOne2.ts, 3, 25))
 >T : Symbol(T, Decl(innerTypeParameterShadowingOuterOne2.ts, 4, 6))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
         var x: T;
 >x : Symbol(x, Decl(innerTypeParameterShadowingOuterOne2.ts, 5, 11))
@@ -23,7 +23,7 @@ class C<T extends Date> {
     }
 
     h() {
->h : Symbol(h, Decl(innerTypeParameterShadowingOuterOne2.ts, 7, 5))
+>h : Symbol(C.h, Decl(innerTypeParameterShadowingOuterOne2.ts, 7, 5))
 
         var x: T;
 >x : Symbol(x, Decl(innerTypeParameterShadowingOuterOne2.ts, 10, 11))
@@ -39,16 +39,16 @@ class C<T extends Date> {
 class C2<T extends Date, U extends Date> {
 >C2 : Symbol(C2, Decl(innerTypeParameterShadowingOuterOne2.ts, 13, 1))
 >T : Symbol(T, Decl(innerTypeParameterShadowingOuterOne2.ts, 15, 9))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >U : Symbol(U, Decl(innerTypeParameterShadowingOuterOne2.ts, 15, 24))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     g<T extends Number, U extends Number>() {
->g : Symbol(g, Decl(innerTypeParameterShadowingOuterOne2.ts, 15, 42))
+>g : Symbol(C2.g, Decl(innerTypeParameterShadowingOuterOne2.ts, 15, 42))
 >T : Symbol(T, Decl(innerTypeParameterShadowingOuterOne2.ts, 16, 6))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >U : Symbol(U, Decl(innerTypeParameterShadowingOuterOne2.ts, 16, 23))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
         var x: U;
 >x : Symbol(x, Decl(innerTypeParameterShadowingOuterOne2.ts, 17, 11))
@@ -61,7 +61,7 @@ class C2<T extends Date, U extends Date> {
     }
 
     h() {
->h : Symbol(h, Decl(innerTypeParameterShadowingOuterOne2.ts, 19, 5))
+>h : Symbol(C2.h, Decl(innerTypeParameterShadowingOuterOne2.ts, 19, 5))
 
         var x: U;
 >x : Symbol(x, Decl(innerTypeParameterShadowingOuterOne2.ts, 22, 11))
diff --git a/tests/baselines/reference/instanceAndStaticDeclarations1.symbols b/tests/baselines/reference/instanceAndStaticDeclarations1.symbols
index 8e9d4a320a0..270f911e86c 100644
--- a/tests/baselines/reference/instanceAndStaticDeclarations1.symbols
+++ b/tests/baselines/reference/instanceAndStaticDeclarations1.symbols
@@ -5,28 +5,28 @@ class Point {
 >Point : Symbol(Point, Decl(instanceAndStaticDeclarations1.ts, 0, 0))
 
     constructor(public x: number, public y: number) { }
->x : Symbol(x, Decl(instanceAndStaticDeclarations1.ts, 3, 16))
->y : Symbol(y, Decl(instanceAndStaticDeclarations1.ts, 3, 33))
+>x : Symbol(Point.x, Decl(instanceAndStaticDeclarations1.ts, 3, 16))
+>y : Symbol(Point.y, Decl(instanceAndStaticDeclarations1.ts, 3, 33))
 
     public distance(p: Point) {
->distance : Symbol(distance, Decl(instanceAndStaticDeclarations1.ts, 3, 55))
+>distance : Symbol(Point.distance, Decl(instanceAndStaticDeclarations1.ts, 3, 55))
 >p : Symbol(p, Decl(instanceAndStaticDeclarations1.ts, 4, 20))
 >Point : Symbol(Point, Decl(instanceAndStaticDeclarations1.ts, 0, 0))
 
         var dx = this.x - p.x;
 >dx : Symbol(dx, Decl(instanceAndStaticDeclarations1.ts, 5, 11))
->this.x : Symbol(x, Decl(instanceAndStaticDeclarations1.ts, 3, 16))
+>this.x : Symbol(Point.x, Decl(instanceAndStaticDeclarations1.ts, 3, 16))
 >this : Symbol(Point, Decl(instanceAndStaticDeclarations1.ts, 0, 0))
->x : Symbol(x, Decl(instanceAndStaticDeclarations1.ts, 3, 16))
+>x : Symbol(Point.x, Decl(instanceAndStaticDeclarations1.ts, 3, 16))
 >p.x : Symbol(Point.x, Decl(instanceAndStaticDeclarations1.ts, 3, 16))
 >p : Symbol(p, Decl(instanceAndStaticDeclarations1.ts, 4, 20))
 >x : Symbol(Point.x, Decl(instanceAndStaticDeclarations1.ts, 3, 16))
 
         var dy = this.y - p.y;
 >dy : Symbol(dy, Decl(instanceAndStaticDeclarations1.ts, 6, 11))
->this.y : Symbol(y, Decl(instanceAndStaticDeclarations1.ts, 3, 33))
+>this.y : Symbol(Point.y, Decl(instanceAndStaticDeclarations1.ts, 3, 33))
 >this : Symbol(Point, Decl(instanceAndStaticDeclarations1.ts, 0, 0))
->y : Symbol(y, Decl(instanceAndStaticDeclarations1.ts, 3, 33))
+>y : Symbol(Point.y, Decl(instanceAndStaticDeclarations1.ts, 3, 33))
 >p.y : Symbol(Point.y, Decl(instanceAndStaticDeclarations1.ts, 3, 33))
 >p : Symbol(p, Decl(instanceAndStaticDeclarations1.ts, 4, 20))
 >y : Symbol(Point.y, Decl(instanceAndStaticDeclarations1.ts, 3, 33))
diff --git a/tests/baselines/reference/instanceMemberInitialization.symbols b/tests/baselines/reference/instanceMemberInitialization.symbols
index adc192208ca..42117133759 100644
--- a/tests/baselines/reference/instanceMemberInitialization.symbols
+++ b/tests/baselines/reference/instanceMemberInitialization.symbols
@@ -3,7 +3,7 @@ class C {
 >C : Symbol(C, Decl(instanceMemberInitialization.ts, 0, 0))
 
     x = 1;
->x : Symbol(x, Decl(instanceMemberInitialization.ts, 0, 9))
+>x : Symbol(C.x, Decl(instanceMemberInitialization.ts, 0, 9))
 }
 
 var c = new C();
diff --git a/tests/baselines/reference/instanceOfAssignability.symbols b/tests/baselines/reference/instanceOfAssignability.symbols
index 1bf39df2dd2..382ee29e34a 100644
--- a/tests/baselines/reference/instanceOfAssignability.symbols
+++ b/tests/baselines/reference/instanceOfAssignability.symbols
@@ -3,10 +3,10 @@ interface Base {
 >Base : Symbol(Base, Decl(instanceOfAssignability.ts, 0, 0))
 
 	foo: string|number;
->foo : Symbol(foo, Decl(instanceOfAssignability.ts, 0, 16))
+>foo : Symbol(Base.foo, Decl(instanceOfAssignability.ts, 0, 16))
 
 	optional?: number;
->optional : Symbol(optional, Decl(instanceOfAssignability.ts, 1, 20))
+>optional : Symbol(Base.optional, Decl(instanceOfAssignability.ts, 1, 20))
 }
 
 // Derived1 is assignable to, but not a subtype of, Base
@@ -15,7 +15,7 @@ class Derived1 implements Base {
 >Base : Symbol(Base, Decl(instanceOfAssignability.ts, 0, 0))
 
 	foo: string;
->foo : Symbol(foo, Decl(instanceOfAssignability.ts, 6, 32))
+>foo : Symbol(Derived1.foo, Decl(instanceOfAssignability.ts, 6, 32))
 }
 // Derived2 is a subtype of Base that is not assignable to Derived1
 class Derived2 implements Base {
@@ -23,27 +23,27 @@ class Derived2 implements Base {
 >Base : Symbol(Base, Decl(instanceOfAssignability.ts, 0, 0))
 
 	foo: number;
->foo : Symbol(foo, Decl(instanceOfAssignability.ts, 10, 32))
+>foo : Symbol(Derived2.foo, Decl(instanceOfAssignability.ts, 10, 32))
 
 	optional: number;
->optional : Symbol(optional, Decl(instanceOfAssignability.ts, 11, 13))
+>optional : Symbol(Derived2.optional, Decl(instanceOfAssignability.ts, 11, 13))
 }
 
 class Animal {
 >Animal : Symbol(Animal, Decl(instanceOfAssignability.ts, 13, 1))
 
 	move;
->move : Symbol(move, Decl(instanceOfAssignability.ts, 15, 14))
+>move : Symbol(Animal.move, Decl(instanceOfAssignability.ts, 15, 14))
 }
 class Mammal extends Animal { milk; }
 >Mammal : Symbol(Mammal, Decl(instanceOfAssignability.ts, 17, 1))
 >Animal : Symbol(Animal, Decl(instanceOfAssignability.ts, 13, 1))
->milk : Symbol(milk, Decl(instanceOfAssignability.ts, 18, 29))
+>milk : Symbol(Mammal.milk, Decl(instanceOfAssignability.ts, 18, 29))
 
 class Giraffe extends Mammal { neck; }
 >Giraffe : Symbol(Giraffe, Decl(instanceOfAssignability.ts, 18, 37))
 >Mammal : Symbol(Mammal, Decl(instanceOfAssignability.ts, 17, 1))
->neck : Symbol(neck, Decl(instanceOfAssignability.ts, 19, 30))
+>neck : Symbol(Giraffe.neck, Decl(instanceOfAssignability.ts, 19, 30))
 
 function fn1(x: Array<number>|Array<string>|boolean) {
 >fn1 : Symbol(fn1, Decl(instanceOfAssignability.ts, 19, 38))
@@ -171,21 +171,21 @@ function fn7(x: Array<number>|Array<string>) {
 
 interface Alpha { a }
 >Alpha : Symbol(Alpha, Decl(instanceOfAssignability.ts, 75, 1))
->a : Symbol(a, Decl(instanceOfAssignability.ts, 77, 17))
+>a : Symbol(Alpha.a, Decl(instanceOfAssignability.ts, 77, 17))
 
 interface Beta { b }
 >Beta : Symbol(Beta, Decl(instanceOfAssignability.ts, 77, 21))
->b : Symbol(b, Decl(instanceOfAssignability.ts, 78, 16))
+>b : Symbol(Beta.b, Decl(instanceOfAssignability.ts, 78, 16))
 
 interface Gamma { c }
 >Gamma : Symbol(Gamma, Decl(instanceOfAssignability.ts, 78, 20))
->c : Symbol(c, Decl(instanceOfAssignability.ts, 79, 17))
+>c : Symbol(Gamma.c, Decl(instanceOfAssignability.ts, 79, 17))
 
 class ABC { a; b; c; }
 >ABC : Symbol(ABC, Decl(instanceOfAssignability.ts, 79, 21))
->a : Symbol(a, Decl(instanceOfAssignability.ts, 80, 11))
->b : Symbol(b, Decl(instanceOfAssignability.ts, 80, 14))
->c : Symbol(c, Decl(instanceOfAssignability.ts, 80, 17))
+>a : Symbol(ABC.a, Decl(instanceOfAssignability.ts, 80, 11))
+>b : Symbol(ABC.b, Decl(instanceOfAssignability.ts, 80, 14))
+>c : Symbol(ABC.c, Decl(instanceOfAssignability.ts, 80, 17))
 
 function fn8(x: Alpha|Beta|Gamma) {
 >fn8 : Symbol(fn8, Decl(instanceOfAssignability.ts, 80, 22))
diff --git a/tests/baselines/reference/instanceOfInExternalModules.symbols b/tests/baselines/reference/instanceOfInExternalModules.symbols
index 45d158fc62e..0834916c1b2 100644
--- a/tests/baselines/reference/instanceOfInExternalModules.symbols
+++ b/tests/baselines/reference/instanceOfInExternalModules.symbols
@@ -17,5 +17,5 @@ function IsFoo(value: any): boolean {
 === tests/cases/compiler/instanceOfInExternalModules_require.ts ===
 export class Foo { foo: string; }
 >Foo : Symbol(Foo, Decl(instanceOfInExternalModules_require.ts, 0, 0))
->foo : Symbol(foo, Decl(instanceOfInExternalModules_require.ts, 0, 18))
+>foo : Symbol(Foo.foo, Decl(instanceOfInExternalModules_require.ts, 0, 18))
 
diff --git a/tests/baselines/reference/instanceSubtypeCheck1.symbols b/tests/baselines/reference/instanceSubtypeCheck1.symbols
index c7f4bb4152d..c9b1a7f0cba 100644
--- a/tests/baselines/reference/instanceSubtypeCheck1.symbols
+++ b/tests/baselines/reference/instanceSubtypeCheck1.symbols
@@ -4,7 +4,7 @@ interface A<T>
 >T : Symbol(T, Decl(instanceSubtypeCheck1.ts, 0, 12))
 {
    x: A<B<T>>
->x : Symbol(x, Decl(instanceSubtypeCheck1.ts, 1, 1))
+>x : Symbol(A.x, Decl(instanceSubtypeCheck1.ts, 1, 1))
 >A : Symbol(A, Decl(instanceSubtypeCheck1.ts, 0, 0))
 >B : Symbol(B, Decl(instanceSubtypeCheck1.ts, 3, 1))
 >T : Symbol(T, Decl(instanceSubtypeCheck1.ts, 0, 12))
@@ -17,7 +17,7 @@ interface B<T> extends A<T>
 >T : Symbol(T, Decl(instanceSubtypeCheck1.ts, 5, 12))
 {
    x: B<A<T>>
->x : Symbol(x, Decl(instanceSubtypeCheck1.ts, 6, 1))
+>x : Symbol(B.x, Decl(instanceSubtypeCheck1.ts, 6, 1))
 >B : Symbol(B, Decl(instanceSubtypeCheck1.ts, 3, 1))
 >A : Symbol(A, Decl(instanceSubtypeCheck1.ts, 0, 0))
 >T : Symbol(T, Decl(instanceSubtypeCheck1.ts, 5, 12))
diff --git a/tests/baselines/reference/instantiateGenericClassWithZeroTypeArguments.symbols b/tests/baselines/reference/instantiateGenericClassWithZeroTypeArguments.symbols
index b20387d9b80..499cd94f3ff 100644
--- a/tests/baselines/reference/instantiateGenericClassWithZeroTypeArguments.symbols
+++ b/tests/baselines/reference/instantiateGenericClassWithZeroTypeArguments.symbols
@@ -6,7 +6,7 @@ class C<T> {
 >T : Symbol(T, Decl(instantiateGenericClassWithZeroTypeArguments.ts, 2, 8))
 
     x: T;
->x : Symbol(x, Decl(instantiateGenericClassWithZeroTypeArguments.ts, 2, 12))
+>x : Symbol(C.x, Decl(instantiateGenericClassWithZeroTypeArguments.ts, 2, 12))
 >T : Symbol(T, Decl(instantiateGenericClassWithZeroTypeArguments.ts, 2, 8))
 }
 
@@ -20,11 +20,11 @@ class D<T, U> {
 >U : Symbol(U, Decl(instantiateGenericClassWithZeroTypeArguments.ts, 8, 10))
 
     x: T
->x : Symbol(x, Decl(instantiateGenericClassWithZeroTypeArguments.ts, 8, 15))
+>x : Symbol(D.x, Decl(instantiateGenericClassWithZeroTypeArguments.ts, 8, 15))
 >T : Symbol(T, Decl(instantiateGenericClassWithZeroTypeArguments.ts, 8, 8))
 
     y: U
->y : Symbol(y, Decl(instantiateGenericClassWithZeroTypeArguments.ts, 9, 8))
+>y : Symbol(D.y, Decl(instantiateGenericClassWithZeroTypeArguments.ts, 9, 8))
 >U : Symbol(U, Decl(instantiateGenericClassWithZeroTypeArguments.ts, 8, 10))
 }
 
diff --git a/tests/baselines/reference/instantiatedBaseTypeConstraints.symbols b/tests/baselines/reference/instantiatedBaseTypeConstraints.symbols
index e92097c309c..923465505ca 100644
--- a/tests/baselines/reference/instantiatedBaseTypeConstraints.symbols
+++ b/tests/baselines/reference/instantiatedBaseTypeConstraints.symbols
@@ -8,7 +8,7 @@ interface Foo<T extends Foo<T, C>, C> {
 >C : Symbol(C, Decl(instantiatedBaseTypeConstraints.ts, 0, 34))
 
   foo(bar: C): void;
->foo : Symbol(foo, Decl(instantiatedBaseTypeConstraints.ts, 0, 39))
+>foo : Symbol(Foo.foo, Decl(instantiatedBaseTypeConstraints.ts, 0, 39))
 >bar : Symbol(bar, Decl(instantiatedBaseTypeConstraints.ts, 1, 6))
 >C : Symbol(C, Decl(instantiatedBaseTypeConstraints.ts, 0, 34))
 }
@@ -19,7 +19,7 @@ class Bar implements Foo<Bar, string> {
 >Bar : Symbol(Bar, Decl(instantiatedBaseTypeConstraints.ts, 2, 1))
 
   foo(bar: string): void {
->foo : Symbol(foo, Decl(instantiatedBaseTypeConstraints.ts, 4, 39))
+>foo : Symbol(Bar.foo, Decl(instantiatedBaseTypeConstraints.ts, 4, 39))
 >bar : Symbol(bar, Decl(instantiatedBaseTypeConstraints.ts, 5, 6))
   }
 }
diff --git a/tests/baselines/reference/instantiatedModule.symbols b/tests/baselines/reference/instantiatedModule.symbols
index 42e0edcd221..acad3db7ea4 100644
--- a/tests/baselines/reference/instantiatedModule.symbols
+++ b/tests/baselines/reference/instantiatedModule.symbols
@@ -6,8 +6,8 @@ module M {
 
     export interface Point { x: number; y: number }
 >Point : Symbol(Point, Decl(instantiatedModule.ts, 2, 10), Decl(instantiatedModule.ts, 4, 14))
->x : Symbol(x, Decl(instantiatedModule.ts, 3, 28))
->y : Symbol(y, Decl(instantiatedModule.ts, 3, 39))
+>x : Symbol(Point.x, Decl(instantiatedModule.ts, 3, 28))
+>y : Symbol(Point.y, Decl(instantiatedModule.ts, 3, 39))
 
     export var Point = 1;
 >Point : Symbol(Point, Decl(instantiatedModule.ts, 2, 10), Decl(instantiatedModule.ts, 4, 14))
@@ -56,10 +56,10 @@ module M2 {
 >Point : Symbol(Point, Decl(instantiatedModule.ts, 20, 11))
 
         x: number;
->x : Symbol(x, Decl(instantiatedModule.ts, 21, 24))
+>x : Symbol(Point.x, Decl(instantiatedModule.ts, 21, 24))
 
         y: number;
->y : Symbol(y, Decl(instantiatedModule.ts, 22, 18))
+>y : Symbol(Point.y, Decl(instantiatedModule.ts, 22, 18))
 
         static Origin(): Point {
 >Origin : Symbol(Point.Origin, Decl(instantiatedModule.ts, 23, 18))
diff --git a/tests/baselines/reference/instantiatedReturnTypeContravariance.symbols b/tests/baselines/reference/instantiatedReturnTypeContravariance.symbols
index f64ebfdce21..c43082200bf 100644
--- a/tests/baselines/reference/instantiatedReturnTypeContravariance.symbols
+++ b/tests/baselines/reference/instantiatedReturnTypeContravariance.symbols
@@ -4,10 +4,10 @@ interface B<T> {
 >T : Symbol(T, Decl(instantiatedReturnTypeContravariance.ts, 0, 12))
 
 name: string;
->name : Symbol(name, Decl(instantiatedReturnTypeContravariance.ts, 0, 16))
+>name : Symbol(B.name, Decl(instantiatedReturnTypeContravariance.ts, 0, 16))
 
 x(): T;
->x : Symbol(x, Decl(instantiatedReturnTypeContravariance.ts, 2, 13))
+>x : Symbol(B.x, Decl(instantiatedReturnTypeContravariance.ts, 2, 13))
 >T : Symbol(T, Decl(instantiatedReturnTypeContravariance.ts, 0, 12))
 
 }
@@ -16,7 +16,7 @@ class c {
 >c : Symbol(c, Decl(instantiatedReturnTypeContravariance.ts, 6, 1))
 
 foo(): B<void> {
->foo : Symbol(foo, Decl(instantiatedReturnTypeContravariance.ts, 8, 9))
+>foo : Symbol(c.foo, Decl(instantiatedReturnTypeContravariance.ts, 8, 9))
 >B : Symbol(B, Decl(instantiatedReturnTypeContravariance.ts, 0, 0))
 
 return null;
@@ -30,7 +30,7 @@ class d extends c {
 >c : Symbol(c, Decl(instantiatedReturnTypeContravariance.ts, 6, 1))
 
 foo(): B<number> {
->foo : Symbol(foo, Decl(instantiatedReturnTypeContravariance.ts, 18, 19))
+>foo : Symbol(d.foo, Decl(instantiatedReturnTypeContravariance.ts, 18, 19))
 >B : Symbol(B, Decl(instantiatedReturnTypeContravariance.ts, 0, 0))
 
 return null;
diff --git a/tests/baselines/reference/intTypeCheck.errors.txt b/tests/baselines/reference/intTypeCheck.errors.txt
index a860f5e3604..0d19c6b2b6e 100644
--- a/tests/baselines/reference/intTypeCheck.errors.txt
+++ b/tests/baselines/reference/intTypeCheck.errors.txt
@@ -70,7 +70,7 @@ tests/cases/compiler/intTypeCheck.ts(182,5): error TS2322: Type '{}' is not assi
   Type '{}' provides no match for the signature 'new (): any'
 tests/cases/compiler/intTypeCheck.ts(183,5): error TS2322: Type 'Object' is not assignable to type 'i7'.
   Type 'Object' provides no match for the signature 'new (): any'
-tests/cases/compiler/intTypeCheck.ts(185,17): error TS2352: Neither type 'Base' nor type 'i7' is assignable to the other.
+tests/cases/compiler/intTypeCheck.ts(185,17): error TS2352: Type 'Base' cannot be converted to type 'i7'.
   Type 'Base' provides no match for the signature 'new (): any'
 tests/cases/compiler/intTypeCheck.ts(187,5): error TS2322: Type '() => void' is not assignable to type 'i7'.
   Type '() => void' provides no match for the signature 'new (): any'
@@ -396,7 +396,7 @@ tests/cases/compiler/intTypeCheck.ts(205,17): error TS2351: Cannot use 'new' wit
     var obj69: i7 = new obj66;
     var obj70: i7 = <i7>new Base;
                     ~~~~~~~~~~~~
-!!! error TS2352: Neither type 'Base' nor type 'i7' is assignable to the other.
+!!! error TS2352: Type 'Base' cannot be converted to type 'i7'.
 !!! error TS2352:   Type 'Base' provides no match for the signature 'new (): any'
     var obj71: i7 = null;
     var obj72: i7 = function () { };
diff --git a/tests/baselines/reference/interMixingModulesInterfaces0.symbols b/tests/baselines/reference/interMixingModulesInterfaces0.symbols
index 6b482053b2e..e16469da656 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces0.symbols
+++ b/tests/baselines/reference/interMixingModulesInterfaces0.symbols
@@ -17,10 +17,10 @@ module A {
 >B : Symbol(B, Decl(interMixingModulesInterfaces0.ts, 0, 10), Decl(interMixingModulesInterfaces0.ts, 6, 5))
 
         name: string;
->name : Symbol(name, Decl(interMixingModulesInterfaces0.ts, 8, 24))
+>name : Symbol(B.name, Decl(interMixingModulesInterfaces0.ts, 8, 24))
 
         value: number;
->value : Symbol(value, Decl(interMixingModulesInterfaces0.ts, 9, 21))
+>value : Symbol(B.value, Decl(interMixingModulesInterfaces0.ts, 9, 21))
     }
 }
 
diff --git a/tests/baselines/reference/interMixingModulesInterfaces1.symbols b/tests/baselines/reference/interMixingModulesInterfaces1.symbols
index 39162cf5a42..ffc583b1236 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces1.symbols
+++ b/tests/baselines/reference/interMixingModulesInterfaces1.symbols
@@ -6,10 +6,10 @@ module A {
 >B : Symbol(B, Decl(interMixingModulesInterfaces1.ts, 0, 10), Decl(interMixingModulesInterfaces1.ts, 5, 5))
 
         name: string;
->name : Symbol(name, Decl(interMixingModulesInterfaces1.ts, 2, 24))
+>name : Symbol(B.name, Decl(interMixingModulesInterfaces1.ts, 2, 24))
 
         value: number;
->value : Symbol(value, Decl(interMixingModulesInterfaces1.ts, 3, 21))
+>value : Symbol(B.value, Decl(interMixingModulesInterfaces1.ts, 3, 21))
     }
 
     export module B {
diff --git a/tests/baselines/reference/interMixingModulesInterfaces2.symbols b/tests/baselines/reference/interMixingModulesInterfaces2.symbols
index 0362909047a..10f0a0267af 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces2.symbols
+++ b/tests/baselines/reference/interMixingModulesInterfaces2.symbols
@@ -6,10 +6,10 @@ module A {
 >B : Symbol(B, Decl(interMixingModulesInterfaces2.ts, 0, 10))
 
         name: string;
->name : Symbol(name, Decl(interMixingModulesInterfaces2.ts, 2, 24))
+>name : Symbol(A.B.name, Decl(interMixingModulesInterfaces2.ts, 2, 24))
 
         value: number;
->value : Symbol(value, Decl(interMixingModulesInterfaces2.ts, 3, 21))
+>value : Symbol(A.B.value, Decl(interMixingModulesInterfaces2.ts, 3, 21))
     }
 
     module B {
diff --git a/tests/baselines/reference/interMixingModulesInterfaces3.symbols b/tests/baselines/reference/interMixingModulesInterfaces3.symbols
index 482cc883930..d66812c6f3d 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces3.symbols
+++ b/tests/baselines/reference/interMixingModulesInterfaces3.symbols
@@ -17,10 +17,10 @@ module A {
 >B : Symbol(B, Decl(interMixingModulesInterfaces3.ts, 6, 5))
 
         name: string;
->name : Symbol(name, Decl(interMixingModulesInterfaces3.ts, 8, 24))
+>name : Symbol(A.B.name, Decl(interMixingModulesInterfaces3.ts, 8, 24))
 
         value: number;
->value : Symbol(value, Decl(interMixingModulesInterfaces3.ts, 9, 21))
+>value : Symbol(A.B.value, Decl(interMixingModulesInterfaces3.ts, 9, 21))
     }
 }
 
diff --git a/tests/baselines/reference/interMixingModulesInterfaces4.symbols b/tests/baselines/reference/interMixingModulesInterfaces4.symbols
index 498b34c721f..d33db455162 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces4.symbols
+++ b/tests/baselines/reference/interMixingModulesInterfaces4.symbols
@@ -16,10 +16,10 @@ module A {
 >B : Symbol(B, Decl(interMixingModulesInterfaces4.ts, 0, 10), Decl(interMixingModulesInterfaces4.ts, 6, 5))
 
         name: string;
->name : Symbol(name, Decl(interMixingModulesInterfaces4.ts, 8, 17))
+>name : Symbol(B.name, Decl(interMixingModulesInterfaces4.ts, 8, 17))
 
         value: number;
->value : Symbol(value, Decl(interMixingModulesInterfaces4.ts, 9, 21))
+>value : Symbol(B.value, Decl(interMixingModulesInterfaces4.ts, 9, 21))
     }
 }
 
diff --git a/tests/baselines/reference/interMixingModulesInterfaces5.symbols b/tests/baselines/reference/interMixingModulesInterfaces5.symbols
index 7f45a62c858..17c3908961a 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces5.symbols
+++ b/tests/baselines/reference/interMixingModulesInterfaces5.symbols
@@ -6,10 +6,10 @@ module A {
 >B : Symbol(B, Decl(interMixingModulesInterfaces5.ts, 0, 10), Decl(interMixingModulesInterfaces5.ts, 5, 5))
 
         name: string;
->name : Symbol(name, Decl(interMixingModulesInterfaces5.ts, 2, 17))
+>name : Symbol(B.name, Decl(interMixingModulesInterfaces5.ts, 2, 17))
 
         value: number;
->value : Symbol(value, Decl(interMixingModulesInterfaces5.ts, 3, 21))
+>value : Symbol(B.value, Decl(interMixingModulesInterfaces5.ts, 3, 21))
     }
 
     export module B {
diff --git a/tests/baselines/reference/interface0.symbols b/tests/baselines/reference/interface0.symbols
index 25e12370916..d9020e16dc0 100644
--- a/tests/baselines/reference/interface0.symbols
+++ b/tests/baselines/reference/interface0.symbols
@@ -4,7 +4,7 @@ interface Generic<T> {
 >T : Symbol(T, Decl(interface0.ts, 0, 18))
 
     x: T;
->x : Symbol(x, Decl(interface0.ts, 0, 22))
+>x : Symbol(Generic.x, Decl(interface0.ts, 0, 22))
 >T : Symbol(T, Decl(interface0.ts, 0, 18))
 }
 
diff --git a/tests/baselines/reference/interfaceAssignmentCompat.errors.txt b/tests/baselines/reference/interfaceAssignmentCompat.errors.txt
index 237358b42de..df06eb1bd6c 100644
--- a/tests/baselines/reference/interfaceAssignmentCompat.errors.txt
+++ b/tests/baselines/reference/interfaceAssignmentCompat.errors.txt
@@ -1,10 +1,9 @@
 tests/cases/compiler/interfaceAssignmentCompat.ts(32,18): error TS2345: Argument of type '(a: IFrenchEye, b: IFrenchEye) => number' is not assignable to parameter of type '(a: IEye, b: IEye) => number'.
   Types of parameters 'a' and 'a' are incompatible.
-    Type 'IFrenchEye' is not assignable to type 'IEye'.
-      Property 'color' is missing in type 'IFrenchEye'.
+    Type 'IEye' is not assignable to type 'IFrenchEye'.
+      Property 'coleur' is missing in type 'IEye'.
 tests/cases/compiler/interfaceAssignmentCompat.ts(37,29): error TS2339: Property '_map' does not exist on type 'typeof Color'.
 tests/cases/compiler/interfaceAssignmentCompat.ts(42,13): error TS2322: Type 'IEye' is not assignable to type 'IFrenchEye'.
-  Property 'coleur' is missing in type 'IEye'.
 tests/cases/compiler/interfaceAssignmentCompat.ts(44,9): error TS2322: Type 'IEye[]' is not assignable to type 'IFrenchEye[]'.
   Type 'IEye' is not assignable to type 'IFrenchEye'.
 
@@ -45,8 +44,8 @@ tests/cases/compiler/interfaceAssignmentCompat.ts(44,9): error TS2322: Type 'IEy
                      ~~~~~~~~~~~
 !!! error TS2345: Argument of type '(a: IFrenchEye, b: IFrenchEye) => number' is not assignable to parameter of type '(a: IEye, b: IEye) => number'.
 !!! error TS2345:   Types of parameters 'a' and 'a' are incompatible.
-!!! error TS2345:     Type 'IFrenchEye' is not assignable to type 'IEye'.
-!!! error TS2345:       Property 'color' is missing in type 'IFrenchEye'.
+!!! error TS2345:     Type 'IEye' is not assignable to type 'IFrenchEye'.
+!!! error TS2345:       Property 'coleur' is missing in type 'IEye'.
             // type of z inferred from specialized array type
             var z=x.sort(CompareEyes); // ok
     
@@ -61,7 +60,6 @@ tests/cases/compiler/interfaceAssignmentCompat.ts(44,9): error TS2322: Type 'IEy
                 eeks[j]=z[j];  // nope: element assignment
                 ~~~~~~~
 !!! error TS2322: Type 'IEye' is not assignable to type 'IFrenchEye'.
-!!! error TS2322:   Property 'coleur' is missing in type 'IEye'.
             }
             eeks=z; // nope: array assignment
             ~~~~
diff --git a/tests/baselines/reference/interfaceClassMerging.symbols b/tests/baselines/reference/interfaceClassMerging.symbols
index eda94cedafd..566e341108f 100644
--- a/tests/baselines/reference/interfaceClassMerging.symbols
+++ b/tests/baselines/reference/interfaceClassMerging.symbols
@@ -3,34 +3,34 @@ interface Foo {
 >Foo : Symbol(Foo, Decl(interfaceClassMerging.ts, 0, 0), Decl(interfaceClassMerging.ts, 5, 1))
 
     method(a: number): string;
->method : Symbol(method, Decl(interfaceClassMerging.ts, 0, 15))
+>method : Symbol(Foo.method, Decl(interfaceClassMerging.ts, 0, 15))
 >a : Symbol(a, Decl(interfaceClassMerging.ts, 1, 11))
 
     optionalMethod?(a: number): string;
->optionalMethod : Symbol(optionalMethod, Decl(interfaceClassMerging.ts, 1, 30))
+>optionalMethod : Symbol(Foo.optionalMethod, Decl(interfaceClassMerging.ts, 1, 30))
 >a : Symbol(a, Decl(interfaceClassMerging.ts, 2, 20))
 
     property: string;
->property : Symbol(property, Decl(interfaceClassMerging.ts, 2, 39))
+>property : Symbol(Foo.property, Decl(interfaceClassMerging.ts, 2, 39))
 
     optionalProperty?: string;
->optionalProperty : Symbol(optionalProperty, Decl(interfaceClassMerging.ts, 3, 21))
+>optionalProperty : Symbol(Foo.optionalProperty, Decl(interfaceClassMerging.ts, 3, 21))
 }
 
 class Foo {
 >Foo : Symbol(Foo, Decl(interfaceClassMerging.ts, 0, 0), Decl(interfaceClassMerging.ts, 5, 1))
 
     additionalProperty: string;
->additionalProperty : Symbol(additionalProperty, Decl(interfaceClassMerging.ts, 7, 11))
+>additionalProperty : Symbol(Foo.additionalProperty, Decl(interfaceClassMerging.ts, 7, 11))
 
     additionalMethod(a: number): string {
->additionalMethod : Symbol(additionalMethod, Decl(interfaceClassMerging.ts, 8, 31))
+>additionalMethod : Symbol(Foo.additionalMethod, Decl(interfaceClassMerging.ts, 8, 31))
 >a : Symbol(a, Decl(interfaceClassMerging.ts, 10, 21))
 
         return this.method(0);
->this.method : Symbol(method, Decl(interfaceClassMerging.ts, 0, 15))
+>this.method : Symbol(Foo.method, Decl(interfaceClassMerging.ts, 0, 15))
 >this : Symbol(Foo, Decl(interfaceClassMerging.ts, 0, 0), Decl(interfaceClassMerging.ts, 5, 1))
->method : Symbol(method, Decl(interfaceClassMerging.ts, 0, 15))
+>method : Symbol(Foo.method, Decl(interfaceClassMerging.ts, 0, 15))
     }
 }
 
@@ -39,7 +39,7 @@ class Bar extends Foo {
 >Foo : Symbol(Foo, Decl(interfaceClassMerging.ts, 0, 0), Decl(interfaceClassMerging.ts, 5, 1))
 
     method(a: number) {
->method : Symbol(method, Decl(interfaceClassMerging.ts, 15, 23))
+>method : Symbol(Bar.method, Decl(interfaceClassMerging.ts, 15, 23))
 >a : Symbol(a, Decl(interfaceClassMerging.ts, 16, 11))
 
         return this.optionalProperty;
diff --git a/tests/baselines/reference/interfaceClassMerging2.symbols b/tests/baselines/reference/interfaceClassMerging2.symbols
index 290b49fdb3d..afd48131daf 100644
--- a/tests/baselines/reference/interfaceClassMerging2.symbols
+++ b/tests/baselines/reference/interfaceClassMerging2.symbols
@@ -3,20 +3,20 @@ interface Foo {
 >Foo : Symbol(Foo, Decl(interfaceClassMerging2.ts, 0, 0), Decl(interfaceClassMerging2.ts, 3, 1))
 
     interfaceFooMethod(): this;
->interfaceFooMethod : Symbol(interfaceFooMethod, Decl(interfaceClassMerging2.ts, 0, 15))
+>interfaceFooMethod : Symbol(Foo.interfaceFooMethod, Decl(interfaceClassMerging2.ts, 0, 15))
 
     interfaceFooProperty: this;
->interfaceFooProperty : Symbol(interfaceFooProperty, Decl(interfaceClassMerging2.ts, 1, 31))
+>interfaceFooProperty : Symbol(Foo.interfaceFooProperty, Decl(interfaceClassMerging2.ts, 1, 31))
 }
 
 class Foo {
 >Foo : Symbol(Foo, Decl(interfaceClassMerging2.ts, 0, 0), Decl(interfaceClassMerging2.ts, 3, 1))
 
     classFooProperty: this;
->classFooProperty : Symbol(classFooProperty, Decl(interfaceClassMerging2.ts, 5, 11))
+>classFooProperty : Symbol(Foo.classFooProperty, Decl(interfaceClassMerging2.ts, 5, 11))
 
     classFooMethod(): this {
->classFooMethod : Symbol(classFooMethod, Decl(interfaceClassMerging2.ts, 6, 27))
+>classFooMethod : Symbol(Foo.classFooMethod, Decl(interfaceClassMerging2.ts, 6, 27))
 
         return this;
 >this : Symbol(Foo, Decl(interfaceClassMerging2.ts, 0, 0), Decl(interfaceClassMerging2.ts, 3, 1))
@@ -28,10 +28,10 @@ interface Bar {
 >Bar : Symbol(Bar, Decl(interfaceClassMerging2.ts, 11, 1), Decl(interfaceClassMerging2.ts, 17, 1))
 
     interfaceBarMethod(): this;
->interfaceBarMethod : Symbol(interfaceBarMethod, Decl(interfaceClassMerging2.ts, 14, 15))
+>interfaceBarMethod : Symbol(Bar.interfaceBarMethod, Decl(interfaceClassMerging2.ts, 14, 15))
 
     interfaceBarProperty: this;
->interfaceBarProperty : Symbol(interfaceBarProperty, Decl(interfaceClassMerging2.ts, 15, 31))
+>interfaceBarProperty : Symbol(Bar.interfaceBarProperty, Decl(interfaceClassMerging2.ts, 15, 31))
 }
 
 class Bar extends Foo {
@@ -39,10 +39,10 @@ class Bar extends Foo {
 >Foo : Symbol(Foo, Decl(interfaceClassMerging2.ts, 0, 0), Decl(interfaceClassMerging2.ts, 3, 1))
 
     classBarProperty: this;
->classBarProperty : Symbol(classBarProperty, Decl(interfaceClassMerging2.ts, 19, 23))
+>classBarProperty : Symbol(Bar.classBarProperty, Decl(interfaceClassMerging2.ts, 19, 23))
 
     classBarMethod(): this {
->classBarMethod : Symbol(classBarMethod, Decl(interfaceClassMerging2.ts, 20, 27))
+>classBarMethod : Symbol(Bar.classBarMethod, Decl(interfaceClassMerging2.ts, 20, 27))
 
         return this;
 >this : Symbol(Bar, Decl(interfaceClassMerging2.ts, 11, 1), Decl(interfaceClassMerging2.ts, 17, 1))
diff --git a/tests/baselines/reference/interfaceContextualType.symbols b/tests/baselines/reference/interfaceContextualType.symbols
index 34831880431..9334740e133 100644
--- a/tests/baselines/reference/interfaceContextualType.symbols
+++ b/tests/baselines/reference/interfaceContextualType.symbols
@@ -3,10 +3,10 @@ export interface IOptions {
 >IOptions : Symbol(IOptions, Decl(interfaceContextualType.ts, 0, 0))
 
     italic?: boolean;
->italic : Symbol(italic, Decl(interfaceContextualType.ts, 0, 27))
+>italic : Symbol(IOptions.italic, Decl(interfaceContextualType.ts, 0, 27))
 
     bold?: boolean;
->bold : Symbol(bold, Decl(interfaceContextualType.ts, 1, 21))
+>bold : Symbol(IOptions.bold, Decl(interfaceContextualType.ts, 1, 21))
 }
 export interface IMap {
 >IMap : Symbol(IMap, Decl(interfaceContextualType.ts, 3, 1))
@@ -20,30 +20,30 @@ class Bug {
 >Bug : Symbol(Bug, Decl(interfaceContextualType.ts, 6, 1))
 
     public values: IMap;
->values : Symbol(values, Decl(interfaceContextualType.ts, 8, 11))
+>values : Symbol(Bug.values, Decl(interfaceContextualType.ts, 8, 11))
 >IMap : Symbol(IMap, Decl(interfaceContextualType.ts, 3, 1))
 
     ok() {
->ok : Symbol(ok, Decl(interfaceContextualType.ts, 9, 24))
+>ok : Symbol(Bug.ok, Decl(interfaceContextualType.ts, 9, 24))
 
         this.values = {};
->this.values : Symbol(values, Decl(interfaceContextualType.ts, 8, 11))
+>this.values : Symbol(Bug.values, Decl(interfaceContextualType.ts, 8, 11))
 >this : Symbol(Bug, Decl(interfaceContextualType.ts, 6, 1))
->values : Symbol(values, Decl(interfaceContextualType.ts, 8, 11))
+>values : Symbol(Bug.values, Decl(interfaceContextualType.ts, 8, 11))
 
         this.values['comments'] = { italic: true };
->this.values : Symbol(values, Decl(interfaceContextualType.ts, 8, 11))
+>this.values : Symbol(Bug.values, Decl(interfaceContextualType.ts, 8, 11))
 >this : Symbol(Bug, Decl(interfaceContextualType.ts, 6, 1))
->values : Symbol(values, Decl(interfaceContextualType.ts, 8, 11))
+>values : Symbol(Bug.values, Decl(interfaceContextualType.ts, 8, 11))
 >italic : Symbol(italic, Decl(interfaceContextualType.ts, 12, 35))
     }
     shouldBeOK() {
->shouldBeOK : Symbol(shouldBeOK, Decl(interfaceContextualType.ts, 13, 5))
+>shouldBeOK : Symbol(Bug.shouldBeOK, Decl(interfaceContextualType.ts, 13, 5))
 
         this.values = {
->this.values : Symbol(values, Decl(interfaceContextualType.ts, 8, 11))
+>this.values : Symbol(Bug.values, Decl(interfaceContextualType.ts, 8, 11))
 >this : Symbol(Bug, Decl(interfaceContextualType.ts, 6, 1))
->values : Symbol(values, Decl(interfaceContextualType.ts, 8, 11))
+>values : Symbol(Bug.values, Decl(interfaceContextualType.ts, 8, 11))
 
             comments: { italic: true }
 >comments : Symbol(comments, Decl(interfaceContextualType.ts, 15, 23))
diff --git a/tests/baselines/reference/interfaceContextualType.types b/tests/baselines/reference/interfaceContextualType.types
index e827f9a9d9b..0e835a2f1f9 100644
--- a/tests/baselines/reference/interfaceContextualType.types
+++ b/tests/baselines/reference/interfaceContextualType.types
@@ -27,11 +27,11 @@ class Bug {
 >ok : () => void
 
         this.values = {};
->this.values = {} : { [x: string]: undefined; }
+>this.values = {} : {}
 >this.values : IMap
 >this : this
 >values : IMap
->{} : { [x: string]: undefined; }
+>{} : {}
 
         this.values['comments'] = { italic: true };
 >this.values['comments'] = { italic: true } : { italic: boolean; }
@@ -48,11 +48,11 @@ class Bug {
 >shouldBeOK : () => void
 
         this.values = {
->this.values = {            comments: { italic: true }        } : { [x: string]: { italic: boolean; }; comments: { italic: boolean; }; }
+>this.values = {            comments: { italic: true }        } : { comments: { italic: boolean; }; }
 >this.values : IMap
 >this : this
 >values : IMap
->{            comments: { italic: true }        } : { [x: string]: { italic: boolean; }; comments: { italic: boolean; }; }
+>{            comments: { italic: true }        } : { comments: { italic: boolean; }; }
 
             comments: { italic: true }
 >comments : { italic: boolean; }
diff --git a/tests/baselines/reference/interfaceDeclaration5.symbols b/tests/baselines/reference/interfaceDeclaration5.symbols
index 3478a56693a..feccd58e0b5 100644
--- a/tests/baselines/reference/interfaceDeclaration5.symbols
+++ b/tests/baselines/reference/interfaceDeclaration5.symbols
@@ -1,7 +1,7 @@
 === tests/cases/compiler/interfaceDeclaration5.ts ===
 export interface I1 { item:string; }
 >I1 : Symbol(I1, Decl(interfaceDeclaration5.ts, 0, 0))
->item : Symbol(item, Decl(interfaceDeclaration5.ts, 0, 21))
+>item : Symbol(I1.item, Decl(interfaceDeclaration5.ts, 0, 21))
 
 export class C1 { }
 >C1 : Symbol(C1, Decl(interfaceDeclaration5.ts, 0, 36))
diff --git a/tests/baselines/reference/interfaceExtendingClassWithPrivates.errors.txt b/tests/baselines/reference/interfaceExtendingClassWithPrivates.errors.txt
index d80df216c79..13e4c3b6e86 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithPrivates.errors.txt
+++ b/tests/baselines/reference/interfaceExtendingClassWithPrivates.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates.ts(5,11): error TS2430: Interface 'I' incorrectly extends interface 'Foo'.
   Property 'x' is private in type 'Foo' but not in type 'I'.
-tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates.ts(15,10): error TS2341: Property 'x' is private and only accessible within class 'Foo'.
+tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates.ts(15,12): error TS2341: Property 'x' is private and only accessible within class 'Foo'.
 
 
 ==== tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates.ts (2 errors) ====
@@ -22,5 +22,5 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtending
     var i: I2;
     var r = i.y;
     var r2 = i.x; // error
-             ~~~
+               ~
 !!! error TS2341: Property 'x' is private and only accessible within class 'Foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/interfaceExtendingClassWithPrivates2.errors.txt b/tests/baselines/reference/interfaceExtendingClassWithPrivates2.errors.txt
index 7850c10fe26..ea0e50af058 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithPrivates2.errors.txt
+++ b/tests/baselines/reference/interfaceExtendingClassWithPrivates2.errors.txt
@@ -4,8 +4,8 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtending
   Property 'x' is private in type 'Bar' but not in type 'I4'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates2.ts(12,11): error TS2430: Interface 'I4' incorrectly extends interface 'Foo'.
   Property 'x' is private in type 'Foo' but not in type 'I4'.
-tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates2.ts(26,10): error TS2341: Property 'x' is private and only accessible within class 'Foo'.
-tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates2.ts(27,10): error TS2341: Property 'y' is private and only accessible within class 'Baz'.
+tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates2.ts(26,12): error TS2341: Property 'x' is private and only accessible within class 'Foo'.
+tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates2.ts(27,12): error TS2341: Property 'y' is private and only accessible within class 'Baz'.
 
 
 ==== tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithPrivates2.ts (5 errors) ====
@@ -44,8 +44,8 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtending
     var i: I5;
     var r: string = i.z;
     var r2 = i.x; // error
-             ~~~
+               ~
 !!! error TS2341: Property 'x' is private and only accessible within class 'Foo'.
     var r3 = i.y; // error
-             ~~~
+               ~
 !!! error TS2341: Property 'y' is private and only accessible within class 'Baz'.
\ No newline at end of file
diff --git a/tests/baselines/reference/interfaceExtendingClassWithProtecteds.errors.txt b/tests/baselines/reference/interfaceExtendingClassWithProtecteds.errors.txt
index 05651c92976..eb5eb371c01 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithProtecteds.errors.txt
+++ b/tests/baselines/reference/interfaceExtendingClassWithProtecteds.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds.ts(5,11): error TS2430: Interface 'I' incorrectly extends interface 'Foo'.
   Property 'x' is protected but type 'I' is not a class derived from 'Foo'.
-tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds.ts(15,10): error TS2445: Property 'x' is protected and only accessible within class 'Foo' and its subclasses.
+tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds.ts(15,12): error TS2445: Property 'x' is protected and only accessible within class 'Foo' and its subclasses.
 
 
 ==== tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds.ts (2 errors) ====
@@ -22,5 +22,5 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtending
     var i: I2;
     var r = i.y;
     var r2 = i.x; // error
-             ~~~
+               ~
 !!! error TS2445: Property 'x' is protected and only accessible within class 'Foo' and its subclasses.
\ No newline at end of file
diff --git a/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.errors.txt b/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.errors.txt
index 48e3b7d7e6c..a957482362c 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.errors.txt
+++ b/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.errors.txt
@@ -4,8 +4,8 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtending
   Property 'x' is protected but type 'I4' is not a class derived from 'Bar'.
 tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds2.ts(12,11): error TS2430: Interface 'I4' incorrectly extends interface 'Foo'.
   Property 'x' is protected but type 'I4' is not a class derived from 'Foo'.
-tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds2.ts(26,10): error TS2445: Property 'x' is protected and only accessible within class 'Foo' and its subclasses.
-tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds2.ts(27,10): error TS2445: Property 'y' is protected and only accessible within class 'Baz' and its subclasses.
+tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds2.ts(26,12): error TS2445: Property 'x' is protected and only accessible within class 'Foo' and its subclasses.
+tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds2.ts(27,12): error TS2445: Property 'y' is protected and only accessible within class 'Baz' and its subclasses.
 
 
 ==== tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtendingClassWithProtecteds2.ts (5 errors) ====
@@ -44,8 +44,8 @@ tests/cases/conformance/interfaces/interfacesExtendingClasses/interfaceExtending
     var i: I5;
     var r: string = i.z;
     var r2 = i.x; // error
-             ~~~
+               ~
 !!! error TS2445: Property 'x' is protected and only accessible within class 'Foo' and its subclasses.
     var r3 = i.y; // error
-             ~~~
+               ~
 !!! error TS2445: Property 'y' is protected and only accessible within class 'Baz' and its subclasses.
\ No newline at end of file
diff --git a/tests/baselines/reference/interfaceExtendsClass1.symbols b/tests/baselines/reference/interfaceExtendsClass1.symbols
index 6caa2013a25..5873419cc0b 100644
--- a/tests/baselines/reference/interfaceExtendsClass1.symbols
+++ b/tests/baselines/reference/interfaceExtendsClass1.symbols
@@ -3,28 +3,28 @@ class Control {
 >Control : Symbol(Control, Decl(interfaceExtendsClass1.ts, 0, 0))
 
     private state: any;
->state : Symbol(state, Decl(interfaceExtendsClass1.ts, 0, 15))
+>state : Symbol(Control.state, Decl(interfaceExtendsClass1.ts, 0, 15))
 }
 interface SelectableControl extends Control {
 >SelectableControl : Symbol(SelectableControl, Decl(interfaceExtendsClass1.ts, 2, 1))
 >Control : Symbol(Control, Decl(interfaceExtendsClass1.ts, 0, 0))
 
     select(): void;
->select : Symbol(select, Decl(interfaceExtendsClass1.ts, 3, 45))
+>select : Symbol(SelectableControl.select, Decl(interfaceExtendsClass1.ts, 3, 45))
 }
 class Button extends Control {
 >Button : Symbol(Button, Decl(interfaceExtendsClass1.ts, 5, 1))
 >Control : Symbol(Control, Decl(interfaceExtendsClass1.ts, 0, 0))
 
     select() { }
->select : Symbol(select, Decl(interfaceExtendsClass1.ts, 6, 30))
+>select : Symbol(Button.select, Decl(interfaceExtendsClass1.ts, 6, 30))
 }
 class TextBox extends Control {
 >TextBox : Symbol(TextBox, Decl(interfaceExtendsClass1.ts, 8, 1))
 >Control : Symbol(Control, Decl(interfaceExtendsClass1.ts, 0, 0))
 
     select() { }
->select : Symbol(select, Decl(interfaceExtendsClass1.ts, 9, 31))
+>select : Symbol(TextBox.select, Decl(interfaceExtendsClass1.ts, 9, 31))
 }
 class Image extends Control {
 >Image : Symbol(Image, Decl(interfaceExtendsClass1.ts, 11, 1))
@@ -34,6 +34,6 @@ class Location {
 >Location : Symbol(Location, Decl(interfaceExtendsClass1.ts, 13, 1))
 
     select() { }
->select : Symbol(select, Decl(interfaceExtendsClass1.ts, 14, 16))
+>select : Symbol(Location.select, Decl(interfaceExtendsClass1.ts, 14, 16))
 }
 
diff --git a/tests/baselines/reference/interfaceInReopenedModule.symbols b/tests/baselines/reference/interfaceInReopenedModule.symbols
index 3cde824b451..0e4d2918a4f 100644
--- a/tests/baselines/reference/interfaceInReopenedModule.symbols
+++ b/tests/baselines/reference/interfaceInReopenedModule.symbols
@@ -14,7 +14,7 @@ module m {
 >n : Symbol(n, Decl(interfaceInReopenedModule.ts, 5, 18))
 
         private n: f;
->n : Symbol(n, Decl(interfaceInReopenedModule.ts, 6, 20))
+>n : Symbol(n.n, Decl(interfaceInReopenedModule.ts, 6, 20))
 >f : Symbol(f, Decl(interfaceInReopenedModule.ts, 4, 10))
     }
 }
diff --git a/tests/baselines/reference/interfaceOnly.symbols b/tests/baselines/reference/interfaceOnly.symbols
index 70473ff3139..2de5dca6dfb 100644
--- a/tests/baselines/reference/interfaceOnly.symbols
+++ b/tests/baselines/reference/interfaceOnly.symbols
@@ -3,9 +3,9 @@ interface foo {
 >foo : Symbol(foo, Decl(interfaceOnly.ts, 0, 0))
 
     foo();
->foo : Symbol(foo, Decl(interfaceOnly.ts, 0, 15))
+>foo : Symbol(foo.foo, Decl(interfaceOnly.ts, 0, 15))
 
     f2 (f: ()=> void);
->f2 : Symbol(f2, Decl(interfaceOnly.ts, 1, 10))
+>f2 : Symbol(foo.f2, Decl(interfaceOnly.ts, 1, 10))
 >f : Symbol(f, Decl(interfaceOnly.ts, 2, 8))
 }
diff --git a/tests/baselines/reference/interfacePropertiesWithSameName1.symbols b/tests/baselines/reference/interfacePropertiesWithSameName1.symbols
index aa002fa4af2..1948b1f244e 100644
--- a/tests/baselines/reference/interfacePropertiesWithSameName1.symbols
+++ b/tests/baselines/reference/interfacePropertiesWithSameName1.symbols
@@ -3,20 +3,20 @@ interface Mover {
 >Mover : Symbol(Mover, Decl(interfacePropertiesWithSameName1.ts, 0, 0))
 
     move(): void;
->move : Symbol(move, Decl(interfacePropertiesWithSameName1.ts, 0, 17))
+>move : Symbol(Mover.move, Decl(interfacePropertiesWithSameName1.ts, 0, 17))
 
     getStatus(): { speed: number; };
->getStatus : Symbol(getStatus, Decl(interfacePropertiesWithSameName1.ts, 1, 17))
+>getStatus : Symbol(Mover.getStatus, Decl(interfacePropertiesWithSameName1.ts, 1, 17))
 >speed : Symbol(speed, Decl(interfacePropertiesWithSameName1.ts, 2, 18))
 }
 interface Shaker {
 >Shaker : Symbol(Shaker, Decl(interfacePropertiesWithSameName1.ts, 3, 1))
 
     shake(): void;
->shake : Symbol(shake, Decl(interfacePropertiesWithSameName1.ts, 4, 18))
+>shake : Symbol(Shaker.shake, Decl(interfacePropertiesWithSameName1.ts, 4, 18))
 
     getStatus(): { frequency: number; };
->getStatus : Symbol(getStatus, Decl(interfacePropertiesWithSameName1.ts, 5, 18))
+>getStatus : Symbol(Shaker.getStatus, Decl(interfacePropertiesWithSameName1.ts, 5, 18))
 >frequency : Symbol(frequency, Decl(interfacePropertiesWithSameName1.ts, 6, 18))
 }
 
@@ -26,7 +26,7 @@ interface MoverShaker extends Mover, Shaker {
 >Shaker : Symbol(Shaker, Decl(interfacePropertiesWithSameName1.ts, 3, 1))
 
     getStatus(): { speed: number; frequency: number; };
->getStatus : Symbol(getStatus, Decl(interfacePropertiesWithSameName1.ts, 9, 45))
+>getStatus : Symbol(MoverShaker.getStatus, Decl(interfacePropertiesWithSameName1.ts, 9, 45))
 >speed : Symbol(speed, Decl(interfacePropertiesWithSameName1.ts, 10, 18))
 >frequency : Symbol(frequency, Decl(interfacePropertiesWithSameName1.ts, 10, 33))
 }
diff --git a/tests/baselines/reference/interfaceSubtyping.symbols b/tests/baselines/reference/interfaceSubtyping.symbols
index 6f77110885f..887f8e3d6b6 100644
--- a/tests/baselines/reference/interfaceSubtyping.symbols
+++ b/tests/baselines/reference/interfaceSubtyping.symbols
@@ -3,16 +3,16 @@ interface iface {
 >iface : Symbol(iface, Decl(interfaceSubtyping.ts, 0, 0))
 
     foo(): void;
->foo : Symbol(foo, Decl(interfaceSubtyping.ts, 0, 17))
+>foo : Symbol(iface.foo, Decl(interfaceSubtyping.ts, 0, 17))
 }
 class Camera implements iface{
 >Camera : Symbol(Camera, Decl(interfaceSubtyping.ts, 2, 1))
 >iface : Symbol(iface, Decl(interfaceSubtyping.ts, 0, 0))
 
     constructor (public str: string) {
->str : Symbol(str, Decl(interfaceSubtyping.ts, 4, 17))
+>str : Symbol(Camera.str, Decl(interfaceSubtyping.ts, 4, 17))
     }
     foo() {  return "s";   }
->foo : Symbol(foo, Decl(interfaceSubtyping.ts, 5, 5))
+>foo : Symbol(Camera.foo, Decl(interfaceSubtyping.ts, 5, 5))
 }
 
diff --git a/tests/baselines/reference/interfaceThatHidesBaseProperty.symbols b/tests/baselines/reference/interfaceThatHidesBaseProperty.symbols
index 2705aef2b27..d168a881990 100644
--- a/tests/baselines/reference/interfaceThatHidesBaseProperty.symbols
+++ b/tests/baselines/reference/interfaceThatHidesBaseProperty.symbols
@@ -3,7 +3,7 @@ interface Base {
 >Base : Symbol(Base, Decl(interfaceThatHidesBaseProperty.ts, 0, 0))
 
     x: { a: number };
->x : Symbol(x, Decl(interfaceThatHidesBaseProperty.ts, 0, 16))
+>x : Symbol(Base.x, Decl(interfaceThatHidesBaseProperty.ts, 0, 16))
 >a : Symbol(a, Decl(interfaceThatHidesBaseProperty.ts, 1, 8))
 }
 
@@ -12,7 +12,7 @@ interface Derived extends Base {
 >Base : Symbol(Base, Decl(interfaceThatHidesBaseProperty.ts, 0, 0))
 
     x: {
->x : Symbol(x, Decl(interfaceThatHidesBaseProperty.ts, 4, 32))
+>x : Symbol(Derived.x, Decl(interfaceThatHidesBaseProperty.ts, 4, 32))
 
         a: number; b: number;
 >a : Symbol(a, Decl(interfaceThatHidesBaseProperty.ts, 5, 8))
diff --git a/tests/baselines/reference/interfaceWithCommaSeparators.symbols b/tests/baselines/reference/interfaceWithCommaSeparators.symbols
index e96a8852d56..a2f76d1791b 100644
--- a/tests/baselines/reference/interfaceWithCommaSeparators.symbols
+++ b/tests/baselines/reference/interfaceWithCommaSeparators.symbols
@@ -6,6 +6,6 @@ var v: { bar(): void, baz }
 
 interface Foo { bar(): void, baz }
 >Foo : Symbol(Foo, Decl(interfaceWithCommaSeparators.ts, 0, 27))
->bar : Symbol(bar, Decl(interfaceWithCommaSeparators.ts, 1, 15))
->baz : Symbol(baz, Decl(interfaceWithCommaSeparators.ts, 1, 28))
+>bar : Symbol(Foo.bar, Decl(interfaceWithCommaSeparators.ts, 1, 15))
+>baz : Symbol(Foo.baz, Decl(interfaceWithCommaSeparators.ts, 1, 28))
 
diff --git a/tests/baselines/reference/interfaceWithMultipleDeclarations.errors.txt b/tests/baselines/reference/interfaceWithMultipleDeclarations.errors.txt
index e4b37db8a7a..79d8b4a509a 100644
--- a/tests/baselines/reference/interfaceWithMultipleDeclarations.errors.txt
+++ b/tests/baselines/reference/interfaceWithMultipleDeclarations.errors.txt
@@ -1,14 +1,14 @@
-tests/cases/compiler/interfaceWithMultipleDeclarations.ts(3,11): error TS2428: All declarations of an interface must have identical type parameters.
-tests/cases/compiler/interfaceWithMultipleDeclarations.ts(5,11): error TS2428: All declarations of an interface must have identical type parameters.
-tests/cases/compiler/interfaceWithMultipleDeclarations.ts(7,11): error TS2428: All declarations of an interface must have identical type parameters.
-tests/cases/compiler/interfaceWithMultipleDeclarations.ts(9,11): error TS2428: All declarations of an interface must have identical type parameters.
-tests/cases/compiler/interfaceWithMultipleDeclarations.ts(11,11): error TS2428: All declarations of an interface must have identical type parameters.
-tests/cases/compiler/interfaceWithMultipleDeclarations.ts(16,11): error TS2428: All declarations of an interface must have identical type parameters.
-tests/cases/compiler/interfaceWithMultipleDeclarations.ts(18,11): error TS2428: All declarations of an interface must have identical type parameters.
-tests/cases/compiler/interfaceWithMultipleDeclarations.ts(20,11): error TS2428: All declarations of an interface must have identical type parameters.
-tests/cases/compiler/interfaceWithMultipleDeclarations.ts(22,11): error TS2428: All declarations of an interface must have identical type parameters.
-tests/cases/compiler/interfaceWithMultipleDeclarations.ts(24,11): error TS2428: All declarations of an interface must have identical type parameters.
-tests/cases/compiler/interfaceWithMultipleDeclarations.ts(29,11): error TS2428: All declarations of an interface must have identical type parameters.
+tests/cases/compiler/interfaceWithMultipleDeclarations.ts(3,11): error TS2428: All declarations of 'I1' must have identical type parameters.
+tests/cases/compiler/interfaceWithMultipleDeclarations.ts(5,11): error TS2428: All declarations of 'I1' must have identical type parameters.
+tests/cases/compiler/interfaceWithMultipleDeclarations.ts(7,11): error TS2428: All declarations of 'I1' must have identical type parameters.
+tests/cases/compiler/interfaceWithMultipleDeclarations.ts(9,11): error TS2428: All declarations of 'I1' must have identical type parameters.
+tests/cases/compiler/interfaceWithMultipleDeclarations.ts(11,11): error TS2428: All declarations of 'I1' must have identical type parameters.
+tests/cases/compiler/interfaceWithMultipleDeclarations.ts(16,11): error TS2428: All declarations of 'I2' must have identical type parameters.
+tests/cases/compiler/interfaceWithMultipleDeclarations.ts(18,11): error TS2428: All declarations of 'I2' must have identical type parameters.
+tests/cases/compiler/interfaceWithMultipleDeclarations.ts(20,11): error TS2428: All declarations of 'I2' must have identical type parameters.
+tests/cases/compiler/interfaceWithMultipleDeclarations.ts(22,11): error TS2428: All declarations of 'I2' must have identical type parameters.
+tests/cases/compiler/interfaceWithMultipleDeclarations.ts(24,11): error TS2428: All declarations of 'I2' must have identical type parameters.
+tests/cases/compiler/interfaceWithMultipleDeclarations.ts(29,11): error TS2428: All declarations of 'I3' must have identical type parameters.
 
 
 ==== tests/cases/compiler/interfaceWithMultipleDeclarations.ts (11 errors) ====
@@ -16,53 +16,53 @@ tests/cases/compiler/interfaceWithMultipleDeclarations.ts(29,11): error TS2428:
     }
     interface I1<S> { // Name mismatch
               ~~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'I1' must have identical type parameters.
     }
     interface I1<T, U extends T> { // Length mismatch
               ~~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'I1' must have identical type parameters.
     }
     interface I1<V extends string> { // constraint present
               ~~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'I1' must have identical type parameters.
     }
     interface I1<V, X extends V> { // Length mismatch
               ~~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'I1' must have identical type parameters.
     }
     interface I1 { // Length mismatch
               ~~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'I1' must have identical type parameters.
     }
     
     interface I2<T extends string> {
     }
     interface I2<T extends () => string> { // constraint mismatch
               ~~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'I2' must have identical type parameters.
     }
     interface I2<T> { // constraint absent
               ~~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'I2' must have identical type parameters.
     }
     interface I2<U> { // name mismatch
               ~~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'I2' must have identical type parameters.
     }
     interface I2<X, Y> { // length mismatch
               ~~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'I2' must have identical type parameters.
     }
     interface I2 { // length mismatch
               ~~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'I2' must have identical type parameters.
     }
     
     interface I3 {
     }
     interface I3<T> { // length mismatch
               ~~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'I3' must have identical type parameters.
     }
     
     class Foo<T> {
diff --git a/tests/baselines/reference/interfaceWithOptionalProperty.symbols b/tests/baselines/reference/interfaceWithOptionalProperty.symbols
index 262b3f01ccc..90e5b666693 100644
--- a/tests/baselines/reference/interfaceWithOptionalProperty.symbols
+++ b/tests/baselines/reference/interfaceWithOptionalProperty.symbols
@@ -4,5 +4,5 @@ interface I {
 >I : Symbol(I, Decl(interfaceWithOptionalProperty.ts, 0, 0))
 
     x?: number;
->x : Symbol(x, Decl(interfaceWithOptionalProperty.ts, 1, 13))
+>x : Symbol(I.x, Decl(interfaceWithOptionalProperty.ts, 1, 13))
 }
diff --git a/tests/baselines/reference/interfaceWithPropertyOfEveryType.symbols b/tests/baselines/reference/interfaceWithPropertyOfEveryType.symbols
index f248bba02f0..46b0edd378b 100644
--- a/tests/baselines/reference/interfaceWithPropertyOfEveryType.symbols
+++ b/tests/baselines/reference/interfaceWithPropertyOfEveryType.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithPropertyOfEveryType.ts ===
 class C { foo: string; }
 >C : Symbol(C, Decl(interfaceWithPropertyOfEveryType.ts, 0, 0))
->foo : Symbol(foo, Decl(interfaceWithPropertyOfEveryType.ts, 0, 9))
+>foo : Symbol(C.foo, Decl(interfaceWithPropertyOfEveryType.ts, 0, 9))
 
 function f1() { }
 >f1 : Symbol(f1, Decl(interfaceWithPropertyOfEveryType.ts, 0, 24))
@@ -20,59 +20,59 @@ interface Foo {
 >Foo : Symbol(Foo, Decl(interfaceWithPropertyOfEveryType.ts, 5, 12))
 
     a: number;
->a : Symbol(a, Decl(interfaceWithPropertyOfEveryType.ts, 7, 15))
+>a : Symbol(Foo.a, Decl(interfaceWithPropertyOfEveryType.ts, 7, 15))
 
     b: string;
->b : Symbol(b, Decl(interfaceWithPropertyOfEveryType.ts, 8, 14))
+>b : Symbol(Foo.b, Decl(interfaceWithPropertyOfEveryType.ts, 8, 14))
 
     c: boolean;
->c : Symbol(c, Decl(interfaceWithPropertyOfEveryType.ts, 9, 14))
+>c : Symbol(Foo.c, Decl(interfaceWithPropertyOfEveryType.ts, 9, 14))
 
     d: any;
->d : Symbol(d, Decl(interfaceWithPropertyOfEveryType.ts, 10, 15))
+>d : Symbol(Foo.d, Decl(interfaceWithPropertyOfEveryType.ts, 10, 15))
 
     e: void;
->e : Symbol(e, Decl(interfaceWithPropertyOfEveryType.ts, 11, 11))
+>e : Symbol(Foo.e, Decl(interfaceWithPropertyOfEveryType.ts, 11, 11))
 
     f: number[];
->f : Symbol(f, Decl(interfaceWithPropertyOfEveryType.ts, 12, 12))
+>f : Symbol(Foo.f, Decl(interfaceWithPropertyOfEveryType.ts, 12, 12))
 
     g: Object;
->g : Symbol(g, Decl(interfaceWithPropertyOfEveryType.ts, 13, 16))
+>g : Symbol(Foo.g, Decl(interfaceWithPropertyOfEveryType.ts, 13, 16))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     h: (x: number) => number;
->h : Symbol(h, Decl(interfaceWithPropertyOfEveryType.ts, 14, 14))
+>h : Symbol(Foo.h, Decl(interfaceWithPropertyOfEveryType.ts, 14, 14))
 >x : Symbol(x, Decl(interfaceWithPropertyOfEveryType.ts, 15, 8))
 
     i: <T>(x: T) => T;
->i : Symbol(i, Decl(interfaceWithPropertyOfEveryType.ts, 15, 29))
+>i : Symbol(Foo.i, Decl(interfaceWithPropertyOfEveryType.ts, 15, 29))
 >T : Symbol(T, Decl(interfaceWithPropertyOfEveryType.ts, 16, 8))
 >x : Symbol(x, Decl(interfaceWithPropertyOfEveryType.ts, 16, 11))
 >T : Symbol(T, Decl(interfaceWithPropertyOfEveryType.ts, 16, 8))
 >T : Symbol(T, Decl(interfaceWithPropertyOfEveryType.ts, 16, 8))
 
     j: Foo;
->j : Symbol(j, Decl(interfaceWithPropertyOfEveryType.ts, 16, 22))
+>j : Symbol(Foo.j, Decl(interfaceWithPropertyOfEveryType.ts, 16, 22))
 >Foo : Symbol(Foo, Decl(interfaceWithPropertyOfEveryType.ts, 5, 12))
 
     k: C;
->k : Symbol(k, Decl(interfaceWithPropertyOfEveryType.ts, 17, 11))
+>k : Symbol(Foo.k, Decl(interfaceWithPropertyOfEveryType.ts, 17, 11))
 >C : Symbol(C, Decl(interfaceWithPropertyOfEveryType.ts, 0, 0))
 
     l: typeof f1;
->l : Symbol(l, Decl(interfaceWithPropertyOfEveryType.ts, 18, 9))
+>l : Symbol(Foo.l, Decl(interfaceWithPropertyOfEveryType.ts, 18, 9))
 >f1 : Symbol(f1, Decl(interfaceWithPropertyOfEveryType.ts, 0, 24))
 
     m: typeof M;
->m : Symbol(m, Decl(interfaceWithPropertyOfEveryType.ts, 19, 17))
+>m : Symbol(Foo.m, Decl(interfaceWithPropertyOfEveryType.ts, 19, 17))
 >M : Symbol(M, Decl(interfaceWithPropertyOfEveryType.ts, 1, 17))
 
     n: {};
->n : Symbol(n, Decl(interfaceWithPropertyOfEveryType.ts, 20, 16))
+>n : Symbol(Foo.n, Decl(interfaceWithPropertyOfEveryType.ts, 20, 16))
 
     o: E;
->o : Symbol(o, Decl(interfaceWithPropertyOfEveryType.ts, 21, 10))
+>o : Symbol(Foo.o, Decl(interfaceWithPropertyOfEveryType.ts, 21, 10))
 >E : Symbol(E, Decl(interfaceWithPropertyOfEveryType.ts, 4, 1))
 }
 
diff --git a/tests/baselines/reference/interfacedecl.symbols b/tests/baselines/reference/interfacedecl.symbols
index eb9cce5f1fd..48a89a94129 100644
--- a/tests/baselines/reference/interfacedecl.symbols
+++ b/tests/baselines/reference/interfacedecl.symbols
@@ -19,33 +19,33 @@ interface a0 {
 >s : Symbol(s, Decl(interfacedecl.ts, 8, 5))
 
     p1;
->p1 : Symbol(p1, Decl(interfacedecl.ts, 8, 21))
+>p1 : Symbol(a0.p1, Decl(interfacedecl.ts, 8, 21))
 
     p2: string;
->p2 : Symbol(p2, Decl(interfacedecl.ts, 10, 7))
+>p2 : Symbol(a0.p2, Decl(interfacedecl.ts, 10, 7))
 
     p3?;
->p3 : Symbol(p3, Decl(interfacedecl.ts, 11, 15))
+>p3 : Symbol(a0.p3, Decl(interfacedecl.ts, 11, 15))
 
     p4?: number;
->p4 : Symbol(p4, Decl(interfacedecl.ts, 12, 8))
+>p4 : Symbol(a0.p4, Decl(interfacedecl.ts, 12, 8))
 
     p5: (s: number) =>string;
->p5 : Symbol(p5, Decl(interfacedecl.ts, 13, 16))
+>p5 : Symbol(a0.p5, Decl(interfacedecl.ts, 13, 16))
 >s : Symbol(s, Decl(interfacedecl.ts, 14, 9))
 
     f1();
->f1 : Symbol(f1, Decl(interfacedecl.ts, 14, 29))
+>f1 : Symbol(a0.f1, Decl(interfacedecl.ts, 14, 29))
 
     f2? ();
->f2 : Symbol(f2, Decl(interfacedecl.ts, 16, 9))
+>f2 : Symbol(a0.f2, Decl(interfacedecl.ts, 16, 9))
 
     f3(a: string): number;
->f3 : Symbol(f3, Decl(interfacedecl.ts, 17, 11))
+>f3 : Symbol(a0.f3, Decl(interfacedecl.ts, 17, 11))
 >a : Symbol(a, Decl(interfacedecl.ts, 18, 7))
 
     f4? (s: number): string;
->f4 : Symbol(f4, Decl(interfacedecl.ts, 18, 26))
+>f4 : Symbol(a0.f4, Decl(interfacedecl.ts, 18, 26))
 >s : Symbol(s, Decl(interfacedecl.ts, 19, 9))
 }
 
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.symbols b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.symbols
index f3a796cf66c..85c5c72cfe1 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.symbols
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.symbols
@@ -6,7 +6,7 @@ export module x {
 >c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 0, 17))
 
         foo(a: number) {
->foo : Symbol(foo, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 1, 20))
+>foo : Symbol(c.foo, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 1, 20))
 >a : Symbol(a, Decl(internalAliasClassInsideLocalModuleWithExport.ts, 2, 12))
 
             return a;
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.symbols b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.symbols
index 5c1d8b16afc..1df4c67b78e 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.symbols
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.symbols
@@ -6,7 +6,7 @@ export module x {
 >c : Symbol(c, Decl(internalAliasClassInsideLocalModuleWithoutExport.ts, 0, 17))
 
         foo(a: number) {
->foo : Symbol(foo, Decl(internalAliasClassInsideLocalModuleWithoutExport.ts, 1, 20))
+>foo : Symbol(c.foo, Decl(internalAliasClassInsideLocalModuleWithoutExport.ts, 1, 20))
 >a : Symbol(a, Decl(internalAliasClassInsideLocalModuleWithoutExport.ts, 2, 12))
 
             return a;
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.symbols b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.symbols
index 1b4d44307e3..b3c0bc487c5 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.symbols
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.symbols
@@ -6,7 +6,7 @@ export module x {
 >c : Symbol(c, Decl(internalAliasClassInsideTopLevelModuleWithExport.ts, 0, 17))
 
         foo(a: number) {
->foo : Symbol(foo, Decl(internalAliasClassInsideTopLevelModuleWithExport.ts, 1, 20))
+>foo : Symbol(c.foo, Decl(internalAliasClassInsideTopLevelModuleWithExport.ts, 1, 20))
 >a : Symbol(a, Decl(internalAliasClassInsideTopLevelModuleWithExport.ts, 2, 12))
 
             return a;
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.symbols b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.symbols
index b4e720cec94..08112614a57 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.symbols
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.symbols
@@ -6,7 +6,7 @@ export module x {
 >c : Symbol(c, Decl(internalAliasClassInsideTopLevelModuleWithoutExport.ts, 0, 17))
 
         foo(a: number) {
->foo : Symbol(foo, Decl(internalAliasClassInsideTopLevelModuleWithoutExport.ts, 1, 20))
+>foo : Symbol(c.foo, Decl(internalAliasClassInsideTopLevelModuleWithoutExport.ts, 1, 20))
 >a : Symbol(a, Decl(internalAliasClassInsideTopLevelModuleWithoutExport.ts, 2, 12))
 
             return a;
diff --git a/tests/baselines/reference/internalAliasUninitializedModule.symbols b/tests/baselines/reference/internalAliasUninitializedModule.symbols
index 95af5c5699d..bdb777461a6 100644
--- a/tests/baselines/reference/internalAliasUninitializedModule.symbols
+++ b/tests/baselines/reference/internalAliasUninitializedModule.symbols
@@ -9,7 +9,7 @@ module a {
 >I : Symbol(I, Decl(internalAliasUninitializedModule.ts, 1, 21))
 
             foo();
->foo : Symbol(foo, Decl(internalAliasUninitializedModule.ts, 2, 28))
+>foo : Symbol(I.foo, Decl(internalAliasUninitializedModule.ts, 2, 28))
         }
     }
 }
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.symbols b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.symbols
index 861859ce2ea..3050a92eaad 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.symbols
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.symbols
@@ -9,7 +9,7 @@ export module a {
 >I : Symbol(I, Decl(internalAliasUninitializedModuleInsideLocalModuleWithExport.ts, 1, 21))
 
             foo();
->foo : Symbol(foo, Decl(internalAliasUninitializedModuleInsideLocalModuleWithExport.ts, 2, 28))
+>foo : Symbol(I.foo, Decl(internalAliasUninitializedModuleInsideLocalModuleWithExport.ts, 2, 28))
         }
     }
 }
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.symbols b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.symbols
index 433426c9fd9..f1e7ecaa8b5 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.symbols
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.symbols
@@ -9,7 +9,7 @@ export module a {
 >I : Symbol(I, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts, 1, 21))
 
             foo();
->foo : Symbol(foo, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts, 2, 28))
+>foo : Symbol(I.foo, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts, 2, 28))
         }
     }
 }
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.symbols b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.symbols
index 14428deac43..5ecf784fccc 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.symbols
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.symbols
@@ -9,7 +9,7 @@ export module a {
 >I : Symbol(I, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts, 1, 21))
 
             foo();
->foo : Symbol(foo, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts, 2, 28))
+>foo : Symbol(I.foo, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts, 2, 28))
         }
     }
 }
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.symbols b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.symbols
index cd17daeb023..aed4d7e7374 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.symbols
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.symbols
@@ -9,7 +9,7 @@ export module a {
 >I : Symbol(I, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts, 1, 21))
 
             foo();
->foo : Symbol(foo, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts, 2, 28))
+>foo : Symbol(I.foo, Decl(internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts, 2, 28))
         }
     }
 }
diff --git a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.symbols b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.symbols
index e1098948fd6..81e07de2dfd 100644
--- a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.symbols
+++ b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.symbols
@@ -3,14 +3,14 @@ class A {
 >A : Symbol(A, Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 0, 0), Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 2, 1))
 
     aProp: string;
->aProp : Symbol(aProp, Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 0, 9))
+>aProp : Symbol(A.aProp, Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 0, 9))
 }
 module A {
 >A : Symbol(A, Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 0, 0), Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 2, 1))
 
     export interface X { s: string }
 >X : Symbol(X, Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 3, 10))
->s : Symbol(s, Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 4, 24))
+>s : Symbol(X.s, Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 4, 24))
 
     export var a = 10;
 >a : Symbol(a, Decl(internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 5, 14))
diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.symbols b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.symbols
index 5852777fe1c..2cf6a029bc8 100644
--- a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.symbols
+++ b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.symbols
@@ -3,14 +3,14 @@ class A {
 >A : Symbol(A, Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 0, 0), Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 2, 1))
 
     aProp: string;
->aProp : Symbol(aProp, Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 0, 9))
+>aProp : Symbol(A.aProp, Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 0, 9))
 }
 module A {
 >A : Symbol(A, Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 0, 0), Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 2, 1))
 
     export interface X { s: string }
 >X : Symbol(X, Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 3, 10))
->s : Symbol(s, Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 4, 24))
+>s : Symbol(X.s, Decl(internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.ts, 4, 24))
 }
 
 module B {
diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.symbols b/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.symbols
index 06df9fbfa3f..0281e502026 100644
--- a/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.symbols
+++ b/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.symbols
@@ -4,7 +4,7 @@ module A {
 
     export interface X { s: string }
 >X : Symbol(X, Decl(internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.ts, 0, 10))
->s : Symbol(s, Decl(internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.ts, 1, 24))
+>s : Symbol(X.s, Decl(internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.ts, 1, 24))
 }
 
 module B {
diff --git a/tests/baselines/reference/intersectionAndUnionTypes.errors.txt b/tests/baselines/reference/intersectionAndUnionTypes.errors.txt
index d4526c815c4..5a04d4f25d3 100644
--- a/tests/baselines/reference/intersectionAndUnionTypes.errors.txt
+++ b/tests/baselines/reference/intersectionAndUnionTypes.errors.txt
@@ -17,27 +17,22 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(25,1): e
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(26,1): error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'A & B'.
   Type 'C & D' is not assignable to type 'A & B'.
     Type 'C & D' is not assignable to type 'A'.
-      Type 'D' is not assignable to type 'A'.
-        Property 'a' is missing in type 'D'.
+      Property 'a' is missing in type 'C & D'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(27,1): error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'A | B'.
   Type 'C & D' is not assignable to type 'A | B'.
     Type 'C & D' is not assignable to type 'B'.
-      Type 'D' is not assignable to type 'B'.
-        Property 'b' is missing in type 'D'.
+      Property 'b' is missing in type 'C & D'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(28,1): error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'C & D'.
   Type 'A & B' is not assignable to type 'C & D'.
     Type 'A & B' is not assignable to type 'C'.
-      Type 'B' is not assignable to type 'C'.
-        Property 'c' is missing in type 'B'.
+      Property 'c' is missing in type 'A & B'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(29,1): error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'C | D'.
   Type 'A & B' is not assignable to type 'C | D'.
     Type 'A & B' is not assignable to type 'D'.
-      Type 'B' is not assignable to type 'D'.
-        Property 'd' is missing in type 'B'.
+      Property 'd' is missing in type 'A & B'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(31,1): error TS2322: Type 'A & B' is not assignable to type '(A | B) & (C | D)'.
   Type 'A & B' is not assignable to type 'C | D'.
     Type 'A & B' is not assignable to type 'D'.
-      Type 'B' is not assignable to type 'D'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(32,1): error TS2322: Type 'A | B' is not assignable to type '(A | B) & (C | D)'.
   Type 'A' is not assignable to type '(A | B) & (C | D)'.
     Type 'A' is not assignable to type 'C | D'.
@@ -46,7 +41,6 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(32,1): e
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(33,1): error TS2322: Type 'C & D' is not assignable to type '(A | B) & (C | D)'.
   Type 'C & D' is not assignable to type 'A | B'.
     Type 'C & D' is not assignable to type 'B'.
-      Type 'D' is not assignable to type 'B'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(34,1): error TS2322: Type 'C | D' is not assignable to type '(A | B) & (C | D)'.
   Type 'C' is not assignable to type '(A | B) & (C | D)'.
     Type 'C' is not assignable to type 'A | B'.
@@ -54,14 +48,10 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(34,1): e
         Property 'b' is missing in type 'C'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(35,1): error TS2322: Type '(A | B) & (C | D)' is not assignable to type 'A & B'.
   Type '(A | B) & (C | D)' is not assignable to type 'A'.
-    Type 'C | D' is not assignable to type 'A'.
-      Type 'C' is not assignable to type 'A'.
-        Property 'a' is missing in type 'C'.
+    Property 'a' is missing in type '(A | B) & (C | D)'.
 tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(37,1): error TS2322: Type '(A | B) & (C | D)' is not assignable to type 'C & D'.
   Type '(A | B) & (C | D)' is not assignable to type 'C'.
-    Type 'C | D' is not assignable to type 'C'.
-      Type 'D' is not assignable to type 'C'.
-        Property 'c' is missing in type 'D'.
+    Property 'c' is missing in type '(A | B) & (C | D)'.
 
 
 ==== tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts (14 errors) ====
@@ -115,36 +105,31 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(37,1): e
 !!! error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'A & B'.
 !!! error TS2322:   Type 'C & D' is not assignable to type 'A & B'.
 !!! error TS2322:     Type 'C & D' is not assignable to type 'A'.
-!!! error TS2322:       Type 'D' is not assignable to type 'A'.
-!!! error TS2322:         Property 'a' is missing in type 'D'.
+!!! error TS2322:       Property 'a' is missing in type 'C & D'.
     aob = x;
     ~~~
 !!! error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'A | B'.
 !!! error TS2322:   Type 'C & D' is not assignable to type 'A | B'.
 !!! error TS2322:     Type 'C & D' is not assignable to type 'B'.
-!!! error TS2322:       Type 'D' is not assignable to type 'B'.
-!!! error TS2322:         Property 'b' is missing in type 'D'.
+!!! error TS2322:       Property 'b' is missing in type 'C & D'.
     cnd = x;
     ~~~
 !!! error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'C & D'.
 !!! error TS2322:   Type 'A & B' is not assignable to type 'C & D'.
 !!! error TS2322:     Type 'A & B' is not assignable to type 'C'.
-!!! error TS2322:       Type 'B' is not assignable to type 'C'.
-!!! error TS2322:         Property 'c' is missing in type 'B'.
+!!! error TS2322:       Property 'c' is missing in type 'A & B'.
     cod = x;
     ~~~
 !!! error TS2322: Type '(A & B) | (C & D)' is not assignable to type 'C | D'.
 !!! error TS2322:   Type 'A & B' is not assignable to type 'C | D'.
 !!! error TS2322:     Type 'A & B' is not assignable to type 'D'.
-!!! error TS2322:       Type 'B' is not assignable to type 'D'.
-!!! error TS2322:         Property 'd' is missing in type 'B'.
+!!! error TS2322:       Property 'd' is missing in type 'A & B'.
     
     y = anb;
     ~
 !!! error TS2322: Type 'A & B' is not assignable to type '(A | B) & (C | D)'.
 !!! error TS2322:   Type 'A & B' is not assignable to type 'C | D'.
 !!! error TS2322:     Type 'A & B' is not assignable to type 'D'.
-!!! error TS2322:       Type 'B' is not assignable to type 'D'.
     y = aob;
     ~
 !!! error TS2322: Type 'A | B' is not assignable to type '(A | B) & (C | D)'.
@@ -157,7 +142,6 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(37,1): e
 !!! error TS2322: Type 'C & D' is not assignable to type '(A | B) & (C | D)'.
 !!! error TS2322:   Type 'C & D' is not assignable to type 'A | B'.
 !!! error TS2322:     Type 'C & D' is not assignable to type 'B'.
-!!! error TS2322:       Type 'D' is not assignable to type 'B'.
     y = cod;
     ~
 !!! error TS2322: Type 'C | D' is not assignable to type '(A | B) & (C | D)'.
@@ -169,16 +153,12 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(37,1): e
     ~~~
 !!! error TS2322: Type '(A | B) & (C | D)' is not assignable to type 'A & B'.
 !!! error TS2322:   Type '(A | B) & (C | D)' is not assignable to type 'A'.
-!!! error TS2322:     Type 'C | D' is not assignable to type 'A'.
-!!! error TS2322:       Type 'C' is not assignable to type 'A'.
-!!! error TS2322:         Property 'a' is missing in type 'C'.
+!!! error TS2322:     Property 'a' is missing in type '(A | B) & (C | D)'.
     aob = y;  // Ok
     cnd = y;
     ~~~
 !!! error TS2322: Type '(A | B) & (C | D)' is not assignable to type 'C & D'.
 !!! error TS2322:   Type '(A | B) & (C | D)' is not assignable to type 'C'.
-!!! error TS2322:     Type 'C | D' is not assignable to type 'C'.
-!!! error TS2322:       Type 'D' is not assignable to type 'C'.
-!!! error TS2322:         Property 'c' is missing in type 'D'.
+!!! error TS2322:     Property 'c' is missing in type '(A | B) & (C | D)'.
     cod = y;  // Ok
     
\ No newline at end of file
diff --git a/tests/baselines/reference/intersectionTypeEquivalence.symbols b/tests/baselines/reference/intersectionTypeEquivalence.symbols
index 2bec452c44e..effcd2759e5 100644
--- a/tests/baselines/reference/intersectionTypeEquivalence.symbols
+++ b/tests/baselines/reference/intersectionTypeEquivalence.symbols
@@ -1,15 +1,15 @@
 === tests/cases/conformance/types/intersection/intersectionTypeEquivalence.ts ===
 interface A { a: string }
 >A : Symbol(A, Decl(intersectionTypeEquivalence.ts, 0, 0))
->a : Symbol(a, Decl(intersectionTypeEquivalence.ts, 0, 13))
+>a : Symbol(A.a, Decl(intersectionTypeEquivalence.ts, 0, 13))
 
 interface B { b: string }
 >B : Symbol(B, Decl(intersectionTypeEquivalence.ts, 0, 25))
->b : Symbol(b, Decl(intersectionTypeEquivalence.ts, 1, 13))
+>b : Symbol(B.b, Decl(intersectionTypeEquivalence.ts, 1, 13))
 
 interface C { c: string }
 >C : Symbol(C, Decl(intersectionTypeEquivalence.ts, 1, 25))
->c : Symbol(c, Decl(intersectionTypeEquivalence.ts, 2, 13))
+>c : Symbol(C.c, Decl(intersectionTypeEquivalence.ts, 2, 13))
 
 // A & B is equivalent to B & A.
 var y: A & B;
diff --git a/tests/baselines/reference/intersectionTypeMembers.symbols b/tests/baselines/reference/intersectionTypeMembers.symbols
index ebec69b4ebe..9ec66ef64b9 100644
--- a/tests/baselines/reference/intersectionTypeMembers.symbols
+++ b/tests/baselines/reference/intersectionTypeMembers.symbols
@@ -4,15 +4,15 @@
 
 interface A { a: string }
 >A : Symbol(A, Decl(intersectionTypeMembers.ts, 0, 0))
->a : Symbol(a, Decl(intersectionTypeMembers.ts, 3, 13))
+>a : Symbol(A.a, Decl(intersectionTypeMembers.ts, 3, 13))
 
 interface B { b: string }
 >B : Symbol(B, Decl(intersectionTypeMembers.ts, 3, 25))
->b : Symbol(b, Decl(intersectionTypeMembers.ts, 4, 13))
+>b : Symbol(B.b, Decl(intersectionTypeMembers.ts, 4, 13))
 
 interface C { c: string }
 >C : Symbol(C, Decl(intersectionTypeMembers.ts, 4, 25))
->c : Symbol(c, Decl(intersectionTypeMembers.ts, 5, 13))
+>c : Symbol(C.c, Decl(intersectionTypeMembers.ts, 5, 13))
 
 var abc: A & B & C;
 >abc : Symbol(abc, Decl(intersectionTypeMembers.ts, 7, 3))
@@ -37,17 +37,17 @@ abc.c = "hello";
 
 interface X { x: A }
 >X : Symbol(X, Decl(intersectionTypeMembers.ts, 10, 16))
->x : Symbol(x, Decl(intersectionTypeMembers.ts, 12, 13))
+>x : Symbol(X.x, Decl(intersectionTypeMembers.ts, 12, 13))
 >A : Symbol(A, Decl(intersectionTypeMembers.ts, 0, 0))
 
 interface Y { x: B }
 >Y : Symbol(Y, Decl(intersectionTypeMembers.ts, 12, 20))
->x : Symbol(x, Decl(intersectionTypeMembers.ts, 13, 13))
+>x : Symbol(Y.x, Decl(intersectionTypeMembers.ts, 13, 13))
 >B : Symbol(B, Decl(intersectionTypeMembers.ts, 3, 25))
 
 interface Z { x: C }
 >Z : Symbol(Z, Decl(intersectionTypeMembers.ts, 13, 20))
->x : Symbol(x, Decl(intersectionTypeMembers.ts, 14, 13))
+>x : Symbol(Z.x, Decl(intersectionTypeMembers.ts, 14, 13))
 >C : Symbol(C, Decl(intersectionTypeMembers.ts, 4, 25))
 
 var xyz: X & Y & Z;
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/invalidThisEmitInContextualObjectLiteral.js b/tests/baselines/reference/invalidThisEmitInContextualObjectLiteral.js
new file mode 100644
index 00000000000..d3bfa819bc9
--- /dev/null
+++ b/tests/baselines/reference/invalidThisEmitInContextualObjectLiteral.js
@@ -0,0 +1,27 @@
+//// [invalidThisEmitInContextualObjectLiteral.ts]
+interface IDef {
+	p1: (e:string) => void;
+	p2: () => (n: number) => any;
+}
+
+class TestController {
+	public m(def: IDef) { }
+	public p = this.m({
+		p1: e => { },
+		p2: () => { return vvvvvvvvv => this; },
+	});
+}
+
+
+//// [invalidThisEmitInContextualObjectLiteral.js]
+var TestController = (function () {
+    function TestController() {
+        var _this = this;
+        this.p = this.m({
+            p1: function (e) { },
+            p2: function () { return function (vvvvvvvvv) { return _this; }; }
+        });
+    }
+    TestController.prototype.m = function (def) { };
+    return TestController;
+}());
diff --git a/tests/baselines/reference/invalidThisEmitInContextualObjectLiteral.symbols b/tests/baselines/reference/invalidThisEmitInContextualObjectLiteral.symbols
new file mode 100644
index 00000000000..bb20fce76cd
--- /dev/null
+++ b/tests/baselines/reference/invalidThisEmitInContextualObjectLiteral.symbols
@@ -0,0 +1,39 @@
+=== tests/cases/compiler/invalidThisEmitInContextualObjectLiteral.ts ===
+interface IDef {
+>IDef : Symbol(IDef, Decl(invalidThisEmitInContextualObjectLiteral.ts, 0, 0))
+
+	p1: (e:string) => void;
+>p1 : Symbol(IDef.p1, Decl(invalidThisEmitInContextualObjectLiteral.ts, 0, 16))
+>e : Symbol(e, Decl(invalidThisEmitInContextualObjectLiteral.ts, 1, 6))
+
+	p2: () => (n: number) => any;
+>p2 : Symbol(IDef.p2, Decl(invalidThisEmitInContextualObjectLiteral.ts, 1, 24))
+>n : Symbol(n, Decl(invalidThisEmitInContextualObjectLiteral.ts, 2, 12))
+}
+
+class TestController {
+>TestController : Symbol(TestController, Decl(invalidThisEmitInContextualObjectLiteral.ts, 3, 1))
+
+	public m(def: IDef) { }
+>m : Symbol(TestController.m, Decl(invalidThisEmitInContextualObjectLiteral.ts, 5, 22))
+>def : Symbol(def, Decl(invalidThisEmitInContextualObjectLiteral.ts, 6, 10))
+>IDef : Symbol(IDef, Decl(invalidThisEmitInContextualObjectLiteral.ts, 0, 0))
+
+	public p = this.m({
+>p : Symbol(TestController.p, Decl(invalidThisEmitInContextualObjectLiteral.ts, 6, 24))
+>this.m : Symbol(TestController.m, Decl(invalidThisEmitInContextualObjectLiteral.ts, 5, 22))
+>this : Symbol(TestController, Decl(invalidThisEmitInContextualObjectLiteral.ts, 3, 1))
+>m : Symbol(TestController.m, Decl(invalidThisEmitInContextualObjectLiteral.ts, 5, 22))
+
+		p1: e => { },
+>p1 : Symbol(p1, Decl(invalidThisEmitInContextualObjectLiteral.ts, 7, 20))
+>e : Symbol(e, Decl(invalidThisEmitInContextualObjectLiteral.ts, 8, 5))
+
+		p2: () => { return vvvvvvvvv => this; },
+>p2 : Symbol(p2, Decl(invalidThisEmitInContextualObjectLiteral.ts, 8, 15))
+>vvvvvvvvv : Symbol(vvvvvvvvv, Decl(invalidThisEmitInContextualObjectLiteral.ts, 9, 20))
+>this : Symbol(TestController, Decl(invalidThisEmitInContextualObjectLiteral.ts, 3, 1))
+
+	});
+}
+
diff --git a/tests/baselines/reference/invalidThisEmitInContextualObjectLiteral.types b/tests/baselines/reference/invalidThisEmitInContextualObjectLiteral.types
new file mode 100644
index 00000000000..290b0a78eb2
--- /dev/null
+++ b/tests/baselines/reference/invalidThisEmitInContextualObjectLiteral.types
@@ -0,0 +1,44 @@
+=== tests/cases/compiler/invalidThisEmitInContextualObjectLiteral.ts ===
+interface IDef {
+>IDef : IDef
+
+	p1: (e:string) => void;
+>p1 : (e: string) => void
+>e : string
+
+	p2: () => (n: number) => any;
+>p2 : () => (n: number) => any
+>n : number
+}
+
+class TestController {
+>TestController : TestController
+
+	public m(def: IDef) { }
+>m : (def: IDef) => void
+>def : IDef
+>IDef : IDef
+
+	public p = this.m({
+>p : void
+>this.m({		p1: e => { },		p2: () => { return vvvvvvvvv => this; },	}) : void
+>this.m : (def: IDef) => void
+>this : this
+>m : (def: IDef) => void
+>{		p1: e => { },		p2: () => { return vvvvvvvvv => this; },	} : { p1: (e: string) => void; p2: () => {}; }
+
+		p1: e => { },
+>p1 : (e: string) => void
+>e => { } : (e: string) => void
+>e : string
+
+		p2: () => { return vvvvvvvvv => this; },
+>p2 : () => {}
+>() => { return vvvvvvvvv => this; } : () => {}
+>vvvvvvvvv => this : (vvvvvvvvv: number) => this
+>vvvvvvvvv : number
+>this : this
+
+	});
+}
+
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/invalidUndefinedValues.symbols b/tests/baselines/reference/invalidUndefinedValues.symbols
index 5a9b81fde31..748adc75eec 100644
--- a/tests/baselines/reference/invalidUndefinedValues.symbols
+++ b/tests/baselines/reference/invalidUndefinedValues.symbols
@@ -24,7 +24,7 @@ x = null;
 
 class C { foo: string }
 >C : Symbol(C, Decl(invalidUndefinedValues.ts, 7, 9))
->foo : Symbol(foo, Decl(invalidUndefinedValues.ts, 9, 9))
+>foo : Symbol(C.foo, Decl(invalidUndefinedValues.ts, 9, 9))
 
 var b: C;
 >b : Symbol(b, Decl(invalidUndefinedValues.ts, 10, 3))
@@ -40,7 +40,7 @@ x = b;
 
 interface I { foo: string }
 >I : Symbol(I, Decl(invalidUndefinedValues.ts, 12, 6))
->foo : Symbol(foo, Decl(invalidUndefinedValues.ts, 14, 13))
+>foo : Symbol(I.foo, Decl(invalidUndefinedValues.ts, 14, 13))
 
 var c: I;
 >c : Symbol(c, Decl(invalidUndefinedValues.ts, 15, 3))
diff --git a/tests/baselines/reference/ipromise2.symbols b/tests/baselines/reference/ipromise2.symbols
index be936f4512a..f4c4d2a0375 100644
--- a/tests/baselines/reference/ipromise2.symbols
+++ b/tests/baselines/reference/ipromise2.symbols
@@ -8,7 +8,7 @@ declare module Windows.Foundation {
 >T : Symbol(T, Decl(ipromise2.ts, 1, 30))
 
         then<U>(success?: (value: T) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
->then : Symbol(then, Decl(ipromise2.ts, 1, 34), Decl(ipromise2.ts, 2, 159), Decl(ipromise2.ts, 3, 149), Decl(ipromise2.ts, 4, 149))
+>then : Symbol(IPromise.then, Decl(ipromise2.ts, 1, 34), Decl(ipromise2.ts, 2, 159), Decl(ipromise2.ts, 3, 149), Decl(ipromise2.ts, 4, 149))
 >U : Symbol(U, Decl(ipromise2.ts, 2, 13))
 >success : Symbol(success, Decl(ipromise2.ts, 2, 16))
 >value : Symbol(value, Decl(ipromise2.ts, 2, 27))
@@ -27,7 +27,7 @@ declare module Windows.Foundation {
 >U : Symbol(U, Decl(ipromise2.ts, 2, 13))
 
         then<U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
->then : Symbol(then, Decl(ipromise2.ts, 1, 34), Decl(ipromise2.ts, 2, 159), Decl(ipromise2.ts, 3, 149), Decl(ipromise2.ts, 4, 149))
+>then : Symbol(IPromise.then, Decl(ipromise2.ts, 1, 34), Decl(ipromise2.ts, 2, 159), Decl(ipromise2.ts, 3, 149), Decl(ipromise2.ts, 4, 149))
 >U : Symbol(U, Decl(ipromise2.ts, 3, 13))
 >success : Symbol(success, Decl(ipromise2.ts, 3, 16))
 >value : Symbol(value, Decl(ipromise2.ts, 3, 27))
@@ -45,7 +45,7 @@ declare module Windows.Foundation {
 >U : Symbol(U, Decl(ipromise2.ts, 3, 13))
 
         then<U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
->then : Symbol(then, Decl(ipromise2.ts, 1, 34), Decl(ipromise2.ts, 2, 159), Decl(ipromise2.ts, 3, 149), Decl(ipromise2.ts, 4, 149))
+>then : Symbol(IPromise.then, Decl(ipromise2.ts, 1, 34), Decl(ipromise2.ts, 2, 159), Decl(ipromise2.ts, 3, 149), Decl(ipromise2.ts, 4, 149))
 >U : Symbol(U, Decl(ipromise2.ts, 4, 13))
 >success : Symbol(success, Decl(ipromise2.ts, 4, 16))
 >value : Symbol(value, Decl(ipromise2.ts, 4, 27))
@@ -63,7 +63,7 @@ declare module Windows.Foundation {
 >U : Symbol(U, Decl(ipromise2.ts, 4, 13))
 
         then<U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
->then : Symbol(then, Decl(ipromise2.ts, 1, 34), Decl(ipromise2.ts, 2, 159), Decl(ipromise2.ts, 3, 149), Decl(ipromise2.ts, 4, 149))
+>then : Symbol(IPromise.then, Decl(ipromise2.ts, 1, 34), Decl(ipromise2.ts, 2, 159), Decl(ipromise2.ts, 3, 149), Decl(ipromise2.ts, 4, 149))
 >U : Symbol(U, Decl(ipromise2.ts, 5, 13))
 >success : Symbol(success, Decl(ipromise2.ts, 5, 16))
 >value : Symbol(value, Decl(ipromise2.ts, 5, 27))
@@ -80,7 +80,7 @@ declare module Windows.Foundation {
 >U : Symbol(U, Decl(ipromise2.ts, 5, 13))
 
         done<U>(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void ): void;
->done : Symbol(done, Decl(ipromise2.ts, 5, 139))
+>done : Symbol(IPromise.done, Decl(ipromise2.ts, 5, 139))
 >U : Symbol(U, Decl(ipromise2.ts, 6, 13))
 >success : Symbol(success, Decl(ipromise2.ts, 6, 16))
 >value : Symbol(value, Decl(ipromise2.ts, 6, 27))
@@ -91,7 +91,7 @@ declare module Windows.Foundation {
 >progress : Symbol(progress, Decl(ipromise2.ts, 6, 86))
 
         value: T;
->value : Symbol(value, Decl(ipromise2.ts, 6, 117))
+>value : Symbol(IPromise.value, Decl(ipromise2.ts, 6, 117))
 >T : Symbol(T, Decl(ipromise2.ts, 1, 30))
     }
 }
diff --git a/tests/baselines/reference/ipromise3.symbols b/tests/baselines/reference/ipromise3.symbols
index 3605a94fc88..c264f8e2280 100644
--- a/tests/baselines/reference/ipromise3.symbols
+++ b/tests/baselines/reference/ipromise3.symbols
@@ -4,7 +4,7 @@ interface IPromise3<T> {
 >T : Symbol(T, Decl(ipromise3.ts, 0, 20))
 
     then<U>(success?: (value: T) => IPromise3<U>, error?: (error: any) => IPromise3<U>, progress?: (progress: any) => void ): IPromise3<U>;
->then : Symbol(then, Decl(ipromise3.ts, 0, 24), Decl(ipromise3.ts, 1, 139), Decl(ipromise3.ts, 2, 128), Decl(ipromise3.ts, 3, 128))
+>then : Symbol(IPromise3.then, Decl(ipromise3.ts, 0, 24), Decl(ipromise3.ts, 1, 139), Decl(ipromise3.ts, 2, 128), Decl(ipromise3.ts, 3, 128))
 >U : Symbol(U, Decl(ipromise3.ts, 1, 9))
 >success : Symbol(success, Decl(ipromise3.ts, 1, 12))
 >value : Symbol(value, Decl(ipromise3.ts, 1, 23))
@@ -21,7 +21,7 @@ interface IPromise3<T> {
 >U : Symbol(U, Decl(ipromise3.ts, 1, 9))
 
     then<U>(success?: (value: T) => IPromise3<U>, error?: (error: any) => U, progress?: (progress: any) => void ): IPromise3<U>;
->then : Symbol(then, Decl(ipromise3.ts, 0, 24), Decl(ipromise3.ts, 1, 139), Decl(ipromise3.ts, 2, 128), Decl(ipromise3.ts, 3, 128))
+>then : Symbol(IPromise3.then, Decl(ipromise3.ts, 0, 24), Decl(ipromise3.ts, 1, 139), Decl(ipromise3.ts, 2, 128), Decl(ipromise3.ts, 3, 128))
 >U : Symbol(U, Decl(ipromise3.ts, 2, 9))
 >success : Symbol(success, Decl(ipromise3.ts, 2, 12))
 >value : Symbol(value, Decl(ipromise3.ts, 2, 23))
@@ -37,7 +37,7 @@ interface IPromise3<T> {
 >U : Symbol(U, Decl(ipromise3.ts, 2, 9))
 
     then<U>(success?: (value: T) => U, error?: (error: any) => IPromise3<U>, progress?: (progress: any) => void ): IPromise3<U>;
->then : Symbol(then, Decl(ipromise3.ts, 0, 24), Decl(ipromise3.ts, 1, 139), Decl(ipromise3.ts, 2, 128), Decl(ipromise3.ts, 3, 128))
+>then : Symbol(IPromise3.then, Decl(ipromise3.ts, 0, 24), Decl(ipromise3.ts, 1, 139), Decl(ipromise3.ts, 2, 128), Decl(ipromise3.ts, 3, 128))
 >U : Symbol(U, Decl(ipromise3.ts, 3, 9))
 >success : Symbol(success, Decl(ipromise3.ts, 3, 12))
 >value : Symbol(value, Decl(ipromise3.ts, 3, 23))
@@ -53,7 +53,7 @@ interface IPromise3<T> {
 >U : Symbol(U, Decl(ipromise3.ts, 3, 9))
 
     then<U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void ): IPromise3<U>;
->then : Symbol(then, Decl(ipromise3.ts, 0, 24), Decl(ipromise3.ts, 1, 139), Decl(ipromise3.ts, 2, 128), Decl(ipromise3.ts, 3, 128))
+>then : Symbol(IPromise3.then, Decl(ipromise3.ts, 0, 24), Decl(ipromise3.ts, 1, 139), Decl(ipromise3.ts, 2, 128), Decl(ipromise3.ts, 3, 128))
 >U : Symbol(U, Decl(ipromise3.ts, 4, 9))
 >success : Symbol(success, Decl(ipromise3.ts, 4, 12))
 >value : Symbol(value, Decl(ipromise3.ts, 4, 23))
@@ -68,7 +68,7 @@ interface IPromise3<T> {
 >U : Symbol(U, Decl(ipromise3.ts, 4, 9))
 
     done? <U>(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void ): void;
->done : Symbol(done, Decl(ipromise3.ts, 4, 117))
+>done : Symbol(IPromise3.done, Decl(ipromise3.ts, 4, 117))
 >U : Symbol(U, Decl(ipromise3.ts, 5, 11))
 >success : Symbol(success, Decl(ipromise3.ts, 5, 14))
 >value : Symbol(value, Decl(ipromise3.ts, 5, 25))
diff --git a/tests/baselines/reference/ipromise4.symbols b/tests/baselines/reference/ipromise4.symbols
index 65ae5f90cfe..58055fdc59d 100644
--- a/tests/baselines/reference/ipromise4.symbols
+++ b/tests/baselines/reference/ipromise4.symbols
@@ -8,7 +8,7 @@ declare module Windows.Foundation {
 >T : Symbol(T, Decl(ipromise4.ts, 1, 30))
 
         then<U>(success?: (value: T) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
->then : Symbol(then, Decl(ipromise4.ts, 1, 34), Decl(ipromise4.ts, 2, 159), Decl(ipromise4.ts, 3, 149), Decl(ipromise4.ts, 4, 149))
+>then : Symbol(IPromise.then, Decl(ipromise4.ts, 1, 34), Decl(ipromise4.ts, 2, 159), Decl(ipromise4.ts, 3, 149), Decl(ipromise4.ts, 4, 149))
 >U : Symbol(U, Decl(ipromise4.ts, 2, 13))
 >success : Symbol(success, Decl(ipromise4.ts, 2, 16))
 >value : Symbol(value, Decl(ipromise4.ts, 2, 27))
@@ -27,7 +27,7 @@ declare module Windows.Foundation {
 >U : Symbol(U, Decl(ipromise4.ts, 2, 13))
 
         then<U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
->then : Symbol(then, Decl(ipromise4.ts, 1, 34), Decl(ipromise4.ts, 2, 159), Decl(ipromise4.ts, 3, 149), Decl(ipromise4.ts, 4, 149))
+>then : Symbol(IPromise.then, Decl(ipromise4.ts, 1, 34), Decl(ipromise4.ts, 2, 159), Decl(ipromise4.ts, 3, 149), Decl(ipromise4.ts, 4, 149))
 >U : Symbol(U, Decl(ipromise4.ts, 3, 13))
 >success : Symbol(success, Decl(ipromise4.ts, 3, 16))
 >value : Symbol(value, Decl(ipromise4.ts, 3, 27))
@@ -45,7 +45,7 @@ declare module Windows.Foundation {
 >U : Symbol(U, Decl(ipromise4.ts, 3, 13))
 
         then<U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
->then : Symbol(then, Decl(ipromise4.ts, 1, 34), Decl(ipromise4.ts, 2, 159), Decl(ipromise4.ts, 3, 149), Decl(ipromise4.ts, 4, 149))
+>then : Symbol(IPromise.then, Decl(ipromise4.ts, 1, 34), Decl(ipromise4.ts, 2, 159), Decl(ipromise4.ts, 3, 149), Decl(ipromise4.ts, 4, 149))
 >U : Symbol(U, Decl(ipromise4.ts, 4, 13))
 >success : Symbol(success, Decl(ipromise4.ts, 4, 16))
 >value : Symbol(value, Decl(ipromise4.ts, 4, 27))
@@ -63,7 +63,7 @@ declare module Windows.Foundation {
 >U : Symbol(U, Decl(ipromise4.ts, 4, 13))
 
         then<U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
->then : Symbol(then, Decl(ipromise4.ts, 1, 34), Decl(ipromise4.ts, 2, 159), Decl(ipromise4.ts, 3, 149), Decl(ipromise4.ts, 4, 149))
+>then : Symbol(IPromise.then, Decl(ipromise4.ts, 1, 34), Decl(ipromise4.ts, 2, 159), Decl(ipromise4.ts, 3, 149), Decl(ipromise4.ts, 4, 149))
 >U : Symbol(U, Decl(ipromise4.ts, 5, 13))
 >success : Symbol(success, Decl(ipromise4.ts, 5, 16))
 >value : Symbol(value, Decl(ipromise4.ts, 5, 27))
@@ -80,7 +80,7 @@ declare module Windows.Foundation {
 >U : Symbol(U, Decl(ipromise4.ts, 5, 13))
 
         done? <U>(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void ): void;
->done : Symbol(done, Decl(ipromise4.ts, 5, 139))
+>done : Symbol(IPromise.done, Decl(ipromise4.ts, 5, 139))
 >U : Symbol(U, Decl(ipromise4.ts, 6, 15))
 >success : Symbol(success, Decl(ipromise4.ts, 6, 18))
 >value : Symbol(value, Decl(ipromise4.ts, 6, 29))
diff --git a/tests/baselines/reference/isArray.types b/tests/baselines/reference/isArray.types
index de54e9d064c..bc452b12bef 100644
--- a/tests/baselines/reference/isArray.types
+++ b/tests/baselines/reference/isArray.types
@@ -4,7 +4,7 @@ var maybeArray: number | number[];
 
 
 if (Array.isArray(maybeArray)) {
->Array.isArray(maybeArray) : arg is any[]
+>Array.isArray(maybeArray) : boolean
 >Array.isArray : (arg: any) => arg is any[]
 >Array : ArrayConstructor
 >isArray : (arg: any) => arg is any[]
diff --git a/tests/baselines/reference/isDeclarationVisibleNodeKinds.symbols b/tests/baselines/reference/isDeclarationVisibleNodeKinds.symbols
index 2af21772cfb..ecc68121f37 100644
--- a/tests/baselines/reference/isDeclarationVisibleNodeKinds.symbols
+++ b/tests/baselines/reference/isDeclarationVisibleNodeKinds.symbols
@@ -146,7 +146,7 @@ module schema {
 >T : Symbol(T, Decl(isDeclarationVisibleNodeKinds.ts, 59, 15))
 
         get createValidator9(): <T>(data: T) => T {
->createValidator9 : Symbol(createValidator9, Decl(isDeclarationVisibleNodeKinds.ts, 60, 20))
+>createValidator9 : Symbol(T.createValidator9, Decl(isDeclarationVisibleNodeKinds.ts, 60, 20))
 >T : Symbol(T, Decl(isDeclarationVisibleNodeKinds.ts, 61, 33))
 >data : Symbol(data, Decl(isDeclarationVisibleNodeKinds.ts, 61, 36))
 >T : Symbol(T, Decl(isDeclarationVisibleNodeKinds.ts, 61, 33))
@@ -157,7 +157,7 @@ module schema {
         }
         
         set createValidator10(v: <T>(data: T) => T) {
->createValidator10 : Symbol(createValidator10, Decl(isDeclarationVisibleNodeKinds.ts, 63, 9))
+>createValidator10 : Symbol(T.createValidator10, Decl(isDeclarationVisibleNodeKinds.ts, 63, 9))
 >v : Symbol(v, Decl(isDeclarationVisibleNodeKinds.ts, 65, 30))
 >T : Symbol(T, Decl(isDeclarationVisibleNodeKinds.ts, 65, 34))
 >data : Symbol(data, Decl(isDeclarationVisibleNodeKinds.ts, 65, 37))
diff --git a/tests/baselines/reference/isolatedModulesOut.errors.txt b/tests/baselines/reference/isolatedModulesOut.errors.txt
index 7d16ac94666..7df16139bfe 100644
--- a/tests/baselines/reference/isolatedModulesOut.errors.txt
+++ b/tests/baselines/reference/isolatedModulesOut.errors.txt
@@ -1,8 +1,10 @@
 error TS5053: Option 'out' cannot be specified with option 'isolatedModules'.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
 tests/cases/compiler/file2.ts(1,1): error TS1208: Cannot compile namespaces when the '--isolatedModules' flag is provided.
 
 
 !!! error TS5053: Option 'out' cannot be specified with option 'isolatedModules'.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
 ==== tests/cases/compiler/file1.ts (0 errors) ====
     
     export var x;
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/isolatedModulesUnspecifiedModule.errors.txt b/tests/baselines/reference/isolatedModulesUnspecifiedModule.errors.txt
deleted file mode 100644
index fbb2f0041d6..00000000000
--- a/tests/baselines/reference/isolatedModulesUnspecifiedModule.errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-error TS5047: Option 'isolatedModules' can only be used when either option '--module' is provided or option 'target' is 'ES2015' or higher.
-
-
-!!! error TS5047: Option 'isolatedModules' can only be used when either option '--module' is provided or option 'target' is 'ES2015' or higher.
-==== tests/cases/compiler/file1.ts (0 errors) ====
-    export var x;
\ No newline at end of file
diff --git a/tests/baselines/reference/isolatedModulesUnspecifiedModule.symbols b/tests/baselines/reference/isolatedModulesUnspecifiedModule.symbols
new file mode 100644
index 00000000000..625dbfbe699
--- /dev/null
+++ b/tests/baselines/reference/isolatedModulesUnspecifiedModule.symbols
@@ -0,0 +1,4 @@
+=== tests/cases/compiler/file1.ts ===
+export var x;
+>x : Symbol(x, Decl(file1.ts, 0, 10))
+
diff --git a/tests/baselines/reference/isolatedModulesUnspecifiedModule.types b/tests/baselines/reference/isolatedModulesUnspecifiedModule.types
new file mode 100644
index 00000000000..27dca700bb9
--- /dev/null
+++ b/tests/baselines/reference/isolatedModulesUnspecifiedModule.types
@@ -0,0 +1,4 @@
+=== tests/cases/compiler/file1.ts ===
+export var x;
+>x : any
+
diff --git a/tests/baselines/reference/iterableArrayPattern1.symbols b/tests/baselines/reference/iterableArrayPattern1.symbols
index 2877a2233da..a7e8215dda9 100644
--- a/tests/baselines/reference/iterableArrayPattern1.symbols
+++ b/tests/baselines/reference/iterableArrayPattern1.symbols
@@ -8,12 +8,12 @@ class SymbolIterator {
 >SymbolIterator : Symbol(SymbolIterator, Decl(iterableArrayPattern1.ts, 0, 32))
 
     next() {
->next : Symbol(next, Decl(iterableArrayPattern1.ts, 1, 22))
+>next : Symbol(SymbolIterator.next, Decl(iterableArrayPattern1.ts, 1, 22))
 
         return {
             value: Symbol(),
 >value : Symbol(value, Decl(iterableArrayPattern1.ts, 3, 16))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
 
             done: false
 >done : Symbol(done, Decl(iterableArrayPattern1.ts, 4, 28))
@@ -22,9 +22,9 @@ class SymbolIterator {
     }
 
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(SymbolIterator, Decl(iterableArrayPattern1.ts, 0, 32))
diff --git a/tests/baselines/reference/iterableArrayPattern11.symbols b/tests/baselines/reference/iterableArrayPattern11.symbols
index 6181edbf1fd..9a61280b634 100644
--- a/tests/baselines/reference/iterableArrayPattern11.symbols
+++ b/tests/baselines/reference/iterableArrayPattern11.symbols
@@ -11,18 +11,18 @@ fun(new FooIterator);
 
 class Bar { x }
 >Bar : Symbol(Bar, Decl(iterableArrayPattern11.ts, 1, 21))
->x : Symbol(x, Decl(iterableArrayPattern11.ts, 2, 11))
+>x : Symbol(Bar.x, Decl(iterableArrayPattern11.ts, 2, 11))
 
 class Foo extends Bar { y }
 >Foo : Symbol(Foo, Decl(iterableArrayPattern11.ts, 2, 15))
 >Bar : Symbol(Bar, Decl(iterableArrayPattern11.ts, 1, 21))
->y : Symbol(y, Decl(iterableArrayPattern11.ts, 3, 23))
+>y : Symbol(Foo.y, Decl(iterableArrayPattern11.ts, 3, 23))
 
 class FooIterator {
 >FooIterator : Symbol(FooIterator, Decl(iterableArrayPattern11.ts, 3, 27))
 
     next() {
->next : Symbol(next, Decl(iterableArrayPattern11.ts, 4, 19))
+>next : Symbol(FooIterator.next, Decl(iterableArrayPattern11.ts, 4, 19))
 
         return {
             value: new Foo,
@@ -36,9 +36,9 @@ class FooIterator {
     }
 
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(FooIterator, Decl(iterableArrayPattern11.ts, 3, 27))
diff --git a/tests/baselines/reference/iterableArrayPattern12.symbols b/tests/baselines/reference/iterableArrayPattern12.symbols
index e4b4baf3bd5..8046b32d120 100644
--- a/tests/baselines/reference/iterableArrayPattern12.symbols
+++ b/tests/baselines/reference/iterableArrayPattern12.symbols
@@ -11,18 +11,18 @@ fun(new FooIterator);
 
 class Bar { x }
 >Bar : Symbol(Bar, Decl(iterableArrayPattern12.ts, 1, 21))
->x : Symbol(x, Decl(iterableArrayPattern12.ts, 2, 11))
+>x : Symbol(Bar.x, Decl(iterableArrayPattern12.ts, 2, 11))
 
 class Foo extends Bar { y }
 >Foo : Symbol(Foo, Decl(iterableArrayPattern12.ts, 2, 15))
 >Bar : Symbol(Bar, Decl(iterableArrayPattern12.ts, 1, 21))
->y : Symbol(y, Decl(iterableArrayPattern12.ts, 3, 23))
+>y : Symbol(Foo.y, Decl(iterableArrayPattern12.ts, 3, 23))
 
 class FooIterator {
 >FooIterator : Symbol(FooIterator, Decl(iterableArrayPattern12.ts, 3, 27))
 
     next() {
->next : Symbol(next, Decl(iterableArrayPattern12.ts, 4, 19))
+>next : Symbol(FooIterator.next, Decl(iterableArrayPattern12.ts, 4, 19))
 
         return {
             value: new Foo,
@@ -36,9 +36,9 @@ class FooIterator {
     }
 
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(FooIterator, Decl(iterableArrayPattern12.ts, 3, 27))
diff --git a/tests/baselines/reference/iterableArrayPattern13.symbols b/tests/baselines/reference/iterableArrayPattern13.symbols
index 02f219e7092..3ebaac62fcc 100644
--- a/tests/baselines/reference/iterableArrayPattern13.symbols
+++ b/tests/baselines/reference/iterableArrayPattern13.symbols
@@ -10,18 +10,18 @@ fun(new FooIterator);
 
 class Bar { x }
 >Bar : Symbol(Bar, Decl(iterableArrayPattern13.ts, 1, 21))
->x : Symbol(x, Decl(iterableArrayPattern13.ts, 2, 11))
+>x : Symbol(Bar.x, Decl(iterableArrayPattern13.ts, 2, 11))
 
 class Foo extends Bar { y }
 >Foo : Symbol(Foo, Decl(iterableArrayPattern13.ts, 2, 15))
 >Bar : Symbol(Bar, Decl(iterableArrayPattern13.ts, 1, 21))
->y : Symbol(y, Decl(iterableArrayPattern13.ts, 3, 23))
+>y : Symbol(Foo.y, Decl(iterableArrayPattern13.ts, 3, 23))
 
 class FooIterator {
 >FooIterator : Symbol(FooIterator, Decl(iterableArrayPattern13.ts, 3, 27))
 
     next() {
->next : Symbol(next, Decl(iterableArrayPattern13.ts, 4, 19))
+>next : Symbol(FooIterator.next, Decl(iterableArrayPattern13.ts, 4, 19))
 
         return {
             value: new Foo,
@@ -35,9 +35,9 @@ class FooIterator {
     }
 
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(FooIterator, Decl(iterableArrayPattern13.ts, 3, 27))
diff --git a/tests/baselines/reference/iterableArrayPattern2.symbols b/tests/baselines/reference/iterableArrayPattern2.symbols
index dad1262cee9..6ab3040d570 100644
--- a/tests/baselines/reference/iterableArrayPattern2.symbols
+++ b/tests/baselines/reference/iterableArrayPattern2.symbols
@@ -8,12 +8,12 @@ class SymbolIterator {
 >SymbolIterator : Symbol(SymbolIterator, Decl(iterableArrayPattern2.ts, 0, 35))
 
     next() {
->next : Symbol(next, Decl(iterableArrayPattern2.ts, 1, 22))
+>next : Symbol(SymbolIterator.next, Decl(iterableArrayPattern2.ts, 1, 22))
 
         return {
             value: Symbol(),
 >value : Symbol(value, Decl(iterableArrayPattern2.ts, 3, 16))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
 
             done: false
 >done : Symbol(done, Decl(iterableArrayPattern2.ts, 4, 28))
@@ -22,9 +22,9 @@ class SymbolIterator {
     }
 
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(SymbolIterator, Decl(iterableArrayPattern2.ts, 0, 35))
diff --git a/tests/baselines/reference/iterableArrayPattern3.symbols b/tests/baselines/reference/iterableArrayPattern3.symbols
index e0372862b9e..b9fe0a95cdd 100644
--- a/tests/baselines/reference/iterableArrayPattern3.symbols
+++ b/tests/baselines/reference/iterableArrayPattern3.symbols
@@ -12,18 +12,18 @@ var a: Bar, b: Bar;
 
 class Bar { x }
 >Bar : Symbol(Bar, Decl(iterableArrayPattern3.ts, 1, 25))
->x : Symbol(x, Decl(iterableArrayPattern3.ts, 2, 11))
+>x : Symbol(Bar.x, Decl(iterableArrayPattern3.ts, 2, 11))
 
 class Foo extends Bar { y }
 >Foo : Symbol(Foo, Decl(iterableArrayPattern3.ts, 2, 15))
 >Bar : Symbol(Bar, Decl(iterableArrayPattern3.ts, 1, 25))
->y : Symbol(y, Decl(iterableArrayPattern3.ts, 3, 23))
+>y : Symbol(Foo.y, Decl(iterableArrayPattern3.ts, 3, 23))
 
 class FooIterator {
 >FooIterator : Symbol(FooIterator, Decl(iterableArrayPattern3.ts, 3, 27))
 
     next() {
->next : Symbol(next, Decl(iterableArrayPattern3.ts, 4, 19))
+>next : Symbol(FooIterator.next, Decl(iterableArrayPattern3.ts, 4, 19))
 
         return {
             value: new Foo,
@@ -37,9 +37,9 @@ class FooIterator {
     }
 
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(FooIterator, Decl(iterableArrayPattern3.ts, 3, 27))
diff --git a/tests/baselines/reference/iterableArrayPattern30.symbols b/tests/baselines/reference/iterableArrayPattern30.symbols
index 393d9fbca51..b6597922490 100644
--- a/tests/baselines/reference/iterableArrayPattern30.symbols
+++ b/tests/baselines/reference/iterableArrayPattern30.symbols
@@ -4,5 +4,5 @@ const [[k1, v1], [k2, v2]] = new Map([["", true], ["hello", true]])
 >v1 : Symbol(v1, Decl(iterableArrayPattern30.ts, 0, 11))
 >k2 : Symbol(k2, Decl(iterableArrayPattern30.ts, 0, 18))
 >v2 : Symbol(v2, Decl(iterableArrayPattern30.ts, 0, 21))
->Map : Symbol(Map, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Map : Symbol(Map, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --))
 
diff --git a/tests/baselines/reference/iterableArrayPattern4.symbols b/tests/baselines/reference/iterableArrayPattern4.symbols
index fb1cce1b8f9..b39834bec2e 100644
--- a/tests/baselines/reference/iterableArrayPattern4.symbols
+++ b/tests/baselines/reference/iterableArrayPattern4.symbols
@@ -12,18 +12,18 @@ var a: Bar, b: Bar[];
 
 class Bar { x }
 >Bar : Symbol(Bar, Decl(iterableArrayPattern4.ts, 1, 28))
->x : Symbol(x, Decl(iterableArrayPattern4.ts, 2, 11))
+>x : Symbol(Bar.x, Decl(iterableArrayPattern4.ts, 2, 11))
 
 class Foo extends Bar { y }
 >Foo : Symbol(Foo, Decl(iterableArrayPattern4.ts, 2, 15))
 >Bar : Symbol(Bar, Decl(iterableArrayPattern4.ts, 1, 28))
->y : Symbol(y, Decl(iterableArrayPattern4.ts, 3, 23))
+>y : Symbol(Foo.y, Decl(iterableArrayPattern4.ts, 3, 23))
 
 class FooIterator {
 >FooIterator : Symbol(FooIterator, Decl(iterableArrayPattern4.ts, 3, 27))
 
     next() {
->next : Symbol(next, Decl(iterableArrayPattern4.ts, 4, 19))
+>next : Symbol(FooIterator.next, Decl(iterableArrayPattern4.ts, 4, 19))
 
         return {
             value: new Foo,
@@ -37,9 +37,9 @@ class FooIterator {
     }
 
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(FooIterator, Decl(iterableArrayPattern4.ts, 3, 27))
diff --git a/tests/baselines/reference/iterableArrayPattern9.symbols b/tests/baselines/reference/iterableArrayPattern9.symbols
index 07d580fcea1..f79e2d687b6 100644
--- a/tests/baselines/reference/iterableArrayPattern9.symbols
+++ b/tests/baselines/reference/iterableArrayPattern9.symbols
@@ -7,18 +7,18 @@ function fun([a, b] = new FooIterator) { }
 
 class Bar { x }
 >Bar : Symbol(Bar, Decl(iterableArrayPattern9.ts, 0, 42))
->x : Symbol(x, Decl(iterableArrayPattern9.ts, 1, 11))
+>x : Symbol(Bar.x, Decl(iterableArrayPattern9.ts, 1, 11))
 
 class Foo extends Bar { y }
 >Foo : Symbol(Foo, Decl(iterableArrayPattern9.ts, 1, 15))
 >Bar : Symbol(Bar, Decl(iterableArrayPattern9.ts, 0, 42))
->y : Symbol(y, Decl(iterableArrayPattern9.ts, 2, 23))
+>y : Symbol(Foo.y, Decl(iterableArrayPattern9.ts, 2, 23))
 
 class FooIterator {
 >FooIterator : Symbol(FooIterator, Decl(iterableArrayPattern9.ts, 2, 27))
 
     next() {
->next : Symbol(next, Decl(iterableArrayPattern9.ts, 3, 19))
+>next : Symbol(FooIterator.next, Decl(iterableArrayPattern9.ts, 3, 19))
 
         return {
             value: new Foo,
@@ -32,9 +32,9 @@ class FooIterator {
     }
 
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(FooIterator, Decl(iterableArrayPattern9.ts, 2, 27))
diff --git a/tests/baselines/reference/iterableContextualTyping1.symbols b/tests/baselines/reference/iterableContextualTyping1.symbols
index 5af4fdbcd78..8d9a47a8f3b 100644
--- a/tests/baselines/reference/iterableContextualTyping1.symbols
+++ b/tests/baselines/reference/iterableContextualTyping1.symbols
@@ -1,10 +1,10 @@
 === tests/cases/conformance/expressions/contextualTyping/iterableContextualTyping1.ts ===
 var iter: Iterable<(x: string) => number> = [s => s.length];
 >iter : Symbol(iter, Decl(iterableContextualTyping1.ts, 0, 3))
->Iterable : Symbol(Iterable, Decl(lib.d.ts, --, --))
+>Iterable : Symbol(Iterable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >x : Symbol(x, Decl(iterableContextualTyping1.ts, 0, 20))
 >s : Symbol(s, Decl(iterableContextualTyping1.ts, 0, 45))
->s.length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>s.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 >s : Symbol(s, Decl(iterableContextualTyping1.ts, 0, 45))
->length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 
diff --git a/tests/baselines/reference/iteratorSpreadInArray.symbols b/tests/baselines/reference/iteratorSpreadInArray.symbols
index d24abca314b..11e1de17444 100644
--- a/tests/baselines/reference/iteratorSpreadInArray.symbols
+++ b/tests/baselines/reference/iteratorSpreadInArray.symbols
@@ -7,12 +7,12 @@ class SymbolIterator {
 >SymbolIterator : Symbol(SymbolIterator, Decl(iteratorSpreadInArray.ts, 0, 36))
 
     next() {
->next : Symbol(next, Decl(iteratorSpreadInArray.ts, 2, 22))
+>next : Symbol(SymbolIterator.next, Decl(iteratorSpreadInArray.ts, 2, 22))
 
         return {
             value: Symbol(),
 >value : Symbol(value, Decl(iteratorSpreadInArray.ts, 4, 16))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
 
             done: false
 >done : Symbol(done, Decl(iteratorSpreadInArray.ts, 5, 28))
@@ -21,9 +21,9 @@ class SymbolIterator {
     }
 
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(SymbolIterator, Decl(iteratorSpreadInArray.ts, 0, 36))
diff --git a/tests/baselines/reference/iteratorSpreadInArray11.symbols b/tests/baselines/reference/iteratorSpreadInArray11.symbols
index f982bf2deab..b2d8a522377 100644
--- a/tests/baselines/reference/iteratorSpreadInArray11.symbols
+++ b/tests/baselines/reference/iteratorSpreadInArray11.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/spread/iteratorSpreadInArray11.ts ===
 var iter: Iterable<number>;
 >iter : Symbol(iter, Decl(iteratorSpreadInArray11.ts, 0, 3))
->Iterable : Symbol(Iterable, Decl(lib.d.ts, --, --))
+>Iterable : Symbol(Iterable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
 var array = [...iter];
 >array : Symbol(array, Decl(iteratorSpreadInArray11.ts, 1, 3))
diff --git a/tests/baselines/reference/iteratorSpreadInArray2.symbols b/tests/baselines/reference/iteratorSpreadInArray2.symbols
index 029d83d2111..5f9354727e5 100644
--- a/tests/baselines/reference/iteratorSpreadInArray2.symbols
+++ b/tests/baselines/reference/iteratorSpreadInArray2.symbols
@@ -8,12 +8,12 @@ class SymbolIterator {
 >SymbolIterator : Symbol(SymbolIterator, Decl(iteratorSpreadInArray2.ts, 0, 59))
 
     next() {
->next : Symbol(next, Decl(iteratorSpreadInArray2.ts, 2, 22))
+>next : Symbol(SymbolIterator.next, Decl(iteratorSpreadInArray2.ts, 2, 22))
 
         return {
             value: Symbol(),
 >value : Symbol(value, Decl(iteratorSpreadInArray2.ts, 4, 16))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
 
             done: false
 >done : Symbol(done, Decl(iteratorSpreadInArray2.ts, 5, 28))
@@ -22,9 +22,9 @@ class SymbolIterator {
     }
 
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(SymbolIterator, Decl(iteratorSpreadInArray2.ts, 0, 59))
@@ -35,7 +35,7 @@ class NumberIterator {
 >NumberIterator : Symbol(NumberIterator, Decl(iteratorSpreadInArray2.ts, 13, 1))
 
     next() {
->next : Symbol(next, Decl(iteratorSpreadInArray2.ts, 15, 22))
+>next : Symbol(NumberIterator.next, Decl(iteratorSpreadInArray2.ts, 15, 22))
 
         return {
             value: 0,
@@ -48,9 +48,9 @@ class NumberIterator {
     }
 
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(NumberIterator, Decl(iteratorSpreadInArray2.ts, 13, 1))
diff --git a/tests/baselines/reference/iteratorSpreadInArray3.symbols b/tests/baselines/reference/iteratorSpreadInArray3.symbols
index 05f90d44174..40d2c3aab43 100644
--- a/tests/baselines/reference/iteratorSpreadInArray3.symbols
+++ b/tests/baselines/reference/iteratorSpreadInArray3.symbols
@@ -7,12 +7,12 @@ class SymbolIterator {
 >SymbolIterator : Symbol(SymbolIterator, Decl(iteratorSpreadInArray3.ts, 0, 47))
 
     next() {
->next : Symbol(next, Decl(iteratorSpreadInArray3.ts, 2, 22))
+>next : Symbol(SymbolIterator.next, Decl(iteratorSpreadInArray3.ts, 2, 22))
 
         return {
             value: Symbol(),
 >value : Symbol(value, Decl(iteratorSpreadInArray3.ts, 4, 16))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
 
             done: false
 >done : Symbol(done, Decl(iteratorSpreadInArray3.ts, 5, 28))
@@ -21,9 +21,9 @@ class SymbolIterator {
     }
 
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(SymbolIterator, Decl(iteratorSpreadInArray3.ts, 0, 47))
diff --git a/tests/baselines/reference/iteratorSpreadInArray4.symbols b/tests/baselines/reference/iteratorSpreadInArray4.symbols
index e7ace40c4de..65f3bbbea45 100644
--- a/tests/baselines/reference/iteratorSpreadInArray4.symbols
+++ b/tests/baselines/reference/iteratorSpreadInArray4.symbols
@@ -7,12 +7,12 @@ class SymbolIterator {
 >SymbolIterator : Symbol(SymbolIterator, Decl(iteratorSpreadInArray4.ts, 0, 42))
 
     next() {
->next : Symbol(next, Decl(iteratorSpreadInArray4.ts, 2, 22))
+>next : Symbol(SymbolIterator.next, Decl(iteratorSpreadInArray4.ts, 2, 22))
 
         return {
             value: Symbol(),
 >value : Symbol(value, Decl(iteratorSpreadInArray4.ts, 4, 16))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
 
             done: false
 >done : Symbol(done, Decl(iteratorSpreadInArray4.ts, 5, 28))
@@ -21,9 +21,9 @@ class SymbolIterator {
     }
 
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(SymbolIterator, Decl(iteratorSpreadInArray4.ts, 0, 42))
diff --git a/tests/baselines/reference/iteratorSpreadInArray6.errors.txt b/tests/baselines/reference/iteratorSpreadInArray6.errors.txt
index b90ac5f203c..8148ce43de7 100644
--- a/tests/baselines/reference/iteratorSpreadInArray6.errors.txt
+++ b/tests/baselines/reference/iteratorSpreadInArray6.errors.txt
@@ -1,11 +1,15 @@
-tests/cases/conformance/es6/spread/iteratorSpreadInArray6.ts(2,14): error TS2345: Argument of type 'symbol[]' is not assignable to parameter of type 'number'.
+tests/cases/conformance/es6/spread/iteratorSpreadInArray6.ts(2,14): error TS2345: Argument of type 'symbol[]' is not assignable to parameter of type 'number | number[]'.
+  Type 'symbol[]' is not assignable to type 'number[]'.
+    Type 'symbol' is not assignable to type 'number'.
 
 
 ==== tests/cases/conformance/es6/spread/iteratorSpreadInArray6.ts (1 errors) ====
     var array: number[] = [0, 1];
     array.concat([...new SymbolIterator]);
                  ~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type 'symbol[]' is not assignable to parameter of type 'number'.
+!!! error TS2345: Argument of type 'symbol[]' is not assignable to parameter of type 'number | number[]'.
+!!! error TS2345:   Type 'symbol[]' is not assignable to type 'number[]'.
+!!! error TS2345:     Type 'symbol' is not assignable to type 'number'.
     
     class SymbolIterator {
         next() {
diff --git a/tests/baselines/reference/iteratorSpreadInArray7.symbols b/tests/baselines/reference/iteratorSpreadInArray7.symbols
index e498e68b9eb..d5830a8146a 100644
--- a/tests/baselines/reference/iteratorSpreadInArray7.symbols
+++ b/tests/baselines/reference/iteratorSpreadInArray7.symbols
@@ -3,21 +3,21 @@ var array: symbol[];
 >array : Symbol(array, Decl(iteratorSpreadInArray7.ts, 0, 3))
 
 array.concat([...new SymbolIterator]);
->array.concat : Symbol(Array.concat, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>array.concat : Symbol(Array.concat, Decl(lib.es5.d.ts, --, --))
 >array : Symbol(array, Decl(iteratorSpreadInArray7.ts, 0, 3))
->concat : Symbol(Array.concat, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>concat : Symbol(Array.concat, Decl(lib.es5.d.ts, --, --))
 >SymbolIterator : Symbol(SymbolIterator, Decl(iteratorSpreadInArray7.ts, 1, 38))
 
 class SymbolIterator {
 >SymbolIterator : Symbol(SymbolIterator, Decl(iteratorSpreadInArray7.ts, 1, 38))
 
     next() {
->next : Symbol(next, Decl(iteratorSpreadInArray7.ts, 3, 22))
+>next : Symbol(SymbolIterator.next, Decl(iteratorSpreadInArray7.ts, 3, 22))
 
         return {
             value: Symbol(),
 >value : Symbol(value, Decl(iteratorSpreadInArray7.ts, 5, 16))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
 
             done: false
 >done : Symbol(done, Decl(iteratorSpreadInArray7.ts, 6, 28))
@@ -26,9 +26,9 @@ class SymbolIterator {
     }
 
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(SymbolIterator, Decl(iteratorSpreadInArray7.ts, 1, 38))
diff --git a/tests/baselines/reference/iteratorSpreadInArray7.types b/tests/baselines/reference/iteratorSpreadInArray7.types
index 6a279838060..f1dd8ebf855 100644
--- a/tests/baselines/reference/iteratorSpreadInArray7.types
+++ b/tests/baselines/reference/iteratorSpreadInArray7.types
@@ -4,9 +4,9 @@ var array: symbol[];
 
 array.concat([...new SymbolIterator]);
 >array.concat([...new SymbolIterator]) : symbol[]
->array.concat : { <U extends symbol[]>(...items: U[]): symbol[]; (...items: symbol[]): symbol[]; }
+>array.concat : (...items: (symbol | symbol[])[]) => symbol[]
 >array : symbol[]
->concat : { <U extends symbol[]>(...items: U[]): symbol[]; (...items: symbol[]): symbol[]; }
+>concat : (...items: (symbol | symbol[])[]) => symbol[]
 >[...new SymbolIterator] : symbol[]
 >...new SymbolIterator : symbol
 >new SymbolIterator : SymbolIterator
diff --git a/tests/baselines/reference/iteratorSpreadInCall11.symbols b/tests/baselines/reference/iteratorSpreadInCall11.symbols
index e504283a3bd..335487813d9 100644
--- a/tests/baselines/reference/iteratorSpreadInCall11.symbols
+++ b/tests/baselines/reference/iteratorSpreadInCall11.symbols
@@ -14,12 +14,12 @@ class SymbolIterator {
 >SymbolIterator : Symbol(SymbolIterator, Decl(iteratorSpreadInCall11.ts, 2, 42))
 
     next() {
->next : Symbol(next, Decl(iteratorSpreadInCall11.ts, 4, 22))
+>next : Symbol(SymbolIterator.next, Decl(iteratorSpreadInCall11.ts, 4, 22))
 
         return {
             value: Symbol(),
 >value : Symbol(value, Decl(iteratorSpreadInCall11.ts, 6, 16))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
 
             done: false
 >done : Symbol(done, Decl(iteratorSpreadInCall11.ts, 7, 28))
@@ -28,9 +28,9 @@ class SymbolIterator {
     }
 
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(SymbolIterator, Decl(iteratorSpreadInCall11.ts, 2, 42))
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/iteratorSpreadInCall12.symbols b/tests/baselines/reference/iteratorSpreadInCall12.symbols
index 4b7f553e969..b0d47deaba0 100644
--- a/tests/baselines/reference/iteratorSpreadInCall12.symbols
+++ b/tests/baselines/reference/iteratorSpreadInCall12.symbols
@@ -17,12 +17,12 @@ class SymbolIterator {
 >SymbolIterator : Symbol(SymbolIterator, Decl(iteratorSpreadInCall12.ts, 4, 1))
 
     next() {
->next : Symbol(next, Decl(iteratorSpreadInCall12.ts, 6, 22))
+>next : Symbol(SymbolIterator.next, Decl(iteratorSpreadInCall12.ts, 6, 22))
 
         return {
             value: Symbol(),
 >value : Symbol(value, Decl(iteratorSpreadInCall12.ts, 8, 16))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
 
             done: false
 >done : Symbol(done, Decl(iteratorSpreadInCall12.ts, 9, 28))
@@ -31,9 +31,9 @@ class SymbolIterator {
     }
 
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(SymbolIterator, Decl(iteratorSpreadInCall12.ts, 4, 1))
@@ -44,7 +44,7 @@ class StringIterator {
 >StringIterator : Symbol(StringIterator, Decl(iteratorSpreadInCall12.ts, 17, 1))
 
     next() {
->next : Symbol(next, Decl(iteratorSpreadInCall12.ts, 19, 22))
+>next : Symbol(StringIterator.next, Decl(iteratorSpreadInCall12.ts, 19, 22))
 
         return {
             value: "",
@@ -57,9 +57,9 @@ class StringIterator {
     }
 
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(StringIterator, Decl(iteratorSpreadInCall12.ts, 17, 1))
diff --git a/tests/baselines/reference/iteratorSpreadInCall3.symbols b/tests/baselines/reference/iteratorSpreadInCall3.symbols
index 402b156002f..eef50a68d38 100644
--- a/tests/baselines/reference/iteratorSpreadInCall3.symbols
+++ b/tests/baselines/reference/iteratorSpreadInCall3.symbols
@@ -11,12 +11,12 @@ class SymbolIterator {
 >SymbolIterator : Symbol(SymbolIterator, Decl(iteratorSpreadInCall3.ts, 2, 32))
 
     next() {
->next : Symbol(next, Decl(iteratorSpreadInCall3.ts, 3, 22))
+>next : Symbol(SymbolIterator.next, Decl(iteratorSpreadInCall3.ts, 3, 22))
 
         return {
             value: Symbol(),
 >value : Symbol(value, Decl(iteratorSpreadInCall3.ts, 5, 16))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
 
             done: false
 >done : Symbol(done, Decl(iteratorSpreadInCall3.ts, 6, 28))
@@ -25,9 +25,9 @@ class SymbolIterator {
     }
 
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(SymbolIterator, Decl(iteratorSpreadInCall3.ts, 2, 32))
diff --git a/tests/baselines/reference/iteratorSpreadInCall5.symbols b/tests/baselines/reference/iteratorSpreadInCall5.symbols
index 855b434f07c..02c44ec3bfa 100644
--- a/tests/baselines/reference/iteratorSpreadInCall5.symbols
+++ b/tests/baselines/reference/iteratorSpreadInCall5.symbols
@@ -12,12 +12,12 @@ class SymbolIterator {
 >SymbolIterator : Symbol(SymbolIterator, Decl(iteratorSpreadInCall5.ts, 2, 43))
 
     next() {
->next : Symbol(next, Decl(iteratorSpreadInCall5.ts, 3, 22))
+>next : Symbol(SymbolIterator.next, Decl(iteratorSpreadInCall5.ts, 3, 22))
 
         return {
             value: Symbol(),
 >value : Symbol(value, Decl(iteratorSpreadInCall5.ts, 5, 16))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
 
             done: false
 >done : Symbol(done, Decl(iteratorSpreadInCall5.ts, 6, 28))
@@ -26,9 +26,9 @@ class SymbolIterator {
     }
 
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(SymbolIterator, Decl(iteratorSpreadInCall5.ts, 2, 43))
@@ -39,7 +39,7 @@ class StringIterator {
 >StringIterator : Symbol(StringIterator, Decl(iteratorSpreadInCall5.ts, 14, 1))
 
     next() {
->next : Symbol(next, Decl(iteratorSpreadInCall5.ts, 16, 22))
+>next : Symbol(StringIterator.next, Decl(iteratorSpreadInCall5.ts, 16, 22))
 
         return {
             value: "",
@@ -52,9 +52,9 @@ class StringIterator {
     }
 
     [Symbol.iterator]() {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return this;
 >this : Symbol(StringIterator, Decl(iteratorSpreadInCall5.ts, 14, 1))
diff --git a/tests/baselines/reference/iteratorSpreadInCall6.errors.txt b/tests/baselines/reference/iteratorSpreadInCall6.errors.txt
index 0a0da985ace..ee9945f7af6 100644
--- a/tests/baselines/reference/iteratorSpreadInCall6.errors.txt
+++ b/tests/baselines/reference/iteratorSpreadInCall6.errors.txt
@@ -1,12 +1,10 @@
 tests/cases/conformance/es6/spread/iteratorSpreadInCall6.ts(1,28): error TS2345: Argument of type 'string' is not assignable to parameter of type 'symbol | number'.
-  Type 'string' is not assignable to type 'number'.
 
 
 ==== tests/cases/conformance/es6/spread/iteratorSpreadInCall6.ts (1 errors) ====
     foo(...new SymbolIterator, ...new StringIterator);
                                ~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type 'string' is not assignable to parameter of type 'symbol | number'.
-!!! error TS2345:   Type 'string' is not assignable to type 'number'.
     
     function foo(...s: (symbol | number)[]) { }
     class SymbolIterator {
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/jsFileCompilationClassMethodContainingArrowFunction.symbols b/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.symbols
index 8db5aa87a5b..0f6ba844290 100644
--- a/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.symbols
+++ b/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.symbols
@@ -4,15 +4,15 @@ class c {
 >c : Symbol(c, Decl(a.js, 0, 0))
 
     method(a) {
->method : Symbol(method, Decl(a.js, 1, 9))
+>method : Symbol(c.method, Decl(a.js, 1, 9))
 >a : Symbol(a, Decl(a.js, 2, 11))
 
         let x = a => this.method(a);
 >x : Symbol(x, Decl(a.js, 3, 11))
 >a : Symbol(a, Decl(a.js, 3, 15))
->this.method : Symbol(method, Decl(a.js, 1, 9))
+>this.method : Symbol(c.method, Decl(a.js, 1, 9))
 >this : Symbol(c, Decl(a.js, 0, 0))
->method : Symbol(method, Decl(a.js, 1, 9))
+>method : Symbol(c.method, Decl(a.js, 1, 9))
 >a : Symbol(a, Decl(a.js, 3, 15))
     }
 }
diff --git a/tests/baselines/reference/jsFileCompilationDecoratorSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationDecoratorSyntax.errors.txt
deleted file mode 100644
index a39d2e1665c..00000000000
--- a/tests/baselines/reference/jsFileCompilationDecoratorSyntax.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
-tests/cases/compiler/a.js(1,1): error TS8017: 'decorators' can only be used in a .ts file.
-
-
-!!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
-==== tests/cases/compiler/a.js (1 errors) ====
-    @internal class C { }
-    ~~~~~~~~~
-!!! error TS8017: 'decorators' can only be used in a .ts file.
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationDecoratorSyntax.symbols b/tests/baselines/reference/jsFileCompilationDecoratorSyntax.symbols
new file mode 100644
index 00000000000..02973b43147
--- /dev/null
+++ b/tests/baselines/reference/jsFileCompilationDecoratorSyntax.symbols
@@ -0,0 +1,4 @@
+=== tests/cases/compiler/a.js ===
+@internal class C { }
+>C : Symbol(C, Decl(a.js, 0, 0))
+
diff --git a/tests/baselines/reference/jsFileCompilationDecoratorSyntax.types b/tests/baselines/reference/jsFileCompilationDecoratorSyntax.types
new file mode 100644
index 00000000000..ee1f14129d5
--- /dev/null
+++ b/tests/baselines/reference/jsFileCompilationDecoratorSyntax.types
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/a.js ===
+@internal class C { }
+>internal : any
+>C : C
+
diff --git a/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt
index 7e67c6325e0..f537941c55c 100644
--- a/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt
@@ -1,12 +1,9 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
-tests/cases/compiler/a.js(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/compiler/a.js(1,1): error TS8003: 'export=' can only be used in a .ts file.
 
 
 !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file.
-==== tests/cases/compiler/a.js (2 errors) ====
+==== tests/cases/compiler/a.js (1 errors) ====
     export = b;
     ~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-    ~~~~~~~~~~~
 !!! error TS8003: 'export=' can only be used in a .ts file.
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.errors.txt b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.errors.txt
index b88c73e0439..21390cc2955 100644
--- a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.errors.txt
@@ -1,13 +1,10 @@
 error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
-tests/cases/compiler/a.ts(2,1): error TS2448: Block-scoped variable 'a' used before its declaration.
 
 
 !!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'.
-==== tests/cases/compiler/a.ts (1 errors) ====
+==== tests/cases/compiler/a.ts (0 errors) ====
     let b = 30;
     a = 10;
-    ~
-!!! error TS2448: Block-scoped variable 'a' used before its declaration.
 ==== tests/cases/compiler/b.js (0 errors) ====
     let a = 10;
     b = 30;
diff --git a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js
new file mode 100644
index 00000000000..e1675ff7131
--- /dev/null
+++ b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js
@@ -0,0 +1,51 @@
+//// [_apply.js]
+
+/**
+ * A faster alternative to `Function#apply`, this function invokes `func`
+ * with the `this` binding of `thisArg` and the arguments of `args`.
+ *
+ * @private
+ * @param {Function} func The function to invoke.
+ * @param {*} thisArg The `this` binding of `func`.
+ * @param {...*} args The arguments to invoke `func` with.
+ * @returns {*} Returns the result of `func`.
+ */
+function apply(func, thisArg, args) {
+    var length = args.length;
+    switch (length) {
+        case 0: return func.call(thisArg);
+        case 1: return func.call(thisArg, args[0]);
+        case 2: return func.call(thisArg, args[0], args[1]);
+        case 3: return func.call(thisArg, args[0], args[1], args[2]);
+    }
+    return func.apply(thisArg, args);
+}
+
+export default apply;
+
+//// [apply.js]
+define("_apply", ["require", "exports"], function (require, exports) {
+    "use strict";
+    /**
+     * A faster alternative to `Function#apply`, this function invokes `func`
+     * with the `this` binding of `thisArg` and the arguments of `args`.
+     *
+     * @private
+     * @param {Function} func The function to invoke.
+     * @param {*} thisArg The `this` binding of `func`.
+     * @param {...*} args The arguments to invoke `func` with.
+     * @returns {*} Returns the result of `func`.
+     */
+    function apply(func, thisArg, args) {
+        var length = args.length;
+        switch (length) {
+            case 0: return func.call(thisArg);
+            case 1: return func.call(thisArg, args[0]);
+            case 2: return func.call(thisArg, args[0], args[1]);
+            case 3: return func.call(thisArg, args[0], args[1], args[2]);
+        }
+        return func.apply(thisArg, args);
+    }
+    exports.__esModule = true;
+    exports["default"] = apply;
+});
diff --git a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.symbols b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.symbols
new file mode 100644
index 00000000000..62e47c8a3c4
--- /dev/null
+++ b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.symbols
@@ -0,0 +1,68 @@
+=== tests/cases/compiler/_apply.js ===
+
+/**
+ * A faster alternative to `Function#apply`, this function invokes `func`
+ * with the `this` binding of `thisArg` and the arguments of `args`.
+ *
+ * @private
+ * @param {Function} func The function to invoke.
+ * @param {*} thisArg The `this` binding of `func`.
+ * @param {...*} args The arguments to invoke `func` with.
+ * @returns {*} Returns the result of `func`.
+ */
+function apply(func, thisArg, args) {
+>apply : Symbol(apply, Decl(_apply.js, 0, 0))
+>func : Symbol(func, Decl(_apply.js, 11, 15))
+>thisArg : Symbol(thisArg, Decl(_apply.js, 11, 20))
+>args : Symbol(args, Decl(_apply.js, 11, 29))
+
+    var length = args.length;
+>length : Symbol(length, Decl(_apply.js, 12, 7))
+>args.length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+>args : Symbol(args, Decl(_apply.js, 11, 29))
+>length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+
+    switch (length) {
+>length : Symbol(length, Decl(_apply.js, 12, 7))
+
+        case 0: return func.call(thisArg);
+>func.call : Symbol(Function.call, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>func : Symbol(func, Decl(_apply.js, 11, 15))
+>call : Symbol(Function.call, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>thisArg : Symbol(thisArg, Decl(_apply.js, 11, 20))
+
+        case 1: return func.call(thisArg, args[0]);
+>func.call : Symbol(Function.call, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>func : Symbol(func, Decl(_apply.js, 11, 15))
+>call : Symbol(Function.call, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>thisArg : Symbol(thisArg, Decl(_apply.js, 11, 20))
+>args : Symbol(args, Decl(_apply.js, 11, 29))
+
+        case 2: return func.call(thisArg, args[0], args[1]);
+>func.call : Symbol(Function.call, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>func : Symbol(func, Decl(_apply.js, 11, 15))
+>call : Symbol(Function.call, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>thisArg : Symbol(thisArg, Decl(_apply.js, 11, 20))
+>args : Symbol(args, Decl(_apply.js, 11, 29))
+>args : Symbol(args, Decl(_apply.js, 11, 29))
+
+        case 3: return func.call(thisArg, args[0], args[1], args[2]);
+>func.call : Symbol(Function.call, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>func : Symbol(func, Decl(_apply.js, 11, 15))
+>call : Symbol(Function.call, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>thisArg : Symbol(thisArg, Decl(_apply.js, 11, 20))
+>args : Symbol(args, Decl(_apply.js, 11, 29))
+>args : Symbol(args, Decl(_apply.js, 11, 29))
+>args : Symbol(args, Decl(_apply.js, 11, 29))
+    }
+    return func.apply(thisArg, args);
+>func.apply : Symbol(Function.apply, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>func : Symbol(func, Decl(_apply.js, 11, 15))
+>apply : Symbol(Function.apply, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>thisArg : Symbol(thisArg, Decl(_apply.js, 11, 20))
+>args : Symbol(args, Decl(_apply.js, 11, 29))
+}
+
+export default apply;
+>apply : Symbol(apply, Decl(_apply.js, 0, 0))
+
diff --git a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.types b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.types
new file mode 100644
index 00000000000..78d0fd1392b
--- /dev/null
+++ b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.types
@@ -0,0 +1,89 @@
+=== tests/cases/compiler/_apply.js ===
+
+/**
+ * A faster alternative to `Function#apply`, this function invokes `func`
+ * with the `this` binding of `thisArg` and the arguments of `args`.
+ *
+ * @private
+ * @param {Function} func The function to invoke.
+ * @param {*} thisArg The `this` binding of `func`.
+ * @param {...*} args The arguments to invoke `func` with.
+ * @returns {*} Returns the result of `func`.
+ */
+function apply(func, thisArg, args) {
+>apply : (func: Function, thisArg: any, ...args: any[]) => any
+>func : Function
+>thisArg : any
+>args : any[]
+
+    var length = args.length;
+>length : number
+>args.length : number
+>args : any[]
+>length : number
+
+    switch (length) {
+>length : number
+
+        case 0: return func.call(thisArg);
+>0 : number
+>func.call(thisArg) : any
+>func.call : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): U; (this: Function, thisArg: any, ...argArray: any[]): any; }
+>func : Function
+>call : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): U; (this: Function, thisArg: any, ...argArray: any[]): any; }
+>thisArg : any
+
+        case 1: return func.call(thisArg, args[0]);
+>1 : number
+>func.call(thisArg, args[0]) : any
+>func.call : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): U; (this: Function, thisArg: any, ...argArray: any[]): any; }
+>func : Function
+>call : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): U; (this: Function, thisArg: any, ...argArray: any[]): any; }
+>thisArg : any
+>args[0] : any
+>args : any[]
+>0 : number
+
+        case 2: return func.call(thisArg, args[0], args[1]);
+>2 : number
+>func.call(thisArg, args[0], args[1]) : any
+>func.call : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): U; (this: Function, thisArg: any, ...argArray: any[]): any; }
+>func : Function
+>call : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): U; (this: Function, thisArg: any, ...argArray: any[]): any; }
+>thisArg : any
+>args[0] : any
+>args : any[]
+>0 : number
+>args[1] : any
+>args : any[]
+>1 : number
+
+        case 3: return func.call(thisArg, args[0], args[1], args[2]);
+>3 : number
+>func.call(thisArg, args[0], args[1], args[2]) : any
+>func.call : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): U; (this: Function, thisArg: any, ...argArray: any[]): any; }
+>func : Function
+>call : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): U; (this: Function, thisArg: any, ...argArray: any[]): any; }
+>thisArg : any
+>args[0] : any
+>args : any[]
+>0 : number
+>args[1] : any
+>args : any[]
+>1 : number
+>args[2] : any
+>args : any[]
+>2 : number
+    }
+    return func.apply(thisArg, args);
+>func.apply(thisArg, args) : any
+>func.apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
+>func : Function
+>apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
+>thisArg : any
+>args : any[]
+}
+
+export default apply;
+>apply : (func: Function, thisArg: any, ...args: any[]) => any
+
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/jsxPreserveWithJsInput.js b/tests/baselines/reference/jsxPreserveWithJsInput.js
new file mode 100644
index 00000000000..2cc59ffa355
--- /dev/null
+++ b/tests/baselines/reference/jsxPreserveWithJsInput.js
@@ -0,0 +1,29 @@
+//// [tests/cases/compiler/jsxPreserveWithJsInput.ts] ////
+
+//// [a.js]
+
+var elemA = 42;
+
+//// [b.jsx]
+var elemB = <b>{"test"}</b>;
+
+//// [c.js]
+var elemC = <c>{42}</c>;
+
+//// [d.ts]
+var elemD = 42;
+
+//// [e.tsx]
+var elemE = <e>{true}</e>;
+
+
+//// [a.js]
+var elemA = 42;
+//// [b.jsx]
+var elemB = <b>{"test"}</b>;
+//// [c.js]
+var elemC = <c>{42}</c>;
+//// [d.js]
+var elemD = 42;
+//// [e.jsx]
+var elemE = <e>{true}</e>;
diff --git a/tests/baselines/reference/jsxPreserveWithJsInput.symbols b/tests/baselines/reference/jsxPreserveWithJsInput.symbols
new file mode 100644
index 00000000000..6ad2f614875
--- /dev/null
+++ b/tests/baselines/reference/jsxPreserveWithJsInput.symbols
@@ -0,0 +1,27 @@
+=== tests/cases/compiler/a.js ===
+
+var elemA = 42;
+>elemA : Symbol(elemA, Decl(a.js, 1, 3))
+
+=== tests/cases/compiler/b.jsx ===
+var elemB = <b>{"test"}</b>;
+>elemB : Symbol(elemB, Decl(b.jsx, 0, 3))
+>b : Symbol(unknown)
+>b : Symbol(unknown)
+
+=== tests/cases/compiler/c.js ===
+var elemC = <c>{42}</c>;
+>elemC : Symbol(elemC, Decl(c.js, 0, 3))
+>c : Symbol(unknown)
+>c : Symbol(unknown)
+
+=== tests/cases/compiler/d.ts ===
+var elemD = 42;
+>elemD : Symbol(elemD, Decl(d.ts, 0, 3))
+
+=== tests/cases/compiler/e.tsx ===
+var elemE = <e>{true}</e>;
+>elemE : Symbol(elemE, Decl(e.tsx, 0, 3))
+>e : Symbol(unknown)
+>e : Symbol(unknown)
+
diff --git a/tests/baselines/reference/jsxPreserveWithJsInput.types b/tests/baselines/reference/jsxPreserveWithJsInput.types
new file mode 100644
index 00000000000..7f4ed6daa2b
--- /dev/null
+++ b/tests/baselines/reference/jsxPreserveWithJsInput.types
@@ -0,0 +1,35 @@
+=== tests/cases/compiler/a.js ===
+
+var elemA = 42;
+>elemA : number
+>42 : number
+
+=== tests/cases/compiler/b.jsx ===
+var elemB = <b>{"test"}</b>;
+>elemB : any
+><b>{"test"}</b> : any
+>b : any
+>"test" : string
+>b : any
+
+=== tests/cases/compiler/c.js ===
+var elemC = <c>{42}</c>;
+>elemC : any
+><c>{42}</c> : any
+>c : any
+>42 : number
+>c : any
+
+=== tests/cases/compiler/d.ts ===
+var elemD = 42;
+>elemD : number
+>42 : number
+
+=== tests/cases/compiler/e.tsx ===
+var elemE = <e>{true}</e>;
+>elemE : any
+><e>{true}</e> : any
+>e : any
+>true : boolean
+>e : any
+
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/jsxReactTestSuite.symbols b/tests/baselines/reference/jsxReactTestSuite.symbols
index cca1dae915b..956b4cff6f7 100644
--- a/tests/baselines/reference/jsxReactTestSuite.symbols
+++ b/tests/baselines/reference/jsxReactTestSuite.symbols
@@ -178,10 +178,10 @@ var x =
 >constructor : Symbol(unknown)
 
 <Namespace.Component />;
->Component : Symbol(unknown)
+>Namespace : Symbol(Namespace, Decl(jsxReactTestSuite.tsx, 6, 11))
 
 <Namespace.DeepNamespace.Component />;
->Component : Symbol(unknown)
+>Namespace : Symbol(Namespace, Decl(jsxReactTestSuite.tsx, 6, 11))
 
 <Component { ... x } y
 >Component : Symbol(Component, Decl(jsxReactTestSuite.tsx, 2, 11))
diff --git a/tests/baselines/reference/jsxReactTestSuite.types b/tests/baselines/reference/jsxReactTestSuite.types
index 88c2c278e59..8bab7ce6e7d 100644
--- a/tests/baselines/reference/jsxReactTestSuite.types
+++ b/tests/baselines/reference/jsxReactTestSuite.types
@@ -235,11 +235,14 @@ var x =
 
 <Namespace.Component />;
 ><Namespace.Component /> : any
+>Namespace.Component : any
 >Namespace : any
 >Component : any
 
 <Namespace.DeepNamespace.Component />;
 ><Namespace.DeepNamespace.Component /> : any
+>Namespace.DeepNamespace.Component : any
+>Namespace.DeepNamespace : any
 >Namespace : any
 >DeepNamespace : any
 >Component : any
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/keepImportsInDts1.js b/tests/baselines/reference/keepImportsInDts1.js
new file mode 100644
index 00000000000..8189ce43088
--- /dev/null
+++ b/tests/baselines/reference/keepImportsInDts1.js
@@ -0,0 +1,16 @@
+//// [tests/cases/compiler/keepImportsInDts1.ts] ////
+
+//// [test.d.ts]
+
+export {}; 
+//// [main.ts]
+import "test"
+
+//// [main.js]
+define(["require", "exports", "test"], function (require, exports) {
+    "use strict";
+});
+
+
+//// [main.d.ts]
+import "test";
diff --git a/tests/baselines/reference/keepImportsInDts1.symbols b/tests/baselines/reference/keepImportsInDts1.symbols
new file mode 100644
index 00000000000..92bd84c2088
--- /dev/null
+++ b/tests/baselines/reference/keepImportsInDts1.symbols
@@ -0,0 +1,6 @@
+=== c:/test.d.ts ===
+
+No type information for this code.export {}; 
+No type information for this code.=== c:/app/main.ts ===
+import "test"
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/keepImportsInDts1.types b/tests/baselines/reference/keepImportsInDts1.types
new file mode 100644
index 00000000000..92bd84c2088
--- /dev/null
+++ b/tests/baselines/reference/keepImportsInDts1.types
@@ -0,0 +1,6 @@
+=== c:/test.d.ts ===
+
+No type information for this code.export {}; 
+No type information for this code.=== c:/app/main.ts ===
+import "test"
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/keepImportsInDts2.js b/tests/baselines/reference/keepImportsInDts2.js
new file mode 100644
index 00000000000..559b4814526
--- /dev/null
+++ b/tests/baselines/reference/keepImportsInDts2.js
@@ -0,0 +1,22 @@
+//// [tests/cases/compiler/keepImportsInDts2.ts] ////
+
+//// [test.ts]
+
+export {};
+//// [main.ts]
+import "./folder/test"
+
+//// [test.js]
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+});
+//// [main.js]
+define(["require", "exports", "./folder/test"], function (require, exports) {
+    "use strict";
+});
+
+
+//// [test.d.ts]
+export {  };
+//// [main.d.ts]
+import "./folder/test";
diff --git a/tests/baselines/reference/keepImportsInDts2.symbols b/tests/baselines/reference/keepImportsInDts2.symbols
new file mode 100644
index 00000000000..ce6f4c7c168
--- /dev/null
+++ b/tests/baselines/reference/keepImportsInDts2.symbols
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/folder/test.ts ===
+
+No type information for this code.export {};
+No type information for this code.=== tests/cases/compiler/main.ts ===
+import "./folder/test"
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/keepImportsInDts2.types b/tests/baselines/reference/keepImportsInDts2.types
new file mode 100644
index 00000000000..ce6f4c7c168
--- /dev/null
+++ b/tests/baselines/reference/keepImportsInDts2.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/folder/test.ts ===
+
+No type information for this code.export {};
+No type information for this code.=== tests/cases/compiler/main.ts ===
+import "./folder/test"
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/keepImportsInDts3.js b/tests/baselines/reference/keepImportsInDts3.js
new file mode 100644
index 00000000000..e48ba693726
--- /dev/null
+++ b/tests/baselines/reference/keepImportsInDts3.js
@@ -0,0 +1,24 @@
+//// [tests/cases/compiler/keepImportsInDts3.ts] ////
+
+//// [test.ts]
+
+export {};
+//// [main.ts]
+import "test"
+
+//// [outputfile.js]
+define("test", ["require", "exports"], function (require, exports) {
+    "use strict";
+});
+define("app/main", ["require", "exports", "test"], function (require, exports) {
+    "use strict";
+});
+
+
+//// [outputfile.d.ts]
+declare module "test" {
+    export {  };
+}
+declare module "app/main" {
+    import "test";
+}
diff --git a/tests/baselines/reference/keepImportsInDts3.symbols b/tests/baselines/reference/keepImportsInDts3.symbols
new file mode 100644
index 00000000000..29c4a4e44b4
--- /dev/null
+++ b/tests/baselines/reference/keepImportsInDts3.symbols
@@ -0,0 +1,6 @@
+=== c:/test.ts ===
+
+No type information for this code.export {};
+No type information for this code.=== c:/app/main.ts ===
+import "test"
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/keepImportsInDts3.types b/tests/baselines/reference/keepImportsInDts3.types
new file mode 100644
index 00000000000..29c4a4e44b4
--- /dev/null
+++ b/tests/baselines/reference/keepImportsInDts3.types
@@ -0,0 +1,6 @@
+=== c:/test.ts ===
+
+No type information for this code.export {};
+No type information for this code.=== c:/app/main.ts ===
+import "test"
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/keepImportsInDts4.js b/tests/baselines/reference/keepImportsInDts4.js
new file mode 100644
index 00000000000..badec87984e
--- /dev/null
+++ b/tests/baselines/reference/keepImportsInDts4.js
@@ -0,0 +1,24 @@
+//// [tests/cases/compiler/keepImportsInDts4.ts] ////
+
+//// [test.ts]
+
+export {};
+//// [main.ts]
+import "./folder/test"
+
+//// [outputfile.js]
+define("folder/test", ["require", "exports"], function (require, exports) {
+    "use strict";
+});
+define("main", ["require", "exports", "folder/test"], function (require, exports) {
+    "use strict";
+});
+
+
+//// [outputfile.d.ts]
+declare module "folder/test" {
+    export {  };
+}
+declare module "main" {
+    import "folder/test";
+}
diff --git a/tests/baselines/reference/keepImportsInDts4.symbols b/tests/baselines/reference/keepImportsInDts4.symbols
new file mode 100644
index 00000000000..ce6f4c7c168
--- /dev/null
+++ b/tests/baselines/reference/keepImportsInDts4.symbols
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/folder/test.ts ===
+
+No type information for this code.export {};
+No type information for this code.=== tests/cases/compiler/main.ts ===
+import "./folder/test"
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/keepImportsInDts4.types b/tests/baselines/reference/keepImportsInDts4.types
new file mode 100644
index 00000000000..ce6f4c7c168
--- /dev/null
+++ b/tests/baselines/reference/keepImportsInDts4.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/folder/test.ts ===
+
+No type information for this code.export {};
+No type information for this code.=== tests/cases/compiler/main.ts ===
+import "./folder/test"
+No type information for this code.
\ No newline at end of file
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/lastPropertyInLiteralWins.errors.txt b/tests/baselines/reference/lastPropertyInLiteralWins.errors.txt
index ab784eae397..51fce2d29d4 100644
--- a/tests/baselines/reference/lastPropertyInLiteralWins.errors.txt
+++ b/tests/baselines/reference/lastPropertyInLiteralWins.errors.txt
@@ -2,7 +2,7 @@ tests/cases/compiler/lastPropertyInLiteralWins.ts(7,6): error TS2345: Argument o
   Types of property 'thunk' are incompatible.
     Type '(num: number) => void' is not assignable to type '(str: string) => void'.
       Types of parameters 'num' and 'str' are incompatible.
-        Type 'number' is not assignable to type 'string'.
+        Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/lastPropertyInLiteralWins.ts(8,5): error TS2300: Duplicate identifier 'thunk'.
 tests/cases/compiler/lastPropertyInLiteralWins.ts(9,5): error TS2300: Duplicate identifier 'thunk'.
 tests/cases/compiler/lastPropertyInLiteralWins.ts(13,5): error TS2300: Duplicate identifier 'thunk'.
@@ -32,7 +32,7 @@ tests/cases/compiler/lastPropertyInLiteralWins.ts(14,5): error TS2300: Duplicate
 !!! error TS2345:   Types of property 'thunk' are incompatible.
 !!! error TS2345:     Type '(num: number) => void' is not assignable to type '(str: string) => void'.
 !!! error TS2345:       Types of parameters 'num' and 'str' are incompatible.
-!!! error TS2345:         Type 'number' is not assignable to type 'string'.
+!!! error TS2345:         Type 'string' is not assignable to type 'number'.
     
     test({ // Should be OK.  Last 'thunk' is of correct type
         thunk: (num: number) => {},
diff --git a/tests/baselines/reference/letDeclarations-access.symbols b/tests/baselines/reference/letDeclarations-access.symbols
index 060ebc80b80..078ad740d20 100644
--- a/tests/baselines/reference/letDeclarations-access.symbols
+++ b/tests/baselines/reference/letDeclarations-access.symbols
@@ -81,7 +81,7 @@ x;
 >x : Symbol(x, Decl(letDeclarations-access.ts, 1, 3))
 
 x.toString();
->x.toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+>x.toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
 >x : Symbol(x, Decl(letDeclarations-access.ts, 1, 3))
->toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+>toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
 
diff --git a/tests/baselines/reference/letIdentifierInElementAccess01.js b/tests/baselines/reference/letIdentifierInElementAccess01.js
new file mode 100644
index 00000000000..5e5e857479c
--- /dev/null
+++ b/tests/baselines/reference/letIdentifierInElementAccess01.js
@@ -0,0 +1,7 @@
+//// [letIdentifierInElementAccess01.ts]
+var let: any = {};
+(let[0] = 100);
+
+//// [letIdentifierInElementAccess01.js]
+var let = {};
+(let[0] = 100);
diff --git a/tests/baselines/reference/letIdentifierInElementAccess01.symbols b/tests/baselines/reference/letIdentifierInElementAccess01.symbols
new file mode 100644
index 00000000000..a655b5703b0
--- /dev/null
+++ b/tests/baselines/reference/letIdentifierInElementAccess01.symbols
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/expressions/elementAccess/letIdentifierInElementAccess01.ts ===
+var let: any = {};
+>let : Symbol(let, Decl(letIdentifierInElementAccess01.ts, 0, 3))
+
+(let[0] = 100);
+>let : Symbol(let, Decl(letIdentifierInElementAccess01.ts, 0, 3))
+
diff --git a/tests/baselines/reference/letIdentifierInElementAccess01.types b/tests/baselines/reference/letIdentifierInElementAccess01.types
new file mode 100644
index 00000000000..187fd7e221c
--- /dev/null
+++ b/tests/baselines/reference/letIdentifierInElementAccess01.types
@@ -0,0 +1,13 @@
+=== tests/cases/conformance/expressions/elementAccess/letIdentifierInElementAccess01.ts ===
+var let: any = {};
+>let : any
+>{} : {}
+
+(let[0] = 100);
+>(let[0] = 100) : number
+>let[0] = 100 : number
+>let[0] : any
+>let : any
+>0 : number
+>100 : number
+
diff --git a/tests/baselines/reference/libdtsFix.symbols b/tests/baselines/reference/libdtsFix.symbols
index 158b0587ec6..5399b7150e4 100644
--- a/tests/baselines/reference/libdtsFix.symbols
+++ b/tests/baselines/reference/libdtsFix.symbols
@@ -3,6 +3,6 @@ interface HTMLElement {
 >HTMLElement : Symbol(HTMLElement, Decl(libdtsFix.ts, 0, 0))
 
     type: string;
->type : Symbol(type, Decl(libdtsFix.ts, 0, 23))
+>type : Symbol(HTMLElement.type, Decl(libdtsFix.ts, 0, 23))
 }
 
diff --git a/tests/baselines/reference/library-reference-1.js b/tests/baselines/reference/library-reference-1.js
new file mode 100644
index 00000000000..e709db72dea
--- /dev/null
+++ b/tests/baselines/reference/library-reference-1.js
@@ -0,0 +1,17 @@
+//// [tests/cases/conformance/references/library-reference-1.ts] ////
+
+//// [index.d.ts]
+
+// We can find typings in the ./types folder
+
+declare var $: { foo(): void };
+
+
+//// [consumer.ts]
+/// <reference types="jquery" />
+$.foo();
+
+
+//// [consumer.js]
+/// <reference types="jquery" />
+$.foo();
diff --git a/tests/baselines/reference/library-reference-1.symbols b/tests/baselines/reference/library-reference-1.symbols
new file mode 100644
index 00000000000..0e848c626c5
--- /dev/null
+++ b/tests/baselines/reference/library-reference-1.symbols
@@ -0,0 +1,16 @@
+=== /consumer.ts ===
+/// <reference types="jquery" />
+$.foo();
+>$.foo : Symbol(foo, Decl(index.d.ts, 3, 16))
+>$ : Symbol($, Decl(index.d.ts, 3, 11))
+>foo : Symbol(foo, Decl(index.d.ts, 3, 16))
+
+=== /types/jquery/index.d.ts ===
+
+// We can find typings in the ./types folder
+
+declare var $: { foo(): void };
+>$ : Symbol($, Decl(index.d.ts, 3, 11))
+>foo : Symbol(foo, Decl(index.d.ts, 3, 16))
+
+
diff --git a/tests/baselines/reference/library-reference-1.trace.json b/tests/baselines/reference/library-reference-1.trace.json
new file mode 100644
index 00000000000..1b8c237dff1
--- /dev/null
+++ b/tests/baselines/reference/library-reference-1.trace.json
@@ -0,0 +1,7 @@
+[
+    "======== Resolving type reference directive 'jquery', containing file '/consumer.ts', root directory '/'. ========",
+    "Resolving with primary search path '/types/'",
+    "File '/types/jquery/package.json' does not exist.",
+    "File '/types/jquery/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'jquery' was successfully resolved to '/types/jquery/index.d.ts', primary: true. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-1.types b/tests/baselines/reference/library-reference-1.types
new file mode 100644
index 00000000000..99133f2f8df
--- /dev/null
+++ b/tests/baselines/reference/library-reference-1.types
@@ -0,0 +1,17 @@
+=== /consumer.ts ===
+/// <reference types="jquery" />
+$.foo();
+>$.foo() : void
+>$.foo : () => void
+>$ : { foo(): void; }
+>foo : () => void
+
+=== /types/jquery/index.d.ts ===
+
+// We can find typings in the ./types folder
+
+declare var $: { foo(): void };
+>$ : { foo(): void; }
+>foo : () => void
+
+
diff --git a/tests/baselines/reference/library-reference-10.js b/tests/baselines/reference/library-reference-10.js
new file mode 100644
index 00000000000..a6dbdfce610
--- /dev/null
+++ b/tests/baselines/reference/library-reference-10.js
@@ -0,0 +1,22 @@
+//// [tests/cases/conformance/references/library-reference-10.ts] ////
+
+//// [package.json]
+
+// package.json in a primary reference can refer to another file
+
+{
+    "typings": "jquery.d.ts"
+}
+
+//// [jquery.d.ts]
+declare var $: { foo(): void };
+
+
+//// [consumer.ts]
+/// <reference types="jquery" />
+$.foo();
+
+
+//// [consumer.js]
+/// <reference types="jquery" />
+$.foo();
diff --git a/tests/baselines/reference/library-reference-10.symbols b/tests/baselines/reference/library-reference-10.symbols
new file mode 100644
index 00000000000..9d0f7e4781e
--- /dev/null
+++ b/tests/baselines/reference/library-reference-10.symbols
@@ -0,0 +1,13 @@
+=== /consumer.ts ===
+/// <reference types="jquery" />
+$.foo();
+>$.foo : Symbol(foo, Decl(jquery.d.ts, 0, 16))
+>$ : Symbol($, Decl(jquery.d.ts, 0, 11))
+>foo : Symbol(foo, Decl(jquery.d.ts, 0, 16))
+
+=== /types/jquery/jquery.d.ts ===
+declare var $: { foo(): void };
+>$ : Symbol($, Decl(jquery.d.ts, 0, 11))
+>foo : Symbol(foo, Decl(jquery.d.ts, 0, 16))
+
+
diff --git a/tests/baselines/reference/library-reference-10.trace.json b/tests/baselines/reference/library-reference-10.trace.json
new file mode 100644
index 00000000000..e6a1918a446
--- /dev/null
+++ b/tests/baselines/reference/library-reference-10.trace.json
@@ -0,0 +1,8 @@
+[
+    "======== Resolving type reference directive 'jquery', containing file '/consumer.ts', root directory '/'. ========",
+    "Resolving with primary search path '/types/'",
+    "Found 'package.json' at '/types/jquery/package.json'.",
+    "'package.json' has 'typings' field 'jquery.d.ts' that references '/types/jquery/jquery.d.ts'.",
+    "File '/types/jquery/jquery.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'jquery' was successfully resolved to '/types/jquery/jquery.d.ts', primary: true. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-10.types b/tests/baselines/reference/library-reference-10.types
new file mode 100644
index 00000000000..42d78f72865
--- /dev/null
+++ b/tests/baselines/reference/library-reference-10.types
@@ -0,0 +1,14 @@
+=== /consumer.ts ===
+/// <reference types="jquery" />
+$.foo();
+>$.foo() : void
+>$.foo : () => void
+>$ : { foo(): void; }
+>foo : () => void
+
+=== /types/jquery/jquery.d.ts ===
+declare var $: { foo(): void };
+>$ : { foo(): void; }
+>foo : () => void
+
+
diff --git a/tests/baselines/reference/library-reference-11.js b/tests/baselines/reference/library-reference-11.js
new file mode 100644
index 00000000000..773fe5a890a
--- /dev/null
+++ b/tests/baselines/reference/library-reference-11.js
@@ -0,0 +1,22 @@
+//// [tests/cases/conformance/references/library-reference-11.ts] ////
+
+//// [package.json]
+
+// package.json in a secondary reference can refer to another file
+
+{
+    "typings": "jquery.d.ts"
+}
+
+//// [jquery.d.ts]
+declare var $: { foo(): void };
+
+
+//// [consumer.ts]
+/// <reference types="jquery" />
+$.foo();
+
+
+//// [consumer.js]
+/// <reference types="jquery" />
+$.foo();
diff --git a/tests/baselines/reference/library-reference-11.symbols b/tests/baselines/reference/library-reference-11.symbols
new file mode 100644
index 00000000000..22b8bdf1b44
--- /dev/null
+++ b/tests/baselines/reference/library-reference-11.symbols
@@ -0,0 +1,13 @@
+=== /a/b/consumer.ts ===
+/// <reference types="jquery" />
+$.foo();
+>$.foo : Symbol(foo, Decl(jquery.d.ts, 0, 16))
+>$ : Symbol($, Decl(jquery.d.ts, 0, 11))
+>foo : Symbol(foo, Decl(jquery.d.ts, 0, 16))
+
+=== /a/node_modules/jquery/jquery.d.ts ===
+declare var $: { foo(): void };
+>$ : Symbol($, Decl(jquery.d.ts, 0, 11))
+>foo : Symbol(foo, Decl(jquery.d.ts, 0, 16))
+
+
diff --git a/tests/baselines/reference/library-reference-11.trace.json b/tests/baselines/reference/library-reference-11.trace.json
new file mode 100644
index 00000000000..e0af1e39c5a
--- /dev/null
+++ b/tests/baselines/reference/library-reference-11.trace.json
@@ -0,0 +1,21 @@
+[
+    "======== 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.",
+    "File '/a/b/node_modules/jquery/package.json' does not exist.",
+    "File '/a/b/node_modules/jquery/index.ts' does not exist.",
+    "File '/a/b/node_modules/jquery/index.d.ts' does not exist.",
+    "File '/a/b/node_modules/@types/jquery.ts' does not exist.",
+    "File '/a/b/node_modules/@types/jquery.d.ts' does not exist.",
+    "File '/a/b/node_modules/@types/jquery/package.json' does not exist.",
+    "File '/a/b/node_modules/@types/jquery/index.ts' does not exist.",
+    "File '/a/b/node_modules/@types/jquery/index.d.ts' does not exist.",
+    "File '/a/node_modules/jquery.ts' does not exist.",
+    "File '/a/node_modules/jquery.d.ts' does not exist.",
+    "Found 'package.json' at '/a/node_modules/jquery/package.json'.",
+    "'package.json' has 'typings' field 'jquery.d.ts' that references '/a/node_modules/jquery/jquery.d.ts'.",
+    "File '/a/node_modules/jquery/jquery.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'jquery' was successfully resolved to '/a/node_modules/jquery/jquery.d.ts', primary: false. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-11.types b/tests/baselines/reference/library-reference-11.types
new file mode 100644
index 00000000000..267ee08e6d6
--- /dev/null
+++ b/tests/baselines/reference/library-reference-11.types
@@ -0,0 +1,14 @@
+=== /a/b/consumer.ts ===
+/// <reference types="jquery" />
+$.foo();
+>$.foo() : void
+>$.foo : () => void
+>$ : { foo(): void; }
+>foo : () => void
+
+=== /a/node_modules/jquery/jquery.d.ts ===
+declare var $: { foo(): void };
+>$ : { foo(): void; }
+>foo : () => void
+
+
diff --git a/tests/baselines/reference/library-reference-12.js b/tests/baselines/reference/library-reference-12.js
new file mode 100644
index 00000000000..42d0f650b50
--- /dev/null
+++ b/tests/baselines/reference/library-reference-12.js
@@ -0,0 +1,22 @@
+//// [tests/cases/conformance/references/library-reference-12.ts] ////
+
+//// [package.json]
+
+// package.json in a secondary reference can refer to another file
+
+{
+    "types": "dist/jquery.d.ts"
+}
+
+//// [jquery.d.ts]
+declare var $: { foo(): void };
+
+
+//// [consumer.ts]
+/// <reference types="jquery" />
+$.foo();
+
+
+//// [consumer.js]
+/// <reference types="jquery" />
+$.foo();
diff --git a/tests/baselines/reference/library-reference-12.symbols b/tests/baselines/reference/library-reference-12.symbols
new file mode 100644
index 00000000000..2e25588bf77
--- /dev/null
+++ b/tests/baselines/reference/library-reference-12.symbols
@@ -0,0 +1,13 @@
+=== /a/b/consumer.ts ===
+/// <reference types="jquery" />
+$.foo();
+>$.foo : Symbol(foo, Decl(jquery.d.ts, 0, 16))
+>$ : Symbol($, Decl(jquery.d.ts, 0, 11))
+>foo : Symbol(foo, Decl(jquery.d.ts, 0, 16))
+
+=== /a/node_modules/jquery/dist/jquery.d.ts ===
+declare var $: { foo(): void };
+>$ : Symbol($, Decl(jquery.d.ts, 0, 11))
+>foo : Symbol(foo, Decl(jquery.d.ts, 0, 16))
+
+
diff --git a/tests/baselines/reference/library-reference-12.trace.json b/tests/baselines/reference/library-reference-12.trace.json
new file mode 100644
index 00000000000..2cdf1f5f20a
--- /dev/null
+++ b/tests/baselines/reference/library-reference-12.trace.json
@@ -0,0 +1,21 @@
+[
+    "======== 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.",
+    "File '/a/b/node_modules/jquery/package.json' does not exist.",
+    "File '/a/b/node_modules/jquery/index.ts' does not exist.",
+    "File '/a/b/node_modules/jquery/index.d.ts' does not exist.",
+    "File '/a/b/node_modules/@types/jquery.ts' does not exist.",
+    "File '/a/b/node_modules/@types/jquery.d.ts' does not exist.",
+    "File '/a/b/node_modules/@types/jquery/package.json' does not exist.",
+    "File '/a/b/node_modules/@types/jquery/index.ts' does not exist.",
+    "File '/a/b/node_modules/@types/jquery/index.d.ts' does not exist.",
+    "File '/a/node_modules/jquery.ts' does not exist.",
+    "File '/a/node_modules/jquery.d.ts' does not exist.",
+    "Found 'package.json' at '/a/node_modules/jquery/package.json'.",
+    "'package.json' has 'types' field 'dist/jquery.d.ts' that references '/a/node_modules/jquery/dist/jquery.d.ts'.",
+    "File '/a/node_modules/jquery/dist/jquery.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'jquery' was successfully resolved to '/a/node_modules/jquery/dist/jquery.d.ts', primary: false. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-12.types b/tests/baselines/reference/library-reference-12.types
new file mode 100644
index 00000000000..2ab9fb8ba95
--- /dev/null
+++ b/tests/baselines/reference/library-reference-12.types
@@ -0,0 +1,14 @@
+=== /a/b/consumer.ts ===
+/// <reference types="jquery" />
+$.foo();
+>$.foo() : void
+>$.foo : () => void
+>$ : { foo(): void; }
+>foo : () => void
+
+=== /a/node_modules/jquery/dist/jquery.d.ts ===
+declare var $: { foo(): void };
+>$ : { foo(): void; }
+>foo : () => void
+
+
diff --git a/tests/baselines/reference/library-reference-13.js b/tests/baselines/reference/library-reference-13.js
new file mode 100644
index 00000000000..be52aba1a39
--- /dev/null
+++ b/tests/baselines/reference/library-reference-13.js
@@ -0,0 +1,12 @@
+//// [tests/cases/conformance/references/library-reference-13.ts] ////
+
+//// [index.d.ts]
+declare var $: { foo(): void };
+
+
+//// [consumer.ts]
+$.foo();
+
+
+//// [consumer.js]
+$.foo();
diff --git a/tests/baselines/reference/library-reference-13.symbols b/tests/baselines/reference/library-reference-13.symbols
new file mode 100644
index 00000000000..04d50373caa
--- /dev/null
+++ b/tests/baselines/reference/library-reference-13.symbols
@@ -0,0 +1,12 @@
+=== /a/b/consumer.ts ===
+$.foo();
+>$.foo : Symbol(foo, Decl(index.d.ts, 0, 16))
+>$ : Symbol($, Decl(index.d.ts, 0, 11))
+>foo : Symbol(foo, Decl(index.d.ts, 0, 16))
+
+=== /a/types/jquery/index.d.ts ===
+declare var $: { foo(): void };
+>$ : Symbol($, Decl(index.d.ts, 0, 11))
+>foo : Symbol(foo, Decl(index.d.ts, 0, 16))
+
+
diff --git a/tests/baselines/reference/library-reference-13.trace.json b/tests/baselines/reference/library-reference-13.trace.json
new file mode 100644
index 00000000000..2133414f414
--- /dev/null
+++ b/tests/baselines/reference/library-reference-13.trace.json
@@ -0,0 +1,7 @@
+[
+    "======== Resolving type reference directive 'jquery', containing file not set, root directory '/a'. ========",
+    "Resolving with primary search path '/a/types/'",
+    "File '/a/types/jquery/package.json' does not exist.",
+    "File '/a/types/jquery/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'jquery' was successfully resolved to '/a/types/jquery/index.d.ts', primary: true. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-13.types b/tests/baselines/reference/library-reference-13.types
new file mode 100644
index 00000000000..b00d778c5b2
--- /dev/null
+++ b/tests/baselines/reference/library-reference-13.types
@@ -0,0 +1,13 @@
+=== /a/b/consumer.ts ===
+$.foo();
+>$.foo() : void
+>$.foo : () => void
+>$ : { foo(): void; }
+>foo : () => void
+
+=== /a/types/jquery/index.d.ts ===
+declare var $: { foo(): void };
+>$ : { foo(): void; }
+>foo : () => void
+
+
diff --git a/tests/baselines/reference/library-reference-14.js b/tests/baselines/reference/library-reference-14.js
new file mode 100644
index 00000000000..0fb5ff04fb9
--- /dev/null
+++ b/tests/baselines/reference/library-reference-14.js
@@ -0,0 +1,13 @@
+//// [tests/cases/conformance/references/library-reference-14.ts] ////
+
+//// [index.d.ts]
+
+declare var $: { foo(): void };
+
+
+//// [consumer.ts]
+$.foo();
+
+
+//// [consumer.js]
+$.foo();
diff --git a/tests/baselines/reference/library-reference-14.symbols b/tests/baselines/reference/library-reference-14.symbols
new file mode 100644
index 00000000000..162afc50ca7
--- /dev/null
+++ b/tests/baselines/reference/library-reference-14.symbols
@@ -0,0 +1,13 @@
+=== /a/b/consumer.ts ===
+$.foo();
+>$.foo : Symbol(foo, Decl(index.d.ts, 1, 16))
+>$ : Symbol($, Decl(index.d.ts, 1, 11))
+>foo : Symbol(foo, Decl(index.d.ts, 1, 16))
+
+=== /a/types/jquery/index.d.ts ===
+
+declare var $: { foo(): void };
+>$ : Symbol($, Decl(index.d.ts, 1, 11))
+>foo : Symbol(foo, Decl(index.d.ts, 1, 16))
+
+
diff --git a/tests/baselines/reference/library-reference-14.trace.json b/tests/baselines/reference/library-reference-14.trace.json
new file mode 100644
index 00000000000..2133414f414
--- /dev/null
+++ b/tests/baselines/reference/library-reference-14.trace.json
@@ -0,0 +1,7 @@
+[
+    "======== Resolving type reference directive 'jquery', containing file not set, root directory '/a'. ========",
+    "Resolving with primary search path '/a/types/'",
+    "File '/a/types/jquery/package.json' does not exist.",
+    "File '/a/types/jquery/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'jquery' was successfully resolved to '/a/types/jquery/index.d.ts', primary: true. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-14.types b/tests/baselines/reference/library-reference-14.types
new file mode 100644
index 00000000000..f4196e10744
--- /dev/null
+++ b/tests/baselines/reference/library-reference-14.types
@@ -0,0 +1,14 @@
+=== /a/b/consumer.ts ===
+$.foo();
+>$.foo() : void
+>$.foo : () => void
+>$ : { foo(): void; }
+>foo : () => void
+
+=== /a/types/jquery/index.d.ts ===
+
+declare var $: { foo(): void };
+>$ : { foo(): void; }
+>foo : () => void
+
+
diff --git a/tests/baselines/reference/library-reference-15.errors.txt b/tests/baselines/reference/library-reference-15.errors.txt
new file mode 100644
index 00000000000..a311633ca76
--- /dev/null
+++ b/tests/baselines/reference/library-reference-15.errors.txt
@@ -0,0 +1,15 @@
+error TS2304: Cannot find name 'jquery'.
+/a/b/consumer.ts(1,1): error TS2304: Cannot find name '$'.
+
+
+!!! error TS2304: Cannot find name 'jquery'.
+==== /a/b/consumer.ts (1 errors) ====
+    $.foo();
+    ~
+!!! error TS2304: Cannot find name '$'.
+    
+==== /a/types/jquery/index.d.ts (0 errors) ====
+    
+    declare var $: { foo(): void };
+    
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-15.js b/tests/baselines/reference/library-reference-15.js
new file mode 100644
index 00000000000..f9aa7038d53
--- /dev/null
+++ b/tests/baselines/reference/library-reference-15.js
@@ -0,0 +1,13 @@
+//// [tests/cases/conformance/references/library-reference-15.ts] ////
+
+//// [index.d.ts]
+
+declare var $: { foo(): void };
+
+
+//// [consumer.ts]
+$.foo();
+
+
+//// [consumer.js]
+$.foo();
diff --git a/tests/baselines/reference/library-reference-15.trace.json b/tests/baselines/reference/library-reference-15.trace.json
new file mode 100644
index 00000000000..9a19d75ffac
--- /dev/null
+++ b/tests/baselines/reference/library-reference-15.trace.json
@@ -0,0 +1,5 @@
+[
+    "======== Resolving type reference directive 'jquery', containing file not set, root directory not set. ========",
+    "Root directory cannot be determined, skipping primary search paths.",
+    "Containing file is not specified and root directory cannot be determined, skipping lookup in 'node_modules' folder."
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-2.js b/tests/baselines/reference/library-reference-2.js
new file mode 100644
index 00000000000..20729db6c60
--- /dev/null
+++ b/tests/baselines/reference/library-reference-2.js
@@ -0,0 +1,22 @@
+//// [tests/cases/conformance/references/library-reference-2.ts] ////
+
+//// [package.json]
+
+// package.json in a primary reference can refer to another file
+
+{
+    "types": "jquery.d.ts"
+}
+
+//// [jquery.d.ts]
+declare var $: { foo(): void };
+
+
+//// [consumer.ts]
+/// <reference types="jquery" />
+$.foo();
+
+
+//// [consumer.js]
+/// <reference types="jquery" />
+$.foo();
diff --git a/tests/baselines/reference/library-reference-2.symbols b/tests/baselines/reference/library-reference-2.symbols
new file mode 100644
index 00000000000..9d0f7e4781e
--- /dev/null
+++ b/tests/baselines/reference/library-reference-2.symbols
@@ -0,0 +1,13 @@
+=== /consumer.ts ===
+/// <reference types="jquery" />
+$.foo();
+>$.foo : Symbol(foo, Decl(jquery.d.ts, 0, 16))
+>$ : Symbol($, Decl(jquery.d.ts, 0, 11))
+>foo : Symbol(foo, Decl(jquery.d.ts, 0, 16))
+
+=== /types/jquery/jquery.d.ts ===
+declare var $: { foo(): void };
+>$ : Symbol($, Decl(jquery.d.ts, 0, 11))
+>foo : Symbol(foo, Decl(jquery.d.ts, 0, 16))
+
+
diff --git a/tests/baselines/reference/library-reference-2.trace.json b/tests/baselines/reference/library-reference-2.trace.json
new file mode 100644
index 00000000000..b5ef5f3e208
--- /dev/null
+++ b/tests/baselines/reference/library-reference-2.trace.json
@@ -0,0 +1,8 @@
+[
+    "======== Resolving type reference directive 'jquery', containing file '/consumer.ts', root directory '/'. ========",
+    "Resolving with primary search path '/types/'",
+    "Found 'package.json' at '/types/jquery/package.json'.",
+    "'package.json' has 'types' field 'jquery.d.ts' that references '/types/jquery/jquery.d.ts'.",
+    "File '/types/jquery/jquery.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'jquery' was successfully resolved to '/types/jquery/jquery.d.ts', primary: true. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-2.types b/tests/baselines/reference/library-reference-2.types
new file mode 100644
index 00000000000..42d78f72865
--- /dev/null
+++ b/tests/baselines/reference/library-reference-2.types
@@ -0,0 +1,14 @@
+=== /consumer.ts ===
+/// <reference types="jquery" />
+$.foo();
+>$.foo() : void
+>$.foo : () => void
+>$ : { foo(): void; }
+>foo : () => void
+
+=== /types/jquery/jquery.d.ts ===
+declare var $: { foo(): void };
+>$ : { foo(): void; }
+>foo : () => void
+
+
diff --git a/tests/baselines/reference/library-reference-3.js b/tests/baselines/reference/library-reference-3.js
new file mode 100644
index 00000000000..6f9ad2d43d2
--- /dev/null
+++ b/tests/baselines/reference/library-reference-3.js
@@ -0,0 +1,16 @@
+//// [tests/cases/conformance/references/library-reference-3.ts] ////
+
+//// [index.d.ts]
+
+// Secondary references are possible
+
+declare var $: { foo(): void };
+
+//// [consumer.ts]
+/// <reference types="jquery" />
+$.foo();
+
+
+//// [consumer.js]
+/// <reference types="jquery" />
+$.foo();
diff --git a/tests/baselines/reference/library-reference-3.symbols b/tests/baselines/reference/library-reference-3.symbols
new file mode 100644
index 00000000000..a1785fd77c9
--- /dev/null
+++ b/tests/baselines/reference/library-reference-3.symbols
@@ -0,0 +1,15 @@
+=== /src/consumer.ts ===
+/// <reference types="jquery" />
+$.foo();
+>$.foo : Symbol(foo, Decl(index.d.ts, 3, 16))
+>$ : Symbol($, Decl(index.d.ts, 3, 11))
+>foo : Symbol(foo, Decl(index.d.ts, 3, 16))
+
+=== /src/node_modules/jquery/index.d.ts ===
+
+// Secondary references are possible
+
+declare var $: { foo(): void };
+>$ : Symbol($, Decl(index.d.ts, 3, 11))
+>foo : Symbol(foo, Decl(index.d.ts, 3, 16))
+
diff --git a/tests/baselines/reference/library-reference-3.trace.json b/tests/baselines/reference/library-reference-3.trace.json
new file mode 100644
index 00000000000..30dbbc3fca4
--- /dev/null
+++ b/tests/baselines/reference/library-reference-3.trace.json
@@ -0,0 +1,10 @@
+[
+    "======== Resolving type reference directive 'jquery', containing file '/src/consumer.ts', root directory '/src'. ========",
+    "Resolving with primary search path '/src/types/'",
+    "File '/src/types/jquery/package.json' does not exist.",
+    "File '/src/types/jquery/index.d.ts' does not exist.",
+    "Resolving with primary search path '/src/node_modules/'",
+    "File '/src/node_modules/jquery/package.json' does not exist.",
+    "File '/src/node_modules/jquery/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'jquery' was successfully resolved to '/src/node_modules/jquery/index.d.ts', primary: true. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-3.types b/tests/baselines/reference/library-reference-3.types
new file mode 100644
index 00000000000..ed7da59525f
--- /dev/null
+++ b/tests/baselines/reference/library-reference-3.types
@@ -0,0 +1,16 @@
+=== /src/consumer.ts ===
+/// <reference types="jquery" />
+$.foo();
+>$.foo() : void
+>$.foo : () => void
+>$ : { foo(): void; }
+>foo : () => void
+
+=== /src/node_modules/jquery/index.d.ts ===
+
+// Secondary references are possible
+
+declare var $: { foo(): void };
+>$ : { foo(): void; }
+>foo : () => void
+
diff --git a/tests/baselines/reference/library-reference-4.js b/tests/baselines/reference/library-reference-4.js
new file mode 100644
index 00000000000..39e4b1d73a5
--- /dev/null
+++ b/tests/baselines/reference/library-reference-4.js
@@ -0,0 +1,27 @@
+//// [tests/cases/conformance/references/library-reference-4.ts] ////
+
+//// [index.d.ts]
+
+// Secondary references may be duplicated if they agree in content
+
+/// <reference types="alpha" />
+declare var foo: any;
+
+//// [index.d.ts]
+declare var alpha: any;
+
+//// [index.d.ts]
+/// <reference types="alpha" />
+declare var bar: any;
+
+//// [index.d.ts]
+declare var alpha: any;
+
+//// [root.ts]
+/// <reference types="foo" />
+/// <reference types="bar" />
+
+
+//// [root.js]
+/// <reference types="foo" />
+/// <reference types="bar" />
diff --git a/tests/baselines/reference/library-reference-4.symbols b/tests/baselines/reference/library-reference-4.symbols
new file mode 100644
index 00000000000..f7c082a946d
--- /dev/null
+++ b/tests/baselines/reference/library-reference-4.symbols
@@ -0,0 +1,21 @@
+=== /src/root.ts ===
+/// <reference types="foo" />
+No type information for this code./// <reference types="bar" />
+No type information for this code.
+No type information for this code.=== /node_modules/foo/index.d.ts ===
+
+// Secondary references may be duplicated if they agree in content
+
+/// <reference types="alpha" />
+declare var foo: any;
+>foo : Symbol(foo, Decl(index.d.ts, 4, 11))
+
+=== /node_modules/foo/node_modules/alpha/index.d.ts ===
+declare var alpha: any;
+>alpha : Symbol(alpha, Decl(index.d.ts, 0, 11))
+
+=== /node_modules/bar/index.d.ts ===
+/// <reference types="alpha" />
+declare var bar: any;
+>bar : Symbol(bar, Decl(index.d.ts, 1, 11))
+
diff --git a/tests/baselines/reference/library-reference-4.trace.json b/tests/baselines/reference/library-reference-4.trace.json
new file mode 100644
index 00000000000..90b6eb7b01d
--- /dev/null
+++ b/tests/baselines/reference/library-reference-4.trace.json
@@ -0,0 +1,90 @@
+[
+    "======== Resolving type reference directive 'foo', containing file '/src/root.ts', root directory '/src'. ========",
+    "Resolving with primary search path '/src/types/'",
+    "File '/src/types/foo/package.json' does not exist.",
+    "File '/src/types/foo/index.d.ts' does not exist.",
+    "Resolving with primary search path '/src/node_modules/'",
+    "File '/src/node_modules/foo/package.json' does not exist.",
+    "File '/src/node_modules/foo/index.d.ts' does not exist.",
+    "Resolving with primary search path '/src/node_modules/@types/'",
+    "File '/src/node_modules/@types/foo/package.json' does not exist.",
+    "File '/src/node_modules/@types/foo/index.d.ts' does not exist.",
+    "Looking up in 'node_modules' folder, initial location '/src'",
+    "File '/src/node_modules/foo.ts' does not exist.",
+    "File '/src/node_modules/foo.d.ts' does not exist.",
+    "File '/src/node_modules/foo/package.json' does not exist.",
+    "File '/src/node_modules/foo/index.ts' does not exist.",
+    "File '/src/node_modules/foo/index.d.ts' does not exist.",
+    "File '/src/node_modules/@types/foo.ts' does not exist.",
+    "File '/src/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/src/node_modules/@types/foo/package.json' does not exist.",
+    "File '/src/node_modules/@types/foo/index.ts' does not exist.",
+    "File '/src/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/node_modules/foo.ts' does not exist.",
+    "File '/node_modules/foo.d.ts' does not exist.",
+    "File '/node_modules/foo/package.json' does not exist.",
+    "File '/node_modules/foo/index.ts' does not exist.",
+    "File '/node_modules/foo/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'foo' was successfully resolved to '/node_modules/foo/index.d.ts', primary: false. ========",
+    "======== Resolving type reference directive 'bar', containing file '/src/root.ts', root directory '/src'. ========",
+    "Resolving with primary search path '/src/types/'",
+    "File '/src/types/bar/package.json' does not exist.",
+    "File '/src/types/bar/index.d.ts' does not exist.",
+    "Resolving with primary search path '/src/node_modules/'",
+    "File '/src/node_modules/bar/package.json' does not exist.",
+    "File '/src/node_modules/bar/index.d.ts' does not exist.",
+    "Resolving with primary search path '/src/node_modules/@types/'",
+    "File '/src/node_modules/@types/bar/package.json' does not exist.",
+    "File '/src/node_modules/@types/bar/index.d.ts' does not exist.",
+    "Looking up in 'node_modules' folder, initial location '/src'",
+    "File '/src/node_modules/bar.ts' does not exist.",
+    "File '/src/node_modules/bar.d.ts' does not exist.",
+    "File '/src/node_modules/bar/package.json' does not exist.",
+    "File '/src/node_modules/bar/index.ts' does not exist.",
+    "File '/src/node_modules/bar/index.d.ts' does not exist.",
+    "File '/src/node_modules/@types/bar.ts' does not exist.",
+    "File '/src/node_modules/@types/bar.d.ts' does not exist.",
+    "File '/src/node_modules/@types/bar/package.json' does not exist.",
+    "File '/src/node_modules/@types/bar/index.ts' does not exist.",
+    "File '/src/node_modules/@types/bar/index.d.ts' does not exist.",
+    "File '/node_modules/bar.ts' does not exist.",
+    "File '/node_modules/bar.d.ts' does not exist.",
+    "File '/node_modules/bar/package.json' does not exist.",
+    "File '/node_modules/bar/index.ts' does not exist.",
+    "File '/node_modules/bar/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'bar' was successfully resolved to '/node_modules/bar/index.d.ts', primary: false. ========",
+    "======== Resolving type reference directive 'alpha', containing file '/node_modules/foo/index.d.ts', root directory '/src'. ========",
+    "Resolving with primary search path '/src/types/'",
+    "File '/src/types/alpha/package.json' does not exist.",
+    "File '/src/types/alpha/index.d.ts' does not exist.",
+    "Resolving with primary search path '/src/node_modules/'",
+    "File '/src/node_modules/alpha/package.json' does not exist.",
+    "File '/src/node_modules/alpha/index.d.ts' does not exist.",
+    "Resolving with primary search path '/src/node_modules/@types/'",
+    "File '/src/node_modules/@types/alpha/package.json' does not exist.",
+    "File '/src/node_modules/@types/alpha/index.d.ts' does not exist.",
+    "Looking up in 'node_modules' folder, initial location '/node_modules/foo'",
+    "File '/node_modules/foo/node_modules/alpha.ts' does not exist.",
+    "File '/node_modules/foo/node_modules/alpha.d.ts' does not exist.",
+    "File '/node_modules/foo/node_modules/alpha/package.json' does not exist.",
+    "File '/node_modules/foo/node_modules/alpha/index.ts' does not exist.",
+    "File '/node_modules/foo/node_modules/alpha/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'alpha' was successfully resolved to '/node_modules/foo/node_modules/alpha/index.d.ts', primary: false. ========",
+    "======== Resolving type reference directive 'alpha', containing file '/node_modules/bar/index.d.ts', root directory '/src'. ========",
+    "Resolving with primary search path '/src/types/'",
+    "File '/src/types/alpha/package.json' does not exist.",
+    "File '/src/types/alpha/index.d.ts' does not exist.",
+    "Resolving with primary search path '/src/node_modules/'",
+    "File '/src/node_modules/alpha/package.json' does not exist.",
+    "File '/src/node_modules/alpha/index.d.ts' does not exist.",
+    "Resolving with primary search path '/src/node_modules/@types/'",
+    "File '/src/node_modules/@types/alpha/package.json' does not exist.",
+    "File '/src/node_modules/@types/alpha/index.d.ts' does not exist.",
+    "Looking up in 'node_modules' folder, initial location '/node_modules/bar'",
+    "File '/node_modules/bar/node_modules/alpha.ts' does not exist.",
+    "File '/node_modules/bar/node_modules/alpha.d.ts' does not exist.",
+    "File '/node_modules/bar/node_modules/alpha/package.json' does not exist.",
+    "File '/node_modules/bar/node_modules/alpha/index.ts' does not exist.",
+    "File '/node_modules/bar/node_modules/alpha/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'alpha' was successfully resolved to '/node_modules/bar/node_modules/alpha/index.d.ts', primary: false. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-4.types b/tests/baselines/reference/library-reference-4.types
new file mode 100644
index 00000000000..a0a7d370b4c
--- /dev/null
+++ b/tests/baselines/reference/library-reference-4.types
@@ -0,0 +1,21 @@
+=== /src/root.ts ===
+/// <reference types="foo" />
+No type information for this code./// <reference types="bar" />
+No type information for this code.
+No type information for this code.=== /node_modules/foo/index.d.ts ===
+
+// Secondary references may be duplicated if they agree in content
+
+/// <reference types="alpha" />
+declare var foo: any;
+>foo : any
+
+=== /node_modules/foo/node_modules/alpha/index.d.ts ===
+declare var alpha: any;
+>alpha : any
+
+=== /node_modules/bar/index.d.ts ===
+/// <reference types="alpha" />
+declare var bar: any;
+>bar : any
+
diff --git a/tests/baselines/reference/library-reference-5.errors.txt b/tests/baselines/reference/library-reference-5.errors.txt
new file mode 100644
index 00000000000..ea571cad1a3
--- /dev/null
+++ b/tests/baselines/reference/library-reference-5.errors.txt
@@ -0,0 +1,26 @@
+/node_modules/bar/index.d.ts(1,1): message TS4090: Conflicting library definitions for 'alpha' found at '/node_modules/bar/node_modules/alpha/index.d.ts' and '/node_modules/foo/node_modules/alpha/index.d.ts'. Copy the correct file to the 'typings' folder to resolve this conflict.
+
+
+==== /src/root.ts (0 errors) ====
+    /// <reference types="foo" />
+    /// <reference types="bar" />
+    
+==== /node_modules/foo/index.d.ts (0 errors) ====
+    
+    // Secondary references may not be duplicated if they disagree in content
+    
+    /// <reference types="alpha" />
+    declare var foo: any;
+    
+==== /node_modules/foo/node_modules/alpha/index.d.ts (0 errors) ====
+    declare var alpha: any;
+    
+==== /node_modules/bar/index.d.ts (1 errors) ====
+    /// <reference types="alpha" />
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! message TS4090: Conflicting library definitions for 'alpha' found at 'index.d.ts' and 'index.d.ts'. Copy the correct file to the 'typings' folder to resolve this conflict.
+    declare var bar: any;
+    
+==== /node_modules/bar/node_modules/alpha/index.d.ts (0 errors) ====
+    declare var alpha: {};
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-5.js b/tests/baselines/reference/library-reference-5.js
new file mode 100644
index 00000000000..40d2131920e
--- /dev/null
+++ b/tests/baselines/reference/library-reference-5.js
@@ -0,0 +1,27 @@
+//// [tests/cases/conformance/references/library-reference-5.ts] ////
+
+//// [index.d.ts]
+
+// Secondary references may not be duplicated if they disagree in content
+
+/// <reference types="alpha" />
+declare var foo: any;
+
+//// [index.d.ts]
+declare var alpha: any;
+
+//// [index.d.ts]
+/// <reference types="alpha" />
+declare var bar: any;
+
+//// [index.d.ts]
+declare var alpha: {};
+
+//// [root.ts]
+/// <reference types="foo" />
+/// <reference types="bar" />
+
+
+//// [root.js]
+/// <reference types="foo" />
+/// <reference types="bar" />
diff --git a/tests/baselines/reference/library-reference-5.trace.json b/tests/baselines/reference/library-reference-5.trace.json
new file mode 100644
index 00000000000..272009782b5
--- /dev/null
+++ b/tests/baselines/reference/library-reference-5.trace.json
@@ -0,0 +1,58 @@
+[
+    "======== Resolving type reference directive 'foo', containing file '/src/root.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/foo.ts' does not exist.",
+    "File '/src/node_modules/foo.d.ts' does not exist.",
+    "File '/src/node_modules/foo/package.json' does not exist.",
+    "File '/src/node_modules/foo/index.ts' does not exist.",
+    "File '/src/node_modules/foo/index.d.ts' does not exist.",
+    "File '/src/node_modules/@types/foo.ts' does not exist.",
+    "File '/src/node_modules/@types/foo.d.ts' does not exist.",
+    "File '/src/node_modules/@types/foo/package.json' does not exist.",
+    "File '/src/node_modules/@types/foo/index.ts' does not exist.",
+    "File '/src/node_modules/@types/foo/index.d.ts' does not exist.",
+    "File '/node_modules/foo.ts' does not exist.",
+    "File '/node_modules/foo.d.ts' does not exist.",
+    "File '/node_modules/foo/package.json' does not exist.",
+    "File '/node_modules/foo/index.ts' does not exist.",
+    "File '/node_modules/foo/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'foo' was successfully resolved to '/node_modules/foo/index.d.ts', primary: false. ========",
+    "======== Resolving type reference directive 'bar', containing file '/src/root.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/bar.ts' does not exist.",
+    "File '/src/node_modules/bar.d.ts' does not exist.",
+    "File '/src/node_modules/bar/package.json' does not exist.",
+    "File '/src/node_modules/bar/index.ts' does not exist.",
+    "File '/src/node_modules/bar/index.d.ts' does not exist.",
+    "File '/src/node_modules/@types/bar.ts' does not exist.",
+    "File '/src/node_modules/@types/bar.d.ts' does not exist.",
+    "File '/src/node_modules/@types/bar/package.json' does not exist.",
+    "File '/src/node_modules/@types/bar/index.ts' does not exist.",
+    "File '/src/node_modules/@types/bar/index.d.ts' does not exist.",
+    "File '/node_modules/bar.ts' does not exist.",
+    "File '/node_modules/bar.d.ts' does not exist.",
+    "File '/node_modules/bar/package.json' does not exist.",
+    "File '/node_modules/bar/index.ts' does not exist.",
+    "File '/node_modules/bar/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'bar' was successfully resolved to '/node_modules/bar/index.d.ts', primary: false. ========",
+    "======== Resolving type reference directive 'alpha', containing file '/node_modules/foo/index.d.ts', root directory not set. ========",
+    "Root directory cannot be determined, skipping primary search paths.",
+    "Looking up in 'node_modules' folder, initial location '/node_modules/foo'",
+    "File '/node_modules/foo/node_modules/alpha.ts' does not exist.",
+    "File '/node_modules/foo/node_modules/alpha.d.ts' does not exist.",
+    "File '/node_modules/foo/node_modules/alpha/package.json' does not exist.",
+    "File '/node_modules/foo/node_modules/alpha/index.ts' does not exist.",
+    "File '/node_modules/foo/node_modules/alpha/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'alpha' was successfully resolved to '/node_modules/foo/node_modules/alpha/index.d.ts', primary: false. ========",
+    "======== Resolving type reference directive 'alpha', containing file '/node_modules/bar/index.d.ts', root directory not set. ========",
+    "Root directory cannot be determined, skipping primary search paths.",
+    "Looking up in 'node_modules' folder, initial location '/node_modules/bar'",
+    "File '/node_modules/bar/node_modules/alpha.ts' does not exist.",
+    "File '/node_modules/bar/node_modules/alpha.d.ts' does not exist.",
+    "File '/node_modules/bar/node_modules/alpha/package.json' does not exist.",
+    "File '/node_modules/bar/node_modules/alpha/index.ts' does not exist.",
+    "File '/node_modules/bar/node_modules/alpha/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'alpha' was successfully resolved to '/node_modules/bar/node_modules/alpha/index.d.ts', primary: false. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-6.js b/tests/baselines/reference/library-reference-6.js
new file mode 100644
index 00000000000..d78a3a131a1
--- /dev/null
+++ b/tests/baselines/reference/library-reference-6.js
@@ -0,0 +1,16 @@
+//// [tests/cases/conformance/references/library-reference-6.ts] ////
+
+//// [index.d.ts]
+
+// The primary lookup folder is relative to tsconfig.json, if present
+
+declare var alpha: { a: string };
+
+//// [foo.ts]
+/// <reference types="alpha" />
+var x: string = alpha.a;
+
+
+//// [foo.js]
+/// <reference types="alpha" />
+var x = alpha.a;
diff --git a/tests/baselines/reference/library-reference-6.symbols b/tests/baselines/reference/library-reference-6.symbols
new file mode 100644
index 00000000000..328842f804c
--- /dev/null
+++ b/tests/baselines/reference/library-reference-6.symbols
@@ -0,0 +1,16 @@
+=== /src/foo.ts ===
+/// <reference types="alpha" />
+var x: string = alpha.a;
+>x : Symbol(x, Decl(foo.ts, 1, 3))
+>alpha.a : Symbol(a, Decl(index.d.ts, 3, 20))
+>alpha : Symbol(alpha, Decl(index.d.ts, 3, 11))
+>a : Symbol(a, Decl(index.d.ts, 3, 20))
+
+=== /types/alpha/index.d.ts ===
+
+// The primary lookup folder is relative to tsconfig.json, if present
+
+declare var alpha: { a: string };
+>alpha : Symbol(alpha, Decl(index.d.ts, 3, 11))
+>a : Symbol(a, Decl(index.d.ts, 3, 20))
+
diff --git a/tests/baselines/reference/library-reference-6.trace.json b/tests/baselines/reference/library-reference-6.trace.json
new file mode 100644
index 00000000000..426214fdcfc
--- /dev/null
+++ b/tests/baselines/reference/library-reference-6.trace.json
@@ -0,0 +1,7 @@
+[
+    "======== Resolving type reference directive 'alpha', containing file '/src/foo.ts', root directory '/'. ========",
+    "Resolving with primary search path '/types/'",
+    "File '/types/alpha/package.json' does not exist.",
+    "File '/types/alpha/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'alpha' was successfully resolved to '/types/alpha/index.d.ts', primary: true. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-6.types b/tests/baselines/reference/library-reference-6.types
new file mode 100644
index 00000000000..2f6c1e49b89
--- /dev/null
+++ b/tests/baselines/reference/library-reference-6.types
@@ -0,0 +1,16 @@
+=== /src/foo.ts ===
+/// <reference types="alpha" />
+var x: string = alpha.a;
+>x : string
+>alpha.a : string
+>alpha : { a: string; }
+>a : string
+
+=== /types/alpha/index.d.ts ===
+
+// The primary lookup folder is relative to tsconfig.json, if present
+
+declare var alpha: { a: string };
+>alpha : { a: string; }
+>a : string
+
diff --git a/tests/baselines/reference/library-reference-7.js b/tests/baselines/reference/library-reference-7.js
new file mode 100644
index 00000000000..f1ef6ca4eab
--- /dev/null
+++ b/tests/baselines/reference/library-reference-7.js
@@ -0,0 +1,16 @@
+//// [tests/cases/conformance/references/library-reference-7.ts] ////
+
+//// [index.d.ts]
+
+// Secondary references are possible
+
+declare var $: { foo(): void };
+
+//// [consumer.ts]
+/// <reference types="jquery" />
+$.foo();
+
+
+//// [consumer.js]
+/// <reference types="jquery" />
+$.foo();
diff --git a/tests/baselines/reference/library-reference-7.symbols b/tests/baselines/reference/library-reference-7.symbols
new file mode 100644
index 00000000000..a1785fd77c9
--- /dev/null
+++ b/tests/baselines/reference/library-reference-7.symbols
@@ -0,0 +1,15 @@
+=== /src/consumer.ts ===
+/// <reference types="jquery" />
+$.foo();
+>$.foo : Symbol(foo, Decl(index.d.ts, 3, 16))
+>$ : Symbol($, Decl(index.d.ts, 3, 11))
+>foo : Symbol(foo, Decl(index.d.ts, 3, 16))
+
+=== /src/node_modules/jquery/index.d.ts ===
+
+// Secondary references are possible
+
+declare var $: { foo(): void };
+>$ : Symbol($, Decl(index.d.ts, 3, 11))
+>foo : Symbol(foo, Decl(index.d.ts, 3, 16))
+
diff --git a/tests/baselines/reference/library-reference-7.trace.json b/tests/baselines/reference/library-reference-7.trace.json
new file mode 100644
index 00000000000..419fe6d055d
--- /dev/null
+++ b/tests/baselines/reference/library-reference-7.trace.json
@@ -0,0 +1,11 @@
+[
+    "======== 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.",
+    "File '/src/node_modules/jquery/package.json' does not exist.",
+    "File '/src/node_modules/jquery/index.ts' does not exist.",
+    "File '/src/node_modules/jquery/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'jquery' was successfully resolved to '/src/node_modules/jquery/index.d.ts', primary: false. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-7.types b/tests/baselines/reference/library-reference-7.types
new file mode 100644
index 00000000000..ed7da59525f
--- /dev/null
+++ b/tests/baselines/reference/library-reference-7.types
@@ -0,0 +1,16 @@
+=== /src/consumer.ts ===
+/// <reference types="jquery" />
+$.foo();
+>$.foo() : void
+>$.foo : () => void
+>$ : { foo(): void; }
+>foo : () => void
+
+=== /src/node_modules/jquery/index.d.ts ===
+
+// Secondary references are possible
+
+declare var $: { foo(): void };
+>$ : { foo(): void; }
+>foo : () => void
+
diff --git a/tests/baselines/reference/library-reference-8.js b/tests/baselines/reference/library-reference-8.js
new file mode 100644
index 00000000000..a48b226cb62
--- /dev/null
+++ b/tests/baselines/reference/library-reference-8.js
@@ -0,0 +1,24 @@
+//// [tests/cases/conformance/references/library-reference-8.ts] ////
+
+//// [index.d.ts]
+
+// Don't crash in circular library reference situations
+
+/// <reference types="beta" />
+declare var alpha: { a: string };
+
+//// [index.d.ts]
+/// <reference types="alpha" />
+declare var beta: { b: string };
+
+//// [foo.ts]
+/// <reference types="alpha" />
+/// <reference types="beta" />
+var x: string = alpha.a + beta.b;
+
+
+
+//// [foo.js]
+/// <reference types="alpha" />
+/// <reference types="beta" />
+var x = alpha.a + beta.b;
diff --git a/tests/baselines/reference/library-reference-8.symbols b/tests/baselines/reference/library-reference-8.symbols
new file mode 100644
index 00000000000..299a60f1b1d
--- /dev/null
+++ b/tests/baselines/reference/library-reference-8.symbols
@@ -0,0 +1,28 @@
+=== /foo.ts ===
+/// <reference types="alpha" />
+/// <reference types="beta" />
+var x: string = alpha.a + beta.b;
+>x : Symbol(x, Decl(foo.ts, 2, 3))
+>alpha.a : Symbol(a, Decl(index.d.ts, 4, 20))
+>alpha : Symbol(alpha, Decl(index.d.ts, 4, 11))
+>a : Symbol(a, Decl(index.d.ts, 4, 20))
+>beta.b : Symbol(b, Decl(index.d.ts, 1, 19))
+>beta : Symbol(beta, Decl(index.d.ts, 1, 11))
+>b : Symbol(b, Decl(index.d.ts, 1, 19))
+
+
+=== /types/alpha/index.d.ts ===
+
+// Don't crash in circular library reference situations
+
+/// <reference types="beta" />
+declare var alpha: { a: string };
+>alpha : Symbol(alpha, Decl(index.d.ts, 4, 11))
+>a : Symbol(a, Decl(index.d.ts, 4, 20))
+
+=== /types/beta/index.d.ts ===
+/// <reference types="alpha" />
+declare var beta: { b: string };
+>beta : Symbol(beta, Decl(index.d.ts, 1, 11))
+>b : Symbol(b, Decl(index.d.ts, 1, 19))
+
diff --git a/tests/baselines/reference/library-reference-8.trace.json b/tests/baselines/reference/library-reference-8.trace.json
new file mode 100644
index 00000000000..b1dc6478688
--- /dev/null
+++ b/tests/baselines/reference/library-reference-8.trace.json
@@ -0,0 +1,22 @@
+[
+    "======== Resolving type reference directive 'alpha', containing file '/foo.ts', root directory '/'. ========",
+    "Resolving with primary search path '/types/'",
+    "File '/types/alpha/package.json' does not exist.",
+    "File '/types/alpha/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'alpha' was successfully resolved to '/types/alpha/index.d.ts', primary: true. ========",
+    "======== Resolving type reference directive 'beta', containing file '/foo.ts', root directory '/'. ========",
+    "Resolving with primary search path '/types/'",
+    "File '/types/beta/package.json' does not exist.",
+    "File '/types/beta/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'beta' was successfully resolved to '/types/beta/index.d.ts', primary: true. ========",
+    "======== Resolving type reference directive 'beta', containing file '/types/alpha/index.d.ts', root directory '/'. ========",
+    "Resolving with primary search path '/types/'",
+    "File '/types/beta/package.json' does not exist.",
+    "File '/types/beta/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'beta' was successfully resolved to '/types/beta/index.d.ts', primary: true. ========",
+    "======== Resolving type reference directive 'alpha', containing file '/types/beta/index.d.ts', root directory '/'. ========",
+    "Resolving with primary search path '/types/'",
+    "File '/types/alpha/package.json' does not exist.",
+    "File '/types/alpha/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'alpha' was successfully resolved to '/types/alpha/index.d.ts', primary: true. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-8.types b/tests/baselines/reference/library-reference-8.types
new file mode 100644
index 00000000000..b0780d90f63
--- /dev/null
+++ b/tests/baselines/reference/library-reference-8.types
@@ -0,0 +1,29 @@
+=== /foo.ts ===
+/// <reference types="alpha" />
+/// <reference types="beta" />
+var x: string = alpha.a + beta.b;
+>x : string
+>alpha.a + beta.b : string
+>alpha.a : string
+>alpha : { a: string; }
+>a : string
+>beta.b : string
+>beta : { b: string; }
+>b : string
+
+
+=== /types/alpha/index.d.ts ===
+
+// Don't crash in circular library reference situations
+
+/// <reference types="beta" />
+declare var alpha: { a: string };
+>alpha : { a: string; }
+>a : string
+
+=== /types/beta/index.d.ts ===
+/// <reference types="alpha" />
+declare var beta: { b: string };
+>beta : { b: string; }
+>b : string
+
diff --git a/tests/baselines/reference/library-reference-9.js b/tests/baselines/reference/library-reference-9.js
new file mode 100644
index 00000000000..ccb3b3213a9
--- /dev/null
+++ b/tests/baselines/reference/library-reference-9.js
@@ -0,0 +1,16 @@
+//// [tests/cases/conformance/references/library-reference-9.ts] ////
+
+//// [index.d.ts]
+
+// Use types search path
+
+declare var alpha: { a: string };
+
+//// [foo.ts]
+/// <reference types="alpha" />
+var x: string = alpha.a;
+
+
+//// [foo.js]
+/// <reference types="alpha" />
+var x = alpha.a;
diff --git a/tests/baselines/reference/library-reference-9.symbols b/tests/baselines/reference/library-reference-9.symbols
new file mode 100644
index 00000000000..62cde2117df
--- /dev/null
+++ b/tests/baselines/reference/library-reference-9.symbols
@@ -0,0 +1,16 @@
+=== /base/src/foo.ts ===
+/// <reference types="alpha" />
+var x: string = alpha.a;
+>x : Symbol(x, Decl(foo.ts, 1, 3))
+>alpha.a : Symbol(a, Decl(index.d.ts, 3, 20))
+>alpha : Symbol(alpha, Decl(index.d.ts, 3, 11))
+>a : Symbol(a, Decl(index.d.ts, 3, 20))
+
+=== /share/typelib/alpha/index.d.ts ===
+
+// Use types search path
+
+declare var alpha: { a: string };
+>alpha : Symbol(alpha, Decl(index.d.ts, 3, 11))
+>a : Symbol(a, Decl(index.d.ts, 3, 20))
+
diff --git a/tests/baselines/reference/library-reference-9.trace.json b/tests/baselines/reference/library-reference-9.trace.json
new file mode 100644
index 00000000000..e2fdfdc0550
--- /dev/null
+++ b/tests/baselines/reference/library-reference-9.trace.json
@@ -0,0 +1,7 @@
+[
+    "======== Resolving type reference directive 'alpha', containing file '/base/src/foo.ts', root directory '/'. ========",
+    "Resolving with primary search path '/share/typelib'",
+    "File '/share/typelib/alpha/package.json' does not exist.",
+    "File '/share/typelib/alpha/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'alpha' was successfully resolved to '/share/typelib/alpha/index.d.ts', primary: true. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/library-reference-9.types b/tests/baselines/reference/library-reference-9.types
new file mode 100644
index 00000000000..8df2179e249
--- /dev/null
+++ b/tests/baselines/reference/library-reference-9.types
@@ -0,0 +1,16 @@
+=== /base/src/foo.ts ===
+/// <reference types="alpha" />
+var x: string = alpha.a;
+>x : string
+>alpha.a : string
+>alpha : { a: string; }
+>a : string
+
+=== /share/typelib/alpha/index.d.ts ===
+
+// Use types search path
+
+declare var alpha: { a: string };
+>alpha : { a: string; }
+>a : string
+
diff --git a/tests/baselines/reference/library_DatePrototypeProperties.symbols b/tests/baselines/reference/library_DatePrototypeProperties.symbols
index 8aa5f81f2f5..4601adcde18 100644
--- a/tests/baselines/reference/library_DatePrototypeProperties.symbols
+++ b/tests/baselines/reference/library_DatePrototypeProperties.symbols
@@ -4,308 +4,308 @@
 Date.prototype.constructor;
 >Date.prototype.constructor : Symbol(Object.constructor, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >constructor : Symbol(Object.constructor, Decl(lib.d.ts, --, --))
 
 Date.prototype.toString();
 >Date.prototype.toString : Symbol(Date.toString, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >toString : Symbol(Date.toString, Decl(lib.d.ts, --, --))
 
 Date.prototype.toDateString();
 >Date.prototype.toDateString : Symbol(Date.toDateString, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >toDateString : Symbol(Date.toDateString, Decl(lib.d.ts, --, --))
 
 Date.prototype.toTimeString();
 >Date.prototype.toTimeString : Symbol(Date.toTimeString, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >toTimeString : Symbol(Date.toTimeString, Decl(lib.d.ts, --, --))
 
 Date.prototype.toLocaleString();
->Date.prototype.toLocaleString : Symbol(Date.toLocaleString, Decl(lib.d.ts, --, --))
+>Date.prototype.toLocaleString : Symbol(Date.toLocaleString, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->toLocaleString : Symbol(Date.toLocaleString, Decl(lib.d.ts, --, --))
+>toLocaleString : Symbol(Date.toLocaleString, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 Date.prototype.toLocaleDateString();
->Date.prototype.toLocaleDateString : Symbol(Date.toLocaleDateString, Decl(lib.d.ts, --, --))
+>Date.prototype.toLocaleDateString : Symbol(Date.toLocaleDateString, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->toLocaleDateString : Symbol(Date.toLocaleDateString, Decl(lib.d.ts, --, --))
+>toLocaleDateString : Symbol(Date.toLocaleDateString, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 Date.prototype.toLocaleTimeString();
->Date.prototype.toLocaleTimeString : Symbol(Date.toLocaleTimeString, Decl(lib.d.ts, --, --))
+>Date.prototype.toLocaleTimeString : Symbol(Date.toLocaleTimeString, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->toLocaleTimeString : Symbol(Date.toLocaleTimeString, Decl(lib.d.ts, --, --))
+>toLocaleTimeString : Symbol(Date.toLocaleTimeString, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 Date.prototype.valueOf();
 >Date.prototype.valueOf : Symbol(Date.valueOf, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >valueOf : Symbol(Date.valueOf, Decl(lib.d.ts, --, --))
 
 Date.prototype.getTime();
 >Date.prototype.getTime : Symbol(Date.getTime, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >getTime : Symbol(Date.getTime, Decl(lib.d.ts, --, --))
 
 Date.prototype.getFullYear();
 >Date.prototype.getFullYear : Symbol(Date.getFullYear, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >getFullYear : Symbol(Date.getFullYear, Decl(lib.d.ts, --, --))
 
 Date.prototype.getUTCFullYear();
 >Date.prototype.getUTCFullYear : Symbol(Date.getUTCFullYear, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >getUTCFullYear : Symbol(Date.getUTCFullYear, Decl(lib.d.ts, --, --))
 
 Date.prototype.getMonth();
 >Date.prototype.getMonth : Symbol(Date.getMonth, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >getMonth : Symbol(Date.getMonth, Decl(lib.d.ts, --, --))
 
 Date.prototype.getUTCMonth();
 >Date.prototype.getUTCMonth : Symbol(Date.getUTCMonth, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >getUTCMonth : Symbol(Date.getUTCMonth, Decl(lib.d.ts, --, --))
 
 Date.prototype.getDate();
 >Date.prototype.getDate : Symbol(Date.getDate, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >getDate : Symbol(Date.getDate, Decl(lib.d.ts, --, --))
 
 Date.prototype.getUTCDate();
 >Date.prototype.getUTCDate : Symbol(Date.getUTCDate, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >getUTCDate : Symbol(Date.getUTCDate, Decl(lib.d.ts, --, --))
 
 Date.prototype.getDay();
 >Date.prototype.getDay : Symbol(Date.getDay, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >getDay : Symbol(Date.getDay, Decl(lib.d.ts, --, --))
 
 Date.prototype.getUTCDay();
 >Date.prototype.getUTCDay : Symbol(Date.getUTCDay, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >getUTCDay : Symbol(Date.getUTCDay, Decl(lib.d.ts, --, --))
 
 Date.prototype.getHours();
 >Date.prototype.getHours : Symbol(Date.getHours, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >getHours : Symbol(Date.getHours, Decl(lib.d.ts, --, --))
 
 Date.prototype.getUTCHours();
 >Date.prototype.getUTCHours : Symbol(Date.getUTCHours, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >getUTCHours : Symbol(Date.getUTCHours, Decl(lib.d.ts, --, --))
 
 Date.prototype.getMinutes();
 >Date.prototype.getMinutes : Symbol(Date.getMinutes, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >getMinutes : Symbol(Date.getMinutes, Decl(lib.d.ts, --, --))
 
 Date.prototype.getUTCMinutes();
 >Date.prototype.getUTCMinutes : Symbol(Date.getUTCMinutes, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >getUTCMinutes : Symbol(Date.getUTCMinutes, Decl(lib.d.ts, --, --))
 
 Date.prototype.getSeconds();
 >Date.prototype.getSeconds : Symbol(Date.getSeconds, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >getSeconds : Symbol(Date.getSeconds, Decl(lib.d.ts, --, --))
 
 Date.prototype.getUTCSeconds();
 >Date.prototype.getUTCSeconds : Symbol(Date.getUTCSeconds, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >getUTCSeconds : Symbol(Date.getUTCSeconds, Decl(lib.d.ts, --, --))
 
 Date.prototype.getMilliseconds();
 >Date.prototype.getMilliseconds : Symbol(Date.getMilliseconds, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >getMilliseconds : Symbol(Date.getMilliseconds, Decl(lib.d.ts, --, --))
 
 Date.prototype.getUTCMilliseconds();
 >Date.prototype.getUTCMilliseconds : Symbol(Date.getUTCMilliseconds, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >getUTCMilliseconds : Symbol(Date.getUTCMilliseconds, Decl(lib.d.ts, --, --))
 
 Date.prototype.getTimezoneOffset();
 >Date.prototype.getTimezoneOffset : Symbol(Date.getTimezoneOffset, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >getTimezoneOffset : Symbol(Date.getTimezoneOffset, Decl(lib.d.ts, --, --))
 
 Date.prototype.setTime(0);
 >Date.prototype.setTime : Symbol(Date.setTime, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >setTime : Symbol(Date.setTime, Decl(lib.d.ts, --, --))
 
 Date.prototype.setMilliseconds(0);
 >Date.prototype.setMilliseconds : Symbol(Date.setMilliseconds, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >setMilliseconds : Symbol(Date.setMilliseconds, Decl(lib.d.ts, --, --))
 
 Date.prototype.setUTCMilliseconds(0);
 >Date.prototype.setUTCMilliseconds : Symbol(Date.setUTCMilliseconds, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >setUTCMilliseconds : Symbol(Date.setUTCMilliseconds, Decl(lib.d.ts, --, --))
 
 Date.prototype.setSeconds(0);
 >Date.prototype.setSeconds : Symbol(Date.setSeconds, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >setSeconds : Symbol(Date.setSeconds, Decl(lib.d.ts, --, --))
 
 Date.prototype.setUTCSeconds(0);
 >Date.prototype.setUTCSeconds : Symbol(Date.setUTCSeconds, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >setUTCSeconds : Symbol(Date.setUTCSeconds, Decl(lib.d.ts, --, --))
 
 Date.prototype.setMinutes(0);
 >Date.prototype.setMinutes : Symbol(Date.setMinutes, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >setMinutes : Symbol(Date.setMinutes, Decl(lib.d.ts, --, --))
 
 Date.prototype.setUTCMinutes(0);
 >Date.prototype.setUTCMinutes : Symbol(Date.setUTCMinutes, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >setUTCMinutes : Symbol(Date.setUTCMinutes, Decl(lib.d.ts, --, --))
 
 Date.prototype.setHours(0);
 >Date.prototype.setHours : Symbol(Date.setHours, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >setHours : Symbol(Date.setHours, Decl(lib.d.ts, --, --))
 
 Date.prototype.setUTCHours(0);
 >Date.prototype.setUTCHours : Symbol(Date.setUTCHours, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >setUTCHours : Symbol(Date.setUTCHours, Decl(lib.d.ts, --, --))
 
 Date.prototype.setDate(0);
 >Date.prototype.setDate : Symbol(Date.setDate, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >setDate : Symbol(Date.setDate, Decl(lib.d.ts, --, --))
 
 Date.prototype.setUTCDate(0);
 >Date.prototype.setUTCDate : Symbol(Date.setUTCDate, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >setUTCDate : Symbol(Date.setUTCDate, Decl(lib.d.ts, --, --))
 
 Date.prototype.setMonth(0);
 >Date.prototype.setMonth : Symbol(Date.setMonth, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >setMonth : Symbol(Date.setMonth, Decl(lib.d.ts, --, --))
 
 Date.prototype.setUTCMonth(0);
 >Date.prototype.setUTCMonth : Symbol(Date.setUTCMonth, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >setUTCMonth : Symbol(Date.setUTCMonth, Decl(lib.d.ts, --, --))
 
 Date.prototype.setFullYear(0);
 >Date.prototype.setFullYear : Symbol(Date.setFullYear, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >setFullYear : Symbol(Date.setFullYear, Decl(lib.d.ts, --, --))
 
 Date.prototype.setUTCFullYear(0);
 >Date.prototype.setUTCFullYear : Symbol(Date.setUTCFullYear, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >setUTCFullYear : Symbol(Date.setUTCFullYear, Decl(lib.d.ts, --, --))
 
 Date.prototype.toUTCString();
 >Date.prototype.toUTCString : Symbol(Date.toUTCString, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >toUTCString : Symbol(Date.toUTCString, Decl(lib.d.ts, --, --))
 
 Date.prototype.toISOString();
 >Date.prototype.toISOString : Symbol(Date.toISOString, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >toISOString : Symbol(Date.toISOString, Decl(lib.d.ts, --, --))
 
 Date.prototype.toJSON(null);
 >Date.prototype.toJSON : Symbol(Date.toJSON, Decl(lib.d.ts, --, --))
 >Date.prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(DateConstructor.prototype, Decl(lib.d.ts, --, --))
 >toJSON : Symbol(Date.toJSON, Decl(lib.d.ts, --, --))
 
diff --git a/tests/baselines/reference/library_DatePrototypeProperties.types b/tests/baselines/reference/library_DatePrototypeProperties.types
index 79aad91245b..c048b9833d6 100644
--- a/tests/baselines/reference/library_DatePrototypeProperties.types
+++ b/tests/baselines/reference/library_DatePrototypeProperties.types
@@ -34,27 +34,27 @@ Date.prototype.toTimeString();
 
 Date.prototype.toLocaleString();
 >Date.prototype.toLocaleString() : string
->Date.prototype.toLocaleString : () => string
+>Date.prototype.toLocaleString : { (): string; (locales?: string[], options?: Intl.DateTimeFormatOptions): string; (locale?: string, options?: Intl.DateTimeFormatOptions): string; }
 >Date.prototype : Date
 >Date : DateConstructor
 >prototype : Date
->toLocaleString : () => string
+>toLocaleString : { (): string; (locales?: string[], options?: Intl.DateTimeFormatOptions): string; (locale?: string, options?: Intl.DateTimeFormatOptions): string; }
 
 Date.prototype.toLocaleDateString();
 >Date.prototype.toLocaleDateString() : string
->Date.prototype.toLocaleDateString : () => string
+>Date.prototype.toLocaleDateString : { (): string; (locales?: string[], options?: Intl.DateTimeFormatOptions): string; (locale?: string, options?: Intl.DateTimeFormatOptions): string; }
 >Date.prototype : Date
 >Date : DateConstructor
 >prototype : Date
->toLocaleDateString : () => string
+>toLocaleDateString : { (): string; (locales?: string[], options?: Intl.DateTimeFormatOptions): string; (locale?: string, options?: Intl.DateTimeFormatOptions): string; }
 
 Date.prototype.toLocaleTimeString();
 >Date.prototype.toLocaleTimeString() : string
->Date.prototype.toLocaleTimeString : () => string
+>Date.prototype.toLocaleTimeString : { (): string; (locale?: string[], options?: Intl.DateTimeFormatOptions): string; (locale?: string, options?: Intl.DateTimeFormatOptions): string; }
 >Date.prototype : Date
 >Date : DateConstructor
 >prototype : Date
->toLocaleTimeString : () => string
+>toLocaleTimeString : { (): string; (locale?: string[], options?: Intl.DateTimeFormatOptions): string; (locale?: string, options?: Intl.DateTimeFormatOptions): string; }
 
 Date.prototype.valueOf();
 >Date.prototype.valueOf() : number
diff --git a/tests/baselines/reference/library_StringSlice.symbols b/tests/baselines/reference/library_StringSlice.symbols
index de79b8755ac..bdf661c5ab2 100644
--- a/tests/baselines/reference/library_StringSlice.symbols
+++ b/tests/baselines/reference/library_StringSlice.symbols
@@ -3,21 +3,21 @@
 String.prototype.slice();
 >String.prototype.slice : Symbol(String.slice, Decl(lib.d.ts, --, --))
 >String.prototype : Symbol(StringConstructor.prototype, Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(StringConstructor.prototype, Decl(lib.d.ts, --, --))
 >slice : Symbol(String.slice, Decl(lib.d.ts, --, --))
 
 String.prototype.slice(0);
 >String.prototype.slice : Symbol(String.slice, Decl(lib.d.ts, --, --))
 >String.prototype : Symbol(StringConstructor.prototype, Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(StringConstructor.prototype, Decl(lib.d.ts, --, --))
 >slice : Symbol(String.slice, Decl(lib.d.ts, --, --))
 
 String.prototype.slice(0,1);
 >String.prototype.slice : Symbol(String.slice, Decl(lib.d.ts, --, --))
 >String.prototype : Symbol(StringConstructor.prototype, Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(StringConstructor.prototype, Decl(lib.d.ts, --, --))
 >slice : Symbol(String.slice, Decl(lib.d.ts, --, --))
 
diff --git a/tests/baselines/reference/listFailure.symbols b/tests/baselines/reference/listFailure.symbols
index 53b1acf09ee..d582c46633e 100644
--- a/tests/baselines/reference/listFailure.symbols
+++ b/tests/baselines/reference/listFailure.symbols
@@ -6,14 +6,14 @@ module Editor {
 >Buffer : Symbol(Buffer, Decl(listFailure.ts, 0, 15))
 
     	lines: List<Line> = ListMakeHead<Line>();
->lines : Symbol(lines, Decl(listFailure.ts, 2, 25))
+>lines : Symbol(Buffer.lines, Decl(listFailure.ts, 2, 25))
 >List : Symbol(List, Decl(listFailure.ts, 24, 5))
 >Line : Symbol(Line, Decl(listFailure.ts, 37, 5))
 >ListMakeHead : Symbol(ListMakeHead, Decl(listFailure.ts, 16, 5))
 >Line : Symbol(Line, Decl(listFailure.ts, 37, 5))
         
         addLine(lineText: string): List<Line> {
->addLine : Symbol(addLine, Decl(listFailure.ts, 3, 46))
+>addLine : Symbol(Buffer.addLine, Decl(listFailure.ts, 3, 46))
 >lineText : Symbol(lineText, Decl(listFailure.ts, 5, 16))
 >List : Symbol(List, Decl(listFailure.ts, 24, 5))
 >Line : Symbol(Line, Decl(listFailure.ts, 37, 5))
@@ -26,9 +26,9 @@ module Editor {
             var lineEntry = this.lines.add(line);
 >lineEntry : Symbol(lineEntry, Decl(listFailure.ts, 8, 15))
 >this.lines.add : Symbol(List.add, Decl(listFailure.ts, 27, 29))
->this.lines : Symbol(lines, Decl(listFailure.ts, 2, 25))
+>this.lines : Symbol(Buffer.lines, Decl(listFailure.ts, 2, 25))
 >this : Symbol(Buffer, Decl(listFailure.ts, 0, 15))
->lines : Symbol(lines, Decl(listFailure.ts, 2, 25))
+>lines : Symbol(Buffer.lines, Decl(listFailure.ts, 2, 25))
 >add : Symbol(List.add, Decl(listFailure.ts, 27, 29))
 >line : Symbol(line, Decl(listFailure.ts, 7, 15))
 
@@ -75,32 +75,32 @@ module Editor {
 >T : Symbol(T, Decl(listFailure.ts, 26, 15))
 
         public next: List<T>; 
->next : Symbol(next, Decl(listFailure.ts, 26, 19))
+>next : Symbol(List.next, Decl(listFailure.ts, 26, 19))
 >List : Symbol(List, Decl(listFailure.ts, 24, 5))
 >T : Symbol(T, Decl(listFailure.ts, 26, 15))
 
         add(data: T): List<T> {
->add : Symbol(add, Decl(listFailure.ts, 27, 29))
+>add : Symbol(List.add, Decl(listFailure.ts, 27, 29))
 >data : Symbol(data, Decl(listFailure.ts, 29, 12))
 >T : Symbol(T, Decl(listFailure.ts, 26, 15))
 >List : Symbol(List, Decl(listFailure.ts, 24, 5))
 >T : Symbol(T, Decl(listFailure.ts, 26, 15))
 
             this.next = ListMakeEntry(data);
->this.next : Symbol(next, Decl(listFailure.ts, 26, 19))
+>this.next : Symbol(List.next, Decl(listFailure.ts, 26, 19))
 >this : Symbol(List, Decl(listFailure.ts, 24, 5))
->next : Symbol(next, Decl(listFailure.ts, 26, 19))
+>next : Symbol(List.next, Decl(listFailure.ts, 26, 19))
 >ListMakeEntry : Symbol(ListMakeEntry, Decl(listFailure.ts, 20, 5))
 >data : Symbol(data, Decl(listFailure.ts, 29, 12))
 
             return this.next;
->this.next : Symbol(next, Decl(listFailure.ts, 26, 19))
+>this.next : Symbol(List.next, Decl(listFailure.ts, 26, 19))
 >this : Symbol(List, Decl(listFailure.ts, 24, 5))
->next : Symbol(next, Decl(listFailure.ts, 26, 19))
+>next : Symbol(List.next, Decl(listFailure.ts, 26, 19))
         }
 
         popEntry(head: List<T>): List<T> {
->popEntry : Symbol(popEntry, Decl(listFailure.ts, 32, 9))
+>popEntry : Symbol(List.popEntry, Decl(listFailure.ts, 32, 9))
 >head : Symbol(head, Decl(listFailure.ts, 34, 17))
 >List : Symbol(List, Decl(listFailure.ts, 24, 5))
 >T : Symbol(T, Decl(listFailure.ts, 26, 15))
@@ -109,9 +109,9 @@ module Editor {
 
             return (ListRemoveEntry(this.next));
 >ListRemoveEntry : Symbol(ListRemoveEntry, Decl(listFailure.ts, 12, 5))
->this.next : Symbol(next, Decl(listFailure.ts, 26, 19))
+>this.next : Symbol(List.next, Decl(listFailure.ts, 26, 19))
 >this : Symbol(List, Decl(listFailure.ts, 24, 5))
->next : Symbol(next, Decl(listFailure.ts, 26, 19))
+>next : Symbol(List.next, Decl(listFailure.ts, 26, 19))
         }      
     }
 
diff --git a/tests/baselines/reference/literals-negative.errors.txt b/tests/baselines/reference/literals-negative.errors.txt
index d783e5dfa02..2024066d9f2 100644
--- a/tests/baselines/reference/literals-negative.errors.txt
+++ b/tests/baselines/reference/literals-negative.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/literals-negative.ts(5,9): error TS2352: Neither type 'number' nor type 'boolean' is assignable to the other.
+tests/cases/compiler/literals-negative.ts(5,9): error TS2352: Type 'number' cannot be converted to type 'boolean'.
 
 
 ==== tests/cases/compiler/literals-negative.ts (1 errors) ====
@@ -8,7 +8,7 @@ tests/cases/compiler/literals-negative.ts(5,9): error TS2352: Neither type 'numb
     var s = <string>(null);
     var b = <boolean>(n);
             ~~~~~~~~~~~~
-!!! error TS2352: Neither type 'number' nor type 'boolean' is assignable to the other.
+!!! error TS2352: Type 'number' cannot be converted to type 'boolean'.
     
     function isVoid() : void { }
     
diff --git a/tests/baselines/reference/literalsInComputedProperties1.js b/tests/baselines/reference/literalsInComputedProperties1.js
index 4c28a5e9083..77eb70c2396 100644
--- a/tests/baselines/reference/literalsInComputedProperties1.js
+++ b/tests/baselines/reference/literalsInComputedProperties1.js
@@ -80,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/localClassesInLoop_ES6.symbols b/tests/baselines/reference/localClassesInLoop_ES6.symbols
index 17e8102ad05..f70373a4d73 100644
--- a/tests/baselines/reference/localClassesInLoop_ES6.symbols
+++ b/tests/baselines/reference/localClassesInLoop_ES6.symbols
@@ -17,9 +17,9 @@ for (let x = 0; x < 2; ++x) {
 >C : Symbol(C, Decl(localClassesInLoop_ES6.ts, 5, 29))
 
     data.push(() => C);
->data.push : Symbol(Array.push, Decl(lib.d.ts, --, --))
+>data.push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --))
 >data : Symbol(data, Decl(localClassesInLoop_ES6.ts, 4, 3))
->push : Symbol(Array.push, Decl(lib.d.ts, --, --))
+>push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --))
 >C : Symbol(C, Decl(localClassesInLoop_ES6.ts, 5, 29))
 }
 
diff --git a/tests/baselines/reference/localTypes1.symbols b/tests/baselines/reference/localTypes1.symbols
index 53d4191ae61..3ee47086b26 100644
--- a/tests/baselines/reference/localTypes1.symbols
+++ b/tests/baselines/reference/localTypes1.symbols
@@ -15,14 +15,14 @@ function f1() {
 >C : Symbol(C, Decl(localTypes1.ts, 4, 5))
 
         x: E;
->x : Symbol(x, Decl(localTypes1.ts, 5, 13))
+>x : Symbol(C.x, Decl(localTypes1.ts, 5, 13))
 >E : Symbol(E, Decl(localTypes1.ts, 1, 15))
     }
     interface I {
 >I : Symbol(I, Decl(localTypes1.ts, 7, 5))
 
         x: E;
->x : Symbol(x, Decl(localTypes1.ts, 8, 17))
+>x : Symbol(I.x, Decl(localTypes1.ts, 8, 17))
 >E : Symbol(E, Decl(localTypes1.ts, 1, 15))
     }
     type A = I[];
@@ -64,14 +64,14 @@ function f2() {
 >C : Symbol(C, Decl(localTypes1.ts, 21, 9))
 
             x: E;
->x : Symbol(x, Decl(localTypes1.ts, 22, 17))
+>x : Symbol(C.x, Decl(localTypes1.ts, 22, 17))
 >E : Symbol(E, Decl(localTypes1.ts, 18, 18))
         }
         interface I {
 >I : Symbol(I, Decl(localTypes1.ts, 24, 9))
 
             x: E;
->x : Symbol(x, Decl(localTypes1.ts, 25, 21))
+>x : Symbol(I.x, Decl(localTypes1.ts, 25, 21))
 >E : Symbol(E, Decl(localTypes1.ts, 18, 18))
         }
         type A = I[];
@@ -118,14 +118,14 @@ function f3(b: boolean) {
 >C : Symbol(C, Decl(localTypes1.ts, 41, 16))
 
                 x: E;
->x : Symbol(x, Decl(localTypes1.ts, 42, 21))
+>x : Symbol(C.x, Decl(localTypes1.ts, 42, 21))
 >E : Symbol(E, Decl(localTypes1.ts, 37, 15))
             }
             interface I {
 >I : Symbol(I, Decl(localTypes1.ts, 44, 13))
 
                 x: E;
->x : Symbol(x, Decl(localTypes1.ts, 45, 25))
+>x : Symbol(I.x, Decl(localTypes1.ts, 45, 25))
 >E : Symbol(E, Decl(localTypes1.ts, 37, 15))
             }
             type A = I[];
@@ -153,14 +153,14 @@ function f3(b: boolean) {
 >A : Symbol(A, Decl(localTypes1.ts, 53, 14))
 
                 x: E;
->x : Symbol(x, Decl(localTypes1.ts, 54, 21))
+>x : Symbol(A.x, Decl(localTypes1.ts, 54, 21))
 >E : Symbol(E, Decl(localTypes1.ts, 37, 15))
             }
             interface J {
 >J : Symbol(J, Decl(localTypes1.ts, 56, 13))
 
                 x: E;
->x : Symbol(x, Decl(localTypes1.ts, 57, 25))
+>x : Symbol(J.x, Decl(localTypes1.ts, 57, 25))
 >E : Symbol(E, Decl(localTypes1.ts, 37, 15))
             }
             type C = J[];
@@ -204,7 +204,7 @@ function f5() {
 >C : Symbol(C, Decl(localTypes1.ts, 72, 9))
 
             x: E;
->x : Symbol(x, Decl(localTypes1.ts, 73, 17))
+>x : Symbol(C.x, Decl(localTypes1.ts, 73, 17))
 >E : Symbol(E, Decl(localTypes1.ts, 69, 26))
         }
         return new C();
@@ -225,7 +225,7 @@ function f5() {
 >C : Symbol(C, Decl(localTypes1.ts, 81, 9))
 
             x: E;
->x : Symbol(x, Decl(localTypes1.ts, 82, 17))
+>x : Symbol(C.x, Decl(localTypes1.ts, 82, 17))
 >E : Symbol(E, Decl(localTypes1.ts, 78, 20))
         }
         return new C();
@@ -249,12 +249,12 @@ class A {
 >C : Symbol(C, Decl(localTypes1.ts, 93, 9))
 
             x: E;
->x : Symbol(x, Decl(localTypes1.ts, 94, 17))
+>x : Symbol(C.x, Decl(localTypes1.ts, 94, 17))
 >E : Symbol(E, Decl(localTypes1.ts, 90, 19))
         }
     }
     m() {
->m : Symbol(m, Decl(localTypes1.ts, 97, 5))
+>m : Symbol(A.m, Decl(localTypes1.ts, 97, 5))
 
         enum E {
 >E : Symbol(E, Decl(localTypes1.ts, 98, 9))
@@ -268,14 +268,14 @@ class A {
 >C : Symbol(C, Decl(localTypes1.ts, 101, 9))
 
             x: E;
->x : Symbol(x, Decl(localTypes1.ts, 102, 17))
+>x : Symbol(C.x, Decl(localTypes1.ts, 102, 17))
 >E : Symbol(E, Decl(localTypes1.ts, 98, 9))
         }
         return new C();
 >C : Symbol(C, Decl(localTypes1.ts, 101, 9))
     }
     get p() {
->p : Symbol(p, Decl(localTypes1.ts, 106, 5))
+>p : Symbol(A.p, Decl(localTypes1.ts, 106, 5))
 
         enum E {
 >E : Symbol(E, Decl(localTypes1.ts, 107, 13))
@@ -289,7 +289,7 @@ class A {
 >C : Symbol(C, Decl(localTypes1.ts, 110, 9))
 
             x: E;
->x : Symbol(x, Decl(localTypes1.ts, 111, 17))
+>x : Symbol(C.x, Decl(localTypes1.ts, 111, 17))
 >E : Symbol(E, Decl(localTypes1.ts, 107, 13))
         }
         return new C();
@@ -304,7 +304,7 @@ function f6() {
 >A : Symbol(A, Decl(localTypes1.ts, 118, 15))
 
         a: string;
->a : Symbol(a, Decl(localTypes1.ts, 119, 13))
+>a : Symbol(A.a, Decl(localTypes1.ts, 119, 13))
     }
     function g() {
 >g : Symbol(g, Decl(localTypes1.ts, 121, 5))
@@ -314,7 +314,7 @@ function f6() {
 >A : Symbol(A, Decl(localTypes1.ts, 118, 15))
 
             b: string;
->b : Symbol(b, Decl(localTypes1.ts, 123, 27))
+>b : Symbol(B.b, Decl(localTypes1.ts, 123, 27))
         }
         function h() {
 >h : Symbol(h, Decl(localTypes1.ts, 125, 9))
@@ -324,7 +324,7 @@ function f6() {
 >B : Symbol(B, Decl(localTypes1.ts, 122, 18))
 
                 c: string;
->c : Symbol(c, Decl(localTypes1.ts, 127, 31))
+>c : Symbol(C.c, Decl(localTypes1.ts, 127, 31))
             }
             var x = new C();
 >x : Symbol(x, Decl(localTypes1.ts, 130, 15))
diff --git a/tests/baselines/reference/localTypes2.symbols b/tests/baselines/reference/localTypes2.symbols
index 3054c6f552d..52ff438f049 100644
--- a/tests/baselines/reference/localTypes2.symbols
+++ b/tests/baselines/reference/localTypes2.symbols
@@ -9,8 +9,8 @@ function f1() {
 >C : Symbol(C, Decl(localTypes2.ts, 1, 18))
 
             constructor(public x: number, public y: number) { }
->x : Symbol(x, Decl(localTypes2.ts, 3, 24))
->y : Symbol(y, Decl(localTypes2.ts, 3, 41))
+>x : Symbol(C.x, Decl(localTypes2.ts, 3, 24))
+>y : Symbol(C.y, Decl(localTypes2.ts, 3, 41))
         }
         return C;
 >C : Symbol(C, Decl(localTypes2.ts, 1, 18))
@@ -47,11 +47,11 @@ function f2() {
 >C : Symbol(C, Decl(localTypes2.ts, 14, 27))
 
             public x = x;
->x : Symbol(x, Decl(localTypes2.ts, 15, 17))
+>x : Symbol(C.x, Decl(localTypes2.ts, 15, 17))
 >x : Symbol(x, Decl(localTypes2.ts, 14, 15))
 
             constructor(public y: number) { }
->y : Symbol(y, Decl(localTypes2.ts, 17, 24))
+>y : Symbol(C.y, Decl(localTypes2.ts, 17, 24))
         }
         return C;
 >C : Symbol(C, Decl(localTypes2.ts, 14, 27))
@@ -89,11 +89,11 @@ function f3() {
 >C : Symbol(C, Decl(localTypes2.ts, 28, 38))
 
             public x = x;
->x : Symbol(x, Decl(localTypes2.ts, 29, 17))
+>x : Symbol(C.x, Decl(localTypes2.ts, 29, 17))
 >x : Symbol(x, Decl(localTypes2.ts, 28, 15))
 
             public y = y;
->y : Symbol(y, Decl(localTypes2.ts, 30, 25))
+>y : Symbol(C.y, Decl(localTypes2.ts, 30, 25))
 >y : Symbol(y, Decl(localTypes2.ts, 28, 25))
         }
         return C;
diff --git a/tests/baselines/reference/localTypes3.symbols b/tests/baselines/reference/localTypes3.symbols
index fe7082e4577..c10b463d697 100644
--- a/tests/baselines/reference/localTypes3.symbols
+++ b/tests/baselines/reference/localTypes3.symbols
@@ -11,9 +11,9 @@ function f1() {
 >Y : Symbol(Y, Decl(localTypes3.ts, 2, 18))
 
             constructor(public x: X, public y: Y) { }
->x : Symbol(x, Decl(localTypes3.ts, 3, 24))
+>x : Symbol(C.x, Decl(localTypes3.ts, 3, 24))
 >X : Symbol(X, Decl(localTypes3.ts, 2, 16))
->y : Symbol(y, Decl(localTypes3.ts, 3, 36))
+>y : Symbol(C.y, Decl(localTypes3.ts, 3, 36))
 >Y : Symbol(Y, Decl(localTypes3.ts, 2, 18))
         }
         return C;
@@ -54,11 +54,11 @@ function f2() {
 >Y : Symbol(Y, Decl(localTypes3.ts, 15, 16))
 
             public x = x;
->x : Symbol(x, Decl(localTypes3.ts, 15, 20))
+>x : Symbol(C.x, Decl(localTypes3.ts, 15, 20))
 >x : Symbol(x, Decl(localTypes3.ts, 14, 18))
 
             constructor(public y: Y) { }
->y : Symbol(y, Decl(localTypes3.ts, 17, 24))
+>y : Symbol(C.y, Decl(localTypes3.ts, 17, 24))
 >Y : Symbol(Y, Decl(localTypes3.ts, 15, 16))
         }
         return C;
@@ -101,11 +101,11 @@ function f3() {
 >C : Symbol(C, Decl(localTypes3.ts, 28, 34))
 
             public x = x;
->x : Symbol(x, Decl(localTypes3.ts, 29, 17))
+>x : Symbol(C.x, Decl(localTypes3.ts, 29, 17))
 >x : Symbol(x, Decl(localTypes3.ts, 28, 21))
 
             public y = y;
->y : Symbol(y, Decl(localTypes3.ts, 30, 25))
+>y : Symbol(C.y, Decl(localTypes3.ts, 30, 25))
 >y : Symbol(y, Decl(localTypes3.ts, 28, 26))
         }
         return C;
diff --git a/tests/baselines/reference/localTypes5.symbols b/tests/baselines/reference/localTypes5.symbols
index 41851a617de..175469e7a72 100644
--- a/tests/baselines/reference/localTypes5.symbols
+++ b/tests/baselines/reference/localTypes5.symbols
@@ -7,7 +7,7 @@ function foo<A>() {
 >X : Symbol(X, Decl(localTypes5.ts, 0, 19))
 
         m<B, C>() {
->m : Symbol(m, Decl(localTypes5.ts, 1, 13))
+>m : Symbol(X.m, Decl(localTypes5.ts, 1, 13))
 >B : Symbol(B, Decl(localTypes5.ts, 2, 10))
 >C : Symbol(C, Decl(localTypes5.ts, 2, 12))
 
@@ -22,7 +22,7 @@ function foo<A>() {
 >Y : Symbol(Y, Decl(localTypes5.ts, 3, 36))
 
             })<Date>();
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
         }
     }
     var x = new X();
diff --git a/tests/baselines/reference/logicalAndOperatorWithEveryType.types b/tests/baselines/reference/logicalAndOperatorWithEveryType.types
index bd913e94da5..b2628eed921 100644
--- a/tests/baselines/reference/logicalAndOperatorWithEveryType.types
+++ b/tests/baselines/reference/logicalAndOperatorWithEveryType.types
@@ -623,7 +623,7 @@ var rj8 = a8 && undefined;
 
 var rj9 = null && undefined;
 >rj9 : any
->null && undefined : undefined
+>null && undefined : null
 >null : null
 >undefined : undefined
 
diff --git a/tests/baselines/reference/logicalNotOperatorInvalidOperations.errors.txt b/tests/baselines/reference/logicalNotOperatorInvalidOperations.errors.txt
index 07262962b08..c7d66e17f9d 100644
--- a/tests/baselines/reference/logicalNotOperatorInvalidOperations.errors.txt
+++ b/tests/baselines/reference/logicalNotOperatorInvalidOperations.errors.txt
@@ -1,19 +1,13 @@
-tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorInvalidOperations.ts(5,17): error TS1005: ',' expected.
-tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorInvalidOperations.ts(5,18): error TS1109: Expression expected.
 tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorInvalidOperations.ts(8,16): error TS2365: Operator '+' cannot be applied to types 'boolean' and 'number'.
 tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorInvalidOperations.ts(11,16): error TS1109: Expression expected.
 
 
-==== tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorInvalidOperations.ts (4 errors) ====
+==== tests/cases/conformance/expressions/unaryOperators/logicalNotOperator/logicalNotOperatorInvalidOperations.ts (2 errors) ====
     // Unary operator !
     var b: number;
     
     // operand before !
     var BOOLEAN1 = b!;  //expect error
-                    ~
-!!! error TS1005: ',' expected.
-                     ~
-!!! error TS1109: Expression expected.
     
     // miss parentheses
     var BOOLEAN2 = !b + b;
diff --git a/tests/baselines/reference/logicalNotOperatorInvalidOperations.js b/tests/baselines/reference/logicalNotOperatorInvalidOperations.js
index 7b16f2ef36f..0cb941b0e41 100644
--- a/tests/baselines/reference/logicalNotOperatorInvalidOperations.js
+++ b/tests/baselines/reference/logicalNotOperatorInvalidOperations.js
@@ -15,8 +15,7 @@ var BOOLEAN3 =!;
 // Unary operator !
 var b;
 // operand before !
-var BOOLEAN1 = b;
-!; //expect error
+var BOOLEAN1 = b; //expect error
 // miss parentheses
 var BOOLEAN2 = !b + b;
 // miss an operand
diff --git a/tests/baselines/reference/logicalNotOperatorWithBooleanType.symbols b/tests/baselines/reference/logicalNotOperatorWithBooleanType.symbols
index b42b9d7922e..d94e5d36074 100644
--- a/tests/baselines/reference/logicalNotOperatorWithBooleanType.symbols
+++ b/tests/baselines/reference/logicalNotOperatorWithBooleanType.symbols
@@ -10,7 +10,7 @@ class A {
 >A : Symbol(A, Decl(logicalNotOperatorWithBooleanType.ts, 3, 40))
 
     public a: boolean;
->a : Symbol(a, Decl(logicalNotOperatorWithBooleanType.ts, 5, 9))
+>a : Symbol(A.a, Decl(logicalNotOperatorWithBooleanType.ts, 5, 9))
 
     static foo() { return false; }
 >foo : Symbol(A.foo, Decl(logicalNotOperatorWithBooleanType.ts, 6, 22))
diff --git a/tests/baselines/reference/logicalNotOperatorWithNumberType.symbols b/tests/baselines/reference/logicalNotOperatorWithNumberType.symbols
index 4f277a8db54..25fac1015d2 100644
--- a/tests/baselines/reference/logicalNotOperatorWithNumberType.symbols
+++ b/tests/baselines/reference/logicalNotOperatorWithNumberType.symbols
@@ -13,7 +13,7 @@ class A {
 >A : Symbol(A, Decl(logicalNotOperatorWithNumberType.ts, 4, 36))
 
     public a: number;
->a : Symbol(a, Decl(logicalNotOperatorWithNumberType.ts, 6, 9))
+>a : Symbol(A.a, Decl(logicalNotOperatorWithNumberType.ts, 6, 9))
 
     static foo() { return 1; }
 >foo : Symbol(A.foo, Decl(logicalNotOperatorWithNumberType.ts, 7, 21))
diff --git a/tests/baselines/reference/logicalNotOperatorWithStringType.symbols b/tests/baselines/reference/logicalNotOperatorWithStringType.symbols
index e91c8b71572..50432fe2333 100644
--- a/tests/baselines/reference/logicalNotOperatorWithStringType.symbols
+++ b/tests/baselines/reference/logicalNotOperatorWithStringType.symbols
@@ -13,7 +13,7 @@ class A {
 >A : Symbol(A, Decl(logicalNotOperatorWithStringType.ts, 4, 40))
 
     public a: string;
->a : Symbol(a, Decl(logicalNotOperatorWithStringType.ts, 6, 9))
+>a : Symbol(A.a, Decl(logicalNotOperatorWithStringType.ts, 6, 9))
 
     static foo() { return ""; }
 >foo : Symbol(A.foo, Decl(logicalNotOperatorWithStringType.ts, 7, 21))
diff --git a/tests/baselines/reference/looseThisTypeInFunctions.errors.txt b/tests/baselines/reference/looseThisTypeInFunctions.errors.txt
new file mode 100644
index 00000000000..b7a36b99ad4
--- /dev/null
+++ b/tests/baselines/reference/looseThisTypeInFunctions.errors.txt
@@ -0,0 +1,66 @@
+tests/cases/conformance/types/thisType/looseThisTypeInFunctions.ts(21,1): error TS2322: Type '(this: C, m: number) => number' is not assignable to type '(this: void, m: number) => number'.
+  The 'this' types of each signature are incompatible.
+    Type 'void' is not assignable to type 'C'.
+tests/cases/conformance/types/thisType/looseThisTypeInFunctions.ts(33,28): error TS2339: Property 'length' does not exist on type 'number'.
+tests/cases/conformance/types/thisType/looseThisTypeInFunctions.ts(37,9): error TS2684: The 'this' context of type 'void' is not assignable to method's 'this' of type 'I'.
+tests/cases/conformance/types/thisType/looseThisTypeInFunctions.ts(46,20): error TS2339: Property 'length' does not exist on type 'number'.
+
+
+==== tests/cases/conformance/types/thisType/looseThisTypeInFunctions.ts (4 errors) ====
+    interface I {
+        n: number;
+        explicitThis(this: this, m: number): number;
+    }
+    interface Unused {
+        implicitNoThis(m: number): number;
+    }
+    class C implements I {
+        n: number;
+        explicitThis(this: this, m: number): number {
+            return this.n + m;
+        }
+        implicitThis(m: number): number {
+            return this.n + m;
+        }
+        explicitVoid(this: void, m: number): number {
+            return m + 1;
+        }
+    }
+    let c = new C();
+    c.explicitVoid = c.explicitThis; // error, 'void' is missing everything
+    ~~~~~~~~~~~~~~
+!!! error TS2322: Type '(this: C, m: number) => number' is not assignable to type '(this: void, m: number) => number'.
+!!! error TS2322:   The 'this' types of each signature are incompatible.
+!!! error TS2322:     Type 'void' is not assignable to type 'C'.
+    let o = { 
+        n: 101,
+        explicitThis: function (m: number) { 
+            return m + this.n.length; // ok, this.n: any
+        },
+        implicitThis(m: number): number { return m; } 
+    };
+    let i: I = o;
+    let o2: I = {
+        n: 1001,
+        explicitThis: function (m) {
+             return m + this.n.length;  // error, this.n: number, no member 'length'
+                               ~~~~~~
+!!! error TS2339: Property 'length' does not exist on type 'number'.
+        },
+    }
+    let x = i.explicitThis;
+    let n = x(12); // callee:void doesn't match this:I
+            ~~~~~
+!!! error TS2684: The 'this' context of type 'void' is not assignable to method's 'this' of type 'I'.
+    let u: Unused;
+    let y = u.implicitNoThis;
+    n = y(12); // ok, callee:void matches this:any
+    c.explicitVoid = c.implicitThis // ok, implicitThis(this:any)
+    o.implicitThis = c.implicitThis; // ok, implicitThis(this:any)
+    o.implicitThis = c.explicitThis; // ok, implicitThis(this:any) is assignable to explicitThis(this: this)
+    o.implicitThis = i.explicitThis;
+    i.explicitThis = function(m) {
+         return this.n.length;  // error, this.n: number
+                       ~~~~~~
+!!! error TS2339: Property 'length' does not exist on type 'number'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/looseThisTypeInFunctions.js b/tests/baselines/reference/looseThisTypeInFunctions.js
new file mode 100644
index 00000000000..3b172877e0e
--- /dev/null
+++ b/tests/baselines/reference/looseThisTypeInFunctions.js
@@ -0,0 +1,92 @@
+//// [looseThisTypeInFunctions.ts]
+interface I {
+    n: number;
+    explicitThis(this: this, m: number): number;
+}
+interface Unused {
+    implicitNoThis(m: number): number;
+}
+class C implements I {
+    n: number;
+    explicitThis(this: this, m: number): number {
+        return this.n + m;
+    }
+    implicitThis(m: number): number {
+        return this.n + m;
+    }
+    explicitVoid(this: void, m: number): number {
+        return m + 1;
+    }
+}
+let c = new C();
+c.explicitVoid = c.explicitThis; // error, 'void' is missing everything
+let o = { 
+    n: 101,
+    explicitThis: function (m: number) { 
+        return m + this.n.length; // ok, this.n: any
+    },
+    implicitThis(m: number): number { return m; } 
+};
+let i: I = o;
+let o2: I = {
+    n: 1001,
+    explicitThis: function (m) {
+         return m + this.n.length;  // error, this.n: number, no member 'length'
+    },
+}
+let x = i.explicitThis;
+let n = x(12); // callee:void doesn't match this:I
+let u: Unused;
+let y = u.implicitNoThis;
+n = y(12); // ok, callee:void matches this:any
+c.explicitVoid = c.implicitThis // ok, implicitThis(this:any)
+o.implicitThis = c.implicitThis; // ok, implicitThis(this:any)
+o.implicitThis = c.explicitThis; // ok, implicitThis(this:any) is assignable to explicitThis(this: this)
+o.implicitThis = i.explicitThis;
+i.explicitThis = function(m) {
+     return this.n.length;  // error, this.n: number
+}
+
+//// [looseThisTypeInFunctions.js]
+var C = (function () {
+    function C() {
+    }
+    C.prototype.explicitThis = function (m) {
+        return this.n + m;
+    };
+    C.prototype.implicitThis = function (m) {
+        return this.n + m;
+    };
+    C.prototype.explicitVoid = function (m) {
+        return m + 1;
+    };
+    return C;
+}());
+var c = new C();
+c.explicitVoid = c.explicitThis; // error, 'void' is missing everything
+var o = {
+    n: 101,
+    explicitThis: function (m) {
+        return m + this.n.length; // ok, this.n: any
+    },
+    implicitThis: function (m) { return m; }
+};
+var i = o;
+var o2 = {
+    n: 1001,
+    explicitThis: function (m) {
+        return m + this.n.length; // error, this.n: number, no member 'length'
+    }
+};
+var x = i.explicitThis;
+var n = x(12); // callee:void doesn't match this:I
+var u;
+var y = u.implicitNoThis;
+n = y(12); // ok, callee:void matches this:any
+c.explicitVoid = c.implicitThis; // ok, implicitThis(this:any)
+o.implicitThis = c.implicitThis; // ok, implicitThis(this:any)
+o.implicitThis = c.explicitThis; // ok, implicitThis(this:any) is assignable to explicitThis(this: this)
+o.implicitThis = i.explicitThis;
+i.explicitThis = function (m) {
+    return this.n.length; // error, this.n: number
+};
diff --git a/tests/baselines/reference/m7Bugs.symbols b/tests/baselines/reference/m7Bugs.symbols
index be6d798a8a5..3dd3ab25102 100644
--- a/tests/baselines/reference/m7Bugs.symbols
+++ b/tests/baselines/reference/m7Bugs.symbols
@@ -4,7 +4,7 @@ interface ISomething {
 >ISomething : Symbol(ISomething, Decl(m7Bugs.ts, 0, 0))
 
    something: number;
->something : Symbol(something, Decl(m7Bugs.ts, 1, 22))
+>something : Symbol(ISomething.something, Decl(m7Bugs.ts, 1, 22))
 }
 
 var s: ISomething = <ISomething>({ });
@@ -16,7 +16,7 @@ var s: ISomething = <ISomething>({ });
 // scenario 2
 interface A { x: string; }
 >A : Symbol(A, Decl(m7Bugs.ts, 5, 38))
->x : Symbol(x, Decl(m7Bugs.ts, 9, 13))
+>x : Symbol(A.x, Decl(m7Bugs.ts, 9, 13))
 
 interface B extends A { }
 >B : Symbol(B, Decl(m7Bugs.ts, 9, 26))
@@ -31,7 +31,7 @@ class C1 {
 >C1 : Symbol(C1, Decl(m7Bugs.ts, 13, 18))
 
 	public x: string;
->x : Symbol(x, Decl(m7Bugs.ts, 15, 10))
+>x : Symbol(C1.x, Decl(m7Bugs.ts, 15, 10))
 }
 
 class C2 extends C1 {}
diff --git a/tests/baselines/reference/malformedTags.js b/tests/baselines/reference/malformedTags.js
new file mode 100644
index 00000000000..33b2c1e6f41
--- /dev/null
+++ b/tests/baselines/reference/malformedTags.js
@@ -0,0 +1,17 @@
+//// [myFile02.js]
+
+/**
+ * Checks if `value` is classified as an `Array` object.
+ *
+ * @type Function
+ */
+var isArray = Array.isArray;
+
+
+//// [myFile02.js]
+/**
+ * Checks if `value` is classified as an `Array` object.
+ *
+ * @type Function
+ */
+var isArray = Array.isArray;
diff --git a/tests/baselines/reference/malformedTags.symbols b/tests/baselines/reference/malformedTags.symbols
new file mode 100644
index 00000000000..df953a82497
--- /dev/null
+++ b/tests/baselines/reference/malformedTags.symbols
@@ -0,0 +1,13 @@
+=== tests/cases/conformance/salsa/myFile02.js ===
+
+/**
+ * Checks if `value` is classified as an `Array` object.
+ *
+ * @type Function
+ */
+var isArray = Array.isArray;
+>isArray : Symbol(isArray, Decl(myFile02.js, 6, 3))
+>Array.isArray : Symbol(ArrayConstructor.isArray, Decl(lib.d.ts, --, --))
+>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>isArray : Symbol(ArrayConstructor.isArray, Decl(lib.d.ts, --, --))
+
diff --git a/tests/baselines/reference/malformedTags.types b/tests/baselines/reference/malformedTags.types
new file mode 100644
index 00000000000..acf442f7cba
--- /dev/null
+++ b/tests/baselines/reference/malformedTags.types
@@ -0,0 +1,13 @@
+=== tests/cases/conformance/salsa/myFile02.js ===
+
+/**
+ * Checks if `value` is classified as an `Array` object.
+ *
+ * @type Function
+ */
+var isArray = Array.isArray;
+>isArray : (arg: any) => arg is any[]
+>Array.isArray : (arg: any) => arg is any[]
+>Array : ArrayConstructor
+>isArray : (arg: any) => arg is any[]
+
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/memberFunctionsWithPrivateOverloads.errors.txt b/tests/baselines/reference/memberFunctionsWithPrivateOverloads.errors.txt
index d6c3d4a659c..97ac52a293d 100644
--- a/tests/baselines/reference/memberFunctionsWithPrivateOverloads.errors.txt
+++ b/tests/baselines/reference/memberFunctionsWithPrivateOverloads.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPrivateOverloads.ts(43,9): error TS2341: Property 'foo' is private and only accessible within class 'C'.
-tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPrivateOverloads.ts(46,10): error TS2341: Property 'foo' is private and only accessible within class 'D<T>'.
-tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPrivateOverloads.ts(48,10): error TS2341: Property 'foo' is private and only accessible within class 'C'.
-tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPrivateOverloads.ts(49,10): error TS2341: Property 'bar' is private and only accessible within class 'D<T>'.
+tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPrivateOverloads.ts(43,11): error TS2341: Property 'foo' is private and only accessible within class 'C'.
+tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPrivateOverloads.ts(46,12): error TS2341: Property 'foo' is private and only accessible within class 'D<T>'.
+tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPrivateOverloads.ts(48,12): error TS2341: Property 'foo' is private and only accessible within class 'C'.
+tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPrivateOverloads.ts(49,12): error TS2341: Property 'bar' is private and only accessible within class 'D<T>'.
 
 
 ==== tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPrivateOverloads.ts (4 errors) ====
@@ -48,17 +48,17 @@ tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclara
     
     var c: C;
     var r = c.foo(1); // error
-            ~~~~~
+              ~~~
 !!! error TS2341: Property 'foo' is private and only accessible within class 'C'.
     
     var d: D<number>;
     var r2 = d.foo(2); // error
-             ~~~~~
+               ~~~
 !!! error TS2341: Property 'foo' is private and only accessible within class 'D<T>'.
     
     var r3 = C.foo(1); // error
-             ~~~~~
+               ~~~
 !!! error TS2341: Property 'foo' is private and only accessible within class 'C'.
     var r4 = D.bar(''); // error
-             ~~~~~
+               ~~~
 !!! error TS2341: Property 'bar' is private and only accessible within class 'D<T>'.
\ No newline at end of file
diff --git a/tests/baselines/reference/memberFunctionsWithPublicOverloads.symbols b/tests/baselines/reference/memberFunctionsWithPublicOverloads.symbols
index 435af50a5f7..66161e3e514 100644
--- a/tests/baselines/reference/memberFunctionsWithPublicOverloads.symbols
+++ b/tests/baselines/reference/memberFunctionsWithPublicOverloads.symbols
@@ -3,34 +3,34 @@ class C {
 >C : Symbol(C, Decl(memberFunctionsWithPublicOverloads.ts, 0, 0))
 
     public foo(x: number);
->foo : Symbol(foo, Decl(memberFunctionsWithPublicOverloads.ts, 0, 9), Decl(memberFunctionsWithPublicOverloads.ts, 1, 26), Decl(memberFunctionsWithPublicOverloads.ts, 2, 37))
+>foo : Symbol(C.foo, Decl(memberFunctionsWithPublicOverloads.ts, 0, 9), Decl(memberFunctionsWithPublicOverloads.ts, 1, 26), Decl(memberFunctionsWithPublicOverloads.ts, 2, 37))
 >x : Symbol(x, Decl(memberFunctionsWithPublicOverloads.ts, 1, 15))
 
     public foo(x: number, y: string);
->foo : Symbol(foo, Decl(memberFunctionsWithPublicOverloads.ts, 0, 9), Decl(memberFunctionsWithPublicOverloads.ts, 1, 26), Decl(memberFunctionsWithPublicOverloads.ts, 2, 37))
+>foo : Symbol(C.foo, Decl(memberFunctionsWithPublicOverloads.ts, 0, 9), Decl(memberFunctionsWithPublicOverloads.ts, 1, 26), Decl(memberFunctionsWithPublicOverloads.ts, 2, 37))
 >x : Symbol(x, Decl(memberFunctionsWithPublicOverloads.ts, 2, 15))
 >y : Symbol(y, Decl(memberFunctionsWithPublicOverloads.ts, 2, 25))
 
     public foo(x: any, y?: any) { }
->foo : Symbol(foo, Decl(memberFunctionsWithPublicOverloads.ts, 0, 9), Decl(memberFunctionsWithPublicOverloads.ts, 1, 26), Decl(memberFunctionsWithPublicOverloads.ts, 2, 37))
+>foo : Symbol(C.foo, Decl(memberFunctionsWithPublicOverloads.ts, 0, 9), Decl(memberFunctionsWithPublicOverloads.ts, 1, 26), Decl(memberFunctionsWithPublicOverloads.ts, 2, 37))
 >x : Symbol(x, Decl(memberFunctionsWithPublicOverloads.ts, 3, 15))
 >y : Symbol(y, Decl(memberFunctionsWithPublicOverloads.ts, 3, 22))
 
     public bar(x: 'hi');
->bar : Symbol(bar, Decl(memberFunctionsWithPublicOverloads.ts, 3, 35), Decl(memberFunctionsWithPublicOverloads.ts, 5, 24), Decl(memberFunctionsWithPublicOverloads.ts, 6, 26), Decl(memberFunctionsWithPublicOverloads.ts, 7, 37))
+>bar : Symbol(C.bar, Decl(memberFunctionsWithPublicOverloads.ts, 3, 35), Decl(memberFunctionsWithPublicOverloads.ts, 5, 24), Decl(memberFunctionsWithPublicOverloads.ts, 6, 26), Decl(memberFunctionsWithPublicOverloads.ts, 7, 37))
 >x : Symbol(x, Decl(memberFunctionsWithPublicOverloads.ts, 5, 15))
 
     public bar(x: string);
->bar : Symbol(bar, Decl(memberFunctionsWithPublicOverloads.ts, 3, 35), Decl(memberFunctionsWithPublicOverloads.ts, 5, 24), Decl(memberFunctionsWithPublicOverloads.ts, 6, 26), Decl(memberFunctionsWithPublicOverloads.ts, 7, 37))
+>bar : Symbol(C.bar, Decl(memberFunctionsWithPublicOverloads.ts, 3, 35), Decl(memberFunctionsWithPublicOverloads.ts, 5, 24), Decl(memberFunctionsWithPublicOverloads.ts, 6, 26), Decl(memberFunctionsWithPublicOverloads.ts, 7, 37))
 >x : Symbol(x, Decl(memberFunctionsWithPublicOverloads.ts, 6, 15))
 
     public bar(x: number, y: string);
->bar : Symbol(bar, Decl(memberFunctionsWithPublicOverloads.ts, 3, 35), Decl(memberFunctionsWithPublicOverloads.ts, 5, 24), Decl(memberFunctionsWithPublicOverloads.ts, 6, 26), Decl(memberFunctionsWithPublicOverloads.ts, 7, 37))
+>bar : Symbol(C.bar, Decl(memberFunctionsWithPublicOverloads.ts, 3, 35), Decl(memberFunctionsWithPublicOverloads.ts, 5, 24), Decl(memberFunctionsWithPublicOverloads.ts, 6, 26), Decl(memberFunctionsWithPublicOverloads.ts, 7, 37))
 >x : Symbol(x, Decl(memberFunctionsWithPublicOverloads.ts, 7, 15))
 >y : Symbol(y, Decl(memberFunctionsWithPublicOverloads.ts, 7, 25))
 
     public bar(x: any, y?: any) { }
->bar : Symbol(bar, Decl(memberFunctionsWithPublicOverloads.ts, 3, 35), Decl(memberFunctionsWithPublicOverloads.ts, 5, 24), Decl(memberFunctionsWithPublicOverloads.ts, 6, 26), Decl(memberFunctionsWithPublicOverloads.ts, 7, 37))
+>bar : Symbol(C.bar, Decl(memberFunctionsWithPublicOverloads.ts, 3, 35), Decl(memberFunctionsWithPublicOverloads.ts, 5, 24), Decl(memberFunctionsWithPublicOverloads.ts, 6, 26), Decl(memberFunctionsWithPublicOverloads.ts, 7, 37))
 >x : Symbol(x, Decl(memberFunctionsWithPublicOverloads.ts, 8, 15))
 >y : Symbol(y, Decl(memberFunctionsWithPublicOverloads.ts, 8, 22))
 
@@ -72,38 +72,38 @@ class D<T> {
 >T : Symbol(T, Decl(memberFunctionsWithPublicOverloads.ts, 20, 8))
 
     public foo(x: number);
->foo : Symbol(foo, Decl(memberFunctionsWithPublicOverloads.ts, 20, 12), Decl(memberFunctionsWithPublicOverloads.ts, 21, 26), Decl(memberFunctionsWithPublicOverloads.ts, 22, 27))
+>foo : Symbol(D.foo, Decl(memberFunctionsWithPublicOverloads.ts, 20, 12), Decl(memberFunctionsWithPublicOverloads.ts, 21, 26), Decl(memberFunctionsWithPublicOverloads.ts, 22, 27))
 >x : Symbol(x, Decl(memberFunctionsWithPublicOverloads.ts, 21, 15))
 
     public foo(x: T, y: T);
->foo : Symbol(foo, Decl(memberFunctionsWithPublicOverloads.ts, 20, 12), Decl(memberFunctionsWithPublicOverloads.ts, 21, 26), Decl(memberFunctionsWithPublicOverloads.ts, 22, 27))
+>foo : Symbol(D.foo, Decl(memberFunctionsWithPublicOverloads.ts, 20, 12), Decl(memberFunctionsWithPublicOverloads.ts, 21, 26), Decl(memberFunctionsWithPublicOverloads.ts, 22, 27))
 >x : Symbol(x, Decl(memberFunctionsWithPublicOverloads.ts, 22, 15))
 >T : Symbol(T, Decl(memberFunctionsWithPublicOverloads.ts, 20, 8))
 >y : Symbol(y, Decl(memberFunctionsWithPublicOverloads.ts, 22, 20))
 >T : Symbol(T, Decl(memberFunctionsWithPublicOverloads.ts, 20, 8))
 
     public foo(x: any, y?: any) { }
->foo : Symbol(foo, Decl(memberFunctionsWithPublicOverloads.ts, 20, 12), Decl(memberFunctionsWithPublicOverloads.ts, 21, 26), Decl(memberFunctionsWithPublicOverloads.ts, 22, 27))
+>foo : Symbol(D.foo, Decl(memberFunctionsWithPublicOverloads.ts, 20, 12), Decl(memberFunctionsWithPublicOverloads.ts, 21, 26), Decl(memberFunctionsWithPublicOverloads.ts, 22, 27))
 >x : Symbol(x, Decl(memberFunctionsWithPublicOverloads.ts, 23, 15))
 >y : Symbol(y, Decl(memberFunctionsWithPublicOverloads.ts, 23, 22))
 
     public bar(x: 'hi');
->bar : Symbol(bar, Decl(memberFunctionsWithPublicOverloads.ts, 23, 35), Decl(memberFunctionsWithPublicOverloads.ts, 25, 24), Decl(memberFunctionsWithPublicOverloads.ts, 26, 26), Decl(memberFunctionsWithPublicOverloads.ts, 27, 27))
+>bar : Symbol(D.bar, Decl(memberFunctionsWithPublicOverloads.ts, 23, 35), Decl(memberFunctionsWithPublicOverloads.ts, 25, 24), Decl(memberFunctionsWithPublicOverloads.ts, 26, 26), Decl(memberFunctionsWithPublicOverloads.ts, 27, 27))
 >x : Symbol(x, Decl(memberFunctionsWithPublicOverloads.ts, 25, 15))
 
     public bar(x: string);
->bar : Symbol(bar, Decl(memberFunctionsWithPublicOverloads.ts, 23, 35), Decl(memberFunctionsWithPublicOverloads.ts, 25, 24), Decl(memberFunctionsWithPublicOverloads.ts, 26, 26), Decl(memberFunctionsWithPublicOverloads.ts, 27, 27))
+>bar : Symbol(D.bar, Decl(memberFunctionsWithPublicOverloads.ts, 23, 35), Decl(memberFunctionsWithPublicOverloads.ts, 25, 24), Decl(memberFunctionsWithPublicOverloads.ts, 26, 26), Decl(memberFunctionsWithPublicOverloads.ts, 27, 27))
 >x : Symbol(x, Decl(memberFunctionsWithPublicOverloads.ts, 26, 15))
 
     public bar(x: T, y: T);
->bar : Symbol(bar, Decl(memberFunctionsWithPublicOverloads.ts, 23, 35), Decl(memberFunctionsWithPublicOverloads.ts, 25, 24), Decl(memberFunctionsWithPublicOverloads.ts, 26, 26), Decl(memberFunctionsWithPublicOverloads.ts, 27, 27))
+>bar : Symbol(D.bar, Decl(memberFunctionsWithPublicOverloads.ts, 23, 35), Decl(memberFunctionsWithPublicOverloads.ts, 25, 24), Decl(memberFunctionsWithPublicOverloads.ts, 26, 26), Decl(memberFunctionsWithPublicOverloads.ts, 27, 27))
 >x : Symbol(x, Decl(memberFunctionsWithPublicOverloads.ts, 27, 15))
 >T : Symbol(T, Decl(memberFunctionsWithPublicOverloads.ts, 20, 8))
 >y : Symbol(y, Decl(memberFunctionsWithPublicOverloads.ts, 27, 20))
 >T : Symbol(T, Decl(memberFunctionsWithPublicOverloads.ts, 20, 8))
 
     public bar(x: any, y?: any) { }
->bar : Symbol(bar, Decl(memberFunctionsWithPublicOverloads.ts, 23, 35), Decl(memberFunctionsWithPublicOverloads.ts, 25, 24), Decl(memberFunctionsWithPublicOverloads.ts, 26, 26), Decl(memberFunctionsWithPublicOverloads.ts, 27, 27))
+>bar : Symbol(D.bar, Decl(memberFunctionsWithPublicOverloads.ts, 23, 35), Decl(memberFunctionsWithPublicOverloads.ts, 25, 24), Decl(memberFunctionsWithPublicOverloads.ts, 26, 26), Decl(memberFunctionsWithPublicOverloads.ts, 27, 27))
 >x : Symbol(x, Decl(memberFunctionsWithPublicOverloads.ts, 28, 15))
 >y : Symbol(y, Decl(memberFunctionsWithPublicOverloads.ts, 28, 22))
 
diff --git a/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.errors.txt b/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.errors.txt
index 64d2f3d3059..16825f02c22 100644
--- a/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.errors.txt
+++ b/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.errors.txt
@@ -11,8 +11,8 @@ tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclara
 tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPublicPrivateOverloads.ts(45,19): error TS2385: Overload signatures must all be public, private or protected.
 tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPublicPrivateOverloads.ts(49,19): error TS2385: Overload signatures must all be public, private or protected.
 tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPublicPrivateOverloads.ts(53,19): error TS2385: Overload signatures must all be public, private or protected.
-tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPublicPrivateOverloads.ts(59,9): error TS2341: Property 'foo' is private and only accessible within class 'C'.
-tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPublicPrivateOverloads.ts(62,10): error TS2341: Property 'foo' is private and only accessible within class 'D<T>'.
+tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPublicPrivateOverloads.ts(59,11): error TS2341: Property 'foo' is private and only accessible within class 'C'.
+tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPublicPrivateOverloads.ts(62,12): error TS2341: Property 'foo' is private and only accessible within class 'D<T>'.
 
 
 ==== tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclarations/memberFunctionsWithPublicPrivateOverloads.ts (15 errors) ====
@@ -101,10 +101,10 @@ tests/cases/conformance/classes/propertyMemberDeclarations/memberFunctionDeclara
     
     var c: C;
     var r = c.foo(1); // error
-            ~~~~~
+              ~~~
 !!! error TS2341: Property 'foo' is private and only accessible within class 'C'.
     
     var d: D<number>;
     var r2 = d.foo(2); // error
-             ~~~~~
+               ~~~
 !!! error TS2341: Property 'foo' is private and only accessible within class 'D<T>'.
\ No newline at end of file
diff --git a/tests/baselines/reference/memberVariableDeclarations1.symbols b/tests/baselines/reference/memberVariableDeclarations1.symbols
index fbd3529262b..d2c76c705c8 100644
--- a/tests/baselines/reference/memberVariableDeclarations1.symbols
+++ b/tests/baselines/reference/memberVariableDeclarations1.symbols
@@ -5,20 +5,20 @@ class Employee {
 >Employee : Symbol(Employee, Decl(memberVariableDeclarations1.ts, 0, 0))
 
     public name: string;
->name : Symbol(name, Decl(memberVariableDeclarations1.ts, 2, 16))
+>name : Symbol(Employee.name, Decl(memberVariableDeclarations1.ts, 2, 16))
 
     public address: string;
->address : Symbol(address, Decl(memberVariableDeclarations1.ts, 3, 24))
+>address : Symbol(Employee.address, Decl(memberVariableDeclarations1.ts, 3, 24))
 
     public retired = false;
->retired : Symbol(retired, Decl(memberVariableDeclarations1.ts, 4, 27))
+>retired : Symbol(Employee.retired, Decl(memberVariableDeclarations1.ts, 4, 27))
 
     public manager: Employee = null;
->manager : Symbol(manager, Decl(memberVariableDeclarations1.ts, 5, 27))
+>manager : Symbol(Employee.manager, Decl(memberVariableDeclarations1.ts, 5, 27))
 >Employee : Symbol(Employee, Decl(memberVariableDeclarations1.ts, 0, 0))
 
     public reports: Employee[] = [];
->reports : Symbol(reports, Decl(memberVariableDeclarations1.ts, 6, 36))
+>reports : Symbol(Employee.reports, Decl(memberVariableDeclarations1.ts, 6, 36))
 >Employee : Symbol(Employee, Decl(memberVariableDeclarations1.ts, 0, 0))
 }
 
@@ -26,37 +26,37 @@ class Employee2 {
 >Employee2 : Symbol(Employee2, Decl(memberVariableDeclarations1.ts, 8, 1))
 
     public name: string;
->name : Symbol(name, Decl(memberVariableDeclarations1.ts, 10, 17))
+>name : Symbol(Employee2.name, Decl(memberVariableDeclarations1.ts, 10, 17))
 
     public address: string;
->address : Symbol(address, Decl(memberVariableDeclarations1.ts, 11, 24))
+>address : Symbol(Employee2.address, Decl(memberVariableDeclarations1.ts, 11, 24))
 
     public retired: boolean;
->retired : Symbol(retired, Decl(memberVariableDeclarations1.ts, 12, 27))
+>retired : Symbol(Employee2.retired, Decl(memberVariableDeclarations1.ts, 12, 27))
 
     public manager: Employee;
->manager : Symbol(manager, Decl(memberVariableDeclarations1.ts, 13, 28))
+>manager : Symbol(Employee2.manager, Decl(memberVariableDeclarations1.ts, 13, 28))
 >Employee : Symbol(Employee, Decl(memberVariableDeclarations1.ts, 0, 0))
 
     public reports: Employee[];
->reports : Symbol(reports, Decl(memberVariableDeclarations1.ts, 14, 29))
+>reports : Symbol(Employee2.reports, Decl(memberVariableDeclarations1.ts, 14, 29))
 >Employee : Symbol(Employee, Decl(memberVariableDeclarations1.ts, 0, 0))
 
     constructor() {
         this.retired = false;
->this.retired : Symbol(retired, Decl(memberVariableDeclarations1.ts, 12, 27))
+>this.retired : Symbol(Employee2.retired, Decl(memberVariableDeclarations1.ts, 12, 27))
 >this : Symbol(Employee2, Decl(memberVariableDeclarations1.ts, 8, 1))
->retired : Symbol(retired, Decl(memberVariableDeclarations1.ts, 12, 27))
+>retired : Symbol(Employee2.retired, Decl(memberVariableDeclarations1.ts, 12, 27))
 
         this.manager = null;
->this.manager : Symbol(manager, Decl(memberVariableDeclarations1.ts, 13, 28))
+>this.manager : Symbol(Employee2.manager, Decl(memberVariableDeclarations1.ts, 13, 28))
 >this : Symbol(Employee2, Decl(memberVariableDeclarations1.ts, 8, 1))
->manager : Symbol(manager, Decl(memberVariableDeclarations1.ts, 13, 28))
+>manager : Symbol(Employee2.manager, Decl(memberVariableDeclarations1.ts, 13, 28))
 
         this.reports = [];
->this.reports : Symbol(reports, Decl(memberVariableDeclarations1.ts, 14, 29))
+>this.reports : Symbol(Employee2.reports, Decl(memberVariableDeclarations1.ts, 14, 29))
 >this : Symbol(Employee2, Decl(memberVariableDeclarations1.ts, 8, 1))
->reports : Symbol(reports, Decl(memberVariableDeclarations1.ts, 14, 29))
+>reports : Symbol(Employee2.reports, Decl(memberVariableDeclarations1.ts, 14, 29))
     }
 }
 
diff --git a/tests/baselines/reference/mergeThreeInterfaces.symbols b/tests/baselines/reference/mergeThreeInterfaces.symbols
index 24bebf49de6..3d73c41948b 100644
--- a/tests/baselines/reference/mergeThreeInterfaces.symbols
+++ b/tests/baselines/reference/mergeThreeInterfaces.symbols
@@ -6,21 +6,21 @@ interface A {
 >A : Symbol(A, Decl(mergeThreeInterfaces.ts, 0, 0), Decl(mergeThreeInterfaces.ts, 5, 1), Decl(mergeThreeInterfaces.ts, 9, 1))
 
     foo: string;
->foo : Symbol(foo, Decl(mergeThreeInterfaces.ts, 3, 13))
+>foo : Symbol(A.foo, Decl(mergeThreeInterfaces.ts, 3, 13))
 }
 
 interface A {
 >A : Symbol(A, Decl(mergeThreeInterfaces.ts, 0, 0), Decl(mergeThreeInterfaces.ts, 5, 1), Decl(mergeThreeInterfaces.ts, 9, 1))
 
     bar: number;
->bar : Symbol(bar, Decl(mergeThreeInterfaces.ts, 7, 13))
+>bar : Symbol(A.bar, Decl(mergeThreeInterfaces.ts, 7, 13))
 }
 
 interface A {
 >A : Symbol(A, Decl(mergeThreeInterfaces.ts, 0, 0), Decl(mergeThreeInterfaces.ts, 5, 1), Decl(mergeThreeInterfaces.ts, 9, 1))
 
     baz: boolean;
->baz : Symbol(baz, Decl(mergeThreeInterfaces.ts, 11, 13))
+>baz : Symbol(A.baz, Decl(mergeThreeInterfaces.ts, 11, 13))
 }
 
 var a: A;
@@ -51,7 +51,7 @@ interface B<T> {
 >T : Symbol(T, Decl(mergeThreeInterfaces.ts, 21, 12), Decl(mergeThreeInterfaces.ts, 25, 12), Decl(mergeThreeInterfaces.ts, 29, 12))
 
     foo: T;
->foo : Symbol(foo, Decl(mergeThreeInterfaces.ts, 21, 16))
+>foo : Symbol(B.foo, Decl(mergeThreeInterfaces.ts, 21, 16))
 >T : Symbol(T, Decl(mergeThreeInterfaces.ts, 21, 12), Decl(mergeThreeInterfaces.ts, 25, 12), Decl(mergeThreeInterfaces.ts, 29, 12))
 }
 
@@ -60,7 +60,7 @@ interface B<T> {
 >T : Symbol(T, Decl(mergeThreeInterfaces.ts, 21, 12), Decl(mergeThreeInterfaces.ts, 25, 12), Decl(mergeThreeInterfaces.ts, 29, 12))
 
     bar: T;
->bar : Symbol(bar, Decl(mergeThreeInterfaces.ts, 25, 16))
+>bar : Symbol(B.bar, Decl(mergeThreeInterfaces.ts, 25, 16))
 >T : Symbol(T, Decl(mergeThreeInterfaces.ts, 21, 12), Decl(mergeThreeInterfaces.ts, 25, 12), Decl(mergeThreeInterfaces.ts, 29, 12))
 }
 
@@ -69,7 +69,7 @@ interface B<T> {
 >T : Symbol(T, Decl(mergeThreeInterfaces.ts, 21, 12), Decl(mergeThreeInterfaces.ts, 25, 12), Decl(mergeThreeInterfaces.ts, 29, 12))
 
     baz: T;
->baz : Symbol(baz, Decl(mergeThreeInterfaces.ts, 29, 16))
+>baz : Symbol(B.baz, Decl(mergeThreeInterfaces.ts, 29, 16))
 >T : Symbol(T, Decl(mergeThreeInterfaces.ts, 21, 12), Decl(mergeThreeInterfaces.ts, 25, 12), Decl(mergeThreeInterfaces.ts, 29, 12))
 }
 
@@ -103,21 +103,21 @@ module M {
 >A : Symbol(A, Decl(mergeThreeInterfaces.ts, 39, 10), Decl(mergeThreeInterfaces.ts, 42, 5), Decl(mergeThreeInterfaces.ts, 46, 5))
 
         foo: string;
->foo : Symbol(foo, Decl(mergeThreeInterfaces.ts, 40, 17))
+>foo : Symbol(A.foo, Decl(mergeThreeInterfaces.ts, 40, 17))
     }
 
     interface A {
 >A : Symbol(A, Decl(mergeThreeInterfaces.ts, 39, 10), Decl(mergeThreeInterfaces.ts, 42, 5), Decl(mergeThreeInterfaces.ts, 46, 5))
 
         bar: number;
->bar : Symbol(bar, Decl(mergeThreeInterfaces.ts, 44, 17))
+>bar : Symbol(A.bar, Decl(mergeThreeInterfaces.ts, 44, 17))
     }
 
     interface A {
 >A : Symbol(A, Decl(mergeThreeInterfaces.ts, 39, 10), Decl(mergeThreeInterfaces.ts, 42, 5), Decl(mergeThreeInterfaces.ts, 46, 5))
 
         baz: boolean;
->baz : Symbol(baz, Decl(mergeThreeInterfaces.ts, 48, 17))
+>baz : Symbol(A.baz, Decl(mergeThreeInterfaces.ts, 48, 17))
     }
 
     var a: A;
@@ -149,7 +149,7 @@ module M {
 >T : Symbol(T, Decl(mergeThreeInterfaces.ts, 59, 16), Decl(mergeThreeInterfaces.ts, 63, 16), Decl(mergeThreeInterfaces.ts, 67, 16))
 
         foo: T;
->foo : Symbol(foo, Decl(mergeThreeInterfaces.ts, 59, 20))
+>foo : Symbol(B.foo, Decl(mergeThreeInterfaces.ts, 59, 20))
 >T : Symbol(T, Decl(mergeThreeInterfaces.ts, 59, 16), Decl(mergeThreeInterfaces.ts, 63, 16), Decl(mergeThreeInterfaces.ts, 67, 16))
     }
 
@@ -158,7 +158,7 @@ module M {
 >T : Symbol(T, Decl(mergeThreeInterfaces.ts, 59, 16), Decl(mergeThreeInterfaces.ts, 63, 16), Decl(mergeThreeInterfaces.ts, 67, 16))
 
         bar: T;
->bar : Symbol(bar, Decl(mergeThreeInterfaces.ts, 63, 20))
+>bar : Symbol(B.bar, Decl(mergeThreeInterfaces.ts, 63, 20))
 >T : Symbol(T, Decl(mergeThreeInterfaces.ts, 59, 16), Decl(mergeThreeInterfaces.ts, 63, 16), Decl(mergeThreeInterfaces.ts, 67, 16))
     }
 
@@ -167,7 +167,7 @@ module M {
 >T : Symbol(T, Decl(mergeThreeInterfaces.ts, 59, 16), Decl(mergeThreeInterfaces.ts, 63, 16), Decl(mergeThreeInterfaces.ts, 67, 16))
 
         baz: T;
->baz : Symbol(baz, Decl(mergeThreeInterfaces.ts, 67, 20))
+>baz : Symbol(B.baz, Decl(mergeThreeInterfaces.ts, 67, 20))
 >T : Symbol(T, Decl(mergeThreeInterfaces.ts, 59, 16), Decl(mergeThreeInterfaces.ts, 63, 16), Decl(mergeThreeInterfaces.ts, 67, 16))
     }
 
diff --git a/tests/baselines/reference/mergeThreeInterfaces2.symbols b/tests/baselines/reference/mergeThreeInterfaces2.symbols
index 66942fd660d..8499e605f45 100644
--- a/tests/baselines/reference/mergeThreeInterfaces2.symbols
+++ b/tests/baselines/reference/mergeThreeInterfaces2.symbols
@@ -9,7 +9,7 @@ module M2 {
 >A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 3, 11), Decl(mergeThreeInterfaces2.ts, 13, 11), Decl(mergeThreeInterfaces2.ts, 16, 5))
 
         foo: string;
->foo : Symbol(foo, Decl(mergeThreeInterfaces2.ts, 4, 24))
+>foo : Symbol(A.foo, Decl(mergeThreeInterfaces2.ts, 4, 24))
     }
 
     var a: A;
@@ -36,14 +36,14 @@ module M2 {
 >A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 3, 11), Decl(mergeThreeInterfaces2.ts, 13, 11), Decl(mergeThreeInterfaces2.ts, 16, 5))
 
         bar: number;
->bar : Symbol(bar, Decl(mergeThreeInterfaces2.ts, 14, 24))
+>bar : Symbol(A.bar, Decl(mergeThreeInterfaces2.ts, 14, 24))
     }
 
     export interface A {
 >A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 3, 11), Decl(mergeThreeInterfaces2.ts, 13, 11), Decl(mergeThreeInterfaces2.ts, 16, 5))
 
         baz: boolean;
->baz : Symbol(baz, Decl(mergeThreeInterfaces2.ts, 18, 24))
+>baz : Symbol(A.baz, Decl(mergeThreeInterfaces2.ts, 18, 24))
     }
 
     var a: A;
@@ -80,7 +80,7 @@ module M2 {
 >A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 30, 22), Decl(mergeThreeInterfaces2.ts, 42, 22), Decl(mergeThreeInterfaces2.ts, 56, 22))
 
             foo: string;
->foo : Symbol(foo, Decl(mergeThreeInterfaces2.ts, 31, 28))
+>foo : Symbol(A.foo, Decl(mergeThreeInterfaces2.ts, 31, 28))
         }
 
         var a: A;
@@ -111,7 +111,7 @@ module M2 {
 >A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 30, 22), Decl(mergeThreeInterfaces2.ts, 42, 22), Decl(mergeThreeInterfaces2.ts, 56, 22))
 
             bar: number;
->bar : Symbol(bar, Decl(mergeThreeInterfaces2.ts, 43, 28))
+>bar : Symbol(A.bar, Decl(mergeThreeInterfaces2.ts, 43, 28))
         }
 
         var a: A;
@@ -148,7 +148,7 @@ module M2 {
 >A : Symbol(A, Decl(mergeThreeInterfaces2.ts, 30, 22), Decl(mergeThreeInterfaces2.ts, 42, 22), Decl(mergeThreeInterfaces2.ts, 56, 22))
 
             baz: boolean;
->baz : Symbol(baz, Decl(mergeThreeInterfaces2.ts, 57, 28))
+>baz : Symbol(A.baz, Decl(mergeThreeInterfaces2.ts, 57, 28))
         }
 
         var a: A;
diff --git a/tests/baselines/reference/mergeTwoInterfaces.symbols b/tests/baselines/reference/mergeTwoInterfaces.symbols
index d34ad6ec9a2..c2c78eb83e8 100644
--- a/tests/baselines/reference/mergeTwoInterfaces.symbols
+++ b/tests/baselines/reference/mergeTwoInterfaces.symbols
@@ -6,14 +6,14 @@ interface A {
 >A : Symbol(A, Decl(mergeTwoInterfaces.ts, 0, 0), Decl(mergeTwoInterfaces.ts, 5, 1))
 
     foo: string;
->foo : Symbol(foo, Decl(mergeTwoInterfaces.ts, 3, 13))
+>foo : Symbol(A.foo, Decl(mergeTwoInterfaces.ts, 3, 13))
 }
 
 interface A {
 >A : Symbol(A, Decl(mergeTwoInterfaces.ts, 0, 0), Decl(mergeTwoInterfaces.ts, 5, 1))
 
     bar: number;
->bar : Symbol(bar, Decl(mergeTwoInterfaces.ts, 7, 13))
+>bar : Symbol(A.bar, Decl(mergeTwoInterfaces.ts, 7, 13))
 }
 
 var a: A;
@@ -38,10 +38,10 @@ interface B<T> {
 >T : Symbol(T, Decl(mergeTwoInterfaces.ts, 16, 12), Decl(mergeTwoInterfaces.ts, 21, 12))
 
     baz: string;
->baz : Symbol(baz, Decl(mergeTwoInterfaces.ts, 16, 16))
+>baz : Symbol(B.baz, Decl(mergeTwoInterfaces.ts, 16, 16))
 
     foo: T;
->foo : Symbol(foo, Decl(mergeTwoInterfaces.ts, 17, 16))
+>foo : Symbol(B.foo, Decl(mergeTwoInterfaces.ts, 17, 16))
 >T : Symbol(T, Decl(mergeTwoInterfaces.ts, 16, 12), Decl(mergeTwoInterfaces.ts, 21, 12))
 }
 
@@ -50,7 +50,7 @@ interface B<T> {
 >T : Symbol(T, Decl(mergeTwoInterfaces.ts, 16, 12), Decl(mergeTwoInterfaces.ts, 21, 12))
 
     bar: T;
->bar : Symbol(bar, Decl(mergeTwoInterfaces.ts, 21, 16))
+>bar : Symbol(B.bar, Decl(mergeTwoInterfaces.ts, 21, 16))
 >T : Symbol(T, Decl(mergeTwoInterfaces.ts, 16, 12), Decl(mergeTwoInterfaces.ts, 21, 12))
 }
 
@@ -78,14 +78,14 @@ module M {
 >A : Symbol(A, Decl(mergeTwoInterfaces.ts, 30, 10), Decl(mergeTwoInterfaces.ts, 33, 5))
 
         foo: string;
->foo : Symbol(foo, Decl(mergeTwoInterfaces.ts, 31, 17))
+>foo : Symbol(A.foo, Decl(mergeTwoInterfaces.ts, 31, 17))
     }
 
     interface A {
 >A : Symbol(A, Decl(mergeTwoInterfaces.ts, 30, 10), Decl(mergeTwoInterfaces.ts, 33, 5))
 
         bar: number;
->bar : Symbol(bar, Decl(mergeTwoInterfaces.ts, 35, 17))
+>bar : Symbol(A.bar, Decl(mergeTwoInterfaces.ts, 35, 17))
     }
 
     var a: A;
@@ -110,7 +110,7 @@ module M {
 >T : Symbol(T, Decl(mergeTwoInterfaces.ts, 44, 16), Decl(mergeTwoInterfaces.ts, 48, 16))
 
         foo: T;
->foo : Symbol(foo, Decl(mergeTwoInterfaces.ts, 44, 20))
+>foo : Symbol(B.foo, Decl(mergeTwoInterfaces.ts, 44, 20))
 >T : Symbol(T, Decl(mergeTwoInterfaces.ts, 44, 16), Decl(mergeTwoInterfaces.ts, 48, 16))
     }
 
@@ -119,7 +119,7 @@ module M {
 >T : Symbol(T, Decl(mergeTwoInterfaces.ts, 44, 16), Decl(mergeTwoInterfaces.ts, 48, 16))
 
         bar: T;
->bar : Symbol(bar, Decl(mergeTwoInterfaces.ts, 48, 20))
+>bar : Symbol(B.bar, Decl(mergeTwoInterfaces.ts, 48, 20))
 >T : Symbol(T, Decl(mergeTwoInterfaces.ts, 44, 16), Decl(mergeTwoInterfaces.ts, 48, 16))
     }
 
diff --git a/tests/baselines/reference/mergeTwoInterfaces2.symbols b/tests/baselines/reference/mergeTwoInterfaces2.symbols
index 661fbdc14d4..ea438343ad9 100644
--- a/tests/baselines/reference/mergeTwoInterfaces2.symbols
+++ b/tests/baselines/reference/mergeTwoInterfaces2.symbols
@@ -9,7 +9,7 @@ module M2 {
 >A : Symbol(A, Decl(mergeTwoInterfaces2.ts, 3, 11), Decl(mergeTwoInterfaces2.ts, 13, 11))
 
         foo: string;
->foo : Symbol(foo, Decl(mergeTwoInterfaces2.ts, 4, 24))
+>foo : Symbol(A.foo, Decl(mergeTwoInterfaces2.ts, 4, 24))
     }
 
     var a: A;
@@ -36,7 +36,7 @@ module M2 {
 >A : Symbol(A, Decl(mergeTwoInterfaces2.ts, 3, 11), Decl(mergeTwoInterfaces2.ts, 13, 11))
 
         bar: number;
->bar : Symbol(bar, Decl(mergeTwoInterfaces2.ts, 14, 24))
+>bar : Symbol(A.bar, Decl(mergeTwoInterfaces2.ts, 14, 24))
     }
 
     var a: A;
@@ -67,7 +67,7 @@ module M2 {
 >A : Symbol(A, Decl(mergeTwoInterfaces2.ts, 25, 22), Decl(mergeTwoInterfaces2.ts, 37, 22))
 
             foo: string;
->foo : Symbol(foo, Decl(mergeTwoInterfaces2.ts, 26, 28))
+>foo : Symbol(A.foo, Decl(mergeTwoInterfaces2.ts, 26, 28))
         }
 
         var a: A;
@@ -98,7 +98,7 @@ module M2 {
 >A : Symbol(A, Decl(mergeTwoInterfaces2.ts, 25, 22), Decl(mergeTwoInterfaces2.ts, 37, 22))
 
             bar: number;
->bar : Symbol(bar, Decl(mergeTwoInterfaces2.ts, 38, 28))
+>bar : Symbol(A.bar, Decl(mergeTwoInterfaces2.ts, 38, 28))
         }
 
         var a: A;
diff --git a/tests/baselines/reference/mergeWithImportedNamespace.js b/tests/baselines/reference/mergeWithImportedNamespace.js
new file mode 100644
index 00000000000..60f6fedd3f2
--- /dev/null
+++ b/tests/baselines/reference/mergeWithImportedNamespace.js
@@ -0,0 +1,20 @@
+//// [tests/cases/compiler/mergeWithImportedNamespace.ts] ////
+
+//// [f1.ts]
+export namespace N { export var x = 1; }
+
+//// [f2.ts]
+import {N} from "./f1";
+// partial revert of https://github.com/Microsoft/TypeScript/pull/7583 to prevent breaking changes
+export namespace N {
+    export interface I {x: any}
+}
+
+//// [f1.js]
+"use strict";
+var N;
+(function (N) {
+    N.x = 1;
+})(N = exports.N || (exports.N = {}));
+//// [f2.js]
+"use strict";
diff --git a/tests/baselines/reference/mergeWithImportedNamespace.symbols b/tests/baselines/reference/mergeWithImportedNamespace.symbols
new file mode 100644
index 00000000000..58b0f0a811f
--- /dev/null
+++ b/tests/baselines/reference/mergeWithImportedNamespace.symbols
@@ -0,0 +1,17 @@
+=== tests/cases/compiler/f1.ts ===
+export namespace N { export var x = 1; }
+>N : Symbol(N, Decl(f1.ts, 0, 0))
+>x : Symbol(x, Decl(f1.ts, 0, 31))
+
+=== tests/cases/compiler/f2.ts ===
+import {N} from "./f1";
+>N : Symbol(N, Decl(f2.ts, 0, 8), Decl(f2.ts, 0, 23))
+
+// partial revert of https://github.com/Microsoft/TypeScript/pull/7583 to prevent breaking changes
+export namespace N {
+>N : Symbol(N, Decl(f2.ts, 0, 23))
+
+    export interface I {x: any}
+>I : Symbol(I, Decl(f2.ts, 2, 20))
+>x : Symbol(I.x, Decl(f2.ts, 3, 24))
+}
diff --git a/tests/baselines/reference/mergeWithImportedNamespace.types b/tests/baselines/reference/mergeWithImportedNamespace.types
new file mode 100644
index 00000000000..d6c1df3b609
--- /dev/null
+++ b/tests/baselines/reference/mergeWithImportedNamespace.types
@@ -0,0 +1,18 @@
+=== tests/cases/compiler/f1.ts ===
+export namespace N { export var x = 1; }
+>N : typeof N
+>x : number
+>1 : number
+
+=== tests/cases/compiler/f2.ts ===
+import {N} from "./f1";
+>N : typeof N
+
+// partial revert of https://github.com/Microsoft/TypeScript/pull/7583 to prevent breaking changes
+export namespace N {
+>N : any
+
+    export interface I {x: any}
+>I : I
+>x : any
+}
diff --git a/tests/baselines/reference/mergeWithImportedType.js b/tests/baselines/reference/mergeWithImportedType.js
new file mode 100644
index 00000000000..89fc353d395
--- /dev/null
+++ b/tests/baselines/reference/mergeWithImportedType.js
@@ -0,0 +1,18 @@
+//// [tests/cases/compiler/mergeWithImportedType.ts] ////
+
+//// [f1.ts]
+export enum E {X}
+
+//// [f2.ts]
+import {E} from "./f1";
+// partial revert of https://github.com/Microsoft/TypeScript/pull/7583 to prevent breaking changes
+export type E = E;
+
+//// [f1.js]
+"use strict";
+(function (E) {
+    E[E["X"] = 0] = "X";
+})(exports.E || (exports.E = {}));
+var E = exports.E;
+//// [f2.js]
+"use strict";
diff --git a/tests/baselines/reference/mergeWithImportedType.symbols b/tests/baselines/reference/mergeWithImportedType.symbols
new file mode 100644
index 00000000000..d14d76f91e7
--- /dev/null
+++ b/tests/baselines/reference/mergeWithImportedType.symbols
@@ -0,0 +1,14 @@
+=== tests/cases/compiler/f1.ts ===
+export enum E {X}
+>E : Symbol(E, Decl(f1.ts, 0, 0))
+>X : Symbol(E.X, Decl(f1.ts, 0, 15))
+
+=== tests/cases/compiler/f2.ts ===
+import {E} from "./f1";
+>E : Symbol(E, Decl(f2.ts, 0, 8), Decl(f2.ts, 0, 23))
+
+// partial revert of https://github.com/Microsoft/TypeScript/pull/7583 to prevent breaking changes
+export type E = E;
+>E : Symbol(E, Decl(f2.ts, 0, 23))
+>E : Symbol(E, Decl(f2.ts, 0, 8), Decl(f2.ts, 0, 23))
+
diff --git a/tests/baselines/reference/mergeWithImportedType.types b/tests/baselines/reference/mergeWithImportedType.types
new file mode 100644
index 00000000000..583492444c5
--- /dev/null
+++ b/tests/baselines/reference/mergeWithImportedType.types
@@ -0,0 +1,14 @@
+=== tests/cases/compiler/f1.ts ===
+export enum E {X}
+>E : E
+>X : E
+
+=== tests/cases/compiler/f2.ts ===
+import {E} from "./f1";
+>E : typeof E
+
+// partial revert of https://github.com/Microsoft/TypeScript/pull/7583 to prevent breaking changes
+export type E = E;
+>E : E
+>E : E
+
diff --git a/tests/baselines/reference/mergedClassInterface.symbols b/tests/baselines/reference/mergedClassInterface.symbols
index 1c452851780..8de9a9557c1 100644
--- a/tests/baselines/reference/mergedClassInterface.symbols
+++ b/tests/baselines/reference/mergedClassInterface.symbols
@@ -29,28 +29,28 @@ interface C5 {
 >C5 : Symbol(C5, Decl(file1.ts, 16, 12), Decl(file1.ts, 20, 1), Decl(file1.ts, 24, 1), Decl(file1.ts, 28, 1))
 
     x1: number;
->x1 : Symbol(x1, Decl(file1.ts, 18, 14))
+>x1 : Symbol(C5.x1, Decl(file1.ts, 18, 14))
 }
 
 declare class C5 {
 >C5 : Symbol(C5, Decl(file1.ts, 16, 12), Decl(file1.ts, 20, 1), Decl(file1.ts, 24, 1), Decl(file1.ts, 28, 1))
 
     x2: number;
->x2 : Symbol(x2, Decl(file1.ts, 22, 18))
+>x2 : Symbol(C5.x2, Decl(file1.ts, 22, 18))
 }
 
 interface C5 {
 >C5 : Symbol(C5, Decl(file1.ts, 16, 12), Decl(file1.ts, 20, 1), Decl(file1.ts, 24, 1), Decl(file1.ts, 28, 1))
 
     x3: number;
->x3 : Symbol(x3, Decl(file1.ts, 26, 14))
+>x3 : Symbol(C5.x3, Decl(file1.ts, 26, 14))
 }
 
 interface C5 {
 >C5 : Symbol(C5, Decl(file1.ts, 16, 12), Decl(file1.ts, 20, 1), Decl(file1.ts, 24, 1), Decl(file1.ts, 28, 1))
 
     x4: number;
->x4 : Symbol(x4, Decl(file1.ts, 30, 14))
+>x4 : Symbol(C5.x4, Decl(file1.ts, 30, 14))
 }
 
 // checks if properties actually were merged
diff --git a/tests/baselines/reference/mergedDeclarations1.symbols b/tests/baselines/reference/mergedDeclarations1.symbols
index 733b9c4ee32..1e84f89aacd 100644
--- a/tests/baselines/reference/mergedDeclarations1.symbols
+++ b/tests/baselines/reference/mergedDeclarations1.symbols
@@ -3,10 +3,10 @@ interface Point {
 >Point : Symbol(Point, Decl(mergedDeclarations1.ts, 0, 0))
 
     x: number;
->x : Symbol(x, Decl(mergedDeclarations1.ts, 0, 17))
+>x : Symbol(Point.x, Decl(mergedDeclarations1.ts, 0, 17))
 
     y: number;
->y : Symbol(y, Decl(mergedDeclarations1.ts, 1, 14))
+>y : Symbol(Point.y, Decl(mergedDeclarations1.ts, 1, 14))
 }
 function point(x: number, y: number): Point {
 >point : Symbol(point, Decl(mergedDeclarations1.ts, 3, 1), Decl(mergedDeclarations1.ts, 6, 1))
diff --git a/tests/baselines/reference/mergedDeclarations5.symbols b/tests/baselines/reference/mergedDeclarations5.symbols
index abe1743de1c..1cbb5c333ba 100644
--- a/tests/baselines/reference/mergedDeclarations5.symbols
+++ b/tests/baselines/reference/mergedDeclarations5.symbols
@@ -3,7 +3,7 @@ class A {
 >A : Symbol(A, Decl(a.ts, 0, 0), Decl(b.ts, 0, 0))
 
     protected foo() {}
->foo : Symbol(foo, Decl(a.ts, 0, 9))
+>foo : Symbol(A.foo, Decl(a.ts, 0, 9))
 }
 === tests/cases/compiler/b.ts ===
 interface A { }
@@ -14,5 +14,5 @@ class B extends A {
 >A : Symbol(A, Decl(a.ts, 0, 0), Decl(b.ts, 0, 0))
 
     protected foo() {}
->foo : Symbol(foo, Decl(b.ts, 2, 19))
+>foo : Symbol(B.foo, Decl(b.ts, 2, 19))
 }
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/mergedDeclarations6.symbols b/tests/baselines/reference/mergedDeclarations6.symbols
index b0d49532384..a51dcf75e9c 100644
--- a/tests/baselines/reference/mergedDeclarations6.symbols
+++ b/tests/baselines/reference/mergedDeclarations6.symbols
@@ -4,16 +4,16 @@ export class A {
 >A : Symbol(A, Decl(a.ts, 0, 0), Decl(b.ts, 2, 22))
 
     protected protected: any;
->protected : Symbol(protected, Decl(a.ts, 1, 16))
+>protected : Symbol(A.protected, Decl(a.ts, 1, 16))
 
     protected setProtected(val: any) {
->setProtected : Symbol(setProtected, Decl(a.ts, 2, 29))
+>setProtected : Symbol(A.setProtected, Decl(a.ts, 2, 29))
 >val : Symbol(val, Decl(a.ts, 4, 27))
 
         this.protected = val;
->this.protected : Symbol(protected, Decl(a.ts, 1, 16))
+>this.protected : Symbol(A.protected, Decl(a.ts, 1, 16))
 >this : Symbol(A, Decl(a.ts, 0, 0), Decl(b.ts, 2, 22))
->protected : Symbol(protected, Decl(a.ts, 1, 16))
+>protected : Symbol(A.protected, Decl(a.ts, 1, 16))
 >val : Symbol(val, Decl(a.ts, 4, 27))
     }
 }
@@ -32,7 +32,7 @@ export class B extends A {
 >A : Symbol(A, Decl(b.ts, 0, 8))
 
     protected setProtected() {
->setProtected : Symbol(setProtected, Decl(b.ts, 6, 26))
+>setProtected : Symbol(B.setProtected, Decl(b.ts, 6, 26))
 
     }
 }
diff --git a/tests/baselines/reference/mergedInheritedClassInterface.symbols b/tests/baselines/reference/mergedInheritedClassInterface.symbols
index 5f4ae67df6f..b829ba073d8 100644
--- a/tests/baselines/reference/mergedInheritedClassInterface.symbols
+++ b/tests/baselines/reference/mergedInheritedClassInterface.symbols
@@ -3,20 +3,20 @@ interface BaseInterface {
 >BaseInterface : Symbol(BaseInterface, Decl(mergedInheritedClassInterface.ts, 0, 0))
 
     required: number;
->required : Symbol(required, Decl(mergedInheritedClassInterface.ts, 0, 25))
+>required : Symbol(BaseInterface.required, Decl(mergedInheritedClassInterface.ts, 0, 25))
 
     optional?: number;
->optional : Symbol(optional, Decl(mergedInheritedClassInterface.ts, 1, 21))
+>optional : Symbol(BaseInterface.optional, Decl(mergedInheritedClassInterface.ts, 1, 21))
 }
 
 class BaseClass {
 >BaseClass : Symbol(BaseClass, Decl(mergedInheritedClassInterface.ts, 3, 1))
 
     baseMethod() { }
->baseMethod : Symbol(baseMethod, Decl(mergedInheritedClassInterface.ts, 5, 17))
+>baseMethod : Symbol(BaseClass.baseMethod, Decl(mergedInheritedClassInterface.ts, 5, 17))
 
     baseNumber: number;
->baseNumber : Symbol(baseNumber, Decl(mergedInheritedClassInterface.ts, 6, 20))
+>baseNumber : Symbol(BaseClass.baseNumber, Decl(mergedInheritedClassInterface.ts, 6, 20))
 }
 
 interface Child extends BaseInterface {
@@ -24,7 +24,7 @@ interface Child extends BaseInterface {
 >BaseInterface : Symbol(BaseInterface, Decl(mergedInheritedClassInterface.ts, 0, 0))
 
     additional: number;
->additional : Symbol(additional, Decl(mergedInheritedClassInterface.ts, 10, 39))
+>additional : Symbol(Child.additional, Decl(mergedInheritedClassInterface.ts, 10, 39))
 }
 
 class Child extends BaseClass {
@@ -32,10 +32,10 @@ class Child extends BaseClass {
 >BaseClass : Symbol(BaseClass, Decl(mergedInheritedClassInterface.ts, 3, 1))
 
     classNumber: number;
->classNumber : Symbol(classNumber, Decl(mergedInheritedClassInterface.ts, 14, 31))
+>classNumber : Symbol(Child.classNumber, Decl(mergedInheritedClassInterface.ts, 14, 31))
 
     method() { }
->method : Symbol(method, Decl(mergedInheritedClassInterface.ts, 15, 24))
+>method : Symbol(Child.method, Decl(mergedInheritedClassInterface.ts, 15, 24))
 }
 
 interface ChildNoBaseClass extends BaseInterface {
@@ -43,16 +43,16 @@ interface ChildNoBaseClass extends BaseInterface {
 >BaseInterface : Symbol(BaseInterface, Decl(mergedInheritedClassInterface.ts, 0, 0))
 
     additional2: string;
->additional2 : Symbol(additional2, Decl(mergedInheritedClassInterface.ts, 19, 50))
+>additional2 : Symbol(ChildNoBaseClass.additional2, Decl(mergedInheritedClassInterface.ts, 19, 50))
 }
 class ChildNoBaseClass {
 >ChildNoBaseClass : Symbol(ChildNoBaseClass, Decl(mergedInheritedClassInterface.ts, 17, 1), Decl(mergedInheritedClassInterface.ts, 21, 1))
 
     classString: string;
->classString : Symbol(classString, Decl(mergedInheritedClassInterface.ts, 22, 24))
+>classString : Symbol(ChildNoBaseClass.classString, Decl(mergedInheritedClassInterface.ts, 22, 24))
 
     method2() { }
->method2 : Symbol(method2, Decl(mergedInheritedClassInterface.ts, 23, 24))
+>method2 : Symbol(ChildNoBaseClass.method2, Decl(mergedInheritedClassInterface.ts, 23, 24))
 }
 class Grandchild extends ChildNoBaseClass {
 >Grandchild : Symbol(Grandchild, Decl(mergedInheritedClassInterface.ts, 25, 1))
diff --git a/tests/baselines/reference/mergedInterfaceFromMultipleFiles1.symbols b/tests/baselines/reference/mergedInterfaceFromMultipleFiles1.symbols
index 78383c29377..4dffd06bcde 100644
--- a/tests/baselines/reference/mergedInterfaceFromMultipleFiles1.symbols
+++ b/tests/baselines/reference/mergedInterfaceFromMultipleFiles1.symbols
@@ -3,15 +3,15 @@
 
 interface D { bar(): number; }
 >D : Symbol(D, Decl(mergedInterfaceFromMultipleFiles1_1.ts, 0, 0))
->bar : Symbol(bar, Decl(mergedInterfaceFromMultipleFiles1_1.ts, 2, 13))
+>bar : Symbol(D.bar, Decl(mergedInterfaceFromMultipleFiles1_1.ts, 2, 13))
 
 interface C extends D {
 >C : Symbol(C, Decl(mergedInterfaceFromMultipleFiles1_0.ts, 1, 30), Decl(mergedInterfaceFromMultipleFiles1_1.ts, 2, 30))
 >D : Symbol(D, Decl(mergedInterfaceFromMultipleFiles1_1.ts, 0, 0))
 
 	b(): Date;
->b : Symbol(b, Decl(mergedInterfaceFromMultipleFiles1_1.ts, 4, 23))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>b : Symbol(C.b, Decl(mergedInterfaceFromMultipleFiles1_1.ts, 4, 23))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
 var c:C;
@@ -38,7 +38,7 @@ var d: number = c.a();
 
 var e: Date = c.b();
 >e : Symbol(e, Decl(mergedInterfaceFromMultipleFiles1_1.ts, 12, 3))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >c.b : Symbol(C.b, Decl(mergedInterfaceFromMultipleFiles1_1.ts, 4, 23))
 >c : Symbol(c, Decl(mergedInterfaceFromMultipleFiles1_1.ts, 8, 3))
 >b : Symbol(C.b, Decl(mergedInterfaceFromMultipleFiles1_1.ts, 4, 23))
@@ -47,13 +47,13 @@ var e: Date = c.b();
 
 interface I { foo(): string; }
 >I : Symbol(I, Decl(mergedInterfaceFromMultipleFiles1_0.ts, 0, 0))
->foo : Symbol(foo, Decl(mergedInterfaceFromMultipleFiles1_0.ts, 1, 13))
+>foo : Symbol(I.foo, Decl(mergedInterfaceFromMultipleFiles1_0.ts, 1, 13))
 
 interface C extends I {
 >C : Symbol(C, Decl(mergedInterfaceFromMultipleFiles1_0.ts, 1, 30), Decl(mergedInterfaceFromMultipleFiles1_1.ts, 2, 30))
 >I : Symbol(I, Decl(mergedInterfaceFromMultipleFiles1_0.ts, 0, 0))
 
 	a(): number;
->a : Symbol(a, Decl(mergedInterfaceFromMultipleFiles1_0.ts, 3, 23))
+>a : Symbol(C.a, Decl(mergedInterfaceFromMultipleFiles1_0.ts, 3, 23))
 }
 
diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.errors.txt b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.errors.txt
index 92d4cb17e72..3bd351ed003 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.errors.txt
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.errors.txt
@@ -2,7 +2,7 @@ tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheri
   Types have separate declarations of a private property 'x'.
 tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates.ts(19,7): error TS2420: Class 'E' incorrectly implements interface 'A'.
   Property 'x' is private in type 'A' but not in type 'E'.
-tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates.ts(26,9): error TS2341: Property 'x' is private and only accessible within class 'C'.
+tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates.ts(26,11): error TS2341: Property 'x' is private and only accessible within class 'C'.
 
 
 ==== tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates.ts (3 errors) ====
@@ -38,5 +38,5 @@ tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheri
     
     var a: A;
     var r = a.x; // error
-            ~~~
+              ~
 !!! error TS2341: Property 'x' is private and only accessible within class 'C'.
\ No newline at end of file
diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.errors.txt b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.errors.txt
index 8fc1f0fe819..eaf516146f4 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.errors.txt
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.errors.txt
@@ -4,8 +4,8 @@ tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheri
   Property 'w' is private in type 'C2' but not in type 'E'.
 tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates2.ts(23,7): error TS2420: Class 'E' incorrectly implements interface 'A'.
   Property 'x' is missing in type 'E'.
-tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates2.ts(30,9): error TS2341: Property 'x' is private and only accessible within class 'C'.
-tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates2.ts(31,10): error TS2341: Property 'w' is private and only accessible within class 'C2'.
+tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates2.ts(30,11): error TS2341: Property 'x' is private and only accessible within class 'C'.
+tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates2.ts(31,12): error TS2341: Property 'w' is private and only accessible within class 'C2'.
 
 
 ==== tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheritedPrivates2.ts (5 errors) ====
@@ -48,8 +48,8 @@ tests/cases/conformance/interfaces/declarationMerging/mergedInterfacesWithInheri
     
     var a: A;
     var r = a.x; // error
-            ~~~
+              ~
 !!! error TS2341: Property 'x' is private and only accessible within class 'C'.
     var r2 = a.w; // error
-             ~~~
+               ~
 !!! error TS2341: Property 'w' is private and only accessible within class 'C2'.
\ No newline at end of file
diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases.symbols b/tests/baselines/reference/mergedInterfacesWithMultipleBases.symbols
index b3fe87bca29..c4275b45908 100644
--- a/tests/baselines/reference/mergedInterfacesWithMultipleBases.symbols
+++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases.symbols
@@ -6,14 +6,14 @@ class C {
 >C : Symbol(C, Decl(mergedInterfacesWithMultipleBases.ts, 0, 0))
 
     a: number;
->a : Symbol(a, Decl(mergedInterfacesWithMultipleBases.ts, 3, 9))
+>a : Symbol(C.a, Decl(mergedInterfacesWithMultipleBases.ts, 3, 9))
 }
 
 class C2 {
 >C2 : Symbol(C2, Decl(mergedInterfacesWithMultipleBases.ts, 5, 1))
 
     b: number;
->b : Symbol(b, Decl(mergedInterfacesWithMultipleBases.ts, 7, 10))
+>b : Symbol(C2.b, Decl(mergedInterfacesWithMultipleBases.ts, 7, 10))
 }
 
 interface A extends C {
@@ -21,7 +21,7 @@ interface A extends C {
 >C : Symbol(C, Decl(mergedInterfacesWithMultipleBases.ts, 0, 0))
 
     y: string;
->y : Symbol(y, Decl(mergedInterfacesWithMultipleBases.ts, 11, 23))
+>y : Symbol(A.y, Decl(mergedInterfacesWithMultipleBases.ts, 11, 23))
 }
 
 interface A extends C2 {
@@ -29,7 +29,7 @@ interface A extends C2 {
 >C2 : Symbol(C2, Decl(mergedInterfacesWithMultipleBases.ts, 5, 1))
 
     z: string;
->z : Symbol(z, Decl(mergedInterfacesWithMultipleBases.ts, 15, 24))
+>z : Symbol(A.z, Decl(mergedInterfacesWithMultipleBases.ts, 15, 24))
 }
 
 class D implements A {
@@ -37,16 +37,16 @@ class D implements A {
 >A : Symbol(A, Decl(mergedInterfacesWithMultipleBases.ts, 9, 1), Decl(mergedInterfacesWithMultipleBases.ts, 13, 1))
 
     a: number;
->a : Symbol(a, Decl(mergedInterfacesWithMultipleBases.ts, 19, 22))
+>a : Symbol(D.a, Decl(mergedInterfacesWithMultipleBases.ts, 19, 22))
 
     b: number;
->b : Symbol(b, Decl(mergedInterfacesWithMultipleBases.ts, 20, 14))
+>b : Symbol(D.b, Decl(mergedInterfacesWithMultipleBases.ts, 20, 14))
 
     y: string;
->y : Symbol(y, Decl(mergedInterfacesWithMultipleBases.ts, 21, 14))
+>y : Symbol(D.y, Decl(mergedInterfacesWithMultipleBases.ts, 21, 14))
 
     z: string;
->z : Symbol(z, Decl(mergedInterfacesWithMultipleBases.ts, 22, 14))
+>z : Symbol(D.z, Decl(mergedInterfacesWithMultipleBases.ts, 22, 14))
 }
 
 var a: A;
@@ -68,7 +68,7 @@ module M {
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases.ts, 31, 12))
 
         a: T;
->a : Symbol(a, Decl(mergedInterfacesWithMultipleBases.ts, 31, 16))
+>a : Symbol(C.a, Decl(mergedInterfacesWithMultipleBases.ts, 31, 16))
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases.ts, 31, 12))
     }
 
@@ -77,7 +77,7 @@ module M {
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases.ts, 35, 13))
 
         b: T;
->b : Symbol(b, Decl(mergedInterfacesWithMultipleBases.ts, 35, 17))
+>b : Symbol(C2.b, Decl(mergedInterfacesWithMultipleBases.ts, 35, 17))
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases.ts, 35, 13))
     }
 
@@ -88,7 +88,7 @@ module M {
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases.ts, 39, 16), Decl(mergedInterfacesWithMultipleBases.ts, 43, 16))
 
         y: T;
->y : Symbol(y, Decl(mergedInterfacesWithMultipleBases.ts, 39, 33))
+>y : Symbol(A.y, Decl(mergedInterfacesWithMultipleBases.ts, 39, 33))
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases.ts, 39, 16), Decl(mergedInterfacesWithMultipleBases.ts, 43, 16))
     }
 
@@ -98,7 +98,7 @@ module M {
 >C2 : Symbol(C2, Decl(mergedInterfacesWithMultipleBases.ts, 33, 5))
 
         z: T;
->z : Symbol(z, Decl(mergedInterfacesWithMultipleBases.ts, 43, 39))
+>z : Symbol(A.z, Decl(mergedInterfacesWithMultipleBases.ts, 43, 39))
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases.ts, 39, 16), Decl(mergedInterfacesWithMultipleBases.ts, 43, 16))
     }
 
@@ -107,15 +107,15 @@ module M {
 >A : Symbol(A, Decl(mergedInterfacesWithMultipleBases.ts, 37, 5), Decl(mergedInterfacesWithMultipleBases.ts, 41, 5))
 
         a: boolean;
->a : Symbol(a, Decl(mergedInterfacesWithMultipleBases.ts, 47, 35))
+>a : Symbol(D.a, Decl(mergedInterfacesWithMultipleBases.ts, 47, 35))
 
         b: string;
->b : Symbol(b, Decl(mergedInterfacesWithMultipleBases.ts, 48, 19))
+>b : Symbol(D.b, Decl(mergedInterfacesWithMultipleBases.ts, 48, 19))
 
         y: boolean;
->y : Symbol(y, Decl(mergedInterfacesWithMultipleBases.ts, 49, 18))
+>y : Symbol(D.y, Decl(mergedInterfacesWithMultipleBases.ts, 49, 18))
 
         z: boolean;
->z : Symbol(z, Decl(mergedInterfacesWithMultipleBases.ts, 50, 19))
+>z : Symbol(D.z, Decl(mergedInterfacesWithMultipleBases.ts, 50, 19))
     }
 }
diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases2.symbols b/tests/baselines/reference/mergedInterfacesWithMultipleBases2.symbols
index 7424e0d110b..a71f3838f7f 100644
--- a/tests/baselines/reference/mergedInterfacesWithMultipleBases2.symbols
+++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases2.symbols
@@ -6,28 +6,28 @@ class C {
 >C : Symbol(C, Decl(mergedInterfacesWithMultipleBases2.ts, 0, 0))
 
     a: number;
->a : Symbol(a, Decl(mergedInterfacesWithMultipleBases2.ts, 3, 9))
+>a : Symbol(C.a, Decl(mergedInterfacesWithMultipleBases2.ts, 3, 9))
 }
 
 class C2 {
 >C2 : Symbol(C2, Decl(mergedInterfacesWithMultipleBases2.ts, 5, 1))
 
     b: number;
->b : Symbol(b, Decl(mergedInterfacesWithMultipleBases2.ts, 7, 10))
+>b : Symbol(C2.b, Decl(mergedInterfacesWithMultipleBases2.ts, 7, 10))
 }
 
 class C3 {
 >C3 : Symbol(C3, Decl(mergedInterfacesWithMultipleBases2.ts, 9, 1))
 
     c: string;
->c : Symbol(c, Decl(mergedInterfacesWithMultipleBases2.ts, 11, 10))
+>c : Symbol(C3.c, Decl(mergedInterfacesWithMultipleBases2.ts, 11, 10))
 }
 
 class C4 {
 >C4 : Symbol(C4, Decl(mergedInterfacesWithMultipleBases2.ts, 13, 1))
 
     d: string;
->d : Symbol(d, Decl(mergedInterfacesWithMultipleBases2.ts, 15, 10))
+>d : Symbol(C4.d, Decl(mergedInterfacesWithMultipleBases2.ts, 15, 10))
 }
 
 
@@ -37,7 +37,7 @@ interface A extends C, C3 {
 >C3 : Symbol(C3, Decl(mergedInterfacesWithMultipleBases2.ts, 9, 1))
 
     y: string;
->y : Symbol(y, Decl(mergedInterfacesWithMultipleBases2.ts, 20, 27))
+>y : Symbol(A.y, Decl(mergedInterfacesWithMultipleBases2.ts, 20, 27))
 }
 
 interface A extends C2, C4 {
@@ -46,7 +46,7 @@ interface A extends C2, C4 {
 >C4 : Symbol(C4, Decl(mergedInterfacesWithMultipleBases2.ts, 13, 1))
 
     z: string;
->z : Symbol(z, Decl(mergedInterfacesWithMultipleBases2.ts, 24, 28))
+>z : Symbol(A.z, Decl(mergedInterfacesWithMultipleBases2.ts, 24, 28))
 }
 
 class D implements A {
@@ -54,22 +54,22 @@ class D implements A {
 >A : Symbol(A, Decl(mergedInterfacesWithMultipleBases2.ts, 17, 1), Decl(mergedInterfacesWithMultipleBases2.ts, 22, 1))
 
     a: number;
->a : Symbol(a, Decl(mergedInterfacesWithMultipleBases2.ts, 28, 22))
+>a : Symbol(D.a, Decl(mergedInterfacesWithMultipleBases2.ts, 28, 22))
 
     b: number;
->b : Symbol(b, Decl(mergedInterfacesWithMultipleBases2.ts, 29, 14))
+>b : Symbol(D.b, Decl(mergedInterfacesWithMultipleBases2.ts, 29, 14))
 
     c: string;
->c : Symbol(c, Decl(mergedInterfacesWithMultipleBases2.ts, 30, 14))
+>c : Symbol(D.c, Decl(mergedInterfacesWithMultipleBases2.ts, 30, 14))
 
     d: string;
->d : Symbol(d, Decl(mergedInterfacesWithMultipleBases2.ts, 31, 14))
+>d : Symbol(D.d, Decl(mergedInterfacesWithMultipleBases2.ts, 31, 14))
 
     y: string;
->y : Symbol(y, Decl(mergedInterfacesWithMultipleBases2.ts, 32, 14))
+>y : Symbol(D.y, Decl(mergedInterfacesWithMultipleBases2.ts, 32, 14))
 
     z: string;
->z : Symbol(z, Decl(mergedInterfacesWithMultipleBases2.ts, 33, 14))
+>z : Symbol(D.z, Decl(mergedInterfacesWithMultipleBases2.ts, 33, 14))
 }
 
 var a: A;
@@ -91,7 +91,7 @@ module M {
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases2.ts, 42, 12))
 
         a: T;
->a : Symbol(a, Decl(mergedInterfacesWithMultipleBases2.ts, 42, 16))
+>a : Symbol(C.a, Decl(mergedInterfacesWithMultipleBases2.ts, 42, 16))
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases2.ts, 42, 12))
     }
 
@@ -100,7 +100,7 @@ module M {
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases2.ts, 46, 13))
 
         b: T;
->b : Symbol(b, Decl(mergedInterfacesWithMultipleBases2.ts, 46, 17))
+>b : Symbol(C2.b, Decl(mergedInterfacesWithMultipleBases2.ts, 46, 17))
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases2.ts, 46, 13))
     }
 
@@ -109,7 +109,7 @@ module M {
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases2.ts, 50, 13))
 
         c: T;
->c : Symbol(c, Decl(mergedInterfacesWithMultipleBases2.ts, 50, 17))
+>c : Symbol(C3.c, Decl(mergedInterfacesWithMultipleBases2.ts, 50, 17))
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases2.ts, 50, 13))
     }
 
@@ -118,7 +118,7 @@ module M {
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases2.ts, 54, 13))
 
         d: T;
->d : Symbol(d, Decl(mergedInterfacesWithMultipleBases2.ts, 54, 17))
+>d : Symbol(C4.d, Decl(mergedInterfacesWithMultipleBases2.ts, 54, 17))
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases2.ts, 54, 13))
     }
 
@@ -131,7 +131,7 @@ module M {
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases2.ts, 58, 16), Decl(mergedInterfacesWithMultipleBases2.ts, 62, 16))
 
         y: T;
->y : Symbol(y, Decl(mergedInterfacesWithMultipleBases2.ts, 58, 40))
+>y : Symbol(A.y, Decl(mergedInterfacesWithMultipleBases2.ts, 58, 40))
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases2.ts, 58, 16), Decl(mergedInterfacesWithMultipleBases2.ts, 62, 16))
     }
 
@@ -142,7 +142,7 @@ module M {
 >C4 : Symbol(C4, Decl(mergedInterfacesWithMultipleBases2.ts, 52, 5))
 
         z: T;
->z : Symbol(z, Decl(mergedInterfacesWithMultipleBases2.ts, 62, 51))
+>z : Symbol(A.z, Decl(mergedInterfacesWithMultipleBases2.ts, 62, 51))
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases2.ts, 58, 16), Decl(mergedInterfacesWithMultipleBases2.ts, 62, 16))
     }
 
@@ -151,21 +151,21 @@ module M {
 >A : Symbol(A, Decl(mergedInterfacesWithMultipleBases2.ts, 56, 5), Decl(mergedInterfacesWithMultipleBases2.ts, 60, 5))
 
         a: boolean;
->a : Symbol(a, Decl(mergedInterfacesWithMultipleBases2.ts, 66, 35))
+>a : Symbol(D.a, Decl(mergedInterfacesWithMultipleBases2.ts, 66, 35))
 
         b: string;
->b : Symbol(b, Decl(mergedInterfacesWithMultipleBases2.ts, 67, 19))
+>b : Symbol(D.b, Decl(mergedInterfacesWithMultipleBases2.ts, 67, 19))
 
         c: boolean;
->c : Symbol(c, Decl(mergedInterfacesWithMultipleBases2.ts, 68, 18))
+>c : Symbol(D.c, Decl(mergedInterfacesWithMultipleBases2.ts, 68, 18))
 
         d: string;
->d : Symbol(d, Decl(mergedInterfacesWithMultipleBases2.ts, 69, 19))
+>d : Symbol(D.d, Decl(mergedInterfacesWithMultipleBases2.ts, 69, 19))
 
         y: boolean;
->y : Symbol(y, Decl(mergedInterfacesWithMultipleBases2.ts, 70, 18))
+>y : Symbol(D.y, Decl(mergedInterfacesWithMultipleBases2.ts, 70, 18))
 
         z: boolean;
->z : Symbol(z, Decl(mergedInterfacesWithMultipleBases2.ts, 71, 19))
+>z : Symbol(D.z, Decl(mergedInterfacesWithMultipleBases2.ts, 71, 19))
     }
 }
diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases3.symbols b/tests/baselines/reference/mergedInterfacesWithMultipleBases3.symbols
index 1aa65e8825a..de2bff45743 100644
--- a/tests/baselines/reference/mergedInterfacesWithMultipleBases3.symbols
+++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases3.symbols
@@ -7,7 +7,7 @@ class C<T> {
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases3.ts, 3, 8))
 
     a: T;
->a : Symbol(a, Decl(mergedInterfacesWithMultipleBases3.ts, 3, 12))
+>a : Symbol(C.a, Decl(mergedInterfacesWithMultipleBases3.ts, 3, 12))
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases3.ts, 3, 8))
 }
 
@@ -16,7 +16,7 @@ class C2<T> {
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases3.ts, 7, 9))
 
     b: T;
->b : Symbol(b, Decl(mergedInterfacesWithMultipleBases3.ts, 7, 13))
+>b : Symbol(C2.b, Decl(mergedInterfacesWithMultipleBases3.ts, 7, 13))
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases3.ts, 7, 9))
 }
 
@@ -25,7 +25,7 @@ class C3<T> {
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases3.ts, 11, 9))
 
     c: T;
->c : Symbol(c, Decl(mergedInterfacesWithMultipleBases3.ts, 11, 13))
+>c : Symbol(C3.c, Decl(mergedInterfacesWithMultipleBases3.ts, 11, 13))
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases3.ts, 11, 9))
 }
 
@@ -34,7 +34,7 @@ class C4<T> {
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases3.ts, 15, 9))
 
     d: T;
->d : Symbol(d, Decl(mergedInterfacesWithMultipleBases3.ts, 15, 13))
+>d : Symbol(C4.d, Decl(mergedInterfacesWithMultipleBases3.ts, 15, 13))
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases3.ts, 15, 9))
 }
 
@@ -45,7 +45,7 @@ interface A<T> extends C<string>, C3<string> {
 >C3 : Symbol(C3, Decl(mergedInterfacesWithMultipleBases3.ts, 9, 1))
 
     y: T;
->y : Symbol(y, Decl(mergedInterfacesWithMultipleBases3.ts, 19, 46))
+>y : Symbol(A.y, Decl(mergedInterfacesWithMultipleBases3.ts, 19, 46))
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases3.ts, 19, 12), Decl(mergedInterfacesWithMultipleBases3.ts, 23, 12))
 }
 
@@ -56,7 +56,7 @@ interface A<T> extends C<string>, C4<string> {
 >C4 : Symbol(C4, Decl(mergedInterfacesWithMultipleBases3.ts, 13, 1))
 
     z: T;
->z : Symbol(z, Decl(mergedInterfacesWithMultipleBases3.ts, 23, 46))
+>z : Symbol(A.z, Decl(mergedInterfacesWithMultipleBases3.ts, 23, 46))
 >T : Symbol(T, Decl(mergedInterfacesWithMultipleBases3.ts, 19, 12), Decl(mergedInterfacesWithMultipleBases3.ts, 23, 12))
 }
 
@@ -65,21 +65,21 @@ class D implements A<boolean> {
 >A : Symbol(A, Decl(mergedInterfacesWithMultipleBases3.ts, 17, 1), Decl(mergedInterfacesWithMultipleBases3.ts, 21, 1))
 
     a: string;
->a : Symbol(a, Decl(mergedInterfacesWithMultipleBases3.ts, 27, 31))
+>a : Symbol(D.a, Decl(mergedInterfacesWithMultipleBases3.ts, 27, 31))
 
     b: Date;
->b : Symbol(b, Decl(mergedInterfacesWithMultipleBases3.ts, 28, 14))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>b : Symbol(D.b, Decl(mergedInterfacesWithMultipleBases3.ts, 28, 14))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     c: string;
->c : Symbol(c, Decl(mergedInterfacesWithMultipleBases3.ts, 29, 12))
+>c : Symbol(D.c, Decl(mergedInterfacesWithMultipleBases3.ts, 29, 12))
 
     d: string;
->d : Symbol(d, Decl(mergedInterfacesWithMultipleBases3.ts, 30, 14))
+>d : Symbol(D.d, Decl(mergedInterfacesWithMultipleBases3.ts, 30, 14))
 
     y: boolean;
->y : Symbol(y, Decl(mergedInterfacesWithMultipleBases3.ts, 31, 14))
+>y : Symbol(D.y, Decl(mergedInterfacesWithMultipleBases3.ts, 31, 14))
 
     z: boolean;
->z : Symbol(z, Decl(mergedInterfacesWithMultipleBases3.ts, 32, 15))
+>z : Symbol(D.z, Decl(mergedInterfacesWithMultipleBases3.ts, 32, 15))
 }
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen.errors.txt b/tests/baselines/reference/mergedModuleDeclarationCodeGen.errors.txt
deleted file mode 100644
index a39c1c4d91a..00000000000
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen.errors.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-tests/cases/compiler/mergedModuleDeclarationCodeGen.ts(1,15): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-
-
-==== tests/cases/compiler/mergedModuleDeclarationCodeGen.ts (1 errors) ====
-    export module X {
-                  ~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-        export module Y {
-            class A {
-                constructor(Y: any) {
-                    new B();
-                }
-            }
-        }
-    }
-    export module X {
-        export module Y {
-            export class B {
-            }
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen.symbols b/tests/baselines/reference/mergedModuleDeclarationCodeGen.symbols
new file mode 100644
index 00000000000..21ec69df7df
--- /dev/null
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen.symbols
@@ -0,0 +1,30 @@
+=== tests/cases/compiler/mergedModuleDeclarationCodeGen.ts ===
+export module X {
+>X : Symbol(X, Decl(mergedModuleDeclarationCodeGen.ts, 0, 0), Decl(mergedModuleDeclarationCodeGen.ts, 8, 1))
+
+    export module Y {
+>Y : Symbol(Y, Decl(mergedModuleDeclarationCodeGen.ts, 0, 17), Decl(mergedModuleDeclarationCodeGen.ts, 9, 17))
+
+        class A {
+>A : Symbol(A, Decl(mergedModuleDeclarationCodeGen.ts, 1, 21))
+
+            constructor(Y: any) {
+>Y : Symbol(Y, Decl(mergedModuleDeclarationCodeGen.ts, 3, 24))
+
+                new B();
+>B : Symbol(B, Decl(mergedModuleDeclarationCodeGen.ts, 10, 21))
+            }
+        }
+    }
+}
+export module X {
+>X : Symbol(X, Decl(mergedModuleDeclarationCodeGen.ts, 0, 0), Decl(mergedModuleDeclarationCodeGen.ts, 8, 1))
+
+    export module Y {
+>Y : Symbol(Y, Decl(mergedModuleDeclarationCodeGen.ts, 0, 17), Decl(mergedModuleDeclarationCodeGen.ts, 9, 17))
+
+        export class B {
+>B : Symbol(B, Decl(mergedModuleDeclarationCodeGen.ts, 10, 21))
+        }
+    }
+}
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen.types b/tests/baselines/reference/mergedModuleDeclarationCodeGen.types
new file mode 100644
index 00000000000..8d250250323
--- /dev/null
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen.types
@@ -0,0 +1,31 @@
+=== tests/cases/compiler/mergedModuleDeclarationCodeGen.ts ===
+export module X {
+>X : typeof X
+
+    export module Y {
+>Y : typeof Y
+
+        class A {
+>A : A
+
+            constructor(Y: any) {
+>Y : any
+
+                new B();
+>new B() : B
+>B : typeof B
+            }
+        }
+    }
+}
+export module X {
+>X : typeof X
+
+    export module Y {
+>Y : typeof Y
+
+        export class B {
+>B : B
+        }
+    }
+}
diff --git a/tests/baselines/reference/methodContainingLocalFunction.symbols b/tests/baselines/reference/methodContainingLocalFunction.symbols
index e449d68562f..0559ad5140b 100644
--- a/tests/baselines/reference/methodContainingLocalFunction.symbols
+++ b/tests/baselines/reference/methodContainingLocalFunction.symbols
@@ -5,7 +5,7 @@ class BugExhibition<T> {
 >T : Symbol(T, Decl(methodContainingLocalFunction.ts, 1, 20))
 
     public exhibitBug() {
->exhibitBug : Symbol(exhibitBug, Decl(methodContainingLocalFunction.ts, 1, 24))
+>exhibitBug : Symbol(BugExhibition.exhibitBug, Decl(methodContainingLocalFunction.ts, 1, 24))
 
         function localFunction() { }
 >localFunction : Symbol(localFunction, Decl(methodContainingLocalFunction.ts, 2, 25))
@@ -45,7 +45,7 @@ class BugExhibition3<T> {
 >T : Symbol(T, Decl(methodContainingLocalFunction.ts, 18, 21))
 
     public exhibitBug() {
->exhibitBug : Symbol(exhibitBug, Decl(methodContainingLocalFunction.ts, 18, 25))
+>exhibitBug : Symbol(BugExhibition3.exhibitBug, Decl(methodContainingLocalFunction.ts, 18, 25))
 
         function localGenericFunction<U>(u?: U) { }
 >localGenericFunction : Symbol(localGenericFunction, Decl(methodContainingLocalFunction.ts, 19, 25))
@@ -66,7 +66,7 @@ class C {
 >C : Symbol(C, Decl(methodContainingLocalFunction.ts, 24, 1))
 
     exhibit() {
->exhibit : Symbol(exhibit, Decl(methodContainingLocalFunction.ts, 26, 9))
+>exhibit : Symbol(C.exhibit, Decl(methodContainingLocalFunction.ts, 26, 9))
 
         var funcExpr = <U>(u?: U) => { };
 >funcExpr : Symbol(funcExpr, Decl(methodContainingLocalFunction.ts, 28, 11))
diff --git a/tests/baselines/reference/methodSignatureDeclarationEmit1.symbols b/tests/baselines/reference/methodSignatureDeclarationEmit1.symbols
index 80e0d2e1e6c..d562b80d5dc 100644
--- a/tests/baselines/reference/methodSignatureDeclarationEmit1.symbols
+++ b/tests/baselines/reference/methodSignatureDeclarationEmit1.symbols
@@ -3,15 +3,15 @@ class C {
 >C : Symbol(C, Decl(methodSignatureDeclarationEmit1.ts, 0, 0))
 
   public foo(n: number): void;
->foo : Symbol(foo, Decl(methodSignatureDeclarationEmit1.ts, 0, 9), Decl(methodSignatureDeclarationEmit1.ts, 1, 30), Decl(methodSignatureDeclarationEmit1.ts, 2, 30))
+>foo : Symbol(C.foo, Decl(methodSignatureDeclarationEmit1.ts, 0, 9), Decl(methodSignatureDeclarationEmit1.ts, 1, 30), Decl(methodSignatureDeclarationEmit1.ts, 2, 30))
 >n : Symbol(n, Decl(methodSignatureDeclarationEmit1.ts, 1, 13))
 
   public foo(s: string): void;
->foo : Symbol(foo, Decl(methodSignatureDeclarationEmit1.ts, 0, 9), Decl(methodSignatureDeclarationEmit1.ts, 1, 30), Decl(methodSignatureDeclarationEmit1.ts, 2, 30))
+>foo : Symbol(C.foo, Decl(methodSignatureDeclarationEmit1.ts, 0, 9), Decl(methodSignatureDeclarationEmit1.ts, 1, 30), Decl(methodSignatureDeclarationEmit1.ts, 2, 30))
 >s : Symbol(s, Decl(methodSignatureDeclarationEmit1.ts, 2, 13))
 
   public foo(a: any): void {
->foo : Symbol(foo, Decl(methodSignatureDeclarationEmit1.ts, 0, 9), Decl(methodSignatureDeclarationEmit1.ts, 1, 30), Decl(methodSignatureDeclarationEmit1.ts, 2, 30))
+>foo : Symbol(C.foo, Decl(methodSignatureDeclarationEmit1.ts, 0, 9), Decl(methodSignatureDeclarationEmit1.ts, 1, 30), Decl(methodSignatureDeclarationEmit1.ts, 2, 30))
 >a : Symbol(a, Decl(methodSignatureDeclarationEmit1.ts, 3, 13))
   }
 }
diff --git a/tests/baselines/reference/mismatchedGenericArguments1.symbols b/tests/baselines/reference/mismatchedGenericArguments1.symbols
index f540c3d7ccb..f0f7b99759e 100644
--- a/tests/baselines/reference/mismatchedGenericArguments1.symbols
+++ b/tests/baselines/reference/mismatchedGenericArguments1.symbols
@@ -4,7 +4,7 @@ interface IFoo<T> {
 >T : Symbol(T, Decl(mismatchedGenericArguments1.ts, 0, 15))
 
    foo<T>(x: T): T;
->foo : Symbol(foo, Decl(mismatchedGenericArguments1.ts, 0, 19))
+>foo : Symbol(IFoo.foo, Decl(mismatchedGenericArguments1.ts, 0, 19))
 >T : Symbol(T, Decl(mismatchedGenericArguments1.ts, 1, 7))
 >x : Symbol(x, Decl(mismatchedGenericArguments1.ts, 1, 10))
 >T : Symbol(T, Decl(mismatchedGenericArguments1.ts, 1, 7))
@@ -17,7 +17,7 @@ class C<T> implements IFoo<T> {
 >T : Symbol(T, Decl(mismatchedGenericArguments1.ts, 3, 8))
 
    foo(x: string): number {
->foo : Symbol(foo, Decl(mismatchedGenericArguments1.ts, 3, 31))
+>foo : Symbol(C.foo, Decl(mismatchedGenericArguments1.ts, 3, 31))
 >x : Symbol(x, Decl(mismatchedGenericArguments1.ts, 4, 7))
 
      return null;
@@ -31,7 +31,7 @@ class C2<T> implements IFoo<T> {
 >T : Symbol(T, Decl(mismatchedGenericArguments1.ts, 9, 9))
 
    foo<U>(x: string): number {
->foo : Symbol(foo, Decl(mismatchedGenericArguments1.ts, 9, 32))
+>foo : Symbol(C2.foo, Decl(mismatchedGenericArguments1.ts, 9, 32))
 >U : Symbol(U, Decl(mismatchedGenericArguments1.ts, 10, 7))
 >x : Symbol(x, Decl(mismatchedGenericArguments1.ts, 10, 10))
 
diff --git a/tests/baselines/reference/missingImportAfterModuleImport.symbols b/tests/baselines/reference/missingImportAfterModuleImport.symbols
index 3ed1d93431c..5493d58c528 100644
--- a/tests/baselines/reference/missingImportAfterModuleImport.symbols
+++ b/tests/baselines/reference/missingImportAfterModuleImport.symbols
@@ -8,7 +8,7 @@ class MainModule {
 
     // public static SubModule: SubModule;
     public SubModule: SubModule;
->SubModule : Symbol(SubModule, Decl(missingImportAfterModuleImport_1.ts, 2, 18))
+>SubModule : Symbol(MainModule.SubModule, Decl(missingImportAfterModuleImport_1.ts, 2, 18))
 >SubModule : Symbol(SubModule, Decl(missingImportAfterModuleImport_1.ts, 0, 0))
 
     constructor() { }
@@ -27,7 +27,7 @@ declare module "SubModule" {
 >StaticVar : Symbol(SubModule.StaticVar, Decl(missingImportAfterModuleImport_0.ts, 2, 21))
 
         public InstanceVar: number;
->InstanceVar : Symbol(InstanceVar, Decl(missingImportAfterModuleImport_0.ts, 3, 40))
+>InstanceVar : Symbol(SubModule.InstanceVar, Decl(missingImportAfterModuleImport_0.ts, 3, 40))
 
         constructor();
     }
diff --git a/tests/baselines/reference/missingSelf.symbols b/tests/baselines/reference/missingSelf.symbols
index b4b5bd0b905..8822ca416c0 100644
--- a/tests/baselines/reference/missingSelf.symbols
+++ b/tests/baselines/reference/missingSelf.symbols
@@ -3,26 +3,26 @@ class CalcButton
 >CalcButton : Symbol(CalcButton, Decl(missingSelf.ts, 0, 0))
 {
     public a() { this.onClick(); }
->a : Symbol(a, Decl(missingSelf.ts, 1, 1))
->this.onClick : Symbol(onClick, Decl(missingSelf.ts, 2, 34))
+>a : Symbol(CalcButton.a, Decl(missingSelf.ts, 1, 1))
+>this.onClick : Symbol(CalcButton.onClick, Decl(missingSelf.ts, 2, 34))
 >this : Symbol(CalcButton, Decl(missingSelf.ts, 0, 0))
->onClick : Symbol(onClick, Decl(missingSelf.ts, 2, 34))
+>onClick : Symbol(CalcButton.onClick, Decl(missingSelf.ts, 2, 34))
 
     public onClick() { }
->onClick : Symbol(onClick, Decl(missingSelf.ts, 2, 34))
+>onClick : Symbol(CalcButton.onClick, Decl(missingSelf.ts, 2, 34))
 }
 
 class CalcButton2
 >CalcButton2 : Symbol(CalcButton2, Decl(missingSelf.ts, 4, 1))
 {
     public b() { () => this.onClick(); }
->b : Symbol(b, Decl(missingSelf.ts, 7, 1))
->this.onClick : Symbol(onClick, Decl(missingSelf.ts, 8, 40))
+>b : Symbol(CalcButton2.b, Decl(missingSelf.ts, 7, 1))
+>this.onClick : Symbol(CalcButton2.onClick, Decl(missingSelf.ts, 8, 40))
 >this : Symbol(CalcButton2, Decl(missingSelf.ts, 4, 1))
->onClick : Symbol(onClick, Decl(missingSelf.ts, 8, 40))
+>onClick : Symbol(CalcButton2.onClick, Decl(missingSelf.ts, 8, 40))
 
     public onClick() { }
->onClick : Symbol(onClick, Decl(missingSelf.ts, 8, 40))
+>onClick : Symbol(CalcButton2.onClick, Decl(missingSelf.ts, 8, 40))
 }
 
 var c = new CalcButton();
diff --git a/tests/baselines/reference/missingTypeArguments3.symbols b/tests/baselines/reference/missingTypeArguments3.symbols
index 4bd7943eace..d23f8da313f 100644
--- a/tests/baselines/reference/missingTypeArguments3.symbols
+++ b/tests/baselines/reference/missingTypeArguments3.symbols
@@ -7,13 +7,13 @@ declare module linq {
 >T : Symbol(T, Decl(missingTypeArguments3.ts, 2, 25))
 
         OrderByDescending(keySelector?: string): OrderedEnumerable<T>;
->OrderByDescending : Symbol(OrderByDescending, Decl(missingTypeArguments3.ts, 2, 29))
+>OrderByDescending : Symbol(Enumerable.OrderByDescending, Decl(missingTypeArguments3.ts, 2, 29))
 >keySelector : Symbol(keySelector, Decl(missingTypeArguments3.ts, 3, 26))
 >OrderedEnumerable : Symbol(OrderedEnumerable, Decl(missingTypeArguments3.ts, 7, 5))
 >T : Symbol(T, Decl(missingTypeArguments3.ts, 2, 25))
 
         GroupBy<TKey>(keySelector: (element: T) => TKey): Enumerable<Grouping<TKey, T>>;
->GroupBy : Symbol(GroupBy, Decl(missingTypeArguments3.ts, 3, 70), Decl(missingTypeArguments3.ts, 4, 88))
+>GroupBy : Symbol(Enumerable.GroupBy, Decl(missingTypeArguments3.ts, 3, 70), Decl(missingTypeArguments3.ts, 4, 88))
 >TKey : Symbol(TKey, Decl(missingTypeArguments3.ts, 4, 16))
 >keySelector : Symbol(keySelector, Decl(missingTypeArguments3.ts, 4, 22))
 >element : Symbol(element, Decl(missingTypeArguments3.ts, 4, 36))
@@ -25,7 +25,7 @@ declare module linq {
 >T : Symbol(T, Decl(missingTypeArguments3.ts, 2, 25))
 
         GroupBy<TKey, TElement>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TElement): Enumerable<Grouping<TKey, TElement>>;
->GroupBy : Symbol(GroupBy, Decl(missingTypeArguments3.ts, 3, 70), Decl(missingTypeArguments3.ts, 4, 88))
+>GroupBy : Symbol(Enumerable.GroupBy, Decl(missingTypeArguments3.ts, 3, 70), Decl(missingTypeArguments3.ts, 4, 88))
 >TKey : Symbol(TKey, Decl(missingTypeArguments3.ts, 5, 16))
 >TElement : Symbol(TElement, Decl(missingTypeArguments3.ts, 5, 21))
 >keySelector : Symbol(keySelector, Decl(missingTypeArguments3.ts, 5, 32))
@@ -42,7 +42,7 @@ declare module linq {
 >TElement : Symbol(TElement, Decl(missingTypeArguments3.ts, 5, 21))
 
         ToDictionary<TKey>(keySelector: (element: T) => TKey): Dictionary<TKey, T>;
->ToDictionary : Symbol(ToDictionary, Decl(missingTypeArguments3.ts, 5, 148))
+>ToDictionary : Symbol(Enumerable.ToDictionary, Decl(missingTypeArguments3.ts, 5, 148))
 >TKey : Symbol(TKey, Decl(missingTypeArguments3.ts, 6, 21))
 >keySelector : Symbol(keySelector, Decl(missingTypeArguments3.ts, 6, 27))
 >element : Symbol(element, Decl(missingTypeArguments3.ts, 6, 41))
@@ -60,7 +60,7 @@ declare module linq {
 >T : Symbol(T, Decl(missingTypeArguments3.ts, 9, 32))
 
         ThenBy<TCompare>(keySelector: (element: T) => TCompare): OrderedEnumerable<T>; // used to incorrectly think this was missing a type argument
->ThenBy : Symbol(ThenBy, Decl(missingTypeArguments3.ts, 9, 58))
+>ThenBy : Symbol(OrderedEnumerable.ThenBy, Decl(missingTypeArguments3.ts, 9, 58))
 >TCompare : Symbol(TCompare, Decl(missingTypeArguments3.ts, 10, 15))
 >keySelector : Symbol(keySelector, Decl(missingTypeArguments3.ts, 10, 25))
 >element : Symbol(element, Decl(missingTypeArguments3.ts, 10, 39))
@@ -78,7 +78,7 @@ declare module linq {
 >TElement : Symbol(TElement, Decl(missingTypeArguments3.ts, 13, 28))
 
         Key(): TKey;
->Key : Symbol(Key, Decl(missingTypeArguments3.ts, 13, 69))
+>Key : Symbol(Grouping.Key, Decl(missingTypeArguments3.ts, 13, 69))
 >TKey : Symbol(TKey, Decl(missingTypeArguments3.ts, 13, 23))
     }
 
@@ -88,19 +88,19 @@ declare module linq {
 >TElement : Symbol(TElement, Decl(missingTypeArguments3.ts, 17, 26))
 
         Count(): number;
->Count : Symbol(Count, Decl(missingTypeArguments3.ts, 17, 38))
+>Count : Symbol(Lookup.Count, Decl(missingTypeArguments3.ts, 17, 38))
 
         Get(key): Enumerable<any>;
->Get : Symbol(Get, Decl(missingTypeArguments3.ts, 18, 24))
+>Get : Symbol(Lookup.Get, Decl(missingTypeArguments3.ts, 18, 24))
 >key : Symbol(key, Decl(missingTypeArguments3.ts, 19, 12))
 >Enumerable : Symbol(Enumerable, Decl(missingTypeArguments3.ts, 0, 21))
 
         Contains(key): boolean;
->Contains : Symbol(Contains, Decl(missingTypeArguments3.ts, 19, 34))
+>Contains : Symbol(Lookup.Contains, Decl(missingTypeArguments3.ts, 19, 34))
 >key : Symbol(key, Decl(missingTypeArguments3.ts, 20, 17))
 
         ToEnumerable(): Enumerable<Grouping<TKey, any>>;
->ToEnumerable : Symbol(ToEnumerable, Decl(missingTypeArguments3.ts, 20, 31))
+>ToEnumerable : Symbol(Lookup.ToEnumerable, Decl(missingTypeArguments3.ts, 20, 31))
 >Enumerable : Symbol(Enumerable, Decl(missingTypeArguments3.ts, 0, 21))
 >Grouping : Symbol(Grouping, Decl(missingTypeArguments3.ts, 11, 5))
 >TKey : Symbol(TKey, Decl(missingTypeArguments3.ts, 17, 21))
@@ -112,43 +112,43 @@ declare module linq {
 >TValue : Symbol(TValue, Decl(missingTypeArguments3.ts, 24, 30))
 
         Add(key: TKey, value: TValue): void;
->Add : Symbol(Add, Decl(missingTypeArguments3.ts, 24, 40))
+>Add : Symbol(Dictionary.Add, Decl(missingTypeArguments3.ts, 24, 40))
 >key : Symbol(key, Decl(missingTypeArguments3.ts, 25, 12))
 >TKey : Symbol(TKey, Decl(missingTypeArguments3.ts, 24, 25))
 >value : Symbol(value, Decl(missingTypeArguments3.ts, 25, 22))
 >TValue : Symbol(TValue, Decl(missingTypeArguments3.ts, 24, 30))
 
         Get(ke: TKey): TValue;
->Get : Symbol(Get, Decl(missingTypeArguments3.ts, 25, 44))
+>Get : Symbol(Dictionary.Get, Decl(missingTypeArguments3.ts, 25, 44))
 >ke : Symbol(ke, Decl(missingTypeArguments3.ts, 26, 12))
 >TKey : Symbol(TKey, Decl(missingTypeArguments3.ts, 24, 25))
 >TValue : Symbol(TValue, Decl(missingTypeArguments3.ts, 24, 30))
 
         Set(key: TKey, value: TValue): boolean;
->Set : Symbol(Set, Decl(missingTypeArguments3.ts, 26, 30))
+>Set : Symbol(Dictionary.Set, Decl(missingTypeArguments3.ts, 26, 30))
 >key : Symbol(key, Decl(missingTypeArguments3.ts, 27, 12))
 >TKey : Symbol(TKey, Decl(missingTypeArguments3.ts, 24, 25))
 >value : Symbol(value, Decl(missingTypeArguments3.ts, 27, 22))
 >TValue : Symbol(TValue, Decl(missingTypeArguments3.ts, 24, 30))
 
         Contains(key: TKey): boolean;
->Contains : Symbol(Contains, Decl(missingTypeArguments3.ts, 27, 47))
+>Contains : Symbol(Dictionary.Contains, Decl(missingTypeArguments3.ts, 27, 47))
 >key : Symbol(key, Decl(missingTypeArguments3.ts, 28, 17))
 >TKey : Symbol(TKey, Decl(missingTypeArguments3.ts, 24, 25))
 
         Clear(): void;
->Clear : Symbol(Clear, Decl(missingTypeArguments3.ts, 28, 37))
+>Clear : Symbol(Dictionary.Clear, Decl(missingTypeArguments3.ts, 28, 37))
 
         Remove(key: TKey): void;
->Remove : Symbol(Remove, Decl(missingTypeArguments3.ts, 29, 22))
+>Remove : Symbol(Dictionary.Remove, Decl(missingTypeArguments3.ts, 29, 22))
 >key : Symbol(key, Decl(missingTypeArguments3.ts, 30, 15))
 >TKey : Symbol(TKey, Decl(missingTypeArguments3.ts, 24, 25))
 
         Count(): number;
->Count : Symbol(Count, Decl(missingTypeArguments3.ts, 30, 32))
+>Count : Symbol(Dictionary.Count, Decl(missingTypeArguments3.ts, 30, 32))
 
         ToEnumerable(): Enumerable<KeyValuePair<TKey, TValue>>;
->ToEnumerable : Symbol(ToEnumerable, Decl(missingTypeArguments3.ts, 31, 24))
+>ToEnumerable : Symbol(Dictionary.ToEnumerable, Decl(missingTypeArguments3.ts, 31, 24))
 >Enumerable : Symbol(Enumerable, Decl(missingTypeArguments3.ts, 0, 21))
 >KeyValuePair : Symbol(KeyValuePair, Decl(missingTypeArguments3.ts, 33, 5))
 >TKey : Symbol(TKey, Decl(missingTypeArguments3.ts, 24, 25))
@@ -161,11 +161,11 @@ declare module linq {
 >TValue : Symbol(TValue, Decl(missingTypeArguments3.ts, 35, 32))
 
         Key: TKey;
->Key : Symbol(Key, Decl(missingTypeArguments3.ts, 35, 42))
+>Key : Symbol(KeyValuePair.Key, Decl(missingTypeArguments3.ts, 35, 42))
 >TKey : Symbol(TKey, Decl(missingTypeArguments3.ts, 35, 27))
 
         Value: TValue;
->Value : Symbol(Value, Decl(missingTypeArguments3.ts, 36, 18))
+>Value : Symbol(KeyValuePair.Value, Decl(missingTypeArguments3.ts, 36, 18))
 >TValue : Symbol(TValue, Decl(missingTypeArguments3.ts, 35, 32))
     }
 }
diff --git a/tests/baselines/reference/mixedExports.symbols b/tests/baselines/reference/mixedExports.symbols
index 317b60e0a8c..1ebcd5d080a 100644
--- a/tests/baselines/reference/mixedExports.symbols
+++ b/tests/baselines/reference/mixedExports.symbols
@@ -27,12 +27,12 @@ module A {
 
      interface X {x}
 >X : Symbol(X, Decl(mixedExports.ts, 11, 10), Decl(mixedExports.ts, 12, 20), Decl(mixedExports.ts, 13, 23))
->x : Symbol(x, Decl(mixedExports.ts, 12, 18))
+>x : Symbol(X.x, Decl(mixedExports.ts, 12, 18))
 
      export module X {}
 >X : Symbol(X, Decl(mixedExports.ts, 12, 20))
 
      interface X {y}
 >X : Symbol(X, Decl(mixedExports.ts, 11, 10), Decl(mixedExports.ts, 12, 20), Decl(mixedExports.ts, 13, 23))
->y : Symbol(y, Decl(mixedExports.ts, 14, 18))
+>y : Symbol(X.y, Decl(mixedExports.ts, 14, 18))
 }
diff --git a/tests/baselines/reference/modifierOnClassDeclarationMemberInFunction.symbols b/tests/baselines/reference/modifierOnClassDeclarationMemberInFunction.symbols
index a411bee09cb..b41f51ffac7 100644
--- a/tests/baselines/reference/modifierOnClassDeclarationMemberInFunction.symbols
+++ b/tests/baselines/reference/modifierOnClassDeclarationMemberInFunction.symbols
@@ -7,12 +7,12 @@ function f() {
 >C : Symbol(C, Decl(modifierOnClassDeclarationMemberInFunction.ts, 1, 14))
 
         public baz = 1;
->baz : Symbol(baz, Decl(modifierOnClassDeclarationMemberInFunction.ts, 2, 13))
+>baz : Symbol(C.baz, Decl(modifierOnClassDeclarationMemberInFunction.ts, 2, 13))
 
         static foo() { }
 >foo : Symbol(C.foo, Decl(modifierOnClassDeclarationMemberInFunction.ts, 3, 23))
 
         public bar() { }
->bar : Symbol(bar, Decl(modifierOnClassDeclarationMemberInFunction.ts, 4, 24))
+>bar : Symbol(C.bar, Decl(modifierOnClassDeclarationMemberInFunction.ts, 4, 24))
     }
 }
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/modularizeLibrary_ErrorFromUsingES6ArrayWithOnlyES6ArrayLib.errors.txt b/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6ArrayWithOnlyES6ArrayLib.errors.txt
new file mode 100644
index 00000000000..f796092fb14
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6ArrayWithOnlyES6ArrayLib.errors.txt
@@ -0,0 +1,20 @@
+error TS2318: Cannot find global type 'Boolean'.
+error TS2318: Cannot find global type 'IArguments'.
+error TS2318: Cannot find global type 'Number'.
+tests/cases/compiler/modularizeLibrary_ErrorFromUsingES6ArrayWithOnlyES6ArrayLib.ts(4,12): error TS2304: Cannot find name 'Array'.
+
+
+!!! error TS2318: Cannot find global type 'Boolean'.
+!!! error TS2318: Cannot find global type 'IArguments'.
+!!! error TS2318: Cannot find global type 'Number'.
+==== tests/cases/compiler/modularizeLibrary_ErrorFromUsingES6ArrayWithOnlyES6ArrayLib.ts (1 errors) ====
+    
+    // Error missing basic JavaScript objects
+    function f(x: number, y: number, z: number) {
+        return Array.from(arguments);
+               ~~~~~
+!!! error TS2304: Cannot find name 'Array'.
+    }
+    
+    f(1, 2, 3);
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6ArrayWithOnlyES6ArrayLib.js b/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6ArrayWithOnlyES6ArrayLib.js
new file mode 100644
index 00000000000..61591a5f7e1
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6ArrayWithOnlyES6ArrayLib.js
@@ -0,0 +1,16 @@
+//// [modularizeLibrary_ErrorFromUsingES6ArrayWithOnlyES6ArrayLib.ts]
+
+// Error missing basic JavaScript objects
+function f(x: number, y: number, z: number) {
+    return Array.from(arguments);
+}
+
+f(1, 2, 3);
+
+
+//// [modularizeLibrary_ErrorFromUsingES6ArrayWithOnlyES6ArrayLib.js]
+// Error missing basic JavaScript objects
+function f(x, y, z) {
+    return Array.from(arguments);
+}
+f(1, 2, 3);
diff --git a/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.errors.txt b/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.errors.txt
new file mode 100644
index 00000000000..c8a69546ee0
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.errors.txt
@@ -0,0 +1,94 @@
+tests/cases/compiler/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.ts(5,18): error TS2339: Property 'from' does not exist on type 'ArrayConstructor'.
+tests/cases/compiler/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.ts(11,13): error TS2304: Cannot find name 'Map'.
+tests/cases/compiler/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.ts(18,5): error TS2339: Property 'name' does not exist on type '() => void'.
+tests/cases/compiler/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.ts(21,6): error TS2339: Property 'sign' does not exist on type 'Math'.
+tests/cases/compiler/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.ts(26,6): error TS2304: Cannot find name 'Symbol'.
+tests/cases/compiler/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.ts(30,18): error TS2304: Cannot find name 'Symbol'.
+tests/cases/compiler/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.ts(34,13): error TS2304: Cannot find name 'Proxy'.
+tests/cases/compiler/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.ts(37,1): error TS2304: Cannot find name 'Reflect'.
+tests/cases/compiler/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.ts(41,5): error TS2339: Property 'flags' does not exist on type 'RegExp'.
+tests/cases/compiler/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.ts(45,5): error TS2339: Property 'includes' does not exist on type 'string'.
+tests/cases/compiler/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.ts(48,9): error TS2304: Cannot find name 'Symbol'.
+tests/cases/compiler/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.ts(52,6): error TS2304: Cannot find name 'Symbol'.
+
+
+==== tests/cases/compiler/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.ts (12 errors) ====
+    
+    // All will be error from using ES6 features but only include ES5 library
+    // Using Es6 array
+    function f(x: number, y: number, z: number) {
+        return Array.from(arguments);
+                     ~~~~
+!!! error TS2339: Property 'from' does not exist on type 'ArrayConstructor'.
+    }
+    
+    f(1, 2, 3);  // no error
+    
+    // Using ES6 collection
+    var m = new Map<string, number>();
+                ~~~
+!!! error TS2304: Cannot find name 'Map'.
+    m.clear();
+    // Using ES6 iterable
+    m.keys();
+    
+    // Using ES6 function
+    function Baz() { }
+    Baz.name;
+        ~~~~
+!!! error TS2339: Property 'name' does not exist on type '() => void'.
+    
+    // Using ES6 math
+    Math.sign(1);
+         ~~~~
+!!! error TS2339: Property 'sign' does not exist on type 'Math'.
+    
+    // Using ES6 object
+    var o = {
+        a: 2,
+        [Symbol.hasInstance](value: any) {
+         ~~~~~~
+!!! error TS2304: Cannot find name 'Symbol'.
+            return false;
+        }
+    };
+    o.hasOwnProperty(Symbol.hasInstance);
+                     ~~~~~~
+!!! error TS2304: Cannot find name 'Symbol'.
+    
+    // Using Es6 proxy
+    var t = {}
+    var p = new Proxy(t, {});
+                ~~~~~
+!!! error TS2304: Cannot find name 'Proxy'.
+    
+    // Using ES6 reflect
+    Reflect.isExtensible({});
+    ~~~~~~~
+!!! error TS2304: Cannot find name 'Reflect'.
+    
+    // Using Es6 regexp
+    var reg = new RegExp("/s");
+    reg.flags;
+        ~~~~~
+!!! error TS2339: Property 'flags' does not exist on type 'RegExp'.
+    
+    // Using ES6 string
+    var str = "Hello world";
+    str.includes("hello", 0);
+        ~~~~~~~~
+!!! error TS2339: Property 'includes' does not exist on type 'string'.
+    
+    // Using ES6 symbol
+    var s = Symbol();
+            ~~~~~~
+!!! error TS2304: Cannot find name 'Symbol'.
+    
+    // Using ES6 wellknown-symbol
+    const o1 = {
+        [Symbol.hasInstance](value: any) {
+         ~~~~~~
+!!! error TS2304: Cannot find name 'Symbol'.
+            return false;
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.js b/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.js
new file mode 100644
index 00000000000..257df4278fe
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.js
@@ -0,0 +1,101 @@
+//// [modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.ts]
+
+// All will be error from using ES6 features but only include ES5 library
+// Using Es6 array
+function f(x: number, y: number, z: number) {
+    return Array.from(arguments);
+}
+
+f(1, 2, 3);  // no error
+
+// Using ES6 collection
+var m = new Map<string, number>();
+m.clear();
+// Using ES6 iterable
+m.keys();
+
+// Using ES6 function
+function Baz() { }
+Baz.name;
+
+// Using ES6 math
+Math.sign(1);
+
+// Using ES6 object
+var o = {
+    a: 2,
+    [Symbol.hasInstance](value: any) {
+        return false;
+    }
+};
+o.hasOwnProperty(Symbol.hasInstance);
+
+// Using Es6 proxy
+var t = {}
+var p = new Proxy(t, {});
+
+// Using ES6 reflect
+Reflect.isExtensible({});
+
+// Using Es6 regexp
+var reg = new RegExp("/s");
+reg.flags;
+
+// Using ES6 string
+var str = "Hello world";
+str.includes("hello", 0);
+
+// Using ES6 symbol
+var s = Symbol();
+
+// Using ES6 wellknown-symbol
+const o1 = {
+    [Symbol.hasInstance](value: any) {
+        return false;
+    }
+}
+
+//// [modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.js]
+// All will be error from using ES6 features but only include ES5 library
+// Using Es6 array
+function f(x, y, z) {
+    return Array.from(arguments);
+}
+f(1, 2, 3); // no error
+// Using ES6 collection
+var m = new Map();
+m.clear();
+// Using ES6 iterable
+m.keys();
+// Using ES6 function
+function Baz() { }
+Baz.name;
+// Using ES6 math
+Math.sign(1);
+// Using ES6 object
+var o = {
+    a: 2,
+    [Symbol.hasInstance](value) {
+        return false;
+    }
+};
+o.hasOwnProperty(Symbol.hasInstance);
+// Using Es6 proxy
+var t = {};
+var p = new Proxy(t, {});
+// Using ES6 reflect
+Reflect.isExtensible({});
+// Using Es6 regexp
+var reg = new RegExp("/s");
+reg.flags;
+// Using ES6 string
+var str = "Hello world";
+str.includes("hello", 0);
+// Using ES6 symbol
+var s = Symbol();
+// Using ES6 wellknown-symbol
+const o1 = {
+    [Symbol.hasInstance](value) {
+        return false;
+    }
+};
diff --git a/tests/baselines/reference/modularizeLibrary_ErrorFromUsingWellknownSymbolWithOutES6WellknownSymbolLib.errors.txt b/tests/baselines/reference/modularizeLibrary_ErrorFromUsingWellknownSymbolWithOutES6WellknownSymbolLib.errors.txt
new file mode 100644
index 00000000000..b5da9f97867
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_ErrorFromUsingWellknownSymbolWithOutES6WellknownSymbolLib.errors.txt
@@ -0,0 +1,17 @@
+tests/cases/compiler/modularizeLibrary_ErrorFromUsingWellknownSymbolWithOutES6WellknownSymbolLib.ts(8,1): error TS2322: Type 'boolean' is not assignable to type 'string'.
+tests/cases/compiler/modularizeLibrary_ErrorFromUsingWellknownSymbolWithOutES6WellknownSymbolLib.ts(8,3): error TS2304: Cannot find name 'Symbol'.
+
+
+==== tests/cases/compiler/modularizeLibrary_ErrorFromUsingWellknownSymbolWithOutES6WellknownSymbolLib.ts (2 errors) ====
+    
+    function f(x: number, y: number, z: number) {
+        return Array.from(arguments);
+    }
+    
+    f(1, 2, 3);   // no error
+    let a = ['c', 'd'];
+    a[Symbol.isConcatSpreadable] = false;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2322: Type 'boolean' is not assignable to type 'string'.
+      ~~~~~~
+!!! error TS2304: Cannot find name 'Symbol'.
\ No newline at end of file
diff --git a/tests/baselines/reference/modularizeLibrary_ErrorFromUsingWellknownSymbolWithOutES6WellknownSymbolLib.js b/tests/baselines/reference/modularizeLibrary_ErrorFromUsingWellknownSymbolWithOutES6WellknownSymbolLib.js
new file mode 100644
index 00000000000..e150560cc6a
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_ErrorFromUsingWellknownSymbolWithOutES6WellknownSymbolLib.js
@@ -0,0 +1,17 @@
+//// [modularizeLibrary_ErrorFromUsingWellknownSymbolWithOutES6WellknownSymbolLib.ts]
+
+function f(x: number, y: number, z: number) {
+    return Array.from(arguments);
+}
+
+f(1, 2, 3);   // no error
+let a = ['c', 'd'];
+a[Symbol.isConcatSpreadable] = false;
+
+//// [modularizeLibrary_ErrorFromUsingWellknownSymbolWithOutES6WellknownSymbolLib.js]
+function f(x, y, z) {
+    return Array.from(arguments);
+}
+f(1, 2, 3); // no error
+var a = ['c', 'd'];
+a[Symbol.isConcatSpreadable] = false;
diff --git a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.js b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.js
new file mode 100644
index 00000000000..9a5ed619b2d
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.js
@@ -0,0 +1,158 @@
+//// [modularizeLibrary_NoErrorDuplicateLibOptions1.ts]
+
+// Using Es6 array
+function f(x: number, y: number, z: number) {
+    return Array.from(arguments);
+}
+
+f(1, 2, 3);  // no error
+
+// Using ES6 collection
+var m = new Map<string, number>();
+m.clear();
+// Using ES6 iterable
+m.keys();
+
+// Using ES6 function
+function Baz() { }
+Baz.name;
+
+// Using ES6 generator
+function* gen() {
+    let i = 0;
+    while (i < 10) {
+        yield i;
+        i++;
+    }
+}
+
+function* gen2() {
+    let i = 0;
+    while (i < 10) {
+        yield i;
+        i++;
+    }
+}
+
+// Using ES6 math
+Math.sign(1);
+
+// Using ES6 object
+var o = {
+    a: 2,
+    [Symbol.hasInstance](value: any) {
+        return false;
+    }
+};
+o.hasOwnProperty(Symbol.hasInstance);
+
+// Using ES6 promise
+async function out() {
+    return new Promise(function (resolve, reject) {});
+}
+
+declare var console: any;
+out().then(() => {
+    console.log("Yea!");
+});
+
+// Using Es6 proxy
+var t = {}
+var p = new Proxy(t, {});
+
+// Using ES6 reflect
+Reflect.isExtensible({});
+
+// Using Es6 regexp
+var reg = new RegExp("/s");
+reg.flags;
+
+// Using ES6 string
+var str = "Hello world";
+str.includes("hello", 0);
+
+// Using ES6 symbol
+var s = Symbol();
+
+// Using ES6 wellknown-symbol
+const o1 = {
+    [Symbol.hasInstance](value: any) {
+        return false;
+    }
+}
+
+//// [modularizeLibrary_NoErrorDuplicateLibOptions1.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());
+    });
+};
+// Using Es6 array
+function f(x, y, z) {
+    return Array.from(arguments);
+}
+f(1, 2, 3); // no error
+// Using ES6 collection
+var m = new Map();
+m.clear();
+// Using ES6 iterable
+m.keys();
+// Using ES6 function
+function Baz() { }
+Baz.name;
+// Using ES6 generator
+function* gen() {
+    let i = 0;
+    while (i < 10) {
+        yield i;
+        i++;
+    }
+}
+function* gen2() {
+    let i = 0;
+    while (i < 10) {
+        yield i;
+        i++;
+    }
+}
+// Using ES6 math
+Math.sign(1);
+// Using ES6 object
+var o = {
+    a: 2,
+    [Symbol.hasInstance](value) {
+        return false;
+    }
+};
+o.hasOwnProperty(Symbol.hasInstance);
+// Using ES6 promise
+function out() {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise(function (resolve, reject) { });
+    });
+}
+out().then(() => {
+    console.log("Yea!");
+});
+// Using Es6 proxy
+var t = {};
+var p = new Proxy(t, {});
+// Using ES6 reflect
+Reflect.isExtensible({});
+// Using Es6 regexp
+var reg = new RegExp("/s");
+reg.flags;
+// Using ES6 string
+var str = "Hello world";
+str.includes("hello", 0);
+// Using ES6 symbol
+var s = Symbol();
+// Using ES6 wellknown-symbol
+const o1 = {
+    [Symbol.hasInstance](value) {
+        return false;
+    }
+};
diff --git a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.symbols b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.symbols
new file mode 100644
index 00000000000..3bbe91bc9fa
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.symbols
@@ -0,0 +1,184 @@
+=== tests/cases/compiler/modularizeLibrary_NoErrorDuplicateLibOptions1.ts ===
+
+// Using Es6 array
+function f(x: number, y: number, z: number) {
+>f : Symbol(f, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 0, 0))
+>x : Symbol(x, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 2, 11))
+>y : Symbol(y, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 2, 21))
+>z : Symbol(z, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 2, 32))
+
+    return Array.from(arguments);
+>Array.from : Symbol(ArrayConstructor.from, Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>Array : Symbol(Array, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>from : Symbol(ArrayConstructor.from, Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>arguments : Symbol(arguments)
+}
+
+f(1, 2, 3);  // no error
+>f : Symbol(f, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 0, 0))
+
+// Using ES6 collection
+var m = new Map<string, number>();
+>m : Symbol(m, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 9, 3))
+>Map : Symbol(Map, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --))
+
+m.clear();
+>m.clear : Symbol(Map.clear, Decl(lib.es2015.collection.d.ts, --, --))
+>m : Symbol(m, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 9, 3))
+>clear : Symbol(Map.clear, Decl(lib.es2015.collection.d.ts, --, --))
+
+// Using ES6 iterable
+m.keys();
+>m.keys : Symbol(Map.keys, Decl(lib.es2015.iterable.d.ts, --, --))
+>m : Symbol(m, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 9, 3))
+>keys : Symbol(Map.keys, Decl(lib.es2015.iterable.d.ts, --, --))
+
+// Using ES6 function
+function Baz() { }
+>Baz : Symbol(Baz, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 12, 9))
+
+Baz.name;
+>Baz.name : Symbol(Function.name, Decl(lib.es2015.core.d.ts, --, --))
+>Baz : Symbol(Baz, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 12, 9))
+>name : Symbol(Function.name, Decl(lib.es2015.core.d.ts, --, --))
+
+// Using ES6 generator
+function* gen() {
+>gen : Symbol(gen, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 16, 9))
+
+    let i = 0;
+>i : Symbol(i, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 20, 7))
+
+    while (i < 10) {
+>i : Symbol(i, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 20, 7))
+
+        yield i;
+>i : Symbol(i, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 20, 7))
+
+        i++;
+>i : Symbol(i, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 20, 7))
+    }
+}
+
+function* gen2() {
+>gen2 : Symbol(gen2, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 25, 1))
+
+    let i = 0;
+>i : Symbol(i, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 28, 7))
+
+    while (i < 10) {
+>i : Symbol(i, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 28, 7))
+
+        yield i;
+>i : Symbol(i, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 28, 7))
+
+        i++;
+>i : Symbol(i, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 28, 7))
+    }
+}
+
+// Using ES6 math
+Math.sign(1);
+>Math.sign : Symbol(Math.sign, Decl(lib.es2015.core.d.ts, --, --))
+>Math : Symbol(Math, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>sign : Symbol(Math.sign, Decl(lib.es2015.core.d.ts, --, --))
+
+// Using ES6 object
+var o = {
+>o : Symbol(o, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 39, 3))
+
+    a: 2,
+>a : Symbol(a, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 39, 9))
+
+    [Symbol.hasInstance](value: any) {
+>Symbol.hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>value : Symbol(value, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 41, 25))
+
+        return false;
+    }
+};
+o.hasOwnProperty(Symbol.hasInstance);
+>o.hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>o : Symbol(o, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 39, 3))
+>hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>Symbol.hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+
+// Using ES6 promise
+async function out() {
+>out : Symbol(out, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 45, 37))
+
+    return new Promise(function (resolve, reject) {});
+>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, --, --))
+>resolve : Symbol(resolve, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 49, 33))
+>reject : Symbol(reject, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 49, 41))
+}
+
+declare var console: any;
+>console : Symbol(console, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 52, 11))
+
+out().then(() => {
+>out().then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>out : Symbol(out, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 45, 37))
+>then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+    console.log("Yea!");
+>console : Symbol(console, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 52, 11))
+
+});
+
+// Using Es6 proxy
+var t = {}
+>t : Symbol(t, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 58, 3))
+
+var p = new Proxy(t, {});
+>p : Symbol(p, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 59, 3))
+>Proxy : Symbol(Proxy, Decl(lib.es2015.proxy.d.ts, --, --))
+>t : Symbol(t, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 58, 3))
+
+// Using ES6 reflect
+Reflect.isExtensible({});
+>Reflect.isExtensible : Symbol(Reflect.isExtensible, Decl(lib.es2015.reflect.d.ts, --, --))
+>Reflect : Symbol(Reflect, Decl(lib.es2015.reflect.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>isExtensible : Symbol(Reflect.isExtensible, Decl(lib.es2015.reflect.d.ts, --, --))
+
+// Using Es6 regexp
+var reg = new RegExp("/s");
+>reg : Symbol(reg, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 65, 3))
+>RegExp : Symbol(RegExp, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+
+reg.flags;
+>reg.flags : Symbol(RegExp.flags, Decl(lib.es2015.core.d.ts, --, --))
+>reg : Symbol(reg, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 65, 3))
+>flags : Symbol(RegExp.flags, Decl(lib.es2015.core.d.ts, --, --))
+
+// Using ES6 string
+var str = "Hello world";
+>str : Symbol(str, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 69, 3))
+
+str.includes("hello", 0);
+>str.includes : Symbol(String.includes, Decl(lib.es2015.core.d.ts, --, --))
+>str : Symbol(str, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 69, 3))
+>includes : Symbol(String.includes, Decl(lib.es2015.core.d.ts, --, --))
+
+// Using ES6 symbol
+var s = Symbol();
+>s : Symbol(s, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 73, 3))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+
+// Using ES6 wellknown-symbol
+const o1 = {
+>o1 : Symbol(o1, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 76, 5))
+
+    [Symbol.hasInstance](value: any) {
+>Symbol.hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>value : Symbol(value, Decl(modularizeLibrary_NoErrorDuplicateLibOptions1.ts, 77, 25))
+
+        return false;
+    }
+}
diff --git a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.types b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.types
new file mode 100644
index 00000000000..16051c14b7c
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.types
@@ -0,0 +1,231 @@
+=== tests/cases/compiler/modularizeLibrary_NoErrorDuplicateLibOptions1.ts ===
+
+// Using Es6 array
+function f(x: number, y: number, z: number) {
+>f : (x: number, y: number, z: number) => any[]
+>x : number
+>y : number
+>z : number
+
+    return Array.from(arguments);
+>Array.from(arguments) : any[]
+>Array.from : { <T, U>(iterable: Iterable<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(iterable: Iterable<T>): T[]; <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(arrayLike: ArrayLike<T>): T[]; }
+>Array : ArrayConstructor
+>from : { <T, U>(iterable: Iterable<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(iterable: Iterable<T>): T[]; <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(arrayLike: ArrayLike<T>): T[]; }
+>arguments : IArguments
+}
+
+f(1, 2, 3);  // no error
+>f(1, 2, 3) : any[]
+>f : (x: number, y: number, z: number) => any[]
+>1 : number
+>2 : number
+>3 : number
+
+// Using ES6 collection
+var m = new Map<string, number>();
+>m : Map<string, number>
+>new Map<string, number>() : Map<string, number>
+>Map : MapConstructor
+
+m.clear();
+>m.clear() : void
+>m.clear : () => void
+>m : Map<string, number>
+>clear : () => void
+
+// Using ES6 iterable
+m.keys();
+>m.keys() : IterableIterator<string>
+>m.keys : () => IterableIterator<string>
+>m : Map<string, number>
+>keys : () => IterableIterator<string>
+
+// Using ES6 function
+function Baz() { }
+>Baz : () => void
+
+Baz.name;
+>Baz.name : string
+>Baz : () => void
+>name : string
+
+// Using ES6 generator
+function* gen() {
+>gen : () => IterableIterator<number>
+
+    let i = 0;
+>i : number
+>0 : number
+
+    while (i < 10) {
+>i < 10 : boolean
+>i : number
+>10 : number
+
+        yield i;
+>yield i : any
+>i : number
+
+        i++;
+>i++ : number
+>i : number
+    }
+}
+
+function* gen2() {
+>gen2 : () => IterableIterator<number>
+
+    let i = 0;
+>i : number
+>0 : number
+
+    while (i < 10) {
+>i < 10 : boolean
+>i : number
+>10 : number
+
+        yield i;
+>yield i : any
+>i : number
+
+        i++;
+>i++ : number
+>i : number
+    }
+}
+
+// Using ES6 math
+Math.sign(1);
+>Math.sign(1) : number
+>Math.sign : (x: number) => number
+>Math : Math
+>sign : (x: number) => number
+>1 : number
+
+// Using ES6 object
+var o = {
+>o : { a: number; [Symbol.hasInstance](value: any): boolean; }
+>{    a: 2,    [Symbol.hasInstance](value: any) {        return false;    }} : { a: number; [Symbol.hasInstance](value: any): boolean; }
+
+    a: 2,
+>a : number
+>2 : number
+
+    [Symbol.hasInstance](value: any) {
+>Symbol.hasInstance : symbol
+>Symbol : SymbolConstructor
+>hasInstance : symbol
+>value : any
+
+        return false;
+>false : boolean
+    }
+};
+o.hasOwnProperty(Symbol.hasInstance);
+>o.hasOwnProperty(Symbol.hasInstance) : boolean
+>o.hasOwnProperty : { (v: string | number | symbol): boolean; (v: string): boolean; }
+>o : { a: number; [Symbol.hasInstance](value: any): boolean; }
+>hasOwnProperty : { (v: string | number | symbol): boolean; (v: string): boolean; }
+>Symbol.hasInstance : symbol
+>Symbol : SymbolConstructor
+>hasInstance : symbol
+
+// Using ES6 promise
+async function out() {
+>out : () => Promise<{}>
+
+    return new Promise(function (resolve, reject) {});
+>new Promise(function (resolve, reject) {}) : Promise<{}>
+>Promise : PromiseConstructor
+>function (resolve, reject) {} : (resolve: (value?: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
+>resolve : (value?: {} | PromiseLike<{}>) => void
+>reject : (reason?: any) => void
+}
+
+declare var console: any;
+>console : any
+
+out().then(() => {
+>out().then(() => {    console.log("Yea!");}) : Promise<void>
+>out().then : { <TResult>(onfulfilled?: (value: {}) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>; <TResult>(onfulfilled?: (value: {}) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): Promise<TResult>; }
+>out() : Promise<{}>
+>out : () => Promise<{}>
+>then : { <TResult>(onfulfilled?: (value: {}) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>; <TResult>(onfulfilled?: (value: {}) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): Promise<TResult>; }
+>() => {    console.log("Yea!");} : () => void
+
+    console.log("Yea!");
+>console.log("Yea!") : any
+>console.log : any
+>console : any
+>log : any
+>"Yea!" : string
+
+});
+
+// Using Es6 proxy
+var t = {}
+>t : {}
+>{} : {}
+
+var p = new Proxy(t, {});
+>p : {}
+>new Proxy(t, {}) : {}
+>Proxy : ProxyConstructor
+>t : {}
+>{} : {}
+
+// Using ES6 reflect
+Reflect.isExtensible({});
+>Reflect.isExtensible({}) : boolean
+>Reflect.isExtensible : (target: any) => boolean
+>Reflect : typeof Reflect
+>isExtensible : (target: any) => boolean
+>{} : {}
+
+// Using Es6 regexp
+var reg = new RegExp("/s");
+>reg : RegExp
+>new RegExp("/s") : RegExp
+>RegExp : RegExpConstructor
+>"/s" : string
+
+reg.flags;
+>reg.flags : string
+>reg : RegExp
+>flags : string
+
+// Using ES6 string
+var str = "Hello world";
+>str : string
+>"Hello world" : string
+
+str.includes("hello", 0);
+>str.includes("hello", 0) : boolean
+>str.includes : (searchString: string, position?: number) => boolean
+>str : string
+>includes : (searchString: string, position?: number) => boolean
+>"hello" : string
+>0 : number
+
+// Using ES6 symbol
+var s = Symbol();
+>s : symbol
+>Symbol() : symbol
+>Symbol : SymbolConstructor
+
+// Using ES6 wellknown-symbol
+const o1 = {
+>o1 : { [Symbol.hasInstance](value: any): boolean; }
+>{    [Symbol.hasInstance](value: any) {        return false;    }} : { [Symbol.hasInstance](value: any): boolean; }
+
+    [Symbol.hasInstance](value: any) {
+>Symbol.hasInstance : symbol
+>Symbol : SymbolConstructor
+>hasInstance : symbol
+>value : any
+
+        return false;
+>false : boolean
+    }
+}
diff --git a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.js b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.js
new file mode 100644
index 00000000000..c4c2d6853af
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.js
@@ -0,0 +1,158 @@
+//// [modularizeLibrary_NoErrorDuplicateLibOptions2.ts]
+
+// Using Es6 array
+function f(x: number, y: number, z: number) {
+    return Array.from(arguments);
+}
+
+f(1, 2, 3);  // no error
+
+// Using ES6 collection
+var m = new Map<string, number>();
+m.clear();
+// Using ES6 iterable
+m.keys();
+
+// Using ES6 function
+function Baz() { }
+Baz.name;
+
+// Using ES6 generator
+function* gen() {
+    let i = 0;
+    while (i < 10) {
+        yield i;
+        i++;
+    }
+}
+
+function* gen2() {
+    let i = 0;
+    while (i < 10) {
+        yield i;
+        i++;
+    }
+}
+
+// Using ES6 math
+Math.sign(1);
+
+// Using ES6 object
+var o = {
+    a: 2,
+    [Symbol.hasInstance](value: any) {
+        return false;
+    }
+};
+o.hasOwnProperty(Symbol.hasInstance);
+
+// Using ES6 promise
+async function out() {
+    return new Promise(function (resolve, reject) {});
+}
+
+declare var console: any;
+out().then(() => {
+    console.log("Yea!");
+});
+
+// Using Es6 proxy
+var t = {}
+var p = new Proxy(t, {});
+
+// Using ES6 reflect
+Reflect.isExtensible({});
+
+// Using Es6 regexp
+var reg = new RegExp("/s");
+reg.flags;
+
+// Using ES6 string
+var str = "Hello world";
+str.includes("hello", 0);
+
+// Using ES6 symbol
+var s = Symbol();
+
+// Using ES6 wellknown-symbol
+const o1 = {
+    [Symbol.hasInstance](value: any) {
+        return false;
+    }
+}
+
+//// [modularizeLibrary_NoErrorDuplicateLibOptions2.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());
+    });
+};
+// Using Es6 array
+function f(x, y, z) {
+    return Array.from(arguments);
+}
+f(1, 2, 3); // no error
+// Using ES6 collection
+var m = new Map();
+m.clear();
+// Using ES6 iterable
+m.keys();
+// Using ES6 function
+function Baz() { }
+Baz.name;
+// Using ES6 generator
+function* gen() {
+    let i = 0;
+    while (i < 10) {
+        yield i;
+        i++;
+    }
+}
+function* gen2() {
+    let i = 0;
+    while (i < 10) {
+        yield i;
+        i++;
+    }
+}
+// Using ES6 math
+Math.sign(1);
+// Using ES6 object
+var o = {
+    a: 2,
+    [Symbol.hasInstance](value) {
+        return false;
+    }
+};
+o.hasOwnProperty(Symbol.hasInstance);
+// Using ES6 promise
+function out() {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise(function (resolve, reject) { });
+    });
+}
+out().then(() => {
+    console.log("Yea!");
+});
+// Using Es6 proxy
+var t = {};
+var p = new Proxy(t, {});
+// Using ES6 reflect
+Reflect.isExtensible({});
+// Using Es6 regexp
+var reg = new RegExp("/s");
+reg.flags;
+// Using ES6 string
+var str = "Hello world";
+str.includes("hello", 0);
+// Using ES6 symbol
+var s = Symbol();
+// Using ES6 wellknown-symbol
+const o1 = {
+    [Symbol.hasInstance](value) {
+        return false;
+    }
+};
diff --git a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.symbols b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.symbols
new file mode 100644
index 00000000000..89cb8fe7179
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.symbols
@@ -0,0 +1,184 @@
+=== tests/cases/compiler/modularizeLibrary_NoErrorDuplicateLibOptions2.ts ===
+
+// Using Es6 array
+function f(x: number, y: number, z: number) {
+>f : Symbol(f, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 0, 0))
+>x : Symbol(x, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 2, 11))
+>y : Symbol(y, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 2, 21))
+>z : Symbol(z, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 2, 32))
+
+    return Array.from(arguments);
+>Array.from : Symbol(ArrayConstructor.from, Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>Array : Symbol(Array, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>from : Symbol(ArrayConstructor.from, Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>arguments : Symbol(arguments)
+}
+
+f(1, 2, 3);  // no error
+>f : Symbol(f, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 0, 0))
+
+// Using ES6 collection
+var m = new Map<string, number>();
+>m : Symbol(m, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 9, 3))
+>Map : Symbol(Map, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --))
+
+m.clear();
+>m.clear : Symbol(Map.clear, Decl(lib.es2015.collection.d.ts, --, --))
+>m : Symbol(m, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 9, 3))
+>clear : Symbol(Map.clear, Decl(lib.es2015.collection.d.ts, --, --))
+
+// Using ES6 iterable
+m.keys();
+>m.keys : Symbol(Map.keys, Decl(lib.es2015.iterable.d.ts, --, --))
+>m : Symbol(m, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 9, 3))
+>keys : Symbol(Map.keys, Decl(lib.es2015.iterable.d.ts, --, --))
+
+// Using ES6 function
+function Baz() { }
+>Baz : Symbol(Baz, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 12, 9))
+
+Baz.name;
+>Baz.name : Symbol(Function.name, Decl(lib.es2015.core.d.ts, --, --))
+>Baz : Symbol(Baz, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 12, 9))
+>name : Symbol(Function.name, Decl(lib.es2015.core.d.ts, --, --))
+
+// Using ES6 generator
+function* gen() {
+>gen : Symbol(gen, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 16, 9))
+
+    let i = 0;
+>i : Symbol(i, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 20, 7))
+
+    while (i < 10) {
+>i : Symbol(i, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 20, 7))
+
+        yield i;
+>i : Symbol(i, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 20, 7))
+
+        i++;
+>i : Symbol(i, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 20, 7))
+    }
+}
+
+function* gen2() {
+>gen2 : Symbol(gen2, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 25, 1))
+
+    let i = 0;
+>i : Symbol(i, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 28, 7))
+
+    while (i < 10) {
+>i : Symbol(i, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 28, 7))
+
+        yield i;
+>i : Symbol(i, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 28, 7))
+
+        i++;
+>i : Symbol(i, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 28, 7))
+    }
+}
+
+// Using ES6 math
+Math.sign(1);
+>Math.sign : Symbol(Math.sign, Decl(lib.es2015.core.d.ts, --, --))
+>Math : Symbol(Math, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>sign : Symbol(Math.sign, Decl(lib.es2015.core.d.ts, --, --))
+
+// Using ES6 object
+var o = {
+>o : Symbol(o, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 39, 3))
+
+    a: 2,
+>a : Symbol(a, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 39, 9))
+
+    [Symbol.hasInstance](value: any) {
+>Symbol.hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>value : Symbol(value, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 41, 25))
+
+        return false;
+    }
+};
+o.hasOwnProperty(Symbol.hasInstance);
+>o.hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>o : Symbol(o, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 39, 3))
+>hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>Symbol.hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+
+// Using ES6 promise
+async function out() {
+>out : Symbol(out, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 45, 37))
+
+    return new Promise(function (resolve, reject) {});
+>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, --, --))
+>resolve : Symbol(resolve, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 49, 33))
+>reject : Symbol(reject, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 49, 41))
+}
+
+declare var console: any;
+>console : Symbol(console, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 52, 11))
+
+out().then(() => {
+>out().then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>out : Symbol(out, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 45, 37))
+>then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+    console.log("Yea!");
+>console : Symbol(console, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 52, 11))
+
+});
+
+// Using Es6 proxy
+var t = {}
+>t : Symbol(t, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 58, 3))
+
+var p = new Proxy(t, {});
+>p : Symbol(p, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 59, 3))
+>Proxy : Symbol(Proxy, Decl(lib.es2015.proxy.d.ts, --, --))
+>t : Symbol(t, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 58, 3))
+
+// Using ES6 reflect
+Reflect.isExtensible({});
+>Reflect.isExtensible : Symbol(Reflect.isExtensible, Decl(lib.es2015.reflect.d.ts, --, --))
+>Reflect : Symbol(Reflect, Decl(lib.es2015.reflect.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>isExtensible : Symbol(Reflect.isExtensible, Decl(lib.es2015.reflect.d.ts, --, --))
+
+// Using Es6 regexp
+var reg = new RegExp("/s");
+>reg : Symbol(reg, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 65, 3))
+>RegExp : Symbol(RegExp, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+
+reg.flags;
+>reg.flags : Symbol(RegExp.flags, Decl(lib.es2015.core.d.ts, --, --))
+>reg : Symbol(reg, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 65, 3))
+>flags : Symbol(RegExp.flags, Decl(lib.es2015.core.d.ts, --, --))
+
+// Using ES6 string
+var str = "Hello world";
+>str : Symbol(str, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 69, 3))
+
+str.includes("hello", 0);
+>str.includes : Symbol(String.includes, Decl(lib.es2015.core.d.ts, --, --))
+>str : Symbol(str, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 69, 3))
+>includes : Symbol(String.includes, Decl(lib.es2015.core.d.ts, --, --))
+
+// Using ES6 symbol
+var s = Symbol();
+>s : Symbol(s, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 73, 3))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+
+// Using ES6 wellknown-symbol
+const o1 = {
+>o1 : Symbol(o1, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 76, 5))
+
+    [Symbol.hasInstance](value: any) {
+>Symbol.hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>value : Symbol(value, Decl(modularizeLibrary_NoErrorDuplicateLibOptions2.ts, 77, 25))
+
+        return false;
+    }
+}
diff --git a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.types b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.types
new file mode 100644
index 00000000000..a7d8e77e28c
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.types
@@ -0,0 +1,231 @@
+=== tests/cases/compiler/modularizeLibrary_NoErrorDuplicateLibOptions2.ts ===
+
+// Using Es6 array
+function f(x: number, y: number, z: number) {
+>f : (x: number, y: number, z: number) => any[]
+>x : number
+>y : number
+>z : number
+
+    return Array.from(arguments);
+>Array.from(arguments) : any[]
+>Array.from : { <T, U>(iterable: Iterable<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(iterable: Iterable<T>): T[]; <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(arrayLike: ArrayLike<T>): T[]; }
+>Array : ArrayConstructor
+>from : { <T, U>(iterable: Iterable<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(iterable: Iterable<T>): T[]; <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(arrayLike: ArrayLike<T>): T[]; }
+>arguments : IArguments
+}
+
+f(1, 2, 3);  // no error
+>f(1, 2, 3) : any[]
+>f : (x: number, y: number, z: number) => any[]
+>1 : number
+>2 : number
+>3 : number
+
+// Using ES6 collection
+var m = new Map<string, number>();
+>m : Map<string, number>
+>new Map<string, number>() : Map<string, number>
+>Map : MapConstructor
+
+m.clear();
+>m.clear() : void
+>m.clear : () => void
+>m : Map<string, number>
+>clear : () => void
+
+// Using ES6 iterable
+m.keys();
+>m.keys() : IterableIterator<string>
+>m.keys : () => IterableIterator<string>
+>m : Map<string, number>
+>keys : () => IterableIterator<string>
+
+// Using ES6 function
+function Baz() { }
+>Baz : () => void
+
+Baz.name;
+>Baz.name : string
+>Baz : () => void
+>name : string
+
+// Using ES6 generator
+function* gen() {
+>gen : () => IterableIterator<number>
+
+    let i = 0;
+>i : number
+>0 : number
+
+    while (i < 10) {
+>i < 10 : boolean
+>i : number
+>10 : number
+
+        yield i;
+>yield i : any
+>i : number
+
+        i++;
+>i++ : number
+>i : number
+    }
+}
+
+function* gen2() {
+>gen2 : () => IterableIterator<number>
+
+    let i = 0;
+>i : number
+>0 : number
+
+    while (i < 10) {
+>i < 10 : boolean
+>i : number
+>10 : number
+
+        yield i;
+>yield i : any
+>i : number
+
+        i++;
+>i++ : number
+>i : number
+    }
+}
+
+// Using ES6 math
+Math.sign(1);
+>Math.sign(1) : number
+>Math.sign : (x: number) => number
+>Math : Math
+>sign : (x: number) => number
+>1 : number
+
+// Using ES6 object
+var o = {
+>o : { a: number; [Symbol.hasInstance](value: any): boolean; }
+>{    a: 2,    [Symbol.hasInstance](value: any) {        return false;    }} : { a: number; [Symbol.hasInstance](value: any): boolean; }
+
+    a: 2,
+>a : number
+>2 : number
+
+    [Symbol.hasInstance](value: any) {
+>Symbol.hasInstance : symbol
+>Symbol : SymbolConstructor
+>hasInstance : symbol
+>value : any
+
+        return false;
+>false : boolean
+    }
+};
+o.hasOwnProperty(Symbol.hasInstance);
+>o.hasOwnProperty(Symbol.hasInstance) : boolean
+>o.hasOwnProperty : { (v: string | number | symbol): boolean; (v: string): boolean; }
+>o : { a: number; [Symbol.hasInstance](value: any): boolean; }
+>hasOwnProperty : { (v: string | number | symbol): boolean; (v: string): boolean; }
+>Symbol.hasInstance : symbol
+>Symbol : SymbolConstructor
+>hasInstance : symbol
+
+// Using ES6 promise
+async function out() {
+>out : () => Promise<{}>
+
+    return new Promise(function (resolve, reject) {});
+>new Promise(function (resolve, reject) {}) : Promise<{}>
+>Promise : PromiseConstructor
+>function (resolve, reject) {} : (resolve: (value?: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
+>resolve : (value?: {} | PromiseLike<{}>) => void
+>reject : (reason?: any) => void
+}
+
+declare var console: any;
+>console : any
+
+out().then(() => {
+>out().then(() => {    console.log("Yea!");}) : Promise<void>
+>out().then : { <TResult>(onfulfilled?: (value: {}) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>; <TResult>(onfulfilled?: (value: {}) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): Promise<TResult>; }
+>out() : Promise<{}>
+>out : () => Promise<{}>
+>then : { <TResult>(onfulfilled?: (value: {}) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>; <TResult>(onfulfilled?: (value: {}) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): Promise<TResult>; }
+>() => {    console.log("Yea!");} : () => void
+
+    console.log("Yea!");
+>console.log("Yea!") : any
+>console.log : any
+>console : any
+>log : any
+>"Yea!" : string
+
+});
+
+// Using Es6 proxy
+var t = {}
+>t : {}
+>{} : {}
+
+var p = new Proxy(t, {});
+>p : {}
+>new Proxy(t, {}) : {}
+>Proxy : ProxyConstructor
+>t : {}
+>{} : {}
+
+// Using ES6 reflect
+Reflect.isExtensible({});
+>Reflect.isExtensible({}) : boolean
+>Reflect.isExtensible : (target: any) => boolean
+>Reflect : typeof Reflect
+>isExtensible : (target: any) => boolean
+>{} : {}
+
+// Using Es6 regexp
+var reg = new RegExp("/s");
+>reg : RegExp
+>new RegExp("/s") : RegExp
+>RegExp : RegExpConstructor
+>"/s" : string
+
+reg.flags;
+>reg.flags : string
+>reg : RegExp
+>flags : string
+
+// Using ES6 string
+var str = "Hello world";
+>str : string
+>"Hello world" : string
+
+str.includes("hello", 0);
+>str.includes("hello", 0) : boolean
+>str.includes : (searchString: string, position?: number) => boolean
+>str : string
+>includes : (searchString: string, position?: number) => boolean
+>"hello" : string
+>0 : number
+
+// Using ES6 symbol
+var s = Symbol();
+>s : symbol
+>Symbol() : symbol
+>Symbol : SymbolConstructor
+
+// Using ES6 wellknown-symbol
+const o1 = {
+>o1 : { [Symbol.hasInstance](value: any): boolean; }
+>{    [Symbol.hasInstance](value: any) {        return false;    }} : { [Symbol.hasInstance](value: any): boolean; }
+
+    [Symbol.hasInstance](value: any) {
+>Symbol.hasInstance : symbol
+>Symbol : SymbolConstructor
+>hasInstance : symbol
+>value : any
+
+        return false;
+>false : boolean
+    }
+}
diff --git a/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.js b/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.js
new file mode 100644
index 00000000000..8736c51cd16
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.js
@@ -0,0 +1,158 @@
+//// [modularizeLibrary_TargetES5UsingES6Lib.ts]
+
+// Using Es6 array
+function f(x: number, y: number, z: number) {
+    return Array.from(arguments);
+}
+
+f(1, 2, 3);  // no error
+
+// Using ES6 collection
+var m = new Map<string, number>();
+m.clear();
+// Using ES6 iterable
+m.keys();
+
+// Using ES6 function
+function Baz() { }
+Baz.name;
+
+// Using ES6 generator
+function* gen() {
+    let i = 0;
+    while (i < 10) {
+        yield i;
+        i++;
+    }
+}
+
+function* gen2() {
+    let i = 0;
+    while (i < 10) {
+        yield i;
+        i++;
+    }
+}
+
+// Using ES6 math
+Math.sign(1);
+
+// Using ES6 object
+var o = {
+    a: 2,
+    [Symbol.hasInstance](value: any) {
+        return false;
+    }
+};
+o.hasOwnProperty(Symbol.hasInstance);
+
+// Using ES6 promise
+async function out() {
+    return new Promise(function (resolve, reject) {});
+}
+
+declare var console: any;
+out().then(() => {
+    console.log("Yea!");
+});
+
+// Using Es6 proxy
+var t = {}
+var p = new Proxy(t, {});
+
+// Using ES6 reflect
+Reflect.isExtensible({});
+
+// Using Es6 regexp
+var reg = new RegExp("/s");
+reg.flags;
+
+// Using ES6 string
+var str = "Hello world";
+str.includes("hello", 0);
+
+// Using ES6 symbol
+var s = Symbol();
+
+// Using ES6 wellknown-symbol
+const o1 = {
+    [Symbol.hasInstance](value: any) {
+        return false;
+    }
+}
+
+//// [modularizeLibrary_TargetES5UsingES6Lib.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());
+    });
+};
+// Using Es6 array
+function f(x, y, z) {
+    return Array.from(arguments);
+}
+f(1, 2, 3); // no error
+// Using ES6 collection
+var m = new Map();
+m.clear();
+// Using ES6 iterable
+m.keys();
+// Using ES6 function
+function Baz() { }
+Baz.name;
+// Using ES6 generator
+function* gen() {
+    let i = 0;
+    while (i < 10) {
+        yield i;
+        i++;
+    }
+}
+function* gen2() {
+    let i = 0;
+    while (i < 10) {
+        yield i;
+        i++;
+    }
+}
+// Using ES6 math
+Math.sign(1);
+// Using ES6 object
+var o = {
+    a: 2,
+    [Symbol.hasInstance](value) {
+        return false;
+    }
+};
+o.hasOwnProperty(Symbol.hasInstance);
+// Using ES6 promise
+function out() {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise(function (resolve, reject) { });
+    });
+}
+out().then(() => {
+    console.log("Yea!");
+});
+// Using Es6 proxy
+var t = {};
+var p = new Proxy(t, {});
+// Using ES6 reflect
+Reflect.isExtensible({});
+// Using Es6 regexp
+var reg = new RegExp("/s");
+reg.flags;
+// Using ES6 string
+var str = "Hello world";
+str.includes("hello", 0);
+// Using ES6 symbol
+var s = Symbol();
+// Using ES6 wellknown-symbol
+const o1 = {
+    [Symbol.hasInstance](value) {
+        return false;
+    }
+};
diff --git a/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.symbols b/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.symbols
new file mode 100644
index 00000000000..c8ccdd98653
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.symbols
@@ -0,0 +1,184 @@
+=== tests/cases/compiler/modularizeLibrary_TargetES5UsingES6Lib.ts ===
+
+// Using Es6 array
+function f(x: number, y: number, z: number) {
+>f : Symbol(f, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 0, 0))
+>x : Symbol(x, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 2, 11))
+>y : Symbol(y, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 2, 21))
+>z : Symbol(z, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 2, 32))
+
+    return Array.from(arguments);
+>Array.from : Symbol(ArrayConstructor.from, Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>Array : Symbol(Array, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>from : Symbol(ArrayConstructor.from, Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>arguments : Symbol(arguments)
+}
+
+f(1, 2, 3);  // no error
+>f : Symbol(f, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 0, 0))
+
+// Using ES6 collection
+var m = new Map<string, number>();
+>m : Symbol(m, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 9, 3))
+>Map : Symbol(Map, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --))
+
+m.clear();
+>m.clear : Symbol(Map.clear, Decl(lib.es2015.collection.d.ts, --, --))
+>m : Symbol(m, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 9, 3))
+>clear : Symbol(Map.clear, Decl(lib.es2015.collection.d.ts, --, --))
+
+// Using ES6 iterable
+m.keys();
+>m.keys : Symbol(Map.keys, Decl(lib.es2015.iterable.d.ts, --, --))
+>m : Symbol(m, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 9, 3))
+>keys : Symbol(Map.keys, Decl(lib.es2015.iterable.d.ts, --, --))
+
+// Using ES6 function
+function Baz() { }
+>Baz : Symbol(Baz, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 12, 9))
+
+Baz.name;
+>Baz.name : Symbol(Function.name, Decl(lib.es2015.core.d.ts, --, --))
+>Baz : Symbol(Baz, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 12, 9))
+>name : Symbol(Function.name, Decl(lib.es2015.core.d.ts, --, --))
+
+// Using ES6 generator
+function* gen() {
+>gen : Symbol(gen, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 16, 9))
+
+    let i = 0;
+>i : Symbol(i, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 20, 7))
+
+    while (i < 10) {
+>i : Symbol(i, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 20, 7))
+
+        yield i;
+>i : Symbol(i, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 20, 7))
+
+        i++;
+>i : Symbol(i, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 20, 7))
+    }
+}
+
+function* gen2() {
+>gen2 : Symbol(gen2, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 25, 1))
+
+    let i = 0;
+>i : Symbol(i, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 28, 7))
+
+    while (i < 10) {
+>i : Symbol(i, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 28, 7))
+
+        yield i;
+>i : Symbol(i, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 28, 7))
+
+        i++;
+>i : Symbol(i, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 28, 7))
+    }
+}
+
+// Using ES6 math
+Math.sign(1);
+>Math.sign : Symbol(Math.sign, Decl(lib.es2015.core.d.ts, --, --))
+>Math : Symbol(Math, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>sign : Symbol(Math.sign, Decl(lib.es2015.core.d.ts, --, --))
+
+// Using ES6 object
+var o = {
+>o : Symbol(o, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 39, 3))
+
+    a: 2,
+>a : Symbol(a, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 39, 9))
+
+    [Symbol.hasInstance](value: any) {
+>Symbol.hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>value : Symbol(value, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 41, 25))
+
+        return false;
+    }
+};
+o.hasOwnProperty(Symbol.hasInstance);
+>o.hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>o : Symbol(o, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 39, 3))
+>hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>Symbol.hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+
+// Using ES6 promise
+async function out() {
+>out : Symbol(out, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 45, 37))
+
+    return new Promise(function (resolve, reject) {});
+>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, --, --))
+>resolve : Symbol(resolve, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 49, 33))
+>reject : Symbol(reject, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 49, 41))
+}
+
+declare var console: any;
+>console : Symbol(console, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 52, 11))
+
+out().then(() => {
+>out().then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>out : Symbol(out, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 45, 37))
+>then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+
+    console.log("Yea!");
+>console : Symbol(console, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 52, 11))
+
+});
+
+// Using Es6 proxy
+var t = {}
+>t : Symbol(t, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 58, 3))
+
+var p = new Proxy(t, {});
+>p : Symbol(p, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 59, 3))
+>Proxy : Symbol(Proxy, Decl(lib.es2015.proxy.d.ts, --, --))
+>t : Symbol(t, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 58, 3))
+
+// Using ES6 reflect
+Reflect.isExtensible({});
+>Reflect.isExtensible : Symbol(Reflect.isExtensible, Decl(lib.es2015.reflect.d.ts, --, --))
+>Reflect : Symbol(Reflect, Decl(lib.es2015.reflect.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>isExtensible : Symbol(Reflect.isExtensible, Decl(lib.es2015.reflect.d.ts, --, --))
+
+// Using Es6 regexp
+var reg = new RegExp("/s");
+>reg : Symbol(reg, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 65, 3))
+>RegExp : Symbol(RegExp, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+
+reg.flags;
+>reg.flags : Symbol(RegExp.flags, Decl(lib.es2015.core.d.ts, --, --))
+>reg : Symbol(reg, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 65, 3))
+>flags : Symbol(RegExp.flags, Decl(lib.es2015.core.d.ts, --, --))
+
+// Using ES6 string
+var str = "Hello world";
+>str : Symbol(str, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 69, 3))
+
+str.includes("hello", 0);
+>str.includes : Symbol(String.includes, Decl(lib.es2015.core.d.ts, --, --))
+>str : Symbol(str, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 69, 3))
+>includes : Symbol(String.includes, Decl(lib.es2015.core.d.ts, --, --))
+
+// Using ES6 symbol
+var s = Symbol();
+>s : Symbol(s, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 73, 3))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+
+// Using ES6 wellknown-symbol
+const o1 = {
+>o1 : Symbol(o1, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 76, 5))
+
+    [Symbol.hasInstance](value: any) {
+>Symbol.hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>value : Symbol(value, Decl(modularizeLibrary_TargetES5UsingES6Lib.ts, 77, 25))
+
+        return false;
+    }
+}
diff --git a/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.types b/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.types
new file mode 100644
index 00000000000..8272465da5e
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.types
@@ -0,0 +1,231 @@
+=== tests/cases/compiler/modularizeLibrary_TargetES5UsingES6Lib.ts ===
+
+// Using Es6 array
+function f(x: number, y: number, z: number) {
+>f : (x: number, y: number, z: number) => any[]
+>x : number
+>y : number
+>z : number
+
+    return Array.from(arguments);
+>Array.from(arguments) : any[]
+>Array.from : { <T, U>(iterable: Iterable<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(iterable: Iterable<T>): T[]; <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(arrayLike: ArrayLike<T>): T[]; }
+>Array : ArrayConstructor
+>from : { <T, U>(iterable: Iterable<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(iterable: Iterable<T>): T[]; <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(arrayLike: ArrayLike<T>): T[]; }
+>arguments : IArguments
+}
+
+f(1, 2, 3);  // no error
+>f(1, 2, 3) : any[]
+>f : (x: number, y: number, z: number) => any[]
+>1 : number
+>2 : number
+>3 : number
+
+// Using ES6 collection
+var m = new Map<string, number>();
+>m : Map<string, number>
+>new Map<string, number>() : Map<string, number>
+>Map : MapConstructor
+
+m.clear();
+>m.clear() : void
+>m.clear : () => void
+>m : Map<string, number>
+>clear : () => void
+
+// Using ES6 iterable
+m.keys();
+>m.keys() : IterableIterator<string>
+>m.keys : () => IterableIterator<string>
+>m : Map<string, number>
+>keys : () => IterableIterator<string>
+
+// Using ES6 function
+function Baz() { }
+>Baz : () => void
+
+Baz.name;
+>Baz.name : string
+>Baz : () => void
+>name : string
+
+// Using ES6 generator
+function* gen() {
+>gen : () => IterableIterator<number>
+
+    let i = 0;
+>i : number
+>0 : number
+
+    while (i < 10) {
+>i < 10 : boolean
+>i : number
+>10 : number
+
+        yield i;
+>yield i : any
+>i : number
+
+        i++;
+>i++ : number
+>i : number
+    }
+}
+
+function* gen2() {
+>gen2 : () => IterableIterator<number>
+
+    let i = 0;
+>i : number
+>0 : number
+
+    while (i < 10) {
+>i < 10 : boolean
+>i : number
+>10 : number
+
+        yield i;
+>yield i : any
+>i : number
+
+        i++;
+>i++ : number
+>i : number
+    }
+}
+
+// Using ES6 math
+Math.sign(1);
+>Math.sign(1) : number
+>Math.sign : (x: number) => number
+>Math : Math
+>sign : (x: number) => number
+>1 : number
+
+// Using ES6 object
+var o = {
+>o : { a: number; [Symbol.hasInstance](value: any): boolean; }
+>{    a: 2,    [Symbol.hasInstance](value: any) {        return false;    }} : { a: number; [Symbol.hasInstance](value: any): boolean; }
+
+    a: 2,
+>a : number
+>2 : number
+
+    [Symbol.hasInstance](value: any) {
+>Symbol.hasInstance : symbol
+>Symbol : SymbolConstructor
+>hasInstance : symbol
+>value : any
+
+        return false;
+>false : boolean
+    }
+};
+o.hasOwnProperty(Symbol.hasInstance);
+>o.hasOwnProperty(Symbol.hasInstance) : boolean
+>o.hasOwnProperty : { (v: string | number | symbol): boolean; (v: string): boolean; }
+>o : { a: number; [Symbol.hasInstance](value: any): boolean; }
+>hasOwnProperty : { (v: string | number | symbol): boolean; (v: string): boolean; }
+>Symbol.hasInstance : symbol
+>Symbol : SymbolConstructor
+>hasInstance : symbol
+
+// Using ES6 promise
+async function out() {
+>out : () => Promise<{}>
+
+    return new Promise(function (resolve, reject) {});
+>new Promise(function (resolve, reject) {}) : Promise<{}>
+>Promise : PromiseConstructor
+>function (resolve, reject) {} : (resolve: (value?: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
+>resolve : (value?: {} | PromiseLike<{}>) => void
+>reject : (reason?: any) => void
+}
+
+declare var console: any;
+>console : any
+
+out().then(() => {
+>out().then(() => {    console.log("Yea!");}) : Promise<void>
+>out().then : { <TResult>(onfulfilled?: (value: {}) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>; <TResult>(onfulfilled?: (value: {}) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): Promise<TResult>; }
+>out() : Promise<{}>
+>out : () => Promise<{}>
+>then : { <TResult>(onfulfilled?: (value: {}) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>; <TResult>(onfulfilled?: (value: {}) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): Promise<TResult>; }
+>() => {    console.log("Yea!");} : () => void
+
+    console.log("Yea!");
+>console.log("Yea!") : any
+>console.log : any
+>console : any
+>log : any
+>"Yea!" : string
+
+});
+
+// Using Es6 proxy
+var t = {}
+>t : {}
+>{} : {}
+
+var p = new Proxy(t, {});
+>p : {}
+>new Proxy(t, {}) : {}
+>Proxy : ProxyConstructor
+>t : {}
+>{} : {}
+
+// Using ES6 reflect
+Reflect.isExtensible({});
+>Reflect.isExtensible({}) : boolean
+>Reflect.isExtensible : (target: any) => boolean
+>Reflect : typeof Reflect
+>isExtensible : (target: any) => boolean
+>{} : {}
+
+// Using Es6 regexp
+var reg = new RegExp("/s");
+>reg : RegExp
+>new RegExp("/s") : RegExp
+>RegExp : RegExpConstructor
+>"/s" : string
+
+reg.flags;
+>reg.flags : string
+>reg : RegExp
+>flags : string
+
+// Using ES6 string
+var str = "Hello world";
+>str : string
+>"Hello world" : string
+
+str.includes("hello", 0);
+>str.includes("hello", 0) : boolean
+>str.includes : (searchString: string, position?: number) => boolean
+>str : string
+>includes : (searchString: string, position?: number) => boolean
+>"hello" : string
+>0 : number
+
+// Using ES6 symbol
+var s = Symbol();
+>s : symbol
+>Symbol() : symbol
+>Symbol : SymbolConstructor
+
+// Using ES6 wellknown-symbol
+const o1 = {
+>o1 : { [Symbol.hasInstance](value: any): boolean; }
+>{    [Symbol.hasInstance](value: any) {        return false;    }} : { [Symbol.hasInstance](value: any): boolean; }
+
+    [Symbol.hasInstance](value: any) {
+>Symbol.hasInstance : symbol
+>Symbol : SymbolConstructor
+>hasInstance : symbol
+>value : any
+
+        return false;
+>false : boolean
+    }
+}
diff --git a/tests/baselines/reference/modularizeLibrary_TargetES6UsingES6Lib.js b/tests/baselines/reference/modularizeLibrary_TargetES6UsingES6Lib.js
new file mode 100644
index 00000000000..137bd1063b8
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_TargetES6UsingES6Lib.js
@@ -0,0 +1,99 @@
+//// [modularizeLibrary_TargetES6UsingES6Lib.ts]
+
+// Using Es6 array
+function f(x: number, y: number, z: number) {
+    return Array.from(arguments);
+}
+
+f(1, 2, 3);  // no error
+
+// Using ES6 collection
+var m = new Map<string, number>();
+m.clear();
+// Using ES6 iterable
+m.keys();
+
+// Using ES6 function
+function Baz() { }
+Baz.name;
+
+// Using ES6 math
+Math.sign(1);
+
+// Using ES6 object
+var o = {
+    a: 2,
+    [Symbol.hasInstance](value: any) {
+        return false;
+    }
+};
+o.hasOwnProperty(Symbol.hasInstance);
+
+// Using Es6 proxy
+var t = {}
+var p = new Proxy(t, {});
+
+// Using ES6 reflect
+Reflect.isExtensible({});
+
+// Using Es6 regexp
+var reg = new RegExp("/s");
+reg.flags;
+
+// Using ES6 string
+var str = "Hello world";
+str.includes("hello", 0);
+
+// Using ES6 symbol
+var s = Symbol();
+
+// Using ES6 wellknown-symbol
+const o1 = {
+    [Symbol.hasInstance](value: any) {
+        return false;
+    }
+}
+
+//// [modularizeLibrary_TargetES6UsingES6Lib.js]
+// Using Es6 array
+function f(x, y, z) {
+    return Array.from(arguments);
+}
+f(1, 2, 3); // no error
+// Using ES6 collection
+var m = new Map();
+m.clear();
+// Using ES6 iterable
+m.keys();
+// Using ES6 function
+function Baz() { }
+Baz.name;
+// Using ES6 math
+Math.sign(1);
+// Using ES6 object
+var o = {
+    a: 2,
+    [Symbol.hasInstance](value) {
+        return false;
+    }
+};
+o.hasOwnProperty(Symbol.hasInstance);
+// Using Es6 proxy
+var t = {};
+var p = new Proxy(t, {});
+// Using ES6 reflect
+Reflect.isExtensible({});
+// Using Es6 regexp
+var reg = new RegExp("/s");
+reg.flags;
+// Using ES6 string
+var str = "Hello world";
+str.includes("hello", 0);
+// Using ES6 symbol
+var s = Symbol();
+// Using ES6 wellknown-symbol
+const o1 = {
+    [Symbol.hasInstance](value) {
+        return false;
+    }
+};
diff --git a/tests/baselines/reference/modularizeLibrary_TargetES6UsingES6Lib.symbols b/tests/baselines/reference/modularizeLibrary_TargetES6UsingES6Lib.symbols
new file mode 100644
index 00000000000..d3d3e3d1ed6
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_TargetES6UsingES6Lib.symbols
@@ -0,0 +1,126 @@
+=== tests/cases/compiler/modularizeLibrary_TargetES6UsingES6Lib.ts ===
+
+// Using Es6 array
+function f(x: number, y: number, z: number) {
+>f : Symbol(f, Decl(modularizeLibrary_TargetES6UsingES6Lib.ts, 0, 0))
+>x : Symbol(x, Decl(modularizeLibrary_TargetES6UsingES6Lib.ts, 2, 11))
+>y : Symbol(y, Decl(modularizeLibrary_TargetES6UsingES6Lib.ts, 2, 21))
+>z : Symbol(z, Decl(modularizeLibrary_TargetES6UsingES6Lib.ts, 2, 32))
+
+    return Array.from(arguments);
+>Array.from : Symbol(ArrayConstructor.from, Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>from : Symbol(ArrayConstructor.from, Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>arguments : Symbol(arguments)
+}
+
+f(1, 2, 3);  // no error
+>f : Symbol(f, Decl(modularizeLibrary_TargetES6UsingES6Lib.ts, 0, 0))
+
+// Using ES6 collection
+var m = new Map<string, number>();
+>m : Symbol(m, Decl(modularizeLibrary_TargetES6UsingES6Lib.ts, 9, 3))
+>Map : Symbol(Map, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --))
+
+m.clear();
+>m.clear : Symbol(Map.clear, Decl(lib.es2015.collection.d.ts, --, --))
+>m : Symbol(m, Decl(modularizeLibrary_TargetES6UsingES6Lib.ts, 9, 3))
+>clear : Symbol(Map.clear, Decl(lib.es2015.collection.d.ts, --, --))
+
+// Using ES6 iterable
+m.keys();
+>m.keys : Symbol(Map.keys, Decl(lib.es2015.iterable.d.ts, --, --))
+>m : Symbol(m, Decl(modularizeLibrary_TargetES6UsingES6Lib.ts, 9, 3))
+>keys : Symbol(Map.keys, Decl(lib.es2015.iterable.d.ts, --, --))
+
+// Using ES6 function
+function Baz() { }
+>Baz : Symbol(Baz, Decl(modularizeLibrary_TargetES6UsingES6Lib.ts, 12, 9))
+
+Baz.name;
+>Baz.name : Symbol(Function.name, Decl(lib.es2015.core.d.ts, --, --))
+>Baz : Symbol(Baz, Decl(modularizeLibrary_TargetES6UsingES6Lib.ts, 12, 9))
+>name : Symbol(Function.name, Decl(lib.es2015.core.d.ts, --, --))
+
+// Using ES6 math
+Math.sign(1);
+>Math.sign : Symbol(Math.sign, Decl(lib.es2015.core.d.ts, --, --))
+>Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>sign : Symbol(Math.sign, Decl(lib.es2015.core.d.ts, --, --))
+
+// Using ES6 object
+var o = {
+>o : Symbol(o, Decl(modularizeLibrary_TargetES6UsingES6Lib.ts, 22, 3))
+
+    a: 2,
+>a : Symbol(a, Decl(modularizeLibrary_TargetES6UsingES6Lib.ts, 22, 9))
+
+    [Symbol.hasInstance](value: any) {
+>Symbol.hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>value : Symbol(value, Decl(modularizeLibrary_TargetES6UsingES6Lib.ts, 24, 25))
+
+        return false;
+    }
+};
+o.hasOwnProperty(Symbol.hasInstance);
+>o.hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>o : Symbol(o, Decl(modularizeLibrary_TargetES6UsingES6Lib.ts, 22, 3))
+>hasOwnProperty : Symbol(Object.hasOwnProperty, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>Symbol.hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+
+// Using Es6 proxy
+var t = {}
+>t : Symbol(t, Decl(modularizeLibrary_TargetES6UsingES6Lib.ts, 31, 3))
+
+var p = new Proxy(t, {});
+>p : Symbol(p, Decl(modularizeLibrary_TargetES6UsingES6Lib.ts, 32, 3))
+>Proxy : Symbol(Proxy, Decl(lib.es2015.proxy.d.ts, --, --))
+>t : Symbol(t, Decl(modularizeLibrary_TargetES6UsingES6Lib.ts, 31, 3))
+
+// Using ES6 reflect
+Reflect.isExtensible({});
+>Reflect.isExtensible : Symbol(Reflect.isExtensible, Decl(lib.es2015.reflect.d.ts, --, --))
+>Reflect : Symbol(Reflect, Decl(lib.es2015.reflect.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>isExtensible : Symbol(Reflect.isExtensible, Decl(lib.es2015.reflect.d.ts, --, --))
+
+// Using Es6 regexp
+var reg = new RegExp("/s");
+>reg : Symbol(reg, Decl(modularizeLibrary_TargetES6UsingES6Lib.ts, 38, 3))
+>RegExp : Symbol(RegExp, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+
+reg.flags;
+>reg.flags : Symbol(RegExp.flags, Decl(lib.es2015.core.d.ts, --, --))
+>reg : Symbol(reg, Decl(modularizeLibrary_TargetES6UsingES6Lib.ts, 38, 3))
+>flags : Symbol(RegExp.flags, Decl(lib.es2015.core.d.ts, --, --))
+
+// Using ES6 string
+var str = "Hello world";
+>str : Symbol(str, Decl(modularizeLibrary_TargetES6UsingES6Lib.ts, 42, 3))
+
+str.includes("hello", 0);
+>str.includes : Symbol(String.includes, Decl(lib.es2015.core.d.ts, --, --))
+>str : Symbol(str, Decl(modularizeLibrary_TargetES6UsingES6Lib.ts, 42, 3))
+>includes : Symbol(String.includes, Decl(lib.es2015.core.d.ts, --, --))
+
+// Using ES6 symbol
+var s = Symbol();
+>s : Symbol(s, Decl(modularizeLibrary_TargetES6UsingES6Lib.ts, 46, 3))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+
+// Using ES6 wellknown-symbol
+const o1 = {
+>o1 : Symbol(o1, Decl(modularizeLibrary_TargetES6UsingES6Lib.ts, 49, 5))
+
+    [Symbol.hasInstance](value: any) {
+>Symbol.hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>value : Symbol(value, Decl(modularizeLibrary_TargetES6UsingES6Lib.ts, 50, 25))
+
+        return false;
+    }
+}
diff --git a/tests/baselines/reference/modularizeLibrary_TargetES6UsingES6Lib.types b/tests/baselines/reference/modularizeLibrary_TargetES6UsingES6Lib.types
new file mode 100644
index 00000000000..7af40d3684c
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_TargetES6UsingES6Lib.types
@@ -0,0 +1,154 @@
+=== tests/cases/compiler/modularizeLibrary_TargetES6UsingES6Lib.ts ===
+
+// Using Es6 array
+function f(x: number, y: number, z: number) {
+>f : (x: number, y: number, z: number) => any[]
+>x : number
+>y : number
+>z : number
+
+    return Array.from(arguments);
+>Array.from(arguments) : any[]
+>Array.from : { <T, U>(iterable: Iterable<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(iterable: Iterable<T>): T[]; <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(arrayLike: ArrayLike<T>): T[]; }
+>Array : ArrayConstructor
+>from : { <T, U>(iterable: Iterable<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(iterable: Iterable<T>): T[]; <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(arrayLike: ArrayLike<T>): T[]; }
+>arguments : IArguments
+}
+
+f(1, 2, 3);  // no error
+>f(1, 2, 3) : any[]
+>f : (x: number, y: number, z: number) => any[]
+>1 : number
+>2 : number
+>3 : number
+
+// Using ES6 collection
+var m = new Map<string, number>();
+>m : Map<string, number>
+>new Map<string, number>() : Map<string, number>
+>Map : MapConstructor
+
+m.clear();
+>m.clear() : void
+>m.clear : () => void
+>m : Map<string, number>
+>clear : () => void
+
+// Using ES6 iterable
+m.keys();
+>m.keys() : IterableIterator<string>
+>m.keys : () => IterableIterator<string>
+>m : Map<string, number>
+>keys : () => IterableIterator<string>
+
+// Using ES6 function
+function Baz() { }
+>Baz : () => void
+
+Baz.name;
+>Baz.name : string
+>Baz : () => void
+>name : string
+
+// Using ES6 math
+Math.sign(1);
+>Math.sign(1) : number
+>Math.sign : (x: number) => number
+>Math : Math
+>sign : (x: number) => number
+>1 : number
+
+// Using ES6 object
+var o = {
+>o : { a: number; [Symbol.hasInstance](value: any): boolean; }
+>{    a: 2,    [Symbol.hasInstance](value: any) {        return false;    }} : { a: number; [Symbol.hasInstance](value: any): boolean; }
+
+    a: 2,
+>a : number
+>2 : number
+
+    [Symbol.hasInstance](value: any) {
+>Symbol.hasInstance : symbol
+>Symbol : SymbolConstructor
+>hasInstance : symbol
+>value : any
+
+        return false;
+>false : boolean
+    }
+};
+o.hasOwnProperty(Symbol.hasInstance);
+>o.hasOwnProperty(Symbol.hasInstance) : boolean
+>o.hasOwnProperty : { (v: string): boolean; (v: string | number | symbol): boolean; }
+>o : { a: number; [Symbol.hasInstance](value: any): boolean; }
+>hasOwnProperty : { (v: string): boolean; (v: string | number | symbol): boolean; }
+>Symbol.hasInstance : symbol
+>Symbol : SymbolConstructor
+>hasInstance : symbol
+
+// Using Es6 proxy
+var t = {}
+>t : {}
+>{} : {}
+
+var p = new Proxy(t, {});
+>p : {}
+>new Proxy(t, {}) : {}
+>Proxy : ProxyConstructor
+>t : {}
+>{} : {}
+
+// Using ES6 reflect
+Reflect.isExtensible({});
+>Reflect.isExtensible({}) : boolean
+>Reflect.isExtensible : (target: any) => boolean
+>Reflect : typeof Reflect
+>isExtensible : (target: any) => boolean
+>{} : {}
+
+// Using Es6 regexp
+var reg = new RegExp("/s");
+>reg : RegExp
+>new RegExp("/s") : RegExp
+>RegExp : RegExpConstructor
+>"/s" : string
+
+reg.flags;
+>reg.flags : string
+>reg : RegExp
+>flags : string
+
+// Using ES6 string
+var str = "Hello world";
+>str : string
+>"Hello world" : string
+
+str.includes("hello", 0);
+>str.includes("hello", 0) : boolean
+>str.includes : (searchString: string, position?: number) => boolean
+>str : string
+>includes : (searchString: string, position?: number) => boolean
+>"hello" : string
+>0 : number
+
+// Using ES6 symbol
+var s = Symbol();
+>s : symbol
+>Symbol() : symbol
+>Symbol : SymbolConstructor
+
+// Using ES6 wellknown-symbol
+const o1 = {
+>o1 : { [Symbol.hasInstance](value: any): boolean; }
+>{    [Symbol.hasInstance](value: any) {        return false;    }} : { [Symbol.hasInstance](value: any): boolean; }
+
+    [Symbol.hasInstance](value: any) {
+>Symbol.hasInstance : symbol
+>Symbol : SymbolConstructor
+>hasInstance : symbol
+>value : any
+
+        return false;
+>false : boolean
+    }
+}
diff --git a/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6ArrayLib.js b/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6ArrayLib.js
new file mode 100644
index 00000000000..29e0afc711c
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6ArrayLib.js
@@ -0,0 +1,15 @@
+//// [modularizeLibrary_UsingES5LibAndES6ArrayLib.ts]
+
+// No error
+function f(x: number, y: number, z: number) {
+    return Array.from(arguments);
+}
+
+f(1, 2, 3);
+
+//// [modularizeLibrary_UsingES5LibAndES6ArrayLib.js]
+// No error
+function f(x, y, z) {
+    return Array.from(arguments);
+}
+f(1, 2, 3);
diff --git a/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6ArrayLib.symbols b/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6ArrayLib.symbols
new file mode 100644
index 00000000000..ce03d4cfc59
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6ArrayLib.symbols
@@ -0,0 +1,19 @@
+=== tests/cases/compiler/modularizeLibrary_UsingES5LibAndES6ArrayLib.ts ===
+
+// No error
+function f(x: number, y: number, z: number) {
+>f : Symbol(f, Decl(modularizeLibrary_UsingES5LibAndES6ArrayLib.ts, 0, 0))
+>x : Symbol(x, Decl(modularizeLibrary_UsingES5LibAndES6ArrayLib.ts, 2, 11))
+>y : Symbol(y, Decl(modularizeLibrary_UsingES5LibAndES6ArrayLib.ts, 2, 21))
+>z : Symbol(z, Decl(modularizeLibrary_UsingES5LibAndES6ArrayLib.ts, 2, 32))
+
+    return Array.from(arguments);
+>Array.from : Symbol(ArrayConstructor.from, Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>Array : Symbol(Array, Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>from : Symbol(ArrayConstructor.from, Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>arguments : Symbol(arguments)
+}
+
+f(1, 2, 3);
+>f : Symbol(f, Decl(modularizeLibrary_UsingES5LibAndES6ArrayLib.ts, 0, 0))
+
diff --git a/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6ArrayLib.types b/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6ArrayLib.types
new file mode 100644
index 00000000000..d17a6fcbcbb
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6ArrayLib.types
@@ -0,0 +1,24 @@
+=== tests/cases/compiler/modularizeLibrary_UsingES5LibAndES6ArrayLib.ts ===
+
+// No error
+function f(x: number, y: number, z: number) {
+>f : (x: number, y: number, z: number) => any[]
+>x : number
+>y : number
+>z : number
+
+    return Array.from(arguments);
+>Array.from(arguments) : any[]
+>Array.from : { <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(arrayLike: ArrayLike<T>): T[]; }
+>Array : ArrayConstructor
+>from : { <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(arrayLike: ArrayLike<T>): T[]; }
+>arguments : IArguments
+}
+
+f(1, 2, 3);
+>f(1, 2, 3) : any[]
+>f : (x: number, y: number, z: number) => any[]
+>1 : number
+>2 : number
+>3 : number
+
diff --git a/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6FeatureLibs.js b/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6FeatureLibs.js
new file mode 100644
index 00000000000..892bc688524
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6FeatureLibs.js
@@ -0,0 +1,27 @@
+//// [modularizeLibrary_UsingES5LibAndES6FeatureLibs.ts]
+
+var s = Symbol();
+var t = {};
+var p = new Proxy(t, {});
+
+Reflect.ownKeys({});
+
+function* idGen() {
+    let i = 10;
+    while (i < 20) {
+        yield i + 2;
+    }
+}
+
+
+//// [modularizeLibrary_UsingES5LibAndES6FeatureLibs.js]
+var s = Symbol();
+var t = {};
+var p = new Proxy(t, {});
+Reflect.ownKeys({});
+function* idGen() {
+    let i = 10;
+    while (i < 20) {
+        yield i + 2;
+    }
+}
diff --git a/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6FeatureLibs.symbols b/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6FeatureLibs.symbols
new file mode 100644
index 00000000000..e6f7584c471
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6FeatureLibs.symbols
@@ -0,0 +1,33 @@
+=== tests/cases/compiler/modularizeLibrary_UsingES5LibAndES6FeatureLibs.ts ===
+
+var s = Symbol();
+>s : Symbol(s, Decl(modularizeLibrary_UsingES5LibAndES6FeatureLibs.ts, 1, 3))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+
+var t = {};
+>t : Symbol(t, Decl(modularizeLibrary_UsingES5LibAndES6FeatureLibs.ts, 2, 3))
+
+var p = new Proxy(t, {});
+>p : Symbol(p, Decl(modularizeLibrary_UsingES5LibAndES6FeatureLibs.ts, 3, 3))
+>Proxy : Symbol(Proxy, Decl(lib.es2015.proxy.d.ts, --, --))
+>t : Symbol(t, Decl(modularizeLibrary_UsingES5LibAndES6FeatureLibs.ts, 2, 3))
+
+Reflect.ownKeys({});
+>Reflect.ownKeys : Symbol(Reflect.ownKeys, Decl(lib.es2015.reflect.d.ts, --, --))
+>Reflect : Symbol(Reflect, Decl(lib.es2015.reflect.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>ownKeys : Symbol(Reflect.ownKeys, Decl(lib.es2015.reflect.d.ts, --, --))
+
+function* idGen() {
+>idGen : Symbol(idGen, Decl(modularizeLibrary_UsingES5LibAndES6FeatureLibs.ts, 5, 20))
+
+    let i = 10;
+>i : Symbol(i, Decl(modularizeLibrary_UsingES5LibAndES6FeatureLibs.ts, 8, 7))
+
+    while (i < 20) {
+>i : Symbol(i, Decl(modularizeLibrary_UsingES5LibAndES6FeatureLibs.ts, 8, 7))
+
+        yield i + 2;
+>i : Symbol(i, Decl(modularizeLibrary_UsingES5LibAndES6FeatureLibs.ts, 8, 7))
+    }
+}
+
diff --git a/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6FeatureLibs.types b/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6FeatureLibs.types
new file mode 100644
index 00000000000..820c2f6dc8a
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_UsingES5LibAndES6FeatureLibs.types
@@ -0,0 +1,45 @@
+=== tests/cases/compiler/modularizeLibrary_UsingES5LibAndES6FeatureLibs.ts ===
+
+var s = Symbol();
+>s : symbol
+>Symbol() : symbol
+>Symbol : SymbolConstructor
+
+var t = {};
+>t : {}
+>{} : {}
+
+var p = new Proxy(t, {});
+>p : {}
+>new Proxy(t, {}) : {}
+>Proxy : ProxyConstructor
+>t : {}
+>{} : {}
+
+Reflect.ownKeys({});
+>Reflect.ownKeys({}) : (string | number | symbol)[]
+>Reflect.ownKeys : (target: any) => (string | number | symbol)[]
+>Reflect : typeof Reflect
+>ownKeys : (target: any) => (string | number | symbol)[]
+>{} : {}
+
+function* idGen() {
+>idGen : () => IterableIterator<number>
+
+    let i = 10;
+>i : number
+>10 : number
+
+    while (i < 20) {
+>i < 20 : boolean
+>i : number
+>20 : number
+
+        yield i + 2;
+>yield i + 2 : any
+>i + 2 : number
+>i : number
+>2 : number
+    }
+}
+
diff --git a/tests/baselines/reference/modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.js b/tests/baselines/reference/modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.js
new file mode 100644
index 00000000000..7755fc72ce8
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.js
@@ -0,0 +1,17 @@
+//// [modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.ts]
+
+function f(x: number, y: number, z: number) {
+    return Array.from(arguments);
+}
+
+f(1, 2, 3);   // no error
+let a = ['c', 'd'];
+a[Symbol.isConcatSpreadable] = false;
+
+//// [modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.js]
+function f(x, y, z) {
+    return Array.from(arguments);
+}
+f(1, 2, 3); // no error
+var a = ['c', 'd'];
+a[Symbol.isConcatSpreadable] = false;
diff --git a/tests/baselines/reference/modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.symbols b/tests/baselines/reference/modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.symbols
new file mode 100644
index 00000000000..0ed5ec38513
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.symbols
@@ -0,0 +1,27 @@
+=== tests/cases/compiler/modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.ts ===
+
+function f(x: number, y: number, z: number) {
+>f : Symbol(f, Decl(modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.ts, 0, 0))
+>x : Symbol(x, Decl(modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.ts, 1, 11))
+>y : Symbol(y, Decl(modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.ts, 1, 21))
+>z : Symbol(z, Decl(modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.ts, 1, 32))
+
+    return Array.from(arguments);
+>Array.from : Symbol(ArrayConstructor.from, Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>Array : Symbol(Array, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>from : Symbol(ArrayConstructor.from, Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>arguments : Symbol(arguments)
+}
+
+f(1, 2, 3);   // no error
+>f : Symbol(f, Decl(modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.ts, 0, 0))
+
+let a = ['c', 'd'];
+>a : Symbol(a, Decl(modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.ts, 6, 3))
+
+a[Symbol.isConcatSpreadable] = false;
+>a : Symbol(a, Decl(modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.ts, 6, 3))
+>Symbol.isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+
diff --git a/tests/baselines/reference/modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.types b/tests/baselines/reference/modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.types
new file mode 100644
index 00000000000..3ae08c79fd4
--- /dev/null
+++ b/tests/baselines/reference/modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.types
@@ -0,0 +1,38 @@
+=== tests/cases/compiler/modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.ts ===
+
+function f(x: number, y: number, z: number) {
+>f : (x: number, y: number, z: number) => any[]
+>x : number
+>y : number
+>z : number
+
+    return Array.from(arguments);
+>Array.from(arguments) : any[]
+>Array.from : { <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(arrayLike: ArrayLike<T>): T[]; }
+>Array : ArrayConstructor
+>from : { <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(arrayLike: ArrayLike<T>): T[]; }
+>arguments : IArguments
+}
+
+f(1, 2, 3);   // no error
+>f(1, 2, 3) : any[]
+>f : (x: number, y: number, z: number) => any[]
+>1 : number
+>2 : number
+>3 : number
+
+let a = ['c', 'd'];
+>a : string[]
+>['c', 'd'] : string[]
+>'c' : string
+>'d' : string
+
+a[Symbol.isConcatSpreadable] = false;
+>a[Symbol.isConcatSpreadable] = false : boolean
+>a[Symbol.isConcatSpreadable] : any
+>a : string[]
+>Symbol.isConcatSpreadable : symbol
+>Symbol : SymbolConstructor
+>isConcatSpreadable : symbol
+>false : boolean
+
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/moduleAliasInterface.symbols b/tests/baselines/reference/moduleAliasInterface.symbols
index 9c4cfdf9b14..c7c85213fa1 100644
--- a/tests/baselines/reference/moduleAliasInterface.symbols
+++ b/tests/baselines/reference/moduleAliasInterface.symbols
@@ -40,7 +40,7 @@ module editor {
 >Mode : Symbol(modes.Mode, Decl(moduleAliasInterface.ts, 3, 2))
 
   public foo(p1:modes.IMode) {
->foo : Symbol(foo, Decl(moduleAliasInterface.ts, 19, 50))
+>foo : Symbol(Bug.foo, Decl(moduleAliasInterface.ts, 19, 50))
 >p1 : Symbol(p1, Decl(moduleAliasInterface.ts, 20, 13))
 >modes : Symbol(modes, Decl(moduleAliasInterface.ts, 12, 15))
 >IMode : Symbol(modes.IMode, Decl(moduleAliasInterface.ts, 0, 15))
diff --git a/tests/baselines/reference/moduleAndInterfaceSharingName4.symbols b/tests/baselines/reference/moduleAndInterfaceSharingName4.symbols
index 383b1801b2d..cb59e73e4ef 100644
--- a/tests/baselines/reference/moduleAndInterfaceSharingName4.symbols
+++ b/tests/baselines/reference/moduleAndInterfaceSharingName4.symbols
@@ -15,7 +15,7 @@ declare module D3 {
 >Color : Symbol(Color, Decl(moduleAndInterfaceSharingName4.ts, 3, 18))
 
             darker: Color;
->darker : Symbol(darker, Decl(moduleAndInterfaceSharingName4.ts, 4, 32))
+>darker : Symbol(Color.darker, Decl(moduleAndInterfaceSharingName4.ts, 4, 32))
 >Color : Symbol(Color, Decl(moduleAndInterfaceSharingName4.ts, 3, 18))
         }
     }
diff --git a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js
index 60ba2217349..2e84e1492be 100644
--- a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js
+++ b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js
@@ -73,3 +73,5 @@ declare module "./observable" {
 }
 export {};
 //// [main.d.ts]
+import "./map1";
+import "./map2";
diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js
index 589d0f506e9..7b44fb7a637 100644
--- a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js
+++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js
@@ -66,3 +66,4 @@ declare module "./observable" {
 }
 export {};
 //// [main.d.ts]
+import "./map";
diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.symbols b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.symbols
index eca44ec774d..17e31591be0 100644
--- a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.symbols
+++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.symbols
@@ -14,7 +14,7 @@ declare module "./observable" {
 >T : Symbol(T, Decl(observable.ts, 0, 32), Decl(map.ts, 6, 25))
 
         map<U>(proj: (e:T) => U): Observable<U>
->map : Symbol(map, Decl(map.ts, 6, 29))
+>map : Symbol(Observable.map, Decl(map.ts, 6, 29))
 >U : Symbol(U, Decl(map.ts, 7, 12))
 >proj : Symbol(proj, Decl(map.ts, 7, 15))
 >e : Symbol(e, Decl(map.ts, 7, 22))
@@ -37,7 +37,7 @@ export declare class Observable<T> {
 >T : Symbol(T, Decl(observable.ts, 0, 32), Decl(map.ts, 6, 25))
 
     filter(pred: (e:T) => boolean): Observable<T>;
->filter : Symbol(filter, Decl(observable.ts, 0, 36))
+>filter : Symbol(Observable.filter, Decl(observable.ts, 0, 36))
 >pred : Symbol(pred, Decl(observable.ts, 1, 11))
 >e : Symbol(e, Decl(observable.ts, 1, 18))
 >T : Symbol(T, Decl(observable.ts, 0, 32), Decl(map.ts, 6, 25))
diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js
index d8fd65a1464..547d017c502 100644
--- a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js
+++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js
@@ -71,3 +71,4 @@ declare module "./observable" {
 }
 export {};
 //// [main.d.ts]
+import "./map";
diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.symbols b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.symbols
index d0f25f693fe..38a0506d179 100644
--- a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.symbols
+++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.symbols
@@ -14,7 +14,7 @@ declare module "./observable" {
 >T : Symbol(T, Decl(observable.ts, 0, 32), Decl(map.ts, 6, 25))
 
         map<U>(proj: (e:T) => U): Observable<U>
->map : Symbol(map, Decl(map.ts, 6, 29))
+>map : Symbol(Observable.map, Decl(map.ts, 6, 29))
 >U : Symbol(U, Decl(map.ts, 7, 12))
 >proj : Symbol(proj, Decl(map.ts, 7, 15))
 >e : Symbol(e, Decl(map.ts, 7, 22))
@@ -37,7 +37,7 @@ export declare class Observable<T> {
 >T : Symbol(T, Decl(observable.ts, 0, 32), Decl(map.ts, 6, 25))
 
     filter(pred: (e:T) => boolean): Observable<T>;
->filter : Symbol(filter, Decl(observable.ts, 0, 36))
+>filter : Symbol(Observable.filter, Decl(observable.ts, 0, 36))
 >pred : Symbol(pred, Decl(observable.ts, 1, 11))
 >e : Symbol(e, Decl(observable.ts, 1, 18))
 >T : Symbol(T, Decl(observable.ts, 0, 32), Decl(map.ts, 6, 25))
diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.symbols b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.symbols
index a471651da0b..62ac82b6953 100644
--- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.symbols
+++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.symbols
@@ -34,7 +34,7 @@ declare module "observable" {
 >T : Symbol(T, Decl(observable.d.ts, 1, 21), Decl(map.ts, 6, 25))
 
         map<U>(proj: (e:T) => U): Observable<U>
->map : Symbol(map, Decl(map.ts, 6, 29))
+>map : Symbol(Observable.map, Decl(map.ts, 6, 29))
 >U : Symbol(U, Decl(map.ts, 7, 12))
 >proj : Symbol(proj, Decl(map.ts, 7, 15))
 >e : Symbol(e, Decl(map.ts, 7, 22))
@@ -58,7 +58,7 @@ declare module "observable" {
 >T : Symbol(T, Decl(observable.d.ts, 1, 21), Decl(map.ts, 6, 25))
 
         filter(pred: (e:T) => boolean): Observable<T>;
->filter : Symbol(filter, Decl(observable.d.ts, 1, 25))
+>filter : Symbol(Observable.filter, Decl(observable.d.ts, 1, 25))
 >pred : Symbol(pred, Decl(observable.d.ts, 2, 15))
 >e : Symbol(e, Decl(observable.d.ts, 2, 22))
 >T : Symbol(T, Decl(observable.d.ts, 1, 21), Decl(map.ts, 6, 25))
diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js
index 733f88e6129..2d65953e2a3 100644
--- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js
+++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js
@@ -63,3 +63,4 @@ declare module "observable" {
 export {};
 //// [main.d.ts]
 /// <reference path="observable.d.ts" />
+import "./map";
diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.symbols b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.symbols
index f907f4d6979..bbd3b6e5f79 100644
--- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.symbols
+++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.symbols
@@ -50,7 +50,7 @@ declare module "observable" {
 >T : Symbol(T, Decl(observable.d.ts, 1, 21), Decl(map.ts, 6, 25))
 
         map<U>(proj: (e:T) => U): Observable<U>
->map : Symbol(map, Decl(map.ts, 6, 29))
+>map : Symbol(Observable.map, Decl(map.ts, 6, 29))
 >U : Symbol(U, Decl(map.ts, 7, 12))
 >proj : Symbol(proj, Decl(map.ts, 7, 15))
 >e : Symbol(e, Decl(map.ts, 7, 22))
@@ -74,7 +74,7 @@ declare module "observable" {
 >T : Symbol(T, Decl(observable.d.ts, 1, 21), Decl(map.ts, 6, 25))
 
         filter(pred: (e:T) => boolean): Observable<T>;
->filter : Symbol(filter, Decl(observable.d.ts, 1, 25))
+>filter : Symbol(Observable.filter, Decl(observable.d.ts, 1, 25))
 >pred : Symbol(pred, Decl(observable.d.ts, 2, 15))
 >e : Symbol(e, Decl(observable.d.ts, 2, 22))
 >T : Symbol(T, Decl(observable.d.ts, 1, 21), Decl(map.ts, 6, 25))
diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule1.symbols b/tests/baselines/reference/moduleAugmentationExtendFileModule1.symbols
index eca44ec774d..17e31591be0 100644
--- a/tests/baselines/reference/moduleAugmentationExtendFileModule1.symbols
+++ b/tests/baselines/reference/moduleAugmentationExtendFileModule1.symbols
@@ -14,7 +14,7 @@ declare module "./observable" {
 >T : Symbol(T, Decl(observable.ts, 0, 32), Decl(map.ts, 6, 25))
 
         map<U>(proj: (e:T) => U): Observable<U>
->map : Symbol(map, Decl(map.ts, 6, 29))
+>map : Symbol(Observable.map, Decl(map.ts, 6, 29))
 >U : Symbol(U, Decl(map.ts, 7, 12))
 >proj : Symbol(proj, Decl(map.ts, 7, 15))
 >e : Symbol(e, Decl(map.ts, 7, 22))
@@ -37,7 +37,7 @@ export declare class Observable<T> {
 >T : Symbol(T, Decl(observable.ts, 0, 32), Decl(map.ts, 6, 25))
 
     filter(pred: (e:T) => boolean): Observable<T>;
->filter : Symbol(filter, Decl(observable.ts, 0, 36))
+>filter : Symbol(Observable.filter, Decl(observable.ts, 0, 36))
 >pred : Symbol(pred, Decl(observable.ts, 1, 11))
 >e : Symbol(e, Decl(observable.ts, 1, 18))
 >T : Symbol(T, Decl(observable.ts, 0, 32), Decl(map.ts, 6, 25))
diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule2.symbols b/tests/baselines/reference/moduleAugmentationExtendFileModule2.symbols
index d0f25f693fe..38a0506d179 100644
--- a/tests/baselines/reference/moduleAugmentationExtendFileModule2.symbols
+++ b/tests/baselines/reference/moduleAugmentationExtendFileModule2.symbols
@@ -14,7 +14,7 @@ declare module "./observable" {
 >T : Symbol(T, Decl(observable.ts, 0, 32), Decl(map.ts, 6, 25))
 
         map<U>(proj: (e:T) => U): Observable<U>
->map : Symbol(map, Decl(map.ts, 6, 29))
+>map : Symbol(Observable.map, Decl(map.ts, 6, 29))
 >U : Symbol(U, Decl(map.ts, 7, 12))
 >proj : Symbol(proj, Decl(map.ts, 7, 15))
 >e : Symbol(e, Decl(map.ts, 7, 22))
@@ -37,7 +37,7 @@ export declare class Observable<T> {
 >T : Symbol(T, Decl(observable.ts, 0, 32), Decl(map.ts, 6, 25))
 
     filter(pred: (e:T) => boolean): Observable<T>;
->filter : Symbol(filter, Decl(observable.ts, 0, 36))
+>filter : Symbol(Observable.filter, Decl(observable.ts, 0, 36))
 >pred : Symbol(pred, Decl(observable.ts, 1, 11))
 >e : Symbol(e, Decl(observable.ts, 1, 18))
 >T : Symbol(T, Decl(observable.ts, 0, 32), Decl(map.ts, 6, 25))
diff --git a/tests/baselines/reference/moduleAugmentationGlobal1.symbols b/tests/baselines/reference/moduleAugmentationGlobal1.symbols
index 36139555c96..4115379b0f2 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal1.symbols
+++ b/tests/baselines/reference/moduleAugmentationGlobal1.symbols
@@ -2,7 +2,7 @@
 
 export class A {x: number;}
 >A : Symbol(A, Decl(f1.ts, 0, 0))
->x : Symbol(x, Decl(f1.ts, 1, 16))
+>x : Symbol(A.x, Decl(f1.ts, 1, 16))
 
 === tests/cases/compiler/f2.ts ===
 import {A} from "./f1";
@@ -17,7 +17,7 @@ declare global {
 >T : Symbol(T, Decl(lib.d.ts, --, --), Decl(f2.ts, 4, 20))
 
         getA(): A;
->getA : Symbol(getA, Decl(f2.ts, 4, 24))
+>getA : Symbol(Array.getA, Decl(f2.ts, 4, 24))
 >A : Symbol(A, Decl(f2.ts, 0, 8))
     }
 }
diff --git a/tests/baselines/reference/moduleAugmentationGlobal1.types b/tests/baselines/reference/moduleAugmentationGlobal1.types
index c1742edd7c0..9963cbe1162 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal1.types
+++ b/tests/baselines/reference/moduleAugmentationGlobal1.types
@@ -10,7 +10,7 @@ import {A} from "./f1";
 
 // change the shape of Array<T>
 declare global {
->global : typeof 
+>global : any
 
     interface Array<T> {
 >Array : T[]
diff --git a/tests/baselines/reference/moduleAugmentationGlobal2.symbols b/tests/baselines/reference/moduleAugmentationGlobal2.symbols
index 4ee2b9bace8..48fe93353fb 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal2.symbols
+++ b/tests/baselines/reference/moduleAugmentationGlobal2.symbols
@@ -17,7 +17,7 @@ declare global {
 >T : Symbol(T, Decl(lib.d.ts, --, --), Decl(f2.ts, 5, 20))
 
         getCountAsString(): string;
->getCountAsString : Symbol(getCountAsString, Decl(f2.ts, 5, 24))
+>getCountAsString : Symbol(Array.getCountAsString, Decl(f2.ts, 5, 24))
     }
 }
 
diff --git a/tests/baselines/reference/moduleAugmentationGlobal2.types b/tests/baselines/reference/moduleAugmentationGlobal2.types
index 36ef480d8b2..96252569da6 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal2.types
+++ b/tests/baselines/reference/moduleAugmentationGlobal2.types
@@ -10,7 +10,7 @@ import {A} from "./f1";
 >A : typeof A
 
 declare global {
->global : typeof 
+>global : any
 
     interface Array<T> {
 >Array : T[]
diff --git a/tests/baselines/reference/moduleAugmentationGlobal3.js b/tests/baselines/reference/moduleAugmentationGlobal3.js
index 4cff75f5df0..caa080a558c 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal3.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal3.js
@@ -50,3 +50,4 @@ declare global  {
 }
 export {};
 //// [f3.d.ts]
+import "./f2";
diff --git a/tests/baselines/reference/moduleAugmentationGlobal3.symbols b/tests/baselines/reference/moduleAugmentationGlobal3.symbols
index acb9a7b9e58..41c7f25b818 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal3.symbols
+++ b/tests/baselines/reference/moduleAugmentationGlobal3.symbols
@@ -17,7 +17,7 @@ declare global {
 >T : Symbol(T, Decl(lib.d.ts, --, --), Decl(f2.ts, 5, 20))
 
         getCountAsString(): string;
->getCountAsString : Symbol(getCountAsString, Decl(f2.ts, 5, 24))
+>getCountAsString : Symbol(Array.getCountAsString, Decl(f2.ts, 5, 24))
     }
 }
 
diff --git a/tests/baselines/reference/moduleAugmentationGlobal3.types b/tests/baselines/reference/moduleAugmentationGlobal3.types
index 58d7f30faab..0e8e731aec1 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal3.types
+++ b/tests/baselines/reference/moduleAugmentationGlobal3.types
@@ -10,7 +10,7 @@ import {A} from "./f1";
 >A : typeof A
 
 declare global {
->global : typeof 
+>global : any
 
     interface Array<T> {
 >Array : T[]
diff --git a/tests/baselines/reference/moduleAugmentationGlobal4.errors.txt b/tests/baselines/reference/moduleAugmentationGlobal4.errors.txt
deleted file mode 100644
index fd3444f56b1..00000000000
--- a/tests/baselines/reference/moduleAugmentationGlobal4.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-tests/cases/compiler/f1.ts(3,15): error TS2665: Module augmentation cannot introduce new names in the top level scope.
-tests/cases/compiler/f2.ts(3,15): error TS2665: Module augmentation cannot introduce new names in the top level scope.
-
-
-==== tests/cases/compiler/f1.ts (1 errors) ====
-    
-    declare global {
-        interface Something {x}
-                  ~~~~~~~~~
-!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
-    }
-    export {};
-==== tests/cases/compiler/f2.ts (1 errors) ====
-    
-    declare global {
-        interface Something {y}
-                  ~~~~~~~~~
-!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
-    }
-    export {};
-==== tests/cases/compiler/f3.ts (0 errors) ====
-    import "./f1";
-    import "./f2";
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleAugmentationGlobal4.js b/tests/baselines/reference/moduleAugmentationGlobal4.js
index 11c5d968df2..38f186d0e05 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal4.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal4.js
@@ -45,3 +45,5 @@ declare global  {
 export {  };
 export {};
 //// [f3.d.ts]
+import "./f1";
+import "./f2";
diff --git a/tests/baselines/reference/moduleAugmentationGlobal4.symbols b/tests/baselines/reference/moduleAugmentationGlobal4.symbols
new file mode 100644
index 00000000000..f9cdac3fc2e
--- /dev/null
+++ b/tests/baselines/reference/moduleAugmentationGlobal4.symbols
@@ -0,0 +1,26 @@
+=== tests/cases/compiler/f1.ts ===
+
+declare global {
+>global : Symbol(, Decl(f1.ts, 0, 0))
+
+    interface Something {x}
+>Something : Symbol(Something, Decl(f1.ts, 1, 16), Decl(f2.ts, 1, 16))
+>x : Symbol(Something.x, Decl(f1.ts, 2, 25))
+}
+export {};
+=== tests/cases/compiler/f2.ts ===
+
+declare global {
+>global : Symbol(, Decl(f2.ts, 0, 0))
+
+    interface Something {y}
+>Something : Symbol(Something, Decl(f1.ts, 1, 16), Decl(f2.ts, 1, 16))
+>y : Symbol(Something.y, Decl(f2.ts, 2, 25))
+}
+export {};
+=== tests/cases/compiler/f3.ts ===
+import "./f1";
+No type information for this code.import "./f2";
+No type information for this code.
+No type information for this code.
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleAugmentationGlobal4.types b/tests/baselines/reference/moduleAugmentationGlobal4.types
new file mode 100644
index 00000000000..e3e780d69ff
--- /dev/null
+++ b/tests/baselines/reference/moduleAugmentationGlobal4.types
@@ -0,0 +1,26 @@
+=== tests/cases/compiler/f1.ts ===
+
+declare global {
+>global : any
+
+    interface Something {x}
+>Something : Something
+>x : any
+}
+export {};
+=== tests/cases/compiler/f2.ts ===
+
+declare global {
+>global : any
+
+    interface Something {y}
+>Something : Something
+>y : any
+}
+export {};
+=== tests/cases/compiler/f3.ts ===
+import "./f1";
+No type information for this code.import "./f2";
+No type information for this code.
+No type information for this code.
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleAugmentationGlobal5.errors.txt b/tests/baselines/reference/moduleAugmentationGlobal5.errors.txt
deleted file mode 100644
index 4f1f9133760..00000000000
--- a/tests/baselines/reference/moduleAugmentationGlobal5.errors.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-tests/cases/compiler/f1.d.ts(4,19): error TS2665: Module augmentation cannot introduce new names in the top level scope.
-tests/cases/compiler/f2.d.ts(3,19): error TS2665: Module augmentation cannot introduce new names in the top level scope.
-
-
-==== tests/cases/compiler/f3.ts (0 errors) ====
-    /// <reference path="f1.d.ts"/>
-    /// <reference path="f2.d.ts"/>
-    import "A";
-    import "B";
-    
-    
-==== tests/cases/compiler/f1.d.ts (1 errors) ====
-    
-    declare module "A" {
-        global {
-            interface Something {x}
-                      ~~~~~~~~~
-!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
-        }
-    }
-==== tests/cases/compiler/f2.d.ts (1 errors) ====
-    declare module "B" {
-        global {
-            interface Something {y}
-                      ~~~~~~~~~
-!!! error TS2665: Module augmentation cannot introduce new names in the top level scope.
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleAugmentationGlobal5.js b/tests/baselines/reference/moduleAugmentationGlobal5.js
index 3efdd2dbb98..70c81893bd8 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal5.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal5.js
@@ -32,3 +32,5 @@ require("B");
 //// [f3.d.ts]
 /// <reference path="f1.d.ts" />
 /// <reference path="f2.d.ts" />
+import "A";
+import "B";
diff --git a/tests/baselines/reference/moduleAugmentationGlobal5.symbols b/tests/baselines/reference/moduleAugmentationGlobal5.symbols
new file mode 100644
index 00000000000..27548b05ef2
--- /dev/null
+++ b/tests/baselines/reference/moduleAugmentationGlobal5.symbols
@@ -0,0 +1,28 @@
+=== tests/cases/compiler/f3.ts ===
+/// <reference path="f1.d.ts"/>
+No type information for this code./// <reference path="f2.d.ts"/>
+No type information for this code.import "A";
+No type information for this code.import "B";
+No type information for this code.
+No type information for this code.
+No type information for this code.=== tests/cases/compiler/f1.d.ts ===
+
+declare module "A" {
+    global {
+>global : Symbol(, Decl(f1.d.ts, 1, 20))
+
+        interface Something {x}
+>Something : Symbol(Something, Decl(f1.d.ts, 2, 12), Decl(f2.d.ts, 1, 12))
+>x : Symbol(Something.x, Decl(f1.d.ts, 3, 29))
+    }
+}
+=== tests/cases/compiler/f2.d.ts ===
+declare module "B" {
+    global {
+>global : Symbol(, Decl(f2.d.ts, 0, 20))
+
+        interface Something {y}
+>Something : Symbol(Something, Decl(f1.d.ts, 2, 12), Decl(f2.d.ts, 1, 12))
+>y : Symbol(Something.y, Decl(f2.d.ts, 2, 29))
+    }
+}
diff --git a/tests/baselines/reference/moduleAugmentationGlobal5.types b/tests/baselines/reference/moduleAugmentationGlobal5.types
new file mode 100644
index 00000000000..b2e6139eb26
--- /dev/null
+++ b/tests/baselines/reference/moduleAugmentationGlobal5.types
@@ -0,0 +1,28 @@
+=== tests/cases/compiler/f3.ts ===
+/// <reference path="f1.d.ts"/>
+No type information for this code./// <reference path="f2.d.ts"/>
+No type information for this code.import "A";
+No type information for this code.import "B";
+No type information for this code.
+No type information for this code.
+No type information for this code.=== tests/cases/compiler/f1.d.ts ===
+
+declare module "A" {
+    global {
+>global : any
+
+        interface Something {x}
+>Something : Something
+>x : any
+    }
+}
+=== tests/cases/compiler/f2.d.ts ===
+declare module "B" {
+    global {
+>global : any
+
+        interface Something {y}
+>Something : Something
+>y : any
+    }
+}
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports1.js b/tests/baselines/reference/moduleAugmentationImportsAndExports1.js
index 7159e7b5d0c..8e0b7dad19d 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports1.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports1.js
@@ -69,3 +69,4 @@ declare module "./f1" {
     }
 }
 //// [f4.d.ts]
+import "./f3";
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports1.symbols b/tests/baselines/reference/moduleAugmentationImportsAndExports1.symbols
index c641cad5228..84daab19bf5 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports1.symbols
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports1.symbols
@@ -8,7 +8,7 @@ export class B {
 >B : Symbol(B, Decl(f2.ts, 0, 0))
 
     n: number;
->n : Symbol(n, Decl(f2.ts, 0, 16))
+>n : Symbol(B.n, Decl(f2.ts, 0, 16))
 }
 
 === tests/cases/compiler/f3.ts ===
@@ -31,7 +31,7 @@ declare module "./f1" {
 >A : Symbol(A, Decl(f1.ts, 0, 0), Decl(f3.ts, 4, 23))
 
         foo(): B;
->foo : Symbol(foo, Decl(f3.ts, 5, 17))
+>foo : Symbol(A.foo, Decl(f3.ts, 5, 17))
 >B : Symbol(B, Decl(f3.ts, 1, 8))
     }
 }
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
index 3a4a807a334..498df8ab90e 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
@@ -74,3 +74,4 @@ export declare class B {
     n: number;
 }
 //// [f4.d.ts]
+import "./f3";
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
index d872a79e985..8d9e69c5076 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
@@ -72,3 +72,4 @@ export declare class B {
     n: number;
 }
 //// [f4.d.ts]
+import "./f3";
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports4.symbols b/tests/baselines/reference/moduleAugmentationImportsAndExports4.symbols
index 94dc05519dd..fd1ec87b2a2 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports4.symbols
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports4.symbols
@@ -8,7 +8,7 @@ export class B {
 >B : Symbol(B, Decl(f2.ts, 0, 0))
 
     n: number;
->n : Symbol(n, Decl(f2.ts, 0, 16))
+>n : Symbol(B.n, Decl(f2.ts, 0, 16))
 }
 
 === tests/cases/compiler/f3.ts ===
@@ -31,11 +31,11 @@ namespace N {
 
     export interface Ifc { a: number; }
 >Ifc : Symbol(Ifc, Decl(f3.ts, 5, 13))
->a : Symbol(a, Decl(f3.ts, 6, 26))
+>a : Symbol(Ifc.a, Decl(f3.ts, 6, 26))
 
     export interface Cls { b: number; }
 >Cls : Symbol(Cls, Decl(f3.ts, 6, 39))
->b : Symbol(b, Decl(f3.ts, 7, 26))
+>b : Symbol(Cls.b, Decl(f3.ts, 7, 26))
 }
 import I = N.Ifc;
 >I : Symbol(I, Decl(f3.ts, 8, 1))
@@ -52,15 +52,15 @@ declare module "./f1" {
 >A : Symbol(A, Decl(f1.ts, 0, 0), Decl(f3.ts, 12, 23))
 
         foo(): B;
->foo : Symbol(foo, Decl(f3.ts, 13, 17))
+>foo : Symbol(A.foo, Decl(f3.ts, 13, 17))
 >B : Symbol(B, Decl(f3.ts, 1, 8))
 
         bar(): I;
->bar : Symbol(bar, Decl(f3.ts, 14, 17))
+>bar : Symbol(A.bar, Decl(f3.ts, 14, 17))
 >I : Symbol(I, Decl(f3.ts, 8, 1))
 
         baz(): C;
->baz : Symbol(baz, Decl(f3.ts, 15, 17))
+>baz : Symbol(A.baz, Decl(f3.ts, 15, 17))
 >C : Symbol(C, Decl(f3.ts, 9, 17))
     }
 }
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
index c9b622ccf25..c3cba4c01f8 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
@@ -76,3 +76,4 @@ export declare class B {
     n: number;
 }
 //// [f4.d.ts]
+import "./f3";
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports6.js b/tests/baselines/reference/moduleAugmentationImportsAndExports6.js
index f0b297720b3..f5aff705eb4 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports6.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports6.js
@@ -95,3 +95,4 @@ declare module "./f1" {
     }
 }
 //// [f4.d.ts]
+import "./f3";
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports6.symbols b/tests/baselines/reference/moduleAugmentationImportsAndExports6.symbols
index 92952ef94bc..5c9be6d9448 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports6.symbols
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports6.symbols
@@ -8,7 +8,7 @@ export class B {
 >B : Symbol(B, Decl(f2.ts, 0, 0))
 
     n: number;
->n : Symbol(n, Decl(f2.ts, 0, 16))
+>n : Symbol(B.n, Decl(f2.ts, 0, 16))
 }
 
 === tests/cases/compiler/f3.ts ===
@@ -31,11 +31,11 @@ export namespace N {
 
     export interface Ifc { a: number; }
 >Ifc : Symbol(Ifc, Decl(f3.ts, 5, 20))
->a : Symbol(a, Decl(f3.ts, 6, 26))
+>a : Symbol(Ifc.a, Decl(f3.ts, 6, 26))
 
     export interface Cls { b: number; }
 >Cls : Symbol(Cls, Decl(f3.ts, 6, 39))
->b : Symbol(b, Decl(f3.ts, 7, 26))
+>b : Symbol(Cls.b, Decl(f3.ts, 7, 26))
 }
 import I = N.Ifc;
 >I : Symbol(I, Decl(f3.ts, 8, 1))
@@ -52,15 +52,15 @@ declare module "./f1" {
 >A : Symbol(A, Decl(f1.ts, 0, 0), Decl(f3.ts, 12, 23))
 
         foo(): B;
->foo : Symbol(foo, Decl(f3.ts, 13, 17))
+>foo : Symbol(A.foo, Decl(f3.ts, 13, 17))
 >B : Symbol(B, Decl(f3.ts, 1, 8))
 
         bar(): I;
->bar : Symbol(bar, Decl(f3.ts, 14, 17))
+>bar : Symbol(A.bar, Decl(f3.ts, 14, 17))
 >I : Symbol(I, Decl(f3.ts, 8, 1))
 
         baz(): C;
->baz : Symbol(baz, Decl(f3.ts, 15, 17))
+>baz : Symbol(A.baz, Decl(f3.ts, 15, 17))
 >C : Symbol(C, Decl(f3.ts, 9, 17))
     }
 }
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule1.symbols b/tests/baselines/reference/moduleAugmentationInAmbientModule1.symbols
index b59f0766eea..6d9c185ca08 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule1.symbols
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule1.symbols
@@ -26,7 +26,7 @@ declare module "Observable" {
 declare module "M" {
     class Cls { x: number }
 >Cls : Symbol(Cls, Decl(O.d.ts, 6, 20))
->x : Symbol(x, Decl(O.d.ts, 7, 15))
+>x : Symbol(Cls.x, Decl(O.d.ts, 7, 15))
 }
 
 declare module "Map" {
@@ -38,7 +38,7 @@ declare module "Map" {
 >Observable : Symbol(Observable, Decl(O.d.ts, 2, 29), Decl(O.d.ts, 12, 25))
 
             foo(): Cls;
->foo : Symbol(foo, Decl(O.d.ts, 13, 30))
+>foo : Symbol(Observable.foo, Decl(O.d.ts, 13, 30))
 >Cls : Symbol(Cls, Decl(O.d.ts, 11, 12))
         }
     }
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule2.symbols b/tests/baselines/reference/moduleAugmentationInAmbientModule2.symbols
index 6308e67b3b9..5bf797dcf08 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule2.symbols
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule2.symbols
@@ -26,7 +26,7 @@ declare module "Observable" {
 declare module "M" {
     class Cls { x: number }
 >Cls : Symbol(Cls, Decl(O.d.ts, 5, 20))
->x : Symbol(x, Decl(O.d.ts, 6, 15))
+>x : Symbol(Cls.x, Decl(O.d.ts, 6, 15))
 }
 
 declare module "Map" {
@@ -38,7 +38,7 @@ declare module "Map" {
 >Observable : Symbol(Observable, Decl(O.d.ts, 1, 29), Decl(O.d.ts, 11, 25))
 
             foo(): Cls;
->foo : Symbol(foo, Decl(O.d.ts, 12, 30))
+>foo : Symbol(Observable.foo, Decl(O.d.ts, 12, 30))
 >Cls : Symbol(Cls, Decl(O.d.ts, 10, 12))
         }
     }
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule3.symbols b/tests/baselines/reference/moduleAugmentationInAmbientModule3.symbols
index 34eea56753f..2bde1316107 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule3.symbols
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule3.symbols
@@ -33,7 +33,7 @@ declare module "Observable" {
 declare module "M" {
     class Cls { x: number }
 >Cls : Symbol(Cls, Decl(O.d.ts, 5, 20))
->x : Symbol(x, Decl(O.d.ts, 6, 15))
+>x : Symbol(Cls.x, Decl(O.d.ts, 6, 15))
 }
 
 declare module "Map" {
@@ -45,7 +45,7 @@ declare module "Map" {
 >Observable : Symbol(Observable, Decl(O.d.ts, 1, 29), Decl(O.d.ts, 11, 25), Decl(O.d.ts, 20, 25))
 
             foo(): Cls;
->foo : Symbol(foo, Decl(O.d.ts, 12, 30))
+>foo : Symbol(Observable.foo, Decl(O.d.ts, 12, 30))
 >Cls : Symbol(Cls, Decl(O.d.ts, 10, 12))
         }
     }
@@ -54,14 +54,14 @@ declare module "Map" {
 declare module "Map" {
     class Cls2 { x2: number }
 >Cls2 : Symbol(Cls2, Decl(O.d.ts, 18, 22))
->x2 : Symbol(x2, Decl(O.d.ts, 19, 16))
+>x2 : Symbol(Cls2.x2, Decl(O.d.ts, 19, 16))
 
     module "Observable" {
         interface Observable {
 >Observable : Symbol(Observable, Decl(O.d.ts, 1, 29), Decl(O.d.ts, 11, 25), Decl(O.d.ts, 20, 25))
 
             foo2(): Cls2;
->foo2 : Symbol(foo2, Decl(O.d.ts, 21, 30))
+>foo2 : Symbol(Observable.foo2, Decl(O.d.ts, 21, 30))
 >Cls2 : Symbol(Cls2, Decl(O.d.ts, 18, 22))
         }
     }
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule4.symbols b/tests/baselines/reference/moduleAugmentationInAmbientModule4.symbols
index 55658c2a52e..6e01ff8a204 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule4.symbols
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule4.symbols
@@ -34,7 +34,7 @@ declare module "Observable" {
 declare module "M" {
     class Cls { x: number }
 >Cls : Symbol(Cls, Decl(O.d.ts, 5, 20))
->x : Symbol(x, Decl(O.d.ts, 6, 15))
+>x : Symbol(Cls.x, Decl(O.d.ts, 6, 15))
 }
 
 declare module "Map" {
@@ -46,7 +46,7 @@ declare module "Map" {
 >Observable : Symbol(Observable, Decl(O.d.ts, 1, 29), Decl(O.d.ts, 11, 25), Decl(O2.d.ts, 2, 25))
 
             foo(): Cls;
->foo : Symbol(foo, Decl(O.d.ts, 12, 30))
+>foo : Symbol(Observable.foo, Decl(O.d.ts, 12, 30))
 >Cls : Symbol(Cls, Decl(O.d.ts, 10, 12))
         }
     }
@@ -56,14 +56,14 @@ declare module "Map" {
 declare module "Map" {
     class Cls2 { x2: number }
 >Cls2 : Symbol(Cls2, Decl(O2.d.ts, 0, 22))
->x2 : Symbol(x2, Decl(O2.d.ts, 1, 16))
+>x2 : Symbol(Cls2.x2, Decl(O2.d.ts, 1, 16))
 
     module "Observable" {
         interface Observable {
 >Observable : Symbol(Observable, Decl(O.d.ts, 1, 29), Decl(O.d.ts, 11, 25), Decl(O2.d.ts, 2, 25))
 
             foo2(): Cls2;
->foo2 : Symbol(foo2, Decl(O2.d.ts, 3, 30))
+>foo2 : Symbol(Observable.foo2, Decl(O2.d.ts, 3, 30))
 >Cls2 : Symbol(Cls2, Decl(O2.d.ts, 0, 22))
         }
     }
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule5.js b/tests/baselines/reference/moduleAugmentationInAmbientModule5.js
index fab9cebb179..2e6503c4774 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule5.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule5.js
@@ -33,3 +33,4 @@ var y = x.getA().x;
 
 //// [f.d.ts]
 /// <reference path="array.d.ts" />
+import "array";
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule5.symbols b/tests/baselines/reference/moduleAugmentationInAmbientModule5.symbols
index a663efca64d..76b135307dd 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule5.symbols
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule5.symbols
@@ -18,7 +18,7 @@ let y = x.getA().x;
 declare module "A" {
     class A { x: number; }
 >A : Symbol(A, Decl(array.d.ts, 1, 20))
->x : Symbol(x, Decl(array.d.ts, 2, 13))
+>x : Symbol(A.x, Decl(array.d.ts, 2, 13))
 }
 
 declare module "array" {
@@ -33,7 +33,7 @@ declare module "array" {
 >T : Symbol(T, Decl(lib.d.ts, --, --), Decl(array.d.ts, 8, 24))
 
             getA(): A;
->getA : Symbol(getA, Decl(array.d.ts, 8, 28))
+>getA : Symbol(Array.getA, Decl(array.d.ts, 8, 28))
 >A : Symbol(A, Decl(array.d.ts, 6, 12))
         }
     }
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule5.types b/tests/baselines/reference/moduleAugmentationInAmbientModule5.types
index d04cdca4893..998452be450 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule5.types
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule5.types
@@ -29,7 +29,7 @@ declare module "array" {
 >A : typeof A
 
     global {
->global : typeof 
+>global : any
 
         interface Array<T> {
 >Array : T[]
diff --git a/tests/baselines/reference/moduleAugmentationsBundledOutput1.js b/tests/baselines/reference/moduleAugmentationsBundledOutput1.js
index 92916206e76..504c015bcb8 100644
--- a/tests/baselines/reference/moduleAugmentationsBundledOutput1.js
+++ b/tests/baselines/reference/moduleAugmentationsBundledOutput1.js
@@ -139,4 +139,6 @@ declare module "m4" {
     }
 }
 declare module "test" {
+    import "m2";
+    import "m4";
 }
diff --git a/tests/baselines/reference/moduleAugmentationsBundledOutput1.symbols b/tests/baselines/reference/moduleAugmentationsBundledOutput1.symbols
index 47160cbc17f..5f98b39c228 100644
--- a/tests/baselines/reference/moduleAugmentationsBundledOutput1.symbols
+++ b/tests/baselines/reference/moduleAugmentationsBundledOutput1.symbols
@@ -23,7 +23,7 @@ declare module "./m1" {
 >Cls : Symbol(Cls, Decl(m1.ts, 0, 0), Decl(m2.ts, 4, 23), Decl(m2.ts, 10, 23), Decl(m4.ts, 5, 23), Decl(m4.ts, 11, 23))
 
         foo(): number;
->foo : Symbol(foo, Decl(m2.ts, 5, 19))
+>foo : Symbol(Cls.foo, Decl(m2.ts, 5, 19))
     }
 }
 
@@ -32,18 +32,18 @@ declare module "./m1" {
 >Cls : Symbol(Cls, Decl(m1.ts, 0, 0), Decl(m2.ts, 4, 23), Decl(m2.ts, 10, 23), Decl(m4.ts, 5, 23), Decl(m4.ts, 11, 23))
 
         bar(): string;
->bar : Symbol(bar, Decl(m2.ts, 11, 19))
+>bar : Symbol(Cls.bar, Decl(m2.ts, 11, 19))
     }
 }
 
 === tests/cases/compiler/m3.ts ===
 export class C1 { x: number }
 >C1 : Symbol(C1, Decl(m3.ts, 0, 0))
->x : Symbol(x, Decl(m3.ts, 0, 17))
+>x : Symbol(C1.x, Decl(m3.ts, 0, 17))
 
 export class C2 { x: string }
 >C2 : Symbol(C2, Decl(m3.ts, 0, 29))
->x : Symbol(x, Decl(m3.ts, 1, 17))
+>x : Symbol(C2.x, Decl(m3.ts, 1, 17))
 
 === tests/cases/compiler/m4.ts ===
 import {Cls} from "./m1";
@@ -70,7 +70,7 @@ declare module "./m1" {
 >Cls : Symbol(Cls, Decl(m1.ts, 0, 0), Decl(m2.ts, 4, 23), Decl(m2.ts, 10, 23), Decl(m4.ts, 5, 23), Decl(m4.ts, 11, 23))
 
         baz1(): C1;
->baz1 : Symbol(baz1, Decl(m4.ts, 6, 19))
+>baz1 : Symbol(Cls.baz1, Decl(m4.ts, 6, 19))
 >C1 : Symbol(C1, Decl(m4.ts, 1, 8))
     }
 }
@@ -80,7 +80,7 @@ declare module "./m1" {
 >Cls : Symbol(Cls, Decl(m1.ts, 0, 0), Decl(m2.ts, 4, 23), Decl(m2.ts, 10, 23), Decl(m4.ts, 5, 23), Decl(m4.ts, 11, 23))
 
         baz2(): C2;
->baz2 : Symbol(baz2, Decl(m4.ts, 12, 19))
+>baz2 : Symbol(Cls.baz2, Decl(m4.ts, 12, 19))
 >C2 : Symbol(C2, Decl(m4.ts, 1, 11))
     }
 }
diff --git a/tests/baselines/reference/moduleAugmentationsImports1.js b/tests/baselines/reference/moduleAugmentationsImports1.js
index 2c635a0719e..922bb61d952 100644
--- a/tests/baselines/reference/moduleAugmentationsImports1.js
+++ b/tests/baselines/reference/moduleAugmentationsImports1.js
@@ -101,4 +101,5 @@ declare module "d" {
     }
 }
 declare module "main" {
+    import "d";
 }
diff --git a/tests/baselines/reference/moduleAugmentationsImports1.symbols b/tests/baselines/reference/moduleAugmentationsImports1.symbols
index 38ef8f55229..685ee9bb31c 100644
--- a/tests/baselines/reference/moduleAugmentationsImports1.symbols
+++ b/tests/baselines/reference/moduleAugmentationsImports1.symbols
@@ -6,13 +6,13 @@ export class A {}
 === tests/cases/compiler/b.ts ===
 export class B {x: number;}
 >B : Symbol(B, Decl(b.ts, 0, 0))
->x : Symbol(x, Decl(b.ts, 0, 16))
+>x : Symbol(B.x, Decl(b.ts, 0, 16))
 
 === tests/cases/compiler/c.d.ts ===
 declare module "C" {
     class Cls {y: string; }
 >Cls : Symbol(Cls, Decl(c.d.ts, 0, 20))
->y : Symbol(y, Decl(c.d.ts, 1, 15))
+>y : Symbol(Cls.y, Decl(c.d.ts, 1, 15))
 }
 
 === tests/cases/compiler/d.ts ===
@@ -48,7 +48,7 @@ declare module "./a" {
 >A : Symbol(A, Decl(a.ts, 0, 0), Decl(d.ts, 9, 22), Decl(d.ts, 15, 22))
 
         getB(): B;
->getB : Symbol(getB, Decl(d.ts, 10, 17))
+>getB : Symbol(A.getB, Decl(d.ts, 10, 17))
 >B : Symbol(B, Decl(d.ts, 3, 8))
     }
 }
@@ -58,7 +58,7 @@ declare module "./a" {
 >A : Symbol(A, Decl(a.ts, 0, 0), Decl(d.ts, 9, 22), Decl(d.ts, 15, 22))
 
         getCls(): Cls;
->getCls : Symbol(getCls, Decl(d.ts, 16, 17))
+>getCls : Symbol(A.getCls, Decl(d.ts, 16, 17))
 >Cls : Symbol(Cls, Decl(d.ts, 4, 8))
     }
 }
diff --git a/tests/baselines/reference/moduleAugmentationsImports2.js b/tests/baselines/reference/moduleAugmentationsImports2.js
index f70426b49bd..605a07e29e1 100644
--- a/tests/baselines/reference/moduleAugmentationsImports2.js
+++ b/tests/baselines/reference/moduleAugmentationsImports2.js
@@ -111,4 +111,6 @@ declare module "e" {
     }
 }
 declare module "main" {
+    import "d";
+    import "e";
 }
diff --git a/tests/baselines/reference/moduleAugmentationsImports2.symbols b/tests/baselines/reference/moduleAugmentationsImports2.symbols
index 643ccf20eb2..126e407da8a 100644
--- a/tests/baselines/reference/moduleAugmentationsImports2.symbols
+++ b/tests/baselines/reference/moduleAugmentationsImports2.symbols
@@ -6,13 +6,13 @@ export class A {}
 === tests/cases/compiler/b.ts ===
 export class B {x: number;}
 >B : Symbol(B, Decl(b.ts, 0, 0))
->x : Symbol(x, Decl(b.ts, 0, 16))
+>x : Symbol(B.x, Decl(b.ts, 0, 16))
 
 === tests/cases/compiler/c.d.ts ===
 declare module "C" {
     class Cls {y: string; }
 >Cls : Symbol(Cls, Decl(c.d.ts, 0, 20))
->y : Symbol(y, Decl(c.d.ts, 1, 15))
+>y : Symbol(Cls.y, Decl(c.d.ts, 1, 15))
 }
 
 === tests/cases/compiler/d.ts ===
@@ -37,7 +37,7 @@ declare module "./a" {
 >A : Symbol(A, Decl(a.ts, 0, 0), Decl(d.ts, 7, 22), Decl(e.ts, 5, 22))
 
         getB(): B;
->getB : Symbol(getB, Decl(d.ts, 8, 17))
+>getB : Symbol(A.getB, Decl(d.ts, 8, 17))
 >B : Symbol(B, Decl(d.ts, 3, 8))
     }
 }
@@ -62,7 +62,7 @@ declare module "./a" {
 >A : Symbol(A, Decl(a.ts, 0, 0), Decl(d.ts, 7, 22), Decl(e.ts, 5, 22))
 
         getCls(): Cls;
->getCls : Symbol(getCls, Decl(e.ts, 6, 17))
+>getCls : Symbol(A.getCls, Decl(e.ts, 6, 17))
 >Cls : Symbol(Cls, Decl(e.ts, 1, 8))
     }
 }
diff --git a/tests/baselines/reference/moduleAugmentationsImports3.js b/tests/baselines/reference/moduleAugmentationsImports3.js
index 3654583b5c9..0a946f42be3 100644
--- a/tests/baselines/reference/moduleAugmentationsImports3.js
+++ b/tests/baselines/reference/moduleAugmentationsImports3.js
@@ -98,4 +98,6 @@ declare module "e" {
     }
 }
 declare module "main" {
+    import "D";
+    import "e";
 }
diff --git a/tests/baselines/reference/moduleAugmentationsImports3.symbols b/tests/baselines/reference/moduleAugmentationsImports3.symbols
index db8eee074c0..fba58ffad8a 100644
--- a/tests/baselines/reference/moduleAugmentationsImports3.symbols
+++ b/tests/baselines/reference/moduleAugmentationsImports3.symbols
@@ -38,13 +38,13 @@ export class A {}
 === tests/cases/compiler/b.ts ===
 export class B {x: number;}
 >B : Symbol(B, Decl(b.ts, 0, 0))
->x : Symbol(x, Decl(b.ts, 0, 16))
+>x : Symbol(B.x, Decl(b.ts, 0, 16))
 
 === tests/cases/compiler/c.d.ts ===
 declare module "C" {
     class Cls {y: string; }
 >Cls : Symbol(Cls, Decl(c.d.ts, 0, 20))
->y : Symbol(y, Decl(c.d.ts, 1, 15))
+>y : Symbol(Cls.y, Decl(c.d.ts, 1, 15))
 }
 
 === tests/cases/compiler/d.d.ts ===
@@ -60,7 +60,7 @@ declare module "D" {
 >A : Symbol(A, Decl(a.ts, 0, 0), Decl(d.d.ts, 3, 16), Decl(e.ts, 6, 22))
 
             getB(): B;
->getB : Symbol(getB, Decl(d.d.ts, 4, 21))
+>getB : Symbol(A.getB, Decl(d.d.ts, 4, 21))
 >B : Symbol(B, Decl(d.d.ts, 2, 12))
         }
     }
@@ -87,7 +87,7 @@ declare module "./a" {
 >A : Symbol(A, Decl(a.ts, 0, 0), Decl(d.d.ts, 3, 16), Decl(e.ts, 6, 22))
 
         getCls(): Cls;
->getCls : Symbol(getCls, Decl(e.ts, 7, 17))
+>getCls : Symbol(A.getCls, Decl(e.ts, 7, 17))
 >Cls : Symbol(Cls, Decl(e.ts, 2, 8))
     }
 }
diff --git a/tests/baselines/reference/moduleAugmentationsImports4.js b/tests/baselines/reference/moduleAugmentationsImports4.js
index 9b64016113f..a48bbb04631 100644
--- a/tests/baselines/reference/moduleAugmentationsImports4.js
+++ b/tests/baselines/reference/moduleAugmentationsImports4.js
@@ -87,4 +87,6 @@ declare module "b" {
     }
 }
 declare module "main" {
+    import "D";
+    import "E";
 }
diff --git a/tests/baselines/reference/moduleAugmentationsImports4.symbols b/tests/baselines/reference/moduleAugmentationsImports4.symbols
index 8d203de8519..77b5431850e 100644
--- a/tests/baselines/reference/moduleAugmentationsImports4.symbols
+++ b/tests/baselines/reference/moduleAugmentationsImports4.symbols
@@ -39,13 +39,13 @@ export class A {}
 === tests/cases/compiler/b.ts ===
 export class B {x: number;}
 >B : Symbol(B, Decl(b.ts, 0, 0))
->x : Symbol(x, Decl(b.ts, 0, 16))
+>x : Symbol(B.x, Decl(b.ts, 0, 16))
 
 === tests/cases/compiler/c.d.ts ===
 declare module "C" {
     class Cls {y: string; }
 >Cls : Symbol(Cls, Decl(c.d.ts, 0, 20))
->y : Symbol(y, Decl(c.d.ts, 1, 15))
+>y : Symbol(Cls.y, Decl(c.d.ts, 1, 15))
 }
 
 === tests/cases/compiler/d.d.ts ===
@@ -61,7 +61,7 @@ declare module "D" {
 >A : Symbol(A, Decl(a.ts, 0, 0), Decl(d.d.ts, 3, 16), Decl(e.d.ts, 5, 16))
 
             getB(): B;
->getB : Symbol(getB, Decl(d.d.ts, 4, 21))
+>getB : Symbol(A.getB, Decl(d.d.ts, 4, 21))
 >B : Symbol(B, Decl(d.d.ts, 2, 12))
         }
     }
@@ -81,7 +81,7 @@ declare module "E" {
 >A : Symbol(A, Decl(a.ts, 0, 0), Decl(d.d.ts, 3, 16), Decl(e.d.ts, 5, 16))
 
             getCls(): Cls;
->getCls : Symbol(getCls, Decl(e.d.ts, 6, 21))
+>getCls : Symbol(A.getCls, Decl(e.d.ts, 6, 21))
 >Cls : Symbol(Cls, Decl(e.d.ts, 3, 12))
         }
     }
diff --git a/tests/baselines/reference/moduleCodeGenTest5.symbols b/tests/baselines/reference/moduleCodeGenTest5.symbols
index 1e68d449665..f93e8ef6297 100644
--- a/tests/baselines/reference/moduleCodeGenTest5.symbols
+++ b/tests/baselines/reference/moduleCodeGenTest5.symbols
@@ -15,19 +15,19 @@ export class C1 {
 >C1 : Symbol(C1, Decl(moduleCodeGenTest5.ts, 4, 16))
 
 	public p1 = 0;
->p1 : Symbol(p1, Decl(moduleCodeGenTest5.ts, 6, 17))
+>p1 : Symbol(C1.p1, Decl(moduleCodeGenTest5.ts, 6, 17))
 
 	public p2() {}
->p2 : Symbol(p2, Decl(moduleCodeGenTest5.ts, 7, 15))
+>p2 : Symbol(C1.p2, Decl(moduleCodeGenTest5.ts, 7, 15))
 }
 class C2{
 >C2 : Symbol(C2, Decl(moduleCodeGenTest5.ts, 9, 1))
 
 	public p1 = 0;
->p1 : Symbol(p1, Decl(moduleCodeGenTest5.ts, 10, 9))
+>p1 : Symbol(C2.p1, Decl(moduleCodeGenTest5.ts, 10, 9))
 
 	public p2() {}	
->p2 : Symbol(p2, Decl(moduleCodeGenTest5.ts, 11, 15))
+>p2 : Symbol(C2.p2, Decl(moduleCodeGenTest5.ts, 11, 15))
 }
 
 export enum E1 {A=0}
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 26fd511a955..7cd2af405e2 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext.js
+++ b/tests/baselines/reference/moduleElementsInWrongContext.js
@@ -32,15 +32,22 @@
 
 //// [moduleElementsInWrongContext.js]
 {
+    export = M;
     var v;
     function foo() { }
-    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 24fccc02dc5..55dd133ec95 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext2.js
+++ b/tests/baselines/reference/moduleElementsInWrongContext2.js
@@ -32,15 +32,22 @@ function blah () {
 
 //// [moduleElementsInWrongContext2.js]
 function blah() {
+    export = M;
     var v;
     function foo() { }
-    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 c5c0d491cd3..76220eab251 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext3.js
+++ b/tests/baselines/reference/moduleElementsInWrongContext3.js
@@ -35,16 +35,25 @@ module P {
 var P;
 (function (P) {
     {
+        export = M;
         var v;
         function foo() { }
-        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/moduleIdentifiers.symbols b/tests/baselines/reference/moduleIdentifiers.symbols
index ffb3ffa7335..1edbf333875 100644
--- a/tests/baselines/reference/moduleIdentifiers.symbols
+++ b/tests/baselines/reference/moduleIdentifiers.symbols
@@ -4,8 +4,8 @@ module M {
 
     interface P { x: number; y: number; }
 >P : Symbol(P, Decl(moduleIdentifiers.ts, 0, 10))
->x : Symbol(x, Decl(moduleIdentifiers.ts, 1, 17))
->y : Symbol(y, Decl(moduleIdentifiers.ts, 1, 28))
+>x : Symbol(P.x, Decl(moduleIdentifiers.ts, 1, 17))
+>y : Symbol(P.y, Decl(moduleIdentifiers.ts, 1, 28))
 
     export var a = 1
 >a : Symbol(a, Decl(moduleIdentifiers.ts, 2, 14))
diff --git a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.symbols b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.symbols
index fb743ea4f57..de787349442 100644
--- a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.symbols
+++ b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.symbols
@@ -7,7 +7,7 @@ module TypeScript.Parser {
 >SyntaxCursor : Symbol(SyntaxCursor, Decl(moduleMemberWithoutTypeAnnotation1.ts, 0, 26))
 
         public currentNode(): SyntaxNode {
->currentNode : Symbol(currentNode, Decl(moduleMemberWithoutTypeAnnotation1.ts, 1, 24))
+>currentNode : Symbol(SyntaxCursor.currentNode, Decl(moduleMemberWithoutTypeAnnotation1.ts, 1, 24))
 >SyntaxNode : Symbol(SyntaxNode, Decl(moduleMemberWithoutTypeAnnotation1.ts, 24, 19))
 
             return null;
@@ -28,7 +28,7 @@ module TypeScript {
 >PositionedElement : Symbol(PositionedElement, Decl(moduleMemberWithoutTypeAnnotation1.ts, 10, 38))
 
         public childIndex(child: ISyntaxElement) {
->childIndex : Symbol(childIndex, Decl(moduleMemberWithoutTypeAnnotation1.ts, 12, 36))
+>childIndex : Symbol(PositionedElement.childIndex, Decl(moduleMemberWithoutTypeAnnotation1.ts, 12, 36))
 >child : Symbol(child, Decl(moduleMemberWithoutTypeAnnotation1.ts, 13, 26))
 >ISyntaxElement : Symbol(ISyntaxElement, Decl(moduleMemberWithoutTypeAnnotation1.ts, 8, 19))
 
@@ -59,22 +59,22 @@ module TypeScript {
 >SyntaxNode : Symbol(SyntaxNode, Decl(moduleMemberWithoutTypeAnnotation1.ts, 24, 19))
 
         public findToken(position: number, includeSkippedTokens: boolean = false): PositionedToken {
->findToken : Symbol(findToken, Decl(moduleMemberWithoutTypeAnnotation1.ts, 25, 29))
+>findToken : Symbol(SyntaxNode.findToken, Decl(moduleMemberWithoutTypeAnnotation1.ts, 25, 29))
 >position : Symbol(position, Decl(moduleMemberWithoutTypeAnnotation1.ts, 26, 25))
 >includeSkippedTokens : Symbol(includeSkippedTokens, Decl(moduleMemberWithoutTypeAnnotation1.ts, 26, 42))
 >PositionedToken : Symbol(PositionedToken, Decl(moduleMemberWithoutTypeAnnotation1.ts, 16, 5))
 
             var positionedToken = this.findTokenInternal(null, position, 0);
 >positionedToken : Symbol(positionedToken, Decl(moduleMemberWithoutTypeAnnotation1.ts, 27, 15))
->this.findTokenInternal : Symbol(findTokenInternal, Decl(moduleMemberWithoutTypeAnnotation1.ts, 29, 9))
+>this.findTokenInternal : Symbol(SyntaxNode.findTokenInternal, Decl(moduleMemberWithoutTypeAnnotation1.ts, 29, 9))
 >this : Symbol(SyntaxNode, Decl(moduleMemberWithoutTypeAnnotation1.ts, 24, 19))
->findTokenInternal : Symbol(findTokenInternal, Decl(moduleMemberWithoutTypeAnnotation1.ts, 29, 9))
+>findTokenInternal : Symbol(SyntaxNode.findTokenInternal, Decl(moduleMemberWithoutTypeAnnotation1.ts, 29, 9))
 >position : Symbol(position, Decl(moduleMemberWithoutTypeAnnotation1.ts, 26, 25))
 
             return null;
         }
         findTokenInternal(x, y, z) {
->findTokenInternal : Symbol(findTokenInternal, Decl(moduleMemberWithoutTypeAnnotation1.ts, 29, 9))
+>findTokenInternal : Symbol(SyntaxNode.findTokenInternal, Decl(moduleMemberWithoutTypeAnnotation1.ts, 29, 9))
 >x : Symbol(x, Decl(moduleMemberWithoutTypeAnnotation1.ts, 30, 26))
 >y : Symbol(y, Decl(moduleMemberWithoutTypeAnnotation1.ts, 30, 28))
 >z : Symbol(z, Decl(moduleMemberWithoutTypeAnnotation1.ts, 30, 31))
@@ -96,7 +96,7 @@ module TypeScript.Syntax {
 >ISyntaxToken : Symbol(ISyntaxToken, Decl(moduleMemberWithoutTypeAnnotation1.ts, 9, 40))
 
         private findTokenInternal(parent: PositionedElement, position: number, fullStart: number) {
->findTokenInternal : Symbol(findTokenInternal, Decl(moduleMemberWithoutTypeAnnotation1.ts, 39, 79))
+>findTokenInternal : Symbol(VariableWidthTokenWithTrailingTrivia.findTokenInternal, Decl(moduleMemberWithoutTypeAnnotation1.ts, 39, 79))
 >parent : Symbol(parent, Decl(moduleMemberWithoutTypeAnnotation1.ts, 40, 34))
 >PositionedElement : Symbol(PositionedElement, Decl(moduleMemberWithoutTypeAnnotation1.ts, 10, 38))
 >position : Symbol(position, Decl(moduleMemberWithoutTypeAnnotation1.ts, 40, 60))
diff --git a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.symbols b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.symbols
index e69b8c37458..f771bbc3c79 100644
--- a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.symbols
+++ b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.symbols
@@ -9,7 +9,7 @@ module TypeScript {
 >IDiagnosticWriter : Symbol(IDiagnosticWriter, Decl(moduleMemberWithoutTypeAnnotation2.ts, 1, 39))
 
             Alert(output: string): void;
->Alert : Symbol(Alert, Decl(moduleMemberWithoutTypeAnnotation2.ts, 3, 44))
+>Alert : Symbol(IDiagnosticWriter.Alert, Decl(moduleMemberWithoutTypeAnnotation2.ts, 3, 44))
 >output : Symbol(output, Decl(moduleMemberWithoutTypeAnnotation2.ts, 4, 18))
         }
 
diff --git a/tests/baselines/reference/moduleMerge.symbols b/tests/baselines/reference/moduleMerge.symbols
index 2c288be6ff6..738aedfc28e 100644
--- a/tests/baselines/reference/moduleMerge.symbols
+++ b/tests/baselines/reference/moduleMerge.symbols
@@ -8,7 +8,7 @@ module A
 >B : Symbol(B, Decl(moduleMerge.ts, 3, 1))
     {
         public Hello(): string
->Hello : Symbol(Hello, Decl(moduleMerge.ts, 5, 5))
+>Hello : Symbol(B.Hello, Decl(moduleMerge.ts, 5, 5))
         {
             return "from private B";
         }
@@ -22,7 +22,7 @@ module A
 >B : Symbol(B, Decl(moduleMerge.ts, 14, 1))
     {
         public Hello(): string
->Hello : Symbol(Hello, Decl(moduleMerge.ts, 16, 5))
+>Hello : Symbol(B.Hello, Decl(moduleMerge.ts, 16, 5))
         {
             return "from export B";
         }
diff --git a/tests/baselines/reference/moduleMergeConstructor.symbols b/tests/baselines/reference/moduleMergeConstructor.symbols
index a960ad07e7e..8d9a773f144 100644
--- a/tests/baselines/reference/moduleMergeConstructor.symbols
+++ b/tests/baselines/reference/moduleMergeConstructor.symbols
@@ -6,7 +6,7 @@ declare module "foo" {
 
         constructor();
         method1(): any;
->method1 : Symbol(method1, Decl(foo.d.ts, 3, 22))
+>method1 : Symbol(Foo.method1, Decl(foo.d.ts, 3, 22))
     }
 }
 
@@ -16,7 +16,7 @@ declare module "foo" {
 >Foo : Symbol(Foo, Decl(foo.d.ts, 1, 22), Decl(foo-ext.d.ts, 0, 22))
 
         method2(): any;
->method2 : Symbol(method2, Decl(foo-ext.d.ts, 1, 26))
+>method2 : Symbol(Foo.method2, Decl(foo-ext.d.ts, 1, 26))
     }
 }
 
@@ -28,15 +28,15 @@ class Test {
 >Test : Symbol(Test, Decl(index.ts, 0, 27))
 
     bar: foo.Foo;
->bar : Symbol(bar, Decl(index.ts, 2, 12))
+>bar : Symbol(Test.bar, Decl(index.ts, 2, 12))
 >foo : Symbol(foo, Decl(index.ts, 0, 6))
 >Foo : Symbol(foo.Foo, Decl(foo.d.ts, 1, 22), Decl(foo-ext.d.ts, 0, 22))
 
     constructor() {
         this.bar = new foo.Foo();
->this.bar : Symbol(bar, Decl(index.ts, 2, 12))
+>this.bar : Symbol(Test.bar, Decl(index.ts, 2, 12))
 >this : Symbol(Test, Decl(index.ts, 0, 27))
->bar : Symbol(bar, Decl(index.ts, 2, 12))
+>bar : Symbol(Test.bar, Decl(index.ts, 2, 12))
 >foo.Foo : Symbol(foo.Foo, Decl(foo.d.ts, 1, 22), Decl(foo-ext.d.ts, 0, 22))
 >foo : Symbol(foo, Decl(index.ts, 0, 6))
 >Foo : Symbol(foo.Foo, Decl(foo.d.ts, 1, 22), Decl(foo-ext.d.ts, 0, 22))
diff --git a/tests/baselines/reference/moduleNoneErrors.errors.txt b/tests/baselines/reference/moduleNoneErrors.errors.txt
new file mode 100644
index 00000000000..cb943050fa8
--- /dev/null
+++ b/tests/baselines/reference/moduleNoneErrors.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/compiler/a.ts(1,14): error TS1148: Cannot compile modules unless the '--module' flag is provided with a valid module type. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
+
+
+==== tests/cases/compiler/a.ts (1 errors) ====
+    export class Foo {
+                 ~~~
+!!! error TS1148: Cannot compile modules unless the '--module' flag is provided with a valid module type. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
+        foo: string;
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleNoneErrors.js b/tests/baselines/reference/moduleNoneErrors.js
new file mode 100644
index 00000000000..c18f11d24b3
--- /dev/null
+++ b/tests/baselines/reference/moduleNoneErrors.js
@@ -0,0 +1,14 @@
+//// [a.ts]
+export class Foo {
+    foo: string;
+}
+
+
+//// [a.js]
+"use strict";
+var Foo = (function () {
+    function Foo() {
+    }
+    return Foo;
+}());
+exports.Foo = Foo;
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/moduleReopenedTypeOtherBlock.symbols b/tests/baselines/reference/moduleReopenedTypeOtherBlock.symbols
index 1a5017b89c7..d4bb9defa38 100644
--- a/tests/baselines/reference/moduleReopenedTypeOtherBlock.symbols
+++ b/tests/baselines/reference/moduleReopenedTypeOtherBlock.symbols
@@ -7,14 +7,14 @@ module M {
 
     export interface I { n: number; }
 >I : Symbol(I, Decl(moduleReopenedTypeOtherBlock.ts, 1, 23))
->n : Symbol(n, Decl(moduleReopenedTypeOtherBlock.ts, 2, 24))
+>n : Symbol(I.n, Decl(moduleReopenedTypeOtherBlock.ts, 2, 24))
 }
 module M {
 >M : Symbol(M, Decl(moduleReopenedTypeOtherBlock.ts, 0, 0), Decl(moduleReopenedTypeOtherBlock.ts, 3, 1))
 
     export class C2 { f(): I { return null; } }
 >C2 : Symbol(C2, Decl(moduleReopenedTypeOtherBlock.ts, 4, 10))
->f : Symbol(f, Decl(moduleReopenedTypeOtherBlock.ts, 5, 21))
+>f : Symbol(C2.f, Decl(moduleReopenedTypeOtherBlock.ts, 5, 21))
 >I : Symbol(I, Decl(moduleReopenedTypeOtherBlock.ts, 1, 23))
 }
 
diff --git a/tests/baselines/reference/moduleReopenedTypeSameBlock.symbols b/tests/baselines/reference/moduleReopenedTypeSameBlock.symbols
index a593b63cd01..3ee83c80746 100644
--- a/tests/baselines/reference/moduleReopenedTypeSameBlock.symbols
+++ b/tests/baselines/reference/moduleReopenedTypeSameBlock.symbols
@@ -8,11 +8,11 @@ module M {
 
     export interface I { n: number; }
 >I : Symbol(I, Decl(moduleReopenedTypeSameBlock.ts, 1, 10))
->n : Symbol(n, Decl(moduleReopenedTypeSameBlock.ts, 2, 24))
+>n : Symbol(I.n, Decl(moduleReopenedTypeSameBlock.ts, 2, 24))
 
     export class C2 { f(): I { return null; } }
 >C2 : Symbol(C2, Decl(moduleReopenedTypeSameBlock.ts, 2, 37))
->f : Symbol(f, Decl(moduleReopenedTypeSameBlock.ts, 3, 21))
+>f : Symbol(C2.f, Decl(moduleReopenedTypeSameBlock.ts, 3, 21))
 >I : Symbol(I, Decl(moduleReopenedTypeSameBlock.ts, 1, 10))
 }
 
diff --git a/tests/baselines/reference/moduleScoping.errors.txt b/tests/baselines/reference/moduleScoping.errors.txt
deleted file mode 100644
index 961715f2e71..00000000000
--- a/tests/baselines/reference/moduleScoping.errors.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-tests/cases/conformance/externalModules/file3.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-
-
-==== tests/cases/conformance/externalModules/file1.ts (0 errors) ====
-    var v1 = "sausages"; // Global scope
-    
-==== tests/cases/conformance/externalModules/file2.ts (0 errors) ====
-    var v2 = 42; // Global scope
-    var v4 = () => 5;
-    
-==== tests/cases/conformance/externalModules/file3.ts (1 errors) ====
-    export var v3 = true;
-    ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-    var v2 = [1,2,3]; // Module scope. Should not appear in global scope
-    
-==== tests/cases/conformance/externalModules/file4.ts (0 errors) ====
-    import file3 = require('./file3');
-    var t1 = v1;
-    var t2 = v2;
-    var t3 = file3.v3;
-    var v4 = {a: true, b: NaN};  // Should shadow global v2 in this module
-    
-==== tests/cases/conformance/externalModules/file5.ts (0 errors) ====
-    var x = v2; // Should be global v2 of type number again
-    
\ No newline at end of file
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/moduleScoping.symbols b/tests/baselines/reference/moduleScoping.symbols
new file mode 100644
index 00000000000..7a63e8a60fc
--- /dev/null
+++ b/tests/baselines/reference/moduleScoping.symbols
@@ -0,0 +1,47 @@
+=== tests/cases/conformance/externalModules/file1.ts ===
+var v1 = "sausages"; // Global scope
+>v1 : Symbol(v1, Decl(file1.ts, 0, 3))
+
+=== tests/cases/conformance/externalModules/file2.ts ===
+var v2 = 42; // Global scope
+>v2 : Symbol(v2, Decl(file2.ts, 0, 3))
+
+var v4 = () => 5;
+>v4 : Symbol(v4, Decl(file2.ts, 1, 3))
+
+=== tests/cases/conformance/externalModules/file3.ts ===
+export var v3 = true;
+>v3 : Symbol(v3, Decl(file3.ts, 0, 10))
+
+var v2 = [1,2,3]; // Module scope. Should not appear in global scope
+>v2 : Symbol(v2, Decl(file3.ts, 1, 3))
+
+=== tests/cases/conformance/externalModules/file4.ts ===
+import file3 = require('./file3');
+>file3 : Symbol(file3, Decl(file4.ts, 0, 0))
+
+var t1 = v1;
+>t1 : Symbol(t1, Decl(file4.ts, 1, 3))
+>v1 : Symbol(v1, Decl(file1.ts, 0, 3))
+
+var t2 = v2;
+>t2 : Symbol(t2, Decl(file4.ts, 2, 3))
+>v2 : Symbol(v2, Decl(file2.ts, 0, 3))
+
+var t3 = file3.v3;
+>t3 : Symbol(t3, Decl(file4.ts, 3, 3))
+>file3.v3 : Symbol(file3.v3, Decl(file3.ts, 0, 10))
+>file3 : Symbol(file3, Decl(file4.ts, 0, 0))
+>v3 : Symbol(file3.v3, Decl(file3.ts, 0, 10))
+
+var v4 = {a: true, b: NaN};  // Should shadow global v2 in this module
+>v4 : Symbol(v4, Decl(file4.ts, 4, 3))
+>a : Symbol(a, Decl(file4.ts, 4, 10))
+>b : Symbol(b, Decl(file4.ts, 4, 18))
+>NaN : Symbol(NaN, Decl(lib.d.ts, --, --))
+
+=== tests/cases/conformance/externalModules/file5.ts ===
+var x = v2; // Should be global v2 of type number again
+>x : Symbol(x, Decl(file5.ts, 0, 3))
+>v2 : Symbol(v2, Decl(file2.ts, 0, 3))
+
diff --git a/tests/baselines/reference/moduleScoping.types b/tests/baselines/reference/moduleScoping.types
new file mode 100644
index 00000000000..b2ee83dc69b
--- /dev/null
+++ b/tests/baselines/reference/moduleScoping.types
@@ -0,0 +1,58 @@
+=== tests/cases/conformance/externalModules/file1.ts ===
+var v1 = "sausages"; // Global scope
+>v1 : string
+>"sausages" : string
+
+=== tests/cases/conformance/externalModules/file2.ts ===
+var v2 = 42; // Global scope
+>v2 : number
+>42 : number
+
+var v4 = () => 5;
+>v4 : () => number
+>() => 5 : () => number
+>5 : number
+
+=== tests/cases/conformance/externalModules/file3.ts ===
+export var v3 = true;
+>v3 : boolean
+>true : boolean
+
+var v2 = [1,2,3]; // Module scope. Should not appear in global scope
+>v2 : number[]
+>[1,2,3] : number[]
+>1 : number
+>2 : number
+>3 : number
+
+=== tests/cases/conformance/externalModules/file4.ts ===
+import file3 = require('./file3');
+>file3 : typeof file3
+
+var t1 = v1;
+>t1 : string
+>v1 : string
+
+var t2 = v2;
+>t2 : number
+>v2 : number
+
+var t3 = file3.v3;
+>t3 : boolean
+>file3.v3 : boolean
+>file3 : typeof file3
+>v3 : boolean
+
+var v4 = {a: true, b: NaN};  // Should shadow global v2 in this module
+>v4 : { a: boolean; b: number; }
+>{a: true, b: NaN} : { a: boolean; b: number; }
+>a : boolean
+>true : boolean
+>b : number
+>NaN : number
+
+=== tests/cases/conformance/externalModules/file5.ts ===
+var x = v2; // Should be global v2 of type number again
+>x : number
+>v2 : number
+
diff --git a/tests/baselines/reference/moduleVisibilityTest1.symbols b/tests/baselines/reference/moduleVisibilityTest1.symbols
index 9879d8a0151..7c939fee5c3 100644
--- a/tests/baselines/reference/moduleVisibilityTest1.symbols
+++ b/tests/baselines/reference/moduleVisibilityTest1.symbols
@@ -59,40 +59,40 @@ module M {
 >I : Symbol(I, Decl(moduleVisibilityTest1.ts, 27, 15))
 
 		someMethod():number;
->someMethod : Symbol(someMethod, Decl(moduleVisibilityTest1.ts, 30, 21))
+>someMethod : Symbol(I.someMethod, Decl(moduleVisibilityTest1.ts, 30, 21))
 	}
 
 	 class B {public b = 0;}
 >B : Symbol(B, Decl(moduleVisibilityTest1.ts, 32, 2))
->b : Symbol(b, Decl(moduleVisibilityTest1.ts, 34, 11))
+>b : Symbol(B.b, Decl(moduleVisibilityTest1.ts, 34, 11))
 
 	 export class C implements I {
 >C : Symbol(C, Decl(moduleVisibilityTest1.ts, 34, 25))
 >I : Symbol(I, Decl(moduleVisibilityTest1.ts, 27, 15))
 
 		public someMethodThatCallsAnOuterMethod() {return OuterInnerAlias.someExportedOuterInnerFunc();}
->someMethodThatCallsAnOuterMethod : Symbol(someMethodThatCallsAnOuterMethod, Decl(moduleVisibilityTest1.ts, 36, 31))
+>someMethodThatCallsAnOuterMethod : Symbol(C.someMethodThatCallsAnOuterMethod, Decl(moduleVisibilityTest1.ts, 36, 31))
 >OuterInnerAlias.someExportedOuterInnerFunc : Symbol(OuterInnerAlias.someExportedOuterInnerFunc, Decl(moduleVisibilityTest1.ts, 5, 30))
 >OuterInnerAlias : Symbol(OuterInnerAlias, Decl(moduleVisibilityTest1.ts, 8, 1))
 >someExportedOuterInnerFunc : Symbol(OuterInnerAlias.someExportedOuterInnerFunc, Decl(moduleVisibilityTest1.ts, 5, 30))
 
 		public someMethodThatCallsAnInnerMethod() {return InnerMod.someExportedInnerFunc();}
->someMethodThatCallsAnInnerMethod : Symbol(someMethodThatCallsAnInnerMethod, Decl(moduleVisibilityTest1.ts, 37, 98))
+>someMethodThatCallsAnInnerMethod : Symbol(C.someMethodThatCallsAnInnerMethod, Decl(moduleVisibilityTest1.ts, 37, 98))
 >InnerMod.someExportedInnerFunc : Symbol(InnerMod.someExportedInnerFunc, Decl(moduleVisibilityTest1.ts, 14, 25))
 >InnerMod : Symbol(InnerMod, Decl(moduleVisibilityTest1.ts, 12, 10))
 >someExportedInnerFunc : Symbol(InnerMod.someExportedInnerFunc, Decl(moduleVisibilityTest1.ts, 14, 25))
 
 		public someMethodThatCallsAnOuterInnerMethod() {return OuterMod.someExportedOuterFunc();}
->someMethodThatCallsAnOuterInnerMethod : Symbol(someMethodThatCallsAnOuterInnerMethod, Decl(moduleVisibilityTest1.ts, 38, 86))
+>someMethodThatCallsAnOuterInnerMethod : Symbol(C.someMethodThatCallsAnOuterInnerMethod, Decl(moduleVisibilityTest1.ts, 38, 86))
 >OuterMod.someExportedOuterFunc : Symbol(OuterMod.someExportedOuterFunc, Decl(moduleVisibilityTest1.ts, 2, 17))
 >OuterMod : Symbol(OuterMod, Decl(moduleVisibilityTest1.ts, 0, 0))
 >someExportedOuterFunc : Symbol(OuterMod.someExportedOuterFunc, Decl(moduleVisibilityTest1.ts, 2, 17))
 
 		public someMethod() { return 0; }
->someMethod : Symbol(someMethod, Decl(moduleVisibilityTest1.ts, 39, 91))
+>someMethod : Symbol(C.someMethod, Decl(moduleVisibilityTest1.ts, 39, 91))
 
 		public someProp = 1;
->someProp : Symbol(someProp, Decl(moduleVisibilityTest1.ts, 40, 35))
+>someProp : Symbol(C.someProp, Decl(moduleVisibilityTest1.ts, 40, 35))
 
 		constructor() {
 		    function someInnerFunc() { return 2; }
diff --git a/tests/baselines/reference/moduleWithStatementsOfEveryKind.symbols b/tests/baselines/reference/moduleWithStatementsOfEveryKind.symbols
index d121e6b5367..48b5f8607be 100644
--- a/tests/baselines/reference/moduleWithStatementsOfEveryKind.symbols
+++ b/tests/baselines/reference/moduleWithStatementsOfEveryKind.symbols
@@ -4,23 +4,23 @@ module A {
 
     class A { s: string }
 >A : Symbol(A, Decl(moduleWithStatementsOfEveryKind.ts, 0, 10))
->s : Symbol(s, Decl(moduleWithStatementsOfEveryKind.ts, 1, 13))
+>s : Symbol(A.s, Decl(moduleWithStatementsOfEveryKind.ts, 1, 13))
 
     class AA<T> { s: T }
 >AA : Symbol(AA, Decl(moduleWithStatementsOfEveryKind.ts, 1, 25))
 >T : Symbol(T, Decl(moduleWithStatementsOfEveryKind.ts, 2, 13))
->s : Symbol(s, Decl(moduleWithStatementsOfEveryKind.ts, 2, 17))
+>s : Symbol(AA.s, Decl(moduleWithStatementsOfEveryKind.ts, 2, 17))
 >T : Symbol(T, Decl(moduleWithStatementsOfEveryKind.ts, 2, 13))
 
     interface I { id: number }
 >I : Symbol(I, Decl(moduleWithStatementsOfEveryKind.ts, 2, 24))
->id : Symbol(id, Decl(moduleWithStatementsOfEveryKind.ts, 3, 17))
+>id : Symbol(I.id, Decl(moduleWithStatementsOfEveryKind.ts, 3, 17))
 
     class B extends AA<string> implements I { id: number }
 >B : Symbol(B, Decl(moduleWithStatementsOfEveryKind.ts, 3, 30))
 >AA : Symbol(AA, Decl(moduleWithStatementsOfEveryKind.ts, 1, 25))
 >I : Symbol(I, Decl(moduleWithStatementsOfEveryKind.ts, 2, 24))
->id : Symbol(id, Decl(moduleWithStatementsOfEveryKind.ts, 5, 45))
+>id : Symbol(B.id, Decl(moduleWithStatementsOfEveryKind.ts, 5, 45))
 
     class BB<T> extends A {
 >BB : Symbol(BB, Decl(moduleWithStatementsOfEveryKind.ts, 5, 58))
@@ -28,7 +28,7 @@ module A {
 >A : Symbol(A, Decl(moduleWithStatementsOfEveryKind.ts, 0, 10))
 
         id: number;
->id : Symbol(id, Decl(moduleWithStatementsOfEveryKind.ts, 6, 27))
+>id : Symbol(BB.id, Decl(moduleWithStatementsOfEveryKind.ts, 6, 27))
     }
 
     module Module {
@@ -36,7 +36,7 @@ module A {
 
         class A { s: string }
 >A : Symbol(A, Decl(moduleWithStatementsOfEveryKind.ts, 10, 19))
->s : Symbol(s, Decl(moduleWithStatementsOfEveryKind.ts, 11, 17))
+>s : Symbol(A.s, Decl(moduleWithStatementsOfEveryKind.ts, 11, 17))
     }
     enum Color { Blue, Red }
 >Color : Symbol(Color, Decl(moduleWithStatementsOfEveryKind.ts, 12, 5))
@@ -82,23 +82,23 @@ module Y {
 
     export class A { s: string }
 >A : Symbol(A, Decl(moduleWithStatementsOfEveryKind.ts, 29, 10))
->s : Symbol(s, Decl(moduleWithStatementsOfEveryKind.ts, 30, 20))
+>s : Symbol(A.s, Decl(moduleWithStatementsOfEveryKind.ts, 30, 20))
 
     export class AA<T> { s: T }
 >AA : Symbol(AA, Decl(moduleWithStatementsOfEveryKind.ts, 30, 32))
 >T : Symbol(T, Decl(moduleWithStatementsOfEveryKind.ts, 31, 20))
->s : Symbol(s, Decl(moduleWithStatementsOfEveryKind.ts, 31, 24))
+>s : Symbol(AA.s, Decl(moduleWithStatementsOfEveryKind.ts, 31, 24))
 >T : Symbol(T, Decl(moduleWithStatementsOfEveryKind.ts, 31, 20))
 
     export interface I { id: number }
 >I : Symbol(I, Decl(moduleWithStatementsOfEveryKind.ts, 31, 31))
->id : Symbol(id, Decl(moduleWithStatementsOfEveryKind.ts, 32, 24))
+>id : Symbol(I.id, Decl(moduleWithStatementsOfEveryKind.ts, 32, 24))
 
     export class B extends AA<string> implements I { id: number }
 >B : Symbol(B, Decl(moduleWithStatementsOfEveryKind.ts, 32, 37))
 >AA : Symbol(AA, Decl(moduleWithStatementsOfEveryKind.ts, 30, 32))
 >I : Symbol(I, Decl(moduleWithStatementsOfEveryKind.ts, 31, 31))
->id : Symbol(id, Decl(moduleWithStatementsOfEveryKind.ts, 34, 52))
+>id : Symbol(B.id, Decl(moduleWithStatementsOfEveryKind.ts, 34, 52))
 
     export class BB<T> extends A {
 >BB : Symbol(BB, Decl(moduleWithStatementsOfEveryKind.ts, 34, 65))
@@ -106,7 +106,7 @@ module Y {
 >A : Symbol(A, Decl(moduleWithStatementsOfEveryKind.ts, 29, 10))
 
         id: number;
->id : Symbol(id, Decl(moduleWithStatementsOfEveryKind.ts, 35, 34))
+>id : Symbol(BB.id, Decl(moduleWithStatementsOfEveryKind.ts, 35, 34))
     }
 
     export module Module {
@@ -114,7 +114,7 @@ module Y {
 
         class A { s: string }
 >A : Symbol(A, Decl(moduleWithStatementsOfEveryKind.ts, 39, 26))
->s : Symbol(s, Decl(moduleWithStatementsOfEveryKind.ts, 40, 17))
+>s : Symbol(A.s, Decl(moduleWithStatementsOfEveryKind.ts, 40, 17))
     }
     export enum Color { Blue, Red }
 >Color : Symbol(Color, Decl(moduleWithStatementsOfEveryKind.ts, 41, 5))
diff --git a/tests/baselines/reference/module_augmentUninstantiatedModule.js b/tests/baselines/reference/module_augmentUninstantiatedModule.js
new file mode 100644
index 00000000000..d3c231fda4e
--- /dev/null
+++ b/tests/baselines/reference/module_augmentUninstantiatedModule.js
@@ -0,0 +1,12 @@
+//// [module_augmentUninstantiatedModule.ts]
+declare module "foo" {
+   namespace M {}
+   var M;
+   export = M;
+}
+
+declare module "bar" {
+    module "foo" {}
+}
+
+//// [module_augmentUninstantiatedModule.js]
diff --git a/tests/baselines/reference/module_augmentUninstantiatedModule.symbols b/tests/baselines/reference/module_augmentUninstantiatedModule.symbols
new file mode 100644
index 00000000000..d405f9549ea
--- /dev/null
+++ b/tests/baselines/reference/module_augmentUninstantiatedModule.symbols
@@ -0,0 +1,15 @@
+=== tests/cases/compiler/module_augmentUninstantiatedModule.ts ===
+declare module "foo" {
+   namespace M {}
+>M : Symbol(, Decl(module_augmentUninstantiatedModule.ts, 0, 22), Decl(module_augmentUninstantiatedModule.ts, 2, 6), Decl(module_augmentUninstantiatedModule.ts, 6, 22))
+
+   var M;
+>M : Symbol(, Decl(module_augmentUninstantiatedModule.ts, 0, 22), Decl(module_augmentUninstantiatedModule.ts, 2, 6), Decl(module_augmentUninstantiatedModule.ts, 6, 22))
+
+   export = M;
+>M : Symbol(M, Decl(module_augmentUninstantiatedModule.ts, 0, 22), Decl(module_augmentUninstantiatedModule.ts, 2, 6))
+}
+
+declare module "bar" {
+    module "foo" {}
+}
diff --git a/tests/baselines/reference/module_augmentUninstantiatedModule.types b/tests/baselines/reference/module_augmentUninstantiatedModule.types
new file mode 100644
index 00000000000..0c27cc3acf9
--- /dev/null
+++ b/tests/baselines/reference/module_augmentUninstantiatedModule.types
@@ -0,0 +1,15 @@
+=== tests/cases/compiler/module_augmentUninstantiatedModule.ts ===
+declare module "foo" {
+   namespace M {}
+>M : any
+
+   var M;
+>M : any
+
+   export = M;
+>M : any
+}
+
+declare module "bar" {
+    module "foo" {}
+}
diff --git a/tests/baselines/reference/module_augmentUninstantiatedModule2.js b/tests/baselines/reference/module_augmentUninstantiatedModule2.js
new file mode 100644
index 00000000000..2e7b4d917db
--- /dev/null
+++ b/tests/baselines/reference/module_augmentUninstantiatedModule2.js
@@ -0,0 +1,6 @@
+//// [module_augmentUninstantiatedModule2.ts]
+declare var ng: ng.IAngularStatic;

declare module ng {
   export interface IModule {
      name: string;
   }

   export interface IAngularStatic {
       module: (s: string) => IModule;
   }
}

export = ng;


+
+//// [module_augmentUninstantiatedModule2.js]
+"use strict";
+module.exports = ng;
diff --git a/tests/baselines/reference/module_augmentUninstantiatedModule2.symbols b/tests/baselines/reference/module_augmentUninstantiatedModule2.symbols
new file mode 100644
index 00000000000..42e27aa9eae
--- /dev/null
+++ b/tests/baselines/reference/module_augmentUninstantiatedModule2.symbols
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/module_augmentUninstantiatedModule2.ts ===
+declare var ng: ng.IAngularStatic;

declare module ng {
   export interface IModule {
      name: string;
   }

   export interface IAngularStatic {
       module: (s: string) => IModule;
   }
}

export = ng;


+>ng : Symbol(ng, Decl(module_augmentUninstantiatedModule2.ts, 0, 11), Decl(module_augmentUninstantiatedModule2.ts, 0, 34))
+>ng : Symbol(ng, Decl(module_augmentUninstantiatedModule2.ts, 0, 11), Decl(module_augmentUninstantiatedModule2.ts, 0, 34))
+>IAngularStatic : Symbol(ng.IAngularStatic, Decl(module_augmentUninstantiatedModule2.ts, 5, 4))
+
diff --git a/tests/baselines/reference/module_augmentUninstantiatedModule2.types b/tests/baselines/reference/module_augmentUninstantiatedModule2.types
new file mode 100644
index 00000000000..2875ace3c1b
--- /dev/null
+++ b/tests/baselines/reference/module_augmentUninstantiatedModule2.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/module_augmentUninstantiatedModule2.ts ===
+declare var ng: ng.IAngularStatic;

declare module ng {
   export interface IModule {
      name: string;
   }

   export interface IAngularStatic {
       module: (s: string) => IModule;
   }
}

export = ng;


+>ng : ng.IAngularStatic
+>ng : any
+>IAngularStatic : ng.IAngularStatic
+
diff --git a/tests/baselines/reference/moduledecl.symbols b/tests/baselines/reference/moduledecl.symbols
index 178c406f8cd..f0b2db9121c 100644
--- a/tests/baselines/reference/moduledecl.symbols
+++ b/tests/baselines/reference/moduledecl.symbols
@@ -65,10 +65,10 @@ module m0 {
 >c1 : Symbol(c1, Decl(moduledecl.ts, 25, 5))
 
         public a : ()=>string;
->a : Symbol(a, Decl(moduledecl.ts, 27, 14))
+>a : Symbol(c1.a, Decl(moduledecl.ts, 27, 14))
 
         private b: ()=>number;
->b : Symbol(b, Decl(moduledecl.ts, 28, 30))
+>b : Symbol(c1.b, Decl(moduledecl.ts, 28, 30))
 
         private static s1;
 >s1 : Symbol(c1.s1, Decl(moduledecl.ts, 29, 30))
@@ -141,10 +141,10 @@ module m1 {
 >c1 : Symbol(c1, Decl(moduledecl.ts, 54, 5))
 
         public a: () =>string;
->a : Symbol(a, Decl(moduledecl.ts, 56, 21))
+>a : Symbol(c1.a, Decl(moduledecl.ts, 56, 21))
 
         private b: () =>number;
->b : Symbol(b, Decl(moduledecl.ts, 57, 30))
+>b : Symbol(c1.b, Decl(moduledecl.ts, 57, 30))
 
         private static s1;
 >s1 : Symbol(c1.s1, Decl(moduledecl.ts, 58, 31))
@@ -153,21 +153,21 @@ module m1 {
 >s2 : Symbol(c1.s2, Decl(moduledecl.ts, 59, 26))
 
         public d() {
->d : Symbol(d, Decl(moduledecl.ts, 60, 25))
+>d : Symbol(c1.d, Decl(moduledecl.ts, 60, 25))
 
             return "Hello";
         }
 
         public e: { x: number; y: string; };
->e : Symbol(e, Decl(moduledecl.ts, 64, 9))
+>e : Symbol(c1.e, Decl(moduledecl.ts, 64, 9))
 >x : Symbol(x, Decl(moduledecl.ts, 66, 19))
 >y : Symbol(y, Decl(moduledecl.ts, 66, 30))
 
         constructor (public n, public n2: number, private n3, private n4: string) {
->n : Symbol(n, Decl(moduledecl.ts, 67, 21))
->n2 : Symbol(n2, Decl(moduledecl.ts, 67, 30))
->n3 : Symbol(n3, Decl(moduledecl.ts, 67, 49))
->n4 : Symbol(n4, Decl(moduledecl.ts, 67, 61))
+>n : Symbol(c1.n, Decl(moduledecl.ts, 67, 21))
+>n2 : Symbol(c1.n2, Decl(moduledecl.ts, 67, 30))
+>n3 : Symbol(c1.n3, Decl(moduledecl.ts, 67, 49))
+>n4 : Symbol(c1.n4, Decl(moduledecl.ts, 67, 61))
         }
     }
 
@@ -312,13 +312,13 @@ module exportTests {
 >C1_public : Symbol(C1_public, Decl(moduledecl.ts, 138, 20))
 
         private f2() {
->f2 : Symbol(f2, Decl(moduledecl.ts, 139, 28))
+>f2 : Symbol(C1_public.f2, Decl(moduledecl.ts, 139, 28))
 
             return 30;
         }
 
         public f3() {
->f3 : Symbol(f3, Decl(moduledecl.ts, 142, 9))
+>f3 : Symbol(C1_public.f3, Decl(moduledecl.ts, 142, 9))
 
             return "string";
         }
@@ -327,13 +327,13 @@ module exportTests {
 >C2_private : Symbol(C2_private, Decl(moduledecl.ts, 147, 5))
 
         private f2() {
->f2 : Symbol(f2, Decl(moduledecl.ts, 148, 22))
+>f2 : Symbol(C2_private.f2, Decl(moduledecl.ts, 148, 22))
 
             return 30;
         }
 
         public f3() {
->f3 : Symbol(f3, Decl(moduledecl.ts, 151, 9))
+>f3 : Symbol(C2_private.f3, Decl(moduledecl.ts, 151, 9))
 
             return "string";
         }
@@ -343,35 +343,35 @@ module exportTests {
 >C3_public : Symbol(C3_public, Decl(moduledecl.ts, 156, 5))
 
         private getC2_private() {
->getC2_private : Symbol(getC2_private, Decl(moduledecl.ts, 158, 28))
+>getC2_private : Symbol(C3_public.getC2_private, Decl(moduledecl.ts, 158, 28))
 
             return new C2_private();
 >C2_private : Symbol(C2_private, Decl(moduledecl.ts, 147, 5))
         }
         private setC2_private(arg: C2_private) {
->setC2_private : Symbol(setC2_private, Decl(moduledecl.ts, 161, 9))
+>setC2_private : Symbol(C3_public.setC2_private, Decl(moduledecl.ts, 161, 9))
 >arg : Symbol(arg, Decl(moduledecl.ts, 162, 30))
 >C2_private : Symbol(C2_private, Decl(moduledecl.ts, 147, 5))
         }
         private get c2() {
->c2 : Symbol(c2, Decl(moduledecl.ts, 163, 9))
+>c2 : Symbol(C3_public.c2, Decl(moduledecl.ts, 163, 9))
 
             return new C2_private();
 >C2_private : Symbol(C2_private, Decl(moduledecl.ts, 147, 5))
         }
         public getC1_public() {
->getC1_public : Symbol(getC1_public, Decl(moduledecl.ts, 166, 9))
+>getC1_public : Symbol(C3_public.getC1_public, Decl(moduledecl.ts, 166, 9))
 
             return new C1_public();
 >C1_public : Symbol(C1_public, Decl(moduledecl.ts, 138, 20))
         }
         public setC1_public(arg: C1_public) {
->setC1_public : Symbol(setC1_public, Decl(moduledecl.ts, 169, 9))
+>setC1_public : Symbol(C3_public.setC1_public, Decl(moduledecl.ts, 169, 9))
 >arg : Symbol(arg, Decl(moduledecl.ts, 170, 28))
 >C1_public : Symbol(C1_public, Decl(moduledecl.ts, 138, 20))
         }
         public get c1() {
->c1 : Symbol(c1, Decl(moduledecl.ts, 171, 9))
+>c1 : Symbol(C3_public.c1, Decl(moduledecl.ts, 171, 9))
 
             return new C1_public();
 >C1_public : Symbol(C1_public, Decl(moduledecl.ts, 138, 20))
@@ -386,7 +386,7 @@ declare module mAmbient {
 >C : Symbol(C, Decl(moduledecl.ts, 178, 25))
 
         public myProp: number;
->myProp : Symbol(myProp, Decl(moduledecl.ts, 179, 13))
+>myProp : Symbol(C.myProp, Decl(moduledecl.ts, 179, 13))
     }
 
     function foo() : C;
@@ -401,10 +401,10 @@ declare module mAmbient {
 >B : Symbol(B, Decl(moduledecl.ts, 184, 16))
 
         x: number;
->x : Symbol(x, Decl(moduledecl.ts, 185, 17))
+>x : Symbol(B.x, Decl(moduledecl.ts, 185, 17))
 
         y: C;
->y : Symbol(y, Decl(moduledecl.ts, 186, 18))
+>y : Symbol(B.y, Decl(moduledecl.ts, 186, 18))
 >C : Symbol(C, Decl(moduledecl.ts, 178, 25))
     }
     enum e {
@@ -427,7 +427,7 @@ declare module mAmbient {
 >C : Symbol(C, Decl(moduledecl.ts, 195, 15))
 
             public myProp: number;
->myProp : Symbol(myProp, Decl(moduledecl.ts, 196, 17))
+>myProp : Symbol(C.myProp, Decl(moduledecl.ts, 196, 17))
         }
 
         function foo(): C;
@@ -442,10 +442,10 @@ declare module mAmbient {
 >B : Symbol(B, Decl(moduledecl.ts, 201, 20))
 
             x: number;
->x : Symbol(x, Decl(moduledecl.ts, 202, 21))
+>x : Symbol(B.x, Decl(moduledecl.ts, 202, 21))
 
             y: C;
->y : Symbol(y, Decl(moduledecl.ts, 203, 22))
+>y : Symbol(B.y, Decl(moduledecl.ts, 203, 22))
 >C : Symbol(C, Decl(moduledecl.ts, 195, 15))
         }
         enum e {
diff --git a/tests/baselines/reference/multiExtendsSplitInterfaces2.symbols b/tests/baselines/reference/multiExtendsSplitInterfaces2.symbols
index c9f390f1621..0572d2df333 100644
--- a/tests/baselines/reference/multiExtendsSplitInterfaces2.symbols
+++ b/tests/baselines/reference/multiExtendsSplitInterfaces2.symbols
@@ -3,7 +3,7 @@ interface A {
 >A : Symbol(A, Decl(multiExtendsSplitInterfaces2.ts, 0, 0))
 
 	a: number;
->a : Symbol(a, Decl(multiExtendsSplitInterfaces2.ts, 0, 13))
+>a : Symbol(A.a, Decl(multiExtendsSplitInterfaces2.ts, 0, 13))
 }
 
 interface I extends A {
@@ -11,14 +11,14 @@ interface I extends A {
 >A : Symbol(A, Decl(multiExtendsSplitInterfaces2.ts, 0, 0))
 
 	i1: number;
->i1 : Symbol(i1, Decl(multiExtendsSplitInterfaces2.ts, 4, 23))
+>i1 : Symbol(I.i1, Decl(multiExtendsSplitInterfaces2.ts, 4, 23))
 }
 
 interface B {
 >B : Symbol(B, Decl(multiExtendsSplitInterfaces2.ts, 6, 1))
 
 	b: number;
->b : Symbol(b, Decl(multiExtendsSplitInterfaces2.ts, 8, 13))
+>b : Symbol(B.b, Decl(multiExtendsSplitInterfaces2.ts, 8, 13))
 }
 
 interface I extends B {
@@ -26,7 +26,7 @@ interface I extends B {
 >B : Symbol(B, Decl(multiExtendsSplitInterfaces2.ts, 6, 1))
 
 	i2: number;
->i2 : Symbol(i2, Decl(multiExtendsSplitInterfaces2.ts, 12, 23))
+>i2 : Symbol(I.i2, Decl(multiExtendsSplitInterfaces2.ts, 12, 23))
 }
 
 var i: I;
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/multiImportExport.symbols b/tests/baselines/reference/multiImportExport.symbols
index 45b59752b2a..e4bac0d7662 100644
--- a/tests/baselines/reference/multiImportExport.symbols
+++ b/tests/baselines/reference/multiImportExport.symbols
@@ -35,7 +35,7 @@ class Adder {
 >Adder : Symbol(Adder, Decl(Adder.ts, 0, 0))
 
     add(a: number, b: number) {
->add : Symbol(add, Decl(Adder.ts, 0, 13))
+>add : Symbol(Adder.add, Decl(Adder.ts, 0, 13))
 >a : Symbol(a, Decl(Adder.ts, 1, 8))
 >b : Symbol(b, Decl(Adder.ts, 1, 18))
         
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/multiModuleClodule1.symbols b/tests/baselines/reference/multiModuleClodule1.symbols
index 8f83e58ed26..7fdbd064e3d 100644
--- a/tests/baselines/reference/multiModuleClodule1.symbols
+++ b/tests/baselines/reference/multiModuleClodule1.symbols
@@ -6,10 +6,10 @@ class C {
 >x : Symbol(x, Decl(multiModuleClodule1.ts, 1, 16))
 
     foo() { }
->foo : Symbol(foo, Decl(multiModuleClodule1.ts, 1, 30))
+>foo : Symbol(C.foo, Decl(multiModuleClodule1.ts, 1, 30))
 
     bar() { }
->bar : Symbol(bar, Decl(multiModuleClodule1.ts, 2, 13))
+>bar : Symbol(C.bar, Decl(multiModuleClodule1.ts, 2, 13))
 
     static boo() { }
 >boo : Symbol(C.boo, Decl(multiModuleClodule1.ts, 3, 13))
diff --git a/tests/baselines/reference/multipleNumericIndexers.errors.txt b/tests/baselines/reference/multipleNumericIndexers.errors.txt
index 856fdbe47ff..82fc444ac65 100644
--- a/tests/baselines/reference/multipleNumericIndexers.errors.txt
+++ b/tests/baselines/reference/multipleNumericIndexers.errors.txt
@@ -3,7 +3,7 @@ tests/cases/conformance/types/objectTypeLiteral/indexSignatures/multipleNumericI
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/multipleNumericIndexers.ts(15,5): error TS2375: Duplicate number index signature.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/multipleNumericIndexers.ts(20,5): error TS2375: Duplicate number index signature.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/multipleNumericIndexers.ts(25,5): error TS2375: Duplicate number index signature.
-tests/cases/conformance/types/objectTypeLiteral/indexSignatures/multipleNumericIndexers.ts(28,11): error TS2428: All declarations of an interface must have identical type parameters.
+tests/cases/conformance/types/objectTypeLiteral/indexSignatures/multipleNumericIndexers.ts(28,11): error TS2428: All declarations of 'I' must have identical type parameters.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/multipleNumericIndexers.ts(29,5): error TS2375: Duplicate number index signature.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/multipleNumericIndexers.ts(30,5): error TS2375: Duplicate number index signature.
 
@@ -48,7 +48,7 @@ tests/cases/conformance/types/objectTypeLiteral/indexSignatures/multipleNumericI
     
     interface I<T> {
               ~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'I' must have identical type parameters.
         [x: number]: string;
         ~~~~~~~~~~~~~~~~~~~~
 !!! error TS2375: Duplicate number index signature.
diff --git a/tests/baselines/reference/mutrec.symbols b/tests/baselines/reference/mutrec.symbols
index 2a24cc4c65e..c4bf8753373 100644
--- a/tests/baselines/reference/mutrec.symbols
+++ b/tests/baselines/reference/mutrec.symbols
@@ -3,7 +3,7 @@ interface A {
 >A : Symbol(A, Decl(mutrec.ts, 0, 0))
 
     x:B[];
->x : Symbol(x, Decl(mutrec.ts, 0, 13))
+>x : Symbol(A.x, Decl(mutrec.ts, 0, 13))
 >B : Symbol(B, Decl(mutrec.ts, 2, 1))
 }
 
@@ -11,7 +11,7 @@ interface B {
 >B : Symbol(B, Decl(mutrec.ts, 2, 1))
 
     x:A[];
->x : Symbol(x, Decl(mutrec.ts, 4, 13))
+>x : Symbol(B.x, Decl(mutrec.ts, 4, 13))
 >A : Symbol(A, Decl(mutrec.ts, 0, 0))
 }
 
@@ -33,7 +33,7 @@ interface I1 {
 >I1 : Symbol(I1, Decl(mutrec.ts, 10, 5))
 
     y:I2;
->y : Symbol(y, Decl(mutrec.ts, 12, 14))
+>y : Symbol(I1.y, Decl(mutrec.ts, 12, 14))
 >I2 : Symbol(I2, Decl(mutrec.ts, 14, 1))
 }
 
@@ -41,7 +41,7 @@ interface I2 {
 >I2 : Symbol(I2, Decl(mutrec.ts, 14, 1))
 
     y:I3;
->y : Symbol(y, Decl(mutrec.ts, 16, 14))
+>y : Symbol(I2.y, Decl(mutrec.ts, 16, 14))
 >I3 : Symbol(I3, Decl(mutrec.ts, 18, 1))
 }
 
@@ -49,7 +49,7 @@ interface I3 {
 >I3 : Symbol(I3, Decl(mutrec.ts, 18, 1))
 
     y:I1;
->y : Symbol(y, Decl(mutrec.ts, 20, 14))
+>y : Symbol(I3.y, Decl(mutrec.ts, 20, 14))
 >I1 : Symbol(I1, Decl(mutrec.ts, 10, 5))
 }
 
@@ -79,7 +79,7 @@ interface I4 {
 >I4 : Symbol(I4, Decl(mutrec.ts, 28, 6))
 
     y:I5;
->y : Symbol(y, Decl(mutrec.ts, 30, 14))
+>y : Symbol(I4.y, Decl(mutrec.ts, 30, 14))
 >I5 : Symbol(I5, Decl(mutrec.ts, 32, 1))
 }
 
@@ -87,7 +87,7 @@ interface I5 {
 >I5 : Symbol(I5, Decl(mutrec.ts, 32, 1))
 
     y:I4;
->y : Symbol(y, Decl(mutrec.ts, 34, 14))
+>y : Symbol(I5.y, Decl(mutrec.ts, 34, 14))
 >I4 : Symbol(I4, Decl(mutrec.ts, 28, 6))
 }
 
diff --git a/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes1.symbols b/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes1.symbols
index 67871a590cb..6d42a8c83f9 100644
--- a/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes1.symbols
+++ b/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes1.symbols
@@ -4,15 +4,15 @@ interface A<T> {
 >T : Symbol(T, Decl(mutuallyRecursiveGenericBaseTypes1.ts, 0, 12))
 
     foo(): B<T>; // instead of B does see this
->foo : Symbol(foo, Decl(mutuallyRecursiveGenericBaseTypes1.ts, 0, 16), Decl(mutuallyRecursiveGenericBaseTypes1.ts, 1, 16))
+>foo : Symbol(A.foo, Decl(mutuallyRecursiveGenericBaseTypes1.ts, 0, 16), Decl(mutuallyRecursiveGenericBaseTypes1.ts, 1, 16))
 >B : Symbol(B, Decl(mutuallyRecursiveGenericBaseTypes1.ts, 5, 1))
 >T : Symbol(T, Decl(mutuallyRecursiveGenericBaseTypes1.ts, 0, 12))
 
     foo(): void; // instead of B does see this
->foo : Symbol(foo, Decl(mutuallyRecursiveGenericBaseTypes1.ts, 0, 16), Decl(mutuallyRecursiveGenericBaseTypes1.ts, 1, 16))
+>foo : Symbol(A.foo, Decl(mutuallyRecursiveGenericBaseTypes1.ts, 0, 16), Decl(mutuallyRecursiveGenericBaseTypes1.ts, 1, 16))
  
     foo2(): B<number>;
->foo2 : Symbol(foo2, Decl(mutuallyRecursiveGenericBaseTypes1.ts, 2, 16))
+>foo2 : Symbol(A.foo2, Decl(mutuallyRecursiveGenericBaseTypes1.ts, 2, 16))
 >B : Symbol(B, Decl(mutuallyRecursiveGenericBaseTypes1.ts, 5, 1))
 }
  
@@ -23,7 +23,7 @@ interface B<T> extends A<T> {
 >T : Symbol(T, Decl(mutuallyRecursiveGenericBaseTypes1.ts, 7, 12))
 
     bar(): void;
->bar : Symbol(bar, Decl(mutuallyRecursiveGenericBaseTypes1.ts, 7, 29))
+>bar : Symbol(B.bar, Decl(mutuallyRecursiveGenericBaseTypes1.ts, 7, 29))
 }
  
 var b: B<number>;
diff --git a/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.symbols b/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.symbols
index d66f6a0c66f..11d5535a6a7 100644
--- a/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.symbols
+++ b/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.symbols
@@ -4,7 +4,7 @@ class foo<T>
 >T : Symbol(T, Decl(mutuallyRecursiveGenericBaseTypes2.ts, 0, 10))
 {
     bar(): foo2<T[]> { return null; }
->bar : Symbol(bar, Decl(mutuallyRecursiveGenericBaseTypes2.ts, 1, 1))
+>bar : Symbol(foo.bar, Decl(mutuallyRecursiveGenericBaseTypes2.ts, 1, 1))
 >foo2 : Symbol(foo2, Decl(mutuallyRecursiveGenericBaseTypes2.ts, 3, 1))
 >T : Symbol(T, Decl(mutuallyRecursiveGenericBaseTypes2.ts, 0, 10))
 }
diff --git a/tests/baselines/reference/nameCollision.symbols b/tests/baselines/reference/nameCollision.symbols
index 064726e21fa..bd14bc6a95f 100644
--- a/tests/baselines/reference/nameCollision.symbols
+++ b/tests/baselines/reference/nameCollision.symbols
@@ -27,7 +27,7 @@ module B {
 >B : Symbol(B, Decl(nameCollision.ts, 11, 10))
 
         name: string;
->name : Symbol(name, Decl(nameCollision.ts, 14, 13))
+>name : Symbol(B.name, Decl(nameCollision.ts, 14, 13))
     }
 }
 
@@ -80,7 +80,7 @@ module D {
 >D : Symbol(D, Decl(nameCollision.ts, 39, 10))
 
         id: number;
->id : Symbol(id, Decl(nameCollision.ts, 40, 24))
+>id : Symbol(D.id, Decl(nameCollision.ts, 40, 24))
     }
 
     export var E = 'hello';
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 2d487ede245..b76a9edadc2 100644
--- a/tests/baselines/reference/nameWithFileExtension.js
+++ b/tests/baselines/reference/nameWithFileExtension.js
@@ -10,5 +10,5 @@ var x = foo.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/namedFunctionExpressionAssignedToClassProperty.symbols b/tests/baselines/reference/namedFunctionExpressionAssignedToClassProperty.symbols
index 707bc64571f..d75eb3c5303 100644
--- a/tests/baselines/reference/namedFunctionExpressionAssignedToClassProperty.symbols
+++ b/tests/baselines/reference/namedFunctionExpressionAssignedToClassProperty.symbols
@@ -3,7 +3,7 @@ class Foo{
 >Foo : Symbol(Foo, Decl(namedFunctionExpressionAssignedToClassProperty.ts, 0, 0))
 
        a = function bar(){
->a : Symbol(a, Decl(namedFunctionExpressionAssignedToClassProperty.ts, 0, 10))
+>a : Symbol(Foo.a, Decl(namedFunctionExpressionAssignedToClassProperty.ts, 0, 10))
 >bar : Symbol(bar, Decl(namedFunctionExpressionAssignedToClassProperty.ts, 2, 10))
 
        }; // this shouldn't crash the compiler...
diff --git a/tests/baselines/reference/narrowTypeByInstanceof.symbols b/tests/baselines/reference/narrowTypeByInstanceof.symbols
index 3e620fd105c..994327ab21c 100644
--- a/tests/baselines/reference/narrowTypeByInstanceof.symbols
+++ b/tests/baselines/reference/narrowTypeByInstanceof.symbols
@@ -3,7 +3,7 @@
 >Match : Symbol(Match, Decl(narrowTypeByInstanceof.ts, 0, 0))
 
         public range(): any {
->range : Symbol(range, Decl(narrowTypeByInstanceof.ts, 0, 17))
+>range : Symbol(Match.range, Decl(narrowTypeByInstanceof.ts, 0, 17))
 
             return undefined;
 >undefined : Symbol(undefined)
@@ -14,7 +14,7 @@
 >FileMatch : Symbol(FileMatch, Decl(narrowTypeByInstanceof.ts, 4, 5))
 
         public resource(): any {
->resource : Symbol(resource, Decl(narrowTypeByInstanceof.ts, 6, 21))
+>resource : Symbol(FileMatch.resource, Decl(narrowTypeByInstanceof.ts, 6, 21))
 
             return undefined;
 >undefined : Symbol(undefined)
diff --git a/tests/baselines/reference/negateOperatorWithAnyOtherType.symbols b/tests/baselines/reference/negateOperatorWithAnyOtherType.symbols
index 891fc363dbd..8c45ccfbc19 100644
--- a/tests/baselines/reference/negateOperatorWithAnyOtherType.symbols
+++ b/tests/baselines/reference/negateOperatorWithAnyOtherType.symbols
@@ -31,7 +31,7 @@ class A {
 >A : Symbol(A, Decl(negateOperatorWithAnyOtherType.ts, 11, 1))
 
     public a: any;
->a : Symbol(a, Decl(negateOperatorWithAnyOtherType.ts, 12, 9))
+>a : Symbol(A.a, Decl(negateOperatorWithAnyOtherType.ts, 12, 9))
 
     static foo() {
 >foo : Symbol(A.foo, Decl(negateOperatorWithAnyOtherType.ts, 13, 18))
diff --git a/tests/baselines/reference/negateOperatorWithBooleanType.symbols b/tests/baselines/reference/negateOperatorWithBooleanType.symbols
index 55b35026b97..a7568eeafe7 100644
--- a/tests/baselines/reference/negateOperatorWithBooleanType.symbols
+++ b/tests/baselines/reference/negateOperatorWithBooleanType.symbols
@@ -10,7 +10,7 @@ class A {
 >A : Symbol(A, Decl(negateOperatorWithBooleanType.ts, 3, 40))
 
     public a: boolean;
->a : Symbol(a, Decl(negateOperatorWithBooleanType.ts, 5, 9))
+>a : Symbol(A.a, Decl(negateOperatorWithBooleanType.ts, 5, 9))
 
     static foo() { return false; }
 >foo : Symbol(A.foo, Decl(negateOperatorWithBooleanType.ts, 6, 22))
diff --git a/tests/baselines/reference/negateOperatorWithNumberType.symbols b/tests/baselines/reference/negateOperatorWithNumberType.symbols
index 1f75d922b09..cf042284898 100644
--- a/tests/baselines/reference/negateOperatorWithNumberType.symbols
+++ b/tests/baselines/reference/negateOperatorWithNumberType.symbols
@@ -13,7 +13,7 @@ class A {
 >A : Symbol(A, Decl(negateOperatorWithNumberType.ts, 4, 36))
 
     public a: number;
->a : Symbol(a, Decl(negateOperatorWithNumberType.ts, 6, 9))
+>a : Symbol(A.a, Decl(negateOperatorWithNumberType.ts, 6, 9))
 
     static foo() { return 1; }
 >foo : Symbol(A.foo, Decl(negateOperatorWithNumberType.ts, 7, 21))
diff --git a/tests/baselines/reference/negateOperatorWithStringType.symbols b/tests/baselines/reference/negateOperatorWithStringType.symbols
index 5ef0afc7e1c..497e3c7cb00 100644
--- a/tests/baselines/reference/negateOperatorWithStringType.symbols
+++ b/tests/baselines/reference/negateOperatorWithStringType.symbols
@@ -13,7 +13,7 @@ class A {
 >A : Symbol(A, Decl(negateOperatorWithStringType.ts, 4, 40))
 
     public a: string;
->a : Symbol(a, Decl(negateOperatorWithStringType.ts, 6, 9))
+>a : Symbol(A.a, Decl(negateOperatorWithStringType.ts, 6, 9))
 
     static foo() { return ""; }
 >foo : Symbol(A.foo, Decl(negateOperatorWithStringType.ts, 7, 21))
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 97fba2da301..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,12 +120,15 @@ function a3() {
     }
 }
 function a4() {
-    var _loop_5 = function(x) {
+    var _loop_5 = function (x) {
         x = x + 1;
         (function () { return x; });
+        out_x_1 = x;
     };
+    var out_x_1;
     for (var x = void 0; x < 1;) {
         _loop_5(x);
+        x = out_x_1;
     }
     switch (1) {
         case 1:
@@ -134,12 +137,15 @@ function a4() {
     }
 }
 function a5() {
-    var _loop_6 = function(x) {
+    var _loop_6 = function (x) {
         x = x + 1;
         (function () { return x; });
+        out_x_2 = x;
     };
+    var out_x_2;
     for (var x = void 0; x < 1;) {
         _loop_6(x);
+        x = out_x_2;
     }
     switch (1) {
         case 1:
diff --git a/tests/baselines/reference/nestedBlockScopedBindings4.js b/tests/baselines/reference/nestedBlockScopedBindings4.js
index 51cddcf676d..0a73cc11148 100644
--- a/tests/baselines/reference/nestedBlockScopedBindings4.js
+++ b/tests/baselines/reference/nestedBlockScopedBindings4.js
@@ -50,12 +50,15 @@ function a0() {
     }
 }
 function a1() {
-    var _loop_1 = function(x) {
+    var _loop_1 = function (x) {
         x = x + 1;
         (function () { return x; });
+        out_x_1 = x;
     };
+    var out_x_1;
     for (var x = void 0; x < 1;) {
         _loop_1(x);
+        x = out_x_1;
     }
     for (var x = void 0;;) {
         x = x + 2;
@@ -65,27 +68,36 @@ 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;
     };
+    var out_x_2;
     for (var x = void 0;;) {
         _loop_2(x);
+        x = out_x_2;
     }
 }
 function a3() {
-    var _loop_3 = function(x) {
+    var _loop_3 = function (x) {
         x = x + 1;
         (function () { return x; });
+        out_x_3 = x;
     };
+    var out_x_3;
     for (var x = void 0; x < 1;) {
         _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;
     };
+    var out_x_4;
     for (var x = void 0;;) {
         _loop_4(x);
+        x = out_x_4;
     }
 }
diff --git a/tests/baselines/reference/nestedBlockScopedBindings5.js b/tests/baselines/reference/nestedBlockScopedBindings5.js
index c80c72c0ed6..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,28 +105,34 @@ 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;
     };
+    var out_x_1;
     for (var x = void 0;;) {
         _loop_2(x);
+        x = out_x_1;
     }
 }
 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;
     };
+    var out_x_2;
     for (var x = void 0; false;) {
         _loop_4(x);
+        x = out_x_2;
     }
     switch (1) {
         case 1:
@@ -154,12 +160,15 @@ 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;
     };
+    var out_x_3;
     for (var x = void 0; false;) {
         _loop_5(x);
+        x = out_x_3;
     }
     switch (1) {
         case 1:
diff --git a/tests/baselines/reference/nestedBlockScopedBindings6.js b/tests/baselines/reference/nestedBlockScopedBindings6.js
index 78207b98fcd..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,16 +116,19 @@ 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;
     };
+    var out_x_1;
     for (var x = void 0;;) {
         _loop_2(x);
+        x = out_x_1;
     }
 }
 function a3() {
-    var _loop_3 = function(x) {
+    var _loop_3 = function (x) {
         x = x + 1;
         (function () { return x; });
     };
@@ -133,16 +136,19 @@ 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;
     };
+    var out_x_2;
     for (var x = void 0;;) {
         _loop_4(x);
+        x = out_x_2;
     }
 }
 function a4() {
-    var _loop_5 = function(x) {
+    var _loop_5 = function (x) {
         x = x + 1;
         (function () { return x; });
     };
@@ -180,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/nestedGenerics.symbols b/tests/baselines/reference/nestedGenerics.symbols
index 24b3e1eb89d..87ba74a503a 100644
--- a/tests/baselines/reference/nestedGenerics.symbols
+++ b/tests/baselines/reference/nestedGenerics.symbols
@@ -4,7 +4,7 @@ interface Foo<T> {
 >T : Symbol(T, Decl(nestedGenerics.ts, 0, 14))
 
 	t: T;
->t : Symbol(t, Decl(nestedGenerics.ts, 0, 18))
+>t : Symbol(Foo.t, Decl(nestedGenerics.ts, 0, 18))
 >T : Symbol(T, Decl(nestedGenerics.ts, 0, 14))
 }
 
diff --git a/tests/baselines/reference/nestedInfinitelyExpandedRecursiveTypes.symbols b/tests/baselines/reference/nestedInfinitelyExpandedRecursiveTypes.symbols
index 28206f8dec2..d9fec01208e 100644
--- a/tests/baselines/reference/nestedInfinitelyExpandedRecursiveTypes.symbols
+++ b/tests/baselines/reference/nestedInfinitelyExpandedRecursiveTypes.symbols
@@ -4,7 +4,7 @@ interface F<T> {
 >T : Symbol(T, Decl(nestedInfinitelyExpandedRecursiveTypes.ts, 0, 12))
 
       t: G<F<() => T>>;
->t : Symbol(t, Decl(nestedInfinitelyExpandedRecursiveTypes.ts, 0, 16))
+>t : Symbol(F.t, Decl(nestedInfinitelyExpandedRecursiveTypes.ts, 0, 16))
 >G : Symbol(G, Decl(nestedInfinitelyExpandedRecursiveTypes.ts, 2, 1))
 >F : Symbol(F, Decl(nestedInfinitelyExpandedRecursiveTypes.ts, 0, 0))
 >T : Symbol(T, Decl(nestedInfinitelyExpandedRecursiveTypes.ts, 0, 12))
@@ -14,7 +14,7 @@ interface G<U> {
 >U : Symbol(U, Decl(nestedInfinitelyExpandedRecursiveTypes.ts, 3, 12))
 
       t: G<G<() => U>>;
->t : Symbol(t, Decl(nestedInfinitelyExpandedRecursiveTypes.ts, 3, 16))
+>t : Symbol(G.t, Decl(nestedInfinitelyExpandedRecursiveTypes.ts, 3, 16))
 >G : Symbol(G, Decl(nestedInfinitelyExpandedRecursiveTypes.ts, 2, 1))
 >G : Symbol(G, Decl(nestedInfinitelyExpandedRecursiveTypes.ts, 2, 1))
 >U : Symbol(U, Decl(nestedInfinitelyExpandedRecursiveTypes.ts, 3, 12))
diff --git a/tests/baselines/reference/nestedModules.symbols b/tests/baselines/reference/nestedModules.symbols
index 7ff4efd30f6..642d181f2c5 100644
--- a/tests/baselines/reference/nestedModules.symbols
+++ b/tests/baselines/reference/nestedModules.symbols
@@ -8,10 +8,10 @@ module A.B.C {
 >Point : Symbol(Point, Decl(nestedModules.ts, 0, 14))
 
         x: number;
->x : Symbol(x, Decl(nestedModules.ts, 1, 28))
+>x : Symbol(Point.x, Decl(nestedModules.ts, 1, 28))
 
         y: number;
->y : Symbol(y, Decl(nestedModules.ts, 2, 18))
+>y : Symbol(Point.y, Decl(nestedModules.ts, 2, 18))
     }
 }
 
@@ -38,8 +38,8 @@ module M2.X {
 >Point : Symbol(Point, Decl(nestedModules.ts, 13, 13), Decl(nestedModules.ts, 21, 18))
 
         x: number; y: number;
->x : Symbol(x, Decl(nestedModules.ts, 14, 28))
->y : Symbol(y, Decl(nestedModules.ts, 15, 18))
+>x : Symbol(Point.x, Decl(nestedModules.ts, 14, 28))
+>y : Symbol(Point.y, Decl(nestedModules.ts, 15, 18))
     }
 }
 
diff --git a/tests/baselines/reference/nestedSelf.symbols b/tests/baselines/reference/nestedSelf.symbols
index a14a9b9d374..50bdd9981e2 100644
--- a/tests/baselines/reference/nestedSelf.symbols
+++ b/tests/baselines/reference/nestedSelf.symbols
@@ -6,16 +6,16 @@ module M {
 >C : Symbol(C, Decl(nestedSelf.ts, 0, 10))
 
    public n = 42;
->n : Symbol(n, Decl(nestedSelf.ts, 1, 17))
+>n : Symbol(C.n, Decl(nestedSelf.ts, 1, 17))
 
    public foo() { [1,2,3].map((x) => { return this.n * x; })}
->foo : Symbol(foo, Decl(nestedSelf.ts, 2, 17))
+>foo : Symbol(C.foo, Decl(nestedSelf.ts, 2, 17))
 >[1,2,3].map : Symbol(Array.map, Decl(lib.d.ts, --, --))
 >map : Symbol(Array.map, Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(nestedSelf.ts, 3, 31))
->this.n : Symbol(n, Decl(nestedSelf.ts, 1, 17))
+>this.n : Symbol(C.n, Decl(nestedSelf.ts, 1, 17))
 >this : Symbol(C, Decl(nestedSelf.ts, 0, 10))
->n : Symbol(n, Decl(nestedSelf.ts, 1, 17))
+>n : Symbol(C.n, Decl(nestedSelf.ts, 1, 17))
 >x : Symbol(x, Decl(nestedSelf.ts, 3, 31))
  }
 }
diff --git a/tests/baselines/reference/newArrays.symbols b/tests/baselines/reference/newArrays.symbols
index 663b6380bc7..4a312365b3f 100644
--- a/tests/baselines/reference/newArrays.symbols
+++ b/tests/baselines/reference/newArrays.symbols
@@ -9,30 +9,30 @@ module M {
 >Gar : Symbol(Gar, Decl(newArrays.ts, 1, 13))
 
 		public fa: Foo[];
->fa : Symbol(fa, Decl(newArrays.ts, 2, 12))
+>fa : Symbol(Gar.fa, Decl(newArrays.ts, 2, 12))
 >Foo : Symbol(Foo, Decl(newArrays.ts, 0, 10))
 
 		public x = 10;
->x : Symbol(x, Decl(newArrays.ts, 3, 19))
+>x : Symbol(Gar.x, Decl(newArrays.ts, 3, 19))
 
 		public y = 10;
->y : Symbol(y, Decl(newArrays.ts, 4, 16))
+>y : Symbol(Gar.y, Decl(newArrays.ts, 4, 16))
 
 		public m () {
->m : Symbol(m, Decl(newArrays.ts, 5, 16))
+>m : Symbol(Gar.m, Decl(newArrays.ts, 5, 16))
 
 			this.fa = new Array<Foo>(this.x * this.y);		
->this.fa : Symbol(fa, Decl(newArrays.ts, 2, 12))
+>this.fa : Symbol(Gar.fa, Decl(newArrays.ts, 2, 12))
 >this : Symbol(Gar, Decl(newArrays.ts, 1, 13))
->fa : Symbol(fa, Decl(newArrays.ts, 2, 12))
+>fa : Symbol(Gar.fa, Decl(newArrays.ts, 2, 12))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Foo : Symbol(Foo, Decl(newArrays.ts, 0, 10))
->this.x : Symbol(x, Decl(newArrays.ts, 3, 19))
+>this.x : Symbol(Gar.x, Decl(newArrays.ts, 3, 19))
 >this : Symbol(Gar, Decl(newArrays.ts, 1, 13))
->x : Symbol(x, Decl(newArrays.ts, 3, 19))
->this.y : Symbol(y, Decl(newArrays.ts, 4, 16))
+>x : Symbol(Gar.x, Decl(newArrays.ts, 3, 19))
+>this.y : Symbol(Gar.y, Decl(newArrays.ts, 4, 16))
 >this : Symbol(Gar, Decl(newArrays.ts, 1, 13))
->y : Symbol(y, Decl(newArrays.ts, 4, 16))
+>y : Symbol(Gar.y, Decl(newArrays.ts, 4, 16))
 		}
 	}
 }
diff --git a/tests/baselines/reference/newNamesInGlobalAugmentations1.js b/tests/baselines/reference/newNamesInGlobalAugmentations1.js
new file mode 100644
index 00000000000..0400f4c3751
--- /dev/null
+++ b/tests/baselines/reference/newNamesInGlobalAugmentations1.js
@@ -0,0 +1,28 @@
+//// [tests/cases/compiler/newNamesInGlobalAugmentations1.ts] ////
+
+//// [f1.d.ts]
+
+export {};
+
+declare module M.M1 {
+    export let x: number;
+}
+declare global {
+    interface SymbolConstructor {
+        observable: symbol;
+    }
+    class Cls {x}
+    let [a, b]: number[];
+    export import X = M.M1.x;
+}
+
+//// [main.ts]
+
+Symbol.observable;
+new Cls().x
+let c = a + b + X;
+
+//// [main.js]
+Symbol.observable;
+new Cls().x;
+let c = a + b + X;
diff --git a/tests/baselines/reference/newNamesInGlobalAugmentations1.symbols b/tests/baselines/reference/newNamesInGlobalAugmentations1.symbols
new file mode 100644
index 00000000000..6215132dd00
--- /dev/null
+++ b/tests/baselines/reference/newNamesInGlobalAugmentations1.symbols
@@ -0,0 +1,53 @@
+=== tests/cases/compiler/f1.d.ts ===
+
+export {};
+
+declare module M.M1 {
+>M : Symbol(M, Decl(f1.d.ts, 1, 10))
+>M1 : Symbol(M1, Decl(f1.d.ts, 3, 17))
+
+    export let x: number;
+>x : Symbol(x, Decl(f1.d.ts, 4, 14))
+}
+declare global {
+>global : Symbol(, Decl(f1.d.ts, 5, 1))
+
+    interface SymbolConstructor {
+>SymbolConstructor : Symbol(SymbolConstructor, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(f1.d.ts, 6, 16))
+
+        observable: symbol;
+>observable : Symbol(SymbolConstructor.observable, Decl(f1.d.ts, 7, 33))
+    }
+    class Cls {x}
+>Cls : Symbol(Cls, Decl(f1.d.ts, 9, 5))
+>x : Symbol(Cls.x, Decl(f1.d.ts, 10, 15))
+
+    let [a, b]: number[];
+>a : Symbol(a, Decl(f1.d.ts, 11, 9))
+>b : Symbol(b, Decl(f1.d.ts, 11, 11))
+
+    export import X = M.M1.x;
+>X : Symbol(X, Decl(f1.d.ts, 11, 25))
+>M : Symbol(M, Decl(f1.d.ts, 1, 10))
+>M1 : Symbol(M.M1, Decl(f1.d.ts, 3, 17))
+>x : Symbol(X, Decl(f1.d.ts, 4, 14))
+}
+
+=== tests/cases/compiler/main.ts ===
+
+Symbol.observable;
+>Symbol.observable : Symbol(SymbolConstructor.observable, Decl(f1.d.ts, 7, 33))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>observable : Symbol(SymbolConstructor.observable, Decl(f1.d.ts, 7, 33))
+
+new Cls().x
+>new Cls().x : Symbol(Cls.x, Decl(f1.d.ts, 10, 15))
+>Cls : Symbol(Cls, Decl(f1.d.ts, 9, 5))
+>x : Symbol(Cls.x, Decl(f1.d.ts, 10, 15))
+
+let c = a + b + X;
+>c : Symbol(c, Decl(main.ts, 3, 3))
+>a : Symbol(a, Decl(f1.d.ts, 11, 9))
+>b : Symbol(b, Decl(f1.d.ts, 11, 11))
+>X : Symbol(X, Decl(f1.d.ts, 11, 25))
+
diff --git a/tests/baselines/reference/newNamesInGlobalAugmentations1.types b/tests/baselines/reference/newNamesInGlobalAugmentations1.types
new file mode 100644
index 00000000000..a9b879fb4c5
--- /dev/null
+++ b/tests/baselines/reference/newNamesInGlobalAugmentations1.types
@@ -0,0 +1,56 @@
+=== tests/cases/compiler/f1.d.ts ===
+
+export {};
+
+declare module M.M1 {
+>M : typeof M
+>M1 : typeof M1
+
+    export let x: number;
+>x : number
+}
+declare global {
+>global : any
+
+    interface SymbolConstructor {
+>SymbolConstructor : SymbolConstructor
+
+        observable: symbol;
+>observable : symbol
+    }
+    class Cls {x}
+>Cls : Cls
+>x : any
+
+    let [a, b]: number[];
+>a : number
+>b : number
+
+    export import X = M.M1.x;
+>X : number
+>M : typeof M
+>M1 : typeof M.M1
+>x : number
+}
+
+=== tests/cases/compiler/main.ts ===
+
+Symbol.observable;
+>Symbol.observable : symbol
+>Symbol : SymbolConstructor
+>observable : symbol
+
+new Cls().x
+>new Cls().x : any
+>new Cls() : Cls
+>Cls : typeof Cls
+>x : any
+
+let c = a + b + X;
+>c : number
+>a + b + X : number
+>a + b : number
+>a : number
+>b : number
+>X : number
+
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/newWithSpreadES5.symbols b/tests/baselines/reference/newWithSpreadES5.symbols
index 021674ef337..4494063e2fa 100644
--- a/tests/baselines/reference/newWithSpreadES5.symbols
+++ b/tests/baselines/reference/newWithSpreadES5.symbols
@@ -15,7 +15,7 @@ interface A {
 >A : Symbol(A, Decl(newWithSpreadES5.ts, 4, 30))
 
     f: {
->f : Symbol(f, Decl(newWithSpreadES5.ts, 6, 13))
+>f : Symbol(A.f, Decl(newWithSpreadES5.ts, 6, 13))
 
         new (x: number, y: number, ...z: string[]);
 >x : Symbol(x, Decl(newWithSpreadES5.ts, 8, 13))
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/newWithSpreadES6.symbols b/tests/baselines/reference/newWithSpreadES6.symbols
index 51a34ad73ef..14e52279a27 100644
--- a/tests/baselines/reference/newWithSpreadES6.symbols
+++ b/tests/baselines/reference/newWithSpreadES6.symbols
@@ -16,7 +16,7 @@ interface A {
 >A : Symbol(A, Decl(newWithSpreadES6.ts, 5, 1))
 
     f: {
->f : Symbol(f, Decl(newWithSpreadES6.ts, 7, 13))
+>f : Symbol(A.f, Decl(newWithSpreadES6.ts, 7, 13))
 
         new (x: number, y: number, ...z: string[]);
 >x : Symbol(x, Decl(newWithSpreadES6.ts, 9, 13))
diff --git a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInMethod.symbols b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInMethod.symbols
index 72e0d20a9b2..02b8d0d0985 100644
--- a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInMethod.symbols
+++ b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInMethod.symbols
@@ -6,7 +6,7 @@ class a {
 >a : Symbol(a, Decl(noCollisionThisExpressionAndLocalVarInMethod.ts, 0, 14))
 
     method1() {
->method1 : Symbol(method1, Decl(noCollisionThisExpressionAndLocalVarInMethod.ts, 1, 9))
+>method1 : Symbol(a.method1, Decl(noCollisionThisExpressionAndLocalVarInMethod.ts, 1, 9))
 
         return {
             doStuff: (callback) => () => {
@@ -23,7 +23,7 @@ class a {
         }
     }
     method2() {
->method2 : Symbol(method2, Decl(noCollisionThisExpressionAndLocalVarInMethod.ts, 9, 5))
+>method2 : Symbol(a.method2, Decl(noCollisionThisExpressionAndLocalVarInMethod.ts, 9, 5))
 
         var _this = 2;
 >_this : Symbol(_this, Decl(noCollisionThisExpressionAndLocalVarInMethod.ts, 11, 11))
diff --git a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInProperty.symbols b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInProperty.symbols
index 0dc4cf1d84e..095a1e87b80 100644
--- a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInProperty.symbols
+++ b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInProperty.symbols
@@ -3,7 +3,7 @@ class class1 {
 >class1 : Symbol(class1, Decl(noCollisionThisExpressionAndLocalVarInProperty.ts, 0, 0))
 
     public prop1 = {
->prop1 : Symbol(prop1, Decl(noCollisionThisExpressionAndLocalVarInProperty.ts, 0, 14))
+>prop1 : Symbol(class1.prop1, Decl(noCollisionThisExpressionAndLocalVarInProperty.ts, 0, 14))
 
         doStuff: (callback) => () => {
 >doStuff : Symbol(doStuff, Decl(noCollisionThisExpressionAndLocalVarInProperty.ts, 1, 20))
@@ -27,7 +27,7 @@ class class2 {
 >_this : Symbol(_this, Decl(noCollisionThisExpressionAndLocalVarInProperty.ts, 11, 11))
     }
     public prop1 = {
->prop1 : Symbol(prop1, Decl(noCollisionThisExpressionAndLocalVarInProperty.ts, 12, 5))
+>prop1 : Symbol(class2.prop1, Decl(noCollisionThisExpressionAndLocalVarInProperty.ts, 12, 5))
 
         doStuff: (callback) => () => {
 >doStuff : Symbol(doStuff, Decl(noCollisionThisExpressionAndLocalVarInProperty.ts, 13, 20))
diff --git a/tests/baselines/reference/noEmitHelpers2.js b/tests/baselines/reference/noEmitHelpers2.js
index fc4baf334c3..64acadf07e3 100644
--- a/tests/baselines/reference/noEmitHelpers2.js
+++ b/tests/baselines/reference/noEmitHelpers2.js
@@ -16,6 +16,6 @@ var A = (function () {
 }());
 A = __decorate([
     decorator,
-    __param(1, decorator), 
-    __metadata('design:paramtypes', [Number, String])
+    __param(1, decorator),
+    __metadata("design:paramtypes", [Number, String])
 ], A);
diff --git a/tests/baselines/reference/noErrorOnEmptyDts.js b/tests/baselines/reference/noErrorOnEmptyDts.js
deleted file mode 100644
index 83595e3d2ad..00000000000
--- a/tests/baselines/reference/noErrorOnEmptyDts.js
+++ /dev/null
@@ -1,13 +0,0 @@
-//// [tests/cases/compiler/noErrorOnEmptyDts.ts] ////
-
-//// [test.d.ts]
-
-
-// comment
-
-//// [main.ts]
-import "test"
-
-//// [main.js]
-"use strict";
-require("test");
diff --git a/tests/baselines/reference/noErrorOnEmptyDts.symbols b/tests/baselines/reference/noErrorOnEmptyDts.symbols
deleted file mode 100644
index 78446a19fb8..00000000000
--- a/tests/baselines/reference/noErrorOnEmptyDts.symbols
+++ /dev/null
@@ -1,8 +0,0 @@
-=== c:/node_modules/test.d.ts ===
-
-No type information for this code.
-No type information for this code.// comment
-No type information for this code.
-No type information for this code.=== c:/app/main.ts ===
-import "test"
-No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/noErrorOnEmptyDts.types b/tests/baselines/reference/noErrorOnEmptyDts.types
deleted file mode 100644
index 78446a19fb8..00000000000
--- a/tests/baselines/reference/noErrorOnEmptyDts.types
+++ /dev/null
@@ -1,8 +0,0 @@
-=== c:/node_modules/test.d.ts ===
-
-No type information for this code.
-No type information for this code.// comment
-No type information for this code.
-No type information for this code.=== c:/app/main.ts ===
-import "test"
-No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/noErrorsInCallback.errors.txt b/tests/baselines/reference/noErrorsInCallback.errors.txt
index 90fdbbd77a5..f0bfe00199e 100644
--- a/tests/baselines/reference/noErrorsInCallback.errors.txt
+++ b/tests/baselines/reference/noErrorsInCallback.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/compiler/noErrorsInCallback.ts(4,19): error TS2345: Argument of type '{ [x: number]: undefined; }' is not assignable to parameter of type 'string'.
-tests/cases/compiler/noErrorsInCallback.ts(6,23): error TS2345: Argument of type '{ [x: number]: undefined; }' is not assignable to parameter of type 'string'.
+tests/cases/compiler/noErrorsInCallback.ts(4,19): error TS2345: Argument of type '{}' is not assignable to parameter of type 'string'.
+tests/cases/compiler/noErrorsInCallback.ts(6,23): error TS2345: Argument of type '{}' is not assignable to parameter of type 'string'.
 
 
 ==== tests/cases/compiler/noErrorsInCallback.ts (2 errors) ====
@@ -8,10 +8,10 @@ tests/cases/compiler/noErrorsInCallback.ts(6,23): error TS2345: Argument of type
     }
     var one = new Bar({}); // Error
                       ~~
-!!! error TS2345: Argument of type '{ [x: number]: undefined; }' is not assignable to parameter of type 'string'.
+!!! error TS2345: Argument of type '{}' is not assignable to parameter of type 'string'.
     [].forEach(() => {
         var two = new Bar({}); // No error?
                           ~~
-!!! error TS2345: Argument of type '{ [x: number]: undefined; }' is not assignable to parameter of type 'string'.
+!!! error TS2345: Argument of type '{}' is not assignable to parameter of type 'string'.
     });
      
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitAnyAndPrivateMembersWithoutTypeAnnotations.symbols b/tests/baselines/reference/noImplicitAnyAndPrivateMembersWithoutTypeAnnotations.symbols
index 1673c50f69f..0cfd1cbff07 100644
--- a/tests/baselines/reference/noImplicitAnyAndPrivateMembersWithoutTypeAnnotations.symbols
+++ b/tests/baselines/reference/noImplicitAnyAndPrivateMembersWithoutTypeAnnotations.symbols
@@ -12,6 +12,6 @@ declare class Something
 >someStaticVar : Symbol(Something.someStaticVar, Decl(test.d.ts, 1, 1))
 
     private someVar;
->someVar : Symbol(someVar, Decl(test.d.ts, 2, 33))
+>someVar : Symbol(Something.someVar, Decl(test.d.ts, 2, 33))
 }
 
diff --git a/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.js b/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.js
new file mode 100644
index 00000000000..2d7d930703c
--- /dev/null
+++ b/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.js
@@ -0,0 +1,34 @@
+//// [noImplicitAnyDestructuringInPrivateMethod.ts]
+type Arg = {
+    a: number;
+};
+export class Bar {
+    private bar({ a, }: Arg): number {
+        return a;
+    }
+}
+export declare class Bar2 {
+    private bar({ a, });
+}
+
+//// [noImplicitAnyDestructuringInPrivateMethod.js]
+"use strict";
+var Bar = (function () {
+    function Bar() {
+    }
+    Bar.prototype.bar = function (_a) {
+        var a = _a.a;
+        return a;
+    };
+    return Bar;
+}());
+exports.Bar = Bar;
+
+
+//// [noImplicitAnyDestructuringInPrivateMethod.d.ts]
+export declare class Bar {
+    private bar({a});
+}
+export declare class Bar2 {
+    private bar({a});
+}
diff --git a/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.symbols b/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.symbols
new file mode 100644
index 00000000000..0b1ce5cfe48
--- /dev/null
+++ b/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.symbols
@@ -0,0 +1,27 @@
+=== tests/cases/compiler/noImplicitAnyDestructuringInPrivateMethod.ts ===
+type Arg = {
+>Arg : Symbol(Arg, Decl(noImplicitAnyDestructuringInPrivateMethod.ts, 0, 0))
+
+    a: number;
+>a : Symbol(a, Decl(noImplicitAnyDestructuringInPrivateMethod.ts, 0, 12))
+
+};
+export class Bar {
+>Bar : Symbol(Bar, Decl(noImplicitAnyDestructuringInPrivateMethod.ts, 2, 2))
+
+    private bar({ a, }: Arg): number {
+>bar : Symbol(Bar.bar, Decl(noImplicitAnyDestructuringInPrivateMethod.ts, 3, 18))
+>a : Symbol(a, Decl(noImplicitAnyDestructuringInPrivateMethod.ts, 4, 17))
+>Arg : Symbol(Arg, Decl(noImplicitAnyDestructuringInPrivateMethod.ts, 0, 0))
+
+        return a;
+>a : Symbol(a, Decl(noImplicitAnyDestructuringInPrivateMethod.ts, 4, 17))
+    }
+}
+export declare class Bar2 {
+>Bar2 : Symbol(Bar2, Decl(noImplicitAnyDestructuringInPrivateMethod.ts, 7, 1))
+
+    private bar({ a, });
+>bar : Symbol(Bar2.bar, Decl(noImplicitAnyDestructuringInPrivateMethod.ts, 8, 27))
+>a : Symbol(a, Decl(noImplicitAnyDestructuringInPrivateMethod.ts, 9, 17))
+}
diff --git a/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.types b/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.types
new file mode 100644
index 00000000000..a399e59e3c3
--- /dev/null
+++ b/tests/baselines/reference/noImplicitAnyDestructuringInPrivateMethod.types
@@ -0,0 +1,27 @@
+=== tests/cases/compiler/noImplicitAnyDestructuringInPrivateMethod.ts ===
+type Arg = {
+>Arg : { a: number; }
+
+    a: number;
+>a : number
+
+};
+export class Bar {
+>Bar : Bar
+
+    private bar({ a, }: Arg): number {
+>bar : ({a}: { a: number; }) => number
+>a : number
+>Arg : { a: number; }
+
+        return a;
+>a : number
+    }
+}
+export declare class Bar2 {
+>Bar2 : Bar2
+
+    private bar({ a, });
+>bar : ({a}: { a: any; }) => any
+>a : any
+}
diff --git a/tests/baselines/reference/noImplicitAnyDestructuringParameterDeclaration.errors.txt b/tests/baselines/reference/noImplicitAnyDestructuringParameterDeclaration.errors.txt
new file mode 100644
index 00000000000..a15f9c07cd3
--- /dev/null
+++ b/tests/baselines/reference/noImplicitAnyDestructuringParameterDeclaration.errors.txt
@@ -0,0 +1,55 @@
+tests/cases/compiler/noImplicitAnyDestructuringParameterDeclaration.ts(1,14): error TS7031: Binding element 'a' implicitly has an 'any' type.
+tests/cases/compiler/noImplicitAnyDestructuringParameterDeclaration.ts(1,19): error TS7031: Binding element 'b' implicitly has an 'any' type.
+tests/cases/compiler/noImplicitAnyDestructuringParameterDeclaration.ts(1,23): error TS7006: Parameter 'c' implicitly has an 'any' type.
+tests/cases/compiler/noImplicitAnyDestructuringParameterDeclaration.ts(1,26): error TS7006: Parameter 'd' implicitly has an 'any' type.
+tests/cases/compiler/noImplicitAnyDestructuringParameterDeclaration.ts(3,14): error TS7031: Binding element 'a' implicitly has an 'any' type.
+tests/cases/compiler/noImplicitAnyDestructuringParameterDeclaration.ts(3,31): error TS7031: Binding element 'b' implicitly has an 'any' type.
+tests/cases/compiler/noImplicitAnyDestructuringParameterDeclaration.ts(3,42): error TS7006: Parameter 'c' implicitly has an 'any' type.
+tests/cases/compiler/noImplicitAnyDestructuringParameterDeclaration.ts(3,57): error TS7006: Parameter 'd' implicitly has an 'any' type.
+tests/cases/compiler/noImplicitAnyDestructuringParameterDeclaration.ts(7,20): error TS7008: Member 'b' implicitly has an 'any' type.
+tests/cases/compiler/noImplicitAnyDestructuringParameterDeclaration.ts(7,30): error TS7008: Member 'b' implicitly has an 'any' type.
+tests/cases/compiler/noImplicitAnyDestructuringParameterDeclaration.ts(9,14): error TS7031: Binding element 'a1' implicitly has an 'any' type.
+tests/cases/compiler/noImplicitAnyDestructuringParameterDeclaration.ts(9,34): error TS7031: Binding element 'b1' implicitly has an 'any' type.
+tests/cases/compiler/noImplicitAnyDestructuringParameterDeclaration.ts(9,54): error TS7006: Parameter 'c1' implicitly has an 'any' type.
+tests/cases/compiler/noImplicitAnyDestructuringParameterDeclaration.ts(9,70): error TS7006: Parameter 'd1' implicitly has an 'any' type.
+
+
+==== tests/cases/compiler/noImplicitAnyDestructuringParameterDeclaration.ts (14 errors) ====
+    function f1([a], {b}, c, d) { // error
+                 ~
+!!! error TS7031: Binding element 'a' implicitly has an 'any' type.
+                      ~
+!!! error TS7031: Binding element 'b' implicitly has an 'any' type.
+                          ~
+!!! error TS7006: Parameter 'c' implicitly has an 'any' type.
+                             ~
+!!! error TS7006: Parameter 'd' implicitly has an 'any' type.
+    }
+    function f2([a = undefined], {b = null}, c = undefined, d = null) { // error
+                 ~
+!!! error TS7031: Binding element 'a' implicitly has an 'any' type.
+                                  ~
+!!! error TS7031: Binding element 'b' implicitly has an 'any' type.
+                                             ~~~~~~~~~~~~~
+!!! error TS7006: Parameter 'c' implicitly has an 'any' type.
+                                                            ~~~~~~~~
+!!! error TS7006: Parameter 'd' implicitly has an 'any' type.
+    }
+    function f3([a]: [any], {b}: { b: any }, c: any, d: any) {
+    }
+    function f4({b}: { b }, x: { b }) { // error in type instead
+                       ~
+!!! error TS7008: Member 'b' implicitly has an 'any' type.
+                                 ~
+!!! error TS7008: Member 'b' implicitly has an 'any' type.
+    }
+    function f5([a1] = [undefined], {b1} = { b1: null }, c1 = undefined, d1 = null) { // error
+                 ~~
+!!! error TS7031: Binding element 'a1' implicitly has an 'any' type.
+                                     ~~
+!!! error TS7031: Binding element 'b1' implicitly has an 'any' type.
+                                                         ~~~~~~~~~~~~~~
+!!! error TS7006: Parameter 'c1' implicitly has an 'any' type.
+                                                                         ~~~~~~~~~
+!!! error TS7006: Parameter 'd1' implicitly has an 'any' type.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitAnyDestructuringParameterDeclaration.js b/tests/baselines/reference/noImplicitAnyDestructuringParameterDeclaration.js
new file mode 100644
index 00000000000..d587f8789a9
--- /dev/null
+++ b/tests/baselines/reference/noImplicitAnyDestructuringParameterDeclaration.js
@@ -0,0 +1,36 @@
+//// [noImplicitAnyDestructuringParameterDeclaration.ts]
+function f1([a], {b}, c, d) { // error
+}
+function f2([a = undefined], {b = null}, c = undefined, d = null) { // error
+}
+function f3([a]: [any], {b}: { b: any }, c: any, d: any) {
+}
+function f4({b}: { b }, x: { b }) { // error in type instead
+}
+function f5([a1] = [undefined], {b1} = { b1: null }, c1 = undefined, d1 = null) { // error
+}
+
+//// [noImplicitAnyDestructuringParameterDeclaration.js]
+function f1(_a, _b, c, d) {
+    var a = _a[0];
+    var b = _b.b;
+}
+function f2(_a, _b, c, d) {
+    var _c = _a[0], a = _c === void 0 ? undefined : _c;
+    var _d = _b.b, b = _d === void 0 ? null : _d;
+    if (c === void 0) { c = undefined; }
+    if (d === void 0) { d = null; }
+}
+function f3(_a, _b, c, d) {
+    var a = _a[0];
+    var b = _b.b;
+}
+function f4(_a, x) {
+    var b = _a.b;
+}
+function f5(_a, _b, c1, d1) {
+    var a1 = (_a === void 0 ? [undefined] : _a)[0];
+    var b1 = (_b === void 0 ? { b1: null } : _b).b1;
+    if (c1 === void 0) { c1 = undefined; }
+    if (d1 === void 0) { d1 = null; }
+}
diff --git a/tests/baselines/reference/noImplicitAnyDestructuringVarDeclaration.errors.txt b/tests/baselines/reference/noImplicitAnyDestructuringVarDeclaration.errors.txt
new file mode 100644
index 00000000000..10d6b05c622
--- /dev/null
+++ b/tests/baselines/reference/noImplicitAnyDestructuringVarDeclaration.errors.txt
@@ -0,0 +1,69 @@
+tests/cases/compiler/noImplicitAnyDestructuringVarDeclaration.ts(1,5): error TS1182: A destructuring declaration must have an initializer.
+tests/cases/compiler/noImplicitAnyDestructuringVarDeclaration.ts(1,6): error TS7031: Binding element 'a' implicitly has an 'any' type.
+tests/cases/compiler/noImplicitAnyDestructuringVarDeclaration.ts(1,10): error TS1182: A destructuring declaration must have an initializer.
+tests/cases/compiler/noImplicitAnyDestructuringVarDeclaration.ts(1,11): error TS7031: Binding element 'b' implicitly has an 'any' type.
+tests/cases/compiler/noImplicitAnyDestructuringVarDeclaration.ts(1,15): error TS7005: Variable 'c' implicitly has an 'any' type.
+tests/cases/compiler/noImplicitAnyDestructuringVarDeclaration.ts(1,18): error TS7005: Variable 'd' implicitly has an 'any' type.
+tests/cases/compiler/noImplicitAnyDestructuringVarDeclaration.ts(3,5): error TS1182: A destructuring declaration must have an initializer.
+tests/cases/compiler/noImplicitAnyDestructuringVarDeclaration.ts(3,6): error TS7031: Binding element 'a1' implicitly has an 'any' type.
+tests/cases/compiler/noImplicitAnyDestructuringVarDeclaration.ts(3,23): error TS1182: A destructuring declaration must have an initializer.
+tests/cases/compiler/noImplicitAnyDestructuringVarDeclaration.ts(3,24): error TS7031: Binding element 'b1' implicitly has an 'any' type.
+tests/cases/compiler/noImplicitAnyDestructuringVarDeclaration.ts(3,36): error TS7005: Variable 'c1' implicitly has an 'any' type.
+tests/cases/compiler/noImplicitAnyDestructuringVarDeclaration.ts(3,52): error TS7005: Variable 'd1' implicitly has an 'any' type.
+tests/cases/compiler/noImplicitAnyDestructuringVarDeclaration.ts(5,5): error TS1182: A destructuring declaration must have an initializer.
+tests/cases/compiler/noImplicitAnyDestructuringVarDeclaration.ts(5,18): error TS1182: A destructuring declaration must have an initializer.
+tests/cases/compiler/noImplicitAnyDestructuringVarDeclaration.ts(7,5): error TS1182: A destructuring declaration must have an initializer.
+tests/cases/compiler/noImplicitAnyDestructuringVarDeclaration.ts(7,13): error TS7008: Member 'b3' implicitly has an 'any' type.
+tests/cases/compiler/noImplicitAnyDestructuringVarDeclaration.ts(7,25): error TS7008: Member 'b3' implicitly has an 'any' type.
+tests/cases/compiler/noImplicitAnyDestructuringVarDeclaration.ts(9,6): error TS7031: Binding element 'a1' implicitly has an 'any' type.
+tests/cases/compiler/noImplicitAnyDestructuringVarDeclaration.ts(9,26): error TS7031: Binding element 'b1' implicitly has an 'any' type.
+
+
+==== tests/cases/compiler/noImplicitAnyDestructuringVarDeclaration.ts (19 errors) ====
+    var [a], {b}, c, d; // error
+        ~~~
+!!! error TS1182: A destructuring declaration must have an initializer.
+         ~
+!!! error TS7031: Binding element 'a' implicitly has an 'any' type.
+             ~~~
+!!! error TS1182: A destructuring declaration must have an initializer.
+              ~
+!!! error TS7031: Binding element 'b' implicitly has an 'any' type.
+                  ~
+!!! error TS7005: Variable 'c' implicitly has an 'any' type.
+                     ~
+!!! error TS7005: Variable 'd' implicitly has an 'any' type.
+    
+    var [a1 = undefined], {b1 = null}, c1 = undefined, d1 = null; // error
+        ~~~~~~~~~~~~~~~~
+!!! error TS1182: A destructuring declaration must have an initializer.
+         ~~
+!!! error TS7031: Binding element 'a1' implicitly has an 'any' type.
+                          ~~~~~~~~~~~
+!!! error TS1182: A destructuring declaration must have an initializer.
+                           ~~
+!!! error TS7031: Binding element 'b1' implicitly has an 'any' type.
+                                       ~~
+!!! error TS7005: Variable 'c1' implicitly has an 'any' type.
+                                                       ~~
+!!! error TS7005: Variable 'd1' implicitly has an 'any' type.
+    
+    var [a2]: [any], {b2}: { b2: any }, c2: any, d2: any;
+        ~~~~
+!!! error TS1182: A destructuring declaration must have an initializer.
+                     ~~~~
+!!! error TS1182: A destructuring declaration must have an initializer.
+    
+    var {b3}: { b3 }, c3: { b3 }; // error in type instead
+        ~~~~
+!!! error TS1182: A destructuring declaration must have an initializer.
+                ~~
+!!! error TS7008: Member 'b3' implicitly has an 'any' type.
+                            ~~
+!!! error TS7008: Member 'b3' implicitly has an 'any' type.
+    
+    var [a1] = [undefined], {b1} = { b1: null }, c1 = undefined, d1 = null; // error
+         ~~
+!!! error TS7031: Binding element 'a1' implicitly has an 'any' type.
+                             ~~
+!!! error TS7031: Binding element 'b1' implicitly has an 'any' type.
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitAnyDestructuringVarDeclaration.js b/tests/baselines/reference/noImplicitAnyDestructuringVarDeclaration.js
new file mode 100644
index 00000000000..cbc15c01e9e
--- /dev/null
+++ b/tests/baselines/reference/noImplicitAnyDestructuringVarDeclaration.js
@@ -0,0 +1,17 @@
+//// [noImplicitAnyDestructuringVarDeclaration.ts]
+var [a], {b}, c, d; // error
+
+var [a1 = undefined], {b1 = null}, c1 = undefined, d1 = null; // error
+
+var [a2]: [any], {b2}: { b2: any }, c2: any, d2: any;
+
+var {b3}: { b3 }, c3: { b3 }; // error in type instead
+
+var [a1] = [undefined], {b1} = { b1: null }, c1 = undefined, d1 = null; // error
+
+//// [noImplicitAnyDestructuringVarDeclaration.js]
+var a = (void 0)[0], b = (void 0).b, c, d; // error
+var _a = (void 0)[0], a1 = _a === void 0 ? undefined : _a, _b = (void 0).b1, b1 = _b === void 0 ? null : _b, c1 = undefined, d1 = null; // error
+var a2 = (void 0)[0], b2 = (void 0).b2, c2, d2;
+var b3 = (void 0).b3, c3; // error in type instead
+var a1 = [undefined][0], b1 = { b1: null }.b1, c1 = undefined, d1 = null; // error
diff --git a/tests/baselines/reference/noImplicitAnyInCastExpression.errors.txt b/tests/baselines/reference/noImplicitAnyInCastExpression.errors.txt
index 66a7773ab49..8243a9c68ce 100644
--- a/tests/baselines/reference/noImplicitAnyInCastExpression.errors.txt
+++ b/tests/baselines/reference/noImplicitAnyInCastExpression.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/noImplicitAnyInCastExpression.ts(16,2): error TS2352: Neither type '{ c: null; }' nor type 'IFoo' is assignable to the other.
+tests/cases/compiler/noImplicitAnyInCastExpression.ts(16,2): error TS2352: Type '{ c: null; }' cannot be converted to type 'IFoo'.
   Property 'a' is missing in type '{ c: null; }'.
 
 
@@ -20,5 +20,5 @@ tests/cases/compiler/noImplicitAnyInCastExpression.ts(16,2): error TS2352: Neith
     // Neither types is assignable to each other
     (<IFoo>{ c: null });
      ~~~~~~~~~~~~~~~~~
-!!! error TS2352: Neither type '{ c: null; }' nor type 'IFoo' is assignable to the other.
+!!! error TS2352: Type '{ c: null; }' cannot be converted to type 'IFoo'.
 !!! error TS2352:   Property 'a' is missing in type '{ c: null; }'.
\ No newline at end of file
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/noImplicitAnyIndexingSuppressed.types b/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types
index b7b21bf8f92..d82b37e0f9e 100644
--- a/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types
+++ b/tests/baselines/reference/noImplicitAnyIndexingSuppressed.types
@@ -87,7 +87,7 @@ interface MyMap<T> {
 var m: MyMap<number> = {
 >m : MyMap<number>
 >MyMap : MyMap<T>
->{    "0": 0,    "1": 1,    "2": 2,    "Okay that's enough for today.": NaN} : { [x: string]: number; "0": number; "1": number; "2": number; "Okay that's enough for today.": number; }
+>{    "0": 0,    "1": 1,    "2": 2,    "Okay that's enough for today.": NaN} : { "0": number; "1": number; "2": number; "Okay that's enough for today.": number; }
 
     "0": 0,
 >0 : number
diff --git a/tests/baselines/reference/noImplicitReturnInConstructors.js b/tests/baselines/reference/noImplicitReturnInConstructors.js
new file mode 100644
index 00000000000..f1c4c8caa60
--- /dev/null
+++ b/tests/baselines/reference/noImplicitReturnInConstructors.js
@@ -0,0 +1,14 @@
+//// [noImplicitReturnInConstructors.ts]
+class C {
+  constructor() {
+    return;
+  }
+}
+
+//// [noImplicitReturnInConstructors.js]
+var C = (function () {
+    function C() {
+        return;
+    }
+    return C;
+}());
diff --git a/tests/baselines/reference/noImplicitReturnInConstructors.symbols b/tests/baselines/reference/noImplicitReturnInConstructors.symbols
new file mode 100644
index 00000000000..326a390ead8
--- /dev/null
+++ b/tests/baselines/reference/noImplicitReturnInConstructors.symbols
@@ -0,0 +1,8 @@
+=== tests/cases/compiler/noImplicitReturnInConstructors.ts ===
+class C {
+>C : Symbol(C, Decl(noImplicitReturnInConstructors.ts, 0, 0))
+
+  constructor() {
+    return;
+  }
+}
diff --git a/tests/baselines/reference/noImplicitReturnInConstructors.types b/tests/baselines/reference/noImplicitReturnInConstructors.types
new file mode 100644
index 00000000000..304c7b5db50
--- /dev/null
+++ b/tests/baselines/reference/noImplicitReturnInConstructors.types
@@ -0,0 +1,8 @@
+=== tests/cases/compiler/noImplicitReturnInConstructors.ts ===
+class C {
+>C : C
+
+  constructor() {
+    return;
+  }
+}
diff --git a/tests/baselines/reference/noImplicitReturnsInAsync1.js b/tests/baselines/reference/noImplicitReturnsInAsync1.js
new file mode 100644
index 00000000000..6192e9e7f24
--- /dev/null
+++ b/tests/baselines/reference/noImplicitReturnsInAsync1.js
@@ -0,0 +1,26 @@
+//// [noImplicitReturnsInAsync1.ts]
+
+async function test(isError: boolean = false) {
+    if (isError === true) {
+        return;
+    }
+    let x = await Promise.resolve("The test is passed without an error.");
+}
+
+//// [noImplicitReturnsInAsync1.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 test(isError = false) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (isError === true) {
+            return;
+        }
+        let x = yield Promise.resolve("The test is passed without an error.");
+    });
+}
diff --git a/tests/baselines/reference/noImplicitReturnsInAsync1.symbols b/tests/baselines/reference/noImplicitReturnsInAsync1.symbols
new file mode 100644
index 00000000000..7bf70fbf04e
--- /dev/null
+++ b/tests/baselines/reference/noImplicitReturnsInAsync1.symbols
@@ -0,0 +1,17 @@
+=== tests/cases/compiler/noImplicitReturnsInAsync1.ts ===
+
+async function test(isError: boolean = false) {
+>test : Symbol(test, Decl(noImplicitReturnsInAsync1.ts, 0, 0))
+>isError : Symbol(isError, Decl(noImplicitReturnsInAsync1.ts, 1, 20))
+
+    if (isError === true) {
+>isError : Symbol(isError, Decl(noImplicitReturnsInAsync1.ts, 1, 20))
+
+        return;
+    }
+    let x = await Promise.resolve("The test is passed without an error.");
+>x : Symbol(x, Decl(noImplicitReturnsInAsync1.ts, 5, 7))
+>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>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, --, --))
+>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+}
diff --git a/tests/baselines/reference/noImplicitReturnsInAsync1.types b/tests/baselines/reference/noImplicitReturnsInAsync1.types
new file mode 100644
index 00000000000..23f0892f30e
--- /dev/null
+++ b/tests/baselines/reference/noImplicitReturnsInAsync1.types
@@ -0,0 +1,23 @@
+=== tests/cases/compiler/noImplicitReturnsInAsync1.ts ===
+
+async function test(isError: boolean = false) {
+>test : (isError?: boolean) => Promise<void>
+>isError : boolean
+>false : boolean
+
+    if (isError === true) {
+>isError === true : boolean
+>isError : boolean
+>true : boolean
+
+        return;
+    }
+    let x = await Promise.resolve("The test is passed without an error.");
+>x : string
+>await Promise.resolve("The test is passed without an error.") : string
+>Promise.resolve("The test is passed without an error.") : Promise<string>
+>Promise.resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
+>Promise : PromiseConstructor
+>resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
+>"The test is passed without an error." : string
+}
diff --git a/tests/baselines/reference/noImplicitReturnsInAsync2.errors.txt b/tests/baselines/reference/noImplicitReturnsInAsync2.errors.txt
new file mode 100644
index 00000000000..83673ff518b
--- /dev/null
+++ b/tests/baselines/reference/noImplicitReturnsInAsync2.errors.txt
@@ -0,0 +1,45 @@
+tests/cases/compiler/noImplicitReturnsInAsync2.ts(3,16): error TS7030: Not all code paths return a value.
+tests/cases/compiler/noImplicitReturnsInAsync2.ts(25,48): error TS7030: Not all code paths return a value.
+
+
+==== tests/cases/compiler/noImplicitReturnsInAsync2.ts (2 errors) ====
+    
+    // Should be an error, Promise<number>, currently retorted correctly 
+    async function test3(isError: boolean = true) {
+                   ~~~~~
+!!! error TS7030: Not all code paths return a value.
+        if (isError === true) {
+            return 6;
+        }
+    }
+    
+    // Should not be an error, Promise<any>, currently **not** working
+    async function test4(isError: boolean = true) {  
+        if (isError === true) {
+            return undefined;
+        }
+    }
+    
+    // should not be error, Promise<any> currently working correctly 
+    async function test5(isError: boolean = true): Promise<any> { //should not be error
+        if (isError === true) {
+            return undefined;
+        }
+    }
+    
+    
+    // should be error, currently reported correctly 
+    async function test6(isError: boolean = true): Promise<number> { 
+                                                   ~~~~~~~~~~~~~~~
+!!! error TS7030: Not all code paths return a value.
+        if (isError === true) {
+            return undefined;
+        }
+    }
+    
+    // infered to be Promise<void>, should not be an error, currently reported correctly 
+    async function test7(isError: boolean = true) { 
+        if (isError === true) {
+            return;
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitReturnsInAsync2.js b/tests/baselines/reference/noImplicitReturnsInAsync2.js
new file mode 100644
index 00000000000..5e034237fef
--- /dev/null
+++ b/tests/baselines/reference/noImplicitReturnsInAsync2.js
@@ -0,0 +1,87 @@
+//// [noImplicitReturnsInAsync2.ts]
+
+// Should be an error, Promise<number>, currently retorted correctly 
+async function test3(isError: boolean = true) {
+    if (isError === true) {
+        return 6;
+    }
+}
+
+// Should not be an error, Promise<any>, currently **not** working
+async function test4(isError: boolean = true) {  
+    if (isError === true) {
+        return undefined;
+    }
+}
+
+// should not be error, Promise<any> currently working correctly 
+async function test5(isError: boolean = true): Promise<any> { //should not be error
+    if (isError === true) {
+        return undefined;
+    }
+}
+
+
+// should be error, currently reported correctly 
+async function test6(isError: boolean = true): Promise<number> { 
+    if (isError === true) {
+        return undefined;
+    }
+}
+
+// infered to be Promise<void>, should not be an error, currently reported correctly 
+async function test7(isError: boolean = true) { 
+    if (isError === true) {
+        return;
+    }
+}
+
+//// [noImplicitReturnsInAsync2.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());
+    });
+};
+// Should be an error, Promise<number>, currently retorted correctly 
+function test3(isError = true) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (isError === true) {
+            return 6;
+        }
+    });
+}
+// Should not be an error, Promise<any>, currently **not** working
+function test4(isError = true) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (isError === true) {
+            return undefined;
+        }
+    });
+}
+// should not be error, Promise<any> currently working correctly 
+function test5(isError = true) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (isError === true) {
+            return undefined;
+        }
+    });
+}
+// should be error, currently reported correctly 
+function test6(isError = true) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (isError === true) {
+            return undefined;
+        }
+    });
+}
+// infered to be Promise<void>, should not be an error, currently reported correctly 
+function test7(isError = true) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (isError === true) {
+            return;
+        }
+    });
+}
diff --git a/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks1.js b/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks1.js
new file mode 100644
index 00000000000..7f0b89153b5
--- /dev/null
+++ b/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks1.js
@@ -0,0 +1,22 @@
+//// [noImplicitReturnsWithProtectedBlocks1.ts]
+declare function log(s: string): void;
+declare function get(): number;
+
+function main1() : number {
+    try {
+        return get();
+    }
+    finally {
+        log("in finally");
+    }
+}
+
+//// [noImplicitReturnsWithProtectedBlocks1.js]
+function main1() {
+    try {
+        return get();
+    }
+    finally {
+        log("in finally");
+    }
+}
diff --git a/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks1.symbols b/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks1.symbols
new file mode 100644
index 00000000000..1defb4bbca3
--- /dev/null
+++ b/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks1.symbols
@@ -0,0 +1,20 @@
+=== tests/cases/compiler/noImplicitReturnsWithProtectedBlocks1.ts ===
+declare function log(s: string): void;
+>log : Symbol(log, Decl(noImplicitReturnsWithProtectedBlocks1.ts, 0, 0))
+>s : Symbol(s, Decl(noImplicitReturnsWithProtectedBlocks1.ts, 0, 21))
+
+declare function get(): number;
+>get : Symbol(get, Decl(noImplicitReturnsWithProtectedBlocks1.ts, 0, 38))
+
+function main1() : number {
+>main1 : Symbol(main1, Decl(noImplicitReturnsWithProtectedBlocks1.ts, 1, 31))
+
+    try {
+        return get();
+>get : Symbol(get, Decl(noImplicitReturnsWithProtectedBlocks1.ts, 0, 38))
+    }
+    finally {
+        log("in finally");
+>log : Symbol(log, Decl(noImplicitReturnsWithProtectedBlocks1.ts, 0, 0))
+    }
+}
diff --git a/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks1.types b/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks1.types
new file mode 100644
index 00000000000..90db4fb42e1
--- /dev/null
+++ b/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks1.types
@@ -0,0 +1,23 @@
+=== tests/cases/compiler/noImplicitReturnsWithProtectedBlocks1.ts ===
+declare function log(s: string): void;
+>log : (s: string) => void
+>s : string
+
+declare function get(): number;
+>get : () => number
+
+function main1() : number {
+>main1 : () => number
+
+    try {
+        return get();
+>get() : number
+>get : () => number
+    }
+    finally {
+        log("in finally");
+>log("in finally") : void
+>log : (s: string) => void
+>"in finally" : string
+    }
+}
diff --git a/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks2.errors.txt b/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks2.errors.txt
new file mode 100644
index 00000000000..a77bd0462cd
--- /dev/null
+++ b/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks2.errors.txt
@@ -0,0 +1,20 @@
+tests/cases/compiler/noImplicitReturnsWithProtectedBlocks2.ts(4,20): error TS7030: Not all code paths return a value.
+
+
+==== tests/cases/compiler/noImplicitReturnsWithProtectedBlocks2.ts (1 errors) ====
+    declare function log(s: string): void;
+    declare function get(): number;
+    
+    function main1() : number {
+                       ~~~~~~
+!!! error TS7030: Not all code paths return a value.
+        try {
+            return get();
+        }
+        catch(e) {
+            log("in catch");
+        }
+        finally {
+            log("in finally");
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks2.js b/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks2.js
new file mode 100644
index 00000000000..857a9686232
--- /dev/null
+++ b/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks2.js
@@ -0,0 +1,28 @@
+//// [noImplicitReturnsWithProtectedBlocks2.ts]
+declare function log(s: string): void;
+declare function get(): number;
+
+function main1() : number {
+    try {
+        return get();
+    }
+    catch(e) {
+        log("in catch");
+    }
+    finally {
+        log("in finally");
+    }
+}
+
+//// [noImplicitReturnsWithProtectedBlocks2.js]
+function main1() {
+    try {
+        return get();
+    }
+    catch (e) {
+        log("in catch");
+    }
+    finally {
+        log("in finally");
+    }
+}
diff --git a/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks3.errors.txt b/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks3.errors.txt
new file mode 100644
index 00000000000..56f9c701b55
--- /dev/null
+++ b/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks3.errors.txt
@@ -0,0 +1,17 @@
+tests/cases/compiler/noImplicitReturnsWithProtectedBlocks3.ts(4,20): error TS7030: Not all code paths return a value.
+
+
+==== tests/cases/compiler/noImplicitReturnsWithProtectedBlocks3.ts (1 errors) ====
+    declare function log(s: string): void;
+    declare function get(): number;
+    
+    function main1() : number {
+                       ~~~~~~
+!!! error TS7030: Not all code paths return a value.
+        try {
+            return get();
+        }
+        catch(e) {
+            log("in catch");
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks3.js b/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks3.js
new file mode 100644
index 00000000000..a70996983f6
--- /dev/null
+++ b/tests/baselines/reference/noImplicitReturnsWithProtectedBlocks3.js
@@ -0,0 +1,22 @@
+//// [noImplicitReturnsWithProtectedBlocks3.ts]
+declare function log(s: string): void;
+declare function get(): number;
+
+function main1() : number {
+    try {
+        return get();
+    }
+    catch(e) {
+        log("in catch");
+    }
+}
+
+//// [noImplicitReturnsWithProtectedBlocks3.js]
+function main1() {
+    try {
+        return get();
+    }
+    catch (e) {
+        log("in catch");
+    }
+}
diff --git a/tests/baselines/reference/noImplicitReturnsWithoutReturnExpression.errors.txt b/tests/baselines/reference/noImplicitReturnsWithoutReturnExpression.errors.txt
new file mode 100644
index 00000000000..83d9a65e95d
--- /dev/null
+++ b/tests/baselines/reference/noImplicitReturnsWithoutReturnExpression.errors.txt
@@ -0,0 +1,34 @@
+tests/cases/compiler/noImplicitReturnsWithoutReturnExpression.ts(2,5): error TS7030: Not all code paths return a value.
+tests/cases/compiler/noImplicitReturnsWithoutReturnExpression.ts(22,9): error TS7030: Not all code paths return a value.
+
+
+==== tests/cases/compiler/noImplicitReturnsWithoutReturnExpression.ts (2 errors) ====
+    function isMissingReturnExpression(): number {
+        return;
+        ~~~~~~~
+!!! error TS7030: Not all code paths return a value.
+    }
+    
+    function isMissingReturnExpression2(): any {
+        return;
+    }
+    
+    function isMissingReturnExpression3(): number|void {
+        return;
+    }
+    
+    function isMissingReturnExpression4(): void {
+        return;
+    }
+    
+    function isMissingReturnExpression5(x) {
+        if (x) {
+            return 0;
+        }
+        else {
+            return;
+            ~~~~~~~
+!!! error TS7030: Not all code paths return a value.
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitReturnsWithoutReturnExpression.js b/tests/baselines/reference/noImplicitReturnsWithoutReturnExpression.js
new file mode 100644
index 00000000000..8c9123f6e17
--- /dev/null
+++ b/tests/baselines/reference/noImplicitReturnsWithoutReturnExpression.js
@@ -0,0 +1,48 @@
+//// [noImplicitReturnsWithoutReturnExpression.ts]
+function isMissingReturnExpression(): number {
+    return;
+}
+
+function isMissingReturnExpression2(): any {
+    return;
+}
+
+function isMissingReturnExpression3(): number|void {
+    return;
+}
+
+function isMissingReturnExpression4(): void {
+    return;
+}
+
+function isMissingReturnExpression5(x) {
+    if (x) {
+        return 0;
+    }
+    else {
+        return;
+    }
+}
+
+
+//// [noImplicitReturnsWithoutReturnExpression.js]
+function isMissingReturnExpression() {
+    return;
+}
+function isMissingReturnExpression2() {
+    return;
+}
+function isMissingReturnExpression3() {
+    return;
+}
+function isMissingReturnExpression4() {
+    return;
+}
+function isMissingReturnExpression5(x) {
+    if (x) {
+        return 0;
+    }
+    else {
+        return;
+    }
+}
diff --git a/tests/baselines/reference/noImplicitThisFunctions.errors.txt b/tests/baselines/reference/noImplicitThisFunctions.errors.txt
new file mode 100644
index 00000000000..5f66ac3553f
--- /dev/null
+++ b/tests/baselines/reference/noImplicitThisFunctions.errors.txt
@@ -0,0 +1,28 @@
+tests/cases/compiler/noImplicitThisFunctions.ts(14,12): error TS2683: 'this' implicitly has type 'any' because it does not have a type annotation.
+tests/cases/compiler/noImplicitThisFunctions.ts(18,38): error TS2683: 'this' implicitly has type 'any' because it does not have a type annotation.
+
+
+==== tests/cases/compiler/noImplicitThisFunctions.ts (2 errors) ====
+    
+    function f1(x) {
+        // implicit any is still allowed
+        return x + 1;
+    }
+    
+    function f2(y: number) {
+        // ok: no reference to this
+        return y + 1;
+    }
+    
+    function f3(z: number): number {
+        // error: this is implicitly any
+        return this.a + z;
+               ~~~~
+!!! error TS2683: 'this' implicitly has type 'any' because it does not have a type annotation.
+    }
+    
+    // error: `this` is `window`, but is still of type `any`
+    let f4: (b: number) => number = b => this.c + b;
+                                         ~~~~
+!!! error TS2683: 'this' implicitly has type 'any' because it does not have a type annotation.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitThisFunctions.js b/tests/baselines/reference/noImplicitThisFunctions.js
new file mode 100644
index 00000000000..80ceccbe751
--- /dev/null
+++ b/tests/baselines/reference/noImplicitThisFunctions.js
@@ -0,0 +1,37 @@
+//// [noImplicitThisFunctions.ts]
+
+function f1(x) {
+    // implicit any is still allowed
+    return x + 1;
+}
+
+function f2(y: number) {
+    // ok: no reference to this
+    return y + 1;
+}
+
+function f3(z: number): number {
+    // error: this is implicitly any
+    return this.a + z;
+}
+
+// error: `this` is `window`, but is still of type `any`
+let f4: (b: number) => number = b => this.c + b;
+
+
+//// [noImplicitThisFunctions.js]
+var _this = this;
+function f1(x) {
+    // implicit any is still allowed
+    return x + 1;
+}
+function f2(y) {
+    // ok: no reference to this
+    return y + 1;
+}
+function f3(z) {
+    // error: this is implicitly any
+    return this.a + z;
+}
+// error: `this` is `window`, but is still of type `any`
+var f4 = function (b) { return _this.c + b; };
diff --git a/tests/baselines/reference/noImplicitUseStrict_amd.js b/tests/baselines/reference/noImplicitUseStrict_amd.js
new file mode 100644
index 00000000000..ac15f548c47
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_amd.js
@@ -0,0 +1,8 @@
+//// [noImplicitUseStrict_amd.ts]
+
+export var x = 0;
+
+//// [noImplicitUseStrict_amd.js]
+define(["require", "exports"], function (require, exports) {
+    exports.x = 0;
+});
diff --git a/tests/baselines/reference/noImplicitUseStrict_amd.symbols b/tests/baselines/reference/noImplicitUseStrict_amd.symbols
new file mode 100644
index 00000000000..de1faa2213c
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_amd.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/noImplicitUseStrict_amd.ts ===
+
+export var x = 0;
+>x : Symbol(x, Decl(noImplicitUseStrict_amd.ts, 1, 10))
+
diff --git a/tests/baselines/reference/noImplicitUseStrict_amd.types b/tests/baselines/reference/noImplicitUseStrict_amd.types
new file mode 100644
index 00000000000..c9e1b5749dc
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_amd.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/noImplicitUseStrict_amd.ts ===
+
+export var x = 0;
+>x : number
+>0 : number
+
diff --git a/tests/baselines/reference/noImplicitUseStrict_commonjs.js b/tests/baselines/reference/noImplicitUseStrict_commonjs.js
new file mode 100644
index 00000000000..9c726938f04
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_commonjs.js
@@ -0,0 +1,6 @@
+//// [noImplicitUseStrict_commonjs.ts]
+
+export var x = 0;
+
+//// [noImplicitUseStrict_commonjs.js]
+exports.x = 0;
diff --git a/tests/baselines/reference/noImplicitUseStrict_commonjs.symbols b/tests/baselines/reference/noImplicitUseStrict_commonjs.symbols
new file mode 100644
index 00000000000..af53dc272d2
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_commonjs.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/noImplicitUseStrict_commonjs.ts ===
+
+export var x = 0;
+>x : Symbol(x, Decl(noImplicitUseStrict_commonjs.ts, 1, 10))
+
diff --git a/tests/baselines/reference/noImplicitUseStrict_commonjs.types b/tests/baselines/reference/noImplicitUseStrict_commonjs.types
new file mode 100644
index 00000000000..9999d3b94ba
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_commonjs.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/noImplicitUseStrict_commonjs.ts ===
+
+export var x = 0;
+>x : number
+>0 : number
+
diff --git a/tests/baselines/reference/noImplicitUseStrict_es6.js b/tests/baselines/reference/noImplicitUseStrict_es6.js
new file mode 100644
index 00000000000..27dbbc7ea79
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_es6.js
@@ -0,0 +1,6 @@
+//// [noImplicitUseStrict_es6.ts]
+
+export var x = 0;
+
+//// [noImplicitUseStrict_es6.js]
+export var x = 0;
diff --git a/tests/baselines/reference/noImplicitUseStrict_es6.symbols b/tests/baselines/reference/noImplicitUseStrict_es6.symbols
new file mode 100644
index 00000000000..31bc1904ff9
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_es6.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/noImplicitUseStrict_es6.ts ===
+
+export var x = 0;
+>x : Symbol(x, Decl(noImplicitUseStrict_es6.ts, 1, 10))
+
diff --git a/tests/baselines/reference/noImplicitUseStrict_es6.types b/tests/baselines/reference/noImplicitUseStrict_es6.types
new file mode 100644
index 00000000000..838c7316be0
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_es6.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/noImplicitUseStrict_es6.ts ===
+
+export var x = 0;
+>x : number
+>0 : number
+
diff --git a/tests/baselines/reference/noImplicitUseStrict_system.js b/tests/baselines/reference/noImplicitUseStrict_system.js
new file mode 100644
index 00000000000..f1100e20fd7
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_system.js
@@ -0,0 +1,15 @@
+//// [noImplicitUseStrict_system.ts]
+
+export var x = 0;
+
+//// [noImplicitUseStrict_system.js]
+System.register([], function (exports_1, context_1) {
+    var __moduleName = context_1 && context_1.id;
+    var x;
+    return {
+        setters: [],
+        execute: function () {
+            exports_1("x", x = 0);
+        }
+    };
+});
diff --git a/tests/baselines/reference/noImplicitUseStrict_system.symbols b/tests/baselines/reference/noImplicitUseStrict_system.symbols
new file mode 100644
index 00000000000..62b89a6593d
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_system.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/noImplicitUseStrict_system.ts ===
+
+export var x = 0;
+>x : Symbol(x, Decl(noImplicitUseStrict_system.ts, 1, 10))
+
diff --git a/tests/baselines/reference/noImplicitUseStrict_system.types b/tests/baselines/reference/noImplicitUseStrict_system.types
new file mode 100644
index 00000000000..1da563f938b
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_system.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/noImplicitUseStrict_system.ts ===
+
+export var x = 0;
+>x : number
+>0 : number
+
diff --git a/tests/baselines/reference/noImplicitUseStrict_umd.js b/tests/baselines/reference/noImplicitUseStrict_umd.js
new file mode 100644
index 00000000000..566c3bbe0b6
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_umd.js
@@ -0,0 +1,15 @@
+//// [noImplicitUseStrict_umd.ts]
+
+export var x = 0;
+
+//// [noImplicitUseStrict_umd.js]
+(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);
+    }
+})(["require", "exports"], function (require, exports) {
+    exports.x = 0;
+});
diff --git a/tests/baselines/reference/noImplicitUseStrict_umd.symbols b/tests/baselines/reference/noImplicitUseStrict_umd.symbols
new file mode 100644
index 00000000000..a72a251ad09
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_umd.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/noImplicitUseStrict_umd.ts ===
+
+export var x = 0;
+>x : Symbol(x, Decl(noImplicitUseStrict_umd.ts, 1, 10))
+
diff --git a/tests/baselines/reference/noImplicitUseStrict_umd.types b/tests/baselines/reference/noImplicitUseStrict_umd.types
new file mode 100644
index 00000000000..6a3fd6ece77
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_umd.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/noImplicitUseStrict_umd.ts ===
+
+export var x = 0;
+>x : number
+>0 : number
+
diff --git a/tests/baselines/reference/nominalSubtypeCheckOfTypeParameter.symbols b/tests/baselines/reference/nominalSubtypeCheckOfTypeParameter.symbols
index f25acc772a6..c7d9a1b50f4 100644
--- a/tests/baselines/reference/nominalSubtypeCheckOfTypeParameter.symbols
+++ b/tests/baselines/reference/nominalSubtypeCheckOfTypeParameter.symbols
@@ -5,11 +5,11 @@ interface Tuple<T, S> {
 >S : Symbol(S, Decl(nominalSubtypeCheckOfTypeParameter.ts, 0, 18))
 
     first: T
->first : Symbol(first, Decl(nominalSubtypeCheckOfTypeParameter.ts, 0, 23))
+>first : Symbol(Tuple.first, Decl(nominalSubtypeCheckOfTypeParameter.ts, 0, 23))
 >T : Symbol(T, Decl(nominalSubtypeCheckOfTypeParameter.ts, 0, 16))
 
       second: S
->second : Symbol(second, Decl(nominalSubtypeCheckOfTypeParameter.ts, 1, 12))
+>second : Symbol(Tuple.second, Decl(nominalSubtypeCheckOfTypeParameter.ts, 1, 12))
 >S : Symbol(S, Decl(nominalSubtypeCheckOfTypeParameter.ts, 0, 18))
 }
 
@@ -18,14 +18,14 @@ interface Sequence<T> {
 >T : Symbol(T, Decl(nominalSubtypeCheckOfTypeParameter.ts, 5, 19))
 
     hasNext(): boolean
->hasNext : Symbol(hasNext, Decl(nominalSubtypeCheckOfTypeParameter.ts, 5, 23))
+>hasNext : Symbol(Sequence.hasNext, Decl(nominalSubtypeCheckOfTypeParameter.ts, 5, 23))
 
       pop(): T
->pop : Symbol(pop, Decl(nominalSubtypeCheckOfTypeParameter.ts, 6, 22))
+>pop : Symbol(Sequence.pop, Decl(nominalSubtypeCheckOfTypeParameter.ts, 6, 22))
 >T : Symbol(T, Decl(nominalSubtypeCheckOfTypeParameter.ts, 5, 19))
 
       zip<S>(seq: Sequence<S>): Sequence<Tuple<T, S>>
->zip : Symbol(zip, Decl(nominalSubtypeCheckOfTypeParameter.ts, 7, 14))
+>zip : Symbol(Sequence.zip, Decl(nominalSubtypeCheckOfTypeParameter.ts, 7, 14))
 >S : Symbol(S, Decl(nominalSubtypeCheckOfTypeParameter.ts, 8, 10))
 >seq : Symbol(seq, Decl(nominalSubtypeCheckOfTypeParameter.ts, 8, 13))
 >Sequence : Symbol(Sequence, Decl(nominalSubtypeCheckOfTypeParameter.ts, 3, 1))
@@ -45,10 +45,10 @@ interface List<T> extends Sequence<T> {
 >T : Symbol(T, Decl(nominalSubtypeCheckOfTypeParameter.ts, 13, 15))
 
     getLength(): number
->getLength : Symbol(getLength, Decl(nominalSubtypeCheckOfTypeParameter.ts, 13, 39))
+>getLength : Symbol(List.getLength, Decl(nominalSubtypeCheckOfTypeParameter.ts, 13, 39))
 
       zip<S>(seq: Sequence<S>): List<Tuple<T, S>>
->zip : Symbol(zip, Decl(nominalSubtypeCheckOfTypeParameter.ts, 14, 23))
+>zip : Symbol(List.zip, Decl(nominalSubtypeCheckOfTypeParameter.ts, 14, 23))
 >S : Symbol(S, Decl(nominalSubtypeCheckOfTypeParameter.ts, 15, 10))
 >seq : Symbol(seq, Decl(nominalSubtypeCheckOfTypeParameter.ts, 15, 13))
 >Sequence : Symbol(Sequence, Decl(nominalSubtypeCheckOfTypeParameter.ts, 3, 1))
diff --git a/tests/baselines/reference/nominalSubtypeCheckOfTypeParameter2.symbols b/tests/baselines/reference/nominalSubtypeCheckOfTypeParameter2.symbols
index 3249c465a98..53c740cccaa 100644
--- a/tests/baselines/reference/nominalSubtypeCheckOfTypeParameter2.symbols
+++ b/tests/baselines/reference/nominalSubtypeCheckOfTypeParameter2.symbols
@@ -4,7 +4,7 @@ interface B<T> {
 >T : Symbol(T, Decl(nominalSubtypeCheckOfTypeParameter2.ts, 0, 12))
 
     bar: T;
->bar : Symbol(bar, Decl(nominalSubtypeCheckOfTypeParameter2.ts, 0, 16))
+>bar : Symbol(B.bar, Decl(nominalSubtypeCheckOfTypeParameter2.ts, 0, 16))
 >T : Symbol(T, Decl(nominalSubtypeCheckOfTypeParameter2.ts, 0, 12))
 }
 
@@ -16,7 +16,7 @@ interface A<T> extends B<T> {
 >T : Symbol(T, Decl(nominalSubtypeCheckOfTypeParameter2.ts, 5, 12))
 
     foo: T;
->foo : Symbol(foo, Decl(nominalSubtypeCheckOfTypeParameter2.ts, 5, 29))
+>foo : Symbol(A.foo, Decl(nominalSubtypeCheckOfTypeParameter2.ts, 5, 29))
 >T : Symbol(T, Decl(nominalSubtypeCheckOfTypeParameter2.ts, 5, 12))
 }
 
@@ -28,7 +28,7 @@ interface A2<T> extends B<B<string>> {
 >B : Symbol(B, Decl(nominalSubtypeCheckOfTypeParameter2.ts, 0, 0))
 
     baz: T;
->baz : Symbol(baz, Decl(nominalSubtypeCheckOfTypeParameter2.ts, 10, 38))
+>baz : Symbol(A2.baz, Decl(nominalSubtypeCheckOfTypeParameter2.ts, 10, 38))
 >T : Symbol(T, Decl(nominalSubtypeCheckOfTypeParameter2.ts, 10, 13))
 }
 
@@ -37,7 +37,7 @@ interface C<T> {
 >T : Symbol(T, Decl(nominalSubtypeCheckOfTypeParameter2.ts, 14, 12))
 
     bam: T;
->bam : Symbol(bam, Decl(nominalSubtypeCheckOfTypeParameter2.ts, 14, 16))
+>bam : Symbol(C.bam, Decl(nominalSubtypeCheckOfTypeParameter2.ts, 14, 16))
 >T : Symbol(T, Decl(nominalSubtypeCheckOfTypeParameter2.ts, 14, 12))
 }
 
@@ -50,6 +50,6 @@ interface A3<T> extends B<C<T>> {
 >T : Symbol(T, Decl(nominalSubtypeCheckOfTypeParameter2.ts, 19, 13))
 
     bing: T;
->bing : Symbol(bing, Decl(nominalSubtypeCheckOfTypeParameter2.ts, 19, 33))
+>bing : Symbol(A3.bing, Decl(nominalSubtypeCheckOfTypeParameter2.ts, 19, 33))
 >T : Symbol(T, Decl(nominalSubtypeCheckOfTypeParameter2.ts, 19, 13))
 }
diff --git a/tests/baselines/reference/nonConflictingRecursiveBaseTypeMembers.symbols b/tests/baselines/reference/nonConflictingRecursiveBaseTypeMembers.symbols
index f3ff334931c..4c92f8cb109 100644
--- a/tests/baselines/reference/nonConflictingRecursiveBaseTypeMembers.symbols
+++ b/tests/baselines/reference/nonConflictingRecursiveBaseTypeMembers.symbols
@@ -4,7 +4,7 @@ interface A<T> {
 >T : Symbol(T, Decl(nonConflictingRecursiveBaseTypeMembers.ts, 0, 12))
 
     x: C<T>
->x : Symbol(x, Decl(nonConflictingRecursiveBaseTypeMembers.ts, 0, 16))
+>x : Symbol(A.x, Decl(nonConflictingRecursiveBaseTypeMembers.ts, 0, 16))
 >C : Symbol(C, Decl(nonConflictingRecursiveBaseTypeMembers.ts, 6, 1))
 >T : Symbol(T, Decl(nonConflictingRecursiveBaseTypeMembers.ts, 0, 12))
 }
@@ -14,7 +14,7 @@ interface B<T> {
 >T : Symbol(T, Decl(nonConflictingRecursiveBaseTypeMembers.ts, 4, 12))
 
     x: C<T>
->x : Symbol(x, Decl(nonConflictingRecursiveBaseTypeMembers.ts, 4, 16))
+>x : Symbol(B.x, Decl(nonConflictingRecursiveBaseTypeMembers.ts, 4, 16))
 >C : Symbol(C, Decl(nonConflictingRecursiveBaseTypeMembers.ts, 6, 1))
 >T : Symbol(T, Decl(nonConflictingRecursiveBaseTypeMembers.ts, 4, 12))
 }
diff --git a/tests/baselines/reference/nonContextuallyTypedLogicalOr.symbols b/tests/baselines/reference/nonContextuallyTypedLogicalOr.symbols
index 738f4fed916..2d921f6631c 100644
--- a/tests/baselines/reference/nonContextuallyTypedLogicalOr.symbols
+++ b/tests/baselines/reference/nonContextuallyTypedLogicalOr.symbols
@@ -3,20 +3,20 @@ interface Contextual {
 >Contextual : Symbol(Contextual, Decl(nonContextuallyTypedLogicalOr.ts, 0, 0))
 
     dummy;
->dummy : Symbol(dummy, Decl(nonContextuallyTypedLogicalOr.ts, 0, 22))
+>dummy : Symbol(Contextual.dummy, Decl(nonContextuallyTypedLogicalOr.ts, 0, 22))
 
     p?: number;
->p : Symbol(p, Decl(nonContextuallyTypedLogicalOr.ts, 1, 10))
+>p : Symbol(Contextual.p, Decl(nonContextuallyTypedLogicalOr.ts, 1, 10))
 }
 
 interface Ellement {
 >Ellement : Symbol(Ellement, Decl(nonContextuallyTypedLogicalOr.ts, 3, 1))
 
     dummy;
->dummy : Symbol(dummy, Decl(nonContextuallyTypedLogicalOr.ts, 5, 20))
+>dummy : Symbol(Ellement.dummy, Decl(nonContextuallyTypedLogicalOr.ts, 5, 20))
 
     p: any;
->p : Symbol(p, Decl(nonContextuallyTypedLogicalOr.ts, 6, 10))
+>p : Symbol(Ellement.p, Decl(nonContextuallyTypedLogicalOr.ts, 6, 10))
 }
 
 var c: Contextual;
diff --git a/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.symbols b/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.symbols
index 47daa69239a..54b1dc0c6f3 100644
--- a/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.symbols
+++ b/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.symbols
@@ -4,7 +4,7 @@ class Foo<T> {
 >T : Symbol(T, Decl(nonGenericClassExtendingGenericClassWithAny.ts, 0, 10))
 
     t: T;
->t : Symbol(t, Decl(nonGenericClassExtendingGenericClassWithAny.ts, 0, 14))
+>t : Symbol(Foo.t, Decl(nonGenericClassExtendingGenericClassWithAny.ts, 0, 14))
 >T : Symbol(T, Decl(nonGenericClassExtendingGenericClassWithAny.ts, 0, 10))
 }
 
diff --git a/tests/baselines/reference/nonIdenticalTypeConstraints.errors.txt b/tests/baselines/reference/nonIdenticalTypeConstraints.errors.txt
new file mode 100644
index 00000000000..627b38579a2
--- /dev/null
+++ b/tests/baselines/reference/nonIdenticalTypeConstraints.errors.txt
@@ -0,0 +1,50 @@
+tests/cases/compiler/nonIdenticalTypeConstraints.ts(10,11): error TS2428: All declarations of 'Foo' must have identical type parameters.
+tests/cases/compiler/nonIdenticalTypeConstraints.ts(16,7): error TS2428: All declarations of 'Qux' must have identical type parameters.
+tests/cases/compiler/nonIdenticalTypeConstraints.ts(36,11): error TS2428: All declarations of 'Quux' must have identical type parameters.
+
+
+==== tests/cases/compiler/nonIdenticalTypeConstraints.ts (3 errors) ====
+    class Different {
+        a: number;
+        b: string;
+        c: boolean;
+    }
+    
+    class Foo<T extends Function> {
+        n: T;
+    }
+    interface Foo<T extends Different> {
+              ~~~
+!!! error TS2428: All declarations of 'Foo' must have identical type parameters.
+        y: T;
+    }
+    interface Qux<T extends Different> {
+        y: T;
+    }
+    class Qux<T extends Function> {
+          ~~~
+!!! error TS2428: All declarations of 'Qux' must have identical type parameters.
+        n: T;
+    }
+    
+    class Bar<T extends Function> {
+        n: T;
+    }
+    interface Bar<T extends Function> {
+        y: T;
+    }
+    interface Baz<T extends Function> {
+        y: T;
+    }
+    class Baz<T extends Function> {
+        n: T;
+    }
+    
+    class Quux<T> {
+        n: T;
+    }
+    interface Quux<U> {
+              ~~~~
+!!! error TS2428: All declarations of 'Quux' must have identical type parameters.
+        m: U;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/nonIdenticalTypeConstraints.js b/tests/baselines/reference/nonIdenticalTypeConstraints.js
new file mode 100644
index 00000000000..73748f63885
--- /dev/null
+++ b/tests/baselines/reference/nonIdenticalTypeConstraints.js
@@ -0,0 +1,71 @@
+//// [nonIdenticalTypeConstraints.ts]
+class Different {
+    a: number;
+    b: string;
+    c: boolean;
+}
+
+class Foo<T extends Function> {
+    n: T;
+}
+interface Foo<T extends Different> {
+    y: T;
+}
+interface Qux<T extends Different> {
+    y: T;
+}
+class Qux<T extends Function> {
+    n: T;
+}
+
+class Bar<T extends Function> {
+    n: T;
+}
+interface Bar<T extends Function> {
+    y: T;
+}
+interface Baz<T extends Function> {
+    y: T;
+}
+class Baz<T extends Function> {
+    n: T;
+}
+
+class Quux<T> {
+    n: T;
+}
+interface Quux<U> {
+    m: U;
+}
+
+//// [nonIdenticalTypeConstraints.js]
+var Different = (function () {
+    function Different() {
+    }
+    return Different;
+}());
+var Foo = (function () {
+    function Foo() {
+    }
+    return Foo;
+}());
+var Qux = (function () {
+    function Qux() {
+    }
+    return Qux;
+}());
+var Bar = (function () {
+    function Bar() {
+    }
+    return Bar;
+}());
+var Baz = (function () {
+    function Baz() {
+    }
+    return Baz;
+}());
+var Quux = (function () {
+    function Quux() {
+    }
+    return Quux;
+}());
diff --git a/tests/baselines/reference/nonInstantiatedModule.symbols b/tests/baselines/reference/nonInstantiatedModule.symbols
index 0d67b0318f8..aac81ee5565 100644
--- a/tests/baselines/reference/nonInstantiatedModule.symbols
+++ b/tests/baselines/reference/nonInstantiatedModule.symbols
@@ -4,8 +4,8 @@ module M {
 
     export interface Point { x: number; y: number }
 >Point : Symbol(Point, Decl(nonInstantiatedModule.ts, 0, 10))
->x : Symbol(x, Decl(nonInstantiatedModule.ts, 1, 28))
->y : Symbol(y, Decl(nonInstantiatedModule.ts, 1, 39))
+>x : Symbol(Point.x, Decl(nonInstantiatedModule.ts, 1, 28))
+>y : Symbol(Point.y, Decl(nonInstantiatedModule.ts, 1, 39))
 
     export var a = 1;
 >a : Symbol(a, Decl(nonInstantiatedModule.ts, 2, 14))
@@ -58,10 +58,10 @@ module M2 {
 >Point : Symbol(Point, Decl(nonInstantiatedModule.ts, 15, 11), Decl(nonInstantiatedModule.ts, 20, 5))
 
         x: number;
->x : Symbol(x, Decl(nonInstantiatedModule.ts, 22, 28))
+>x : Symbol(Point.x, Decl(nonInstantiatedModule.ts, 22, 28))
 
         y: number;
->y : Symbol(y, Decl(nonInstantiatedModule.ts, 23, 18))
+>y : Symbol(Point.y, Decl(nonInstantiatedModule.ts, 23, 18))
     }
 }
 
@@ -97,8 +97,8 @@ module M3 {
 >Point : Symbol(Point, Decl(nonInstantiatedModule.ts, 35, 25))
 
             x: number; y: number;
->x : Symbol(x, Decl(nonInstantiatedModule.ts, 36, 32))
->y : Symbol(y, Decl(nonInstantiatedModule.ts, 37, 22))
+>x : Symbol(Point.x, Decl(nonInstantiatedModule.ts, 36, 32))
+>y : Symbol(Point.y, Decl(nonInstantiatedModule.ts, 37, 22))
         }
     }
 
@@ -106,6 +106,6 @@ module M3 {
 >Utils : Symbol(Utils, Decl(nonInstantiatedModule.ts, 34, 11), Decl(nonInstantiatedModule.ts, 39, 5))
 
         name: string;
->name : Symbol(name, Decl(nonInstantiatedModule.ts, 41, 24))
+>name : Symbol(Utils.name, Decl(nonInstantiatedModule.ts, 41, 24))
     }
 }
diff --git a/tests/baselines/reference/nonMergedOverloads.errors.txt b/tests/baselines/reference/nonMergedOverloads.errors.txt
index f5fb58247da..b21a471ea8c 100644
--- a/tests/baselines/reference/nonMergedOverloads.errors.txt
+++ b/tests/baselines/reference/nonMergedOverloads.errors.txt
@@ -1,18 +1,15 @@
 tests/cases/compiler/nonMergedOverloads.ts(1,5): error TS2300: Duplicate identifier 'f'.
-tests/cases/compiler/nonMergedOverloads.ts(3,17): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/compiler/nonMergedOverloads.ts(3,17): error TS2300: Duplicate identifier 'f'.
 tests/cases/compiler/nonMergedOverloads.ts(4,17): error TS2300: Duplicate identifier 'f'.
 
 
-==== tests/cases/compiler/nonMergedOverloads.ts (4 errors) ====
+==== tests/cases/compiler/nonMergedOverloads.ts (3 errors) ====
     var f = 10;
         ~
 !!! error TS2300: Duplicate identifier 'f'.
     
     export function f();
                     ~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-                    ~
 !!! error TS2300: Duplicate identifier 'f'.
     export function f() {
                     ~
diff --git a/tests/baselines/reference/null.symbols b/tests/baselines/reference/null.symbols
index bd3d835995b..f1d888e6889 100644
--- a/tests/baselines/reference/null.symbols
+++ b/tests/baselines/reference/null.symbols
@@ -30,10 +30,10 @@ interface I {
 >I : Symbol(I, Decl(null.ts, 13, 1))
 
     x:any;
->x : Symbol(x, Decl(null.ts, 14, 13))
+>x : Symbol(I.x, Decl(null.ts, 14, 13))
 
     y:number;
->y : Symbol(y, Decl(null.ts, 15, 10))
+>y : Symbol(I.y, Decl(null.ts, 15, 10))
 }
 var w:I={x:null,y:3};
 >w : Symbol(w, Decl(null.ts, 18, 3))
diff --git a/tests/baselines/reference/nullAssignableToEveryType.symbols b/tests/baselines/reference/nullAssignableToEveryType.symbols
index a01077c8eb4..969686563a3 100644
--- a/tests/baselines/reference/nullAssignableToEveryType.symbols
+++ b/tests/baselines/reference/nullAssignableToEveryType.symbols
@@ -3,7 +3,7 @@ class C {
 >C : Symbol(C, Decl(nullAssignableToEveryType.ts, 0, 0))
 
     foo: string;
->foo : Symbol(foo, Decl(nullAssignableToEveryType.ts, 0, 9))
+>foo : Symbol(C.foo, Decl(nullAssignableToEveryType.ts, 0, 9))
 }
 var ac: C;
 >ac : Symbol(ac, Decl(nullAssignableToEveryType.ts, 3, 3))
@@ -13,7 +13,7 @@ interface I {
 >I : Symbol(I, Decl(nullAssignableToEveryType.ts, 3, 10))
 
     foo: string;
->foo : Symbol(foo, Decl(nullAssignableToEveryType.ts, 4, 13))
+>foo : Symbol(I.foo, Decl(nullAssignableToEveryType.ts, 4, 13))
 }
 var ai: I;
 >ai : Symbol(ai, Decl(nullAssignableToEveryType.ts, 7, 3))
@@ -38,7 +38,7 @@ var d: boolean = null;
 
 var e: Date = null;
 >e : Symbol(e, Decl(nullAssignableToEveryType.ts, 15, 3))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var f: any = null;
 >f : Symbol(f, Decl(nullAssignableToEveryType.ts, 16, 3))
@@ -89,18 +89,18 @@ var o: <T>(x: T) => T = null;
 
 var p: Number = null;
 >p : Symbol(p, Decl(nullAssignableToEveryType.ts, 29, 3))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var q: String = null;
 >q : Symbol(q, Decl(nullAssignableToEveryType.ts, 30, 3))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo<T, U, V extends Date>(x: T, y: U, z: V) {
 >foo : Symbol(foo, Decl(nullAssignableToEveryType.ts, 30, 21))
 >T : Symbol(T, Decl(nullAssignableToEveryType.ts, 32, 13))
 >U : Symbol(U, Decl(nullAssignableToEveryType.ts, 32, 15))
 >V : Symbol(V, Decl(nullAssignableToEveryType.ts, 32, 18))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(nullAssignableToEveryType.ts, 32, 35))
 >T : Symbol(T, Decl(nullAssignableToEveryType.ts, 32, 13))
 >y : Symbol(y, Decl(nullAssignableToEveryType.ts, 32, 40))
diff --git a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.symbols b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.symbols
index cb6fab17560..3d4fb84145e 100644
--- a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.symbols
+++ b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.symbols
@@ -39,11 +39,11 @@ var r3 = true ? null : true;
 
 var r4 = true ? new Date() : null;
 >r4 : Symbol(r4, Decl(nullIsSubtypeOfEverythingButUndefined.ts, 18, 3), Decl(nullIsSubtypeOfEverythingButUndefined.ts, 19, 3))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var r4 = true ? null : new Date();
 >r4 : Symbol(r4, Decl(nullIsSubtypeOfEverythingButUndefined.ts, 18, 3), Decl(nullIsSubtypeOfEverythingButUndefined.ts, 19, 3))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var r5 = true ? /1/ : null;
 >r5 : Symbol(r5, Decl(nullIsSubtypeOfEverythingButUndefined.ts, 21, 3), Decl(nullIsSubtypeOfEverythingButUndefined.ts, 22, 3))
@@ -81,7 +81,7 @@ var r8b = true ? null : <T>(x: T) => { return x }; // type parameters not identi
 
 interface I1 { foo: number; }
 >I1 : Symbol(I1, Decl(nullIsSubtypeOfEverythingButUndefined.ts, 31, 50))
->foo : Symbol(foo, Decl(nullIsSubtypeOfEverythingButUndefined.ts, 33, 14))
+>foo : Symbol(I1.foo, Decl(nullIsSubtypeOfEverythingButUndefined.ts, 33, 14))
 
 var i1: I1;
 >i1 : Symbol(i1, Decl(nullIsSubtypeOfEverythingButUndefined.ts, 34, 3))
@@ -97,7 +97,7 @@ var r9 = true ? null : i1;
 
 class C1 { foo: number; }
 >C1 : Symbol(C1, Decl(nullIsSubtypeOfEverythingButUndefined.ts, 36, 26))
->foo : Symbol(foo, Decl(nullIsSubtypeOfEverythingButUndefined.ts, 38, 10))
+>foo : Symbol(C1.foo, Decl(nullIsSubtypeOfEverythingButUndefined.ts, 38, 10))
 
 var c1: C1;
 >c1 : Symbol(c1, Decl(nullIsSubtypeOfEverythingButUndefined.ts, 39, 3))
@@ -114,7 +114,7 @@ var r10 = true ? null : c1;
 class C2<T> { foo: T; }
 >C2 : Symbol(C2, Decl(nullIsSubtypeOfEverythingButUndefined.ts, 41, 27))
 >T : Symbol(T, Decl(nullIsSubtypeOfEverythingButUndefined.ts, 43, 9))
->foo : Symbol(foo, Decl(nullIsSubtypeOfEverythingButUndefined.ts, 43, 13))
+>foo : Symbol(C2.foo, Decl(nullIsSubtypeOfEverythingButUndefined.ts, 43, 13))
 >T : Symbol(T, Decl(nullIsSubtypeOfEverythingButUndefined.ts, 43, 9))
 
 var c2: C2<number>;
@@ -176,7 +176,7 @@ var r15 = true ? null : af;
 
 class c { baz: string }
 >c : Symbol(c, Decl(nullIsSubtypeOfEverythingButUndefined.ts, 61, 27), Decl(nullIsSubtypeOfEverythingButUndefined.ts, 63, 23))
->baz : Symbol(baz, Decl(nullIsSubtypeOfEverythingButUndefined.ts, 63, 9))
+>baz : Symbol(c.baz, Decl(nullIsSubtypeOfEverythingButUndefined.ts, 63, 9))
 
 module c {
 >c : Symbol(c, Decl(nullIsSubtypeOfEverythingButUndefined.ts, 61, 27), Decl(nullIsSubtypeOfEverythingButUndefined.ts, 63, 23))
diff --git a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.errors.txt b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.errors.txt
index 35673eb3072..bb01b2fe125 100644
--- a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.errors.txt
+++ b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.errors.txt
@@ -5,10 +5,9 @@ tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerCo
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations.ts(36,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations.ts(50,5): error TS2412: Property '2.0' of type 'number' is not assignable to numeric index type 'string'.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations.ts(68,5): error TS2412: Property '2.0' of type 'number' is not assignable to numeric index type 'string'.
-tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations.ts(78,5): error TS2322: Type '{ [x: number]: string | number; 1.0: string; 2.0: number; a: string; b: number; c: () => void; "d": string; "e": number; "3.0": string; "4.0": number; f: any; X: string; foo(): string; }' is not assignable to type '{ [x: number]: string; }'.
-  Index signatures are incompatible.
-    Type 'string | number' is not assignable to type 'string'.
-      Type 'number' is not assignable to type 'string'.
+tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations.ts(78,5): error TS2322: Type '{ 1.0: string; 2.0: number; a: string; b: number; c: () => void; "d": string; "e": number; "3.0": string; "4.0": number; f: any; X: string; foo(): string; }' is not assignable to type '{ [x: number]: string; }'.
+  Property '2.0' is incompatible with index signature.
+    Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations.ts(88,9): error TS2304: Cannot find name 'Myn'.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations.ts(90,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations.ts(93,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
@@ -108,10 +107,9 @@ tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerCo
     // error
     var b: { [x: number]: string; } = {
         ~
-!!! error TS2322: Type '{ [x: number]: string | number; 1.0: string; 2.0: number; a: string; b: number; c: () => void; "d": string; "e": number; "3.0": string; "4.0": number; f: any; X: string; foo(): string; }' is not assignable to type '{ [x: number]: string; }'.
-!!! error TS2322:   Index signatures are incompatible.
-!!! error TS2322:     Type 'string | number' is not assignable to type 'string'.
-!!! error TS2322:       Type 'number' is not assignable to type 'string'.
+!!! error TS2322: Type '{ 1.0: string; 2.0: number; a: string; b: number; c: () => void; "d": string; "e": number; "3.0": string; "4.0": number; f: any; X: string; foo(): string; }' is not assignable to type '{ [x: number]: string; }'.
+!!! error TS2322:   Property '2.0' is incompatible with index signature.
+!!! error TS2322:     Type 'number' is not assignable to type 'string'.
         a: '',
         b: 1, 
         c: () => { }, 
diff --git a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.errors.txt b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.errors.txt
index ff18160e9a5..332b356c732 100644
--- a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.errors.txt
+++ b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.errors.txt
@@ -1,10 +1,9 @@
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations2.ts(16,5): error TS2412: Property '3.0' of type 'number' is not assignable to numeric index type 'A'.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations2.ts(25,5): error TS2412: Property '3.0' of type 'number' is not assignable to numeric index type 'A'.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations2.ts(34,5): error TS2412: Property '3.0' of type 'number' is not assignable to numeric index type 'A'.
-tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations2.ts(39,5): error TS2322: Type '{ [x: number]: A | number; 1.0: A; 2.0: B; 3.0: number; "2.5": B; "4.0": string; }' is not assignable to type '{ [x: number]: A; }'.
-  Index signatures are incompatible.
-    Type 'A | number' is not assignable to type 'A'.
-      Type 'number' is not assignable to type 'A'.
+tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations2.ts(39,5): error TS2322: Type '{ 1.0: A; 2.0: B; 3.0: number; "2.5": B; "4.0": string; }' is not assignable to type '{ [x: number]: A; }'.
+  Property '3.0' is incompatible with index signature.
+    Type 'number' is not assignable to type 'A'.
 
 
 ==== tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerConstrainsPropertyDeclarations2.ts (4 errors) ====
@@ -54,10 +53,9 @@ tests/cases/conformance/types/objectTypeLiteral/indexSignatures/numericIndexerCo
     // error
     var b: { [x: number]: A } = {
         ~
-!!! error TS2322: Type '{ [x: number]: A | number; 1.0: A; 2.0: B; 3.0: number; "2.5": B; "4.0": string; }' is not assignable to type '{ [x: number]: A; }'.
-!!! error TS2322:   Index signatures are incompatible.
-!!! error TS2322:     Type 'A | number' is not assignable to type 'A'.
-!!! error TS2322:       Type 'number' is not assignable to type 'A'.
+!!! error TS2322: Type '{ 1.0: A; 2.0: B; 3.0: number; "2.5": B; "4.0": string; }' is not assignable to type '{ [x: number]: A; }'.
+!!! error TS2322:   Property '3.0' is incompatible with index signature.
+!!! error TS2322:     Type 'number' is not assignable to type 'A'.
         1.0: new A(), 
         2.0: new B(), 
         "2.5": new B(),
diff --git a/tests/baselines/reference/numericIndexerConstraint2.errors.txt b/tests/baselines/reference/numericIndexerConstraint2.errors.txt
index 385efbcead2..5c0337acc32 100644
--- a/tests/baselines/reference/numericIndexerConstraint2.errors.txt
+++ b/tests/baselines/reference/numericIndexerConstraint2.errors.txt
@@ -1,5 +1,6 @@
 tests/cases/compiler/numericIndexerConstraint2.ts(4,1): error TS2322: Type '{ one: number; }' is not assignable to type '{ [index: string]: Foo; }'.
-  Index signature is missing in type '{ one: number; }'.
+  Property 'one' is incompatible with index signature.
+    Type 'number' is not assignable to type 'Foo'.
 
 
 ==== tests/cases/compiler/numericIndexerConstraint2.ts (1 errors) ====
@@ -9,4 +10,5 @@ tests/cases/compiler/numericIndexerConstraint2.ts(4,1): error TS2322: Type '{ on
     x = a;
     ~
 !!! error TS2322: Type '{ one: number; }' is not assignable to type '{ [index: string]: Foo; }'.
-!!! error TS2322:   Index signature is missing in type '{ one: number; }'.
\ No newline at end of file
+!!! error TS2322:   Property 'one' is incompatible with index signature.
+!!! error TS2322:     Type 'number' is not assignable to type 'Foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/numericIndexerConstraint3.symbols b/tests/baselines/reference/numericIndexerConstraint3.symbols
index bdf58cb1372..5b784742ad8 100644
--- a/tests/baselines/reference/numericIndexerConstraint3.symbols
+++ b/tests/baselines/reference/numericIndexerConstraint3.symbols
@@ -3,7 +3,7 @@ class A {
 >A : Symbol(A, Decl(numericIndexerConstraint3.ts, 0, 0))
 
     foo: number;
->foo : Symbol(foo, Decl(numericIndexerConstraint3.ts, 0, 9))
+>foo : Symbol(A.foo, Decl(numericIndexerConstraint3.ts, 0, 9))
 }
 
 class B extends A {
@@ -11,7 +11,7 @@ class B extends A {
 >A : Symbol(A, Decl(numericIndexerConstraint3.ts, 0, 0))
 
     bar: string;
->bar : Symbol(bar, Decl(numericIndexerConstraint3.ts, 4, 19))
+>bar : Symbol(B.bar, Decl(numericIndexerConstraint3.ts, 4, 19))
 }
 
 class C {
diff --git a/tests/baselines/reference/numericIndexerConstraint4.symbols b/tests/baselines/reference/numericIndexerConstraint4.symbols
index 63d976ea1b1..46301a6787b 100644
--- a/tests/baselines/reference/numericIndexerConstraint4.symbols
+++ b/tests/baselines/reference/numericIndexerConstraint4.symbols
@@ -3,7 +3,7 @@ class A {
 >A : Symbol(A, Decl(numericIndexerConstraint4.ts, 0, 0))
 
     foo: number;
->foo : Symbol(foo, Decl(numericIndexerConstraint4.ts, 0, 9))
+>foo : Symbol(A.foo, Decl(numericIndexerConstraint4.ts, 0, 9))
 }
 
 class B extends A {
@@ -11,7 +11,7 @@ class B extends A {
 >A : Symbol(A, Decl(numericIndexerConstraint4.ts, 0, 0))
 
     bar: string;
->bar : Symbol(bar, Decl(numericIndexerConstraint4.ts, 4, 19))
+>bar : Symbol(B.bar, Decl(numericIndexerConstraint4.ts, 4, 19))
 }
 
 var x: {
diff --git a/tests/baselines/reference/numericIndexerConstraint4.types b/tests/baselines/reference/numericIndexerConstraint4.types
index 97e72b5088d..c8af4d54a9a 100644
--- a/tests/baselines/reference/numericIndexerConstraint4.types
+++ b/tests/baselines/reference/numericIndexerConstraint4.types
@@ -22,7 +22,7 @@ var x: {
 >A : A
 
 } = { data: new B() }
->{ data: new B() } : { [x: number]: undefined; data: B; }
+>{ data: new B() } : { data: B; }
 >data : B
 >new B() : B
 >B : typeof B
diff --git a/tests/baselines/reference/numericIndexerConstraint5.errors.txt b/tests/baselines/reference/numericIndexerConstraint5.errors.txt
index 98acc65eeb7..cb888de08c4 100644
--- a/tests/baselines/reference/numericIndexerConstraint5.errors.txt
+++ b/tests/baselines/reference/numericIndexerConstraint5.errors.txt
@@ -1,5 +1,6 @@
 tests/cases/compiler/numericIndexerConstraint5.ts(2,5): error TS2322: Type '{ 0: Date; name: string; }' is not assignable to type '{ [name: number]: string; }'.
-  Index signature is missing in type '{ 0: Date; name: string; }'.
+  Property '0' is incompatible with index signature.
+    Type 'Date' is not assignable to type 'string'.
 
 
 ==== tests/cases/compiler/numericIndexerConstraint5.ts (1 errors) ====
@@ -7,4 +8,5 @@ tests/cases/compiler/numericIndexerConstraint5.ts(2,5): error TS2322: Type '{ 0:
     var z: { [name: number]: string } = x;
         ~
 !!! error TS2322: Type '{ 0: Date; name: string; }' is not assignable to type '{ [name: number]: string; }'.
-!!! error TS2322:   Index signature is missing in type '{ 0: Date; name: string; }'.
\ No newline at end of file
+!!! error TS2322:   Property '0' is incompatible with index signature.
+!!! error TS2322:     Type 'Date' is not assignable to type 'string'.
\ No newline at end of file
diff --git a/tests/baselines/reference/numericIndexingResults.types b/tests/baselines/reference/numericIndexingResults.types
index 560bbdc74a8..9a060b388e3 100644
--- a/tests/baselines/reference/numericIndexingResults.types
+++ b/tests/baselines/reference/numericIndexingResults.types
@@ -151,7 +151,7 @@ var r6 = a[3];
 var b: { [x: number]: string } = { 1: '', "2": '' }
 >b : { [x: number]: string; }
 >x : number
->{ 1: '', "2": '' } : { [x: number]: string; 1: string; "2": string; }
+>{ 1: '', "2": '' } : { 1: string; "2": string; }
 >'' : string
 >'' : string
 
@@ -194,7 +194,7 @@ var r6 = b[3];
 var b2: { [x: number]: string; 1: string; "2": string; } = { 1: '', "2": '' }
 >b2 : { [x: number]: string; 1: string; "2": string; }
 >x : number
->{ 1: '', "2": '' } : { [x: number]: string; 1: string; "2": string; }
+>{ 1: '', "2": '' } : { 1: string; "2": string; }
 >'' : string
 >'' : string
 
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/objectIndexer.symbols b/tests/baselines/reference/objectIndexer.symbols
index 33885a40e27..56d1d4242ca 100644
--- a/tests/baselines/reference/objectIndexer.symbols
+++ b/tests/baselines/reference/objectIndexer.symbols
@@ -18,14 +18,14 @@ class Emitter {
 >Emitter : Symbol(Emitter, Decl(objectIndexer.ts, 6, 1))
 
     private listeners: IMap;
->listeners : Symbol(listeners, Decl(objectIndexer.ts, 8, 15))
+>listeners : Symbol(Emitter.listeners, Decl(objectIndexer.ts, 8, 15))
 >IMap : Symbol(IMap, Decl(objectIndexer.ts, 2, 1))
 
     constructor () {
         this.listeners = {};
->this.listeners : Symbol(listeners, Decl(objectIndexer.ts, 8, 15))
+>this.listeners : Symbol(Emitter.listeners, Decl(objectIndexer.ts, 8, 15))
 >this : Symbol(Emitter, Decl(objectIndexer.ts, 6, 1))
->listeners : Symbol(listeners, Decl(objectIndexer.ts, 8, 15))
+>listeners : Symbol(Emitter.listeners, Decl(objectIndexer.ts, 8, 15))
     }
 }
 
diff --git a/tests/baselines/reference/objectIndexer.types b/tests/baselines/reference/objectIndexer.types
index 3dcd7bcb77e..b11c475a386 100644
--- a/tests/baselines/reference/objectIndexer.types
+++ b/tests/baselines/reference/objectIndexer.types
@@ -23,11 +23,11 @@ class Emitter {
 
     constructor () {
         this.listeners = {};
->this.listeners = {} : { [x: string]: undefined; }
+>this.listeners = {} : {}
 >this.listeners : IMap
 >this : this
 >listeners : IMap
->{} : { [x: string]: undefined; }
+>{} : {}
     }
 }
 
diff --git a/tests/baselines/reference/objectLiteralArraySpecialization.symbols b/tests/baselines/reference/objectLiteralArraySpecialization.symbols
index 4cc1188dcc4..0b91dd4a350 100644
--- a/tests/baselines/reference/objectLiteralArraySpecialization.symbols
+++ b/tests/baselines/reference/objectLiteralArraySpecialization.symbols
@@ -12,12 +12,12 @@ interface MyArrayWrapper<T> {
 >T : Symbol(T, Decl(objectLiteralArraySpecialization.ts, 1, 25))
 
 	constructor(initialItems?: T[]);
->constructor : Symbol(constructor, Decl(objectLiteralArraySpecialization.ts, 1, 29))
+>constructor : Symbol(MyArrayWrapper.constructor, Decl(objectLiteralArraySpecialization.ts, 1, 29))
 >initialItems : Symbol(initialItems, Decl(objectLiteralArraySpecialization.ts, 2, 13))
 >T : Symbol(T, Decl(objectLiteralArraySpecialization.ts, 1, 25))
 
 	doSomething(predicate: (x: T, y: T) => boolean): void;
->doSomething : Symbol(doSomething, Decl(objectLiteralArraySpecialization.ts, 2, 33))
+>doSomething : Symbol(MyArrayWrapper.doSomething, Decl(objectLiteralArraySpecialization.ts, 2, 33))
 >predicate : Symbol(predicate, Decl(objectLiteralArraySpecialization.ts, 3, 13))
 >x : Symbol(x, Decl(objectLiteralArraySpecialization.ts, 3, 25))
 >T : Symbol(T, Decl(objectLiteralArraySpecialization.ts, 1, 25))
diff --git a/tests/baselines/reference/objectLiteralContextualTyping.symbols b/tests/baselines/reference/objectLiteralContextualTyping.symbols
index 23a468eac3f..171ae48776f 100644
--- a/tests/baselines/reference/objectLiteralContextualTyping.symbols
+++ b/tests/baselines/reference/objectLiteralContextualTyping.symbols
@@ -8,10 +8,10 @@ interface Item {
 >Item : Symbol(Item, Decl(objectLiteralContextualTyping.ts, 0, 0))
 
     name: string;
->name : Symbol(name, Decl(objectLiteralContextualTyping.ts, 5, 16))
+>name : Symbol(Item.name, Decl(objectLiteralContextualTyping.ts, 5, 16))
 
     description?: string;
->description : Symbol(description, Decl(objectLiteralContextualTyping.ts, 6, 17))
+>description : Symbol(Item.description, Decl(objectLiteralContextualTyping.ts, 6, 17))
 }
 
 declare function foo(item: Item): string;
diff --git a/tests/baselines/reference/objectLiteralErrors.errors.txt b/tests/baselines/reference/objectLiteralErrors.errors.txt
index 19935f52bdc..134b79a443e 100644
--- a/tests/baselines/reference/objectLiteralErrors.errors.txt
+++ b/tests/baselines/reference/objectLiteralErrors.errors.txt
@@ -89,11 +89,11 @@ tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(39,26)
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(40,13): error TS2300: Duplicate identifier 'a'.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(40,46): error TS1119: An object literal cannot have property and accessor with the same name.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(40,46): error TS2300: Duplicate identifier 'a'.
-tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(43,12): error TS2380: 'get' and 'set' accessor must have the same type.
-tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(43,43): error TS2380: 'get' and 'set' accessor must have the same type.
+tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(43,16): error TS2380: 'get' and 'set' accessor must have the same type.
+tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(43,47): error TS2380: 'get' and 'set' accessor must have the same type.
 tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(44,29): error TS2322: Type 'number' is not assignable to type 'string'.
-tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(45,12): error TS2380: 'get' and 'set' accessor must have the same type.
-tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(45,51): error TS2380: 'get' and 'set' accessor must have the same type.
+tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(45,16): error TS2380: 'get' and 'set' accessor must have the same type.
+tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(45,55): error TS2380: 'get' and 'set' accessor must have the same type.
 
 
 ==== tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts (96 errors) ====
@@ -322,16 +322,16 @@ tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts(45,51)
     
     // Get and set accessor with mismatched type annotations
     var g1 = { get a(): number { return 4; }, set a(n: string) { } };
-               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                   ~
 !!! error TS2380: 'get' and 'set' accessor must have the same type.
-                                              ~~~~~~~~~~~~~~~~~~~~
+                                                  ~
 !!! error TS2380: 'get' and 'set' accessor must have the same type.
     var g2 = { get a() { return 4; }, set a(n: string) { } };
                                 ~
 !!! error TS2322: Type 'number' is not assignable to type 'string'.
     var g3 = { get a(): number { return undefined; }, set a(n: string) { } };
-               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                   ~
 !!! error TS2380: 'get' and 'set' accessor must have the same type.
-                                                      ~~~~~~~~~~~~~~~~~~~~
+                                                          ~
 !!! error TS2380: 'get' and 'set' accessor must have the same type.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/objectLiteralIndexerErrors.errors.txt b/tests/baselines/reference/objectLiteralIndexerErrors.errors.txt
index f825c416311..9d5ff7ea0a2 100644
--- a/tests/baselines/reference/objectLiteralIndexerErrors.errors.txt
+++ b/tests/baselines/reference/objectLiteralIndexerErrors.errors.txt
@@ -1,10 +1,13 @@
-tests/cases/compiler/objectLiteralIndexerErrors.ts(13,5): error TS2322: Type '{ [x: string]: A; [x: number]: A; 0: A; x: B; }' is not assignable to type '{ [s: string]: A; [n: number]: B; }'.
-  Index signatures are incompatible.
+tests/cases/compiler/objectLiteralIndexerErrors.ts(13,5): error TS2322: Type '{ 0: A; x: B; }' is not assignable to type '{ [s: string]: A; [n: number]: B; }'.
+  Property '0' is incompatible with index signature.
     Type 'A' is not assignable to type 'B'.
       Property 'y' is missing in type 'A'.
+tests/cases/compiler/objectLiteralIndexerErrors.ts(14,1): error TS2322: Type '{ 0: A; x: any; }' is not assignable to type '{ [s: string]: A; [n: number]: B; }'.
+  Property '0' is incompatible with index signature.
+    Type 'A' is not assignable to type 'B'.
 
 
-==== tests/cases/compiler/objectLiteralIndexerErrors.ts (1 errors) ====
+==== tests/cases/compiler/objectLiteralIndexerErrors.ts (2 errors) ====
     interface A {
         x: number;
     }
@@ -19,8 +22,12 @@ tests/cases/compiler/objectLiteralIndexerErrors.ts(13,5): error TS2322: Type '{
     
     var o1: { [s: string]: A;[n: number]: B; } = { x: b, 0: a }; // both indexers are A
         ~~
-!!! error TS2322: Type '{ [x: string]: A; [x: number]: A; 0: A; x: B; }' is not assignable to type '{ [s: string]: A; [n: number]: B; }'.
-!!! error TS2322:   Index signatures are incompatible.
+!!! error TS2322: Type '{ 0: A; x: B; }' is not assignable to type '{ [s: string]: A; [n: number]: B; }'.
+!!! error TS2322:   Property '0' is incompatible with index signature.
 !!! error TS2322:     Type 'A' is not assignable to type 'B'.
 !!! error TS2322:       Property 'y' is missing in type 'A'.
-    o1 = { x: c, 0: a }; // string indexer is any, number indexer is A
\ No newline at end of file
+    o1 = { x: c, 0: a }; // string indexer is any, number indexer is A
+    ~~
+!!! error TS2322: Type '{ 0: A; x: any; }' is not assignable to type '{ [s: string]: A; [n: number]: B; }'.
+!!! error TS2322:   Property '0' is incompatible with index signature.
+!!! error TS2322:     Type 'A' is not assignable to type 'B'.
\ No newline at end of file
diff --git a/tests/baselines/reference/objectLiteralIndexerNoImplicitAny.types b/tests/baselines/reference/objectLiteralIndexerNoImplicitAny.types
index a49f76d02e9..b0ddd9f60d0 100644
--- a/tests/baselines/reference/objectLiteralIndexerNoImplicitAny.types
+++ b/tests/baselines/reference/objectLiteralIndexerNoImplicitAny.types
@@ -9,7 +9,7 @@ interface I {
 var x: I = {
 >x : I
 >I : I
->{    p: null} : { [x: string]: null; p: null; }
+>{    p: null} : { p: null; }
 
     p: null
 >p : null
diff --git a/tests/baselines/reference/objectLiteralIndexers.symbols b/tests/baselines/reference/objectLiteralIndexers.symbols
index 424e95be0fa..53e1c82aca4 100644
--- a/tests/baselines/reference/objectLiteralIndexers.symbols
+++ b/tests/baselines/reference/objectLiteralIndexers.symbols
@@ -3,7 +3,7 @@ interface A {
 >A : Symbol(A, Decl(objectLiteralIndexers.ts, 0, 0))
 
     x: number;
->x : Symbol(x, Decl(objectLiteralIndexers.ts, 0, 13))
+>x : Symbol(A.x, Decl(objectLiteralIndexers.ts, 0, 13))
 }
 
 interface B extends A {
@@ -11,7 +11,7 @@ interface B extends A {
 >A : Symbol(A, Decl(objectLiteralIndexers.ts, 0, 0))
 
     y: string;
->y : Symbol(y, Decl(objectLiteralIndexers.ts, 4, 23))
+>y : Symbol(B.y, Decl(objectLiteralIndexers.ts, 4, 23))
 }
 
 var a: A;
diff --git a/tests/baselines/reference/objectLiteralIndexers.types b/tests/baselines/reference/objectLiteralIndexers.types
index d5add00ebaf..9e3aa4bac49 100644
--- a/tests/baselines/reference/objectLiteralIndexers.types
+++ b/tests/baselines/reference/objectLiteralIndexers.types
@@ -31,23 +31,23 @@ var o1: { [s: string]: A;[n: number]: B; } = { x: a, 0: b }; // string indexer i
 >A : A
 >n : number
 >B : B
->{ x: a, 0: b } : { [x: string]: A; [x: number]: B; 0: B; x: A; }
+>{ x: a, 0: b } : { 0: B; x: A; }
 >x : A
 >a : A
 >b : B
 
 o1 = { x: b, 0: c }; // both indexers are any
->o1 = { x: b, 0: c } : { [x: string]: any; [x: number]: any; 0: any; x: B; }
+>o1 = { x: b, 0: c } : { 0: any; x: B; }
 >o1 : { [s: string]: A; [n: number]: B; }
->{ x: b, 0: c } : { [x: string]: any; [x: number]: any; 0: any; x: B; }
+>{ x: b, 0: c } : { 0: any; x: B; }
 >x : B
 >b : B
 >c : any
 
 o1 = { x: c, 0: b }; // string indexer is any, number indexer is B
->o1 = { x: c, 0: b } : { [x: string]: any; [x: number]: B; 0: B; x: any; }
+>o1 = { x: c, 0: b } : { 0: B; x: any; }
 >o1 : { [s: string]: A; [n: number]: B; }
->{ x: c, 0: b } : { [x: string]: any; [x: number]: B; 0: B; x: any; }
+>{ x: c, 0: b } : { 0: B; x: any; }
 >x : any
 >c : any
 >b : B
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/objectTypeHidingMembersOfObject.symbols b/tests/baselines/reference/objectTypeHidingMembersOfObject.symbols
index 5c88d538fdb..b3462d920be 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfObject.symbols
+++ b/tests/baselines/reference/objectTypeHidingMembersOfObject.symbols
@@ -5,7 +5,7 @@ class C {
 >C : Symbol(C, Decl(objectTypeHidingMembersOfObject.ts, 0, 0))
 
     valueOf() { }
->valueOf : Symbol(valueOf, Decl(objectTypeHidingMembersOfObject.ts, 2, 9))
+>valueOf : Symbol(C.valueOf, Decl(objectTypeHidingMembersOfObject.ts, 2, 9))
 }
 
 var c: C;
@@ -22,7 +22,7 @@ interface I {
 >I : Symbol(I, Decl(objectTypeHidingMembersOfObject.ts, 7, 27))
 
     valueOf(): void;
->valueOf : Symbol(valueOf, Decl(objectTypeHidingMembersOfObject.ts, 9, 13))
+>valueOf : Symbol(I.valueOf, Decl(objectTypeHidingMembersOfObject.ts, 9, 13))
 }
 
 var i: I;
diff --git a/tests/baselines/reference/objectTypePropertyAccess.symbols b/tests/baselines/reference/objectTypePropertyAccess.symbols
index 2117b9ce35a..072ddf5f476 100644
--- a/tests/baselines/reference/objectTypePropertyAccess.symbols
+++ b/tests/baselines/reference/objectTypePropertyAccess.symbols
@@ -4,7 +4,7 @@ class C {
 >C : Symbol(C, Decl(objectTypePropertyAccess.ts, 0, 0))
 
     foo: string;
->foo : Symbol(foo, Decl(objectTypePropertyAccess.ts, 1, 9))
+>foo : Symbol(C.foo, Decl(objectTypePropertyAccess.ts, 1, 9))
 }
 
 var c: C;
@@ -37,7 +37,7 @@ interface I {
 >I : Symbol(I, Decl(objectTypePropertyAccess.ts, 9, 18))
 
     bar: string;
->bar : Symbol(bar, Decl(objectTypePropertyAccess.ts, 11, 13))
+>bar : Symbol(I.bar, Decl(objectTypePropertyAccess.ts, 11, 13))
 }
 var i: I;
 >i : Symbol(i, Decl(objectTypePropertyAccess.ts, 14, 3))
diff --git a/tests/baselines/reference/objectTypeWithCallSignatureAppearsToBeFunctionType.symbols b/tests/baselines/reference/objectTypeWithCallSignatureAppearsToBeFunctionType.symbols
index 60b7b08397a..08d3d75e9dc 100644
--- a/tests/baselines/reference/objectTypeWithCallSignatureAppearsToBeFunctionType.symbols
+++ b/tests/baselines/reference/objectTypeWithCallSignatureAppearsToBeFunctionType.symbols
@@ -20,9 +20,9 @@ var r2b: (x: any, y?: any) => any = i.apply;
 >r2b : Symbol(r2b, Decl(objectTypeWithCallSignatureAppearsToBeFunctionType.ts, 9, 3))
 >x : Symbol(x, Decl(objectTypeWithCallSignatureAppearsToBeFunctionType.ts, 9, 10))
 >y : Symbol(y, Decl(objectTypeWithCallSignatureAppearsToBeFunctionType.ts, 9, 17))
->i.apply : Symbol(Function.apply, Decl(lib.d.ts, --, --))
+>i.apply : Symbol(Function.apply, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >i : Symbol(i, Decl(objectTypeWithCallSignatureAppearsToBeFunctionType.ts, 7, 3))
->apply : Symbol(Function.apply, Decl(lib.d.ts, --, --))
+>apply : Symbol(Function.apply, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var b: {
 >b : Symbol(b, Decl(objectTypeWithCallSignatureAppearsToBeFunctionType.ts, 11, 3))
@@ -38,7 +38,7 @@ var rb4: (x: any, y?: any) => any = b.apply;
 >rb4 : Symbol(rb4, Decl(objectTypeWithCallSignatureAppearsToBeFunctionType.ts, 16, 3))
 >x : Symbol(x, Decl(objectTypeWithCallSignatureAppearsToBeFunctionType.ts, 16, 10))
 >y : Symbol(y, Decl(objectTypeWithCallSignatureAppearsToBeFunctionType.ts, 16, 17))
->b.apply : Symbol(Function.apply, Decl(lib.d.ts, --, --))
+>b.apply : Symbol(Function.apply, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >b : Symbol(b, Decl(objectTypeWithCallSignatureAppearsToBeFunctionType.ts, 11, 3))
->apply : Symbol(Function.apply, Decl(lib.d.ts, --, --))
+>apply : Symbol(Function.apply, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
diff --git a/tests/baselines/reference/objectTypeWithCallSignatureAppearsToBeFunctionType.types b/tests/baselines/reference/objectTypeWithCallSignatureAppearsToBeFunctionType.types
index 74d8ef57d67..496734c9183 100644
--- a/tests/baselines/reference/objectTypeWithCallSignatureAppearsToBeFunctionType.types
+++ b/tests/baselines/reference/objectTypeWithCallSignatureAppearsToBeFunctionType.types
@@ -21,9 +21,9 @@ var r2b: (x: any, y?: any) => any = i.apply;
 >r2b : (x: any, y?: any) => any
 >x : any
 >y : any
->i.apply : (thisArg: any, argArray?: any) => any
+>i.apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
 >i : I
->apply : (thisArg: any, argArray?: any) => any
+>apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
 
 var b: {
 >b : () => void
@@ -40,7 +40,7 @@ var rb4: (x: any, y?: any) => any = b.apply;
 >rb4 : (x: any, y?: any) => any
 >x : any
 >y : any
->b.apply : (thisArg: any, argArray?: any) => any
+>b.apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
 >b : () => void
->apply : (thisArg: any, argArray?: any) => any
+>apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
 
diff --git a/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfExtendedFunction.symbols b/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfExtendedFunction.symbols
index 2d80be5f4ea..8700c3a042f 100644
--- a/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfExtendedFunction.symbols
+++ b/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfExtendedFunction.symbols
@@ -6,7 +6,7 @@ interface Function {
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(objectTypeWithCallSignatureHidingMembersOfExtendedFunction.ts, 0, 0))
 
     data: number;
->data : Symbol(data, Decl(objectTypeWithCallSignatureHidingMembersOfExtendedFunction.ts, 3, 20))
+>data : Symbol(Function.data, Decl(objectTypeWithCallSignatureHidingMembersOfExtendedFunction.ts, 3, 20))
 
     [x: string]: Object;
 >x : Symbol(x, Decl(objectTypeWithCallSignatureHidingMembersOfExtendedFunction.ts, 5, 5))
@@ -18,12 +18,12 @@ interface I {
 
     (): void;
     apply(a: any, b?: any): void;
->apply : Symbol(apply, Decl(objectTypeWithCallSignatureHidingMembersOfExtendedFunction.ts, 9, 13))
+>apply : Symbol(I.apply, Decl(objectTypeWithCallSignatureHidingMembersOfExtendedFunction.ts, 9, 13))
 >a : Symbol(a, Decl(objectTypeWithCallSignatureHidingMembersOfExtendedFunction.ts, 10, 10))
 >b : Symbol(b, Decl(objectTypeWithCallSignatureHidingMembersOfExtendedFunction.ts, 10, 17))
 
     call(thisArg: number, ...argArray: number[]): any;
->call : Symbol(call, Decl(objectTypeWithCallSignatureHidingMembersOfExtendedFunction.ts, 10, 33))
+>call : Symbol(I.call, Decl(objectTypeWithCallSignatureHidingMembersOfExtendedFunction.ts, 10, 33))
 >thisArg : Symbol(thisArg, Decl(objectTypeWithCallSignatureHidingMembersOfExtendedFunction.ts, 11, 9))
 >argArray : Symbol(argArray, Decl(objectTypeWithCallSignatureHidingMembersOfExtendedFunction.ts, 11, 25))
 }
diff --git a/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunction.symbols b/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunction.symbols
index 07b0ca1a9c1..96cb451f861 100644
--- a/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunction.symbols
+++ b/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfFunction.symbols
@@ -7,12 +7,12 @@ interface I {
 
     (): void;
     apply(a: any, b?: any): void;
->apply : Symbol(apply, Decl(objectTypeWithCallSignatureHidingMembersOfFunction.ts, 4, 13))
+>apply : Symbol(I.apply, Decl(objectTypeWithCallSignatureHidingMembersOfFunction.ts, 4, 13))
 >a : Symbol(a, Decl(objectTypeWithCallSignatureHidingMembersOfFunction.ts, 5, 10))
 >b : Symbol(b, Decl(objectTypeWithCallSignatureHidingMembersOfFunction.ts, 5, 17))
 
     call(thisArg: number, ...argArray: number[]): any;
->call : Symbol(call, Decl(objectTypeWithCallSignatureHidingMembersOfFunction.ts, 5, 33))
+>call : Symbol(I.call, Decl(objectTypeWithCallSignatureHidingMembersOfFunction.ts, 5, 33))
 >thisArg : Symbol(thisArg, Decl(objectTypeWithCallSignatureHidingMembersOfFunction.ts, 6, 9))
 >argArray : Symbol(argArray, Decl(objectTypeWithCallSignatureHidingMembersOfFunction.ts, 6, 25))
 }
diff --git a/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.symbols b/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.symbols
index 009291b0fb3..70175ae0d73 100644
--- a/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.symbols
+++ b/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.symbols
@@ -3,7 +3,7 @@ interface Function {
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.ts, 0, 0))
 
     data: number;
->data : Symbol(data, Decl(objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.ts, 0, 20))
+>data : Symbol(Function.data, Decl(objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.ts, 0, 20))
 
     [x: string]: Object;
 >x : Symbol(x, Decl(objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.ts, 2, 5))
@@ -15,12 +15,12 @@ interface I {
 
     new(): number;
     apply(a: any, b?: any): void;
->apply : Symbol(apply, Decl(objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.ts, 6, 18))
+>apply : Symbol(I.apply, Decl(objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.ts, 6, 18))
 >a : Symbol(a, Decl(objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.ts, 7, 10))
 >b : Symbol(b, Decl(objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.ts, 7, 17))
 
     call(thisArg: number, ...argArray: number[]): any;
->call : Symbol(call, Decl(objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.ts, 7, 33))
+>call : Symbol(I.call, Decl(objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.ts, 7, 33))
 >thisArg : Symbol(thisArg, Decl(objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.ts, 8, 9))
 >argArray : Symbol(argArray, Decl(objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.ts, 8, 25))
 }
diff --git a/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunction.symbols b/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunction.symbols
index c623bcb6f63..9d128975147 100644
--- a/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunction.symbols
+++ b/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfFunction.symbols
@@ -4,12 +4,12 @@ interface I {
 
     new(): number;
     apply(a: any, b?: any): void;
->apply : Symbol(apply, Decl(objectTypeWithConstructSignatureHidingMembersOfFunction.ts, 1, 18))
+>apply : Symbol(I.apply, Decl(objectTypeWithConstructSignatureHidingMembersOfFunction.ts, 1, 18))
 >a : Symbol(a, Decl(objectTypeWithConstructSignatureHidingMembersOfFunction.ts, 2, 10))
 >b : Symbol(b, Decl(objectTypeWithConstructSignatureHidingMembersOfFunction.ts, 2, 17))
 
     call(thisArg: number, ...argArray: number[]): any;
->call : Symbol(call, Decl(objectTypeWithConstructSignatureHidingMembersOfFunction.ts, 2, 33))
+>call : Symbol(I.call, Decl(objectTypeWithConstructSignatureHidingMembersOfFunction.ts, 2, 33))
 >thisArg : Symbol(thisArg, Decl(objectTypeWithConstructSignatureHidingMembersOfFunction.ts, 3, 9))
 >argArray : Symbol(argArray, Decl(objectTypeWithConstructSignatureHidingMembersOfFunction.ts, 3, 25))
 }
diff --git a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.symbols b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.symbols
index d3c463d9a15..a3f316b1bbf 100644
--- a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.symbols
+++ b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.symbols
@@ -15,13 +15,13 @@ class C {
     "1.": string;
     "1..": boolean;
     "1.0": Date;
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     "-1.0": RegExp;
 >RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     "-1": Date;
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
 var c: C;
@@ -121,13 +121,13 @@ interface I {
     "1.": string;
     "1..": boolean;
     "1.0": Date;
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     "-1.0": RegExp;
 >RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     "-1": Date;
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
 var i: I;
@@ -227,13 +227,13 @@ var a: {
     "1.": string;
     "1..": boolean;
     "1.0": Date;
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     "-1.0": RegExp;
 >RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     "-1": Date;
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
 var r1 = a['0.1'];
@@ -329,11 +329,11 @@ var b = {
     "1.": "",
     "1..": true,
     "1.0": new Date(),
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     "-1.0": /123/,
     "-1": Date
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 };
 
diff --git a/tests/baselines/reference/objectTypesIdentity.symbols b/tests/baselines/reference/objectTypesIdentity.symbols
index a39b47acf55..8691978a527 100644
--- a/tests/baselines/reference/objectTypesIdentity.symbols
+++ b/tests/baselines/reference/objectTypesIdentity.symbols
@@ -5,14 +5,14 @@ class A {
 >A : Symbol(A, Decl(objectTypesIdentity.ts, 0, 0))
 
     foo: string;
->foo : Symbol(foo, Decl(objectTypesIdentity.ts, 2, 9))
+>foo : Symbol(A.foo, Decl(objectTypesIdentity.ts, 2, 9))
 }
 
 class B {
 >B : Symbol(B, Decl(objectTypesIdentity.ts, 4, 1))
 
     foo: string;
->foo : Symbol(foo, Decl(objectTypesIdentity.ts, 6, 9))
+>foo : Symbol(B.foo, Decl(objectTypesIdentity.ts, 6, 9))
 }
 
 class C<T> {
@@ -20,7 +20,7 @@ class C<T> {
 >T : Symbol(T, Decl(objectTypesIdentity.ts, 10, 8))
 
     foo: T;
->foo : Symbol(foo, Decl(objectTypesIdentity.ts, 10, 12))
+>foo : Symbol(C.foo, Decl(objectTypesIdentity.ts, 10, 12))
 >T : Symbol(T, Decl(objectTypesIdentity.ts, 10, 8))
 }
 
@@ -28,7 +28,7 @@ interface I {
 >I : Symbol(I, Decl(objectTypesIdentity.ts, 12, 1))
 
     foo: string;
->foo : Symbol(foo, Decl(objectTypesIdentity.ts, 14, 13))
+>foo : Symbol(I.foo, Decl(objectTypesIdentity.ts, 14, 13))
 }
 
 var a: { foo: string; }
diff --git a/tests/baselines/reference/objectTypesIdentity2.symbols b/tests/baselines/reference/objectTypesIdentity2.symbols
index 6db54e5b59a..eb04eaf03c7 100644
--- a/tests/baselines/reference/objectTypesIdentity2.symbols
+++ b/tests/baselines/reference/objectTypesIdentity2.symbols
@@ -5,14 +5,14 @@ class A {
 >A : Symbol(A, Decl(objectTypesIdentity2.ts, 0, 0))
 
     foo: number;
->foo : Symbol(foo, Decl(objectTypesIdentity2.ts, 2, 9))
+>foo : Symbol(A.foo, Decl(objectTypesIdentity2.ts, 2, 9))
 }
 
 class B {
 >B : Symbol(B, Decl(objectTypesIdentity2.ts, 4, 1))
 
     foo: boolean;
->foo : Symbol(foo, Decl(objectTypesIdentity2.ts, 6, 9))
+>foo : Symbol(B.foo, Decl(objectTypesIdentity2.ts, 6, 9))
 }
 
 class C<T> {
@@ -20,7 +20,7 @@ class C<T> {
 >T : Symbol(T, Decl(objectTypesIdentity2.ts, 10, 8))
 
     foo: T;
->foo : Symbol(foo, Decl(objectTypesIdentity2.ts, 10, 12))
+>foo : Symbol(C.foo, Decl(objectTypesIdentity2.ts, 10, 12))
 >T : Symbol(T, Decl(objectTypesIdentity2.ts, 10, 8))
 }
 
@@ -28,8 +28,8 @@ interface I {
 >I : Symbol(I, Decl(objectTypesIdentity2.ts, 12, 1))
 
     foo: Date;
->foo : Symbol(foo, Decl(objectTypesIdentity2.ts, 14, 13))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>foo : Symbol(I.foo, Decl(objectTypesIdentity2.ts, 14, 13))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
 var a: { foo: RegExp; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignatures.symbols b/tests/baselines/reference/objectTypesIdentityWithCallSignatures.symbols
index e1131a019c0..72906bc9880 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignatures.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignatures.symbols
@@ -5,7 +5,7 @@ class A {
 >A : Symbol(A, Decl(objectTypesIdentityWithCallSignatures.ts, 0, 0))
 
     foo(x: string): string { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignatures.ts, 2, 9))
+>foo : Symbol(A.foo, Decl(objectTypesIdentityWithCallSignatures.ts, 2, 9))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignatures.ts, 3, 8))
 }
 
@@ -13,7 +13,7 @@ class B {
 >B : Symbol(B, Decl(objectTypesIdentityWithCallSignatures.ts, 4, 1))
 
     foo(x: string): string { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignatures.ts, 6, 9))
+>foo : Symbol(B.foo, Decl(objectTypesIdentityWithCallSignatures.ts, 6, 9))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignatures.ts, 7, 8))
 }
 
@@ -22,7 +22,7 @@ class C<T> {
 >T : Symbol(T, Decl(objectTypesIdentityWithCallSignatures.ts, 10, 8))
 
     foo(x: T): T { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignatures.ts, 10, 12))
+>foo : Symbol(C.foo, Decl(objectTypesIdentityWithCallSignatures.ts, 10, 12))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignatures.ts, 11, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithCallSignatures.ts, 10, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithCallSignatures.ts, 10, 8))
@@ -32,7 +32,7 @@ interface I {
 >I : Symbol(I, Decl(objectTypesIdentityWithCallSignatures.ts, 12, 1))
 
     foo(x: string): string;
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignatures.ts, 14, 13))
+>foo : Symbol(I.foo, Decl(objectTypesIdentityWithCallSignatures.ts, 14, 13))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignatures.ts, 15, 8))
 }
 
@@ -41,7 +41,7 @@ interface I2<T> {
 >T : Symbol(T, Decl(objectTypesIdentityWithCallSignatures.ts, 18, 13))
 
     foo(x: T): T;
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignatures.ts, 18, 17))
+>foo : Symbol(I2.foo, Decl(objectTypesIdentityWithCallSignatures.ts, 18, 17))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignatures.ts, 19, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithCallSignatures.ts, 18, 13))
 >T : Symbol(T, Decl(objectTypesIdentityWithCallSignatures.ts, 18, 13))
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.symbols b/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.symbols
index 7e081608bc0..fb01ef775c4 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.symbols
@@ -5,7 +5,7 @@ class A {
 >A : Symbol(A, Decl(objectTypesIdentityWithCallSignatures2.ts, 0, 0))
 
     foo(x: string): string { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignatures2.ts, 2, 9))
+>foo : Symbol(A.foo, Decl(objectTypesIdentityWithCallSignatures2.ts, 2, 9))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignatures2.ts, 3, 8))
 }
 
@@ -13,7 +13,7 @@ class B {
 >B : Symbol(B, Decl(objectTypesIdentityWithCallSignatures2.ts, 4, 1))
 
     foo(x: number): string { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignatures2.ts, 6, 9))
+>foo : Symbol(B.foo, Decl(objectTypesIdentityWithCallSignatures2.ts, 6, 9))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignatures2.ts, 7, 8))
 }
 
@@ -22,7 +22,7 @@ class C<T> {
 >T : Symbol(T, Decl(objectTypesIdentityWithCallSignatures2.ts, 10, 8))
 
     foo(x: T): T { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignatures2.ts, 10, 12))
+>foo : Symbol(C.foo, Decl(objectTypesIdentityWithCallSignatures2.ts, 10, 12))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignatures2.ts, 11, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithCallSignatures2.ts, 10, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithCallSignatures2.ts, 10, 8))
@@ -32,7 +32,7 @@ interface I {
 >I : Symbol(I, Decl(objectTypesIdentityWithCallSignatures2.ts, 12, 1))
 
     foo(x: boolean): string;
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignatures2.ts, 14, 13))
+>foo : Symbol(I.foo, Decl(objectTypesIdentityWithCallSignatures2.ts, 14, 13))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignatures2.ts, 15, 8))
 }
 
@@ -41,7 +41,7 @@ interface I2<T> {
 >T : Symbol(T, Decl(objectTypesIdentityWithCallSignatures2.ts, 18, 13))
 
     foo(x: T): T;
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignatures2.ts, 18, 17))
+>foo : Symbol(I2.foo, Decl(objectTypesIdentityWithCallSignatures2.ts, 18, 17))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignatures2.ts, 19, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithCallSignatures2.ts, 18, 13))
 >T : Symbol(T, Decl(objectTypesIdentityWithCallSignatures2.ts, 18, 13))
@@ -51,7 +51,7 @@ var a: { foo(x: Date): string }
 >a : Symbol(a, Decl(objectTypesIdentityWithCallSignatures2.ts, 22, 3))
 >foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignatures2.ts, 22, 8))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignatures2.ts, 22, 13))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var b = { foo(x: RegExp) { return ''; } };
 >b : Symbol(b, Decl(objectTypesIdentityWithCallSignatures2.ts, 23, 3))
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.symbols b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.symbols
index 9341ba35c42..9bf5c16e351 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.symbols
@@ -5,7 +5,7 @@ class A {
 >A : Symbol(A, Decl(objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts, 0, 0))
 
     foo(x: string): string { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts, 2, 9))
+>foo : Symbol(A.foo, Decl(objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts, 2, 9))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts, 3, 8))
 }
 
@@ -13,7 +13,7 @@ class B {
 >B : Symbol(B, Decl(objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts, 4, 1))
 
     foo(x: string, y: string): string { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts, 6, 9))
+>foo : Symbol(B.foo, Decl(objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts, 6, 9))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts, 7, 8))
 >y : Symbol(y, Decl(objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts, 7, 18))
 }
@@ -23,7 +23,7 @@ class C<T> {
 >T : Symbol(T, Decl(objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts, 10, 8))
 
     foo(x: T, y: T): T { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts, 10, 12))
+>foo : Symbol(C.foo, Decl(objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts, 10, 12))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts, 11, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts, 10, 8))
 >y : Symbol(y, Decl(objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts, 11, 13))
@@ -35,7 +35,7 @@ interface I {
 >I : Symbol(I, Decl(objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts, 12, 1))
 
     foo(x: string): string;
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts, 14, 13))
+>foo : Symbol(I.foo, Decl(objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts, 14, 13))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts, 15, 8))
 }
 
@@ -44,7 +44,7 @@ interface I2<T> {
 >T : Symbol(T, Decl(objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts, 18, 13))
 
     foo(x: T): T;
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts, 18, 17))
+>foo : Symbol(I2.foo, Decl(objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts, 18, 17))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts, 19, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts, 18, 13))
 >T : Symbol(T, Decl(objectTypesIdentityWithCallSignaturesDifferingParamCounts.ts, 18, 13))
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.symbols b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.symbols
index 6575c6787fd..81dcabbf47e 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.symbols
@@ -5,15 +5,15 @@ class A {
 >A : Symbol(A, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 0, 0))
 
     foo(x: number): number;
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 2, 9), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 3, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 4, 27))
+>foo : Symbol(A.foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 2, 9), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 3, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 4, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 3, 8))
 
     foo(x: string): string;
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 2, 9), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 3, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 4, 27))
+>foo : Symbol(A.foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 2, 9), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 3, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 4, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 4, 8))
 
     foo(x: any): any { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 2, 9), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 3, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 4, 27))
+>foo : Symbol(A.foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 2, 9), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 3, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 4, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 5, 8))
 }
 
@@ -21,15 +21,15 @@ class B {
 >B : Symbol(B, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 6, 1))
 
     foo(x: number): number;
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 8, 9), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 9, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 10, 27))
+>foo : Symbol(B.foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 8, 9), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 9, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 10, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 9, 8))
 
     foo(x: string): string;
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 8, 9), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 9, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 10, 27))
+>foo : Symbol(B.foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 8, 9), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 9, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 10, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 10, 8))
 
     foo(x: any): any { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 8, 9), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 9, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 10, 27))
+>foo : Symbol(B.foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 8, 9), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 9, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 10, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 11, 8))
 }
 
@@ -38,21 +38,21 @@ class C<T> {
 >T : Symbol(T, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 14, 8))
 
     foo(x: number): number;
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 14, 12), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 15, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 16, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 17, 17))
+>foo : Symbol(C.foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 14, 12), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 15, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 16, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 17, 17))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 15, 8))
 
     foo(x: string): string;
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 14, 12), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 15, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 16, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 17, 17))
+>foo : Symbol(C.foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 14, 12), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 15, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 16, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 17, 17))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 16, 8))
 
     foo(x: T): T;
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 14, 12), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 15, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 16, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 17, 17))
+>foo : Symbol(C.foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 14, 12), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 15, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 16, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 17, 17))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 17, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 14, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 14, 8))
 
     foo(x: any): any { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 14, 12), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 15, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 16, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 17, 17))
+>foo : Symbol(C.foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 14, 12), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 15, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 16, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 17, 17))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 18, 8))
 }
 
@@ -60,11 +60,11 @@ interface I {
 >I : Symbol(I, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 19, 1))
 
     foo(x: number): number;
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 21, 13), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 22, 27))
+>foo : Symbol(I.foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 21, 13), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 22, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 22, 8))
 
     foo(x: string): string;    
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 21, 13), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 22, 27))
+>foo : Symbol(I.foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 21, 13), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 22, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 23, 8))
 }
 
@@ -73,15 +73,15 @@ interface I2<T> {
 >T : Symbol(T, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 26, 13))
 
     foo(x: number): number;
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 26, 17), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 27, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 28, 27))
+>foo : Symbol(I2.foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 26, 17), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 27, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 28, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 27, 8))
 
     foo(x: string): string;
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 26, 17), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 27, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 28, 27))
+>foo : Symbol(I2.foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 26, 17), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 27, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 28, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 28, 8))
 
     foo(x: T): T;
->foo : Symbol(foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 26, 17), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 27, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 28, 27))
+>foo : Symbol(I2.foo, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 26, 17), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 27, 27), Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 28, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 29, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 26, 13))
 >T : Symbol(T, Decl(objectTypesIdentityWithCallSignaturesWithOverloads.ts, 26, 13))
diff --git a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.symbols b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.symbols
index 90ec832873c..64677b63c5f 100644
--- a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.symbols
@@ -37,7 +37,7 @@ interface I2<T> {
 var a: { new(x: Date): string }
 >a : Symbol(a, Decl(objectTypesIdentityWithConstructSignatures2.ts, 18, 3))
 >x : Symbol(x, Decl(objectTypesIdentityWithConstructSignatures2.ts, 18, 13))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var b = { new(x: RegExp) { return ''; } }; // not a construct signature, function called new
 >b : Symbol(b, Decl(objectTypesIdentityWithConstructSignatures2.ts, 19, 3))
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.symbols b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.symbols
index 8fdebdcccbe..42367d7ed38 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.symbols
@@ -5,7 +5,7 @@ class A {
 >A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 0, 0))
 
     foo<T>(x: T): T { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 2, 9))
+>foo : Symbol(A.foo, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 2, 9))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 3, 8))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 3, 11))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 3, 8))
@@ -17,7 +17,7 @@ class B<T> {
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 6, 8))
 
     foo(x: T): T { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 6, 12))
+>foo : Symbol(B.foo, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 6, 12))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 7, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 6, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 6, 8))
@@ -28,7 +28,7 @@ class C<T> {
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 10, 8))
 
     foo(x: T): T { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 10, 12))
+>foo : Symbol(C.foo, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 10, 12))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 11, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 10, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 10, 8))
@@ -39,7 +39,7 @@ interface I<T> {
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 14, 12))
 
     foo(x: T): T;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 14, 16))
+>foo : Symbol(I.foo, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 14, 16))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 15, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 14, 12))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 14, 12))
@@ -49,7 +49,7 @@ interface I2 {
 >I2 : Symbol(I2, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 16, 1))
 
     foo<T>(x: T): T;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 18, 14))
+>foo : Symbol(I2.foo, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 18, 14))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 19, 8))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 19, 11))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignatures.ts, 19, 8))
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.symbols b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.symbols
index 2ca97948a99..a9925925c9e 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.symbols
@@ -5,7 +5,7 @@ class A {
 >A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 0, 0))
 
     foo<T, U>(x: T, y: U): T { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 2, 9))
+>foo : Symbol(A.foo, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 2, 9))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 3, 8))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 3, 10))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 3, 14))
@@ -21,7 +21,7 @@ class B<T, U> {
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 6, 10))
 
     foo(x: T, y: U): T { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 6, 15))
+>foo : Symbol(B.foo, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 6, 15))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 7, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 6, 8))
 >y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 7, 13))
@@ -35,7 +35,7 @@ class C<T, U> {
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 10, 10))
 
     foo(x: T, y: U): T { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 10, 15))
+>foo : Symbol(C.foo, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 10, 15))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 11, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 10, 8))
 >y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 11, 13))
@@ -49,7 +49,7 @@ interface I<T, U> {
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 14, 14))
 
     foo(x: T, y: U): T;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 14, 19))
+>foo : Symbol(I.foo, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 14, 19))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 15, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 14, 12))
 >y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 15, 13))
@@ -61,7 +61,7 @@ interface I2 {
 >I2 : Symbol(I2, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 16, 1))
 
     foo<T, U>(x: T, y: U): T;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 18, 14))
+>foo : Symbol(I2.foo, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 18, 14))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 19, 8))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 19, 10))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignatures2.ts, 19, 14))
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.symbols b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.symbols
index b8432af2425..7d017936a04 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.symbols
@@ -7,9 +7,9 @@ class A {
 >A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 0, 0))
 
     foo<T extends Date>(x: T): string { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 4, 9))
+>foo : Symbol(A.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 4, 9))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 5, 8))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 5, 24))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 5, 8))
 }
@@ -20,7 +20,7 @@ class B<T extends Array<number>> {
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     foo(x: T): string { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 8, 34))
+>foo : Symbol(B.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 8, 34))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 9, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 8, 8))
 }
@@ -28,10 +28,10 @@ class B<T extends Array<number>> {
 class C<T extends String> {
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 10, 1))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 12, 8))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     foo(x: T): string { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 12, 27))
+>foo : Symbol(C.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 12, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 13, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 12, 8))
 }
@@ -39,10 +39,10 @@ class C<T extends String> {
 interface I<T extends Number> {
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 14, 1))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 16, 12))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     foo(x: T): string;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 16, 31))
+>foo : Symbol(I.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 16, 31))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 17, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 16, 12))
 }
@@ -51,7 +51,7 @@ interface I2 {
 >I2 : Symbol(I2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 18, 1))
 
     foo<T extends Boolean>(x: T): string;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 20, 14))
+>foo : Symbol(I2.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 20, 14))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 21, 8))
 >Boolean : Symbol(Boolean, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 21, 27))
@@ -108,13 +108,13 @@ function foo1c(x: C<String>);
 >foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 33, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 35, 29), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 36, 29))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 35, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 10, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo1c(x: C<String>); // error
 >foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 33, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 35, 29), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 36, 29))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 36, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 10, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo1c(x: any) { }
 >foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 33, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 35, 29), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 36, 29))
@@ -124,13 +124,13 @@ function foo2(x: I<Number>);
 >foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 37, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 39, 28), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 40, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 39, 14))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 14, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo2(x: I<Number>); // error
 >foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 37, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 39, 28), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 40, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 40, 14))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 14, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo2(x: any) { }
 >foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 37, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 39, 28), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 40, 28))
@@ -188,7 +188,7 @@ function foo5b(x: C<String>); // ok
 >foo5b : Symbol(foo5b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 53, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 55, 21), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 56, 29))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 56, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 10, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo5b(x: any) { }
 >foo5b : Symbol(foo5b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 53, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 55, 21), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 56, 29))
@@ -203,7 +203,7 @@ function foo6(x: I<Number>); // ok
 >foo6 : Symbol(foo6, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 57, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 59, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 60, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 60, 14))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 14, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo6(x: any) { }
 >foo6 : Symbol(foo6, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 57, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 59, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 60, 28))
@@ -233,7 +233,7 @@ function foo8(x: I<Number>); // ok
 >foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 65, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 67, 35), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 68, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 68, 14))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 14, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo8(x: any) { }
 >foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 65, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 67, 35), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 68, 28))
@@ -249,7 +249,7 @@ function foo9(x: C<String>); // ok
 >foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 69, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 71, 35), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 72, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 72, 14))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 10, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo9(x: any) { }
 >foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 69, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 71, 35), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 72, 28))
@@ -289,13 +289,13 @@ function foo12(x: I<Number>);
 >foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 81, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 83, 29), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 84, 29))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 83, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 14, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo12(x: C<String>); // ok
 >foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 81, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 83, 29), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 84, 29))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 84, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 10, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo12(x: any) { }
 >foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 81, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 83, 29), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 84, 29))
@@ -310,7 +310,7 @@ function foo12b(x: C<String>); // ok
 >foo12b : Symbol(foo12b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 85, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 87, 23), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 88, 30))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 88, 16))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 10, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo12b(x: any) { }
 >foo12b : Symbol(foo12b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 85, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 87, 23), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 88, 30))
@@ -320,7 +320,7 @@ function foo13(x: I<Number>);
 >foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 89, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 91, 29), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 92, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 91, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 14, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo13(x: typeof a); // ok
 >foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 89, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 91, 29), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 92, 28))
@@ -335,7 +335,7 @@ function foo14(x: I<Number>);
 >foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 93, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 95, 29), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 96, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 95, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 14, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo14(x: typeof b); // ok
 >foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 93, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 95, 29), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 96, 28))
@@ -355,7 +355,7 @@ function foo15(x: C<String>); // ok
 >foo15 : Symbol(foo15, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 97, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 99, 22), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 100, 29))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 100, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 10, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo15(x: any) { }
 >foo15 : Symbol(foo15, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 97, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 99, 22), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.ts, 100, 29))
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.symbols b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.symbols
index e8c34a1bf99..e37b606be59 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.symbols
@@ -7,11 +7,11 @@ class A {
 >A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 0, 0))
 
     foo<T extends U, U extends Date>(x: T, y: U): string { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 4, 9))
+>foo : Symbol(A.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 4, 9))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 5, 8))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 5, 20))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 5, 20))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 5, 37))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 5, 8))
 >y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 5, 42))
@@ -26,7 +26,7 @@ class B<T extends U, U extends Array<number>> {
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     foo(x: T, y: U): string { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 8, 47))
+>foo : Symbol(B.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 8, 47))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 9, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 8, 8))
 >y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 9, 13))
@@ -38,10 +38,10 @@ class C<T extends U, U extends String> {
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 12, 8))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 12, 20))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 12, 20))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     foo(x: T, y: U): string { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 12, 40))
+>foo : Symbol(C.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 12, 40))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 13, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 12, 8))
 >y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 13, 13))
@@ -53,10 +53,10 @@ class D<T extends U, U extends Number> {
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 16, 8))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 16, 20))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 16, 20))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     foo(x: T, y: U): string { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 16, 40))
+>foo : Symbol(D.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 16, 40))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 17, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 16, 8))
 >y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 17, 13))
@@ -68,10 +68,10 @@ interface I<T extends U, U extends Number> {
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 20, 12))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 20, 24))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 20, 24))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     foo(x: T, y: U): string;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 20, 44))
+>foo : Symbol(I.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 20, 44))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 21, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 20, 12))
 >y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 21, 13))
@@ -82,7 +82,7 @@ interface I2 {
 >I2 : Symbol(I2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 22, 1))
 
     foo<T extends U, U extends Boolean>(x: T, y: U): string;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 24, 14))
+>foo : Symbol(I2.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 24, 14))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 25, 8))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 25, 20))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 25, 20))
@@ -153,15 +153,15 @@ function foo1c(x: C<String, String>);
 >foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 37, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 39, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 40, 37))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 39, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 10, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo1c(x: C<String, String>); // error
 >foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 37, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 39, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 40, 37))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 40, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 10, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo1c(x: any) { }
 >foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 37, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 39, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 40, 37))
@@ -171,15 +171,15 @@ function foo2(x: I<Number, Number>);
 >foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 41, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 43, 36), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 44, 36))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 43, 14))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 18, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo2(x: I<Number, Number>); // error
 >foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 41, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 43, 36), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 44, 36))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 44, 14))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 18, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo2(x: any) { }
 >foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 41, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 43, 36), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 44, 36))
@@ -238,8 +238,8 @@ function foo5b(x: C<String, String>); // ok
 >foo5b : Symbol(foo5b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 57, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 59, 21), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 60, 37))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 60, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 10, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo5b(x: any) { }
 >foo5b : Symbol(foo5b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 57, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 59, 21), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 60, 37))
@@ -249,15 +249,15 @@ function foo5c(x: C<String, String>);
 >foo5c : Symbol(foo5c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 61, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 63, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 64, 37))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 63, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 10, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo5c(x: D<Number, Number>); // ok
 >foo5c : Symbol(foo5c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 61, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 63, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 64, 37))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 64, 15))
 >D : Symbol(D, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 14, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo5c(x: any) { }
 >foo5c : Symbol(foo5c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 61, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 63, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 64, 37))
@@ -267,14 +267,14 @@ function foo6c(x: C<String, String>);
 >foo6c : Symbol(foo6c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 65, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 67, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 68, 34))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 67, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 10, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo6c(x: D<any, Number>); // error, "any" does not satisfy the constraint
 >foo6c : Symbol(foo6c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 65, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 67, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 68, 34))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 68, 15))
 >D : Symbol(D, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 14, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo6c(x: any) { }
 >foo6c : Symbol(foo6c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 65, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 67, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 68, 34))
@@ -289,8 +289,8 @@ function foo6(x: I<Number, Number>); // ok
 >foo6 : Symbol(foo6, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 69, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 71, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 72, 36))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 72, 14))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 18, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo6(x: any) { }
 >foo6 : Symbol(foo6, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 69, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 71, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 72, 36))
@@ -321,8 +321,8 @@ function foo8(x: I<Number, Number>); // ok
 >foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 77, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 79, 50), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 80, 36))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 80, 14))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 18, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo8(x: any) { }
 >foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 77, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 79, 50), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 80, 36))
@@ -339,8 +339,8 @@ function foo9(x: C<String, String>); // ok
 >foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 81, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 83, 50), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 84, 36))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 84, 14))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 10, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo9(x: any) { }
 >foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 81, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 83, 50), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 84, 36))
@@ -382,15 +382,15 @@ function foo12(x: I<Number, Number>);
 >foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 93, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 95, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 96, 37))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 95, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 18, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo12(x: C<String, String>); // ok
 >foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 93, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 95, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 96, 37))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 96, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 10, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo12(x: any) { }
 >foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 93, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 95, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 96, 37))
@@ -405,8 +405,8 @@ function foo12b(x: C<String, String>); // ok
 >foo12b : Symbol(foo12b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 97, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 99, 23), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 100, 38))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 100, 16))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 10, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo12b(x: any) { }
 >foo12b : Symbol(foo12b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 97, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 99, 23), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 100, 38))
@@ -416,8 +416,8 @@ function foo13(x: I<Number, Number>);
 >foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 101, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 103, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 104, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 103, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 18, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo13(x: typeof a); // ok
 >foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 101, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 103, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 104, 28))
@@ -432,8 +432,8 @@ function foo14(x: I<Number, Number>);
 >foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 105, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 107, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 108, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 107, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 18, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo14(x: typeof b); // ok
 >foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 105, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 107, 37), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 108, 28))
@@ -453,8 +453,8 @@ function foo15(x: C<String, String>); // ok
 >foo15 : Symbol(foo15, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 109, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 111, 22), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 112, 37))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 112, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 10, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo15(x: any) { }
 >foo15 : Symbol(foo15, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 109, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 111, 22), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.ts, 112, 37))
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.symbols b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.symbols
index 6bcbd98f225..c622452a8e1 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.symbols
@@ -5,20 +5,20 @@
 
 class One { foo: string }
 >One : Symbol(One, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 0, 0))
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 4, 11))
+>foo : Symbol(One.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 4, 11))
 
 class Two { foo: string }
 >Two : Symbol(Two, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 4, 25))
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 5, 11))
+>foo : Symbol(Two.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 5, 11))
 
 interface Three { foo: string }
 >Three : Symbol(Three, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 5, 25))
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 6, 17))
+>foo : Symbol(Three.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 6, 17))
 
 interface Four<T> { foo: T }
 >Four : Symbol(Four, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 6, 31))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 7, 15))
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 7, 19))
+>foo : Symbol(Four.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 7, 19))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 7, 15))
 
 interface Five<T> extends Four<T> { }
@@ -33,7 +33,7 @@ interface Six<T, U> {
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 9, 16))
 
     foo: T;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 9, 21))
+>foo : Symbol(Six.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 9, 21))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 9, 14))
 }
 
@@ -41,7 +41,7 @@ class A {
 >A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 11, 1))
 
     foo<T extends U, U extends One>(x: T, y: U): string { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 13, 9))
+>foo : Symbol(A.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 13, 9))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 14, 8))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 14, 20))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 14, 20))
@@ -60,7 +60,7 @@ class B<T extends U, U extends Two> {
 >Two : Symbol(Two, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 4, 25))
 
     foo(x: T, y: U): string { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 17, 37))
+>foo : Symbol(B.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 17, 37))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 18, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 17, 8))
 >y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 18, 13))
@@ -75,7 +75,7 @@ class C<T extends U, U extends Three> {
 >Three : Symbol(Three, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 5, 25))
 
     foo(x: T, y: U): string { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 21, 39))
+>foo : Symbol(C.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 21, 39))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 22, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 21, 8))
 >y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 22, 13))
@@ -90,7 +90,7 @@ class D<T extends U, U extends Four<string>> {
 >Four : Symbol(Four, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 6, 31))
 
     foo(x: T, y: U): string { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 25, 46))
+>foo : Symbol(D.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 25, 46))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 26, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 25, 8))
 >y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 26, 13))
@@ -105,7 +105,7 @@ interface I<T extends U, U extends Five<string>> {
 >Five : Symbol(Five, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 7, 28))
 
     foo(x: T, y: U): string;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 29, 50))
+>foo : Symbol(I.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 29, 50))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 30, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 29, 12))
 >y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 30, 13))
@@ -116,7 +116,7 @@ interface I2 {
 >I2 : Symbol(I2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 31, 1))
 
     foo<T extends U, U extends Six<string, string>>(x: T, y: U): string;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 33, 14))
+>foo : Symbol(I2.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 33, 14))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 34, 8))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 34, 20))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.ts, 34, 20))
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.symbols b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.symbols
index e199d538e4b..a3f4f8038a0 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.symbols
@@ -7,7 +7,7 @@ class A {
 >A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 0, 0))
 
     foo<T>(x: T): string { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 4, 9))
+>foo : Symbol(A.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 4, 9))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 5, 8))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 5, 11))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 5, 8))
@@ -18,7 +18,7 @@ class B<T> {
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 8, 8))
 
     foo(x: T): number { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 8, 12))
+>foo : Symbol(B.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 8, 12))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 9, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 8, 8))
 }
@@ -28,7 +28,7 @@ class C<T> {
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 12, 8))
 
     foo(x: T): boolean { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 12, 12))
+>foo : Symbol(C.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 12, 12))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 13, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 12, 8))
 }
@@ -38,17 +38,17 @@ interface I<T> {
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 16, 12))
 
     foo(x: T): Date;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 16, 16))
+>foo : Symbol(I.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 16, 16))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 17, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 16, 12))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
 interface I2 {
 >I2 : Symbol(I2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 18, 1))
 
     foo<T>(x: T): RegExp;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 20, 14))
+>foo : Symbol(I2.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 20, 14))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 21, 8))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 21, 11))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.ts, 21, 8))
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.symbols b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.symbols
index a0c520ef3fa..d90a4b1d545 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.symbols
@@ -7,9 +7,9 @@ class A {
 >A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 0, 0))
 
     foo<T extends Date>(x: T): string { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 4, 9))
+>foo : Symbol(A.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 4, 9))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 5, 8))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 5, 24))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 5, 8))
 }
@@ -17,10 +17,10 @@ class A {
 class B<T extends Date> {
 >B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 6, 1))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 8, 8))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     foo(x: T): number { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 8, 25))
+>foo : Symbol(B.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 8, 25))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 9, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 8, 8))
 }
@@ -28,10 +28,10 @@ class B<T extends Date> {
 class C<T extends Date> {
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 10, 1))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 12, 8))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     foo(x: T): boolean { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 12, 25))
+>foo : Symbol(C.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 12, 25))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 13, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 12, 8))
 }
@@ -39,22 +39,22 @@ class C<T extends Date> {
 interface I<T extends Date> {
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 14, 1))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 16, 12))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     foo(x: T): Date;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 16, 29))
+>foo : Symbol(I.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 16, 29))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 17, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 16, 12))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
 interface I2 {
 >I2 : Symbol(I2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 18, 1))
 
     foo<T extends Date>(x: T): RegExp;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 20, 14))
+>foo : Symbol(I2.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 20, 14))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 21, 8))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 21, 24))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 21, 8))
 >RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
@@ -64,7 +64,7 @@ var a: { foo<T extends Date>(x: T): T }
 >a : Symbol(a, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 24, 3))
 >foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 24, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 24, 13))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 24, 29))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 24, 13))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 24, 13))
@@ -73,7 +73,7 @@ var b = { foo<T extends Date>(x: T) { return null; } };
 >b : Symbol(b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 25, 3))
 >foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 25, 9))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 25, 14))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 25, 30))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 25, 14))
 
@@ -95,13 +95,13 @@ function foo1b(x: B<Date>);
 >foo1b : Symbol(foo1b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 29, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 31, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 32, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 31, 15))
 >B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 6, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo1b(x: B<Date>); // error
 >foo1b : Symbol(foo1b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 29, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 31, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 32, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 32, 15))
 >B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 6, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo1b(x: any) { }
 >foo1b : Symbol(foo1b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 29, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 31, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 32, 27))
@@ -111,13 +111,13 @@ function foo1c(x: C<Date>);
 >foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 33, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 35, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 36, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 35, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 10, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo1c(x: C<Date>); // error
 >foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 33, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 35, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 36, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 36, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 10, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo1c(x: any) { }
 >foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 33, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 35, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 36, 27))
@@ -127,13 +127,13 @@ function foo2(x: I<Date>);
 >foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 37, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 39, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 40, 26))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 39, 14))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 14, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo2(x: I<Date>); // error
 >foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 37, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 39, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 40, 26))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 40, 14))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 14, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo2(x: any) { }
 >foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 37, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 39, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 40, 26))
@@ -176,7 +176,7 @@ function foo5(x: B<Date>); // ok
 >foo5 : Symbol(foo5, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 49, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 51, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 52, 26))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 52, 14))
 >B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 6, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo5(x: any) { }
 >foo5 : Symbol(foo5, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 49, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 51, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 52, 26))
@@ -191,7 +191,7 @@ function foo5b(x: C<Date>); // ok
 >foo5b : Symbol(foo5b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 53, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 55, 21), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 56, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 56, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 10, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo5b(x: any) { }
 >foo5b : Symbol(foo5b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 53, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 55, 21), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 56, 27))
@@ -206,7 +206,7 @@ function foo6(x: I<Date>); // ok
 >foo6 : Symbol(foo6, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 57, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 59, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 60, 26))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 60, 14))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 14, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo6(x: any) { }
 >foo6 : Symbol(foo6, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 57, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 59, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 60, 26))
@@ -230,13 +230,13 @@ function foo8(x: B<Date>);
 >foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 65, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 67, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 68, 26))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 67, 14))
 >B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 6, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo8(x: I<Date>); // ok
 >foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 65, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 67, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 68, 26))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 68, 14))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 14, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo8(x: any) { }
 >foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 65, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 67, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 68, 26))
@@ -246,13 +246,13 @@ function foo9(x: B<Date>);
 >foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 69, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 71, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 72, 26))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 71, 14))
 >B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 6, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo9(x: C<Date>); // ok
 >foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 69, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 71, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 72, 26))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 72, 14))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 10, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo9(x: any) { }
 >foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 69, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 71, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 72, 26))
@@ -262,7 +262,7 @@ function foo10(x: B<Date>);
 >foo10 : Symbol(foo10, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 73, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 75, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 76, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 75, 15))
 >B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 6, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo10(x: typeof a); // ok
 >foo10 : Symbol(foo10, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 73, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 75, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 76, 28))
@@ -277,7 +277,7 @@ function foo11(x: B<Date>);
 >foo11 : Symbol(foo11, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 77, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 79, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 80, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 79, 15))
 >B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 6, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo11(x: typeof b); // ok
 >foo11 : Symbol(foo11, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 77, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 79, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 80, 28))
@@ -292,13 +292,13 @@ function foo12(x: I<Date>);
 >foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 81, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 83, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 84, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 83, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 14, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo12(x: C<Date>); // ok
 >foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 81, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 83, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 84, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 84, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 10, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo12(x: any) { }
 >foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 81, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 83, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 84, 27))
@@ -313,7 +313,7 @@ function foo12b(x: C<Date>); // ok
 >foo12b : Symbol(foo12b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 85, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 87, 23), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 88, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 88, 16))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 10, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo12b(x: any) { }
 >foo12b : Symbol(foo12b, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 85, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 87, 23), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 88, 28))
@@ -323,7 +323,7 @@ function foo13(x: I<Date>);
 >foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 89, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 91, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 92, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 91, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 14, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo13(x: typeof a); // ok
 >foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 89, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 91, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 92, 28))
@@ -338,7 +338,7 @@ function foo14(x: I<Date>);
 >foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 93, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 95, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 96, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 95, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 14, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo14(x: typeof b); // ok
 >foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 93, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 95, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 96, 28))
@@ -358,7 +358,7 @@ function foo15(x: C<Date>); // ok
 >foo15 : Symbol(foo15, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 97, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 99, 22), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 100, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 100, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 10, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo15(x: any) { }
 >foo15 : Symbol(foo15, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 97, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 99, 22), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.ts, 100, 27))
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.symbols b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.symbols
index a4760572e7d..748c945d8d0 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.symbols
@@ -5,7 +5,7 @@ class A {
 >A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 0, 0))
 
     foo<T>(x: T): T { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 2, 9))
+>foo : Symbol(A.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 2, 9))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 3, 8))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 3, 11))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 3, 8))
@@ -18,7 +18,7 @@ class B<U, V> {
 >V : Symbol(V, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 6, 10))
 
     foo(x: U): U { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 6, 15))
+>foo : Symbol(B.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 6, 15))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 7, 8))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 6, 8))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 6, 8))
@@ -31,7 +31,7 @@ class C<V, W, X> {
 >X : Symbol(X, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 10, 13))
 
     foo(x: V): V { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 10, 18))
+>foo : Symbol(C.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 10, 18))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 11, 8))
 >V : Symbol(V, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 10, 8))
 >V : Symbol(V, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 10, 8))
@@ -45,7 +45,7 @@ interface I<X, Y, Z, A> {
 >A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 14, 20))
 
     foo(x: X): X;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 14, 25))
+>foo : Symbol(I.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 14, 25))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 15, 8))
 >X : Symbol(X, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 14, 12))
 >X : Symbol(X, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 14, 12))
@@ -55,7 +55,7 @@ interface I2 {
 >I2 : Symbol(I2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 16, 1))
 
     foo<Y, Z, A, B>(x: Y): Y;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 18, 14))
+>foo : Symbol(I2.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 18, 14))
 >Y : Symbol(Y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 19, 8))
 >Z : Symbol(Z, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 19, 10))
 >A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 19, 13))
@@ -211,7 +211,7 @@ function foo6(x: I<string, number, boolean, Date>); // ok
 >foo6 : Symbol(foo6, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 55, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 57, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 58, 51))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 58, 14))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 12, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo6(x: any) { }
 >foo6 : Symbol(foo6, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 55, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 57, 20), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 58, 51))
@@ -240,7 +240,7 @@ function foo8(x: I<string, string, boolean, Date>); // error
 >foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 63, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 65, 36), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 66, 51))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 66, 14))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 12, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo8(x: any) { }
 >foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 63, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 65, 36), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 66, 51))
@@ -294,14 +294,14 @@ function foo12(x: I<B<string, number>, number, Date, string>);
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 81, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 12, 1))
 >B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 4, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo12(x: C<B<string, number>, number, Date>); // error
 >foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 79, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 81, 62), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 82, 54))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 82, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 8, 1))
 >B : Symbol(B, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 4, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo12(x: any) { }
 >foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 79, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 81, 62), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 82, 54))
@@ -325,9 +325,9 @@ function foo13(x: I<string, Date, RegExp, Date>);
 >foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 87, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 89, 49), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 90, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 89, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 12, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo13(x: typeof a); // ok
 >foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 87, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 89, 49), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 90, 28))
@@ -342,7 +342,7 @@ function foo14(x: I<string, Date, RegExp, boolean>);
 >foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 91, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 93, 52), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 94, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 93, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.ts, 12, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo14(x: typeof b); // ok
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.symbols b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.symbols
index d1f87946de5..a69ddbe5647 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.symbols
@@ -85,7 +85,7 @@ function foo13(x: I<boolean, string, number, Date>);
 >foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts, 23, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts, 25, 52), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts, 26, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts, 25, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts, 0, 0))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo13(x: typeof a); // ok
 >foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts, 23, 25), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts, 25, 52), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts, 26, 28))
@@ -100,7 +100,7 @@ function foo14(x: I<boolean, string, number, Date>);
 >foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts, 27, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts, 29, 52), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts, 30, 22))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts, 29, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts, 0, 0))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo14(x: I2); // error
 >foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts, 27, 26), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts, 29, 52), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts, 30, 22))
@@ -129,7 +129,7 @@ function foo15(x: I<boolean, string, number, Date>);
 >foo15 : Symbol(foo15, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts, 35, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts, 37, 52), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts, 38, 22))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts, 37, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts, 0, 0))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo15(x: I2); // ok
 >foo15 : Symbol(foo15, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts, 35, 27), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts, 37, 52), Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.ts, 38, 22))
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.symbols b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.symbols
index 94e6aaf0139..851388a4604 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.symbols
@@ -5,7 +5,7 @@ class A {
 >A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 0, 0))
 
     foo<T>(x: T): T { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 2, 9))
+>foo : Symbol(A.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 2, 9))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 3, 8))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 3, 11))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 3, 8))
@@ -17,7 +17,7 @@ class B<U> {
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 6, 8))
 
     foo(x: U): U { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 6, 12))
+>foo : Symbol(B.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 6, 12))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 7, 8))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 6, 8))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 6, 8))
@@ -28,7 +28,7 @@ class C<V> {
 >V : Symbol(V, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 10, 8))
 
     foo(x: V): V { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 10, 12))
+>foo : Symbol(C.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 10, 12))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 11, 8))
 >V : Symbol(V, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 10, 8))
 >V : Symbol(V, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 10, 8))
@@ -39,7 +39,7 @@ interface I<X> {
 >X : Symbol(X, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 14, 12))
 
     foo(x: X): X;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 14, 16))
+>foo : Symbol(I.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 14, 16))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 15, 8))
 >X : Symbol(X, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 14, 12))
 >X : Symbol(X, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 14, 12))
@@ -49,7 +49,7 @@ interface I2 {
 >I2 : Symbol(I2, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 16, 1))
 
     foo<Y>(x: Y): Y;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 18, 14))
+>foo : Symbol(I2.foo, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 18, 14))
 >Y : Symbol(Y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 19, 8))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 19, 11))
 >Y : Symbol(Y, Decl(objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.ts, 19, 8))
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.symbols b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.symbols
index 0bb008d82be..9edbcf9e6ad 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.symbols
@@ -7,7 +7,7 @@ class A {
 >A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 0, 0))
 
     foo<T>(x: T, y?: T): T { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 4, 9))
+>foo : Symbol(A.foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 4, 9))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 5, 8))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 5, 11))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 5, 8))
@@ -21,7 +21,7 @@ class B<T> {
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 8, 8))
 
     foo(x: T, y?: T): T { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 8, 12))
+>foo : Symbol(B.foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 8, 12))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 9, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 8, 8))
 >y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 9, 13))
@@ -34,7 +34,7 @@ class C<T> {
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 12, 8))
 
     foo(x: T, y?: T): T { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 12, 12))
+>foo : Symbol(C.foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 12, 12))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 13, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 12, 8))
 >y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 13, 13))
@@ -47,7 +47,7 @@ interface I<T> {
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 16, 12))
 
     foo(x: T, y?: T): T;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 16, 16))
+>foo : Symbol(I.foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 16, 16))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 17, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 16, 12))
 >y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 17, 13))
@@ -59,7 +59,7 @@ interface I2 {
 >I2 : Symbol(I2, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 18, 1))
 
     foo<T>(x: T, y?: T): T;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 20, 14))
+>foo : Symbol(I2.foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 20, 14))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 21, 8))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 21, 11))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams.ts, 21, 8))
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.symbols b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.symbols
index 8878d73f576..9fcac2f65ed 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.symbols
@@ -7,7 +7,7 @@ class A {
 >A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 0, 0))
 
     foo<T, U>(x: T, y?: U): T { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 4, 9))
+>foo : Symbol(A.foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 4, 9))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 5, 8))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 5, 10))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 5, 14))
@@ -23,7 +23,7 @@ class B<T, U> {
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 8, 10))
 
     foo(x: T, y?: U): T { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 8, 15))
+>foo : Symbol(B.foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 8, 15))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 9, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 8, 8))
 >y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 9, 13))
@@ -37,7 +37,7 @@ class C<T, U> {
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 12, 10))
 
     foo(x: T, y?: U): T { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 12, 15))
+>foo : Symbol(C.foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 12, 15))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 13, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 12, 8))
 >y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 13, 13))
@@ -51,7 +51,7 @@ interface I<T, U> {
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 16, 14))
 
     foo(x: T, y?: U): T;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 16, 19))
+>foo : Symbol(I.foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 16, 19))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 17, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 16, 12))
 >y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 17, 13))
@@ -63,7 +63,7 @@ interface I2 {
 >I2 : Symbol(I2, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 18, 1))
 
     foo<T, U>(x: T, y?: U): T;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 20, 14))
+>foo : Symbol(I2.foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 20, 14))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 21, 8))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 21, 10))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams2.ts, 21, 14))
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.symbols b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.symbols
index b1cfab012bf..ff215bfbe58 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.symbols
@@ -7,7 +7,7 @@ class A {
 >A : Symbol(A, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 0, 0))
 
     foo<T, U>(x: T, y?: U): T { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 4, 9))
+>foo : Symbol(A.foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 4, 9))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 5, 8))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 5, 10))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 5, 14))
@@ -23,7 +23,7 @@ class B<T, U> {
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 8, 10))
 
     foo(x: T, y: U): T { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 8, 15))
+>foo : Symbol(B.foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 8, 15))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 9, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 8, 8))
 >y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 9, 13))
@@ -37,7 +37,7 @@ class C<T, U> {
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 12, 10))
 
     foo(x: T, y?: U): T { return null; }
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 12, 15))
+>foo : Symbol(C.foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 12, 15))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 13, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 12, 8))
 >y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 13, 13))
@@ -51,7 +51,7 @@ interface I<T, U> {
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 16, 14))
 
     foo(x: T, y?: U): T;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 16, 19))
+>foo : Symbol(I.foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 16, 19))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 17, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 16, 12))
 >y : Symbol(y, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 17, 13))
@@ -63,7 +63,7 @@ interface I2 {
 >I2 : Symbol(I2, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 18, 1))
 
     foo<T, U>(x: T, y: U): T;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 20, 14))
+>foo : Symbol(I2.foo, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 20, 14))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 21, 8))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 21, 10))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericCallSignaturesOptionalParams3.ts, 21, 14))
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.symbols b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.symbols
index fb3fba82cb2..c95d5234ac5 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.symbols
@@ -16,7 +16,7 @@ class B<T extends Array<number>> {
 class C<T extends String> {
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 6, 1))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 8, 8))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     constructor(x: T) { return null; }
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 9, 16))
@@ -26,7 +26,7 @@ class C<T extends String> {
 interface I<T extends Number> {
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 10, 1))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 12, 12))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     new(x: T): string;
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 13, 8))
@@ -78,13 +78,13 @@ function foo1c(x: C<String>);
 >foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 25, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 27, 29), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 28, 29))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 27, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 6, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo1c(x: C<String>); // error
 >foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 25, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 27, 29), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 28, 29))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 28, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 6, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo1c(x: any) { }
 >foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 25, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 27, 29), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 28, 29))
@@ -94,13 +94,13 @@ function foo2(x: I<Number>);
 >foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 29, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 31, 28), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 32, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 31, 14))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 10, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo2(x: I<Number>); // error
 >foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 29, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 31, 28), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 32, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 32, 14))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 10, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo2(x: any) { }
 >foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 29, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 31, 28), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 32, 28))
@@ -144,7 +144,7 @@ function foo8(x: I<Number>); // ok
 >foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 41, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 43, 35), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 44, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 44, 14))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 10, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo8(x: any) { }
 >foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 41, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 43, 35), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 44, 28))
@@ -160,7 +160,7 @@ function foo9(x: C<String>); // error, types are structurally equal
 >foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 45, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 47, 35), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 48, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 48, 14))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 6, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo9(x: any) { }
 >foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 45, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 47, 35), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 48, 28))
@@ -200,13 +200,13 @@ function foo12(x: I<Number>);
 >foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 57, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 59, 29), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 60, 29))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 59, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 10, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo12(x: C<String>); // ok
 >foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 57, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 59, 29), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 60, 29))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 60, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 6, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo12(x: any) { }
 >foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 57, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 59, 29), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 60, 29))
@@ -221,7 +221,7 @@ function foo12b(x: C<String>); // ok
 >foo12b : Symbol(foo12b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 61, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 63, 23), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 64, 30))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 64, 16))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 6, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo12b(x: any) { }
 >foo12b : Symbol(foo12b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 61, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 63, 23), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 64, 30))
@@ -231,7 +231,7 @@ function foo13(x: I<Number>);
 >foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 65, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 67, 29), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 68, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 67, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 10, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo13(x: typeof a); // ok
 >foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 65, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 67, 29), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 68, 28))
@@ -246,7 +246,7 @@ function foo14(x: I<Number>);
 >foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 69, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 71, 29), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 72, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 71, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 10, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo14(x: typeof b); // ok
 >foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 69, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 71, 29), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.ts, 72, 28))
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.symbols b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.symbols
index ce55a114621..8d82f4ea140 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.symbols
@@ -22,7 +22,7 @@ class C<T extends U, U extends String> {
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 8, 8))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 8, 20))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 8, 20))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     constructor(x: T, y: U) { return null; }
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 9, 16))
@@ -36,7 +36,7 @@ class D<T extends U, U extends Number> {
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 12, 8))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 12, 20))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 12, 20))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     constructor(x: T, y: U) { return null; }
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 13, 16))
@@ -50,7 +50,7 @@ interface I<T extends U, U extends Number> {
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 16, 12))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 16, 24))
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 16, 24))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     new(x: T, y: U): string;
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 17, 8))
@@ -118,15 +118,15 @@ function foo1c(x: C<String, String>);
 >foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 29, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 31, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 32, 37))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 31, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 6, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo1c(x: C<String, String>); // error
 >foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 29, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 31, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 32, 37))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 32, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 6, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo1c(x: any) { }
 >foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 29, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 31, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 32, 37))
@@ -136,15 +136,15 @@ function foo2(x: I<Number, Number>);
 >foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 33, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 35, 36), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 36, 36))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 35, 14))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 14, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo2(x: I<Number, Number>); // error
 >foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 33, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 35, 36), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 36, 36))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 36, 14))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 14, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo2(x: any) { }
 >foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 33, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 35, 36), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 36, 36))
@@ -182,15 +182,15 @@ function foo5c(x: C<String, String>);
 >foo5c : Symbol(foo5c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 45, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 47, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 48, 37))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 47, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 6, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo5c(x: D<Number, Number>); // ok
 >foo5c : Symbol(foo5c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 45, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 47, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 48, 37))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 48, 15))
 >D : Symbol(D, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 10, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo5c(x: any) { }
 >foo5c : Symbol(foo5c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 45, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 47, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 48, 37))
@@ -200,14 +200,14 @@ function foo6c(x: C<String, String>);
 >foo6c : Symbol(foo6c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 49, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 51, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 52, 34))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 51, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 6, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo6c(x: D<any, Number>); // ok
 >foo6c : Symbol(foo6c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 49, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 51, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 52, 34))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 52, 15))
 >D : Symbol(D, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 10, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo6c(x: any) { }
 >foo6c : Symbol(foo6c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 49, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 51, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 52, 34))
@@ -224,8 +224,8 @@ function foo8(x: I<Number, Number>); // ok
 >foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 53, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 55, 50), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 56, 36))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 56, 14))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 14, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo8(x: any) { }
 >foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 53, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 55, 50), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 56, 36))
@@ -242,8 +242,8 @@ function foo9(x: C<String, String>); // error, types are structurally equal
 >foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 57, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 59, 50), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 60, 36))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 60, 14))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 6, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo9(x: any) { }
 >foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 57, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 59, 50), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 60, 36))
@@ -285,15 +285,15 @@ function foo12(x: I<Number, Number>);
 >foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 69, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 71, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 72, 37))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 71, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 14, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo12(x: C<String, String>); // ok
 >foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 69, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 71, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 72, 37))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 72, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 6, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo12(x: any) { }
 >foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 69, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 71, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 72, 37))
@@ -308,8 +308,8 @@ function foo12b(x: C<String, String>); // ok
 >foo12b : Symbol(foo12b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 73, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 75, 23), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 76, 38))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 76, 16))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 6, 1))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo12b(x: any) { }
 >foo12b : Symbol(foo12b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 73, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 75, 23), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 76, 38))
@@ -319,8 +319,8 @@ function foo13(x: I<Number, Number>);
 >foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 77, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 79, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 80, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 79, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 14, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo13(x: typeof a); // ok
 >foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 77, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 79, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 80, 28))
@@ -335,8 +335,8 @@ function foo14(x: I<Number, Number>);
 >foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 81, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 83, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 84, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 83, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 14, 1))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo14(x: typeof b); // ok
 >foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 81, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 83, 37), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.ts, 84, 28))
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.symbols b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.symbols
index 4d7adc798f9..ffd5363f030 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.symbols
@@ -5,20 +5,20 @@
 
 class One { foo: string }
 >One : Symbol(One, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 0, 0))
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 4, 11))
+>foo : Symbol(One.foo, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 4, 11))
 
 class Two { foo: string }
 >Two : Symbol(Two, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 4, 25))
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 5, 11))
+>foo : Symbol(Two.foo, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 5, 11))
 
 interface Three { foo: string }
 >Three : Symbol(Three, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 5, 25))
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 6, 17))
+>foo : Symbol(Three.foo, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 6, 17))
 
 interface Four<T> { foo: T }
 >Four : Symbol(Four, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 6, 31))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 7, 15))
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 7, 19))
+>foo : Symbol(Four.foo, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 7, 19))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 7, 15))
 
 interface Five<T> extends Four<T> { }
@@ -33,7 +33,7 @@ interface Six<T, U> {
 >U : Symbol(U, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 9, 16))
 
     foo: T;
->foo : Symbol(foo, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 9, 21))
+>foo : Symbol(Six.foo, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 9, 21))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.ts, 9, 14))
 }
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.symbols b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.symbols
index 422b5820a8b..418ed27a99d 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.symbols
@@ -28,7 +28,7 @@ interface I<T> {
     new(x: T): Date;
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.ts, 13, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.ts, 12, 12))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
 interface I2 {
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.symbols b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.symbols
index e44493e933b..23702ebab68 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.symbols
@@ -6,7 +6,7 @@
 class B<T extends Date> {
 >B : Symbol(B, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 0, 0))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 4, 8))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     constructor(x: T) { return null; }
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 5, 16))
@@ -16,7 +16,7 @@ class B<T extends Date> {
 class C<T extends Date> {
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 6, 1))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 8, 8))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     constructor(x: T) { return null; }
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 9, 16))
@@ -26,12 +26,12 @@ class C<T extends Date> {
 interface I<T extends Date> {
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 10, 1))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 12, 12))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     new(x: T): Date;
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 13, 8))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 12, 12))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
 interface I2 {
@@ -39,7 +39,7 @@ interface I2 {
 
     new<T extends Date>(x: T): RegExp;
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 17, 8))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 17, 24))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 17, 8))
 >RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
@@ -48,7 +48,7 @@ interface I2 {
 var a: { new<T extends Date>(x: T): T }
 >a : Symbol(a, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 20, 3))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 20, 13))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 20, 29))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 20, 13))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 20, 13))
@@ -57,7 +57,7 @@ var b = { new<T extends Date>(x: T) { return null; } }; // not a construct signa
 >b : Symbol(b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 21, 3))
 >new : Symbol(new, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 21, 9))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 21, 14))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 21, 30))
 >T : Symbol(T, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 21, 14))
 
@@ -65,13 +65,13 @@ function foo1b(x: B<Date>);
 >foo1b : Symbol(foo1b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 21, 55), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 23, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 24, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 23, 15))
 >B : Symbol(B, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 0, 0))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo1b(x: B<Date>); // error
 >foo1b : Symbol(foo1b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 21, 55), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 23, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 24, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 24, 15))
 >B : Symbol(B, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 0, 0))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo1b(x: any) { }
 >foo1b : Symbol(foo1b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 21, 55), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 23, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 24, 27))
@@ -81,13 +81,13 @@ function foo1c(x: C<Date>);
 >foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 25, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 27, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 28, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 27, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 6, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo1c(x: C<Date>); // error
 >foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 25, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 27, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 28, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 28, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 6, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo1c(x: any) { }
 >foo1c : Symbol(foo1c, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 25, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 27, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 28, 27))
@@ -97,13 +97,13 @@ function foo2(x: I<Date>);
 >foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 29, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 31, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 32, 26))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 31, 14))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 10, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo2(x: I<Date>); // error
 >foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 29, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 31, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 32, 26))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 32, 14))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 10, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo2(x: any) { }
 >foo2 : Symbol(foo2, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 29, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 31, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 32, 26))
@@ -141,13 +141,13 @@ function foo8(x: B<Date>);
 >foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 41, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 43, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 44, 26))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 43, 14))
 >B : Symbol(B, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 0, 0))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo8(x: I<Date>); // ok
 >foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 41, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 43, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 44, 26))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 44, 14))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 10, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo8(x: any) { }
 >foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 41, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 43, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 44, 26))
@@ -157,13 +157,13 @@ function foo9(x: B<Date>);
 >foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 45, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 47, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 48, 26))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 47, 14))
 >B : Symbol(B, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 0, 0))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo9(x: C<Date>); // error since types are structurally equal
 >foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 45, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 47, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 48, 26))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 48, 14))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 6, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo9(x: any) { }
 >foo9 : Symbol(foo9, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 45, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 47, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 48, 26))
@@ -173,7 +173,7 @@ function foo10(x: B<Date>);
 >foo10 : Symbol(foo10, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 49, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 51, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 52, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 51, 15))
 >B : Symbol(B, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 0, 0))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo10(x: typeof a); // ok
 >foo10 : Symbol(foo10, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 49, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 51, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 52, 28))
@@ -188,7 +188,7 @@ function foo11(x: B<Date>);
 >foo11 : Symbol(foo11, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 53, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 55, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 56, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 55, 15))
 >B : Symbol(B, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 0, 0))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo11(x: typeof b); // ok
 >foo11 : Symbol(foo11, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 53, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 55, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 56, 28))
@@ -203,13 +203,13 @@ function foo12(x: I<Date>);
 >foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 57, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 59, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 60, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 59, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 10, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo12(x: C<Date>); // ok
 >foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 57, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 59, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 60, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 60, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 6, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo12(x: any) { }
 >foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 57, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 59, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 60, 27))
@@ -224,7 +224,7 @@ function foo12b(x: C<Date>); // ok
 >foo12b : Symbol(foo12b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 61, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 63, 23), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 64, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 64, 16))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 6, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo12b(x: any) { }
 >foo12b : Symbol(foo12b, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 61, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 63, 23), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 64, 28))
@@ -234,7 +234,7 @@ function foo13(x: I<Date>);
 >foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 65, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 67, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 68, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 67, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 10, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo13(x: typeof a); // ok
 >foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 65, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 67, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 68, 28))
@@ -249,7 +249,7 @@ function foo14(x: I<Date>);
 >foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 69, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 71, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 72, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 71, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 10, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo14(x: typeof b); // ok
 >foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 69, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 71, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 72, 28))
@@ -269,7 +269,7 @@ function foo15(x: C<Date>); // ok
 >foo15 : Symbol(foo15, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 73, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 75, 22), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 76, 27))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 76, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 6, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo15(x: any) { }
 >foo15 : Symbol(foo15, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 73, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 75, 22), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.ts, 76, 27))
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.symbols b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.symbols
index 48f28e40b8a..e03c24b2ce5 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.symbols
@@ -159,7 +159,7 @@ function foo8(x: I<string, string, boolean, Date>); // BUG 832086
 >foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 39, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 41, 36), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 42, 51))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 42, 14))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 8, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo8(x: any) { }
 >foo8 : Symbol(foo8, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 39, 25), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 41, 36), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 42, 51))
@@ -213,14 +213,14 @@ function foo12(x: I<B<string, number>, number, Date, string>);
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 57, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 8, 1))
 >B : Symbol(B, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 0, 0))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo12(x: C<B<string, number>, number, Date>); // ok
 >foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 55, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 57, 62), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 58, 54))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 58, 15))
 >C : Symbol(C, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 4, 1))
 >B : Symbol(B, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 0, 0))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo12(x: any) { }
 >foo12 : Symbol(foo12, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 55, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 57, 62), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 58, 54))
@@ -244,9 +244,9 @@ function foo13(x: I<string, Date, RegExp, Date>);
 >foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 63, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 65, 49), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 66, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 65, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 8, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo13(x: typeof a); // ok
 >foo13 : Symbol(foo13, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 63, 27), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 65, 49), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 66, 28))
@@ -261,7 +261,7 @@ function foo14(x: I<string, Date, RegExp, boolean>);
 >foo14 : Symbol(foo14, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 67, 26), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 69, 52), Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 70, 28))
 >x : Symbol(x, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 69, 15))
 >I : Symbol(I, Decl(objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.ts, 8, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function foo14(x: typeof b); // ok
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types
index 2284d06ffbd..c5de5c7b9b4 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types
@@ -50,7 +50,7 @@ var a: {
 var b: { [x: number]: string; } = { foo: '' };
 >b : { [x: number]: string; }
 >x : number
->{ foo: '' } : { [x: number]: undefined; foo: string; }
+>{ foo: '' } : { foo: string; }
 >foo : string
 >'' : string
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.symbols b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.symbols
index 375fff858fb..5fde90941ef 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.symbols
@@ -3,12 +3,12 @@
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(objectTypesIdentityWithNumericIndexers2.ts, 0, 0))
->foo : Symbol(foo, Decl(objectTypesIdentityWithNumericIndexers2.ts, 2, 12))
+>foo : Symbol(Base.foo, Decl(objectTypesIdentityWithNumericIndexers2.ts, 2, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(objectTypesIdentityWithNumericIndexers2.ts, 2, 27))
 >Base : Symbol(Base, Decl(objectTypesIdentityWithNumericIndexers2.ts, 0, 0))
->bar : Symbol(bar, Decl(objectTypesIdentityWithNumericIndexers2.ts, 3, 28))
+>bar : Symbol(Derived.bar, Decl(objectTypesIdentityWithNumericIndexers2.ts, 3, 28))
 
 class A {
 >A : Symbol(A, Decl(objectTypesIdentityWithNumericIndexers2.ts, 3, 43))
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types
index 1a580297b1b..17fc6a07a00 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types
@@ -64,7 +64,7 @@ var b: { [x: number]: Derived; } = { foo: <Derived>null };
 >b : { [x: number]: Derived; }
 >x : number
 >Derived : Derived
->{ foo: <Derived>null } : { [x: number]: undefined; foo: Derived; }
+>{ foo: <Derived>null } : { foo: Derived; }
 >foo : Derived
 ><Derived>null : Derived
 >Derived : Derived
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types
index ae384bbb4db..99e6b8c8632 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types
@@ -50,7 +50,7 @@ var a: {
 var b: { [x: number]: string; } = { foo: '' };
 >b : { [x: number]: string; }
 >x : number
->{ foo: '' } : { [x: number]: undefined; foo: string; }
+>{ foo: '' } : { foo: string; }
 >foo : string
 >'' : string
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithOptionality.symbols b/tests/baselines/reference/objectTypesIdentityWithOptionality.symbols
index 595295418f5..90a69d7bb7a 100644
--- a/tests/baselines/reference/objectTypesIdentityWithOptionality.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithOptionality.symbols
@@ -5,14 +5,14 @@ class A {
 >A : Symbol(A, Decl(objectTypesIdentityWithOptionality.ts, 0, 0))
 
     foo: string;
->foo : Symbol(foo, Decl(objectTypesIdentityWithOptionality.ts, 2, 9))
+>foo : Symbol(A.foo, Decl(objectTypesIdentityWithOptionality.ts, 2, 9))
 }
 
 class B {
 >B : Symbol(B, Decl(objectTypesIdentityWithOptionality.ts, 4, 1))
 
     foo: string;
->foo : Symbol(foo, Decl(objectTypesIdentityWithOptionality.ts, 6, 9))
+>foo : Symbol(B.foo, Decl(objectTypesIdentityWithOptionality.ts, 6, 9))
 }
 
 class C<T> {
@@ -20,7 +20,7 @@ class C<T> {
 >T : Symbol(T, Decl(objectTypesIdentityWithOptionality.ts, 10, 8))
 
     foo: T;
->foo : Symbol(foo, Decl(objectTypesIdentityWithOptionality.ts, 10, 12))
+>foo : Symbol(C.foo, Decl(objectTypesIdentityWithOptionality.ts, 10, 12))
 >T : Symbol(T, Decl(objectTypesIdentityWithOptionality.ts, 10, 8))
 }
 
@@ -28,7 +28,7 @@ interface I {
 >I : Symbol(I, Decl(objectTypesIdentityWithOptionality.ts, 12, 1))
 
     foo?: string;
->foo : Symbol(foo, Decl(objectTypesIdentityWithOptionality.ts, 14, 13))
+>foo : Symbol(I.foo, Decl(objectTypesIdentityWithOptionality.ts, 14, 13))
 }
 
 var a: { foo?: string; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates.symbols b/tests/baselines/reference/objectTypesIdentityWithPrivates.symbols
index d7680f7fb91..c6cd57f9930 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates.symbols
@@ -5,14 +5,14 @@ class A {
 >A : Symbol(A, Decl(objectTypesIdentityWithPrivates.ts, 0, 0))
 
     private foo: string;
->foo : Symbol(foo, Decl(objectTypesIdentityWithPrivates.ts, 2, 9))
+>foo : Symbol(A.foo, Decl(objectTypesIdentityWithPrivates.ts, 2, 9))
 }
 
 class B {
 >B : Symbol(B, Decl(objectTypesIdentityWithPrivates.ts, 4, 1))
 
     private foo: string;
->foo : Symbol(foo, Decl(objectTypesIdentityWithPrivates.ts, 6, 9))
+>foo : Symbol(B.foo, Decl(objectTypesIdentityWithPrivates.ts, 6, 9))
 }
 
 class C<T> {
@@ -20,7 +20,7 @@ class C<T> {
 >T : Symbol(T, Decl(objectTypesIdentityWithPrivates.ts, 10, 8))
 
     private foo: T;
->foo : Symbol(foo, Decl(objectTypesIdentityWithPrivates.ts, 10, 12))
+>foo : Symbol(C.foo, Decl(objectTypesIdentityWithPrivates.ts, 10, 12))
 >T : Symbol(T, Decl(objectTypesIdentityWithPrivates.ts, 10, 8))
 }
 
@@ -28,7 +28,7 @@ interface I {
 >I : Symbol(I, Decl(objectTypesIdentityWithPrivates.ts, 12, 1))
 
     foo: string;
->foo : Symbol(foo, Decl(objectTypesIdentityWithPrivates.ts, 14, 13))
+>foo : Symbol(I.foo, Decl(objectTypesIdentityWithPrivates.ts, 14, 13))
 }
 
 class PA extends A {
diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates2.symbols b/tests/baselines/reference/objectTypesIdentityWithPrivates2.symbols
index 1a33946229e..ddd75660ad8 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates2.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates2.symbols
@@ -6,7 +6,7 @@ class C<T> {
 >T : Symbol(T, Decl(objectTypesIdentityWithPrivates2.ts, 2, 8))
 
     private foo: T;
->foo : Symbol(foo, Decl(objectTypesIdentityWithPrivates2.ts, 2, 12))
+>foo : Symbol(C.foo, Decl(objectTypesIdentityWithPrivates2.ts, 2, 12))
 >T : Symbol(T, Decl(objectTypesIdentityWithPrivates2.ts, 2, 8))
 }
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates3.errors.txt b/tests/baselines/reference/objectTypesIdentityWithPrivates3.errors.txt
index 9cbaa730022..2342065605b 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates3.errors.txt
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates3.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates3.ts(25,1): error TS2352: Neither type 'C3<T2>' nor type 'C4' is assignable to the other.
+tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates3.ts(25,1): error TS2352: Type 'C3<T2>' cannot be converted to type 'C4'.
   Property 'y' is missing in type 'C3<T2>'.
 
 
@@ -29,5 +29,5 @@ tests/cases/conformance/types/typeRelationships/typeAndMemberIdentity/objectType
     var c3: C3<T2>;
     <C4>c3; // Should fail (private x originates in the same declaration, but different types)
     ~~~~~~
-!!! error TS2352: Neither type 'C3<T2>' nor type 'C4' is assignable to the other.
+!!! error TS2352: Type 'C3<T2>' cannot be converted to type 'C4'.
 !!! error TS2352:   Property 'y' is missing in type 'C3<T2>'.
\ No newline at end of file
diff --git a/tests/baselines/reference/objectTypesIdentityWithPublics.symbols b/tests/baselines/reference/objectTypesIdentityWithPublics.symbols
index ebfb52e3d2e..794301f6fc3 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPublics.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithPublics.symbols
@@ -5,14 +5,14 @@ class A {
 >A : Symbol(A, Decl(objectTypesIdentityWithPublics.ts, 0, 0))
 
     public foo: string;
->foo : Symbol(foo, Decl(objectTypesIdentityWithPublics.ts, 2, 9))
+>foo : Symbol(A.foo, Decl(objectTypesIdentityWithPublics.ts, 2, 9))
 }
 
 class B {
 >B : Symbol(B, Decl(objectTypesIdentityWithPublics.ts, 4, 1))
 
     public foo: string;
->foo : Symbol(foo, Decl(objectTypesIdentityWithPublics.ts, 6, 9))
+>foo : Symbol(B.foo, Decl(objectTypesIdentityWithPublics.ts, 6, 9))
 }
 
 class C<T> {
@@ -20,7 +20,7 @@ class C<T> {
 >T : Symbol(T, Decl(objectTypesIdentityWithPublics.ts, 10, 8))
 
     public foo: T;
->foo : Symbol(foo, Decl(objectTypesIdentityWithPublics.ts, 10, 12))
+>foo : Symbol(C.foo, Decl(objectTypesIdentityWithPublics.ts, 10, 12))
 >T : Symbol(T, Decl(objectTypesIdentityWithPublics.ts, 10, 8))
 }
 
@@ -28,7 +28,7 @@ interface I {
 >I : Symbol(I, Decl(objectTypesIdentityWithPublics.ts, 12, 1))
 
     foo: string;
->foo : Symbol(foo, Decl(objectTypesIdentityWithPublics.ts, 14, 13))
+>foo : Symbol(I.foo, Decl(objectTypesIdentityWithPublics.ts, 14, 13))
 }
 
 var a: { foo: string; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithStringIndexers.types b/tests/baselines/reference/objectTypesIdentityWithStringIndexers.types
index a7eeb672504..8393eaf68a0 100644
--- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers.types
+++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers.types
@@ -50,7 +50,7 @@ var a: {
 var b: { [x: string]: string; } = { foo: '' };
 >b : { [x: string]: string; }
 >x : string
->{ foo: '' } : { [x: string]: string; foo: string; }
+>{ foo: '' } : { foo: string; }
 >foo : string
 >'' : string
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.symbols b/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.symbols
index 2df0bf01b1d..dd2e561e67d 100644
--- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.symbols
+++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.symbols
@@ -3,12 +3,12 @@
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(objectTypesIdentityWithStringIndexers2.ts, 0, 0))
->foo : Symbol(foo, Decl(objectTypesIdentityWithStringIndexers2.ts, 2, 12))
+>foo : Symbol(Base.foo, Decl(objectTypesIdentityWithStringIndexers2.ts, 2, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(objectTypesIdentityWithStringIndexers2.ts, 2, 27))
 >Base : Symbol(Base, Decl(objectTypesIdentityWithStringIndexers2.ts, 0, 0))
->bar : Symbol(bar, Decl(objectTypesIdentityWithStringIndexers2.ts, 3, 28))
+>bar : Symbol(Derived.bar, Decl(objectTypesIdentityWithStringIndexers2.ts, 3, 28))
 
 class A {
 >A : Symbol(A, Decl(objectTypesIdentityWithStringIndexers2.ts, 3, 43))
diff --git a/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.types b/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.types
index d1394252117..814d0c91814 100644
--- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.types
@@ -64,7 +64,7 @@ var b: { [x: string]: Derived; } = { foo: <Derived>null };
 >b : { [x: string]: Derived; }
 >x : string
 >Derived : Derived
->{ foo: <Derived>null } : { [x: string]: Derived; foo: Derived; }
+>{ foo: <Derived>null } : { foo: Derived; }
 >foo : Derived
 ><Derived>null : Derived
 >Derived : Derived
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/operatorsAndIntersectionTypes.js b/tests/baselines/reference/operatorsAndIntersectionTypes.js
new file mode 100644
index 00000000000..6f5b3d329d1
--- /dev/null
+++ b/tests/baselines/reference/operatorsAndIntersectionTypes.js
@@ -0,0 +1,57 @@
+//// [operatorsAndIntersectionTypes.ts]
+type Guid = string & { $Guid };          // Tagged string type
+type SerialNo = number & { $SerialNo };  // Tagged number type
+
+function createGuid() {
+    return "21EC2020-3AEA-4069-A2DD-08002B30309D" as Guid;
+}
+
+function createSerialNo() {
+    return 12345 as SerialNo;
+}
+
+let map1: { [x: string]: number } = {};
+let guid = createGuid();
+map1[guid] = 123;  // Can with tagged string
+
+let map2: { [x: number]: string } = {};
+let serialNo = createSerialNo();
+map2[serialNo] = "hello";  // Can index with tagged number
+
+const s1 = "{" + guid + "}";
+const s2 = guid.toLowerCase();
+const s3 = guid + guid;
+const s4 = guid + serialNo;
+const s5 = serialNo.toPrecision(0);
+const n1 = serialNo * 3;
+const n2 = serialNo + serialNo;
+const b1 = guid === "";
+const b2 = guid === guid;
+const b3 = serialNo === 0;
+const b4 = serialNo === serialNo;
+
+
+//// [operatorsAndIntersectionTypes.js]
+function createGuid() {
+    return "21EC2020-3AEA-4069-A2DD-08002B30309D";
+}
+function createSerialNo() {
+    return 12345;
+}
+var map1 = {};
+var guid = createGuid();
+map1[guid] = 123; // Can with tagged string
+var map2 = {};
+var serialNo = createSerialNo();
+map2[serialNo] = "hello"; // Can index with tagged number
+var s1 = "{" + guid + "}";
+var s2 = guid.toLowerCase();
+var s3 = guid + guid;
+var s4 = guid + serialNo;
+var s5 = serialNo.toPrecision(0);
+var n1 = serialNo * 3;
+var n2 = serialNo + serialNo;
+var b1 = guid === "";
+var b2 = guid === guid;
+var b3 = serialNo === 0;
+var b4 = serialNo === serialNo;
diff --git a/tests/baselines/reference/operatorsAndIntersectionTypes.symbols b/tests/baselines/reference/operatorsAndIntersectionTypes.symbols
new file mode 100644
index 00000000000..7ffc093e4af
--- /dev/null
+++ b/tests/baselines/reference/operatorsAndIntersectionTypes.symbols
@@ -0,0 +1,100 @@
+=== tests/cases/conformance/types/intersection/operatorsAndIntersectionTypes.ts ===
+type Guid = string & { $Guid };          // Tagged string type
+>Guid : Symbol(Guid, Decl(operatorsAndIntersectionTypes.ts, 0, 0))
+>$Guid : Symbol($Guid, Decl(operatorsAndIntersectionTypes.ts, 0, 22))
+
+type SerialNo = number & { $SerialNo };  // Tagged number type
+>SerialNo : Symbol(SerialNo, Decl(operatorsAndIntersectionTypes.ts, 0, 31))
+>$SerialNo : Symbol($SerialNo, Decl(operatorsAndIntersectionTypes.ts, 1, 26))
+
+function createGuid() {
+>createGuid : Symbol(createGuid, Decl(operatorsAndIntersectionTypes.ts, 1, 39))
+
+    return "21EC2020-3AEA-4069-A2DD-08002B30309D" as Guid;
+>Guid : Symbol(Guid, Decl(operatorsAndIntersectionTypes.ts, 0, 0))
+}
+
+function createSerialNo() {
+>createSerialNo : Symbol(createSerialNo, Decl(operatorsAndIntersectionTypes.ts, 5, 1))
+
+    return 12345 as SerialNo;
+>SerialNo : Symbol(SerialNo, Decl(operatorsAndIntersectionTypes.ts, 0, 31))
+}
+
+let map1: { [x: string]: number } = {};
+>map1 : Symbol(map1, Decl(operatorsAndIntersectionTypes.ts, 11, 3))
+>x : Symbol(x, Decl(operatorsAndIntersectionTypes.ts, 11, 13))
+
+let guid = createGuid();
+>guid : Symbol(guid, Decl(operatorsAndIntersectionTypes.ts, 12, 3))
+>createGuid : Symbol(createGuid, Decl(operatorsAndIntersectionTypes.ts, 1, 39))
+
+map1[guid] = 123;  // Can with tagged string
+>map1 : Symbol(map1, Decl(operatorsAndIntersectionTypes.ts, 11, 3))
+>guid : Symbol(guid, Decl(operatorsAndIntersectionTypes.ts, 12, 3))
+
+let map2: { [x: number]: string } = {};
+>map2 : Symbol(map2, Decl(operatorsAndIntersectionTypes.ts, 15, 3))
+>x : Symbol(x, Decl(operatorsAndIntersectionTypes.ts, 15, 13))
+
+let serialNo = createSerialNo();
+>serialNo : Symbol(serialNo, Decl(operatorsAndIntersectionTypes.ts, 16, 3))
+>createSerialNo : Symbol(createSerialNo, Decl(operatorsAndIntersectionTypes.ts, 5, 1))
+
+map2[serialNo] = "hello";  // Can index with tagged number
+>map2 : Symbol(map2, Decl(operatorsAndIntersectionTypes.ts, 15, 3))
+>serialNo : Symbol(serialNo, Decl(operatorsAndIntersectionTypes.ts, 16, 3))
+
+const s1 = "{" + guid + "}";
+>s1 : Symbol(s1, Decl(operatorsAndIntersectionTypes.ts, 19, 5))
+>guid : Symbol(guid, Decl(operatorsAndIntersectionTypes.ts, 12, 3))
+
+const s2 = guid.toLowerCase();
+>s2 : Symbol(s2, Decl(operatorsAndIntersectionTypes.ts, 20, 5))
+>guid.toLowerCase : Symbol(String.toLowerCase, Decl(lib.d.ts, --, --))
+>guid : Symbol(guid, Decl(operatorsAndIntersectionTypes.ts, 12, 3))
+>toLowerCase : Symbol(String.toLowerCase, Decl(lib.d.ts, --, --))
+
+const s3 = guid + guid;
+>s3 : Symbol(s3, Decl(operatorsAndIntersectionTypes.ts, 21, 5))
+>guid : Symbol(guid, Decl(operatorsAndIntersectionTypes.ts, 12, 3))
+>guid : Symbol(guid, Decl(operatorsAndIntersectionTypes.ts, 12, 3))
+
+const s4 = guid + serialNo;
+>s4 : Symbol(s4, Decl(operatorsAndIntersectionTypes.ts, 22, 5))
+>guid : Symbol(guid, Decl(operatorsAndIntersectionTypes.ts, 12, 3))
+>serialNo : Symbol(serialNo, Decl(operatorsAndIntersectionTypes.ts, 16, 3))
+
+const s5 = serialNo.toPrecision(0);
+>s5 : Symbol(s5, Decl(operatorsAndIntersectionTypes.ts, 23, 5))
+>serialNo.toPrecision : Symbol(Number.toPrecision, Decl(lib.d.ts, --, --))
+>serialNo : Symbol(serialNo, Decl(operatorsAndIntersectionTypes.ts, 16, 3))
+>toPrecision : Symbol(Number.toPrecision, Decl(lib.d.ts, --, --))
+
+const n1 = serialNo * 3;
+>n1 : Symbol(n1, Decl(operatorsAndIntersectionTypes.ts, 24, 5))
+>serialNo : Symbol(serialNo, Decl(operatorsAndIntersectionTypes.ts, 16, 3))
+
+const n2 = serialNo + serialNo;
+>n2 : Symbol(n2, Decl(operatorsAndIntersectionTypes.ts, 25, 5))
+>serialNo : Symbol(serialNo, Decl(operatorsAndIntersectionTypes.ts, 16, 3))
+>serialNo : Symbol(serialNo, Decl(operatorsAndIntersectionTypes.ts, 16, 3))
+
+const b1 = guid === "";
+>b1 : Symbol(b1, Decl(operatorsAndIntersectionTypes.ts, 26, 5))
+>guid : Symbol(guid, Decl(operatorsAndIntersectionTypes.ts, 12, 3))
+
+const b2 = guid === guid;
+>b2 : Symbol(b2, Decl(operatorsAndIntersectionTypes.ts, 27, 5))
+>guid : Symbol(guid, Decl(operatorsAndIntersectionTypes.ts, 12, 3))
+>guid : Symbol(guid, Decl(operatorsAndIntersectionTypes.ts, 12, 3))
+
+const b3 = serialNo === 0;
+>b3 : Symbol(b3, Decl(operatorsAndIntersectionTypes.ts, 28, 5))
+>serialNo : Symbol(serialNo, Decl(operatorsAndIntersectionTypes.ts, 16, 3))
+
+const b4 = serialNo === serialNo;
+>b4 : Symbol(b4, Decl(operatorsAndIntersectionTypes.ts, 29, 5))
+>serialNo : Symbol(serialNo, Decl(operatorsAndIntersectionTypes.ts, 16, 3))
+>serialNo : Symbol(serialNo, Decl(operatorsAndIntersectionTypes.ts, 16, 3))
+
diff --git a/tests/baselines/reference/operatorsAndIntersectionTypes.types b/tests/baselines/reference/operatorsAndIntersectionTypes.types
new file mode 100644
index 00000000000..6b5987d3a69
--- /dev/null
+++ b/tests/baselines/reference/operatorsAndIntersectionTypes.types
@@ -0,0 +1,132 @@
+=== tests/cases/conformance/types/intersection/operatorsAndIntersectionTypes.ts ===
+type Guid = string & { $Guid };          // Tagged string type
+>Guid : string & { $Guid: any; }
+>$Guid : any
+
+type SerialNo = number & { $SerialNo };  // Tagged number type
+>SerialNo : number & { $SerialNo: any; }
+>$SerialNo : any
+
+function createGuid() {
+>createGuid : () => string & { $Guid: any; }
+
+    return "21EC2020-3AEA-4069-A2DD-08002B30309D" as Guid;
+>"21EC2020-3AEA-4069-A2DD-08002B30309D" as Guid : string & { $Guid: any; }
+>"21EC2020-3AEA-4069-A2DD-08002B30309D" : string
+>Guid : string & { $Guid: any; }
+}
+
+function createSerialNo() {
+>createSerialNo : () => number & { $SerialNo: any; }
+
+    return 12345 as SerialNo;
+>12345 as SerialNo : number & { $SerialNo: any; }
+>12345 : number
+>SerialNo : number & { $SerialNo: any; }
+}
+
+let map1: { [x: string]: number } = {};
+>map1 : { [x: string]: number; }
+>x : string
+>{} : {}
+
+let guid = createGuid();
+>guid : string & { $Guid: any; }
+>createGuid() : string & { $Guid: any; }
+>createGuid : () => string & { $Guid: any; }
+
+map1[guid] = 123;  // Can with tagged string
+>map1[guid] = 123 : number
+>map1[guid] : number
+>map1 : { [x: string]: number; }
+>guid : string & { $Guid: any; }
+>123 : number
+
+let map2: { [x: number]: string } = {};
+>map2 : { [x: number]: string; }
+>x : number
+>{} : {}
+
+let serialNo = createSerialNo();
+>serialNo : number & { $SerialNo: any; }
+>createSerialNo() : number & { $SerialNo: any; }
+>createSerialNo : () => number & { $SerialNo: any; }
+
+map2[serialNo] = "hello";  // Can index with tagged number
+>map2[serialNo] = "hello" : string
+>map2[serialNo] : string
+>map2 : { [x: number]: string; }
+>serialNo : number & { $SerialNo: any; }
+>"hello" : string
+
+const s1 = "{" + guid + "}";
+>s1 : string
+>"{" + guid + "}" : string
+>"{" + guid : string
+>"{" : string
+>guid : string & { $Guid: any; }
+>"}" : string
+
+const s2 = guid.toLowerCase();
+>s2 : string
+>guid.toLowerCase() : string
+>guid.toLowerCase : () => string
+>guid : string & { $Guid: any; }
+>toLowerCase : () => string
+
+const s3 = guid + guid;
+>s3 : string
+>guid + guid : string
+>guid : string & { $Guid: any; }
+>guid : string & { $Guid: any; }
+
+const s4 = guid + serialNo;
+>s4 : string
+>guid + serialNo : string
+>guid : string & { $Guid: any; }
+>serialNo : number & { $SerialNo: any; }
+
+const s5 = serialNo.toPrecision(0);
+>s5 : string
+>serialNo.toPrecision(0) : string
+>serialNo.toPrecision : (precision?: number) => string
+>serialNo : number & { $SerialNo: any; }
+>toPrecision : (precision?: number) => string
+>0 : number
+
+const n1 = serialNo * 3;
+>n1 : number
+>serialNo * 3 : number
+>serialNo : number & { $SerialNo: any; }
+>3 : number
+
+const n2 = serialNo + serialNo;
+>n2 : number
+>serialNo + serialNo : number
+>serialNo : number & { $SerialNo: any; }
+>serialNo : number & { $SerialNo: any; }
+
+const b1 = guid === "";
+>b1 : boolean
+>guid === "" : boolean
+>guid : string & { $Guid: any; }
+>"" : string
+
+const b2 = guid === guid;
+>b2 : boolean
+>guid === guid : boolean
+>guid : string & { $Guid: any; }
+>guid : string & { $Guid: any; }
+
+const b3 = serialNo === 0;
+>b3 : boolean
+>serialNo === 0 : boolean
+>serialNo : number & { $SerialNo: any; }
+>0 : number
+
+const b4 = serialNo === serialNo;
+>b4 : boolean
+>serialNo === serialNo : boolean
+>serialNo : number & { $SerialNo: any; }
+>serialNo : number & { $SerialNo: any; }
+
diff --git a/tests/baselines/reference/optionalAccessorsInInterface1.symbols b/tests/baselines/reference/optionalAccessorsInInterface1.symbols
index 6c9c8ab1429..905aefa02ba 100644
--- a/tests/baselines/reference/optionalAccessorsInInterface1.symbols
+++ b/tests/baselines/reference/optionalAccessorsInInterface1.symbols
@@ -3,10 +3,10 @@ interface MyPropertyDescriptor {
 >MyPropertyDescriptor : Symbol(MyPropertyDescriptor, Decl(optionalAccessorsInInterface1.ts, 0, 0))
 
     get? (): any;
->get : Symbol(get, Decl(optionalAccessorsInInterface1.ts, 0, 32))
+>get : Symbol(MyPropertyDescriptor.get, Decl(optionalAccessorsInInterface1.ts, 0, 32))
 
     set? (v: any): void;
->set : Symbol(set, Decl(optionalAccessorsInInterface1.ts, 1, 17))
+>set : Symbol(MyPropertyDescriptor.set, Decl(optionalAccessorsInInterface1.ts, 1, 17))
 >v : Symbol(v, Decl(optionalAccessorsInInterface1.ts, 2, 10))
 }
 
@@ -25,10 +25,10 @@ interface MyPropertyDescriptor2 {
 >MyPropertyDescriptor2 : Symbol(MyPropertyDescriptor2, Decl(optionalAccessorsInInterface1.ts, 6, 65))
 
     get?: () => any;
->get : Symbol(get, Decl(optionalAccessorsInInterface1.ts, 8, 33))
+>get : Symbol(MyPropertyDescriptor2.get, Decl(optionalAccessorsInInterface1.ts, 8, 33))
 
     set?: (v: any) => void;
->set : Symbol(set, Decl(optionalAccessorsInInterface1.ts, 9, 20))
+>set : Symbol(MyPropertyDescriptor2.set, Decl(optionalAccessorsInInterface1.ts, 9, 20))
 >v : Symbol(v, Decl(optionalAccessorsInInterface1.ts, 10, 11))
 }
 
diff --git a/tests/baselines/reference/optionalConstructorArgInSuper.symbols b/tests/baselines/reference/optionalConstructorArgInSuper.symbols
index a912d8f62e3..000032d1757 100644
--- a/tests/baselines/reference/optionalConstructorArgInSuper.symbols
+++ b/tests/baselines/reference/optionalConstructorArgInSuper.symbols
@@ -6,7 +6,7 @@ class Base {
 >opt : Symbol(opt, Decl(optionalConstructorArgInSuper.ts, 1, 16))
 
     foo(other?) { }
->foo : Symbol(foo, Decl(optionalConstructorArgInSuper.ts, 1, 25))
+>foo : Symbol(Base.foo, Decl(optionalConstructorArgInSuper.ts, 1, 25))
 >other : Symbol(other, Decl(optionalConstructorArgInSuper.ts, 2, 8))
 }
 class Derived extends Base {
diff --git a/tests/baselines/reference/optionalFunctionArgAssignability.errors.txt b/tests/baselines/reference/optionalFunctionArgAssignability.errors.txt
index 52fb45e40d2..024c5c1ea2b 100644
--- a/tests/baselines/reference/optionalFunctionArgAssignability.errors.txt
+++ b/tests/baselines/reference/optionalFunctionArgAssignability.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/optionalFunctionArgAssignability.ts(7,1): error TS2322: Type '<U>(onFulFill?: (value: number) => U, onReject?: (reason: any) => U) => Promise<U>' is not assignable to type '<U>(onFulfill?: (value: string) => U, onReject?: (reason: any) => U) => Promise<U>'.
   Types of parameters 'onFulFill' and 'onFulfill' are incompatible.
-    Type '(value: number) => any' is not assignable to type '(value: string) => any'.
+    Type '(value: string) => any' is not assignable to type '(value: number) => any'.
       Types of parameters 'value' and 'value' are incompatible.
         Type 'number' is not assignable to type 'string'.
 
@@ -16,7 +16,7 @@ tests/cases/compiler/optionalFunctionArgAssignability.ts(7,1): error TS2322: Typ
     ~
 !!! error TS2322: Type '<U>(onFulFill?: (value: number) => U, onReject?: (reason: any) => U) => Promise<U>' is not assignable to type '<U>(onFulfill?: (value: string) => U, onReject?: (reason: any) => U) => Promise<U>'.
 !!! error TS2322:   Types of parameters 'onFulFill' and 'onFulfill' are incompatible.
-!!! error TS2322:     Type '(value: number) => any' is not assignable to type '(value: string) => any'.
+!!! error TS2322:     Type '(value: string) => any' is not assignable to type '(value: number) => any'.
 !!! error TS2322:       Types of parameters 'value' and 'value' are incompatible.
 !!! error TS2322:         Type 'number' is not assignable to type 'string'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/optionalParamAssignmentCompat.errors.txt b/tests/baselines/reference/optionalParamAssignmentCompat.errors.txt
index de02509d124..5ab492540ac 100644
--- a/tests/baselines/reference/optionalParamAssignmentCompat.errors.txt
+++ b/tests/baselines/reference/optionalParamAssignmentCompat.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/optionalParamAssignmentCompat.ts(10,5): error TS2322: Type '(p1?: string) => I1' is not assignable to type 'I1'.
   Types of parameters 'p1' and 'p1' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 
 
 ==== tests/cases/compiler/optionalParamAssignmentCompat.ts (1 errors) ====
@@ -17,5 +17,5 @@ tests/cases/compiler/optionalParamAssignmentCompat.ts(10,5): error TS2322: Type
         ~
 !!! error TS2322: Type '(p1?: string) => I1' is not assignable to type 'I1'.
 !!! error TS2322:   Types of parameters 'p1' and 'p1' are incompatible.
-!!! error TS2322:     Type 'string' is not assignable to type 'number'.
+!!! error TS2322:     Type 'number' is not assignable to type 'string'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/optionalParamInOverride.symbols b/tests/baselines/reference/optionalParamInOverride.symbols
index b15802b7294..0d33d6c8d06 100644
--- a/tests/baselines/reference/optionalParamInOverride.symbols
+++ b/tests/baselines/reference/optionalParamInOverride.symbols
@@ -3,14 +3,14 @@ class Z {
 >Z : Symbol(Z, Decl(optionalParamInOverride.ts, 0, 0))
 
     public func(): void { }
->func : Symbol(func, Decl(optionalParamInOverride.ts, 0, 9))
+>func : Symbol(Z.func, Decl(optionalParamInOverride.ts, 0, 9))
 }
 class Y extends Z {
 >Y : Symbol(Y, Decl(optionalParamInOverride.ts, 2, 1))
 >Z : Symbol(Z, Decl(optionalParamInOverride.ts, 0, 0))
 
     public func(value?: any): void { }
->func : Symbol(func, Decl(optionalParamInOverride.ts, 3, 19))
+>func : Symbol(Y.func, Decl(optionalParamInOverride.ts, 3, 19))
 >value : Symbol(value, Decl(optionalParamInOverride.ts, 4, 16))
 }
 
diff --git a/tests/baselines/reference/optionalParamTypeComparison.errors.txt b/tests/baselines/reference/optionalParamTypeComparison.errors.txt
index 98a07570c65..287c1123211 100644
--- a/tests/baselines/reference/optionalParamTypeComparison.errors.txt
+++ b/tests/baselines/reference/optionalParamTypeComparison.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/compiler/optionalParamTypeComparison.ts(4,1): error TS2322: Type '(s: string, b?: boolean) => void' is not assignable to type '(s: string, n?: number) => void'.
   Types of parameters 'b' and 'n' are incompatible.
-    Type 'boolean' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'boolean'.
 tests/cases/compiler/optionalParamTypeComparison.ts(5,1): error TS2322: Type '(s: string, n?: number) => void' is not assignable to type '(s: string, b?: boolean) => void'.
   Types of parameters 'n' and 'b' are incompatible.
-    Type 'number' is not assignable to type 'boolean'.
+    Type 'boolean' is not assignable to type 'number'.
 
 
 ==== tests/cases/compiler/optionalParamTypeComparison.ts (2 errors) ====
@@ -14,9 +14,9 @@ tests/cases/compiler/optionalParamTypeComparison.ts(5,1): error TS2322: Type '(s
     ~
 !!! error TS2322: Type '(s: string, b?: boolean) => void' is not assignable to type '(s: string, n?: number) => void'.
 !!! error TS2322:   Types of parameters 'b' and 'n' are incompatible.
-!!! error TS2322:     Type 'boolean' is not assignable to type 'number'.
+!!! error TS2322:     Type 'number' is not assignable to type 'boolean'.
     g = f;
     ~
 !!! error TS2322: Type '(s: string, n?: number) => void' is not assignable to type '(s: string, b?: boolean) => void'.
 !!! error TS2322:   Types of parameters 'n' and 'b' are incompatible.
-!!! error TS2322:     Type 'number' is not assignable to type 'boolean'.
\ No newline at end of file
+!!! error TS2322:     Type 'boolean' is not assignable to type 'number'.
\ No newline at end of file
diff --git a/tests/baselines/reference/optionsOutAndNoModuleGen.errors.txt b/tests/baselines/reference/optionsOutAndNoModuleGen.errors.txt
new file mode 100644
index 00000000000..b4d00619993
--- /dev/null
+++ b/tests/baselines/reference/optionsOutAndNoModuleGen.errors.txt
@@ -0,0 +1,7 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+==== tests/cases/compiler/optionsOutAndNoModuleGen.ts (0 errors) ====
+    
+    export var x = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/out-flag.symbols b/tests/baselines/reference/out-flag.symbols
index 8f7e559b8fa..2a6a1775dd7 100644
--- a/tests/baselines/reference/out-flag.symbols
+++ b/tests/baselines/reference/out-flag.symbols
@@ -7,13 +7,13 @@ class MyClass
 {
     // my function comments
     public Count(): number
->Count : Symbol(Count, Decl(out-flag.ts, 4, 1))
+>Count : Symbol(MyClass.Count, Decl(out-flag.ts, 4, 1))
     {
         return 42;
     }
 
     public SetCount(value: number)
->SetCount : Symbol(SetCount, Decl(out-flag.ts, 9, 5))
+>SetCount : Symbol(MyClass.SetCount, Decl(out-flag.ts, 9, 5))
 >value : Symbol(value, Decl(out-flag.ts, 11, 20))
     {
         //
diff --git a/tests/baselines/reference/outFilerootDirModuleNamesSystem.js b/tests/baselines/reference/outFilerootDirModuleNamesSystem.js
index eb1ef2a4a54..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() {
-            class Foo {
             }
+        ],
+        execute: function () {
+            Foo = class Foo {
+            };
             exports_2("default", Foo);
             b_1.default();
         }
-    }
+    };
 });
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/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/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/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/outModuleTripleSlashRefs.symbols b/tests/baselines/reference/outModuleTripleSlashRefs.symbols
index f8d550aedb6..5f137a95361 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.symbols
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.symbols
@@ -5,7 +5,7 @@ export class A {
 >A : Symbol(A, Decl(a.ts, 0, 0))
 
 	member: typeof GlobalFoo;
->member : Symbol(member, Decl(a.ts, 2, 16))
+>member : Symbol(A.member, Decl(a.ts, 2, 16))
 >GlobalFoo : Symbol(GlobalFoo, Decl(b.ts, 4, 11))
 }
 
@@ -15,7 +15,7 @@ class Foo {
 >Foo : Symbol(Foo, Decl(b.ts, 0, 0))
 
 	member: Bar;
->member : Symbol(member, Decl(b.ts, 1, 11))
+>member : Symbol(Foo.member, Decl(b.ts, 1, 11))
 >Bar : Symbol(Bar, Decl(c.d.ts, 0, 0))
 }
 declare var GlobalFoo: Foo;
@@ -28,7 +28,7 @@ declare class Bar {
 >Bar : Symbol(Bar, Decl(c.d.ts, 0, 0))
 
 	member: Baz;
->member : Symbol(member, Decl(c.d.ts, 1, 19))
+>member : Symbol(Bar.member, Decl(c.d.ts, 1, 19))
 >Baz : Symbol(Baz, Decl(d.d.ts, 0, 0))
 }
 
@@ -37,7 +37,7 @@ declare class Baz {
 >Baz : Symbol(Baz, Decl(d.d.ts, 0, 0))
 
 	member: number;
->member : Symbol(member, Decl(d.d.ts, 0, 19))
+>member : Symbol(Baz.member, Decl(d.d.ts, 0, 19))
 }
 
 === tests/cases/compiler/b.ts ===
diff --git a/tests/baselines/reference/overloadBindingAcrossDeclarationBoundaries.symbols b/tests/baselines/reference/overloadBindingAcrossDeclarationBoundaries.symbols
index 65f64fa8915..0791f7009d0 100644
--- a/tests/baselines/reference/overloadBindingAcrossDeclarationBoundaries.symbols
+++ b/tests/baselines/reference/overloadBindingAcrossDeclarationBoundaries.symbols
@@ -3,37 +3,37 @@ interface Opt1 {
 >Opt1 : Symbol(Opt1, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 0, 0))
 
     p?: any;
->p : Symbol(p, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 0, 16))
+>p : Symbol(Opt1.p, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 0, 16))
 }
 interface Opt2 {
 >Opt2 : Symbol(Opt2, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 2, 1))
 
     q?: any;
->q : Symbol(q, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 3, 16))
+>q : Symbol(Opt2.q, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 3, 16))
 }
 interface Opt3 {
 >Opt3 : Symbol(Opt3, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 5, 1))
 
     r?: any;
->r : Symbol(r, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 6, 16))
+>r : Symbol(Opt3.r, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 6, 16))
 }
 interface Opt4 {
 >Opt4 : Symbol(Opt4, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 8, 1))
 
     s?: any;
->s : Symbol(s, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 9, 16))
+>s : Symbol(Opt4.s, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 9, 16))
 }
 interface A {
 >A : Symbol(A, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 11, 1), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 19, 1))
 
     a(o: Opt1): Opt1;
->a : Symbol(a, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 12, 13), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 13, 21), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 20, 13), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 21, 21))
+>a : Symbol(A.a, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 12, 13), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 13, 21), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 20, 13), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 21, 21))
 >o : Symbol(o, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 13, 6))
 >Opt1 : Symbol(Opt1, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 0, 0))
 >Opt1 : Symbol(Opt1, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 0, 0))
 
     a(o: Opt2): Opt2;
->a : Symbol(a, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 12, 13), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 13, 21), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 20, 13), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 21, 21))
+>a : Symbol(A.a, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 12, 13), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 13, 21), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 20, 13), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 21, 21))
 >o : Symbol(o, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 14, 6))
 >Opt2 : Symbol(Opt2, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 2, 1))
 >Opt2 : Symbol(Opt2, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 2, 1))
@@ -62,13 +62,13 @@ interface A {
 >A : Symbol(A, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 11, 1), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 19, 1))
 
     a(o: Opt3): Opt3;
->a : Symbol(a, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 12, 13), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 13, 21), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 20, 13), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 21, 21))
+>a : Symbol(A.a, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 12, 13), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 13, 21), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 20, 13), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 21, 21))
 >o : Symbol(o, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 21, 6))
 >Opt3 : Symbol(Opt3, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 5, 1))
 >Opt3 : Symbol(Opt3, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 5, 1))
 
     a(o: Opt4): Opt4;
->a : Symbol(a, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 12, 13), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 13, 21), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 20, 13), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 21, 21))
+>a : Symbol(A.a, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 12, 13), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 13, 21), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 20, 13), Decl(overloadBindingAcrossDeclarationBoundaries.ts, 21, 21))
 >o : Symbol(o, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 22, 6))
 >Opt4 : Symbol(Opt4, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 8, 1))
 >Opt4 : Symbol(Opt4, Decl(overloadBindingAcrossDeclarationBoundaries.ts, 8, 1))
diff --git a/tests/baselines/reference/overloadBindingAcrossDeclarationBoundaries2.symbols b/tests/baselines/reference/overloadBindingAcrossDeclarationBoundaries2.symbols
index 534475bcc30..7fd32af7cec 100644
--- a/tests/baselines/reference/overloadBindingAcrossDeclarationBoundaries2.symbols
+++ b/tests/baselines/reference/overloadBindingAcrossDeclarationBoundaries2.symbols
@@ -3,38 +3,38 @@ interface Opt1 {
 >Opt1 : Symbol(Opt1, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 0, 0))
 
     p?: any;
->p : Symbol(p, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 0, 16))
+>p : Symbol(Opt1.p, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 0, 16))
 }
 interface Opt2 {
 >Opt2 : Symbol(Opt2, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 2, 1))
 
     q?: any;
->q : Symbol(q, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 3, 16))
+>q : Symbol(Opt2.q, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 3, 16))
 }
 interface Opt3 {
 >Opt3 : Symbol(Opt3, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 5, 1))
 
     r?: any;
->r : Symbol(r, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 6, 16))
+>r : Symbol(Opt3.r, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 6, 16))
 }
 interface Opt4 {
 >Opt4 : Symbol(Opt4, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 8, 1))
 
     s?: any;
->s : Symbol(s, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 9, 16))
+>s : Symbol(Opt4.s, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 9, 16))
 }
 
 interface A {
 >A : Symbol(A, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 11, 1), Decl(overloadBindingAcrossDeclarationBoundaries_file1.ts, 0, 0))
 
     a(o: Opt1): Opt1;
->a : Symbol(a, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 13, 13), Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 14, 21), Decl(overloadBindingAcrossDeclarationBoundaries_file1.ts, 0, 13), Decl(overloadBindingAcrossDeclarationBoundaries_file1.ts, 1, 21))
+>a : Symbol(A.a, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 13, 13), Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 14, 21), Decl(overloadBindingAcrossDeclarationBoundaries_file1.ts, 0, 13), Decl(overloadBindingAcrossDeclarationBoundaries_file1.ts, 1, 21))
 >o : Symbol(o, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 14, 6))
 >Opt1 : Symbol(Opt1, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 0, 0))
 >Opt1 : Symbol(Opt1, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 0, 0))
 
     a(o: Opt2): Opt2;
->a : Symbol(a, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 13, 13), Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 14, 21), Decl(overloadBindingAcrossDeclarationBoundaries_file1.ts, 0, 13), Decl(overloadBindingAcrossDeclarationBoundaries_file1.ts, 1, 21))
+>a : Symbol(A.a, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 13, 13), Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 14, 21), Decl(overloadBindingAcrossDeclarationBoundaries_file1.ts, 0, 13), Decl(overloadBindingAcrossDeclarationBoundaries_file1.ts, 1, 21))
 >o : Symbol(o, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 15, 6))
 >Opt2 : Symbol(Opt2, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 2, 1))
 >Opt2 : Symbol(Opt2, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 2, 1))
@@ -65,13 +65,13 @@ interface A {
 >A : Symbol(A, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 11, 1), Decl(overloadBindingAcrossDeclarationBoundaries_file1.ts, 0, 0))
 
     a(o: Opt3): Opt3;
->a : Symbol(a, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 13, 13), Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 14, 21), Decl(overloadBindingAcrossDeclarationBoundaries_file1.ts, 0, 13), Decl(overloadBindingAcrossDeclarationBoundaries_file1.ts, 1, 21))
+>a : Symbol(A.a, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 13, 13), Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 14, 21), Decl(overloadBindingAcrossDeclarationBoundaries_file1.ts, 0, 13), Decl(overloadBindingAcrossDeclarationBoundaries_file1.ts, 1, 21))
 >o : Symbol(o, Decl(overloadBindingAcrossDeclarationBoundaries_file1.ts, 1, 6))
 >Opt3 : Symbol(Opt3, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 5, 1))
 >Opt3 : Symbol(Opt3, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 5, 1))
 
     a(o: Opt4): Opt4;
->a : Symbol(a, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 13, 13), Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 14, 21), Decl(overloadBindingAcrossDeclarationBoundaries_file1.ts, 0, 13), Decl(overloadBindingAcrossDeclarationBoundaries_file1.ts, 1, 21))
+>a : Symbol(A.a, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 13, 13), Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 14, 21), Decl(overloadBindingAcrossDeclarationBoundaries_file1.ts, 0, 13), Decl(overloadBindingAcrossDeclarationBoundaries_file1.ts, 1, 21))
 >o : Symbol(o, Decl(overloadBindingAcrossDeclarationBoundaries_file1.ts, 2, 6))
 >Opt4 : Symbol(Opt4, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 8, 1))
 >Opt4 : Symbol(Opt4, Decl(overloadBindingAcrossDeclarationBoundaries_file0.ts, 8, 1))
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/overloadCrash.symbols b/tests/baselines/reference/overloadCrash.symbols
index 791411540b3..8345107dc45 100644
--- a/tests/baselines/reference/overloadCrash.symbols
+++ b/tests/baselines/reference/overloadCrash.symbols
@@ -1,20 +1,20 @@
 === tests/cases/compiler/overloadCrash.ts ===
 interface I1 {a:number; b:number;};
 >I1 : Symbol(I1, Decl(overloadCrash.ts, 0, 0))
->a : Symbol(a, Decl(overloadCrash.ts, 0, 14))
->b : Symbol(b, Decl(overloadCrash.ts, 0, 23))
+>a : Symbol(I1.a, Decl(overloadCrash.ts, 0, 14))
+>b : Symbol(I1.b, Decl(overloadCrash.ts, 0, 23))
 
 interface I2 {c:number; d:number;};
 >I2 : Symbol(I2, Decl(overloadCrash.ts, 0, 35))
->c : Symbol(c, Decl(overloadCrash.ts, 1, 14))
->d : Symbol(d, Decl(overloadCrash.ts, 1, 23))
+>c : Symbol(I2.c, Decl(overloadCrash.ts, 1, 14))
+>d : Symbol(I2.d, Decl(overloadCrash.ts, 1, 23))
 
 interface I3 {a:number; b:number; c:number; d:number;};
 >I3 : Symbol(I3, Decl(overloadCrash.ts, 1, 35))
->a : Symbol(a, Decl(overloadCrash.ts, 2, 14))
->b : Symbol(b, Decl(overloadCrash.ts, 2, 23))
->c : Symbol(c, Decl(overloadCrash.ts, 2, 33))
->d : Symbol(d, Decl(overloadCrash.ts, 2, 43))
+>a : Symbol(I3.a, Decl(overloadCrash.ts, 2, 14))
+>b : Symbol(I3.b, Decl(overloadCrash.ts, 2, 23))
+>c : Symbol(I3.c, Decl(overloadCrash.ts, 2, 33))
+>d : Symbol(I3.d, Decl(overloadCrash.ts, 2, 43))
 
 declare function foo(...n:I1[]);
 >foo : Symbol(foo, Decl(overloadCrash.ts, 2, 55), Decl(overloadCrash.ts, 4, 32))
diff --git a/tests/baselines/reference/overloadGenericFunctionWithRestArgs.symbols b/tests/baselines/reference/overloadGenericFunctionWithRestArgs.symbols
index 52ee82e5d3c..c98e0c35d5a 100644
--- a/tests/baselines/reference/overloadGenericFunctionWithRestArgs.symbols
+++ b/tests/baselines/reference/overloadGenericFunctionWithRestArgs.symbols
@@ -4,7 +4,7 @@ class B<V>{
 >V : Symbol(V, Decl(overloadGenericFunctionWithRestArgs.ts, 0, 8))
 
     private id: V;
->id : Symbol(id, Decl(overloadGenericFunctionWithRestArgs.ts, 0, 11))
+>id : Symbol(B.id, Decl(overloadGenericFunctionWithRestArgs.ts, 0, 11))
 >V : Symbol(V, Decl(overloadGenericFunctionWithRestArgs.ts, 0, 8))
 }
 class A<U>{
@@ -12,7 +12,7 @@ class A<U>{
 >U : Symbol(U, Decl(overloadGenericFunctionWithRestArgs.ts, 3, 8))
 
     GetEnumerator: () => B<U>;
->GetEnumerator : Symbol(GetEnumerator, Decl(overloadGenericFunctionWithRestArgs.ts, 3, 11))
+>GetEnumerator : Symbol(A.GetEnumerator, Decl(overloadGenericFunctionWithRestArgs.ts, 3, 11))
 >B : Symbol(B, Decl(overloadGenericFunctionWithRestArgs.ts, 0, 0))
 >U : Symbol(U, Decl(overloadGenericFunctionWithRestArgs.ts, 3, 8))
 }
diff --git a/tests/baselines/reference/overloadModifiersMustAgree.errors.txt b/tests/baselines/reference/overloadModifiersMustAgree.errors.txt
index 0efdbcdd1f6..8fbc4b4fda5 100644
--- a/tests/baselines/reference/overloadModifiersMustAgree.errors.txt
+++ b/tests/baselines/reference/overloadModifiersMustAgree.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/overloadModifiersMustAgree.ts(2,12): error TS2385: Overload signatures must all be public, private or protected.
 tests/cases/compiler/overloadModifiersMustAgree.ts(6,18): error TS2384: Overload signatures must all be ambient or non-ambient.
-tests/cases/compiler/overloadModifiersMustAgree.ts(7,17): error TS2383: Overload signatures must all be exported or not exported.
+tests/cases/compiler/overloadModifiersMustAgree.ts(7,17): error TS2383: Overload signatures must all be exported or non-exported.
 tests/cases/compiler/overloadModifiersMustAgree.ts(12,5): error TS2386: Overload signatures must all be optional or required.
 
 
@@ -17,7 +17,7 @@ tests/cases/compiler/overloadModifiersMustAgree.ts(12,5): error TS2386: Overload
 !!! error TS2384: Overload signatures must all be ambient or non-ambient.
     export function bar(s: string);
                     ~~~
-!!! error TS2383: Overload signatures must all be exported or not exported.
+!!! error TS2383: Overload signatures must all be exported or non-exported.
     function bar(s?: string) { }
     
     interface I {
diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks1.symbols b/tests/baselines/reference/overloadOnConstConstraintChecks1.symbols
index 2eedf3254a2..6e86ccc2eb1 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks1.symbols
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks1.symbols
@@ -1,43 +1,43 @@
 === tests/cases/compiler/overloadOnConstConstraintChecks1.ts ===
 class Base { foo() { } }
 >Base : Symbol(Base, Decl(overloadOnConstConstraintChecks1.ts, 0, 0))
->foo : Symbol(foo, Decl(overloadOnConstConstraintChecks1.ts, 0, 12))
+>foo : Symbol(Base.foo, Decl(overloadOnConstConstraintChecks1.ts, 0, 12))
 
 class Derived1 extends Base { bar() { } }
 >Derived1 : Symbol(Derived1, Decl(overloadOnConstConstraintChecks1.ts, 0, 24))
 >Base : Symbol(Base, Decl(overloadOnConstConstraintChecks1.ts, 0, 0))
->bar : Symbol(bar, Decl(overloadOnConstConstraintChecks1.ts, 1, 29))
+>bar : Symbol(Derived1.bar, Decl(overloadOnConstConstraintChecks1.ts, 1, 29))
 
 class Derived2 extends Base { baz() { } }
 >Derived2 : Symbol(Derived2, Decl(overloadOnConstConstraintChecks1.ts, 1, 41))
 >Base : Symbol(Base, Decl(overloadOnConstConstraintChecks1.ts, 0, 0))
->baz : Symbol(baz, Decl(overloadOnConstConstraintChecks1.ts, 2, 29))
+>baz : Symbol(Derived2.baz, Decl(overloadOnConstConstraintChecks1.ts, 2, 29))
 
 class Derived3 extends Base { biz() { } }
 >Derived3 : Symbol(Derived3, Decl(overloadOnConstConstraintChecks1.ts, 2, 41))
 >Base : Symbol(Base, Decl(overloadOnConstConstraintChecks1.ts, 0, 0))
->biz : Symbol(biz, Decl(overloadOnConstConstraintChecks1.ts, 3, 29))
+>biz : Symbol(Derived3.biz, Decl(overloadOnConstConstraintChecks1.ts, 3, 29))
 
 interface MyDoc { // Document
 >MyDoc : Symbol(MyDoc, Decl(overloadOnConstConstraintChecks1.ts, 3, 41))
 
     createElement(tagName: string): Base;
->createElement : Symbol(createElement, Decl(overloadOnConstConstraintChecks1.ts, 5, 17), Decl(overloadOnConstConstraintChecks1.ts, 6, 41), Decl(overloadOnConstConstraintChecks1.ts, 7, 47), Decl(overloadOnConstConstraintChecks1.ts, 8, 44))
+>createElement : Symbol(MyDoc.createElement, Decl(overloadOnConstConstraintChecks1.ts, 5, 17), Decl(overloadOnConstConstraintChecks1.ts, 6, 41), Decl(overloadOnConstConstraintChecks1.ts, 7, 47), Decl(overloadOnConstConstraintChecks1.ts, 8, 44))
 >tagName : Symbol(tagName, Decl(overloadOnConstConstraintChecks1.ts, 6, 18))
 >Base : Symbol(Base, Decl(overloadOnConstConstraintChecks1.ts, 0, 0))
 
     createElement(tagName: 'canvas'): Derived1;
->createElement : Symbol(createElement, Decl(overloadOnConstConstraintChecks1.ts, 5, 17), Decl(overloadOnConstConstraintChecks1.ts, 6, 41), Decl(overloadOnConstConstraintChecks1.ts, 7, 47), Decl(overloadOnConstConstraintChecks1.ts, 8, 44))
+>createElement : Symbol(MyDoc.createElement, Decl(overloadOnConstConstraintChecks1.ts, 5, 17), Decl(overloadOnConstConstraintChecks1.ts, 6, 41), Decl(overloadOnConstConstraintChecks1.ts, 7, 47), Decl(overloadOnConstConstraintChecks1.ts, 8, 44))
 >tagName : Symbol(tagName, Decl(overloadOnConstConstraintChecks1.ts, 7, 18))
 >Derived1 : Symbol(Derived1, Decl(overloadOnConstConstraintChecks1.ts, 0, 24))
 
     createElement(tagName: 'div'): Derived2;
->createElement : Symbol(createElement, Decl(overloadOnConstConstraintChecks1.ts, 5, 17), Decl(overloadOnConstConstraintChecks1.ts, 6, 41), Decl(overloadOnConstConstraintChecks1.ts, 7, 47), Decl(overloadOnConstConstraintChecks1.ts, 8, 44))
+>createElement : Symbol(MyDoc.createElement, Decl(overloadOnConstConstraintChecks1.ts, 5, 17), Decl(overloadOnConstConstraintChecks1.ts, 6, 41), Decl(overloadOnConstConstraintChecks1.ts, 7, 47), Decl(overloadOnConstConstraintChecks1.ts, 8, 44))
 >tagName : Symbol(tagName, Decl(overloadOnConstConstraintChecks1.ts, 8, 18))
 >Derived2 : Symbol(Derived2, Decl(overloadOnConstConstraintChecks1.ts, 1, 41))
 
     createElement(tagName: 'span'): Derived3;
->createElement : Symbol(createElement, Decl(overloadOnConstConstraintChecks1.ts, 5, 17), Decl(overloadOnConstConstraintChecks1.ts, 6, 41), Decl(overloadOnConstConstraintChecks1.ts, 7, 47), Decl(overloadOnConstConstraintChecks1.ts, 8, 44))
+>createElement : Symbol(MyDoc.createElement, Decl(overloadOnConstConstraintChecks1.ts, 5, 17), Decl(overloadOnConstConstraintChecks1.ts, 6, 41), Decl(overloadOnConstConstraintChecks1.ts, 7, 47), Decl(overloadOnConstConstraintChecks1.ts, 8, 44))
 >tagName : Symbol(tagName, Decl(overloadOnConstConstraintChecks1.ts, 9, 18))
 >Derived3 : Symbol(Derived3, Decl(overloadOnConstConstraintChecks1.ts, 2, 41))
 
@@ -49,27 +49,27 @@ class D implements MyDoc {
 >MyDoc : Symbol(MyDoc, Decl(overloadOnConstConstraintChecks1.ts, 3, 41))
 
     createElement(tagName:string): Base;
->createElement : Symbol(createElement, Decl(overloadOnConstConstraintChecks1.ts, 13, 26), Decl(overloadOnConstConstraintChecks1.ts, 14, 40), Decl(overloadOnConstConstraintChecks1.ts, 15, 47), Decl(overloadOnConstConstraintChecks1.ts, 16, 44), Decl(overloadOnConstConstraintChecks1.ts, 17, 45))
+>createElement : Symbol(D.createElement, Decl(overloadOnConstConstraintChecks1.ts, 13, 26), Decl(overloadOnConstConstraintChecks1.ts, 14, 40), Decl(overloadOnConstConstraintChecks1.ts, 15, 47), Decl(overloadOnConstConstraintChecks1.ts, 16, 44), Decl(overloadOnConstConstraintChecks1.ts, 17, 45))
 >tagName : Symbol(tagName, Decl(overloadOnConstConstraintChecks1.ts, 14, 18))
 >Base : Symbol(Base, Decl(overloadOnConstConstraintChecks1.ts, 0, 0))
 
     createElement(tagName: 'canvas'): Derived1;
->createElement : Symbol(createElement, Decl(overloadOnConstConstraintChecks1.ts, 13, 26), Decl(overloadOnConstConstraintChecks1.ts, 14, 40), Decl(overloadOnConstConstraintChecks1.ts, 15, 47), Decl(overloadOnConstConstraintChecks1.ts, 16, 44), Decl(overloadOnConstConstraintChecks1.ts, 17, 45))
+>createElement : Symbol(D.createElement, Decl(overloadOnConstConstraintChecks1.ts, 13, 26), Decl(overloadOnConstConstraintChecks1.ts, 14, 40), Decl(overloadOnConstConstraintChecks1.ts, 15, 47), Decl(overloadOnConstConstraintChecks1.ts, 16, 44), Decl(overloadOnConstConstraintChecks1.ts, 17, 45))
 >tagName : Symbol(tagName, Decl(overloadOnConstConstraintChecks1.ts, 15, 18))
 >Derived1 : Symbol(Derived1, Decl(overloadOnConstConstraintChecks1.ts, 0, 24))
 
     createElement(tagName: 'div'): Derived2;
->createElement : Symbol(createElement, Decl(overloadOnConstConstraintChecks1.ts, 13, 26), Decl(overloadOnConstConstraintChecks1.ts, 14, 40), Decl(overloadOnConstConstraintChecks1.ts, 15, 47), Decl(overloadOnConstConstraintChecks1.ts, 16, 44), Decl(overloadOnConstConstraintChecks1.ts, 17, 45))
+>createElement : Symbol(D.createElement, Decl(overloadOnConstConstraintChecks1.ts, 13, 26), Decl(overloadOnConstConstraintChecks1.ts, 14, 40), Decl(overloadOnConstConstraintChecks1.ts, 15, 47), Decl(overloadOnConstConstraintChecks1.ts, 16, 44), Decl(overloadOnConstConstraintChecks1.ts, 17, 45))
 >tagName : Symbol(tagName, Decl(overloadOnConstConstraintChecks1.ts, 16, 18))
 >Derived2 : Symbol(Derived2, Decl(overloadOnConstConstraintChecks1.ts, 1, 41))
 
     createElement(tagName: 'span'): Derived3;
->createElement : Symbol(createElement, Decl(overloadOnConstConstraintChecks1.ts, 13, 26), Decl(overloadOnConstConstraintChecks1.ts, 14, 40), Decl(overloadOnConstConstraintChecks1.ts, 15, 47), Decl(overloadOnConstConstraintChecks1.ts, 16, 44), Decl(overloadOnConstConstraintChecks1.ts, 17, 45))
+>createElement : Symbol(D.createElement, Decl(overloadOnConstConstraintChecks1.ts, 13, 26), Decl(overloadOnConstConstraintChecks1.ts, 14, 40), Decl(overloadOnConstConstraintChecks1.ts, 15, 47), Decl(overloadOnConstConstraintChecks1.ts, 16, 44), Decl(overloadOnConstConstraintChecks1.ts, 17, 45))
 >tagName : Symbol(tagName, Decl(overloadOnConstConstraintChecks1.ts, 17, 18))
 >Derived3 : Symbol(Derived3, Decl(overloadOnConstConstraintChecks1.ts, 2, 41))
 
     createElement(tagName:any): Base {
->createElement : Symbol(createElement, Decl(overloadOnConstConstraintChecks1.ts, 13, 26), Decl(overloadOnConstConstraintChecks1.ts, 14, 40), Decl(overloadOnConstConstraintChecks1.ts, 15, 47), Decl(overloadOnConstConstraintChecks1.ts, 16, 44), Decl(overloadOnConstConstraintChecks1.ts, 17, 45))
+>createElement : Symbol(D.createElement, Decl(overloadOnConstConstraintChecks1.ts, 13, 26), Decl(overloadOnConstConstraintChecks1.ts, 14, 40), Decl(overloadOnConstConstraintChecks1.ts, 15, 47), Decl(overloadOnConstConstraintChecks1.ts, 16, 44), Decl(overloadOnConstConstraintChecks1.ts, 17, 45))
 >tagName : Symbol(tagName, Decl(overloadOnConstConstraintChecks1.ts, 18, 18))
 >Base : Symbol(Base, Decl(overloadOnConstConstraintChecks1.ts, 0, 0))
 
diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks2.symbols b/tests/baselines/reference/overloadOnConstConstraintChecks2.symbols
index 0c5bd49b4f3..1ef43f1f941 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks2.symbols
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks2.symbols
@@ -11,7 +11,7 @@ class C extends A {
 >A : Symbol(A, Decl(overloadOnConstConstraintChecks2.ts, 0, 0))
 
     public foo() { }
->foo : Symbol(foo, Decl(overloadOnConstConstraintChecks2.ts, 2, 19))
+>foo : Symbol(C.foo, Decl(overloadOnConstConstraintChecks2.ts, 2, 19))
 }
 function foo(name: 'hi'): B;
 >foo : Symbol(foo, Decl(overloadOnConstConstraintChecks2.ts, 4, 1), Decl(overloadOnConstConstraintChecks2.ts, 5, 28), Decl(overloadOnConstConstraintChecks2.ts, 6, 29), Decl(overloadOnConstConstraintChecks2.ts, 7, 30))
diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks3.symbols b/tests/baselines/reference/overloadOnConstConstraintChecks3.symbols
index 5748fd441a5..3232ca9a94b 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks3.symbols
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks3.symbols
@@ -1,7 +1,7 @@
 === tests/cases/compiler/overloadOnConstConstraintChecks3.ts ===
 class A { private x = 1} 
 >A : Symbol(A, Decl(overloadOnConstConstraintChecks3.ts, 0, 0))
->x : Symbol(x, Decl(overloadOnConstConstraintChecks3.ts, 0, 9))
+>x : Symbol(A.x, Decl(overloadOnConstConstraintChecks3.ts, 0, 9))
 
 class B extends A {}
 >B : Symbol(B, Decl(overloadOnConstConstraintChecks3.ts, 0, 24))
@@ -12,7 +12,7 @@ class C extends A {
 >A : Symbol(A, Decl(overloadOnConstConstraintChecks3.ts, 0, 0))
 
     public foo() { }
->foo : Symbol(foo, Decl(overloadOnConstConstraintChecks3.ts, 2, 19))
+>foo : Symbol(C.foo, Decl(overloadOnConstConstraintChecks3.ts, 2, 19))
 }
 function foo(name: 'hi'): B;
 >foo : Symbol(foo, Decl(overloadOnConstConstraintChecks3.ts, 4, 1), Decl(overloadOnConstConstraintChecks3.ts, 5, 28), Decl(overloadOnConstConstraintChecks3.ts, 6, 29), Decl(overloadOnConstConstraintChecks3.ts, 7, 30))
diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks4.symbols b/tests/baselines/reference/overloadOnConstConstraintChecks4.symbols
index 6e2a34b55e9..d50030fde3d 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks4.symbols
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks4.symbols
@@ -5,7 +5,7 @@ class Z { }
 class A extends Z { private x = 1 }
 >A : Symbol(A, Decl(overloadOnConstConstraintChecks4.ts, 0, 11))
 >Z : Symbol(Z, Decl(overloadOnConstConstraintChecks4.ts, 0, 0))
->x : Symbol(x, Decl(overloadOnConstConstraintChecks4.ts, 1, 19))
+>x : Symbol(A.x, Decl(overloadOnConstConstraintChecks4.ts, 1, 19))
 
 class B extends A {}
 >B : Symbol(B, Decl(overloadOnConstConstraintChecks4.ts, 1, 35))
@@ -16,7 +16,7 @@ class C extends A {
 >A : Symbol(A, Decl(overloadOnConstConstraintChecks4.ts, 0, 11))
 
     public foo() { }
->foo : Symbol(foo, Decl(overloadOnConstConstraintChecks4.ts, 3, 19))
+>foo : Symbol(C.foo, Decl(overloadOnConstConstraintChecks4.ts, 3, 19))
 }
 function foo(name: 'hi'): B;
 >foo : Symbol(foo, Decl(overloadOnConstConstraintChecks4.ts, 5, 1), Decl(overloadOnConstConstraintChecks4.ts, 6, 28), Decl(overloadOnConstConstraintChecks4.ts, 7, 29), Decl(overloadOnConstConstraintChecks4.ts, 8, 30))
diff --git a/tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.symbols b/tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.symbols
index 6e4429759e2..de3aae746a2 100644
--- a/tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.symbols
+++ b/tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.symbols
@@ -3,7 +3,7 @@ interface I {
 >I : Symbol(I, Decl(overloadOnConstInBaseWithBadImplementationInDerived.ts, 0, 0))
 
     x1(a: number, callback: (x: 'hi') => number);
->x1 : Symbol(x1, Decl(overloadOnConstInBaseWithBadImplementationInDerived.ts, 0, 13))
+>x1 : Symbol(I.x1, Decl(overloadOnConstInBaseWithBadImplementationInDerived.ts, 0, 13))
 >a : Symbol(a, Decl(overloadOnConstInBaseWithBadImplementationInDerived.ts, 1, 7))
 >callback : Symbol(callback, Decl(overloadOnConstInBaseWithBadImplementationInDerived.ts, 1, 17))
 >x : Symbol(x, Decl(overloadOnConstInBaseWithBadImplementationInDerived.ts, 1, 29))
@@ -14,7 +14,7 @@ class C implements I {
 >I : Symbol(I, Decl(overloadOnConstInBaseWithBadImplementationInDerived.ts, 0, 0))
 
     x1(a: number, callback: (x: 'hi') => number) { // error
->x1 : Symbol(x1, Decl(overloadOnConstInBaseWithBadImplementationInDerived.ts, 4, 22))
+>x1 : Symbol(C.x1, Decl(overloadOnConstInBaseWithBadImplementationInDerived.ts, 4, 22))
 >a : Symbol(a, Decl(overloadOnConstInBaseWithBadImplementationInDerived.ts, 5, 7))
 >callback : Symbol(callback, Decl(overloadOnConstInBaseWithBadImplementationInDerived.ts, 5, 17))
 >x : Symbol(x, Decl(overloadOnConstInBaseWithBadImplementationInDerived.ts, 5, 29))
diff --git a/tests/baselines/reference/overloadOnConstInCallback1.symbols b/tests/baselines/reference/overloadOnConstInCallback1.symbols
index 923c726714e..935d7f3b607 100644
--- a/tests/baselines/reference/overloadOnConstInCallback1.symbols
+++ b/tests/baselines/reference/overloadOnConstInCallback1.symbols
@@ -3,13 +3,13 @@ class C {
 >C : Symbol(C, Decl(overloadOnConstInCallback1.ts, 0, 0))
 
     x1(a: number, callback: (x: 'hi') => number); // error
->x1 : Symbol(x1, Decl(overloadOnConstInCallback1.ts, 0, 9), Decl(overloadOnConstInCallback1.ts, 1, 49))
+>x1 : Symbol(C.x1, Decl(overloadOnConstInCallback1.ts, 0, 9), Decl(overloadOnConstInCallback1.ts, 1, 49))
 >a : Symbol(a, Decl(overloadOnConstInCallback1.ts, 1, 7))
 >callback : Symbol(callback, Decl(overloadOnConstInCallback1.ts, 1, 17))
 >x : Symbol(x, Decl(overloadOnConstInCallback1.ts, 1, 29))
 
     x1(a: number, callback: (x: any) => number) {
->x1 : Symbol(x1, Decl(overloadOnConstInCallback1.ts, 0, 9), Decl(overloadOnConstInCallback1.ts, 1, 49))
+>x1 : Symbol(C.x1, Decl(overloadOnConstInCallback1.ts, 0, 9), Decl(overloadOnConstInCallback1.ts, 1, 49))
 >a : Symbol(a, Decl(overloadOnConstInCallback1.ts, 2, 7))
 >callback : Symbol(callback, Decl(overloadOnConstInCallback1.ts, 2, 17))
 >x : Symbol(x, Decl(overloadOnConstInCallback1.ts, 2, 29))
diff --git a/tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.symbols b/tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.symbols
index 9ea93140085..98873216523 100644
--- a/tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.symbols
+++ b/tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.symbols
@@ -3,7 +3,7 @@ interface I {
 >I : Symbol(I, Decl(overloadOnConstInObjectLiteralImplementingAnInterface.ts, 0, 0))
 
     x1(a: number, callback: (x: 'hi') => number);
->x1 : Symbol(x1, Decl(overloadOnConstInObjectLiteralImplementingAnInterface.ts, 0, 13))
+>x1 : Symbol(I.x1, Decl(overloadOnConstInObjectLiteralImplementingAnInterface.ts, 0, 13))
 >a : Symbol(a, Decl(overloadOnConstInObjectLiteralImplementingAnInterface.ts, 1, 7))
 >callback : Symbol(callback, Decl(overloadOnConstInObjectLiteralImplementingAnInterface.ts, 1, 17))
 >x : Symbol(x, Decl(overloadOnConstInObjectLiteralImplementingAnInterface.ts, 1, 29))
diff --git a/tests/baselines/reference/overloadOnConstInheritance1.symbols b/tests/baselines/reference/overloadOnConstInheritance1.symbols
index c5cc9b52abc..4cd7ef13209 100644
--- a/tests/baselines/reference/overloadOnConstInheritance1.symbols
+++ b/tests/baselines/reference/overloadOnConstInheritance1.symbols
@@ -3,11 +3,11 @@ interface Base {
 >Base : Symbol(Base, Decl(overloadOnConstInheritance1.ts, 0, 0))
 
     addEventListener(x: string): any;
->addEventListener : Symbol(addEventListener, Decl(overloadOnConstInheritance1.ts, 0, 16), Decl(overloadOnConstInheritance1.ts, 1, 37))
+>addEventListener : Symbol(Base.addEventListener, Decl(overloadOnConstInheritance1.ts, 0, 16), Decl(overloadOnConstInheritance1.ts, 1, 37))
 >x : Symbol(x, Decl(overloadOnConstInheritance1.ts, 1, 21))
 
     addEventListener(x: 'foo'): string;
->addEventListener : Symbol(addEventListener, Decl(overloadOnConstInheritance1.ts, 0, 16), Decl(overloadOnConstInheritance1.ts, 1, 37))
+>addEventListener : Symbol(Base.addEventListener, Decl(overloadOnConstInheritance1.ts, 0, 16), Decl(overloadOnConstInheritance1.ts, 1, 37))
 >x : Symbol(x, Decl(overloadOnConstInheritance1.ts, 2, 21))
 }
 interface Deriver extends Base {
@@ -15,11 +15,11 @@ interface Deriver extends Base {
 >Base : Symbol(Base, Decl(overloadOnConstInheritance1.ts, 0, 0))
 
     addEventListener(x: string): any;
->addEventListener : Symbol(addEventListener, Decl(overloadOnConstInheritance1.ts, 4, 32), Decl(overloadOnConstInheritance1.ts, 5, 37))
+>addEventListener : Symbol(Deriver.addEventListener, Decl(overloadOnConstInheritance1.ts, 4, 32), Decl(overloadOnConstInheritance1.ts, 5, 37))
 >x : Symbol(x, Decl(overloadOnConstInheritance1.ts, 5, 21))
 
     addEventListener(x: 'bar'): string;
->addEventListener : Symbol(addEventListener, Decl(overloadOnConstInheritance1.ts, 4, 32), Decl(overloadOnConstInheritance1.ts, 5, 37))
+>addEventListener : Symbol(Deriver.addEventListener, Decl(overloadOnConstInheritance1.ts, 4, 32), Decl(overloadOnConstInheritance1.ts, 5, 37))
 >x : Symbol(x, Decl(overloadOnConstInheritance1.ts, 6, 21))
 }
 
diff --git a/tests/baselines/reference/overloadOnConstInheritance2.errors.txt b/tests/baselines/reference/overloadOnConstInheritance2.errors.txt
index 3e25a825d1a..8d104fc1ab0 100644
--- a/tests/baselines/reference/overloadOnConstInheritance2.errors.txt
+++ b/tests/baselines/reference/overloadOnConstInheritance2.errors.txt
@@ -2,7 +2,7 @@ tests/cases/compiler/overloadOnConstInheritance2.ts(5,11): error TS2430: Interfa
   Types of property 'addEventListener' are incompatible.
     Type '(x: "bar") => string' is not assignable to type '{ (x: string): any; (x: "foo"): string; }'.
       Types of parameters 'x' and 'x' are incompatible.
-        Type '"bar"' is not assignable to type '"foo"'.
+        Type '"foo"' is not assignable to type '"bar"'.
 
 
 ==== tests/cases/compiler/overloadOnConstInheritance2.ts (1 errors) ====
@@ -16,7 +16,7 @@ tests/cases/compiler/overloadOnConstInheritance2.ts(5,11): error TS2430: Interfa
 !!! error TS2430:   Types of property 'addEventListener' are incompatible.
 !!! error TS2430:     Type '(x: "bar") => string' is not assignable to type '{ (x: string): any; (x: "foo"): string; }'.
 !!! error TS2430:       Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2430:         Type '"bar"' is not assignable to type '"foo"'.
+!!! error TS2430:         Type '"foo"' is not assignable to type '"bar"'.
         addEventListener(x: 'bar'): string; // shouldn't need to redeclare the string overload
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/overloadOnConstInheritance3.symbols b/tests/baselines/reference/overloadOnConstInheritance3.symbols
index 32d07b19285..e73c3e88084 100644
--- a/tests/baselines/reference/overloadOnConstInheritance3.symbols
+++ b/tests/baselines/reference/overloadOnConstInheritance3.symbols
@@ -3,7 +3,7 @@ interface Base {
 >Base : Symbol(Base, Decl(overloadOnConstInheritance3.ts, 0, 0))
 
     addEventListener(x: string): any;
->addEventListener : Symbol(addEventListener, Decl(overloadOnConstInheritance3.ts, 0, 16))
+>addEventListener : Symbol(Base.addEventListener, Decl(overloadOnConstInheritance3.ts, 0, 16))
 >x : Symbol(x, Decl(overloadOnConstInheritance3.ts, 1, 21))
 }
 interface Deriver extends Base {
@@ -12,11 +12,11 @@ interface Deriver extends Base {
 
     // shouldn't need to redeclare the string overload
     addEventListener(x: 'bar'): string;
->addEventListener : Symbol(addEventListener, Decl(overloadOnConstInheritance3.ts, 3, 32), Decl(overloadOnConstInheritance3.ts, 5, 39))
+>addEventListener : Symbol(Deriver.addEventListener, Decl(overloadOnConstInheritance3.ts, 3, 32), Decl(overloadOnConstInheritance3.ts, 5, 39))
 >x : Symbol(x, Decl(overloadOnConstInheritance3.ts, 5, 21))
 
     addEventListener(x: 'foo'): string;
->addEventListener : Symbol(addEventListener, Decl(overloadOnConstInheritance3.ts, 3, 32), Decl(overloadOnConstInheritance3.ts, 5, 39))
+>addEventListener : Symbol(Deriver.addEventListener, Decl(overloadOnConstInheritance3.ts, 3, 32), Decl(overloadOnConstInheritance3.ts, 5, 39))
 >x : Symbol(x, Decl(overloadOnConstInheritance3.ts, 6, 21))
 }
 
diff --git a/tests/baselines/reference/overloadOnConstInheritance4.symbols b/tests/baselines/reference/overloadOnConstInheritance4.symbols
index 9bfa61e6aa9..8902b0442fd 100644
--- a/tests/baselines/reference/overloadOnConstInheritance4.symbols
+++ b/tests/baselines/reference/overloadOnConstInheritance4.symbols
@@ -3,7 +3,7 @@ interface I {
 >I : Symbol(I, Decl(overloadOnConstInheritance4.ts, 0, 0))
 
     x1(a: number, callback: (x: 'hi') => number);
->x1 : Symbol(x1, Decl(overloadOnConstInheritance4.ts, 0, 13))
+>x1 : Symbol(I.x1, Decl(overloadOnConstInheritance4.ts, 0, 13))
 >a : Symbol(a, Decl(overloadOnConstInheritance4.ts, 1, 7))
 >callback : Symbol(callback, Decl(overloadOnConstInheritance4.ts, 1, 17))
 >x : Symbol(x, Decl(overloadOnConstInheritance4.ts, 1, 29))
@@ -13,13 +13,13 @@ class C implements I {
 >I : Symbol(I, Decl(overloadOnConstInheritance4.ts, 0, 0))
 
     x1(a: number, callback: (x: 'hi') => number);
->x1 : Symbol(x1, Decl(overloadOnConstInheritance4.ts, 3, 22), Decl(overloadOnConstInheritance4.ts, 4, 49))
+>x1 : Symbol(C.x1, Decl(overloadOnConstInheritance4.ts, 3, 22), Decl(overloadOnConstInheritance4.ts, 4, 49))
 >a : Symbol(a, Decl(overloadOnConstInheritance4.ts, 4, 7))
 >callback : Symbol(callback, Decl(overloadOnConstInheritance4.ts, 4, 17))
 >x : Symbol(x, Decl(overloadOnConstInheritance4.ts, 4, 29))
 
     x1(a: number, callback: (x: 'hi') => number) {
->x1 : Symbol(x1, Decl(overloadOnConstInheritance4.ts, 3, 22), Decl(overloadOnConstInheritance4.ts, 4, 49))
+>x1 : Symbol(C.x1, Decl(overloadOnConstInheritance4.ts, 3, 22), Decl(overloadOnConstInheritance4.ts, 4, 49))
 >a : Symbol(a, Decl(overloadOnConstInheritance4.ts, 5, 7))
 >callback : Symbol(callback, Decl(overloadOnConstInheritance4.ts, 5, 17))
 >x : Symbol(x, Decl(overloadOnConstInheritance4.ts, 5, 29))
diff --git a/tests/baselines/reference/overloadOnConstNoAnyImplementation2.errors.txt b/tests/baselines/reference/overloadOnConstNoAnyImplementation2.errors.txt
index bfd888c9912..8723a79d474 100644
--- a/tests/baselines/reference/overloadOnConstNoAnyImplementation2.errors.txt
+++ b/tests/baselines/reference/overloadOnConstNoAnyImplementation2.errors.txt
@@ -1,10 +1,10 @@
 tests/cases/compiler/overloadOnConstNoAnyImplementation2.ts(12,18): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'.
 tests/cases/compiler/overloadOnConstNoAnyImplementation2.ts(18,9): error TS2345: Argument of type '(x: "bye") => number' is not assignable to parameter of type '(x: "hi") => number'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type '"bye"' is not assignable to type '"hi"'.
+    Type '"hi"' is not assignable to type '"bye"'.
 tests/cases/compiler/overloadOnConstNoAnyImplementation2.ts(21,9): error TS2345: Argument of type '(x: number) => number' is not assignable to parameter of type '(x: "hi") => number'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type 'number' is not assignable to type '"hi"'.
+    Type '"hi"' is not assignable to type 'number'.
 
 
 ==== tests/cases/compiler/overloadOnConstNoAnyImplementation2.ts (3 errors) ====
@@ -31,11 +31,11 @@ tests/cases/compiler/overloadOnConstNoAnyImplementation2.ts(21,9): error TS2345:
             ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: "bye") => number' is not assignable to parameter of type '(x: "hi") => number'.
 !!! error TS2345:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2345:     Type '"bye"' is not assignable to type '"hi"'.
+!!! error TS2345:     Type '"hi"' is not assignable to type '"bye"'.
     c.x1(1, (x) => { return 1; } );
     
     c.x1(1, (x: number) => { return 1; } );
             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number) => number' is not assignable to parameter of type '(x: "hi") => number'.
 !!! error TS2345:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2345:     Type 'number' is not assignable to type '"hi"'.
\ No newline at end of file
+!!! error TS2345:     Type '"hi"' is not assignable to type 'number'.
\ No newline at end of file
diff --git a/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.symbols b/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.symbols
index ff7f88f43c3..bb1633940ba 100644
--- a/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.symbols
+++ b/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.symbols
@@ -3,11 +3,11 @@ class C {
 >C : Symbol(C, Decl(overloadOnConstNoNonSpecializedSignature.ts, 0, 0))
 
    x1(a: 'hi'); // error, no non-specialized signature in overload list
->x1 : Symbol(x1, Decl(overloadOnConstNoNonSpecializedSignature.ts, 0, 9), Decl(overloadOnConstNoNonSpecializedSignature.ts, 1, 15))
+>x1 : Symbol(C.x1, Decl(overloadOnConstNoNonSpecializedSignature.ts, 0, 9), Decl(overloadOnConstNoNonSpecializedSignature.ts, 1, 15))
 >a : Symbol(a, Decl(overloadOnConstNoNonSpecializedSignature.ts, 1, 6))
 
    x1(a: string) { }
->x1 : Symbol(x1, Decl(overloadOnConstNoNonSpecializedSignature.ts, 0, 9), Decl(overloadOnConstNoNonSpecializedSignature.ts, 1, 15))
+>x1 : Symbol(C.x1, Decl(overloadOnConstNoNonSpecializedSignature.ts, 0, 9), Decl(overloadOnConstNoNonSpecializedSignature.ts, 1, 15))
 >a : Symbol(a, Decl(overloadOnConstNoNonSpecializedSignature.ts, 2, 6))
 }
 
diff --git a/tests/baselines/reference/overloadOnConstNoStringImplementation2.errors.txt b/tests/baselines/reference/overloadOnConstNoStringImplementation2.errors.txt
index fddfa04eef7..e7ac72eb052 100644
--- a/tests/baselines/reference/overloadOnConstNoStringImplementation2.errors.txt
+++ b/tests/baselines/reference/overloadOnConstNoStringImplementation2.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/compiler/overloadOnConstNoStringImplementation2.ts(18,9): error TS2345: Argument of type '(x: "bye") => number' is not assignable to parameter of type '(x: "hi") => number'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type '"bye"' is not assignable to type '"hi"'.
+    Type '"hi"' is not assignable to type '"bye"'.
 tests/cases/compiler/overloadOnConstNoStringImplementation2.ts(20,9): error TS2345: Argument of type '(x: number) => number' is not assignable to parameter of type '(x: "hi") => number'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type 'number' is not assignable to type '"hi"'.
+    Type '"hi"' is not assignable to type 'number'.
 
 
 ==== tests/cases/compiler/overloadOnConstNoStringImplementation2.ts (2 errors) ====
@@ -28,10 +28,10 @@ tests/cases/compiler/overloadOnConstNoStringImplementation2.ts(20,9): error TS23
             ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: "bye") => number' is not assignable to parameter of type '(x: "hi") => number'.
 !!! error TS2345:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2345:     Type '"bye"' is not assignable to type '"hi"'.
+!!! error TS2345:     Type '"hi"' is not assignable to type '"bye"'.
     c.x1(1, (x: string) => { return 1; } );
     c.x1(1, (x: number) => { return 1; } );
             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number) => number' is not assignable to parameter of type '(x: "hi") => number'.
 !!! error TS2345:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2345:     Type 'number' is not assignable to type '"hi"'.
\ No newline at end of file
+!!! error TS2345:     Type '"hi"' is not assignable to type 'number'.
\ No newline at end of file
diff --git a/tests/baselines/reference/overloadOnGenericArity.symbols b/tests/baselines/reference/overloadOnGenericArity.symbols
index a9fddb65177..a50a788b4e8 100644
--- a/tests/baselines/reference/overloadOnGenericArity.symbols
+++ b/tests/baselines/reference/overloadOnGenericArity.symbols
@@ -3,14 +3,14 @@ interface Test {
 >Test : Symbol(Test, Decl(overloadOnGenericArity.ts, 0, 0))
 
     then<U>(p: string): string;
->then : Symbol(then, Decl(overloadOnGenericArity.ts, 0, 16), Decl(overloadOnGenericArity.ts, 1, 31))
+>then : Symbol(Test.then, Decl(overloadOnGenericArity.ts, 0, 16), Decl(overloadOnGenericArity.ts, 1, 31))
 >U : Symbol(U, Decl(overloadOnGenericArity.ts, 1, 9))
 >p : Symbol(p, Decl(overloadOnGenericArity.ts, 1, 12))
 
     then(p: string): Date; // Error: Overloads cannot differ only by return type
->then : Symbol(then, Decl(overloadOnGenericArity.ts, 0, 16), Decl(overloadOnGenericArity.ts, 1, 31))
+>then : Symbol(Test.then, Decl(overloadOnGenericArity.ts, 0, 16), Decl(overloadOnGenericArity.ts, 1, 31))
 >p : Symbol(p, Decl(overloadOnGenericArity.ts, 2, 9))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
   
 
diff --git a/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.symbols b/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.symbols
index 8c4b74f89a2..daf7c34cf00 100644
--- a/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.symbols
+++ b/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.symbols
@@ -1,29 +1,29 @@
 === tests/cases/compiler/overloadOnGenericClassAndNonGenericClass.ts ===
 class A { a; }
 >A : Symbol(A, Decl(overloadOnGenericClassAndNonGenericClass.ts, 0, 0))
->a : Symbol(a, Decl(overloadOnGenericClassAndNonGenericClass.ts, 0, 9))
+>a : Symbol(A.a, Decl(overloadOnGenericClassAndNonGenericClass.ts, 0, 9))
 
 class B { b; }
 >B : Symbol(B, Decl(overloadOnGenericClassAndNonGenericClass.ts, 0, 14))
->b : Symbol(b, Decl(overloadOnGenericClassAndNonGenericClass.ts, 1, 9))
+>b : Symbol(B.b, Decl(overloadOnGenericClassAndNonGenericClass.ts, 1, 9))
 
 class C { c; }
 >C : Symbol(C, Decl(overloadOnGenericClassAndNonGenericClass.ts, 1, 14))
->c : Symbol(c, Decl(overloadOnGenericClassAndNonGenericClass.ts, 2, 9))
+>c : Symbol(C.c, Decl(overloadOnGenericClassAndNonGenericClass.ts, 2, 9))
 
 class X<T> { x: T; }
 >X : Symbol(X, Decl(overloadOnGenericClassAndNonGenericClass.ts, 2, 14))
 >T : Symbol(T, Decl(overloadOnGenericClassAndNonGenericClass.ts, 3, 8))
->x : Symbol(x, Decl(overloadOnGenericClassAndNonGenericClass.ts, 3, 12))
+>x : Symbol(X.x, Decl(overloadOnGenericClassAndNonGenericClass.ts, 3, 12))
 >T : Symbol(T, Decl(overloadOnGenericClassAndNonGenericClass.ts, 3, 8))
 
 class X1 { x: string; }
 >X1 : Symbol(X1, Decl(overloadOnGenericClassAndNonGenericClass.ts, 3, 20))
->x : Symbol(x, Decl(overloadOnGenericClassAndNonGenericClass.ts, 4, 10))
+>x : Symbol(X1.x, Decl(overloadOnGenericClassAndNonGenericClass.ts, 4, 10))
 
 class X2 { x: string; }
 >X2 : Symbol(X2, Decl(overloadOnGenericClassAndNonGenericClass.ts, 4, 23))
->x : Symbol(x, Decl(overloadOnGenericClassAndNonGenericClass.ts, 5, 10))
+>x : Symbol(X2.x, Decl(overloadOnGenericClassAndNonGenericClass.ts, 5, 10))
 
 function f(a: X1): A;
 >f : Symbol(f, Decl(overloadOnGenericClassAndNonGenericClass.ts, 5, 23), Decl(overloadOnGenericClassAndNonGenericClass.ts, 6, 21), Decl(overloadOnGenericClassAndNonGenericClass.ts, 7, 26))
diff --git a/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.symbols b/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.symbols
index d352216b74e..7ca4614ebe7 100644
--- a/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.symbols
+++ b/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.symbols
@@ -6,13 +6,13 @@ module Bugs {
 >IToken : Symbol(IToken, Decl(overloadResolutionOverNonCTObjectLit.ts, 0, 13))
 
                                 startIndex:number;
->startIndex : Symbol(startIndex, Decl(overloadResolutionOverNonCTObjectLit.ts, 1, 41))
+>startIndex : Symbol(IToken.startIndex, Decl(overloadResolutionOverNonCTObjectLit.ts, 1, 41))
 
                                 type:string;
->type : Symbol(type, Decl(overloadResolutionOverNonCTObjectLit.ts, 2, 50))
+>type : Symbol(IToken.type, Decl(overloadResolutionOverNonCTObjectLit.ts, 2, 50))
 
                                 bracket:number;
->bracket : Symbol(bracket, Decl(overloadResolutionOverNonCTObjectLit.ts, 3, 44))
+>bracket : Symbol(IToken.bracket, Decl(overloadResolutionOverNonCTObjectLit.ts, 3, 44))
                 }
                 
                 export interface IState {
@@ -24,11 +24,11 @@ module Bugs {
 >IToken : Symbol(IToken, Decl(overloadResolutionOverNonCTObjectLit.ts, 0, 13))
 
                                 state: IState;
->state : Symbol(state, Decl(overloadResolutionOverNonCTObjectLit.ts, 10, 61))
+>state : Symbol(IStateToken.state, Decl(overloadResolutionOverNonCTObjectLit.ts, 10, 61))
 >IState : Symbol(IState, Decl(overloadResolutionOverNonCTObjectLit.ts, 5, 17))
 
                                 length: number;
->length : Symbol(length, Decl(overloadResolutionOverNonCTObjectLit.ts, 11, 46))
+>length : Symbol(IStateToken.length, Decl(overloadResolutionOverNonCTObjectLit.ts, 11, 46))
                 }
                 
                 function bug3() {
diff --git a/tests/baselines/reference/overloadRet.symbols b/tests/baselines/reference/overloadRet.symbols
index 0c645b7c4b8..cfb33663b7f 100644
--- a/tests/baselines/reference/overloadRet.symbols
+++ b/tests/baselines/reference/overloadRet.symbols
@@ -3,36 +3,36 @@ interface I {
 >I : Symbol(I, Decl(overloadRet.ts, 0, 0))
 
     f(s:string):number;  
->f : Symbol(f, Decl(overloadRet.ts, 0, 13), Decl(overloadRet.ts, 1, 23))
+>f : Symbol(I.f, Decl(overloadRet.ts, 0, 13), Decl(overloadRet.ts, 1, 23))
 >s : Symbol(s, Decl(overloadRet.ts, 1, 6))
 
     f(n:number):string;
->f : Symbol(f, Decl(overloadRet.ts, 0, 13), Decl(overloadRet.ts, 1, 23))
+>f : Symbol(I.f, Decl(overloadRet.ts, 0, 13), Decl(overloadRet.ts, 1, 23))
 >n : Symbol(n, Decl(overloadRet.ts, 2, 6))
 
     g(n:number):any; 
->g : Symbol(g, Decl(overloadRet.ts, 2, 23), Decl(overloadRet.ts, 3, 20))
+>g : Symbol(I.g, Decl(overloadRet.ts, 2, 23), Decl(overloadRet.ts, 3, 20))
 >n : Symbol(n, Decl(overloadRet.ts, 3, 6))
 
     g(n:number,m:number):string;
->g : Symbol(g, Decl(overloadRet.ts, 2, 23), Decl(overloadRet.ts, 3, 20))
+>g : Symbol(I.g, Decl(overloadRet.ts, 2, 23), Decl(overloadRet.ts, 3, 20))
 >n : Symbol(n, Decl(overloadRet.ts, 4, 6))
 >m : Symbol(m, Decl(overloadRet.ts, 4, 15))
 
     h(n:number):I;  
->h : Symbol(h, Decl(overloadRet.ts, 4, 32), Decl(overloadRet.ts, 5, 18))
+>h : Symbol(I.h, Decl(overloadRet.ts, 4, 32), Decl(overloadRet.ts, 5, 18))
 >n : Symbol(n, Decl(overloadRet.ts, 5, 6))
 >I : Symbol(I, Decl(overloadRet.ts, 0, 0))
 
     h(b:boolean):number;
->h : Symbol(h, Decl(overloadRet.ts, 4, 32), Decl(overloadRet.ts, 5, 18))
+>h : Symbol(I.h, Decl(overloadRet.ts, 4, 32), Decl(overloadRet.ts, 5, 18))
 >b : Symbol(b, Decl(overloadRet.ts, 6, 6))
 
     i(b:boolean):number;
->i : Symbol(i, Decl(overloadRet.ts, 6, 24), Decl(overloadRet.ts, 7, 24))
+>i : Symbol(I.i, Decl(overloadRet.ts, 6, 24), Decl(overloadRet.ts, 7, 24))
 >b : Symbol(b, Decl(overloadRet.ts, 7, 6))
 
     i(b:boolean):any;
->i : Symbol(i, Decl(overloadRet.ts, 6, 24), Decl(overloadRet.ts, 7, 24))
+>i : Symbol(I.i, Decl(overloadRet.ts, 6, 24), Decl(overloadRet.ts, 7, 24))
 >b : Symbol(b, Decl(overloadRet.ts, 8, 6))
 }
diff --git a/tests/baselines/reference/overloadReturnTypes.symbols b/tests/baselines/reference/overloadReturnTypes.symbols
index b76efb4a0d6..88fda7bfdbb 100644
--- a/tests/baselines/reference/overloadReturnTypes.symbols
+++ b/tests/baselines/reference/overloadReturnTypes.symbols
@@ -41,17 +41,17 @@ interface IFace {
 >IFace : Symbol(IFace, Decl(overloadReturnTypes.ts, 14, 1))
 
 	attr(name:string):string;
->attr : Symbol(attr, Decl(overloadReturnTypes.ts, 17, 17), Decl(overloadReturnTypes.ts, 18, 26), Decl(overloadReturnTypes.ts, 19, 45))
+>attr : Symbol(IFace.attr, Decl(overloadReturnTypes.ts, 17, 17), Decl(overloadReturnTypes.ts, 18, 26), Decl(overloadReturnTypes.ts, 19, 45))
 >name : Symbol(name, Decl(overloadReturnTypes.ts, 18, 6))
 
 	attr(name: string, value: string): Accessor;
->attr : Symbol(attr, Decl(overloadReturnTypes.ts, 17, 17), Decl(overloadReturnTypes.ts, 18, 26), Decl(overloadReturnTypes.ts, 19, 45))
+>attr : Symbol(IFace.attr, Decl(overloadReturnTypes.ts, 17, 17), Decl(overloadReturnTypes.ts, 18, 26), Decl(overloadReturnTypes.ts, 19, 45))
 >name : Symbol(name, Decl(overloadReturnTypes.ts, 19, 6))
 >value : Symbol(value, Decl(overloadReturnTypes.ts, 19, 19))
 >Accessor : Symbol(Accessor, Decl(overloadReturnTypes.ts, 0, 0))
 
 	attr(map: any): Accessor;
->attr : Symbol(attr, Decl(overloadReturnTypes.ts, 17, 17), Decl(overloadReturnTypes.ts, 18, 26), Decl(overloadReturnTypes.ts, 19, 45))
+>attr : Symbol(IFace.attr, Decl(overloadReturnTypes.ts, 17, 17), Decl(overloadReturnTypes.ts, 18, 26), Decl(overloadReturnTypes.ts, 19, 45))
 >map : Symbol(map, Decl(overloadReturnTypes.ts, 20, 6))
 >Accessor : Symbol(Accessor, Decl(overloadReturnTypes.ts, 0, 0))
 }
diff --git a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt
index 45c9f99b691..3c06fd43275 100644
--- a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt
+++ b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.errors.txt
@@ -5,8 +5,8 @@ tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(16,5):
 tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(16,38): error TS2344: Type 'D' does not satisfy the constraint 'A'.
 tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(18,27): error TS2345: Argument of type '(x: D) => G<D>' is not assignable to parameter of type '(x: B) => any'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type 'D' is not assignable to type 'B'.
-      Property 'x' is missing in type 'D'.
+    Type 'B' is not assignable to type 'D'.
+      Property 'q' is missing in type 'B'.
 tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(19,14): error TS2344: Type 'D' does not satisfy the constraint 'A'.
 
 
@@ -39,16 +39,13 @@ tests/cases/compiler/overloadresolutionWithConstraintCheckingDeferred.ts(19,14):
     
     var result3: string = foo(x => { // x has type D
                               ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2345: Argument of type '(x: D) => G<D>' is not assignable to parameter of type '(x: B) => any'.
+!!! error TS2345:   Types of parameters 'x' and 'x' are incompatible.
+!!! error TS2345:     Type 'B' is not assignable to type 'D'.
+!!! error TS2345:       Property 'q' is missing in type 'B'.
         var y: G<typeof x>; // error that D does not satisfy constraint, y is of type G<D>, entire call to foo is an error
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                  ~~~~~~~~
 !!! error TS2344: Type 'D' does not satisfy the constraint 'A'.
         return y;
-    ~~~~~~~~~~~~~
     });
-    ~
-!!! error TS2345: Argument of type '(x: D) => G<D>' is not assignable to parameter of type '(x: B) => any'.
-!!! error TS2345:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2345:     Type 'D' is not assignable to type 'B'.
-!!! error TS2345:       Property 'x' is missing in type 'D'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/overloadsWithConstraints.symbols b/tests/baselines/reference/overloadsWithConstraints.symbols
index 4b33826e6b8..d3a3574da6a 100644
--- a/tests/baselines/reference/overloadsWithConstraints.symbols
+++ b/tests/baselines/reference/overloadsWithConstraints.symbols
@@ -2,7 +2,7 @@
 declare function f<T extends Number>(x: T): T;
 >f : Symbol(f, Decl(overloadsWithConstraints.ts, 0, 0), Decl(overloadsWithConstraints.ts, 0, 46))
 >T : Symbol(T, Decl(overloadsWithConstraints.ts, 0, 19))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(overloadsWithConstraints.ts, 0, 37))
 >T : Symbol(T, Decl(overloadsWithConstraints.ts, 0, 19))
 >T : Symbol(T, Decl(overloadsWithConstraints.ts, 0, 19))
@@ -10,7 +10,7 @@ declare function f<T extends Number>(x: T): T;
 declare function f<T extends String>(x: T): T
 >f : Symbol(f, Decl(overloadsWithConstraints.ts, 0, 0), Decl(overloadsWithConstraints.ts, 0, 46))
 >T : Symbol(T, Decl(overloadsWithConstraints.ts, 1, 19))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(overloadsWithConstraints.ts, 1, 37))
 >T : Symbol(T, Decl(overloadsWithConstraints.ts, 1, 19))
 >T : Symbol(T, Decl(overloadsWithConstraints.ts, 1, 19))
diff --git a/tests/baselines/reference/parameterPropertyInitializerInInitializers.symbols b/tests/baselines/reference/parameterPropertyInitializerInInitializers.symbols
index c05adb9e8ca..e355a40d85e 100644
--- a/tests/baselines/reference/parameterPropertyInitializerInInitializers.symbols
+++ b/tests/baselines/reference/parameterPropertyInitializerInInitializers.symbols
@@ -3,7 +3,7 @@ class Foo {
 >Foo : Symbol(Foo, Decl(parameterPropertyInitializerInInitializers.ts, 0, 0))
 
     constructor(public x: number, public y: number = x) { }
->x : Symbol(x, Decl(parameterPropertyInitializerInInitializers.ts, 1, 16))
->y : Symbol(y, Decl(parameterPropertyInitializerInInitializers.ts, 1, 33))
+>x : Symbol(Foo.x, Decl(parameterPropertyInitializerInInitializers.ts, 1, 16))
+>y : Symbol(Foo.y, Decl(parameterPropertyInitializerInInitializers.ts, 1, 33))
 >x : Symbol(x, Decl(parameterPropertyInitializerInInitializers.ts, 1, 16))
 }
diff --git a/tests/baselines/reference/parameterPropertyReferencingOtherParameter.symbols b/tests/baselines/reference/parameterPropertyReferencingOtherParameter.symbols
index fb6d289f241..97c0c22bc8c 100644
--- a/tests/baselines/reference/parameterPropertyReferencingOtherParameter.symbols
+++ b/tests/baselines/reference/parameterPropertyReferencingOtherParameter.symbols
@@ -3,8 +3,8 @@ class Foo {
 >Foo : Symbol(Foo, Decl(parameterPropertyReferencingOtherParameter.ts, 0, 0))
 
     constructor(public x: number, public y: number = x) { }
->x : Symbol(x, Decl(parameterPropertyReferencingOtherParameter.ts, 1, 16))
->y : Symbol(y, Decl(parameterPropertyReferencingOtherParameter.ts, 1, 33))
+>x : Symbol(Foo.x, Decl(parameterPropertyReferencingOtherParameter.ts, 1, 16))
+>y : Symbol(Foo.y, Decl(parameterPropertyReferencingOtherParameter.ts, 1, 33))
 >x : Symbol(x, Decl(parameterPropertyReferencingOtherParameter.ts, 1, 16))
 }
 
diff --git a/tests/baselines/reference/parameterReferencesOtherParameter1.symbols b/tests/baselines/reference/parameterReferencesOtherParameter1.symbols
index 7e7eec1a3cb..02e5cce5c20 100644
--- a/tests/baselines/reference/parameterReferencesOtherParameter1.symbols
+++ b/tests/baselines/reference/parameterReferencesOtherParameter1.symbols
@@ -3,7 +3,7 @@ class Model {
 >Model : Symbol(Model, Decl(parameterReferencesOtherParameter1.ts, 0, 0))
 
     public name: string;
->name : Symbol(name, Decl(parameterReferencesOtherParameter1.ts, 0, 13))
+>name : Symbol(Model.name, Decl(parameterReferencesOtherParameter1.ts, 0, 13))
 }
 
 class UI {
diff --git a/tests/baselines/reference/parameterReferencesOtherParameter2.symbols b/tests/baselines/reference/parameterReferencesOtherParameter2.symbols
index 2d63c7a3334..94f9b43bb27 100644
--- a/tests/baselines/reference/parameterReferencesOtherParameter2.symbols
+++ b/tests/baselines/reference/parameterReferencesOtherParameter2.symbols
@@ -3,7 +3,7 @@ class Model {
 >Model : Symbol(Model, Decl(parameterReferencesOtherParameter2.ts, 0, 0))
 
     public name: string;
->name : Symbol(name, Decl(parameterReferencesOtherParameter2.ts, 0, 13))
+>name : Symbol(Model.name, Decl(parameterReferencesOtherParameter2.ts, 0, 13))
 }
 
 class UI {
diff --git a/tests/baselines/reference/parametersWithNoAnnotationAreAny.symbols b/tests/baselines/reference/parametersWithNoAnnotationAreAny.symbols
index 9771d7f05ca..257679f61b2 100644
--- a/tests/baselines/reference/parametersWithNoAnnotationAreAny.symbols
+++ b/tests/baselines/reference/parametersWithNoAnnotationAreAny.symbols
@@ -25,7 +25,7 @@ class C {
 >C : Symbol(C, Decl(parametersWithNoAnnotationAreAny.ts, 3, 21))
 
     foo(x) {
->foo : Symbol(foo, Decl(parametersWithNoAnnotationAreAny.ts, 5, 9))
+>foo : Symbol(C.foo, Decl(parametersWithNoAnnotationAreAny.ts, 5, 9))
 >x : Symbol(x, Decl(parametersWithNoAnnotationAreAny.ts, 6, 8))
 
         return x;
@@ -37,11 +37,11 @@ interface I {
 >I : Symbol(I, Decl(parametersWithNoAnnotationAreAny.ts, 9, 1))
 
     foo(x);
->foo : Symbol(foo, Decl(parametersWithNoAnnotationAreAny.ts, 11, 13))
+>foo : Symbol(I.foo, Decl(parametersWithNoAnnotationAreAny.ts, 11, 13))
 >x : Symbol(x, Decl(parametersWithNoAnnotationAreAny.ts, 12, 8))
 
     foo2(x, y);
->foo2 : Symbol(foo2, Decl(parametersWithNoAnnotationAreAny.ts, 12, 11))
+>foo2 : Symbol(I.foo2, Decl(parametersWithNoAnnotationAreAny.ts, 12, 11))
 >x : Symbol(x, Decl(parametersWithNoAnnotationAreAny.ts, 13, 9))
 >y : Symbol(y, Decl(parametersWithNoAnnotationAreAny.ts, 13, 11))
 }
diff --git a/tests/baselines/reference/parenthesizedContexualTyping3.symbols b/tests/baselines/reference/parenthesizedContexualTyping3.symbols
index 4db888efd61..1d4bce3f230 100644
--- a/tests/baselines/reference/parenthesizedContexualTyping3.symbols
+++ b/tests/baselines/reference/parenthesizedContexualTyping3.symbols
@@ -9,7 +9,7 @@ function tempFun<T>(tempStrs: TemplateStringsArray, g: (x: T) => T, x: T): T;
 >tempFun : Symbol(tempFun, Decl(parenthesizedContexualTyping3.ts, 0, 0), Decl(parenthesizedContexualTyping3.ts, 6, 77), Decl(parenthesizedContexualTyping3.ts, 7, 93))
 >T : Symbol(T, Decl(parenthesizedContexualTyping3.ts, 6, 17))
 >tempStrs : Symbol(tempStrs, Decl(parenthesizedContexualTyping3.ts, 6, 20))
->TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.d.ts, --, --))
+>TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.es5.d.ts, --, --))
 >g : Symbol(g, Decl(parenthesizedContexualTyping3.ts, 6, 51))
 >x : Symbol(x, Decl(parenthesizedContexualTyping3.ts, 6, 56))
 >T : Symbol(T, Decl(parenthesizedContexualTyping3.ts, 6, 17))
@@ -22,7 +22,7 @@ function tempFun<T>(tempStrs: TemplateStringsArray, g: (x: T) => T, h: (y: T) =>
 >tempFun : Symbol(tempFun, Decl(parenthesizedContexualTyping3.ts, 0, 0), Decl(parenthesizedContexualTyping3.ts, 6, 77), Decl(parenthesizedContexualTyping3.ts, 7, 93))
 >T : Symbol(T, Decl(parenthesizedContexualTyping3.ts, 7, 17))
 >tempStrs : Symbol(tempStrs, Decl(parenthesizedContexualTyping3.ts, 7, 20))
->TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.d.ts, --, --))
+>TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.es5.d.ts, --, --))
 >g : Symbol(g, Decl(parenthesizedContexualTyping3.ts, 7, 51))
 >x : Symbol(x, Decl(parenthesizedContexualTyping3.ts, 7, 56))
 >T : Symbol(T, Decl(parenthesizedContexualTyping3.ts, 7, 17))
@@ -39,7 +39,7 @@ function tempFun<T>(tempStrs: TemplateStringsArray, g: (x: T) => T, x: T): T {
 >tempFun : Symbol(tempFun, Decl(parenthesizedContexualTyping3.ts, 0, 0), Decl(parenthesizedContexualTyping3.ts, 6, 77), Decl(parenthesizedContexualTyping3.ts, 7, 93))
 >T : Symbol(T, Decl(parenthesizedContexualTyping3.ts, 8, 17))
 >tempStrs : Symbol(tempStrs, Decl(parenthesizedContexualTyping3.ts, 8, 20))
->TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.d.ts, --, --))
+>TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.es5.d.ts, --, --))
 >g : Symbol(g, Decl(parenthesizedContexualTyping3.ts, 8, 51))
 >x : Symbol(x, Decl(parenthesizedContexualTyping3.ts, 8, 56))
 >T : Symbol(T, Decl(parenthesizedContexualTyping3.ts, 8, 17))
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/parseShortform.symbols b/tests/baselines/reference/parseShortform.symbols
index 31310e7bbb7..f0caf5f7d12 100644
--- a/tests/baselines/reference/parseShortform.symbols
+++ b/tests/baselines/reference/parseShortform.symbols
@@ -3,7 +3,7 @@ interface I {
 >I : Symbol(I, Decl(parseShortform.ts, 0, 0))
 
     w: {
->w : Symbol(w, Decl(parseShortform.ts, 0, 13))
+>w : Symbol(I.w, Decl(parseShortform.ts, 0, 13))
 
         z: I;
 >z : Symbol(z, Decl(parseShortform.ts, 1, 8))
@@ -22,13 +22,13 @@ interface I {
 
     };
     x: boolean;
->x : Symbol(x, Decl(parseShortform.ts, 6, 6))
+>x : Symbol(I.x, Decl(parseShortform.ts, 6, 6))
 
     y: (s: string) => boolean;
->y : Symbol(y, Decl(parseShortform.ts, 7, 15))
+>y : Symbol(I.y, Decl(parseShortform.ts, 7, 15))
 >s : Symbol(s, Decl(parseShortform.ts, 8, 8))
 
     z: I; 
->z : Symbol(z, Decl(parseShortform.ts, 8, 30))
+>z : Symbol(I.z, Decl(parseShortform.ts, 8, 30))
 >I : Symbol(I, Decl(parseShortform.ts, 0, 0))
 }
diff --git a/tests/baselines/reference/parser0_004152.errors.txt b/tests/baselines/reference/parser0_004152.errors.txt
index 85c450ef39f..dfff2ea1a09 100644
--- a/tests/baselines/reference/parser0_004152.errors.txt
+++ b/tests/baselines/reference/parser0_004152.errors.txt
@@ -1,4 +1,3 @@
-tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts(1,14): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts(2,28): error TS2304: Cannot find name 'DisplayPosition'.
 tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts(2,45): error TS1137: Expression or comma expected.
 tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts(2,46): error TS1005: ';' expected.
@@ -35,10 +34,8 @@ tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts(2,97): error T
 tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts(3,25): error TS2304: Cannot find name 'SeedCoords'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts (35 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts (34 errors) ====
     export class Game {
-                 ~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
         private position = new DisplayPosition([), 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 0], NoMove, 0);
                                ~~~~~~~~~~~~~~~
 !!! error TS2304: Cannot find name 'DisplayPosition'.
diff --git a/tests/baselines/reference/parser509546.errors.txt b/tests/baselines/reference/parser509546.errors.txt
deleted file mode 100644
index 65e524cb0e7..00000000000
--- a/tests/baselines/reference/parser509546.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546.ts(1,14): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-
-
-==== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546.ts (1 errors) ====
-    export class Logger { 
-                 ~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-         public
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/parser509546.symbols b/tests/baselines/reference/parser509546.symbols
new file mode 100644
index 00000000000..a288b0c782e
--- /dev/null
+++ b/tests/baselines/reference/parser509546.symbols
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546.ts ===
+export class Logger { 
+>Logger : Symbol(Logger, Decl(parser509546.ts, 0, 0))
+
+     public
+>public : Symbol(Logger.public, Decl(parser509546.ts, 0, 21))
+}
+
diff --git a/tests/baselines/reference/parser509546.types b/tests/baselines/reference/parser509546.types
new file mode 100644
index 00000000000..250b249c045
--- /dev/null
+++ b/tests/baselines/reference/parser509546.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546.ts ===
+export class Logger { 
+>Logger : Logger
+
+     public
+>public : any
+}
+
diff --git a/tests/baselines/reference/parser509546_1.errors.txt b/tests/baselines/reference/parser509546_1.errors.txt
deleted file mode 100644
index 1098adc1463..00000000000
--- a/tests/baselines/reference/parser509546_1.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_1.ts(1,14): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-
-
-==== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_1.ts (1 errors) ====
-    export class Logger { 
-                 ~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-         public
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/parser509546_1.symbols b/tests/baselines/reference/parser509546_1.symbols
new file mode 100644
index 00000000000..356345d31c4
--- /dev/null
+++ b/tests/baselines/reference/parser509546_1.symbols
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_1.ts ===
+export class Logger { 
+>Logger : Symbol(Logger, Decl(parser509546_1.ts, 0, 0))
+
+     public
+>public : Symbol(Logger.public, Decl(parser509546_1.ts, 0, 21))
+}
+
diff --git a/tests/baselines/reference/parser509546_1.types b/tests/baselines/reference/parser509546_1.types
new file mode 100644
index 00000000000..8392297ec27
--- /dev/null
+++ b/tests/baselines/reference/parser509546_1.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_1.ts ===
+export class Logger { 
+>Logger : Logger
+
+     public
+>public : any
+}
+
diff --git a/tests/baselines/reference/parser509546_2.errors.txt b/tests/baselines/reference/parser509546_2.errors.txt
deleted file mode 100644
index ad551887dda..00000000000
--- a/tests/baselines/reference/parser509546_2.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_2.ts(3,14): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-
-
-==== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_2.ts (1 errors) ====
-    "use strict";
-    
-    export class Logger { 
-                 ~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-         public
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/parser509546_2.symbols b/tests/baselines/reference/parser509546_2.symbols
new file mode 100644
index 00000000000..89f4980a002
--- /dev/null
+++ b/tests/baselines/reference/parser509546_2.symbols
@@ -0,0 +1,10 @@
+=== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_2.ts ===
+"use strict";
+
+export class Logger { 
+>Logger : Symbol(Logger, Decl(parser509546_2.ts, 0, 13))
+
+     public
+>public : Symbol(Logger.public, Decl(parser509546_2.ts, 2, 21))
+}
+
diff --git a/tests/baselines/reference/parser509546_2.types b/tests/baselines/reference/parser509546_2.types
new file mode 100644
index 00000000000..211553286a5
--- /dev/null
+++ b/tests/baselines/reference/parser509546_2.types
@@ -0,0 +1,11 @@
+=== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_2.ts ===
+"use strict";
+>"use strict" : string
+
+export class Logger { 
+>Logger : Logger
+
+     public
+>public : any
+}
+
diff --git a/tests/baselines/reference/parser618973.errors.txt b/tests/baselines/reference/parser618973.errors.txt
index b76aa15c858..5c67c9066b6 100644
--- a/tests/baselines/reference/parser618973.errors.txt
+++ b/tests/baselines/reference/parser618973.errors.txt
@@ -1,13 +1,10 @@
 tests/cases/conformance/parser/ecmascript5/RegressionTests/parser618973.ts(1,8): error TS1030: 'export' modifier already seen.
-tests/cases/conformance/parser/ecmascript5/RegressionTests/parser618973.ts(1,21): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 
 
-==== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser618973.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser618973.ts (1 errors) ====
     export export class Foo {
            ~~~~~~
 !!! error TS1030: 'export' modifier already seen.
-                        ~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
       public Bar() {
       }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parser643728.symbols b/tests/baselines/reference/parser643728.symbols
index 705e4b1ba9d..ffa2ed06746 100644
--- a/tests/baselines/reference/parser643728.symbols
+++ b/tests/baselines/reference/parser643728.symbols
@@ -3,9 +3,9 @@ interface C {
 >C : Symbol(C, Decl(parser643728.ts, 0, 0))
 
     foo;
->foo : Symbol(foo, Decl(parser643728.ts, 0, 13))
+>foo : Symbol(C.foo, Decl(parser643728.ts, 0, 13))
 
     new;
->new : Symbol(new, Decl(parser643728.ts, 1, 8))
+>new : Symbol(C.new, Decl(parser643728.ts, 1, 8))
 }
 
diff --git a/tests/baselines/reference/parserAccessors2.symbols b/tests/baselines/reference/parserAccessors2.symbols
index d4371695610..1d83ee847d5 100644
--- a/tests/baselines/reference/parserAccessors2.symbols
+++ b/tests/baselines/reference/parserAccessors2.symbols
@@ -3,6 +3,6 @@ class C {
 >C : Symbol(C, Decl(parserAccessors2.ts, 0, 0))
 
     set Foo(a) { }
->Foo : Symbol(Foo, Decl(parserAccessors2.ts, 0, 9))
+>Foo : Symbol(C.Foo, Decl(parserAccessors2.ts, 0, 9))
 >a : Symbol(a, Decl(parserAccessors2.ts, 1, 12))
 }
diff --git a/tests/baselines/reference/parserArgumentList1.errors.txt b/tests/baselines/reference/parserArgumentList1.errors.txt
index 01575cec0c4..f01dfb531f0 100644
--- a/tests/baselines/reference/parserArgumentList1.errors.txt
+++ b/tests/baselines/reference/parserArgumentList1.errors.txt
@@ -1,12 +1,9 @@
-tests/cases/conformance/parser/ecmascript5/parserArgumentList1.ts(1,17): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/conformance/parser/ecmascript5/parserArgumentList1.ts(1,35): error TS2304: Cannot find name 'HTMLElement'.
 tests/cases/conformance/parser/ecmascript5/parserArgumentList1.ts(2,42): error TS2304: Cannot find name '_classNameRegexp'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/parserArgumentList1.ts (3 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/parserArgumentList1.ts (2 errors) ====
     export function removeClass (node:HTMLElement, className:string) {
-                    ~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
                                       ~~~~~~~~~~~
 !!! error TS2304: Cannot find name 'HTMLElement'.
     	node.className = node.className.replace(_classNameRegexp(className), function (everything, leftDelimiter, name, rightDelimiter) {
diff --git a/tests/baselines/reference/parserClass1.errors.txt b/tests/baselines/reference/parserClass1.errors.txt
index 03ec87f66a6..dd9e39b4075 100644
--- a/tests/baselines/reference/parserClass1.errors.txt
+++ b/tests/baselines/reference/parserClass1.errors.txt
@@ -1,11 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass1.ts(1,18): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass1.ts(1,40): error TS2304: Cannot find name 'ILogger'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass1.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass1.ts (1 errors) ====
         export class NullLogger implements ILogger {
-                     ~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
                                            ~~~~~~~
 !!! error TS2304: Cannot find name 'ILogger'.
             public information(): boolean { return false; }
diff --git a/tests/baselines/reference/parserClass2.errors.txt b/tests/baselines/reference/parserClass2.errors.txt
index ee67b262fe5..6bd60fc84d7 100644
--- a/tests/baselines/reference/parserClass2.errors.txt
+++ b/tests/baselines/reference/parserClass2.errors.txt
@@ -1,15 +1,12 @@
-tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass2.ts(3,18): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass2.ts(3,43): error TS2304: Cannot find name 'ILogger'.
 tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass2.ts(4,37): error TS2304: Cannot find name 'ILogger'.
 tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass2.ts(5,18): error TS2339: Property '_information' does not exist on type 'LoggerAdapter'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass2.ts (4 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass2.ts (3 errors) ====
     
     
         export class LoggerAdapter implements ILogger {
-                     ~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
                                               ~~~~~~~
 !!! error TS2304: Cannot find name 'ILogger'.
             constructor (public logger: ILogger) { 
diff --git a/tests/baselines/reference/parserClassDeclaration16.symbols b/tests/baselines/reference/parserClassDeclaration16.symbols
index 770793b8ff9..f5afdd07a2e 100644
--- a/tests/baselines/reference/parserClassDeclaration16.symbols
+++ b/tests/baselines/reference/parserClassDeclaration16.symbols
@@ -3,8 +3,8 @@ class C {
 >C : Symbol(C, Decl(parserClassDeclaration16.ts, 0, 0))
 
    foo();
->foo : Symbol(foo, Decl(parserClassDeclaration16.ts, 0, 9), Decl(parserClassDeclaration16.ts, 1, 9))
+>foo : Symbol(C.foo, Decl(parserClassDeclaration16.ts, 0, 9), Decl(parserClassDeclaration16.ts, 1, 9))
 
    foo() { }
->foo : Symbol(foo, Decl(parserClassDeclaration16.ts, 0, 9), Decl(parserClassDeclaration16.ts, 1, 9))
+>foo : Symbol(C.foo, Decl(parserClassDeclaration16.ts, 0, 9), Decl(parserClassDeclaration16.ts, 1, 9))
 }
diff --git a/tests/baselines/reference/parserClassDeclaration17.symbols b/tests/baselines/reference/parserClassDeclaration17.symbols
index 7d230821d8a..fc8655b784f 100644
--- a/tests/baselines/reference/parserClassDeclaration17.symbols
+++ b/tests/baselines/reference/parserClassDeclaration17.symbols
@@ -3,13 +3,13 @@ declare class Enumerator {
 >Enumerator : Symbol(Enumerator, Decl(parserClassDeclaration17.ts, 0, 0))
 
     public atEnd(): boolean;
->atEnd : Symbol(atEnd, Decl(parserClassDeclaration17.ts, 0, 26))
+>atEnd : Symbol(Enumerator.atEnd, Decl(parserClassDeclaration17.ts, 0, 26))
 
     public moveNext();
->moveNext : Symbol(moveNext, Decl(parserClassDeclaration17.ts, 1, 28))
+>moveNext : Symbol(Enumerator.moveNext, Decl(parserClassDeclaration17.ts, 1, 28))
 
     public item(): any;
->item : Symbol(item, Decl(parserClassDeclaration17.ts, 2, 22))
+>item : Symbol(Enumerator.item, Decl(parserClassDeclaration17.ts, 2, 22))
 
     constructor (o: any);
 >o : Symbol(o, Decl(parserClassDeclaration17.ts, 4, 17))
diff --git a/tests/baselines/reference/parserClassDeclaration19.symbols b/tests/baselines/reference/parserClassDeclaration19.symbols
index e9ac1a666c7..9e9f64ca282 100644
--- a/tests/baselines/reference/parserClassDeclaration19.symbols
+++ b/tests/baselines/reference/parserClassDeclaration19.symbols
@@ -3,7 +3,7 @@ class C {
 >C : Symbol(C, Decl(parserClassDeclaration19.ts, 0, 0))
 
     foo();
->foo : Symbol(foo, Decl(parserClassDeclaration19.ts, 0, 9), Decl(parserClassDeclaration19.ts, 1, 10))
+>foo : Symbol(C.foo, Decl(parserClassDeclaration19.ts, 0, 9), Decl(parserClassDeclaration19.ts, 1, 10))
 
     "foo"() { }
 }
diff --git a/tests/baselines/reference/parserClassDeclaration26.symbols b/tests/baselines/reference/parserClassDeclaration26.symbols
index 09b9cbfd3a4..7ad2b33c5f5 100644
--- a/tests/baselines/reference/parserClassDeclaration26.symbols
+++ b/tests/baselines/reference/parserClassDeclaration26.symbols
@@ -3,8 +3,8 @@ class C {
 >C : Symbol(C, Decl(parserClassDeclaration26.ts, 0, 0))
 
    var
->var : Symbol(var, Decl(parserClassDeclaration26.ts, 0, 9))
+>var : Symbol(C.var, Decl(parserClassDeclaration26.ts, 0, 9))
 
    public
->public : Symbol(public, Decl(parserClassDeclaration26.ts, 1, 6))
+>public : Symbol(C.public, Decl(parserClassDeclaration26.ts, 1, 6))
 }
diff --git a/tests/baselines/reference/parserConstructorDeclaration5.errors.txt b/tests/baselines/reference/parserConstructorDeclaration5.errors.txt
deleted file mode 100644
index 4589ad95a32..00000000000
--- a/tests/baselines/reference/parserConstructorDeclaration5.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration5.ts(2,3): error TS1089: 'private' modifier cannot appear on a constructor declaration.
-
-
-==== tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration5.ts (1 errors) ====
-    class C {
-      private constructor() { }
-      ~~~~~~~
-!!! error TS1089: 'private' modifier cannot appear on a constructor declaration.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserConstructorDeclaration5.symbols b/tests/baselines/reference/parserConstructorDeclaration5.symbols
new file mode 100644
index 00000000000..6eb3d32a0f0
--- /dev/null
+++ b/tests/baselines/reference/parserConstructorDeclaration5.symbols
@@ -0,0 +1,6 @@
+=== tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration5.ts ===
+class C {
+>C : Symbol(C, Decl(parserConstructorDeclaration5.ts, 0, 0))
+
+  private constructor() { }
+}
diff --git a/tests/baselines/reference/parserConstructorDeclaration5.types b/tests/baselines/reference/parserConstructorDeclaration5.types
new file mode 100644
index 00000000000..ae5d2c44b49
--- /dev/null
+++ b/tests/baselines/reference/parserConstructorDeclaration5.types
@@ -0,0 +1,6 @@
+=== tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration5.ts ===
+class C {
+>C : C
+
+  private constructor() { }
+}
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/parserEnum1.errors.txt b/tests/baselines/reference/parserEnum1.errors.txt
deleted file mode 100644
index dd8cd23fe2c..00000000000
--- a/tests/baselines/reference/parserEnum1.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum1.ts(3,17): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-
-
-==== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum1.ts (1 errors) ====
-    
-    
-        export enum SignatureFlags {
-                    ~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-            None = 0,
-            IsIndexer = 1,
-            IsStringIndexer = 1 << 1,
-            IsNumberIndexer = 1 << 2,
-        }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserEnum1.symbols b/tests/baselines/reference/parserEnum1.symbols
new file mode 100644
index 00000000000..ec9a3d8aa21
--- /dev/null
+++ b/tests/baselines/reference/parserEnum1.symbols
@@ -0,0 +1,18 @@
+=== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum1.ts ===
+
+
+    export enum SignatureFlags {
+>SignatureFlags : Symbol(SignatureFlags, Decl(parserEnum1.ts, 0, 0))
+
+        None = 0,
+>None : Symbol(SignatureFlags.None, Decl(parserEnum1.ts, 2, 32))
+
+        IsIndexer = 1,
+>IsIndexer : Symbol(SignatureFlags.IsIndexer, Decl(parserEnum1.ts, 3, 17))
+
+        IsStringIndexer = 1 << 1,
+>IsStringIndexer : Symbol(SignatureFlags.IsStringIndexer, Decl(parserEnum1.ts, 4, 22))
+
+        IsNumberIndexer = 1 << 2,
+>IsNumberIndexer : Symbol(SignatureFlags.IsNumberIndexer, Decl(parserEnum1.ts, 5, 33))
+    }
diff --git a/tests/baselines/reference/parserEnum1.types b/tests/baselines/reference/parserEnum1.types
new file mode 100644
index 00000000000..34d11a1858d
--- /dev/null
+++ b/tests/baselines/reference/parserEnum1.types
@@ -0,0 +1,26 @@
+=== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum1.ts ===
+
+
+    export enum SignatureFlags {
+>SignatureFlags : SignatureFlags
+
+        None = 0,
+>None : SignatureFlags
+>0 : number
+
+        IsIndexer = 1,
+>IsIndexer : SignatureFlags
+>1 : number
+
+        IsStringIndexer = 1 << 1,
+>IsStringIndexer : SignatureFlags
+>1 << 1 : number
+>1 : number
+>1 : number
+
+        IsNumberIndexer = 1 << 2,
+>IsNumberIndexer : SignatureFlags
+>1 << 2 : number
+>1 : number
+>2 : number
+    }
diff --git a/tests/baselines/reference/parserEnum2.errors.txt b/tests/baselines/reference/parserEnum2.errors.txt
deleted file mode 100644
index 242b624ad88..00000000000
--- a/tests/baselines/reference/parserEnum2.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum2.ts(3,17): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-
-
-==== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum2.ts (1 errors) ====
-    
-    
-        export enum SignatureFlags {
-                    ~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-            None = 0,
-            IsIndexer = 1,
-            IsStringIndexer = 1 << 1,
-            IsNumberIndexer = 1 << 2
-        }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserEnum2.symbols b/tests/baselines/reference/parserEnum2.symbols
new file mode 100644
index 00000000000..dc745ca726e
--- /dev/null
+++ b/tests/baselines/reference/parserEnum2.symbols
@@ -0,0 +1,18 @@
+=== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum2.ts ===
+
+
+    export enum SignatureFlags {
+>SignatureFlags : Symbol(SignatureFlags, Decl(parserEnum2.ts, 0, 0))
+
+        None = 0,
+>None : Symbol(SignatureFlags.None, Decl(parserEnum2.ts, 2, 32))
+
+        IsIndexer = 1,
+>IsIndexer : Symbol(SignatureFlags.IsIndexer, Decl(parserEnum2.ts, 3, 17))
+
+        IsStringIndexer = 1 << 1,
+>IsStringIndexer : Symbol(SignatureFlags.IsStringIndexer, Decl(parserEnum2.ts, 4, 22))
+
+        IsNumberIndexer = 1 << 2
+>IsNumberIndexer : Symbol(SignatureFlags.IsNumberIndexer, Decl(parserEnum2.ts, 5, 33))
+    }
diff --git a/tests/baselines/reference/parserEnum2.types b/tests/baselines/reference/parserEnum2.types
new file mode 100644
index 00000000000..6d119d8f079
--- /dev/null
+++ b/tests/baselines/reference/parserEnum2.types
@@ -0,0 +1,26 @@
+=== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum2.ts ===
+
+
+    export enum SignatureFlags {
+>SignatureFlags : SignatureFlags
+
+        None = 0,
+>None : SignatureFlags
+>0 : number
+
+        IsIndexer = 1,
+>IsIndexer : SignatureFlags
+>1 : number
+
+        IsStringIndexer = 1 << 1,
+>IsStringIndexer : SignatureFlags
+>1 << 1 : number
+>1 : number
+>1 : number
+
+        IsNumberIndexer = 1 << 2
+>IsNumberIndexer : SignatureFlags
+>1 << 2 : number
+>1 : number
+>2 : number
+    }
diff --git a/tests/baselines/reference/parserEnum3.errors.txt b/tests/baselines/reference/parserEnum3.errors.txt
deleted file mode 100644
index e0b3691dbde..00000000000
--- a/tests/baselines/reference/parserEnum3.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum3.ts(3,17): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-
-
-==== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum3.ts (1 errors) ====
-    
-    
-        export enum SignatureFlags {
-                    ~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-        }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserEnum3.symbols b/tests/baselines/reference/parserEnum3.symbols
new file mode 100644
index 00000000000..01e55693335
--- /dev/null
+++ b/tests/baselines/reference/parserEnum3.symbols
@@ -0,0 +1,6 @@
+=== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum3.ts ===
+
+
+    export enum SignatureFlags {
+>SignatureFlags : Symbol(SignatureFlags, Decl(parserEnum3.ts, 0, 0))
+    }
diff --git a/tests/baselines/reference/parserEnum3.types b/tests/baselines/reference/parserEnum3.types
new file mode 100644
index 00000000000..21527136b32
--- /dev/null
+++ b/tests/baselines/reference/parserEnum3.types
@@ -0,0 +1,6 @@
+=== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum3.ts ===
+
+
+    export enum SignatureFlags {
+>SignatureFlags : SignatureFlags
+    }
diff --git a/tests/baselines/reference/parserEnum4.errors.txt b/tests/baselines/reference/parserEnum4.errors.txt
index 9329b484c92..d9a57b21daa 100644
--- a/tests/baselines/reference/parserEnum4.errors.txt
+++ b/tests/baselines/reference/parserEnum4.errors.txt
@@ -1,13 +1,10 @@
-tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum4.ts(3,17): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum4.ts(4,9): error TS1132: Enum member expected.
 
 
-==== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum4.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum4.ts (1 errors) ====
     
     
         export enum SignatureFlags {
-                    ~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
             ,
             ~
 !!! error TS1132: Enum member expected.
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.symbols b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.symbols
index 7b8be05f923..e9209df72f2 100644
--- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.symbols
+++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.symbols
@@ -4,7 +4,7 @@ interface IPoint {
 >IPoint : Symbol(IPoint, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 0, 0))
 
     getDist(): number;
->getDist : Symbol(getDist, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 1, 18))
+>getDist : Symbol(IPoint.getDist, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 1, 18))
 }
 
 // Module
@@ -17,31 +17,31 @@ module Shapes {
 >IPoint : Symbol(IPoint, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 0, 0))
 
         public con: "hello";
->con : Symbol(con, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 9, 42))
+>con : Symbol(Point.con, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 9, 42))
 
         // Constructor
         constructor (public x: number, public y: number) { }
->x : Symbol(x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21))
->y : Symbol(y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38))
+>x : Symbol(Point.x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21))
+>y : Symbol(Point.y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38))
 
         // Instance member
         getDist() { return Math.sqrt(this.x * this.x + this.y * this.y); }
->getDist : Symbol(getDist, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 60))
+>getDist : Symbol(Point.getDist, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 60))
 >Math.sqrt : Symbol(Math.sqrt, Decl(lib.d.ts, --, --))
 >Math : Symbol(Math, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >sqrt : Symbol(Math.sqrt, Decl(lib.d.ts, --, --))
->this.x : Symbol(x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21))
+>this.x : Symbol(Point.x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21))
 >this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15))
->x : Symbol(x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21))
->this.x : Symbol(x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21))
+>x : Symbol(Point.x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21))
+>this.x : Symbol(Point.x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21))
 >this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15))
->x : Symbol(x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21))
->this.y : Symbol(y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38))
+>x : Symbol(Point.x, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 21))
+>this.y : Symbol(Point.y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38))
 >this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15))
->y : Symbol(y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38))
->this.y : Symbol(y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38))
+>y : Symbol(Point.y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38))
+>this.y : Symbol(Point.y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38))
 >this : Symbol(Point, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 6, 15))
->y : Symbol(y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38))
+>y : Symbol(Point.y, Decl(parserErrorRecovery_IncompleteMemberVariable1.ts, 13, 38))
 
         // Static member
         static origin = new Point(0, 0);
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/parserExportAsFunctionIdentifier.symbols b/tests/baselines/reference/parserExportAsFunctionIdentifier.symbols
index 6d81e8fdae3..d60cf30c821 100644
--- a/tests/baselines/reference/parserExportAsFunctionIdentifier.symbols
+++ b/tests/baselines/reference/parserExportAsFunctionIdentifier.symbols
@@ -3,7 +3,7 @@ interface Foo {
 >Foo : Symbol(Foo, Decl(parserExportAsFunctionIdentifier.ts, 0, 0))
 
        export(): string;
->export : Symbol(export, Decl(parserExportAsFunctionIdentifier.ts, 0, 15))
+>export : Symbol(Foo.export, Decl(parserExportAsFunctionIdentifier.ts, 0, 15))
 }
 
 var f: Foo;
diff --git a/tests/baselines/reference/parserExportAssignment1.errors.txt b/tests/baselines/reference/parserExportAssignment1.errors.txt
index cb989f655ce..41a428f6da2 100644
--- a/tests/baselines/reference/parserExportAssignment1.errors.txt
+++ b/tests/baselines/reference/parserExportAssignment1.errors.txt
@@ -1,10 +1,7 @@
-tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment1.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment1.ts(1,10): error TS2304: Cannot find name 'foo'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment1.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment1.ts (1 errors) ====
     export = foo
-    ~~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
              ~~~
 !!! error TS2304: Cannot find name 'foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserExportAssignment2.errors.txt b/tests/baselines/reference/parserExportAssignment2.errors.txt
index 7e7fcbd950f..bd9291c4930 100644
--- a/tests/baselines/reference/parserExportAssignment2.errors.txt
+++ b/tests/baselines/reference/parserExportAssignment2.errors.txt
@@ -1,10 +1,7 @@
-tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment2.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment2.ts(1,10): error TS2304: Cannot find name 'foo'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment2.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment2.ts (1 errors) ====
     export = foo;
-    ~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
              ~~~
 !!! error TS2304: Cannot find name 'foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserExportAssignment3.errors.txt b/tests/baselines/reference/parserExportAssignment3.errors.txt
index 5e2ff747e2d..57bda04945e 100644
--- a/tests/baselines/reference/parserExportAssignment3.errors.txt
+++ b/tests/baselines/reference/parserExportAssignment3.errors.txt
@@ -1,10 +1,7 @@
-tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment3.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment3.ts(1,9): error TS1109: Expression expected.
 
 
-==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment3.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment3.ts (1 errors) ====
     export =
-    ~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
             
 !!! error TS1109: Expression expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserExportAssignment4.errors.txt b/tests/baselines/reference/parserExportAssignment4.errors.txt
index 10830b9b977..950baf4b72c 100644
--- a/tests/baselines/reference/parserExportAssignment4.errors.txt
+++ b/tests/baselines/reference/parserExportAssignment4.errors.txt
@@ -1,10 +1,7 @@
-tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment4.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment4.ts(1,10): error TS1109: Expression expected.
 
 
-==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment4.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment4.ts (1 errors) ====
     export = ;
-    ~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
              ~
 !!! error TS1109: Expression expected.
\ No newline at end of file
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/parserExportAssignment7.errors.txt b/tests/baselines/reference/parserExportAssignment7.errors.txt
index c4ecd785484..3f1c14ddf70 100644
--- a/tests/baselines/reference/parserExportAssignment7.errors.txt
+++ b/tests/baselines/reference/parserExportAssignment7.errors.txt
@@ -1,12 +1,9 @@
-tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment7.ts(1,14): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment7.ts(4,1): error TS2309: An export assignment cannot be used in a module with other exported elements.
 tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment7.ts(4,10): error TS2304: Cannot find name 'B'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment7.ts (3 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment7.ts (2 errors) ====
     export class C {
-                 ~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
     }
     
     export = B;
diff --git a/tests/baselines/reference/parserExportAssignment8.errors.txt b/tests/baselines/reference/parserExportAssignment8.errors.txt
index 39ccc32e495..4d4a3ad7eb1 100644
--- a/tests/baselines/reference/parserExportAssignment8.errors.txt
+++ b/tests/baselines/reference/parserExportAssignment8.errors.txt
@@ -1,13 +1,10 @@
-tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment8.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment8.ts(1,1): error TS2309: An export assignment cannot be used in a module with other exported elements.
 tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment8.ts(1,10): error TS2304: Cannot find name 'B'.
 
 
-==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment8.ts (3 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment8.ts (2 errors) ====
     export = B;
     ~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-    ~~~~~~~~~~~
 !!! error TS2309: An export assignment cannot be used in a module with other exported elements.
              ~
 !!! error TS2304: Cannot find name 'B'.
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/parserIndexMemberDeclaration2.symbols b/tests/baselines/reference/parserIndexMemberDeclaration2.symbols
index 1b42a8f8160..0031cde94be 100644
--- a/tests/baselines/reference/parserIndexMemberDeclaration2.symbols
+++ b/tests/baselines/reference/parserIndexMemberDeclaration2.symbols
@@ -6,5 +6,5 @@ class C {
 >a : Symbol(a, Decl(parserIndexMemberDeclaration2.ts, 1, 4))
 
    public v: number
->v : Symbol(v, Decl(parserIndexMemberDeclaration2.ts, 1, 22))
+>v : Symbol(C.v, Decl(parserIndexMemberDeclaration2.ts, 1, 22))
 }
diff --git a/tests/baselines/reference/parserIndexMemberDeclaration3.symbols b/tests/baselines/reference/parserIndexMemberDeclaration3.symbols
index 6961a37f497..7db6c7dd93e 100644
--- a/tests/baselines/reference/parserIndexMemberDeclaration3.symbols
+++ b/tests/baselines/reference/parserIndexMemberDeclaration3.symbols
@@ -6,5 +6,5 @@ class C {
 >a : Symbol(a, Decl(parserIndexMemberDeclaration3.ts, 1, 4))
 
    public v: number
->v : Symbol(v, Decl(parserIndexMemberDeclaration3.ts, 1, 23))
+>v : Symbol(C.v, Decl(parserIndexMemberDeclaration3.ts, 1, 23))
 }
diff --git a/tests/baselines/reference/parserIndexMemberDeclaration4.symbols b/tests/baselines/reference/parserIndexMemberDeclaration4.symbols
index 29b101d05d8..9b5f99d6ba8 100644
--- a/tests/baselines/reference/parserIndexMemberDeclaration4.symbols
+++ b/tests/baselines/reference/parserIndexMemberDeclaration4.symbols
@@ -4,5 +4,5 @@ class C {
 
    [a: string]: number; public v: number
 >a : Symbol(a, Decl(parserIndexMemberDeclaration4.ts, 1, 4))
->v : Symbol(v, Decl(parserIndexMemberDeclaration4.ts, 1, 23))
+>v : Symbol(C.v, Decl(parserIndexMemberDeclaration4.ts, 1, 23))
 }
diff --git a/tests/baselines/reference/parserInterfaceDeclaration6.errors.txt b/tests/baselines/reference/parserInterfaceDeclaration6.errors.txt
index 6820ecdd48c..07734135de4 100644
--- a/tests/baselines/reference/parserInterfaceDeclaration6.errors.txt
+++ b/tests/baselines/reference/parserInterfaceDeclaration6.errors.txt
@@ -1,11 +1,8 @@
 tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration6.ts(1,8): error TS1030: 'export' modifier already seen.
-tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration6.ts(1,25): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 
 
-==== tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration6.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration6.ts (1 errors) ====
     export export interface I {
            ~~~~~~
 !!! error TS1030: 'export' modifier already seen.
-                            ~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserInterfaceDeclaration7.errors.txt b/tests/baselines/reference/parserInterfaceDeclaration7.errors.txt
deleted file mode 100644
index ecd59ae29e8..00000000000
--- a/tests/baselines/reference/parserInterfaceDeclaration7.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration7.ts(1,18): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-
-
-==== tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration7.ts (1 errors) ====
-    export interface I {
-                     ~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserInterfaceDeclaration7.symbols b/tests/baselines/reference/parserInterfaceDeclaration7.symbols
new file mode 100644
index 00000000000..c873239c716
--- /dev/null
+++ b/tests/baselines/reference/parserInterfaceDeclaration7.symbols
@@ -0,0 +1,4 @@
+=== tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration7.ts ===
+export interface I {
+>I : Symbol(I, Decl(parserInterfaceDeclaration7.ts, 0, 0))
+}
diff --git a/tests/baselines/reference/parserInterfaceDeclaration7.types b/tests/baselines/reference/parserInterfaceDeclaration7.types
new file mode 100644
index 00000000000..8119f50c9f2
--- /dev/null
+++ b/tests/baselines/reference/parserInterfaceDeclaration7.types
@@ -0,0 +1,4 @@
+=== tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration7.ts ===
+export interface I {
+>I : I
+}
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/parserMemberAccessorDeclaration4.symbols b/tests/baselines/reference/parserMemberAccessorDeclaration4.symbols
index 2750f28943e..f446aa992ca 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration4.symbols
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration4.symbols
@@ -3,6 +3,6 @@ class C {
 >C : Symbol(C, Decl(parserMemberAccessorDeclaration4.ts, 0, 0))
 
   set a(i) { }
->a : Symbol(a, Decl(parserMemberAccessorDeclaration4.ts, 0, 9))
+>a : Symbol(C.a, Decl(parserMemberAccessorDeclaration4.ts, 0, 9))
 >i : Symbol(i, Decl(parserMemberAccessorDeclaration4.ts, 1, 8))
 }
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/parserMethodSignature1.symbols b/tests/baselines/reference/parserMethodSignature1.symbols
index 2c12a156ef0..a905dc1056c 100644
--- a/tests/baselines/reference/parserMethodSignature1.symbols
+++ b/tests/baselines/reference/parserMethodSignature1.symbols
@@ -3,5 +3,5 @@ interface I {
 >I : Symbol(I, Decl(parserMethodSignature1.ts, 0, 0))
 
   A();
->A : Symbol(A, Decl(parserMethodSignature1.ts, 0, 13))
+>A : Symbol(I.A, Decl(parserMethodSignature1.ts, 0, 13))
 }
diff --git a/tests/baselines/reference/parserMethodSignature2.symbols b/tests/baselines/reference/parserMethodSignature2.symbols
index ba86c20293e..7c7013e1b13 100644
--- a/tests/baselines/reference/parserMethodSignature2.symbols
+++ b/tests/baselines/reference/parserMethodSignature2.symbols
@@ -3,5 +3,5 @@ interface I {
 >I : Symbol(I, Decl(parserMethodSignature2.ts, 0, 0))
 
   B?();
->B : Symbol(B, Decl(parserMethodSignature2.ts, 0, 13))
+>B : Symbol(I.B, Decl(parserMethodSignature2.ts, 0, 13))
 }
diff --git a/tests/baselines/reference/parserMethodSignature3.symbols b/tests/baselines/reference/parserMethodSignature3.symbols
index ce4c0f05561..5f6efea534b 100644
--- a/tests/baselines/reference/parserMethodSignature3.symbols
+++ b/tests/baselines/reference/parserMethodSignature3.symbols
@@ -3,6 +3,6 @@ interface I {
 >I : Symbol(I, Decl(parserMethodSignature3.ts, 0, 0))
 
   C<T>();
->C : Symbol(C, Decl(parserMethodSignature3.ts, 0, 13))
+>C : Symbol(I.C, Decl(parserMethodSignature3.ts, 0, 13))
 >T : Symbol(T, Decl(parserMethodSignature3.ts, 1, 4))
 }
diff --git a/tests/baselines/reference/parserMethodSignature4.symbols b/tests/baselines/reference/parserMethodSignature4.symbols
index d1612bf2f4f..7ebcbcbcf5a 100644
--- a/tests/baselines/reference/parserMethodSignature4.symbols
+++ b/tests/baselines/reference/parserMethodSignature4.symbols
@@ -3,6 +3,6 @@ interface I {
 >I : Symbol(I, Decl(parserMethodSignature4.ts, 0, 0))
 
   D?<T>();
->D : Symbol(D, Decl(parserMethodSignature4.ts, 0, 13))
+>D : Symbol(I.D, Decl(parserMethodSignature4.ts, 0, 13))
 >T : Symbol(T, Decl(parserMethodSignature4.ts, 1, 5))
 }
diff --git a/tests/baselines/reference/parserModifierOnPropertySignature2.symbols b/tests/baselines/reference/parserModifierOnPropertySignature2.symbols
index ac17a3810bf..496f5736141 100644
--- a/tests/baselines/reference/parserModifierOnPropertySignature2.symbols
+++ b/tests/baselines/reference/parserModifierOnPropertySignature2.symbols
@@ -3,9 +3,9 @@ interface Foo{
 >Foo : Symbol(Foo, Decl(parserModifierOnPropertySignature2.ts, 0, 0))
 
     public
->public : Symbol(public, Decl(parserModifierOnPropertySignature2.ts, 0, 14))
+>public : Symbol(Foo.public, Decl(parserModifierOnPropertySignature2.ts, 0, 14))
 
     biz;
->biz : Symbol(biz, Decl(parserModifierOnPropertySignature2.ts, 1, 10))
+>biz : Symbol(Foo.biz, Decl(parserModifierOnPropertySignature2.ts, 1, 10))
 }
 
diff --git a/tests/baselines/reference/parserModifierOnStatementInBlock1.errors.txt b/tests/baselines/reference/parserModifierOnStatementInBlock1.errors.txt
index c73c52ddd35..e394705fac0 100644
--- a/tests/baselines/reference/parserModifierOnStatementInBlock1.errors.txt
+++ b/tests/baselines/reference/parserModifierOnStatementInBlock1.errors.txt
@@ -1,11 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock1.ts(1,17): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock1.ts(2,4): error TS1184: Modifiers cannot appear here.
 
 
-==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock1.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock1.ts (1 errors) ====
     export function foo() {
-                    ~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
        export var x = this;
        ~~~~~~
 !!! error TS1184: Modifiers cannot appear here.
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.errors.txt b/tests/baselines/reference/parserModifierOnStatementInBlock3.errors.txt
index a480a0c4330..9c1ccf68351 100644
--- a/tests/baselines/reference/parserModifierOnStatementInBlock3.errors.txt
+++ b/tests/baselines/reference/parserModifierOnStatementInBlock3.errors.txt
@@ -1,11 +1,8 @@
-tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock3.ts(1,17): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock3.ts(2,4): error TS1184: Modifiers cannot appear here.
 
 
-==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock3.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock3.ts (1 errors) ====
     export function foo() {
-                    ~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
        export function bar() {
        ~~~~~~
 !!! error TS1184: Modifiers cannot appear here.
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/parserModule1.errors.txt b/tests/baselines/reference/parserModule1.errors.txt
deleted file mode 100644
index dc5c9c2dd35..00000000000
--- a/tests/baselines/reference/parserModule1.errors.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModule1.ts(1,19): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-
-
-==== tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModule1.ts (1 errors) ====
-        export module CompilerDiagnostics {
-                      ~~~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-            export var debug = false;
-            export interface IDiagnosticWriter {
-                Alert(output: string): void;
-            }
-    
-            export var diagnosticWriter: IDiagnosticWriter = null;
-    
-            export var analysisPass: number = 0;
-    
-            export function Alert(output: string) {
-                if (diagnosticWriter) {
-                    diagnosticWriter.Alert(output);
-                }
-            }
-    
-            export function debugPrint(s: string) {
-                if (debug) {
-                    Alert(s);
-                }
-            }
-    
-            export function assert(condition: boolean, s: string) {
-                if (debug) {
-                    if (!condition) {
-                        Alert(s);
-                    }
-                }
-            }
-    
-        }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserModule1.symbols b/tests/baselines/reference/parserModule1.symbols
new file mode 100644
index 00000000000..5215a2e656d
--- /dev/null
+++ b/tests/baselines/reference/parserModule1.symbols
@@ -0,0 +1,69 @@
+=== tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModule1.ts ===
+    export module CompilerDiagnostics {
+>CompilerDiagnostics : Symbol(CompilerDiagnostics, Decl(parserModule1.ts, 0, 0))
+
+        export var debug = false;
+>debug : Symbol(debug, Decl(parserModule1.ts, 1, 18))
+
+        export interface IDiagnosticWriter {
+>IDiagnosticWriter : Symbol(IDiagnosticWriter, Decl(parserModule1.ts, 1, 33))
+
+            Alert(output: string): void;
+>Alert : Symbol(IDiagnosticWriter.Alert, Decl(parserModule1.ts, 2, 44))
+>output : Symbol(output, Decl(parserModule1.ts, 3, 18))
+        }
+
+        export var diagnosticWriter: IDiagnosticWriter = null;
+>diagnosticWriter : Symbol(diagnosticWriter, Decl(parserModule1.ts, 6, 18))
+>IDiagnosticWriter : Symbol(IDiagnosticWriter, Decl(parserModule1.ts, 1, 33))
+
+        export var analysisPass: number = 0;
+>analysisPass : Symbol(analysisPass, Decl(parserModule1.ts, 8, 18))
+
+        export function Alert(output: string) {
+>Alert : Symbol(Alert, Decl(parserModule1.ts, 8, 44))
+>output : Symbol(output, Decl(parserModule1.ts, 10, 30))
+
+            if (diagnosticWriter) {
+>diagnosticWriter : Symbol(diagnosticWriter, Decl(parserModule1.ts, 6, 18))
+
+                diagnosticWriter.Alert(output);
+>diagnosticWriter.Alert : Symbol(IDiagnosticWriter.Alert, Decl(parserModule1.ts, 2, 44))
+>diagnosticWriter : Symbol(diagnosticWriter, Decl(parserModule1.ts, 6, 18))
+>Alert : Symbol(IDiagnosticWriter.Alert, Decl(parserModule1.ts, 2, 44))
+>output : Symbol(output, Decl(parserModule1.ts, 10, 30))
+            }
+        }
+
+        export function debugPrint(s: string) {
+>debugPrint : Symbol(debugPrint, Decl(parserModule1.ts, 14, 9))
+>s : Symbol(s, Decl(parserModule1.ts, 16, 35))
+
+            if (debug) {
+>debug : Symbol(debug, Decl(parserModule1.ts, 1, 18))
+
+                Alert(s);
+>Alert : Symbol(Alert, Decl(parserModule1.ts, 8, 44))
+>s : Symbol(s, Decl(parserModule1.ts, 16, 35))
+            }
+        }
+
+        export function assert(condition: boolean, s: string) {
+>assert : Symbol(assert, Decl(parserModule1.ts, 20, 9))
+>condition : Symbol(condition, Decl(parserModule1.ts, 22, 31))
+>s : Symbol(s, Decl(parserModule1.ts, 22, 50))
+
+            if (debug) {
+>debug : Symbol(debug, Decl(parserModule1.ts, 1, 18))
+
+                if (!condition) {
+>condition : Symbol(condition, Decl(parserModule1.ts, 22, 31))
+
+                    Alert(s);
+>Alert : Symbol(Alert, Decl(parserModule1.ts, 8, 44))
+>s : Symbol(s, Decl(parserModule1.ts, 22, 50))
+                }
+            }
+        }
+
+    }
diff --git a/tests/baselines/reference/parserModule1.types b/tests/baselines/reference/parserModule1.types
new file mode 100644
index 00000000000..2d3b670aaa6
--- /dev/null
+++ b/tests/baselines/reference/parserModule1.types
@@ -0,0 +1,76 @@
+=== tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModule1.ts ===
+    export module CompilerDiagnostics {
+>CompilerDiagnostics : typeof CompilerDiagnostics
+
+        export var debug = false;
+>debug : boolean
+>false : boolean
+
+        export interface IDiagnosticWriter {
+>IDiagnosticWriter : IDiagnosticWriter
+
+            Alert(output: string): void;
+>Alert : (output: string) => void
+>output : string
+        }
+
+        export var diagnosticWriter: IDiagnosticWriter = null;
+>diagnosticWriter : IDiagnosticWriter
+>IDiagnosticWriter : IDiagnosticWriter
+>null : null
+
+        export var analysisPass: number = 0;
+>analysisPass : number
+>0 : number
+
+        export function Alert(output: string) {
+>Alert : (output: string) => void
+>output : string
+
+            if (diagnosticWriter) {
+>diagnosticWriter : IDiagnosticWriter
+
+                diagnosticWriter.Alert(output);
+>diagnosticWriter.Alert(output) : void
+>diagnosticWriter.Alert : (output: string) => void
+>diagnosticWriter : IDiagnosticWriter
+>Alert : (output: string) => void
+>output : string
+            }
+        }
+
+        export function debugPrint(s: string) {
+>debugPrint : (s: string) => void
+>s : string
+
+            if (debug) {
+>debug : boolean
+
+                Alert(s);
+>Alert(s) : void
+>Alert : (output: string) => void
+>s : string
+            }
+        }
+
+        export function assert(condition: boolean, s: string) {
+>assert : (condition: boolean, s: string) => void
+>condition : boolean
+>s : string
+
+            if (debug) {
+>debug : boolean
+
+                if (!condition) {
+>!condition : boolean
+>condition : boolean
+
+                    Alert(s);
+>Alert(s) : void
+>Alert : (output: string) => void
+>s : string
+                }
+            }
+        }
+
+    }
diff --git a/tests/baselines/reference/parserOptionalTypeMembers1.symbols b/tests/baselines/reference/parserOptionalTypeMembers1.symbols
index ce12a4ec19b..fb4d93d7f9c 100644
--- a/tests/baselines/reference/parserOptionalTypeMembers1.symbols
+++ b/tests/baselines/reference/parserOptionalTypeMembers1.symbols
@@ -3,21 +3,21 @@ interface PropertyDescriptor2 {
 >PropertyDescriptor2 : Symbol(PropertyDescriptor2, Decl(parserOptionalTypeMembers1.ts, 0, 0))
 
     configurable?: boolean;
->configurable : Symbol(configurable, Decl(parserOptionalTypeMembers1.ts, 0, 31))
+>configurable : Symbol(PropertyDescriptor2.configurable, Decl(parserOptionalTypeMembers1.ts, 0, 31))
 
     enumerable?: boolean;
->enumerable : Symbol(enumerable, Decl(parserOptionalTypeMembers1.ts, 1, 27))
+>enumerable : Symbol(PropertyDescriptor2.enumerable, Decl(parserOptionalTypeMembers1.ts, 1, 27))
 
     value?: any;
->value : Symbol(value, Decl(parserOptionalTypeMembers1.ts, 2, 25))
+>value : Symbol(PropertyDescriptor2.value, Decl(parserOptionalTypeMembers1.ts, 2, 25))
 
     writable?: boolean;
->writable : Symbol(writable, Decl(parserOptionalTypeMembers1.ts, 3, 16))
+>writable : Symbol(PropertyDescriptor2.writable, Decl(parserOptionalTypeMembers1.ts, 3, 16))
 
     get?(): any;
->get : Symbol(get, Decl(parserOptionalTypeMembers1.ts, 4, 23))
+>get : Symbol(PropertyDescriptor2.get, Decl(parserOptionalTypeMembers1.ts, 4, 23))
 
     set?(v: any): void;
->set : Symbol(set, Decl(parserOptionalTypeMembers1.ts, 5, 16))
+>set : Symbol(PropertyDescriptor2.set, Decl(parserOptionalTypeMembers1.ts, 5, 16))
 >v : Symbol(v, Decl(parserOptionalTypeMembers1.ts, 6, 9))
 }
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/parserPropertySignature1.symbols b/tests/baselines/reference/parserPropertySignature1.symbols
index 6b8a26c4164..e32b1173d53 100644
--- a/tests/baselines/reference/parserPropertySignature1.symbols
+++ b/tests/baselines/reference/parserPropertySignature1.symbols
@@ -3,5 +3,5 @@ interface I {
 >I : Symbol(I, Decl(parserPropertySignature1.ts, 0, 0))
 
   A;
->A : Symbol(A, Decl(parserPropertySignature1.ts, 0, 13))
+>A : Symbol(I.A, Decl(parserPropertySignature1.ts, 0, 13))
 }
diff --git a/tests/baselines/reference/parserPropertySignature2.symbols b/tests/baselines/reference/parserPropertySignature2.symbols
index 334c0655908..6ec329e7b6d 100644
--- a/tests/baselines/reference/parserPropertySignature2.symbols
+++ b/tests/baselines/reference/parserPropertySignature2.symbols
@@ -3,5 +3,5 @@ interface I {
 >I : Symbol(I, Decl(parserPropertySignature2.ts, 0, 0))
 
   B?;
->B : Symbol(B, Decl(parserPropertySignature2.ts, 0, 13))
+>B : Symbol(I.B, Decl(parserPropertySignature2.ts, 0, 13))
 }
diff --git a/tests/baselines/reference/parserPropertySignature3.symbols b/tests/baselines/reference/parserPropertySignature3.symbols
index c2b70b58be8..84e39dab5ec 100644
--- a/tests/baselines/reference/parserPropertySignature3.symbols
+++ b/tests/baselines/reference/parserPropertySignature3.symbols
@@ -3,5 +3,5 @@ interface I {
 >I : Symbol(I, Decl(parserPropertySignature3.ts, 0, 0))
 
   C:any;
->C : Symbol(C, Decl(parserPropertySignature3.ts, 0, 13))
+>C : Symbol(I.C, Decl(parserPropertySignature3.ts, 0, 13))
 }
diff --git a/tests/baselines/reference/parserPropertySignature4.symbols b/tests/baselines/reference/parserPropertySignature4.symbols
index cd61b14d34c..071a826b7f9 100644
--- a/tests/baselines/reference/parserPropertySignature4.symbols
+++ b/tests/baselines/reference/parserPropertySignature4.symbols
@@ -3,5 +3,5 @@ interface I {
 >I : Symbol(I, Decl(parserPropertySignature4.ts, 0, 0))
 
   D?:any;
->D : Symbol(D, Decl(parserPropertySignature4.ts, 0, 13))
+>D : Symbol(I.D, Decl(parserPropertySignature4.ts, 0, 13))
 }
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/parserSymbolProperty1.symbols b/tests/baselines/reference/parserSymbolProperty1.symbols
index b337b6ae30b..f9e377e054e 100644
--- a/tests/baselines/reference/parserSymbolProperty1.symbols
+++ b/tests/baselines/reference/parserSymbolProperty1.symbols
@@ -3,7 +3,7 @@ interface I {
 >I : Symbol(I, Decl(parserSymbolProperty1.ts, 0, 0))
 
     [Symbol.iterator]: string;
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/parserSymbolProperty2.symbols b/tests/baselines/reference/parserSymbolProperty2.symbols
index d4bfa388fa8..f5bb7fa0f53 100644
--- a/tests/baselines/reference/parserSymbolProperty2.symbols
+++ b/tests/baselines/reference/parserSymbolProperty2.symbols
@@ -3,7 +3,7 @@ interface I {
 >I : Symbol(I, Decl(parserSymbolProperty2.ts, 0, 0))
 
     [Symbol.unscopables](): string;
->Symbol.unscopables : Symbol(SymbolConstructor.unscopables, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->unscopables : Symbol(SymbolConstructor.unscopables, Decl(lib.d.ts, --, --))
+>Symbol.unscopables : Symbol(SymbolConstructor.unscopables, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>unscopables : Symbol(SymbolConstructor.unscopables, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/parserSymbolProperty3.symbols b/tests/baselines/reference/parserSymbolProperty3.symbols
index b740d5be4ad..9d2266ad4b7 100644
--- a/tests/baselines/reference/parserSymbolProperty3.symbols
+++ b/tests/baselines/reference/parserSymbolProperty3.symbols
@@ -3,7 +3,7 @@ declare class C {
 >C : Symbol(C, Decl(parserSymbolProperty3.ts, 0, 0))
 
     [Symbol.unscopables](): string;
->Symbol.unscopables : Symbol(SymbolConstructor.unscopables, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->unscopables : Symbol(SymbolConstructor.unscopables, Decl(lib.d.ts, --, --))
+>Symbol.unscopables : Symbol(SymbolConstructor.unscopables, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>unscopables : Symbol(SymbolConstructor.unscopables, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/parserSymbolProperty4.symbols b/tests/baselines/reference/parserSymbolProperty4.symbols
index 65250e977b7..e37cb6bc011 100644
--- a/tests/baselines/reference/parserSymbolProperty4.symbols
+++ b/tests/baselines/reference/parserSymbolProperty4.symbols
@@ -3,7 +3,7 @@ declare class C {
 >C : Symbol(C, Decl(parserSymbolProperty4.ts, 0, 0))
 
     [Symbol.toPrimitive]: string;
->Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
+>Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/parserSymbolProperty5.symbols b/tests/baselines/reference/parserSymbolProperty5.symbols
index c883c0aa12f..f8fb7d93417 100644
--- a/tests/baselines/reference/parserSymbolProperty5.symbols
+++ b/tests/baselines/reference/parserSymbolProperty5.symbols
@@ -3,7 +3,7 @@ class C {
 >C : Symbol(C, Decl(parserSymbolProperty5.ts, 0, 0))
 
     [Symbol.toPrimitive]: string;
->Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
+>Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/parserSymbolProperty6.symbols b/tests/baselines/reference/parserSymbolProperty6.symbols
index d8a2b9bf1cc..7fb83ea9ffa 100644
--- a/tests/baselines/reference/parserSymbolProperty6.symbols
+++ b/tests/baselines/reference/parserSymbolProperty6.symbols
@@ -3,7 +3,7 @@ class C {
 >C : Symbol(C, Decl(parserSymbolProperty6.ts, 0, 0))
 
     [Symbol.toStringTag]: string = "";
->Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
+>Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/parserSymbolProperty7.symbols b/tests/baselines/reference/parserSymbolProperty7.symbols
index 9319dfe87bb..8d71cbb1a0d 100644
--- a/tests/baselines/reference/parserSymbolProperty7.symbols
+++ b/tests/baselines/reference/parserSymbolProperty7.symbols
@@ -3,7 +3,7 @@ class C {
 >C : Symbol(C, Decl(parserSymbolProperty7.ts, 0, 0))
 
     [Symbol.toStringTag](): void { }
->Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
+>Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/parserSymbolProperty8.symbols b/tests/baselines/reference/parserSymbolProperty8.symbols
index 2a58473973e..e20dd2dbba4 100644
--- a/tests/baselines/reference/parserSymbolProperty8.symbols
+++ b/tests/baselines/reference/parserSymbolProperty8.symbols
@@ -3,7 +3,7 @@ var x: {
 >x : Symbol(x, Decl(parserSymbolProperty8.ts, 0, 3))
 
     [Symbol.toPrimitive](): string
->Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
+>Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/parserSymbolProperty9.symbols b/tests/baselines/reference/parserSymbolProperty9.symbols
index 85c66b21d5e..c70643c254a 100644
--- a/tests/baselines/reference/parserSymbolProperty9.symbols
+++ b/tests/baselines/reference/parserSymbolProperty9.symbols
@@ -3,7 +3,7 @@ var x: {
 >x : Symbol(x, Decl(parserSymbolProperty9.ts, 0, 3))
 
     [Symbol.toPrimitive]: string
->Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
+>Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.symbols b/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.symbols
index 36d09277a3e..2f0087416b9 100644
--- a/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.symbols
+++ b/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.symbols
@@ -3,9 +3,9 @@ class C {
 >C : Symbol(C, Decl(parsingClassRecoversWhenHittingUnexpectedSemicolon.ts, 0, 0))
 
     public f() { };
->f : Symbol(f, Decl(parsingClassRecoversWhenHittingUnexpectedSemicolon.ts, 0, 9))
+>f : Symbol(C.f, Decl(parsingClassRecoversWhenHittingUnexpectedSemicolon.ts, 0, 9))
 
     private m;
->m : Symbol(m, Decl(parsingClassRecoversWhenHittingUnexpectedSemicolon.ts, 1, 19))
+>m : Symbol(C.m, Decl(parsingClassRecoversWhenHittingUnexpectedSemicolon.ts, 1, 19))
 }
 
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.trace.json
index 513198c50b0..8b003e05e8f 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.trace.json
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.trace.json
@@ -3,11 +3,11 @@
     "Explicitly specified module resolution kind: 'Classic'.",
     "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'folder2/file2'",
     "Resolving module name 'folder2/file2' relative to base url 'c:/root' - 'c:/root/folder2/file2'.",
-    "File 'c:/root/folder2/file2.ts' exist - use it as a module resolution result.",
+    "File 'c:/root/folder2/file2.ts' exist - use it as a name resolution result.",
     "======== Module name 'folder2/file2' was successfully resolved to 'c:/root/folder2/file2.ts'. ========",
     "======== Resolving module './file3' from 'c:/root/folder2/file2.ts'. ========",
     "Explicitly specified module resolution kind: 'Classic'.",
-    "File 'c:/root/folder2/file3.ts' exist - use it as a module resolution result.",
+    "File 'c:/root/folder2/file3.ts' exist - use it as a name resolution result.",
     "======== Module name './file3' was successfully resolved to 'c:/root/folder2/file3.ts'. ========",
     "======== Resolving module 'file4' from 'c:/root/folder2/file2.ts'. ========",
     "Explicitly specified module resolution kind: 'Classic'.",
@@ -19,6 +19,6 @@
     "File 'c:/root/folder2/file4.d.ts' does not exist.",
     "File 'c:/root/file4.ts' does not exist.",
     "File 'c:/root/file4.d.ts' does not exist.",
-    "File 'c:/file4.ts' exist - use it as a module resolution result.",
+    "File 'c:/file4.ts' exist - use it as a name resolution result.",
     "======== Module name 'file4' was successfully resolved to 'c:/file4.ts'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.trace.json
index 6d0de807bc0..af5e20a3cc3 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.trace.json
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.trace.json
@@ -4,12 +4,12 @@
     "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'folder2/file2'",
     "Resolving module name 'folder2/file2' relative to base url 'c:/root' - 'c:/root/folder2/file2'.",
     "Loading module as file / folder, candidate module location 'c:/root/folder2/file2'.",
-    "File 'c:/root/folder2/file2.ts' exist - use it as a module resolution result.",
+    "File 'c:/root/folder2/file2.ts' exist - use it as a name resolution result.",
     "======== Module name 'folder2/file2' was successfully resolved to 'c:/root/folder2/file2.ts'. ========",
     "======== Resolving module './file3' from 'c:/root/folder2/file2.ts'. ========",
     "Explicitly specified module resolution kind: 'NodeJs'.",
     "Loading module as file / folder, candidate module location 'c:/root/folder2/file3'.",
-    "File 'c:/root/folder2/file3.ts' exist - use it as a module resolution result.",
+    "File 'c:/root/folder2/file3.ts' exist - use it as a name resolution result.",
     "======== Module name './file3' was successfully resolved to 'c:/root/folder2/file3.ts'. ========",
     "======== Resolving module 'file4' from 'c:/root/folder2/file2.ts'. ========",
     "Explicitly specified module resolution kind: 'NodeJs'.",
@@ -31,6 +31,13 @@
     "File 'c:/root/folder2/node_modules/file4/index.ts' does not exist.",
     "File 'c:/root/folder2/node_modules/file4/index.tsx' does not exist.",
     "File 'c:/root/folder2/node_modules/file4/index.d.ts' does not exist.",
+    "File 'c:/root/folder2/node_modules/@types/file4.ts' does not exist.",
+    "File 'c:/root/folder2/node_modules/@types/file4.tsx' does not exist.",
+    "File 'c:/root/folder2/node_modules/@types/file4.d.ts' does not exist.",
+    "File 'c:/root/folder2/node_modules/@types/file4/package.json' does not exist.",
+    "File 'c:/root/folder2/node_modules/@types/file4/index.ts' does not exist.",
+    "File 'c:/root/folder2/node_modules/@types/file4/index.tsx' does not exist.",
+    "File 'c:/root/folder2/node_modules/@types/file4/index.d.ts' does not exist.",
     "File 'c:/root/node_modules/file4.ts' does not exist.",
     "File 'c:/root/node_modules/file4.tsx' does not exist.",
     "File 'c:/root/node_modules/file4.d.ts' does not exist.",
@@ -38,12 +45,19 @@
     "File 'c:/root/node_modules/file4/index.ts' does not exist.",
     "File 'c:/root/node_modules/file4/index.tsx' does not exist.",
     "File 'c:/root/node_modules/file4/index.d.ts' does not exist.",
+    "File 'c:/root/node_modules/@types/file4.ts' does not exist.",
+    "File 'c:/root/node_modules/@types/file4.tsx' does not exist.",
+    "File 'c:/root/node_modules/@types/file4.d.ts' does not exist.",
+    "File 'c:/root/node_modules/@types/file4/package.json' does not exist.",
+    "File 'c:/root/node_modules/@types/file4/index.ts' does not exist.",
+    "File 'c:/root/node_modules/@types/file4/index.tsx' does not exist.",
+    "File 'c:/root/node_modules/@types/file4/index.d.ts' does not exist.",
     "File 'c:/node_modules/file4.ts' does not exist.",
     "File 'c:/node_modules/file4.tsx' does not exist.",
     "File 'c:/node_modules/file4.d.ts' does not exist.",
     "File 'c:/node_modules/file4/package.json' does not exist.",
     "File 'c:/node_modules/file4/index.ts' does not exist.",
     "File 'c:/node_modules/file4/index.tsx' does not exist.",
-    "File 'c:/node_modules/file4/index.d.ts' exist - use it as a module resolution result.",
+    "File 'c:/node_modules/file4/index.d.ts' exist - use it as a name resolution result.",
     "======== Module name 'file4' was successfully resolved to 'c:/node_modules/file4/index.d.ts'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.trace.json
index 513198c50b0..8b003e05e8f 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.trace.json
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.trace.json
@@ -3,11 +3,11 @@
     "Explicitly specified module resolution kind: 'Classic'.",
     "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'folder2/file2'",
     "Resolving module name 'folder2/file2' relative to base url 'c:/root' - 'c:/root/folder2/file2'.",
-    "File 'c:/root/folder2/file2.ts' exist - use it as a module resolution result.",
+    "File 'c:/root/folder2/file2.ts' exist - use it as a name resolution result.",
     "======== Module name 'folder2/file2' was successfully resolved to 'c:/root/folder2/file2.ts'. ========",
     "======== Resolving module './file3' from 'c:/root/folder2/file2.ts'. ========",
     "Explicitly specified module resolution kind: 'Classic'.",
-    "File 'c:/root/folder2/file3.ts' exist - use it as a module resolution result.",
+    "File 'c:/root/folder2/file3.ts' exist - use it as a name resolution result.",
     "======== Module name './file3' was successfully resolved to 'c:/root/folder2/file3.ts'. ========",
     "======== Resolving module 'file4' from 'c:/root/folder2/file2.ts'. ========",
     "Explicitly specified module resolution kind: 'Classic'.",
@@ -19,6 +19,6 @@
     "File 'c:/root/folder2/file4.d.ts' does not exist.",
     "File 'c:/root/file4.ts' does not exist.",
     "File 'c:/root/file4.d.ts' does not exist.",
-    "File 'c:/file4.ts' exist - use it as a module resolution result.",
+    "File 'c:/file4.ts' exist - use it as a name resolution result.",
     "======== Module name 'file4' was successfully resolved to 'c:/file4.ts'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.trace.json
index 6d0de807bc0..af5e20a3cc3 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.trace.json
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.trace.json
@@ -4,12 +4,12 @@
     "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'folder2/file2'",
     "Resolving module name 'folder2/file2' relative to base url 'c:/root' - 'c:/root/folder2/file2'.",
     "Loading module as file / folder, candidate module location 'c:/root/folder2/file2'.",
-    "File 'c:/root/folder2/file2.ts' exist - use it as a module resolution result.",
+    "File 'c:/root/folder2/file2.ts' exist - use it as a name resolution result.",
     "======== Module name 'folder2/file2' was successfully resolved to 'c:/root/folder2/file2.ts'. ========",
     "======== Resolving module './file3' from 'c:/root/folder2/file2.ts'. ========",
     "Explicitly specified module resolution kind: 'NodeJs'.",
     "Loading module as file / folder, candidate module location 'c:/root/folder2/file3'.",
-    "File 'c:/root/folder2/file3.ts' exist - use it as a module resolution result.",
+    "File 'c:/root/folder2/file3.ts' exist - use it as a name resolution result.",
     "======== Module name './file3' was successfully resolved to 'c:/root/folder2/file3.ts'. ========",
     "======== Resolving module 'file4' from 'c:/root/folder2/file2.ts'. ========",
     "Explicitly specified module resolution kind: 'NodeJs'.",
@@ -31,6 +31,13 @@
     "File 'c:/root/folder2/node_modules/file4/index.ts' does not exist.",
     "File 'c:/root/folder2/node_modules/file4/index.tsx' does not exist.",
     "File 'c:/root/folder2/node_modules/file4/index.d.ts' does not exist.",
+    "File 'c:/root/folder2/node_modules/@types/file4.ts' does not exist.",
+    "File 'c:/root/folder2/node_modules/@types/file4.tsx' does not exist.",
+    "File 'c:/root/folder2/node_modules/@types/file4.d.ts' does not exist.",
+    "File 'c:/root/folder2/node_modules/@types/file4/package.json' does not exist.",
+    "File 'c:/root/folder2/node_modules/@types/file4/index.ts' does not exist.",
+    "File 'c:/root/folder2/node_modules/@types/file4/index.tsx' does not exist.",
+    "File 'c:/root/folder2/node_modules/@types/file4/index.d.ts' does not exist.",
     "File 'c:/root/node_modules/file4.ts' does not exist.",
     "File 'c:/root/node_modules/file4.tsx' does not exist.",
     "File 'c:/root/node_modules/file4.d.ts' does not exist.",
@@ -38,12 +45,19 @@
     "File 'c:/root/node_modules/file4/index.ts' does not exist.",
     "File 'c:/root/node_modules/file4/index.tsx' does not exist.",
     "File 'c:/root/node_modules/file4/index.d.ts' does not exist.",
+    "File 'c:/root/node_modules/@types/file4.ts' does not exist.",
+    "File 'c:/root/node_modules/@types/file4.tsx' does not exist.",
+    "File 'c:/root/node_modules/@types/file4.d.ts' does not exist.",
+    "File 'c:/root/node_modules/@types/file4/package.json' does not exist.",
+    "File 'c:/root/node_modules/@types/file4/index.ts' does not exist.",
+    "File 'c:/root/node_modules/@types/file4/index.tsx' does not exist.",
+    "File 'c:/root/node_modules/@types/file4/index.d.ts' does not exist.",
     "File 'c:/node_modules/file4.ts' does not exist.",
     "File 'c:/node_modules/file4.tsx' does not exist.",
     "File 'c:/node_modules/file4.d.ts' does not exist.",
     "File 'c:/node_modules/file4/package.json' does not exist.",
     "File 'c:/node_modules/file4/index.ts' does not exist.",
     "File 'c:/node_modules/file4/index.tsx' does not exist.",
-    "File 'c:/node_modules/file4/index.d.ts' exist - use it as a module resolution result.",
+    "File 'c:/node_modules/file4/index.d.ts' exist - use it as a name resolution result.",
     "======== Module name 'file4' was successfully resolved to 'c:/node_modules/file4/index.d.ts'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.trace.json
index 099acae2aca..d1709c82dc6 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.trace.json
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.trace.json
@@ -5,7 +5,7 @@
     "'paths' option is specified, looking for a pattern to match module name 'folder2/file1'.",
     "Module name 'folder2/file1', matched pattern '*'.",
     "Trying substitution '*', candidate module location: 'folder2/file1'.",
-    "File 'c:/root/folder2/file1.ts' exist - use it as a module resolution result.",
+    "File 'c:/root/folder2/file1.ts' exist - use it as a name resolution result.",
     "======== Module name 'folder2/file1' was successfully resolved to 'c:/root/folder2/file1.ts'. ========",
     "======== Resolving module 'folder3/file2' from 'c:/root/folder1/file1.ts'. ========",
     "Module resolution kind is not specified, using 'Classic'.",
@@ -16,7 +16,7 @@
     "File 'c:/root/folder3/file2.ts' does not exist.",
     "File 'c:/root/folder3/file2.d.ts' does not exist.",
     "Trying substitution 'generated/*', candidate module location: 'generated/folder3/file2'.",
-    "File 'c:/root/generated/folder3/file2.ts' exist - use it as a module resolution result.",
+    "File 'c:/root/generated/folder3/file2.ts' exist - use it as a name resolution result.",
     "======== Module name 'folder3/file2' was successfully resolved to 'c:/root/generated/folder3/file2.ts'. ========",
     "======== Resolving module 'components/file3' from 'c:/root/folder1/file1.ts'. ========",
     "Module resolution kind is not specified, using 'Classic'.",
@@ -24,7 +24,7 @@
     "'paths' option is specified, looking for a pattern to match module name 'components/file3'.",
     "Module name 'components/file3', matched pattern 'components/*'.",
     "Trying substitution 'shared/components/*', candidate module location: 'shared/components/file3'.",
-    "File 'c:/root/shared/components/file3.ts' exist - use it as a module resolution result.",
+    "File 'c:/root/shared/components/file3.ts' exist - use it as a name resolution result.",
     "======== Module name 'components/file3' was successfully resolved to 'c:/root/shared/components/file3.ts'. ========",
     "======== Resolving module 'file4' from 'c:/root/folder1/file1.ts'. ========",
     "Module resolution kind is not specified, using 'Classic'.",
@@ -41,6 +41,6 @@
     "File 'c:/root/folder1/file4.d.ts' does not exist.",
     "File 'c:/root/file4.ts' does not exist.",
     "File 'c:/root/file4.d.ts' does not exist.",
-    "File 'c:/file4.ts' exist - use it as a module resolution result.",
+    "File 'c:/file4.ts' exist - use it as a name resolution result.",
     "======== Module name 'file4' was successfully resolved to 'c:/file4.ts'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.trace.json
index 398d15839de..cebd59f01b4 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.trace.json
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.trace.json
@@ -6,7 +6,7 @@
     "Module name 'folder2/file1', matched pattern '*'.",
     "Trying substitution '*', candidate module location: 'folder2/file1'.",
     "Loading module as file / folder, candidate module location 'c:/root/folder2/file1'.",
-    "File 'c:/root/folder2/file1.ts' exist - use it as a module resolution result.",
+    "File 'c:/root/folder2/file1.ts' exist - use it as a name resolution result.",
     "======== Module name 'folder2/file1' was successfully resolved to 'c:/root/folder2/file1.ts'. ========",
     "======== Resolving module 'folder3/file2' from 'c:/root/folder1/file1.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -24,7 +24,7 @@
     "File 'c:/root/folder3/file2/index.d.ts' does not exist.",
     "Trying substitution 'generated/*', candidate module location: 'generated/folder3/file2'.",
     "Loading module as file / folder, candidate module location 'c:/root/generated/folder3/file2'.",
-    "File 'c:/root/generated/folder3/file2.ts' exist - use it as a module resolution result.",
+    "File 'c:/root/generated/folder3/file2.ts' exist - use it as a name resolution result.",
     "======== Module name 'folder3/file2' was successfully resolved to 'c:/root/generated/folder3/file2.ts'. ========",
     "======== Resolving module 'components/file3' from 'c:/root/folder1/file1.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -39,7 +39,7 @@
     "File 'c:/root/shared/components/file3/package.json' does not exist.",
     "File 'c:/root/shared/components/file3/index.ts' does not exist.",
     "File 'c:/root/shared/components/file3/index.tsx' does not exist.",
-    "File 'c:/root/shared/components/file3/index.d.ts' exist - use it as a module resolution result.",
+    "File 'c:/root/shared/components/file3/index.d.ts' exist - use it as a name resolution result.",
     "======== Module name 'components/file3' was successfully resolved to 'c:/root/shared/components/file3/index.d.ts'. ========",
     "======== Resolving module 'file4' from 'c:/root/folder1/file1.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -72,6 +72,13 @@
     "File 'c:/root/folder1/node_modules/file4/index.ts' does not exist.",
     "File 'c:/root/folder1/node_modules/file4/index.tsx' does not exist.",
     "File 'c:/root/folder1/node_modules/file4/index.d.ts' does not exist.",
+    "File 'c:/root/folder1/node_modules/@types/file4.ts' does not exist.",
+    "File 'c:/root/folder1/node_modules/@types/file4.tsx' does not exist.",
+    "File 'c:/root/folder1/node_modules/@types/file4.d.ts' does not exist.",
+    "File 'c:/root/folder1/node_modules/@types/file4/package.json' does not exist.",
+    "File 'c:/root/folder1/node_modules/@types/file4/index.ts' does not exist.",
+    "File 'c:/root/folder1/node_modules/@types/file4/index.tsx' does not exist.",
+    "File 'c:/root/folder1/node_modules/@types/file4/index.d.ts' does not exist.",
     "File 'c:/root/node_modules/file4.ts' does not exist.",
     "File 'c:/root/node_modules/file4.tsx' does not exist.",
     "File 'c:/root/node_modules/file4.d.ts' does not exist.",
@@ -79,6 +86,13 @@
     "File 'c:/root/node_modules/file4/index.ts' does not exist.",
     "File 'c:/root/node_modules/file4/index.tsx' does not exist.",
     "File 'c:/root/node_modules/file4/index.d.ts' does not exist.",
-    "File 'c:/node_modules/file4.ts' exist - use it as a module resolution result.",
+    "File 'c:/root/node_modules/@types/file4.ts' does not exist.",
+    "File 'c:/root/node_modules/@types/file4.tsx' does not exist.",
+    "File 'c:/root/node_modules/@types/file4.d.ts' does not exist.",
+    "File 'c:/root/node_modules/@types/file4/package.json' does not exist.",
+    "File 'c:/root/node_modules/@types/file4/index.ts' does not exist.",
+    "File 'c:/root/node_modules/@types/file4/index.tsx' does not exist.",
+    "File 'c:/root/node_modules/@types/file4/index.d.ts' does not exist.",
+    "File 'c:/node_modules/file4.ts' exist - use it as a name resolution result.",
     "======== Module name 'file4' was successfully resolved to 'c:/node_modules/file4.ts'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.trace.json
index 0493e9c216b..20fc416ccd4 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.trace.json
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.trace.json
@@ -10,7 +10,7 @@
     "File 'c:/root/src/project/file3.d.ts' does not exist.",
     "Trying other entries in 'rootDirs'",
     "Loading 'project/file3' from the root dir 'c:/root/generated/src', candidate location 'c:/root/generated/src/project/file3'",
-    "File 'c:/root/generated/src/project/file3.ts' exist - use it as a module resolution result.",
+    "File 'c:/root/generated/src/project/file3.ts' exist - use it as a name resolution result.",
     "======== Module name './project/file3' was successfully resolved to 'c:/root/generated/src/project/file3.ts'. ========",
     "======== Resolving module '../file2' from 'c:/root/generated/src/project/file3.ts'. ========",
     "Module resolution kind is not specified, using 'Classic'.",
@@ -24,6 +24,6 @@
     "Trying other entries in 'rootDirs'",
     "Loading 'file2' from the root dir 'c:/root/src', candidate location 'c:/root/src/file2'",
     "File 'c:/root/src/file2.ts' does not exist.",
-    "File 'c:/root/src/file2.d.ts' exist - use it as a module resolution result.",
+    "File 'c:/root/src/file2.d.ts' exist - use it as a name resolution result.",
     "======== Module name '../file2' was successfully resolved to 'c:/root/src/file2.d.ts'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.trace.json
index 4ea2f12a63c..7c5e76a2847 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.trace.json
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.trace.json
@@ -17,7 +17,7 @@
     "Trying other entries in 'rootDirs'",
     "Loading 'project/file3' from the root dir 'c:/root/generated/src', candidate location 'c:/root/generated/src/project/file3'",
     "Loading module as file / folder, candidate module location 'c:/root/generated/src/project/file3'.",
-    "File 'c:/root/generated/src/project/file3.ts' exist - use it as a module resolution result.",
+    "File 'c:/root/generated/src/project/file3.ts' exist - use it as a name resolution result.",
     "======== Module name './project/file3' was successfully resolved to 'c:/root/generated/src/project/file3.ts'. ========",
     "======== Resolving module '../file2' from 'c:/root/generated/src/project/file3.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -43,6 +43,6 @@
     "File 'c:/root/src/file2/package.json' does not exist.",
     "File 'c:/root/src/file2/index.ts' does not exist.",
     "File 'c:/root/src/file2/index.tsx' does not exist.",
-    "File 'c:/root/src/file2/index.d.ts' exist - use it as a module resolution result.",
+    "File 'c:/root/src/file2/index.d.ts' exist - use it as a name resolution result.",
     "======== Module name '../file2' was successfully resolved to 'c:/root/src/file2/index.d.ts'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.trace.json
index b45cd4754c7..2d72108210e 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.trace.json
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.trace.json
@@ -10,7 +10,7 @@
     "File 'c:/root/src/project/file2.d.ts' does not exist.",
     "Trying other entries in 'rootDirs'",
     "Loading 'project/file2' from the root dir 'c:/root/generated/src', candidate location 'c:/root/generated/src/project/file2'",
-    "File 'c:/root/generated/src/project/file2.ts' exist - use it as a module resolution result.",
+    "File 'c:/root/generated/src/project/file2.ts' exist - use it as a name resolution result.",
     "======== Module name './project/file2' was successfully resolved to 'c:/root/generated/src/project/file2.ts'. ========",
     "======== Resolving module 'module3' from 'c:/root/src/file1.ts'. ========",
     "Module resolution kind is not specified, using 'Classic'.",
@@ -28,7 +28,7 @@
     "File 'c:/root/module3.ts' does not exist.",
     "File 'c:/root/module3.d.ts' does not exist.",
     "File 'c:/module3.ts' does not exist.",
-    "File 'c:/module3.d.ts' exist - use it as a module resolution result.",
+    "File 'c:/module3.d.ts' exist - use it as a name resolution result.",
     "======== Module name 'module3' was successfully resolved to 'c:/module3.d.ts'. ========",
     "======== Resolving module 'module1' from 'c:/root/generated/src/project/file2.ts'. ========",
     "Module resolution kind is not specified, using 'Classic'.",
@@ -40,7 +40,7 @@
     "File 'c:/root/module1.d.ts' does not exist.",
     "Trying substitution 'c:/shared/*', candidate module location: 'c:/shared/module1'.",
     "File 'c:/shared/module1.ts' does not exist.",
-    "File 'c:/shared/module1.d.ts' exist - use it as a module resolution result.",
+    "File 'c:/shared/module1.d.ts' exist - use it as a name resolution result.",
     "======== Module name 'module1' was successfully resolved to 'c:/shared/module1.d.ts'. ========",
     "======== Resolving module 'templates/module2' from 'c:/root/generated/src/project/file2.ts'. ========",
     "Module resolution kind is not specified, using 'Classic'.",
@@ -48,7 +48,7 @@
     "'paths' option is specified, looking for a pattern to match module name 'templates/module2'.",
     "Module name 'templates/module2', matched pattern 'templates/*'.",
     "Trying substitution 'generated/src/templates/*', candidate module location: 'generated/src/templates/module2'.",
-    "File 'c:/root/generated/src/templates/module2.ts' exist - use it as a module resolution result.",
+    "File 'c:/root/generated/src/templates/module2.ts' exist - use it as a name resolution result.",
     "======== Module name 'templates/module2' was successfully resolved to 'c:/root/generated/src/templates/module2.ts'. ========",
     "======== Resolving module '../file3' from 'c:/root/generated/src/project/file2.ts'. ========",
     "Module resolution kind is not specified, using 'Classic'.",
@@ -62,6 +62,6 @@
     "Trying other entries in 'rootDirs'",
     "Loading 'file3' from the root dir 'c:/root/src', candidate location 'c:/root/src/file3'",
     "File 'c:/root/src/file3.ts' does not exist.",
-    "File 'c:/root/src/file3.d.ts' exist - use it as a module resolution result.",
+    "File 'c:/root/src/file3.d.ts' exist - use it as a name resolution result.",
     "======== Module name '../file3' was successfully resolved to 'c:/root/src/file3.d.ts'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.trace.json
index 39d5c25c92a..99d4bf244db 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.trace.json
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.trace.json
@@ -17,7 +17,7 @@
     "Trying other entries in 'rootDirs'",
     "Loading 'project/file2' from the root dir 'c:/root/generated/src', candidate location 'c:/root/generated/src/project/file2'",
     "Loading module as file / folder, candidate module location 'c:/root/generated/src/project/file2'.",
-    "File 'c:/root/generated/src/project/file2.ts' exist - use it as a module resolution result.",
+    "File 'c:/root/generated/src/project/file2.ts' exist - use it as a name resolution result.",
     "======== Module name './project/file2' was successfully resolved to 'c:/root/generated/src/project/file2.ts'. ========",
     "======== Resolving module 'module3' from 'c:/root/src/file1.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -50,6 +50,13 @@
     "File 'c:/root/src/node_modules/module3/index.ts' does not exist.",
     "File 'c:/root/src/node_modules/module3/index.tsx' does not exist.",
     "File 'c:/root/src/node_modules/module3/index.d.ts' does not exist.",
+    "File 'c:/root/src/node_modules/@types/module3.ts' does not exist.",
+    "File 'c:/root/src/node_modules/@types/module3.tsx' does not exist.",
+    "File 'c:/root/src/node_modules/@types/module3.d.ts' does not exist.",
+    "File 'c:/root/src/node_modules/@types/module3/package.json' does not exist.",
+    "File 'c:/root/src/node_modules/@types/module3/index.ts' does not exist.",
+    "File 'c:/root/src/node_modules/@types/module3/index.tsx' does not exist.",
+    "File 'c:/root/src/node_modules/@types/module3/index.d.ts' does not exist.",
     "File 'c:/root/node_modules/module3.ts' does not exist.",
     "File 'c:/root/node_modules/module3.tsx' does not exist.",
     "File 'c:/root/node_modules/module3.d.ts' does not exist.",
@@ -57,9 +64,16 @@
     "File 'c:/root/node_modules/module3/index.ts' does not exist.",
     "File 'c:/root/node_modules/module3/index.tsx' does not exist.",
     "File 'c:/root/node_modules/module3/index.d.ts' does not exist.",
+    "File 'c:/root/node_modules/@types/module3.ts' does not exist.",
+    "File 'c:/root/node_modules/@types/module3.tsx' does not exist.",
+    "File 'c:/root/node_modules/@types/module3.d.ts' does not exist.",
+    "File 'c:/root/node_modules/@types/module3/package.json' does not exist.",
+    "File 'c:/root/node_modules/@types/module3/index.ts' does not exist.",
+    "File 'c:/root/node_modules/@types/module3/index.tsx' does not exist.",
+    "File 'c:/root/node_modules/@types/module3/index.d.ts' does not exist.",
     "File 'c:/node_modules/module3.ts' does not exist.",
     "File 'c:/node_modules/module3.tsx' does not exist.",
-    "File 'c:/node_modules/module3.d.ts' exist - use it as a module resolution result.",
+    "File 'c:/node_modules/module3.d.ts' exist - use it as a name resolution result.",
     "======== Module name 'module3' was successfully resolved to 'c:/node_modules/module3.d.ts'. ========",
     "======== Resolving module 'module1' from 'c:/root/generated/src/project/file2.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -83,7 +97,7 @@
     "File 'c:/shared/module1/package.json' does not exist.",
     "File 'c:/shared/module1/index.ts' does not exist.",
     "File 'c:/shared/module1/index.tsx' does not exist.",
-    "File 'c:/shared/module1/index.d.ts' exist - use it as a module resolution result.",
+    "File 'c:/shared/module1/index.d.ts' exist - use it as a name resolution result.",
     "======== Module name 'module1' was successfully resolved to 'c:/shared/module1/index.d.ts'. ========",
     "======== Resolving module 'templates/module2' from 'c:/root/generated/src/project/file2.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -92,7 +106,7 @@
     "Module name 'templates/module2', matched pattern 'templates/*'.",
     "Trying substitution 'generated/src/templates/*', candidate module location: 'generated/src/templates/module2'.",
     "Loading module as file / folder, candidate module location 'c:/root/generated/src/templates/module2'.",
-    "File 'c:/root/generated/src/templates/module2.ts' exist - use it as a module resolution result.",
+    "File 'c:/root/generated/src/templates/module2.ts' exist - use it as a name resolution result.",
     "======== Module name 'templates/module2' was successfully resolved to 'c:/root/generated/src/templates/module2.ts'. ========",
     "======== Resolving module '../file3' from 'c:/root/generated/src/project/file2.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
@@ -118,6 +132,6 @@
     "File 'c:/root/src/file3/package.json' does not exist.",
     "File 'c:/root/src/file3/index.ts' does not exist.",
     "File 'c:/root/src/file3/index.tsx' does not exist.",
-    "File 'c:/root/src/file3/index.d.ts' exist - use it as a module resolution result.",
+    "File 'c:/root/src/file3/index.d.ts' exist - use it as a name resolution result.",
     "======== Module name '../file3' was successfully resolved to 'c:/root/src/file3/index.d.ts'. ========"
 ]
\ No newline at end of file
diff --git a/tests/baselines/reference/pathsValidation1.errors.txt b/tests/baselines/reference/pathsValidation1.errors.txt
new file mode 100644
index 00000000000..c6193be67ac
--- /dev/null
+++ b/tests/baselines/reference/pathsValidation1.errors.txt
@@ -0,0 +1,6 @@
+error TS5063: Substututions for pattern '*' should be an array.
+
+
+!!! error TS5063: Substututions for pattern '*' should be an array.
+==== tests/cases/compiler/a.ts (0 errors) ====
+    let x = 1;
\ No newline at end of file
diff --git a/tests/baselines/reference/pathsValidation1.js b/tests/baselines/reference/pathsValidation1.js
new file mode 100644
index 00000000000..bfffc647f63
--- /dev/null
+++ b/tests/baselines/reference/pathsValidation1.js
@@ -0,0 +1,5 @@
+//// [a.ts]
+let x = 1;
+
+//// [a.js]
+var x = 1;
diff --git a/tests/baselines/reference/pathsValidation2.errors.txt b/tests/baselines/reference/pathsValidation2.errors.txt
new file mode 100644
index 00000000000..8956b2fc159
--- /dev/null
+++ b/tests/baselines/reference/pathsValidation2.errors.txt
@@ -0,0 +1,6 @@
+error TS5064: Substitution '1' for pattern '*' has incorrect type, expected 'string', got 'number'.
+
+
+!!! error TS5064: Substitution '1' for pattern '*' has incorrect type, expected 'string', got 'number'.
+==== tests/cases/compiler/a.ts (0 errors) ====
+    let x = 1;
\ No newline at end of file
diff --git a/tests/baselines/reference/pathsValidation2.js b/tests/baselines/reference/pathsValidation2.js
new file mode 100644
index 00000000000..bfffc647f63
--- /dev/null
+++ b/tests/baselines/reference/pathsValidation2.js
@@ -0,0 +1,5 @@
+//// [a.ts]
+let x = 1;
+
+//// [a.js]
+var x = 1;
diff --git a/tests/baselines/reference/plusOperatorWithBooleanType.symbols b/tests/baselines/reference/plusOperatorWithBooleanType.symbols
index d8c6beda3bc..29ee32c9f54 100644
--- a/tests/baselines/reference/plusOperatorWithBooleanType.symbols
+++ b/tests/baselines/reference/plusOperatorWithBooleanType.symbols
@@ -10,7 +10,7 @@ class A {
 >A : Symbol(A, Decl(plusOperatorWithBooleanType.ts, 3, 40))
 
     public a: boolean;
->a : Symbol(a, Decl(plusOperatorWithBooleanType.ts, 5, 9))
+>a : Symbol(A.a, Decl(plusOperatorWithBooleanType.ts, 5, 9))
 
     static foo() { return false; }
 >foo : Symbol(A.foo, Decl(plusOperatorWithBooleanType.ts, 6, 22))
diff --git a/tests/baselines/reference/plusOperatorWithNumberType.symbols b/tests/baselines/reference/plusOperatorWithNumberType.symbols
index fd62582515e..c8f4b9652d0 100644
--- a/tests/baselines/reference/plusOperatorWithNumberType.symbols
+++ b/tests/baselines/reference/plusOperatorWithNumberType.symbols
@@ -13,7 +13,7 @@ class A {
 >A : Symbol(A, Decl(plusOperatorWithNumberType.ts, 4, 36))
 
     public a: number;
->a : Symbol(a, Decl(plusOperatorWithNumberType.ts, 6, 9))
+>a : Symbol(A.a, Decl(plusOperatorWithNumberType.ts, 6, 9))
 
     static foo() { return 1; }
 >foo : Symbol(A.foo, Decl(plusOperatorWithNumberType.ts, 7, 21))
diff --git a/tests/baselines/reference/plusOperatorWithStringType.symbols b/tests/baselines/reference/plusOperatorWithStringType.symbols
index fd3e10c172f..eb2e2625a1c 100644
--- a/tests/baselines/reference/plusOperatorWithStringType.symbols
+++ b/tests/baselines/reference/plusOperatorWithStringType.symbols
@@ -13,7 +13,7 @@ class A {
 >A : Symbol(A, Decl(plusOperatorWithStringType.ts, 4, 40))
 
     public a: string;
->a : Symbol(a, Decl(plusOperatorWithStringType.ts, 6, 9))
+>a : Symbol(A.a, Decl(plusOperatorWithStringType.ts, 6, 9))
 
     static foo() { return ""; }
 >foo : Symbol(A.foo, Decl(plusOperatorWithStringType.ts, 7, 21))
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 c139b6279fd..cebf700aa59 100644
--- a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
+++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
@@ -161,11 +161,11 @@ var publicClassWithWithPrivatePropertyTypes = (function () {
     }
     return publicClassWithWithPrivatePropertyTypes;
 }());
+exports.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes;
 publicClassWithWithPrivatePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget1(); // Error
 publicClassWithWithPrivatePropertyTypes.myPrivateStaticProperty = exporter.createExportedWidget1();
 publicClassWithWithPrivatePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget3(); // Error
 publicClassWithWithPrivatePropertyTypes.myPrivateStaticProperty1 = exporter.createExportedWidget3();
-exports.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes;
 var privateClassWithWithPrivatePropertyTypes = (function () {
     function privateClassWithWithPrivatePropertyTypes() {
         this.myPublicProperty = exporter.createExportedWidget1();
@@ -190,9 +190,9 @@ var publicClassWithPrivateModulePropertyTypes = (function () {
     }
     return publicClassWithPrivateModulePropertyTypes;
 }());
+exports.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes;
 publicClassWithPrivateModulePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget2(); // Error
 publicClassWithPrivateModulePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget4(); // Error
-exports.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes;
 exports.publicVarWithPrivateModulePropertyTypes = exporter.createExportedWidget2(); // Error
 exports.publicVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); // Error
 var privateClassWithPrivateModulePropertyTypes = (function () {
diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.symbols b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.symbols
index d0f8179dfea..14d223f2c01 100644
--- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.symbols
+++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.symbols
@@ -5,7 +5,7 @@ export var x = 1;  // Makes this an external module
 interface Iterator<T> { x: T }
 >Iterator : Symbol(Iterator, Decl(privacyCheckAnonymousFunctionParameter2.ts, 0, 17))
 >T : Symbol(T, Decl(privacyCheckAnonymousFunctionParameter2.ts, 1, 19))
->x : Symbol(x, Decl(privacyCheckAnonymousFunctionParameter2.ts, 1, 23))
+>x : Symbol(Iterator.x, Decl(privacyCheckAnonymousFunctionParameter2.ts, 1, 23))
 >T : Symbol(T, Decl(privacyCheckAnonymousFunctionParameter2.ts, 1, 19))
 
 module Q {
diff --git a/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.symbols b/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.symbols
index 61e8d09798b..9234971375c 100644
--- a/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.symbols
+++ b/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.symbols
@@ -4,7 +4,7 @@ export interface A<T> {
 >T : Symbol(T, Decl(privacyCheckCallbackOfInterfaceMethodWithTypeParameter.ts, 0, 19))
 
     f1(callback: (p: T) => any); 
->f1 : Symbol(f1, Decl(privacyCheckCallbackOfInterfaceMethodWithTypeParameter.ts, 0, 23))
+>f1 : Symbol(A.f1, Decl(privacyCheckCallbackOfInterfaceMethodWithTypeParameter.ts, 0, 23))
 >callback : Symbol(callback, Decl(privacyCheckCallbackOfInterfaceMethodWithTypeParameter.ts, 1, 7))
 >p : Symbol(p, Decl(privacyCheckCallbackOfInterfaceMethodWithTypeParameter.ts, 1, 18))
 >T : Symbol(T, Decl(privacyCheckCallbackOfInterfaceMethodWithTypeParameter.ts, 0, 19))
diff --git a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.symbols b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.symbols
index 75ebd0bff0a..50402be8633 100644
--- a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.symbols
+++ b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.symbols
@@ -9,7 +9,7 @@ interface Bar {
 >Bar : Symbol(Bar, Decl(privacyCheckExternalModuleExportAssignmentOfGenericClass_1.ts, 1, 13))
 
     foo: Foo<number>;
->foo : Symbol(foo, Decl(privacyCheckExternalModuleExportAssignmentOfGenericClass_1.ts, 2, 15))
+>foo : Symbol(Bar.foo, Decl(privacyCheckExternalModuleExportAssignmentOfGenericClass_1.ts, 2, 15))
 >Foo : Symbol(Foo, Decl(privacyCheckExternalModuleExportAssignmentOfGenericClass_1.ts, 0, 0))
 }
 === tests/cases/compiler/privacyCheckExternalModuleExportAssignmentOfGenericClass_0.ts ===
@@ -21,7 +21,7 @@ class Foo<A> {
 >A : Symbol(A, Decl(privacyCheckExternalModuleExportAssignmentOfGenericClass_0.ts, 1, 10))
 
     constructor(public a: A) { }
->a : Symbol(a, Decl(privacyCheckExternalModuleExportAssignmentOfGenericClass_0.ts, 2, 16))
+>a : Symbol(Foo.a, Decl(privacyCheckExternalModuleExportAssignmentOfGenericClass_0.ts, 2, 16))
 >A : Symbol(A, Decl(privacyCheckExternalModuleExportAssignmentOfGenericClass_0.ts, 1, 10))
 }
 
diff --git a/tests/baselines/reference/privacyClass.symbols b/tests/baselines/reference/privacyClass.symbols
index 791193a54ab..b0d949c0444 100644
--- a/tests/baselines/reference/privacyClass.symbols
+++ b/tests/baselines/reference/privacyClass.symbols
@@ -14,7 +14,7 @@ export module m1 {
 >m1_c_public : Symbol(m1_c_public, Decl(privacyClass.ts, 5, 5))
 
         private f1() {
->f1 : Symbol(f1, Decl(privacyClass.ts, 7, 30))
+>f1 : Symbol(m1_c_public.f1, Decl(privacyClass.ts, 7, 30))
         }
     }
 
@@ -98,7 +98,7 @@ module m2 {
 >m2_c_public : Symbol(m2_c_public, Decl(privacyClass.ts, 49, 5))
 
         private f1() {
->f1 : Symbol(f1, Decl(privacyClass.ts, 51, 30))
+>f1 : Symbol(m2_c_public.f1, Decl(privacyClass.ts, 51, 30))
         }
     }
 
@@ -178,7 +178,7 @@ export class glo_c_public {
 >glo_c_public : Symbol(glo_c_public, Decl(privacyClass.ts, 91, 1))
 
     private f1() {
->f1 : Symbol(f1, Decl(privacyClass.ts, 93, 27))
+>f1 : Symbol(glo_c_public.f1, Decl(privacyClass.ts, 93, 27))
     }
 }
 
diff --git a/tests/baselines/reference/privacyFunc.symbols b/tests/baselines/reference/privacyFunc.symbols
index 2d156da870d..0eb77cf8606 100644
--- a/tests/baselines/reference/privacyFunc.symbols
+++ b/tests/baselines/reference/privacyFunc.symbols
@@ -6,7 +6,7 @@ module m1 {
 >C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11))
 
         private f1() {
->f1 : Symbol(f1, Decl(privacyFunc.ts, 1, 28))
+>f1 : Symbol(C1_public.f1, Decl(privacyFunc.ts, 1, 28))
         }
     }
 
@@ -30,59 +30,59 @@ module m1 {
         }
 
         private f1_private(m1_c3_f1_arg: C1_public) {
->f1_private : Symbol(f1_private, Decl(privacyFunc.ts, 13, 9))
+>f1_private : Symbol(C3_public.f1_private, Decl(privacyFunc.ts, 13, 9))
 >m1_c3_f1_arg : Symbol(m1_c3_f1_arg, Decl(privacyFunc.ts, 15, 27))
 >C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11))
         }
 
         public f2_public(m1_c3_f2_arg: C1_public) {
->f2_public : Symbol(f2_public, Decl(privacyFunc.ts, 16, 9))
+>f2_public : Symbol(C3_public.f2_public, Decl(privacyFunc.ts, 16, 9))
 >m1_c3_f2_arg : Symbol(m1_c3_f2_arg, Decl(privacyFunc.ts, 18, 25))
 >C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11))
         }
 
         private f3_private(m1_c3_f3_arg: C2_private) {
->f3_private : Symbol(f3_private, Decl(privacyFunc.ts, 19, 9))
+>f3_private : Symbol(C3_public.f3_private, Decl(privacyFunc.ts, 19, 9))
 >m1_c3_f3_arg : Symbol(m1_c3_f3_arg, Decl(privacyFunc.ts, 21, 27))
 >C2_private : Symbol(C2_private, Decl(privacyFunc.ts, 4, 5))
         }
 
         public f4_public(m1_c3_f4_arg: C2_private) { // error
->f4_public : Symbol(f4_public, Decl(privacyFunc.ts, 22, 9))
+>f4_public : Symbol(C3_public.f4_public, Decl(privacyFunc.ts, 22, 9))
 >m1_c3_f4_arg : Symbol(m1_c3_f4_arg, Decl(privacyFunc.ts, 24, 25))
 >C2_private : Symbol(C2_private, Decl(privacyFunc.ts, 4, 5))
         }
 
         private f5_private() {
->f5_private : Symbol(f5_private, Decl(privacyFunc.ts, 25, 9))
+>f5_private : Symbol(C3_public.f5_private, Decl(privacyFunc.ts, 25, 9))
 
             return new C1_public();
 >C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11))
         }
 
         public f6_public() {
->f6_public : Symbol(f6_public, Decl(privacyFunc.ts, 29, 9))
+>f6_public : Symbol(C3_public.f6_public, Decl(privacyFunc.ts, 29, 9))
 
             return new C1_public();
 >C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11))
         }
 
         private f7_private() {
->f7_private : Symbol(f7_private, Decl(privacyFunc.ts, 33, 9))
+>f7_private : Symbol(C3_public.f7_private, Decl(privacyFunc.ts, 33, 9))
 
             return new C2_private();
 >C2_private : Symbol(C2_private, Decl(privacyFunc.ts, 4, 5))
         }
 
         public f8_public() {
->f8_public : Symbol(f8_public, Decl(privacyFunc.ts, 37, 9))
+>f8_public : Symbol(C3_public.f8_public, Decl(privacyFunc.ts, 37, 9))
 
             return new C2_private();  // error
 >C2_private : Symbol(C2_private, Decl(privacyFunc.ts, 4, 5))
         }
 
         private f9_private(): C1_public {
->f9_private : Symbol(f9_private, Decl(privacyFunc.ts, 41, 9))
+>f9_private : Symbol(C3_public.f9_private, Decl(privacyFunc.ts, 41, 9))
 >C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11))
 
             return new C1_public();
@@ -90,7 +90,7 @@ module m1 {
         }
 
         public f10_public(): C1_public {
->f10_public : Symbol(f10_public, Decl(privacyFunc.ts, 45, 9))
+>f10_public : Symbol(C3_public.f10_public, Decl(privacyFunc.ts, 45, 9))
 >C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11))
 
             return new C1_public();
@@ -98,7 +98,7 @@ module m1 {
         }
 
         private f11_private(): C2_private {
->f11_private : Symbol(f11_private, Decl(privacyFunc.ts, 49, 9))
+>f11_private : Symbol(C3_public.f11_private, Decl(privacyFunc.ts, 49, 9))
 >C2_private : Symbol(C2_private, Decl(privacyFunc.ts, 4, 5))
 
             return new C2_private();
@@ -106,7 +106,7 @@ module m1 {
         }
 
         public f12_public(): C2_private { // error
->f12_public : Symbol(f12_public, Decl(privacyFunc.ts, 53, 9))
+>f12_public : Symbol(C3_public.f12_public, Decl(privacyFunc.ts, 53, 9))
 >C2_private : Symbol(C2_private, Decl(privacyFunc.ts, 4, 5))
 
             return new C2_private(); //error
@@ -129,53 +129,53 @@ module m1 {
 >m1_c4_c1_2 : Symbol(m1_c4_c1_2, Decl(privacyFunc.ts, 63, 21))
         }
         private f1_private(m1_c4_f1_arg: C1_public) {
->f1_private : Symbol(f1_private, Decl(privacyFunc.ts, 64, 9))
+>f1_private : Symbol(C4_private.f1_private, Decl(privacyFunc.ts, 64, 9))
 >m1_c4_f1_arg : Symbol(m1_c4_f1_arg, Decl(privacyFunc.ts, 65, 27))
 >C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11))
         }
 
         public f2_public(m1_c4_f2_arg: C1_public) {
->f2_public : Symbol(f2_public, Decl(privacyFunc.ts, 66, 9))
+>f2_public : Symbol(C4_private.f2_public, Decl(privacyFunc.ts, 66, 9))
 >m1_c4_f2_arg : Symbol(m1_c4_f2_arg, Decl(privacyFunc.ts, 68, 25))
 >C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11))
         }
 
         private f3_private(m1_c4_f3_arg: C2_private) {
->f3_private : Symbol(f3_private, Decl(privacyFunc.ts, 69, 9))
+>f3_private : Symbol(C4_private.f3_private, Decl(privacyFunc.ts, 69, 9))
 >m1_c4_f3_arg : Symbol(m1_c4_f3_arg, Decl(privacyFunc.ts, 71, 27))
 >C2_private : Symbol(C2_private, Decl(privacyFunc.ts, 4, 5))
         }
 
         public f4_public(m1_c4_f4_arg: C2_private) {
->f4_public : Symbol(f4_public, Decl(privacyFunc.ts, 72, 9))
+>f4_public : Symbol(C4_private.f4_public, Decl(privacyFunc.ts, 72, 9))
 >m1_c4_f4_arg : Symbol(m1_c4_f4_arg, Decl(privacyFunc.ts, 74, 25))
 >C2_private : Symbol(C2_private, Decl(privacyFunc.ts, 4, 5))
         }
 
 
         private f5_private() {
->f5_private : Symbol(f5_private, Decl(privacyFunc.ts, 75, 9))
+>f5_private : Symbol(C4_private.f5_private, Decl(privacyFunc.ts, 75, 9))
 
             return new C1_public();
 >C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11))
         }
 
         public f6_public() {
->f6_public : Symbol(f6_public, Decl(privacyFunc.ts, 80, 9))
+>f6_public : Symbol(C4_private.f6_public, Decl(privacyFunc.ts, 80, 9))
 
             return new C1_public();
 >C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11))
         }
 
         private f7_private() {
->f7_private : Symbol(f7_private, Decl(privacyFunc.ts, 84, 9))
+>f7_private : Symbol(C4_private.f7_private, Decl(privacyFunc.ts, 84, 9))
 
             return new C2_private();
 >C2_private : Symbol(C2_private, Decl(privacyFunc.ts, 4, 5))
         }
 
         public f8_public() {
->f8_public : Symbol(f8_public, Decl(privacyFunc.ts, 88, 9))
+>f8_public : Symbol(C4_private.f8_public, Decl(privacyFunc.ts, 88, 9))
 
             return new C2_private();
 >C2_private : Symbol(C2_private, Decl(privacyFunc.ts, 4, 5))
@@ -183,7 +183,7 @@ module m1 {
 
 
         private f9_private(): C1_public {
->f9_private : Symbol(f9_private, Decl(privacyFunc.ts, 92, 9))
+>f9_private : Symbol(C4_private.f9_private, Decl(privacyFunc.ts, 92, 9))
 >C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11))
 
             return new C1_public();
@@ -191,7 +191,7 @@ module m1 {
         }
 
         public f10_public(): C1_public {
->f10_public : Symbol(f10_public, Decl(privacyFunc.ts, 97, 9))
+>f10_public : Symbol(C4_private.f10_public, Decl(privacyFunc.ts, 97, 9))
 >C1_public : Symbol(C1_public, Decl(privacyFunc.ts, 0, 11))
 
             return new C1_public();
@@ -199,7 +199,7 @@ module m1 {
         }
 
         private f11_private(): C2_private {
->f11_private : Symbol(f11_private, Decl(privacyFunc.ts, 101, 9))
+>f11_private : Symbol(C4_private.f11_private, Decl(privacyFunc.ts, 101, 9))
 >C2_private : Symbol(C2_private, Decl(privacyFunc.ts, 4, 5))
 
             return new C2_private();
@@ -207,7 +207,7 @@ module m1 {
         }
 
         public f12_public(): C2_private {
->f12_public : Symbol(f12_public, Decl(privacyFunc.ts, 105, 9))
+>f12_public : Symbol(C4_private.f12_public, Decl(privacyFunc.ts, 105, 9))
 >C2_private : Symbol(C2_private, Decl(privacyFunc.ts, 4, 5))
 
             return new C2_private();
@@ -352,33 +352,33 @@ class C7_public {
 >c7_c1_2 : Symbol(c7_c1_2, Decl(privacyFunc.ts, 183, 17))
     }
     private f1_private(c7_f1_arg: C6_public) {
->f1_private : Symbol(f1_private, Decl(privacyFunc.ts, 184, 5))
+>f1_private : Symbol(C7_public.f1_private, Decl(privacyFunc.ts, 184, 5))
 >c7_f1_arg : Symbol(c7_f1_arg, Decl(privacyFunc.ts, 185, 23))
 >C6_public : Symbol(C6_public, Decl(privacyFunc.ts, 176, 1))
     }
 
     public f2_public(c7_f2_arg: C6_public) {
->f2_public : Symbol(f2_public, Decl(privacyFunc.ts, 186, 5))
+>f2_public : Symbol(C7_public.f2_public, Decl(privacyFunc.ts, 186, 5))
 >c7_f2_arg : Symbol(c7_f2_arg, Decl(privacyFunc.ts, 188, 21))
 >C6_public : Symbol(C6_public, Decl(privacyFunc.ts, 176, 1))
     }
 
     private f5_private() {
->f5_private : Symbol(f5_private, Decl(privacyFunc.ts, 189, 5))
+>f5_private : Symbol(C7_public.f5_private, Decl(privacyFunc.ts, 189, 5))
 
         return new C6_public();
 >C6_public : Symbol(C6_public, Decl(privacyFunc.ts, 176, 1))
     }
 
     public f6_public() {
->f6_public : Symbol(f6_public, Decl(privacyFunc.ts, 193, 5))
+>f6_public : Symbol(C7_public.f6_public, Decl(privacyFunc.ts, 193, 5))
 
         return new C6_public();
 >C6_public : Symbol(C6_public, Decl(privacyFunc.ts, 176, 1))
     }
 
     private f9_private(): C6_public {
->f9_private : Symbol(f9_private, Decl(privacyFunc.ts, 197, 5))
+>f9_private : Symbol(C7_public.f9_private, Decl(privacyFunc.ts, 197, 5))
 >C6_public : Symbol(C6_public, Decl(privacyFunc.ts, 176, 1))
 
         return new C6_public();
@@ -386,7 +386,7 @@ class C7_public {
     }
 
     public f10_public(): C6_public {
->f10_public : Symbol(f10_public, Decl(privacyFunc.ts, 201, 5))
+>f10_public : Symbol(C7_public.f10_public, Decl(privacyFunc.ts, 201, 5))
 >C6_public : Symbol(C6_public, Decl(privacyFunc.ts, 176, 1))
 
         return new C6_public();
diff --git a/tests/baselines/reference/privacyGetter.symbols b/tests/baselines/reference/privacyGetter.symbols
index eff33e0061b..19a78e7ce8a 100644
--- a/tests/baselines/reference/privacyGetter.symbols
+++ b/tests/baselines/reference/privacyGetter.symbols
@@ -6,7 +6,7 @@ export module m1 {
 >C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 18))
 
         private f1() {
->f1 : Symbol(f1, Decl(privacyGetter.ts, 1, 28))
+>f1 : Symbol(C1_public.f1, Decl(privacyGetter.ts, 1, 28))
         }
     }
 
@@ -18,46 +18,46 @@ export module m1 {
 >C3_public : Symbol(C3_public, Decl(privacyGetter.ts, 7, 5))
 
         private get p1_private() {
->p1_private : Symbol(p1_private, Decl(privacyGetter.ts, 9, 28), Decl(privacyGetter.ts, 12, 9))
+>p1_private : Symbol(C3_public.p1_private, Decl(privacyGetter.ts, 9, 28), Decl(privacyGetter.ts, 12, 9))
 
             return new C1_public();
 >C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 18))
         }
 
         private set p1_private(m1_c3_p1_arg: C1_public) {
->p1_private : Symbol(p1_private, Decl(privacyGetter.ts, 9, 28), Decl(privacyGetter.ts, 12, 9))
+>p1_private : Symbol(C3_public.p1_private, Decl(privacyGetter.ts, 9, 28), Decl(privacyGetter.ts, 12, 9))
 >m1_c3_p1_arg : Symbol(m1_c3_p1_arg, Decl(privacyGetter.ts, 14, 31))
 >C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 18))
         }
 
         private get p2_private() {
->p2_private : Symbol(p2_private, Decl(privacyGetter.ts, 15, 9), Decl(privacyGetter.ts, 19, 9))
+>p2_private : Symbol(C3_public.p2_private, Decl(privacyGetter.ts, 15, 9), Decl(privacyGetter.ts, 19, 9))
 
             return new C1_public();
 >C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 18))
         }
 
         private set p2_private(m1_c3_p2_arg: C1_public) {
->p2_private : Symbol(p2_private, Decl(privacyGetter.ts, 15, 9), Decl(privacyGetter.ts, 19, 9))
+>p2_private : Symbol(C3_public.p2_private, Decl(privacyGetter.ts, 15, 9), Decl(privacyGetter.ts, 19, 9))
 >m1_c3_p2_arg : Symbol(m1_c3_p2_arg, Decl(privacyGetter.ts, 21, 31))
 >C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 18))
         }
 
         private get p3_private() {
->p3_private : Symbol(p3_private, Decl(privacyGetter.ts, 22, 9), Decl(privacyGetter.ts, 26, 9))
+>p3_private : Symbol(C3_public.p3_private, Decl(privacyGetter.ts, 22, 9), Decl(privacyGetter.ts, 26, 9))
 
             return new C2_private();
 >C2_private : Symbol(C2_private, Decl(privacyGetter.ts, 4, 5))
         }
 
         private set p3_private(m1_c3_p3_arg: C2_private) {
->p3_private : Symbol(p3_private, Decl(privacyGetter.ts, 22, 9), Decl(privacyGetter.ts, 26, 9))
+>p3_private : Symbol(C3_public.p3_private, Decl(privacyGetter.ts, 22, 9), Decl(privacyGetter.ts, 26, 9))
 >m1_c3_p3_arg : Symbol(m1_c3_p3_arg, Decl(privacyGetter.ts, 28, 31))
 >C2_private : Symbol(C2_private, Decl(privacyGetter.ts, 4, 5))
         }
 
         public get p4_public(): C2_private { // error
->p4_public : Symbol(p4_public, Decl(privacyGetter.ts, 29, 9), Decl(privacyGetter.ts, 33, 9))
+>p4_public : Symbol(C3_public.p4_public, Decl(privacyGetter.ts, 29, 9), Decl(privacyGetter.ts, 33, 9))
 >C2_private : Symbol(C2_private, Decl(privacyGetter.ts, 4, 5))
 
             return new C2_private(); //error
@@ -65,7 +65,7 @@ export module m1 {
         }
 
         public set p4_public(m1_c3_p4_arg: C2_private) { // error
->p4_public : Symbol(p4_public, Decl(privacyGetter.ts, 29, 9), Decl(privacyGetter.ts, 33, 9))
+>p4_public : Symbol(C3_public.p4_public, Decl(privacyGetter.ts, 29, 9), Decl(privacyGetter.ts, 33, 9))
 >m1_c3_p4_arg : Symbol(m1_c3_p4_arg, Decl(privacyGetter.ts, 35, 29))
 >C2_private : Symbol(C2_private, Decl(privacyGetter.ts, 4, 5))
         }
@@ -75,46 +75,46 @@ export module m1 {
 >C4_private : Symbol(C4_private, Decl(privacyGetter.ts, 37, 5))
 
         private get p1_private() {
->p1_private : Symbol(p1_private, Decl(privacyGetter.ts, 39, 22), Decl(privacyGetter.ts, 42, 9))
+>p1_private : Symbol(C4_private.p1_private, Decl(privacyGetter.ts, 39, 22), Decl(privacyGetter.ts, 42, 9))
 
             return new C1_public();
 >C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 18))
         }
 
         private set p1_private(m1_c3_p1_arg: C1_public) {
->p1_private : Symbol(p1_private, Decl(privacyGetter.ts, 39, 22), Decl(privacyGetter.ts, 42, 9))
+>p1_private : Symbol(C4_private.p1_private, Decl(privacyGetter.ts, 39, 22), Decl(privacyGetter.ts, 42, 9))
 >m1_c3_p1_arg : Symbol(m1_c3_p1_arg, Decl(privacyGetter.ts, 44, 31))
 >C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 18))
         }
 
         private get p2_private() {
->p2_private : Symbol(p2_private, Decl(privacyGetter.ts, 45, 9), Decl(privacyGetter.ts, 49, 9))
+>p2_private : Symbol(C4_private.p2_private, Decl(privacyGetter.ts, 45, 9), Decl(privacyGetter.ts, 49, 9))
 
             return new C1_public();
 >C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 18))
         }
 
         private set p2_private(m1_c3_p2_arg: C1_public) {
->p2_private : Symbol(p2_private, Decl(privacyGetter.ts, 45, 9), Decl(privacyGetter.ts, 49, 9))
+>p2_private : Symbol(C4_private.p2_private, Decl(privacyGetter.ts, 45, 9), Decl(privacyGetter.ts, 49, 9))
 >m1_c3_p2_arg : Symbol(m1_c3_p2_arg, Decl(privacyGetter.ts, 51, 31))
 >C1_public : Symbol(C1_public, Decl(privacyGetter.ts, 0, 18))
         }
 
         private get p3_private() {
->p3_private : Symbol(p3_private, Decl(privacyGetter.ts, 52, 9), Decl(privacyGetter.ts, 56, 9))
+>p3_private : Symbol(C4_private.p3_private, Decl(privacyGetter.ts, 52, 9), Decl(privacyGetter.ts, 56, 9))
 
             return new C2_private();
 >C2_private : Symbol(C2_private, Decl(privacyGetter.ts, 4, 5))
         }
 
         private set p3_private(m1_c3_p3_arg: C2_private) {
->p3_private : Symbol(p3_private, Decl(privacyGetter.ts, 52, 9), Decl(privacyGetter.ts, 56, 9))
+>p3_private : Symbol(C4_private.p3_private, Decl(privacyGetter.ts, 52, 9), Decl(privacyGetter.ts, 56, 9))
 >m1_c3_p3_arg : Symbol(m1_c3_p3_arg, Decl(privacyGetter.ts, 58, 31))
 >C2_private : Symbol(C2_private, Decl(privacyGetter.ts, 4, 5))
         }
 
         public get p4_public(): C2_private {
->p4_public : Symbol(p4_public, Decl(privacyGetter.ts, 59, 9), Decl(privacyGetter.ts, 63, 9))
+>p4_public : Symbol(C4_private.p4_public, Decl(privacyGetter.ts, 59, 9), Decl(privacyGetter.ts, 63, 9))
 >C2_private : Symbol(C2_private, Decl(privacyGetter.ts, 4, 5))
 
             return new C2_private();
@@ -122,7 +122,7 @@ export module m1 {
         }
 
         public set p4_public(m1_c3_p4_arg: C2_private) {
->p4_public : Symbol(p4_public, Decl(privacyGetter.ts, 59, 9), Decl(privacyGetter.ts, 63, 9))
+>p4_public : Symbol(C4_private.p4_public, Decl(privacyGetter.ts, 59, 9), Decl(privacyGetter.ts, 63, 9))
 >m1_c3_p4_arg : Symbol(m1_c3_p4_arg, Decl(privacyGetter.ts, 65, 29))
 >C2_private : Symbol(C2_private, Decl(privacyGetter.ts, 4, 5))
         }
@@ -136,7 +136,7 @@ module m2 {
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 11))
 
         private f1() {
->f1 : Symbol(f1, Decl(privacyGetter.ts, 71, 31))
+>f1 : Symbol(m2_C1_public.f1, Decl(privacyGetter.ts, 71, 31))
         }
     }
 
@@ -148,46 +148,46 @@ module m2 {
 >m2_C3_public : Symbol(m2_C3_public, Decl(privacyGetter.ts, 77, 5))
 
         private get p1_private() {
->p1_private : Symbol(p1_private, Decl(privacyGetter.ts, 79, 31), Decl(privacyGetter.ts, 82, 9))
+>p1_private : Symbol(m2_C3_public.p1_private, Decl(privacyGetter.ts, 79, 31), Decl(privacyGetter.ts, 82, 9))
 
             return new m2_C1_public();
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 11))
         }
 
         private set p1_private(m2_c3_p1_arg: m2_C1_public) {
->p1_private : Symbol(p1_private, Decl(privacyGetter.ts, 79, 31), Decl(privacyGetter.ts, 82, 9))
+>p1_private : Symbol(m2_C3_public.p1_private, Decl(privacyGetter.ts, 79, 31), Decl(privacyGetter.ts, 82, 9))
 >m2_c3_p1_arg : Symbol(m2_c3_p1_arg, Decl(privacyGetter.ts, 84, 31))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 11))
         }
 
         private get p2_private() {
->p2_private : Symbol(p2_private, Decl(privacyGetter.ts, 85, 9), Decl(privacyGetter.ts, 89, 9))
+>p2_private : Symbol(m2_C3_public.p2_private, Decl(privacyGetter.ts, 85, 9), Decl(privacyGetter.ts, 89, 9))
 
             return new m2_C1_public();
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 11))
         }
 
         private set p2_private(m2_c3_p2_arg: m2_C1_public) {
->p2_private : Symbol(p2_private, Decl(privacyGetter.ts, 85, 9), Decl(privacyGetter.ts, 89, 9))
+>p2_private : Symbol(m2_C3_public.p2_private, Decl(privacyGetter.ts, 85, 9), Decl(privacyGetter.ts, 89, 9))
 >m2_c3_p2_arg : Symbol(m2_c3_p2_arg, Decl(privacyGetter.ts, 91, 31))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 11))
         }
 
         private get p3_private() {
->p3_private : Symbol(p3_private, Decl(privacyGetter.ts, 92, 9), Decl(privacyGetter.ts, 96, 9))
+>p3_private : Symbol(m2_C3_public.p3_private, Decl(privacyGetter.ts, 92, 9), Decl(privacyGetter.ts, 96, 9))
 
             return new m2_C2_private();
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyGetter.ts, 74, 5))
         }
 
         private set p3_private(m2_c3_p3_arg: m2_C2_private) {
->p3_private : Symbol(p3_private, Decl(privacyGetter.ts, 92, 9), Decl(privacyGetter.ts, 96, 9))
+>p3_private : Symbol(m2_C3_public.p3_private, Decl(privacyGetter.ts, 92, 9), Decl(privacyGetter.ts, 96, 9))
 >m2_c3_p3_arg : Symbol(m2_c3_p3_arg, Decl(privacyGetter.ts, 98, 31))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyGetter.ts, 74, 5))
         }
 
         public get p4_public(): m2_C2_private {
->p4_public : Symbol(p4_public, Decl(privacyGetter.ts, 99, 9), Decl(privacyGetter.ts, 103, 9))
+>p4_public : Symbol(m2_C3_public.p4_public, Decl(privacyGetter.ts, 99, 9), Decl(privacyGetter.ts, 103, 9))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyGetter.ts, 74, 5))
 
             return new m2_C2_private();
@@ -195,7 +195,7 @@ module m2 {
         }
 
         public set p4_public(m2_c3_p4_arg: m2_C2_private) {
->p4_public : Symbol(p4_public, Decl(privacyGetter.ts, 99, 9), Decl(privacyGetter.ts, 103, 9))
+>p4_public : Symbol(m2_C3_public.p4_public, Decl(privacyGetter.ts, 99, 9), Decl(privacyGetter.ts, 103, 9))
 >m2_c3_p4_arg : Symbol(m2_c3_p4_arg, Decl(privacyGetter.ts, 105, 29))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyGetter.ts, 74, 5))
         }
@@ -205,46 +205,46 @@ module m2 {
 >m2_C4_private : Symbol(m2_C4_private, Decl(privacyGetter.ts, 107, 5))
 
         private get p1_private() {
->p1_private : Symbol(p1_private, Decl(privacyGetter.ts, 109, 25), Decl(privacyGetter.ts, 112, 9))
+>p1_private : Symbol(m2_C4_private.p1_private, Decl(privacyGetter.ts, 109, 25), Decl(privacyGetter.ts, 112, 9))
 
             return new m2_C1_public();
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 11))
         }
 
         private set p1_private(m2_c3_p1_arg: m2_C1_public) {
->p1_private : Symbol(p1_private, Decl(privacyGetter.ts, 109, 25), Decl(privacyGetter.ts, 112, 9))
+>p1_private : Symbol(m2_C4_private.p1_private, Decl(privacyGetter.ts, 109, 25), Decl(privacyGetter.ts, 112, 9))
 >m2_c3_p1_arg : Symbol(m2_c3_p1_arg, Decl(privacyGetter.ts, 114, 31))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 11))
         }
 
         private get p2_private() {
->p2_private : Symbol(p2_private, Decl(privacyGetter.ts, 115, 9), Decl(privacyGetter.ts, 119, 9))
+>p2_private : Symbol(m2_C4_private.p2_private, Decl(privacyGetter.ts, 115, 9), Decl(privacyGetter.ts, 119, 9))
 
             return new m2_C1_public();
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 11))
         }
 
         private set p2_private(m2_c3_p2_arg: m2_C1_public) {
->p2_private : Symbol(p2_private, Decl(privacyGetter.ts, 115, 9), Decl(privacyGetter.ts, 119, 9))
+>p2_private : Symbol(m2_C4_private.p2_private, Decl(privacyGetter.ts, 115, 9), Decl(privacyGetter.ts, 119, 9))
 >m2_c3_p2_arg : Symbol(m2_c3_p2_arg, Decl(privacyGetter.ts, 121, 31))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyGetter.ts, 70, 11))
         }
 
         private get p3_private() {
->p3_private : Symbol(p3_private, Decl(privacyGetter.ts, 122, 9), Decl(privacyGetter.ts, 126, 9))
+>p3_private : Symbol(m2_C4_private.p3_private, Decl(privacyGetter.ts, 122, 9), Decl(privacyGetter.ts, 126, 9))
 
             return new m2_C2_private();
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyGetter.ts, 74, 5))
         }
 
         private set p3_private(m2_c3_p3_arg: m2_C2_private) {
->p3_private : Symbol(p3_private, Decl(privacyGetter.ts, 122, 9), Decl(privacyGetter.ts, 126, 9))
+>p3_private : Symbol(m2_C4_private.p3_private, Decl(privacyGetter.ts, 122, 9), Decl(privacyGetter.ts, 126, 9))
 >m2_c3_p3_arg : Symbol(m2_c3_p3_arg, Decl(privacyGetter.ts, 128, 31))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyGetter.ts, 74, 5))
         }
 
         public get p4_public(): m2_C2_private {
->p4_public : Symbol(p4_public, Decl(privacyGetter.ts, 129, 9), Decl(privacyGetter.ts, 133, 9))
+>p4_public : Symbol(m2_C4_private.p4_public, Decl(privacyGetter.ts, 129, 9), Decl(privacyGetter.ts, 133, 9))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyGetter.ts, 74, 5))
 
             return new m2_C2_private();
@@ -252,7 +252,7 @@ module m2 {
         }
 
         public set p4_public(m2_c3_p4_arg: m2_C2_private) {
->p4_public : Symbol(p4_public, Decl(privacyGetter.ts, 129, 9), Decl(privacyGetter.ts, 133, 9))
+>p4_public : Symbol(m2_C4_private.p4_public, Decl(privacyGetter.ts, 129, 9), Decl(privacyGetter.ts, 133, 9))
 >m2_c3_p4_arg : Symbol(m2_c3_p4_arg, Decl(privacyGetter.ts, 135, 29))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyGetter.ts, 74, 5))
         }
@@ -263,7 +263,7 @@ class C5_private {
 >C5_private : Symbol(C5_private, Decl(privacyGetter.ts, 138, 1))
 
     private f() {
->f : Symbol(f, Decl(privacyGetter.ts, 140, 18))
+>f : Symbol(C5_private.f, Decl(privacyGetter.ts, 140, 18))
     }
 }
 
@@ -275,46 +275,46 @@ export class C7_public {
 >C7_public : Symbol(C7_public, Decl(privacyGetter.ts, 146, 1))
 
     private get p1_private() {
->p1_private : Symbol(p1_private, Decl(privacyGetter.ts, 148, 24), Decl(privacyGetter.ts, 151, 5))
+>p1_private : Symbol(C7_public.p1_private, Decl(privacyGetter.ts, 148, 24), Decl(privacyGetter.ts, 151, 5))
 
         return new C6_public();
 >C6_public : Symbol(C6_public, Decl(privacyGetter.ts, 143, 1))
     }
 
     private set p1_private(m1_c3_p1_arg: C6_public) {
->p1_private : Symbol(p1_private, Decl(privacyGetter.ts, 148, 24), Decl(privacyGetter.ts, 151, 5))
+>p1_private : Symbol(C7_public.p1_private, Decl(privacyGetter.ts, 148, 24), Decl(privacyGetter.ts, 151, 5))
 >m1_c3_p1_arg : Symbol(m1_c3_p1_arg, Decl(privacyGetter.ts, 153, 27))
 >C6_public : Symbol(C6_public, Decl(privacyGetter.ts, 143, 1))
     }
 
     private get p2_private() {
->p2_private : Symbol(p2_private, Decl(privacyGetter.ts, 154, 5), Decl(privacyGetter.ts, 158, 5))
+>p2_private : Symbol(C7_public.p2_private, Decl(privacyGetter.ts, 154, 5), Decl(privacyGetter.ts, 158, 5))
 
         return new C6_public();
 >C6_public : Symbol(C6_public, Decl(privacyGetter.ts, 143, 1))
     }
 
     private set p2_private(m1_c3_p2_arg: C6_public) {
->p2_private : Symbol(p2_private, Decl(privacyGetter.ts, 154, 5), Decl(privacyGetter.ts, 158, 5))
+>p2_private : Symbol(C7_public.p2_private, Decl(privacyGetter.ts, 154, 5), Decl(privacyGetter.ts, 158, 5))
 >m1_c3_p2_arg : Symbol(m1_c3_p2_arg, Decl(privacyGetter.ts, 160, 27))
 >C6_public : Symbol(C6_public, Decl(privacyGetter.ts, 143, 1))
     }
 
     private get p3_private() {
->p3_private : Symbol(p3_private, Decl(privacyGetter.ts, 161, 5), Decl(privacyGetter.ts, 165, 5))
+>p3_private : Symbol(C7_public.p3_private, Decl(privacyGetter.ts, 161, 5), Decl(privacyGetter.ts, 165, 5))
 
         return new C5_private();
 >C5_private : Symbol(C5_private, Decl(privacyGetter.ts, 138, 1))
     }
 
     private set p3_private(m1_c3_p3_arg: C5_private) {
->p3_private : Symbol(p3_private, Decl(privacyGetter.ts, 161, 5), Decl(privacyGetter.ts, 165, 5))
+>p3_private : Symbol(C7_public.p3_private, Decl(privacyGetter.ts, 161, 5), Decl(privacyGetter.ts, 165, 5))
 >m1_c3_p3_arg : Symbol(m1_c3_p3_arg, Decl(privacyGetter.ts, 167, 27))
 >C5_private : Symbol(C5_private, Decl(privacyGetter.ts, 138, 1))
     }
 
     public get p4_public(): C5_private { // error
->p4_public : Symbol(p4_public, Decl(privacyGetter.ts, 168, 5), Decl(privacyGetter.ts, 172, 5))
+>p4_public : Symbol(C7_public.p4_public, Decl(privacyGetter.ts, 168, 5), Decl(privacyGetter.ts, 172, 5))
 >C5_private : Symbol(C5_private, Decl(privacyGetter.ts, 138, 1))
 
         return new C5_private(); //error
@@ -322,7 +322,7 @@ export class C7_public {
     }
 
     public set p4_public(m1_c3_p4_arg: C5_private) { // error
->p4_public : Symbol(p4_public, Decl(privacyGetter.ts, 168, 5), Decl(privacyGetter.ts, 172, 5))
+>p4_public : Symbol(C7_public.p4_public, Decl(privacyGetter.ts, 168, 5), Decl(privacyGetter.ts, 172, 5))
 >m1_c3_p4_arg : Symbol(m1_c3_p4_arg, Decl(privacyGetter.ts, 174, 25))
 >C5_private : Symbol(C5_private, Decl(privacyGetter.ts, 138, 1))
     }
@@ -332,46 +332,46 @@ class C8_private {
 >C8_private : Symbol(C8_private, Decl(privacyGetter.ts, 176, 1))
 
     private get p1_private() {
->p1_private : Symbol(p1_private, Decl(privacyGetter.ts, 178, 18), Decl(privacyGetter.ts, 181, 5))
+>p1_private : Symbol(C8_private.p1_private, Decl(privacyGetter.ts, 178, 18), Decl(privacyGetter.ts, 181, 5))
 
         return new C6_public();
 >C6_public : Symbol(C6_public, Decl(privacyGetter.ts, 143, 1))
     }
 
     private set p1_private(m1_c3_p1_arg: C6_public) {
->p1_private : Symbol(p1_private, Decl(privacyGetter.ts, 178, 18), Decl(privacyGetter.ts, 181, 5))
+>p1_private : Symbol(C8_private.p1_private, Decl(privacyGetter.ts, 178, 18), Decl(privacyGetter.ts, 181, 5))
 >m1_c3_p1_arg : Symbol(m1_c3_p1_arg, Decl(privacyGetter.ts, 183, 27))
 >C6_public : Symbol(C6_public, Decl(privacyGetter.ts, 143, 1))
     }
 
     private get p2_private() {
->p2_private : Symbol(p2_private, Decl(privacyGetter.ts, 184, 5), Decl(privacyGetter.ts, 188, 5))
+>p2_private : Symbol(C8_private.p2_private, Decl(privacyGetter.ts, 184, 5), Decl(privacyGetter.ts, 188, 5))
 
         return new C6_public();
 >C6_public : Symbol(C6_public, Decl(privacyGetter.ts, 143, 1))
     }
 
     private set p2_private(m1_c3_p2_arg: C6_public) {
->p2_private : Symbol(p2_private, Decl(privacyGetter.ts, 184, 5), Decl(privacyGetter.ts, 188, 5))
+>p2_private : Symbol(C8_private.p2_private, Decl(privacyGetter.ts, 184, 5), Decl(privacyGetter.ts, 188, 5))
 >m1_c3_p2_arg : Symbol(m1_c3_p2_arg, Decl(privacyGetter.ts, 190, 27))
 >C6_public : Symbol(C6_public, Decl(privacyGetter.ts, 143, 1))
     }
 
     private get p3_private() {
->p3_private : Symbol(p3_private, Decl(privacyGetter.ts, 191, 5), Decl(privacyGetter.ts, 195, 5))
+>p3_private : Symbol(C8_private.p3_private, Decl(privacyGetter.ts, 191, 5), Decl(privacyGetter.ts, 195, 5))
 
         return new C5_private();
 >C5_private : Symbol(C5_private, Decl(privacyGetter.ts, 138, 1))
     }
 
     private set p3_private(m1_c3_p3_arg: C5_private) {
->p3_private : Symbol(p3_private, Decl(privacyGetter.ts, 191, 5), Decl(privacyGetter.ts, 195, 5))
+>p3_private : Symbol(C8_private.p3_private, Decl(privacyGetter.ts, 191, 5), Decl(privacyGetter.ts, 195, 5))
 >m1_c3_p3_arg : Symbol(m1_c3_p3_arg, Decl(privacyGetter.ts, 197, 27))
 >C5_private : Symbol(C5_private, Decl(privacyGetter.ts, 138, 1))
     }
 
     public get p4_public(): C5_private {
->p4_public : Symbol(p4_public, Decl(privacyGetter.ts, 198, 5), Decl(privacyGetter.ts, 202, 5))
+>p4_public : Symbol(C8_private.p4_public, Decl(privacyGetter.ts, 198, 5), Decl(privacyGetter.ts, 202, 5))
 >C5_private : Symbol(C5_private, Decl(privacyGetter.ts, 138, 1))
 
         return new C5_private();
@@ -379,7 +379,7 @@ class C8_private {
     }
 
     public set p4_public(m1_c3_p4_arg: C5_private) {
->p4_public : Symbol(p4_public, Decl(privacyGetter.ts, 198, 5), Decl(privacyGetter.ts, 202, 5))
+>p4_public : Symbol(C8_private.p4_public, Decl(privacyGetter.ts, 198, 5), Decl(privacyGetter.ts, 202, 5))
 >m1_c3_p4_arg : Symbol(m1_c3_p4_arg, Decl(privacyGetter.ts, 204, 25))
 >C5_private : Symbol(C5_private, Decl(privacyGetter.ts, 138, 1))
     }
diff --git a/tests/baselines/reference/privacyGloClass.symbols b/tests/baselines/reference/privacyGloClass.symbols
index 76b160f81e9..af548294fed 100644
--- a/tests/baselines/reference/privacyGloClass.symbols
+++ b/tests/baselines/reference/privacyGloClass.symbols
@@ -14,7 +14,7 @@ module m1 {
 >m1_c_public : Symbol(m1_c_public, Decl(privacyGloClass.ts, 5, 5))
 
         private f1() {
->f1 : Symbol(f1, Decl(privacyGloClass.ts, 7, 30))
+>f1 : Symbol(m1_c_public.f1, Decl(privacyGloClass.ts, 7, 30))
         }
     }
 
@@ -90,7 +90,7 @@ class glo_c_public {
 >glo_c_public : Symbol(glo_c_public, Decl(privacyGloClass.ts, 44, 1))
 
     private f1() {
->f1 : Symbol(f1, Decl(privacyGloClass.ts, 46, 20))
+>f1 : Symbol(glo_c_public.f1, Decl(privacyGloClass.ts, 46, 20))
     }
 }
 
diff --git a/tests/baselines/reference/privacyGloFunc.symbols b/tests/baselines/reference/privacyGloFunc.symbols
index dd76e2e627f..f3d753aacba 100644
--- a/tests/baselines/reference/privacyGloFunc.symbols
+++ b/tests/baselines/reference/privacyGloFunc.symbols
@@ -6,7 +6,7 @@ export module m1 {
 >C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18))
 
         private f1() {
->f1 : Symbol(f1, Decl(privacyGloFunc.ts, 1, 28))
+>f1 : Symbol(C1_public.f1, Decl(privacyGloFunc.ts, 1, 28))
         }
     }
 
@@ -30,59 +30,59 @@ export module m1 {
         }
 
         private f1_private(m1_c3_f1_arg: C1_public) {
->f1_private : Symbol(f1_private, Decl(privacyGloFunc.ts, 13, 9))
+>f1_private : Symbol(C3_public.f1_private, Decl(privacyGloFunc.ts, 13, 9))
 >m1_c3_f1_arg : Symbol(m1_c3_f1_arg, Decl(privacyGloFunc.ts, 15, 27))
 >C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18))
         }
 
         public f2_public(m1_c3_f2_arg: C1_public) {
->f2_public : Symbol(f2_public, Decl(privacyGloFunc.ts, 16, 9))
+>f2_public : Symbol(C3_public.f2_public, Decl(privacyGloFunc.ts, 16, 9))
 >m1_c3_f2_arg : Symbol(m1_c3_f2_arg, Decl(privacyGloFunc.ts, 18, 25))
 >C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18))
         }
 
         private f3_private(m1_c3_f3_arg: C2_private) {
->f3_private : Symbol(f3_private, Decl(privacyGloFunc.ts, 19, 9))
+>f3_private : Symbol(C3_public.f3_private, Decl(privacyGloFunc.ts, 19, 9))
 >m1_c3_f3_arg : Symbol(m1_c3_f3_arg, Decl(privacyGloFunc.ts, 21, 27))
 >C2_private : Symbol(C2_private, Decl(privacyGloFunc.ts, 4, 5))
         }
 
         public f4_public(m1_c3_f4_arg: C2_private) { // error
->f4_public : Symbol(f4_public, Decl(privacyGloFunc.ts, 22, 9))
+>f4_public : Symbol(C3_public.f4_public, Decl(privacyGloFunc.ts, 22, 9))
 >m1_c3_f4_arg : Symbol(m1_c3_f4_arg, Decl(privacyGloFunc.ts, 24, 25))
 >C2_private : Symbol(C2_private, Decl(privacyGloFunc.ts, 4, 5))
         }
 
         private f5_private() {
->f5_private : Symbol(f5_private, Decl(privacyGloFunc.ts, 25, 9))
+>f5_private : Symbol(C3_public.f5_private, Decl(privacyGloFunc.ts, 25, 9))
 
             return new C1_public();
 >C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18))
         }
 
         public f6_public() {
->f6_public : Symbol(f6_public, Decl(privacyGloFunc.ts, 29, 9))
+>f6_public : Symbol(C3_public.f6_public, Decl(privacyGloFunc.ts, 29, 9))
 
             return new C1_public();
 >C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18))
         }
 
         private f7_private() {
->f7_private : Symbol(f7_private, Decl(privacyGloFunc.ts, 33, 9))
+>f7_private : Symbol(C3_public.f7_private, Decl(privacyGloFunc.ts, 33, 9))
 
             return new C2_private();
 >C2_private : Symbol(C2_private, Decl(privacyGloFunc.ts, 4, 5))
         }
 
         public f8_public() {
->f8_public : Symbol(f8_public, Decl(privacyGloFunc.ts, 37, 9))
+>f8_public : Symbol(C3_public.f8_public, Decl(privacyGloFunc.ts, 37, 9))
 
             return new C2_private();  // error
 >C2_private : Symbol(C2_private, Decl(privacyGloFunc.ts, 4, 5))
         }
 
         private f9_private(): C1_public {
->f9_private : Symbol(f9_private, Decl(privacyGloFunc.ts, 41, 9))
+>f9_private : Symbol(C3_public.f9_private, Decl(privacyGloFunc.ts, 41, 9))
 >C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18))
 
             return new C1_public();
@@ -90,7 +90,7 @@ export module m1 {
         }
 
         public f10_public(): C1_public {
->f10_public : Symbol(f10_public, Decl(privacyGloFunc.ts, 45, 9))
+>f10_public : Symbol(C3_public.f10_public, Decl(privacyGloFunc.ts, 45, 9))
 >C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18))
 
             return new C1_public();
@@ -98,7 +98,7 @@ export module m1 {
         }
 
         private f11_private(): C2_private {
->f11_private : Symbol(f11_private, Decl(privacyGloFunc.ts, 49, 9))
+>f11_private : Symbol(C3_public.f11_private, Decl(privacyGloFunc.ts, 49, 9))
 >C2_private : Symbol(C2_private, Decl(privacyGloFunc.ts, 4, 5))
 
             return new C2_private();
@@ -106,7 +106,7 @@ export module m1 {
         }
 
         public f12_public(): C2_private { // error
->f12_public : Symbol(f12_public, Decl(privacyGloFunc.ts, 53, 9))
+>f12_public : Symbol(C3_public.f12_public, Decl(privacyGloFunc.ts, 53, 9))
 >C2_private : Symbol(C2_private, Decl(privacyGloFunc.ts, 4, 5))
 
             return new C2_private(); //error
@@ -129,53 +129,53 @@ export module m1 {
 >m1_c4_c1_2 : Symbol(m1_c4_c1_2, Decl(privacyGloFunc.ts, 63, 21))
         }
         private f1_private(m1_c4_f1_arg: C1_public) {
->f1_private : Symbol(f1_private, Decl(privacyGloFunc.ts, 64, 9))
+>f1_private : Symbol(C4_private.f1_private, Decl(privacyGloFunc.ts, 64, 9))
 >m1_c4_f1_arg : Symbol(m1_c4_f1_arg, Decl(privacyGloFunc.ts, 65, 27))
 >C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18))
         }
 
         public f2_public(m1_c4_f2_arg: C1_public) {
->f2_public : Symbol(f2_public, Decl(privacyGloFunc.ts, 66, 9))
+>f2_public : Symbol(C4_private.f2_public, Decl(privacyGloFunc.ts, 66, 9))
 >m1_c4_f2_arg : Symbol(m1_c4_f2_arg, Decl(privacyGloFunc.ts, 68, 25))
 >C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18))
         }
 
         private f3_private(m1_c4_f3_arg: C2_private) {
->f3_private : Symbol(f3_private, Decl(privacyGloFunc.ts, 69, 9))
+>f3_private : Symbol(C4_private.f3_private, Decl(privacyGloFunc.ts, 69, 9))
 >m1_c4_f3_arg : Symbol(m1_c4_f3_arg, Decl(privacyGloFunc.ts, 71, 27))
 >C2_private : Symbol(C2_private, Decl(privacyGloFunc.ts, 4, 5))
         }
 
         public f4_public(m1_c4_f4_arg: C2_private) {
->f4_public : Symbol(f4_public, Decl(privacyGloFunc.ts, 72, 9))
+>f4_public : Symbol(C4_private.f4_public, Decl(privacyGloFunc.ts, 72, 9))
 >m1_c4_f4_arg : Symbol(m1_c4_f4_arg, Decl(privacyGloFunc.ts, 74, 25))
 >C2_private : Symbol(C2_private, Decl(privacyGloFunc.ts, 4, 5))
         }
 
 
         private f5_private() {
->f5_private : Symbol(f5_private, Decl(privacyGloFunc.ts, 75, 9))
+>f5_private : Symbol(C4_private.f5_private, Decl(privacyGloFunc.ts, 75, 9))
 
             return new C1_public();
 >C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18))
         }
 
         public f6_public() {
->f6_public : Symbol(f6_public, Decl(privacyGloFunc.ts, 80, 9))
+>f6_public : Symbol(C4_private.f6_public, Decl(privacyGloFunc.ts, 80, 9))
 
             return new C1_public();
 >C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18))
         }
 
         private f7_private() {
->f7_private : Symbol(f7_private, Decl(privacyGloFunc.ts, 84, 9))
+>f7_private : Symbol(C4_private.f7_private, Decl(privacyGloFunc.ts, 84, 9))
 
             return new C2_private();
 >C2_private : Symbol(C2_private, Decl(privacyGloFunc.ts, 4, 5))
         }
 
         public f8_public() {
->f8_public : Symbol(f8_public, Decl(privacyGloFunc.ts, 88, 9))
+>f8_public : Symbol(C4_private.f8_public, Decl(privacyGloFunc.ts, 88, 9))
 
             return new C2_private();
 >C2_private : Symbol(C2_private, Decl(privacyGloFunc.ts, 4, 5))
@@ -183,7 +183,7 @@ export module m1 {
 
 
         private f9_private(): C1_public {
->f9_private : Symbol(f9_private, Decl(privacyGloFunc.ts, 92, 9))
+>f9_private : Symbol(C4_private.f9_private, Decl(privacyGloFunc.ts, 92, 9))
 >C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18))
 
             return new C1_public();
@@ -191,7 +191,7 @@ export module m1 {
         }
 
         public f10_public(): C1_public {
->f10_public : Symbol(f10_public, Decl(privacyGloFunc.ts, 97, 9))
+>f10_public : Symbol(C4_private.f10_public, Decl(privacyGloFunc.ts, 97, 9))
 >C1_public : Symbol(C1_public, Decl(privacyGloFunc.ts, 0, 18))
 
             return new C1_public();
@@ -199,7 +199,7 @@ export module m1 {
         }
 
         private f11_private(): C2_private {
->f11_private : Symbol(f11_private, Decl(privacyGloFunc.ts, 101, 9))
+>f11_private : Symbol(C4_private.f11_private, Decl(privacyGloFunc.ts, 101, 9))
 >C2_private : Symbol(C2_private, Decl(privacyGloFunc.ts, 4, 5))
 
             return new C2_private();
@@ -207,7 +207,7 @@ export module m1 {
         }
 
         public f12_public(): C2_private {
->f12_public : Symbol(f12_public, Decl(privacyGloFunc.ts, 105, 9))
+>f12_public : Symbol(C4_private.f12_public, Decl(privacyGloFunc.ts, 105, 9))
 >C2_private : Symbol(C2_private, Decl(privacyGloFunc.ts, 4, 5))
 
             return new C2_private();
@@ -344,7 +344,7 @@ module m2 {
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11))
 
         private f() {
->f : Symbol(f, Decl(privacyGloFunc.ts, 179, 31))
+>f : Symbol(m2_C1_public.f, Decl(privacyGloFunc.ts, 179, 31))
         }
     }
 
@@ -368,59 +368,59 @@ module m2 {
         }
 
         private f1_private(m2_c3_f1_arg: m2_C1_public) {
->f1_private : Symbol(f1_private, Decl(privacyGloFunc.ts, 191, 9))
+>f1_private : Symbol(m2_C3_public.f1_private, Decl(privacyGloFunc.ts, 191, 9))
 >m2_c3_f1_arg : Symbol(m2_c3_f1_arg, Decl(privacyGloFunc.ts, 193, 27))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11))
         }
 
         public f2_public(m2_c3_f2_arg: m2_C1_public) {
->f2_public : Symbol(f2_public, Decl(privacyGloFunc.ts, 194, 9))
+>f2_public : Symbol(m2_C3_public.f2_public, Decl(privacyGloFunc.ts, 194, 9))
 >m2_c3_f2_arg : Symbol(m2_c3_f2_arg, Decl(privacyGloFunc.ts, 196, 25))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11))
         }
 
         private f3_private(m2_c3_f3_arg: m2_C2_private) {
->f3_private : Symbol(f3_private, Decl(privacyGloFunc.ts, 197, 9))
+>f3_private : Symbol(m2_C3_public.f3_private, Decl(privacyGloFunc.ts, 197, 9))
 >m2_c3_f3_arg : Symbol(m2_c3_f3_arg, Decl(privacyGloFunc.ts, 199, 27))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyGloFunc.ts, 182, 5))
         }
 
         public f4_public(m2_c3_f4_arg: m2_C2_private) {
->f4_public : Symbol(f4_public, Decl(privacyGloFunc.ts, 200, 9))
+>f4_public : Symbol(m2_C3_public.f4_public, Decl(privacyGloFunc.ts, 200, 9))
 >m2_c3_f4_arg : Symbol(m2_c3_f4_arg, Decl(privacyGloFunc.ts, 202, 25))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyGloFunc.ts, 182, 5))
         }
 
         private f5_private() {
->f5_private : Symbol(f5_private, Decl(privacyGloFunc.ts, 203, 9))
+>f5_private : Symbol(m2_C3_public.f5_private, Decl(privacyGloFunc.ts, 203, 9))
 
             return new m2_C1_public();
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11))
         }
 
         public f6_public() {
->f6_public : Symbol(f6_public, Decl(privacyGloFunc.ts, 207, 9))
+>f6_public : Symbol(m2_C3_public.f6_public, Decl(privacyGloFunc.ts, 207, 9))
 
             return new m2_C1_public();
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11))
         }
 
         private f7_private() {
->f7_private : Symbol(f7_private, Decl(privacyGloFunc.ts, 211, 9))
+>f7_private : Symbol(m2_C3_public.f7_private, Decl(privacyGloFunc.ts, 211, 9))
 
             return new m2_C2_private();
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyGloFunc.ts, 182, 5))
         }
 
         public f8_public() {
->f8_public : Symbol(f8_public, Decl(privacyGloFunc.ts, 215, 9))
+>f8_public : Symbol(m2_C3_public.f8_public, Decl(privacyGloFunc.ts, 215, 9))
 
             return new m2_C2_private();
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyGloFunc.ts, 182, 5))
         }
 
         private f9_private(): m2_C1_public {
->f9_private : Symbol(f9_private, Decl(privacyGloFunc.ts, 219, 9))
+>f9_private : Symbol(m2_C3_public.f9_private, Decl(privacyGloFunc.ts, 219, 9))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11))
 
             return new m2_C1_public();
@@ -428,7 +428,7 @@ module m2 {
         }
 
         public f10_public(): m2_C1_public {
->f10_public : Symbol(f10_public, Decl(privacyGloFunc.ts, 223, 9))
+>f10_public : Symbol(m2_C3_public.f10_public, Decl(privacyGloFunc.ts, 223, 9))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11))
 
             return new m2_C1_public();
@@ -436,7 +436,7 @@ module m2 {
         }
 
         private f11_private(): m2_C2_private {
->f11_private : Symbol(f11_private, Decl(privacyGloFunc.ts, 227, 9))
+>f11_private : Symbol(m2_C3_public.f11_private, Decl(privacyGloFunc.ts, 227, 9))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyGloFunc.ts, 182, 5))
 
             return new m2_C2_private();
@@ -444,7 +444,7 @@ module m2 {
         }
 
         public f12_public(): m2_C2_private {
->f12_public : Symbol(f12_public, Decl(privacyGloFunc.ts, 231, 9))
+>f12_public : Symbol(m2_C3_public.f12_public, Decl(privacyGloFunc.ts, 231, 9))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyGloFunc.ts, 182, 5))
 
             return new m2_C2_private();
@@ -468,53 +468,53 @@ module m2 {
         }
 
         private f1_private(m2_c4_f1_arg: m2_C1_public) {
->f1_private : Symbol(f1_private, Decl(privacyGloFunc.ts, 242, 9))
+>f1_private : Symbol(m2_C4_private.f1_private, Decl(privacyGloFunc.ts, 242, 9))
 >m2_c4_f1_arg : Symbol(m2_c4_f1_arg, Decl(privacyGloFunc.ts, 244, 27))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11))
         }
 
         public f2_public(m2_c4_f2_arg: m2_C1_public) {
->f2_public : Symbol(f2_public, Decl(privacyGloFunc.ts, 245, 9))
+>f2_public : Symbol(m2_C4_private.f2_public, Decl(privacyGloFunc.ts, 245, 9))
 >m2_c4_f2_arg : Symbol(m2_c4_f2_arg, Decl(privacyGloFunc.ts, 247, 25))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11))
         }
 
         private f3_private(m2_c4_f3_arg: m2_C2_private) {
->f3_private : Symbol(f3_private, Decl(privacyGloFunc.ts, 248, 9))
+>f3_private : Symbol(m2_C4_private.f3_private, Decl(privacyGloFunc.ts, 248, 9))
 >m2_c4_f3_arg : Symbol(m2_c4_f3_arg, Decl(privacyGloFunc.ts, 250, 27))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyGloFunc.ts, 182, 5))
         }
 
         public f4_public(m2_c4_f4_arg: m2_C2_private) {
->f4_public : Symbol(f4_public, Decl(privacyGloFunc.ts, 251, 9))
+>f4_public : Symbol(m2_C4_private.f4_public, Decl(privacyGloFunc.ts, 251, 9))
 >m2_c4_f4_arg : Symbol(m2_c4_f4_arg, Decl(privacyGloFunc.ts, 253, 25))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyGloFunc.ts, 182, 5))
         }
 
 
         private f5_private() {
->f5_private : Symbol(f5_private, Decl(privacyGloFunc.ts, 254, 9))
+>f5_private : Symbol(m2_C4_private.f5_private, Decl(privacyGloFunc.ts, 254, 9))
 
             return new m2_C1_public();
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11))
         }
 
         public f6_public() {
->f6_public : Symbol(f6_public, Decl(privacyGloFunc.ts, 259, 9))
+>f6_public : Symbol(m2_C4_private.f6_public, Decl(privacyGloFunc.ts, 259, 9))
 
             return new m2_C1_public();
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11))
         }
 
         private f7_private() {
->f7_private : Symbol(f7_private, Decl(privacyGloFunc.ts, 263, 9))
+>f7_private : Symbol(m2_C4_private.f7_private, Decl(privacyGloFunc.ts, 263, 9))
 
             return new m2_C2_private();
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyGloFunc.ts, 182, 5))
         }
 
         public f8_public() {
->f8_public : Symbol(f8_public, Decl(privacyGloFunc.ts, 267, 9))
+>f8_public : Symbol(m2_C4_private.f8_public, Decl(privacyGloFunc.ts, 267, 9))
 
             return new m2_C2_private();
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyGloFunc.ts, 182, 5))
@@ -522,7 +522,7 @@ module m2 {
 
 
         private f9_private(): m2_C1_public {
->f9_private : Symbol(f9_private, Decl(privacyGloFunc.ts, 271, 9))
+>f9_private : Symbol(m2_C4_private.f9_private, Decl(privacyGloFunc.ts, 271, 9))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11))
 
             return new m2_C1_public();
@@ -530,7 +530,7 @@ module m2 {
         }
 
         public f10_public(): m2_C1_public {
->f10_public : Symbol(f10_public, Decl(privacyGloFunc.ts, 276, 9))
+>f10_public : Symbol(m2_C4_private.f10_public, Decl(privacyGloFunc.ts, 276, 9))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyGloFunc.ts, 178, 11))
 
             return new m2_C1_public();
@@ -538,7 +538,7 @@ module m2 {
         }
 
         private f11_private(): m2_C2_private {
->f11_private : Symbol(f11_private, Decl(privacyGloFunc.ts, 280, 9))
+>f11_private : Symbol(m2_C4_private.f11_private, Decl(privacyGloFunc.ts, 280, 9))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyGloFunc.ts, 182, 5))
 
             return new m2_C2_private();
@@ -546,7 +546,7 @@ module m2 {
         }
 
         public f12_public(): m2_C2_private {
->f12_public : Symbol(f12_public, Decl(privacyGloFunc.ts, 284, 9))
+>f12_public : Symbol(m2_C4_private.f12_public, Decl(privacyGloFunc.ts, 284, 9))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyGloFunc.ts, 182, 5))
 
             return new m2_C2_private();
@@ -680,7 +680,7 @@ class C5_private {
 >C5_private : Symbol(C5_private, Decl(privacyGloFunc.ts, 355, 1))
 
     private f() {
->f : Symbol(f, Decl(privacyGloFunc.ts, 357, 18))
+>f : Symbol(C5_private.f, Decl(privacyGloFunc.ts, 357, 18))
     }
 }
 
@@ -703,59 +703,59 @@ export class C7_public {
 >c7_c1_2 : Symbol(c7_c1_2, Decl(privacyGloFunc.ts, 368, 17))
     }
     private f1_private(c7_f1_arg: C6_public) {
->f1_private : Symbol(f1_private, Decl(privacyGloFunc.ts, 369, 5))
+>f1_private : Symbol(C7_public.f1_private, Decl(privacyGloFunc.ts, 369, 5))
 >c7_f1_arg : Symbol(c7_f1_arg, Decl(privacyGloFunc.ts, 370, 23))
 >C6_public : Symbol(C6_public, Decl(privacyGloFunc.ts, 360, 1))
     }
 
     public f2_public(c7_f2_arg: C6_public) {
->f2_public : Symbol(f2_public, Decl(privacyGloFunc.ts, 371, 5))
+>f2_public : Symbol(C7_public.f2_public, Decl(privacyGloFunc.ts, 371, 5))
 >c7_f2_arg : Symbol(c7_f2_arg, Decl(privacyGloFunc.ts, 373, 21))
 >C6_public : Symbol(C6_public, Decl(privacyGloFunc.ts, 360, 1))
     }
 
     private f3_private(c7_f3_arg: C5_private) {
->f3_private : Symbol(f3_private, Decl(privacyGloFunc.ts, 374, 5))
+>f3_private : Symbol(C7_public.f3_private, Decl(privacyGloFunc.ts, 374, 5))
 >c7_f3_arg : Symbol(c7_f3_arg, Decl(privacyGloFunc.ts, 376, 23))
 >C5_private : Symbol(C5_private, Decl(privacyGloFunc.ts, 355, 1))
     }
 
     public f4_public(c7_f4_arg: C5_private) { //error
->f4_public : Symbol(f4_public, Decl(privacyGloFunc.ts, 377, 5))
+>f4_public : Symbol(C7_public.f4_public, Decl(privacyGloFunc.ts, 377, 5))
 >c7_f4_arg : Symbol(c7_f4_arg, Decl(privacyGloFunc.ts, 379, 21))
 >C5_private : Symbol(C5_private, Decl(privacyGloFunc.ts, 355, 1))
     }
 
     private f5_private() {
->f5_private : Symbol(f5_private, Decl(privacyGloFunc.ts, 380, 5))
+>f5_private : Symbol(C7_public.f5_private, Decl(privacyGloFunc.ts, 380, 5))
 
         return new C6_public();
 >C6_public : Symbol(C6_public, Decl(privacyGloFunc.ts, 360, 1))
     }
 
     public f6_public() {
->f6_public : Symbol(f6_public, Decl(privacyGloFunc.ts, 384, 5))
+>f6_public : Symbol(C7_public.f6_public, Decl(privacyGloFunc.ts, 384, 5))
 
         return new C6_public();
 >C6_public : Symbol(C6_public, Decl(privacyGloFunc.ts, 360, 1))
     }
 
     private f7_private() {
->f7_private : Symbol(f7_private, Decl(privacyGloFunc.ts, 388, 5))
+>f7_private : Symbol(C7_public.f7_private, Decl(privacyGloFunc.ts, 388, 5))
 
         return new C5_private();
 >C5_private : Symbol(C5_private, Decl(privacyGloFunc.ts, 355, 1))
     }
 
     public f8_public() {
->f8_public : Symbol(f8_public, Decl(privacyGloFunc.ts, 392, 5))
+>f8_public : Symbol(C7_public.f8_public, Decl(privacyGloFunc.ts, 392, 5))
 
         return new C5_private(); //error
 >C5_private : Symbol(C5_private, Decl(privacyGloFunc.ts, 355, 1))
     }
 
     private f9_private(): C6_public {
->f9_private : Symbol(f9_private, Decl(privacyGloFunc.ts, 396, 5))
+>f9_private : Symbol(C7_public.f9_private, Decl(privacyGloFunc.ts, 396, 5))
 >C6_public : Symbol(C6_public, Decl(privacyGloFunc.ts, 360, 1))
 
         return new C6_public();
@@ -763,7 +763,7 @@ export class C7_public {
     }
 
     public f10_public(): C6_public {
->f10_public : Symbol(f10_public, Decl(privacyGloFunc.ts, 400, 5))
+>f10_public : Symbol(C7_public.f10_public, Decl(privacyGloFunc.ts, 400, 5))
 >C6_public : Symbol(C6_public, Decl(privacyGloFunc.ts, 360, 1))
 
         return new C6_public();
@@ -771,7 +771,7 @@ export class C7_public {
     }
 
     private f11_private(): C5_private {
->f11_private : Symbol(f11_private, Decl(privacyGloFunc.ts, 404, 5))
+>f11_private : Symbol(C7_public.f11_private, Decl(privacyGloFunc.ts, 404, 5))
 >C5_private : Symbol(C5_private, Decl(privacyGloFunc.ts, 355, 1))
 
         return new C5_private();
@@ -779,7 +779,7 @@ export class C7_public {
     }
 
     public f12_public(): C5_private { //error
->f12_public : Symbol(f12_public, Decl(privacyGloFunc.ts, 408, 5))
+>f12_public : Symbol(C7_public.f12_public, Decl(privacyGloFunc.ts, 408, 5))
 >C5_private : Symbol(C5_private, Decl(privacyGloFunc.ts, 355, 1))
 
         return new C5_private(); //error
@@ -803,59 +803,59 @@ class C8_private {
     }
         
     private f1_private(c8_f1_arg: C6_public) {
->f1_private : Symbol(f1_private, Decl(privacyGloFunc.ts, 419, 5))
+>f1_private : Symbol(C8_private.f1_private, Decl(privacyGloFunc.ts, 419, 5))
 >c8_f1_arg : Symbol(c8_f1_arg, Decl(privacyGloFunc.ts, 421, 23))
 >C6_public : Symbol(C6_public, Decl(privacyGloFunc.ts, 360, 1))
     }
 
     public f2_public(c8_f2_arg: C6_public) {
->f2_public : Symbol(f2_public, Decl(privacyGloFunc.ts, 422, 5))
+>f2_public : Symbol(C8_private.f2_public, Decl(privacyGloFunc.ts, 422, 5))
 >c8_f2_arg : Symbol(c8_f2_arg, Decl(privacyGloFunc.ts, 424, 21))
 >C6_public : Symbol(C6_public, Decl(privacyGloFunc.ts, 360, 1))
     }
 
     private f3_private(c8_f3_arg: C5_private) {
->f3_private : Symbol(f3_private, Decl(privacyGloFunc.ts, 425, 5))
+>f3_private : Symbol(C8_private.f3_private, Decl(privacyGloFunc.ts, 425, 5))
 >c8_f3_arg : Symbol(c8_f3_arg, Decl(privacyGloFunc.ts, 427, 23))
 >C5_private : Symbol(C5_private, Decl(privacyGloFunc.ts, 355, 1))
     }
 
     public f4_public(c8_f4_arg: C5_private) {
->f4_public : Symbol(f4_public, Decl(privacyGloFunc.ts, 428, 5))
+>f4_public : Symbol(C8_private.f4_public, Decl(privacyGloFunc.ts, 428, 5))
 >c8_f4_arg : Symbol(c8_f4_arg, Decl(privacyGloFunc.ts, 430, 21))
 >C5_private : Symbol(C5_private, Decl(privacyGloFunc.ts, 355, 1))
     }
 
     private f5_private() {
->f5_private : Symbol(f5_private, Decl(privacyGloFunc.ts, 431, 5))
+>f5_private : Symbol(C8_private.f5_private, Decl(privacyGloFunc.ts, 431, 5))
 
         return new C6_public();
 >C6_public : Symbol(C6_public, Decl(privacyGloFunc.ts, 360, 1))
     }
 
     public f6_public() {
->f6_public : Symbol(f6_public, Decl(privacyGloFunc.ts, 435, 5))
+>f6_public : Symbol(C8_private.f6_public, Decl(privacyGloFunc.ts, 435, 5))
 
         return new C6_public();
 >C6_public : Symbol(C6_public, Decl(privacyGloFunc.ts, 360, 1))
     }
 
     private f7_private() {
->f7_private : Symbol(f7_private, Decl(privacyGloFunc.ts, 439, 5))
+>f7_private : Symbol(C8_private.f7_private, Decl(privacyGloFunc.ts, 439, 5))
 
         return new C5_private();
 >C5_private : Symbol(C5_private, Decl(privacyGloFunc.ts, 355, 1))
     }
 
     public f8_public() {
->f8_public : Symbol(f8_public, Decl(privacyGloFunc.ts, 443, 5))
+>f8_public : Symbol(C8_private.f8_public, Decl(privacyGloFunc.ts, 443, 5))
 
         return new C5_private();
 >C5_private : Symbol(C5_private, Decl(privacyGloFunc.ts, 355, 1))
     }
 
     private f9_private(): C6_public {
->f9_private : Symbol(f9_private, Decl(privacyGloFunc.ts, 447, 5))
+>f9_private : Symbol(C8_private.f9_private, Decl(privacyGloFunc.ts, 447, 5))
 >C6_public : Symbol(C6_public, Decl(privacyGloFunc.ts, 360, 1))
 
         return new C6_public();
@@ -863,7 +863,7 @@ class C8_private {
     }
 
     public f10_public(): C6_public {
->f10_public : Symbol(f10_public, Decl(privacyGloFunc.ts, 451, 5))
+>f10_public : Symbol(C8_private.f10_public, Decl(privacyGloFunc.ts, 451, 5))
 >C6_public : Symbol(C6_public, Decl(privacyGloFunc.ts, 360, 1))
 
         return new C6_public();
@@ -871,7 +871,7 @@ class C8_private {
     }
 
     private f11_private(): C5_private {
->f11_private : Symbol(f11_private, Decl(privacyGloFunc.ts, 455, 5))
+>f11_private : Symbol(C8_private.f11_private, Decl(privacyGloFunc.ts, 455, 5))
 >C5_private : Symbol(C5_private, Decl(privacyGloFunc.ts, 355, 1))
 
         return new C5_private();
@@ -879,7 +879,7 @@ class C8_private {
     }
 
     public f12_public(): C5_private {
->f12_public : Symbol(f12_public, Decl(privacyGloFunc.ts, 459, 5))
+>f12_public : Symbol(C8_private.f12_public, Decl(privacyGloFunc.ts, 459, 5))
 >C5_private : Symbol(C5_private, Decl(privacyGloFunc.ts, 355, 1))
 
         return new C5_private();
diff --git a/tests/baselines/reference/privacyGloGetter.symbols b/tests/baselines/reference/privacyGloGetter.symbols
index ac6a2041f3c..5f67eec29a9 100644
--- a/tests/baselines/reference/privacyGloGetter.symbols
+++ b/tests/baselines/reference/privacyGloGetter.symbols
@@ -6,7 +6,7 @@ module m1 {
 >C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 11))
 
         private f1() {
->f1 : Symbol(f1, Decl(privacyGloGetter.ts, 1, 28))
+>f1 : Symbol(C1_public.f1, Decl(privacyGloGetter.ts, 1, 28))
         }
     }
 
@@ -18,46 +18,46 @@ module m1 {
 >C3_public : Symbol(C3_public, Decl(privacyGloGetter.ts, 7, 5))
 
         private get p1_private() {
->p1_private : Symbol(p1_private, Decl(privacyGloGetter.ts, 9, 28), Decl(privacyGloGetter.ts, 12, 9))
+>p1_private : Symbol(C3_public.p1_private, Decl(privacyGloGetter.ts, 9, 28), Decl(privacyGloGetter.ts, 12, 9))
 
             return new C1_public();
 >C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 11))
         }
 
         private set p1_private(m1_c3_p1_arg: C1_public) {
->p1_private : Symbol(p1_private, Decl(privacyGloGetter.ts, 9, 28), Decl(privacyGloGetter.ts, 12, 9))
+>p1_private : Symbol(C3_public.p1_private, Decl(privacyGloGetter.ts, 9, 28), Decl(privacyGloGetter.ts, 12, 9))
 >m1_c3_p1_arg : Symbol(m1_c3_p1_arg, Decl(privacyGloGetter.ts, 14, 31))
 >C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 11))
         }
 
         private get p2_private() {
->p2_private : Symbol(p2_private, Decl(privacyGloGetter.ts, 15, 9), Decl(privacyGloGetter.ts, 19, 9))
+>p2_private : Symbol(C3_public.p2_private, Decl(privacyGloGetter.ts, 15, 9), Decl(privacyGloGetter.ts, 19, 9))
 
             return new C1_public();
 >C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 11))
         }
 
         private set p2_private(m1_c3_p2_arg: C1_public) {
->p2_private : Symbol(p2_private, Decl(privacyGloGetter.ts, 15, 9), Decl(privacyGloGetter.ts, 19, 9))
+>p2_private : Symbol(C3_public.p2_private, Decl(privacyGloGetter.ts, 15, 9), Decl(privacyGloGetter.ts, 19, 9))
 >m1_c3_p2_arg : Symbol(m1_c3_p2_arg, Decl(privacyGloGetter.ts, 21, 31))
 >C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 11))
         }
 
         private get p3_private() {
->p3_private : Symbol(p3_private, Decl(privacyGloGetter.ts, 22, 9), Decl(privacyGloGetter.ts, 26, 9))
+>p3_private : Symbol(C3_public.p3_private, Decl(privacyGloGetter.ts, 22, 9), Decl(privacyGloGetter.ts, 26, 9))
 
             return new C2_private();
 >C2_private : Symbol(C2_private, Decl(privacyGloGetter.ts, 4, 5))
         }
 
         private set p3_private(m1_c3_p3_arg: C2_private) {
->p3_private : Symbol(p3_private, Decl(privacyGloGetter.ts, 22, 9), Decl(privacyGloGetter.ts, 26, 9))
+>p3_private : Symbol(C3_public.p3_private, Decl(privacyGloGetter.ts, 22, 9), Decl(privacyGloGetter.ts, 26, 9))
 >m1_c3_p3_arg : Symbol(m1_c3_p3_arg, Decl(privacyGloGetter.ts, 28, 31))
 >C2_private : Symbol(C2_private, Decl(privacyGloGetter.ts, 4, 5))
         }
 
         public get p4_public(): C2_private { // error
->p4_public : Symbol(p4_public, Decl(privacyGloGetter.ts, 29, 9), Decl(privacyGloGetter.ts, 33, 9))
+>p4_public : Symbol(C3_public.p4_public, Decl(privacyGloGetter.ts, 29, 9), Decl(privacyGloGetter.ts, 33, 9))
 >C2_private : Symbol(C2_private, Decl(privacyGloGetter.ts, 4, 5))
 
             return new C2_private(); //error
@@ -65,7 +65,7 @@ module m1 {
         }
 
         public set p4_public(m1_c3_p4_arg: C2_private) { // error
->p4_public : Symbol(p4_public, Decl(privacyGloGetter.ts, 29, 9), Decl(privacyGloGetter.ts, 33, 9))
+>p4_public : Symbol(C3_public.p4_public, Decl(privacyGloGetter.ts, 29, 9), Decl(privacyGloGetter.ts, 33, 9))
 >m1_c3_p4_arg : Symbol(m1_c3_p4_arg, Decl(privacyGloGetter.ts, 35, 29))
 >C2_private : Symbol(C2_private, Decl(privacyGloGetter.ts, 4, 5))
         }
@@ -75,46 +75,46 @@ module m1 {
 >C4_private : Symbol(C4_private, Decl(privacyGloGetter.ts, 37, 5))
 
         private get p1_private() {
->p1_private : Symbol(p1_private, Decl(privacyGloGetter.ts, 39, 22), Decl(privacyGloGetter.ts, 42, 9))
+>p1_private : Symbol(C4_private.p1_private, Decl(privacyGloGetter.ts, 39, 22), Decl(privacyGloGetter.ts, 42, 9))
 
             return new C1_public();
 >C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 11))
         }
 
         private set p1_private(m1_c3_p1_arg: C1_public) {
->p1_private : Symbol(p1_private, Decl(privacyGloGetter.ts, 39, 22), Decl(privacyGloGetter.ts, 42, 9))
+>p1_private : Symbol(C4_private.p1_private, Decl(privacyGloGetter.ts, 39, 22), Decl(privacyGloGetter.ts, 42, 9))
 >m1_c3_p1_arg : Symbol(m1_c3_p1_arg, Decl(privacyGloGetter.ts, 44, 31))
 >C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 11))
         }
 
         private get p2_private() {
->p2_private : Symbol(p2_private, Decl(privacyGloGetter.ts, 45, 9), Decl(privacyGloGetter.ts, 49, 9))
+>p2_private : Symbol(C4_private.p2_private, Decl(privacyGloGetter.ts, 45, 9), Decl(privacyGloGetter.ts, 49, 9))
 
             return new C1_public();
 >C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 11))
         }
 
         private set p2_private(m1_c3_p2_arg: C1_public) {
->p2_private : Symbol(p2_private, Decl(privacyGloGetter.ts, 45, 9), Decl(privacyGloGetter.ts, 49, 9))
+>p2_private : Symbol(C4_private.p2_private, Decl(privacyGloGetter.ts, 45, 9), Decl(privacyGloGetter.ts, 49, 9))
 >m1_c3_p2_arg : Symbol(m1_c3_p2_arg, Decl(privacyGloGetter.ts, 51, 31))
 >C1_public : Symbol(C1_public, Decl(privacyGloGetter.ts, 0, 11))
         }
 
         private get p3_private() {
->p3_private : Symbol(p3_private, Decl(privacyGloGetter.ts, 52, 9), Decl(privacyGloGetter.ts, 56, 9))
+>p3_private : Symbol(C4_private.p3_private, Decl(privacyGloGetter.ts, 52, 9), Decl(privacyGloGetter.ts, 56, 9))
 
             return new C2_private();
 >C2_private : Symbol(C2_private, Decl(privacyGloGetter.ts, 4, 5))
         }
 
         private set p3_private(m1_c3_p3_arg: C2_private) {
->p3_private : Symbol(p3_private, Decl(privacyGloGetter.ts, 52, 9), Decl(privacyGloGetter.ts, 56, 9))
+>p3_private : Symbol(C4_private.p3_private, Decl(privacyGloGetter.ts, 52, 9), Decl(privacyGloGetter.ts, 56, 9))
 >m1_c3_p3_arg : Symbol(m1_c3_p3_arg, Decl(privacyGloGetter.ts, 58, 31))
 >C2_private : Symbol(C2_private, Decl(privacyGloGetter.ts, 4, 5))
         }
 
         public get p4_public(): C2_private {
->p4_public : Symbol(p4_public, Decl(privacyGloGetter.ts, 59, 9), Decl(privacyGloGetter.ts, 63, 9))
+>p4_public : Symbol(C4_private.p4_public, Decl(privacyGloGetter.ts, 59, 9), Decl(privacyGloGetter.ts, 63, 9))
 >C2_private : Symbol(C2_private, Decl(privacyGloGetter.ts, 4, 5))
 
             return new C2_private();
@@ -122,7 +122,7 @@ module m1 {
         }
 
         public set p4_public(m1_c3_p4_arg: C2_private) {
->p4_public : Symbol(p4_public, Decl(privacyGloGetter.ts, 59, 9), Decl(privacyGloGetter.ts, 63, 9))
+>p4_public : Symbol(C4_private.p4_public, Decl(privacyGloGetter.ts, 59, 9), Decl(privacyGloGetter.ts, 63, 9))
 >m1_c3_p4_arg : Symbol(m1_c3_p4_arg, Decl(privacyGloGetter.ts, 65, 29))
 >C2_private : Symbol(C2_private, Decl(privacyGloGetter.ts, 4, 5))
         }
@@ -137,27 +137,27 @@ class C7_public {
 >C7_public : Symbol(C7_public, Decl(privacyGloGetter.ts, 71, 1))
 
     private get p1_private() {
->p1_private : Symbol(p1_private, Decl(privacyGloGetter.ts, 73, 17), Decl(privacyGloGetter.ts, 76, 5))
+>p1_private : Symbol(C7_public.p1_private, Decl(privacyGloGetter.ts, 73, 17), Decl(privacyGloGetter.ts, 76, 5))
 
         return new C6_public();
 >C6_public : Symbol(C6_public, Decl(privacyGloGetter.ts, 68, 1))
     }
 
     private set p1_private(m1_c3_p1_arg: C6_public) {
->p1_private : Symbol(p1_private, Decl(privacyGloGetter.ts, 73, 17), Decl(privacyGloGetter.ts, 76, 5))
+>p1_private : Symbol(C7_public.p1_private, Decl(privacyGloGetter.ts, 73, 17), Decl(privacyGloGetter.ts, 76, 5))
 >m1_c3_p1_arg : Symbol(m1_c3_p1_arg, Decl(privacyGloGetter.ts, 78, 27))
 >C6_public : Symbol(C6_public, Decl(privacyGloGetter.ts, 68, 1))
     }
 
     private get p2_private() {
->p2_private : Symbol(p2_private, Decl(privacyGloGetter.ts, 79, 5), Decl(privacyGloGetter.ts, 83, 5))
+>p2_private : Symbol(C7_public.p2_private, Decl(privacyGloGetter.ts, 79, 5), Decl(privacyGloGetter.ts, 83, 5))
 
         return new C6_public();
 >C6_public : Symbol(C6_public, Decl(privacyGloGetter.ts, 68, 1))
     }
 
     private set p2_private(m1_c3_p2_arg: C6_public) {
->p2_private : Symbol(p2_private, Decl(privacyGloGetter.ts, 79, 5), Decl(privacyGloGetter.ts, 83, 5))
+>p2_private : Symbol(C7_public.p2_private, Decl(privacyGloGetter.ts, 79, 5), Decl(privacyGloGetter.ts, 83, 5))
 >m1_c3_p2_arg : Symbol(m1_c3_p2_arg, Decl(privacyGloGetter.ts, 85, 27))
 >C6_public : Symbol(C6_public, Decl(privacyGloGetter.ts, 68, 1))
     }
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/privacyGloInterface.symbols b/tests/baselines/reference/privacyGloInterface.symbols
index 561025ee6dc..da8db47856a 100644
--- a/tests/baselines/reference/privacyGloInterface.symbols
+++ b/tests/baselines/reference/privacyGloInterface.symbols
@@ -6,7 +6,7 @@ module m1 {
 >C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11))
 
         private f1() {
->f1 : Symbol(f1, Decl(privacyGloInterface.ts, 1, 28))
+>f1 : Symbol(C1_public.f1, Decl(privacyGloInterface.ts, 1, 28))
         }
     }
 
@@ -57,37 +57,37 @@ module m1 {
 >C2_private : Symbol(C2_private, Decl(privacyGloInterface.ts, 4, 5))
 
         x: C1_public;
->x : Symbol(x, Decl(privacyGloInterface.ts, 22, 32))
+>x : Symbol(C3_public.x, Decl(privacyGloInterface.ts, 22, 32))
 >C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11))
 
         y: C2_private;
->y : Symbol(y, Decl(privacyGloInterface.ts, 24, 21))
+>y : Symbol(C3_public.y, Decl(privacyGloInterface.ts, 24, 21))
 >C2_private : Symbol(C2_private, Decl(privacyGloInterface.ts, 4, 5))
 
         a?: C1_public;
->a : Symbol(a, Decl(privacyGloInterface.ts, 25, 22))
+>a : Symbol(C3_public.a, Decl(privacyGloInterface.ts, 25, 22))
 >C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11))
 
         b?: C2_private;
->b : Symbol(b, Decl(privacyGloInterface.ts, 27, 22))
+>b : Symbol(C3_public.b, Decl(privacyGloInterface.ts, 27, 22))
 >C2_private : Symbol(C2_private, Decl(privacyGloInterface.ts, 4, 5))
 
         f1(a1: C1_public);
->f1 : Symbol(f1, Decl(privacyGloInterface.ts, 28, 23))
+>f1 : Symbol(C3_public.f1, Decl(privacyGloInterface.ts, 28, 23))
 >a1 : Symbol(a1, Decl(privacyGloInterface.ts, 30, 11))
 >C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11))
 
         f2(a1: C2_private);
->f2 : Symbol(f2, Decl(privacyGloInterface.ts, 30, 26))
+>f2 : Symbol(C3_public.f2, Decl(privacyGloInterface.ts, 30, 26))
 >a1 : Symbol(a1, Decl(privacyGloInterface.ts, 31, 11))
 >C2_private : Symbol(C2_private, Decl(privacyGloInterface.ts, 4, 5))
 
         f3(): C1_public;
->f3 : Symbol(f3, Decl(privacyGloInterface.ts, 31, 27))
+>f3 : Symbol(C3_public.f3, Decl(privacyGloInterface.ts, 31, 27))
 >C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11))
 
         f4(): C2_private;
->f4 : Symbol(f4, Decl(privacyGloInterface.ts, 32, 24))
+>f4 : Symbol(C3_public.f4, Decl(privacyGloInterface.ts, 32, 24))
 >C2_private : Symbol(C2_private, Decl(privacyGloInterface.ts, 4, 5))
 
     }
@@ -134,37 +134,37 @@ module m1 {
 >C2_private : Symbol(C2_private, Decl(privacyGloInterface.ts, 4, 5))
 
         x: C1_public;
->x : Symbol(x, Decl(privacyGloInterface.ts, 49, 32))
+>x : Symbol(C4_private.x, Decl(privacyGloInterface.ts, 49, 32))
 >C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11))
 
         y: C2_private;
->y : Symbol(y, Decl(privacyGloInterface.ts, 51, 21))
+>y : Symbol(C4_private.y, Decl(privacyGloInterface.ts, 51, 21))
 >C2_private : Symbol(C2_private, Decl(privacyGloInterface.ts, 4, 5))
 
         a?: C1_public;
->a : Symbol(a, Decl(privacyGloInterface.ts, 52, 22))
+>a : Symbol(C4_private.a, Decl(privacyGloInterface.ts, 52, 22))
 >C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11))
 
         b?: C2_private;
->b : Symbol(b, Decl(privacyGloInterface.ts, 54, 22))
+>b : Symbol(C4_private.b, Decl(privacyGloInterface.ts, 54, 22))
 >C2_private : Symbol(C2_private, Decl(privacyGloInterface.ts, 4, 5))
 
         f1(a1: C1_public);
->f1 : Symbol(f1, Decl(privacyGloInterface.ts, 55, 23))
+>f1 : Symbol(C4_private.f1, Decl(privacyGloInterface.ts, 55, 23))
 >a1 : Symbol(a1, Decl(privacyGloInterface.ts, 57, 11))
 >C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11))
 
         f2(a1: C2_private);
->f2 : Symbol(f2, Decl(privacyGloInterface.ts, 57, 26))
+>f2 : Symbol(C4_private.f2, Decl(privacyGloInterface.ts, 57, 26))
 >a1 : Symbol(a1, Decl(privacyGloInterface.ts, 58, 11))
 >C2_private : Symbol(C2_private, Decl(privacyGloInterface.ts, 4, 5))
 
         f3(): C1_public;
->f3 : Symbol(f3, Decl(privacyGloInterface.ts, 58, 27))
+>f3 : Symbol(C4_private.f3, Decl(privacyGloInterface.ts, 58, 27))
 >C1_public : Symbol(C1_public, Decl(privacyGloInterface.ts, 0, 11))
 
         f4(): C2_private;
->f4 : Symbol(f4, Decl(privacyGloInterface.ts, 59, 24))
+>f4 : Symbol(C4_private.f4, Decl(privacyGloInterface.ts, 59, 24))
 >C2_private : Symbol(C2_private, Decl(privacyGloInterface.ts, 4, 5))
 
     }
@@ -174,7 +174,7 @@ class C5_public {
 >C5_public : Symbol(C5_public, Decl(privacyGloInterface.ts, 63, 1))
 
     private f1() {
->f1 : Symbol(f1, Decl(privacyGloInterface.ts, 65, 17))
+>f1 : Symbol(C5_public.f1, Decl(privacyGloInterface.ts, 65, 17))
     }
 }
 
@@ -201,20 +201,20 @@ interface C7_public {
 >C5_public : Symbol(C5_public, Decl(privacyGloInterface.ts, 63, 1))
 
     x: C5_public;
->x : Symbol(x, Decl(privacyGloInterface.ts, 78, 27))
+>x : Symbol(C7_public.x, Decl(privacyGloInterface.ts, 78, 27))
 >C5_public : Symbol(C5_public, Decl(privacyGloInterface.ts, 63, 1))
 
     a?: C5_public;
->a : Symbol(a, Decl(privacyGloInterface.ts, 80, 17))
+>a : Symbol(C7_public.a, Decl(privacyGloInterface.ts, 80, 17))
 >C5_public : Symbol(C5_public, Decl(privacyGloInterface.ts, 63, 1))
 
     f1(a1: C5_public);
->f1 : Symbol(f1, Decl(privacyGloInterface.ts, 82, 18))
+>f1 : Symbol(C7_public.f1, Decl(privacyGloInterface.ts, 82, 18))
 >a1 : Symbol(a1, Decl(privacyGloInterface.ts, 84, 7))
 >C5_public : Symbol(C5_public, Decl(privacyGloInterface.ts, 63, 1))
 
     f3(): C5_public;
->f3 : Symbol(f3, Decl(privacyGloInterface.ts, 84, 22))
+>f3 : Symbol(C7_public.f3, Decl(privacyGloInterface.ts, 84, 22))
 >C5_public : Symbol(C5_public, Decl(privacyGloInterface.ts, 63, 1))
 }
 
@@ -225,14 +225,14 @@ module m3 {
 >m3_i_public : Symbol(m3_i_public, Decl(privacyGloInterface.ts, 88, 11))
 
         f1(): number;
->f1 : Symbol(f1, Decl(privacyGloInterface.ts, 89, 34))
+>f1 : Symbol(m3_i_public.f1, Decl(privacyGloInterface.ts, 89, 34))
     }
 
     interface m3_i_private {
 >m3_i_private : Symbol(m3_i_private, Decl(privacyGloInterface.ts, 91, 5))
 
         f2(): string;
->f2 : Symbol(f2, Decl(privacyGloInterface.ts, 93, 28))
+>f2 : Symbol(m3_i_private.f2, Decl(privacyGloInterface.ts, 93, 28))
     }
 
     interface m3_C1_private extends m3_i_public {
@@ -268,7 +268,7 @@ interface glo_i_public {
 >glo_i_public : Symbol(glo_i_public, Decl(privacyGloInterface.ts, 110, 1))
 
     f1(): number;
->f1 : Symbol(f1, Decl(privacyGloInterface.ts, 112, 24))
+>f1 : Symbol(glo_i_public.f1, Decl(privacyGloInterface.ts, 112, 24))
 }
 
 interface glo_C3_public extends glo_i_public {
diff --git a/tests/baselines/reference/privacyGloVar.symbols b/tests/baselines/reference/privacyGloVar.symbols
index 5f08438817e..9c8a01fc9a4 100644
--- a/tests/baselines/reference/privacyGloVar.symbols
+++ b/tests/baselines/reference/privacyGloVar.symbols
@@ -6,7 +6,7 @@ module m1 {
 >C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11))
 
         private f1() {
->f1 : Symbol(f1, Decl(privacyGloVar.ts, 1, 28))
+>f1 : Symbol(C1_public.f1, Decl(privacyGloVar.ts, 1, 28))
         }
     }
 
@@ -18,54 +18,54 @@ module m1 {
 >C3_public : Symbol(C3_public, Decl(privacyGloVar.ts, 7, 5))
 
         private C3_v1_private: C1_public;
->C3_v1_private : Symbol(C3_v1_private, Decl(privacyGloVar.ts, 9, 28))
+>C3_v1_private : Symbol(C3_public.C3_v1_private, Decl(privacyGloVar.ts, 9, 28))
 >C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11))
 
         public C3_v2_public: C1_public;
->C3_v2_public : Symbol(C3_v2_public, Decl(privacyGloVar.ts, 10, 41))
+>C3_v2_public : Symbol(C3_public.C3_v2_public, Decl(privacyGloVar.ts, 10, 41))
 >C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11))
 
         private C3_v3_private: C2_private;
->C3_v3_private : Symbol(C3_v3_private, Decl(privacyGloVar.ts, 11, 39))
+>C3_v3_private : Symbol(C3_public.C3_v3_private, Decl(privacyGloVar.ts, 11, 39))
 >C2_private : Symbol(C2_private, Decl(privacyGloVar.ts, 4, 5))
 
         public C3_v4_public: C2_private; // error
->C3_v4_public : Symbol(C3_v4_public, Decl(privacyGloVar.ts, 12, 42))
+>C3_v4_public : Symbol(C3_public.C3_v4_public, Decl(privacyGloVar.ts, 12, 42))
 >C2_private : Symbol(C2_private, Decl(privacyGloVar.ts, 4, 5))
 
         private C3_v11_private = new C1_public();
->C3_v11_private : Symbol(C3_v11_private, Decl(privacyGloVar.ts, 13, 40))
+>C3_v11_private : Symbol(C3_public.C3_v11_private, Decl(privacyGloVar.ts, 13, 40))
 >C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11))
 
         public C3_v12_public = new C1_public();
->C3_v12_public : Symbol(C3_v12_public, Decl(privacyGloVar.ts, 15, 49))
+>C3_v12_public : Symbol(C3_public.C3_v12_public, Decl(privacyGloVar.ts, 15, 49))
 >C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11))
 
         private C3_v13_private = new C2_private();
->C3_v13_private : Symbol(C3_v13_private, Decl(privacyGloVar.ts, 16, 47))
+>C3_v13_private : Symbol(C3_public.C3_v13_private, Decl(privacyGloVar.ts, 16, 47))
 >C2_private : Symbol(C2_private, Decl(privacyGloVar.ts, 4, 5))
 
         public C3_v14_public = new C2_private(); // error
->C3_v14_public : Symbol(C3_v14_public, Decl(privacyGloVar.ts, 17, 50))
+>C3_v14_public : Symbol(C3_public.C3_v14_public, Decl(privacyGloVar.ts, 17, 50))
 >C2_private : Symbol(C2_private, Decl(privacyGloVar.ts, 4, 5))
 
         private C3_v21_private: C1_public = new C1_public();
->C3_v21_private : Symbol(C3_v21_private, Decl(privacyGloVar.ts, 18, 48))
+>C3_v21_private : Symbol(C3_public.C3_v21_private, Decl(privacyGloVar.ts, 18, 48))
 >C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11))
 >C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11))
 
         public C3_v22_public: C1_public = new C1_public();
->C3_v22_public : Symbol(C3_v22_public, Decl(privacyGloVar.ts, 20, 60))
+>C3_v22_public : Symbol(C3_public.C3_v22_public, Decl(privacyGloVar.ts, 20, 60))
 >C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11))
 >C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11))
 
         private C3_v23_private: C2_private = new C2_private();
->C3_v23_private : Symbol(C3_v23_private, Decl(privacyGloVar.ts, 21, 58))
+>C3_v23_private : Symbol(C3_public.C3_v23_private, Decl(privacyGloVar.ts, 21, 58))
 >C2_private : Symbol(C2_private, Decl(privacyGloVar.ts, 4, 5))
 >C2_private : Symbol(C2_private, Decl(privacyGloVar.ts, 4, 5))
 
         public C3_v24_public: C2_private = new C2_private(); // error
->C3_v24_public : Symbol(C3_v24_public, Decl(privacyGloVar.ts, 22, 62))
+>C3_v24_public : Symbol(C3_public.C3_v24_public, Decl(privacyGloVar.ts, 22, 62))
 >C2_private : Symbol(C2_private, Decl(privacyGloVar.ts, 4, 5))
 >C2_private : Symbol(C2_private, Decl(privacyGloVar.ts, 4, 5))
     }
@@ -74,54 +74,54 @@ module m1 {
 >C4_public : Symbol(C4_public, Decl(privacyGloVar.ts, 24, 5))
 
         private C4_v1_private: C1_public;
->C4_v1_private : Symbol(C4_v1_private, Decl(privacyGloVar.ts, 26, 21))
+>C4_v1_private : Symbol(C4_public.C4_v1_private, Decl(privacyGloVar.ts, 26, 21))
 >C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11))
 
         public C4_v2_public: C1_public;
->C4_v2_public : Symbol(C4_v2_public, Decl(privacyGloVar.ts, 27, 41))
+>C4_v2_public : Symbol(C4_public.C4_v2_public, Decl(privacyGloVar.ts, 27, 41))
 >C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11))
 
         private C4_v3_private: C2_private;
->C4_v3_private : Symbol(C4_v3_private, Decl(privacyGloVar.ts, 28, 39))
+>C4_v3_private : Symbol(C4_public.C4_v3_private, Decl(privacyGloVar.ts, 28, 39))
 >C2_private : Symbol(C2_private, Decl(privacyGloVar.ts, 4, 5))
 
         public C4_v4_public: C2_private;
->C4_v4_public : Symbol(C4_v4_public, Decl(privacyGloVar.ts, 29, 42))
+>C4_v4_public : Symbol(C4_public.C4_v4_public, Decl(privacyGloVar.ts, 29, 42))
 >C2_private : Symbol(C2_private, Decl(privacyGloVar.ts, 4, 5))
 
         private C4_v11_private = new C1_public();
->C4_v11_private : Symbol(C4_v11_private, Decl(privacyGloVar.ts, 30, 40))
+>C4_v11_private : Symbol(C4_public.C4_v11_private, Decl(privacyGloVar.ts, 30, 40))
 >C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11))
 
         public C4_v12_public = new C1_public();
->C4_v12_public : Symbol(C4_v12_public, Decl(privacyGloVar.ts, 32, 49))
+>C4_v12_public : Symbol(C4_public.C4_v12_public, Decl(privacyGloVar.ts, 32, 49))
 >C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11))
 
         private C4_v13_private = new C2_private();
->C4_v13_private : Symbol(C4_v13_private, Decl(privacyGloVar.ts, 33, 47))
+>C4_v13_private : Symbol(C4_public.C4_v13_private, Decl(privacyGloVar.ts, 33, 47))
 >C2_private : Symbol(C2_private, Decl(privacyGloVar.ts, 4, 5))
 
         public C4_v14_public = new C2_private();
->C4_v14_public : Symbol(C4_v14_public, Decl(privacyGloVar.ts, 34, 50))
+>C4_v14_public : Symbol(C4_public.C4_v14_public, Decl(privacyGloVar.ts, 34, 50))
 >C2_private : Symbol(C2_private, Decl(privacyGloVar.ts, 4, 5))
 
         private C4_v21_private: C1_public = new C1_public();
->C4_v21_private : Symbol(C4_v21_private, Decl(privacyGloVar.ts, 35, 48))
+>C4_v21_private : Symbol(C4_public.C4_v21_private, Decl(privacyGloVar.ts, 35, 48))
 >C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11))
 >C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11))
 
         public C4_v22_public: C1_public = new C1_public();
->C4_v22_public : Symbol(C4_v22_public, Decl(privacyGloVar.ts, 37, 60))
+>C4_v22_public : Symbol(C4_public.C4_v22_public, Decl(privacyGloVar.ts, 37, 60))
 >C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11))
 >C1_public : Symbol(C1_public, Decl(privacyGloVar.ts, 0, 11))
 
         private C4_v23_private: C2_private = new C2_private();
->C4_v23_private : Symbol(C4_v23_private, Decl(privacyGloVar.ts, 38, 58))
+>C4_v23_private : Symbol(C4_public.C4_v23_private, Decl(privacyGloVar.ts, 38, 58))
 >C2_private : Symbol(C2_private, Decl(privacyGloVar.ts, 4, 5))
 >C2_private : Symbol(C2_private, Decl(privacyGloVar.ts, 4, 5))
 
         public C4_v24_public: C2_private = new C2_private();
->C4_v24_public : Symbol(C4_v24_public, Decl(privacyGloVar.ts, 39, 62))
+>C4_v24_public : Symbol(C4_public.C4_v24_public, Decl(privacyGloVar.ts, 39, 62))
 >C2_private : Symbol(C2_private, Decl(privacyGloVar.ts, 4, 5))
 >C2_private : Symbol(C2_private, Decl(privacyGloVar.ts, 4, 5))
     }
@@ -183,7 +183,7 @@ class glo_C1_public {
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyGloVar.ts, 57, 1))
 
     private f1() {
->f1 : Symbol(f1, Decl(privacyGloVar.ts, 59, 21))
+>f1 : Symbol(glo_C1_public.f1, Decl(privacyGloVar.ts, 59, 21))
     }
 }
 
@@ -191,28 +191,28 @@ class glo_C3_public {
 >glo_C3_public : Symbol(glo_C3_public, Decl(privacyGloVar.ts, 62, 1))
 
     private glo_C3_v1_private: glo_C1_public;
->glo_C3_v1_private : Symbol(glo_C3_v1_private, Decl(privacyGloVar.ts, 64, 21))
+>glo_C3_v1_private : Symbol(glo_C3_public.glo_C3_v1_private, Decl(privacyGloVar.ts, 64, 21))
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyGloVar.ts, 57, 1))
 
     public glo_C3_v2_public: glo_C1_public;
->glo_C3_v2_public : Symbol(glo_C3_v2_public, Decl(privacyGloVar.ts, 65, 45))
+>glo_C3_v2_public : Symbol(glo_C3_public.glo_C3_v2_public, Decl(privacyGloVar.ts, 65, 45))
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyGloVar.ts, 57, 1))
 
     private glo_C3_v11_private = new glo_C1_public();
->glo_C3_v11_private : Symbol(glo_C3_v11_private, Decl(privacyGloVar.ts, 66, 43))
+>glo_C3_v11_private : Symbol(glo_C3_public.glo_C3_v11_private, Decl(privacyGloVar.ts, 66, 43))
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyGloVar.ts, 57, 1))
 
     public glo_C3_v12_public = new glo_C1_public();
->glo_C3_v12_public : Symbol(glo_C3_v12_public, Decl(privacyGloVar.ts, 68, 53))
+>glo_C3_v12_public : Symbol(glo_C3_public.glo_C3_v12_public, Decl(privacyGloVar.ts, 68, 53))
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyGloVar.ts, 57, 1))
 
     private glo_C3_v21_private: glo_C1_public = new glo_C1_public();
->glo_C3_v21_private : Symbol(glo_C3_v21_private, Decl(privacyGloVar.ts, 69, 51))
+>glo_C3_v21_private : Symbol(glo_C3_public.glo_C3_v21_private, Decl(privacyGloVar.ts, 69, 51))
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyGloVar.ts, 57, 1))
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyGloVar.ts, 57, 1))
 
     public glo_C3_v22_public: glo_C1_public = new glo_C1_public();
->glo_C3_v22_public : Symbol(glo_C3_v22_public, Decl(privacyGloVar.ts, 71, 68))
+>glo_C3_v22_public : Symbol(glo_C3_public.glo_C3_v22_public, Decl(privacyGloVar.ts, 71, 68))
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyGloVar.ts, 57, 1))
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyGloVar.ts, 57, 1))
 }
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/privacyInterface.symbols b/tests/baselines/reference/privacyInterface.symbols
index f7556aceae2..d5dbe3c1b62 100644
--- a/tests/baselines/reference/privacyInterface.symbols
+++ b/tests/baselines/reference/privacyInterface.symbols
@@ -6,7 +6,7 @@ export module m1 {
 >C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18))
 
         private f1() {
->f1 : Symbol(f1, Decl(privacyInterface.ts, 1, 28))
+>f1 : Symbol(C1_public.f1, Decl(privacyInterface.ts, 1, 28))
         }
     }
 
@@ -57,37 +57,37 @@ export module m1 {
 >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 4, 5))
 
         x: C1_public;
->x : Symbol(x, Decl(privacyInterface.ts, 22, 32))
+>x : Symbol(C3_public.x, Decl(privacyInterface.ts, 22, 32))
 >C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18))
 
         y: C2_private;
->y : Symbol(y, Decl(privacyInterface.ts, 24, 21))
+>y : Symbol(C3_public.y, Decl(privacyInterface.ts, 24, 21))
 >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 4, 5))
 
         a?: C1_public;
->a : Symbol(a, Decl(privacyInterface.ts, 25, 22))
+>a : Symbol(C3_public.a, Decl(privacyInterface.ts, 25, 22))
 >C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18))
 
         b?: C2_private;
->b : Symbol(b, Decl(privacyInterface.ts, 27, 22))
+>b : Symbol(C3_public.b, Decl(privacyInterface.ts, 27, 22))
 >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 4, 5))
 
         f1(a1: C1_public);
->f1 : Symbol(f1, Decl(privacyInterface.ts, 28, 23))
+>f1 : Symbol(C3_public.f1, Decl(privacyInterface.ts, 28, 23))
 >a1 : Symbol(a1, Decl(privacyInterface.ts, 30, 11))
 >C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18))
 
         f2(a1: C2_private);
->f2 : Symbol(f2, Decl(privacyInterface.ts, 30, 26))
+>f2 : Symbol(C3_public.f2, Decl(privacyInterface.ts, 30, 26))
 >a1 : Symbol(a1, Decl(privacyInterface.ts, 31, 11))
 >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 4, 5))
 
         f3(): C1_public;
->f3 : Symbol(f3, Decl(privacyInterface.ts, 31, 27))
+>f3 : Symbol(C3_public.f3, Decl(privacyInterface.ts, 31, 27))
 >C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18))
 
         f4(): C2_private;
->f4 : Symbol(f4, Decl(privacyInterface.ts, 32, 24))
+>f4 : Symbol(C3_public.f4, Decl(privacyInterface.ts, 32, 24))
 >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 4, 5))
 
     }
@@ -134,37 +134,37 @@ export module m1 {
 >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 4, 5))
 
         x: C1_public;
->x : Symbol(x, Decl(privacyInterface.ts, 49, 32))
+>x : Symbol(C4_private.x, Decl(privacyInterface.ts, 49, 32))
 >C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18))
 
         y: C2_private;
->y : Symbol(y, Decl(privacyInterface.ts, 51, 21))
+>y : Symbol(C4_private.y, Decl(privacyInterface.ts, 51, 21))
 >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 4, 5))
 
         a?: C1_public;
->a : Symbol(a, Decl(privacyInterface.ts, 52, 22))
+>a : Symbol(C4_private.a, Decl(privacyInterface.ts, 52, 22))
 >C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18))
 
         b?: C2_private;
->b : Symbol(b, Decl(privacyInterface.ts, 54, 22))
+>b : Symbol(C4_private.b, Decl(privacyInterface.ts, 54, 22))
 >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 4, 5))
 
         f1(a1: C1_public);
->f1 : Symbol(f1, Decl(privacyInterface.ts, 55, 23))
+>f1 : Symbol(C4_private.f1, Decl(privacyInterface.ts, 55, 23))
 >a1 : Symbol(a1, Decl(privacyInterface.ts, 57, 11))
 >C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18))
 
         f2(a1: C2_private);
->f2 : Symbol(f2, Decl(privacyInterface.ts, 57, 26))
+>f2 : Symbol(C4_private.f2, Decl(privacyInterface.ts, 57, 26))
 >a1 : Symbol(a1, Decl(privacyInterface.ts, 58, 11))
 >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 4, 5))
 
         f3(): C1_public;
->f3 : Symbol(f3, Decl(privacyInterface.ts, 58, 27))
+>f3 : Symbol(C4_private.f3, Decl(privacyInterface.ts, 58, 27))
 >C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 0, 18))
 
         f4(): C2_private;
->f4 : Symbol(f4, Decl(privacyInterface.ts, 59, 24))
+>f4 : Symbol(C4_private.f4, Decl(privacyInterface.ts, 59, 24))
 >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 4, 5))
 
     }
@@ -178,7 +178,7 @@ module m2 {
 >C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11))
 
         private f1() {
->f1 : Symbol(f1, Decl(privacyInterface.ts, 67, 28))
+>f1 : Symbol(C1_public.f1, Decl(privacyInterface.ts, 67, 28))
         }
     }
 
@@ -229,37 +229,37 @@ module m2 {
 >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 70, 5))
 
         x: C1_public;
->x : Symbol(x, Decl(privacyInterface.ts, 88, 32))
+>x : Symbol(C3_public.x, Decl(privacyInterface.ts, 88, 32))
 >C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11))
 
         y: C2_private;
->y : Symbol(y, Decl(privacyInterface.ts, 90, 21))
+>y : Symbol(C3_public.y, Decl(privacyInterface.ts, 90, 21))
 >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 70, 5))
 
         a?: C1_public;
->a : Symbol(a, Decl(privacyInterface.ts, 91, 22))
+>a : Symbol(C3_public.a, Decl(privacyInterface.ts, 91, 22))
 >C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11))
 
         b?: C2_private;
->b : Symbol(b, Decl(privacyInterface.ts, 93, 22))
+>b : Symbol(C3_public.b, Decl(privacyInterface.ts, 93, 22))
 >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 70, 5))
 
         f1(a1: C1_public);
->f1 : Symbol(f1, Decl(privacyInterface.ts, 94, 23))
+>f1 : Symbol(C3_public.f1, Decl(privacyInterface.ts, 94, 23))
 >a1 : Symbol(a1, Decl(privacyInterface.ts, 96, 11))
 >C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11))
 
         f2(a1: C2_private);
->f2 : Symbol(f2, Decl(privacyInterface.ts, 96, 26))
+>f2 : Symbol(C3_public.f2, Decl(privacyInterface.ts, 96, 26))
 >a1 : Symbol(a1, Decl(privacyInterface.ts, 97, 11))
 >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 70, 5))
 
         f3(): C1_public;
->f3 : Symbol(f3, Decl(privacyInterface.ts, 97, 27))
+>f3 : Symbol(C3_public.f3, Decl(privacyInterface.ts, 97, 27))
 >C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11))
 
         f4(): C2_private;
->f4 : Symbol(f4, Decl(privacyInterface.ts, 98, 24))
+>f4 : Symbol(C3_public.f4, Decl(privacyInterface.ts, 98, 24))
 >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 70, 5))
 
     }
@@ -306,37 +306,37 @@ module m2 {
 >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 70, 5))
 
         x: C1_public;
->x : Symbol(x, Decl(privacyInterface.ts, 115, 32))
+>x : Symbol(C4_private.x, Decl(privacyInterface.ts, 115, 32))
 >C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11))
 
         y: C2_private;
->y : Symbol(y, Decl(privacyInterface.ts, 117, 21))
+>y : Symbol(C4_private.y, Decl(privacyInterface.ts, 117, 21))
 >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 70, 5))
 
         a?: C1_public;
->a : Symbol(a, Decl(privacyInterface.ts, 118, 22))
+>a : Symbol(C4_private.a, Decl(privacyInterface.ts, 118, 22))
 >C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11))
 
         b?: C2_private;
->b : Symbol(b, Decl(privacyInterface.ts, 120, 22))
+>b : Symbol(C4_private.b, Decl(privacyInterface.ts, 120, 22))
 >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 70, 5))
 
         f1(a1: C1_public);
->f1 : Symbol(f1, Decl(privacyInterface.ts, 121, 23))
+>f1 : Symbol(C4_private.f1, Decl(privacyInterface.ts, 121, 23))
 >a1 : Symbol(a1, Decl(privacyInterface.ts, 123, 11))
 >C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11))
 
         f2(a1: C2_private);
->f2 : Symbol(f2, Decl(privacyInterface.ts, 123, 26))
+>f2 : Symbol(C4_private.f2, Decl(privacyInterface.ts, 123, 26))
 >a1 : Symbol(a1, Decl(privacyInterface.ts, 124, 11))
 >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 70, 5))
 
         f3(): C1_public;
->f3 : Symbol(f3, Decl(privacyInterface.ts, 124, 27))
+>f3 : Symbol(C4_private.f3, Decl(privacyInterface.ts, 124, 27))
 >C1_public : Symbol(C1_public, Decl(privacyInterface.ts, 66, 11))
 
         f4(): C2_private;
->f4 : Symbol(f4, Decl(privacyInterface.ts, 125, 24))
+>f4 : Symbol(C4_private.f4, Decl(privacyInterface.ts, 125, 24))
 >C2_private : Symbol(C2_private, Decl(privacyInterface.ts, 70, 5))
 
     }
@@ -346,7 +346,7 @@ export class C5_public {
 >C5_public : Symbol(C5_public, Decl(privacyInterface.ts, 129, 1))
 
     private f1() {
->f1 : Symbol(f1, Decl(privacyInterface.ts, 131, 24))
+>f1 : Symbol(C5_public.f1, Decl(privacyInterface.ts, 131, 24))
     }
 }
 
@@ -397,37 +397,37 @@ export interface C7_public {
 >C6_private : Symbol(C6_private, Decl(privacyInterface.ts, 134, 1))
 
     x: C5_public;
->x : Symbol(x, Decl(privacyInterface.ts, 152, 28))
+>x : Symbol(C7_public.x, Decl(privacyInterface.ts, 152, 28))
 >C5_public : Symbol(C5_public, Decl(privacyInterface.ts, 129, 1))
 
     y: C6_private;
->y : Symbol(y, Decl(privacyInterface.ts, 154, 17))
+>y : Symbol(C7_public.y, Decl(privacyInterface.ts, 154, 17))
 >C6_private : Symbol(C6_private, Decl(privacyInterface.ts, 134, 1))
 
     a?: C5_public;
->a : Symbol(a, Decl(privacyInterface.ts, 155, 18))
+>a : Symbol(C7_public.a, Decl(privacyInterface.ts, 155, 18))
 >C5_public : Symbol(C5_public, Decl(privacyInterface.ts, 129, 1))
 
     b?: C6_private;
->b : Symbol(b, Decl(privacyInterface.ts, 157, 18))
+>b : Symbol(C7_public.b, Decl(privacyInterface.ts, 157, 18))
 >C6_private : Symbol(C6_private, Decl(privacyInterface.ts, 134, 1))
 
     f1(a1: C5_public);
->f1 : Symbol(f1, Decl(privacyInterface.ts, 158, 19))
+>f1 : Symbol(C7_public.f1, Decl(privacyInterface.ts, 158, 19))
 >a1 : Symbol(a1, Decl(privacyInterface.ts, 160, 7))
 >C5_public : Symbol(C5_public, Decl(privacyInterface.ts, 129, 1))
 
     f2(a1: C6_private);
->f2 : Symbol(f2, Decl(privacyInterface.ts, 160, 22))
+>f2 : Symbol(C7_public.f2, Decl(privacyInterface.ts, 160, 22))
 >a1 : Symbol(a1, Decl(privacyInterface.ts, 161, 7))
 >C6_private : Symbol(C6_private, Decl(privacyInterface.ts, 134, 1))
 
     f3(): C5_public;
->f3 : Symbol(f3, Decl(privacyInterface.ts, 161, 23))
+>f3 : Symbol(C7_public.f3, Decl(privacyInterface.ts, 161, 23))
 >C5_public : Symbol(C5_public, Decl(privacyInterface.ts, 129, 1))
 
     f4(): C6_private;
->f4 : Symbol(f4, Decl(privacyInterface.ts, 162, 20))
+>f4 : Symbol(C7_public.f4, Decl(privacyInterface.ts, 162, 20))
 >C6_private : Symbol(C6_private, Decl(privacyInterface.ts, 134, 1))
 
 }
@@ -474,37 +474,37 @@ interface C8_private {
 >C6_private : Symbol(C6_private, Decl(privacyInterface.ts, 134, 1))
 
     x: C5_public;
->x : Symbol(x, Decl(privacyInterface.ts, 179, 28))
+>x : Symbol(C8_private.x, Decl(privacyInterface.ts, 179, 28))
 >C5_public : Symbol(C5_public, Decl(privacyInterface.ts, 129, 1))
 
     y: C6_private;
->y : Symbol(y, Decl(privacyInterface.ts, 181, 17))
+>y : Symbol(C8_private.y, Decl(privacyInterface.ts, 181, 17))
 >C6_private : Symbol(C6_private, Decl(privacyInterface.ts, 134, 1))
 
     a?: C5_public;
->a : Symbol(a, Decl(privacyInterface.ts, 182, 18))
+>a : Symbol(C8_private.a, Decl(privacyInterface.ts, 182, 18))
 >C5_public : Symbol(C5_public, Decl(privacyInterface.ts, 129, 1))
 
     b?: C6_private;
->b : Symbol(b, Decl(privacyInterface.ts, 184, 18))
+>b : Symbol(C8_private.b, Decl(privacyInterface.ts, 184, 18))
 >C6_private : Symbol(C6_private, Decl(privacyInterface.ts, 134, 1))
 
     f1(a1: C5_public);
->f1 : Symbol(f1, Decl(privacyInterface.ts, 185, 19))
+>f1 : Symbol(C8_private.f1, Decl(privacyInterface.ts, 185, 19))
 >a1 : Symbol(a1, Decl(privacyInterface.ts, 187, 7))
 >C5_public : Symbol(C5_public, Decl(privacyInterface.ts, 129, 1))
 
     f2(a1: C6_private);
->f2 : Symbol(f2, Decl(privacyInterface.ts, 187, 22))
+>f2 : Symbol(C8_private.f2, Decl(privacyInterface.ts, 187, 22))
 >a1 : Symbol(a1, Decl(privacyInterface.ts, 188, 7))
 >C6_private : Symbol(C6_private, Decl(privacyInterface.ts, 134, 1))
 
     f3(): C5_public;
->f3 : Symbol(f3, Decl(privacyInterface.ts, 188, 23))
+>f3 : Symbol(C8_private.f3, Decl(privacyInterface.ts, 188, 23))
 >C5_public : Symbol(C5_public, Decl(privacyInterface.ts, 129, 1))
 
     f4(): C6_private;
->f4 : Symbol(f4, Decl(privacyInterface.ts, 189, 20))
+>f4 : Symbol(C8_private.f4, Decl(privacyInterface.ts, 189, 20))
 >C6_private : Symbol(C6_private, Decl(privacyInterface.ts, 134, 1))
 
 }
@@ -516,14 +516,14 @@ export module m3 {
 >m3_i_public : Symbol(m3_i_public, Decl(privacyInterface.ts, 194, 18))
 
         f1(): number;
->f1 : Symbol(f1, Decl(privacyInterface.ts, 195, 34))
+>f1 : Symbol(m3_i_public.f1, Decl(privacyInterface.ts, 195, 34))
     }
 
     interface m3_i_private {
 >m3_i_private : Symbol(m3_i_private, Decl(privacyInterface.ts, 197, 5))
 
         f2(): string;
->f2 : Symbol(f2, Decl(privacyInterface.ts, 199, 28))
+>f2 : Symbol(m3_i_private.f2, Decl(privacyInterface.ts, 199, 28))
     }
 
     interface m3_C1_private extends m3_i_public {
@@ -563,14 +563,14 @@ module m4 {
 >m4_i_public : Symbol(m4_i_public, Decl(privacyInterface.ts, 219, 11))
 
         f1(): number;
->f1 : Symbol(f1, Decl(privacyInterface.ts, 220, 34))
+>f1 : Symbol(m4_i_public.f1, Decl(privacyInterface.ts, 220, 34))
     }
 
     interface m4_i_private {
 >m4_i_private : Symbol(m4_i_private, Decl(privacyInterface.ts, 222, 5))
 
         f2(): string;
->f2 : Symbol(f2, Decl(privacyInterface.ts, 224, 28))
+>f2 : Symbol(m4_i_private.f2, Decl(privacyInterface.ts, 224, 28))
     }
 
     interface m4_C1_private extends m4_i_public {
@@ -606,14 +606,14 @@ export interface glo_i_public {
 >glo_i_public : Symbol(glo_i_public, Decl(privacyInterface.ts, 241, 1))
 
     f1(): number;
->f1 : Symbol(f1, Decl(privacyInterface.ts, 243, 31))
+>f1 : Symbol(glo_i_public.f1, Decl(privacyInterface.ts, 243, 31))
 }
 
 interface glo_i_private {
 >glo_i_private : Symbol(glo_i_private, Decl(privacyInterface.ts, 245, 1))
 
     f2(): string;
->f2 : Symbol(f2, Decl(privacyInterface.ts, 247, 25))
+>f2 : Symbol(glo_i_private.f2, Decl(privacyInterface.ts, 247, 25))
 }
 
 interface glo_C1_private extends glo_i_public {
diff --git a/tests/baselines/reference/privacyTypeParameterOfFunction.symbols b/tests/baselines/reference/privacyTypeParameterOfFunction.symbols
index dbdb0617aab..db50f1e61a4 100644
--- a/tests/baselines/reference/privacyTypeParameterOfFunction.symbols
+++ b/tests/baselines/reference/privacyTypeParameterOfFunction.symbols
@@ -24,7 +24,7 @@ export interface publicInterfaceWithPrivateTypeParameters {
 
     // TypeParameter_0_of_method_from_exported_interface_has_or_is_using_private_type_1
     myMethod<T extends privateClass>(): privateClass;
->myMethod : Symbol(myMethod, Decl(privacyTypeParameterOfFunction.ts, 11, 45))
+>myMethod : Symbol(publicInterfaceWithPrivateTypeParameters.myMethod, Decl(privacyTypeParameterOfFunction.ts, 11, 45))
 >T : Symbol(T, Decl(privacyTypeParameterOfFunction.ts, 14, 13))
 >privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunction.ts, 0, 0))
 >privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunction.ts, 0, 0))
@@ -44,7 +44,7 @@ export interface publicInterfaceWithPublicTypeParameters {
 >publicClass : Symbol(publicClass, Decl(privacyTypeParameterOfFunction.ts, 1, 1))
 
     myMethod<T extends publicClass>(): publicClass;
->myMethod : Symbol(myMethod, Decl(privacyTypeParameterOfFunction.ts, 19, 43))
+>myMethod : Symbol(publicInterfaceWithPublicTypeParameters.myMethod, Decl(privacyTypeParameterOfFunction.ts, 19, 43))
 >T : Symbol(T, Decl(privacyTypeParameterOfFunction.ts, 20, 13))
 >publicClass : Symbol(publicClass, Decl(privacyTypeParameterOfFunction.ts, 1, 1))
 >publicClass : Symbol(publicClass, Decl(privacyTypeParameterOfFunction.ts, 1, 1))
@@ -64,7 +64,7 @@ interface privateInterfaceWithPrivateTypeParameters {
 >privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunction.ts, 0, 0))
 
     myMethod<T extends privateClass>(): privateClass;
->myMethod : Symbol(myMethod, Decl(privacyTypeParameterOfFunction.ts, 25, 45))
+>myMethod : Symbol(privateInterfaceWithPrivateTypeParameters.myMethod, Decl(privacyTypeParameterOfFunction.ts, 25, 45))
 >T : Symbol(T, Decl(privacyTypeParameterOfFunction.ts, 26, 13))
 >privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunction.ts, 0, 0))
 >privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunction.ts, 0, 0))
@@ -84,7 +84,7 @@ interface privateInterfaceWithPublicTypeParameters {
 >publicClass : Symbol(publicClass, Decl(privacyTypeParameterOfFunction.ts, 1, 1))
 
     myMethod<T extends publicClass>(): publicClass;
->myMethod : Symbol(myMethod, Decl(privacyTypeParameterOfFunction.ts, 31, 43))
+>myMethod : Symbol(privateInterfaceWithPublicTypeParameters.myMethod, Decl(privacyTypeParameterOfFunction.ts, 31, 43))
 >T : Symbol(T, Decl(privacyTypeParameterOfFunction.ts, 32, 13))
 >publicClass : Symbol(publicClass, Decl(privacyTypeParameterOfFunction.ts, 1, 1))
 >publicClass : Symbol(publicClass, Decl(privacyTypeParameterOfFunction.ts, 1, 1))
@@ -106,12 +106,12 @@ export class publicClassWithWithPrivateTypeParameters {
     }
     // TypeParameter_0_of_public_method_from_exported_class_has_or_is_using_private_type_1
     myPublicMethod<T extends privateClass>() {
->myPublicMethod : Symbol(myPublicMethod, Decl(privacyTypeParameterOfFunction.ts, 40, 5))
+>myPublicMethod : Symbol(publicClassWithWithPrivateTypeParameters.myPublicMethod, Decl(privacyTypeParameterOfFunction.ts, 40, 5))
 >T : Symbol(T, Decl(privacyTypeParameterOfFunction.ts, 42, 19))
 >privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunction.ts, 0, 0))
     }
     private myPrivateMethod<T extends privateClass>() { // No error
->myPrivateMethod : Symbol(myPrivateMethod, Decl(privacyTypeParameterOfFunction.ts, 43, 5))
+>myPrivateMethod : Symbol(publicClassWithWithPrivateTypeParameters.myPrivateMethod, Decl(privacyTypeParameterOfFunction.ts, 43, 5))
 >T : Symbol(T, Decl(privacyTypeParameterOfFunction.ts, 44, 28))
 >privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunction.ts, 0, 0))
     }
@@ -131,12 +131,12 @@ export class publicClassWithWithPublicTypeParameters {
 >publicClass : Symbol(publicClass, Decl(privacyTypeParameterOfFunction.ts, 1, 1))
     }
     myPublicMethod<T extends publicClass>() {
->myPublicMethod : Symbol(myPublicMethod, Decl(privacyTypeParameterOfFunction.ts, 52, 5))
+>myPublicMethod : Symbol(publicClassWithWithPublicTypeParameters.myPublicMethod, Decl(privacyTypeParameterOfFunction.ts, 52, 5))
 >T : Symbol(T, Decl(privacyTypeParameterOfFunction.ts, 53, 19))
 >publicClass : Symbol(publicClass, Decl(privacyTypeParameterOfFunction.ts, 1, 1))
     }
     private myPrivateMethod<T extends publicClass>() {
->myPrivateMethod : Symbol(myPrivateMethod, Decl(privacyTypeParameterOfFunction.ts, 54, 5))
+>myPrivateMethod : Symbol(publicClassWithWithPublicTypeParameters.myPrivateMethod, Decl(privacyTypeParameterOfFunction.ts, 54, 5))
 >T : Symbol(T, Decl(privacyTypeParameterOfFunction.ts, 55, 28))
 >publicClass : Symbol(publicClass, Decl(privacyTypeParameterOfFunction.ts, 1, 1))
     }
@@ -156,12 +156,12 @@ class privateClassWithWithPrivateTypeParameters {
 >privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunction.ts, 0, 0))
     }
     myPublicMethod<T extends privateClass>() {
->myPublicMethod : Symbol(myPublicMethod, Decl(privacyTypeParameterOfFunction.ts, 63, 5))
+>myPublicMethod : Symbol(privateClassWithWithPrivateTypeParameters.myPublicMethod, Decl(privacyTypeParameterOfFunction.ts, 63, 5))
 >T : Symbol(T, Decl(privacyTypeParameterOfFunction.ts, 64, 19))
 >privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunction.ts, 0, 0))
     }
     private myPrivateMethod<T extends privateClass>() { // No error
->myPrivateMethod : Symbol(myPrivateMethod, Decl(privacyTypeParameterOfFunction.ts, 65, 5))
+>myPrivateMethod : Symbol(privateClassWithWithPrivateTypeParameters.myPrivateMethod, Decl(privacyTypeParameterOfFunction.ts, 65, 5))
 >T : Symbol(T, Decl(privacyTypeParameterOfFunction.ts, 66, 28))
 >privateClass : Symbol(privateClass, Decl(privacyTypeParameterOfFunction.ts, 0, 0))
     }
@@ -181,12 +181,12 @@ class privateClassWithWithPublicTypeParameters {
 >publicClass : Symbol(publicClass, Decl(privacyTypeParameterOfFunction.ts, 1, 1))
     }
     myPublicMethod<T extends publicClass>() {
->myPublicMethod : Symbol(myPublicMethod, Decl(privacyTypeParameterOfFunction.ts, 74, 5))
+>myPublicMethod : Symbol(privateClassWithWithPublicTypeParameters.myPublicMethod, Decl(privacyTypeParameterOfFunction.ts, 74, 5))
 >T : Symbol(T, Decl(privacyTypeParameterOfFunction.ts, 75, 19))
 >publicClass : Symbol(publicClass, Decl(privacyTypeParameterOfFunction.ts, 1, 1))
     }
     private myPrivateMethod<T extends publicClass>() {
->myPrivateMethod : Symbol(myPrivateMethod, Decl(privacyTypeParameterOfFunction.ts, 76, 5))
+>myPrivateMethod : Symbol(privateClassWithWithPublicTypeParameters.myPrivateMethod, Decl(privacyTypeParameterOfFunction.ts, 76, 5))
 >T : Symbol(T, Decl(privacyTypeParameterOfFunction.ts, 77, 28))
 >publicClass : Symbol(publicClass, Decl(privacyTypeParameterOfFunction.ts, 1, 1))
     }
@@ -229,7 +229,7 @@ export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
 >publicClass : Symbol(publicClass, Decl(privacyTypeParameterOfFunction.ts, 1, 1))
 
     myMethod<T>(): publicClass;
->myMethod : Symbol(myMethod, Decl(privacyTypeParameterOfFunction.ts, 96, 23))
+>myMethod : Symbol(publicInterfaceWithPublicTypeParametersWithoutExtends.myMethod, Decl(privacyTypeParameterOfFunction.ts, 96, 23))
 >T : Symbol(T, Decl(privacyTypeParameterOfFunction.ts, 97, 13))
 >publicClass : Symbol(publicClass, Decl(privacyTypeParameterOfFunction.ts, 1, 1))
 }
@@ -246,7 +246,7 @@ interface privateInterfaceWithPublicTypeParametersWithoutExtends {
 >publicClass : Symbol(publicClass, Decl(privacyTypeParameterOfFunction.ts, 1, 1))
 
     myMethod<T>(): publicClass;
->myMethod : Symbol(myMethod, Decl(privacyTypeParameterOfFunction.ts, 102, 23))
+>myMethod : Symbol(privateInterfaceWithPublicTypeParametersWithoutExtends.myMethod, Decl(privacyTypeParameterOfFunction.ts, 102, 23))
 >T : Symbol(T, Decl(privacyTypeParameterOfFunction.ts, 103, 13))
 >publicClass : Symbol(publicClass, Decl(privacyTypeParameterOfFunction.ts, 1, 1))
 }
@@ -263,11 +263,11 @@ export class publicClassWithWithPublicTypeParametersWithoutExtends {
 >T : Symbol(T, Decl(privacyTypeParameterOfFunction.ts, 109, 41))
     }
     myPublicMethod<T>() {
->myPublicMethod : Symbol(myPublicMethod, Decl(privacyTypeParameterOfFunction.ts, 110, 5))
+>myPublicMethod : Symbol(publicClassWithWithPublicTypeParametersWithoutExtends.myPublicMethod, Decl(privacyTypeParameterOfFunction.ts, 110, 5))
 >T : Symbol(T, Decl(privacyTypeParameterOfFunction.ts, 111, 19))
     }
     private myPrivateMethod<T>() {
->myPrivateMethod : Symbol(myPrivateMethod, Decl(privacyTypeParameterOfFunction.ts, 112, 5))
+>myPrivateMethod : Symbol(publicClassWithWithPublicTypeParametersWithoutExtends.myPrivateMethod, Decl(privacyTypeParameterOfFunction.ts, 112, 5))
 >T : Symbol(T, Decl(privacyTypeParameterOfFunction.ts, 113, 28))
     }
 }
@@ -283,11 +283,11 @@ class privateClassWithWithPublicTypeParametersWithoutExtends {
 >T : Symbol(T, Decl(privacyTypeParameterOfFunction.ts, 119, 41))
     }
     myPublicMethod<T>() {
->myPublicMethod : Symbol(myPublicMethod, Decl(privacyTypeParameterOfFunction.ts, 120, 5))
+>myPublicMethod : Symbol(privateClassWithWithPublicTypeParametersWithoutExtends.myPublicMethod, Decl(privacyTypeParameterOfFunction.ts, 120, 5))
 >T : Symbol(T, Decl(privacyTypeParameterOfFunction.ts, 121, 19))
     }
     private myPrivateMethod<T>() {
->myPrivateMethod : Symbol(myPrivateMethod, Decl(privacyTypeParameterOfFunction.ts, 122, 5))
+>myPrivateMethod : Symbol(privateClassWithWithPublicTypeParametersWithoutExtends.myPrivateMethod, Decl(privacyTypeParameterOfFunction.ts, 122, 5))
 >T : Symbol(T, Decl(privacyTypeParameterOfFunction.ts, 123, 28))
     }
 }
diff --git a/tests/baselines/reference/privacyTypeParametersOfClass.symbols b/tests/baselines/reference/privacyTypeParametersOfClass.symbols
index cdb0e6044cf..6f52f1bd391 100644
--- a/tests/baselines/reference/privacyTypeParametersOfClass.symbols
+++ b/tests/baselines/reference/privacyTypeParametersOfClass.symbols
@@ -14,7 +14,7 @@ export class publicClassWithPrivateTypeParameters<T extends privateClass> {
 >privateClass : Symbol(privateClass, Decl(privacyTypeParametersOfClass.ts, 0, 0))
 
     myMethod(val: T): T { // Error
->myMethod : Symbol(myMethod, Decl(privacyTypeParametersOfClass.ts, 7, 75))
+>myMethod : Symbol(publicClassWithPrivateTypeParameters.myMethod, Decl(privacyTypeParametersOfClass.ts, 7, 75))
 >val : Symbol(val, Decl(privacyTypeParametersOfClass.ts, 8, 13))
 >T : Symbol(T, Decl(privacyTypeParametersOfClass.ts, 7, 50))
 >T : Symbol(T, Decl(privacyTypeParametersOfClass.ts, 7, 50))
@@ -30,7 +30,7 @@ export class publicClassWithPublicTypeParameters<T extends publicClass> {
 >publicClass : Symbol(publicClass, Decl(privacyTypeParametersOfClass.ts, 1, 1))
 
     myMethod(val: T): T { // No Error
->myMethod : Symbol(myMethod, Decl(privacyTypeParametersOfClass.ts, 13, 73))
+>myMethod : Symbol(publicClassWithPublicTypeParameters.myMethod, Decl(privacyTypeParametersOfClass.ts, 13, 73))
 >val : Symbol(val, Decl(privacyTypeParametersOfClass.ts, 14, 13))
 >T : Symbol(T, Decl(privacyTypeParametersOfClass.ts, 13, 49))
 >T : Symbol(T, Decl(privacyTypeParametersOfClass.ts, 13, 49))
@@ -46,7 +46,7 @@ class privateClassWithPrivateTypeParameters<T extends privateClass> {
 >privateClass : Symbol(privateClass, Decl(privacyTypeParametersOfClass.ts, 0, 0))
 
     myMethod(val: T): T { // No Error
->myMethod : Symbol(myMethod, Decl(privacyTypeParametersOfClass.ts, 19, 69))
+>myMethod : Symbol(privateClassWithPrivateTypeParameters.myMethod, Decl(privacyTypeParametersOfClass.ts, 19, 69))
 >val : Symbol(val, Decl(privacyTypeParametersOfClass.ts, 20, 13))
 >T : Symbol(T, Decl(privacyTypeParametersOfClass.ts, 19, 44))
 >T : Symbol(T, Decl(privacyTypeParametersOfClass.ts, 19, 44))
@@ -62,7 +62,7 @@ class privateClassWithPublicTypeParameters<T extends publicClass> {
 >publicClass : Symbol(publicClass, Decl(privacyTypeParametersOfClass.ts, 1, 1))
 
     myMethod(val: T): T { // No Error
->myMethod : Symbol(myMethod, Decl(privacyTypeParametersOfClass.ts, 25, 67))
+>myMethod : Symbol(privateClassWithPublicTypeParameters.myMethod, Decl(privacyTypeParametersOfClass.ts, 25, 67))
 >val : Symbol(val, Decl(privacyTypeParametersOfClass.ts, 26, 13))
 >T : Symbol(T, Decl(privacyTypeParametersOfClass.ts, 25, 43))
 >T : Symbol(T, Decl(privacyTypeParametersOfClass.ts, 25, 43))
@@ -77,7 +77,7 @@ export class publicClassWithPublicTypeParametersWithoutExtends<T> {
 >T : Symbol(T, Decl(privacyTypeParametersOfClass.ts, 31, 63))
 
     myMethod(val: T): T { // No Error
->myMethod : Symbol(myMethod, Decl(privacyTypeParametersOfClass.ts, 31, 67))
+>myMethod : Symbol(publicClassWithPublicTypeParametersWithoutExtends.myMethod, Decl(privacyTypeParametersOfClass.ts, 31, 67))
 >val : Symbol(val, Decl(privacyTypeParametersOfClass.ts, 32, 13))
 >T : Symbol(T, Decl(privacyTypeParametersOfClass.ts, 31, 63))
 >T : Symbol(T, Decl(privacyTypeParametersOfClass.ts, 31, 63))
@@ -92,7 +92,7 @@ class privateClassWithPublicTypeParametersWithoutExtends<T> {
 >T : Symbol(T, Decl(privacyTypeParametersOfClass.ts, 37, 57))
 
     myMethod(val: T): T { // No Error
->myMethod : Symbol(myMethod, Decl(privacyTypeParametersOfClass.ts, 37, 61))
+>myMethod : Symbol(privateClassWithPublicTypeParametersWithoutExtends.myMethod, Decl(privacyTypeParametersOfClass.ts, 37, 61))
 >val : Symbol(val, Decl(privacyTypeParametersOfClass.ts, 38, 13))
 >T : Symbol(T, Decl(privacyTypeParametersOfClass.ts, 37, 57))
 >T : Symbol(T, Decl(privacyTypeParametersOfClass.ts, 37, 57))
diff --git a/tests/baselines/reference/privacyTypeParametersOfInterface.symbols b/tests/baselines/reference/privacyTypeParametersOfInterface.symbols
index 8d6e2070444..2ee927a9eec 100644
--- a/tests/baselines/reference/privacyTypeParametersOfInterface.symbols
+++ b/tests/baselines/reference/privacyTypeParametersOfInterface.symbols
@@ -24,33 +24,33 @@ export interface publicInterfaceWithPrivateTypeParameters<T extends privateClass
 >privateClass : Symbol(privateClass, Decl(privacyTypeParametersOfInterface.ts, 0, 0))
 
     myMethod(val: T): T; // Error
->myMethod : Symbol(myMethod, Decl(privacyTypeParametersOfInterface.ts, 13, 83))
+>myMethod : Symbol(publicInterfaceWithPrivateTypeParameters.myMethod, Decl(privacyTypeParametersOfInterface.ts, 13, 83))
 >val : Symbol(val, Decl(privacyTypeParametersOfInterface.ts, 14, 13))
 >T : Symbol(T, Decl(privacyTypeParametersOfInterface.ts, 13, 58))
 >T : Symbol(T, Decl(privacyTypeParametersOfInterface.ts, 13, 58))
 
     myMethod0(): publicClassT<T>; // error
->myMethod0 : Symbol(myMethod0, Decl(privacyTypeParametersOfInterface.ts, 14, 24))
+>myMethod0 : Symbol(publicInterfaceWithPrivateTypeParameters.myMethod0, Decl(privacyTypeParametersOfInterface.ts, 14, 24))
 >publicClassT : Symbol(publicClassT, Decl(privacyTypeParametersOfInterface.ts, 7, 1))
 >T : Symbol(T, Decl(privacyTypeParametersOfInterface.ts, 13, 58))
 
     myMethod1(): privateClassT<privateClass>; // error
->myMethod1 : Symbol(myMethod1, Decl(privacyTypeParametersOfInterface.ts, 15, 33))
+>myMethod1 : Symbol(publicInterfaceWithPrivateTypeParameters.myMethod1, Decl(privacyTypeParametersOfInterface.ts, 15, 33))
 >privateClassT : Symbol(privateClassT, Decl(privacyTypeParametersOfInterface.ts, 4, 1))
 >privateClass : Symbol(privateClass, Decl(privacyTypeParametersOfInterface.ts, 0, 0))
 
     myMethod2(): privateClassT<publicClass>; // error
->myMethod2 : Symbol(myMethod2, Decl(privacyTypeParametersOfInterface.ts, 16, 45))
+>myMethod2 : Symbol(publicInterfaceWithPrivateTypeParameters.myMethod2, Decl(privacyTypeParametersOfInterface.ts, 16, 45))
 >privateClassT : Symbol(privateClassT, Decl(privacyTypeParametersOfInterface.ts, 4, 1))
 >publicClass : Symbol(publicClass, Decl(privacyTypeParametersOfInterface.ts, 1, 1))
 
     myMethod3(): publicClassT<privateClass>; //error
->myMethod3 : Symbol(myMethod3, Decl(privacyTypeParametersOfInterface.ts, 17, 44))
+>myMethod3 : Symbol(publicInterfaceWithPrivateTypeParameters.myMethod3, Decl(privacyTypeParametersOfInterface.ts, 17, 44))
 >publicClassT : Symbol(publicClassT, Decl(privacyTypeParametersOfInterface.ts, 7, 1))
 >privateClass : Symbol(privateClass, Decl(privacyTypeParametersOfInterface.ts, 0, 0))
 
     myMethod4(): publicClassT<publicClass>; // no error
->myMethod4 : Symbol(myMethod4, Decl(privacyTypeParametersOfInterface.ts, 18, 44))
+>myMethod4 : Symbol(publicInterfaceWithPrivateTypeParameters.myMethod4, Decl(privacyTypeParametersOfInterface.ts, 18, 44))
 >publicClassT : Symbol(publicClassT, Decl(privacyTypeParametersOfInterface.ts, 7, 1))
 >publicClass : Symbol(publicClass, Decl(privacyTypeParametersOfInterface.ts, 1, 1))
 }
@@ -61,33 +61,33 @@ export interface publicInterfaceWithPublicTypeParameters<T extends publicClass>
 >publicClass : Symbol(publicClass, Decl(privacyTypeParametersOfInterface.ts, 1, 1))
 
     myMethod(val: T): T; // No Error
->myMethod : Symbol(myMethod, Decl(privacyTypeParametersOfInterface.ts, 22, 81))
+>myMethod : Symbol(publicInterfaceWithPublicTypeParameters.myMethod, Decl(privacyTypeParametersOfInterface.ts, 22, 81))
 >val : Symbol(val, Decl(privacyTypeParametersOfInterface.ts, 23, 13))
 >T : Symbol(T, Decl(privacyTypeParametersOfInterface.ts, 22, 57))
 >T : Symbol(T, Decl(privacyTypeParametersOfInterface.ts, 22, 57))
 
     myMethod0(): publicClassT<T>; // No error
->myMethod0 : Symbol(myMethod0, Decl(privacyTypeParametersOfInterface.ts, 23, 24))
+>myMethod0 : Symbol(publicInterfaceWithPublicTypeParameters.myMethod0, Decl(privacyTypeParametersOfInterface.ts, 23, 24))
 >publicClassT : Symbol(publicClassT, Decl(privacyTypeParametersOfInterface.ts, 7, 1))
 >T : Symbol(T, Decl(privacyTypeParametersOfInterface.ts, 22, 57))
 
     myMethod1(): privateClassT<privateClass>; // error
->myMethod1 : Symbol(myMethod1, Decl(privacyTypeParametersOfInterface.ts, 24, 33))
+>myMethod1 : Symbol(publicInterfaceWithPublicTypeParameters.myMethod1, Decl(privacyTypeParametersOfInterface.ts, 24, 33))
 >privateClassT : Symbol(privateClassT, Decl(privacyTypeParametersOfInterface.ts, 4, 1))
 >privateClass : Symbol(privateClass, Decl(privacyTypeParametersOfInterface.ts, 0, 0))
 
     myMethod2(): privateClassT<publicClass>; // error
->myMethod2 : Symbol(myMethod2, Decl(privacyTypeParametersOfInterface.ts, 25, 45))
+>myMethod2 : Symbol(publicInterfaceWithPublicTypeParameters.myMethod2, Decl(privacyTypeParametersOfInterface.ts, 25, 45))
 >privateClassT : Symbol(privateClassT, Decl(privacyTypeParametersOfInterface.ts, 4, 1))
 >publicClass : Symbol(publicClass, Decl(privacyTypeParametersOfInterface.ts, 1, 1))
 
     myMethod3(): publicClassT<privateClass>; //error
->myMethod3 : Symbol(myMethod3, Decl(privacyTypeParametersOfInterface.ts, 26, 44))
+>myMethod3 : Symbol(publicInterfaceWithPublicTypeParameters.myMethod3, Decl(privacyTypeParametersOfInterface.ts, 26, 44))
 >publicClassT : Symbol(publicClassT, Decl(privacyTypeParametersOfInterface.ts, 7, 1))
 >privateClass : Symbol(privateClass, Decl(privacyTypeParametersOfInterface.ts, 0, 0))
 
     myMethod4(): publicClassT<publicClass>; // no error
->myMethod4 : Symbol(myMethod4, Decl(privacyTypeParametersOfInterface.ts, 27, 44))
+>myMethod4 : Symbol(publicInterfaceWithPublicTypeParameters.myMethod4, Decl(privacyTypeParametersOfInterface.ts, 27, 44))
 >publicClassT : Symbol(publicClassT, Decl(privacyTypeParametersOfInterface.ts, 7, 1))
 >publicClass : Symbol(publicClass, Decl(privacyTypeParametersOfInterface.ts, 1, 1))
 }
@@ -98,33 +98,33 @@ interface privateInterfaceWithPrivateTypeParameters<T extends privateClass> {
 >privateClass : Symbol(privateClass, Decl(privacyTypeParametersOfInterface.ts, 0, 0))
 
     myMethod(val: T): T; // No Error
->myMethod : Symbol(myMethod, Decl(privacyTypeParametersOfInterface.ts, 31, 77))
+>myMethod : Symbol(privateInterfaceWithPrivateTypeParameters.myMethod, Decl(privacyTypeParametersOfInterface.ts, 31, 77))
 >val : Symbol(val, Decl(privacyTypeParametersOfInterface.ts, 32, 13))
 >T : Symbol(T, Decl(privacyTypeParametersOfInterface.ts, 31, 52))
 >T : Symbol(T, Decl(privacyTypeParametersOfInterface.ts, 31, 52))
 
     myMethod0(): publicClassT<T>; // No error
->myMethod0 : Symbol(myMethod0, Decl(privacyTypeParametersOfInterface.ts, 32, 24))
+>myMethod0 : Symbol(privateInterfaceWithPrivateTypeParameters.myMethod0, Decl(privacyTypeParametersOfInterface.ts, 32, 24))
 >publicClassT : Symbol(publicClassT, Decl(privacyTypeParametersOfInterface.ts, 7, 1))
 >T : Symbol(T, Decl(privacyTypeParametersOfInterface.ts, 31, 52))
 
     myMethod1(): privateClassT<privateClass>; // No error
->myMethod1 : Symbol(myMethod1, Decl(privacyTypeParametersOfInterface.ts, 33, 33))
+>myMethod1 : Symbol(privateInterfaceWithPrivateTypeParameters.myMethod1, Decl(privacyTypeParametersOfInterface.ts, 33, 33))
 >privateClassT : Symbol(privateClassT, Decl(privacyTypeParametersOfInterface.ts, 4, 1))
 >privateClass : Symbol(privateClass, Decl(privacyTypeParametersOfInterface.ts, 0, 0))
 
     myMethod2(): privateClassT<publicClass>; // No error
->myMethod2 : Symbol(myMethod2, Decl(privacyTypeParametersOfInterface.ts, 34, 45))
+>myMethod2 : Symbol(privateInterfaceWithPrivateTypeParameters.myMethod2, Decl(privacyTypeParametersOfInterface.ts, 34, 45))
 >privateClassT : Symbol(privateClassT, Decl(privacyTypeParametersOfInterface.ts, 4, 1))
 >publicClass : Symbol(publicClass, Decl(privacyTypeParametersOfInterface.ts, 1, 1))
 
     myMethod3(): publicClassT<privateClass>; //No error
->myMethod3 : Symbol(myMethod3, Decl(privacyTypeParametersOfInterface.ts, 35, 44))
+>myMethod3 : Symbol(privateInterfaceWithPrivateTypeParameters.myMethod3, Decl(privacyTypeParametersOfInterface.ts, 35, 44))
 >publicClassT : Symbol(publicClassT, Decl(privacyTypeParametersOfInterface.ts, 7, 1))
 >privateClass : Symbol(privateClass, Decl(privacyTypeParametersOfInterface.ts, 0, 0))
 
     myMethod4(): publicClassT<publicClass>; // no error
->myMethod4 : Symbol(myMethod4, Decl(privacyTypeParametersOfInterface.ts, 36, 44))
+>myMethod4 : Symbol(privateInterfaceWithPrivateTypeParameters.myMethod4, Decl(privacyTypeParametersOfInterface.ts, 36, 44))
 >publicClassT : Symbol(publicClassT, Decl(privacyTypeParametersOfInterface.ts, 7, 1))
 >publicClass : Symbol(publicClass, Decl(privacyTypeParametersOfInterface.ts, 1, 1))
 }
@@ -135,33 +135,33 @@ interface privateInterfaceWithPublicTypeParameters<T extends publicClass> {
 >publicClass : Symbol(publicClass, Decl(privacyTypeParametersOfInterface.ts, 1, 1))
 
     myMethod(val: T): T; // No Error
->myMethod : Symbol(myMethod, Decl(privacyTypeParametersOfInterface.ts, 40, 75))
+>myMethod : Symbol(privateInterfaceWithPublicTypeParameters.myMethod, Decl(privacyTypeParametersOfInterface.ts, 40, 75))
 >val : Symbol(val, Decl(privacyTypeParametersOfInterface.ts, 41, 13))
 >T : Symbol(T, Decl(privacyTypeParametersOfInterface.ts, 40, 51))
 >T : Symbol(T, Decl(privacyTypeParametersOfInterface.ts, 40, 51))
 
     myMethod0(): publicClassT<T>; // No error
->myMethod0 : Symbol(myMethod0, Decl(privacyTypeParametersOfInterface.ts, 41, 24))
+>myMethod0 : Symbol(privateInterfaceWithPublicTypeParameters.myMethod0, Decl(privacyTypeParametersOfInterface.ts, 41, 24))
 >publicClassT : Symbol(publicClassT, Decl(privacyTypeParametersOfInterface.ts, 7, 1))
 >T : Symbol(T, Decl(privacyTypeParametersOfInterface.ts, 40, 51))
 
     myMethod1(): privateClassT<privateClass>; // No error
->myMethod1 : Symbol(myMethod1, Decl(privacyTypeParametersOfInterface.ts, 42, 33))
+>myMethod1 : Symbol(privateInterfaceWithPublicTypeParameters.myMethod1, Decl(privacyTypeParametersOfInterface.ts, 42, 33))
 >privateClassT : Symbol(privateClassT, Decl(privacyTypeParametersOfInterface.ts, 4, 1))
 >privateClass : Symbol(privateClass, Decl(privacyTypeParametersOfInterface.ts, 0, 0))
 
     myMethod2(): privateClassT<publicClass>; // No error
->myMethod2 : Symbol(myMethod2, Decl(privacyTypeParametersOfInterface.ts, 43, 45))
+>myMethod2 : Symbol(privateInterfaceWithPublicTypeParameters.myMethod2, Decl(privacyTypeParametersOfInterface.ts, 43, 45))
 >privateClassT : Symbol(privateClassT, Decl(privacyTypeParametersOfInterface.ts, 4, 1))
 >publicClass : Symbol(publicClass, Decl(privacyTypeParametersOfInterface.ts, 1, 1))
 
     myMethod3(): publicClassT<privateClass>; //No error
->myMethod3 : Symbol(myMethod3, Decl(privacyTypeParametersOfInterface.ts, 44, 44))
+>myMethod3 : Symbol(privateInterfaceWithPublicTypeParameters.myMethod3, Decl(privacyTypeParametersOfInterface.ts, 44, 44))
 >publicClassT : Symbol(publicClassT, Decl(privacyTypeParametersOfInterface.ts, 7, 1))
 >privateClass : Symbol(privateClass, Decl(privacyTypeParametersOfInterface.ts, 0, 0))
 
     myMethod4(): publicClassT<publicClass>; // no error
->myMethod4 : Symbol(myMethod4, Decl(privacyTypeParametersOfInterface.ts, 45, 44))
+>myMethod4 : Symbol(privateInterfaceWithPublicTypeParameters.myMethod4, Decl(privacyTypeParametersOfInterface.ts, 45, 44))
 >publicClassT : Symbol(publicClassT, Decl(privacyTypeParametersOfInterface.ts, 7, 1))
 >publicClass : Symbol(publicClass, Decl(privacyTypeParametersOfInterface.ts, 1, 1))
 }
@@ -171,13 +171,13 @@ export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
 >T : Symbol(T, Decl(privacyTypeParametersOfInterface.ts, 49, 71))
 
     myMethod(val: T): T; // No Error
->myMethod : Symbol(myMethod, Decl(privacyTypeParametersOfInterface.ts, 49, 75))
+>myMethod : Symbol(publicInterfaceWithPublicTypeParametersWithoutExtends.myMethod, Decl(privacyTypeParametersOfInterface.ts, 49, 75))
 >val : Symbol(val, Decl(privacyTypeParametersOfInterface.ts, 50, 13))
 >T : Symbol(T, Decl(privacyTypeParametersOfInterface.ts, 49, 71))
 >T : Symbol(T, Decl(privacyTypeParametersOfInterface.ts, 49, 71))
 
     myMethod0(): publicClassT<T>; // No error
->myMethod0 : Symbol(myMethod0, Decl(privacyTypeParametersOfInterface.ts, 50, 24))
+>myMethod0 : Symbol(publicInterfaceWithPublicTypeParametersWithoutExtends.myMethod0, Decl(privacyTypeParametersOfInterface.ts, 50, 24))
 >publicClassT : Symbol(publicClassT, Decl(privacyTypeParametersOfInterface.ts, 7, 1))
 >T : Symbol(T, Decl(privacyTypeParametersOfInterface.ts, 49, 71))
 }
@@ -187,13 +187,13 @@ interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
 >T : Symbol(T, Decl(privacyTypeParametersOfInterface.ts, 54, 65))
 
     myMethod(val: T): T; // No Error
->myMethod : Symbol(myMethod, Decl(privacyTypeParametersOfInterface.ts, 54, 69))
+>myMethod : Symbol(privateInterfaceWithPublicTypeParametersWithoutExtends.myMethod, Decl(privacyTypeParametersOfInterface.ts, 54, 69))
 >val : Symbol(val, Decl(privacyTypeParametersOfInterface.ts, 55, 13))
 >T : Symbol(T, Decl(privacyTypeParametersOfInterface.ts, 54, 65))
 >T : Symbol(T, Decl(privacyTypeParametersOfInterface.ts, 54, 65))
 
     myMethod0(): publicClassT<T>; // No error
->myMethod0 : Symbol(myMethod0, Decl(privacyTypeParametersOfInterface.ts, 55, 24))
+>myMethod0 : Symbol(privateInterfaceWithPublicTypeParametersWithoutExtends.myMethod0, Decl(privacyTypeParametersOfInterface.ts, 55, 24))
 >publicClassT : Symbol(publicClassT, Decl(privacyTypeParametersOfInterface.ts, 7, 1))
 >T : Symbol(T, Decl(privacyTypeParametersOfInterface.ts, 54, 65))
 }
diff --git a/tests/baselines/reference/privacyVar.symbols b/tests/baselines/reference/privacyVar.symbols
index 098a48d6499..a08e2421080 100644
--- a/tests/baselines/reference/privacyVar.symbols
+++ b/tests/baselines/reference/privacyVar.symbols
@@ -6,7 +6,7 @@ export module m1 {
 >C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18))
 
         private f1() {
->f1 : Symbol(f1, Decl(privacyVar.ts, 1, 28))
+>f1 : Symbol(C1_public.f1, Decl(privacyVar.ts, 1, 28))
         }
     }
 
@@ -18,54 +18,54 @@ export module m1 {
 >C3_public : Symbol(C3_public, Decl(privacyVar.ts, 7, 5))
 
         private C3_v1_private: C1_public;
->C3_v1_private : Symbol(C3_v1_private, Decl(privacyVar.ts, 9, 28))
+>C3_v1_private : Symbol(C3_public.C3_v1_private, Decl(privacyVar.ts, 9, 28))
 >C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18))
 
         public C3_v2_public: C1_public;
->C3_v2_public : Symbol(C3_v2_public, Decl(privacyVar.ts, 10, 41))
+>C3_v2_public : Symbol(C3_public.C3_v2_public, Decl(privacyVar.ts, 10, 41))
 >C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18))
 
         private C3_v3_private: C2_private;
->C3_v3_private : Symbol(C3_v3_private, Decl(privacyVar.ts, 11, 39))
+>C3_v3_private : Symbol(C3_public.C3_v3_private, Decl(privacyVar.ts, 11, 39))
 >C2_private : Symbol(C2_private, Decl(privacyVar.ts, 4, 5))
 
         public C3_v4_public: C2_private; // error
->C3_v4_public : Symbol(C3_v4_public, Decl(privacyVar.ts, 12, 42))
+>C3_v4_public : Symbol(C3_public.C3_v4_public, Decl(privacyVar.ts, 12, 42))
 >C2_private : Symbol(C2_private, Decl(privacyVar.ts, 4, 5))
 
         private C3_v11_private = new C1_public();
->C3_v11_private : Symbol(C3_v11_private, Decl(privacyVar.ts, 13, 40))
+>C3_v11_private : Symbol(C3_public.C3_v11_private, Decl(privacyVar.ts, 13, 40))
 >C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18))
 
         public C3_v12_public = new C1_public();
->C3_v12_public : Symbol(C3_v12_public, Decl(privacyVar.ts, 15, 49))
+>C3_v12_public : Symbol(C3_public.C3_v12_public, Decl(privacyVar.ts, 15, 49))
 >C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18))
 
         private C3_v13_private = new C2_private();
->C3_v13_private : Symbol(C3_v13_private, Decl(privacyVar.ts, 16, 47))
+>C3_v13_private : Symbol(C3_public.C3_v13_private, Decl(privacyVar.ts, 16, 47))
 >C2_private : Symbol(C2_private, Decl(privacyVar.ts, 4, 5))
 
         public C3_v14_public = new C2_private(); // error
->C3_v14_public : Symbol(C3_v14_public, Decl(privacyVar.ts, 17, 50))
+>C3_v14_public : Symbol(C3_public.C3_v14_public, Decl(privacyVar.ts, 17, 50))
 >C2_private : Symbol(C2_private, Decl(privacyVar.ts, 4, 5))
 
         private C3_v21_private: C1_public = new C1_public();
->C3_v21_private : Symbol(C3_v21_private, Decl(privacyVar.ts, 18, 48))
+>C3_v21_private : Symbol(C3_public.C3_v21_private, Decl(privacyVar.ts, 18, 48))
 >C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18))
 >C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18))
 
         public C3_v22_public: C1_public = new C1_public();
->C3_v22_public : Symbol(C3_v22_public, Decl(privacyVar.ts, 20, 60))
+>C3_v22_public : Symbol(C3_public.C3_v22_public, Decl(privacyVar.ts, 20, 60))
 >C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18))
 >C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18))
 
         private C3_v23_private: C2_private = new C2_private();
->C3_v23_private : Symbol(C3_v23_private, Decl(privacyVar.ts, 21, 58))
+>C3_v23_private : Symbol(C3_public.C3_v23_private, Decl(privacyVar.ts, 21, 58))
 >C2_private : Symbol(C2_private, Decl(privacyVar.ts, 4, 5))
 >C2_private : Symbol(C2_private, Decl(privacyVar.ts, 4, 5))
 
         public C3_v24_public: C2_private = new C2_private(); // error
->C3_v24_public : Symbol(C3_v24_public, Decl(privacyVar.ts, 22, 62))
+>C3_v24_public : Symbol(C3_public.C3_v24_public, Decl(privacyVar.ts, 22, 62))
 >C2_private : Symbol(C2_private, Decl(privacyVar.ts, 4, 5))
 >C2_private : Symbol(C2_private, Decl(privacyVar.ts, 4, 5))
     }
@@ -74,54 +74,54 @@ export module m1 {
 >C4_public : Symbol(C4_public, Decl(privacyVar.ts, 24, 5))
 
         private C4_v1_private: C1_public;
->C4_v1_private : Symbol(C4_v1_private, Decl(privacyVar.ts, 26, 21))
+>C4_v1_private : Symbol(C4_public.C4_v1_private, Decl(privacyVar.ts, 26, 21))
 >C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18))
 
         public C4_v2_public: C1_public;
->C4_v2_public : Symbol(C4_v2_public, Decl(privacyVar.ts, 27, 41))
+>C4_v2_public : Symbol(C4_public.C4_v2_public, Decl(privacyVar.ts, 27, 41))
 >C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18))
 
         private C4_v3_private: C2_private;
->C4_v3_private : Symbol(C4_v3_private, Decl(privacyVar.ts, 28, 39))
+>C4_v3_private : Symbol(C4_public.C4_v3_private, Decl(privacyVar.ts, 28, 39))
 >C2_private : Symbol(C2_private, Decl(privacyVar.ts, 4, 5))
 
         public C4_v4_public: C2_private;
->C4_v4_public : Symbol(C4_v4_public, Decl(privacyVar.ts, 29, 42))
+>C4_v4_public : Symbol(C4_public.C4_v4_public, Decl(privacyVar.ts, 29, 42))
 >C2_private : Symbol(C2_private, Decl(privacyVar.ts, 4, 5))
 
         private C4_v11_private = new C1_public();
->C4_v11_private : Symbol(C4_v11_private, Decl(privacyVar.ts, 30, 40))
+>C4_v11_private : Symbol(C4_public.C4_v11_private, Decl(privacyVar.ts, 30, 40))
 >C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18))
 
         public C4_v12_public = new C1_public();
->C4_v12_public : Symbol(C4_v12_public, Decl(privacyVar.ts, 32, 49))
+>C4_v12_public : Symbol(C4_public.C4_v12_public, Decl(privacyVar.ts, 32, 49))
 >C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18))
 
         private C4_v13_private = new C2_private();
->C4_v13_private : Symbol(C4_v13_private, Decl(privacyVar.ts, 33, 47))
+>C4_v13_private : Symbol(C4_public.C4_v13_private, Decl(privacyVar.ts, 33, 47))
 >C2_private : Symbol(C2_private, Decl(privacyVar.ts, 4, 5))
 
         public C4_v14_public = new C2_private();
->C4_v14_public : Symbol(C4_v14_public, Decl(privacyVar.ts, 34, 50))
+>C4_v14_public : Symbol(C4_public.C4_v14_public, Decl(privacyVar.ts, 34, 50))
 >C2_private : Symbol(C2_private, Decl(privacyVar.ts, 4, 5))
 
         private C4_v21_private: C1_public = new C1_public();
->C4_v21_private : Symbol(C4_v21_private, Decl(privacyVar.ts, 35, 48))
+>C4_v21_private : Symbol(C4_public.C4_v21_private, Decl(privacyVar.ts, 35, 48))
 >C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18))
 >C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18))
 
         public C4_v22_public: C1_public = new C1_public();
->C4_v22_public : Symbol(C4_v22_public, Decl(privacyVar.ts, 37, 60))
+>C4_v22_public : Symbol(C4_public.C4_v22_public, Decl(privacyVar.ts, 37, 60))
 >C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18))
 >C1_public : Symbol(C1_public, Decl(privacyVar.ts, 0, 18))
 
         private C4_v23_private: C2_private = new C2_private();
->C4_v23_private : Symbol(C4_v23_private, Decl(privacyVar.ts, 38, 58))
+>C4_v23_private : Symbol(C4_public.C4_v23_private, Decl(privacyVar.ts, 38, 58))
 >C2_private : Symbol(C2_private, Decl(privacyVar.ts, 4, 5))
 >C2_private : Symbol(C2_private, Decl(privacyVar.ts, 4, 5))
 
         public C4_v24_public: C2_private = new C2_private();
->C4_v24_public : Symbol(C4_v24_public, Decl(privacyVar.ts, 39, 62))
+>C4_v24_public : Symbol(C4_public.C4_v24_public, Decl(privacyVar.ts, 39, 62))
 >C2_private : Symbol(C2_private, Decl(privacyVar.ts, 4, 5))
 >C2_private : Symbol(C2_private, Decl(privacyVar.ts, 4, 5))
     }
@@ -186,7 +186,7 @@ module m2 {
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11))
 
         private f1() {
->f1 : Symbol(f1, Decl(privacyVar.ts, 60, 31))
+>f1 : Symbol(m2_C1_public.f1, Decl(privacyVar.ts, 60, 31))
         }
     }
 
@@ -198,54 +198,54 @@ module m2 {
 >m2_C3_public : Symbol(m2_C3_public, Decl(privacyVar.ts, 66, 5))
 
         private m2_C3_v1_private: m2_C1_public;
->m2_C3_v1_private : Symbol(m2_C3_v1_private, Decl(privacyVar.ts, 68, 31))
+>m2_C3_v1_private : Symbol(m2_C3_public.m2_C3_v1_private, Decl(privacyVar.ts, 68, 31))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11))
 
         public m2_C3_v2_public: m2_C1_public;
->m2_C3_v2_public : Symbol(m2_C3_v2_public, Decl(privacyVar.ts, 69, 47))
+>m2_C3_v2_public : Symbol(m2_C3_public.m2_C3_v2_public, Decl(privacyVar.ts, 69, 47))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11))
 
         private m2_C3_v3_private: m2_C2_private;
->m2_C3_v3_private : Symbol(m2_C3_v3_private, Decl(privacyVar.ts, 70, 45))
+>m2_C3_v3_private : Symbol(m2_C3_public.m2_C3_v3_private, Decl(privacyVar.ts, 70, 45))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyVar.ts, 63, 5))
 
         public m2_C3_v4_public: m2_C2_private;
->m2_C3_v4_public : Symbol(m2_C3_v4_public, Decl(privacyVar.ts, 71, 48))
+>m2_C3_v4_public : Symbol(m2_C3_public.m2_C3_v4_public, Decl(privacyVar.ts, 71, 48))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyVar.ts, 63, 5))
 
         private m2_C3_v11_private = new m2_C1_public();
->m2_C3_v11_private : Symbol(m2_C3_v11_private, Decl(privacyVar.ts, 72, 46))
+>m2_C3_v11_private : Symbol(m2_C3_public.m2_C3_v11_private, Decl(privacyVar.ts, 72, 46))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11))
 
         public m2_C3_v12_public = new m2_C1_public();
->m2_C3_v12_public : Symbol(m2_C3_v12_public, Decl(privacyVar.ts, 74, 55))
+>m2_C3_v12_public : Symbol(m2_C3_public.m2_C3_v12_public, Decl(privacyVar.ts, 74, 55))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11))
 
         private m2_C3_v13_private = new m2_C2_private();
->m2_C3_v13_private : Symbol(m2_C3_v13_private, Decl(privacyVar.ts, 75, 53))
+>m2_C3_v13_private : Symbol(m2_C3_public.m2_C3_v13_private, Decl(privacyVar.ts, 75, 53))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyVar.ts, 63, 5))
 
         public m2_C3_v14_public = new m2_C2_private(); 
->m2_C3_v14_public : Symbol(m2_C3_v14_public, Decl(privacyVar.ts, 76, 56))
+>m2_C3_v14_public : Symbol(m2_C3_public.m2_C3_v14_public, Decl(privacyVar.ts, 76, 56))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyVar.ts, 63, 5))
 
         private m2_C3_v21_private: m2_C1_public = new m2_C1_public();
->m2_C3_v21_private : Symbol(m2_C3_v21_private, Decl(privacyVar.ts, 77, 54))
+>m2_C3_v21_private : Symbol(m2_C3_public.m2_C3_v21_private, Decl(privacyVar.ts, 77, 54))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11))
 
         public m2_C3_v22_public: m2_C1_public = new m2_C1_public();
->m2_C3_v22_public : Symbol(m2_C3_v22_public, Decl(privacyVar.ts, 79, 69))
+>m2_C3_v22_public : Symbol(m2_C3_public.m2_C3_v22_public, Decl(privacyVar.ts, 79, 69))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11))
 
         private m2_C3_v23_private: m2_C2_private = new m2_C2_private();
->m2_C3_v23_private : Symbol(m2_C3_v23_private, Decl(privacyVar.ts, 80, 67))
+>m2_C3_v23_private : Symbol(m2_C3_public.m2_C3_v23_private, Decl(privacyVar.ts, 80, 67))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyVar.ts, 63, 5))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyVar.ts, 63, 5))
 
         public m2_C3_v24_public: m2_C2_private = new m2_C2_private();
->m2_C3_v24_public : Symbol(m2_C3_v24_public, Decl(privacyVar.ts, 81, 71))
+>m2_C3_v24_public : Symbol(m2_C3_public.m2_C3_v24_public, Decl(privacyVar.ts, 81, 71))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyVar.ts, 63, 5))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyVar.ts, 63, 5))
     }
@@ -254,54 +254,54 @@ module m2 {
 >m2_C4_public : Symbol(m2_C4_public, Decl(privacyVar.ts, 83, 5))
 
         private m2_C4_v1_private: m2_C1_public;
->m2_C4_v1_private : Symbol(m2_C4_v1_private, Decl(privacyVar.ts, 85, 24))
+>m2_C4_v1_private : Symbol(m2_C4_public.m2_C4_v1_private, Decl(privacyVar.ts, 85, 24))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11))
 
         public m2_C4_v2_public: m2_C1_public;
->m2_C4_v2_public : Symbol(m2_C4_v2_public, Decl(privacyVar.ts, 86, 47))
+>m2_C4_v2_public : Symbol(m2_C4_public.m2_C4_v2_public, Decl(privacyVar.ts, 86, 47))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11))
 
         private m2_C4_v3_private: m2_C2_private;
->m2_C4_v3_private : Symbol(m2_C4_v3_private, Decl(privacyVar.ts, 87, 45))
+>m2_C4_v3_private : Symbol(m2_C4_public.m2_C4_v3_private, Decl(privacyVar.ts, 87, 45))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyVar.ts, 63, 5))
 
         public m2_C4_v4_public: m2_C2_private;
->m2_C4_v4_public : Symbol(m2_C4_v4_public, Decl(privacyVar.ts, 88, 48))
+>m2_C4_v4_public : Symbol(m2_C4_public.m2_C4_v4_public, Decl(privacyVar.ts, 88, 48))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyVar.ts, 63, 5))
 
         private m2_C4_v11_private = new m2_C1_public();
->m2_C4_v11_private : Symbol(m2_C4_v11_private, Decl(privacyVar.ts, 89, 46))
+>m2_C4_v11_private : Symbol(m2_C4_public.m2_C4_v11_private, Decl(privacyVar.ts, 89, 46))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11))
 
         public m2_C4_v12_public = new m2_C1_public();
->m2_C4_v12_public : Symbol(m2_C4_v12_public, Decl(privacyVar.ts, 91, 55))
+>m2_C4_v12_public : Symbol(m2_C4_public.m2_C4_v12_public, Decl(privacyVar.ts, 91, 55))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11))
 
         private m2_C4_v13_private = new m2_C2_private();
->m2_C4_v13_private : Symbol(m2_C4_v13_private, Decl(privacyVar.ts, 92, 53))
+>m2_C4_v13_private : Symbol(m2_C4_public.m2_C4_v13_private, Decl(privacyVar.ts, 92, 53))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyVar.ts, 63, 5))
 
         public m2_C4_v14_public = new m2_C2_private();
->m2_C4_v14_public : Symbol(m2_C4_v14_public, Decl(privacyVar.ts, 93, 56))
+>m2_C4_v14_public : Symbol(m2_C4_public.m2_C4_v14_public, Decl(privacyVar.ts, 93, 56))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyVar.ts, 63, 5))
 
         private m2_C4_v21_private: m2_C1_public = new m2_C1_public();
->m2_C4_v21_private : Symbol(m2_C4_v21_private, Decl(privacyVar.ts, 94, 54))
+>m2_C4_v21_private : Symbol(m2_C4_public.m2_C4_v21_private, Decl(privacyVar.ts, 94, 54))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11))
 
         public m2_C4_v22_public: m2_C1_public = new m2_C1_public();
->m2_C4_v22_public : Symbol(m2_C4_v22_public, Decl(privacyVar.ts, 96, 69))
+>m2_C4_v22_public : Symbol(m2_C4_public.m2_C4_v22_public, Decl(privacyVar.ts, 96, 69))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11))
 >m2_C1_public : Symbol(m2_C1_public, Decl(privacyVar.ts, 59, 11))
 
         private m2_C4_v23_private: m2_C2_private = new m2_C2_private();
->m2_C4_v23_private : Symbol(m2_C4_v23_private, Decl(privacyVar.ts, 97, 67))
+>m2_C4_v23_private : Symbol(m2_C4_public.m2_C4_v23_private, Decl(privacyVar.ts, 97, 67))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyVar.ts, 63, 5))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyVar.ts, 63, 5))
 
         public m2_C4_v24_public: m2_C2_private = new m2_C2_private();
->m2_C4_v24_public : Symbol(m2_C4_v24_public, Decl(privacyVar.ts, 98, 71))
+>m2_C4_v24_public : Symbol(m2_C4_public.m2_C4_v24_public, Decl(privacyVar.ts, 98, 71))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyVar.ts, 63, 5))
 >m2_C2_private : Symbol(m2_C2_private, Decl(privacyVar.ts, 63, 5))
     }
@@ -363,7 +363,7 @@ export class glo_C1_public {
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyVar.ts, 116, 1))
 
     private f1() {
->f1 : Symbol(f1, Decl(privacyVar.ts, 118, 28))
+>f1 : Symbol(glo_C1_public.f1, Decl(privacyVar.ts, 118, 28))
     }
 }
 
@@ -375,54 +375,54 @@ export class glo_C3_public {
 >glo_C3_public : Symbol(glo_C3_public, Decl(privacyVar.ts, 124, 1))
 
     private glo_C3_v1_private: glo_C1_public;
->glo_C3_v1_private : Symbol(glo_C3_v1_private, Decl(privacyVar.ts, 126, 28))
+>glo_C3_v1_private : Symbol(glo_C3_public.glo_C3_v1_private, Decl(privacyVar.ts, 126, 28))
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyVar.ts, 116, 1))
 
     public glo_C3_v2_public: glo_C1_public;
->glo_C3_v2_public : Symbol(glo_C3_v2_public, Decl(privacyVar.ts, 127, 45))
+>glo_C3_v2_public : Symbol(glo_C3_public.glo_C3_v2_public, Decl(privacyVar.ts, 127, 45))
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyVar.ts, 116, 1))
 
     private glo_C3_v3_private: glo_C2_private;
->glo_C3_v3_private : Symbol(glo_C3_v3_private, Decl(privacyVar.ts, 128, 43))
+>glo_C3_v3_private : Symbol(glo_C3_public.glo_C3_v3_private, Decl(privacyVar.ts, 128, 43))
 >glo_C2_private : Symbol(glo_C2_private, Decl(privacyVar.ts, 121, 1))
 
     public glo_C3_v4_public: glo_C2_private; //error
->glo_C3_v4_public : Symbol(glo_C3_v4_public, Decl(privacyVar.ts, 129, 46))
+>glo_C3_v4_public : Symbol(glo_C3_public.glo_C3_v4_public, Decl(privacyVar.ts, 129, 46))
 >glo_C2_private : Symbol(glo_C2_private, Decl(privacyVar.ts, 121, 1))
 
     private glo_C3_v11_private = new glo_C1_public();
->glo_C3_v11_private : Symbol(glo_C3_v11_private, Decl(privacyVar.ts, 130, 44))
+>glo_C3_v11_private : Symbol(glo_C3_public.glo_C3_v11_private, Decl(privacyVar.ts, 130, 44))
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyVar.ts, 116, 1))
 
     public glo_C3_v12_public = new glo_C1_public();
->glo_C3_v12_public : Symbol(glo_C3_v12_public, Decl(privacyVar.ts, 132, 53))
+>glo_C3_v12_public : Symbol(glo_C3_public.glo_C3_v12_public, Decl(privacyVar.ts, 132, 53))
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyVar.ts, 116, 1))
 
     private glo_C3_v13_private = new glo_C2_private();
->glo_C3_v13_private : Symbol(glo_C3_v13_private, Decl(privacyVar.ts, 133, 51))
+>glo_C3_v13_private : Symbol(glo_C3_public.glo_C3_v13_private, Decl(privacyVar.ts, 133, 51))
 >glo_C2_private : Symbol(glo_C2_private, Decl(privacyVar.ts, 121, 1))
 
     public glo_C3_v14_public = new glo_C2_private(); // error 
->glo_C3_v14_public : Symbol(glo_C3_v14_public, Decl(privacyVar.ts, 134, 54))
+>glo_C3_v14_public : Symbol(glo_C3_public.glo_C3_v14_public, Decl(privacyVar.ts, 134, 54))
 >glo_C2_private : Symbol(glo_C2_private, Decl(privacyVar.ts, 121, 1))
 
     private glo_C3_v21_private: glo_C1_public = new glo_C1_public();
->glo_C3_v21_private : Symbol(glo_C3_v21_private, Decl(privacyVar.ts, 135, 52))
+>glo_C3_v21_private : Symbol(glo_C3_public.glo_C3_v21_private, Decl(privacyVar.ts, 135, 52))
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyVar.ts, 116, 1))
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyVar.ts, 116, 1))
 
     public glo_C3_v22_public: glo_C1_public = new glo_C1_public();
->glo_C3_v22_public : Symbol(glo_C3_v22_public, Decl(privacyVar.ts, 137, 68))
+>glo_C3_v22_public : Symbol(glo_C3_public.glo_C3_v22_public, Decl(privacyVar.ts, 137, 68))
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyVar.ts, 116, 1))
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyVar.ts, 116, 1))
 
     private glo_C3_v23_private: glo_C2_private = new glo_C2_private();
->glo_C3_v23_private : Symbol(glo_C3_v23_private, Decl(privacyVar.ts, 138, 66))
+>glo_C3_v23_private : Symbol(glo_C3_public.glo_C3_v23_private, Decl(privacyVar.ts, 138, 66))
 >glo_C2_private : Symbol(glo_C2_private, Decl(privacyVar.ts, 121, 1))
 >glo_C2_private : Symbol(glo_C2_private, Decl(privacyVar.ts, 121, 1))
 
     public glo_C3_v24_public: glo_C2_private = new glo_C2_private(); //error
->glo_C3_v24_public : Symbol(glo_C3_v24_public, Decl(privacyVar.ts, 139, 70))
+>glo_C3_v24_public : Symbol(glo_C3_public.glo_C3_v24_public, Decl(privacyVar.ts, 139, 70))
 >glo_C2_private : Symbol(glo_C2_private, Decl(privacyVar.ts, 121, 1))
 >glo_C2_private : Symbol(glo_C2_private, Decl(privacyVar.ts, 121, 1))
 }
@@ -431,54 +431,54 @@ class glo_C4_public {
 >glo_C4_public : Symbol(glo_C4_public, Decl(privacyVar.ts, 141, 1))
 
     private glo_C4_v1_private: glo_C1_public;
->glo_C4_v1_private : Symbol(glo_C4_v1_private, Decl(privacyVar.ts, 143, 21))
+>glo_C4_v1_private : Symbol(glo_C4_public.glo_C4_v1_private, Decl(privacyVar.ts, 143, 21))
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyVar.ts, 116, 1))
 
     public glo_C4_v2_public: glo_C1_public;
->glo_C4_v2_public : Symbol(glo_C4_v2_public, Decl(privacyVar.ts, 144, 45))
+>glo_C4_v2_public : Symbol(glo_C4_public.glo_C4_v2_public, Decl(privacyVar.ts, 144, 45))
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyVar.ts, 116, 1))
 
     private glo_C4_v3_private: glo_C2_private;
->glo_C4_v3_private : Symbol(glo_C4_v3_private, Decl(privacyVar.ts, 145, 43))
+>glo_C4_v3_private : Symbol(glo_C4_public.glo_C4_v3_private, Decl(privacyVar.ts, 145, 43))
 >glo_C2_private : Symbol(glo_C2_private, Decl(privacyVar.ts, 121, 1))
 
     public glo_C4_v4_public: glo_C2_private;
->glo_C4_v4_public : Symbol(glo_C4_v4_public, Decl(privacyVar.ts, 146, 46))
+>glo_C4_v4_public : Symbol(glo_C4_public.glo_C4_v4_public, Decl(privacyVar.ts, 146, 46))
 >glo_C2_private : Symbol(glo_C2_private, Decl(privacyVar.ts, 121, 1))
 
     private glo_C4_v11_private = new glo_C1_public();
->glo_C4_v11_private : Symbol(glo_C4_v11_private, Decl(privacyVar.ts, 147, 44))
+>glo_C4_v11_private : Symbol(glo_C4_public.glo_C4_v11_private, Decl(privacyVar.ts, 147, 44))
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyVar.ts, 116, 1))
 
     public glo_C4_v12_public = new glo_C1_public();
->glo_C4_v12_public : Symbol(glo_C4_v12_public, Decl(privacyVar.ts, 149, 53))
+>glo_C4_v12_public : Symbol(glo_C4_public.glo_C4_v12_public, Decl(privacyVar.ts, 149, 53))
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyVar.ts, 116, 1))
 
     private glo_C4_v13_private = new glo_C2_private();
->glo_C4_v13_private : Symbol(glo_C4_v13_private, Decl(privacyVar.ts, 150, 51))
+>glo_C4_v13_private : Symbol(glo_C4_public.glo_C4_v13_private, Decl(privacyVar.ts, 150, 51))
 >glo_C2_private : Symbol(glo_C2_private, Decl(privacyVar.ts, 121, 1))
 
     public glo_C4_v14_public = new glo_C2_private();
->glo_C4_v14_public : Symbol(glo_C4_v14_public, Decl(privacyVar.ts, 151, 54))
+>glo_C4_v14_public : Symbol(glo_C4_public.glo_C4_v14_public, Decl(privacyVar.ts, 151, 54))
 >glo_C2_private : Symbol(glo_C2_private, Decl(privacyVar.ts, 121, 1))
 
     private glo_C4_v21_private: glo_C1_public = new glo_C1_public();
->glo_C4_v21_private : Symbol(glo_C4_v21_private, Decl(privacyVar.ts, 152, 52))
+>glo_C4_v21_private : Symbol(glo_C4_public.glo_C4_v21_private, Decl(privacyVar.ts, 152, 52))
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyVar.ts, 116, 1))
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyVar.ts, 116, 1))
 
     public glo_C4_v22_public: glo_C1_public = new glo_C1_public();
->glo_C4_v22_public : Symbol(glo_C4_v22_public, Decl(privacyVar.ts, 154, 68))
+>glo_C4_v22_public : Symbol(glo_C4_public.glo_C4_v22_public, Decl(privacyVar.ts, 154, 68))
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyVar.ts, 116, 1))
 >glo_C1_public : Symbol(glo_C1_public, Decl(privacyVar.ts, 116, 1))
 
     private glo_C4_v23_private: glo_C2_private = new glo_C2_private();
->glo_C4_v23_private : Symbol(glo_C4_v23_private, Decl(privacyVar.ts, 155, 66))
+>glo_C4_v23_private : Symbol(glo_C4_public.glo_C4_v23_private, Decl(privacyVar.ts, 155, 66))
 >glo_C2_private : Symbol(glo_C2_private, Decl(privacyVar.ts, 121, 1))
 >glo_C2_private : Symbol(glo_C2_private, Decl(privacyVar.ts, 121, 1))
 
     public glo_C4_v24_public: glo_C2_private = new glo_C2_private();
->glo_C4_v24_public : Symbol(glo_C4_v24_public, Decl(privacyVar.ts, 156, 70))
+>glo_C4_v24_public : Symbol(glo_C4_public.glo_C4_v24_public, Decl(privacyVar.ts, 156, 70))
 >glo_C2_private : Symbol(glo_C2_private, Decl(privacyVar.ts, 121, 1))
 >glo_C2_private : Symbol(glo_C2_private, Decl(privacyVar.ts, 121, 1))
 }
diff --git a/tests/baselines/reference/privateAccessInSubclass1.errors.txt b/tests/baselines/reference/privateAccessInSubclass1.errors.txt
index 5ffb876a728..6464a2f6d78 100644
--- a/tests/baselines/reference/privateAccessInSubclass1.errors.txt
+++ b/tests/baselines/reference/privateAccessInSubclass1.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/privateAccessInSubclass1.ts(7,5): error TS2341: Property 'options' is private and only accessible within class 'Base'.
+tests/cases/compiler/privateAccessInSubclass1.ts(7,10): error TS2341: Property 'options' is private and only accessible within class 'Base'.
 
 
 ==== tests/cases/compiler/privateAccessInSubclass1.ts (1 errors) ====
@@ -9,7 +9,7 @@ tests/cases/compiler/privateAccessInSubclass1.ts(7,5): error TS2341: Property 'o
     class D extends Base {
       myMethod() {
         this.options;
-        ~~~~~~~~~~~~
+             ~~~~~~~
 !!! error TS2341: Property 'options' is private and only accessible within class 'Base'.
       }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/privateClassPropertyAccessibleWithinNestedClass.js b/tests/baselines/reference/privateClassPropertyAccessibleWithinNestedClass.js
new file mode 100644
index 00000000000..3bb0a7da3ea
--- /dev/null
+++ b/tests/baselines/reference/privateClassPropertyAccessibleWithinNestedClass.js
@@ -0,0 +1,84 @@
+//// [privateClassPropertyAccessibleWithinNestedClass.ts]
+// no errors
+
+class C {
+    private x: string;
+    private get y() { return this.x; }
+    private set y(x) { this.y = this.x; }
+    private foo() { return this.foo; }
+
+    private static x: string;
+    private static get y() { return this.x; }
+    private static set y(x) { this.y = this.x; }
+    private static foo() { return this.foo; }
+    private static bar() { this.foo(); }
+
+    private bar() {
+        class C2 {
+            private foo() {
+                let x: C;
+                var x1 = x.foo;
+                var x2 = x.bar;
+                var x3 = x.x;
+                var x4 = x.y;
+
+                var sx1 = C.x;
+                var sx2 = C.y;
+                var sx3 = C.bar;
+                var sx4 = C.foo;
+
+                let y = new C();
+                var y1 = y.foo;
+                var y2 = y.bar;
+                var y3 = y.x;
+                var y4 = y.y;
+            }
+        }
+    }
+}
+
+//// [privateClassPropertyAccessibleWithinNestedClass.js]
+// no errors
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, "y", {
+        get: function () { return this.x; },
+        set: function (x) { this.y = this.x; },
+        enumerable: true,
+        configurable: true
+    });
+    C.prototype.foo = function () { return this.foo; };
+    Object.defineProperty(C, "y", {
+        get: function () { return this.x; },
+        set: function (x) { this.y = this.x; },
+        enumerable: true,
+        configurable: true
+    });
+    C.foo = function () { return this.foo; };
+    C.bar = function () { this.foo(); };
+    C.prototype.bar = function () {
+        var C2 = (function () {
+            function C2() {
+            }
+            C2.prototype.foo = function () {
+                var x;
+                var x1 = x.foo;
+                var x2 = x.bar;
+                var x3 = x.x;
+                var x4 = x.y;
+                var sx1 = C.x;
+                var sx2 = C.y;
+                var sx3 = C.bar;
+                var sx4 = C.foo;
+                var y = new C();
+                var y1 = y.foo;
+                var y2 = y.bar;
+                var y3 = y.x;
+                var y4 = y.y;
+            };
+            return C2;
+        }());
+    };
+    return C;
+}());
diff --git a/tests/baselines/reference/privateClassPropertyAccessibleWithinNestedClass.symbols b/tests/baselines/reference/privateClassPropertyAccessibleWithinNestedClass.symbols
new file mode 100644
index 00000000000..4aa6e6df5d9
--- /dev/null
+++ b/tests/baselines/reference/privateClassPropertyAccessibleWithinNestedClass.symbols
@@ -0,0 +1,154 @@
+=== tests/cases/conformance/classes/members/accessibility/privateClassPropertyAccessibleWithinNestedClass.ts ===
+// no errors
+
+class C {
+>C : Symbol(C, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+
+    private x: string;
+>x : Symbol(C.x, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 2, 9))
+
+    private get y() { return this.x; }
+>y : Symbol(C.y, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 3, 22), Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 4, 38))
+>this.x : Symbol(C.x, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 2, 9))
+>this : Symbol(C, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>x : Symbol(C.x, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 2, 9))
+
+    private set y(x) { this.y = this.x; }
+>y : Symbol(C.y, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 3, 22), Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 4, 38))
+>x : Symbol(x, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 5, 18))
+>this.y : Symbol(C.y, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 3, 22), Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 4, 38))
+>this : Symbol(C, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>y : Symbol(C.y, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 3, 22), Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 4, 38))
+>this.x : Symbol(C.x, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 2, 9))
+>this : Symbol(C, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>x : Symbol(C.x, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 2, 9))
+
+    private foo() { return this.foo; }
+>foo : Symbol(C.foo, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 5, 41))
+>this.foo : Symbol(C.foo, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 5, 41))
+>this : Symbol(C, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>foo : Symbol(C.foo, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 5, 41))
+
+    private static x: string;
+>x : Symbol(C.x, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 6, 38))
+
+    private static get y() { return this.x; }
+>y : Symbol(C.y, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 8, 29), Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 9, 45))
+>this.x : Symbol(C.x, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 6, 38))
+>this : Symbol(C, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>x : Symbol(C.x, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 6, 38))
+
+    private static set y(x) { this.y = this.x; }
+>y : Symbol(C.y, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 8, 29), Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 9, 45))
+>x : Symbol(x, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 10, 25))
+>this.y : Symbol(C.y, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 8, 29), Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 9, 45))
+>this : Symbol(C, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>y : Symbol(C.y, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 8, 29), Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 9, 45))
+>this.x : Symbol(C.x, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 6, 38))
+>this : Symbol(C, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>x : Symbol(C.x, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 6, 38))
+
+    private static foo() { return this.foo; }
+>foo : Symbol(C.foo, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 10, 48))
+>this.foo : Symbol(C.foo, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 10, 48))
+>this : Symbol(C, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>foo : Symbol(C.foo, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 10, 48))
+
+    private static bar() { this.foo(); }
+>bar : Symbol(C.bar, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 11, 45))
+>this.foo : Symbol(C.foo, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 10, 48))
+>this : Symbol(C, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>foo : Symbol(C.foo, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 10, 48))
+
+    private bar() {
+>bar : Symbol(C.bar, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 12, 40))
+
+        class C2 {
+>C2 : Symbol(C2, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 14, 19))
+
+            private foo() {
+>foo : Symbol(C2.foo, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 15, 18))
+
+                let x: C;
+>x : Symbol(x, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 17, 19))
+>C : Symbol(C, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+
+                var x1 = x.foo;
+>x1 : Symbol(x1, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 18, 19))
+>x.foo : Symbol(C.foo, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 5, 41))
+>x : Symbol(x, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 17, 19))
+>foo : Symbol(C.foo, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 5, 41))
+
+                var x2 = x.bar;
+>x2 : Symbol(x2, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 19, 19))
+>x.bar : Symbol(C.bar, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 12, 40))
+>x : Symbol(x, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 17, 19))
+>bar : Symbol(C.bar, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 12, 40))
+
+                var x3 = x.x;
+>x3 : Symbol(x3, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 20, 19))
+>x.x : Symbol(C.x, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 2, 9))
+>x : Symbol(x, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 17, 19))
+>x : Symbol(C.x, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 2, 9))
+
+                var x4 = x.y;
+>x4 : Symbol(x4, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 21, 19))
+>x.y : Symbol(C.y, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 3, 22), Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 4, 38))
+>x : Symbol(x, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 17, 19))
+>y : Symbol(C.y, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 3, 22), Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 4, 38))
+
+                var sx1 = C.x;
+>sx1 : Symbol(sx1, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 23, 19))
+>C.x : Symbol(C.x, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 6, 38))
+>C : Symbol(C, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>x : Symbol(C.x, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 6, 38))
+
+                var sx2 = C.y;
+>sx2 : Symbol(sx2, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 24, 19))
+>C.y : Symbol(C.y, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 8, 29), Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 9, 45))
+>C : Symbol(C, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>y : Symbol(C.y, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 8, 29), Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 9, 45))
+
+                var sx3 = C.bar;
+>sx3 : Symbol(sx3, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 25, 19))
+>C.bar : Symbol(C.bar, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 11, 45))
+>C : Symbol(C, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>bar : Symbol(C.bar, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 11, 45))
+
+                var sx4 = C.foo;
+>sx4 : Symbol(sx4, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 26, 19))
+>C.foo : Symbol(C.foo, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 10, 48))
+>C : Symbol(C, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>foo : Symbol(C.foo, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 10, 48))
+
+                let y = new C();
+>y : Symbol(y, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 28, 19))
+>C : Symbol(C, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+
+                var y1 = y.foo;
+>y1 : Symbol(y1, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 29, 19))
+>y.foo : Symbol(C.foo, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 5, 41))
+>y : Symbol(y, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 28, 19))
+>foo : Symbol(C.foo, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 5, 41))
+
+                var y2 = y.bar;
+>y2 : Symbol(y2, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 30, 19))
+>y.bar : Symbol(C.bar, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 12, 40))
+>y : Symbol(y, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 28, 19))
+>bar : Symbol(C.bar, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 12, 40))
+
+                var y3 = y.x;
+>y3 : Symbol(y3, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 31, 19))
+>y.x : Symbol(C.x, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 2, 9))
+>y : Symbol(y, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 28, 19))
+>x : Symbol(C.x, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 2, 9))
+
+                var y4 = y.y;
+>y4 : Symbol(y4, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 32, 19))
+>y.y : Symbol(C.y, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 3, 22), Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 4, 38))
+>y : Symbol(y, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 28, 19))
+>y : Symbol(C.y, Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 3, 22), Decl(privateClassPropertyAccessibleWithinNestedClass.ts, 4, 38))
+            }
+        }
+    }
+}
diff --git a/tests/baselines/reference/privateClassPropertyAccessibleWithinNestedClass.types b/tests/baselines/reference/privateClassPropertyAccessibleWithinNestedClass.types
new file mode 100644
index 00000000000..ee8eb82b940
--- /dev/null
+++ b/tests/baselines/reference/privateClassPropertyAccessibleWithinNestedClass.types
@@ -0,0 +1,158 @@
+=== tests/cases/conformance/classes/members/accessibility/privateClassPropertyAccessibleWithinNestedClass.ts ===
+// no errors
+
+class C {
+>C : C
+
+    private x: string;
+>x : string
+
+    private get y() { return this.x; }
+>y : string
+>this.x : string
+>this : this
+>x : string
+
+    private set y(x) { this.y = this.x; }
+>y : string
+>x : string
+>this.y = this.x : string
+>this.y : string
+>this : this
+>y : string
+>this.x : string
+>this : this
+>x : string
+
+    private foo() { return this.foo; }
+>foo : () => any
+>this.foo : () => any
+>this : this
+>foo : () => any
+
+    private static x: string;
+>x : string
+
+    private static get y() { return this.x; }
+>y : string
+>this.x : string
+>this : typeof C
+>x : string
+
+    private static set y(x) { this.y = this.x; }
+>y : string
+>x : string
+>this.y = this.x : string
+>this.y : string
+>this : typeof C
+>y : string
+>this.x : string
+>this : typeof C
+>x : string
+
+    private static foo() { return this.foo; }
+>foo : () => typeof C.foo
+>this.foo : () => typeof C.foo
+>this : typeof C
+>foo : () => typeof C.foo
+
+    private static bar() { this.foo(); }
+>bar : () => void
+>this.foo() : () => typeof C.foo
+>this.foo : () => typeof C.foo
+>this : typeof C
+>foo : () => typeof C.foo
+
+    private bar() {
+>bar : () => void
+
+        class C2 {
+>C2 : C2
+
+            private foo() {
+>foo : () => void
+
+                let x: C;
+>x : C
+>C : C
+
+                var x1 = x.foo;
+>x1 : () => any
+>x.foo : () => any
+>x : C
+>foo : () => any
+
+                var x2 = x.bar;
+>x2 : () => void
+>x.bar : () => void
+>x : C
+>bar : () => void
+
+                var x3 = x.x;
+>x3 : string
+>x.x : string
+>x : C
+>x : string
+
+                var x4 = x.y;
+>x4 : string
+>x.y : string
+>x : C
+>y : string
+
+                var sx1 = C.x;
+>sx1 : string
+>C.x : string
+>C : typeof C
+>x : string
+
+                var sx2 = C.y;
+>sx2 : string
+>C.y : string
+>C : typeof C
+>y : string
+
+                var sx3 = C.bar;
+>sx3 : () => void
+>C.bar : () => void
+>C : typeof C
+>bar : () => void
+
+                var sx4 = C.foo;
+>sx4 : () => typeof C.foo
+>C.foo : () => typeof C.foo
+>C : typeof C
+>foo : () => typeof C.foo
+
+                let y = new C();
+>y : C
+>new C() : C
+>C : typeof C
+
+                var y1 = y.foo;
+>y1 : () => any
+>y.foo : () => any
+>y : C
+>foo : () => any
+
+                var y2 = y.bar;
+>y2 : () => void
+>y.bar : () => void
+>y : C
+>bar : () => void
+
+                var y3 = y.x;
+>y3 : string
+>y.x : string
+>y : C
+>x : string
+
+                var y4 = y.y;
+>y4 : string
+>y.y : string
+>y : C
+>y : string
+            }
+        }
+    }
+}
diff --git a/tests/baselines/reference/privateInstanceVisibility.symbols b/tests/baselines/reference/privateInstanceVisibility.symbols
index d537c05c798..3304e4b31f3 100644
--- a/tests/baselines/reference/privateInstanceVisibility.symbols
+++ b/tests/baselines/reference/privateInstanceVisibility.symbols
@@ -6,12 +6,12 @@ module Test {
 >Example : Symbol(Example, Decl(privateInstanceVisibility.ts, 0, 13))
  
         private someNumber: number;
->someNumber : Symbol(someNumber, Decl(privateInstanceVisibility.ts, 2, 26))
+>someNumber : Symbol(Example.someNumber, Decl(privateInstanceVisibility.ts, 2, 26))
  
         
 
         public doSomething() {
->doSomething : Symbol(doSomething, Decl(privateInstanceVisibility.ts, 4, 35))
+>doSomething : Symbol(Example.doSomething, Decl(privateInstanceVisibility.ts, 4, 35))
  
             var that = this;                      
 >that : Symbol(that, Decl(privateInstanceVisibility.ts, 10, 15))
@@ -22,9 +22,9 @@ module Test {
                 
                 var num = that.someNumber;
 >num : Symbol(num, Decl(privateInstanceVisibility.ts, 14, 19))
->that.someNumber : Symbol(someNumber, Decl(privateInstanceVisibility.ts, 2, 26))
+>that.someNumber : Symbol(Example.someNumber, Decl(privateInstanceVisibility.ts, 2, 26))
 >that : Symbol(that, Decl(privateInstanceVisibility.ts, 10, 15))
->someNumber : Symbol(someNumber, Decl(privateInstanceVisibility.ts, 2, 26))
+>someNumber : Symbol(Example.someNumber, Decl(privateInstanceVisibility.ts, 2, 26))
  
             }
  
@@ -40,26 +40,26 @@ class C {
 >C : Symbol(C, Decl(privateInstanceVisibility.ts, 22, 1))
 
     private x: number;
->x : Symbol(x, Decl(privateInstanceVisibility.ts, 26, 9))
+>x : Symbol(C.x, Decl(privateInstanceVisibility.ts, 26, 9))
 
     getX() { return this.x; }
->getX : Symbol(getX, Decl(privateInstanceVisibility.ts, 28, 22))
->this.x : Symbol(x, Decl(privateInstanceVisibility.ts, 26, 9))
+>getX : Symbol(C.getX, Decl(privateInstanceVisibility.ts, 28, 22))
+>this.x : Symbol(C.x, Decl(privateInstanceVisibility.ts, 26, 9))
 >this : Symbol(C, Decl(privateInstanceVisibility.ts, 22, 1))
->x : Symbol(x, Decl(privateInstanceVisibility.ts, 26, 9))
+>x : Symbol(C.x, Decl(privateInstanceVisibility.ts, 26, 9))
 
     clone(other: C) {
->clone : Symbol(clone, Decl(privateInstanceVisibility.ts, 30, 29))
+>clone : Symbol(C.clone, Decl(privateInstanceVisibility.ts, 30, 29))
 >other : Symbol(other, Decl(privateInstanceVisibility.ts, 32, 10))
 >C : Symbol(C, Decl(privateInstanceVisibility.ts, 22, 1))
 
         this.x = other.x;
->this.x : Symbol(x, Decl(privateInstanceVisibility.ts, 26, 9))
+>this.x : Symbol(C.x, Decl(privateInstanceVisibility.ts, 26, 9))
 >this : Symbol(C, Decl(privateInstanceVisibility.ts, 22, 1))
->x : Symbol(x, Decl(privateInstanceVisibility.ts, 26, 9))
->other.x : Symbol(x, Decl(privateInstanceVisibility.ts, 26, 9))
+>x : Symbol(C.x, Decl(privateInstanceVisibility.ts, 26, 9))
+>other.x : Symbol(C.x, Decl(privateInstanceVisibility.ts, 26, 9))
 >other : Symbol(other, Decl(privateInstanceVisibility.ts, 32, 10))
->x : Symbol(x, Decl(privateInstanceVisibility.ts, 26, 9))
+>x : Symbol(C.x, Decl(privateInstanceVisibility.ts, 26, 9))
 
     }
 }
diff --git a/tests/baselines/reference/privatePropertyUsingObjectType.symbols b/tests/baselines/reference/privatePropertyUsingObjectType.symbols
index 094294b6dc0..ac968385afa 100644
--- a/tests/baselines/reference/privatePropertyUsingObjectType.symbols
+++ b/tests/baselines/reference/privatePropertyUsingObjectType.symbols
@@ -3,22 +3,22 @@ export class FilterManager {
 >FilterManager : Symbol(FilterManager, Decl(privatePropertyUsingObjectType.ts, 0, 0))
 
     private _filterProviders: { index: IFilterProvider; };
->_filterProviders : Symbol(_filterProviders, Decl(privatePropertyUsingObjectType.ts, 0, 28))
+>_filterProviders : Symbol(FilterManager._filterProviders, Decl(privatePropertyUsingObjectType.ts, 0, 28))
 >index : Symbol(index, Decl(privatePropertyUsingObjectType.ts, 1, 31))
 >IFilterProvider : Symbol(IFilterProvider, Decl(privatePropertyUsingObjectType.ts, 5, 1))
 
     private _filterProviders2: { [index: number]: IFilterProvider; };
->_filterProviders2 : Symbol(_filterProviders2, Decl(privatePropertyUsingObjectType.ts, 1, 58))
+>_filterProviders2 : Symbol(FilterManager._filterProviders2, Decl(privatePropertyUsingObjectType.ts, 1, 58))
 >index : Symbol(index, Decl(privatePropertyUsingObjectType.ts, 2, 34))
 >IFilterProvider : Symbol(IFilterProvider, Decl(privatePropertyUsingObjectType.ts, 5, 1))
 
     private _filterProviders3: { (index: number): IFilterProvider; };
->_filterProviders3 : Symbol(_filterProviders3, Decl(privatePropertyUsingObjectType.ts, 2, 69))
+>_filterProviders3 : Symbol(FilterManager._filterProviders3, Decl(privatePropertyUsingObjectType.ts, 2, 69))
 >index : Symbol(index, Decl(privatePropertyUsingObjectType.ts, 3, 34))
 >IFilterProvider : Symbol(IFilterProvider, Decl(privatePropertyUsingObjectType.ts, 5, 1))
 
     private _filterProviders4: (index: number) => IFilterProvider;
->_filterProviders4 : Symbol(_filterProviders4, Decl(privatePropertyUsingObjectType.ts, 3, 69))
+>_filterProviders4 : Symbol(FilterManager._filterProviders4, Decl(privatePropertyUsingObjectType.ts, 3, 69))
 >index : Symbol(index, Decl(privatePropertyUsingObjectType.ts, 4, 32))
 >IFilterProvider : Symbol(IFilterProvider, Decl(privatePropertyUsingObjectType.ts, 5, 1))
 }
diff --git a/tests/baselines/reference/privateProtectedMembersAreNotAccessibleDestructuring.errors.txt b/tests/baselines/reference/privateProtectedMembersAreNotAccessibleDestructuring.errors.txt
new file mode 100644
index 00000000000..40568c4fb85
--- /dev/null
+++ b/tests/baselines/reference/privateProtectedMembersAreNotAccessibleDestructuring.errors.txt
@@ -0,0 +1,45 @@
+tests/cases/conformance/classes/members/accessibility/privateProtectedMembersAreNotAccessibleDestructuring.ts(12,13): error TS2341: Property 'priv' is private and only accessible within class 'K'.
+tests/cases/conformance/classes/members/accessibility/privateProtectedMembersAreNotAccessibleDestructuring.ts(17,5): error TS2341: Property 'priv' is private and only accessible within class 'K'.
+tests/cases/conformance/classes/members/accessibility/privateProtectedMembersAreNotAccessibleDestructuring.ts(18,5): error TS2445: Property 'prot' is protected and only accessible within class 'K' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/privateProtectedMembersAreNotAccessibleDestructuring.ts(19,5): error TS2341: Property 'privateMethod' is private and only accessible within class 'K'.
+tests/cases/conformance/classes/members/accessibility/privateProtectedMembersAreNotAccessibleDestructuring.ts(20,5): error TS2341: Property 'priv' is private and only accessible within class 'K'.
+tests/cases/conformance/classes/members/accessibility/privateProtectedMembersAreNotAccessibleDestructuring.ts(20,5): error TS2341: Property 'privateMethod' is private and only accessible within class 'K'.
+tests/cases/conformance/classes/members/accessibility/privateProtectedMembersAreNotAccessibleDestructuring.ts(20,5): error TS2445: Property 'prot' is protected and only accessible within class 'K' and its subclasses.
+
+
+==== tests/cases/conformance/classes/members/accessibility/privateProtectedMembersAreNotAccessibleDestructuring.ts (7 errors) ====
+    class K {
+        private priv;
+        protected prot;
+        private privateMethod() { }
+        m() {
+            let { priv: a, prot: b } = this; // ok
+            let { priv, prot } = new K(); // ok
+        }
+    }
+    class C extends K {
+        m2() {
+            let { priv: a } = this; // error
+                ~~~~~~~~~~~
+!!! error TS2341: Property 'priv' is private and only accessible within class 'K'.
+            let { prot: b } = this; // ok
+        }
+    }
+    let k = new K();
+    let { priv } = k; // error 
+        ~~~~~~~~
+!!! error TS2341: Property 'priv' is private and only accessible within class 'K'.
+    let { prot } = k; // error
+        ~~~~~~~~
+!!! error TS2445: Property 'prot' is protected and only accessible within class 'K' and its subclasses.
+    let { privateMethod } = k; // error
+        ~~~~~~~~~~~~~~~~~
+!!! error TS2341: Property 'privateMethod' is private and only accessible within class 'K'.
+    let { priv: a, prot: b, privateMethod: f } = k; // error
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2341: Property 'priv' is private and only accessible within class 'K'.
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2341: Property 'privateMethod' is private and only accessible within class 'K'.
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2445: Property 'prot' is protected and only accessible within class 'K' and its subclasses.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/privateProtectedMembersAreNotAccessibleDestructuring.js b/tests/baselines/reference/privateProtectedMembersAreNotAccessibleDestructuring.js
new file mode 100644
index 00000000000..058a6ba1b65
--- /dev/null
+++ b/tests/baselines/reference/privateProtectedMembersAreNotAccessibleDestructuring.js
@@ -0,0 +1,55 @@
+//// [privateProtectedMembersAreNotAccessibleDestructuring.ts]
+class K {
+    private priv;
+    protected prot;
+    private privateMethod() { }
+    m() {
+        let { priv: a, prot: b } = this; // ok
+        let { priv, prot } = new K(); // ok
+    }
+}
+class C extends K {
+    m2() {
+        let { priv: a } = this; // error
+        let { prot: b } = this; // ok
+    }
+}
+let k = new K();
+let { priv } = k; // error 
+let { prot } = k; // error
+let { privateMethod } = k; // error
+let { priv: a, prot: b, privateMethod: f } = k; // error
+
+
+//// [privateProtectedMembersAreNotAccessibleDestructuring.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 K = (function () {
+    function K() {
+    }
+    K.prototype.privateMethod = function () { };
+    K.prototype.m = function () {
+        var _a = this, a = _a.priv, b = _a.prot; // ok
+        var _b = new K(), priv = _b.priv, prot = _b.prot; // ok
+    };
+    return K;
+}());
+var C = (function (_super) {
+    __extends(C, _super);
+    function C() {
+        _super.apply(this, arguments);
+    }
+    C.prototype.m2 = function () {
+        var a = this.priv; // error
+        var b = this.prot; // ok
+    };
+    return C;
+}(K));
+var k = new K();
+var priv = k.priv; // error 
+var prot = k.prot; // error
+var privateMethod = k.privateMethod; // error
+var a = k.priv, b = k.prot, f = k.privateMethod; // error
diff --git a/tests/baselines/reference/privateStaticMemberAccessibility.errors.txt b/tests/baselines/reference/privateStaticMemberAccessibility.errors.txt
index 4ec16f02045..4c6b8328f75 100644
--- a/tests/baselines/reference/privateStaticMemberAccessibility.errors.txt
+++ b/tests/baselines/reference/privateStaticMemberAccessibility.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/conformance/classes/members/accessibility/privateStaticMemberAccessibility.ts(6,18): error TS2341: Property 'foo' is private and only accessible within class 'Base'.
-tests/cases/conformance/classes/members/accessibility/privateStaticMemberAccessibility.ts(7,18): error TS2341: Property 'foo' is private and only accessible within class 'Base'.
+tests/cases/conformance/classes/members/accessibility/privateStaticMemberAccessibility.ts(6,23): error TS2341: Property 'foo' is private and only accessible within class 'Base'.
+tests/cases/conformance/classes/members/accessibility/privateStaticMemberAccessibility.ts(7,23): error TS2341: Property 'foo' is private and only accessible within class 'Base'.
 
 
 ==== tests/cases/conformance/classes/members/accessibility/privateStaticMemberAccessibility.ts (2 errors) ====
@@ -9,9 +9,9 @@ tests/cases/conformance/classes/members/accessibility/privateStaticMemberAccessi
     
     class Derived extends Base {
         static bar = Base.foo; // error
-                     ~~~~~~~~
+                          ~~~
 !!! error TS2341: Property 'foo' is private and only accessible within class 'Base'.
         bing = () => Base.foo; // error
-                     ~~~~~~~~
+                          ~~~
 !!! error TS2341: Property 'foo' is private and only accessible within class 'Base'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/privateStaticNotAccessibleInClodule.errors.txt b/tests/baselines/reference/privateStaticNotAccessibleInClodule.errors.txt
index a5834b6cd0f..a5fd1d76400 100644
--- a/tests/baselines/reference/privateStaticNotAccessibleInClodule.errors.txt
+++ b/tests/baselines/reference/privateStaticNotAccessibleInClodule.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/classes/members/accessibility/privateStaticNotAccessibleInClodule.ts(9,20): error TS2341: Property 'bar' is private and only accessible within class 'C'.
+tests/cases/conformance/classes/members/accessibility/privateStaticNotAccessibleInClodule.ts(9,22): error TS2341: Property 'bar' is private and only accessible within class 'C'.
 
 
 ==== tests/cases/conformance/classes/members/accessibility/privateStaticNotAccessibleInClodule.ts (1 errors) ====
@@ -11,6 +11,6 @@ tests/cases/conformance/classes/members/accessibility/privateStaticNotAccessible
     
     module C {
         export var y = C.bar; // error
-                       ~~~~~
+                         ~~~
 !!! error TS2341: Property 'bar' is private and only accessible within class 'C'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/privateStaticNotAccessibleInClodule2.errors.txt b/tests/baselines/reference/privateStaticNotAccessibleInClodule2.errors.txt
index 950649ee4b2..2d0534b02c7 100644
--- a/tests/baselines/reference/privateStaticNotAccessibleInClodule2.errors.txt
+++ b/tests/baselines/reference/privateStaticNotAccessibleInClodule2.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/classes/members/accessibility/privateStaticNotAccessibleInClodule2.ts(13,20): error TS2341: Property 'bar' is private and only accessible within class 'C'.
+tests/cases/conformance/classes/members/accessibility/privateStaticNotAccessibleInClodule2.ts(13,22): error TS2341: Property 'bar' is private and only accessible within class 'C'.
 
 
 ==== tests/cases/conformance/classes/members/accessibility/privateStaticNotAccessibleInClodule2.ts (1 errors) ====
@@ -15,6 +15,6 @@ tests/cases/conformance/classes/members/accessibility/privateStaticNotAccessible
     
     module D {
         export var y = D.bar; // error
-                       ~~~~~
+                         ~~~
 !!! error TS2341: Property 'bar' is private and only accessible within class 'C'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/privateVisibility.errors.txt b/tests/baselines/reference/privateVisibility.errors.txt
index 88784706f43..fc4889f82a9 100644
--- a/tests/baselines/reference/privateVisibility.errors.txt
+++ b/tests/baselines/reference/privateVisibility.errors.txt
@@ -1,6 +1,6 @@
-tests/cases/compiler/privateVisibility.ts(9,1): error TS2341: Property 'privMeth' is private and only accessible within class 'Foo'.
-tests/cases/compiler/privateVisibility.ts(10,1): error TS2341: Property 'privProp' is private and only accessible within class 'Foo'.
-tests/cases/compiler/privateVisibility.ts(24,1): error TS2341: Property 'priv' is private and only accessible within class 'C'.
+tests/cases/compiler/privateVisibility.ts(9,3): error TS2341: Property 'privMeth' is private and only accessible within class 'Foo'.
+tests/cases/compiler/privateVisibility.ts(10,3): error TS2341: Property 'privProp' is private and only accessible within class 'Foo'.
+tests/cases/compiler/privateVisibility.ts(24,3): error TS2341: Property 'priv' is private and only accessible within class 'C'.
 
 
 ==== tests/cases/compiler/privateVisibility.ts (3 errors) ====
@@ -13,10 +13,10 @@ tests/cases/compiler/privateVisibility.ts(24,1): error TS2341: Property 'priv' i
     
     var f = new Foo();
     f.privMeth(); // should not work
-    ~~~~~~~~~~
+      ~~~~~~~~
 !!! error TS2341: Property 'privMeth' is private and only accessible within class 'Foo'.
     f.privProp; // should not work
-    ~~~~~~~~~~
+      ~~~~~~~~
 !!! error TS2341: Property 'privProp' is private and only accessible within class 'Foo'.
     
     f.pubMeth(); // should work
@@ -32,7 +32,7 @@ tests/cases/compiler/privateVisibility.ts(24,1): error TS2341: Property 'priv' i
     
     c.pub; // should work
     c.priv; // should not work
-    ~~~~~~
+      ~~~~
 !!! error TS2341: Property 'priv' is private and only accessible within class 'C'.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/privateVisibles.symbols b/tests/baselines/reference/privateVisibles.symbols
index 5dda2315add..0d5d0105737 100644
--- a/tests/baselines/reference/privateVisibles.symbols
+++ b/tests/baselines/reference/privateVisibles.symbols
@@ -3,21 +3,21 @@ class Foo {
 >Foo : Symbol(Foo, Decl(privateVisibles.ts, 0, 0))
 
 	private pvar = 0;
->pvar : Symbol(pvar, Decl(privateVisibles.ts, 0, 11))
+>pvar : Symbol(Foo.pvar, Decl(privateVisibles.ts, 0, 11))
 
 	constructor() {
 	    var n = this.pvar;
 >n : Symbol(n, Decl(privateVisibles.ts, 3, 8))
->this.pvar : Symbol(pvar, Decl(privateVisibles.ts, 0, 11))
+>this.pvar : Symbol(Foo.pvar, Decl(privateVisibles.ts, 0, 11))
 >this : Symbol(Foo, Decl(privateVisibles.ts, 0, 0))
->pvar : Symbol(pvar, Decl(privateVisibles.ts, 0, 11))
+>pvar : Symbol(Foo.pvar, Decl(privateVisibles.ts, 0, 11))
 	}
 
 	public meth() { var q = this.pvar;}
->meth : Symbol(meth, Decl(privateVisibles.ts, 4, 2))
+>meth : Symbol(Foo.meth, Decl(privateVisibles.ts, 4, 2))
 >q : Symbol(q, Decl(privateVisibles.ts, 6, 20))
->this.pvar : Symbol(pvar, Decl(privateVisibles.ts, 0, 11))
+>this.pvar : Symbol(Foo.pvar, Decl(privateVisibles.ts, 0, 11))
 >this : Symbol(Foo, Decl(privateVisibles.ts, 0, 0))
->pvar : Symbol(pvar, Decl(privateVisibles.ts, 0, 11))
+>pvar : Symbol(Foo.pvar, Decl(privateVisibles.ts, 0, 11))
 }
 
diff --git a/tests/baselines/reference/project/declarationDir/amd/a.js b/tests/baselines/reference/project/declarationDir/amd/a.js
new file mode 100644
index 00000000000..331c004bd67
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir/amd/a.js
@@ -0,0 +1,9 @@
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var A = (function () {
+        function A() {
+        }
+        return A;
+    }());
+    exports.A = A;
+});
diff --git a/tests/baselines/reference/project/declarationDir/amd/declarationDir.json b/tests/baselines/reference/project/declarationDir/amd/declarationDir.json
new file mode 100644
index 00000000000..83e17dc949c
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir/amd/declarationDir.json
@@ -0,0 +1,26 @@
+{
+    "scenario": "declarationDir: specify declarationDir only",
+    "projectRoot": "tests/cases/projects/declarationDir",
+    "inputFiles": [
+        "a.ts",
+        "subfolder/b.ts",
+        "subfolder/c.ts"
+    ],
+    "declaration": true,
+    "declarationDir": "declarations",
+    "baselineCheck": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "subfolder/b.ts",
+        "a.ts",
+        "subfolder/c.ts"
+    ],
+    "emittedFiles": [
+        "subfolder/b.js",
+        "declarations/subfolder/b.d.ts",
+        "a.js",
+        "declarations/a.d.ts",
+        "subfolder/c.js",
+        "declarations/subfolder/c.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationDir/amd/declarations/a.d.ts b/tests/baselines/reference/project/declarationDir/amd/declarations/a.d.ts
new file mode 100644
index 00000000000..d8c7642c262
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir/amd/declarations/a.d.ts
@@ -0,0 +1,4 @@
+import { B } from './subfolder/b';
+export declare class A {
+    b: B;
+}
diff --git a/tests/baselines/reference/project/declarationDir/amd/declarations/subfolder/b.d.ts b/tests/baselines/reference/project/declarationDir/amd/declarations/subfolder/b.d.ts
new file mode 100644
index 00000000000..a03032c2d62
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir/amd/declarations/subfolder/b.d.ts
@@ -0,0 +1,2 @@
+export declare class B {
+}
diff --git a/tests/baselines/reference/project/declarationDir/amd/declarations/subfolder/c.d.ts b/tests/baselines/reference/project/declarationDir/amd/declarations/subfolder/c.d.ts
new file mode 100644
index 00000000000..c45525d0c5f
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir/amd/declarations/subfolder/c.d.ts
@@ -0,0 +1,4 @@
+import { A } from '../a';
+export declare class C {
+    a: A;
+}
diff --git a/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js b/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js
new file mode 100644
index 00000000000..e2cdda8530b
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js
@@ -0,0 +1,9 @@
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var B = (function () {
+        function B() {
+        }
+        return B;
+    }());
+    exports.B = B;
+});
diff --git a/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js b/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js
new file mode 100644
index 00000000000..212511f2bf5
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js
@@ -0,0 +1,9 @@
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var C = (function () {
+        function C() {
+        }
+        return C;
+    }());
+    exports.C = C;
+});
diff --git a/tests/baselines/reference/project/declarationDir/node/a.js b/tests/baselines/reference/project/declarationDir/node/a.js
new file mode 100644
index 00000000000..35f5adf27f0
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir/node/a.js
@@ -0,0 +1,7 @@
+"use strict";
+var A = (function () {
+    function A() {
+    }
+    return A;
+}());
+exports.A = A;
diff --git a/tests/baselines/reference/project/declarationDir/node/declarationDir.json b/tests/baselines/reference/project/declarationDir/node/declarationDir.json
new file mode 100644
index 00000000000..83e17dc949c
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir/node/declarationDir.json
@@ -0,0 +1,26 @@
+{
+    "scenario": "declarationDir: specify declarationDir only",
+    "projectRoot": "tests/cases/projects/declarationDir",
+    "inputFiles": [
+        "a.ts",
+        "subfolder/b.ts",
+        "subfolder/c.ts"
+    ],
+    "declaration": true,
+    "declarationDir": "declarations",
+    "baselineCheck": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "subfolder/b.ts",
+        "a.ts",
+        "subfolder/c.ts"
+    ],
+    "emittedFiles": [
+        "subfolder/b.js",
+        "declarations/subfolder/b.d.ts",
+        "a.js",
+        "declarations/a.d.ts",
+        "subfolder/c.js",
+        "declarations/subfolder/c.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationDir/node/declarations/a.d.ts b/tests/baselines/reference/project/declarationDir/node/declarations/a.d.ts
new file mode 100644
index 00000000000..d8c7642c262
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir/node/declarations/a.d.ts
@@ -0,0 +1,4 @@
+import { B } from './subfolder/b';
+export declare class A {
+    b: B;
+}
diff --git a/tests/baselines/reference/project/declarationDir/node/declarations/subfolder/b.d.ts b/tests/baselines/reference/project/declarationDir/node/declarations/subfolder/b.d.ts
new file mode 100644
index 00000000000..a03032c2d62
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir/node/declarations/subfolder/b.d.ts
@@ -0,0 +1,2 @@
+export declare class B {
+}
diff --git a/tests/baselines/reference/project/declarationDir/node/declarations/subfolder/c.d.ts b/tests/baselines/reference/project/declarationDir/node/declarations/subfolder/c.d.ts
new file mode 100644
index 00000000000..c45525d0c5f
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir/node/declarations/subfolder/c.d.ts
@@ -0,0 +1,4 @@
+import { A } from '../a';
+export declare class C {
+    a: A;
+}
diff --git a/tests/baselines/reference/project/declarationDir/node/subfolder/b.js b/tests/baselines/reference/project/declarationDir/node/subfolder/b.js
new file mode 100644
index 00000000000..7b46df97ac3
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir/node/subfolder/b.js
@@ -0,0 +1,7 @@
+"use strict";
+var B = (function () {
+    function B() {
+    }
+    return B;
+}());
+exports.B = B;
diff --git a/tests/baselines/reference/project/declarationDir/node/subfolder/c.js b/tests/baselines/reference/project/declarationDir/node/subfolder/c.js
new file mode 100644
index 00000000000..65238579edc
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir/node/subfolder/c.js
@@ -0,0 +1,7 @@
+"use strict";
+var C = (function () {
+    function C() {
+    }
+    return C;
+}());
+exports.C = C;
diff --git a/tests/baselines/reference/project/declarationDir2/amd/declarationDir2.json b/tests/baselines/reference/project/declarationDir2/amd/declarationDir2.json
new file mode 100644
index 00000000000..a746ea58a7c
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir2/amd/declarationDir2.json
@@ -0,0 +1,27 @@
+{
+    "scenario": "declarationDir: specify declarationDir with outDir",
+    "projectRoot": "tests/cases/projects/declarationDir",
+    "inputFiles": [
+        "a.ts",
+        "subfolder/b.ts",
+        "subfolder/c.ts"
+    ],
+    "outDir": "out",
+    "declaration": true,
+    "declarationDir": "declarations",
+    "baselineCheck": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "subfolder/b.ts",
+        "a.ts",
+        "subfolder/c.ts"
+    ],
+    "emittedFiles": [
+        "out/subfolder/b.js",
+        "declarations/subfolder/b.d.ts",
+        "out/a.js",
+        "declarations/a.d.ts",
+        "out/subfolder/c.js",
+        "declarations/subfolder/c.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationDir2/amd/declarations/a.d.ts b/tests/baselines/reference/project/declarationDir2/amd/declarations/a.d.ts
new file mode 100644
index 00000000000..d8c7642c262
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir2/amd/declarations/a.d.ts
@@ -0,0 +1,4 @@
+import { B } from './subfolder/b';
+export declare class A {
+    b: B;
+}
diff --git a/tests/baselines/reference/project/declarationDir2/amd/declarations/subfolder/b.d.ts b/tests/baselines/reference/project/declarationDir2/amd/declarations/subfolder/b.d.ts
new file mode 100644
index 00000000000..a03032c2d62
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir2/amd/declarations/subfolder/b.d.ts
@@ -0,0 +1,2 @@
+export declare class B {
+}
diff --git a/tests/baselines/reference/project/declarationDir2/amd/declarations/subfolder/c.d.ts b/tests/baselines/reference/project/declarationDir2/amd/declarations/subfolder/c.d.ts
new file mode 100644
index 00000000000..c45525d0c5f
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir2/amd/declarations/subfolder/c.d.ts
@@ -0,0 +1,4 @@
+import { A } from '../a';
+export declare class C {
+    a: A;
+}
diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/a.js b/tests/baselines/reference/project/declarationDir2/amd/out/a.js
new file mode 100644
index 00000000000..331c004bd67
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir2/amd/out/a.js
@@ -0,0 +1,9 @@
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var A = (function () {
+        function A() {
+        }
+        return A;
+    }());
+    exports.A = A;
+});
diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js
new file mode 100644
index 00000000000..e2cdda8530b
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js
@@ -0,0 +1,9 @@
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var B = (function () {
+        function B() {
+        }
+        return B;
+    }());
+    exports.B = B;
+});
diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js
new file mode 100644
index 00000000000..212511f2bf5
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js
@@ -0,0 +1,9 @@
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var C = (function () {
+        function C() {
+        }
+        return C;
+    }());
+    exports.C = C;
+});
diff --git a/tests/baselines/reference/project/declarationDir2/node/declarationDir2.json b/tests/baselines/reference/project/declarationDir2/node/declarationDir2.json
new file mode 100644
index 00000000000..a746ea58a7c
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir2/node/declarationDir2.json
@@ -0,0 +1,27 @@
+{
+    "scenario": "declarationDir: specify declarationDir with outDir",
+    "projectRoot": "tests/cases/projects/declarationDir",
+    "inputFiles": [
+        "a.ts",
+        "subfolder/b.ts",
+        "subfolder/c.ts"
+    ],
+    "outDir": "out",
+    "declaration": true,
+    "declarationDir": "declarations",
+    "baselineCheck": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "subfolder/b.ts",
+        "a.ts",
+        "subfolder/c.ts"
+    ],
+    "emittedFiles": [
+        "out/subfolder/b.js",
+        "declarations/subfolder/b.d.ts",
+        "out/a.js",
+        "declarations/a.d.ts",
+        "out/subfolder/c.js",
+        "declarations/subfolder/c.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationDir2/node/declarations/a.d.ts b/tests/baselines/reference/project/declarationDir2/node/declarations/a.d.ts
new file mode 100644
index 00000000000..d8c7642c262
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir2/node/declarations/a.d.ts
@@ -0,0 +1,4 @@
+import { B } from './subfolder/b';
+export declare class A {
+    b: B;
+}
diff --git a/tests/baselines/reference/project/declarationDir2/node/declarations/subfolder/b.d.ts b/tests/baselines/reference/project/declarationDir2/node/declarations/subfolder/b.d.ts
new file mode 100644
index 00000000000..a03032c2d62
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir2/node/declarations/subfolder/b.d.ts
@@ -0,0 +1,2 @@
+export declare class B {
+}
diff --git a/tests/baselines/reference/project/declarationDir2/node/declarations/subfolder/c.d.ts b/tests/baselines/reference/project/declarationDir2/node/declarations/subfolder/c.d.ts
new file mode 100644
index 00000000000..c45525d0c5f
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir2/node/declarations/subfolder/c.d.ts
@@ -0,0 +1,4 @@
+import { A } from '../a';
+export declare class C {
+    a: A;
+}
diff --git a/tests/baselines/reference/project/declarationDir2/node/out/a.js b/tests/baselines/reference/project/declarationDir2/node/out/a.js
new file mode 100644
index 00000000000..35f5adf27f0
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir2/node/out/a.js
@@ -0,0 +1,7 @@
+"use strict";
+var A = (function () {
+    function A() {
+    }
+    return A;
+}());
+exports.A = A;
diff --git a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js
new file mode 100644
index 00000000000..7b46df97ac3
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js
@@ -0,0 +1,7 @@
+"use strict";
+var B = (function () {
+    function B() {
+    }
+    return B;
+}());
+exports.B = B;
diff --git a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js
new file mode 100644
index 00000000000..65238579edc
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js
@@ -0,0 +1,7 @@
+"use strict";
+var C = (function () {
+    function C() {
+    }
+    return C;
+}());
+exports.C = C;
diff --git a/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.errors.txt b/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.errors.txt
new file mode 100644
index 00000000000..a152ace6f11
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.errors.txt
@@ -0,0 +1,19 @@
+error TS5053: Option 'declarationDir' cannot be specified with option 'out'.
+
+
+!!! error TS5053: Option 'declarationDir' cannot be specified with option 'out'.
+==== b.ts (0 errors) ====
+    export class B {
+        
+    }
+==== a.ts (0 errors) ====
+    import {B} from './subfolder/b';
+    export class A {
+        b: B;
+    }
+==== subfolder/c.ts (0 errors) ====
+    import {A} from '../a';
+    
+    export class C {
+        a: A;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.json b/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.json
new file mode 100644
index 00000000000..7c26154e17b
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.json
@@ -0,0 +1,23 @@
+{
+    "scenario": "declarationDir: specify declarationDir with bundled output file",
+    "projectRoot": "tests/cases/projects/declarationDir",
+    "inputFiles": [
+        "a.ts",
+        "subfolder/b.ts",
+        "subfolder/c.ts"
+    ],
+    "out": "out.js",
+    "declaration": true,
+    "declarationDir": "declarations",
+    "baselineCheck": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "subfolder/b.ts",
+        "a.ts",
+        "subfolder/c.ts"
+    ],
+    "emittedFiles": [
+        "out.js",
+        "out.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationDir3/amd/out.d.ts b/tests/baselines/reference/project/declarationDir3/amd/out.d.ts
new file mode 100644
index 00000000000..60950f066bc
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir3/amd/out.d.ts
@@ -0,0 +1,16 @@
+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/amd/out.js b/tests/baselines/reference/project/declarationDir3/amd/out.js
new file mode 100644
index 00000000000..6c49867c908
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir3/amd/out.js
@@ -0,0 +1,27 @@
+define("subfolder/b", ["require", "exports"], function (require, exports) {
+    "use strict";
+    var B = (function () {
+        function B() {
+        }
+        return B;
+    }());
+    exports.B = B;
+});
+define("a", ["require", "exports"], function (require, exports) {
+    "use strict";
+    var A = (function () {
+        function A() {
+        }
+        return A;
+    }());
+    exports.A = A;
+});
+define("subfolder/c", ["require", "exports"], function (require, exports) {
+    "use strict";
+    var C = (function () {
+        function C() {
+        }
+        return C;
+    }());
+    exports.C = C;
+});
diff --git a/tests/baselines/reference/project/declarationDir3/node/declarationDir3.errors.txt b/tests/baselines/reference/project/declarationDir3/node/declarationDir3.errors.txt
new file mode 100644
index 00000000000..19e15ce8fef
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir3/node/declarationDir3.errors.txt
@@ -0,0 +1,21 @@
+error TS5053: Option 'declarationDir' cannot be specified with option 'out'.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+
+
+!!! error TS5053: Option 'declarationDir' cannot be specified with option 'out'.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+==== b.ts (0 errors) ====
+    export class B {
+        
+    }
+==== a.ts (0 errors) ====
+    import {B} from './subfolder/b';
+    export class A {
+        b: B;
+    }
+==== subfolder/c.ts (0 errors) ====
+    import {A} from '../a';
+    
+    export class C {
+        a: A;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/declarationDir3/node/declarationDir3.json b/tests/baselines/reference/project/declarationDir3/node/declarationDir3.json
new file mode 100644
index 00000000000..3025d1c8d37
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir3/node/declarationDir3.json
@@ -0,0 +1,20 @@
+{
+    "scenario": "declarationDir: specify declarationDir with bundled output file",
+    "projectRoot": "tests/cases/projects/declarationDir",
+    "inputFiles": [
+        "a.ts",
+        "subfolder/b.ts",
+        "subfolder/c.ts"
+    ],
+    "out": "out.js",
+    "declaration": true,
+    "declarationDir": "declarations",
+    "baselineCheck": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "subfolder/b.ts",
+        "a.ts",
+        "subfolder/c.ts"
+    ],
+    "emittedFiles": []
+}
\ 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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/promiseChaining.symbols b/tests/baselines/reference/promiseChaining.symbols
index f13323742ce..73f0eafd5b4 100644
--- a/tests/baselines/reference/promiseChaining.symbols
+++ b/tests/baselines/reference/promiseChaining.symbols
@@ -4,11 +4,11 @@ class Chain<T> {
 >T : Symbol(T, Decl(promiseChaining.ts, 0, 12))
 
     constructor(public value: T) { }
->value : Symbol(value, Decl(promiseChaining.ts, 1, 16))
+>value : Symbol(Chain.value, Decl(promiseChaining.ts, 1, 16))
 >T : Symbol(T, Decl(promiseChaining.ts, 0, 12))
 
     then<S>(cb: (x: T) => S): Chain<S> {
->then : Symbol(then, Decl(promiseChaining.ts, 1, 36))
+>then : Symbol(Chain.then, Decl(promiseChaining.ts, 1, 36))
 >S : Symbol(S, Decl(promiseChaining.ts, 2, 9))
 >cb : Symbol(cb, Decl(promiseChaining.ts, 2, 12))
 >x : Symbol(x, Decl(promiseChaining.ts, 2, 17))
@@ -20,18 +20,18 @@ class Chain<T> {
         var result = cb(this.value);
 >result : Symbol(result, Decl(promiseChaining.ts, 3, 11))
 >cb : Symbol(cb, Decl(promiseChaining.ts, 2, 12))
->this.value : Symbol(value, Decl(promiseChaining.ts, 1, 16))
+>this.value : Symbol(Chain.value, Decl(promiseChaining.ts, 1, 16))
 >this : Symbol(Chain, Decl(promiseChaining.ts, 0, 0))
->value : Symbol(value, Decl(promiseChaining.ts, 1, 16))
+>value : Symbol(Chain.value, Decl(promiseChaining.ts, 1, 16))
 
         // should get a fresh type parameter which each then call
         var z = this.then(x => result)/*S*/.then(x => "abc")/*string*/.then(x => x.length)/*number*/; // No error
 >z : Symbol(z, Decl(promiseChaining.ts, 5, 11))
 >this.then(x => result)/*S*/.then(x => "abc")/*string*/.then : Symbol(Chain.then, Decl(promiseChaining.ts, 1, 36))
 >this.then(x => result)/*S*/.then : Symbol(Chain.then, Decl(promiseChaining.ts, 1, 36))
->this.then : Symbol(then, Decl(promiseChaining.ts, 1, 36))
+>this.then : Symbol(Chain.then, Decl(promiseChaining.ts, 1, 36))
 >this : Symbol(Chain, Decl(promiseChaining.ts, 0, 0))
->then : Symbol(then, Decl(promiseChaining.ts, 1, 36))
+>then : Symbol(Chain.then, Decl(promiseChaining.ts, 1, 36))
 >x : Symbol(x, Decl(promiseChaining.ts, 5, 26))
 >result : Symbol(result, Decl(promiseChaining.ts, 3, 11))
 >then : Symbol(Chain.then, Decl(promiseChaining.ts, 1, 36))
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/promiseIdentity.symbols b/tests/baselines/reference/promiseIdentity.symbols
index 6987154b07f..f1404eaf7b1 100644
--- a/tests/baselines/reference/promiseIdentity.symbols
+++ b/tests/baselines/reference/promiseIdentity.symbols
@@ -4,7 +4,7 @@ interface IPromise<T> {
 >T : Symbol(T, Decl(promiseIdentity.ts, 0, 19))
 
     then<U>(callback: (x: T) => IPromise<U>): IPromise<U>;
->then : Symbol(then, Decl(promiseIdentity.ts, 0, 23))
+>then : Symbol(IPromise.then, Decl(promiseIdentity.ts, 0, 23))
 >U : Symbol(U, Decl(promiseIdentity.ts, 1, 9))
 >callback : Symbol(callback, Decl(promiseIdentity.ts, 1, 12))
 >x : Symbol(x, Decl(promiseIdentity.ts, 1, 23))
@@ -19,7 +19,7 @@ interface Promise<T> {
 >T : Symbol(T, Decl(promiseIdentity.ts, 3, 18))
 
     then<U>(callback: (x: T) => Promise<U>): Promise<U>;
->then : Symbol(then, Decl(promiseIdentity.ts, 3, 22))
+>then : Symbol(Promise.then, Decl(promiseIdentity.ts, 3, 22))
 >U : Symbol(U, Decl(promiseIdentity.ts, 4, 9))
 >callback : Symbol(callback, Decl(promiseIdentity.ts, 4, 12))
 >x : Symbol(x, Decl(promiseIdentity.ts, 4, 23))
@@ -44,7 +44,7 @@ interface IPromise2<T, V> {
 >V : Symbol(V, Decl(promiseIdentity.ts, 10, 22))
 
     then<U, W>(callback: (x: T) => IPromise2<U, W>): IPromise2<W, U>;
->then : Symbol(then, Decl(promiseIdentity.ts, 10, 27))
+>then : Symbol(IPromise2.then, Decl(promiseIdentity.ts, 10, 27))
 >U : Symbol(U, Decl(promiseIdentity.ts, 11, 9))
 >W : Symbol(W, Decl(promiseIdentity.ts, 11, 11))
 >callback : Symbol(callback, Decl(promiseIdentity.ts, 11, 15))
@@ -63,7 +63,7 @@ interface Promise2<T, V> {
 >V : Symbol(V, Decl(promiseIdentity.ts, 13, 21))
 
     then<U, W>(callback: (x: V) => Promise2<U, T>): Promise2<T, W>; // Uses V instead of T in callback's parameter
->then : Symbol(then, Decl(promiseIdentity.ts, 13, 26))
+>then : Symbol(Promise2.then, Decl(promiseIdentity.ts, 13, 26))
 >U : Symbol(U, Decl(promiseIdentity.ts, 14, 9))
 >W : Symbol(W, Decl(promiseIdentity.ts, 14, 11))
 >callback : Symbol(callback, Decl(promiseIdentity.ts, 14, 15))
diff --git a/tests/baselines/reference/promiseIdentityWithAny.symbols b/tests/baselines/reference/promiseIdentityWithAny.symbols
index fedac33e280..8bcf096a0a3 100644
--- a/tests/baselines/reference/promiseIdentityWithAny.symbols
+++ b/tests/baselines/reference/promiseIdentityWithAny.symbols
@@ -5,7 +5,7 @@ interface IPromise<T, V> {
 >V : Symbol(V, Decl(promiseIdentityWithAny.ts, 0, 21))
 
     then<U, W>(callback: (x: T) => IPromise<U, W>): IPromise<U, W>;
->then : Symbol(then, Decl(promiseIdentityWithAny.ts, 0, 26))
+>then : Symbol(IPromise.then, Decl(promiseIdentityWithAny.ts, 0, 26))
 >U : Symbol(U, Decl(promiseIdentityWithAny.ts, 1, 9))
 >W : Symbol(W, Decl(promiseIdentityWithAny.ts, 1, 11))
 >callback : Symbol(callback, Decl(promiseIdentityWithAny.ts, 1, 15))
@@ -24,7 +24,7 @@ interface Promise<T, V> {
 >V : Symbol(V, Decl(promiseIdentityWithAny.ts, 3, 20))
 
     then<U, W>(callback: (x: T) => Promise<any, any>): Promise<any, any>;
->then : Symbol(then, Decl(promiseIdentityWithAny.ts, 3, 25))
+>then : Symbol(Promise.then, Decl(promiseIdentityWithAny.ts, 3, 25))
 >U : Symbol(U, Decl(promiseIdentityWithAny.ts, 4, 9))
 >W : Symbol(W, Decl(promiseIdentityWithAny.ts, 4, 11))
 >callback : Symbol(callback, Decl(promiseIdentityWithAny.ts, 4, 15))
diff --git a/tests/baselines/reference/promiseIdentityWithConstraints.symbols b/tests/baselines/reference/promiseIdentityWithConstraints.symbols
index b3f481c9e7c..00308362b18 100644
--- a/tests/baselines/reference/promiseIdentityWithConstraints.symbols
+++ b/tests/baselines/reference/promiseIdentityWithConstraints.symbols
@@ -5,7 +5,7 @@ interface IPromise<T, V> {
 >V : Symbol(V, Decl(promiseIdentityWithConstraints.ts, 0, 21))
 
     then<U extends T, W extends V>(callback: (x: T) => IPromise<U, W>): IPromise<U, W>;
->then : Symbol(then, Decl(promiseIdentityWithConstraints.ts, 0, 26))
+>then : Symbol(IPromise.then, Decl(promiseIdentityWithConstraints.ts, 0, 26))
 >U : Symbol(U, Decl(promiseIdentityWithConstraints.ts, 1, 9))
 >T : Symbol(T, Decl(promiseIdentityWithConstraints.ts, 0, 19))
 >W : Symbol(W, Decl(promiseIdentityWithConstraints.ts, 1, 21))
@@ -26,7 +26,7 @@ interface Promise<T, V> {
 >V : Symbol(V, Decl(promiseIdentityWithConstraints.ts, 3, 20))
 
     then<U extends T, W extends V>(callback: (x: T) => Promise<U, W>): Promise<U, W>;
->then : Symbol(then, Decl(promiseIdentityWithConstraints.ts, 3, 25))
+>then : Symbol(Promise.then, Decl(promiseIdentityWithConstraints.ts, 3, 25))
 >U : Symbol(U, Decl(promiseIdentityWithConstraints.ts, 4, 9))
 >T : Symbol(T, Decl(promiseIdentityWithConstraints.ts, 3, 18))
 >W : Symbol(W, Decl(promiseIdentityWithConstraints.ts, 4, 21))
diff --git a/tests/baselines/reference/promisePermutations.errors.txt b/tests/baselines/reference/promisePermutations.errors.txt
index 4edfff05a5a..65fa0981643 100644
--- a/tests/baselines/reference/promisePermutations.errors.txt
+++ b/tests/baselines/reference/promisePermutations.errors.txt
@@ -1,18 +1,18 @@
 tests/cases/compiler/promisePermutations.ts(74,70): error TS2345: Argument of type '(x: number) => IPromise<number>' is not assignable to parameter of type '(value: IPromise<number>) => IPromise<number>'.
   Types of parameters 'x' and 'value' are incompatible.
-    Type 'number' is not assignable to type 'IPromise<number>'.
+    Type 'IPromise<number>' is not assignable to type 'number'.
 tests/cases/compiler/promisePermutations.ts(79,19): error TS2345: Argument of type '(x: number, y?: string) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
   Types of parameters 'x' and 'value' are incompatible.
-    Type 'number' is not assignable to type 'string'.
+    Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/promisePermutations.ts(82,19): error TS2345: Argument of type '(x: number, y?: string) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
   Types of parameters 'x' and 'value' are incompatible.
-    Type 'number' is not assignable to type 'string'.
+    Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/promisePermutations.ts(83,19): error TS2345: Argument of type '(x: number, y?: string) => Promise<string>' is not assignable to parameter of type '(value: string) => Promise<string>'.
   Types of parameters 'x' and 'value' are incompatible.
-    Type 'number' is not assignable to type 'string'.
+    Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/promisePermutations.ts(84,19): error TS2345: Argument of type '(x: number, y?: string) => Promise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
   Types of parameters 'x' and 'value' are incompatible.
-    Type 'number' is not assignable to type 'string'.
+    Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/promisePermutations.ts(88,19): error TS2345: Argument of type '(x: number, cb: (a: string) => string) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 tests/cases/compiler/promisePermutations.ts(91,19): error TS2345: Argument of type '(x: number, cb: (a: string) => string) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 tests/cases/compiler/promisePermutations.ts(92,19): error TS2345: Argument of type '(x: number, cb: (a: string) => string) => Promise<string>' is not assignable to parameter of type '(value: string) => Promise<string>'.
@@ -23,16 +23,16 @@ tests/cases/compiler/promisePermutations.ts(101,19): error TS2345: Argument of t
 tests/cases/compiler/promisePermutations.ts(102,19): error TS2345: Argument of type '(x: number, cb: <T>(a: T) => T) => Promise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 tests/cases/compiler/promisePermutations.ts(106,19): error TS2345: Argument of type '(cb: <T>(a: T) => T) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
   Types of parameters 'cb' and 'value' are incompatible.
-    Type '<T>(a: T) => T' is not assignable to type 'string'.
+    Type 'string' is not assignable to type '<T>(a: T) => T'.
 tests/cases/compiler/promisePermutations.ts(109,19): error TS2345: Argument of type '(cb: <T>(a: T) => T) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
   Types of parameters 'cb' and 'value' are incompatible.
-    Type '<T>(a: T) => T' is not assignable to type 'string'.
+    Type 'string' is not assignable to type '<T>(a: T) => T'.
 tests/cases/compiler/promisePermutations.ts(110,19): error TS2345: Argument of type '(cb: <T>(a: T) => T) => Promise<string>' is not assignable to parameter of type '(value: string) => Promise<string>'.
   Types of parameters 'cb' and 'value' are incompatible.
-    Type '<T>(a: T) => T' is not assignable to type 'string'.
+    Type 'string' is not assignable to type '<T>(a: T) => T'.
 tests/cases/compiler/promisePermutations.ts(111,19): error TS2345: Argument of type '(cb: <T>(a: T) => T) => Promise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
   Types of parameters 'cb' and 'value' are incompatible.
-    Type '<T>(a: T) => T' is not assignable to type 'string'.
+    Type 'string' is not assignable to type '<T>(a: T) => T'.
 tests/cases/compiler/promisePermutations.ts(117,19): error TS2345: Argument of type '<T>(x: T, cb: (a: T) => T) => IPromise<T>' is not assignable to parameter of type '(value: number) => IPromise<number>'.
 tests/cases/compiler/promisePermutations.ts(120,19): error TS2345: Argument of type '<T>(x: T, cb: (a: T) => T) => IPromise<T>' is not assignable to parameter of type '(value: number) => IPromise<number>'.
 tests/cases/compiler/promisePermutations.ts(121,19): error TS2345: Argument of type '<T>(x: T, cb: (a: T) => T) => Promise<T>' is not assignable to parameter of type '(value: number) => Promise<number>'.
@@ -55,7 +55,7 @@ tests/cases/compiler/promisePermutations.ts(152,12): error TS2453: The type argu
     Types of property 'then' are incompatible.
       Type '{ <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }' is not assignable to type '{ <U>(success?: (value: number) => Promise<U>, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; }'.
         Types of parameters 'success' and 'success' are incompatible.
-          Type '(value: string) => IPromise<any>' is not assignable to type '(value: number) => Promise<any>'.
+          Type '(value: number) => Promise<any>' is not assignable to type '(value: string) => IPromise<any>'.
             Types of parameters 'value' and 'value' are incompatible.
               Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/promisePermutations.ts(156,21): error TS2345: Argument of type '{ (x: number): IPromise<number>; (x: string): IPromise<string>; }' is not assignable to parameter of type '(value: number) => IPromise<string>'.
@@ -72,7 +72,7 @@ tests/cases/compiler/promisePermutations.ts(160,21): error TS2345: Argument of t
     Types of property 'then' are incompatible.
       Type '{ <U>(success?: (value: number) => Promise<U>, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; }' is not assignable to type '{ <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }'.
         Types of parameters 'success' and 'success' are incompatible.
-          Type '(value: number) => Promise<any>' is not assignable to type '(value: string) => IPromise<any>'.
+          Type '(value: string) => IPromise<any>' is not assignable to type '(value: number) => Promise<any>'.
             Types of parameters 'value' and 'value' are incompatible.
               Type 'number' is not assignable to type 'string'.
 
@@ -155,7 +155,7 @@ tests/cases/compiler/promisePermutations.ts(160,21): error TS2345: Argument of t
                                                                          ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number) => IPromise<number>' is not assignable to parameter of type '(value: IPromise<number>) => IPromise<number>'.
 !!! error TS2345:   Types of parameters 'x' and 'value' are incompatible.
-!!! error TS2345:     Type 'number' is not assignable to type 'IPromise<number>'.
+!!! error TS2345:     Type 'IPromise<number>' is not assignable to type 'number'.
     
     var r4: IPromise<string>;
     var sIPromise: (x: any) => IPromise<string>;
@@ -164,24 +164,24 @@ tests/cases/compiler/promisePermutations.ts(160,21): error TS2345: Argument of t
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number, y?: string) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 !!! error TS2345:   Types of parameters 'x' and 'value' are incompatible.
-!!! error TS2345:     Type 'number' is not assignable to type 'string'.
+!!! error TS2345:     Type 'string' is not assignable to type 'number'.
     var r4b = r4.then(sIPromise, testFunction4, testFunction4).then(sIPromise, testFunction4, testFunction4); // ok
     var s4: Promise<string>;
     var s4a = s4.then(testFunction4, testFunction4, testFunction4); // error
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number, y?: string) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 !!! error TS2345:   Types of parameters 'x' and 'value' are incompatible.
-!!! error TS2345:     Type 'number' is not assignable to type 'string'.
+!!! error TS2345:     Type 'string' is not assignable to type 'number'.
     var s4b = s4.then(testFunction4P, testFunction4P, testFunction4P); // error 
                       ~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number, y?: string) => Promise<string>' is not assignable to parameter of type '(value: string) => Promise<string>'.
 !!! error TS2345:   Types of parameters 'x' and 'value' are incompatible.
-!!! error TS2345:     Type 'number' is not assignable to type 'string'.
+!!! error TS2345:     Type 'string' is not assignable to type 'number'.
     var s4c = s4.then(testFunction4P, testFunction4, testFunction4); // error
                       ~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number, y?: string) => Promise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 !!! error TS2345:   Types of parameters 'x' and 'value' are incompatible.
-!!! error TS2345:     Type 'number' is not assignable to type 'string'.
+!!! error TS2345:     Type 'string' is not assignable to type 'number'.
     var s4d = s4.then(sIPromise, testFunction4P, testFunction4).then(sIPromise, testFunction4P, testFunction4);
     
     var r5: IPromise<string>;
@@ -223,24 +223,24 @@ tests/cases/compiler/promisePermutations.ts(160,21): error TS2345: Argument of t
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(cb: <T>(a: T) => T) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 !!! error TS2345:   Types of parameters 'cb' and 'value' are incompatible.
-!!! error TS2345:     Type '<T>(a: T) => T' is not assignable to type 'string'.
+!!! error TS2345:     Type 'string' is not assignable to type '<T>(a: T) => T'.
     var r7b = r7.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
     var s7: Promise<string>;
     var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(cb: <T>(a: T) => T) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 !!! error TS2345:   Types of parameters 'cb' and 'value' are incompatible.
-!!! error TS2345:     Type '<T>(a: T) => T' is not assignable to type 'string'.
+!!! error TS2345:     Type 'string' is not assignable to type '<T>(a: T) => T'.
     var s7b = r7.then(testFunction7P, testFunction7P, testFunction7P); // error
                       ~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(cb: <T>(a: T) => T) => Promise<string>' is not assignable to parameter of type '(value: string) => Promise<string>'.
 !!! error TS2345:   Types of parameters 'cb' and 'value' are incompatible.
-!!! error TS2345:     Type '<T>(a: T) => T' is not assignable to type 'string'.
+!!! error TS2345:     Type 'string' is not assignable to type '<T>(a: T) => T'.
     var s7c = r7.then(testFunction7P, testFunction7, testFunction7); // error
                       ~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(cb: <T>(a: T) => T) => Promise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 !!! error TS2345:   Types of parameters 'cb' and 'value' are incompatible.
-!!! error TS2345:     Type '<T>(a: T) => T' is not assignable to type 'string'.
+!!! error TS2345:     Type 'string' is not assignable to type '<T>(a: T) => T'.
     var s7d = r7.then(sPromise, sPromise, sPromise).then(sPromise, sPromise, sPromise); // ok?
     
     var r8: IPromise<number>;
@@ -316,7 +316,7 @@ tests/cases/compiler/promisePermutations.ts(160,21): error TS2345: Argument of t
 !!! error TS2453:     Types of property 'then' are incompatible.
 !!! error TS2453:       Type '{ <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }' is not assignable to type '{ <U>(success?: (value: number) => Promise<U>, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; }'.
 !!! error TS2453:         Types of parameters 'success' and 'success' are incompatible.
-!!! error TS2453:           Type '(value: string) => IPromise<any>' is not assignable to type '(value: number) => Promise<any>'.
+!!! error TS2453:           Type '(value: number) => Promise<any>' is not assignable to type '(value: string) => IPromise<any>'.
 !!! error TS2453:             Types of parameters 'value' and 'value' are incompatible.
 !!! error TS2453:               Type 'string' is not assignable to type 'number'.
     var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
@@ -345,7 +345,7 @@ tests/cases/compiler/promisePermutations.ts(160,21): error TS2345: Argument of t
 !!! error TS2345:     Types of property 'then' are incompatible.
 !!! error TS2345:       Type '{ <U>(success?: (value: number) => Promise<U>, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; }' is not assignable to type '{ <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }'.
 !!! error TS2345:         Types of parameters 'success' and 'success' are incompatible.
-!!! error TS2345:           Type '(value: number) => Promise<any>' is not assignable to type '(value: string) => IPromise<any>'.
+!!! error TS2345:           Type '(value: string) => IPromise<any>' is not assignable to type '(value: number) => Promise<any>'.
 !!! error TS2345:             Types of parameters 'value' and 'value' are incompatible.
 !!! error TS2345:               Type 'number' is not assignable to type 'string'.
     
diff --git a/tests/baselines/reference/promisePermutations2.errors.txt b/tests/baselines/reference/promisePermutations2.errors.txt
index dda9a08b38d..0fc6f04911a 100644
--- a/tests/baselines/reference/promisePermutations2.errors.txt
+++ b/tests/baselines/reference/promisePermutations2.errors.txt
@@ -1,18 +1,18 @@
 tests/cases/compiler/promisePermutations2.ts(73,70): error TS2345: Argument of type '(x: number) => IPromise<number>' is not assignable to parameter of type '(value: IPromise<number>) => IPromise<number>'.
   Types of parameters 'x' and 'value' are incompatible.
-    Type 'number' is not assignable to type 'IPromise<number>'.
+    Type 'IPromise<number>' is not assignable to type 'number'.
 tests/cases/compiler/promisePermutations2.ts(78,19): error TS2345: Argument of type '(x: number, y?: string) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
   Types of parameters 'x' and 'value' are incompatible.
-    Type 'number' is not assignable to type 'string'.
+    Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/promisePermutations2.ts(81,19): error TS2345: Argument of type '(x: number, y?: string) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
   Types of parameters 'x' and 'value' are incompatible.
-    Type 'number' is not assignable to type 'string'.
+    Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/promisePermutations2.ts(82,19): error TS2345: Argument of type '(x: number, y?: string) => Promise<string>' is not assignable to parameter of type '(value: string) => Promise<string>'.
   Types of parameters 'x' and 'value' are incompatible.
-    Type 'number' is not assignable to type 'string'.
+    Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/promisePermutations2.ts(83,19): error TS2345: Argument of type '(x: number, y?: string) => Promise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
   Types of parameters 'x' and 'value' are incompatible.
-    Type 'number' is not assignable to type 'string'.
+    Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/promisePermutations2.ts(87,19): error TS2345: Argument of type '(x: number, cb: (a: string) => string) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 tests/cases/compiler/promisePermutations2.ts(90,19): error TS2345: Argument of type '(x: number, cb: (a: string) => string) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 tests/cases/compiler/promisePermutations2.ts(91,19): error TS2345: Argument of type '(x: number, cb: (a: string) => string) => Promise<string>' is not assignable to parameter of type '(value: string) => Promise<string>'.
@@ -23,16 +23,16 @@ tests/cases/compiler/promisePermutations2.ts(100,19): error TS2345: Argument of
 tests/cases/compiler/promisePermutations2.ts(101,19): error TS2345: Argument of type '(x: number, cb: <T>(a: T) => T) => Promise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 tests/cases/compiler/promisePermutations2.ts(105,19): error TS2345: Argument of type '(cb: <T>(a: T) => T) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
   Types of parameters 'cb' and 'value' are incompatible.
-    Type '<T>(a: T) => T' is not assignable to type 'string'.
+    Type 'string' is not assignable to type '<T>(a: T) => T'.
 tests/cases/compiler/promisePermutations2.ts(108,19): error TS2345: Argument of type '(cb: <T>(a: T) => T) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
   Types of parameters 'cb' and 'value' are incompatible.
-    Type '<T>(a: T) => T' is not assignable to type 'string'.
+    Type 'string' is not assignable to type '<T>(a: T) => T'.
 tests/cases/compiler/promisePermutations2.ts(109,19): error TS2345: Argument of type '(cb: <T>(a: T) => T) => Promise<string>' is not assignable to parameter of type '(value: string) => Promise<string>'.
   Types of parameters 'cb' and 'value' are incompatible.
-    Type '<T>(a: T) => T' is not assignable to type 'string'.
+    Type 'string' is not assignable to type '<T>(a: T) => T'.
 tests/cases/compiler/promisePermutations2.ts(110,19): error TS2345: Argument of type '(cb: <T>(a: T) => T) => Promise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
   Types of parameters 'cb' and 'value' are incompatible.
-    Type '<T>(a: T) => T' is not assignable to type 'string'.
+    Type 'string' is not assignable to type '<T>(a: T) => T'.
 tests/cases/compiler/promisePermutations2.ts(116,19): error TS2345: Argument of type '<T>(x: T, cb: (a: T) => T) => IPromise<T>' is not assignable to parameter of type '(value: number) => IPromise<number>'.
 tests/cases/compiler/promisePermutations2.ts(119,19): error TS2345: Argument of type '<T>(x: T, cb: (a: T) => T) => IPromise<T>' is not assignable to parameter of type '(value: number) => IPromise<number>'.
 tests/cases/compiler/promisePermutations2.ts(120,19): error TS2345: Argument of type '<T>(x: T, cb: (a: T) => T) => Promise<T>' is not assignable to parameter of type '(value: number) => Promise<number>'.
@@ -55,7 +55,7 @@ tests/cases/compiler/promisePermutations2.ts(151,12): error TS2453: The type arg
     Types of property 'then' are incompatible.
       Type '{ <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }' is not assignable to type '<U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void) => Promise<U>'.
         Types of parameters 'success' and 'success' are incompatible.
-          Type '(value: string) => IPromise<any>' is not assignable to type '(value: number) => any'.
+          Type '(value: number) => any' is not assignable to type '(value: string) => IPromise<any>'.
             Types of parameters 'value' and 'value' are incompatible.
               Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/promisePermutations2.ts(155,21): error TS2345: Argument of type '{ (x: number): IPromise<number>; (x: string): IPromise<string>; }' is not assignable to parameter of type '(value: number) => IPromise<string>'.
@@ -72,7 +72,7 @@ tests/cases/compiler/promisePermutations2.ts(159,21): error TS2345: Argument of
     Types of property 'then' are incompatible.
       Type '<U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void) => Promise<U>' is not assignable to type '{ <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }'.
         Types of parameters 'success' and 'success' are incompatible.
-          Type '(value: number) => any' is not assignable to type '(value: string) => IPromise<any>'.
+          Type '(value: string) => IPromise<any>' is not assignable to type '(value: number) => any'.
             Types of parameters 'value' and 'value' are incompatible.
               Type 'number' is not assignable to type 'string'.
 
@@ -154,7 +154,7 @@ tests/cases/compiler/promisePermutations2.ts(159,21): error TS2345: Argument of
                                                                          ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number) => IPromise<number>' is not assignable to parameter of type '(value: IPromise<number>) => IPromise<number>'.
 !!! error TS2345:   Types of parameters 'x' and 'value' are incompatible.
-!!! error TS2345:     Type 'number' is not assignable to type 'IPromise<number>'.
+!!! error TS2345:     Type 'IPromise<number>' is not assignable to type 'number'.
     
     var r4: IPromise<string>;
     var sIPromise: (x: any) => IPromise<string>;
@@ -163,24 +163,24 @@ tests/cases/compiler/promisePermutations2.ts(159,21): error TS2345: Argument of
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number, y?: string) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 !!! error TS2345:   Types of parameters 'x' and 'value' are incompatible.
-!!! error TS2345:     Type 'number' is not assignable to type 'string'.
+!!! error TS2345:     Type 'string' is not assignable to type 'number'.
     var r4b = r4.then(sIPromise, testFunction4, testFunction4).then(sIPromise, testFunction4, testFunction4); // ok
     var s4: Promise<string>;
     var s4a = s4.then(testFunction4, testFunction4, testFunction4); // error
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number, y?: string) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 !!! error TS2345:   Types of parameters 'x' and 'value' are incompatible.
-!!! error TS2345:     Type 'number' is not assignable to type 'string'.
+!!! error TS2345:     Type 'string' is not assignable to type 'number'.
     var s4b = s4.then(testFunction4P, testFunction4P, testFunction4P); // error 
                       ~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number, y?: string) => Promise<string>' is not assignable to parameter of type '(value: string) => Promise<string>'.
 !!! error TS2345:   Types of parameters 'x' and 'value' are incompatible.
-!!! error TS2345:     Type 'number' is not assignable to type 'string'.
+!!! error TS2345:     Type 'string' is not assignable to type 'number'.
     var s4c = s4.then(testFunction4P, testFunction4, testFunction4); // error
                       ~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number, y?: string) => Promise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 !!! error TS2345:   Types of parameters 'x' and 'value' are incompatible.
-!!! error TS2345:     Type 'number' is not assignable to type 'string'.
+!!! error TS2345:     Type 'string' is not assignable to type 'number'.
     var s4d = s4.then(sIPromise, testFunction4P, testFunction4).then(sIPromise, testFunction4P, testFunction4);
     
     var r5: IPromise<string>;
@@ -222,24 +222,24 @@ tests/cases/compiler/promisePermutations2.ts(159,21): error TS2345: Argument of
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(cb: <T>(a: T) => T) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 !!! error TS2345:   Types of parameters 'cb' and 'value' are incompatible.
-!!! error TS2345:     Type '<T>(a: T) => T' is not assignable to type 'string'.
+!!! error TS2345:     Type 'string' is not assignable to type '<T>(a: T) => T'.
     var r7b = r7.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
     var s7: Promise<string>;
     var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(cb: <T>(a: T) => T) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 !!! error TS2345:   Types of parameters 'cb' and 'value' are incompatible.
-!!! error TS2345:     Type '<T>(a: T) => T' is not assignable to type 'string'.
+!!! error TS2345:     Type 'string' is not assignable to type '<T>(a: T) => T'.
     var s7b = r7.then(testFunction7P, testFunction7P, testFunction7P); // error
                       ~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(cb: <T>(a: T) => T) => Promise<string>' is not assignable to parameter of type '(value: string) => Promise<string>'.
 !!! error TS2345:   Types of parameters 'cb' and 'value' are incompatible.
-!!! error TS2345:     Type '<T>(a: T) => T' is not assignable to type 'string'.
+!!! error TS2345:     Type 'string' is not assignable to type '<T>(a: T) => T'.
     var s7c = r7.then(testFunction7P, testFunction7, testFunction7); // error
                       ~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(cb: <T>(a: T) => T) => Promise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 !!! error TS2345:   Types of parameters 'cb' and 'value' are incompatible.
-!!! error TS2345:     Type '<T>(a: T) => T' is not assignable to type 'string'.
+!!! error TS2345:     Type 'string' is not assignable to type '<T>(a: T) => T'.
     var s7d = r7.then(sPromise, sPromise, sPromise).then(sPromise, sPromise, sPromise); // ok?
     
     var r8: IPromise<number>;
@@ -315,7 +315,7 @@ tests/cases/compiler/promisePermutations2.ts(159,21): error TS2345: Argument of
 !!! error TS2453:     Types of property 'then' are incompatible.
 !!! error TS2453:       Type '{ <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }' is not assignable to type '<U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void) => Promise<U>'.
 !!! error TS2453:         Types of parameters 'success' and 'success' are incompatible.
-!!! error TS2453:           Type '(value: string) => IPromise<any>' is not assignable to type '(value: number) => any'.
+!!! error TS2453:           Type '(value: number) => any' is not assignable to type '(value: string) => IPromise<any>'.
 !!! error TS2453:             Types of parameters 'value' and 'value' are incompatible.
 !!! error TS2453:               Type 'string' is not assignable to type 'number'.
     var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
@@ -344,7 +344,7 @@ tests/cases/compiler/promisePermutations2.ts(159,21): error TS2345: Argument of
 !!! error TS2345:     Types of property 'then' are incompatible.
 !!! error TS2345:       Type '<U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void) => Promise<U>' is not assignable to type '{ <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }'.
 !!! error TS2345:         Types of parameters 'success' and 'success' are incompatible.
-!!! error TS2345:           Type '(value: number) => any' is not assignable to type '(value: string) => IPromise<any>'.
+!!! error TS2345:           Type '(value: string) => IPromise<any>' is not assignable to type '(value: number) => any'.
 !!! error TS2345:             Types of parameters 'value' and 'value' are incompatible.
 !!! error TS2345:               Type 'number' is not assignable to type 'string'.
     
diff --git a/tests/baselines/reference/promisePermutations3.errors.txt b/tests/baselines/reference/promisePermutations3.errors.txt
index c6c2bca62a4..a1a1b3f493f 100644
--- a/tests/baselines/reference/promisePermutations3.errors.txt
+++ b/tests/baselines/reference/promisePermutations3.errors.txt
@@ -1,21 +1,21 @@
 tests/cases/compiler/promisePermutations3.ts(68,69): error TS2345: Argument of type '(x: number) => IPromise<number>' is not assignable to parameter of type '(value: IPromise<number>) => IPromise<number>'.
   Types of parameters 'x' and 'value' are incompatible.
-    Type 'number' is not assignable to type 'IPromise<number>'.
+    Type 'IPromise<number>' is not assignable to type 'number'.
 tests/cases/compiler/promisePermutations3.ts(73,70): error TS2345: Argument of type '(x: number) => IPromise<number>' is not assignable to parameter of type '(value: IPromise<number>) => IPromise<number>'.
   Types of parameters 'x' and 'value' are incompatible.
-    Type 'number' is not assignable to type 'IPromise<number>'.
+    Type 'IPromise<number>' is not assignable to type 'number'.
 tests/cases/compiler/promisePermutations3.ts(78,19): error TS2345: Argument of type '(x: number, y?: string) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
   Types of parameters 'x' and 'value' are incompatible.
-    Type 'number' is not assignable to type 'string'.
+    Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/promisePermutations3.ts(81,19): error TS2345: Argument of type '(x: number, y?: string) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
   Types of parameters 'x' and 'value' are incompatible.
-    Type 'number' is not assignable to type 'string'.
+    Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/promisePermutations3.ts(82,19): error TS2345: Argument of type '(x: number, y?: string) => Promise<string>' is not assignable to parameter of type '(value: string) => Promise<string>'.
   Types of parameters 'x' and 'value' are incompatible.
-    Type 'number' is not assignable to type 'string'.
+    Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/promisePermutations3.ts(83,19): error TS2345: Argument of type '(x: number, y?: string) => Promise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
   Types of parameters 'x' and 'value' are incompatible.
-    Type 'number' is not assignable to type 'string'.
+    Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/promisePermutations3.ts(87,19): error TS2345: Argument of type '(x: number, cb: (a: string) => string) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 tests/cases/compiler/promisePermutations3.ts(90,19): error TS2345: Argument of type '(x: number, cb: (a: string) => string) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 tests/cases/compiler/promisePermutations3.ts(91,19): error TS2345: Argument of type '(x: number, cb: (a: string) => string) => Promise<string>' is not assignable to parameter of type '(value: string) => Promise<string>'.
@@ -26,16 +26,16 @@ tests/cases/compiler/promisePermutations3.ts(100,19): error TS2345: Argument of
 tests/cases/compiler/promisePermutations3.ts(101,19): error TS2345: Argument of type '(x: number, cb: <T>(a: T) => T) => Promise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 tests/cases/compiler/promisePermutations3.ts(105,19): error TS2345: Argument of type '(cb: <T>(a: T) => T) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
   Types of parameters 'cb' and 'value' are incompatible.
-    Type '<T>(a: T) => T' is not assignable to type 'string'.
+    Type 'string' is not assignable to type '<T>(a: T) => T'.
 tests/cases/compiler/promisePermutations3.ts(108,19): error TS2345: Argument of type '(cb: <T>(a: T) => T) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
   Types of parameters 'cb' and 'value' are incompatible.
-    Type '<T>(a: T) => T' is not assignable to type 'string'.
+    Type 'string' is not assignable to type '<T>(a: T) => T'.
 tests/cases/compiler/promisePermutations3.ts(109,19): error TS2345: Argument of type '(cb: <T>(a: T) => T) => Promise<string>' is not assignable to parameter of type '(value: string) => Promise<string>'.
   Types of parameters 'cb' and 'value' are incompatible.
-    Type '<T>(a: T) => T' is not assignable to type 'string'.
+    Type 'string' is not assignable to type '<T>(a: T) => T'.
 tests/cases/compiler/promisePermutations3.ts(110,19): error TS2345: Argument of type '(cb: <T>(a: T) => T) => Promise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
   Types of parameters 'cb' and 'value' are incompatible.
-    Type '<T>(a: T) => T' is not assignable to type 'string'.
+    Type 'string' is not assignable to type '<T>(a: T) => T'.
 tests/cases/compiler/promisePermutations3.ts(116,19): error TS2345: Argument of type '<T>(x: T, cb: (a: T) => T) => IPromise<T>' is not assignable to parameter of type '(value: number) => IPromise<number>'.
 tests/cases/compiler/promisePermutations3.ts(119,19): error TS2345: Argument of type '<T>(x: T, cb: (a: T) => T) => IPromise<T>' is not assignable to parameter of type '(value: number) => IPromise<number>'.
 tests/cases/compiler/promisePermutations3.ts(120,19): error TS2345: Argument of type '<T>(x: T, cb: (a: T) => T) => Promise<T>' is not assignable to parameter of type '(value: number) => Promise<number>'.
@@ -58,7 +58,7 @@ tests/cases/compiler/promisePermutations3.ts(151,12): error TS2453: The type arg
     Types of property 'then' are incompatible.
       Type '<U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void) => IPromise<U>' is not assignable to type '{ <U>(success?: (value: number) => Promise<U>, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; }'.
         Types of parameters 'success' and 'success' are incompatible.
-          Type '(value: string) => any' is not assignable to type '(value: number) => Promise<any>'.
+          Type '(value: number) => Promise<any>' is not assignable to type '(value: string) => any'.
             Types of parameters 'value' and 'value' are incompatible.
               Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/promisePermutations3.ts(155,21): error TS2345: Argument of type '{ (x: number): IPromise<number>; (x: string): IPromise<string>; }' is not assignable to parameter of type '(value: number) => IPromise<string>'.
@@ -75,7 +75,7 @@ tests/cases/compiler/promisePermutations3.ts(159,21): error TS2345: Argument of
     Types of property 'then' are incompatible.
       Type '{ <U>(success?: (value: number) => Promise<U>, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; }' is not assignable to type '<U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void) => IPromise<U>'.
         Types of parameters 'success' and 'success' are incompatible.
-          Type '(value: number) => Promise<any>' is not assignable to type '(value: string) => any'.
+          Type '(value: string) => any' is not assignable to type '(value: number) => Promise<any>'.
             Types of parameters 'value' and 'value' are incompatible.
               Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/promisePermutations3.ts(165,21): error TS2345: Argument of type '{ <T>(x: T): IPromise<T>; <T>(x: T, y: T): Promise<T>; }' is not assignable to parameter of type '(value: (x: any) => any) => Promise<any>'.
@@ -157,7 +157,7 @@ tests/cases/compiler/promisePermutations3.ts(165,21): error TS2345: Argument of
                                                                         ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number) => IPromise<number>' is not assignable to parameter of type '(value: IPromise<number>) => IPromise<number>'.
 !!! error TS2345:   Types of parameters 'x' and 'value' are incompatible.
-!!! error TS2345:     Type 'number' is not assignable to type 'IPromise<number>'.
+!!! error TS2345:     Type 'IPromise<number>' is not assignable to type 'number'.
     var s3: Promise<number>;
     var s3a = s3.then(testFunction3, testFunction3, testFunction3);
     var s3b = s3.then(testFunction3P, testFunction3P, testFunction3P);
@@ -166,7 +166,7 @@ tests/cases/compiler/promisePermutations3.ts(165,21): error TS2345: Argument of
                                                                          ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number) => IPromise<number>' is not assignable to parameter of type '(value: IPromise<number>) => IPromise<number>'.
 !!! error TS2345:   Types of parameters 'x' and 'value' are incompatible.
-!!! error TS2345:     Type 'number' is not assignable to type 'IPromise<number>'.
+!!! error TS2345:     Type 'IPromise<number>' is not assignable to type 'number'.
     
     var r4: IPromise<string>;
     var sIPromise: (x: any) => IPromise<string>;
@@ -175,24 +175,24 @@ tests/cases/compiler/promisePermutations3.ts(165,21): error TS2345: Argument of
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number, y?: string) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 !!! error TS2345:   Types of parameters 'x' and 'value' are incompatible.
-!!! error TS2345:     Type 'number' is not assignable to type 'string'.
+!!! error TS2345:     Type 'string' is not assignable to type 'number'.
     var r4b = r4.then(sIPromise, testFunction4, testFunction4).then(sIPromise, testFunction4, testFunction4); // ok
     var s4: Promise<string>;
     var s4a = s4.then(testFunction4, testFunction4, testFunction4); // error
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number, y?: string) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 !!! error TS2345:   Types of parameters 'x' and 'value' are incompatible.
-!!! error TS2345:     Type 'number' is not assignable to type 'string'.
+!!! error TS2345:     Type 'string' is not assignable to type 'number'.
     var s4b = s4.then(testFunction4P, testFunction4P, testFunction4P); // error 
                       ~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number, y?: string) => Promise<string>' is not assignable to parameter of type '(value: string) => Promise<string>'.
 !!! error TS2345:   Types of parameters 'x' and 'value' are incompatible.
-!!! error TS2345:     Type 'number' is not assignable to type 'string'.
+!!! error TS2345:     Type 'string' is not assignable to type 'number'.
     var s4c = s4.then(testFunction4P, testFunction4, testFunction4); // error
                       ~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: number, y?: string) => Promise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 !!! error TS2345:   Types of parameters 'x' and 'value' are incompatible.
-!!! error TS2345:     Type 'number' is not assignable to type 'string'.
+!!! error TS2345:     Type 'string' is not assignable to type 'number'.
     var s4d = s4.then(sIPromise, testFunction4P, testFunction4).then(sIPromise, testFunction4P, testFunction4);
     
     var r5: IPromise<string>;
@@ -234,24 +234,24 @@ tests/cases/compiler/promisePermutations3.ts(165,21): error TS2345: Argument of
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(cb: <T>(a: T) => T) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 !!! error TS2345:   Types of parameters 'cb' and 'value' are incompatible.
-!!! error TS2345:     Type '<T>(a: T) => T' is not assignable to type 'string'.
+!!! error TS2345:     Type 'string' is not assignable to type '<T>(a: T) => T'.
     var r7b = r7.then(sIPromise, sIPromise, sIPromise).then(sIPromise, sIPromise, sIPromise); // ok
     var s7: Promise<string>;
     var s7a = r7.then(testFunction7, testFunction7, testFunction7); // error
                       ~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(cb: <T>(a: T) => T) => IPromise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 !!! error TS2345:   Types of parameters 'cb' and 'value' are incompatible.
-!!! error TS2345:     Type '<T>(a: T) => T' is not assignable to type 'string'.
+!!! error TS2345:     Type 'string' is not assignable to type '<T>(a: T) => T'.
     var s7b = r7.then(testFunction7P, testFunction7P, testFunction7P); // error
                       ~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(cb: <T>(a: T) => T) => Promise<string>' is not assignable to parameter of type '(value: string) => Promise<string>'.
 !!! error TS2345:   Types of parameters 'cb' and 'value' are incompatible.
-!!! error TS2345:     Type '<T>(a: T) => T' is not assignable to type 'string'.
+!!! error TS2345:     Type 'string' is not assignable to type '<T>(a: T) => T'.
     var s7c = r7.then(testFunction7P, testFunction7, testFunction7); // error
                       ~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(cb: <T>(a: T) => T) => Promise<string>' is not assignable to parameter of type '(value: string) => IPromise<string>'.
 !!! error TS2345:   Types of parameters 'cb' and 'value' are incompatible.
-!!! error TS2345:     Type '<T>(a: T) => T' is not assignable to type 'string'.
+!!! error TS2345:     Type 'string' is not assignable to type '<T>(a: T) => T'.
     var s7d = r7.then(sPromise, sPromise, sPromise).then(sPromise, sPromise, sPromise); // ok?
     
     var r8: IPromise<number>;
@@ -327,7 +327,7 @@ tests/cases/compiler/promisePermutations3.ts(165,21): error TS2345: Argument of
 !!! error TS2453:     Types of property 'then' are incompatible.
 !!! error TS2453:       Type '<U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void) => IPromise<U>' is not assignable to type '{ <U>(success?: (value: number) => Promise<U>, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; }'.
 !!! error TS2453:         Types of parameters 'success' and 'success' are incompatible.
-!!! error TS2453:           Type '(value: string) => any' is not assignable to type '(value: number) => Promise<any>'.
+!!! error TS2453:           Type '(value: number) => Promise<any>' is not assignable to type '(value: string) => any'.
 !!! error TS2453:             Types of parameters 'value' and 'value' are incompatible.
 !!! error TS2453:               Type 'string' is not assignable to type 'number'.
     var s10g = s10.then(testFunctionP, nIPromise, sIPromise).then(sPromise, sIPromise, sIPromise); // ok
@@ -356,7 +356,7 @@ tests/cases/compiler/promisePermutations3.ts(165,21): error TS2345: Argument of
 !!! error TS2345:     Types of property 'then' are incompatible.
 !!! error TS2345:       Type '{ <U>(success?: (value: number) => Promise<U>, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; }' is not assignable to type '<U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void) => IPromise<U>'.
 !!! error TS2345:         Types of parameters 'success' and 'success' are incompatible.
-!!! error TS2345:           Type '(value: number) => Promise<any>' is not assignable to type '(value: string) => any'.
+!!! error TS2345:           Type '(value: string) => any' is not assignable to type '(value: number) => Promise<any>'.
 !!! error TS2345:             Types of parameters 'value' and 'value' are incompatible.
 !!! error TS2345:               Type 'number' is not assignable to type 'string'.
     
diff --git a/tests/baselines/reference/promiseTest.symbols b/tests/baselines/reference/promiseTest.symbols
index 229d3e089d0..6cf4ff98d8f 100644
--- a/tests/baselines/reference/promiseTest.symbols
+++ b/tests/baselines/reference/promiseTest.symbols
@@ -5,7 +5,7 @@ interface Promise<T> {
 >T : Symbol(T, Decl(promiseTest.ts, 1, 18))
 
     then<A>(success?: (value: T) => Promise<A>): Promise<A>;
->then : Symbol(then, Decl(promiseTest.ts, 1, 22), Decl(promiseTest.ts, 2, 60))
+>then : Symbol(Promise.then, Decl(promiseTest.ts, 1, 22), Decl(promiseTest.ts, 2, 60))
 >A : Symbol(A, Decl(promiseTest.ts, 2, 9))
 >success : Symbol(success, Decl(promiseTest.ts, 2, 12))
 >value : Symbol(value, Decl(promiseTest.ts, 2, 23))
@@ -16,7 +16,7 @@ interface Promise<T> {
 >A : Symbol(A, Decl(promiseTest.ts, 2, 9))
 
     then<B>(success?: (value: T) => B): Promise<B>;
->then : Symbol(then, Decl(promiseTest.ts, 1, 22), Decl(promiseTest.ts, 2, 60))
+>then : Symbol(Promise.then, Decl(promiseTest.ts, 1, 22), Decl(promiseTest.ts, 2, 60))
 >B : Symbol(B, Decl(promiseTest.ts, 3, 9))
 >success : Symbol(success, Decl(promiseTest.ts, 3, 12))
 >value : Symbol(value, Decl(promiseTest.ts, 3, 23))
@@ -26,7 +26,7 @@ interface Promise<T> {
 >B : Symbol(B, Decl(promiseTest.ts, 3, 9))
 
     data: T;
->data : Symbol(data, Decl(promiseTest.ts, 3, 51))
+>data : Symbol(Promise.data, Decl(promiseTest.ts, 3, 51))
 >T : Symbol(T, Decl(promiseTest.ts, 1, 18))
 }
 
diff --git a/tests/baselines/reference/promiseTypeInference.symbols b/tests/baselines/reference/promiseTypeInference.symbols
index 14a77b9cdf2..1dcf037b8b3 100644
--- a/tests/baselines/reference/promiseTypeInference.symbols
+++ b/tests/baselines/reference/promiseTypeInference.symbols
@@ -4,7 +4,7 @@ declare class Promise<T> {
 >T : Symbol(T, Decl(promiseTypeInference.ts, 0, 22))
 
     then<U>(success?: (value: T) => Promise<U>): Promise<U>;
->then : Symbol(then, Decl(promiseTypeInference.ts, 0, 26))
+>then : Symbol(Promise.then, Decl(promiseTypeInference.ts, 0, 26))
 >U : Symbol(U, Decl(promiseTypeInference.ts, 1, 9))
 >success : Symbol(success, Decl(promiseTypeInference.ts, 1, 12))
 >value : Symbol(value, Decl(promiseTypeInference.ts, 1, 23))
@@ -19,7 +19,7 @@ interface IPromise<T> {
 >T : Symbol(T, Decl(promiseTypeInference.ts, 3, 19))
 
     then<U>(success?: (value: T) => IPromise<U>): IPromise<U>;
->then : Symbol(then, Decl(promiseTypeInference.ts, 3, 23))
+>then : Symbol(IPromise.then, Decl(promiseTypeInference.ts, 3, 23))
 >U : Symbol(U, Decl(promiseTypeInference.ts, 4, 9))
 >success : Symbol(success, Decl(promiseTypeInference.ts, 4, 12))
 >value : Symbol(value, Decl(promiseTypeInference.ts, 4, 23))
diff --git a/tests/baselines/reference/promiseVoidErrorCallback.symbols b/tests/baselines/reference/promiseVoidErrorCallback.symbols
index 93e86b9ec2e..b2959f139ea 100644
--- a/tests/baselines/reference/promiseVoidErrorCallback.symbols
+++ b/tests/baselines/reference/promiseVoidErrorCallback.symbols
@@ -3,32 +3,32 @@ interface T1 {
 >T1 : Symbol(T1, Decl(promiseVoidErrorCallback.ts, 0, 0))
 
     __t1: string;
->__t1 : Symbol(__t1, Decl(promiseVoidErrorCallback.ts, 0, 14))
+>__t1 : Symbol(T1.__t1, Decl(promiseVoidErrorCallback.ts, 0, 14))
 }
 
 interface T2 {
 >T2 : Symbol(T2, Decl(promiseVoidErrorCallback.ts, 2, 1))
 
     __t2: string;
->__t2 : Symbol(__t2, Decl(promiseVoidErrorCallback.ts, 4, 14))
+>__t2 : Symbol(T2.__t2, Decl(promiseVoidErrorCallback.ts, 4, 14))
 }
 
 interface T3 {
 >T3 : Symbol(T3, Decl(promiseVoidErrorCallback.ts, 6, 1))
 
     __t3: string;
->__t3 : Symbol(__t3, Decl(promiseVoidErrorCallback.ts, 8, 14))
+>__t3 : Symbol(T3.__t3, Decl(promiseVoidErrorCallback.ts, 8, 14))
 }
 
 function f1(): Promise<T1> {
 >f1 : Symbol(f1, Decl(promiseVoidErrorCallback.ts, 10, 1))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>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, --, --))
 >T1 : Symbol(T1, Decl(promiseVoidErrorCallback.ts, 0, 0))
 
     return Promise.resolve({ __t1: "foo_t1" });
->Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->resolve : Symbol(PromiseConstructor.resolve, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>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, --, --))
+>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
 >__t1 : Symbol(__t1, Decl(promiseVoidErrorCallback.ts, 13, 28))
 }
 
@@ -47,22 +47,22 @@ function f2(x: T1): T2 {
 
 var x3 = f1()
 >x3 : Symbol(x3, Decl(promiseVoidErrorCallback.ts, 20, 3))
->f1()    .then(f2, (e: Error) => {    throw e;})    .then : Symbol(Promise.then, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->f1()    .then : Symbol(Promise.then, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>f1()    .then(f2, (e: Error) => {    throw e;})    .then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>f1()    .then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
 >f1 : Symbol(f1, Decl(promiseVoidErrorCallback.ts, 10, 1))
 
     .then(f2, (e: Error) => {
->then : Symbol(Promise.then, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
 >f2 : Symbol(f2, Decl(promiseVoidErrorCallback.ts, 14, 1))
 >e : Symbol(e, Decl(promiseVoidErrorCallback.ts, 21, 15))
->Error : Symbol(Error, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
     throw e;
 >e : Symbol(e, Decl(promiseVoidErrorCallback.ts, 21, 15))
 
 })
     .then((x: T2) => {
->then : Symbol(Promise.then, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>then : Symbol(Promise.then, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
 >x : Symbol(x, Decl(promiseVoidErrorCallback.ts, 24, 11))
 >T2 : Symbol(T2, Decl(promiseVoidErrorCallback.ts, 2, 1))
 
diff --git a/tests/baselines/reference/promises.symbols b/tests/baselines/reference/promises.symbols
index 9c25dc8ad28..623a9cfb20a 100644
--- a/tests/baselines/reference/promises.symbols
+++ b/tests/baselines/reference/promises.symbols
@@ -4,7 +4,7 @@ interface Promise<T> {
 >T : Symbol(T, Decl(promises.ts, 0, 18))
 
     then<U>(success?: (value: T) => U): Promise<U>;
->then : Symbol(then, Decl(promises.ts, 0, 22), Decl(promises.ts, 1, 51))
+>then : Symbol(Promise.then, Decl(promises.ts, 0, 22), Decl(promises.ts, 1, 51))
 >U : Symbol(U, Decl(promises.ts, 1, 9))
 >success : Symbol(success, Decl(promises.ts, 1, 12))
 >value : Symbol(value, Decl(promises.ts, 1, 23))
@@ -14,7 +14,7 @@ interface Promise<T> {
 >U : Symbol(U, Decl(promises.ts, 1, 9))
 
     then<U>(success?: (value: T) => Promise<U>): Promise<U>;
->then : Symbol(then, Decl(promises.ts, 0, 22), Decl(promises.ts, 1, 51))
+>then : Symbol(Promise.then, Decl(promises.ts, 0, 22), Decl(promises.ts, 1, 51))
 >U : Symbol(U, Decl(promises.ts, 2, 9))
 >success : Symbol(success, Decl(promises.ts, 2, 12))
 >value : Symbol(value, Decl(promises.ts, 2, 23))
@@ -25,7 +25,7 @@ interface Promise<T> {
 >U : Symbol(U, Decl(promises.ts, 2, 9))
 
     value: T;
->value : Symbol(value, Decl(promises.ts, 2, 60))
+>value : Symbol(Promise.value, Decl(promises.ts, 2, 60))
 >T : Symbol(T, Decl(promises.ts, 0, 18))
 }
 
diff --git a/tests/baselines/reference/promisesWithConstraints.symbols b/tests/baselines/reference/promisesWithConstraints.symbols
index 055f67cadc1..a180a26135c 100644
--- a/tests/baselines/reference/promisesWithConstraints.symbols
+++ b/tests/baselines/reference/promisesWithConstraints.symbols
@@ -4,7 +4,7 @@ interface Promise<T> {
 >T : Symbol(T, Decl(promisesWithConstraints.ts, 0, 18))
 
     then<U>(cb: (x: T) => Promise<U>): Promise<U>;
->then : Symbol(then, Decl(promisesWithConstraints.ts, 0, 22))
+>then : Symbol(Promise.then, Decl(promisesWithConstraints.ts, 0, 22))
 >U : Symbol(U, Decl(promisesWithConstraints.ts, 1, 9))
 >cb : Symbol(cb, Decl(promisesWithConstraints.ts, 1, 12))
 >x : Symbol(x, Decl(promisesWithConstraints.ts, 1, 17))
@@ -21,7 +21,7 @@ interface CPromise<T extends { x: any; }> {
 >x : Symbol(x, Decl(promisesWithConstraints.ts, 4, 30))
 
     then<U extends { x: any; }>(cb: (x: T) => Promise<U>): Promise<U>;
->then : Symbol(then, Decl(promisesWithConstraints.ts, 4, 43))
+>then : Symbol(CPromise.then, Decl(promisesWithConstraints.ts, 4, 43))
 >U : Symbol(U, Decl(promisesWithConstraints.ts, 5, 9))
 >x : Symbol(x, Decl(promisesWithConstraints.ts, 5, 20))
 >cb : Symbol(cb, Decl(promisesWithConstraints.ts, 5, 32))
@@ -35,12 +35,12 @@ interface CPromise<T extends { x: any; }> {
 
 interface Foo { x; }
 >Foo : Symbol(Foo, Decl(promisesWithConstraints.ts, 6, 1))
->x : Symbol(x, Decl(promisesWithConstraints.ts, 8, 15))
+>x : Symbol(Foo.x, Decl(promisesWithConstraints.ts, 8, 15))
 
 interface Bar { x; y; }
 >Bar : Symbol(Bar, Decl(promisesWithConstraints.ts, 8, 20))
->x : Symbol(x, Decl(promisesWithConstraints.ts, 9, 15))
->y : Symbol(y, Decl(promisesWithConstraints.ts, 9, 18))
+>x : Symbol(Bar.x, Decl(promisesWithConstraints.ts, 9, 15))
+>y : Symbol(Bar.y, Decl(promisesWithConstraints.ts, 9, 18))
 
 var a: Promise<Foo>;
 >a : Symbol(a, Decl(promisesWithConstraints.ts, 11, 3))
diff --git a/tests/baselines/reference/propagationOfPromiseInitialization.symbols b/tests/baselines/reference/propagationOfPromiseInitialization.symbols
index 25527f05809..ce60dd5818d 100644
--- a/tests/baselines/reference/propagationOfPromiseInitialization.symbols
+++ b/tests/baselines/reference/propagationOfPromiseInitialization.symbols
@@ -4,7 +4,7 @@ interface IPromise<T> {
 >T : Symbol(T, Decl(propagationOfPromiseInitialization.ts, 0, 19))
 
     then<TResult>(successCallback: (promiseValue: T) => TResult, errorCallback?: (reason: any) => TResult): IPromise<TResult>;
->then : Symbol(then, Decl(propagationOfPromiseInitialization.ts, 0, 23))
+>then : Symbol(IPromise.then, Decl(propagationOfPromiseInitialization.ts, 0, 23))
 >TResult : Symbol(TResult, Decl(propagationOfPromiseInitialization.ts, 1, 9))
 >successCallback : Symbol(successCallback, Decl(propagationOfPromiseInitialization.ts, 1, 18))
 >promiseValue : Symbol(promiseValue, Decl(propagationOfPromiseInitialization.ts, 1, 36))
diff --git a/tests/baselines/reference/properties.symbols b/tests/baselines/reference/properties.symbols
index 6e344f03934..c322e5ecfb2 100644
--- a/tests/baselines/reference/properties.symbols
+++ b/tests/baselines/reference/properties.symbols
@@ -4,13 +4,13 @@ class MyClass
 >MyClass : Symbol(MyClass, Decl(properties.ts, 0, 0))
 {
     public get Count(): number
->Count : Symbol(Count, Decl(properties.ts, 2, 1), Decl(properties.ts, 6, 5))
+>Count : Symbol(MyClass.Count, Decl(properties.ts, 2, 1), Decl(properties.ts, 6, 5))
     {
         return 42;
     }
 
     public set Count(value: number)
->Count : Symbol(Count, Decl(properties.ts, 2, 1), Decl(properties.ts, 6, 5))
+>Count : Symbol(MyClass.Count, Decl(properties.ts, 2, 1), Decl(properties.ts, 6, 5))
 >value : Symbol(value, Decl(properties.ts, 8, 21))
     {
         //
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints.symbols b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints.symbols
index bf5cb72a708..6fbb89f00de 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints.symbols
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints.symbols
@@ -5,10 +5,10 @@
 class C<T extends Date> {
 >C : Symbol(C, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 0, 0))
 >T : Symbol(T, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 3, 8))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     f() {
->f : Symbol(f, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 3, 25))
+>f : Symbol(C.f, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 3, 25))
 
         var x: T;
 >x : Symbol(x, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 5, 11))
@@ -31,22 +31,22 @@ var r = (new C<Date>()).f();
 >r : Symbol(r, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 11, 3))
 >(new C<Date>()).f : Symbol(C.f, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 3, 25))
 >C : Symbol(C, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 0, 0))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >f : Symbol(C.f, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 3, 25))
 
 interface I<T extends Date> {
 >I : Symbol(I, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 11, 28))
 >T : Symbol(T, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 13, 12))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     foo: T;
->foo : Symbol(foo, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 13, 29))
+>foo : Symbol(I.foo, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 13, 29))
 >T : Symbol(T, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 13, 12))
 }
 var i: I<Date>;
 >i : Symbol(i, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 16, 3))
 >I : Symbol(I, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 11, 28))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var r2 = i.foo.getDate();
 >r2 : Symbol(r2, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 17, 3))
@@ -68,14 +68,14 @@ var a: {
 
     <T extends Date>(): T;
 >T : Symbol(T, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 21, 5))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >T : Symbol(T, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 21, 5))
 }
 var r3 = a<Date>().getDate();
 >r3 : Symbol(r3, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 23, 3))
 >a<Date>().getDate : Symbol(Date.getDate, Decl(lib.d.ts, --, --))
 >a : Symbol(a, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 20, 3))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >getDate : Symbol(Date.getDate, Decl(lib.d.ts, --, --))
 
 var r3b = a()['getDate']();
@@ -89,7 +89,7 @@ var b = {
     foo: <T extends Date>(x: T) => {
 >foo : Symbol(foo, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 26, 9))
 >T : Symbol(T, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 27, 10))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 27, 26))
 >T : Symbol(T, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 27, 10))
 
@@ -111,5 +111,5 @@ var r4 = b.foo(new Date());
 >b.foo : Symbol(foo, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 26, 9))
 >b : Symbol(b, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 26, 3))
 >foo : Symbol(foo, Decl(propertyAccessOnTypeParameterWithConstraints.ts, 26, 9))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.symbols b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.symbols
index 29a3b30d450..e535e3e7e71 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.symbols
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.symbols
@@ -5,7 +5,7 @@ class A {
 >A : Symbol(A, Decl(propertyAccessOnTypeParameterWithConstraints2.ts, 0, 0))
 
     foo(): string { return ''; }
->foo : Symbol(foo, Decl(propertyAccessOnTypeParameterWithConstraints2.ts, 2, 9))
+>foo : Symbol(A.foo, Decl(propertyAccessOnTypeParameterWithConstraints2.ts, 2, 9))
 }
 
 class B extends A {
@@ -13,7 +13,7 @@ class B extends A {
 >A : Symbol(A, Decl(propertyAccessOnTypeParameterWithConstraints2.ts, 0, 0))
 
     bar(): string {
->bar : Symbol(bar, Decl(propertyAccessOnTypeParameterWithConstraints2.ts, 6, 19))
+>bar : Symbol(B.bar, Decl(propertyAccessOnTypeParameterWithConstraints2.ts, 6, 19))
 
         return '';
     }
@@ -27,7 +27,7 @@ class C<U extends A, T extends A> {
 >A : Symbol(A, Decl(propertyAccessOnTypeParameterWithConstraints2.ts, 0, 0))
 
     f() {
->f : Symbol(f, Decl(propertyAccessOnTypeParameterWithConstraints2.ts, 12, 35))
+>f : Symbol(C.f, Decl(propertyAccessOnTypeParameterWithConstraints2.ts, 12, 35))
 
         var x: U;
 >x : Symbol(x, Decl(propertyAccessOnTypeParameterWithConstraints2.ts, 14, 11))
@@ -46,7 +46,7 @@ class C<U extends A, T extends A> {
     }
 
     g(x: U) {
->g : Symbol(g, Decl(propertyAccessOnTypeParameterWithConstraints2.ts, 17, 5))
+>g : Symbol(C.g, Decl(propertyAccessOnTypeParameterWithConstraints2.ts, 17, 5))
 >x : Symbol(x, Decl(propertyAccessOnTypeParameterWithConstraints2.ts, 19, 6))
 >U : Symbol(U, Decl(propertyAccessOnTypeParameterWithConstraints2.ts, 12, 8))
 
@@ -100,7 +100,7 @@ interface I<U extends A, T extends A> {
 >A : Symbol(A, Decl(propertyAccessOnTypeParameterWithConstraints2.ts, 0, 0))
 
     foo: U;
->foo : Symbol(foo, Decl(propertyAccessOnTypeParameterWithConstraints2.ts, 40, 39))
+>foo : Symbol(I.foo, Decl(propertyAccessOnTypeParameterWithConstraints2.ts, 40, 39))
 >U : Symbol(U, Decl(propertyAccessOnTypeParameterWithConstraints2.ts, 40, 12))
 }
 //interface I<U extends T, T extends A> {
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.symbols b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.symbols
index 6d1074b14f6..c651871a7e3 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.symbols
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.symbols
@@ -5,7 +5,7 @@ class A {
 >A : Symbol(A, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 0, 0))
 
     foo(): string { return ''; }
->foo : Symbol(foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 2, 9))
+>foo : Symbol(A.foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 2, 9))
 }
 
 class B extends A {
@@ -13,7 +13,7 @@ class B extends A {
 >A : Symbol(A, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 0, 0))
 
     bar(): string {
->bar : Symbol(bar, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 6, 19))
+>bar : Symbol(B.bar, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 6, 19))
 
         return '';
     }
@@ -27,7 +27,7 @@ class C<U extends A, T extends U> {
 >U : Symbol(U, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 12, 8))
 
     f() {
->f : Symbol(f, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 12, 35))
+>f : Symbol(C.f, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 12, 35))
 
         var x: T;
 >x : Symbol(x, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 14, 11))
@@ -47,7 +47,7 @@ class C<U extends A, T extends U> {
     }
 
     g(x: U) {
->g : Symbol(g, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 18, 5))
+>g : Symbol(C.g, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 18, 5))
 >x : Symbol(x, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 20, 6))
 >U : Symbol(U, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 12, 8))
 
@@ -90,7 +90,7 @@ interface I<U extends A, T extends U> {
 >U : Symbol(U, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 30, 12))
 
     foo: T;
->foo : Symbol(foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 30, 39))
+>foo : Symbol(I.foo, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 30, 39))
 >T : Symbol(T, Decl(propertyAccessOnTypeParameterWithConstraints3.ts, 30, 24))
 }
 var i: I<A, B>;
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.symbols b/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.symbols
index 7417346a791..4ae9957f41e 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.symbols
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.symbols
@@ -4,7 +4,7 @@ class C<T> {
 >T : Symbol(T, Decl(propertyAccessOnTypeParameterWithoutConstraints.ts, 0, 8))
 
     f() {
->f : Symbol(f, Decl(propertyAccessOnTypeParameterWithoutConstraints.ts, 0, 12))
+>f : Symbol(C.f, Decl(propertyAccessOnTypeParameterWithoutConstraints.ts, 0, 12))
 
         var x: T;
 >x : Symbol(x, Decl(propertyAccessOnTypeParameterWithoutConstraints.ts, 2, 11))
@@ -34,7 +34,7 @@ interface I<T> {
 >T : Symbol(T, Decl(propertyAccessOnTypeParameterWithoutConstraints.ts, 10, 12))
 
     foo: T;
->foo : Symbol(foo, Decl(propertyAccessOnTypeParameterWithoutConstraints.ts, 10, 16))
+>foo : Symbol(I.foo, Decl(propertyAccessOnTypeParameterWithoutConstraints.ts, 10, 16))
 >T : Symbol(T, Decl(propertyAccessOnTypeParameterWithoutConstraints.ts, 10, 12))
 }
 var i: I<number>;
diff --git a/tests/baselines/reference/propertyAccessibility1.errors.txt b/tests/baselines/reference/propertyAccessibility1.errors.txt
index 2caf251b2a5..fb1b0bbf0f6 100644
--- a/tests/baselines/reference/propertyAccessibility1.errors.txt
+++ b/tests/baselines/reference/propertyAccessibility1.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/propertyAccessibility1.ts(5,1): error TS2341: Property 'privProp' is private and only accessible within class 'Foo'.
+tests/cases/compiler/propertyAccessibility1.ts(5,3): error TS2341: Property 'privProp' is private and only accessible within class 'Foo'.
 
 
 ==== tests/cases/compiler/propertyAccessibility1.ts (1 errors) ====
@@ -7,6 +7,6 @@ tests/cases/compiler/propertyAccessibility1.ts(5,1): error TS2341: Property 'pri
     }
     var f = new Foo();
     f.privProp;
-    ~~~~~~~~~~
+      ~~~~~~~~
 !!! error TS2341: Property 'privProp' is private and only accessible within class 'Foo'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/propertyAccessibility2.errors.txt b/tests/baselines/reference/propertyAccessibility2.errors.txt
index 7eb81d45ed4..4e958b8d72b 100644
--- a/tests/baselines/reference/propertyAccessibility2.errors.txt
+++ b/tests/baselines/reference/propertyAccessibility2.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/propertyAccessibility2.ts(4,9): error TS2341: Property 'x' is private and only accessible within class 'C'.
+tests/cases/compiler/propertyAccessibility2.ts(4,11): error TS2341: Property 'x' is private and only accessible within class 'C'.
 
 
 ==== tests/cases/compiler/propertyAccessibility2.ts (1 errors) ====
@@ -6,6 +6,6 @@ tests/cases/compiler/propertyAccessibility2.ts(4,9): error TS2341: Property 'x'
       private static x = 1;
     }
     var c = C.x;
-            ~~~
+              ~
 !!! error TS2341: Property 'x' is private and only accessible within class 'C'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/propertyNameWithoutTypeAnnotation.symbols b/tests/baselines/reference/propertyNameWithoutTypeAnnotation.symbols
index 45840561fa7..3c430005fca 100644
--- a/tests/baselines/reference/propertyNameWithoutTypeAnnotation.symbols
+++ b/tests/baselines/reference/propertyNameWithoutTypeAnnotation.symbols
@@ -3,14 +3,14 @@ class C {
 >C : Symbol(C, Decl(propertyNameWithoutTypeAnnotation.ts, 0, 0))
 
     foo;
->foo : Symbol(foo, Decl(propertyNameWithoutTypeAnnotation.ts, 0, 9))
+>foo : Symbol(C.foo, Decl(propertyNameWithoutTypeAnnotation.ts, 0, 9))
 }
 
 interface I {
 >I : Symbol(I, Decl(propertyNameWithoutTypeAnnotation.ts, 2, 1))
 
     foo;
->foo : Symbol(foo, Decl(propertyNameWithoutTypeAnnotation.ts, 4, 13))
+>foo : Symbol(I.foo, Decl(propertyNameWithoutTypeAnnotation.ts, 4, 13))
 }
 
 var a: {
diff --git a/tests/baselines/reference/propertyNamesOfReservedWords.symbols b/tests/baselines/reference/propertyNamesOfReservedWords.symbols
index 591fae05bd5..1ee7ee58595 100644
--- a/tests/baselines/reference/propertyNamesOfReservedWords.symbols
+++ b/tests/baselines/reference/propertyNamesOfReservedWords.symbols
@@ -3,193 +3,193 @@ class C {
 >C : Symbol(C, Decl(propertyNamesOfReservedWords.ts, 0, 0))
 
     abstract;
->abstract : Symbol(abstract, Decl(propertyNamesOfReservedWords.ts, 0, 9))
+>abstract : Symbol(C.abstract, Decl(propertyNamesOfReservedWords.ts, 0, 9))
 
     as;
->as : Symbol(as, Decl(propertyNamesOfReservedWords.ts, 1, 13))
+>as : Symbol(C.as, Decl(propertyNamesOfReservedWords.ts, 1, 13))
 
     boolean;
->boolean : Symbol(boolean, Decl(propertyNamesOfReservedWords.ts, 2, 7))
+>boolean : Symbol(C.boolean, Decl(propertyNamesOfReservedWords.ts, 2, 7))
 
     break;
->break : Symbol(break, Decl(propertyNamesOfReservedWords.ts, 3, 12))
+>break : Symbol(C.break, Decl(propertyNamesOfReservedWords.ts, 3, 12))
 
     byte;
->byte : Symbol(byte, Decl(propertyNamesOfReservedWords.ts, 4, 10))
+>byte : Symbol(C.byte, Decl(propertyNamesOfReservedWords.ts, 4, 10))
 
     case;
->case : Symbol(case, Decl(propertyNamesOfReservedWords.ts, 5, 9))
+>case : Symbol(C.case, Decl(propertyNamesOfReservedWords.ts, 5, 9))
 
     catch;
->catch : Symbol(catch, Decl(propertyNamesOfReservedWords.ts, 6, 9))
+>catch : Symbol(C.catch, Decl(propertyNamesOfReservedWords.ts, 6, 9))
 
     char;
->char : Symbol(char, Decl(propertyNamesOfReservedWords.ts, 7, 10))
+>char : Symbol(C.char, Decl(propertyNamesOfReservedWords.ts, 7, 10))
 
     class;
->class : Symbol(class, Decl(propertyNamesOfReservedWords.ts, 8, 9))
+>class : Symbol(C.class, Decl(propertyNamesOfReservedWords.ts, 8, 9))
 
     continue;
->continue : Symbol(continue, Decl(propertyNamesOfReservedWords.ts, 9, 10))
+>continue : Symbol(C.continue, Decl(propertyNamesOfReservedWords.ts, 9, 10))
 
     const;
->const : Symbol(const, Decl(propertyNamesOfReservedWords.ts, 10, 13))
+>const : Symbol(C.const, Decl(propertyNamesOfReservedWords.ts, 10, 13))
 
     debugger;
->debugger : Symbol(debugger, Decl(propertyNamesOfReservedWords.ts, 11, 10))
+>debugger : Symbol(C.debugger, Decl(propertyNamesOfReservedWords.ts, 11, 10))
 
     default;
->default : Symbol(default, Decl(propertyNamesOfReservedWords.ts, 12, 13))
+>default : Symbol(C.default, Decl(propertyNamesOfReservedWords.ts, 12, 13))
 
     delete;
->delete : Symbol(delete, Decl(propertyNamesOfReservedWords.ts, 13, 12))
+>delete : Symbol(C.delete, Decl(propertyNamesOfReservedWords.ts, 13, 12))
 
     do;
->do : Symbol(do, Decl(propertyNamesOfReservedWords.ts, 14, 11))
+>do : Symbol(C.do, Decl(propertyNamesOfReservedWords.ts, 14, 11))
 
     double;
->double : Symbol(double, Decl(propertyNamesOfReservedWords.ts, 15, 7))
+>double : Symbol(C.double, Decl(propertyNamesOfReservedWords.ts, 15, 7))
 
     else;
->else : Symbol(else, Decl(propertyNamesOfReservedWords.ts, 16, 11))
+>else : Symbol(C.else, Decl(propertyNamesOfReservedWords.ts, 16, 11))
 
     enum;
->enum : Symbol(enum, Decl(propertyNamesOfReservedWords.ts, 17, 9))
+>enum : Symbol(C.enum, Decl(propertyNamesOfReservedWords.ts, 17, 9))
 
     export;
->export : Symbol(export, Decl(propertyNamesOfReservedWords.ts, 18, 9))
+>export : Symbol(C.export, Decl(propertyNamesOfReservedWords.ts, 18, 9))
 
     extends;
->extends : Symbol(extends, Decl(propertyNamesOfReservedWords.ts, 19, 11))
+>extends : Symbol(C.extends, Decl(propertyNamesOfReservedWords.ts, 19, 11))
 
     false;
->false : Symbol(false, Decl(propertyNamesOfReservedWords.ts, 20, 12))
+>false : Symbol(C.false, Decl(propertyNamesOfReservedWords.ts, 20, 12))
 
     final;
->final : Symbol(final, Decl(propertyNamesOfReservedWords.ts, 21, 10))
+>final : Symbol(C.final, Decl(propertyNamesOfReservedWords.ts, 21, 10))
 
     finally;
->finally : Symbol(finally, Decl(propertyNamesOfReservedWords.ts, 22, 10))
+>finally : Symbol(C.finally, Decl(propertyNamesOfReservedWords.ts, 22, 10))
 
     float;
->float : Symbol(float, Decl(propertyNamesOfReservedWords.ts, 23, 12))
+>float : Symbol(C.float, Decl(propertyNamesOfReservedWords.ts, 23, 12))
 
     for;
->for : Symbol(for, Decl(propertyNamesOfReservedWords.ts, 24, 10))
+>for : Symbol(C.for, Decl(propertyNamesOfReservedWords.ts, 24, 10))
 
     function;
->function : Symbol(function, Decl(propertyNamesOfReservedWords.ts, 25, 8))
+>function : Symbol(C.function, Decl(propertyNamesOfReservedWords.ts, 25, 8))
 
     goto;
->goto : Symbol(goto, Decl(propertyNamesOfReservedWords.ts, 26, 13))
+>goto : Symbol(C.goto, Decl(propertyNamesOfReservedWords.ts, 26, 13))
 
     if;
->if : Symbol(if, Decl(propertyNamesOfReservedWords.ts, 27, 9))
+>if : Symbol(C.if, Decl(propertyNamesOfReservedWords.ts, 27, 9))
 
     implements;
->implements : Symbol(implements, Decl(propertyNamesOfReservedWords.ts, 28, 7))
+>implements : Symbol(C.implements, Decl(propertyNamesOfReservedWords.ts, 28, 7))
 
     import;
->import : Symbol(import, Decl(propertyNamesOfReservedWords.ts, 29, 15))
+>import : Symbol(C.import, Decl(propertyNamesOfReservedWords.ts, 29, 15))
 
     in;
->in : Symbol(in, Decl(propertyNamesOfReservedWords.ts, 30, 11))
+>in : Symbol(C.in, Decl(propertyNamesOfReservedWords.ts, 30, 11))
 
     instanceof;
->instanceof : Symbol(instanceof, Decl(propertyNamesOfReservedWords.ts, 31, 7))
+>instanceof : Symbol(C.instanceof, Decl(propertyNamesOfReservedWords.ts, 31, 7))
 
     int;
->int : Symbol(int, Decl(propertyNamesOfReservedWords.ts, 32, 15))
+>int : Symbol(C.int, Decl(propertyNamesOfReservedWords.ts, 32, 15))
 
     interface;
->interface : Symbol(interface, Decl(propertyNamesOfReservedWords.ts, 33, 8))
+>interface : Symbol(C.interface, Decl(propertyNamesOfReservedWords.ts, 33, 8))
 
     is;
->is : Symbol(is, Decl(propertyNamesOfReservedWords.ts, 34, 14))
+>is : Symbol(C.is, Decl(propertyNamesOfReservedWords.ts, 34, 14))
 
     long;
->long : Symbol(long, Decl(propertyNamesOfReservedWords.ts, 35, 7))
+>long : Symbol(C.long, Decl(propertyNamesOfReservedWords.ts, 35, 7))
 
     namespace;
->namespace : Symbol(namespace, Decl(propertyNamesOfReservedWords.ts, 36, 9))
+>namespace : Symbol(C.namespace, Decl(propertyNamesOfReservedWords.ts, 36, 9))
 
     native;
->native : Symbol(native, Decl(propertyNamesOfReservedWords.ts, 37, 14))
+>native : Symbol(C.native, Decl(propertyNamesOfReservedWords.ts, 37, 14))
 
     new;
->new : Symbol(new, Decl(propertyNamesOfReservedWords.ts, 38, 11))
+>new : Symbol(C.new, Decl(propertyNamesOfReservedWords.ts, 38, 11))
 
     null;
->null : Symbol(null, Decl(propertyNamesOfReservedWords.ts, 39, 8))
+>null : Symbol(C.null, Decl(propertyNamesOfReservedWords.ts, 39, 8))
 
     package;
->package : Symbol(package, Decl(propertyNamesOfReservedWords.ts, 40, 9))
+>package : Symbol(C.package, Decl(propertyNamesOfReservedWords.ts, 40, 9))
 
     private;
->private : Symbol(private, Decl(propertyNamesOfReservedWords.ts, 41, 12))
+>private : Symbol(C.private, Decl(propertyNamesOfReservedWords.ts, 41, 12))
 
     protected;
->protected : Symbol(protected, Decl(propertyNamesOfReservedWords.ts, 42, 12))
+>protected : Symbol(C.protected, Decl(propertyNamesOfReservedWords.ts, 42, 12))
 
     public;
->public : Symbol(public, Decl(propertyNamesOfReservedWords.ts, 43, 14))
+>public : Symbol(C.public, Decl(propertyNamesOfReservedWords.ts, 43, 14))
 
     return;
->return : Symbol(return, Decl(propertyNamesOfReservedWords.ts, 44, 11))
+>return : Symbol(C.return, Decl(propertyNamesOfReservedWords.ts, 44, 11))
 
     short;
->short : Symbol(short, Decl(propertyNamesOfReservedWords.ts, 45, 11))
+>short : Symbol(C.short, Decl(propertyNamesOfReservedWords.ts, 45, 11))
 
     static;
->static : Symbol(static, Decl(propertyNamesOfReservedWords.ts, 46, 10))
+>static : Symbol(C.static, Decl(propertyNamesOfReservedWords.ts, 46, 10))
 
     super;
->super : Symbol(super, Decl(propertyNamesOfReservedWords.ts, 47, 11))
+>super : Symbol(C.super, Decl(propertyNamesOfReservedWords.ts, 47, 11))
 
     switch;
->switch : Symbol(switch, Decl(propertyNamesOfReservedWords.ts, 48, 10))
+>switch : Symbol(C.switch, Decl(propertyNamesOfReservedWords.ts, 48, 10))
 
     synchronized;
->synchronized : Symbol(synchronized, Decl(propertyNamesOfReservedWords.ts, 49, 11))
+>synchronized : Symbol(C.synchronized, Decl(propertyNamesOfReservedWords.ts, 49, 11))
 
     this;
->this : Symbol(this, Decl(propertyNamesOfReservedWords.ts, 50, 17))
+>this : Symbol(C.this, Decl(propertyNamesOfReservedWords.ts, 50, 17))
 
     throw;
->throw : Symbol(throw, Decl(propertyNamesOfReservedWords.ts, 51, 9))
+>throw : Symbol(C.throw, Decl(propertyNamesOfReservedWords.ts, 51, 9))
 
     throws;
->throws : Symbol(throws, Decl(propertyNamesOfReservedWords.ts, 52, 10))
+>throws : Symbol(C.throws, Decl(propertyNamesOfReservedWords.ts, 52, 10))
 
     transient;
->transient : Symbol(transient, Decl(propertyNamesOfReservedWords.ts, 53, 11))
+>transient : Symbol(C.transient, Decl(propertyNamesOfReservedWords.ts, 53, 11))
 
     true;
->true : Symbol(true, Decl(propertyNamesOfReservedWords.ts, 54, 14))
+>true : Symbol(C.true, Decl(propertyNamesOfReservedWords.ts, 54, 14))
 
     try;
->try : Symbol(try, Decl(propertyNamesOfReservedWords.ts, 55, 9))
+>try : Symbol(C.try, Decl(propertyNamesOfReservedWords.ts, 55, 9))
 
     typeof;
->typeof : Symbol(typeof, Decl(propertyNamesOfReservedWords.ts, 56, 8))
+>typeof : Symbol(C.typeof, Decl(propertyNamesOfReservedWords.ts, 56, 8))
 
     use;
->use : Symbol(use, Decl(propertyNamesOfReservedWords.ts, 57, 11))
+>use : Symbol(C.use, Decl(propertyNamesOfReservedWords.ts, 57, 11))
 
     var;
->var : Symbol(var, Decl(propertyNamesOfReservedWords.ts, 58, 8))
+>var : Symbol(C.var, Decl(propertyNamesOfReservedWords.ts, 58, 8))
 
     void;
->void : Symbol(void, Decl(propertyNamesOfReservedWords.ts, 59, 8))
+>void : Symbol(C.void, Decl(propertyNamesOfReservedWords.ts, 59, 8))
 
     volatile;
->volatile : Symbol(volatile, Decl(propertyNamesOfReservedWords.ts, 60, 9))
+>volatile : Symbol(C.volatile, Decl(propertyNamesOfReservedWords.ts, 60, 9))
 
     while;
->while : Symbol(while, Decl(propertyNamesOfReservedWords.ts, 61, 13))
+>while : Symbol(C.while, Decl(propertyNamesOfReservedWords.ts, 61, 13))
 
     with;
->with : Symbol(with, Decl(propertyNamesOfReservedWords.ts, 62, 10))
+>with : Symbol(C.with, Decl(propertyNamesOfReservedWords.ts, 62, 10))
 }
 var c: C;
 >c : Symbol(c, Decl(propertyNamesOfReservedWords.ts, 65, 3))
@@ -211,193 +211,193 @@ interface I {
 >I : Symbol(I, Decl(propertyNamesOfReservedWords.ts, 67, 14))
 
     abstract;
->abstract : Symbol(abstract, Decl(propertyNamesOfReservedWords.ts, 69, 13))
+>abstract : Symbol(I.abstract, Decl(propertyNamesOfReservedWords.ts, 69, 13))
 
     as;
->as : Symbol(as, Decl(propertyNamesOfReservedWords.ts, 70, 13))
+>as : Symbol(I.as, Decl(propertyNamesOfReservedWords.ts, 70, 13))
 
     boolean;
->boolean : Symbol(boolean, Decl(propertyNamesOfReservedWords.ts, 71, 7))
+>boolean : Symbol(I.boolean, Decl(propertyNamesOfReservedWords.ts, 71, 7))
 
     break;
->break : Symbol(break, Decl(propertyNamesOfReservedWords.ts, 72, 12))
+>break : Symbol(I.break, Decl(propertyNamesOfReservedWords.ts, 72, 12))
 
     byte;
->byte : Symbol(byte, Decl(propertyNamesOfReservedWords.ts, 73, 10))
+>byte : Symbol(I.byte, Decl(propertyNamesOfReservedWords.ts, 73, 10))
 
     case;
->case : Symbol(case, Decl(propertyNamesOfReservedWords.ts, 74, 9))
+>case : Symbol(I.case, Decl(propertyNamesOfReservedWords.ts, 74, 9))
 
     catch;
->catch : Symbol(catch, Decl(propertyNamesOfReservedWords.ts, 75, 9))
+>catch : Symbol(I.catch, Decl(propertyNamesOfReservedWords.ts, 75, 9))
 
     char;
->char : Symbol(char, Decl(propertyNamesOfReservedWords.ts, 76, 10))
+>char : Symbol(I.char, Decl(propertyNamesOfReservedWords.ts, 76, 10))
 
     class;
->class : Symbol(class, Decl(propertyNamesOfReservedWords.ts, 77, 9))
+>class : Symbol(I.class, Decl(propertyNamesOfReservedWords.ts, 77, 9))
 
     continue;
->continue : Symbol(continue, Decl(propertyNamesOfReservedWords.ts, 78, 10))
+>continue : Symbol(I.continue, Decl(propertyNamesOfReservedWords.ts, 78, 10))
 
     const;
->const : Symbol(const, Decl(propertyNamesOfReservedWords.ts, 79, 13))
+>const : Symbol(I.const, Decl(propertyNamesOfReservedWords.ts, 79, 13))
 
     debugger;
->debugger : Symbol(debugger, Decl(propertyNamesOfReservedWords.ts, 80, 10))
+>debugger : Symbol(I.debugger, Decl(propertyNamesOfReservedWords.ts, 80, 10))
 
     default;
->default : Symbol(default, Decl(propertyNamesOfReservedWords.ts, 81, 13))
+>default : Symbol(I.default, Decl(propertyNamesOfReservedWords.ts, 81, 13))
 
     delete;
->delete : Symbol(delete, Decl(propertyNamesOfReservedWords.ts, 82, 12))
+>delete : Symbol(I.delete, Decl(propertyNamesOfReservedWords.ts, 82, 12))
 
     do;
->do : Symbol(do, Decl(propertyNamesOfReservedWords.ts, 83, 11))
+>do : Symbol(I.do, Decl(propertyNamesOfReservedWords.ts, 83, 11))
 
     double;
->double : Symbol(double, Decl(propertyNamesOfReservedWords.ts, 84, 7))
+>double : Symbol(I.double, Decl(propertyNamesOfReservedWords.ts, 84, 7))
 
     else;
->else : Symbol(else, Decl(propertyNamesOfReservedWords.ts, 85, 11))
+>else : Symbol(I.else, Decl(propertyNamesOfReservedWords.ts, 85, 11))
 
     enum;
->enum : Symbol(enum, Decl(propertyNamesOfReservedWords.ts, 86, 9))
+>enum : Symbol(I.enum, Decl(propertyNamesOfReservedWords.ts, 86, 9))
 
     export;
->export : Symbol(export, Decl(propertyNamesOfReservedWords.ts, 87, 9))
+>export : Symbol(I.export, Decl(propertyNamesOfReservedWords.ts, 87, 9))
 
     extends;
->extends : Symbol(extends, Decl(propertyNamesOfReservedWords.ts, 88, 11))
+>extends : Symbol(I.extends, Decl(propertyNamesOfReservedWords.ts, 88, 11))
 
     false;
->false : Symbol(false, Decl(propertyNamesOfReservedWords.ts, 89, 12))
+>false : Symbol(I.false, Decl(propertyNamesOfReservedWords.ts, 89, 12))
 
     final;
->final : Symbol(final, Decl(propertyNamesOfReservedWords.ts, 90, 10))
+>final : Symbol(I.final, Decl(propertyNamesOfReservedWords.ts, 90, 10))
 
     finally;
->finally : Symbol(finally, Decl(propertyNamesOfReservedWords.ts, 91, 10))
+>finally : Symbol(I.finally, Decl(propertyNamesOfReservedWords.ts, 91, 10))
 
     float;
->float : Symbol(float, Decl(propertyNamesOfReservedWords.ts, 92, 12))
+>float : Symbol(I.float, Decl(propertyNamesOfReservedWords.ts, 92, 12))
 
     for;
->for : Symbol(for, Decl(propertyNamesOfReservedWords.ts, 93, 10))
+>for : Symbol(I.for, Decl(propertyNamesOfReservedWords.ts, 93, 10))
 
     function;
->function : Symbol(function, Decl(propertyNamesOfReservedWords.ts, 94, 8))
+>function : Symbol(I.function, Decl(propertyNamesOfReservedWords.ts, 94, 8))
 
     goto;
->goto : Symbol(goto, Decl(propertyNamesOfReservedWords.ts, 95, 13))
+>goto : Symbol(I.goto, Decl(propertyNamesOfReservedWords.ts, 95, 13))
 
     if;
->if : Symbol(if, Decl(propertyNamesOfReservedWords.ts, 96, 9))
+>if : Symbol(I.if, Decl(propertyNamesOfReservedWords.ts, 96, 9))
 
     implements;
->implements : Symbol(implements, Decl(propertyNamesOfReservedWords.ts, 97, 7))
+>implements : Symbol(I.implements, Decl(propertyNamesOfReservedWords.ts, 97, 7))
 
     import;
->import : Symbol(import, Decl(propertyNamesOfReservedWords.ts, 98, 15))
+>import : Symbol(I.import, Decl(propertyNamesOfReservedWords.ts, 98, 15))
 
     in;
->in : Symbol(in, Decl(propertyNamesOfReservedWords.ts, 99, 11))
+>in : Symbol(I.in, Decl(propertyNamesOfReservedWords.ts, 99, 11))
 
     instanceof;
->instanceof : Symbol(instanceof, Decl(propertyNamesOfReservedWords.ts, 100, 7))
+>instanceof : Symbol(I.instanceof, Decl(propertyNamesOfReservedWords.ts, 100, 7))
 
     int;
->int : Symbol(int, Decl(propertyNamesOfReservedWords.ts, 101, 15))
+>int : Symbol(I.int, Decl(propertyNamesOfReservedWords.ts, 101, 15))
 
     interface;
->interface : Symbol(interface, Decl(propertyNamesOfReservedWords.ts, 102, 8))
+>interface : Symbol(I.interface, Decl(propertyNamesOfReservedWords.ts, 102, 8))
 
     is;
->is : Symbol(is, Decl(propertyNamesOfReservedWords.ts, 103, 14))
+>is : Symbol(I.is, Decl(propertyNamesOfReservedWords.ts, 103, 14))
 
     long;
->long : Symbol(long, Decl(propertyNamesOfReservedWords.ts, 104, 7))
+>long : Symbol(I.long, Decl(propertyNamesOfReservedWords.ts, 104, 7))
 
     namespace;
->namespace : Symbol(namespace, Decl(propertyNamesOfReservedWords.ts, 105, 9))
+>namespace : Symbol(I.namespace, Decl(propertyNamesOfReservedWords.ts, 105, 9))
 
     native;
->native : Symbol(native, Decl(propertyNamesOfReservedWords.ts, 106, 14))
+>native : Symbol(I.native, Decl(propertyNamesOfReservedWords.ts, 106, 14))
 
     new;
->new : Symbol(new, Decl(propertyNamesOfReservedWords.ts, 107, 11))
+>new : Symbol(I.new, Decl(propertyNamesOfReservedWords.ts, 107, 11))
 
     null;
->null : Symbol(null, Decl(propertyNamesOfReservedWords.ts, 108, 8))
+>null : Symbol(I.null, Decl(propertyNamesOfReservedWords.ts, 108, 8))
 
     package;
->package : Symbol(package, Decl(propertyNamesOfReservedWords.ts, 109, 9))
+>package : Symbol(I.package, Decl(propertyNamesOfReservedWords.ts, 109, 9))
 
     private;
->private : Symbol(private, Decl(propertyNamesOfReservedWords.ts, 110, 12))
+>private : Symbol(I.private, Decl(propertyNamesOfReservedWords.ts, 110, 12))
 
     protected;
->protected : Symbol(protected, Decl(propertyNamesOfReservedWords.ts, 111, 12))
+>protected : Symbol(I.protected, Decl(propertyNamesOfReservedWords.ts, 111, 12))
 
     public;
->public : Symbol(public, Decl(propertyNamesOfReservedWords.ts, 112, 14))
+>public : Symbol(I.public, Decl(propertyNamesOfReservedWords.ts, 112, 14))
 
     return;
->return : Symbol(return, Decl(propertyNamesOfReservedWords.ts, 113, 11))
+>return : Symbol(I.return, Decl(propertyNamesOfReservedWords.ts, 113, 11))
 
     short;
->short : Symbol(short, Decl(propertyNamesOfReservedWords.ts, 114, 11))
+>short : Symbol(I.short, Decl(propertyNamesOfReservedWords.ts, 114, 11))
 
     static;
->static : Symbol(static, Decl(propertyNamesOfReservedWords.ts, 115, 10))
+>static : Symbol(I.static, Decl(propertyNamesOfReservedWords.ts, 115, 10))
 
     super;
->super : Symbol(super, Decl(propertyNamesOfReservedWords.ts, 116, 11))
+>super : Symbol(I.super, Decl(propertyNamesOfReservedWords.ts, 116, 11))
 
     switch;
->switch : Symbol(switch, Decl(propertyNamesOfReservedWords.ts, 117, 10))
+>switch : Symbol(I.switch, Decl(propertyNamesOfReservedWords.ts, 117, 10))
 
     synchronized;
->synchronized : Symbol(synchronized, Decl(propertyNamesOfReservedWords.ts, 118, 11))
+>synchronized : Symbol(I.synchronized, Decl(propertyNamesOfReservedWords.ts, 118, 11))
 
     this;
->this : Symbol(this, Decl(propertyNamesOfReservedWords.ts, 119, 17))
+>this : Symbol(I.this, Decl(propertyNamesOfReservedWords.ts, 119, 17))
 
     throw;
->throw : Symbol(throw, Decl(propertyNamesOfReservedWords.ts, 120, 9))
+>throw : Symbol(I.throw, Decl(propertyNamesOfReservedWords.ts, 120, 9))
 
     throws;
->throws : Symbol(throws, Decl(propertyNamesOfReservedWords.ts, 121, 10))
+>throws : Symbol(I.throws, Decl(propertyNamesOfReservedWords.ts, 121, 10))
 
     transient;
->transient : Symbol(transient, Decl(propertyNamesOfReservedWords.ts, 122, 11))
+>transient : Symbol(I.transient, Decl(propertyNamesOfReservedWords.ts, 122, 11))
 
     true;
->true : Symbol(true, Decl(propertyNamesOfReservedWords.ts, 123, 14))
+>true : Symbol(I.true, Decl(propertyNamesOfReservedWords.ts, 123, 14))
 
     try;
->try : Symbol(try, Decl(propertyNamesOfReservedWords.ts, 124, 9))
+>try : Symbol(I.try, Decl(propertyNamesOfReservedWords.ts, 124, 9))
 
     typeof;
->typeof : Symbol(typeof, Decl(propertyNamesOfReservedWords.ts, 125, 8))
+>typeof : Symbol(I.typeof, Decl(propertyNamesOfReservedWords.ts, 125, 8))
 
     use;
->use : Symbol(use, Decl(propertyNamesOfReservedWords.ts, 126, 11))
+>use : Symbol(I.use, Decl(propertyNamesOfReservedWords.ts, 126, 11))
 
     var;
->var : Symbol(var, Decl(propertyNamesOfReservedWords.ts, 127, 8))
+>var : Symbol(I.var, Decl(propertyNamesOfReservedWords.ts, 127, 8))
 
     void;
->void : Symbol(void, Decl(propertyNamesOfReservedWords.ts, 128, 8))
+>void : Symbol(I.void, Decl(propertyNamesOfReservedWords.ts, 128, 8))
 
     volatile;
->volatile : Symbol(volatile, Decl(propertyNamesOfReservedWords.ts, 129, 9))
+>volatile : Symbol(I.volatile, Decl(propertyNamesOfReservedWords.ts, 129, 9))
 
     while;
->while : Symbol(while, Decl(propertyNamesOfReservedWords.ts, 130, 13))
+>while : Symbol(I.while, Decl(propertyNamesOfReservedWords.ts, 130, 13))
 
     with;
->with : Symbol(with, Decl(propertyNamesOfReservedWords.ts, 131, 10))
+>with : Symbol(I.with, Decl(propertyNamesOfReservedWords.ts, 131, 10))
 }
 
 var i: I;
diff --git a/tests/baselines/reference/propertyNamesWithStringLiteral.symbols b/tests/baselines/reference/propertyNamesWithStringLiteral.symbols
index d81f39b5325..3844c0891e8 100644
--- a/tests/baselines/reference/propertyNamesWithStringLiteral.symbols
+++ b/tests/baselines/reference/propertyNamesWithStringLiteral.symbols
@@ -3,17 +3,17 @@ class _Color {
 >_Color : Symbol(_Color, Decl(propertyNamesWithStringLiteral.ts, 0, 0))
 
     a: number; r: number; g: number; b: number;
->a : Symbol(a, Decl(propertyNamesWithStringLiteral.ts, 0, 14))
->r : Symbol(r, Decl(propertyNamesWithStringLiteral.ts, 1, 14))
->g : Symbol(g, Decl(propertyNamesWithStringLiteral.ts, 1, 25))
->b : Symbol(b, Decl(propertyNamesWithStringLiteral.ts, 1, 36))
+>a : Symbol(_Color.a, Decl(propertyNamesWithStringLiteral.ts, 0, 14))
+>r : Symbol(_Color.r, Decl(propertyNamesWithStringLiteral.ts, 1, 14))
+>g : Symbol(_Color.g, Decl(propertyNamesWithStringLiteral.ts, 1, 25))
+>b : Symbol(_Color.b, Decl(propertyNamesWithStringLiteral.ts, 1, 36))
 }
 
 interface NamedColors {
 >NamedColors : Symbol(NamedColors, Decl(propertyNamesWithStringLiteral.ts, 2, 1))
 
     azure: _Color;
->azure : Symbol(azure, Decl(propertyNamesWithStringLiteral.ts, 4, 23))
+>azure : Symbol(NamedColors.azure, Decl(propertyNamesWithStringLiteral.ts, 4, 23))
 >_Color : Symbol(_Color, Decl(propertyNamesWithStringLiteral.ts, 0, 0))
 
     "blue": _Color;
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinClass.symbols b/tests/baselines/reference/protectedClassPropertyAccessibleWithinClass.symbols
index ccca7ab7501..ec9464ef1ee 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinClass.symbols
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinClass.symbols
@@ -5,29 +5,29 @@ class C {
 >C : Symbol(C, Decl(protectedClassPropertyAccessibleWithinClass.ts, 0, 0))
 
     protected x: string;
->x : Symbol(x, Decl(protectedClassPropertyAccessibleWithinClass.ts, 2, 9))
+>x : Symbol(C.x, Decl(protectedClassPropertyAccessibleWithinClass.ts, 2, 9))
 
     protected get y() { return this.x; }
->y : Symbol(y, Decl(protectedClassPropertyAccessibleWithinClass.ts, 3, 24), Decl(protectedClassPropertyAccessibleWithinClass.ts, 4, 40))
->this.x : Symbol(x, Decl(protectedClassPropertyAccessibleWithinClass.ts, 2, 9))
+>y : Symbol(C.y, Decl(protectedClassPropertyAccessibleWithinClass.ts, 3, 24), Decl(protectedClassPropertyAccessibleWithinClass.ts, 4, 40))
+>this.x : Symbol(C.x, Decl(protectedClassPropertyAccessibleWithinClass.ts, 2, 9))
 >this : Symbol(C, Decl(protectedClassPropertyAccessibleWithinClass.ts, 0, 0))
->x : Symbol(x, Decl(protectedClassPropertyAccessibleWithinClass.ts, 2, 9))
+>x : Symbol(C.x, Decl(protectedClassPropertyAccessibleWithinClass.ts, 2, 9))
 
     protected set y(x) { this.y = this.x; }
->y : Symbol(y, Decl(protectedClassPropertyAccessibleWithinClass.ts, 3, 24), Decl(protectedClassPropertyAccessibleWithinClass.ts, 4, 40))
+>y : Symbol(C.y, Decl(protectedClassPropertyAccessibleWithinClass.ts, 3, 24), Decl(protectedClassPropertyAccessibleWithinClass.ts, 4, 40))
 >x : Symbol(x, Decl(protectedClassPropertyAccessibleWithinClass.ts, 5, 20))
->this.y : Symbol(y, Decl(protectedClassPropertyAccessibleWithinClass.ts, 3, 24), Decl(protectedClassPropertyAccessibleWithinClass.ts, 4, 40))
+>this.y : Symbol(C.y, Decl(protectedClassPropertyAccessibleWithinClass.ts, 3, 24), Decl(protectedClassPropertyAccessibleWithinClass.ts, 4, 40))
 >this : Symbol(C, Decl(protectedClassPropertyAccessibleWithinClass.ts, 0, 0))
->y : Symbol(y, Decl(protectedClassPropertyAccessibleWithinClass.ts, 3, 24), Decl(protectedClassPropertyAccessibleWithinClass.ts, 4, 40))
->this.x : Symbol(x, Decl(protectedClassPropertyAccessibleWithinClass.ts, 2, 9))
+>y : Symbol(C.y, Decl(protectedClassPropertyAccessibleWithinClass.ts, 3, 24), Decl(protectedClassPropertyAccessibleWithinClass.ts, 4, 40))
+>this.x : Symbol(C.x, Decl(protectedClassPropertyAccessibleWithinClass.ts, 2, 9))
 >this : Symbol(C, Decl(protectedClassPropertyAccessibleWithinClass.ts, 0, 0))
->x : Symbol(x, Decl(protectedClassPropertyAccessibleWithinClass.ts, 2, 9))
+>x : Symbol(C.x, Decl(protectedClassPropertyAccessibleWithinClass.ts, 2, 9))
 
     protected foo() { return this.foo; }
->foo : Symbol(foo, Decl(protectedClassPropertyAccessibleWithinClass.ts, 5, 43))
->this.foo : Symbol(foo, Decl(protectedClassPropertyAccessibleWithinClass.ts, 5, 43))
+>foo : Symbol(C.foo, Decl(protectedClassPropertyAccessibleWithinClass.ts, 5, 43))
+>this.foo : Symbol(C.foo, Decl(protectedClassPropertyAccessibleWithinClass.ts, 5, 43))
 >this : Symbol(C, Decl(protectedClassPropertyAccessibleWithinClass.ts, 0, 0))
->foo : Symbol(foo, Decl(protectedClassPropertyAccessibleWithinClass.ts, 5, 43))
+>foo : Symbol(C.foo, Decl(protectedClassPropertyAccessibleWithinClass.ts, 5, 43))
 
     protected static x: string;
 >x : Symbol(C.x, Decl(protectedClassPropertyAccessibleWithinClass.ts, 6, 40))
@@ -66,29 +66,29 @@ class C2 {
 >C2 : Symbol(C2, Decl(protectedClassPropertyAccessibleWithinClass.ts, 13, 1))
 
     protected x: string;
->x : Symbol(x, Decl(protectedClassPropertyAccessibleWithinClass.ts, 16, 10))
+>x : Symbol(C2.x, Decl(protectedClassPropertyAccessibleWithinClass.ts, 16, 10))
 
     protected get y() { () => this.x; return null; }
->y : Symbol(y, Decl(protectedClassPropertyAccessibleWithinClass.ts, 17, 24), Decl(protectedClassPropertyAccessibleWithinClass.ts, 18, 52))
->this.x : Symbol(x, Decl(protectedClassPropertyAccessibleWithinClass.ts, 16, 10))
+>y : Symbol(C2.y, Decl(protectedClassPropertyAccessibleWithinClass.ts, 17, 24), Decl(protectedClassPropertyAccessibleWithinClass.ts, 18, 52))
+>this.x : Symbol(C2.x, Decl(protectedClassPropertyAccessibleWithinClass.ts, 16, 10))
 >this : Symbol(C2, Decl(protectedClassPropertyAccessibleWithinClass.ts, 13, 1))
->x : Symbol(x, Decl(protectedClassPropertyAccessibleWithinClass.ts, 16, 10))
+>x : Symbol(C2.x, Decl(protectedClassPropertyAccessibleWithinClass.ts, 16, 10))
 
     protected set y(x) { () => { this.y = this.x; } }
->y : Symbol(y, Decl(protectedClassPropertyAccessibleWithinClass.ts, 17, 24), Decl(protectedClassPropertyAccessibleWithinClass.ts, 18, 52))
+>y : Symbol(C2.y, Decl(protectedClassPropertyAccessibleWithinClass.ts, 17, 24), Decl(protectedClassPropertyAccessibleWithinClass.ts, 18, 52))
 >x : Symbol(x, Decl(protectedClassPropertyAccessibleWithinClass.ts, 19, 20))
->this.y : Symbol(y, Decl(protectedClassPropertyAccessibleWithinClass.ts, 17, 24), Decl(protectedClassPropertyAccessibleWithinClass.ts, 18, 52))
+>this.y : Symbol(C2.y, Decl(protectedClassPropertyAccessibleWithinClass.ts, 17, 24), Decl(protectedClassPropertyAccessibleWithinClass.ts, 18, 52))
 >this : Symbol(C2, Decl(protectedClassPropertyAccessibleWithinClass.ts, 13, 1))
->y : Symbol(y, Decl(protectedClassPropertyAccessibleWithinClass.ts, 17, 24), Decl(protectedClassPropertyAccessibleWithinClass.ts, 18, 52))
->this.x : Symbol(x, Decl(protectedClassPropertyAccessibleWithinClass.ts, 16, 10))
+>y : Symbol(C2.y, Decl(protectedClassPropertyAccessibleWithinClass.ts, 17, 24), Decl(protectedClassPropertyAccessibleWithinClass.ts, 18, 52))
+>this.x : Symbol(C2.x, Decl(protectedClassPropertyAccessibleWithinClass.ts, 16, 10))
 >this : Symbol(C2, Decl(protectedClassPropertyAccessibleWithinClass.ts, 13, 1))
->x : Symbol(x, Decl(protectedClassPropertyAccessibleWithinClass.ts, 16, 10))
+>x : Symbol(C2.x, Decl(protectedClassPropertyAccessibleWithinClass.ts, 16, 10))
 
     protected foo() { () => this.foo; }
->foo : Symbol(foo, Decl(protectedClassPropertyAccessibleWithinClass.ts, 19, 53))
->this.foo : Symbol(foo, Decl(protectedClassPropertyAccessibleWithinClass.ts, 19, 53))
+>foo : Symbol(C2.foo, Decl(protectedClassPropertyAccessibleWithinClass.ts, 19, 53))
+>this.foo : Symbol(C2.foo, Decl(protectedClassPropertyAccessibleWithinClass.ts, 19, 53))
 >this : Symbol(C2, Decl(protectedClassPropertyAccessibleWithinClass.ts, 13, 1))
->foo : Symbol(foo, Decl(protectedClassPropertyAccessibleWithinClass.ts, 19, 53))
+>foo : Symbol(C2.foo, Decl(protectedClassPropertyAccessibleWithinClass.ts, 19, 53))
 
     protected static x: string;
 >x : Symbol(C2.x, Decl(protectedClassPropertyAccessibleWithinClass.ts, 20, 39))
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedClass.js b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedClass.js
new file mode 100644
index 00000000000..2bc544e046e
--- /dev/null
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedClass.js
@@ -0,0 +1,84 @@
+//// [protectedClassPropertyAccessibleWithinNestedClass.ts]
+// no errors
+
+class C {
+    protected x: string;
+    protected get y() { return this.x; }
+    protected set y(x) { this.y = this.x; }
+    protected foo() { return this.foo; }
+
+    protected static x: string;
+    protected static get y() { return this.x; }
+    protected static set y(x) { this.y = this.x; }
+    protected static foo() { return this.foo; }
+    protected static bar() { this.foo(); }
+
+    protected bar() {
+        class C2 {
+            protected foo() {
+                let x: C;
+                var x1 = x.foo;
+                var x2 = x.bar;
+                var x3 = x.x;
+                var x4 = x.y;
+
+                var sx1 = C.x;
+                var sx2 = C.y;
+                var sx3 = C.bar;
+                var sx4 = C.foo;
+
+                let y = new C();
+                var y1 = y.foo;
+                var y2 = y.bar;
+                var y3 = y.x;
+                var y4 = y.y;
+            }
+        }
+    }
+}
+
+//// [protectedClassPropertyAccessibleWithinNestedClass.js]
+// no errors
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, "y", {
+        get: function () { return this.x; },
+        set: function (x) { this.y = this.x; },
+        enumerable: true,
+        configurable: true
+    });
+    C.prototype.foo = function () { return this.foo; };
+    Object.defineProperty(C, "y", {
+        get: function () { return this.x; },
+        set: function (x) { this.y = this.x; },
+        enumerable: true,
+        configurable: true
+    });
+    C.foo = function () { return this.foo; };
+    C.bar = function () { this.foo(); };
+    C.prototype.bar = function () {
+        var C2 = (function () {
+            function C2() {
+            }
+            C2.prototype.foo = function () {
+                var x;
+                var x1 = x.foo;
+                var x2 = x.bar;
+                var x3 = x.x;
+                var x4 = x.y;
+                var sx1 = C.x;
+                var sx2 = C.y;
+                var sx3 = C.bar;
+                var sx4 = C.foo;
+                var y = new C();
+                var y1 = y.foo;
+                var y2 = y.bar;
+                var y3 = y.x;
+                var y4 = y.y;
+            };
+            return C2;
+        }());
+    };
+    return C;
+}());
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedClass.symbols b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedClass.symbols
new file mode 100644
index 00000000000..8b05cc017c8
--- /dev/null
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedClass.symbols
@@ -0,0 +1,154 @@
+=== tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedClass.ts ===
+// no errors
+
+class C {
+>C : Symbol(C, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+
+    protected x: string;
+>x : Symbol(C.x, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 2, 9))
+
+    protected get y() { return this.x; }
+>y : Symbol(C.y, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 3, 24), Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 4, 40))
+>this.x : Symbol(C.x, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 2, 9))
+>this : Symbol(C, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>x : Symbol(C.x, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 2, 9))
+
+    protected set y(x) { this.y = this.x; }
+>y : Symbol(C.y, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 3, 24), Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 4, 40))
+>x : Symbol(x, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 5, 20))
+>this.y : Symbol(C.y, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 3, 24), Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 4, 40))
+>this : Symbol(C, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>y : Symbol(C.y, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 3, 24), Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 4, 40))
+>this.x : Symbol(C.x, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 2, 9))
+>this : Symbol(C, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>x : Symbol(C.x, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 2, 9))
+
+    protected foo() { return this.foo; }
+>foo : Symbol(C.foo, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 5, 43))
+>this.foo : Symbol(C.foo, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 5, 43))
+>this : Symbol(C, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>foo : Symbol(C.foo, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 5, 43))
+
+    protected static x: string;
+>x : Symbol(C.x, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 6, 40))
+
+    protected static get y() { return this.x; }
+>y : Symbol(C.y, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 8, 31), Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 9, 47))
+>this.x : Symbol(C.x, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 6, 40))
+>this : Symbol(C, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>x : Symbol(C.x, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 6, 40))
+
+    protected static set y(x) { this.y = this.x; }
+>y : Symbol(C.y, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 8, 31), Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 9, 47))
+>x : Symbol(x, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 10, 27))
+>this.y : Symbol(C.y, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 8, 31), Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 9, 47))
+>this : Symbol(C, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>y : Symbol(C.y, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 8, 31), Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 9, 47))
+>this.x : Symbol(C.x, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 6, 40))
+>this : Symbol(C, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>x : Symbol(C.x, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 6, 40))
+
+    protected static foo() { return this.foo; }
+>foo : Symbol(C.foo, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 10, 50))
+>this.foo : Symbol(C.foo, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 10, 50))
+>this : Symbol(C, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>foo : Symbol(C.foo, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 10, 50))
+
+    protected static bar() { this.foo(); }
+>bar : Symbol(C.bar, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 11, 47))
+>this.foo : Symbol(C.foo, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 10, 50))
+>this : Symbol(C, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>foo : Symbol(C.foo, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 10, 50))
+
+    protected bar() {
+>bar : Symbol(C.bar, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 12, 42))
+
+        class C2 {
+>C2 : Symbol(C2, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 14, 21))
+
+            protected foo() {
+>foo : Symbol(C2.foo, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 15, 18))
+
+                let x: C;
+>x : Symbol(x, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 17, 19))
+>C : Symbol(C, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+
+                var x1 = x.foo;
+>x1 : Symbol(x1, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 18, 19))
+>x.foo : Symbol(C.foo, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 5, 43))
+>x : Symbol(x, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 17, 19))
+>foo : Symbol(C.foo, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 5, 43))
+
+                var x2 = x.bar;
+>x2 : Symbol(x2, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 19, 19))
+>x.bar : Symbol(C.bar, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 12, 42))
+>x : Symbol(x, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 17, 19))
+>bar : Symbol(C.bar, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 12, 42))
+
+                var x3 = x.x;
+>x3 : Symbol(x3, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 20, 19))
+>x.x : Symbol(C.x, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 2, 9))
+>x : Symbol(x, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 17, 19))
+>x : Symbol(C.x, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 2, 9))
+
+                var x4 = x.y;
+>x4 : Symbol(x4, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 21, 19))
+>x.y : Symbol(C.y, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 3, 24), Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 4, 40))
+>x : Symbol(x, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 17, 19))
+>y : Symbol(C.y, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 3, 24), Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 4, 40))
+
+                var sx1 = C.x;
+>sx1 : Symbol(sx1, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 23, 19))
+>C.x : Symbol(C.x, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 6, 40))
+>C : Symbol(C, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>x : Symbol(C.x, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 6, 40))
+
+                var sx2 = C.y;
+>sx2 : Symbol(sx2, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 24, 19))
+>C.y : Symbol(C.y, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 8, 31), Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 9, 47))
+>C : Symbol(C, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>y : Symbol(C.y, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 8, 31), Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 9, 47))
+
+                var sx3 = C.bar;
+>sx3 : Symbol(sx3, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 25, 19))
+>C.bar : Symbol(C.bar, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 11, 47))
+>C : Symbol(C, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>bar : Symbol(C.bar, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 11, 47))
+
+                var sx4 = C.foo;
+>sx4 : Symbol(sx4, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 26, 19))
+>C.foo : Symbol(C.foo, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 10, 50))
+>C : Symbol(C, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+>foo : Symbol(C.foo, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 10, 50))
+
+                let y = new C();
+>y : Symbol(y, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 28, 19))
+>C : Symbol(C, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 0, 0))
+
+                var y1 = y.foo;
+>y1 : Symbol(y1, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 29, 19))
+>y.foo : Symbol(C.foo, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 5, 43))
+>y : Symbol(y, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 28, 19))
+>foo : Symbol(C.foo, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 5, 43))
+
+                var y2 = y.bar;
+>y2 : Symbol(y2, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 30, 19))
+>y.bar : Symbol(C.bar, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 12, 42))
+>y : Symbol(y, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 28, 19))
+>bar : Symbol(C.bar, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 12, 42))
+
+                var y3 = y.x;
+>y3 : Symbol(y3, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 31, 19))
+>y.x : Symbol(C.x, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 2, 9))
+>y : Symbol(y, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 28, 19))
+>x : Symbol(C.x, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 2, 9))
+
+                var y4 = y.y;
+>y4 : Symbol(y4, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 32, 19))
+>y.y : Symbol(C.y, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 3, 24), Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 4, 40))
+>y : Symbol(y, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 28, 19))
+>y : Symbol(C.y, Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 3, 24), Decl(protectedClassPropertyAccessibleWithinNestedClass.ts, 4, 40))
+            }
+        }
+    }
+}
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedClass.types b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedClass.types
new file mode 100644
index 00000000000..f7cff2e6719
--- /dev/null
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedClass.types
@@ -0,0 +1,158 @@
+=== tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedClass.ts ===
+// no errors
+
+class C {
+>C : C
+
+    protected x: string;
+>x : string
+
+    protected get y() { return this.x; }
+>y : string
+>this.x : string
+>this : this
+>x : string
+
+    protected set y(x) { this.y = this.x; }
+>y : string
+>x : string
+>this.y = this.x : string
+>this.y : string
+>this : this
+>y : string
+>this.x : string
+>this : this
+>x : string
+
+    protected foo() { return this.foo; }
+>foo : () => any
+>this.foo : () => any
+>this : this
+>foo : () => any
+
+    protected static x: string;
+>x : string
+
+    protected static get y() { return this.x; }
+>y : string
+>this.x : string
+>this : typeof C
+>x : string
+
+    protected static set y(x) { this.y = this.x; }
+>y : string
+>x : string
+>this.y = this.x : string
+>this.y : string
+>this : typeof C
+>y : string
+>this.x : string
+>this : typeof C
+>x : string
+
+    protected static foo() { return this.foo; }
+>foo : () => typeof C.foo
+>this.foo : () => typeof C.foo
+>this : typeof C
+>foo : () => typeof C.foo
+
+    protected static bar() { this.foo(); }
+>bar : () => void
+>this.foo() : () => typeof C.foo
+>this.foo : () => typeof C.foo
+>this : typeof C
+>foo : () => typeof C.foo
+
+    protected bar() {
+>bar : () => void
+
+        class C2 {
+>C2 : C2
+
+            protected foo() {
+>foo : () => void
+
+                let x: C;
+>x : C
+>C : C
+
+                var x1 = x.foo;
+>x1 : () => any
+>x.foo : () => any
+>x : C
+>foo : () => any
+
+                var x2 = x.bar;
+>x2 : () => void
+>x.bar : () => void
+>x : C
+>bar : () => void
+
+                var x3 = x.x;
+>x3 : string
+>x.x : string
+>x : C
+>x : string
+
+                var x4 = x.y;
+>x4 : string
+>x.y : string
+>x : C
+>y : string
+
+                var sx1 = C.x;
+>sx1 : string
+>C.x : string
+>C : typeof C
+>x : string
+
+                var sx2 = C.y;
+>sx2 : string
+>C.y : string
+>C : typeof C
+>y : string
+
+                var sx3 = C.bar;
+>sx3 : () => void
+>C.bar : () => void
+>C : typeof C
+>bar : () => void
+
+                var sx4 = C.foo;
+>sx4 : () => typeof C.foo
+>C.foo : () => typeof C.foo
+>C : typeof C
+>foo : () => typeof C.foo
+
+                let y = new C();
+>y : C
+>new C() : C
+>C : typeof C
+
+                var y1 = y.foo;
+>y1 : () => any
+>y.foo : () => any
+>y : C
+>foo : () => any
+
+                var y2 = y.bar;
+>y2 : () => void
+>y.bar : () => void
+>y : C
+>bar : () => void
+
+                var y3 = y.x;
+>y3 : string
+>y.x : string
+>y : C
+>x : string
+
+                var y4 = y.y;
+>y4 : string
+>y.y : string
+>y : C
+>y : string
+            }
+        }
+    }
+}
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass.errors.txt b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass.errors.txt
new file mode 100644
index 00000000000..0bf38477f70
--- /dev/null
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass.errors.txt
@@ -0,0 +1,44 @@
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass.ts(25,28): error TS2339: Property 'z' does not exist on type 'C'.
+
+
+==== tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass.ts (1 errors) ====
+    
+    class B {
+        protected x: string;
+        protected static x: string;
+    }
+    
+    class C extends B {
+        protected get y() { return this.x; }
+        protected set y(x) { this.y = this.x; }
+        protected foo() { return this.x; }
+    
+        protected static get y() { return this.x; }
+        protected static set y(x) { this.y = this.x; }
+        protected static foo() { return this.x; }
+        protected static bar() { this.foo(); }
+        
+        protected bar() { 
+            class D {
+                protected foo() {
+                    var c = new C();
+                    var c1 = c.y;
+                    var c2 = c.x;
+                    var c3 = c.foo;
+                    var c4 = c.bar;
+                    var c5 = c.z; // error
+                               ~
+!!! error TS2339: Property 'z' does not exist on type 'C'.
+                    
+                    var sc1 = C.x;
+                    var sc2 = C.y;
+                    var sc3 = C.foo;
+                    var sc4 = C.bar;
+                }
+            }
+        }
+    }
+    
+    class E extends C {
+        protected z: string;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass.js b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass.js
new file mode 100644
index 00000000000..255c05ac3ac
--- /dev/null
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass.js
@@ -0,0 +1,99 @@
+//// [protectedClassPropertyAccessibleWithinNestedSubclass.ts]
+
+class B {
+    protected x: string;
+    protected static x: string;
+}
+
+class C extends B {
+    protected get y() { return this.x; }
+    protected set y(x) { this.y = this.x; }
+    protected foo() { return this.x; }
+
+    protected static get y() { return this.x; }
+    protected static set y(x) { this.y = this.x; }
+    protected static foo() { return this.x; }
+    protected static bar() { this.foo(); }
+    
+    protected bar() { 
+        class D {
+            protected foo() {
+                var c = new C();
+                var c1 = c.y;
+                var c2 = c.x;
+                var c3 = c.foo;
+                var c4 = c.bar;
+                var c5 = c.z; // error
+                
+                var sc1 = C.x;
+                var sc2 = C.y;
+                var sc3 = C.foo;
+                var sc4 = C.bar;
+            }
+        }
+    }
+}
+
+class E extends C {
+    protected z: string;
+}
+
+//// [protectedClassPropertyAccessibleWithinNestedSubclass.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 B = (function () {
+    function B() {
+    }
+    return B;
+}());
+var C = (function (_super) {
+    __extends(C, _super);
+    function C() {
+        _super.apply(this, arguments);
+    }
+    Object.defineProperty(C.prototype, "y", {
+        get: function () { return this.x; },
+        set: function (x) { this.y = this.x; },
+        enumerable: true,
+        configurable: true
+    });
+    C.prototype.foo = function () { return this.x; };
+    Object.defineProperty(C, "y", {
+        get: function () { return this.x; },
+        set: function (x) { this.y = this.x; },
+        enumerable: true,
+        configurable: true
+    });
+    C.foo = function () { return this.x; };
+    C.bar = function () { this.foo(); };
+    C.prototype.bar = function () {
+        var D = (function () {
+            function D() {
+            }
+            D.prototype.foo = function () {
+                var c = new C();
+                var c1 = c.y;
+                var c2 = c.x;
+                var c3 = c.foo;
+                var c4 = c.bar;
+                var c5 = c.z; // error
+                var sc1 = C.x;
+                var sc2 = C.y;
+                var sc3 = C.foo;
+                var sc4 = C.bar;
+            };
+            return D;
+        }());
+    };
+    return C;
+}(B));
+var E = (function (_super) {
+    __extends(E, _super);
+    function E() {
+        _super.apply(this, arguments);
+    }
+    return E;
+}(C));
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.errors.txt b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.errors.txt
new file mode 100644
index 00000000000..2d882681d72
--- /dev/null
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.errors.txt
@@ -0,0 +1,180 @@
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts(15,20): error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts(32,19): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived1'.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts(34,20): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived1'.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts(35,20): error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts(36,20): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived1'.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts(52,19): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived2'.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts(53,20): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived2'.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts(55,20): error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts(73,19): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived3'.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts(74,20): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived3'.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts(75,20): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived3'.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts(77,20): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived3'.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts(93,19): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived4'.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts(94,20): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived4'.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts(95,20): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived4'.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts(96,20): error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts(110,3): error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts(111,4): error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts(112,4): error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts(113,4): error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts(114,4): error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
+
+
+==== tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts (21 errors) ====
+    class Base {
+        protected x: string;
+        method() {
+            class A {
+                methoda() {
+                    var b: Base;
+                    var d1: Derived1;
+                    var d2: Derived2;
+                    var d3: Derived3;
+                    var d4: Derived4;
+    
+                    b.x;            // OK, accessed within their declaring class
+                    d1.x;           // OK, accessed within their declaring class
+                    d2.x;           // OK, accessed within their declaring class
+                    d3.x;           // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
+                       ~
+!!! error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
+                    d4.x;           // OK, accessed within their declaring class
+                }
+            }
+        }
+    }
+    
+    class Derived1 extends Base {
+        method1() {
+            class B {
+                method1b() {
+                    var b: Base;
+                    var d1: Derived1;
+                    var d2: Derived2;
+                    var d3: Derived3;
+                    var d4: Derived4;
+    
+                    b.x;            // Error, isn't accessed through an instance of the enclosing class
+                      ~
+!!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived1'.
+                    d1.x;           // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class
+                    d2.x;           // Error, isn't accessed through an instance of the enclosing class
+                       ~
+!!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived1'.
+                    d3.x;           // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
+                       ~
+!!! error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
+                    d4.x;           // Error, isn't accessed through an instance of the enclosing class
+                       ~
+!!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived1'.
+                }
+            }
+        }
+    }
+    
+    class Derived2 extends Base {
+        method2() {
+            class C {
+                method2c() {
+                    var b: Base;
+                    var d1: Derived1;
+                    var d2: Derived2;
+                    var d3: Derived3;
+                    var d4: Derived4;
+    
+                    b.x;            // Error, isn't accessed through an instance of the enclosing class
+                      ~
+!!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived2'.
+                    d1.x;           // Error, isn't accessed through an instance of the enclosing class
+                       ~
+!!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived2'.
+                    d2.x;           // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class
+                    d3.x;           // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
+                       ~
+!!! error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
+                    d4.x;           // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class or one of its subclasses
+                }
+            }
+        }
+    }
+    
+    class Derived3 extends Derived1 {
+        protected x: string;
+        method3() {
+            class D {
+                method3d() {
+                    var b: Base;
+                    var d1: Derived1;
+                    var d2: Derived2;
+                    var d3: Derived3;
+                    var d4: Derived4;
+    
+                    b.x;            // Error, isn't accessed through an instance of the enclosing class
+                      ~
+!!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived3'.
+                    d1.x;           // Error, isn't accessed through an instance of the enclosing class
+                       ~
+!!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived3'.
+                    d2.x;           // Error, isn't accessed through an instance of the enclosing class
+                       ~
+!!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived3'.
+                    d3.x;           // OK, accessed within their declaring class
+                    d4.x;           // Error, isn't accessed through an instance of the enclosing class
+                       ~
+!!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived3'.
+                }
+            }
+        }
+    }
+    
+    class Derived4 extends Derived2 {
+        method4() {
+            class E {
+                method4e() {
+                    var b: Base;
+                    var d1: Derived1;
+                    var d2: Derived2;
+                    var d3: Derived3;
+                    var d4: Derived4;
+    
+                    b.x;            // Error, isn't accessed through an instance of the enclosing class
+                      ~
+!!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived4'.
+                    d1.x;           // Error, isn't accessed through an instance of the enclosing class
+                       ~
+!!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived4'.
+                    d2.x;           // Error, isn't accessed through an instance of the enclosing class
+                       ~
+!!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived4'.
+                    d3.x;           // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
+                       ~
+!!! error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
+                    d4.x;           // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class
+                }
+            }
+        }
+    }
+    
+    
+    var b: Base;
+    var d1: Derived1;
+    var d2: Derived2;
+    var d3: Derived3;
+    var d4: Derived4;
+    
+    b.x;                    // Error, neither within their declaring class nor classes derived from their declaring class
+      ~
+!!! error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
+    d1.x;                   // Error, neither within their declaring class nor classes derived from their declaring class
+       ~
+!!! error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
+    d2.x;                   // Error, neither within their declaring class nor classes derived from their declaring class
+       ~
+!!! error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
+    d3.x;                   // Error, neither within their declaring class nor classes derived from their declaring class
+       ~
+!!! error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
+    d4.x;                   // Error, neither within their declaring class nor classes derived from their declaring class
+       ~
+!!! error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
\ No newline at end of file
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.js b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.js
new file mode 100644
index 00000000000..02ad29bd312
--- /dev/null
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.js
@@ -0,0 +1,260 @@
+//// [protectedClassPropertyAccessibleWithinNestedSubclass1.ts]
+class Base {
+    protected x: string;
+    method() {
+        class A {
+            methoda() {
+                var b: Base;
+                var d1: Derived1;
+                var d2: Derived2;
+                var d3: Derived3;
+                var d4: Derived4;
+
+                b.x;            // OK, accessed within their declaring class
+                d1.x;           // OK, accessed within their declaring class
+                d2.x;           // OK, accessed within their declaring class
+                d3.x;           // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
+                d4.x;           // OK, accessed within their declaring class
+            }
+        }
+    }
+}
+
+class Derived1 extends Base {
+    method1() {
+        class B {
+            method1b() {
+                var b: Base;
+                var d1: Derived1;
+                var d2: Derived2;
+                var d3: Derived3;
+                var d4: Derived4;
+
+                b.x;            // Error, isn't accessed through an instance of the enclosing class
+                d1.x;           // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class
+                d2.x;           // Error, isn't accessed through an instance of the enclosing class
+                d3.x;           // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
+                d4.x;           // Error, isn't accessed through an instance of the enclosing class
+            }
+        }
+    }
+}
+
+class Derived2 extends Base {
+    method2() {
+        class C {
+            method2c() {
+                var b: Base;
+                var d1: Derived1;
+                var d2: Derived2;
+                var d3: Derived3;
+                var d4: Derived4;
+
+                b.x;            // Error, isn't accessed through an instance of the enclosing class
+                d1.x;           // Error, isn't accessed through an instance of the enclosing class
+                d2.x;           // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class
+                d3.x;           // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
+                d4.x;           // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class or one of its subclasses
+            }
+        }
+    }
+}
+
+class Derived3 extends Derived1 {
+    protected x: string;
+    method3() {
+        class D {
+            method3d() {
+                var b: Base;
+                var d1: Derived1;
+                var d2: Derived2;
+                var d3: Derived3;
+                var d4: Derived4;
+
+                b.x;            // Error, isn't accessed through an instance of the enclosing class
+                d1.x;           // Error, isn't accessed through an instance of the enclosing class
+                d2.x;           // Error, isn't accessed through an instance of the enclosing class
+                d3.x;           // OK, accessed within their declaring class
+                d4.x;           // Error, isn't accessed through an instance of the enclosing class
+            }
+        }
+    }
+}
+
+class Derived4 extends Derived2 {
+    method4() {
+        class E {
+            method4e() {
+                var b: Base;
+                var d1: Derived1;
+                var d2: Derived2;
+                var d3: Derived3;
+                var d4: Derived4;
+
+                b.x;            // Error, isn't accessed through an instance of the enclosing class
+                d1.x;           // Error, isn't accessed through an instance of the enclosing class
+                d2.x;           // Error, isn't accessed through an instance of the enclosing class
+                d3.x;           // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
+                d4.x;           // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class
+            }
+        }
+    }
+}
+
+
+var b: Base;
+var d1: Derived1;
+var d2: Derived2;
+var d3: Derived3;
+var d4: Derived4;
+
+b.x;                    // Error, neither within their declaring class nor classes derived from their declaring class
+d1.x;                   // Error, neither within their declaring class nor classes derived from their declaring class
+d2.x;                   // Error, neither within their declaring class nor classes derived from their declaring class
+d3.x;                   // Error, neither within their declaring class nor classes derived from their declaring class
+d4.x;                   // Error, neither within their declaring class nor classes derived from their declaring class
+
+//// [protectedClassPropertyAccessibleWithinNestedSubclass1.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 Base = (function () {
+    function Base() {
+    }
+    Base.prototype.method = function () {
+        var A = (function () {
+            function A() {
+            }
+            A.prototype.methoda = function () {
+                var b;
+                var d1;
+                var d2;
+                var d3;
+                var d4;
+                b.x; // OK, accessed within their declaring class
+                d1.x; // OK, accessed within their declaring class
+                d2.x; // OK, accessed within their declaring class
+                d3.x; // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
+                d4.x; // OK, accessed within their declaring class
+            };
+            return A;
+        }());
+    };
+    return Base;
+}());
+var Derived1 = (function (_super) {
+    __extends(Derived1, _super);
+    function Derived1() {
+        _super.apply(this, arguments);
+    }
+    Derived1.prototype.method1 = function () {
+        var B = (function () {
+            function B() {
+            }
+            B.prototype.method1b = function () {
+                var b;
+                var d1;
+                var d2;
+                var d3;
+                var d4;
+                b.x; // Error, isn't accessed through an instance of the enclosing class
+                d1.x; // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class
+                d2.x; // Error, isn't accessed through an instance of the enclosing class
+                d3.x; // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
+                d4.x; // Error, isn't accessed through an instance of the enclosing class
+            };
+            return B;
+        }());
+    };
+    return Derived1;
+}(Base));
+var Derived2 = (function (_super) {
+    __extends(Derived2, _super);
+    function Derived2() {
+        _super.apply(this, arguments);
+    }
+    Derived2.prototype.method2 = function () {
+        var C = (function () {
+            function C() {
+            }
+            C.prototype.method2c = function () {
+                var b;
+                var d1;
+                var d2;
+                var d3;
+                var d4;
+                b.x; // Error, isn't accessed through an instance of the enclosing class
+                d1.x; // Error, isn't accessed through an instance of the enclosing class
+                d2.x; // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class
+                d3.x; // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
+                d4.x; // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class or one of its subclasses
+            };
+            return C;
+        }());
+    };
+    return Derived2;
+}(Base));
+var Derived3 = (function (_super) {
+    __extends(Derived3, _super);
+    function Derived3() {
+        _super.apply(this, arguments);
+    }
+    Derived3.prototype.method3 = function () {
+        var D = (function () {
+            function D() {
+            }
+            D.prototype.method3d = function () {
+                var b;
+                var d1;
+                var d2;
+                var d3;
+                var d4;
+                b.x; // Error, isn't accessed through an instance of the enclosing class
+                d1.x; // Error, isn't accessed through an instance of the enclosing class
+                d2.x; // Error, isn't accessed through an instance of the enclosing class
+                d3.x; // OK, accessed within their declaring class
+                d4.x; // Error, isn't accessed through an instance of the enclosing class
+            };
+            return D;
+        }());
+    };
+    return Derived3;
+}(Derived1));
+var Derived4 = (function (_super) {
+    __extends(Derived4, _super);
+    function Derived4() {
+        _super.apply(this, arguments);
+    }
+    Derived4.prototype.method4 = function () {
+        var E = (function () {
+            function E() {
+            }
+            E.prototype.method4e = function () {
+                var b;
+                var d1;
+                var d2;
+                var d3;
+                var d4;
+                b.x; // Error, isn't accessed through an instance of the enclosing class
+                d1.x; // Error, isn't accessed through an instance of the enclosing class
+                d2.x; // Error, isn't accessed through an instance of the enclosing class
+                d3.x; // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
+                d4.x; // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class
+            };
+            return E;
+        }());
+    };
+    return Derived4;
+}(Derived2));
+var b;
+var d1;
+var d2;
+var d3;
+var d4;
+b.x; // Error, neither within their declaring class nor classes derived from their declaring class
+d1.x; // Error, neither within their declaring class nor classes derived from their declaring class
+d2.x; // Error, neither within their declaring class nor classes derived from their declaring class
+d3.x; // Error, neither within their declaring class nor classes derived from their declaring class
+d4.x; // Error, neither within their declaring class nor classes derived from their declaring class
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.symbols b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.symbols
index 5bd7dfad392..17a91458085 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.symbols
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.symbols
@@ -5,7 +5,7 @@ class B {
 >B : Symbol(B, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 0, 0))
 
     protected x: string;
->x : Symbol(x, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 2, 9))
+>x : Symbol(B.x, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 2, 9))
 
     protected static x: string;
 >x : Symbol(B.x, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 3, 24))
@@ -16,32 +16,32 @@ class C extends B {
 >B : Symbol(B, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 0, 0))
 
     protected get y() { return this.x; }
->y : Symbol(y, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 7, 19), Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 8, 40))
+>y : Symbol(C.y, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 7, 19), Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 8, 40))
 >this.x : Symbol(B.x, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 2, 9))
 >this : Symbol(C, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 5, 1))
 >x : Symbol(B.x, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 2, 9))
 
     protected set y(x) { this.y = this.x; }
->y : Symbol(y, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 7, 19), Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 8, 40))
+>y : Symbol(C.y, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 7, 19), Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 8, 40))
 >x : Symbol(x, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 9, 20))
->this.y : Symbol(y, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 7, 19), Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 8, 40))
+>this.y : Symbol(C.y, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 7, 19), Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 8, 40))
 >this : Symbol(C, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 5, 1))
->y : Symbol(y, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 7, 19), Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 8, 40))
+>y : Symbol(C.y, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 7, 19), Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 8, 40))
 >this.x : Symbol(B.x, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 2, 9))
 >this : Symbol(C, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 5, 1))
 >x : Symbol(B.x, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 2, 9))
 
     protected foo() { return this.x; }
->foo : Symbol(foo, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 9, 43))
+>foo : Symbol(C.foo, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 9, 43))
 >this.x : Symbol(B.x, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 2, 9))
 >this : Symbol(C, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 5, 1))
 >x : Symbol(B.x, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 2, 9))
 
     protected bar() { return this.foo(); }
->bar : Symbol(bar, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 10, 38))
->this.foo : Symbol(foo, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 9, 43))
+>bar : Symbol(C.bar, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 10, 38))
+>this.foo : Symbol(C.foo, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 9, 43))
 >this : Symbol(C, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 5, 1))
->foo : Symbol(foo, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 9, 43))
+>foo : Symbol(C.foo, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 9, 43))
 
     protected static get y() { return this.x; }
 >y : Symbol(C.y, Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 11, 42), Decl(protectedClassPropertyAccessibleWithinSubclass.ts, 13, 47))
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.errors.txt b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.errors.txt
index 289ecdcb9fe..996d62c1652 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.errors.txt
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.errors.txt
@@ -1,24 +1,24 @@
-tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(13,9): error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
-tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(26,9): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived1'.
-tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(28,9): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived1'.
-tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(29,9): error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
-tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(30,9): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived1'.
-tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(42,9): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived2'.
-tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(43,9): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived2'.
-tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(45,9): error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
-tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(59,9): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived3'.
-tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(60,9): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived3'.
-tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(61,9): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived3'.
-tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(63,9): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived3'.
-tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(75,9): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived4'.
-tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(76,9): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived4'.
-tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(77,9): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived4'.
-tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(78,9): error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
-tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(90,1): error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
-tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(91,1): error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
-tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(92,1): error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
-tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(93,1): error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
-tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(94,1): error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(13,12): error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(26,11): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived1'.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(28,12): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived1'.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(29,12): error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(30,12): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived1'.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(42,11): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived2'.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(43,12): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived2'.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(45,12): error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(59,11): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived3'.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(60,12): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived3'.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(61,12): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived3'.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(63,12): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived3'.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(75,11): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived4'.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(76,12): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived4'.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(77,12): error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived4'.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(78,12): error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(90,3): error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(91,4): error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(92,4): error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(93,4): error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts(94,4): error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
 
 
 ==== tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinSubclass2.ts (21 errors) ====
@@ -35,7 +35,7 @@ tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAcce
             d1.x;           // OK, accessed within their declaring class
             d2.x;           // OK, accessed within their declaring class
             d3.x;           // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
-            ~~~~
+               ~
 !!! error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
             d4.x;           // OK, accessed within their declaring class
         }
@@ -50,17 +50,17 @@ tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAcce
             var d4: Derived4;
     
             b.x;            // Error, isn't accessed through an instance of the enclosing class
-            ~~~
+              ~
 !!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived1'.
             d1.x;           // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class
             d2.x;           // Error, isn't accessed through an instance of the enclosing class
-            ~~~~
+               ~
 !!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived1'.
             d3.x;           // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
-            ~~~~
+               ~
 !!! error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
             d4.x;           // Error, isn't accessed through an instance of the enclosing class
-            ~~~~
+               ~
 !!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived1'.
         }
     }
@@ -74,14 +74,14 @@ tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAcce
             var d4: Derived4;
     
             b.x;            // Error, isn't accessed through an instance of the enclosing class
-            ~~~
+              ~
 !!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived2'.
             d1.x;           // Error, isn't accessed through an instance of the enclosing class
-            ~~~~
+               ~
 !!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived2'.
             d2.x;           // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class
             d3.x;           // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
-            ~~~~
+               ~
 !!! error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
             d4.x;           // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class or one of its subclasses
         }
@@ -97,17 +97,17 @@ tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAcce
             var d4: Derived4;
     
             b.x;            // Error, isn't accessed through an instance of the enclosing class
-            ~~~
+              ~
 !!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived3'.
             d1.x;           // Error, isn't accessed through an instance of the enclosing class
-            ~~~~
+               ~
 !!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived3'.
             d2.x;           // Error, isn't accessed through an instance of the enclosing class
-            ~~~~
+               ~
 !!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived3'.
             d3.x;           // OK, accessed within their declaring class
             d4.x;           // Error, isn't accessed through an instance of the enclosing class
-            ~~~~
+               ~
 !!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived3'.
         }
     }
@@ -121,16 +121,16 @@ tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAcce
             var d4: Derived4;
     
             b.x;            // Error, isn't accessed through an instance of the enclosing class
-            ~~~
+              ~
 !!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived4'.
             d1.x;           // Error, isn't accessed through an instance of the enclosing class
-            ~~~~
+               ~
 !!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived4'.
             d2.x;           // Error, isn't accessed through an instance of the enclosing class
-            ~~~~
+               ~
 !!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'Derived4'.
             d3.x;           // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
-            ~~~~
+               ~
 !!! error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
             d4.x;           // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class
         }
@@ -144,17 +144,17 @@ tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAcce
     var d4: Derived4;
     
     b.x;                    // Error, neither within their declaring class nor classes derived from their declaring class
-    ~~~
+      ~
 !!! error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
     d1.x;                   // Error, neither within their declaring class nor classes derived from their declaring class
-    ~~~~
+       ~
 !!! error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
     d2.x;                   // Error, neither within their declaring class nor classes derived from their declaring class
-    ~~~~
+       ~
 !!! error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
     d3.x;                   // Error, neither within their declaring class nor classes derived from their declaring class
-    ~~~~
+       ~
 !!! error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
     d4.x;                   // Error, neither within their declaring class nor classes derived from their declaring class
-    ~~~~
+       ~
 !!! error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
\ No newline at end of file
diff --git a/tests/baselines/reference/protectedInstanceMemberAccessibility.errors.txt b/tests/baselines/reference/protectedInstanceMemberAccessibility.errors.txt
index 4b950c70019..fc2ee300c9a 100644
--- a/tests/baselines/reference/protectedInstanceMemberAccessibility.errors.txt
+++ b/tests/baselines/reference/protectedInstanceMemberAccessibility.errors.txt
@@ -2,15 +2,15 @@ tests/cases/conformance/classes/members/accessibility/protectedInstanceMemberAcc
 tests/cases/conformance/classes/members/accessibility/protectedInstanceMemberAccessibility.ts(16,24): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
 tests/cases/conformance/classes/members/accessibility/protectedInstanceMemberAccessibility.ts(18,24): error TS2339: Property 'y' does not exist on type 'A'.
 tests/cases/conformance/classes/members/accessibility/protectedInstanceMemberAccessibility.ts(19,24): error TS2339: Property 'z' does not exist on type 'A'.
-tests/cases/conformance/classes/members/accessibility/protectedInstanceMemberAccessibility.ts(22,18): error TS2446: Property 'x' is protected and only accessible through an instance of class 'B'.
-tests/cases/conformance/classes/members/accessibility/protectedInstanceMemberAccessibility.ts(23,18): error TS2446: Property 'f' is protected and only accessible through an instance of class 'B'.
+tests/cases/conformance/classes/members/accessibility/protectedInstanceMemberAccessibility.ts(22,20): error TS2446: Property 'x' is protected and only accessible through an instance of class 'B'.
+tests/cases/conformance/classes/members/accessibility/protectedInstanceMemberAccessibility.ts(23,20): error TS2446: Property 'f' is protected and only accessible through an instance of class 'B'.
 tests/cases/conformance/classes/members/accessibility/protectedInstanceMemberAccessibility.ts(24,20): error TS2339: Property 'y' does not exist on type 'A'.
 tests/cases/conformance/classes/members/accessibility/protectedInstanceMemberAccessibility.ts(25,20): error TS2339: Property 'z' does not exist on type 'A'.
 tests/cases/conformance/classes/members/accessibility/protectedInstanceMemberAccessibility.ts(31,20): error TS2339: Property 'z' does not exist on type 'B'.
-tests/cases/conformance/classes/members/accessibility/protectedInstanceMemberAccessibility.ts(34,18): error TS2446: Property 'x' is protected and only accessible through an instance of class 'B'.
-tests/cases/conformance/classes/members/accessibility/protectedInstanceMemberAccessibility.ts(35,18): error TS2446: Property 'f' is protected and only accessible through an instance of class 'B'.
+tests/cases/conformance/classes/members/accessibility/protectedInstanceMemberAccessibility.ts(34,20): error TS2446: Property 'x' is protected and only accessible through an instance of class 'B'.
+tests/cases/conformance/classes/members/accessibility/protectedInstanceMemberAccessibility.ts(35,20): error TS2446: Property 'f' is protected and only accessible through an instance of class 'B'.
 tests/cases/conformance/classes/members/accessibility/protectedInstanceMemberAccessibility.ts(36,20): error TS2339: Property 'y' does not exist on type 'C'.
-tests/cases/conformance/classes/members/accessibility/protectedInstanceMemberAccessibility.ts(37,18): error TS2445: Property 'z' is protected and only accessible within class 'C' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedInstanceMemberAccessibility.ts(37,20): error TS2445: Property 'z' is protected and only accessible within class 'C' and its subclasses.
 
 
 ==== tests/cases/conformance/classes/members/accessibility/protectedInstanceMemberAccessibility.ts (13 errors) ====
@@ -44,10 +44,10 @@ tests/cases/conformance/classes/members/accessibility/protectedInstanceMemberAcc
     
             var a: A;
             var a1 = a.x;    // error
-                     ~~~
+                       ~
 !!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'B'.
             var a2 = a.f();  // error
-                     ~~~
+                       ~
 !!! error TS2446: Property 'f' is protected and only accessible through an instance of class 'B'.
             var a3 = a.y;    // error
                        ~
@@ -66,16 +66,16 @@ tests/cases/conformance/classes/members/accessibility/protectedInstanceMemberAcc
     
             var c: C;
             var c1 = c.x;    // error
-                     ~~~
+                       ~
 !!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'B'.
             var c2 = c.f();  // error
-                     ~~~
+                       ~
 !!! error TS2446: Property 'f' is protected and only accessible through an instance of class 'B'.
             var c3 = c.y;    // error
                        ~
 !!! error TS2339: Property 'y' does not exist on type 'C'.
             var c4 = c.z;    // error
-                     ~~~
+                       ~
 !!! error TS2445: Property 'z' is protected and only accessible within class 'C' and its subclasses.
         }
     }
diff --git a/tests/baselines/reference/protectedMembers.errors.txt b/tests/baselines/reference/protectedMembers.errors.txt
index c35bc25fe71..9171df2a485 100644
--- a/tests/baselines/reference/protectedMembers.errors.txt
+++ b/tests/baselines/reference/protectedMembers.errors.txt
@@ -1,23 +1,22 @@
-tests/cases/compiler/protectedMembers.ts(40,1): error TS2445: Property 'x' is protected and only accessible within class 'C1' and its subclasses.
-tests/cases/compiler/protectedMembers.ts(41,1): error TS2445: Property 'f' is protected and only accessible within class 'C1' and its subclasses.
-tests/cases/compiler/protectedMembers.ts(42,1): error TS2445: Property 'sx' is protected and only accessible within class 'C1' and its subclasses.
-tests/cases/compiler/protectedMembers.ts(43,1): error TS2445: Property 'sf' is protected and only accessible within class 'C1' and its subclasses.
-tests/cases/compiler/protectedMembers.ts(46,1): error TS2445: Property 'x' is protected and only accessible within class 'C1' and its subclasses.
-tests/cases/compiler/protectedMembers.ts(47,1): error TS2445: Property 'f' is protected and only accessible within class 'C2' and its subclasses.
-tests/cases/compiler/protectedMembers.ts(48,1): error TS2445: Property 'sx' is protected and only accessible within class 'C1' and its subclasses.
-tests/cases/compiler/protectedMembers.ts(49,1): error TS2445: Property 'sf' is protected and only accessible within class 'C2' and its subclasses.
-tests/cases/compiler/protectedMembers.ts(68,9): error TS2446: Property 'x' is protected and only accessible through an instance of class 'C'.
-tests/cases/compiler/protectedMembers.ts(69,9): error TS2446: Property 'x' is protected and only accessible through an instance of class 'C'.
-tests/cases/compiler/protectedMembers.ts(86,5): error TS1089: 'protected' modifier cannot appear on a constructor declaration.
-tests/cases/compiler/protectedMembers.ts(98,1): error TS2322: Type 'B1' is not assignable to type 'A1'.
+tests/cases/compiler/protectedMembers.ts(40,4): error TS2445: Property 'x' is protected and only accessible within class 'C1' and its subclasses.
+tests/cases/compiler/protectedMembers.ts(41,4): error TS2445: Property 'f' is protected and only accessible within class 'C1' and its subclasses.
+tests/cases/compiler/protectedMembers.ts(42,4): error TS2445: Property 'sx' is protected and only accessible within class 'C1' and its subclasses.
+tests/cases/compiler/protectedMembers.ts(43,4): error TS2445: Property 'sf' is protected and only accessible within class 'C1' and its subclasses.
+tests/cases/compiler/protectedMembers.ts(46,4): error TS2445: Property 'x' is protected and only accessible within class 'C1' and its subclasses.
+tests/cases/compiler/protectedMembers.ts(47,4): error TS2445: Property 'f' is protected and only accessible within class 'C2' and its subclasses.
+tests/cases/compiler/protectedMembers.ts(48,4): error TS2445: Property 'sx' is protected and only accessible within class 'C1' and its subclasses.
+tests/cases/compiler/protectedMembers.ts(49,4): error TS2445: Property 'sf' is protected and only accessible within class 'C2' and its subclasses.
+tests/cases/compiler/protectedMembers.ts(68,11): error TS2446: Property 'x' is protected and only accessible through an instance of class 'C'.
+tests/cases/compiler/protectedMembers.ts(69,11): error TS2446: Property 'x' is protected and only accessible through an instance of class 'C'.
+tests/cases/compiler/protectedMembers.ts(97,1): error TS2322: Type 'B1' is not assignable to type 'A1'.
   Property 'x' is protected but type 'B1' is not a class derived from 'A1'.
-tests/cases/compiler/protectedMembers.ts(99,1): error TS2322: Type 'A1' is not assignable to type 'B1'.
+tests/cases/compiler/protectedMembers.ts(98,1): error TS2322: Type 'A1' is not assignable to type 'B1'.
   Property 'x' is protected in type 'A1' but public in type 'B1'.
-tests/cases/compiler/protectedMembers.ts(112,7): error TS2415: Class 'B3' incorrectly extends base class 'A3'.
+tests/cases/compiler/protectedMembers.ts(111,7): error TS2415: Class 'B3' incorrectly extends base class 'A3'.
   Property 'x' is protected in type 'B3' but public in type 'A3'.
 
 
-==== tests/cases/compiler/protectedMembers.ts (14 errors) ====
+==== tests/cases/compiler/protectedMembers.ts (13 errors) ====
     // Class with protected members
     class C1 {
         protected x: number;
@@ -58,30 +57,30 @@ tests/cases/compiler/protectedMembers.ts(112,7): error TS2415: Class 'B3' incorr
     
     // All of these should be errors
     c1.x;
-    ~~~~
+       ~
 !!! error TS2445: Property 'x' is protected and only accessible within class 'C1' and its subclasses.
     c1.f();
-    ~~~~
+       ~
 !!! error TS2445: Property 'f' is protected and only accessible within class 'C1' and its subclasses.
     C1.sx;
-    ~~~~~
+       ~~
 !!! error TS2445: Property 'sx' is protected and only accessible within class 'C1' and its subclasses.
     C1.sf();
-    ~~~~~
+       ~~
 !!! error TS2445: Property 'sf' is protected and only accessible within class 'C1' and its subclasses.
     
     // All of these should be errors
     c2.x;
-    ~~~~
+       ~
 !!! error TS2445: Property 'x' is protected and only accessible within class 'C1' and its subclasses.
     c2.f();
-    ~~~~
+       ~
 !!! error TS2445: Property 'f' is protected and only accessible within class 'C2' and its subclasses.
     C2.sx;
-    ~~~~~
+       ~~
 !!! error TS2445: Property 'sx' is protected and only accessible within class 'C1' and its subclasses.
     C2.sf();
-    ~~~~~
+       ~~
 !!! error TS2445: Property 'sf' is protected and only accessible within class 'C2' and its subclasses.
     
     // All of these should be ok
@@ -102,10 +101,10 @@ tests/cases/compiler/protectedMembers.ts(112,7): error TS2415: Class 'B3' incorr
         z;
         static foo(a: A, b: B, c: C, d: D, e: E) {
             a.x = 1;  // Error, access must be through C or type derived from C
-            ~~~
+              ~
 !!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'C'.
             b.x = 1;  // Error, access must be through C or type derived from C
-            ~~~
+              ~
 !!! error TS2446: Property 'x' is protected and only accessible through an instance of class 'C'.
             c.x = 1;
             d.x = 1;
@@ -122,10 +121,7 @@ tests/cases/compiler/protectedMembers.ts(112,7): error TS2415: Class 'B3' incorr
     }
     
     class CC {
-        // Error, constructor cannot be protected
         protected constructor() {
-        ~~~~~~~~~
-!!! error TS1089: 'protected' modifier cannot appear on a constructor declaration.
         }
     }
     
diff --git a/tests/baselines/reference/protectedMembers.js b/tests/baselines/reference/protectedMembers.js
index e541f697f44..dcc68e0c946 100644
--- a/tests/baselines/reference/protectedMembers.js
+++ b/tests/baselines/reference/protectedMembers.js
@@ -83,7 +83,6 @@ interface E extends C {
 }
 
 class CC {
-    // Error, constructor cannot be protected
     protected constructor() {
     }
 }
@@ -214,7 +213,6 @@ var D = (function (_super) {
     return D;
 }(C));
 var CC = (function () {
-    // Error, constructor cannot be protected
     function CC() {
     }
     return CC;
diff --git a/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass.errors.txt b/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass.errors.txt
index 911633cb98f..361cf557ee5 100644
--- a/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass.errors.txt
+++ b/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/classes/members/accessibility/protectedStaticClassPropertyAccessibleWithinSubclass.ts(7,9): error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
-tests/cases/conformance/classes/members/accessibility/protectedStaticClassPropertyAccessibleWithinSubclass.ts(16,9): error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
-tests/cases/conformance/classes/members/accessibility/protectedStaticClassPropertyAccessibleWithinSubclass.ts(25,9): error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
-tests/cases/conformance/classes/members/accessibility/protectedStaticClassPropertyAccessibleWithinSubclass.ts(40,1): error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
-tests/cases/conformance/classes/members/accessibility/protectedStaticClassPropertyAccessibleWithinSubclass.ts(41,1): error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
-tests/cases/conformance/classes/members/accessibility/protectedStaticClassPropertyAccessibleWithinSubclass.ts(42,1): error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
-tests/cases/conformance/classes/members/accessibility/protectedStaticClassPropertyAccessibleWithinSubclass.ts(43,1): error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedStaticClassPropertyAccessibleWithinSubclass.ts(7,18): error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedStaticClassPropertyAccessibleWithinSubclass.ts(16,18): error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedStaticClassPropertyAccessibleWithinSubclass.ts(25,18): error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedStaticClassPropertyAccessibleWithinSubclass.ts(40,6): error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedStaticClassPropertyAccessibleWithinSubclass.ts(41,10): error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedStaticClassPropertyAccessibleWithinSubclass.ts(42,10): error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedStaticClassPropertyAccessibleWithinSubclass.ts(43,10): error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
 
 
 ==== tests/cases/conformance/classes/members/accessibility/protectedStaticClassPropertyAccessibleWithinSubclass.ts (7 errors) ====
@@ -15,7 +15,7 @@ tests/cases/conformance/classes/members/accessibility/protectedStaticClassProper
             Derived1.x;     // OK, accessed within their declaring class
             Derived2.x;     // OK, accessed within their declaring class
             Derived3.x;     // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
-            ~~~~~~~~~~
+                     ~
 !!! error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
         }
     }
@@ -26,7 +26,7 @@ tests/cases/conformance/classes/members/accessibility/protectedStaticClassProper
             Derived1.x;     // OK, accessed within a class derived from their declaring class
             Derived2.x;     // OK, accessed within a class derived from their declaring class
             Derived3.x;     // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
-            ~~~~~~~~~~
+                     ~
 !!! error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
         }
     }
@@ -37,7 +37,7 @@ tests/cases/conformance/classes/members/accessibility/protectedStaticClassProper
             Derived1.x;     // OK, accessed within a class derived from their declaring class
             Derived2.x;     // OK, accessed within a class derived from their declaring class
             Derived3.x;     // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
-            ~~~~~~~~~~
+                     ~
 !!! error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
         }
     }
@@ -54,14 +54,14 @@ tests/cases/conformance/classes/members/accessibility/protectedStaticClassProper
     
     
     Base.x;         // Error, neither within their declaring class nor classes derived from their declaring class
-    ~~~~~~
+         ~
 !!! error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
     Derived1.x;     // Error, neither within their declaring class nor classes derived from their declaring class
-    ~~~~~~~~~~
+             ~
 !!! error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
     Derived2.x;     // Error, neither within their declaring class nor classes derived from their declaring class
-    ~~~~~~~~~~
+             ~
 !!! error TS2445: Property 'x' is protected and only accessible within class 'Base' and its subclasses.
     Derived3.x;     // Error, neither within their declaring class nor classes derived from their declaring class
-    ~~~~~~~~~~
+             ~
 !!! error TS2445: Property 'x' is protected and only accessible within class 'Derived3' and its subclasses.
\ No newline at end of file
diff --git a/tests/baselines/reference/protectedStaticNotAccessibleInClodule.errors.txt b/tests/baselines/reference/protectedStaticNotAccessibleInClodule.errors.txt
index 059e5d6cb12..955884b90d9 100644
--- a/tests/baselines/reference/protectedStaticNotAccessibleInClodule.errors.txt
+++ b/tests/baselines/reference/protectedStaticNotAccessibleInClodule.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/classes/members/accessibility/protectedStaticNotAccessibleInClodule.ts(10,20): error TS2445: Property 'bar' is protected and only accessible within class 'C' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/protectedStaticNotAccessibleInClodule.ts(10,22): error TS2445: Property 'bar' is protected and only accessible within class 'C' and its subclasses.
 
 
 ==== tests/cases/conformance/classes/members/accessibility/protectedStaticNotAccessibleInClodule.ts (1 errors) ====
@@ -12,6 +12,6 @@ tests/cases/conformance/classes/members/accessibility/protectedStaticNotAccessib
     module C {
         export var f = C.foo; // OK
         export var b = C.bar; // error
-                       ~~~~~
+                         ~~~
 !!! error TS2445: Property 'bar' is protected and only accessible within class 'C' and its subclasses.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/prototypeInstantiatedWithBaseConstraint.symbols b/tests/baselines/reference/prototypeInstantiatedWithBaseConstraint.symbols
index bbb95de0910..2dc9a0b6704 100644
--- a/tests/baselines/reference/prototypeInstantiatedWithBaseConstraint.symbols
+++ b/tests/baselines/reference/prototypeInstantiatedWithBaseConstraint.symbols
@@ -4,7 +4,7 @@ class C<T> {
 >T : Symbol(T, Decl(prototypeInstantiatedWithBaseConstraint.ts, 0, 8))
 
     x: T;
->x : Symbol(x, Decl(prototypeInstantiatedWithBaseConstraint.ts, 0, 12))
+>x : Symbol(C.x, Decl(prototypeInstantiatedWithBaseConstraint.ts, 0, 12))
 >T : Symbol(T, Decl(prototypeInstantiatedWithBaseConstraint.ts, 0, 8))
 }
 
diff --git a/tests/baselines/reference/prototypeOnConstructorFunctions.symbols b/tests/baselines/reference/prototypeOnConstructorFunctions.symbols
index d3644ad89b2..56764468350 100644
--- a/tests/baselines/reference/prototypeOnConstructorFunctions.symbols
+++ b/tests/baselines/reference/prototypeOnConstructorFunctions.symbols
@@ -3,7 +3,7 @@ interface I1 {
 >I1 : Symbol(I1, Decl(prototypeOnConstructorFunctions.ts, 0, 0))
 
     const: new (options?, element?) => any;
->const : Symbol(const, Decl(prototypeOnConstructorFunctions.ts, 0, 14))
+>const : Symbol(I1.const, Decl(prototypeOnConstructorFunctions.ts, 0, 14))
 >options : Symbol(options, Decl(prototypeOnConstructorFunctions.ts, 1, 16))
 >element : Symbol(element, Decl(prototypeOnConstructorFunctions.ts, 1, 25))
 }
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/quotedPropertyName3.symbols b/tests/baselines/reference/quotedPropertyName3.symbols
index 1a843022425..2b09da7f6cc 100644
--- a/tests/baselines/reference/quotedPropertyName3.symbols
+++ b/tests/baselines/reference/quotedPropertyName3.symbols
@@ -4,12 +4,12 @@ class Test {
 
     "prop1": number;
     foo() {
->foo : Symbol(foo, Decl(quotedPropertyName3.ts, 1, 20))
+>foo : Symbol(Test.foo, Decl(quotedPropertyName3.ts, 1, 20))
 
         var x = () => this["prop1"];
 >x : Symbol(x, Decl(quotedPropertyName3.ts, 3, 11))
 >this : Symbol(Test, Decl(quotedPropertyName3.ts, 0, 0))
->"prop1" : Symbol("prop1", Decl(quotedPropertyName3.ts, 0, 12))
+>"prop1" : Symbol(Test."prop1", Decl(quotedPropertyName3.ts, 0, 12))
 
         var y: number = x();
 >y : Symbol(y, Decl(quotedPropertyName3.ts, 4, 11))
diff --git a/tests/baselines/reference/reExportGlobalDeclaration1.errors.txt b/tests/baselines/reference/reExportGlobalDeclaration1.errors.txt
index 0ebeed05b28..0d83d8b94ee 100644
--- a/tests/baselines/reference/reExportGlobalDeclaration1.errors.txt
+++ b/tests/baselines/reference/reExportGlobalDeclaration1.errors.txt
@@ -1,15 +1,15 @@
-tests/cases/compiler/file2.ts(1,9): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(1,12): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(2,9): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(2,13): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(4,9): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(4,12): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(5,9): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(5,12): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(8,9): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(9,9): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(10,9): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(11,9): error TS2661: Cannot re-export name that is not defined in the module.
+tests/cases/compiler/file2.ts(1,9): error TS2661: Cannot export 'x'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(1,12): error TS2661: Cannot export 'x'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(2,9): error TS2661: Cannot export 'x1'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(2,13): error TS2661: Cannot export 'x1'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(4,9): error TS2661: Cannot export 'a'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(4,12): error TS2661: Cannot export 'a'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(5,9): error TS2661: Cannot export 'b'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(5,12): error TS2661: Cannot export 'b'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(8,9): error TS2661: Cannot export 'x'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(9,9): error TS2661: Cannot export 'x1'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(10,9): error TS2661: Cannot export 'a'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(11,9): error TS2661: Cannot export 'b'. Only local declarations can be exported from a module.
 
 
 ==== tests/cases/compiler/file1.d.ts (0 errors) ====
@@ -21,37 +21,37 @@ tests/cases/compiler/file2.ts(11,9): error TS2661: Cannot re-export name that is
 ==== tests/cases/compiler/file2.ts (12 errors) ====
     export {x, x as y};
             ~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'x'. Only local declarations can be exported from a module.
                ~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'x'. Only local declarations can be exported from a module.
     export {x1, x1 as y1};
             ~~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'x1'. Only local declarations can be exported from a module.
                 ~~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'x1'. Only local declarations can be exported from a module.
     
     export {a, a as a1};
             ~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'a'. Only local declarations can be exported from a module.
                ~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'a'. Only local declarations can be exported from a module.
     export {b, b as b1};
             ~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'b'. Only local declarations can be exported from a module.
                ~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'b'. Only local declarations can be exported from a module.
     
     
     export {x as z};
             ~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'x'. Only local declarations can be exported from a module.
     export {x1 as z1};
             ~~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'x1'. Only local declarations can be exported from a module.
     export {a as a2};
             ~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'a'. Only local declarations can be exported from a module.
     export {b as b2};
             ~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'b'. Only local declarations can be exported from a module.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/reExportGlobalDeclaration2.errors.txt b/tests/baselines/reference/reExportGlobalDeclaration2.errors.txt
index 17a3e2ad565..b24a52aff49 100644
--- a/tests/baselines/reference/reExportGlobalDeclaration2.errors.txt
+++ b/tests/baselines/reference/reExportGlobalDeclaration2.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/compiler/file2.ts(1,9): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(1,13): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(2,9): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(2,13): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(3,9): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(4,9): error TS2661: Cannot re-export name that is not defined in the module.
+tests/cases/compiler/file2.ts(1,9): error TS2661: Cannot export 'I1'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(1,13): error TS2661: Cannot export 'I1'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(2,9): error TS2661: Cannot export 'I2'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(2,13): error TS2661: Cannot export 'I2'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(3,9): error TS2661: Cannot export 'I1'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(4,9): error TS2661: Cannot export 'I2'. Only local declarations can be exported from a module.
 
 
 ==== tests/cases/compiler/file1.d.ts (0 errors) ====
@@ -19,17 +19,17 @@ tests/cases/compiler/file2.ts(4,9): error TS2661: Cannot re-export name that is
 ==== tests/cases/compiler/file2.ts (6 errors) ====
     export {I1, I1 as II1};
             ~~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'I1'. Only local declarations can be exported from a module.
                 ~~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'I1'. Only local declarations can be exported from a module.
     export {I2, I2 as II2};
             ~~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'I2'. Only local declarations can be exported from a module.
                 ~~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'I2'. Only local declarations can be exported from a module.
     export {I1 as III1};
             ~~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'I1'. Only local declarations can be exported from a module.
     export {I2 as III2};
             ~~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
\ No newline at end of file
+!!! error TS2661: Cannot export 'I2'. Only local declarations can be exported from a module.
\ No newline at end of file
diff --git a/tests/baselines/reference/reExportGlobalDeclaration3.errors.txt b/tests/baselines/reference/reExportGlobalDeclaration3.errors.txt
index d99c184518c..2f469e80491 100644
--- a/tests/baselines/reference/reExportGlobalDeclaration3.errors.txt
+++ b/tests/baselines/reference/reExportGlobalDeclaration3.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/compiler/file2.ts(1,9): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(1,14): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(2,9): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(2,14): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(3,9): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(4,9): error TS2661: Cannot re-export name that is not defined in the module.
+tests/cases/compiler/file2.ts(1,9): error TS2661: Cannot export 'NS1'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(1,14): error TS2661: Cannot export 'NS1'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(2,9): error TS2661: Cannot export 'NS2'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(2,14): error TS2661: Cannot export 'NS2'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(3,9): error TS2661: Cannot export 'NS1'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(4,9): error TS2661: Cannot export 'NS2'. Only local declarations can be exported from a module.
 
 
 ==== tests/cases/compiler/file1.d.ts (0 errors) ====
@@ -19,17 +19,17 @@ tests/cases/compiler/file2.ts(4,9): error TS2661: Cannot re-export name that is
 ==== tests/cases/compiler/file2.ts (6 errors) ====
     export {NS1, NS1 as NNS1};
             ~~~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'NS1'. Only local declarations can be exported from a module.
                  ~~~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'NS1'. Only local declarations can be exported from a module.
     export {NS2, NS2 as NNS2};
             ~~~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'NS2'. Only local declarations can be exported from a module.
                  ~~~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'NS2'. Only local declarations can be exported from a module.
     export {NS1 as NNNS1};
             ~~~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'NS1'. Only local declarations can be exported from a module.
     export {NS2 as NNNS2};
             ~~~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
\ No newline at end of file
+!!! error TS2661: Cannot export 'NS2'. Only local declarations can be exported from a module.
\ No newline at end of file
diff --git a/tests/baselines/reference/reExportGlobalDeclaration4.errors.txt b/tests/baselines/reference/reExportGlobalDeclaration4.errors.txt
index 5e250a5fc57..a3b58a276ae 100644
--- a/tests/baselines/reference/reExportGlobalDeclaration4.errors.txt
+++ b/tests/baselines/reference/reExportGlobalDeclaration4.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/compiler/file2.ts(1,9): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(1,15): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(2,9): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(2,15): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(3,9): error TS2661: Cannot re-export name that is not defined in the module.
-tests/cases/compiler/file2.ts(4,9): error TS2661: Cannot re-export name that is not defined in the module.
+tests/cases/compiler/file2.ts(1,9): error TS2661: Cannot export 'Cls1'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(1,15): error TS2661: Cannot export 'Cls1'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(2,9): error TS2661: Cannot export 'Cls2'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(2,15): error TS2661: Cannot export 'Cls2'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(3,9): error TS2661: Cannot export 'Cls1'. Only local declarations can be exported from a module.
+tests/cases/compiler/file2.ts(4,9): error TS2661: Cannot export 'Cls2'. Only local declarations can be exported from a module.
 
 
 ==== tests/cases/compiler/file1.d.ts (0 errors) ====
@@ -19,17 +19,17 @@ tests/cases/compiler/file2.ts(4,9): error TS2661: Cannot re-export name that is
 ==== tests/cases/compiler/file2.ts (6 errors) ====
     export {Cls1, Cls1 as CCls1};
             ~~~~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'Cls1'. Only local declarations can be exported from a module.
                   ~~~~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'Cls1'. Only local declarations can be exported from a module.
     export {Cls2, Cls2 as CCls2};
             ~~~~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'Cls2'. Only local declarations can be exported from a module.
                   ~~~~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'Cls2'. Only local declarations can be exported from a module.
     export {Cls1 as CCCls1};
             ~~~~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
+!!! error TS2661: Cannot export 'Cls1'. Only local declarations can be exported from a module.
     export {Cls2 as CCCls2};
             ~~~~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
\ No newline at end of file
+!!! error TS2661: Cannot export 'Cls2'. Only local declarations can be exported from a module.
\ No newline at end of file
diff --git a/tests/baselines/reference/reExportUndefined1.errors.txt b/tests/baselines/reference/reExportUndefined1.errors.txt
index ff3259ae37e..5042b4c4c0c 100644
--- a/tests/baselines/reference/reExportUndefined1.errors.txt
+++ b/tests/baselines/reference/reExportUndefined1.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/compiler/a.ts(2,10): error TS2661: Cannot re-export name that is not defined in the module.
+tests/cases/compiler/a.ts(2,10): error TS2661: Cannot export 'undefined'. Only local declarations can be exported from a module.
 
 
 ==== tests/cases/compiler/a.ts (1 errors) ====
     
     export { undefined };
              ~~~~~~~~~
-!!! error TS2661: Cannot re-export name that is not defined in the module.
\ No newline at end of file
+!!! error TS2661: Cannot export 'undefined'. Only local declarations can be exported from a module.
\ No newline at end of file
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 26967d56b7b..3a21504bb80 100644
--- a/tests/baselines/reference/reactNamespaceJSXEmit.js
+++ b/tests/baselines/reference/reactNamespaceJSXEmit.js
@@ -13,8 +13,16 @@ declare var x: any;
 
 
 //// [reactNamespaceJSXEmit.js]
-myReactLib.createElement("foo", {data: true});
-myReactLib.createElement(Bar, {x: x});
+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;
+};
+myReactLib.createElement("foo", { data: true });
+myReactLib.createElement(Bar, { x: x });
 myReactLib.createElement("x-component", null);
-myReactLib.createElement(Bar, myReactLib.__spread({}, x));
-myReactLib.createElement(Bar, myReactLib.__spread({}, x, {y: 2}));
+myReactLib.createElement(Bar, __assign({}, x));
+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/readonlyInDeclarationFile.symbols b/tests/baselines/reference/readonlyInDeclarationFile.symbols
index af979e4dacd..c5f3b066a5d 100644
--- a/tests/baselines/reference/readonlyInDeclarationFile.symbols
+++ b/tests/baselines/reference/readonlyInDeclarationFile.symbols
@@ -4,7 +4,7 @@ interface Foo {
 >Foo : Symbol(Foo, Decl(readonlyInDeclarationFile.ts, 0, 0))
 
     readonly x: number;
->x : Symbol(x, Decl(readonlyInDeclarationFile.ts, 1, 15))
+>x : Symbol(Foo.x, Decl(readonlyInDeclarationFile.ts, 1, 15))
 
     readonly [x: string]: Object;
 >x : Symbol(x, Decl(readonlyInDeclarationFile.ts, 3, 14))
@@ -19,42 +19,42 @@ class C {
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     private readonly a1: number;
->a1 : Symbol(a1, Decl(readonlyInDeclarationFile.ts, 7, 33))
+>a1 : Symbol(C.a1, Decl(readonlyInDeclarationFile.ts, 7, 33))
 
     protected readonly a2: number;
->a2 : Symbol(a2, Decl(readonlyInDeclarationFile.ts, 8, 32))
+>a2 : Symbol(C.a2, Decl(readonlyInDeclarationFile.ts, 8, 32))
 
     public readonly a3: number;
->a3 : Symbol(a3, Decl(readonlyInDeclarationFile.ts, 9, 34))
+>a3 : Symbol(C.a3, Decl(readonlyInDeclarationFile.ts, 9, 34))
 
     private get b1() { return 1 }
->b1 : Symbol(b1, Decl(readonlyInDeclarationFile.ts, 10, 31))
+>b1 : Symbol(C.b1, Decl(readonlyInDeclarationFile.ts, 10, 31))
 
     protected get b2() { return 1 }
->b2 : Symbol(b2, Decl(readonlyInDeclarationFile.ts, 11, 33))
+>b2 : Symbol(C.b2, Decl(readonlyInDeclarationFile.ts, 11, 33))
 
     public get b3() { return 1 }
->b3 : Symbol(b3, Decl(readonlyInDeclarationFile.ts, 12, 35))
+>b3 : Symbol(C.b3, Decl(readonlyInDeclarationFile.ts, 12, 35))
 
     private get c1() { return 1 }
->c1 : Symbol(c1, Decl(readonlyInDeclarationFile.ts, 13, 32), Decl(readonlyInDeclarationFile.ts, 14, 33))
+>c1 : Symbol(C.c1, Decl(readonlyInDeclarationFile.ts, 13, 32), Decl(readonlyInDeclarationFile.ts, 14, 33))
 
     private set c1(value) { }
->c1 : Symbol(c1, Decl(readonlyInDeclarationFile.ts, 13, 32), Decl(readonlyInDeclarationFile.ts, 14, 33))
+>c1 : Symbol(C.c1, Decl(readonlyInDeclarationFile.ts, 13, 32), Decl(readonlyInDeclarationFile.ts, 14, 33))
 >value : Symbol(value, Decl(readonlyInDeclarationFile.ts, 15, 19))
 
     protected get c2() { return 1 }
->c2 : Symbol(c2, Decl(readonlyInDeclarationFile.ts, 15, 29), Decl(readonlyInDeclarationFile.ts, 16, 35))
+>c2 : Symbol(C.c2, Decl(readonlyInDeclarationFile.ts, 15, 29), Decl(readonlyInDeclarationFile.ts, 16, 35))
 
     protected set c2(value) { }
->c2 : Symbol(c2, Decl(readonlyInDeclarationFile.ts, 15, 29), Decl(readonlyInDeclarationFile.ts, 16, 35))
+>c2 : Symbol(C.c2, Decl(readonlyInDeclarationFile.ts, 15, 29), Decl(readonlyInDeclarationFile.ts, 16, 35))
 >value : Symbol(value, Decl(readonlyInDeclarationFile.ts, 17, 21))
 
     public get c3() { return 1 }
->c3 : Symbol(c3, Decl(readonlyInDeclarationFile.ts, 17, 31), Decl(readonlyInDeclarationFile.ts, 18, 32))
+>c3 : Symbol(C.c3, Decl(readonlyInDeclarationFile.ts, 17, 31), Decl(readonlyInDeclarationFile.ts, 18, 32))
 
     public set c3(value) { }
->c3 : Symbol(c3, Decl(readonlyInDeclarationFile.ts, 17, 31), Decl(readonlyInDeclarationFile.ts, 18, 32))
+>c3 : Symbol(C.c3, Decl(readonlyInDeclarationFile.ts, 17, 31), Decl(readonlyInDeclarationFile.ts, 18, 32))
 >value : Symbol(value, Decl(readonlyInDeclarationFile.ts, 19, 18))
 
     private static readonly s1: number;
diff --git a/tests/baselines/reference/reboundBaseClassSymbol.symbols b/tests/baselines/reference/reboundBaseClassSymbol.symbols
index 788d7d95c9e..79cc00a6459 100644
--- a/tests/baselines/reference/reboundBaseClassSymbol.symbols
+++ b/tests/baselines/reference/reboundBaseClassSymbol.symbols
@@ -1,7 +1,7 @@
 === tests/cases/compiler/reboundBaseClassSymbol.ts ===
 interface A { a: number; }
 >A : Symbol(A, Decl(reboundBaseClassSymbol.ts, 0, 0))
->a : Symbol(a, Decl(reboundBaseClassSymbol.ts, 0, 13))
+>a : Symbol(A.a, Decl(reboundBaseClassSymbol.ts, 0, 13))
 
 module Foo {
 >Foo : Symbol(Foo, Decl(reboundBaseClassSymbol.ts, 0, 26))
@@ -12,5 +12,5 @@ module Foo {
     interface B extends A { b: string; } 
 >B : Symbol(B, Decl(reboundBaseClassSymbol.ts, 2, 14))
 >A : Symbol(A, Decl(reboundBaseClassSymbol.ts, 0, 0))
->b : Symbol(b, Decl(reboundBaseClassSymbol.ts, 3, 27))
+>b : Symbol(B.b, Decl(reboundBaseClassSymbol.ts, 3, 27))
 }
diff --git a/tests/baselines/reference/recursiveBaseConstructorCreation1.symbols b/tests/baselines/reference/recursiveBaseConstructorCreation1.symbols
index 5cef41185e8..9185ecbfec0 100644
--- a/tests/baselines/reference/recursiveBaseConstructorCreation1.symbols
+++ b/tests/baselines/reference/recursiveBaseConstructorCreation1.symbols
@@ -3,7 +3,7 @@ class C1 {
 >C1 : Symbol(C1, Decl(recursiveBaseConstructorCreation1.ts, 0, 0))
 
 public func(param: C2): any { }
->func : Symbol(func, Decl(recursiveBaseConstructorCreation1.ts, 0, 10))
+>func : Symbol(C1.func, Decl(recursiveBaseConstructorCreation1.ts, 0, 10))
 >param : Symbol(param, Decl(recursiveBaseConstructorCreation1.ts, 1, 12))
 >C2 : Symbol(C2, Decl(recursiveBaseConstructorCreation1.ts, 2, 1))
 }
diff --git a/tests/baselines/reference/recursiveBaseConstructorCreation2.symbols b/tests/baselines/reference/recursiveBaseConstructorCreation2.symbols
index 794c8a38dc4..e2e0642f5aa 100644
--- a/tests/baselines/reference/recursiveBaseConstructorCreation2.symbols
+++ b/tests/baselines/reference/recursiveBaseConstructorCreation2.symbols
@@ -8,7 +8,7 @@ declare class abc extends base
 >base : Symbol(base, Decl(recursiveBaseConstructorCreation2.ts, 0, 0))
 {
    foo: xyz;
->foo : Symbol(foo, Decl(recursiveBaseConstructorCreation2.ts, 4, 1))
+>foo : Symbol(abc.foo, Decl(recursiveBaseConstructorCreation2.ts, 4, 1))
 >xyz : Symbol(xyz, Decl(recursiveBaseConstructorCreation2.ts, 6, 1))
 }
 declare class xyz extends abc
diff --git a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.symbols b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.symbols
index 35fa0bf5ab0..c722d8ef8f7 100644
--- a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.symbols
+++ b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.symbols
@@ -12,7 +12,7 @@ export class MemberName {
 >MemberName : Symbol(MemberName, Decl(recursiveClassInstantiationsWithDefaultConstructors.ts, 1, 20))
 
 public prefix: string = "";
->prefix : Symbol(prefix, Decl(recursiveClassInstantiationsWithDefaultConstructors.ts, 2, 25))
+>prefix : Symbol(MemberName.prefix, Decl(recursiveClassInstantiationsWithDefaultConstructors.ts, 2, 25))
 }
 export class MemberNameArray extends MemberName {
 >MemberNameArray : Symbol(MemberNameArray, Decl(recursiveClassInstantiationsWithDefaultConstructors.ts, 4, 1))
diff --git a/tests/baselines/reference/recursiveComplicatedClasses.symbols b/tests/baselines/reference/recursiveComplicatedClasses.symbols
index 93d0378793d..4fb614ae798 100644
--- a/tests/baselines/reference/recursiveComplicatedClasses.symbols
+++ b/tests/baselines/reference/recursiveComplicatedClasses.symbols
@@ -3,7 +3,7 @@ class Signature {
 >Signature : Symbol(Signature, Decl(recursiveComplicatedClasses.ts, 0, 0))
 
     public parameters: ParameterSymbol[] = null;
->parameters : Symbol(parameters, Decl(recursiveComplicatedClasses.ts, 0, 17))
+>parameters : Symbol(Signature.parameters, Decl(recursiveComplicatedClasses.ts, 0, 17))
 >ParameterSymbol : Symbol(ParameterSymbol, Decl(recursiveComplicatedClasses.ts, 17, 1))
 }
 
@@ -19,10 +19,10 @@ class Symbol {
 >Symbol : Symbol(Symbol, Decl(recursiveComplicatedClasses.ts, 6, 1))
 
     public bound: boolean;
->bound : Symbol(bound, Decl(recursiveComplicatedClasses.ts, 8, 14))
+>bound : Symbol(Symbol.bound, Decl(recursiveComplicatedClasses.ts, 8, 14))
 
     public visible() {
->visible : Symbol(visible, Decl(recursiveComplicatedClasses.ts, 9, 26))
+>visible : Symbol(Symbol.visible, Decl(recursiveComplicatedClasses.ts, 9, 26))
 
         var b: TypeSymbol;
 >b : Symbol(b, Decl(recursiveComplicatedClasses.ts, 11, 11))
diff --git a/tests/baselines/reference/recursiveIdenticalAssignment.symbols b/tests/baselines/reference/recursiveIdenticalAssignment.symbols
index b82fe1d9d17..54a871c5141 100644
--- a/tests/baselines/reference/recursiveIdenticalAssignment.symbols
+++ b/tests/baselines/reference/recursiveIdenticalAssignment.symbols
@@ -4,7 +4,7 @@ interface A<T> {
 >T : Symbol(T, Decl(recursiveIdenticalAssignment.ts, 0, 12))
 
     x: A<T>
->x : Symbol(x, Decl(recursiveIdenticalAssignment.ts, 0, 16))
+>x : Symbol(A.x, Decl(recursiveIdenticalAssignment.ts, 0, 16))
 >A : Symbol(A, Decl(recursiveIdenticalAssignment.ts, 0, 0))
 >T : Symbol(T, Decl(recursiveIdenticalAssignment.ts, 0, 12))
 }
@@ -17,7 +17,7 @@ interface B<T extends B<B<T>>> { // error, constraint referencing itself
 >T : Symbol(T, Decl(recursiveIdenticalAssignment.ts, 4, 12))
 
     x: B<T>
->x : Symbol(x, Decl(recursiveIdenticalAssignment.ts, 4, 32))
+>x : Symbol(B.x, Decl(recursiveIdenticalAssignment.ts, 4, 32))
 >B : Symbol(B, Decl(recursiveIdenticalAssignment.ts, 2, 1))
 >T : Symbol(T, Decl(recursiveIdenticalAssignment.ts, 4, 12))
 }
diff --git a/tests/baselines/reference/recursiveIntersectionTypes.errors.txt b/tests/baselines/reference/recursiveIntersectionTypes.errors.txt
index bac97470e55..34a25c19712 100644
--- a/tests/baselines/reference/recursiveIntersectionTypes.errors.txt
+++ b/tests/baselines/reference/recursiveIntersectionTypes.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/conformance/types/intersection/recursiveIntersectionTypes.ts(19,1): error TS2322: Type 'Entity & { next: Entity & any; }' is not assignable to type 'Product & { next: Product & any; }'.
   Type 'Entity & { next: Entity & any; }' is not assignable to type 'Product'.
-    Type '{ next: Entity & any; }' is not assignable to type 'Product'.
-      Property 'price' is missing in type '{ next: Entity & any; }'.
+    Property 'price' is missing in type 'Entity & { next: Entity & any; }'.
 
 
 ==== tests/cases/conformance/types/intersection/recursiveIntersectionTypes.ts (1 errors) ====
@@ -27,6 +26,5 @@ tests/cases/conformance/types/intersection/recursiveIntersectionTypes.ts(19,1):
     ~~~~~~~~~~~
 !!! error TS2322: Type 'Entity & { next: Entity & any; }' is not assignable to type 'Product & { next: Product & any; }'.
 !!! error TS2322:   Type 'Entity & { next: Entity & any; }' is not assignable to type 'Product'.
-!!! error TS2322:     Type '{ next: Entity & any; }' is not assignable to type 'Product'.
-!!! error TS2322:       Property 'price' is missing in type '{ next: Entity & any; }'.
+!!! error TS2322:     Property 'price' is missing in type 'Entity & { next: Entity & any; }'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/recursiveProperties.symbols b/tests/baselines/reference/recursiveProperties.symbols
index 11ecc0a4f90..73df9163d2e 100644
--- a/tests/baselines/reference/recursiveProperties.symbols
+++ b/tests/baselines/reference/recursiveProperties.symbols
@@ -3,20 +3,20 @@ class A {
 >A : Symbol(A, Decl(recursiveProperties.ts, 0, 0))
 
     get testProp() { return this.testProp; }
->testProp : Symbol(testProp, Decl(recursiveProperties.ts, 0, 9))
->this.testProp : Symbol(testProp, Decl(recursiveProperties.ts, 0, 9))
+>testProp : Symbol(A.testProp, Decl(recursiveProperties.ts, 0, 9))
+>this.testProp : Symbol(A.testProp, Decl(recursiveProperties.ts, 0, 9))
 >this : Symbol(A, Decl(recursiveProperties.ts, 0, 0))
->testProp : Symbol(testProp, Decl(recursiveProperties.ts, 0, 9))
+>testProp : Symbol(A.testProp, Decl(recursiveProperties.ts, 0, 9))
 }
 
 class B {
 >B : Symbol(B, Decl(recursiveProperties.ts, 2, 1))
 
     set testProp(value:string) { this.testProp = value; }
->testProp : Symbol(testProp, Decl(recursiveProperties.ts, 4, 9))
+>testProp : Symbol(B.testProp, Decl(recursiveProperties.ts, 4, 9))
 >value : Symbol(value, Decl(recursiveProperties.ts, 5, 17))
->this.testProp : Symbol(testProp, Decl(recursiveProperties.ts, 4, 9))
+>this.testProp : Symbol(B.testProp, Decl(recursiveProperties.ts, 4, 9))
 >this : Symbol(B, Decl(recursiveProperties.ts, 2, 1))
->testProp : Symbol(testProp, Decl(recursiveProperties.ts, 4, 9))
+>testProp : Symbol(B.testProp, Decl(recursiveProperties.ts, 4, 9))
 >value : Symbol(value, Decl(recursiveProperties.ts, 5, 17))
 }
diff --git a/tests/baselines/reference/recursiveSpecializationOfExtendedTypeWithError.symbols b/tests/baselines/reference/recursiveSpecializationOfExtendedTypeWithError.symbols
index d7bb467ac94..88b0cad70f1 100644
--- a/tests/baselines/reference/recursiveSpecializationOfExtendedTypeWithError.symbols
+++ b/tests/baselines/reference/recursiveSpecializationOfExtendedTypeWithError.symbols
@@ -3,7 +3,7 @@ interface HTMLSelectElement {
 >HTMLSelectElement : Symbol(HTMLSelectElement, Decl(recursiveSpecializationOfExtendedTypeWithError.ts, 0, 0))
 
     options: HTMLSelectElement;
->options : Symbol(options, Decl(recursiveSpecializationOfExtendedTypeWithError.ts, 0, 29))
+>options : Symbol(HTMLSelectElement.options, Decl(recursiveSpecializationOfExtendedTypeWithError.ts, 0, 29))
 >HTMLSelectElement : Symbol(HTMLSelectElement, Decl(recursiveSpecializationOfExtendedTypeWithError.ts, 0, 0))
 
     <A>(name: A): any;
diff --git a/tests/baselines/reference/recursiveTupleTypes1.symbols b/tests/baselines/reference/recursiveTupleTypes1.symbols
index 8bd0797f3f6..94802dd5135 100644
--- a/tests/baselines/reference/recursiveTupleTypes1.symbols
+++ b/tests/baselines/reference/recursiveTupleTypes1.symbols
@@ -3,7 +3,7 @@ interface Tree1 {
 >Tree1 : Symbol(Tree1, Decl(recursiveTupleTypes1.ts, 0, 0))
 
     children: [Tree1, Tree2];
->children : Symbol(children, Decl(recursiveTupleTypes1.ts, 0, 17))
+>children : Symbol(Tree1.children, Decl(recursiveTupleTypes1.ts, 0, 17))
 >Tree1 : Symbol(Tree1, Decl(recursiveTupleTypes1.ts, 0, 0))
 >Tree2 : Symbol(Tree2, Decl(recursiveTupleTypes1.ts, 2, 1))
 }
@@ -12,7 +12,7 @@ interface Tree2 {
 >Tree2 : Symbol(Tree2, Decl(recursiveTupleTypes1.ts, 2, 1))
 
     children: [Tree2, Tree1];
->children : Symbol(children, Decl(recursiveTupleTypes1.ts, 4, 17))
+>children : Symbol(Tree2.children, Decl(recursiveTupleTypes1.ts, 4, 17))
 >Tree2 : Symbol(Tree2, Decl(recursiveTupleTypes1.ts, 2, 1))
 >Tree1 : Symbol(Tree1, Decl(recursiveTupleTypes1.ts, 0, 0))
 }
diff --git a/tests/baselines/reference/recursiveTupleTypes2.symbols b/tests/baselines/reference/recursiveTupleTypes2.symbols
index 2895f1b5669..8212239f89e 100644
--- a/tests/baselines/reference/recursiveTupleTypes2.symbols
+++ b/tests/baselines/reference/recursiveTupleTypes2.symbols
@@ -3,7 +3,7 @@ interface Tree1 {
 >Tree1 : Symbol(Tree1, Decl(recursiveTupleTypes2.ts, 0, 0))
 
     children: [Tree1, Tree2];
->children : Symbol(children, Decl(recursiveTupleTypes2.ts, 0, 17))
+>children : Symbol(Tree1.children, Decl(recursiveTupleTypes2.ts, 0, 17))
 >Tree1 : Symbol(Tree1, Decl(recursiveTupleTypes2.ts, 0, 0))
 >Tree2 : Symbol(Tree2, Decl(recursiveTupleTypes2.ts, 2, 1))
 }
@@ -12,7 +12,7 @@ interface Tree2 {
 >Tree2 : Symbol(Tree2, Decl(recursiveTupleTypes2.ts, 2, 1))
 
     children: [Tree2, Tree2];
->children : Symbol(children, Decl(recursiveTupleTypes2.ts, 4, 17))
+>children : Symbol(Tree2.children, Decl(recursiveTupleTypes2.ts, 4, 17))
 >Tree2 : Symbol(Tree2, Decl(recursiveTupleTypes2.ts, 2, 1))
 >Tree2 : Symbol(Tree2, Decl(recursiveTupleTypes2.ts, 2, 1))
 }
diff --git a/tests/baselines/reference/recursiveTypeComparison.symbols b/tests/baselines/reference/recursiveTypeComparison.symbols
index 7aa566971e8..baca46bce71 100644
--- a/tests/baselines/reference/recursiveTypeComparison.symbols
+++ b/tests/baselines/reference/recursiveTypeComparison.symbols
@@ -7,23 +7,23 @@ interface Observable<T> {
 
     // This member can't be of type T, Property<T>, or Observable<anything but T>
     needThisOne: Observable<T>;
->needThisOne : Symbol(needThisOne, Decl(recursiveTypeComparison.ts, 2, 25))
+>needThisOne : Symbol(Observable.needThisOne, Decl(recursiveTypeComparison.ts, 2, 25))
 >Observable : Symbol(Observable, Decl(recursiveTypeComparison.ts, 0, 0))
 >T : Symbol(T, Decl(recursiveTypeComparison.ts, 2, 21))
 
     // Add more to make it slower
     expo1: Property<T[]>; //  0.31 seconds in check
->expo1 : Symbol(expo1, Decl(recursiveTypeComparison.ts, 4, 31))
+>expo1 : Symbol(Observable.expo1, Decl(recursiveTypeComparison.ts, 4, 31))
 >Property : Symbol(Property, Decl(recursiveTypeComparison.ts, 9, 1))
 >T : Symbol(T, Decl(recursiveTypeComparison.ts, 2, 21))
 
     expo2: Property<T[]>; //  3.11 seconds
->expo2 : Symbol(expo2, Decl(recursiveTypeComparison.ts, 6, 25))
+>expo2 : Symbol(Observable.expo2, Decl(recursiveTypeComparison.ts, 6, 25))
 >Property : Symbol(Property, Decl(recursiveTypeComparison.ts, 9, 1))
 >T : Symbol(T, Decl(recursiveTypeComparison.ts, 2, 21))
 
     expo3: Property<T[]>; // 82.28 seconds
->expo3 : Symbol(expo3, Decl(recursiveTypeComparison.ts, 7, 25))
+>expo3 : Symbol(Observable.expo3, Decl(recursiveTypeComparison.ts, 7, 25))
 >Property : Symbol(Property, Decl(recursiveTypeComparison.ts, 9, 1))
 >T : Symbol(T, Decl(recursiveTypeComparison.ts, 2, 21))
 }
diff --git a/tests/baselines/reference/recursiveTypeInGenericConstraint.symbols b/tests/baselines/reference/recursiveTypeInGenericConstraint.symbols
index d23245e2187..aaace0cd0c4 100644
--- a/tests/baselines/reference/recursiveTypeInGenericConstraint.symbols
+++ b/tests/baselines/reference/recursiveTypeInGenericConstraint.symbols
@@ -4,7 +4,7 @@ class G<T> {
 >T : Symbol(T, Decl(recursiveTypeInGenericConstraint.ts, 0, 8))
 
     x: G<G<T>>; // infinitely expanding type reference
->x : Symbol(x, Decl(recursiveTypeInGenericConstraint.ts, 0, 12))
+>x : Symbol(G.x, Decl(recursiveTypeInGenericConstraint.ts, 0, 12))
 >G : Symbol(G, Decl(recursiveTypeInGenericConstraint.ts, 0, 0))
 >G : Symbol(G, Decl(recursiveTypeInGenericConstraint.ts, 0, 0))
 >T : Symbol(T, Decl(recursiveTypeInGenericConstraint.ts, 0, 8))
@@ -17,7 +17,7 @@ class Foo<T extends G<T>> { // error, constraint referencing itself
 >T : Symbol(T, Decl(recursiveTypeInGenericConstraint.ts, 4, 10))
 
     bar: T;
->bar : Symbol(bar, Decl(recursiveTypeInGenericConstraint.ts, 4, 27))
+>bar : Symbol(Foo.bar, Decl(recursiveTypeInGenericConstraint.ts, 4, 27))
 >T : Symbol(T, Decl(recursiveTypeInGenericConstraint.ts, 4, 10))
 }
 
@@ -26,7 +26,7 @@ class D<T> {
 >T : Symbol(T, Decl(recursiveTypeInGenericConstraint.ts, 8, 8))
 
     x: G<G<T>>; 
->x : Symbol(x, Decl(recursiveTypeInGenericConstraint.ts, 8, 12))
+>x : Symbol(D.x, Decl(recursiveTypeInGenericConstraint.ts, 8, 12))
 >G : Symbol(G, Decl(recursiveTypeInGenericConstraint.ts, 0, 0))
 >G : Symbol(G, Decl(recursiveTypeInGenericConstraint.ts, 0, 0))
 >T : Symbol(T, Decl(recursiveTypeInGenericConstraint.ts, 8, 8))
diff --git a/tests/baselines/reference/recursiveTypeParameterReferenceError1.symbols b/tests/baselines/reference/recursiveTypeParameterReferenceError1.symbols
index e9bb848c0e3..c1695bd2130 100644
--- a/tests/baselines/reference/recursiveTypeParameterReferenceError1.symbols
+++ b/tests/baselines/reference/recursiveTypeParameterReferenceError1.symbols
@@ -8,7 +8,7 @@ interface Foo<T> {
 >T : Symbol(T, Decl(recursiveTypeParameterReferenceError1.ts, 1, 14))
 
     z: Foo<X<T>>; // error
->z : Symbol(z, Decl(recursiveTypeParameterReferenceError1.ts, 1, 18))
+>z : Symbol(Foo.z, Decl(recursiveTypeParameterReferenceError1.ts, 1, 18))
 >Foo : Symbol(Foo, Decl(recursiveTypeParameterReferenceError1.ts, 0, 14))
 >X : Symbol(X, Decl(recursiveTypeParameterReferenceError1.ts, 0, 0))
 >T : Symbol(T, Decl(recursiveTypeParameterReferenceError1.ts, 1, 14))
@@ -29,7 +29,7 @@ class C2<T> {
 >T : Symbol(T, Decl(recursiveTypeParameterReferenceError1.ts, 8, 9))
 
     x: T;
->x : Symbol(x, Decl(recursiveTypeParameterReferenceError1.ts, 8, 13))
+>x : Symbol(C2.x, Decl(recursiveTypeParameterReferenceError1.ts, 8, 13))
 >T : Symbol(T, Decl(recursiveTypeParameterReferenceError1.ts, 8, 9))
 }
 interface Foo2<T> {
@@ -37,7 +37,7 @@ interface Foo2<T> {
 >T : Symbol(T, Decl(recursiveTypeParameterReferenceError1.ts, 11, 15))
 
     ofC4: C2<{ x: T }> // ok
->ofC4 : Symbol(ofC4, Decl(recursiveTypeParameterReferenceError1.ts, 11, 19))
+>ofC4 : Symbol(Foo2.ofC4, Decl(recursiveTypeParameterReferenceError1.ts, 11, 19))
 >C2 : Symbol(C2, Decl(recursiveTypeParameterReferenceError1.ts, 5, 12))
 >x : Symbol(x, Decl(recursiveTypeParameterReferenceError1.ts, 12, 14))
 >T : Symbol(T, Decl(recursiveTypeParameterReferenceError1.ts, 11, 15))
diff --git a/tests/baselines/reference/recursiveTypeParameterReferenceError2.symbols b/tests/baselines/reference/recursiveTypeParameterReferenceError2.symbols
index 423c2ba71d8..61234f7de2e 100644
--- a/tests/baselines/reference/recursiveTypeParameterReferenceError2.symbols
+++ b/tests/baselines/reference/recursiveTypeParameterReferenceError2.symbols
@@ -4,16 +4,16 @@ interface List<T> {
 >T : Symbol(T, Decl(recursiveTypeParameterReferenceError2.ts, 0, 15))
 
     data: T;
->data : Symbol(data, Decl(recursiveTypeParameterReferenceError2.ts, 0, 19))
+>data : Symbol(List.data, Decl(recursiveTypeParameterReferenceError2.ts, 0, 19))
 >T : Symbol(T, Decl(recursiveTypeParameterReferenceError2.ts, 0, 15))
 
     next: List<T>;
->next : Symbol(next, Decl(recursiveTypeParameterReferenceError2.ts, 1, 12))
+>next : Symbol(List.next, Decl(recursiveTypeParameterReferenceError2.ts, 1, 12))
 >List : Symbol(List, Decl(recursiveTypeParameterReferenceError2.ts, 0, 0))
 >T : Symbol(T, Decl(recursiveTypeParameterReferenceError2.ts, 0, 15))
 
     owner: List<List<T>>;  // Error, recursive reference with wrapped T
->owner : Symbol(owner, Decl(recursiveTypeParameterReferenceError2.ts, 2, 18))
+>owner : Symbol(List.owner, Decl(recursiveTypeParameterReferenceError2.ts, 2, 18))
 >List : Symbol(List, Decl(recursiveTypeParameterReferenceError2.ts, 0, 0))
 >List : Symbol(List, Decl(recursiveTypeParameterReferenceError2.ts, 0, 0))
 >T : Symbol(T, Decl(recursiveTypeParameterReferenceError2.ts, 0, 15))
@@ -24,16 +24,16 @@ interface List2<T> {
 >T : Symbol(T, Decl(recursiveTypeParameterReferenceError2.ts, 6, 16))
 
     data: T;
->data : Symbol(data, Decl(recursiveTypeParameterReferenceError2.ts, 6, 20))
+>data : Symbol(List2.data, Decl(recursiveTypeParameterReferenceError2.ts, 6, 20))
 >T : Symbol(T, Decl(recursiveTypeParameterReferenceError2.ts, 6, 16))
 
     next: List2<T>;
->next : Symbol(next, Decl(recursiveTypeParameterReferenceError2.ts, 7, 12))
+>next : Symbol(List2.next, Decl(recursiveTypeParameterReferenceError2.ts, 7, 12))
 >List2 : Symbol(List2, Decl(recursiveTypeParameterReferenceError2.ts, 4, 1))
 >T : Symbol(T, Decl(recursiveTypeParameterReferenceError2.ts, 6, 16))
 
     owner: List2<List2<string>>;  // Ok
->owner : Symbol(owner, Decl(recursiveTypeParameterReferenceError2.ts, 8, 19))
+>owner : Symbol(List2.owner, Decl(recursiveTypeParameterReferenceError2.ts, 8, 19))
 >List2 : Symbol(List2, Decl(recursiveTypeParameterReferenceError2.ts, 4, 1))
 >List2 : Symbol(List2, Decl(recursiveTypeParameterReferenceError2.ts, 4, 1))
 }
diff --git a/tests/baselines/reference/recursiveTypes1.symbols b/tests/baselines/reference/recursiveTypes1.symbols
index 8ced51db0dc..7efaa78e109 100644
--- a/tests/baselines/reference/recursiveTypes1.symbols
+++ b/tests/baselines/reference/recursiveTypes1.symbols
@@ -6,11 +6,11 @@ interface Entity<T extends Entity<T>> {
 >T : Symbol(T, Decl(recursiveTypes1.ts, 0, 17))
 
    X: T;
->X : Symbol(X, Decl(recursiveTypes1.ts, 0, 39))
+>X : Symbol(Entity.X, Decl(recursiveTypes1.ts, 0, 39))
 >T : Symbol(T, Decl(recursiveTypes1.ts, 0, 17))
 
    Y: T;
->Y : Symbol(Y, Decl(recursiveTypes1.ts, 1, 8))
+>Y : Symbol(Entity.Y, Decl(recursiveTypes1.ts, 1, 8))
 >T : Symbol(T, Decl(recursiveTypes1.ts, 0, 17))
 }
 
@@ -23,7 +23,7 @@ interface Person<U extends Person<U>> extends Entity<U> {
 >U : Symbol(U, Decl(recursiveTypes1.ts, 5, 17))
 
 	n: number;
->n : Symbol(n, Decl(recursiveTypes1.ts, 5, 57))
+>n : Symbol(Person.n, Decl(recursiveTypes1.ts, 5, 57))
 }
 
 interface Customer extends Person<Customer> {
@@ -32,6 +32,6 @@ interface Customer extends Person<Customer> {
 >Customer : Symbol(Customer, Decl(recursiveTypes1.ts, 7, 1))
 
 	s: string;
->s : Symbol(s, Decl(recursiveTypes1.ts, 9, 45))
+>s : Symbol(Customer.s, Decl(recursiveTypes1.ts, 9, 45))
 }
 
diff --git a/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.symbols b/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.symbols
index 9894c6acd45..af1119fe495 100644
--- a/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.symbols
+++ b/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.symbols
@@ -4,11 +4,11 @@ class List<T> {
 >T : Symbol(T, Decl(recursiveTypesUsedAsFunctionParameters.ts, 0, 11))
 
     data: T;
->data : Symbol(data, Decl(recursiveTypesUsedAsFunctionParameters.ts, 0, 15))
+>data : Symbol(List.data, Decl(recursiveTypesUsedAsFunctionParameters.ts, 0, 15))
 >T : Symbol(T, Decl(recursiveTypesUsedAsFunctionParameters.ts, 0, 11))
 
     next: List<List<T>>;
->next : Symbol(next, Decl(recursiveTypesUsedAsFunctionParameters.ts, 1, 12))
+>next : Symbol(List.next, Decl(recursiveTypesUsedAsFunctionParameters.ts, 1, 12))
 >List : Symbol(List, Decl(recursiveTypesUsedAsFunctionParameters.ts, 0, 0))
 >List : Symbol(List, Decl(recursiveTypesUsedAsFunctionParameters.ts, 0, 0))
 >T : Symbol(T, Decl(recursiveTypesUsedAsFunctionParameters.ts, 0, 11))
@@ -19,11 +19,11 @@ class MyList<T> {
 >T : Symbol(T, Decl(recursiveTypesUsedAsFunctionParameters.ts, 5, 13))
 
     data: T;
->data : Symbol(data, Decl(recursiveTypesUsedAsFunctionParameters.ts, 5, 17))
+>data : Symbol(MyList.data, Decl(recursiveTypesUsedAsFunctionParameters.ts, 5, 17))
 >T : Symbol(T, Decl(recursiveTypesUsedAsFunctionParameters.ts, 5, 13))
 
     next: MyList<MyList<T>>;
->next : Symbol(next, Decl(recursiveTypesUsedAsFunctionParameters.ts, 6, 12))
+>next : Symbol(MyList.next, Decl(recursiveTypesUsedAsFunctionParameters.ts, 6, 12))
 >MyList : Symbol(MyList, Decl(recursiveTypesUsedAsFunctionParameters.ts, 3, 1))
 >MyList : Symbol(MyList, Decl(recursiveTypesUsedAsFunctionParameters.ts, 3, 1))
 >T : Symbol(T, Decl(recursiveTypesUsedAsFunctionParameters.ts, 5, 13))
diff --git a/tests/baselines/reference/recursiveUnionTypeInference.symbols b/tests/baselines/reference/recursiveUnionTypeInference.symbols
index 88233573941..7025e6af455 100644
--- a/tests/baselines/reference/recursiveUnionTypeInference.symbols
+++ b/tests/baselines/reference/recursiveUnionTypeInference.symbols
@@ -4,7 +4,7 @@ interface Foo<T> {
 >T : Symbol(T, Decl(recursiveUnionTypeInference.ts, 0, 14))
 
     x: T;
->x : Symbol(x, Decl(recursiveUnionTypeInference.ts, 0, 18))
+>x : Symbol(Foo.x, Decl(recursiveUnionTypeInference.ts, 0, 18))
 >T : Symbol(T, Decl(recursiveUnionTypeInference.ts, 0, 14))
 }
 
diff --git a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.symbols b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.symbols
index aa2a1bfc713..a14fc677b17 100644
--- a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.symbols
+++ b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.symbols
@@ -11,7 +11,7 @@ module MsPortal.Controls.Base.ItemList {
 
         // Removing this line fixes the constructor of ItemValue
         options: ViewModel<TValue>;
->options : Symbol(options, Decl(recursivelySpecializedConstructorDeclaration.ts, 2, 40))
+>options : Symbol(Interface.options, Decl(recursivelySpecializedConstructorDeclaration.ts, 2, 40))
 >ViewModel : Symbol(ViewModel, Decl(recursivelySpecializedConstructorDeclaration.ts, 10, 5))
 >TValue : Symbol(TValue, Decl(recursivelySpecializedConstructorDeclaration.ts, 2, 31))
     }    
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/relativeNamesInClassicResolution.errors.txt b/tests/baselines/reference/relativeNamesInClassicResolution.errors.txt
new file mode 100644
index 00000000000..65a42775331
--- /dev/null
+++ b/tests/baselines/reference/relativeNamesInClassicResolution.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/compiler/somefolder/a.ts(2,17): error TS2307: Cannot find module './b'.
+
+
+==== tests/cases/compiler/somefolder/a.ts (1 errors) ====
+    
+    import {x} from "./b"
+                    ~~~~~
+!!! error TS2307: Cannot find module './b'.
+    
+==== tests/cases/compiler/b.ts (0 errors) ====
+    export let x = 1;
\ No newline at end of file
diff --git a/tests/baselines/reference/relativeNamesInClassicResolution.js b/tests/baselines/reference/relativeNamesInClassicResolution.js
new file mode 100644
index 00000000000..a6c5a06ea3d
--- /dev/null
+++ b/tests/baselines/reference/relativeNamesInClassicResolution.js
@@ -0,0 +1,18 @@
+//// [tests/cases/compiler/relativeNamesInClassicResolution.ts] ////
+
+//// [a.ts]
+
+import {x} from "./b"
+
+//// [b.ts]
+export let x = 1;
+
+//// [a.js]
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+});
+//// [b.js]
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    exports.x = 1;
+});
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.errors.txt b/tests/baselines/reference/relativePathToDeclarationFile.errors.txt
deleted file mode 100644
index 0431c3a5bfa..00000000000
--- a/tests/baselines/reference/relativePathToDeclarationFile.errors.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-tests/cases/conformance/externalModules/test/foo.d.ts(1,23): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-
-
-==== tests/cases/conformance/externalModules/test/file1.ts (0 errors) ====
-    import foo = require('foo');
-    import other = require('./other');
-    import relMod = require('./sub/relMod');
-    
-    if(foo.M2.x){
-    	var x = new relMod(other.M2.x.charCodeAt(0));
-    }
-    
-==== tests/cases/conformance/externalModules/test/foo.d.ts (1 errors) ====
-    export declare module M2 {
-                          ~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-    	export var x: boolean;
-    }
-    
-==== tests/cases/conformance/externalModules/test/other.d.ts (0 errors) ====
-    export declare module M2 {
-    	export var x: string;
-    }
-    
-==== tests/cases/conformance/externalModules/test/sub/relMod.d.ts (0 errors) ====
-    declare class Test {
-    	constructor(x: number);
-    }
-    export = Test;
-    
\ No newline at end of file
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/relativePathToDeclarationFile.symbols b/tests/baselines/reference/relativePathToDeclarationFile.symbols
new file mode 100644
index 00000000000..5aa953178d5
--- /dev/null
+++ b/tests/baselines/reference/relativePathToDeclarationFile.symbols
@@ -0,0 +1,55 @@
+=== tests/cases/conformance/externalModules/test/file1.ts ===
+import foo = require('foo');
+>foo : Symbol(foo, Decl(file1.ts, 0, 0))
+
+import other = require('./other');
+>other : Symbol(other, Decl(file1.ts, 0, 28))
+
+import relMod = require('./sub/relMod');
+>relMod : Symbol(relMod, Decl(file1.ts, 1, 34))
+
+if(foo.M2.x){
+>foo.M2.x : Symbol(foo.M2.x, Decl(foo.d.ts, 1, 11))
+>foo.M2 : Symbol(foo.M2, Decl(foo.d.ts, 0, 0))
+>foo : Symbol(foo, Decl(file1.ts, 0, 0))
+>M2 : Symbol(foo.M2, Decl(foo.d.ts, 0, 0))
+>x : Symbol(foo.M2.x, Decl(foo.d.ts, 1, 11))
+
+	var x = new relMod(other.M2.x.charCodeAt(0));
+>x : Symbol(x, Decl(file1.ts, 5, 4))
+>relMod : Symbol(relMod, Decl(file1.ts, 1, 34))
+>other.M2.x.charCodeAt : Symbol(String.charCodeAt, Decl(lib.d.ts, --, --))
+>other.M2.x : Symbol(other.M2.x, Decl(other.d.ts, 1, 11))
+>other.M2 : Symbol(other.M2, Decl(other.d.ts, 0, 0))
+>other : Symbol(other, Decl(file1.ts, 0, 28))
+>M2 : Symbol(other.M2, Decl(other.d.ts, 0, 0))
+>x : Symbol(other.M2.x, Decl(other.d.ts, 1, 11))
+>charCodeAt : Symbol(String.charCodeAt, Decl(lib.d.ts, --, --))
+}
+
+=== tests/cases/conformance/externalModules/test/foo.d.ts ===
+export declare module M2 {
+>M2 : Symbol(M2, Decl(foo.d.ts, 0, 0))
+
+	export var x: boolean;
+>x : Symbol(x, Decl(foo.d.ts, 1, 11))
+}
+
+=== tests/cases/conformance/externalModules/test/other.d.ts ===
+export declare module M2 {
+>M2 : Symbol(M2, Decl(other.d.ts, 0, 0))
+
+	export var x: string;
+>x : Symbol(x, Decl(other.d.ts, 1, 11))
+}
+
+=== tests/cases/conformance/externalModules/test/sub/relMod.d.ts ===
+declare class Test {
+>Test : Symbol(Test, Decl(relMod.d.ts, 0, 0))
+
+	constructor(x: number);
+>x : Symbol(x, Decl(relMod.d.ts, 1, 13))
+}
+export = Test;
+>Test : Symbol(Test, Decl(relMod.d.ts, 0, 0))
+
diff --git a/tests/baselines/reference/relativePathToDeclarationFile.types b/tests/baselines/reference/relativePathToDeclarationFile.types
new file mode 100644
index 00000000000..ef77acc85b4
--- /dev/null
+++ b/tests/baselines/reference/relativePathToDeclarationFile.types
@@ -0,0 +1,58 @@
+=== tests/cases/conformance/externalModules/test/file1.ts ===
+import foo = require('foo');
+>foo : typeof foo
+
+import other = require('./other');
+>other : typeof other
+
+import relMod = require('./sub/relMod');
+>relMod : typeof relMod
+
+if(foo.M2.x){
+>foo.M2.x : boolean
+>foo.M2 : typeof foo.M2
+>foo : typeof foo
+>M2 : typeof foo.M2
+>x : boolean
+
+	var x = new relMod(other.M2.x.charCodeAt(0));
+>x : relMod
+>new relMod(other.M2.x.charCodeAt(0)) : relMod
+>relMod : typeof relMod
+>other.M2.x.charCodeAt(0) : number
+>other.M2.x.charCodeAt : (index: number) => number
+>other.M2.x : string
+>other.M2 : typeof other.M2
+>other : typeof other
+>M2 : typeof other.M2
+>x : string
+>charCodeAt : (index: number) => number
+>0 : number
+}
+
+=== tests/cases/conformance/externalModules/test/foo.d.ts ===
+export declare module M2 {
+>M2 : typeof M2
+
+	export var x: boolean;
+>x : boolean
+}
+
+=== tests/cases/conformance/externalModules/test/other.d.ts ===
+export declare module M2 {
+>M2 : typeof M2
+
+	export var x: string;
+>x : string
+}
+
+=== tests/cases/conformance/externalModules/test/sub/relMod.d.ts ===
+declare class Test {
+>Test : Test
+
+	constructor(x: number);
+>x : number
+}
+export = Test;
+>Test : Test
+
diff --git a/tests/baselines/reference/reorderProperties.symbols b/tests/baselines/reference/reorderProperties.symbols
index 6308131398c..7874e90456c 100644
--- a/tests/baselines/reference/reorderProperties.symbols
+++ b/tests/baselines/reference/reorderProperties.symbols
@@ -4,7 +4,7 @@ interface A<T> {
 >T : Symbol(T, Decl(reorderProperties.ts, 0, 12))
 
     x: T
->x : Symbol(x, Decl(reorderProperties.ts, 0, 16))
+>x : Symbol(A.x, Decl(reorderProperties.ts, 0, 16))
 >T : Symbol(T, Decl(reorderProperties.ts, 0, 12))
 }
 
@@ -13,7 +13,7 @@ interface B<T> {
 >T : Symbol(T, Decl(reorderProperties.ts, 4, 12))
 
     x: T
->x : Symbol(x, Decl(reorderProperties.ts, 4, 16))
+>x : Symbol(B.x, Decl(reorderProperties.ts, 4, 16))
 >T : Symbol(T, Decl(reorderProperties.ts, 4, 12))
 }
 
@@ -25,7 +25,7 @@ interface C<S> extends A<D<S>> {
 >S : Symbol(S, Decl(reorderProperties.ts, 8, 12))
 
     y: S
->y : Symbol(y, Decl(reorderProperties.ts, 8, 32))
+>y : Symbol(C.y, Decl(reorderProperties.ts, 8, 32))
 >S : Symbol(S, Decl(reorderProperties.ts, 8, 12))
 }
 
@@ -37,7 +37,7 @@ interface D<S> extends B<C<S>> {
 >S : Symbol(S, Decl(reorderProperties.ts, 12, 12))
 
     y: S
->y : Symbol(y, Decl(reorderProperties.ts, 12, 32))
+>y : Symbol(D.y, Decl(reorderProperties.ts, 12, 32))
 >S : Symbol(S, Decl(reorderProperties.ts, 12, 12))
 }
 
diff --git a/tests/baselines/reference/requireEmitSemicolon.symbols b/tests/baselines/reference/requireEmitSemicolon.symbols
index 938dcdef8ca..a1a9ce51e4e 100644
--- a/tests/baselines/reference/requireEmitSemicolon.symbols
+++ b/tests/baselines/reference/requireEmitSemicolon.symbols
@@ -10,7 +10,7 @@ export module Database {
 >DB : Symbol(DB, Decl(requireEmitSemicolon_1.ts, 3, 24))
 
 	    public findPerson(id: number): P.Models.Person {
->findPerson : Symbol(findPerson, Decl(requireEmitSemicolon_1.ts, 4, 18))
+>findPerson : Symbol(DB.findPerson, Decl(requireEmitSemicolon_1.ts, 4, 18))
 >id : Symbol(id, Decl(requireEmitSemicolon_1.ts, 5, 23))
 >P : Symbol(P, Decl(requireEmitSemicolon_1.ts, 0, 0))
 >Models : Symbol(P.Models, Decl(requireEmitSemicolon_0.ts, 0, 0))
diff --git a/tests/baselines/reference/requiredInitializedParameter3.symbols b/tests/baselines/reference/requiredInitializedParameter3.symbols
index e9f35b21bcf..8f7649b449d 100644
--- a/tests/baselines/reference/requiredInitializedParameter3.symbols
+++ b/tests/baselines/reference/requiredInitializedParameter3.symbols
@@ -3,7 +3,7 @@ interface I1 {
 >I1 : Symbol(I1, Decl(requiredInitializedParameter3.ts, 0, 0))
 
     method();
->method : Symbol(method, Decl(requiredInitializedParameter3.ts, 0, 14))
+>method : Symbol(I1.method, Decl(requiredInitializedParameter3.ts, 0, 14))
 }
 
 class C1 implements I1 {
@@ -11,7 +11,7 @@ class C1 implements I1 {
 >I1 : Symbol(I1, Decl(requiredInitializedParameter3.ts, 0, 0))
 
     method(a = 0, b?) { }
->method : Symbol(method, Decl(requiredInitializedParameter3.ts, 4, 24))
+>method : Symbol(C1.method, Decl(requiredInitializedParameter3.ts, 4, 24))
 >a : Symbol(a, Decl(requiredInitializedParameter3.ts, 5, 11))
 >b : Symbol(b, Decl(requiredInitializedParameter3.ts, 5, 17))
 }
diff --git a/tests/baselines/reference/requiredInitializedParameter4.symbols b/tests/baselines/reference/requiredInitializedParameter4.symbols
index 2790b33698c..5136bfc1bc0 100644
--- a/tests/baselines/reference/requiredInitializedParameter4.symbols
+++ b/tests/baselines/reference/requiredInitializedParameter4.symbols
@@ -3,7 +3,7 @@ class C1 {
 >C1 : Symbol(C1, Decl(requiredInitializedParameter4.ts, 0, 0))
 
     method(a = 0, b) { }
->method : Symbol(method, Decl(requiredInitializedParameter4.ts, 0, 10))
+>method : Symbol(C1.method, Decl(requiredInitializedParameter4.ts, 0, 10))
 >a : Symbol(a, Decl(requiredInitializedParameter4.ts, 1, 11))
 >b : Symbol(b, Decl(requiredInitializedParameter4.ts, 1, 17))
 }
diff --git a/tests/baselines/reference/reservedWords2.errors.txt b/tests/baselines/reference/reservedWords2.errors.txt
index fa89df3af7a..5aa1df63a96 100644
--- a/tests/baselines/reference/reservedWords2.errors.txt
+++ b/tests/baselines/reference/reservedWords2.errors.txt
@@ -1,4 +1,3 @@
-tests/cases/compiler/reservedWords2.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/compiler/reservedWords2.ts(1,8): error TS1109: Expression expected.
 tests/cases/compiler/reservedWords2.ts(1,14): error TS1005: '(' expected.
 tests/cases/compiler/reservedWords2.ts(1,16): error TS2304: Cannot find name 'require'.
@@ -32,10 +31,8 @@ tests/cases/compiler/reservedWords2.ts(10,5): error TS2300: Duplicate identifier
 tests/cases/compiler/reservedWords2.ts(10,6): error TS1003: Identifier expected.
 
 
-==== tests/cases/compiler/reservedWords2.ts (32 errors) ====
+==== tests/cases/compiler/reservedWords2.ts (31 errors) ====
     import while = require("dfdf");
-    ~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
            ~~~~~
 !!! error TS1109: Expression expected.
                  ~
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/resolveModuleNameWithSameLetDeclarationName2.symbols b/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.symbols
index e98437abb9a..7ddb3d5b9e1 100644
--- a/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.symbols
+++ b/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.symbols
@@ -4,11 +4,11 @@ declare module "punycode" {
 >ucs2 : Symbol(ucs2, Decl(resolveModuleNameWithSameLetDeclarationName2.ts, 0, 27), Decl(resolveModuleNameWithSameLetDeclarationName2.ts, 6, 14))
 
         decode(string: string): string;
->decode : Symbol(decode, Decl(resolveModuleNameWithSameLetDeclarationName2.ts, 1, 20))
+>decode : Symbol(ucs2.decode, Decl(resolveModuleNameWithSameLetDeclarationName2.ts, 1, 20))
 >string : Symbol(string, Decl(resolveModuleNameWithSameLetDeclarationName2.ts, 2, 15))
 
         encode(codePoints: number[]): string;
->encode : Symbol(encode, Decl(resolveModuleNameWithSameLetDeclarationName2.ts, 2, 39))
+>encode : Symbol(ucs2.encode, Decl(resolveModuleNameWithSameLetDeclarationName2.ts, 2, 39))
 >codePoints : Symbol(codePoints, Decl(resolveModuleNameWithSameLetDeclarationName2.ts, 3, 15))
     }
 
diff --git a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.symbols b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.symbols
index 39ca7f38840..a4761973db1 100644
--- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.symbols
+++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.symbols
@@ -13,7 +13,7 @@ module rionegrensis {
 >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3))
 
     salomonseni() : caniventer { var x : caniventer; () => { var y = this; }; return x; }
->salomonseni : Symbol(salomonseni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1, 96))
+>salomonseni : Symbol(caniventer.salomonseni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1, 96))
 >caniventer : Symbol(caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 2, 36))
 >caniventer : Symbol(caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21))
@@ -22,7 +22,7 @@ module rionegrensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 2, 36))
 
     uchidai() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; }
->uchidai : Symbol(uchidai, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 2, 89))
+>uchidai : Symbol(caniventer.uchidai, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 2, 89))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 3, 42))
@@ -33,7 +33,7 @@ module rionegrensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 3, 42))
 
     raffrayana() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; }
->raffrayana : Symbol(raffrayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 3, 105))
+>raffrayana : Symbol(caniventer.raffrayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 3, 105))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 4, 37))
@@ -44,7 +44,7 @@ module rionegrensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 4, 37))
 
     Uranium() : minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri> { var x : minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri>; () => { var y = this; }; return x; }
->Uranium : Symbol(Uranium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 4, 92))
+>Uranium : Symbol(caniventer.Uranium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 4, 92))
 >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1))
 >inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16))
 >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1))
@@ -71,7 +71,7 @@ module rionegrensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 5, 112))
 
     nayaur() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; }
->nayaur : Symbol(nayaur, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 5, 245))
+>nayaur : Symbol(caniventer.nayaur, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 5, 245))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
 >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 6, 38))
@@ -94,7 +94,7 @@ module rionegrensis {
 >punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18))
 
     naso() : panamensis.setulosus<lutreolus.punicus, howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>> { var x : panamensis.setulosus<lutreolus.punicus, howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>>; () => { var y = this; }; return x; }
->naso : Symbol(naso, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 8, 101))
+>naso : Symbol(veraecrucis.naso, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 8, 101))
 >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1))
 >setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
@@ -121,7 +121,7 @@ module rionegrensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 9, 115))
 
     vancouverensis() : imperfecta.ciliolabrum<argurus.oreas, argurus.peninsulae> { var x : imperfecta.ciliolabrum<argurus.oreas, argurus.peninsulae>; () => { var y = this; }; return x; }
->vancouverensis : Symbol(vancouverensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 9, 254))
+>vancouverensis : Symbol(veraecrucis.vancouverensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 9, 254))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
 >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -140,7 +140,7 @@ module rionegrensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 10, 86))
 
     africana() : argurus.gilbertii<panamensis.linulus<lavali.lepturus, argurus.oreas>, sagitta.cinereus<lavali.xanthognathus, argurus.oreas>> { var x : argurus.gilbertii<panamensis.linulus<lavali.lepturus, argurus.oreas>, sagitta.cinereus<lavali.xanthognathus, argurus.oreas>>; () => { var y = this; }; return x; }
->africana : Symbol(africana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 10, 186))
+>africana : Symbol(veraecrucis.africana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 10, 186))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >gilbertii : Symbol(argurus.gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16))
 >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1))
@@ -175,7 +175,7 @@ module rionegrensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 11, 147))
 
     palliolata() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; }
->palliolata : Symbol(palliolata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 11, 314))
+>palliolata : Symbol(veraecrucis.palliolata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 11, 314))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
 >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 12, 44))
@@ -186,7 +186,7 @@ module rionegrensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 12, 44))
 
     nivicola() : samarensis.pallidus { var x : samarensis.pallidus; () => { var y = this; }; return x; }
->nivicola : Symbol(nivicola, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 12, 106))
+>nivicola : Symbol(veraecrucis.nivicola, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 12, 106))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 13, 42))
@@ -207,7 +207,7 @@ module julianae {
 >nudicaudus : Symbol(nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3))
 
     brandtii() : argurus.germaini { var x : argurus.germaini; () => { var y = this; }; return x; }
->brandtii : Symbol(brandtii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 19, 27))
+>brandtii : Symbol(nudicaudus.brandtii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 19, 27))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 20, 39))
@@ -218,7 +218,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 20, 39))
 
     maxwellii() : ruatanica.Praseodymium<Lanthanum.jugularis, dammermani.melanops> { var x : ruatanica.Praseodymium<Lanthanum.jugularis, dammermani.melanops>; () => { var y = this; }; return x; }
->maxwellii : Symbol(maxwellii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 20, 98))
+>maxwellii : Symbol(nudicaudus.maxwellii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 20, 98))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
 >Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
@@ -237,7 +237,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 21, 88))
 
     endoi() : panglima.abidi<dogramacii.kaiseri, lavali.wilsoni> { var x : panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>; () => { var y = this; }; return x; }
->endoi : Symbol(endoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 21, 195))
+>endoi : Symbol(nudicaudus.endoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 21, 195))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >abidi : Symbol(panglima.abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
@@ -256,7 +256,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 22, 70))
 
     venezuelae() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; }
->venezuelae : Symbol(venezuelae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 22, 163))
+>venezuelae : Symbol(nudicaudus.venezuelae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 22, 163))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
 >marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 23, 38))
@@ -267,7 +267,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 23, 38))
 
     zamicrus() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
->zamicrus : Symbol(zamicrus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 23, 94))
+>zamicrus : Symbol(nudicaudus.zamicrus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 23, 94))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
 >caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 24, 46))
@@ -281,7 +281,7 @@ module julianae {
 >galapagoensis : Symbol(galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3))
 
     isabellae() : panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis> { var x : panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>; () => { var y = this; }; return x; }
->isabellae : Symbol(isabellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 26, 30))
+>isabellae : Symbol(galapagoensis.isabellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 26, 30))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
@@ -300,7 +300,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 27, 84))
 
     rueppellii() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
->rueppellii : Symbol(rueppellii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 27, 187))
+>rueppellii : Symbol(galapagoensis.rueppellii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 27, 187))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
 >americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 28, 45))
@@ -311,7 +311,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 28, 45))
 
     peregusna() : dogramacii.kaiseri { var x : dogramacii.kaiseri; () => { var y = this; }; return x; }
->peregusna : Symbol(peregusna, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 28, 108))
+>peregusna : Symbol(galapagoensis.peregusna, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 28, 108))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
 >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 29, 42))
@@ -322,7 +322,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 29, 42))
 
     gliroides() : howi.coludo<howi.marcanoi, lavali.wilsoni> { var x : howi.coludo<howi.marcanoi, lavali.wilsoni>; () => { var y = this; }; return x; }
->gliroides : Symbol(gliroides, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 29, 103))
+>gliroides : Symbol(galapagoensis.gliroides, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 29, 103))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
 >coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
@@ -341,7 +341,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 30, 66))
 
     banakrisi() : macrorhinos.daphaenodon { var x : macrorhinos.daphaenodon; () => { var y = this; }; return x; }
->banakrisi : Symbol(banakrisi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 30, 151))
+>banakrisi : Symbol(galapagoensis.banakrisi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 30, 151))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 31, 47))
@@ -352,7 +352,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 31, 47))
 
     rozendaali() : lutreolus.foina { var x : lutreolus.foina; () => { var y = this; }; return x; }
->rozendaali : Symbol(rozendaali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 31, 113))
+>rozendaali : Symbol(galapagoensis.rozendaali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 31, 113))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
 >foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 32, 40))
@@ -363,7 +363,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 32, 40))
 
     stuhlmanni() : panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus> { var x : panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus>; () => { var y = this; }; return x; }
->stuhlmanni : Symbol(stuhlmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 32, 98))
+>stuhlmanni : Symbol(galapagoensis.stuhlmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 32, 98))
 >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1))
 >linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
@@ -387,7 +387,7 @@ module julianae {
 >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 35, 27))
 
     mattheyi() : samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>> { var x : samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>; () => { var y = this; }; return x; }
->mattheyi : Symbol(mattheyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 35, 33))
+>mattheyi : Symbol(albidens.mattheyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 35, 33))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >fuscus : Symbol(samarensis.fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -414,7 +414,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 36, 126))
 
     Astatine() : steerii { var x : steerii; () => { var y = this; }; return x; }
->Astatine : Symbol(Astatine, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 36, 272))
+>Astatine : Symbol(albidens.Astatine, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 36, 272))
 >steerii : Symbol(steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 37, 30))
 >steerii : Symbol(steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17))
@@ -423,7 +423,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 37, 30))
 
     vincenti() : argurus.dauricus<macrorhinos.konganensis, patas.uralensis> { var x : argurus.dauricus<macrorhinos.konganensis, patas.uralensis>; () => { var y = this; }; return x; }
->vincenti : Symbol(vincenti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 37, 80))
+>vincenti : Symbol(albidens.vincenti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 37, 80))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
@@ -442,7 +442,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 38, 81))
 
     hirta() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; }
->hirta : Symbol(hirta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 38, 182))
+>hirta : Symbol(albidens.hirta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 38, 182))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
 >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 39, 39))
@@ -453,7 +453,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 39, 39))
 
     virginianus() : durangae { var x : durangae; () => { var y = this; }; return x; }
->virginianus : Symbol(virginianus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 39, 101))
+>virginianus : Symbol(albidens.virginianus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 39, 101))
 >durangae : Symbol(durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 40, 34))
 >durangae : Symbol(durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3))
@@ -462,7 +462,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 40, 34))
 
     macrophyllum() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; }
->macrophyllum : Symbol(macrophyllum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 40, 85))
+>macrophyllum : Symbol(albidens.macrophyllum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 40, 85))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
 >marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 41, 40))
@@ -473,7 +473,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 41, 40))
 
     porcellus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
->porcellus : Symbol(porcellus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 41, 96))
+>porcellus : Symbol(albidens.porcellus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 41, 96))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
 >americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 42, 44))
@@ -492,7 +492,7 @@ module julianae {
 >psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17))
 
     cepapi() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; }
->cepapi : Symbol(cepapi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 44, 57))
+>cepapi : Symbol(oralis.cepapi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 44, 57))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
 >psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 45, 38))
@@ -503,7 +503,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 45, 38))
 
     porteri() : lavali.thaeleri { var x : lavali.thaeleri; () => { var y = this; }; return x; }
->porteri : Symbol(porteri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 45, 98))
+>porteri : Symbol(oralis.porteri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 45, 98))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 46, 37))
@@ -514,7 +514,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 46, 37))
 
     bindi() : caurinus.mahaganus<gabriellae.amicus, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>> { var x : caurinus.mahaganus<gabriellae.amicus, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>; () => { var y = this; }; return x; }
->bindi : Symbol(bindi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 46, 95))
+>bindi : Symbol(oralis.bindi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 46, 95))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
 >mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
@@ -541,7 +541,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 47, 119))
 
     puda() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; }
->puda : Symbol(puda, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 47, 261))
+>puda : Symbol(oralis.puda, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 47, 261))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 48, 37))
@@ -552,7 +552,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 48, 37))
 
     mindorensis() : trivirgatus.falconeri { var x : trivirgatus.falconeri; () => { var y = this; }; return x; }
->mindorensis : Symbol(mindorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 48, 98))
+>mindorensis : Symbol(oralis.mindorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 48, 98))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 49, 47))
@@ -563,7 +563,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 49, 47))
 
     ignitus() : petrophilus.rosalia<panamensis.setulosus<gabriellae.echinatus, steerii>, lavali.wilsoni> { var x : petrophilus.rosalia<panamensis.setulosus<gabriellae.echinatus, steerii>, lavali.wilsoni>; () => { var y = this; }; return x; }
->ignitus : Symbol(ignitus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 49, 111))
+>ignitus : Symbol(oralis.ignitus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 49, 111))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
 >rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20))
 >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1))
@@ -588,7 +588,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 50, 110))
 
     rufus() : nudicaudus { var x : nudicaudus; () => { var y = this; }; return x; }
->rufus : Symbol(rufus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 50, 241))
+>rufus : Symbol(oralis.rufus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 50, 241))
 >nudicaudus : Symbol(nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 51, 30))
 >nudicaudus : Symbol(nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3))
@@ -597,7 +597,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 51, 30))
 
     monax() : imperfecta.subspinosus { var x : imperfecta.subspinosus; () => { var y = this; }; return x; }
->monax : Symbol(monax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 51, 83))
+>monax : Symbol(oralis.monax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 51, 83))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
 >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 52, 42))
@@ -608,7 +608,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 52, 42))
 
     unalascensis() : minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata> { var x : minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>; () => { var y = this; }; return x; }
->unalascensis : Symbol(unalascensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 52, 107))
+>unalascensis : Symbol(oralis.unalascensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 52, 107))
 >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1))
 >inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
@@ -643,7 +643,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 53, 160))
 
     wuchihensis() : howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla> { var x : howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla>; () => { var y = this; }; return x; }
->wuchihensis : Symbol(wuchihensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 53, 336))
+>wuchihensis : Symbol(oralis.wuchihensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 53, 336))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
 >angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 13))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
@@ -670,7 +670,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 54, 123))
 
     leucippe() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; }
->leucippe : Symbol(leucippe, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 54, 263))
+>leucippe : Symbol(oralis.leucippe, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 54, 263))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 55, 35))
@@ -681,7 +681,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 55, 35))
 
     ordii() : daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni> { var x : daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>; () => { var y = this; }; return x; }
->ordii : Symbol(ordii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 55, 90))
+>ordii : Symbol(oralis.ordii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 55, 90))
 >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1))
 >arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -700,7 +700,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 56, 78))
 
     eisentrauti() : rendalli.zuluensis { var x : rendalli.zuluensis; () => { var y = this; }; return x; }
->eisentrauti : Symbol(eisentrauti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 56, 179))
+>eisentrauti : Symbol(oralis.eisentrauti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 56, 179))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
 >zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 57, 44))
@@ -717,7 +717,7 @@ module julianae {
 >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3))
 
     wolffsohni() : Lanthanum.suillus<dammermani.melanops, quasiater.carolinensis> { var x : Lanthanum.suillus<dammermani.melanops, quasiater.carolinensis>; () => { var y = this; }; return x; }
->wolffsohni : Symbol(wolffsohni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 59, 54))
+>wolffsohni : Symbol(sumatrana.wolffsohni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 59, 54))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
 >suillus : Symbol(Lanthanum.suillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 107, 18))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
@@ -736,7 +736,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 60, 87))
 
     geata() : ruatanica.hector<sumatrana, quasiater.bobrinskoi> { var x : ruatanica.hector<sumatrana, quasiater.bobrinskoi>; () => { var y = this; }; return x; }
->geata : Symbol(geata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 60, 192))
+>geata : Symbol(sumatrana.geata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 60, 192))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
 >hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18))
 >sumatrana : Symbol(sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3))
@@ -753,7 +753,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 61, 69))
 
     awashensis() : petrophilus.minutilla { var x : petrophilus.minutilla; () => { var y = this; }; return x; }
->awashensis : Symbol(awashensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 61, 161))
+>awashensis : Symbol(sumatrana.awashensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 61, 161))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
 >minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 62, 46))
@@ -764,7 +764,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 62, 46))
 
     sturdeei() : lutreolus.cor<Lanthanum.jugularis, galapagoensis> { var x : lutreolus.cor<Lanthanum.jugularis, galapagoensis>; () => { var y = this; }; return x; }
->sturdeei : Symbol(sturdeei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 62, 110))
+>sturdeei : Symbol(sumatrana.sturdeei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 62, 110))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
 >cor : Symbol(lutreolus.cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 18))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
@@ -781,7 +781,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 63, 72))
 
     pachyurus() : howi.angulatus<dogramacii.aurata, gerbillus<lavali.thaeleri, quasiater.carolinensis>> { var x : howi.angulatus<dogramacii.aurata, gerbillus<lavali.thaeleri, quasiater.carolinensis>>; () => { var y = this; }; return x; }
->pachyurus : Symbol(pachyurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 63, 164))
+>pachyurus : Symbol(sumatrana.pachyurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 63, 164))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
 >angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 13))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
@@ -806,7 +806,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 64, 109))
 
     lyelli() : provocax.melanoleuca { var x : provocax.melanoleuca; () => { var y = this; }; return x; }
->lyelli : Symbol(lyelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 64, 237))
+>lyelli : Symbol(sumatrana.lyelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 64, 237))
 >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1))
 >melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 65, 41))
@@ -817,7 +817,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 65, 41))
 
     neohibernicus() : dammermani.siberu<lutreolus.foina, samarensis.pallidus> { var x : dammermani.siberu<lutreolus.foina, samarensis.pallidus>; () => { var y = this; }; return x; }
->neohibernicus : Symbol(neohibernicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 65, 104))
+>neohibernicus : Symbol(sumatrana.neohibernicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 65, 104))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
 >siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
@@ -841,7 +841,7 @@ module julianae {
 >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 68, 28))
 
     pundti() : sagitta.sicarius<dogramacii.koepckeae, caurinus.psilurus> { var x : sagitta.sicarius<dogramacii.koepckeae, caurinus.psilurus>; () => { var y = this; }; return x; }
->pundti : Symbol(pundti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 68, 34))
+>pundti : Symbol(gerbillus.pundti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 68, 34))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >sicarius : Symbol(sagitta.sicarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 676, 16))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
@@ -860,7 +860,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 69, 78))
 
     tristrami() : petrophilus.minutilla { var x : petrophilus.minutilla; () => { var y = this; }; return x; }
->tristrami : Symbol(tristrami, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 69, 178))
+>tristrami : Symbol(gerbillus.tristrami, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 69, 178))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
 >minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 70, 45))
@@ -871,7 +871,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 70, 45))
 
     swarthi() : lutreolus.foina { var x : lutreolus.foina; () => { var y = this; }; return x; }
->swarthi : Symbol(swarthi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 70, 109))
+>swarthi : Symbol(gerbillus.swarthi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 70, 109))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
 >foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 71, 37))
@@ -882,7 +882,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 71, 37))
 
     horsfieldii() : trivirgatus.falconeri { var x : trivirgatus.falconeri; () => { var y = this; }; return x; }
->horsfieldii : Symbol(horsfieldii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 71, 95))
+>horsfieldii : Symbol(gerbillus.horsfieldii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 71, 95))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 72, 47))
@@ -893,7 +893,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 72, 47))
 
     diazi() : imperfecta.lasiurus<lutreolus.foina, dammermani.melanops> { var x : imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>; () => { var y = this; }; return x; }
->diazi : Symbol(diazi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 72, 111))
+>diazi : Symbol(gerbillus.diazi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 72, 111))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
 >lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
@@ -912,7 +912,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 73, 77))
 
     rennelli() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; }
->rennelli : Symbol(rennelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 73, 177))
+>rennelli : Symbol(gerbillus.rennelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 73, 177))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 74, 39))
@@ -923,7 +923,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 74, 39))
 
     maulinus() : lavali.lepturus { var x : lavali.lepturus; () => { var y = this; }; return x; }
->maulinus : Symbol(maulinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 74, 98))
+>maulinus : Symbol(gerbillus.maulinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 74, 98))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 75, 38))
@@ -934,7 +934,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 75, 38))
 
     muscina() : daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae> { var x : daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae>; () => { var y = this; }; return x; }
->muscina : Symbol(muscina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 75, 96))
+>muscina : Symbol(gerbillus.muscina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 75, 96))
 >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1))
 >arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
@@ -953,7 +953,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 76, 85))
 
     pelengensis() : sagitta.leptoceros<caurinus.psilurus, gabriellae.echinatus> { var x : sagitta.leptoceros<caurinus.psilurus, gabriellae.echinatus>; () => { var y = this; }; return x; }
->pelengensis : Symbol(pelengensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 76, 191))
+>pelengensis : Symbol(gerbillus.pelengensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 76, 191))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 16))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
@@ -972,7 +972,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 77, 85))
 
     abramus() : lavali.thaeleri { var x : lavali.thaeleri; () => { var y = this; }; return x; }
->abramus : Symbol(abramus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 77, 187))
+>abramus : Symbol(gerbillus.abramus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 77, 187))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 78, 37))
@@ -983,7 +983,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 78, 37))
 
     reevesi() : provocax.melanoleuca { var x : provocax.melanoleuca; () => { var y = this; }; return x; }
->reevesi : Symbol(reevesi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 78, 95))
+>reevesi : Symbol(gerbillus.reevesi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 78, 95))
 >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1))
 >melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 79, 42))
@@ -997,7 +997,7 @@ module julianae {
 >acariensis : Symbol(acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3))
 
     levicula() : lavali.lepturus { var x : lavali.lepturus; () => { var y = this; }; return x; }
->levicula : Symbol(levicula, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 81, 27))
+>levicula : Symbol(acariensis.levicula, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 81, 27))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 82, 38))
@@ -1008,7 +1008,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 82, 38))
 
     minous() : argurus.dauricus<quasiater.carolinensis, lavali.otion> { var x : argurus.dauricus<quasiater.carolinensis, lavali.otion>; () => { var y = this; }; return x; }
->minous : Symbol(minous, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 82, 96))
+>minous : Symbol(acariensis.minous, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 82, 96))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
@@ -1027,7 +1027,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 83, 75))
 
     cinereiventer() : panamensis.setulosus<sagitta.walkeri, lavali.otion> { var x : panamensis.setulosus<sagitta.walkeri, lavali.otion>; () => { var y = this; }; return x; }
->cinereiventer : Symbol(cinereiventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 83, 172))
+>cinereiventer : Symbol(acariensis.cinereiventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 83, 172))
 >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1))
 >setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
@@ -1046,7 +1046,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 84, 79))
 
     longicaudatus() : macrorhinos.marmosurus<dammermani.melanops, caurinus.mahaganus<nudicaudus, lavali.otion>> { var x : macrorhinos.marmosurus<dammermani.melanops, caurinus.mahaganus<nudicaudus, lavali.otion>>; () => { var y = this; }; return x; }
->longicaudatus : Symbol(longicaudatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 84, 173))
+>longicaudatus : Symbol(acariensis.longicaudatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 84, 173))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
@@ -1071,7 +1071,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 85, 117))
 
     baeodon() : argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa> { var x : argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa>; () => { var y = this; }; return x; }
->baeodon : Symbol(baeodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 85, 249))
+>baeodon : Symbol(acariensis.baeodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 85, 249))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
@@ -1098,7 +1098,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 86, 114))
 
     soricoides() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; }
->soricoides : Symbol(soricoides, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 86, 249))
+>soricoides : Symbol(acariensis.soricoides, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 86, 249))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 87, 41))
@@ -1109,7 +1109,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 87, 41))
 
     datae() : daubentonii.arboreus<provocax.melanoleuca, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>> { var x : daubentonii.arboreus<provocax.melanoleuca, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>; () => { var y = this; }; return x; }
->datae : Symbol(datae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 87, 100))
+>datae : Symbol(acariensis.datae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 87, 100))
 >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1))
 >arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20))
 >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1))
@@ -1136,7 +1136,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 88, 124))
 
     spixii() : imperfecta.subspinosus { var x : imperfecta.subspinosus; () => { var y = this; }; return x; }
->spixii : Symbol(spixii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 88, 271))
+>spixii : Symbol(acariensis.spixii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 88, 271))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
 >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 89, 43))
@@ -1147,7 +1147,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 89, 43))
 
     anakuma() : lavali.wilsoni { var x : lavali.wilsoni; () => { var y = this; }; return x; }
->anakuma : Symbol(anakuma, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 89, 108))
+>anakuma : Symbol(acariensis.anakuma, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 89, 108))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 90, 36))
@@ -1158,7 +1158,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 90, 36))
 
     kihaulei() : panglima.amphibius<trivirgatus.oconnelli, macrorhinos.konganensis> { var x : panglima.amphibius<trivirgatus.oconnelli, macrorhinos.konganensis>; () => { var y = this; }; return x; }
->kihaulei : Symbol(kihaulei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 90, 93))
+>kihaulei : Symbol(acariensis.kihaulei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 90, 93))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
@@ -1177,7 +1177,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 91, 89))
 
     gymnura() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; }
->gymnura : Symbol(gymnura, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 91, 198))
+>gymnura : Symbol(acariensis.gymnura, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 91, 198))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
 >carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 92, 44))
@@ -1188,7 +1188,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 92, 44))
 
     olchonensis() : rendalli.crenulata<trivirgatus.falconeri, provocax.melanoleuca> { var x : rendalli.crenulata<trivirgatus.falconeri, provocax.melanoleuca>; () => { var y = this; }; return x; }
->olchonensis : Symbol(olchonensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 92, 109))
+>olchonensis : Symbol(acariensis.olchonensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 92, 109))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
 >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
@@ -1213,7 +1213,7 @@ module julianae {
 >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3))
 
     Californium() : panamensis.setulosus<lutreolus.punicus, dammermani.melanops> { var x : panamensis.setulosus<lutreolus.punicus, dammermani.melanops>; () => { var y = this; }; return x; }
->Californium : Symbol(Californium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 95, 51))
+>Californium : Symbol(durangae.Californium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 95, 51))
 >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1))
 >setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
@@ -1232,7 +1232,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 96, 86))
 
     Flerovium() : howi.angulatus<petrophilus.minutilla, lavali.xanthognathus> { var x : howi.angulatus<petrophilus.minutilla, lavali.xanthognathus>; () => { var y = this; }; return x; }
->Flerovium : Symbol(Flerovium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 96, 189))
+>Flerovium : Symbol(durangae.Flerovium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 96, 189))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
 >angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 13))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
@@ -1251,7 +1251,7 @@ module julianae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 97, 83))
 
     phrudus() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; }
->phrudus : Symbol(phrudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 97, 185))
+>phrudus : Symbol(durangae.phrudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 97, 185))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 98, 40))
@@ -1271,7 +1271,7 @@ module ruatanica {
 >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 102, 25))
 
     humulis() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; }
->humulis : Symbol(humulis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 102, 31))
+>humulis : Symbol(hector.humulis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 102, 31))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 103, 38))
@@ -1282,7 +1282,7 @@ module ruatanica {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 103, 38))
 
     eurycerus() : panamensis.linulus<ruatanica.Praseodymium<Lanthanum.jugularis, dammermani.melanops>, lavali.wilsoni> { var x : panamensis.linulus<ruatanica.Praseodymium<Lanthanum.jugularis, dammermani.melanops>, lavali.wilsoni>; () => { var y = this; }; return x; }
->eurycerus : Symbol(eurycerus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 103, 97))
+>eurycerus : Symbol(hector.eurycerus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 103, 97))
 >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1))
 >linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
@@ -1318,7 +1318,7 @@ module Lanthanum {
 >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 108, 26))
 
     spilosoma() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; }
->spilosoma : Symbol(spilosoma, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 108, 32))
+>spilosoma : Symbol(suillus.spilosoma, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 108, 32))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
 >carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 109, 46))
@@ -1329,7 +1329,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 109, 46))
 
     tumbalensis() : caurinus.megaphyllus { var x : caurinus.megaphyllus; () => { var y = this; }; return x; }
->tumbalensis : Symbol(tumbalensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 109, 111))
+>tumbalensis : Symbol(suillus.tumbalensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 109, 111))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
 >megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 110, 46))
@@ -1340,7 +1340,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 110, 46))
 
     anatolicus() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; }
->anatolicus : Symbol(anatolicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 110, 109))
+>anatolicus : Symbol(suillus.anatolicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 110, 109))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 111, 41))
@@ -1363,7 +1363,7 @@ module Lanthanum {
 >punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18))
 
     granatensis() : quasiater.bobrinskoi { var x : quasiater.bobrinskoi; () => { var y = this; }; return x; }
->granatensis : Symbol(granatensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 113, 94))
+>granatensis : Symbol(nitidus.granatensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 113, 94))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
 >bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 114, 46))
@@ -1374,7 +1374,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 114, 46))
 
     negligens() : minutus.inez<lavali.wilsoni, lavali.wilsoni> { var x : minutus.inez<lavali.wilsoni, lavali.wilsoni>; () => { var y = this; }; return x; }
->negligens : Symbol(negligens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 114, 109))
+>negligens : Symbol(nitidus.negligens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 114, 109))
 >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1))
 >inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -1393,7 +1393,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 115, 68))
 
     lewisi() : julianae.oralis<lavali.xanthognathus, argurus.oreas> { var x : julianae.oralis<lavali.xanthognathus, argurus.oreas>; () => { var y = this; }; return x; }
->lewisi : Symbol(lewisi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 115, 155))
+>lewisi : Symbol(nitidus.lewisi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 115, 155))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >oralis : Symbol(julianae.oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -1412,7 +1412,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 116, 73))
 
     arge() : chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus> { var x : chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>; () => { var y = this; }; return x; }
->arge : Symbol(arge, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 116, 168))
+>arge : Symbol(nitidus.arge, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 116, 168))
 >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1))
 >sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
@@ -1431,7 +1431,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 117, 86))
 
     dominicensis() : dammermani.melanops { var x : dammermani.melanops; () => { var y = this; }; return x; }
->dominicensis : Symbol(dominicensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 117, 196))
+>dominicensis : Symbol(nitidus.dominicensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 117, 196))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
 >melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 118, 46))
@@ -1442,7 +1442,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 118, 46))
 
     taurus() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; }
->taurus : Symbol(taurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 118, 108))
+>taurus : Symbol(nitidus.taurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 118, 108))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 119, 44))
@@ -1453,7 +1453,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 119, 44))
 
     tonganus() : argurus.netscheri<dogramacii.aurata, dogramacii.aurata> { var x : argurus.netscheri<dogramacii.aurata, dogramacii.aurata>; () => { var y = this; }; return x; }
->tonganus : Symbol(tonganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 119, 110))
+>tonganus : Symbol(nitidus.tonganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 119, 110))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
@@ -1472,7 +1472,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 120, 78))
 
     silvatica() : rendalli.moojeni<dogramacii.aurata, lavali.otion> { var x : rendalli.moojeni<dogramacii.aurata, lavali.otion>; () => { var y = this; }; return x; }
->silvatica : Symbol(silvatica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 120, 176))
+>silvatica : Symbol(nitidus.silvatica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 120, 176))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
 >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
@@ -1491,7 +1491,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 121, 73))
 
     midas() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; }
->midas : Symbol(midas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 121, 165))
+>midas : Symbol(nitidus.midas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 121, 165))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 122, 40))
@@ -1502,7 +1502,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 122, 40))
 
     bicornis() : dogramacii.kaiseri { var x : dogramacii.kaiseri; () => { var y = this; }; return x; }
->bicornis : Symbol(bicornis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 122, 103))
+>bicornis : Symbol(nitidus.bicornis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 122, 103))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
 >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 123, 41))
@@ -1523,7 +1523,7 @@ module Lanthanum {
 >steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17))
 
     phillipsii() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; }
->phillipsii : Symbol(phillipsii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 125, 94))
+>phillipsii : Symbol(megalonyx.phillipsii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 125, 94))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 126, 48))
@@ -1534,7 +1534,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 126, 48))
 
     melanogaster() : rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis> { var x : rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis>; () => { var y = this; }; return x; }
->melanogaster : Symbol(melanogaster, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 126, 114))
+>melanogaster : Symbol(megalonyx.melanogaster, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 126, 114))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
 >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
@@ -1553,7 +1553,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 127, 98))
 
     elaphus() : nitidus<petrophilus.minutilla, julianae.sumatrana> { var x : nitidus<petrophilus.minutilla, julianae.sumatrana>; () => { var y = this; }; return x; }
->elaphus : Symbol(elaphus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 127, 212))
+>elaphus : Symbol(megalonyx.elaphus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 127, 212))
 >nitidus : Symbol(nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
 >minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20))
@@ -1570,7 +1570,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 128, 72))
 
     elater() : lavali.lepturus { var x : lavali.lepturus; () => { var y = this; }; return x; }
->elater : Symbol(elater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 128, 165))
+>elater : Symbol(megalonyx.elater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 128, 165))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 129, 36))
@@ -1581,7 +1581,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 129, 36))
 
     ourebi() : provocax.melanoleuca { var x : provocax.melanoleuca; () => { var y = this; }; return x; }
->ourebi : Symbol(ourebi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 129, 94))
+>ourebi : Symbol(megalonyx.ourebi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 129, 94))
 >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1))
 >melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 130, 41))
@@ -1592,7 +1592,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 130, 41))
 
     caraccioli() : imperfecta.ciliolabrum<julianae.nudicaudus, ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis>> { var x : imperfecta.ciliolabrum<julianae.nudicaudus, ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis>>; () => { var y = this; }; return x; }
->caraccioli : Symbol(caraccioli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 130, 104))
+>caraccioli : Symbol(megalonyx.caraccioli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 130, 104))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
 >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -1619,7 +1619,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 131, 130))
 
     parva() : gabriellae.echinatus { var x : gabriellae.echinatus; () => { var y = this; }; return x; }
->parva : Symbol(parva, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 131, 278))
+>parva : Symbol(megalonyx.parva, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 131, 278))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
 >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 132, 40))
@@ -1630,7 +1630,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 132, 40))
 
     albipes() : quasiater.wattsi<dammermani.melanops, megalonyx> { var x : quasiater.wattsi<dammermani.melanops, megalonyx>; () => { var y = this; }; return x; }
->albipes : Symbol(albipes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 132, 103))
+>albipes : Symbol(megalonyx.albipes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 132, 103))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
 >wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
@@ -1650,7 +1650,7 @@ module Lanthanum {
 >jugularis : Symbol(jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3))
 
     torrei() : petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon> { var x : petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>; () => { var y = this; }; return x; }
->torrei : Symbol(torrei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 135, 26))
+>torrei : Symbol(jugularis.torrei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 135, 26))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
 >sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -1669,7 +1669,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 136, 78))
 
     revoili() : lavali.wilsoni { var x : lavali.wilsoni; () => { var y = this; }; return x; }
->revoili : Symbol(revoili, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 136, 178))
+>revoili : Symbol(jugularis.revoili, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 136, 178))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 137, 36))
@@ -1680,7 +1680,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 137, 36))
 
     macrobullatus() : macrorhinos.daphaenodon { var x : macrorhinos.daphaenodon; () => { var y = this; }; return x; }
->macrobullatus : Symbol(macrobullatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 137, 93))
+>macrobullatus : Symbol(jugularis.macrobullatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 137, 93))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 138, 51))
@@ -1691,7 +1691,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 138, 51))
 
     compactus() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; }
->compactus : Symbol(compactus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 138, 117))
+>compactus : Symbol(jugularis.compactus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 138, 117))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 139, 42))
@@ -1702,7 +1702,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 139, 42))
 
     talpinus() : nitidus<ruatanica.americanus, sagitta.stolzmanni> { var x : nitidus<ruatanica.americanus, sagitta.stolzmanni>; () => { var y = this; }; return x; }
->talpinus : Symbol(talpinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 139, 103))
+>talpinus : Symbol(jugularis.talpinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 139, 103))
 >nitidus : Symbol(nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
 >americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18))
@@ -1719,7 +1719,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 140, 72))
 
     stramineus() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; }
->stramineus : Symbol(stramineus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 140, 164))
+>stramineus : Symbol(jugularis.stramineus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 140, 164))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
 >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 141, 42))
@@ -1730,7 +1730,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 141, 42))
 
     dartmouthi() : trivirgatus.mixtus<macrorhinos.daphaenodon, argurus.luctuosa> { var x : trivirgatus.mixtus<macrorhinos.daphaenodon, argurus.luctuosa>; () => { var y = this; }; return x; }
->dartmouthi : Symbol(dartmouthi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 141, 102))
+>dartmouthi : Symbol(jugularis.dartmouthi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 141, 102))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >mixtus : Symbol(trivirgatus.mixtus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 197, 3))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
@@ -1749,7 +1749,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 142, 86))
 
     ogilbyi() : argurus.dauricus<argurus.oreas, quasiater.carolinensis> { var x : argurus.dauricus<argurus.oreas, quasiater.carolinensis>; () => { var y = this; }; return x; }
->ogilbyi : Symbol(ogilbyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 142, 190))
+>ogilbyi : Symbol(jugularis.ogilbyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 142, 190))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -1768,7 +1768,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 143, 77))
 
     incomtus() : daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis> { var x : daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis>; () => { var y = this; }; return x; }
->incomtus : Symbol(incomtus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 143, 175))
+>incomtus : Symbol(jugularis.incomtus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 143, 175))
 >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1))
 >nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 20))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -1787,7 +1787,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 144, 87))
 
     surdaster() : ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus> { var x : ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>; () => { var y = this; }; return x; }
->surdaster : Symbol(surdaster, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 144, 194))
+>surdaster : Symbol(jugularis.surdaster, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 144, 194))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
 >Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -1806,7 +1806,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 145, 86))
 
     melanorhinus() : samarensis.pelurus<dammermani.melanops, rendalli.zuluensis> { var x : samarensis.pelurus<dammermani.melanops, rendalli.zuluensis>; () => { var y = this; }; return x; }
->melanorhinus : Symbol(melanorhinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 145, 191))
+>melanorhinus : Symbol(jugularis.melanorhinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 145, 191))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
@@ -1825,7 +1825,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 146, 86))
 
     picticaudata() : minutus.inez<quasiater.wattsi<quasiater.carolinensis, lavali.lepturus>, dogramacii.kaiseri> { var x : minutus.inez<quasiater.wattsi<quasiater.carolinensis, lavali.lepturus>, dogramacii.kaiseri>; () => { var y = this; }; return x; }
->picticaudata : Symbol(picticaudata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 146, 188))
+>picticaudata : Symbol(jugularis.picticaudata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 146, 188))
 >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1))
 >inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
@@ -1852,7 +1852,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 147, 118))
 
     pomona() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; }
->pomona : Symbol(pomona, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 147, 252))
+>pomona : Symbol(jugularis.pomona, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 147, 252))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 148, 37))
@@ -1863,7 +1863,7 @@ module Lanthanum {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 148, 37))
 
     ileile() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; }
->ileile : Symbol(ileile, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 148, 96))
+>ileile : Symbol(jugularis.ileile, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 148, 96))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
 >carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 149, 43))
@@ -1884,7 +1884,7 @@ module rendalli {
 >steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17))
 
     telfairi() : argurus.wetmorei<Lanthanum.megalonyx, provocax.melanoleuca> { var x : argurus.wetmorei<Lanthanum.megalonyx, provocax.melanoleuca>; () => { var y = this; }; return x; }
->telfairi : Symbol(telfairi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 153, 51))
+>telfairi : Symbol(zuluensis.telfairi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 153, 51))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >wetmorei : Symbol(argurus.wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 16))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
@@ -1903,7 +1903,7 @@ module rendalli {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 154, 82))
 
     keyensis() : quasiater.wattsi<quasiater.carolinensis, lavali.lepturus> { var x : quasiater.wattsi<quasiater.carolinensis, lavali.lepturus>; () => { var y = this; }; return x; }
->keyensis : Symbol(keyensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 154, 184))
+>keyensis : Symbol(zuluensis.keyensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 154, 184))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
 >wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
@@ -1922,7 +1922,7 @@ module rendalli {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 155, 80))
 
     occasius() : argurus.gilbertii<caurinus.psilurus, lavali.xanthognathus> { var x : argurus.gilbertii<caurinus.psilurus, lavali.xanthognathus>; () => { var y = this; }; return x; }
->occasius : Symbol(occasius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 155, 180))
+>occasius : Symbol(zuluensis.occasius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 155, 180))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >gilbertii : Symbol(argurus.gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
@@ -1941,7 +1941,7 @@ module rendalli {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 156, 81))
 
     damarensis() : julianae.galapagoensis { var x : julianae.galapagoensis; () => { var y = this; }; return x; }
->damarensis : Symbol(damarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 156, 182))
+>damarensis : Symbol(zuluensis.damarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 156, 182))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >galapagoensis : Symbol(julianae.galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 157, 47))
@@ -1952,7 +1952,7 @@ module rendalli {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 157, 47))
 
     Neptunium() : panglima.abidi<dogramacii.robustulus, lutreolus.foina> { var x : panglima.abidi<dogramacii.robustulus, lutreolus.foina>; () => { var y = this; }; return x; }
->Neptunium : Symbol(Neptunium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 157, 112))
+>Neptunium : Symbol(zuluensis.Neptunium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 157, 112))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >abidi : Symbol(panglima.abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
@@ -1971,7 +1971,7 @@ module rendalli {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 158, 78))
 
     griseoflavus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
->griseoflavus : Symbol(griseoflavus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 158, 175))
+>griseoflavus : Symbol(zuluensis.griseoflavus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 158, 175))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
 >americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 159, 47))
@@ -1982,7 +1982,7 @@ module rendalli {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 159, 47))
 
     thar() : argurus.oreas { var x : argurus.oreas; () => { var y = this; }; return x; }
->thar : Symbol(thar, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 159, 110))
+>thar : Symbol(zuluensis.thar, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 159, 110))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 160, 32))
@@ -1993,7 +1993,7 @@ module rendalli {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 160, 32))
 
     alborufus() : panamensis.linulus<lavali.lepturus, argurus.oreas> { var x : panamensis.linulus<lavali.lepturus, argurus.oreas>; () => { var y = this; }; return x; }
->alborufus : Symbol(alborufus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 160, 88))
+>alborufus : Symbol(zuluensis.alborufus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 160, 88))
 >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1))
 >linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -2012,7 +2012,7 @@ module rendalli {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 161, 74))
 
     fusicaudus() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; }
->fusicaudus : Symbol(fusicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 161, 167))
+>fusicaudus : Symbol(zuluensis.fusicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 161, 167))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 162, 43))
@@ -2023,7 +2023,7 @@ module rendalli {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 162, 43))
 
     gordonorum() : howi.angulatus<ruatanica.americanus, argurus.germaini> { var x : howi.angulatus<ruatanica.americanus, argurus.germaini>; () => { var y = this; }; return x; }
->gordonorum : Symbol(gordonorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 162, 104))
+>gordonorum : Symbol(zuluensis.gordonorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 162, 104))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
 >angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 13))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
@@ -2042,7 +2042,7 @@ module rendalli {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 163, 79))
 
     ruber() : dammermani.siberu<lutreolus.punicus, julianae.acariensis> { var x : dammermani.siberu<lutreolus.punicus, julianae.acariensis>; () => { var y = this; }; return x; }
->ruber : Symbol(ruber, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 163, 176))
+>ruber : Symbol(zuluensis.ruber, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 163, 176))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
 >siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
@@ -2061,7 +2061,7 @@ module rendalli {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 164, 77))
 
     desmarestianus() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; }
->desmarestianus : Symbol(desmarestianus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 164, 177))
+>desmarestianus : Symbol(zuluensis.desmarestianus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 164, 177))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 165, 45))
@@ -2072,7 +2072,7 @@ module rendalli {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 165, 45))
 
     lutillus() : nigra.dolichurus<howi.marcanoi, lavali.wilsoni> { var x : nigra.dolichurus<howi.marcanoi, lavali.wilsoni>; () => { var y = this; }; return x; }
->lutillus : Symbol(lutillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 165, 104))
+>lutillus : Symbol(zuluensis.lutillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 165, 104))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
@@ -2091,7 +2091,7 @@ module rendalli {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 166, 70))
 
     salocco() : argurus.peninsulae { var x : argurus.peninsulae; () => { var y = this; }; return x; }
->salocco : Symbol(salocco, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 166, 160))
+>salocco : Symbol(zuluensis.salocco, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 166, 160))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 167, 40))
@@ -2107,7 +2107,7 @@ module rendalli {
 >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 169, 26))
 
     floweri() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; }
->floweri : Symbol(floweri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 169, 32))
+>floweri : Symbol(moojeni.floweri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 169, 32))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >otion : Symbol(lavali.otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 170, 34))
@@ -2118,7 +2118,7 @@ module rendalli {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 170, 34))
 
     montosa() : imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla> { var x : imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>; () => { var y = this; }; return x; }
->montosa : Symbol(montosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 170, 89))
+>montosa : Symbol(moojeni.montosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 170, 89))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
 >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
@@ -2137,7 +2137,7 @@ module rendalli {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 171, 88))
 
     miletus() : julianae.sumatrana { var x : julianae.sumatrana; () => { var y = this; }; return x; }
->miletus : Symbol(miletus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 171, 197))
+>miletus : Symbol(moojeni.miletus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 171, 197))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 172, 40))
@@ -2148,7 +2148,7 @@ module rendalli {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 172, 40))
 
     heaneyi() : zuluensis { var x : zuluensis; () => { var y = this; }; return x; }
->heaneyi : Symbol(heaneyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 172, 101))
+>heaneyi : Symbol(moojeni.heaneyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 172, 101))
 >zuluensis : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 173, 31))
 >zuluensis : Symbol(zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17))
@@ -2157,7 +2157,7 @@ module rendalli {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 173, 31))
 
     marchei() : panglima.amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>> { var x : panglima.amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>; () => { var y = this; }; return x; }
->marchei : Symbol(marchei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 173, 83))
+>marchei : Symbol(moojeni.marchei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 173, 83))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17))
 >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1))
@@ -2184,7 +2184,7 @@ module rendalli {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 174, 117))
 
     budini() : julianae.durangae { var x : julianae.durangae; () => { var y = this; }; return x; }
->budini : Symbol(budini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 174, 255))
+>budini : Symbol(moojeni.budini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 174, 255))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >durangae : Symbol(julianae.durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 175, 38))
@@ -2195,7 +2195,7 @@ module rendalli {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 175, 38))
 
     maggietaylorae() : trivirgatus.mixtus<panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus>, sagitta.stolzmanni> { var x : trivirgatus.mixtus<panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus>, sagitta.stolzmanni>; () => { var y = this; }; return x; }
->maggietaylorae : Symbol(maggietaylorae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 175, 98))
+>maggietaylorae : Symbol(moojeni.maggietaylorae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 175, 98))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >mixtus : Symbol(trivirgatus.mixtus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 197, 3))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
@@ -2230,7 +2230,7 @@ module rendalli {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 176, 173))
 
     poliocephalus() : julianae.gerbillus<julianae.durangae, dammermani.melanops> { var x : julianae.gerbillus<julianae.durangae, dammermani.melanops>; () => { var y = this; }; return x; }
->poliocephalus : Symbol(poliocephalus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 176, 360))
+>poliocephalus : Symbol(moojeni.poliocephalus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 176, 360))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >gerbillus : Symbol(julianae.gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -2249,7 +2249,7 @@ module rendalli {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 177, 86))
 
     zibethicus() : minutus.inez<sagitta.stolzmanni, dammermani.melanops> { var x : minutus.inez<sagitta.stolzmanni, dammermani.melanops>; () => { var y = this; }; return x; }
->zibethicus : Symbol(zibethicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 177, 187))
+>zibethicus : Symbol(moojeni.zibethicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 177, 187))
 >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1))
 >inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
@@ -2268,7 +2268,7 @@ module rendalli {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 178, 78))
 
     biacensis() : howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca> { var x : howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>; () => { var y = this; }; return x; }
->biacensis : Symbol(biacensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 178, 174))
+>biacensis : Symbol(moojeni.biacensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 178, 174))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
 >coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
@@ -2295,7 +2295,7 @@ module rendalli {
 >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3))
 
     salvanius() : howi.coludo<howi.marcanoi, rionegrensis.caniventer> { var x : howi.coludo<howi.marcanoi, rionegrensis.caniventer>; () => { var y = this; }; return x; }
->salvanius : Symbol(salvanius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 181, 64))
+>salvanius : Symbol(crenulata.salvanius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 181, 64))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
 >coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
@@ -2314,7 +2314,7 @@ module rendalli {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 182, 75))
 
     maritimus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
->maritimus : Symbol(maritimus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 182, 169))
+>maritimus : Symbol(crenulata.maritimus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 182, 169))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
 >americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 183, 44))
@@ -2325,7 +2325,7 @@ module rendalli {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 183, 44))
 
     edax() : lutreolus.cor<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, rionegrensis.caniventer> { var x : lutreolus.cor<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, rionegrensis.caniventer>; () => { var y = this; }; return x; }
->edax : Symbol(edax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 183, 107))
+>edax : Symbol(crenulata.edax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 183, 107))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
 >cor : Symbol(lutreolus.cor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 873, 18))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
@@ -2369,7 +2369,7 @@ module trivirgatus {
 >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 188, 30))
 
     nivalis() : dogramacii.kaiseri { var x : dogramacii.kaiseri; () => { var y = this; }; return x; }
->nivalis : Symbol(nivalis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 188, 36))
+>nivalis : Symbol(tumidifrons.nivalis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 188, 36))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
 >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 189, 40))
@@ -2380,7 +2380,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 189, 40))
 
     vestitus() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; }
->vestitus : Symbol(vestitus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 189, 101))
+>vestitus : Symbol(tumidifrons.vestitus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 189, 101))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 190, 43))
@@ -2391,7 +2391,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 190, 43))
 
     aequatorius() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
->aequatorius : Symbol(aequatorius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 190, 106))
+>aequatorius : Symbol(tumidifrons.aequatorius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 190, 106))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
 >caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 191, 49))
@@ -2402,7 +2402,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 191, 49))
 
     scherman() : oconnelli { var x : oconnelli; () => { var y = this; }; return x; }
->scherman : Symbol(scherman, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 191, 115))
+>scherman : Symbol(tumidifrons.scherman, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 191, 115))
 >oconnelli : Symbol(oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 192, 32))
 >oconnelli : Symbol(oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3))
@@ -2411,7 +2411,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 192, 32))
 
     improvisum() : argurus.peninsulae { var x : argurus.peninsulae; () => { var y = this; }; return x; }
->improvisum : Symbol(improvisum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 192, 84))
+>improvisum : Symbol(tumidifrons.improvisum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 192, 84))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 193, 43))
@@ -2422,7 +2422,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 193, 43))
 
     cervinipes() : panglima.abidi<lavali.lepturus, caurinus.psilurus> { var x : panglima.abidi<lavali.lepturus, caurinus.psilurus>; () => { var y = this; }; return x; }
->cervinipes : Symbol(cervinipes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 193, 104))
+>cervinipes : Symbol(tumidifrons.cervinipes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 193, 104))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >abidi : Symbol(panglima.abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -2441,7 +2441,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 194, 75))
 
     audax() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; }
->audax : Symbol(audax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 194, 168))
+>audax : Symbol(tumidifrons.audax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 194, 168))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
 >robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 195, 41))
@@ -2452,7 +2452,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 195, 41))
 
     vallinus() : sagitta.sicarius<lavali.wilsoni, lutreolus.punicus> { var x : sagitta.sicarius<lavali.wilsoni, lutreolus.punicus>; () => { var y = this; }; return x; }
->vallinus : Symbol(vallinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 195, 105))
+>vallinus : Symbol(tumidifrons.vallinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 195, 105))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >sicarius : Symbol(sagitta.sicarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 676, 16))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -2487,7 +2487,7 @@ module trivirgatus {
 >daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20))
 
     ochrogaster() : dogramacii.aurata { var x : dogramacii.aurata; () => { var y = this; }; return x; }
->ochrogaster : Symbol(ochrogaster, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 198, 138))
+>ochrogaster : Symbol(mixtus.ochrogaster, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 198, 138))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
 >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 199, 43))
@@ -2498,7 +2498,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 199, 43))
 
     bryophilus() : macrorhinos.marmosurus<dogramacii.koepckeae, panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>> { var x : macrorhinos.marmosurus<dogramacii.koepckeae, panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>>; () => { var y = this; }; return x; }
->bryophilus : Symbol(bryophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 199, 103))
+>bryophilus : Symbol(mixtus.bryophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 199, 103))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
@@ -2533,7 +2533,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 200, 173))
 
     liechtensteini() : rendalli.zuluensis { var x : rendalli.zuluensis; () => { var y = this; }; return x; }
->liechtensteini : Symbol(liechtensteini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 200, 364))
+>liechtensteini : Symbol(mixtus.liechtensteini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 200, 364))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
 >zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 201, 47))
@@ -2544,7 +2544,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 201, 47))
 
     crawfordi() : howi.coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>> { var x : howi.coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>>; () => { var y = this; }; return x; }
->crawfordi : Symbol(crawfordi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 201, 108))
+>crawfordi : Symbol(mixtus.crawfordi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 201, 108))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
 >coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -2571,7 +2571,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 202, 114))
 
     hypsibia() : lavali.thaeleri { var x : lavali.thaeleri; () => { var y = this; }; return x; }
->hypsibia : Symbol(hypsibia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 202, 247))
+>hypsibia : Symbol(mixtus.hypsibia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 202, 247))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 203, 38))
@@ -2582,7 +2582,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 203, 38))
 
     matacus() : panglima.fundatus<panamensis.linulus<lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>, dammermani.melanops> { var x : panglima.fundatus<panamensis.linulus<lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>, dammermani.melanops>; () => { var y = this; }; return x; }
->matacus : Symbol(matacus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 203, 96))
+>matacus : Symbol(mixtus.matacus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 203, 96))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5))
 >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1))
@@ -2615,7 +2615,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 204, 135))
 
     demidoff() : caurinus.johorensis<julianae.acariensis, rendalli.zuluensis> { var x : caurinus.johorensis<julianae.acariensis, rendalli.zuluensis>; () => { var y = this; }; return x; }
->demidoff : Symbol(demidoff, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 204, 291))
+>demidoff : Symbol(mixtus.demidoff, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 204, 291))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
 >johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -2639,7 +2639,7 @@ module trivirgatus {
 >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 207, 24))
 
     balensis() : samarensis.pallidus { var x : samarensis.pallidus; () => { var y = this; }; return x; }
->balensis : Symbol(balensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 207, 30))
+>balensis : Symbol(lotor.balensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 207, 30))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 208, 42))
@@ -2650,7 +2650,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 208, 42))
 
     pullata() : rionegrensis.veraecrucis<quasiater.carolinensis, argurus.peninsulae> { var x : rionegrensis.veraecrucis<quasiater.carolinensis, argurus.peninsulae>; () => { var y = this; }; return x; }
->pullata : Symbol(pullata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 208, 104))
+>pullata : Symbol(lotor.pullata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 208, 104))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
 >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
@@ -2672,7 +2672,7 @@ module trivirgatus {
 >falconeri : Symbol(falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3))
 
     cabrali() : rendalli.moojeni<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, daubentonii.arboreus<julianae.nudicaudus, julianae.steerii>> { var x : rendalli.moojeni<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, daubentonii.arboreus<julianae.nudicaudus, julianae.steerii>>; () => { var y = this; }; return x; }
->cabrali : Symbol(cabrali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 211, 26))
+>cabrali : Symbol(falconeri.cabrali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 211, 26))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
 >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
@@ -2715,7 +2715,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 212, 203))
 
     gouldi() : nigra.dolichurus<imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>>, patas.uralensis> { var x : nigra.dolichurus<imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>>, patas.uralensis>; () => { var y = this; }; return x; }
->gouldi : Symbol(gouldi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 212, 427))
+>gouldi : Symbol(falconeri.gouldi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 212, 427))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
@@ -2750,7 +2750,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 213, 139))
 
     fuscicollis() : samarensis.pelurus<dammermani.melanops, Lanthanum.nitidus<ruatanica.americanus, sagitta.stolzmanni>> { var x : samarensis.pelurus<dammermani.melanops, Lanthanum.nitidus<ruatanica.americanus, sagitta.stolzmanni>>; () => { var y = this; }; return x; }
->fuscicollis : Symbol(fuscicollis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 213, 300))
+>fuscicollis : Symbol(falconeri.fuscicollis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 213, 300))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
@@ -2777,7 +2777,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 214, 126))
 
     martiensseni() : sagitta.cinereus<imperfecta.ciliolabrum<lavali.otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>, dogramacii.koepckeae> { var x : sagitta.cinereus<imperfecta.ciliolabrum<lavali.otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>, dogramacii.koepckeae>; () => { var y = this; }; return x; }
->martiensseni : Symbol(martiensseni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 214, 269))
+>martiensseni : Symbol(falconeri.martiensseni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 214, 269))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
@@ -2812,7 +2812,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 215, 166))
 
     gaoligongensis() : dogramacii.koepckeae { var x : dogramacii.koepckeae; () => { var y = this; }; return x; }
->gaoligongensis : Symbol(gaoligongensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 215, 348))
+>gaoligongensis : Symbol(falconeri.gaoligongensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 215, 348))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
 >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 216, 49))
@@ -2823,7 +2823,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 216, 49))
 
     shawi() : minutus.inez<sagitta.stolzmanni, rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi>> { var x : minutus.inez<sagitta.stolzmanni, rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi>>; () => { var y = this; }; return x; }
->shawi : Symbol(shawi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 216, 112))
+>shawi : Symbol(falconeri.shawi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 216, 112))
 >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1))
 >inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
@@ -2850,7 +2850,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 217, 122))
 
     gmelini() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
->gmelini : Symbol(gmelini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 217, 267))
+>gmelini : Symbol(falconeri.gmelini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 217, 267))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
 >caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 218, 45))
@@ -2864,7 +2864,7 @@ module trivirgatus {
 >oconnelli : Symbol(oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3))
 
     youngsoni() : nigra.thalia<patas.uralensis, julianae.galapagoensis> { var x : nigra.thalia<patas.uralensis, julianae.galapagoensis>; () => { var y = this; }; return x; }
->youngsoni : Symbol(youngsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 220, 26))
+>youngsoni : Symbol(oconnelli.youngsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 220, 26))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14))
 >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1))
@@ -2883,7 +2883,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 221, 77))
 
     terrestris() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; }
->terrestris : Symbol(terrestris, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 221, 173))
+>terrestris : Symbol(oconnelli.terrestris, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 221, 173))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 222, 48))
@@ -2894,7 +2894,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 222, 48))
 
     chrysopus() : sagitta.sicarius<dogramacii.koepckeae, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>> { var x : sagitta.sicarius<dogramacii.koepckeae, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>>; () => { var y = this; }; return x; }
->chrysopus : Symbol(chrysopus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 222, 114))
+>chrysopus : Symbol(oconnelli.chrysopus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 222, 114))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >sicarius : Symbol(sagitta.sicarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 676, 16))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
@@ -2921,7 +2921,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 223, 121))
 
     fuscomurina() : argurus.peninsulae { var x : argurus.peninsulae; () => { var y = this; }; return x; }
->fuscomurina : Symbol(fuscomurina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 223, 261))
+>fuscomurina : Symbol(oconnelli.fuscomurina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 223, 261))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 224, 44))
@@ -2932,7 +2932,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 224, 44))
 
     hellwaldii() : nigra.gracilis<panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus>, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>> { var x : nigra.gracilis<panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus>, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>>; () => { var y = this; }; return x; }
->hellwaldii : Symbol(hellwaldii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 224, 105))
+>hellwaldii : Symbol(oconnelli.hellwaldii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 224, 105))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14))
 >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1))
@@ -2967,7 +2967,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 225, 160))
 
     aenea() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; }
->aenea : Symbol(aenea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 225, 338))
+>aenea : Symbol(oconnelli.aenea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 225, 338))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 226, 36))
@@ -2978,7 +2978,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 226, 36))
 
     perrini() : quasiater.bobrinskoi { var x : quasiater.bobrinskoi; () => { var y = this; }; return x; }
->perrini : Symbol(perrini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 226, 95))
+>perrini : Symbol(oconnelli.perrini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 226, 95))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
 >bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 227, 42))
@@ -2989,7 +2989,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 227, 42))
 
     entellus() : dammermani.melanops { var x : dammermani.melanops; () => { var y = this; }; return x; }
->entellus : Symbol(entellus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 227, 105))
+>entellus : Symbol(oconnelli.entellus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 227, 105))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
 >melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 228, 42))
@@ -3000,7 +3000,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 228, 42))
 
     krebsii() : rionegrensis.veraecrucis<rionegrensis.caniventer, julianae.durangae> { var x : rionegrensis.veraecrucis<rionegrensis.caniventer, julianae.durangae>; () => { var y = this; }; return x; }
->krebsii : Symbol(krebsii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 228, 104))
+>krebsii : Symbol(oconnelli.krebsii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 228, 104))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
 >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
@@ -3019,7 +3019,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 229, 90))
 
     cephalotes() : lutreolus.schlegeli { var x : lutreolus.schlegeli; () => { var y = this; }; return x; }
->cephalotes : Symbol(cephalotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 229, 201))
+>cephalotes : Symbol(oconnelli.cephalotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 229, 201))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
 >schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 230, 44))
@@ -3030,7 +3030,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 230, 44))
 
     molossinus() : daubentonii.nigricans<quasiater.carolinensis, daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis>> { var x : daubentonii.nigricans<quasiater.carolinensis, daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis>>; () => { var y = this; }; return x; }
->molossinus : Symbol(molossinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 230, 106))
+>molossinus : Symbol(oconnelli.molossinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 230, 106))
 >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1))
 >nigricans : Symbol(daubentonii.nigricans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 587, 20))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
@@ -3057,7 +3057,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 231, 136))
 
     luisi() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; }
->luisi : Symbol(luisi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 231, 290))
+>luisi : Symbol(oconnelli.luisi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 231, 290))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
 >robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 232, 41))
@@ -3068,7 +3068,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 232, 41))
 
     ceylonicus() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
->ceylonicus : Symbol(ceylonicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 232, 105))
+>ceylonicus : Symbol(oconnelli.ceylonicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 232, 105))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
 >caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 233, 48))
@@ -3079,7 +3079,7 @@ module trivirgatus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 233, 48))
 
     ralli() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; }
->ralli : Symbol(ralli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 233, 114))
+>ralli : Symbol(oconnelli.ralli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 233, 114))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 234, 40))
@@ -3097,7 +3097,7 @@ module quasiater {
 >bobrinskoi : Symbol(bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18))
 
     crassicaudatus() : samarensis.cahirinus<macrorhinos.daphaenodon, argurus.luctuosa> { var x : samarensis.cahirinus<macrorhinos.daphaenodon, argurus.luctuosa>; () => { var y = this; }; return x; }
->crassicaudatus : Symbol(crassicaudatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 238, 27))
+>crassicaudatus : Symbol(bobrinskoi.crassicaudatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 238, 27))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >cahirinus : Symbol(samarensis.cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
@@ -3116,7 +3116,7 @@ module quasiater {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 239, 92))
 
     mulatta() : argurus.oreas { var x : argurus.oreas; () => { var y = this; }; return x; }
->mulatta : Symbol(mulatta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 239, 198))
+>mulatta : Symbol(bobrinskoi.mulatta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 239, 198))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 240, 35))
@@ -3127,7 +3127,7 @@ module quasiater {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 240, 35))
 
     ansorgei() : rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus> { var x : rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>; () => { var y = this; }; return x; }
->ansorgei : Symbol(ansorgei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 240, 91))
+>ansorgei : Symbol(bobrinskoi.ansorgei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 240, 91))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
 >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
@@ -3154,7 +3154,7 @@ module quasiater {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 241, 123))
 
     Copper() : argurus.netscheri<quasiater.carolinensis, dogramacii.kaiseri> { var x : argurus.netscheri<quasiater.carolinensis, dogramacii.kaiseri>; () => { var y = this; }; return x; }
->Copper : Symbol(Copper, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 241, 266))
+>Copper : Symbol(bobrinskoi.Copper, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 241, 266))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
@@ -3187,7 +3187,7 @@ module ruatanica {
 >foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18))
 
     nasoloi() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; }
->nasoloi : Symbol(nasoloi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 246, 93))
+>nasoloi : Symbol(americanus.nasoloi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 246, 93))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 247, 45))
@@ -3198,7 +3198,7 @@ module ruatanica {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 247, 45))
 
     mystacalis() : howi.angulatus<quasiater.carolinensis, sagitta.stolzmanni> { var x : howi.angulatus<quasiater.carolinensis, sagitta.stolzmanni>; () => { var y = this; }; return x; }
->mystacalis : Symbol(mystacalis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 247, 111))
+>mystacalis : Symbol(americanus.mystacalis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 247, 111))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
 >angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 13))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
@@ -3217,7 +3217,7 @@ module ruatanica {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 248, 83))
 
     fardoulisi() : trivirgatus.oconnelli { var x : trivirgatus.oconnelli; () => { var y = this; }; return x; }
->fardoulisi : Symbol(fardoulisi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 248, 184))
+>fardoulisi : Symbol(americanus.fardoulisi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 248, 184))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 249, 46))
@@ -3228,7 +3228,7 @@ module ruatanica {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 249, 46))
 
     tumidus() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; }
->tumidus : Symbol(tumidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 249, 110))
+>tumidus : Symbol(americanus.tumidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 249, 110))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
 >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 250, 39))
@@ -3253,7 +3253,7 @@ module lavali {
 >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3))
 
     setiger() : nigra.thalia<patas.uralensis, wilsoni> { var x : nigra.thalia<patas.uralensis, wilsoni>; () => { var y = this; }; return x; }
->setiger : Symbol(setiger, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 254, 96))
+>setiger : Symbol(wilsoni.setiger, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 254, 96))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14))
 >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1))
@@ -3270,7 +3270,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 255, 60))
 
     lorentzii() : imperfecta.subspinosus { var x : imperfecta.subspinosus; () => { var y = this; }; return x; }
->lorentzii : Symbol(lorentzii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 255, 141))
+>lorentzii : Symbol(wilsoni.lorentzii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 255, 141))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
 >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 256, 46))
@@ -3281,7 +3281,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 256, 46))
 
     antisensis() : lutreolus.foina { var x : lutreolus.foina; () => { var y = this; }; return x; }
->antisensis : Symbol(antisensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 256, 111))
+>antisensis : Symbol(wilsoni.antisensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 256, 111))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
 >foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 257, 40))
@@ -3292,7 +3292,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 257, 40))
 
     blossevillii() : dammermani.siberu<Lanthanum.megalonyx, dogramacii.kaiseri> { var x : dammermani.siberu<Lanthanum.megalonyx, dogramacii.kaiseri>; () => { var y = this; }; return x; }
->blossevillii : Symbol(blossevillii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 257, 98))
+>blossevillii : Symbol(wilsoni.blossevillii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 257, 98))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
 >siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
@@ -3311,7 +3311,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 258, 85))
 
     bontanus() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
->bontanus : Symbol(bontanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 258, 186))
+>bontanus : Symbol(wilsoni.bontanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 258, 186))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
 >caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 259, 46))
@@ -3322,7 +3322,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 259, 46))
 
     caligata() : argurus.oreas { var x : argurus.oreas; () => { var y = this; }; return x; }
->caligata : Symbol(caligata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 259, 112))
+>caligata : Symbol(wilsoni.caligata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 259, 112))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 260, 36))
@@ -3333,7 +3333,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 260, 36))
 
     franqueti() : panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus> { var x : panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus>; () => { var y = this; }; return x; }
->franqueti : Symbol(franqueti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 260, 92))
+>franqueti : Symbol(wilsoni.franqueti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 260, 92))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
@@ -3360,7 +3360,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 261, 128))
 
     roberti() : julianae.acariensis { var x : julianae.acariensis; () => { var y = this; }; return x; }
->roberti : Symbol(roberti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 261, 275))
+>roberti : Symbol(wilsoni.roberti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 261, 275))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 262, 41))
@@ -3371,7 +3371,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 262, 41))
 
     degelidus() : chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus> { var x : chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>; () => { var y = this; }; return x; }
->degelidus : Symbol(degelidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 262, 103))
+>degelidus : Symbol(wilsoni.degelidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 262, 103))
 >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1))
 >sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
@@ -3390,7 +3390,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 263, 92))
 
     amoenus() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; }
->amoenus : Symbol(amoenus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 263, 203))
+>amoenus : Symbol(wilsoni.amoenus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 263, 203))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
 >carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 264, 44))
@@ -3401,7 +3401,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 264, 44))
 
     kob() : trivirgatus.lotor<argurus.oreas, beisa> { var x : trivirgatus.lotor<argurus.oreas, beisa>; () => { var y = this; }; return x; }
->kob : Symbol(kob, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 264, 109))
+>kob : Symbol(wilsoni.kob, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 264, 109))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -3418,7 +3418,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 265, 57))
 
     csorbai() : caurinus.johorensis<caurinus.megaphyllus, julianae.steerii> { var x : caurinus.johorensis<caurinus.megaphyllus, julianae.steerii>; () => { var y = this; }; return x; }
->csorbai : Symbol(csorbai, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 265, 139))
+>csorbai : Symbol(wilsoni.csorbai, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 265, 139))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
 >johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
@@ -3437,7 +3437,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 266, 81))
 
     dorsata() : gabriellae.echinatus { var x : gabriellae.echinatus; () => { var y = this; }; return x; }
->dorsata : Symbol(dorsata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 266, 183))
+>dorsata : Symbol(wilsoni.dorsata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 266, 183))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
 >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 267, 42))
@@ -3461,7 +3461,7 @@ module lavali {
 >marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13))
 
     bonaerensis() : provocax.melanoleuca { var x : provocax.melanoleuca; () => { var y = this; }; return x; }
->bonaerensis : Symbol(bonaerensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 271, 72))
+>bonaerensis : Symbol(otion.bonaerensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 271, 72))
 >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1))
 >melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 272, 46))
@@ -3472,7 +3472,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 272, 46))
 
     dussumieri() : nigra.gracilis<julianae.steerii, dogramacii.kaiseri> { var x : nigra.gracilis<julianae.steerii, dogramacii.kaiseri>; () => { var y = this; }; return x; }
->dussumieri : Symbol(dussumieri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 272, 109))
+>dussumieri : Symbol(otion.dussumieri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 272, 109))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -3491,7 +3491,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 273, 77))
 
     osvaldoreigi() : julianae.albidens<julianae.steerii, quasiater.carolinensis> { var x : julianae.albidens<julianae.steerii, quasiater.carolinensis>; () => { var y = this; }; return x; }
->osvaldoreigi : Symbol(osvaldoreigi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 273, 172))
+>osvaldoreigi : Symbol(otion.osvaldoreigi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 273, 172))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >albidens : Symbol(julianae.albidens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 34, 3))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -3510,7 +3510,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 274, 86))
 
     grevyi() : samarensis.pallidus { var x : samarensis.pallidus; () => { var y = this; }; return x; }
->grevyi : Symbol(grevyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 274, 188))
+>grevyi : Symbol(otion.grevyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 274, 188))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 275, 40))
@@ -3521,7 +3521,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 275, 40))
 
     hirtula() : lepturus { var x : lepturus; () => { var y = this; }; return x; }
->hirtula : Symbol(hirtula, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 275, 102))
+>hirtula : Symbol(otion.hirtula, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 275, 102))
 >lepturus : Symbol(lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 276, 30))
 >lepturus : Symbol(lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3))
@@ -3530,7 +3530,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 276, 30))
 
     cristatus() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; }
->cristatus : Symbol(cristatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 276, 81))
+>cristatus : Symbol(otion.cristatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 276, 81))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 277, 40))
@@ -3541,7 +3541,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 277, 40))
 
     darlingtoni() : sagitta.leptoceros<wilsoni, trivirgatus.oconnelli> { var x : sagitta.leptoceros<wilsoni, trivirgatus.oconnelli>; () => { var y = this; }; return x; }
->darlingtoni : Symbol(darlingtoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 277, 99))
+>darlingtoni : Symbol(otion.darlingtoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 277, 99))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 16))
 >wilsoni : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15))
@@ -3558,7 +3558,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 278, 76))
 
     fontanierii() : panamensis.setulosus<samarensis.fuscus<wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, lutreolus.foina> { var x : panamensis.setulosus<samarensis.fuscus<wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, lutreolus.foina>; () => { var y = this; }; return x; }
->fontanierii : Symbol(fontanierii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 278, 169))
+>fontanierii : Symbol(otion.fontanierii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 278, 169))
 >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1))
 >setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
@@ -3591,7 +3591,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 279, 161))
 
     umbrosus() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; }
->umbrosus : Symbol(umbrosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 279, 339))
+>umbrosus : Symbol(otion.umbrosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 279, 339))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
 >marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 280, 36))
@@ -3602,7 +3602,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 280, 36))
 
     chiriquinus() : imperfecta.lasiurus<caurinus.psilurus, caurinus.psilurus> { var x : imperfecta.lasiurus<caurinus.psilurus, caurinus.psilurus>; () => { var y = this; }; return x; }
->chiriquinus : Symbol(chiriquinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 280, 92))
+>chiriquinus : Symbol(otion.chiriquinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 280, 92))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
 >lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
@@ -3621,7 +3621,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 281, 83))
 
     orarius() : lutreolus.schlegeli { var x : lutreolus.schlegeli; () => { var y = this; }; return x; }
->orarius : Symbol(orarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 281, 183))
+>orarius : Symbol(otion.orarius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 281, 183))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
 >schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 282, 41))
@@ -3632,7 +3632,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 282, 41))
 
     ilaeus() : caurinus.mahaganus<julianae.acariensis, julianae.sumatrana> { var x : caurinus.mahaganus<julianae.acariensis, julianae.sumatrana>; () => { var y = this; }; return x; }
->ilaeus : Symbol(ilaeus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 282, 103))
+>ilaeus : Symbol(otion.ilaeus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 282, 103))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
 >mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -3651,7 +3651,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 283, 80))
 
     musschenbroekii() : trivirgatus.falconeri { var x : trivirgatus.falconeri; () => { var y = this; }; return x; }
->musschenbroekii : Symbol(musschenbroekii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 283, 182))
+>musschenbroekii : Symbol(otion.musschenbroekii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 283, 182))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 284, 51))
@@ -3665,7 +3665,7 @@ module lavali {
 >xanthognathus : Symbol(xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3))
 
     nanulus() : daubentonii.nigricans<imperfecta.subspinosus, samarensis.pallidus> { var x : daubentonii.nigricans<imperfecta.subspinosus, samarensis.pallidus>; () => { var y = this; }; return x; }
->nanulus : Symbol(nanulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 286, 30))
+>nanulus : Symbol(xanthognathus.nanulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 286, 30))
 >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1))
 >nigricans : Symbol(daubentonii.nigricans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 587, 20))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
@@ -3684,7 +3684,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 287, 88))
 
     albigena() : chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi> { var x : chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>; () => { var y = this; }; return x; }
->albigena : Symbol(albigena, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 287, 197))
+>albigena : Symbol(xanthognathus.albigena, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 287, 197))
 >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1))
 >sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
@@ -3703,7 +3703,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 288, 87))
 
     onca() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; }
->onca : Symbol(onca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 288, 194))
+>onca : Symbol(xanthognathus.onca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 288, 194))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 289, 37))
@@ -3714,7 +3714,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 289, 37))
 
     gunnii() : minutus.himalayana<howi.coludo<lepturus, lutreolus.punicus>, nigra.thalia<patas.uralensis, dogramacii.robustulus>> { var x : minutus.himalayana<howi.coludo<lepturus, lutreolus.punicus>, nigra.thalia<patas.uralensis, dogramacii.robustulus>>; () => { var y = this; }; return x; }
->gunnii : Symbol(gunnii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 289, 98))
+>gunnii : Symbol(xanthognathus.gunnii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 289, 98))
 >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1))
 >himalayana : Symbol(minutus.himalayana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 434, 16))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
@@ -3747,7 +3747,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 290, 135))
 
     apeco() : lutreolus.foina { var x : lutreolus.foina; () => { var y = this; }; return x; }
->apeco : Symbol(apeco, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 290, 292))
+>apeco : Symbol(xanthognathus.apeco, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 290, 292))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
 >foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 291, 35))
@@ -3758,7 +3758,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 291, 35))
 
     variegates() : gabriellae.klossii<wilsoni, julianae.nudicaudus> { var x : gabriellae.klossii<wilsoni, julianae.nudicaudus>; () => { var y = this; }; return x; }
->variegates : Symbol(variegates, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 291, 93))
+>variegates : Symbol(xanthognathus.variegates, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 291, 93))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
 >klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19))
 >wilsoni : Symbol(wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15))
@@ -3775,7 +3775,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 292, 73))
 
     goudotii() : trivirgatus.falconeri { var x : trivirgatus.falconeri; () => { var y = this; }; return x; }
->goudotii : Symbol(goudotii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 292, 164))
+>goudotii : Symbol(xanthognathus.goudotii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 292, 164))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 293, 44))
@@ -3786,7 +3786,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 293, 44))
 
     pohlei() : Lanthanum.megalonyx { var x : Lanthanum.megalonyx; () => { var y = this; }; return x; }
->pohlei : Symbol(pohlei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 293, 108))
+>pohlei : Symbol(xanthognathus.pohlei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 293, 108))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
 >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 294, 40))
@@ -3797,7 +3797,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 294, 40))
 
     ineptus() : panamensis.setulosus<xanthognathus, beisa> { var x : panamensis.setulosus<xanthognathus, beisa>; () => { var y = this; }; return x; }
->ineptus : Symbol(ineptus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 294, 102))
+>ineptus : Symbol(xanthognathus.ineptus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 294, 102))
 >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1))
 >setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19))
 >xanthognathus : Symbol(xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3))
@@ -3812,7 +3812,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 295, 64))
 
     euryotis() : rendalli.moojeni<julianae.steerii, samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>> { var x : rendalli.moojeni<julianae.steerii, samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>>; () => { var y = this; }; return x; }
->euryotis : Symbol(euryotis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 295, 149))
+>euryotis : Symbol(xanthognathus.euryotis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 295, 149))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
 >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -3839,7 +3839,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 296, 120))
 
     maurisca() : Lanthanum.suillus<rionegrensis.caniventer, imperfecta.subspinosus> { var x : Lanthanum.suillus<rionegrensis.caniventer, imperfecta.subspinosus>; () => { var y = this; }; return x; }
->maurisca : Symbol(maurisca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 296, 260))
+>maurisca : Symbol(xanthognathus.maurisca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 296, 260))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
 >suillus : Symbol(Lanthanum.suillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 107, 18))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
@@ -3858,7 +3858,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 297, 89))
 
     coyhaiquensis() : caurinus.mahaganus<dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, argurus.peninsulae>>, lutreolus.punicus> { var x : caurinus.mahaganus<dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, argurus.peninsulae>>, lutreolus.punicus>; () => { var y = this; }; return x; }
->coyhaiquensis : Symbol(coyhaiquensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 297, 198))
+>coyhaiquensis : Symbol(xanthognathus.coyhaiquensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 297, 198))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
 >mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
@@ -3907,7 +3907,7 @@ module lavali {
 >oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16))
 
     coromandra() : julianae.galapagoensis { var x : julianae.galapagoensis; () => { var y = this; }; return x; }
->coromandra : Symbol(coromandra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 300, 47))
+>coromandra : Symbol(thaeleri.coromandra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 300, 47))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >galapagoensis : Symbol(julianae.galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 301, 47))
@@ -3918,7 +3918,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 301, 47))
 
     parvipes() : nigra.dolichurus<argurus.germaini, samarensis.pallidus> { var x : nigra.dolichurus<argurus.germaini, samarensis.pallidus>; () => { var y = this; }; return x; }
->parvipes : Symbol(parvipes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 301, 112))
+>parvipes : Symbol(thaeleri.parvipes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 301, 112))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -3937,7 +3937,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 302, 78))
 
     sponsorius() : rionegrensis.veraecrucis<chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>, julianae.steerii> { var x : rionegrensis.veraecrucis<chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>, julianae.steerii>; () => { var y = this; }; return x; }
->sponsorius : Symbol(sponsorius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 302, 176))
+>sponsorius : Symbol(thaeleri.sponsorius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 302, 176))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
 >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3))
 >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1))
@@ -3964,7 +3964,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 303, 133))
 
     vates() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; }
->vates : Symbol(vates, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 303, 284))
+>vates : Symbol(thaeleri.vates, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 303, 284))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
 >robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 304, 41))
@@ -3975,7 +3975,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 304, 41))
 
     roosmalenorum() : dogramacii.koepckeae { var x : dogramacii.koepckeae; () => { var y = this; }; return x; }
->roosmalenorum : Symbol(roosmalenorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 304, 105))
+>roosmalenorum : Symbol(thaeleri.roosmalenorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 304, 105))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
 >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 305, 48))
@@ -3986,7 +3986,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 305, 48))
 
     rubicola() : rendalli.moojeni<rionegrensis.caniventer, rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>> { var x : rendalli.moojeni<rionegrensis.caniventer, rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>>; () => { var y = this; }; return x; }
->rubicola : Symbol(rubicola, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 305, 111))
+>rubicola : Symbol(thaeleri.rubicola, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 305, 111))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
 >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
@@ -4021,7 +4021,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 306, 166))
 
     ikonnikovi() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; }
->ikonnikovi : Symbol(ikonnikovi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 306, 352))
+>ikonnikovi : Symbol(thaeleri.ikonnikovi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 306, 352))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 307, 41))
@@ -4032,7 +4032,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 307, 41))
 
     paramicrus() : imperfecta.ciliolabrum<otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>> { var x : imperfecta.ciliolabrum<otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>; () => { var y = this; }; return x; }
->paramicrus : Symbol(paramicrus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 307, 100))
+>paramicrus : Symbol(thaeleri.paramicrus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 307, 100))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
 >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5))
 >otion : Symbol(otion, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 270, 3))
@@ -4067,7 +4067,7 @@ module lavali {
 >carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18))
 
     ferrumequinum() : argurus.netscheri<argurus.luctuosa, julianae.nudicaudus> { var x : argurus.netscheri<argurus.luctuosa, julianae.nudicaudus>; () => { var y = this; }; return x; }
->ferrumequinum : Symbol(ferrumequinum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 310, 96))
+>ferrumequinum : Symbol(lepturus.ferrumequinum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 310, 96))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -4086,7 +4086,7 @@ module lavali {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 311, 84))
 
     aequalis() : sagitta.cinereus<petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla>, Lanthanum.jugularis> { var x : sagitta.cinereus<petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla>, Lanthanum.jugularis>; () => { var y = this; }; return x; }
->aequalis : Symbol(aequalis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 311, 183))
+>aequalis : Symbol(lepturus.aequalis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 311, 183))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
@@ -4137,7 +4137,7 @@ module dogramacii {
 >wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15))
 
     fossor() : minutus.inez<argurus.peninsulae, julianae.nudicaudus> { var x : minutus.inez<argurus.peninsulae, julianae.nudicaudus>; () => { var y = this; }; return x; }
->fossor : Symbol(fossor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 316, 50))
+>fossor : Symbol(robustulus.fossor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 316, 50))
 >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1))
 >inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -4156,7 +4156,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 317, 74))
 
     humboldti() : sagitta.cinereus<lavali.xanthognathus, argurus.oreas> { var x : sagitta.cinereus<lavali.xanthognathus, argurus.oreas>; () => { var y = this; }; return x; }
->humboldti : Symbol(humboldti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 317, 170))
+>humboldti : Symbol(robustulus.humboldti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 317, 170))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -4175,7 +4175,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 318, 77))
 
     mexicana() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; }
->mexicana : Symbol(mexicana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 318, 173))
+>mexicana : Symbol(robustulus.mexicana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 318, 173))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 319, 46))
@@ -4186,7 +4186,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 319, 46))
 
     martini() : julianae.oralis<julianae.steerii, lavali.lepturus> { var x : julianae.oralis<julianae.steerii, lavali.lepturus>; () => { var y = this; }; return x; }
->martini : Symbol(martini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 319, 112))
+>martini : Symbol(robustulus.martini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 319, 112))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >oralis : Symbol(julianae.oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -4205,7 +4205,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 320, 72))
 
     beatus() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; }
->beatus : Symbol(beatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 320, 165))
+>beatus : Symbol(robustulus.beatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 320, 165))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
 >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 321, 40))
@@ -4216,7 +4216,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 321, 40))
 
     leporina() : trivirgatus.falconeri { var x : trivirgatus.falconeri; () => { var y = this; }; return x; }
->leporina : Symbol(leporina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 321, 102))
+>leporina : Symbol(robustulus.leporina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 321, 102))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 322, 44))
@@ -4227,7 +4227,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 322, 44))
 
     pearsonii() : dammermani.melanops { var x : dammermani.melanops; () => { var y = this; }; return x; }
->pearsonii : Symbol(pearsonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 322, 108))
+>pearsonii : Symbol(robustulus.pearsonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 322, 108))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
 >melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 323, 43))
@@ -4238,7 +4238,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 323, 43))
 
     keaysi() : howi.angulatus<lavali.beisa, rendalli.zuluensis> { var x : howi.angulatus<lavali.beisa, rendalli.zuluensis>; () => { var y = this; }; return x; }
->keaysi : Symbol(keaysi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 323, 105))
+>keaysi : Symbol(robustulus.keaysi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 323, 105))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
 >angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 13))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -4257,7 +4257,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 324, 69))
 
     hindei() : imperfecta.lasiurus<macrorhinos.konganensis, julianae.steerii> { var x : imperfecta.lasiurus<macrorhinos.konganensis, julianae.steerii>; () => { var y = this; }; return x; }
->hindei : Symbol(hindei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 324, 160))
+>hindei : Symbol(robustulus.hindei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 324, 160))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
 >lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
@@ -4279,7 +4279,7 @@ module dogramacii {
 >koepckeae : Symbol(koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3))
 
     culturatus() : samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana> { var x : samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana>; () => { var y = this; }; return x; }
->culturatus : Symbol(culturatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 327, 26))
+>culturatus : Symbol(koepckeae.culturatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 327, 26))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19))
 >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1))
@@ -4307,7 +4307,7 @@ module dogramacii {
 >kaiseri : Symbol(kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3))
 
     bedfordiae() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; }
->bedfordiae : Symbol(bedfordiae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 330, 24))
+>bedfordiae : Symbol(kaiseri.bedfordiae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 330, 24))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
 >carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 331, 47))
@@ -4318,7 +4318,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 331, 47))
 
     paramorum() : Lanthanum.megalonyx { var x : Lanthanum.megalonyx; () => { var y = this; }; return x; }
->paramorum : Symbol(paramorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 331, 112))
+>paramorum : Symbol(kaiseri.paramorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 331, 112))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
 >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 332, 43))
@@ -4329,7 +4329,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 332, 43))
 
     rubidus() : trivirgatus.lotor<julianae.steerii, samarensis.pallidus> { var x : trivirgatus.lotor<julianae.steerii, samarensis.pallidus>; () => { var y = this; }; return x; }
->rubidus : Symbol(rubidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 332, 105))
+>rubidus : Symbol(kaiseri.rubidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 332, 105))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -4348,7 +4348,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 333, 78))
 
     juninensis() : quasiater.bobrinskoi { var x : quasiater.bobrinskoi; () => { var y = this; }; return x; }
->juninensis : Symbol(juninensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 333, 177))
+>juninensis : Symbol(kaiseri.juninensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 333, 177))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
 >bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 334, 45))
@@ -4359,7 +4359,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 334, 45))
 
     marginata() : argurus.wetmorei<rionegrensis.caniventer, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>> { var x : argurus.wetmorei<rionegrensis.caniventer, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>; () => { var y = this; }; return x; }
->marginata : Symbol(marginata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 334, 108))
+>marginata : Symbol(kaiseri.marginata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 334, 108))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >wetmorei : Symbol(argurus.wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 16))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
@@ -4394,7 +4394,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 335, 175))
 
     Meitnerium() : ruatanica.Praseodymium<julianae.sumatrana, lutreolus.cor<Lanthanum.jugularis, julianae.galapagoensis>> { var x : ruatanica.Praseodymium<julianae.sumatrana, lutreolus.cor<Lanthanum.jugularis, julianae.galapagoensis>>; () => { var y = this; }; return x; }
->Meitnerium : Symbol(Meitnerium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 335, 369))
+>Meitnerium : Symbol(kaiseri.Meitnerium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 335, 369))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
 >Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -4421,7 +4421,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 336, 127))
 
     pinetorum() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
->pinetorum : Symbol(pinetorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 336, 272))
+>pinetorum : Symbol(kaiseri.pinetorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 336, 272))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
 >caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 337, 47))
@@ -4432,7 +4432,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 337, 47))
 
     hoolock() : samarensis.pelurus<argurus.oreas, argurus.luctuosa> { var x : samarensis.pelurus<argurus.oreas, argurus.luctuosa>; () => { var y = this; }; return x; }
->hoolock : Symbol(hoolock, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 337, 113))
+>hoolock : Symbol(kaiseri.hoolock, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 337, 113))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -4451,7 +4451,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 338, 73))
 
     poeyi() : gabriellae.echinatus { var x : gabriellae.echinatus; () => { var y = this; }; return x; }
->poeyi : Symbol(poeyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 338, 167))
+>poeyi : Symbol(kaiseri.poeyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 338, 167))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
 >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 339, 40))
@@ -4462,7 +4462,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 339, 40))
 
     Thulium() : julianae.durangae { var x : julianae.durangae; () => { var y = this; }; return x; }
->Thulium : Symbol(Thulium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 339, 103))
+>Thulium : Symbol(kaiseri.Thulium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 339, 103))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >durangae : Symbol(julianae.durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 340, 39))
@@ -4473,7 +4473,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 340, 39))
 
     patrius() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; }
->patrius : Symbol(patrius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 340, 99))
+>patrius : Symbol(kaiseri.patrius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 340, 99))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
 >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 341, 41))
@@ -4484,7 +4484,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 341, 41))
 
     quadraticauda() : julianae.nudicaudus { var x : julianae.nudicaudus; () => { var y = this; }; return x; }
->quadraticauda : Symbol(quadraticauda, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 341, 103))
+>quadraticauda : Symbol(kaiseri.quadraticauda, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 341, 103))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 342, 47))
@@ -4495,7 +4495,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 342, 47))
 
     ater() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
->ater : Symbol(ater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 342, 109))
+>ater : Symbol(kaiseri.ater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 342, 109))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
 >americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 343, 39))
@@ -4509,7 +4509,7 @@ module dogramacii {
 >aurata : Symbol(aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3))
 
     grunniens() : nigra.gracilis<samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana>, ruatanica.americanus> { var x : nigra.gracilis<samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana>, ruatanica.americanus>; () => { var y = this; }; return x; }
->grunniens : Symbol(grunniens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 345, 23))
+>grunniens : Symbol(aurata.grunniens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 345, 23))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
@@ -4542,7 +4542,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 346, 150))
 
     howensis() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
->howensis : Symbol(howensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 346, 319))
+>howensis : Symbol(aurata.howensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 346, 319))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
 >americanus : Symbol(ruatanica.americanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 245, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 347, 43))
@@ -4553,7 +4553,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 347, 43))
 
     karlkoopmani() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; }
->karlkoopmani : Symbol(karlkoopmani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 347, 106))
+>karlkoopmani : Symbol(aurata.karlkoopmani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 347, 106))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
 >psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 348, 44))
@@ -4564,7 +4564,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 348, 44))
 
     mirapitanga() : julianae.albidens<gabriellae.echinatus, gabriellae.echinatus> { var x : julianae.albidens<gabriellae.echinatus, gabriellae.echinatus>; () => { var y = this; }; return x; }
->mirapitanga : Symbol(mirapitanga, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 348, 104))
+>mirapitanga : Symbol(aurata.mirapitanga, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 348, 104))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >albidens : Symbol(julianae.albidens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 34, 3))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
@@ -4583,7 +4583,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 349, 87))
 
     ophiodon() : aurata { var x : aurata; () => { var y = this; }; return x; }
->ophiodon : Symbol(ophiodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 349, 191))
+>ophiodon : Symbol(aurata.ophiodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 349, 191))
 >aurata : Symbol(aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 350, 29))
 >aurata : Symbol(aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3))
@@ -4592,7 +4592,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 350, 29))
 
     landeri() : samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus> { var x : samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>; () => { var y = this; }; return x; }
->landeri : Symbol(landeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 350, 78))
+>landeri : Symbol(aurata.landeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 350, 78))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
@@ -4611,7 +4611,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 351, 83))
 
     sonomae() : trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, koepckeae> { var x : trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, koepckeae>; () => { var y = this; }; return x; }
->sonomae : Symbol(sonomae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 351, 187))
+>sonomae : Symbol(aurata.sonomae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 351, 187))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
@@ -4636,7 +4636,7 @@ module dogramacii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 352, 102))
 
     erythromos() : caurinus.johorensis<panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni>, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>> { var x : caurinus.johorensis<panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni>, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>>; () => { var y = this; }; return x; }
->erythromos : Symbol(erythromos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 352, 225))
+>erythromos : Symbol(aurata.erythromos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 352, 225))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
 >johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
@@ -4681,7 +4681,7 @@ module lutreolus {
 >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3))
 
     mittendorfi() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
->mittendorfi : Symbol(mittendorfi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 357, 47))
+>mittendorfi : Symbol(schlegeli.mittendorfi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 357, 47))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
 >caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 358, 49))
@@ -4692,7 +4692,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 358, 49))
 
     blicki() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; }
->blicki : Symbol(blicki, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 358, 115))
+>blicki : Symbol(schlegeli.blicki, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 358, 115))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
 >robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 359, 42))
@@ -4703,7 +4703,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 359, 42))
 
     culionensis() : argurus.dauricus<ruatanica.americanus, rionegrensis.caniventer> { var x : argurus.dauricus<ruatanica.americanus, rionegrensis.caniventer>; () => { var y = this; }; return x; }
->culionensis : Symbol(culionensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 359, 106))
+>culionensis : Symbol(schlegeli.culionensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 359, 106))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
@@ -4722,7 +4722,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 360, 89))
 
     scrofa() : petrophilus.sodyi<gabriellae.amicus, julianae.sumatrana> { var x : petrophilus.sodyi<gabriellae.amicus, julianae.sumatrana>; () => { var y = this; }; return x; }
->scrofa : Symbol(scrofa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 360, 195))
+>scrofa : Symbol(schlegeli.scrofa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 360, 195))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
 >sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
@@ -4741,7 +4741,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 361, 77))
 
     fernandoni() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; }
->fernandoni : Symbol(fernandoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 361, 176))
+>fernandoni : Symbol(schlegeli.fernandoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 361, 176))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
 >carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 362, 47))
@@ -4752,7 +4752,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 362, 47))
 
     Tin() : sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>> { var x : sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>; () => { var y = this; }; return x; }
->Tin : Symbol(Tin, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 362, 112))
+>Tin : Symbol(schlegeli.Tin, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 362, 112))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >leptoceros : Symbol(sagitta.leptoceros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 578, 16))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
@@ -4779,7 +4779,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 363, 126))
 
     marmorata() : panamensis.setulosus<quasiater.carolinensis, daubentonii.arboreus<dogramacii.kaiseri, lutreolus.punicus>> { var x : panamensis.setulosus<quasiater.carolinensis, daubentonii.arboreus<dogramacii.kaiseri, lutreolus.punicus>>; () => { var y = this; }; return x; }
->marmorata : Symbol(marmorata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 363, 277))
+>marmorata : Symbol(schlegeli.marmorata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 363, 277))
 >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1))
 >setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
@@ -4806,7 +4806,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 364, 129))
 
     tavaratra() : Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon> { var x : Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon>; () => { var y = this; }; return x; }
->tavaratra : Symbol(tavaratra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 364, 277))
+>tavaratra : Symbol(schlegeli.tavaratra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 364, 277))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
 >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
@@ -4825,7 +4825,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 365, 81))
 
     peregrina() : daubentonii.nesiotes<macrorhinos.konganensis, lutreolus.punicus> { var x : daubentonii.nesiotes<macrorhinos.konganensis, lutreolus.punicus>; () => { var y = this; }; return x; }
->peregrina : Symbol(peregrina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 365, 181))
+>peregrina : Symbol(schlegeli.peregrina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 365, 181))
 >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1))
 >nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 20))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
@@ -4844,7 +4844,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 366, 88))
 
     frontalis() : macrorhinos.marmosurus<ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>>, samarensis.pallidus> { var x : macrorhinos.marmosurus<ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>>, samarensis.pallidus>; () => { var y = this; }; return x; }
->frontalis : Symbol(frontalis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 366, 195))
+>frontalis : Symbol(schlegeli.frontalis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 366, 195))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
@@ -4879,7 +4879,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 367, 163))
 
     cuniculus() : patas.uralensis { var x : patas.uralensis; () => { var y = this; }; return x; }
->cuniculus : Symbol(cuniculus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 367, 345))
+>cuniculus : Symbol(schlegeli.cuniculus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 367, 345))
 >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1))
 >uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 368, 39))
@@ -4890,7 +4890,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 368, 39))
 
     magdalenae() : julianae.gerbillus<rionegrensis.caniventer, rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus>> { var x : julianae.gerbillus<rionegrensis.caniventer, rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus>>; () => { var y = this; }; return x; }
->magdalenae : Symbol(magdalenae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 368, 97))
+>magdalenae : Symbol(schlegeli.magdalenae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 368, 97))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >gerbillus : Symbol(julianae.gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
@@ -4917,7 +4917,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 369, 131))
 
     andamanensis() : julianae.oralis<ruatanica.americanus, rendalli.zuluensis> { var x : julianae.oralis<ruatanica.americanus, rendalli.zuluensis>; () => { var y = this; }; return x; }
->andamanensis : Symbol(andamanensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 369, 280))
+>andamanensis : Symbol(schlegeli.andamanensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 369, 280))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >oralis : Symbol(julianae.oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
@@ -4936,7 +4936,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 370, 84))
 
     dispar() : panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis> { var x : panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>; () => { var y = this; }; return x; }
->dispar : Symbol(dispar, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 370, 184))
+>dispar : Symbol(schlegeli.dispar, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 370, 184))
 >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1))
 >linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
@@ -4964,7 +4964,7 @@ module argurus {
 >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 375, 27))
 
     chinensis() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; }
->chinensis : Symbol(chinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 375, 33))
+>chinensis : Symbol(dauricus.chinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 375, 33))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
 >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 376, 43))
@@ -4975,7 +4975,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 376, 43))
 
     duodecimcostatus() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; }
->duodecimcostatus : Symbol(duodecimcostatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 376, 105))
+>duodecimcostatus : Symbol(dauricus.duodecimcostatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 376, 105))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 377, 51))
@@ -4986,7 +4986,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 377, 51))
 
     foxi() : daubentonii.nesiotes<lavali.beisa, lavali.lepturus> { var x : daubentonii.nesiotes<lavali.beisa, lavali.lepturus>; () => { var y = this; }; return x; }
->foxi : Symbol(foxi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 377, 114))
+>foxi : Symbol(dauricus.foxi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 377, 114))
 >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1))
 >nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 20))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -5005,7 +5005,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 378, 70))
 
     macleayii() : petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla> { var x : petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla>; () => { var y = this; }; return x; }
->macleayii : Symbol(macleayii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 378, 164))
+>macleayii : Symbol(dauricus.macleayii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 378, 164))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
 >sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
@@ -5040,7 +5040,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 379, 173))
 
     darienensis() : trivirgatus.oconnelli { var x : trivirgatus.oconnelli; () => { var y = this; }; return x; }
->darienensis : Symbol(darienensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 379, 365))
+>darienensis : Symbol(dauricus.darienensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 379, 365))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 380, 47))
@@ -5051,7 +5051,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 380, 47))
 
     hardwickii() : macrorhinos.daphaenodon { var x : macrorhinos.daphaenodon; () => { var y = this; }; return x; }
->hardwickii : Symbol(hardwickii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 380, 111))
+>hardwickii : Symbol(dauricus.hardwickii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 380, 111))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 381, 48))
@@ -5062,7 +5062,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 381, 48))
 
     albifrons() : rionegrensis.veraecrucis<lavali.lepturus, julianae.durangae> { var x : rionegrensis.veraecrucis<lavali.lepturus, julianae.durangae>; () => { var y = this; }; return x; }
->albifrons : Symbol(albifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 381, 114))
+>albifrons : Symbol(dauricus.albifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 381, 114))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
 >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -5081,7 +5081,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 382, 84))
 
     jacobitus() : caurinus.johorensis<macrorhinos.konganensis, caurinus.johorensis<argurus.peninsulae, daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>>> { var x : caurinus.johorensis<macrorhinos.konganensis, caurinus.johorensis<argurus.peninsulae, daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>>>; () => { var y = this; }; return x; }
->jacobitus : Symbol(jacobitus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 382, 187))
+>jacobitus : Symbol(dauricus.jacobitus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 382, 187))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
 >johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
@@ -5116,7 +5116,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 383, 169))
 
     guentheri() : rendalli.moojeni<lutreolus.foina, argurus.oreas> { var x : rendalli.moojeni<lutreolus.foina, argurus.oreas>; () => { var y = this; }; return x; }
->guentheri : Symbol(guentheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 383, 357))
+>guentheri : Symbol(dauricus.guentheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 383, 357))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
 >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
@@ -5135,7 +5135,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 384, 72))
 
     mahomet() : imperfecta.ciliolabrum<argurus.germaini, lutreolus.foina> { var x : imperfecta.ciliolabrum<argurus.germaini, lutreolus.foina>; () => { var y = this; }; return x; }
->mahomet : Symbol(mahomet, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 384, 163))
+>mahomet : Symbol(dauricus.mahomet, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 384, 163))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
 >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -5154,7 +5154,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 385, 79))
 
     misionensis() : macrorhinos.marmosurus<daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>, gabriellae.echinatus> { var x : macrorhinos.marmosurus<daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>, gabriellae.echinatus>; () => { var y = this; }; return x; }
->misionensis : Symbol(misionensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 385, 179))
+>misionensis : Symbol(dauricus.misionensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 385, 179))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20))
 >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1))
@@ -5190,7 +5190,7 @@ module nigra {
 >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 390, 29))
 
     solomonis() : panglima.abidi<quasiater.carolinensis, rendalli.crenulata<gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>, argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>>> { var x : panglima.abidi<quasiater.carolinensis, rendalli.crenulata<gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>, argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>>>; () => { var y = this; }; return x; }
->solomonis : Symbol(solomonis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 390, 35))
+>solomonis : Symbol(dolichurus.solomonis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 390, 35))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >abidi : Symbol(panglima.abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
@@ -5249,7 +5249,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 391, 270))
 
     alfredi() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; }
->alfredi : Symbol(alfredi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 391, 559))
+>alfredi : Symbol(dolichurus.alfredi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 391, 559))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
 >psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 392, 39))
@@ -5260,7 +5260,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 392, 39))
 
     morrisi() : ruatanica.hector<trivirgatus.oconnelli, sagitta.cinereus<nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>, quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>>> { var x : ruatanica.hector<trivirgatus.oconnelli, sagitta.cinereus<nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>, quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>>>; () => { var y = this; }; return x; }
->morrisi : Symbol(morrisi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 392, 99))
+>morrisi : Symbol(dolichurus.morrisi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 392, 99))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
 >hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
@@ -5311,7 +5311,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 393, 248))
 
     lekaguli() : Lanthanum.nitidus<dammermani.melanops, lavali.lepturus> { var x : Lanthanum.nitidus<dammermani.melanops, lavali.lepturus>; () => { var y = this; }; return x; }
->lekaguli : Symbol(lekaguli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 393, 517))
+>lekaguli : Symbol(dolichurus.lekaguli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 393, 517))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
 >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
@@ -5330,7 +5330,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 394, 78))
 
     dimissus() : imperfecta.subspinosus { var x : imperfecta.subspinosus; () => { var y = this; }; return x; }
->dimissus : Symbol(dimissus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 394, 176))
+>dimissus : Symbol(dolichurus.dimissus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 394, 176))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
 >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 395, 45))
@@ -5341,7 +5341,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 395, 45))
 
     phaeotis() : julianae.sumatrana { var x : julianae.sumatrana; () => { var y = this; }; return x; }
->phaeotis : Symbol(phaeotis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 395, 110))
+>phaeotis : Symbol(dolichurus.phaeotis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 395, 110))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 396, 41))
@@ -5352,7 +5352,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 396, 41))
 
     ustus() : julianae.acariensis { var x : julianae.acariensis; () => { var y = this; }; return x; }
->ustus : Symbol(ustus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 396, 102))
+>ustus : Symbol(dolichurus.ustus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 396, 102))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 397, 39))
@@ -5363,7 +5363,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 397, 39))
 
     sagei() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; }
->sagei : Symbol(sagei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 397, 101))
+>sagei : Symbol(dolichurus.sagei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 397, 101))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
 >marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 398, 33))
@@ -5394,7 +5394,7 @@ module panglima {
 >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3))
 
         bottegi(): macrorhinos.marmosurus<rendalli.moojeni<amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni> { var x: macrorhinos.marmosurus<rendalli.moojeni<amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>; () => { var y = this; }; return x; }
->bottegi : Symbol(bottegi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 402, 147))
+>bottegi : Symbol(amphibius.bottegi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 402, 147))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
@@ -5427,7 +5427,7 @@ module panglima {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 403, 160))
 
         jerdoni(): macrorhinos.daphaenodon { var x: macrorhinos.daphaenodon; () => { var y = this; }; return x; }
->jerdoni : Symbol(jerdoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 403, 337))
+>jerdoni : Symbol(amphibius.jerdoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 403, 337))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 404, 48))
@@ -5438,7 +5438,7 @@ module panglima {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 404, 48))
 
         camtschatica(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; }
->camtschatica : Symbol(camtschatica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 404, 113))
+>camtschatica : Symbol(amphibius.camtschatica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 404, 113))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 405, 49))
@@ -5449,7 +5449,7 @@ module panglima {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 405, 49))
 
         spadix(): petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus> { var x: petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>; () => { var y = this; }; return x; }
->spadix : Symbol(spadix, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 405, 110))
+>spadix : Symbol(amphibius.spadix, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 405, 110))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
 >sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
@@ -5468,7 +5468,7 @@ module panglima {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 406, 85))
 
         luismanueli(): rendalli.moojeni<julianae.sumatrana, trivirgatus.oconnelli> { var x: rendalli.moojeni<julianae.sumatrana, trivirgatus.oconnelli>; () => { var y = this; }; return x; }
->luismanueli : Symbol(luismanueli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 406, 188))
+>luismanueli : Symbol(amphibius.luismanueli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 406, 188))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
 >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -5487,7 +5487,7 @@ module panglima {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 407, 88))
 
         aceramarcae(): daubentonii.arboreus<julianae.nudicaudus, julianae.steerii> { var x: daubentonii.arboreus<julianae.nudicaudus, julianae.steerii>; () => { var y = this; }; return x; }
->aceramarcae : Symbol(aceramarcae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 407, 189))
+>aceramarcae : Symbol(amphibius.aceramarcae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 407, 189))
 >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1))
 >arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -5514,7 +5514,7 @@ module panglima {
 >schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18))
 
         crassulus(): nigra.gracilis<provocax.melanoleuca, provocax.melanoleuca> { var x: nigra.gracilis<provocax.melanoleuca, provocax.melanoleuca>; () => { var y = this; }; return x; }
->crassulus : Symbol(crassulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 410, 63))
+>crassulus : Symbol(fundatus.crassulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 410, 63))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14))
 >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1))
@@ -5533,7 +5533,7 @@ module panglima {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 411, 85))
 
         flamarioni(): imperfecta.lasiurus<amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>> { var x: imperfecta.lasiurus<amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>; () => { var y = this; }; return x; }
->flamarioni : Symbol(flamarioni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 411, 185))
+>flamarioni : Symbol(fundatus.flamarioni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 411, 185))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
 >lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19))
 >amphibius : Symbol(amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17))
@@ -5582,7 +5582,7 @@ module panglima {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 412, 245))
 
         mirabilis(): macrorhinos.marmosurus<petrophilus.rosalia<julianae.steerii, lavali.beisa>, lavali.lepturus> { var x: macrorhinos.marmosurus<petrophilus.rosalia<julianae.steerii, lavali.beisa>, lavali.lepturus>; () => { var y = this; }; return x; }
->mirabilis : Symbol(mirabilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 412, 504))
+>mirabilis : Symbol(fundatus.mirabilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 412, 504))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
@@ -5621,7 +5621,7 @@ module panglima {
 >durangae : Symbol(julianae.durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3))
 
         greyii(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; }
->greyii : Symbol(greyii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 415, 94))
+>greyii : Symbol(abidi.greyii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 415, 94))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 416, 45))
@@ -5632,7 +5632,7 @@ module panglima {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 416, 45))
 
         macedonicus(): petrophilus.minutilla { var x: petrophilus.minutilla; () => { var y = this; }; return x; }
->macedonicus : Symbol(macedonicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 416, 108))
+>macedonicus : Symbol(abidi.macedonicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 416, 108))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
 >minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 417, 50))
@@ -5643,7 +5643,7 @@ module panglima {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 417, 50))
 
         galili(): samarensis.cahirinus<dammermani.melanops, samarensis.pallidus> { var x: samarensis.cahirinus<dammermani.melanops, samarensis.pallidus>; () => { var y = this; }; return x; }
->galili : Symbol(galili, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 417, 113))
+>galili : Symbol(abidi.galili, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 417, 113))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >cahirinus : Symbol(samarensis.cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
@@ -5662,7 +5662,7 @@ module panglima {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 418, 86))
 
         thierryi(): dogramacii.robustulus { var x: dogramacii.robustulus; () => { var y = this; }; return x; }
->thierryi : Symbol(thierryi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 418, 190))
+>thierryi : Symbol(abidi.thierryi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 418, 190))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
 >robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 419, 47))
@@ -5673,7 +5673,7 @@ module panglima {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 419, 47))
 
         ega(): imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>> { var x: imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>>; () => { var y = this; }; return x; }
->ega : Symbol(ega, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 419, 110))
+>ega : Symbol(abidi.ega, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 419, 110))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
 >lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -5707,7 +5707,7 @@ module quasiater {
 >carolinensis : Symbol(carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18))
 
         concinna(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; }
->concinna : Symbol(concinna, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 424, 31))
+>concinna : Symbol(carolinensis.concinna, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 424, 31))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
 >zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 425, 44))
@@ -5718,7 +5718,7 @@ module quasiater {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 425, 44))
 
         aeneus(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; }
->aeneus : Symbol(aeneus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 425, 104))
+>aeneus : Symbol(carolinensis.aeneus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 425, 104))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
 >marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 426, 37))
@@ -5729,7 +5729,7 @@ module quasiater {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 426, 37))
 
         aloysiisabaudiae(): argurus.netscheri<trivirgatus.lotor<argurus.oreas, lavali.beisa>, lavali.lepturus> { var x: argurus.netscheri<trivirgatus.lotor<argurus.oreas, lavali.beisa>, lavali.lepturus>; () => { var y = this; }; return x; }
->aloysiisabaudiae : Symbol(aloysiisabaudiae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 426, 92))
+>aloysiisabaudiae : Symbol(carolinensis.aloysiisabaudiae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 426, 92))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
@@ -5756,7 +5756,7 @@ module quasiater {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 427, 116))
 
         tenellus(): julianae.nudicaudus { var x: julianae.nudicaudus; () => { var y = this; }; return x; }
->tenellus : Symbol(tenellus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 427, 240))
+>tenellus : Symbol(carolinensis.tenellus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 427, 240))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 428, 45))
@@ -5767,7 +5767,7 @@ module quasiater {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 428, 45))
 
         andium(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; }
->andium : Symbol(andium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 428, 106))
+>andium : Symbol(carolinensis.andium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 428, 106))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 429, 36))
@@ -5778,7 +5778,7 @@ module quasiater {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 429, 36))
 
         persephone(): panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni> { var x: panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni>; () => { var y = this; }; return x; }
->persephone : Symbol(persephone, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 429, 90))
+>persephone : Symbol(carolinensis.persephone, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 429, 90))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
@@ -5797,7 +5797,7 @@ module quasiater {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 430, 86))
 
         patrizii(): Lanthanum.megalonyx { var x: Lanthanum.megalonyx; () => { var y = this; }; return x; }
->patrizii : Symbol(patrizii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 430, 186))
+>patrizii : Symbol(carolinensis.patrizii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 430, 186))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
 >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 431, 45))
@@ -5820,7 +5820,7 @@ module minutus {
 >punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18))
 
         simoni(): argurus.netscheri<lavali.lepturus, argurus.dauricus<argurus.oreas, quasiater.carolinensis>> { var x: argurus.netscheri<lavali.lepturus, argurus.dauricus<argurus.oreas, quasiater.carolinensis>>; () => { var y = this; }; return x; }
->simoni : Symbol(simoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 435, 63))
+>simoni : Symbol(himalayana.simoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 435, 63))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -5847,7 +5847,7 @@ module minutus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 436, 115))
 
         lobata(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; }
->lobata : Symbol(lobata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 436, 248))
+>lobata : Symbol(himalayana.lobata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 436, 248))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 437, 43))
@@ -5858,7 +5858,7 @@ module minutus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 437, 43))
 
         rusticus(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; }
->rusticus : Symbol(rusticus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 437, 104))
+>rusticus : Symbol(himalayana.rusticus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 437, 104))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
 >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 438, 43))
@@ -5869,7 +5869,7 @@ module minutus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 438, 43))
 
         latona(): daubentonii.nesiotes<dammermani.melanops, Lanthanum.megalonyx> { var x: daubentonii.nesiotes<dammermani.melanops, Lanthanum.megalonyx>; () => { var y = this; }; return x; }
->latona : Symbol(latona, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 438, 102))
+>latona : Symbol(himalayana.latona, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 438, 102))
 >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1))
 >nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 20))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
@@ -5888,7 +5888,7 @@ module minutus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 439, 86))
 
         famulus(): patas.uralensis { var x: patas.uralensis; () => { var y = this; }; return x; }
->famulus : Symbol(famulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 439, 190))
+>famulus : Symbol(himalayana.famulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 439, 190))
 >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1))
 >uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 440, 40))
@@ -5899,7 +5899,7 @@ module minutus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 440, 40))
 
         flaviceps(): minutus.inez<argurus.oreas, panglima.fundatus<gabriellae.amicus, lutreolus.foina>> { var x: minutus.inez<argurus.oreas, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>; () => { var y = this; }; return x; }
->flaviceps : Symbol(flaviceps, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 440, 97))
+>flaviceps : Symbol(himalayana.flaviceps, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 440, 97))
 >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1))
 >inez : Symbol(inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -5926,7 +5926,7 @@ module minutus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 441, 109))
 
         paradoxolophus(): nigra.dolichurus<lutreolus.schlegeli, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>> { var x: nigra.dolichurus<lutreolus.schlegeli, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>; () => { var y = this; }; return x; }
->paradoxolophus : Symbol(paradoxolophus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 441, 233))
+>paradoxolophus : Symbol(himalayana.paradoxolophus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 441, 233))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
@@ -5953,7 +5953,7 @@ module minutus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 442, 139))
 
         Osmium(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
->Osmium : Symbol(Osmium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 442, 288))
+>Osmium : Symbol(himalayana.Osmium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 442, 288))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 443, 38))
@@ -5964,7 +5964,7 @@ module minutus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 443, 38))
 
         vulgaris(): Lanthanum.nitidus<lavali.lepturus, julianae.acariensis> { var x: Lanthanum.nitidus<lavali.lepturus, julianae.acariensis>; () => { var y = this; }; return x; }
->vulgaris : Symbol(vulgaris, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 443, 94))
+>vulgaris : Symbol(himalayana.vulgaris, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 443, 94))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
 >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -5983,7 +5983,7 @@ module minutus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 444, 81))
 
         betsileoensis(): panglima.amphibius<caurinus.megaphyllus, lavali.lepturus> { var x: panglima.amphibius<caurinus.megaphyllus, lavali.lepturus>; () => { var y = this; }; return x; }
->betsileoensis : Symbol(betsileoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 444, 178))
+>betsileoensis : Symbol(himalayana.betsileoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 444, 178))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
@@ -6002,7 +6002,7 @@ module minutus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 445, 88))
 
         vespuccii(): argurus.gilbertii<gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis>, provocax.melanoleuca> { var x: argurus.gilbertii<gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis>, provocax.melanoleuca>; () => { var y = this; }; return x; }
->vespuccii : Symbol(vespuccii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 445, 187))
+>vespuccii : Symbol(himalayana.vespuccii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 445, 187))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >gilbertii : Symbol(argurus.gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
@@ -6029,7 +6029,7 @@ module minutus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 446, 135))
 
         olympus(): Lanthanum.megalonyx { var x: Lanthanum.megalonyx; () => { var y = this; }; return x; }
->olympus : Symbol(olympus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 446, 285))
+>olympus : Symbol(himalayana.olympus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 446, 285))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
 >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 447, 44))
@@ -6056,7 +6056,7 @@ module caurinus {
 >daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20))
 
         martiniquensis(): ruatanica.hector<julianae.sumatrana, macrorhinos.marmosurus<dammermani.melanops, caurinus.mahaganus<julianae.nudicaudus, lavali.otion>>> { var x: ruatanica.hector<julianae.sumatrana, macrorhinos.marmosurus<dammermani.melanops, caurinus.mahaganus<julianae.nudicaudus, lavali.otion>>>; () => { var y = this; }; return x; }
->martiniquensis : Symbol(martiniquensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 451, 111))
+>martiniquensis : Symbol(mahaganus.martiniquensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 451, 111))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
 >hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -6091,7 +6091,7 @@ module caurinus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 452, 168))
 
         devius(): samarensis.pelurus<dogramacii.aurata, minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri>> { var x: samarensis.pelurus<dogramacii.aurata, minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri>>; () => { var y = this; }; return x; }
->devius : Symbol(devius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 452, 346))
+>devius : Symbol(mahaganus.devius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 452, 346))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
@@ -6126,7 +6126,7 @@ module caurinus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 453, 153))
 
         masalai(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; }
->masalai : Symbol(masalai, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 453, 324))
+>masalai : Symbol(mahaganus.masalai, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 453, 324))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 454, 38))
@@ -6137,7 +6137,7 @@ module caurinus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 454, 38))
 
         kathleenae(): nigra.dolichurus<patas.uralensis, caurinus.psilurus> { var x: nigra.dolichurus<patas.uralensis, caurinus.psilurus>; () => { var y = this; }; return x; }
->kathleenae : Symbol(kathleenae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 454, 93))
+>kathleenae : Symbol(mahaganus.kathleenae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 454, 93))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14))
 >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1))
@@ -6156,7 +6156,7 @@ module caurinus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 455, 80))
 
         simulus(): gabriellae.echinatus { var x: gabriellae.echinatus; () => { var y = this; }; return x; }
->simulus : Symbol(simulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 455, 174))
+>simulus : Symbol(mahaganus.simulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 455, 174))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
 >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 456, 45))
@@ -6167,7 +6167,7 @@ module caurinus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 456, 45))
 
         nigrovittatus(): caurinus.mahaganus<gabriellae.echinatus, petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>>> { var x: caurinus.mahaganus<gabriellae.echinatus, petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>>>; () => { var y = this; }; return x; }
->nigrovittatus : Symbol(nigrovittatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 456, 107))
+>nigrovittatus : Symbol(mahaganus.nigrovittatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 456, 107))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
 >mahaganus : Symbol(mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
@@ -6202,7 +6202,7 @@ module caurinus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 457, 165))
 
         senegalensis(): gabriellae.klossii<howi.coludo<lavali.lepturus, lutreolus.punicus>, dammermani.melanops> { var x: gabriellae.klossii<howi.coludo<lavali.lepturus, lutreolus.punicus>, dammermani.melanops>; () => { var y = this; }; return x; }
->senegalensis : Symbol(senegalensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 457, 341))
+>senegalensis : Symbol(mahaganus.senegalensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 457, 341))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
 >klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
@@ -6229,7 +6229,7 @@ module caurinus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 458, 118))
 
         acticola(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; }
->acticola : Symbol(acticola, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 458, 248))
+>acticola : Symbol(mahaganus.acticola, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 458, 248))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 459, 42))
@@ -6249,7 +6249,7 @@ module macrorhinos {
 >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 463, 31))
 
         tansaniana(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
->tansaniana : Symbol(tansaniana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 463, 37))
+>tansaniana : Symbol(marmosurus.tansaniana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 463, 37))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
 >punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 464, 45))
@@ -6272,7 +6272,7 @@ module howi {
 >stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16))
 
         pennatus(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; }
->pennatus : Symbol(pennatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 468, 63))
+>pennatus : Symbol(angulatus.pennatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 468, 63))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
 >marcanoi : Symbol(marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 469, 39))
@@ -6301,7 +6301,7 @@ module nigra {
 >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 477, 27))
 
         dichotomus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
->dichotomus : Symbol(dichotomus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 477, 33))
+>dichotomus : Symbol(thalia.dichotomus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 477, 33))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
 >carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 478, 50))
@@ -6312,7 +6312,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 478, 50))
 
         arnuxii(): panamensis.linulus<trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa> { var x: panamensis.linulus<trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>; () => { var y = this; }; return x; }
->arnuxii : Symbol(arnuxii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 478, 114))
+>arnuxii : Symbol(thalia.arnuxii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 478, 114))
 >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1))
 >linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
@@ -6339,7 +6339,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 479, 110))
 
         verheyeni(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; }
->verheyeni : Symbol(verheyeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 479, 237))
+>verheyeni : Symbol(thalia.verheyeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 479, 237))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 480, 47))
@@ -6350,7 +6350,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 480, 47))
 
         dauuricus(): gabriellae.amicus { var x: gabriellae.amicus; () => { var y = this; }; return x; }
->dauuricus : Symbol(dauuricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 480, 109))
+>dauuricus : Symbol(thalia.dauuricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 480, 109))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
 >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 481, 44))
@@ -6361,7 +6361,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 481, 44))
 
         tristriatus(): rionegrensis.veraecrucis<howi.marcanoi, panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi>> { var x: rionegrensis.veraecrucis<howi.marcanoi, panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi>>; () => { var y = this; }; return x; }
->tristriatus : Symbol(tristriatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 481, 103))
+>tristriatus : Symbol(thalia.tristriatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 481, 103))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
 >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
@@ -6388,7 +6388,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 482, 124))
 
         lasiura(): panglima.abidi<samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, Lanthanum.nitidus<lavali.lepturus, julianae.acariensis>> { var x: panglima.abidi<samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, Lanthanum.nitidus<lavali.lepturus, julianae.acariensis>>; () => { var y = this; }; return x; }
->lasiura : Symbol(lasiura, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 482, 261))
+>lasiura : Symbol(thalia.lasiura, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 482, 261))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >abidi : Symbol(panglima.abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
@@ -6431,7 +6431,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 483, 201))
 
         gangetica(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; }
->gangetica : Symbol(gangetica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 483, 419))
+>gangetica : Symbol(thalia.gangetica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 483, 419))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 484, 43))
@@ -6442,7 +6442,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 484, 43))
 
         brucei(): chrysaeolus.sarasinorum<julianae.steerii, ruatanica.americanus> { var x: chrysaeolus.sarasinorum<julianae.steerii, ruatanica.americanus>; () => { var y = this; }; return x; }
->brucei : Symbol(brucei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 484, 101))
+>brucei : Symbol(thalia.brucei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 484, 101))
 >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1))
 >sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -6471,7 +6471,7 @@ module sagitta {
 >portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16))
 
         maracajuensis(): samarensis.cahirinus<Lanthanum.jugularis, ruatanica.americanus> { var x: samarensis.cahirinus<Lanthanum.jugularis, ruatanica.americanus>; () => { var y = this; }; return x; }
->maracajuensis : Symbol(maracajuensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 489, 56))
+>maracajuensis : Symbol(walkeri.maracajuensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 489, 56))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >cahirinus : Symbol(samarensis.cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
@@ -6506,7 +6506,7 @@ module minutus {
 >durangae : Symbol(julianae.durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3))
 
         vexillaris(): samarensis.cahirinus<lavali.lepturus, lavali.wilsoni> { var x: samarensis.cahirinus<lavali.lepturus, lavali.wilsoni>; () => { var y = this; }; return x; }
->vexillaris : Symbol(vexillaris, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 494, 95))
+>vexillaris : Symbol(inez.vexillaris, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 494, 95))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >cahirinus : Symbol(samarensis.cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -6559,7 +6559,7 @@ module panamensis {
 >walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16))
 
         goslingi(): daubentonii.arboreus<gabriellae.amicus, dogramacii.kaiseri> { var x: daubentonii.arboreus<gabriellae.amicus, dogramacii.kaiseri>; () => { var y = this; }; return x; }
->goslingi : Symbol(goslingi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 503, 137))
+>goslingi : Symbol(linulus.goslingi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 503, 137))
 >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1))
 >arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
@@ -6578,7 +6578,7 @@ module panamensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 504, 85))
 
         taki(): patas.uralensis { var x: patas.uralensis; () => { var y = this; }; return x; }
->taki : Symbol(taki, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 504, 186))
+>taki : Symbol(linulus.taki, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 504, 186))
 >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1))
 >uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 505, 37))
@@ -6589,7 +6589,7 @@ module panamensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 505, 37))
 
         fumosus(): rendalli.moojeni<argurus.netscheri<dogramacii.aurata, dogramacii.aurata>, lavali.beisa> { var x: rendalli.moojeni<argurus.netscheri<dogramacii.aurata, dogramacii.aurata>, lavali.beisa>; () => { var y = this; }; return x; }
->fumosus : Symbol(fumosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 505, 94))
+>fumosus : Symbol(linulus.fumosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 505, 94))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
 >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -6616,7 +6616,7 @@ module panamensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 506, 112))
 
         rufinus(): macrorhinos.konganensis { var x: macrorhinos.konganensis; () => { var y = this; }; return x; }
->rufinus : Symbol(rufinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 506, 241))
+>rufinus : Symbol(linulus.rufinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 506, 241))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 507, 48))
@@ -6627,7 +6627,7 @@ module panamensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 507, 48))
 
         lami(): nigra.thalia<patas.uralensis, dogramacii.robustulus> { var x: nigra.thalia<patas.uralensis, dogramacii.robustulus>; () => { var y = this; }; return x; }
->lami : Symbol(lami, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 507, 113))
+>lami : Symbol(linulus.lami, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 507, 113))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14))
 >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1))
@@ -6646,7 +6646,7 @@ module panamensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 508, 74))
 
         regina(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; }
->regina : Symbol(regina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 508, 168))
+>regina : Symbol(linulus.regina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 508, 168))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 509, 45))
@@ -6657,7 +6657,7 @@ module panamensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 509, 45))
 
         nanilla(): dammermani.siberu<lavali.xanthognathus, trivirgatus.oconnelli> { var x: dammermani.siberu<lavali.xanthognathus, trivirgatus.oconnelli>; () => { var y = this; }; return x; }
->nanilla : Symbol(nanilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 509, 108))
+>nanilla : Symbol(linulus.nanilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 509, 108))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
 >siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -6676,7 +6676,7 @@ module panamensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 510, 87))
 
         enganus(): petrophilus.sodyi<dogramacii.aurata, argurus.oreas> { var x: petrophilus.sodyi<dogramacii.aurata, argurus.oreas>; () => { var y = this; }; return x; }
->enganus : Symbol(enganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 510, 191))
+>enganus : Symbol(linulus.enganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 510, 191))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
 >sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
@@ -6695,7 +6695,7 @@ module panamensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 511, 76))
 
         gomantongensis(): rionegrensis.veraecrucis<caurinus.psilurus, minutus.inez<rendalli.zuluensis, rionegrensis.caniventer>> { var x: rionegrensis.veraecrucis<caurinus.psilurus, minutus.inez<rendalli.zuluensis, rionegrensis.caniventer>>; () => { var y = this; }; return x; }
->gomantongensis : Symbol(gomantongensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 511, 169))
+>gomantongensis : Symbol(linulus.gomantongensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 511, 169))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
 >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
@@ -6731,7 +6731,7 @@ module nigra {
 >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 516, 29))
 
         weddellii(): nigra.dolichurus<dogramacii.aurata, julianae.steerii> { var x: nigra.dolichurus<dogramacii.aurata, julianae.steerii>; () => { var y = this; }; return x; }
->weddellii : Symbol(weddellii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 516, 35))
+>weddellii : Symbol(gracilis.weddellii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 516, 35))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >dolichurus : Symbol(dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
@@ -6750,7 +6750,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 517, 80))
 
         echinothrix(): Lanthanum.nitidus<panglima.amphibius<caurinus.megaphyllus, lavali.lepturus>, argurus.oreas> { var x: Lanthanum.nitidus<panglima.amphibius<caurinus.megaphyllus, lavali.lepturus>, argurus.oreas>; () => { var y = this; }; return x; }
->echinothrix : Symbol(echinothrix, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 517, 175))
+>echinothrix : Symbol(gracilis.echinothrix, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 517, 175))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
 >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
@@ -6777,7 +6777,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 518, 120))
 
         garridoi(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; }
->garridoi : Symbol(garridoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 518, 253))
+>garridoi : Symbol(gracilis.garridoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 518, 253))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
 >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 519, 46))
@@ -6788,7 +6788,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 519, 46))
 
         rouxii(): nigra.gracilis<argurus.dauricus<macrorhinos.konganensis, patas.uralensis>, nigra.thalia<patas.uralensis, julianae.galapagoensis>> { var x: nigra.gracilis<argurus.dauricus<macrorhinos.konganensis, patas.uralensis>, nigra.thalia<patas.uralensis, julianae.galapagoensis>>; () => { var y = this; }; return x; }
->rouxii : Symbol(rouxii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 519, 108))
+>rouxii : Symbol(gracilis.rouxii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 519, 108))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >gracilis : Symbol(gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -6823,7 +6823,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 520, 153))
 
         aurita(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
->aurita : Symbol(aurita, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 520, 324))
+>aurita : Symbol(gracilis.aurita, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 520, 324))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 521, 42))
@@ -6834,7 +6834,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 521, 42))
 
         geoffrensis(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; }
->geoffrensis : Symbol(geoffrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 521, 102))
+>geoffrensis : Symbol(gracilis.geoffrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 521, 102))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
 >caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 522, 52))
@@ -6845,7 +6845,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 522, 52))
 
         theresa(): macrorhinos.marmosurus<argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa>, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>> { var x: macrorhinos.marmosurus<argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa>, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>>; () => { var y = this; }; return x; }
->theresa : Symbol(theresa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 522, 117))
+>theresa : Symbol(gracilis.theresa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 522, 117))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -6888,7 +6888,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 523, 197))
 
         melanocarpus(): julianae.albidens<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, julianae.sumatrana> { var x: julianae.albidens<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, julianae.sumatrana>; () => { var y = this; }; return x; }
->melanocarpus : Symbol(melanocarpus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 523, 411))
+>melanocarpus : Symbol(gracilis.melanocarpus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 523, 411))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >albidens : Symbol(julianae.albidens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 34, 3))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
@@ -6915,7 +6915,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 524, 124))
 
         dubiaquercus(): dogramacii.robustulus { var x: dogramacii.robustulus; () => { var y = this; }; return x; }
->dubiaquercus : Symbol(dubiaquercus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 524, 260))
+>dubiaquercus : Symbol(gracilis.dubiaquercus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 524, 260))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
 >robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 525, 51))
@@ -6926,7 +6926,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 525, 51))
 
         pectoralis(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; }
->pectoralis : Symbol(pectoralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 525, 114))
+>pectoralis : Symbol(gracilis.pectoralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 525, 114))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 526, 46))
@@ -6937,7 +6937,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 526, 46))
 
         apoensis(): caurinus.megaphyllus { var x: caurinus.megaphyllus; () => { var y = this; }; return x; }
->apoensis : Symbol(apoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 526, 106))
+>apoensis : Symbol(gracilis.apoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 526, 106))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
 >megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 527, 46))
@@ -6948,7 +6948,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 527, 46))
 
         grisescens(): Lanthanum.jugularis { var x: Lanthanum.jugularis; () => { var y = this; }; return x; }
->grisescens : Symbol(grisescens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 527, 108))
+>grisescens : Symbol(gracilis.grisescens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 527, 108))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
 >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 528, 47))
@@ -6959,7 +6959,7 @@ module nigra {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 528, 47))
 
         ramirohitra(): panglima.amphibius<trivirgatus.falconeri, gabriellae.echinatus> { var x: panglima.amphibius<trivirgatus.falconeri, gabriellae.echinatus>; () => { var y = this; }; return x; }
->ramirohitra : Symbol(ramirohitra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 528, 108))
+>ramirohitra : Symbol(gracilis.ramirohitra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 528, 108))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
@@ -6990,7 +6990,7 @@ module samarensis {
 >stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16))
 
         Palladium(): panamensis.linulus<macrorhinos.konganensis, rionegrensis.caniventer> { var x: panamensis.linulus<macrorhinos.konganensis, rionegrensis.caniventer>; () => { var y = this; }; return x; }
->Palladium : Symbol(Palladium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 533, 61))
+>Palladium : Symbol(pelurus.Palladium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 533, 61))
 >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1))
 >linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
@@ -7009,7 +7009,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 534, 95))
 
         castanea(): argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>> { var x: argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>; () => { var y = this; }; return x; }
->castanea : Symbol(castanea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 534, 205))
+>castanea : Symbol(pelurus.castanea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 534, 205))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >netscheri : Symbol(argurus.netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16))
 >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1))
@@ -7044,7 +7044,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 535, 152))
 
         chamek(): argurus.pygmaea<julianae.galapagoensis, provocax.melanoleuca> { var x: argurus.pygmaea<julianae.galapagoensis, provocax.melanoleuca>; () => { var y = this; }; return x; }
->chamek : Symbol(chamek, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 535, 320))
+>chamek : Symbol(pelurus.chamek, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 535, 320))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >pygmaea : Symbol(argurus.pygmaea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 596, 16))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -7063,7 +7063,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 536, 85))
 
         nigriceps(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
->nigriceps : Symbol(nigriceps, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 536, 188))
+>nigriceps : Symbol(pelurus.nigriceps, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 536, 188))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
 >punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 537, 44))
@@ -7074,7 +7074,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 537, 44))
 
         lunatus(): pelurus<Lanthanum.jugularis, sagitta.walkeri> { var x: pelurus<Lanthanum.jugularis, sagitta.walkeri>; () => { var y = this; }; return x; }
->lunatus : Symbol(lunatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 537, 103))
+>lunatus : Symbol(pelurus.lunatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 537, 103))
 >pelurus : Symbol(pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
 >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3))
@@ -7091,7 +7091,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 538, 70))
 
         madurae(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; }
->madurae : Symbol(madurae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 538, 157))
+>madurae : Symbol(pelurus.madurae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 538, 157))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
 >caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 539, 48))
@@ -7102,7 +7102,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 539, 48))
 
         chinchilla(): macrorhinos.daphaenodon { var x: macrorhinos.daphaenodon; () => { var y = this; }; return x; }
->chinchilla : Symbol(chinchilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 539, 113))
+>chinchilla : Symbol(pelurus.chinchilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 539, 113))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 540, 51))
@@ -7113,7 +7113,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 540, 51))
 
         eliasi(): petrophilus.rosalia<julianae.steerii, lavali.beisa> { var x: petrophilus.rosalia<julianae.steerii, lavali.beisa>; () => { var y = this; }; return x; }
->eliasi : Symbol(eliasi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 540, 116))
+>eliasi : Symbol(pelurus.eliasi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 540, 116))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
 >rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -7132,7 +7132,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 541, 75))
 
         proditor(): panamensis.setulosus<gabriellae.echinatus, julianae.steerii> { var x: panamensis.setulosus<gabriellae.echinatus, julianae.steerii>; () => { var y = this; }; return x; }
->proditor : Symbol(proditor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 541, 168))
+>proditor : Symbol(pelurus.proditor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 541, 168))
 >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1))
 >setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
@@ -7151,7 +7151,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 542, 86))
 
         gambianus(): quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>> { var x: quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>; () => { var y = this; }; return x; }
->gambianus : Symbol(gambianus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 542, 188))
+>gambianus : Symbol(pelurus.gambianus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 542, 188))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
 >wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -7178,7 +7178,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 543, 134))
 
         petteri(): dogramacii.kaiseri { var x: dogramacii.kaiseri; () => { var y = this; }; return x; }
->petteri : Symbol(petteri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 543, 283))
+>petteri : Symbol(pelurus.petteri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 543, 283))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
 >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 544, 43))
@@ -7189,7 +7189,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 544, 43))
 
         nusatenggara(): panglima.amphibius<lavali.lepturus, quasiater.carolinensis> { var x: panglima.amphibius<lavali.lepturus, quasiater.carolinensis>; () => { var y = this; }; return x; }
->nusatenggara : Symbol(nusatenggara, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 544, 103))
+>nusatenggara : Symbol(pelurus.nusatenggara, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 544, 103))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -7208,7 +7208,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 545, 89))
 
         olitor(): rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi> { var x: rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi>; () => { var y = this; }; return x; }
->olitor : Symbol(olitor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 545, 190))
+>olitor : Symbol(pelurus.olitor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 545, 190))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
 >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -7235,7 +7235,7 @@ module samarensis {
 >daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20))
 
         planifrons(): nigra.gracilis<julianae.nudicaudus, dogramacii.aurata> { var x: nigra.gracilis<julianae.nudicaudus, dogramacii.aurata>; () => { var y = this; }; return x; }
->planifrons : Symbol(planifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 548, 65))
+>planifrons : Symbol(fuscus.planifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 548, 65))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -7254,7 +7254,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 549, 82))
 
         badia(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; }
->badia : Symbol(badia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 549, 178))
+>badia : Symbol(fuscus.badia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 549, 178))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 550, 41))
@@ -7265,7 +7265,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 550, 41))
 
         prymnolopha(): sagitta.walkeri { var x: sagitta.walkeri; () => { var y = this; }; return x; }
->prymnolopha : Symbol(prymnolopha, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 550, 101))
+>prymnolopha : Symbol(fuscus.prymnolopha, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 550, 101))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 551, 44))
@@ -7276,7 +7276,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 551, 44))
 
         natalensis(): trivirgatus.falconeri { var x: trivirgatus.falconeri; () => { var y = this; }; return x; }
->natalensis : Symbol(natalensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 551, 101))
+>natalensis : Symbol(fuscus.natalensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 551, 101))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 552, 49))
@@ -7287,7 +7287,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 552, 49))
 
         hunteri(): julianae.durangae { var x: julianae.durangae; () => { var y = this; }; return x; }
->hunteri : Symbol(hunteri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 552, 112))
+>hunteri : Symbol(fuscus.hunteri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 552, 112))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >durangae : Symbol(julianae.durangae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 94, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 553, 42))
@@ -7298,7 +7298,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 553, 42))
 
         sapiens(): pallidus { var x: pallidus; () => { var y = this; }; return x; }
->sapiens : Symbol(sapiens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 553, 101))
+>sapiens : Symbol(fuscus.sapiens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 553, 101))
 >pallidus : Symbol(pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 554, 33))
 >pallidus : Symbol(pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5))
@@ -7307,7 +7307,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 554, 33))
 
         macrocercus(): panamensis.setulosus<dogramacii.koepckeae, julianae.sumatrana> { var x: panamensis.setulosus<dogramacii.koepckeae, julianae.sumatrana>; () => { var y = this; }; return x; }
->macrocercus : Symbol(macrocercus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 554, 83))
+>macrocercus : Symbol(fuscus.macrocercus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 554, 83))
 >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1))
 >setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
@@ -7326,7 +7326,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 555, 91))
 
         nimbae(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
->nimbae : Symbol(nimbae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 555, 195))
+>nimbae : Symbol(fuscus.nimbae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 555, 195))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
 >punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 556, 41))
@@ -7337,7 +7337,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 556, 41))
 
         suricatta(): daubentonii.nigricans<dammermani.melanops, imperfecta.subspinosus> { var x: daubentonii.nigricans<dammermani.melanops, imperfecta.subspinosus>; () => { var y = this; }; return x; }
->suricatta : Symbol(suricatta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 556, 100))
+>suricatta : Symbol(fuscus.suricatta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 556, 100))
 >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1))
 >nigricans : Symbol(daubentonii.nigricans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 587, 20))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
@@ -7356,7 +7356,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 557, 93))
 
         jagorii(): julianae.galapagoensis { var x: julianae.galapagoensis; () => { var y = this; }; return x; }
->jagorii : Symbol(jagorii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 557, 201))
+>jagorii : Symbol(fuscus.jagorii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 557, 201))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >galapagoensis : Symbol(julianae.galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 558, 47))
@@ -7367,7 +7367,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 558, 47))
 
         beecrofti(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
->beecrofti : Symbol(beecrofti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 558, 111))
+>beecrofti : Symbol(fuscus.beecrofti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 558, 111))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 559, 45))
@@ -7378,7 +7378,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 559, 45))
 
         imaizumii(): minutus.inez<julianae.gerbillus<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis> { var x: minutus.inez<julianae.gerbillus<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis>; () => { var y = this; }; return x; }
->imaizumii : Symbol(imaizumii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 559, 105))
+>imaizumii : Symbol(fuscus.imaizumii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 559, 105))
 >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1))
 >inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -7429,7 +7429,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 560, 233))
 
         colocolo(): quasiater.bobrinskoi { var x: quasiater.bobrinskoi; () => { var y = this; }; return x; }
->colocolo : Symbol(colocolo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 560, 481))
+>colocolo : Symbol(fuscus.colocolo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 560, 481))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
 >bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 561, 46))
@@ -7440,7 +7440,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 561, 46))
 
         wolfi(): petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>> { var x: petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>>; () => { var y = this; }; return x; }
->wolfi : Symbol(wolfi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 561, 108))
+>wolfi : Symbol(fuscus.wolfi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 561, 108))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
 >rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
@@ -7470,7 +7470,7 @@ module samarensis {
 >pallidus : Symbol(pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5))
 
         oblativa(): trivirgatus.falconeri { var x: trivirgatus.falconeri; () => { var y = this; }; return x; }
->oblativa : Symbol(oblativa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 564, 27))
+>oblativa : Symbol(pallidus.oblativa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 564, 27))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 565, 47))
@@ -7481,7 +7481,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 565, 47))
 
         watersi(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
->watersi : Symbol(watersi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 565, 110))
+>watersi : Symbol(pallidus.watersi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 565, 110))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 566, 39))
@@ -7492,7 +7492,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 566, 39))
 
         glacialis(): sagitta.cinereus<nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>, quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>> { var x: sagitta.cinereus<nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>, quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>>; () => { var y = this; }; return x; }
->glacialis : Symbol(glacialis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 566, 95))
+>glacialis : Symbol(pallidus.glacialis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 566, 95))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
@@ -7535,7 +7535,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 567, 212))
 
         viaria(): chrysaeolus.sarasinorum<lavali.xanthognathus, lutreolus.punicus> { var x: chrysaeolus.sarasinorum<lavali.xanthognathus, lutreolus.punicus>; () => { var y = this; }; return x; }
->viaria : Symbol(viaria, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 567, 439))
+>viaria : Symbol(pallidus.viaria, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 567, 439))
 >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1))
 >sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -7559,7 +7559,7 @@ module samarensis {
 >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 570, 30))
 
         alashanicus(): nigra.caucasica<ruatanica.americanus, argurus.peninsulae> { var x: nigra.caucasica<ruatanica.americanus, argurus.peninsulae>; () => { var y = this; }; return x; }
->alashanicus : Symbol(alashanicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 570, 36))
+>alashanicus : Symbol(cahirinus.alashanicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 570, 36))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 14))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
@@ -7578,7 +7578,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 571, 86))
 
         flaviventer(): trivirgatus.tumidifrons<lavali.thaeleri, daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae>> { var x: trivirgatus.tumidifrons<lavali.thaeleri, daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae>>; () => { var y = this; }; return x; }
->flaviventer : Symbol(flaviventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 571, 185))
+>flaviventer : Symbol(cahirinus.flaviventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 571, 185))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >tumidifrons : Symbol(trivirgatus.tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 20))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -7605,7 +7605,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 572, 134))
 
         bottai(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; }
->bottai : Symbol(bottai, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 572, 281))
+>bottai : Symbol(cahirinus.bottai, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 572, 281))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
 >schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 573, 43))
@@ -7616,7 +7616,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 573, 43))
 
         pinetis(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; }
->pinetis : Symbol(pinetis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 573, 104))
+>pinetis : Symbol(cahirinus.pinetis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 573, 104))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 574, 38))
@@ -7627,7 +7627,7 @@ module samarensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 574, 38))
 
         saussurei(): rendalli.crenulata<gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>, argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>> { var x: rendalli.crenulata<gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>, argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>>; () => { var y = this; }; return x; }
->saussurei : Symbol(saussurei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 574, 93))
+>saussurei : Symbol(cahirinus.saussurei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 574, 93))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
 >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
@@ -7698,7 +7698,7 @@ module sagitta {
 >stolzmanni : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16))
 
         victus(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; }
->victus : Symbol(victus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 579, 145))
+>victus : Symbol(leptoceros.victus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 579, 145))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
 >caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 580, 47))
@@ -7709,7 +7709,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 580, 47))
 
         hoplomyoides(): panglima.fundatus<julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>, nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>> { var x: panglima.fundatus<julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>, nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>>; () => { var y = this; }; return x; }
->hoplomyoides : Symbol(hoplomyoides, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 580, 112))
+>hoplomyoides : Symbol(leptoceros.hoplomyoides, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 580, 112))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -7744,7 +7744,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 581, 168))
 
         gratiosus(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; }
->gratiosus : Symbol(gratiosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 581, 348))
+>gratiosus : Symbol(leptoceros.gratiosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 581, 348))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 582, 42))
@@ -7755,7 +7755,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 582, 42))
 
         rex(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
->rex : Symbol(rex, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 582, 99))
+>rex : Symbol(leptoceros.rex, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 582, 99))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 583, 35))
@@ -7766,7 +7766,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 583, 35))
 
         bolami(): trivirgatus.tumidifrons<lutreolus.schlegeli, ruatanica.americanus> { var x: trivirgatus.tumidifrons<lutreolus.schlegeli, ruatanica.americanus>; () => { var y = this; }; return x; }
->bolami : Symbol(bolami, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 583, 91))
+>bolami : Symbol(leptoceros.bolami, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 583, 91))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >tumidifrons : Symbol(trivirgatus.tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 20))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
@@ -7797,7 +7797,7 @@ module daubentonii {
 >stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16))
 
         woosnami(): dogramacii.robustulus { var x: dogramacii.robustulus; () => { var y = this; }; return x; }
->woosnami : Symbol(woosnami, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 588, 63))
+>woosnami : Symbol(nigricans.woosnami, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 588, 63))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
 >robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 589, 47))
@@ -7833,7 +7833,7 @@ module argurus {
 >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5))
 
         pajeros(): gabriellae.echinatus { var x: gabriellae.echinatus; () => { var y = this; }; return x; }
->pajeros : Symbol(pajeros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 597, 106))
+>pajeros : Symbol(pygmaea.pajeros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 597, 106))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
 >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 598, 45))
@@ -7844,7 +7844,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 598, 45))
 
         capucinus(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; }
->capucinus : Symbol(capucinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 598, 107))
+>capucinus : Symbol(pygmaea.capucinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 598, 107))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
 >zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 599, 45))
@@ -7855,7 +7855,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 599, 45))
 
         cuvieri(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; }
->cuvieri : Symbol(cuvieri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 599, 105))
+>cuvieri : Symbol(pygmaea.cuvieri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 599, 105))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
 >caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 600, 48))
@@ -7878,7 +7878,7 @@ module chrysaeolus {
 >psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17))
 
         belzebul(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; }
->belzebul : Symbol(belzebul, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 604, 64))
+>belzebul : Symbol(sarasinorum.belzebul, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 604, 64))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 605, 45))
@@ -7889,7 +7889,7 @@ module chrysaeolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 605, 45))
 
         hinpoon(): nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli> { var x: nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>; () => { var y = this; }; return x; }
->hinpoon : Symbol(hinpoon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 605, 106))
+>hinpoon : Symbol(sarasinorum.hinpoon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 605, 106))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 14))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -7908,7 +7908,7 @@ module chrysaeolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 606, 83))
 
         kandti(): quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana> { var x: quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana>; () => { var y = this; }; return x; }
->kandti : Symbol(kandti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 606, 183))
+>kandti : Symbol(sarasinorum.kandti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 606, 183))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
 >wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
@@ -7927,7 +7927,7 @@ module chrysaeolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 607, 81))
 
         cynosuros(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; }
->cynosuros : Symbol(cynosuros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 607, 180))
+>cynosuros : Symbol(sarasinorum.cynosuros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 607, 180))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
 >melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 608, 46))
@@ -7938,7 +7938,7 @@ module chrysaeolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 608, 46))
 
         Germanium(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; }
->Germanium : Symbol(Germanium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 608, 107))
+>Germanium : Symbol(sarasinorum.Germanium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 608, 107))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 609, 39))
@@ -7949,7 +7949,7 @@ module chrysaeolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 609, 39))
 
         Ununoctium(): nigra.gracilis<lavali.xanthognathus, provocax.melanoleuca> { var x: nigra.gracilis<lavali.xanthognathus, provocax.melanoleuca>; () => { var y = this; }; return x; }
->Ununoctium : Symbol(Ununoctium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 609, 93))
+>Ununoctium : Symbol(sarasinorum.Ununoctium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 609, 93))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -7968,7 +7968,7 @@ module chrysaeolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 610, 86))
 
         princeps(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; }
->princeps : Symbol(princeps, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 610, 186))
+>princeps : Symbol(sarasinorum.princeps, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 610, 186))
 >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1))
 >portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 611, 47))
@@ -7988,7 +7988,7 @@ module argurus {
 >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 615, 29))
 
         leucoptera(): petrophilus.rosalia<dogramacii.koepckeae, lutreolus.foina> { var x: petrophilus.rosalia<dogramacii.koepckeae, lutreolus.foina>; () => { var y = this; }; return x; }
->leucoptera : Symbol(leucoptera, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 615, 35))
+>leucoptera : Symbol(wetmorei.leucoptera, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 615, 35))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
 >rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
@@ -8007,7 +8007,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 616, 86))
 
         ochraventer(): sagitta.walkeri { var x: sagitta.walkeri; () => { var y = this; }; return x; }
->ochraventer : Symbol(ochraventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 616, 186))
+>ochraventer : Symbol(wetmorei.ochraventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 616, 186))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 617, 44))
@@ -8018,7 +8018,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 617, 44))
 
         tephromelas(): Lanthanum.jugularis { var x: Lanthanum.jugularis; () => { var y = this; }; return x; }
->tephromelas : Symbol(tephromelas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 617, 101))
+>tephromelas : Symbol(wetmorei.tephromelas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 617, 101))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
 >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 618, 48))
@@ -8029,7 +8029,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 618, 48))
 
         cracens(): argurus.gilbertii<lavali.thaeleri, lutreolus.punicus> { var x: argurus.gilbertii<lavali.thaeleri, lutreolus.punicus>; () => { var y = this; }; return x; }
->cracens : Symbol(cracens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 618, 109))
+>cracens : Symbol(wetmorei.cracens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 618, 109))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >gilbertii : Symbol(gilbertii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 700, 16))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -8048,7 +8048,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 619, 78))
 
         jamaicensis(): nigra.thalia<howi.marcanoi, rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis>> { var x: nigra.thalia<howi.marcanoi, rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis>>; () => { var y = this; }; return x; }
->jamaicensis : Symbol(jamaicensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 619, 173))
+>jamaicensis : Symbol(wetmorei.jamaicensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 619, 173))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
@@ -8075,7 +8075,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 620, 129))
 
         gymnocaudus(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; }
->gymnocaudus : Symbol(gymnocaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 620, 271))
+>gymnocaudus : Symbol(wetmorei.gymnocaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 620, 271))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
 >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 621, 46))
@@ -8086,7 +8086,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 621, 46))
 
         mayori(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
->mayori : Symbol(mayori, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 621, 105))
+>mayori : Symbol(wetmorei.mayori, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 621, 105))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 622, 42))
@@ -8107,7 +8107,7 @@ module argurus {
 >wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15))
 
         salamonis(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; }
->salamonis : Symbol(salamonis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 626, 47))
+>salamonis : Symbol(oreas.salamonis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 626, 47))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 627, 47))
@@ -8118,7 +8118,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 627, 47))
 
         paniscus(): ruatanica.Praseodymium<caurinus.psilurus, lavali.xanthognathus> { var x: ruatanica.Praseodymium<caurinus.psilurus, lavali.xanthognathus>; () => { var y = this; }; return x; }
->paniscus : Symbol(paniscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 627, 109))
+>paniscus : Symbol(oreas.paniscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 627, 109))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
 >Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
@@ -8137,7 +8137,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 628, 89))
 
         fagani(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; }
->fagani : Symbol(fagani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 628, 194))
+>fagani : Symbol(oreas.fagani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 628, 194))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 629, 45))
@@ -8148,7 +8148,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 629, 45))
 
         papuanus(): panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon> { var x: panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>; () => { var y = this; }; return x; }
->papuanus : Symbol(papuanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 629, 108))
+>papuanus : Symbol(oreas.papuanus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 629, 108))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
@@ -8167,7 +8167,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 630, 92))
 
         timidus(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; }
->timidus : Symbol(timidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 630, 200))
+>timidus : Symbol(oreas.timidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 630, 200))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
 >melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 631, 44))
@@ -8178,7 +8178,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 631, 44))
 
         nghetinhensis(): gabriellae.klossii<argurus.luctuosa, julianae.steerii> { var x: gabriellae.klossii<argurus.luctuosa, julianae.steerii>; () => { var y = this; }; return x; }
->nghetinhensis : Symbol(nghetinhensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 631, 105))
+>nghetinhensis : Symbol(oreas.nghetinhensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 631, 105))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
 >klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -8197,7 +8197,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 632, 85))
 
         barbei(): samarensis.cahirinus<lavali.lepturus, quasiater.carolinensis> { var x: samarensis.cahirinus<lavali.lepturus, quasiater.carolinensis>; () => { var y = this; }; return x; }
->barbei : Symbol(barbei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 632, 181))
+>barbei : Symbol(oreas.barbei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 632, 181))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >cahirinus : Symbol(samarensis.cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -8216,7 +8216,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 633, 85))
 
         univittatus(): argurus.peninsulae { var x: argurus.peninsulae; () => { var y = this; }; return x; }
->univittatus : Symbol(univittatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 633, 188))
+>univittatus : Symbol(oreas.univittatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 633, 188))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >peninsulae : Symbol(peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 634, 47))
@@ -8236,7 +8236,7 @@ module daubentonii {
 >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 638, 29))
 
         capreolus(): rendalli.crenulata<samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>, lavali.wilsoni> { var x: rendalli.crenulata<samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>, lavali.wilsoni>; () => { var y = this; }; return x; }
->capreolus : Symbol(capreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 638, 35))
+>capreolus : Symbol(arboreus.capreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 638, 35))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
 >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
@@ -8263,7 +8263,7 @@ module daubentonii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 639, 124))
 
         moreni(): panglima.abidi<julianae.galapagoensis, dogramacii.koepckeae> { var x: panglima.abidi<julianae.galapagoensis, dogramacii.koepckeae>; () => { var y = this; }; return x; }
->moreni : Symbol(moreni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 639, 263))
+>moreni : Symbol(arboreus.moreni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 639, 263))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >abidi : Symbol(panglima.abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -8282,7 +8282,7 @@ module daubentonii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 640, 84))
 
         hypoleucos(): nigra.gracilis<trivirgatus.falconeri, argurus.germaini> { var x: nigra.gracilis<trivirgatus.falconeri, argurus.germaini>; () => { var y = this; }; return x; }
->hypoleucos : Symbol(hypoleucos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 640, 186))
+>hypoleucos : Symbol(arboreus.hypoleucos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 640, 186))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
@@ -8301,7 +8301,7 @@ module daubentonii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 641, 83))
 
         paedulcus(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; }
->paedulcus : Symbol(paedulcus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 641, 180))
+>paedulcus : Symbol(arboreus.paedulcus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 641, 180))
 >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1))
 >portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 642, 48))
@@ -8312,7 +8312,7 @@ module daubentonii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 642, 48))
 
         pucheranii(): samarensis.fuscus<julianae.durangae, caurinus.megaphyllus> { var x: samarensis.fuscus<julianae.durangae, caurinus.megaphyllus>; () => { var y = this; }; return x; }
->pucheranii : Symbol(pucheranii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 642, 111))
+>pucheranii : Symbol(arboreus.pucheranii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 642, 111))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >fuscus : Symbol(samarensis.fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -8331,7 +8331,7 @@ module daubentonii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 643, 86))
 
         stella(): julianae.oralis<lutreolus.foina, quasiater.carolinensis> { var x: julianae.oralis<lutreolus.foina, quasiater.carolinensis>; () => { var y = this; }; return x; }
->stella : Symbol(stella, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 643, 186))
+>stella : Symbol(arboreus.stella, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 643, 186))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >oralis : Symbol(julianae.oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
@@ -8350,7 +8350,7 @@ module daubentonii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 644, 80))
 
         brasiliensis(): imperfecta.subspinosus { var x: imperfecta.subspinosus; () => { var y = this; }; return x; }
->brasiliensis : Symbol(brasiliensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 644, 178))
+>brasiliensis : Symbol(arboreus.brasiliensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 644, 178))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
 >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 645, 52))
@@ -8361,7 +8361,7 @@ module daubentonii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 645, 52))
 
         brevicaudata(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; }
->brevicaudata : Symbol(brevicaudata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 645, 116))
+>brevicaudata : Symbol(arboreus.brevicaudata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 645, 116))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 646, 51))
@@ -8372,7 +8372,7 @@ module daubentonii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 646, 51))
 
         vitticollis(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; }
->vitticollis : Symbol(vitticollis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 646, 114))
+>vitticollis : Symbol(arboreus.vitticollis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 646, 114))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
 >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 647, 49))
@@ -8383,7 +8383,7 @@ module daubentonii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 647, 49))
 
         huangensis(): caurinus.psilurus { var x: caurinus.psilurus; () => { var y = this; }; return x; }
->huangensis : Symbol(huangensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 647, 111))
+>huangensis : Symbol(arboreus.huangensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 647, 111))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
 >psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 648, 45))
@@ -8394,7 +8394,7 @@ module daubentonii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 648, 45))
 
         cameroni(): petrophilus.rosalia<dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, caurinus.psilurus> { var x: petrophilus.rosalia<dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, caurinus.psilurus>; () => { var y = this; }; return x; }
->cameroni : Symbol(cameroni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 648, 104))
+>cameroni : Symbol(arboreus.cameroni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 648, 104))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
 >rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
@@ -8437,7 +8437,7 @@ module daubentonii {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 649, 210))
 
         tianshanica(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; }
->tianshanica : Symbol(tianshanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 649, 436))
+>tianshanica : Symbol(arboreus.tianshanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 649, 436))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
 >marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 650, 42))
@@ -8455,7 +8455,7 @@ module patas {
 >uralensis : Symbol(uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14))
 
         cartilagonodus(): Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis> { var x: Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis>; () => { var y = this; }; return x; }
->cartilagonodus : Symbol(cartilagonodus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 654, 28))
+>cartilagonodus : Symbol(uralensis.cartilagonodus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 654, 28))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
 >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
@@ -8474,7 +8474,7 @@ module patas {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 655, 95))
 
         pyrrhinus(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; }
->pyrrhinus : Symbol(pyrrhinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 655, 200))
+>pyrrhinus : Symbol(uralensis.pyrrhinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 655, 200))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 656, 39))
@@ -8485,7 +8485,7 @@ module patas {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 656, 39))
 
         insulans(): Lanthanum.jugularis { var x: Lanthanum.jugularis; () => { var y = this; }; return x; }
->insulans : Symbol(insulans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 656, 93))
+>insulans : Symbol(uralensis.insulans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 656, 93))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
 >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 657, 45))
@@ -8496,7 +8496,7 @@ module patas {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 657, 45))
 
         nigricauda(): caurinus.johorensis<Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana>, Lanthanum.jugularis> { var x: caurinus.johorensis<Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana>, Lanthanum.jugularis>; () => { var y = this; }; return x; }
->nigricauda : Symbol(nigricauda, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 657, 106))
+>nigricauda : Symbol(uralensis.nigricauda, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 657, 106))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
 >johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
@@ -8523,7 +8523,7 @@ module patas {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 658, 130))
 
         muricauda(): panglima.fundatus<lutreolus.foina, dammermani.siberu<lutreolus.punicus, julianae.acariensis>> { var x: panglima.fundatus<lutreolus.foina, dammermani.siberu<lutreolus.punicus, julianae.acariensis>>; () => { var y = this; }; return x; }
->muricauda : Symbol(muricauda, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 658, 274))
+>muricauda : Symbol(uralensis.muricauda, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 658, 274))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
@@ -8550,7 +8550,7 @@ module patas {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 659, 120))
 
         albicaudus(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
->albicaudus : Symbol(albicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 659, 255))
+>albicaudus : Symbol(uralensis.albicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 659, 255))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 660, 46))
@@ -8561,7 +8561,7 @@ module patas {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 660, 46))
 
         fallax(): ruatanica.hector<lutreolus.punicus, gabriellae.amicus> { var x: ruatanica.hector<lutreolus.punicus, gabriellae.amicus>; () => { var y = this; }; return x; }
->fallax : Symbol(fallax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 660, 106))
+>fallax : Symbol(uralensis.fallax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 660, 106))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
 >hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
@@ -8580,7 +8580,7 @@ module patas {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 661, 78))
 
         attenuata(): macrorhinos.marmosurus<ruatanica.americanus, argurus.netscheri<quasiater.carolinensis, dogramacii.kaiseri>> { var x: macrorhinos.marmosurus<ruatanica.americanus, argurus.netscheri<quasiater.carolinensis, dogramacii.kaiseri>>; () => { var y = this; }; return x; }
->attenuata : Symbol(attenuata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 661, 174))
+>attenuata : Symbol(uralensis.attenuata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 661, 174))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
@@ -8607,7 +8607,7 @@ module patas {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 662, 134))
 
         megalura(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; }
->megalura : Symbol(megalura, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 662, 283))
+>megalura : Symbol(uralensis.megalura, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 662, 283))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
 >marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 663, 39))
@@ -8618,7 +8618,7 @@ module patas {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 663, 39))
 
         neblina(): samarensis.pelurus<macrorhinos.daphaenodon, rionegrensis.caniventer> { var x: samarensis.pelurus<macrorhinos.daphaenodon, rionegrensis.caniventer>; () => { var y = this; }; return x; }
->neblina : Symbol(neblina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 663, 94))
+>neblina : Symbol(uralensis.neblina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 663, 94))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
@@ -8637,7 +8637,7 @@ module patas {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 664, 93))
 
         citellus(): daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer> { var x: daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>; () => { var y = this; }; return x; }
->citellus : Symbol(citellus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 664, 203))
+>citellus : Symbol(uralensis.citellus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 664, 203))
 >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1))
 >arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
@@ -8656,7 +8656,7 @@ module patas {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 665, 95))
 
         tanezumi(): imperfecta.lasiurus<dogramacii.robustulus, caurinus.psilurus> { var x: imperfecta.lasiurus<dogramacii.robustulus, caurinus.psilurus>; () => { var y = this; }; return x; }
->tanezumi : Symbol(tanezumi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 665, 206))
+>tanezumi : Symbol(uralensis.tanezumi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 665, 206))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
 >lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
@@ -8675,7 +8675,7 @@ module patas {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 666, 87))
 
         albiventer(): rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus> { var x: rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus>; () => { var y = this; }; return x; }
->albiventer : Symbol(albiventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 666, 190))
+>albiventer : Symbol(uralensis.albiventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 666, 190))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
 >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
@@ -8704,7 +8704,7 @@ module provocax {
 >wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15))
 
         Neodymium(): macrorhinos.marmosurus<petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>, lutreolus.foina> { var x: macrorhinos.marmosurus<petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>, lutreolus.foina>; () => { var y = this; }; return x; }
->Neodymium : Symbol(Neodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 671, 53))
+>Neodymium : Symbol(melanoleuca.Neodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 671, 53))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
@@ -8731,7 +8731,7 @@ module provocax {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 672, 130))
 
         baeri(): imperfecta.lasiurus<lavali.lepturus, ruatanica.americanus> { var x: imperfecta.lasiurus<lavali.lepturus, ruatanica.americanus>; () => { var y = this; }; return x; }
->baeri : Symbol(baeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 672, 275))
+>baeri : Symbol(melanoleuca.baeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 672, 275))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
 >lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -8759,7 +8759,7 @@ module sagitta {
 >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 677, 29))
 
         Chlorine(): samarensis.cahirinus<nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>, dogramacii.robustulus> { var x: samarensis.cahirinus<nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>, dogramacii.robustulus>; () => { var y = this; }; return x; }
->Chlorine : Symbol(Chlorine, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 677, 35))
+>Chlorine : Symbol(sicarius.Chlorine, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 677, 35))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >cahirinus : Symbol(samarensis.cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
@@ -8786,7 +8786,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 678, 127))
 
         simulator(): macrorhinos.marmosurus<Lanthanum.nitidus<dammermani.melanops, lavali.lepturus>, macrorhinos.marmosurus<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>> { var x: macrorhinos.marmosurus<Lanthanum.nitidus<dammermani.melanops, lavali.lepturus>, macrorhinos.marmosurus<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>>; () => { var y = this; }; return x; }
->simulator : Symbol(simulator, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 678, 270))
+>simulator : Symbol(sicarius.simulator, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 678, 270))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
@@ -8847,7 +8847,7 @@ module howi {
 >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3))
 
         formosae(): Lanthanum.megalonyx { var x: Lanthanum.megalonyx; () => { var y = this; }; return x; }
->formosae : Symbol(formosae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 683, 55))
+>formosae : Symbol(marcanoi.formosae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 683, 55))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
 >megalonyx : Symbol(Lanthanum.megalonyx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 124, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 684, 45))
@@ -8858,7 +8858,7 @@ module howi {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 684, 45))
 
         dudui(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
->dudui : Symbol(dudui, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 684, 106))
+>dudui : Symbol(marcanoi.dudui, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 684, 106))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
 >punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 685, 40))
@@ -8869,7 +8869,7 @@ module howi {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 685, 40))
 
         leander(): daubentonii.nesiotes<Lanthanum.megalonyx, minutus.portoricensis> { var x: daubentonii.nesiotes<Lanthanum.megalonyx, minutus.portoricensis>; () => { var y = this; }; return x; }
->leander : Symbol(leander, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 685, 99))
+>leander : Symbol(marcanoi.leander, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 685, 99))
 >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1))
 >nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 20))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
@@ -8888,7 +8888,7 @@ module howi {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 686, 89))
 
         martinsi(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; }
->martinsi : Symbol(martinsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 686, 195))
+>martinsi : Symbol(marcanoi.martinsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 686, 195))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
 >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 687, 43))
@@ -8899,7 +8899,7 @@ module howi {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 687, 43))
 
         beatrix(): imperfecta.ciliolabrum<provocax.melanoleuca, panglima.amphibius<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>>> { var x: imperfecta.ciliolabrum<provocax.melanoleuca, panglima.amphibius<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>>>; () => { var y = this; }; return x; }
->beatrix : Symbol(beatrix, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 687, 102))
+>beatrix : Symbol(marcanoi.beatrix, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 687, 102))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
 >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5))
 >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1))
@@ -8958,7 +8958,7 @@ module howi {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 688, 286))
 
         griseoventer(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; }
->griseoventer : Symbol(griseoventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 688, 589))
+>griseoventer : Symbol(marcanoi.griseoventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 688, 589))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 689, 43))
@@ -8969,7 +8969,7 @@ module howi {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 689, 43))
 
         zerda(): quasiater.wattsi<julianae.oralis<julianae.steerii, lavali.lepturus>, howi.coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>>> { var x: quasiater.wattsi<julianae.oralis<julianae.steerii, lavali.lepturus>, howi.coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>>>; () => { var y = this; }; return x; }
->zerda : Symbol(zerda, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 689, 98))
+>zerda : Symbol(marcanoi.zerda, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 689, 98))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
 >wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -9012,7 +9012,7 @@ module howi {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 690, 183))
 
         yucatanicus(): julianae.nudicaudus { var x: julianae.nudicaudus; () => { var y = this; }; return x; }
->yucatanicus : Symbol(yucatanicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 690, 385))
+>yucatanicus : Symbol(marcanoi.yucatanicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 690, 385))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 691, 48))
@@ -9023,7 +9023,7 @@ module howi {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 691, 48))
 
         nigrita(): argurus.peninsulae { var x: argurus.peninsulae; () => { var y = this; }; return x; }
->nigrita : Symbol(nigrita, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 691, 109))
+>nigrita : Symbol(marcanoi.nigrita, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 691, 109))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >peninsulae : Symbol(argurus.peninsulae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 931, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 692, 43))
@@ -9034,7 +9034,7 @@ module howi {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 692, 43))
 
         jouvenetae(): argurus.dauricus<argurus.germaini, julianae.durangae> { var x: argurus.dauricus<argurus.germaini, julianae.durangae>; () => { var y = this; }; return x; }
->jouvenetae : Symbol(jouvenetae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 692, 103))
+>jouvenetae : Symbol(marcanoi.jouvenetae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 692, 103))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -9053,7 +9053,7 @@ module howi {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 693, 81))
 
         indefessus(): sagitta.walkeri { var x: sagitta.walkeri; () => { var y = this; }; return x; }
->indefessus : Symbol(indefessus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 693, 176))
+>indefessus : Symbol(marcanoi.indefessus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 693, 176))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 694, 43))
@@ -9064,7 +9064,7 @@ module howi {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 694, 43))
 
         vuquangensis(): macrorhinos.daphaenodon { var x: macrorhinos.daphaenodon; () => { var y = this; }; return x; }
->vuquangensis : Symbol(vuquangensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 694, 100))
+>vuquangensis : Symbol(marcanoi.vuquangensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 694, 100))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 695, 53))
@@ -9075,7 +9075,7 @@ module howi {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 695, 53))
 
         Zirconium(): lavali.thaeleri { var x: lavali.thaeleri; () => { var y = this; }; return x; }
->Zirconium : Symbol(Zirconium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 695, 118))
+>Zirconium : Symbol(marcanoi.Zirconium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 695, 118))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 696, 42))
@@ -9086,7 +9086,7 @@ module howi {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 696, 42))
 
         hyaena(): julianae.oralis<lavali.beisa, argurus.oreas> { var x: julianae.oralis<lavali.beisa, argurus.oreas>; () => { var y = this; }; return x; }
->hyaena : Symbol(hyaena, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 696, 99))
+>hyaena : Symbol(marcanoi.hyaena, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 696, 99))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >oralis : Symbol(julianae.oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -9114,7 +9114,7 @@ module argurus {
 >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 701, 30))
 
         nasutus(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; }
->nasutus : Symbol(nasutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 701, 36))
+>nasutus : Symbol(gilbertii.nasutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 701, 36))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 702, 40))
@@ -9125,7 +9125,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 702, 40))
 
         poecilops(): julianae.steerii { var x: julianae.steerii; () => { var y = this; }; return x; }
->poecilops : Symbol(poecilops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 702, 97))
+>poecilops : Symbol(gilbertii.poecilops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 702, 97))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 703, 43))
@@ -9136,7 +9136,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 703, 43))
 
         sondaicus(): samarensis.fuscus<argurus.peninsulae, lavali.lepturus> { var x: samarensis.fuscus<argurus.peninsulae, lavali.lepturus>; () => { var y = this; }; return x; }
->sondaicus : Symbol(sondaicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 703, 101))
+>sondaicus : Symbol(gilbertii.sondaicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 703, 101))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >fuscus : Symbol(samarensis.fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -9155,7 +9155,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 704, 81))
 
         auriventer(): petrophilus.rosalia<lavali.xanthognathus, trivirgatus.oconnelli> { var x: petrophilus.rosalia<lavali.xanthognathus, trivirgatus.oconnelli>; () => { var y = this; }; return x; }
->auriventer : Symbol(auriventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 704, 177))
+>auriventer : Symbol(gilbertii.auriventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 704, 177))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
 >rosalia : Symbol(petrophilus.rosalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 999, 20))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -9174,7 +9174,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 705, 92))
 
         cherriei(): ruatanica.Praseodymium<Lanthanum.jugularis, argurus.oreas> { var x: ruatanica.Praseodymium<Lanthanum.jugularis, argurus.oreas>; () => { var y = this; }; return x; }
->cherriei : Symbol(cherriei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 705, 198))
+>cherriei : Symbol(gilbertii.cherriei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 705, 198))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
 >Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
@@ -9193,7 +9193,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 706, 84))
 
         lindberghi(): minutus.inez<rendalli.zuluensis, rionegrensis.caniventer> { var x: minutus.inez<rendalli.zuluensis, rionegrensis.caniventer>; () => { var y = this; }; return x; }
->lindberghi : Symbol(lindberghi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 706, 184))
+>lindberghi : Symbol(gilbertii.lindberghi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 706, 184))
 >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1))
 >inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
@@ -9212,7 +9212,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 707, 85))
 
         pipistrellus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
->pipistrellus : Symbol(pipistrellus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 707, 184))
+>pipistrellus : Symbol(gilbertii.pipistrellus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 707, 184))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
 >carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 708, 52))
@@ -9223,7 +9223,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 708, 52))
 
         paranus(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
->paranus : Symbol(paranus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 708, 116))
+>paranus : Symbol(gilbertii.paranus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 708, 116))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
 >punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 709, 42))
@@ -9234,7 +9234,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 709, 42))
 
         dubosti(): nigra.thalia<lutreolus.schlegeli, julianae.sumatrana> { var x: nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>; () => { var y = this; }; return x; }
->dubosti : Symbol(dubosti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 709, 101))
+>dubosti : Symbol(gilbertii.dubosti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 709, 101))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >thalia : Symbol(nigra.thalia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 476, 14))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
@@ -9253,7 +9253,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 710, 78))
 
         opossum(): nigra.dolichurus<lavali.lepturus, samarensis.pallidus> { var x: nigra.dolichurus<lavali.lepturus, samarensis.pallidus>; () => { var y = this; }; return x; }
->opossum : Symbol(opossum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 710, 173))
+>opossum : Symbol(gilbertii.opossum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 710, 173))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -9272,7 +9272,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 711, 79))
 
         oreopolus(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; }
->oreopolus : Symbol(oreopolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 711, 175))
+>oreopolus : Symbol(gilbertii.oreopolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 711, 175))
 >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1))
 >portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 712, 48))
@@ -9283,7 +9283,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 712, 48))
 
         amurensis(): daubentonii.arboreus<lavali.otion, macrorhinos.konganensis> { var x: daubentonii.arboreus<lavali.otion, macrorhinos.konganensis>; () => { var y = this; }; return x; }
->amurensis : Symbol(amurensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 712, 111))
+>amurensis : Symbol(gilbertii.amurensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 712, 111))
 >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1))
 >arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -9316,7 +9316,7 @@ module lutreolus {
 >punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18))
 
         strandi(): gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis> { var x: gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>; () => { var y = this; }; return x; }
->strandi : Symbol(strandi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 721, 26))
+>strandi : Symbol(punicus.strandi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 721, 26))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
 >klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
@@ -9335,7 +9335,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 722, 85))
 
         lar(): caurinus.mahaganus<julianae.nudicaudus, lavali.otion> { var x: caurinus.mahaganus<julianae.nudicaudus, lavali.otion>; () => { var y = this; }; return x; }
->lar : Symbol(lar, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 722, 187))
+>lar : Symbol(punicus.lar, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 722, 187))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
 >mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -9354,7 +9354,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 723, 74))
 
         erica(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; }
->erica : Symbol(erica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 723, 169))
+>erica : Symbol(punicus.erica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 723, 169))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
 >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 724, 43))
@@ -9365,7 +9365,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 724, 43))
 
         trichura(): macrorhinos.konganensis { var x: macrorhinos.konganensis; () => { var y = this; }; return x; }
->trichura : Symbol(trichura, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 724, 105))
+>trichura : Symbol(punicus.trichura, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 724, 105))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 725, 49))
@@ -9376,7 +9376,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 725, 49))
 
         lemniscatus(): panglima.fundatus<gabriellae.amicus, lutreolus.foina> { var x: panglima.fundatus<gabriellae.amicus, lutreolus.foina>; () => { var y = this; }; return x; }
->lemniscatus : Symbol(lemniscatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 725, 114))
+>lemniscatus : Symbol(punicus.lemniscatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 725, 114))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
@@ -9395,7 +9395,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 726, 82))
 
         aspalax(): panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis> { var x: panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>; () => { var y = this; }; return x; }
->aspalax : Symbol(aspalax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 726, 177))
+>aspalax : Symbol(punicus.aspalax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 726, 177))
 >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1))
 >linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -9414,7 +9414,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 727, 90))
 
         marshalli(): julianae.nudicaudus { var x: julianae.nudicaudus; () => { var y = this; }; return x; }
->marshalli : Symbol(marshalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 727, 197))
+>marshalli : Symbol(punicus.marshalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 727, 197))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 728, 46))
@@ -9425,7 +9425,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 728, 46))
 
         Zinc(): julianae.galapagoensis { var x: julianae.galapagoensis; () => { var y = this; }; return x; }
->Zinc : Symbol(Zinc, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 728, 107))
+>Zinc : Symbol(punicus.Zinc, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 728, 107))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >galapagoensis : Symbol(julianae.galapagoensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 25, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 729, 44))
@@ -9436,7 +9436,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 729, 44))
 
         monochromos(): howi.coludo<lavali.lepturus, lutreolus.punicus> { var x: howi.coludo<lavali.lepturus, lutreolus.punicus>; () => { var y = this; }; return x; }
->monochromos : Symbol(monochromos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 729, 108))
+>monochromos : Symbol(punicus.monochromos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 729, 108))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
 >coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -9455,7 +9455,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 730, 76))
 
         purinus(): ruatanica.hector<lutreolus.schlegeli, provocax.melanoleuca> { var x: ruatanica.hector<lutreolus.schlegeli, provocax.melanoleuca>; () => { var y = this; }; return x; }
->purinus : Symbol(purinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 730, 165))
+>purinus : Symbol(punicus.purinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 730, 165))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
 >hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
@@ -9474,7 +9474,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 731, 84))
 
         ischyrus(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; }
->ischyrus : Symbol(ischyrus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 731, 185))
+>ischyrus : Symbol(punicus.ischyrus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 731, 185))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 732, 41))
@@ -9485,7 +9485,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 732, 41))
 
         tenuis(): macrorhinos.daphaenodon { var x: macrorhinos.daphaenodon; () => { var y = this; }; return x; }
->tenuis : Symbol(tenuis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 732, 98))
+>tenuis : Symbol(punicus.tenuis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 732, 98))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >daphaenodon : Symbol(macrorhinos.daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 733, 47))
@@ -9496,7 +9496,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 733, 47))
 
         Helium(): julianae.acariensis { var x: julianae.acariensis; () => { var y = this; }; return x; }
->Helium : Symbol(Helium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 733, 112))
+>Helium : Symbol(punicus.Helium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 733, 112))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >acariensis : Symbol(julianae.acariensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 80, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 734, 43))
@@ -9514,7 +9514,7 @@ module macrorhinos {
 >daphaenodon : Symbol(daphaenodon, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 737, 20))
 
         bredanensis(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; }
->bredanensis : Symbol(bredanensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 738, 30))
+>bredanensis : Symbol(daphaenodon.bredanensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 738, 30))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 739, 47))
@@ -9525,7 +9525,7 @@ module macrorhinos {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 739, 47))
 
         othus(): howi.coludo<argurus.oreas, howi.marcanoi> { var x: howi.coludo<argurus.oreas, howi.marcanoi>; () => { var y = this; }; return x; }
->othus : Symbol(othus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 739, 107))
+>othus : Symbol(daphaenodon.othus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 739, 107))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
 >coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -9544,7 +9544,7 @@ module macrorhinos {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 740, 64))
 
         hammondi(): julianae.gerbillus<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion> { var x: julianae.gerbillus<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>; () => { var y = this; }; return x; }
->hammondi : Symbol(hammondi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 740, 147))
+>hammondi : Symbol(daphaenodon.hammondi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 740, 147))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >gerbillus : Symbol(julianae.gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3))
 >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1))
@@ -9587,7 +9587,7 @@ module macrorhinos {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 741, 193))
 
         aureocollaris(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
->aureocollaris : Symbol(aureocollaris, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 741, 402))
+>aureocollaris : Symbol(daphaenodon.aureocollaris, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 741, 402))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
 >carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 742, 53))
@@ -9598,7 +9598,7 @@ module macrorhinos {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 742, 53))
 
         flavipes(): petrophilus.minutilla { var x: petrophilus.minutilla; () => { var y = this; }; return x; }
->flavipes : Symbol(flavipes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 742, 117))
+>flavipes : Symbol(daphaenodon.flavipes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 742, 117))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
 >minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 743, 47))
@@ -9609,7 +9609,7 @@ module macrorhinos {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 743, 47))
 
         callosus(): trivirgatus.lotor<lutreolus.foina, dogramacii.robustulus> { var x: trivirgatus.lotor<lutreolus.foina, dogramacii.robustulus>; () => { var y = this; }; return x; }
->callosus : Symbol(callosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 743, 110))
+>callosus : Symbol(daphaenodon.callosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 743, 110))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
@@ -9637,7 +9637,7 @@ module sagitta {
 >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 748, 29))
 
         zunigae(): rendalli.crenulata<macrorhinos.konganensis, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>> { var x: rendalli.crenulata<macrorhinos.konganensis, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>>; () => { var y = this; }; return x; }
->zunigae : Symbol(zunigae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 748, 35))
+>zunigae : Symbol(cinereus.zunigae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 748, 35))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
 >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
@@ -9664,7 +9664,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 749, 124))
 
         microps(): daubentonii.nigricans<caurinus.megaphyllus, quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana>> { var x: daubentonii.nigricans<caurinus.megaphyllus, quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana>>; () => { var y = this; }; return x; }
->microps : Symbol(microps, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 749, 265))
+>microps : Symbol(cinereus.microps, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 749, 265))
 >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1))
 >nigricans : Symbol(daubentonii.nigricans, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 587, 20))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
@@ -9691,7 +9691,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 750, 127))
 
         guaporensis(): daubentonii.arboreus<gabriellae.amicus, argurus.germaini> { var x: daubentonii.arboreus<gabriellae.amicus, argurus.germaini>; () => { var y = this; }; return x; }
->guaporensis : Symbol(guaporensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 750, 271))
+>guaporensis : Symbol(cinereus.guaporensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 750, 271))
 >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1))
 >arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
@@ -9710,7 +9710,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 751, 86))
 
         tonkeana(): panglima.fundatus<petrophilus.minutilla, dammermani.melanops> { var x: panglima.fundatus<petrophilus.minutilla, dammermani.melanops>; () => { var y = this; }; return x; }
->tonkeana : Symbol(tonkeana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 751, 185))
+>tonkeana : Symbol(cinereus.tonkeana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 751, 185))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
@@ -9729,7 +9729,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 752, 87))
 
         montensis(): dammermani.siberu<dogramacii.aurata, trivirgatus.oconnelli> { var x: dammermani.siberu<dogramacii.aurata, trivirgatus.oconnelli>; () => { var y = this; }; return x; }
->montensis : Symbol(montensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 752, 190))
+>montensis : Symbol(cinereus.montensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 752, 190))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
 >siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
@@ -9748,7 +9748,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 753, 86))
 
         sphinx(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; }
->sphinx : Symbol(sphinx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 753, 187))
+>sphinx : Symbol(cinereus.sphinx, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 753, 187))
 >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1))
 >portoricensis : Symbol(minutus.portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 754, 45))
@@ -9759,7 +9759,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 754, 45))
 
         glis(): argurus.wetmorei<argurus.oreas, howi.marcanoi> { var x: argurus.wetmorei<argurus.oreas, howi.marcanoi>; () => { var y = this; }; return x; }
->glis : Symbol(glis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 754, 108))
+>glis : Symbol(cinereus.glis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 754, 108))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >wetmorei : Symbol(argurus.wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 16))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -9778,7 +9778,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 755, 68))
 
         dorsalis(): petrophilus.sodyi<argurus.luctuosa, julianae.sumatrana> { var x: petrophilus.sodyi<argurus.luctuosa, julianae.sumatrana>; () => { var y = this; }; return x; }
->dorsalis : Symbol(dorsalis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 755, 156))
+>dorsalis : Symbol(cinereus.dorsalis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 755, 156))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
 >sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -9797,7 +9797,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 756, 81))
 
         fimbriatus(): provocax.melanoleuca { var x: provocax.melanoleuca; () => { var y = this; }; return x; }
->fimbriatus : Symbol(fimbriatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 756, 178))
+>fimbriatus : Symbol(cinereus.fimbriatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 756, 178))
 >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1))
 >melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 757, 48))
@@ -9808,7 +9808,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 757, 48))
 
         sara(): nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus> { var x: nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>; () => { var y = this; }; return x; }
->sara : Symbol(sara, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 757, 110))
+>sara : Symbol(cinereus.sara, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 757, 110))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -9827,7 +9827,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 758, 78))
 
         epimelas(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
->epimelas : Symbol(epimelas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 758, 176))
+>epimelas : Symbol(cinereus.epimelas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 758, 176))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >stolzmanni : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 759, 44))
@@ -9838,7 +9838,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 759, 44))
 
         pittieri(): samarensis.fuscus<quasiater.carolinensis, sagitta.stolzmanni> { var x: samarensis.fuscus<quasiater.carolinensis, sagitta.stolzmanni>; () => { var y = this; }; return x; }
->pittieri : Symbol(pittieri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 759, 104))
+>pittieri : Symbol(cinereus.pittieri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 759, 104))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >fuscus : Symbol(samarensis.fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
@@ -9885,7 +9885,7 @@ module gabriellae {
 >amicus : Symbol(amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5))
 
         pirrensis(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; }
->pirrensis : Symbol(pirrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 770, 25))
+>pirrensis : Symbol(amicus.pirrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 770, 25))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 771, 43))
@@ -9896,7 +9896,7 @@ module gabriellae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 771, 43))
 
         phaeura(): panglima.abidi<lutreolus.foina, argurus.peninsulae> { var x: panglima.abidi<lutreolus.foina, argurus.peninsulae>; () => { var y = this; }; return x; }
->phaeura : Symbol(phaeura, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 771, 101))
+>phaeura : Symbol(amicus.phaeura, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 771, 101))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >abidi : Symbol(panglima.abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
@@ -9915,7 +9915,7 @@ module gabriellae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 772, 76))
 
         voratus(): lavali.thaeleri { var x: lavali.thaeleri; () => { var y = this; }; return x; }
->voratus : Symbol(voratus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 772, 169))
+>voratus : Symbol(amicus.voratus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 772, 169))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 773, 40))
@@ -9926,7 +9926,7 @@ module gabriellae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 773, 40))
 
         satarae(): trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni> { var x: trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>; () => { var y = this; }; return x; }
->satarae : Symbol(satarae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 773, 97))
+>satarae : Symbol(amicus.satarae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 773, 97))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -9945,7 +9945,7 @@ module gabriellae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 774, 76))
 
         hooperi(): caurinus.psilurus { var x: caurinus.psilurus; () => { var y = this; }; return x; }
->hooperi : Symbol(hooperi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 774, 169))
+>hooperi : Symbol(amicus.hooperi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 774, 169))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
 >psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 775, 42))
@@ -9956,7 +9956,7 @@ module gabriellae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 775, 42))
 
         perrensi(): rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi> { var x: rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi>; () => { var y = this; }; return x; }
->perrensi : Symbol(perrensi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 775, 101))
+>perrensi : Symbol(amicus.perrensi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 775, 101))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
 >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
@@ -9975,7 +9975,7 @@ module gabriellae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 776, 82))
 
         ridei(): ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>> { var x: ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>>; () => { var y = this; }; return x; }
->ridei : Symbol(ridei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 776, 180))
+>ridei : Symbol(amicus.ridei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 776, 180))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
 >hector : Symbol(ruatanica.hector, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 101, 18))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -10002,7 +10002,7 @@ module gabriellae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 777, 117))
 
         audeberti(): daubentonii.arboreus<dogramacii.kaiseri, lutreolus.punicus> { var x: daubentonii.arboreus<dogramacii.kaiseri, lutreolus.punicus>; () => { var y = this; }; return x; }
->audeberti : Symbol(audeberti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 777, 253))
+>audeberti : Symbol(amicus.audeberti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 777, 253))
 >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1))
 >arboreus : Symbol(daubentonii.arboreus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 637, 20))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
@@ -10021,7 +10021,7 @@ module gabriellae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 778, 86))
 
         Lutetium(): macrorhinos.marmosurus<sagitta.stolzmanni, lavali.thaeleri> { var x: macrorhinos.marmosurus<sagitta.stolzmanni, lavali.thaeleri>; () => { var y = this; }; return x; }
->Lutetium : Symbol(Lutetium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 778, 187))
+>Lutetium : Symbol(amicus.Lutetium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 778, 187))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
@@ -10040,7 +10040,7 @@ module gabriellae {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 779, 85))
 
         atrox(): samarensis.fuscus<julianae.oralis<julianae.steerii, lavali.lepturus>, dogramacii.koepckeae> { var x: samarensis.fuscus<julianae.oralis<julianae.steerii, lavali.lepturus>, dogramacii.koepckeae>; () => { var y = this; }; return x; }
->atrox : Symbol(atrox, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 779, 186))
+>atrox : Symbol(amicus.atrox, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 779, 186))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >fuscus : Symbol(samarensis.fuscus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 547, 5))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -10070,7 +10070,7 @@ module gabriellae {
 >echinatus : Symbol(echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5))
 
         tenuipes(): howi.coludo<macrorhinos.daphaenodon, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>> { var x: howi.coludo<macrorhinos.daphaenodon, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>; () => { var y = this; }; return x; }
->tenuipes : Symbol(tenuipes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 782, 28))
+>tenuipes : Symbol(echinatus.tenuipes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 782, 28))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
 >coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
@@ -10106,7 +10106,7 @@ module imperfecta {
 >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 787, 29))
 
         marisae(): lavali.thaeleri { var x: lavali.thaeleri; () => { var y = this; }; return x; }
->marisae : Symbol(marisae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 787, 35))
+>marisae : Symbol(lasiurus.marisae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 787, 35))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 788, 40))
@@ -10117,7 +10117,7 @@ module imperfecta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 788, 40))
 
         fulvus(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; }
->fulvus : Symbol(fulvus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 788, 97))
+>fulvus : Symbol(lasiurus.fulvus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 788, 97))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 789, 40))
@@ -10128,7 +10128,7 @@ module imperfecta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 789, 40))
 
         paranaensis(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; }
->paranaensis : Symbol(paranaensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 789, 98))
+>paranaensis : Symbol(lasiurus.paranaensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 789, 98))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
 >koepckeae : Symbol(dogramacii.koepckeae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 326, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 790, 49))
@@ -10139,7 +10139,7 @@ module imperfecta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 790, 49))
 
         didactylus(): panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>> { var x: panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>; () => { var y = this; }; return x; }
->didactylus : Symbol(didactylus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 790, 111))
+>didactylus : Symbol(lasiurus.didactylus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 790, 111))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >abidi : Symbol(panglima.abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
@@ -10166,7 +10166,7 @@ module imperfecta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 791, 130))
 
         schreibersii(): nigra.gracilis<argurus.luctuosa, ruatanica.americanus> { var x: nigra.gracilis<argurus.luctuosa, ruatanica.americanus>; () => { var y = this; }; return x; }
->schreibersii : Symbol(schreibersii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 791, 274))
+>schreibersii : Symbol(lasiurus.schreibersii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 791, 274))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -10185,7 +10185,7 @@ module imperfecta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 792, 84))
 
         orii(): dogramacii.kaiseri { var x: dogramacii.kaiseri; () => { var y = this; }; return x; }
->orii : Symbol(orii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 792, 180))
+>orii : Symbol(lasiurus.orii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 792, 180))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
 >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 793, 40))
@@ -10199,7 +10199,7 @@ module imperfecta {
 >subspinosus : Symbol(subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5))
 
         monticularis(): macrorhinos.konganensis { var x: macrorhinos.konganensis; () => { var y = this; }; return x; }
->monticularis : Symbol(monticularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 795, 30))
+>monticularis : Symbol(subspinosus.monticularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 795, 30))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 796, 53))
@@ -10210,7 +10210,7 @@ module imperfecta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 796, 53))
 
         Gadolinium(): nigra.caucasica<sagitta.stolzmanni, patas.uralensis> { var x: nigra.caucasica<sagitta.stolzmanni, patas.uralensis>; () => { var y = this; }; return x; }
->Gadolinium : Symbol(Gadolinium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 796, 118))
+>Gadolinium : Symbol(subspinosus.Gadolinium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 796, 118))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 14))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
@@ -10229,7 +10229,7 @@ module imperfecta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 797, 80))
 
         oasicus(): caurinus.johorensis<argurus.peninsulae, daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>> { var x: caurinus.johorensis<argurus.peninsulae, daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>>; () => { var y = this; }; return x; }
->oasicus : Symbol(oasicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 797, 174))
+>oasicus : Symbol(subspinosus.oasicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 797, 174))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
 >johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -10256,7 +10256,7 @@ module imperfecta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 798, 124))
 
         paterculus(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
->paterculus : Symbol(paterculus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 798, 265))
+>paterculus : Symbol(subspinosus.paterculus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 798, 265))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
 >punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 799, 45))
@@ -10267,7 +10267,7 @@ module imperfecta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 799, 45))
 
         punctata(): lavali.thaeleri { var x: lavali.thaeleri; () => { var y = this; }; return x; }
->punctata : Symbol(punctata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 799, 104))
+>punctata : Symbol(subspinosus.punctata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 799, 104))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >thaeleri : Symbol(lavali.thaeleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 299, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 800, 41))
@@ -10278,7 +10278,7 @@ module imperfecta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 800, 41))
 
         invictus(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
->invictus : Symbol(invictus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 800, 98))
+>invictus : Symbol(subspinosus.invictus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 800, 98))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 801, 44))
@@ -10289,7 +10289,7 @@ module imperfecta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 801, 44))
 
         stangeri(): petrophilus.minutilla { var x: petrophilus.minutilla; () => { var y = this; }; return x; }
->stangeri : Symbol(stangeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 801, 104))
+>stangeri : Symbol(subspinosus.stangeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 801, 104))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
 >minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 802, 47))
@@ -10300,7 +10300,7 @@ module imperfecta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 802, 47))
 
         siskiyou(): minutus.inez<macrorhinos.konganensis, samarensis.pallidus> { var x: minutus.inez<macrorhinos.konganensis, samarensis.pallidus>; () => { var y = this; }; return x; }
->siskiyou : Symbol(siskiyou, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 802, 110))
+>siskiyou : Symbol(subspinosus.siskiyou, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 802, 110))
 >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1))
 >inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
@@ -10319,7 +10319,7 @@ module imperfecta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 803, 84))
 
         welwitschii(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; }
->welwitschii : Symbol(welwitschii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 803, 184))
+>welwitschii : Symbol(subspinosus.welwitschii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 803, 184))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
 >caniventer : Symbol(rionegrensis.caniventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 21))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 804, 52))
@@ -10330,7 +10330,7 @@ module imperfecta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 804, 52))
 
         Polonium(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
->Polonium : Symbol(Polonium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 804, 117))
+>Polonium : Symbol(subspinosus.Polonium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 804, 117))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 805, 40))
@@ -10341,7 +10341,7 @@ module imperfecta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 805, 40))
 
         harpia(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; }
->harpia : Symbol(harpia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 805, 96))
+>harpia : Symbol(subspinosus.harpia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 805, 96))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 806, 40))
@@ -10360,7 +10360,7 @@ module imperfecta {
 >robustulus : Symbol(dogramacii.robustulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 315, 19))
 
         leschenaultii(): argurus.dauricus<Lanthanum.jugularis, ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>> { var x: argurus.dauricus<Lanthanum.jugularis, ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>>; () => { var y = this; }; return x; }
->leschenaultii : Symbol(leschenaultii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 808, 68))
+>leschenaultii : Symbol(ciliolabrum.leschenaultii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 808, 68))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
@@ -10387,7 +10387,7 @@ module imperfecta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 809, 132))
 
         ludia(): caurinus.johorensis<rionegrensis.caniventer, lutreolus.punicus> { var x: caurinus.johorensis<rionegrensis.caniventer, lutreolus.punicus>; () => { var y = this; }; return x; }
->ludia : Symbol(ludia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 809, 275))
+>ludia : Symbol(ciliolabrum.ludia, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 809, 275))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
 >johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
@@ -10406,7 +10406,7 @@ module imperfecta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 810, 86))
 
         sinicus(): macrorhinos.marmosurus<macrorhinos.daphaenodon, gabriellae.amicus> { var x: macrorhinos.marmosurus<macrorhinos.daphaenodon, gabriellae.amicus>; () => { var y = this; }; return x; }
->sinicus : Symbol(sinicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 810, 191))
+>sinicus : Symbol(ciliolabrum.sinicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 810, 191))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
@@ -10434,7 +10434,7 @@ module quasiater {
 >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 815, 27))
 
         lagotis(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; }
->lagotis : Symbol(lagotis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 815, 33))
+>lagotis : Symbol(wattsi.lagotis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 815, 33))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 816, 45))
@@ -10445,7 +10445,7 @@ module quasiater {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 816, 45))
 
         hussoni(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
->hussoni : Symbol(hussoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 816, 107))
+>hussoni : Symbol(wattsi.hussoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 816, 107))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 817, 39))
@@ -10456,7 +10456,7 @@ module quasiater {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 817, 39))
 
         bilarni(): samarensis.cahirinus<rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>, dogramacii.koepckeae> { var x: samarensis.cahirinus<rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>, dogramacii.koepckeae>; () => { var y = this; }; return x; }
->bilarni : Symbol(bilarni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 817, 95))
+>bilarni : Symbol(wattsi.bilarni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 817, 95))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >cahirinus : Symbol(samarensis.cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
@@ -10491,7 +10491,7 @@ module quasiater {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 818, 158))
 
         cabrerae(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; }
->cabrerae : Symbol(cabrerae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 818, 333))
+>cabrerae : Symbol(wattsi.cabrerae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 818, 333))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >lepturus : Symbol(lavali.lepturus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 309, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 819, 41))
@@ -10517,7 +10517,7 @@ module petrophilus {
 >bobrinskoi : Symbol(quasiater.bobrinskoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 237, 18))
 
         saundersiae(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; }
->saundersiae : Symbol(saundersiae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 825, 61))
+>saundersiae : Symbol(sodyi.saundersiae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 825, 61))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 826, 48))
@@ -10528,7 +10528,7 @@ module petrophilus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 826, 48))
 
         imberbis(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
->imberbis : Symbol(imberbis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 826, 109))
+>imberbis : Symbol(sodyi.imberbis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 826, 109))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
 >carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 827, 48))
@@ -10539,7 +10539,7 @@ module petrophilus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 827, 48))
 
         cansdalei(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; }
->cansdalei : Symbol(cansdalei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 827, 112))
+>cansdalei : Symbol(sodyi.cansdalei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 827, 112))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
 >melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 828, 46))
@@ -10550,7 +10550,7 @@ module petrophilus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 828, 46))
 
         Lawrencium(): nigra.dolichurus<julianae.sumatrana, imperfecta.subspinosus> { var x: nigra.dolichurus<julianae.sumatrana, imperfecta.subspinosus>; () => { var y = this; }; return x; }
->Lawrencium : Symbol(Lawrencium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 828, 107))
+>Lawrencium : Symbol(sodyi.Lawrencium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 828, 107))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -10569,7 +10569,7 @@ module petrophilus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 829, 88))
 
         catta(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; }
->catta : Symbol(catta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 829, 190))
+>catta : Symbol(sodyi.catta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 829, 190))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 830, 36))
@@ -10580,7 +10580,7 @@ module petrophilus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 830, 36))
 
         breviceps(): argurus.dauricus<dogramacii.aurata, dammermani.melanops> { var x: argurus.dauricus<dogramacii.aurata, dammermani.melanops>; () => { var y = this; }; return x; }
->breviceps : Symbol(breviceps, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 830, 91))
+>breviceps : Symbol(sodyi.breviceps, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 830, 91))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >dauricus : Symbol(argurus.dauricus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 374, 16))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
@@ -10599,7 +10599,7 @@ module petrophilus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 831, 83))
 
         transitionalis(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; }
->transitionalis : Symbol(transitionalis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 831, 181))
+>transitionalis : Symbol(sodyi.transitionalis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 831, 181))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
 >zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 832, 50))
@@ -10610,7 +10610,7 @@ module petrophilus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 832, 50))
 
         heptneri(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; }
->heptneri : Symbol(heptneri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 832, 110))
+>heptneri : Symbol(sodyi.heptneri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 832, 110))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 833, 42))
@@ -10621,7 +10621,7 @@ module petrophilus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 833, 42))
 
         bairdii(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; }
->bairdii : Symbol(bairdii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 833, 100))
+>bairdii : Symbol(sodyi.bairdii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 833, 100))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 834, 37))
@@ -10650,7 +10650,7 @@ module caurinus {
 >marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13))
 
         montana(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; }
->montana : Symbol(montana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 838, 122))
+>montana : Symbol(megaphyllus.montana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 838, 122))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 839, 38))
@@ -10661,7 +10661,7 @@ module caurinus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 839, 38))
 
         amatus(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; }
->amatus : Symbol(amatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 839, 93))
+>amatus : Symbol(megaphyllus.amatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 839, 93))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
 >schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 840, 43))
@@ -10672,7 +10672,7 @@ module caurinus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 840, 43))
 
         bucculentus(): gabriellae.echinatus { var x: gabriellae.echinatus; () => { var y = this; }; return x; }
->bucculentus : Symbol(bucculentus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 840, 104))
+>bucculentus : Symbol(megaphyllus.bucculentus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 840, 104))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
 >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 841, 49))
@@ -10683,7 +10683,7 @@ module caurinus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 841, 49))
 
         lepida(): rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>> { var x: rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>; () => { var y = this; }; return x; }
->lepida : Symbol(lepida, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 841, 111))
+>lepida : Symbol(megaphyllus.lepida, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 841, 111))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
 >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -10710,7 +10710,7 @@ module caurinus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 842, 113))
 
         graecus(): dogramacii.kaiseri { var x: dogramacii.kaiseri; () => { var y = this; }; return x; }
->graecus : Symbol(graecus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 842, 244))
+>graecus : Symbol(megaphyllus.graecus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 842, 244))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
 >kaiseri : Symbol(dogramacii.kaiseri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 329, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 843, 43))
@@ -10721,7 +10721,7 @@ module caurinus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 843, 43))
 
         forsteri(): petrophilus.minutilla { var x: petrophilus.minutilla; () => { var y = this; }; return x; }
->forsteri : Symbol(forsteri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 843, 103))
+>forsteri : Symbol(megaphyllus.forsteri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 843, 103))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
 >minutilla : Symbol(petrophilus.minutilla, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 716, 20))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 844, 47))
@@ -10732,7 +10732,7 @@ module caurinus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 844, 47))
 
         perotensis(): samarensis.cahirinus<minutus.portoricensis, lavali.lepturus> { var x: samarensis.cahirinus<minutus.portoricensis, lavali.lepturus>; () => { var y = this; }; return x; }
->perotensis : Symbol(perotensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 844, 110))
+>perotensis : Symbol(megaphyllus.perotensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 844, 110))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >cahirinus : Symbol(samarensis.cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5))
 >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1))
@@ -10751,7 +10751,7 @@ module caurinus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 845, 88))
 
         cirrhosus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
->cirrhosus : Symbol(cirrhosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 845, 190))
+>cirrhosus : Symbol(megaphyllus.cirrhosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 845, 190))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
 >carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 846, 49))
@@ -10769,7 +10769,7 @@ module minutus {
 >portoricensis : Symbol(portoricensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 849, 16))
 
         relictus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
->relictus : Symbol(relictus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 850, 32))
+>relictus : Symbol(portoricensis.relictus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 850, 32))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
 >carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 851, 48))
@@ -10780,7 +10780,7 @@ module minutus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 851, 48))
 
         aequatorianus(): gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata> { var x: gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>; () => { var y = this; }; return x; }
->aequatorianus : Symbol(aequatorianus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 851, 112))
+>aequatorianus : Symbol(portoricensis.aequatorianus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 851, 112))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
 >klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -10799,7 +10799,7 @@ module minutus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 852, 89))
 
         rhinogradoides(): samarensis.cahirinus<quasiater.carolinensis, julianae.durangae> { var x: samarensis.cahirinus<quasiater.carolinensis, julianae.durangae>; () => { var y = this; }; return x; }
->rhinogradoides : Symbol(rhinogradoides, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 852, 189))
+>rhinogradoides : Symbol(portoricensis.rhinogradoides, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 852, 189))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >cahirinus : Symbol(samarensis.cahirinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 569, 5))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
@@ -10825,7 +10825,7 @@ module lutreolus {
 >foina : Symbol(foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18))
 
         tarfayensis(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
->tarfayensis : Symbol(tarfayensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 857, 24))
+>tarfayensis : Symbol(foina.tarfayensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 857, 24))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
 >punicus : Symbol(punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 858, 46))
@@ -10836,7 +10836,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 858, 46))
 
         Promethium(): samarensis.pelurus<argurus.germaini, julianae.durangae> { var x: samarensis.pelurus<argurus.germaini, julianae.durangae>; () => { var y = this; }; return x; }
->Promethium : Symbol(Promethium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 858, 105))
+>Promethium : Symbol(foina.Promethium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 858, 105))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >pelurus : Symbol(samarensis.pelurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 532, 19))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -10855,7 +10855,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 859, 83))
 
         salinae(): gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis> { var x: gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis>; () => { var y = this; }; return x; }
->salinae : Symbol(salinae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 859, 180))
+>salinae : Symbol(foina.salinae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 859, 180))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
 >klossii : Symbol(gabriellae.klossii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 767, 19))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
@@ -10874,7 +10874,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 860, 92))
 
         kerri(): howi.coludo<quasiater.carolinensis, minutus.portoricensis> { var x: howi.coludo<quasiater.carolinensis, minutus.portoricensis>; () => { var y = this; }; return x; }
->kerri : Symbol(kerri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 860, 201))
+>kerri : Symbol(foina.kerri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 860, 201))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
 >coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
@@ -10893,7 +10893,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 861, 81))
 
         scotti(): quasiater.wattsi<macrorhinos.konganensis, dogramacii.robustulus> { var x: quasiater.wattsi<macrorhinos.konganensis, dogramacii.robustulus>; () => { var y = this; }; return x; }
->scotti : Symbol(scotti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 861, 181))
+>scotti : Symbol(foina.scotti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 861, 181))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
 >wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
@@ -10912,7 +10912,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 862, 88))
 
         camerunensis(): julianae.gerbillus<imperfecta.subspinosus, julianae.durangae> { var x: julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>; () => { var y = this; }; return x; }
->camerunensis : Symbol(camerunensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 862, 194))
+>camerunensis : Symbol(foina.camerunensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 862, 194))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >gerbillus : Symbol(julianae.gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
@@ -10931,7 +10931,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 863, 91))
 
         affinis(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; }
->affinis : Symbol(affinis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 863, 194))
+>affinis : Symbol(foina.affinis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 863, 194))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 864, 41))
@@ -10942,7 +10942,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 864, 41))
 
         siebersi(): trivirgatus.lotor<argurus.oreas, nigra.thalia<patas.uralensis, lavali.wilsoni>> { var x: trivirgatus.lotor<argurus.oreas, nigra.thalia<patas.uralensis, lavali.wilsoni>>; () => { var y = this; }; return x; }
->siebersi : Symbol(siebersi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 864, 99))
+>siebersi : Symbol(foina.siebersi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 864, 99))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -10969,7 +10969,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 865, 105))
 
         maquassiensis(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; }
->maquassiensis : Symbol(maquassiensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 865, 226))
+>maquassiensis : Symbol(foina.maquassiensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 865, 226))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 866, 52))
@@ -10980,7 +10980,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 866, 52))
 
         layardi(): julianae.albidens<howi.marcanoi, dogramacii.koepckeae> { var x: julianae.albidens<howi.marcanoi, dogramacii.koepckeae>; () => { var y = this; }; return x; }
->layardi : Symbol(layardi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 866, 115))
+>layardi : Symbol(foina.layardi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 866, 115))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >albidens : Symbol(julianae.albidens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 34, 3))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
@@ -10999,7 +10999,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 867, 79))
 
         bishopi(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; }
->bishopi : Symbol(bishopi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 867, 175))
+>bishopi : Symbol(foina.bishopi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 867, 175))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
 >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 868, 42))
@@ -11010,7 +11010,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 868, 42))
 
         apodemoides(): caurinus.psilurus { var x: caurinus.psilurus; () => { var y = this; }; return x; }
->apodemoides : Symbol(apodemoides, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 868, 101))
+>apodemoides : Symbol(foina.apodemoides, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 868, 101))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
 >psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 869, 46))
@@ -11021,7 +11021,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 869, 46))
 
         argentiventer(): trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus> { var x: trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus>; () => { var y = this; }; return x; }
->argentiventer : Symbol(argentiventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 869, 105))
+>argentiventer : Symbol(foina.argentiventer, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 869, 105))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >mixtus : Symbol(trivirgatus.mixtus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 197, 3))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
@@ -11064,7 +11064,7 @@ module lutreolus {
 >melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19))
 
         antinorii(): petrophilus.sodyi<quasiater.carolinensis, argurus.germaini> { var x: petrophilus.sodyi<quasiater.carolinensis, argurus.germaini>; () => { var y = this; }; return x; }
->antinorii : Symbol(antinorii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 874, 164))
+>antinorii : Symbol(cor.antinorii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 874, 164))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
 >sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
@@ -11083,7 +11083,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 875, 86))
 
         voi(): caurinus.johorensis<dammermani.melanops, macrorhinos.konganensis> { var x: caurinus.johorensis<dammermani.melanops, macrorhinos.konganensis>; () => { var y = this; }; return x; }
->voi : Symbol(voi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 875, 187))
+>voi : Symbol(cor.voi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 875, 187))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
 >johorensis : Symbol(caurinus.johorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 977, 17))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
@@ -11102,7 +11102,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 876, 86))
 
         mussoi(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
->mussoi : Symbol(mussoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 876, 193))
+>mussoi : Symbol(cor.mussoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 876, 193))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
 >carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 877, 46))
@@ -11113,7 +11113,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 877, 46))
 
         truncatus(): trivirgatus.lotor<sagitta.stolzmanni, lutreolus.foina> { var x: trivirgatus.lotor<sagitta.stolzmanni, lutreolus.foina>; () => { var y = this; }; return x; }
->truncatus : Symbol(truncatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 877, 110))
+>truncatus : Symbol(cor.truncatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 877, 110))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
@@ -11132,7 +11132,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 878, 81))
 
         achates(): provocax.melanoleuca { var x: provocax.melanoleuca; () => { var y = this; }; return x; }
->achates : Symbol(achates, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 878, 177))
+>achates : Symbol(cor.achates, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 878, 177))
 >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1))
 >melanoleuca : Symbol(provocax.melanoleuca, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 670, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 879, 45))
@@ -11143,7 +11143,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 879, 45))
 
         praedatrix(): howi.angulatus<dogramacii.kaiseri, julianae.steerii> { var x: howi.angulatus<dogramacii.kaiseri, julianae.steerii>; () => { var y = this; }; return x; }
->praedatrix : Symbol(praedatrix, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 879, 107))
+>praedatrix : Symbol(cor.praedatrix, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 879, 107))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
 >angulatus : Symbol(howi.angulatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 467, 13))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
@@ -11162,7 +11162,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 880, 80))
 
         mzabi(): quasiater.wattsi<trivirgatus.lotor<julianae.steerii, samarensis.pallidus>, minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis>> { var x: quasiater.wattsi<trivirgatus.lotor<julianae.steerii, samarensis.pallidus>, minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis>>; () => { var y = this; }; return x; }
->mzabi : Symbol(mzabi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 880, 174))
+>mzabi : Symbol(cor.mzabi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 880, 174))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
 >wattsi : Symbol(quasiater.wattsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 814, 18))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
@@ -11197,7 +11197,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 881, 155))
 
         xanthinus(): nigra.gracilis<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, howi.marcanoi> { var x: nigra.gracilis<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, howi.marcanoi>; () => { var y = this; }; return x; }
->xanthinus : Symbol(xanthinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 881, 329))
+>xanthinus : Symbol(cor.xanthinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 881, 329))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14))
 >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1))
@@ -11224,7 +11224,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 882, 119))
 
         tapoatafa(): caurinus.megaphyllus { var x: caurinus.megaphyllus; () => { var y = this; }; return x; }
->tapoatafa : Symbol(tapoatafa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 882, 253))
+>tapoatafa : Symbol(cor.tapoatafa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 882, 253))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
 >megaphyllus : Symbol(caurinus.megaphyllus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 837, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 883, 47))
@@ -11235,7 +11235,7 @@ module lutreolus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 883, 47))
 
         castroviejoi(): Lanthanum.jugularis { var x: Lanthanum.jugularis; () => { var y = this; }; return x; }
->castroviejoi : Symbol(castroviejoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 883, 109))
+>castroviejoi : Symbol(cor.castroviejoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 883, 109))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
 >jugularis : Symbol(Lanthanum.jugularis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 134, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 884, 49))
@@ -11255,7 +11255,7 @@ module howi {
 >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 888, 27))
 
         bernhardi(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
->bernhardi : Symbol(bernhardi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 888, 33))
+>bernhardi : Symbol(coludo.bernhardi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 888, 33))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
 >punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 889, 44))
@@ -11266,7 +11266,7 @@ module howi {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 889, 44))
 
         isseli(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; }
->isseli : Symbol(isseli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 889, 103))
+>isseli : Symbol(coludo.isseli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 889, 103))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 890, 40))
@@ -11287,7 +11287,7 @@ module argurus {
 >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5))
 
         sharpei(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
->sharpei : Symbol(sharpei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 894, 53))
+>sharpei : Symbol(germaini.sharpei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 894, 53))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 895, 39))
@@ -11298,7 +11298,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 895, 39))
 
         palmarum(): macrorhinos.marmosurus<Lanthanum.megalonyx, lavali.thaeleri> { var x: macrorhinos.marmosurus<Lanthanum.megalonyx, lavali.thaeleri>; () => { var y = this; }; return x; }
->palmarum : Symbol(palmarum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 895, 95))
+>palmarum : Symbol(germaini.palmarum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 895, 95))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >marmosurus : Symbol(macrorhinos.marmosurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 462, 20))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
@@ -11324,7 +11324,7 @@ module sagitta {
 >stolzmanni : Symbol(stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16))
 
         riparius(): nigra.dolichurus<dogramacii.koepckeae, caurinus.psilurus> { var x: nigra.dolichurus<dogramacii.koepckeae, caurinus.psilurus>; () => { var y = this; }; return x; }
->riparius : Symbol(riparius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 900, 29))
+>riparius : Symbol(stolzmanni.riparius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 900, 29))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >dolichurus : Symbol(nigra.dolichurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 389, 14))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
@@ -11343,7 +11343,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 901, 83))
 
         dhofarensis(): lutreolus.foina { var x: lutreolus.foina; () => { var y = this; }; return x; }
->dhofarensis : Symbol(dhofarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 901, 182))
+>dhofarensis : Symbol(stolzmanni.dhofarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 901, 182))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
 >foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 902, 44))
@@ -11354,7 +11354,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 902, 44))
 
         tricolor(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; }
->tricolor : Symbol(tricolor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 902, 101))
+>tricolor : Symbol(stolzmanni.tricolor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 902, 101))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >germaini : Symbol(argurus.germaini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 893, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 903, 42))
@@ -11365,7 +11365,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 903, 42))
 
         gardneri(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; }
->gardneri : Symbol(gardneri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 903, 100))
+>gardneri : Symbol(stolzmanni.gardneri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 903, 100))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 904, 46))
@@ -11376,7 +11376,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 904, 46))
 
         walleri(): rendalli.moojeni<chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>, gabriellae.echinatus> { var x: rendalli.moojeni<chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>, gabriellae.echinatus>; () => { var y = this; }; return x; }
->walleri : Symbol(walleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 904, 108))
+>walleri : Symbol(stolzmanni.walleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 904, 108))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
 >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3))
 >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1))
@@ -11403,7 +11403,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 905, 132))
 
         talpoides(): gabriellae.echinatus { var x: gabriellae.echinatus; () => { var y = this; }; return x; }
->talpoides : Symbol(talpoides, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 905, 281))
+>talpoides : Symbol(stolzmanni.talpoides, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 905, 281))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
 >echinatus : Symbol(gabriellae.echinatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 781, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 906, 47))
@@ -11414,7 +11414,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 906, 47))
 
         pallipes(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; }
->pallipes : Symbol(pallipes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 906, 109))
+>pallipes : Symbol(stolzmanni.pallipes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 906, 109))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
 >melanops : Symbol(dammermani.melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 907, 45))
@@ -11425,7 +11425,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 907, 45))
 
         lagurus(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; }
->lagurus : Symbol(lagurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 907, 106))
+>lagurus : Symbol(stolzmanni.lagurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 907, 106))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >beisa : Symbol(lavali.beisa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 268, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 908, 37))
@@ -11436,7 +11436,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 908, 37))
 
         hipposideros(): julianae.albidens<argurus.luctuosa, gabriellae.echinatus> { var x: julianae.albidens<argurus.luctuosa, gabriellae.echinatus>; () => { var y = this; }; return x; }
->hipposideros : Symbol(hipposideros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 908, 91))
+>hipposideros : Symbol(stolzmanni.hipposideros, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 908, 91))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >albidens : Symbol(julianae.albidens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 34, 3))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -11455,7 +11455,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 909, 87))
 
         griselda(): caurinus.psilurus { var x: caurinus.psilurus; () => { var y = this; }; return x; }
->griselda : Symbol(griselda, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 909, 186))
+>griselda : Symbol(stolzmanni.griselda, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 909, 186))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
 >psilurus : Symbol(caurinus.psilurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1008, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 910, 43))
@@ -11466,7 +11466,7 @@ module sagitta {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 910, 43))
 
         florium(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; }
->florium : Symbol(florium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 910, 102))
+>florium : Symbol(stolzmanni.florium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 910, 102))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
 >zuluensis : Symbol(rendalli.zuluensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 152, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 911, 43))
@@ -11491,7 +11491,7 @@ module dammermani {
 >melanops : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19))
 
         blarina(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; }
->blarina : Symbol(blarina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 915, 89))
+>blarina : Symbol(melanops.blarina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 915, 89))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
 >melanops : Symbol(melanops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 914, 19))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 916, 44))
@@ -11502,7 +11502,7 @@ module dammermani {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 916, 44))
 
         harwoodi(): rionegrensis.veraecrucis<nigra.dolichurus<lavali.lepturus, samarensis.pallidus>, lavali.wilsoni> { var x: rionegrensis.veraecrucis<nigra.dolichurus<lavali.lepturus, samarensis.pallidus>, lavali.wilsoni>; () => { var y = this; }; return x; }
->harwoodi : Symbol(harwoodi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 916, 105))
+>harwoodi : Symbol(melanops.harwoodi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 916, 105))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
 >veraecrucis : Symbol(rionegrensis.veraecrucis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 7, 3))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
@@ -11529,7 +11529,7 @@ module dammermani {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 917, 122))
 
         ashaninka(): julianae.nudicaudus { var x: julianae.nudicaudus; () => { var y = this; }; return x; }
->ashaninka : Symbol(ashaninka, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 917, 260))
+>ashaninka : Symbol(melanops.ashaninka, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 917, 260))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >nudicaudus : Symbol(julianae.nudicaudus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 18, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 918, 46))
@@ -11540,7 +11540,7 @@ module dammermani {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 918, 46))
 
         wiedii(): julianae.steerii { var x: julianae.steerii; () => { var y = this; }; return x; }
->wiedii : Symbol(wiedii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 918, 107))
+>wiedii : Symbol(melanops.wiedii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 918, 107))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >steerii : Symbol(julianae.steerii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 16, 17))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 919, 40))
@@ -11551,7 +11551,7 @@ module dammermani {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 919, 40))
 
         godmani(): imperfecta.subspinosus { var x: imperfecta.subspinosus; () => { var y = this; }; return x; }
->godmani : Symbol(godmani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 919, 98))
+>godmani : Symbol(melanops.godmani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 919, 98))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
 >subspinosus : Symbol(imperfecta.subspinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 794, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 920, 47))
@@ -11562,7 +11562,7 @@ module dammermani {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 920, 47))
 
         condorensis(): imperfecta.ciliolabrum<samarensis.pallidus, caurinus.psilurus> { var x: imperfecta.ciliolabrum<samarensis.pallidus, caurinus.psilurus>; () => { var y = this; }; return x; }
->condorensis : Symbol(condorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 920, 111))
+>condorensis : Symbol(melanops.condorensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 920, 111))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
 >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
@@ -11581,7 +11581,7 @@ module dammermani {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 921, 91))
 
         xerophila(): panglima.abidi<minutus.portoricensis, patas.uralensis> { var x: panglima.abidi<minutus.portoricensis, patas.uralensis>; () => { var y = this; }; return x; }
->xerophila : Symbol(xerophila, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 921, 195))
+>xerophila : Symbol(melanops.xerophila, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 921, 195))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >abidi : Symbol(panglima.abidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 414, 5))
 >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1))
@@ -11600,7 +11600,7 @@ module dammermani {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 922, 81))
 
         laminatus(): panglima.fundatus<howi.marcanoi, samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>> { var x: panglima.fundatus<howi.marcanoi, samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>>; () => { var y = this; }; return x; }
->laminatus : Symbol(laminatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 922, 177))
+>laminatus : Symbol(melanops.laminatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 922, 177))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >fundatus : Symbol(panglima.fundatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 409, 5))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
@@ -11635,7 +11635,7 @@ module dammermani {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 923, 164))
 
         archeri(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; }
->archeri : Symbol(archeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 923, 343))
+>archeri : Symbol(melanops.archeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 923, 343))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
 >marcanoi : Symbol(howi.marcanoi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 682, 13))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 924, 38))
@@ -11646,7 +11646,7 @@ module dammermani {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 924, 38))
 
         hidalgo(): minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis> { var x: minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis>; () => { var y = this; }; return x; }
->hidalgo : Symbol(hidalgo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 924, 93))
+>hidalgo : Symbol(melanops.hidalgo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 924, 93))
 >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1))
 >inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
@@ -11665,7 +11665,7 @@ module dammermani {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 925, 81))
 
         unicolor(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; }
->unicolor : Symbol(unicolor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 925, 179))
+>unicolor : Symbol(melanops.unicolor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 925, 179))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
 >schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 926, 45))
@@ -11676,7 +11676,7 @@ module dammermani {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 926, 45))
 
         philippii(): nigra.gracilis<sagitta.walkeri, sagitta.stolzmanni> { var x: nigra.gracilis<sagitta.walkeri, sagitta.stolzmanni>; () => { var y = this; }; return x; }
->philippii : Symbol(philippii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 926, 106))
+>philippii : Symbol(melanops.philippii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 926, 106))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >gracilis : Symbol(nigra.gracilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 515, 14))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
@@ -11695,7 +11695,7 @@ module dammermani {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 927, 78))
 
         bocagei(): julianae.albidens<lavali.wilsoni, lavali.thaeleri> { var x: julianae.albidens<lavali.wilsoni, lavali.thaeleri>; () => { var y = this; }; return x; }
->bocagei : Symbol(bocagei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 927, 171))
+>bocagei : Symbol(melanops.bocagei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 927, 171))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >albidens : Symbol(julianae.albidens, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 34, 3))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -11724,7 +11724,7 @@ module argurus {
 >uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14))
 
         aitkeni(): trivirgatus.mixtus<argurus.dauricus<dogramacii.aurata, dammermani.melanops>, panglima.amphibius<lavali.lepturus, quasiater.carolinensis>> { var x: trivirgatus.mixtus<argurus.dauricus<dogramacii.aurata, dammermani.melanops>, panglima.amphibius<lavali.lepturus, quasiater.carolinensis>>; () => { var y = this; }; return x; }
->aitkeni : Symbol(aitkeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 932, 53))
+>aitkeni : Symbol(peninsulae.aitkeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 932, 53))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >mixtus : Symbol(trivirgatus.mixtus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 197, 3))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -11759,7 +11759,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 933, 162))
 
         novaeangliae(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; }
->novaeangliae : Symbol(novaeangliae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 933, 341))
+>novaeangliae : Symbol(peninsulae.novaeangliae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 933, 341))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >xanthognathus : Symbol(lavali.xanthognathus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 285, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 934, 50))
@@ -11770,7 +11770,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 934, 50))
 
         olallae(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; }
->olallae : Symbol(olallae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 934, 112))
+>olallae : Symbol(peninsulae.olallae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 934, 112))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 935, 43))
@@ -11781,7 +11781,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 935, 43))
 
         anselli(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; }
->anselli : Symbol(anselli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 935, 103))
+>anselli : Symbol(peninsulae.anselli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 935, 103))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
 >aurata : Symbol(dogramacii.aurata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 344, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 936, 42))
@@ -11792,7 +11792,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 936, 42))
 
         timminsi(): macrorhinos.konganensis { var x: macrorhinos.konganensis; () => { var y = this; }; return x; }
->timminsi : Symbol(timminsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 936, 101))
+>timminsi : Symbol(peninsulae.timminsi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 936, 101))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
 >konganensis : Symbol(macrorhinos.konganensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 498, 20))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 937, 49))
@@ -11803,7 +11803,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 937, 49))
 
         sordidus(): rendalli.moojeni<macrorhinos.konganensis, gabriellae.echinatus> { var x: rendalli.moojeni<macrorhinos.konganensis, gabriellae.echinatus>; () => { var y = this; }; return x; }
->sordidus : Symbol(sordidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 937, 114))
+>sordidus : Symbol(peninsulae.sordidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 937, 114))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
 >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
@@ -11822,7 +11822,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 938, 89))
 
         telfordi(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; }
->telfordi : Symbol(telfordi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 938, 194))
+>telfordi : Symbol(peninsulae.telfordi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 938, 194))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >oconnelli : Symbol(trivirgatus.oconnelli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 219, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 939, 47))
@@ -11833,7 +11833,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 939, 47))
 
         cavernarum(): minutus.inez<gabriellae.echinatus, argurus.luctuosa> { var x: minutus.inez<gabriellae.echinatus, argurus.luctuosa>; () => { var y = this; }; return x; }
->cavernarum : Symbol(cavernarum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 939, 110))
+>cavernarum : Symbol(peninsulae.cavernarum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 939, 110))
 >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1))
 >inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16))
 >gabriellae : Symbol(gabriellae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 766, 1))
@@ -11861,7 +11861,7 @@ module argurus {
 >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 944, 30))
 
         gravis(): nigra.caucasica<rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi>, dogramacii.kaiseri> { var x: nigra.caucasica<rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi>, dogramacii.kaiseri>; () => { var y = this; }; return x; }
->gravis : Symbol(gravis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 944, 36))
+>gravis : Symbol(netscheri.gravis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 944, 36))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
 >caucasica : Symbol(nigra.caucasica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 763, 14))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
@@ -11888,7 +11888,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 945, 117))
 
         ruschii(): imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>> { var x: imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>; () => { var y = this; }; return x; }
->ruschii : Symbol(ruschii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 945, 252))
+>ruschii : Symbol(netscheri.ruschii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 945, 252))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
 >lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
@@ -11915,7 +11915,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 946, 127))
 
         tricuspidatus(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
->tricuspidatus : Symbol(tricuspidatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 946, 271))
+>tricuspidatus : Symbol(netscheri.tricuspidatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 946, 271))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
 >wilsoni : Symbol(lavali.wilsoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 253, 15))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 947, 45))
@@ -11926,7 +11926,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 947, 45))
 
         fernandezi(): dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, argurus.peninsulae>> { var x: dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, argurus.peninsulae>>; () => { var y = this; }; return x; }
->fernandezi : Symbol(fernandezi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 947, 101))
+>fernandezi : Symbol(netscheri.fernandezi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 947, 101))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
 >siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19))
 >nigra : Symbol(nigra, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 388, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 475, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 514, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 762, 1))
@@ -11961,7 +11961,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 948, 153))
 
         colletti(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; }
->colletti : Symbol(colletti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 948, 320))
+>colletti : Symbol(netscheri.colletti, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 948, 320))
 >samarensis : Symbol(samarensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 531, 1))
 >pallidus : Symbol(samarensis.pallidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 563, 5))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 949, 45))
@@ -11972,7 +11972,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 949, 45))
 
         microbullatus(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; }
->microbullatus : Symbol(microbullatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 949, 106))
+>microbullatus : Symbol(netscheri.microbullatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 949, 106))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
 >schlegeli : Symbol(lutreolus.schlegeli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 356, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 950, 50))
@@ -11983,7 +11983,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 950, 50))
 
         eburneae(): chrysaeolus.sarasinorum<macrorhinos.konganensis, julianae.acariensis> { var x: chrysaeolus.sarasinorum<macrorhinos.konganensis, julianae.acariensis>; () => { var y = this; }; return x; }
->eburneae : Symbol(eburneae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 950, 111))
+>eburneae : Symbol(netscheri.eburneae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 950, 111))
 >chrysaeolus : Symbol(chrysaeolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 602, 1))
 >sarasinorum : Symbol(chrysaeolus.sarasinorum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 603, 20))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
@@ -12002,7 +12002,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 951, 95))
 
         tatei(): argurus.pygmaea<argurus.oreas, panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>> { var x: argurus.pygmaea<argurus.oreas, panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>>; () => { var y = this; }; return x; }
->tatei : Symbol(tatei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 951, 206))
+>tatei : Symbol(netscheri.tatei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 951, 206))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >pygmaea : Symbol(pygmaea, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 596, 16))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -12029,7 +12029,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 952, 121))
 
         millardi(): sagitta.walkeri { var x: sagitta.walkeri; () => { var y = this; }; return x; }
->millardi : Symbol(millardi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 952, 261))
+>millardi : Symbol(netscheri.millardi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 952, 261))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >walkeri : Symbol(sagitta.walkeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 488, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 953, 41))
@@ -12040,7 +12040,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 953, 41))
 
         pruinosus(): trivirgatus.falconeri { var x: trivirgatus.falconeri; () => { var y = this; }; return x; }
->pruinosus : Symbol(pruinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 953, 98))
+>pruinosus : Symbol(netscheri.pruinosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 953, 98))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >falconeri : Symbol(trivirgatus.falconeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 210, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 954, 48))
@@ -12051,7 +12051,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 954, 48))
 
         delator(): argurus.netscheri<dogramacii.kaiseri, lavali.lepturus> { var x: argurus.netscheri<dogramacii.kaiseri, lavali.lepturus>; () => { var y = this; }; return x; }
->delator : Symbol(delator, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 954, 111))
+>delator : Symbol(netscheri.delator, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 954, 111))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >netscheri : Symbol(netscheri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 943, 16))
 >dogramacii : Symbol(dogramacii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 314, 1))
@@ -12070,7 +12070,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 955, 79))
 
         nyikae(): trivirgatus.tumidifrons<howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla>, julianae.acariensis> { var x: trivirgatus.tumidifrons<howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla>, julianae.acariensis>; () => { var y = this; }; return x; }
->nyikae : Symbol(nyikae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 955, 175))
+>nyikae : Symbol(netscheri.nyikae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 955, 175))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >tumidifrons : Symbol(trivirgatus.tumidifrons, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 187, 20))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
@@ -12105,7 +12105,7 @@ module argurus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 956, 167))
 
         ruemmleri(): panglima.amphibius<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>> { var x: panglima.amphibius<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>>; () => { var y = this; }; return x; }
->ruemmleri : Symbol(ruemmleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 956, 352))
+>ruemmleri : Symbol(netscheri.ruemmleri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 956, 352))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17))
 >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1))
@@ -12172,7 +12172,7 @@ module ruatanica {
 >amicus : Symbol(gabriellae.amicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 769, 5))
 
         clara(): panglima.amphibius<imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>, argurus.dauricus<ruatanica.americanus, rionegrensis.caniventer>> { var x: panglima.amphibius<imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>, argurus.dauricus<ruatanica.americanus, rionegrensis.caniventer>>; () => { var y = this; }; return x; }
->clara : Symbol(clara, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 961, 102))
+>clara : Symbol(Praseodymium.clara, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 961, 102))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
@@ -12207,7 +12207,7 @@ module ruatanica {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 962, 168))
 
         spectabilis(): petrophilus.sodyi<rionegrensis.caniventer, quasiater.carolinensis> { var x: petrophilus.sodyi<rionegrensis.caniventer, quasiater.carolinensis>; () => { var y = this; }; return x; }
->spectabilis : Symbol(spectabilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 962, 355))
+>spectabilis : Symbol(Praseodymium.spectabilis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 962, 355))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
 >sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20))
 >rionegrensis : Symbol(rionegrensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 0, 0))
@@ -12226,7 +12226,7 @@ module ruatanica {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 963, 95))
 
         kamensis(): trivirgatus.lotor<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, lavali.lepturus> { var x: trivirgatus.lotor<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, lavali.lepturus>; () => { var y = this; }; return x; }
->kamensis : Symbol(kamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 963, 203))
+>kamensis : Symbol(Praseodymium.kamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 963, 203))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >lotor : Symbol(trivirgatus.lotor, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 206, 3))
 >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1))
@@ -12253,7 +12253,7 @@ module ruatanica {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 964, 123))
 
         ruddi(): lutreolus.foina { var x: lutreolus.foina; () => { var y = this; }; return x; }
->ruddi : Symbol(ruddi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 964, 262))
+>ruddi : Symbol(Praseodymium.ruddi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 964, 262))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
 >foina : Symbol(lutreolus.foina, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 856, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 965, 38))
@@ -12264,7 +12264,7 @@ module ruatanica {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 965, 38))
 
         bartelsii(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; }
->bartelsii : Symbol(bartelsii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 965, 95))
+>bartelsii : Symbol(Praseodymium.bartelsii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 965, 95))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >sumatrana : Symbol(julianae.sumatrana, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 58, 3))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 966, 45))
@@ -12275,7 +12275,7 @@ module ruatanica {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 966, 45))
 
         yerbabuenae(): dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>> { var x: dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>; () => { var y = this; }; return x; }
->yerbabuenae : Symbol(yerbabuenae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 966, 105))
+>yerbabuenae : Symbol(Praseodymium.yerbabuenae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 966, 105))
 >dammermani : Symbol(dammermani, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 591, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 913, 1))
 >siberu : Symbol(dammermani.siberu, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 592, 19))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
@@ -12310,7 +12310,7 @@ module ruatanica {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 967, 173))
 
         davidi(): trivirgatus.mixtus<provocax.melanoleuca, sagitta.stolzmanni> { var x: trivirgatus.mixtus<provocax.melanoleuca, sagitta.stolzmanni>; () => { var y = this; }; return x; }
->davidi : Symbol(davidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 967, 359))
+>davidi : Symbol(Praseodymium.davidi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 967, 359))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
 >mixtus : Symbol(trivirgatus.mixtus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 197, 3))
 >provocax : Symbol(provocax, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 669, 1))
@@ -12329,7 +12329,7 @@ module ruatanica {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 968, 84))
 
         pilirostris(): argurus.wetmorei<imperfecta.lasiurus<panglima.amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>, macrorhinos.konganensis> { var x: argurus.wetmorei<imperfecta.lasiurus<panglima.amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>, macrorhinos.konganensis>; () => { var y = this; }; return x; }
->pilirostris : Symbol(pilirostris, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 968, 186))
+>pilirostris : Symbol(Praseodymium.pilirostris, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 968, 186))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >wetmorei : Symbol(argurus.wetmorei, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 614, 16))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
@@ -12388,7 +12388,7 @@ module ruatanica {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 969, 298))
 
         catherinae(): imperfecta.lasiurus<Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon>, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>> { var x: imperfecta.lasiurus<Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon>, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>; () => { var y = this; }; return x; }
->catherinae : Symbol(catherinae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 969, 609))
+>catherinae : Symbol(Praseodymium.catherinae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 969, 609))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
 >lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
@@ -12423,7 +12423,7 @@ module ruatanica {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 970, 169))
 
         frontata(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; }
->frontata : Symbol(frontata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 970, 352))
+>frontata : Symbol(Praseodymium.frontata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 970, 352))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >oreas : Symbol(argurus.oreas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 625, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 971, 39))
@@ -12434,7 +12434,7 @@ module ruatanica {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 971, 39))
 
         Terbium(): caurinus.mahaganus<julianae.galapagoensis, argurus.luctuosa> { var x: caurinus.mahaganus<julianae.galapagoensis, argurus.luctuosa>; () => { var y = this; }; return x; }
->Terbium : Symbol(Terbium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 971, 94))
+>Terbium : Symbol(Praseodymium.Terbium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 971, 94))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
 >mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
@@ -12453,7 +12453,7 @@ module ruatanica {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 972, 85))
 
         thomensis(): minutus.inez<argurus.oreas, julianae.albidens<argurus.luctuosa, gabriellae.echinatus>> { var x: minutus.inez<argurus.oreas, julianae.albidens<argurus.luctuosa, gabriellae.echinatus>>; () => { var y = this; }; return x; }
->thomensis : Symbol(thomensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 972, 187))
+>thomensis : Symbol(Praseodymium.thomensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 972, 187))
 >minutus : Symbol(minutus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 433, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 492, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 848, 1))
 >inez : Symbol(minutus.inez, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 493, 16))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -12480,7 +12480,7 @@ module ruatanica {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 973, 113))
 
         soricinus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
->soricinus : Symbol(soricinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 973, 241))
+>soricinus : Symbol(Praseodymium.soricinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 973, 241))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
 >carolinensis : Symbol(quasiater.carolinensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 423, 18))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 974, 49))
@@ -12503,7 +12503,7 @@ module caurinus {
 >punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18))
 
         maini(): ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis> { var x: ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis>; () => { var y = this; }; return x; }
->maini : Symbol(maini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 978, 63))
+>maini : Symbol(johorensis.maini, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 978, 63))
 >ruatanica : Symbol(ruatanica, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 100, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 244, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 959, 1))
 >Praseodymium : Symbol(ruatanica.Praseodymium, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 960, 18))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -12529,7 +12529,7 @@ module argurus {
 >luctuosa : Symbol(luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16))
 
         loriae(): rendalli.moojeni<macrorhinos.marmosurus<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>, lutreolus.punicus> { var x: rendalli.moojeni<macrorhinos.marmosurus<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>, lutreolus.punicus>; () => { var y = this; }; return x; }
->loriae : Symbol(loriae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 983, 27))
+>loriae : Symbol(luctuosa.loriae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 983, 27))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
 >moojeni : Symbol(rendalli.moojeni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 168, 3))
 >macrorhinos : Symbol(macrorhinos, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 461, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 497, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 736, 1))
@@ -12581,7 +12581,7 @@ module panamensis {
 >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 988, 30))
 
         duthieae(): caurinus.mahaganus<howi.coludo<argurus.oreas, howi.marcanoi>, dogramacii.aurata> { var x: caurinus.mahaganus<howi.coludo<argurus.oreas, howi.marcanoi>, dogramacii.aurata>; () => { var y = this; }; return x; }
->duthieae : Symbol(duthieae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 988, 36))
+>duthieae : Symbol(setulosus.duthieae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 988, 36))
 >caurinus : Symbol(caurinus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 449, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 836, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 976, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1007, 1))
 >mahaganus : Symbol(caurinus.mahaganus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 450, 17))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
@@ -12608,7 +12608,7 @@ module panamensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 989, 106))
 
         guereza(): howi.coludo<sagitta.stolzmanni, quasiater.carolinensis> { var x: howi.coludo<sagitta.stolzmanni, quasiater.carolinensis>; () => { var y = this; }; return x; }
->guereza : Symbol(guereza, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 989, 228))
+>guereza : Symbol(setulosus.guereza, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 989, 228))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
 >coludo : Symbol(howi.coludo, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 887, 13))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
@@ -12627,7 +12627,7 @@ module panamensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 990, 80))
 
         buselaphus(): daubentonii.nesiotes<trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, dogramacii.koepckeae>, trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus>> { var x: daubentonii.nesiotes<trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, dogramacii.koepckeae>, trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus>>; () => { var y = this; }; return x; }
->buselaphus : Symbol(buselaphus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 990, 177))
+>buselaphus : Symbol(setulosus.buselaphus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 990, 177))
 >daubentonii : Symbol(daubentonii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 471, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 586, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 636, 1))
 >nesiotes : Symbol(daubentonii.nesiotes, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 472, 20))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
@@ -12670,7 +12670,7 @@ module panamensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 991, 199))
 
         nuttalli(): sagitta.cinereus<argurus.netscheri<argurus.luctuosa, julianae.nudicaudus>, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>> { var x: sagitta.cinereus<argurus.netscheri<argurus.luctuosa, julianae.nudicaudus>, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>; () => { var y = this; }; return x; }
->nuttalli : Symbol(nuttalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 991, 412))
+>nuttalli : Symbol(setulosus.nuttalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 991, 412))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >cinereus : Symbol(sagitta.cinereus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 747, 16))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
@@ -12705,7 +12705,7 @@ module panamensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 992, 169))
 
         pelii(): rendalli.crenulata<Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis>, julianae.steerii> { var x: rendalli.crenulata<Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis>, julianae.steerii>; () => { var y = this; }; return x; }
->pelii : Symbol(pelii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 992, 354))
+>pelii : Symbol(setulosus.pelii, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 992, 354))
 >rendalli : Symbol(rendalli, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 151, 1))
 >crenulata : Symbol(rendalli.crenulata, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 180, 3))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
@@ -12732,7 +12732,7 @@ module panamensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 993, 124))
 
         tunneyi(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
->tunneyi : Symbol(tunneyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 993, 267))
+>tunneyi : Symbol(setulosus.tunneyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 993, 267))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
 >stolzmanni : Symbol(sagitta.stolzmanni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 899, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 994, 43))
@@ -12743,7 +12743,7 @@ module panamensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 994, 43))
 
         lamula(): patas.uralensis { var x: patas.uralensis; () => { var y = this; }; return x; }
->lamula : Symbol(lamula, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 994, 103))
+>lamula : Symbol(setulosus.lamula, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 994, 103))
 >patas : Symbol(patas, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 652, 1))
 >uralensis : Symbol(patas.uralensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 653, 14))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 995, 39))
@@ -12754,7 +12754,7 @@ module panamensis {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 995, 39))
 
         vampyrus(): julianae.oralis<lutreolus.foina, provocax.melanoleuca> { var x: julianae.oralis<lutreolus.foina, provocax.melanoleuca>; () => { var y = this; }; return x; }
->vampyrus : Symbol(vampyrus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 995, 96))
+>vampyrus : Symbol(setulosus.vampyrus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 995, 96))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >oralis : Symbol(julianae.oralis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 43, 3))
 >lutreolus : Symbol(lutreolus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 355, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 719, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 855, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 872, 1))
@@ -12782,7 +12782,7 @@ module petrophilus {
 >T1 : Symbol(T1, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1000, 28))
 
         palmeri(): panglima.amphibius<howi.coludo<macrorhinos.daphaenodon, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>, trivirgatus.mixtus<argurus.dauricus<dogramacii.aurata, dammermani.melanops>, panglima.amphibius<lavali.lepturus, quasiater.carolinensis>>> { var x: panglima.amphibius<howi.coludo<macrorhinos.daphaenodon, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>, trivirgatus.mixtus<argurus.dauricus<dogramacii.aurata, dammermani.melanops>, panglima.amphibius<lavali.lepturus, quasiater.carolinensis>>>; () => { var y = this; }; return x; }
->palmeri : Symbol(palmeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1000, 34))
+>palmeri : Symbol(rosalia.palmeri, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1000, 34))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17))
 >howi : Symbol(howi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 466, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 681, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 886, 1))
@@ -12841,7 +12841,7 @@ module petrophilus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1001, 282))
 
         baeops(): Lanthanum.nitidus<lavali.thaeleri, lavali.lepturus> { var x: Lanthanum.nitidus<lavali.thaeleri, lavali.lepturus>; () => { var y = this; }; return x; }
->baeops : Symbol(baeops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1001, 581))
+>baeops : Symbol(rosalia.baeops, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1001, 581))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
 >nitidus : Symbol(Lanthanum.nitidus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 112, 3))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -12860,7 +12860,7 @@ module petrophilus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1002, 75))
 
         ozensis(): imperfecta.lasiurus<panglima.fundatus<gabriellae.amicus, lutreolus.foina>, lutreolus.foina> { var x: imperfecta.lasiurus<panglima.fundatus<gabriellae.amicus, lutreolus.foina>, lutreolus.foina>; () => { var y = this; }; return x; }
->ozensis : Symbol(ozensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1002, 168))
+>ozensis : Symbol(rosalia.ozensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1002, 168))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
 >lasiurus : Symbol(imperfecta.lasiurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 786, 19))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
@@ -12887,7 +12887,7 @@ module petrophilus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1003, 116))
 
         creaghi(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; }
->creaghi : Symbol(creaghi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1003, 249))
+>creaghi : Symbol(rosalia.creaghi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1003, 249))
 >argurus : Symbol(argurus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 373, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 595, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 613, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 624, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 699, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 892, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 930, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 942, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 981, 1))
 >luctuosa : Symbol(argurus.luctuosa, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 982, 16))
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1004, 41))
@@ -12898,7 +12898,7 @@ module petrophilus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1004, 41))
 
         montivaga(): panamensis.setulosus<lavali.beisa, panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus>> { var x: panamensis.setulosus<lavali.beisa, panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus>>; () => { var y = this; }; return x; }
->montivaga : Symbol(montivaga, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1004, 99))
+>montivaga : Symbol(rosalia.montivaga, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1004, 99))
 >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1))
 >setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -12935,7 +12935,7 @@ module caurinus {
 >punicus : Symbol(lutreolus.punicus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 720, 18))
 
         socialis(): panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus> { var x: panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>; () => { var y = this; }; return x; }
->socialis : Symbol(socialis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1009, 53))
+>socialis : Symbol(psilurus.socialis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1009, 53))
 >panglima : Symbol(panglima, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 400, 1))
 >amphibius : Symbol(panglima.amphibius, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 401, 17))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
@@ -12954,7 +12954,7 @@ module caurinus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1010, 86))
 
         lundi(): petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi> { var x: petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>; () => { var y = this; }; return x; }
->lundi : Symbol(lundi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1010, 188))
+>lundi : Symbol(psilurus.lundi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1010, 188))
 >petrophilus : Symbol(petrophilus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 715, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 823, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 998, 1))
 >sodyi : Symbol(petrophilus.sodyi, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 824, 20))
 >trivirgatus : Symbol(trivirgatus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 186, 1))
@@ -12973,7 +12973,7 @@ module caurinus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1011, 85))
 
         araeum(): imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa> { var x: imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>; () => { var y = this; }; return x; }
->araeum : Symbol(araeum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1011, 189))
+>araeum : Symbol(psilurus.araeum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1011, 189))
 >imperfecta : Symbol(imperfecta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 785, 1))
 >ciliolabrum : Symbol(imperfecta.ciliolabrum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 807, 5))
 >quasiater : Symbol(quasiater, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 236, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 422, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 813, 1))
@@ -12992,7 +12992,7 @@ module caurinus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1012, 84))
 
         calamianensis(): julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis> { var x: julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>; () => { var y = this; }; return x; }
->calamianensis : Symbol(calamianensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1012, 186))
+>calamianensis : Symbol(psilurus.calamianensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1012, 186))
 >julianae : Symbol(julianae, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 15, 1))
 >gerbillus : Symbol(julianae.gerbillus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 67, 3))
 >lavali : Symbol(lavali, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 252, 1))
@@ -13011,7 +13011,7 @@ module caurinus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1013, 90))
 
         petersoni(): panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus> { var x: panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus>; () => { var y = this; }; return x; }
->petersoni : Symbol(petersoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1013, 191))
+>petersoni : Symbol(psilurus.petersoni, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1013, 191))
 >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1))
 >setulosus : Symbol(panamensis.setulosus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 987, 19))
 >sagitta : Symbol(sagitta, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 487, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 577, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 675, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 746, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 898, 1))
@@ -13030,7 +13030,7 @@ module caurinus {
 >x : Symbol(x, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1014, 87))
 
         nitela(): panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi> { var x: panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi>; () => { var y = this; }; return x; }
->nitela : Symbol(nitela, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1014, 189))
+>nitela : Symbol(psilurus.nitela, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 1014, 189))
 >panamensis : Symbol(panamensis, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 501, 1), Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 986, 1))
 >linulus : Symbol(panamensis.linulus, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 502, 19))
 >Lanthanum : Symbol(Lanthanum, Decl(resolvingClassDeclarationWhenInBaseTypeResolution.ts, 106, 1))
diff --git a/tests/baselines/reference/restArgAssignmentCompat.errors.txt b/tests/baselines/reference/restArgAssignmentCompat.errors.txt
index c17d28cb28b..5be7e3f8d67 100644
--- a/tests/baselines/reference/restArgAssignmentCompat.errors.txt
+++ b/tests/baselines/reference/restArgAssignmentCompat.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/restArgAssignmentCompat.ts(7,1): error TS2322: Type '(...x: number[]) => void' is not assignable to type '(x: number[], y: string) => void'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type 'number' is not assignable to type 'number[]'.
+    Type 'number[]' is not assignable to type 'number'.
 
 
 ==== tests/cases/compiler/restArgAssignmentCompat.ts (1 errors) ====
@@ -14,6 +14,6 @@ tests/cases/compiler/restArgAssignmentCompat.ts(7,1): error TS2322: Type '(...x:
     ~
 !!! error TS2322: Type '(...x: number[]) => void' is not assignable to type '(x: number[], y: string) => void'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:     Type 'number' is not assignable to type 'number[]'.
+!!! error TS2322:     Type 'number[]' is not assignable to type 'number'.
     n([4], 'foo');
     
\ No newline at end of file
diff --git a/tests/baselines/reference/restElementWithNullInitializer.errors.txt b/tests/baselines/reference/restElementWithNullInitializer.errors.txt
index 7beb7b9a642..4658acc5ff4 100644
--- a/tests/baselines/reference/restElementWithNullInitializer.errors.txt
+++ b/tests/baselines/reference/restElementWithNullInitializer.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/es6/destructuring/restElementWithNullInitializer.ts(1,15): error TS2461: Type 'null' is not an array type.
 tests/cases/conformance/es6/destructuring/restElementWithNullInitializer.ts(4,15): error TS2461: Type 'undefined' is not an array type.
-tests/cases/conformance/es6/destructuring/restElementWithNullInitializer.ts(7,15): error TS2461: Type '{ [x: number]: undefined; }' is not an array type.
+tests/cases/conformance/es6/destructuring/restElementWithNullInitializer.ts(7,15): error TS2461: Type '{}' is not an array type.
 
 
 ==== tests/cases/conformance/es6/destructuring/restElementWithNullInitializer.ts (3 errors) ====
@@ -16,7 +16,7 @@ tests/cases/conformance/es6/destructuring/restElementWithNullInitializer.ts(7,15
     
     function foo3([...r] = {}) {
                   ~~~~~~
-!!! error TS2461: Type '{ [x: number]: undefined; }' is not an array type.
+!!! error TS2461: Type '{}' is not an array type.
     }
     
     function foo4([...r] = []) {
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/restParameterAssignmentCompatibility.symbols b/tests/baselines/reference/restParameterAssignmentCompatibility.symbols
index dd5e7a8fa81..03209d8b1a4 100644
--- a/tests/baselines/reference/restParameterAssignmentCompatibility.symbols
+++ b/tests/baselines/reference/restParameterAssignmentCompatibility.symbols
@@ -3,7 +3,7 @@ class T {
 >T : Symbol(T, Decl(restParameterAssignmentCompatibility.ts, 0, 0))
 
     m(...p3) {
->m : Symbol(m, Decl(restParameterAssignmentCompatibility.ts, 0, 9))
+>m : Symbol(T.m, Decl(restParameterAssignmentCompatibility.ts, 0, 9))
 >p3 : Symbol(p3, Decl(restParameterAssignmentCompatibility.ts, 1, 6))
 
     }
@@ -13,7 +13,7 @@ class S {
 >S : Symbol(S, Decl(restParameterAssignmentCompatibility.ts, 4, 1))
 
     m(p1, p2) {
->m : Symbol(m, Decl(restParameterAssignmentCompatibility.ts, 6, 9))
+>m : Symbol(S.m, Decl(restParameterAssignmentCompatibility.ts, 6, 9))
 >p1 : Symbol(p1, Decl(restParameterAssignmentCompatibility.ts, 7, 6))
 >p2 : Symbol(p2, Decl(restParameterAssignmentCompatibility.ts, 7, 9))
 
@@ -38,7 +38,7 @@ class T1 {
 >T1 : Symbol(T1, Decl(restParameterAssignmentCompatibility.ts, 16, 6))
 
     m(p1?, p2?) {
->m : Symbol(m, Decl(restParameterAssignmentCompatibility.ts, 18, 10))
+>m : Symbol(T1.m, Decl(restParameterAssignmentCompatibility.ts, 18, 10))
 >p1 : Symbol(p1, Decl(restParameterAssignmentCompatibility.ts, 19, 6))
 >p2 : Symbol(p2, Decl(restParameterAssignmentCompatibility.ts, 19, 10))
 
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/returnStatements.symbols b/tests/baselines/reference/returnStatements.symbols
index 7d8b6d69d82..af8aa2af7df 100644
--- a/tests/baselines/reference/returnStatements.symbols
+++ b/tests/baselines/reference/returnStatements.symbols
@@ -18,8 +18,8 @@ function fn5(): boolean { return true; }
 
 function fn6(): Date { return new Date(12); }
 >fn6 : Symbol(fn6, Decl(returnStatements.ts, 5, 40))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function fn7(): any { return null; }
 >fn7 : Symbol(fn7, Decl(returnStatements.ts, 6, 45))
@@ -29,24 +29,24 @@ function fn8(): any { return; } // OK, eq. to 'return undefined'
 
 interface I { id: number }
 >I : Symbol(I, Decl(returnStatements.ts, 8, 31))
->id : Symbol(id, Decl(returnStatements.ts, 10, 13))
+>id : Symbol(I.id, Decl(returnStatements.ts, 10, 13))
 
 class C implements I {
 >C : Symbol(C, Decl(returnStatements.ts, 10, 26))
 >I : Symbol(I, Decl(returnStatements.ts, 8, 31))
 
     id: number;
->id : Symbol(id, Decl(returnStatements.ts, 11, 22))
+>id : Symbol(C.id, Decl(returnStatements.ts, 11, 22))
 
     dispose() {}
->dispose : Symbol(dispose, Decl(returnStatements.ts, 12, 15))
+>dispose : Symbol(C.dispose, Decl(returnStatements.ts, 12, 15))
 }
 class D extends C {
 >D : Symbol(D, Decl(returnStatements.ts, 14, 1))
 >C : Symbol(C, Decl(returnStatements.ts, 10, 26))
 
     name: string;
->name : Symbol(name, Decl(returnStatements.ts, 15, 19))
+>name : Symbol(D.name, Decl(returnStatements.ts, 15, 19))
 }
 function fn10(): I { return { id: 12 }; } 
 >fn10 : Symbol(fn10, Decl(returnStatements.ts, 17, 1))
diff --git a/tests/baselines/reference/returnTypeParameterWithModules.symbols b/tests/baselines/reference/returnTypeParameterWithModules.symbols
index 7f8fab382a3..e3b7c50948f 100644
--- a/tests/baselines/reference/returnTypeParameterWithModules.symbols
+++ b/tests/baselines/reference/returnTypeParameterWithModules.symbols
@@ -12,13 +12,13 @@ module M1 {
 >A : Symbol(A, Decl(returnTypeParameterWithModules.ts, 1, 27))
 
         return Array.prototype.reduce.apply(ar, e ? [f, e] : [f]);
->Array.prototype.reduce.apply : Symbol(Function.apply, Decl(lib.d.ts, --, --))
+>Array.prototype.reduce.apply : Symbol(Function.apply, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Array.prototype.reduce : Symbol(Array.reduce, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Array.prototype : Symbol(ArrayConstructor.prototype, Decl(lib.d.ts, --, --))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >prototype : Symbol(ArrayConstructor.prototype, Decl(lib.d.ts, --, --))
 >reduce : Symbol(Array.reduce, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->apply : Symbol(Function.apply, Decl(lib.d.ts, --, --))
+>apply : Symbol(Function.apply, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >ar : Symbol(ar, Decl(returnTypeParameterWithModules.ts, 1, 30))
 >e : Symbol(e, Decl(returnTypeParameterWithModules.ts, 1, 36))
 >f : Symbol(f, Decl(returnTypeParameterWithModules.ts, 1, 33))
diff --git a/tests/baselines/reference/returnTypeParameterWithModules.types b/tests/baselines/reference/returnTypeParameterWithModules.types
index be09b8f46b0..ffb058daa08 100644
--- a/tests/baselines/reference/returnTypeParameterWithModules.types
+++ b/tests/baselines/reference/returnTypeParameterWithModules.types
@@ -13,13 +13,13 @@ module M1 {
 
         return Array.prototype.reduce.apply(ar, e ? [f, e] : [f]);
 >Array.prototype.reduce.apply(ar, e ? [f, e] : [f]) : any
->Array.prototype.reduce.apply : (thisArg: any, argArray?: any) => any
+>Array.prototype.reduce.apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
 >Array.prototype.reduce : { (callbackfn: (previousValue: any, currentValue: any, currentIndex: number, array: any[]) => any, initialValue?: any): any; <U>(callbackfn: (previousValue: U, currentValue: any, currentIndex: number, array: any[]) => U, initialValue: U): U; }
 >Array.prototype : any[]
 >Array : ArrayConstructor
 >prototype : any[]
 >reduce : { (callbackfn: (previousValue: any, currentValue: any, currentIndex: number, array: any[]) => any, initialValue?: any): any; <U>(callbackfn: (previousValue: U, currentValue: any, currentIndex: number, array: any[]) => U, initialValue: U): U; }
->apply : (thisArg: any, argArray?: any) => any
+>apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
 >ar : any
 >e ? [f, e] : [f] : any[]
 >e : any
diff --git a/tests/baselines/reference/reversedRecusiveTypeInstantiation.symbols b/tests/baselines/reference/reversedRecusiveTypeInstantiation.symbols
index ccb8b01ee78..2078d6c963d 100644
--- a/tests/baselines/reference/reversedRecusiveTypeInstantiation.symbols
+++ b/tests/baselines/reference/reversedRecusiveTypeInstantiation.symbols
@@ -5,15 +5,15 @@ interface A<StringArgPos1, NumberArgPos2> {
 >NumberArgPos2 : Symbol(NumberArgPos2, Decl(reversedRecusiveTypeInstantiation.ts, 0, 26))
 
    xPos1 : StringArgPos1
->xPos1 : Symbol(xPos1, Decl(reversedRecusiveTypeInstantiation.ts, 0, 43))
+>xPos1 : Symbol(A.xPos1, Decl(reversedRecusiveTypeInstantiation.ts, 0, 43))
 >StringArgPos1 : Symbol(StringArgPos1, Decl(reversedRecusiveTypeInstantiation.ts, 0, 12))
 
    yPos2 : NumberArgPos2
->yPos2 : Symbol(yPos2, Decl(reversedRecusiveTypeInstantiation.ts, 1, 24))
+>yPos2 : Symbol(A.yPos2, Decl(reversedRecusiveTypeInstantiation.ts, 1, 24))
 >NumberArgPos2 : Symbol(NumberArgPos2, Decl(reversedRecusiveTypeInstantiation.ts, 0, 26))
 
    zPos2Pos1 : A<NumberArgPos2, StringArgPos1>
->zPos2Pos1 : Symbol(zPos2Pos1, Decl(reversedRecusiveTypeInstantiation.ts, 2, 24))
+>zPos2Pos1 : Symbol(A.zPos2Pos1, Decl(reversedRecusiveTypeInstantiation.ts, 2, 24))
 >A : Symbol(A, Decl(reversedRecusiveTypeInstantiation.ts, 0, 0))
 >NumberArgPos2 : Symbol(NumberArgPos2, Decl(reversedRecusiveTypeInstantiation.ts, 0, 26))
 >StringArgPos1 : Symbol(StringArgPos1, Decl(reversedRecusiveTypeInstantiation.ts, 0, 12))
diff --git a/tests/baselines/reference/scannerClass2.errors.txt b/tests/baselines/reference/scannerClass2.errors.txt
index d808f6fdd59..e7a1765a766 100644
--- a/tests/baselines/reference/scannerClass2.errors.txt
+++ b/tests/baselines/reference/scannerClass2.errors.txt
@@ -1,15 +1,12 @@
-tests/cases/conformance/scanner/ecmascript5/scannerClass2.ts(3,18): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/conformance/scanner/ecmascript5/scannerClass2.ts(3,43): error TS2304: Cannot find name 'ILogger'.
 tests/cases/conformance/scanner/ecmascript5/scannerClass2.ts(4,37): error TS2304: Cannot find name 'ILogger'.
 tests/cases/conformance/scanner/ecmascript5/scannerClass2.ts(5,18): error TS2339: Property '_information' does not exist on type 'LoggerAdapter'.
 
 
-==== tests/cases/conformance/scanner/ecmascript5/scannerClass2.ts (4 errors) ====
+==== tests/cases/conformance/scanner/ecmascript5/scannerClass2.ts (3 errors) ====
     
     
         export class LoggerAdapter implements ILogger {
-                     ~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
                                               ~~~~~~~
 !!! error TS2304: Cannot find name 'ILogger'.
             constructor (public logger: ILogger) { 
diff --git a/tests/baselines/reference/scannerEnum1.errors.txt b/tests/baselines/reference/scannerEnum1.errors.txt
deleted file mode 100644
index d0bbf16743c..00000000000
--- a/tests/baselines/reference/scannerEnum1.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-tests/cases/conformance/scanner/ecmascript5/scannerEnum1.ts(1,17): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-
-
-==== tests/cases/conformance/scanner/ecmascript5/scannerEnum1.ts (1 errors) ====
-        export enum CodeGenTarget {
-                    ~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
-            ES3 = 0,
-            ES5 = 1,
-        }
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerEnum1.symbols b/tests/baselines/reference/scannerEnum1.symbols
new file mode 100644
index 00000000000..cd40e63770f
--- /dev/null
+++ b/tests/baselines/reference/scannerEnum1.symbols
@@ -0,0 +1,10 @@
+=== tests/cases/conformance/scanner/ecmascript5/scannerEnum1.ts ===
+    export enum CodeGenTarget {
+>CodeGenTarget : Symbol(CodeGenTarget, Decl(scannerEnum1.ts, 0, 0))
+
+        ES3 = 0,
+>ES3 : Symbol(CodeGenTarget.ES3, Decl(scannerEnum1.ts, 0, 31))
+
+        ES5 = 1,
+>ES5 : Symbol(CodeGenTarget.ES5, Decl(scannerEnum1.ts, 1, 16))
+    }
diff --git a/tests/baselines/reference/scannerEnum1.types b/tests/baselines/reference/scannerEnum1.types
new file mode 100644
index 00000000000..d75899a75f1
--- /dev/null
+++ b/tests/baselines/reference/scannerEnum1.types
@@ -0,0 +1,12 @@
+=== tests/cases/conformance/scanner/ecmascript5/scannerEnum1.ts ===
+    export enum CodeGenTarget {
+>CodeGenTarget : CodeGenTarget
+
+        ES3 = 0,
+>ES3 : CodeGenTarget
+>0 : number
+
+        ES5 = 1,
+>ES5 : CodeGenTarget
+>1 : number
+    }
diff --git a/tests/baselines/reference/scopeResolutionIdentifiers.symbols b/tests/baselines/reference/scopeResolutionIdentifiers.symbols
index 3ba780b8290..ecabe30534e 100644
--- a/tests/baselines/reference/scopeResolutionIdentifiers.symbols
+++ b/tests/baselines/reference/scopeResolutionIdentifiers.symbols
@@ -50,27 +50,27 @@ class C {
 >C : Symbol(C, Decl(scopeResolutionIdentifiers.ts, 19, 1))
 
     s: Date;
->s : Symbol(s, Decl(scopeResolutionIdentifiers.ts, 21, 9))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>s : Symbol(C.s, Decl(scopeResolutionIdentifiers.ts, 21, 9))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     n = this.s;
->n : Symbol(n, Decl(scopeResolutionIdentifiers.ts, 22, 12))
->this.s : Symbol(s, Decl(scopeResolutionIdentifiers.ts, 21, 9))
+>n : Symbol(C.n, Decl(scopeResolutionIdentifiers.ts, 22, 12))
+>this.s : Symbol(C.s, Decl(scopeResolutionIdentifiers.ts, 21, 9))
 >this : Symbol(C, Decl(scopeResolutionIdentifiers.ts, 19, 1))
->s : Symbol(s, Decl(scopeResolutionIdentifiers.ts, 21, 9))
+>s : Symbol(C.s, Decl(scopeResolutionIdentifiers.ts, 21, 9))
 
     x() {
->x : Symbol(x, Decl(scopeResolutionIdentifiers.ts, 23, 15))
+>x : Symbol(C.x, Decl(scopeResolutionIdentifiers.ts, 23, 15))
 
         var p = this.n;
 >p : Symbol(p, Decl(scopeResolutionIdentifiers.ts, 25, 11), Decl(scopeResolutionIdentifiers.ts, 26, 11))
->this.n : Symbol(n, Decl(scopeResolutionIdentifiers.ts, 22, 12))
+>this.n : Symbol(C.n, Decl(scopeResolutionIdentifiers.ts, 22, 12))
 >this : Symbol(C, Decl(scopeResolutionIdentifiers.ts, 19, 1))
->n : Symbol(n, Decl(scopeResolutionIdentifiers.ts, 22, 12))
+>n : Symbol(C.n, Decl(scopeResolutionIdentifiers.ts, 22, 12))
 
         var p: Date;
 >p : Symbol(p, Decl(scopeResolutionIdentifiers.ts, 25, 11), Decl(scopeResolutionIdentifiers.ts, 26, 11))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
     }
 }
 
diff --git a/tests/baselines/reference/selfInCallback.symbols b/tests/baselines/reference/selfInCallback.symbols
index 805b7714012..97aabd3165f 100644
--- a/tests/baselines/reference/selfInCallback.symbols
+++ b/tests/baselines/reference/selfInCallback.symbols
@@ -3,22 +3,22 @@ class C {
 >C : Symbol(C, Decl(selfInCallback.ts, 0, 0))
 
 	public p1 = 0;
->p1 : Symbol(p1, Decl(selfInCallback.ts, 0, 9))
+>p1 : Symbol(C.p1, Decl(selfInCallback.ts, 0, 9))
 
 	public callback(cb:()=>void) {cb();}
->callback : Symbol(callback, Decl(selfInCallback.ts, 1, 15))
+>callback : Symbol(C.callback, Decl(selfInCallback.ts, 1, 15))
 >cb : Symbol(cb, Decl(selfInCallback.ts, 2, 17))
 >cb : Symbol(cb, Decl(selfInCallback.ts, 2, 17))
 
 	public doit() {
->doit : Symbol(doit, Decl(selfInCallback.ts, 2, 37))
+>doit : Symbol(C.doit, Decl(selfInCallback.ts, 2, 37))
 
 		this.callback(()=>{this.p1+1});
->this.callback : Symbol(callback, Decl(selfInCallback.ts, 1, 15))
+>this.callback : Symbol(C.callback, Decl(selfInCallback.ts, 1, 15))
 >this : Symbol(C, Decl(selfInCallback.ts, 0, 0))
->callback : Symbol(callback, Decl(selfInCallback.ts, 1, 15))
->this.p1 : Symbol(p1, Decl(selfInCallback.ts, 0, 9))
+>callback : Symbol(C.callback, Decl(selfInCallback.ts, 1, 15))
+>this.p1 : Symbol(C.p1, Decl(selfInCallback.ts, 0, 9))
 >this : Symbol(C, Decl(selfInCallback.ts, 0, 0))
->p1 : Symbol(p1, Decl(selfInCallback.ts, 0, 9))
+>p1 : Symbol(C.p1, Decl(selfInCallback.ts, 0, 9))
 	}
 }
diff --git a/tests/baselines/reference/selfInLambdas.symbols b/tests/baselines/reference/selfInLambdas.symbols
index 032de5e7767..edcc03b6bf6 100644
--- a/tests/baselines/reference/selfInLambdas.symbols
+++ b/tests/baselines/reference/selfInLambdas.symbols
@@ -3,10 +3,10 @@ interface MouseEvent {
 >MouseEvent : Symbol(MouseEvent, Decl(selfInLambdas.ts, 0, 0))
 
     x: number;
->x : Symbol(x, Decl(selfInLambdas.ts, 0, 22))
+>x : Symbol(MouseEvent.x, Decl(selfInLambdas.ts, 0, 22))
 
     y: number;
->y : Symbol(y, Decl(selfInLambdas.ts, 1, 14))
+>y : Symbol(MouseEvent.y, Decl(selfInLambdas.ts, 1, 14))
 }
 
 declare var window: Window;
@@ -17,7 +17,7 @@ interface Window {
 >Window : Symbol(Window, Decl(selfInLambdas.ts, 5, 27))
 
     onmousemove: (ev: MouseEvent) => any;
->onmousemove : Symbol(onmousemove, Decl(selfInLambdas.ts, 6, 18))
+>onmousemove : Symbol(Window.onmousemove, Decl(selfInLambdas.ts, 6, 18))
 >ev : Symbol(ev, Decl(selfInLambdas.ts, 7, 18))
 >MouseEvent : Symbol(MouseEvent, Decl(selfInLambdas.ts, 0, 0))
     
@@ -52,28 +52,28 @@ class X {
 >X : Symbol(X, Decl(selfInLambdas.ts, 24, 1))
 
 	private value = "value";
->value : Symbol(value, Decl(selfInLambdas.ts, 28, 9))
+>value : Symbol(X.value, Decl(selfInLambdas.ts, 28, 9))
 
 	public foo() {
->foo : Symbol(foo, Decl(selfInLambdas.ts, 29, 25))
+>foo : Symbol(X.foo, Decl(selfInLambdas.ts, 29, 25))
 
 		var outer= () => {
 >outer : Symbol(outer, Decl(selfInLambdas.ts, 32, 5))
 
             var x = this.value;
 >x : Symbol(x, Decl(selfInLambdas.ts, 33, 15))
->this.value : Symbol(value, Decl(selfInLambdas.ts, 28, 9))
+>this.value : Symbol(X.value, Decl(selfInLambdas.ts, 28, 9))
 >this : Symbol(X, Decl(selfInLambdas.ts, 24, 1))
->value : Symbol(value, Decl(selfInLambdas.ts, 28, 9))
+>value : Symbol(X.value, Decl(selfInLambdas.ts, 28, 9))
 
             var inner = () => {
 >inner : Symbol(inner, Decl(selfInLambdas.ts, 34, 15))
 
                 var y = this.value;
 >y : Symbol(y, Decl(selfInLambdas.ts, 35, 19))
->this.value : Symbol(value, Decl(selfInLambdas.ts, 28, 9))
+>this.value : Symbol(X.value, Decl(selfInLambdas.ts, 28, 9))
 >this : Symbol(X, Decl(selfInLambdas.ts, 24, 1))
->value : Symbol(value, Decl(selfInLambdas.ts, 28, 9))
+>value : Symbol(X.value, Decl(selfInLambdas.ts, 28, 9))
 			}
 
 			inner();
diff --git a/tests/baselines/reference/shorthand-property-es5-es6.errors.txt b/tests/baselines/reference/shorthand-property-es5-es6.errors.txt
new file mode 100644
index 00000000000..f491dfbaabe
--- /dev/null
+++ b/tests/baselines/reference/shorthand-property-es5-es6.errors.txt
@@ -0,0 +1,13 @@
+error TS1204: Cannot compile modules into 'es2015' when targeting 'ES5' or lower.
+tests/cases/compiler/test.ts(2,19): error TS2307: Cannot find module './foo'.
+
+
+!!! error TS1204: Cannot compile modules into 'es2015' when targeting 'ES5' or lower.
+==== tests/cases/compiler/test.ts (1 errors) ====
+    
+    import {foo} from './foo';
+                      ~~~~~~~
+!!! error TS2307: Cannot find module './foo'.
+    const baz = 42;
+    const bar = { foo, baz };
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/shorthand-property-es5-es6.js b/tests/baselines/reference/shorthand-property-es5-es6.js
new file mode 100644
index 00000000000..cbca92adb0c
--- /dev/null
+++ b/tests/baselines/reference/shorthand-property-es5-es6.js
@@ -0,0 +1,14 @@
+//// [test.ts]
+
+import {foo} from './foo';
+const baz = 42;
+const bar = { foo, baz };
+
+
+//// [test.js]
+import { foo } from './foo';
+var baz = 42;
+var bar = { foo: foo, baz: baz };
+
+
+//// [test.d.ts]
diff --git a/tests/baselines/reference/shorthand-property-es6-amd.errors.txt b/tests/baselines/reference/shorthand-property-es6-amd.errors.txt
new file mode 100644
index 00000000000..e54f73a4e61
--- /dev/null
+++ b/tests/baselines/reference/shorthand-property-es6-amd.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/compiler/test.ts(2,19): error TS2307: Cannot find module './foo'.
+
+
+==== tests/cases/compiler/test.ts (1 errors) ====
+    
+    import {foo} from './foo';
+                      ~~~~~~~
+!!! error TS2307: Cannot find module './foo'.
+    const baz = 42;
+    const bar = { foo, baz };
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/shorthand-property-es6-amd.js b/tests/baselines/reference/shorthand-property-es6-amd.js
new file mode 100644
index 00000000000..383d5d99e9e
--- /dev/null
+++ b/tests/baselines/reference/shorthand-property-es6-amd.js
@@ -0,0 +1,16 @@
+//// [test.ts]
+
+import {foo} from './foo';
+const baz = 42;
+const bar = { foo, baz };
+
+
+//// [test.js]
+define(["require", "exports", "./foo"], function (require, exports, foo_1) {
+    "use strict";
+    const baz = 42;
+    const bar = { foo: foo_1.foo, baz };
+});
+
+
+//// [test.d.ts]
diff --git a/tests/baselines/reference/shorthand-property-es6-es6.errors.txt b/tests/baselines/reference/shorthand-property-es6-es6.errors.txt
new file mode 100644
index 00000000000..e54f73a4e61
--- /dev/null
+++ b/tests/baselines/reference/shorthand-property-es6-es6.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/compiler/test.ts(2,19): error TS2307: Cannot find module './foo'.
+
+
+==== tests/cases/compiler/test.ts (1 errors) ====
+    
+    import {foo} from './foo';
+                      ~~~~~~~
+!!! error TS2307: Cannot find module './foo'.
+    const baz = 42;
+    const bar = { foo, baz };
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/shorthand-property-es6-es6.js b/tests/baselines/reference/shorthand-property-es6-es6.js
new file mode 100644
index 00000000000..eff67c879cc
--- /dev/null
+++ b/tests/baselines/reference/shorthand-property-es6-es6.js
@@ -0,0 +1,14 @@
+//// [test.ts]
+
+import {foo} from './foo';
+const baz = 42;
+const bar = { foo, baz };
+
+
+//// [test.js]
+import { foo } from './foo';
+const baz = 42;
+const bar = { foo, baz };
+
+
+//// [test.d.ts]
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/sigantureIsSubTypeIfTheyAreIdentical.symbols b/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.symbols
index e99f0076d39..9f8d22c1f6f 100644
--- a/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.symbols
+++ b/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.symbols
@@ -3,7 +3,7 @@ interface ICache {
 >ICache : Symbol(ICache, Decl(sigantureIsSubTypeIfTheyAreIdentical.ts, 0, 0))
 
     get<T>(key: string): T;
->get : Symbol(get, Decl(sigantureIsSubTypeIfTheyAreIdentical.ts, 0, 18))
+>get : Symbol(ICache.get, Decl(sigantureIsSubTypeIfTheyAreIdentical.ts, 0, 18))
 >T : Symbol(T, Decl(sigantureIsSubTypeIfTheyAreIdentical.ts, 1, 8))
 >key : Symbol(key, Decl(sigantureIsSubTypeIfTheyAreIdentical.ts, 1, 11))
 >T : Symbol(T, Decl(sigantureIsSubTypeIfTheyAreIdentical.ts, 1, 8))
@@ -13,7 +13,7 @@ class CacheService implements ICache { // Should not error that property type of
 >ICache : Symbol(ICache, Decl(sigantureIsSubTypeIfTheyAreIdentical.ts, 0, 0))
 
     get<T>(key: string): T {
->get : Symbol(get, Decl(sigantureIsSubTypeIfTheyAreIdentical.ts, 3, 38))
+>get : Symbol(CacheService.get, Decl(sigantureIsSubTypeIfTheyAreIdentical.ts, 3, 38))
 >T : Symbol(T, Decl(sigantureIsSubTypeIfTheyAreIdentical.ts, 4, 8))
 >key : Symbol(key, Decl(sigantureIsSubTypeIfTheyAreIdentical.ts, 4, 11))
 >T : Symbol(T, Decl(sigantureIsSubTypeIfTheyAreIdentical.ts, 4, 8))
diff --git a/tests/baselines/reference/sourceMap-Comments.symbols b/tests/baselines/reference/sourceMap-Comments.symbols
index d7c1adabbb0..490042b4c89 100644
--- a/tests/baselines/reference/sourceMap-Comments.symbols
+++ b/tests/baselines/reference/sourceMap-Comments.symbols
@@ -7,7 +7,7 @@ module sas.tools {
 >Test : Symbol(Test, Decl(sourceMap-Comments.ts, 0, 18))
 
         public doX(): void {
->doX : Symbol(doX, Decl(sourceMap-Comments.ts, 1, 23))
+>doX : Symbol(Test.doX, Decl(sourceMap-Comments.ts, 1, 23))
 
             let f: number = 2;
 >f : Symbol(f, Decl(sourceMap-Comments.ts, 3, 15))
diff --git a/tests/baselines/reference/sourceMap-FileWithComments.js.map b/tests/baselines/reference/sourceMap-FileWithComments.js.map
index 80437501d33..0cffa405b40 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;QAItE,YAAC;IAAD,CAAC,AATD;IAOI,gBAAgB;IACT,YAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAClC;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,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;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 2abfabff566..922e8ae1b83 100644
--- a/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt
+++ b/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt
@@ -334,8 +334,7 @@ sourceFile:sourceMap-FileWithComments.ts
 8 >                              , 
 9 >                                0
 10>                                 )
-11>                                  ;
-  >                                      }
+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)
@@ -346,7 +345,7 @@ sourceFile:sourceMap-FileWithComments.ts
 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(20, 6) + SourceIndex(0)
+11>Emitted(16, 36) Source(19, 41) + SourceIndex(0)
 ---
 >>>    Shapes.Point = Point;
 1 >^^^^
diff --git a/tests/baselines/reference/sourceMap-FileWithComments.symbols b/tests/baselines/reference/sourceMap-FileWithComments.symbols
index 50993547428..e7b8c1c4b7c 100644
--- a/tests/baselines/reference/sourceMap-FileWithComments.symbols
+++ b/tests/baselines/reference/sourceMap-FileWithComments.symbols
@@ -5,7 +5,7 @@ interface IPoint {
 >IPoint : Symbol(IPoint, Decl(sourceMap-FileWithComments.ts, 0, 0))
 
     getDist(): number;
->getDist : Symbol(getDist, Decl(sourceMap-FileWithComments.ts, 2, 18))
+>getDist : Symbol(IPoint.getDist, Decl(sourceMap-FileWithComments.ts, 2, 18))
 }
 
 // Module
@@ -19,27 +19,27 @@ module Shapes {
 
         // Constructor
         constructor(public x: number, public y: number) { }
->x : Symbol(x, Decl(sourceMap-FileWithComments.ts, 12, 20))
->y : Symbol(y, Decl(sourceMap-FileWithComments.ts, 12, 37))
+>x : Symbol(Point.x, Decl(sourceMap-FileWithComments.ts, 12, 20))
+>y : Symbol(Point.y, Decl(sourceMap-FileWithComments.ts, 12, 37))
 
         // Instance member
         getDist() { return Math.sqrt(this.x * this.x + this.y * this.y); }
->getDist : Symbol(getDist, Decl(sourceMap-FileWithComments.ts, 12, 59))
+>getDist : Symbol(Point.getDist, Decl(sourceMap-FileWithComments.ts, 12, 59))
 >Math.sqrt : Symbol(Math.sqrt, Decl(lib.d.ts, --, --))
 >Math : Symbol(Math, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >sqrt : Symbol(Math.sqrt, Decl(lib.d.ts, --, --))
->this.x : Symbol(x, Decl(sourceMap-FileWithComments.ts, 12, 20))
+>this.x : Symbol(Point.x, Decl(sourceMap-FileWithComments.ts, 12, 20))
 >this : Symbol(Point, Decl(sourceMap-FileWithComments.ts, 7, 15))
->x : Symbol(x, Decl(sourceMap-FileWithComments.ts, 12, 20))
->this.x : Symbol(x, Decl(sourceMap-FileWithComments.ts, 12, 20))
+>x : Symbol(Point.x, Decl(sourceMap-FileWithComments.ts, 12, 20))
+>this.x : Symbol(Point.x, Decl(sourceMap-FileWithComments.ts, 12, 20))
 >this : Symbol(Point, Decl(sourceMap-FileWithComments.ts, 7, 15))
->x : Symbol(x, Decl(sourceMap-FileWithComments.ts, 12, 20))
->this.y : Symbol(y, Decl(sourceMap-FileWithComments.ts, 12, 37))
+>x : Symbol(Point.x, Decl(sourceMap-FileWithComments.ts, 12, 20))
+>this.y : Symbol(Point.y, Decl(sourceMap-FileWithComments.ts, 12, 37))
 >this : Symbol(Point, Decl(sourceMap-FileWithComments.ts, 7, 15))
->y : Symbol(y, Decl(sourceMap-FileWithComments.ts, 12, 37))
->this.y : Symbol(y, Decl(sourceMap-FileWithComments.ts, 12, 37))
+>y : Symbol(Point.y, Decl(sourceMap-FileWithComments.ts, 12, 37))
+>this.y : Symbol(Point.y, Decl(sourceMap-FileWithComments.ts, 12, 37))
 >this : Symbol(Point, Decl(sourceMap-FileWithComments.ts, 7, 15))
->y : Symbol(y, Decl(sourceMap-FileWithComments.ts, 12, 37))
+>y : Symbol(Point.y, Decl(sourceMap-FileWithComments.ts, 12, 37))
 
         // Static member
         static origin = new Point(0, 0);
diff --git a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.symbols b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.symbols
index 96d39301090..3b1d95afc00 100644
--- a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.symbols
+++ b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.symbols
@@ -7,7 +7,7 @@ interface Window {
 >Window : Symbol(Window, Decl(sourceMap-StringLiteralWithNewLine.ts, 2, 1))
 
     document: Document;
->document : Symbol(document, Decl(sourceMap-StringLiteralWithNewLine.ts, 3, 18))
+>document : Symbol(Window.document, Decl(sourceMap-StringLiteralWithNewLine.ts, 3, 18))
 >Document : Symbol(Document, Decl(sourceMap-StringLiteralWithNewLine.ts, 0, 0))
 }
 declare var window: Window;
diff --git a/tests/baselines/reference/sourceMapValidationClass.symbols b/tests/baselines/reference/sourceMapValidationClass.symbols
index 28c2e1efe1a..1a5e244586f 100644
--- a/tests/baselines/reference/sourceMapValidationClass.symbols
+++ b/tests/baselines/reference/sourceMapValidationClass.symbols
@@ -3,47 +3,47 @@ class Greeter {
 >Greeter : Symbol(Greeter, Decl(sourceMapValidationClass.ts, 0, 0))
 
     constructor(public greeting: string, ...b: string[]) {
->greeting : Symbol(greeting, Decl(sourceMapValidationClass.ts, 1, 16))
+>greeting : Symbol(Greeter.greeting, Decl(sourceMapValidationClass.ts, 1, 16))
 >b : Symbol(b, Decl(sourceMapValidationClass.ts, 1, 40))
     }
     greet() {
->greet : Symbol(greet, Decl(sourceMapValidationClass.ts, 2, 5))
+>greet : Symbol(Greeter.greet, Decl(sourceMapValidationClass.ts, 2, 5))
 
         return "<h1>" + this.greeting + "</h1>";
->this.greeting : Symbol(greeting, Decl(sourceMapValidationClass.ts, 1, 16))
+>this.greeting : Symbol(Greeter.greeting, Decl(sourceMapValidationClass.ts, 1, 16))
 >this : Symbol(Greeter, Decl(sourceMapValidationClass.ts, 0, 0))
->greeting : Symbol(greeting, Decl(sourceMapValidationClass.ts, 1, 16))
+>greeting : Symbol(Greeter.greeting, Decl(sourceMapValidationClass.ts, 1, 16))
     }
     private x: string;
->x : Symbol(x, Decl(sourceMapValidationClass.ts, 5, 5))
+>x : Symbol(Greeter.x, Decl(sourceMapValidationClass.ts, 5, 5))
 
     private x1: number = 10;
->x1 : Symbol(x1, Decl(sourceMapValidationClass.ts, 6, 22))
+>x1 : Symbol(Greeter.x1, Decl(sourceMapValidationClass.ts, 6, 22))
 
     private fn() {
->fn : Symbol(fn, Decl(sourceMapValidationClass.ts, 7, 28))
+>fn : Symbol(Greeter.fn, Decl(sourceMapValidationClass.ts, 7, 28))
 
         return this.greeting;
->this.greeting : Symbol(greeting, Decl(sourceMapValidationClass.ts, 1, 16))
+>this.greeting : Symbol(Greeter.greeting, Decl(sourceMapValidationClass.ts, 1, 16))
 >this : Symbol(Greeter, Decl(sourceMapValidationClass.ts, 0, 0))
->greeting : Symbol(greeting, Decl(sourceMapValidationClass.ts, 1, 16))
+>greeting : Symbol(Greeter.greeting, Decl(sourceMapValidationClass.ts, 1, 16))
     }
     get greetings() {
->greetings : Symbol(greetings, Decl(sourceMapValidationClass.ts, 10, 5), Decl(sourceMapValidationClass.ts, 13, 5))
+>greetings : Symbol(Greeter.greetings, Decl(sourceMapValidationClass.ts, 10, 5), Decl(sourceMapValidationClass.ts, 13, 5))
 
         return this.greeting;
->this.greeting : Symbol(greeting, Decl(sourceMapValidationClass.ts, 1, 16))
+>this.greeting : Symbol(Greeter.greeting, Decl(sourceMapValidationClass.ts, 1, 16))
 >this : Symbol(Greeter, Decl(sourceMapValidationClass.ts, 0, 0))
->greeting : Symbol(greeting, Decl(sourceMapValidationClass.ts, 1, 16))
+>greeting : Symbol(Greeter.greeting, Decl(sourceMapValidationClass.ts, 1, 16))
     }
     set greetings(greetings: string) {
->greetings : Symbol(greetings, Decl(sourceMapValidationClass.ts, 10, 5), Decl(sourceMapValidationClass.ts, 13, 5))
+>greetings : Symbol(Greeter.greetings, Decl(sourceMapValidationClass.ts, 10, 5), Decl(sourceMapValidationClass.ts, 13, 5))
 >greetings : Symbol(greetings, Decl(sourceMapValidationClass.ts, 14, 18))
 
         this.greeting = greetings;
->this.greeting : Symbol(greeting, Decl(sourceMapValidationClass.ts, 1, 16))
+>this.greeting : Symbol(Greeter.greeting, Decl(sourceMapValidationClass.ts, 1, 16))
 >this : Symbol(Greeter, Decl(sourceMapValidationClass.ts, 0, 0))
->greeting : Symbol(greeting, Decl(sourceMapValidationClass.ts, 1, 16))
+>greeting : Symbol(Greeter.greeting, Decl(sourceMapValidationClass.ts, 1, 16))
 >greetings : Symbol(greetings, Decl(sourceMapValidationClass.ts, 14, 18))
     }
 }
diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.symbols b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.symbols
index 416e02b3990..dfa9a7bc045 100644
--- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.symbols
+++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.symbols
@@ -3,8 +3,8 @@ class Greeter {
 >Greeter : Symbol(Greeter, Decl(sourceMapValidationClassWithDefaultConstructor.ts, 0, 0))
 
     public a = 10;
->a : Symbol(a, Decl(sourceMapValidationClassWithDefaultConstructor.ts, 0, 15))
+>a : Symbol(Greeter.a, Decl(sourceMapValidationClassWithDefaultConstructor.ts, 0, 15))
 
     public nameA = "Ten";
->nameA : Symbol(nameA, Decl(sourceMapValidationClassWithDefaultConstructor.ts, 1, 18))
+>nameA : Symbol(Greeter.nameA, Decl(sourceMapValidationClassWithDefaultConstructor.ts, 1, 18))
 }
diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.symbols b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.symbols
index 44612abacbb..cb7f70706ec 100644
--- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.symbols
+++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.symbols
@@ -3,11 +3,11 @@ class Greeter {
 >Greeter : Symbol(Greeter, Decl(sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.ts, 0, 0))
 
     public a = 10;
->a : Symbol(a, Decl(sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.ts, 0, 15))
+>a : Symbol(Greeter.a, Decl(sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.ts, 0, 15))
 
     public returnA = () => this.a;
->returnA : Symbol(returnA, Decl(sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.ts, 1, 18))
->this.a : Symbol(a, Decl(sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.ts, 0, 15))
+>returnA : Symbol(Greeter.returnA, Decl(sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.ts, 1, 18))
+>this.a : Symbol(Greeter.a, Decl(sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.ts, 0, 15))
 >this : Symbol(Greeter, Decl(sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.ts, 0, 0))
->a : Symbol(a, Decl(sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.ts, 0, 15))
+>a : Symbol(Greeter.a, Decl(sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.ts, 0, 15))
 }
diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.symbols b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.symbols
index 0fafe3ecdc0..7ff0c061a26 100644
--- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.symbols
+++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.symbols
@@ -8,8 +8,8 @@ class Greeter extends AbstractGreeter {
 >AbstractGreeter : Symbol(AbstractGreeter, Decl(sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts, 0, 0))
 
     public a = 10;
->a : Symbol(a, Decl(sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts, 3, 39))
+>a : Symbol(Greeter.a, Decl(sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts, 3, 39))
 
     public nameA = "Ten";
->nameA : Symbol(nameA, Decl(sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts, 4, 18))
+>nameA : Symbol(Greeter.nameA, Decl(sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts, 4, 18))
 }
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..128ea62bb68 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,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,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..cc3755d11d0 100644
--- a/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt
@@ -444,7 +444,6 @@ sourceFile:sourceMapValidationClasses.ts
 4 >                             ^^^^^^^^^^^^^^^^^^^^^^
 5 >                                                   ^
 6 >                                                    ^^^^
-7 >                                                        ^^^^^^^^^^^^^^^^^^^->
 1->
 2 >                 ...restGreetings /* more greeting */: string[]
 3 >                            
@@ -458,19 +457,13 @@ sourceFile:sourceMapValidationClasses.ts
 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/sourceMapValidationClasses.symbols b/tests/baselines/reference/sourceMapValidationClasses.symbols
index 8608cd4ed21..3386730e4f9 100644
--- a/tests/baselines/reference/sourceMapValidationClasses.symbols
+++ b/tests/baselines/reference/sourceMapValidationClasses.symbols
@@ -9,16 +9,16 @@ module Foo.Bar {
 >Greeter : Symbol(Greeter, Decl(sourceMapValidationClasses.ts, 1, 17))
 
         constructor(public greeting: string) {
->greeting : Symbol(greeting, Decl(sourceMapValidationClasses.ts, 4, 20))
+>greeting : Symbol(Greeter.greeting, Decl(sourceMapValidationClasses.ts, 4, 20))
         }
 
         greet() {
->greet : Symbol(greet, Decl(sourceMapValidationClasses.ts, 5, 9))
+>greet : Symbol(Greeter.greet, Decl(sourceMapValidationClasses.ts, 5, 9))
 
             return "<h1>" + this.greeting + "</h1>";
->this.greeting : Symbol(greeting, Decl(sourceMapValidationClasses.ts, 4, 20))
+>this.greeting : Symbol(Greeter.greeting, Decl(sourceMapValidationClasses.ts, 4, 20))
 >this : Symbol(Greeter, Decl(sourceMapValidationClasses.ts, 1, 17))
->greeting : Symbol(greeting, Decl(sourceMapValidationClasses.ts, 4, 20))
+>greeting : Symbol(Greeter.greeting, Decl(sourceMapValidationClasses.ts, 4, 20))
         }
     }
 
diff --git a/tests/baselines/reference/sourceMapValidationDecorators.js.map b/tests/baselines/reference/sourceMapValidationDecorators.js.map
index 18b24ddf37e..04a582a72b5 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;IAQL,cAAC;AAAD,CAAC,AA5CD;AAuBmB,UAAE,GAAW,EAAE,CAAC;AAZ/B;IAAC,kBAAkB;IAClB,kBAAkB,CAAC,EAAE,CAAC;oCAAA;AAKvB;IAAC,kBAAkB;IAClB,kBAAkB,CAAC,EAAE,CAAC;kCAAA;AAQrB;eAAC,mBAAmB;eACnB,mBAAmB,CAAC,EAAE,CAAC;iCAAA;AAK1B;IAAC,kBAAkB;IAClB,kBAAkB,CAAC,EAAE,CAAC;eAMpB,mBAAmB;eACnB,mBAAmB,CAAC,EAAE,CAAC;wCAPH;AAZvB;IAAC,kBAAkB;IAClB,kBAAkB,CAAC,EAAE,CAAC;yBAAA;AAxB3B;IAAC,eAAe;IACf,eAAe,CAAC,EAAE,CAAC;eAGb,mBAAmB;eACnB,mBAAmB,CAAC,EAAE,CAAC;eAGvB,mBAAmB;eACnB,mBAAmB,CAAC,EAAE,CAAC;WARV;AA6CnB"}
\ No newline at end of file
+{"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;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 58b5eaefc7c..29dcb496ecb 100644
--- a/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt
@@ -380,13 +380,60 @@ sourceFile:sourceMapValidationDecorators.ts
 1 >
 2 >^
 3 > 
-4 > ^^^^^^^^^^^^^^^^->
+4 > ^^^^
+5 >     ^^^^^^^^^^^^->
 1 >
 2 >}
 3 > 
+4 > 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 
+  >       @ParameterDecorator2(90) 
+  >       greetings: string) {
+  >         this.greeting = greetings;
+  >     }    
+  > }
 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->
@@ -394,30 +441,7 @@ sourceFile:sourceMapValidationDecorators.ts
 3 >          ^^^
 4 >             ^^
 5 >               ^
-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 
+1->
 2 >x1
 3 >          : number = 
 4 >             10
@@ -432,13 +456,13 @@ sourceFile:sourceMapValidationDecorators.ts
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(37, 1) Source(21, 5) + SourceIndex(0)
+1 >Emitted(37, 1) Source(23, 5) + SourceIndex(0)
 ---
 >>>    PropertyDecorator1,
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^
 3 >                      ^^^^^->
-1->@
+1->
 2 >    PropertyDecorator1
 1->Emitted(38, 5) Source(21, 6) + SourceIndex(0)
 2 >Emitted(38, 23) Source(21, 24) + SourceIndex(0)
@@ -464,25 +488,27 @@ sourceFile:sourceMapValidationDecorators.ts
 ---
 >>>], Greeter.prototype, "greet", null);
 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->
-1->Emitted(40, 37) Source(22, 28) + SourceIndex(0)
+1->
+  >    greet() {
+  >        return "<h1>" + this.greeting + "</h1>";
+  >    }
+1->Emitted(40, 37) Source(25, 6) + SourceIndex(0)
 ---
 >>>__decorate([
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-  >    greet() {
-  >        return "<h1>" + this.greeting + "</h1>";
-  >    }
   >
+  >    @PropertyDecorator1
+  >    @PropertyDecorator2(50)
   >    
-1 >Emitted(41, 1) Source(27, 5) + SourceIndex(0)
+1 >Emitted(41, 1) Source(29, 5) + SourceIndex(0)
 ---
 >>>    PropertyDecorator1,
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^
 3 >                      ^^^^^->
-1->@
+1->
 2 >    PropertyDecorator1
 1->Emitted(42, 5) Source(27, 6) + SourceIndex(0)
 2 >Emitted(42, 23) Source(27, 24) + SourceIndex(0)
@@ -508,71 +534,85 @@ sourceFile:sourceMapValidationDecorators.ts
 ---
 >>>], Greeter.prototype, "x", void 0);
 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->
-1->Emitted(44, 35) Source(28, 28) + SourceIndex(0)
+1->
+  >    private x: string;
+1->Emitted(44, 35) Source(29, 23) + SourceIndex(0)
 ---
 >>>__decorate([
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-  >    private x: string;
   >
   >    @PropertyDecorator1
   >    @PropertyDecorator2(60)
   >    private static x1: number = 10;
   >    
-  >    private fn(
-  >      
-1 >Emitted(45, 1) Source(36, 7) + SourceIndex(0)
+  >    
+1 >Emitted(45, 1) Source(35, 5) + SourceIndex(0)
 ---
 >>>    __param(0, ParameterDecorator1),
-1->^^^^^^^^^^^^^^^
-2 >               ^^^^^^^^^^^^^^^^^^^
-3 >                                  ^^^^^^->
-1->@
-2 >               ParameterDecorator1
-1->Emitted(46, 16) Source(36, 8) + SourceIndex(0)
-2 >Emitted(46, 35) Source(36, 27) + SourceIndex(0)
+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 >                                     ^
+1->^^^^
+2 >    ^^^^^^^^^^^
+3 >               ^^^^^^^^^^^^^^^^^^^
+4 >                                  ^
+5 >                                   ^^
+6 >                                     ^
+7 >                                      ^
 1-> 
   >      @
-2 >               ParameterDecorator2
-3 >                                  (
-4 >                                   70
-5 >                                     )
-1->Emitted(47, 16) Source(37, 8) + SourceIndex(0)
-2 >Emitted(47, 35) Source(37, 27) + SourceIndex(0)
-3 >Emitted(47, 36) Source(37, 28) + SourceIndex(0)
-4 >Emitted(47, 38) Source(37, 30) + SourceIndex(0)
-5 >Emitted(47, 39) Source(37, 31) + SourceIndex(0)
+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 >
-1 >Emitted(48, 34) Source(37, 31) + SourceIndex(0)
+1 > 
+  >      x: number) {
+  >        return this.greeting;
+  >    }
+1 >Emitted(48, 34) Source(40, 6) + SourceIndex(0)
 ---
 >>>__decorate([
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^->
-1 > 
-  >      x: number) {
-  >        return this.greeting;
-  >    }
+1 >
   >
+  >    @PropertyDecorator1
+  >    @PropertyDecorator2(80)
   >    
-1 >Emitted(49, 1) Source(42, 5) + SourceIndex(0)
+1 >Emitted(49, 1) Source(44, 5) + SourceIndex(0)
 ---
 >>>    PropertyDecorator1,
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^
 3 >                      ^^^^^^->
-1->@
+1->
 2 >    PropertyDecorator1
 1->Emitted(50, 5) Source(42, 6) + SourceIndex(0)
 2 >Emitted(50, 23) Source(42, 24) + SourceIndex(0)
@@ -597,9 +637,11 @@ sourceFile:sourceMapValidationDecorators.ts
 5 >Emitted(51, 27) Source(43, 28) + SourceIndex(0)
 ---
 >>>    __param(0, ParameterDecorator1),
-1->^^^^^^^^^^^^^^^
-2 >               ^^^^^^^^^^^^^^^^^^^
-3 >                                  ^^^^^^->
+1->^^^^
+2 >    ^^^^^^^^^^^
+3 >               ^^^^^^^^^^^^^^^^^^^
+4 >                                  ^
+5 >                                   ^^^^^->
 1->
   >    get greetings() {
   >        return this.greeting;
@@ -607,45 +649,55 @@ sourceFile:sourceMapValidationDecorators.ts
   >
   >    set greetings(
   >      @
-2 >               ParameterDecorator1
-1->Emitted(52, 16) Source(49, 8) + SourceIndex(0)
-2 >Emitted(52, 35) Source(49, 27) + SourceIndex(0)
+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 >                                      ^^^^->
+1->^^^^
+2 >    ^^^^^^^^^^^
+3 >               ^^^^^^^^^^^^^^^^^^^
+4 >                                  ^
+5 >                                   ^^
+6 >                                     ^
+7 >                                      ^
+8 >                                       ^^^->
 1-> 
   >      @
-2 >               ParameterDecorator2
-3 >                                  (
-4 >                                   90
-5 >                                     )
-1->Emitted(53, 16) Source(50, 8) + SourceIndex(0)
-2 >Emitted(53, 35) Source(50, 27) + SourceIndex(0)
-3 >Emitted(53, 36) Source(50, 28) + SourceIndex(0)
-4 >Emitted(53, 38) Source(50, 30) + SourceIndex(0)
-5 >Emitted(53, 39) Source(50, 31) + SourceIndex(0)
+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(43, 28) + SourceIndex(0)
+1->Emitted(54, 41) Source(46, 6) + SourceIndex(0)
 ---
 >>>__decorate([
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(55, 1) Source(31, 5) + SourceIndex(0)
+1 >Emitted(55, 1) Source(33, 5) + SourceIndex(0)
 ---
 >>>    PropertyDecorator1,
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^
 3 >                      ^^^^^->
-1->@
+1->
 2 >    PropertyDecorator1
 1->Emitted(56, 5) Source(31, 6) + SourceIndex(0)
 2 >Emitted(56, 23) Source(31, 24) + SourceIndex(0)
@@ -671,20 +723,21 @@ sourceFile:sourceMapValidationDecorators.ts
 ---
 >>>], Greeter, "x1", void 0);
 1->^^^^^^^^^^^^^^^^^^^^^^^^^
-1->
-1->Emitted(58, 26) Source(32, 28) + SourceIndex(0)
+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(8, 1) + SourceIndex(0)
+1 >Emitted(59, 1) Source(10, 1) + SourceIndex(0)
 ---
 >>>    ClassDecorator1,
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^
 3 >                   ^^^^^^->
-1->@
+1->
 2 >    ClassDecorator1
 1->Emitted(60, 5) Source(8, 2) + SourceIndex(0)
 2 >Emitted(60, 20) Source(8, 17) + SourceIndex(0)
@@ -709,82 +762,93 @@ sourceFile:sourceMapValidationDecorators.ts
 5 >Emitted(61, 24) Source(9, 21) + SourceIndex(0)
 ---
 >>>    __param(0, ParameterDecorator1),
-1->^^^^^^^^^^^^^^^
-2 >               ^^^^^^^^^^^^^^^^^^^
-3 >                                  ^^^^^^^->
+1->^^^^
+2 >    ^^^^^^^^^^^
+3 >               ^^^^^^^^^^^^^^^^^^^
+4 >                                  ^
+5 >                                   ^^^^^^->
 1->
   >class Greeter {
   >    constructor(
   >      @
-2 >               ParameterDecorator1
-1->Emitted(62, 16) Source(12, 8) + SourceIndex(0)
-2 >Emitted(62, 35) Source(12, 27) + SourceIndex(0)
+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 >                                     ^
+1->^^^^
+2 >    ^^^^^^^^^^^
+3 >               ^^^^^^^^^^^^^^^^^^^
+4 >                                  ^
+5 >                                   ^^
+6 >                                     ^
+7 >                                      ^
 1-> 
   >      @
-2 >               ParameterDecorator2
-3 >                                  (
-4 >                                   20
-5 >                                     )
-1->Emitted(63, 16) Source(13, 8) + SourceIndex(0)
-2 >Emitted(63, 35) Source(13, 27) + SourceIndex(0)
-3 >Emitted(63, 36) Source(13, 28) + SourceIndex(0)
-4 >Emitted(63, 38) Source(13, 30) + SourceIndex(0)
-5 >Emitted(63, 39) Source(13, 31) + SourceIndex(0)
+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 >                                  ^^^^^^->
+1 >^^^^
+2 >    ^^^^^^^^^^^
+3 >               ^^^^^^^^^^^^^^^^^^^
+4 >                                  ^
+5 >                                   ^^^^^->
 1 > 
   >      public greeting: string, 
   >      
   >      @
-2 >               ParameterDecorator1
-1 >Emitted(64, 16) Source(16, 8) + SourceIndex(0)
-2 >Emitted(64, 35) Source(16, 27) + SourceIndex(0)
+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 >                                     ^
+1->^^^^
+2 >    ^^^^^^^^^^^
+3 >               ^^^^^^^^^^^^^^^^^^^
+4 >                                  ^
+5 >                                   ^^
+6 >                                     ^
+7 >                                      ^
 1-> 
   >      @
-2 >               ParameterDecorator2
-3 >                                  (
-4 >                                   30
-5 >                                     )
-1->Emitted(65, 16) Source(17, 8) + SourceIndex(0)
-2 >Emitted(65, 35) Source(17, 27) + SourceIndex(0)
-3 >Emitted(65, 36) Source(17, 28) + SourceIndex(0)
-4 >Emitted(65, 38) Source(17, 30) + SourceIndex(0)
-5 >Emitted(65, 39) Source(17, 31) + SourceIndex(0)
+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 >
-1 >Emitted(66, 12) Source(9, 21) + SourceIndex(0)
----
->>>//# sourceMappingURL=sourceMapValidationDecorators.js.map1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >class Greeter {
-  >    constructor(
-  >      @ParameterDecorator1 
-  >      @ParameterDecorator2(20) 
-  >      public greeting: string, 
-  >      
-  >      @ParameterDecorator1 
-  >      @ParameterDecorator2(30) 
+1 > 
   >      ...b: string[]) {
   >    }
   >    
@@ -822,5 +886,6 @@ sourceFile:sourceMapValidationDecorators.ts
   >        this.greeting = greetings;
   >    }    
   >}
-1->Emitted(67, 1) Source(54, 2) + SourceIndex(0)
----
\ No newline at end of file
+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/sourceMapValidationDecorators.symbols b/tests/baselines/reference/sourceMapValidationDecorators.symbols
index 90204d0b71f..72e47dabe0b 100644
--- a/tests/baselines/reference/sourceMapValidationDecorators.symbols
+++ b/tests/baselines/reference/sourceMapValidationDecorators.symbols
@@ -59,7 +59,7 @@ class Greeter {
 >ParameterDecorator2 : Symbol(ParameterDecorator2, Decl(sourceMapValidationDecorators.ts, 4, 101))
 
       public greeting: string, 
->greeting : Symbol(greeting, Decl(sourceMapValidationDecorators.ts, 10, 16))
+>greeting : Symbol(Greeter.greeting, Decl(sourceMapValidationDecorators.ts, 10, 16))
       
       @ParameterDecorator1 
 >ParameterDecorator1 : Symbol(ParameterDecorator1, Decl(sourceMapValidationDecorators.ts, 3, 128))
@@ -78,12 +78,12 @@ class Greeter {
 >PropertyDecorator2 : Symbol(PropertyDecorator2, Decl(sourceMapValidationDecorators.ts, 2, 113))
 
     greet() {
->greet : Symbol(greet, Decl(sourceMapValidationDecorators.ts, 18, 5))
+>greet : Symbol(Greeter.greet, Decl(sourceMapValidationDecorators.ts, 18, 5))
 
         return "<h1>" + this.greeting + "</h1>";
->this.greeting : Symbol(greeting, Decl(sourceMapValidationDecorators.ts, 10, 16))
+>this.greeting : Symbol(Greeter.greeting, Decl(sourceMapValidationDecorators.ts, 10, 16))
 >this : Symbol(Greeter, Decl(sourceMapValidationDecorators.ts, 5, 116))
->greeting : Symbol(greeting, Decl(sourceMapValidationDecorators.ts, 10, 16))
+>greeting : Symbol(Greeter.greeting, Decl(sourceMapValidationDecorators.ts, 10, 16))
     }
 
     @PropertyDecorator1
@@ -93,7 +93,7 @@ class Greeter {
 >PropertyDecorator2 : Symbol(PropertyDecorator2, Decl(sourceMapValidationDecorators.ts, 2, 113))
 
     private x: string;
->x : Symbol(x, Decl(sourceMapValidationDecorators.ts, 24, 5))
+>x : Symbol(Greeter.x, Decl(sourceMapValidationDecorators.ts, 24, 5))
 
     @PropertyDecorator1
 >PropertyDecorator1 : Symbol(PropertyDecorator1, Decl(sourceMapValidationDecorators.ts, 1, 72))
@@ -105,7 +105,7 @@ class Greeter {
 >x1 : Symbol(Greeter.x1, Decl(sourceMapValidationDecorators.ts, 28, 22))
     
     private fn(
->fn : Symbol(fn, Decl(sourceMapValidationDecorators.ts, 32, 35))
+>fn : Symbol(Greeter.fn, Decl(sourceMapValidationDecorators.ts, 32, 35))
 
       @ParameterDecorator1 
 >ParameterDecorator1 : Symbol(ParameterDecorator1, Decl(sourceMapValidationDecorators.ts, 3, 128))
@@ -117,9 +117,9 @@ class Greeter {
 >x : Symbol(x, Decl(sourceMapValidationDecorators.ts, 34, 15))
 
         return this.greeting;
->this.greeting : Symbol(greeting, Decl(sourceMapValidationDecorators.ts, 10, 16))
+>this.greeting : Symbol(Greeter.greeting, Decl(sourceMapValidationDecorators.ts, 10, 16))
 >this : Symbol(Greeter, Decl(sourceMapValidationDecorators.ts, 5, 116))
->greeting : Symbol(greeting, Decl(sourceMapValidationDecorators.ts, 10, 16))
+>greeting : Symbol(Greeter.greeting, Decl(sourceMapValidationDecorators.ts, 10, 16))
     }
 
     @PropertyDecorator1
@@ -129,16 +129,16 @@ class Greeter {
 >PropertyDecorator2 : Symbol(PropertyDecorator2, Decl(sourceMapValidationDecorators.ts, 2, 113))
 
     get greetings() {
->greetings : Symbol(greetings, Decl(sourceMapValidationDecorators.ts, 39, 5), Decl(sourceMapValidationDecorators.ts, 45, 5))
+>greetings : Symbol(Greeter.greetings, Decl(sourceMapValidationDecorators.ts, 39, 5), Decl(sourceMapValidationDecorators.ts, 45, 5))
 
         return this.greeting;
->this.greeting : Symbol(greeting, Decl(sourceMapValidationDecorators.ts, 10, 16))
+>this.greeting : Symbol(Greeter.greeting, Decl(sourceMapValidationDecorators.ts, 10, 16))
 >this : Symbol(Greeter, Decl(sourceMapValidationDecorators.ts, 5, 116))
->greeting : Symbol(greeting, Decl(sourceMapValidationDecorators.ts, 10, 16))
+>greeting : Symbol(Greeter.greeting, Decl(sourceMapValidationDecorators.ts, 10, 16))
     }
 
     set greetings(
->greetings : Symbol(greetings, Decl(sourceMapValidationDecorators.ts, 39, 5), Decl(sourceMapValidationDecorators.ts, 45, 5))
+>greetings : Symbol(Greeter.greetings, Decl(sourceMapValidationDecorators.ts, 39, 5), Decl(sourceMapValidationDecorators.ts, 45, 5))
 
       @ParameterDecorator1 
 >ParameterDecorator1 : Symbol(ParameterDecorator1, Decl(sourceMapValidationDecorators.ts, 3, 128))
@@ -150,9 +150,9 @@ class Greeter {
 >greetings : Symbol(greetings, Decl(sourceMapValidationDecorators.ts, 47, 18))
 
         this.greeting = greetings;
->this.greeting : Symbol(greeting, Decl(sourceMapValidationDecorators.ts, 10, 16))
+>this.greeting : Symbol(Greeter.greeting, Decl(sourceMapValidationDecorators.ts, 10, 16))
 >this : Symbol(Greeter, Decl(sourceMapValidationDecorators.ts, 5, 116))
->greeting : Symbol(greeting, Decl(sourceMapValidationDecorators.ts, 10, 16))
+>greeting : Symbol(Greeter.greeting, Decl(sourceMapValidationDecorators.ts, 10, 16))
 >greetings : Symbol(greetings, Decl(sourceMapValidationDecorators.ts, 47, 18))
     }    
 }
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/sourceMapValidationDestructuringForObjectBindingPattern.symbols b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern.symbols
index 7037783e9a1..3cbd93783d2 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern.symbols
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern.symbols
@@ -10,20 +10,20 @@ interface Robot {
 >Robot : Symbol(Robot, Decl(sourceMapValidationDestructuringForObjectBindingPattern.ts, 2, 1))
 
     name: string;
->name : Symbol(name, Decl(sourceMapValidationDestructuringForObjectBindingPattern.ts, 3, 17))
+>name : Symbol(Robot.name, Decl(sourceMapValidationDestructuringForObjectBindingPattern.ts, 3, 17))
 
     skill: string;
->skill : Symbol(skill, Decl(sourceMapValidationDestructuringForObjectBindingPattern.ts, 4, 17))
+>skill : Symbol(Robot.skill, Decl(sourceMapValidationDestructuringForObjectBindingPattern.ts, 4, 17))
 }
 
 interface MultiRobot {
 >MultiRobot : Symbol(MultiRobot, Decl(sourceMapValidationDestructuringForObjectBindingPattern.ts, 6, 1))
 
     name: string;
->name : Symbol(name, Decl(sourceMapValidationDestructuringForObjectBindingPattern.ts, 8, 22))
+>name : Symbol(MultiRobot.name, Decl(sourceMapValidationDestructuringForObjectBindingPattern.ts, 8, 22))
 
     skills: {
->skills : Symbol(skills, Decl(sourceMapValidationDestructuringForObjectBindingPattern.ts, 9, 17))
+>skills : Symbol(MultiRobot.skills, Decl(sourceMapValidationDestructuringForObjectBindingPattern.ts, 9, 17))
 
         primary: string;
 >primary : Symbol(primary, Decl(sourceMapValidationDestructuringForObjectBindingPattern.ts, 10, 13))
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/sourceMapValidationDestructuringForObjectBindingPattern2.symbols b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern2.symbols
index 49de55505a2..1d6df1e8394 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern2.symbols
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPattern2.symbols
@@ -10,20 +10,20 @@ interface Robot {
 >Robot : Symbol(Robot, Decl(sourceMapValidationDestructuringForObjectBindingPattern2.ts, 2, 1))
 
     name: string;
->name : Symbol(name, Decl(sourceMapValidationDestructuringForObjectBindingPattern2.ts, 3, 17))
+>name : Symbol(Robot.name, Decl(sourceMapValidationDestructuringForObjectBindingPattern2.ts, 3, 17))
 
     skill: string;
->skill : Symbol(skill, Decl(sourceMapValidationDestructuringForObjectBindingPattern2.ts, 4, 17))
+>skill : Symbol(Robot.skill, Decl(sourceMapValidationDestructuringForObjectBindingPattern2.ts, 4, 17))
 }
 
 interface MultiRobot {
 >MultiRobot : Symbol(MultiRobot, Decl(sourceMapValidationDestructuringForObjectBindingPattern2.ts, 6, 1))
 
     name: string;
->name : Symbol(name, Decl(sourceMapValidationDestructuringForObjectBindingPattern2.ts, 8, 22))
+>name : Symbol(MultiRobot.name, Decl(sourceMapValidationDestructuringForObjectBindingPattern2.ts, 8, 22))
 
     skills: {
->skills : Symbol(skills, Decl(sourceMapValidationDestructuringForObjectBindingPattern2.ts, 9, 17))
+>skills : Symbol(MultiRobot.skills, Decl(sourceMapValidationDestructuringForObjectBindingPattern2.ts, 9, 17))
 
         primary: string;
 >primary : Symbol(primary, Decl(sourceMapValidationDestructuringForObjectBindingPattern2.ts, 10, 13))
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/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.symbols b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.symbols
index 5d47a45699e..04afb458955 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.symbols
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.symbols
@@ -10,20 +10,20 @@ interface Robot {
 >Robot : Symbol(Robot, Decl(sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.ts, 2, 1))
 
     name: string;
->name : Symbol(name, Decl(sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.ts, 3, 17))
+>name : Symbol(Robot.name, Decl(sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.ts, 3, 17))
 
     skill: string;
->skill : Symbol(skill, Decl(sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.ts, 4, 17))
+>skill : Symbol(Robot.skill, Decl(sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.ts, 4, 17))
 }
 
 interface MultiRobot {
 >MultiRobot : Symbol(MultiRobot, Decl(sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.ts, 6, 1))
 
     name: string;
->name : Symbol(name, Decl(sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.ts, 8, 22))
+>name : Symbol(MultiRobot.name, Decl(sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.ts, 8, 22))
 
     skills: {
->skills : Symbol(skills, Decl(sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.ts, 9, 17))
+>skills : Symbol(MultiRobot.skills, Decl(sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.ts, 9, 17))
 
         primary?: string;
 >primary : Symbol(primary, Decl(sourceMapValidationDestructuringForObjectBindingPatternDefaultValues.ts, 10, 13))
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/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.symbols b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.symbols
index 20ccd1136c3..86e1e28dd0c 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.symbols
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.symbols
@@ -10,20 +10,20 @@ interface Robot {
 >Robot : Symbol(Robot, Decl(sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.ts, 2, 1))
 
     name: string;
->name : Symbol(name, Decl(sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.ts, 3, 17))
+>name : Symbol(Robot.name, Decl(sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.ts, 3, 17))
 
     skill: string;
->skill : Symbol(skill, Decl(sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.ts, 4, 17))
+>skill : Symbol(Robot.skill, Decl(sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.ts, 4, 17))
 }
 
 interface MultiRobot {
 >MultiRobot : Symbol(MultiRobot, Decl(sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.ts, 6, 1))
 
     name: string;
->name : Symbol(name, Decl(sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.ts, 8, 22))
+>name : Symbol(MultiRobot.name, Decl(sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.ts, 8, 22))
 
     skills: {
->skills : Symbol(skills, Decl(sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.ts, 9, 17))
+>skills : Symbol(MultiRobot.skills, Decl(sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.ts, 9, 17))
 
         primary?: string;
 >primary : Symbol(primary, Decl(sourceMapValidationDestructuringForObjectBindingPatternDefaultValues2.ts, 10, 13))
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/sourceMapValidationDestructuringForOfObjectBindingPattern.symbols b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern.symbols
index 8fef1fabd6d..51499a35e91 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern.symbols
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern.symbols
@@ -10,20 +10,20 @@ interface Robot {
 >Robot : Symbol(Robot, Decl(sourceMapValidationDestructuringForOfObjectBindingPattern.ts, 2, 1))
 
     name: string;
->name : Symbol(name, Decl(sourceMapValidationDestructuringForOfObjectBindingPattern.ts, 3, 17))
+>name : Symbol(Robot.name, Decl(sourceMapValidationDestructuringForOfObjectBindingPattern.ts, 3, 17))
 
     skill: string;
->skill : Symbol(skill, Decl(sourceMapValidationDestructuringForOfObjectBindingPattern.ts, 4, 17))
+>skill : Symbol(Robot.skill, Decl(sourceMapValidationDestructuringForOfObjectBindingPattern.ts, 4, 17))
 }
 
 interface MultiRobot {
 >MultiRobot : Symbol(MultiRobot, Decl(sourceMapValidationDestructuringForOfObjectBindingPattern.ts, 6, 1))
 
     name: string;
->name : Symbol(name, Decl(sourceMapValidationDestructuringForOfObjectBindingPattern.ts, 8, 22))
+>name : Symbol(MultiRobot.name, Decl(sourceMapValidationDestructuringForOfObjectBindingPattern.ts, 8, 22))
 
     skills: {
->skills : Symbol(skills, Decl(sourceMapValidationDestructuringForOfObjectBindingPattern.ts, 9, 17))
+>skills : Symbol(MultiRobot.skills, Decl(sourceMapValidationDestructuringForOfObjectBindingPattern.ts, 9, 17))
 
         primary: string;
 >primary : Symbol(primary, Decl(sourceMapValidationDestructuringForOfObjectBindingPattern.ts, 10, 13))
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/sourceMapValidationDestructuringForOfObjectBindingPattern2.symbols b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern2.symbols
index ed2a6c3449d..532791cca68 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern2.symbols
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPattern2.symbols
@@ -10,20 +10,20 @@ interface Robot {
 >Robot : Symbol(Robot, Decl(sourceMapValidationDestructuringForOfObjectBindingPattern2.ts, 2, 1))
 
     name: string;
->name : Symbol(name, Decl(sourceMapValidationDestructuringForOfObjectBindingPattern2.ts, 3, 17))
+>name : Symbol(Robot.name, Decl(sourceMapValidationDestructuringForOfObjectBindingPattern2.ts, 3, 17))
 
     skill: string;
->skill : Symbol(skill, Decl(sourceMapValidationDestructuringForOfObjectBindingPattern2.ts, 4, 17))
+>skill : Symbol(Robot.skill, Decl(sourceMapValidationDestructuringForOfObjectBindingPattern2.ts, 4, 17))
 }
 
 interface MultiRobot {
 >MultiRobot : Symbol(MultiRobot, Decl(sourceMapValidationDestructuringForOfObjectBindingPattern2.ts, 6, 1))
 
     name: string;
->name : Symbol(name, Decl(sourceMapValidationDestructuringForOfObjectBindingPattern2.ts, 8, 22))
+>name : Symbol(MultiRobot.name, Decl(sourceMapValidationDestructuringForOfObjectBindingPattern2.ts, 8, 22))
 
     skills: {
->skills : Symbol(skills, Decl(sourceMapValidationDestructuringForOfObjectBindingPattern2.ts, 9, 17))
+>skills : Symbol(MultiRobot.skills, Decl(sourceMapValidationDestructuringForOfObjectBindingPattern2.ts, 9, 17))
 
         primary: string;
 >primary : Symbol(primary, Decl(sourceMapValidationDestructuringForOfObjectBindingPattern2.ts, 10, 13))
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/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.symbols b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.symbols
index f73adeb7761..bf3cbd59e0b 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.symbols
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.symbols
@@ -10,20 +10,20 @@ interface Robot {
 >Robot : Symbol(Robot, Decl(sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.ts, 2, 1))
 
     name: string;
->name : Symbol(name, Decl(sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.ts, 3, 17))
+>name : Symbol(Robot.name, Decl(sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.ts, 3, 17))
 
     skill: string;
->skill : Symbol(skill, Decl(sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.ts, 4, 17))
+>skill : Symbol(Robot.skill, Decl(sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.ts, 4, 17))
 }
 
 interface MultiRobot {
 >MultiRobot : Symbol(MultiRobot, Decl(sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.ts, 6, 1))
 
     name: string;
->name : Symbol(name, Decl(sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.ts, 8, 22))
+>name : Symbol(MultiRobot.name, Decl(sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.ts, 8, 22))
 
     skills: {
->skills : Symbol(skills, Decl(sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.ts, 9, 17))
+>skills : Symbol(MultiRobot.skills, Decl(sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.ts, 9, 17))
 
         primary?: string;
 >primary : Symbol(primary, Decl(sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues.ts, 10, 13))
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/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.symbols b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.symbols
index 7194270c784..ebbda4d0517 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.symbols
+++ b/tests/baselines/reference/sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.symbols
@@ -10,20 +10,20 @@ interface Robot {
 >Robot : Symbol(Robot, Decl(sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.ts, 2, 1))
 
     name: string;
->name : Symbol(name, Decl(sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.ts, 3, 17))
+>name : Symbol(Robot.name, Decl(sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.ts, 3, 17))
 
     skill: string;
->skill : Symbol(skill, Decl(sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.ts, 4, 17))
+>skill : Symbol(Robot.skill, Decl(sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.ts, 4, 17))
 }
 
 interface MultiRobot {
 >MultiRobot : Symbol(MultiRobot, Decl(sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.ts, 6, 1))
 
     name: string;
->name : Symbol(name, Decl(sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.ts, 8, 22))
+>name : Symbol(MultiRobot.name, Decl(sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.ts, 8, 22))
 
     skills: {
->skills : Symbol(skills, Decl(sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.ts, 9, 17))
+>skills : Symbol(MultiRobot.skills, Decl(sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.ts, 9, 17))
 
         primary: string;
 >primary : Symbol(primary, Decl(sourceMapValidationDestructuringForOfObjectBindingPatternDefaultValues2.ts, 10, 13))
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPattern.symbols b/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPattern.symbols
index 3b2a89b2bda..7c6e8135e26 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPattern.symbols
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPattern.symbols
@@ -10,10 +10,10 @@ interface Robot {
 >Robot : Symbol(Robot, Decl(sourceMapValidationDestructuringParameterNestedObjectBindingPattern.ts, 2, 1))
 
     name: string;
->name : Symbol(name, Decl(sourceMapValidationDestructuringParameterNestedObjectBindingPattern.ts, 3, 17))
+>name : Symbol(Robot.name, Decl(sourceMapValidationDestructuringParameterNestedObjectBindingPattern.ts, 3, 17))
 
     skills: {
->skills : Symbol(skills, Decl(sourceMapValidationDestructuringParameterNestedObjectBindingPattern.ts, 4, 17))
+>skills : Symbol(Robot.skills, Decl(sourceMapValidationDestructuringParameterNestedObjectBindingPattern.ts, 4, 17))
 
         primary: string;
 >primary : Symbol(primary, Decl(sourceMapValidationDestructuringParameterNestedObjectBindingPattern.ts, 5, 13))
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPattern.types b/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPattern.types
index 029e47cd3a0..af27c32d15b 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPattern.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPattern.types
@@ -37,7 +37,7 @@ var robotA: Robot = { name: "mower", skills: { primary: "mowing", secondary: "no
 >"none" : string
 
 function foo1({ skills: { primary: primaryA, secondary: secondaryA } }: Robot) {
->foo1 : ({ skills: { primary: primaryA, secondary: secondaryA } }: Robot) => void
+>foo1 : ({skills: {primary: primaryA, secondary: secondaryA}}: Robot) => void
 >skills : any
 >primary : any
 >primaryA : string
@@ -53,7 +53,7 @@ function foo1({ skills: { primary: primaryA, secondary: secondaryA } }: Robot) {
 >primaryA : string
 }
 function foo2({ name: nameC, skills: { primary: primaryB, secondary: secondaryB } }: Robot) {
->foo2 : ({ name: nameC, skills: { primary: primaryB, secondary: secondaryB } }: Robot) => void
+>foo2 : ({name: nameC, skills: {primary: primaryB, secondary: secondaryB}}: Robot) => void
 >name : any
 >nameC : string
 >skills : any
@@ -71,7 +71,7 @@ function foo2({ name: nameC, skills: { primary: primaryB, secondary: secondaryB
 >secondaryB : string
 }
 function foo3({ skills }: Robot) {
->foo3 : ({ skills }: Robot) => void
+>foo3 : ({skills}: Robot) => void
 >skills : { primary: string; secondary: string; }
 >Robot : Robot
 
@@ -87,12 +87,12 @@ function foo3({ skills }: Robot) {
 
 foo1(robotA);
 >foo1(robotA) : void
->foo1 : ({ skills: { primary: primaryA, secondary: secondaryA } }: Robot) => void
+>foo1 : ({skills: {primary: primaryA, secondary: secondaryA}}: Robot) => void
 >robotA : Robot
 
 foo1({ name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } });
 >foo1({ name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } }) : void
->foo1 : ({ skills: { primary: primaryA, secondary: secondaryA } }: Robot) => void
+>foo1 : ({skills: {primary: primaryA, secondary: secondaryA}}: Robot) => void
 >{ name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"Edger" : string
@@ -105,12 +105,12 @@ foo1({ name: "Edger", skills: { primary: "edging", secondary: "branch trimming"
 
 foo2(robotA);
 >foo2(robotA) : void
->foo2 : ({ name: nameC, skills: { primary: primaryB, secondary: secondaryB } }: Robot) => void
+>foo2 : ({name: nameC, skills: {primary: primaryB, secondary: secondaryB}}: Robot) => void
 >robotA : Robot
 
 foo2({ name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } });
 >foo2({ name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } }) : void
->foo2 : ({ name: nameC, skills: { primary: primaryB, secondary: secondaryB } }: Robot) => void
+>foo2 : ({name: nameC, skills: {primary: primaryB, secondary: secondaryB}}: Robot) => void
 >{ name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"Edger" : string
@@ -123,12 +123,12 @@ foo2({ name: "Edger", skills: { primary: "edging", secondary: "branch trimming"
 
 foo3(robotA);
 >foo3(robotA) : void
->foo3 : ({ skills }: Robot) => void
+>foo3 : ({skills}: Robot) => void
 >robotA : Robot
 
 foo3({ name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } });
 >foo3({ name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } }) : void
->foo3 : ({ skills }: Robot) => void
+>foo3 : ({skills}: Robot) => void
 >{ name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"Edger" : string
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPatternDefaultValues.symbols b/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPatternDefaultValues.symbols
index 229e9acb6da..72412207cfb 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPatternDefaultValues.symbols
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPatternDefaultValues.symbols
@@ -10,10 +10,10 @@ interface Robot {
 >Robot : Symbol(Robot, Decl(sourceMapValidationDestructuringParameterNestedObjectBindingPatternDefaultValues.ts, 2, 1))
 
     name: string;
->name : Symbol(name, Decl(sourceMapValidationDestructuringParameterNestedObjectBindingPatternDefaultValues.ts, 3, 17))
+>name : Symbol(Robot.name, Decl(sourceMapValidationDestructuringParameterNestedObjectBindingPatternDefaultValues.ts, 3, 17))
 
     skills: {
->skills : Symbol(skills, Decl(sourceMapValidationDestructuringParameterNestedObjectBindingPatternDefaultValues.ts, 4, 17))
+>skills : Symbol(Robot.skills, Decl(sourceMapValidationDestructuringParameterNestedObjectBindingPatternDefaultValues.ts, 4, 17))
 
         primary?: string;
 >primary : Symbol(primary, Decl(sourceMapValidationDestructuringParameterNestedObjectBindingPatternDefaultValues.ts, 5, 13))
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPatternDefaultValues.types b/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPatternDefaultValues.types
index a9e5c2d6ee6..1115931feef 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPatternDefaultValues.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParameterNestedObjectBindingPatternDefaultValues.types
@@ -37,12 +37,7 @@ var robotA: Robot = { name: "mower", skills: { primary: "mowing", secondary: "no
 >"none" : string
 
 function foo1(
->foo1 : ({
-        skills: {
-            primary: primaryA = "primary",
-            secondary: secondaryA = "secondary"
-        } = { primary: "SomeSkill", secondary: "someSkill" }
-    }?: Robot) => void
+>foo1 : ({skills: {primary: primaryA, secondary: secondaryA}}?: Robot) => void
     {
         skills: {
 >skills : any
@@ -76,13 +71,7 @@ function foo1(
 >primaryA : string
 }
 function foo2(
->foo2 : ({
-        name: nameC = "name",
-        skills: {
-            primary: primaryB = "primary",
-            secondary: secondaryB = "secondary"
-        } = { primary: "SomeSkill", secondary: "someSkill" }
-    }?: Robot) => void
+>foo2 : ({name: nameC, skills: {primary: primaryB, secondary: secondaryB}}?: Robot) => void
     {
         name: nameC = "name",
 >name : any
@@ -121,7 +110,7 @@ function foo2(
 >secondaryB : string
 }
 function foo3({ skills = { primary: "SomeSkill", secondary: "someSkill" }  }: Robot = robotA) {
->foo3 : ({ skills = { primary: "SomeSkill", secondary: "someSkill" }  }?: Robot) => void
+>foo3 : ({skills}?: Robot) => void
 >skills : { primary?: string; secondary?: string; }
 >{ primary: "SomeSkill", secondary: "someSkill" } : { primary: string; secondary: string; }
 >primary : string
@@ -143,22 +132,12 @@ function foo3({ skills = { primary: "SomeSkill", secondary: "someSkill" }  }: Ro
 
 foo1(robotA);
 >foo1(robotA) : void
->foo1 : ({
-        skills: {
-            primary: primaryA = "primary",
-            secondary: secondaryA = "secondary"
-        } = { primary: "SomeSkill", secondary: "someSkill" }
-    }?: Robot) => void
+>foo1 : ({skills: {primary: primaryA, secondary: secondaryA}}?: Robot) => void
 >robotA : Robot
 
 foo1({ name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } });
 >foo1({ name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } }) : void
->foo1 : ({
-        skills: {
-            primary: primaryA = "primary",
-            secondary: secondaryA = "secondary"
-        } = { primary: "SomeSkill", secondary: "someSkill" }
-    }?: Robot) => void
+>foo1 : ({skills: {primary: primaryA, secondary: secondaryA}}?: Robot) => void
 >{ name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"Edger" : string
@@ -171,24 +150,12 @@ foo1({ name: "Edger", skills: { primary: "edging", secondary: "branch trimming"
 
 foo2(robotA);
 >foo2(robotA) : void
->foo2 : ({
-        name: nameC = "name",
-        skills: {
-            primary: primaryB = "primary",
-            secondary: secondaryB = "secondary"
-        } = { primary: "SomeSkill", secondary: "someSkill" }
-    }?: Robot) => void
+>foo2 : ({name: nameC, skills: {primary: primaryB, secondary: secondaryB}}?: Robot) => void
 >robotA : Robot
 
 foo2({ name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } });
 >foo2({ name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } }) : void
->foo2 : ({
-        name: nameC = "name",
-        skills: {
-            primary: primaryB = "primary",
-            secondary: secondaryB = "secondary"
-        } = { primary: "SomeSkill", secondary: "someSkill" }
-    }?: Robot) => void
+>foo2 : ({name: nameC, skills: {primary: primaryB, secondary: secondaryB}}?: Robot) => void
 >{ name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"Edger" : string
@@ -201,12 +168,12 @@ foo2({ name: "Edger", skills: { primary: "edging", secondary: "branch trimming"
 
 foo3(robotA);
 >foo3(robotA) : void
->foo3 : ({ skills = { primary: "SomeSkill", secondary: "someSkill" }  }?: Robot) => void
+>foo3 : ({skills}?: Robot) => void
 >robotA : Robot
 
 foo3({ name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } });
 >foo3({ name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } }) : void
->foo3 : ({ skills = { primary: "SomeSkill", secondary: "someSkill" }  }?: Robot) => void
+>foo3 : ({skills}?: Robot) => void
 >{ name: "Edger", skills: { primary: "edging", secondary: "branch trimming" } } : { name: string; skills: { primary: string; secondary: string; }; }
 >name : string
 >"Edger" : string
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPattern.symbols b/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPattern.symbols
index 9b810165c1b..c87a10dce92 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPattern.symbols
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPattern.symbols
@@ -3,10 +3,10 @@ interface Robot {
 >Robot : Symbol(Robot, Decl(sourceMapValidationDestructuringParameterObjectBindingPattern.ts, 0, 0))
 
     name: string;
->name : Symbol(name, Decl(sourceMapValidationDestructuringParameterObjectBindingPattern.ts, 0, 17))
+>name : Symbol(Robot.name, Decl(sourceMapValidationDestructuringParameterObjectBindingPattern.ts, 0, 17))
 
     skill: string;
->skill : Symbol(skill, Decl(sourceMapValidationDestructuringParameterObjectBindingPattern.ts, 1, 17))
+>skill : Symbol(Robot.skill, Decl(sourceMapValidationDestructuringParameterObjectBindingPattern.ts, 1, 17))
 }
 declare var console: {
 >console : Symbol(console, Decl(sourceMapValidationDestructuringParameterObjectBindingPattern.ts, 4, 11))
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPattern.types b/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPattern.types
index 894cd714c73..6b8f26acf43 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPattern.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPattern.types
@@ -29,7 +29,7 @@ var robotA: Robot = { name: "mower", skill: "mowing" };
 >"mowing" : string
 
 function foo1({ name: nameA }: Robot) {
->foo1 : ({ name: nameA }: Robot) => void
+>foo1 : ({name: nameA}: Robot) => void
 >name : any
 >nameA : string
 >Robot : Robot
@@ -42,7 +42,7 @@ function foo1({ name: nameA }: Robot) {
 >nameA : string
 }
 function foo2({ name: nameB, skill: skillB }: Robot) {
->foo2 : ({ name: nameB, skill: skillB }: Robot) => void
+>foo2 : ({name: nameB, skill: skillB}: Robot) => void
 >name : any
 >nameB : string
 >skill : any
@@ -57,7 +57,7 @@ function foo2({ name: nameB, skill: skillB }: Robot) {
 >nameB : string
 }
 function foo3({ name }: Robot) {
->foo3 : ({ name }: Robot) => void
+>foo3 : ({name}: Robot) => void
 >name : string
 >Robot : Robot
 
@@ -71,12 +71,12 @@ function foo3({ name }: Robot) {
 
 foo1(robotA);
 >foo1(robotA) : void
->foo1 : ({ name: nameA }: Robot) => void
+>foo1 : ({name: nameA}: Robot) => void
 >robotA : Robot
 
 foo1({ name: "Edger", skill: "cutting edges" });
 >foo1({ name: "Edger", skill: "cutting edges" }) : void
->foo1 : ({ name: nameA }: Robot) => void
+>foo1 : ({name: nameA}: Robot) => void
 >{ name: "Edger", skill: "cutting edges" } : { name: string; skill: string; }
 >name : string
 >"Edger" : string
@@ -85,12 +85,12 @@ foo1({ name: "Edger", skill: "cutting edges" });
 
 foo2(robotA);
 >foo2(robotA) : void
->foo2 : ({ name: nameB, skill: skillB }: Robot) => void
+>foo2 : ({name: nameB, skill: skillB}: Robot) => void
 >robotA : Robot
 
 foo2({ name: "Edger", skill: "cutting edges" });
 >foo2({ name: "Edger", skill: "cutting edges" }) : void
->foo2 : ({ name: nameB, skill: skillB }: Robot) => void
+>foo2 : ({name: nameB, skill: skillB}: Robot) => void
 >{ name: "Edger", skill: "cutting edges" } : { name: string; skill: string; }
 >name : string
 >"Edger" : string
@@ -99,12 +99,12 @@ foo2({ name: "Edger", skill: "cutting edges" });
 
 foo3(robotA);
 >foo3(robotA) : void
->foo3 : ({ name }: Robot) => void
+>foo3 : ({name}: Robot) => void
 >robotA : Robot
 
 foo3({ name: "Edger", skill: "cutting edges" });
 >foo3({ name: "Edger", skill: "cutting edges" }) : void
->foo3 : ({ name }: Robot) => void
+>foo3 : ({name}: Robot) => void
 >{ name: "Edger", skill: "cutting edges" } : { name: string; skill: string; }
 >name : string
 >"Edger" : string
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPatternDefaultValues.symbols b/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPatternDefaultValues.symbols
index 7e3804a5e88..4f33517fe00 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPatternDefaultValues.symbols
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPatternDefaultValues.symbols
@@ -3,10 +3,10 @@ interface Robot {
 >Robot : Symbol(Robot, Decl(sourceMapValidationDestructuringParameterObjectBindingPatternDefaultValues.ts, 0, 0))
 
     name?: string;
->name : Symbol(name, Decl(sourceMapValidationDestructuringParameterObjectBindingPatternDefaultValues.ts, 0, 17))
+>name : Symbol(Robot.name, Decl(sourceMapValidationDestructuringParameterObjectBindingPatternDefaultValues.ts, 0, 17))
 
     skill?: string;
->skill : Symbol(skill, Decl(sourceMapValidationDestructuringParameterObjectBindingPatternDefaultValues.ts, 1, 18))
+>skill : Symbol(Robot.skill, Decl(sourceMapValidationDestructuringParameterObjectBindingPatternDefaultValues.ts, 1, 18))
 }
 declare var console: {
 >console : Symbol(console, Decl(sourceMapValidationDestructuringParameterObjectBindingPatternDefaultValues.ts, 4, 11))
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPatternDefaultValues.types b/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPatternDefaultValues.types
index 669708f412f..253c5feae8f 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPatternDefaultValues.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParameterObjectBindingPatternDefaultValues.types
@@ -29,7 +29,7 @@ var robotA: Robot = { name: "mower", skill: "mowing" };
 >"mowing" : string
 
 function foo1({ name: nameA = "<NoName>" }: Robot = { }) {
->foo1 : ({ name: nameA = "<NoName>" }?: Robot) => void
+>foo1 : ({name: nameA}?: Robot) => void
 >name : any
 >nameA : string
 >"<NoName>" : string
@@ -44,7 +44,7 @@ function foo1({ name: nameA = "<NoName>" }: Robot = { }) {
 >nameA : string
 }
 function foo2({ name: nameB = "<NoName>", skill: skillB = "noSkill" }: Robot = {}) {
->foo2 : ({ name: nameB = "<NoName>", skill: skillB = "noSkill" }?: Robot) => void
+>foo2 : ({name: nameB, skill: skillB}?: Robot) => void
 >name : any
 >nameB : string
 >"<NoName>" : string
@@ -62,7 +62,7 @@ function foo2({ name: nameB = "<NoName>", skill: skillB = "noSkill" }: Robot = {
 >nameB : string
 }
 function foo3({ name = "<NoName>" }: Robot = {}) {
->foo3 : ({ name = "<NoName>" }?: Robot) => void
+>foo3 : ({name}?: Robot) => void
 >name : string
 >"<NoName>" : string
 >Robot : Robot
@@ -78,12 +78,12 @@ function foo3({ name = "<NoName>" }: Robot = {}) {
 
 foo1(robotA);
 >foo1(robotA) : void
->foo1 : ({ name: nameA = "<NoName>" }?: Robot) => void
+>foo1 : ({name: nameA}?: Robot) => void
 >robotA : Robot
 
 foo1({ name: "Edger", skill: "cutting edges" });
 >foo1({ name: "Edger", skill: "cutting edges" }) : void
->foo1 : ({ name: nameA = "<NoName>" }?: Robot) => void
+>foo1 : ({name: nameA}?: Robot) => void
 >{ name: "Edger", skill: "cutting edges" } : { name: string; skill: string; }
 >name : string
 >"Edger" : string
@@ -92,12 +92,12 @@ foo1({ name: "Edger", skill: "cutting edges" });
 
 foo2(robotA);
 >foo2(robotA) : void
->foo2 : ({ name: nameB = "<NoName>", skill: skillB = "noSkill" }?: Robot) => void
+>foo2 : ({name: nameB, skill: skillB}?: Robot) => void
 >robotA : Robot
 
 foo2({ name: "Edger", skill: "cutting edges" });
 >foo2({ name: "Edger", skill: "cutting edges" }) : void
->foo2 : ({ name: nameB = "<NoName>", skill: skillB = "noSkill" }?: Robot) => void
+>foo2 : ({name: nameB, skill: skillB}?: Robot) => void
 >{ name: "Edger", skill: "cutting edges" } : { name: string; skill: string; }
 >name : string
 >"Edger" : string
@@ -106,12 +106,12 @@ foo2({ name: "Edger", skill: "cutting edges" });
 
 foo3(robotA);
 >foo3(robotA) : void
->foo3 : ({ name = "<NoName>" }?: Robot) => void
+>foo3 : ({name}?: Robot) => void
 >robotA : Robot
 
 foo3({ name: "Edger", skill: "cutting edges" });
 >foo3({ name: "Edger", skill: "cutting edges" }) : void
->foo3 : ({ name = "<NoName>" }?: Robot) => void
+>foo3 : ({name}?: Robot) => void
 >{ name: "Edger", skill: "cutting edges" } : { name: string; skill: string; }
 >name : string
 >"Edger" : string
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPatternDefaultValues.types b/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPatternDefaultValues.types
index 8e12e876b1d..366c538dda7 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPatternDefaultValues.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPatternDefaultValues.types
@@ -18,7 +18,7 @@ var robotA: Robot = [1, "mower", "mowing"];
 >"mowing" : string
 
 function foo1([, nameA = "noName"]: Robot = [-1, "name", "skill"]) {
->foo1 : ([, nameA = "noName"]?: [number, string, string]) => void
+>foo1 : ([, nameA]?: [number, string, string]) => void
 > : undefined
 >nameA : string
 >"noName" : string
@@ -38,7 +38,7 @@ function foo1([, nameA = "noName"]: Robot = [-1, "name", "skill"]) {
 }
 
 function foo2([numberB = -1]: Robot = [-1, "name", "skill"]) {
->foo2 : ([numberB = -1]?: [number, string, string]) => void
+>foo2 : ([numberB]?: [number, string, string]) => void
 >numberB : number
 >-1 : number
 >1 : number
@@ -58,7 +58,7 @@ function foo2([numberB = -1]: Robot = [-1, "name", "skill"]) {
 }
 
 function foo3([numberA2 = -1, nameA2 = "name", skillA2 = "skill"]: Robot = [-1, "name", "skill"]) {
->foo3 : ([numberA2 = -1, nameA2 = "name", skillA2 = "skill"]?: [number, string, string]) => void
+>foo3 : ([numberA2, nameA2, skillA2]?: [number, string, string]) => void
 >numberA2 : number
 >-1 : number
 >1 : number
@@ -82,7 +82,7 @@ function foo3([numberA2 = -1, nameA2 = "name", skillA2 = "skill"]: Robot = [-1,
 }
 
 function foo4([numberA3 = -1, ...robotAInfo]: Robot = [-1, "name", "skill"]) {
->foo4 : ([numberA3 = -1, ...robotAInfo]?: [number, string, string]) => void
+>foo4 : ([numberA3, ...robotAInfo]?: [number, string, string]) => void
 >numberA3 : number
 >-1 : number
 >1 : number
@@ -104,12 +104,12 @@ function foo4([numberA3 = -1, ...robotAInfo]: Robot = [-1, "name", "skill"]) {
 
 foo1(robotA);
 >foo1(robotA) : void
->foo1 : ([, nameA = "noName"]?: [number, string, string]) => void
+>foo1 : ([, nameA]?: [number, string, string]) => void
 >robotA : [number, string, string]
 
 foo1([2, "trimmer", "trimming"]);
 >foo1([2, "trimmer", "trimming"]) : void
->foo1 : ([, nameA = "noName"]?: [number, string, string]) => void
+>foo1 : ([, nameA]?: [number, string, string]) => void
 >[2, "trimmer", "trimming"] : [number, string, string]
 >2 : number
 >"trimmer" : string
@@ -117,12 +117,12 @@ foo1([2, "trimmer", "trimming"]);
 
 foo2(robotA);
 >foo2(robotA) : void
->foo2 : ([numberB = -1]?: [number, string, string]) => void
+>foo2 : ([numberB]?: [number, string, string]) => void
 >robotA : [number, string, string]
 
 foo2([2, "trimmer", "trimming"]);
 >foo2([2, "trimmer", "trimming"]) : void
->foo2 : ([numberB = -1]?: [number, string, string]) => void
+>foo2 : ([numberB]?: [number, string, string]) => void
 >[2, "trimmer", "trimming"] : [number, string, string]
 >2 : number
 >"trimmer" : string
@@ -130,12 +130,12 @@ foo2([2, "trimmer", "trimming"]);
 
 foo3(robotA);
 >foo3(robotA) : void
->foo3 : ([numberA2 = -1, nameA2 = "name", skillA2 = "skill"]?: [number, string, string]) => void
+>foo3 : ([numberA2, nameA2, skillA2]?: [number, string, string]) => void
 >robotA : [number, string, string]
 
 foo3([2, "trimmer", "trimming"]);
 >foo3([2, "trimmer", "trimming"]) : void
->foo3 : ([numberA2 = -1, nameA2 = "name", skillA2 = "skill"]?: [number, string, string]) => void
+>foo3 : ([numberA2, nameA2, skillA2]?: [number, string, string]) => void
 >[2, "trimmer", "trimming"] : [number, string, string]
 >2 : number
 >"trimmer" : string
@@ -143,12 +143,12 @@ foo3([2, "trimmer", "trimming"]);
 
 foo4(robotA);
 >foo4(robotA) : void
->foo4 : ([numberA3 = -1, ...robotAInfo]?: [number, string, string]) => void
+>foo4 : ([numberA3, ...robotAInfo]?: [number, string, string]) => void
 >robotA : [number, string, string]
 
 foo4([2, "trimmer", "trimming"]);
 >foo4([2, "trimmer", "trimming"]) : void
->foo4 : ([numberA3 = -1, ...robotAInfo]?: [number, string, string]) => void
+>foo4 : ([numberA3, ...robotAInfo]?: [number, string, string]) => void
 >[2, "trimmer", "trimming"] : [number, string, string]
 >2 : number
 >"trimmer" : string
diff --git a/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPatternDefaultValues2.types b/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPatternDefaultValues2.types
index 52423dfce21..bd140d6a232 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPatternDefaultValues2.types
+++ b/tests/baselines/reference/sourceMapValidationDestructuringParametertArrayBindingPatternDefaultValues2.types
@@ -19,7 +19,7 @@ var robotA: Robot = ["trimmer", ["trimming", "edging"]];
 >"edging" : string
 
 function foo1([, skillA = ["noSkill", "noSkill"]]: Robot= ["name", ["skill1", "skill2"]]) {
->foo1 : ([, skillA = ["noSkill", "noSkill"]]?: [string, string[]]) => void
+>foo1 : ([, skillA]?: [string, string[]]) => void
 > : undefined
 >skillA : string[]
 >["noSkill", "noSkill"] : string[]
@@ -41,7 +41,7 @@ function foo1([, skillA = ["noSkill", "noSkill"]]: Robot= ["name", ["skill1", "s
 }
 
 function foo2([nameMB = "noName"]: Robot = ["name", ["skill1", "skill2"]]) {
->foo2 : ([nameMB = "noName"]?: [string, string[]]) => void
+>foo2 : ([nameMB]?: [string, string[]]) => void
 >nameMB : string
 >"noName" : string
 >Robot : [string, string[]]
@@ -60,10 +60,7 @@ function foo2([nameMB = "noName"]: Robot = ["name", ["skill1", "skill2"]]) {
 }
 
 function foo3([nameMA = "noName", [
->foo3 : ([nameMA = "noName", [
-    primarySkillA = "primary",
-    secondarySkillA = "secondary"
-] = ["noSkill", "noSkill"]]: [string, string[]]) => void
+>foo3 : ([nameMA, [primarySkillA, secondarySkillA]]: [string, string[]]) => void
 >nameMA : string
 >"noName" : string
 
@@ -91,12 +88,12 @@ function foo3([nameMA = "noName", [
 
 foo1(robotA);
 >foo1(robotA) : void
->foo1 : ([, skillA = ["noSkill", "noSkill"]]?: [string, string[]]) => void
+>foo1 : ([, skillA]?: [string, string[]]) => void
 >robotA : [string, string[]]
 
 foo1(["roomba", ["vaccum", "mopping"]]);
 >foo1(["roomba", ["vaccum", "mopping"]]) : void
->foo1 : ([, skillA = ["noSkill", "noSkill"]]?: [string, string[]]) => void
+>foo1 : ([, skillA]?: [string, string[]]) => void
 >["roomba", ["vaccum", "mopping"]] : [string, string[]]
 >"roomba" : string
 >["vaccum", "mopping"] : string[]
@@ -105,12 +102,12 @@ foo1(["roomba", ["vaccum", "mopping"]]);
 
 foo2(robotA);
 >foo2(robotA) : void
->foo2 : ([nameMB = "noName"]?: [string, string[]]) => void
+>foo2 : ([nameMB]?: [string, string[]]) => void
 >robotA : [string, string[]]
 
 foo2(["roomba", ["vaccum", "mopping"]]);
 >foo2(["roomba", ["vaccum", "mopping"]]) : void
->foo2 : ([nameMB = "noName"]?: [string, string[]]) => void
+>foo2 : ([nameMB]?: [string, string[]]) => void
 >["roomba", ["vaccum", "mopping"]] : [string, string[]]
 >"roomba" : string
 >["vaccum", "mopping"] : string[]
@@ -119,18 +116,12 @@ foo2(["roomba", ["vaccum", "mopping"]]);
 
 foo3(robotA);
 >foo3(robotA) : void
->foo3 : ([nameMA = "noName", [
-    primarySkillA = "primary",
-    secondarySkillA = "secondary"
-] = ["noSkill", "noSkill"]]: [string, string[]]) => void
+>foo3 : ([nameMA, [primarySkillA, secondarySkillA]]: [string, string[]]) => void
 >robotA : [string, string[]]
 
 foo3(["roomba", ["vaccum", "mopping"]]);
 >foo3(["roomba", ["vaccum", "mopping"]]) : void
->foo3 : ([nameMA = "noName", [
-    primarySkillA = "primary",
-    secondarySkillA = "secondary"
-] = ["noSkill", "noSkill"]]: [string, string[]]) => void
+>foo3 : ([nameMA, [primarySkillA, secondarySkillA]]: [string, string[]]) => void
 >["roomba", ["vaccum", "mopping"]] : [string, string[]]
 >"roomba" : string
 >["vaccum", "mopping"] : string[]
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/sourceMapValidationDestructuringVariableStatement.symbols b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement.symbols
index 3d8e925d8b3..91b73a7c220 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement.symbols
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement.symbols
@@ -3,10 +3,10 @@ interface Robot {
 >Robot : Symbol(Robot, Decl(sourceMapValidationDestructuringVariableStatement.ts, 0, 0))
 
     name: string;
->name : Symbol(name, Decl(sourceMapValidationDestructuringVariableStatement.ts, 0, 17))
+>name : Symbol(Robot.name, Decl(sourceMapValidationDestructuringVariableStatement.ts, 0, 17))
 
     skill: string;
->skill : Symbol(skill, Decl(sourceMapValidationDestructuringVariableStatement.ts, 1, 17))
+>skill : Symbol(Robot.skill, Decl(sourceMapValidationDestructuringVariableStatement.ts, 1, 17))
 }
 declare var console: {
 >console : Symbol(console, Decl(sourceMapValidationDestructuringVariableStatement.ts, 4, 11))
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/sourceMapValidationDestructuringVariableStatement1.symbols b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement1.symbols
index eb009ba9ad7..fd8995cc3ba 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement1.symbols
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatement1.symbols
@@ -3,10 +3,10 @@ interface Robot {
 >Robot : Symbol(Robot, Decl(sourceMapValidationDestructuringVariableStatement1.ts, 0, 0))
 
     name: string;
->name : Symbol(name, Decl(sourceMapValidationDestructuringVariableStatement1.ts, 0, 17))
+>name : Symbol(Robot.name, Decl(sourceMapValidationDestructuringVariableStatement1.ts, 0, 17))
 
     skill: string;
->skill : Symbol(skill, Decl(sourceMapValidationDestructuringVariableStatement1.ts, 1, 17))
+>skill : Symbol(Robot.skill, Decl(sourceMapValidationDestructuringVariableStatement1.ts, 1, 17))
 }
 declare var console: {
 >console : Symbol(console, Decl(sourceMapValidationDestructuringVariableStatement1.ts, 4, 11))
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/sourceMapValidationDestructuringVariableStatementDefaultValues.symbols b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementDefaultValues.symbols
index 1fc07bf4a17..85801e566b5 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementDefaultValues.symbols
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementDefaultValues.symbols
@@ -3,10 +3,10 @@ interface Robot {
 >Robot : Symbol(Robot, Decl(sourceMapValidationDestructuringVariableStatementDefaultValues.ts, 0, 0))
 
     name: string;
->name : Symbol(name, Decl(sourceMapValidationDestructuringVariableStatementDefaultValues.ts, 0, 17))
+>name : Symbol(Robot.name, Decl(sourceMapValidationDestructuringVariableStatementDefaultValues.ts, 0, 17))
 
     skill: string;
->skill : Symbol(skill, Decl(sourceMapValidationDestructuringVariableStatementDefaultValues.ts, 1, 17))
+>skill : Symbol(Robot.skill, Decl(sourceMapValidationDestructuringVariableStatementDefaultValues.ts, 1, 17))
 }
 declare var console: {
 >console : Symbol(console, Decl(sourceMapValidationDestructuringVariableStatementDefaultValues.ts, 4, 11))
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/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.symbols b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.symbols
index 09b66f24ad8..833212c606a 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.symbols
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.symbols
@@ -10,10 +10,10 @@ interface Robot {
 >Robot : Symbol(Robot, Decl(sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.ts, 2, 1))
 
     name: string;
->name : Symbol(name, Decl(sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.ts, 3, 17))
+>name : Symbol(Robot.name, Decl(sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.ts, 3, 17))
 
     skills: {
->skills : Symbol(skills, Decl(sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.ts, 4, 17))
+>skills : Symbol(Robot.skills, Decl(sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.ts, 4, 17))
 
         primary: string;
 >primary : Symbol(primary, Decl(sourceMapValidationDestructuringVariableStatementNestedObjectBindingPattern.ts, 5, 13))
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/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.symbols b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.symbols
index a9a3a91f824..d0f04399e3f 100644
--- a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.symbols
+++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.symbols
@@ -10,10 +10,10 @@ interface Robot {
 >Robot : Symbol(Robot, Decl(sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.ts, 2, 1))
 
     name: string;
->name : Symbol(name, Decl(sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.ts, 3, 17))
+>name : Symbol(Robot.name, Decl(sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.ts, 3, 17))
 
     skills: {
->skills : Symbol(skills, Decl(sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.ts, 4, 17))
+>skills : Symbol(Robot.skills, Decl(sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.ts, 4, 17))
 
         primary?: string;
 >primary : Symbol(primary, Decl(sourceMapValidationDestructuringVariableStatementNestedObjectBindingPatternWithDefaultValues.ts, 5, 13))
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/sourceMapValidationExportAssignment.symbols b/tests/baselines/reference/sourceMapValidationExportAssignment.symbols
index 2506d52fb87..57d619eb998 100644
--- a/tests/baselines/reference/sourceMapValidationExportAssignment.symbols
+++ b/tests/baselines/reference/sourceMapValidationExportAssignment.symbols
@@ -3,7 +3,7 @@ class a {
 >a : Symbol(a, Decl(sourceMapValidationExportAssignment.ts, 0, 0))
 
     public c;
->c : Symbol(c, Decl(sourceMapValidationExportAssignment.ts, 0, 9))
+>c : Symbol(a.c, Decl(sourceMapValidationExportAssignment.ts, 0, 9))
 }
 export = a;
 >a : Symbol(a, Decl(sourceMapValidationExportAssignment.ts, 0, 0))
diff --git a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.symbols b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.symbols
index 91e2de7a2b9..72e435af089 100644
--- a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.symbols
+++ b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.symbols
@@ -3,7 +3,7 @@ class a {
 >a : Symbol(a, Decl(sourceMapValidationExportAssignmentCommonjs.ts, 0, 0))
 
     public c;
->c : Symbol(c, Decl(sourceMapValidationExportAssignmentCommonjs.ts, 0, 9))
+>c : Symbol(a.c, Decl(sourceMapValidationExportAssignmentCommonjs.ts, 0, 9))
 }
 export = a;
 >a : Symbol(a, Decl(sourceMapValidationExportAssignmentCommonjs.ts, 0, 0))
diff --git a/tests/baselines/reference/sourceMapValidationFunctions.js.map b/tests/baselines/reference/sourceMapValidationFunctions.js.map
index 7578efc11f8..2aaa87c4fe7 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,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,kBAAA,EAAA,MAAM;IAAc,oBAAuB;SAAvB,WAAuB,CAAvB,sBAAuB,CAAvB,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..96fd9009739 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)
 ---
@@ -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)
 ---
diff --git a/tests/baselines/reference/sourceMapValidationImport.js.map b/tests/baselines/reference/sourceMapValidationImport.js.map
index 2a1a549beff..7d1182a1873 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,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,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..cc4798de5a0 100644
--- a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt
@@ -171,28 +171,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/sourceMapWithMultipleFilesWithFileEndingWithInterface.symbols b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.symbols
index 4f48bb97347..f262fb43781 100644
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.symbols
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.symbols
@@ -9,19 +9,19 @@ interface Navigator {
 >Navigator : Symbol(Navigator, Decl(a.ts, 2, 1))
 
     getGamepads(func?: any): any;
->getGamepads : Symbol(getGamepads, Decl(a.ts, 3, 21))
+>getGamepads : Symbol(Navigator.getGamepads, Decl(a.ts, 3, 21))
 >func : Symbol(func, Decl(a.ts, 4, 16))
 
     webkitGetGamepads(func?: any): any
->webkitGetGamepads : Symbol(webkitGetGamepads, Decl(a.ts, 4, 33))
+>webkitGetGamepads : Symbol(Navigator.webkitGetGamepads, Decl(a.ts, 4, 33))
 >func : Symbol(func, Decl(a.ts, 5, 22))
 
     msGetGamepads(func?: any): any;
->msGetGamepads : Symbol(msGetGamepads, Decl(a.ts, 5, 38))
+>msGetGamepads : Symbol(Navigator.msGetGamepads, Decl(a.ts, 5, 38))
 >func : Symbol(func, Decl(a.ts, 6, 18))
 
     webkitGamepads(func?: any): any;
->webkitGamepads : Symbol(webkitGamepads, Decl(a.ts, 6, 35))
+>webkitGamepads : Symbol(Navigator.webkitGamepads, Decl(a.ts, 6, 35))
 >func : Symbol(func, Decl(a.ts, 7, 19))
 }
 
diff --git a/tests/baselines/reference/specializationError.symbols b/tests/baselines/reference/specializationError.symbols
index 906cfee1e65..b866a7034df 100644
--- a/tests/baselines/reference/specializationError.symbols
+++ b/tests/baselines/reference/specializationError.symbols
@@ -4,7 +4,7 @@ interface Promise<T> {
 >T : Symbol(T, Decl(specializationError.ts, 0, 18))
 
     then<U>(value: T): void;
->then : Symbol(then, Decl(specializationError.ts, 0, 22))
+>then : Symbol(Promise.then, Decl(specializationError.ts, 0, 22))
 >U : Symbol(U, Decl(specializationError.ts, 1, 9))
 >value : Symbol(value, Decl(specializationError.ts, 1, 12))
 >T : Symbol(T, Decl(specializationError.ts, 0, 18))
@@ -14,12 +14,12 @@ interface Bar {
 >Bar : Symbol(Bar, Decl(specializationError.ts, 2, 1))
 
     bar(value: "Menu"): Promise<string>;
->bar : Symbol(bar, Decl(specializationError.ts, 4, 15), Decl(specializationError.ts, 5, 40), Decl(specializationError.ts, 6, 55))
+>bar : Symbol(Bar.bar, Decl(specializationError.ts, 4, 15), Decl(specializationError.ts, 5, 40), Decl(specializationError.ts, 6, 55))
 >value : Symbol(value, Decl(specializationError.ts, 5, 8))
 >Promise : Symbol(Promise, Decl(specializationError.ts, 0, 0))
 
     bar<T>(value: string, element: string): Promise<T>;
->bar : Symbol(bar, Decl(specializationError.ts, 4, 15), Decl(specializationError.ts, 5, 40), Decl(specializationError.ts, 6, 55))
+>bar : Symbol(Bar.bar, Decl(specializationError.ts, 4, 15), Decl(specializationError.ts, 5, 40), Decl(specializationError.ts, 6, 55))
 >T : Symbol(T, Decl(specializationError.ts, 6, 8))
 >value : Symbol(value, Decl(specializationError.ts, 6, 11))
 >element : Symbol(element, Decl(specializationError.ts, 6, 25))
@@ -27,7 +27,7 @@ interface Bar {
 >T : Symbol(T, Decl(specializationError.ts, 6, 8))
 
     bar<T>(value: string): Promise<T>;
->bar : Symbol(bar, Decl(specializationError.ts, 4, 15), Decl(specializationError.ts, 5, 40), Decl(specializationError.ts, 6, 55))
+>bar : Symbol(Bar.bar, Decl(specializationError.ts, 4, 15), Decl(specializationError.ts, 5, 40), Decl(specializationError.ts, 6, 55))
 >T : Symbol(T, Decl(specializationError.ts, 7, 8))
 >value : Symbol(value, Decl(specializationError.ts, 7, 11))
 >Promise : Symbol(Promise, Decl(specializationError.ts, 0, 0))
diff --git a/tests/baselines/reference/specializationsShouldNotAffectEachOther.symbols b/tests/baselines/reference/specializationsShouldNotAffectEachOther.symbols
index 9114afccdf4..5c93a74fe51 100644
--- a/tests/baselines/reference/specializationsShouldNotAffectEachOther.symbols
+++ b/tests/baselines/reference/specializationsShouldNotAffectEachOther.symbols
@@ -4,7 +4,7 @@ interface Series  {
 >Series : Symbol(Series, Decl(specializationsShouldNotAffectEachOther.ts, 0, 0))
 
     data: string[];
->data : Symbol(data, Decl(specializationsShouldNotAffectEachOther.ts, 1, 19))
+>data : Symbol(Series.data, Decl(specializationsShouldNotAffectEachOther.ts, 1, 19))
 }
 
 var series: Series;
diff --git a/tests/baselines/reference/specializeVarArgs1.symbols b/tests/baselines/reference/specializeVarArgs1.symbols
index 836e3613f07..8ac5369ce91 100644
--- a/tests/baselines/reference/specializeVarArgs1.symbols
+++ b/tests/baselines/reference/specializeVarArgs1.symbols
@@ -14,7 +14,7 @@ interface ObservableArray<T> extends Observable<T[]>
 {
 
     push(...values: T[]);
->push : Symbol(push, Decl(specializeVarArgs1.ts, 6, 1))
+>push : Symbol(ObservableArray.push, Decl(specializeVarArgs1.ts, 6, 1))
 >values : Symbol(values, Decl(specializeVarArgs1.ts, 8, 9))
 >T : Symbol(T, Decl(specializeVarArgs1.ts, 4, 26))
 
diff --git a/tests/baselines/reference/specializedInheritedConstructors1.symbols b/tests/baselines/reference/specializedInheritedConstructors1.symbols
index 97285e073cc..69ea33898ad 100644
--- a/tests/baselines/reference/specializedInheritedConstructors1.symbols
+++ b/tests/baselines/reference/specializedInheritedConstructors1.symbols
@@ -4,7 +4,7 @@ interface ViewOptions<TModel> {
 >TModel : Symbol(TModel, Decl(specializedInheritedConstructors1.ts, 0, 22))
 
     model: TModel;
->model : Symbol(model, Decl(specializedInheritedConstructors1.ts, 0, 31))
+>model : Symbol(ViewOptions.model, Decl(specializedInheritedConstructors1.ts, 0, 31))
 >TModel : Symbol(TModel, Decl(specializedInheritedConstructors1.ts, 0, 22))
 }
 
@@ -18,7 +18,7 @@ class View<TModel> {
 >TModel : Symbol(TModel, Decl(specializedInheritedConstructors1.ts, 4, 11))
 
     model: TModel;
->model : Symbol(model, Decl(specializedInheritedConstructors1.ts, 5, 49))
+>model : Symbol(View.model, Decl(specializedInheritedConstructors1.ts, 5, 49))
 >TModel : Symbol(TModel, Decl(specializedInheritedConstructors1.ts, 4, 11))
 }
 
diff --git a/tests/baselines/reference/specializedLambdaTypeArguments.symbols b/tests/baselines/reference/specializedLambdaTypeArguments.symbols
index 44083d6c7c8..9799199a1d7 100644
--- a/tests/baselines/reference/specializedLambdaTypeArguments.symbols
+++ b/tests/baselines/reference/specializedLambdaTypeArguments.symbols
@@ -4,7 +4,7 @@ class X<A> {
 >A : Symbol(A, Decl(specializedLambdaTypeArguments.ts, 0, 8))
 
 	prop: X< <Tany>() => Tany >;
->prop : Symbol(prop, Decl(specializedLambdaTypeArguments.ts, 0, 12))
+>prop : Symbol(X.prop, Decl(specializedLambdaTypeArguments.ts, 0, 12))
 >X : Symbol(X, Decl(specializedLambdaTypeArguments.ts, 0, 0))
 >Tany : Symbol(Tany, Decl(specializedLambdaTypeArguments.ts, 1, 11))
 >Tany : Symbol(Tany, Decl(specializedLambdaTypeArguments.ts, 1, 11))
diff --git a/tests/baselines/reference/specializedOverloadWithRestParameters.symbols b/tests/baselines/reference/specializedOverloadWithRestParameters.symbols
index 77e16aced4d..0f5832ab53d 100644
--- a/tests/baselines/reference/specializedOverloadWithRestParameters.symbols
+++ b/tests/baselines/reference/specializedOverloadWithRestParameters.symbols
@@ -1,12 +1,12 @@
 === tests/cases/compiler/specializedOverloadWithRestParameters.ts ===
 class Base { foo() { } }
 >Base : Symbol(Base, Decl(specializedOverloadWithRestParameters.ts, 0, 0))
->foo : Symbol(foo, Decl(specializedOverloadWithRestParameters.ts, 0, 12))
+>foo : Symbol(Base.foo, Decl(specializedOverloadWithRestParameters.ts, 0, 12))
 
 class Derived1 extends Base { bar() { } }
 >Derived1 : Symbol(Derived1, Decl(specializedOverloadWithRestParameters.ts, 0, 24))
 >Base : Symbol(Base, Decl(specializedOverloadWithRestParameters.ts, 0, 0))
->bar : Symbol(bar, Decl(specializedOverloadWithRestParameters.ts, 1, 29))
+>bar : Symbol(Derived1.bar, Decl(specializedOverloadWithRestParameters.ts, 1, 29))
 
 function f(tagName: 'span', ...args): Derived1;   // error
 >f : Symbol(f, Decl(specializedOverloadWithRestParameters.ts, 1, 41), Decl(specializedOverloadWithRestParameters.ts, 2, 47), Decl(specializedOverloadWithRestParameters.ts, 3, 43))
diff --git a/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.symbols b/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.symbols
index 8b1bbfb6aab..164361c14ac 100644
--- a/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.symbols
+++ b/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.symbols
@@ -18,15 +18,15 @@ class C {
 >C : Symbol(C, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 5, 24))
 
     foo(x: 'a');
->foo : Symbol(foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 7, 9), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 8, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 9, 19))
+>foo : Symbol(C.foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 7, 9), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 8, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 9, 19))
 >x : Symbol(x, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 8, 8))
 
     foo(x: string);
->foo : Symbol(foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 7, 9), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 8, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 9, 19))
+>foo : Symbol(C.foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 7, 9), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 8, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 9, 19))
 >x : Symbol(x, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 9, 8))
 
     foo(x: any) { }
->foo : Symbol(foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 7, 9), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 8, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 9, 19))
+>foo : Symbol(C.foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 7, 9), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 8, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 9, 19))
 >x : Symbol(x, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 10, 8))
 }
 
@@ -35,43 +35,43 @@ class C2<T> {
 >T : Symbol(T, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 13, 9))
 
     foo(x: 'a');
->foo : Symbol(foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 13, 13), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 14, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 15, 19), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 16, 14))
+>foo : Symbol(C2.foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 13, 13), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 14, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 15, 19), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 16, 14))
 >x : Symbol(x, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 14, 8))
 
     foo(x: string);
->foo : Symbol(foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 13, 13), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 14, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 15, 19), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 16, 14))
+>foo : Symbol(C2.foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 13, 13), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 14, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 15, 19), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 16, 14))
 >x : Symbol(x, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 15, 8))
 
     foo(x: T);
->foo : Symbol(foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 13, 13), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 14, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 15, 19), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 16, 14))
+>foo : Symbol(C2.foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 13, 13), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 14, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 15, 19), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 16, 14))
 >x : Symbol(x, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 16, 8))
 >T : Symbol(T, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 13, 9))
 
     foo(x: any) { }
->foo : Symbol(foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 13, 13), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 14, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 15, 19), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 16, 14))
+>foo : Symbol(C2.foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 13, 13), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 14, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 15, 19), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 16, 14))
 >x : Symbol(x, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 17, 8))
 }
 
 class C3<T extends String> {
 >C3 : Symbol(C3, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 18, 1))
 >T : Symbol(T, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 20, 9))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     foo(x: 'a');
->foo : Symbol(foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 20, 28), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 21, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 22, 19), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 23, 14))
+>foo : Symbol(C3.foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 20, 28), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 21, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 22, 19), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 23, 14))
 >x : Symbol(x, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 21, 8))
 
     foo(x: string);
->foo : Symbol(foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 20, 28), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 21, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 22, 19), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 23, 14))
+>foo : Symbol(C3.foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 20, 28), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 21, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 22, 19), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 23, 14))
 >x : Symbol(x, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 22, 8))
 
     foo(x: T);
->foo : Symbol(foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 20, 28), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 21, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 22, 19), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 23, 14))
+>foo : Symbol(C3.foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 20, 28), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 21, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 22, 19), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 23, 14))
 >x : Symbol(x, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 23, 8))
 >T : Symbol(T, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 20, 9))
 
     foo(x: any) { }
->foo : Symbol(foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 20, 28), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 21, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 22, 19), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 23, 14))
+>foo : Symbol(C3.foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 20, 28), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 21, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 22, 19), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 23, 14))
 >x : Symbol(x, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 24, 8))
 }
 
@@ -88,15 +88,15 @@ interface I {
 >x : Symbol(x, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 30, 5))
 
     foo(x: 'a');
->foo : Symbol(foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 30, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 31, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 32, 19))
+>foo : Symbol(I.foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 30, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 31, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 32, 19))
 >x : Symbol(x, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 31, 8))
 
     foo(x: string);
->foo : Symbol(foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 30, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 31, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 32, 19))
+>foo : Symbol(I.foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 30, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 31, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 32, 19))
 >x : Symbol(x, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 32, 8))
 
     foo(x: number);
->foo : Symbol(foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 30, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 31, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 32, 19))
+>foo : Symbol(I.foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 30, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 31, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 32, 19))
 >x : Symbol(x, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 33, 8))
 }
 
@@ -115,15 +115,15 @@ interface I2<T> {
 >x : Symbol(x, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 39, 5))
 
     foo(x: 'a');
->foo : Symbol(foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 39, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 40, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 41, 19))
+>foo : Symbol(I2.foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 39, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 40, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 41, 19))
 >x : Symbol(x, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 40, 8))
 
     foo(x: string);
->foo : Symbol(foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 39, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 40, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 41, 19))
+>foo : Symbol(I2.foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 39, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 40, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 41, 19))
 >x : Symbol(x, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 41, 8))
 
     foo(x: T);
->foo : Symbol(foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 39, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 40, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 41, 19))
+>foo : Symbol(I2.foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 39, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 40, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 41, 19))
 >x : Symbol(x, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 42, 8))
 >T : Symbol(T, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 36, 13))
 }
@@ -131,7 +131,7 @@ interface I2<T> {
 interface I3<T extends String> {
 >I3 : Symbol(I3, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 43, 1))
 >T : Symbol(T, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 45, 13))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     (x: 'a');
 >x : Symbol(x, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 46, 5))
@@ -144,15 +144,15 @@ interface I3<T extends String> {
 >T : Symbol(T, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 45, 13))
 
     foo(x: 'a');
->foo : Symbol(foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 48, 11), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 49, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 50, 19))
+>foo : Symbol(I3.foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 48, 11), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 49, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 50, 19))
 >x : Symbol(x, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 49, 8))
 
     foo(x: string);
->foo : Symbol(foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 48, 11), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 49, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 50, 19))
+>foo : Symbol(I3.foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 48, 11), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 49, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 50, 19))
 >x : Symbol(x, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 50, 8))
 
     foo(x: T);
->foo : Symbol(foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 48, 11), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 49, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 50, 19))
+>foo : Symbol(I3.foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 48, 11), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 49, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 50, 19))
 >x : Symbol(x, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 51, 8))
 >T : Symbol(T, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 45, 13))
 }
@@ -236,7 +236,7 @@ var a3: {
     foo<T extends String>(x: T);
 >foo : Symbol(foo, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 75, 16), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 76, 19), Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 77, 16))
 >T : Symbol(T, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 78, 8))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 78, 26))
 >T : Symbol(T, Decl(specializedSignatureIsSubtypeOfNonSpecializedSignature.ts, 78, 8))
 }
diff --git a/tests/baselines/reference/specializedSignatureOverloadReturnTypeWithIndexers.symbols b/tests/baselines/reference/specializedSignatureOverloadReturnTypeWithIndexers.symbols
index ea966cfda18..2aec70cdc98 100644
--- a/tests/baselines/reference/specializedSignatureOverloadReturnTypeWithIndexers.symbols
+++ b/tests/baselines/reference/specializedSignatureOverloadReturnTypeWithIndexers.symbols
@@ -3,12 +3,12 @@ interface A {
 >A : Symbol(A, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 0, 0))
 
     f(p: string): { [p: string]: string; };
->f : Symbol(f, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 0, 13), Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 1, 43))
+>f : Symbol(A.f, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 0, 13), Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 1, 43))
 >p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 1, 6))
 >p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 1, 21))
 
     f(p: "spec"): { [p: string]: any; } // Should be ok
->f : Symbol(f, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 0, 13), Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 1, 43))
+>f : Symbol(A.f, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 0, 13), Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 1, 43))
 >p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 2, 6))
 >p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 2, 21))
 }
@@ -16,12 +16,12 @@ interface B {
 >B : Symbol(B, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 3, 1))
 
     f(p: string): { [p: number]: string; };
->f : Symbol(f, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 4, 13), Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 5, 43))
+>f : Symbol(B.f, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 4, 13), Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 5, 43))
 >p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 5, 6))
 >p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 5, 21))
 
     f(p: "spec"): { [p: string]: any; } // Should be ok
->f : Symbol(f, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 4, 13), Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 5, 43))
+>f : Symbol(B.f, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 4, 13), Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 5, 43))
 >p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 6, 6))
 >p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 6, 21))
 }
@@ -29,12 +29,12 @@ interface C {
 >C : Symbol(C, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 7, 1))
 
     f(p: string): { [p: number]: string; };
->f : Symbol(f, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 8, 13), Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 9, 43))
+>f : Symbol(C.f, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 8, 13), Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 9, 43))
 >p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 9, 6))
 >p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 9, 21))
 
     f(p: "spec"): { [p: number]: any; } // Should be ok
->f : Symbol(f, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 8, 13), Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 9, 43))
+>f : Symbol(C.f, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 8, 13), Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 9, 43))
 >p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 10, 6))
 >p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 10, 21))
 }
@@ -42,12 +42,12 @@ interface D {
 >D : Symbol(D, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 11, 1))
 
     f(p: string): { [p: string]: string; };
->f : Symbol(f, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 12, 13), Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 13, 43))
+>f : Symbol(D.f, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 12, 13), Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 13, 43))
 >p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 13, 6))
 >p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 13, 21))
 
     f(p: "spec"): { [p: number]: any; } // Should be error
->f : Symbol(f, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 12, 13), Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 13, 43))
+>f : Symbol(D.f, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 12, 13), Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 13, 43))
 >p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 14, 6))
 >p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 14, 21))
 }
diff --git a/tests/baselines/reference/staticAndMemberFunctions.symbols b/tests/baselines/reference/staticAndMemberFunctions.symbols
index 8df6cb52f3c..3c4e6380801 100644
--- a/tests/baselines/reference/staticAndMemberFunctions.symbols
+++ b/tests/baselines/reference/staticAndMemberFunctions.symbols
@@ -6,5 +6,5 @@ class T {
 >x : Symbol(T.x, Decl(staticAndMemberFunctions.ts, 0, 9))
 
     public y() { }
->y : Symbol(y, Decl(staticAndMemberFunctions.ts, 1, 18))
+>y : Symbol(T.y, Decl(staticAndMemberFunctions.ts, 1, 18))
 }
diff --git a/tests/baselines/reference/staticAndNonStaticPropertiesSameName.symbols b/tests/baselines/reference/staticAndNonStaticPropertiesSameName.symbols
index 99cc732465d..c0d6667087a 100644
--- a/tests/baselines/reference/staticAndNonStaticPropertiesSameName.symbols
+++ b/tests/baselines/reference/staticAndNonStaticPropertiesSameName.symbols
@@ -3,13 +3,13 @@ class C {
 >C : Symbol(C, Decl(staticAndNonStaticPropertiesSameName.ts, 0, 0))
 
     x: number;
->x : Symbol(x, Decl(staticAndNonStaticPropertiesSameName.ts, 0, 9))
+>x : Symbol(C.x, Decl(staticAndNonStaticPropertiesSameName.ts, 0, 9))
 
     static x: number;
 >x : Symbol(C.x, Decl(staticAndNonStaticPropertiesSameName.ts, 1, 14))
 
     f() { }
->f : Symbol(f, Decl(staticAndNonStaticPropertiesSameName.ts, 2, 21))
+>f : Symbol(C.f, Decl(staticAndNonStaticPropertiesSameName.ts, 2, 21))
 
     static f() { }
 >f : Symbol(C.f, Decl(staticAndNonStaticPropertiesSameName.ts, 4, 11))
diff --git a/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.js b/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.js
new file mode 100644
index 00000000000..a641ecd6f03
--- /dev/null
+++ b/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.js
@@ -0,0 +1,295 @@
+//// [staticAnonymousTypeNotReferencingTypeParameter.ts]
+// This test case is a condensed version of Angular 2's ListWrapper. Prior to #7448
+// this would cause the compiler to run out of memory.
+
+function outer<T>(x: T) {
+  class Inner {
+    static y: T = x;
+  }
+  return Inner;
+}
+let y: number = outer(5).y;
+
+class ListWrapper2 {
+  static clone<T>(dit: typeof ListWrapper2, array: T[]): T[] { return array.slice(0); }
+  static reversed<T>(dit: typeof ListWrapper2, array: T[]): T[] {
+    var a = ListWrapper2.clone(dit, array);
+    return a;
+  }
+}
+namespace tessst {
+    /**
+     * Iterates through 'array' by index and performs the callback on each element of array until the callback
+     * returns a truthy value, then returns that value.
+     * If no such value is found, the callback is applied to each element of array and undefined is returned.
+     */
+    export function funkyFor<T, U>(array: T[], callback: (element: T, index: number) => U): U {
+        if (array) {
+            for (let i = 0, len = array.length; i < len; i++) {
+                const result = callback(array[i], i);
+                if (result) {
+                    return result;
+                }
+            }
+        }
+        return undefined;
+    }
+}
+interface Scanner {
+  scanRange<T>(start: number, length: number, callback: () => T): T;
+}
+class ListWrapper {
+  // JS has no way to express a statically fixed size list, but dart does so we
+  // keep both methods.
+  static createFixedSize(dit: typeof ListWrapper, size: number): any[] { return new Array(size); }
+  static createGrowableSize(dit: typeof ListWrapper, size: number): any[] { return new Array(size); }
+  static clone<T>(dit: typeof ListWrapper, array: T[]): T[] { return array.slice(0); }
+  static forEachWithIndex<T>(dit: typeof ListWrapper, array: T[], fn: (t: T, n: number) => void) {
+    for (var i = 0; i < array.length; i++) {
+      fn(array[i], i);
+    }
+  }
+  static first<T>(dit: typeof ListWrapper, array: T[]): T {
+    if (!array) return null;
+    return array[0];
+  }
+  static last<T>(dit: typeof ListWrapper, array: T[]): T {
+    if (!array || array.length == 0) return null;
+    return array[array.length - 1];
+  }
+  static indexOf<T>(dit: typeof ListWrapper, array: T[], value: T, startIndex: number = 0): number {
+    return array.indexOf(value, startIndex);
+  }
+  static contains<T>(dit: typeof ListWrapper, list: T[], el: T): boolean { return list.indexOf(el) !== -1; }
+  static reversed<T>(dit: typeof ListWrapper, array: T[]): T[] {
+    var a = ListWrapper.clone(dit, array);
+    let scanner: Scanner;
+    scanner.scanRange(3, 5, () => {  });
+    return tessst.funkyFor(array, t => t.toString()) ? a.reverse() : a;
+  }
+  static concat(dit: typeof ListWrapper, a: any[], b: any[]): any[] { return a.concat(b); }
+  static insert<T>(dit: typeof ListWrapper, list: T[], index: number, value: T) { list.splice(index, 0, value); }
+  static removeAt<T>(dit: typeof ListWrapper, list: T[], index: number): T {
+    var res = list[index];
+    list.splice(index, 1);
+    return res;
+  }
+  static removeAll<T>(dit: typeof ListWrapper, list: T[], items: T[]) {
+    for (var i = 0; i < items.length; ++i) {
+      var index = list.indexOf(items[i]);
+      list.splice(index, 1);
+    }
+  }
+  static remove<T>(dit: typeof ListWrapper, list: T[], el: T): boolean {
+    var index = list.indexOf(el);
+    if (index > -1) {
+      list.splice(index, 1);
+      return true;
+    }
+    return false;
+  }
+  static clear(dit: typeof ListWrapper, list: any[]) { list.length = 0; }
+  static isEmpty(dit: typeof ListWrapper, list: any[]): boolean { return list.length == 0; }
+  static fill(dit: typeof ListWrapper, list: any[], value: any, start: number = 0, end: number = null) {
+    list.fill(value, start, end === null ? list.length : end);
+  }
+  static equals(dit: typeof ListWrapper, a: any[], b: any[]): boolean {
+    if (a.length != b.length) return false;
+    for (var i = 0; i < a.length; ++i) {
+      if (a[i] !== b[i]) return false;
+    }
+    return true;
+  }
+  static slice<T>(dit: typeof ListWrapper, l: T[], from: number = 0, to: number = null): T[] {
+    return l.slice(from, to === null ? undefined : to);
+  }
+  static splice<T>(dit: typeof ListWrapper, l: T[], from: number, length: number): T[] { return l.splice(from, length); }
+  static sort<T>(dit: typeof ListWrapper, l: T[], compareFn?: (a: T, b: T) => number) {
+    if (isPresent(compareFn)) {
+      l.sort(compareFn);
+    } else {
+      l.sort();
+    }
+  }
+  static toString<T>(dit: typeof ListWrapper, l: T[]): string { return l.toString(); }
+  static toJSON<T>(dit: typeof ListWrapper, l: T[]): string { return JSON.stringify(l); }
+
+  static maximum<T>(dit: typeof ListWrapper, list: T[], predicate: (t: T) => number): T {
+    if (list.length == 0) {
+      return null;
+    }
+    var solution: T = null;
+    var maxValue = -Infinity;
+    for (var index = 0; index < list.length; index++) {
+      var candidate = list[index];
+      if (isBlank(candidate)) {
+        continue;
+      }
+      var candidateValue = predicate(candidate);
+      if (candidateValue > maxValue) {
+        solution = candidate;
+        maxValue = candidateValue;
+      }
+    }
+    return solution;
+  }
+}
+let cloned = ListWrapper.clone(ListWrapper, [1,2,3,4]);
+declare function isBlank(x: any): boolean;
+declare function isPresent<T>(compareFn?: (a: T, b: T) => number): boolean;
+interface Array<T> {
+	fill(value: any, start: number, end: number): void;
+}
+
+//// [staticAnonymousTypeNotReferencingTypeParameter.js]
+// This test case is a condensed version of Angular 2's ListWrapper. Prior to #7448
+// this would cause the compiler to run out of memory.
+function outer(x) {
+    var Inner = (function () {
+        function Inner() {
+        }
+        return Inner;
+    }());
+    Inner.y = x;
+    return Inner;
+}
+var y = outer(5).y;
+var ListWrapper2 = (function () {
+    function ListWrapper2() {
+    }
+    ListWrapper2.clone = function (dit, array) { return array.slice(0); };
+    ListWrapper2.reversed = function (dit, array) {
+        var a = ListWrapper2.clone(dit, array);
+        return a;
+    };
+    return ListWrapper2;
+}());
+var tessst;
+(function (tessst) {
+    /**
+     * Iterates through 'array' by index and performs the callback on each element of array until the callback
+     * returns a truthy value, then returns that value.
+     * If no such value is found, the callback is applied to each element of array and undefined is returned.
+     */
+    function funkyFor(array, callback) {
+        if (array) {
+            for (var i = 0, len = array.length; i < len; i++) {
+                var result = callback(array[i], i);
+                if (result) {
+                    return result;
+                }
+            }
+        }
+        return undefined;
+    }
+    tessst.funkyFor = funkyFor;
+})(tessst || (tessst = {}));
+var ListWrapper = (function () {
+    function ListWrapper() {
+    }
+    // JS has no way to express a statically fixed size list, but dart does so we
+    // keep both methods.
+    ListWrapper.createFixedSize = function (dit, size) { return new Array(size); };
+    ListWrapper.createGrowableSize = function (dit, size) { return new Array(size); };
+    ListWrapper.clone = function (dit, array) { return array.slice(0); };
+    ListWrapper.forEachWithIndex = function (dit, array, fn) {
+        for (var i = 0; i < array.length; i++) {
+            fn(array[i], i);
+        }
+    };
+    ListWrapper.first = function (dit, array) {
+        if (!array)
+            return null;
+        return array[0];
+    };
+    ListWrapper.last = function (dit, array) {
+        if (!array || array.length == 0)
+            return null;
+        return array[array.length - 1];
+    };
+    ListWrapper.indexOf = function (dit, array, value, startIndex) {
+        if (startIndex === void 0) { startIndex = 0; }
+        return array.indexOf(value, startIndex);
+    };
+    ListWrapper.contains = function (dit, list, el) { return list.indexOf(el) !== -1; };
+    ListWrapper.reversed = function (dit, array) {
+        var a = ListWrapper.clone(dit, array);
+        var scanner;
+        scanner.scanRange(3, 5, function () { });
+        return tessst.funkyFor(array, function (t) { return t.toString(); }) ? a.reverse() : a;
+    };
+    ListWrapper.concat = function (dit, a, b) { return a.concat(b); };
+    ListWrapper.insert = function (dit, list, index, value) { list.splice(index, 0, value); };
+    ListWrapper.removeAt = function (dit, list, index) {
+        var res = list[index];
+        list.splice(index, 1);
+        return res;
+    };
+    ListWrapper.removeAll = function (dit, list, items) {
+        for (var i = 0; i < items.length; ++i) {
+            var index = list.indexOf(items[i]);
+            list.splice(index, 1);
+        }
+    };
+    ListWrapper.remove = function (dit, list, el) {
+        var index = list.indexOf(el);
+        if (index > -1) {
+            list.splice(index, 1);
+            return true;
+        }
+        return false;
+    };
+    ListWrapper.clear = function (dit, list) { list.length = 0; };
+    ListWrapper.isEmpty = function (dit, list) { return list.length == 0; };
+    ListWrapper.fill = function (dit, list, value, start, end) {
+        if (start === void 0) { start = 0; }
+        if (end === void 0) { end = null; }
+        list.fill(value, start, end === null ? list.length : end);
+    };
+    ListWrapper.equals = function (dit, a, b) {
+        if (a.length != b.length)
+            return false;
+        for (var i = 0; i < a.length; ++i) {
+            if (a[i] !== b[i])
+                return false;
+        }
+        return true;
+    };
+    ListWrapper.slice = function (dit, l, from, to) {
+        if (from === void 0) { from = 0; }
+        if (to === void 0) { to = null; }
+        return l.slice(from, to === null ? undefined : to);
+    };
+    ListWrapper.splice = function (dit, l, from, length) { return l.splice(from, length); };
+    ListWrapper.sort = function (dit, l, compareFn) {
+        if (isPresent(compareFn)) {
+            l.sort(compareFn);
+        }
+        else {
+            l.sort();
+        }
+    };
+    ListWrapper.toString = function (dit, l) { return l.toString(); };
+    ListWrapper.toJSON = function (dit, l) { return JSON.stringify(l); };
+    ListWrapper.maximum = function (dit, list, predicate) {
+        if (list.length == 0) {
+            return null;
+        }
+        var solution = null;
+        var maxValue = -Infinity;
+        for (var index = 0; index < list.length; index++) {
+            var candidate = list[index];
+            if (isBlank(candidate)) {
+                continue;
+            }
+            var candidateValue = predicate(candidate);
+            if (candidateValue > maxValue) {
+                solution = candidate;
+                maxValue = candidateValue;
+            }
+        }
+        return solution;
+    };
+    return ListWrapper;
+}());
+var cloned = ListWrapper.clone(ListWrapper, [1, 2, 3, 4]);
diff --git a/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.symbols b/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.symbols
new file mode 100644
index 00000000000..a6aa91e3a56
--- /dev/null
+++ b/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.symbols
@@ -0,0 +1,667 @@
+=== tests/cases/compiler/staticAnonymousTypeNotReferencingTypeParameter.ts ===
+// This test case is a condensed version of Angular 2's ListWrapper. Prior to #7448
+// this would cause the compiler to run out of memory.
+
+function outer<T>(x: T) {
+>outer : Symbol(outer, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 0, 0))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 3, 15))
+>x : Symbol(x, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 3, 18))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 3, 15))
+
+  class Inner {
+>Inner : Symbol(Inner, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 3, 25))
+
+    static y: T = x;
+>y : Symbol(Inner.y, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 4, 15))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 3, 15))
+>x : Symbol(x, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 3, 18))
+  }
+  return Inner;
+>Inner : Symbol(Inner, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 3, 25))
+}
+let y: number = outer(5).y;
+>y : Symbol(y, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 9, 3))
+>outer(5).y : Symbol(Inner.y, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 4, 15))
+>outer : Symbol(outer, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 0, 0))
+>y : Symbol(Inner.y, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 4, 15))
+
+class ListWrapper2 {
+>ListWrapper2 : Symbol(ListWrapper2, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 9, 27))
+
+  static clone<T>(dit: typeof ListWrapper2, array: T[]): T[] { return array.slice(0); }
+>clone : Symbol(ListWrapper2.clone, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 11, 20))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 12, 15))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 12, 18))
+>ListWrapper2 : Symbol(ListWrapper2, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 9, 27))
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 12, 43))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 12, 15))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 12, 15))
+>array.slice : Symbol(Array.slice, Decl(lib.d.ts, --, --))
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 12, 43))
+>slice : Symbol(Array.slice, Decl(lib.d.ts, --, --))
+
+  static reversed<T>(dit: typeof ListWrapper2, array: T[]): T[] {
+>reversed : Symbol(ListWrapper2.reversed, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 12, 87))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 13, 18))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 13, 21))
+>ListWrapper2 : Symbol(ListWrapper2, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 9, 27))
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 13, 46))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 13, 18))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 13, 18))
+
+    var a = ListWrapper2.clone(dit, array);
+>a : Symbol(a, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 14, 7))
+>ListWrapper2.clone : Symbol(ListWrapper2.clone, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 11, 20))
+>ListWrapper2 : Symbol(ListWrapper2, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 9, 27))
+>clone : Symbol(ListWrapper2.clone, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 11, 20))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 13, 21))
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 13, 46))
+
+    return a;
+>a : Symbol(a, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 14, 7))
+  }
+}
+namespace tessst {
+>tessst : Symbol(tessst, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 17, 1))
+
+    /**
+     * Iterates through 'array' by index and performs the callback on each element of array until the callback
+     * returns a truthy value, then returns that value.
+     * If no such value is found, the callback is applied to each element of array and undefined is returned.
+     */
+    export function funkyFor<T, U>(array: T[], callback: (element: T, index: number) => U): U {
+>funkyFor : Symbol(funkyFor, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 18, 18))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 24, 29))
+>U : Symbol(U, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 24, 31))
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 24, 35))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 24, 29))
+>callback : Symbol(callback, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 24, 46))
+>element : Symbol(element, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 24, 58))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 24, 29))
+>index : Symbol(index, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 24, 69))
+>U : Symbol(U, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 24, 31))
+>U : Symbol(U, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 24, 31))
+
+        if (array) {
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 24, 35))
+
+            for (let i = 0, len = array.length; i < len; i++) {
+>i : Symbol(i, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 26, 20))
+>len : Symbol(len, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 26, 27))
+>array.length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 24, 35))
+>length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+>i : Symbol(i, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 26, 20))
+>len : Symbol(len, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 26, 27))
+>i : Symbol(i, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 26, 20))
+
+                const result = callback(array[i], i);
+>result : Symbol(result, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 27, 21))
+>callback : Symbol(callback, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 24, 46))
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 24, 35))
+>i : Symbol(i, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 26, 20))
+>i : Symbol(i, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 26, 20))
+
+                if (result) {
+>result : Symbol(result, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 27, 21))
+
+                    return result;
+>result : Symbol(result, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 27, 21))
+                }
+            }
+        }
+        return undefined;
+>undefined : Symbol(undefined)
+    }
+}
+interface Scanner {
+>Scanner : Symbol(Scanner, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 35, 1))
+
+  scanRange<T>(start: number, length: number, callback: () => T): T;
+>scanRange : Symbol(Scanner.scanRange, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 36, 19))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 37, 12))
+>start : Symbol(start, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 37, 15))
+>length : Symbol(length, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 37, 29))
+>callback : Symbol(callback, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 37, 45))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 37, 12))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 37, 12))
+}
+class ListWrapper {
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+
+  // JS has no way to express a statically fixed size list, but dart does so we
+  // keep both methods.
+  static createFixedSize(dit: typeof ListWrapper, size: number): any[] { return new Array(size); }
+>createFixedSize : Symbol(ListWrapper.createFixedSize, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 39, 19))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 42, 25))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>size : Symbol(size, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 42, 49))
+>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 137, 75))
+>size : Symbol(size, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 42, 49))
+
+  static createGrowableSize(dit: typeof ListWrapper, size: number): any[] { return new Array(size); }
+>createGrowableSize : Symbol(ListWrapper.createGrowableSize, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 42, 98))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 43, 28))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>size : Symbol(size, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 43, 52))
+>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 137, 75))
+>size : Symbol(size, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 43, 52))
+
+  static clone<T>(dit: typeof ListWrapper, array: T[]): T[] { return array.slice(0); }
+>clone : Symbol(ListWrapper.clone, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 43, 101))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 44, 15))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 44, 18))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 44, 42))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 44, 15))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 44, 15))
+>array.slice : Symbol(Array.slice, Decl(lib.d.ts, --, --))
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 44, 42))
+>slice : Symbol(Array.slice, Decl(lib.d.ts, --, --))
+
+  static forEachWithIndex<T>(dit: typeof ListWrapper, array: T[], fn: (t: T, n: number) => void) {
+>forEachWithIndex : Symbol(ListWrapper.forEachWithIndex, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 44, 86))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 45, 26))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 45, 29))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 45, 53))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 45, 26))
+>fn : Symbol(fn, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 45, 65))
+>t : Symbol(t, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 45, 71))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 45, 26))
+>n : Symbol(n, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 45, 76))
+
+    for (var i = 0; i < array.length; i++) {
+>i : Symbol(i, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 46, 12))
+>i : Symbol(i, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 46, 12))
+>array.length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 45, 53))
+>length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+>i : Symbol(i, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 46, 12))
+
+      fn(array[i], i);
+>fn : Symbol(fn, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 45, 65))
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 45, 53))
+>i : Symbol(i, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 46, 12))
+>i : Symbol(i, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 46, 12))
+    }
+  }
+  static first<T>(dit: typeof ListWrapper, array: T[]): T {
+>first : Symbol(ListWrapper.first, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 49, 3))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 50, 15))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 50, 18))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 50, 42))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 50, 15))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 50, 15))
+
+    if (!array) return null;
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 50, 42))
+
+    return array[0];
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 50, 42))
+  }
+  static last<T>(dit: typeof ListWrapper, array: T[]): T {
+>last : Symbol(ListWrapper.last, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 53, 3))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 54, 14))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 54, 17))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 54, 41))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 54, 14))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 54, 14))
+
+    if (!array || array.length == 0) return null;
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 54, 41))
+>array.length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 54, 41))
+>length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+
+    return array[array.length - 1];
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 54, 41))
+>array.length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 54, 41))
+>length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+  }
+  static indexOf<T>(dit: typeof ListWrapper, array: T[], value: T, startIndex: number = 0): number {
+>indexOf : Symbol(ListWrapper.indexOf, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 57, 3))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 58, 17))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 58, 20))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 58, 44))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 58, 17))
+>value : Symbol(value, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 58, 56))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 58, 17))
+>startIndex : Symbol(startIndex, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 58, 66))
+
+    return array.indexOf(value, startIndex);
+>array.indexOf : Symbol(Array.indexOf, Decl(lib.d.ts, --, --))
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 58, 44))
+>indexOf : Symbol(Array.indexOf, Decl(lib.d.ts, --, --))
+>value : Symbol(value, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 58, 56))
+>startIndex : Symbol(startIndex, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 58, 66))
+  }
+  static contains<T>(dit: typeof ListWrapper, list: T[], el: T): boolean { return list.indexOf(el) !== -1; }
+>contains : Symbol(ListWrapper.contains, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 60, 3))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 61, 18))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 61, 21))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>list : Symbol(list, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 61, 45))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 61, 18))
+>el : Symbol(el, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 61, 56))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 61, 18))
+>list.indexOf : Symbol(Array.indexOf, Decl(lib.d.ts, --, --))
+>list : Symbol(list, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 61, 45))
+>indexOf : Symbol(Array.indexOf, Decl(lib.d.ts, --, --))
+>el : Symbol(el, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 61, 56))
+
+  static reversed<T>(dit: typeof ListWrapper, array: T[]): T[] {
+>reversed : Symbol(ListWrapper.reversed, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 61, 108))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 62, 18))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 62, 21))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 62, 45))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 62, 18))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 62, 18))
+
+    var a = ListWrapper.clone(dit, array);
+>a : Symbol(a, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 63, 7))
+>ListWrapper.clone : Symbol(ListWrapper.clone, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 43, 101))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>clone : Symbol(ListWrapper.clone, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 43, 101))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 62, 21))
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 62, 45))
+
+    let scanner: Scanner;
+>scanner : Symbol(scanner, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 64, 7))
+>Scanner : Symbol(Scanner, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 35, 1))
+
+    scanner.scanRange(3, 5, () => {  });
+>scanner.scanRange : Symbol(Scanner.scanRange, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 36, 19))
+>scanner : Symbol(scanner, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 64, 7))
+>scanRange : Symbol(Scanner.scanRange, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 36, 19))
+
+    return tessst.funkyFor(array, t => t.toString()) ? a.reverse() : a;
+>tessst.funkyFor : Symbol(tessst.funkyFor, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 18, 18))
+>tessst : Symbol(tessst, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 17, 1))
+>funkyFor : Symbol(tessst.funkyFor, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 18, 18))
+>array : Symbol(array, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 62, 45))
+>t : Symbol(t, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 66, 33))
+>t.toString : Symbol(Object.toString, Decl(lib.d.ts, --, --))
+>t : Symbol(t, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 66, 33))
+>toString : Symbol(Object.toString, Decl(lib.d.ts, --, --))
+>a.reverse : Symbol(Array.reverse, Decl(lib.d.ts, --, --))
+>a : Symbol(a, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 63, 7))
+>reverse : Symbol(Array.reverse, Decl(lib.d.ts, --, --))
+>a : Symbol(a, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 63, 7))
+  }
+  static concat(dit: typeof ListWrapper, a: any[], b: any[]): any[] { return a.concat(b); }
+>concat : Symbol(ListWrapper.concat, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 67, 3))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 68, 16))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>a : Symbol(a, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 68, 40))
+>b : Symbol(b, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 68, 50))
+>a.concat : Symbol(Array.concat, Decl(lib.d.ts, --, --))
+>a : Symbol(a, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 68, 40))
+>concat : Symbol(Array.concat, Decl(lib.d.ts, --, --))
+>b : Symbol(b, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 68, 50))
+
+  static insert<T>(dit: typeof ListWrapper, list: T[], index: number, value: T) { list.splice(index, 0, value); }
+>insert : Symbol(ListWrapper.insert, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 68, 91))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 69, 16))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 69, 19))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>list : Symbol(list, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 69, 43))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 69, 16))
+>index : Symbol(index, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 69, 54))
+>value : Symbol(value, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 69, 69))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 69, 16))
+>list.splice : Symbol(Array.splice, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>list : Symbol(list, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 69, 43))
+>splice : Symbol(Array.splice, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>index : Symbol(index, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 69, 54))
+>value : Symbol(value, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 69, 69))
+
+  static removeAt<T>(dit: typeof ListWrapper, list: T[], index: number): T {
+>removeAt : Symbol(ListWrapper.removeAt, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 69, 113))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 70, 18))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 70, 21))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>list : Symbol(list, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 70, 45))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 70, 18))
+>index : Symbol(index, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 70, 56))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 70, 18))
+
+    var res = list[index];
+>res : Symbol(res, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 71, 7))
+>list : Symbol(list, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 70, 45))
+>index : Symbol(index, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 70, 56))
+
+    list.splice(index, 1);
+>list.splice : Symbol(Array.splice, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>list : Symbol(list, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 70, 45))
+>splice : Symbol(Array.splice, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>index : Symbol(index, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 70, 56))
+
+    return res;
+>res : Symbol(res, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 71, 7))
+  }
+  static removeAll<T>(dit: typeof ListWrapper, list: T[], items: T[]) {
+>removeAll : Symbol(ListWrapper.removeAll, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 74, 3))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 75, 19))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 75, 22))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>list : Symbol(list, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 75, 46))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 75, 19))
+>items : Symbol(items, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 75, 57))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 75, 19))
+
+    for (var i = 0; i < items.length; ++i) {
+>i : Symbol(i, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 76, 12))
+>i : Symbol(i, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 76, 12))
+>items.length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+>items : Symbol(items, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 75, 57))
+>length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+>i : Symbol(i, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 76, 12))
+
+      var index = list.indexOf(items[i]);
+>index : Symbol(index, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 77, 9))
+>list.indexOf : Symbol(Array.indexOf, Decl(lib.d.ts, --, --))
+>list : Symbol(list, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 75, 46))
+>indexOf : Symbol(Array.indexOf, Decl(lib.d.ts, --, --))
+>items : Symbol(items, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 75, 57))
+>i : Symbol(i, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 76, 12))
+
+      list.splice(index, 1);
+>list.splice : Symbol(Array.splice, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>list : Symbol(list, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 75, 46))
+>splice : Symbol(Array.splice, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>index : Symbol(index, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 77, 9))
+    }
+  }
+  static remove<T>(dit: typeof ListWrapper, list: T[], el: T): boolean {
+>remove : Symbol(ListWrapper.remove, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 80, 3))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 81, 16))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 81, 19))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>list : Symbol(list, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 81, 43))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 81, 16))
+>el : Symbol(el, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 81, 54))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 81, 16))
+
+    var index = list.indexOf(el);
+>index : Symbol(index, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 82, 7))
+>list.indexOf : Symbol(Array.indexOf, Decl(lib.d.ts, --, --))
+>list : Symbol(list, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 81, 43))
+>indexOf : Symbol(Array.indexOf, Decl(lib.d.ts, --, --))
+>el : Symbol(el, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 81, 54))
+
+    if (index > -1) {
+>index : Symbol(index, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 82, 7))
+
+      list.splice(index, 1);
+>list.splice : Symbol(Array.splice, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>list : Symbol(list, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 81, 43))
+>splice : Symbol(Array.splice, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>index : Symbol(index, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 82, 7))
+
+      return true;
+    }
+    return false;
+  }
+  static clear(dit: typeof ListWrapper, list: any[]) { list.length = 0; }
+>clear : Symbol(ListWrapper.clear, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 88, 3))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 89, 15))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>list : Symbol(list, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 89, 39))
+>list.length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+>list : Symbol(list, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 89, 39))
+>length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+
+  static isEmpty(dit: typeof ListWrapper, list: any[]): boolean { return list.length == 0; }
+>isEmpty : Symbol(ListWrapper.isEmpty, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 89, 73))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 90, 17))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>list : Symbol(list, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 90, 41))
+>list.length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+>list : Symbol(list, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 90, 41))
+>length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+
+  static fill(dit: typeof ListWrapper, list: any[], value: any, start: number = 0, end: number = null) {
+>fill : Symbol(ListWrapper.fill, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 90, 92))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 91, 14))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>list : Symbol(list, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 91, 38))
+>value : Symbol(value, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 91, 51))
+>start : Symbol(start, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 91, 63))
+>end : Symbol(end, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 91, 82))
+
+    list.fill(value, start, end === null ? list.length : end);
+>list.fill : Symbol(Array.fill, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 138, 20))
+>list : Symbol(list, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 91, 38))
+>fill : Symbol(Array.fill, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 138, 20))
+>value : Symbol(value, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 91, 51))
+>start : Symbol(start, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 91, 63))
+>end : Symbol(end, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 91, 82))
+>list.length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+>list : Symbol(list, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 91, 38))
+>length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+>end : Symbol(end, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 91, 82))
+  }
+  static equals(dit: typeof ListWrapper, a: any[], b: any[]): boolean {
+>equals : Symbol(ListWrapper.equals, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 93, 3))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 94, 16))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>a : Symbol(a, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 94, 40))
+>b : Symbol(b, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 94, 50))
+
+    if (a.length != b.length) return false;
+>a.length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+>a : Symbol(a, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 94, 40))
+>length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+>b.length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+>b : Symbol(b, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 94, 50))
+>length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+
+    for (var i = 0; i < a.length; ++i) {
+>i : Symbol(i, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 96, 12))
+>i : Symbol(i, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 96, 12))
+>a.length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+>a : Symbol(a, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 94, 40))
+>length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+>i : Symbol(i, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 96, 12))
+
+      if (a[i] !== b[i]) return false;
+>a : Symbol(a, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 94, 40))
+>i : Symbol(i, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 96, 12))
+>b : Symbol(b, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 94, 50))
+>i : Symbol(i, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 96, 12))
+    }
+    return true;
+  }
+  static slice<T>(dit: typeof ListWrapper, l: T[], from: number = 0, to: number = null): T[] {
+>slice : Symbol(ListWrapper.slice, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 100, 3))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 101, 15))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 101, 18))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>l : Symbol(l, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 101, 42))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 101, 15))
+>from : Symbol(from, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 101, 50))
+>to : Symbol(to, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 101, 68))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 101, 15))
+
+    return l.slice(from, to === null ? undefined : to);
+>l.slice : Symbol(Array.slice, Decl(lib.d.ts, --, --))
+>l : Symbol(l, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 101, 42))
+>slice : Symbol(Array.slice, Decl(lib.d.ts, --, --))
+>from : Symbol(from, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 101, 50))
+>to : Symbol(to, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 101, 68))
+>undefined : Symbol(undefined)
+>to : Symbol(to, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 101, 68))
+  }
+  static splice<T>(dit: typeof ListWrapper, l: T[], from: number, length: number): T[] { return l.splice(from, length); }
+>splice : Symbol(ListWrapper.splice, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 103, 3))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 104, 16))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 104, 19))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>l : Symbol(l, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 104, 43))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 104, 16))
+>from : Symbol(from, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 104, 51))
+>length : Symbol(length, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 104, 65))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 104, 16))
+>l.splice : Symbol(Array.splice, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>l : Symbol(l, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 104, 43))
+>splice : Symbol(Array.splice, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>from : Symbol(from, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 104, 51))
+>length : Symbol(length, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 104, 65))
+
+  static sort<T>(dit: typeof ListWrapper, l: T[], compareFn?: (a: T, b: T) => number) {
+>sort : Symbol(ListWrapper.sort, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 104, 121))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 105, 14))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 105, 17))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>l : Symbol(l, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 105, 41))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 105, 14))
+>compareFn : Symbol(compareFn, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 105, 49))
+>a : Symbol(a, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 105, 63))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 105, 14))
+>b : Symbol(b, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 105, 68))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 105, 14))
+
+    if (isPresent(compareFn)) {
+>isPresent : Symbol(isPresent, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 136, 42))
+>compareFn : Symbol(compareFn, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 105, 49))
+
+      l.sort(compareFn);
+>l.sort : Symbol(Array.sort, Decl(lib.d.ts, --, --))
+>l : Symbol(l, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 105, 41))
+>sort : Symbol(Array.sort, Decl(lib.d.ts, --, --))
+>compareFn : Symbol(compareFn, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 105, 49))
+
+    } else {
+      l.sort();
+>l.sort : Symbol(Array.sort, Decl(lib.d.ts, --, --))
+>l : Symbol(l, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 105, 41))
+>sort : Symbol(Array.sort, Decl(lib.d.ts, --, --))
+    }
+  }
+  static toString<T>(dit: typeof ListWrapper, l: T[]): string { return l.toString(); }
+>toString : Symbol(ListWrapper.toString, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 111, 3))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 112, 18))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 112, 21))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>l : Symbol(l, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 112, 45))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 112, 18))
+>l.toString : Symbol(Array.toString, Decl(lib.d.ts, --, --))
+>l : Symbol(l, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 112, 45))
+>toString : Symbol(Array.toString, Decl(lib.d.ts, --, --))
+
+  static toJSON<T>(dit: typeof ListWrapper, l: T[]): string { return JSON.stringify(l); }
+>toJSON : Symbol(ListWrapper.toJSON, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 112, 86))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 113, 16))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 113, 19))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>l : Symbol(l, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 113, 43))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 113, 16))
+>JSON.stringify : Symbol(JSON.stringify, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>JSON : Symbol(JSON, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>stringify : Symbol(JSON.stringify, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>l : Symbol(l, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 113, 43))
+
+  static maximum<T>(dit: typeof ListWrapper, list: T[], predicate: (t: T) => number): T {
+>maximum : Symbol(ListWrapper.maximum, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 113, 89))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 115, 17))
+>dit : Symbol(dit, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 115, 20))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>list : Symbol(list, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 115, 44))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 115, 17))
+>predicate : Symbol(predicate, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 115, 55))
+>t : Symbol(t, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 115, 68))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 115, 17))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 115, 17))
+
+    if (list.length == 0) {
+>list.length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+>list : Symbol(list, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 115, 44))
+>length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+
+      return null;
+    }
+    var solution: T = null;
+>solution : Symbol(solution, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 119, 7))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 115, 17))
+
+    var maxValue = -Infinity;
+>maxValue : Symbol(maxValue, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 120, 7))
+>Infinity : Symbol(Infinity, Decl(lib.d.ts, --, --))
+
+    for (var index = 0; index < list.length; index++) {
+>index : Symbol(index, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 121, 12))
+>index : Symbol(index, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 121, 12))
+>list.length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+>list : Symbol(list, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 115, 44))
+>length : Symbol(Array.length, Decl(lib.d.ts, --, --))
+>index : Symbol(index, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 121, 12))
+
+      var candidate = list[index];
+>candidate : Symbol(candidate, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 122, 9))
+>list : Symbol(list, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 115, 44))
+>index : Symbol(index, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 121, 12))
+
+      if (isBlank(candidate)) {
+>isBlank : Symbol(isBlank, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 135, 55))
+>candidate : Symbol(candidate, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 122, 9))
+
+        continue;
+      }
+      var candidateValue = predicate(candidate);
+>candidateValue : Symbol(candidateValue, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 126, 9))
+>predicate : Symbol(predicate, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 115, 55))
+>candidate : Symbol(candidate, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 122, 9))
+
+      if (candidateValue > maxValue) {
+>candidateValue : Symbol(candidateValue, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 126, 9))
+>maxValue : Symbol(maxValue, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 120, 7))
+
+        solution = candidate;
+>solution : Symbol(solution, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 119, 7))
+>candidate : Symbol(candidate, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 122, 9))
+
+        maxValue = candidateValue;
+>maxValue : Symbol(maxValue, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 120, 7))
+>candidateValue : Symbol(candidateValue, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 126, 9))
+      }
+    }
+    return solution;
+>solution : Symbol(solution, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 119, 7))
+  }
+}
+let cloned = ListWrapper.clone(ListWrapper, [1,2,3,4]);
+>cloned : Symbol(cloned, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 135, 3))
+>ListWrapper.clone : Symbol(ListWrapper.clone, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 43, 101))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+>clone : Symbol(ListWrapper.clone, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 43, 101))
+>ListWrapper : Symbol(ListWrapper, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 38, 1))
+
+declare function isBlank(x: any): boolean;
+>isBlank : Symbol(isBlank, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 135, 55))
+>x : Symbol(x, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 136, 25))
+
+declare function isPresent<T>(compareFn?: (a: T, b: T) => number): boolean;
+>isPresent : Symbol(isPresent, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 136, 42))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 137, 27))
+>compareFn : Symbol(compareFn, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 137, 30))
+>a : Symbol(a, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 137, 43))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 137, 27))
+>b : Symbol(b, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 137, 48))
+>T : Symbol(T, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 137, 27))
+
+interface Array<T> {
+>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 137, 75))
+>T : Symbol(T, Decl(lib.d.ts, --, --), Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 138, 16))
+
+	fill(value: any, start: number, end: number): void;
+>fill : Symbol(Array.fill, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 138, 20))
+>value : Symbol(value, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 139, 6))
+>start : Symbol(start, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 139, 17))
+>end : Symbol(end, Decl(staticAnonymousTypeNotReferencingTypeParameter.ts, 139, 32))
+}
diff --git a/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.types b/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.types
new file mode 100644
index 00000000000..90148bdbb19
--- /dev/null
+++ b/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.types
@@ -0,0 +1,787 @@
+=== tests/cases/compiler/staticAnonymousTypeNotReferencingTypeParameter.ts ===
+// This test case is a condensed version of Angular 2's ListWrapper. Prior to #7448
+// this would cause the compiler to run out of memory.
+
+function outer<T>(x: T) {
+>outer : <T>(x: T) => typeof Inner
+>T : T
+>x : T
+>T : T
+
+  class Inner {
+>Inner : Inner
+
+    static y: T = x;
+>y : T
+>T : T
+>x : T
+  }
+  return Inner;
+>Inner : typeof Inner
+}
+let y: number = outer(5).y;
+>y : number
+>outer(5).y : number
+>outer(5) : typeof Inner
+>outer : <T>(x: T) => typeof Inner
+>5 : number
+>y : number
+
+class ListWrapper2 {
+>ListWrapper2 : ListWrapper2
+
+  static clone<T>(dit: typeof ListWrapper2, array: T[]): T[] { return array.slice(0); }
+>clone : <T>(dit: typeof ListWrapper2, array: T[]) => T[]
+>T : T
+>dit : typeof ListWrapper2
+>ListWrapper2 : typeof ListWrapper2
+>array : T[]
+>T : T
+>T : T
+>array.slice(0) : T[]
+>array.slice : (start?: number, end?: number) => T[]
+>array : T[]
+>slice : (start?: number, end?: number) => T[]
+>0 : number
+
+  static reversed<T>(dit: typeof ListWrapper2, array: T[]): T[] {
+>reversed : <T>(dit: typeof ListWrapper2, array: T[]) => T[]
+>T : T
+>dit : typeof ListWrapper2
+>ListWrapper2 : typeof ListWrapper2
+>array : T[]
+>T : T
+>T : T
+
+    var a = ListWrapper2.clone(dit, array);
+>a : T[]
+>ListWrapper2.clone(dit, array) : T[]
+>ListWrapper2.clone : <T>(dit: typeof ListWrapper2, array: T[]) => T[]
+>ListWrapper2 : typeof ListWrapper2
+>clone : <T>(dit: typeof ListWrapper2, array: T[]) => T[]
+>dit : typeof ListWrapper2
+>array : T[]
+
+    return a;
+>a : T[]
+  }
+}
+namespace tessst {
+>tessst : typeof tessst
+
+    /**
+     * Iterates through 'array' by index and performs the callback on each element of array until the callback
+     * returns a truthy value, then returns that value.
+     * If no such value is found, the callback is applied to each element of array and undefined is returned.
+     */
+    export function funkyFor<T, U>(array: T[], callback: (element: T, index: number) => U): U {
+>funkyFor : <T, U>(array: T[], callback: (element: T, index: number) => U) => U
+>T : T
+>U : U
+>array : T[]
+>T : T
+>callback : (element: T, index: number) => U
+>element : T
+>T : T
+>index : number
+>U : U
+>U : U
+
+        if (array) {
+>array : T[]
+
+            for (let i = 0, len = array.length; i < len; i++) {
+>i : number
+>0 : number
+>len : number
+>array.length : number
+>array : T[]
+>length : number
+>i < len : boolean
+>i : number
+>len : number
+>i++ : number
+>i : number
+
+                const result = callback(array[i], i);
+>result : U
+>callback(array[i], i) : U
+>callback : (element: T, index: number) => U
+>array[i] : T
+>array : T[]
+>i : number
+>i : number
+
+                if (result) {
+>result : U
+
+                    return result;
+>result : U
+                }
+            }
+        }
+        return undefined;
+>undefined : undefined
+    }
+}
+interface Scanner {
+>Scanner : Scanner
+
+  scanRange<T>(start: number, length: number, callback: () => T): T;
+>scanRange : <T>(start: number, length: number, callback: () => T) => T
+>T : T
+>start : number
+>length : number
+>callback : () => T
+>T : T
+>T : T
+}
+class ListWrapper {
+>ListWrapper : ListWrapper
+
+  // JS has no way to express a statically fixed size list, but dart does so we
+  // keep both methods.
+  static createFixedSize(dit: typeof ListWrapper, size: number): any[] { return new Array(size); }
+>createFixedSize : (dit: typeof ListWrapper, size: number) => any[]
+>dit : typeof ListWrapper
+>ListWrapper : typeof ListWrapper
+>size : number
+>new Array(size) : any[]
+>Array : ArrayConstructor
+>size : number
+
+  static createGrowableSize(dit: typeof ListWrapper, size: number): any[] { return new Array(size); }
+>createGrowableSize : (dit: typeof ListWrapper, size: number) => any[]
+>dit : typeof ListWrapper
+>ListWrapper : typeof ListWrapper
+>size : number
+>new Array(size) : any[]
+>Array : ArrayConstructor
+>size : number
+
+  static clone<T>(dit: typeof ListWrapper, array: T[]): T[] { return array.slice(0); }
+>clone : <T>(dit: typeof ListWrapper, array: T[]) => T[]
+>T : T
+>dit : typeof ListWrapper
+>ListWrapper : typeof ListWrapper
+>array : T[]
+>T : T
+>T : T
+>array.slice(0) : T[]
+>array.slice : (start?: number, end?: number) => T[]
+>array : T[]
+>slice : (start?: number, end?: number) => T[]
+>0 : number
+
+  static forEachWithIndex<T>(dit: typeof ListWrapper, array: T[], fn: (t: T, n: number) => void) {
+>forEachWithIndex : <T>(dit: typeof ListWrapper, array: T[], fn: (t: T, n: number) => void) => void
+>T : T
+>dit : typeof ListWrapper
+>ListWrapper : typeof ListWrapper
+>array : T[]
+>T : T
+>fn : (t: T, n: number) => void
+>t : T
+>T : T
+>n : number
+
+    for (var i = 0; i < array.length; i++) {
+>i : number
+>0 : number
+>i < array.length : boolean
+>i : number
+>array.length : number
+>array : T[]
+>length : number
+>i++ : number
+>i : number
+
+      fn(array[i], i);
+>fn(array[i], i) : void
+>fn : (t: T, n: number) => void
+>array[i] : T
+>array : T[]
+>i : number
+>i : number
+    }
+  }
+  static first<T>(dit: typeof ListWrapper, array: T[]): T {
+>first : <T>(dit: typeof ListWrapper, array: T[]) => T
+>T : T
+>dit : typeof ListWrapper
+>ListWrapper : typeof ListWrapper
+>array : T[]
+>T : T
+>T : T
+
+    if (!array) return null;
+>!array : boolean
+>array : T[]
+>null : null
+
+    return array[0];
+>array[0] : T
+>array : T[]
+>0 : number
+  }
+  static last<T>(dit: typeof ListWrapper, array: T[]): T {
+>last : <T>(dit: typeof ListWrapper, array: T[]) => T
+>T : T
+>dit : typeof ListWrapper
+>ListWrapper : typeof ListWrapper
+>array : T[]
+>T : T
+>T : T
+
+    if (!array || array.length == 0) return null;
+>!array || array.length == 0 : boolean
+>!array : boolean
+>array : T[]
+>array.length == 0 : boolean
+>array.length : number
+>array : T[]
+>length : number
+>0 : number
+>null : null
+
+    return array[array.length - 1];
+>array[array.length - 1] : T
+>array : T[]
+>array.length - 1 : number
+>array.length : number
+>array : T[]
+>length : number
+>1 : number
+  }
+  static indexOf<T>(dit: typeof ListWrapper, array: T[], value: T, startIndex: number = 0): number {
+>indexOf : <T>(dit: typeof ListWrapper, array: T[], value: T, startIndex?: number) => number
+>T : T
+>dit : typeof ListWrapper
+>ListWrapper : typeof ListWrapper
+>array : T[]
+>T : T
+>value : T
+>T : T
+>startIndex : number
+>0 : number
+
+    return array.indexOf(value, startIndex);
+>array.indexOf(value, startIndex) : number
+>array.indexOf : (searchElement: T, fromIndex?: number) => number
+>array : T[]
+>indexOf : (searchElement: T, fromIndex?: number) => number
+>value : T
+>startIndex : number
+  }
+  static contains<T>(dit: typeof ListWrapper, list: T[], el: T): boolean { return list.indexOf(el) !== -1; }
+>contains : <T>(dit: typeof ListWrapper, list: T[], el: T) => boolean
+>T : T
+>dit : typeof ListWrapper
+>ListWrapper : typeof ListWrapper
+>list : T[]
+>T : T
+>el : T
+>T : T
+>list.indexOf(el) !== -1 : boolean
+>list.indexOf(el) : number
+>list.indexOf : (searchElement: T, fromIndex?: number) => number
+>list : T[]
+>indexOf : (searchElement: T, fromIndex?: number) => number
+>el : T
+>-1 : number
+>1 : number
+
+  static reversed<T>(dit: typeof ListWrapper, array: T[]): T[] {
+>reversed : <T>(dit: typeof ListWrapper, array: T[]) => T[]
+>T : T
+>dit : typeof ListWrapper
+>ListWrapper : typeof ListWrapper
+>array : T[]
+>T : T
+>T : T
+
+    var a = ListWrapper.clone(dit, array);
+>a : T[]
+>ListWrapper.clone(dit, array) : T[]
+>ListWrapper.clone : <T>(dit: typeof ListWrapper, array: T[]) => T[]
+>ListWrapper : typeof ListWrapper
+>clone : <T>(dit: typeof ListWrapper, array: T[]) => T[]
+>dit : typeof ListWrapper
+>array : T[]
+
+    let scanner: Scanner;
+>scanner : Scanner
+>Scanner : Scanner
+
+    scanner.scanRange(3, 5, () => {  });
+>scanner.scanRange(3, 5, () => {  }) : void
+>scanner.scanRange : <T>(start: number, length: number, callback: () => T) => T
+>scanner : Scanner
+>scanRange : <T>(start: number, length: number, callback: () => T) => T
+>3 : number
+>5 : number
+>() => {  } : () => void
+
+    return tessst.funkyFor(array, t => t.toString()) ? a.reverse() : a;
+>tessst.funkyFor(array, t => t.toString()) ? a.reverse() : a : T[]
+>tessst.funkyFor(array, t => t.toString()) : string
+>tessst.funkyFor : <T, U>(array: T[], callback: (element: T, index: number) => U) => U
+>tessst : typeof tessst
+>funkyFor : <T, U>(array: T[], callback: (element: T, index: number) => U) => U
+>array : T[]
+>t => t.toString() : (t: T) => string
+>t : T
+>t.toString() : string
+>t.toString : () => string
+>t : T
+>toString : () => string
+>a.reverse() : T[]
+>a.reverse : () => T[]
+>a : T[]
+>reverse : () => T[]
+>a : T[]
+  }
+  static concat(dit: typeof ListWrapper, a: any[], b: any[]): any[] { return a.concat(b); }
+>concat : (dit: typeof ListWrapper, a: any[], b: any[]) => any[]
+>dit : typeof ListWrapper
+>ListWrapper : typeof ListWrapper
+>a : any[]
+>b : any[]
+>a.concat(b) : any[]
+>a.concat : (...items: any[]) => any[]
+>a : any[]
+>concat : (...items: any[]) => any[]
+>b : any[]
+
+  static insert<T>(dit: typeof ListWrapper, list: T[], index: number, value: T) { list.splice(index, 0, value); }
+>insert : <T>(dit: typeof ListWrapper, list: T[], index: number, value: T) => void
+>T : T
+>dit : typeof ListWrapper
+>ListWrapper : typeof ListWrapper
+>list : T[]
+>T : T
+>index : number
+>value : T
+>T : T
+>list.splice(index, 0, value) : T[]
+>list.splice : { (start: number): T[]; (start: number, deleteCount: number, ...items: T[]): T[]; }
+>list : T[]
+>splice : { (start: number): T[]; (start: number, deleteCount: number, ...items: T[]): T[]; }
+>index : number
+>0 : number
+>value : T
+
+  static removeAt<T>(dit: typeof ListWrapper, list: T[], index: number): T {
+>removeAt : <T>(dit: typeof ListWrapper, list: T[], index: number) => T
+>T : T
+>dit : typeof ListWrapper
+>ListWrapper : typeof ListWrapper
+>list : T[]
+>T : T
+>index : number
+>T : T
+
+    var res = list[index];
+>res : T
+>list[index] : T
+>list : T[]
+>index : number
+
+    list.splice(index, 1);
+>list.splice(index, 1) : T[]
+>list.splice : { (start: number): T[]; (start: number, deleteCount: number, ...items: T[]): T[]; }
+>list : T[]
+>splice : { (start: number): T[]; (start: number, deleteCount: number, ...items: T[]): T[]; }
+>index : number
+>1 : number
+
+    return res;
+>res : T
+  }
+  static removeAll<T>(dit: typeof ListWrapper, list: T[], items: T[]) {
+>removeAll : <T>(dit: typeof ListWrapper, list: T[], items: T[]) => void
+>T : T
+>dit : typeof ListWrapper
+>ListWrapper : typeof ListWrapper
+>list : T[]
+>T : T
+>items : T[]
+>T : T
+
+    for (var i = 0; i < items.length; ++i) {
+>i : number
+>0 : number
+>i < items.length : boolean
+>i : number
+>items.length : number
+>items : T[]
+>length : number
+>++i : number
+>i : number
+
+      var index = list.indexOf(items[i]);
+>index : number
+>list.indexOf(items[i]) : number
+>list.indexOf : (searchElement: T, fromIndex?: number) => number
+>list : T[]
+>indexOf : (searchElement: T, fromIndex?: number) => number
+>items[i] : T
+>items : T[]
+>i : number
+
+      list.splice(index, 1);
+>list.splice(index, 1) : T[]
+>list.splice : { (start: number): T[]; (start: number, deleteCount: number, ...items: T[]): T[]; }
+>list : T[]
+>splice : { (start: number): T[]; (start: number, deleteCount: number, ...items: T[]): T[]; }
+>index : number
+>1 : number
+    }
+  }
+  static remove<T>(dit: typeof ListWrapper, list: T[], el: T): boolean {
+>remove : <T>(dit: typeof ListWrapper, list: T[], el: T) => boolean
+>T : T
+>dit : typeof ListWrapper
+>ListWrapper : typeof ListWrapper
+>list : T[]
+>T : T
+>el : T
+>T : T
+
+    var index = list.indexOf(el);
+>index : number
+>list.indexOf(el) : number
+>list.indexOf : (searchElement: T, fromIndex?: number) => number
+>list : T[]
+>indexOf : (searchElement: T, fromIndex?: number) => number
+>el : T
+
+    if (index > -1) {
+>index > -1 : boolean
+>index : number
+>-1 : number
+>1 : number
+
+      list.splice(index, 1);
+>list.splice(index, 1) : T[]
+>list.splice : { (start: number): T[]; (start: number, deleteCount: number, ...items: T[]): T[]; }
+>list : T[]
+>splice : { (start: number): T[]; (start: number, deleteCount: number, ...items: T[]): T[]; }
+>index : number
+>1 : number
+
+      return true;
+>true : boolean
+    }
+    return false;
+>false : boolean
+  }
+  static clear(dit: typeof ListWrapper, list: any[]) { list.length = 0; }
+>clear : (dit: typeof ListWrapper, list: any[]) => void
+>dit : typeof ListWrapper
+>ListWrapper : typeof ListWrapper
+>list : any[]
+>list.length = 0 : number
+>list.length : number
+>list : any[]
+>length : number
+>0 : number
+
+  static isEmpty(dit: typeof ListWrapper, list: any[]): boolean { return list.length == 0; }
+>isEmpty : (dit: typeof ListWrapper, list: any[]) => boolean
+>dit : typeof ListWrapper
+>ListWrapper : typeof ListWrapper
+>list : any[]
+>list.length == 0 : boolean
+>list.length : number
+>list : any[]
+>length : number
+>0 : number
+
+  static fill(dit: typeof ListWrapper, list: any[], value: any, start: number = 0, end: number = null) {
+>fill : (dit: typeof ListWrapper, list: any[], value: any, start?: number, end?: number) => void
+>dit : typeof ListWrapper
+>ListWrapper : typeof ListWrapper
+>list : any[]
+>value : any
+>start : number
+>0 : number
+>end : number
+>null : null
+
+    list.fill(value, start, end === null ? list.length : end);
+>list.fill(value, start, end === null ? list.length : end) : void
+>list.fill : (value: any, start: number, end: number) => void
+>list : any[]
+>fill : (value: any, start: number, end: number) => void
+>value : any
+>start : number
+>end === null ? list.length : end : number
+>end === null : boolean
+>end : number
+>null : null
+>list.length : number
+>list : any[]
+>length : number
+>end : number
+  }
+  static equals(dit: typeof ListWrapper, a: any[], b: any[]): boolean {
+>equals : (dit: typeof ListWrapper, a: any[], b: any[]) => boolean
+>dit : typeof ListWrapper
+>ListWrapper : typeof ListWrapper
+>a : any[]
+>b : any[]
+
+    if (a.length != b.length) return false;
+>a.length != b.length : boolean
+>a.length : number
+>a : any[]
+>length : number
+>b.length : number
+>b : any[]
+>length : number
+>false : boolean
+
+    for (var i = 0; i < a.length; ++i) {
+>i : number
+>0 : number
+>i < a.length : boolean
+>i : number
+>a.length : number
+>a : any[]
+>length : number
+>++i : number
+>i : number
+
+      if (a[i] !== b[i]) return false;
+>a[i] !== b[i] : boolean
+>a[i] : any
+>a : any[]
+>i : number
+>b[i] : any
+>b : any[]
+>i : number
+>false : boolean
+    }
+    return true;
+>true : boolean
+  }
+  static slice<T>(dit: typeof ListWrapper, l: T[], from: number = 0, to: number = null): T[] {
+>slice : <T>(dit: typeof ListWrapper, l: T[], from?: number, to?: number) => T[]
+>T : T
+>dit : typeof ListWrapper
+>ListWrapper : typeof ListWrapper
+>l : T[]
+>T : T
+>from : number
+>0 : number
+>to : number
+>null : null
+>T : T
+
+    return l.slice(from, to === null ? undefined : to);
+>l.slice(from, to === null ? undefined : to) : T[]
+>l.slice : (start?: number, end?: number) => T[]
+>l : T[]
+>slice : (start?: number, end?: number) => T[]
+>from : number
+>to === null ? undefined : to : number
+>to === null : boolean
+>to : number
+>null : null
+>undefined : undefined
+>to : number
+  }
+  static splice<T>(dit: typeof ListWrapper, l: T[], from: number, length: number): T[] { return l.splice(from, length); }
+>splice : <T>(dit: typeof ListWrapper, l: T[], from: number, length: number) => T[]
+>T : T
+>dit : typeof ListWrapper
+>ListWrapper : typeof ListWrapper
+>l : T[]
+>T : T
+>from : number
+>length : number
+>T : T
+>l.splice(from, length) : T[]
+>l.splice : { (start: number): T[]; (start: number, deleteCount: number, ...items: T[]): T[]; }
+>l : T[]
+>splice : { (start: number): T[]; (start: number, deleteCount: number, ...items: T[]): T[]; }
+>from : number
+>length : number
+
+  static sort<T>(dit: typeof ListWrapper, l: T[], compareFn?: (a: T, b: T) => number) {
+>sort : <T>(dit: typeof ListWrapper, l: T[], compareFn?: (a: T, b: T) => number) => void
+>T : T
+>dit : typeof ListWrapper
+>ListWrapper : typeof ListWrapper
+>l : T[]
+>T : T
+>compareFn : (a: T, b: T) => number
+>a : T
+>T : T
+>b : T
+>T : T
+
+    if (isPresent(compareFn)) {
+>isPresent(compareFn) : boolean
+>isPresent : <T>(compareFn?: (a: T, b: T) => number) => boolean
+>compareFn : (a: T, b: T) => number
+
+      l.sort(compareFn);
+>l.sort(compareFn) : T[]
+>l.sort : (compareFn?: (a: T, b: T) => number) => T[]
+>l : T[]
+>sort : (compareFn?: (a: T, b: T) => number) => T[]
+>compareFn : (a: T, b: T) => number
+
+    } else {
+      l.sort();
+>l.sort() : T[]
+>l.sort : (compareFn?: (a: T, b: T) => number) => T[]
+>l : T[]
+>sort : (compareFn?: (a: T, b: T) => number) => T[]
+    }
+  }
+  static toString<T>(dit: typeof ListWrapper, l: T[]): string { return l.toString(); }
+>toString : <T>(dit: typeof ListWrapper, l: T[]) => string
+>T : T
+>dit : typeof ListWrapper
+>ListWrapper : typeof ListWrapper
+>l : T[]
+>T : T
+>l.toString() : string
+>l.toString : () => string
+>l : T[]
+>toString : () => string
+
+  static toJSON<T>(dit: typeof ListWrapper, l: T[]): string { return JSON.stringify(l); }
+>toJSON : <T>(dit: typeof ListWrapper, l: T[]) => string
+>T : T
+>dit : typeof ListWrapper
+>ListWrapper : typeof ListWrapper
+>l : T[]
+>T : T
+>JSON.stringify(l) : string
+>JSON.stringify : { (value: any): string; (value: any, replacer: (key: string, value: any) => any): string; (value: any, replacer: any[]): string; (value: any, replacer: (key: string, value: any) => any, space: string | number): string; (value: any, replacer: any[], space: string | number): string; }
+>JSON : JSON
+>stringify : { (value: any): string; (value: any, replacer: (key: string, value: any) => any): string; (value: any, replacer: any[]): string; (value: any, replacer: (key: string, value: any) => any, space: string | number): string; (value: any, replacer: any[], space: string | number): string; }
+>l : T[]
+
+  static maximum<T>(dit: typeof ListWrapper, list: T[], predicate: (t: T) => number): T {
+>maximum : <T>(dit: typeof ListWrapper, list: T[], predicate: (t: T) => number) => T
+>T : T
+>dit : typeof ListWrapper
+>ListWrapper : typeof ListWrapper
+>list : T[]
+>T : T
+>predicate : (t: T) => number
+>t : T
+>T : T
+>T : T
+
+    if (list.length == 0) {
+>list.length == 0 : boolean
+>list.length : number
+>list : T[]
+>length : number
+>0 : number
+
+      return null;
+>null : null
+    }
+    var solution: T = null;
+>solution : T
+>T : T
+>null : null
+
+    var maxValue = -Infinity;
+>maxValue : number
+>-Infinity : number
+>Infinity : number
+
+    for (var index = 0; index < list.length; index++) {
+>index : number
+>0 : number
+>index < list.length : boolean
+>index : number
+>list.length : number
+>list : T[]
+>length : number
+>index++ : number
+>index : number
+
+      var candidate = list[index];
+>candidate : T
+>list[index] : T
+>list : T[]
+>index : number
+
+      if (isBlank(candidate)) {
+>isBlank(candidate) : boolean
+>isBlank : (x: any) => boolean
+>candidate : T
+
+        continue;
+      }
+      var candidateValue = predicate(candidate);
+>candidateValue : number
+>predicate(candidate) : number
+>predicate : (t: T) => number
+>candidate : T
+
+      if (candidateValue > maxValue) {
+>candidateValue > maxValue : boolean
+>candidateValue : number
+>maxValue : number
+
+        solution = candidate;
+>solution = candidate : T
+>solution : T
+>candidate : T
+
+        maxValue = candidateValue;
+>maxValue = candidateValue : number
+>maxValue : number
+>candidateValue : number
+      }
+    }
+    return solution;
+>solution : T
+  }
+}
+let cloned = ListWrapper.clone(ListWrapper, [1,2,3,4]);
+>cloned : number[]
+>ListWrapper.clone(ListWrapper, [1,2,3,4]) : number[]
+>ListWrapper.clone : <T>(dit: typeof ListWrapper, array: T[]) => T[]
+>ListWrapper : typeof ListWrapper
+>clone : <T>(dit: typeof ListWrapper, array: T[]) => T[]
+>ListWrapper : typeof ListWrapper
+>[1,2,3,4] : number[]
+>1 : number
+>2 : number
+>3 : number
+>4 : number
+
+declare function isBlank(x: any): boolean;
+>isBlank : (x: any) => boolean
+>x : any
+
+declare function isPresent<T>(compareFn?: (a: T, b: T) => number): boolean;
+>isPresent : <T>(compareFn?: (a: T, b: T) => number) => boolean
+>T : T
+>compareFn : (a: T, b: T) => number
+>a : T
+>T : T
+>b : T
+>T : T
+
+interface Array<T> {
+>Array : T[]
+>T : T
+
+	fill(value: any, start: number, end: number): void;
+>fill : (value: any, start: number, end: number) => void
+>value : any
+>start : number
+>end : number
+}
diff --git a/tests/baselines/reference/staticClassProps.js b/tests/baselines/reference/staticClassProps.js
index 8a61bb7400f..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.prototype.foo = function () {
+    };
     return C;
 }());
 C.z = 1;
diff --git a/tests/baselines/reference/staticFactory1.symbols b/tests/baselines/reference/staticFactory1.symbols
index 1e3d1855813..d213ed20765 100644
--- a/tests/baselines/reference/staticFactory1.symbols
+++ b/tests/baselines/reference/staticFactory1.symbols
@@ -3,7 +3,7 @@ class Base {
 >Base : Symbol(Base, Decl(staticFactory1.ts, 0, 0))
 
     foo() { return 1; }
->foo : Symbol(foo, Decl(staticFactory1.ts, 0, 12))
+>foo : Symbol(Base.foo, Decl(staticFactory1.ts, 0, 12))
 
     static create() {
 >create : Symbol(Base.create, Decl(staticFactory1.ts, 1, 23))
@@ -18,7 +18,7 @@ class Derived extends Base {
 >Base : Symbol(Base, Decl(staticFactory1.ts, 0, 0))
 
     foo() { return 2; }
->foo : Symbol(foo, Decl(staticFactory1.ts, 7, 28))
+>foo : Symbol(Derived.foo, Decl(staticFactory1.ts, 7, 28))
 }
 var d = Derived.create(); 
 >d : Symbol(d, Decl(staticFactory1.ts, 10, 3))
diff --git a/tests/baselines/reference/staticInheritance.symbols b/tests/baselines/reference/staticInheritance.symbols
index 5ef080f96ac..35656ee75e3 100644
--- a/tests/baselines/reference/staticInheritance.symbols
+++ b/tests/baselines/reference/staticInheritance.symbols
@@ -11,7 +11,7 @@ class A {
 >n : Symbol(A.n, Decl(staticInheritance.ts, 1, 9))
 
     p = doThing(A); // OK
->p : Symbol(p, Decl(staticInheritance.ts, 2, 21))
+>p : Symbol(A.p, Decl(staticInheritance.ts, 2, 21))
 >doThing : Symbol(doThing, Decl(staticInheritance.ts, 0, 0))
 >A : Symbol(A, Decl(staticInheritance.ts, 0, 38))
 }
@@ -20,12 +20,12 @@ class B extends A {
 >A : Symbol(A, Decl(staticInheritance.ts, 0, 38))
 
     p1 = doThing(A); // OK
->p1 : Symbol(p1, Decl(staticInheritance.ts, 5, 19))
+>p1 : Symbol(B.p1, Decl(staticInheritance.ts, 5, 19))
 >doThing : Symbol(doThing, Decl(staticInheritance.ts, 0, 0))
 >A : Symbol(A, Decl(staticInheritance.ts, 0, 38))
 
     p2 = doThing(B); // OK
->p2 : Symbol(p2, Decl(staticInheritance.ts, 6, 20))
+>p2 : Symbol(B.p2, Decl(staticInheritance.ts, 6, 20))
 >doThing : Symbol(doThing, Decl(staticInheritance.ts, 0, 0))
 >B : Symbol(B, Decl(staticInheritance.ts, 4, 1))
 }
diff --git a/tests/baselines/reference/staticInstanceResolution.symbols b/tests/baselines/reference/staticInstanceResolution.symbols
index 1b58989347d..c7a3f935b3d 100644
--- a/tests/baselines/reference/staticInstanceResolution.symbols
+++ b/tests/baselines/reference/staticInstanceResolution.symbols
@@ -3,7 +3,7 @@ class Comment {
 >Comment : Symbol(Comment, Decl(staticInstanceResolution.ts, 0, 0))
 
     public getDocCommentText()
->getDocCommentText : Symbol(getDocCommentText, Decl(staticInstanceResolution.ts, 0, 15))
+>getDocCommentText : Symbol(Comment.getDocCommentText, Decl(staticInstanceResolution.ts, 0, 15))
     {
 
     }
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/staticInterfaceAssignmentCompat.symbols b/tests/baselines/reference/staticInterfaceAssignmentCompat.symbols
index d1c87faad74..4872a0c62fe 100644
--- a/tests/baselines/reference/staticInterfaceAssignmentCompat.symbols
+++ b/tests/baselines/reference/staticInterfaceAssignmentCompat.symbols
@@ -15,7 +15,7 @@ interface ShapeFactory {
 >ShapeFactory : Symbol(ShapeFactory, Decl(staticInterfaceAssignmentCompat.ts, 4, 1))
 
     create(): Shape;
->create : Symbol(create, Decl(staticInterfaceAssignmentCompat.ts, 6, 24))
+>create : Symbol(ShapeFactory.create, Decl(staticInterfaceAssignmentCompat.ts, 6, 24))
 >Shape : Symbol(Shape, Decl(staticInterfaceAssignmentCompat.ts, 0, 0))
 }
 
diff --git a/tests/baselines/reference/staticMemberWithStringAndNumberNames.symbols b/tests/baselines/reference/staticMemberWithStringAndNumberNames.symbols
index 1ce1a12dd80..906bd824909 100644
--- a/tests/baselines/reference/staticMemberWithStringAndNumberNames.symbols
+++ b/tests/baselines/reference/staticMemberWithStringAndNumberNames.symbols
@@ -6,17 +6,17 @@ class C {
     static 0 = 1;
 
     x = C['foo'];
->x : Symbol(x, Decl(staticMemberWithStringAndNumberNames.ts, 2, 17))
+>x : Symbol(C.x, Decl(staticMemberWithStringAndNumberNames.ts, 2, 17))
 >C : Symbol(C, Decl(staticMemberWithStringAndNumberNames.ts, 0, 0))
 >'foo' : Symbol(C."foo", Decl(staticMemberWithStringAndNumberNames.ts, 0, 9))
 
     x2 = C['0'];
->x2 : Symbol(x2, Decl(staticMemberWithStringAndNumberNames.ts, 4, 17))
+>x2 : Symbol(C.x2, Decl(staticMemberWithStringAndNumberNames.ts, 4, 17))
 >C : Symbol(C, Decl(staticMemberWithStringAndNumberNames.ts, 0, 0))
 >'0' : Symbol(C.0, Decl(staticMemberWithStringAndNumberNames.ts, 1, 21))
 
     x3 = C[0];
->x3 : Symbol(x3, Decl(staticMemberWithStringAndNumberNames.ts, 5, 16))
+>x3 : Symbol(C.x3, Decl(staticMemberWithStringAndNumberNames.ts, 5, 16))
 >C : Symbol(C, Decl(staticMemberWithStringAndNumberNames.ts, 0, 0))
 >0 : Symbol(C.0, Decl(staticMemberWithStringAndNumberNames.ts, 1, 21))
         
diff --git a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.symbols b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.symbols
index b3658ceadcf..84fa0464051 100644
--- a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.symbols
+++ b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.symbols
@@ -16,7 +16,7 @@ export class publicClassWithWithPrivateTypeParameters {
 >privateClass : Symbol(privateClass, Decl(staticMethodWithTypeParameterExtendsClauseDeclFile.ts, 0, 0))
     }
     private myPrivateMethod1<T extends privateClass>() { // do not emit extends clause
->myPrivateMethod1 : Symbol(myPrivateMethod1, Decl(staticMethodWithTypeParameterExtendsClauseDeclFile.ts, 8, 5))
+>myPrivateMethod1 : Symbol(publicClassWithWithPrivateTypeParameters.myPrivateMethod1, Decl(staticMethodWithTypeParameterExtendsClauseDeclFile.ts, 8, 5))
 >T : Symbol(T, Decl(staticMethodWithTypeParameterExtendsClauseDeclFile.ts, 9, 29))
 >privateClass : Symbol(privateClass, Decl(staticMethodWithTypeParameterExtendsClauseDeclFile.ts, 0, 0))
     }
@@ -26,7 +26,7 @@ export class publicClassWithWithPrivateTypeParameters {
 >publicClass : Symbol(publicClass, Decl(staticMethodWithTypeParameterExtendsClauseDeclFile.ts, 1, 1))
     }
     private myPrivateMethod2<T extends publicClass>() { // do not emit extends clause
->myPrivateMethod2 : Symbol(myPrivateMethod2, Decl(staticMethodWithTypeParameterExtendsClauseDeclFile.ts, 12, 5))
+>myPrivateMethod2 : Symbol(publicClassWithWithPrivateTypeParameters.myPrivateMethod2, Decl(staticMethodWithTypeParameterExtendsClauseDeclFile.ts, 12, 5))
 >T : Symbol(T, Decl(staticMethodWithTypeParameterExtendsClauseDeclFile.ts, 13, 29))
 >publicClass : Symbol(publicClass, Decl(staticMethodWithTypeParameterExtendsClauseDeclFile.ts, 1, 1))
     }
@@ -36,7 +36,7 @@ export class publicClassWithWithPrivateTypeParameters {
 >publicClass : Symbol(publicClass, Decl(staticMethodWithTypeParameterExtendsClauseDeclFile.ts, 1, 1))
     }
     public myPublicMethod<T extends publicClass>() {
->myPublicMethod : Symbol(myPublicMethod, Decl(staticMethodWithTypeParameterExtendsClauseDeclFile.ts, 16, 5))
+>myPublicMethod : Symbol(publicClassWithWithPrivateTypeParameters.myPublicMethod, Decl(staticMethodWithTypeParameterExtendsClauseDeclFile.ts, 16, 5))
 >T : Symbol(T, Decl(staticMethodWithTypeParameterExtendsClauseDeclFile.ts, 17, 26))
 >publicClass : Symbol(publicClass, Decl(staticMethodWithTypeParameterExtendsClauseDeclFile.ts, 1, 1))
     }
diff --git a/tests/baselines/reference/staticPropertyAndFunctionWithSameName.symbols b/tests/baselines/reference/staticPropertyAndFunctionWithSameName.symbols
index 02d7b5690e2..bde100cec76 100644
--- a/tests/baselines/reference/staticPropertyAndFunctionWithSameName.symbols
+++ b/tests/baselines/reference/staticPropertyAndFunctionWithSameName.symbols
@@ -6,7 +6,7 @@ class C {
 >f : Symbol(C.f, Decl(staticPropertyAndFunctionWithSameName.ts, 0, 9))
 
     f: number;
->f : Symbol(f, Decl(staticPropertyAndFunctionWithSameName.ts, 1, 21))
+>f : Symbol(C.f, Decl(staticPropertyAndFunctionWithSameName.ts, 1, 21))
 }
 
 class D {
@@ -16,5 +16,5 @@ class D {
 >f : Symbol(D.f, Decl(staticPropertyAndFunctionWithSameName.ts, 5, 9))
 
     f() { }
->f : Symbol(f, Decl(staticPropertyAndFunctionWithSameName.ts, 6, 21))
+>f : Symbol(D.f, Decl(staticPropertyAndFunctionWithSameName.ts, 6, 21))
 }
diff --git a/tests/baselines/reference/strictModeInConstructor.js b/tests/baselines/reference/strictModeInConstructor.js
index 30dbfa58d70..446fed5b76a 100644
--- a/tests/baselines/reference/strictModeInConstructor.js
+++ b/tests/baselines/reference/strictModeInConstructor.js
@@ -75,8 +75,8 @@ var B = (function (_super) {
     __extends(B, _super);
     function B() {
         "use strict"; // No error
-        this.s = 9;
         _super.call(this);
+        this.s = 9;
     }
     return B;
 }(A));
diff --git a/tests/baselines/reference/strictModeUseContextualKeyword.symbols b/tests/baselines/reference/strictModeUseContextualKeyword.symbols
index a0a3182b9c6..a27477bfa99 100644
--- a/tests/baselines/reference/strictModeUseContextualKeyword.symbols
+++ b/tests/baselines/reference/strictModeUseContextualKeyword.symbols
@@ -11,7 +11,7 @@ class C {
 >C : Symbol(C, Decl(strictModeUseContextualKeyword.ts, 2, 28))
 
     public as() { }
->as : Symbol(as, Decl(strictModeUseContextualKeyword.ts, 3, 9))
+>as : Symbol(C.as, Decl(strictModeUseContextualKeyword.ts, 3, 9))
 }
 function F() {
 >F : Symbol(F, Decl(strictModeUseContextualKeyword.ts, 5, 1))
diff --git a/tests/baselines/reference/stringIncludes.symbols b/tests/baselines/reference/stringIncludes.symbols
index 1f1b2e55ccf..5b2bf4b7afa 100644
--- a/tests/baselines/reference/stringIncludes.symbols
+++ b/tests/baselines/reference/stringIncludes.symbols
@@ -5,11 +5,11 @@ var includes: boolean;
 
 includes = "abcde".includes("cd");
 >includes : Symbol(includes, Decl(stringIncludes.ts, 1, 3))
->"abcde".includes : Symbol(String.includes, Decl(lib.d.ts, --, --))
->includes : Symbol(String.includes, Decl(lib.d.ts, --, --))
+>"abcde".includes : Symbol(String.includes, Decl(lib.es2015.core.d.ts, --, --))
+>includes : Symbol(String.includes, Decl(lib.es2015.core.d.ts, --, --))
 
 includes = "abcde".includes("cd", 2);
 >includes : Symbol(includes, Decl(stringIncludes.ts, 1, 3))
->"abcde".includes : Symbol(String.includes, Decl(lib.d.ts, --, --))
->includes : Symbol(String.includes, Decl(lib.d.ts, --, --))
+>"abcde".includes : Symbol(String.includes, Decl(lib.es2015.core.d.ts, --, --))
+>includes : Symbol(String.includes, Decl(lib.es2015.core.d.ts, --, --))
 
diff --git a/tests/baselines/reference/stringIndexerAssignments1.errors.txt b/tests/baselines/reference/stringIndexerAssignments1.errors.txt
index 908371bc7dd..ac99b239779 100644
--- a/tests/baselines/reference/stringIndexerAssignments1.errors.txt
+++ b/tests/baselines/reference/stringIndexerAssignments1.errors.txt
@@ -1,18 +1,13 @@
-tests/cases/compiler/stringIndexerAssignments1.ts(4,1): error TS2322: Type '{ one: string; }' is not assignable to type '{ [index: string]: string; one: string; }'.
-  Index signature is missing in type '{ one: string; }'.
 tests/cases/compiler/stringIndexerAssignments1.ts(5,1): error TS2322: Type '{ one: number; two: string; }' is not assignable to type '{ [index: string]: string; one: string; }'.
   Types of property 'one' are incompatible.
     Type 'number' is not assignable to type 'string'.
 
 
-==== tests/cases/compiler/stringIndexerAssignments1.ts (2 errors) ====
+==== tests/cases/compiler/stringIndexerAssignments1.ts (1 errors) ====
     var x: { [index: string]: string; one: string; };
     var a: { one: string; };
     var b: { one: number; two: string; };
     x = a;
-    ~
-!!! error TS2322: Type '{ one: string; }' is not assignable to type '{ [index: string]: string; one: string; }'.
-!!! error TS2322:   Index signature is missing in type '{ one: string; }'.
     x = b; // error
     ~
 !!! error TS2322: Type '{ one: number; two: string; }' is not assignable to type '{ [index: string]: string; one: string; }'.
diff --git a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.errors.txt b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.errors.txt
index 08881be2a86..8f4bbe2025a 100644
--- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.errors.txt
+++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.errors.txt
@@ -22,10 +22,9 @@ tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerCon
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations.ts(71,5): error TS2411: Property 'foo' of type '() => string' is not assignable to string index type 'string'.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations.ts(73,5): error TS2411: Property '"4.0"' of type 'number' is not assignable to string index type 'string'.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations.ts(74,5): error TS2411: Property 'f' of type 'MyString' is not assignable to string index type 'string'.
-tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations.ts(78,5): error TS2322: Type '{ [x: string]: string | number | (() => void) | MyString; 1.0: string; 2.0: number; a: string; b: number; c: () => void; "d": string; "e": number; "3.0": string; "4.0": number; f: MyString; X: string; foo(): string; }' is not assignable to type '{ [x: string]: string; }'.
-  Index signatures are incompatible.
-    Type 'string | number | (() => void) | MyString' is not assignable to type 'string'.
-      Type 'number' is not assignable to type 'string'.
+tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations.ts(78,5): error TS2322: Type '{ 1.0: string; 2.0: number; a: string; b: number; c: () => void; "d": string; "e": number; "3.0": string; "4.0": number; f: MyString; X: string; foo(): string; }' is not assignable to type '{ [x: string]: string; }'.
+  Property '2.0' is incompatible with index signature.
+    Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations.ts(90,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations.ts(93,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 
@@ -158,10 +157,9 @@ tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerCon
     // error
     var b: { [x: string]: string; } = {
         ~
-!!! error TS2322: Type '{ [x: string]: string | number | (() => void) | MyString; 1.0: string; 2.0: number; a: string; b: number; c: () => void; "d": string; "e": number; "3.0": string; "4.0": number; f: MyString; X: string; foo(): string; }' is not assignable to type '{ [x: string]: string; }'.
-!!! error TS2322:   Index signatures are incompatible.
-!!! error TS2322:     Type 'string | number | (() => void) | MyString' is not assignable to type 'string'.
-!!! error TS2322:       Type 'number' is not assignable to type 'string'.
+!!! error TS2322: Type '{ 1.0: string; 2.0: number; a: string; b: number; c: () => void; "d": string; "e": number; "3.0": string; "4.0": number; f: MyString; X: string; foo(): string; }' is not assignable to type '{ [x: string]: string; }'.
+!!! error TS2322:   Property '2.0' is incompatible with index signature.
+!!! error TS2322:     Type 'number' is not assignable to type 'string'.
         a: '',
         b: 1, 
         c: () => { }, 
diff --git a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.errors.txt b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.errors.txt
index faef7905453..dacfb1a522d 100644
--- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.errors.txt
+++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.errors.txt
@@ -4,8 +4,8 @@ tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerCon
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts(24,5): error TS2411: Property 'd' of type 'string' is not assignable to string index type 'A'.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts(31,5): error TS2411: Property 'c' of type 'number' is not assignable to string index type 'A'.
 tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts(32,5): error TS2411: Property 'd' of type 'string' is not assignable to string index type 'A'.
-tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts(36,5): error TS2322: Type '{ [x: string]: typeof A; a: typeof A; b: typeof B; }' is not assignable to type '{ [x: string]: A; }'.
-  Index signatures are incompatible.
+tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerConstrainsPropertyDeclarations2.ts(36,5): error TS2322: Type '{ a: typeof A; b: typeof B; }' is not assignable to type '{ [x: string]: A; }'.
+  Property 'a' is incompatible with index signature.
     Type 'typeof A' is not assignable to type 'A'.
       Property 'foo' is missing in type 'typeof A'.
 
@@ -60,8 +60,8 @@ tests/cases/conformance/types/objectTypeLiteral/indexSignatures/stringIndexerCon
     // error
     var b: { [x: string]: A } = {
         ~
-!!! error TS2322: Type '{ [x: string]: typeof A; a: typeof A; b: typeof B; }' is not assignable to type '{ [x: string]: A; }'.
-!!! error TS2322:   Index signatures are incompatible.
+!!! error TS2322: Type '{ a: typeof A; b: typeof B; }' is not assignable to type '{ [x: string]: A; }'.
+!!! error TS2322:   Property 'a' is incompatible with index signature.
 !!! error TS2322:     Type 'typeof A' is not assignable to type 'A'.
 !!! error TS2322:       Property 'foo' is missing in type 'typeof A'.
         a: A,
diff --git a/tests/baselines/reference/stringIndexingResults.symbols b/tests/baselines/reference/stringIndexingResults.symbols
index 4890b44bce6..34771ab49ab 100644
--- a/tests/baselines/reference/stringIndexingResults.symbols
+++ b/tests/baselines/reference/stringIndexingResults.symbols
@@ -6,7 +6,7 @@ class C {
 >x : Symbol(x, Decl(stringIndexingResults.ts, 1, 5))
 
     y = '';
->y : Symbol(y, Decl(stringIndexingResults.ts, 1, 24))
+>y : Symbol(C.y, Decl(stringIndexingResults.ts, 1, 24))
 }
 
 var c: C;
@@ -33,7 +33,7 @@ interface I {
 >x : Symbol(x, Decl(stringIndexingResults.ts, 11, 5))
 
     y: string;
->y : Symbol(y, Decl(stringIndexingResults.ts, 11, 24))
+>y : Symbol(I.y, Decl(stringIndexingResults.ts, 11, 24))
 }
 
 var i: I
diff --git a/tests/baselines/reference/stringIndexingResults.types b/tests/baselines/reference/stringIndexingResults.types
index 9f613312e5a..1fdc580b1a2 100644
--- a/tests/baselines/reference/stringIndexingResults.types
+++ b/tests/baselines/reference/stringIndexingResults.types
@@ -95,7 +95,7 @@ var r9 = a[1];
 var b: { [x: string]: string } = { y: '' }
 >b : { [x: string]: string; }
 >x : string
->{ y: '' } : { [x: string]: string; y: string; }
+>{ y: '' } : { y: string; }
 >y : string
 >'' : string
 
diff --git a/tests/baselines/reference/stringLiteralCheckedInIf02.types b/tests/baselines/reference/stringLiteralCheckedInIf02.types
index f91eea03097..79f4c6a223a 100644
--- a/tests/baselines/reference/stringLiteralCheckedInIf02.types
+++ b/tests/baselines/reference/stringLiteralCheckedInIf02.types
@@ -31,7 +31,7 @@ function f(foo: T) {
 >T : ("a" | "b")[] | "a" | "b"
 
     if (isS(foo)) {
->isS(foo) : t is "a" | "b"
+>isS(foo) : boolean
 >isS : (t: ("a" | "b")[] | "a" | "b") => t is "a" | "b"
 >foo : ("a" | "b")[] | "a" | "b"
 
diff --git a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.symbols b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.symbols
index 1a49a6a6c47..e97b2a59118 100644
--- a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.symbols
+++ b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.symbols
@@ -84,7 +84,7 @@ function f7(x: 'a');
 function f7(x: Date);
 >f7 : Symbol(f7, Decl(stringLiteralTypeIsSubtypeOfString.ts, 27, 23), Decl(stringLiteralTypeIsSubtypeOfString.ts, 29, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 30, 21))
 >x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 30, 12))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function f7(x: any) { }
 >f7 : Symbol(f7, Decl(stringLiteralTypeIsSubtypeOfString.ts, 27, 23), Decl(stringLiteralTypeIsSubtypeOfString.ts, 29, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 30, 21))
@@ -117,90 +117,90 @@ function f9(x: any) { }
 
 class C implements String {
 >C : Symbol(C, Decl(stringLiteralTypeIsSubtypeOfString.ts, 39, 23))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     toString(): string { return null; }
->toString : Symbol(toString, Decl(stringLiteralTypeIsSubtypeOfString.ts, 41, 27))
+>toString : Symbol(C.toString, Decl(stringLiteralTypeIsSubtypeOfString.ts, 41, 27))
 
     charAt(pos: number): string { return null; }
->charAt : Symbol(charAt, Decl(stringLiteralTypeIsSubtypeOfString.ts, 42, 39))
+>charAt : Symbol(C.charAt, Decl(stringLiteralTypeIsSubtypeOfString.ts, 42, 39))
 >pos : Symbol(pos, Decl(stringLiteralTypeIsSubtypeOfString.ts, 43, 11))
 
     charCodeAt(index: number): number { return null; }
->charCodeAt : Symbol(charCodeAt, Decl(stringLiteralTypeIsSubtypeOfString.ts, 43, 48))
+>charCodeAt : Symbol(C.charCodeAt, Decl(stringLiteralTypeIsSubtypeOfString.ts, 43, 48))
 >index : Symbol(index, Decl(stringLiteralTypeIsSubtypeOfString.ts, 44, 15))
 
     concat(...strings: string[]): string { return null; }
->concat : Symbol(concat, Decl(stringLiteralTypeIsSubtypeOfString.ts, 44, 54))
+>concat : Symbol(C.concat, Decl(stringLiteralTypeIsSubtypeOfString.ts, 44, 54))
 >strings : Symbol(strings, Decl(stringLiteralTypeIsSubtypeOfString.ts, 45, 11))
 
     indexOf(searchString: string, position?: number): number { return null; }
->indexOf : Symbol(indexOf, Decl(stringLiteralTypeIsSubtypeOfString.ts, 45, 57))
+>indexOf : Symbol(C.indexOf, Decl(stringLiteralTypeIsSubtypeOfString.ts, 45, 57))
 >searchString : Symbol(searchString, Decl(stringLiteralTypeIsSubtypeOfString.ts, 46, 12))
 >position : Symbol(position, Decl(stringLiteralTypeIsSubtypeOfString.ts, 46, 33))
 
     lastIndexOf(searchString: string, position?: number): number { return null; }
->lastIndexOf : Symbol(lastIndexOf, Decl(stringLiteralTypeIsSubtypeOfString.ts, 46, 77))
+>lastIndexOf : Symbol(C.lastIndexOf, Decl(stringLiteralTypeIsSubtypeOfString.ts, 46, 77))
 >searchString : Symbol(searchString, Decl(stringLiteralTypeIsSubtypeOfString.ts, 47, 16))
 >position : Symbol(position, Decl(stringLiteralTypeIsSubtypeOfString.ts, 47, 37))
 
     localeCompare(that: string): number { return null; }
->localeCompare : Symbol(localeCompare, Decl(stringLiteralTypeIsSubtypeOfString.ts, 47, 81))
+>localeCompare : Symbol(C.localeCompare, Decl(stringLiteralTypeIsSubtypeOfString.ts, 47, 81))
 >that : Symbol(that, Decl(stringLiteralTypeIsSubtypeOfString.ts, 48, 18))
 
     match(regexp: any): string[] { return null; }
->match : Symbol(match, Decl(stringLiteralTypeIsSubtypeOfString.ts, 48, 56))
+>match : Symbol(C.match, Decl(stringLiteralTypeIsSubtypeOfString.ts, 48, 56))
 >regexp : Symbol(regexp, Decl(stringLiteralTypeIsSubtypeOfString.ts, 49, 10))
 
     replace(searchValue: any, replaceValue: any): string { return null; }
->replace : Symbol(replace, Decl(stringLiteralTypeIsSubtypeOfString.ts, 49, 49))
+>replace : Symbol(C.replace, Decl(stringLiteralTypeIsSubtypeOfString.ts, 49, 49))
 >searchValue : Symbol(searchValue, Decl(stringLiteralTypeIsSubtypeOfString.ts, 50, 12))
 >replaceValue : Symbol(replaceValue, Decl(stringLiteralTypeIsSubtypeOfString.ts, 50, 29))
 
     search(regexp: any): number { return null; }
->search : Symbol(search, Decl(stringLiteralTypeIsSubtypeOfString.ts, 50, 73))
+>search : Symbol(C.search, Decl(stringLiteralTypeIsSubtypeOfString.ts, 50, 73))
 >regexp : Symbol(regexp, Decl(stringLiteralTypeIsSubtypeOfString.ts, 51, 11))
 
     slice(start?: number, end?: number): string { return null; }
->slice : Symbol(slice, Decl(stringLiteralTypeIsSubtypeOfString.ts, 51, 48))
+>slice : Symbol(C.slice, Decl(stringLiteralTypeIsSubtypeOfString.ts, 51, 48))
 >start : Symbol(start, Decl(stringLiteralTypeIsSubtypeOfString.ts, 52, 10))
 >end : Symbol(end, Decl(stringLiteralTypeIsSubtypeOfString.ts, 52, 25))
 
     split(separator: any, limit?: number): string[] { return null; }
->split : Symbol(split, Decl(stringLiteralTypeIsSubtypeOfString.ts, 52, 64))
+>split : Symbol(C.split, Decl(stringLiteralTypeIsSubtypeOfString.ts, 52, 64))
 >separator : Symbol(separator, Decl(stringLiteralTypeIsSubtypeOfString.ts, 53, 10))
 >limit : Symbol(limit, Decl(stringLiteralTypeIsSubtypeOfString.ts, 53, 25))
 
     substring(start: number, end?: number): string { return null; }
->substring : Symbol(substring, Decl(stringLiteralTypeIsSubtypeOfString.ts, 53, 68))
+>substring : Symbol(C.substring, Decl(stringLiteralTypeIsSubtypeOfString.ts, 53, 68))
 >start : Symbol(start, Decl(stringLiteralTypeIsSubtypeOfString.ts, 54, 14))
 >end : Symbol(end, Decl(stringLiteralTypeIsSubtypeOfString.ts, 54, 28))
 
     toLowerCase(): string { return null; }
->toLowerCase : Symbol(toLowerCase, Decl(stringLiteralTypeIsSubtypeOfString.ts, 54, 67))
+>toLowerCase : Symbol(C.toLowerCase, Decl(stringLiteralTypeIsSubtypeOfString.ts, 54, 67))
 
     toLocaleLowerCase(): string { return null; }
->toLocaleLowerCase : Symbol(toLocaleLowerCase, Decl(stringLiteralTypeIsSubtypeOfString.ts, 55, 42))
+>toLocaleLowerCase : Symbol(C.toLocaleLowerCase, Decl(stringLiteralTypeIsSubtypeOfString.ts, 55, 42))
 
     toUpperCase(): string { return null; }
->toUpperCase : Symbol(toUpperCase, Decl(stringLiteralTypeIsSubtypeOfString.ts, 56, 48))
+>toUpperCase : Symbol(C.toUpperCase, Decl(stringLiteralTypeIsSubtypeOfString.ts, 56, 48))
 
     toLocaleUpperCase(): string { return null; }
->toLocaleUpperCase : Symbol(toLocaleUpperCase, Decl(stringLiteralTypeIsSubtypeOfString.ts, 57, 42))
+>toLocaleUpperCase : Symbol(C.toLocaleUpperCase, Decl(stringLiteralTypeIsSubtypeOfString.ts, 57, 42))
 
     trim(): string { return null; }
->trim : Symbol(trim, Decl(stringLiteralTypeIsSubtypeOfString.ts, 58, 48))
+>trim : Symbol(C.trim, Decl(stringLiteralTypeIsSubtypeOfString.ts, 58, 48))
 
     length: number;
->length : Symbol(length, Decl(stringLiteralTypeIsSubtypeOfString.ts, 59, 35))
+>length : Symbol(C.length, Decl(stringLiteralTypeIsSubtypeOfString.ts, 59, 35))
 
     substr(from: number, length?: number): string { return null; }
->substr : Symbol(substr, Decl(stringLiteralTypeIsSubtypeOfString.ts, 60, 19))
+>substr : Symbol(C.substr, Decl(stringLiteralTypeIsSubtypeOfString.ts, 60, 19))
 >from : Symbol(from, Decl(stringLiteralTypeIsSubtypeOfString.ts, 61, 11))
 >length : Symbol(length, Decl(stringLiteralTypeIsSubtypeOfString.ts, 61, 24))
 
     valueOf(): string { return null; }
->valueOf : Symbol(valueOf, Decl(stringLiteralTypeIsSubtypeOfString.ts, 61, 66))
+>valueOf : Symbol(C.valueOf, Decl(stringLiteralTypeIsSubtypeOfString.ts, 61, 66))
 
     [index: number]: string;
 >index : Symbol(index, Decl(stringLiteralTypeIsSubtypeOfString.ts, 63, 5))
@@ -222,10 +222,10 @@ function f10(x: any) { }
 
 interface I extends String {
 >I : Symbol(I, Decl(stringLiteralTypeIsSubtypeOfString.ts, 69, 24))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     foo: string;
->foo : Symbol(foo, Decl(stringLiteralTypeIsSubtypeOfString.ts, 71, 28))
+>foo : Symbol(I.foo, Decl(stringLiteralTypeIsSubtypeOfString.ts, 71, 28))
 }
 
 // BUG 831846
@@ -261,20 +261,20 @@ function f12<T>(x: any) { }
 function f13<T extends String>(x: 'a');
 >f13 : Symbol(f13, Decl(stringLiteralTypeIsSubtypeOfString.ts, 82, 27), Decl(stringLiteralTypeIsSubtypeOfString.ts, 84, 39), Decl(stringLiteralTypeIsSubtypeOfString.ts, 85, 37))
 >T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 84, 13))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 84, 31))
 
 function f13<T extends String>(x: T);
 >f13 : Symbol(f13, Decl(stringLiteralTypeIsSubtypeOfString.ts, 82, 27), Decl(stringLiteralTypeIsSubtypeOfString.ts, 84, 39), Decl(stringLiteralTypeIsSubtypeOfString.ts, 85, 37))
 >T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 85, 13))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 85, 31))
 >T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 85, 13))
 
 function f13<T extends String>(x: any) { }
 >f13 : Symbol(f13, Decl(stringLiteralTypeIsSubtypeOfString.ts, 82, 27), Decl(stringLiteralTypeIsSubtypeOfString.ts, 84, 39), Decl(stringLiteralTypeIsSubtypeOfString.ts, 85, 37))
 >T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 86, 13))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 86, 31))
 
 enum E { A }
@@ -319,7 +319,7 @@ function f15<T, U extends T>(x: any) { }
 function f16<T extends String, U extends T>(x: 'a');
 >f16 : Symbol(f16, Decl(stringLiteralTypeIsSubtypeOfString.ts, 95, 40), Decl(stringLiteralTypeIsSubtypeOfString.ts, 97, 52), Decl(stringLiteralTypeIsSubtypeOfString.ts, 98, 50))
 >T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 97, 13))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >U : Symbol(U, Decl(stringLiteralTypeIsSubtypeOfString.ts, 97, 30))
 >T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 97, 13))
 >x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 97, 44))
@@ -327,7 +327,7 @@ function f16<T extends String, U extends T>(x: 'a');
 function f16<T extends String, U extends T>(x: U);
 >f16 : Symbol(f16, Decl(stringLiteralTypeIsSubtypeOfString.ts, 95, 40), Decl(stringLiteralTypeIsSubtypeOfString.ts, 97, 52), Decl(stringLiteralTypeIsSubtypeOfString.ts, 98, 50))
 >T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 98, 13))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >U : Symbol(U, Decl(stringLiteralTypeIsSubtypeOfString.ts, 98, 30))
 >T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 98, 13))
 >x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 98, 44))
@@ -336,7 +336,7 @@ function f16<T extends String, U extends T>(x: U);
 function f16<T extends String, U extends T>(x: any) { }
 >f16 : Symbol(f16, Decl(stringLiteralTypeIsSubtypeOfString.ts, 95, 40), Decl(stringLiteralTypeIsSubtypeOfString.ts, 97, 52), Decl(stringLiteralTypeIsSubtypeOfString.ts, 98, 50))
 >T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 99, 13))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >U : Symbol(U, Decl(stringLiteralTypeIsSubtypeOfString.ts, 99, 30))
 >T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 99, 13))
 >x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 99, 44))
diff --git a/tests/baselines/reference/stringLiteralTypesAsTags01.symbols b/tests/baselines/reference/stringLiteralTypesAsTags01.symbols
index afdeeff71a6..f092e1f7a50 100644
--- a/tests/baselines/reference/stringLiteralTypesAsTags01.symbols
+++ b/tests/baselines/reference/stringLiteralTypesAsTags01.symbols
@@ -7,7 +7,7 @@ interface Entity {
 >Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags01.ts, 1, 21))
 
     kind: Kind;
->kind : Symbol(kind, Decl(stringLiteralTypesAsTags01.ts, 3, 18))
+>kind : Symbol(Entity.kind, Decl(stringLiteralTypesAsTags01.ts, 3, 18))
 >Kind : Symbol(Kind, Decl(stringLiteralTypesAsTags01.ts, 0, 0))
 }
 
@@ -16,10 +16,10 @@ interface A extends Entity {
 >Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags01.ts, 1, 21))
 
     kind: "A";
->kind : Symbol(kind, Decl(stringLiteralTypesAsTags01.ts, 7, 28))
+>kind : Symbol(A.kind, Decl(stringLiteralTypesAsTags01.ts, 7, 28))
 
     a: number;
->a : Symbol(a, Decl(stringLiteralTypesAsTags01.ts, 8, 14))
+>a : Symbol(A.a, Decl(stringLiteralTypesAsTags01.ts, 8, 14))
 }
 
 interface B extends Entity {
@@ -27,10 +27,10 @@ interface B extends Entity {
 >Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags01.ts, 1, 21))
 
     kind: "B";
->kind : Symbol(kind, Decl(stringLiteralTypesAsTags01.ts, 12, 28))
+>kind : Symbol(B.kind, Decl(stringLiteralTypesAsTags01.ts, 12, 28))
 
     b: string;
->b : Symbol(b, Decl(stringLiteralTypesAsTags01.ts, 13, 14))
+>b : Symbol(B.b, Decl(stringLiteralTypesAsTags01.ts, 13, 14))
 }
 
 function hasKind(entity: Entity, kind: "A"): entity is A;
diff --git a/tests/baselines/reference/stringLiteralTypesAsTags01.types b/tests/baselines/reference/stringLiteralTypesAsTags01.types
index 6966ede5482..a7f403e76ec 100644
--- a/tests/baselines/reference/stringLiteralTypesAsTags01.types
+++ b/tests/baselines/reference/stringLiteralTypesAsTags01.types
@@ -88,7 +88,7 @@ let x: A = {
 }
 
 if (hasKind(x, "A")) {
->hasKind(x, "A") : entity is A
+>hasKind(x, "A") : boolean
 >hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; (entity: Entity, kind: "A" | "B"): entity is Entity; }
 >x : A
 >"A" : "A"
@@ -105,7 +105,7 @@ else {
 
 if (!hasKind(x, "B")) {
 >!hasKind(x, "B") : boolean
->hasKind(x, "B") : entity is B
+>hasKind(x, "B") : boolean
 >hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; (entity: Entity, kind: "A" | "B"): entity is Entity; }
 >x : A
 >"B" : "B"
diff --git a/tests/baselines/reference/stringLiteralTypesAsTags02.symbols b/tests/baselines/reference/stringLiteralTypesAsTags02.symbols
index 61d50230993..1cf73015ea7 100644
--- a/tests/baselines/reference/stringLiteralTypesAsTags02.symbols
+++ b/tests/baselines/reference/stringLiteralTypesAsTags02.symbols
@@ -7,7 +7,7 @@ interface Entity {
 >Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags02.ts, 1, 21))
 
     kind: Kind;
->kind : Symbol(kind, Decl(stringLiteralTypesAsTags02.ts, 3, 18))
+>kind : Symbol(Entity.kind, Decl(stringLiteralTypesAsTags02.ts, 3, 18))
 >Kind : Symbol(Kind, Decl(stringLiteralTypesAsTags02.ts, 0, 0))
 }
 
@@ -16,10 +16,10 @@ interface A extends Entity {
 >Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags02.ts, 1, 21))
 
     kind: "A";
->kind : Symbol(kind, Decl(stringLiteralTypesAsTags02.ts, 7, 28))
+>kind : Symbol(A.kind, Decl(stringLiteralTypesAsTags02.ts, 7, 28))
 
     a: number;
->a : Symbol(a, Decl(stringLiteralTypesAsTags02.ts, 8, 14))
+>a : Symbol(A.a, Decl(stringLiteralTypesAsTags02.ts, 8, 14))
 }
 
 interface B extends Entity {
@@ -27,10 +27,10 @@ interface B extends Entity {
 >Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags02.ts, 1, 21))
 
     kind: "B";
->kind : Symbol(kind, Decl(stringLiteralTypesAsTags02.ts, 12, 28))
+>kind : Symbol(B.kind, Decl(stringLiteralTypesAsTags02.ts, 12, 28))
 
     b: string;
->b : Symbol(b, Decl(stringLiteralTypesAsTags02.ts, 13, 14))
+>b : Symbol(B.b, Decl(stringLiteralTypesAsTags02.ts, 13, 14))
 }
 
 function hasKind(entity: Entity, kind: "A"): entity is A;
diff --git a/tests/baselines/reference/stringLiteralTypesAsTags02.types b/tests/baselines/reference/stringLiteralTypesAsTags02.types
index 0b8ea0faf67..edad220b086 100644
--- a/tests/baselines/reference/stringLiteralTypesAsTags02.types
+++ b/tests/baselines/reference/stringLiteralTypesAsTags02.types
@@ -82,7 +82,7 @@ let x: A = {
 }
 
 if (hasKind(x, "A")) {
->hasKind(x, "A") : entity is A
+>hasKind(x, "A") : boolean
 >hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; }
 >x : A
 >"A" : "A"
@@ -99,7 +99,7 @@ else {
 
 if (!hasKind(x, "B")) {
 >!hasKind(x, "B") : boolean
->hasKind(x, "B") : entity is B
+>hasKind(x, "B") : boolean
 >hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; }
 >x : A
 >"B" : "B"
diff --git a/tests/baselines/reference/stringLiteralTypesAsTags03.symbols b/tests/baselines/reference/stringLiteralTypesAsTags03.symbols
index 3694daf8e00..6f7e522d55b 100644
--- a/tests/baselines/reference/stringLiteralTypesAsTags03.symbols
+++ b/tests/baselines/reference/stringLiteralTypesAsTags03.symbols
@@ -7,7 +7,7 @@ interface Entity {
 >Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags03.ts, 1, 21))
 
     kind: Kind;
->kind : Symbol(kind, Decl(stringLiteralTypesAsTags03.ts, 3, 18))
+>kind : Symbol(Entity.kind, Decl(stringLiteralTypesAsTags03.ts, 3, 18))
 >Kind : Symbol(Kind, Decl(stringLiteralTypesAsTags03.ts, 0, 0))
 }
 
@@ -16,10 +16,10 @@ interface A extends Entity {
 >Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags03.ts, 1, 21))
 
     kind: "A";
->kind : Symbol(kind, Decl(stringLiteralTypesAsTags03.ts, 7, 28))
+>kind : Symbol(A.kind, Decl(stringLiteralTypesAsTags03.ts, 7, 28))
 
     a: number;
->a : Symbol(a, Decl(stringLiteralTypesAsTags03.ts, 8, 14))
+>a : Symbol(A.a, Decl(stringLiteralTypesAsTags03.ts, 8, 14))
 }
 
 interface B extends Entity {
@@ -27,10 +27,10 @@ interface B extends Entity {
 >Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags03.ts, 1, 21))
 
     kind: "B";
->kind : Symbol(kind, Decl(stringLiteralTypesAsTags03.ts, 12, 28))
+>kind : Symbol(B.kind, Decl(stringLiteralTypesAsTags03.ts, 12, 28))
 
     b: string;
->b : Symbol(b, Decl(stringLiteralTypesAsTags03.ts, 13, 14))
+>b : Symbol(B.b, Decl(stringLiteralTypesAsTags03.ts, 13, 14))
 }
 
 // Currently (2015-12-14), we write '"A" | "A"' and '"B" | "B"' to avoid
diff --git a/tests/baselines/reference/stringLiteralTypesAsTags03.types b/tests/baselines/reference/stringLiteralTypesAsTags03.types
index a1d83a1c058..25816659388 100644
--- a/tests/baselines/reference/stringLiteralTypesAsTags03.types
+++ b/tests/baselines/reference/stringLiteralTypesAsTags03.types
@@ -85,7 +85,7 @@ let x: A = {
 }
 
 if (hasKind(x, "A")) {
->hasKind(x, "A") : entity is A
+>hasKind(x, "A") : boolean
 >hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; }
 >x : A
 >"A" : "A"
@@ -102,7 +102,7 @@ else {
 
 if (!hasKind(x, "B")) {
 >!hasKind(x, "B") : boolean
->hasKind(x, "B") : entity is B
+>hasKind(x, "B") : boolean
 >hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; }
 >x : A
 >"B" : "B"
diff --git a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.symbols b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.symbols
index 6f764b5c271..769ba4715f8 100644
--- a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.symbols
+++ b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.symbols
@@ -19,7 +19,7 @@ class C {
 >C : Symbol(C, Decl(stringLiteralTypesInImplementationSignatures.ts, 4, 34))
 
     foo(x: 'hi') { }
->foo : Symbol(foo, Decl(stringLiteralTypesInImplementationSignatures.ts, 6, 9))
+>foo : Symbol(C.foo, Decl(stringLiteralTypesInImplementationSignatures.ts, 6, 9))
 >x : Symbol(x, Decl(stringLiteralTypesInImplementationSignatures.ts, 7, 8))
 }
 
@@ -30,7 +30,7 @@ interface I {
 >x : Symbol(x, Decl(stringLiteralTypesInImplementationSignatures.ts, 11, 5))
 
     foo(x: 'hi', y: 'hi');
->foo : Symbol(foo, Decl(stringLiteralTypesInImplementationSignatures.ts, 11, 14))
+>foo : Symbol(I.foo, Decl(stringLiteralTypesInImplementationSignatures.ts, 11, 14))
 >x : Symbol(x, Decl(stringLiteralTypesInImplementationSignatures.ts, 12, 8))
 >y : Symbol(y, Decl(stringLiteralTypesInImplementationSignatures.ts, 12, 16))
 }
diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.errors.txt
index 4c66c2000f9..8010b31a9d0 100644
--- a/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.errors.txt
+++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability01.ts(15,1): error TS2322: Type '(x: "bar") => number' is not assignable to type '(x: "foo") => number'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type '"bar"' is not assignable to type '"foo"'.
+    Type '"foo"' is not assignable to type '"bar"'.
 tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability01.ts(16,1): error TS2322: Type '(x: "foo") => number' is not assignable to type '(x: "bar") => number'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type '"foo"' is not assignable to type '"bar"'.
+    Type '"bar"' is not assignable to type '"foo"'.
 
 
 ==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability01.ts (2 errors) ====
@@ -25,9 +25,9 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignabil
     ~
 !!! error TS2322: Type '(x: "bar") => number' is not assignable to type '(x: "foo") => number'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:     Type '"bar"' is not assignable to type '"foo"'.
+!!! error TS2322:     Type '"foo"' is not assignable to type '"bar"'.
     b = a;
     ~
 !!! error TS2322: Type '(x: "foo") => number' is not assignable to type '(x: "bar") => number'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:     Type '"foo"' is not assignable to type '"bar"'.
\ No newline at end of file
+!!! error TS2322:     Type '"bar"' is not assignable to type '"foo"'.
\ No newline at end of file
diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.errors.txt
index 952fd7aae86..8fe5a676aab 100644
--- a/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.errors.txt
+++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability02.ts(15,1): error TS2322: Type '(x: "bar") => number' is not assignable to type '(x: "foo") => number'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type '"bar"' is not assignable to type '"foo"'.
+    Type '"foo"' is not assignable to type '"bar"'.
 tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability02.ts(16,1): error TS2322: Type '(x: "foo") => number' is not assignable to type '(x: "bar") => number'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type '"foo"' is not assignable to type '"bar"'.
+    Type '"bar"' is not assignable to type '"foo"'.
 
 
 ==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability02.ts (2 errors) ====
@@ -25,9 +25,9 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignabil
     ~
 !!! error TS2322: Type '(x: "bar") => number' is not assignable to type '(x: "foo") => number'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:     Type '"bar"' is not assignable to type '"foo"'.
+!!! error TS2322:     Type '"foo"' is not assignable to type '"bar"'.
     b = a;
     ~
 !!! error TS2322: Type '(x: "foo") => number' is not assignable to type '(x: "bar") => number'.
 !!! error TS2322:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2322:     Type '"foo"' is not assignable to type '"bar"'.
\ No newline at end of file
+!!! error TS2322:     Type '"bar"' is not assignable to type '"foo"'.
\ No newline at end of file
diff --git a/tests/baselines/reference/stringLiteralTypesOverloads03.symbols b/tests/baselines/reference/stringLiteralTypesOverloads03.symbols
index a0a48de790f..277cc7e84e3 100644
--- a/tests/baselines/reference/stringLiteralTypesOverloads03.symbols
+++ b/tests/baselines/reference/stringLiteralTypesOverloads03.symbols
@@ -4,10 +4,10 @@ interface Base {
 >Base : Symbol(Base, Decl(stringLiteralTypesOverloads03.ts, 0, 0))
 
     x: string;
->x : Symbol(x, Decl(stringLiteralTypesOverloads03.ts, 1, 16))
+>x : Symbol(Base.x, Decl(stringLiteralTypesOverloads03.ts, 1, 16))
 
     y: number;
->y : Symbol(y, Decl(stringLiteralTypesOverloads03.ts, 2, 14))
+>y : Symbol(Base.y, Decl(stringLiteralTypesOverloads03.ts, 2, 14))
 }
 
 interface HelloOrWorld extends Base {
@@ -15,7 +15,7 @@ interface HelloOrWorld extends Base {
 >Base : Symbol(Base, Decl(stringLiteralTypesOverloads03.ts, 0, 0))
 
     p1: boolean;
->p1 : Symbol(p1, Decl(stringLiteralTypesOverloads03.ts, 6, 37))
+>p1 : Symbol(HelloOrWorld.p1, Decl(stringLiteralTypesOverloads03.ts, 6, 37))
 }
 
 interface JustHello extends Base {
@@ -23,7 +23,7 @@ interface JustHello extends Base {
 >Base : Symbol(Base, Decl(stringLiteralTypesOverloads03.ts, 0, 0))
 
     p2: boolean;
->p2 : Symbol(p2, Decl(stringLiteralTypesOverloads03.ts, 10, 34))
+>p2 : Symbol(JustHello.p2, Decl(stringLiteralTypesOverloads03.ts, 10, 34))
 }
 
 interface JustWorld extends Base {
@@ -31,7 +31,7 @@ interface JustWorld extends Base {
 >Base : Symbol(Base, Decl(stringLiteralTypesOverloads03.ts, 0, 0))
 
     p3: boolean;
->p3 : Symbol(p3, Decl(stringLiteralTypesOverloads03.ts, 14, 34))
+>p3 : Symbol(JustWorld.p3, Decl(stringLiteralTypesOverloads03.ts, 14, 34))
 }
 
 let hello: "hello";
diff --git a/tests/baselines/reference/stringLiteralTypesTypePredicates01.types b/tests/baselines/reference/stringLiteralTypesTypePredicates01.types
index 43c8271b76b..41da80afd30 100644
--- a/tests/baselines/reference/stringLiteralTypesTypePredicates01.types
+++ b/tests/baselines/reference/stringLiteralTypesTypePredicates01.types
@@ -36,7 +36,7 @@ var x: Kind = "A";
 >"A" : "A"
 
 if (kindIs(x, "A")) {
->kindIs(x, "A") : kind is "A"
+>kindIs(x, "A") : boolean
 >kindIs : { (kind: "A" | "B", is: "A"): kind is "A"; (kind: "A" | "B", is: "B"): kind is "B"; }
 >x : "A" | "B"
 >"A" : "A"
@@ -53,7 +53,7 @@ else {
 
 if (!kindIs(x, "B")) {
 >!kindIs(x, "B") : boolean
->kindIs(x, "B") : kind is "B"
+>kindIs(x, "B") : boolean
 >kindIs : { (kind: "A" | "B", is: "A"): kind is "A"; (kind: "A" | "B", is: "B"): kind is "B"; }
 >x : "A" | "B"
 >"B" : "B"
diff --git a/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.errors.txt b/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.errors.txt
index 69dd6c2f6a9..92afe67df0c 100644
--- a/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.errors.txt
+++ b/tests/baselines/reference/stringLiteralTypesWithVariousOperators02.errors.txt
@@ -7,9 +7,12 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperato
 tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(13,11): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
 tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(14,9): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
 tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(15,9): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(16,9): error TS2365: Operator '<' cannot be applied to types '"ABC"' and '"XYZ"'.
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(17,9): error TS2365: Operator '===' cannot be applied to types '"ABC"' and '"XYZ"'.
+tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts(18,9): error TS2365: Operator '!=' cannot be applied to types '"ABC"' and '"XYZ"'.
 
 
-==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts (9 errors) ====
+==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperators02.ts (12 errors) ====
     
     let abc: "ABC" = "ABC";
     let xyz: "XYZ" = "XYZ";
@@ -44,5 +47,11 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesWithVariousOperato
             ~~~~~~~~~~~~~~~~
 !!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
     let j = abc < xyz;
+            ~~~~~~~~~
+!!! error TS2365: Operator '<' cannot be applied to types '"ABC"' and '"XYZ"'.
     let k = abc === xyz;
-    let l = abc != xyz;
\ No newline at end of file
+            ~~~~~~~~~~~
+!!! error TS2365: Operator '===' cannot be applied to types '"ABC"' and '"XYZ"'.
+    let l = abc != xyz;
+            ~~~~~~~~~~
+!!! error TS2365: Operator '!=' cannot be applied to types '"ABC"' and '"XYZ"'.
\ No newline at end of file
diff --git a/tests/baselines/reference/stripInternal1.symbols b/tests/baselines/reference/stripInternal1.symbols
index 2a71c1d9dbd..dd53f671bc9 100644
--- a/tests/baselines/reference/stripInternal1.symbols
+++ b/tests/baselines/reference/stripInternal1.symbols
@@ -4,9 +4,9 @@ class C {
 >C : Symbol(C, Decl(stripInternal1.ts, 0, 0))
 
   foo(): void { }
->foo : Symbol(foo, Decl(stripInternal1.ts, 1, 9))
+>foo : Symbol(C.foo, Decl(stripInternal1.ts, 1, 9))
 
   // @internal
   bar(): void { }
->bar : Symbol(bar, Decl(stripInternal1.ts, 2, 17))
+>bar : Symbol(C.bar, Decl(stripInternal1.ts, 2, 17))
 }
diff --git a/tests/baselines/reference/structural1.symbols b/tests/baselines/reference/structural1.symbols
index 78330978cd4..c04668c992d 100644
--- a/tests/baselines/reference/structural1.symbols
+++ b/tests/baselines/reference/structural1.symbols
@@ -6,10 +6,10 @@ module M {
 >I : Symbol(I, Decl(structural1.ts, 0, 10))
 
         salt:number;
->salt : Symbol(salt, Decl(structural1.ts, 1, 24))
+>salt : Symbol(I.salt, Decl(structural1.ts, 1, 24))
 
         pepper:number;
->pepper : Symbol(pepper, Decl(structural1.ts, 2, 20))
+>pepper : Symbol(I.pepper, Decl(structural1.ts, 2, 20))
     }
 
     export function f(i:I) {
diff --git a/tests/baselines/reference/subtypesOfAny.symbols b/tests/baselines/reference/subtypesOfAny.symbols
index 85f5186f705..5e5353e8c9d 100644
--- a/tests/baselines/reference/subtypesOfAny.symbols
+++ b/tests/baselines/reference/subtypesOfAny.symbols
@@ -8,7 +8,7 @@ interface I {
 >x : Symbol(x, Decl(subtypesOfAny.ts, 3, 5))
 
     foo: any;
->foo : Symbol(foo, Decl(subtypesOfAny.ts, 3, 21))
+>foo : Symbol(I.foo, Decl(subtypesOfAny.ts, 3, 21))
 }
 
 
@@ -19,7 +19,7 @@ interface I2 {
 >x : Symbol(x, Decl(subtypesOfAny.ts, 9, 5))
 
     foo: number;
->foo : Symbol(foo, Decl(subtypesOfAny.ts, 9, 21))
+>foo : Symbol(I2.foo, Decl(subtypesOfAny.ts, 9, 21))
 }
 
 
@@ -30,7 +30,7 @@ interface I3 {
 >x : Symbol(x, Decl(subtypesOfAny.ts, 15, 5))
 
     foo: string;
->foo : Symbol(foo, Decl(subtypesOfAny.ts, 15, 21))
+>foo : Symbol(I3.foo, Decl(subtypesOfAny.ts, 15, 21))
 }
 
 
@@ -41,7 +41,7 @@ interface I4 {
 >x : Symbol(x, Decl(subtypesOfAny.ts, 21, 5))
 
     foo: boolean;
->foo : Symbol(foo, Decl(subtypesOfAny.ts, 21, 21))
+>foo : Symbol(I4.foo, Decl(subtypesOfAny.ts, 21, 21))
 }
 
 
@@ -52,8 +52,8 @@ interface I5 {
 >x : Symbol(x, Decl(subtypesOfAny.ts, 27, 5))
 
     foo: Date;
->foo : Symbol(foo, Decl(subtypesOfAny.ts, 27, 21))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>foo : Symbol(I5.foo, Decl(subtypesOfAny.ts, 27, 21))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
 
@@ -64,7 +64,7 @@ interface I6 {
 >x : Symbol(x, Decl(subtypesOfAny.ts, 33, 5))
 
     foo: RegExp;
->foo : Symbol(foo, Decl(subtypesOfAny.ts, 33, 21))
+>foo : Symbol(I6.foo, Decl(subtypesOfAny.ts, 33, 21))
 >RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
@@ -76,7 +76,7 @@ interface I7 {
 >x : Symbol(x, Decl(subtypesOfAny.ts, 39, 5))
 
     foo: { bar: number };
->foo : Symbol(foo, Decl(subtypesOfAny.ts, 39, 21))
+>foo : Symbol(I7.foo, Decl(subtypesOfAny.ts, 39, 21))
 >bar : Symbol(bar, Decl(subtypesOfAny.ts, 40, 10))
 }
 
@@ -88,7 +88,7 @@ interface I8 {
 >x : Symbol(x, Decl(subtypesOfAny.ts, 45, 5))
 
     foo: number[];
->foo : Symbol(foo, Decl(subtypesOfAny.ts, 45, 21))
+>foo : Symbol(I8.foo, Decl(subtypesOfAny.ts, 45, 21))
 }
 
 
@@ -99,13 +99,13 @@ interface I9 {
 >x : Symbol(x, Decl(subtypesOfAny.ts, 51, 5))
 
     foo: I8;
->foo : Symbol(foo, Decl(subtypesOfAny.ts, 51, 21))
+>foo : Symbol(I9.foo, Decl(subtypesOfAny.ts, 51, 21))
 >I8 : Symbol(I8, Decl(subtypesOfAny.ts, 41, 1))
 }
 
 class A { foo: number; }
 >A : Symbol(A, Decl(subtypesOfAny.ts, 53, 1))
->foo : Symbol(foo, Decl(subtypesOfAny.ts, 55, 9))
+>foo : Symbol(A.foo, Decl(subtypesOfAny.ts, 55, 9))
 
 interface I10 {
 >I10 : Symbol(I10, Decl(subtypesOfAny.ts, 55, 24))
@@ -114,14 +114,14 @@ interface I10 {
 >x : Symbol(x, Decl(subtypesOfAny.ts, 57, 5))
 
     foo: A;
->foo : Symbol(foo, Decl(subtypesOfAny.ts, 57, 21))
+>foo : Symbol(I10.foo, Decl(subtypesOfAny.ts, 57, 21))
 >A : Symbol(A, Decl(subtypesOfAny.ts, 53, 1))
 }
 
 class A2<T> { foo: T; }
 >A2 : Symbol(A2, Decl(subtypesOfAny.ts, 59, 1))
 >T : Symbol(T, Decl(subtypesOfAny.ts, 61, 9))
->foo : Symbol(foo, Decl(subtypesOfAny.ts, 61, 13))
+>foo : Symbol(A2.foo, Decl(subtypesOfAny.ts, 61, 13))
 >T : Symbol(T, Decl(subtypesOfAny.ts, 61, 9))
 
 interface I11 {
@@ -131,7 +131,7 @@ interface I11 {
 >x : Symbol(x, Decl(subtypesOfAny.ts, 63, 5))
 
     foo: A2<number>;
->foo : Symbol(foo, Decl(subtypesOfAny.ts, 63, 21))
+>foo : Symbol(I11.foo, Decl(subtypesOfAny.ts, 63, 21))
 >A2 : Symbol(A2, Decl(subtypesOfAny.ts, 59, 1))
 }
 
@@ -143,7 +143,7 @@ interface I12 {
 >x : Symbol(x, Decl(subtypesOfAny.ts, 69, 5))
 
     foo: (x) => number;
->foo : Symbol(foo, Decl(subtypesOfAny.ts, 69, 21))
+>foo : Symbol(I12.foo, Decl(subtypesOfAny.ts, 69, 21))
 >x : Symbol(x, Decl(subtypesOfAny.ts, 70, 10))
 }
 
@@ -155,7 +155,7 @@ interface I13 {
 >x : Symbol(x, Decl(subtypesOfAny.ts, 75, 5))
 
     foo: <T>(x:T) => T;
->foo : Symbol(foo, Decl(subtypesOfAny.ts, 75, 21))
+>foo : Symbol(I13.foo, Decl(subtypesOfAny.ts, 75, 21))
 >T : Symbol(T, Decl(subtypesOfAny.ts, 76, 10))
 >x : Symbol(x, Decl(subtypesOfAny.ts, 76, 13))
 >T : Symbol(T, Decl(subtypesOfAny.ts, 76, 10))
@@ -174,7 +174,7 @@ interface I14 {
 >x : Symbol(x, Decl(subtypesOfAny.ts, 82, 5))
 
     foo: E;
->foo : Symbol(foo, Decl(subtypesOfAny.ts, 82, 21))
+>foo : Symbol(I14.foo, Decl(subtypesOfAny.ts, 82, 21))
 >E : Symbol(E, Decl(subtypesOfAny.ts, 77, 1))
 }
 
@@ -195,14 +195,14 @@ interface I15 {
 >x : Symbol(x, Decl(subtypesOfAny.ts, 92, 5))
 
     foo: typeof f;
->foo : Symbol(foo, Decl(subtypesOfAny.ts, 92, 21))
+>foo : Symbol(I15.foo, Decl(subtypesOfAny.ts, 92, 21))
 >f : Symbol(f, Decl(subtypesOfAny.ts, 84, 1), Decl(subtypesOfAny.ts, 87, 16))
 }
 
 
 class c { baz: string }
 >c : Symbol(c, Decl(subtypesOfAny.ts, 94, 1), Decl(subtypesOfAny.ts, 97, 23))
->baz : Symbol(baz, Decl(subtypesOfAny.ts, 97, 9))
+>baz : Symbol(c.baz, Decl(subtypesOfAny.ts, 97, 9))
 
 module c {
 >c : Symbol(c, Decl(subtypesOfAny.ts, 94, 1), Decl(subtypesOfAny.ts, 97, 23))
@@ -217,7 +217,7 @@ interface I16 {
 >x : Symbol(x, Decl(subtypesOfAny.ts, 102, 5))
 
     foo: typeof c;
->foo : Symbol(foo, Decl(subtypesOfAny.ts, 102, 21))
+>foo : Symbol(I16.foo, Decl(subtypesOfAny.ts, 102, 21))
 >c : Symbol(c, Decl(subtypesOfAny.ts, 94, 1), Decl(subtypesOfAny.ts, 97, 23))
 }
 
@@ -230,7 +230,7 @@ interface I17<T> {
 >x : Symbol(x, Decl(subtypesOfAny.ts, 108, 5))
 
     foo: T;
->foo : Symbol(foo, Decl(subtypesOfAny.ts, 108, 21))
+>foo : Symbol(I17.foo, Decl(subtypesOfAny.ts, 108, 21))
 >T : Symbol(T, Decl(subtypesOfAny.ts, 107, 14))
 }
 
@@ -244,7 +244,7 @@ interface I18<T, U> {
 >x : Symbol(x, Decl(subtypesOfAny.ts, 114, 5))
 
     foo: U;
->foo : Symbol(foo, Decl(subtypesOfAny.ts, 114, 21))
+>foo : Symbol(I18.foo, Decl(subtypesOfAny.ts, 114, 21))
 >U : Symbol(U, Decl(subtypesOfAny.ts, 113, 16))
 }
 //interface I18<T, U extends T> {
@@ -260,7 +260,7 @@ interface I19 {
 >x : Symbol(x, Decl(subtypesOfAny.ts, 124, 5))
 
     foo: Object;
->foo : Symbol(foo, Decl(subtypesOfAny.ts, 124, 21))
+>foo : Symbol(I19.foo, Decl(subtypesOfAny.ts, 124, 21))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
@@ -272,5 +272,5 @@ interface I20 {
 >x : Symbol(x, Decl(subtypesOfAny.ts, 130, 5))
 
     foo: {};
->foo : Symbol(foo, Decl(subtypesOfAny.ts, 130, 21))
+>foo : Symbol(I20.foo, Decl(subtypesOfAny.ts, 130, 21))
 }
diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.symbols b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.symbols
index 05276362cbe..b33b9d212f2 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.symbols
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.symbols
@@ -76,7 +76,7 @@ function f3<T extends U, U extends Date>(x: T, y: U) {
 >T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 22, 12))
 >U : Symbol(U, Decl(subtypesOfTypeParameterWithConstraints2.ts, 22, 24))
 >U : Symbol(U, Decl(subtypesOfTypeParameterWithConstraints2.ts, 22, 24))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 22, 41))
 >T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 22, 12))
 >y : Symbol(y, Decl(subtypesOfTypeParameterWithConstraints2.ts, 22, 46))
@@ -96,38 +96,38 @@ function f3<T extends U, U extends Date>(x: T, y: U) {
     var r2 = true ? x : new Date(); 
 >r2 : Symbol(r2, Decl(subtypesOfTypeParameterWithConstraints2.ts, 27, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 28, 7))
 >x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 22, 41))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     var r2 = true ? new Date() : x;
 >r2 : Symbol(r2, Decl(subtypesOfTypeParameterWithConstraints2.ts, 27, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 28, 7))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 22, 41))
 
     // ok
     var r3 = true ? y : new Date(); 
 >r3 : Symbol(r3, Decl(subtypesOfTypeParameterWithConstraints2.ts, 31, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 32, 7))
 >y : Symbol(y, Decl(subtypesOfTypeParameterWithConstraints2.ts, 22, 46))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     var r3 = true ? new Date() : y;
 >r3 : Symbol(r3, Decl(subtypesOfTypeParameterWithConstraints2.ts, 31, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 32, 7))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >y : Symbol(y, Decl(subtypesOfTypeParameterWithConstraints2.ts, 22, 46))
 }
 
 
 interface I1 { foo: number; }
 >I1 : Symbol(I1, Decl(subtypesOfTypeParameterWithConstraints2.ts, 33, 1))
->foo : Symbol(foo, Decl(subtypesOfTypeParameterWithConstraints2.ts, 36, 14))
+>foo : Symbol(I1.foo, Decl(subtypesOfTypeParameterWithConstraints2.ts, 36, 14))
 
 class C1 { foo: number; }
 >C1 : Symbol(C1, Decl(subtypesOfTypeParameterWithConstraints2.ts, 36, 29))
->foo : Symbol(foo, Decl(subtypesOfTypeParameterWithConstraints2.ts, 37, 10))
+>foo : Symbol(C1.foo, Decl(subtypesOfTypeParameterWithConstraints2.ts, 37, 10))
 
 class C2<T> { foo: T; }
 >C2 : Symbol(C2, Decl(subtypesOfTypeParameterWithConstraints2.ts, 37, 25))
 >T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 38, 9))
->foo : Symbol(foo, Decl(subtypesOfTypeParameterWithConstraints2.ts, 38, 13))
+>foo : Symbol(C2.foo, Decl(subtypesOfTypeParameterWithConstraints2.ts, 38, 13))
 >T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 38, 9))
 
 enum E { A }
@@ -145,7 +145,7 @@ module f {
 }
 class c { baz: string }
 >c : Symbol(c, Decl(subtypesOfTypeParameterWithConstraints2.ts, 43, 1), Decl(subtypesOfTypeParameterWithConstraints2.ts, 44, 23))
->baz : Symbol(baz, Decl(subtypesOfTypeParameterWithConstraints2.ts, 44, 9))
+>baz : Symbol(c.baz, Decl(subtypesOfTypeParameterWithConstraints2.ts, 44, 9))
 
 module c {
 >c : Symbol(c, Decl(subtypesOfTypeParameterWithConstraints2.ts, 43, 1), Decl(subtypesOfTypeParameterWithConstraints2.ts, 44, 23))
@@ -157,7 +157,7 @@ module c {
 function f4<T extends Number>(x: T) {
 >f4 : Symbol(f4, Decl(subtypesOfTypeParameterWithConstraints2.ts, 47, 1))
 >T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 49, 12))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 49, 30))
 >T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 49, 12))
 
@@ -187,7 +187,7 @@ function f4<T extends Number>(x: T) {
 function f5<T extends Number>(x: T) {
 >f5 : Symbol(f5, Decl(subtypesOfTypeParameterWithConstraints2.ts, 56, 1))
 >T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 58, 12))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 58, 30))
 >T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 58, 12))
 
@@ -203,7 +203,7 @@ function f5<T extends Number>(x: T) {
 function f6<T extends String>(x: T) {
 >f6 : Symbol(f6, Decl(subtypesOfTypeParameterWithConstraints2.ts, 61, 1))
 >T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 63, 12))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 63, 30))
 >T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 63, 12))
 
@@ -235,19 +235,19 @@ function f7<T extends Boolean>(x: T) {
 function f8<T extends Date>(x: T) {
 >f8 : Symbol(f8, Decl(subtypesOfTypeParameterWithConstraints2.ts, 71, 1))
 >T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 73, 12))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 73, 28))
 >T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 73, 12))
 
     var r4 = true ? new Date() : x; // ok
 >r4 : Symbol(r4, Decl(subtypesOfTypeParameterWithConstraints2.ts, 74, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 75, 7))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 73, 28))
 
     var r4 = true ? x : new Date(); // ok
 >r4 : Symbol(r4, Decl(subtypesOfTypeParameterWithConstraints2.ts, 74, 7), Decl(subtypesOfTypeParameterWithConstraints2.ts, 75, 7))
 >x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 73, 28))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
 function f9<T extends RegExp>(x: T) {
@@ -516,7 +516,7 @@ function f19<T>(x: T) {
 function f20<T extends Number>(x: T) {
 >f20 : Symbol(f20, Decl(subtypesOfTypeParameterWithConstraints2.ts, 146, 1))
 >T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 148, 13))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 148, 31))
 >T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 148, 13))
 
@@ -534,7 +534,7 @@ function f20<T extends Number>(x: T) {
 function f21<T extends Number>(x: T) {
 >f21 : Symbol(f21, Decl(subtypesOfTypeParameterWithConstraints2.ts, 151, 1))
 >T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 153, 13))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(subtypesOfTypeParameterWithConstraints2.ts, 153, 31))
 >T : Symbol(T, Decl(subtypesOfTypeParameterWithConstraints2.ts, 153, 13))
 
diff --git a/tests/baselines/reference/subtypingTransitivity.symbols b/tests/baselines/reference/subtypingTransitivity.symbols
index 7a1ee279bb3..2a2f10af524 100644
--- a/tests/baselines/reference/subtypingTransitivity.symbols
+++ b/tests/baselines/reference/subtypingTransitivity.symbols
@@ -3,7 +3,7 @@ class B {
 >B : Symbol(B, Decl(subtypingTransitivity.ts, 0, 0))
 
     x: Object;
->x : Symbol(x, Decl(subtypingTransitivity.ts, 0, 9))
+>x : Symbol(B.x, Decl(subtypingTransitivity.ts, 0, 9))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
@@ -12,14 +12,14 @@ class D extends B {
 >B : Symbol(B, Decl(subtypingTransitivity.ts, 0, 0))
 
     public x: string;
->x : Symbol(x, Decl(subtypingTransitivity.ts, 4, 19))
+>x : Symbol(D.x, Decl(subtypingTransitivity.ts, 4, 19))
 }
 class D2 extends B {
 >D2 : Symbol(D2, Decl(subtypingTransitivity.ts, 6, 1))
 >B : Symbol(B, Decl(subtypingTransitivity.ts, 0, 0))
 
     public x: number;
->x : Symbol(x, Decl(subtypingTransitivity.ts, 7, 20))
+>x : Symbol(D2.x, Decl(subtypingTransitivity.ts, 7, 20))
 }
 
 var b: B;
diff --git a/tests/baselines/reference/subtypingWithCallSignatures2.symbols b/tests/baselines/reference/subtypingWithCallSignatures2.symbols
index 02f08016b31..95158bb25d9 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures2.symbols
+++ b/tests/baselines/reference/subtypingWithCallSignatures2.symbols
@@ -3,22 +3,22 @@
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(subtypingWithCallSignatures2.ts, 0, 0))
->foo : Symbol(foo, Decl(subtypingWithCallSignatures2.ts, 2, 12))
+>foo : Symbol(Base.foo, Decl(subtypingWithCallSignatures2.ts, 2, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(subtypingWithCallSignatures2.ts, 2, 27))
 >Base : Symbol(Base, Decl(subtypingWithCallSignatures2.ts, 0, 0))
->bar : Symbol(bar, Decl(subtypingWithCallSignatures2.ts, 3, 28))
+>bar : Symbol(Derived.bar, Decl(subtypingWithCallSignatures2.ts, 3, 28))
 
 class Derived2 extends Derived { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(subtypingWithCallSignatures2.ts, 3, 43))
 >Derived : Symbol(Derived, Decl(subtypingWithCallSignatures2.ts, 2, 27))
->baz : Symbol(baz, Decl(subtypingWithCallSignatures2.ts, 4, 32))
+>baz : Symbol(Derived2.baz, Decl(subtypingWithCallSignatures2.ts, 4, 32))
 
 class OtherDerived extends Base { bing: string; }
 >OtherDerived : Symbol(OtherDerived, Decl(subtypingWithCallSignatures2.ts, 4, 47))
 >Base : Symbol(Base, Decl(subtypingWithCallSignatures2.ts, 0, 0))
->bing : Symbol(bing, Decl(subtypingWithCallSignatures2.ts, 5, 33))
+>bing : Symbol(OtherDerived.bing, Decl(subtypingWithCallSignatures2.ts, 5, 33))
 
 declare function foo1(a: (x: number) => number[]): typeof a;
 >foo1 : Symbol(foo1, Decl(subtypingWithCallSignatures2.ts, 5, 49), Decl(subtypingWithCallSignatures2.ts, 7, 60))
@@ -297,8 +297,8 @@ declare function foo18(a: {
 
         (a: Date): Date;
 >a : Symbol(a, Decl(subtypingWithCallSignatures2.ts, 74, 9))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     }): any[];
 }): typeof a;
diff --git a/tests/baselines/reference/subtypingWithCallSignatures3.symbols b/tests/baselines/reference/subtypingWithCallSignatures3.symbols
index 37e1c0423c4..5b41bc78e38 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures3.symbols
+++ b/tests/baselines/reference/subtypingWithCallSignatures3.symbols
@@ -7,22 +7,22 @@ module Errors {
 
     class Base { foo: string; }
 >Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15))
->foo : Symbol(foo, Decl(subtypingWithCallSignatures3.ts, 4, 16))
+>foo : Symbol(Base.foo, Decl(subtypingWithCallSignatures3.ts, 4, 16))
 
     class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(subtypingWithCallSignatures3.ts, 4, 31))
 >Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15))
->bar : Symbol(bar, Decl(subtypingWithCallSignatures3.ts, 5, 32))
+>bar : Symbol(Derived.bar, Decl(subtypingWithCallSignatures3.ts, 5, 32))
 
     class Derived2 extends Derived { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(subtypingWithCallSignatures3.ts, 5, 47))
 >Derived : Symbol(Derived, Decl(subtypingWithCallSignatures3.ts, 4, 31))
->baz : Symbol(baz, Decl(subtypingWithCallSignatures3.ts, 6, 36))
+>baz : Symbol(Derived2.baz, Decl(subtypingWithCallSignatures3.ts, 6, 36))
 
     class OtherDerived extends Base { bing: string; }
 >OtherDerived : Symbol(OtherDerived, Decl(subtypingWithCallSignatures3.ts, 6, 51))
 >Base : Symbol(Base, Decl(subtypingWithCallSignatures3.ts, 3, 15))
->bing : Symbol(bing, Decl(subtypingWithCallSignatures3.ts, 7, 37))
+>bing : Symbol(OtherDerived.bing, Decl(subtypingWithCallSignatures3.ts, 7, 37))
 
     declare function foo2(a2: (x: number) => string[]): typeof a2;
 >foo2 : Symbol(foo2, Decl(subtypingWithCallSignatures3.ts, 7, 53), Decl(subtypingWithCallSignatures3.ts, 9, 66))
diff --git a/tests/baselines/reference/subtypingWithCallSignatures4.symbols b/tests/baselines/reference/subtypingWithCallSignatures4.symbols
index 382abb58a0d..d5cb92bace8 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures4.symbols
+++ b/tests/baselines/reference/subtypingWithCallSignatures4.symbols
@@ -3,22 +3,22 @@
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(subtypingWithCallSignatures4.ts, 0, 0))
->foo : Symbol(foo, Decl(subtypingWithCallSignatures4.ts, 2, 12))
+>foo : Symbol(Base.foo, Decl(subtypingWithCallSignatures4.ts, 2, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(subtypingWithCallSignatures4.ts, 2, 27))
 >Base : Symbol(Base, Decl(subtypingWithCallSignatures4.ts, 0, 0))
->bar : Symbol(bar, Decl(subtypingWithCallSignatures4.ts, 3, 28))
+>bar : Symbol(Derived.bar, Decl(subtypingWithCallSignatures4.ts, 3, 28))
 
 class Derived2 extends Derived { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(subtypingWithCallSignatures4.ts, 3, 43))
 >Derived : Symbol(Derived, Decl(subtypingWithCallSignatures4.ts, 2, 27))
->baz : Symbol(baz, Decl(subtypingWithCallSignatures4.ts, 4, 32))
+>baz : Symbol(Derived2.baz, Decl(subtypingWithCallSignatures4.ts, 4, 32))
 
 class OtherDerived extends Base { bing: string; }
 >OtherDerived : Symbol(OtherDerived, Decl(subtypingWithCallSignatures4.ts, 4, 47))
 >Base : Symbol(Base, Decl(subtypingWithCallSignatures4.ts, 0, 0))
->bing : Symbol(bing, Decl(subtypingWithCallSignatures4.ts, 5, 33))
+>bing : Symbol(OtherDerived.bing, Decl(subtypingWithCallSignatures4.ts, 5, 33))
 
 declare function foo1(a: <T>(x: T) => T[]);
 >foo1 : Symbol(foo1, Decl(subtypingWithCallSignatures4.ts, 5, 49), Decl(subtypingWithCallSignatures4.ts, 7, 43))
diff --git a/tests/baselines/reference/subtypingWithCallSignaturesWithRestParameters.errors.txt b/tests/baselines/reference/subtypingWithCallSignaturesWithRestParameters.errors.txt
index f4a141ff390..3d0e04bbfa7 100644
--- a/tests/baselines/reference/subtypingWithCallSignaturesWithRestParameters.errors.txt
+++ b/tests/baselines/reference/subtypingWithCallSignaturesWithRestParameters.errors.txt
@@ -2,57 +2,57 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
   Types of property 'a' are incompatible.
     Type '(...args: string[]) => number' is not assignable to type '(...args: number[]) => number'.
       Types of parameters 'args' and 'args' are incompatible.
-        Type 'string' is not assignable to type 'number'.
+        Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithRestParameters.ts(34,11): error TS2430: Interface 'I3B' incorrectly extends interface 'Base'.
   Types of property 'a' are incompatible.
     Type '(x?: string) => number' is not assignable to type '(...args: number[]) => number'.
       Types of parameters 'x' and 'args' are incompatible.
-        Type 'string' is not assignable to type 'number'.
+        Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithRestParameters.ts(60,11): error TS2430: Interface 'I6C' incorrectly extends interface 'Base'.
   Types of property 'a2' are incompatible.
     Type '(x: number, ...args: string[]) => number' is not assignable to type '(x: number, ...z: number[]) => number'.
       Types of parameters 'args' and 'z' are incompatible.
-        Type 'string' is not assignable to type 'number'.
+        Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithRestParameters.ts(90,11): error TS2430: Interface 'I10B' incorrectly extends interface 'Base'.
   Types of property 'a3' are incompatible.
     Type '(x: number, y?: number, z?: number) => number' is not assignable to type '(x: number, y?: string, ...z: number[]) => number'.
       Types of parameters 'y' and 'y' are incompatible.
-        Type 'number' is not assignable to type 'string'.
+        Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithRestParameters.ts(94,11): error TS2430: Interface 'I10C' incorrectly extends interface 'Base'.
   Types of property 'a3' are incompatible.
     Type '(x: number, ...z: number[]) => number' is not assignable to type '(x: number, y?: string, ...z: number[]) => number'.
       Types of parameters 'z' and 'y' are incompatible.
-        Type 'number' is not assignable to type 'string'.
+        Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithRestParameters.ts(98,11): error TS2430: Interface 'I10D' incorrectly extends interface 'Base'.
   Types of property 'a3' are incompatible.
     Type '(x: string, y?: string, z?: string) => number' is not assignable to type '(x: number, y?: string, ...z: number[]) => number'.
       Types of parameters 'x' and 'x' are incompatible.
-        Type 'string' is not assignable to type 'number'.
+        Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithRestParameters.ts(102,11): error TS2430: Interface 'I10E' incorrectly extends interface 'Base'.
   Types of property 'a3' are incompatible.
     Type '(x: number, ...z: string[]) => number' is not assignable to type '(x: number, y?: string, ...z: number[]) => number'.
       Types of parameters 'z' and 'z' are incompatible.
-        Type 'string' is not assignable to type 'number'.
+        Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithRestParameters.ts(110,11): error TS2430: Interface 'I12' incorrectly extends interface 'Base'.
   Types of property 'a4' are incompatible.
     Type '(x?: number, y?: number) => number' is not assignable to type '(x?: number, y?: string, ...z: number[]) => number'.
       Types of parameters 'y' and 'y' are incompatible.
-        Type 'number' is not assignable to type 'string'.
+        Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithRestParameters.ts(118,11): error TS2430: Interface 'I14' incorrectly extends interface 'Base'.
   Types of property 'a4' are incompatible.
     Type '(x: number, y?: number) => number' is not assignable to type '(x?: number, y?: string, ...z: number[]) => number'.
       Types of parameters 'y' and 'y' are incompatible.
-        Type 'number' is not assignable to type 'string'.
+        Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithRestParameters.ts(126,11): error TS2430: Interface 'I16' incorrectly extends interface 'Base'.
   Types of property 'a4' are incompatible.
     Type '(x: number, ...args: string[]) => number' is not assignable to type '(x?: number, y?: string, ...z: number[]) => number'.
       Types of parameters 'args' and 'z' are incompatible.
-        Type 'string' is not assignable to type 'number'.
+        Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithRestParameters.ts(130,11): error TS2430: Interface 'I17' incorrectly extends interface 'Base'.
   Types of property 'a4' are incompatible.
     Type '(...args: number[]) => number' is not assignable to type '(x?: number, y?: string, ...z: number[]) => number'.
       Types of parameters 'args' and 'y' are incompatible.
-        Type 'number' is not assignable to type 'string'.
+        Type 'string' is not assignable to type 'number'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignaturesWithRestParameters.ts (11 errors) ====
@@ -79,7 +79,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2430:   Types of property 'a' are incompatible.
 !!! error TS2430:     Type '(...args: string[]) => number' is not assignable to type '(...args: number[]) => number'.
 !!! error TS2430:       Types of parameters 'args' and 'args' are incompatible.
-!!! error TS2430:         Type 'string' is not assignable to type 'number'.
+!!! error TS2430:         Type 'number' is not assignable to type 'string'.
         a: (...args: string[]) => number; // error, type mismatch
     }
     
@@ -101,7 +101,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2430:   Types of property 'a' are incompatible.
 !!! error TS2430:     Type '(x?: string) => number' is not assignable to type '(...args: number[]) => number'.
 !!! error TS2430:       Types of parameters 'x' and 'args' are incompatible.
-!!! error TS2430:         Type 'string' is not assignable to type 'number'.
+!!! error TS2430:         Type 'number' is not assignable to type 'string'.
         a: (x?: string) => number; // error, incompatible type
     }
     
@@ -133,7 +133,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2430:   Types of property 'a2' are incompatible.
 !!! error TS2430:     Type '(x: number, ...args: string[]) => number' is not assignable to type '(x: number, ...z: number[]) => number'.
 !!! error TS2430:       Types of parameters 'args' and 'z' are incompatible.
-!!! error TS2430:         Type 'string' is not assignable to type 'number'.
+!!! error TS2430:         Type 'number' is not assignable to type 'string'.
         a2: (x: number, ...args: string[]) => number; // error
     }
     
@@ -169,7 +169,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2430:   Types of property 'a3' are incompatible.
 !!! error TS2430:     Type '(x: number, y?: number, z?: number) => number' is not assignable to type '(x: number, y?: string, ...z: number[]) => number'.
 !!! error TS2430:       Types of parameters 'y' and 'y' are incompatible.
-!!! error TS2430:         Type 'number' is not assignable to type 'string'.
+!!! error TS2430:         Type 'string' is not assignable to type 'number'.
         a3: (x: number, y?: number, z?: number) => number;  // error
     }
     
@@ -179,7 +179,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2430:   Types of property 'a3' are incompatible.
 !!! error TS2430:     Type '(x: number, ...z: number[]) => number' is not assignable to type '(x: number, y?: string, ...z: number[]) => number'.
 !!! error TS2430:       Types of parameters 'z' and 'y' are incompatible.
-!!! error TS2430:         Type 'number' is not assignable to type 'string'.
+!!! error TS2430:         Type 'string' is not assignable to type 'number'.
         a3: (x: number, ...z: number[]) => number;  // error
     }
     
@@ -189,7 +189,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2430:   Types of property 'a3' are incompatible.
 !!! error TS2430:     Type '(x: string, y?: string, z?: string) => number' is not assignable to type '(x: number, y?: string, ...z: number[]) => number'.
 !!! error TS2430:       Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2430:         Type 'string' is not assignable to type 'number'.
+!!! error TS2430:         Type 'number' is not assignable to type 'string'.
         a3: (x: string, y?: string, z?: string) => number;  // error, incompatible types
     }
     
@@ -199,7 +199,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2430:   Types of property 'a3' are incompatible.
 !!! error TS2430:     Type '(x: number, ...z: string[]) => number' is not assignable to type '(x: number, y?: string, ...z: number[]) => number'.
 !!! error TS2430:       Types of parameters 'z' and 'z' are incompatible.
-!!! error TS2430:         Type 'string' is not assignable to type 'number'.
+!!! error TS2430:         Type 'number' is not assignable to type 'string'.
         a3: (x: number, ...z: string[]) => number;  // error
     }
     
@@ -213,7 +213,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2430:   Types of property 'a4' are incompatible.
 !!! error TS2430:     Type '(x?: number, y?: number) => number' is not assignable to type '(x?: number, y?: string, ...z: number[]) => number'.
 !!! error TS2430:       Types of parameters 'y' and 'y' are incompatible.
-!!! error TS2430:         Type 'number' is not assignable to type 'string'.
+!!! error TS2430:         Type 'string' is not assignable to type 'number'.
         a4: (x?: number, y?: number) => number; // error, type mismatch
     }
     
@@ -227,7 +227,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2430:   Types of property 'a4' are incompatible.
 !!! error TS2430:     Type '(x: number, y?: number) => number' is not assignable to type '(x?: number, y?: string, ...z: number[]) => number'.
 !!! error TS2430:       Types of parameters 'y' and 'y' are incompatible.
-!!! error TS2430:         Type 'number' is not assignable to type 'string'.
+!!! error TS2430:         Type 'string' is not assignable to type 'number'.
         a4: (x: number, y?: number) => number;  // error, second param has type mismatch
     }
     
@@ -241,7 +241,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2430:   Types of property 'a4' are incompatible.
 !!! error TS2430:     Type '(x: number, ...args: string[]) => number' is not assignable to type '(x?: number, y?: string, ...z: number[]) => number'.
 !!! error TS2430:       Types of parameters 'args' and 'z' are incompatible.
-!!! error TS2430:         Type 'string' is not assignable to type 'number'.
+!!! error TS2430:         Type 'number' is not assignable to type 'string'.
         a4: (x: number, ...args: string[]) => number;  // error, rest param has type mismatch
     }
     
@@ -251,7 +251,7 @@ tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingW
 !!! error TS2430:   Types of property 'a4' are incompatible.
 !!! error TS2430:     Type '(...args: number[]) => number' is not assignable to type '(x?: number, y?: string, ...z: number[]) => number'.
 !!! error TS2430:       Types of parameters 'args' and 'y' are incompatible.
-!!! error TS2430:         Type 'number' is not assignable to type 'string'.
+!!! error TS2430:         Type 'string' is not assignable to type 'number'.
         a4: (...args: number[]) => number; // error
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures2.symbols b/tests/baselines/reference/subtypingWithConstructSignatures2.symbols
index 2173aaa1392..cbb72b9f396 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures2.symbols
+++ b/tests/baselines/reference/subtypingWithConstructSignatures2.symbols
@@ -3,22 +3,22 @@
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures2.ts, 0, 0))
->foo : Symbol(foo, Decl(subtypingWithConstructSignatures2.ts, 2, 12))
+>foo : Symbol(Base.foo, Decl(subtypingWithConstructSignatures2.ts, 2, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures2.ts, 2, 27))
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures2.ts, 0, 0))
->bar : Symbol(bar, Decl(subtypingWithConstructSignatures2.ts, 3, 28))
+>bar : Symbol(Derived.bar, Decl(subtypingWithConstructSignatures2.ts, 3, 28))
 
 class Derived2 extends Derived { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(subtypingWithConstructSignatures2.ts, 3, 43))
 >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures2.ts, 2, 27))
->baz : Symbol(baz, Decl(subtypingWithConstructSignatures2.ts, 4, 32))
+>baz : Symbol(Derived2.baz, Decl(subtypingWithConstructSignatures2.ts, 4, 32))
 
 class OtherDerived extends Base { bing: string; }
 >OtherDerived : Symbol(OtherDerived, Decl(subtypingWithConstructSignatures2.ts, 4, 47))
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures2.ts, 0, 0))
->bing : Symbol(bing, Decl(subtypingWithConstructSignatures2.ts, 5, 33))
+>bing : Symbol(OtherDerived.bing, Decl(subtypingWithConstructSignatures2.ts, 5, 33))
 
 declare function foo1(a: new (x: number) => number[]): typeof a;
 >foo1 : Symbol(foo1, Decl(subtypingWithConstructSignatures2.ts, 5, 49), Decl(subtypingWithConstructSignatures2.ts, 7, 64))
@@ -297,8 +297,8 @@ declare function foo18(a: {
 
         new (a: Date): Date;
 >a : Symbol(a, Decl(subtypingWithConstructSignatures2.ts, 74, 13))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     }): any[];
 }): typeof a;
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures3.symbols b/tests/baselines/reference/subtypingWithConstructSignatures3.symbols
index 3adce566f95..b161a0f92c2 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures3.symbols
+++ b/tests/baselines/reference/subtypingWithConstructSignatures3.symbols
@@ -7,22 +7,22 @@ module Errors {
 
     class Base { foo: string; }
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15))
->foo : Symbol(foo, Decl(subtypingWithConstructSignatures3.ts, 4, 16))
+>foo : Symbol(Base.foo, Decl(subtypingWithConstructSignatures3.ts, 4, 16))
 
     class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures3.ts, 4, 31))
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15))
->bar : Symbol(bar, Decl(subtypingWithConstructSignatures3.ts, 5, 32))
+>bar : Symbol(Derived.bar, Decl(subtypingWithConstructSignatures3.ts, 5, 32))
 
     class Derived2 extends Derived { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(subtypingWithConstructSignatures3.ts, 5, 47))
 >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures3.ts, 4, 31))
->baz : Symbol(baz, Decl(subtypingWithConstructSignatures3.ts, 6, 36))
+>baz : Symbol(Derived2.baz, Decl(subtypingWithConstructSignatures3.ts, 6, 36))
 
     class OtherDerived extends Base { bing: string; }
 >OtherDerived : Symbol(OtherDerived, Decl(subtypingWithConstructSignatures3.ts, 6, 51))
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures3.ts, 3, 15))
->bing : Symbol(bing, Decl(subtypingWithConstructSignatures3.ts, 7, 37))
+>bing : Symbol(OtherDerived.bing, Decl(subtypingWithConstructSignatures3.ts, 7, 37))
 
     declare function foo2(a2: new (x: number) => string[]): typeof a2;
 >foo2 : Symbol(foo2, Decl(subtypingWithConstructSignatures3.ts, 7, 53), Decl(subtypingWithConstructSignatures3.ts, 9, 70))
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures4.symbols b/tests/baselines/reference/subtypingWithConstructSignatures4.symbols
index b337c6642f4..4ab22b5a482 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures4.symbols
+++ b/tests/baselines/reference/subtypingWithConstructSignatures4.symbols
@@ -3,22 +3,22 @@
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures4.ts, 0, 0))
->foo : Symbol(foo, Decl(subtypingWithConstructSignatures4.ts, 2, 12))
+>foo : Symbol(Base.foo, Decl(subtypingWithConstructSignatures4.ts, 2, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures4.ts, 2, 27))
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures4.ts, 0, 0))
->bar : Symbol(bar, Decl(subtypingWithConstructSignatures4.ts, 3, 28))
+>bar : Symbol(Derived.bar, Decl(subtypingWithConstructSignatures4.ts, 3, 28))
 
 class Derived2 extends Derived { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(subtypingWithConstructSignatures4.ts, 3, 43))
 >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures4.ts, 2, 27))
->baz : Symbol(baz, Decl(subtypingWithConstructSignatures4.ts, 4, 32))
+>baz : Symbol(Derived2.baz, Decl(subtypingWithConstructSignatures4.ts, 4, 32))
 
 class OtherDerived extends Base { bing: string; }
 >OtherDerived : Symbol(OtherDerived, Decl(subtypingWithConstructSignatures4.ts, 4, 47))
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures4.ts, 0, 0))
->bing : Symbol(bing, Decl(subtypingWithConstructSignatures4.ts, 5, 33))
+>bing : Symbol(OtherDerived.bing, Decl(subtypingWithConstructSignatures4.ts, 5, 33))
 
 declare function foo1(a: new <T>(x: T) => T[]);
 >foo1 : Symbol(foo1, Decl(subtypingWithConstructSignatures4.ts, 5, 49), Decl(subtypingWithConstructSignatures4.ts, 7, 47))
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures5.symbols b/tests/baselines/reference/subtypingWithConstructSignatures5.symbols
index 634f31ff783..1adbdb82b49 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures5.symbols
+++ b/tests/baselines/reference/subtypingWithConstructSignatures5.symbols
@@ -4,51 +4,51 @@
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures5.ts, 0, 0))
->foo : Symbol(foo, Decl(subtypingWithConstructSignatures5.ts, 3, 12))
+>foo : Symbol(Base.foo, Decl(subtypingWithConstructSignatures5.ts, 3, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures5.ts, 3, 27))
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures5.ts, 0, 0))
->bar : Symbol(bar, Decl(subtypingWithConstructSignatures5.ts, 4, 28))
+>bar : Symbol(Derived.bar, Decl(subtypingWithConstructSignatures5.ts, 4, 28))
 
 class Derived2 extends Derived { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(subtypingWithConstructSignatures5.ts, 4, 43))
 >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures5.ts, 3, 27))
->baz : Symbol(baz, Decl(subtypingWithConstructSignatures5.ts, 5, 32))
+>baz : Symbol(Derived2.baz, Decl(subtypingWithConstructSignatures5.ts, 5, 32))
 
 class OtherDerived extends Base { bing: string; }
 >OtherDerived : Symbol(OtherDerived, Decl(subtypingWithConstructSignatures5.ts, 5, 47))
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures5.ts, 0, 0))
->bing : Symbol(bing, Decl(subtypingWithConstructSignatures5.ts, 6, 33))
+>bing : Symbol(OtherDerived.bing, Decl(subtypingWithConstructSignatures5.ts, 6, 33))
 
 interface A { // T
 >A : Symbol(A, Decl(subtypingWithConstructSignatures5.ts, 6, 49))
 
     // M's
     a: new (x: number) => number[];
->a : Symbol(a, Decl(subtypingWithConstructSignatures5.ts, 8, 13))
+>a : Symbol(A.a, Decl(subtypingWithConstructSignatures5.ts, 8, 13))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures5.ts, 10, 12))
 
     a2: new (x: number) => string[];
->a2 : Symbol(a2, Decl(subtypingWithConstructSignatures5.ts, 10, 35))
+>a2 : Symbol(A.a2, Decl(subtypingWithConstructSignatures5.ts, 10, 35))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures5.ts, 11, 13))
 
     a3: new (x: number) => void;
->a3 : Symbol(a3, Decl(subtypingWithConstructSignatures5.ts, 11, 36))
+>a3 : Symbol(A.a3, Decl(subtypingWithConstructSignatures5.ts, 11, 36))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures5.ts, 12, 13))
 
     a4: new (x: string, y: number) => string;
->a4 : Symbol(a4, Decl(subtypingWithConstructSignatures5.ts, 12, 32))
+>a4 : Symbol(A.a4, Decl(subtypingWithConstructSignatures5.ts, 12, 32))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures5.ts, 13, 13))
 >y : Symbol(y, Decl(subtypingWithConstructSignatures5.ts, 13, 23))
 
     a5: new (x: (arg: string) => number) => string;
->a5 : Symbol(a5, Decl(subtypingWithConstructSignatures5.ts, 13, 45))
+>a5 : Symbol(A.a5, Decl(subtypingWithConstructSignatures5.ts, 13, 45))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures5.ts, 14, 13))
 >arg : Symbol(arg, Decl(subtypingWithConstructSignatures5.ts, 14, 17))
 
     a6: new (x: (arg: Base) => Derived) => Base;
->a6 : Symbol(a6, Decl(subtypingWithConstructSignatures5.ts, 14, 51))
+>a6 : Symbol(A.a6, Decl(subtypingWithConstructSignatures5.ts, 14, 51))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures5.ts, 15, 13))
 >arg : Symbol(arg, Decl(subtypingWithConstructSignatures5.ts, 15, 17))
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures5.ts, 0, 0))
@@ -56,7 +56,7 @@ interface A { // T
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures5.ts, 0, 0))
 
     a7: new (x: (arg: Base) => Derived) => (r: Base) => Derived;
->a7 : Symbol(a7, Decl(subtypingWithConstructSignatures5.ts, 15, 48))
+>a7 : Symbol(A.a7, Decl(subtypingWithConstructSignatures5.ts, 15, 48))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures5.ts, 16, 13))
 >arg : Symbol(arg, Decl(subtypingWithConstructSignatures5.ts, 16, 17))
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures5.ts, 0, 0))
@@ -66,7 +66,7 @@ interface A { // T
 >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures5.ts, 3, 27))
 
     a8: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
->a8 : Symbol(a8, Decl(subtypingWithConstructSignatures5.ts, 16, 64))
+>a8 : Symbol(A.a8, Decl(subtypingWithConstructSignatures5.ts, 16, 64))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures5.ts, 17, 13))
 >arg : Symbol(arg, Decl(subtypingWithConstructSignatures5.ts, 17, 17))
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures5.ts, 0, 0))
@@ -80,7 +80,7 @@ interface A { // T
 >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures5.ts, 3, 27))
 
     a9: new (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived;
->a9 : Symbol(a9, Decl(subtypingWithConstructSignatures5.ts, 17, 92))
+>a9 : Symbol(A.a9, Decl(subtypingWithConstructSignatures5.ts, 17, 92))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures5.ts, 18, 13))
 >arg : Symbol(arg, Decl(subtypingWithConstructSignatures5.ts, 18, 17))
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures5.ts, 0, 0))
@@ -94,13 +94,13 @@ interface A { // T
 >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures5.ts, 3, 27))
 
     a10: new (...x: Derived[]) => Derived;
->a10 : Symbol(a10, Decl(subtypingWithConstructSignatures5.ts, 18, 92))
+>a10 : Symbol(A.a10, Decl(subtypingWithConstructSignatures5.ts, 18, 92))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures5.ts, 19, 14))
 >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures5.ts, 3, 27))
 >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures5.ts, 3, 27))
 
     a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
->a11 : Symbol(a11, Decl(subtypingWithConstructSignatures5.ts, 19, 42))
+>a11 : Symbol(A.a11, Decl(subtypingWithConstructSignatures5.ts, 19, 42))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures5.ts, 20, 14))
 >foo : Symbol(foo, Decl(subtypingWithConstructSignatures5.ts, 20, 18))
 >y : Symbol(y, Decl(subtypingWithConstructSignatures5.ts, 20, 33))
@@ -109,7 +109,7 @@ interface A { // T
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures5.ts, 0, 0))
 
     a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
->a12 : Symbol(a12, Decl(subtypingWithConstructSignatures5.ts, 20, 75))
+>a12 : Symbol(A.a12, Decl(subtypingWithConstructSignatures5.ts, 20, 75))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures5.ts, 21, 14))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures5.ts, 0, 0))
@@ -120,7 +120,7 @@ interface A { // T
 >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures5.ts, 3, 27))
 
     a13: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
->a13 : Symbol(a13, Decl(subtypingWithConstructSignatures5.ts, 21, 68))
+>a13 : Symbol(A.a13, Decl(subtypingWithConstructSignatures5.ts, 21, 68))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures5.ts, 22, 14))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures5.ts, 0, 0))
@@ -131,7 +131,7 @@ interface A { // T
 >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures5.ts, 3, 27))
 
     a14: new (x: { a: string; b: number }) => Object;
->a14 : Symbol(a14, Decl(subtypingWithConstructSignatures5.ts, 22, 67))
+>a14 : Symbol(A.a14, Decl(subtypingWithConstructSignatures5.ts, 22, 67))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures5.ts, 23, 14))
 >a : Symbol(a, Decl(subtypingWithConstructSignatures5.ts, 23, 18))
 >b : Symbol(b, Decl(subtypingWithConstructSignatures5.ts, 23, 29))
@@ -143,7 +143,7 @@ interface B extends A {
 >A : Symbol(A, Decl(subtypingWithConstructSignatures5.ts, 6, 49))
 
     a: new <T>(x: T) => T[];
->a : Symbol(a, Decl(subtypingWithConstructSignatures5.ts, 26, 23))
+>a : Symbol(B.a, Decl(subtypingWithConstructSignatures5.ts, 26, 23))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 27, 12))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures5.ts, 27, 15))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 27, 12))
@@ -157,27 +157,27 @@ interface I extends B {
 
     // N's
     a: new <T>(x: T) => T[]; // ok, instantiation of N is a subtype of M, T is number
->a : Symbol(a, Decl(subtypingWithConstructSignatures5.ts, 31, 23))
+>a : Symbol(I.a, Decl(subtypingWithConstructSignatures5.ts, 31, 23))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 33, 12))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures5.ts, 33, 15))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 33, 12))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 33, 12))
 
     a2: new <T>(x: T) => string[]; // ok
->a2 : Symbol(a2, Decl(subtypingWithConstructSignatures5.ts, 33, 28))
+>a2 : Symbol(I.a2, Decl(subtypingWithConstructSignatures5.ts, 33, 28))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 34, 13))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures5.ts, 34, 16))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 34, 13))
 
     a3: new <T>(x: T) => T; // ok since Base returns void
->a3 : Symbol(a3, Decl(subtypingWithConstructSignatures5.ts, 34, 34))
+>a3 : Symbol(I.a3, Decl(subtypingWithConstructSignatures5.ts, 34, 34))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 35, 13))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures5.ts, 35, 16))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 35, 13))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 35, 13))
 
     a4: new <T, U>(x: T, y: U) => T; // ok, instantiation of N is a subtype of M, T is string, U is number
->a4 : Symbol(a4, Decl(subtypingWithConstructSignatures5.ts, 35, 27))
+>a4 : Symbol(I.a4, Decl(subtypingWithConstructSignatures5.ts, 35, 27))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 36, 13))
 >U : Symbol(U, Decl(subtypingWithConstructSignatures5.ts, 36, 15))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures5.ts, 36, 19))
@@ -187,7 +187,7 @@ interface I extends B {
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 36, 13))
 
     a5: new <T, U>(x: (arg: T) => U) => T; // ok, U is in a parameter position so inferences can be made
->a5 : Symbol(a5, Decl(subtypingWithConstructSignatures5.ts, 36, 36))
+>a5 : Symbol(I.a5, Decl(subtypingWithConstructSignatures5.ts, 36, 36))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 37, 13))
 >U : Symbol(U, Decl(subtypingWithConstructSignatures5.ts, 37, 15))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures5.ts, 37, 19))
@@ -197,7 +197,7 @@ interface I extends B {
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 37, 13))
 
     a6: new <T extends Base, U extends Derived>(x: (arg: T) => U) => T; // ok, same as a5 but with object type hierarchy
->a6 : Symbol(a6, Decl(subtypingWithConstructSignatures5.ts, 37, 42))
+>a6 : Symbol(I.a6, Decl(subtypingWithConstructSignatures5.ts, 37, 42))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 38, 13))
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures5.ts, 0, 0))
 >U : Symbol(U, Decl(subtypingWithConstructSignatures5.ts, 38, 28))
@@ -209,7 +209,7 @@ interface I extends B {
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 38, 13))
 
     a7: new <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U; // ok
->a7 : Symbol(a7, Decl(subtypingWithConstructSignatures5.ts, 38, 71))
+>a7 : Symbol(I.a7, Decl(subtypingWithConstructSignatures5.ts, 38, 71))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 39, 13))
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures5.ts, 0, 0))
 >U : Symbol(U, Decl(subtypingWithConstructSignatures5.ts, 39, 28))
@@ -223,7 +223,7 @@ interface I extends B {
 >U : Symbol(U, Decl(subtypingWithConstructSignatures5.ts, 39, 28))
 
     a8: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U; // ok
->a8 : Symbol(a8, Decl(subtypingWithConstructSignatures5.ts, 39, 81))
+>a8 : Symbol(I.a8, Decl(subtypingWithConstructSignatures5.ts, 39, 81))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 40, 13))
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures5.ts, 0, 0))
 >U : Symbol(U, Decl(subtypingWithConstructSignatures5.ts, 40, 28))
@@ -241,7 +241,7 @@ interface I extends B {
 >U : Symbol(U, Decl(subtypingWithConstructSignatures5.ts, 40, 28))
 
     a9: new <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number }) => U) => (r: T) => U; // ok, same as a8 with compatible object literal
->a9 : Symbol(a9, Decl(subtypingWithConstructSignatures5.ts, 40, 100))
+>a9 : Symbol(I.a9, Decl(subtypingWithConstructSignatures5.ts, 40, 100))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 41, 13))
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures5.ts, 0, 0))
 >U : Symbol(U, Decl(subtypingWithConstructSignatures5.ts, 41, 28))
@@ -260,7 +260,7 @@ interface I extends B {
 >U : Symbol(U, Decl(subtypingWithConstructSignatures5.ts, 41, 28))
 
     a10: new <T extends Derived>(...x: T[]) => T; // ok
->a10 : Symbol(a10, Decl(subtypingWithConstructSignatures5.ts, 41, 128))
+>a10 : Symbol(I.a10, Decl(subtypingWithConstructSignatures5.ts, 41, 128))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 42, 14))
 >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures5.ts, 3, 27))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures5.ts, 42, 33))
@@ -268,7 +268,7 @@ interface I extends B {
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 42, 14))
 
     a11: new <T extends Base>(x: T, y: T) => T; // ok
->a11 : Symbol(a11, Decl(subtypingWithConstructSignatures5.ts, 42, 49))
+>a11 : Symbol(I.a11, Decl(subtypingWithConstructSignatures5.ts, 42, 49))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 43, 14))
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures5.ts, 0, 0))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures5.ts, 43, 30))
@@ -278,7 +278,7 @@ interface I extends B {
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 43, 14))
 
     a12: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; // ok, less specific parameter type
->a12 : Symbol(a12, Decl(subtypingWithConstructSignatures5.ts, 43, 47))
+>a12 : Symbol(I.a12, Decl(subtypingWithConstructSignatures5.ts, 43, 47))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 44, 14))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures5.ts, 0, 0))
@@ -291,7 +291,7 @@ interface I extends B {
 >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures5.ts, 3, 27))
 
     a13: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T; // ok, T = Array<Derived>, satisfies constraint, contextual signature instantiation succeeds
->a13 : Symbol(a13, Decl(subtypingWithConstructSignatures5.ts, 44, 77))
+>a13 : Symbol(I.a13, Decl(subtypingWithConstructSignatures5.ts, 44, 77))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 45, 14))
 >Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures5.ts, 3, 27))
@@ -303,7 +303,7 @@ interface I extends B {
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 45, 14))
 
     a14: new <T>(x: { a: T; b: T }) => T; // ok, best common type yields T = {} but that's satisfactory for this signature
->a14 : Symbol(a14, Decl(subtypingWithConstructSignatures5.ts, 45, 67))
+>a14 : Symbol(I.a14, Decl(subtypingWithConstructSignatures5.ts, 45, 67))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures5.ts, 46, 14))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures5.ts, 46, 17))
 >a : Symbol(a, Decl(subtypingWithConstructSignatures5.ts, 46, 21))
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures6.symbols b/tests/baselines/reference/subtypingWithConstructSignatures6.symbols
index 08b9350da88..c8fb0301127 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures6.symbols
+++ b/tests/baselines/reference/subtypingWithConstructSignatures6.symbols
@@ -5,48 +5,48 @@
 
 class Base { foo: string; }
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures6.ts, 0, 0))
->foo : Symbol(foo, Decl(subtypingWithConstructSignatures6.ts, 4, 12))
+>foo : Symbol(Base.foo, Decl(subtypingWithConstructSignatures6.ts, 4, 12))
 
 class Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures6.ts, 4, 27))
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures6.ts, 0, 0))
->bar : Symbol(bar, Decl(subtypingWithConstructSignatures6.ts, 5, 28))
+>bar : Symbol(Derived.bar, Decl(subtypingWithConstructSignatures6.ts, 5, 28))
 
 class Derived2 extends Derived { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(subtypingWithConstructSignatures6.ts, 5, 43))
 >Derived : Symbol(Derived, Decl(subtypingWithConstructSignatures6.ts, 4, 27))
->baz : Symbol(baz, Decl(subtypingWithConstructSignatures6.ts, 6, 32))
+>baz : Symbol(Derived2.baz, Decl(subtypingWithConstructSignatures6.ts, 6, 32))
 
 class OtherDerived extends Base { bing: string; }
 >OtherDerived : Symbol(OtherDerived, Decl(subtypingWithConstructSignatures6.ts, 6, 47))
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures6.ts, 0, 0))
->bing : Symbol(bing, Decl(subtypingWithConstructSignatures6.ts, 7, 33))
+>bing : Symbol(OtherDerived.bing, Decl(subtypingWithConstructSignatures6.ts, 7, 33))
 
 interface A { // T
 >A : Symbol(A, Decl(subtypingWithConstructSignatures6.ts, 7, 49))
 
     // M's
     a: new <T>(x: T) => T[];
->a : Symbol(a, Decl(subtypingWithConstructSignatures6.ts, 9, 13))
+>a : Symbol(A.a, Decl(subtypingWithConstructSignatures6.ts, 9, 13))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures6.ts, 11, 12))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures6.ts, 11, 15))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures6.ts, 11, 12))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures6.ts, 11, 12))
 
     a2: new <T>(x: T) => string[];
->a2 : Symbol(a2, Decl(subtypingWithConstructSignatures6.ts, 11, 28))
+>a2 : Symbol(A.a2, Decl(subtypingWithConstructSignatures6.ts, 11, 28))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures6.ts, 12, 13))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures6.ts, 12, 16))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures6.ts, 12, 13))
 
     a3: new <T>(x: T) => void;
->a3 : Symbol(a3, Decl(subtypingWithConstructSignatures6.ts, 12, 34))
+>a3 : Symbol(A.a3, Decl(subtypingWithConstructSignatures6.ts, 12, 34))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures6.ts, 13, 13))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures6.ts, 13, 16))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures6.ts, 13, 13))
 
     a4: new <T, U>(x: T, y: U) => string;
->a4 : Symbol(a4, Decl(subtypingWithConstructSignatures6.ts, 13, 30))
+>a4 : Symbol(A.a4, Decl(subtypingWithConstructSignatures6.ts, 13, 30))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures6.ts, 14, 13))
 >U : Symbol(U, Decl(subtypingWithConstructSignatures6.ts, 14, 15))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures6.ts, 14, 19))
@@ -55,7 +55,7 @@ interface A { // T
 >U : Symbol(U, Decl(subtypingWithConstructSignatures6.ts, 14, 15))
 
     a5: new <T, U>(x: (arg: T) => U) => T;
->a5 : Symbol(a5, Decl(subtypingWithConstructSignatures6.ts, 14, 41))
+>a5 : Symbol(A.a5, Decl(subtypingWithConstructSignatures6.ts, 14, 41))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures6.ts, 15, 13))
 >U : Symbol(U, Decl(subtypingWithConstructSignatures6.ts, 15, 15))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures6.ts, 15, 19))
@@ -65,7 +65,7 @@ interface A { // T
 >T : Symbol(T, Decl(subtypingWithConstructSignatures6.ts, 15, 13))
 
     a6: new <T extends Base>(x: (arg: T) => Derived) => T;
->a6 : Symbol(a6, Decl(subtypingWithConstructSignatures6.ts, 15, 42))
+>a6 : Symbol(A.a6, Decl(subtypingWithConstructSignatures6.ts, 15, 42))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures6.ts, 16, 13))
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures6.ts, 0, 0))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures6.ts, 16, 29))
@@ -75,7 +75,7 @@ interface A { // T
 >T : Symbol(T, Decl(subtypingWithConstructSignatures6.ts, 16, 13))
 
     a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
->a11 : Symbol(a11, Decl(subtypingWithConstructSignatures6.ts, 16, 58))
+>a11 : Symbol(A.a11, Decl(subtypingWithConstructSignatures6.ts, 16, 58))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures6.ts, 17, 14))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures6.ts, 17, 17))
 >foo : Symbol(foo, Decl(subtypingWithConstructSignatures6.ts, 17, 21))
@@ -88,7 +88,7 @@ interface A { // T
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures6.ts, 0, 0))
 
     a15: new <T>(x: { a: T; b: T }) => T[];
->a15 : Symbol(a15, Decl(subtypingWithConstructSignatures6.ts, 17, 63))
+>a15 : Symbol(A.a15, Decl(subtypingWithConstructSignatures6.ts, 17, 63))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures6.ts, 18, 14))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures6.ts, 18, 17))
 >a : Symbol(a, Decl(subtypingWithConstructSignatures6.ts, 18, 21))
@@ -98,7 +98,7 @@ interface A { // T
 >T : Symbol(T, Decl(subtypingWithConstructSignatures6.ts, 18, 14))
 
     a16: new <T extends Base>(x: { a: T; b: T }) => T[];
->a16 : Symbol(a16, Decl(subtypingWithConstructSignatures6.ts, 18, 43))
+>a16 : Symbol(A.a16, Decl(subtypingWithConstructSignatures6.ts, 18, 43))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures6.ts, 19, 14))
 >Base : Symbol(Base, Decl(subtypingWithConstructSignatures6.ts, 0, 0))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures6.ts, 19, 30))
@@ -116,7 +116,7 @@ interface I<T> extends A {
 >A : Symbol(A, Decl(subtypingWithConstructSignatures6.ts, 7, 49))
 
     a: new (x: T) => T[]; 
->a : Symbol(a, Decl(subtypingWithConstructSignatures6.ts, 23, 26))
+>a : Symbol(I.a, Decl(subtypingWithConstructSignatures6.ts, 23, 26))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures6.ts, 24, 12))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures6.ts, 23, 12))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures6.ts, 23, 12))
@@ -128,7 +128,7 @@ interface I2<T> extends A {
 >A : Symbol(A, Decl(subtypingWithConstructSignatures6.ts, 7, 49))
 
     a2: new (x: T) => string[]; 
->a2 : Symbol(a2, Decl(subtypingWithConstructSignatures6.ts, 27, 27))
+>a2 : Symbol(I2.a2, Decl(subtypingWithConstructSignatures6.ts, 27, 27))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures6.ts, 28, 13))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures6.ts, 27, 13))
 }
@@ -139,7 +139,7 @@ interface I3<T> extends A {
 >A : Symbol(A, Decl(subtypingWithConstructSignatures6.ts, 7, 49))
 
     a3: new (x: T) => T;
->a3 : Symbol(a3, Decl(subtypingWithConstructSignatures6.ts, 31, 27))
+>a3 : Symbol(I3.a3, Decl(subtypingWithConstructSignatures6.ts, 31, 27))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures6.ts, 32, 13))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures6.ts, 31, 13))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures6.ts, 31, 13))
@@ -151,7 +151,7 @@ interface I4<T> extends A {
 >A : Symbol(A, Decl(subtypingWithConstructSignatures6.ts, 7, 49))
 
     a4: new <U>(x: T, y: U) => string; 
->a4 : Symbol(a4, Decl(subtypingWithConstructSignatures6.ts, 35, 27))
+>a4 : Symbol(I4.a4, Decl(subtypingWithConstructSignatures6.ts, 35, 27))
 >U : Symbol(U, Decl(subtypingWithConstructSignatures6.ts, 36, 13))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures6.ts, 36, 16))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures6.ts, 35, 13))
@@ -165,7 +165,7 @@ interface I5<T> extends A {
 >A : Symbol(A, Decl(subtypingWithConstructSignatures6.ts, 7, 49))
 
     a5: new <U>(x: (arg: T) => U) => T; 
->a5 : Symbol(a5, Decl(subtypingWithConstructSignatures6.ts, 39, 27))
+>a5 : Symbol(I5.a5, Decl(subtypingWithConstructSignatures6.ts, 39, 27))
 >U : Symbol(U, Decl(subtypingWithConstructSignatures6.ts, 40, 13))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures6.ts, 40, 16))
 >arg : Symbol(arg, Decl(subtypingWithConstructSignatures6.ts, 40, 20))
@@ -180,7 +180,7 @@ interface I7<T> extends A {
 >A : Symbol(A, Decl(subtypingWithConstructSignatures6.ts, 7, 49))
 
     a11: new <U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
->a11 : Symbol(a11, Decl(subtypingWithConstructSignatures6.ts, 43, 27))
+>a11 : Symbol(I7.a11, Decl(subtypingWithConstructSignatures6.ts, 43, 27))
 >U : Symbol(U, Decl(subtypingWithConstructSignatures6.ts, 44, 14))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures6.ts, 44, 17))
 >foo : Symbol(foo, Decl(subtypingWithConstructSignatures6.ts, 44, 21))
@@ -199,7 +199,7 @@ interface I9<T> extends A {
 >A : Symbol(A, Decl(subtypingWithConstructSignatures6.ts, 7, 49))
 
     a16: new (x: { a: T; b: T }) => T[]; 
->a16 : Symbol(a16, Decl(subtypingWithConstructSignatures6.ts, 47, 27))
+>a16 : Symbol(I9.a16, Decl(subtypingWithConstructSignatures6.ts, 47, 27))
 >x : Symbol(x, Decl(subtypingWithConstructSignatures6.ts, 48, 14))
 >a : Symbol(a, Decl(subtypingWithConstructSignatures6.ts, 48, 18))
 >T : Symbol(T, Decl(subtypingWithConstructSignatures6.ts, 47, 13))
diff --git a/tests/baselines/reference/subtypingWithObjectMembers4.symbols b/tests/baselines/reference/subtypingWithObjectMembers4.symbols
index e710e2a3d4a..94b38bc4c9b 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers4.symbols
+++ b/tests/baselines/reference/subtypingWithObjectMembers4.symbols
@@ -5,7 +5,7 @@ class Base {
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers4.ts, 0, 0))
 
     foo: string;
->foo : Symbol(foo, Decl(subtypingWithObjectMembers4.ts, 2, 12))
+>foo : Symbol(Base.foo, Decl(subtypingWithObjectMembers4.ts, 2, 12))
 }
 
 class Derived extends Base {
@@ -13,14 +13,14 @@ class Derived extends Base {
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers4.ts, 0, 0))
 
     bar: string;
->bar : Symbol(bar, Decl(subtypingWithObjectMembers4.ts, 6, 28))
+>bar : Symbol(Derived.bar, Decl(subtypingWithObjectMembers4.ts, 6, 28))
 }
 
 class A {
 >A : Symbol(A, Decl(subtypingWithObjectMembers4.ts, 8, 1))
 
     foo: Base;
->foo : Symbol(foo, Decl(subtypingWithObjectMembers4.ts, 10, 9))
+>foo : Symbol(A.foo, Decl(subtypingWithObjectMembers4.ts, 10, 9))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembers4.ts, 0, 0))
 }
 
@@ -29,7 +29,7 @@ class B extends A {
 >A : Symbol(A, Decl(subtypingWithObjectMembers4.ts, 8, 1))
 
     fooo: Derived; // ok, inherits foo
->fooo : Symbol(fooo, Decl(subtypingWithObjectMembers4.ts, 14, 19))
+>fooo : Symbol(B.fooo, Decl(subtypingWithObjectMembers4.ts, 14, 19))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembers4.ts, 4, 1))
 }
 
diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality.symbols b/tests/baselines/reference/subtypingWithObjectMembersOptionality.symbols
index 7fce581b74b..5b144baa428 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersOptionality.symbols
+++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality.symbols
@@ -3,17 +3,17 @@
 
 interface Base { foo: string; }
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality.ts, 0, 0))
->foo : Symbol(foo, Decl(subtypingWithObjectMembersOptionality.ts, 2, 16))
+>foo : Symbol(Base.foo, Decl(subtypingWithObjectMembersOptionality.ts, 2, 16))
 
 interface Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersOptionality.ts, 2, 31))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality.ts, 0, 0))
->bar : Symbol(bar, Decl(subtypingWithObjectMembersOptionality.ts, 3, 32))
+>bar : Symbol(Derived.bar, Decl(subtypingWithObjectMembersOptionality.ts, 3, 32))
 
 interface Derived2 extends Derived { baz: string; }
 >Derived2 : Symbol(Derived2, Decl(subtypingWithObjectMembersOptionality.ts, 3, 47))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersOptionality.ts, 2, 31))
->baz : Symbol(baz, Decl(subtypingWithObjectMembersOptionality.ts, 4, 36))
+>baz : Symbol(Derived2.baz, Decl(subtypingWithObjectMembersOptionality.ts, 4, 36))
 
 // S is a subtype of a type T, and T is a supertype of S, if one of the following is true, where S' denotes the apparent type (section 3.8.1) of S:
 //   - S' and T are object types and, for each member M in T, one of the following is true:
@@ -27,7 +27,7 @@ interface T {
 >T : Symbol(T, Decl(subtypingWithObjectMembersOptionality.ts, 4, 51))
 
     Foo?: Base;
->Foo : Symbol(Foo, Decl(subtypingWithObjectMembersOptionality.ts, 14, 13))
+>Foo : Symbol(T.Foo, Decl(subtypingWithObjectMembersOptionality.ts, 14, 13))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality.ts, 0, 0))
 }
 
@@ -36,7 +36,7 @@ interface S extends T {
 >T : Symbol(T, Decl(subtypingWithObjectMembersOptionality.ts, 4, 51))
 
     Foo: Derived
->Foo : Symbol(Foo, Decl(subtypingWithObjectMembersOptionality.ts, 18, 23))
+>Foo : Symbol(S.Foo, Decl(subtypingWithObjectMembersOptionality.ts, 18, 23))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersOptionality.ts, 2, 31))
 }
 
@@ -93,7 +93,7 @@ module TwoLevels {
 >T : Symbol(T, Decl(subtypingWithObjectMembersOptionality.ts, 43, 18))
 
         Foo?: Base;
->Foo : Symbol(Foo, Decl(subtypingWithObjectMembersOptionality.ts, 44, 17))
+>Foo : Symbol(T.Foo, Decl(subtypingWithObjectMembersOptionality.ts, 44, 17))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality.ts, 0, 0))
     }
 
@@ -102,7 +102,7 @@ module TwoLevels {
 >T : Symbol(T, Decl(subtypingWithObjectMembersOptionality.ts, 43, 18))
 
         Foo: Derived2 
->Foo : Symbol(Foo, Decl(subtypingWithObjectMembersOptionality.ts, 48, 27))
+>Foo : Symbol(S.Foo, Decl(subtypingWithObjectMembersOptionality.ts, 48, 27))
 >Derived2 : Symbol(Derived2, Decl(subtypingWithObjectMembersOptionality.ts, 3, 47))
     }
 
diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality3.symbols b/tests/baselines/reference/subtypingWithObjectMembersOptionality3.symbols
index e770df28285..2a3e806f540 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersOptionality3.symbols
+++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality3.symbols
@@ -3,18 +3,18 @@
 
 interface Base { foo: string; }
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality3.ts, 0, 0))
->foo : Symbol(foo, Decl(subtypingWithObjectMembersOptionality3.ts, 2, 16))
+>foo : Symbol(Base.foo, Decl(subtypingWithObjectMembersOptionality3.ts, 2, 16))
 
 interface Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersOptionality3.ts, 2, 31))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality3.ts, 0, 0))
->bar : Symbol(bar, Decl(subtypingWithObjectMembersOptionality3.ts, 3, 32))
+>bar : Symbol(Derived.bar, Decl(subtypingWithObjectMembersOptionality3.ts, 3, 32))
 
 interface T {
 >T : Symbol(T, Decl(subtypingWithObjectMembersOptionality3.ts, 3, 47))
 
     Foo?: Base;
->Foo : Symbol(Foo, Decl(subtypingWithObjectMembersOptionality3.ts, 5, 13))
+>Foo : Symbol(T.Foo, Decl(subtypingWithObjectMembersOptionality3.ts, 5, 13))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality3.ts, 0, 0))
 }
 
@@ -23,7 +23,7 @@ interface S extends T {
 >T : Symbol(T, Decl(subtypingWithObjectMembersOptionality3.ts, 3, 47))
 
     Foo2: Derived // ok
->Foo2 : Symbol(Foo2, Decl(subtypingWithObjectMembersOptionality3.ts, 9, 23))
+>Foo2 : Symbol(S.Foo2, Decl(subtypingWithObjectMembersOptionality3.ts, 9, 23))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersOptionality3.ts, 2, 31))
 }
 
diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality4.symbols b/tests/baselines/reference/subtypingWithObjectMembersOptionality4.symbols
index e05cc3d03f8..b1124d49083 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersOptionality4.symbols
+++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality4.symbols
@@ -3,18 +3,18 @@
 
 interface Base { foo: string; }
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality4.ts, 0, 0))
->foo : Symbol(foo, Decl(subtypingWithObjectMembersOptionality4.ts, 2, 16))
+>foo : Symbol(Base.foo, Decl(subtypingWithObjectMembersOptionality4.ts, 2, 16))
 
 interface Derived extends Base { bar: string; }
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersOptionality4.ts, 2, 31))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality4.ts, 0, 0))
->bar : Symbol(bar, Decl(subtypingWithObjectMembersOptionality4.ts, 3, 32))
+>bar : Symbol(Derived.bar, Decl(subtypingWithObjectMembersOptionality4.ts, 3, 32))
 
 interface T {
 >T : Symbol(T, Decl(subtypingWithObjectMembersOptionality4.ts, 3, 47))
 
     Foo: Base;
->Foo : Symbol(Foo, Decl(subtypingWithObjectMembersOptionality4.ts, 5, 13))
+>Foo : Symbol(T.Foo, Decl(subtypingWithObjectMembersOptionality4.ts, 5, 13))
 >Base : Symbol(Base, Decl(subtypingWithObjectMembersOptionality4.ts, 0, 0))
 }
 
@@ -23,7 +23,7 @@ interface S extends T {
 >T : Symbol(T, Decl(subtypingWithObjectMembersOptionality4.ts, 3, 47))
 
     Foo2?: Derived // ok
->Foo2 : Symbol(Foo2, Decl(subtypingWithObjectMembersOptionality4.ts, 9, 23))
+>Foo2 : Symbol(S.Foo2, Decl(subtypingWithObjectMembersOptionality4.ts, 9, 23))
 >Derived : Symbol(Derived, Decl(subtypingWithObjectMembersOptionality4.ts, 2, 31))
 }
 
diff --git a/tests/baselines/reference/super2.symbols b/tests/baselines/reference/super2.symbols
index 69b0254f270..8bb0c6a735c 100644
--- a/tests/baselines/reference/super2.symbols
+++ b/tests/baselines/reference/super2.symbols
@@ -4,13 +4,13 @@ class Base5 {
 >Base5 : Symbol(Base5, Decl(super2.ts, 0, 0))
 
     public x() {
->x : Symbol(x, Decl(super2.ts, 1, 13))
+>x : Symbol(Base5.x, Decl(super2.ts, 1, 13))
 
         return "BaseX";
     }
     
     public y() {
->y : Symbol(y, Decl(super2.ts, 4, 5))
+>y : Symbol(Base5.y, Decl(super2.ts, 4, 5))
 
         return "BaseY";
     }
@@ -21,7 +21,7 @@ class Sub5 extends Base5 {
 >Base5 : Symbol(Base5, Decl(super2.ts, 0, 0))
 
     public x() {
->x : Symbol(x, Decl(super2.ts, 11, 26))
+>x : Symbol(Sub5.x, Decl(super2.ts, 11, 26))
 
         return "SubX";
     }
@@ -32,7 +32,7 @@ class SubSub5 extends Sub5 {
 >Sub5 : Symbol(Sub5, Decl(super2.ts, 9, 1))
 
     public x() {
->x : Symbol(x, Decl(super2.ts, 17, 28))
+>x : Symbol(SubSub5.x, Decl(super2.ts, 17, 28))
 
         return super.x();
 >super.x : Symbol(Sub5.x, Decl(super2.ts, 11, 26))
@@ -40,7 +40,7 @@ class SubSub5 extends Sub5 {
 >x : Symbol(Sub5.x, Decl(super2.ts, 11, 26))
     }
     public y() {
->y : Symbol(y, Decl(super2.ts, 20, 5))
+>y : Symbol(SubSub5.y, Decl(super2.ts, 20, 5))
 
         return super.y();
 >super.y : Symbol(Base5.y, Decl(super2.ts, 4, 5))
@@ -54,7 +54,7 @@ class Base6 {
 >Base6 : Symbol(Base6, Decl(super2.ts, 24, 1))
 
     public x() {
->x : Symbol(x, Decl(super2.ts, 27, 13))
+>x : Symbol(Base6.x, Decl(super2.ts, 27, 13))
 
         return "BaseX";
     }
@@ -65,7 +65,7 @@ class Sub6 extends Base6 {
 >Base6 : Symbol(Base6, Decl(super2.ts, 24, 1))
 
     public y() {
->y : Symbol(y, Decl(super2.ts, 33, 26))
+>y : Symbol(Sub6.y, Decl(super2.ts, 33, 26))
 
         return "SubY";
     }
@@ -76,7 +76,7 @@ class SubSub6 extends Sub6 {
 >Sub6 : Symbol(Sub6, Decl(super2.ts, 31, 1))
 
     public y() {
->y : Symbol(y, Decl(super2.ts, 39, 28))
+>y : Symbol(SubSub6.y, Decl(super2.ts, 39, 28))
 
         return super.y();
 >super.y : Symbol(Sub6.y, Decl(super2.ts, 33, 26))
diff --git a/tests/baselines/reference/superAccess2.js b/tests/baselines/reference/superAccess2.js
index c72bf387c24..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.;
diff --git a/tests/baselines/reference/superAccessInFatArrow1.symbols b/tests/baselines/reference/superAccessInFatArrow1.symbols
index 9b0a0607e0a..88715df9a93 100644
--- a/tests/baselines/reference/superAccessInFatArrow1.symbols
+++ b/tests/baselines/reference/superAccessInFatArrow1.symbols
@@ -6,7 +6,7 @@ module test {
 >A : Symbol(A, Decl(superAccessInFatArrow1.ts, 0, 13))
 
         foo() {
->foo : Symbol(foo, Decl(superAccessInFatArrow1.ts, 1, 20))
+>foo : Symbol(A.foo, Decl(superAccessInFatArrow1.ts, 1, 20))
         }
     }
     export class B extends A {
@@ -14,16 +14,16 @@ module test {
 >A : Symbol(A, Decl(superAccessInFatArrow1.ts, 0, 13))
 
         bar(callback: () => void ) {
->bar : Symbol(bar, Decl(superAccessInFatArrow1.ts, 5, 30))
+>bar : Symbol(B.bar, Decl(superAccessInFatArrow1.ts, 5, 30))
 >callback : Symbol(callback, Decl(superAccessInFatArrow1.ts, 6, 12))
         }
         runme() {
->runme : Symbol(runme, Decl(superAccessInFatArrow1.ts, 7, 9))
+>runme : Symbol(B.runme, Decl(superAccessInFatArrow1.ts, 7, 9))
 
             this.bar(() => {
->this.bar : Symbol(bar, Decl(superAccessInFatArrow1.ts, 5, 30))
+>this.bar : Symbol(B.bar, Decl(superAccessInFatArrow1.ts, 5, 30))
 >this : Symbol(B, Decl(superAccessInFatArrow1.ts, 4, 5))
->bar : Symbol(bar, Decl(superAccessInFatArrow1.ts, 5, 30))
+>bar : Symbol(B.bar, Decl(superAccessInFatArrow1.ts, 5, 30))
 
                 super.foo();
 >super.foo : Symbol(A.foo, Decl(superAccessInFatArrow1.ts, 1, 20))
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing1.js b/tests/baselines/reference/superCallBeforeThisAccessing1.js
new file mode 100644
index 00000000000..1fc7ab39c91
--- /dev/null
+++ b/tests/baselines/reference/superCallBeforeThisAccessing1.js
@@ -0,0 +1,40 @@
+//// [superCallBeforeThisAccessing1.ts]
+declare var Factory: any
+
+class Base {
+    constructor(c) { }
+}
+class D extends Base {
+    private _t;
+    constructor() {
+        super(i);
+        var s = {
+            t: this._t
+        }
+        var i = Factory.create(s);
+    }
+}
+
+
+//// [superCallBeforeThisAccessing1.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 Base = (function () {
+    function Base(c) {
+    }
+    return Base;
+}());
+var D = (function (_super) {
+    __extends(D, _super);
+    function D() {
+        _super.call(this, i);
+        var s = {
+            t: this._t
+        };
+        var i = Factory.create(s);
+    }
+    return D;
+}(Base));
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing1.symbols b/tests/baselines/reference/superCallBeforeThisAccessing1.symbols
new file mode 100644
index 00000000000..63795342381
--- /dev/null
+++ b/tests/baselines/reference/superCallBeforeThisAccessing1.symbols
@@ -0,0 +1,38 @@
+=== tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing1.ts ===
+declare var Factory: any
+>Factory : Symbol(Factory, Decl(superCallBeforeThisAccessing1.ts, 0, 11))
+
+class Base {
+>Base : Symbol(Base, Decl(superCallBeforeThisAccessing1.ts, 0, 24))
+
+    constructor(c) { }
+>c : Symbol(c, Decl(superCallBeforeThisAccessing1.ts, 3, 16))
+}
+class D extends Base {
+>D : Symbol(D, Decl(superCallBeforeThisAccessing1.ts, 4, 1))
+>Base : Symbol(Base, Decl(superCallBeforeThisAccessing1.ts, 0, 24))
+
+    private _t;
+>_t : Symbol(D._t, Decl(superCallBeforeThisAccessing1.ts, 5, 22))
+
+    constructor() {
+        super(i);
+>super : Symbol(Base, Decl(superCallBeforeThisAccessing1.ts, 0, 24))
+>i : Symbol(i, Decl(superCallBeforeThisAccessing1.ts, 12, 11))
+
+        var s = {
+>s : Symbol(s, Decl(superCallBeforeThisAccessing1.ts, 9, 11))
+
+            t: this._t
+>t : Symbol(t, Decl(superCallBeforeThisAccessing1.ts, 9, 17))
+>this._t : Symbol(D._t, Decl(superCallBeforeThisAccessing1.ts, 5, 22))
+>this : Symbol(D, Decl(superCallBeforeThisAccessing1.ts, 4, 1))
+>_t : Symbol(D._t, Decl(superCallBeforeThisAccessing1.ts, 5, 22))
+        }
+        var i = Factory.create(s);
+>i : Symbol(i, Decl(superCallBeforeThisAccessing1.ts, 12, 11))
+>Factory : Symbol(Factory, Decl(superCallBeforeThisAccessing1.ts, 0, 11))
+>s : Symbol(s, Decl(superCallBeforeThisAccessing1.ts, 9, 11))
+    }
+}
+
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing1.types b/tests/baselines/reference/superCallBeforeThisAccessing1.types
new file mode 100644
index 00000000000..e947653584a
--- /dev/null
+++ b/tests/baselines/reference/superCallBeforeThisAccessing1.types
@@ -0,0 +1,43 @@
+=== tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing1.ts ===
+declare var Factory: any
+>Factory : any
+
+class Base {
+>Base : Base
+
+    constructor(c) { }
+>c : any
+}
+class D extends Base {
+>D : D
+>Base : Base
+
+    private _t;
+>_t : any
+
+    constructor() {
+        super(i);
+>super(i) : void
+>super : typeof Base
+>i : any
+
+        var s = {
+>s : { t: any; }
+>{            t: this._t        } : { t: any; }
+
+            t: this._t
+>t : any
+>this._t : any
+>this : this
+>_t : any
+        }
+        var i = Factory.create(s);
+>i : any
+>Factory.create(s) : any
+>Factory.create : any
+>Factory : any
+>create : any
+>s : { t: any; }
+    }
+}
+
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing2.js b/tests/baselines/reference/superCallBeforeThisAccessing2.js
new file mode 100644
index 00000000000..e5acf06bbfd
--- /dev/null
+++ b/tests/baselines/reference/superCallBeforeThisAccessing2.js
@@ -0,0 +1,31 @@
+//// [superCallBeforeThisAccessing2.ts]
+class Base {
+    constructor(c) { }
+}
+class D extends Base {
+    private _t;
+    constructor() {
+        super(() => { this._t }); // no error. only check when this is directly accessing in constructor
+    }
+}
+
+
+//// [superCallBeforeThisAccessing2.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 Base = (function () {
+    function Base(c) {
+    }
+    return Base;
+}());
+var D = (function (_super) {
+    __extends(D, _super);
+    function D() {
+        var _this = this;
+        _super.call(this, function () { _this._t; }); // no error. only check when this is directly accessing in constructor
+    }
+    return D;
+}(Base));
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing2.symbols b/tests/baselines/reference/superCallBeforeThisAccessing2.symbols
new file mode 100644
index 00000000000..3684f853101
--- /dev/null
+++ b/tests/baselines/reference/superCallBeforeThisAccessing2.symbols
@@ -0,0 +1,23 @@
+=== tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing2.ts ===
+class Base {
+>Base : Symbol(Base, Decl(superCallBeforeThisAccessing2.ts, 0, 0))
+
+    constructor(c) { }
+>c : Symbol(c, Decl(superCallBeforeThisAccessing2.ts, 1, 16))
+}
+class D extends Base {
+>D : Symbol(D, Decl(superCallBeforeThisAccessing2.ts, 2, 1))
+>Base : Symbol(Base, Decl(superCallBeforeThisAccessing2.ts, 0, 0))
+
+    private _t;
+>_t : Symbol(D._t, Decl(superCallBeforeThisAccessing2.ts, 3, 22))
+
+    constructor() {
+        super(() => { this._t }); // no error. only check when this is directly accessing in constructor
+>super : Symbol(Base, Decl(superCallBeforeThisAccessing2.ts, 0, 0))
+>this._t : Symbol(D._t, Decl(superCallBeforeThisAccessing2.ts, 3, 22))
+>this : Symbol(D, Decl(superCallBeforeThisAccessing2.ts, 2, 1))
+>_t : Symbol(D._t, Decl(superCallBeforeThisAccessing2.ts, 3, 22))
+    }
+}
+
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing2.types b/tests/baselines/reference/superCallBeforeThisAccessing2.types
new file mode 100644
index 00000000000..cf0f54b6246
--- /dev/null
+++ b/tests/baselines/reference/superCallBeforeThisAccessing2.types
@@ -0,0 +1,25 @@
+=== tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing2.ts ===
+class Base {
+>Base : Base
+
+    constructor(c) { }
+>c : any
+}
+class D extends Base {
+>D : D
+>Base : Base
+
+    private _t;
+>_t : any
+
+    constructor() {
+        super(() => { this._t }); // no error. only check when this is directly accessing in constructor
+>super(() => { this._t }) : void
+>super : typeof Base
+>() => { this._t } : () => void
+>this._t : any
+>this : this
+>_t : any
+    }
+}
+
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing3.errors.txt b/tests/baselines/reference/superCallBeforeThisAccessing3.errors.txt
new file mode 100644
index 00000000000..90b9b034263
--- /dev/null
+++ b/tests/baselines/reference/superCallBeforeThisAccessing3.errors.txt
@@ -0,0 +1,19 @@
+tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing3.ts(9,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+
+
+==== tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing3.ts (1 errors) ====
+    class Base {
+        constructor(c) { }
+    }
+    class D extends Base {
+        private _t;
+        constructor() {
+            let x = () => { this._t };
+            x();  // no error; we only check super is called before this when the container is a constructor
+            this._t;  // error
+            ~~~~
+!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+            super(undefined);
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing3.js b/tests/baselines/reference/superCallBeforeThisAccessing3.js
new file mode 100644
index 00000000000..101d74e4bc7
--- /dev/null
+++ b/tests/baselines/reference/superCallBeforeThisAccessing3.js
@@ -0,0 +1,37 @@
+//// [superCallBeforeThisAccessing3.ts]
+class Base {
+    constructor(c) { }
+}
+class D extends Base {
+    private _t;
+    constructor() {
+        let x = () => { this._t };
+        x();  // no error; we only check super is called before this when the container is a constructor
+        this._t;  // error
+        super(undefined);
+    }
+}
+
+
+//// [superCallBeforeThisAccessing3.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 Base = (function () {
+    function Base(c) {
+    }
+    return Base;
+}());
+var D = (function (_super) {
+    __extends(D, _super);
+    function D() {
+        var _this = this;
+        var x = function () { _this._t; };
+        x(); // no error; we only check super is called before this when the container is a constructor
+        this._t; // error
+        _super.call(this, undefined);
+    }
+    return D;
+}(Base));
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing4.errors.txt b/tests/baselines/reference/superCallBeforeThisAccessing4.errors.txt
new file mode 100644
index 00000000000..91c3e7763f6
--- /dev/null
+++ b/tests/baselines/reference/superCallBeforeThisAccessing4.errors.txt
@@ -0,0 +1,24 @@
+tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing4.ts(5,9): error TS17005: A constructor cannot contain a 'super' call when its class extends 'null'
+tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing4.ts(12,9): error TS17005: A constructor cannot contain a 'super' call when its class extends 'null'
+
+
+==== tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing4.ts (2 errors) ====
+    class D extends null {
+        private _t;
+        constructor() {
+            this._t;
+            super();
+            ~~~~~~~
+!!! error TS17005: A constructor cannot contain a 'super' call when its class extends 'null'
+        }
+    }
+    
+    class E extends null {
+        private _t;
+        constructor() {
+            super();
+            ~~~~~~~
+!!! error TS17005: A constructor cannot contain a 'super' call when its class extends 'null'
+            this._t;
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing4.js b/tests/baselines/reference/superCallBeforeThisAccessing4.js
new file mode 100644
index 00000000000..9c3c5ab60c4
--- /dev/null
+++ b/tests/baselines/reference/superCallBeforeThisAccessing4.js
@@ -0,0 +1,39 @@
+//// [superCallBeforeThisAccessing4.ts]
+class D extends null {
+    private _t;
+    constructor() {
+        this._t;
+        super();
+    }
+}
+
+class E extends null {
+    private _t;
+    constructor() {
+        super();
+        this._t;
+    }
+}
+
+//// [superCallBeforeThisAccessing4.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 D = (function (_super) {
+    __extends(D, _super);
+    function D() {
+        this._t;
+        _super.call(this);
+    }
+    return D;
+}(null));
+var E = (function (_super) {
+    __extends(E, _super);
+    function E() {
+        _super.call(this);
+        this._t;
+    }
+    return E;
+}(null));
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing5.js b/tests/baselines/reference/superCallBeforeThisAccessing5.js
new file mode 100644
index 00000000000..3281a3f8b55
--- /dev/null
+++ b/tests/baselines/reference/superCallBeforeThisAccessing5.js
@@ -0,0 +1,22 @@
+//// [superCallBeforeThisAccessing5.ts]
+class D extends null {
+    private _t;
+    constructor() {
+        this._t;  // No error
+    }
+}
+
+
+//// [superCallBeforeThisAccessing5.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 D = (function (_super) {
+    __extends(D, _super);
+    function D() {
+        this._t; // No error
+    }
+    return D;
+}(null));
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing5.symbols b/tests/baselines/reference/superCallBeforeThisAccessing5.symbols
new file mode 100644
index 00000000000..908f0f59add
--- /dev/null
+++ b/tests/baselines/reference/superCallBeforeThisAccessing5.symbols
@@ -0,0 +1,15 @@
+=== tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing5.ts ===
+class D extends null {
+>D : Symbol(D, Decl(superCallBeforeThisAccessing5.ts, 0, 0))
+
+    private _t;
+>_t : Symbol(D._t, Decl(superCallBeforeThisAccessing5.ts, 0, 22))
+
+    constructor() {
+        this._t;  // No error
+>this._t : Symbol(D._t, Decl(superCallBeforeThisAccessing5.ts, 0, 22))
+>this : Symbol(D, Decl(superCallBeforeThisAccessing5.ts, 0, 0))
+>_t : Symbol(D._t, Decl(superCallBeforeThisAccessing5.ts, 0, 22))
+    }
+}
+
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing5.types b/tests/baselines/reference/superCallBeforeThisAccessing5.types
new file mode 100644
index 00000000000..2c0fc33c4dc
--- /dev/null
+++ b/tests/baselines/reference/superCallBeforeThisAccessing5.types
@@ -0,0 +1,16 @@
+=== tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing5.ts ===
+class D extends null {
+>D : D
+>null : null
+
+    private _t;
+>_t : any
+
+    constructor() {
+        this._t;  // No error
+>this._t : any
+>this : this
+>_t : any
+    }
+}
+
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing6.errors.txt b/tests/baselines/reference/superCallBeforeThisAccessing6.errors.txt
new file mode 100644
index 00000000000..346b2d58bec
--- /dev/null
+++ b/tests/baselines/reference/superCallBeforeThisAccessing6.errors.txt
@@ -0,0 +1,16 @@
+tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing6.ts(7,15): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+
+
+==== tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing6.ts (1 errors) ====
+    class Base {
+        constructor(c) { }
+    }
+    class D extends Base {
+        private _t;
+        constructor() {
+            super(this); 
+                  ~~~~
+!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing6.js b/tests/baselines/reference/superCallBeforeThisAccessing6.js
new file mode 100644
index 00000000000..746ce9f2791
--- /dev/null
+++ b/tests/baselines/reference/superCallBeforeThisAccessing6.js
@@ -0,0 +1,30 @@
+//// [superCallBeforeThisAccessing6.ts]
+class Base {
+    constructor(c) { }
+}
+class D extends Base {
+    private _t;
+    constructor() {
+        super(this); 
+    }
+}
+
+
+//// [superCallBeforeThisAccessing6.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 Base = (function () {
+    function Base(c) {
+    }
+    return Base;
+}());
+var D = (function (_super) {
+    __extends(D, _super);
+    function D() {
+        _super.call(this, this);
+    }
+    return D;
+}(Base));
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing7.errors.txt b/tests/baselines/reference/superCallBeforeThisAccessing7.errors.txt
new file mode 100644
index 00000000000..4e374fd96ea
--- /dev/null
+++ b/tests/baselines/reference/superCallBeforeThisAccessing7.errors.txt
@@ -0,0 +1,19 @@
+tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing7.ts(8,16): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+
+
+==== tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing7.ts (1 errors) ====
+    class Base {
+        constructor(c) { }
+    }
+    class D extends Base {
+        private _t;
+        constructor() {
+            let x = {
+                j: this._t,
+                   ~~~~
+!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+            }
+            super(undefined);
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing7.js b/tests/baselines/reference/superCallBeforeThisAccessing7.js
new file mode 100644
index 00000000000..c3aa1655cf7
--- /dev/null
+++ b/tests/baselines/reference/superCallBeforeThisAccessing7.js
@@ -0,0 +1,36 @@
+//// [superCallBeforeThisAccessing7.ts]
+class Base {
+    constructor(c) { }
+}
+class D extends Base {
+    private _t;
+    constructor() {
+        let x = {
+            j: this._t,
+        }
+        super(undefined);
+    }
+}
+
+
+//// [superCallBeforeThisAccessing7.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 Base = (function () {
+    function Base(c) {
+    }
+    return Base;
+}());
+var D = (function (_super) {
+    __extends(D, _super);
+    function D() {
+        var x = {
+            j: this._t
+        };
+        _super.call(this, undefined);
+    }
+    return D;
+}(Base));
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing8.js b/tests/baselines/reference/superCallBeforeThisAccessing8.js
new file mode 100644
index 00000000000..0865c4305a5
--- /dev/null
+++ b/tests/baselines/reference/superCallBeforeThisAccessing8.js
@@ -0,0 +1,36 @@
+//// [superCallBeforeThisAccessing8.ts]
+class Base {
+    constructor(c) { }
+}
+class D extends Base {
+    private _t;
+    constructor() {
+        let x = {
+            k: super(undefined), 
+            j: this._t,  // no error
+        }
+    }
+}
+
+
+//// [superCallBeforeThisAccessing8.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 Base = (function () {
+    function Base(c) {
+    }
+    return Base;
+}());
+var D = (function (_super) {
+    __extends(D, _super);
+    function D() {
+        var x = {
+            k: _super.call(this, undefined),
+            j: this._t
+        };
+    }
+    return D;
+}(Base));
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing8.symbols b/tests/baselines/reference/superCallBeforeThisAccessing8.symbols
new file mode 100644
index 00000000000..e60ec92e917
--- /dev/null
+++ b/tests/baselines/reference/superCallBeforeThisAccessing8.symbols
@@ -0,0 +1,32 @@
+=== tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing8.ts ===
+class Base {
+>Base : Symbol(Base, Decl(superCallBeforeThisAccessing8.ts, 0, 0))
+
+    constructor(c) { }
+>c : Symbol(c, Decl(superCallBeforeThisAccessing8.ts, 1, 16))
+}
+class D extends Base {
+>D : Symbol(D, Decl(superCallBeforeThisAccessing8.ts, 2, 1))
+>Base : Symbol(Base, Decl(superCallBeforeThisAccessing8.ts, 0, 0))
+
+    private _t;
+>_t : Symbol(D._t, Decl(superCallBeforeThisAccessing8.ts, 3, 22))
+
+    constructor() {
+        let x = {
+>x : Symbol(x, Decl(superCallBeforeThisAccessing8.ts, 6, 11))
+
+            k: super(undefined), 
+>k : Symbol(k, Decl(superCallBeforeThisAccessing8.ts, 6, 17))
+>super : Symbol(Base, Decl(superCallBeforeThisAccessing8.ts, 0, 0))
+>undefined : Symbol(undefined)
+
+            j: this._t,  // no error
+>j : Symbol(j, Decl(superCallBeforeThisAccessing8.ts, 7, 32))
+>this._t : Symbol(D._t, Decl(superCallBeforeThisAccessing8.ts, 3, 22))
+>this : Symbol(D, Decl(superCallBeforeThisAccessing8.ts, 2, 1))
+>_t : Symbol(D._t, Decl(superCallBeforeThisAccessing8.ts, 3, 22))
+        }
+    }
+}
+
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing8.types b/tests/baselines/reference/superCallBeforeThisAccessing8.types
new file mode 100644
index 00000000000..dd92d924ceb
--- /dev/null
+++ b/tests/baselines/reference/superCallBeforeThisAccessing8.types
@@ -0,0 +1,34 @@
+=== tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing8.ts ===
+class Base {
+>Base : Base
+
+    constructor(c) { }
+>c : any
+}
+class D extends Base {
+>D : D
+>Base : Base
+
+    private _t;
+>_t : any
+
+    constructor() {
+        let x = {
+>x : { k: void; j: any; }
+>{            k: super(undefined),             j: this._t,  // no error        } : { k: void; j: any; }
+
+            k: super(undefined), 
+>k : void
+>super(undefined) : void
+>super : typeof Base
+>undefined : undefined
+
+            j: this._t,  // no error
+>j : any
+>this._t : any
+>this : this
+>_t : any
+        }
+    }
+}
+
diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.symbols b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.symbols
index 7220d65dc89..15105a27b98 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.symbols
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.symbols
@@ -4,7 +4,7 @@ declare class B<T> {
 >T : Symbol(T, Decl(superCallFromClassThatDerivesFromGenericType1.ts, 0, 16))
 
     m<U>(): B<U>;
->m : Symbol(m, Decl(superCallFromClassThatDerivesFromGenericType1.ts, 0, 20))
+>m : Symbol(B.m, Decl(superCallFromClassThatDerivesFromGenericType1.ts, 0, 20))
 >U : Symbol(U, Decl(superCallFromClassThatDerivesFromGenericType1.ts, 1, 6))
 >B : Symbol(B, Decl(superCallFromClassThatDerivesFromGenericType1.ts, 0, 0))
 >U : Symbol(U, Decl(superCallFromClassThatDerivesFromGenericType1.ts, 1, 6))
diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.symbols b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.symbols
index eca7cd26b03..e04a2fd286a 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.symbols
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.symbols
@@ -4,7 +4,7 @@ declare class B<T> {
 >T : Symbol(T, Decl(superCallFromClassThatDerivesFromGenericType2.ts, 0, 16))
 
     m<U>(): B<U>;
->m : Symbol(m, Decl(superCallFromClassThatDerivesFromGenericType2.ts, 0, 20))
+>m : Symbol(B.m, Decl(superCallFromClassThatDerivesFromGenericType2.ts, 0, 20))
 >U : Symbol(U, Decl(superCallFromClassThatDerivesFromGenericType2.ts, 1, 6))
 >B : Symbol(B, Decl(superCallFromClassThatDerivesFromGenericType2.ts, 0, 0))
 >U : Symbol(U, Decl(superCallFromClassThatDerivesFromGenericType2.ts, 1, 6))
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/superCallInsideObjectLiteralExpression.symbols b/tests/baselines/reference/superCallInsideObjectLiteralExpression.symbols
index d01899ecfef..9199c3e5a04 100644
--- a/tests/baselines/reference/superCallInsideObjectLiteralExpression.symbols
+++ b/tests/baselines/reference/superCallInsideObjectLiteralExpression.symbols
@@ -3,7 +3,7 @@ class A {
 >A : Symbol(A, Decl(superCallInsideObjectLiteralExpression.ts, 0, 0))
 
     foo() {
->foo : Symbol(foo, Decl(superCallInsideObjectLiteralExpression.ts, 0, 9))
+>foo : Symbol(A.foo, Decl(superCallInsideObjectLiteralExpression.ts, 0, 9))
     }
 }
 
diff --git a/tests/baselines/reference/superCallParameterContextualTyping1.symbols b/tests/baselines/reference/superCallParameterContextualTyping1.symbols
index ed845b7cd4e..91eff4b3c8b 100644
--- a/tests/baselines/reference/superCallParameterContextualTyping1.symbols
+++ b/tests/baselines/reference/superCallParameterContextualTyping1.symbols
@@ -6,7 +6,7 @@ class A<T1, T2> {
 >T2 : Symbol(T2, Decl(superCallParameterContextualTyping1.ts, 1, 11))
 
     constructor(private map: (value: T1) => T2) {
->map : Symbol(map, Decl(superCallParameterContextualTyping1.ts, 2, 16))
+>map : Symbol(A.map, Decl(superCallParameterContextualTyping1.ts, 2, 16))
 >value : Symbol(value, Decl(superCallParameterContextualTyping1.ts, 2, 30))
 >T1 : Symbol(T1, Decl(superCallParameterContextualTyping1.ts, 1, 8))
 >T2 : Symbol(T2, Decl(superCallParameterContextualTyping1.ts, 1, 11))
@@ -22,7 +22,7 @@ class B extends A<number, string> {
     constructor() { super(value => String(value.toExponential())); }
 >super : Symbol(A, Decl(superCallParameterContextualTyping1.ts, 0, 0))
 >value : Symbol(value, Decl(superCallParameterContextualTyping1.ts, 9, 26))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >value.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --))
 >value : Symbol(value, Decl(superCallParameterContextualTyping1.ts, 9, 26))
 >toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --))
diff --git a/tests/baselines/reference/superCallParameterContextualTyping3.symbols b/tests/baselines/reference/superCallParameterContextualTyping3.symbols
index e51687b4539..55101b7f053 100644
--- a/tests/baselines/reference/superCallParameterContextualTyping3.symbols
+++ b/tests/baselines/reference/superCallParameterContextualTyping3.symbols
@@ -4,7 +4,7 @@ interface ContextualType<T> {
 >T : Symbol(T, Decl(superCallParameterContextualTyping3.ts, 0, 25))
 
     method(parameter: T): void;
->method : Symbol(method, Decl(superCallParameterContextualTyping3.ts, 0, 29))
+>method : Symbol(ContextualType.method, Decl(superCallParameterContextualTyping3.ts, 0, 29))
 >parameter : Symbol(parameter, Decl(superCallParameterContextualTyping3.ts, 1, 11))
 >T : Symbol(T, Decl(superCallParameterContextualTyping3.ts, 0, 25))
 }
@@ -20,7 +20,7 @@ class CBase<T>  {
     }
 
     foo(param: ContextualType<T>) {
->foo : Symbol(foo, Decl(superCallParameterContextualTyping3.ts, 6, 5))
+>foo : Symbol(CBase.foo, Decl(superCallParameterContextualTyping3.ts, 6, 5))
 >param : Symbol(param, Decl(superCallParameterContextualTyping3.ts, 8, 8))
 >ContextualType : Symbol(ContextualType, Decl(superCallParameterContextualTyping3.ts, 0, 0))
 >T : Symbol(T, Decl(superCallParameterContextualTyping3.ts, 4, 12))
diff --git a/tests/baselines/reference/superCalls.symbols b/tests/baselines/reference/superCalls.symbols
index 3c91d2bace0..61835288637 100644
--- a/tests/baselines/reference/superCalls.symbols
+++ b/tests/baselines/reference/superCalls.symbols
@@ -3,7 +3,7 @@ class Base {
 >Base : Symbol(Base, Decl(superCalls.ts, 0, 0))
 
     x = 43;
->x : Symbol(x, Decl(superCalls.ts, 0, 12))
+>x : Symbol(Base.x, Decl(superCalls.ts, 0, 12))
 
     constructor(n: string) {
 >n : Symbol(n, Decl(superCalls.ts, 2, 16))
@@ -20,7 +20,7 @@ class Derived extends Base {
 
     //super call in class constructor of derived type
     constructor(public q: number) {
->q : Symbol(q, Decl(superCalls.ts, 11, 16))
+>q : Symbol(Derived.q, Decl(superCalls.ts, 11, 16))
 
         super('');
 >super : Symbol(Base, Decl(superCalls.ts, 0, 0))
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/superInCatchBlock1.symbols b/tests/baselines/reference/superInCatchBlock1.symbols
index 02b931a67ff..374a736e338 100644
--- a/tests/baselines/reference/superInCatchBlock1.symbols
+++ b/tests/baselines/reference/superInCatchBlock1.symbols
@@ -3,14 +3,14 @@ class A {
 >A : Symbol(A, Decl(superInCatchBlock1.ts, 0, 0))
 
  m(): void { }
->m : Symbol(m, Decl(superInCatchBlock1.ts, 0, 9))
+>m : Symbol(A.m, Decl(superInCatchBlock1.ts, 0, 9))
 }
 class B extends A {
 >B : Symbol(B, Decl(superInCatchBlock1.ts, 2, 1))
 >A : Symbol(A, Decl(superInCatchBlock1.ts, 0, 0))
 
  m() {
->m : Symbol(m, Decl(superInCatchBlock1.ts, 3, 19))
+>m : Symbol(B.m, Decl(superInCatchBlock1.ts, 3, 19))
 
   try {
   }
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/superPropertyAccess.errors.txt b/tests/baselines/reference/superPropertyAccess.errors.txt
index 41e0a0adac5..22b1a1c5346 100644
--- a/tests/baselines/reference/superPropertyAccess.errors.txt
+++ b/tests/baselines/reference/superPropertyAccess.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/superPropertyAccess.ts(8,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/superPropertyAccess.ts(9,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/superPropertyAccess.ts(22,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-tests/cases/compiler/superPropertyAccess.ts(24,9): error TS2341: Property 'p1' is private and only accessible within class 'MyBase'.
+tests/cases/compiler/superPropertyAccess.ts(24,15): error TS2341: Property 'p1' is private and only accessible within class 'MyBase'.
 tests/cases/compiler/superPropertyAccess.ts(26,24): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
 tests/cases/compiler/superPropertyAccess.ts(28,24): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
 tests/cases/compiler/superPropertyAccess.ts(32,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
@@ -39,7 +39,7 @@ tests/cases/compiler/superPropertyAccess.ts(34,23): error TS2340: Only public an
 !!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
     
             super.p1();                                         // Should error, private not public instance member function
-            ~~~~~~~~
+                  ~~
 !!! error TS2341: Property 'p1' is private and only accessible within class 'MyBase'.
     
             var l1 = super.d1;                                  // Should error, instance data property not a public instance member function
diff --git a/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.symbols b/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.symbols
index 1379d50179f..d29cfed7084 100644
--- a/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.symbols
+++ b/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.symbols
@@ -3,7 +3,7 @@ class A {
 >A : Symbol(A, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES5.ts, 0, 0))
 
     foo() { return 1; }
->foo : Symbol(foo, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES5.ts, 0, 9))
+>foo : Symbol(A.foo, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES5.ts, 0, 9))
 }
 
 class B extends A {
@@ -11,10 +11,10 @@ class B extends A {
 >A : Symbol(A, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES5.ts, 0, 0))
 
     foo() { return 2; }
->foo : Symbol(foo, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES5.ts, 4, 19))
+>foo : Symbol(B.foo, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES5.ts, 4, 19))
 
     bar() {
->bar : Symbol(bar, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES5.ts, 5, 23))
+>bar : Symbol(B.bar, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES5.ts, 5, 23))
 
         return class {
             [super.foo()]() {
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/superPropertyAccessInComputedPropertiesOfNestedType_ES6.symbols b/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES6.symbols
index 12446259f32..2eae0080f4b 100644
--- a/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES6.symbols
+++ b/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES6.symbols
@@ -3,7 +3,7 @@ class A {
 >A : Symbol(A, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES6.ts, 0, 0))
 
     foo() { return 1; }
->foo : Symbol(foo, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES6.ts, 0, 9))
+>foo : Symbol(A.foo, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES6.ts, 0, 9))
 }
 
 class B extends A {
@@ -11,10 +11,10 @@ class B extends A {
 >A : Symbol(A, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES6.ts, 0, 0))
 
     foo() { return 2; }
->foo : Symbol(foo, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES6.ts, 4, 19))
+>foo : Symbol(B.foo, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES6.ts, 4, 19))
 
     bar() {
->bar : Symbol(bar, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES6.ts, 5, 23))
+>bar : Symbol(B.bar, Decl(superPropertyAccessInComputedPropertiesOfNestedType_ES6.ts, 5, 23))
 
         return class {
             [super.foo()]() {
diff --git a/tests/baselines/reference/superPropertyAccess_ES6.symbols b/tests/baselines/reference/superPropertyAccess_ES6.symbols
index ada6c5b8057..61b8ab3dc76 100644
--- a/tests/baselines/reference/superPropertyAccess_ES6.symbols
+++ b/tests/baselines/reference/superPropertyAccess_ES6.symbols
@@ -4,10 +4,10 @@ class MyBase {
 >MyBase : Symbol(MyBase, Decl(superPropertyAccess_ES6.ts, 0, 0))
 
   getValue(): number { return 1; }
->getValue : Symbol(getValue, Decl(superPropertyAccess_ES6.ts, 1, 14))
+>getValue : Symbol(MyBase.getValue, Decl(superPropertyAccess_ES6.ts, 1, 14))
 
   get value(): number { return 1; }
->value : Symbol(value, Decl(superPropertyAccess_ES6.ts, 2, 34))
+>value : Symbol(MyBase.value, Decl(superPropertyAccess_ES6.ts, 2, 34))
 }
 
 class MyDerived extends MyBase {
@@ -46,20 +46,20 @@ class A {
 >A : Symbol(A, Decl(superPropertyAccess_ES6.ts, 16, 17))
 
     private _property: string;
->_property : Symbol(_property, Decl(superPropertyAccess_ES6.ts, 18, 9))
+>_property : Symbol(A._property, Decl(superPropertyAccess_ES6.ts, 18, 9))
 
     get property() { return this._property; }
->property : Symbol(property, Decl(superPropertyAccess_ES6.ts, 19, 30), Decl(superPropertyAccess_ES6.ts, 20, 45))
->this._property : Symbol(_property, Decl(superPropertyAccess_ES6.ts, 18, 9))
+>property : Symbol(A.property, Decl(superPropertyAccess_ES6.ts, 19, 30), Decl(superPropertyAccess_ES6.ts, 20, 45))
+>this._property : Symbol(A._property, Decl(superPropertyAccess_ES6.ts, 18, 9))
 >this : Symbol(A, Decl(superPropertyAccess_ES6.ts, 16, 17))
->_property : Symbol(_property, Decl(superPropertyAccess_ES6.ts, 18, 9))
+>_property : Symbol(A._property, Decl(superPropertyAccess_ES6.ts, 18, 9))
 
     set property(value: string) { this._property = value }
->property : Symbol(property, Decl(superPropertyAccess_ES6.ts, 19, 30), Decl(superPropertyAccess_ES6.ts, 20, 45))
+>property : Symbol(A.property, Decl(superPropertyAccess_ES6.ts, 19, 30), Decl(superPropertyAccess_ES6.ts, 20, 45))
 >value : Symbol(value, Decl(superPropertyAccess_ES6.ts, 21, 17))
->this._property : Symbol(_property, Decl(superPropertyAccess_ES6.ts, 18, 9))
+>this._property : Symbol(A._property, Decl(superPropertyAccess_ES6.ts, 18, 9))
 >this : Symbol(A, Decl(superPropertyAccess_ES6.ts, 16, 17))
->_property : Symbol(_property, Decl(superPropertyAccess_ES6.ts, 18, 9))
+>_property : Symbol(A._property, Decl(superPropertyAccess_ES6.ts, 18, 9))
 >value : Symbol(value, Decl(superPropertyAccess_ES6.ts, 21, 17))
 }
 
@@ -68,7 +68,7 @@ class B extends A {
 >A : Symbol(A, Decl(superPropertyAccess_ES6.ts, 16, 17))
 
     set property(value: string) {
->property : Symbol(property, Decl(superPropertyAccess_ES6.ts, 24, 19))
+>property : Symbol(B.property, Decl(superPropertyAccess_ES6.ts, 24, 19))
 >value : Symbol(value, Decl(superPropertyAccess_ES6.ts, 25, 17))
 
         super.property = value + " addition";
diff --git a/tests/baselines/reference/superSymbolIndexedAccess1.symbols b/tests/baselines/reference/superSymbolIndexedAccess1.symbols
index 47131f231cb..9141771f0c9 100644
--- a/tests/baselines/reference/superSymbolIndexedAccess1.symbols
+++ b/tests/baselines/reference/superSymbolIndexedAccess1.symbols
@@ -1,9 +1,9 @@
 === tests/cases/conformance/expressions/superPropertyAccess/superSymbolIndexedAccess1.ts ===
 var symbol = Symbol.for('myThing');
 >symbol : Symbol(symbol, Decl(superSymbolIndexedAccess1.ts, 0, 3))
->Symbol.for : Symbol(SymbolConstructor.for, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->for : Symbol(SymbolConstructor.for, Decl(lib.d.ts, --, --))
+>Symbol.for : Symbol(SymbolConstructor.for, Decl(lib.es2015.symbol.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>for : Symbol(SymbolConstructor.for, Decl(lib.es2015.symbol.d.ts, --, --))
 
 class Foo {
 >Foo : Symbol(Foo, Decl(superSymbolIndexedAccess1.ts, 0, 35))
diff --git a/tests/baselines/reference/superSymbolIndexedAccess2.symbols b/tests/baselines/reference/superSymbolIndexedAccess2.symbols
index 9b65ce358bb..68b503778e7 100644
--- a/tests/baselines/reference/superSymbolIndexedAccess2.symbols
+++ b/tests/baselines/reference/superSymbolIndexedAccess2.symbols
@@ -4,9 +4,9 @@ class Foo {
 >Foo : Symbol(Foo, Decl(superSymbolIndexedAccess2.ts, 0, 0))
 
     [Symbol.isConcatSpreadable]() {
->Symbol.isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.d.ts, --, --))
+>Symbol.isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return 0;
     }
@@ -17,14 +17,14 @@ class Bar extends Foo {
 >Foo : Symbol(Foo, Decl(superSymbolIndexedAccess2.ts, 0, 0))
 
     [Symbol.isConcatSpreadable]() {
->Symbol.isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.d.ts, --, --))
+>Symbol.isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return super[Symbol.isConcatSpreadable]();
 >super : Symbol(Foo, Decl(superSymbolIndexedAccess2.ts, 0, 0))
->Symbol.isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.d.ts, --, --))
+>Symbol.isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
     }
 }
diff --git a/tests/baselines/reference/superWithGenericSpecialization.symbols b/tests/baselines/reference/superWithGenericSpecialization.symbols
index 7a8f93b4e28..1ead844b154 100644
--- a/tests/baselines/reference/superWithGenericSpecialization.symbols
+++ b/tests/baselines/reference/superWithGenericSpecialization.symbols
@@ -4,7 +4,7 @@ class C<T> {
 >T : Symbol(T, Decl(superWithGenericSpecialization.ts, 0, 8))
 
     x: T;
->x : Symbol(x, Decl(superWithGenericSpecialization.ts, 0, 12))
+>x : Symbol(C.x, Decl(superWithGenericSpecialization.ts, 0, 12))
 >T : Symbol(T, Decl(superWithGenericSpecialization.ts, 0, 8))
 }
 
@@ -14,7 +14,7 @@ class D<T> extends C<string> {
 >C : Symbol(C, Decl(superWithGenericSpecialization.ts, 0, 0))
 
     y: T;
->y : Symbol(y, Decl(superWithGenericSpecialization.ts, 4, 30))
+>y : Symbol(D.y, Decl(superWithGenericSpecialization.ts, 4, 30))
 >T : Symbol(T, Decl(superWithGenericSpecialization.ts, 4, 8))
 
     constructor() {
diff --git a/tests/baselines/reference/superWithGenerics.symbols b/tests/baselines/reference/superWithGenerics.symbols
index 43a7e7493b6..79bda5ab120 100644
--- a/tests/baselines/reference/superWithGenerics.symbols
+++ b/tests/baselines/reference/superWithGenerics.symbols
@@ -4,7 +4,7 @@ declare class B<T> {
 >T : Symbol(T, Decl(superWithGenerics.ts, 0, 16))
 
     m<U>(): B<U>;
->m : Symbol(m, Decl(superWithGenerics.ts, 0, 20))
+>m : Symbol(B.m, Decl(superWithGenerics.ts, 0, 20))
 >U : Symbol(U, Decl(superWithGenerics.ts, 1, 6))
 >B : Symbol(B, Decl(superWithGenerics.ts, 0, 0))
 >U : Symbol(U, Decl(superWithGenerics.ts, 1, 6))
diff --git a/tests/baselines/reference/switchAssignmentCompat.errors.txt b/tests/baselines/reference/switchAssignmentCompat.errors.txt
index 6a2755365ab..747a1035b68 100644
--- a/tests/baselines/reference/switchAssignmentCompat.errors.txt
+++ b/tests/baselines/reference/switchAssignmentCompat.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/switchAssignmentCompat.ts(4,10): error TS2322: Type 'typeof Foo' is not assignable to type 'number'.
+tests/cases/compiler/switchAssignmentCompat.ts(4,10): error TS2678: Type 'typeof Foo' is not comparable to type 'number'.
 
 
 ==== tests/cases/compiler/switchAssignmentCompat.ts (1 errors) ====
@@ -7,6 +7,6 @@ tests/cases/compiler/switchAssignmentCompat.ts(4,10): error TS2322: Type 'typeof
     switch (0) {
         case Foo: break; // Error expected
              ~~~
-!!! error TS2322: Type 'typeof Foo' is not assignable to type 'number'.
+!!! error TS2678: Type 'typeof Foo' is not comparable to type 'number'.
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/switchCaseWithIntersectionTypes01.errors.txt b/tests/baselines/reference/switchCaseWithIntersectionTypes01.errors.txt
new file mode 100644
index 00000000000..d42f407a784
--- /dev/null
+++ b/tests/baselines/reference/switchCaseWithIntersectionTypes01.errors.txt
@@ -0,0 +1,38 @@
+tests/cases/conformance/types/typeRelationships/comparable/switchCaseWithIntersectionTypes01.ts(19,10): error TS2678: Type 'number & boolean' is not comparable to type 'string & number'.
+  Type 'number & boolean' is not comparable to type 'string'.
+tests/cases/conformance/types/typeRelationships/comparable/switchCaseWithIntersectionTypes01.ts(23,10): error TS2678: Type 'boolean' is not comparable to type 'string & number'.
+  Type 'boolean' is not comparable to type 'string'.
+
+
+==== tests/cases/conformance/types/typeRelationships/comparable/switchCaseWithIntersectionTypes01.ts (2 errors) ====
+    
+    var strAndNum: string & number;
+    var numAndBool: number & boolean;
+    var str: string;
+    var num: number;
+    var bool: boolean;
+    
+    switch (strAndNum) {
+        // Identical
+        case strAndNum:
+            break;
+    
+        // Constituents
+        case str:
+        case num:
+            break;
+    
+        // Overlap in constituents
+        case numAndBool:
+             ~~~~~~~~~~
+!!! error TS2678: Type 'number & boolean' is not comparable to type 'string & number'.
+!!! error TS2678:   Type 'number & boolean' is not comparable to type 'string'.
+            break;
+    
+        // No relation
+        case bool:
+             ~~~~
+!!! error TS2678: Type 'boolean' is not comparable to type 'string & number'.
+!!! error TS2678:   Type 'boolean' is not comparable to type 'string'.
+            break;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/switchCaseWithIntersectionTypes01.js b/tests/baselines/reference/switchCaseWithIntersectionTypes01.js
new file mode 100644
index 00000000000..4e0ddf7ea76
--- /dev/null
+++ b/tests/baselines/reference/switchCaseWithIntersectionTypes01.js
@@ -0,0 +1,48 @@
+//// [switchCaseWithIntersectionTypes01.ts]
+
+var strAndNum: string & number;
+var numAndBool: number & boolean;
+var str: string;
+var num: number;
+var bool: boolean;
+
+switch (strAndNum) {
+    // Identical
+    case strAndNum:
+        break;
+
+    // Constituents
+    case str:
+    case num:
+        break;
+
+    // Overlap in constituents
+    case numAndBool:
+        break;
+
+    // No relation
+    case bool:
+        break;
+}
+
+//// [switchCaseWithIntersectionTypes01.js]
+var strAndNum;
+var numAndBool;
+var str;
+var num;
+var bool;
+switch (strAndNum) {
+    // Identical
+    case strAndNum:
+        break;
+    // Constituents
+    case str:
+    case num:
+        break;
+    // Overlap in constituents
+    case numAndBool:
+        break;
+    // No relation
+    case bool:
+        break;
+}
diff --git a/tests/baselines/reference/switchCaseWithUnionTypes01.errors.txt b/tests/baselines/reference/switchCaseWithUnionTypes01.errors.txt
new file mode 100644
index 00000000000..5f164f57343
--- /dev/null
+++ b/tests/baselines/reference/switchCaseWithUnionTypes01.errors.txt
@@ -0,0 +1,31 @@
+tests/cases/conformance/types/typeRelationships/comparable/switchCaseWithUnionTypes01.ts(23,10): error TS2678: Type 'boolean' is not comparable to type 'string | number'.
+
+
+==== tests/cases/conformance/types/typeRelationships/comparable/switchCaseWithUnionTypes01.ts (1 errors) ====
+    
+    var strOrNum: string | number;
+    var numOrBool: number | boolean;
+    var str: string;
+    var num: number;
+    var bool: boolean;
+    
+    switch (strOrNum) {
+        // Identical
+        case strOrNum:
+            break;
+    
+        // Constituents
+        case str:
+        case num:
+            break;
+    
+        // Overlap in constituents
+        case numOrBool:
+            break;
+    
+        // No relation
+        case bool:
+             ~~~~
+!!! error TS2678: Type 'boolean' is not comparable to type 'string | number'.
+            break;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/switchCaseWithUnionTypes01.js b/tests/baselines/reference/switchCaseWithUnionTypes01.js
new file mode 100644
index 00000000000..5c34ea674dc
--- /dev/null
+++ b/tests/baselines/reference/switchCaseWithUnionTypes01.js
@@ -0,0 +1,48 @@
+//// [switchCaseWithUnionTypes01.ts]
+
+var strOrNum: string | number;
+var numOrBool: number | boolean;
+var str: string;
+var num: number;
+var bool: boolean;
+
+switch (strOrNum) {
+    // Identical
+    case strOrNum:
+        break;
+
+    // Constituents
+    case str:
+    case num:
+        break;
+
+    // Overlap in constituents
+    case numOrBool:
+        break;
+
+    // No relation
+    case bool:
+        break;
+}
+
+//// [switchCaseWithUnionTypes01.js]
+var strOrNum;
+var numOrBool;
+var str;
+var num;
+var bool;
+switch (strOrNum) {
+    // Identical
+    case strOrNum:
+        break;
+    // Constituents
+    case str:
+    case num:
+        break;
+    // Overlap in constituents
+    case numOrBool:
+        break;
+    // No relation
+    case bool:
+        break;
+}
diff --git a/tests/baselines/reference/switchCasesExpressionTypeMismatch.errors.txt b/tests/baselines/reference/switchCasesExpressionTypeMismatch.errors.txt
index de739af007d..26d39efef48 100644
--- a/tests/baselines/reference/switchCasesExpressionTypeMismatch.errors.txt
+++ b/tests/baselines/reference/switchCasesExpressionTypeMismatch.errors.txt
@@ -1,6 +1,6 @@
-tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(4,10): error TS2322: Type 'typeof Foo' is not assignable to type 'number'.
-tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(5,10): error TS2322: Type 'string' is not assignable to type 'number'.
-tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(7,10): error TS2322: Type 'boolean' is not assignable to type 'number'.
+tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(4,10): error TS2678: Type 'typeof Foo' is not comparable to type 'number'.
+tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(5,10): error TS2678: Type 'string' is not comparable to type 'number'.
+tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(7,10): error TS2678: Type 'boolean' is not comparable to type 'number'.
 
 
 ==== tests/cases/compiler/switchCasesExpressionTypeMismatch.ts (3 errors) ====
@@ -9,14 +9,14 @@ tests/cases/compiler/switchCasesExpressionTypeMismatch.ts(7,10): error TS2322: T
     switch (0) {
         case Foo: break;    // Error
              ~~~
-!!! error TS2322: Type 'typeof Foo' is not assignable to type 'number'.
+!!! error TS2678: Type 'typeof Foo' is not comparable to type 'number'.
         case "sss": break;  // Error
              ~~~~~
-!!! error TS2322: Type 'string' is not assignable to type 'number'.
+!!! error TS2678: Type 'string' is not comparable to type 'number'.
         case 123: break;    // No Error
         case true: break;   // Error
              ~~~~
-!!! error TS2322: Type 'boolean' is not assignable to type 'number'.
+!!! error TS2678: Type 'boolean' is not comparable to type 'number'.
     }
     
     var s: any = 0;
diff --git a/tests/baselines/reference/switchStatements.errors.txt b/tests/baselines/reference/switchStatements.errors.txt
index c99b0eba909..81e24aa69a8 100644
--- a/tests/baselines/reference/switchStatements.errors.txt
+++ b/tests/baselines/reference/switchStatements.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/statements/switchStatements/switchStatements.ts(35,20): error TS2322: Type '{ id: number; name: string; }' is not assignable to type 'C'.
+tests/cases/conformance/statements/switchStatements/switchStatements.ts(35,20): error TS2678: Type '{ id: number; name: string; }' is not comparable to type 'C'.
   Object literal may only specify known properties, and 'name' does not exist in type 'C'.
 
 
@@ -39,8 +39,8 @@ tests/cases/conformance/statements/switchStatements/switchStatements.ts(35,20):
         case new D():
         case { id: 12, name: '' }:
                        ~~~~~~~~
-!!! error TS2322: Type '{ id: number; name: string; }' is not assignable to type 'C'.
-!!! error TS2322:   Object literal may only specify known properties, and 'name' does not exist in type 'C'.
+!!! error TS2678: Type '{ id: number; name: string; }' is not comparable to type 'C'.
+!!! error TS2678:   Object literal may only specify known properties, and 'name' does not exist in type 'C'.
         case new C():
     }
     
diff --git a/tests/baselines/reference/symbolDeclarationEmit1.symbols b/tests/baselines/reference/symbolDeclarationEmit1.symbols
index 0b1999cf606..86f57e7de92 100644
--- a/tests/baselines/reference/symbolDeclarationEmit1.symbols
+++ b/tests/baselines/reference/symbolDeclarationEmit1.symbols
@@ -3,7 +3,7 @@ class C {
 >C : Symbol(C, Decl(symbolDeclarationEmit1.ts, 0, 0))
 
     [Symbol.toPrimitive]: number;
->Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
+>Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/symbolDeclarationEmit10.symbols b/tests/baselines/reference/symbolDeclarationEmit10.symbols
index 7d7cbf257df..bcc562e478e 100644
--- a/tests/baselines/reference/symbolDeclarationEmit10.symbols
+++ b/tests/baselines/reference/symbolDeclarationEmit10.symbols
@@ -3,13 +3,13 @@ var obj = {
 >obj : Symbol(obj, Decl(symbolDeclarationEmit10.ts, 0, 3))
 
     get [Symbol.isConcatSpreadable]() { return '' },
->Symbol.isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.d.ts, --, --))
+>Symbol.isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
     set [Symbol.isConcatSpreadable](x) { }
->Symbol.isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.d.ts, --, --))
+>Symbol.isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >x : Symbol(x, Decl(symbolDeclarationEmit10.ts, 2, 36))
 }
diff --git a/tests/baselines/reference/symbolDeclarationEmit11.symbols b/tests/baselines/reference/symbolDeclarationEmit11.symbols
index a8b9ab0757d..485bb58fb2a 100644
--- a/tests/baselines/reference/symbolDeclarationEmit11.symbols
+++ b/tests/baselines/reference/symbolDeclarationEmit11.symbols
@@ -3,23 +3,23 @@ class C {
 >C : Symbol(C, Decl(symbolDeclarationEmit11.ts, 0, 0))
 
     static [Symbol.iterator] = 0;
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
     static [Symbol.isConcatSpreadable]() { }
->Symbol.isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.d.ts, --, --))
+>Symbol.isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
     static get [Symbol.toPrimitive]() { return ""; }
->Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
+>Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
     static set [Symbol.toPrimitive](x) { }
->Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
+>Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >x : Symbol(x, Decl(symbolDeclarationEmit11.ts, 4, 36))
 }
diff --git a/tests/baselines/reference/symbolDeclarationEmit13.symbols b/tests/baselines/reference/symbolDeclarationEmit13.symbols
index 9ac140cbcc4..b0884c44cb8 100644
--- a/tests/baselines/reference/symbolDeclarationEmit13.symbols
+++ b/tests/baselines/reference/symbolDeclarationEmit13.symbols
@@ -3,13 +3,13 @@ class C {
 >C : Symbol(C, Decl(symbolDeclarationEmit13.ts, 0, 0))
 
     get [Symbol.toPrimitive]() { return ""; }
->Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
+>Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
     set [Symbol.toStringTag](x) { }
->Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
+>Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >x : Symbol(x, Decl(symbolDeclarationEmit13.ts, 2, 29))
 }
diff --git a/tests/baselines/reference/symbolDeclarationEmit14.symbols b/tests/baselines/reference/symbolDeclarationEmit14.symbols
index 4ee1d1d2ebd..e20e3348309 100644
--- a/tests/baselines/reference/symbolDeclarationEmit14.symbols
+++ b/tests/baselines/reference/symbolDeclarationEmit14.symbols
@@ -3,12 +3,12 @@ class C {
 >C : Symbol(C, Decl(symbolDeclarationEmit14.ts, 0, 0))
 
     get [Symbol.toPrimitive]() { return ""; }
->Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
+>Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
     get [Symbol.toStringTag]() { return ""; }
->Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
+>Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/symbolDeclarationEmit2.symbols b/tests/baselines/reference/symbolDeclarationEmit2.symbols
index f3d7253f1af..348760f0d7d 100644
--- a/tests/baselines/reference/symbolDeclarationEmit2.symbols
+++ b/tests/baselines/reference/symbolDeclarationEmit2.symbols
@@ -3,7 +3,7 @@ class C {
 >C : Symbol(C, Decl(symbolDeclarationEmit2.ts, 0, 0))
 
     [Symbol.toPrimitive] = "";
->Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
+>Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/symbolDeclarationEmit3.symbols b/tests/baselines/reference/symbolDeclarationEmit3.symbols
index 4a75ecac742..5bb8d67984e 100644
--- a/tests/baselines/reference/symbolDeclarationEmit3.symbols
+++ b/tests/baselines/reference/symbolDeclarationEmit3.symbols
@@ -3,20 +3,20 @@ class C {
 >C : Symbol(C, Decl(symbolDeclarationEmit3.ts, 0, 0))
 
     [Symbol.toPrimitive](x: number);
->Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
+>Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >x : Symbol(x, Decl(symbolDeclarationEmit3.ts, 1, 25))
 
     [Symbol.toPrimitive](x: string);
->Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
+>Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >x : Symbol(x, Decl(symbolDeclarationEmit3.ts, 2, 25))
 
     [Symbol.toPrimitive](x: any) { }
->Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
+>Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >x : Symbol(x, Decl(symbolDeclarationEmit3.ts, 3, 25))
 }
diff --git a/tests/baselines/reference/symbolDeclarationEmit4.symbols b/tests/baselines/reference/symbolDeclarationEmit4.symbols
index eec0912d6ee..89a4714f941 100644
--- a/tests/baselines/reference/symbolDeclarationEmit4.symbols
+++ b/tests/baselines/reference/symbolDeclarationEmit4.symbols
@@ -3,13 +3,13 @@ class C {
 >C : Symbol(C, Decl(symbolDeclarationEmit4.ts, 0, 0))
 
     get [Symbol.toPrimitive]() { return ""; }
->Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
+>Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
     set [Symbol.toPrimitive](x) { }
->Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
+>Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >x : Symbol(x, Decl(symbolDeclarationEmit4.ts, 2, 29))
 }
diff --git a/tests/baselines/reference/symbolDeclarationEmit5.symbols b/tests/baselines/reference/symbolDeclarationEmit5.symbols
index e9ee78e4a7d..bd1049b4e00 100644
--- a/tests/baselines/reference/symbolDeclarationEmit5.symbols
+++ b/tests/baselines/reference/symbolDeclarationEmit5.symbols
@@ -3,7 +3,7 @@ interface I {
 >I : Symbol(I, Decl(symbolDeclarationEmit5.ts, 0, 0))
 
     [Symbol.isConcatSpreadable](): string;
->Symbol.isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.d.ts, --, --))
+>Symbol.isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/symbolDeclarationEmit6.symbols b/tests/baselines/reference/symbolDeclarationEmit6.symbols
index 64da887014c..19b86ff2b66 100644
--- a/tests/baselines/reference/symbolDeclarationEmit6.symbols
+++ b/tests/baselines/reference/symbolDeclarationEmit6.symbols
@@ -3,7 +3,7 @@ interface I {
 >I : Symbol(I, Decl(symbolDeclarationEmit6.ts, 0, 0))
 
     [Symbol.isConcatSpreadable]: string;
->Symbol.isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.d.ts, --, --))
+>Symbol.isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/symbolDeclarationEmit7.symbols b/tests/baselines/reference/symbolDeclarationEmit7.symbols
index 3bfaee5316c..2cf42a5c5cc 100644
--- a/tests/baselines/reference/symbolDeclarationEmit7.symbols
+++ b/tests/baselines/reference/symbolDeclarationEmit7.symbols
@@ -3,7 +3,7 @@ var obj: {
 >obj : Symbol(obj, Decl(symbolDeclarationEmit7.ts, 0, 3))
 
     [Symbol.isConcatSpreadable]: string;
->Symbol.isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.d.ts, --, --))
+>Symbol.isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/symbolDeclarationEmit8.symbols b/tests/baselines/reference/symbolDeclarationEmit8.symbols
index 9eead633343..bb6c4728a08 100644
--- a/tests/baselines/reference/symbolDeclarationEmit8.symbols
+++ b/tests/baselines/reference/symbolDeclarationEmit8.symbols
@@ -3,7 +3,7 @@ var obj = {
 >obj : Symbol(obj, Decl(symbolDeclarationEmit8.ts, 0, 3))
 
     [Symbol.isConcatSpreadable]: 0
->Symbol.isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.d.ts, --, --))
+>Symbol.isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/symbolDeclarationEmit9.symbols b/tests/baselines/reference/symbolDeclarationEmit9.symbols
index ec49c196d02..60fdbf63c95 100644
--- a/tests/baselines/reference/symbolDeclarationEmit9.symbols
+++ b/tests/baselines/reference/symbolDeclarationEmit9.symbols
@@ -3,7 +3,7 @@ var obj = {
 >obj : Symbol(obj, Decl(symbolDeclarationEmit9.ts, 0, 3))
 
     [Symbol.isConcatSpreadable]() { }
->Symbol.isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.d.ts, --, --))
+>Symbol.isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>isConcatSpreadable : Symbol(SymbolConstructor.isConcatSpreadable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/symbolProperty1.types b/tests/baselines/reference/symbolProperty1.types
index f39d98853d2..667e51fda8a 100644
--- a/tests/baselines/reference/symbolProperty1.types
+++ b/tests/baselines/reference/symbolProperty1.types
@@ -3,8 +3,8 @@ var s: symbol;
 >s : symbol
 
 var x = {
->x : {}
->{    [s]: 0,    [s]() { },    get [s]() {        return 0;    }} : {}
+>x : { [x: string]: number | (() => void); }
+>{    [s]: 0,    [s]() { },    get [s]() {        return 0;    }} : { [x: string]: number | (() => void); }
 
     [s]: 0,
 >s : symbol
diff --git a/tests/baselines/reference/symbolProperty11.symbols b/tests/baselines/reference/symbolProperty11.symbols
index b064d11b9de..2b9c912bc14 100644
--- a/tests/baselines/reference/symbolProperty11.symbols
+++ b/tests/baselines/reference/symbolProperty11.symbols
@@ -6,9 +6,9 @@ interface I {
 >I : Symbol(I, Decl(symbolProperty11.ts, 0, 11))
 
     [Symbol.iterator]?: { x };
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >x : Symbol(x, Decl(symbolProperty11.ts, 2, 25))
 }
 
diff --git a/tests/baselines/reference/symbolProperty13.symbols b/tests/baselines/reference/symbolProperty13.symbols
index a48f02fdacf..9b9b17baf51 100644
--- a/tests/baselines/reference/symbolProperty13.symbols
+++ b/tests/baselines/reference/symbolProperty13.symbols
@@ -3,9 +3,9 @@ class C {
 >C : Symbol(C, Decl(symbolProperty13.ts, 0, 0))
 
     [Symbol.iterator]: { x; y };
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >x : Symbol(x, Decl(symbolProperty13.ts, 1, 24))
 >y : Symbol(y, Decl(symbolProperty13.ts, 1, 27))
 }
@@ -13,9 +13,9 @@ interface I {
 >I : Symbol(I, Decl(symbolProperty13.ts, 2, 1))
 
     [Symbol.iterator]: { x };
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >x : Symbol(x, Decl(symbolProperty13.ts, 4, 24))
 }
 
diff --git a/tests/baselines/reference/symbolProperty14.symbols b/tests/baselines/reference/symbolProperty14.symbols
index 459b2699e42..4a995d3311d 100644
--- a/tests/baselines/reference/symbolProperty14.symbols
+++ b/tests/baselines/reference/symbolProperty14.symbols
@@ -3,9 +3,9 @@ class C {
 >C : Symbol(C, Decl(symbolProperty14.ts, 0, 0))
 
     [Symbol.iterator]: { x; y };
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >x : Symbol(x, Decl(symbolProperty14.ts, 1, 24))
 >y : Symbol(y, Decl(symbolProperty14.ts, 1, 27))
 }
@@ -13,9 +13,9 @@ interface I {
 >I : Symbol(I, Decl(symbolProperty14.ts, 2, 1))
 
     [Symbol.iterator]?: { x };
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >x : Symbol(x, Decl(symbolProperty14.ts, 4, 25))
 }
 
diff --git a/tests/baselines/reference/symbolProperty15.symbols b/tests/baselines/reference/symbolProperty15.symbols
index 83a3f4630fe..3685a2971f8 100644
--- a/tests/baselines/reference/symbolProperty15.symbols
+++ b/tests/baselines/reference/symbolProperty15.symbols
@@ -6,9 +6,9 @@ interface I {
 >I : Symbol(I, Decl(symbolProperty15.ts, 0, 11))
 
     [Symbol.iterator]?: { x };
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >x : Symbol(x, Decl(symbolProperty15.ts, 2, 25))
 }
 
diff --git a/tests/baselines/reference/symbolProperty16.symbols b/tests/baselines/reference/symbolProperty16.symbols
index d54002167a1..4147b23d4ff 100644
--- a/tests/baselines/reference/symbolProperty16.symbols
+++ b/tests/baselines/reference/symbolProperty16.symbols
@@ -3,18 +3,18 @@ class C {
 >C : Symbol(C, Decl(symbolProperty16.ts, 0, 0))
 
     private [Symbol.iterator]: { x };
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >x : Symbol(x, Decl(symbolProperty16.ts, 1, 32))
 }
 interface I {
 >I : Symbol(I, Decl(symbolProperty16.ts, 2, 1))
 
     [Symbol.iterator]: { x };
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >x : Symbol(x, Decl(symbolProperty16.ts, 4, 24))
 }
 
diff --git a/tests/baselines/reference/symbolProperty18.symbols b/tests/baselines/reference/symbolProperty18.symbols
index 8f863572639..5e79c460fc8 100644
--- a/tests/baselines/reference/symbolProperty18.symbols
+++ b/tests/baselines/reference/symbolProperty18.symbols
@@ -3,39 +3,39 @@ var i = {
 >i : Symbol(i, Decl(symbolProperty18.ts, 0, 3))
 
     [Symbol.iterator]: 0,
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
     [Symbol.toStringTag]() { return "" },
->Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
+>Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
     set [Symbol.toPrimitive](p: boolean) { }
->Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
+>Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >p : Symbol(p, Decl(symbolProperty18.ts, 3, 29))
 }
 
 var it = i[Symbol.iterator];
 >it : Symbol(it, Decl(symbolProperty18.ts, 6, 3))
 >i : Symbol(i, Decl(symbolProperty18.ts, 0, 3))
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 var str = i[Symbol.toStringTag]();
 >str : Symbol(str, Decl(symbolProperty18.ts, 7, 3))
 >i : Symbol(i, Decl(symbolProperty18.ts, 0, 3))
->Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
+>Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 i[Symbol.toPrimitive] = false;
 >i : Symbol(i, Decl(symbolProperty18.ts, 0, 3))
->Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
+>Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
diff --git a/tests/baselines/reference/symbolProperty19.symbols b/tests/baselines/reference/symbolProperty19.symbols
index a2c7dd7dcfd..1e50924524d 100644
--- a/tests/baselines/reference/symbolProperty19.symbols
+++ b/tests/baselines/reference/symbolProperty19.symbols
@@ -3,15 +3,15 @@ var i = {
 >i : Symbol(i, Decl(symbolProperty19.ts, 0, 3))
 
     [Symbol.iterator]: { p: null },
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >p : Symbol(p, Decl(symbolProperty19.ts, 1, 24))
 
     [Symbol.toStringTag]() { return { p: undefined }; }
->Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
+>Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >p : Symbol(p, Decl(symbolProperty19.ts, 2, 37))
 >undefined : Symbol(undefined)
 }
@@ -19,14 +19,14 @@ var i = {
 var it = i[Symbol.iterator];
 >it : Symbol(it, Decl(symbolProperty19.ts, 5, 3))
 >i : Symbol(i, Decl(symbolProperty19.ts, 0, 3))
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 var str = i[Symbol.toStringTag]();
 >str : Symbol(str, Decl(symbolProperty19.ts, 6, 3))
 >i : Symbol(i, Decl(symbolProperty19.ts, 0, 3))
->Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
+>Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
diff --git a/tests/baselines/reference/symbolProperty2.symbols b/tests/baselines/reference/symbolProperty2.symbols
index a9bc4a440e0..90cb47c0011 100644
--- a/tests/baselines/reference/symbolProperty2.symbols
+++ b/tests/baselines/reference/symbolProperty2.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/Symbols/symbolProperty2.ts ===
 var s = Symbol();
 >s : Symbol(s, Decl(symbolProperty2.ts, 0, 3))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
 
 var x = {
 >x : Symbol(x, Decl(symbolProperty2.ts, 1, 3))
diff --git a/tests/baselines/reference/symbolProperty2.types b/tests/baselines/reference/symbolProperty2.types
index df49130520a..7584c6461e8 100644
--- a/tests/baselines/reference/symbolProperty2.types
+++ b/tests/baselines/reference/symbolProperty2.types
@@ -5,8 +5,8 @@ var s = Symbol();
 >Symbol : SymbolConstructor
 
 var x = {
->x : {}
->{    [s]: 0,    [s]() { },    get [s]() {        return 0;    }} : {}
+>x : { [x: string]: number | (() => void); }
+>{    [s]: 0,    [s]() { },    get [s]() {        return 0;    }} : { [x: string]: number | (() => void); }
 
     [s]: 0,
 >s : symbol
diff --git a/tests/baselines/reference/symbolProperty20.symbols b/tests/baselines/reference/symbolProperty20.symbols
index 97bb4164c2f..e40abe03277 100644
--- a/tests/baselines/reference/symbolProperty20.symbols
+++ b/tests/baselines/reference/symbolProperty20.symbols
@@ -3,15 +3,15 @@ interface I {
 >I : Symbol(I, Decl(symbolProperty20.ts, 0, 0))
 
     [Symbol.iterator]: (s: string) => string;
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >s : Symbol(s, Decl(symbolProperty20.ts, 1, 24))
 
     [Symbol.toStringTag](s: number): number;
->Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
+>Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >s : Symbol(s, Decl(symbolProperty20.ts, 2, 25))
 }
 
@@ -20,16 +20,16 @@ var i: I = {
 >I : Symbol(I, Decl(symbolProperty20.ts, 0, 0))
 
     [Symbol.iterator]: s => s,
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >s : Symbol(s, Decl(symbolProperty20.ts, 6, 22))
 >s : Symbol(s, Decl(symbolProperty20.ts, 6, 22))
 
     [Symbol.toStringTag](n) { return n; }
->Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
+>Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >n : Symbol(n, Decl(symbolProperty20.ts, 7, 25))
 >n : Symbol(n, Decl(symbolProperty20.ts, 7, 25))
 }
diff --git a/tests/baselines/reference/symbolProperty22.symbols b/tests/baselines/reference/symbolProperty22.symbols
index 1d7f46fa897..e4e68d81970 100644
--- a/tests/baselines/reference/symbolProperty22.symbols
+++ b/tests/baselines/reference/symbolProperty22.symbols
@@ -5,9 +5,9 @@ interface I<T, U> {
 >U : Symbol(U, Decl(symbolProperty22.ts, 0, 14))
 
     [Symbol.unscopables](x: T): U;
->Symbol.unscopables : Symbol(SymbolConstructor.unscopables, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->unscopables : Symbol(SymbolConstructor.unscopables, Decl(lib.d.ts, --, --))
+>Symbol.unscopables : Symbol(SymbolConstructor.unscopables, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>unscopables : Symbol(SymbolConstructor.unscopables, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >x : Symbol(x, Decl(symbolProperty22.ts, 1, 25))
 >T : Symbol(T, Decl(symbolProperty22.ts, 0, 12))
 >U : Symbol(U, Decl(symbolProperty22.ts, 0, 14))
@@ -27,11 +27,11 @@ declare function foo<T, U>(p1: T, p2: I<T, U>): U;
 
 foo("", { [Symbol.unscopables]: s => s.length });
 >foo : Symbol(foo, Decl(symbolProperty22.ts, 2, 1))
->Symbol.unscopables : Symbol(SymbolConstructor.unscopables, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->unscopables : Symbol(SymbolConstructor.unscopables, Decl(lib.d.ts, --, --))
+>Symbol.unscopables : Symbol(SymbolConstructor.unscopables, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>unscopables : Symbol(SymbolConstructor.unscopables, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >s : Symbol(s, Decl(symbolProperty22.ts, 6, 31))
->s.length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>s.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 >s : Symbol(s, Decl(symbolProperty22.ts, 6, 31))
->length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 
diff --git a/tests/baselines/reference/symbolProperty23.symbols b/tests/baselines/reference/symbolProperty23.symbols
index 06fce65875c..714b76fa85b 100644
--- a/tests/baselines/reference/symbolProperty23.symbols
+++ b/tests/baselines/reference/symbolProperty23.symbols
@@ -3,9 +3,9 @@ interface I {
 >I : Symbol(I, Decl(symbolProperty23.ts, 0, 0))
 
     [Symbol.toPrimitive]: () => boolean;
->Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
+>Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 }
 
 class C implements I {
@@ -13,9 +13,9 @@ class C implements I {
 >I : Symbol(I, Decl(symbolProperty23.ts, 0, 0))
 
     [Symbol.toPrimitive]() {
->Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
+>Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return true;
     }
diff --git a/tests/baselines/reference/symbolProperty26.symbols b/tests/baselines/reference/symbolProperty26.symbols
index ae8f95d5859..785a2e395cb 100644
--- a/tests/baselines/reference/symbolProperty26.symbols
+++ b/tests/baselines/reference/symbolProperty26.symbols
@@ -3,9 +3,9 @@ class C1 {
 >C1 : Symbol(C1, Decl(symbolProperty26.ts, 0, 0))
 
     [Symbol.toStringTag]() {
->Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
+>Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return "";
     }
@@ -16,9 +16,9 @@ class C2 extends C1 {
 >C1 : Symbol(C1, Decl(symbolProperty26.ts, 0, 0))
 
     [Symbol.toStringTag]() {
->Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
+>Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return "";
     }
diff --git a/tests/baselines/reference/symbolProperty27.symbols b/tests/baselines/reference/symbolProperty27.symbols
index d5fcf7ec224..1b050b617c2 100644
--- a/tests/baselines/reference/symbolProperty27.symbols
+++ b/tests/baselines/reference/symbolProperty27.symbols
@@ -3,9 +3,9 @@ class C1 {
 >C1 : Symbol(C1, Decl(symbolProperty27.ts, 0, 0))
 
     [Symbol.toStringTag]() {
->Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
+>Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return {};
     }
@@ -16,9 +16,9 @@ class C2 extends C1 {
 >C1 : Symbol(C1, Decl(symbolProperty27.ts, 0, 0))
 
     [Symbol.toStringTag]() {
->Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
+>Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return "";
     }
diff --git a/tests/baselines/reference/symbolProperty28.symbols b/tests/baselines/reference/symbolProperty28.symbols
index d8c9daba0d9..c72de5fefb5 100644
--- a/tests/baselines/reference/symbolProperty28.symbols
+++ b/tests/baselines/reference/symbolProperty28.symbols
@@ -3,9 +3,9 @@ class C1 {
 >C1 : Symbol(C1, Decl(symbolProperty28.ts, 0, 0))
 
     [Symbol.toStringTag]() {
->Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
+>Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return { x: "" };
 >x : Symbol(x, Decl(symbolProperty28.ts, 2, 16))
@@ -24,8 +24,8 @@ var obj = c[Symbol.toStringTag]().x;
 >obj : Symbol(obj, Decl(symbolProperty28.ts, 9, 3))
 >c[Symbol.toStringTag]().x : Symbol(x, Decl(symbolProperty28.ts, 2, 16))
 >c : Symbol(c, Decl(symbolProperty28.ts, 8, 3))
->Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
+>Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >x : Symbol(x, Decl(symbolProperty28.ts, 2, 16))
 
diff --git a/tests/baselines/reference/symbolProperty4.symbols b/tests/baselines/reference/symbolProperty4.symbols
index 7817a7c6fd0..c1f7c82de7d 100644
--- a/tests/baselines/reference/symbolProperty4.symbols
+++ b/tests/baselines/reference/symbolProperty4.symbols
@@ -3,13 +3,13 @@ var x = {
 >x : Symbol(x, Decl(symbolProperty4.ts, 0, 3))
 
     [Symbol()]: 0,
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
 
     [Symbol()]() { },
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
 
     get [Symbol()]() {
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
 
         return 0;
     }
diff --git a/tests/baselines/reference/symbolProperty4.types b/tests/baselines/reference/symbolProperty4.types
index 93b4417b8ae..7bcf3f23397 100644
--- a/tests/baselines/reference/symbolProperty4.types
+++ b/tests/baselines/reference/symbolProperty4.types
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/Symbols/symbolProperty4.ts ===
 var x = {
->x : {}
->{    [Symbol()]: 0,    [Symbol()]() { },    get [Symbol()]() {        return 0;    }} : {}
+>x : { [x: string]: number | (() => void); }
+>{    [Symbol()]: 0,    [Symbol()]() { },    get [Symbol()]() {        return 0;    }} : { [x: string]: number | (() => void); }
 
     [Symbol()]: 0,
 >Symbol() : symbol
diff --git a/tests/baselines/reference/symbolProperty40.symbols b/tests/baselines/reference/symbolProperty40.symbols
index 26a5dc36ed5..a572c380d13 100644
--- a/tests/baselines/reference/symbolProperty40.symbols
+++ b/tests/baselines/reference/symbolProperty40.symbols
@@ -3,21 +3,21 @@ class C {
 >C : Symbol(C, Decl(symbolProperty40.ts, 0, 0))
 
     [Symbol.iterator](x: string): string;
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >x : Symbol(x, Decl(symbolProperty40.ts, 1, 22))
 
     [Symbol.iterator](x: number): number;
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >x : Symbol(x, Decl(symbolProperty40.ts, 2, 22))
 
     [Symbol.iterator](x: any) {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >x : Symbol(x, Decl(symbolProperty40.ts, 3, 22))
 
         return undefined;
@@ -31,13 +31,13 @@ var c = new C;
 
 c[Symbol.iterator]("");
 >c : Symbol(c, Decl(symbolProperty40.ts, 8, 3))
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 c[Symbol.iterator](0);
 >c : Symbol(c, Decl(symbolProperty40.ts, 8, 3))
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
diff --git a/tests/baselines/reference/symbolProperty41.symbols b/tests/baselines/reference/symbolProperty41.symbols
index 7db66e5862e..82174ce2e0e 100644
--- a/tests/baselines/reference/symbolProperty41.symbols
+++ b/tests/baselines/reference/symbolProperty41.symbols
@@ -3,24 +3,24 @@ class C {
 >C : Symbol(C, Decl(symbolProperty41.ts, 0, 0))
 
     [Symbol.iterator](x: string): { x: string };
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >x : Symbol(x, Decl(symbolProperty41.ts, 1, 22))
 >x : Symbol(x, Decl(symbolProperty41.ts, 1, 35))
 
     [Symbol.iterator](x: "hello"): { x: string; hello: string };
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >x : Symbol(x, Decl(symbolProperty41.ts, 2, 22))
 >x : Symbol(x, Decl(symbolProperty41.ts, 2, 36))
 >hello : Symbol(hello, Decl(symbolProperty41.ts, 2, 47))
 
     [Symbol.iterator](x: any) {
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >x : Symbol(x, Decl(symbolProperty41.ts, 3, 22))
 
         return undefined;
@@ -34,13 +34,13 @@ var c = new C;
 
 c[Symbol.iterator]("");
 >c : Symbol(c, Decl(symbolProperty41.ts, 8, 3))
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 c[Symbol.iterator]("hello");
 >c : Symbol(c, Decl(symbolProperty41.ts, 8, 3))
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
diff --git a/tests/baselines/reference/symbolProperty45.symbols b/tests/baselines/reference/symbolProperty45.symbols
index 46ecb0a6414..0f42e37c5cf 100644
--- a/tests/baselines/reference/symbolProperty45.symbols
+++ b/tests/baselines/reference/symbolProperty45.symbols
@@ -3,16 +3,16 @@ class C {
 >C : Symbol(C, Decl(symbolProperty45.ts, 0, 0))
 
     get [Symbol.hasInstance]() {
->Symbol.hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.d.ts, --, --))
+>Symbol.hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>hasInstance : Symbol(SymbolConstructor.hasInstance, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return "";
     }
     get [Symbol.toPrimitive]() {
->Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
+>Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return "";
     }
diff --git a/tests/baselines/reference/symbolProperty5.symbols b/tests/baselines/reference/symbolProperty5.symbols
index 00e47c461ee..d8ae4d18940 100644
--- a/tests/baselines/reference/symbolProperty5.symbols
+++ b/tests/baselines/reference/symbolProperty5.symbols
@@ -3,19 +3,19 @@ var x = {
 >x : Symbol(x, Decl(symbolProperty5.ts, 0, 3))
 
     [Symbol.iterator]: 0,
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
     [Symbol.toPrimitive]() { },
->Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
+>Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
     get [Symbol.toStringTag]() {
->Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
+>Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return 0;
     }
diff --git a/tests/baselines/reference/symbolProperty50.symbols b/tests/baselines/reference/symbolProperty50.symbols
index f5197627846..2e51286ffa4 100644
--- a/tests/baselines/reference/symbolProperty50.symbols
+++ b/tests/baselines/reference/symbolProperty50.symbols
@@ -9,8 +9,8 @@ module M {
 >C : Symbol(C, Decl(symbolProperty50.ts, 1, 24))
 
         [Symbol.iterator]() { }
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
     }
 }
diff --git a/tests/baselines/reference/symbolProperty51.symbols b/tests/baselines/reference/symbolProperty51.symbols
index 4be31dd0a56..7cd4870ea32 100644
--- a/tests/baselines/reference/symbolProperty51.symbols
+++ b/tests/baselines/reference/symbolProperty51.symbols
@@ -9,8 +9,8 @@ module M {
 >C : Symbol(C, Decl(symbolProperty51.ts, 1, 21))
 
         [Symbol.iterator]() { }
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
     }
 }
diff --git a/tests/baselines/reference/symbolProperty55.symbols b/tests/baselines/reference/symbolProperty55.symbols
index e6a9c304abe..f7371428e76 100644
--- a/tests/baselines/reference/symbolProperty55.symbols
+++ b/tests/baselines/reference/symbolProperty55.symbols
@@ -3,9 +3,9 @@ var obj = {
 >obj : Symbol(obj, Decl(symbolProperty55.ts, 0, 3))
 
     [Symbol.iterator]: 0
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 };
 
@@ -14,13 +14,13 @@ module M {
 
     var Symbol: SymbolConstructor;
 >Symbol : Symbol(Symbol, Decl(symbolProperty55.ts, 5, 7))
->SymbolConstructor : Symbol(SymbolConstructor, Decl(lib.d.ts, --, --))
+>SymbolConstructor : Symbol(SymbolConstructor, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
 
     // The following should be of type 'any'. This is because even though obj has a property keyed by Symbol.iterator,
     // the key passed in here is the *wrong* Symbol.iterator. It is not the iterator property of the global Symbol.
     obj[Symbol.iterator];
 >obj : Symbol(obj, Decl(symbolProperty55.ts, 0, 3))
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >Symbol : Symbol(Symbol, Decl(symbolProperty55.ts, 5, 7))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/symbolProperty56.symbols b/tests/baselines/reference/symbolProperty56.symbols
index 6ff465daa98..00ca21138fc 100644
--- a/tests/baselines/reference/symbolProperty56.symbols
+++ b/tests/baselines/reference/symbolProperty56.symbols
@@ -3,9 +3,9 @@ var obj = {
 >obj : Symbol(obj, Decl(symbolProperty56.ts, 0, 3))
 
     [Symbol.iterator]: 0
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 };
 
diff --git a/tests/baselines/reference/symbolProperty57.symbols b/tests/baselines/reference/symbolProperty57.symbols
index b256ba651c4..bb4ac0ceef2 100644
--- a/tests/baselines/reference/symbolProperty57.symbols
+++ b/tests/baselines/reference/symbolProperty57.symbols
@@ -3,14 +3,14 @@ var obj = {
 >obj : Symbol(obj, Decl(symbolProperty57.ts, 0, 3))
 
     [Symbol.iterator]: 0
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
 };
 
 // Should give type 'any'.
 obj[Symbol["nonsense"]];
 >obj : Symbol(obj, Decl(symbolProperty57.ts, 0, 3))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
 
diff --git a/tests/baselines/reference/symbolProperty6.symbols b/tests/baselines/reference/symbolProperty6.symbols
index d0eedccf4fa..73c55715a5d 100644
--- a/tests/baselines/reference/symbolProperty6.symbols
+++ b/tests/baselines/reference/symbolProperty6.symbols
@@ -3,24 +3,24 @@ class C {
 >C : Symbol(C, Decl(symbolProperty6.ts, 0, 0))
 
     [Symbol.iterator] = 0;
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
     [Symbol.unscopables]: number;
->Symbol.unscopables : Symbol(SymbolConstructor.unscopables, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->unscopables : Symbol(SymbolConstructor.unscopables, Decl(lib.d.ts, --, --))
+>Symbol.unscopables : Symbol(SymbolConstructor.unscopables, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>unscopables : Symbol(SymbolConstructor.unscopables, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
     [Symbol.toPrimitive]() { }
->Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
+>Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
     get [Symbol.toStringTag]() {
->Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.d.ts, --, --))
+>Symbol.toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toStringTag : Symbol(SymbolConstructor.toStringTag, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
         return 0;
     }
diff --git a/tests/baselines/reference/symbolProperty8.symbols b/tests/baselines/reference/symbolProperty8.symbols
index 8d26d193ef5..e46c35b47be 100644
--- a/tests/baselines/reference/symbolProperty8.symbols
+++ b/tests/baselines/reference/symbolProperty8.symbols
@@ -3,12 +3,12 @@ interface I {
 >I : Symbol(I, Decl(symbolProperty8.ts, 0, 0))
 
     [Symbol.unscopables]: number;
->Symbol.unscopables : Symbol(SymbolConstructor.unscopables, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->unscopables : Symbol(SymbolConstructor.unscopables, Decl(lib.d.ts, --, --))
+>Symbol.unscopables : Symbol(SymbolConstructor.unscopables, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>unscopables : Symbol(SymbolConstructor.unscopables, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
     [Symbol.toPrimitive]();
->Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.d.ts, --, --))
+>Symbol.toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>toPrimitive : Symbol(SymbolConstructor.toPrimitive, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 }
diff --git a/tests/baselines/reference/symbolType11.symbols b/tests/baselines/reference/symbolType11.symbols
index d5c19af7844..3c5fc1b61cc 100644
--- a/tests/baselines/reference/symbolType11.symbols
+++ b/tests/baselines/reference/symbolType11.symbols
@@ -1,9 +1,9 @@
 === tests/cases/conformance/es6/Symbols/symbolType11.ts ===
 var s = Symbol.for("logical");
 >s : Symbol(s, Decl(symbolType11.ts, 0, 3))
->Symbol.for : Symbol(SymbolConstructor.for, Decl(lib.d.ts, --, --))
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->for : Symbol(SymbolConstructor.for, Decl(lib.d.ts, --, --))
+>Symbol.for : Symbol(SymbolConstructor.for, Decl(lib.es2015.symbol.d.ts, --, --))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
+>for : Symbol(SymbolConstructor.for, Decl(lib.es2015.symbol.d.ts, --, --))
 
 s && s;
 >s : Symbol(s, Decl(symbolType11.ts, 0, 3))
diff --git a/tests/baselines/reference/symbolType16.symbols b/tests/baselines/reference/symbolType16.symbols
index a31a4e5c677..3e5fb6e2157 100644
--- a/tests/baselines/reference/symbolType16.symbols
+++ b/tests/baselines/reference/symbolType16.symbols
@@ -1,9 +1,9 @@
 === tests/cases/conformance/es6/Symbols/symbolType16.ts ===
 interface Symbol {
->Symbol : Symbol(Symbol, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(symbolType16.ts, 0, 0))
+>Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(symbolType16.ts, 0, 0))
 
     newSymbolProp: number;
->newSymbolProp : Symbol(newSymbolProp, Decl(symbolType16.ts, 0, 18))
+>newSymbolProp : Symbol(Symbol.newSymbolProp, Decl(symbolType16.ts, 0, 18))
 }
 
 var sym: symbol;
diff --git a/tests/baselines/reference/symbolType17.symbols b/tests/baselines/reference/symbolType17.symbols
index fe77cb8d6b3..0f1ccc0e83a 100644
--- a/tests/baselines/reference/symbolType17.symbols
+++ b/tests/baselines/reference/symbolType17.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/Symbols/symbolType17.ts ===
 interface Foo { prop }
 >Foo : Symbol(Foo, Decl(symbolType17.ts, 0, 0))
->prop : Symbol(prop, Decl(symbolType17.ts, 0, 15))
+>prop : Symbol(Foo.prop, Decl(symbolType17.ts, 0, 15))
 
 var x: symbol | Foo;
 >x : Symbol(x, Decl(symbolType17.ts, 1, 3))
diff --git a/tests/baselines/reference/symbolType18.symbols b/tests/baselines/reference/symbolType18.symbols
index d2121672b71..9dc8c824a85 100644
--- a/tests/baselines/reference/symbolType18.symbols
+++ b/tests/baselines/reference/symbolType18.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/es6/Symbols/symbolType18.ts ===
 interface Foo { prop }
 >Foo : Symbol(Foo, Decl(symbolType18.ts, 0, 0))
->prop : Symbol(prop, Decl(symbolType18.ts, 0, 15))
+>prop : Symbol(Foo.prop, Decl(symbolType18.ts, 0, 15))
 
 var x: symbol | Foo;
 >x : Symbol(x, Decl(symbolType18.ts, 1, 3))
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
new file mode 100644
index 00000000000..a049ea78395
--- /dev/null
+++ b/tests/baselines/reference/systemModuleTargetES6.js
@@ -0,0 +1,42 @@
+//// [systemModuleTargetES6.ts]
+export class MyClass { }
+export class MyClass2 {
+    static value = 42;
+    static getInstance() { return MyClass2.value; }
+}
+
+export function myFunction() {
+    return new MyClass();
+}
+
+export function myFunction2() {
+    return new MyClass2();
+}
+
+//// [systemModuleTargetES6.js]
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var __moduleName = context_1 && context_1.id;
+    function myFunction() {
+        return new MyClass();
+    }
+    function myFunction2() {
+        return new MyClass2();
+    }
+    var MyClass, MyClass2;
+    exports_1("myFunction", myFunction);
+    exports_1("myFunction2", myFunction2);
+    return {
+        setters: [],
+        execute: function () {
+            MyClass = class MyClass {
+            };
+            exports_1("MyClass", MyClass);
+            MyClass2 = class MyClass2 {
+                static getInstance() { return MyClass2.value; }
+            };
+            exports_1("MyClass2", MyClass2);
+            MyClass2.value = 42;
+        }
+    };
+});
diff --git a/tests/baselines/reference/systemModuleTargetES6.symbols b/tests/baselines/reference/systemModuleTargetES6.symbols
new file mode 100644
index 00000000000..afb217c0c0a
--- /dev/null
+++ b/tests/baselines/reference/systemModuleTargetES6.symbols
@@ -0,0 +1,30 @@
+=== tests/cases/compiler/systemModuleTargetES6.ts ===
+export class MyClass { }
+>MyClass : Symbol(MyClass, Decl(systemModuleTargetES6.ts, 0, 0))
+
+export class MyClass2 {
+>MyClass2 : Symbol(MyClass2, Decl(systemModuleTargetES6.ts, 0, 24))
+
+    static value = 42;
+>value : Symbol(MyClass2.value, Decl(systemModuleTargetES6.ts, 1, 23))
+
+    static getInstance() { return MyClass2.value; }
+>getInstance : Symbol(MyClass2.getInstance, Decl(systemModuleTargetES6.ts, 2, 22))
+>MyClass2.value : Symbol(MyClass2.value, Decl(systemModuleTargetES6.ts, 1, 23))
+>MyClass2 : Symbol(MyClass2, Decl(systemModuleTargetES6.ts, 0, 24))
+>value : Symbol(MyClass2.value, Decl(systemModuleTargetES6.ts, 1, 23))
+}
+
+export function myFunction() {
+>myFunction : Symbol(myFunction, Decl(systemModuleTargetES6.ts, 4, 1))
+
+    return new MyClass();
+>MyClass : Symbol(MyClass, Decl(systemModuleTargetES6.ts, 0, 0))
+}
+
+export function myFunction2() {
+>myFunction2 : Symbol(myFunction2, Decl(systemModuleTargetES6.ts, 8, 1))
+
+    return new MyClass2();
+>MyClass2 : Symbol(MyClass2, Decl(systemModuleTargetES6.ts, 0, 24))
+}
diff --git a/tests/baselines/reference/systemModuleTargetES6.types b/tests/baselines/reference/systemModuleTargetES6.types
new file mode 100644
index 00000000000..5a9801a5d89
--- /dev/null
+++ b/tests/baselines/reference/systemModuleTargetES6.types
@@ -0,0 +1,33 @@
+=== tests/cases/compiler/systemModuleTargetES6.ts ===
+export class MyClass { }
+>MyClass : MyClass
+
+export class MyClass2 {
+>MyClass2 : MyClass2
+
+    static value = 42;
+>value : number
+>42 : number
+
+    static getInstance() { return MyClass2.value; }
+>getInstance : () => number
+>MyClass2.value : number
+>MyClass2 : typeof MyClass2
+>value : number
+}
+
+export function myFunction() {
+>myFunction : () => MyClass
+
+    return new MyClass();
+>new MyClass() : MyClass
+>MyClass : typeof MyClass
+}
+
+export function myFunction2() {
+>myFunction2 : () => MyClass2
+
+    return new MyClass2();
+>new MyClass2() : MyClass2
+>MyClass2 : typeof MyClass2
+}
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/systemModuleWithSuperClass.symbols b/tests/baselines/reference/systemModuleWithSuperClass.symbols
index 46354333479..415e7d1e99f 100644
--- a/tests/baselines/reference/systemModuleWithSuperClass.symbols
+++ b/tests/baselines/reference/systemModuleWithSuperClass.symbols
@@ -4,7 +4,7 @@ export class Foo {
 >Foo : Symbol(Foo, Decl(foo.ts, 0, 0))
 
     a: string;
->a : Symbol(a, Decl(foo.ts, 1, 18))
+>a : Symbol(Foo.a, Decl(foo.ts, 1, 18))
 }
 
 === tests/cases/compiler/bar.ts ===
@@ -16,5 +16,5 @@ export class Bar extends Foo {
 >Foo : Symbol(Foo, Decl(bar.ts, 0, 8))
 
     b: string;
->b : Symbol(b, Decl(bar.ts, 1, 30))
+>b : Symbol(Bar.b, Decl(bar.ts, 1, 30))
 }
diff --git a/tests/baselines/reference/taggedTemplateContextualTyping1.symbols b/tests/baselines/reference/taggedTemplateContextualTyping1.symbols
index 2de45d16379..3c50a6f92e4 100644
--- a/tests/baselines/reference/taggedTemplateContextualTyping1.symbols
+++ b/tests/baselines/reference/taggedTemplateContextualTyping1.symbols
@@ -13,7 +13,7 @@ function tempTag1<T>(templateStrs: TemplateStringsArray, f: FuncType, x: T): T;
 >tempTag1 : Symbol(tempTag1, Decl(taggedTemplateContextualTyping1.ts, 1, 48), Decl(taggedTemplateContextualTyping1.ts, 3, 79), Decl(taggedTemplateContextualTyping1.ts, 4, 92))
 >T : Symbol(T, Decl(taggedTemplateContextualTyping1.ts, 3, 18))
 >templateStrs : Symbol(templateStrs, Decl(taggedTemplateContextualTyping1.ts, 3, 21))
->TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.d.ts, --, --))
+>TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.es5.d.ts, --, --))
 >f : Symbol(f, Decl(taggedTemplateContextualTyping1.ts, 3, 56))
 >FuncType : Symbol(FuncType, Decl(taggedTemplateContextualTyping1.ts, 0, 0))
 >x : Symbol(x, Decl(taggedTemplateContextualTyping1.ts, 3, 69))
@@ -24,7 +24,7 @@ function tempTag1<T>(templateStrs: TemplateStringsArray, f: FuncType, h: FuncTyp
 >tempTag1 : Symbol(tempTag1, Decl(taggedTemplateContextualTyping1.ts, 1, 48), Decl(taggedTemplateContextualTyping1.ts, 3, 79), Decl(taggedTemplateContextualTyping1.ts, 4, 92))
 >T : Symbol(T, Decl(taggedTemplateContextualTyping1.ts, 4, 18))
 >templateStrs : Symbol(templateStrs, Decl(taggedTemplateContextualTyping1.ts, 4, 21))
->TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.d.ts, --, --))
+>TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.es5.d.ts, --, --))
 >f : Symbol(f, Decl(taggedTemplateContextualTyping1.ts, 4, 56))
 >FuncType : Symbol(FuncType, Decl(taggedTemplateContextualTyping1.ts, 0, 0))
 >h : Symbol(h, Decl(taggedTemplateContextualTyping1.ts, 4, 69))
diff --git a/tests/baselines/reference/taggedTemplateContextualTyping2.symbols b/tests/baselines/reference/taggedTemplateContextualTyping2.symbols
index 240cc344de7..a1ee63ef8b0 100644
--- a/tests/baselines/reference/taggedTemplateContextualTyping2.symbols
+++ b/tests/baselines/reference/taggedTemplateContextualTyping2.symbols
@@ -22,7 +22,7 @@ type FuncType2 = (x: <S, T>(p: T) => T) => typeof x;
 function tempTag2(templateStrs: TemplateStringsArray, f: FuncType1, x: number): number;
 >tempTag2 : Symbol(tempTag2, Decl(taggedTemplateContextualTyping2.ts, 2, 52), Decl(taggedTemplateContextualTyping2.ts, 4, 87), Decl(taggedTemplateContextualTyping2.ts, 5, 101))
 >templateStrs : Symbol(templateStrs, Decl(taggedTemplateContextualTyping2.ts, 4, 18))
->TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.d.ts, --, --))
+>TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.es5.d.ts, --, --))
 >f : Symbol(f, Decl(taggedTemplateContextualTyping2.ts, 4, 53))
 >FuncType1 : Symbol(FuncType1, Decl(taggedTemplateContextualTyping2.ts, 0, 0))
 >x : Symbol(x, Decl(taggedTemplateContextualTyping2.ts, 4, 67))
@@ -30,7 +30,7 @@ function tempTag2(templateStrs: TemplateStringsArray, f: FuncType1, x: number):
 function tempTag2(templateStrs: TemplateStringsArray, f: FuncType2, h: FuncType2, x: string): string;
 >tempTag2 : Symbol(tempTag2, Decl(taggedTemplateContextualTyping2.ts, 2, 52), Decl(taggedTemplateContextualTyping2.ts, 4, 87), Decl(taggedTemplateContextualTyping2.ts, 5, 101))
 >templateStrs : Symbol(templateStrs, Decl(taggedTemplateContextualTyping2.ts, 5, 18))
->TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.d.ts, --, --))
+>TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.es5.d.ts, --, --))
 >f : Symbol(f, Decl(taggedTemplateContextualTyping2.ts, 5, 53))
 >FuncType2 : Symbol(FuncType2, Decl(taggedTemplateContextualTyping2.ts, 1, 49))
 >h : Symbol(h, Decl(taggedTemplateContextualTyping2.ts, 5, 67))
diff --git a/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.js b/tests/baselines/reference/taggedTemplateStringsWithIncompatibleTypedTags.js
index 9d113793228..67c94fd6513 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/taggedTemplateStringsWithManyCallAndMemberExpressions.symbols b/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressions.symbols
index 24f75c49178..226729907de 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressions.symbols
+++ b/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressions.symbols
@@ -8,7 +8,7 @@ interface I {
 >I : Symbol(I, Decl(taggedTemplateStringsWithManyCallAndMemberExpressions.ts, 0, 0))
 
     member: {
->member : Symbol(member, Decl(taggedTemplateStringsWithManyCallAndMemberExpressions.ts, 1, 43))
+>member : Symbol(I.member, Decl(taggedTemplateStringsWithManyCallAndMemberExpressions.ts, 1, 43))
 
         new (s: string): {
 >s : Symbol(s, Decl(taggedTemplateStringsWithManyCallAndMemberExpressions.ts, 3, 13))
diff --git a/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressionsES6.symbols b/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressionsES6.symbols
index cbe21173d55..6535e998808 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressionsES6.symbols
+++ b/tests/baselines/reference/taggedTemplateStringsWithManyCallAndMemberExpressionsES6.symbols
@@ -8,7 +8,7 @@ interface I {
 >I : Symbol(I, Decl(taggedTemplateStringsWithManyCallAndMemberExpressionsES6.ts, 0, 0))
 
     member: {
->member : Symbol(member, Decl(taggedTemplateStringsWithManyCallAndMemberExpressionsES6.ts, 1, 43))
+>member : Symbol(I.member, Decl(taggedTemplateStringsWithManyCallAndMemberExpressionsES6.ts, 1, 43))
 
         new (s: string): {
 >s : Symbol(s, Decl(taggedTemplateStringsWithManyCallAndMemberExpressionsES6.ts, 3, 13))
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2_ES6.symbols b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2_ES6.symbols
index e96912ec3bb..cadfa135202 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2_ES6.symbols
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution2_ES6.symbols
@@ -2,7 +2,7 @@
 function foo1(strs: TemplateStringsArray, x: number): string;
 >foo1 : Symbol(foo1, Decl(taggedTemplateStringsWithOverloadResolution2_ES6.ts, 0, 0), Decl(taggedTemplateStringsWithOverloadResolution2_ES6.ts, 0, 61), Decl(taggedTemplateStringsWithOverloadResolution2_ES6.ts, 1, 49))
 >strs : Symbol(strs, Decl(taggedTemplateStringsWithOverloadResolution2_ES6.ts, 0, 14))
->TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.d.ts, --, --))
+>TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.es5.d.ts, --, --))
 >x : Symbol(x, Decl(taggedTemplateStringsWithOverloadResolution2_ES6.ts, 0, 41))
 
 function foo1(strs: string[], x: number): number;
@@ -34,7 +34,7 @@ function foo2(strs: string[], x: number): number;
 function foo2(strs: TemplateStringsArray, x: number): string;
 >foo2 : Symbol(foo2, Decl(taggedTemplateStringsWithOverloadResolution2_ES6.ts, 7, 20), Decl(taggedTemplateStringsWithOverloadResolution2_ES6.ts, 9, 49), Decl(taggedTemplateStringsWithOverloadResolution2_ES6.ts, 10, 61))
 >strs : Symbol(strs, Decl(taggedTemplateStringsWithOverloadResolution2_ES6.ts, 10, 14))
->TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.d.ts, --, --))
+>TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.es5.d.ts, --, --))
 >x : Symbol(x, Decl(taggedTemplateStringsWithOverloadResolution2_ES6.ts, 10, 41))
 
 function foo2(...stuff: any[]): any {
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 fcc2cda86dc..14b584e22e4 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/taggedTemplateStringsWithTypedTags.symbols b/tests/baselines/reference/taggedTemplateStringsWithTypedTags.symbols
index 974410a7b1d..d3f85d8375a 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithTypedTags.symbols
+++ b/tests/baselines/reference/taggedTemplateStringsWithTypedTags.symbols
@@ -8,19 +8,19 @@ interface I {
 >I : Symbol(I, Decl(taggedTemplateStringsWithTypedTags.ts, 0, 0))
 
     g: I;
->g : Symbol(g, Decl(taggedTemplateStringsWithTypedTags.ts, 1, 50))
+>g : Symbol(I.g, Decl(taggedTemplateStringsWithTypedTags.ts, 1, 50))
 >I : Symbol(I, Decl(taggedTemplateStringsWithTypedTags.ts, 0, 0))
 
     h: I;
->h : Symbol(h, Decl(taggedTemplateStringsWithTypedTags.ts, 2, 9))
+>h : Symbol(I.h, Decl(taggedTemplateStringsWithTypedTags.ts, 2, 9))
 >I : Symbol(I, Decl(taggedTemplateStringsWithTypedTags.ts, 0, 0))
 
     member: I;
->member : Symbol(member, Decl(taggedTemplateStringsWithTypedTags.ts, 3, 9))
+>member : Symbol(I.member, Decl(taggedTemplateStringsWithTypedTags.ts, 3, 9))
 >I : Symbol(I, Decl(taggedTemplateStringsWithTypedTags.ts, 0, 0))
 
     thisIsNotATag(x: string): void
->thisIsNotATag : Symbol(thisIsNotATag, Decl(taggedTemplateStringsWithTypedTags.ts, 4, 14))
+>thisIsNotATag : Symbol(I.thisIsNotATag, Decl(taggedTemplateStringsWithTypedTags.ts, 4, 14))
 >x : Symbol(x, Decl(taggedTemplateStringsWithTypedTags.ts, 5, 18))
 
     [x: number]: I;
diff --git a/tests/baselines/reference/taggedTemplateStringsWithTypedTagsES6.symbols b/tests/baselines/reference/taggedTemplateStringsWithTypedTagsES6.symbols
index a78e10c11e0..f0b088bd6f6 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithTypedTagsES6.symbols
+++ b/tests/baselines/reference/taggedTemplateStringsWithTypedTagsES6.symbols
@@ -8,19 +8,19 @@ interface I {
 >I : Symbol(I, Decl(taggedTemplateStringsWithTypedTagsES6.ts, 0, 0))
 
     g: I;
->g : Symbol(g, Decl(taggedTemplateStringsWithTypedTagsES6.ts, 1, 50))
+>g : Symbol(I.g, Decl(taggedTemplateStringsWithTypedTagsES6.ts, 1, 50))
 >I : Symbol(I, Decl(taggedTemplateStringsWithTypedTagsES6.ts, 0, 0))
 
     h: I;
->h : Symbol(h, Decl(taggedTemplateStringsWithTypedTagsES6.ts, 2, 9))
+>h : Symbol(I.h, Decl(taggedTemplateStringsWithTypedTagsES6.ts, 2, 9))
 >I : Symbol(I, Decl(taggedTemplateStringsWithTypedTagsES6.ts, 0, 0))
 
     member: I;
->member : Symbol(member, Decl(taggedTemplateStringsWithTypedTagsES6.ts, 3, 9))
+>member : Symbol(I.member, Decl(taggedTemplateStringsWithTypedTagsES6.ts, 3, 9))
 >I : Symbol(I, Decl(taggedTemplateStringsWithTypedTagsES6.ts, 0, 0))
 
     thisIsNotATag(x: string): void
->thisIsNotATag : Symbol(thisIsNotATag, Decl(taggedTemplateStringsWithTypedTagsES6.ts, 4, 14))
+>thisIsNotATag : Symbol(I.thisIsNotATag, Decl(taggedTemplateStringsWithTypedTagsES6.ts, 4, 14))
 >x : Symbol(x, Decl(taggedTemplateStringsWithTypedTagsES6.ts, 5, 18))
 
     [x: number]: I;
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/templateStringWithEmbeddedNewOperator.symbols b/tests/baselines/reference/templateStringWithEmbeddedNewOperator.symbols
index ed7ef9dbc63..120bd330502 100644
--- a/tests/baselines/reference/templateStringWithEmbeddedNewOperator.symbols
+++ b/tests/baselines/reference/templateStringWithEmbeddedNewOperator.symbols
@@ -1,5 +1,5 @@
 === tests/cases/conformance/es6/templates/templateStringWithEmbeddedNewOperator.ts ===
 var x = `abc${ new String("Hi") }def`;
 >x : Symbol(x, Decl(templateStringWithEmbeddedNewOperator.ts, 0, 3))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
diff --git a/tests/baselines/reference/templateStringWithEmbeddedNewOperatorES6.symbols b/tests/baselines/reference/templateStringWithEmbeddedNewOperatorES6.symbols
index a7240d4fd22..8b499b52e6b 100644
--- a/tests/baselines/reference/templateStringWithEmbeddedNewOperatorES6.symbols
+++ b/tests/baselines/reference/templateStringWithEmbeddedNewOperatorES6.symbols
@@ -1,5 +1,5 @@
 === tests/cases/conformance/es6/templates/templateStringWithEmbeddedNewOperatorES6.ts ===
 var x = `abc${ new String("Hi") }def`;
 >x : Symbol(x, Decl(templateStringWithEmbeddedNewOperatorES6.ts, 0, 3))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.es5.d.ts, --, --), 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/templateStringWithEmbeddedUnaryPlusES6.symbols b/tests/baselines/reference/templateStringWithEmbeddedUnaryPlusES6.symbols
index 5d27cedede1..df10fbfca6d 100644
--- a/tests/baselines/reference/templateStringWithEmbeddedUnaryPlusES6.symbols
+++ b/tests/baselines/reference/templateStringWithEmbeddedUnaryPlusES6.symbols
@@ -1,5 +1,5 @@
 === tests/cases/conformance/es6/templates/templateStringWithEmbeddedUnaryPlusES6.ts ===
 var x = `abc${ +Infinity }def`;
 >x : Symbol(x, Decl(templateStringWithEmbeddedUnaryPlusES6.ts, 0, 3))
->Infinity : Symbol(Infinity, Decl(lib.d.ts, --, --))
+>Infinity : Symbol(Infinity, Decl(lib.es5.d.ts, --, --))
 
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/templateStringWithPropertyAccessES6.symbols b/tests/baselines/reference/templateStringWithPropertyAccessES6.symbols
index 9259aff2a31..803705609a1 100644
--- a/tests/baselines/reference/templateStringWithPropertyAccessES6.symbols
+++ b/tests/baselines/reference/templateStringWithPropertyAccessES6.symbols
@@ -1,5 +1,5 @@
 === tests/cases/conformance/es6/templates/templateStringWithPropertyAccessES6.ts ===
 `abc${0}abc`.indexOf(`abc`);
->`abc${0}abc`.indexOf : Symbol(String.indexOf, Decl(lib.d.ts, --, --))
->indexOf : Symbol(String.indexOf, Decl(lib.d.ts, --, --))
+>`abc${0}abc`.indexOf : Symbol(String.indexOf, Decl(lib.es5.d.ts, --, --))
+>indexOf : Symbol(String.indexOf, Decl(lib.es5.d.ts, --, --))
 
diff --git a/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt b/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt
index e6910840d39..94ab5028647 100644
--- a/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt
+++ b/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/compiler/templateStringsArrayTypeDefinedInES5Mode.ts(8,3): error TS2345: Argument of type '{ [x: number]: undefined; }' is not assignable to parameter of type 'TemplateStringsArray'.
-  Property 'raw' is missing in type '{ [x: number]: undefined; }'.
+tests/cases/compiler/templateStringsArrayTypeDefinedInES5Mode.ts(8,3): error TS2345: Argument of type '{}' is not assignable to parameter of type 'TemplateStringsArray'.
+  Property 'raw' is missing in type '{}'.
 
 
 ==== tests/cases/compiler/templateStringsArrayTypeDefinedInES5Mode.ts (1 errors) ====
@@ -12,7 +12,7 @@ tests/cases/compiler/templateStringsArrayTypeDefinedInES5Mode.ts(8,3): error TS2
     
     f({}, 10, 10);
       ~~
-!!! error TS2345: Argument of type '{ [x: number]: undefined; }' is not assignable to parameter of type 'TemplateStringsArray'.
-!!! error TS2345:   Property 'raw' is missing in type '{ [x: number]: undefined; }'.
+!!! error TS2345: Argument of type '{}' is not assignable to parameter of type 'TemplateStringsArray'.
+!!! error TS2345:   Property 'raw' is missing in type '{}'.
     
     f `abcdef${ 1234 }${ 5678 }ghijkl`;
\ No newline at end of file
diff --git a/tests/baselines/reference/templateStringsArrayTypeNotDefinedES5Mode.errors.txt b/tests/baselines/reference/templateStringsArrayTypeNotDefinedES5Mode.errors.txt
index e8bf38c1048..1201c82f4d0 100644
--- a/tests/baselines/reference/templateStringsArrayTypeNotDefinedES5Mode.errors.txt
+++ b/tests/baselines/reference/templateStringsArrayTypeNotDefinedES5Mode.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/compiler/templateStringsArrayTypeNotDefinedES5Mode.ts(5,3): error TS2345: Argument of type '{ [x: number]: undefined; }' is not assignable to parameter of type 'TemplateStringsArray'.
-  Property 'raw' is missing in type '{ [x: number]: undefined; }'.
+tests/cases/compiler/templateStringsArrayTypeNotDefinedES5Mode.ts(5,3): error TS2345: Argument of type '{}' is not assignable to parameter of type 'TemplateStringsArray'.
+  Property 'raw' is missing in type '{}'.
 
 
 ==== tests/cases/compiler/templateStringsArrayTypeNotDefinedES5Mode.ts (1 errors) ====
@@ -9,7 +9,7 @@ tests/cases/compiler/templateStringsArrayTypeNotDefinedES5Mode.ts(5,3): error TS
     
     f({}, 10, 10);
       ~~
-!!! error TS2345: Argument of type '{ [x: number]: undefined; }' is not assignable to parameter of type 'TemplateStringsArray'.
-!!! error TS2345:   Property 'raw' is missing in type '{ [x: number]: undefined; }'.
+!!! error TS2345: Argument of type '{}' is not assignable to parameter of type 'TemplateStringsArray'.
+!!! error TS2345:   Property 'raw' is missing in type '{}'.
     
     f `abcdef${ 1234 }${ 5678 }ghijkl`;
\ No newline at end of file
diff --git a/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt b/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt
index ac30556a235..f410d408482 100644
--- a/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt
+++ b/tests/baselines/reference/templateStringsArrayTypeRedefinedInES6Mode.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/compiler/templateStringsArrayTypeRedefinedInES6Mode.ts(8,3): error TS2345: Argument of type '{ [x: number]: undefined; }' is not assignable to parameter of type 'TemplateStringsArray'.
-  Property 'raw' is missing in type '{ [x: number]: undefined; }'.
+tests/cases/compiler/templateStringsArrayTypeRedefinedInES6Mode.ts(8,3): error TS2345: Argument of type '{}' is not assignable to parameter of type 'TemplateStringsArray'.
+  Property 'raw' is missing in type '{}'.
 
 
 ==== tests/cases/compiler/templateStringsArrayTypeRedefinedInES6Mode.ts (1 errors) ====
@@ -12,7 +12,7 @@ tests/cases/compiler/templateStringsArrayTypeRedefinedInES6Mode.ts(8,3): error T
     
     f({}, 10, 10);
       ~~
-!!! error TS2345: Argument of type '{ [x: number]: undefined; }' is not assignable to parameter of type 'TemplateStringsArray'.
-!!! error TS2345:   Property 'raw' is missing in type '{ [x: number]: undefined; }'.
+!!! error TS2345: Argument of type '{}' is not assignable to parameter of type 'TemplateStringsArray'.
+!!! error TS2345:   Property 'raw' is missing in type '{}'.
     
     f `abcdef${ 1234 }${ 5678 }ghijkl`;
\ No newline at end of file
diff --git a/tests/baselines/reference/testContainerList.symbols b/tests/baselines/reference/testContainerList.symbols
index aed56643448..79c7df0c82f 100644
--- a/tests/baselines/reference/testContainerList.symbols
+++ b/tests/baselines/reference/testContainerList.symbols
@@ -7,7 +7,7 @@ module A {
 >C : Symbol(C, Decl(testContainerList.ts, 1, 10))
 
         constructor(public d: {}) { }
->d : Symbol(d, Decl(testContainerList.ts, 3, 20))
+>d : Symbol(C.d, Decl(testContainerList.ts, 3, 20))
     }
 }
 
diff --git a/tests/baselines/reference/testTypings.symbols b/tests/baselines/reference/testTypings.symbols
index 5e3074a9585..4d91263142a 100644
--- a/tests/baselines/reference/testTypings.symbols
+++ b/tests/baselines/reference/testTypings.symbols
@@ -4,7 +4,7 @@ interface IComparable<T> {
 >T : Symbol(T, Decl(testTypings.ts, 0, 22))
 
    compareTo(other: T);
->compareTo : Symbol(compareTo, Decl(testTypings.ts, 0, 26))
+>compareTo : Symbol(IComparable.compareTo, Decl(testTypings.ts, 0, 26))
 >other : Symbol(other, Decl(testTypings.ts, 1, 13))
 >T : Symbol(T, Decl(testTypings.ts, 0, 22))
 }
diff --git a/tests/baselines/reference/thisBinding2.symbols b/tests/baselines/reference/thisBinding2.symbols
index 60c11c2e959..cdef9b60b3e 100644
--- a/tests/baselines/reference/thisBinding2.symbols
+++ b/tests/baselines/reference/thisBinding2.symbols
@@ -3,27 +3,27 @@ class C {
 >C : Symbol(C, Decl(thisBinding2.ts, 0, 0))
 
  x: number;
->x : Symbol(x, Decl(thisBinding2.ts, 0, 9))
+>x : Symbol(C.x, Decl(thisBinding2.ts, 0, 9))
 
     constructor() {
         this.x = (() => {
->this.x : Symbol(x, Decl(thisBinding2.ts, 0, 9))
+>this.x : Symbol(C.x, Decl(thisBinding2.ts, 0, 9))
 >this : Symbol(C, Decl(thisBinding2.ts, 0, 0))
->x : Symbol(x, Decl(thisBinding2.ts, 0, 9))
+>x : Symbol(C.x, Decl(thisBinding2.ts, 0, 9))
 
    var x = 1;
 >x : Symbol(x, Decl(thisBinding2.ts, 4, 6))
 
    return this.x;
->this.x : Symbol(x, Decl(thisBinding2.ts, 0, 9))
+>this.x : Symbol(C.x, Decl(thisBinding2.ts, 0, 9))
 >this : Symbol(C, Decl(thisBinding2.ts, 0, 0))
->x : Symbol(x, Decl(thisBinding2.ts, 0, 9))
+>x : Symbol(C.x, Decl(thisBinding2.ts, 0, 9))
 
   })();
   this.x = function() {
->this.x : Symbol(x, Decl(thisBinding2.ts, 0, 9))
+>this.x : Symbol(C.x, Decl(thisBinding2.ts, 0, 9))
 >this : Symbol(C, Decl(thisBinding2.ts, 0, 0))
->x : Symbol(x, Decl(thisBinding2.ts, 0, 9))
+>x : Symbol(C.x, Decl(thisBinding2.ts, 0, 9))
 
    var x = 1;
 >x : Symbol(x, Decl(thisBinding2.ts, 8, 6))
diff --git a/tests/baselines/reference/thisCapture1.symbols b/tests/baselines/reference/thisCapture1.symbols
index fade5bbeca3..7065eb0db1c 100644
--- a/tests/baselines/reference/thisCapture1.symbols
+++ b/tests/baselines/reference/thisCapture1.symbols
@@ -3,10 +3,10 @@ class X {
 >X : Symbol(X, Decl(thisCapture1.ts, 0, 0))
 
     private y = 0;
->y : Symbol(y, Decl(thisCapture1.ts, 0, 9))
+>y : Symbol(X.y, Decl(thisCapture1.ts, 0, 9))
 
     public getSettings(keys: string[]): any {
->getSettings : Symbol(getSettings, Decl(thisCapture1.ts, 1, 18))
+>getSettings : Symbol(X.getSettings, Decl(thisCapture1.ts, 1, 18))
 >keys : Symbol(keys, Decl(thisCapture1.ts, 2, 23))
 
         var ret: any;
@@ -16,9 +16,9 @@ class X {
 >ret : Symbol(ret, Decl(thisCapture1.ts, 3, 11))
 
             this.y = 0;
->this.y : Symbol(y, Decl(thisCapture1.ts, 0, 9))
+>this.y : Symbol(X.y, Decl(thisCapture1.ts, 0, 9))
 >this : Symbol(X, Decl(thisCapture1.ts, 0, 0))
->y : Symbol(y, Decl(thisCapture1.ts, 0, 9))
+>y : Symbol(X.y, Decl(thisCapture1.ts, 0, 9))
 
         }).promise();
     }
diff --git a/tests/baselines/reference/thisExpressionOfGenericObject.symbols b/tests/baselines/reference/thisExpressionOfGenericObject.symbols
index f923b675e5d..4f0affe548b 100644
--- a/tests/baselines/reference/thisExpressionOfGenericObject.symbols
+++ b/tests/baselines/reference/thisExpressionOfGenericObject.symbols
@@ -4,7 +4,7 @@ class MyClass1<T> {
 >T : Symbol(T, Decl(thisExpressionOfGenericObject.ts, 0, 15))
 
     private obj: MyClass1<string>;
->obj : Symbol(obj, Decl(thisExpressionOfGenericObject.ts, 0, 19))
+>obj : Symbol(MyClass1.obj, Decl(thisExpressionOfGenericObject.ts, 0, 19))
 >MyClass1 : Symbol(MyClass1, Decl(thisExpressionOfGenericObject.ts, 0, 0))
 
     constructor() {
diff --git a/tests/baselines/reference/thisInArrowFunctionInStaticInitializer1.js b/tests/baselines/reference/thisInArrowFunctionInStaticInitializer1.js
index 07d65c726b3..03b86b1d225 100644
--- a/tests/baselines/reference/thisInArrowFunctionInStaticInitializer1.js
+++ b/tests/baselines/reference/thisInArrowFunctionInStaticInitializer1.js
@@ -9,10 +9,10 @@ class Vector {
 }
 
 //// [thisInArrowFunctionInStaticInitializer1.js]
+var _this = this;
 function log(a) { }
 var Vector = (function () {
     function Vector() {
-        var _this = this;
     }
     return Vector;
 }());
diff --git a/tests/baselines/reference/thisInInnerFunctions.symbols b/tests/baselines/reference/thisInInnerFunctions.symbols
index 70c9106f9f8..c981180ec79 100644
--- a/tests/baselines/reference/thisInInnerFunctions.symbols
+++ b/tests/baselines/reference/thisInInnerFunctions.symbols
@@ -3,10 +3,10 @@ class Foo {
 >Foo : Symbol(Foo, Decl(thisInInnerFunctions.ts, 0, 0))
 
     x = "hello";
->x : Symbol(x, Decl(thisInInnerFunctions.ts, 0, 11))
+>x : Symbol(Foo.x, Decl(thisInInnerFunctions.ts, 0, 11))
 
     bar() {
->bar : Symbol(bar, Decl(thisInInnerFunctions.ts, 1, 16))
+>bar : Symbol(Foo.bar, Decl(thisInInnerFunctions.ts, 1, 16))
 
         function inner() {
 >inner : Symbol(inner, Decl(thisInInnerFunctions.ts, 2, 11))
diff --git a/tests/baselines/reference/thisInInstanceMemberInitializer.symbols b/tests/baselines/reference/thisInInstanceMemberInitializer.symbols
index 2690bb1b73e..00a0f92e439 100644
--- a/tests/baselines/reference/thisInInstanceMemberInitializer.symbols
+++ b/tests/baselines/reference/thisInInstanceMemberInitializer.symbols
@@ -3,7 +3,7 @@ class C {
 >C : Symbol(C, Decl(thisInInstanceMemberInitializer.ts, 0, 0))
 
     x = this;
->x : Symbol(x, Decl(thisInInstanceMemberInitializer.ts, 0, 9))
+>x : Symbol(C.x, Decl(thisInInstanceMemberInitializer.ts, 0, 9))
 >this : Symbol(C, Decl(thisInInstanceMemberInitializer.ts, 0, 0))
 }
 
@@ -12,10 +12,10 @@ class D<T> {
 >T : Symbol(T, Decl(thisInInstanceMemberInitializer.ts, 4, 8))
 
     x = this;
->x : Symbol(x, Decl(thisInInstanceMemberInitializer.ts, 4, 12))
+>x : Symbol(D.x, Decl(thisInInstanceMemberInitializer.ts, 4, 12))
 >this : Symbol(D, Decl(thisInInstanceMemberInitializer.ts, 2, 1))
 
     y: T;
->y : Symbol(y, Decl(thisInInstanceMemberInitializer.ts, 5, 13))
+>y : Symbol(D.y, Decl(thisInInstanceMemberInitializer.ts, 5, 13))
 >T : Symbol(T, Decl(thisInInstanceMemberInitializer.ts, 4, 8))
 }
diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt
index 6c1a257b5ea..8f84793a49f 100644
--- a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt
+++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt
@@ -6,10 +6,9 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalMod
 tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(38,25): error TS2507: Type 'any' is not a constructor function type.
 tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(44,9): error TS2332: 'this' cannot be referenced in current location.
 tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(45,9): error TS2332: 'this' cannot be referenced in current location.
-tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(48,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 
 
-==== tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts (9 errors) ====
+==== tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts (8 errors) ====
     //'this' in static member initializer
     class ErrClass1 {
         static t = this; // Error
@@ -73,6 +72,4 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalMod
 !!! error TS2332: 'this' cannot be referenced in current location.
     }
     
-    export = this; // Should be an error
-    ~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
\ No newline at end of file
+    export = this; // Should be an error
\ No newline at end of file
diff --git a/tests/baselines/reference/thisInLambda.symbols b/tests/baselines/reference/thisInLambda.symbols
index e760c1b1c02..79a43a59037 100644
--- a/tests/baselines/reference/thisInLambda.symbols
+++ b/tests/baselines/reference/thisInLambda.symbols
@@ -3,21 +3,21 @@ class Foo {
 >Foo : Symbol(Foo, Decl(thisInLambda.ts, 0, 0))
 
     x = "hello";
->x : Symbol(x, Decl(thisInLambda.ts, 0, 11))
+>x : Symbol(Foo.x, Decl(thisInLambda.ts, 0, 11))
 
     bar() {
->bar : Symbol(bar, Decl(thisInLambda.ts, 1, 16))
+>bar : Symbol(Foo.bar, Decl(thisInLambda.ts, 1, 16))
 
         this.x; // 'this' is type 'Foo'
->this.x : Symbol(x, Decl(thisInLambda.ts, 0, 11))
+>this.x : Symbol(Foo.x, Decl(thisInLambda.ts, 0, 11))
 >this : Symbol(Foo, Decl(thisInLambda.ts, 0, 0))
->x : Symbol(x, Decl(thisInLambda.ts, 0, 11))
+>x : Symbol(Foo.x, Decl(thisInLambda.ts, 0, 11))
 
         var f = () => this.x; // 'this' should be type 'Foo' as well
 >f : Symbol(f, Decl(thisInLambda.ts, 4, 11))
->this.x : Symbol(x, Decl(thisInLambda.ts, 0, 11))
+>this.x : Symbol(Foo.x, Decl(thisInLambda.ts, 0, 11))
 >this : Symbol(Foo, Decl(thisInLambda.ts, 0, 0))
->x : Symbol(x, Decl(thisInLambda.ts, 0, 11))
+>x : Symbol(Foo.x, Decl(thisInLambda.ts, 0, 11))
     }
 }
 
diff --git a/tests/baselines/reference/thisInObjectLiterals.errors.txt b/tests/baselines/reference/thisInObjectLiterals.errors.txt
index 73300d86d74..b0b1c63a34a 100644
--- a/tests/baselines/reference/thisInObjectLiterals.errors.txt
+++ b/tests/baselines/reference/thisInObjectLiterals.errors.txt
@@ -1,7 +1,8 @@
 tests/cases/conformance/expressions/thisKeyword/thisInObjectLiterals.ts(7,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 't' must be of type '{ x: this; y: number; }', but here has type '{ x: MyClass; y: number; }'.
+tests/cases/conformance/expressions/thisKeyword/thisInObjectLiterals.ts(14,21): error TS2339: Property 'spaaace' does not exist on type '{ f(): any; }'.
 
 
-==== tests/cases/conformance/expressions/thisKeyword/thisInObjectLiterals.ts (1 errors) ====
+==== tests/cases/conformance/expressions/thisKeyword/thisInObjectLiterals.ts (2 errors) ====
     class MyClass {
         t: number;
     
@@ -14,10 +15,12 @@ tests/cases/conformance/expressions/thisKeyword/thisInObjectLiterals.ts(7,13): e
         }
     }
     
-    //type of 'this' in an object literal property of a function type is Any
+    //type of 'this' in an object literal method is the type of the object literal
     var obj = {
         f() {
             return this.spaaace;
+                        ~~~~~~~
+!!! error TS2339: Property 'spaaace' does not exist on type '{ f(): any; }'.
         }
     };
     var obj: { f: () => any; };
diff --git a/tests/baselines/reference/thisInObjectLiterals.js b/tests/baselines/reference/thisInObjectLiterals.js
index 4e71347a366..6c8380060a7 100644
--- a/tests/baselines/reference/thisInObjectLiterals.js
+++ b/tests/baselines/reference/thisInObjectLiterals.js
@@ -9,7 +9,7 @@ class MyClass {
     }
 }
 
-//type of 'this' in an object literal property of a function type is Any
+//type of 'this' in an object literal method is the type of the object literal
 var obj = {
     f() {
         return this.spaaace;
@@ -29,7 +29,7 @@ var MyClass = (function () {
     };
     return MyClass;
 }());
-//type of 'this' in an object literal property of a function type is Any
+//type of 'this' in an object literal method is the type of the object literal
 var obj = {
     f: function () {
         return this.spaaace;
diff --git a/tests/baselines/reference/thisInPropertyBoundDeclarations.symbols b/tests/baselines/reference/thisInPropertyBoundDeclarations.symbols
index 9d405b8f6f6..12d3b2db31e 100644
--- a/tests/baselines/reference/thisInPropertyBoundDeclarations.symbols
+++ b/tests/baselines/reference/thisInPropertyBoundDeclarations.symbols
@@ -3,7 +3,7 @@ class Bug {
 >Bug : Symbol(Bug, Decl(thisInPropertyBoundDeclarations.ts, 0, 0))
 
     private name: string;
->name : Symbol(name, Decl(thisInPropertyBoundDeclarations.ts, 0, 11))
+>name : Symbol(Bug.name, Decl(thisInPropertyBoundDeclarations.ts, 0, 11))
 
     private static func: Function[] = [
 >func : Symbol(Bug.func, Decl(thisInPropertyBoundDeclarations.ts, 1, 25))
@@ -23,13 +23,13 @@ class Bug {
     ];
 
     private foo(name: string) {
->foo : Symbol(foo, Decl(thisInPropertyBoundDeclarations.ts, 7, 6))
+>foo : Symbol(Bug.foo, Decl(thisInPropertyBoundDeclarations.ts, 7, 6))
 >name : Symbol(name, Decl(thisInPropertyBoundDeclarations.ts, 9, 16))
 
         this.name = name;
->this.name : Symbol(name, Decl(thisInPropertyBoundDeclarations.ts, 0, 11))
+>this.name : Symbol(Bug.name, Decl(thisInPropertyBoundDeclarations.ts, 0, 11))
 >this : Symbol(Bug, Decl(thisInPropertyBoundDeclarations.ts, 0, 0))
->name : Symbol(name, Decl(thisInPropertyBoundDeclarations.ts, 0, 11))
+>name : Symbol(Bug.name, Decl(thisInPropertyBoundDeclarations.ts, 0, 11))
 >name : Symbol(name, Decl(thisInPropertyBoundDeclarations.ts, 9, 16))
     }
 }
@@ -39,13 +39,13 @@ class A {
 >A : Symbol(A, Decl(thisInPropertyBoundDeclarations.ts, 12, 1))
 
     prop1 = function() {
->prop1 : Symbol(prop1, Decl(thisInPropertyBoundDeclarations.ts, 15, 9))
+>prop1 : Symbol(A.prop1, Decl(thisInPropertyBoundDeclarations.ts, 15, 9))
 
         this;
     };
 
     prop2 = function() {
->prop2 : Symbol(prop2, Decl(thisInPropertyBoundDeclarations.ts, 18, 6))
+>prop2 : Symbol(A.prop2, Decl(thisInPropertyBoundDeclarations.ts, 18, 6))
 
         function inner() {
 >inner : Symbol(inner, Decl(thisInPropertyBoundDeclarations.ts, 20, 24))
@@ -56,7 +56,7 @@ class A {
     };
 
     prop3 = () => {
->prop3 : Symbol(prop3, Decl(thisInPropertyBoundDeclarations.ts, 25, 6))
+>prop3 : Symbol(A.prop3, Decl(thisInPropertyBoundDeclarations.ts, 25, 6))
 
         function inner() {
 >inner : Symbol(inner, Decl(thisInPropertyBoundDeclarations.ts, 27, 19))
@@ -66,7 +66,7 @@ class A {
     };
 
     prop4 = {
->prop4 : Symbol(prop4, Decl(thisInPropertyBoundDeclarations.ts, 31, 6))
+>prop4 : Symbol(A.prop4, Decl(thisInPropertyBoundDeclarations.ts, 31, 6))
 
         a: function() { return this; },
 >a : Symbol(a, Decl(thisInPropertyBoundDeclarations.ts, 33, 13))
@@ -74,7 +74,7 @@ class A {
     };
 
     prop5 = () => {
->prop5 : Symbol(prop5, Decl(thisInPropertyBoundDeclarations.ts, 35, 6))
+>prop5 : Symbol(A.prop5, Decl(thisInPropertyBoundDeclarations.ts, 35, 6))
 
         return {
             a: function() { return this; },
@@ -88,19 +88,19 @@ class B {
 >B : Symbol(B, Decl(thisInPropertyBoundDeclarations.ts, 42, 1))
 
     prop1 = this;
->prop1 : Symbol(prop1, Decl(thisInPropertyBoundDeclarations.ts, 44, 9))
+>prop1 : Symbol(B.prop1, Decl(thisInPropertyBoundDeclarations.ts, 44, 9))
 >this : Symbol(B, Decl(thisInPropertyBoundDeclarations.ts, 42, 1))
 
     prop2 = () => this;
->prop2 : Symbol(prop2, Decl(thisInPropertyBoundDeclarations.ts, 45, 17))
+>prop2 : Symbol(B.prop2, Decl(thisInPropertyBoundDeclarations.ts, 45, 17))
 >this : Symbol(B, Decl(thisInPropertyBoundDeclarations.ts, 42, 1))
 
     prop3 = () => () => () => () => this;
->prop3 : Symbol(prop3, Decl(thisInPropertyBoundDeclarations.ts, 47, 23))
+>prop3 : Symbol(B.prop3, Decl(thisInPropertyBoundDeclarations.ts, 47, 23))
 >this : Symbol(B, Decl(thisInPropertyBoundDeclarations.ts, 42, 1))
 
     prop4 = '  ' +
->prop4 : Symbol(prop4, Decl(thisInPropertyBoundDeclarations.ts, 49, 41))
+>prop4 : Symbol(B.prop4, Decl(thisInPropertyBoundDeclarations.ts, 49, 41))
 
     function() {
     } +
@@ -109,7 +109,7 @@ class B {
 >this : Symbol(B, Decl(thisInPropertyBoundDeclarations.ts, 42, 1))
 
     prop5 = {
->prop5 : Symbol(prop5, Decl(thisInPropertyBoundDeclarations.ts, 55, 29))
+>prop5 : Symbol(B.prop5, Decl(thisInPropertyBoundDeclarations.ts, 55, 29))
 
         a: () => { return this; }
 >a : Symbol(a, Decl(thisInPropertyBoundDeclarations.ts, 57, 13))
@@ -118,7 +118,7 @@ class B {
     };
 
     prop6 = () => {
->prop6 : Symbol(prop6, Decl(thisInPropertyBoundDeclarations.ts, 59, 6))
+>prop6 : Symbol(B.prop6, Decl(thisInPropertyBoundDeclarations.ts, 59, 6))
 
         return {
             a: () => { return this; }
diff --git a/tests/baselines/reference/thisTypeAndConstraints.symbols b/tests/baselines/reference/thisTypeAndConstraints.symbols
index 5f93df22c1a..777a19a95fd 100644
--- a/tests/baselines/reference/thisTypeAndConstraints.symbols
+++ b/tests/baselines/reference/thisTypeAndConstraints.symbols
@@ -3,7 +3,7 @@ class A {
 >A : Symbol(A, Decl(thisTypeAndConstraints.ts, 0, 0))
 
     self() {
->self : Symbol(self, Decl(thisTypeAndConstraints.ts, 0, 9))
+>self : Symbol(A.self, Decl(thisTypeAndConstraints.ts, 0, 9))
 
         return this;
 >this : Symbol(A, Decl(thisTypeAndConstraints.ts, 0, 0))
@@ -43,7 +43,7 @@ class B<T extends A> {
 >A : Symbol(A, Decl(thisTypeAndConstraints.ts, 0, 0))
 
     foo(x: T) {
->foo : Symbol(foo, Decl(thisTypeAndConstraints.ts, 13, 22))
+>foo : Symbol(B.foo, Decl(thisTypeAndConstraints.ts, 13, 22))
 >x : Symbol(x, Decl(thisTypeAndConstraints.ts, 14, 8))
 >T : Symbol(T, Decl(thisTypeAndConstraints.ts, 13, 8))
 
@@ -54,7 +54,7 @@ class B<T extends A> {
 >self : Symbol(A.self, Decl(thisTypeAndConstraints.ts, 0, 9))
     }
     bar<U extends T>(x: U) {
->bar : Symbol(bar, Decl(thisTypeAndConstraints.ts, 16, 5))
+>bar : Symbol(B.bar, Decl(thisTypeAndConstraints.ts, 16, 5))
 >U : Symbol(U, Decl(thisTypeAndConstraints.ts, 17, 8))
 >T : Symbol(T, Decl(thisTypeAndConstraints.ts, 13, 8))
 >x : Symbol(x, Decl(thisTypeAndConstraints.ts, 17, 21))
diff --git a/tests/baselines/reference/thisTypeAsConstraint.symbols b/tests/baselines/reference/thisTypeAsConstraint.symbols
index 020dd966cad..ae1407bd253 100644
--- a/tests/baselines/reference/thisTypeAsConstraint.symbols
+++ b/tests/baselines/reference/thisTypeAsConstraint.symbols
@@ -3,7 +3,7 @@ class C {
 >C : Symbol(C, Decl(thisTypeAsConstraint.ts, 0, 0))
 
   public m<T extends this>() {
->m : Symbol(m, Decl(thisTypeAsConstraint.ts, 0, 9))
+>m : Symbol(C.m, Decl(thisTypeAsConstraint.ts, 0, 9))
 >T : Symbol(T, Decl(thisTypeAsConstraint.ts, 1, 11))
   }
 }
diff --git a/tests/baselines/reference/thisTypeInClasses.symbols b/tests/baselines/reference/thisTypeInClasses.symbols
index 5ae45b923af..0f98f013b01 100644
--- a/tests/baselines/reference/thisTypeInClasses.symbols
+++ b/tests/baselines/reference/thisTypeInClasses.symbols
@@ -3,10 +3,10 @@ class C1 {
 >C1 : Symbol(C1, Decl(thisTypeInClasses.ts, 0, 0))
 
     x: this;
->x : Symbol(x, Decl(thisTypeInClasses.ts, 0, 10))
+>x : Symbol(C1.x, Decl(thisTypeInClasses.ts, 0, 10))
 
     f(x: this): this { return undefined; }
->f : Symbol(f, Decl(thisTypeInClasses.ts, 1, 12))
+>f : Symbol(C1.f, Decl(thisTypeInClasses.ts, 1, 12))
 >x : Symbol(x, Decl(thisTypeInClasses.ts, 2, 6))
 >undefined : Symbol(undefined)
 }
@@ -23,51 +23,51 @@ interface Foo<T> {
 >T : Symbol(T, Decl(thisTypeInClasses.ts, 9, 14))
 
     x: T;
->x : Symbol(x, Decl(thisTypeInClasses.ts, 9, 18))
+>x : Symbol(Foo.x, Decl(thisTypeInClasses.ts, 9, 18))
 >T : Symbol(T, Decl(thisTypeInClasses.ts, 9, 14))
 
     y: this;
->y : Symbol(y, Decl(thisTypeInClasses.ts, 10, 9))
+>y : Symbol(Foo.y, Decl(thisTypeInClasses.ts, 10, 9))
 }
 
 class C3 {
 >C3 : Symbol(C3, Decl(thisTypeInClasses.ts, 12, 1))
 
     a: this[];
->a : Symbol(a, Decl(thisTypeInClasses.ts, 14, 10))
+>a : Symbol(C3.a, Decl(thisTypeInClasses.ts, 14, 10))
 
     b: [this, this];
->b : Symbol(b, Decl(thisTypeInClasses.ts, 15, 14))
+>b : Symbol(C3.b, Decl(thisTypeInClasses.ts, 15, 14))
 
     c: this | Date;
->c : Symbol(c, Decl(thisTypeInClasses.ts, 16, 20))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>c : Symbol(C3.c, Decl(thisTypeInClasses.ts, 16, 20))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     d: this & Date;
->d : Symbol(d, Decl(thisTypeInClasses.ts, 17, 19))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>d : Symbol(C3.d, Decl(thisTypeInClasses.ts, 17, 19))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     e: (((this)));
->e : Symbol(e, Decl(thisTypeInClasses.ts, 18, 19))
+>e : Symbol(C3.e, Decl(thisTypeInClasses.ts, 18, 19))
 
     f: (x: this) => this;
->f : Symbol(f, Decl(thisTypeInClasses.ts, 19, 18))
+>f : Symbol(C3.f, Decl(thisTypeInClasses.ts, 19, 18))
 >x : Symbol(x, Decl(thisTypeInClasses.ts, 20, 8))
 
     g: new (x: this) => this;
->g : Symbol(g, Decl(thisTypeInClasses.ts, 20, 25))
+>g : Symbol(C3.g, Decl(thisTypeInClasses.ts, 20, 25))
 >x : Symbol(x, Decl(thisTypeInClasses.ts, 21, 12))
 
     h: Foo<this>;
->h : Symbol(h, Decl(thisTypeInClasses.ts, 21, 29))
+>h : Symbol(C3.h, Decl(thisTypeInClasses.ts, 21, 29))
 >Foo : Symbol(Foo, Decl(thisTypeInClasses.ts, 7, 1))
 
     i: Foo<this | (() => this)>;
->i : Symbol(i, Decl(thisTypeInClasses.ts, 22, 17))
+>i : Symbol(C3.i, Decl(thisTypeInClasses.ts, 22, 17))
 >Foo : Symbol(Foo, Decl(thisTypeInClasses.ts, 7, 1))
 
     j: (x: any) => x is this;
->j : Symbol(j, Decl(thisTypeInClasses.ts, 23, 32))
+>j : Symbol(C3.j, Decl(thisTypeInClasses.ts, 23, 32))
 >x : Symbol(x, Decl(thisTypeInClasses.ts, 24, 8))
 >x : Symbol(x, Decl(thisTypeInClasses.ts, 24, 8))
 }
@@ -76,10 +76,10 @@ declare class C4 {
 >C4 : Symbol(C4, Decl(thisTypeInClasses.ts, 25, 1))
 
     x: this;
->x : Symbol(x, Decl(thisTypeInClasses.ts, 27, 18))
+>x : Symbol(C4.x, Decl(thisTypeInClasses.ts, 27, 18))
 
     f(x: this): this;
->f : Symbol(f, Decl(thisTypeInClasses.ts, 28, 12))
+>f : Symbol(C4.f, Decl(thisTypeInClasses.ts, 28, 12))
 >x : Symbol(x, Decl(thisTypeInClasses.ts, 29, 6))
 }
 
@@ -87,7 +87,7 @@ class C5 {
 >C5 : Symbol(C5, Decl(thisTypeInClasses.ts, 30, 1))
 
     foo() {
->foo : Symbol(foo, Decl(thisTypeInClasses.ts, 32, 10))
+>foo : Symbol(C5.foo, Decl(thisTypeInClasses.ts, 32, 10))
 
         let f1 = (x: this): this => this;
 >f1 : Symbol(f1, Decl(thisTypeInClasses.ts, 34, 11))
@@ -122,7 +122,7 @@ class C5 {
         }
     }
     bar() {
->bar : Symbol(bar, Decl(thisTypeInClasses.ts, 43, 5))
+>bar : Symbol(C5.bar, Decl(thisTypeInClasses.ts, 43, 5))
 
         let x1 = <this>undefined;
 >x1 : Symbol(x1, Decl(thisTypeInClasses.ts, 45, 11))
diff --git a/tests/baselines/reference/thisTypeInFunctions.js b/tests/baselines/reference/thisTypeInFunctions.js
new file mode 100644
index 00000000000..cfe1706ae99
--- /dev/null
+++ b/tests/baselines/reference/thisTypeInFunctions.js
@@ -0,0 +1,382 @@
+//// [thisTypeInFunctions.ts]
+// body checking
+class B {
+    n: number;
+}
+class C {
+    n: number;
+    explicitThis(this: this, m: number): number {
+        return this.n + m;
+    }
+    explicitC(this: C, m: number): number {
+        return this.n + m;
+    }
+    explicitProperty(this: {n: number}, m: number): number {
+        return this.n + m;
+    }
+    explicitVoid(this: void, m: number): number {
+        return m + 1;
+    }
+}
+class D extends C { }
+interface I {
+    a: number;
+    explicitVoid1(this: void): number;
+    explicitVoid2(this: void): number;
+    explicitStructural(this: {a: number}): number;
+    explicitInterface(this: I): number;
+    explicitThis(this: this): number;
+}
+function explicitStructural(this: { y: number }, x: number): number {
+    return x + this.y;
+}
+function justThis(this: { y: number }): number {
+    return this.y;
+}
+function implicitThis(n: number): number {
+    return this.m + n + 12;
+}
+let impl: I = {
+    a: 12,
+    explicitVoid2: () => this.a, // ok, this: any because it refers to some outer object (window?)
+    explicitVoid1() { return 12; },
+    explicitStructural() {
+        return this.a;
+    },
+    explicitInterface() {
+        return this.a;
+    },
+    explicitThis() {
+        return this.a;
+    },
+}
+impl.explicitVoid1 = function () { return 12; };
+impl.explicitVoid2 = () => 12;
+impl.explicitStructural = function() { return this.a; };
+impl.explicitInterface = function() { return this.a; };
+impl.explicitStructural = () => 12;
+impl.explicitInterface = () => 12;
+impl.explicitThis = function () { return this.a; };
+// parameter checking
+let ok: {y: number, f: (this: { y: number }, x: number) => number} = { y: 12, f: explicitStructural };
+let implicitAnyOk: {notSpecified: number, f: (x: number) => number} = { notSpecified: 12, f: implicitThis };
+ok.f(13);
+implicitThis(12);
+implicitAnyOk.f(12);
+
+let c = new C();
+let d = new D();
+let ripped = c.explicitC;
+c.explicitC(12);
+c.explicitProperty(12);
+c.explicitThis(12);
+d.explicitC(12);
+d.explicitProperty(12);
+d.explicitThis(12);
+let reconstructed: { 
+    n: number,
+    explicitThis(this: C, m: number): number, // note: this: this is not allowed in an object literal type.
+    explicitC(this: C, m: number): number,
+    explicitProperty: (this: {n : number}, m: number) => number,
+    explicitVoid(this: void, m: number): number,
+} = { 
+    n: 12,
+    explicitThis: c.explicitThis,
+    explicitC: c.explicitC,
+    explicitProperty: c.explicitProperty,
+    explicitVoid: c.explicitVoid
+};
+reconstructed.explicitThis(10);
+reconstructed.explicitProperty(11);
+let explicitVoid = reconstructed.explicitVoid;
+explicitVoid(12);
+// assignment checking
+let unboundToSpecified: (this: { y: number }, x: number) => number = x => x + this.y; // ok, this:any
+let specifiedToSpecified: (this: {y: number}, x: number) => number = explicitStructural;
+let anyToSpecified: (this: { y: number }, x: number) => number = function(x: number): number { return x + 12; };
+
+let unspecifiedLambda: (x: number) => number = x => x + 12;
+let specifiedLambda: (this: void, x: number) => number = x => x + 12;
+let unspecifiedLambdaToSpecified: (this: {y: number}, x: number) => number = unspecifiedLambda;
+let specifiedLambdaToSpecified: (this: {y: number}, x: number) => number = specifiedLambda;
+
+
+let explicitCFunction: (this: C, m: number) => number;
+let explicitPropertyFunction: (this: {n: number}, m: number) => number;
+c.explicitC = explicitCFunction;
+c.explicitC = function(this: C, m: number) { return this.n + m };
+c.explicitProperty = explicitPropertyFunction;
+c.explicitProperty = function(this: {n: number}, m: number) { return this.n + m };
+c.explicitProperty = reconstructed.explicitProperty;
+
+// lambdas are assignable to anything
+c.explicitC = m => m;
+c.explicitThis = m => m;
+c.explicitProperty = m => m;
+
+// this inside lambdas refer to outer scope
+// the outer-scoped lambda at top-level is still just `any`
+c.explicitC = m => m + this.n;
+c.explicitThis = m => m + this.n;
+c.explicitProperty = m => m + this.n;
+
+//NOTE: this=C here, I guess?
+c.explicitThis = explicitCFunction;
+c.explicitThis = function(this: C, m: number) { return this.n + m };
+
+// this:any compatibility
+c.explicitC = function(m) { return this.n + m };
+c.explicitProperty = function(m) { return this.n + m };
+c.explicitThis = function(m) { return this.n + m };
+
+// this: contextual typing
+c.explicitThis = function(this, m) { return this.n + m };
+
+// this: superclass compatibility
+c.explicitC = function(this: B, m: number) { return this.n + m };
+
+// this:void compatibility
+c.explicitVoid = n => n;
+
+// class-based assignability
+class Base1 {
+    x: number;
+    public polymorphic(this: this): number { return this.x; }
+    explicit(this: Base1): number { return this.x; }
+    static explicitStatic(this: typeof Base1): number { return this.y; }
+    static y: number;
+}
+class Derived1 extends Base1 {
+    y: number
+}
+class Base2 {
+    y: number
+    polymorphic(this: this): number { return this.y; }
+    explicit(this: Base1): number { return this.x; }
+}
+class Derived2 extends Base2 {
+    x: number
+}
+let b1 = new Base1();
+let b2 = new Base2();
+let d1 = new Derived1();
+let d2 = new Derived2();
+d2.polymorphic = d1.polymorphic // ok, 'x' and 'y' in { x, y }
+d1.polymorphic = d2.polymorphic // ok, 'x' and 'y' in { x, y }
+
+// bivariance-allowed cases
+d1.polymorphic = b2.polymorphic // ok, 'y' in D: { x, y }
+d2.polymorphic = d1.explicit // ok, 'y' in { x, y }
+b1.polymorphic = d2.polymorphic // ok, 'x' and 'y' not in Base1: { x }
+b1.explicit = d2.polymorphic // ok, 'x' and 'y' not in Base1: { x }
+
+////// use this-type for construction with new ////
+function InterfaceThis(this: I) {
+    this.a = 12;
+}
+function LiteralTypeThis(this: {x: string}) {
+    this.x = "ok";
+}
+function AnyThis(this: any) {
+    this.x = "ok";
+}
+let interfaceThis = new InterfaceThis();
+let literalTypeThis = new LiteralTypeThis();
+let anyThis = new AnyThis();
+
+//// type parameter inference ////
+declare var f: { 
+    (this: void, x: number): number, 
+    call<U>(this: (...argArray: any[]) => U, ...argArray: any[]): U;
+};
+let n: number = f.call(12);
+
+function missingTypeIsImplicitAny(this, a: number) { return this.anything + a; } 
+
+
+//// [thisTypeInFunctions.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 _this = this;
+// body checking
+var B = (function () {
+    function B() {
+    }
+    return B;
+}());
+var C = (function () {
+    function C() {
+    }
+    C.prototype.explicitThis = function (m) {
+        return this.n + m;
+    };
+    C.prototype.explicitC = function (m) {
+        return this.n + m;
+    };
+    C.prototype.explicitProperty = function (m) {
+        return this.n + m;
+    };
+    C.prototype.explicitVoid = function (m) {
+        return m + 1;
+    };
+    return C;
+}());
+var D = (function (_super) {
+    __extends(D, _super);
+    function D() {
+        _super.apply(this, arguments);
+    }
+    return D;
+}(C));
+function explicitStructural(x) {
+    return x + this.y;
+}
+function justThis() {
+    return this.y;
+}
+function implicitThis(n) {
+    return this.m + n + 12;
+}
+var impl = {
+    a: 12,
+    explicitVoid2: function () { return _this.a; },
+    explicitVoid1: function () { return 12; },
+    explicitStructural: function () {
+        return this.a;
+    },
+    explicitInterface: function () {
+        return this.a;
+    },
+    explicitThis: function () {
+        return this.a;
+    }
+};
+impl.explicitVoid1 = function () { return 12; };
+impl.explicitVoid2 = function () { return 12; };
+impl.explicitStructural = function () { return this.a; };
+impl.explicitInterface = function () { return this.a; };
+impl.explicitStructural = function () { return 12; };
+impl.explicitInterface = function () { return 12; };
+impl.explicitThis = function () { return this.a; };
+// parameter checking
+var ok = { y: 12, f: explicitStructural };
+var implicitAnyOk = { notSpecified: 12, f: implicitThis };
+ok.f(13);
+implicitThis(12);
+implicitAnyOk.f(12);
+var c = new C();
+var d = new D();
+var ripped = c.explicitC;
+c.explicitC(12);
+c.explicitProperty(12);
+c.explicitThis(12);
+d.explicitC(12);
+d.explicitProperty(12);
+d.explicitThis(12);
+var reconstructed = {
+    n: 12,
+    explicitThis: c.explicitThis,
+    explicitC: c.explicitC,
+    explicitProperty: c.explicitProperty,
+    explicitVoid: c.explicitVoid
+};
+reconstructed.explicitThis(10);
+reconstructed.explicitProperty(11);
+var explicitVoid = reconstructed.explicitVoid;
+explicitVoid(12);
+// assignment checking
+var unboundToSpecified = function (x) { return x + _this.y; }; // ok, this:any
+var specifiedToSpecified = explicitStructural;
+var anyToSpecified = function (x) { return x + 12; };
+var unspecifiedLambda = function (x) { return x + 12; };
+var specifiedLambda = function (x) { return x + 12; };
+var unspecifiedLambdaToSpecified = unspecifiedLambda;
+var specifiedLambdaToSpecified = specifiedLambda;
+var explicitCFunction;
+var explicitPropertyFunction;
+c.explicitC = explicitCFunction;
+c.explicitC = function (m) { return this.n + m; };
+c.explicitProperty = explicitPropertyFunction;
+c.explicitProperty = function (m) { return this.n + m; };
+c.explicitProperty = reconstructed.explicitProperty;
+// lambdas are assignable to anything
+c.explicitC = function (m) { return m; };
+c.explicitThis = function (m) { return m; };
+c.explicitProperty = function (m) { return m; };
+// this inside lambdas refer to outer scope
+// the outer-scoped lambda at top-level is still just `any`
+c.explicitC = function (m) { return m + _this.n; };
+c.explicitThis = function (m) { return m + _this.n; };
+c.explicitProperty = function (m) { return m + _this.n; };
+//NOTE: this=C here, I guess?
+c.explicitThis = explicitCFunction;
+c.explicitThis = function (m) { return this.n + m; };
+// this:any compatibility
+c.explicitC = function (m) { return this.n + m; };
+c.explicitProperty = function (m) { return this.n + m; };
+c.explicitThis = function (m) { return this.n + m; };
+// this: contextual typing
+c.explicitThis = function (m) { return this.n + m; };
+// this: superclass compatibility
+c.explicitC = function (m) { return this.n + m; };
+// this:void compatibility
+c.explicitVoid = function (n) { return n; };
+// class-based assignability
+var Base1 = (function () {
+    function Base1() {
+    }
+    Base1.prototype.polymorphic = function () { return this.x; };
+    Base1.prototype.explicit = function () { return this.x; };
+    Base1.explicitStatic = function () { return this.y; };
+    return Base1;
+}());
+var Derived1 = (function (_super) {
+    __extends(Derived1, _super);
+    function Derived1() {
+        _super.apply(this, arguments);
+    }
+    return Derived1;
+}(Base1));
+var Base2 = (function () {
+    function Base2() {
+    }
+    Base2.prototype.polymorphic = function () { return this.y; };
+    Base2.prototype.explicit = function () { return this.x; };
+    return Base2;
+}());
+var Derived2 = (function (_super) {
+    __extends(Derived2, _super);
+    function Derived2() {
+        _super.apply(this, arguments);
+    }
+    return Derived2;
+}(Base2));
+var b1 = new Base1();
+var b2 = new Base2();
+var d1 = new Derived1();
+var d2 = new Derived2();
+d2.polymorphic = d1.polymorphic; // ok, 'x' and 'y' in { x, y }
+d1.polymorphic = d2.polymorphic; // ok, 'x' and 'y' in { x, y }
+// bivariance-allowed cases
+d1.polymorphic = b2.polymorphic; // ok, 'y' in D: { x, y }
+d2.polymorphic = d1.explicit; // ok, 'y' in { x, y }
+b1.polymorphic = d2.polymorphic; // ok, 'x' and 'y' not in Base1: { x }
+b1.explicit = d2.polymorphic; // ok, 'x' and 'y' not in Base1: { x }
+////// use this-type for construction with new ////
+function InterfaceThis() {
+    this.a = 12;
+}
+function LiteralTypeThis() {
+    this.x = "ok";
+}
+function AnyThis() {
+    this.x = "ok";
+}
+var interfaceThis = new InterfaceThis();
+var literalTypeThis = new LiteralTypeThis();
+var anyThis = new AnyThis();
+var n = f.call(12);
+function missingTypeIsImplicitAny(a) { return this.anything + a; }
diff --git a/tests/baselines/reference/thisTypeInFunctions.symbols b/tests/baselines/reference/thisTypeInFunctions.symbols
new file mode 100644
index 00000000000..3d4c3f6ecc7
--- /dev/null
+++ b/tests/baselines/reference/thisTypeInFunctions.symbols
@@ -0,0 +1,797 @@
+=== tests/cases/conformance/types/thisType/thisTypeInFunctions.ts ===
+// body checking
+class B {
+>B : Symbol(B, Decl(thisTypeInFunctions.ts, 0, 0))
+
+    n: number;
+>n : Symbol(B.n, Decl(thisTypeInFunctions.ts, 1, 9))
+}
+class C {
+>C : Symbol(C, Decl(thisTypeInFunctions.ts, 3, 1))
+
+    n: number;
+>n : Symbol(C.n, Decl(thisTypeInFunctions.ts, 4, 9))
+
+    explicitThis(this: this, m: number): number {
+>explicitThis : Symbol(C.explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 6, 17))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 6, 28))
+
+        return this.n + m;
+>this.n : Symbol(C.n, Decl(thisTypeInFunctions.ts, 4, 9))
+>this : Symbol(C, Decl(thisTypeInFunctions.ts, 3, 1))
+>n : Symbol(C.n, Decl(thisTypeInFunctions.ts, 4, 9))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 6, 28))
+    }
+    explicitC(this: C, m: number): number {
+>explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 9, 14))
+>C : Symbol(C, Decl(thisTypeInFunctions.ts, 3, 1))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 9, 22))
+
+        return this.n + m;
+>this.n : Symbol(C.n, Decl(thisTypeInFunctions.ts, 4, 9))
+>this : Symbol(C, Decl(thisTypeInFunctions.ts, 3, 1))
+>n : Symbol(C.n, Decl(thisTypeInFunctions.ts, 4, 9))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 9, 22))
+    }
+    explicitProperty(this: {n: number}, m: number): number {
+>explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 12, 21))
+>n : Symbol(n, Decl(thisTypeInFunctions.ts, 12, 28))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 12, 39))
+
+        return this.n + m;
+>this.n : Symbol(n, Decl(thisTypeInFunctions.ts, 12, 28))
+>this : Symbol(, Decl(thisTypeInFunctions.ts, 12, 26))
+>n : Symbol(n, Decl(thisTypeInFunctions.ts, 12, 28))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 12, 39))
+    }
+    explicitVoid(this: void, m: number): number {
+>explicitVoid : Symbol(C.explicitVoid, Decl(thisTypeInFunctions.ts, 14, 5))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 15, 17))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 15, 28))
+
+        return m + 1;
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 15, 28))
+    }
+}
+class D extends C { }
+>D : Symbol(D, Decl(thisTypeInFunctions.ts, 18, 1))
+>C : Symbol(C, Decl(thisTypeInFunctions.ts, 3, 1))
+
+interface I {
+>I : Symbol(I, Decl(thisTypeInFunctions.ts, 19, 21))
+
+    a: number;
+>a : Symbol(I.a, Decl(thisTypeInFunctions.ts, 20, 13))
+
+    explicitVoid1(this: void): number;
+>explicitVoid1 : Symbol(I.explicitVoid1, Decl(thisTypeInFunctions.ts, 21, 14))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 22, 18))
+
+    explicitVoid2(this: void): number;
+>explicitVoid2 : Symbol(I.explicitVoid2, Decl(thisTypeInFunctions.ts, 22, 38))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 23, 18))
+
+    explicitStructural(this: {a: number}): number;
+>explicitStructural : Symbol(I.explicitStructural, Decl(thisTypeInFunctions.ts, 23, 38))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 24, 23))
+>a : Symbol(a, Decl(thisTypeInFunctions.ts, 24, 30))
+
+    explicitInterface(this: I): number;
+>explicitInterface : Symbol(I.explicitInterface, Decl(thisTypeInFunctions.ts, 24, 50))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 25, 22))
+>I : Symbol(I, Decl(thisTypeInFunctions.ts, 19, 21))
+
+    explicitThis(this: this): number;
+>explicitThis : Symbol(I.explicitThis, Decl(thisTypeInFunctions.ts, 25, 39))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 26, 17))
+}
+function explicitStructural(this: { y: number }, x: number): number {
+>explicitStructural : Symbol(explicitStructural, Decl(thisTypeInFunctions.ts, 27, 1))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 28, 28))
+>y : Symbol(y, Decl(thisTypeInFunctions.ts, 28, 35))
+>x : Symbol(x, Decl(thisTypeInFunctions.ts, 28, 48))
+
+    return x + this.y;
+>x : Symbol(x, Decl(thisTypeInFunctions.ts, 28, 48))
+>this.y : Symbol(y, Decl(thisTypeInFunctions.ts, 28, 35))
+>this : Symbol(, Decl(thisTypeInFunctions.ts, 28, 33))
+>y : Symbol(y, Decl(thisTypeInFunctions.ts, 28, 35))
+}
+function justThis(this: { y: number }): number {
+>justThis : Symbol(justThis, Decl(thisTypeInFunctions.ts, 30, 1))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 31, 18))
+>y : Symbol(y, Decl(thisTypeInFunctions.ts, 31, 25))
+
+    return this.y;
+>this.y : Symbol(y, Decl(thisTypeInFunctions.ts, 31, 25))
+>this : Symbol(, Decl(thisTypeInFunctions.ts, 31, 23))
+>y : Symbol(y, Decl(thisTypeInFunctions.ts, 31, 25))
+}
+function implicitThis(n: number): number {
+>implicitThis : Symbol(implicitThis, Decl(thisTypeInFunctions.ts, 33, 1))
+>n : Symbol(n, Decl(thisTypeInFunctions.ts, 34, 22))
+
+    return this.m + n + 12;
+>n : Symbol(n, Decl(thisTypeInFunctions.ts, 34, 22))
+}
+let impl: I = {
+>impl : Symbol(impl, Decl(thisTypeInFunctions.ts, 37, 3))
+>I : Symbol(I, Decl(thisTypeInFunctions.ts, 19, 21))
+
+    a: 12,
+>a : Symbol(a, Decl(thisTypeInFunctions.ts, 37, 15))
+
+    explicitVoid2: () => this.a, // ok, this: any because it refers to some outer object (window?)
+>explicitVoid2 : Symbol(explicitVoid2, Decl(thisTypeInFunctions.ts, 38, 10))
+
+    explicitVoid1() { return 12; },
+>explicitVoid1 : Symbol(explicitVoid1, Decl(thisTypeInFunctions.ts, 39, 32))
+
+    explicitStructural() {
+>explicitStructural : Symbol(explicitStructural, Decl(thisTypeInFunctions.ts, 40, 35))
+
+        return this.a;
+>this.a : Symbol(a, Decl(thisTypeInFunctions.ts, 24, 30))
+>this : Symbol(, Decl(thisTypeInFunctions.ts, 24, 28))
+>a : Symbol(a, Decl(thisTypeInFunctions.ts, 24, 30))
+
+    },
+    explicitInterface() {
+>explicitInterface : Symbol(explicitInterface, Decl(thisTypeInFunctions.ts, 43, 6))
+
+        return this.a;
+>this.a : Symbol(I.a, Decl(thisTypeInFunctions.ts, 20, 13))
+>this : Symbol(I, Decl(thisTypeInFunctions.ts, 19, 21))
+>a : Symbol(I.a, Decl(thisTypeInFunctions.ts, 20, 13))
+
+    },
+    explicitThis() {
+>explicitThis : Symbol(explicitThis, Decl(thisTypeInFunctions.ts, 46, 6))
+
+        return this.a;
+>this.a : Symbol(I.a, Decl(thisTypeInFunctions.ts, 20, 13))
+>this : Symbol(I, Decl(thisTypeInFunctions.ts, 19, 21))
+>a : Symbol(I.a, Decl(thisTypeInFunctions.ts, 20, 13))
+
+    },
+}
+impl.explicitVoid1 = function () { return 12; };
+>impl.explicitVoid1 : Symbol(I.explicitVoid1, Decl(thisTypeInFunctions.ts, 21, 14))
+>impl : Symbol(impl, Decl(thisTypeInFunctions.ts, 37, 3))
+>explicitVoid1 : Symbol(I.explicitVoid1, Decl(thisTypeInFunctions.ts, 21, 14))
+
+impl.explicitVoid2 = () => 12;
+>impl.explicitVoid2 : Symbol(I.explicitVoid2, Decl(thisTypeInFunctions.ts, 22, 38))
+>impl : Symbol(impl, Decl(thisTypeInFunctions.ts, 37, 3))
+>explicitVoid2 : Symbol(I.explicitVoid2, Decl(thisTypeInFunctions.ts, 22, 38))
+
+impl.explicitStructural = function() { return this.a; };
+>impl.explicitStructural : Symbol(I.explicitStructural, Decl(thisTypeInFunctions.ts, 23, 38))
+>impl : Symbol(impl, Decl(thisTypeInFunctions.ts, 37, 3))
+>explicitStructural : Symbol(I.explicitStructural, Decl(thisTypeInFunctions.ts, 23, 38))
+>this.a : Symbol(a, Decl(thisTypeInFunctions.ts, 24, 30))
+>this : Symbol(, Decl(thisTypeInFunctions.ts, 24, 28))
+>a : Symbol(a, Decl(thisTypeInFunctions.ts, 24, 30))
+
+impl.explicitInterface = function() { return this.a; };
+>impl.explicitInterface : Symbol(I.explicitInterface, Decl(thisTypeInFunctions.ts, 24, 50))
+>impl : Symbol(impl, Decl(thisTypeInFunctions.ts, 37, 3))
+>explicitInterface : Symbol(I.explicitInterface, Decl(thisTypeInFunctions.ts, 24, 50))
+>this.a : Symbol(I.a, Decl(thisTypeInFunctions.ts, 20, 13))
+>this : Symbol(I, Decl(thisTypeInFunctions.ts, 19, 21))
+>a : Symbol(I.a, Decl(thisTypeInFunctions.ts, 20, 13))
+
+impl.explicitStructural = () => 12;
+>impl.explicitStructural : Symbol(I.explicitStructural, Decl(thisTypeInFunctions.ts, 23, 38))
+>impl : Symbol(impl, Decl(thisTypeInFunctions.ts, 37, 3))
+>explicitStructural : Symbol(I.explicitStructural, Decl(thisTypeInFunctions.ts, 23, 38))
+
+impl.explicitInterface = () => 12;
+>impl.explicitInterface : Symbol(I.explicitInterface, Decl(thisTypeInFunctions.ts, 24, 50))
+>impl : Symbol(impl, Decl(thisTypeInFunctions.ts, 37, 3))
+>explicitInterface : Symbol(I.explicitInterface, Decl(thisTypeInFunctions.ts, 24, 50))
+
+impl.explicitThis = function () { return this.a; };
+>impl.explicitThis : Symbol(I.explicitThis, Decl(thisTypeInFunctions.ts, 25, 39))
+>impl : Symbol(impl, Decl(thisTypeInFunctions.ts, 37, 3))
+>explicitThis : Symbol(I.explicitThis, Decl(thisTypeInFunctions.ts, 25, 39))
+>this.a : Symbol(I.a, Decl(thisTypeInFunctions.ts, 20, 13))
+>this : Symbol(I, Decl(thisTypeInFunctions.ts, 19, 21))
+>a : Symbol(I.a, Decl(thisTypeInFunctions.ts, 20, 13))
+
+// parameter checking
+let ok: {y: number, f: (this: { y: number }, x: number) => number} = { y: 12, f: explicitStructural };
+>ok : Symbol(ok, Decl(thisTypeInFunctions.ts, 59, 3))
+>y : Symbol(y, Decl(thisTypeInFunctions.ts, 59, 9))
+>f : Symbol(f, Decl(thisTypeInFunctions.ts, 59, 19))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 59, 24))
+>y : Symbol(y, Decl(thisTypeInFunctions.ts, 59, 31))
+>x : Symbol(x, Decl(thisTypeInFunctions.ts, 59, 44))
+>y : Symbol(y, Decl(thisTypeInFunctions.ts, 59, 70))
+>f : Symbol(f, Decl(thisTypeInFunctions.ts, 59, 77))
+>explicitStructural : Symbol(explicitStructural, Decl(thisTypeInFunctions.ts, 27, 1))
+
+let implicitAnyOk: {notSpecified: number, f: (x: number) => number} = { notSpecified: 12, f: implicitThis };
+>implicitAnyOk : Symbol(implicitAnyOk, Decl(thisTypeInFunctions.ts, 60, 3))
+>notSpecified : Symbol(notSpecified, Decl(thisTypeInFunctions.ts, 60, 20))
+>f : Symbol(f, Decl(thisTypeInFunctions.ts, 60, 41))
+>x : Symbol(x, Decl(thisTypeInFunctions.ts, 60, 46))
+>notSpecified : Symbol(notSpecified, Decl(thisTypeInFunctions.ts, 60, 71))
+>f : Symbol(f, Decl(thisTypeInFunctions.ts, 60, 89))
+>implicitThis : Symbol(implicitThis, Decl(thisTypeInFunctions.ts, 33, 1))
+
+ok.f(13);
+>ok.f : Symbol(f, Decl(thisTypeInFunctions.ts, 59, 19))
+>ok : Symbol(ok, Decl(thisTypeInFunctions.ts, 59, 3))
+>f : Symbol(f, Decl(thisTypeInFunctions.ts, 59, 19))
+
+implicitThis(12);
+>implicitThis : Symbol(implicitThis, Decl(thisTypeInFunctions.ts, 33, 1))
+
+implicitAnyOk.f(12);
+>implicitAnyOk.f : Symbol(f, Decl(thisTypeInFunctions.ts, 60, 41))
+>implicitAnyOk : Symbol(implicitAnyOk, Decl(thisTypeInFunctions.ts, 60, 3))
+>f : Symbol(f, Decl(thisTypeInFunctions.ts, 60, 41))
+
+let c = new C();
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>C : Symbol(C, Decl(thisTypeInFunctions.ts, 3, 1))
+
+let d = new D();
+>d : Symbol(d, Decl(thisTypeInFunctions.ts, 66, 3))
+>D : Symbol(D, Decl(thisTypeInFunctions.ts, 18, 1))
+
+let ripped = c.explicitC;
+>ripped : Symbol(ripped, Decl(thisTypeInFunctions.ts, 67, 3))
+>c.explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
+
+c.explicitC(12);
+>c.explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
+
+c.explicitProperty(12);
+>c.explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
+
+c.explicitThis(12);
+>c.explicitThis : Symbol(C.explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitThis : Symbol(C.explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
+
+d.explicitC(12);
+>d.explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
+>d : Symbol(d, Decl(thisTypeInFunctions.ts, 66, 3))
+>explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
+
+d.explicitProperty(12);
+>d.explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
+>d : Symbol(d, Decl(thisTypeInFunctions.ts, 66, 3))
+>explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
+
+d.explicitThis(12);
+>d.explicitThis : Symbol(C.explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
+>d : Symbol(d, Decl(thisTypeInFunctions.ts, 66, 3))
+>explicitThis : Symbol(C.explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
+
+let reconstructed: { 
+>reconstructed : Symbol(reconstructed, Decl(thisTypeInFunctions.ts, 74, 3))
+
+    n: number,
+>n : Symbol(n, Decl(thisTypeInFunctions.ts, 74, 20))
+
+    explicitThis(this: C, m: number): number, // note: this: this is not allowed in an object literal type.
+>explicitThis : Symbol(explicitThis, Decl(thisTypeInFunctions.ts, 75, 14))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 76, 17))
+>C : Symbol(C, Decl(thisTypeInFunctions.ts, 3, 1))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 76, 25))
+
+    explicitC(this: C, m: number): number,
+>explicitC : Symbol(explicitC, Decl(thisTypeInFunctions.ts, 76, 45))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 77, 14))
+>C : Symbol(C, Decl(thisTypeInFunctions.ts, 3, 1))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 77, 22))
+
+    explicitProperty: (this: {n : number}, m: number) => number,
+>explicitProperty : Symbol(explicitProperty, Decl(thisTypeInFunctions.ts, 77, 42))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 78, 23))
+>n : Symbol(n, Decl(thisTypeInFunctions.ts, 78, 30))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 78, 42))
+
+    explicitVoid(this: void, m: number): number,
+>explicitVoid : Symbol(explicitVoid, Decl(thisTypeInFunctions.ts, 78, 64))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 79, 17))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 79, 28))
+
+} = { 
+    n: 12,
+>n : Symbol(n, Decl(thisTypeInFunctions.ts, 80, 5))
+
+    explicitThis: c.explicitThis,
+>explicitThis : Symbol(explicitThis, Decl(thisTypeInFunctions.ts, 81, 10))
+>c.explicitThis : Symbol(C.explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitThis : Symbol(C.explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
+
+    explicitC: c.explicitC,
+>explicitC : Symbol(explicitC, Decl(thisTypeInFunctions.ts, 82, 33))
+>c.explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
+
+    explicitProperty: c.explicitProperty,
+>explicitProperty : Symbol(explicitProperty, Decl(thisTypeInFunctions.ts, 83, 27))
+>c.explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
+
+    explicitVoid: c.explicitVoid
+>explicitVoid : Symbol(explicitVoid, Decl(thisTypeInFunctions.ts, 84, 41))
+>c.explicitVoid : Symbol(C.explicitVoid, Decl(thisTypeInFunctions.ts, 14, 5))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitVoid : Symbol(C.explicitVoid, Decl(thisTypeInFunctions.ts, 14, 5))
+
+};
+reconstructed.explicitThis(10);
+>reconstructed.explicitThis : Symbol(explicitThis, Decl(thisTypeInFunctions.ts, 75, 14))
+>reconstructed : Symbol(reconstructed, Decl(thisTypeInFunctions.ts, 74, 3))
+>explicitThis : Symbol(explicitThis, Decl(thisTypeInFunctions.ts, 75, 14))
+
+reconstructed.explicitProperty(11);
+>reconstructed.explicitProperty : Symbol(explicitProperty, Decl(thisTypeInFunctions.ts, 77, 42))
+>reconstructed : Symbol(reconstructed, Decl(thisTypeInFunctions.ts, 74, 3))
+>explicitProperty : Symbol(explicitProperty, Decl(thisTypeInFunctions.ts, 77, 42))
+
+let explicitVoid = reconstructed.explicitVoid;
+>explicitVoid : Symbol(explicitVoid, Decl(thisTypeInFunctions.ts, 89, 3))
+>reconstructed.explicitVoid : Symbol(explicitVoid, Decl(thisTypeInFunctions.ts, 78, 64))
+>reconstructed : Symbol(reconstructed, Decl(thisTypeInFunctions.ts, 74, 3))
+>explicitVoid : Symbol(explicitVoid, Decl(thisTypeInFunctions.ts, 78, 64))
+
+explicitVoid(12);
+>explicitVoid : Symbol(explicitVoid, Decl(thisTypeInFunctions.ts, 89, 3))
+
+// assignment checking
+let unboundToSpecified: (this: { y: number }, x: number) => number = x => x + this.y; // ok, this:any
+>unboundToSpecified : Symbol(unboundToSpecified, Decl(thisTypeInFunctions.ts, 92, 3))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 92, 25))
+>y : Symbol(y, Decl(thisTypeInFunctions.ts, 92, 32))
+>x : Symbol(x, Decl(thisTypeInFunctions.ts, 92, 45))
+>x : Symbol(x, Decl(thisTypeInFunctions.ts, 92, 68))
+>x : Symbol(x, Decl(thisTypeInFunctions.ts, 92, 68))
+
+let specifiedToSpecified: (this: {y: number}, x: number) => number = explicitStructural;
+>specifiedToSpecified : Symbol(specifiedToSpecified, Decl(thisTypeInFunctions.ts, 93, 3))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 93, 27))
+>y : Symbol(y, Decl(thisTypeInFunctions.ts, 93, 34))
+>x : Symbol(x, Decl(thisTypeInFunctions.ts, 93, 45))
+>explicitStructural : Symbol(explicitStructural, Decl(thisTypeInFunctions.ts, 27, 1))
+
+let anyToSpecified: (this: { y: number }, x: number) => number = function(x: number): number { return x + 12; };
+>anyToSpecified : Symbol(anyToSpecified, Decl(thisTypeInFunctions.ts, 94, 3))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 94, 21))
+>y : Symbol(y, Decl(thisTypeInFunctions.ts, 94, 28))
+>x : Symbol(x, Decl(thisTypeInFunctions.ts, 94, 41))
+>x : Symbol(x, Decl(thisTypeInFunctions.ts, 94, 74))
+>x : Symbol(x, Decl(thisTypeInFunctions.ts, 94, 74))
+
+let unspecifiedLambda: (x: number) => number = x => x + 12;
+>unspecifiedLambda : Symbol(unspecifiedLambda, Decl(thisTypeInFunctions.ts, 96, 3))
+>x : Symbol(x, Decl(thisTypeInFunctions.ts, 96, 24))
+>x : Symbol(x, Decl(thisTypeInFunctions.ts, 96, 46))
+>x : Symbol(x, Decl(thisTypeInFunctions.ts, 96, 46))
+
+let specifiedLambda: (this: void, x: number) => number = x => x + 12;
+>specifiedLambda : Symbol(specifiedLambda, Decl(thisTypeInFunctions.ts, 97, 3))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 97, 22))
+>x : Symbol(x, Decl(thisTypeInFunctions.ts, 97, 33))
+>x : Symbol(x, Decl(thisTypeInFunctions.ts, 97, 56))
+>x : Symbol(x, Decl(thisTypeInFunctions.ts, 97, 56))
+
+let unspecifiedLambdaToSpecified: (this: {y: number}, x: number) => number = unspecifiedLambda;
+>unspecifiedLambdaToSpecified : Symbol(unspecifiedLambdaToSpecified, Decl(thisTypeInFunctions.ts, 98, 3))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 98, 35))
+>y : Symbol(y, Decl(thisTypeInFunctions.ts, 98, 42))
+>x : Symbol(x, Decl(thisTypeInFunctions.ts, 98, 53))
+>unspecifiedLambda : Symbol(unspecifiedLambda, Decl(thisTypeInFunctions.ts, 96, 3))
+
+let specifiedLambdaToSpecified: (this: {y: number}, x: number) => number = specifiedLambda;
+>specifiedLambdaToSpecified : Symbol(specifiedLambdaToSpecified, Decl(thisTypeInFunctions.ts, 99, 3))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 99, 33))
+>y : Symbol(y, Decl(thisTypeInFunctions.ts, 99, 40))
+>x : Symbol(x, Decl(thisTypeInFunctions.ts, 99, 51))
+>specifiedLambda : Symbol(specifiedLambda, Decl(thisTypeInFunctions.ts, 97, 3))
+
+
+let explicitCFunction: (this: C, m: number) => number;
+>explicitCFunction : Symbol(explicitCFunction, Decl(thisTypeInFunctions.ts, 102, 3))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 102, 24))
+>C : Symbol(C, Decl(thisTypeInFunctions.ts, 3, 1))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 102, 32))
+
+let explicitPropertyFunction: (this: {n: number}, m: number) => number;
+>explicitPropertyFunction : Symbol(explicitPropertyFunction, Decl(thisTypeInFunctions.ts, 103, 3))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 103, 31))
+>n : Symbol(n, Decl(thisTypeInFunctions.ts, 103, 38))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 103, 49))
+
+c.explicitC = explicitCFunction;
+>c.explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
+>explicitCFunction : Symbol(explicitCFunction, Decl(thisTypeInFunctions.ts, 102, 3))
+
+c.explicitC = function(this: C, m: number) { return this.n + m };
+>c.explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 105, 23))
+>C : Symbol(C, Decl(thisTypeInFunctions.ts, 3, 1))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 105, 31))
+>this.n : Symbol(C.n, Decl(thisTypeInFunctions.ts, 4, 9))
+>this : Symbol(C, Decl(thisTypeInFunctions.ts, 3, 1))
+>n : Symbol(C.n, Decl(thisTypeInFunctions.ts, 4, 9))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 105, 31))
+
+c.explicitProperty = explicitPropertyFunction;
+>c.explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
+>explicitPropertyFunction : Symbol(explicitPropertyFunction, Decl(thisTypeInFunctions.ts, 103, 3))
+
+c.explicitProperty = function(this: {n: number}, m: number) { return this.n + m };
+>c.explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 107, 30))
+>n : Symbol(n, Decl(thisTypeInFunctions.ts, 107, 37))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 107, 48))
+>this.n : Symbol(n, Decl(thisTypeInFunctions.ts, 107, 37))
+>this : Symbol(, Decl(thisTypeInFunctions.ts, 107, 35))
+>n : Symbol(n, Decl(thisTypeInFunctions.ts, 107, 37))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 107, 48))
+
+c.explicitProperty = reconstructed.explicitProperty;
+>c.explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
+>reconstructed.explicitProperty : Symbol(explicitProperty, Decl(thisTypeInFunctions.ts, 77, 42))
+>reconstructed : Symbol(reconstructed, Decl(thisTypeInFunctions.ts, 74, 3))
+>explicitProperty : Symbol(explicitProperty, Decl(thisTypeInFunctions.ts, 77, 42))
+
+// lambdas are assignable to anything
+c.explicitC = m => m;
+>c.explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 111, 13))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 111, 13))
+
+c.explicitThis = m => m;
+>c.explicitThis : Symbol(C.explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitThis : Symbol(C.explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 112, 16))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 112, 16))
+
+c.explicitProperty = m => m;
+>c.explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 113, 20))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 113, 20))
+
+// this inside lambdas refer to outer scope
+// the outer-scoped lambda at top-level is still just `any`
+c.explicitC = m => m + this.n;
+>c.explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 117, 13))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 117, 13))
+
+c.explicitThis = m => m + this.n;
+>c.explicitThis : Symbol(C.explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitThis : Symbol(C.explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 118, 16))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 118, 16))
+
+c.explicitProperty = m => m + this.n;
+>c.explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 119, 20))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 119, 20))
+
+//NOTE: this=C here, I guess?
+c.explicitThis = explicitCFunction;
+>c.explicitThis : Symbol(C.explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitThis : Symbol(C.explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
+>explicitCFunction : Symbol(explicitCFunction, Decl(thisTypeInFunctions.ts, 102, 3))
+
+c.explicitThis = function(this: C, m: number) { return this.n + m };
+>c.explicitThis : Symbol(C.explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitThis : Symbol(C.explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 123, 26))
+>C : Symbol(C, Decl(thisTypeInFunctions.ts, 3, 1))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 123, 34))
+>this.n : Symbol(C.n, Decl(thisTypeInFunctions.ts, 4, 9))
+>this : Symbol(C, Decl(thisTypeInFunctions.ts, 3, 1))
+>n : Symbol(C.n, Decl(thisTypeInFunctions.ts, 4, 9))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 123, 34))
+
+// this:any compatibility
+c.explicitC = function(m) { return this.n + m };
+>c.explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 126, 23))
+>this.n : Symbol(C.n, Decl(thisTypeInFunctions.ts, 4, 9))
+>this : Symbol(C, Decl(thisTypeInFunctions.ts, 3, 1))
+>n : Symbol(C.n, Decl(thisTypeInFunctions.ts, 4, 9))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 126, 23))
+
+c.explicitProperty = function(m) { return this.n + m };
+>c.explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 127, 30))
+>this.n : Symbol(n, Decl(thisTypeInFunctions.ts, 12, 28))
+>this : Symbol(, Decl(thisTypeInFunctions.ts, 12, 26))
+>n : Symbol(n, Decl(thisTypeInFunctions.ts, 12, 28))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 127, 30))
+
+c.explicitThis = function(m) { return this.n + m };
+>c.explicitThis : Symbol(C.explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitThis : Symbol(C.explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 128, 26))
+>this.n : Symbol(C.n, Decl(thisTypeInFunctions.ts, 4, 9))
+>this : Symbol(C, Decl(thisTypeInFunctions.ts, 3, 1))
+>n : Symbol(C.n, Decl(thisTypeInFunctions.ts, 4, 9))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 128, 26))
+
+// this: contextual typing
+c.explicitThis = function(this, m) { return this.n + m };
+>c.explicitThis : Symbol(C.explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitThis : Symbol(C.explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 131, 26))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 131, 31))
+>this.n : Symbol(C.n, Decl(thisTypeInFunctions.ts, 4, 9))
+>this : Symbol(C, Decl(thisTypeInFunctions.ts, 3, 1))
+>n : Symbol(C.n, Decl(thisTypeInFunctions.ts, 4, 9))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 131, 31))
+
+// this: superclass compatibility
+c.explicitC = function(this: B, m: number) { return this.n + m };
+>c.explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 134, 23))
+>B : Symbol(B, Decl(thisTypeInFunctions.ts, 0, 0))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 134, 31))
+>this.n : Symbol(B.n, Decl(thisTypeInFunctions.ts, 1, 9))
+>this : Symbol(B, Decl(thisTypeInFunctions.ts, 0, 0))
+>n : Symbol(B.n, Decl(thisTypeInFunctions.ts, 1, 9))
+>m : Symbol(m, Decl(thisTypeInFunctions.ts, 134, 31))
+
+// this:void compatibility
+c.explicitVoid = n => n;
+>c.explicitVoid : Symbol(C.explicitVoid, Decl(thisTypeInFunctions.ts, 14, 5))
+>c : Symbol(c, Decl(thisTypeInFunctions.ts, 65, 3))
+>explicitVoid : Symbol(C.explicitVoid, Decl(thisTypeInFunctions.ts, 14, 5))
+>n : Symbol(n, Decl(thisTypeInFunctions.ts, 137, 16))
+>n : Symbol(n, Decl(thisTypeInFunctions.ts, 137, 16))
+
+// class-based assignability
+class Base1 {
+>Base1 : Symbol(Base1, Decl(thisTypeInFunctions.ts, 137, 24))
+
+    x: number;
+>x : Symbol(Base1.x, Decl(thisTypeInFunctions.ts, 140, 13))
+
+    public polymorphic(this: this): number { return this.x; }
+>polymorphic : Symbol(Base1.polymorphic, Decl(thisTypeInFunctions.ts, 141, 14))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 142, 23))
+>this.x : Symbol(Base1.x, Decl(thisTypeInFunctions.ts, 140, 13))
+>this : Symbol(Base1, Decl(thisTypeInFunctions.ts, 137, 24))
+>x : Symbol(Base1.x, Decl(thisTypeInFunctions.ts, 140, 13))
+
+    explicit(this: Base1): number { return this.x; }
+>explicit : Symbol(Base1.explicit, Decl(thisTypeInFunctions.ts, 142, 61))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 143, 13))
+>Base1 : Symbol(Base1, Decl(thisTypeInFunctions.ts, 137, 24))
+>this.x : Symbol(Base1.x, Decl(thisTypeInFunctions.ts, 140, 13))
+>this : Symbol(Base1, Decl(thisTypeInFunctions.ts, 137, 24))
+>x : Symbol(Base1.x, Decl(thisTypeInFunctions.ts, 140, 13))
+
+    static explicitStatic(this: typeof Base1): number { return this.y; }
+>explicitStatic : Symbol(Base1.explicitStatic, Decl(thisTypeInFunctions.ts, 143, 52))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 144, 26))
+>Base1 : Symbol(Base1, Decl(thisTypeInFunctions.ts, 137, 24))
+>this.y : Symbol(Base1.y, Decl(thisTypeInFunctions.ts, 144, 72))
+>this : Symbol(Base1, Decl(thisTypeInFunctions.ts, 137, 24))
+>y : Symbol(Base1.y, Decl(thisTypeInFunctions.ts, 144, 72))
+
+    static y: number;
+>y : Symbol(Base1.y, Decl(thisTypeInFunctions.ts, 144, 72))
+}
+class Derived1 extends Base1 {
+>Derived1 : Symbol(Derived1, Decl(thisTypeInFunctions.ts, 146, 1))
+>Base1 : Symbol(Base1, Decl(thisTypeInFunctions.ts, 137, 24))
+
+    y: number
+>y : Symbol(Derived1.y, Decl(thisTypeInFunctions.ts, 147, 30))
+}
+class Base2 {
+>Base2 : Symbol(Base2, Decl(thisTypeInFunctions.ts, 149, 1))
+
+    y: number
+>y : Symbol(Base2.y, Decl(thisTypeInFunctions.ts, 150, 13))
+
+    polymorphic(this: this): number { return this.y; }
+>polymorphic : Symbol(Base2.polymorphic, Decl(thisTypeInFunctions.ts, 151, 13))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 152, 16))
+>this.y : Symbol(Base2.y, Decl(thisTypeInFunctions.ts, 150, 13))
+>this : Symbol(Base2, Decl(thisTypeInFunctions.ts, 149, 1))
+>y : Symbol(Base2.y, Decl(thisTypeInFunctions.ts, 150, 13))
+
+    explicit(this: Base1): number { return this.x; }
+>explicit : Symbol(Base2.explicit, Decl(thisTypeInFunctions.ts, 152, 54))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 153, 13))
+>Base1 : Symbol(Base1, Decl(thisTypeInFunctions.ts, 137, 24))
+>this.x : Symbol(Base1.x, Decl(thisTypeInFunctions.ts, 140, 13))
+>this : Symbol(Base1, Decl(thisTypeInFunctions.ts, 137, 24))
+>x : Symbol(Base1.x, Decl(thisTypeInFunctions.ts, 140, 13))
+}
+class Derived2 extends Base2 {
+>Derived2 : Symbol(Derived2, Decl(thisTypeInFunctions.ts, 154, 1))
+>Base2 : Symbol(Base2, Decl(thisTypeInFunctions.ts, 149, 1))
+
+    x: number
+>x : Symbol(Derived2.x, Decl(thisTypeInFunctions.ts, 155, 30))
+}
+let b1 = new Base1();
+>b1 : Symbol(b1, Decl(thisTypeInFunctions.ts, 158, 3))
+>Base1 : Symbol(Base1, Decl(thisTypeInFunctions.ts, 137, 24))
+
+let b2 = new Base2();
+>b2 : Symbol(b2, Decl(thisTypeInFunctions.ts, 159, 3))
+>Base2 : Symbol(Base2, Decl(thisTypeInFunctions.ts, 149, 1))
+
+let d1 = new Derived1();
+>d1 : Symbol(d1, Decl(thisTypeInFunctions.ts, 160, 3))
+>Derived1 : Symbol(Derived1, Decl(thisTypeInFunctions.ts, 146, 1))
+
+let d2 = new Derived2();
+>d2 : Symbol(d2, Decl(thisTypeInFunctions.ts, 161, 3))
+>Derived2 : Symbol(Derived2, Decl(thisTypeInFunctions.ts, 154, 1))
+
+d2.polymorphic = d1.polymorphic // ok, 'x' and 'y' in { x, y }
+>d2.polymorphic : Symbol(Base2.polymorphic, Decl(thisTypeInFunctions.ts, 151, 13))
+>d2 : Symbol(d2, Decl(thisTypeInFunctions.ts, 161, 3))
+>polymorphic : Symbol(Base2.polymorphic, Decl(thisTypeInFunctions.ts, 151, 13))
+>d1.polymorphic : Symbol(Base1.polymorphic, Decl(thisTypeInFunctions.ts, 141, 14))
+>d1 : Symbol(d1, Decl(thisTypeInFunctions.ts, 160, 3))
+>polymorphic : Symbol(Base1.polymorphic, Decl(thisTypeInFunctions.ts, 141, 14))
+
+d1.polymorphic = d2.polymorphic // ok, 'x' and 'y' in { x, y }
+>d1.polymorphic : Symbol(Base1.polymorphic, Decl(thisTypeInFunctions.ts, 141, 14))
+>d1 : Symbol(d1, Decl(thisTypeInFunctions.ts, 160, 3))
+>polymorphic : Symbol(Base1.polymorphic, Decl(thisTypeInFunctions.ts, 141, 14))
+>d2.polymorphic : Symbol(Base2.polymorphic, Decl(thisTypeInFunctions.ts, 151, 13))
+>d2 : Symbol(d2, Decl(thisTypeInFunctions.ts, 161, 3))
+>polymorphic : Symbol(Base2.polymorphic, Decl(thisTypeInFunctions.ts, 151, 13))
+
+// bivariance-allowed cases
+d1.polymorphic = b2.polymorphic // ok, 'y' in D: { x, y }
+>d1.polymorphic : Symbol(Base1.polymorphic, Decl(thisTypeInFunctions.ts, 141, 14))
+>d1 : Symbol(d1, Decl(thisTypeInFunctions.ts, 160, 3))
+>polymorphic : Symbol(Base1.polymorphic, Decl(thisTypeInFunctions.ts, 141, 14))
+>b2.polymorphic : Symbol(Base2.polymorphic, Decl(thisTypeInFunctions.ts, 151, 13))
+>b2 : Symbol(b2, Decl(thisTypeInFunctions.ts, 159, 3))
+>polymorphic : Symbol(Base2.polymorphic, Decl(thisTypeInFunctions.ts, 151, 13))
+
+d2.polymorphic = d1.explicit // ok, 'y' in { x, y }
+>d2.polymorphic : Symbol(Base2.polymorphic, Decl(thisTypeInFunctions.ts, 151, 13))
+>d2 : Symbol(d2, Decl(thisTypeInFunctions.ts, 161, 3))
+>polymorphic : Symbol(Base2.polymorphic, Decl(thisTypeInFunctions.ts, 151, 13))
+>d1.explicit : Symbol(Base1.explicit, Decl(thisTypeInFunctions.ts, 142, 61))
+>d1 : Symbol(d1, Decl(thisTypeInFunctions.ts, 160, 3))
+>explicit : Symbol(Base1.explicit, Decl(thisTypeInFunctions.ts, 142, 61))
+
+b1.polymorphic = d2.polymorphic // ok, 'x' and 'y' not in Base1: { x }
+>b1.polymorphic : Symbol(Base1.polymorphic, Decl(thisTypeInFunctions.ts, 141, 14))
+>b1 : Symbol(b1, Decl(thisTypeInFunctions.ts, 158, 3))
+>polymorphic : Symbol(Base1.polymorphic, Decl(thisTypeInFunctions.ts, 141, 14))
+>d2.polymorphic : Symbol(Base2.polymorphic, Decl(thisTypeInFunctions.ts, 151, 13))
+>d2 : Symbol(d2, Decl(thisTypeInFunctions.ts, 161, 3))
+>polymorphic : Symbol(Base2.polymorphic, Decl(thisTypeInFunctions.ts, 151, 13))
+
+b1.explicit = d2.polymorphic // ok, 'x' and 'y' not in Base1: { x }
+>b1.explicit : Symbol(Base1.explicit, Decl(thisTypeInFunctions.ts, 142, 61))
+>b1 : Symbol(b1, Decl(thisTypeInFunctions.ts, 158, 3))
+>explicit : Symbol(Base1.explicit, Decl(thisTypeInFunctions.ts, 142, 61))
+>d2.polymorphic : Symbol(Base2.polymorphic, Decl(thisTypeInFunctions.ts, 151, 13))
+>d2 : Symbol(d2, Decl(thisTypeInFunctions.ts, 161, 3))
+>polymorphic : Symbol(Base2.polymorphic, Decl(thisTypeInFunctions.ts, 151, 13))
+
+////// use this-type for construction with new ////
+function InterfaceThis(this: I) {
+>InterfaceThis : Symbol(InterfaceThis, Decl(thisTypeInFunctions.ts, 169, 28))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 172, 23))
+>I : Symbol(I, Decl(thisTypeInFunctions.ts, 19, 21))
+
+    this.a = 12;
+>this.a : Symbol(I.a, Decl(thisTypeInFunctions.ts, 20, 13))
+>this : Symbol(I, Decl(thisTypeInFunctions.ts, 19, 21))
+>a : Symbol(I.a, Decl(thisTypeInFunctions.ts, 20, 13))
+}
+function LiteralTypeThis(this: {x: string}) {
+>LiteralTypeThis : Symbol(LiteralTypeThis, Decl(thisTypeInFunctions.ts, 174, 1))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 175, 25))
+>x : Symbol(x, Decl(thisTypeInFunctions.ts, 175, 32))
+
+    this.x = "ok";
+>this.x : Symbol(x, Decl(thisTypeInFunctions.ts, 175, 32))
+>this : Symbol(, Decl(thisTypeInFunctions.ts, 175, 30))
+>x : Symbol(x, Decl(thisTypeInFunctions.ts, 175, 32))
+}
+function AnyThis(this: any) {
+>AnyThis : Symbol(AnyThis, Decl(thisTypeInFunctions.ts, 177, 1))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 178, 17))
+
+    this.x = "ok";
+}
+let interfaceThis = new InterfaceThis();
+>interfaceThis : Symbol(interfaceThis, Decl(thisTypeInFunctions.ts, 181, 3))
+>InterfaceThis : Symbol(InterfaceThis, Decl(thisTypeInFunctions.ts, 169, 28))
+
+let literalTypeThis = new LiteralTypeThis();
+>literalTypeThis : Symbol(literalTypeThis, Decl(thisTypeInFunctions.ts, 182, 3))
+>LiteralTypeThis : Symbol(LiteralTypeThis, Decl(thisTypeInFunctions.ts, 174, 1))
+
+let anyThis = new AnyThis();
+>anyThis : Symbol(anyThis, Decl(thisTypeInFunctions.ts, 183, 3))
+>AnyThis : Symbol(AnyThis, Decl(thisTypeInFunctions.ts, 177, 1))
+
+//// type parameter inference ////
+declare var f: { 
+>f : Symbol(f, Decl(thisTypeInFunctions.ts, 186, 11))
+
+    (this: void, x: number): number, 
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 187, 5))
+>x : Symbol(x, Decl(thisTypeInFunctions.ts, 187, 16))
+
+    call<U>(this: (...argArray: any[]) => U, ...argArray: any[]): U;
+>call : Symbol(call, Decl(thisTypeInFunctions.ts, 187, 36))
+>U : Symbol(U, Decl(thisTypeInFunctions.ts, 188, 9))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 188, 12))
+>argArray : Symbol(argArray, Decl(thisTypeInFunctions.ts, 188, 19))
+>U : Symbol(U, Decl(thisTypeInFunctions.ts, 188, 9))
+>argArray : Symbol(argArray, Decl(thisTypeInFunctions.ts, 188, 44))
+>U : Symbol(U, Decl(thisTypeInFunctions.ts, 188, 9))
+
+};
+let n: number = f.call(12);
+>n : Symbol(n, Decl(thisTypeInFunctions.ts, 190, 3))
+>f.call : Symbol(call, Decl(thisTypeInFunctions.ts, 187, 36))
+>f : Symbol(f, Decl(thisTypeInFunctions.ts, 186, 11))
+>call : Symbol(call, Decl(thisTypeInFunctions.ts, 187, 36))
+
+function missingTypeIsImplicitAny(this, a: number) { return this.anything + a; } 
+>missingTypeIsImplicitAny : Symbol(missingTypeIsImplicitAny, Decl(thisTypeInFunctions.ts, 190, 27))
+>this : Symbol(this, Decl(thisTypeInFunctions.ts, 192, 34))
+>a : Symbol(a, Decl(thisTypeInFunctions.ts, 192, 39))
+>a : Symbol(a, Decl(thisTypeInFunctions.ts, 192, 39))
+
diff --git a/tests/baselines/reference/thisTypeInFunctions.types b/tests/baselines/reference/thisTypeInFunctions.types
new file mode 100644
index 00000000000..ddef8544a54
--- /dev/null
+++ b/tests/baselines/reference/thisTypeInFunctions.types
@@ -0,0 +1,963 @@
+=== tests/cases/conformance/types/thisType/thisTypeInFunctions.ts ===
+// body checking
+class B {
+>B : B
+
+    n: number;
+>n : number
+}
+class C {
+>C : C
+
+    n: number;
+>n : number
+
+    explicitThis(this: this, m: number): number {
+>explicitThis : (this: this, m: number) => number
+>this : this
+>m : number
+
+        return this.n + m;
+>this.n + m : number
+>this.n : number
+>this : this
+>n : number
+>m : number
+    }
+    explicitC(this: C, m: number): number {
+>explicitC : (this: C, m: number) => number
+>this : C
+>C : C
+>m : number
+
+        return this.n + m;
+>this.n + m : number
+>this.n : number
+>this : C
+>n : number
+>m : number
+    }
+    explicitProperty(this: {n: number}, m: number): number {
+>explicitProperty : (this: { n: number; }, m: number) => number
+>this : { n: number; }
+>n : number
+>m : number
+
+        return this.n + m;
+>this.n + m : number
+>this.n : number
+>this : { n: number; }
+>n : number
+>m : number
+    }
+    explicitVoid(this: void, m: number): number {
+>explicitVoid : (this: void, m: number) => number
+>this : void
+>m : number
+
+        return m + 1;
+>m + 1 : number
+>m : number
+>1 : number
+    }
+}
+class D extends C { }
+>D : D
+>C : C
+
+interface I {
+>I : I
+
+    a: number;
+>a : number
+
+    explicitVoid1(this: void): number;
+>explicitVoid1 : (this: void) => number
+>this : void
+
+    explicitVoid2(this: void): number;
+>explicitVoid2 : (this: void) => number
+>this : void
+
+    explicitStructural(this: {a: number}): number;
+>explicitStructural : (this: { a: number; }) => number
+>this : { a: number; }
+>a : number
+
+    explicitInterface(this: I): number;
+>explicitInterface : (this: I) => number
+>this : I
+>I : I
+
+    explicitThis(this: this): number;
+>explicitThis : (this: this) => number
+>this : this
+}
+function explicitStructural(this: { y: number }, x: number): number {
+>explicitStructural : (this: { y: number; }, x: number) => number
+>this : { y: number; }
+>y : number
+>x : number
+
+    return x + this.y;
+>x + this.y : number
+>x : number
+>this.y : number
+>this : { y: number; }
+>y : number
+}
+function justThis(this: { y: number }): number {
+>justThis : (this: { y: number; }) => number
+>this : { y: number; }
+>y : number
+
+    return this.y;
+>this.y : number
+>this : { y: number; }
+>y : number
+}
+function implicitThis(n: number): number {
+>implicitThis : (n: number) => number
+>n : number
+
+    return this.m + n + 12;
+>this.m + n + 12 : any
+>this.m + n : any
+>this.m : any
+>this : any
+>m : any
+>n : number
+>12 : number
+}
+let impl: I = {
+>impl : I
+>I : I
+>{    a: 12,    explicitVoid2: () => this.a, // ok, this: any because it refers to some outer object (window?)    explicitVoid1() { return 12; },    explicitStructural() {        return this.a;    },    explicitInterface() {        return this.a;    },    explicitThis() {        return this.a;    },} : { a: number; explicitVoid2: () => any; explicitVoid1(): number; explicitStructural(): number; explicitInterface(): number; explicitThis(): number; }
+
+    a: 12,
+>a : number
+>12 : number
+
+    explicitVoid2: () => this.a, // ok, this: any because it refers to some outer object (window?)
+>explicitVoid2 : () => any
+>() => this.a : () => any
+>this.a : any
+>this : any
+>a : any
+
+    explicitVoid1() { return 12; },
+>explicitVoid1 : () => number
+>12 : number
+
+    explicitStructural() {
+>explicitStructural : () => number
+
+        return this.a;
+>this.a : number
+>this : { a: number; }
+>a : number
+
+    },
+    explicitInterface() {
+>explicitInterface : () => number
+
+        return this.a;
+>this.a : number
+>this : I
+>a : number
+
+    },
+    explicitThis() {
+>explicitThis : () => number
+
+        return this.a;
+>this.a : number
+>this : I
+>a : number
+
+    },
+}
+impl.explicitVoid1 = function () { return 12; };
+>impl.explicitVoid1 = function () { return 12; } : () => number
+>impl.explicitVoid1 : (this: void) => number
+>impl : I
+>explicitVoid1 : (this: void) => number
+>function () { return 12; } : () => number
+>12 : number
+
+impl.explicitVoid2 = () => 12;
+>impl.explicitVoid2 = () => 12 : () => number
+>impl.explicitVoid2 : (this: void) => number
+>impl : I
+>explicitVoid2 : (this: void) => number
+>() => 12 : () => number
+>12 : number
+
+impl.explicitStructural = function() { return this.a; };
+>impl.explicitStructural = function() { return this.a; } : () => number
+>impl.explicitStructural : (this: { a: number; }) => number
+>impl : I
+>explicitStructural : (this: { a: number; }) => number
+>function() { return this.a; } : () => number
+>this.a : number
+>this : { a: number; }
+>a : number
+
+impl.explicitInterface = function() { return this.a; };
+>impl.explicitInterface = function() { return this.a; } : () => number
+>impl.explicitInterface : (this: I) => number
+>impl : I
+>explicitInterface : (this: I) => number
+>function() { return this.a; } : () => number
+>this.a : number
+>this : I
+>a : number
+
+impl.explicitStructural = () => 12;
+>impl.explicitStructural = () => 12 : () => number
+>impl.explicitStructural : (this: { a: number; }) => number
+>impl : I
+>explicitStructural : (this: { a: number; }) => number
+>() => 12 : () => number
+>12 : number
+
+impl.explicitInterface = () => 12;
+>impl.explicitInterface = () => 12 : () => number
+>impl.explicitInterface : (this: I) => number
+>impl : I
+>explicitInterface : (this: I) => number
+>() => 12 : () => number
+>12 : number
+
+impl.explicitThis = function () { return this.a; };
+>impl.explicitThis = function () { return this.a; } : () => number
+>impl.explicitThis : (this: I) => number
+>impl : I
+>explicitThis : (this: I) => number
+>function () { return this.a; } : () => number
+>this.a : number
+>this : I
+>a : number
+
+// parameter checking
+let ok: {y: number, f: (this: { y: number }, x: number) => number} = { y: 12, f: explicitStructural };
+>ok : { y: number; f: (this: { y: number; }, x: number) => number; }
+>y : number
+>f : (this: { y: number; }, x: number) => number
+>this : { y: number; }
+>y : number
+>x : number
+>{ y: 12, f: explicitStructural } : { y: number; f: (this: { y: number; }, x: number) => number; }
+>y : number
+>12 : number
+>f : (this: { y: number; }, x: number) => number
+>explicitStructural : (this: { y: number; }, x: number) => number
+
+let implicitAnyOk: {notSpecified: number, f: (x: number) => number} = { notSpecified: 12, f: implicitThis };
+>implicitAnyOk : { notSpecified: number; f: (x: number) => number; }
+>notSpecified : number
+>f : (x: number) => number
+>x : number
+>{ notSpecified: 12, f: implicitThis } : { notSpecified: number; f: (n: number) => number; }
+>notSpecified : number
+>12 : number
+>f : (n: number) => number
+>implicitThis : (n: number) => number
+
+ok.f(13);
+>ok.f(13) : number
+>ok.f : (this: { y: number; }, x: number) => number
+>ok : { y: number; f: (this: { y: number; }, x: number) => number; }
+>f : (this: { y: number; }, x: number) => number
+>13 : number
+
+implicitThis(12);
+>implicitThis(12) : number
+>implicitThis : (n: number) => number
+>12 : number
+
+implicitAnyOk.f(12);
+>implicitAnyOk.f(12) : number
+>implicitAnyOk.f : (x: number) => number
+>implicitAnyOk : { notSpecified: number; f: (x: number) => number; }
+>f : (x: number) => number
+>12 : number
+
+let c = new C();
+>c : C
+>new C() : C
+>C : typeof C
+
+let d = new D();
+>d : D
+>new D() : D
+>D : typeof D
+
+let ripped = c.explicitC;
+>ripped : (this: C, m: number) => number
+>c.explicitC : (this: C, m: number) => number
+>c : C
+>explicitC : (this: C, m: number) => number
+
+c.explicitC(12);
+>c.explicitC(12) : number
+>c.explicitC : (this: C, m: number) => number
+>c : C
+>explicitC : (this: C, m: number) => number
+>12 : number
+
+c.explicitProperty(12);
+>c.explicitProperty(12) : number
+>c.explicitProperty : (this: { n: number; }, m: number) => number
+>c : C
+>explicitProperty : (this: { n: number; }, m: number) => number
+>12 : number
+
+c.explicitThis(12);
+>c.explicitThis(12) : number
+>c.explicitThis : (this: C, m: number) => number
+>c : C
+>explicitThis : (this: C, m: number) => number
+>12 : number
+
+d.explicitC(12);
+>d.explicitC(12) : number
+>d.explicitC : (this: C, m: number) => number
+>d : D
+>explicitC : (this: C, m: number) => number
+>12 : number
+
+d.explicitProperty(12);
+>d.explicitProperty(12) : number
+>d.explicitProperty : (this: { n: number; }, m: number) => number
+>d : D
+>explicitProperty : (this: { n: number; }, m: number) => number
+>12 : number
+
+d.explicitThis(12);
+>d.explicitThis(12) : number
+>d.explicitThis : (this: D, m: number) => number
+>d : D
+>explicitThis : (this: D, m: number) => number
+>12 : number
+
+let reconstructed: { 
+>reconstructed : { n: number; explicitThis(this: C, m: number): number; explicitC(this: C, m: number): number; explicitProperty: (this: { n: number; }, m: number) => number; explicitVoid(this: void, m: number): number; }
+
+    n: number,
+>n : number
+
+    explicitThis(this: C, m: number): number, // note: this: this is not allowed in an object literal type.
+>explicitThis : (this: C, m: number) => number
+>this : C
+>C : C
+>m : number
+
+    explicitC(this: C, m: number): number,
+>explicitC : (this: C, m: number) => number
+>this : C
+>C : C
+>m : number
+
+    explicitProperty: (this: {n : number}, m: number) => number,
+>explicitProperty : (this: { n: number; }, m: number) => number
+>this : { n: number; }
+>n : number
+>m : number
+
+    explicitVoid(this: void, m: number): number,
+>explicitVoid : (this: void, m: number) => number
+>this : void
+>m : number
+
+} = { 
+>{     n: 12,    explicitThis: c.explicitThis,    explicitC: c.explicitC,    explicitProperty: c.explicitProperty,    explicitVoid: c.explicitVoid} : { n: number; explicitThis: (this: C, m: number) => number; explicitC: (this: C, m: number) => number; explicitProperty: (this: { n: number; }, m: number) => number; explicitVoid: (this: void, m: number) => number; }
+
+    n: 12,
+>n : number
+>12 : number
+
+    explicitThis: c.explicitThis,
+>explicitThis : (this: C, m: number) => number
+>c.explicitThis : (this: C, m: number) => number
+>c : C
+>explicitThis : (this: C, m: number) => number
+
+    explicitC: c.explicitC,
+>explicitC : (this: C, m: number) => number
+>c.explicitC : (this: C, m: number) => number
+>c : C
+>explicitC : (this: C, m: number) => number
+
+    explicitProperty: c.explicitProperty,
+>explicitProperty : (this: { n: number; }, m: number) => number
+>c.explicitProperty : (this: { n: number; }, m: number) => number
+>c : C
+>explicitProperty : (this: { n: number; }, m: number) => number
+
+    explicitVoid: c.explicitVoid
+>explicitVoid : (this: void, m: number) => number
+>c.explicitVoid : (this: void, m: number) => number
+>c : C
+>explicitVoid : (this: void, m: number) => number
+
+};
+reconstructed.explicitThis(10);
+>reconstructed.explicitThis(10) : number
+>reconstructed.explicitThis : (this: C, m: number) => number
+>reconstructed : { n: number; explicitThis(this: C, m: number): number; explicitC(this: C, m: number): number; explicitProperty: (this: { n: number; }, m: number) => number; explicitVoid(this: void, m: number): number; }
+>explicitThis : (this: C, m: number) => number
+>10 : number
+
+reconstructed.explicitProperty(11);
+>reconstructed.explicitProperty(11) : number
+>reconstructed.explicitProperty : (this: { n: number; }, m: number) => number
+>reconstructed : { n: number; explicitThis(this: C, m: number): number; explicitC(this: C, m: number): number; explicitProperty: (this: { n: number; }, m: number) => number; explicitVoid(this: void, m: number): number; }
+>explicitProperty : (this: { n: number; }, m: number) => number
+>11 : number
+
+let explicitVoid = reconstructed.explicitVoid;
+>explicitVoid : (this: void, m: number) => number
+>reconstructed.explicitVoid : (this: void, m: number) => number
+>reconstructed : { n: number; explicitThis(this: C, m: number): number; explicitC(this: C, m: number): number; explicitProperty: (this: { n: number; }, m: number) => number; explicitVoid(this: void, m: number): number; }
+>explicitVoid : (this: void, m: number) => number
+
+explicitVoid(12);
+>explicitVoid(12) : number
+>explicitVoid : (this: void, m: number) => number
+>12 : number
+
+// assignment checking
+let unboundToSpecified: (this: { y: number }, x: number) => number = x => x + this.y; // ok, this:any
+>unboundToSpecified : (this: { y: number; }, x: number) => number
+>this : { y: number; }
+>y : number
+>x : number
+>x => x + this.y : (x: number) => any
+>x : number
+>x + this.y : any
+>x : number
+>this.y : any
+>this : any
+>y : any
+
+let specifiedToSpecified: (this: {y: number}, x: number) => number = explicitStructural;
+>specifiedToSpecified : (this: { y: number; }, x: number) => number
+>this : { y: number; }
+>y : number
+>x : number
+>explicitStructural : (this: { y: number; }, x: number) => number
+
+let anyToSpecified: (this: { y: number }, x: number) => number = function(x: number): number { return x + 12; };
+>anyToSpecified : (this: { y: number; }, x: number) => number
+>this : { y: number; }
+>y : number
+>x : number
+>function(x: number): number { return x + 12; } : (x: number) => number
+>x : number
+>x + 12 : number
+>x : number
+>12 : number
+
+let unspecifiedLambda: (x: number) => number = x => x + 12;
+>unspecifiedLambda : (x: number) => number
+>x : number
+>x => x + 12 : (x: number) => number
+>x : number
+>x + 12 : number
+>x : number
+>12 : number
+
+let specifiedLambda: (this: void, x: number) => number = x => x + 12;
+>specifiedLambda : (this: void, x: number) => number
+>this : void
+>x : number
+>x => x + 12 : (x: number) => number
+>x : number
+>x + 12 : number
+>x : number
+>12 : number
+
+let unspecifiedLambdaToSpecified: (this: {y: number}, x: number) => number = unspecifiedLambda;
+>unspecifiedLambdaToSpecified : (this: { y: number; }, x: number) => number
+>this : { y: number; }
+>y : number
+>x : number
+>unspecifiedLambda : (x: number) => number
+
+let specifiedLambdaToSpecified: (this: {y: number}, x: number) => number = specifiedLambda;
+>specifiedLambdaToSpecified : (this: { y: number; }, x: number) => number
+>this : { y: number; }
+>y : number
+>x : number
+>specifiedLambda : (this: void, x: number) => number
+
+
+let explicitCFunction: (this: C, m: number) => number;
+>explicitCFunction : (this: C, m: number) => number
+>this : C
+>C : C
+>m : number
+
+let explicitPropertyFunction: (this: {n: number}, m: number) => number;
+>explicitPropertyFunction : (this: { n: number; }, m: number) => number
+>this : { n: number; }
+>n : number
+>m : number
+
+c.explicitC = explicitCFunction;
+>c.explicitC = explicitCFunction : (this: C, m: number) => number
+>c.explicitC : (this: C, m: number) => number
+>c : C
+>explicitC : (this: C, m: number) => number
+>explicitCFunction : (this: C, m: number) => number
+
+c.explicitC = function(this: C, m: number) { return this.n + m };
+>c.explicitC = function(this: C, m: number) { return this.n + m } : (this: C, m: number) => number
+>c.explicitC : (this: C, m: number) => number
+>c : C
+>explicitC : (this: C, m: number) => number
+>function(this: C, m: number) { return this.n + m } : (this: C, m: number) => number
+>this : C
+>C : C
+>m : number
+>this.n + m : number
+>this.n : number
+>this : C
+>n : number
+>m : number
+
+c.explicitProperty = explicitPropertyFunction;
+>c.explicitProperty = explicitPropertyFunction : (this: { n: number; }, m: number) => number
+>c.explicitProperty : (this: { n: number; }, m: number) => number
+>c : C
+>explicitProperty : (this: { n: number; }, m: number) => number
+>explicitPropertyFunction : (this: { n: number; }, m: number) => number
+
+c.explicitProperty = function(this: {n: number}, m: number) { return this.n + m };
+>c.explicitProperty = function(this: {n: number}, m: number) { return this.n + m } : (this: { n: number; }, m: number) => number
+>c.explicitProperty : (this: { n: number; }, m: number) => number
+>c : C
+>explicitProperty : (this: { n: number; }, m: number) => number
+>function(this: {n: number}, m: number) { return this.n + m } : (this: { n: number; }, m: number) => number
+>this : { n: number; }
+>n : number
+>m : number
+>this.n + m : number
+>this.n : number
+>this : { n: number; }
+>n : number
+>m : number
+
+c.explicitProperty = reconstructed.explicitProperty;
+>c.explicitProperty = reconstructed.explicitProperty : (this: { n: number; }, m: number) => number
+>c.explicitProperty : (this: { n: number; }, m: number) => number
+>c : C
+>explicitProperty : (this: { n: number; }, m: number) => number
+>reconstructed.explicitProperty : (this: { n: number; }, m: number) => number
+>reconstructed : { n: number; explicitThis(this: C, m: number): number; explicitC(this: C, m: number): number; explicitProperty: (this: { n: number; }, m: number) => number; explicitVoid(this: void, m: number): number; }
+>explicitProperty : (this: { n: number; }, m: number) => number
+
+// lambdas are assignable to anything
+c.explicitC = m => m;
+>c.explicitC = m => m : (m: number) => number
+>c.explicitC : (this: C, m: number) => number
+>c : C
+>explicitC : (this: C, m: number) => number
+>m => m : (m: number) => number
+>m : number
+>m : number
+
+c.explicitThis = m => m;
+>c.explicitThis = m => m : (m: number) => number
+>c.explicitThis : (this: C, m: number) => number
+>c : C
+>explicitThis : (this: C, m: number) => number
+>m => m : (m: number) => number
+>m : number
+>m : number
+
+c.explicitProperty = m => m;
+>c.explicitProperty = m => m : (m: number) => number
+>c.explicitProperty : (this: { n: number; }, m: number) => number
+>c : C
+>explicitProperty : (this: { n: number; }, m: number) => number
+>m => m : (m: number) => number
+>m : number
+>m : number
+
+// this inside lambdas refer to outer scope
+// the outer-scoped lambda at top-level is still just `any`
+c.explicitC = m => m + this.n;
+>c.explicitC = m => m + this.n : (m: number) => any
+>c.explicitC : (this: C, m: number) => number
+>c : C
+>explicitC : (this: C, m: number) => number
+>m => m + this.n : (m: number) => any
+>m : number
+>m + this.n : any
+>m : number
+>this.n : any
+>this : any
+>n : any
+
+c.explicitThis = m => m + this.n;
+>c.explicitThis = m => m + this.n : (m: number) => any
+>c.explicitThis : (this: C, m: number) => number
+>c : C
+>explicitThis : (this: C, m: number) => number
+>m => m + this.n : (m: number) => any
+>m : number
+>m + this.n : any
+>m : number
+>this.n : any
+>this : any
+>n : any
+
+c.explicitProperty = m => m + this.n;
+>c.explicitProperty = m => m + this.n : (m: number) => any
+>c.explicitProperty : (this: { n: number; }, m: number) => number
+>c : C
+>explicitProperty : (this: { n: number; }, m: number) => number
+>m => m + this.n : (m: number) => any
+>m : number
+>m + this.n : any
+>m : number
+>this.n : any
+>this : any
+>n : any
+
+//NOTE: this=C here, I guess?
+c.explicitThis = explicitCFunction;
+>c.explicitThis = explicitCFunction : (this: C, m: number) => number
+>c.explicitThis : (this: C, m: number) => number
+>c : C
+>explicitThis : (this: C, m: number) => number
+>explicitCFunction : (this: C, m: number) => number
+
+c.explicitThis = function(this: C, m: number) { return this.n + m };
+>c.explicitThis = function(this: C, m: number) { return this.n + m } : (this: C, m: number) => number
+>c.explicitThis : (this: C, m: number) => number
+>c : C
+>explicitThis : (this: C, m: number) => number
+>function(this: C, m: number) { return this.n + m } : (this: C, m: number) => number
+>this : C
+>C : C
+>m : number
+>this.n + m : number
+>this.n : number
+>this : C
+>n : number
+>m : number
+
+// this:any compatibility
+c.explicitC = function(m) { return this.n + m };
+>c.explicitC = function(m) { return this.n + m } : (m: number) => number
+>c.explicitC : (this: C, m: number) => number
+>c : C
+>explicitC : (this: C, m: number) => number
+>function(m) { return this.n + m } : (m: number) => number
+>m : number
+>this.n + m : number
+>this.n : number
+>this : C
+>n : number
+>m : number
+
+c.explicitProperty = function(m) { return this.n + m };
+>c.explicitProperty = function(m) { return this.n + m } : (m: number) => number
+>c.explicitProperty : (this: { n: number; }, m: number) => number
+>c : C
+>explicitProperty : (this: { n: number; }, m: number) => number
+>function(m) { return this.n + m } : (m: number) => number
+>m : number
+>this.n + m : number
+>this.n : number
+>this : { n: number; }
+>n : number
+>m : number
+
+c.explicitThis = function(m) { return this.n + m };
+>c.explicitThis = function(m) { return this.n + m } : (m: number) => number
+>c.explicitThis : (this: C, m: number) => number
+>c : C
+>explicitThis : (this: C, m: number) => number
+>function(m) { return this.n + m } : (m: number) => number
+>m : number
+>this.n + m : number
+>this.n : number
+>this : C
+>n : number
+>m : number
+
+// this: contextual typing
+c.explicitThis = function(this, m) { return this.n + m };
+>c.explicitThis = function(this, m) { return this.n + m } : (this: any, m: number) => number
+>c.explicitThis : (this: C, m: number) => number
+>c : C
+>explicitThis : (this: C, m: number) => number
+>function(this, m) { return this.n + m } : (this: any, m: number) => number
+>this : C
+>m : number
+>this.n + m : number
+>this.n : number
+>this : C
+>n : number
+>m : number
+
+// this: superclass compatibility
+c.explicitC = function(this: B, m: number) { return this.n + m };
+>c.explicitC = function(this: B, m: number) { return this.n + m } : (this: B, m: number) => number
+>c.explicitC : (this: C, m: number) => number
+>c : C
+>explicitC : (this: C, m: number) => number
+>function(this: B, m: number) { return this.n + m } : (this: B, m: number) => number
+>this : B
+>B : B
+>m : number
+>this.n + m : number
+>this.n : number
+>this : B
+>n : number
+>m : number
+
+// this:void compatibility
+c.explicitVoid = n => n;
+>c.explicitVoid = n => n : (n: number) => number
+>c.explicitVoid : (this: void, m: number) => number
+>c : C
+>explicitVoid : (this: void, m: number) => number
+>n => n : (n: number) => number
+>n : number
+>n : number
+
+// class-based assignability
+class Base1 {
+>Base1 : Base1
+
+    x: number;
+>x : number
+
+    public polymorphic(this: this): number { return this.x; }
+>polymorphic : (this: this) => number
+>this : this
+>this.x : number
+>this : this
+>x : number
+
+    explicit(this: Base1): number { return this.x; }
+>explicit : (this: Base1) => number
+>this : Base1
+>Base1 : Base1
+>this.x : number
+>this : Base1
+>x : number
+
+    static explicitStatic(this: typeof Base1): number { return this.y; }
+>explicitStatic : (this: typeof Base1) => number
+>this : typeof Base1
+>Base1 : typeof Base1
+>this.y : number
+>this : typeof Base1
+>y : number
+
+    static y: number;
+>y : number
+}
+class Derived1 extends Base1 {
+>Derived1 : Derived1
+>Base1 : Base1
+
+    y: number
+>y : number
+}
+class Base2 {
+>Base2 : Base2
+
+    y: number
+>y : number
+
+    polymorphic(this: this): number { return this.y; }
+>polymorphic : (this: this) => number
+>this : this
+>this.y : number
+>this : this
+>y : number
+
+    explicit(this: Base1): number { return this.x; }
+>explicit : (this: Base1) => number
+>this : Base1
+>Base1 : Base1
+>this.x : number
+>this : Base1
+>x : number
+}
+class Derived2 extends Base2 {
+>Derived2 : Derived2
+>Base2 : Base2
+
+    x: number
+>x : number
+}
+let b1 = new Base1();
+>b1 : Base1
+>new Base1() : Base1
+>Base1 : typeof Base1
+
+let b2 = new Base2();
+>b2 : Base2
+>new Base2() : Base2
+>Base2 : typeof Base2
+
+let d1 = new Derived1();
+>d1 : Derived1
+>new Derived1() : Derived1
+>Derived1 : typeof Derived1
+
+let d2 = new Derived2();
+>d2 : Derived2
+>new Derived2() : Derived2
+>Derived2 : typeof Derived2
+
+d2.polymorphic = d1.polymorphic // ok, 'x' and 'y' in { x, y }
+>d2.polymorphic = d1.polymorphic : (this: Derived1) => number
+>d2.polymorphic : (this: Derived2) => number
+>d2 : Derived2
+>polymorphic : (this: Derived2) => number
+>d1.polymorphic : (this: Derived1) => number
+>d1 : Derived1
+>polymorphic : (this: Derived1) => number
+
+d1.polymorphic = d2.polymorphic // ok, 'x' and 'y' in { x, y }
+>d1.polymorphic = d2.polymorphic : (this: Derived2) => number
+>d1.polymorphic : (this: Derived1) => number
+>d1 : Derived1
+>polymorphic : (this: Derived1) => number
+>d2.polymorphic : (this: Derived2) => number
+>d2 : Derived2
+>polymorphic : (this: Derived2) => number
+
+// bivariance-allowed cases
+d1.polymorphic = b2.polymorphic // ok, 'y' in D: { x, y }
+>d1.polymorphic = b2.polymorphic : (this: Base2) => number
+>d1.polymorphic : (this: Derived1) => number
+>d1 : Derived1
+>polymorphic : (this: Derived1) => number
+>b2.polymorphic : (this: Base2) => number
+>b2 : Base2
+>polymorphic : (this: Base2) => number
+
+d2.polymorphic = d1.explicit // ok, 'y' in { x, y }
+>d2.polymorphic = d1.explicit : (this: Base1) => number
+>d2.polymorphic : (this: Derived2) => number
+>d2 : Derived2
+>polymorphic : (this: Derived2) => number
+>d1.explicit : (this: Base1) => number
+>d1 : Derived1
+>explicit : (this: Base1) => number
+
+b1.polymorphic = d2.polymorphic // ok, 'x' and 'y' not in Base1: { x }
+>b1.polymorphic = d2.polymorphic : (this: Derived2) => number
+>b1.polymorphic : (this: Base1) => number
+>b1 : Base1
+>polymorphic : (this: Base1) => number
+>d2.polymorphic : (this: Derived2) => number
+>d2 : Derived2
+>polymorphic : (this: Derived2) => number
+
+b1.explicit = d2.polymorphic // ok, 'x' and 'y' not in Base1: { x }
+>b1.explicit = d2.polymorphic : (this: Derived2) => number
+>b1.explicit : (this: Base1) => number
+>b1 : Base1
+>explicit : (this: Base1) => number
+>d2.polymorphic : (this: Derived2) => number
+>d2 : Derived2
+>polymorphic : (this: Derived2) => number
+
+////// use this-type for construction with new ////
+function InterfaceThis(this: I) {
+>InterfaceThis : (this: I) => void
+>this : I
+>I : I
+
+    this.a = 12;
+>this.a = 12 : number
+>this.a : number
+>this : I
+>a : number
+>12 : number
+}
+function LiteralTypeThis(this: {x: string}) {
+>LiteralTypeThis : (this: { x: string; }) => void
+>this : { x: string; }
+>x : string
+
+    this.x = "ok";
+>this.x = "ok" : string
+>this.x : string
+>this : { x: string; }
+>x : string
+>"ok" : string
+}
+function AnyThis(this: any) {
+>AnyThis : (this: any) => void
+>this : any
+
+    this.x = "ok";
+>this.x = "ok" : string
+>this.x : any
+>this : any
+>x : any
+>"ok" : string
+}
+let interfaceThis = new InterfaceThis();
+>interfaceThis : any
+>new InterfaceThis() : any
+>InterfaceThis : (this: I) => void
+
+let literalTypeThis = new LiteralTypeThis();
+>literalTypeThis : any
+>new LiteralTypeThis() : any
+>LiteralTypeThis : (this: { x: string; }) => void
+
+let anyThis = new AnyThis();
+>anyThis : any
+>new AnyThis() : any
+>AnyThis : (this: any) => void
+
+//// type parameter inference ////
+declare var f: { 
+>f : { (this: void, x: number): number; call<U>(this: (...argArray: any[]) => U, ...argArray: any[]): U; }
+
+    (this: void, x: number): number, 
+>this : void
+>x : number
+
+    call<U>(this: (...argArray: any[]) => U, ...argArray: any[]): U;
+>call : <U>(this: (...argArray: any[]) => U, ...argArray: any[]) => U
+>U : U
+>this : (...argArray: any[]) => U
+>argArray : any[]
+>U : U
+>argArray : any[]
+>U : U
+
+};
+let n: number = f.call(12);
+>n : number
+>f.call(12) : number
+>f.call : <U>(this: (...argArray: any[]) => U, ...argArray: any[]) => U
+>f : { (this: void, x: number): number; call<U>(this: (...argArray: any[]) => U, ...argArray: any[]): U; }
+>call : <U>(this: (...argArray: any[]) => U, ...argArray: any[]) => U
+>12 : number
+
+function missingTypeIsImplicitAny(this, a: number) { return this.anything + a; } 
+>missingTypeIsImplicitAny : (this: any, a: number) => any
+>this : any
+>a : number
+>this.anything + a : any
+>this.anything : any
+>this : any
+>anything : any
+>a : number
+
diff --git a/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt b/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt
new file mode 100644
index 00000000000..017550dcecd
--- /dev/null
+++ b/tests/baselines/reference/thisTypeInFunctionsNegative.errors.txt
@@ -0,0 +1,447 @@
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(16,15): error TS2339: Property 'n' does not exist on type 'void'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(39,21): error TS2339: Property 'a' does not exist on type 'void'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(49,1): error TS2684: The 'this' context of type 'void' is not assignable to method's 'this' of type '{ a: number; }'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(51,1): error TS2684: The 'this' context of type 'void' is not assignable to method's 'this' of type 'I'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(56,21): error TS2339: Property 'notFound' does not exist on type '{ y: number; }'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(59,21): error TS2339: Property 'notSpecified' does not exist on type 'void'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(61,79): error TS2322: Type '{ y: number; explicitStructural: (this: { y: number; }, x: number) => number; }' is not assignable to type '{ y: number; f: (this: { y: number; }, x: number) => number; }'.
+  Object literal may only specify known properties, and 'explicitStructural' does not exist in type '{ y: number; f: (this: { y: number; }, x: number) => number; }'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(62,97): error TS2322: Type '{ y: string; explicitStructural: (this: { y: number; }, x: number) => number; }' is not assignable to type '{ y: string; f: (this: { y: number; }, x: number) => number; }'.
+  Object literal may only specify known properties, and 'explicitStructural' does not exist in type '{ y: string; f: (this: { y: number; }, x: number) => number; }'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(63,110): error TS2322: Type '{ wrongName: number; explicitStructural: (this: { y: number; }, x: number) => number; }' is not assignable to type '{ wrongName: number; f: (this: { y: number; }, x: number) => number; }'.
+  Object literal may only specify known properties, and 'explicitStructural' does not exist in type '{ wrongName: number; f: (this: { y: number; }, x: number) => number; }'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(65,1): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(66,6): error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(67,1): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(68,1): error TS2684: The 'this' context of type '{ y: string; f: (this: { y: number; }, x: number) => number; }' is not assignable to method's 'this' of type '{ y: number; }'.
+  Types of property 'y' are incompatible.
+    Type 'string' is not assignable to type 'number'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(69,1): error TS2684: The 'this' context of type '{ wrongName: number; f: (this: { y: number; }, x: number) => number; }' is not assignable to method's 'this' of type '{ y: number; }'.
+  Property 'y' is missing in type '{ wrongName: number; f: (this: { y: number; }, x: number) => number; }'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(72,1): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(73,13): error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(74,1): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(75,1): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(76,16): error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(77,1): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(78,1): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(79,16): error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(80,1): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(81,1): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(82,20): error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(83,1): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(86,5): error TS2322: Type '(this: { y: number; }, x: number) => number' is not assignable to type '(this: void, x: number) => number'.
+  The 'this' types of each signature are incompatible.
+    Type 'void' is not assignable to type '{ y: number; }'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(107,1): error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: C, m: number) => number'.
+  The 'this' types of each signature are incompatible.
+    Type 'C' is not assignable to type 'D'.
+      Property 'x' is missing in type 'C'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(108,1): error TS2322: Type '(this: { x: number; }, m: number) => number' is not assignable to type '(this: { n: number; }, m: number) => number'.
+  The 'this' types of each signature are incompatible.
+    Type '{ n: number; }' is not assignable to type '{ x: number; }'.
+      Property 'x' is missing in type '{ n: number; }'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(110,1): error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: C, m: number) => number'.
+  The 'this' types of each signature are incompatible.
+    Type 'C' is not assignable to type 'D'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(111,1): error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: C, m: number) => number'.
+  The 'this' types of each signature are incompatible.
+    Type 'C' is not assignable to type 'D'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(112,1): error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: C, m: number) => number'.
+  The 'this' types of each signature are incompatible.
+    Type 'C' is not assignable to type 'D'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(113,1): error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: C, m: number) => number'.
+  The 'this' types of each signature are incompatible.
+    Type 'C' is not assignable to type 'D'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(114,1): error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: { n: number; }, m: number) => number'.
+  The 'this' types of each signature are incompatible.
+    Type '{ n: number; }' is not assignable to type 'D'.
+      Property 'x' is missing in type '{ n: number; }'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(115,1): error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: C, m: number) => number'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(116,1): error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: void, m: number) => number'.
+  The 'this' types of each signature are incompatible.
+    Type 'void' is not assignable to type 'D'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(117,1): error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: void, m: number) => number'.
+  The 'this' types of each signature are incompatible.
+    Type 'void' is not assignable to type 'D'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(125,69): error TS2339: Property 'x' does not exist on type 'typeof Base1'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(145,1): error TS2322: Type '(this: Base2) => number' is not assignable to type '(this: Base1) => number'.
+  The 'this' types of each signature are incompatible.
+    Type 'Base1' is not assignable to type 'Base2'.
+      Property 'y' is missing in type 'Base1'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(146,1): error TS2322: Type '(this: Base2) => number' is not assignable to type '(this: Base1) => number'.
+  The 'this' types of each signature are incompatible.
+    Type 'Base1' is not assignable to type 'Base2'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(148,1): error TS2322: Type '(this: Base2) => number' is not assignable to type '(this: Base1) => number'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(154,16): error TS2679: A function that is called with the 'new' keyword cannot have a 'this' type that is 'void'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(158,17): error TS2681: A constructor cannot have a 'this' parameter.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(160,11): error TS2682: A setter cannot have a 'this' parameter.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(164,9): error TS2681: A constructor cannot have a 'this' parameter.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(166,31): error TS2681: A constructor cannot have a 'this' parameter.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(167,30): error TS2680: A 'this' parameter must be the first parameter.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(170,26): error TS1003: Identifier expected.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(170,30): error TS1005: ',' expected.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(171,20): error TS2370: A rest parameter must be of an array type.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(171,23): error TS1003: Identifier expected.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(171,27): error TS1005: ',' expected.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(172,23): error TS1005: ',' expected.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(172,24): error TS1138: Parameter declaration expected.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(173,28): error TS1003: Identifier expected.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(173,32): error TS1005: ',' expected.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(174,30): error TS1005: ',' expected.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(174,32): error TS1138: Parameter declaration expected.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(174,39): error TS1005: ';' expected.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(174,40): error TS1128: Declaration or statement expected.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(174,42): error TS2304: Cannot find name 'number'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(174,49): error TS1005: ';' expected.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(177,1): error TS7027: Unreachable code detected.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(177,29): error TS2304: Cannot find name 'm'.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(177,32): error TS1005: ';' expected.
+tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts(177,35): error TS2304: Cannot find name 'm'.
+
+
+==== tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts (66 errors) ====
+    class C {
+        n: number;
+        explicitThis(this: this, m: number): number {
+            return this.n + m;
+        }
+        implicitThis(m: number): number {
+            return this.n + m;
+        }
+        explicitC(this: C, m: number): number {
+            return this.n + m;
+        }
+        explicitProperty(this: {n: number}, m: number): number {
+            return this.n + m;
+        }
+        explicitVoid(this: void, m: number): number {
+    		return this.n + m; // 'n' doesn't exist on type 'void'.
+    		            ~
+!!! error TS2339: Property 'n' does not exist on type 'void'.
+        }
+    }
+    class D {
+    	x: number;
+    	explicitThis(this: this, m: number): number {
+    		return this.x + m;
+    	}
+    	explicitD(this: D, m: number): number {
+    		return this.x + m;
+    	}
+    }
+    interface I {
+        a: number;
+        explicitVoid1(this: void): number;
+        explicitVoid2(this: void): number;
+        explicitStructural(this: {a: number}): number;
+        explicitInterface(this: I): number;
+        explicitThis(this: this): number; // TODO: Allow `this` types for interfaces
+    }
+    let impl: I = {
+        a: 12,
+        explicitVoid1() {
+            return this.a; // error, no 'a' in 'void'
+                        ~
+!!! error TS2339: Property 'a' does not exist on type 'void'.
+        },
+        explicitVoid2: () => this.a, // ok, `this:any` because it refers to an outer object
+        explicitStructural: () => 12,
+        explicitInterface: () => 12,
+        explicitThis() {
+            return this.a;
+        },
+    }
+    let implExplicitStructural = impl.explicitStructural;
+    implExplicitStructural(); // error, no 'a' in 'void'
+    ~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2684: The 'this' context of type 'void' is not assignable to method's 'this' of type '{ a: number; }'.
+    let implExplicitInterface = impl.explicitInterface;
+    implExplicitInterface(); // error, no 'a' in 'void' 
+    ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2684: The 'this' context of type 'void' is not assignable to method's 'this' of type 'I'.
+    function explicitStructural(this: { y: number }, x: number): number {
+        return x + this.y;
+    }
+    function propertyName(this: { y: number }, x: number): number {
+        return x + this.notFound;
+                        ~~~~~~~~
+!!! error TS2339: Property 'notFound' does not exist on type '{ y: number; }'.
+    }
+    function voidThisSpecified(this: void, x: number): number {
+        return x + this.notSpecified;
+                        ~~~~~~~~~~~~
+!!! error TS2339: Property 'notSpecified' does not exist on type 'void'.
+    }
+    let ok: {y: number, f: (this: { y: number }, x: number) => number} = { y: 12, explicitStructural };
+                                                                                  ~~~~~~~~~~~~~~~~~~
+!!! error TS2322: Type '{ y: number; explicitStructural: (this: { y: number; }, x: number) => number; }' is not assignable to type '{ y: number; f: (this: { y: number; }, x: number) => number; }'.
+!!! error TS2322:   Object literal may only specify known properties, and 'explicitStructural' does not exist in type '{ y: number; f: (this: { y: number; }, x: number) => number; }'.
+    let wrongPropertyType: {y: string, f: (this: { y: number }, x: number) => number} = { y: 'foo', explicitStructural };
+                                                                                                    ~~~~~~~~~~~~~~~~~~
+!!! error TS2322: Type '{ y: string; explicitStructural: (this: { y: number; }, x: number) => number; }' is not assignable to type '{ y: string; f: (this: { y: number; }, x: number) => number; }'.
+!!! error TS2322:   Object literal may only specify known properties, and 'explicitStructural' does not exist in type '{ y: string; f: (this: { y: number; }, x: number) => number; }'.
+    let wrongPropertyName: {wrongName: number, f: (this: { y: number }, x: number) => number} = { wrongName: 12, explicitStructural };
+                                                                                                                 ~~~~~~~~~~~~~~~~~~
+!!! error TS2322: Type '{ wrongName: number; explicitStructural: (this: { y: number; }, x: number) => number; }' is not assignable to type '{ wrongName: number; f: (this: { y: number; }, x: number) => number; }'.
+!!! error TS2322:   Object literal may only specify known properties, and 'explicitStructural' does not exist in type '{ wrongName: number; f: (this: { y: number; }, x: number) => number; }'.
+    
+    ok.f(); // not enough arguments
+    ~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+    ok.f('wrong type');
+         ~~~~~~~~~~~~
+!!! error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'.
+    ok.f(13, 'too many arguments');
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+    wrongPropertyType.f(13);
+    ~~~~~~~~~~~~~~~~~
+!!! error TS2684: The 'this' context of type '{ y: string; f: (this: { y: number; }, x: number) => number; }' is not assignable to method's 'this' of type '{ y: number; }'.
+!!! error TS2684:   Types of property 'y' are incompatible.
+!!! error TS2684:     Type 'string' is not assignable to type 'number'.
+    wrongPropertyName.f(13);
+    ~~~~~~~~~~~~~~~~~
+!!! error TS2684: The 'this' context of type '{ wrongName: number; f: (this: { y: number; }, x: number) => number; }' is not assignable to method's 'this' of type '{ y: number; }'.
+!!! error TS2684:   Property 'y' is missing in type '{ wrongName: number; f: (this: { y: number; }, x: number) => number; }'.
+    
+    let c = new C();
+    c.explicitC(); // not enough arguments
+    ~~~~~~~~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+    c.explicitC('wrong type');
+                ~~~~~~~~~~~~
+!!! error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'.
+    c.explicitC(13, 'too many arguments');
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+    c.explicitThis(); // not enough arguments
+    ~~~~~~~~~~~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+    c.explicitThis('wrong type 2');
+                   ~~~~~~~~~~~~~~
+!!! error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'.
+    c.explicitThis(14, 'too many arguments 2');
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+    c.implicitThis(); // not enough arguments
+    ~~~~~~~~~~~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+    c.implicitThis('wrong type 2');
+                   ~~~~~~~~~~~~~~
+!!! error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'.
+    c.implicitThis(14, 'too many arguments 2');
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+    c.explicitProperty(); // not enough arguments
+    ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+    c.explicitProperty('wrong type 3');
+                       ~~~~~~~~~~~~~~
+!!! error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'.
+    c.explicitProperty(15, 'too many arguments 3');
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2346: Supplied parameters do not match any signature of call target.
+    
+    // oops, this triggers contextual typing, which needs to be updated to understand that =>'s `this` is void.
+    let specifiedToVoid: (this: void, x: number) => number = explicitStructural;
+        ~~~~~~~~~~~~~~~
+!!! error TS2322: Type '(this: { y: number; }, x: number) => number' is not assignable to type '(this: void, x: number) => number'.
+!!! error TS2322:   The 'this' types of each signature are incompatible.
+!!! error TS2322:     Type 'void' is not assignable to type '{ y: number; }'.
+    
+    let reconstructed: { 
+        n: number,
+        explicitThis(this: C, m: number): number, // note: this: this is not allowed in an object literal type.
+        explicitC(this: C, m: number): number,
+        explicitProperty: (this: {n : number}, m: number) => number,
+        explicitVoid(this: void, m: number): number,
+    } = { 
+        n: 12,
+        explicitThis: c.explicitThis,
+        explicitC: c.explicitC,
+        explicitProperty: c.explicitProperty,
+        explicitVoid: c.explicitVoid
+    };;
+    
+    // lambdas have this: void for assignability purposes (and this unbound (free) for body checking)
+    let d = new D();
+    let explicitXProperty: (this: { x: number }, m: number) => number;
+    
+    // from differing object types
+    c.explicitC = function(this: D, m: number) { return this.x + m };
+    ~~~~~~~~~~~
+!!! error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: C, m: number) => number'.
+!!! error TS2322:   The 'this' types of each signature are incompatible.
+!!! error TS2322:     Type 'C' is not assignable to type 'D'.
+!!! error TS2322:       Property 'x' is missing in type 'C'.
+    c.explicitProperty = explicitXProperty;
+    ~~~~~~~~~~~~~~~~~~
+!!! error TS2322: Type '(this: { x: number; }, m: number) => number' is not assignable to type '(this: { n: number; }, m: number) => number'.
+!!! error TS2322:   The 'this' types of each signature are incompatible.
+!!! error TS2322:     Type '{ n: number; }' is not assignable to type '{ x: number; }'.
+!!! error TS2322:       Property 'x' is missing in type '{ n: number; }'.
+    
+    c.explicitC = d.explicitD;
+    ~~~~~~~~~~~
+!!! error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: C, m: number) => number'.
+!!! error TS2322:   The 'this' types of each signature are incompatible.
+!!! error TS2322:     Type 'C' is not assignable to type 'D'.
+    c.explicitC = d.explicitThis;
+    ~~~~~~~~~~~
+!!! error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: C, m: number) => number'.
+!!! error TS2322:   The 'this' types of each signature are incompatible.
+!!! error TS2322:     Type 'C' is not assignable to type 'D'.
+    c.explicitThis = d.explicitD;
+    ~~~~~~~~~~~~~~
+!!! error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: C, m: number) => number'.
+!!! error TS2322:   The 'this' types of each signature are incompatible.
+!!! error TS2322:     Type 'C' is not assignable to type 'D'.
+    c.explicitThis = d.explicitThis;
+    ~~~~~~~~~~~~~~
+!!! error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: C, m: number) => number'.
+!!! error TS2322:   The 'this' types of each signature are incompatible.
+!!! error TS2322:     Type 'C' is not assignable to type 'D'.
+    c.explicitProperty = d.explicitD;
+    ~~~~~~~~~~~~~~~~~~
+!!! error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: { n: number; }, m: number) => number'.
+!!! error TS2322:   The 'this' types of each signature are incompatible.
+!!! error TS2322:     Type '{ n: number; }' is not assignable to type 'D'.
+!!! error TS2322:       Property 'x' is missing in type '{ n: number; }'.
+    c.explicitThis = d.explicitThis;
+    ~~~~~~~~~~~~~~
+!!! error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: C, m: number) => number'.
+    c.explicitVoid = d.explicitD;
+    ~~~~~~~~~~~~~~
+!!! error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: void, m: number) => number'.
+!!! error TS2322:   The 'this' types of each signature are incompatible.
+!!! error TS2322:     Type 'void' is not assignable to type 'D'.
+    c.explicitVoid = d.explicitThis;
+    ~~~~~~~~~~~~~~
+!!! error TS2322: Type '(this: D, m: number) => number' is not assignable to type '(this: void, m: number) => number'.
+!!! error TS2322:   The 'this' types of each signature are incompatible.
+!!! error TS2322:     Type 'void' is not assignable to type 'D'.
+    
+    /// class-based polymorphic assignability (with inheritance!) ///
+    
+    class Base1 {
+        x: number
+        public polymorphic(this: this): number { return this.x; }
+        explicit(this: Base1): number { return this.x; }
+        static explicitStatic(this: typeof Base1): number { return this.x; }
+                                                                        ~
+!!! error TS2339: Property 'x' does not exist on type 'typeof Base1'.
+    }
+    class Derived1 extends Base1 {
+        y: number
+    }
+    class Base2 {
+        y: number
+        polymorphic(this: this): number { return this.y; }
+        explicit(this: Base1): number { return this.x; }
+    }
+    class Derived2 extends Base2 {
+        x: number
+    }
+    
+    
+    let b1 = new Base1();
+    let d1 = new Derived1();
+    let b2 = new Base2();
+    let d2 = new Derived2();
+    
+    b1.polymorphic = b2.polymorphic // error, 'this.y' not in Base1: { x }
+    ~~~~~~~~~~~~~~
+!!! error TS2322: Type '(this: Base2) => number' is not assignable to type '(this: Base1) => number'.
+!!! error TS2322:   The 'this' types of each signature are incompatible.
+!!! error TS2322:     Type 'Base1' is not assignable to type 'Base2'.
+!!! error TS2322:       Property 'y' is missing in type 'Base1'.
+    b1.explicit = b2.polymorphic // error, 'y' not in Base1: { x }
+    ~~~~~~~~~~~
+!!! error TS2322: Type '(this: Base2) => number' is not assignable to type '(this: Base1) => number'.
+!!! error TS2322:   The 'this' types of each signature are incompatible.
+!!! error TS2322:     Type 'Base1' is not assignable to type 'Base2'.
+    
+    d1.explicit = b2.polymorphic // error, 'y' not in Base1: { x }
+    ~~~~~~~~~~~
+!!! error TS2322: Type '(this: Base2) => number' is not assignable to type '(this: Base1) => number'.
+    
+    ////// use this-type for construction with new ////
+    function VoidThis(this: void) {
+    
+    }
+    let voidThis = new VoidThis();
+                   ~~~~~~~~~~~~~~
+!!! error TS2679: A function that is called with the 'new' keyword cannot have a 'this' type that is 'void'.
+    
+    ///// syntax-ish errors /////
+    class ThisConstructor {
+        constructor(this: ThisConstructor, private n: number) {
+                    ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2681: A constructor cannot have a 'this' parameter.
+        }
+        set p(this: void) {
+              ~~~~~~~~~~
+!!! error TS2682: A setter cannot have a 'this' parameter.
+        }
+    }
+    interface ThisConstructorInterface {
+        new(this: ThisConstructor, n: number);
+            ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2681: A constructor cannot have a 'this' parameter.
+    }
+    var thisConstructorType: new (this: number) => number;
+                                  ~~~~~~~~~~~~
+!!! error TS2681: A constructor cannot have a 'this' parameter.
+    function notFirst(a: number, this: C): number { return this.n; }
+                                 ~~~~~~~
+!!! error TS2680: A 'this' parameter must be the first parameter.
+    
+    ///// parse errors /////
+    function modifiers(async this: C): number { return this.n; }
+                             ~~~~
+!!! error TS1003: Identifier expected.
+                                 ~
+!!! error TS1005: ',' expected.
+    function restParam(...this: C): number { return this.n; }
+                       ~~~~~~~
+!!! error TS2370: A rest parameter must be of an array type.
+                          ~~~~
+!!! error TS1003: Identifier expected.
+                              ~
+!!! error TS1005: ',' expected.
+    function optional(this?: C): number { return this.n; }
+                          ~
+!!! error TS1005: ',' expected.
+                           ~
+!!! error TS1138: Parameter declaration expected.
+    function decorated(@deco() this: C): number { return this.n; }
+                               ~~~~
+!!! error TS1003: Identifier expected.
+                                   ~
+!!! error TS1005: ',' expected.
+    function initializer(this: C = new C()): number { return this.n; }
+                                 ~
+!!! error TS1005: ',' expected.
+                                   ~~~
+!!! error TS1138: Parameter declaration expected.
+                                          ~
+!!! error TS1005: ';' expected.
+                                           ~
+!!! error TS1128: Declaration or statement expected.
+                                             ~~~~~~
+!!! error TS2304: Cannot find name 'number'.
+                                                    ~
+!!! error TS1005: ';' expected.
+    
+    // can't name parameters 'this' in a lambda.
+    c.explicitProperty = (this, m) => m + this.n;
+    ~
+!!! error TS7027: Unreachable code detected.
+                                ~
+!!! error TS2304: Cannot find name 'm'.
+                                   ~~
+!!! error TS1005: ';' expected.
+                                      ~
+!!! error TS2304: Cannot find name 'm'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/thisTypeInFunctionsNegative.js b/tests/baselines/reference/thisTypeInFunctionsNegative.js
new file mode 100644
index 00000000000..93c65031212
--- /dev/null
+++ b/tests/baselines/reference/thisTypeInFunctionsNegative.js
@@ -0,0 +1,364 @@
+//// [thisTypeInFunctionsNegative.ts]
+class C {
+    n: number;
+    explicitThis(this: this, m: number): number {
+        return this.n + m;
+    }
+    implicitThis(m: number): number {
+        return this.n + m;
+    }
+    explicitC(this: C, m: number): number {
+        return this.n + m;
+    }
+    explicitProperty(this: {n: number}, m: number): number {
+        return this.n + m;
+    }
+    explicitVoid(this: void, m: number): number {
+		return this.n + m; // 'n' doesn't exist on type 'void'.
+    }
+}
+class D {
+	x: number;
+	explicitThis(this: this, m: number): number {
+		return this.x + m;
+	}
+	explicitD(this: D, m: number): number {
+		return this.x + m;
+	}
+}
+interface I {
+    a: number;
+    explicitVoid1(this: void): number;
+    explicitVoid2(this: void): number;
+    explicitStructural(this: {a: number}): number;
+    explicitInterface(this: I): number;
+    explicitThis(this: this): number; // TODO: Allow `this` types for interfaces
+}
+let impl: I = {
+    a: 12,
+    explicitVoid1() {
+        return this.a; // error, no 'a' in 'void'
+    },
+    explicitVoid2: () => this.a, // ok, `this:any` because it refers to an outer object
+    explicitStructural: () => 12,
+    explicitInterface: () => 12,
+    explicitThis() {
+        return this.a;
+    },
+}
+let implExplicitStructural = impl.explicitStructural;
+implExplicitStructural(); // error, no 'a' in 'void'
+let implExplicitInterface = impl.explicitInterface;
+implExplicitInterface(); // error, no 'a' in 'void' 
+function explicitStructural(this: { y: number }, x: number): number {
+    return x + this.y;
+}
+function propertyName(this: { y: number }, x: number): number {
+    return x + this.notFound;
+}
+function voidThisSpecified(this: void, x: number): number {
+    return x + this.notSpecified;
+}
+let ok: {y: number, f: (this: { y: number }, x: number) => number} = { y: 12, explicitStructural };
+let wrongPropertyType: {y: string, f: (this: { y: number }, x: number) => number} = { y: 'foo', explicitStructural };
+let wrongPropertyName: {wrongName: number, f: (this: { y: number }, x: number) => number} = { wrongName: 12, explicitStructural };
+
+ok.f(); // not enough arguments
+ok.f('wrong type');
+ok.f(13, 'too many arguments');
+wrongPropertyType.f(13);
+wrongPropertyName.f(13);
+
+let c = new C();
+c.explicitC(); // not enough arguments
+c.explicitC('wrong type');
+c.explicitC(13, 'too many arguments');
+c.explicitThis(); // not enough arguments
+c.explicitThis('wrong type 2');
+c.explicitThis(14, 'too many arguments 2');
+c.implicitThis(); // not enough arguments
+c.implicitThis('wrong type 2');
+c.implicitThis(14, 'too many arguments 2');
+c.explicitProperty(); // not enough arguments
+c.explicitProperty('wrong type 3');
+c.explicitProperty(15, 'too many arguments 3');
+
+// oops, this triggers contextual typing, which needs to be updated to understand that =>'s `this` is void.
+let specifiedToVoid: (this: void, x: number) => number = explicitStructural;
+
+let reconstructed: { 
+    n: number,
+    explicitThis(this: C, m: number): number, // note: this: this is not allowed in an object literal type.
+    explicitC(this: C, m: number): number,
+    explicitProperty: (this: {n : number}, m: number) => number,
+    explicitVoid(this: void, m: number): number,
+} = { 
+    n: 12,
+    explicitThis: c.explicitThis,
+    explicitC: c.explicitC,
+    explicitProperty: c.explicitProperty,
+    explicitVoid: c.explicitVoid
+};;
+
+// lambdas have this: void for assignability purposes (and this unbound (free) for body checking)
+let d = new D();
+let explicitXProperty: (this: { x: number }, m: number) => number;
+
+// from differing object types
+c.explicitC = function(this: D, m: number) { return this.x + m };
+c.explicitProperty = explicitXProperty;
+
+c.explicitC = d.explicitD;
+c.explicitC = d.explicitThis;
+c.explicitThis = d.explicitD;
+c.explicitThis = d.explicitThis;
+c.explicitProperty = d.explicitD;
+c.explicitThis = d.explicitThis;
+c.explicitVoid = d.explicitD;
+c.explicitVoid = d.explicitThis;
+
+/// class-based polymorphic assignability (with inheritance!) ///
+
+class Base1 {
+    x: number
+    public polymorphic(this: this): number { return this.x; }
+    explicit(this: Base1): number { return this.x; }
+    static explicitStatic(this: typeof Base1): number { return this.x; }
+}
+class Derived1 extends Base1 {
+    y: number
+}
+class Base2 {
+    y: number
+    polymorphic(this: this): number { return this.y; }
+    explicit(this: Base1): number { return this.x; }
+}
+class Derived2 extends Base2 {
+    x: number
+}
+
+
+let b1 = new Base1();
+let d1 = new Derived1();
+let b2 = new Base2();
+let d2 = new Derived2();
+
+b1.polymorphic = b2.polymorphic // error, 'this.y' not in Base1: { x }
+b1.explicit = b2.polymorphic // error, 'y' not in Base1: { x }
+
+d1.explicit = b2.polymorphic // error, 'y' not in Base1: { x }
+
+////// use this-type for construction with new ////
+function VoidThis(this: void) {
+
+}
+let voidThis = new VoidThis();
+
+///// syntax-ish errors /////
+class ThisConstructor {
+    constructor(this: ThisConstructor, private n: number) {
+    }
+    set p(this: void) {
+    }
+}
+interface ThisConstructorInterface {
+    new(this: ThisConstructor, n: number);
+}
+var thisConstructorType: new (this: number) => number;
+function notFirst(a: number, this: C): number { return this.n; }
+
+///// parse errors /////
+function modifiers(async this: C): number { return this.n; }
+function restParam(...this: C): number { return this.n; }
+function optional(this?: C): number { return this.n; }
+function decorated(@deco() this: C): number { return this.n; }
+function initializer(this: C = new C()): number { return this.n; }
+
+// can't name parameters 'this' in a lambda.
+c.explicitProperty = (this, m) => m + this.n;
+
+
+//// [thisTypeInFunctionsNegative.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 _this = this;
+var C = (function () {
+    function C() {
+    }
+    C.prototype.explicitThis = function (m) {
+        return this.n + m;
+    };
+    C.prototype.implicitThis = function (m) {
+        return this.n + m;
+    };
+    C.prototype.explicitC = function (m) {
+        return this.n + m;
+    };
+    C.prototype.explicitProperty = function (m) {
+        return this.n + m;
+    };
+    C.prototype.explicitVoid = function (m) {
+        return this.n + m; // 'n' doesn't exist on type 'void'.
+    };
+    return C;
+}());
+var D = (function () {
+    function D() {
+    }
+    D.prototype.explicitThis = function (m) {
+        return this.x + m;
+    };
+    D.prototype.explicitD = function (m) {
+        return this.x + m;
+    };
+    return D;
+}());
+var impl = {
+    a: 12,
+    explicitVoid1: function () {
+        return this.a; // error, no 'a' in 'void'
+    },
+    explicitVoid2: function () { return _this.a; },
+    explicitStructural: function () { return 12; },
+    explicitInterface: function () { return 12; },
+    explicitThis: function () {
+        return this.a;
+    }
+};
+var implExplicitStructural = impl.explicitStructural;
+implExplicitStructural(); // error, no 'a' in 'void'
+var implExplicitInterface = impl.explicitInterface;
+implExplicitInterface(); // error, no 'a' in 'void' 
+function explicitStructural(x) {
+    return x + this.y;
+}
+function propertyName(x) {
+    return x + this.notFound;
+}
+function voidThisSpecified(x) {
+    return x + this.notSpecified;
+}
+var ok = { y: 12, explicitStructural: explicitStructural };
+var wrongPropertyType = { y: 'foo', explicitStructural: explicitStructural };
+var wrongPropertyName = { wrongName: 12, explicitStructural: explicitStructural };
+ok.f(); // not enough arguments
+ok.f('wrong type');
+ok.f(13, 'too many arguments');
+wrongPropertyType.f(13);
+wrongPropertyName.f(13);
+var c = new C();
+c.explicitC(); // not enough arguments
+c.explicitC('wrong type');
+c.explicitC(13, 'too many arguments');
+c.explicitThis(); // not enough arguments
+c.explicitThis('wrong type 2');
+c.explicitThis(14, 'too many arguments 2');
+c.implicitThis(); // not enough arguments
+c.implicitThis('wrong type 2');
+c.implicitThis(14, 'too many arguments 2');
+c.explicitProperty(); // not enough arguments
+c.explicitProperty('wrong type 3');
+c.explicitProperty(15, 'too many arguments 3');
+// oops, this triggers contextual typing, which needs to be updated to understand that =>'s `this` is void.
+var specifiedToVoid = explicitStructural;
+var reconstructed = {
+    n: 12,
+    explicitThis: c.explicitThis,
+    explicitC: c.explicitC,
+    explicitProperty: c.explicitProperty,
+    explicitVoid: c.explicitVoid
+};
+;
+// lambdas have this: void for assignability purposes (and this unbound (free) for body checking)
+var d = new D();
+var explicitXProperty;
+// from differing object types
+c.explicitC = function (m) { return this.x + m; };
+c.explicitProperty = explicitXProperty;
+c.explicitC = d.explicitD;
+c.explicitC = d.explicitThis;
+c.explicitThis = d.explicitD;
+c.explicitThis = d.explicitThis;
+c.explicitProperty = d.explicitD;
+c.explicitThis = d.explicitThis;
+c.explicitVoid = d.explicitD;
+c.explicitVoid = d.explicitThis;
+/// class-based polymorphic assignability (with inheritance!) ///
+var Base1 = (function () {
+    function Base1() {
+    }
+    Base1.prototype.polymorphic = function () { return this.x; };
+    Base1.prototype.explicit = function () { return this.x; };
+    Base1.explicitStatic = function () { return this.x; };
+    return Base1;
+}());
+var Derived1 = (function (_super) {
+    __extends(Derived1, _super);
+    function Derived1() {
+        _super.apply(this, arguments);
+    }
+    return Derived1;
+}(Base1));
+var Base2 = (function () {
+    function Base2() {
+    }
+    Base2.prototype.polymorphic = function () { return this.y; };
+    Base2.prototype.explicit = function () { return this.x; };
+    return Base2;
+}());
+var Derived2 = (function (_super) {
+    __extends(Derived2, _super);
+    function Derived2() {
+        _super.apply(this, arguments);
+    }
+    return Derived2;
+}(Base2));
+var b1 = new Base1();
+var d1 = new Derived1();
+var b2 = new Base2();
+var d2 = new Derived2();
+b1.polymorphic = b2.polymorphic; // error, 'this.y' not in Base1: { x }
+b1.explicit = b2.polymorphic; // error, 'y' not in Base1: { x }
+d1.explicit = b2.polymorphic; // error, 'y' not in Base1: { x }
+////// use this-type for construction with new ////
+function VoidThis() {
+}
+var voidThis = new VoidThis();
+///// syntax-ish errors /////
+var ThisConstructor = (function () {
+    function ThisConstructor(n) {
+        this.n = n;
+    }
+    Object.defineProperty(ThisConstructor.prototype, "p", {
+        set: function () {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return ThisConstructor;
+}());
+var thisConstructorType;
+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 optional(C) { return this.n; }
+function decorated(, C) {
+    if ( === void 0) {  = this; }
+    return this.n;
+}
+function initializer() { }
+new C();
+number;
+{
+    return this.n;
+}
+// can't name parameters 'this' in a lambda.
+c.explicitProperty = (this, m);
+m + this.n;
diff --git a/tests/baselines/reference/thisTypeInInterfaces.symbols b/tests/baselines/reference/thisTypeInInterfaces.symbols
index 4ab896ae6f6..286447a7083 100644
--- a/tests/baselines/reference/thisTypeInInterfaces.symbols
+++ b/tests/baselines/reference/thisTypeInInterfaces.symbols
@@ -3,10 +3,10 @@ interface I1 {
 >I1 : Symbol(I1, Decl(thisTypeInInterfaces.ts, 0, 0))
 
     x: this;
->x : Symbol(x, Decl(thisTypeInInterfaces.ts, 0, 14))
+>x : Symbol(I1.x, Decl(thisTypeInInterfaces.ts, 0, 14))
 
     f(x: this): this;
->f : Symbol(f, Decl(thisTypeInInterfaces.ts, 1, 12))
+>f : Symbol(I1.f, Decl(thisTypeInInterfaces.ts, 1, 12))
 >x : Symbol(x, Decl(thisTypeInInterfaces.ts, 2, 6))
 }
 
@@ -28,51 +28,51 @@ interface Foo<T> {
 >T : Symbol(T, Decl(thisTypeInInterfaces.ts, 11, 14))
 
     x: T;
->x : Symbol(x, Decl(thisTypeInInterfaces.ts, 11, 18))
+>x : Symbol(Foo.x, Decl(thisTypeInInterfaces.ts, 11, 18))
 >T : Symbol(T, Decl(thisTypeInInterfaces.ts, 11, 14))
 
     y: this;
->y : Symbol(y, Decl(thisTypeInInterfaces.ts, 12, 9))
+>y : Symbol(Foo.y, Decl(thisTypeInInterfaces.ts, 12, 9))
 }
 
 interface I3 {
 >I3 : Symbol(I3, Decl(thisTypeInInterfaces.ts, 14, 1))
 
     a: this[];
->a : Symbol(a, Decl(thisTypeInInterfaces.ts, 16, 14))
+>a : Symbol(I3.a, Decl(thisTypeInInterfaces.ts, 16, 14))
 
     b: [this, this];
->b : Symbol(b, Decl(thisTypeInInterfaces.ts, 17, 14))
+>b : Symbol(I3.b, Decl(thisTypeInInterfaces.ts, 17, 14))
 
     c: this | Date;
->c : Symbol(c, Decl(thisTypeInInterfaces.ts, 18, 20))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>c : Symbol(I3.c, Decl(thisTypeInInterfaces.ts, 18, 20))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     d: this & Date;
->d : Symbol(d, Decl(thisTypeInInterfaces.ts, 19, 19))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>d : Symbol(I3.d, Decl(thisTypeInInterfaces.ts, 19, 19))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     e: (((this)));
->e : Symbol(e, Decl(thisTypeInInterfaces.ts, 20, 19))
+>e : Symbol(I3.e, Decl(thisTypeInInterfaces.ts, 20, 19))
 
     f: (x: this) => this;
->f : Symbol(f, Decl(thisTypeInInterfaces.ts, 21, 18))
+>f : Symbol(I3.f, Decl(thisTypeInInterfaces.ts, 21, 18))
 >x : Symbol(x, Decl(thisTypeInInterfaces.ts, 22, 8))
 
     g: new (x: this) => this;
->g : Symbol(g, Decl(thisTypeInInterfaces.ts, 22, 25))
+>g : Symbol(I3.g, Decl(thisTypeInInterfaces.ts, 22, 25))
 >x : Symbol(x, Decl(thisTypeInInterfaces.ts, 23, 12))
 
     h: Foo<this>;
->h : Symbol(h, Decl(thisTypeInInterfaces.ts, 23, 29))
+>h : Symbol(I3.h, Decl(thisTypeInInterfaces.ts, 23, 29))
 >Foo : Symbol(Foo, Decl(thisTypeInInterfaces.ts, 9, 1))
 
     i: Foo<this | (() => this)>;
->i : Symbol(i, Decl(thisTypeInInterfaces.ts, 24, 17))
+>i : Symbol(I3.i, Decl(thisTypeInInterfaces.ts, 24, 17))
 >Foo : Symbol(Foo, Decl(thisTypeInInterfaces.ts, 9, 1))
 
     j: (x: any) => x is this;
->j : Symbol(j, Decl(thisTypeInInterfaces.ts, 25, 32))
+>j : Symbol(I3.j, Decl(thisTypeInInterfaces.ts, 25, 32))
 >x : Symbol(x, Decl(thisTypeInInterfaces.ts, 26, 8))
 >x : Symbol(x, Decl(thisTypeInInterfaces.ts, 26, 8))
 }
diff --git a/tests/baselines/reference/thisTypeInObjectLiterals.js b/tests/baselines/reference/thisTypeInObjectLiterals.js
new file mode 100644
index 00000000000..5af13a41af8
--- /dev/null
+++ b/tests/baselines/reference/thisTypeInObjectLiterals.js
@@ -0,0 +1,56 @@
+//// [thisTypeInObjectLiterals.ts]
+let o = {
+    d: "bar",
+    m() {
+        return this.d.length;
+    }
+}
+let mutuallyRecursive = {
+    a: 100,
+    start() {
+        return this.passthrough(this.a);
+    },
+    passthrough(n: number) {
+        return this.sub1(n);
+    },
+    sub1(n: number): number {
+        if (n > 0) {
+            return this.passthrough(n - 1);
+        }
+        return n;
+    }
+}
+var i: number = mutuallyRecursive.start();
+interface I {
+    a: number;
+    start(): number;
+    passthrough(n: number): number;
+    sub1(n: number): number;
+}
+var impl: I = mutuallyRecursive;
+
+
+//// [thisTypeInObjectLiterals.js]
+var o = {
+    d: "bar",
+    m: function () {
+        return this.d.length;
+    }
+};
+var mutuallyRecursive = {
+    a: 100,
+    start: function () {
+        return this.passthrough(this.a);
+    },
+    passthrough: function (n) {
+        return this.sub1(n);
+    },
+    sub1: function (n) {
+        if (n > 0) {
+            return this.passthrough(n - 1);
+        }
+        return n;
+    }
+};
+var i = mutuallyRecursive.start();
+var impl = mutuallyRecursive;
diff --git a/tests/baselines/reference/thisTypeInObjectLiterals.symbols b/tests/baselines/reference/thisTypeInObjectLiterals.symbols
new file mode 100644
index 00000000000..9ae4a990d5b
--- /dev/null
+++ b/tests/baselines/reference/thisTypeInObjectLiterals.symbols
@@ -0,0 +1,92 @@
+=== tests/cases/conformance/types/thisType/thisTypeInObjectLiterals.ts ===
+let o = {
+>o : Symbol(o, Decl(thisTypeInObjectLiterals.ts, 0, 3))
+
+    d: "bar",
+>d : Symbol(d, Decl(thisTypeInObjectLiterals.ts, 0, 9))
+
+    m() {
+>m : Symbol(m, Decl(thisTypeInObjectLiterals.ts, 1, 13))
+
+        return this.d.length;
+>this.d.length : Symbol(String.length, Decl(lib.d.ts, --, --))
+>this.d : Symbol(d, Decl(thisTypeInObjectLiterals.ts, 0, 9))
+>this : Symbol(, Decl(thisTypeInObjectLiterals.ts, 0, 7))
+>d : Symbol(d, Decl(thisTypeInObjectLiterals.ts, 0, 9))
+>length : Symbol(String.length, Decl(lib.d.ts, --, --))
+    }
+}
+let mutuallyRecursive = {
+>mutuallyRecursive : Symbol(mutuallyRecursive, Decl(thisTypeInObjectLiterals.ts, 6, 3))
+
+    a: 100,
+>a : Symbol(a, Decl(thisTypeInObjectLiterals.ts, 6, 25))
+
+    start() {
+>start : Symbol(start, Decl(thisTypeInObjectLiterals.ts, 7, 11))
+
+        return this.passthrough(this.a);
+>this.passthrough : Symbol(passthrough, Decl(thisTypeInObjectLiterals.ts, 10, 6))
+>this : Symbol(, Decl(thisTypeInObjectLiterals.ts, 6, 23))
+>passthrough : Symbol(passthrough, Decl(thisTypeInObjectLiterals.ts, 10, 6))
+>this.a : Symbol(a, Decl(thisTypeInObjectLiterals.ts, 6, 25))
+>this : Symbol(, Decl(thisTypeInObjectLiterals.ts, 6, 23))
+>a : Symbol(a, Decl(thisTypeInObjectLiterals.ts, 6, 25))
+
+    },
+    passthrough(n: number) {
+>passthrough : Symbol(passthrough, Decl(thisTypeInObjectLiterals.ts, 10, 6))
+>n : Symbol(n, Decl(thisTypeInObjectLiterals.ts, 11, 16))
+
+        return this.sub1(n);
+>this.sub1 : Symbol(sub1, Decl(thisTypeInObjectLiterals.ts, 13, 6))
+>this : Symbol(, Decl(thisTypeInObjectLiterals.ts, 6, 23))
+>sub1 : Symbol(sub1, Decl(thisTypeInObjectLiterals.ts, 13, 6))
+>n : Symbol(n, Decl(thisTypeInObjectLiterals.ts, 11, 16))
+
+    },
+    sub1(n: number): number {
+>sub1 : Symbol(sub1, Decl(thisTypeInObjectLiterals.ts, 13, 6))
+>n : Symbol(n, Decl(thisTypeInObjectLiterals.ts, 14, 9))
+
+        if (n > 0) {
+>n : Symbol(n, Decl(thisTypeInObjectLiterals.ts, 14, 9))
+
+            return this.passthrough(n - 1);
+>this.passthrough : Symbol(passthrough, Decl(thisTypeInObjectLiterals.ts, 10, 6))
+>this : Symbol(, Decl(thisTypeInObjectLiterals.ts, 6, 23))
+>passthrough : Symbol(passthrough, Decl(thisTypeInObjectLiterals.ts, 10, 6))
+>n : Symbol(n, Decl(thisTypeInObjectLiterals.ts, 14, 9))
+        }
+        return n;
+>n : Symbol(n, Decl(thisTypeInObjectLiterals.ts, 14, 9))
+    }
+}
+var i: number = mutuallyRecursive.start();
+>i : Symbol(i, Decl(thisTypeInObjectLiterals.ts, 21, 3))
+>mutuallyRecursive.start : Symbol(start, Decl(thisTypeInObjectLiterals.ts, 7, 11))
+>mutuallyRecursive : Symbol(mutuallyRecursive, Decl(thisTypeInObjectLiterals.ts, 6, 3))
+>start : Symbol(start, Decl(thisTypeInObjectLiterals.ts, 7, 11))
+
+interface I {
+>I : Symbol(I, Decl(thisTypeInObjectLiterals.ts, 21, 42))
+
+    a: number;
+>a : Symbol(I.a, Decl(thisTypeInObjectLiterals.ts, 22, 13))
+
+    start(): number;
+>start : Symbol(I.start, Decl(thisTypeInObjectLiterals.ts, 23, 14))
+
+    passthrough(n: number): number;
+>passthrough : Symbol(I.passthrough, Decl(thisTypeInObjectLiterals.ts, 24, 20))
+>n : Symbol(n, Decl(thisTypeInObjectLiterals.ts, 25, 16))
+
+    sub1(n: number): number;
+>sub1 : Symbol(I.sub1, Decl(thisTypeInObjectLiterals.ts, 25, 35))
+>n : Symbol(n, Decl(thisTypeInObjectLiterals.ts, 26, 9))
+}
+var impl: I = mutuallyRecursive;
+>impl : Symbol(impl, Decl(thisTypeInObjectLiterals.ts, 28, 3))
+>I : Symbol(I, Decl(thisTypeInObjectLiterals.ts, 21, 42))
+>mutuallyRecursive : Symbol(mutuallyRecursive, Decl(thisTypeInObjectLiterals.ts, 6, 3))
+
diff --git a/tests/baselines/reference/thisTypeInObjectLiterals.types b/tests/baselines/reference/thisTypeInObjectLiterals.types
new file mode 100644
index 00000000000..0b164209219
--- /dev/null
+++ b/tests/baselines/reference/thisTypeInObjectLiterals.types
@@ -0,0 +1,104 @@
+=== tests/cases/conformance/types/thisType/thisTypeInObjectLiterals.ts ===
+let o = {
+>o : { d: string; m(): number; }
+>{    d: "bar",    m() {        return this.d.length;    }} : { d: string; m(): number; }
+
+    d: "bar",
+>d : string
+>"bar" : string
+
+    m() {
+>m : () => number
+
+        return this.d.length;
+>this.d.length : number
+>this.d : string
+>this : { d: string; m(): number; }
+>d : string
+>length : number
+    }
+}
+let mutuallyRecursive = {
+>mutuallyRecursive : { a: number; start(): number; passthrough(n: number): number; sub1(n: number): number; }
+>{    a: 100,    start() {        return this.passthrough(this.a);    },    passthrough(n: number) {        return this.sub1(n);    },    sub1(n: number): number {        if (n > 0) {            return this.passthrough(n - 1);        }        return n;    }} : { a: number; start(): number; passthrough(n: number): number; sub1(n: number): number; }
+
+    a: 100,
+>a : number
+>100 : number
+
+    start() {
+>start : () => number
+
+        return this.passthrough(this.a);
+>this.passthrough(this.a) : number
+>this.passthrough : (n: number) => number
+>this : { a: number; start(): number; passthrough(n: number): number; sub1(n: number): number; }
+>passthrough : (n: number) => number
+>this.a : number
+>this : { a: number; start(): number; passthrough(n: number): number; sub1(n: number): number; }
+>a : number
+
+    },
+    passthrough(n: number) {
+>passthrough : (n: number) => number
+>n : number
+
+        return this.sub1(n);
+>this.sub1(n) : number
+>this.sub1 : (n: number) => number
+>this : { a: number; start(): number; passthrough(n: number): number; sub1(n: number): number; }
+>sub1 : (n: number) => number
+>n : number
+
+    },
+    sub1(n: number): number {
+>sub1 : (n: number) => number
+>n : number
+
+        if (n > 0) {
+>n > 0 : boolean
+>n : number
+>0 : number
+
+            return this.passthrough(n - 1);
+>this.passthrough(n - 1) : number
+>this.passthrough : (n: number) => number
+>this : { a: number; start(): number; passthrough(n: number): number; sub1(n: number): number; }
+>passthrough : (n: number) => number
+>n - 1 : number
+>n : number
+>1 : number
+        }
+        return n;
+>n : number
+    }
+}
+var i: number = mutuallyRecursive.start();
+>i : number
+>mutuallyRecursive.start() : number
+>mutuallyRecursive.start : () => number
+>mutuallyRecursive : { a: number; start(): number; passthrough(n: number): number; sub1(n: number): number; }
+>start : () => number
+
+interface I {
+>I : I
+
+    a: number;
+>a : number
+
+    start(): number;
+>start : () => number
+
+    passthrough(n: number): number;
+>passthrough : (n: number) => number
+>n : number
+
+    sub1(n: number): number;
+>sub1 : (n: number) => number
+>n : number
+}
+var impl: I = mutuallyRecursive;
+>impl : I
+>I : I
+>mutuallyRecursive : { a: number; start(): number; passthrough(n: number): number; sub1(n: number): number; }
+
diff --git a/tests/baselines/reference/thisTypeInTuples.symbols b/tests/baselines/reference/thisTypeInTuples.symbols
index 256f182dd69..44f8660f691 100644
--- a/tests/baselines/reference/thisTypeInTuples.symbols
+++ b/tests/baselines/reference/thisTypeInTuples.symbols
@@ -4,7 +4,7 @@ interface Array<T> {
 >T : Symbol(T, Decl(lib.d.ts, --, --), Decl(thisTypeInTuples.ts, 0, 16))
 
     slice(): this;
->slice : Symbol(slice, Decl(lib.d.ts, --, --), Decl(thisTypeInTuples.ts, 0, 20))
+>slice : Symbol(Array.slice, Decl(lib.d.ts, --, --), Decl(thisTypeInTuples.ts, 0, 20))
 }
 
 let t: [number, string] = [42, "hello"];
diff --git a/tests/baselines/reference/throwInEnclosingStatements.symbols b/tests/baselines/reference/throwInEnclosingStatements.symbols
index 42053c60efa..858b6484e53 100644
--- a/tests/baselines/reference/throwInEnclosingStatements.symbols
+++ b/tests/baselines/reference/throwInEnclosingStatements.symbols
@@ -61,16 +61,16 @@ class C<T> {
 >T : Symbol(T, Decl(throwInEnclosingStatements.ts, 29, 8))
 
     private value: T;
->value : Symbol(value, Decl(throwInEnclosingStatements.ts, 29, 12))
+>value : Symbol(C.value, Decl(throwInEnclosingStatements.ts, 29, 12))
 >T : Symbol(T, Decl(throwInEnclosingStatements.ts, 29, 8))
 
     biz() {
->biz : Symbol(biz, Decl(throwInEnclosingStatements.ts, 30, 21))
+>biz : Symbol(C.biz, Decl(throwInEnclosingStatements.ts, 30, 21))
 
         throw this.value;
->this.value : Symbol(value, Decl(throwInEnclosingStatements.ts, 29, 12))
+>this.value : Symbol(C.value, Decl(throwInEnclosingStatements.ts, 29, 12))
 >this : Symbol(C, Decl(throwInEnclosingStatements.ts, 27, 26))
->value : Symbol(value, Decl(throwInEnclosingStatements.ts, 29, 12))
+>value : Symbol(C.value, Decl(throwInEnclosingStatements.ts, 29, 12))
     }
 
     constructor() {
@@ -89,6 +89,7 @@ var aa = {
 >biz : Symbol(biz, Decl(throwInEnclosingStatements.ts, 41, 10))
 
         throw this;
+>this : Symbol(, Decl(throwInEnclosingStatements.ts, 40, 8))
     }
 }
 
diff --git a/tests/baselines/reference/throwInEnclosingStatements.types b/tests/baselines/reference/throwInEnclosingStatements.types
index 32f0fb093bc..8add6e8b1a8 100644
--- a/tests/baselines/reference/throwInEnclosingStatements.types
+++ b/tests/baselines/reference/throwInEnclosingStatements.types
@@ -104,7 +104,7 @@ var aa = {
 >biz : () => void
 
         throw this;
->this : any
+>this : { id: number; biz(): void; }
     }
 }
 
diff --git a/tests/baselines/reference/throwStatements.symbols b/tests/baselines/reference/throwStatements.symbols
index adf9cb461cf..854fbcbe90b 100644
--- a/tests/baselines/reference/throwStatements.symbols
+++ b/tests/baselines/reference/throwStatements.symbols
@@ -6,7 +6,7 @@ interface I {
 >I : Symbol(I, Decl(throwStatements.ts, 0, 0))
 
     id: number;
->id : Symbol(id, Decl(throwStatements.ts, 3, 13))
+>id : Symbol(I.id, Decl(throwStatements.ts, 3, 13))
 }
 
 class C implements I {
@@ -14,7 +14,7 @@ class C implements I {
 >I : Symbol(I, Decl(throwStatements.ts, 0, 0))
 
     id: number;
->id : Symbol(id, Decl(throwStatements.ts, 7, 22))
+>id : Symbol(C.id, Decl(throwStatements.ts, 7, 22))
 }
 
 class D<T>{
@@ -22,16 +22,16 @@ class D<T>{
 >T : Symbol(T, Decl(throwStatements.ts, 11, 8))
 
     source: T;
->source : Symbol(source, Decl(throwStatements.ts, 11, 11))
+>source : Symbol(D.source, Decl(throwStatements.ts, 11, 11))
 >T : Symbol(T, Decl(throwStatements.ts, 11, 8))
 
     recurse: D<T>;
->recurse : Symbol(recurse, Decl(throwStatements.ts, 12, 14))
+>recurse : Symbol(D.recurse, Decl(throwStatements.ts, 12, 14))
 >D : Symbol(D, Decl(throwStatements.ts, 9, 1))
 >T : Symbol(T, Decl(throwStatements.ts, 11, 8))
 
     wrapped: D<D<T>>
->wrapped : Symbol(wrapped, Decl(throwStatements.ts, 13, 18))
+>wrapped : Symbol(D.wrapped, Decl(throwStatements.ts, 13, 18))
 >D : Symbol(D, Decl(throwStatements.ts, 9, 1))
 >D : Symbol(D, Decl(throwStatements.ts, 9, 1))
 >T : Symbol(T, Decl(throwStatements.ts, 11, 8))
@@ -48,7 +48,7 @@ module M {
 >A : Symbol(A, Decl(throwStatements.ts, 19, 10))
 
         name: string;
->name : Symbol(name, Decl(throwStatements.ts, 20, 20))
+>name : Symbol(A.name, Decl(throwStatements.ts, 20, 20))
     }
 
     export function F2(x: number): string { return x.toString(); }
@@ -73,7 +73,7 @@ throw aString;
 
 var aDate = new Date(12);
 >aDate : Symbol(aDate, Decl(throwStatements.ts, 31, 3))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 throw aDate;
 >aDate : Symbol(aDate, Decl(throwStatements.ts, 31, 3))
@@ -203,7 +203,7 @@ throw [];
 throw ['a', ['b']];
 throw /[a-z]/;
 throw new Date();
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 throw new C();
 >C : Symbol(C, Decl(throwStatements.ts, 5, 1))
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/tooFewArgumentsInGenericFunctionTypedArgument.symbols b/tests/baselines/reference/tooFewArgumentsInGenericFunctionTypedArgument.symbols
index 752e75d4901..9a6549577d2 100644
--- a/tests/baselines/reference/tooFewArgumentsInGenericFunctionTypedArgument.symbols
+++ b/tests/baselines/reference/tooFewArgumentsInGenericFunctionTypedArgument.symbols
@@ -5,17 +5,17 @@ interface Collection<T, U> {
 >U : Symbol(U, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 0, 23))
 
     length: number;
->length : Symbol(length, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 0, 28))
+>length : Symbol(Collection.length, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 0, 28))
 
     add(x: T, y: U): void;
->add : Symbol(add, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 1, 19))
+>add : Symbol(Collection.add, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 1, 19))
 >x : Symbol(x, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 2, 8))
 >T : Symbol(T, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 0, 21))
 >y : Symbol(y, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 2, 13))
 >U : Symbol(U, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 0, 23))
 
     remove(x: T, y: U): boolean;
->remove : Symbol(remove, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 2, 26))
+>remove : Symbol(Collection.remove, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 2, 26))
 >x : Symbol(x, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 3, 11))
 >T : Symbol(T, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 0, 21))
 >y : Symbol(y, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 3, 16))
@@ -25,7 +25,7 @@ interface Combinators {
 >Combinators : Symbol(Combinators, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 4, 1))
 
     map<T, U, V>(c: Collection<T,U>, f: (x: T, y: U) => V): Collection<T, V>;
->map : Symbol(map, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 5, 23), Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 6, 77))
+>map : Symbol(Combinators.map, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 5, 23), Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 6, 77))
 >T : Symbol(T, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 6, 8))
 >U : Symbol(U, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 6, 10))
 >V : Symbol(V, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 6, 13))
@@ -44,7 +44,7 @@ interface Combinators {
 >V : Symbol(V, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 6, 13))
 
     map<T, U>(c: Collection<T,U>, f: (x: T, y: U) => any): Collection<any, any>;
->map : Symbol(map, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 5, 23), Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 6, 77))
+>map : Symbol(Combinators.map, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 5, 23), Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 6, 77))
 >T : Symbol(T, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 7, 8))
 >U : Symbol(U, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 7, 10))
 >c : Symbol(c, Decl(tooFewArgumentsInGenericFunctionTypedArgument.ts, 7, 14))
diff --git a/tests/baselines/reference/topLevel.symbols b/tests/baselines/reference/topLevel.symbols
index ebca65a13cf..a98b51d2b87 100644
--- a/tests/baselines/reference/topLevel.symbols
+++ b/tests/baselines/reference/topLevel.symbols
@@ -3,10 +3,10 @@ interface IPoint {
 >IPoint : Symbol(IPoint, Decl(topLevel.ts, 0, 0))
 
     x:number;
->x : Symbol(x, Decl(topLevel.ts, 0, 18))
+>x : Symbol(IPoint.x, Decl(topLevel.ts, 0, 18))
 
     y:number;
->y : Symbol(y, Decl(topLevel.ts, 1, 13))
+>y : Symbol(IPoint.y, Decl(topLevel.ts, 1, 13))
 }
 
 class Point implements IPoint {
@@ -14,39 +14,39 @@ class Point implements IPoint {
 >IPoint : Symbol(IPoint, Decl(topLevel.ts, 0, 0))
 
     constructor(public x,public y){}
->x : Symbol(x, Decl(topLevel.ts, 6, 16))
->y : Symbol(y, Decl(topLevel.ts, 6, 25))
+>x : Symbol(Point.x, Decl(topLevel.ts, 6, 16))
+>y : Symbol(Point.y, Decl(topLevel.ts, 6, 25))
 
     public move(xo:number,yo:number) {
->move : Symbol(move, Decl(topLevel.ts, 6, 36))
+>move : Symbol(Point.move, Decl(topLevel.ts, 6, 36))
 >xo : Symbol(xo, Decl(topLevel.ts, 7, 16))
 >yo : Symbol(yo, Decl(topLevel.ts, 7, 26))
 
 	this.x+=xo;
->this.x : Symbol(x, Decl(topLevel.ts, 6, 16))
+>this.x : Symbol(Point.x, Decl(topLevel.ts, 6, 16))
 >this : Symbol(Point, Decl(topLevel.ts, 3, 1))
->x : Symbol(x, Decl(topLevel.ts, 6, 16))
+>x : Symbol(Point.x, Decl(topLevel.ts, 6, 16))
 >xo : Symbol(xo, Decl(topLevel.ts, 7, 16))
 
 	this.y+=yo;
->this.y : Symbol(y, Decl(topLevel.ts, 6, 25))
+>this.y : Symbol(Point.y, Decl(topLevel.ts, 6, 25))
 >this : Symbol(Point, Decl(topLevel.ts, 3, 1))
->y : Symbol(y, Decl(topLevel.ts, 6, 25))
+>y : Symbol(Point.y, Decl(topLevel.ts, 6, 25))
 >yo : Symbol(yo, Decl(topLevel.ts, 7, 26))
 
 	return this;
 >this : Symbol(Point, Decl(topLevel.ts, 3, 1))
     }
     public toString() {
->toString : Symbol(toString, Decl(topLevel.ts, 11, 5))
+>toString : Symbol(Point.toString, Decl(topLevel.ts, 11, 5))
 
 	return ("("+this.x+","+this.y+")");
->this.x : Symbol(x, Decl(topLevel.ts, 6, 16))
+>this.x : Symbol(Point.x, Decl(topLevel.ts, 6, 16))
 >this : Symbol(Point, Decl(topLevel.ts, 3, 1))
->x : Symbol(x, Decl(topLevel.ts, 6, 16))
->this.y : Symbol(y, Decl(topLevel.ts, 6, 25))
+>x : Symbol(Point.x, Decl(topLevel.ts, 6, 16))
+>this.y : Symbol(Point.y, Decl(topLevel.ts, 6, 25))
 >this : Symbol(Point, Decl(topLevel.ts, 3, 1))
->y : Symbol(y, Decl(topLevel.ts, 6, 25))
+>y : Symbol(Point.y, Decl(topLevel.ts, 6, 25))
     }
 }
 
diff --git a/tests/baselines/reference/transitiveTypeArgumentInference1.symbols b/tests/baselines/reference/transitiveTypeArgumentInference1.symbols
index 625857e11be..912e0d94f35 100644
--- a/tests/baselines/reference/transitiveTypeArgumentInference1.symbols
+++ b/tests/baselines/reference/transitiveTypeArgumentInference1.symbols
@@ -5,7 +5,7 @@ interface I1<T, U> {
 >U : Symbol(U, Decl(transitiveTypeArgumentInference1.ts, 0, 15))
 
 	m(value: T): U;
->m : Symbol(m, Decl(transitiveTypeArgumentInference1.ts, 0, 20))
+>m : Symbol(I1.m, Decl(transitiveTypeArgumentInference1.ts, 0, 20))
 >value : Symbol(value, Decl(transitiveTypeArgumentInference1.ts, 1, 3))
 >T : Symbol(T, Decl(transitiveTypeArgumentInference1.ts, 0, 13))
 >U : Symbol(U, Decl(transitiveTypeArgumentInference1.ts, 0, 15))
diff --git a/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js b/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js
new file mode 100644
index 00000000000..61a703e13bb
--- /dev/null
+++ b/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js	
@@ -0,0 +1,3 @@
+"use strict";
+var x = 0;
+//# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.errors.txt b/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.errors.txt
new file mode 100644
index 00000000000..6fbdba6f2c6
--- /dev/null
+++ b/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.errors.txt	
@@ -0,0 +1,7 @@
+file.ts(1,3): error TS1005: ';' expected.
+
+
+==== file.ts (1 errors) ====
+    a b
+      ~
+!!! error TS1005: ';' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js b/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js
new file mode 100644
index 00000000000..9d108d63313
--- /dev/null
+++ b/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js	
@@ -0,0 +1,4 @@
+"use strict";
+a;
+b;
+//# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates module output.js b/tests/baselines/reference/transpile/Generates module output.js
new file mode 100644
index 00000000000..9eadd1f2717
--- /dev/null
+++ b/tests/baselines/reference/transpile/Generates module output.js	
@@ -0,0 +1,5 @@
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var x = 0;
+});
+//# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js b/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js
new file mode 100644
index 00000000000..88d98628eee
--- /dev/null
+++ b/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js	
@@ -0,0 +1,4 @@
+"use strict";
+/// <reference path="file2.ts" />
+var x = 0;
+//# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates no diagnostics for missing module imports.js b/tests/baselines/reference/transpile/Generates no diagnostics for missing module imports.js
new file mode 100644
index 00000000000..1ceb1bcd146
--- /dev/null
+++ b/tests/baselines/reference/transpile/Generates no diagnostics for missing module imports.js	
@@ -0,0 +1,2 @@
+"use strict";
+//# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js b/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js
new file mode 100644
index 00000000000..61a703e13bb
--- /dev/null
+++ b/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js	
@@ -0,0 +1,3 @@
+"use strict";
+var x = 0;
+//# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/No extra errors for file without extension.js b/tests/baselines/reference/transpile/No extra errors for file without extension.js
new file mode 100644
index 00000000000..61a703e13bb
--- /dev/null
+++ b/tests/baselines/reference/transpile/No extra errors for file without extension.js	
@@ -0,0 +1,3 @@
+"use strict";
+var x = 0;
+//# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Rename dependencies - AMD.js b/tests/baselines/reference/transpile/Rename dependencies - AMD.js
new file mode 100644
index 00000000000..a0dd948c9fc
--- /dev/null
+++ b/tests/baselines/reference/transpile/Rename dependencies - AMD.js	
@@ -0,0 +1,5 @@
+define(["require", "exports", "SomeOtherName"], function (require, exports, SomeName_1) {
+    "use strict";
+    use(SomeName_1.foo);
+});
+//# 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
new file mode 100644
index 00000000000..4aad7dd82ec
--- /dev/null
+++ b/tests/baselines/reference/transpile/Rename dependencies - System.js	
@@ -0,0 +1,16 @@
+System.register(["SomeOtherName"], function (exports_1, context_1) {
+    "use strict";
+    var __moduleName = context_1 && context_1.id;
+    var SomeName_1;
+    return {
+        setters: [
+            function (SomeName_1_1) {
+                SomeName_1 = SomeName_1_1;
+            }
+        ],
+        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
new file mode 100644
index 00000000000..88bdc515936
--- /dev/null
+++ b/tests/baselines/reference/transpile/Rename dependencies - UMD.js	
@@ -0,0 +1,13 @@
+(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);
+    }
+})(["require", "exports", "SomeOtherName"], function (require, exports) {
+    "use strict";
+    var SomeName_1 = require("SomeOtherName");
+    use(SomeName_1.foo);
+});
+//# 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
new file mode 100644
index 00000000000..dfe9605fc9e
--- /dev/null
+++ b/tests/baselines/reference/transpile/Sets module name.js	
@@ -0,0 +1,12 @@
+System.register("NamedModule", [], function (exports_1, context_1) {
+    "use strict";
+    var __moduleName = context_1 && context_1.id;
+    var x;
+    return {
+        setters: [],
+        execute: function () {
+            x = 1;
+        }
+    };
+});
+//# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports backslashes in file name.js b/tests/baselines/reference/transpile/Supports backslashes in file name.js
new file mode 100644
index 00000000000..942449753b0
--- /dev/null
+++ b/tests/baselines/reference/transpile/Supports backslashes in file name.js	
@@ -0,0 +1,3 @@
+"use strict";
+var x;
+//# sourceMappingURL=b.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
new file mode 100644
index 00000000000..b6b17292c12
--- /dev/null
+++ b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js	
@@ -0,0 +1,19 @@
+"use strict";
+var db_1 = require("./db");
+function someDecorator(target) {
+    return target;
+}
+var MyClass = (function () {
+    function MyClass(db) {
+        this.db = db;
+        this.db.doSomething();
+    }
+    return MyClass;
+}());
+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/transpile/Uses correct newLine character.js b/tests/baselines/reference/transpile/Uses correct newLine character.js
new file mode 100644
index 00000000000..bab9c3c4443
--- /dev/null
+++ b/tests/baselines/reference/transpile/Uses correct newLine character.js	
@@ -0,0 +1,3 @@
+"use strict";
+var x = 0;
+//# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/transpile .js files.js b/tests/baselines/reference/transpile/transpile .js files.js
new file mode 100644
index 00000000000..c17099d84ba
--- /dev/null
+++ b/tests/baselines/reference/transpile/transpile .js files.js	
@@ -0,0 +1,3 @@
+"use strict";
+var a = 10;
+//# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js b/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js
new file mode 100644
index 00000000000..baa27ee64ce
--- /dev/null
+++ b/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js	
@@ -0,0 +1,3 @@
+"use strict";
+var x = React.createElement("div", null);
+//# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxAttributeResolution.symbols b/tests/baselines/reference/tsxAttributeResolution.symbols
index a40be3861b3..bb0c5e7878f 100644
--- a/tests/baselines/reference/tsxAttributeResolution.symbols
+++ b/tests/baselines/reference/tsxAttributeResolution.symbols
@@ -7,7 +7,7 @@ declare namespace JSX {
 >IntrinsicElements : Symbol(IntrinsicElements, Decl(tsxAttributeResolution.tsx, 1, 23))
 
 		x: { y: number; z: string; };
->x : Symbol(x, Decl(tsxAttributeResolution.tsx, 2, 30))
+>x : Symbol(IntrinsicElements.x, Decl(tsxAttributeResolution.tsx, 2, 30))
 >y : Symbol(y, Decl(tsxAttributeResolution.tsx, 3, 6))
 >z : Symbol(z, Decl(tsxAttributeResolution.tsx, 3, 17))
 	}
diff --git a/tests/baselines/reference/tsxAttributeResolution12.errors.txt b/tests/baselines/reference/tsxAttributeResolution12.errors.txt
new file mode 100644
index 00000000000..ecf51a0f3dd
--- /dev/null
+++ b/tests/baselines/reference/tsxAttributeResolution12.errors.txt
@@ -0,0 +1,54 @@
+tests/cases/conformance/jsx/file.tsx(26,10): error TS2324: Property 'reqd' is missing in type 'IntrinsicAttributes & { reqd: any; }'.
+tests/cases/conformance/jsx/file.tsx(29,10): error TS2324: Property 'reqd' is missing in type 'IntrinsicAttributes & { reqd: any; }'.
+
+
+==== tests/cases/conformance/jsx/react.d.ts (0 errors) ====
+    
+    declare module JSX {
+    	interface Element { }
+    	interface IntrinsicElements {
+    	}
+    	interface ElementAttributesProperty {
+    		props;
+    	}
+    	interface IntrinsicAttributes {
+    		ref?: string;
+    	}
+    }
+    
+==== tests/cases/conformance/jsx/file.tsx (2 errors) ====
+    
+    declare class Component<P, S>  {
+    	constructor(props?: P, context?: any);
+    	setState(f: (prevState: S, props: P) => S, callback?: () => any): void;
+    	setState(state: S, callback?: () => any): void;
+    	forceUpdate(callBack?: () => any): void;
+    	render(): JSX.Element;
+    	props: P;
+    	state: S;
+    	context: {};
+    }
+    
+    
+    interface ComponentClass<P> {
+    	new (props?: P, context?: any): Component<P, any>;
+    }
+    
+    declare module TestMod {
+    	interface TestClass extends ComponentClass<{reqd: any}> {
+    	}
+    	var Test: TestClass;
+    }
+    
+    // Errors correctly
+    const T = TestMod.Test;
+    var t1 = <T />;
+             ~~~~~
+!!! error TS2324: Property 'reqd' is missing in type 'IntrinsicAttributes & { reqd: any; }'.
+    
+    // Should error
+    var t2 = <TestMod.Test />;
+             ~~~~~~~~~~~~~~~~
+!!! error TS2324: Property 'reqd' is missing in type 'IntrinsicAttributes & { reqd: any; }'.
+    
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxAttributeResolution12.js b/tests/baselines/reference/tsxAttributeResolution12.js
new file mode 100644
index 00000000000..05a854a7cbc
--- /dev/null
+++ b/tests/baselines/reference/tsxAttributeResolution12.js
@@ -0,0 +1,55 @@
+//// [tests/cases/conformance/jsx/tsxAttributeResolution12.tsx] ////
+
+//// [react.d.ts]
+
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements {
+	}
+	interface ElementAttributesProperty {
+		props;
+	}
+	interface IntrinsicAttributes {
+		ref?: string;
+	}
+}
+
+//// [file.tsx]
+
+declare class Component<P, S>  {
+	constructor(props?: P, context?: any);
+	setState(f: (prevState: S, props: P) => S, callback?: () => any): void;
+	setState(state: S, callback?: () => any): void;
+	forceUpdate(callBack?: () => any): void;
+	render(): JSX.Element;
+	props: P;
+	state: S;
+	context: {};
+}
+
+
+interface ComponentClass<P> {
+	new (props?: P, context?: any): Component<P, any>;
+}
+
+declare module TestMod {
+	interface TestClass extends ComponentClass<{reqd: any}> {
+	}
+	var Test: TestClass;
+}
+
+// Errors correctly
+const T = TestMod.Test;
+var t1 = <T />;
+
+// Should error
+var t2 = <TestMod.Test />;
+
+
+
+//// [file.jsx]
+// Errors correctly
+var T = TestMod.Test;
+var t1 = <T />;
+// Should error
+var t2 = <TestMod.Test />;
diff --git a/tests/baselines/reference/tsxAttributeResolution13.js b/tests/baselines/reference/tsxAttributeResolution13.js
new file mode 100644
index 00000000000..e6c942eb926
--- /dev/null
+++ b/tests/baselines/reference/tsxAttributeResolution13.js
@@ -0,0 +1,9 @@
+//// [test.tsx]
+
+function Test() { }
+<Test></Test>
+
+
+//// [test.jsx]
+function Test() { }
+<Test></Test>;
diff --git a/tests/baselines/reference/tsxAttributeResolution13.symbols b/tests/baselines/reference/tsxAttributeResolution13.symbols
new file mode 100644
index 00000000000..a913e50969c
--- /dev/null
+++ b/tests/baselines/reference/tsxAttributeResolution13.symbols
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/jsx/test.tsx ===
+
+function Test() { }
+>Test : Symbol(Test, Decl(test.tsx, 0, 0))
+
+<Test></Test>
+>Test : Symbol(Test, Decl(test.tsx, 0, 0))
+>Test : Symbol(Test, Decl(test.tsx, 0, 0))
+
diff --git a/tests/baselines/reference/tsxAttributeResolution13.types b/tests/baselines/reference/tsxAttributeResolution13.types
new file mode 100644
index 00000000000..1a426d86e7d
--- /dev/null
+++ b/tests/baselines/reference/tsxAttributeResolution13.types
@@ -0,0 +1,10 @@
+=== tests/cases/conformance/jsx/test.tsx ===
+
+function Test() { }
+>Test : () => void
+
+<Test></Test>
+><Test></Test> : any
+>Test : () => void
+>Test : () => void
+
diff --git a/tests/baselines/reference/tsxAttributeResolution8.symbols b/tests/baselines/reference/tsxAttributeResolution8.symbols
index 58629c15b6f..354905faeec 100644
--- a/tests/baselines/reference/tsxAttributeResolution8.symbols
+++ b/tests/baselines/reference/tsxAttributeResolution8.symbols
@@ -9,7 +9,7 @@ declare module JSX {
 >IntrinsicElements : Symbol(IntrinsicElements, Decl(file.tsx, 1, 22))
 
 		test1: {x: string};
->test1 : Symbol(test1, Decl(file.tsx, 2, 30))
+>test1 : Symbol(IntrinsicElements.test1, Decl(file.tsx, 2, 30))
 >x : Symbol(x, Decl(file.tsx, 3, 10))
 	}
 }
diff --git a/tests/baselines/reference/tsxElementResolution.symbols b/tests/baselines/reference/tsxElementResolution.symbols
index 4cdd0c23cf1..cd7ac7807f1 100644
--- a/tests/baselines/reference/tsxElementResolution.symbols
+++ b/tests/baselines/reference/tsxElementResolution.symbols
@@ -7,7 +7,7 @@ declare namespace JSX {
 >IntrinsicElements : Symbol(IntrinsicElements, Decl(tsxElementResolution.tsx, 1, 23))
 
 		foundFirst: { x: string };
->foundFirst : Symbol(foundFirst, Decl(tsxElementResolution.tsx, 2, 30))
+>foundFirst : Symbol(IntrinsicElements.foundFirst, Decl(tsxElementResolution.tsx, 2, 30))
 >x : Symbol(x, Decl(tsxElementResolution.tsx, 3, 15))
 
 		'string_named';
@@ -47,5 +47,7 @@ var d = <Other />;
 
 var e = <Dotted.Name />;
 >e : Symbol(e, Decl(tsxElementResolution.tsx, 23, 3))
+>Dotted.Name : Symbol(Dotted.Name, Decl(tsxElementResolution.tsx, 12, 15))
+>Dotted : Symbol(Dotted, Decl(tsxElementResolution.tsx, 10, 14))
 >Name : Symbol(Dotted.Name, Decl(tsxElementResolution.tsx, 12, 15))
 
diff --git a/tests/baselines/reference/tsxElementResolution.types b/tests/baselines/reference/tsxElementResolution.types
index 89600bbbc2f..a1c2abcef7c 100644
--- a/tests/baselines/reference/tsxElementResolution.types
+++ b/tests/baselines/reference/tsxElementResolution.types
@@ -51,6 +51,7 @@ var d = <Other />;
 var e = <Dotted.Name />;
 >e : any
 ><Dotted.Name /> : any
->Dotted : any
->Name : any
+>Dotted.Name : typeof Dotted.Name
+>Dotted : typeof Dotted
+>Name : typeof Dotted.Name
 
diff --git a/tests/baselines/reference/tsxElementResolution13.symbols b/tests/baselines/reference/tsxElementResolution13.symbols
index 4b6a5b4f4e7..9122f553a88 100644
--- a/tests/baselines/reference/tsxElementResolution13.symbols
+++ b/tests/baselines/reference/tsxElementResolution13.symbols
@@ -7,8 +7,8 @@ declare module JSX {
 
 	interface ElementAttributesProperty { pr1: any; pr2: any; }
 >ElementAttributesProperty : Symbol(ElementAttributesProperty, Decl(file.tsx, 1, 22))
->pr1 : Symbol(pr1, Decl(file.tsx, 2, 38))
->pr2 : Symbol(pr2, Decl(file.tsx, 2, 48))
+>pr1 : Symbol(ElementAttributesProperty.pr1, Decl(file.tsx, 2, 38))
+>pr2 : Symbol(ElementAttributesProperty.pr2, Decl(file.tsx, 2, 48))
 }
 
 interface Obj1 {
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/tsxElementResolution17.symbols b/tests/baselines/reference/tsxElementResolution17.symbols
index 0b4459552de..0225cc35d91 100644
--- a/tests/baselines/reference/tsxElementResolution17.symbols
+++ b/tests/baselines/reference/tsxElementResolution17.symbols
@@ -8,6 +8,8 @@ import s2 = require('elements2');
 >s2 : Symbol(s2, Decl(consumer.tsx, 2, 33))
 
 <s1.MyElement />;
+>s1.MyElement : Symbol(s1.MyElement, Decl(file.tsx, 6, 28))
+>s1 : Symbol(s1, Decl(consumer.tsx, 0, 0))
 >MyElement : Symbol(s1.MyElement, Decl(file.tsx, 6, 28))
 
 === tests/cases/conformance/jsx/file.tsx ===
diff --git a/tests/baselines/reference/tsxElementResolution17.types b/tests/baselines/reference/tsxElementResolution17.types
index e6396a9a60b..c68c19f58e7 100644
--- a/tests/baselines/reference/tsxElementResolution17.types
+++ b/tests/baselines/reference/tsxElementResolution17.types
@@ -9,8 +9,9 @@ import s2 = require('elements2');
 
 <s1.MyElement />;
 ><s1.MyElement /> : JSX.Element
->s1 : any
->MyElement : any
+>s1.MyElement : typeof s1.MyElement
+>s1 : typeof s1
+>MyElement : typeof s1.MyElement
 
 === tests/cases/conformance/jsx/file.tsx ===
 
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/tsxElementResolution9.symbols b/tests/baselines/reference/tsxElementResolution9.symbols
index 0aec19a8094..d6b0da12e6f 100644
--- a/tests/baselines/reference/tsxElementResolution9.symbols
+++ b/tests/baselines/reference/tsxElementResolution9.symbols
@@ -4,7 +4,7 @@ declare module JSX {
 
 	interface Element { something; }
 >Element : Symbol(Element, Decl(file.tsx, 0, 20))
->something : Symbol(something, Decl(file.tsx, 1, 20))
+>something : Symbol(Element.something, Decl(file.tsx, 1, 20))
 
 	interface IntrinsicElements { }
 >IntrinsicElements : Symbol(IntrinsicElements, Decl(file.tsx, 1, 33))
diff --git a/tests/baselines/reference/tsxEmit1.symbols b/tests/baselines/reference/tsxEmit1.symbols
index 9d373bc62be..9e32354b184 100644
--- a/tests/baselines/reference/tsxEmit1.symbols
+++ b/tests/baselines/reference/tsxEmit1.symbols
@@ -93,7 +93,7 @@ class SomeClass {
 >SomeClass : Symbol(SomeClass, Decl(file.tsx, 20, 43))
 
 	f() {
->f : Symbol(f, Decl(file.tsx, 22, 17))
+>f : Symbol(SomeClass.f, Decl(file.tsx, 22, 17))
 
 		var rewrites1 = <div>{() => this}</div>;
 >rewrites1 : Symbol(rewrites1, Decl(file.tsx, 24, 5))
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..bae6c014d17 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,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;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,EAAC,CAAC;IACT,aAAa;IACb,EAAA,GAAG,EAAE,CAAC,EAAA,GAAG,GAAG,CAAC;IAEb,IAAc,CAAC,CAMd;IAND,WAAc,CAAC,EAAC,CAAC;QAChB,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,EAAC,CAAC;IACT,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,EAAC,CAAC;IACT,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..a1bf07541e6 100644
--- a/tests/baselines/reference/tsxEmit3.sourcemap.txt
+++ b/tests/baselines/reference/tsxEmit3.sourcemap.txt
@@ -203,7 +203,6 @@ sourceFile:file.tsx
 2 >        ^^^^^
 3 >             ^^^^^^
 4 >                   ^
-5 >                    ^^^^^^^^^^^->
 1->
 2 >        Bar
 3 >              { }
@@ -213,6 +212,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 +244,6 @@ sourceFile:file.tsx
 8 >                   ^^^
 9 >                      ^^^^^^^^
 1->
-  >
-  >		// Emit Foo
-  >		// Foo, <Foo />;
   >	
 2 >    }
 3 >     
@@ -241,15 +258,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 +292,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,10 +324,10 @@ 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->
@@ -324,11 +341,11 @@ sourceFile:file.tsx
 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)
+4 >Emitted(22, 15) Source(17, 10) + SourceIndex(0)
+5 >Emitted(22, 16) Source(17, 11) + SourceIndex(0)
 ---
 >>>    // Emit M.Foo
 1->^^^^
@@ -337,32 +354,38 @@ sourceFile:file.tsx
 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,10 +405,10 @@ 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->^^^^
@@ -399,11 +422,11 @@ sourceFile:file.tsx
 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)
+4 >Emitted(26, 19) Source(21, 18) + SourceIndex(0)
+5 >Emitted(26, 20) Source(21, 19) + SourceIndex(0)
 ---
 >>>        // Emit M.Foo
 1->^^^^^^^^
@@ -412,32 +435,38 @@ sourceFile:file.tsx
 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 +476,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 +536,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 +575,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,10 +598,10 @@ 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->
@@ -580,11 +615,11 @@ sourceFile:file.tsx
 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)
+4 >Emitted(34, 15) Source(31, 10) + SourceIndex(0)
+5 >Emitted(34, 16) Source(31, 11) + SourceIndex(0)
 ---
 >>>    // Emit M.S.Bar
 1->^^^^
@@ -593,44 +628,50 @@ sourceFile:file.tsx
 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 +692,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,10 +716,10 @@ 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->
@@ -691,11 +732,11 @@ sourceFile:file.tsx
 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)
+4 >Emitted(39, 17) Source(36, 10) + SourceIndex(0)
+5 >Emitted(39, 18) Source(36, 11) + SourceIndex(0)
 ---
 >>>    var M = 100;
 1 >^^^^
@@ -712,12 +753,12 @@ sourceFile:file.tsx
 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 +767,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 +821,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/tsxEmit3.symbols b/tests/baselines/reference/tsxEmit3.symbols
index 3b88d4e0371..3eb4ef3b05d 100644
--- a/tests/baselines/reference/tsxEmit3.symbols
+++ b/tests/baselines/reference/tsxEmit3.symbols
@@ -59,6 +59,8 @@ module M {
 >S.Bar : Symbol(S.Bar, Decl(file.tsx, 8, 18))
 >S : Symbol(S, Decl(file.tsx, 7, 39), Decl(file.tsx, 18, 14))
 >Bar : Symbol(S.Bar, Decl(file.tsx, 8, 18))
+>S.Bar : Symbol(S.Bar, Decl(file.tsx, 8, 18))
+>S : Symbol(S, Decl(file.tsx, 7, 39), Decl(file.tsx, 18, 14))
 >Bar : Symbol(S.Bar, Decl(file.tsx, 8, 18))
 }
 
diff --git a/tests/baselines/reference/tsxEmit3.types b/tests/baselines/reference/tsxEmit3.types
index 49a5cf8a51b..e70c44d0041 100644
--- a/tests/baselines/reference/tsxEmit3.types
+++ b/tests/baselines/reference/tsxEmit3.types
@@ -67,8 +67,9 @@ module M {
 >S : typeof S
 >Bar : typeof S.Bar
 ><S.Bar /> : JSX.Element
->S : any
->Bar : any
+>S.Bar : typeof S.Bar
+>S : typeof S
+>Bar : typeof S.Bar
 }
 
 module M {
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/tsxExternalModuleEmit1.symbols b/tests/baselines/reference/tsxExternalModuleEmit1.symbols
index 129edcca0d1..e2d3eee98b0 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit1.symbols
+++ b/tests/baselines/reference/tsxExternalModuleEmit1.symbols
@@ -22,7 +22,7 @@ export class App extends React.Component<any, any> {
 >Component : Symbol(React.Component, Decl(react.d.ts, 1, 24))
 
     render() {
->render : Symbol(render, Decl(app.tsx, 5, 52))
+>render : Symbol(App.render, Decl(app.tsx, 5, 52))
 
         return <Button />;
 >Button : Symbol(Button, Decl(app.tsx, 3, 8))
@@ -41,7 +41,7 @@ export class Button extends React.Component<any, any> {
 >Component : Symbol(React.Component, Decl(react.d.ts, 1, 24))
 
     render() {
->render : Symbol(render, Decl(button.tsx, 2, 55))
+>render : Symbol(Button.render, Decl(button.tsx, 2, 55))
 
         return <button>Some button</button>;
 >button : Symbol(unknown)
diff --git a/tests/baselines/reference/tsxExternalModuleEmit2.js b/tests/baselines/reference/tsxExternalModuleEmit2.js
index 2233c5181cb..6c01a48af78 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit2.js
+++ b/tests/baselines/reference/tsxExternalModuleEmit2.js
@@ -19,8 +19,16 @@ declare var Foo, React;
 
 //// [app.js]
 "use strict";
-var mod_1 = require('mod');
+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 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, React.__spread({}, mod_1["default"]));
+React.createElement(Foo, __assign({}, mod_1["default"]));
diff --git a/tests/baselines/reference/tsxGenericArrowFunctionParsing.symbols b/tests/baselines/reference/tsxGenericArrowFunctionParsing.symbols
index 85dec56b2f8..6d90c583a66 100644
--- a/tests/baselines/reference/tsxGenericArrowFunctionParsing.symbols
+++ b/tests/baselines/reference/tsxGenericArrowFunctionParsing.symbols
@@ -4,7 +4,7 @@ declare module JSX {
 
 	interface Element { isElement; }
 >Element : Symbol(Element, Decl(file.tsx, 0, 20))
->isElement : Symbol(isElement, Decl(file.tsx, 1, 20))
+>isElement : Symbol(Element.isElement, Decl(file.tsx, 1, 20))
 }
 
 var T, T1, T2;
diff --git a/tests/baselines/reference/tsxInArrowFunction.symbols b/tests/baselines/reference/tsxInArrowFunction.symbols
index 5896dfa1eef..ff80428cf74 100644
--- a/tests/baselines/reference/tsxInArrowFunction.symbols
+++ b/tests/baselines/reference/tsxInArrowFunction.symbols
@@ -10,7 +10,7 @@ declare namespace JSX {
 >IntrinsicElements : Symbol(IntrinsicElements, Decl(tsxInArrowFunction.tsx, 2, 25))
 
         div: {
->div : Symbol(div, Decl(tsxInArrowFunction.tsx, 3, 33))
+>div : Symbol(IntrinsicElements.div, Decl(tsxInArrowFunction.tsx, 3, 33))
 
             text?: string;
 >text : Symbol(text, Decl(tsxInArrowFunction.tsx, 4, 14))
diff --git a/tests/baselines/reference/tsxOpeningClosingNames.symbols b/tests/baselines/reference/tsxOpeningClosingNames.symbols
index 08da0bf05fb..66010f74d2f 100644
--- a/tests/baselines/reference/tsxOpeningClosingNames.symbols
+++ b/tests/baselines/reference/tsxOpeningClosingNames.symbols
@@ -16,6 +16,18 @@ declare module A.B.C {
 }
 
 <A.B.C.D>foo</A . B . C.D>
->D : Symbol(unknown)
->D : Symbol(unknown)
+>A.B.C.D : Symbol(A.B.C.D, Decl(file.tsx, 5, 5))
+>A.B.C : Symbol(A.B.C, Decl(file.tsx, 4, 19))
+>A.B : Symbol(A.B, Decl(file.tsx, 4, 17))
+>A : Symbol(A, Decl(file.tsx, 2, 1))
+>B : Symbol(A.B, Decl(file.tsx, 4, 17))
+>C : Symbol(A.B.C, Decl(file.tsx, 4, 19))
+>D : Symbol(A.B.C.D, Decl(file.tsx, 5, 5))
+>A . B . C.D : Symbol(A.B.C.D, Decl(file.tsx, 5, 5))
+>A . B . C : Symbol(A.B.C, Decl(file.tsx, 4, 19))
+>A . B : Symbol(A.B, Decl(file.tsx, 4, 17))
+>A : Symbol(A, Decl(file.tsx, 2, 1))
+>B : Symbol(A.B, Decl(file.tsx, 4, 17))
+>C : Symbol(A.B.C, Decl(file.tsx, 4, 19))
+>D : Symbol(A.B.C.D, Decl(file.tsx, 5, 5))
 
diff --git a/tests/baselines/reference/tsxOpeningClosingNames.types b/tests/baselines/reference/tsxOpeningClosingNames.types
index ac36205029e..2e21f346d10 100644
--- a/tests/baselines/reference/tsxOpeningClosingNames.types
+++ b/tests/baselines/reference/tsxOpeningClosingNames.types
@@ -17,12 +17,18 @@ declare module A.B.C {
 
 <A.B.C.D>foo</A . B . C.D>
 ><A.B.C.D>foo</A . B . C.D> : JSX.Element
->A : any
->B : any
->C : any
+>A.B.C.D : any
+>A.B.C : typeof A.B.C
+>A.B : typeof A.B
+>A : typeof A
+>B : typeof A.B
+>C : typeof A.B.C
 >D : any
->A : any
->B : any
->C : any
+>A . B . C.D : any
+>A . B . C : typeof A.B.C
+>A . B : typeof A.B
+>A : typeof A
+>B : typeof A.B
+>C : typeof A.B.C
 >D : any
 
diff --git a/tests/baselines/reference/tsxParseTests1.symbols b/tests/baselines/reference/tsxParseTests1.symbols
index 0ee595a9a3d..905a7f4860b 100644
--- a/tests/baselines/reference/tsxParseTests1.symbols
+++ b/tests/baselines/reference/tsxParseTests1.symbols
@@ -7,8 +7,8 @@ declare module JSX {
 
 	interface IntrinsicElements { div; span; }
 >IntrinsicElements : Symbol(IntrinsicElements, Decl(file.tsx, 1, 22))
->div : Symbol(div, Decl(file.tsx, 2, 30))
->span : Symbol(span, Decl(file.tsx, 2, 35))
+>div : Symbol(IntrinsicElements.div, Decl(file.tsx, 2, 30))
+>span : Symbol(IntrinsicElements.span, Decl(file.tsx, 2, 35))
 }
 
 var x = <div><div><span><div></div></span></div></div>;
diff --git a/tests/baselines/reference/tsxParseTests2.symbols b/tests/baselines/reference/tsxParseTests2.symbols
index 690bc183ddd..396edca4a0a 100644
--- a/tests/baselines/reference/tsxParseTests2.symbols
+++ b/tests/baselines/reference/tsxParseTests2.symbols
@@ -7,8 +7,8 @@ declare module JSX {
 
 	interface IntrinsicElements { div; span; }
 >IntrinsicElements : Symbol(IntrinsicElements, Decl(file.tsx, 1, 22))
->div : Symbol(div, Decl(file.tsx, 2, 30))
->span : Symbol(span, Decl(file.tsx, 2, 35))
+>div : Symbol(IntrinsicElements.div, Decl(file.tsx, 2, 30))
+>span : Symbol(IntrinsicElements.span, Decl(file.tsx, 2, 35))
 }
 
 var x = </**/div></div>;
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/tsxReactEmit1.symbols b/tests/baselines/reference/tsxReactEmit1.symbols
index 640f666c0d8..6887a9550c0 100644
--- a/tests/baselines/reference/tsxReactEmit1.symbols
+++ b/tests/baselines/reference/tsxReactEmit1.symbols
@@ -97,7 +97,7 @@ class SomeClass {
 >SomeClass : Symbol(SomeClass, Decl(file.tsx, 21, 45))
 
 	f() {
->f : Symbol(f, Decl(file.tsx, 23, 17))
+>f : Symbol(SomeClass.f, Decl(file.tsx, 23, 17))
 
 		var rewrites1 = <div>{() => this}</div>;
 >rewrites1 : Symbol(rewrites1, Decl(file.tsx, 25, 5))
diff --git a/tests/baselines/reference/tsxReactEmit2.js b/tests/baselines/reference/tsxReactEmit2.js
index fd7fff16976..80e3215e2b6 100644
--- a/tests/baselines/reference/tsxReactEmit2.js
+++ b/tests/baselines/reference/tsxReactEmit2.js
@@ -16,9 +16,17 @@ var spreads5 = <div x={p2} {...p1} y={p3}>{p2}</div>;
 
 
 //// [file.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 p1, p2, p3;
-var spreads1 = React.createElement("div", React.__spread({}, p1), p2);
-var spreads2 = React.createElement("div", React.__spread({}, p1), p2);
-var spreads3 = React.createElement("div", React.__spread({x: p3}, p1), p2);
-var spreads4 = React.createElement("div", React.__spread({}, p1, {x: p3}), p2);
-var spreads5 = React.createElement("div", React.__spread({x: p2}, p1, {y: p3}), p2);
+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);
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 d61cea24d2c..33c835d1ab2 100644
--- a/tests/baselines/reference/tsxReactEmit4.js
+++ b/tests/baselines/reference/tsxReactEmit4.js
@@ -18,7 +18,15 @@ var openClosed1 = <div>
 var spread1 = <div {...p} x={0} />;
 
 //// [file.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 p;
 var openClosed1 = React.createElement("div", null, blah);
 // Should emit React.__spread({}, p, {x: 0})
-var spread1 = React.createElement("div", React.__spread({}, 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 06b05f67d63..c3e58d0a0da 100644
--- a/tests/baselines/reference/tsxReactEmit5.js
+++ b/tests/baselines/reference/tsxReactEmit5.js
@@ -23,8 +23,16 @@ var spread1 = <div x='' {...foo} y='' />;
 //// [file.js]
 //// [react-consumer.js]
 "use strict";
+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 test_1 = require("./test");
 // Should emit test_1.React.createElement
 //  and React.__spread
 var foo;
-var spread1 = test_1.React.createElement("div", test_1.React.__spread({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 4f583929004..a85c6baa687 100644
--- a/tests/baselines/reference/tsxReactEmit6.js
+++ b/tests/baselines/reference/tsxReactEmit6.js
@@ -28,6 +28,14 @@ namespace M {
 
 //// [file.js]
 //// [react-consumer.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 M;
 (function (M) {
 })(M || (M = {}));
@@ -36,7 +44,7 @@ var M;
     // Should emit M.React.createElement
     //  and M.React.__spread
     var foo;
-    var spread1 = M.React.createElement("div", M.React.__spread({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.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponents2.errors.txt
index cced3116b5e..f8a569838ee 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents2.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents2.errors.txt
@@ -1,15 +1,12 @@
-tests/cases/conformance/jsx/file.tsx(2,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/conformance/jsx/file.tsx(20,16): error TS2339: Property 'ref' does not exist on type 'IntrinsicAttributes & { name?: string; }'.
 tests/cases/conformance/jsx/file.tsx(26,42): error TS2339: Property 'subtr' does not exist on type 'string'.
 tests/cases/conformance/jsx/file.tsx(28,33): error TS2339: Property 'notARealProperty' does not exist on type 'BigGreeter'.
 tests/cases/conformance/jsx/file.tsx(36,26): error TS2339: Property 'propertyNotOnHtmlDivElement' does not exist on type 'HTMLDivElement'.
 
 
-==== tests/cases/conformance/jsx/file.tsx (5 errors) ====
+==== tests/cases/conformance/jsx/file.tsx (4 errors) ====
     
     import React = require('react');
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
     
     function Greet(x: {name?: string}) {
     	return <div>Hello, {x}</div>;
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/tsxTypeErrors.symbols b/tests/baselines/reference/tsxTypeErrors.symbols
index 2b87e994477..062442cda16 100644
--- a/tests/baselines/reference/tsxTypeErrors.symbols
+++ b/tests/baselines/reference/tsxTypeErrors.symbols
@@ -34,7 +34,7 @@ class MyClass {
 >MyClass : Symbol(MyClass, Decl(tsxTypeErrors.tsx, 12, 31))
 
   props: {
->props : Symbol(props, Decl(tsxTypeErrors.tsx, 15, 15))
+>props : Symbol(MyClass.props, Decl(tsxTypeErrors.tsx, 15, 15))
 
     pt?: { x: number; y: number; };
 >pt : Symbol(pt, Decl(tsxTypeErrors.tsx, 16, 10))
diff --git a/tests/baselines/reference/tupleTypeInference.symbols b/tests/baselines/reference/tupleTypeInference.symbols
index 4dbed73e395..ec825e81f4b 100644
--- a/tests/baselines/reference/tupleTypeInference.symbols
+++ b/tests/baselines/reference/tupleTypeInference.symbols
@@ -7,7 +7,7 @@ interface IQService {
 >IQService : Symbol(IQService, Decl(tupleTypeInference.ts, 0, 26))
 
     all<T1, T2, T3>(x: [IPromise<T1>, IPromise<T2>, IPromise<T3>]): IPromise<[T1, T2, T3]>;
->all : Symbol(all, Decl(tupleTypeInference.ts, 2, 21), Decl(tupleTypeInference.ts, 3, 91), Decl(tupleTypeInference.ts, 4, 69))
+>all : Symbol(IQService.all, Decl(tupleTypeInference.ts, 2, 21), Decl(tupleTypeInference.ts, 3, 91), Decl(tupleTypeInference.ts, 4, 69))
 >T1 : Symbol(T1, Decl(tupleTypeInference.ts, 3, 8))
 >T2 : Symbol(T2, Decl(tupleTypeInference.ts, 3, 11))
 >T3 : Symbol(T3, Decl(tupleTypeInference.ts, 3, 15))
@@ -24,7 +24,7 @@ interface IQService {
 >T3 : Symbol(T3, Decl(tupleTypeInference.ts, 3, 15))
 
     all<T1, T2>(x: [IPromise<T1>, IPromise<T2>]): IPromise<[T1, T2]>;
->all : Symbol(all, Decl(tupleTypeInference.ts, 2, 21), Decl(tupleTypeInference.ts, 3, 91), Decl(tupleTypeInference.ts, 4, 69))
+>all : Symbol(IQService.all, Decl(tupleTypeInference.ts, 2, 21), Decl(tupleTypeInference.ts, 3, 91), Decl(tupleTypeInference.ts, 4, 69))
 >T1 : Symbol(T1, Decl(tupleTypeInference.ts, 4, 8))
 >T2 : Symbol(T2, Decl(tupleTypeInference.ts, 4, 11))
 >x : Symbol(x, Decl(tupleTypeInference.ts, 4, 16))
@@ -37,7 +37,7 @@ interface IQService {
 >T2 : Symbol(T2, Decl(tupleTypeInference.ts, 4, 11))
 
     all<T1>(x: [IPromise<T1>]): IPromise<[T1]>;
->all : Symbol(all, Decl(tupleTypeInference.ts, 2, 21), Decl(tupleTypeInference.ts, 3, 91), Decl(tupleTypeInference.ts, 4, 69))
+>all : Symbol(IQService.all, Decl(tupleTypeInference.ts, 2, 21), Decl(tupleTypeInference.ts, 3, 91), Decl(tupleTypeInference.ts, 4, 69))
 >T1 : Symbol(T1, Decl(tupleTypeInference.ts, 5, 8))
 >x : Symbol(x, Decl(tupleTypeInference.ts, 5, 12))
 >IPromise : Symbol(IPromise, Decl(tupleTypeInference.ts, 7, 1))
@@ -46,7 +46,7 @@ interface IQService {
 >T1 : Symbol(T1, Decl(tupleTypeInference.ts, 5, 8))
 
     when<T>(t?: T): IPromise<T>;
->when : Symbol(when, Decl(tupleTypeInference.ts, 5, 47))
+>when : Symbol(IQService.when, Decl(tupleTypeInference.ts, 5, 47))
 >T : Symbol(T, Decl(tupleTypeInference.ts, 6, 9))
 >t : Symbol(t, Decl(tupleTypeInference.ts, 6, 12))
 >T : Symbol(T, Decl(tupleTypeInference.ts, 6, 9))
@@ -59,7 +59,7 @@ interface IPromise<T> {
 >T : Symbol(T, Decl(tupleTypeInference.ts, 9, 19))
 
     then<TResult>(callback: (t: T) => TResult): IPromise<TResult>;
->then : Symbol(then, Decl(tupleTypeInference.ts, 9, 23))
+>then : Symbol(IPromise.then, Decl(tupleTypeInference.ts, 9, 23))
 >TResult : Symbol(TResult, Decl(tupleTypeInference.ts, 10, 9))
 >callback : Symbol(callback, Decl(tupleTypeInference.ts, 10, 18))
 >t : Symbol(t, Decl(tupleTypeInference.ts, 10, 29))
diff --git a/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName.errors.txt b/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName.errors.txt
index adf9583095d..6c0f562ac64 100644
--- a/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName.errors.txt
+++ b/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName.ts(7,11): error TS2428: All declarations of an interface must have identical type parameters.
-tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName.ts(15,11): error TS2428: All declarations of an interface must have identical type parameters.
-tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName.ts(24,15): error TS2428: All declarations of an interface must have identical type parameters.
-tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName.ts(32,15): error TS2428: All declarations of an interface must have identical type parameters.
-tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName.ts(56,22): error TS2428: All declarations of an interface must have identical type parameters.
+tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName.ts(7,11): error TS2428: All declarations of 'A' must have identical type parameters.
+tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName.ts(15,11): error TS2428: All declarations of 'B' must have identical type parameters.
+tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName.ts(24,15): error TS2428: All declarations of 'A' must have identical type parameters.
+tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName.ts(32,15): error TS2428: All declarations of 'B' must have identical type parameters.
+tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName.ts(56,22): error TS2428: All declarations of 'B' must have identical type parameters.
 
 
 ==== tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName.ts (5 errors) ====
@@ -14,7 +14,7 @@ tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDiffer
     
     interface A<U> { // error
               ~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'A' must have identical type parameters.
         y: U;
     }
     
@@ -24,7 +24,7 @@ tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDiffer
     
     interface B<T,V> { // error
               ~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'B' must have identical type parameters.
         y: V;
     }
     
@@ -35,7 +35,7 @@ tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDiffer
     
         interface A<U> { // error
                   ~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'A' must have identical type parameters.
             y: U;
         }
     
@@ -45,7 +45,7 @@ tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDiffer
     
         interface B<T, V> { // error
                   ~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'B' must have identical type parameters.
             y: V;
         }
     }
@@ -71,7 +71,7 @@ tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDiffer
     module M3 {
         export interface B<T, V> { // error
                          ~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'B' must have identical type parameters.
             y: V;
         }
     }
diff --git a/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName2.errors.txt b/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName2.errors.txt
index dd1483b9e1d..f2a0063c230 100644
--- a/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName2.errors.txt
+++ b/tests/baselines/reference/twoGenericInterfacesDifferingByTypeParameterName2.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName2.ts(7,11): error TS2428: All declarations of an interface must have identical type parameters.
+tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName2.ts(7,11): error TS2428: All declarations of 'B' must have identical type parameters.
 tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName2.ts(8,8): error TS2304: Cannot find name 'V'.
-tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName2.ts(16,15): error TS2428: All declarations of an interface must have identical type parameters.
-tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName2.ts(40,22): error TS2428: All declarations of an interface must have identical type parameters.
+tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName2.ts(16,15): error TS2428: All declarations of 'B' must have identical type parameters.
+tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName2.ts(40,22): error TS2428: All declarations of 'B' must have identical type parameters.
 
 
 ==== tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDifferingByTypeParameterName2.ts (4 errors) ====
@@ -13,7 +13,7 @@ tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDiffer
     
     interface B<U, T> { // error
               ~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'B' must have identical type parameters.
         y: V;
            ~
 !!! error TS2304: Cannot find name 'V'.
@@ -26,7 +26,7 @@ tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDiffer
     
         interface B<U, T> { // error
                   ~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'B' must have identical type parameters.
             y: T;
         }
     }
@@ -52,7 +52,7 @@ tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesDiffer
     module M3 {
         export interface B<U, T> { // error
                          ~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'B' must have identical type parameters.
             y: T;
         }
     }
diff --git a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.errors.txt b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.errors.txt
index 665a26f47f4..4b2455773f5 100644
--- a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.errors.txt
+++ b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.errors.txt
@@ -1,6 +1,6 @@
-tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts(5,11): error TS2428: All declarations of an interface must have identical type parameters.
-tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts(14,15): error TS2428: All declarations of an interface must have identical type parameters.
-tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts(38,22): error TS2428: All declarations of an interface must have identical type parameters.
+tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts(5,11): error TS2428: All declarations of 'A' must have identical type parameters.
+tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts(14,15): error TS2428: All declarations of 'B' must have identical type parameters.
+tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts(38,22): error TS2428: All declarations of 'A' must have identical type parameters.
 
 
 ==== tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts (3 errors) ====
@@ -10,7 +10,7 @@ tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDi
     
     interface A<T extends Number> { // error
               ~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'A' must have identical type parameters.
         y: T;
     }
     
@@ -21,7 +21,7 @@ tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDi
     
         interface B<T extends A<any>> { // error
                   ~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'B' must have identical type parameters.
             y: T;
         }
     }
@@ -47,7 +47,7 @@ tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDi
     module M3 {
         export interface A<T extends Number> { // error
                          ~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'A' must have identical type parameters.
             y: T;
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/twoGenericInterfacesWithTheSameNameButDifferentArity.errors.txt b/tests/baselines/reference/twoGenericInterfacesWithTheSameNameButDifferentArity.errors.txt
index be0608c0cd6..de4c4d8e1c3 100644
--- a/tests/baselines/reference/twoGenericInterfacesWithTheSameNameButDifferentArity.errors.txt
+++ b/tests/baselines/reference/twoGenericInterfacesWithTheSameNameButDifferentArity.errors.txt
@@ -1,6 +1,6 @@
-tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithTheSameNameButDifferentArity.ts(5,11): error TS2428: All declarations of an interface must have identical type parameters.
-tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithTheSameNameButDifferentArity.ts(14,15): error TS2428: All declarations of an interface must have identical type parameters.
-tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithTheSameNameButDifferentArity.ts(38,22): error TS2428: All declarations of an interface must have identical type parameters.
+tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithTheSameNameButDifferentArity.ts(5,11): error TS2428: All declarations of 'A' must have identical type parameters.
+tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithTheSameNameButDifferentArity.ts(14,15): error TS2428: All declarations of 'A' must have identical type parameters.
+tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithTheSameNameButDifferentArity.ts(38,22): error TS2428: All declarations of 'A' must have identical type parameters.
 
 
 ==== tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithTheSameNameButDifferentArity.ts (3 errors) ====
@@ -10,7 +10,7 @@ tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithTh
     
     interface A<T, U> { // error
               ~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'A' must have identical type parameters.
         y: T;
     }
     
@@ -21,7 +21,7 @@ tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithTh
     
         interface A<T, U> { // error
                   ~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'A' must have identical type parameters.
             y: T;
         }
     }
@@ -47,7 +47,7 @@ tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithTh
     module M3 {
         export interface A<T, U> { // error
                          ~
-!!! error TS2428: All declarations of an interface must have identical type parameters.
+!!! error TS2428: All declarations of 'A' must have identical type parameters.
             y: T;
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads.symbols b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads.symbols
index 5d46be73518..b93de8e55ce 100644
--- a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads.symbols
+++ b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads.symbols
@@ -5,11 +5,11 @@ interface A {
 >A : Symbol(A, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 0, 0), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 5, 1))
 
     foo(x: number): number;
->foo : Symbol(foo, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 2, 13), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 3, 27), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 7, 13))
+>foo : Symbol(A.foo, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 2, 13), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 3, 27), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 7, 13))
 >x : Symbol(x, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 3, 8))
 
     foo(x: string): string;
->foo : Symbol(foo, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 2, 13), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 3, 27), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 7, 13))
+>foo : Symbol(A.foo, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 2, 13), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 3, 27), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 7, 13))
 >x : Symbol(x, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 4, 8))
 }
 
@@ -17,10 +17,10 @@ interface A {
 >A : Symbol(A, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 0, 0), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 5, 1))
 
     foo(x: Date): Date;
->foo : Symbol(foo, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 2, 13), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 3, 27), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 7, 13))
+>foo : Symbol(A.foo, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 2, 13), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 3, 27), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 7, 13))
 >x : Symbol(x, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 8, 8))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
 interface B<T> {
@@ -28,12 +28,12 @@ interface B<T> {
 >T : Symbol(T, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 11, 12), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 16, 12))
 
     foo(x: T): number;
->foo : Symbol(foo, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 11, 16), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 12, 22), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 16, 16), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 17, 20))
+>foo : Symbol(B.foo, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 11, 16), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 12, 22), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 16, 16), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 17, 20))
 >x : Symbol(x, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 12, 8))
 >T : Symbol(T, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 11, 12), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 16, 12))
 
     foo(x: string): string;
->foo : Symbol(foo, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 11, 16), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 12, 22), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 16, 16), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 17, 20))
+>foo : Symbol(B.foo, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 11, 16), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 12, 22), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 16, 16), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 17, 20))
 >x : Symbol(x, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 13, 8))
 }
 
@@ -42,15 +42,15 @@ interface B<T> {
 >T : Symbol(T, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 11, 12), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 16, 12))
 
     foo(x: T): Date;
->foo : Symbol(foo, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 11, 16), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 12, 22), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 16, 16), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 17, 20))
+>foo : Symbol(B.foo, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 11, 16), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 12, 22), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 16, 16), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 17, 20))
 >x : Symbol(x, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 17, 8))
 >T : Symbol(T, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 11, 12), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 16, 12))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     foo(x: Date): string;
->foo : Symbol(foo, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 11, 16), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 12, 22), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 16, 16), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 17, 20))
+>foo : Symbol(B.foo, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 11, 16), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 12, 22), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 16, 16), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 17, 20))
 >x : Symbol(x, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 18, 8))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
 var b: B<boolean>;
@@ -70,14 +70,14 @@ interface C<T, U> {
 >U : Symbol(U, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 25, 14), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 30, 14))
 
     foo(x: T, y: U): string;
->foo : Symbol(foo, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 25, 19), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 26, 28), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 30, 19))
+>foo : Symbol(C.foo, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 25, 19), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 26, 28), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 30, 19))
 >x : Symbol(x, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 26, 8))
 >T : Symbol(T, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 25, 12), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 30, 12))
 >y : Symbol(y, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 26, 13))
 >U : Symbol(U, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 25, 14), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 30, 14))
 
     foo(x: string, y: string): number;
->foo : Symbol(foo, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 25, 19), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 26, 28), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 30, 19))
+>foo : Symbol(C.foo, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 25, 19), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 26, 28), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 30, 19))
 >x : Symbol(x, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 27, 8))
 >y : Symbol(y, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 27, 18))
 }
@@ -88,7 +88,7 @@ interface C<T, U> {
 >U : Symbol(U, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 25, 14), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 30, 14))
 
     foo<W>(x: W, y: W): W;
->foo : Symbol(foo, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 25, 19), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 26, 28), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 30, 19))
+>foo : Symbol(C.foo, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 25, 19), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 26, 28), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 30, 19))
 >W : Symbol(W, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 31, 8))
 >x : Symbol(x, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 31, 11))
 >W : Symbol(W, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 31, 8))
@@ -100,7 +100,7 @@ interface C<T, U> {
 var c: C<boolean, Date>;
 >c : Symbol(c, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 34, 3))
 >C : Symbol(C, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 22, 20), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 28, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var r2 = c.foo(1, 2); // number
 >r2 : Symbol(r2, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 35, 3))
@@ -115,15 +115,15 @@ interface D<T, U> {
 >U : Symbol(U, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 38, 14), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 44, 14))
 
     a: T;
->a : Symbol(a, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 38, 19))
+>a : Symbol(D.a, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 38, 19))
 >T : Symbol(T, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 38, 12), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 44, 12))
 
     b: U;
->b : Symbol(b, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 39, 9))
+>b : Symbol(D.b, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 39, 9))
 >U : Symbol(U, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 38, 14), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 44, 14))
 
     foo<A>(x: A, y: A): U;
->foo : Symbol(foo, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 40, 9), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 44, 19))
+>foo : Symbol(D.foo, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 40, 9), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 44, 19))
 >A : Symbol(A, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 41, 8))
 >x : Symbol(x, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 41, 11))
 >A : Symbol(A, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 41, 8))
@@ -138,7 +138,7 @@ interface D<T, U> {
 >U : Symbol(U, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 38, 14), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 44, 14))
 
     foo<W>(x: W, y: W): T;
->foo : Symbol(foo, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 40, 9), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 44, 19))
+>foo : Symbol(D.foo, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 40, 9), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 44, 19))
 >W : Symbol(W, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 45, 8))
 >x : Symbol(x, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 45, 11))
 >W : Symbol(W, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 45, 8))
@@ -150,7 +150,7 @@ interface D<T, U> {
 var d: D<boolean, Date>;
 >d : Symbol(d, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 48, 3))
 >D : Symbol(D, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 35, 21), Decl(twoMergedInterfacesWithDifferingOverloads.ts, 42, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var r3 = d.foo(1, 1); // boolean, last definition wins
 >r3 : Symbol(r3, Decl(twoMergedInterfacesWithDifferingOverloads.ts, 49, 3))
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/typeAliases.symbols b/tests/baselines/reference/typeAliases.symbols
index 02cc5027b04..bedd6c8bb69 100644
--- a/tests/baselines/reference/typeAliases.symbols
+++ b/tests/baselines/reference/typeAliases.symbols
@@ -53,7 +53,7 @@ var x5: T5;
 
 interface I6 { x : string }
 >I6 : Symbol(I6, Decl(typeAliases.ts, 20, 11))
->x : Symbol(x, Decl(typeAliases.ts, 22, 14))
+>x : Symbol(I6.x, Decl(typeAliases.ts, 22, 14))
 
 type T6 = I6;
 >T6 : Symbol(T6, Decl(typeAliases.ts, 22, 27))
@@ -69,7 +69,7 @@ var x6: T6;
 
 class C7 { x: boolean }
 >C7 : Symbol(C7, Decl(typeAliases.ts, 25, 11))
->x : Symbol(x, Decl(typeAliases.ts, 27, 10))
+>x : Symbol(C7.x, Decl(typeAliases.ts, 27, 10))
 
 type T7 = C7;
 >T7 : Symbol(T7, Decl(typeAliases.ts, 27, 23))
@@ -127,7 +127,7 @@ var x11: T11;
 
 interface I13 { x: string };
 >I13 : Symbol(I13, Decl(typeAliases.ts, 46, 13))
->x : Symbol(x, Decl(typeAliases.ts, 48, 15))
+>x : Symbol(I13.x, Decl(typeAliases.ts, 48, 15))
 
 type T13 = I13;
 >T13 : Symbol(T13, Decl(typeAliases.ts, 48, 28))
diff --git a/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.symbols b/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.symbols
index f172c91f265..1e7604b44e7 100644
--- a/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.symbols
+++ b/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.symbols
@@ -3,22 +3,22 @@ interface IMenuItem {
 >IMenuItem : Symbol(IMenuItem, Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 0, 0))
 
     id: string;
->id : Symbol(id, Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 0, 21))
+>id : Symbol(IMenuItem.id, Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 0, 21))
 
     type: string;
->type : Symbol(type, Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 1, 15))
+>type : Symbol(IMenuItem.type, Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 1, 15))
 
     link?: string;
->link : Symbol(link, Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 2, 17))
+>link : Symbol(IMenuItem.link, Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 2, 17))
 
     classes?: string;
->classes : Symbol(classes, Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 3, 18))
+>classes : Symbol(IMenuItem.classes, Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 3, 18))
 
     text?: string;
->text : Symbol(text, Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 4, 21))
+>text : Symbol(IMenuItem.text, Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 4, 21))
 
     icon?: string;
->icon : Symbol(icon, Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 5, 18))
+>icon : Symbol(IMenuItem.icon, Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 5, 18))
 }
 var menuData: IMenuItem[] = [
 >menuData : Symbol(menuData, Decl(typeAnnotationBestCommonTypeInArrayLiteral.ts, 8, 3))
diff --git a/tests/baselines/reference/typeArgInference.symbols b/tests/baselines/reference/typeArgInference.symbols
index 37318e35906..3801b996ed7 100644
--- a/tests/baselines/reference/typeArgInference.symbols
+++ b/tests/baselines/reference/typeArgInference.symbols
@@ -3,7 +3,7 @@ interface I {
 >I : Symbol(I, Decl(typeArgInference.ts, 0, 0))
 
     f<T, U>(a1: { a: T; b: U }[], a2: { a: T; b: U }[]): { c: T; d: U };
->f : Symbol(f, Decl(typeArgInference.ts, 0, 13))
+>f : Symbol(I.f, Decl(typeArgInference.ts, 0, 13))
 >T : Symbol(T, Decl(typeArgInference.ts, 1, 6))
 >U : Symbol(U, Decl(typeArgInference.ts, 1, 8))
 >a1 : Symbol(a1, Decl(typeArgInference.ts, 1, 12))
@@ -22,7 +22,7 @@ interface I {
 >U : Symbol(U, Decl(typeArgInference.ts, 1, 8))
 
     g<T, U>(...arg: { a: T; b: U }[][]): { c: T; d: U };
->g : Symbol(g, Decl(typeArgInference.ts, 1, 72))
+>g : Symbol(I.g, Decl(typeArgInference.ts, 1, 72))
 >T : Symbol(T, Decl(typeArgInference.ts, 2, 6))
 >U : Symbol(U, Decl(typeArgInference.ts, 2, 8))
 >arg : Symbol(arg, Decl(typeArgInference.ts, 2, 12))
diff --git a/tests/baselines/reference/typeArgumentInferenceApparentType1.symbols b/tests/baselines/reference/typeArgumentInferenceApparentType1.symbols
index 00de7ec64c9..4b57715d3fb 100644
--- a/tests/baselines/reference/typeArgumentInferenceApparentType1.symbols
+++ b/tests/baselines/reference/typeArgumentInferenceApparentType1.symbols
@@ -3,7 +3,7 @@ function method<T>(iterable: Iterable<T>): T {
 >method : Symbol(method, Decl(typeArgumentInferenceApparentType1.ts, 0, 0))
 >T : Symbol(T, Decl(typeArgumentInferenceApparentType1.ts, 0, 16))
 >iterable : Symbol(iterable, Decl(typeArgumentInferenceApparentType1.ts, 0, 19))
->Iterable : Symbol(Iterable, Decl(lib.d.ts, --, --))
+>Iterable : Symbol(Iterable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >T : Symbol(T, Decl(typeArgumentInferenceApparentType1.ts, 0, 16))
 >T : Symbol(T, Decl(typeArgumentInferenceApparentType1.ts, 0, 16))
 
diff --git a/tests/baselines/reference/typeArgumentInferenceApparentType2.symbols b/tests/baselines/reference/typeArgumentInferenceApparentType2.symbols
index 4626aabb605..f5985b6ff48 100644
--- a/tests/baselines/reference/typeArgumentInferenceApparentType2.symbols
+++ b/tests/baselines/reference/typeArgumentInferenceApparentType2.symbols
@@ -3,14 +3,14 @@ function method<T>(iterable: Iterable<T>): T {
 >method : Symbol(method, Decl(typeArgumentInferenceApparentType2.ts, 0, 0))
 >T : Symbol(T, Decl(typeArgumentInferenceApparentType2.ts, 0, 16))
 >iterable : Symbol(iterable, Decl(typeArgumentInferenceApparentType2.ts, 0, 19))
->Iterable : Symbol(Iterable, Decl(lib.d.ts, --, --))
+>Iterable : Symbol(Iterable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >T : Symbol(T, Decl(typeArgumentInferenceApparentType2.ts, 0, 16))
 >T : Symbol(T, Decl(typeArgumentInferenceApparentType2.ts, 0, 16))
 
     function inner<U extends Iterable<T>>() {
 >inner : Symbol(inner, Decl(typeArgumentInferenceApparentType2.ts, 0, 46))
 >U : Symbol(U, Decl(typeArgumentInferenceApparentType2.ts, 1, 19))
->Iterable : Symbol(Iterable, Decl(lib.d.ts, --, --))
+>Iterable : Symbol(Iterable, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >T : Symbol(T, Decl(typeArgumentInferenceApparentType2.ts, 0, 16))
 
         var u: U;
diff --git a/tests/baselines/reference/typeArgumentInferenceConstructSignatures.errors.txt b/tests/baselines/reference/typeArgumentInferenceConstructSignatures.errors.txt
index d058426b9c9..da01aa778b6 100644
--- a/tests/baselines/reference/typeArgumentInferenceConstructSignatures.errors.txt
+++ b/tests/baselines/reference/typeArgumentInferenceConstructSignatures.errors.txt
@@ -2,13 +2,13 @@ tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceConstruct
 tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceConstructSignatures.ts(51,19): error TS2304: Cannot find name 'Window'.
 tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceConstructSignatures.ts(61,39): error TS2345: Argument of type '(x: string) => string' is not assignable to parameter of type '(x: number) => void'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceConstructSignatures.ts(71,39): error TS2345: Argument of type '(x: string) => string' is not assignable to parameter of type '(x: number) => void'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceConstructSignatures.ts(81,45): error TS2345: Argument of type '(n: string) => string' is not assignable to parameter of type '(b: number) => number'.
   Types of parameters 'n' and 'b' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceConstructSignatures.ts(106,15): error TS2453: The type argument for type parameter 'T' cannot be inferred from the usage. Consider specifying the type arguments explicitly.
   Type argument candidate 'string' is not a valid type argument because it is not a supertype of candidate 'number'.
 tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceConstructSignatures.ts(118,9): error TS2304: Cannot find name 'Window'.
@@ -90,7 +90,7 @@ tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceConstruct
                                           ~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: string) => string' is not assignable to parameter of type '(x: number) => void'.
 !!! error TS2345:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2345:     Type 'string' is not assignable to type 'number'.
+!!! error TS2345:     Type 'number' is not assignable to type 'string'.
     new someGenerics4<string, number>(null, null);
     
     // 2 parameter generic call with argument 2 of type parameter type and argument 1 of function type whose parameter is of type parameter type
@@ -104,7 +104,7 @@ tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceConstruct
                                           ~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: string) => string' is not assignable to parameter of type '(x: number) => void'.
 !!! error TS2345:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2345:     Type 'string' is not assignable to type 'number'.
+!!! error TS2345:     Type 'number' is not assignable to type 'string'.
     new someGenerics5<string, number>(null, null);
     
     // Generic call with multiple arguments of function types that each have parameters of the same generic type
@@ -118,7 +118,7 @@ tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceConstruct
                                                 ~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(n: string) => string' is not assignable to parameter of type '(b: number) => number'.
 !!! error TS2345:   Types of parameters 'n' and 'b' are incompatible.
-!!! error TS2345:     Type 'string' is not assignable to type 'number'.
+!!! error TS2345:     Type 'number' is not assignable to type 'string'.
     new someGenerics6<number>((n: number) => n, (n: number) => n, (n: number) => n);
     
     // Generic call with multiple arguments of function types that each have parameters of different generic type
diff --git a/tests/baselines/reference/typeArgumentInferenceErrors.errors.txt b/tests/baselines/reference/typeArgumentInferenceErrors.errors.txt
index 9bd25dda4e6..36a17e166a5 100644
--- a/tests/baselines/reference/typeArgumentInferenceErrors.errors.txt
+++ b/tests/baselines/reference/typeArgumentInferenceErrors.errors.txt
@@ -1,13 +1,13 @@
 tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceErrors.ts(3,31): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'.
 tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceErrors.ts(7,35): error TS2345: Argument of type '(x: string) => string' is not assignable to parameter of type '(x: number) => void'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceErrors.ts(11,35): error TS2345: Argument of type '(x: string) => string' is not assignable to parameter of type '(x: number) => void'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceErrors.ts(15,41): error TS2345: Argument of type '(n: string) => string' is not assignable to parameter of type '(b: number) => number'.
   Types of parameters 'n' and 'b' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 
 
 ==== tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceErrors.ts (4 errors) ====
@@ -23,7 +23,7 @@ tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceErrors.ts
                                       ~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: string) => string' is not assignable to parameter of type '(x: number) => void'.
 !!! error TS2345:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2345:     Type 'string' is not assignable to type 'number'.
+!!! error TS2345:     Type 'number' is not assignable to type 'string'.
     
     // 2 parameter generic call with argument 2 of type parameter type and argument 1 of function type whose parameter is of type parameter type
     function someGenerics5<U, T>(n: T, f: (x: U) => void) { }
@@ -31,7 +31,7 @@ tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceErrors.ts
                                       ~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: string) => string' is not assignable to parameter of type '(x: number) => void'.
 !!! error TS2345:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2345:     Type 'string' is not assignable to type 'number'.
+!!! error TS2345:     Type 'number' is not assignable to type 'string'.
     
     // Generic call with multiple arguments of function types that each have parameters of the same generic type
     function someGenerics6<A>(a: (a: A) => A, b: (b: A) => A, c: (c: A) => A) { }
@@ -39,5 +39,5 @@ tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceErrors.ts
                                             ~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(n: string) => string' is not assignable to parameter of type '(b: number) => number'.
 !!! error TS2345:   Types of parameters 'n' and 'b' are incompatible.
-!!! error TS2345:     Type 'string' is not assignable to type 'number'.
+!!! error TS2345:     Type 'number' is not assignable to type 'string'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/typeArgumentInferenceOrdering.symbols b/tests/baselines/reference/typeArgumentInferenceOrdering.symbols
index 963be8731ec..630aebcf185 100644
--- a/tests/baselines/reference/typeArgumentInferenceOrdering.symbols
+++ b/tests/baselines/reference/typeArgumentInferenceOrdering.symbols
@@ -18,7 +18,7 @@ class C {
 >C : Symbol(C, Decl(typeArgumentInferenceOrdering.ts, 1, 23))
 
     y: I;
->y : Symbol(y, Decl(typeArgumentInferenceOrdering.ts, 3, 9))
+>y : Symbol(C.y, Decl(typeArgumentInferenceOrdering.ts, 3, 9))
 >I : Symbol(I, Decl(typeArgumentInferenceOrdering.ts, 5, 1))
 }
 
@@ -26,7 +26,7 @@ interface I {
 >I : Symbol(I, Decl(typeArgumentInferenceOrdering.ts, 5, 1))
 
     x(): Goo;
->x : Symbol(x, Decl(typeArgumentInferenceOrdering.ts, 7, 13))
+>x : Symbol(I.x, Decl(typeArgumentInferenceOrdering.ts, 7, 13))
 >Goo : Symbol(Goo, Decl(typeArgumentInferenceOrdering.ts, 9, 1))
 }
 
@@ -34,6 +34,6 @@ interface Goo {
 >Goo : Symbol(Goo, Decl(typeArgumentInferenceOrdering.ts, 9, 1))
 
     p: string;
->p : Symbol(p, Decl(typeArgumentInferenceOrdering.ts, 11, 15))
+>p : Symbol(Goo.p, Decl(typeArgumentInferenceOrdering.ts, 11, 15))
 }
 
diff --git a/tests/baselines/reference/typeArgumentInferenceTransitiveConstraints.symbols b/tests/baselines/reference/typeArgumentInferenceTransitiveConstraints.symbols
index 2d6270bbf5c..bc554ce9f86 100644
--- a/tests/baselines/reference/typeArgumentInferenceTransitiveConstraints.symbols
+++ b/tests/baselines/reference/typeArgumentInferenceTransitiveConstraints.symbols
@@ -3,7 +3,7 @@
 function fn<A extends Date, B extends A, C extends B>(a: A, b: B, c: C) {
 >fn : Symbol(fn, Decl(typeArgumentInferenceTransitiveConstraints.ts, 0, 0))
 >A : Symbol(A, Decl(typeArgumentInferenceTransitiveConstraints.ts, 1, 12))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >B : Symbol(B, Decl(typeArgumentInferenceTransitiveConstraints.ts, 1, 27))
 >A : Symbol(A, Decl(typeArgumentInferenceTransitiveConstraints.ts, 1, 12))
 >C : Symbol(C, Decl(typeArgumentInferenceTransitiveConstraints.ts, 1, 40))
@@ -24,11 +24,11 @@ function fn<A extends Date, B extends A, C extends B>(a: A, b: B, c: C) {
 var d = fn(new Date(), new Date(), new Date());
 >d : Symbol(d, Decl(typeArgumentInferenceTransitiveConstraints.ts, 5, 3), Decl(typeArgumentInferenceTransitiveConstraints.ts, 6, 3))
 >fn : Symbol(fn, Decl(typeArgumentInferenceTransitiveConstraints.ts, 0, 0))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var d: Date[]; // Should be OK (d should be Date[])
 >d : Symbol(d, Decl(typeArgumentInferenceTransitiveConstraints.ts, 5, 3), Decl(typeArgumentInferenceTransitiveConstraints.ts, 6, 3))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
diff --git a/tests/baselines/reference/typeArgumentInferenceWithConstraints.errors.txt b/tests/baselines/reference/typeArgumentInferenceWithConstraints.errors.txt
index e6de840ec54..22d18e11eca 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithConstraints.errors.txt
+++ b/tests/baselines/reference/typeArgumentInferenceWithConstraints.errors.txt
@@ -5,14 +5,14 @@ tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConst
 tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConstraints.ts(34,15): error TS2304: Cannot find name 'Window'.
 tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConstraints.ts(41,35): error TS2345: Argument of type '(x: string) => string' is not assignable to parameter of type '(x: number) => void'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConstraints.ts(48,35): error TS2345: Argument of type '(x: string) => string' is not assignable to parameter of type '(x: number) => void'.
   Types of parameters 'x' and 'x' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConstraints.ts(49,15): error TS2344: Type 'string' does not satisfy the constraint 'number'.
 tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConstraints.ts(55,41): error TS2345: Argument of type '(n: string) => string' is not assignable to parameter of type '(b: number) => number'.
   Types of parameters 'n' and 'b' are incompatible.
-    Type 'string' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConstraints.ts(66,31): error TS2345: Argument of type '<A, B extends string, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C) => void' is not assignable to parameter of type 'string'.
 tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConstraints.ts(73,11): error TS2453: The type argument for type parameter 'T' cannot be inferred from the usage. Consider specifying the type arguments explicitly.
   Type argument candidate 'string' is not a valid type argument because it is not a supertype of candidate 'number'.
@@ -81,7 +81,7 @@ tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConst
                                       ~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: string) => string' is not assignable to parameter of type '(x: number) => void'.
 !!! error TS2345:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2345:     Type 'string' is not assignable to type 'number'.
+!!! error TS2345:     Type 'number' is not assignable to type 'string'.
     someGenerics4<string, number>(null, null);
     
     // 2 parameter generic call with argument 2 of type parameter type and argument 1 of function type whose parameter is of type parameter type
@@ -92,7 +92,7 @@ tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConst
                                       ~~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(x: string) => string' is not assignable to parameter of type '(x: number) => void'.
 !!! error TS2345:   Types of parameters 'x' and 'x' are incompatible.
-!!! error TS2345:     Type 'string' is not assignable to type 'number'.
+!!! error TS2345:     Type 'number' is not assignable to type 'string'.
     someGenerics5<string, number>(null, null); // Error
                   ~~~~~~
 !!! error TS2344: Type 'string' does not satisfy the constraint 'number'.
@@ -105,7 +105,7 @@ tests/cases/conformance/expressions/functionCalls/typeArgumentInferenceWithConst
                                             ~~~~~~~~~~~~~~~~
 !!! error TS2345: Argument of type '(n: string) => string' is not assignable to parameter of type '(b: number) => number'.
 !!! error TS2345:   Types of parameters 'n' and 'b' are incompatible.
-!!! error TS2345:     Type 'string' is not assignable to type 'number'.
+!!! error TS2345:     Type 'number' is not assignable to type 'string'.
     someGenerics6<number>((n: number) => n, (n: number) => n, (n: number) => n);
     
     // Generic call with multiple arguments of function types that each have parameters of different generic type
diff --git a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt
index ef582ab9b26..48c7efb37e8 100644
--- a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt
+++ b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt
@@ -4,15 +4,10 @@ tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes0
 tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(40,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'.
 tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(41,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'.
 tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(44,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'.
-  Type 'string' is not assignable to type '"World"'.
 tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(45,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'.
-  Type 'string' is not assignable to type '"World"'.
 tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(46,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'.
-  Type 'string' is not assignable to type '"World"'.
 tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(47,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'.
-  Type 'string' is not assignable to type '"World"'.
 tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(48,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'.
-  Type 'string' is not assignable to type '"World"'.
 tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(55,43): error TS2345: Argument of type '"World"' is not assignable to parameter of type '"Hello"'.
 tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(57,52): error TS2345: Argument of type '"World"' is not assignable to parameter of type '"Hello"'.
 tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(58,43): error TS2345: Argument of type '"World"' is not assignable to parameter of type '"Hello"'.
@@ -26,9 +21,7 @@ tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes0
 tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(88,43): error TS2345: Argument of type '"Hello"' is not assignable to parameter of type '"World"'.
 tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(89,52): error TS2345: Argument of type '"World"' is not assignable to parameter of type '"Hello"'.
 tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(93,5): error TS2322: Type 'string' is not assignable to type '"Hello" | "World"'.
-  Type 'string' is not assignable to type '"World"'.
 tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(97,5): error TS2322: Type 'string' is not assignable to type '"Hello" | "World"'.
-  Type 'string' is not assignable to type '"World"'.
 tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(100,25): error TS2345: Argument of type '"Hello" | "World"' is not assignable to parameter of type '"Hello"'.
   Type '"World"' is not assignable to type '"Hello"'.
 tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(104,25): error TS2345: Argument of type '"Hello" | "World"' is not assignable to parameter of type '"Hello"'.
@@ -92,23 +85,18 @@ tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes0
         a = takeReturnHelloWorld(a);
                                  ~
 !!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'.
-!!! error TS2345:   Type 'string' is not assignable to type '"World"'.
         b = takeReturnHelloWorld(b);
                                  ~
 !!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'.
-!!! error TS2345:   Type 'string' is not assignable to type '"World"'.
         c = takeReturnHelloWorld(c);
                                  ~
 !!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'.
-!!! error TS2345:   Type 'string' is not assignable to type '"World"'.
         d = takeReturnHelloWorld(d);
                                  ~
 !!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'.
-!!! error TS2345:   Type 'string' is not assignable to type '"World"'.
         e = takeReturnHelloWorld(e);
                                  ~
 !!! error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello" | "World"'.
-!!! error TS2345:   Type 'string' is not assignable to type '"World"'.
     }
     
     namespace n2 {
@@ -178,14 +166,12 @@ tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes0
         a = takeReturnString(a);
         ~
 !!! error TS2322: Type 'string' is not assignable to type '"Hello" | "World"'.
-!!! error TS2322:   Type 'string' is not assignable to type '"World"'.
         b = takeReturnString(b);
         c = takeReturnString(c);
         d = takeReturnString(d);
         e = takeReturnString(e);
         ~
 !!! error TS2322: Type 'string' is not assignable to type '"Hello" | "World"'.
-!!! error TS2322:   Type 'string' is not assignable to type '"World"'.
     
         // Passing these as arguments should cause an error.
         a = takeReturnHello(a);
diff --git a/tests/baselines/reference/typeAssertions.errors.txt b/tests/baselines/reference/typeAssertions.errors.txt
index c7401e4fcf9..e330c23d737 100644
--- a/tests/baselines/reference/typeAssertions.errors.txt
+++ b/tests/baselines/reference/typeAssertions.errors.txt
@@ -1,11 +1,11 @@
 tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(5,5): error TS2346: Supplied parameters do not match any signature of call target.
-tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(31,12): error TS2352: Neither type 'SomeOther' nor type 'SomeBase' is assignable to the other.
+tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(31,12): error TS2352: Type 'SomeOther' cannot be converted to type 'SomeBase'.
   Property 'p' is missing in type 'SomeOther'.
-tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(35,15): error TS2352: Neither type 'SomeOther' nor type 'SomeDerived' is assignable to the other.
+tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(35,15): error TS2352: Type 'SomeOther' cannot be converted to type 'SomeDerived'.
   Property 'x' is missing in type 'SomeOther'.
-tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(37,13): error TS2352: Neither type 'SomeDerived' nor type 'SomeOther' is assignable to the other.
+tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(37,13): error TS2352: Type 'SomeDerived' cannot be converted to type 'SomeOther'.
   Property 'q' is missing in type 'SomeDerived'.
-tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(38,13): error TS2352: Neither type 'SomeBase' nor type 'SomeOther' is assignable to the other.
+tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(38,13): error TS2352: Type 'SomeBase' cannot be converted to type 'SomeOther'.
   Property 'q' is missing in type 'SomeBase'.
 tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(44,5): error TS2304: Cannot find name 'numOrStr'.
 tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(44,14): error TS1005: '>' expected.
@@ -58,23 +58,23 @@ tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(48,50): err
     someBase = <SomeBase>someBase;
     someBase = <SomeBase>someOther; // Error
                ~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Neither type 'SomeOther' nor type 'SomeBase' is assignable to the other.
+!!! error TS2352: Type 'SomeOther' cannot be converted to type 'SomeBase'.
 !!! error TS2352:   Property 'p' is missing in type 'SomeOther'.
     
     someDerived = <SomeDerived>someDerived;
     someDerived = <SomeDerived>someBase;
     someDerived = <SomeDerived>someOther; // Error
                   ~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Neither type 'SomeOther' nor type 'SomeDerived' is assignable to the other.
+!!! error TS2352: Type 'SomeOther' cannot be converted to type 'SomeDerived'.
 !!! error TS2352:   Property 'x' is missing in type 'SomeOther'.
     
     someOther = <SomeOther>someDerived; // Error
                 ~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Neither type 'SomeDerived' nor type 'SomeOther' is assignable to the other.
+!!! error TS2352: Type 'SomeDerived' cannot be converted to type 'SomeOther'.
 !!! error TS2352:   Property 'q' is missing in type 'SomeDerived'.
     someOther = <SomeOther>someBase; // Error
                 ~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Neither type 'SomeBase' nor type 'SomeOther' is assignable to the other.
+!!! error TS2352: Type 'SomeBase' cannot be converted to type 'SomeOther'.
 !!! error TS2352:   Property 'q' is missing in type 'SomeBase'.
     someOther = <SomeOther>someOther;
     
diff --git a/tests/baselines/reference/typeAssertionsWithIntersectionTypes01.errors.txt b/tests/baselines/reference/typeAssertionsWithIntersectionTypes01.errors.txt
new file mode 100644
index 00000000000..42ed640e8fc
--- /dev/null
+++ b/tests/baselines/reference/typeAssertionsWithIntersectionTypes01.errors.txt
@@ -0,0 +1,34 @@
+tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithIntersectionTypes01.ts(17,9): error TS2352: Type 'I2' cannot be converted to type 'I1 & I3'.
+  Type 'I2' is not comparable to type 'I3'.
+    Property 'p3' is missing in type 'I2'.
+tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithIntersectionTypes01.ts(18,9): error TS2352: Type 'I2' cannot be converted to type 'I3'.
+
+
+==== tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithIntersectionTypes01.ts (2 errors) ====
+    interface I1 {
+        p1: number
+    }
+    
+    interface I2 extends I1 {
+        p2: number;
+    }
+    
+    interface I3 {
+        p3: number;
+    }
+    
+    var x = { p1: 10, p2: 20, p3: 30 };
+    var y: I1 & I3 = x;
+    var z: I2 = x;
+    
+    var a = <I1 & I3>z;
+            ~~~~~~~~~~
+!!! error TS2352: Type 'I2' cannot be converted to type 'I1 & I3'.
+!!! error TS2352:   Type 'I2' is not comparable to type 'I3'.
+!!! error TS2352:     Property 'p3' is missing in type 'I2'.
+    var b = <I3>z;
+            ~~~~~
+!!! error TS2352: Type 'I2' cannot be converted to type 'I3'.
+    var c = <I2>z;
+    var d = <I1>y;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/typeAssertionsWithIntersectionTypes01.js b/tests/baselines/reference/typeAssertionsWithIntersectionTypes01.js
new file mode 100644
index 00000000000..31fc831f95f
--- /dev/null
+++ b/tests/baselines/reference/typeAssertionsWithIntersectionTypes01.js
@@ -0,0 +1,31 @@
+//// [typeAssertionsWithIntersectionTypes01.ts]
+interface I1 {
+    p1: number
+}
+
+interface I2 extends I1 {
+    p2: number;
+}
+
+interface I3 {
+    p3: number;
+}
+
+var x = { p1: 10, p2: 20, p3: 30 };
+var y: I1 & I3 = x;
+var z: I2 = x;
+
+var a = <I1 & I3>z;
+var b = <I3>z;
+var c = <I2>z;
+var d = <I1>y;
+
+
+//// [typeAssertionsWithIntersectionTypes01.js]
+var x = { p1: 10, p2: 20, p3: 30 };
+var y = x;
+var z = x;
+var a = z;
+var b = z;
+var c = z;
+var d = y;
diff --git a/tests/baselines/reference/typeAssertionsWithUnionTypes01.errors.txt b/tests/baselines/reference/typeAssertionsWithUnionTypes01.errors.txt
new file mode 100644
index 00000000000..7bc2a9df9b3
--- /dev/null
+++ b/tests/baselines/reference/typeAssertionsWithUnionTypes01.errors.txt
@@ -0,0 +1,23 @@
+tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithUnionTypes01.ts(14,9): error TS2352: Type 'I1' cannot be converted to type 'number'.
+
+
+==== tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithUnionTypes01.ts (1 errors) ====
+    interface I1 {
+        p1: number
+    }
+    
+    interface I2 extends I1 {
+        p2: number;
+    }
+    
+    var x = { p1: 10, p2: 20 };
+    var y: number | I2 = x;
+    var z: I1 = x;
+    
+    var a = <number | I2>z;
+    var b = <number>z;
+            ~~~~~~~~~
+!!! error TS2352: Type 'I1' cannot be converted to type 'number'.
+    var c = <I2>z;
+    var d = <I1>y;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/typeAssertionsWithUnionTypes01.js b/tests/baselines/reference/typeAssertionsWithUnionTypes01.js
new file mode 100644
index 00000000000..9cc448f6217
--- /dev/null
+++ b/tests/baselines/reference/typeAssertionsWithUnionTypes01.js
@@ -0,0 +1,27 @@
+//// [typeAssertionsWithUnionTypes01.ts]
+interface I1 {
+    p1: number
+}
+
+interface I2 extends I1 {
+    p2: number;
+}
+
+var x = { p1: 10, p2: 20 };
+var y: number | I2 = x;
+var z: I1 = x;
+
+var a = <number | I2>z;
+var b = <number>z;
+var c = <I2>z;
+var d = <I1>y;
+
+
+//// [typeAssertionsWithUnionTypes01.js]
+var x = { p1: 10, p2: 20 };
+var y = x;
+var z = x;
+var a = z;
+var b = z;
+var c = z;
+var d = y;
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/typeConstraintsWithConstructSignatures.symbols b/tests/baselines/reference/typeConstraintsWithConstructSignatures.symbols
index f8848afcfab..6c6450ffd0e 100644
--- a/tests/baselines/reference/typeConstraintsWithConstructSignatures.symbols
+++ b/tests/baselines/reference/typeConstraintsWithConstructSignatures.symbols
@@ -11,25 +11,25 @@ class C<T extends Constructable> {
 >Constructable : Symbol(Constructable, Decl(typeConstraintsWithConstructSignatures.ts, 0, 0))
 
     constructor(public data: T, public data2: Constructable) { }
->data : Symbol(data, Decl(typeConstraintsWithConstructSignatures.ts, 5, 16))
+>data : Symbol(C.data, Decl(typeConstraintsWithConstructSignatures.ts, 5, 16))
 >T : Symbol(T, Decl(typeConstraintsWithConstructSignatures.ts, 4, 8))
->data2 : Symbol(data2, Decl(typeConstraintsWithConstructSignatures.ts, 5, 31))
+>data2 : Symbol(C.data2, Decl(typeConstraintsWithConstructSignatures.ts, 5, 31))
 >Constructable : Symbol(Constructable, Decl(typeConstraintsWithConstructSignatures.ts, 0, 0))
 
     create() {
->create : Symbol(create, Decl(typeConstraintsWithConstructSignatures.ts, 5, 64))
+>create : Symbol(C.create, Decl(typeConstraintsWithConstructSignatures.ts, 5, 64))
 
         var x = new this.data(); // should not error
 >x : Symbol(x, Decl(typeConstraintsWithConstructSignatures.ts, 7, 11))
->this.data : Symbol(data, Decl(typeConstraintsWithConstructSignatures.ts, 5, 16))
+>this.data : Symbol(C.data, Decl(typeConstraintsWithConstructSignatures.ts, 5, 16))
 >this : Symbol(C, Decl(typeConstraintsWithConstructSignatures.ts, 2, 1))
->data : Symbol(data, Decl(typeConstraintsWithConstructSignatures.ts, 5, 16))
+>data : Symbol(C.data, Decl(typeConstraintsWithConstructSignatures.ts, 5, 16))
 
         var x2 = new this.data2(); // should not error
 >x2 : Symbol(x2, Decl(typeConstraintsWithConstructSignatures.ts, 8, 11))
->this.data2 : Symbol(data2, Decl(typeConstraintsWithConstructSignatures.ts, 5, 31))
+>this.data2 : Symbol(C.data2, Decl(typeConstraintsWithConstructSignatures.ts, 5, 31))
 >this : Symbol(C, Decl(typeConstraintsWithConstructSignatures.ts, 2, 1))
->data2 : Symbol(data2, Decl(typeConstraintsWithConstructSignatures.ts, 5, 31))
+>data2 : Symbol(C.data2, Decl(typeConstraintsWithConstructSignatures.ts, 5, 31))
     }
 }
 
diff --git a/tests/baselines/reference/typeGuardFunction.symbols b/tests/baselines/reference/typeGuardFunction.symbols
index 13ad30de5c5..83bb3e713dd 100644
--- a/tests/baselines/reference/typeGuardFunction.symbols
+++ b/tests/baselines/reference/typeGuardFunction.symbols
@@ -4,14 +4,14 @@ class A {
 >A : Symbol(A, Decl(typeGuardFunction.ts, 0, 0))
 
     propA: number;
->propA : Symbol(propA, Decl(typeGuardFunction.ts, 1, 9))
+>propA : Symbol(A.propA, Decl(typeGuardFunction.ts, 1, 9))
 }
 
 class B {
 >B : Symbol(B, Decl(typeGuardFunction.ts, 3, 1))
 
     propB: number;
->propB : Symbol(propB, Decl(typeGuardFunction.ts, 5, 9))
+>propB : Symbol(B.propB, Decl(typeGuardFunction.ts, 5, 9))
 }
 
 class C extends A {
@@ -19,7 +19,7 @@ class C extends A {
 >A : Symbol(A, Decl(typeGuardFunction.ts, 0, 0))
 
     propC: number;
->propC : Symbol(propC, Decl(typeGuardFunction.ts, 9, 19))
+>propC : Symbol(C.propC, Decl(typeGuardFunction.ts, 9, 19))
 }
 
 declare function isA(p1: any): p1 is A;
@@ -139,7 +139,7 @@ class D {
 >D : Symbol(D, Decl(typeGuardFunction.ts, 54, 1))
 
     method1(p1: A): p1 is C {
->method1 : Symbol(method1, Decl(typeGuardFunction.ts, 55, 9))
+>method1 : Symbol(D.method1, Decl(typeGuardFunction.ts, 55, 9))
 >p1 : Symbol(p1, Decl(typeGuardFunction.ts, 56, 12))
 >A : Symbol(A, Decl(typeGuardFunction.ts, 0, 0))
 >p1 : Symbol(p1, Decl(typeGuardFunction.ts, 56, 12))
diff --git a/tests/baselines/reference/typeGuardFunction.types b/tests/baselines/reference/typeGuardFunction.types
index 9bab1e7ca2c..50a5fcaf324 100644
--- a/tests/baselines/reference/typeGuardFunction.types
+++ b/tests/baselines/reference/typeGuardFunction.types
@@ -54,7 +54,7 @@ var b: B;
 
 // Basic
 if (isC(a)) {
->isC(a) : p1 is C
+>isC(a) : boolean
 >isC : (p1: any) => p1 is C
 >a : A
 
@@ -70,7 +70,7 @@ var subType: C;
 >C : C
 
 if(isA(subType)) {
->isA(subType) : p1 is A
+>isA(subType) : boolean
 >isA : (p1: any) => p1 is A
 >subType : C
 
@@ -87,7 +87,7 @@ var union: A | B;
 >B : B
 
 if(isA(union)) {
->isA(union) : p1 is A
+>isA(union) : boolean
 >isA : (p1: any) => p1 is A
 >union : A | B
 
@@ -118,7 +118,7 @@ declare function isC_multipleParams(p1, p2): p1 is C;
 >C : C
 
 if (isC_multipleParams(a, 0)) {
->isC_multipleParams(a, 0) : p1 is C
+>isC_multipleParams(a, 0) : boolean
 >isC_multipleParams : (p1: any, p2: any) => p1 is C
 >a : A
 >0 : number
@@ -197,7 +197,7 @@ declare function acceptingBoolean(a: boolean);
 acceptingBoolean(isA(a));
 >acceptingBoolean(isA(a)) : any
 >acceptingBoolean : (a: boolean) => any
->isA(a) : p1 is A
+>isA(a) : boolean
 >isA : (p1: any) => p1 is A
 >a : A
 
@@ -223,8 +223,8 @@ let union2: C | B;
 let union3: boolean | B = isA(union2) || union2;
 >union3 : boolean | B
 >B : B
->isA(union2) || union2 : p1 is A | B
->isA(union2) : p1 is A
+>isA(union2) || union2 : boolean | B
+>isA(union2) : boolean
 >isA : (p1: any) => p1 is A
 >union2 : C | B
 >union2 : B
diff --git a/tests/baselines/reference/typeGuardFunctionErrors.errors.txt b/tests/baselines/reference/typeGuardFunctionErrors.errors.txt
index 9ecad007672..eac2660df81 100644
--- a/tests/baselines/reference/typeGuardFunctionErrors.errors.txt
+++ b/tests/baselines/reference/typeGuardFunctionErrors.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(2,7): error TS2300: Duplicate identifier 'A'.
-tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(15,12): error TS2322: Type 'string' is not assignable to type 'x is A'.
+tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(15,12): error TS2322: Type 'string' is not assignable to type 'boolean'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(18,55): error TS2304: Cannot find name 'x'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(18,57): error TS1144: '{' or ';' expected.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(18,57): error TS2304: Cannot find name 'is'.
@@ -12,10 +12,13 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(31,5):
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(31,5): error TS7027: Unreachable code detected.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(32,1): error TS1128: Declaration or statement expected.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(34,38): error TS1225: Cannot find parameter 'x'.
-tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(38,51): error TS2322: Type 'B' is not assignable to type 'A'.
-  Property 'propA' is missing in type 'B'.
-tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(42,56): error TS2322: Type 'number' is not assignable to type 'string'.
-tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(46,56): error TS2322: Type 'T[]' is not assignable to type 'string'.
+tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(38,51): error TS2677: A type predicate's type must be assignable to its parameter's type.
+  Type 'B' is not assignable to type 'A'.
+    Property 'propA' is missing in type 'B'.
+tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(42,56): error TS2677: A type predicate's type must be assignable to its parameter's type.
+  Type 'number' is not assignable to type 'string'.
+tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(46,56): error TS2677: A type predicate's type must be assignable to its parameter's type.
+  Type 'T[]' is not assignable to type 'string'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(60,7): error TS2339: Property 'propB' does not exist on type 'A'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(65,7): error TS2339: Property 'propB' does not exist on type 'A'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(70,7): error TS2339: Property 'propB' does not exist on type 'A'.
@@ -43,9 +46,13 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(98,22)
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(98,22): error TS2304: Cannot find name 'is'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(98,25): error TS1005: ';' expected.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(98,27): error TS1005: ';' expected.
+tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(104,25): error TS1228: A type predicate is only allowed in return type position for functions and methods.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(105,16): error TS2322: Type 'boolean' is not assignable to type 'D'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(105,16): error TS2409: Return type of constructor signature must be assignable to the instance type of the class
+tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(107,20): error TS1228: A type predicate is only allowed in return type position for functions and methods.
+tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(110,20): error TS1228: A type predicate is only allowed in return type position for functions and methods.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(111,16): error TS2408: Setters cannot return a value.
+tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(116,18): error TS1228: A type predicate is only allowed in return type position for functions and methods.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(120,22): error TS2304: Cannot find name 'p1'.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(120,25): error TS1005: ';' expected.
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(120,25): error TS2304: Cannot find name 'is'.
@@ -57,7 +64,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(133,34
 tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(137,39): error TS1230: A type predicate cannot reference element 'p1' in a binding pattern.
 
 
-==== tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts (50 errors) ====
+==== tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts (54 errors) ====
     
     class A {
           ~
@@ -76,7 +83,7 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(137,39
     function hasANonBooleanReturnStatement(x): x is A {
         return '';
                ~~
-!!! error TS2322: Type 'string' is not assignable to type 'x is A'.
+!!! error TS2322: Type 'string' is not assignable to type 'boolean'.
     }
     
     function hasTypeGuardTypeInsideTypeGuardType(x): x is x is A {
@@ -125,20 +132,23 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(137,39
     
     function hasNonMatchingParameterType1(x: A): x is B {
                                                       ~
-!!! error TS2322: Type 'B' is not assignable to type 'A'.
-!!! error TS2322:   Property 'propA' is missing in type 'B'.
+!!! error TS2677: A type predicate's type must be assignable to its parameter's type.
+!!! error TS2677:   Type 'B' is not assignable to type 'A'.
+!!! error TS2677:     Property 'propA' is missing in type 'B'.
         return true;
     }
     
     function hasNonMatchingParameterType2(x: string): x is number {
                                                            ~~~~~~
-!!! error TS2322: Type 'number' is not assignable to type 'string'.
+!!! error TS2677: A type predicate's type must be assignable to its parameter's type.
+!!! error TS2677:   Type 'number' is not assignable to type 'string'.
         return true;
     }
     
     function hasNonMathcingGenericType<T>(a: string): a is T[] {
                                                            ~~~
-!!! error TS2322: Type 'T[]' is not assignable to type 'string'.
+!!! error TS2677: A type predicate's type must be assignable to its parameter's type.
+!!! error TS2677:   Type 'T[]' is not assignable to type 'string'.
         return true;
     }
     
@@ -245,6 +255,8 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(137,39
     // Non-compatiable type predicate positions for signature declarations
     class D {
         constructor(p1: A): p1 is C {
+                            ~~~~~~~
+!!! error TS1228: A type predicate is only allowed in return type position for functions and methods.
             return true;
                    ~~~~
 !!! error TS2322: Type 'boolean' is not assignable to type 'D'.
@@ -252,9 +264,13 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(137,39
 !!! error TS2409: Return type of constructor signature must be assignable to the instance type of the class
         }
         get m1(p1: A): p1 is C {
+                       ~~~~~~~
+!!! error TS1228: A type predicate is only allowed in return type position for functions and methods.
             return true;
         }
         set m2(p1: A): p1 is C {
+                       ~~~~~~~
+!!! error TS1228: A type predicate is only allowed in return type position for functions and methods.
             return true;
                    ~~~~
 !!! error TS2408: Setters cannot return a value.
@@ -263,6 +279,8 @@ tests/cases/conformance/expressions/typeGuards/typeGuardFunctionErrors.ts(137,39
     
     interface I1 {
         new (p1: A): p1 is C;
+                     ~~~~~~~
+!!! error TS1228: A type predicate is only allowed in return type position for functions and methods.
     }
     
     interface I2 {
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/typeGuardFunctionGenerics.symbols b/tests/baselines/reference/typeGuardFunctionGenerics.symbols
index 100d610070d..45debfcf73d 100644
--- a/tests/baselines/reference/typeGuardFunctionGenerics.symbols
+++ b/tests/baselines/reference/typeGuardFunctionGenerics.symbols
@@ -4,14 +4,14 @@ class A {
 >A : Symbol(A, Decl(typeGuardFunctionGenerics.ts, 0, 0))
 
     propA: number;
->propA : Symbol(propA, Decl(typeGuardFunctionGenerics.ts, 1, 9))
+>propA : Symbol(A.propA, Decl(typeGuardFunctionGenerics.ts, 1, 9))
 }
 
 class B {
 >B : Symbol(B, Decl(typeGuardFunctionGenerics.ts, 3, 1))
 
     propB: number;
->propB : Symbol(propB, Decl(typeGuardFunctionGenerics.ts, 5, 9))
+>propB : Symbol(B.propB, Decl(typeGuardFunctionGenerics.ts, 5, 9))
 }
 
 class C extends A {
@@ -19,7 +19,7 @@ class C extends A {
 >A : Symbol(A, Decl(typeGuardFunctionGenerics.ts, 0, 0))
 
     propC: number;
->propC : Symbol(propC, Decl(typeGuardFunctionGenerics.ts, 9, 19))
+>propC : Symbol(C.propC, Decl(typeGuardFunctionGenerics.ts, 9, 19))
 }
 
 declare function isB(p1): p1 is B;
diff --git a/tests/baselines/reference/typeGuardFunctionGenerics.types b/tests/baselines/reference/typeGuardFunctionGenerics.types
index 1f2ad2b69be..c4655e71f0c 100644
--- a/tests/baselines/reference/typeGuardFunctionGenerics.types
+++ b/tests/baselines/reference/typeGuardFunctionGenerics.types
@@ -100,7 +100,7 @@ let test1: boolean = funA(isB);
 >isB : (p1: any) => p1 is B
 
 if (funB(retC, a)) {
->funB(retC, a) : p2 is C
+>funB(retC, a) : boolean
 >funB : <T>(p1: (p1: any) => T, p2: any) => p2 is T
 >retC : (x: any) => C
 >a : A
@@ -118,7 +118,7 @@ let test2: B = funC(isB);
 >isB : (p1: any) => p1 is B
 
 if (funD(isC, a)) {
->funD(isC, a) : p2 is C
+>funD(isC, a) : boolean
 >funD : <T>(p1: (p1: any) => p1 is T, p2: any) => p2 is T
 >isC : (p1: any) => p1 is C
 >a : A
diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThis.symbols b/tests/baselines/reference/typeGuardFunctionOfFormThis.symbols
index 2968063dc51..4f08201ba64 100644
--- a/tests/baselines/reference/typeGuardFunctionOfFormThis.symbols
+++ b/tests/baselines/reference/typeGuardFunctionOfFormThis.symbols
@@ -3,7 +3,7 @@ class RoyalGuard {
 >RoyalGuard : Symbol(RoyalGuard, Decl(typeGuardFunctionOfFormThis.ts, 0, 0))
 
     isLeader(): this is LeadGuard {
->isLeader : Symbol(isLeader, Decl(typeGuardFunctionOfFormThis.ts, 0, 18))
+>isLeader : Symbol(RoyalGuard.isLeader, Decl(typeGuardFunctionOfFormThis.ts, 0, 18))
 >LeadGuard : Symbol(LeadGuard, Decl(typeGuardFunctionOfFormThis.ts, 7, 1))
 
         return this instanceof LeadGuard;
@@ -11,7 +11,7 @@ class RoyalGuard {
 >LeadGuard : Symbol(LeadGuard, Decl(typeGuardFunctionOfFormThis.ts, 7, 1))
     }
     isFollower(): this is FollowerGuard {
->isFollower : Symbol(isFollower, Decl(typeGuardFunctionOfFormThis.ts, 3, 5))
+>isFollower : Symbol(RoyalGuard.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 3, 5))
 >FollowerGuard : Symbol(FollowerGuard, Decl(typeGuardFunctionOfFormThis.ts, 11, 1))
 
         return this instanceof FollowerGuard;
@@ -25,7 +25,7 @@ class LeadGuard extends RoyalGuard {
 >RoyalGuard : Symbol(RoyalGuard, Decl(typeGuardFunctionOfFormThis.ts, 0, 0))
 
     lead(): void {};
->lead : Symbol(lead, Decl(typeGuardFunctionOfFormThis.ts, 9, 36))
+>lead : Symbol(LeadGuard.lead, Decl(typeGuardFunctionOfFormThis.ts, 9, 36))
 }
 
 class FollowerGuard extends RoyalGuard {
@@ -33,7 +33,7 @@ class FollowerGuard extends RoyalGuard {
 >RoyalGuard : Symbol(RoyalGuard, Decl(typeGuardFunctionOfFormThis.ts, 0, 0))
 
     follow(): void {};
->follow : Symbol(follow, Decl(typeGuardFunctionOfFormThis.ts, 13, 40))
+>follow : Symbol(FollowerGuard.follow, Decl(typeGuardFunctionOfFormThis.ts, 13, 40))
 }
 
 let a: RoyalGuard = new FollowerGuard();
@@ -158,7 +158,7 @@ class ArrowGuard {
 >ArrowGuard : Symbol(ArrowGuard, Decl(typeGuardFunctionOfFormThis.ts, 56, 1))
 
     isElite = (): this is ArrowElite => {
->isElite : Symbol(isElite, Decl(typeGuardFunctionOfFormThis.ts, 58, 18))
+>isElite : Symbol(ArrowGuard.isElite, Decl(typeGuardFunctionOfFormThis.ts, 58, 18))
 >ArrowElite : Symbol(ArrowElite, Decl(typeGuardFunctionOfFormThis.ts, 65, 1))
 
         return this instanceof ArrowElite;
@@ -166,7 +166,7 @@ class ArrowGuard {
 >ArrowElite : Symbol(ArrowElite, Decl(typeGuardFunctionOfFormThis.ts, 65, 1))
     }
     isMedic = (): this is ArrowMedic => {
->isMedic : Symbol(isMedic, Decl(typeGuardFunctionOfFormThis.ts, 61, 5))
+>isMedic : Symbol(ArrowGuard.isMedic, Decl(typeGuardFunctionOfFormThis.ts, 61, 5))
 >ArrowMedic : Symbol(ArrowMedic, Decl(typeGuardFunctionOfFormThis.ts, 69, 1))
 
         return this instanceof ArrowMedic;
@@ -180,7 +180,7 @@ class ArrowElite extends ArrowGuard {
 >ArrowGuard : Symbol(ArrowGuard, Decl(typeGuardFunctionOfFormThis.ts, 56, 1))
 
     defend(): void {}
->defend : Symbol(defend, Decl(typeGuardFunctionOfFormThis.ts, 67, 37))
+>defend : Symbol(ArrowElite.defend, Decl(typeGuardFunctionOfFormThis.ts, 67, 37))
 }
 
 class ArrowMedic extends ArrowGuard {
@@ -188,7 +188,7 @@ class ArrowMedic extends ArrowGuard {
 >ArrowGuard : Symbol(ArrowGuard, Decl(typeGuardFunctionOfFormThis.ts, 56, 1))
 
     heal(): void {}
->heal : Symbol(heal, Decl(typeGuardFunctionOfFormThis.ts, 71, 37))
+>heal : Symbol(ArrowMedic.heal, Decl(typeGuardFunctionOfFormThis.ts, 71, 37))
 }
 
 let guard = new ArrowGuard();
@@ -220,14 +220,14 @@ interface Supplies {
 >Supplies : Symbol(Supplies, Decl(typeGuardFunctionOfFormThis.ts, 81, 1))
 
     spoiled: boolean;
->spoiled : Symbol(spoiled, Decl(typeGuardFunctionOfFormThis.ts, 83, 20))
+>spoiled : Symbol(Supplies.spoiled, Decl(typeGuardFunctionOfFormThis.ts, 83, 20))
 }
 
 interface Sundries {
 >Sundries : Symbol(Sundries, Decl(typeGuardFunctionOfFormThis.ts, 85, 1))
 
     broken: boolean;
->broken : Symbol(broken, Decl(typeGuardFunctionOfFormThis.ts, 87, 20))
+>broken : Symbol(Sundries.broken, Decl(typeGuardFunctionOfFormThis.ts, 87, 20))
 }
 
 interface Crate<T> {
@@ -235,19 +235,19 @@ interface Crate<T> {
 >T : Symbol(T, Decl(typeGuardFunctionOfFormThis.ts, 91, 16))
 
     contents: T;
->contents : Symbol(contents, Decl(typeGuardFunctionOfFormThis.ts, 91, 20))
+>contents : Symbol(Crate.contents, Decl(typeGuardFunctionOfFormThis.ts, 91, 20))
 >T : Symbol(T, Decl(typeGuardFunctionOfFormThis.ts, 91, 16))
 
     volume: number;
->volume : Symbol(volume, Decl(typeGuardFunctionOfFormThis.ts, 92, 16))
+>volume : Symbol(Crate.volume, Decl(typeGuardFunctionOfFormThis.ts, 92, 16))
 
     isSupplies(): this is Crate<Supplies>;
->isSupplies : Symbol(isSupplies, Decl(typeGuardFunctionOfFormThis.ts, 93, 19))
+>isSupplies : Symbol(Crate.isSupplies, Decl(typeGuardFunctionOfFormThis.ts, 93, 19))
 >Crate : Symbol(Crate, Decl(typeGuardFunctionOfFormThis.ts, 89, 1))
 >Supplies : Symbol(Supplies, Decl(typeGuardFunctionOfFormThis.ts, 81, 1))
 
     isSundries(): this is Crate<Sundries>;
->isSundries : Symbol(isSundries, Decl(typeGuardFunctionOfFormThis.ts, 94, 42))
+>isSundries : Symbol(Crate.isSundries, Decl(typeGuardFunctionOfFormThis.ts, 94, 42))
 >Crate : Symbol(Crate, Decl(typeGuardFunctionOfFormThis.ts, 89, 1))
 >Sundries : Symbol(Sundries, Decl(typeGuardFunctionOfFormThis.ts, 85, 1))
 }
@@ -303,13 +303,13 @@ class MimicGuard {
 >MimicGuard : Symbol(MimicGuard, Decl(typeGuardFunctionOfFormThis.ts, 110, 24))
 
     isLeader(): this is MimicLeader { return this instanceof MimicLeader; };
->isLeader : Symbol(isLeader, Decl(typeGuardFunctionOfFormThis.ts, 112, 18))
+>isLeader : Symbol(MimicGuard.isLeader, Decl(typeGuardFunctionOfFormThis.ts, 112, 18))
 >MimicLeader : Symbol(MimicLeader, Decl(typeGuardFunctionOfFormThis.ts, 115, 1))
 >this : Symbol(MimicGuard, Decl(typeGuardFunctionOfFormThis.ts, 110, 24))
 >MimicLeader : Symbol(MimicLeader, Decl(typeGuardFunctionOfFormThis.ts, 115, 1))
 
     isFollower(): this is MimicFollower { return this instanceof MimicFollower; };
->isFollower : Symbol(isFollower, Decl(typeGuardFunctionOfFormThis.ts, 113, 76))
+>isFollower : Symbol(MimicGuard.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 113, 76))
 >MimicFollower : Symbol(MimicFollower, Decl(typeGuardFunctionOfFormThis.ts, 119, 1))
 >this : Symbol(MimicGuard, Decl(typeGuardFunctionOfFormThis.ts, 110, 24))
 >MimicFollower : Symbol(MimicFollower, Decl(typeGuardFunctionOfFormThis.ts, 119, 1))
@@ -320,7 +320,7 @@ class MimicLeader extends MimicGuard {
 >MimicGuard : Symbol(MimicGuard, Decl(typeGuardFunctionOfFormThis.ts, 110, 24))
 
     lead(): void {}
->lead : Symbol(lead, Decl(typeGuardFunctionOfFormThis.ts, 117, 38))
+>lead : Symbol(MimicLeader.lead, Decl(typeGuardFunctionOfFormThis.ts, 117, 38))
 }
 
 class MimicFollower extends MimicGuard {
@@ -328,7 +328,7 @@ class MimicFollower extends MimicGuard {
 >MimicGuard : Symbol(MimicGuard, Decl(typeGuardFunctionOfFormThis.ts, 110, 24))
 
     follow(): void {}
->follow : Symbol(follow, Decl(typeGuardFunctionOfFormThis.ts, 121, 40))
+>follow : Symbol(MimicFollower.follow, Decl(typeGuardFunctionOfFormThis.ts, 121, 40))
 }
 
 let mimic = new MimicGuard();
@@ -375,11 +375,11 @@ interface MimicGuardInterface {
 >MimicGuardInterface : Symbol(MimicGuardInterface, Decl(typeGuardFunctionOfFormThis.ts, 133, 1))
 
     isLeader(): this is LeadGuard;
->isLeader : Symbol(isLeader, Decl(typeGuardFunctionOfFormThis.ts, 136, 31))
+>isLeader : Symbol(MimicGuardInterface.isLeader, Decl(typeGuardFunctionOfFormThis.ts, 136, 31))
 >LeadGuard : Symbol(LeadGuard, Decl(typeGuardFunctionOfFormThis.ts, 7, 1))
 
     isFollower(): this is FollowerGuard;
->isFollower : Symbol(isFollower, Decl(typeGuardFunctionOfFormThis.ts, 137, 34))
+>isFollower : Symbol(MimicGuardInterface.isFollower, Decl(typeGuardFunctionOfFormThis.ts, 137, 34))
 >FollowerGuard : Symbol(FollowerGuard, Decl(typeGuardFunctionOfFormThis.ts, 11, 1))
 }
 
diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThis.types b/tests/baselines/reference/typeGuardFunctionOfFormThis.types
index e91c77dd07a..cd0381a94e9 100644
--- a/tests/baselines/reference/typeGuardFunctionOfFormThis.types
+++ b/tests/baselines/reference/typeGuardFunctionOfFormThis.types
@@ -45,7 +45,7 @@ let a: RoyalGuard = new FollowerGuard();
 >FollowerGuard : typeof FollowerGuard
 
 if (a.isLeader()) {
->a.isLeader() : this is LeadGuard
+>a.isLeader() : boolean
 >a.isLeader : () => this is LeadGuard
 >a : RoyalGuard
 >isLeader : () => this is LeadGuard
@@ -57,7 +57,7 @@ if (a.isLeader()) {
 >lead : () => void
 }
 else if (a.isFollower()) {
->a.isFollower() : this is FollowerGuard
+>a.isFollower() : boolean
 >a.isFollower : () => this is FollowerGuard
 >a : RoyalGuard
 >isFollower : () => this is FollowerGuard
@@ -78,7 +78,7 @@ let b: GuardInterface;
 >GuardInterface : GuardInterface
 
 if (b.isLeader()) {
->b.isLeader() : this is LeadGuard
+>b.isLeader() : boolean
 >b.isLeader : () => this is LeadGuard
 >b : GuardInterface
 >isLeader : () => this is LeadGuard
@@ -90,7 +90,7 @@ if (b.isLeader()) {
 >lead : () => void
 }
 else if (b.isFollower()) {
->b.isFollower() : this is FollowerGuard
+>b.isFollower() : boolean
 >b.isFollower : () => this is FollowerGuard
 >b : GuardInterface
 >isFollower : () => this is FollowerGuard
@@ -103,8 +103,8 @@ else if (b.isFollower()) {
 }
 
 if (((a.isLeader)())) {
->((a.isLeader)()) : this is LeadGuard
->(a.isLeader)() : this is LeadGuard
+>((a.isLeader)()) : boolean
+>(a.isLeader)() : boolean
 >(a.isLeader) : () => this is LeadGuard
 >a.isLeader : () => this is LeadGuard
 >a : RoyalGuard
@@ -117,8 +117,8 @@ if (((a.isLeader)())) {
 >lead : () => void
 }
 else if (((a).isFollower())) {
->((a).isFollower()) : this is FollowerGuard
->(a).isFollower() : this is FollowerGuard
+>((a).isFollower()) : boolean
+>(a).isFollower() : boolean
 >(a).isFollower : () => this is FollowerGuard
 >(a) : RoyalGuard
 >a : RoyalGuard
@@ -132,8 +132,8 @@ else if (((a).isFollower())) {
 }
 
 if (((a["isLeader"])())) {
->((a["isLeader"])()) : this is LeadGuard
->(a["isLeader"])() : this is LeadGuard
+>((a["isLeader"])()) : boolean
+>(a["isLeader"])() : boolean
 >(a["isLeader"]) : () => this is LeadGuard
 >a["isLeader"] : () => this is LeadGuard
 >a : RoyalGuard
@@ -146,8 +146,8 @@ if (((a["isLeader"])())) {
 >lead : () => void
 }
 else if (((a)["isFollower"]())) {
->((a)["isFollower"]()) : this is FollowerGuard
->(a)["isFollower"]() : this is FollowerGuard
+>((a)["isFollower"]()) : boolean
+>(a)["isFollower"]() : boolean
 >(a)["isFollower"] : () => this is FollowerGuard
 >(a) : RoyalGuard
 >a : RoyalGuard
@@ -166,7 +166,7 @@ var holder2 = {a};
 >a : RoyalGuard
 
 if (holder2.a.isLeader()) {
->holder2.a.isLeader() : this is LeadGuard
+>holder2.a.isLeader() : boolean
 >holder2.a.isLeader : () => this is LeadGuard
 >holder2.a : RoyalGuard
 >holder2 : { a: RoyalGuard; }
@@ -174,9 +174,9 @@ if (holder2.a.isLeader()) {
 >isLeader : () => this is LeadGuard
 
     holder2.a;
->holder2.a : RoyalGuard
+>holder2.a : LeadGuard
 >holder2 : { a: RoyalGuard; }
->a : RoyalGuard
+>a : LeadGuard
 }
 else {
     holder2.a;
@@ -232,7 +232,7 @@ let guard = new ArrowGuard();
 >ArrowGuard : typeof ArrowGuard
 
 if (guard.isElite()) {
->guard.isElite() : this is ArrowElite
+>guard.isElite() : boolean
 >guard.isElite : () => this is ArrowElite
 >guard : ArrowGuard
 >isElite : () => this is ArrowElite
@@ -244,7 +244,7 @@ if (guard.isElite()) {
 >defend : () => void
 }
 else if (guard.isMedic()) {
->guard.isMedic() : this is ArrowMedic
+>guard.isMedic() : boolean
 >guard.isMedic : () => this is ArrowMedic
 >guard : ArrowGuard
 >isMedic : () => this is ArrowMedic
@@ -297,7 +297,7 @@ let crate: Crate<{}>;
 >Crate : Crate<T>
 
 if (crate.isSundries()) {
->crate.isSundries() : this is Crate<Sundries>
+>crate.isSundries() : boolean
 >crate.isSundries : () => this is Crate<Sundries>
 >crate : Crate<{}>
 >isSundries : () => this is Crate<Sundries>
@@ -312,7 +312,7 @@ if (crate.isSundries()) {
 >true : boolean
 }
 else if (crate.isSupplies()) {
->crate.isSupplies() : this is Crate<Supplies>
+>crate.isSupplies() : boolean
 >crate.isSupplies : () => this is Crate<Supplies>
 >crate : Crate<{}>
 >isSupplies : () => this is Crate<Supplies>
@@ -405,7 +405,7 @@ a.isFollower = mimic.isFollower;
 >isFollower : () => this is MimicFollower
 
 if (mimic.isFollower()) {
->mimic.isFollower() : this is MimicFollower
+>mimic.isFollower() : boolean
 >mimic.isFollower : () => this is MimicFollower
 >mimic : MimicGuard
 >isFollower : () => this is MimicFollower
diff --git a/tests/baselines/reference/typeGuardInClass.errors.txt b/tests/baselines/reference/typeGuardInClass.errors.txt
new file mode 100644
index 00000000000..aa86067576f
--- /dev/null
+++ b/tests/baselines/reference/typeGuardInClass.errors.txt
@@ -0,0 +1,30 @@
+tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts(6,17): error TS2322: Type 'string | number' is not assignable to type 'string'.
+  Type 'number' is not assignable to type 'string'.
+tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts(13,17): error TS2322: Type 'string | number' is not assignable to type 'number'.
+  Type 'string' is not assignable to type 'number'.
+
+
+==== tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts (2 errors) ====
+    let x: string | number;
+    
+    if (typeof x === "string") {
+        let n = class {
+            constructor() {
+                let y: string = x;
+                    ~
+!!! error TS2322: Type 'string | number' is not assignable to type 'string'.
+!!! error TS2322:   Type 'number' is not assignable to type 'string'.
+            }
+        }
+    }
+    else {
+        let m = class {
+            constructor() {
+                let y: number = x;
+                    ~
+!!! error TS2322: Type 'string | number' is not assignable to type 'number'.
+!!! error TS2322:   Type 'string' is not assignable to type 'number'.
+            }
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/typeGuardInClass.symbols b/tests/baselines/reference/typeGuardInClass.symbols
deleted file mode 100644
index cc0e745e4de..00000000000
--- a/tests/baselines/reference/typeGuardInClass.symbols
+++ /dev/null
@@ -1,29 +0,0 @@
-=== tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts ===
-let x: string | number;
->x : Symbol(x, Decl(typeGuardInClass.ts, 0, 3))
-
-if (typeof x === "string") {
->x : Symbol(x, Decl(typeGuardInClass.ts, 0, 3))
-
-    let n = class {
->n : Symbol(n, Decl(typeGuardInClass.ts, 3, 7))
-
-        constructor() {
-            let y: string = x;
->y : Symbol(y, Decl(typeGuardInClass.ts, 5, 15))
->x : Symbol(x, Decl(typeGuardInClass.ts, 0, 3))
-        }
-    }
-}
-else {
-    let m = class {
->m : Symbol(m, Decl(typeGuardInClass.ts, 10, 7))
-
-        constructor() {
-            let y: number = x;
->y : Symbol(y, Decl(typeGuardInClass.ts, 12, 15))
->x : Symbol(x, Decl(typeGuardInClass.ts, 0, 3))
-        }
-    }
-}
-
diff --git a/tests/baselines/reference/typeGuardInClass.types b/tests/baselines/reference/typeGuardInClass.types
deleted file mode 100644
index 93fe9f28c5e..00000000000
--- a/tests/baselines/reference/typeGuardInClass.types
+++ /dev/null
@@ -1,34 +0,0 @@
-=== tests/cases/conformance/expressions/typeGuards/typeGuardInClass.ts ===
-let x: string | number;
->x : string | number
-
-if (typeof x === "string") {
->typeof x === "string" : boolean
->typeof x : string
->x : string | number
->"string" : string
-
-    let n = class {
->n : typeof (Anonymous class)
->class {        constructor() {            let y: string = x;        }    } : typeof (Anonymous class)
-
-        constructor() {
-            let y: string = x;
->y : string
->x : string
-        }
-    }
-}
-else {
-    let m = class {
->m : typeof (Anonymous class)
->class {        constructor() {            let y: number = x;        }    } : typeof (Anonymous class)
-
-        constructor() {
-            let y: number = x;
->y : number
->x : number
-        }
-    }
-}
-
diff --git a/tests/baselines/reference/typeGuardOfFormExpr1AndExpr2.symbols b/tests/baselines/reference/typeGuardOfFormExpr1AndExpr2.symbols
index b8db746ef91..3e8f00143ed 100644
--- a/tests/baselines/reference/typeGuardOfFormExpr1AndExpr2.symbols
+++ b/tests/baselines/reference/typeGuardOfFormExpr1AndExpr2.symbols
@@ -19,7 +19,7 @@ var numOrBool: number | boolean;
 
 class C { private p; }
 >C : Symbol(C, Decl(typeGuardOfFormExpr1AndExpr2.ts, 5, 32))
->p : Symbol(p, Decl(typeGuardOfFormExpr1AndExpr2.ts, 6, 9))
+>p : Symbol(C.p, Decl(typeGuardOfFormExpr1AndExpr2.ts, 6, 9))
 
 var c: C;
 >c : Symbol(c, Decl(typeGuardOfFormExpr1AndExpr2.ts, 7, 3))
diff --git a/tests/baselines/reference/typeGuardOfFormExpr1OrExpr2.symbols b/tests/baselines/reference/typeGuardOfFormExpr1OrExpr2.symbols
index f38b74b69b9..32a5422a393 100644
--- a/tests/baselines/reference/typeGuardOfFormExpr1OrExpr2.symbols
+++ b/tests/baselines/reference/typeGuardOfFormExpr1OrExpr2.symbols
@@ -19,7 +19,7 @@ var numOrBool: number | boolean;
 
 class C { private p; }
 >C : Symbol(C, Decl(typeGuardOfFormExpr1OrExpr2.ts, 5, 32))
->p : Symbol(p, Decl(typeGuardOfFormExpr1OrExpr2.ts, 6, 9))
+>p : Symbol(C.p, Decl(typeGuardOfFormExpr1OrExpr2.ts, 6, 9))
 
 var c: C;
 >c : Symbol(c, Decl(typeGuardOfFormExpr1OrExpr2.ts, 7, 3))
diff --git a/tests/baselines/reference/typeGuardOfFormFunctionEquality.js b/tests/baselines/reference/typeGuardOfFormFunctionEquality.js
new file mode 100644
index 00000000000..c15c1a739a9
--- /dev/null
+++ b/tests/baselines/reference/typeGuardOfFormFunctionEquality.js
@@ -0,0 +1,26 @@
+//// [typeGuardOfFormFunctionEquality.ts]
+declare function isString1(a: number, b: Object): b is string;
+
+declare function isString2(a: Object): a is string;
+
+switch (isString1(0, "")) {
+    case isString2(""):
+    default:
+}
+
+var x = isString1(0, "") === isString2("");
+
+function isString3(a: number, b: number, c: Object): c is string {
+    return isString1(0, c);
+}
+
+
+//// [typeGuardOfFormFunctionEquality.js]
+switch (isString1(0, "")) {
+    case isString2(""):
+    default:
+}
+var x = isString1(0, "") === isString2("");
+function isString3(a, b, c) {
+    return isString1(0, c);
+}
diff --git a/tests/baselines/reference/typeGuardOfFormFunctionEquality.symbols b/tests/baselines/reference/typeGuardOfFormFunctionEquality.symbols
new file mode 100644
index 00000000000..f1384050176
--- /dev/null
+++ b/tests/baselines/reference/typeGuardOfFormFunctionEquality.symbols
@@ -0,0 +1,41 @@
+=== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormFunctionEquality.ts ===
+declare function isString1(a: number, b: Object): b is string;
+>isString1 : Symbol(isString1, Decl(typeGuardOfFormFunctionEquality.ts, 0, 0))
+>a : Symbol(a, Decl(typeGuardOfFormFunctionEquality.ts, 0, 27))
+>b : Symbol(b, Decl(typeGuardOfFormFunctionEquality.ts, 0, 37))
+>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>b : Symbol(b, Decl(typeGuardOfFormFunctionEquality.ts, 0, 37))
+
+declare function isString2(a: Object): a is string;
+>isString2 : Symbol(isString2, Decl(typeGuardOfFormFunctionEquality.ts, 0, 62))
+>a : Symbol(a, Decl(typeGuardOfFormFunctionEquality.ts, 2, 27))
+>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>a : Symbol(a, Decl(typeGuardOfFormFunctionEquality.ts, 2, 27))
+
+switch (isString1(0, "")) {
+>isString1 : Symbol(isString1, Decl(typeGuardOfFormFunctionEquality.ts, 0, 0))
+
+    case isString2(""):
+>isString2 : Symbol(isString2, Decl(typeGuardOfFormFunctionEquality.ts, 0, 62))
+
+    default:
+}
+
+var x = isString1(0, "") === isString2("");
+>x : Symbol(x, Decl(typeGuardOfFormFunctionEquality.ts, 9, 3))
+>isString1 : Symbol(isString1, Decl(typeGuardOfFormFunctionEquality.ts, 0, 0))
+>isString2 : Symbol(isString2, Decl(typeGuardOfFormFunctionEquality.ts, 0, 62))
+
+function isString3(a: number, b: number, c: Object): c is string {
+>isString3 : Symbol(isString3, Decl(typeGuardOfFormFunctionEquality.ts, 9, 43))
+>a : Symbol(a, Decl(typeGuardOfFormFunctionEquality.ts, 11, 19))
+>b : Symbol(b, Decl(typeGuardOfFormFunctionEquality.ts, 11, 29))
+>c : Symbol(c, Decl(typeGuardOfFormFunctionEquality.ts, 11, 40))
+>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>c : Symbol(c, Decl(typeGuardOfFormFunctionEquality.ts, 11, 40))
+
+    return isString1(0, c);
+>isString1 : Symbol(isString1, Decl(typeGuardOfFormFunctionEquality.ts, 0, 0))
+>c : Symbol(c, Decl(typeGuardOfFormFunctionEquality.ts, 11, 40))
+}
+
diff --git a/tests/baselines/reference/typeGuardOfFormFunctionEquality.types b/tests/baselines/reference/typeGuardOfFormFunctionEquality.types
new file mode 100644
index 00000000000..55f2e2aac0e
--- /dev/null
+++ b/tests/baselines/reference/typeGuardOfFormFunctionEquality.types
@@ -0,0 +1,54 @@
+=== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormFunctionEquality.ts ===
+declare function isString1(a: number, b: Object): b is string;
+>isString1 : (a: number, b: Object) => b is string
+>a : number
+>b : Object
+>Object : Object
+>b : any
+
+declare function isString2(a: Object): a is string;
+>isString2 : (a: Object) => a is string
+>a : Object
+>Object : Object
+>a : any
+
+switch (isString1(0, "")) {
+>isString1(0, "") : boolean
+>isString1 : (a: number, b: Object) => b is string
+>0 : number
+>"" : string
+
+    case isString2(""):
+>isString2("") : boolean
+>isString2 : (a: Object) => a is string
+>"" : string
+
+    default:
+}
+
+var x = isString1(0, "") === isString2("");
+>x : boolean
+>isString1(0, "") === isString2("") : boolean
+>isString1(0, "") : boolean
+>isString1 : (a: number, b: Object) => b is string
+>0 : number
+>"" : string
+>isString2("") : boolean
+>isString2 : (a: Object) => a is string
+>"" : string
+
+function isString3(a: number, b: number, c: Object): c is string {
+>isString3 : (a: number, b: number, c: Object) => c is string
+>a : number
+>b : number
+>c : Object
+>Object : Object
+>c : any
+
+    return isString1(0, c);
+>isString1(0, c) : boolean
+>isString1 : (a: number, b: Object) => b is string
+>0 : number
+>c : Object
+}
+
diff --git a/tests/baselines/reference/typeGuardOfFormInstanceOf.symbols b/tests/baselines/reference/typeGuardOfFormInstanceOf.symbols
index 0dd2844f6ad..42797cc369f 100644
--- a/tests/baselines/reference/typeGuardOfFormInstanceOf.symbols
+++ b/tests/baselines/reference/typeGuardOfFormInstanceOf.symbols
@@ -9,26 +9,26 @@ class C1 {
 >C1 : Symbol(C1, Decl(typeGuardOfFormInstanceOf.ts, 0, 0))
 
     p1: string;
->p1 : Symbol(p1, Decl(typeGuardOfFormInstanceOf.ts, 6, 10))
+>p1 : Symbol(C1.p1, Decl(typeGuardOfFormInstanceOf.ts, 6, 10))
 }
 class C2 {
 >C2 : Symbol(C2, Decl(typeGuardOfFormInstanceOf.ts, 8, 1))
 
     p2: number;
->p2 : Symbol(p2, Decl(typeGuardOfFormInstanceOf.ts, 9, 10))
+>p2 : Symbol(C2.p2, Decl(typeGuardOfFormInstanceOf.ts, 9, 10))
 }
 class D1 extends C1 {
 >D1 : Symbol(D1, Decl(typeGuardOfFormInstanceOf.ts, 11, 1))
 >C1 : Symbol(C1, Decl(typeGuardOfFormInstanceOf.ts, 0, 0))
 
     p3: number;
->p3 : Symbol(p3, Decl(typeGuardOfFormInstanceOf.ts, 12, 21))
+>p3 : Symbol(D1.p3, Decl(typeGuardOfFormInstanceOf.ts, 12, 21))
 }
 class C3 {
 >C3 : Symbol(C3, Decl(typeGuardOfFormInstanceOf.ts, 14, 1))
 
     p4: number;
->p4 : Symbol(p4, Decl(typeGuardOfFormInstanceOf.ts, 15, 10))
+>p4 : Symbol(C3.p4, Decl(typeGuardOfFormInstanceOf.ts, 15, 10))
 }
 var str: string;
 >str : Symbol(str, Decl(typeGuardOfFormInstanceOf.ts, 18, 3))
diff --git a/tests/baselines/reference/typeGuardOfFormInstanceOfOnInterface.symbols b/tests/baselines/reference/typeGuardOfFormInstanceOfOnInterface.symbols
index aa634144399..177664ba339 100644
--- a/tests/baselines/reference/typeGuardOfFormInstanceOfOnInterface.symbols
+++ b/tests/baselines/reference/typeGuardOfFormInstanceOfOnInterface.symbols
@@ -12,11 +12,11 @@ interface C1 {
 >C1 : Symbol(C1, Decl(typeGuardOfFormInstanceOfOnInterface.ts, 0, 0))
 
     prototype: C1;
->prototype : Symbol(prototype, Decl(typeGuardOfFormInstanceOfOnInterface.ts, 7, 11))
+>prototype : Symbol(C1.prototype, Decl(typeGuardOfFormInstanceOfOnInterface.ts, 7, 11))
 >C1 : Symbol(C1, Decl(typeGuardOfFormInstanceOfOnInterface.ts, 0, 0))
 
     p1: string;
->p1 : Symbol(p1, Decl(typeGuardOfFormInstanceOfOnInterface.ts, 8, 18))
+>p1 : Symbol(C1.p1, Decl(typeGuardOfFormInstanceOfOnInterface.ts, 8, 18))
 }
 interface C2 {
 >C2 : Symbol(C2, Decl(typeGuardOfFormInstanceOfOnInterface.ts, 10, 1))
@@ -25,22 +25,22 @@ interface C2 {
 >C2 : Symbol(C2, Decl(typeGuardOfFormInstanceOfOnInterface.ts, 10, 1))
 
     prototype: C2;
->prototype : Symbol(prototype, Decl(typeGuardOfFormInstanceOfOnInterface.ts, 12, 11))
+>prototype : Symbol(C2.prototype, Decl(typeGuardOfFormInstanceOfOnInterface.ts, 12, 11))
 >C2 : Symbol(C2, Decl(typeGuardOfFormInstanceOfOnInterface.ts, 10, 1))
 
     p2: number;
->p2 : Symbol(p2, Decl(typeGuardOfFormInstanceOfOnInterface.ts, 13, 18))
+>p2 : Symbol(C2.p2, Decl(typeGuardOfFormInstanceOfOnInterface.ts, 13, 18))
 }
 interface D1 extends C1 {
 >D1 : Symbol(D1, Decl(typeGuardOfFormInstanceOfOnInterface.ts, 15, 1))
 >C1 : Symbol(C1, Decl(typeGuardOfFormInstanceOfOnInterface.ts, 0, 0))
 
     prototype: D1;
->prototype : Symbol(prototype, Decl(typeGuardOfFormInstanceOfOnInterface.ts, 16, 25))
+>prototype : Symbol(D1.prototype, Decl(typeGuardOfFormInstanceOfOnInterface.ts, 16, 25))
 >D1 : Symbol(D1, Decl(typeGuardOfFormInstanceOfOnInterface.ts, 15, 1))
 
     p3: number;
->p3 : Symbol(p3, Decl(typeGuardOfFormInstanceOfOnInterface.ts, 17, 18))
+>p3 : Symbol(D1.p3, Decl(typeGuardOfFormInstanceOfOnInterface.ts, 17, 18))
 }
 var str: string;
 >str : Symbol(str, Decl(typeGuardOfFormInstanceOfOnInterface.ts, 20, 3))
diff --git a/tests/baselines/reference/typeGuardOfFormIsType.symbols b/tests/baselines/reference/typeGuardOfFormIsType.symbols
index e7e8965673d..faa825daeb4 100644
--- a/tests/baselines/reference/typeGuardOfFormIsType.symbols
+++ b/tests/baselines/reference/typeGuardOfFormIsType.symbols
@@ -4,20 +4,20 @@ class C1 {
 >C1 : Symbol(C1, Decl(typeGuardOfFormIsType.ts, 0, 0))
 
     p1: string;
->p1 : Symbol(p1, Decl(typeGuardOfFormIsType.ts, 1, 10))
+>p1 : Symbol(C1.p1, Decl(typeGuardOfFormIsType.ts, 1, 10))
 }
 class C2 {
 >C2 : Symbol(C2, Decl(typeGuardOfFormIsType.ts, 3, 1))
 
     p2: number;
->p2 : Symbol(p2, Decl(typeGuardOfFormIsType.ts, 4, 10))
+>p2 : Symbol(C2.p2, Decl(typeGuardOfFormIsType.ts, 4, 10))
 }
 class D1 extends C1 {
 >D1 : Symbol(D1, Decl(typeGuardOfFormIsType.ts, 6, 1))
 >C1 : Symbol(C1, Decl(typeGuardOfFormIsType.ts, 0, 0))
 
     p3: number;
->p3 : Symbol(p3, Decl(typeGuardOfFormIsType.ts, 7, 21))
+>p3 : Symbol(D1.p3, Decl(typeGuardOfFormIsType.ts, 7, 21))
 }
 var str: string;
 >str : Symbol(str, Decl(typeGuardOfFormIsType.ts, 10, 3))
diff --git a/tests/baselines/reference/typeGuardOfFormIsType.types b/tests/baselines/reference/typeGuardOfFormIsType.types
index aa8f8cc7d60..e2059be7b63 100644
--- a/tests/baselines/reference/typeGuardOfFormIsType.types
+++ b/tests/baselines/reference/typeGuardOfFormIsType.types
@@ -67,7 +67,7 @@ str = isC1(c1Orc2) && c1Orc2.p1; // C1
 >str = isC1(c1Orc2) && c1Orc2.p1 : string
 >str : string
 >isC1(c1Orc2) && c1Orc2.p1 : string
->isC1(c1Orc2) : x is C1
+>isC1(c1Orc2) : boolean
 >isC1 : (x: any) => x is C1
 >c1Orc2 : C1 | C2
 >c1Orc2.p1 : string
@@ -78,7 +78,7 @@ num = isC2(c1Orc2) && c1Orc2.p2; // C2
 >num = isC2(c1Orc2) && c1Orc2.p2 : number
 >num : number
 >isC2(c1Orc2) && c1Orc2.p2 : number
->isC2(c1Orc2) : x is C2
+>isC2(c1Orc2) : boolean
 >isC2 : (x: any) => x is C2
 >c1Orc2 : C1 | C2
 >c1Orc2.p2 : number
@@ -89,7 +89,7 @@ str = isD1(c1Orc2) && c1Orc2.p1; // D1
 >str = isD1(c1Orc2) && c1Orc2.p1 : string
 >str : string
 >isD1(c1Orc2) && c1Orc2.p1 : string
->isD1(c1Orc2) : x is D1
+>isD1(c1Orc2) : boolean
 >isD1 : (x: any) => x is D1
 >c1Orc2 : C1 | C2
 >c1Orc2.p1 : string
@@ -100,7 +100,7 @@ num = isD1(c1Orc2) && c1Orc2.p3; // D1
 >num = isD1(c1Orc2) && c1Orc2.p3 : number
 >num : number
 >isD1(c1Orc2) && c1Orc2.p3 : number
->isD1(c1Orc2) : x is D1
+>isD1(c1Orc2) : boolean
 >isD1 : (x: any) => x is D1
 >c1Orc2 : C1 | C2
 >c1Orc2.p3 : number
@@ -116,7 +116,7 @@ num = isC2(c2Ord1) && c2Ord1.p2; // C2
 >num = isC2(c2Ord1) && c2Ord1.p2 : number
 >num : number
 >isC2(c2Ord1) && c2Ord1.p2 : number
->isC2(c2Ord1) : x is C2
+>isC2(c2Ord1) : boolean
 >isC2 : (x: any) => x is C2
 >c2Ord1 : C2 | D1
 >c2Ord1.p2 : number
@@ -127,7 +127,7 @@ num = isD1(c2Ord1) && c2Ord1.p3; // D1
 >num = isD1(c2Ord1) && c2Ord1.p3 : number
 >num : number
 >isD1(c2Ord1) && c2Ord1.p3 : number
->isD1(c2Ord1) : x is D1
+>isD1(c2Ord1) : boolean
 >isD1 : (x: any) => x is D1
 >c2Ord1 : C2 | D1
 >c2Ord1.p3 : number
@@ -138,7 +138,7 @@ str = isD1(c2Ord1) && c2Ord1.p1; // D1
 >str = isD1(c2Ord1) && c2Ord1.p1 : string
 >str : string
 >isD1(c2Ord1) && c2Ord1.p1 : string
->isD1(c2Ord1) : x is D1
+>isD1(c2Ord1) : boolean
 >isD1 : (x: any) => x is D1
 >c2Ord1 : C2 | D1
 >c2Ord1.p1 : string
@@ -150,7 +150,7 @@ var r2: C2 | D1 = isC1(c2Ord1) && c2Ord1; // C2 | D1
 >C2 : C2
 >D1 : D1
 >isC1(c2Ord1) && c2Ord1 : D1
->isC1(c2Ord1) : x is C1
+>isC1(c2Ord1) : boolean
 >isC1 : (x: any) => x is C1
 >c2Ord1 : C2 | D1
 >c2Ord1 : D1
diff --git a/tests/baselines/reference/typeGuardOfFormIsTypeOnInterfaces.symbols b/tests/baselines/reference/typeGuardOfFormIsTypeOnInterfaces.symbols
index 641d20d95cd..64ecc01d6f1 100644
--- a/tests/baselines/reference/typeGuardOfFormIsTypeOnInterfaces.symbols
+++ b/tests/baselines/reference/typeGuardOfFormIsTypeOnInterfaces.symbols
@@ -7,11 +7,11 @@ interface C1 {
 >C1 : Symbol(C1, Decl(typeGuardOfFormIsTypeOnInterfaces.ts, 0, 0))
 
     prototype: C1;
->prototype : Symbol(prototype, Decl(typeGuardOfFormIsTypeOnInterfaces.ts, 2, 11))
+>prototype : Symbol(C1.prototype, Decl(typeGuardOfFormIsTypeOnInterfaces.ts, 2, 11))
 >C1 : Symbol(C1, Decl(typeGuardOfFormIsTypeOnInterfaces.ts, 0, 0))
 
     p1: string;
->p1 : Symbol(p1, Decl(typeGuardOfFormIsTypeOnInterfaces.ts, 3, 18))
+>p1 : Symbol(C1.p1, Decl(typeGuardOfFormIsTypeOnInterfaces.ts, 3, 18))
 }
 interface C2 {
 >C2 : Symbol(C2, Decl(typeGuardOfFormIsTypeOnInterfaces.ts, 5, 1))
@@ -20,22 +20,22 @@ interface C2 {
 >C2 : Symbol(C2, Decl(typeGuardOfFormIsTypeOnInterfaces.ts, 5, 1))
 
     prototype: C2;
->prototype : Symbol(prototype, Decl(typeGuardOfFormIsTypeOnInterfaces.ts, 7, 11))
+>prototype : Symbol(C2.prototype, Decl(typeGuardOfFormIsTypeOnInterfaces.ts, 7, 11))
 >C2 : Symbol(C2, Decl(typeGuardOfFormIsTypeOnInterfaces.ts, 5, 1))
 
     p2: number;
->p2 : Symbol(p2, Decl(typeGuardOfFormIsTypeOnInterfaces.ts, 8, 18))
+>p2 : Symbol(C2.p2, Decl(typeGuardOfFormIsTypeOnInterfaces.ts, 8, 18))
 }
 interface D1 extends C1 {
 >D1 : Symbol(D1, Decl(typeGuardOfFormIsTypeOnInterfaces.ts, 10, 1))
 >C1 : Symbol(C1, Decl(typeGuardOfFormIsTypeOnInterfaces.ts, 0, 0))
 
     prototype: D1;
->prototype : Symbol(prototype, Decl(typeGuardOfFormIsTypeOnInterfaces.ts, 11, 25))
+>prototype : Symbol(D1.prototype, Decl(typeGuardOfFormIsTypeOnInterfaces.ts, 11, 25))
 >D1 : Symbol(D1, Decl(typeGuardOfFormIsTypeOnInterfaces.ts, 10, 1))
 
     p3: number;
->p3 : Symbol(p3, Decl(typeGuardOfFormIsTypeOnInterfaces.ts, 12, 18))
+>p3 : Symbol(D1.p3, Decl(typeGuardOfFormIsTypeOnInterfaces.ts, 12, 18))
 }
 var str: string;
 >str : Symbol(str, Decl(typeGuardOfFormIsTypeOnInterfaces.ts, 15, 3))
diff --git a/tests/baselines/reference/typeGuardOfFormIsTypeOnInterfaces.types b/tests/baselines/reference/typeGuardOfFormIsTypeOnInterfaces.types
index 4e28e6a4d38..ea169e95413 100644
--- a/tests/baselines/reference/typeGuardOfFormIsTypeOnInterfaces.types
+++ b/tests/baselines/reference/typeGuardOfFormIsTypeOnInterfaces.types
@@ -98,7 +98,7 @@ str = isC1(c1Orc2) && c1Orc2.p1; // C1
 >str = isC1(c1Orc2) && c1Orc2.p1 : string
 >str : string
 >isC1(c1Orc2) && c1Orc2.p1 : string
->isC1(c1Orc2) : x is C1
+>isC1(c1Orc2) : boolean
 >isC1 : (x: any) => x is C1
 >c1Orc2 : C1 | C2
 >c1Orc2.p1 : string
@@ -109,7 +109,7 @@ num = isC2(c1Orc2) && c1Orc2.p2; // C2
 >num = isC2(c1Orc2) && c1Orc2.p2 : number
 >num : number
 >isC2(c1Orc2) && c1Orc2.p2 : number
->isC2(c1Orc2) : x is C2
+>isC2(c1Orc2) : boolean
 >isC2 : (x: any) => x is C2
 >c1Orc2 : C1 | C2
 >c1Orc2.p2 : number
@@ -120,7 +120,7 @@ str = isD1(c1Orc2) && c1Orc2.p1; // D1
 >str = isD1(c1Orc2) && c1Orc2.p1 : string
 >str : string
 >isD1(c1Orc2) && c1Orc2.p1 : string
->isD1(c1Orc2) : x is D1
+>isD1(c1Orc2) : boolean
 >isD1 : (x: any) => x is D1
 >c1Orc2 : C1 | C2
 >c1Orc2.p1 : string
@@ -131,7 +131,7 @@ num = isD1(c1Orc2) && c1Orc2.p3; // D1
 >num = isD1(c1Orc2) && c1Orc2.p3 : number
 >num : number
 >isD1(c1Orc2) && c1Orc2.p3 : number
->isD1(c1Orc2) : x is D1
+>isD1(c1Orc2) : boolean
 >isD1 : (x: any) => x is D1
 >c1Orc2 : C1 | C2
 >c1Orc2.p3 : number
@@ -147,7 +147,7 @@ num = isC2(c2Ord1) && c2Ord1.p2; // C2
 >num = isC2(c2Ord1) && c2Ord1.p2 : number
 >num : number
 >isC2(c2Ord1) && c2Ord1.p2 : number
->isC2(c2Ord1) : x is C2
+>isC2(c2Ord1) : boolean
 >isC2 : (x: any) => x is C2
 >c2Ord1 : C2 | D1
 >c2Ord1.p2 : number
@@ -158,7 +158,7 @@ num = isD1(c2Ord1) && c2Ord1.p3; // D1
 >num = isD1(c2Ord1) && c2Ord1.p3 : number
 >num : number
 >isD1(c2Ord1) && c2Ord1.p3 : number
->isD1(c2Ord1) : x is D1
+>isD1(c2Ord1) : boolean
 >isD1 : (x: any) => x is D1
 >c2Ord1 : C2 | D1
 >c2Ord1.p3 : number
@@ -169,7 +169,7 @@ str = isD1(c2Ord1) && c2Ord1.p1; // D1
 >str = isD1(c2Ord1) && c2Ord1.p1 : string
 >str : string
 >isD1(c2Ord1) && c2Ord1.p1 : string
->isD1(c2Ord1) : x is D1
+>isD1(c2Ord1) : boolean
 >isD1 : (x: any) => x is D1
 >c2Ord1 : C2 | D1
 >c2Ord1.p1 : string
@@ -181,7 +181,7 @@ var r2: C2 | D1 = isC1(c2Ord1) && c2Ord1; // C2 | D1
 >C2 : C2
 >D1 : D1
 >isC1(c2Ord1) && c2Ord1 : D1
->isC1(c2Ord1) : x is C1
+>isC1(c2Ord1) : boolean
 >isC1 : (x: any) => x is C1
 >c2Ord1 : C2 | D1
 >c2Ord1 : D1
diff --git a/tests/baselines/reference/typeGuardOfFormThisMember.errors.txt b/tests/baselines/reference/typeGuardOfFormThisMember.errors.txt
new file mode 100644
index 00000000000..21dc896fbd9
--- /dev/null
+++ b/tests/baselines/reference/typeGuardOfFormThisMember.errors.txt
@@ -0,0 +1,130 @@
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts(4,10): error TS1228: A type predicate is only allowed in return type position for functions and methods.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts(5,17): error TS1228: A type predicate is only allowed in return type position for functions and methods.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts(11,22): error TS1228: A type predicate is only allowed in return type position for functions and methods.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts(14,16): error TS1228: A type predicate is only allowed in return type position for functions and methods.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts(34,8): error TS2339: Property 'content' does not exist on type 'FileSystemObject'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts(36,9): error TS2339: Property 'host' does not exist on type 'FileSystemObject'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts(37,9): error TS2339: Property 'content' does not exist on type 'FileSystemObject'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts(41,8): error TS2339: Property 'children' does not exist on type 'FileSystemObject'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts(44,8): error TS2339: Property 'host' does not exist on type 'FileSystemObject'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts(57,13): error TS1228: A type predicate is only allowed in return type position for functions and methods.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts(58,15): error TS1228: A type predicate is only allowed in return type position for functions and methods.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts(63,9): error TS2339: Property 'lead' does not exist on type 'GenericGuard<File>'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts(66,9): error TS2339: Property 'follow' does not exist on type 'GenericGuard<File>'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts(70,19): error TS1228: A type predicate is only allowed in return type position for functions and methods.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts(79,11): error TS2339: Property 'do' does not exist on type 'SpecificGuard'.
+
+
+==== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts (15 errors) ====
+    // There's a 'File' class in the stdlib, wrap with a namespace to avoid collision
+    namespace Test {
+    	export class FileSystemObject {
+    		isFSO: this is FileSystemObject;
+    		       ~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1228: A type predicate is only allowed in return type position for functions and methods.
+    		get isFile(): this is File {
+    		              ~~~~~~~~~~~~
+!!! error TS1228: A type predicate is only allowed in return type position for functions and methods.
+    			return this instanceof File;
+    		}
+    		set isFile(param) {
+    			// noop
+    		}
+    		get isDirectory(): this is Directory {
+    		                   ~~~~~~~~~~~~~~~~~
+!!! error TS1228: A type predicate is only allowed in return type position for functions and methods.
+    			return this instanceof Directory;
+    		}
+    		isNetworked: this is (Networked & this);
+    		             ~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1228: A type predicate is only allowed in return type position for functions and methods.
+    		constructor(public path: string) {}
+    	}
+    
+    	export class File extends FileSystemObject {
+    		constructor(path: string, public content: string) { super(path); }
+    	}
+    	export class Directory extends FileSystemObject {
+    		children: FileSystemObject[];
+    	}
+    	export interface Networked {
+    		host: string;
+    	}
+    
+    	let file: FileSystemObject = new File("foo/bar.txt", "foo");
+    	file.isNetworked = false;
+    	file.isFSO = file.isFile;
+    	file.isFile = true;
+    	let x = file.isFile;
+    	if (file.isFile) {
+    		file.content;
+    		     ~~~~~~~
+!!! error TS2339: Property 'content' does not exist on type 'FileSystemObject'.
+    		if (file.isNetworked) {
+    			file.host;
+    			     ~~~~
+!!! error TS2339: Property 'host' does not exist on type 'FileSystemObject'.
+    			file.content;
+    			     ~~~~~~~
+!!! error TS2339: Property 'content' does not exist on type 'FileSystemObject'.
+    		}
+    	}
+    	else if (file.isDirectory) {
+    		file.children;
+    		     ~~~~~~~~
+!!! error TS2339: Property 'children' does not exist on type 'FileSystemObject'.
+    	}
+    	else if (file.isNetworked) {
+    		file.host;
+    		     ~~~~
+!!! error TS2339: Property 'host' does not exist on type 'FileSystemObject'.
+    	}
+    	
+    	interface GenericLeadGuard<T> extends GenericGuard<T> {
+    		lead(): void;
+    	}
+    	
+    	interface GenericFollowerGuard<T> extends GenericGuard<T> {
+    		follow(): void;
+    	}
+    	
+    	interface GenericGuard<T> {
+    		target: T;
+    		isLeader: this is (GenericLeadGuard<T>);
+    		          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1228: A type predicate is only allowed in return type position for functions and methods.
+    		isFollower: this is GenericFollowerGuard<T>;
+    		            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1228: A type predicate is only allowed in return type position for functions and methods.
+    	}
+    
+    	let guard: GenericGuard<File>;
+    	if (guard.isLeader) {
+    		guard.lead();
+    		      ~~~~
+!!! error TS2339: Property 'lead' does not exist on type 'GenericGuard<File>'.
+    	}
+    	else if (guard.isFollower) {
+    		guard.follow();
+    		      ~~~~~~
+!!! error TS2339: Property 'follow' does not exist on type 'GenericGuard<File>'.
+    	}
+    
+    	interface SpecificGuard {
+    		isMoreSpecific: this is MoreSpecificGuard;
+    		                ~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1228: A type predicate is only allowed in return type position for functions and methods.
+    	}
+    
+    	interface MoreSpecificGuard extends SpecificGuard {
+    		do(): void;
+    	}
+    
+    	let general: SpecificGuard;
+    	if (general.isMoreSpecific) {
+    		general.do();
+    		        ~~
+!!! error TS2339: Property 'do' does not exist on type 'SpecificGuard'.
+    	}
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/typeGuardOfFormThisMember.symbols b/tests/baselines/reference/typeGuardOfFormThisMember.symbols
deleted file mode 100644
index 50e15b68ca4..00000000000
--- a/tests/baselines/reference/typeGuardOfFormThisMember.symbols
+++ /dev/null
@@ -1,240 +0,0 @@
-=== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts ===
-// There's a 'File' class in the stdlib, wrap with a namespace to avoid collision
-namespace Test {
->Test : Symbol(Test, Decl(typeGuardOfFormThisMember.ts, 0, 0))
-
-	export class FileSystemObject {
->FileSystemObject : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16))
-
-		isFSO: this is FileSystemObject;
->isFSO : Symbol(isFSO, Decl(typeGuardOfFormThisMember.ts, 2, 32))
->FileSystemObject : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16))
-
-		get isFile(): this is File {
->isFile : Symbol(isFile, Decl(typeGuardOfFormThisMember.ts, 3, 34), Decl(typeGuardOfFormThisMember.ts, 6, 3))
->File : Symbol(File, Decl(typeGuardOfFormThisMember.ts, 15, 2))
-
-			return this instanceof File;
->this : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16))
->File : Symbol(File, Decl(typeGuardOfFormThisMember.ts, 15, 2))
-		}
-		set isFile(param) {
->isFile : Symbol(isFile, Decl(typeGuardOfFormThisMember.ts, 3, 34), Decl(typeGuardOfFormThisMember.ts, 6, 3))
->param : Symbol(param, Decl(typeGuardOfFormThisMember.ts, 7, 13))
-
-			// noop
-		}
-		get isDirectory(): this is Directory {
->isDirectory : Symbol(isDirectory, Decl(typeGuardOfFormThisMember.ts, 9, 3))
->Directory : Symbol(Directory, Decl(typeGuardOfFormThisMember.ts, 19, 2))
-
-			return this instanceof Directory;
->this : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16))
->Directory : Symbol(Directory, Decl(typeGuardOfFormThisMember.ts, 19, 2))
-		}
-		isNetworked: this is (Networked & this);
->isNetworked : Symbol(isNetworked, Decl(typeGuardOfFormThisMember.ts, 12, 3))
->Networked : Symbol(Networked, Decl(typeGuardOfFormThisMember.ts, 22, 2))
-
-		constructor(public path: string) {}
->path : Symbol(path, Decl(typeGuardOfFormThisMember.ts, 14, 14))
-	}
-
-	export class File extends FileSystemObject {
->File : Symbol(File, Decl(typeGuardOfFormThisMember.ts, 15, 2))
->FileSystemObject : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16))
-
-		constructor(path: string, public content: string) { super(path); }
->path : Symbol(path, Decl(typeGuardOfFormThisMember.ts, 18, 14))
->content : Symbol(content, Decl(typeGuardOfFormThisMember.ts, 18, 27))
->super : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16))
->path : Symbol(path, Decl(typeGuardOfFormThisMember.ts, 18, 14))
-	}
-	export class Directory extends FileSystemObject {
->Directory : Symbol(Directory, Decl(typeGuardOfFormThisMember.ts, 19, 2))
->FileSystemObject : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16))
-
-		children: FileSystemObject[];
->children : Symbol(children, Decl(typeGuardOfFormThisMember.ts, 20, 50))
->FileSystemObject : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16))
-	}
-	export interface Networked {
->Networked : Symbol(Networked, Decl(typeGuardOfFormThisMember.ts, 22, 2))
-
-		host: string;
->host : Symbol(host, Decl(typeGuardOfFormThisMember.ts, 23, 29))
-	}
-
-	let file: FileSystemObject = new File("foo/bar.txt", "foo");
->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4))
->FileSystemObject : Symbol(FileSystemObject, Decl(typeGuardOfFormThisMember.ts, 1, 16))
->File : Symbol(File, Decl(typeGuardOfFormThisMember.ts, 15, 2))
-
-	file.isNetworked = false;
->file.isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 12, 3))
->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4))
->isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 12, 3))
-
-	file.isFSO = file.isFile;
->file.isFSO : Symbol(FileSystemObject.isFSO, Decl(typeGuardOfFormThisMember.ts, 2, 32))
->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4))
->isFSO : Symbol(FileSystemObject.isFSO, Decl(typeGuardOfFormThisMember.ts, 2, 32))
->file.isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 3, 34), Decl(typeGuardOfFormThisMember.ts, 6, 3))
->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4))
->isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 3, 34), Decl(typeGuardOfFormThisMember.ts, 6, 3))
-
-	file.isFile = true;
->file.isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 3, 34), Decl(typeGuardOfFormThisMember.ts, 6, 3))
->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4))
->isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 3, 34), Decl(typeGuardOfFormThisMember.ts, 6, 3))
-
-	let x = file.isFile;
->x : Symbol(x, Decl(typeGuardOfFormThisMember.ts, 31, 4))
->file.isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 3, 34), Decl(typeGuardOfFormThisMember.ts, 6, 3))
->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4))
->isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 3, 34), Decl(typeGuardOfFormThisMember.ts, 6, 3))
-
-	if (file.isFile) {
->file.isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 3, 34), Decl(typeGuardOfFormThisMember.ts, 6, 3))
->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4))
->isFile : Symbol(FileSystemObject.isFile, Decl(typeGuardOfFormThisMember.ts, 3, 34), Decl(typeGuardOfFormThisMember.ts, 6, 3))
-
-		file.content;
->file.content : Symbol(File.content, Decl(typeGuardOfFormThisMember.ts, 18, 27))
->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4))
->content : Symbol(File.content, Decl(typeGuardOfFormThisMember.ts, 18, 27))
-
-		if (file.isNetworked) {
->file.isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 12, 3))
->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4))
->isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 12, 3))
-
-			file.host;
->file.host : Symbol(Networked.host, Decl(typeGuardOfFormThisMember.ts, 23, 29))
->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4))
->host : Symbol(Networked.host, Decl(typeGuardOfFormThisMember.ts, 23, 29))
-
-			file.content;
->file.content : Symbol(File.content, Decl(typeGuardOfFormThisMember.ts, 18, 27))
->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4))
->content : Symbol(File.content, Decl(typeGuardOfFormThisMember.ts, 18, 27))
-		}
-	}
-	else if (file.isDirectory) {
->file.isDirectory : Symbol(FileSystemObject.isDirectory, Decl(typeGuardOfFormThisMember.ts, 9, 3))
->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4))
->isDirectory : Symbol(FileSystemObject.isDirectory, Decl(typeGuardOfFormThisMember.ts, 9, 3))
-
-		file.children;
->file.children : Symbol(Directory.children, Decl(typeGuardOfFormThisMember.ts, 20, 50))
->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4))
->children : Symbol(Directory.children, Decl(typeGuardOfFormThisMember.ts, 20, 50))
-	}
-	else if (file.isNetworked) {
->file.isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 12, 3))
->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4))
->isNetworked : Symbol(FileSystemObject.isNetworked, Decl(typeGuardOfFormThisMember.ts, 12, 3))
-
-		file.host;
->file.host : Symbol(Networked.host, Decl(typeGuardOfFormThisMember.ts, 23, 29))
->file : Symbol(file, Decl(typeGuardOfFormThisMember.ts, 27, 4))
->host : Symbol(Networked.host, Decl(typeGuardOfFormThisMember.ts, 23, 29))
-	}
-	
-	interface GenericLeadGuard<T> extends GenericGuard<T> {
->GenericLeadGuard : Symbol(GenericLeadGuard, Decl(typeGuardOfFormThisMember.ts, 44, 2))
->T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 46, 28))
->GenericGuard : Symbol(GenericGuard, Decl(typeGuardOfFormThisMember.ts, 52, 2))
->T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 46, 28))
-
-		lead(): void;
->lead : Symbol(lead, Decl(typeGuardOfFormThisMember.ts, 46, 56))
-	}
-	
-	interface GenericFollowerGuard<T> extends GenericGuard<T> {
->GenericFollowerGuard : Symbol(GenericFollowerGuard, Decl(typeGuardOfFormThisMember.ts, 48, 2))
->T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 50, 32))
->GenericGuard : Symbol(GenericGuard, Decl(typeGuardOfFormThisMember.ts, 52, 2))
->T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 50, 32))
-
-		follow(): void;
->follow : Symbol(follow, Decl(typeGuardOfFormThisMember.ts, 50, 60))
-	}
-	
-	interface GenericGuard<T> {
->GenericGuard : Symbol(GenericGuard, Decl(typeGuardOfFormThisMember.ts, 52, 2))
->T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 54, 24))
-
-		target: T;
->target : Symbol(target, Decl(typeGuardOfFormThisMember.ts, 54, 28))
->T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 54, 24))
-
-		isLeader: this is (GenericLeadGuard<T>);
->isLeader : Symbol(isLeader, Decl(typeGuardOfFormThisMember.ts, 55, 12))
->GenericLeadGuard : Symbol(GenericLeadGuard, Decl(typeGuardOfFormThisMember.ts, 44, 2))
->T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 54, 24))
-
-		isFollower: this is GenericFollowerGuard<T>;
->isFollower : Symbol(isFollower, Decl(typeGuardOfFormThisMember.ts, 56, 42))
->GenericFollowerGuard : Symbol(GenericFollowerGuard, Decl(typeGuardOfFormThisMember.ts, 48, 2))
->T : Symbol(T, Decl(typeGuardOfFormThisMember.ts, 54, 24))
-	}
-
-	let guard: GenericGuard<File>;
->guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 60, 4))
->GenericGuard : Symbol(GenericGuard, Decl(typeGuardOfFormThisMember.ts, 52, 2))
->File : Symbol(File, Decl(typeGuardOfFormThisMember.ts, 15, 2))
-
-	if (guard.isLeader) {
->guard.isLeader : Symbol(GenericGuard.isLeader, Decl(typeGuardOfFormThisMember.ts, 55, 12))
->guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 60, 4))
->isLeader : Symbol(GenericGuard.isLeader, Decl(typeGuardOfFormThisMember.ts, 55, 12))
-
-		guard.lead();
->guard.lead : Symbol(GenericLeadGuard.lead, Decl(typeGuardOfFormThisMember.ts, 46, 56))
->guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 60, 4))
->lead : Symbol(GenericLeadGuard.lead, Decl(typeGuardOfFormThisMember.ts, 46, 56))
-	}
-	else if (guard.isFollower) {
->guard.isFollower : Symbol(GenericGuard.isFollower, Decl(typeGuardOfFormThisMember.ts, 56, 42))
->guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 60, 4))
->isFollower : Symbol(GenericGuard.isFollower, Decl(typeGuardOfFormThisMember.ts, 56, 42))
-
-		guard.follow();
->guard.follow : Symbol(GenericFollowerGuard.follow, Decl(typeGuardOfFormThisMember.ts, 50, 60))
->guard : Symbol(guard, Decl(typeGuardOfFormThisMember.ts, 60, 4))
->follow : Symbol(GenericFollowerGuard.follow, Decl(typeGuardOfFormThisMember.ts, 50, 60))
-	}
-
-	interface SpecificGuard {
->SpecificGuard : Symbol(SpecificGuard, Decl(typeGuardOfFormThisMember.ts, 66, 2))
-
-		isMoreSpecific: this is MoreSpecificGuard;
->isMoreSpecific : Symbol(isMoreSpecific, Decl(typeGuardOfFormThisMember.ts, 68, 26))
->MoreSpecificGuard : Symbol(MoreSpecificGuard, Decl(typeGuardOfFormThisMember.ts, 70, 2))
-	}
-
-	interface MoreSpecificGuard extends SpecificGuard {
->MoreSpecificGuard : Symbol(MoreSpecificGuard, Decl(typeGuardOfFormThisMember.ts, 70, 2))
->SpecificGuard : Symbol(SpecificGuard, Decl(typeGuardOfFormThisMember.ts, 66, 2))
-
-		do(): void;
->do : Symbol(do, Decl(typeGuardOfFormThisMember.ts, 72, 52))
-	}
-
-	let general: SpecificGuard;
->general : Symbol(general, Decl(typeGuardOfFormThisMember.ts, 76, 4))
->SpecificGuard : Symbol(SpecificGuard, Decl(typeGuardOfFormThisMember.ts, 66, 2))
-
-	if (general.isMoreSpecific) {
->general.isMoreSpecific : Symbol(SpecificGuard.isMoreSpecific, Decl(typeGuardOfFormThisMember.ts, 68, 26))
->general : Symbol(general, Decl(typeGuardOfFormThisMember.ts, 76, 4))
->isMoreSpecific : Symbol(SpecificGuard.isMoreSpecific, Decl(typeGuardOfFormThisMember.ts, 68, 26))
-
-		general.do();
->general.do : Symbol(MoreSpecificGuard.do, Decl(typeGuardOfFormThisMember.ts, 72, 52))
->general : Symbol(general, Decl(typeGuardOfFormThisMember.ts, 76, 4))
->do : Symbol(MoreSpecificGuard.do, Decl(typeGuardOfFormThisMember.ts, 72, 52))
-	}
-}
-
diff --git a/tests/baselines/reference/typeGuardOfFormThisMember.types b/tests/baselines/reference/typeGuardOfFormThisMember.types
deleted file mode 100644
index 68343947fb4..00000000000
--- a/tests/baselines/reference/typeGuardOfFormThisMember.types
+++ /dev/null
@@ -1,254 +0,0 @@
-=== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMember.ts ===
-// There's a 'File' class in the stdlib, wrap with a namespace to avoid collision
-namespace Test {
->Test : typeof Test
-
-	export class FileSystemObject {
->FileSystemObject : FileSystemObject
-
-		isFSO: this is FileSystemObject;
->isFSO : this is FileSystemObject
->FileSystemObject : FileSystemObject
-
-		get isFile(): this is File {
->isFile : this is File
->File : File
-
-			return this instanceof File;
->this instanceof File : boolean
->this : this
->File : typeof File
-		}
-		set isFile(param) {
->isFile : this is File
->param : boolean
-
-			// noop
-		}
-		get isDirectory(): this is Directory {
->isDirectory : this is Directory
->Directory : Directory
-
-			return this instanceof Directory;
->this instanceof Directory : boolean
->this : this
->Directory : typeof Directory
-		}
-		isNetworked: this is (Networked & this);
->isNetworked : this is Networked & this
->Networked : Networked
-
-		constructor(public path: string) {}
->path : string
-	}
-
-	export class File extends FileSystemObject {
->File : File
->FileSystemObject : FileSystemObject
-
-		constructor(path: string, public content: string) { super(path); }
->path : string
->content : string
->super(path) : void
->super : typeof FileSystemObject
->path : string
-	}
-	export class Directory extends FileSystemObject {
->Directory : Directory
->FileSystemObject : FileSystemObject
-
-		children: FileSystemObject[];
->children : FileSystemObject[]
->FileSystemObject : FileSystemObject
-	}
-	export interface Networked {
->Networked : Networked
-
-		host: string;
->host : string
-	}
-
-	let file: FileSystemObject = new File("foo/bar.txt", "foo");
->file : FileSystemObject
->FileSystemObject : FileSystemObject
->new File("foo/bar.txt", "foo") : File
->File : typeof File
->"foo/bar.txt" : string
->"foo" : string
-
-	file.isNetworked = false;
->file.isNetworked = false : boolean
->file.isNetworked : this is Networked & FileSystemObject
->file : FileSystemObject
->isNetworked : this is Networked & FileSystemObject
->false : boolean
-
-	file.isFSO = file.isFile;
->file.isFSO = file.isFile : this is File
->file.isFSO : this is FileSystemObject
->file : FileSystemObject
->isFSO : this is FileSystemObject
->file.isFile : this is File
->file : FileSystemObject
->isFile : this is File
-
-	file.isFile = true;
->file.isFile = true : boolean
->file.isFile : this is File
->file : FileSystemObject
->isFile : this is File
->true : boolean
-
-	let x = file.isFile;
->x : boolean
->file.isFile : this is File
->file : FileSystemObject
->isFile : this is File
-
-	if (file.isFile) {
->file.isFile : this is File
->file : FileSystemObject
->isFile : this is File
-
-		file.content;
->file.content : string
->file : File
->content : string
-
-		if (file.isNetworked) {
->file.isNetworked : this is Networked & File
->file : File
->isNetworked : this is Networked & File
-
-			file.host;
->file.host : string
->file : Networked & File
->host : string
-
-			file.content;
->file.content : string
->file : Networked & File
->content : string
-		}
-	}
-	else if (file.isDirectory) {
->file.isDirectory : this is Directory
->file : FileSystemObject
->isDirectory : this is Directory
-
-		file.children;
->file.children : FileSystemObject[]
->file : Directory
->children : FileSystemObject[]
-	}
-	else if (file.isNetworked) {
->file.isNetworked : this is Networked & FileSystemObject
->file : FileSystemObject
->isNetworked : this is Networked & FileSystemObject
-
-		file.host;
->file.host : string
->file : Networked & FileSystemObject
->host : string
-	}
-	
-	interface GenericLeadGuard<T> extends GenericGuard<T> {
->GenericLeadGuard : GenericLeadGuard<T>
->T : T
->GenericGuard : GenericGuard<T>
->T : T
-
-		lead(): void;
->lead : () => void
-	}
-	
-	interface GenericFollowerGuard<T> extends GenericGuard<T> {
->GenericFollowerGuard : GenericFollowerGuard<T>
->T : T
->GenericGuard : GenericGuard<T>
->T : T
-
-		follow(): void;
->follow : () => void
-	}
-	
-	interface GenericGuard<T> {
->GenericGuard : GenericGuard<T>
->T : T
-
-		target: T;
->target : T
->T : T
-
-		isLeader: this is (GenericLeadGuard<T>);
->isLeader : this is GenericLeadGuard<T>
->GenericLeadGuard : GenericLeadGuard<T>
->T : T
-
-		isFollower: this is GenericFollowerGuard<T>;
->isFollower : this is GenericFollowerGuard<T>
->GenericFollowerGuard : GenericFollowerGuard<T>
->T : T
-	}
-
-	let guard: GenericGuard<File>;
->guard : GenericGuard<File>
->GenericGuard : GenericGuard<T>
->File : File
-
-	if (guard.isLeader) {
->guard.isLeader : this is GenericLeadGuard<File>
->guard : GenericGuard<File>
->isLeader : this is GenericLeadGuard<File>
-
-		guard.lead();
->guard.lead() : void
->guard.lead : () => void
->guard : GenericLeadGuard<File>
->lead : () => void
-	}
-	else if (guard.isFollower) {
->guard.isFollower : this is GenericFollowerGuard<File>
->guard : GenericGuard<File>
->isFollower : this is GenericFollowerGuard<File>
-
-		guard.follow();
->guard.follow() : void
->guard.follow : () => void
->guard : GenericFollowerGuard<File>
->follow : () => void
-	}
-
-	interface SpecificGuard {
->SpecificGuard : SpecificGuard
-
-		isMoreSpecific: this is MoreSpecificGuard;
->isMoreSpecific : this is MoreSpecificGuard
->MoreSpecificGuard : MoreSpecificGuard
-	}
-
-	interface MoreSpecificGuard extends SpecificGuard {
->MoreSpecificGuard : MoreSpecificGuard
->SpecificGuard : SpecificGuard
-
-		do(): void;
->do : () => void
-	}
-
-	let general: SpecificGuard;
->general : SpecificGuard
->SpecificGuard : SpecificGuard
-
-	if (general.isMoreSpecific) {
->general.isMoreSpecific : this is MoreSpecificGuard
->general : SpecificGuard
->isMoreSpecific : this is MoreSpecificGuard
-
-		general.do();
->general.do() : void
->general.do : () => void
->general : MoreSpecificGuard
->do : () => void
-	}
-}
-
diff --git a/tests/baselines/reference/typeGuardOfFormThisMemberErrors.errors.txt b/tests/baselines/reference/typeGuardOfFormThisMemberErrors.errors.txt
index 754cbffe6e6..88e9d41cc7b 100644
--- a/tests/baselines/reference/typeGuardOfFormThisMemberErrors.errors.txt
+++ b/tests/baselines/reference/typeGuardOfFormThisMemberErrors.errors.txt
@@ -1,27 +1,32 @@
-tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMemberErrors.ts(29,2): error TS1226: Type predicate 'this is File' is not assignable to 'this is Networked & FileSystemObject'.
-  Type 'File' is not assignable to type 'Networked & FileSystemObject'.
-    Type 'File' is not assignable to type 'Networked'.
-      Property 'host' is missing in type 'File'.
-tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMemberErrors.ts(31,2): error TS1226: Type predicate 'this is FileSystemObject' is not assignable to 'this is File'.
-  Type 'FileSystemObject' is not assignable to type 'File'.
-    Property 'content' is missing in type 'FileSystemObject'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMemberErrors.ts(4,10): error TS1228: A type predicate is only allowed in return type position for functions and methods.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMemberErrors.ts(5,17): error TS1228: A type predicate is only allowed in return type position for functions and methods.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMemberErrors.ts(11,22): error TS1228: A type predicate is only allowed in return type position for functions and methods.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMemberErrors.ts(14,16): error TS1228: A type predicate is only allowed in return type position for functions and methods.
 
 
-==== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMemberErrors.ts (2 errors) ====
+==== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMemberErrors.ts (4 errors) ====
     // There's a 'File' class in the stdlib, wrap with a namespace to avoid collision
     namespace Test {
     	export class FileSystemObject {
     		isFSO: this is FileSystemObject;
+    		       ~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1228: A type predicate is only allowed in return type position for functions and methods.
     		get isFile(): this is File {
+    		              ~~~~~~~~~~~~
+!!! error TS1228: A type predicate is only allowed in return type position for functions and methods.
     			return this instanceof File;
     		}
     		set isFile(param) {
     			// noop
     		}
     		get isDirectory(): this is Directory {
+    		                   ~~~~~~~~~~~~~~~~~
+!!! error TS1228: A type predicate is only allowed in return type position for functions and methods.
     			return this instanceof Directory;
     		}
     		isNetworked: this is (Networked & this);
+    		             ~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1228: A type predicate is only allowed in return type position for functions and methods.
     		constructor(public path: string) {}
     	}
     
@@ -37,15 +42,6 @@ tests/cases/conformance/expressions/typeGuards/typeGuardOfFormThisMemberErrors.t
     
     	let file: FileSystemObject = new File("foo/bar.txt", "foo");
     	file.isNetworked = file.isFile;
-    	~~~~~~~~~~~~~~~~
-!!! error TS1226: Type predicate 'this is File' is not assignable to 'this is Networked & FileSystemObject'.
-!!! error TS1226:   Type 'File' is not assignable to type 'Networked & FileSystemObject'.
-!!! error TS1226:     Type 'File' is not assignable to type 'Networked'.
-!!! error TS1226:       Property 'host' is missing in type 'File'.
     	file.isFSO = file.isNetworked;
     	file.isFile = file.isFSO;
-    	~~~~~~~~~~~
-!!! error TS1226: Type predicate 'this is FileSystemObject' is not assignable to 'this is File'.
-!!! error TS1226:   Type 'FileSystemObject' is not assignable to type 'File'.
-!!! error TS1226:     Property 'content' is missing in type 'FileSystemObject'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfBoolean.symbols b/tests/baselines/reference/typeGuardOfFormTypeOfBoolean.symbols
index 7cb38bfdeaf..d3879519228 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfBoolean.symbols
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfBoolean.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfBoolean.ts ===
 class C { private p: string };
 >C : Symbol(C, Decl(typeGuardOfFormTypeOfBoolean.ts, 0, 0))
->p : Symbol(p, Decl(typeGuardOfFormTypeOfBoolean.ts, 0, 9))
+>p : Symbol(C.p, Decl(typeGuardOfFormTypeOfBoolean.ts, 0, 9))
 
 var str: string;
 >str : Symbol(str, Decl(typeGuardOfFormTypeOfBoolean.ts, 2, 3))
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.errors.txt b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.errors.txt
new file mode 100644
index 00000000000..c76c6e819df
--- /dev/null
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.errors.txt
@@ -0,0 +1,50 @@
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts(13,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'r1' must be of type 'string', but here has type 'number'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts(20,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'r2' must be of type 'boolean', but here has type 'string'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts(27,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'r3' must be of type 'number', but here has type 'boolean'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts(34,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'r4' must be of type 'C', but here has type 'string'.
+
+
+==== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts (4 errors) ====
+    class C { private p: string };
+    
+    var strOrNum: string | number;
+    var strOrBool: string | boolean;
+    var numOrBool: number | boolean
+    var strOrC: string | C;
+    
+    // typeof x == s has not effect on typeguard
+    if (typeof strOrNum == "string") {
+        var r1 = strOrNum; // string | number
+    }
+    else {
+        var r1 = strOrNum; // string | number
+            ~~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'r1' must be of type 'string', but here has type 'number'.
+    }
+    
+    if (typeof strOrBool == "boolean") {
+        var r2 = strOrBool; // string | boolean
+    }
+    else {
+        var r2 = strOrBool; // string | boolean
+            ~~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'r2' must be of type 'boolean', but here has type 'string'.
+    }
+    
+    if (typeof numOrBool == "number") {
+        var r3 = numOrBool; // number | boolean
+    }
+    else {
+        var r3 =  numOrBool; // number | boolean
+            ~~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'r3' must be of type 'number', but here has type 'boolean'.
+    }
+    
+    if (typeof strOrC == "Object") {
+        var r4 = strOrC; // string | C
+    }
+    else {
+        var r4 = strOrC; // string | C
+            ~~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'r4' must be of type 'C', but here has type 'string'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.symbols b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.symbols
deleted file mode 100644
index 69e0dc78738..00000000000
--- a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.symbols
+++ /dev/null
@@ -1,70 +0,0 @@
-=== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts ===
-class C { private p: string };
->C : Symbol(C, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 0, 0))
->p : Symbol(p, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 0, 9))
-
-var strOrNum: string | number;
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 2, 3))
-
-var strOrBool: string | boolean;
->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 3, 3))
-
-var numOrBool: number | boolean
->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 4, 3))
-
-var strOrC: string | C;
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 5, 3))
->C : Symbol(C, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 0, 0))
-
-// typeof x == s has not effect on typeguard
-if (typeof strOrNum == "string") {
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 2, 3))
-
-    var r1 = strOrNum; // string | number
->r1 : Symbol(r1, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 9, 7), Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 12, 7))
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 2, 3))
-}
-else {
-    var r1 = strOrNum; // string | number
->r1 : Symbol(r1, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 9, 7), Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 12, 7))
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 2, 3))
-}
-
-if (typeof strOrBool == "boolean") {
->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 3, 3))
-
-    var r2 = strOrBool; // string | boolean
->r2 : Symbol(r2, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 16, 7), Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 19, 7))
->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 3, 3))
-}
-else {
-    var r2 = strOrBool; // string | boolean
->r2 : Symbol(r2, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 16, 7), Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 19, 7))
->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 3, 3))
-}
-
-if (typeof numOrBool == "number") {
->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 4, 3))
-
-    var r3 = numOrBool; // number | boolean
->r3 : Symbol(r3, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 23, 7), Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 26, 7))
->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 4, 3))
-}
-else {
-    var r3 =  numOrBool; // number | boolean
->r3 : Symbol(r3, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 23, 7), Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 26, 7))
->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 4, 3))
-}
-
-if (typeof strOrC == "Object") {
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 5, 3))
-
-    var r4 = strOrC; // string | C
->r4 : Symbol(r4, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 30, 7), Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 33, 7))
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 5, 3))
-}
-else {
-    var r4 = strOrC; // string | C
->r4 : Symbol(r4, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 30, 7), Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 33, 7))
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 5, 3))
-}
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.types b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.types
deleted file mode 100644
index 4bfc8fe6bf1..00000000000
--- a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.types
+++ /dev/null
@@ -1,82 +0,0 @@
-=== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts ===
-class C { private p: string };
->C : C
->p : string
-
-var strOrNum: string | number;
->strOrNum : string | number
-
-var strOrBool: string | boolean;
->strOrBool : string | boolean
-
-var numOrBool: number | boolean
->numOrBool : number | boolean
-
-var strOrC: string | C;
->strOrC : string | C
->C : C
-
-// typeof x == s has not effect on typeguard
-if (typeof strOrNum == "string") {
->typeof strOrNum == "string" : boolean
->typeof strOrNum : string
->strOrNum : string | number
->"string" : string
-
-    var r1 = strOrNum; // string | number
->r1 : string | number
->strOrNum : string | number
-}
-else {
-    var r1 = strOrNum; // string | number
->r1 : string | number
->strOrNum : string | number
-}
-
-if (typeof strOrBool == "boolean") {
->typeof strOrBool == "boolean" : boolean
->typeof strOrBool : string
->strOrBool : string | boolean
->"boolean" : string
-
-    var r2 = strOrBool; // string | boolean
->r2 : string | boolean
->strOrBool : string | boolean
-}
-else {
-    var r2 = strOrBool; // string | boolean
->r2 : string | boolean
->strOrBool : string | boolean
-}
-
-if (typeof numOrBool == "number") {
->typeof numOrBool == "number" : boolean
->typeof numOrBool : string
->numOrBool : number | boolean
->"number" : string
-
-    var r3 = numOrBool; // number | boolean
->r3 : number | boolean
->numOrBool : number | boolean
-}
-else {
-    var r3 =  numOrBool; // number | boolean
->r3 : number | boolean
->numOrBool : number | boolean
-}
-
-if (typeof strOrC == "Object") {
->typeof strOrC == "Object" : boolean
->typeof strOrC : string
->strOrC : string | C
->"Object" : string
-
-    var r4 = strOrC; // string | C
->r4 : string | C
->strOrC : string | C
-}
-else {
-    var r4 = strOrC; // string | C
->r4 : string | C
->strOrC : string | C
-}
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.errors.txt b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.errors.txt
new file mode 100644
index 00000000000..3b29f3ecba8
--- /dev/null
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.errors.txt
@@ -0,0 +1,50 @@
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts(13,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'r1' must be of type 'number', but here has type 'string'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts(20,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'r2' must be of type 'string', but here has type 'boolean'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts(27,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'r3' must be of type 'boolean', but here has type 'number'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts(34,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'r4' must be of type 'string', but here has type 'C'.
+
+
+==== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts (4 errors) ====
+    class C { private p: string };
+    
+    var strOrNum: string | number;
+    var strOrBool: string | boolean;
+    var numOrBool: number | boolean
+    var strOrC: string | C;
+    
+    // typeof x != s has not effect on typeguard
+    if (typeof strOrNum != "string") {
+        var r1 = strOrNum; // string | number
+    }
+    else {
+        var r1 = strOrNum; // string | number
+            ~~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'r1' must be of type 'number', but here has type 'string'.
+    }
+    
+    if (typeof strOrBool != "boolean") {
+        var r2 = strOrBool; // string | boolean
+    }
+    else {
+        var r2 = strOrBool; // string | boolean
+            ~~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'r2' must be of type 'string', but here has type 'boolean'.
+    }
+    
+    if (typeof numOrBool != "number") {
+        var r3 = numOrBool; // number | boolean
+    }
+    else {
+        var r3 = numOrBool; // number | boolean
+            ~~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'r3' must be of type 'boolean', but here has type 'number'.
+    }
+    
+    if (typeof strOrC != "Object") {
+        var r4 = strOrC; // string | C
+    }
+    else {
+        var r4 = strOrC; // string | C
+            ~~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'r4' must be of type 'string', but here has type 'C'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.symbols b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.symbols
deleted file mode 100644
index b22f1e313a4..00000000000
--- a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.symbols
+++ /dev/null
@@ -1,70 +0,0 @@
-=== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts ===
-class C { private p: string };
->C : Symbol(C, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 0, 0))
->p : Symbol(p, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 0, 9))
-
-var strOrNum: string | number;
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 2, 3))
-
-var strOrBool: string | boolean;
->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 3, 3))
-
-var numOrBool: number | boolean
->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 4, 3))
-
-var strOrC: string | C;
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 5, 3))
->C : Symbol(C, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 0, 0))
-
-// typeof x != s has not effect on typeguard
-if (typeof strOrNum != "string") {
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 2, 3))
-
-    var r1 = strOrNum; // string | number
->r1 : Symbol(r1, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 9, 7), Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 12, 7))
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 2, 3))
-}
-else {
-    var r1 = strOrNum; // string | number
->r1 : Symbol(r1, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 9, 7), Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 12, 7))
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 2, 3))
-}
-
-if (typeof strOrBool != "boolean") {
->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 3, 3))
-
-    var r2 = strOrBool; // string | boolean
->r2 : Symbol(r2, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 16, 7), Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 19, 7))
->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 3, 3))
-}
-else {
-    var r2 = strOrBool; // string | boolean
->r2 : Symbol(r2, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 16, 7), Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 19, 7))
->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 3, 3))
-}
-
-if (typeof numOrBool != "number") {
->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 4, 3))
-
-    var r3 = numOrBool; // number | boolean
->r3 : Symbol(r3, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 23, 7), Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 26, 7))
->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 4, 3))
-}
-else {
-    var r3 = numOrBool; // number | boolean
->r3 : Symbol(r3, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 23, 7), Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 26, 7))
->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 4, 3))
-}
-
-if (typeof strOrC != "Object") {
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 5, 3))
-
-    var r4 = strOrC; // string | C
->r4 : Symbol(r4, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 30, 7), Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 33, 7))
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 5, 3))
-}
-else {
-    var r4 = strOrC; // string | C
->r4 : Symbol(r4, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 30, 7), Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 33, 7))
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 5, 3))
-}
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.types b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.types
deleted file mode 100644
index 6eabeb25ede..00000000000
--- a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.types
+++ /dev/null
@@ -1,82 +0,0 @@
-=== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts ===
-class C { private p: string };
->C : C
->p : string
-
-var strOrNum: string | number;
->strOrNum : string | number
-
-var strOrBool: string | boolean;
->strOrBool : string | boolean
-
-var numOrBool: number | boolean
->numOrBool : number | boolean
-
-var strOrC: string | C;
->strOrC : string | C
->C : C
-
-// typeof x != s has not effect on typeguard
-if (typeof strOrNum != "string") {
->typeof strOrNum != "string" : boolean
->typeof strOrNum : string
->strOrNum : string | number
->"string" : string
-
-    var r1 = strOrNum; // string | number
->r1 : string | number
->strOrNum : string | number
-}
-else {
-    var r1 = strOrNum; // string | number
->r1 : string | number
->strOrNum : string | number
-}
-
-if (typeof strOrBool != "boolean") {
->typeof strOrBool != "boolean" : boolean
->typeof strOrBool : string
->strOrBool : string | boolean
->"boolean" : string
-
-    var r2 = strOrBool; // string | boolean
->r2 : string | boolean
->strOrBool : string | boolean
-}
-else {
-    var r2 = strOrBool; // string | boolean
->r2 : string | boolean
->strOrBool : string | boolean
-}
-
-if (typeof numOrBool != "number") {
->typeof numOrBool != "number" : boolean
->typeof numOrBool : string
->numOrBool : number | boolean
->"number" : string
-
-    var r3 = numOrBool; // number | boolean
->r3 : number | boolean
->numOrBool : number | boolean
-}
-else {
-    var r3 = numOrBool; // number | boolean
->r3 : number | boolean
->numOrBool : number | boolean
-}
-
-if (typeof strOrC != "Object") {
->typeof strOrC != "Object" : boolean
->typeof strOrC : string
->strOrC : string | C
->"Object" : string
-
-    var r4 = strOrC; // string | C
->r4 : string | C
->strOrC : string | C
-}
-else {
-    var r4 = strOrC; // string | C
->r4 : string | C
->strOrC : string | C
-}
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfNumber.symbols b/tests/baselines/reference/typeGuardOfFormTypeOfNumber.symbols
index 0052fb90880..2fd48389ae8 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfNumber.symbols
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfNumber.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNumber.ts ===
 class C { private p: string };
 >C : Symbol(C, Decl(typeGuardOfFormTypeOfNumber.ts, 0, 0))
->p : Symbol(p, Decl(typeGuardOfFormTypeOfNumber.ts, 0, 9))
+>p : Symbol(C.p, Decl(typeGuardOfFormTypeOfNumber.ts, 0, 9))
 
 var str: string;
 >str : Symbol(str, Decl(typeGuardOfFormTypeOfNumber.ts, 2, 3))
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfOther.symbols b/tests/baselines/reference/typeGuardOfFormTypeOfOther.symbols
index eb120d468dc..ba759871a9b 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfOther.symbols
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfOther.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfOther.ts ===
 class C { private p: string };
 >C : Symbol(C, Decl(typeGuardOfFormTypeOfOther.ts, 0, 0))
->p : Symbol(p, Decl(typeGuardOfFormTypeOfOther.ts, 0, 9))
+>p : Symbol(C.p, Decl(typeGuardOfFormTypeOfOther.ts, 0, 9))
 
 var str: string;
 >str : Symbol(str, Decl(typeGuardOfFormTypeOfOther.ts, 2, 3))
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfString.symbols b/tests/baselines/reference/typeGuardOfFormTypeOfString.symbols
index 54684f715a4..d3209189f83 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfString.symbols
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfString.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfString.ts ===
 class C { private p: string };
 >C : Symbol(C, Decl(typeGuardOfFormTypeOfString.ts, 0, 0))
->p : Symbol(p, Decl(typeGuardOfFormTypeOfString.ts, 0, 9))
+>p : Symbol(C.p, Decl(typeGuardOfFormTypeOfString.ts, 0, 9))
 
 var str: string;
 >str : Symbol(str, Decl(typeGuardOfFormTypeOfString.ts, 2, 3))
diff --git a/tests/baselines/reference/typeGuardsDefeat.errors.txt b/tests/baselines/reference/typeGuardsDefeat.errors.txt
new file mode 100644
index 00000000000..d4006711d45
--- /dev/null
+++ b/tests/baselines/reference/typeGuardsDefeat.errors.txt
@@ -0,0 +1,52 @@
+tests/cases/conformance/expressions/typeGuards/typeGuardsDefeat.ts(21,20): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/expressions/typeGuards/typeGuardsDefeat.ts(21,24): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/expressions/typeGuards/typeGuardsDefeat.ts(32,23): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+tests/cases/conformance/expressions/typeGuards/typeGuardsDefeat.ts(32,27): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+
+
+==== tests/cases/conformance/expressions/typeGuards/typeGuardsDefeat.ts (4 errors) ====
+    // Also note that it is possible to defeat a type guard by calling a function that changes the 
+    // type of the guarded variable.
+    function foo(x: number | string) {
+        function f() {
+            x = 10;
+        }
+        if (typeof x === "string") {
+            f();
+            return x.length; // string
+        }
+        else {
+            return x++; // number
+        }
+    }
+    function foo2(x: number | string) {
+        if (typeof x === "string") {
+            return x.length; // string
+        }
+        else {
+            var f = function () {
+                return x * x;
+                       ~
+!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+                           ~
+!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+            };
+        }
+        x = "hello";
+        f();
+    }
+    function foo3(x: number | string) {
+        if (typeof x === "string") {
+            return x.length; // string
+        }
+        else {
+            var f = () => x * x;
+                          ~
+!!! error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+                              ~
+!!! error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+        }
+        x = "hello";
+        f();
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/typeGuardsDefeat.symbols b/tests/baselines/reference/typeGuardsDefeat.symbols
deleted file mode 100644
index 388b69b5789..00000000000
--- a/tests/baselines/reference/typeGuardsDefeat.symbols
+++ /dev/null
@@ -1,82 +0,0 @@
-=== tests/cases/conformance/expressions/typeGuards/typeGuardsDefeat.ts ===
-// Also note that it is possible to defeat a type guard by calling a function that changes the 
-// type of the guarded variable.
-function foo(x: number | string) {
->foo : Symbol(foo, Decl(typeGuardsDefeat.ts, 0, 0))
->x : Symbol(x, Decl(typeGuardsDefeat.ts, 2, 13))
-
-    function f() {
->f : Symbol(f, Decl(typeGuardsDefeat.ts, 2, 34))
-
-        x = 10;
->x : Symbol(x, Decl(typeGuardsDefeat.ts, 2, 13))
-    }
-    if (typeof x === "string") {
->x : Symbol(x, Decl(typeGuardsDefeat.ts, 2, 13))
-
-        f();
->f : Symbol(f, Decl(typeGuardsDefeat.ts, 2, 34))
-
-        return x.length; // string
->x.length : Symbol(String.length, Decl(lib.d.ts, --, --))
->x : Symbol(x, Decl(typeGuardsDefeat.ts, 2, 13))
->length : Symbol(String.length, Decl(lib.d.ts, --, --))
-    }
-    else {
-        return x++; // number
->x : Symbol(x, Decl(typeGuardsDefeat.ts, 2, 13))
-    }
-}
-function foo2(x: number | string) {
->foo2 : Symbol(foo2, Decl(typeGuardsDefeat.ts, 13, 1))
->x : Symbol(x, Decl(typeGuardsDefeat.ts, 14, 14))
-
-    if (typeof x === "string") {
->x : Symbol(x, Decl(typeGuardsDefeat.ts, 14, 14))
-
-        return x.length; // string
->x.length : Symbol(String.length, Decl(lib.d.ts, --, --))
->x : Symbol(x, Decl(typeGuardsDefeat.ts, 14, 14))
->length : Symbol(String.length, Decl(lib.d.ts, --, --))
-    }
-    else {
-        var f = function () {
->f : Symbol(f, Decl(typeGuardsDefeat.ts, 19, 11))
-
-            return x * x;
->x : Symbol(x, Decl(typeGuardsDefeat.ts, 14, 14))
->x : Symbol(x, Decl(typeGuardsDefeat.ts, 14, 14))
-
-        };
-    }
-    x = "hello";
->x : Symbol(x, Decl(typeGuardsDefeat.ts, 14, 14))
-
-    f();
->f : Symbol(f, Decl(typeGuardsDefeat.ts, 19, 11))
-}
-function foo3(x: number | string) {
->foo3 : Symbol(foo3, Decl(typeGuardsDefeat.ts, 25, 1))
->x : Symbol(x, Decl(typeGuardsDefeat.ts, 26, 14))
-
-    if (typeof x === "string") {
->x : Symbol(x, Decl(typeGuardsDefeat.ts, 26, 14))
-
-        return x.length; // string
->x.length : Symbol(String.length, Decl(lib.d.ts, --, --))
->x : Symbol(x, Decl(typeGuardsDefeat.ts, 26, 14))
->length : Symbol(String.length, Decl(lib.d.ts, --, --))
-    }
-    else {
-        var f = () => x * x;
->f : Symbol(f, Decl(typeGuardsDefeat.ts, 31, 11))
->x : Symbol(x, Decl(typeGuardsDefeat.ts, 26, 14))
->x : Symbol(x, Decl(typeGuardsDefeat.ts, 26, 14))
-    }
-    x = "hello";
->x : Symbol(x, Decl(typeGuardsDefeat.ts, 26, 14))
-
-    f();
->f : Symbol(f, Decl(typeGuardsDefeat.ts, 31, 11))
-}
-
diff --git a/tests/baselines/reference/typeGuardsDefeat.types b/tests/baselines/reference/typeGuardsDefeat.types
deleted file mode 100644
index cc655d3ce0f..00000000000
--- a/tests/baselines/reference/typeGuardsDefeat.types
+++ /dev/null
@@ -1,105 +0,0 @@
-=== tests/cases/conformance/expressions/typeGuards/typeGuardsDefeat.ts ===
-// Also note that it is possible to defeat a type guard by calling a function that changes the 
-// type of the guarded variable.
-function foo(x: number | string) {
->foo : (x: number | string) => number
->x : number | string
-
-    function f() {
->f : () => void
-
-        x = 10;
->x = 10 : number
->x : number | string
->10 : number
-    }
-    if (typeof x === "string") {
->typeof x === "string" : boolean
->typeof x : string
->x : number | string
->"string" : string
-
-        f();
->f() : void
->f : () => void
-
-        return x.length; // string
->x.length : number
->x : string
->length : number
-    }
-    else {
-        return x++; // number
->x++ : number
->x : number
-    }
-}
-function foo2(x: number | string) {
->foo2 : (x: number | string) => number
->x : number | string
-
-    if (typeof x === "string") {
->typeof x === "string" : boolean
->typeof x : string
->x : number | string
->"string" : string
-
-        return x.length; // string
->x.length : number
->x : string
->length : number
-    }
-    else {
-        var f = function () {
->f : () => number
->function () {            return x * x;        } : () => number
-
-            return x * x;
->x * x : number
->x : number
->x : number
-
-        };
-    }
-    x = "hello";
->x = "hello" : string
->x : number | string
->"hello" : string
-
-    f();
->f() : number
->f : () => number
-}
-function foo3(x: number | string) {
->foo3 : (x: number | string) => number
->x : number | string
-
-    if (typeof x === "string") {
->typeof x === "string" : boolean
->typeof x : string
->x : number | string
->"string" : string
-
-        return x.length; // string
->x.length : number
->x : string
->length : number
-    }
-    else {
-        var f = () => x * x;
->f : () => number
->() => x * x : () => number
->x * x : number
->x : number
->x : number
-    }
-    x = "hello";
->x = "hello" : string
->x : number | string
->"hello" : string
-
-    f();
->f() : number
->f : () => number
-}
-
diff --git a/tests/baselines/reference/typeGuardsInClassAccessors.symbols b/tests/baselines/reference/typeGuardsInClassAccessors.symbols
index d38c3040e01..5f28ed4498c 100644
--- a/tests/baselines/reference/typeGuardsInClassAccessors.symbols
+++ b/tests/baselines/reference/typeGuardsInClassAccessors.symbols
@@ -18,7 +18,7 @@ class ClassWithAccessors {
 
     // Inside public accessor getter
     get p1() {
->p1 : Symbol(p1, Decl(typeGuardsInClassAccessors.ts, 8, 26), Decl(typeGuardsInClassAccessors.ts, 19, 5))
+>p1 : Symbol(ClassWithAccessors.p1, Decl(typeGuardsInClassAccessors.ts, 8, 26), Decl(typeGuardsInClassAccessors.ts, 19, 5))
 
         // global vars in function declaration
         num = typeof var1 === "string" && var1.length; // string
@@ -44,7 +44,7 @@ class ClassWithAccessors {
     }
     // Inside public accessor setter
     set p1(param: string | number) {
->p1 : Symbol(p1, Decl(typeGuardsInClassAccessors.ts, 8, 26), Decl(typeGuardsInClassAccessors.ts, 19, 5))
+>p1 : Symbol(ClassWithAccessors.p1, Decl(typeGuardsInClassAccessors.ts, 8, 26), Decl(typeGuardsInClassAccessors.ts, 19, 5))
 >param : Symbol(param, Decl(typeGuardsInClassAccessors.ts, 21, 11))
 
         // global vars in function declaration
@@ -76,7 +76,7 @@ class ClassWithAccessors {
     }
     // Inside private accessor getter
     private get pp1() {
->pp1 : Symbol(pp1, Decl(typeGuardsInClassAccessors.ts, 31, 5), Decl(typeGuardsInClassAccessors.ts, 42, 5))
+>pp1 : Symbol(ClassWithAccessors.pp1, Decl(typeGuardsInClassAccessors.ts, 31, 5), Decl(typeGuardsInClassAccessors.ts, 42, 5))
 
         // global vars in function declaration
         num = typeof var1 === "string" && var1.length; // string
@@ -102,7 +102,7 @@ class ClassWithAccessors {
     }
     // Inside private accessor setter
     private set pp1(param: string | number) {
->pp1 : Symbol(pp1, Decl(typeGuardsInClassAccessors.ts, 31, 5), Decl(typeGuardsInClassAccessors.ts, 42, 5))
+>pp1 : Symbol(ClassWithAccessors.pp1, Decl(typeGuardsInClassAccessors.ts, 31, 5), Decl(typeGuardsInClassAccessors.ts, 42, 5))
 >param : Symbol(param, Decl(typeGuardsInClassAccessors.ts, 44, 20))
 
         // global vars in function declaration
diff --git a/tests/baselines/reference/typeGuardsInClassMethods.symbols b/tests/baselines/reference/typeGuardsInClassMethods.symbols
index 30f01d3619f..1808b97be47 100644
--- a/tests/baselines/reference/typeGuardsInClassMethods.symbols
+++ b/tests/baselines/reference/typeGuardsInClassMethods.symbols
@@ -44,7 +44,7 @@ class C1 {
     }
     // Inside function declaration
     private p1(param: string | number) {
->p1 : Symbol(p1, Decl(typeGuardsInClassMethods.ts, 17, 5))
+>p1 : Symbol(C1.p1, Decl(typeGuardsInClassMethods.ts, 17, 5))
 >param : Symbol(param, Decl(typeGuardsInClassMethods.ts, 19, 15))
 
         // global vars in function declaration
@@ -76,7 +76,7 @@ class C1 {
     }
     // Inside function declaration
     p2(param: string | number) {
->p2 : Symbol(p2, Decl(typeGuardsInClassMethods.ts, 29, 5))
+>p2 : Symbol(C1.p2, Decl(typeGuardsInClassMethods.ts, 29, 5))
 >param : Symbol(param, Decl(typeGuardsInClassMethods.ts, 31, 7))
 
         // global vars in function declaration
diff --git a/tests/baselines/reference/typeGuardsInExternalModule.types b/tests/baselines/reference/typeGuardsInExternalModule.types
index e20063719f5..940e7db831a 100644
--- a/tests/baselines/reference/typeGuardsInExternalModule.types
+++ b/tests/baselines/reference/typeGuardsInExternalModule.types
@@ -44,13 +44,13 @@ if (typeof var2 === "string") {
 
     // export makes the var property and not variable
     strOrNum = var2; // string | number
->strOrNum = var2 : string | number
+>strOrNum = var2 : string
 >strOrNum : string | number
->var2 : string | number
+>var2 : string
 }
 else {
     strOrNum = var2; // number | string
->strOrNum = var2 : string | number
+>strOrNum = var2 : number
 >strOrNum : string | number
->var2 : string | number
+>var2 : number
 }
diff --git a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.symbols b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.symbols
index 34810f303db..bf21641624e 100644
--- a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.symbols
+++ b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.symbols
@@ -27,9 +27,9 @@ function foo(x: number | string | boolean) {
 >toString : Symbol(Object.toString, Decl(lib.d.ts, --, --))
 
                 : x.toString(); // number
->x.toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+>x.toString : Symbol(toString, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(typeGuardsInFunctionAndModuleBlock.ts, 2, 13))
->toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+>toString : Symbol(toString, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
         } ();
 }
@@ -60,9 +60,9 @@ function foo2(x: number | string | boolean) {
 >toString : Symbol(Object.toString, Decl(lib.d.ts, --, --))
 
                 : x.toString(); // number
->x.toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+>x.toString : Symbol(toString, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(typeGuardsInFunctionAndModuleBlock.ts, 12, 14))
->toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+>toString : Symbol(toString, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
         } (x); // x here is narrowed to number | boolean
 >x : Symbol(x, Decl(typeGuardsInFunctionAndModuleBlock.ts, 12, 14))
@@ -91,9 +91,9 @@ function foo3(x: number | string | boolean) {
 >toString : Symbol(Object.toString, Decl(lib.d.ts, --, --))
 
                 : x.toString(); // number
->x.toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+>x.toString : Symbol(toString, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(typeGuardsInFunctionAndModuleBlock.ts, 22, 14))
->toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+>toString : Symbol(toString, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
         })();
 }
@@ -123,9 +123,9 @@ function foo4(x: number | string | boolean) {
 >toString : Symbol(Object.toString, Decl(lib.d.ts, --, --))
 
                 : x.toString(); // number
->x.toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+>x.toString : Symbol(toString, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(typeGuardsInFunctionAndModuleBlock.ts, 32, 14))
->toString : Symbol(Number.toString, Decl(lib.d.ts, --, --))
+>toString : Symbol(toString, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
         })(x); // x here is narrowed to number | boolean
 >x : Symbol(x, Decl(typeGuardsInFunctionAndModuleBlock.ts, 32, 14))
diff --git a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.types b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.types
index f7d56ed17d1..67d1816cfc3 100644
--- a/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.types
+++ b/tests/baselines/reference/typeGuardsInFunctionAndModuleBlock.types
@@ -21,14 +21,14 @@ function foo(x: number | string | boolean) {
 >f : () => string
 
             var b = x; // number | boolean
->b : number | boolean
->x : number | boolean
+>b : number | string | boolean
+>x : number | string | boolean
 
             return typeof x === "boolean"
 >typeof x === "boolean"                ? x.toString() // boolean                : x.toString() : string
 >typeof x === "boolean" : boolean
 >typeof x : string
->x : number | boolean
+>x : number | string | boolean
 >"boolean" : string
 
                 ? x.toString() // boolean
@@ -40,7 +40,7 @@ function foo(x: number | string | boolean) {
                 : x.toString(); // number
 >x.toString() : string
 >x.toString : (radix?: number) => string
->x : number
+>x : number | string
 >toString : (radix?: number) => string
 
         } ();
@@ -66,14 +66,14 @@ function foo2(x: number | string | boolean) {
 >a : number | boolean
 
             var b = x; // new scope - number | boolean
->b : number | boolean
->x : number | boolean
+>b : number | string | boolean
+>x : number | string | boolean
 
             return typeof x === "boolean"
 >typeof x === "boolean"                ? x.toString() // boolean                : x.toString() : string
 >typeof x === "boolean" : boolean
 >typeof x : string
->x : number | boolean
+>x : number | string | boolean
 >"boolean" : string
 
                 ? x.toString() // boolean
@@ -85,7 +85,7 @@ function foo2(x: number | string | boolean) {
                 : x.toString(); // number
 >x.toString() : string
 >x.toString : (radix?: number) => string
->x : number
+>x : number | string
 >toString : (radix?: number) => string
 
         } (x); // x here is narrowed to number | boolean
@@ -111,14 +111,14 @@ function foo3(x: number | string | boolean) {
 >() => {            var b = x; // new scope - number | boolean            return typeof x === "boolean"                ? x.toString() // boolean                : x.toString(); // number        } : () => string
 
             var b = x; // new scope - number | boolean
->b : number | boolean
->x : number | boolean
+>b : number | string | boolean
+>x : number | string | boolean
 
             return typeof x === "boolean"
 >typeof x === "boolean"                ? x.toString() // boolean                : x.toString() : string
 >typeof x === "boolean" : boolean
 >typeof x : string
->x : number | boolean
+>x : number | string | boolean
 >"boolean" : string
 
                 ? x.toString() // boolean
@@ -130,7 +130,7 @@ function foo3(x: number | string | boolean) {
                 : x.toString(); // number
 >x.toString() : string
 >x.toString : (radix?: number) => string
->x : number
+>x : number | string
 >toString : (radix?: number) => string
 
         })();
@@ -156,14 +156,14 @@ function foo4(x: number | string | boolean) {
 >a : number | boolean
 
             var b = x; // new scope - number | boolean
->b : number | boolean
->x : number | boolean
+>b : number | string | boolean
+>x : number | string | boolean
 
             return typeof x === "boolean"
 >typeof x === "boolean"                ? x.toString() // boolean                : x.toString() : string
 >typeof x === "boolean" : boolean
 >typeof x : string
->x : number | boolean
+>x : number | string | boolean
 >"boolean" : string
 
                 ? x.toString() // boolean
@@ -175,7 +175,7 @@ function foo4(x: number | string | boolean) {
                 : x.toString(); // number
 >x.toString() : string
 >x.toString : (radix?: number) => string
->x : number
+>x : number | string
 >toString : (radix?: number) => string
 
         })(x); // x here is narrowed to number | boolean
@@ -200,8 +200,8 @@ function foo5(x: number | string | boolean) {
 >foo : () => void
 
             var z = x; // string
->z : string
->x : string
+>z : number | string | boolean
+>x : number | string | boolean
         }
     }
 }
diff --git a/tests/baselines/reference/typeGuardsInModule.types b/tests/baselines/reference/typeGuardsInModule.types
index 6b6c552f0cc..7d3753037ad 100644
--- a/tests/baselines/reference/typeGuardsInModule.types
+++ b/tests/baselines/reference/typeGuardsInModule.types
@@ -64,15 +64,15 @@ module m1 {
 >"string" : string
 
         strOrNum = var3; // string | number
->strOrNum = var3 : string | number
+>strOrNum = var3 : string
 >strOrNum : string | number
->var3 : string | number
+>var3 : string
     }
     else {
         strOrNum = var3; // string | number
->strOrNum = var3 : string | number
+>strOrNum = var3 : number
 >strOrNum : string | number
->var3 : string | number
+>var3 : number
     }
 }
 // local module
@@ -116,14 +116,14 @@ module m2 {
 
         // exported variable from outer the module
         strOrNum = typeof var3 === "string" && var3; // string | number
->strOrNum = typeof var3 === "string" && var3 : string | number
+>strOrNum = typeof var3 === "string" && var3 : string
 >strOrNum : string | number
->typeof var3 === "string" && var3 : string | number
+>typeof var3 === "string" && var3 : string
 >typeof var3 === "string" : boolean
 >typeof var3 : string
 >var3 : string | number
 >"string" : string
->var3 : string | number
+>var3 : string
 
         // variables in module declaration
         var var4: string | number;
@@ -160,15 +160,15 @@ module m2 {
 >"string" : string
 
             strOrNum = var5; // string | number
->strOrNum = var5 : string | number
+>strOrNum = var5 : string
 >strOrNum : string | number
->var5 : string | number
+>var5 : string
         }
         else {
             strOrNum = var5; // string | number
->strOrNum = var5 : string | number
+>strOrNum = var5 : number
 >strOrNum : string | number
->var5 : string | number
+>var5 : number
         }
     }
 }
@@ -225,15 +225,15 @@ module m3.m4 {
 >"string" : string
 
         strOrNum = var3; // string | number
->strOrNum = var3 : string | number
+>strOrNum = var3 : string
 >strOrNum : string | number
->var3 : string | number
+>var3 : string
     }
     else {
         strOrNum = var3; // string | number
->strOrNum = var3 : string | number
+>strOrNum = var3 : number
 >strOrNum : string | number
->var3 : string | number
+>var3 : number
     }
 }
 
diff --git a/tests/baselines/reference/typeGuardsInProperties.symbols b/tests/baselines/reference/typeGuardsInProperties.symbols
index 61a4a9c2fdb..86faad794fe 100644
--- a/tests/baselines/reference/typeGuardsInProperties.symbols
+++ b/tests/baselines/reference/typeGuardsInProperties.symbols
@@ -13,47 +13,47 @@ class C1 {
 >C1 : Symbol(C1, Decl(typeGuardsInProperties.ts, 5, 30))
 
     private pp1: string | number;
->pp1 : Symbol(pp1, Decl(typeGuardsInProperties.ts, 6, 10))
+>pp1 : Symbol(C1.pp1, Decl(typeGuardsInProperties.ts, 6, 10))
 
     pp2: string | number;
->pp2 : Symbol(pp2, Decl(typeGuardsInProperties.ts, 7, 33))
+>pp2 : Symbol(C1.pp2, Decl(typeGuardsInProperties.ts, 7, 33))
 
     // Inside public accessor getter
     get pp3() {
->pp3 : Symbol(pp3, Decl(typeGuardsInProperties.ts, 8, 25))
+>pp3 : Symbol(C1.pp3, Decl(typeGuardsInProperties.ts, 8, 25))
 
         return strOrNum;
 >strOrNum : Symbol(strOrNum, Decl(typeGuardsInProperties.ts, 5, 3))
     }
     method() {
->method : Symbol(method, Decl(typeGuardsInProperties.ts, 12, 5))
+>method : Symbol(C1.method, Decl(typeGuardsInProperties.ts, 12, 5))
 
         strOrNum = typeof this.pp1 === "string" && this.pp1; // string | number
 >strOrNum : Symbol(strOrNum, Decl(typeGuardsInProperties.ts, 5, 3))
->this.pp1 : Symbol(pp1, Decl(typeGuardsInProperties.ts, 6, 10))
+>this.pp1 : Symbol(C1.pp1, Decl(typeGuardsInProperties.ts, 6, 10))
 >this : Symbol(C1, Decl(typeGuardsInProperties.ts, 5, 30))
->pp1 : Symbol(pp1, Decl(typeGuardsInProperties.ts, 6, 10))
->this.pp1 : Symbol(pp1, Decl(typeGuardsInProperties.ts, 6, 10))
+>pp1 : Symbol(C1.pp1, Decl(typeGuardsInProperties.ts, 6, 10))
+>this.pp1 : Symbol(C1.pp1, Decl(typeGuardsInProperties.ts, 6, 10))
 >this : Symbol(C1, Decl(typeGuardsInProperties.ts, 5, 30))
->pp1 : Symbol(pp1, Decl(typeGuardsInProperties.ts, 6, 10))
+>pp1 : Symbol(C1.pp1, Decl(typeGuardsInProperties.ts, 6, 10))
 
         strOrNum = typeof this.pp2 === "string" && this.pp2; // string | number
 >strOrNum : Symbol(strOrNum, Decl(typeGuardsInProperties.ts, 5, 3))
->this.pp2 : Symbol(pp2, Decl(typeGuardsInProperties.ts, 7, 33))
+>this.pp2 : Symbol(C1.pp2, Decl(typeGuardsInProperties.ts, 7, 33))
 >this : Symbol(C1, Decl(typeGuardsInProperties.ts, 5, 30))
->pp2 : Symbol(pp2, Decl(typeGuardsInProperties.ts, 7, 33))
->this.pp2 : Symbol(pp2, Decl(typeGuardsInProperties.ts, 7, 33))
+>pp2 : Symbol(C1.pp2, Decl(typeGuardsInProperties.ts, 7, 33))
+>this.pp2 : Symbol(C1.pp2, Decl(typeGuardsInProperties.ts, 7, 33))
 >this : Symbol(C1, Decl(typeGuardsInProperties.ts, 5, 30))
->pp2 : Symbol(pp2, Decl(typeGuardsInProperties.ts, 7, 33))
+>pp2 : Symbol(C1.pp2, Decl(typeGuardsInProperties.ts, 7, 33))
 
         strOrNum = typeof this.pp3 === "string" && this.pp3; // string | number
 >strOrNum : Symbol(strOrNum, Decl(typeGuardsInProperties.ts, 5, 3))
->this.pp3 : Symbol(pp3, Decl(typeGuardsInProperties.ts, 8, 25))
+>this.pp3 : Symbol(C1.pp3, Decl(typeGuardsInProperties.ts, 8, 25))
 >this : Symbol(C1, Decl(typeGuardsInProperties.ts, 5, 30))
->pp3 : Symbol(pp3, Decl(typeGuardsInProperties.ts, 8, 25))
->this.pp3 : Symbol(pp3, Decl(typeGuardsInProperties.ts, 8, 25))
+>pp3 : Symbol(C1.pp3, Decl(typeGuardsInProperties.ts, 8, 25))
+>this.pp3 : Symbol(C1.pp3, Decl(typeGuardsInProperties.ts, 8, 25))
 >this : Symbol(C1, Decl(typeGuardsInProperties.ts, 5, 30))
->pp3 : Symbol(pp3, Decl(typeGuardsInProperties.ts, 8, 25))
+>pp3 : Symbol(C1.pp3, Decl(typeGuardsInProperties.ts, 8, 25))
     }
 }
 var c1: C1;
diff --git a/tests/baselines/reference/typeGuardsInProperties.types b/tests/baselines/reference/typeGuardsInProperties.types
index ca4d8b94527..ef4cfbb5b05 100644
--- a/tests/baselines/reference/typeGuardsInProperties.types
+++ b/tests/baselines/reference/typeGuardsInProperties.types
@@ -29,32 +29,32 @@ class C1 {
 >method : () => void
 
         strOrNum = typeof this.pp1 === "string" && this.pp1; // string | number
->strOrNum = typeof this.pp1 === "string" && this.pp1 : string | number
+>strOrNum = typeof this.pp1 === "string" && this.pp1 : string
 >strOrNum : string | number
->typeof this.pp1 === "string" && this.pp1 : string | number
+>typeof this.pp1 === "string" && this.pp1 : string
 >typeof this.pp1 === "string" : boolean
 >typeof this.pp1 : string
 >this.pp1 : string | number
 >this : this
 >pp1 : string | number
 >"string" : string
->this.pp1 : string | number
+>this.pp1 : string
 >this : this
->pp1 : string | number
+>pp1 : string
 
         strOrNum = typeof this.pp2 === "string" && this.pp2; // string | number
->strOrNum = typeof this.pp2 === "string" && this.pp2 : string | number
+>strOrNum = typeof this.pp2 === "string" && this.pp2 : string
 >strOrNum : string | number
->typeof this.pp2 === "string" && this.pp2 : string | number
+>typeof this.pp2 === "string" && this.pp2 : string
 >typeof this.pp2 === "string" : boolean
 >typeof this.pp2 : string
 >this.pp2 : string | number
 >this : this
 >pp2 : string | number
 >"string" : string
->this.pp2 : string | number
+>this.pp2 : string
 >this : this
->pp2 : string | number
+>pp2 : string
 
         strOrNum = typeof this.pp3 === "string" && this.pp3; // string | number
 >strOrNum = typeof this.pp3 === "string" && this.pp3 : string | number
@@ -76,18 +76,18 @@ var c1: C1;
 >C1 : C1
 
 strOrNum = typeof c1.pp2 === "string" && c1.pp2; // string | number
->strOrNum = typeof c1.pp2 === "string" && c1.pp2 : string | number
+>strOrNum = typeof c1.pp2 === "string" && c1.pp2 : string
 >strOrNum : string | number
->typeof c1.pp2 === "string" && c1.pp2 : string | number
+>typeof c1.pp2 === "string" && c1.pp2 : string
 >typeof c1.pp2 === "string" : boolean
 >typeof c1.pp2 : string
 >c1.pp2 : string | number
 >c1 : C1
 >pp2 : string | number
 >"string" : string
->c1.pp2 : string | number
+>c1.pp2 : string
 >c1 : C1
->pp2 : string | number
+>pp2 : string
 
 strOrNum = typeof c1.pp3 === "string" && c1.pp3; // string | number
 >strOrNum = typeof c1.pp3 === "string" && c1.pp3 : string | number
@@ -111,16 +111,16 @@ var obj1: {
 
 };
 strOrNum = typeof obj1.x === "string" && obj1.x;  // string | number
->strOrNum = typeof obj1.x === "string" && obj1.x : string | number
+>strOrNum = typeof obj1.x === "string" && obj1.x : string
 >strOrNum : string | number
->typeof obj1.x === "string" && obj1.x : string | number
+>typeof obj1.x === "string" && obj1.x : string
 >typeof obj1.x === "string" : boolean
 >typeof obj1.x : string
 >obj1.x : string | number
 >obj1 : { x: string | number; }
 >x : string | number
 >"string" : string
->obj1.x : string | number
+>obj1.x : string
 >obj1 : { x: string | number; }
->x : string | number
+>x : string
 
diff --git a/tests/baselines/reference/typeGuardsOnClassProperty.errors.txt b/tests/baselines/reference/typeGuardsOnClassProperty.errors.txt
deleted file mode 100644
index 91d6d6998bc..00000000000
--- a/tests/baselines/reference/typeGuardsOnClassProperty.errors.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-tests/cases/conformance/expressions/typeGuards/typeGuardsOnClassProperty.ts(14,70): error TS2339: Property 'join' does not exist on type 'string | string[]'.
-tests/cases/conformance/expressions/typeGuards/typeGuardsOnClassProperty.ts(26,44): error TS2339: Property 'toLowerCase' does not exist on type 'number | string'.
-
-
-==== tests/cases/conformance/expressions/typeGuards/typeGuardsOnClassProperty.ts (2 errors) ====
-    // Note that type guards affect types of variables and parameters only and 
-    // have no effect on members of objects such as properties. 
-    
-    // Note that the class's property must be copied to a local variable for
-    // the type guard to have an effect
-    class D {
-        data: string | string[];
-        getData() {
-            var data = this.data;
-            return typeof data === "string" ? data : data.join(" ");
-        }
-    
-        getData1() {
-            return typeof this.data === "string" ? this.data : this.data.join(" ");
-                                                                         ~~~~
-!!! error TS2339: Property 'join' does not exist on type 'string | string[]'.
-        }
-    }
-    
-    var o: {
-        prop1: number|string;
-        prop2: boolean|string;
-    } = {
-            prop1: "string" ,
-            prop2: true
-        }
-    
-    if (typeof o.prop1 === "string" && o.prop1.toLowerCase()) {}
-                                               ~~~~~~~~~~~
-!!! error TS2339: Property 'toLowerCase' does not exist on type 'number | string'.
-    var prop1 = o.prop1;
-    if (typeof prop1 === "string" && prop1.toLocaleLowerCase()) { }
\ No newline at end of file
diff --git a/tests/baselines/reference/typeGuardsOnClassProperty.symbols b/tests/baselines/reference/typeGuardsOnClassProperty.symbols
new file mode 100644
index 00000000000..5017c442b2f
--- /dev/null
+++ b/tests/baselines/reference/typeGuardsOnClassProperty.symbols
@@ -0,0 +1,86 @@
+=== tests/cases/conformance/expressions/typeGuards/typeGuardsOnClassProperty.ts ===
+// Note that type guards affect types of variables and parameters only and 
+// have no effect on members of objects such as properties. 
+
+// Note that the class's property must be copied to a local variable for
+// the type guard to have an effect
+class D {
+>D : Symbol(D, Decl(typeGuardsOnClassProperty.ts, 0, 0))
+
+    data: string | string[];
+>data : Symbol(D.data, Decl(typeGuardsOnClassProperty.ts, 5, 9))
+
+    getData() {
+>getData : Symbol(D.getData, Decl(typeGuardsOnClassProperty.ts, 6, 28))
+
+        var data = this.data;
+>data : Symbol(data, Decl(typeGuardsOnClassProperty.ts, 8, 11))
+>this.data : Symbol(D.data, Decl(typeGuardsOnClassProperty.ts, 5, 9))
+>this : Symbol(D, Decl(typeGuardsOnClassProperty.ts, 0, 0))
+>data : Symbol(D.data, Decl(typeGuardsOnClassProperty.ts, 5, 9))
+
+        return typeof data === "string" ? data : data.join(" ");
+>data : Symbol(data, Decl(typeGuardsOnClassProperty.ts, 8, 11))
+>data : Symbol(data, Decl(typeGuardsOnClassProperty.ts, 8, 11))
+>data.join : Symbol(Array.join, Decl(lib.d.ts, --, --))
+>data : Symbol(data, Decl(typeGuardsOnClassProperty.ts, 8, 11))
+>join : Symbol(Array.join, Decl(lib.d.ts, --, --))
+    }
+
+    getData1() {
+>getData1 : Symbol(D.getData1, Decl(typeGuardsOnClassProperty.ts, 10, 5))
+
+        return typeof this.data === "string" ? this.data : this.data.join(" ");
+>this.data : Symbol(D.data, Decl(typeGuardsOnClassProperty.ts, 5, 9))
+>this : Symbol(D, Decl(typeGuardsOnClassProperty.ts, 0, 0))
+>data : Symbol(D.data, Decl(typeGuardsOnClassProperty.ts, 5, 9))
+>this.data : Symbol(D.data, Decl(typeGuardsOnClassProperty.ts, 5, 9))
+>this : Symbol(D, Decl(typeGuardsOnClassProperty.ts, 0, 0))
+>data : Symbol(D.data, Decl(typeGuardsOnClassProperty.ts, 5, 9))
+>this.data.join : Symbol(Array.join, Decl(lib.d.ts, --, --))
+>this.data : Symbol(D.data, Decl(typeGuardsOnClassProperty.ts, 5, 9))
+>this : Symbol(D, Decl(typeGuardsOnClassProperty.ts, 0, 0))
+>data : Symbol(D.data, Decl(typeGuardsOnClassProperty.ts, 5, 9))
+>join : Symbol(Array.join, Decl(lib.d.ts, --, --))
+    }
+}
+
+var o: {
+>o : Symbol(o, Decl(typeGuardsOnClassProperty.ts, 17, 3))
+
+    prop1: number|string;
+>prop1 : Symbol(prop1, Decl(typeGuardsOnClassProperty.ts, 17, 8))
+
+    prop2: boolean|string;
+>prop2 : Symbol(prop2, Decl(typeGuardsOnClassProperty.ts, 18, 25))
+
+} = {
+        prop1: "string" ,
+>prop1 : Symbol(prop1, Decl(typeGuardsOnClassProperty.ts, 20, 5))
+
+        prop2: true
+>prop2 : Symbol(prop2, Decl(typeGuardsOnClassProperty.ts, 21, 25))
+    }
+
+if (typeof o.prop1 === "string" && o.prop1.toLowerCase()) {}
+>o.prop1 : Symbol(prop1, Decl(typeGuardsOnClassProperty.ts, 17, 8))
+>o : Symbol(o, Decl(typeGuardsOnClassProperty.ts, 17, 3))
+>prop1 : Symbol(prop1, Decl(typeGuardsOnClassProperty.ts, 17, 8))
+>o.prop1.toLowerCase : Symbol(String.toLowerCase, Decl(lib.d.ts, --, --))
+>o.prop1 : Symbol(prop1, Decl(typeGuardsOnClassProperty.ts, 17, 8))
+>o : Symbol(o, Decl(typeGuardsOnClassProperty.ts, 17, 3))
+>prop1 : Symbol(prop1, Decl(typeGuardsOnClassProperty.ts, 17, 8))
+>toLowerCase : Symbol(String.toLowerCase, Decl(lib.d.ts, --, --))
+
+var prop1 = o.prop1;
+>prop1 : Symbol(prop1, Decl(typeGuardsOnClassProperty.ts, 26, 3))
+>o.prop1 : Symbol(prop1, Decl(typeGuardsOnClassProperty.ts, 17, 8))
+>o : Symbol(o, Decl(typeGuardsOnClassProperty.ts, 17, 3))
+>prop1 : Symbol(prop1, Decl(typeGuardsOnClassProperty.ts, 17, 8))
+
+if (typeof prop1 === "string" && prop1.toLocaleLowerCase()) { }
+>prop1 : Symbol(prop1, Decl(typeGuardsOnClassProperty.ts, 26, 3))
+>prop1.toLocaleLowerCase : Symbol(String.toLocaleLowerCase, Decl(lib.d.ts, --, --))
+>prop1 : Symbol(prop1, Decl(typeGuardsOnClassProperty.ts, 26, 3))
+>toLocaleLowerCase : Symbol(String.toLocaleLowerCase, Decl(lib.d.ts, --, --))
+
diff --git a/tests/baselines/reference/typeGuardsOnClassProperty.types b/tests/baselines/reference/typeGuardsOnClassProperty.types
new file mode 100644
index 00000000000..6d524ccf674
--- /dev/null
+++ b/tests/baselines/reference/typeGuardsOnClassProperty.types
@@ -0,0 +1,112 @@
+=== tests/cases/conformance/expressions/typeGuards/typeGuardsOnClassProperty.ts ===
+// Note that type guards affect types of variables and parameters only and 
+// have no effect on members of objects such as properties. 
+
+// Note that the class's property must be copied to a local variable for
+// the type guard to have an effect
+class D {
+>D : D
+
+    data: string | string[];
+>data : string | string[]
+
+    getData() {
+>getData : () => string
+
+        var data = this.data;
+>data : string | string[]
+>this.data : string | string[]
+>this : this
+>data : string | string[]
+
+        return typeof data === "string" ? data : data.join(" ");
+>typeof data === "string" ? data : data.join(" ") : string
+>typeof data === "string" : boolean
+>typeof data : string
+>data : string | string[]
+>"string" : string
+>data : string
+>data.join(" ") : string
+>data.join : (separator?: string) => string
+>data : string[]
+>join : (separator?: string) => string
+>" " : string
+    }
+
+    getData1() {
+>getData1 : () => string
+
+        return typeof this.data === "string" ? this.data : this.data.join(" ");
+>typeof this.data === "string" ? this.data : this.data.join(" ") : string
+>typeof this.data === "string" : boolean
+>typeof this.data : string
+>this.data : string | string[]
+>this : this
+>data : string | string[]
+>"string" : string
+>this.data : string
+>this : this
+>data : string
+>this.data.join(" ") : string
+>this.data.join : (separator?: string) => string
+>this.data : string[]
+>this : this
+>data : string[]
+>join : (separator?: string) => string
+>" " : string
+    }
+}
+
+var o: {
+>o : { prop1: number | string; prop2: boolean | string; }
+
+    prop1: number|string;
+>prop1 : number | string
+
+    prop2: boolean|string;
+>prop2 : boolean | string
+
+} = {
+>{        prop1: "string" ,        prop2: true    } : { prop1: string; prop2: boolean; }
+
+        prop1: "string" ,
+>prop1 : string
+>"string" : string
+
+        prop2: true
+>prop2 : boolean
+>true : boolean
+    }
+
+if (typeof o.prop1 === "string" && o.prop1.toLowerCase()) {}
+>typeof o.prop1 === "string" && o.prop1.toLowerCase() : string
+>typeof o.prop1 === "string" : boolean
+>typeof o.prop1 : string
+>o.prop1 : number | string
+>o : { prop1: number | string; prop2: boolean | string; }
+>prop1 : number | string
+>"string" : string
+>o.prop1.toLowerCase() : string
+>o.prop1.toLowerCase : () => string
+>o.prop1 : string
+>o : { prop1: number | string; prop2: boolean | string; }
+>prop1 : string
+>toLowerCase : () => string
+
+var prop1 = o.prop1;
+>prop1 : number | string
+>o.prop1 : number | string
+>o : { prop1: number | string; prop2: boolean | string; }
+>prop1 : number | string
+
+if (typeof prop1 === "string" && prop1.toLocaleLowerCase()) { }
+>typeof prop1 === "string" && prop1.toLocaleLowerCase() : string
+>typeof prop1 === "string" : boolean
+>typeof prop1 : string
+>prop1 : number | string
+>"string" : string
+>prop1.toLocaleLowerCase() : string
+>prop1.toLocaleLowerCase : () => string
+>prop1 : string
+>toLocaleLowerCase : () => string
+
diff --git a/tests/baselines/reference/typeGuardsWithInstanceOf.symbols b/tests/baselines/reference/typeGuardsWithInstanceOf.symbols
index 81efb5d5b1d..cc2695e6aea 100644
--- a/tests/baselines/reference/typeGuardsWithInstanceOf.symbols
+++ b/tests/baselines/reference/typeGuardsWithInstanceOf.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/expressions/typeGuards/typeGuardsWithInstanceOf.ts ===
 interface I { global: string; }
 >I : Symbol(I, Decl(typeGuardsWithInstanceOf.ts, 0, 0))
->global : Symbol(global, Decl(typeGuardsWithInstanceOf.ts, 0, 13))
+>global : Symbol(I.global, Decl(typeGuardsWithInstanceOf.ts, 0, 13))
 
 var result: I;
 >result : Symbol(result, Decl(typeGuardsWithInstanceOf.ts, 1, 3))
diff --git a/tests/baselines/reference/typeInferenceReturnTypeCallback.symbols b/tests/baselines/reference/typeInferenceReturnTypeCallback.symbols
index a7322f7e69b..5e65945f9ad 100644
--- a/tests/baselines/reference/typeInferenceReturnTypeCallback.symbols
+++ b/tests/baselines/reference/typeInferenceReturnTypeCallback.symbols
@@ -4,7 +4,7 @@ interface IList<A> {
 >A : Symbol(A, Decl(typeInferenceReturnTypeCallback.ts, 0, 16))
 
     map<B>(f: (t: A) => B): IList<B>;
->map : Symbol(map, Decl(typeInferenceReturnTypeCallback.ts, 0, 20))
+>map : Symbol(IList.map, Decl(typeInferenceReturnTypeCallback.ts, 0, 20))
 >B : Symbol(B, Decl(typeInferenceReturnTypeCallback.ts, 1, 8))
 >f : Symbol(f, Decl(typeInferenceReturnTypeCallback.ts, 1, 11))
 >t : Symbol(t, Decl(typeInferenceReturnTypeCallback.ts, 1, 15))
@@ -21,7 +21,7 @@ class Nil<C> implements IList<C>{
 >C : Symbol(C, Decl(typeInferenceReturnTypeCallback.ts, 4, 10))
 
     map<D>(f: (t: C) => D): IList<D> {
->map : Symbol(map, Decl(typeInferenceReturnTypeCallback.ts, 4, 33))
+>map : Symbol(Nil.map, Decl(typeInferenceReturnTypeCallback.ts, 4, 33))
 >D : Symbol(D, Decl(typeInferenceReturnTypeCallback.ts, 5, 8))
 >f : Symbol(f, Decl(typeInferenceReturnTypeCallback.ts, 5, 11))
 >t : Symbol(t, Decl(typeInferenceReturnTypeCallback.ts, 5, 15))
@@ -41,7 +41,7 @@ class Cons<T> implements IList<T>{
 >T : Symbol(T, Decl(typeInferenceReturnTypeCallback.ts, 10, 11))
 
     map<U>(f: (t: T) => U): IList<U> {
->map : Symbol(map, Decl(typeInferenceReturnTypeCallback.ts, 10, 34))
+>map : Symbol(Cons.map, Decl(typeInferenceReturnTypeCallback.ts, 10, 34))
 >U : Symbol(U, Decl(typeInferenceReturnTypeCallback.ts, 11, 8))
 >f : Symbol(f, Decl(typeInferenceReturnTypeCallback.ts, 11, 11))
 >t : Symbol(t, Decl(typeInferenceReturnTypeCallback.ts, 11, 15))
@@ -51,9 +51,9 @@ class Cons<T> implements IList<T>{
 >U : Symbol(U, Decl(typeInferenceReturnTypeCallback.ts, 11, 8))
 
         return this.foldRight(new Nil<U>(), (t, acc) => {
->this.foldRight : Symbol(foldRight, Decl(typeInferenceReturnTypeCallback.ts, 15, 5))
+>this.foldRight : Symbol(Cons.foldRight, Decl(typeInferenceReturnTypeCallback.ts, 15, 5))
 >this : Symbol(Cons, Decl(typeInferenceReturnTypeCallback.ts, 8, 1))
->foldRight : Symbol(foldRight, Decl(typeInferenceReturnTypeCallback.ts, 15, 5))
+>foldRight : Symbol(Cons.foldRight, Decl(typeInferenceReturnTypeCallback.ts, 15, 5))
 >Nil : Symbol(Nil, Decl(typeInferenceReturnTypeCallback.ts, 2, 1))
 >U : Symbol(U, Decl(typeInferenceReturnTypeCallback.ts, 11, 8))
 >t : Symbol(t, Decl(typeInferenceReturnTypeCallback.ts, 12, 45))
@@ -67,7 +67,7 @@ class Cons<T> implements IList<T>{
     }
 
     foldRight<E>(z: E, f: (t: T, acc: E) => E): E {
->foldRight : Symbol(foldRight, Decl(typeInferenceReturnTypeCallback.ts, 15, 5))
+>foldRight : Symbol(Cons.foldRight, Decl(typeInferenceReturnTypeCallback.ts, 15, 5))
 >E : Symbol(E, Decl(typeInferenceReturnTypeCallback.ts, 17, 14))
 >z : Symbol(z, Decl(typeInferenceReturnTypeCallback.ts, 17, 17))
 >E : Symbol(E, Decl(typeInferenceReturnTypeCallback.ts, 17, 14))
diff --git a/tests/baselines/reference/typeLiteralCallback.symbols b/tests/baselines/reference/typeLiteralCallback.symbols
index 14bdd240612..824998a3a99 100644
--- a/tests/baselines/reference/typeLiteralCallback.symbols
+++ b/tests/baselines/reference/typeLiteralCallback.symbols
@@ -4,7 +4,7 @@ interface Foo<T> {
 >T : Symbol(T, Decl(typeLiteralCallback.ts, 0, 14))
 
     reject(arg: T): void ;
->reject : Symbol(reject, Decl(typeLiteralCallback.ts, 0, 18))
+>reject : Symbol(Foo.reject, Decl(typeLiteralCallback.ts, 0, 18))
 >arg : Symbol(arg, Decl(typeLiteralCallback.ts, 1, 11))
 >T : Symbol(T, Decl(typeLiteralCallback.ts, 0, 14))
 }
@@ -17,13 +17,13 @@ interface bar<T> {
 >T : Symbol(T, Decl(typeLiteralCallback.ts, 5, 14))
 
     fail(func: (arg: T) => void ): void ;
->fail : Symbol(fail, Decl(typeLiteralCallback.ts, 5, 18))
+>fail : Symbol(bar.fail, Decl(typeLiteralCallback.ts, 5, 18))
 >func : Symbol(func, Decl(typeLiteralCallback.ts, 6, 9))
 >arg : Symbol(arg, Decl(typeLiteralCallback.ts, 6, 16))
 >T : Symbol(T, Decl(typeLiteralCallback.ts, 5, 14))
 
     fail2(func: { (arg: T): void ; }): void ;
->fail2 : Symbol(fail2, Decl(typeLiteralCallback.ts, 6, 41))
+>fail2 : Symbol(bar.fail2, Decl(typeLiteralCallback.ts, 6, 41))
 >func : Symbol(func, Decl(typeLiteralCallback.ts, 7, 10))
 >arg : Symbol(arg, Decl(typeLiteralCallback.ts, 7, 19))
 >T : Symbol(T, Decl(typeLiteralCallback.ts, 5, 14))
diff --git a/tests/baselines/reference/typeOfPrototype.symbols b/tests/baselines/reference/typeOfPrototype.symbols
index ee44b3c9ae0..f6ba0d1600e 100644
--- a/tests/baselines/reference/typeOfPrototype.symbols
+++ b/tests/baselines/reference/typeOfPrototype.symbols
@@ -3,7 +3,7 @@ class Foo {
 >Foo : Symbol(Foo, Decl(typeOfPrototype.ts, 0, 0))
 
     bar = 3;
->bar : Symbol(bar, Decl(typeOfPrototype.ts, 0, 11))
+>bar : Symbol(Foo.bar, Decl(typeOfPrototype.ts, 0, 11))
 
     static bar = '';
 >bar : Symbol(Foo.bar, Decl(typeOfPrototype.ts, 1, 12))
diff --git a/tests/baselines/reference/typeOfThisInFunctionExpression.symbols b/tests/baselines/reference/typeOfThisInFunctionExpression.symbols
index 59a7b11bc9f..4b6bd18509b 100644
--- a/tests/baselines/reference/typeOfThisInFunctionExpression.symbols
+++ b/tests/baselines/reference/typeOfThisInFunctionExpression.symbols
@@ -36,7 +36,7 @@ class C {
 >C : Symbol(C, Decl(typeOfThisInFunctionExpression.ts, 15, 1))
 
     x = function () {
->x : Symbol(x, Decl(typeOfThisInFunctionExpression.ts, 17, 9))
+>x : Symbol(C.x, Decl(typeOfThisInFunctionExpression.ts, 17, 9))
 
         var q: any;
 >q : Symbol(q, Decl(typeOfThisInFunctionExpression.ts, 19, 11), Decl(typeOfThisInFunctionExpression.ts, 20, 11))
@@ -45,7 +45,7 @@ class C {
 >q : Symbol(q, Decl(typeOfThisInFunctionExpression.ts, 19, 11), Decl(typeOfThisInFunctionExpression.ts, 20, 11))
     }
     y = function ff() {
->y : Symbol(y, Decl(typeOfThisInFunctionExpression.ts, 21, 5))
+>y : Symbol(C.y, Decl(typeOfThisInFunctionExpression.ts, 21, 5))
 >ff : Symbol(ff, Decl(typeOfThisInFunctionExpression.ts, 22, 7))
 
         var q: any;
diff --git a/tests/baselines/reference/typeOfThisInMemberFunctions.symbols b/tests/baselines/reference/typeOfThisInMemberFunctions.symbols
index c0a860af4f7..a98234023c5 100644
--- a/tests/baselines/reference/typeOfThisInMemberFunctions.symbols
+++ b/tests/baselines/reference/typeOfThisInMemberFunctions.symbols
@@ -3,7 +3,7 @@ class C {
 >C : Symbol(C, Decl(typeOfThisInMemberFunctions.ts, 0, 0))
 
     foo() {
->foo : Symbol(foo, Decl(typeOfThisInMemberFunctions.ts, 0, 9))
+>foo : Symbol(C.foo, Decl(typeOfThisInMemberFunctions.ts, 0, 9))
 
         var r = this;
 >r : Symbol(r, Decl(typeOfThisInMemberFunctions.ts, 2, 11))
@@ -24,11 +24,11 @@ class D<T> {
 >T : Symbol(T, Decl(typeOfThisInMemberFunctions.ts, 10, 8))
 
     x: T;
->x : Symbol(x, Decl(typeOfThisInMemberFunctions.ts, 10, 12))
+>x : Symbol(D.x, Decl(typeOfThisInMemberFunctions.ts, 10, 12))
 >T : Symbol(T, Decl(typeOfThisInMemberFunctions.ts, 10, 8))
 
     foo() {
->foo : Symbol(foo, Decl(typeOfThisInMemberFunctions.ts, 11, 9))
+>foo : Symbol(D.foo, Decl(typeOfThisInMemberFunctions.ts, 11, 9))
 
         var r = this;
 >r : Symbol(r, Decl(typeOfThisInMemberFunctions.ts, 13, 11))
@@ -47,14 +47,14 @@ class D<T> {
 class E<T extends Date> {
 >E : Symbol(E, Decl(typeOfThisInMemberFunctions.ts, 19, 1))
 >T : Symbol(T, Decl(typeOfThisInMemberFunctions.ts, 21, 8))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     x: T;
->x : Symbol(x, Decl(typeOfThisInMemberFunctions.ts, 21, 25))
+>x : Symbol(E.x, Decl(typeOfThisInMemberFunctions.ts, 21, 25))
 >T : Symbol(T, Decl(typeOfThisInMemberFunctions.ts, 21, 8))
 
     foo() {
->foo : Symbol(foo, Decl(typeOfThisInMemberFunctions.ts, 22, 9))
+>foo : Symbol(E.foo, Decl(typeOfThisInMemberFunctions.ts, 22, 9))
 
         var r = this;
 >r : Symbol(r, Decl(typeOfThisInMemberFunctions.ts, 24, 11))
diff --git a/tests/baselines/reference/typeParameterAndArgumentOfSameName1.symbols b/tests/baselines/reference/typeParameterAndArgumentOfSameName1.symbols
index e38953fe8a2..cacd7f91dfe 100644
--- a/tests/baselines/reference/typeParameterAndArgumentOfSameName1.symbols
+++ b/tests/baselines/reference/typeParameterAndArgumentOfSameName1.symbols
@@ -2,7 +2,7 @@
 function f<A extends Number>(A: A): A {
 >f : Symbol(f, Decl(typeParameterAndArgumentOfSameName1.ts, 0, 0))
 >A : Symbol(A, Decl(typeParameterAndArgumentOfSameName1.ts, 0, 11), Decl(typeParameterAndArgumentOfSameName1.ts, 0, 29))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >A : Symbol(A, Decl(typeParameterAndArgumentOfSameName1.ts, 0, 11), Decl(typeParameterAndArgumentOfSameName1.ts, 0, 29))
 >A : Symbol(A, Decl(typeParameterAndArgumentOfSameName1.ts, 0, 11), Decl(typeParameterAndArgumentOfSameName1.ts, 0, 29))
 >A : Symbol(A, Decl(typeParameterAndArgumentOfSameName1.ts, 0, 11), Decl(typeParameterAndArgumentOfSameName1.ts, 0, 29))
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence.errors.txt b/tests/baselines/reference/typeParameterArgumentEquivalence.errors.txt
index f47266f2850..39e6db64fbf 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence.errors.txt
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/compiler/typeParameterArgumentEquivalence.ts(4,5): error TS2322: Type '(item: T) => boolean' is not assignable to type '(item: number) => boolean'.
   Types of parameters 'item' and 'item' are incompatible.
-    Type 'T' is not assignable to type 'number'.
+    Type 'number' is not assignable to type 'T'.
 tests/cases/compiler/typeParameterArgumentEquivalence.ts(5,5): error TS2322: Type '(item: number) => boolean' is not assignable to type '(item: T) => boolean'.
   Types of parameters 'item' and 'item' are incompatible.
-    Type 'number' is not assignable to type 'T'.
+    Type 'T' is not assignable to type 'number'.
 
 
 ==== tests/cases/compiler/typeParameterArgumentEquivalence.ts (2 errors) ====
@@ -14,11 +14,11 @@ tests/cases/compiler/typeParameterArgumentEquivalence.ts(5,5): error TS2322: Typ
         ~
 !!! error TS2322: Type '(item: T) => boolean' is not assignable to type '(item: number) => boolean'.
 !!! error TS2322:   Types of parameters 'item' and 'item' are incompatible.
-!!! error TS2322:     Type 'T' is not assignable to type 'number'.
+!!! error TS2322:     Type 'number' is not assignable to type 'T'.
         y = x;  // Shound be an error
         ~
 !!! error TS2322: Type '(item: number) => boolean' is not assignable to type '(item: T) => boolean'.
 !!! error TS2322:   Types of parameters 'item' and 'item' are incompatible.
-!!! error TS2322:     Type 'number' is not assignable to type 'T'.
+!!! error TS2322:     Type 'T' is not assignable to type 'number'.
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/typeParameterArgumentEquivalence2.errors.txt b/tests/baselines/reference/typeParameterArgumentEquivalence2.errors.txt
index 2aa8d77ba6d..17fce0384f7 100644
--- a/tests/baselines/reference/typeParameterArgumentEquivalence2.errors.txt
+++ b/tests/baselines/reference/typeParameterArgumentEquivalence2.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/compiler/typeParameterArgumentEquivalence2.ts(4,5): error TS2322: Type '(item: T) => boolean' is not assignable to type '(item: U) => boolean'.
   Types of parameters 'item' and 'item' are incompatible.
-    Type 'T' is not assignable to type 'U'.
+    Type 'U' is not assignable to type 'T'.
 tests/cases/compiler/typeParameterArgumentEquivalence2.ts(5,5): error TS2322: Type '(item: U) => boolean' is not assignable to type '(item: T) => boolean'.
   Types of parameters 'item' and 'item' are incompatible.
-    Type 'U' is not assignable to type 'T'.
+    Type 'T' is not assignable to type 'U'.
 
 
 ==== tests/cases/compiler/typeParameterArgumentEquivalence2.ts (2 errors) ====
@@ -14,11 +14,11 @@ tests/cases/compiler/typeParameterArgumentEquivalence2.ts(5,5): error TS2322: Ty
         ~
 !!! error TS2322: Type '(item: T) => boolean' is not assignable to type '(item: U) => boolean'.
 !!! error TS2322:   Types of parameters 'item' and 'item' are incompatible.
-!!! error TS2322:     Type 'T' is not assignable to type 'U'.
+!!! error TS2322:     Type 'U' is not assignable to type 'T'.
         y = x;  // Shound be an error
         ~
 !!! error TS2322: Type '(item: U) => boolean' is not assignable to type '(item: T) => boolean'.
 !!! error TS2322:   Types of parameters 'item' and 'item' are incompatible.
-!!! error TS2322:     Type 'U' is not assignable to type 'T'.
+!!! error TS2322:     Type 'T' is not assignable to type 'U'.
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/typeParameterAsTypeArgument.symbols b/tests/baselines/reference/typeParameterAsTypeArgument.symbols
index a0e03fcf639..cfff8926e55 100644
--- a/tests/baselines/reference/typeParameterAsTypeArgument.symbols
+++ b/tests/baselines/reference/typeParameterAsTypeArgument.symbols
@@ -29,7 +29,7 @@ class C<T, U> {
 >U : Symbol(U, Decl(typeParameterAsTypeArgument.ts, 7, 10))
 
     x: T;
->x : Symbol(x, Decl(typeParameterAsTypeArgument.ts, 7, 15))
+>x : Symbol(C.x, Decl(typeParameterAsTypeArgument.ts, 7, 15))
 >T : Symbol(T, Decl(typeParameterAsTypeArgument.ts, 7, 8))
 }
 
@@ -39,7 +39,7 @@ interface I<T, U> {
 >U : Symbol(U, Decl(typeParameterAsTypeArgument.ts, 11, 14))
 
     x: C<U, T>;
->x : Symbol(x, Decl(typeParameterAsTypeArgument.ts, 11, 19))
+>x : Symbol(I.x, Decl(typeParameterAsTypeArgument.ts, 11, 19))
 >C : Symbol(C, Decl(typeParameterAsTypeArgument.ts, 5, 1))
 >U : Symbol(U, Decl(typeParameterAsTypeArgument.ts, 11, 14))
 >T : Symbol(T, Decl(typeParameterAsTypeArgument.ts, 11, 12))
diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraint.symbols b/tests/baselines/reference/typeParameterAsTypeParameterConstraint.symbols
index 569b37e64d1..a530a6c7864 100644
--- a/tests/baselines/reference/typeParameterAsTypeParameterConstraint.symbols
+++ b/tests/baselines/reference/typeParameterAsTypeParameterConstraint.symbols
@@ -26,14 +26,14 @@ interface A {
 >A : Symbol(A, Decl(typeParameterAsTypeParameterConstraint.ts, 6, 19))
 
     foo: string;
->foo : Symbol(foo, Decl(typeParameterAsTypeParameterConstraint.ts, 8, 13))
+>foo : Symbol(A.foo, Decl(typeParameterAsTypeParameterConstraint.ts, 8, 13))
 }
 interface B extends A {
 >B : Symbol(B, Decl(typeParameterAsTypeParameterConstraint.ts, 10, 1))
 >A : Symbol(A, Decl(typeParameterAsTypeParameterConstraint.ts, 6, 19))
 
     bar: number;
->bar : Symbol(bar, Decl(typeParameterAsTypeParameterConstraint.ts, 11, 23))
+>bar : Symbol(B.bar, Decl(typeParameterAsTypeParameterConstraint.ts, 11, 23))
 }
 var a: A;
 >a : Symbol(a, Decl(typeParameterAsTypeParameterConstraint.ts, 14, 3))
diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively.symbols b/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively.symbols
index 90276a96b3d..6739f6930f1 100644
--- a/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively.symbols
+++ b/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively.symbols
@@ -4,17 +4,17 @@
 
 interface A { foo: number }
 >A : Symbol(A, Decl(typeParameterAsTypeParameterConstraintTransitively.ts, 0, 0))
->foo : Symbol(foo, Decl(typeParameterAsTypeParameterConstraintTransitively.ts, 3, 13))
+>foo : Symbol(A.foo, Decl(typeParameterAsTypeParameterConstraintTransitively.ts, 3, 13))
 
 interface B extends A { bar: string; }
 >B : Symbol(B, Decl(typeParameterAsTypeParameterConstraintTransitively.ts, 3, 27))
 >A : Symbol(A, Decl(typeParameterAsTypeParameterConstraintTransitively.ts, 0, 0))
->bar : Symbol(bar, Decl(typeParameterAsTypeParameterConstraintTransitively.ts, 4, 23))
+>bar : Symbol(B.bar, Decl(typeParameterAsTypeParameterConstraintTransitively.ts, 4, 23))
 
 interface C extends B { baz: boolean; }
 >C : Symbol(C, Decl(typeParameterAsTypeParameterConstraintTransitively.ts, 4, 38))
 >B : Symbol(B, Decl(typeParameterAsTypeParameterConstraintTransitively.ts, 3, 27))
->baz : Symbol(baz, Decl(typeParameterAsTypeParameterConstraintTransitively.ts, 5, 23))
+>baz : Symbol(C.baz, Decl(typeParameterAsTypeParameterConstraintTransitively.ts, 5, 23))
 
 var a: A;
 >a : Symbol(a, Decl(typeParameterAsTypeParameterConstraintTransitively.ts, 6, 3))
diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively2.symbols b/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively2.symbols
index 5635d0e61ed..f0fbba60d9a 100644
--- a/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively2.symbols
+++ b/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively2.symbols
@@ -4,17 +4,17 @@
 
 interface A { foo: number }
 >A : Symbol(A, Decl(typeParameterAsTypeParameterConstraintTransitively2.ts, 0, 0))
->foo : Symbol(foo, Decl(typeParameterAsTypeParameterConstraintTransitively2.ts, 3, 13))
+>foo : Symbol(A.foo, Decl(typeParameterAsTypeParameterConstraintTransitively2.ts, 3, 13))
 
 interface B extends A { bar: string; }
 >B : Symbol(B, Decl(typeParameterAsTypeParameterConstraintTransitively2.ts, 3, 27))
 >A : Symbol(A, Decl(typeParameterAsTypeParameterConstraintTransitively2.ts, 0, 0))
->bar : Symbol(bar, Decl(typeParameterAsTypeParameterConstraintTransitively2.ts, 4, 23))
+>bar : Symbol(B.bar, Decl(typeParameterAsTypeParameterConstraintTransitively2.ts, 4, 23))
 
 interface C extends B { baz: boolean; }
 >C : Symbol(C, Decl(typeParameterAsTypeParameterConstraintTransitively2.ts, 4, 38))
 >B : Symbol(B, Decl(typeParameterAsTypeParameterConstraintTransitively2.ts, 3, 27))
->baz : Symbol(baz, Decl(typeParameterAsTypeParameterConstraintTransitively2.ts, 5, 23))
+>baz : Symbol(C.baz, Decl(typeParameterAsTypeParameterConstraintTransitively2.ts, 5, 23))
 
 var a: A;
 >a : Symbol(a, Decl(typeParameterAsTypeParameterConstraintTransitively2.ts, 6, 3))
diff --git a/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.symbols b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.symbols
index eb1aeeaca27..d7d4980d21d 100644
--- a/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.symbols
+++ b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.symbols
@@ -20,7 +20,7 @@ export interface I {
 >I : Symbol(I, Decl(typeParameterCompatibilityAccrossDeclarations.ts, 5, 1))
 
    x<T>(y: T): T;
->x : Symbol(x, Decl(typeParameterCompatibilityAccrossDeclarations.ts, 6, 20))
+>x : Symbol(I.x, Decl(typeParameterCompatibilityAccrossDeclarations.ts, 6, 20))
 >T : Symbol(T, Decl(typeParameterCompatibilityAccrossDeclarations.ts, 7, 5))
 >y : Symbol(y, Decl(typeParameterCompatibilityAccrossDeclarations.ts, 7, 8))
 >T : Symbol(T, Decl(typeParameterCompatibilityAccrossDeclarations.ts, 7, 5))
@@ -30,7 +30,7 @@ export interface I2 {
 >I2 : Symbol(I2, Decl(typeParameterCompatibilityAccrossDeclarations.ts, 8, 1))
 
    x(y: any): any;
->x : Symbol(x, Decl(typeParameterCompatibilityAccrossDeclarations.ts, 9, 21))
+>x : Symbol(I2.x, Decl(typeParameterCompatibilityAccrossDeclarations.ts, 9, 21))
 >y : Symbol(y, Decl(typeParameterCompatibilityAccrossDeclarations.ts, 10, 5))
 }
  
diff --git a/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter2.symbols b/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter2.symbols
index cd6cefc5ec0..0d9365e4753 100644
--- a/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter2.symbols
+++ b/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter2.symbols
@@ -4,7 +4,7 @@ interface A<T> {
 >T : Symbol(T, Decl(typeParameterConstrainedToOuterTypeParameter2.ts, 0, 12))
 
     foo<U extends T>(x: A<A<U>>)
->foo : Symbol(foo, Decl(typeParameterConstrainedToOuterTypeParameter2.ts, 0, 16))
+>foo : Symbol(A.foo, Decl(typeParameterConstrainedToOuterTypeParameter2.ts, 0, 16))
 >U : Symbol(U, Decl(typeParameterConstrainedToOuterTypeParameter2.ts, 1, 8))
 >T : Symbol(T, Decl(typeParameterConstrainedToOuterTypeParameter2.ts, 0, 12))
 >x : Symbol(x, Decl(typeParameterConstrainedToOuterTypeParameter2.ts, 1, 21))
@@ -18,7 +18,7 @@ interface B<T> {
 >T : Symbol(T, Decl(typeParameterConstrainedToOuterTypeParameter2.ts, 4, 12))
 
     foo<U extends T>(x: B<B<U>>)
->foo : Symbol(foo, Decl(typeParameterConstrainedToOuterTypeParameter2.ts, 4, 16))
+>foo : Symbol(B.foo, Decl(typeParameterConstrainedToOuterTypeParameter2.ts, 4, 16))
 >U : Symbol(U, Decl(typeParameterConstrainedToOuterTypeParameter2.ts, 5, 8))
 >T : Symbol(T, Decl(typeParameterConstrainedToOuterTypeParameter2.ts, 4, 12))
 >x : Symbol(x, Decl(typeParameterConstrainedToOuterTypeParameter2.ts, 5, 21))
diff --git a/tests/baselines/reference/typeParameterConstraintInstantiation.symbols b/tests/baselines/reference/typeParameterConstraintInstantiation.symbols
index 9103d65c0e9..f3b5a01eef9 100644
--- a/tests/baselines/reference/typeParameterConstraintInstantiation.symbols
+++ b/tests/baselines/reference/typeParameterConstraintInstantiation.symbols
@@ -6,7 +6,7 @@ interface Mapper<T> {
 >T : Symbol(T, Decl(typeParameterConstraintInstantiation.ts, 2, 17))
 
     map<U extends T, V extends U[]>(f: (item: T) => U): V;
->map : Symbol(map, Decl(typeParameterConstraintInstantiation.ts, 2, 21))
+>map : Symbol(Mapper.map, Decl(typeParameterConstraintInstantiation.ts, 2, 21))
 >U : Symbol(U, Decl(typeParameterConstraintInstantiation.ts, 3, 8))
 >T : Symbol(T, Decl(typeParameterConstraintInstantiation.ts, 2, 17))
 >V : Symbol(V, Decl(typeParameterConstraintInstantiation.ts, 3, 20))
diff --git a/tests/baselines/reference/typeParameterConstraints1.errors.txt b/tests/baselines/reference/typeParameterConstraints1.errors.txt
index e837e19317d..97bc8165751 100644
--- a/tests/baselines/reference/typeParameterConstraints1.errors.txt
+++ b/tests/baselines/reference/typeParameterConstraints1.errors.txt
@@ -1,11 +1,9 @@
 tests/cases/compiler/typeParameterConstraints1.ts(6,25): error TS2304: Cannot find name 'hm'.
 tests/cases/compiler/typeParameterConstraints1.ts(9,25): error TS1110: Type expected.
 tests/cases/compiler/typeParameterConstraints1.ts(10,26): error TS1110: Type expected.
-tests/cases/compiler/typeParameterConstraints1.ts(11,26): error TS1110: Type expected.
-tests/cases/compiler/typeParameterConstraints1.ts(12,26): error TS2304: Cannot find name 'undefined'.
 
 
-==== tests/cases/compiler/typeParameterConstraints1.ts (5 errors) ====
+==== tests/cases/compiler/typeParameterConstraints1.ts (3 errors) ====
     function foo1<T extends any>(test: T) { }
     function foo2<T extends number>(test: T) { }
     function foo3<T extends string>(test: T) { }
@@ -23,9 +21,5 @@ tests/cases/compiler/typeParameterConstraints1.ts(12,26): error TS2304: Cannot f
                              ~
 !!! error TS1110: Type expected.
     function foo11<T extends null> (test: T) { }
-                             ~~~~
-!!! error TS1110: Type expected.
     function foo12<T extends undefined>(test: T) { }
-                             ~~~~~~~~~
-!!! error TS2304: Cannot find name 'undefined'.
     function foo13<T extends void>(test: T) { }
\ No newline at end of file
diff --git a/tests/baselines/reference/typeParameterEquality.symbols b/tests/baselines/reference/typeParameterEquality.symbols
index 562d6277d93..711d6264c48 100644
--- a/tests/baselines/reference/typeParameterEquality.symbols
+++ b/tests/baselines/reference/typeParameterEquality.symbols
@@ -3,14 +3,14 @@ class C {
 >C : Symbol(C, Decl(typeParameterEquality.ts, 0, 0))
 
     get x(): <T>(a: T) => T { return null; }
->x : Symbol(x, Decl(typeParameterEquality.ts, 0, 9), Decl(typeParameterEquality.ts, 1, 44))
+>x : Symbol(C.x, Decl(typeParameterEquality.ts, 0, 9), Decl(typeParameterEquality.ts, 1, 44))
 >T : Symbol(T, Decl(typeParameterEquality.ts, 1, 14))
 >a : Symbol(a, Decl(typeParameterEquality.ts, 1, 17))
 >T : Symbol(T, Decl(typeParameterEquality.ts, 1, 14))
 >T : Symbol(T, Decl(typeParameterEquality.ts, 1, 14))
 
     set x(p: <U>(a: U) => U) {}
->x : Symbol(x, Decl(typeParameterEquality.ts, 0, 9), Decl(typeParameterEquality.ts, 1, 44))
+>x : Symbol(C.x, Decl(typeParameterEquality.ts, 0, 9), Decl(typeParameterEquality.ts, 1, 44))
 >p : Symbol(p, Decl(typeParameterEquality.ts, 2, 10))
 >U : Symbol(U, Decl(typeParameterEquality.ts, 2, 14))
 >a : Symbol(a, Decl(typeParameterEquality.ts, 2, 17))
diff --git a/tests/baselines/reference/typeParameterExtendingUnion1.symbols b/tests/baselines/reference/typeParameterExtendingUnion1.symbols
index 39b67e6428c..0538dcf91e0 100644
--- a/tests/baselines/reference/typeParameterExtendingUnion1.symbols
+++ b/tests/baselines/reference/typeParameterExtendingUnion1.symbols
@@ -1,17 +1,17 @@
 === tests/cases/compiler/typeParameterExtendingUnion1.ts ===
 class Animal { run() { } }
 >Animal : Symbol(Animal, Decl(typeParameterExtendingUnion1.ts, 0, 0))
->run : Symbol(run, Decl(typeParameterExtendingUnion1.ts, 0, 14))
+>run : Symbol(Animal.run, Decl(typeParameterExtendingUnion1.ts, 0, 14))
 
 class Cat extends Animal { meow }
 >Cat : Symbol(Cat, Decl(typeParameterExtendingUnion1.ts, 0, 26))
 >Animal : Symbol(Animal, Decl(typeParameterExtendingUnion1.ts, 0, 0))
->meow : Symbol(meow, Decl(typeParameterExtendingUnion1.ts, 1, 26))
+>meow : Symbol(Cat.meow, Decl(typeParameterExtendingUnion1.ts, 1, 26))
 
 class Dog extends Animal { woof }
 >Dog : Symbol(Dog, Decl(typeParameterExtendingUnion1.ts, 1, 33))
 >Animal : Symbol(Animal, Decl(typeParameterExtendingUnion1.ts, 0, 0))
->woof : Symbol(woof, Decl(typeParameterExtendingUnion1.ts, 2, 26))
+>woof : Symbol(Dog.woof, Decl(typeParameterExtendingUnion1.ts, 2, 26))
 
 function run(a: Animal) {
 >run : Symbol(run, Decl(typeParameterExtendingUnion1.ts, 2, 33))
diff --git a/tests/baselines/reference/typeParameterExtendingUnion2.symbols b/tests/baselines/reference/typeParameterExtendingUnion2.symbols
index 44d47692a82..f29f12f6f09 100644
--- a/tests/baselines/reference/typeParameterExtendingUnion2.symbols
+++ b/tests/baselines/reference/typeParameterExtendingUnion2.symbols
@@ -1,17 +1,17 @@
 === tests/cases/compiler/typeParameterExtendingUnion2.ts ===
 class Animal { run() { } }
 >Animal : Symbol(Animal, Decl(typeParameterExtendingUnion2.ts, 0, 0))
->run : Symbol(run, Decl(typeParameterExtendingUnion2.ts, 0, 14))
+>run : Symbol(Animal.run, Decl(typeParameterExtendingUnion2.ts, 0, 14))
 
 class Cat extends Animal { meow }
 >Cat : Symbol(Cat, Decl(typeParameterExtendingUnion2.ts, 0, 26))
 >Animal : Symbol(Animal, Decl(typeParameterExtendingUnion2.ts, 0, 0))
->meow : Symbol(meow, Decl(typeParameterExtendingUnion2.ts, 1, 26))
+>meow : Symbol(Cat.meow, Decl(typeParameterExtendingUnion2.ts, 1, 26))
 
 class Dog extends Animal { woof }
 >Dog : Symbol(Dog, Decl(typeParameterExtendingUnion2.ts, 1, 33))
 >Animal : Symbol(Animal, Decl(typeParameterExtendingUnion2.ts, 0, 0))
->woof : Symbol(woof, Decl(typeParameterExtendingUnion2.ts, 2, 26))
+>woof : Symbol(Dog.woof, Decl(typeParameterExtendingUnion2.ts, 2, 26))
 
 function run(a: Cat | Dog) {
 >run : Symbol(run, Decl(typeParameterExtendingUnion2.ts, 2, 33))
diff --git a/tests/baselines/reference/typeParameterFixingWithConstraints.symbols b/tests/baselines/reference/typeParameterFixingWithConstraints.symbols
index 94e1b8172cb..4b998238130 100644
--- a/tests/baselines/reference/typeParameterFixingWithConstraints.symbols
+++ b/tests/baselines/reference/typeParameterFixingWithConstraints.symbols
@@ -10,7 +10,7 @@ interface IFoo {
 >IFoo : Symbol(IFoo, Decl(typeParameterFixingWithConstraints.ts, 2, 1))
 
     foo<TBar extends IBar>(bar: TBar, bar1: (bar: TBar) => TBar, bar2: (bar: TBar) => TBar): TBar;
->foo : Symbol(foo, Decl(typeParameterFixingWithConstraints.ts, 4, 16))
+>foo : Symbol(IFoo.foo, Decl(typeParameterFixingWithConstraints.ts, 4, 16))
 >TBar : Symbol(TBar, Decl(typeParameterFixingWithConstraints.ts, 5, 8))
 >IBar : Symbol(IBar, Decl(typeParameterFixingWithConstraints.ts, 0, 0))
 >bar : Symbol(bar, Decl(typeParameterFixingWithConstraints.ts, 5, 27))
diff --git a/tests/baselines/reference/typeParameterFixingWithConstraints.types b/tests/baselines/reference/typeParameterFixingWithConstraints.types
index 22d294f9d2e..1e71f439e5e 100644
--- a/tests/baselines/reference/typeParameterFixingWithConstraints.types
+++ b/tests/baselines/reference/typeParameterFixingWithConstraints.types
@@ -31,17 +31,17 @@ var foo: IFoo;
 >IFoo : IFoo
 
 foo.foo({ bar: null }, bar => null, bar => null);
->foo.foo({ bar: null }, bar => null, bar => null) : { [x: string]: any; bar: any; }
+>foo.foo({ bar: null }, bar => null, bar => null) : { bar: any; }
 >foo.foo : <TBar extends IBar>(bar: TBar, bar1: (bar: TBar) => TBar, bar2: (bar: TBar) => TBar) => TBar
 >foo : IFoo
 >foo : <TBar extends IBar>(bar: TBar, bar1: (bar: TBar) => TBar, bar2: (bar: TBar) => TBar) => TBar
->{ bar: null } : { [x: string]: null; bar: null; }
+>{ bar: null } : { bar: null; }
 >bar : null
 >null : null
->bar => null : (bar: { [x: string]: any; bar: any; }) => any
->bar : { [x: string]: any; bar: any; }
+>bar => null : (bar: { bar: any; }) => any
+>bar : { bar: any; }
 >null : null
->bar => null : (bar: { [x: string]: any; bar: any; }) => any
->bar : { [x: string]: any; bar: any; }
+>bar => null : (bar: { bar: any; }) => any
+>bar : { bar: any; }
 >null : null
 
diff --git a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments.symbols b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments.symbols
index fcf8fcb8dc4..d5dad41b449 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments.symbols
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments.symbols
@@ -19,13 +19,13 @@ function f<T, U>(y: T, f: (x: T) => U, x: T): [T, U] { return [y, f(x)]; }
 
 interface A { a: A; }
 >A : Symbol(A, Decl(typeParameterFixingWithContextSensitiveArguments.ts, 0, 74))
->a : Symbol(a, Decl(typeParameterFixingWithContextSensitiveArguments.ts, 1, 13))
+>a : Symbol(A.a, Decl(typeParameterFixingWithContextSensitiveArguments.ts, 1, 13))
 >A : Symbol(A, Decl(typeParameterFixingWithContextSensitiveArguments.ts, 0, 74))
 
 interface B extends A { b; }
 >B : Symbol(B, Decl(typeParameterFixingWithContextSensitiveArguments.ts, 1, 21))
 >A : Symbol(A, Decl(typeParameterFixingWithContextSensitiveArguments.ts, 0, 74))
->b : Symbol(b, Decl(typeParameterFixingWithContextSensitiveArguments.ts, 2, 23))
+>b : Symbol(B.b, Decl(typeParameterFixingWithContextSensitiveArguments.ts, 2, 23))
 
 var a: A, b: B;
 >a : Symbol(a, Decl(typeParameterFixingWithContextSensitiveArguments.ts, 4, 3))
diff --git a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments4.symbols b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments4.symbols
index d8f7abea606..1e50e4a18e3 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments4.symbols
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments4.symbols
@@ -23,13 +23,13 @@ function f<T, U>(y: T, y1: U, p: (z: U) => T, p1: (x: T) => U): [T, U] { return
 
 interface A { a: A; }
 >A : Symbol(A, Decl(typeParameterFixingWithContextSensitiveArguments4.ts, 0, 93))
->a : Symbol(a, Decl(typeParameterFixingWithContextSensitiveArguments4.ts, 1, 13))
+>a : Symbol(A.a, Decl(typeParameterFixingWithContextSensitiveArguments4.ts, 1, 13))
 >A : Symbol(A, Decl(typeParameterFixingWithContextSensitiveArguments4.ts, 0, 93))
 
 interface B extends A { b; }
 >B : Symbol(B, Decl(typeParameterFixingWithContextSensitiveArguments4.ts, 1, 21))
 >A : Symbol(A, Decl(typeParameterFixingWithContextSensitiveArguments4.ts, 0, 93))
->b : Symbol(b, Decl(typeParameterFixingWithContextSensitiveArguments4.ts, 2, 23))
+>b : Symbol(B.b, Decl(typeParameterFixingWithContextSensitiveArguments4.ts, 2, 23))
 
 var a: A, b: B;
 >a : Symbol(a, Decl(typeParameterFixingWithContextSensitiveArguments4.ts, 4, 3))
diff --git a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments5.symbols b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments5.symbols
index 5ba8aee8dba..1f9711a19ab 100644
--- a/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments5.symbols
+++ b/tests/baselines/reference/typeParameterFixingWithContextSensitiveArguments5.symbols
@@ -23,13 +23,13 @@ function f<T, U>(t1: T, u1: U, pf1: (u2: U) => T, pf2: (t2: T) => U): [T, U] { r
 
 interface A { a: A; }
 >A : Symbol(A, Decl(typeParameterFixingWithContextSensitiveArguments5.ts, 0, 102))
->a : Symbol(a, Decl(typeParameterFixingWithContextSensitiveArguments5.ts, 1, 13))
+>a : Symbol(A.a, Decl(typeParameterFixingWithContextSensitiveArguments5.ts, 1, 13))
 >A : Symbol(A, Decl(typeParameterFixingWithContextSensitiveArguments5.ts, 0, 102))
 
 interface B extends A { b: any; }
 >B : Symbol(B, Decl(typeParameterFixingWithContextSensitiveArguments5.ts, 1, 21))
 >A : Symbol(A, Decl(typeParameterFixingWithContextSensitiveArguments5.ts, 0, 102))
->b : Symbol(b, Decl(typeParameterFixingWithContextSensitiveArguments5.ts, 2, 23))
+>b : Symbol(B.b, Decl(typeParameterFixingWithContextSensitiveArguments5.ts, 2, 23))
 
 var a: A, b: B;
 >a : Symbol(a, Decl(typeParameterFixingWithContextSensitiveArguments5.ts, 4, 3))
diff --git a/tests/baselines/reference/typeParameterOrderReversal.symbols b/tests/baselines/reference/typeParameterOrderReversal.symbols
index 6b17ac1da55..1c8fbad5550 100644
--- a/tests/baselines/reference/typeParameterOrderReversal.symbols
+++ b/tests/baselines/reference/typeParameterOrderReversal.symbols
@@ -4,7 +4,7 @@ interface X<T> {
 >T : Symbol(T, Decl(typeParameterOrderReversal.ts, 0, 12))
 
     n: T;
->n : Symbol(n, Decl(typeParameterOrderReversal.ts, 0, 16))
+>n : Symbol(X.n, Decl(typeParameterOrderReversal.ts, 0, 16))
 >T : Symbol(T, Decl(typeParameterOrderReversal.ts, 0, 12))
 }
 
diff --git a/tests/baselines/reference/typeParameterUsedAsConstraint.symbols b/tests/baselines/reference/typeParameterUsedAsConstraint.symbols
index 0b031742e75..2ab34915a65 100644
--- a/tests/baselines/reference/typeParameterUsedAsConstraint.symbols
+++ b/tests/baselines/reference/typeParameterUsedAsConstraint.symbols
@@ -14,7 +14,7 @@ class C2<T extends U, U> { }
 class C3<T extends Date, U extends T> { }
 >C3 : Symbol(C3, Decl(typeParameterUsedAsConstraint.ts, 1, 28))
 >T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 2, 9))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 2, 24))
 >T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 2, 9))
 
@@ -23,7 +23,7 @@ class C4<T extends U, U extends Date> { }
 >T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 3, 9))
 >U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 3, 21))
 >U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 3, 21))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 class C5<T extends U, U extends V, V> { }
 >C5 : Symbol(C5, Decl(typeParameterUsedAsConstraint.ts, 3, 41))
@@ -56,7 +56,7 @@ interface I2<T extends U, U> { }
 interface I3<T extends Date, U extends T> { }
 >I3 : Symbol(I3, Decl(typeParameterUsedAsConstraint.ts, 8, 32))
 >T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 9, 13))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 9, 28))
 >T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 9, 13))
 
@@ -65,7 +65,7 @@ interface I4<T extends U, U extends Date> { }
 >T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 10, 13))
 >U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 10, 25))
 >U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 10, 25))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 interface I5<T extends U, U extends V, V> { }
 >I5 : Symbol(I5, Decl(typeParameterUsedAsConstraint.ts, 10, 45))
@@ -98,7 +98,7 @@ function f2<T extends U, U>() { }
 function f3<T extends Date, U extends T>() { }
 >f3 : Symbol(f3, Decl(typeParameterUsedAsConstraint.ts, 15, 33))
 >T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 16, 12))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 16, 27))
 >T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 16, 12))
 
@@ -107,7 +107,7 @@ function f4<T extends U, U extends Date>() { }
 >T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 17, 12))
 >U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 17, 24))
 >U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 17, 24))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 function f5<T extends U, U extends V, V>() { }
 >f5 : Symbol(f5, Decl(typeParameterUsedAsConstraint.ts, 17, 46))
@@ -140,7 +140,7 @@ var e2 = <T extends U, U>() => { }
 var e3 = <T extends Date, U extends T>() => { }
 >e3 : Symbol(e3, Decl(typeParameterUsedAsConstraint.ts, 23, 3))
 >T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 23, 10))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 23, 25))
 >T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 23, 10))
 
@@ -149,7 +149,7 @@ var e4 = <T extends U, U extends Date>() => { }
 >T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 24, 10))
 >U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 24, 22))
 >U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 24, 22))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var e5 = <T extends U, U extends V, V>() => { }
 >e5 : Symbol(e5, Decl(typeParameterUsedAsConstraint.ts, 25, 3))
@@ -182,7 +182,7 @@ var a2: { <T extends U, U>(): void }
 var a3: { <T extends Date, U extends T>(): void }
 >a3 : Symbol(a3, Decl(typeParameterUsedAsConstraint.ts, 30, 3))
 >T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 30, 11))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 30, 26))
 >T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 30, 11))
 
@@ -191,7 +191,7 @@ var a4: { <T extends U, U extends Date>(): void }
 >T : Symbol(T, Decl(typeParameterUsedAsConstraint.ts, 31, 11))
 >U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 31, 23))
 >U : Symbol(U, Decl(typeParameterUsedAsConstraint.ts, 31, 23))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var a5: { <T extends U, U extends V, V>(): void }
 >a5 : Symbol(a5, Decl(typeParameterUsedAsConstraint.ts, 32, 3))
diff --git a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint3.symbols b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint3.symbols
index 5142fc44af9..afd41a6ee94 100644
--- a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint3.symbols
+++ b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint3.symbols
@@ -29,19 +29,19 @@ interface I<T, U, V> {
 >V : Symbol(V, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 23, 17))
 
     x: T;
->x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 23, 22))
+>x : Symbol(I.x, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 23, 22))
 >T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 23, 12))
 
     y: U;
->y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 24, 9))
+>y : Symbol(I.y, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 24, 9))
 >U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 23, 14))
 
     z: V;
->z : Symbol(z, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 25, 9))
+>z : Symbol(I.z, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 25, 9))
 >V : Symbol(V, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 23, 17))
 
     foo<W extends V>(x: W): T;
->foo : Symbol(foo, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 26, 9))
+>foo : Symbol(I.foo, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 26, 9))
 >W : Symbol(W, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 27, 8))
 >V : Symbol(V, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 23, 17))
 >x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 27, 21))
@@ -56,19 +56,19 @@ interface I2<V, T, U> {
 >U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 30, 18))
 
     x: T;
->x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 30, 23))
+>x : Symbol(I2.x, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 30, 23))
 >T : Symbol(T, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 30, 15))
 
     y: U;
->y : Symbol(y, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 31, 9))
+>y : Symbol(I2.y, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 31, 9))
 >U : Symbol(U, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 30, 18))
 
     z: V;
->z : Symbol(z, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 32, 9))
+>z : Symbol(I2.z, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 32, 9))
 >V : Symbol(V, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 30, 13))
 
     foo<W extends V>(x: W): T;
->foo : Symbol(foo, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 33, 9))
+>foo : Symbol(I2.foo, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 33, 9))
 >W : Symbol(W, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 34, 8))
 >V : Symbol(V, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 30, 13))
 >x : Symbol(x, Decl(typeParameterUsedAsTypeParameterConstraint3.ts, 34, 21))
diff --git a/tests/baselines/reference/typeParametersAreIdenticalToThemselves.symbols b/tests/baselines/reference/typeParametersAreIdenticalToThemselves.symbols
index e50bce9e043..39479bdba90 100644
--- a/tests/baselines/reference/typeParametersAreIdenticalToThemselves.symbols
+++ b/tests/baselines/reference/typeParametersAreIdenticalToThemselves.symbols
@@ -85,22 +85,22 @@ class C<T> {
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 20, 8))
 
     foo1(x: T);
->foo1 : Symbol(foo1, Decl(typeParametersAreIdenticalToThemselves.ts, 20, 12), Decl(typeParametersAreIdenticalToThemselves.ts, 21, 15), Decl(typeParametersAreIdenticalToThemselves.ts, 22, 15))
+>foo1 : Symbol(C.foo1, Decl(typeParametersAreIdenticalToThemselves.ts, 20, 12), Decl(typeParametersAreIdenticalToThemselves.ts, 21, 15), Decl(typeParametersAreIdenticalToThemselves.ts, 22, 15))
 >x : Symbol(x, Decl(typeParametersAreIdenticalToThemselves.ts, 21, 9))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 20, 8))
 
     foo1(x: T); // error, same T
->foo1 : Symbol(foo1, Decl(typeParametersAreIdenticalToThemselves.ts, 20, 12), Decl(typeParametersAreIdenticalToThemselves.ts, 21, 15), Decl(typeParametersAreIdenticalToThemselves.ts, 22, 15))
+>foo1 : Symbol(C.foo1, Decl(typeParametersAreIdenticalToThemselves.ts, 20, 12), Decl(typeParametersAreIdenticalToThemselves.ts, 21, 15), Decl(typeParametersAreIdenticalToThemselves.ts, 22, 15))
 >x : Symbol(x, Decl(typeParametersAreIdenticalToThemselves.ts, 22, 9))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 20, 8))
 
     foo1(x: T) { }
->foo1 : Symbol(foo1, Decl(typeParametersAreIdenticalToThemselves.ts, 20, 12), Decl(typeParametersAreIdenticalToThemselves.ts, 21, 15), Decl(typeParametersAreIdenticalToThemselves.ts, 22, 15))
+>foo1 : Symbol(C.foo1, Decl(typeParametersAreIdenticalToThemselves.ts, 20, 12), Decl(typeParametersAreIdenticalToThemselves.ts, 21, 15), Decl(typeParametersAreIdenticalToThemselves.ts, 22, 15))
 >x : Symbol(x, Decl(typeParametersAreIdenticalToThemselves.ts, 23, 9))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 20, 8))
 
     foo2<U>(a: T, x: U);
->foo2 : Symbol(foo2, Decl(typeParametersAreIdenticalToThemselves.ts, 23, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 25, 24), Decl(typeParametersAreIdenticalToThemselves.ts, 26, 24))
+>foo2 : Symbol(C.foo2, Decl(typeParametersAreIdenticalToThemselves.ts, 23, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 25, 24), Decl(typeParametersAreIdenticalToThemselves.ts, 26, 24))
 >U : Symbol(U, Decl(typeParametersAreIdenticalToThemselves.ts, 25, 9))
 >a : Symbol(a, Decl(typeParametersAreIdenticalToThemselves.ts, 25, 12))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 20, 8))
@@ -108,7 +108,7 @@ class C<T> {
 >U : Symbol(U, Decl(typeParametersAreIdenticalToThemselves.ts, 25, 9))
 
     foo2<U>(a: T, x: U); // no error, different declaration for each U
->foo2 : Symbol(foo2, Decl(typeParametersAreIdenticalToThemselves.ts, 23, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 25, 24), Decl(typeParametersAreIdenticalToThemselves.ts, 26, 24))
+>foo2 : Symbol(C.foo2, Decl(typeParametersAreIdenticalToThemselves.ts, 23, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 25, 24), Decl(typeParametersAreIdenticalToThemselves.ts, 26, 24))
 >U : Symbol(U, Decl(typeParametersAreIdenticalToThemselves.ts, 26, 9))
 >a : Symbol(a, Decl(typeParametersAreIdenticalToThemselves.ts, 26, 12))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 20, 8))
@@ -116,7 +116,7 @@ class C<T> {
 >U : Symbol(U, Decl(typeParametersAreIdenticalToThemselves.ts, 26, 9))
 
     foo2<U>(a: T, x: U) { }
->foo2 : Symbol(foo2, Decl(typeParametersAreIdenticalToThemselves.ts, 23, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 25, 24), Decl(typeParametersAreIdenticalToThemselves.ts, 26, 24))
+>foo2 : Symbol(C.foo2, Decl(typeParametersAreIdenticalToThemselves.ts, 23, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 25, 24), Decl(typeParametersAreIdenticalToThemselves.ts, 26, 24))
 >U : Symbol(U, Decl(typeParametersAreIdenticalToThemselves.ts, 27, 9))
 >a : Symbol(a, Decl(typeParametersAreIdenticalToThemselves.ts, 27, 12))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 20, 8))
@@ -124,41 +124,41 @@ class C<T> {
 >U : Symbol(U, Decl(typeParametersAreIdenticalToThemselves.ts, 27, 9))
 
     foo3<T>(x: T);
->foo3 : Symbol(foo3, Decl(typeParametersAreIdenticalToThemselves.ts, 27, 27), Decl(typeParametersAreIdenticalToThemselves.ts, 29, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 30, 18))
+>foo3 : Symbol(C.foo3, Decl(typeParametersAreIdenticalToThemselves.ts, 27, 27), Decl(typeParametersAreIdenticalToThemselves.ts, 29, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 30, 18))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 29, 9))
 >x : Symbol(x, Decl(typeParametersAreIdenticalToThemselves.ts, 29, 12))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 29, 9))
 
     foo3<T>(x: T); // no error, different declaration for each T
->foo3 : Symbol(foo3, Decl(typeParametersAreIdenticalToThemselves.ts, 27, 27), Decl(typeParametersAreIdenticalToThemselves.ts, 29, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 30, 18))
+>foo3 : Symbol(C.foo3, Decl(typeParametersAreIdenticalToThemselves.ts, 27, 27), Decl(typeParametersAreIdenticalToThemselves.ts, 29, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 30, 18))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 30, 9))
 >x : Symbol(x, Decl(typeParametersAreIdenticalToThemselves.ts, 30, 12))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 30, 9))
 
     foo3<T>(x: T) { }
->foo3 : Symbol(foo3, Decl(typeParametersAreIdenticalToThemselves.ts, 27, 27), Decl(typeParametersAreIdenticalToThemselves.ts, 29, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 30, 18))
+>foo3 : Symbol(C.foo3, Decl(typeParametersAreIdenticalToThemselves.ts, 27, 27), Decl(typeParametersAreIdenticalToThemselves.ts, 29, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 30, 18))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 31, 9))
 >x : Symbol(x, Decl(typeParametersAreIdenticalToThemselves.ts, 31, 12))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 31, 9))
 
     foo4<T extends Date>(x: T);
->foo4 : Symbol(foo4, Decl(typeParametersAreIdenticalToThemselves.ts, 31, 21), Decl(typeParametersAreIdenticalToThemselves.ts, 33, 31), Decl(typeParametersAreIdenticalToThemselves.ts, 34, 31))
+>foo4 : Symbol(C.foo4, Decl(typeParametersAreIdenticalToThemselves.ts, 31, 21), Decl(typeParametersAreIdenticalToThemselves.ts, 33, 31), Decl(typeParametersAreIdenticalToThemselves.ts, 34, 31))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 33, 9))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(typeParametersAreIdenticalToThemselves.ts, 33, 25))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 33, 9))
 
     foo4<T extends Date>(x: T); // no error, different declaration for each T
->foo4 : Symbol(foo4, Decl(typeParametersAreIdenticalToThemselves.ts, 31, 21), Decl(typeParametersAreIdenticalToThemselves.ts, 33, 31), Decl(typeParametersAreIdenticalToThemselves.ts, 34, 31))
+>foo4 : Symbol(C.foo4, Decl(typeParametersAreIdenticalToThemselves.ts, 31, 21), Decl(typeParametersAreIdenticalToThemselves.ts, 33, 31), Decl(typeParametersAreIdenticalToThemselves.ts, 34, 31))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 34, 9))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(typeParametersAreIdenticalToThemselves.ts, 34, 25))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 34, 9))
 
     foo4<T extends Date>(x: T) { }
->foo4 : Symbol(foo4, Decl(typeParametersAreIdenticalToThemselves.ts, 31, 21), Decl(typeParametersAreIdenticalToThemselves.ts, 33, 31), Decl(typeParametersAreIdenticalToThemselves.ts, 34, 31))
+>foo4 : Symbol(C.foo4, Decl(typeParametersAreIdenticalToThemselves.ts, 31, 21), Decl(typeParametersAreIdenticalToThemselves.ts, 33, 31), Decl(typeParametersAreIdenticalToThemselves.ts, 34, 31))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 35, 9))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(typeParametersAreIdenticalToThemselves.ts, 35, 25))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 35, 9))
 }
@@ -166,25 +166,25 @@ class C<T> {
 class C2<T extends Date> {
 >C2 : Symbol(C2, Decl(typeParametersAreIdenticalToThemselves.ts, 36, 1))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 38, 9))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     foo1(x: T);
->foo1 : Symbol(foo1, Decl(typeParametersAreIdenticalToThemselves.ts, 38, 26), Decl(typeParametersAreIdenticalToThemselves.ts, 39, 15), Decl(typeParametersAreIdenticalToThemselves.ts, 40, 15))
+>foo1 : Symbol(C2.foo1, Decl(typeParametersAreIdenticalToThemselves.ts, 38, 26), Decl(typeParametersAreIdenticalToThemselves.ts, 39, 15), Decl(typeParametersAreIdenticalToThemselves.ts, 40, 15))
 >x : Symbol(x, Decl(typeParametersAreIdenticalToThemselves.ts, 39, 9))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 38, 9))
 
     foo1(x: T); // error, same T
->foo1 : Symbol(foo1, Decl(typeParametersAreIdenticalToThemselves.ts, 38, 26), Decl(typeParametersAreIdenticalToThemselves.ts, 39, 15), Decl(typeParametersAreIdenticalToThemselves.ts, 40, 15))
+>foo1 : Symbol(C2.foo1, Decl(typeParametersAreIdenticalToThemselves.ts, 38, 26), Decl(typeParametersAreIdenticalToThemselves.ts, 39, 15), Decl(typeParametersAreIdenticalToThemselves.ts, 40, 15))
 >x : Symbol(x, Decl(typeParametersAreIdenticalToThemselves.ts, 40, 9))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 38, 9))
 
     foo1(x: T) { }
->foo1 : Symbol(foo1, Decl(typeParametersAreIdenticalToThemselves.ts, 38, 26), Decl(typeParametersAreIdenticalToThemselves.ts, 39, 15), Decl(typeParametersAreIdenticalToThemselves.ts, 40, 15))
+>foo1 : Symbol(C2.foo1, Decl(typeParametersAreIdenticalToThemselves.ts, 38, 26), Decl(typeParametersAreIdenticalToThemselves.ts, 39, 15), Decl(typeParametersAreIdenticalToThemselves.ts, 40, 15))
 >x : Symbol(x, Decl(typeParametersAreIdenticalToThemselves.ts, 41, 9))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 38, 9))
 
     foo2<U>(a: T, x: U);
->foo2 : Symbol(foo2, Decl(typeParametersAreIdenticalToThemselves.ts, 41, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 43, 24), Decl(typeParametersAreIdenticalToThemselves.ts, 44, 24))
+>foo2 : Symbol(C2.foo2, Decl(typeParametersAreIdenticalToThemselves.ts, 41, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 43, 24), Decl(typeParametersAreIdenticalToThemselves.ts, 44, 24))
 >U : Symbol(U, Decl(typeParametersAreIdenticalToThemselves.ts, 43, 9))
 >a : Symbol(a, Decl(typeParametersAreIdenticalToThemselves.ts, 43, 12))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 38, 9))
@@ -192,7 +192,7 @@ class C2<T extends Date> {
 >U : Symbol(U, Decl(typeParametersAreIdenticalToThemselves.ts, 43, 9))
 
     foo2<U>(a: T, x: U); // no error, different declaration for each U
->foo2 : Symbol(foo2, Decl(typeParametersAreIdenticalToThemselves.ts, 41, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 43, 24), Decl(typeParametersAreIdenticalToThemselves.ts, 44, 24))
+>foo2 : Symbol(C2.foo2, Decl(typeParametersAreIdenticalToThemselves.ts, 41, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 43, 24), Decl(typeParametersAreIdenticalToThemselves.ts, 44, 24))
 >U : Symbol(U, Decl(typeParametersAreIdenticalToThemselves.ts, 44, 9))
 >a : Symbol(a, Decl(typeParametersAreIdenticalToThemselves.ts, 44, 12))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 38, 9))
@@ -200,7 +200,7 @@ class C2<T extends Date> {
 >U : Symbol(U, Decl(typeParametersAreIdenticalToThemselves.ts, 44, 9))
 
     foo2<U>(a: T, x: U) { }
->foo2 : Symbol(foo2, Decl(typeParametersAreIdenticalToThemselves.ts, 41, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 43, 24), Decl(typeParametersAreIdenticalToThemselves.ts, 44, 24))
+>foo2 : Symbol(C2.foo2, Decl(typeParametersAreIdenticalToThemselves.ts, 41, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 43, 24), Decl(typeParametersAreIdenticalToThemselves.ts, 44, 24))
 >U : Symbol(U, Decl(typeParametersAreIdenticalToThemselves.ts, 45, 9))
 >a : Symbol(a, Decl(typeParametersAreIdenticalToThemselves.ts, 45, 12))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 38, 9))
@@ -208,19 +208,19 @@ class C2<T extends Date> {
 >U : Symbol(U, Decl(typeParametersAreIdenticalToThemselves.ts, 45, 9))
 
     foo3<T>(x: T);
->foo3 : Symbol(foo3, Decl(typeParametersAreIdenticalToThemselves.ts, 45, 27), Decl(typeParametersAreIdenticalToThemselves.ts, 47, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 48, 18))
+>foo3 : Symbol(C2.foo3, Decl(typeParametersAreIdenticalToThemselves.ts, 45, 27), Decl(typeParametersAreIdenticalToThemselves.ts, 47, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 48, 18))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 47, 9))
 >x : Symbol(x, Decl(typeParametersAreIdenticalToThemselves.ts, 47, 12))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 47, 9))
 
     foo3<T>(x: T); // no error, different declaration for each T
->foo3 : Symbol(foo3, Decl(typeParametersAreIdenticalToThemselves.ts, 45, 27), Decl(typeParametersAreIdenticalToThemselves.ts, 47, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 48, 18))
+>foo3 : Symbol(C2.foo3, Decl(typeParametersAreIdenticalToThemselves.ts, 45, 27), Decl(typeParametersAreIdenticalToThemselves.ts, 47, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 48, 18))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 48, 9))
 >x : Symbol(x, Decl(typeParametersAreIdenticalToThemselves.ts, 48, 12))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 48, 9))
 
     foo3<T>(x: T) { }
->foo3 : Symbol(foo3, Decl(typeParametersAreIdenticalToThemselves.ts, 45, 27), Decl(typeParametersAreIdenticalToThemselves.ts, 47, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 48, 18))
+>foo3 : Symbol(C2.foo3, Decl(typeParametersAreIdenticalToThemselves.ts, 45, 27), Decl(typeParametersAreIdenticalToThemselves.ts, 47, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 48, 18))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 49, 9))
 >x : Symbol(x, Decl(typeParametersAreIdenticalToThemselves.ts, 49, 12))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 49, 9))
@@ -231,17 +231,17 @@ interface I<T> {
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 52, 12))
 
     foo1(x: T);
->foo1 : Symbol(foo1, Decl(typeParametersAreIdenticalToThemselves.ts, 52, 16), Decl(typeParametersAreIdenticalToThemselves.ts, 53, 15))
+>foo1 : Symbol(I.foo1, Decl(typeParametersAreIdenticalToThemselves.ts, 52, 16), Decl(typeParametersAreIdenticalToThemselves.ts, 53, 15))
 >x : Symbol(x, Decl(typeParametersAreIdenticalToThemselves.ts, 53, 9))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 52, 12))
 
     foo1(x: T); // error, same T
->foo1 : Symbol(foo1, Decl(typeParametersAreIdenticalToThemselves.ts, 52, 16), Decl(typeParametersAreIdenticalToThemselves.ts, 53, 15))
+>foo1 : Symbol(I.foo1, Decl(typeParametersAreIdenticalToThemselves.ts, 52, 16), Decl(typeParametersAreIdenticalToThemselves.ts, 53, 15))
 >x : Symbol(x, Decl(typeParametersAreIdenticalToThemselves.ts, 54, 9))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 52, 12))
 
     foo2<U>(a: T, x: U);
->foo2 : Symbol(foo2, Decl(typeParametersAreIdenticalToThemselves.ts, 54, 15), Decl(typeParametersAreIdenticalToThemselves.ts, 56, 24))
+>foo2 : Symbol(I.foo2, Decl(typeParametersAreIdenticalToThemselves.ts, 54, 15), Decl(typeParametersAreIdenticalToThemselves.ts, 56, 24))
 >U : Symbol(U, Decl(typeParametersAreIdenticalToThemselves.ts, 56, 9))
 >a : Symbol(a, Decl(typeParametersAreIdenticalToThemselves.ts, 56, 12))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 52, 12))
@@ -249,7 +249,7 @@ interface I<T> {
 >U : Symbol(U, Decl(typeParametersAreIdenticalToThemselves.ts, 56, 9))
 
     foo2<U>(a: T, x: U); // no error, different declaration for each U
->foo2 : Symbol(foo2, Decl(typeParametersAreIdenticalToThemselves.ts, 54, 15), Decl(typeParametersAreIdenticalToThemselves.ts, 56, 24))
+>foo2 : Symbol(I.foo2, Decl(typeParametersAreIdenticalToThemselves.ts, 54, 15), Decl(typeParametersAreIdenticalToThemselves.ts, 56, 24))
 >U : Symbol(U, Decl(typeParametersAreIdenticalToThemselves.ts, 57, 9))
 >a : Symbol(a, Decl(typeParametersAreIdenticalToThemselves.ts, 57, 12))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 52, 12))
@@ -257,28 +257,28 @@ interface I<T> {
 >U : Symbol(U, Decl(typeParametersAreIdenticalToThemselves.ts, 57, 9))
 
     foo3<T>(x: T);
->foo3 : Symbol(foo3, Decl(typeParametersAreIdenticalToThemselves.ts, 57, 24), Decl(typeParametersAreIdenticalToThemselves.ts, 59, 18))
+>foo3 : Symbol(I.foo3, Decl(typeParametersAreIdenticalToThemselves.ts, 57, 24), Decl(typeParametersAreIdenticalToThemselves.ts, 59, 18))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 59, 9))
 >x : Symbol(x, Decl(typeParametersAreIdenticalToThemselves.ts, 59, 12))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 59, 9))
 
     foo3<T>(x: T); // no error, different declaration for each T
->foo3 : Symbol(foo3, Decl(typeParametersAreIdenticalToThemselves.ts, 57, 24), Decl(typeParametersAreIdenticalToThemselves.ts, 59, 18))
+>foo3 : Symbol(I.foo3, Decl(typeParametersAreIdenticalToThemselves.ts, 57, 24), Decl(typeParametersAreIdenticalToThemselves.ts, 59, 18))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 60, 9))
 >x : Symbol(x, Decl(typeParametersAreIdenticalToThemselves.ts, 60, 12))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 60, 9))
 
     foo4<T extends Date>(x: T);
->foo4 : Symbol(foo4, Decl(typeParametersAreIdenticalToThemselves.ts, 60, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 62, 31))
+>foo4 : Symbol(I.foo4, Decl(typeParametersAreIdenticalToThemselves.ts, 60, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 62, 31))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 62, 9))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(typeParametersAreIdenticalToThemselves.ts, 62, 25))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 62, 9))
 
     foo4<T extends Date>(x: T); // no error, different declaration for each T
->foo4 : Symbol(foo4, Decl(typeParametersAreIdenticalToThemselves.ts, 60, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 62, 31))
+>foo4 : Symbol(I.foo4, Decl(typeParametersAreIdenticalToThemselves.ts, 60, 18), Decl(typeParametersAreIdenticalToThemselves.ts, 62, 31))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 63, 9))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(typeParametersAreIdenticalToThemselves.ts, 63, 25))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 63, 9))
 }
@@ -286,20 +286,20 @@ interface I<T> {
 interface I2<T extends Date> {
 >I2 : Symbol(I2, Decl(typeParametersAreIdenticalToThemselves.ts, 64, 1))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 66, 13))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     foo1(x: T);
->foo1 : Symbol(foo1, Decl(typeParametersAreIdenticalToThemselves.ts, 66, 30), Decl(typeParametersAreIdenticalToThemselves.ts, 67, 15))
+>foo1 : Symbol(I2.foo1, Decl(typeParametersAreIdenticalToThemselves.ts, 66, 30), Decl(typeParametersAreIdenticalToThemselves.ts, 67, 15))
 >x : Symbol(x, Decl(typeParametersAreIdenticalToThemselves.ts, 67, 9))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 66, 13))
 
     foo1(x: T); // error, same T
->foo1 : Symbol(foo1, Decl(typeParametersAreIdenticalToThemselves.ts, 66, 30), Decl(typeParametersAreIdenticalToThemselves.ts, 67, 15))
+>foo1 : Symbol(I2.foo1, Decl(typeParametersAreIdenticalToThemselves.ts, 66, 30), Decl(typeParametersAreIdenticalToThemselves.ts, 67, 15))
 >x : Symbol(x, Decl(typeParametersAreIdenticalToThemselves.ts, 68, 9))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 66, 13))
 
     foo2<U>(a: T, x: U);
->foo2 : Symbol(foo2, Decl(typeParametersAreIdenticalToThemselves.ts, 68, 15), Decl(typeParametersAreIdenticalToThemselves.ts, 70, 24))
+>foo2 : Symbol(I2.foo2, Decl(typeParametersAreIdenticalToThemselves.ts, 68, 15), Decl(typeParametersAreIdenticalToThemselves.ts, 70, 24))
 >U : Symbol(U, Decl(typeParametersAreIdenticalToThemselves.ts, 70, 9))
 >a : Symbol(a, Decl(typeParametersAreIdenticalToThemselves.ts, 70, 12))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 66, 13))
@@ -307,7 +307,7 @@ interface I2<T extends Date> {
 >U : Symbol(U, Decl(typeParametersAreIdenticalToThemselves.ts, 70, 9))
 
     foo2<U>(a: T, x: U); // no error, different declaration for each U
->foo2 : Symbol(foo2, Decl(typeParametersAreIdenticalToThemselves.ts, 68, 15), Decl(typeParametersAreIdenticalToThemselves.ts, 70, 24))
+>foo2 : Symbol(I2.foo2, Decl(typeParametersAreIdenticalToThemselves.ts, 68, 15), Decl(typeParametersAreIdenticalToThemselves.ts, 70, 24))
 >U : Symbol(U, Decl(typeParametersAreIdenticalToThemselves.ts, 71, 9))
 >a : Symbol(a, Decl(typeParametersAreIdenticalToThemselves.ts, 71, 12))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 66, 13))
@@ -315,13 +315,13 @@ interface I2<T extends Date> {
 >U : Symbol(U, Decl(typeParametersAreIdenticalToThemselves.ts, 71, 9))
 
     foo3<T>(x: T);
->foo3 : Symbol(foo3, Decl(typeParametersAreIdenticalToThemselves.ts, 71, 24), Decl(typeParametersAreIdenticalToThemselves.ts, 73, 18))
+>foo3 : Symbol(I2.foo3, Decl(typeParametersAreIdenticalToThemselves.ts, 71, 24), Decl(typeParametersAreIdenticalToThemselves.ts, 73, 18))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 73, 9))
 >x : Symbol(x, Decl(typeParametersAreIdenticalToThemselves.ts, 73, 12))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 73, 9))
 
     foo3<T>(x: T); // no error, different declaration for each T
->foo3 : Symbol(foo3, Decl(typeParametersAreIdenticalToThemselves.ts, 71, 24), Decl(typeParametersAreIdenticalToThemselves.ts, 73, 18))
+>foo3 : Symbol(I2.foo3, Decl(typeParametersAreIdenticalToThemselves.ts, 71, 24), Decl(typeParametersAreIdenticalToThemselves.ts, 73, 18))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 74, 9))
 >x : Symbol(x, Decl(typeParametersAreIdenticalToThemselves.ts, 74, 12))
 >T : Symbol(T, Decl(typeParametersAreIdenticalToThemselves.ts, 74, 9))
diff --git a/tests/baselines/reference/typeParametersAvailableInNestedScope.symbols b/tests/baselines/reference/typeParametersAvailableInNestedScope.symbols
index 905ccba8f3f..d9b3661ace9 100644
--- a/tests/baselines/reference/typeParametersAvailableInNestedScope.symbols
+++ b/tests/baselines/reference/typeParametersAvailableInNestedScope.symbols
@@ -4,11 +4,11 @@ class C<T> {
 >T : Symbol(T, Decl(typeParametersAvailableInNestedScope.ts, 0, 8))
 
     data: T;
->data : Symbol(data, Decl(typeParametersAvailableInNestedScope.ts, 0, 12))
+>data : Symbol(C.data, Decl(typeParametersAvailableInNestedScope.ts, 0, 12))
 >T : Symbol(T, Decl(typeParametersAvailableInNestedScope.ts, 0, 8))
 
     x = <U>(a: U) => {
->x : Symbol(x, Decl(typeParametersAvailableInNestedScope.ts, 1, 12))
+>x : Symbol(C.x, Decl(typeParametersAvailableInNestedScope.ts, 1, 12))
 >U : Symbol(U, Decl(typeParametersAvailableInNestedScope.ts, 3, 9))
 >a : Symbol(a, Decl(typeParametersAvailableInNestedScope.ts, 3, 12))
 >U : Symbol(U, Decl(typeParametersAvailableInNestedScope.ts, 3, 9))
@@ -22,7 +22,7 @@ class C<T> {
     }
 
     foo() {
->foo : Symbol(foo, Decl(typeParametersAvailableInNestedScope.ts, 6, 5))
+>foo : Symbol(C.foo, Decl(typeParametersAvailableInNestedScope.ts, 6, 5))
 
         function temp<U>(a: U) {
 >temp : Symbol(temp, Decl(typeParametersAvailableInNestedScope.ts, 8, 11))
diff --git a/tests/baselines/reference/typePredicateASI.symbols b/tests/baselines/reference/typePredicateASI.symbols
index c451c4caf06..b3a9c3fd030 100644
--- a/tests/baselines/reference/typePredicateASI.symbols
+++ b/tests/baselines/reference/typePredicateASI.symbols
@@ -3,12 +3,12 @@ interface I {
 >I : Symbol(I, Decl(typePredicateASI.ts, 0, 0))
 
     foo(callback: (a: any, b: any) => void): I
->foo : Symbol(foo, Decl(typePredicateASI.ts, 0, 13))
+>foo : Symbol(I.foo, Decl(typePredicateASI.ts, 0, 13))
 >callback : Symbol(callback, Decl(typePredicateASI.ts, 1, 8))
 >a : Symbol(a, Decl(typePredicateASI.ts, 1, 19))
 >b : Symbol(b, Decl(typePredicateASI.ts, 1, 26))
 >I : Symbol(I, Decl(typePredicateASI.ts, 0, 0))
 
     is(): boolean;
->is : Symbol(is, Decl(typePredicateASI.ts, 1, 46))
+>is : Symbol(I.is, Decl(typePredicateASI.ts, 1, 46))
 }
diff --git a/tests/baselines/reference/typePredicateOnVariableDeclaration01.errors.txt b/tests/baselines/reference/typePredicateOnVariableDeclaration01.errors.txt
new file mode 100644
index 00000000000..b713dd12ae7
--- /dev/null
+++ b/tests/baselines/reference/typePredicateOnVariableDeclaration01.errors.txt
@@ -0,0 +1,8 @@
+tests/cases/conformance/expressions/typeGuards/typePredicateOnVariableDeclaration01.ts(2,8): error TS1228: A type predicate is only allowed in return type position for functions and methods.
+
+
+==== tests/cases/conformance/expressions/typeGuards/typePredicateOnVariableDeclaration01.ts (1 errors) ====
+    
+    var x: this is string;
+           ~~~~~~~~~~~~~~
+!!! error TS1228: A type predicate is only allowed in return type position for functions and methods.
\ No newline at end of file
diff --git a/tests/baselines/reference/typePredicateOnVariableDeclaration01.js b/tests/baselines/reference/typePredicateOnVariableDeclaration01.js
new file mode 100644
index 00000000000..5831142cf5c
--- /dev/null
+++ b/tests/baselines/reference/typePredicateOnVariableDeclaration01.js
@@ -0,0 +1,10 @@
+//// [typePredicateOnVariableDeclaration01.ts]
+
+var x: this is string;
+
+//// [typePredicateOnVariableDeclaration01.js]
+var x;
+
+
+//// [typePredicateOnVariableDeclaration01.d.ts]
+declare var x: this is string;
diff --git a/tests/baselines/reference/typePredicateOnVariableDeclaration02.errors.txt b/tests/baselines/reference/typePredicateOnVariableDeclaration02.errors.txt
new file mode 100644
index 00000000000..af967b22b79
--- /dev/null
+++ b/tests/baselines/reference/typePredicateOnVariableDeclaration02.errors.txt
@@ -0,0 +1,20 @@
+tests/cases/conformance/expressions/typeGuards/typePredicateOnVariableDeclaration02.ts(2,8): error TS2304: Cannot find name 'z'.
+tests/cases/conformance/expressions/typeGuards/typePredicateOnVariableDeclaration02.ts(2,8): error TS4025: Exported variable 'y' has or is using private name 'z'.
+tests/cases/conformance/expressions/typeGuards/typePredicateOnVariableDeclaration02.ts(2,10): error TS1005: '=' expected.
+tests/cases/conformance/expressions/typeGuards/typePredicateOnVariableDeclaration02.ts(2,10): error TS2304: Cannot find name 'is'.
+tests/cases/conformance/expressions/typeGuards/typePredicateOnVariableDeclaration02.ts(2,13): error TS1005: ',' expected.
+
+
+==== tests/cases/conformance/expressions/typeGuards/typePredicateOnVariableDeclaration02.ts (5 errors) ====
+    
+    var y: z is number;
+           ~
+!!! error TS2304: Cannot find name 'z'.
+           ~
+!!! error TS4025: Exported variable 'y' has or is using private name 'z'.
+             ~~
+!!! error TS1005: '=' expected.
+             ~~
+!!! error TS2304: Cannot find name 'is'.
+                ~~~~~~
+!!! error TS1005: ',' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/typePredicateOnVariableDeclaration02.js b/tests/baselines/reference/typePredicateOnVariableDeclaration02.js
new file mode 100644
index 00000000000..b28a89116ba
--- /dev/null
+++ b/tests/baselines/reference/typePredicateOnVariableDeclaration02.js
@@ -0,0 +1,6 @@
+//// [typePredicateOnVariableDeclaration02.ts]
+
+var y: z is number;
+
+//// [typePredicateOnVariableDeclaration02.js]
+var y = is, number;
diff --git a/tests/baselines/reference/typeQueryWithReservedWords.symbols b/tests/baselines/reference/typeQueryWithReservedWords.symbols
index c8c04e3c2aa..e804d9dddaa 100644
--- a/tests/baselines/reference/typeQueryWithReservedWords.symbols
+++ b/tests/baselines/reference/typeQueryWithReservedWords.symbols
@@ -3,13 +3,13 @@ class Controller {
 >Controller : Symbol(Controller, Decl(typeQueryWithReservedWords.ts, 0, 0))
 
     create() {
->create : Symbol(create, Decl(typeQueryWithReservedWords.ts, 0, 18))
+>create : Symbol(Controller.create, Decl(typeQueryWithReservedWords.ts, 0, 18))
     }
     delete() {
->delete : Symbol(delete, Decl(typeQueryWithReservedWords.ts, 2, 5))
+>delete : Symbol(Controller.delete, Decl(typeQueryWithReservedWords.ts, 2, 5))
     }
     var() {
->var : Symbol(var, Decl(typeQueryWithReservedWords.ts, 4, 5))
+>var : Symbol(Controller.var, Decl(typeQueryWithReservedWords.ts, 4, 5))
     }
 }
 
@@ -17,7 +17,7 @@ interface IScope {
 >IScope : Symbol(IScope, Decl(typeQueryWithReservedWords.ts, 7, 1))
 
     create: typeof Controller.prototype.create;  
->create : Symbol(create, Decl(typeQueryWithReservedWords.ts, 9, 18))
+>create : Symbol(IScope.create, Decl(typeQueryWithReservedWords.ts, 9, 18))
 >Controller.prototype.create : Symbol(Controller.create, Decl(typeQueryWithReservedWords.ts, 0, 18))
 >Controller.prototype : Symbol(Controller.prototype)
 >Controller : Symbol(Controller, Decl(typeQueryWithReservedWords.ts, 0, 0))
@@ -25,7 +25,7 @@ interface IScope {
 >create : Symbol(Controller.create, Decl(typeQueryWithReservedWords.ts, 0, 18))
 
     delete: typeof Controller.prototype.delete;  // Should not error
->delete : Symbol(delete, Decl(typeQueryWithReservedWords.ts, 10, 47))
+>delete : Symbol(IScope.delete, Decl(typeQueryWithReservedWords.ts, 10, 47))
 >Controller.prototype.delete : Symbol(Controller.delete, Decl(typeQueryWithReservedWords.ts, 2, 5))
 >Controller.prototype : Symbol(Controller.prototype)
 >Controller : Symbol(Controller, Decl(typeQueryWithReservedWords.ts, 0, 0))
@@ -33,7 +33,7 @@ interface IScope {
 >delete : Symbol(Controller.delete, Decl(typeQueryWithReservedWords.ts, 2, 5))
 
     var: typeof Controller.prototype.var;        // Should not error
->var : Symbol(var, Decl(typeQueryWithReservedWords.ts, 11, 47))
+>var : Symbol(IScope.var, Decl(typeQueryWithReservedWords.ts, 11, 47))
 >Controller.prototype.var : Symbol(Controller.var, Decl(typeQueryWithReservedWords.ts, 4, 5))
 >Controller.prototype : Symbol(Controller.prototype)
 >Controller : Symbol(Controller, Decl(typeQueryWithReservedWords.ts, 0, 0))
diff --git a/tests/baselines/reference/typeReferenceDirectives1.js b/tests/baselines/reference/typeReferenceDirectives1.js
new file mode 100644
index 00000000000..775af9c5283
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives1.js
@@ -0,0 +1,21 @@
+//// [tests/cases/compiler/typeReferenceDirectives1.ts] ////
+
+//// [index.d.ts]
+
+
+interface $ { x }
+
+//// [app.ts]
+/// <reference types="lib"/>
+interface A {
+    x: $
+}
+
+//// [app.js]
+
+
+//// [app.d.ts]
+/// <reference types="lib" />
+interface A {
+    x: $;
+}
diff --git a/tests/baselines/reference/typeReferenceDirectives1.symbols b/tests/baselines/reference/typeReferenceDirectives1.symbols
new file mode 100644
index 00000000000..55c17b219ec
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives1.symbols
@@ -0,0 +1,16 @@
+=== /app.ts ===
+/// <reference types="lib"/>
+interface A {
+>A : Symbol(A, Decl(app.ts, 0, 0))
+
+    x: $
+>x : Symbol(A.x, Decl(app.ts, 1, 13))
+>$ : Symbol($, Decl(index.d.ts, 0, 0))
+}
+=== /types/lib/index.d.ts ===
+
+
+interface $ { x }
+>$ : Symbol($, Decl(index.d.ts, 0, 0))
+>x : Symbol($.x, Decl(index.d.ts, 2, 13))
+
diff --git a/tests/baselines/reference/typeReferenceDirectives1.trace.json b/tests/baselines/reference/typeReferenceDirectives1.trace.json
new file mode 100644
index 00000000000..c936a84dcc0
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives1.trace.json
@@ -0,0 +1,7 @@
+[
+    "======== Resolving type reference directive 'lib', containing file '/app.ts', root directory '/'. ========",
+    "Resolving with primary search path '/types/'",
+    "File '/types/lib/package.json' does not exist.",
+    "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives1.types b/tests/baselines/reference/typeReferenceDirectives1.types
new file mode 100644
index 00000000000..05080e05651
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives1.types
@@ -0,0 +1,16 @@
+=== /app.ts ===
+/// <reference types="lib"/>
+interface A {
+>A : A
+
+    x: $
+>x : $
+>$ : $
+}
+=== /types/lib/index.d.ts ===
+
+
+interface $ { x }
+>$ : $
+>x : any
+
diff --git a/tests/baselines/reference/typeReferenceDirectives10.js b/tests/baselines/reference/typeReferenceDirectives10.js
new file mode 100644
index 00000000000..e4253bb3a58
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives10.js
@@ -0,0 +1,26 @@
+//// [tests/cases/compiler/typeReferenceDirectives10.ts] ////
+
+//// [ref.d.ts]
+
+export interface $ { x }
+
+//// [index.d.ts]
+declare let $: { x: number }
+
+//// [app.ts]
+/// <reference types="lib"/>
+import {$} from "./ref";
+export interface A {
+    x: $
+}
+
+
+//// [app.js]
+"use strict";
+
+
+//// [app.d.ts]
+import { $ } from "./ref";
+export interface A {
+    x: $;
+}
diff --git a/tests/baselines/reference/typeReferenceDirectives10.symbols b/tests/baselines/reference/typeReferenceDirectives10.symbols
new file mode 100644
index 00000000000..910f9ac6643
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives10.symbols
@@ -0,0 +1,24 @@
+=== /app.ts ===
+/// <reference types="lib"/>
+import {$} from "./ref";
+>$ : Symbol($, Decl(app.ts, 1, 8))
+
+export interface A {
+>A : Symbol(A, Decl(app.ts, 1, 24))
+
+    x: $
+>x : Symbol(A.x, Decl(app.ts, 2, 20))
+>$ : Symbol($, Decl(app.ts, 1, 8))
+}
+
+=== /ref.d.ts ===
+
+export interface $ { x }
+>$ : Symbol($, Decl(ref.d.ts, 0, 0))
+>x : Symbol($.x, Decl(ref.d.ts, 1, 20))
+
+=== /types/lib/index.d.ts ===
+declare let $: { x: number }
+>$ : Symbol($, Decl(index.d.ts, 0, 11))
+>x : Symbol(x, Decl(index.d.ts, 0, 16))
+
diff --git a/tests/baselines/reference/typeReferenceDirectives10.trace.json b/tests/baselines/reference/typeReferenceDirectives10.trace.json
new file mode 100644
index 00000000000..b6adaf1f513
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives10.trace.json
@@ -0,0 +1,14 @@
+[
+    "======== Resolving type reference directive 'lib', containing file '/app.ts', root directory '/'. ========",
+    "Resolving with primary search path '/types/'",
+    "File '/types/lib/package.json' does not exist.",
+    "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
+    "======== Resolving module './ref' from '/app.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module as file / folder, candidate module location '/ref'.",
+    "File '/ref.ts' does not exist.",
+    "File '/ref.tsx' does not exist.",
+    "File '/ref.d.ts' exist - use it as a name resolution result.",
+    "======== Module name './ref' was successfully resolved to '/ref.d.ts'. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives10.types b/tests/baselines/reference/typeReferenceDirectives10.types
new file mode 100644
index 00000000000..c33e2e64a88
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives10.types
@@ -0,0 +1,24 @@
+=== /app.ts ===
+/// <reference types="lib"/>
+import {$} from "./ref";
+>$ : any
+
+export interface A {
+>A : A
+
+    x: $
+>x : $
+>$ : $
+}
+
+=== /ref.d.ts ===
+
+export interface $ { x }
+>$ : $
+>x : any
+
+=== /types/lib/index.d.ts ===
+declare let $: { x: number }
+>$ : { x: number; }
+>x : number
+
diff --git a/tests/baselines/reference/typeReferenceDirectives11.js b/tests/baselines/reference/typeReferenceDirectives11.js
new file mode 100644
index 00000000000..b75ce8b4762
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives11.js
@@ -0,0 +1,36 @@
+//// [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]
+define("mod1", ["require", "exports"], function (require, exports) {
+    "use strict";
+    function foo() { return { x: 1 }; }
+    exports.foo = foo;
+});
+define("mod2", ["require", "exports", "mod1"], function (require, exports, mod1_1) {
+    "use strict";
+    exports.bar = mod1_1.foo();
+});
+
+
+//// [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.trace.json b/tests/baselines/reference/typeReferenceDirectives11.trace.json
new file mode 100644
index 00000000000..c21e8989f4a
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives11.trace.json
@@ -0,0 +1,11 @@
+[
+    "======== Resolving type reference directive 'lib', containing file not set, root directory '/'. ========",
+    "Resolving with primary search path '/types/'",
+    "File '/types/lib/package.json' does not exist.",
+    "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
+    "======== Resolving module './mod1' from '/mod2.ts'. ========",
+    "Module resolution kind is not specified, using 'Classic'.",
+    "File '/mod1.ts' exist - use it as a name resolution result.",
+    "======== Module name './mod1' was successfully resolved to '/mod1.ts'. ========"
+]
\ No newline at end of file
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.js b/tests/baselines/reference/typeReferenceDirectives12.js
new file mode 100644
index 00000000000..8d64e1dba9b
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives12.js
@@ -0,0 +1,82 @@
+//// [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]
+define("main", ["require", "exports"], function (require, exports) {
+    "use strict";
+    var Cls = (function () {
+        function Cls() {
+        }
+        return Cls;
+    }());
+    exports.Cls = Cls;
+});
+/// <reference types="lib" />
+define("mod1", ["require", "exports", "main"], function (require, exports, main_1) {
+    "use strict";
+    main_1.Cls.prototype.foo = function () { return undefined; };
+});
+define("mod2", ["require", "exports", "main", "mod1"], function (require, exports, main_2) {
+    "use strict";
+    exports.cls = main_2.Cls;
+    exports.foo = new main_2.Cls().foo();
+    exports.bar = main_2.Cls.bar();
+});
+
+
+//// [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.trace.json b/tests/baselines/reference/typeReferenceDirectives12.trace.json
new file mode 100644
index 00000000000..ff27d63ef50
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives12.trace.json
@@ -0,0 +1,19 @@
+[
+    "======== Resolving module './main' from '/mod2.ts'. ========",
+    "Module resolution kind is not specified, using 'Classic'.",
+    "File '/main.ts' exist - use it as a name resolution result.",
+    "======== Module name './main' was successfully resolved to '/main.ts'. ========",
+    "======== Resolving module './mod1' from '/mod2.ts'. ========",
+    "Module resolution kind is not specified, using 'Classic'.",
+    "File '/mod1.ts' exist - use it as a name resolution result.",
+    "======== Module name './mod1' was successfully resolved to '/mod1.ts'. ========",
+    "======== Resolving type reference directive 'lib', containing file '/mod1.ts', root directory '/'. ========",
+    "Resolving with primary search path '/types/'",
+    "File '/types/lib/package.json' does not exist.",
+    "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
+    "======== Resolving module './main' from '/mod1.ts'. ========",
+    "Module resolution kind is not specified, using 'Classic'.",
+    "File '/main.ts' exist - use it as a name resolution result.",
+    "======== Module name './main' was successfully resolved to '/main.ts'. ========"
+]
\ No newline at end of file
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/typeReferenceDirectives13.js b/tests/baselines/reference/typeReferenceDirectives13.js
new file mode 100644
index 00000000000..9fecdd47f77
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives13.js
@@ -0,0 +1,26 @@
+//// [tests/cases/compiler/typeReferenceDirectives13.ts] ////
+
+//// [ref.d.ts]
+
+export interface $ { x }
+
+//// [index.d.ts]
+declare let $: { x: number }
+
+//// [app.ts]
+/// <reference types="lib"/>
+import {$} from "./ref";
+export interface A {
+    x: () => typeof $
+}
+
+
+//// [app.js]
+"use strict";
+
+
+//// [app.d.ts]
+/// <reference types="lib" />
+export interface A {
+    x: () => typeof $;
+}
diff --git a/tests/baselines/reference/typeReferenceDirectives13.symbols b/tests/baselines/reference/typeReferenceDirectives13.symbols
new file mode 100644
index 00000000000..90a32b16341
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives13.symbols
@@ -0,0 +1,24 @@
+=== /app.ts ===
+/// <reference types="lib"/>
+import {$} from "./ref";
+>$ : Symbol($, Decl(app.ts, 1, 8))
+
+export interface A {
+>A : Symbol(A, Decl(app.ts, 1, 24))
+
+    x: () => typeof $
+>x : Symbol(A.x, Decl(app.ts, 2, 20))
+>$ : Symbol($, Decl(app.ts, 1, 8))
+}
+
+=== /ref.d.ts ===
+
+export interface $ { x }
+>$ : Symbol($, Decl(ref.d.ts, 0, 0))
+>x : Symbol($.x, Decl(ref.d.ts, 1, 20))
+
+=== /types/lib/index.d.ts ===
+declare let $: { x: number }
+>$ : Symbol($, Decl(index.d.ts, 0, 11))
+>x : Symbol(x, Decl(index.d.ts, 0, 16))
+
diff --git a/tests/baselines/reference/typeReferenceDirectives13.trace.json b/tests/baselines/reference/typeReferenceDirectives13.trace.json
new file mode 100644
index 00000000000..b6adaf1f513
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives13.trace.json
@@ -0,0 +1,14 @@
+[
+    "======== Resolving type reference directive 'lib', containing file '/app.ts', root directory '/'. ========",
+    "Resolving with primary search path '/types/'",
+    "File '/types/lib/package.json' does not exist.",
+    "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
+    "======== Resolving module './ref' from '/app.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module as file / folder, candidate module location '/ref'.",
+    "File '/ref.ts' does not exist.",
+    "File '/ref.tsx' does not exist.",
+    "File '/ref.d.ts' exist - use it as a name resolution result.",
+    "======== Module name './ref' was successfully resolved to '/ref.d.ts'. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives13.types b/tests/baselines/reference/typeReferenceDirectives13.types
new file mode 100644
index 00000000000..240661883bb
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives13.types
@@ -0,0 +1,24 @@
+=== /app.ts ===
+/// <reference types="lib"/>
+import {$} from "./ref";
+>$ : any
+
+export interface A {
+>A : A
+
+    x: () => typeof $
+>x : () => { x: number; }
+>$ : { x: number; }
+}
+
+=== /ref.d.ts ===
+
+export interface $ { x }
+>$ : $
+>x : any
+
+=== /types/lib/index.d.ts ===
+declare let $: { x: number }
+>$ : { x: number; }
+>x : number
+
diff --git a/tests/baselines/reference/typeReferenceDirectives2.js b/tests/baselines/reference/typeReferenceDirectives2.js
new file mode 100644
index 00000000000..3d441ac04fc
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives2.js
@@ -0,0 +1,19 @@
+//// [tests/cases/compiler/typeReferenceDirectives2.ts] ////
+
+//// [index.d.ts]
+
+interface $ { x }
+
+//// [app.ts]
+interface A {
+    x: $
+}
+
+//// [app.js]
+
+
+//// [app.d.ts]
+/// <reference types="lib" />
+interface A {
+    x: $;
+}
diff --git a/tests/baselines/reference/typeReferenceDirectives2.symbols b/tests/baselines/reference/typeReferenceDirectives2.symbols
new file mode 100644
index 00000000000..100296c11cf
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives2.symbols
@@ -0,0 +1,14 @@
+=== /app.ts ===
+interface A {
+>A : Symbol(A, Decl(app.ts, 0, 0))
+
+    x: $
+>x : Symbol(A.x, Decl(app.ts, 0, 13))
+>$ : Symbol($, Decl(index.d.ts, 0, 0))
+}
+=== /types/lib/index.d.ts ===
+
+interface $ { x }
+>$ : Symbol($, Decl(index.d.ts, 0, 0))
+>x : Symbol($.x, Decl(index.d.ts, 1, 13))
+
diff --git a/tests/baselines/reference/typeReferenceDirectives2.trace.json b/tests/baselines/reference/typeReferenceDirectives2.trace.json
new file mode 100644
index 00000000000..826abe5d51a
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives2.trace.json
@@ -0,0 +1,7 @@
+[
+    "======== Resolving type reference directive 'lib', containing file not set, root directory '/'. ========",
+    "Resolving with primary search path '/types/'",
+    "File '/types/lib/package.json' does not exist.",
+    "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives2.types b/tests/baselines/reference/typeReferenceDirectives2.types
new file mode 100644
index 00000000000..284e2ef1f44
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives2.types
@@ -0,0 +1,14 @@
+=== /app.ts ===
+interface A {
+>A : A
+
+    x: $
+>x : $
+>$ : $
+}
+=== /types/lib/index.d.ts ===
+
+interface $ { x }
+>$ : $
+>x : any
+
diff --git a/tests/baselines/reference/typeReferenceDirectives3.js b/tests/baselines/reference/typeReferenceDirectives3.js
new file mode 100644
index 00000000000..9a41c69e30a
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives3.js
@@ -0,0 +1,27 @@
+//// [tests/cases/compiler/typeReferenceDirectives3.ts] ////
+
+//// [ref.d.ts]
+
+// $ comes from d.ts file - no need to add type reference directive
+
+interface $ { x }
+
+//// [index.d.ts]
+declare let $: { x: number }
+
+//// [app.ts]
+/// <reference types="lib"/>
+/// <reference path="ref.d.ts" />
+interface A {
+    x: () => $
+}
+
+//// [app.js]
+/// <reference path="ref.d.ts" />
+
+
+//// [app.d.ts]
+/// <reference path="ref.d.ts" />
+interface A {
+    x: () => $;
+}
diff --git a/tests/baselines/reference/typeReferenceDirectives3.symbols b/tests/baselines/reference/typeReferenceDirectives3.symbols
new file mode 100644
index 00000000000..6ab3cd7d1ee
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives3.symbols
@@ -0,0 +1,23 @@
+=== /app.ts ===
+/// <reference types="lib"/>
+/// <reference path="ref.d.ts" />
+interface A {
+>A : Symbol(A, Decl(app.ts, 0, 0))
+
+    x: () => $
+>x : Symbol(A.x, Decl(app.ts, 2, 13))
+>$ : Symbol($, Decl(ref.d.ts, 0, 0), Decl(index.d.ts, 0, 11))
+}
+=== /ref.d.ts ===
+
+// $ comes from d.ts file - no need to add type reference directive
+
+interface $ { x }
+>$ : Symbol($, Decl(ref.d.ts, 0, 0), Decl(index.d.ts, 0, 11))
+>x : Symbol($.x, Decl(ref.d.ts, 3, 13))
+
+=== /types/lib/index.d.ts ===
+declare let $: { x: number }
+>$ : Symbol($, Decl(ref.d.ts, 0, 0), Decl(index.d.ts, 0, 11))
+>x : Symbol(x, Decl(index.d.ts, 0, 16))
+
diff --git a/tests/baselines/reference/typeReferenceDirectives3.trace.json b/tests/baselines/reference/typeReferenceDirectives3.trace.json
new file mode 100644
index 00000000000..c936a84dcc0
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives3.trace.json
@@ -0,0 +1,7 @@
+[
+    "======== Resolving type reference directive 'lib', containing file '/app.ts', root directory '/'. ========",
+    "Resolving with primary search path '/types/'",
+    "File '/types/lib/package.json' does not exist.",
+    "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives3.types b/tests/baselines/reference/typeReferenceDirectives3.types
new file mode 100644
index 00000000000..3f82a9c666b
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives3.types
@@ -0,0 +1,23 @@
+=== /app.ts ===
+/// <reference types="lib"/>
+/// <reference path="ref.d.ts" />
+interface A {
+>A : A
+
+    x: () => $
+>x : () => $
+>$ : $
+}
+=== /ref.d.ts ===
+
+// $ comes from d.ts file - no need to add type reference directive
+
+interface $ { x }
+>$ : $
+>x : any
+
+=== /types/lib/index.d.ts ===
+declare let $: { x: number }
+>$ : { x: number; }
+>x : number
+
diff --git a/tests/baselines/reference/typeReferenceDirectives4.js b/tests/baselines/reference/typeReferenceDirectives4.js
new file mode 100644
index 00000000000..ebe66d7b4dc
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives4.js
@@ -0,0 +1,30 @@
+//// [tests/cases/compiler/typeReferenceDirectives4.ts] ////
+
+//// [ref.d.ts]
+
+// $ comes from d.ts file - no need to add type reference directive
+
+interface $ { x }
+
+//// [index.d.ts]
+declare let $: { x: number }
+
+
+//// [app.ts]
+/// <reference path="./ref.d.ts"/>
+/// <reference types="lib"/>
+
+let x: $;
+let y = () => x
+
+//// [app.js]
+/// <reference path="./ref.d.ts"/>
+/// <reference types="lib"/>
+var x;
+var y = function () { return x; };
+
+
+//// [app.d.ts]
+/// <reference path="ref.d.ts" />
+declare let x: $;
+declare let y: () => $;
diff --git a/tests/baselines/reference/typeReferenceDirectives4.symbols b/tests/baselines/reference/typeReferenceDirectives4.symbols
new file mode 100644
index 00000000000..2877064934a
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives4.symbols
@@ -0,0 +1,26 @@
+=== /app.ts ===
+/// <reference path="./ref.d.ts"/>
+/// <reference types="lib"/>
+
+let x: $;
+>x : Symbol(x, Decl(app.ts, 3, 3))
+>$ : Symbol($, Decl(ref.d.ts, 0, 0), Decl(index.d.ts, 0, 11))
+
+let y = () => x
+>y : Symbol(y, Decl(app.ts, 4, 3))
+>x : Symbol(x, Decl(app.ts, 3, 3))
+
+=== /ref.d.ts ===
+
+// $ comes from d.ts file - no need to add type reference directive
+
+interface $ { x }
+>$ : Symbol($, Decl(ref.d.ts, 0, 0), Decl(index.d.ts, 0, 11))
+>x : Symbol($.x, Decl(ref.d.ts, 3, 13))
+
+=== /types/lib/index.d.ts ===
+declare let $: { x: number }
+>$ : Symbol($, Decl(ref.d.ts, 0, 0), Decl(index.d.ts, 0, 11))
+>x : Symbol(x, Decl(index.d.ts, 0, 16))
+
+
diff --git a/tests/baselines/reference/typeReferenceDirectives4.trace.json b/tests/baselines/reference/typeReferenceDirectives4.trace.json
new file mode 100644
index 00000000000..c936a84dcc0
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives4.trace.json
@@ -0,0 +1,7 @@
+[
+    "======== Resolving type reference directive 'lib', containing file '/app.ts', root directory '/'. ========",
+    "Resolving with primary search path '/types/'",
+    "File '/types/lib/package.json' does not exist.",
+    "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives4.types b/tests/baselines/reference/typeReferenceDirectives4.types
new file mode 100644
index 00000000000..39d40a1ee78
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives4.types
@@ -0,0 +1,27 @@
+=== /app.ts ===
+/// <reference path="./ref.d.ts"/>
+/// <reference types="lib"/>
+
+let x: $;
+>x : $
+>$ : $
+
+let y = () => x
+>y : () => $
+>() => x : () => $
+>x : $
+
+=== /ref.d.ts ===
+
+// $ comes from d.ts file - no need to add type reference directive
+
+interface $ { x }
+>$ : $
+>x : any
+
+=== /types/lib/index.d.ts ===
+declare let $: { x: number }
+>$ : { x: number; }
+>x : number
+
+
diff --git a/tests/baselines/reference/typeReferenceDirectives5.js b/tests/baselines/reference/typeReferenceDirectives5.js
new file mode 100644
index 00000000000..41448cbeab2
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives5.js
@@ -0,0 +1,25 @@
+//// [tests/cases/compiler/typeReferenceDirectives5.ts] ////
+
+//// [ref.d.ts]
+
+export interface $ { x }
+
+//// [index.d.ts]
+declare let $: { x: number }
+
+//// [app.ts]
+/// <reference types="lib"/>
+import {$} from "./ref";
+export interface A {
+    x: typeof $;
+}
+
+//// [app.js]
+"use strict";
+
+
+//// [app.d.ts]
+/// <reference types="lib" />
+export interface A {
+    x: typeof $;
+}
diff --git a/tests/baselines/reference/typeReferenceDirectives5.symbols b/tests/baselines/reference/typeReferenceDirectives5.symbols
new file mode 100644
index 00000000000..fbbb06d6834
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives5.symbols
@@ -0,0 +1,23 @@
+=== /app.ts ===
+/// <reference types="lib"/>
+import {$} from "./ref";
+>$ : Symbol($, Decl(app.ts, 1, 8))
+
+export interface A {
+>A : Symbol(A, Decl(app.ts, 1, 24))
+
+    x: typeof $;
+>x : Symbol(A.x, Decl(app.ts, 2, 20))
+>$ : Symbol($, Decl(app.ts, 1, 8))
+}
+=== /ref.d.ts ===
+
+export interface $ { x }
+>$ : Symbol($, Decl(ref.d.ts, 0, 0))
+>x : Symbol($.x, Decl(ref.d.ts, 1, 20))
+
+=== /types/lib/index.d.ts ===
+declare let $: { x: number }
+>$ : Symbol($, Decl(index.d.ts, 0, 11))
+>x : Symbol(x, Decl(index.d.ts, 0, 16))
+
diff --git a/tests/baselines/reference/typeReferenceDirectives5.trace.json b/tests/baselines/reference/typeReferenceDirectives5.trace.json
new file mode 100644
index 00000000000..b6adaf1f513
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives5.trace.json
@@ -0,0 +1,14 @@
+[
+    "======== Resolving type reference directive 'lib', containing file '/app.ts', root directory '/'. ========",
+    "Resolving with primary search path '/types/'",
+    "File '/types/lib/package.json' does not exist.",
+    "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
+    "======== Resolving module './ref' from '/app.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module as file / folder, candidate module location '/ref'.",
+    "File '/ref.ts' does not exist.",
+    "File '/ref.tsx' does not exist.",
+    "File '/ref.d.ts' exist - use it as a name resolution result.",
+    "======== Module name './ref' was successfully resolved to '/ref.d.ts'. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives5.types b/tests/baselines/reference/typeReferenceDirectives5.types
new file mode 100644
index 00000000000..9b7cd93f6cc
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives5.types
@@ -0,0 +1,23 @@
+=== /app.ts ===
+/// <reference types="lib"/>
+import {$} from "./ref";
+>$ : any
+
+export interface A {
+>A : A
+
+    x: typeof $;
+>x : { x: number; }
+>$ : { x: number; }
+}
+=== /ref.d.ts ===
+
+export interface $ { x }
+>$ : $
+>x : any
+
+=== /types/lib/index.d.ts ===
+declare let $: { x: number }
+>$ : { x: number; }
+>x : number
+
diff --git a/tests/baselines/reference/typeReferenceDirectives6.js b/tests/baselines/reference/typeReferenceDirectives6.js
new file mode 100644
index 00000000000..3d1ea0e41c9
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives6.js
@@ -0,0 +1,33 @@
+//// [tests/cases/compiler/typeReferenceDirectives6.ts] ////
+
+//// [ref.d.ts]
+
+// $ comes from type declaration file - type reference directive should be added
+
+declare let $: { x: number }
+    
+//// [index.d.ts]
+interface $ { x }
+
+
+//// [app.ts]
+/// <reference path="./ref.d.ts"/>
+/// <reference types="lib"/>
+
+let x: $;
+let y = () => x
+
+
+
+//// [app.js]
+/// <reference path="./ref.d.ts"/>
+/// <reference types="lib"/>
+var x;
+var y = function () { return x; };
+
+
+//// [app.d.ts]
+/// <reference path="ref.d.ts" />
+/// <reference types="lib" />
+declare let x: $;
+declare let y: () => $;
diff --git a/tests/baselines/reference/typeReferenceDirectives6.symbols b/tests/baselines/reference/typeReferenceDirectives6.symbols
new file mode 100644
index 00000000000..f8a5245a0a5
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives6.symbols
@@ -0,0 +1,27 @@
+=== /app.ts ===
+/// <reference path="./ref.d.ts"/>
+/// <reference types="lib"/>
+
+let x: $;
+>x : Symbol(x, Decl(app.ts, 3, 3))
+>$ : Symbol($, Decl(ref.d.ts, 3, 11), Decl(index.d.ts, 0, 0))
+
+let y = () => x
+>y : Symbol(y, Decl(app.ts, 4, 3))
+>x : Symbol(x, Decl(app.ts, 3, 3))
+
+
+=== /ref.d.ts ===
+
+// $ comes from type declaration file - type reference directive should be added
+
+declare let $: { x: number }
+>$ : Symbol($, Decl(ref.d.ts, 3, 11), Decl(index.d.ts, 0, 0))
+>x : Symbol(x, Decl(ref.d.ts, 3, 16))
+    
+=== /types/lib/index.d.ts ===
+interface $ { x }
+>$ : Symbol($, Decl(ref.d.ts, 3, 11), Decl(index.d.ts, 0, 0))
+>x : Symbol($.x, Decl(index.d.ts, 0, 13))
+
+
diff --git a/tests/baselines/reference/typeReferenceDirectives6.trace.json b/tests/baselines/reference/typeReferenceDirectives6.trace.json
new file mode 100644
index 00000000000..c936a84dcc0
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives6.trace.json
@@ -0,0 +1,7 @@
+[
+    "======== Resolving type reference directive 'lib', containing file '/app.ts', root directory '/'. ========",
+    "Resolving with primary search path '/types/'",
+    "File '/types/lib/package.json' does not exist.",
+    "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives6.types b/tests/baselines/reference/typeReferenceDirectives6.types
new file mode 100644
index 00000000000..db4d3514bde
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives6.types
@@ -0,0 +1,28 @@
+=== /app.ts ===
+/// <reference path="./ref.d.ts"/>
+/// <reference types="lib"/>
+
+let x: $;
+>x : $
+>$ : $
+
+let y = () => x
+>y : () => $
+>() => x : () => $
+>x : $
+
+
+=== /ref.d.ts ===
+
+// $ comes from type declaration file - type reference directive should be added
+
+declare let $: { x: number }
+>$ : { x: number; }
+>x : number
+    
+=== /types/lib/index.d.ts ===
+interface $ { x }
+>$ : $
+>x : any
+
+
diff --git a/tests/baselines/reference/typeReferenceDirectives7.js b/tests/baselines/reference/typeReferenceDirectives7.js
new file mode 100644
index 00000000000..6a15180d3e7
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives7.js
@@ -0,0 +1,28 @@
+//// [tests/cases/compiler/typeReferenceDirectives7.ts] ////
+
+//// [index.d.ts]
+
+// local value shadows global - no need to add type reference directive 
+   
+declare let $: { x: number }
+
+
+//// [app.ts]
+/// <reference types="lib"/>
+
+export let $ = 1;
+
+export let x: typeof $;
+export let y = () => x
+
+//// [app.js]
+/// <reference types="lib"/>
+"use strict";
+exports.$ = 1;
+exports.y = function () { return exports.x; };
+
+
+//// [app.d.ts]
+export declare let $: number;
+export declare let x: typeof $;
+export declare let y: () => number;
diff --git a/tests/baselines/reference/typeReferenceDirectives7.symbols b/tests/baselines/reference/typeReferenceDirectives7.symbols
new file mode 100644
index 00000000000..27637dfaa0e
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives7.symbols
@@ -0,0 +1,23 @@
+=== /app.ts ===
+/// <reference types="lib"/>
+
+export let $ = 1;
+>$ : Symbol($, Decl(app.ts, 2, 10))
+
+export let x: typeof $;
+>x : Symbol(x, Decl(app.ts, 4, 10))
+>$ : Symbol($, Decl(app.ts, 2, 10))
+
+export let y = () => x
+>y : Symbol(y, Decl(app.ts, 5, 10))
+>x : Symbol(x, Decl(app.ts, 4, 10))
+
+=== /types/lib/index.d.ts ===
+
+// local value shadows global - no need to add type reference directive 
+   
+declare let $: { x: number }
+>$ : Symbol($, Decl(index.d.ts, 3, 11))
+>x : Symbol(x, Decl(index.d.ts, 3, 16))
+
+
diff --git a/tests/baselines/reference/typeReferenceDirectives7.trace.json b/tests/baselines/reference/typeReferenceDirectives7.trace.json
new file mode 100644
index 00000000000..c936a84dcc0
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives7.trace.json
@@ -0,0 +1,7 @@
+[
+    "======== Resolving type reference directive 'lib', containing file '/app.ts', root directory '/'. ========",
+    "Resolving with primary search path '/types/'",
+    "File '/types/lib/package.json' does not exist.",
+    "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives7.types b/tests/baselines/reference/typeReferenceDirectives7.types
new file mode 100644
index 00000000000..dab53a49899
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives7.types
@@ -0,0 +1,25 @@
+=== /app.ts ===
+/// <reference types="lib"/>
+
+export let $ = 1;
+>$ : number
+>1 : number
+
+export let x: typeof $;
+>x : number
+>$ : number
+
+export let y = () => x
+>y : () => number
+>() => x : () => number
+>x : number
+
+=== /types/lib/index.d.ts ===
+
+// local value shadows global - no need to add type reference directive 
+   
+declare let $: { x: number }
+>$ : { x: number; }
+>x : number
+
+
diff --git a/tests/baselines/reference/typeReferenceDirectives8.js b/tests/baselines/reference/typeReferenceDirectives8.js
new file mode 100644
index 00000000000..cfa22c4228c
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives8.js
@@ -0,0 +1,32 @@
+//// [tests/cases/compiler/typeReferenceDirectives8.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();
+
+//// [mod1.js]
+"use strict";
+function foo() { return { x: 1 }; }
+exports.foo = foo;
+//// [mod2.js]
+"use strict";
+var mod1_1 = require("./mod1");
+exports.bar = mod1_1.foo();
+
+
+//// [mod1.d.ts]
+/// <reference types="lib" />
+export declare function foo(): Lib;
+//// [mod2.d.ts]
+/// <reference types="lib" />
+export declare const bar: Lib;
diff --git a/tests/baselines/reference/typeReferenceDirectives8.symbols b/tests/baselines/reference/typeReferenceDirectives8.symbols
new file mode 100644
index 00000000000..875bb2a0900
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives8.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/typeReferenceDirectives8.trace.json b/tests/baselines/reference/typeReferenceDirectives8.trace.json
new file mode 100644
index 00000000000..be060569d83
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives8.trace.json
@@ -0,0 +1,12 @@
+[
+    "======== Resolving type reference directive 'lib', containing file not set, root directory '/'. ========",
+    "Resolving with primary search path '/types/'",
+    "File '/types/lib/package.json' does not exist.",
+    "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
+    "======== Resolving module './mod1' from '/mod2.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module as file / folder, candidate module location '/mod1'.",
+    "File '/mod1.ts' exist - use it as a name resolution result.",
+    "======== Module name './mod1' was successfully resolved to '/mod1.ts'. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives8.types b/tests/baselines/reference/typeReferenceDirectives8.types
new file mode 100644
index 00000000000..93d80b7988a
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives8.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/typeReferenceDirectives9.js b/tests/baselines/reference/typeReferenceDirectives9.js
new file mode 100644
index 00000000000..5fd17ea16d3
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives9.js
@@ -0,0 +1,79 @@
+//// [tests/cases/compiler/typeReferenceDirectives9.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();
+
+//// [main.js]
+"use strict";
+var Cls = (function () {
+    function Cls() {
+    }
+    return Cls;
+}());
+exports.Cls = Cls;
+//// [mod1.js]
+/// <reference types="lib" />
+"use strict";
+var main_1 = require("./main");
+main_1.Cls.prototype.foo = function () { return undefined; };
+//// [mod2.js]
+"use strict";
+var main_1 = require("./main");
+require("./mod1");
+exports.cls = main_1.Cls;
+exports.foo = new main_1.Cls().foo();
+exports.bar = main_1.Cls.bar();
+
+
+//// [main.d.ts]
+export declare class Cls {
+    x: any;
+}
+//// [mod1.d.ts]
+/// <reference types="lib" />
+declare module "./main" {
+    interface Cls {
+        foo(): Lib;
+    }
+    namespace Cls {
+        function bar(): Lib;
+    }
+}
+export {};
+//// [mod2.d.ts]
+/// <reference types="lib" />
+import { Cls } from "./main";
+import "./mod1";
+export declare const cls: typeof Cls;
+export declare const foo: Lib;
+export declare const bar: Lib;
diff --git a/tests/baselines/reference/typeReferenceDirectives9.symbols b/tests/baselines/reference/typeReferenceDirectives9.symbols
new file mode 100644
index 00000000000..30b24c39284
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives9.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/typeReferenceDirectives9.trace.json b/tests/baselines/reference/typeReferenceDirectives9.trace.json
new file mode 100644
index 00000000000..f4fc0937325
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives9.trace.json
@@ -0,0 +1,22 @@
+[
+    "======== Resolving module './main' from '/mod2.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module as file / folder, candidate module location '/main'.",
+    "File '/main.ts' exist - use it as a name resolution result.",
+    "======== Module name './main' was successfully resolved to '/main.ts'. ========",
+    "======== Resolving module './mod1' from '/mod2.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module as file / folder, candidate module location '/mod1'.",
+    "File '/mod1.ts' exist - use it as a name resolution result.",
+    "======== Module name './mod1' was successfully resolved to '/mod1.ts'. ========",
+    "======== Resolving type reference directive 'lib', containing file '/mod1.ts', root directory '/'. ========",
+    "Resolving with primary search path '/types/'",
+    "File '/types/lib/package.json' does not exist.",
+    "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
+    "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
+    "======== Resolving module './main' from '/mod1.ts'. ========",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module as file / folder, candidate module location '/main'.",
+    "File '/main.ts' exist - use it as a name resolution result.",
+    "======== Module name './main' was successfully resolved to '/main.ts'. ========"
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives9.types b/tests/baselines/reference/typeReferenceDirectives9.types
new file mode 100644
index 00000000000..bd429b91f1c
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives9.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.symbols b/tests/baselines/reference/typeResolution.symbols
index aa0d611e52e..b967bd3d7ff 100644
--- a/tests/baselines/reference/typeResolution.symbols
+++ b/tests/baselines/reference/typeResolution.symbols
@@ -12,7 +12,7 @@ export module TopLevelModule1 {
 >ClassA : Symbol(ClassA, Decl(typeResolution.ts, 2, 37))
 
                 public AisIn1_1_1() {
->AisIn1_1_1 : Symbol(AisIn1_1_1, Decl(typeResolution.ts, 3, 33))
+>AisIn1_1_1 : Symbol(ClassA.AisIn1_1_1, Decl(typeResolution.ts, 3, 33))
 
                     // Try all qualified names of this type
                     var a1: ClassA; a1.AisIn1_1_1();
@@ -99,7 +99,7 @@ export module TopLevelModule1 {
 >ClassB : Symbol(ClassB, Decl(typeResolution.ts, 22, 13))
 
                 public BisIn1_1_1() {
->BisIn1_1_1 : Symbol(BisIn1_1_1, Decl(typeResolution.ts, 23, 33))
+>BisIn1_1_1 : Symbol(ClassB.BisIn1_1_1, Decl(typeResolution.ts, 23, 33))
 
                     /** Exactly the same as above in AisIn1_1_1 **/
                     
@@ -195,7 +195,7 @@ export module TopLevelModule1 {
             }
             export interface InterfaceX { XisIn1_1_1(); }
 >InterfaceX : Symbol(InterfaceX, Decl(typeResolution.ts, 45, 13))
->XisIn1_1_1 : Symbol(XisIn1_1_1, Decl(typeResolution.ts, 46, 41))
+>XisIn1_1_1 : Symbol(InterfaceX.XisIn1_1_1, Decl(typeResolution.ts, 46, 41))
 
             class NonExportedClassQ {
 >NonExportedClassQ : Symbol(NonExportedClassQ, Decl(typeResolution.ts, 46, 57))
@@ -302,19 +302,19 @@ export module TopLevelModule1 {
             // No code here since these are the mirror of the above calls
             export class ClassA { public AisIn1_2_2() { } }
 >ClassA : Symbol(ClassA, Decl(typeResolution.ts, 76, 37))
->AisIn1_2_2 : Symbol(AisIn1_2_2, Decl(typeResolution.ts, 78, 33))
+>AisIn1_2_2 : Symbol(ClassA.AisIn1_2_2, Decl(typeResolution.ts, 78, 33))
 
             export class ClassB { public BisIn1_2_2() { } }
 >ClassB : Symbol(ClassB, Decl(typeResolution.ts, 78, 59))
->BisIn1_2_2 : Symbol(BisIn1_2_2, Decl(typeResolution.ts, 79, 33))
+>BisIn1_2_2 : Symbol(ClassB.BisIn1_2_2, Decl(typeResolution.ts, 79, 33))
 
             export class ClassC { public CisIn1_2_2() { } }
 >ClassC : Symbol(ClassC, Decl(typeResolution.ts, 79, 59))
->CisIn1_2_2 : Symbol(CisIn1_2_2, Decl(typeResolution.ts, 80, 33))
+>CisIn1_2_2 : Symbol(ClassC.CisIn1_2_2, Decl(typeResolution.ts, 80, 33))
 
             export interface InterfaceY { YisIn1_2_2(); }
 >InterfaceY : Symbol(InterfaceY, Decl(typeResolution.ts, 80, 59))
->YisIn1_2_2 : Symbol(YisIn1_2_2, Decl(typeResolution.ts, 81, 41))
+>YisIn1_2_2 : Symbol(InterfaceY.YisIn1_2_2, Decl(typeResolution.ts, 81, 41))
 
             interface NonExportedInterfaceQ { }
 >NonExportedInterfaceQ : Symbol(NonExportedInterfaceQ, Decl(typeResolution.ts, 81, 57))
@@ -322,21 +322,21 @@ export module TopLevelModule1 {
         
         export interface InterfaceY { YisIn1_2(); }
 >InterfaceY : Symbol(InterfaceY, Decl(typeResolution.ts, 83, 9))
->YisIn1_2 : Symbol(YisIn1_2, Decl(typeResolution.ts, 85, 37))
+>YisIn1_2 : Symbol(InterfaceY.YisIn1_2, Decl(typeResolution.ts, 85, 37))
     }
     
     class ClassA {
 >ClassA : Symbol(ClassA, Decl(typeResolution.ts, 86, 5))
 
         public AisIn1() { }
->AisIn1 : Symbol(AisIn1, Decl(typeResolution.ts, 88, 18))
+>AisIn1 : Symbol(ClassA.AisIn1, Decl(typeResolution.ts, 88, 18))
     }
 
     interface InterfaceY {
 >InterfaceY : Symbol(InterfaceY, Decl(typeResolution.ts, 90, 5))
 
         YisIn1();
->YisIn1 : Symbol(YisIn1, Decl(typeResolution.ts, 92, 26))
+>YisIn1 : Symbol(InterfaceY.YisIn1, Decl(typeResolution.ts, 92, 26))
     }
     
     module NotExportedModule {
@@ -357,7 +357,7 @@ module TopLevelModule2 {
 >ClassA : Symbol(ClassA, Decl(typeResolution.ts, 102, 30))
 
             public AisIn2_3() { }
->AisIn2_3 : Symbol(AisIn2_3, Decl(typeResolution.ts, 103, 29))
+>AisIn2_3 : Symbol(ClassA.AisIn2_3, Decl(typeResolution.ts, 103, 29))
         }
     }
 }
diff --git a/tests/baselines/reference/typeVal.symbols b/tests/baselines/reference/typeVal.symbols
index 353b187a48e..42c8b7158e2 100644
--- a/tests/baselines/reference/typeVal.symbols
+++ b/tests/baselines/reference/typeVal.symbols
@@ -3,7 +3,7 @@ interface I {
 >I : Symbol(I, Decl(typeVal.ts, 0, 0), Decl(typeVal.ts, 4, 3))
 
     I:number;
->I : Symbol(I, Decl(typeVal.ts, 0, 13))
+>I : Symbol(I.I, Decl(typeVal.ts, 0, 13))
 }
 
 var I:I = { I: 3};
diff --git a/tests/baselines/reference/typedArrays.symbols b/tests/baselines/reference/typedArrays.symbols
index 7282e8b8879..2d45fb7e5c1 100644
--- a/tests/baselines/reference/typedArrays.symbols
+++ b/tests/baselines/reference/typedArrays.symbols
@@ -8,39 +8,39 @@ function CreateTypedArrayTypes() {
 
     typedArrays[0] = Int8Array;
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 2, 7))
->Int8Array : Symbol(Int8Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Int8Array : Symbol(Int8Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
     typedArrays[1] = Uint8Array;
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 2, 7))
->Uint8Array : Symbol(Uint8Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint8Array : Symbol(Uint8Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
     typedArrays[2] = Int16Array;
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 2, 7))
->Int16Array : Symbol(Int16Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Int16Array : Symbol(Int16Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
     typedArrays[3] = Uint16Array;
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 2, 7))
->Uint16Array : Symbol(Uint16Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint16Array : Symbol(Uint16Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
     typedArrays[4] = Int32Array;
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 2, 7))
->Int32Array : Symbol(Int32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Int32Array : Symbol(Int32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
     typedArrays[5] = Uint32Array;
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 2, 7))
->Uint32Array : Symbol(Uint32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint32Array : Symbol(Uint32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
     typedArrays[6] = Float32Array;
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 2, 7))
->Float32Array : Symbol(Float32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Float32Array : Symbol(Float32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
     typedArrays[7] = Float64Array;
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 2, 7))
->Float64Array : Symbol(Float64Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Float64Array : Symbol(Float64Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
     typedArrays[8] = Uint8ClampedArray;
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 2, 7))
->Uint8ClampedArray : Symbol(Uint8ClampedArray, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint8ClampedArray : Symbol(Uint8ClampedArray, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
     return typedArrays;
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 2, 7))
@@ -55,47 +55,47 @@ function CreateTypedArrayInstancesFromLength(obj: number) {
 
     typedArrays[0] = new Int8Array(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 17, 7))
->Int8Array : Symbol(Int8Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Int8Array : Symbol(Int8Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 16, 45))
 
     typedArrays[1] = new Uint8Array(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 17, 7))
->Uint8Array : Symbol(Uint8Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint8Array : Symbol(Uint8Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 16, 45))
 
     typedArrays[2] = new Int16Array(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 17, 7))
->Int16Array : Symbol(Int16Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Int16Array : Symbol(Int16Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 16, 45))
 
     typedArrays[3] = new Uint16Array(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 17, 7))
->Uint16Array : Symbol(Uint16Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint16Array : Symbol(Uint16Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 16, 45))
 
     typedArrays[4] = new Int32Array(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 17, 7))
->Int32Array : Symbol(Int32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Int32Array : Symbol(Int32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 16, 45))
 
     typedArrays[5] = new Uint32Array(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 17, 7))
->Uint32Array : Symbol(Uint32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint32Array : Symbol(Uint32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 16, 45))
 
     typedArrays[6] = new Float32Array(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 17, 7))
->Float32Array : Symbol(Float32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Float32Array : Symbol(Float32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 16, 45))
 
     typedArrays[7] = new Float64Array(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 17, 7))
->Float64Array : Symbol(Float64Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Float64Array : Symbol(Float64Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 16, 45))
 
     typedArrays[8] = new Uint8ClampedArray(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 17, 7))
->Uint8ClampedArray : Symbol(Uint8ClampedArray, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint8ClampedArray : Symbol(Uint8ClampedArray, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 16, 45))
 
     return typedArrays;
@@ -111,47 +111,47 @@ function CreateTypedArrayInstancesFromArray(obj: number[]) {
 
     typedArrays[0] = new Int8Array(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 32, 7))
->Int8Array : Symbol(Int8Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Int8Array : Symbol(Int8Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 31, 44))
 
     typedArrays[1] = new Uint8Array(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 32, 7))
->Uint8Array : Symbol(Uint8Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint8Array : Symbol(Uint8Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 31, 44))
 
     typedArrays[2] = new Int16Array(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 32, 7))
->Int16Array : Symbol(Int16Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Int16Array : Symbol(Int16Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 31, 44))
 
     typedArrays[3] = new Uint16Array(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 32, 7))
->Uint16Array : Symbol(Uint16Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint16Array : Symbol(Uint16Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 31, 44))
 
     typedArrays[4] = new Int32Array(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 32, 7))
->Int32Array : Symbol(Int32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Int32Array : Symbol(Int32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 31, 44))
 
     typedArrays[5] = new Uint32Array(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 32, 7))
->Uint32Array : Symbol(Uint32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint32Array : Symbol(Uint32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 31, 44))
 
     typedArrays[6] = new Float32Array(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 32, 7))
->Float32Array : Symbol(Float32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Float32Array : Symbol(Float32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 31, 44))
 
     typedArrays[7] = new Float64Array(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 32, 7))
->Float64Array : Symbol(Float64Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Float64Array : Symbol(Float64Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 31, 44))
 
     typedArrays[8] = new Uint8ClampedArray(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 32, 7))
->Uint8ClampedArray : Symbol(Uint8ClampedArray, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint8ClampedArray : Symbol(Uint8ClampedArray, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 31, 44))
 
     return typedArrays;
@@ -167,65 +167,65 @@ function CreateIntegerTypedArraysFromArray2(obj:number[]) {
 
     typedArrays[0] = Int8Array.from(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 47, 7))
->Int8Array.from : Symbol(Int8ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Int8Array : Symbol(Int8Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Int8ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Int8Array.from : Symbol(Int8ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Int8Array : Symbol(Int8Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Int8ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 46, 44))
 
     typedArrays[1] = Uint8Array.from(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 47, 7))
->Uint8Array.from : Symbol(Uint8ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Uint8Array : Symbol(Uint8Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Uint8ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint8Array.from : Symbol(Uint8ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Uint8Array : Symbol(Uint8Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Uint8ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 46, 44))
 
     typedArrays[2] = Int16Array.from(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 47, 7))
->Int16Array.from : Symbol(Int16ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Int16Array : Symbol(Int16Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Int16ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Int16Array.from : Symbol(Int16ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Int16Array : Symbol(Int16Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Int16ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 46, 44))
 
     typedArrays[3] = Uint16Array.from(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 47, 7))
->Uint16Array.from : Symbol(Uint16ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Uint16Array : Symbol(Uint16Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Uint16ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint16Array.from : Symbol(Uint16ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Uint16Array : Symbol(Uint16Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Uint16ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 46, 44))
 
     typedArrays[4] = Int32Array.from(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 47, 7))
->Int32Array.from : Symbol(Int32ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Int32Array : Symbol(Int32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Int32ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Int32Array.from : Symbol(Int32ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Int32Array : Symbol(Int32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Int32ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 46, 44))
 
     typedArrays[5] = Uint32Array.from(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 47, 7))
->Uint32Array.from : Symbol(Uint32ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Uint32Array : Symbol(Uint32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Uint32ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint32Array.from : Symbol(Uint32ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Uint32Array : Symbol(Uint32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Uint32ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 46, 44))
 
     typedArrays[6] = Float32Array.from(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 47, 7))
->Float32Array.from : Symbol(Float32ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Float32Array : Symbol(Float32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Float32ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Float32Array.from : Symbol(Float32ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Float32Array : Symbol(Float32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Float32ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 46, 44))
 
     typedArrays[7] = Float64Array.from(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 47, 7))
->Float64Array.from : Symbol(Float64ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Float64Array : Symbol(Float64Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Float64ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Float64Array.from : Symbol(Float64ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Float64Array : Symbol(Float64Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Float64ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 46, 44))
 
     typedArrays[8] = Uint8ClampedArray.from(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 47, 7))
->Uint8ClampedArray.from : Symbol(Uint8ClampedArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Uint8ClampedArray : Symbol(Uint8ClampedArray, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Uint8ClampedArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint8ClampedArray.from : Symbol(Uint8ClampedArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Uint8ClampedArray : Symbol(Uint8ClampedArray, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Uint8ClampedArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 46, 44))
 
     return typedArrays;
@@ -235,72 +235,72 @@ function CreateIntegerTypedArraysFromArray2(obj:number[]) {
 function CreateIntegerTypedArraysFromArrayLike(obj:ArrayLike<number>) {
 >CreateIntegerTypedArraysFromArrayLike : Symbol(CreateIntegerTypedArraysFromArrayLike, Decl(typedArrays.ts, 59, 1))
 >obj : Symbol(obj, Decl(typedArrays.ts, 61, 47))
->ArrayLike : Symbol(ArrayLike, Decl(lib.d.ts, --, --))
+>ArrayLike : Symbol(ArrayLike, Decl(lib.es5.d.ts, --, --))
 
     var typedArrays = [];
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 62, 7))
 
     typedArrays[0] = Int8Array.from(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 62, 7))
->Int8Array.from : Symbol(Int8ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Int8Array : Symbol(Int8Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Int8ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Int8Array.from : Symbol(Int8ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Int8Array : Symbol(Int8Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Int8ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 61, 47))
 
     typedArrays[1] = Uint8Array.from(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 62, 7))
->Uint8Array.from : Symbol(Uint8ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Uint8Array : Symbol(Uint8Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Uint8ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint8Array.from : Symbol(Uint8ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Uint8Array : Symbol(Uint8Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Uint8ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 61, 47))
 
     typedArrays[2] = Int16Array.from(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 62, 7))
->Int16Array.from : Symbol(Int16ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Int16Array : Symbol(Int16Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Int16ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Int16Array.from : Symbol(Int16ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Int16Array : Symbol(Int16Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Int16ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 61, 47))
 
     typedArrays[3] = Uint16Array.from(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 62, 7))
->Uint16Array.from : Symbol(Uint16ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Uint16Array : Symbol(Uint16Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Uint16ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint16Array.from : Symbol(Uint16ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Uint16Array : Symbol(Uint16Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Uint16ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 61, 47))
 
     typedArrays[4] = Int32Array.from(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 62, 7))
->Int32Array.from : Symbol(Int32ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Int32Array : Symbol(Int32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Int32ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Int32Array.from : Symbol(Int32ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Int32Array : Symbol(Int32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Int32ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 61, 47))
 
     typedArrays[5] = Uint32Array.from(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 62, 7))
->Uint32Array.from : Symbol(Uint32ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Uint32Array : Symbol(Uint32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Uint32ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint32Array.from : Symbol(Uint32ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Uint32Array : Symbol(Uint32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Uint32ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 61, 47))
 
     typedArrays[6] = Float32Array.from(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 62, 7))
->Float32Array.from : Symbol(Float32ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Float32Array : Symbol(Float32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Float32ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Float32Array.from : Symbol(Float32ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Float32Array : Symbol(Float32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Float32ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 61, 47))
 
     typedArrays[7] = Float64Array.from(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 62, 7))
->Float64Array.from : Symbol(Float64ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Float64Array : Symbol(Float64Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Float64ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Float64Array.from : Symbol(Float64ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Float64Array : Symbol(Float64Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Float64ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 61, 47))
 
     typedArrays[8] = Uint8ClampedArray.from(obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 62, 7))
->Uint8ClampedArray.from : Symbol(Uint8ClampedArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Uint8ClampedArray : Symbol(Uint8ClampedArray, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Uint8ClampedArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint8ClampedArray.from : Symbol(Uint8ClampedArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Uint8ClampedArray : Symbol(Uint8ClampedArray, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Uint8ClampedArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 61, 47))
 
     return typedArrays;
@@ -316,65 +316,65 @@ function CreateTypedArraysOf(obj) {
 
     typedArrays[0] = Int8Array.of(...obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 77, 7))
->Int8Array.of : Symbol(Int8ArrayConstructor.of, Decl(lib.d.ts, --, --))
->Int8Array : Symbol(Int8Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->of : Symbol(Int8ArrayConstructor.of, Decl(lib.d.ts, --, --))
+>Int8Array.of : Symbol(Int8ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
+>Int8Array : Symbol(Int8Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>of : Symbol(Int8ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 76, 29))
 
     typedArrays[1] = Uint8Array.of(...obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 77, 7))
->Uint8Array.of : Symbol(Uint8ArrayConstructor.of, Decl(lib.d.ts, --, --))
->Uint8Array : Symbol(Uint8Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->of : Symbol(Uint8ArrayConstructor.of, Decl(lib.d.ts, --, --))
+>Uint8Array.of : Symbol(Uint8ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
+>Uint8Array : Symbol(Uint8Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>of : Symbol(Uint8ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 76, 29))
 
     typedArrays[2] = Int16Array.of(...obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 77, 7))
->Int16Array.of : Symbol(Int16ArrayConstructor.of, Decl(lib.d.ts, --, --))
->Int16Array : Symbol(Int16Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->of : Symbol(Int16ArrayConstructor.of, Decl(lib.d.ts, --, --))
+>Int16Array.of : Symbol(Int16ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
+>Int16Array : Symbol(Int16Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>of : Symbol(Int16ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 76, 29))
 
     typedArrays[3] = Uint16Array.of(...obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 77, 7))
->Uint16Array.of : Symbol(Uint16ArrayConstructor.of, Decl(lib.d.ts, --, --))
->Uint16Array : Symbol(Uint16Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->of : Symbol(Uint16ArrayConstructor.of, Decl(lib.d.ts, --, --))
+>Uint16Array.of : Symbol(Uint16ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
+>Uint16Array : Symbol(Uint16Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>of : Symbol(Uint16ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 76, 29))
 
     typedArrays[4] = Int32Array.of(...obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 77, 7))
->Int32Array.of : Symbol(Int32ArrayConstructor.of, Decl(lib.d.ts, --, --))
->Int32Array : Symbol(Int32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->of : Symbol(Int32ArrayConstructor.of, Decl(lib.d.ts, --, --))
+>Int32Array.of : Symbol(Int32ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
+>Int32Array : Symbol(Int32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>of : Symbol(Int32ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 76, 29))
 
     typedArrays[5] = Uint32Array.of(...obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 77, 7))
->Uint32Array.of : Symbol(Uint32ArrayConstructor.of, Decl(lib.d.ts, --, --))
->Uint32Array : Symbol(Uint32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->of : Symbol(Uint32ArrayConstructor.of, Decl(lib.d.ts, --, --))
+>Uint32Array.of : Symbol(Uint32ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
+>Uint32Array : Symbol(Uint32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>of : Symbol(Uint32ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 76, 29))
 
     typedArrays[6] = Float32Array.of(...obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 77, 7))
->Float32Array.of : Symbol(Float32ArrayConstructor.of, Decl(lib.d.ts, --, --))
->Float32Array : Symbol(Float32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->of : Symbol(Float32ArrayConstructor.of, Decl(lib.d.ts, --, --))
+>Float32Array.of : Symbol(Float32ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
+>Float32Array : Symbol(Float32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>of : Symbol(Float32ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 76, 29))
 
     typedArrays[7] = Float64Array.of(...obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 77, 7))
->Float64Array.of : Symbol(Float64ArrayConstructor.of, Decl(lib.d.ts, --, --))
->Float64Array : Symbol(Float64Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->of : Symbol(Float64ArrayConstructor.of, Decl(lib.d.ts, --, --))
+>Float64Array.of : Symbol(Float64ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
+>Float64Array : Symbol(Float64Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>of : Symbol(Float64ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 76, 29))
 
     typedArrays[8] = Uint8ClampedArray.of(...obj);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 77, 7))
->Uint8ClampedArray.of : Symbol(Uint8ClampedArrayConstructor.of, Decl(lib.d.ts, --, --))
->Uint8ClampedArray : Symbol(Uint8ClampedArray, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->of : Symbol(Uint8ClampedArrayConstructor.of, Decl(lib.d.ts, --, --))
+>Uint8ClampedArray.of : Symbol(Uint8ClampedArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
+>Uint8ClampedArray : Symbol(Uint8ClampedArray, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>of : Symbol(Uint8ClampedArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 76, 29))
 
     return typedArrays;
@@ -389,57 +389,57 @@ function CreateTypedArraysOf2() {
 
     typedArrays[0] = Int8Array.of(1,2,3,4);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 92, 7))
->Int8Array.of : Symbol(Int8ArrayConstructor.of, Decl(lib.d.ts, --, --))
->Int8Array : Symbol(Int8Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->of : Symbol(Int8ArrayConstructor.of, Decl(lib.d.ts, --, --))
+>Int8Array.of : Symbol(Int8ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
+>Int8Array : Symbol(Int8Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>of : Symbol(Int8ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
 
     typedArrays[1] = Uint8Array.of(1,2,3,4);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 92, 7))
->Uint8Array.of : Symbol(Uint8ArrayConstructor.of, Decl(lib.d.ts, --, --))
->Uint8Array : Symbol(Uint8Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->of : Symbol(Uint8ArrayConstructor.of, Decl(lib.d.ts, --, --))
+>Uint8Array.of : Symbol(Uint8ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
+>Uint8Array : Symbol(Uint8Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>of : Symbol(Uint8ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
 
     typedArrays[2] = Int16Array.of(1,2,3,4);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 92, 7))
->Int16Array.of : Symbol(Int16ArrayConstructor.of, Decl(lib.d.ts, --, --))
->Int16Array : Symbol(Int16Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->of : Symbol(Int16ArrayConstructor.of, Decl(lib.d.ts, --, --))
+>Int16Array.of : Symbol(Int16ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
+>Int16Array : Symbol(Int16Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>of : Symbol(Int16ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
 
     typedArrays[3] = Uint16Array.of(1,2,3,4);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 92, 7))
->Uint16Array.of : Symbol(Uint16ArrayConstructor.of, Decl(lib.d.ts, --, --))
->Uint16Array : Symbol(Uint16Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->of : Symbol(Uint16ArrayConstructor.of, Decl(lib.d.ts, --, --))
+>Uint16Array.of : Symbol(Uint16ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
+>Uint16Array : Symbol(Uint16Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>of : Symbol(Uint16ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
 
     typedArrays[4] = Int32Array.of(1,2,3,4);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 92, 7))
->Int32Array.of : Symbol(Int32ArrayConstructor.of, Decl(lib.d.ts, --, --))
->Int32Array : Symbol(Int32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->of : Symbol(Int32ArrayConstructor.of, Decl(lib.d.ts, --, --))
+>Int32Array.of : Symbol(Int32ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
+>Int32Array : Symbol(Int32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>of : Symbol(Int32ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
 
     typedArrays[5] = Uint32Array.of(1,2,3,4);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 92, 7))
->Uint32Array.of : Symbol(Uint32ArrayConstructor.of, Decl(lib.d.ts, --, --))
->Uint32Array : Symbol(Uint32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->of : Symbol(Uint32ArrayConstructor.of, Decl(lib.d.ts, --, --))
+>Uint32Array.of : Symbol(Uint32ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
+>Uint32Array : Symbol(Uint32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>of : Symbol(Uint32ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
 
     typedArrays[6] = Float32Array.of(1,2,3,4);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 92, 7))
->Float32Array.of : Symbol(Float32ArrayConstructor.of, Decl(lib.d.ts, --, --))
->Float32Array : Symbol(Float32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->of : Symbol(Float32ArrayConstructor.of, Decl(lib.d.ts, --, --))
+>Float32Array.of : Symbol(Float32ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
+>Float32Array : Symbol(Float32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>of : Symbol(Float32ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
 
     typedArrays[7] = Float64Array.of(1,2,3,4);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 92, 7))
->Float64Array.of : Symbol(Float64ArrayConstructor.of, Decl(lib.d.ts, --, --))
->Float64Array : Symbol(Float64Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->of : Symbol(Float64ArrayConstructor.of, Decl(lib.d.ts, --, --))
+>Float64Array.of : Symbol(Float64ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
+>Float64Array : Symbol(Float64Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>of : Symbol(Float64ArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
 
     typedArrays[8] = Uint8ClampedArray.of(1,2,3,4);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 92, 7))
->Uint8ClampedArray.of : Symbol(Uint8ClampedArrayConstructor.of, Decl(lib.d.ts, --, --))
->Uint8ClampedArray : Symbol(Uint8ClampedArray, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->of : Symbol(Uint8ClampedArrayConstructor.of, Decl(lib.d.ts, --, --))
+>Uint8ClampedArray.of : Symbol(Uint8ClampedArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
+>Uint8ClampedArray : Symbol(Uint8ClampedArray, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>of : Symbol(Uint8ClampedArrayConstructor.of, Decl(lib.es5.d.ts, --, --))
 
     return typedArrays;
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 92, 7))
@@ -448,7 +448,7 @@ function CreateTypedArraysOf2() {
 function CreateTypedArraysFromMapFn(obj:ArrayLike<number>, mapFn: (n:number, v:number)=> number) {
 >CreateTypedArraysFromMapFn : Symbol(CreateTypedArraysFromMapFn, Decl(typedArrays.ts, 104, 1))
 >obj : Symbol(obj, Decl(typedArrays.ts, 106, 36))
->ArrayLike : Symbol(ArrayLike, Decl(lib.d.ts, --, --))
+>ArrayLike : Symbol(ArrayLike, Decl(lib.es5.d.ts, --, --))
 >mapFn : Symbol(mapFn, Decl(typedArrays.ts, 106, 58))
 >n : Symbol(n, Decl(typedArrays.ts, 106, 67))
 >v : Symbol(v, Decl(typedArrays.ts, 106, 76))
@@ -458,73 +458,73 @@ function CreateTypedArraysFromMapFn(obj:ArrayLike<number>, mapFn: (n:number, v:n
 
     typedArrays[0] = Int8Array.from(obj, mapFn);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 107, 7))
->Int8Array.from : Symbol(Int8ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Int8Array : Symbol(Int8Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Int8ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Int8Array.from : Symbol(Int8ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Int8Array : Symbol(Int8Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Int8ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 106, 36))
 >mapFn : Symbol(mapFn, Decl(typedArrays.ts, 106, 58))
 
     typedArrays[1] = Uint8Array.from(obj, mapFn);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 107, 7))
->Uint8Array.from : Symbol(Uint8ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Uint8Array : Symbol(Uint8Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Uint8ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint8Array.from : Symbol(Uint8ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Uint8Array : Symbol(Uint8Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Uint8ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 106, 36))
 >mapFn : Symbol(mapFn, Decl(typedArrays.ts, 106, 58))
 
     typedArrays[2] = Int16Array.from(obj, mapFn);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 107, 7))
->Int16Array.from : Symbol(Int16ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Int16Array : Symbol(Int16Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Int16ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Int16Array.from : Symbol(Int16ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Int16Array : Symbol(Int16Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Int16ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 106, 36))
 >mapFn : Symbol(mapFn, Decl(typedArrays.ts, 106, 58))
 
     typedArrays[3] = Uint16Array.from(obj, mapFn);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 107, 7))
->Uint16Array.from : Symbol(Uint16ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Uint16Array : Symbol(Uint16Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Uint16ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint16Array.from : Symbol(Uint16ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Uint16Array : Symbol(Uint16Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Uint16ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 106, 36))
 >mapFn : Symbol(mapFn, Decl(typedArrays.ts, 106, 58))
 
     typedArrays[4] = Int32Array.from(obj, mapFn);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 107, 7))
->Int32Array.from : Symbol(Int32ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Int32Array : Symbol(Int32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Int32ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Int32Array.from : Symbol(Int32ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Int32Array : Symbol(Int32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Int32ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 106, 36))
 >mapFn : Symbol(mapFn, Decl(typedArrays.ts, 106, 58))
 
     typedArrays[5] = Uint32Array.from(obj, mapFn);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 107, 7))
->Uint32Array.from : Symbol(Uint32ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Uint32Array : Symbol(Uint32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Uint32ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint32Array.from : Symbol(Uint32ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Uint32Array : Symbol(Uint32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Uint32ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 106, 36))
 >mapFn : Symbol(mapFn, Decl(typedArrays.ts, 106, 58))
 
     typedArrays[6] = Float32Array.from(obj, mapFn);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 107, 7))
->Float32Array.from : Symbol(Float32ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Float32Array : Symbol(Float32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Float32ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Float32Array.from : Symbol(Float32ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Float32Array : Symbol(Float32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Float32ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 106, 36))
 >mapFn : Symbol(mapFn, Decl(typedArrays.ts, 106, 58))
 
     typedArrays[7] = Float64Array.from(obj, mapFn);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 107, 7))
->Float64Array.from : Symbol(Float64ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Float64Array : Symbol(Float64Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Float64ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Float64Array.from : Symbol(Float64ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Float64Array : Symbol(Float64Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Float64ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 106, 36))
 >mapFn : Symbol(mapFn, Decl(typedArrays.ts, 106, 58))
 
     typedArrays[8] = Uint8ClampedArray.from(obj, mapFn);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 107, 7))
->Uint8ClampedArray.from : Symbol(Uint8ClampedArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Uint8ClampedArray : Symbol(Uint8ClampedArray, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Uint8ClampedArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint8ClampedArray.from : Symbol(Uint8ClampedArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Uint8ClampedArray : Symbol(Uint8ClampedArray, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Uint8ClampedArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 106, 36))
 >mapFn : Symbol(mapFn, Decl(typedArrays.ts, 106, 58))
 
@@ -535,7 +535,7 @@ function CreateTypedArraysFromMapFn(obj:ArrayLike<number>, mapFn: (n:number, v:n
 function CreateTypedArraysFromThisObj(obj:ArrayLike<number>, mapFn: (n:number, v:number)=> number, thisArg: {}) {
 >CreateTypedArraysFromThisObj : Symbol(CreateTypedArraysFromThisObj, Decl(typedArrays.ts, 119, 1))
 >obj : Symbol(obj, Decl(typedArrays.ts, 121, 38))
->ArrayLike : Symbol(ArrayLike, Decl(lib.d.ts, --, --))
+>ArrayLike : Symbol(ArrayLike, Decl(lib.es5.d.ts, --, --))
 >mapFn : Symbol(mapFn, Decl(typedArrays.ts, 121, 60))
 >n : Symbol(n, Decl(typedArrays.ts, 121, 69))
 >v : Symbol(v, Decl(typedArrays.ts, 121, 78))
@@ -546,81 +546,81 @@ function CreateTypedArraysFromThisObj(obj:ArrayLike<number>, mapFn: (n:number, v
 
     typedArrays[0] = Int8Array.from(obj, mapFn, thisArg);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 122, 7))
->Int8Array.from : Symbol(Int8ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Int8Array : Symbol(Int8Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Int8ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Int8Array.from : Symbol(Int8ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Int8Array : Symbol(Int8Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Int8ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 121, 38))
 >mapFn : Symbol(mapFn, Decl(typedArrays.ts, 121, 60))
 >thisArg : Symbol(thisArg, Decl(typedArrays.ts, 121, 98))
 
     typedArrays[1] = Uint8Array.from(obj, mapFn, thisArg);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 122, 7))
->Uint8Array.from : Symbol(Uint8ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Uint8Array : Symbol(Uint8Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Uint8ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint8Array.from : Symbol(Uint8ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Uint8Array : Symbol(Uint8Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Uint8ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 121, 38))
 >mapFn : Symbol(mapFn, Decl(typedArrays.ts, 121, 60))
 >thisArg : Symbol(thisArg, Decl(typedArrays.ts, 121, 98))
 
     typedArrays[2] = Int16Array.from(obj, mapFn, thisArg);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 122, 7))
->Int16Array.from : Symbol(Int16ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Int16Array : Symbol(Int16Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Int16ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Int16Array.from : Symbol(Int16ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Int16Array : Symbol(Int16Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Int16ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 121, 38))
 >mapFn : Symbol(mapFn, Decl(typedArrays.ts, 121, 60))
 >thisArg : Symbol(thisArg, Decl(typedArrays.ts, 121, 98))
 
     typedArrays[3] = Uint16Array.from(obj, mapFn, thisArg);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 122, 7))
->Uint16Array.from : Symbol(Uint16ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Uint16Array : Symbol(Uint16Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Uint16ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint16Array.from : Symbol(Uint16ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Uint16Array : Symbol(Uint16Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Uint16ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 121, 38))
 >mapFn : Symbol(mapFn, Decl(typedArrays.ts, 121, 60))
 >thisArg : Symbol(thisArg, Decl(typedArrays.ts, 121, 98))
 
     typedArrays[4] = Int32Array.from(obj, mapFn, thisArg);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 122, 7))
->Int32Array.from : Symbol(Int32ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Int32Array : Symbol(Int32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Int32ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Int32Array.from : Symbol(Int32ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Int32Array : Symbol(Int32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Int32ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 121, 38))
 >mapFn : Symbol(mapFn, Decl(typedArrays.ts, 121, 60))
 >thisArg : Symbol(thisArg, Decl(typedArrays.ts, 121, 98))
 
     typedArrays[5] = Uint32Array.from(obj, mapFn, thisArg);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 122, 7))
->Uint32Array.from : Symbol(Uint32ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Uint32Array : Symbol(Uint32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Uint32ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint32Array.from : Symbol(Uint32ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Uint32Array : Symbol(Uint32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Uint32ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 121, 38))
 >mapFn : Symbol(mapFn, Decl(typedArrays.ts, 121, 60))
 >thisArg : Symbol(thisArg, Decl(typedArrays.ts, 121, 98))
 
     typedArrays[6] = Float32Array.from(obj, mapFn, thisArg);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 122, 7))
->Float32Array.from : Symbol(Float32ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Float32Array : Symbol(Float32Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Float32ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Float32Array.from : Symbol(Float32ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Float32Array : Symbol(Float32Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Float32ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 121, 38))
 >mapFn : Symbol(mapFn, Decl(typedArrays.ts, 121, 60))
 >thisArg : Symbol(thisArg, Decl(typedArrays.ts, 121, 98))
 
     typedArrays[7] = Float64Array.from(obj, mapFn, thisArg);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 122, 7))
->Float64Array.from : Symbol(Float64ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Float64Array : Symbol(Float64Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Float64ArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Float64Array.from : Symbol(Float64ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Float64Array : Symbol(Float64Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Float64ArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 121, 38))
 >mapFn : Symbol(mapFn, Decl(typedArrays.ts, 121, 60))
 >thisArg : Symbol(thisArg, Decl(typedArrays.ts, 121, 98))
 
     typedArrays[8] = Uint8ClampedArray.from(obj, mapFn, thisArg);
 >typedArrays : Symbol(typedArrays, Decl(typedArrays.ts, 122, 7))
->Uint8ClampedArray.from : Symbol(Uint8ClampedArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->Uint8ClampedArray : Symbol(Uint8ClampedArray, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->from : Symbol(Uint8ClampedArrayConstructor.from, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Uint8ClampedArray.from : Symbol(Uint8ClampedArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>Uint8ClampedArray : Symbol(Uint8ClampedArray, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>from : Symbol(Uint8ClampedArrayConstructor.from, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 >obj : Symbol(obj, Decl(typedArrays.ts, 121, 38))
 >mapFn : Symbol(mapFn, Decl(typedArrays.ts, 121, 60))
 >thisArg : Symbol(thisArg, Decl(typedArrays.ts, 121, 98))
diff --git a/tests/baselines/reference/typedGenericPrototypeMember.symbols b/tests/baselines/reference/typedGenericPrototypeMember.symbols
index ee1d6a1c9f6..e733ea63bdf 100644
--- a/tests/baselines/reference/typedGenericPrototypeMember.symbols
+++ b/tests/baselines/reference/typedGenericPrototypeMember.symbols
@@ -4,7 +4,7 @@ class List<T> {
 >T : Symbol(T, Decl(typedGenericPrototypeMember.ts, 0, 11))
 
    add(item: T) { }
->add : Symbol(add, Decl(typedGenericPrototypeMember.ts, 0, 15))
+>add : Symbol(List.add, Decl(typedGenericPrototypeMember.ts, 0, 15))
 >item : Symbol(item, Decl(typedGenericPrototypeMember.ts, 1, 7))
 >T : Symbol(T, Decl(typedGenericPrototypeMember.ts, 0, 11))
 }
diff --git a/tests/baselines/reference/typeofANonExportedType.errors.txt b/tests/baselines/reference/typeofANonExportedType.errors.txt
index 2399938dcfc..b54cbf74c66 100644
--- a/tests/baselines/reference/typeofANonExportedType.errors.txt
+++ b/tests/baselines/reference/typeofANonExportedType.errors.txt
@@ -1,14 +1,11 @@
-tests/cases/conformance/types/specifyingTypes/typeQueries/typeofANonExportedType.ts(2,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/conformance/types/specifyingTypes/typeQueries/typeofANonExportedType.ts(20,12): error TS2323: Cannot redeclare exported variable 'r5'.
 tests/cases/conformance/types/specifyingTypes/typeQueries/typeofANonExportedType.ts(21,12): error TS2323: Cannot redeclare exported variable 'r5'.
 tests/cases/conformance/types/specifyingTypes/typeQueries/typeofANonExportedType.ts(42,12): error TS2502: 'r12' is referenced directly or indirectly in its own type annotation.
 
 
-==== tests/cases/conformance/types/specifyingTypes/typeQueries/typeofANonExportedType.ts (4 errors) ====
+==== tests/cases/conformance/types/specifyingTypes/typeQueries/typeofANonExportedType.ts (3 errors) ====
     var x = 1;
     export var r1: typeof x;
-    ~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
     var y = { foo: '' };
     export var r2: typeof y;
     class C {
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/typeofAnExportedType.errors.txt b/tests/baselines/reference/typeofAnExportedType.errors.txt
index 9740909bd59..520b8138ba5 100644
--- a/tests/baselines/reference/typeofAnExportedType.errors.txt
+++ b/tests/baselines/reference/typeofAnExportedType.errors.txt
@@ -1,13 +1,10 @@
-tests/cases/conformance/types/specifyingTypes/typeQueries/typeofAnExportedType.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
 tests/cases/conformance/types/specifyingTypes/typeQueries/typeofAnExportedType.ts(20,12): error TS2323: Cannot redeclare exported variable 'r5'.
 tests/cases/conformance/types/specifyingTypes/typeQueries/typeofAnExportedType.ts(21,12): error TS2323: Cannot redeclare exported variable 'r5'.
 tests/cases/conformance/types/specifyingTypes/typeQueries/typeofAnExportedType.ts(42,12): error TS2502: 'r12' is referenced directly or indirectly in its own type annotation.
 
 
-==== tests/cases/conformance/types/specifyingTypes/typeQueries/typeofAnExportedType.ts (4 errors) ====
+==== tests/cases/conformance/types/specifyingTypes/typeQueries/typeofAnExportedType.ts (3 errors) ====
     export var x = 1;
-    ~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
     export var r1: typeof x;
     export var y = { foo: '' };
     export var r2: typeof y;
diff --git a/tests/baselines/reference/typeofClass2.symbols b/tests/baselines/reference/typeofClass2.symbols
index 9f06726d368..bd306596f66 100644
--- a/tests/baselines/reference/typeofClass2.symbols
+++ b/tests/baselines/reference/typeofClass2.symbols
@@ -38,7 +38,7 @@ class D extends C {
 >x : Symbol(x, Decl(typeofClass2.ts, 13, 15))
 
     foo() { }
->foo : Symbol(foo, Decl(typeofClass2.ts, 13, 29))
+>foo : Symbol(D.foo, Decl(typeofClass2.ts, 13, 29))
 }
 
 var d: D;
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/typeofInterface.symbols b/tests/baselines/reference/typeofInterface.symbols
index 9aa305e0a30..267b8c0926c 100644
--- a/tests/baselines/reference/typeofInterface.symbols
+++ b/tests/baselines/reference/typeofInterface.symbols
@@ -7,10 +7,10 @@ interface I {
 >I : Symbol(I, Decl(typeofInterface.ts, 0, 3), Decl(typeofInterface.ts, 0, 20))
 
     I: number;
->I : Symbol(I, Decl(typeofInterface.ts, 2, 13))
+>I : Symbol(I.I, Decl(typeofInterface.ts, 2, 13))
 
     foo: typeof I;
->foo : Symbol(foo, Decl(typeofInterface.ts, 3, 14))
+>foo : Symbol(I.foo, Decl(typeofInterface.ts, 3, 14))
 >I : Symbol(I, Decl(typeofInterface.ts, 0, 3), Decl(typeofInterface.ts, 0, 20))
 }
 
diff --git a/tests/baselines/reference/typeofModuleWithoutExports.symbols b/tests/baselines/reference/typeofModuleWithoutExports.symbols
index 7ad01e1eda7..747bff96bf5 100644
--- a/tests/baselines/reference/typeofModuleWithoutExports.symbols
+++ b/tests/baselines/reference/typeofModuleWithoutExports.symbols
@@ -9,7 +9,7 @@ module M {
 >C : Symbol(C, Decl(typeofModuleWithoutExports.ts, 1, 14))
 
         foo: number;
->foo : Symbol(foo, Decl(typeofModuleWithoutExports.ts, 2, 13))
+>foo : Symbol(C.foo, Decl(typeofModuleWithoutExports.ts, 2, 13))
     }
 }
 
diff --git a/tests/baselines/reference/typeofOperatorWithBooleanType.symbols b/tests/baselines/reference/typeofOperatorWithBooleanType.symbols
index 0167a14ae03..33589277e01 100644
--- a/tests/baselines/reference/typeofOperatorWithBooleanType.symbols
+++ b/tests/baselines/reference/typeofOperatorWithBooleanType.symbols
@@ -11,7 +11,7 @@ class A {
 >A : Symbol(A, Decl(typeofOperatorWithBooleanType.ts, 4, 40))
 
     public a: boolean;
->a : Symbol(a, Decl(typeofOperatorWithBooleanType.ts, 6, 9))
+>a : Symbol(A.a, Decl(typeofOperatorWithBooleanType.ts, 6, 9))
 
     static foo() { return false; }
 >foo : Symbol(A.foo, Decl(typeofOperatorWithBooleanType.ts, 7, 22))
diff --git a/tests/baselines/reference/typeofOperatorWithNumberType.symbols b/tests/baselines/reference/typeofOperatorWithNumberType.symbols
index df49b7dccb6..b413c6e2af8 100644
--- a/tests/baselines/reference/typeofOperatorWithNumberType.symbols
+++ b/tests/baselines/reference/typeofOperatorWithNumberType.symbols
@@ -13,7 +13,7 @@ class A {
 >A : Symbol(A, Decl(typeofOperatorWithNumberType.ts, 4, 36))
 
     public a: number;
->a : Symbol(a, Decl(typeofOperatorWithNumberType.ts, 6, 9))
+>a : Symbol(A.a, Decl(typeofOperatorWithNumberType.ts, 6, 9))
 
     static foo() { return 1; }
 >foo : Symbol(A.foo, Decl(typeofOperatorWithNumberType.ts, 7, 21))
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/typesWithOptionalProperty.symbols b/tests/baselines/reference/typesWithOptionalProperty.symbols
index 9c546101099..07af97da644 100644
--- a/tests/baselines/reference/typesWithOptionalProperty.symbols
+++ b/tests/baselines/reference/typesWithOptionalProperty.symbols
@@ -5,13 +5,13 @@ interface I {
 >I : Symbol(I, Decl(typesWithOptionalProperty.ts, 0, 0))
 
     foo: string;
->foo : Symbol(foo, Decl(typesWithOptionalProperty.ts, 2, 13))
+>foo : Symbol(I.foo, Decl(typesWithOptionalProperty.ts, 2, 13))
 
     bar?: number;
->bar : Symbol(bar, Decl(typesWithOptionalProperty.ts, 3, 16))
+>bar : Symbol(I.bar, Decl(typesWithOptionalProperty.ts, 3, 16))
 
     baz? (): string;
->baz : Symbol(baz, Decl(typesWithOptionalProperty.ts, 4, 17))
+>baz : Symbol(I.baz, Decl(typesWithOptionalProperty.ts, 4, 17))
 }
 
 var a: {
diff --git a/tests/baselines/reference/typesWithPrivateConstructor.errors.txt b/tests/baselines/reference/typesWithPrivateConstructor.errors.txt
index 261038a1f4a..ab8ea4e26ad 100644
--- a/tests/baselines/reference/typesWithPrivateConstructor.errors.txt
+++ b/tests/baselines/reference/typesWithPrivateConstructor.errors.txt
@@ -1,36 +1,24 @@
-tests/cases/conformance/types/members/typesWithPrivateConstructor.ts(4,5): error TS1089: 'private' modifier cannot appear on a constructor declaration.
-tests/cases/conformance/types/members/typesWithPrivateConstructor.ts(8,5): error TS2322: Type 'Function' is not assignable to type '() => void'.
-  Type 'Function' provides no match for the signature '(): void'
-tests/cases/conformance/types/members/typesWithPrivateConstructor.ts(11,5): error TS1089: 'private' modifier cannot appear on a constructor declaration.
-tests/cases/conformance/types/members/typesWithPrivateConstructor.ts(12,5): error TS1089: 'private' modifier cannot appear on a constructor declaration.
-tests/cases/conformance/types/members/typesWithPrivateConstructor.ts(15,10): error TS2346: Supplied parameters do not match any signature of call target.
+tests/cases/conformance/types/members/typesWithPrivateConstructor.ts(6,9): error TS2673: Constructor of class 'C' is private and only accessible within the class declaration.
+tests/cases/conformance/types/members/typesWithPrivateConstructor.ts(14,10): error TS2673: Constructor of class 'C2' is private and only accessible within the class declaration.
 
 
-==== tests/cases/conformance/types/members/typesWithPrivateConstructor.ts (5 errors) ====
-    // private constructors are not allowed
+==== tests/cases/conformance/types/members/typesWithPrivateConstructor.ts (2 errors) ====
     
     class C {
         private constructor() { }
-        ~~~~~~~
-!!! error TS1089: 'private' modifier cannot appear on a constructor declaration.
     }
     
-    var c = new C();
+    var c = new C(); // error C is private
+            ~~~~~~~
+!!! error TS2673: Constructor of class 'C' is private and only accessible within the class declaration.
     var r: () => void = c.constructor;
-        ~
-!!! error TS2322: Type 'Function' is not assignable to type '() => void'.
-!!! error TS2322:   Type 'Function' provides no match for the signature '(): void'
     
     class C2 {
         private constructor(x: number);
-        ~~~~~~~
-!!! error TS1089: 'private' modifier cannot appear on a constructor declaration.
         private constructor(x: any) { }
-        ~~~~~~~
-!!! error TS1089: 'private' modifier cannot appear on a constructor declaration.
     }
     
-    var c2 = new C2();
+    var c2 = new C2(); // error C2 is private
              ~~~~~~~~
-!!! error TS2346: Supplied parameters do not match any signature of call target.
+!!! error TS2673: Constructor of class 'C2' is private and only accessible within the class declaration.
     var r2: (x: number) => void = c2.constructor;
\ No newline at end of file
diff --git a/tests/baselines/reference/typesWithPrivateConstructor.js b/tests/baselines/reference/typesWithPrivateConstructor.js
index d894eeda49a..1795ee6b316 100644
--- a/tests/baselines/reference/typesWithPrivateConstructor.js
+++ b/tests/baselines/reference/typesWithPrivateConstructor.js
@@ -1,11 +1,10 @@
 //// [typesWithPrivateConstructor.ts]
-// private constructors are not allowed
 
 class C {
     private constructor() { }
 }
 
-var c = new C();
+var c = new C(); // error C is private
 var r: () => void = c.constructor;
 
 class C2 {
@@ -13,22 +12,34 @@ class C2 {
     private constructor(x: any) { }
 }
 
-var c2 = new C2();
+var c2 = new C2(); // error C2 is private
 var r2: (x: number) => void = c2.constructor;
 
 //// [typesWithPrivateConstructor.js]
-// private constructors are not allowed
 var C = (function () {
     function C() {
     }
     return C;
 }());
-var c = new C();
+var c = new C(); // error C is private
 var r = c.constructor;
 var C2 = (function () {
     function C2(x) {
     }
     return C2;
 }());
-var c2 = new C2();
+var c2 = new C2(); // error C2 is private
 var r2 = c2.constructor;
+
+
+//// [typesWithPrivateConstructor.d.ts]
+declare class C {
+    private constructor();
+}
+declare var c: any;
+declare var r: () => void;
+declare class C2 {
+    private constructor(x);
+}
+declare var c2: any;
+declare var r2: (x: number) => void;
diff --git a/tests/baselines/reference/typesWithProtectedConstructor.errors.txt b/tests/baselines/reference/typesWithProtectedConstructor.errors.txt
new file mode 100644
index 00000000000..2a5a059f44d
--- /dev/null
+++ b/tests/baselines/reference/typesWithProtectedConstructor.errors.txt
@@ -0,0 +1,24 @@
+tests/cases/conformance/types/members/typesWithProtectedConstructor.ts(6,9): error TS2674: Constructor of class 'C' is protected and only accessible within the class declaration.
+tests/cases/conformance/types/members/typesWithProtectedConstructor.ts(14,10): error TS2674: Constructor of class 'C2' is protected and only accessible within the class declaration.
+
+
+==== tests/cases/conformance/types/members/typesWithProtectedConstructor.ts (2 errors) ====
+    
+    class C {
+        protected constructor() { }
+    }
+    
+    var c = new C(); // error C is protected
+            ~~~~~~~
+!!! error TS2674: Constructor of class 'C' is protected and only accessible within the class declaration.
+    var r: () => void = c.constructor;
+    
+    class C2 {
+        protected constructor(x: number);
+        protected constructor(x: any) { }
+    }
+    
+    var c2 = new C2(); // error C2 is protected
+             ~~~~~~~~
+!!! error TS2674: Constructor of class 'C2' is protected and only accessible within the class declaration.
+    var r2: (x: number) => void = c2.constructor;
\ No newline at end of file
diff --git a/tests/baselines/reference/typesWithProtectedConstructor.js b/tests/baselines/reference/typesWithProtectedConstructor.js
new file mode 100644
index 00000000000..e75b3b6ecd3
--- /dev/null
+++ b/tests/baselines/reference/typesWithProtectedConstructor.js
@@ -0,0 +1,45 @@
+//// [typesWithProtectedConstructor.ts]
+
+class C {
+    protected constructor() { }
+}
+
+var c = new C(); // error C is protected
+var r: () => void = c.constructor;
+
+class C2 {
+    protected constructor(x: number);
+    protected constructor(x: any) { }
+}
+
+var c2 = new C2(); // error C2 is protected
+var r2: (x: number) => void = c2.constructor;
+
+//// [typesWithProtectedConstructor.js]
+var C = (function () {
+    function C() {
+    }
+    return C;
+}());
+var c = new C(); // error C is protected
+var r = c.constructor;
+var C2 = (function () {
+    function C2(x) {
+    }
+    return C2;
+}());
+var c2 = new C2(); // error C2 is protected
+var r2 = c2.constructor;
+
+
+//// [typesWithProtectedConstructor.d.ts]
+declare class C {
+    protected constructor();
+}
+declare var c: any;
+declare var r: () => void;
+declare class C2 {
+    protected constructor(x: number);
+}
+declare var c2: any;
+declare var r2: (x: number) => void;
diff --git a/tests/baselines/reference/typesWithSpecializedCallSignatures.symbols b/tests/baselines/reference/typesWithSpecializedCallSignatures.symbols
index 87aa18e3564..f51f9322913 100644
--- a/tests/baselines/reference/typesWithSpecializedCallSignatures.symbols
+++ b/tests/baselines/reference/typesWithSpecializedCallSignatures.symbols
@@ -3,38 +3,38 @@
 
 class Base { foo: string }
 >Base : Symbol(Base, Decl(typesWithSpecializedCallSignatures.ts, 0, 0))
->foo : Symbol(foo, Decl(typesWithSpecializedCallSignatures.ts, 2, 12))
+>foo : Symbol(Base.foo, Decl(typesWithSpecializedCallSignatures.ts, 2, 12))
 
 class Derived1 extends Base { bar: string }
 >Derived1 : Symbol(Derived1, Decl(typesWithSpecializedCallSignatures.ts, 2, 26))
 >Base : Symbol(Base, Decl(typesWithSpecializedCallSignatures.ts, 0, 0))
->bar : Symbol(bar, Decl(typesWithSpecializedCallSignatures.ts, 3, 29))
+>bar : Symbol(Derived1.bar, Decl(typesWithSpecializedCallSignatures.ts, 3, 29))
 
 class Derived2 extends Base { baz: string }
 >Derived2 : Symbol(Derived2, Decl(typesWithSpecializedCallSignatures.ts, 3, 43))
 >Base : Symbol(Base, Decl(typesWithSpecializedCallSignatures.ts, 0, 0))
->baz : Symbol(baz, Decl(typesWithSpecializedCallSignatures.ts, 4, 29))
+>baz : Symbol(Derived2.baz, Decl(typesWithSpecializedCallSignatures.ts, 4, 29))
 
 class C {
 >C : Symbol(C, Decl(typesWithSpecializedCallSignatures.ts, 4, 43))
 
     foo(x: 'hi'): Derived1;
->foo : Symbol(foo, Decl(typesWithSpecializedCallSignatures.ts, 6, 9), Decl(typesWithSpecializedCallSignatures.ts, 7, 27), Decl(typesWithSpecializedCallSignatures.ts, 8, 28), Decl(typesWithSpecializedCallSignatures.ts, 9, 25))
+>foo : Symbol(C.foo, Decl(typesWithSpecializedCallSignatures.ts, 6, 9), Decl(typesWithSpecializedCallSignatures.ts, 7, 27), Decl(typesWithSpecializedCallSignatures.ts, 8, 28), Decl(typesWithSpecializedCallSignatures.ts, 9, 25))
 >x : Symbol(x, Decl(typesWithSpecializedCallSignatures.ts, 7, 8))
 >Derived1 : Symbol(Derived1, Decl(typesWithSpecializedCallSignatures.ts, 2, 26))
 
     foo(x: 'bye'): Derived2;
->foo : Symbol(foo, Decl(typesWithSpecializedCallSignatures.ts, 6, 9), Decl(typesWithSpecializedCallSignatures.ts, 7, 27), Decl(typesWithSpecializedCallSignatures.ts, 8, 28), Decl(typesWithSpecializedCallSignatures.ts, 9, 25))
+>foo : Symbol(C.foo, Decl(typesWithSpecializedCallSignatures.ts, 6, 9), Decl(typesWithSpecializedCallSignatures.ts, 7, 27), Decl(typesWithSpecializedCallSignatures.ts, 8, 28), Decl(typesWithSpecializedCallSignatures.ts, 9, 25))
 >x : Symbol(x, Decl(typesWithSpecializedCallSignatures.ts, 8, 8))
 >Derived2 : Symbol(Derived2, Decl(typesWithSpecializedCallSignatures.ts, 3, 43))
 
     foo(x: string): Base;
->foo : Symbol(foo, Decl(typesWithSpecializedCallSignatures.ts, 6, 9), Decl(typesWithSpecializedCallSignatures.ts, 7, 27), Decl(typesWithSpecializedCallSignatures.ts, 8, 28), Decl(typesWithSpecializedCallSignatures.ts, 9, 25))
+>foo : Symbol(C.foo, Decl(typesWithSpecializedCallSignatures.ts, 6, 9), Decl(typesWithSpecializedCallSignatures.ts, 7, 27), Decl(typesWithSpecializedCallSignatures.ts, 8, 28), Decl(typesWithSpecializedCallSignatures.ts, 9, 25))
 >x : Symbol(x, Decl(typesWithSpecializedCallSignatures.ts, 9, 8))
 >Base : Symbol(Base, Decl(typesWithSpecializedCallSignatures.ts, 0, 0))
 
     foo(x) {
->foo : Symbol(foo, Decl(typesWithSpecializedCallSignatures.ts, 6, 9), Decl(typesWithSpecializedCallSignatures.ts, 7, 27), Decl(typesWithSpecializedCallSignatures.ts, 8, 28), Decl(typesWithSpecializedCallSignatures.ts, 9, 25))
+>foo : Symbol(C.foo, Decl(typesWithSpecializedCallSignatures.ts, 6, 9), Decl(typesWithSpecializedCallSignatures.ts, 7, 27), Decl(typesWithSpecializedCallSignatures.ts, 8, 28), Decl(typesWithSpecializedCallSignatures.ts, 9, 25))
 >x : Symbol(x, Decl(typesWithSpecializedCallSignatures.ts, 10, 8))
 
         return x;
@@ -49,17 +49,17 @@ interface I {
 >I : Symbol(I, Decl(typesWithSpecializedCallSignatures.ts, 14, 16))
 
     foo(x: 'hi'): Derived1;
->foo : Symbol(foo, Decl(typesWithSpecializedCallSignatures.ts, 16, 13), Decl(typesWithSpecializedCallSignatures.ts, 17, 27), Decl(typesWithSpecializedCallSignatures.ts, 18, 28))
+>foo : Symbol(I.foo, Decl(typesWithSpecializedCallSignatures.ts, 16, 13), Decl(typesWithSpecializedCallSignatures.ts, 17, 27), Decl(typesWithSpecializedCallSignatures.ts, 18, 28))
 >x : Symbol(x, Decl(typesWithSpecializedCallSignatures.ts, 17, 8))
 >Derived1 : Symbol(Derived1, Decl(typesWithSpecializedCallSignatures.ts, 2, 26))
 
     foo(x: 'bye'): Derived2;
->foo : Symbol(foo, Decl(typesWithSpecializedCallSignatures.ts, 16, 13), Decl(typesWithSpecializedCallSignatures.ts, 17, 27), Decl(typesWithSpecializedCallSignatures.ts, 18, 28))
+>foo : Symbol(I.foo, Decl(typesWithSpecializedCallSignatures.ts, 16, 13), Decl(typesWithSpecializedCallSignatures.ts, 17, 27), Decl(typesWithSpecializedCallSignatures.ts, 18, 28))
 >x : Symbol(x, Decl(typesWithSpecializedCallSignatures.ts, 18, 8))
 >Derived2 : Symbol(Derived2, Decl(typesWithSpecializedCallSignatures.ts, 3, 43))
 
     foo(x: string): Base;
->foo : Symbol(foo, Decl(typesWithSpecializedCallSignatures.ts, 16, 13), Decl(typesWithSpecializedCallSignatures.ts, 17, 27), Decl(typesWithSpecializedCallSignatures.ts, 18, 28))
+>foo : Symbol(I.foo, Decl(typesWithSpecializedCallSignatures.ts, 16, 13), Decl(typesWithSpecializedCallSignatures.ts, 17, 27), Decl(typesWithSpecializedCallSignatures.ts, 18, 28))
 >x : Symbol(x, Decl(typesWithSpecializedCallSignatures.ts, 19, 8))
 >Base : Symbol(Base, Decl(typesWithSpecializedCallSignatures.ts, 0, 0))
 }
diff --git a/tests/baselines/reference/typesWithSpecializedConstructSignatures.symbols b/tests/baselines/reference/typesWithSpecializedConstructSignatures.symbols
index 428be5f7438..1adb4e6d96c 100644
--- a/tests/baselines/reference/typesWithSpecializedConstructSignatures.symbols
+++ b/tests/baselines/reference/typesWithSpecializedConstructSignatures.symbols
@@ -3,17 +3,17 @@
 
 class Base { foo: string }
 >Base : Symbol(Base, Decl(typesWithSpecializedConstructSignatures.ts, 0, 0))
->foo : Symbol(foo, Decl(typesWithSpecializedConstructSignatures.ts, 2, 12))
+>foo : Symbol(Base.foo, Decl(typesWithSpecializedConstructSignatures.ts, 2, 12))
 
 class Derived1 extends Base { bar: string }
 >Derived1 : Symbol(Derived1, Decl(typesWithSpecializedConstructSignatures.ts, 2, 26))
 >Base : Symbol(Base, Decl(typesWithSpecializedConstructSignatures.ts, 0, 0))
->bar : Symbol(bar, Decl(typesWithSpecializedConstructSignatures.ts, 3, 29))
+>bar : Symbol(Derived1.bar, Decl(typesWithSpecializedConstructSignatures.ts, 3, 29))
 
 class Derived2 extends Base { baz: string }
 >Derived2 : Symbol(Derived2, Decl(typesWithSpecializedConstructSignatures.ts, 3, 43))
 >Base : Symbol(Base, Decl(typesWithSpecializedConstructSignatures.ts, 0, 0))
->baz : Symbol(baz, Decl(typesWithSpecializedConstructSignatures.ts, 4, 29))
+>baz : Symbol(Derived2.baz, Decl(typesWithSpecializedConstructSignatures.ts, 4, 29))
 
 class C {
 >C : Symbol(C, Decl(typesWithSpecializedConstructSignatures.ts, 4, 43))
diff --git a/tests/baselines/reference/umd-augmentation-1.js b/tests/baselines/reference/umd-augmentation-1.js
new file mode 100644
index 00000000000..ee4c143486c
--- /dev/null
+++ b/tests/baselines/reference/umd-augmentation-1.js
@@ -0,0 +1,50 @@
+//// [tests/cases/conformance/externalModules/umd-augmentation-1.ts] ////
+
+//// [index.d.ts]
+
+export as namespace Math2d;
+
+export interface Point {
+	x: number;
+	y: number;
+}
+
+export class Vector implements Point {
+	x: number;
+	y: number;
+	constructor(x: number, y: number);
+
+	translate(dx: number, dy: number): Vector;
+}
+
+export function getLength(p: Vector): number;
+
+//// [math2d-augment.d.ts]
+import * as Math2d from 'math2d';
+// Augment the module
+declare module 'math2d' {
+	// Add a method to the class
+	interface Vector {
+		reverse(): Math2d.Point;
+	}
+}
+
+//// [b.ts]
+/// <reference path="math2d-augment.d.ts" />
+import * as m from 'math2d';
+let v = new m.Vector(3, 2);
+let magnitude = m.getLength(v);
+let p: m.Point = v.translate(5, 5);
+p = v.reverse();
+var t = p.x;
+
+
+//// [b.js]
+"use strict";
+/// <reference path="math2d-augment.d.ts" />
+var m = require("math2d");
+var v = new m.Vector(3, 2);
+var magnitude = m.getLength(v);
+var p = v.translate(5, 5);
+p = v.reverse();
+var t = p.x;
diff --git a/tests/baselines/reference/umd-augmentation-1.symbols b/tests/baselines/reference/umd-augmentation-1.symbols
new file mode 100644
index 00000000000..645511350a9
--- /dev/null
+++ b/tests/baselines/reference/umd-augmentation-1.symbols
@@ -0,0 +1,95 @@
+=== tests/cases/conformance/externalModules/b.ts ===
+/// <reference path="math2d-augment.d.ts" />
+import * as m from 'math2d';
+>m : Symbol(m, Decl(b.ts, 1, 6))
+
+let v = new m.Vector(3, 2);
+>v : Symbol(v, Decl(b.ts, 2, 3))
+>m.Vector : Symbol(m.Vector, Decl(index.d.ts, 6, 1), Decl(math2d-augment.d.ts, 2, 25))
+>m : Symbol(m, Decl(b.ts, 1, 6))
+>Vector : Symbol(m.Vector, Decl(index.d.ts, 6, 1), Decl(math2d-augment.d.ts, 2, 25))
+
+let magnitude = m.getLength(v);
+>magnitude : Symbol(magnitude, Decl(b.ts, 3, 3))
+>m.getLength : Symbol(m.getLength, Decl(index.d.ts, 14, 1))
+>m : Symbol(m, Decl(b.ts, 1, 6))
+>getLength : Symbol(m.getLength, Decl(index.d.ts, 14, 1))
+>v : Symbol(v, Decl(b.ts, 2, 3))
+
+let p: m.Point = v.translate(5, 5);
+>p : Symbol(p, Decl(b.ts, 4, 3))
+>m : Symbol(m, Decl(b.ts, 1, 6))
+>Point : Symbol(m.Point, Decl(index.d.ts, 1, 27))
+>v.translate : Symbol(m.Vector.translate, Decl(index.d.ts, 11, 35))
+>v : Symbol(v, Decl(b.ts, 2, 3))
+>translate : Symbol(m.Vector.translate, Decl(index.d.ts, 11, 35))
+
+p = v.reverse();
+>p : Symbol(p, Decl(b.ts, 4, 3))
+>v.reverse : Symbol(m.Vector.reverse, Decl(math2d-augment.d.ts, 4, 19))
+>v : Symbol(v, Decl(b.ts, 2, 3))
+>reverse : Symbol(m.Vector.reverse, Decl(math2d-augment.d.ts, 4, 19))
+
+var t = p.x;
+>t : Symbol(t, Decl(b.ts, 6, 3))
+>p.x : Symbol(m.Point.x, Decl(index.d.ts, 3, 24))
+>p : Symbol(p, Decl(b.ts, 4, 3))
+>x : Symbol(m.Point.x, Decl(index.d.ts, 3, 24))
+
+=== tests/cases/conformance/externalModules/node_modules/math2d/index.d.ts ===
+
+export as namespace Math2d;
+
+export interface Point {
+>Point : Symbol(Point, Decl(index.d.ts, 1, 27))
+
+	x: number;
+>x : Symbol(Point.x, Decl(index.d.ts, 3, 24))
+
+	y: number;
+>y : Symbol(Point.y, Decl(index.d.ts, 4, 11))
+}
+
+export class Vector implements Point {
+>Vector : Symbol(Vector, Decl(index.d.ts, 6, 1), Decl(math2d-augment.d.ts, 2, 25))
+>Point : Symbol(Point, Decl(index.d.ts, 1, 27))
+
+	x: number;
+>x : Symbol(Vector.x, Decl(index.d.ts, 8, 38))
+
+	y: number;
+>y : Symbol(Vector.y, Decl(index.d.ts, 9, 11))
+
+	constructor(x: number, y: number);
+>x : Symbol(x, Decl(index.d.ts, 11, 13))
+>y : Symbol(y, Decl(index.d.ts, 11, 23))
+
+	translate(dx: number, dy: number): Vector;
+>translate : Symbol(Vector.translate, Decl(index.d.ts, 11, 35))
+>dx : Symbol(dx, Decl(index.d.ts, 13, 11))
+>dy : Symbol(dy, Decl(index.d.ts, 13, 22))
+>Vector : Symbol(Vector, Decl(index.d.ts, 6, 1), Decl(math2d-augment.d.ts, 2, 25))
+}
+
+export function getLength(p: Vector): number;
+>getLength : Symbol(getLength, Decl(index.d.ts, 14, 1))
+>p : Symbol(p, Decl(index.d.ts, 16, 26))
+>Vector : Symbol(Vector, Decl(index.d.ts, 6, 1), Decl(math2d-augment.d.ts, 2, 25))
+
+=== tests/cases/conformance/externalModules/math2d-augment.d.ts ===
+import * as Math2d from 'math2d';
+>Math2d : Symbol(Math2d, Decl(math2d-augment.d.ts, 0, 6))
+
+// Augment the module
+declare module 'math2d' {
+	// Add a method to the class
+	interface Vector {
+>Vector : Symbol(Vector, Decl(index.d.ts, 6, 1), Decl(math2d-augment.d.ts, 2, 25))
+
+		reverse(): Math2d.Point;
+>reverse : Symbol(Vector.reverse, Decl(math2d-augment.d.ts, 4, 19))
+>Math2d : Symbol(Math2d, Decl(math2d-augment.d.ts, 0, 6))
+>Point : Symbol(Point, Decl(index.d.ts, 1, 27))
+	}
+}
+
diff --git a/tests/baselines/reference/umd-augmentation-1.types b/tests/baselines/reference/umd-augmentation-1.types
new file mode 100644
index 00000000000..31ac43fe855
--- /dev/null
+++ b/tests/baselines/reference/umd-augmentation-1.types
@@ -0,0 +1,105 @@
+=== tests/cases/conformance/externalModules/b.ts ===
+/// <reference path="math2d-augment.d.ts" />
+import * as m from 'math2d';
+>m : typeof m
+
+let v = new m.Vector(3, 2);
+>v : m.Vector
+>new m.Vector(3, 2) : m.Vector
+>m.Vector : typeof m.Vector
+>m : typeof m
+>Vector : typeof m.Vector
+>3 : number
+>2 : number
+
+let magnitude = m.getLength(v);
+>magnitude : number
+>m.getLength(v) : number
+>m.getLength : (p: m.Vector) => number
+>m : typeof m
+>getLength : (p: m.Vector) => number
+>v : m.Vector
+
+let p: m.Point = v.translate(5, 5);
+>p : m.Point
+>m : any
+>Point : m.Point
+>v.translate(5, 5) : m.Vector
+>v.translate : (dx: number, dy: number) => m.Vector
+>v : m.Vector
+>translate : (dx: number, dy: number) => m.Vector
+>5 : number
+>5 : number
+
+p = v.reverse();
+>p = v.reverse() : m.Point
+>p : m.Point
+>v.reverse() : m.Point
+>v.reverse : () => m.Point
+>v : m.Vector
+>reverse : () => m.Point
+
+var t = p.x;
+>t : number
+>p.x : number
+>p : m.Point
+>x : number
+
+=== tests/cases/conformance/externalModules/node_modules/math2d/index.d.ts ===
+
+export as namespace Math2d;
+>Math2d : any
+
+export interface Point {
+>Point : Point
+
+	x: number;
+>x : number
+
+	y: number;
+>y : number
+}
+
+export class Vector implements Point {
+>Vector : Vector
+>Point : Point
+
+	x: number;
+>x : number
+
+	y: number;
+>y : number
+
+	constructor(x: number, y: number);
+>x : number
+>y : number
+
+	translate(dx: number, dy: number): Vector;
+>translate : (dx: number, dy: number) => Vector
+>dx : number
+>dy : number
+>Vector : Vector
+}
+
+export function getLength(p: Vector): number;
+>getLength : (p: Vector) => number
+>p : Vector
+>Vector : Vector
+
+=== tests/cases/conformance/externalModules/math2d-augment.d.ts ===
+import * as Math2d from 'math2d';
+>Math2d : typeof Math2d
+
+// Augment the module
+declare module 'math2d' {
+	// Add a method to the class
+	interface Vector {
+>Vector : Vector
+
+		reverse(): Math2d.Point;
+>reverse : () => Point
+>Math2d : any
+>Point : Point
+	}
+}
+
diff --git a/tests/baselines/reference/umd-augmentation-2.js b/tests/baselines/reference/umd-augmentation-2.js
new file mode 100644
index 00000000000..a4a98690b52
--- /dev/null
+++ b/tests/baselines/reference/umd-augmentation-2.js
@@ -0,0 +1,49 @@
+//// [tests/cases/conformance/externalModules/umd-augmentation-2.ts] ////
+
+//// [index.d.ts]
+
+export as namespace Math2d;
+
+export interface Point {
+	x: number;
+	y: number;
+}
+
+export class Vector implements Point {
+	x: number;
+	y: number;
+	constructor(x: number, y: number);
+
+	translate(dx: number, dy: number): Vector;
+}
+
+export function getLength(p: Vector): number;
+
+//// [math2d-augment.d.ts]
+import * as Math2d from 'math2d';
+// Augment the module
+declare module 'math2d' {
+	// Add a method to the class
+	interface Vector {
+		reverse(): Math2d.Point;
+	}
+}
+
+//// [a.ts]
+/// <reference path="node_modules/math2d/index.d.ts" />
+/// <reference path="math2d-augment.d.ts" />
+let v = new Math2d.Vector(3, 2);
+let magnitude = Math2d.getLength(v);
+let p: Math2d.Point = v.translate(5, 5);
+p = v.reverse();
+var t = p.x;
+
+
+//// [a.js]
+/// <reference path="node_modules/math2d/index.d.ts" />
+/// <reference path="math2d-augment.d.ts" />
+var v = new exports.Math2d.Vector(3, 2);
+var magnitude = exports.Math2d.getLength(v);
+var p = v.translate(5, 5);
+p = v.reverse();
+var t = p.x;
diff --git a/tests/baselines/reference/umd-augmentation-2.symbols b/tests/baselines/reference/umd-augmentation-2.symbols
new file mode 100644
index 00000000000..bd6584d3d74
--- /dev/null
+++ b/tests/baselines/reference/umd-augmentation-2.symbols
@@ -0,0 +1,93 @@
+=== tests/cases/conformance/externalModules/a.ts ===
+/// <reference path="node_modules/math2d/index.d.ts" />
+/// <reference path="math2d-augment.d.ts" />
+let v = new Math2d.Vector(3, 2);
+>v : Symbol(v, Decl(a.ts, 2, 3))
+>Math2d.Vector : Symbol(Math2d.Vector, Decl(index.d.ts, 6, 1))
+>Math2d : Symbol(Math2d, Decl(index.d.ts, 0, 0))
+>Vector : Symbol(Math2d.Vector, Decl(index.d.ts, 6, 1))
+
+let magnitude = Math2d.getLength(v);
+>magnitude : Symbol(magnitude, Decl(a.ts, 3, 3))
+>Math2d.getLength : Symbol(Math2d.getLength, Decl(index.d.ts, 14, 1))
+>Math2d : Symbol(Math2d, Decl(index.d.ts, 0, 0))
+>getLength : Symbol(Math2d.getLength, Decl(index.d.ts, 14, 1))
+>v : Symbol(v, Decl(a.ts, 2, 3))
+
+let p: Math2d.Point = v.translate(5, 5);
+>p : Symbol(p, Decl(a.ts, 4, 3))
+>Math2d : Symbol(Math2d, Decl(index.d.ts, 0, 0))
+>Point : Symbol(Math2d.Point, Decl(index.d.ts, 1, 27))
+>v.translate : Symbol(Vector.translate, Decl(index.d.ts, 11, 35))
+>v : Symbol(v, Decl(a.ts, 2, 3))
+>translate : Symbol(Vector.translate, Decl(index.d.ts, 11, 35))
+
+p = v.reverse();
+>p : Symbol(p, Decl(a.ts, 4, 3))
+>v.reverse : Symbol(Vector.reverse, Decl(math2d-augment.d.ts, 4, 19))
+>v : Symbol(v, Decl(a.ts, 2, 3))
+>reverse : Symbol(Vector.reverse, Decl(math2d-augment.d.ts, 4, 19))
+
+var t = p.x;
+>t : Symbol(t, Decl(a.ts, 6, 3))
+>p.x : Symbol(Math2d.Point.x, Decl(index.d.ts, 3, 24))
+>p : Symbol(p, Decl(a.ts, 4, 3))
+>x : Symbol(Math2d.Point.x, Decl(index.d.ts, 3, 24))
+
+=== tests/cases/conformance/externalModules/node_modules/math2d/index.d.ts ===
+
+export as namespace Math2d;
+
+export interface Point {
+>Point : Symbol(Point, Decl(index.d.ts, 1, 27))
+
+	x: number;
+>x : Symbol(Point.x, Decl(index.d.ts, 3, 24))
+
+	y: number;
+>y : Symbol(Point.y, Decl(index.d.ts, 4, 11))
+}
+
+export class Vector implements Point {
+>Vector : Symbol(Vector, Decl(index.d.ts, 6, 1), Decl(math2d-augment.d.ts, 2, 25))
+>Point : Symbol(Point, Decl(index.d.ts, 1, 27))
+
+	x: number;
+>x : Symbol(Vector.x, Decl(index.d.ts, 8, 38))
+
+	y: number;
+>y : Symbol(Vector.y, Decl(index.d.ts, 9, 11))
+
+	constructor(x: number, y: number);
+>x : Symbol(x, Decl(index.d.ts, 11, 13))
+>y : Symbol(y, Decl(index.d.ts, 11, 23))
+
+	translate(dx: number, dy: number): Vector;
+>translate : Symbol(Vector.translate, Decl(index.d.ts, 11, 35))
+>dx : Symbol(dx, Decl(index.d.ts, 13, 11))
+>dy : Symbol(dy, Decl(index.d.ts, 13, 22))
+>Vector : Symbol(Vector, Decl(index.d.ts, 6, 1), Decl(math2d-augment.d.ts, 2, 25))
+}
+
+export function getLength(p: Vector): number;
+>getLength : Symbol(getLength, Decl(index.d.ts, 14, 1))
+>p : Symbol(p, Decl(index.d.ts, 16, 26))
+>Vector : Symbol(Vector, Decl(index.d.ts, 6, 1), Decl(math2d-augment.d.ts, 2, 25))
+
+=== tests/cases/conformance/externalModules/math2d-augment.d.ts ===
+import * as Math2d from 'math2d';
+>Math2d : Symbol(Math2d, Decl(math2d-augment.d.ts, 0, 6))
+
+// Augment the module
+declare module 'math2d' {
+	// Add a method to the class
+	interface Vector {
+>Vector : Symbol(Vector, Decl(index.d.ts, 6, 1), Decl(math2d-augment.d.ts, 2, 25))
+
+		reverse(): Math2d.Point;
+>reverse : Symbol(Vector.reverse, Decl(math2d-augment.d.ts, 4, 19))
+>Math2d : Symbol(Math2d, Decl(math2d-augment.d.ts, 0, 6))
+>Point : Symbol(Point, Decl(index.d.ts, 1, 27))
+	}
+}
+
diff --git a/tests/baselines/reference/umd-augmentation-2.types b/tests/baselines/reference/umd-augmentation-2.types
new file mode 100644
index 00000000000..20bba091903
--- /dev/null
+++ b/tests/baselines/reference/umd-augmentation-2.types
@@ -0,0 +1,103 @@
+=== tests/cases/conformance/externalModules/a.ts ===
+/// <reference path="node_modules/math2d/index.d.ts" />
+/// <reference path="math2d-augment.d.ts" />
+let v = new Math2d.Vector(3, 2);
+>v : Vector
+>new Math2d.Vector(3, 2) : Vector
+>Math2d.Vector : typeof Math2d.Vector
+>Math2d : typeof Math2d
+>Vector : typeof Math2d.Vector
+>3 : number
+>2 : number
+
+let magnitude = Math2d.getLength(v);
+>magnitude : number
+>Math2d.getLength(v) : number
+>Math2d.getLength : (p: Vector) => number
+>Math2d : typeof Math2d
+>getLength : (p: Vector) => number
+>v : Vector
+
+let p: Math2d.Point = v.translate(5, 5);
+>p : Math2d.Point
+>Math2d : any
+>Point : Math2d.Point
+>v.translate(5, 5) : Vector
+>v.translate : (dx: number, dy: number) => Vector
+>v : Vector
+>translate : (dx: number, dy: number) => Vector
+>5 : number
+>5 : number
+
+p = v.reverse();
+>p = v.reverse() : Math2d.Point
+>p : Math2d.Point
+>v.reverse() : Math2d.Point
+>v.reverse : () => Math2d.Point
+>v : Vector
+>reverse : () => Math2d.Point
+
+var t = p.x;
+>t : number
+>p.x : number
+>p : Math2d.Point
+>x : number
+
+=== tests/cases/conformance/externalModules/node_modules/math2d/index.d.ts ===
+
+export as namespace Math2d;
+>Math2d : any
+
+export interface Point {
+>Point : Point
+
+	x: number;
+>x : number
+
+	y: number;
+>y : number
+}
+
+export class Vector implements Point {
+>Vector : Vector
+>Point : Point
+
+	x: number;
+>x : number
+
+	y: number;
+>y : number
+
+	constructor(x: number, y: number);
+>x : number
+>y : number
+
+	translate(dx: number, dy: number): Vector;
+>translate : (dx: number, dy: number) => Vector
+>dx : number
+>dy : number
+>Vector : Vector
+}
+
+export function getLength(p: Vector): number;
+>getLength : (p: Vector) => number
+>p : Vector
+>Vector : Vector
+
+=== tests/cases/conformance/externalModules/math2d-augment.d.ts ===
+import * as Math2d from 'math2d';
+>Math2d : typeof Math2d
+
+// Augment the module
+declare module 'math2d' {
+	// Add a method to the class
+	interface Vector {
+>Vector : Vector
+
+		reverse(): Math2d.Point;
+>reverse : () => Point
+>Math2d : any
+>Point : Point
+	}
+}
+
diff --git a/tests/baselines/reference/umd-augmentation-3.js b/tests/baselines/reference/umd-augmentation-3.js
new file mode 100644
index 00000000000..e9abf724881
--- /dev/null
+++ b/tests/baselines/reference/umd-augmentation-3.js
@@ -0,0 +1,56 @@
+//// [tests/cases/conformance/externalModules/umd-augmentation-3.ts] ////
+
+//// [index.d.ts]
+
+export as namespace Math2d;
+
+export = M2D;
+
+declare namespace M2D {
+	interface Point {
+		x: number;
+		y: number;
+	}
+
+	class Vector implements Point {
+		x: number;
+		y: number;
+		constructor(x: number, y: number);
+
+		translate(dx: number, dy: number): Vector;
+	}
+
+	function getLength(p: Vector): number;
+
+}
+
+
+//// [math2d-augment.d.ts]
+import * as Math2d from 'math2d';
+// Augment the module
+declare module 'math2d' {
+	// Add a method to the class
+	interface Vector {
+		reverse(): Math2d.Point;
+	}
+}
+
+//// [b.ts]
+/// <reference path="math2d-augment.d.ts" />
+import * as m from 'math2d';
+let v = new m.Vector(3, 2);
+let magnitude = m.getLength(v);
+let p: m.Point = v.translate(5, 5);
+p = v.reverse();
+var t = p.x;
+
+
+//// [b.js]
+"use strict";
+/// <reference path="math2d-augment.d.ts" />
+var m = require("math2d");
+var v = new m.Vector(3, 2);
+var magnitude = m.getLength(v);
+var p = v.translate(5, 5);
+p = v.reverse();
+var t = p.x;
diff --git a/tests/baselines/reference/umd-augmentation-3.symbols b/tests/baselines/reference/umd-augmentation-3.symbols
new file mode 100644
index 00000000000..4923c17954f
--- /dev/null
+++ b/tests/baselines/reference/umd-augmentation-3.symbols
@@ -0,0 +1,104 @@
+=== tests/cases/conformance/externalModules/b.ts ===
+/// <reference path="math2d-augment.d.ts" />
+import * as m from 'math2d';
+>m : Symbol(m, Decl(b.ts, 1, 6))
+
+let v = new m.Vector(3, 2);
+>v : Symbol(v, Decl(b.ts, 2, 3))
+>m.Vector : Symbol(m.Vector, Decl(index.d.ts, 9, 2), Decl(math2d-augment.d.ts, 2, 25))
+>m : Symbol(m, Decl(b.ts, 1, 6))
+>Vector : Symbol(m.Vector, Decl(index.d.ts, 9, 2), Decl(math2d-augment.d.ts, 2, 25))
+
+let magnitude = m.getLength(v);
+>magnitude : Symbol(magnitude, Decl(b.ts, 3, 3))
+>m.getLength : Symbol(m.getLength, Decl(index.d.ts, 17, 2))
+>m : Symbol(m, Decl(b.ts, 1, 6))
+>getLength : Symbol(m.getLength, Decl(index.d.ts, 17, 2))
+>v : Symbol(v, Decl(b.ts, 2, 3))
+
+let p: m.Point = v.translate(5, 5);
+>p : Symbol(p, Decl(b.ts, 4, 3))
+>m : Symbol(m, Decl(b.ts, 1, 6))
+>Point : Symbol(m.Point, Decl(index.d.ts, 5, 23))
+>v.translate : Symbol(m.Vector.translate, Decl(index.d.ts, 14, 36))
+>v : Symbol(v, Decl(b.ts, 2, 3))
+>translate : Symbol(m.Vector.translate, Decl(index.d.ts, 14, 36))
+
+p = v.reverse();
+>p : Symbol(p, Decl(b.ts, 4, 3))
+>v.reverse : Symbol(m.Vector.reverse, Decl(math2d-augment.d.ts, 4, 19))
+>v : Symbol(v, Decl(b.ts, 2, 3))
+>reverse : Symbol(m.Vector.reverse, Decl(math2d-augment.d.ts, 4, 19))
+
+var t = p.x;
+>t : Symbol(t, Decl(b.ts, 6, 3))
+>p.x : Symbol(m.Point.x, Decl(index.d.ts, 6, 18))
+>p : Symbol(p, Decl(b.ts, 4, 3))
+>x : Symbol(m.Point.x, Decl(index.d.ts, 6, 18))
+
+=== tests/cases/conformance/externalModules/node_modules/math2d/index.d.ts ===
+
+export as namespace Math2d;
+
+export = M2D;
+>M2D : Symbol(M2D, Decl(index.d.ts, 3, 13))
+
+declare namespace M2D {
+>M2D : Symbol(, Decl(index.d.ts, 3, 13), Decl(math2d-augment.d.ts, 0, 33))
+
+	interface Point {
+>Point : Symbol(Point, Decl(index.d.ts, 5, 23))
+
+		x: number;
+>x : Symbol(Point.x, Decl(index.d.ts, 6, 18))
+
+		y: number;
+>y : Symbol(Point.y, Decl(index.d.ts, 7, 12))
+	}
+
+	class Vector implements Point {
+>Vector : Symbol(Vector, Decl(index.d.ts, 9, 2), Decl(math2d-augment.d.ts, 2, 25))
+>Point : Symbol(Point, Decl(index.d.ts, 5, 23))
+
+		x: number;
+>x : Symbol(Vector.x, Decl(index.d.ts, 11, 32))
+
+		y: number;
+>y : Symbol(Vector.y, Decl(index.d.ts, 12, 12))
+
+		constructor(x: number, y: number);
+>x : Symbol(x, Decl(index.d.ts, 14, 14))
+>y : Symbol(y, Decl(index.d.ts, 14, 24))
+
+		translate(dx: number, dy: number): Vector;
+>translate : Symbol(Vector.translate, Decl(index.d.ts, 14, 36))
+>dx : Symbol(dx, Decl(index.d.ts, 16, 12))
+>dy : Symbol(dy, Decl(index.d.ts, 16, 23))
+>Vector : Symbol(Vector, Decl(index.d.ts, 9, 2), Decl(math2d-augment.d.ts, 2, 25))
+	}
+
+	function getLength(p: Vector): number;
+>getLength : Symbol(getLength, Decl(index.d.ts, 17, 2))
+>p : Symbol(p, Decl(index.d.ts, 19, 20))
+>Vector : Symbol(Vector, Decl(index.d.ts, 9, 2), Decl(math2d-augment.d.ts, 2, 25))
+
+}
+
+
+=== tests/cases/conformance/externalModules/math2d-augment.d.ts ===
+import * as Math2d from 'math2d';
+>Math2d : Symbol(Math2d, Decl(math2d-augment.d.ts, 0, 6))
+
+// Augment the module
+declare module 'math2d' {
+	// Add a method to the class
+	interface Vector {
+>Vector : Symbol(Vector, Decl(index.d.ts, 9, 2), Decl(math2d-augment.d.ts, 2, 25))
+
+		reverse(): Math2d.Point;
+>reverse : Symbol(Vector.reverse, Decl(math2d-augment.d.ts, 4, 19))
+>Math2d : Symbol(Math2d, Decl(math2d-augment.d.ts, 0, 6))
+>Point : Symbol(Point, Decl(index.d.ts, 5, 23))
+	}
+}
+
diff --git a/tests/baselines/reference/umd-augmentation-3.types b/tests/baselines/reference/umd-augmentation-3.types
new file mode 100644
index 00000000000..09a383dc881
--- /dev/null
+++ b/tests/baselines/reference/umd-augmentation-3.types
@@ -0,0 +1,114 @@
+=== tests/cases/conformance/externalModules/b.ts ===
+/// <reference path="math2d-augment.d.ts" />
+import * as m from 'math2d';
+>m : typeof m
+
+let v = new m.Vector(3, 2);
+>v : m.Vector
+>new m.Vector(3, 2) : m.Vector
+>m.Vector : typeof m.Vector
+>m : typeof m
+>Vector : typeof m.Vector
+>3 : number
+>2 : number
+
+let magnitude = m.getLength(v);
+>magnitude : number
+>m.getLength(v) : number
+>m.getLength : (p: m.Vector) => number
+>m : typeof m
+>getLength : (p: m.Vector) => number
+>v : m.Vector
+
+let p: m.Point = v.translate(5, 5);
+>p : m.Point
+>m : any
+>Point : m.Point
+>v.translate(5, 5) : m.Vector
+>v.translate : (dx: number, dy: number) => m.Vector
+>v : m.Vector
+>translate : (dx: number, dy: number) => m.Vector
+>5 : number
+>5 : number
+
+p = v.reverse();
+>p = v.reverse() : m.Point
+>p : m.Point
+>v.reverse() : m.Point
+>v.reverse : () => m.Point
+>v : m.Vector
+>reverse : () => m.Point
+
+var t = p.x;
+>t : number
+>p.x : number
+>p : m.Point
+>x : number
+
+=== tests/cases/conformance/externalModules/node_modules/math2d/index.d.ts ===
+
+export as namespace Math2d;
+>Math2d : any
+
+export = M2D;
+>M2D : typeof M2D
+
+declare namespace M2D {
+>M2D : typeof 
+
+	interface Point {
+>Point : Point
+
+		x: number;
+>x : number
+
+		y: number;
+>y : number
+	}
+
+	class Vector implements Point {
+>Vector : Vector
+>Point : Point
+
+		x: number;
+>x : number
+
+		y: number;
+>y : number
+
+		constructor(x: number, y: number);
+>x : number
+>y : number
+
+		translate(dx: number, dy: number): Vector;
+>translate : (dx: number, dy: number) => Vector
+>dx : number
+>dy : number
+>Vector : Vector
+	}
+
+	function getLength(p: Vector): number;
+>getLength : (p: Vector) => number
+>p : Vector
+>Vector : Vector
+
+}
+
+
+=== tests/cases/conformance/externalModules/math2d-augment.d.ts ===
+import * as Math2d from 'math2d';
+>Math2d : typeof Math2d
+
+// Augment the module
+declare module 'math2d' {
+	// Add a method to the class
+	interface Vector {
+>Vector : Vector
+
+		reverse(): Math2d.Point;
+>reverse : () => Point
+>Math2d : any
+>Point : Point
+	}
+}
+
diff --git a/tests/baselines/reference/umd-augmentation-4.js b/tests/baselines/reference/umd-augmentation-4.js
new file mode 100644
index 00000000000..da0f2ec1777
--- /dev/null
+++ b/tests/baselines/reference/umd-augmentation-4.js
@@ -0,0 +1,55 @@
+//// [tests/cases/conformance/externalModules/umd-augmentation-4.ts] ////
+
+//// [index.d.ts]
+
+export as namespace Math2d;
+
+export = M2D;
+
+declare namespace M2D {
+	interface Point {
+		x: number;
+		y: number;
+	}
+
+	class Vector implements Point {
+		x: number;
+		y: number;
+		constructor(x: number, y: number);
+
+		translate(dx: number, dy: number): Vector;
+	}
+
+	function getLength(p: Vector): number;
+
+}
+
+
+//// [math2d-augment.d.ts]
+import * as Math2d from 'math2d';
+// Augment the module
+declare module 'math2d' {
+	// Add a method to the class
+	interface Vector {
+		reverse(): Math2d.Point;
+	}
+}
+
+//// [a.ts]
+/// <reference path="node_modules/math2d/index.d.ts" />
+/// <reference path="math2d-augment.d.ts" />
+let v = new Math2d.Vector(3, 2);
+let magnitude = Math2d.getLength(v);
+let p: Math2d.Point = v.translate(5, 5);
+p = v.reverse();
+var t = p.x;
+
+
+//// [a.js]
+/// <reference path="node_modules/math2d/index.d.ts" />
+/// <reference path="math2d-augment.d.ts" />
+var v = new exports.Math2d.Vector(3, 2);
+var magnitude = exports.Math2d.getLength(v);
+var p = v.translate(5, 5);
+p = v.reverse();
+var t = p.x;
diff --git a/tests/baselines/reference/umd-augmentation-4.symbols b/tests/baselines/reference/umd-augmentation-4.symbols
new file mode 100644
index 00000000000..3f2cc913d86
--- /dev/null
+++ b/tests/baselines/reference/umd-augmentation-4.symbols
@@ -0,0 +1,102 @@
+=== tests/cases/conformance/externalModules/a.ts ===
+/// <reference path="node_modules/math2d/index.d.ts" />
+/// <reference path="math2d-augment.d.ts" />
+let v = new Math2d.Vector(3, 2);
+>v : Symbol(v, Decl(a.ts, 2, 3))
+>Math2d.Vector : Symbol(Math2d.Vector, Decl(index.d.ts, 9, 2), Decl(math2d-augment.d.ts, 2, 25))
+>Math2d : Symbol(Math2d, Decl(index.d.ts, 0, 0))
+>Vector : Symbol(Math2d.Vector, Decl(index.d.ts, 9, 2), Decl(math2d-augment.d.ts, 2, 25))
+
+let magnitude = Math2d.getLength(v);
+>magnitude : Symbol(magnitude, Decl(a.ts, 3, 3))
+>Math2d.getLength : Symbol(Math2d.getLength, Decl(index.d.ts, 17, 2))
+>Math2d : Symbol(Math2d, Decl(index.d.ts, 0, 0))
+>getLength : Symbol(Math2d.getLength, Decl(index.d.ts, 17, 2))
+>v : Symbol(v, Decl(a.ts, 2, 3))
+
+let p: Math2d.Point = v.translate(5, 5);
+>p : Symbol(p, Decl(a.ts, 4, 3))
+>Math2d : Symbol(Math2d, Decl(index.d.ts, 0, 0))
+>Point : Symbol(Math2d.Point, Decl(index.d.ts, 5, 23))
+>v.translate : Symbol(Math2d.Vector.translate, Decl(index.d.ts, 14, 36))
+>v : Symbol(v, Decl(a.ts, 2, 3))
+>translate : Symbol(Math2d.Vector.translate, Decl(index.d.ts, 14, 36))
+
+p = v.reverse();
+>p : Symbol(p, Decl(a.ts, 4, 3))
+>v.reverse : Symbol(Math2d.Vector.reverse, Decl(math2d-augment.d.ts, 4, 19))
+>v : Symbol(v, Decl(a.ts, 2, 3))
+>reverse : Symbol(Math2d.Vector.reverse, Decl(math2d-augment.d.ts, 4, 19))
+
+var t = p.x;
+>t : Symbol(t, Decl(a.ts, 6, 3))
+>p.x : Symbol(Math2d.Point.x, Decl(index.d.ts, 6, 18))
+>p : Symbol(p, Decl(a.ts, 4, 3))
+>x : Symbol(Math2d.Point.x, Decl(index.d.ts, 6, 18))
+
+=== tests/cases/conformance/externalModules/node_modules/math2d/index.d.ts ===
+
+export as namespace Math2d;
+
+export = M2D;
+>M2D : Symbol(M2D, Decl(index.d.ts, 3, 13))
+
+declare namespace M2D {
+>M2D : Symbol(Math2d, Decl(index.d.ts, 3, 13), Decl(math2d-augment.d.ts, 0, 33))
+
+	interface Point {
+>Point : Symbol(Point, Decl(index.d.ts, 5, 23))
+
+		x: number;
+>x : Symbol(Point.x, Decl(index.d.ts, 6, 18))
+
+		y: number;
+>y : Symbol(Point.y, Decl(index.d.ts, 7, 12))
+	}
+
+	class Vector implements Point {
+>Vector : Symbol(Vector, Decl(index.d.ts, 9, 2), Decl(math2d-augment.d.ts, 2, 25))
+>Point : Symbol(Point, Decl(index.d.ts, 5, 23))
+
+		x: number;
+>x : Symbol(Vector.x, Decl(index.d.ts, 11, 32))
+
+		y: number;
+>y : Symbol(Vector.y, Decl(index.d.ts, 12, 12))
+
+		constructor(x: number, y: number);
+>x : Symbol(x, Decl(index.d.ts, 14, 14))
+>y : Symbol(y, Decl(index.d.ts, 14, 24))
+
+		translate(dx: number, dy: number): Vector;
+>translate : Symbol(Vector.translate, Decl(index.d.ts, 14, 36))
+>dx : Symbol(dx, Decl(index.d.ts, 16, 12))
+>dy : Symbol(dy, Decl(index.d.ts, 16, 23))
+>Vector : Symbol(Vector, Decl(index.d.ts, 9, 2), Decl(math2d-augment.d.ts, 2, 25))
+	}
+
+	function getLength(p: Vector): number;
+>getLength : Symbol(getLength, Decl(index.d.ts, 17, 2))
+>p : Symbol(p, Decl(index.d.ts, 19, 20))
+>Vector : Symbol(Vector, Decl(index.d.ts, 9, 2), Decl(math2d-augment.d.ts, 2, 25))
+
+}
+
+
+=== tests/cases/conformance/externalModules/math2d-augment.d.ts ===
+import * as Math2d from 'math2d';
+>Math2d : Symbol(Math2d, Decl(math2d-augment.d.ts, 0, 6))
+
+// Augment the module
+declare module 'math2d' {
+	// Add a method to the class
+	interface Vector {
+>Vector : Symbol(Vector, Decl(index.d.ts, 9, 2), Decl(math2d-augment.d.ts, 2, 25))
+
+		reverse(): Math2d.Point;
+>reverse : Symbol(Vector.reverse, Decl(math2d-augment.d.ts, 4, 19))
+>Math2d : Symbol(Math2d, Decl(math2d-augment.d.ts, 0, 6))
+>Point : Symbol(Point, Decl(index.d.ts, 5, 23))
+	}
+}
+
diff --git a/tests/baselines/reference/umd-augmentation-4.types b/tests/baselines/reference/umd-augmentation-4.types
new file mode 100644
index 00000000000..71783d03012
--- /dev/null
+++ b/tests/baselines/reference/umd-augmentation-4.types
@@ -0,0 +1,112 @@
+=== tests/cases/conformance/externalModules/a.ts ===
+/// <reference path="node_modules/math2d/index.d.ts" />
+/// <reference path="math2d-augment.d.ts" />
+let v = new Math2d.Vector(3, 2);
+>v : Math2d.Vector
+>new Math2d.Vector(3, 2) : Math2d.Vector
+>Math2d.Vector : typeof Math2d.Vector
+>Math2d : typeof Math2d
+>Vector : typeof Math2d.Vector
+>3 : number
+>2 : number
+
+let magnitude = Math2d.getLength(v);
+>magnitude : number
+>Math2d.getLength(v) : number
+>Math2d.getLength : (p: Math2d.Vector) => number
+>Math2d : typeof Math2d
+>getLength : (p: Math2d.Vector) => number
+>v : Math2d.Vector
+
+let p: Math2d.Point = v.translate(5, 5);
+>p : Math2d.Point
+>Math2d : any
+>Point : Math2d.Point
+>v.translate(5, 5) : Math2d.Vector
+>v.translate : (dx: number, dy: number) => Math2d.Vector
+>v : Math2d.Vector
+>translate : (dx: number, dy: number) => Math2d.Vector
+>5 : number
+>5 : number
+
+p = v.reverse();
+>p = v.reverse() : Math2d.Point
+>p : Math2d.Point
+>v.reverse() : Math2d.Point
+>v.reverse : () => Math2d.Point
+>v : Math2d.Vector
+>reverse : () => Math2d.Point
+
+var t = p.x;
+>t : number
+>p.x : number
+>p : Math2d.Point
+>x : number
+
+=== tests/cases/conformance/externalModules/node_modules/math2d/index.d.ts ===
+
+export as namespace Math2d;
+>Math2d : any
+
+export = M2D;
+>M2D : typeof M2D
+
+declare namespace M2D {
+>M2D : typeof Math2d
+
+	interface Point {
+>Point : Point
+
+		x: number;
+>x : number
+
+		y: number;
+>y : number
+	}
+
+	class Vector implements Point {
+>Vector : Vector
+>Point : Point
+
+		x: number;
+>x : number
+
+		y: number;
+>y : number
+
+		constructor(x: number, y: number);
+>x : number
+>y : number
+
+		translate(dx: number, dy: number): Vector;
+>translate : (dx: number, dy: number) => Vector
+>dx : number
+>dy : number
+>Vector : Vector
+	}
+
+	function getLength(p: Vector): number;
+>getLength : (p: Vector) => number
+>p : Vector
+>Vector : Vector
+
+}
+
+
+=== tests/cases/conformance/externalModules/math2d-augment.d.ts ===
+import * as Math2d from 'math2d';
+>Math2d : typeof Math2d
+
+// Augment the module
+declare module 'math2d' {
+	// Add a method to the class
+	interface Vector {
+>Vector : Vector
+
+		reverse(): Math2d.Point;
+>reverse : () => Point
+>Math2d : any
+>Point : Point
+	}
+}
+
diff --git a/tests/baselines/reference/umd-errors.errors.txt b/tests/baselines/reference/umd-errors.errors.txt
new file mode 100644
index 00000000000..a9575665277
--- /dev/null
+++ b/tests/baselines/reference/umd-errors.errors.txt
@@ -0,0 +1,57 @@
+tests/cases/conformance/externalModules/err1.d.ts(3,1): error TS1314: Global module exports may only appear in module files.
+tests/cases/conformance/externalModules/err2.d.ts(3,2): error TS1316: Global module exports may only appear at top level.
+tests/cases/conformance/externalModules/err3.d.ts(3,1): error TS1184: Modifiers cannot appear here.
+tests/cases/conformance/externalModules/err3.d.ts(4,1): error TS1184: Modifiers cannot appear here.
+tests/cases/conformance/externalModules/err3.d.ts(5,1): error TS1184: Modifiers cannot appear here.
+tests/cases/conformance/externalModules/err3.d.ts(6,7): error TS1134: Variable declaration expected.
+tests/cases/conformance/externalModules/err4.d.ts(3,2): error TS1316: Global module exports may only appear at top level.
+tests/cases/conformance/externalModules/err5.ts(3,1): error TS1315: Global module exports may only appear in declaration files.
+
+
+==== tests/cases/conformance/externalModules/err1.d.ts (1 errors) ====
+    
+    // Illegal, can't be in script file
+    export as namespace Foo;
+    ~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1314: Global module exports may only appear in module files.
+    
+==== tests/cases/conformance/externalModules/err2.d.ts (1 errors) ====
+    // Illegal, can't be in external ambient module
+    declare module "Foo" {
+    	export as namespace Bar;
+    	~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1316: Global module exports may only appear at top level.
+    }
+    
+==== tests/cases/conformance/externalModules/err3.d.ts (4 errors) ====
+    // Illegal, can't have modifiers
+    export var p;
+    static export as namespace oo1;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1184: Modifiers cannot appear here.
+    declare export as namespace oo2;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1184: Modifiers cannot appear here.
+    public export as namespace oo3;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1184: Modifiers cannot appear here.
+    const export as namespace oo4;
+          ~~~~~~
+!!! error TS1134: Variable declaration expected.
+    
+==== tests/cases/conformance/externalModules/err4.d.ts (1 errors) ====
+    // Illegal, must be at top-level
+    export namespace B {
+    	export as namespace C1;
+    	~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1316: Global module exports may only appear at top level.
+    }
+    
+==== tests/cases/conformance/externalModules/err5.ts (1 errors) ====
+    // Illegal, may not appear in implementation files
+    export var v;
+    export as namespace C2;
+    ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1315: Global module exports may only appear in declaration files.
+    
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/umd-errors.js b/tests/baselines/reference/umd-errors.js
new file mode 100644
index 00000000000..7423c81f9ed
--- /dev/null
+++ b/tests/baselines/reference/umd-errors.js
@@ -0,0 +1,36 @@
+//// [tests/cases/conformance/externalModules/umd-errors.ts] ////
+
+//// [err1.d.ts]
+
+// Illegal, can't be in script file
+export as namespace Foo;
+
+//// [err2.d.ts]
+// Illegal, can't be in external ambient module
+declare module "Foo" {
+	export as namespace Bar;
+}
+
+//// [err3.d.ts]
+// Illegal, can't have modifiers
+export var p;
+static export as namespace oo1;
+declare export as namespace oo2;
+public export as namespace oo3;
+const export as namespace oo4;
+
+//// [err4.d.ts]
+// Illegal, must be at top-level
+export namespace B {
+	export as namespace C1;
+}
+
+//// [err5.ts]
+// Illegal, may not appear in implementation files
+export var v;
+export as namespace C2;
+
+
+
+//// [err5.js]
+"use strict";
diff --git a/tests/baselines/reference/umd1.js b/tests/baselines/reference/umd1.js
new file mode 100644
index 00000000000..9b059da4887
--- /dev/null
+++ b/tests/baselines/reference/umd1.js
@@ -0,0 +1,21 @@
+//// [tests/cases/conformance/externalModules/umd1.ts] ////
+
+//// [foo.d.ts]
+
+export var x: number;
+export function fn(): void;
+export interface Thing { n: typeof x }
+export as namespace Foo;
+
+//// [a.ts]
+/// <reference path="foo.d.ts" />
+Foo.fn();
+let x: Foo.Thing;
+let y: number = x.n;
+
+
+//// [a.js]
+/// <reference path="foo.d.ts" />
+exports.Foo.fn();
+var x;
+var y = x.n;
diff --git a/tests/baselines/reference/umd1.symbols b/tests/baselines/reference/umd1.symbols
new file mode 100644
index 00000000000..9b964456bcf
--- /dev/null
+++ b/tests/baselines/reference/umd1.symbols
@@ -0,0 +1,33 @@
+=== tests/cases/conformance/externalModules/a.ts ===
+/// <reference path="foo.d.ts" />
+Foo.fn();
+>Foo.fn : Symbol(Foo.fn, Decl(foo.d.ts, 1, 21))
+>Foo : Symbol(Foo, Decl(foo.d.ts, 3, 38))
+>fn : Symbol(Foo.fn, Decl(foo.d.ts, 1, 21))
+
+let x: Foo.Thing;
+>x : Symbol(x, Decl(a.ts, 2, 3))
+>Foo : Symbol(Foo, Decl(foo.d.ts, 3, 38))
+>Thing : Symbol(Foo.Thing, Decl(foo.d.ts, 2, 27))
+
+let y: number = x.n;
+>y : Symbol(y, Decl(a.ts, 3, 3))
+>x.n : Symbol(Foo.Thing.n, Decl(foo.d.ts, 3, 24))
+>x : Symbol(x, Decl(a.ts, 2, 3))
+>n : Symbol(Foo.Thing.n, Decl(foo.d.ts, 3, 24))
+
+=== tests/cases/conformance/externalModules/foo.d.ts ===
+
+export var x: number;
+>x : Symbol(x, Decl(foo.d.ts, 1, 10))
+
+export function fn(): void;
+>fn : Symbol(fn, Decl(foo.d.ts, 1, 21))
+
+export interface Thing { n: typeof x }
+>Thing : Symbol(Thing, Decl(foo.d.ts, 2, 27))
+>n : Symbol(Thing.n, Decl(foo.d.ts, 3, 24))
+>x : Symbol(x, Decl(foo.d.ts, 1, 10))
+
+export as namespace Foo;
+
diff --git a/tests/baselines/reference/umd1.types b/tests/baselines/reference/umd1.types
new file mode 100644
index 00000000000..1767f3b5a89
--- /dev/null
+++ b/tests/baselines/reference/umd1.types
@@ -0,0 +1,35 @@
+=== tests/cases/conformance/externalModules/a.ts ===
+/// <reference path="foo.d.ts" />
+Foo.fn();
+>Foo.fn() : void
+>Foo.fn : () => void
+>Foo : typeof Foo
+>fn : () => void
+
+let x: Foo.Thing;
+>x : Foo.Thing
+>Foo : any
+>Thing : Foo.Thing
+
+let y: number = x.n;
+>y : number
+>x.n : number
+>x : Foo.Thing
+>n : number
+
+=== tests/cases/conformance/externalModules/foo.d.ts ===
+
+export var x: number;
+>x : number
+
+export function fn(): void;
+>fn : () => void
+
+export interface Thing { n: typeof x }
+>Thing : Thing
+>n : number
+>x : number
+
+export as namespace Foo;
+>Foo : any
+
diff --git a/tests/baselines/reference/umd2.errors.txt b/tests/baselines/reference/umd2.errors.txt
new file mode 100644
index 00000000000..76a4d33f65a
--- /dev/null
+++ b/tests/baselines/reference/umd2.errors.txt
@@ -0,0 +1,19 @@
+tests/cases/conformance/externalModules/a.ts(1,1): error TS2304: Cannot find name 'Foo'.
+tests/cases/conformance/externalModules/a.ts(2,8): error TS2503: Cannot find namespace 'Foo'.
+
+
+==== tests/cases/conformance/externalModules/a.ts (2 errors) ====
+    Foo.fn();
+    ~~~
+!!! error TS2304: Cannot find name 'Foo'.
+    let x: Foo.Thing;
+           ~~~
+!!! error TS2503: Cannot find namespace 'Foo'.
+    let y: number = x.n;
+    
+==== tests/cases/conformance/externalModules/foo.d.ts (0 errors) ====
+    
+    export var x: number;
+    export function fn(): void;
+    export as namespace Foo;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/umd2.js b/tests/baselines/reference/umd2.js
new file mode 100644
index 00000000000..2737856dcfd
--- /dev/null
+++ b/tests/baselines/reference/umd2.js
@@ -0,0 +1,18 @@
+//// [tests/cases/conformance/externalModules/umd2.ts] ////
+
+//// [foo.d.ts]
+
+export var x: number;
+export function fn(): void;
+export as namespace Foo;
+
+//// [a.ts]
+Foo.fn();
+let x: Foo.Thing;
+let y: number = x.n;
+
+
+//// [a.js]
+Foo.fn();
+var x;
+var y = x.n;
diff --git a/tests/baselines/reference/umd3.js b/tests/baselines/reference/umd3.js
new file mode 100644
index 00000000000..03e15be2ecf
--- /dev/null
+++ b/tests/baselines/reference/umd3.js
@@ -0,0 +1,22 @@
+//// [tests/cases/conformance/externalModules/umd3.ts] ////
+
+//// [foo.d.ts]
+
+export var x: number;
+export function fn(): void;
+export interface Thing { n: typeof x }
+export as namespace Foo;
+
+//// [a.ts]
+import * as Foo from './foo';
+Foo.fn();
+let x: Foo.Thing;
+let y: number = x.n;
+
+
+//// [a.js]
+"use strict";
+var Foo = require("./foo");
+Foo.fn();
+var x;
+var y = x.n;
diff --git a/tests/baselines/reference/umd3.symbols b/tests/baselines/reference/umd3.symbols
new file mode 100644
index 00000000000..165fd81597a
--- /dev/null
+++ b/tests/baselines/reference/umd3.symbols
@@ -0,0 +1,35 @@
+=== tests/cases/conformance/externalModules/a.ts ===
+import * as Foo from './foo';
+>Foo : Symbol(Foo, Decl(a.ts, 0, 6))
+
+Foo.fn();
+>Foo.fn : Symbol(Foo.fn, Decl(foo.d.ts, 1, 21))
+>Foo : Symbol(Foo, Decl(a.ts, 0, 6))
+>fn : Symbol(Foo.fn, Decl(foo.d.ts, 1, 21))
+
+let x: Foo.Thing;
+>x : Symbol(x, Decl(a.ts, 2, 3))
+>Foo : Symbol(Foo, Decl(a.ts, 0, 6))
+>Thing : Symbol(Foo.Thing, Decl(foo.d.ts, 2, 27))
+
+let y: number = x.n;
+>y : Symbol(y, Decl(a.ts, 3, 3))
+>x.n : Symbol(Foo.Thing.n, Decl(foo.d.ts, 3, 24))
+>x : Symbol(x, Decl(a.ts, 2, 3))
+>n : Symbol(Foo.Thing.n, Decl(foo.d.ts, 3, 24))
+
+=== tests/cases/conformance/externalModules/foo.d.ts ===
+
+export var x: number;
+>x : Symbol(x, Decl(foo.d.ts, 1, 10))
+
+export function fn(): void;
+>fn : Symbol(fn, Decl(foo.d.ts, 1, 21))
+
+export interface Thing { n: typeof x }
+>Thing : Symbol(Thing, Decl(foo.d.ts, 2, 27))
+>n : Symbol(Thing.n, Decl(foo.d.ts, 3, 24))
+>x : Symbol(x, Decl(foo.d.ts, 1, 10))
+
+export as namespace Foo;
+
diff --git a/tests/baselines/reference/umd3.types b/tests/baselines/reference/umd3.types
new file mode 100644
index 00000000000..85ee6bafe5e
--- /dev/null
+++ b/tests/baselines/reference/umd3.types
@@ -0,0 +1,37 @@
+=== tests/cases/conformance/externalModules/a.ts ===
+import * as Foo from './foo';
+>Foo : typeof Foo
+
+Foo.fn();
+>Foo.fn() : void
+>Foo.fn : () => void
+>Foo : typeof Foo
+>fn : () => void
+
+let x: Foo.Thing;
+>x : Foo.Thing
+>Foo : any
+>Thing : Foo.Thing
+
+let y: number = x.n;
+>y : number
+>x.n : number
+>x : Foo.Thing
+>n : number
+
+=== tests/cases/conformance/externalModules/foo.d.ts ===
+
+export var x: number;
+>x : number
+
+export function fn(): void;
+>fn : () => void
+
+export interface Thing { n: typeof x }
+>Thing : Thing
+>n : number
+>x : number
+
+export as namespace Foo;
+>Foo : any
+
diff --git a/tests/baselines/reference/umd4.js b/tests/baselines/reference/umd4.js
new file mode 100644
index 00000000000..d06fc3aba93
--- /dev/null
+++ b/tests/baselines/reference/umd4.js
@@ -0,0 +1,22 @@
+//// [tests/cases/conformance/externalModules/umd4.ts] ////
+
+//// [foo.d.ts]
+
+export var x: number;
+export function fn(): void;
+export interface Thing { n: typeof x }
+export as namespace Foo;
+
+//// [a.ts]
+import * as Bar from './foo';
+Bar.fn();
+let x: Bar.Thing;
+let y: number = x.n;
+
+
+//// [a.js]
+"use strict";
+var Bar = require("./foo");
+Bar.fn();
+var x;
+var y = x.n;
diff --git a/tests/baselines/reference/umd4.symbols b/tests/baselines/reference/umd4.symbols
new file mode 100644
index 00000000000..8403187198b
--- /dev/null
+++ b/tests/baselines/reference/umd4.symbols
@@ -0,0 +1,35 @@
+=== tests/cases/conformance/externalModules/a.ts ===
+import * as Bar from './foo';
+>Bar : Symbol(Bar, Decl(a.ts, 0, 6))
+
+Bar.fn();
+>Bar.fn : Symbol(Bar.fn, Decl(foo.d.ts, 1, 21))
+>Bar : Symbol(Bar, Decl(a.ts, 0, 6))
+>fn : Symbol(Bar.fn, Decl(foo.d.ts, 1, 21))
+
+let x: Bar.Thing;
+>x : Symbol(x, Decl(a.ts, 2, 3))
+>Bar : Symbol(Bar, Decl(a.ts, 0, 6))
+>Thing : Symbol(Bar.Thing, Decl(foo.d.ts, 2, 27))
+
+let y: number = x.n;
+>y : Symbol(y, Decl(a.ts, 3, 3))
+>x.n : Symbol(Bar.Thing.n, Decl(foo.d.ts, 3, 24))
+>x : Symbol(x, Decl(a.ts, 2, 3))
+>n : Symbol(Bar.Thing.n, Decl(foo.d.ts, 3, 24))
+
+=== tests/cases/conformance/externalModules/foo.d.ts ===
+
+export var x: number;
+>x : Symbol(x, Decl(foo.d.ts, 1, 10))
+
+export function fn(): void;
+>fn : Symbol(fn, Decl(foo.d.ts, 1, 21))
+
+export interface Thing { n: typeof x }
+>Thing : Symbol(Thing, Decl(foo.d.ts, 2, 27))
+>n : Symbol(Thing.n, Decl(foo.d.ts, 3, 24))
+>x : Symbol(x, Decl(foo.d.ts, 1, 10))
+
+export as namespace Foo;
+
diff --git a/tests/baselines/reference/umd4.types b/tests/baselines/reference/umd4.types
new file mode 100644
index 00000000000..579599f5661
--- /dev/null
+++ b/tests/baselines/reference/umd4.types
@@ -0,0 +1,37 @@
+=== tests/cases/conformance/externalModules/a.ts ===
+import * as Bar from './foo';
+>Bar : typeof Bar
+
+Bar.fn();
+>Bar.fn() : void
+>Bar.fn : () => void
+>Bar : typeof Bar
+>fn : () => void
+
+let x: Bar.Thing;
+>x : Bar.Thing
+>Bar : any
+>Thing : Bar.Thing
+
+let y: number = x.n;
+>y : number
+>x.n : number
+>x : Bar.Thing
+>n : number
+
+=== tests/cases/conformance/externalModules/foo.d.ts ===
+
+export var x: number;
+>x : number
+
+export function fn(): void;
+>fn : () => void
+
+export interface Thing { n: typeof x }
+>Thing : Thing
+>n : number
+>x : number
+
+export as namespace Foo;
+>Foo : any
+
diff --git a/tests/baselines/reference/umd5.errors.txt b/tests/baselines/reference/umd5.errors.txt
new file mode 100644
index 00000000000..19529ce195a
--- /dev/null
+++ b/tests/baselines/reference/umd5.errors.txt
@@ -0,0 +1,20 @@
+tests/cases/conformance/externalModules/a.ts(6,9): error TS2304: Cannot find name 'Foo'.
+
+
+==== tests/cases/conformance/externalModules/a.ts (1 errors) ====
+    import * as Bar from './foo';
+    Bar.fn();
+    let x: Bar.Thing;
+    let y: number = x.n;
+    // should error
+    let z = Foo;
+            ~~~
+!!! error TS2304: Cannot find name 'Foo'.
+    
+==== tests/cases/conformance/externalModules/foo.d.ts (0 errors) ====
+    
+    export var x: number;
+    export function fn(): void;
+    export interface Thing { n: typeof x }
+    export as namespace Foo;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/umd5.js b/tests/baselines/reference/umd5.js
new file mode 100644
index 00000000000..95626132f77
--- /dev/null
+++ b/tests/baselines/reference/umd5.js
@@ -0,0 +1,26 @@
+//// [tests/cases/conformance/externalModules/umd5.ts] ////
+
+//// [foo.d.ts]
+
+export var x: number;
+export function fn(): void;
+export interface Thing { n: typeof x }
+export as namespace Foo;
+
+//// [a.ts]
+import * as Bar from './foo';
+Bar.fn();
+let x: Bar.Thing;
+let y: number = x.n;
+// should error
+let z = Foo;
+
+
+//// [a.js]
+"use strict";
+var Bar = require("./foo");
+Bar.fn();
+var x;
+var y = x.n;
+// should error
+var z = Foo;
diff --git a/tests/baselines/reference/umd6.js b/tests/baselines/reference/umd6.js
new file mode 100644
index 00000000000..d4d84fd0384
--- /dev/null
+++ b/tests/baselines/reference/umd6.js
@@ -0,0 +1,18 @@
+//// [tests/cases/conformance/externalModules/umd6.ts] ////
+
+//// [foo.d.ts]
+
+declare namespace Thing {
+	export function fn(): number;
+}
+export = Thing;
+export as namespace Foo;
+
+//// [a.ts]
+/// <reference path="foo.d.ts" />
+let y: number = Foo.fn();
+
+
+//// [a.js]
+/// <reference path="foo.d.ts" />
+var y = exports.Foo.fn();
diff --git a/tests/baselines/reference/umd6.symbols b/tests/baselines/reference/umd6.symbols
new file mode 100644
index 00000000000..d08507f1ea2
--- /dev/null
+++ b/tests/baselines/reference/umd6.symbols
@@ -0,0 +1,21 @@
+=== tests/cases/conformance/externalModules/a.ts ===
+/// <reference path="foo.d.ts" />
+let y: number = Foo.fn();
+>y : Symbol(y, Decl(a.ts, 1, 3))
+>Foo.fn : Symbol(Foo.fn, Decl(foo.d.ts, 1, 25))
+>Foo : Symbol(Foo, Decl(foo.d.ts, 4, 15))
+>fn : Symbol(Foo.fn, Decl(foo.d.ts, 1, 25))
+
+=== tests/cases/conformance/externalModules/foo.d.ts ===
+
+declare namespace Thing {
+>Thing : Symbol(Thing, Decl(foo.d.ts, 0, 0))
+
+	export function fn(): number;
+>fn : Symbol(fn, Decl(foo.d.ts, 1, 25))
+}
+export = Thing;
+>Thing : Symbol(Thing, Decl(foo.d.ts, 0, 0))
+
+export as namespace Foo;
+
diff --git a/tests/baselines/reference/umd6.types b/tests/baselines/reference/umd6.types
new file mode 100644
index 00000000000..7318a43057a
--- /dev/null
+++ b/tests/baselines/reference/umd6.types
@@ -0,0 +1,23 @@
+=== tests/cases/conformance/externalModules/a.ts ===
+/// <reference path="foo.d.ts" />
+let y: number = Foo.fn();
+>y : number
+>Foo.fn() : number
+>Foo.fn : () => number
+>Foo : typeof Foo
+>fn : () => number
+
+=== tests/cases/conformance/externalModules/foo.d.ts ===
+
+declare namespace Thing {
+>Thing : typeof Thing
+
+	export function fn(): number;
+>fn : () => number
+}
+export = Thing;
+>Thing : typeof Thing
+
+export as namespace Foo;
+>Foo : any
+
diff --git a/tests/baselines/reference/umd7.js b/tests/baselines/reference/umd7.js
new file mode 100644
index 00000000000..12d0a8651fc
--- /dev/null
+++ b/tests/baselines/reference/umd7.js
@@ -0,0 +1,16 @@
+//// [tests/cases/conformance/externalModules/umd7.ts] ////
+
+//// [foo.d.ts]
+
+declare function Thing(): number;
+export = Thing;
+export as namespace Foo;
+
+//// [a.ts]
+/// <reference path="foo.d.ts" />
+let y: number = Foo();
+
+
+//// [a.js]
+/// <reference path="foo.d.ts" />
+var y = exports.Foo();
diff --git a/tests/baselines/reference/umd7.symbols b/tests/baselines/reference/umd7.symbols
new file mode 100644
index 00000000000..0b3ef17fb7b
--- /dev/null
+++ b/tests/baselines/reference/umd7.symbols
@@ -0,0 +1,16 @@
+=== tests/cases/conformance/externalModules/a.ts ===
+/// <reference path="foo.d.ts" />
+let y: number = Foo();
+>y : Symbol(y, Decl(a.ts, 1, 3))
+>Foo : Symbol(Foo, Decl(foo.d.ts, 2, 15))
+
+=== tests/cases/conformance/externalModules/foo.d.ts ===
+
+declare function Thing(): number;
+>Thing : Symbol(Thing, Decl(foo.d.ts, 0, 0))
+
+export = Thing;
+>Thing : Symbol(Thing, Decl(foo.d.ts, 0, 0))
+
+export as namespace Foo;
+
diff --git a/tests/baselines/reference/umd7.types b/tests/baselines/reference/umd7.types
new file mode 100644
index 00000000000..60782543710
--- /dev/null
+++ b/tests/baselines/reference/umd7.types
@@ -0,0 +1,18 @@
+=== tests/cases/conformance/externalModules/a.ts ===
+/// <reference path="foo.d.ts" />
+let y: number = Foo();
+>y : number
+>Foo() : number
+>Foo : () => number
+
+=== tests/cases/conformance/externalModules/foo.d.ts ===
+
+declare function Thing(): number;
+>Thing : () => number
+
+export = Thing;
+>Thing : () => number
+
+export as namespace Foo;
+>Foo : any
+
diff --git a/tests/baselines/reference/umd8.js b/tests/baselines/reference/umd8.js
new file mode 100644
index 00000000000..b4c6e0fa76b
--- /dev/null
+++ b/tests/baselines/reference/umd8.js
@@ -0,0 +1,21 @@
+//// [tests/cases/conformance/externalModules/umd8.ts] ////
+
+//// [foo.d.ts]
+
+declare class Thing {
+	foo(): number;
+}
+export = Thing;
+export as namespace Foo;
+
+//// [a.ts]
+/// <reference path="foo.d.ts" />
+let y: Foo;
+y.foo();
+
+
+
+//// [a.js]
+/// <reference path="foo.d.ts" />
+var y;
+y.foo();
diff --git a/tests/baselines/reference/umd8.symbols b/tests/baselines/reference/umd8.symbols
new file mode 100644
index 00000000000..8c38f267a2a
--- /dev/null
+++ b/tests/baselines/reference/umd8.symbols
@@ -0,0 +1,25 @@
+=== tests/cases/conformance/externalModules/a.ts ===
+/// <reference path="foo.d.ts" />
+let y: Foo;
+>y : Symbol(y, Decl(a.ts, 1, 3))
+>Foo : Symbol(Foo, Decl(foo.d.ts, 4, 15))
+
+y.foo();
+>y.foo : Symbol(Foo.foo, Decl(foo.d.ts, 1, 21))
+>y : Symbol(y, Decl(a.ts, 1, 3))
+>foo : Symbol(Foo.foo, Decl(foo.d.ts, 1, 21))
+
+
+=== tests/cases/conformance/externalModules/foo.d.ts ===
+
+declare class Thing {
+>Thing : Symbol(Thing, Decl(foo.d.ts, 0, 0))
+
+	foo(): number;
+>foo : Symbol(Thing.foo, Decl(foo.d.ts, 1, 21))
+}
+export = Thing;
+>Thing : Symbol(Thing, Decl(foo.d.ts, 0, 0))
+
+export as namespace Foo;
+
diff --git a/tests/baselines/reference/umd8.types b/tests/baselines/reference/umd8.types
new file mode 100644
index 00000000000..0e66a49b963
--- /dev/null
+++ b/tests/baselines/reference/umd8.types
@@ -0,0 +1,27 @@
+=== tests/cases/conformance/externalModules/a.ts ===
+/// <reference path="foo.d.ts" />
+let y: Foo;
+>y : Foo
+>Foo : Foo
+
+y.foo();
+>y.foo() : number
+>y.foo : () => number
+>y : Foo
+>foo : () => number
+
+
+=== tests/cases/conformance/externalModules/foo.d.ts ===
+
+declare class Thing {
+>Thing : Thing
+
+	foo(): number;
+>foo : () => number
+}
+export = Thing;
+>Thing : Thing
+
+export as namespace Foo;
+>Foo : any
+
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.errors.txt b/tests/baselines/reference/undeclaredModuleError.errors.txt
index 74e36318595..4a8248bfd6c 100644
--- a/tests/baselines/reference/undeclaredModuleError.errors.txt
+++ b/tests/baselines/reference/undeclaredModuleError.errors.txt
@@ -16,10 +16,9 @@ tests/cases/compiler/undeclaredModuleError.ts(11,41): error TS2304: Cannot find
         fs.readFile(originalFilePath, () => {       
             readdir(covFileDir, () => {
                                 ~~~~~~~
-            } , (error: Error, files: {}[]) => {
-    ~~~~~~~~~
 !!! error TS2345: Argument of type '() => void' is not assignable to parameter of type '(stat: any, name: string) => boolean'.
 !!! error TS2345:   Type 'void' is not assignable to type 'boolean'.
+            } , (error: Error, files: {}[]) => {
                     files.forEach((file) => {
                         var fullPath = join(IDoNotExist);
                                             ~~~~~~~~~~~
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/undefinedAssignableToEveryType.symbols b/tests/baselines/reference/undefinedAssignableToEveryType.symbols
index f511231515e..c48839ea50f 100644
--- a/tests/baselines/reference/undefinedAssignableToEveryType.symbols
+++ b/tests/baselines/reference/undefinedAssignableToEveryType.symbols
@@ -3,7 +3,7 @@ class C {
 >C : Symbol(C, Decl(undefinedAssignableToEveryType.ts, 0, 0))
 
     foo: string;
->foo : Symbol(foo, Decl(undefinedAssignableToEveryType.ts, 0, 9))
+>foo : Symbol(C.foo, Decl(undefinedAssignableToEveryType.ts, 0, 9))
 }
 var ac: C;
 >ac : Symbol(ac, Decl(undefinedAssignableToEveryType.ts, 3, 3))
@@ -13,7 +13,7 @@ interface I {
 >I : Symbol(I, Decl(undefinedAssignableToEveryType.ts, 3, 10))
 
     foo: string;
->foo : Symbol(foo, Decl(undefinedAssignableToEveryType.ts, 4, 13))
+>foo : Symbol(I.foo, Decl(undefinedAssignableToEveryType.ts, 4, 13))
 }
 var ai: I;
 >ai : Symbol(ai, Decl(undefinedAssignableToEveryType.ts, 7, 3))
@@ -41,7 +41,7 @@ var d: boolean = undefined;
 
 var e: Date = undefined;
 >e : Symbol(e, Decl(undefinedAssignableToEveryType.ts, 15, 3))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >undefined : Symbol(undefined)
 
 var f: any = undefined;
@@ -106,12 +106,12 @@ var o: <T>(x: T) => T = undefined;
 
 var p: Number = undefined;
 >p : Symbol(p, Decl(undefinedAssignableToEveryType.ts, 29, 3))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >undefined : Symbol(undefined)
 
 var q: String = undefined;
 >q : Symbol(q, Decl(undefinedAssignableToEveryType.ts, 30, 3))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >undefined : Symbol(undefined)
 
 function foo<T, U, V extends Date>(x: T, y: U, z: V) {
@@ -119,7 +119,7 @@ function foo<T, U, V extends Date>(x: T, y: U, z: V) {
 >T : Symbol(T, Decl(undefinedAssignableToEveryType.ts, 32, 13))
 >U : Symbol(U, Decl(undefinedAssignableToEveryType.ts, 32, 15))
 >V : Symbol(V, Decl(undefinedAssignableToEveryType.ts, 32, 18))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(undefinedAssignableToEveryType.ts, 32, 35))
 >T : Symbol(T, Decl(undefinedAssignableToEveryType.ts, 32, 13))
 >y : Symbol(y, Decl(undefinedAssignableToEveryType.ts, 32, 40))
diff --git a/tests/baselines/reference/undefinedIsSubtypeOfEverything.symbols b/tests/baselines/reference/undefinedIsSubtypeOfEverything.symbols
index de4f6f0da05..f2776039d3a 100644
--- a/tests/baselines/reference/undefinedIsSubtypeOfEverything.symbols
+++ b/tests/baselines/reference/undefinedIsSubtypeOfEverything.symbols
@@ -5,7 +5,7 @@ class Base {
 >Base : Symbol(Base, Decl(undefinedIsSubtypeOfEverything.ts, 0, 0))
 
     foo: typeof undefined;
->foo : Symbol(foo, Decl(undefinedIsSubtypeOfEverything.ts, 2, 12))
+>foo : Symbol(Base.foo, Decl(undefinedIsSubtypeOfEverything.ts, 2, 12))
 >undefined : Symbol(undefined)
 } 
 
@@ -14,7 +14,7 @@ class D0 extends Base {
 >Base : Symbol(Base, Decl(undefinedIsSubtypeOfEverything.ts, 0, 0))
 
     foo: any;
->foo : Symbol(foo, Decl(undefinedIsSubtypeOfEverything.ts, 6, 23))
+>foo : Symbol(D0.foo, Decl(undefinedIsSubtypeOfEverything.ts, 6, 23))
 }
 
 class DA extends Base {
@@ -22,7 +22,7 @@ class DA extends Base {
 >Base : Symbol(Base, Decl(undefinedIsSubtypeOfEverything.ts, 0, 0))
 
     foo: typeof undefined; 
->foo : Symbol(foo, Decl(undefinedIsSubtypeOfEverything.ts, 10, 23))
+>foo : Symbol(DA.foo, Decl(undefinedIsSubtypeOfEverything.ts, 10, 23))
 >undefined : Symbol(undefined)
 }
 
@@ -31,7 +31,7 @@ class D1 extends Base {
 >Base : Symbol(Base, Decl(undefinedIsSubtypeOfEverything.ts, 0, 0))
 
     foo: string;
->foo : Symbol(foo, Decl(undefinedIsSubtypeOfEverything.ts, 14, 23))
+>foo : Symbol(D1.foo, Decl(undefinedIsSubtypeOfEverything.ts, 14, 23))
 }
 
 class D1A extends Base {
@@ -39,8 +39,8 @@ class D1A extends Base {
 >Base : Symbol(Base, Decl(undefinedIsSubtypeOfEverything.ts, 0, 0))
 
     foo: String;
->foo : Symbol(foo, Decl(undefinedIsSubtypeOfEverything.ts, 18, 24))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>foo : Symbol(D1A.foo, Decl(undefinedIsSubtypeOfEverything.ts, 18, 24))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
 
@@ -49,7 +49,7 @@ class D2 extends Base {
 >Base : Symbol(Base, Decl(undefinedIsSubtypeOfEverything.ts, 0, 0))
 
     foo: number;
->foo : Symbol(foo, Decl(undefinedIsSubtypeOfEverything.ts, 23, 23))
+>foo : Symbol(D2.foo, Decl(undefinedIsSubtypeOfEverything.ts, 23, 23))
 }
 
 class D2A extends Base {
@@ -57,8 +57,8 @@ class D2A extends Base {
 >Base : Symbol(Base, Decl(undefinedIsSubtypeOfEverything.ts, 0, 0))
 
     foo: Number;
->foo : Symbol(foo, Decl(undefinedIsSubtypeOfEverything.ts, 27, 24))
->Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>foo : Symbol(D2A.foo, Decl(undefinedIsSubtypeOfEverything.ts, 27, 24))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
 
@@ -67,7 +67,7 @@ class D3 extends Base {
 >Base : Symbol(Base, Decl(undefinedIsSubtypeOfEverything.ts, 0, 0))
 
     foo: boolean;
->foo : Symbol(foo, Decl(undefinedIsSubtypeOfEverything.ts, 32, 23))
+>foo : Symbol(D3.foo, Decl(undefinedIsSubtypeOfEverything.ts, 32, 23))
 }
 
 class D3A extends Base {
@@ -75,7 +75,7 @@ class D3A extends Base {
 >Base : Symbol(Base, Decl(undefinedIsSubtypeOfEverything.ts, 0, 0))
 
     foo: Boolean;
->foo : Symbol(foo, Decl(undefinedIsSubtypeOfEverything.ts, 36, 24))
+>foo : Symbol(D3A.foo, Decl(undefinedIsSubtypeOfEverything.ts, 36, 24))
 >Boolean : Symbol(Boolean, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
@@ -85,7 +85,7 @@ class D4 extends Base {
 >Base : Symbol(Base, Decl(undefinedIsSubtypeOfEverything.ts, 0, 0))
 
     foo: RegExp;
->foo : Symbol(foo, Decl(undefinedIsSubtypeOfEverything.ts, 41, 23))
+>foo : Symbol(D4.foo, Decl(undefinedIsSubtypeOfEverything.ts, 41, 23))
 >RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
@@ -94,8 +94,8 @@ class D5 extends Base {
 >Base : Symbol(Base, Decl(undefinedIsSubtypeOfEverything.ts, 0, 0))
 
     foo: Date;
->foo : Symbol(foo, Decl(undefinedIsSubtypeOfEverything.ts, 45, 23))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>foo : Symbol(D5.foo, Decl(undefinedIsSubtypeOfEverything.ts, 45, 23))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
 
@@ -104,7 +104,7 @@ class D6 extends Base {
 >Base : Symbol(Base, Decl(undefinedIsSubtypeOfEverything.ts, 0, 0))
 
     foo: number[];
->foo : Symbol(foo, Decl(undefinedIsSubtypeOfEverything.ts, 50, 23))
+>foo : Symbol(D6.foo, Decl(undefinedIsSubtypeOfEverything.ts, 50, 23))
 }
 
 class D7 extends Base {
@@ -112,7 +112,7 @@ class D7 extends Base {
 >Base : Symbol(Base, Decl(undefinedIsSubtypeOfEverything.ts, 0, 0))
 
     foo: { bar: number };
->foo : Symbol(foo, Decl(undefinedIsSubtypeOfEverything.ts, 54, 23))
+>foo : Symbol(D7.foo, Decl(undefinedIsSubtypeOfEverything.ts, 54, 23))
 >bar : Symbol(bar, Decl(undefinedIsSubtypeOfEverything.ts, 55, 10))
 }
 
@@ -122,7 +122,7 @@ class D8 extends Base {
 >Base : Symbol(Base, Decl(undefinedIsSubtypeOfEverything.ts, 0, 0))
 
     foo: D7;
->foo : Symbol(foo, Decl(undefinedIsSubtypeOfEverything.ts, 59, 23))
+>foo : Symbol(D8.foo, Decl(undefinedIsSubtypeOfEverything.ts, 59, 23))
 >D7 : Symbol(D7, Decl(undefinedIsSubtypeOfEverything.ts, 52, 1))
 }
 
@@ -130,14 +130,14 @@ interface I1 {
 >I1 : Symbol(I1, Decl(undefinedIsSubtypeOfEverything.ts, 61, 1))
 
     bar: string;
->bar : Symbol(bar, Decl(undefinedIsSubtypeOfEverything.ts, 63, 14))
+>bar : Symbol(I1.bar, Decl(undefinedIsSubtypeOfEverything.ts, 63, 14))
 }
 class D9 extends Base {
 >D9 : Symbol(D9, Decl(undefinedIsSubtypeOfEverything.ts, 65, 1))
 >Base : Symbol(Base, Decl(undefinedIsSubtypeOfEverything.ts, 0, 0))
 
     foo: I1;
->foo : Symbol(foo, Decl(undefinedIsSubtypeOfEverything.ts, 66, 23))
+>foo : Symbol(D9.foo, Decl(undefinedIsSubtypeOfEverything.ts, 66, 23))
 >I1 : Symbol(I1, Decl(undefinedIsSubtypeOfEverything.ts, 61, 1))
 }
 
@@ -147,7 +147,7 @@ class D10 extends Base {
 >Base : Symbol(Base, Decl(undefinedIsSubtypeOfEverything.ts, 0, 0))
 
     foo: () => number;
->foo : Symbol(foo, Decl(undefinedIsSubtypeOfEverything.ts, 71, 24))
+>foo : Symbol(D10.foo, Decl(undefinedIsSubtypeOfEverything.ts, 71, 24))
 }
 
 enum E { A }
@@ -159,7 +159,7 @@ class D11 extends Base {
 >Base : Symbol(Base, Decl(undefinedIsSubtypeOfEverything.ts, 0, 0))
 
     foo: E;
->foo : Symbol(foo, Decl(undefinedIsSubtypeOfEverything.ts, 76, 24))
+>foo : Symbol(D11.foo, Decl(undefinedIsSubtypeOfEverything.ts, 76, 24))
 >E : Symbol(E, Decl(undefinedIsSubtypeOfEverything.ts, 73, 1))
 }
 
@@ -177,14 +177,14 @@ class D12 extends Base {
 >Base : Symbol(Base, Decl(undefinedIsSubtypeOfEverything.ts, 0, 0))
 
     foo: typeof f;
->foo : Symbol(foo, Decl(undefinedIsSubtypeOfEverything.ts, 84, 24))
+>foo : Symbol(D12.foo, Decl(undefinedIsSubtypeOfEverything.ts, 84, 24))
 >f : Symbol(f, Decl(undefinedIsSubtypeOfEverything.ts, 78, 1), Decl(undefinedIsSubtypeOfEverything.ts, 80, 16))
 }
 
 
 class c { baz: string }
 >c : Symbol(c, Decl(undefinedIsSubtypeOfEverything.ts, 86, 1), Decl(undefinedIsSubtypeOfEverything.ts, 89, 23))
->baz : Symbol(baz, Decl(undefinedIsSubtypeOfEverything.ts, 89, 9))
+>baz : Symbol(c.baz, Decl(undefinedIsSubtypeOfEverything.ts, 89, 9))
 
 module c {
 >c : Symbol(c, Decl(undefinedIsSubtypeOfEverything.ts, 86, 1), Decl(undefinedIsSubtypeOfEverything.ts, 89, 23))
@@ -197,7 +197,7 @@ class D13 extends Base {
 >Base : Symbol(Base, Decl(undefinedIsSubtypeOfEverything.ts, 0, 0))
 
     foo: typeof c;
->foo : Symbol(foo, Decl(undefinedIsSubtypeOfEverything.ts, 93, 24))
+>foo : Symbol(D13.foo, Decl(undefinedIsSubtypeOfEverything.ts, 93, 24))
 >c : Symbol(c, Decl(undefinedIsSubtypeOfEverything.ts, 86, 1), Decl(undefinedIsSubtypeOfEverything.ts, 89, 23))
 }
 
@@ -208,7 +208,7 @@ class D14<T> extends Base {
 >Base : Symbol(Base, Decl(undefinedIsSubtypeOfEverything.ts, 0, 0))
 
     foo: T;
->foo : Symbol(foo, Decl(undefinedIsSubtypeOfEverything.ts, 98, 27))
+>foo : Symbol(D14.foo, Decl(undefinedIsSubtypeOfEverything.ts, 98, 27))
 >T : Symbol(T, Decl(undefinedIsSubtypeOfEverything.ts, 98, 10))
 }
 
@@ -220,7 +220,7 @@ class D15<T, U> extends Base {
 >Base : Symbol(Base, Decl(undefinedIsSubtypeOfEverything.ts, 0, 0))
 
     foo: U;
->foo : Symbol(foo, Decl(undefinedIsSubtypeOfEverything.ts, 103, 30))
+>foo : Symbol(D15.foo, Decl(undefinedIsSubtypeOfEverything.ts, 103, 30))
 >U : Symbol(U, Decl(undefinedIsSubtypeOfEverything.ts, 103, 12))
 }
 
@@ -234,7 +234,7 @@ class D16 extends Base {
 >Base : Symbol(Base, Decl(undefinedIsSubtypeOfEverything.ts, 0, 0))
 
     foo: Object;
->foo : Symbol(foo, Decl(undefinedIsSubtypeOfEverything.ts, 112, 24))
+>foo : Symbol(D16.foo, Decl(undefinedIsSubtypeOfEverything.ts, 112, 24))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
@@ -244,6 +244,6 @@ class D17 extends Base {
 >Base : Symbol(Base, Decl(undefinedIsSubtypeOfEverything.ts, 0, 0))
 
     foo: {};
->foo : Symbol(foo, Decl(undefinedIsSubtypeOfEverything.ts, 117, 24))
+>foo : Symbol(D17.foo, Decl(undefinedIsSubtypeOfEverything.ts, 117, 24))
 }
 
diff --git a/tests/baselines/reference/underscoreMapFirst.symbols b/tests/baselines/reference/underscoreMapFirst.symbols
index e926121db57..9b08a7ab4eb 100644
--- a/tests/baselines/reference/underscoreMapFirst.symbols
+++ b/tests/baselines/reference/underscoreMapFirst.symbols
@@ -17,7 +17,7 @@ declare module _ {
 >T : Symbol(T, Decl(underscoreMapFirst.ts, 2, 19))
 
         length: number;
->length : Symbol(length, Decl(underscoreMapFirst.ts, 3, 27))
+>length : Symbol(List.length, Decl(underscoreMapFirst.ts, 3, 27))
     }
 
     interface ListIterator<T, TResult> {
@@ -89,14 +89,14 @@ declare class View {
 >View : Symbol(View, Decl(underscoreMapFirst.ts, 24, 1))
 
     model: any;
->model : Symbol(model, Decl(underscoreMapFirst.ts, 26, 20))
+>model : Symbol(View.model, Decl(underscoreMapFirst.ts, 26, 20))
 }
 
 interface IData {
 >IData : Symbol(IData, Decl(underscoreMapFirst.ts, 28, 1))
 
     series: ISeries[];
->series : Symbol(series, Decl(underscoreMapFirst.ts, 30, 17))
+>series : Symbol(IData.series, Decl(underscoreMapFirst.ts, 30, 17))
 >ISeries : Symbol(ISeries, Decl(underscoreMapFirst.ts, 32, 1))
 }
 
@@ -104,10 +104,10 @@ interface ISeries {
 >ISeries : Symbol(ISeries, Decl(underscoreMapFirst.ts, 32, 1))
 
     items: any[];
->items : Symbol(items, Decl(underscoreMapFirst.ts, 34, 19))
+>items : Symbol(ISeries.items, Decl(underscoreMapFirst.ts, 34, 19))
 
     key: string;
->key : Symbol(key, Decl(underscoreMapFirst.ts, 35, 17))
+>key : Symbol(ISeries.key, Decl(underscoreMapFirst.ts, 35, 17))
 }
 
 class MyView extends View {
@@ -115,7 +115,7 @@ class MyView extends View {
 >View : Symbol(View, Decl(underscoreMapFirst.ts, 24, 1))
 
     public getDataSeries(): ISeries[] {
->getDataSeries : Symbol(getDataSeries, Decl(underscoreMapFirst.ts, 39, 27))
+>getDataSeries : Symbol(MyView.getDataSeries, Decl(underscoreMapFirst.ts, 39, 27))
 >ISeries : Symbol(ISeries, Decl(underscoreMapFirst.ts, 32, 1))
 
         var data: IData[] = this.model.get("data");
diff --git a/tests/baselines/reference/underscoreTest1.symbols b/tests/baselines/reference/underscoreTest1.symbols
index 9de509de417..3506f23510e 100644
--- a/tests/baselines/reference/underscoreTest1.symbols
+++ b/tests/baselines/reference/underscoreTest1.symbols
@@ -71,9 +71,9 @@ var flat = _.reduceRight(list, (a, b) => a.concat(b), []);
 >list : Symbol(list, Decl(underscoreTest1_underscoreTests.ts, 13, 3))
 >a : Symbol(a, Decl(underscoreTest1_underscoreTests.ts, 14, 32))
 >b : Symbol(b, Decl(underscoreTest1_underscoreTests.ts, 14, 34))
->a.concat : Symbol(Array.concat, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>a.concat : Symbol(Array.concat, Decl(lib.d.ts, --, --))
 >a : Symbol(a, Decl(underscoreTest1_underscoreTests.ts, 14, 32))
->concat : Symbol(Array.concat, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>concat : Symbol(Array.concat, Decl(lib.d.ts, --, --))
 >b : Symbol(b, Decl(underscoreTest1_underscoreTests.ts, 14, 34))
 
 var even = _.find([1, 2, 3, 4, 5, 6], (num) => num % 2 == 0);
@@ -437,7 +437,7 @@ var log = _.bind((message?: string, ...rest: string[]) => { }, Date);
 >bind : Symbol(Underscore.Static.bind, Decl(underscoreTest1_underscore.ts, 548, 68), Decl(underscoreTest1_underscore.ts, 550, 58))
 >message : Symbol(message, Decl(underscoreTest1_underscoreTests.ts, 108, 18))
 >rest : Symbol(rest, Decl(underscoreTest1_underscoreTests.ts, 108, 35))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 _.delay(log, 1000, 'logged later');
 >_.delay : Symbol(Underscore.Static.delay, Decl(underscoreTest1_underscore.ts, 557, 73))
@@ -782,7 +782,7 @@ _.isDate(new Date());
 >_.isDate : Symbol(Underscore.Static.isDate, Decl(underscoreTest1_underscore.ts, 611, 40))
 >_ : Symbol(_, Decl(underscoreTest1_underscore.ts, 645, 11))
 >isDate : Symbol(Underscore.Static.isDate, Decl(underscoreTest1_underscore.ts, 611, 40))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 _.isRegExp(/moe/);
 >_.isRegExp : Symbol(Underscore.Static.isRegExp, Decl(underscoreTest1_underscore.ts, 612, 37))
@@ -1063,110 +1063,110 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 31, 35))
 
         keys(): string[];
->keys : Symbol(keys, Decl(underscoreTest1_underscore.ts, 31, 39))
+>keys : Symbol(WrappedObject.keys, Decl(underscoreTest1_underscore.ts, 31, 39))
 
         values(): any[];
->values : Symbol(values, Decl(underscoreTest1_underscore.ts, 32, 25))
+>values : Symbol(WrappedObject.values, Decl(underscoreTest1_underscore.ts, 32, 25))
 
         pairs(): any[][];
->pairs : Symbol(pairs, Decl(underscoreTest1_underscore.ts, 33, 24))
+>pairs : Symbol(WrappedObject.pairs, Decl(underscoreTest1_underscore.ts, 33, 24))
 
         invert(): any;
->invert : Symbol(invert, Decl(underscoreTest1_underscore.ts, 34, 25))
+>invert : Symbol(WrappedObject.invert, Decl(underscoreTest1_underscore.ts, 34, 25))
 
         functions(): string[];
->functions : Symbol(functions, Decl(underscoreTest1_underscore.ts, 35, 22))
+>functions : Symbol(WrappedObject.functions, Decl(underscoreTest1_underscore.ts, 35, 22))
 
         methods(): string[];
->methods : Symbol(methods, Decl(underscoreTest1_underscore.ts, 36, 30))
+>methods : Symbol(WrappedObject.methods, Decl(underscoreTest1_underscore.ts, 36, 30))
 
         extend(...sources: any[]): T;
->extend : Symbol(extend, Decl(underscoreTest1_underscore.ts, 37, 28))
+>extend : Symbol(WrappedObject.extend, Decl(underscoreTest1_underscore.ts, 37, 28))
 >sources : Symbol(sources, Decl(underscoreTest1_underscore.ts, 38, 15))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 31, 35))
 
         pick(...keys: string[]): T;
->pick : Symbol(pick, Decl(underscoreTest1_underscore.ts, 38, 37))
+>pick : Symbol(WrappedObject.pick, Decl(underscoreTest1_underscore.ts, 38, 37))
 >keys : Symbol(keys, Decl(underscoreTest1_underscore.ts, 39, 13))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 31, 35))
 
         omit(...keys: string[]): T;
->omit : Symbol(omit, Decl(underscoreTest1_underscore.ts, 39, 35))
+>omit : Symbol(WrappedObject.omit, Decl(underscoreTest1_underscore.ts, 39, 35))
 >keys : Symbol(keys, Decl(underscoreTest1_underscore.ts, 40, 13))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 31, 35))
 
         defaults(...defaults: any[]): T;
->defaults : Symbol(defaults, Decl(underscoreTest1_underscore.ts, 40, 35))
+>defaults : Symbol(WrappedObject.defaults, Decl(underscoreTest1_underscore.ts, 40, 35))
 >defaults : Symbol(defaults, Decl(underscoreTest1_underscore.ts, 41, 17))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 31, 35))
 
         clone(): T;
->clone : Symbol(clone, Decl(underscoreTest1_underscore.ts, 41, 40))
+>clone : Symbol(WrappedObject.clone, Decl(underscoreTest1_underscore.ts, 41, 40))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 31, 35))
 
         tap(interceptor: (object: T) => void): T;
->tap : Symbol(tap, Decl(underscoreTest1_underscore.ts, 42, 19))
+>tap : Symbol(WrappedObject.tap, Decl(underscoreTest1_underscore.ts, 42, 19))
 >interceptor : Symbol(interceptor, Decl(underscoreTest1_underscore.ts, 43, 12))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 43, 26))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 31, 35))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 31, 35))
 
         has(key: string): boolean;
->has : Symbol(has, Decl(underscoreTest1_underscore.ts, 43, 49))
+>has : Symbol(WrappedObject.has, Decl(underscoreTest1_underscore.ts, 43, 49))
 >key : Symbol(key, Decl(underscoreTest1_underscore.ts, 44, 12))
 
         isEqual(other: T): boolean;
->isEqual : Symbol(isEqual, Decl(underscoreTest1_underscore.ts, 44, 34))
+>isEqual : Symbol(WrappedObject.isEqual, Decl(underscoreTest1_underscore.ts, 44, 34))
 >other : Symbol(other, Decl(underscoreTest1_underscore.ts, 45, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 31, 35))
 
         isEmpty(): boolean;
->isEmpty : Symbol(isEmpty, Decl(underscoreTest1_underscore.ts, 45, 35))
+>isEmpty : Symbol(WrappedObject.isEmpty, Decl(underscoreTest1_underscore.ts, 45, 35))
 
         isElement(): boolean;
->isElement : Symbol(isElement, Decl(underscoreTest1_underscore.ts, 46, 27))
+>isElement : Symbol(WrappedObject.isElement, Decl(underscoreTest1_underscore.ts, 46, 27))
 
         isArray(): boolean;
->isArray : Symbol(isArray, Decl(underscoreTest1_underscore.ts, 47, 29))
+>isArray : Symbol(WrappedObject.isArray, Decl(underscoreTest1_underscore.ts, 47, 29))
 
         isObject(): boolean;
->isObject : Symbol(isObject, Decl(underscoreTest1_underscore.ts, 48, 27))
+>isObject : Symbol(WrappedObject.isObject, Decl(underscoreTest1_underscore.ts, 48, 27))
 
         isArguments(): boolean;
->isArguments : Symbol(isArguments, Decl(underscoreTest1_underscore.ts, 49, 28))
+>isArguments : Symbol(WrappedObject.isArguments, Decl(underscoreTest1_underscore.ts, 49, 28))
 
         isFunction(): boolean;
->isFunction : Symbol(isFunction, Decl(underscoreTest1_underscore.ts, 50, 31))
+>isFunction : Symbol(WrappedObject.isFunction, Decl(underscoreTest1_underscore.ts, 50, 31))
 
         isString(): boolean;
->isString : Symbol(isString, Decl(underscoreTest1_underscore.ts, 51, 30))
+>isString : Symbol(WrappedObject.isString, Decl(underscoreTest1_underscore.ts, 51, 30))
 
         isNumber(): boolean;
->isNumber : Symbol(isNumber, Decl(underscoreTest1_underscore.ts, 52, 28))
+>isNumber : Symbol(WrappedObject.isNumber, Decl(underscoreTest1_underscore.ts, 52, 28))
 
         isFinite(): boolean;
->isFinite : Symbol(isFinite, Decl(underscoreTest1_underscore.ts, 53, 28))
+>isFinite : Symbol(WrappedObject.isFinite, Decl(underscoreTest1_underscore.ts, 53, 28))
 
         isBoolean(): boolean;
->isBoolean : Symbol(isBoolean, Decl(underscoreTest1_underscore.ts, 54, 28))
+>isBoolean : Symbol(WrappedObject.isBoolean, Decl(underscoreTest1_underscore.ts, 54, 28))
 
         isDate(): boolean;
->isDate : Symbol(isDate, Decl(underscoreTest1_underscore.ts, 55, 29))
+>isDate : Symbol(WrappedObject.isDate, Decl(underscoreTest1_underscore.ts, 55, 29))
 
         isRegExp(): boolean;
->isRegExp : Symbol(isRegExp, Decl(underscoreTest1_underscore.ts, 56, 26))
+>isRegExp : Symbol(WrappedObject.isRegExp, Decl(underscoreTest1_underscore.ts, 56, 26))
 
         isNaN(): boolean;
->isNaN : Symbol(isNaN, Decl(underscoreTest1_underscore.ts, 57, 28))
+>isNaN : Symbol(WrappedObject.isNaN, Decl(underscoreTest1_underscore.ts, 57, 28))
 
         isNull(): boolean;
->isNull : Symbol(isNull, Decl(underscoreTest1_underscore.ts, 58, 25))
+>isNull : Symbol(WrappedObject.isNull, Decl(underscoreTest1_underscore.ts, 58, 25))
 
         isUndefined(): boolean;
->isUndefined : Symbol(isUndefined, Decl(underscoreTest1_underscore.ts, 59, 26))
+>isUndefined : Symbol(WrappedObject.isUndefined, Decl(underscoreTest1_underscore.ts, 59, 26))
 
         value(): T;
->value : Symbol(value, Decl(underscoreTest1_underscore.ts, 60, 31))
+>value : Symbol(WrappedObject.value, Decl(underscoreTest1_underscore.ts, 60, 31))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 31, 35))
     }
 
@@ -1178,58 +1178,58 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 64, 37))
 
         bind(object: any): T;
->bind : Symbol(bind, Decl(underscoreTest1_underscore.ts, 64, 83), Decl(underscoreTest1_underscore.ts, 65, 29))
+>bind : Symbol(WrappedFunction.bind, Decl(underscoreTest1_underscore.ts, 64, 83), Decl(underscoreTest1_underscore.ts, 65, 29))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 65, 13))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 64, 37))
 
         bind(object: any, ...args: any[]): Function;
->bind : Symbol(bind, Decl(underscoreTest1_underscore.ts, 64, 83), Decl(underscoreTest1_underscore.ts, 65, 29))
+>bind : Symbol(WrappedFunction.bind, Decl(underscoreTest1_underscore.ts, 64, 83), Decl(underscoreTest1_underscore.ts, 65, 29))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 66, 13))
 >args : Symbol(args, Decl(underscoreTest1_underscore.ts, 66, 25))
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
         bindAll(...methodNames: string[]): T;
->bindAll : Symbol(bindAll, Decl(underscoreTest1_underscore.ts, 66, 52))
+>bindAll : Symbol(WrappedFunction.bindAll, Decl(underscoreTest1_underscore.ts, 66, 52))
 >methodNames : Symbol(methodNames, Decl(underscoreTest1_underscore.ts, 67, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 64, 37))
 
         partial(...args: any[]): Function;
->partial : Symbol(partial, Decl(underscoreTest1_underscore.ts, 67, 45))
+>partial : Symbol(WrappedFunction.partial, Decl(underscoreTest1_underscore.ts, 67, 45))
 >args : Symbol(args, Decl(underscoreTest1_underscore.ts, 68, 16))
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
         memoize(hashFunction?: Function): T;
->memoize : Symbol(memoize, Decl(underscoreTest1_underscore.ts, 68, 42))
+>memoize : Symbol(WrappedFunction.memoize, Decl(underscoreTest1_underscore.ts, 68, 42))
 >hashFunction : Symbol(hashFunction, Decl(underscoreTest1_underscore.ts, 69, 16))
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 64, 37))
 
         delay(wait: number, ...args: any[]): number;
->delay : Symbol(delay, Decl(underscoreTest1_underscore.ts, 69, 44))
+>delay : Symbol(WrappedFunction.delay, Decl(underscoreTest1_underscore.ts, 69, 44))
 >wait : Symbol(wait, Decl(underscoreTest1_underscore.ts, 70, 14))
 >args : Symbol(args, Decl(underscoreTest1_underscore.ts, 70, 27))
 
         defer(...args: any[]): number;
->defer : Symbol(defer, Decl(underscoreTest1_underscore.ts, 70, 52))
+>defer : Symbol(WrappedFunction.defer, Decl(underscoreTest1_underscore.ts, 70, 52))
 >args : Symbol(args, Decl(underscoreTest1_underscore.ts, 71, 14))
 
         throttle(wait: number): T;
->throttle : Symbol(throttle, Decl(underscoreTest1_underscore.ts, 71, 38))
+>throttle : Symbol(WrappedFunction.throttle, Decl(underscoreTest1_underscore.ts, 71, 38))
 >wait : Symbol(wait, Decl(underscoreTest1_underscore.ts, 72, 17))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 64, 37))
 
         debounce(wait: number, immediate?: boolean): T;
->debounce : Symbol(debounce, Decl(underscoreTest1_underscore.ts, 72, 34))
+>debounce : Symbol(WrappedFunction.debounce, Decl(underscoreTest1_underscore.ts, 72, 34))
 >wait : Symbol(wait, Decl(underscoreTest1_underscore.ts, 73, 17))
 >immediate : Symbol(immediate, Decl(underscoreTest1_underscore.ts, 73, 30))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 64, 37))
 
         once(): T;
->once : Symbol(once, Decl(underscoreTest1_underscore.ts, 73, 55))
+>once : Symbol(WrappedFunction.once, Decl(underscoreTest1_underscore.ts, 73, 55))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 64, 37))
 
         wrap(wrapper: (func: T, ...args: any[]) => any): T;
->wrap : Symbol(wrap, Decl(underscoreTest1_underscore.ts, 74, 18))
+>wrap : Symbol(WrappedFunction.wrap, Decl(underscoreTest1_underscore.ts, 74, 18))
 >wrapper : Symbol(wrapper, Decl(underscoreTest1_underscore.ts, 75, 13))
 >func : Symbol(func, Decl(underscoreTest1_underscore.ts, 75, 23))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 64, 37))
@@ -1237,7 +1237,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 64, 37))
 
         compose(...funcs: Function[]): Function;
->compose : Symbol(compose, Decl(underscoreTest1_underscore.ts, 75, 59))
+>compose : Symbol(WrappedFunction.compose, Decl(underscoreTest1_underscore.ts, 75, 59))
 >funcs : Symbol(funcs, Decl(underscoreTest1_underscore.ts, 76, 16))
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
@@ -1251,21 +1251,21 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         each(iterator: Iterator<T, void>, context?: any): void;
->each : Symbol(each, Decl(underscoreTest1_underscore.ts, 79, 70))
+>each : Symbol(WrappedArray.each, Decl(underscoreTest1_underscore.ts, 79, 70))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 80, 13))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 >context : Symbol(context, Decl(underscoreTest1_underscore.ts, 80, 41))
 
         forEach(iterator: Iterator<T, void>, context?: any): void;
->forEach : Symbol(forEach, Decl(underscoreTest1_underscore.ts, 80, 63))
+>forEach : Symbol(WrappedArray.forEach, Decl(underscoreTest1_underscore.ts, 80, 63))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 81, 16))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 >context : Symbol(context, Decl(underscoreTest1_underscore.ts, 81, 44))
 
         map<U>(iterator: Iterator<T, U>, context?: any): U[];
->map : Symbol(map, Decl(underscoreTest1_underscore.ts, 81, 66))
+>map : Symbol(WrappedArray.map, Decl(underscoreTest1_underscore.ts, 81, 66))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 82, 12))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 82, 15))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
@@ -1275,7 +1275,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 82, 12))
 
         collect<U>(iterator: Iterator<T, U>, context?: any): U[];
->collect : Symbol(collect, Decl(underscoreTest1_underscore.ts, 82, 61))
+>collect : Symbol(WrappedArray.collect, Decl(underscoreTest1_underscore.ts, 82, 61))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 83, 16))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 83, 19))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
@@ -1285,7 +1285,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 83, 16))
 
         reduce(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
->reduce : Symbol(reduce, Decl(underscoreTest1_underscore.ts, 83, 65), Decl(underscoreTest1_underscore.ts, 84, 76))
+>reduce : Symbol(WrappedArray.reduce, Decl(underscoreTest1_underscore.ts, 83, 65), Decl(underscoreTest1_underscore.ts, 84, 76))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 84, 15))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
@@ -1296,7 +1296,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         reduce<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->reduce : Symbol(reduce, Decl(underscoreTest1_underscore.ts, 83, 65), Decl(underscoreTest1_underscore.ts, 84, 76))
+>reduce : Symbol(WrappedArray.reduce, Decl(underscoreTest1_underscore.ts, 83, 65), Decl(underscoreTest1_underscore.ts, 84, 76))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 85, 15))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 85, 18))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
@@ -1308,7 +1308,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 85, 15))
 
         foldl(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
->foldl : Symbol(foldl, Decl(underscoreTest1_underscore.ts, 85, 78), Decl(underscoreTest1_underscore.ts, 86, 75))
+>foldl : Symbol(WrappedArray.foldl, Decl(underscoreTest1_underscore.ts, 85, 78), Decl(underscoreTest1_underscore.ts, 86, 75))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 86, 14))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
@@ -1319,7 +1319,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         foldl<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->foldl : Symbol(foldl, Decl(underscoreTest1_underscore.ts, 85, 78), Decl(underscoreTest1_underscore.ts, 86, 75))
+>foldl : Symbol(WrappedArray.foldl, Decl(underscoreTest1_underscore.ts, 85, 78), Decl(underscoreTest1_underscore.ts, 86, 75))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 87, 14))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 87, 17))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
@@ -1331,7 +1331,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 87, 14))
 
         inject(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
->inject : Symbol(inject, Decl(underscoreTest1_underscore.ts, 87, 77), Decl(underscoreTest1_underscore.ts, 88, 76))
+>inject : Symbol(WrappedArray.inject, Decl(underscoreTest1_underscore.ts, 87, 77), Decl(underscoreTest1_underscore.ts, 88, 76))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 88, 15))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
@@ -1342,7 +1342,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         inject<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->inject : Symbol(inject, Decl(underscoreTest1_underscore.ts, 87, 77), Decl(underscoreTest1_underscore.ts, 88, 76))
+>inject : Symbol(WrappedArray.inject, Decl(underscoreTest1_underscore.ts, 87, 77), Decl(underscoreTest1_underscore.ts, 88, 76))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 89, 15))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 89, 18))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
@@ -1354,7 +1354,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 89, 15))
 
         reduceRight(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
->reduceRight : Symbol(reduceRight, Decl(underscoreTest1_underscore.ts, 89, 78), Decl(underscoreTest1_underscore.ts, 90, 81))
+>reduceRight : Symbol(WrappedArray.reduceRight, Decl(underscoreTest1_underscore.ts, 89, 78), Decl(underscoreTest1_underscore.ts, 90, 81))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 90, 20))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
@@ -1365,7 +1365,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         reduceRight<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->reduceRight : Symbol(reduceRight, Decl(underscoreTest1_underscore.ts, 89, 78), Decl(underscoreTest1_underscore.ts, 90, 81))
+>reduceRight : Symbol(WrappedArray.reduceRight, Decl(underscoreTest1_underscore.ts, 89, 78), Decl(underscoreTest1_underscore.ts, 90, 81))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 91, 20))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 91, 23))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
@@ -1377,7 +1377,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 91, 20))
 
         foldr(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
->foldr : Symbol(foldr, Decl(underscoreTest1_underscore.ts, 91, 83), Decl(underscoreTest1_underscore.ts, 92, 75))
+>foldr : Symbol(WrappedArray.foldr, Decl(underscoreTest1_underscore.ts, 91, 83), Decl(underscoreTest1_underscore.ts, 92, 75))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 92, 14))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
@@ -1388,7 +1388,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         foldr<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->foldr : Symbol(foldr, Decl(underscoreTest1_underscore.ts, 91, 83), Decl(underscoreTest1_underscore.ts, 92, 75))
+>foldr : Symbol(WrappedArray.foldr, Decl(underscoreTest1_underscore.ts, 91, 83), Decl(underscoreTest1_underscore.ts, 92, 75))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 93, 14))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 93, 17))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
@@ -1400,7 +1400,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 93, 14))
 
         find(iterator: Iterator<T, boolean>, context?: any): T;
->find : Symbol(find, Decl(underscoreTest1_underscore.ts, 93, 77))
+>find : Symbol(WrappedArray.find, Decl(underscoreTest1_underscore.ts, 93, 77))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 94, 13))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
@@ -1408,7 +1408,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         detect(iterator: Iterator<T, boolean>, context?: any): T;
->detect : Symbol(detect, Decl(underscoreTest1_underscore.ts, 94, 63))
+>detect : Symbol(WrappedArray.detect, Decl(underscoreTest1_underscore.ts, 94, 63))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 95, 15))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
@@ -1416,7 +1416,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         filter(iterator: Iterator<T, boolean>, context?: any): T[];
->filter : Symbol(filter, Decl(underscoreTest1_underscore.ts, 95, 65))
+>filter : Symbol(WrappedArray.filter, Decl(underscoreTest1_underscore.ts, 95, 65))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 96, 15))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
@@ -1424,7 +1424,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         select(iterator: Iterator<T, boolean>, context?: any): T[];
->select : Symbol(select, Decl(underscoreTest1_underscore.ts, 96, 67))
+>select : Symbol(WrappedArray.select, Decl(underscoreTest1_underscore.ts, 96, 67))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 97, 15))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
@@ -1432,19 +1432,19 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         where(properties: Object): T[];
->where : Symbol(where, Decl(underscoreTest1_underscore.ts, 97, 67))
+>where : Symbol(WrappedArray.where, Decl(underscoreTest1_underscore.ts, 97, 67))
 >properties : Symbol(properties, Decl(underscoreTest1_underscore.ts, 98, 14))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         findWhere(properties: Object): T;
->findWhere : Symbol(findWhere, Decl(underscoreTest1_underscore.ts, 98, 39))
+>findWhere : Symbol(WrappedArray.findWhere, Decl(underscoreTest1_underscore.ts, 98, 39))
 >properties : Symbol(properties, Decl(underscoreTest1_underscore.ts, 99, 18))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         reject(iterator: Iterator<T, boolean>, context?: any): T[];
->reject : Symbol(reject, Decl(underscoreTest1_underscore.ts, 99, 41))
+>reject : Symbol(WrappedArray.reject, Decl(underscoreTest1_underscore.ts, 99, 41))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 100, 15))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
@@ -1452,54 +1452,54 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         every(iterator?: Iterator<T, boolean>, context?: any): boolean;
->every : Symbol(every, Decl(underscoreTest1_underscore.ts, 100, 67))
+>every : Symbol(WrappedArray.every, Decl(underscoreTest1_underscore.ts, 100, 67))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 101, 14))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 >context : Symbol(context, Decl(underscoreTest1_underscore.ts, 101, 46))
 
         all(iterator?: Iterator<T, boolean>, context?: any): boolean;
->all : Symbol(all, Decl(underscoreTest1_underscore.ts, 101, 71))
+>all : Symbol(WrappedArray.all, Decl(underscoreTest1_underscore.ts, 101, 71))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 102, 12))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 >context : Symbol(context, Decl(underscoreTest1_underscore.ts, 102, 44))
 
         some(iterator?: Iterator<T, boolean>, context?: any): boolean;
->some : Symbol(some, Decl(underscoreTest1_underscore.ts, 102, 69))
+>some : Symbol(WrappedArray.some, Decl(underscoreTest1_underscore.ts, 102, 69))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 103, 13))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 >context : Symbol(context, Decl(underscoreTest1_underscore.ts, 103, 45))
 
         any(iterator?: Iterator<T, boolean>, context?: any): boolean;
->any : Symbol(any, Decl(underscoreTest1_underscore.ts, 103, 70))
+>any : Symbol(WrappedArray.any, Decl(underscoreTest1_underscore.ts, 103, 70))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 104, 12))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 >context : Symbol(context, Decl(underscoreTest1_underscore.ts, 104, 44))
 
         contains(value: T): boolean;
->contains : Symbol(contains, Decl(underscoreTest1_underscore.ts, 104, 69))
+>contains : Symbol(WrappedArray.contains, Decl(underscoreTest1_underscore.ts, 104, 69))
 >value : Symbol(value, Decl(underscoreTest1_underscore.ts, 105, 17))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         include(value: T): boolean;
->include : Symbol(include, Decl(underscoreTest1_underscore.ts, 105, 36))
+>include : Symbol(WrappedArray.include, Decl(underscoreTest1_underscore.ts, 105, 36))
 >value : Symbol(value, Decl(underscoreTest1_underscore.ts, 106, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         invoke(methodName: string, ...args: any[]): any[];
->invoke : Symbol(invoke, Decl(underscoreTest1_underscore.ts, 106, 35))
+>invoke : Symbol(WrappedArray.invoke, Decl(underscoreTest1_underscore.ts, 106, 35))
 >methodName : Symbol(methodName, Decl(underscoreTest1_underscore.ts, 107, 15))
 >args : Symbol(args, Decl(underscoreTest1_underscore.ts, 107, 34))
 
         pluck(propertyName: string): any[];
->pluck : Symbol(pluck, Decl(underscoreTest1_underscore.ts, 107, 58))
+>pluck : Symbol(WrappedArray.pluck, Decl(underscoreTest1_underscore.ts, 107, 58))
 >propertyName : Symbol(propertyName, Decl(underscoreTest1_underscore.ts, 108, 14))
 
         max(iterator?: Iterator<T, any>, context?: any): T;
->max : Symbol(max, Decl(underscoreTest1_underscore.ts, 108, 43))
+>max : Symbol(WrappedArray.max, Decl(underscoreTest1_underscore.ts, 108, 43))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 109, 12))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
@@ -1507,7 +1507,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         min(iterator?: Iterator<T, any>, context?: any): T;
->min : Symbol(min, Decl(underscoreTest1_underscore.ts, 109, 59))
+>min : Symbol(WrappedArray.min, Decl(underscoreTest1_underscore.ts, 109, 59))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 110, 12))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
@@ -1515,7 +1515,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         sortBy(iterator: Iterator<T, any>, context?: any): T[];
->sortBy : Symbol(sortBy, Decl(underscoreTest1_underscore.ts, 110, 59), Decl(underscoreTest1_underscore.ts, 111, 63))
+>sortBy : Symbol(WrappedArray.sortBy, Decl(underscoreTest1_underscore.ts, 110, 59), Decl(underscoreTest1_underscore.ts, 111, 63))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 111, 15))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
@@ -1523,12 +1523,12 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         sortBy(propertyName: string): T[];
->sortBy : Symbol(sortBy, Decl(underscoreTest1_underscore.ts, 110, 59), Decl(underscoreTest1_underscore.ts, 111, 63))
+>sortBy : Symbol(WrappedArray.sortBy, Decl(underscoreTest1_underscore.ts, 110, 59), Decl(underscoreTest1_underscore.ts, 111, 63))
 >propertyName : Symbol(propertyName, Decl(underscoreTest1_underscore.ts, 112, 15))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         groupBy(iterator?: Iterator<T, any>, context?: any): Dictionary<T[]>;
->groupBy : Symbol(groupBy, Decl(underscoreTest1_underscore.ts, 112, 42), Decl(underscoreTest1_underscore.ts, 113, 77))
+>groupBy : Symbol(WrappedArray.groupBy, Decl(underscoreTest1_underscore.ts, 112, 42), Decl(underscoreTest1_underscore.ts, 113, 77))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 113, 16))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
@@ -1537,13 +1537,13 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         groupBy(propertyName: string): Dictionary<T[]>;
->groupBy : Symbol(groupBy, Decl(underscoreTest1_underscore.ts, 112, 42), Decl(underscoreTest1_underscore.ts, 113, 77))
+>groupBy : Symbol(WrappedArray.groupBy, Decl(underscoreTest1_underscore.ts, 112, 42), Decl(underscoreTest1_underscore.ts, 113, 77))
 >propertyName : Symbol(propertyName, Decl(underscoreTest1_underscore.ts, 114, 16))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         countBy(iterator?: Iterator<T, any>, context?: any): Dictionary<number>;
->countBy : Symbol(countBy, Decl(underscoreTest1_underscore.ts, 114, 55), Decl(underscoreTest1_underscore.ts, 115, 80))
+>countBy : Symbol(WrappedArray.countBy, Decl(underscoreTest1_underscore.ts, 114, 55), Decl(underscoreTest1_underscore.ts, 115, 80))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 115, 16))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
@@ -1551,112 +1551,112 @@ module Underscore {
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
 
         countBy(propertyName: string): Dictionary<number>;
->countBy : Symbol(countBy, Decl(underscoreTest1_underscore.ts, 114, 55), Decl(underscoreTest1_underscore.ts, 115, 80))
+>countBy : Symbol(WrappedArray.countBy, Decl(underscoreTest1_underscore.ts, 114, 55), Decl(underscoreTest1_underscore.ts, 115, 80))
 >propertyName : Symbol(propertyName, Decl(underscoreTest1_underscore.ts, 116, 16))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
 
         shuffle(): T[];
->shuffle : Symbol(shuffle, Decl(underscoreTest1_underscore.ts, 116, 58))
+>shuffle : Symbol(WrappedArray.shuffle, Decl(underscoreTest1_underscore.ts, 116, 58))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         toArray(): T[];
->toArray : Symbol(toArray, Decl(underscoreTest1_underscore.ts, 117, 23))
+>toArray : Symbol(WrappedArray.toArray, Decl(underscoreTest1_underscore.ts, 117, 23))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         size(): number;
->size : Symbol(size, Decl(underscoreTest1_underscore.ts, 118, 23))
+>size : Symbol(WrappedArray.size, Decl(underscoreTest1_underscore.ts, 118, 23))
 
         first(): T;
->first : Symbol(first, Decl(underscoreTest1_underscore.ts, 119, 23), Decl(underscoreTest1_underscore.ts, 120, 19))
+>first : Symbol(WrappedArray.first, Decl(underscoreTest1_underscore.ts, 119, 23), Decl(underscoreTest1_underscore.ts, 120, 19))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         first(count: number): T[];
->first : Symbol(first, Decl(underscoreTest1_underscore.ts, 119, 23), Decl(underscoreTest1_underscore.ts, 120, 19))
+>first : Symbol(WrappedArray.first, Decl(underscoreTest1_underscore.ts, 119, 23), Decl(underscoreTest1_underscore.ts, 120, 19))
 >count : Symbol(count, Decl(underscoreTest1_underscore.ts, 121, 14))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         head(): T;
->head : Symbol(head, Decl(underscoreTest1_underscore.ts, 121, 34), Decl(underscoreTest1_underscore.ts, 122, 18))
+>head : Symbol(WrappedArray.head, Decl(underscoreTest1_underscore.ts, 121, 34), Decl(underscoreTest1_underscore.ts, 122, 18))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         head(count: number): T[];
->head : Symbol(head, Decl(underscoreTest1_underscore.ts, 121, 34), Decl(underscoreTest1_underscore.ts, 122, 18))
+>head : Symbol(WrappedArray.head, Decl(underscoreTest1_underscore.ts, 121, 34), Decl(underscoreTest1_underscore.ts, 122, 18))
 >count : Symbol(count, Decl(underscoreTest1_underscore.ts, 123, 13))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         take(): T;
->take : Symbol(take, Decl(underscoreTest1_underscore.ts, 123, 33), Decl(underscoreTest1_underscore.ts, 124, 18))
+>take : Symbol(WrappedArray.take, Decl(underscoreTest1_underscore.ts, 123, 33), Decl(underscoreTest1_underscore.ts, 124, 18))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         take(count: number): T[];
->take : Symbol(take, Decl(underscoreTest1_underscore.ts, 123, 33), Decl(underscoreTest1_underscore.ts, 124, 18))
+>take : Symbol(WrappedArray.take, Decl(underscoreTest1_underscore.ts, 123, 33), Decl(underscoreTest1_underscore.ts, 124, 18))
 >count : Symbol(count, Decl(underscoreTest1_underscore.ts, 125, 13))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         initial(): T;
->initial : Symbol(initial, Decl(underscoreTest1_underscore.ts, 125, 33), Decl(underscoreTest1_underscore.ts, 126, 21))
+>initial : Symbol(WrappedArray.initial, Decl(underscoreTest1_underscore.ts, 125, 33), Decl(underscoreTest1_underscore.ts, 126, 21))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         initial(count: number): T[];
->initial : Symbol(initial, Decl(underscoreTest1_underscore.ts, 125, 33), Decl(underscoreTest1_underscore.ts, 126, 21))
+>initial : Symbol(WrappedArray.initial, Decl(underscoreTest1_underscore.ts, 125, 33), Decl(underscoreTest1_underscore.ts, 126, 21))
 >count : Symbol(count, Decl(underscoreTest1_underscore.ts, 127, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         last(): T;
->last : Symbol(last, Decl(underscoreTest1_underscore.ts, 127, 36), Decl(underscoreTest1_underscore.ts, 128, 18))
+>last : Symbol(WrappedArray.last, Decl(underscoreTest1_underscore.ts, 127, 36), Decl(underscoreTest1_underscore.ts, 128, 18))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         last(count: number): T[];
->last : Symbol(last, Decl(underscoreTest1_underscore.ts, 127, 36), Decl(underscoreTest1_underscore.ts, 128, 18))
+>last : Symbol(WrappedArray.last, Decl(underscoreTest1_underscore.ts, 127, 36), Decl(underscoreTest1_underscore.ts, 128, 18))
 >count : Symbol(count, Decl(underscoreTest1_underscore.ts, 129, 13))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         rest(index?: number): T[];
->rest : Symbol(rest, Decl(underscoreTest1_underscore.ts, 129, 33))
+>rest : Symbol(WrappedArray.rest, Decl(underscoreTest1_underscore.ts, 129, 33))
 >index : Symbol(index, Decl(underscoreTest1_underscore.ts, 130, 13))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         compact(): T[];
->compact : Symbol(compact, Decl(underscoreTest1_underscore.ts, 130, 34))
+>compact : Symbol(WrappedArray.compact, Decl(underscoreTest1_underscore.ts, 130, 34))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         flatten<U>(shallow?: boolean): U[];
->flatten : Symbol(flatten, Decl(underscoreTest1_underscore.ts, 131, 23))
+>flatten : Symbol(WrappedArray.flatten, Decl(underscoreTest1_underscore.ts, 131, 23))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 132, 16))
 >shallow : Symbol(shallow, Decl(underscoreTest1_underscore.ts, 132, 19))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 132, 16))
 
         without(...values: T[]): T[];
->without : Symbol(without, Decl(underscoreTest1_underscore.ts, 132, 43))
+>without : Symbol(WrappedArray.without, Decl(underscoreTest1_underscore.ts, 132, 43))
 >values : Symbol(values, Decl(underscoreTest1_underscore.ts, 133, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         union(...arrays: T[][]): T[];
->union : Symbol(union, Decl(underscoreTest1_underscore.ts, 133, 37))
+>union : Symbol(WrappedArray.union, Decl(underscoreTest1_underscore.ts, 133, 37))
 >arrays : Symbol(arrays, Decl(underscoreTest1_underscore.ts, 134, 14))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         intersection(...arrays: T[][]): T[];
->intersection : Symbol(intersection, Decl(underscoreTest1_underscore.ts, 134, 37))
+>intersection : Symbol(WrappedArray.intersection, Decl(underscoreTest1_underscore.ts, 134, 37))
 >arrays : Symbol(arrays, Decl(underscoreTest1_underscore.ts, 135, 21))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         difference(...others: T[][]): T[];
->difference : Symbol(difference, Decl(underscoreTest1_underscore.ts, 135, 44))
+>difference : Symbol(WrappedArray.difference, Decl(underscoreTest1_underscore.ts, 135, 44))
 >others : Symbol(others, Decl(underscoreTest1_underscore.ts, 136, 19))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         uniq(isSorted?: boolean): T[];
->uniq : Symbol(uniq, Decl(underscoreTest1_underscore.ts, 136, 42), Decl(underscoreTest1_underscore.ts, 137, 38))
+>uniq : Symbol(WrappedArray.uniq, Decl(underscoreTest1_underscore.ts, 136, 42), Decl(underscoreTest1_underscore.ts, 137, 38))
 >isSorted : Symbol(isSorted, Decl(underscoreTest1_underscore.ts, 137, 13))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         uniq<U>(isSorted: boolean, iterator: Iterator<T, U>, context?: any): U[];
->uniq : Symbol(uniq, Decl(underscoreTest1_underscore.ts, 136, 42), Decl(underscoreTest1_underscore.ts, 137, 38))
+>uniq : Symbol(WrappedArray.uniq, Decl(underscoreTest1_underscore.ts, 136, 42), Decl(underscoreTest1_underscore.ts, 137, 38))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 138, 13))
 >isSorted : Symbol(isSorted, Decl(underscoreTest1_underscore.ts, 138, 16))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 138, 34))
@@ -1667,12 +1667,12 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 138, 13))
 
         unique(isSorted?: boolean): T[];
->unique : Symbol(unique, Decl(underscoreTest1_underscore.ts, 138, 81), Decl(underscoreTest1_underscore.ts, 139, 40))
+>unique : Symbol(WrappedArray.unique, Decl(underscoreTest1_underscore.ts, 138, 81), Decl(underscoreTest1_underscore.ts, 139, 40))
 >isSorted : Symbol(isSorted, Decl(underscoreTest1_underscore.ts, 139, 15))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         unique<U>(isSorted: boolean, iterator: Iterator<T, U>, context?: any): U[];
->unique : Symbol(unique, Decl(underscoreTest1_underscore.ts, 138, 81), Decl(underscoreTest1_underscore.ts, 139, 40))
+>unique : Symbol(WrappedArray.unique, Decl(underscoreTest1_underscore.ts, 138, 81), Decl(underscoreTest1_underscore.ts, 139, 40))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 140, 15))
 >isSorted : Symbol(isSorted, Decl(underscoreTest1_underscore.ts, 140, 18))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 140, 36))
@@ -1683,36 +1683,36 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 140, 15))
 
         zip(...arrays: any[][]): any[][];
->zip : Symbol(zip, Decl(underscoreTest1_underscore.ts, 140, 83))
+>zip : Symbol(WrappedArray.zip, Decl(underscoreTest1_underscore.ts, 140, 83))
 >arrays : Symbol(arrays, Decl(underscoreTest1_underscore.ts, 141, 12))
 
         object(): any;
->object : Symbol(object, Decl(underscoreTest1_underscore.ts, 141, 41), Decl(underscoreTest1_underscore.ts, 142, 22))
+>object : Symbol(WrappedArray.object, Decl(underscoreTest1_underscore.ts, 141, 41), Decl(underscoreTest1_underscore.ts, 142, 22))
 
         object(values: any[]): any;
->object : Symbol(object, Decl(underscoreTest1_underscore.ts, 141, 41), Decl(underscoreTest1_underscore.ts, 142, 22))
+>object : Symbol(WrappedArray.object, Decl(underscoreTest1_underscore.ts, 141, 41), Decl(underscoreTest1_underscore.ts, 142, 22))
 >values : Symbol(values, Decl(underscoreTest1_underscore.ts, 143, 15))
 
         indexOf(value: T, isSorted?: boolean): number;
->indexOf : Symbol(indexOf, Decl(underscoreTest1_underscore.ts, 143, 35))
+>indexOf : Symbol(WrappedArray.indexOf, Decl(underscoreTest1_underscore.ts, 143, 35))
 >value : Symbol(value, Decl(underscoreTest1_underscore.ts, 144, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 >isSorted : Symbol(isSorted, Decl(underscoreTest1_underscore.ts, 144, 25))
 
         lastIndexOf(value: T, fromIndex?: number): number;
->lastIndexOf : Symbol(lastIndexOf, Decl(underscoreTest1_underscore.ts, 144, 54))
+>lastIndexOf : Symbol(WrappedArray.lastIndexOf, Decl(underscoreTest1_underscore.ts, 144, 54))
 >value : Symbol(value, Decl(underscoreTest1_underscore.ts, 145, 20))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 >fromIndex : Symbol(fromIndex, Decl(underscoreTest1_underscore.ts, 145, 29))
 
         sortedIndex(obj: T, propertyName: string): number;
->sortedIndex : Symbol(sortedIndex, Decl(underscoreTest1_underscore.ts, 145, 58), Decl(underscoreTest1_underscore.ts, 146, 58))
+>sortedIndex : Symbol(WrappedArray.sortedIndex, Decl(underscoreTest1_underscore.ts, 145, 58), Decl(underscoreTest1_underscore.ts, 146, 58))
 >obj : Symbol(obj, Decl(underscoreTest1_underscore.ts, 146, 20))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 >propertyName : Symbol(propertyName, Decl(underscoreTest1_underscore.ts, 146, 27))
 
         sortedIndex(obj: T, iterator?: Iterator<T, any>, context?: any): number;
->sortedIndex : Symbol(sortedIndex, Decl(underscoreTest1_underscore.ts, 145, 58), Decl(underscoreTest1_underscore.ts, 146, 58))
+>sortedIndex : Symbol(WrappedArray.sortedIndex, Decl(underscoreTest1_underscore.ts, 145, 58), Decl(underscoreTest1_underscore.ts, 146, 58))
 >obj : Symbol(obj, Decl(underscoreTest1_underscore.ts, 147, 20))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 147, 27))
@@ -1722,40 +1722,40 @@ module Underscore {
 
         // Methods from Array
         concat(...items: T[]): T[];
->concat : Symbol(concat, Decl(underscoreTest1_underscore.ts, 147, 80))
+>concat : Symbol(WrappedArray.concat, Decl(underscoreTest1_underscore.ts, 147, 80))
 >items : Symbol(items, Decl(underscoreTest1_underscore.ts, 149, 15))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         join(separator?: string): string;
->join : Symbol(join, Decl(underscoreTest1_underscore.ts, 149, 35))
+>join : Symbol(WrappedArray.join, Decl(underscoreTest1_underscore.ts, 149, 35))
 >separator : Symbol(separator, Decl(underscoreTest1_underscore.ts, 150, 13))
 
         pop(): T;
->pop : Symbol(pop, Decl(underscoreTest1_underscore.ts, 150, 41))
+>pop : Symbol(WrappedArray.pop, Decl(underscoreTest1_underscore.ts, 150, 41))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         push(...items: T[]): number;
->push : Symbol(push, Decl(underscoreTest1_underscore.ts, 151, 17))
+>push : Symbol(WrappedArray.push, Decl(underscoreTest1_underscore.ts, 151, 17))
 >items : Symbol(items, Decl(underscoreTest1_underscore.ts, 152, 13))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         reverse(): T[];
->reverse : Symbol(reverse, Decl(underscoreTest1_underscore.ts, 152, 36))
+>reverse : Symbol(WrappedArray.reverse, Decl(underscoreTest1_underscore.ts, 152, 36))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         shift(): T;
->shift : Symbol(shift, Decl(underscoreTest1_underscore.ts, 153, 23))
+>shift : Symbol(WrappedArray.shift, Decl(underscoreTest1_underscore.ts, 153, 23))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         slice(start: number, end?: number): T[];
->slice : Symbol(slice, Decl(underscoreTest1_underscore.ts, 154, 19))
+>slice : Symbol(WrappedArray.slice, Decl(underscoreTest1_underscore.ts, 154, 19))
 >start : Symbol(start, Decl(underscoreTest1_underscore.ts, 155, 14))
 >end : Symbol(end, Decl(underscoreTest1_underscore.ts, 155, 28))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         sort(compareFn?: (a: T, b: T) => number): T[];
->sort : Symbol(sort, Decl(underscoreTest1_underscore.ts, 155, 48))
+>sort : Symbol(WrappedArray.sort, Decl(underscoreTest1_underscore.ts, 155, 48))
 >compareFn : Symbol(compareFn, Decl(underscoreTest1_underscore.ts, 156, 13))
 >a : Symbol(a, Decl(underscoreTest1_underscore.ts, 156, 26))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
@@ -1764,12 +1764,12 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         splice(start: number): T[];
->splice : Symbol(splice, Decl(underscoreTest1_underscore.ts, 156, 54), Decl(underscoreTest1_underscore.ts, 157, 35))
+>splice : Symbol(WrappedArray.splice, Decl(underscoreTest1_underscore.ts, 156, 54), Decl(underscoreTest1_underscore.ts, 157, 35))
 >start : Symbol(start, Decl(underscoreTest1_underscore.ts, 157, 15))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         splice(start: number, deleteCount: number, ...items: T[]): T[];
->splice : Symbol(splice, Decl(underscoreTest1_underscore.ts, 156, 54), Decl(underscoreTest1_underscore.ts, 157, 35))
+>splice : Symbol(WrappedArray.splice, Decl(underscoreTest1_underscore.ts, 156, 54), Decl(underscoreTest1_underscore.ts, 157, 35))
 >start : Symbol(start, Decl(underscoreTest1_underscore.ts, 158, 15))
 >deleteCount : Symbol(deleteCount, Decl(underscoreTest1_underscore.ts, 158, 29))
 >items : Symbol(items, Decl(underscoreTest1_underscore.ts, 158, 50))
@@ -1777,7 +1777,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
 
         unshift(...items: T[]): number;
->unshift : Symbol(unshift, Decl(underscoreTest1_underscore.ts, 158, 71))
+>unshift : Symbol(WrappedArray.unshift, Decl(underscoreTest1_underscore.ts, 158, 71))
 >items : Symbol(items, Decl(underscoreTest1_underscore.ts, 159, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 79, 34))
     }
@@ -1790,21 +1790,21 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 
         each(iterator: Iterator<T, void>, context?: any): void;
->each : Symbol(each, Decl(underscoreTest1_underscore.ts, 162, 80))
+>each : Symbol(WrappedDictionary.each, Decl(underscoreTest1_underscore.ts, 162, 80))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 163, 13))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 >context : Symbol(context, Decl(underscoreTest1_underscore.ts, 163, 41))
 
         forEach(iterator: Iterator<T, void>, context?: any): void;
->forEach : Symbol(forEach, Decl(underscoreTest1_underscore.ts, 163, 63))
+>forEach : Symbol(WrappedDictionary.forEach, Decl(underscoreTest1_underscore.ts, 163, 63))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 164, 16))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 >context : Symbol(context, Decl(underscoreTest1_underscore.ts, 164, 44))
 
         map<U>(iterator: Iterator<T, U>, context?: any): U[];
->map : Symbol(map, Decl(underscoreTest1_underscore.ts, 164, 66))
+>map : Symbol(WrappedDictionary.map, Decl(underscoreTest1_underscore.ts, 164, 66))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 165, 12))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 165, 15))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
@@ -1814,7 +1814,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 165, 12))
 
         collect<U>(iterator: Iterator<T, U>, context?: any): U[];
->collect : Symbol(collect, Decl(underscoreTest1_underscore.ts, 165, 61))
+>collect : Symbol(WrappedDictionary.collect, Decl(underscoreTest1_underscore.ts, 165, 61))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 166, 16))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 166, 19))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
@@ -1824,7 +1824,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 166, 16))
 
         reduce(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
->reduce : Symbol(reduce, Decl(underscoreTest1_underscore.ts, 166, 65), Decl(underscoreTest1_underscore.ts, 167, 76))
+>reduce : Symbol(WrappedDictionary.reduce, Decl(underscoreTest1_underscore.ts, 166, 65), Decl(underscoreTest1_underscore.ts, 167, 76))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 167, 15))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
@@ -1835,7 +1835,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 
         reduce<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->reduce : Symbol(reduce, Decl(underscoreTest1_underscore.ts, 166, 65), Decl(underscoreTest1_underscore.ts, 167, 76))
+>reduce : Symbol(WrappedDictionary.reduce, Decl(underscoreTest1_underscore.ts, 166, 65), Decl(underscoreTest1_underscore.ts, 167, 76))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 168, 15))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 168, 18))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
@@ -1847,7 +1847,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 168, 15))
 
         foldl(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
->foldl : Symbol(foldl, Decl(underscoreTest1_underscore.ts, 168, 78), Decl(underscoreTest1_underscore.ts, 169, 75))
+>foldl : Symbol(WrappedDictionary.foldl, Decl(underscoreTest1_underscore.ts, 168, 78), Decl(underscoreTest1_underscore.ts, 169, 75))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 169, 14))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
@@ -1858,7 +1858,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 
         foldl<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->foldl : Symbol(foldl, Decl(underscoreTest1_underscore.ts, 168, 78), Decl(underscoreTest1_underscore.ts, 169, 75))
+>foldl : Symbol(WrappedDictionary.foldl, Decl(underscoreTest1_underscore.ts, 168, 78), Decl(underscoreTest1_underscore.ts, 169, 75))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 170, 14))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 170, 17))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
@@ -1870,7 +1870,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 170, 14))
 
         inject(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
->inject : Symbol(inject, Decl(underscoreTest1_underscore.ts, 170, 77), Decl(underscoreTest1_underscore.ts, 171, 76))
+>inject : Symbol(WrappedDictionary.inject, Decl(underscoreTest1_underscore.ts, 170, 77), Decl(underscoreTest1_underscore.ts, 171, 76))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 171, 15))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
@@ -1881,7 +1881,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 
         inject<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->inject : Symbol(inject, Decl(underscoreTest1_underscore.ts, 170, 77), Decl(underscoreTest1_underscore.ts, 171, 76))
+>inject : Symbol(WrappedDictionary.inject, Decl(underscoreTest1_underscore.ts, 170, 77), Decl(underscoreTest1_underscore.ts, 171, 76))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 172, 15))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 172, 18))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
@@ -1893,7 +1893,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 172, 15))
 
         reduceRight(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
->reduceRight : Symbol(reduceRight, Decl(underscoreTest1_underscore.ts, 172, 78), Decl(underscoreTest1_underscore.ts, 173, 81))
+>reduceRight : Symbol(WrappedDictionary.reduceRight, Decl(underscoreTest1_underscore.ts, 172, 78), Decl(underscoreTest1_underscore.ts, 173, 81))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 173, 20))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
@@ -1904,7 +1904,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 
         reduceRight<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->reduceRight : Symbol(reduceRight, Decl(underscoreTest1_underscore.ts, 172, 78), Decl(underscoreTest1_underscore.ts, 173, 81))
+>reduceRight : Symbol(WrappedDictionary.reduceRight, Decl(underscoreTest1_underscore.ts, 172, 78), Decl(underscoreTest1_underscore.ts, 173, 81))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 174, 20))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 174, 23))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
@@ -1916,7 +1916,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 174, 20))
 
         foldr(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
->foldr : Symbol(foldr, Decl(underscoreTest1_underscore.ts, 174, 83), Decl(underscoreTest1_underscore.ts, 175, 75))
+>foldr : Symbol(WrappedDictionary.foldr, Decl(underscoreTest1_underscore.ts, 174, 83), Decl(underscoreTest1_underscore.ts, 175, 75))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 175, 14))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
@@ -1927,7 +1927,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 
         foldr<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->foldr : Symbol(foldr, Decl(underscoreTest1_underscore.ts, 174, 83), Decl(underscoreTest1_underscore.ts, 175, 75))
+>foldr : Symbol(WrappedDictionary.foldr, Decl(underscoreTest1_underscore.ts, 174, 83), Decl(underscoreTest1_underscore.ts, 175, 75))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 176, 14))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 176, 17))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
@@ -1939,7 +1939,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 176, 14))
 
         find(iterator: Iterator<T, boolean>, context?: any): T;
->find : Symbol(find, Decl(underscoreTest1_underscore.ts, 176, 77))
+>find : Symbol(WrappedDictionary.find, Decl(underscoreTest1_underscore.ts, 176, 77))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 177, 13))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
@@ -1947,7 +1947,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 
         detect(iterator: Iterator<T, boolean>, context?: any): T;
->detect : Symbol(detect, Decl(underscoreTest1_underscore.ts, 177, 63))
+>detect : Symbol(WrappedDictionary.detect, Decl(underscoreTest1_underscore.ts, 177, 63))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 178, 15))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
@@ -1955,7 +1955,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 
         filter(iterator: Iterator<T, boolean>, context?: any): T[];
->filter : Symbol(filter, Decl(underscoreTest1_underscore.ts, 178, 65))
+>filter : Symbol(WrappedDictionary.filter, Decl(underscoreTest1_underscore.ts, 178, 65))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 179, 15))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
@@ -1963,7 +1963,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 
         select(iterator: Iterator<T, boolean>, context?: any): T[];
->select : Symbol(select, Decl(underscoreTest1_underscore.ts, 179, 67))
+>select : Symbol(WrappedDictionary.select, Decl(underscoreTest1_underscore.ts, 179, 67))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 180, 15))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
@@ -1971,19 +1971,19 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 
         where(properties: Object): T[];
->where : Symbol(where, Decl(underscoreTest1_underscore.ts, 180, 67))
+>where : Symbol(WrappedDictionary.where, Decl(underscoreTest1_underscore.ts, 180, 67))
 >properties : Symbol(properties, Decl(underscoreTest1_underscore.ts, 181, 14))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 
         findWhere(properties: Object): T;
->findWhere : Symbol(findWhere, Decl(underscoreTest1_underscore.ts, 181, 39))
+>findWhere : Symbol(WrappedDictionary.findWhere, Decl(underscoreTest1_underscore.ts, 181, 39))
 >properties : Symbol(properties, Decl(underscoreTest1_underscore.ts, 182, 18))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 
         reject(iterator: Iterator<T, boolean>, context?: any): T[];
->reject : Symbol(reject, Decl(underscoreTest1_underscore.ts, 182, 41))
+>reject : Symbol(WrappedDictionary.reject, Decl(underscoreTest1_underscore.ts, 182, 41))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 183, 15))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
@@ -1991,54 +1991,54 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 
         every(iterator?: Iterator<T, boolean>, context?: any): boolean;
->every : Symbol(every, Decl(underscoreTest1_underscore.ts, 183, 67))
+>every : Symbol(WrappedDictionary.every, Decl(underscoreTest1_underscore.ts, 183, 67))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 184, 14))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 >context : Symbol(context, Decl(underscoreTest1_underscore.ts, 184, 46))
 
         all(iterator?: Iterator<T, boolean>, context?: any): boolean;
->all : Symbol(all, Decl(underscoreTest1_underscore.ts, 184, 71))
+>all : Symbol(WrappedDictionary.all, Decl(underscoreTest1_underscore.ts, 184, 71))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 185, 12))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 >context : Symbol(context, Decl(underscoreTest1_underscore.ts, 185, 44))
 
         some(iterator?: Iterator<T, boolean>, context?: any): boolean;
->some : Symbol(some, Decl(underscoreTest1_underscore.ts, 185, 69))
+>some : Symbol(WrappedDictionary.some, Decl(underscoreTest1_underscore.ts, 185, 69))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 186, 13))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 >context : Symbol(context, Decl(underscoreTest1_underscore.ts, 186, 45))
 
         any(iterator?: Iterator<T, boolean>, context?: any): boolean;
->any : Symbol(any, Decl(underscoreTest1_underscore.ts, 186, 70))
+>any : Symbol(WrappedDictionary.any, Decl(underscoreTest1_underscore.ts, 186, 70))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 187, 12))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 >context : Symbol(context, Decl(underscoreTest1_underscore.ts, 187, 44))
 
         contains(value: T): boolean;
->contains : Symbol(contains, Decl(underscoreTest1_underscore.ts, 187, 69))
+>contains : Symbol(WrappedDictionary.contains, Decl(underscoreTest1_underscore.ts, 187, 69))
 >value : Symbol(value, Decl(underscoreTest1_underscore.ts, 188, 17))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 
         include(value: T): boolean;
->include : Symbol(include, Decl(underscoreTest1_underscore.ts, 188, 36))
+>include : Symbol(WrappedDictionary.include, Decl(underscoreTest1_underscore.ts, 188, 36))
 >value : Symbol(value, Decl(underscoreTest1_underscore.ts, 189, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 
         invoke(methodName: string, ...args: any[]): any[];
->invoke : Symbol(invoke, Decl(underscoreTest1_underscore.ts, 189, 35))
+>invoke : Symbol(WrappedDictionary.invoke, Decl(underscoreTest1_underscore.ts, 189, 35))
 >methodName : Symbol(methodName, Decl(underscoreTest1_underscore.ts, 190, 15))
 >args : Symbol(args, Decl(underscoreTest1_underscore.ts, 190, 34))
 
         pluck(propertyName: string): any[];
->pluck : Symbol(pluck, Decl(underscoreTest1_underscore.ts, 190, 58))
+>pluck : Symbol(WrappedDictionary.pluck, Decl(underscoreTest1_underscore.ts, 190, 58))
 >propertyName : Symbol(propertyName, Decl(underscoreTest1_underscore.ts, 191, 14))
 
         max(iterator?: Iterator<T, any>, context?: any): T;
->max : Symbol(max, Decl(underscoreTest1_underscore.ts, 191, 43))
+>max : Symbol(WrappedDictionary.max, Decl(underscoreTest1_underscore.ts, 191, 43))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 192, 12))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
@@ -2046,7 +2046,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 
         min(iterator?: Iterator<T, any>, context?: any): T;
->min : Symbol(min, Decl(underscoreTest1_underscore.ts, 192, 59))
+>min : Symbol(WrappedDictionary.min, Decl(underscoreTest1_underscore.ts, 192, 59))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 193, 12))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
@@ -2054,7 +2054,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 
         sortBy(iterator: Iterator<T, any>, context?: any): T[];
->sortBy : Symbol(sortBy, Decl(underscoreTest1_underscore.ts, 193, 59), Decl(underscoreTest1_underscore.ts, 194, 63))
+>sortBy : Symbol(WrappedDictionary.sortBy, Decl(underscoreTest1_underscore.ts, 193, 59), Decl(underscoreTest1_underscore.ts, 194, 63))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 194, 15))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
@@ -2062,12 +2062,12 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 
         sortBy(propertyName: string): T[];
->sortBy : Symbol(sortBy, Decl(underscoreTest1_underscore.ts, 193, 59), Decl(underscoreTest1_underscore.ts, 194, 63))
+>sortBy : Symbol(WrappedDictionary.sortBy, Decl(underscoreTest1_underscore.ts, 193, 59), Decl(underscoreTest1_underscore.ts, 194, 63))
 >propertyName : Symbol(propertyName, Decl(underscoreTest1_underscore.ts, 195, 15))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 
         groupBy(iterator?: Iterator<T, any>, context?: any): Dictionary<T[]>;
->groupBy : Symbol(groupBy, Decl(underscoreTest1_underscore.ts, 195, 42), Decl(underscoreTest1_underscore.ts, 196, 77))
+>groupBy : Symbol(WrappedDictionary.groupBy, Decl(underscoreTest1_underscore.ts, 195, 42), Decl(underscoreTest1_underscore.ts, 196, 77))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 196, 16))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
@@ -2076,13 +2076,13 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 
         groupBy(propertyName: string): Dictionary<T[]>;
->groupBy : Symbol(groupBy, Decl(underscoreTest1_underscore.ts, 195, 42), Decl(underscoreTest1_underscore.ts, 196, 77))
+>groupBy : Symbol(WrappedDictionary.groupBy, Decl(underscoreTest1_underscore.ts, 195, 42), Decl(underscoreTest1_underscore.ts, 196, 77))
 >propertyName : Symbol(propertyName, Decl(underscoreTest1_underscore.ts, 197, 16))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 
         countBy(iterator?: Iterator<T, any>, context?: any): Dictionary<number>;
->countBy : Symbol(countBy, Decl(underscoreTest1_underscore.ts, 197, 55), Decl(underscoreTest1_underscore.ts, 198, 80))
+>countBy : Symbol(WrappedDictionary.countBy, Decl(underscoreTest1_underscore.ts, 197, 55), Decl(underscoreTest1_underscore.ts, 198, 80))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 198, 16))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
@@ -2090,20 +2090,20 @@ module Underscore {
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
 
         countBy(propertyName: string): Dictionary<number>;
->countBy : Symbol(countBy, Decl(underscoreTest1_underscore.ts, 197, 55), Decl(underscoreTest1_underscore.ts, 198, 80))
+>countBy : Symbol(WrappedDictionary.countBy, Decl(underscoreTest1_underscore.ts, 197, 55), Decl(underscoreTest1_underscore.ts, 198, 80))
 >propertyName : Symbol(propertyName, Decl(underscoreTest1_underscore.ts, 199, 16))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
 
         shuffle(): T[];
->shuffle : Symbol(shuffle, Decl(underscoreTest1_underscore.ts, 199, 58))
+>shuffle : Symbol(WrappedDictionary.shuffle, Decl(underscoreTest1_underscore.ts, 199, 58))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 
         toArray(): T[];
->toArray : Symbol(toArray, Decl(underscoreTest1_underscore.ts, 200, 23))
+>toArray : Symbol(WrappedDictionary.toArray, Decl(underscoreTest1_underscore.ts, 200, 23))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 162, 39))
 
         size(): number;
->size : Symbol(size, Decl(underscoreTest1_underscore.ts, 201, 23))
+>size : Symbol(WrappedDictionary.size, Decl(underscoreTest1_underscore.ts, 201, 23))
     }
 
     export interface ChainedObject<T> {
@@ -2111,60 +2111,60 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 205, 35))
 
         keys(): ChainedArray<string>;
->keys : Symbol(keys, Decl(underscoreTest1_underscore.ts, 205, 39))
+>keys : Symbol(ChainedObject.keys, Decl(underscoreTest1_underscore.ts, 205, 39))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 
         values(): ChainedArray<any>;
->values : Symbol(values, Decl(underscoreTest1_underscore.ts, 206, 37))
+>values : Symbol(ChainedObject.values, Decl(underscoreTest1_underscore.ts, 206, 37))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 
         pairs(): ChainedArray<any[]>;
->pairs : Symbol(pairs, Decl(underscoreTest1_underscore.ts, 207, 36))
+>pairs : Symbol(ChainedObject.pairs, Decl(underscoreTest1_underscore.ts, 207, 36))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 
         invert(): ChainedObject<any>;
->invert : Symbol(invert, Decl(underscoreTest1_underscore.ts, 208, 37))
+>invert : Symbol(ChainedObject.invert, Decl(underscoreTest1_underscore.ts, 208, 37))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         functions(): ChainedArray<string>;
->functions : Symbol(functions, Decl(underscoreTest1_underscore.ts, 209, 37))
+>functions : Symbol(ChainedObject.functions, Decl(underscoreTest1_underscore.ts, 209, 37))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 
         methods(): ChainedArray<string>;
->methods : Symbol(methods, Decl(underscoreTest1_underscore.ts, 210, 42))
+>methods : Symbol(ChainedObject.methods, Decl(underscoreTest1_underscore.ts, 210, 42))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 
         extend(...sources: any[]): ChainedObject<T>;
->extend : Symbol(extend, Decl(underscoreTest1_underscore.ts, 211, 40))
+>extend : Symbol(ChainedObject.extend, Decl(underscoreTest1_underscore.ts, 211, 40))
 >sources : Symbol(sources, Decl(underscoreTest1_underscore.ts, 212, 15))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 205, 35))
 
         pick(...keys: string[]): ChainedObject<T>;
->pick : Symbol(pick, Decl(underscoreTest1_underscore.ts, 212, 52))
+>pick : Symbol(ChainedObject.pick, Decl(underscoreTest1_underscore.ts, 212, 52))
 >keys : Symbol(keys, Decl(underscoreTest1_underscore.ts, 213, 13))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 205, 35))
 
         omit(...keys: string[]): ChainedObject<T>;
->omit : Symbol(omit, Decl(underscoreTest1_underscore.ts, 213, 50))
+>omit : Symbol(ChainedObject.omit, Decl(underscoreTest1_underscore.ts, 213, 50))
 >keys : Symbol(keys, Decl(underscoreTest1_underscore.ts, 214, 13))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 205, 35))
 
         defaults(...defaults: any[]): ChainedObject<T>;
->defaults : Symbol(defaults, Decl(underscoreTest1_underscore.ts, 214, 50))
+>defaults : Symbol(ChainedObject.defaults, Decl(underscoreTest1_underscore.ts, 214, 50))
 >defaults : Symbol(defaults, Decl(underscoreTest1_underscore.ts, 215, 17))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 205, 35))
 
         clone(): ChainedObject<T>;
->clone : Symbol(clone, Decl(underscoreTest1_underscore.ts, 215, 55))
+>clone : Symbol(ChainedObject.clone, Decl(underscoreTest1_underscore.ts, 215, 55))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 205, 35))
 
         tap(interceptor: (object: T) => void): ChainedObject<T>;
->tap : Symbol(tap, Decl(underscoreTest1_underscore.ts, 216, 34))
+>tap : Symbol(ChainedObject.tap, Decl(underscoreTest1_underscore.ts, 216, 34))
 >interceptor : Symbol(interceptor, Decl(underscoreTest1_underscore.ts, 217, 12))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 217, 26))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 205, 35))
@@ -2172,78 +2172,78 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 205, 35))
 
         has(key: string): ChainedObject<boolean>;
->has : Symbol(has, Decl(underscoreTest1_underscore.ts, 217, 64))
+>has : Symbol(ChainedObject.has, Decl(underscoreTest1_underscore.ts, 217, 64))
 >key : Symbol(key, Decl(underscoreTest1_underscore.ts, 218, 12))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         isEqual(other: T): ChainedObject<boolean>;
->isEqual : Symbol(isEqual, Decl(underscoreTest1_underscore.ts, 218, 49))
+>isEqual : Symbol(ChainedObject.isEqual, Decl(underscoreTest1_underscore.ts, 218, 49))
 >other : Symbol(other, Decl(underscoreTest1_underscore.ts, 219, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 205, 35))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         isEmpty(): ChainedObject<boolean>;
->isEmpty : Symbol(isEmpty, Decl(underscoreTest1_underscore.ts, 219, 50))
+>isEmpty : Symbol(ChainedObject.isEmpty, Decl(underscoreTest1_underscore.ts, 219, 50))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         isElement(): ChainedObject<boolean>;
->isElement : Symbol(isElement, Decl(underscoreTest1_underscore.ts, 220, 42))
+>isElement : Symbol(ChainedObject.isElement, Decl(underscoreTest1_underscore.ts, 220, 42))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         isArray(): ChainedObject<boolean>;
->isArray : Symbol(isArray, Decl(underscoreTest1_underscore.ts, 221, 44))
+>isArray : Symbol(ChainedObject.isArray, Decl(underscoreTest1_underscore.ts, 221, 44))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         isObject(): ChainedObject<boolean>;
->isObject : Symbol(isObject, Decl(underscoreTest1_underscore.ts, 222, 42))
+>isObject : Symbol(ChainedObject.isObject, Decl(underscoreTest1_underscore.ts, 222, 42))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         isArguments(): ChainedObject<boolean>;
->isArguments : Symbol(isArguments, Decl(underscoreTest1_underscore.ts, 223, 43))
+>isArguments : Symbol(ChainedObject.isArguments, Decl(underscoreTest1_underscore.ts, 223, 43))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         isFunction(): ChainedObject<boolean>;
->isFunction : Symbol(isFunction, Decl(underscoreTest1_underscore.ts, 224, 46))
+>isFunction : Symbol(ChainedObject.isFunction, Decl(underscoreTest1_underscore.ts, 224, 46))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         isString(): ChainedObject<boolean>;
->isString : Symbol(isString, Decl(underscoreTest1_underscore.ts, 225, 45))
+>isString : Symbol(ChainedObject.isString, Decl(underscoreTest1_underscore.ts, 225, 45))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         isNumber(): ChainedObject<boolean>;
->isNumber : Symbol(isNumber, Decl(underscoreTest1_underscore.ts, 226, 43))
+>isNumber : Symbol(ChainedObject.isNumber, Decl(underscoreTest1_underscore.ts, 226, 43))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         isFinite(): ChainedObject<boolean>;
->isFinite : Symbol(isFinite, Decl(underscoreTest1_underscore.ts, 227, 43))
+>isFinite : Symbol(ChainedObject.isFinite, Decl(underscoreTest1_underscore.ts, 227, 43))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         isBoolean(): ChainedObject<boolean>;
->isBoolean : Symbol(isBoolean, Decl(underscoreTest1_underscore.ts, 228, 43))
+>isBoolean : Symbol(ChainedObject.isBoolean, Decl(underscoreTest1_underscore.ts, 228, 43))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         isDate(): ChainedObject<boolean>;
->isDate : Symbol(isDate, Decl(underscoreTest1_underscore.ts, 229, 44))
+>isDate : Symbol(ChainedObject.isDate, Decl(underscoreTest1_underscore.ts, 229, 44))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         isRegExp(): ChainedObject<boolean>;
->isRegExp : Symbol(isRegExp, Decl(underscoreTest1_underscore.ts, 230, 41))
+>isRegExp : Symbol(ChainedObject.isRegExp, Decl(underscoreTest1_underscore.ts, 230, 41))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         isNaN(): ChainedObject<boolean>;
->isNaN : Symbol(isNaN, Decl(underscoreTest1_underscore.ts, 231, 43))
+>isNaN : Symbol(ChainedObject.isNaN, Decl(underscoreTest1_underscore.ts, 231, 43))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         isNull(): ChainedObject<boolean>;
->isNull : Symbol(isNull, Decl(underscoreTest1_underscore.ts, 232, 40))
+>isNull : Symbol(ChainedObject.isNull, Decl(underscoreTest1_underscore.ts, 232, 40))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         isUndefined(): ChainedObject<boolean>;
->isUndefined : Symbol(isUndefined, Decl(underscoreTest1_underscore.ts, 233, 41))
+>isUndefined : Symbol(ChainedObject.isUndefined, Decl(underscoreTest1_underscore.ts, 233, 41))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         value(): T;
->value : Symbol(value, Decl(underscoreTest1_underscore.ts, 234, 46))
+>value : Symbol(ChainedObject.value, Decl(underscoreTest1_underscore.ts, 234, 46))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 205, 35))
     }
 
@@ -2255,7 +2255,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         each(iterator: Iterator<T, void>, context?: any): ChainedObject<void>;
->each : Symbol(each, Decl(underscoreTest1_underscore.ts, 238, 70))
+>each : Symbol(ChainedArray.each, Decl(underscoreTest1_underscore.ts, 238, 70))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 239, 13))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
@@ -2263,7 +2263,7 @@ module Underscore {
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         forEach(iterator: Iterator<T, void>, context?: any): ChainedObject<void>;
->forEach : Symbol(forEach, Decl(underscoreTest1_underscore.ts, 239, 78))
+>forEach : Symbol(ChainedArray.forEach, Decl(underscoreTest1_underscore.ts, 239, 78))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 240, 16))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
@@ -2271,7 +2271,7 @@ module Underscore {
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         map<U>(iterator: Iterator<T, U>, context?: any): ChainedArray<U>;
->map : Symbol(map, Decl(underscoreTest1_underscore.ts, 240, 81))
+>map : Symbol(ChainedArray.map, Decl(underscoreTest1_underscore.ts, 240, 81))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 241, 12))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 241, 15))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
@@ -2282,7 +2282,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 241, 12))
 
         collect<U>(iterator: Iterator<T, U>, context?: any): ChainedArray<U>;
->collect : Symbol(collect, Decl(underscoreTest1_underscore.ts, 241, 73))
+>collect : Symbol(ChainedArray.collect, Decl(underscoreTest1_underscore.ts, 241, 73))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 242, 16))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 242, 19))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
@@ -2293,7 +2293,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 242, 16))
 
         reduce(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
->reduce : Symbol(reduce, Decl(underscoreTest1_underscore.ts, 242, 77), Decl(underscoreTest1_underscore.ts, 243, 91))
+>reduce : Symbol(ChainedArray.reduce, Decl(underscoreTest1_underscore.ts, 242, 77), Decl(underscoreTest1_underscore.ts, 243, 91))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 243, 15))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
@@ -2305,7 +2305,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         reduce<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
->reduce : Symbol(reduce, Decl(underscoreTest1_underscore.ts, 242, 77), Decl(underscoreTest1_underscore.ts, 243, 91))
+>reduce : Symbol(ChainedArray.reduce, Decl(underscoreTest1_underscore.ts, 242, 77), Decl(underscoreTest1_underscore.ts, 243, 91))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 244, 15))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 244, 18))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
@@ -2318,7 +2318,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 244, 15))
 
         foldl(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
->foldl : Symbol(foldl, Decl(underscoreTest1_underscore.ts, 244, 93), Decl(underscoreTest1_underscore.ts, 245, 90))
+>foldl : Symbol(ChainedArray.foldl, Decl(underscoreTest1_underscore.ts, 244, 93), Decl(underscoreTest1_underscore.ts, 245, 90))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 245, 14))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
@@ -2330,7 +2330,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         foldl<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
->foldl : Symbol(foldl, Decl(underscoreTest1_underscore.ts, 244, 93), Decl(underscoreTest1_underscore.ts, 245, 90))
+>foldl : Symbol(ChainedArray.foldl, Decl(underscoreTest1_underscore.ts, 244, 93), Decl(underscoreTest1_underscore.ts, 245, 90))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 246, 14))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 246, 17))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
@@ -2343,7 +2343,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 246, 14))
 
         inject(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
->inject : Symbol(inject, Decl(underscoreTest1_underscore.ts, 246, 92), Decl(underscoreTest1_underscore.ts, 247, 91))
+>inject : Symbol(ChainedArray.inject, Decl(underscoreTest1_underscore.ts, 246, 92), Decl(underscoreTest1_underscore.ts, 247, 91))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 247, 15))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
@@ -2355,7 +2355,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         inject<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
->inject : Symbol(inject, Decl(underscoreTest1_underscore.ts, 246, 92), Decl(underscoreTest1_underscore.ts, 247, 91))
+>inject : Symbol(ChainedArray.inject, Decl(underscoreTest1_underscore.ts, 246, 92), Decl(underscoreTest1_underscore.ts, 247, 91))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 248, 15))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 248, 18))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
@@ -2368,7 +2368,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 248, 15))
 
         reduceRight(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
->reduceRight : Symbol(reduceRight, Decl(underscoreTest1_underscore.ts, 248, 93), Decl(underscoreTest1_underscore.ts, 249, 96))
+>reduceRight : Symbol(ChainedArray.reduceRight, Decl(underscoreTest1_underscore.ts, 248, 93), Decl(underscoreTest1_underscore.ts, 249, 96))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 249, 20))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
@@ -2380,7 +2380,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         reduceRight<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
->reduceRight : Symbol(reduceRight, Decl(underscoreTest1_underscore.ts, 248, 93), Decl(underscoreTest1_underscore.ts, 249, 96))
+>reduceRight : Symbol(ChainedArray.reduceRight, Decl(underscoreTest1_underscore.ts, 248, 93), Decl(underscoreTest1_underscore.ts, 249, 96))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 250, 20))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 250, 23))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
@@ -2393,7 +2393,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 250, 20))
 
         foldr(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
->foldr : Symbol(foldr, Decl(underscoreTest1_underscore.ts, 250, 98), Decl(underscoreTest1_underscore.ts, 251, 90))
+>foldr : Symbol(ChainedArray.foldr, Decl(underscoreTest1_underscore.ts, 250, 98), Decl(underscoreTest1_underscore.ts, 251, 90))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 251, 14))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
@@ -2405,7 +2405,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         foldr<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
->foldr : Symbol(foldr, Decl(underscoreTest1_underscore.ts, 250, 98), Decl(underscoreTest1_underscore.ts, 251, 90))
+>foldr : Symbol(ChainedArray.foldr, Decl(underscoreTest1_underscore.ts, 250, 98), Decl(underscoreTest1_underscore.ts, 251, 90))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 252, 14))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 252, 17))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
@@ -2418,7 +2418,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 252, 14))
 
         find(iterator: Iterator<T, boolean>, context?: any): ChainedObject<T>;
->find : Symbol(find, Decl(underscoreTest1_underscore.ts, 252, 92))
+>find : Symbol(ChainedArray.find, Decl(underscoreTest1_underscore.ts, 252, 92))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 253, 13))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
@@ -2427,7 +2427,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         detect(iterator: Iterator<T, boolean>, context?: any): ChainedObject<T>;
->detect : Symbol(detect, Decl(underscoreTest1_underscore.ts, 253, 78))
+>detect : Symbol(ChainedArray.detect, Decl(underscoreTest1_underscore.ts, 253, 78))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 254, 15))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
@@ -2436,7 +2436,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         filter(iterator: Iterator<T, boolean>, context?: any): ChainedArray<T>;
->filter : Symbol(filter, Decl(underscoreTest1_underscore.ts, 254, 80))
+>filter : Symbol(ChainedArray.filter, Decl(underscoreTest1_underscore.ts, 254, 80))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 255, 15))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
@@ -2445,7 +2445,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         select(iterator: Iterator<T, boolean>, context?: any): ChainedArray<T>;
->select : Symbol(select, Decl(underscoreTest1_underscore.ts, 255, 79))
+>select : Symbol(ChainedArray.select, Decl(underscoreTest1_underscore.ts, 255, 79))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 256, 15))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
@@ -2454,21 +2454,21 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         where(properties: Object): ChainedArray<T>;
->where : Symbol(where, Decl(underscoreTest1_underscore.ts, 256, 79))
+>where : Symbol(ChainedArray.where, Decl(underscoreTest1_underscore.ts, 256, 79))
 >properties : Symbol(properties, Decl(underscoreTest1_underscore.ts, 257, 14))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         findWhere(properties: Object): ChainedObject<T>;
->findWhere : Symbol(findWhere, Decl(underscoreTest1_underscore.ts, 257, 51))
+>findWhere : Symbol(ChainedArray.findWhere, Decl(underscoreTest1_underscore.ts, 257, 51))
 >properties : Symbol(properties, Decl(underscoreTest1_underscore.ts, 258, 18))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         reject(iterator: Iterator<T, boolean>, context?: any): ChainedArray<T>;
->reject : Symbol(reject, Decl(underscoreTest1_underscore.ts, 258, 56))
+>reject : Symbol(ChainedArray.reject, Decl(underscoreTest1_underscore.ts, 258, 56))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 259, 15))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
@@ -2477,7 +2477,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         every(iterator?: Iterator<T, boolean>, context?: any): ChainedObject<boolean>;
->every : Symbol(every, Decl(underscoreTest1_underscore.ts, 259, 79))
+>every : Symbol(ChainedArray.every, Decl(underscoreTest1_underscore.ts, 259, 79))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 260, 14))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
@@ -2485,7 +2485,7 @@ module Underscore {
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         all(iterator?: Iterator<T, boolean>, context?: any): ChainedObject<boolean>;
->all : Symbol(all, Decl(underscoreTest1_underscore.ts, 260, 86))
+>all : Symbol(ChainedArray.all, Decl(underscoreTest1_underscore.ts, 260, 86))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 261, 12))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
@@ -2493,7 +2493,7 @@ module Underscore {
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         some(iterator?: Iterator<T, boolean>, context?: any): ChainedObject<boolean>;
->some : Symbol(some, Decl(underscoreTest1_underscore.ts, 261, 84))
+>some : Symbol(ChainedArray.some, Decl(underscoreTest1_underscore.ts, 261, 84))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 262, 13))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
@@ -2501,7 +2501,7 @@ module Underscore {
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         any(iterator?: Iterator<T, boolean>, context?: any): ChainedObject<boolean>;
->any : Symbol(any, Decl(underscoreTest1_underscore.ts, 262, 85))
+>any : Symbol(ChainedArray.any, Decl(underscoreTest1_underscore.ts, 262, 85))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 263, 12))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
@@ -2509,30 +2509,30 @@ module Underscore {
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         contains(value: T): ChainedObject<boolean>;
->contains : Symbol(contains, Decl(underscoreTest1_underscore.ts, 263, 84))
+>contains : Symbol(ChainedArray.contains, Decl(underscoreTest1_underscore.ts, 263, 84))
 >value : Symbol(value, Decl(underscoreTest1_underscore.ts, 264, 17))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         include(value: T): ChainedObject<boolean>;
->include : Symbol(include, Decl(underscoreTest1_underscore.ts, 264, 51))
+>include : Symbol(ChainedArray.include, Decl(underscoreTest1_underscore.ts, 264, 51))
 >value : Symbol(value, Decl(underscoreTest1_underscore.ts, 265, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         invoke(methodName: string, ...args: any[]): ChainedArray<any>;
->invoke : Symbol(invoke, Decl(underscoreTest1_underscore.ts, 265, 50))
+>invoke : Symbol(ChainedArray.invoke, Decl(underscoreTest1_underscore.ts, 265, 50))
 >methodName : Symbol(methodName, Decl(underscoreTest1_underscore.ts, 266, 15))
 >args : Symbol(args, Decl(underscoreTest1_underscore.ts, 266, 34))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 
         pluck(propertyName: string): ChainedArray<any>;
->pluck : Symbol(pluck, Decl(underscoreTest1_underscore.ts, 266, 70))
+>pluck : Symbol(ChainedArray.pluck, Decl(underscoreTest1_underscore.ts, 266, 70))
 >propertyName : Symbol(propertyName, Decl(underscoreTest1_underscore.ts, 267, 14))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 
         max(iterator?: Iterator<T, any>, context?: any): ChainedObject<T>;
->max : Symbol(max, Decl(underscoreTest1_underscore.ts, 267, 55))
+>max : Symbol(ChainedArray.max, Decl(underscoreTest1_underscore.ts, 267, 55))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 268, 12))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
@@ -2541,7 +2541,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         min(iterator?: Iterator<T, any>, context?: any): ChainedObject<T>;
->min : Symbol(min, Decl(underscoreTest1_underscore.ts, 268, 74))
+>min : Symbol(ChainedArray.min, Decl(underscoreTest1_underscore.ts, 268, 74))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 269, 12))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
@@ -2550,7 +2550,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         sortBy(iterator: Iterator<T, any>, context?: any): ChainedArray<T>;
->sortBy : Symbol(sortBy, Decl(underscoreTest1_underscore.ts, 269, 74), Decl(underscoreTest1_underscore.ts, 270, 75))
+>sortBy : Symbol(ChainedArray.sortBy, Decl(underscoreTest1_underscore.ts, 269, 74), Decl(underscoreTest1_underscore.ts, 270, 75))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 270, 15))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
@@ -2559,14 +2559,14 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         sortBy(propertyName: string): ChainedArray<T>;
->sortBy : Symbol(sortBy, Decl(underscoreTest1_underscore.ts, 269, 74), Decl(underscoreTest1_underscore.ts, 270, 75))
+>sortBy : Symbol(ChainedArray.sortBy, Decl(underscoreTest1_underscore.ts, 269, 74), Decl(underscoreTest1_underscore.ts, 270, 75))
 >propertyName : Symbol(propertyName, Decl(underscoreTest1_underscore.ts, 271, 15))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         // Should return ChainedDictionary<T[]>, but expansive recursion not allowed
         groupBy(iterator?: Iterator<T, any>, context?: any): ChainedDictionary<any[]>;
->groupBy : Symbol(groupBy, Decl(underscoreTest1_underscore.ts, 271, 54), Decl(underscoreTest1_underscore.ts, 273, 86))
+>groupBy : Symbol(ChainedArray.groupBy, Decl(underscoreTest1_underscore.ts, 271, 54), Decl(underscoreTest1_underscore.ts, 273, 86))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 273, 16))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
@@ -2574,12 +2574,12 @@ module Underscore {
 >ChainedDictionary : Symbol(ChainedDictionary, Decl(underscoreTest1_underscore.ts, 327, 5))
 
         groupBy(propertyName: string): ChainedDictionary<any[]>;
->groupBy : Symbol(groupBy, Decl(underscoreTest1_underscore.ts, 271, 54), Decl(underscoreTest1_underscore.ts, 273, 86))
+>groupBy : Symbol(ChainedArray.groupBy, Decl(underscoreTest1_underscore.ts, 271, 54), Decl(underscoreTest1_underscore.ts, 273, 86))
 >propertyName : Symbol(propertyName, Decl(underscoreTest1_underscore.ts, 274, 16))
 >ChainedDictionary : Symbol(ChainedDictionary, Decl(underscoreTest1_underscore.ts, 327, 5))
 
         countBy(iterator?: Iterator<T, any>, context?: any): ChainedDictionary<number>;
->countBy : Symbol(countBy, Decl(underscoreTest1_underscore.ts, 274, 64), Decl(underscoreTest1_underscore.ts, 275, 87))
+>countBy : Symbol(ChainedArray.countBy, Decl(underscoreTest1_underscore.ts, 274, 64), Decl(underscoreTest1_underscore.ts, 275, 87))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 275, 16))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
@@ -2587,133 +2587,133 @@ module Underscore {
 >ChainedDictionary : Symbol(ChainedDictionary, Decl(underscoreTest1_underscore.ts, 327, 5))
 
         countBy(propertyName: string): ChainedDictionary<number>;
->countBy : Symbol(countBy, Decl(underscoreTest1_underscore.ts, 274, 64), Decl(underscoreTest1_underscore.ts, 275, 87))
+>countBy : Symbol(ChainedArray.countBy, Decl(underscoreTest1_underscore.ts, 274, 64), Decl(underscoreTest1_underscore.ts, 275, 87))
 >propertyName : Symbol(propertyName, Decl(underscoreTest1_underscore.ts, 276, 16))
 >ChainedDictionary : Symbol(ChainedDictionary, Decl(underscoreTest1_underscore.ts, 327, 5))
 
         shuffle(): ChainedArray<T>;
->shuffle : Symbol(shuffle, Decl(underscoreTest1_underscore.ts, 276, 65))
+>shuffle : Symbol(ChainedArray.shuffle, Decl(underscoreTest1_underscore.ts, 276, 65))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         toArray(): ChainedArray<T>;
->toArray : Symbol(toArray, Decl(underscoreTest1_underscore.ts, 277, 35))
+>toArray : Symbol(ChainedArray.toArray, Decl(underscoreTest1_underscore.ts, 277, 35))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         size(): ChainedObject<number>;
->size : Symbol(size, Decl(underscoreTest1_underscore.ts, 278, 35))
+>size : Symbol(ChainedArray.size, Decl(underscoreTest1_underscore.ts, 278, 35))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         first(): ChainedObject<T>;
->first : Symbol(first, Decl(underscoreTest1_underscore.ts, 279, 38), Decl(underscoreTest1_underscore.ts, 280, 34))
+>first : Symbol(ChainedArray.first, Decl(underscoreTest1_underscore.ts, 279, 38), Decl(underscoreTest1_underscore.ts, 280, 34))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         first(count: number): ChainedArray<T>;
->first : Symbol(first, Decl(underscoreTest1_underscore.ts, 279, 38), Decl(underscoreTest1_underscore.ts, 280, 34))
+>first : Symbol(ChainedArray.first, Decl(underscoreTest1_underscore.ts, 279, 38), Decl(underscoreTest1_underscore.ts, 280, 34))
 >count : Symbol(count, Decl(underscoreTest1_underscore.ts, 281, 14))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         head(): ChainedObject<T>;
->head : Symbol(head, Decl(underscoreTest1_underscore.ts, 281, 46), Decl(underscoreTest1_underscore.ts, 282, 33))
+>head : Symbol(ChainedArray.head, Decl(underscoreTest1_underscore.ts, 281, 46), Decl(underscoreTest1_underscore.ts, 282, 33))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         head(count: number): ChainedArray<T>;
->head : Symbol(head, Decl(underscoreTest1_underscore.ts, 281, 46), Decl(underscoreTest1_underscore.ts, 282, 33))
+>head : Symbol(ChainedArray.head, Decl(underscoreTest1_underscore.ts, 281, 46), Decl(underscoreTest1_underscore.ts, 282, 33))
 >count : Symbol(count, Decl(underscoreTest1_underscore.ts, 283, 13))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         take(): ChainedObject<T>;
->take : Symbol(take, Decl(underscoreTest1_underscore.ts, 283, 45), Decl(underscoreTest1_underscore.ts, 284, 33))
+>take : Symbol(ChainedArray.take, Decl(underscoreTest1_underscore.ts, 283, 45), Decl(underscoreTest1_underscore.ts, 284, 33))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         take(count: number): ChainedArray<T>;
->take : Symbol(take, Decl(underscoreTest1_underscore.ts, 283, 45), Decl(underscoreTest1_underscore.ts, 284, 33))
+>take : Symbol(ChainedArray.take, Decl(underscoreTest1_underscore.ts, 283, 45), Decl(underscoreTest1_underscore.ts, 284, 33))
 >count : Symbol(count, Decl(underscoreTest1_underscore.ts, 285, 13))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         initial(): ChainedObject<T>;
->initial : Symbol(initial, Decl(underscoreTest1_underscore.ts, 285, 45), Decl(underscoreTest1_underscore.ts, 286, 36))
+>initial : Symbol(ChainedArray.initial, Decl(underscoreTest1_underscore.ts, 285, 45), Decl(underscoreTest1_underscore.ts, 286, 36))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         initial(count: number): ChainedArray<T>;
->initial : Symbol(initial, Decl(underscoreTest1_underscore.ts, 285, 45), Decl(underscoreTest1_underscore.ts, 286, 36))
+>initial : Symbol(ChainedArray.initial, Decl(underscoreTest1_underscore.ts, 285, 45), Decl(underscoreTest1_underscore.ts, 286, 36))
 >count : Symbol(count, Decl(underscoreTest1_underscore.ts, 287, 16))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         last(): ChainedObject<T>;
->last : Symbol(last, Decl(underscoreTest1_underscore.ts, 287, 48), Decl(underscoreTest1_underscore.ts, 288, 33))
+>last : Symbol(ChainedArray.last, Decl(underscoreTest1_underscore.ts, 287, 48), Decl(underscoreTest1_underscore.ts, 288, 33))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         last(count: number): ChainedArray<T>;
->last : Symbol(last, Decl(underscoreTest1_underscore.ts, 287, 48), Decl(underscoreTest1_underscore.ts, 288, 33))
+>last : Symbol(ChainedArray.last, Decl(underscoreTest1_underscore.ts, 287, 48), Decl(underscoreTest1_underscore.ts, 288, 33))
 >count : Symbol(count, Decl(underscoreTest1_underscore.ts, 289, 13))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         rest(index?: number): ChainedArray<T>;
->rest : Symbol(rest, Decl(underscoreTest1_underscore.ts, 289, 45))
+>rest : Symbol(ChainedArray.rest, Decl(underscoreTest1_underscore.ts, 289, 45))
 >index : Symbol(index, Decl(underscoreTest1_underscore.ts, 290, 13))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         compact(): ChainedArray<T>;
->compact : Symbol(compact, Decl(underscoreTest1_underscore.ts, 290, 46))
+>compact : Symbol(ChainedArray.compact, Decl(underscoreTest1_underscore.ts, 290, 46))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         flatten<U>(shallow?: boolean): ChainedArray<U>;
->flatten : Symbol(flatten, Decl(underscoreTest1_underscore.ts, 291, 35))
+>flatten : Symbol(ChainedArray.flatten, Decl(underscoreTest1_underscore.ts, 291, 35))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 292, 16))
 >shallow : Symbol(shallow, Decl(underscoreTest1_underscore.ts, 292, 19))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 292, 16))
 
         without(...values: T[]): ChainedArray<T>;
->without : Symbol(without, Decl(underscoreTest1_underscore.ts, 292, 55))
+>without : Symbol(ChainedArray.without, Decl(underscoreTest1_underscore.ts, 292, 55))
 >values : Symbol(values, Decl(underscoreTest1_underscore.ts, 293, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         union(...arrays: T[][]): ChainedArray<T>;
->union : Symbol(union, Decl(underscoreTest1_underscore.ts, 293, 49))
+>union : Symbol(ChainedArray.union, Decl(underscoreTest1_underscore.ts, 293, 49))
 >arrays : Symbol(arrays, Decl(underscoreTest1_underscore.ts, 294, 14))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         intersection(...arrays: T[][]): ChainedArray<T>;
->intersection : Symbol(intersection, Decl(underscoreTest1_underscore.ts, 294, 49))
+>intersection : Symbol(ChainedArray.intersection, Decl(underscoreTest1_underscore.ts, 294, 49))
 >arrays : Symbol(arrays, Decl(underscoreTest1_underscore.ts, 295, 21))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         difference(...others: T[][]): ChainedArray<T>;
->difference : Symbol(difference, Decl(underscoreTest1_underscore.ts, 295, 56))
+>difference : Symbol(ChainedArray.difference, Decl(underscoreTest1_underscore.ts, 295, 56))
 >others : Symbol(others, Decl(underscoreTest1_underscore.ts, 296, 19))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         uniq(isSorted?: boolean): ChainedArray<T>;
->uniq : Symbol(uniq, Decl(underscoreTest1_underscore.ts, 296, 54), Decl(underscoreTest1_underscore.ts, 297, 50))
+>uniq : Symbol(ChainedArray.uniq, Decl(underscoreTest1_underscore.ts, 296, 54), Decl(underscoreTest1_underscore.ts, 297, 50))
 >isSorted : Symbol(isSorted, Decl(underscoreTest1_underscore.ts, 297, 13))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         uniq<U>(isSorted: boolean, iterator: Iterator<T, U>, context?: any): ChainedArray<U>;
->uniq : Symbol(uniq, Decl(underscoreTest1_underscore.ts, 296, 54), Decl(underscoreTest1_underscore.ts, 297, 50))
+>uniq : Symbol(ChainedArray.uniq, Decl(underscoreTest1_underscore.ts, 296, 54), Decl(underscoreTest1_underscore.ts, 297, 50))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 298, 13))
 >isSorted : Symbol(isSorted, Decl(underscoreTest1_underscore.ts, 298, 16))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 298, 34))
@@ -2725,13 +2725,13 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 298, 13))
 
         unique(isSorted?: boolean): ChainedArray<T>;
->unique : Symbol(unique, Decl(underscoreTest1_underscore.ts, 298, 93), Decl(underscoreTest1_underscore.ts, 299, 52))
+>unique : Symbol(ChainedArray.unique, Decl(underscoreTest1_underscore.ts, 298, 93), Decl(underscoreTest1_underscore.ts, 299, 52))
 >isSorted : Symbol(isSorted, Decl(underscoreTest1_underscore.ts, 299, 15))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         unique<U>(isSorted: boolean, iterator: Iterator<T, U>, context?: any): ChainedArray<U>;
->unique : Symbol(unique, Decl(underscoreTest1_underscore.ts, 298, 93), Decl(underscoreTest1_underscore.ts, 299, 52))
+>unique : Symbol(ChainedArray.unique, Decl(underscoreTest1_underscore.ts, 298, 93), Decl(underscoreTest1_underscore.ts, 299, 52))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 300, 15))
 >isSorted : Symbol(isSorted, Decl(underscoreTest1_underscore.ts, 300, 18))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 300, 36))
@@ -2743,42 +2743,42 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 300, 15))
 
         zip(...arrays: any[][]): ChainedArray<any[]>;
->zip : Symbol(zip, Decl(underscoreTest1_underscore.ts, 300, 95))
+>zip : Symbol(ChainedArray.zip, Decl(underscoreTest1_underscore.ts, 300, 95))
 >arrays : Symbol(arrays, Decl(underscoreTest1_underscore.ts, 301, 12))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 
         object(): ChainedObject<any>;
->object : Symbol(object, Decl(underscoreTest1_underscore.ts, 301, 53), Decl(underscoreTest1_underscore.ts, 302, 37))
+>object : Symbol(ChainedArray.object, Decl(underscoreTest1_underscore.ts, 301, 53), Decl(underscoreTest1_underscore.ts, 302, 37))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         object(values: any[]): ChainedObject<any>;
->object : Symbol(object, Decl(underscoreTest1_underscore.ts, 301, 53), Decl(underscoreTest1_underscore.ts, 302, 37))
+>object : Symbol(ChainedArray.object, Decl(underscoreTest1_underscore.ts, 301, 53), Decl(underscoreTest1_underscore.ts, 302, 37))
 >values : Symbol(values, Decl(underscoreTest1_underscore.ts, 303, 15))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         indexOf(value: T, isSorted?: boolean): ChainedObject<number>;
->indexOf : Symbol(indexOf, Decl(underscoreTest1_underscore.ts, 303, 50))
+>indexOf : Symbol(ChainedArray.indexOf, Decl(underscoreTest1_underscore.ts, 303, 50))
 >value : Symbol(value, Decl(underscoreTest1_underscore.ts, 304, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 >isSorted : Symbol(isSorted, Decl(underscoreTest1_underscore.ts, 304, 25))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         lastIndexOf(value: T, fromIndex?: number): ChainedObject<number>;
->lastIndexOf : Symbol(lastIndexOf, Decl(underscoreTest1_underscore.ts, 304, 69))
+>lastIndexOf : Symbol(ChainedArray.lastIndexOf, Decl(underscoreTest1_underscore.ts, 304, 69))
 >value : Symbol(value, Decl(underscoreTest1_underscore.ts, 305, 20))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 >fromIndex : Symbol(fromIndex, Decl(underscoreTest1_underscore.ts, 305, 29))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         sortedIndex(obj: T, propertyName: string): ChainedObject<number>;
->sortedIndex : Symbol(sortedIndex, Decl(underscoreTest1_underscore.ts, 305, 73), Decl(underscoreTest1_underscore.ts, 306, 73))
+>sortedIndex : Symbol(ChainedArray.sortedIndex, Decl(underscoreTest1_underscore.ts, 305, 73), Decl(underscoreTest1_underscore.ts, 306, 73))
 >obj : Symbol(obj, Decl(underscoreTest1_underscore.ts, 306, 20))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 >propertyName : Symbol(propertyName, Decl(underscoreTest1_underscore.ts, 306, 27))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         sortedIndex(obj: T, iterator?: Iterator<T, any>, context?: any): ChainedObject<number>;
->sortedIndex : Symbol(sortedIndex, Decl(underscoreTest1_underscore.ts, 305, 73), Decl(underscoreTest1_underscore.ts, 306, 73))
+>sortedIndex : Symbol(ChainedArray.sortedIndex, Decl(underscoreTest1_underscore.ts, 305, 73), Decl(underscoreTest1_underscore.ts, 306, 73))
 >obj : Symbol(obj, Decl(underscoreTest1_underscore.ts, 307, 20))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 307, 27))
@@ -2789,47 +2789,47 @@ module Underscore {
 
         // Methods from Array
         concat(...items: T[]): ChainedArray<T>;
->concat : Symbol(concat, Decl(underscoreTest1_underscore.ts, 307, 95))
+>concat : Symbol(ChainedArray.concat, Decl(underscoreTest1_underscore.ts, 307, 95))
 >items : Symbol(items, Decl(underscoreTest1_underscore.ts, 309, 15))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         join(separator?: string): ChainedObject<string>;
->join : Symbol(join, Decl(underscoreTest1_underscore.ts, 309, 47))
+>join : Symbol(ChainedArray.join, Decl(underscoreTest1_underscore.ts, 309, 47))
 >separator : Symbol(separator, Decl(underscoreTest1_underscore.ts, 310, 13))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         pop(): ChainedObject<T>;
->pop : Symbol(pop, Decl(underscoreTest1_underscore.ts, 310, 56))
+>pop : Symbol(ChainedArray.pop, Decl(underscoreTest1_underscore.ts, 310, 56))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         push(...items: T[]): ChainedObject<number>;
->push : Symbol(push, Decl(underscoreTest1_underscore.ts, 311, 32))
+>push : Symbol(ChainedArray.push, Decl(underscoreTest1_underscore.ts, 311, 32))
 >items : Symbol(items, Decl(underscoreTest1_underscore.ts, 312, 13))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         reverse(): ChainedArray<T>;
->reverse : Symbol(reverse, Decl(underscoreTest1_underscore.ts, 312, 51))
+>reverse : Symbol(ChainedArray.reverse, Decl(underscoreTest1_underscore.ts, 312, 51))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         shift(): ChainedObject<T>;
->shift : Symbol(shift, Decl(underscoreTest1_underscore.ts, 313, 35))
+>shift : Symbol(ChainedArray.shift, Decl(underscoreTest1_underscore.ts, 313, 35))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         slice(start: number, end?: number): ChainedArray<T>;
->slice : Symbol(slice, Decl(underscoreTest1_underscore.ts, 314, 34))
+>slice : Symbol(ChainedArray.slice, Decl(underscoreTest1_underscore.ts, 314, 34))
 >start : Symbol(start, Decl(underscoreTest1_underscore.ts, 315, 14))
 >end : Symbol(end, Decl(underscoreTest1_underscore.ts, 315, 28))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         sort(compareFn?: (a: T, b: T) => number): ChainedArray<T>;
->sort : Symbol(sort, Decl(underscoreTest1_underscore.ts, 315, 60))
+>sort : Symbol(ChainedArray.sort, Decl(underscoreTest1_underscore.ts, 315, 60))
 >compareFn : Symbol(compareFn, Decl(underscoreTest1_underscore.ts, 316, 13))
 >a : Symbol(a, Decl(underscoreTest1_underscore.ts, 316, 26))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
@@ -2839,13 +2839,13 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         splice(start: number): ChainedArray<T>;
->splice : Symbol(splice, Decl(underscoreTest1_underscore.ts, 316, 66), Decl(underscoreTest1_underscore.ts, 317, 47))
+>splice : Symbol(ChainedArray.splice, Decl(underscoreTest1_underscore.ts, 316, 66), Decl(underscoreTest1_underscore.ts, 317, 47))
 >start : Symbol(start, Decl(underscoreTest1_underscore.ts, 317, 15))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         splice(start: number, deleteCount: number, ...items: T[]): ChainedArray<T>;
->splice : Symbol(splice, Decl(underscoreTest1_underscore.ts, 316, 66), Decl(underscoreTest1_underscore.ts, 317, 47))
+>splice : Symbol(ChainedArray.splice, Decl(underscoreTest1_underscore.ts, 316, 66), Decl(underscoreTest1_underscore.ts, 317, 47))
 >start : Symbol(start, Decl(underscoreTest1_underscore.ts, 318, 15))
 >deleteCount : Symbol(deleteCount, Decl(underscoreTest1_underscore.ts, 318, 29))
 >items : Symbol(items, Decl(underscoreTest1_underscore.ts, 318, 50))
@@ -2854,43 +2854,43 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         unshift(...items: T[]): ChainedObject<number>;
->unshift : Symbol(unshift, Decl(underscoreTest1_underscore.ts, 318, 83))
+>unshift : Symbol(ChainedArray.unshift, Decl(underscoreTest1_underscore.ts, 318, 83))
 >items : Symbol(items, Decl(underscoreTest1_underscore.ts, 319, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         // Methods from ChainedObject with promoted return types
         extend(...sources: any[]): ChainedArray<T>;
->extend : Symbol(extend, Decl(underscoreTest1_underscore.ts, 319, 54))
+>extend : Symbol(ChainedArray.extend, Decl(underscoreTest1_underscore.ts, 319, 54))
 >sources : Symbol(sources, Decl(underscoreTest1_underscore.ts, 321, 15))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         pick(...keys: string[]): ChainedArray<T>;
->pick : Symbol(pick, Decl(underscoreTest1_underscore.ts, 321, 51))
+>pick : Symbol(ChainedArray.pick, Decl(underscoreTest1_underscore.ts, 321, 51))
 >keys : Symbol(keys, Decl(underscoreTest1_underscore.ts, 322, 13))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         omit(...keys: string[]): ChainedArray<T>;
->omit : Symbol(omit, Decl(underscoreTest1_underscore.ts, 322, 49))
+>omit : Symbol(ChainedArray.omit, Decl(underscoreTest1_underscore.ts, 322, 49))
 >keys : Symbol(keys, Decl(underscoreTest1_underscore.ts, 323, 13))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         defaults(...defaults: any[]): ChainedArray<T>;
->defaults : Symbol(defaults, Decl(underscoreTest1_underscore.ts, 323, 49))
+>defaults : Symbol(ChainedArray.defaults, Decl(underscoreTest1_underscore.ts, 323, 49))
 >defaults : Symbol(defaults, Decl(underscoreTest1_underscore.ts, 324, 17))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         clone(): ChainedArray<T>;
->clone : Symbol(clone, Decl(underscoreTest1_underscore.ts, 324, 54))
+>clone : Symbol(ChainedArray.clone, Decl(underscoreTest1_underscore.ts, 324, 54))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
 
         tap(interceptor: (object: T[]) => void): ChainedArray<T>;
->tap : Symbol(tap, Decl(underscoreTest1_underscore.ts, 325, 33))
+>tap : Symbol(ChainedArray.tap, Decl(underscoreTest1_underscore.ts, 325, 33))
 >interceptor : Symbol(interceptor, Decl(underscoreTest1_underscore.ts, 326, 12))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 326, 26))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 238, 34))
@@ -2906,7 +2906,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 
         each(iterator: Iterator<T, void>, context?: any): ChainedObject<void>;
->each : Symbol(each, Decl(underscoreTest1_underscore.ts, 329, 80))
+>each : Symbol(ChainedDictionary.each, Decl(underscoreTest1_underscore.ts, 329, 80))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 330, 13))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
@@ -2914,7 +2914,7 @@ module Underscore {
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         forEach(iterator: Iterator<T, void>, context?: any): ChainedObject<void>;
->forEach : Symbol(forEach, Decl(underscoreTest1_underscore.ts, 330, 78))
+>forEach : Symbol(ChainedDictionary.forEach, Decl(underscoreTest1_underscore.ts, 330, 78))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 331, 16))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
@@ -2922,7 +2922,7 @@ module Underscore {
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         map<U>(iterator: Iterator<T, U>, context?: any): ChainedArray<U>;
->map : Symbol(map, Decl(underscoreTest1_underscore.ts, 331, 81))
+>map : Symbol(ChainedDictionary.map, Decl(underscoreTest1_underscore.ts, 331, 81))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 332, 12))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 332, 15))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
@@ -2933,7 +2933,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 332, 12))
 
         collect<U>(iterator: Iterator<T, U>, context?: any): ChainedArray<U>;
->collect : Symbol(collect, Decl(underscoreTest1_underscore.ts, 332, 73))
+>collect : Symbol(ChainedDictionary.collect, Decl(underscoreTest1_underscore.ts, 332, 73))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 333, 16))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 333, 19))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
@@ -2944,7 +2944,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 333, 16))
 
         reduce(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
->reduce : Symbol(reduce, Decl(underscoreTest1_underscore.ts, 333, 77), Decl(underscoreTest1_underscore.ts, 334, 91))
+>reduce : Symbol(ChainedDictionary.reduce, Decl(underscoreTest1_underscore.ts, 333, 77), Decl(underscoreTest1_underscore.ts, 334, 91))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 334, 15))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
@@ -2956,7 +2956,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 
         reduce<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
->reduce : Symbol(reduce, Decl(underscoreTest1_underscore.ts, 333, 77), Decl(underscoreTest1_underscore.ts, 334, 91))
+>reduce : Symbol(ChainedDictionary.reduce, Decl(underscoreTest1_underscore.ts, 333, 77), Decl(underscoreTest1_underscore.ts, 334, 91))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 335, 15))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 335, 18))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
@@ -2969,7 +2969,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 335, 15))
 
         foldl(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
->foldl : Symbol(foldl, Decl(underscoreTest1_underscore.ts, 335, 93), Decl(underscoreTest1_underscore.ts, 336, 90))
+>foldl : Symbol(ChainedDictionary.foldl, Decl(underscoreTest1_underscore.ts, 335, 93), Decl(underscoreTest1_underscore.ts, 336, 90))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 336, 14))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
@@ -2981,7 +2981,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 
         foldl<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
->foldl : Symbol(foldl, Decl(underscoreTest1_underscore.ts, 335, 93), Decl(underscoreTest1_underscore.ts, 336, 90))
+>foldl : Symbol(ChainedDictionary.foldl, Decl(underscoreTest1_underscore.ts, 335, 93), Decl(underscoreTest1_underscore.ts, 336, 90))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 337, 14))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 337, 17))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
@@ -2994,7 +2994,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 337, 14))
 
         inject(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
->inject : Symbol(inject, Decl(underscoreTest1_underscore.ts, 337, 92), Decl(underscoreTest1_underscore.ts, 338, 91))
+>inject : Symbol(ChainedDictionary.inject, Decl(underscoreTest1_underscore.ts, 337, 92), Decl(underscoreTest1_underscore.ts, 338, 91))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 338, 15))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
@@ -3006,7 +3006,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 
         inject<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
->inject : Symbol(inject, Decl(underscoreTest1_underscore.ts, 337, 92), Decl(underscoreTest1_underscore.ts, 338, 91))
+>inject : Symbol(ChainedDictionary.inject, Decl(underscoreTest1_underscore.ts, 337, 92), Decl(underscoreTest1_underscore.ts, 338, 91))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 339, 15))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 339, 18))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
@@ -3019,7 +3019,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 339, 15))
 
         reduceRight(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
->reduceRight : Symbol(reduceRight, Decl(underscoreTest1_underscore.ts, 339, 93), Decl(underscoreTest1_underscore.ts, 340, 96))
+>reduceRight : Symbol(ChainedDictionary.reduceRight, Decl(underscoreTest1_underscore.ts, 339, 93), Decl(underscoreTest1_underscore.ts, 340, 96))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 340, 20))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
@@ -3031,7 +3031,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 
         reduceRight<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
->reduceRight : Symbol(reduceRight, Decl(underscoreTest1_underscore.ts, 339, 93), Decl(underscoreTest1_underscore.ts, 340, 96))
+>reduceRight : Symbol(ChainedDictionary.reduceRight, Decl(underscoreTest1_underscore.ts, 339, 93), Decl(underscoreTest1_underscore.ts, 340, 96))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 341, 20))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 341, 23))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
@@ -3044,7 +3044,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 341, 20))
 
         foldr(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
->foldr : Symbol(foldr, Decl(underscoreTest1_underscore.ts, 341, 98), Decl(underscoreTest1_underscore.ts, 342, 90))
+>foldr : Symbol(ChainedDictionary.foldr, Decl(underscoreTest1_underscore.ts, 341, 98), Decl(underscoreTest1_underscore.ts, 342, 90))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 342, 14))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
@@ -3056,7 +3056,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 
         foldr<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
->foldr : Symbol(foldr, Decl(underscoreTest1_underscore.ts, 341, 98), Decl(underscoreTest1_underscore.ts, 342, 90))
+>foldr : Symbol(ChainedDictionary.foldr, Decl(underscoreTest1_underscore.ts, 341, 98), Decl(underscoreTest1_underscore.ts, 342, 90))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 343, 14))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 343, 17))
 >Reducer : Symbol(Reducer, Decl(underscoreTest1_underscore.ts, 6, 1))
@@ -3069,7 +3069,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 343, 14))
 
         find(iterator: Iterator<T, boolean>, context?: any): ChainedObject<T>;
->find : Symbol(find, Decl(underscoreTest1_underscore.ts, 343, 92))
+>find : Symbol(ChainedDictionary.find, Decl(underscoreTest1_underscore.ts, 343, 92))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 344, 13))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
@@ -3078,7 +3078,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 
         detect(iterator: Iterator<T, boolean>, context?: any): ChainedObject<T>;
->detect : Symbol(detect, Decl(underscoreTest1_underscore.ts, 344, 78))
+>detect : Symbol(ChainedDictionary.detect, Decl(underscoreTest1_underscore.ts, 344, 78))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 345, 15))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
@@ -3087,7 +3087,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 
         filter(iterator: Iterator<T, boolean>, context?: any): ChainedArray<T>;
->filter : Symbol(filter, Decl(underscoreTest1_underscore.ts, 345, 80))
+>filter : Symbol(ChainedDictionary.filter, Decl(underscoreTest1_underscore.ts, 345, 80))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 346, 15))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
@@ -3096,7 +3096,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 
         select(iterator: Iterator<T, boolean>, context?: any): ChainedArray<T>;
->select : Symbol(select, Decl(underscoreTest1_underscore.ts, 346, 79))
+>select : Symbol(ChainedDictionary.select, Decl(underscoreTest1_underscore.ts, 346, 79))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 347, 15))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
@@ -3105,21 +3105,21 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 
         where(properties: Object): ChainedArray<T>;
->where : Symbol(where, Decl(underscoreTest1_underscore.ts, 347, 79))
+>where : Symbol(ChainedDictionary.where, Decl(underscoreTest1_underscore.ts, 347, 79))
 >properties : Symbol(properties, Decl(underscoreTest1_underscore.ts, 348, 14))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 
         findWhere(properties: Object): ChainedObject<T>;
->findWhere : Symbol(findWhere, Decl(underscoreTest1_underscore.ts, 348, 51))
+>findWhere : Symbol(ChainedDictionary.findWhere, Decl(underscoreTest1_underscore.ts, 348, 51))
 >properties : Symbol(properties, Decl(underscoreTest1_underscore.ts, 349, 18))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 
         reject(iterator: Iterator<T, boolean>, context?: any): ChainedArray<T>;
->reject : Symbol(reject, Decl(underscoreTest1_underscore.ts, 349, 56))
+>reject : Symbol(ChainedDictionary.reject, Decl(underscoreTest1_underscore.ts, 349, 56))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 350, 15))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
@@ -3128,7 +3128,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 
         every(iterator?: Iterator<T, boolean>, context?: any): ChainedObject<boolean>;
->every : Symbol(every, Decl(underscoreTest1_underscore.ts, 350, 79))
+>every : Symbol(ChainedDictionary.every, Decl(underscoreTest1_underscore.ts, 350, 79))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 351, 14))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
@@ -3136,7 +3136,7 @@ module Underscore {
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         all(iterator?: Iterator<T, boolean>, context?: any): ChainedObject<boolean>;
->all : Symbol(all, Decl(underscoreTest1_underscore.ts, 351, 86))
+>all : Symbol(ChainedDictionary.all, Decl(underscoreTest1_underscore.ts, 351, 86))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 352, 12))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
@@ -3144,7 +3144,7 @@ module Underscore {
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         some(iterator?: Iterator<T, boolean>, context?: any): ChainedObject<boolean>;
->some : Symbol(some, Decl(underscoreTest1_underscore.ts, 352, 84))
+>some : Symbol(ChainedDictionary.some, Decl(underscoreTest1_underscore.ts, 352, 84))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 353, 13))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
@@ -3152,7 +3152,7 @@ module Underscore {
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         any(iterator?: Iterator<T, boolean>, context?: any): ChainedObject<boolean>;
->any : Symbol(any, Decl(underscoreTest1_underscore.ts, 353, 85))
+>any : Symbol(ChainedDictionary.any, Decl(underscoreTest1_underscore.ts, 353, 85))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 354, 12))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
@@ -3160,30 +3160,30 @@ module Underscore {
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         contains(value: T): ChainedObject<boolean>;
->contains : Symbol(contains, Decl(underscoreTest1_underscore.ts, 354, 84))
+>contains : Symbol(ChainedDictionary.contains, Decl(underscoreTest1_underscore.ts, 354, 84))
 >value : Symbol(value, Decl(underscoreTest1_underscore.ts, 355, 17))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         include(value: T): ChainedObject<boolean>;
->include : Symbol(include, Decl(underscoreTest1_underscore.ts, 355, 51))
+>include : Symbol(ChainedDictionary.include, Decl(underscoreTest1_underscore.ts, 355, 51))
 >value : Symbol(value, Decl(underscoreTest1_underscore.ts, 356, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         invoke(methodName: string, ...args: any[]): ChainedArray<any>;
->invoke : Symbol(invoke, Decl(underscoreTest1_underscore.ts, 356, 50))
+>invoke : Symbol(ChainedDictionary.invoke, Decl(underscoreTest1_underscore.ts, 356, 50))
 >methodName : Symbol(methodName, Decl(underscoreTest1_underscore.ts, 357, 15))
 >args : Symbol(args, Decl(underscoreTest1_underscore.ts, 357, 34))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 
         pluck(propertyName: string): ChainedArray<any>;
->pluck : Symbol(pluck, Decl(underscoreTest1_underscore.ts, 357, 70))
+>pluck : Symbol(ChainedDictionary.pluck, Decl(underscoreTest1_underscore.ts, 357, 70))
 >propertyName : Symbol(propertyName, Decl(underscoreTest1_underscore.ts, 358, 14))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 
         max(iterator?: Iterator<T, any>, context?: any): ChainedObject<T>;
->max : Symbol(max, Decl(underscoreTest1_underscore.ts, 358, 55))
+>max : Symbol(ChainedDictionary.max, Decl(underscoreTest1_underscore.ts, 358, 55))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 359, 12))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
@@ -3192,7 +3192,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 
         min(iterator?: Iterator<T, any>, context?: any): ChainedObject<T>;
->min : Symbol(min, Decl(underscoreTest1_underscore.ts, 359, 74))
+>min : Symbol(ChainedDictionary.min, Decl(underscoreTest1_underscore.ts, 359, 74))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 360, 12))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
@@ -3201,7 +3201,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 
         sortBy(iterator: Iterator<T, any>, context?: any): ChainedArray<T>;
->sortBy : Symbol(sortBy, Decl(underscoreTest1_underscore.ts, 360, 74), Decl(underscoreTest1_underscore.ts, 361, 75))
+>sortBy : Symbol(ChainedDictionary.sortBy, Decl(underscoreTest1_underscore.ts, 360, 74), Decl(underscoreTest1_underscore.ts, 361, 75))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 361, 15))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
@@ -3210,14 +3210,14 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 
         sortBy(propertyName: string): ChainedArray<T>;
->sortBy : Symbol(sortBy, Decl(underscoreTest1_underscore.ts, 360, 74), Decl(underscoreTest1_underscore.ts, 361, 75))
+>sortBy : Symbol(ChainedDictionary.sortBy, Decl(underscoreTest1_underscore.ts, 360, 74), Decl(underscoreTest1_underscore.ts, 361, 75))
 >propertyName : Symbol(propertyName, Decl(underscoreTest1_underscore.ts, 362, 15))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 
         // Should return ChainedDictionary<T[]>, but expansive recursion not allowed
         groupBy(iterator?: Iterator<T, any>, context?: any): ChainedDictionary<any[]>;
->groupBy : Symbol(groupBy, Decl(underscoreTest1_underscore.ts, 362, 54), Decl(underscoreTest1_underscore.ts, 364, 86))
+>groupBy : Symbol(ChainedDictionary.groupBy, Decl(underscoreTest1_underscore.ts, 362, 54), Decl(underscoreTest1_underscore.ts, 364, 86))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 364, 16))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
@@ -3225,12 +3225,12 @@ module Underscore {
 >ChainedDictionary : Symbol(ChainedDictionary, Decl(underscoreTest1_underscore.ts, 327, 5))
 
         groupBy(propertyName: string): ChainedDictionary<any[]>;
->groupBy : Symbol(groupBy, Decl(underscoreTest1_underscore.ts, 362, 54), Decl(underscoreTest1_underscore.ts, 364, 86))
+>groupBy : Symbol(ChainedDictionary.groupBy, Decl(underscoreTest1_underscore.ts, 362, 54), Decl(underscoreTest1_underscore.ts, 364, 86))
 >propertyName : Symbol(propertyName, Decl(underscoreTest1_underscore.ts, 365, 16))
 >ChainedDictionary : Symbol(ChainedDictionary, Decl(underscoreTest1_underscore.ts, 327, 5))
 
         countBy(iterator?: Iterator<T, any>, context?: any): ChainedDictionary<number>;
->countBy : Symbol(countBy, Decl(underscoreTest1_underscore.ts, 365, 64), Decl(underscoreTest1_underscore.ts, 366, 87))
+>countBy : Symbol(ChainedDictionary.countBy, Decl(underscoreTest1_underscore.ts, 365, 64), Decl(underscoreTest1_underscore.ts, 366, 87))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 366, 16))
 >Iterator : Symbol(Iterator, Decl(underscoreTest1_underscore.ts, 2, 1))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
@@ -3238,56 +3238,56 @@ module Underscore {
 >ChainedDictionary : Symbol(ChainedDictionary, Decl(underscoreTest1_underscore.ts, 327, 5))
 
         countBy(propertyName: string): ChainedDictionary<number>;
->countBy : Symbol(countBy, Decl(underscoreTest1_underscore.ts, 365, 64), Decl(underscoreTest1_underscore.ts, 366, 87))
+>countBy : Symbol(ChainedDictionary.countBy, Decl(underscoreTest1_underscore.ts, 365, 64), Decl(underscoreTest1_underscore.ts, 366, 87))
 >propertyName : Symbol(propertyName, Decl(underscoreTest1_underscore.ts, 367, 16))
 >ChainedDictionary : Symbol(ChainedDictionary, Decl(underscoreTest1_underscore.ts, 327, 5))
 
         shuffle(): ChainedArray<T>;
->shuffle : Symbol(shuffle, Decl(underscoreTest1_underscore.ts, 367, 65))
+>shuffle : Symbol(ChainedDictionary.shuffle, Decl(underscoreTest1_underscore.ts, 367, 65))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 
         toArray(): ChainedArray<T>;
->toArray : Symbol(toArray, Decl(underscoreTest1_underscore.ts, 368, 35))
+>toArray : Symbol(ChainedDictionary.toArray, Decl(underscoreTest1_underscore.ts, 368, 35))
 >ChainedArray : Symbol(ChainedArray, Decl(underscoreTest1_underscore.ts, 236, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 
         size(): ChainedObject<number>;
->size : Symbol(size, Decl(underscoreTest1_underscore.ts, 369, 35))
+>size : Symbol(ChainedDictionary.size, Decl(underscoreTest1_underscore.ts, 369, 35))
 >ChainedObject : Symbol(ChainedObject, Decl(underscoreTest1_underscore.ts, 203, 5))
 
         // Methods from ChainedObject with promoted return types
         extend(...sources: any[]): ChainedDictionary<T>;
->extend : Symbol(extend, Decl(underscoreTest1_underscore.ts, 370, 38))
+>extend : Symbol(ChainedDictionary.extend, Decl(underscoreTest1_underscore.ts, 370, 38))
 >sources : Symbol(sources, Decl(underscoreTest1_underscore.ts, 372, 15))
 >ChainedDictionary : Symbol(ChainedDictionary, Decl(underscoreTest1_underscore.ts, 327, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 
         pick(...keys: string[]): ChainedDictionary<T>;
->pick : Symbol(pick, Decl(underscoreTest1_underscore.ts, 372, 56))
+>pick : Symbol(ChainedDictionary.pick, Decl(underscoreTest1_underscore.ts, 372, 56))
 >keys : Symbol(keys, Decl(underscoreTest1_underscore.ts, 373, 13))
 >ChainedDictionary : Symbol(ChainedDictionary, Decl(underscoreTest1_underscore.ts, 327, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 
         omit(...keys: string[]): ChainedDictionary<T>;
->omit : Symbol(omit, Decl(underscoreTest1_underscore.ts, 373, 54))
+>omit : Symbol(ChainedDictionary.omit, Decl(underscoreTest1_underscore.ts, 373, 54))
 >keys : Symbol(keys, Decl(underscoreTest1_underscore.ts, 374, 13))
 >ChainedDictionary : Symbol(ChainedDictionary, Decl(underscoreTest1_underscore.ts, 327, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 
         defaults(...defaults: any[]): ChainedDictionary<T>;
->defaults : Symbol(defaults, Decl(underscoreTest1_underscore.ts, 374, 54))
+>defaults : Symbol(ChainedDictionary.defaults, Decl(underscoreTest1_underscore.ts, 374, 54))
 >defaults : Symbol(defaults, Decl(underscoreTest1_underscore.ts, 375, 17))
 >ChainedDictionary : Symbol(ChainedDictionary, Decl(underscoreTest1_underscore.ts, 327, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 
         clone(): ChainedDictionary<T>;
->clone : Symbol(clone, Decl(underscoreTest1_underscore.ts, 375, 59))
+>clone : Symbol(ChainedDictionary.clone, Decl(underscoreTest1_underscore.ts, 375, 59))
 >ChainedDictionary : Symbol(ChainedDictionary, Decl(underscoreTest1_underscore.ts, 327, 5))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 329, 39))
 
         tap(interceptor: (object: Dictionary<T>) => void): ChainedDictionary<T>;
->tap : Symbol(tap, Decl(underscoreTest1_underscore.ts, 376, 38))
+>tap : Symbol(ChainedDictionary.tap, Decl(underscoreTest1_underscore.ts, 376, 38))
 >interceptor : Symbol(interceptor, Decl(underscoreTest1_underscore.ts, 377, 12))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 377, 26))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -3300,19 +3300,19 @@ module Underscore {
 >TemplateSettings : Symbol(TemplateSettings, Decl(underscoreTest1_underscore.ts, 378, 5))
 
         evaluate?: RegExp;
->evaluate : Symbol(evaluate, Decl(underscoreTest1_underscore.ts, 380, 39))
+>evaluate : Symbol(TemplateSettings.evaluate, Decl(underscoreTest1_underscore.ts, 380, 39))
 >RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
         interpolate?: RegExp;
->interpolate : Symbol(interpolate, Decl(underscoreTest1_underscore.ts, 381, 26))
+>interpolate : Symbol(TemplateSettings.interpolate, Decl(underscoreTest1_underscore.ts, 381, 26))
 >RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
         escape?: RegExp;
->escape : Symbol(escape, Decl(underscoreTest1_underscore.ts, 382, 29))
+>escape : Symbol(TemplateSettings.escape, Decl(underscoreTest1_underscore.ts, 382, 29))
 >RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
         variable?: string;
->variable : Symbol(variable, Decl(underscoreTest1_underscore.ts, 383, 24))
+>variable : Symbol(TemplateSettings.variable, Decl(underscoreTest1_underscore.ts, 383, 24))
     }
 
     export interface Static {
@@ -3349,7 +3349,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 391, 9))
 
         chain<T>(list: T[]): ChainedArray<T>;
->chain : Symbol(chain, Decl(underscoreTest1_underscore.ts, 391, 38), Decl(underscoreTest1_underscore.ts, 393, 45), Decl(underscoreTest1_underscore.ts, 394, 60))
+>chain : Symbol(Static.chain, Decl(underscoreTest1_underscore.ts, 391, 38), Decl(underscoreTest1_underscore.ts, 393, 45), Decl(underscoreTest1_underscore.ts, 394, 60))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 393, 14))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 393, 17))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 393, 14))
@@ -3357,7 +3357,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 393, 14))
 
         chain<T>(list: Dictionary<T>): ChainedDictionary<T>;
->chain : Symbol(chain, Decl(underscoreTest1_underscore.ts, 391, 38), Decl(underscoreTest1_underscore.ts, 393, 45), Decl(underscoreTest1_underscore.ts, 394, 60))
+>chain : Symbol(Static.chain, Decl(underscoreTest1_underscore.ts, 391, 38), Decl(underscoreTest1_underscore.ts, 393, 45), Decl(underscoreTest1_underscore.ts, 394, 60))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 394, 14))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 394, 17))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -3366,7 +3366,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 394, 14))
 
         chain<T>(obj: T): ChainedObject<T>;
->chain : Symbol(chain, Decl(underscoreTest1_underscore.ts, 391, 38), Decl(underscoreTest1_underscore.ts, 393, 45), Decl(underscoreTest1_underscore.ts, 394, 60))
+>chain : Symbol(Static.chain, Decl(underscoreTest1_underscore.ts, 391, 38), Decl(underscoreTest1_underscore.ts, 393, 45), Decl(underscoreTest1_underscore.ts, 394, 60))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 395, 14))
 >obj : Symbol(obj, Decl(underscoreTest1_underscore.ts, 395, 17))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 395, 14))
@@ -3374,7 +3374,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 395, 14))
 
         each<T>(list: T[], iterator: Iterator<T, void>, context?: any): void;
->each : Symbol(each, Decl(underscoreTest1_underscore.ts, 395, 43), Decl(underscoreTest1_underscore.ts, 397, 77))
+>each : Symbol(Static.each, Decl(underscoreTest1_underscore.ts, 395, 43), Decl(underscoreTest1_underscore.ts, 397, 77))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 397, 13))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 397, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 397, 13))
@@ -3384,7 +3384,7 @@ module Underscore {
 >context : Symbol(context, Decl(underscoreTest1_underscore.ts, 397, 55))
 
         each<T>(list: Dictionary<T>, iterator: Iterator<T, void>, context?: any): void;
->each : Symbol(each, Decl(underscoreTest1_underscore.ts, 395, 43), Decl(underscoreTest1_underscore.ts, 397, 77))
+>each : Symbol(Static.each, Decl(underscoreTest1_underscore.ts, 395, 43), Decl(underscoreTest1_underscore.ts, 397, 77))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 398, 13))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 398, 16))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -3395,7 +3395,7 @@ module Underscore {
 >context : Symbol(context, Decl(underscoreTest1_underscore.ts, 398, 65))
 
         forEach<T>(list: T[], iterator: Iterator<T, void>, context?: any): void;
->forEach : Symbol(forEach, Decl(underscoreTest1_underscore.ts, 398, 87), Decl(underscoreTest1_underscore.ts, 399, 80))
+>forEach : Symbol(Static.forEach, Decl(underscoreTest1_underscore.ts, 398, 87), Decl(underscoreTest1_underscore.ts, 399, 80))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 399, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 399, 19))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 399, 16))
@@ -3405,7 +3405,7 @@ module Underscore {
 >context : Symbol(context, Decl(underscoreTest1_underscore.ts, 399, 58))
 
         forEach<T>(list: Dictionary<T>, iterator: Iterator<T, void>, context?: any): void;
->forEach : Symbol(forEach, Decl(underscoreTest1_underscore.ts, 398, 87), Decl(underscoreTest1_underscore.ts, 399, 80))
+>forEach : Symbol(Static.forEach, Decl(underscoreTest1_underscore.ts, 398, 87), Decl(underscoreTest1_underscore.ts, 399, 80))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 400, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 400, 19))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -3416,7 +3416,7 @@ module Underscore {
 >context : Symbol(context, Decl(underscoreTest1_underscore.ts, 400, 68))
 
         map<T, U>(list: T[], iterator: Iterator<T, U>, context?: any): U[];
->map : Symbol(map, Decl(underscoreTest1_underscore.ts, 400, 90), Decl(underscoreTest1_underscore.ts, 402, 75))
+>map : Symbol(Static.map, Decl(underscoreTest1_underscore.ts, 400, 90), Decl(underscoreTest1_underscore.ts, 402, 75))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 402, 12))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 402, 14))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 402, 18))
@@ -3429,7 +3429,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 402, 14))
 
         map<T, U>(list: Dictionary<T>, iterator: Iterator<T, U>, context?: any): U[];
->map : Symbol(map, Decl(underscoreTest1_underscore.ts, 400, 90), Decl(underscoreTest1_underscore.ts, 402, 75))
+>map : Symbol(Static.map, Decl(underscoreTest1_underscore.ts, 400, 90), Decl(underscoreTest1_underscore.ts, 402, 75))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 403, 12))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 403, 14))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 403, 18))
@@ -3443,7 +3443,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 403, 14))
 
         collect<T, U>(list: T[], iterator: Iterator<T, U>, context?: any): U[];
->collect : Symbol(collect, Decl(underscoreTest1_underscore.ts, 403, 85), Decl(underscoreTest1_underscore.ts, 404, 79))
+>collect : Symbol(Static.collect, Decl(underscoreTest1_underscore.ts, 403, 85), Decl(underscoreTest1_underscore.ts, 404, 79))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 404, 16))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 404, 18))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 404, 22))
@@ -3456,7 +3456,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 404, 18))
 
         collect<T, U>(list: Dictionary<T>, iterator: Iterator<T, U>, context?: any): U[];
->collect : Symbol(collect, Decl(underscoreTest1_underscore.ts, 403, 85), Decl(underscoreTest1_underscore.ts, 404, 79))
+>collect : Symbol(Static.collect, Decl(underscoreTest1_underscore.ts, 403, 85), Decl(underscoreTest1_underscore.ts, 404, 79))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 405, 16))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 405, 18))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 405, 22))
@@ -3470,7 +3470,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 405, 18))
 
         reduce<T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
->reduce : Symbol(reduce, Decl(underscoreTest1_underscore.ts, 405, 89), Decl(underscoreTest1_underscore.ts, 407, 90), Decl(underscoreTest1_underscore.ts, 408, 92), Decl(underscoreTest1_underscore.ts, 409, 100))
+>reduce : Symbol(Static.reduce, Decl(underscoreTest1_underscore.ts, 405, 89), Decl(underscoreTest1_underscore.ts, 407, 90), Decl(underscoreTest1_underscore.ts, 408, 92), Decl(underscoreTest1_underscore.ts, 409, 100))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 407, 15))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 407, 18))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 407, 15))
@@ -3484,7 +3484,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 407, 15))
 
         reduce<T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->reduce : Symbol(reduce, Decl(underscoreTest1_underscore.ts, 405, 89), Decl(underscoreTest1_underscore.ts, 407, 90), Decl(underscoreTest1_underscore.ts, 408, 92), Decl(underscoreTest1_underscore.ts, 409, 100))
+>reduce : Symbol(Static.reduce, Decl(underscoreTest1_underscore.ts, 405, 89), Decl(underscoreTest1_underscore.ts, 407, 90), Decl(underscoreTest1_underscore.ts, 408, 92), Decl(underscoreTest1_underscore.ts, 409, 100))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 408, 15))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 408, 17))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 408, 21))
@@ -3499,7 +3499,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 408, 17))
 
         reduce<T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
->reduce : Symbol(reduce, Decl(underscoreTest1_underscore.ts, 405, 89), Decl(underscoreTest1_underscore.ts, 407, 90), Decl(underscoreTest1_underscore.ts, 408, 92), Decl(underscoreTest1_underscore.ts, 409, 100))
+>reduce : Symbol(Static.reduce, Decl(underscoreTest1_underscore.ts, 405, 89), Decl(underscoreTest1_underscore.ts, 407, 90), Decl(underscoreTest1_underscore.ts, 408, 92), Decl(underscoreTest1_underscore.ts, 409, 100))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 409, 15))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 409, 18))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -3514,7 +3514,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 409, 15))
 
         reduce<T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->reduce : Symbol(reduce, Decl(underscoreTest1_underscore.ts, 405, 89), Decl(underscoreTest1_underscore.ts, 407, 90), Decl(underscoreTest1_underscore.ts, 408, 92), Decl(underscoreTest1_underscore.ts, 409, 100))
+>reduce : Symbol(Static.reduce, Decl(underscoreTest1_underscore.ts, 405, 89), Decl(underscoreTest1_underscore.ts, 407, 90), Decl(underscoreTest1_underscore.ts, 408, 92), Decl(underscoreTest1_underscore.ts, 409, 100))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 410, 15))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 410, 17))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 410, 21))
@@ -3530,7 +3530,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 410, 17))
 
         foldl<T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
->foldl : Symbol(foldl, Decl(underscoreTest1_underscore.ts, 410, 102), Decl(underscoreTest1_underscore.ts, 411, 89), Decl(underscoreTest1_underscore.ts, 412, 91), Decl(underscoreTest1_underscore.ts, 413, 99))
+>foldl : Symbol(Static.foldl, Decl(underscoreTest1_underscore.ts, 410, 102), Decl(underscoreTest1_underscore.ts, 411, 89), Decl(underscoreTest1_underscore.ts, 412, 91), Decl(underscoreTest1_underscore.ts, 413, 99))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 411, 14))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 411, 17))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 411, 14))
@@ -3544,7 +3544,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 411, 14))
 
         foldl<T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->foldl : Symbol(foldl, Decl(underscoreTest1_underscore.ts, 410, 102), Decl(underscoreTest1_underscore.ts, 411, 89), Decl(underscoreTest1_underscore.ts, 412, 91), Decl(underscoreTest1_underscore.ts, 413, 99))
+>foldl : Symbol(Static.foldl, Decl(underscoreTest1_underscore.ts, 410, 102), Decl(underscoreTest1_underscore.ts, 411, 89), Decl(underscoreTest1_underscore.ts, 412, 91), Decl(underscoreTest1_underscore.ts, 413, 99))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 412, 14))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 412, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 412, 20))
@@ -3559,7 +3559,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 412, 16))
 
         foldl<T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
->foldl : Symbol(foldl, Decl(underscoreTest1_underscore.ts, 410, 102), Decl(underscoreTest1_underscore.ts, 411, 89), Decl(underscoreTest1_underscore.ts, 412, 91), Decl(underscoreTest1_underscore.ts, 413, 99))
+>foldl : Symbol(Static.foldl, Decl(underscoreTest1_underscore.ts, 410, 102), Decl(underscoreTest1_underscore.ts, 411, 89), Decl(underscoreTest1_underscore.ts, 412, 91), Decl(underscoreTest1_underscore.ts, 413, 99))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 413, 14))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 413, 17))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -3574,7 +3574,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 413, 14))
 
         foldl<T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->foldl : Symbol(foldl, Decl(underscoreTest1_underscore.ts, 410, 102), Decl(underscoreTest1_underscore.ts, 411, 89), Decl(underscoreTest1_underscore.ts, 412, 91), Decl(underscoreTest1_underscore.ts, 413, 99))
+>foldl : Symbol(Static.foldl, Decl(underscoreTest1_underscore.ts, 410, 102), Decl(underscoreTest1_underscore.ts, 411, 89), Decl(underscoreTest1_underscore.ts, 412, 91), Decl(underscoreTest1_underscore.ts, 413, 99))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 414, 14))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 414, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 414, 20))
@@ -3590,7 +3590,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 414, 16))
 
         inject<T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
->inject : Symbol(inject, Decl(underscoreTest1_underscore.ts, 414, 101), Decl(underscoreTest1_underscore.ts, 415, 90), Decl(underscoreTest1_underscore.ts, 416, 92), Decl(underscoreTest1_underscore.ts, 417, 100))
+>inject : Symbol(Static.inject, Decl(underscoreTest1_underscore.ts, 414, 101), Decl(underscoreTest1_underscore.ts, 415, 90), Decl(underscoreTest1_underscore.ts, 416, 92), Decl(underscoreTest1_underscore.ts, 417, 100))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 415, 15))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 415, 18))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 415, 15))
@@ -3604,7 +3604,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 415, 15))
 
         inject<T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->inject : Symbol(inject, Decl(underscoreTest1_underscore.ts, 414, 101), Decl(underscoreTest1_underscore.ts, 415, 90), Decl(underscoreTest1_underscore.ts, 416, 92), Decl(underscoreTest1_underscore.ts, 417, 100))
+>inject : Symbol(Static.inject, Decl(underscoreTest1_underscore.ts, 414, 101), Decl(underscoreTest1_underscore.ts, 415, 90), Decl(underscoreTest1_underscore.ts, 416, 92), Decl(underscoreTest1_underscore.ts, 417, 100))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 416, 15))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 416, 17))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 416, 21))
@@ -3619,7 +3619,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 416, 17))
 
         inject<T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
->inject : Symbol(inject, Decl(underscoreTest1_underscore.ts, 414, 101), Decl(underscoreTest1_underscore.ts, 415, 90), Decl(underscoreTest1_underscore.ts, 416, 92), Decl(underscoreTest1_underscore.ts, 417, 100))
+>inject : Symbol(Static.inject, Decl(underscoreTest1_underscore.ts, 414, 101), Decl(underscoreTest1_underscore.ts, 415, 90), Decl(underscoreTest1_underscore.ts, 416, 92), Decl(underscoreTest1_underscore.ts, 417, 100))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 417, 15))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 417, 18))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -3634,7 +3634,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 417, 15))
 
         inject<T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->inject : Symbol(inject, Decl(underscoreTest1_underscore.ts, 414, 101), Decl(underscoreTest1_underscore.ts, 415, 90), Decl(underscoreTest1_underscore.ts, 416, 92), Decl(underscoreTest1_underscore.ts, 417, 100))
+>inject : Symbol(Static.inject, Decl(underscoreTest1_underscore.ts, 414, 101), Decl(underscoreTest1_underscore.ts, 415, 90), Decl(underscoreTest1_underscore.ts, 416, 92), Decl(underscoreTest1_underscore.ts, 417, 100))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 418, 15))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 418, 17))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 418, 21))
@@ -3650,7 +3650,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 418, 17))
 
         reduceRight<T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
->reduceRight : Symbol(reduceRight, Decl(underscoreTest1_underscore.ts, 418, 102), Decl(underscoreTest1_underscore.ts, 420, 95), Decl(underscoreTest1_underscore.ts, 421, 97), Decl(underscoreTest1_underscore.ts, 422, 105))
+>reduceRight : Symbol(Static.reduceRight, Decl(underscoreTest1_underscore.ts, 418, 102), Decl(underscoreTest1_underscore.ts, 420, 95), Decl(underscoreTest1_underscore.ts, 421, 97), Decl(underscoreTest1_underscore.ts, 422, 105))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 420, 20))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 420, 23))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 420, 20))
@@ -3664,7 +3664,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 420, 20))
 
         reduceRight<T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->reduceRight : Symbol(reduceRight, Decl(underscoreTest1_underscore.ts, 418, 102), Decl(underscoreTest1_underscore.ts, 420, 95), Decl(underscoreTest1_underscore.ts, 421, 97), Decl(underscoreTest1_underscore.ts, 422, 105))
+>reduceRight : Symbol(Static.reduceRight, Decl(underscoreTest1_underscore.ts, 418, 102), Decl(underscoreTest1_underscore.ts, 420, 95), Decl(underscoreTest1_underscore.ts, 421, 97), Decl(underscoreTest1_underscore.ts, 422, 105))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 421, 20))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 421, 22))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 421, 26))
@@ -3679,7 +3679,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 421, 22))
 
         reduceRight<T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
->reduceRight : Symbol(reduceRight, Decl(underscoreTest1_underscore.ts, 418, 102), Decl(underscoreTest1_underscore.ts, 420, 95), Decl(underscoreTest1_underscore.ts, 421, 97), Decl(underscoreTest1_underscore.ts, 422, 105))
+>reduceRight : Symbol(Static.reduceRight, Decl(underscoreTest1_underscore.ts, 418, 102), Decl(underscoreTest1_underscore.ts, 420, 95), Decl(underscoreTest1_underscore.ts, 421, 97), Decl(underscoreTest1_underscore.ts, 422, 105))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 422, 20))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 422, 23))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -3694,7 +3694,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 422, 20))
 
         reduceRight<T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->reduceRight : Symbol(reduceRight, Decl(underscoreTest1_underscore.ts, 418, 102), Decl(underscoreTest1_underscore.ts, 420, 95), Decl(underscoreTest1_underscore.ts, 421, 97), Decl(underscoreTest1_underscore.ts, 422, 105))
+>reduceRight : Symbol(Static.reduceRight, Decl(underscoreTest1_underscore.ts, 418, 102), Decl(underscoreTest1_underscore.ts, 420, 95), Decl(underscoreTest1_underscore.ts, 421, 97), Decl(underscoreTest1_underscore.ts, 422, 105))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 423, 20))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 423, 22))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 423, 26))
@@ -3710,7 +3710,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 423, 22))
 
         foldr<T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
->foldr : Symbol(foldr, Decl(underscoreTest1_underscore.ts, 423, 107), Decl(underscoreTest1_underscore.ts, 424, 89), Decl(underscoreTest1_underscore.ts, 425, 91), Decl(underscoreTest1_underscore.ts, 426, 99))
+>foldr : Symbol(Static.foldr, Decl(underscoreTest1_underscore.ts, 423, 107), Decl(underscoreTest1_underscore.ts, 424, 89), Decl(underscoreTest1_underscore.ts, 425, 91), Decl(underscoreTest1_underscore.ts, 426, 99))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 424, 14))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 424, 17))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 424, 14))
@@ -3724,7 +3724,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 424, 14))
 
         foldr<T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->foldr : Symbol(foldr, Decl(underscoreTest1_underscore.ts, 423, 107), Decl(underscoreTest1_underscore.ts, 424, 89), Decl(underscoreTest1_underscore.ts, 425, 91), Decl(underscoreTest1_underscore.ts, 426, 99))
+>foldr : Symbol(Static.foldr, Decl(underscoreTest1_underscore.ts, 423, 107), Decl(underscoreTest1_underscore.ts, 424, 89), Decl(underscoreTest1_underscore.ts, 425, 91), Decl(underscoreTest1_underscore.ts, 426, 99))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 425, 14))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 425, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 425, 20))
@@ -3739,7 +3739,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 425, 16))
 
         foldr<T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
->foldr : Symbol(foldr, Decl(underscoreTest1_underscore.ts, 423, 107), Decl(underscoreTest1_underscore.ts, 424, 89), Decl(underscoreTest1_underscore.ts, 425, 91), Decl(underscoreTest1_underscore.ts, 426, 99))
+>foldr : Symbol(Static.foldr, Decl(underscoreTest1_underscore.ts, 423, 107), Decl(underscoreTest1_underscore.ts, 424, 89), Decl(underscoreTest1_underscore.ts, 425, 91), Decl(underscoreTest1_underscore.ts, 426, 99))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 426, 14))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 426, 17))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -3754,7 +3754,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 426, 14))
 
         foldr<T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->foldr : Symbol(foldr, Decl(underscoreTest1_underscore.ts, 423, 107), Decl(underscoreTest1_underscore.ts, 424, 89), Decl(underscoreTest1_underscore.ts, 425, 91), Decl(underscoreTest1_underscore.ts, 426, 99))
+>foldr : Symbol(Static.foldr, Decl(underscoreTest1_underscore.ts, 423, 107), Decl(underscoreTest1_underscore.ts, 424, 89), Decl(underscoreTest1_underscore.ts, 425, 91), Decl(underscoreTest1_underscore.ts, 426, 99))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 427, 14))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 427, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 427, 20))
@@ -3770,7 +3770,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 427, 16))
 
         find<T>(list: T[], iterator: Iterator<T, boolean>, context?: any): T;
->find : Symbol(find, Decl(underscoreTest1_underscore.ts, 427, 101), Decl(underscoreTest1_underscore.ts, 429, 77))
+>find : Symbol(Static.find, Decl(underscoreTest1_underscore.ts, 427, 101), Decl(underscoreTest1_underscore.ts, 429, 77))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 429, 13))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 429, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 429, 13))
@@ -3781,7 +3781,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 429, 13))
 
         find<T>(list: Dictionary<T>, iterator: Iterator<T, boolean>, context?: any): T;
->find : Symbol(find, Decl(underscoreTest1_underscore.ts, 427, 101), Decl(underscoreTest1_underscore.ts, 429, 77))
+>find : Symbol(Static.find, Decl(underscoreTest1_underscore.ts, 427, 101), Decl(underscoreTest1_underscore.ts, 429, 77))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 430, 13))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 430, 16))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -3793,7 +3793,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 430, 13))
 
         detect<T>(list: T[], iterator: Iterator<T, boolean>, context?: any): T;
->detect : Symbol(detect, Decl(underscoreTest1_underscore.ts, 430, 87), Decl(underscoreTest1_underscore.ts, 431, 79))
+>detect : Symbol(Static.detect, Decl(underscoreTest1_underscore.ts, 430, 87), Decl(underscoreTest1_underscore.ts, 431, 79))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 431, 15))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 431, 18))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 431, 15))
@@ -3804,7 +3804,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 431, 15))
 
         detect<T>(list: Dictionary<T>, iterator: Iterator<T, boolean>, context?: any): T;
->detect : Symbol(detect, Decl(underscoreTest1_underscore.ts, 430, 87), Decl(underscoreTest1_underscore.ts, 431, 79))
+>detect : Symbol(Static.detect, Decl(underscoreTest1_underscore.ts, 430, 87), Decl(underscoreTest1_underscore.ts, 431, 79))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 432, 15))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 432, 18))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -3816,7 +3816,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 432, 15))
 
         filter<T>(list: T[], iterator: Iterator<T, boolean>, context?: any): T[];
->filter : Symbol(filter, Decl(underscoreTest1_underscore.ts, 432, 89), Decl(underscoreTest1_underscore.ts, 434, 81))
+>filter : Symbol(Static.filter, Decl(underscoreTest1_underscore.ts, 432, 89), Decl(underscoreTest1_underscore.ts, 434, 81))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 434, 15))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 434, 18))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 434, 15))
@@ -3827,7 +3827,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 434, 15))
 
         filter<T>(list: Dictionary<T>, iterator: Iterator<T, boolean>, context?: any): T[];
->filter : Symbol(filter, Decl(underscoreTest1_underscore.ts, 432, 89), Decl(underscoreTest1_underscore.ts, 434, 81))
+>filter : Symbol(Static.filter, Decl(underscoreTest1_underscore.ts, 432, 89), Decl(underscoreTest1_underscore.ts, 434, 81))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 435, 15))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 435, 18))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -3839,7 +3839,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 435, 15))
 
         select<T>(list: T[], iterator: Iterator<T, boolean>, context?: any): T[];
->select : Symbol(select, Decl(underscoreTest1_underscore.ts, 435, 91), Decl(underscoreTest1_underscore.ts, 436, 81))
+>select : Symbol(Static.select, Decl(underscoreTest1_underscore.ts, 435, 91), Decl(underscoreTest1_underscore.ts, 436, 81))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 436, 15))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 436, 18))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 436, 15))
@@ -3850,7 +3850,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 436, 15))
 
         select<T>(list: Dictionary<T>, iterator: Iterator<T, boolean>, context?: any): T[];
->select : Symbol(select, Decl(underscoreTest1_underscore.ts, 435, 91), Decl(underscoreTest1_underscore.ts, 436, 81))
+>select : Symbol(Static.select, Decl(underscoreTest1_underscore.ts, 435, 91), Decl(underscoreTest1_underscore.ts, 436, 81))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 437, 15))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 437, 18))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -3862,7 +3862,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 437, 15))
 
         where<T>(list: T[], properties: Object): T[];
->where : Symbol(where, Decl(underscoreTest1_underscore.ts, 437, 91), Decl(underscoreTest1_underscore.ts, 439, 53))
+>where : Symbol(Static.where, Decl(underscoreTest1_underscore.ts, 437, 91), Decl(underscoreTest1_underscore.ts, 439, 53))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 439, 14))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 439, 17))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 439, 14))
@@ -3871,7 +3871,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 439, 14))
 
         where<T>(list: Dictionary<T>, properties: Object): T[];
->where : Symbol(where, Decl(underscoreTest1_underscore.ts, 437, 91), Decl(underscoreTest1_underscore.ts, 439, 53))
+>where : Symbol(Static.where, Decl(underscoreTest1_underscore.ts, 437, 91), Decl(underscoreTest1_underscore.ts, 439, 53))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 440, 14))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 440, 17))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -3881,7 +3881,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 440, 14))
 
         findWhere<T>(list: T[], properties: Object): T;
->findWhere : Symbol(findWhere, Decl(underscoreTest1_underscore.ts, 440, 63), Decl(underscoreTest1_underscore.ts, 442, 55))
+>findWhere : Symbol(Static.findWhere, Decl(underscoreTest1_underscore.ts, 440, 63), Decl(underscoreTest1_underscore.ts, 442, 55))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 442, 18))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 442, 21))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 442, 18))
@@ -3890,7 +3890,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 442, 18))
 
         findWhere<T>(list: Dictionary<T>, properties: Object): T;
->findWhere : Symbol(findWhere, Decl(underscoreTest1_underscore.ts, 440, 63), Decl(underscoreTest1_underscore.ts, 442, 55))
+>findWhere : Symbol(Static.findWhere, Decl(underscoreTest1_underscore.ts, 440, 63), Decl(underscoreTest1_underscore.ts, 442, 55))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 443, 18))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 443, 21))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -3900,7 +3900,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 443, 18))
 
         reject<T>(list: T[], iterator: Iterator<T, boolean>, context?: any): T[];
->reject : Symbol(reject, Decl(underscoreTest1_underscore.ts, 443, 65), Decl(underscoreTest1_underscore.ts, 445, 81))
+>reject : Symbol(Static.reject, Decl(underscoreTest1_underscore.ts, 443, 65), Decl(underscoreTest1_underscore.ts, 445, 81))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 445, 15))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 445, 18))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 445, 15))
@@ -3911,7 +3911,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 445, 15))
 
         reject<T>(list: Dictionary<T>, iterator: Iterator<T, boolean>, context?: any): T[];
->reject : Symbol(reject, Decl(underscoreTest1_underscore.ts, 443, 65), Decl(underscoreTest1_underscore.ts, 445, 81))
+>reject : Symbol(Static.reject, Decl(underscoreTest1_underscore.ts, 443, 65), Decl(underscoreTest1_underscore.ts, 445, 81))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 446, 15))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 446, 18))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -3923,7 +3923,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 446, 15))
 
         every<T>(list: T[], iterator?: Iterator<T, boolean>, context?: any): boolean;
->every : Symbol(every, Decl(underscoreTest1_underscore.ts, 446, 91), Decl(underscoreTest1_underscore.ts, 448, 85))
+>every : Symbol(Static.every, Decl(underscoreTest1_underscore.ts, 446, 91), Decl(underscoreTest1_underscore.ts, 448, 85))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 448, 14))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 448, 17))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 448, 14))
@@ -3933,7 +3933,7 @@ module Underscore {
 >context : Symbol(context, Decl(underscoreTest1_underscore.ts, 448, 60))
 
         every<T>(list: Dictionary<T>, iterator?: Iterator<T, boolean>, context?: any): boolean;
->every : Symbol(every, Decl(underscoreTest1_underscore.ts, 446, 91), Decl(underscoreTest1_underscore.ts, 448, 85))
+>every : Symbol(Static.every, Decl(underscoreTest1_underscore.ts, 446, 91), Decl(underscoreTest1_underscore.ts, 448, 85))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 449, 14))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 449, 17))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -3944,7 +3944,7 @@ module Underscore {
 >context : Symbol(context, Decl(underscoreTest1_underscore.ts, 449, 70))
 
         all<T>(list: T[], iterator?: Iterator<T, boolean>, context?: any): boolean;
->all : Symbol(all, Decl(underscoreTest1_underscore.ts, 449, 95), Decl(underscoreTest1_underscore.ts, 450, 83))
+>all : Symbol(Static.all, Decl(underscoreTest1_underscore.ts, 449, 95), Decl(underscoreTest1_underscore.ts, 450, 83))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 450, 12))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 450, 15))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 450, 12))
@@ -3954,7 +3954,7 @@ module Underscore {
 >context : Symbol(context, Decl(underscoreTest1_underscore.ts, 450, 58))
 
         all<T>(list: Dictionary<T>, iterator?: Iterator<T, boolean>, context?: any): boolean;
->all : Symbol(all, Decl(underscoreTest1_underscore.ts, 449, 95), Decl(underscoreTest1_underscore.ts, 450, 83))
+>all : Symbol(Static.all, Decl(underscoreTest1_underscore.ts, 449, 95), Decl(underscoreTest1_underscore.ts, 450, 83))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 451, 12))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 451, 15))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -3965,7 +3965,7 @@ module Underscore {
 >context : Symbol(context, Decl(underscoreTest1_underscore.ts, 451, 68))
 
         some<T>(list: T[], iterator?: Iterator<T, boolean>, context?: any): boolean;
->some : Symbol(some, Decl(underscoreTest1_underscore.ts, 451, 93), Decl(underscoreTest1_underscore.ts, 453, 84))
+>some : Symbol(Static.some, Decl(underscoreTest1_underscore.ts, 451, 93), Decl(underscoreTest1_underscore.ts, 453, 84))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 453, 13))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 453, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 453, 13))
@@ -3975,7 +3975,7 @@ module Underscore {
 >context : Symbol(context, Decl(underscoreTest1_underscore.ts, 453, 59))
 
         some<T>(list: Dictionary<T>, iterator?: Iterator<T, boolean>, context?: any): boolean;
->some : Symbol(some, Decl(underscoreTest1_underscore.ts, 451, 93), Decl(underscoreTest1_underscore.ts, 453, 84))
+>some : Symbol(Static.some, Decl(underscoreTest1_underscore.ts, 451, 93), Decl(underscoreTest1_underscore.ts, 453, 84))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 454, 13))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 454, 16))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -3986,7 +3986,7 @@ module Underscore {
 >context : Symbol(context, Decl(underscoreTest1_underscore.ts, 454, 69))
 
         any<T>(list: T[], iterator?: Iterator<T, boolean>, context?: any): boolean;
->any : Symbol(any, Decl(underscoreTest1_underscore.ts, 454, 94), Decl(underscoreTest1_underscore.ts, 455, 83))
+>any : Symbol(Static.any, Decl(underscoreTest1_underscore.ts, 454, 94), Decl(underscoreTest1_underscore.ts, 455, 83))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 455, 12))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 455, 15))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 455, 12))
@@ -3996,7 +3996,7 @@ module Underscore {
 >context : Symbol(context, Decl(underscoreTest1_underscore.ts, 455, 58))
 
         any<T>(list: Dictionary<T>, iterator?: Iterator<T, boolean>, context?: any): boolean;
->any : Symbol(any, Decl(underscoreTest1_underscore.ts, 454, 94), Decl(underscoreTest1_underscore.ts, 455, 83))
+>any : Symbol(Static.any, Decl(underscoreTest1_underscore.ts, 454, 94), Decl(underscoreTest1_underscore.ts, 455, 83))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 456, 12))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 456, 15))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -4007,7 +4007,7 @@ module Underscore {
 >context : Symbol(context, Decl(underscoreTest1_underscore.ts, 456, 68))
 
         contains<T>(list: T[], value: T): boolean;
->contains : Symbol(contains, Decl(underscoreTest1_underscore.ts, 456, 93), Decl(underscoreTest1_underscore.ts, 458, 50))
+>contains : Symbol(Static.contains, Decl(underscoreTest1_underscore.ts, 456, 93), Decl(underscoreTest1_underscore.ts, 458, 50))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 458, 17))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 458, 20))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 458, 17))
@@ -4015,7 +4015,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 458, 17))
 
         contains<T>(list: Dictionary<T>, value: T): boolean;
->contains : Symbol(contains, Decl(underscoreTest1_underscore.ts, 456, 93), Decl(underscoreTest1_underscore.ts, 458, 50))
+>contains : Symbol(Static.contains, Decl(underscoreTest1_underscore.ts, 456, 93), Decl(underscoreTest1_underscore.ts, 458, 50))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 459, 17))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 459, 20))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -4024,7 +4024,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 459, 17))
 
         include<T>(list: T[], value: T): boolean;
->include : Symbol(include, Decl(underscoreTest1_underscore.ts, 459, 60), Decl(underscoreTest1_underscore.ts, 460, 49))
+>include : Symbol(Static.include, Decl(underscoreTest1_underscore.ts, 459, 60), Decl(underscoreTest1_underscore.ts, 460, 49))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 460, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 460, 19))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 460, 16))
@@ -4032,7 +4032,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 460, 16))
 
         include<T>(list: Dictionary<T>, value: T): boolean;
->include : Symbol(include, Decl(underscoreTest1_underscore.ts, 459, 60), Decl(underscoreTest1_underscore.ts, 460, 49))
+>include : Symbol(Static.include, Decl(underscoreTest1_underscore.ts, 459, 60), Decl(underscoreTest1_underscore.ts, 460, 49))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 461, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 461, 19))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -4041,31 +4041,31 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 461, 16))
 
         invoke(list: any[], methodName: string, ...args: any[]): any[];
->invoke : Symbol(invoke, Decl(underscoreTest1_underscore.ts, 461, 59), Decl(underscoreTest1_underscore.ts, 463, 71))
+>invoke : Symbol(Static.invoke, Decl(underscoreTest1_underscore.ts, 461, 59), Decl(underscoreTest1_underscore.ts, 463, 71))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 463, 15))
 >methodName : Symbol(methodName, Decl(underscoreTest1_underscore.ts, 463, 27))
 >args : Symbol(args, Decl(underscoreTest1_underscore.ts, 463, 47))
 
         invoke(list: Dictionary<any>, methodName: string, ...args: any[]): any[];
->invoke : Symbol(invoke, Decl(underscoreTest1_underscore.ts, 461, 59), Decl(underscoreTest1_underscore.ts, 463, 71))
+>invoke : Symbol(Static.invoke, Decl(underscoreTest1_underscore.ts, 461, 59), Decl(underscoreTest1_underscore.ts, 463, 71))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 464, 15))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
 >methodName : Symbol(methodName, Decl(underscoreTest1_underscore.ts, 464, 37))
 >args : Symbol(args, Decl(underscoreTest1_underscore.ts, 464, 57))
 
         pluck(list: any[], propertyName: string): any[];
->pluck : Symbol(pluck, Decl(underscoreTest1_underscore.ts, 464, 81), Decl(underscoreTest1_underscore.ts, 466, 56))
+>pluck : Symbol(Static.pluck, Decl(underscoreTest1_underscore.ts, 464, 81), Decl(underscoreTest1_underscore.ts, 466, 56))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 466, 14))
 >propertyName : Symbol(propertyName, Decl(underscoreTest1_underscore.ts, 466, 26))
 
         pluck(list: Dictionary<any>, propertyName: string): any[];
->pluck : Symbol(pluck, Decl(underscoreTest1_underscore.ts, 464, 81), Decl(underscoreTest1_underscore.ts, 466, 56))
+>pluck : Symbol(Static.pluck, Decl(underscoreTest1_underscore.ts, 464, 81), Decl(underscoreTest1_underscore.ts, 466, 56))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 467, 14))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
 >propertyName : Symbol(propertyName, Decl(underscoreTest1_underscore.ts, 467, 36))
 
         max<T>(list: T[], iterator?: Iterator<T, any>, context?: any): T;
->max : Symbol(max, Decl(underscoreTest1_underscore.ts, 467, 66), Decl(underscoreTest1_underscore.ts, 469, 73))
+>max : Symbol(Static.max, Decl(underscoreTest1_underscore.ts, 467, 66), Decl(underscoreTest1_underscore.ts, 469, 73))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 469, 12))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 469, 15))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 469, 12))
@@ -4076,7 +4076,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 469, 12))
 
         max<T>(list: Dictionary<T>, iterator?: Iterator<T, any>, context?: any): T;
->max : Symbol(max, Decl(underscoreTest1_underscore.ts, 467, 66), Decl(underscoreTest1_underscore.ts, 469, 73))
+>max : Symbol(Static.max, Decl(underscoreTest1_underscore.ts, 467, 66), Decl(underscoreTest1_underscore.ts, 469, 73))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 470, 12))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 470, 15))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -4088,7 +4088,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 470, 12))
 
         min<T>(list: T[], iterator?: Iterator<T, any>, context?: any): T;
->min : Symbol(min, Decl(underscoreTest1_underscore.ts, 470, 83), Decl(underscoreTest1_underscore.ts, 472, 73))
+>min : Symbol(Static.min, Decl(underscoreTest1_underscore.ts, 470, 83), Decl(underscoreTest1_underscore.ts, 472, 73))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 472, 12))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 472, 15))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 472, 12))
@@ -4099,7 +4099,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 472, 12))
 
         min<T>(list: Dictionary<T>, iterator?: Iterator<T, any>, context?: any): T;
->min : Symbol(min, Decl(underscoreTest1_underscore.ts, 470, 83), Decl(underscoreTest1_underscore.ts, 472, 73))
+>min : Symbol(Static.min, Decl(underscoreTest1_underscore.ts, 470, 83), Decl(underscoreTest1_underscore.ts, 472, 73))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 473, 12))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 473, 15))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -4111,7 +4111,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 473, 12))
 
         sortBy<T>(list: T[], iterator: Iterator<T, any>, context?: any): T[];
->sortBy : Symbol(sortBy, Decl(underscoreTest1_underscore.ts, 473, 83), Decl(underscoreTest1_underscore.ts, 475, 77), Decl(underscoreTest1_underscore.ts, 476, 87), Decl(underscoreTest1_underscore.ts, 477, 56))
+>sortBy : Symbol(Static.sortBy, Decl(underscoreTest1_underscore.ts, 473, 83), Decl(underscoreTest1_underscore.ts, 475, 77), Decl(underscoreTest1_underscore.ts, 476, 87), Decl(underscoreTest1_underscore.ts, 477, 56))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 475, 15))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 475, 18))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 475, 15))
@@ -4122,7 +4122,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 475, 15))
 
         sortBy<T>(list: Dictionary<T>, iterator: Iterator<T, any>, context?: any): T[];
->sortBy : Symbol(sortBy, Decl(underscoreTest1_underscore.ts, 473, 83), Decl(underscoreTest1_underscore.ts, 475, 77), Decl(underscoreTest1_underscore.ts, 476, 87), Decl(underscoreTest1_underscore.ts, 477, 56))
+>sortBy : Symbol(Static.sortBy, Decl(underscoreTest1_underscore.ts, 473, 83), Decl(underscoreTest1_underscore.ts, 475, 77), Decl(underscoreTest1_underscore.ts, 476, 87), Decl(underscoreTest1_underscore.ts, 477, 56))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 476, 15))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 476, 18))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -4134,7 +4134,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 476, 15))
 
         sortBy<T>(list: T[], propertyName: string): T[];
->sortBy : Symbol(sortBy, Decl(underscoreTest1_underscore.ts, 473, 83), Decl(underscoreTest1_underscore.ts, 475, 77), Decl(underscoreTest1_underscore.ts, 476, 87), Decl(underscoreTest1_underscore.ts, 477, 56))
+>sortBy : Symbol(Static.sortBy, Decl(underscoreTest1_underscore.ts, 473, 83), Decl(underscoreTest1_underscore.ts, 475, 77), Decl(underscoreTest1_underscore.ts, 476, 87), Decl(underscoreTest1_underscore.ts, 477, 56))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 477, 15))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 477, 18))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 477, 15))
@@ -4142,7 +4142,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 477, 15))
 
         sortBy<T>(list: Dictionary<T>, propertyName: string): T[];
->sortBy : Symbol(sortBy, Decl(underscoreTest1_underscore.ts, 473, 83), Decl(underscoreTest1_underscore.ts, 475, 77), Decl(underscoreTest1_underscore.ts, 476, 87), Decl(underscoreTest1_underscore.ts, 477, 56))
+>sortBy : Symbol(Static.sortBy, Decl(underscoreTest1_underscore.ts, 473, 83), Decl(underscoreTest1_underscore.ts, 475, 77), Decl(underscoreTest1_underscore.ts, 476, 87), Decl(underscoreTest1_underscore.ts, 477, 56))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 478, 15))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 478, 18))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -4151,7 +4151,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 478, 15))
 
         groupBy<T>(list: T[], iterator?: Iterator<T, any>, context?: any): Dictionary<T[]>;
->groupBy : Symbol(groupBy, Decl(underscoreTest1_underscore.ts, 478, 66), Decl(underscoreTest1_underscore.ts, 480, 91), Decl(underscoreTest1_underscore.ts, 481, 101), Decl(underscoreTest1_underscore.ts, 482, 69))
+>groupBy : Symbol(Static.groupBy, Decl(underscoreTest1_underscore.ts, 478, 66), Decl(underscoreTest1_underscore.ts, 480, 91), Decl(underscoreTest1_underscore.ts, 481, 101), Decl(underscoreTest1_underscore.ts, 482, 69))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 480, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 480, 19))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 480, 16))
@@ -4163,7 +4163,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 480, 16))
 
         groupBy<T>(list: Dictionary<T>, iterator?: Iterator<T, any>, context?: any): Dictionary<T[]>;
->groupBy : Symbol(groupBy, Decl(underscoreTest1_underscore.ts, 478, 66), Decl(underscoreTest1_underscore.ts, 480, 91), Decl(underscoreTest1_underscore.ts, 481, 101), Decl(underscoreTest1_underscore.ts, 482, 69))
+>groupBy : Symbol(Static.groupBy, Decl(underscoreTest1_underscore.ts, 478, 66), Decl(underscoreTest1_underscore.ts, 480, 91), Decl(underscoreTest1_underscore.ts, 481, 101), Decl(underscoreTest1_underscore.ts, 482, 69))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 481, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 481, 19))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -4176,7 +4176,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 481, 16))
 
         groupBy<T>(list: T[], propertyName: string): Dictionary<T[]>;
->groupBy : Symbol(groupBy, Decl(underscoreTest1_underscore.ts, 478, 66), Decl(underscoreTest1_underscore.ts, 480, 91), Decl(underscoreTest1_underscore.ts, 481, 101), Decl(underscoreTest1_underscore.ts, 482, 69))
+>groupBy : Symbol(Static.groupBy, Decl(underscoreTest1_underscore.ts, 478, 66), Decl(underscoreTest1_underscore.ts, 480, 91), Decl(underscoreTest1_underscore.ts, 481, 101), Decl(underscoreTest1_underscore.ts, 482, 69))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 482, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 482, 19))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 482, 16))
@@ -4185,7 +4185,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 482, 16))
 
         groupBy<T>(list: Dictionary<T>, propertyName: string): Dictionary<T[]>;
->groupBy : Symbol(groupBy, Decl(underscoreTest1_underscore.ts, 478, 66), Decl(underscoreTest1_underscore.ts, 480, 91), Decl(underscoreTest1_underscore.ts, 481, 101), Decl(underscoreTest1_underscore.ts, 482, 69))
+>groupBy : Symbol(Static.groupBy, Decl(underscoreTest1_underscore.ts, 478, 66), Decl(underscoreTest1_underscore.ts, 480, 91), Decl(underscoreTest1_underscore.ts, 481, 101), Decl(underscoreTest1_underscore.ts, 482, 69))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 483, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 483, 19))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -4195,7 +4195,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 483, 16))
 
         countBy<T>(list: T[], iterator?: Iterator<T, any>, context?: any): Dictionary<number>;
->countBy : Symbol(countBy, Decl(underscoreTest1_underscore.ts, 483, 79), Decl(underscoreTest1_underscore.ts, 485, 94), Decl(underscoreTest1_underscore.ts, 486, 104), Decl(underscoreTest1_underscore.ts, 487, 72))
+>countBy : Symbol(Static.countBy, Decl(underscoreTest1_underscore.ts, 483, 79), Decl(underscoreTest1_underscore.ts, 485, 94), Decl(underscoreTest1_underscore.ts, 486, 104), Decl(underscoreTest1_underscore.ts, 487, 72))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 485, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 485, 19))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 485, 16))
@@ -4206,7 +4206,7 @@ module Underscore {
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
 
         countBy<T>(list: Dictionary<T>, iterator?: Iterator<T, any>, context?: any): Dictionary<number>;
->countBy : Symbol(countBy, Decl(underscoreTest1_underscore.ts, 483, 79), Decl(underscoreTest1_underscore.ts, 485, 94), Decl(underscoreTest1_underscore.ts, 486, 104), Decl(underscoreTest1_underscore.ts, 487, 72))
+>countBy : Symbol(Static.countBy, Decl(underscoreTest1_underscore.ts, 483, 79), Decl(underscoreTest1_underscore.ts, 485, 94), Decl(underscoreTest1_underscore.ts, 486, 104), Decl(underscoreTest1_underscore.ts, 487, 72))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 486, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 486, 19))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -4218,7 +4218,7 @@ module Underscore {
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
 
         countBy<T>(list: T[], propertyName: string): Dictionary<number>;
->countBy : Symbol(countBy, Decl(underscoreTest1_underscore.ts, 483, 79), Decl(underscoreTest1_underscore.ts, 485, 94), Decl(underscoreTest1_underscore.ts, 486, 104), Decl(underscoreTest1_underscore.ts, 487, 72))
+>countBy : Symbol(Static.countBy, Decl(underscoreTest1_underscore.ts, 483, 79), Decl(underscoreTest1_underscore.ts, 485, 94), Decl(underscoreTest1_underscore.ts, 486, 104), Decl(underscoreTest1_underscore.ts, 487, 72))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 487, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 487, 19))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 487, 16))
@@ -4226,7 +4226,7 @@ module Underscore {
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
 
         countBy<T>(list: Dictionary<T>, propertyName: string): Dictionary<number>;
->countBy : Symbol(countBy, Decl(underscoreTest1_underscore.ts, 483, 79), Decl(underscoreTest1_underscore.ts, 485, 94), Decl(underscoreTest1_underscore.ts, 486, 104), Decl(underscoreTest1_underscore.ts, 487, 72))
+>countBy : Symbol(Static.countBy, Decl(underscoreTest1_underscore.ts, 483, 79), Decl(underscoreTest1_underscore.ts, 485, 94), Decl(underscoreTest1_underscore.ts, 486, 104), Decl(underscoreTest1_underscore.ts, 487, 72))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 488, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 488, 19))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -4235,14 +4235,14 @@ module Underscore {
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
 
         shuffle<T>(list: T[]): T[];
->shuffle : Symbol(shuffle, Decl(underscoreTest1_underscore.ts, 488, 82), Decl(underscoreTest1_underscore.ts, 490, 35))
+>shuffle : Symbol(Static.shuffle, Decl(underscoreTest1_underscore.ts, 488, 82), Decl(underscoreTest1_underscore.ts, 490, 35))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 490, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 490, 19))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 490, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 490, 16))
 
         shuffle<T>(list: Dictionary<T>): T[];
->shuffle : Symbol(shuffle, Decl(underscoreTest1_underscore.ts, 488, 82), Decl(underscoreTest1_underscore.ts, 490, 35))
+>shuffle : Symbol(Static.shuffle, Decl(underscoreTest1_underscore.ts, 488, 82), Decl(underscoreTest1_underscore.ts, 490, 35))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 491, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 491, 19))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -4250,14 +4250,14 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 491, 16))
 
         toArray<T>(list: T[]): T[];
->toArray : Symbol(toArray, Decl(underscoreTest1_underscore.ts, 491, 45), Decl(underscoreTest1_underscore.ts, 493, 35))
+>toArray : Symbol(Static.toArray, Decl(underscoreTest1_underscore.ts, 491, 45), Decl(underscoreTest1_underscore.ts, 493, 35))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 493, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 493, 19))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 493, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 493, 16))
 
         toArray<T>(list: Dictionary<T>): T[];
->toArray : Symbol(toArray, Decl(underscoreTest1_underscore.ts, 491, 45), Decl(underscoreTest1_underscore.ts, 493, 35))
+>toArray : Symbol(Static.toArray, Decl(underscoreTest1_underscore.ts, 491, 45), Decl(underscoreTest1_underscore.ts, 493, 35))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 494, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 494, 19))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
@@ -4265,27 +4265,27 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 494, 16))
 
         size<T>(list: T[]): number;
->size : Symbol(size, Decl(underscoreTest1_underscore.ts, 494, 45), Decl(underscoreTest1_underscore.ts, 496, 35))
+>size : Symbol(Static.size, Decl(underscoreTest1_underscore.ts, 494, 45), Decl(underscoreTest1_underscore.ts, 496, 35))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 496, 13))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 496, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 496, 13))
 
         size<T>(list: Dictionary<T>): number;
->size : Symbol(size, Decl(underscoreTest1_underscore.ts, 494, 45), Decl(underscoreTest1_underscore.ts, 496, 35))
+>size : Symbol(Static.size, Decl(underscoreTest1_underscore.ts, 494, 45), Decl(underscoreTest1_underscore.ts, 496, 35))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 497, 13))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 497, 16))
 >Dictionary : Symbol(Dictionary, Decl(underscoreTest1_underscore.ts, 0, 0))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 497, 13))
 
         first<T>(list: T[]): T;
->first : Symbol(first, Decl(underscoreTest1_underscore.ts, 497, 45), Decl(underscoreTest1_underscore.ts, 499, 31))
+>first : Symbol(Static.first, Decl(underscoreTest1_underscore.ts, 497, 45), Decl(underscoreTest1_underscore.ts, 499, 31))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 499, 14))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 499, 17))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 499, 14))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 499, 14))
 
         first<T>(list: T[], count: number): T[];
->first : Symbol(first, Decl(underscoreTest1_underscore.ts, 497, 45), Decl(underscoreTest1_underscore.ts, 499, 31))
+>first : Symbol(Static.first, Decl(underscoreTest1_underscore.ts, 497, 45), Decl(underscoreTest1_underscore.ts, 499, 31))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 500, 14))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 500, 17))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 500, 14))
@@ -4293,14 +4293,14 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 500, 14))
 
         head<T>(list: T[]): T;
->head : Symbol(head, Decl(underscoreTest1_underscore.ts, 500, 48), Decl(underscoreTest1_underscore.ts, 501, 30))
+>head : Symbol(Static.head, Decl(underscoreTest1_underscore.ts, 500, 48), Decl(underscoreTest1_underscore.ts, 501, 30))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 501, 13))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 501, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 501, 13))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 501, 13))
 
         head<T>(list: T[], count: number): T[];
->head : Symbol(head, Decl(underscoreTest1_underscore.ts, 500, 48), Decl(underscoreTest1_underscore.ts, 501, 30))
+>head : Symbol(Static.head, Decl(underscoreTest1_underscore.ts, 500, 48), Decl(underscoreTest1_underscore.ts, 501, 30))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 502, 13))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 502, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 502, 13))
@@ -4308,14 +4308,14 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 502, 13))
 
         take<T>(list: T[]): T;
->take : Symbol(take, Decl(underscoreTest1_underscore.ts, 502, 47), Decl(underscoreTest1_underscore.ts, 503, 30))
+>take : Symbol(Static.take, Decl(underscoreTest1_underscore.ts, 502, 47), Decl(underscoreTest1_underscore.ts, 503, 30))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 503, 13))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 503, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 503, 13))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 503, 13))
 
         take<T>(list: T[], count: number): T[];
->take : Symbol(take, Decl(underscoreTest1_underscore.ts, 502, 47), Decl(underscoreTest1_underscore.ts, 503, 30))
+>take : Symbol(Static.take, Decl(underscoreTest1_underscore.ts, 502, 47), Decl(underscoreTest1_underscore.ts, 503, 30))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 504, 13))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 504, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 504, 13))
@@ -4323,14 +4323,14 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 504, 13))
 
         initial<T>(list: T[]): T;
->initial : Symbol(initial, Decl(underscoreTest1_underscore.ts, 504, 47), Decl(underscoreTest1_underscore.ts, 506, 33))
+>initial : Symbol(Static.initial, Decl(underscoreTest1_underscore.ts, 504, 47), Decl(underscoreTest1_underscore.ts, 506, 33))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 506, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 506, 19))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 506, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 506, 16))
 
         initial<T>(list: T[], count: number): T[];
->initial : Symbol(initial, Decl(underscoreTest1_underscore.ts, 504, 47), Decl(underscoreTest1_underscore.ts, 506, 33))
+>initial : Symbol(Static.initial, Decl(underscoreTest1_underscore.ts, 504, 47), Decl(underscoreTest1_underscore.ts, 506, 33))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 507, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 507, 19))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 507, 16))
@@ -4338,14 +4338,14 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 507, 16))
 
         last<T>(list: T[]): T;
->last : Symbol(last, Decl(underscoreTest1_underscore.ts, 507, 50), Decl(underscoreTest1_underscore.ts, 509, 30))
+>last : Symbol(Static.last, Decl(underscoreTest1_underscore.ts, 507, 50), Decl(underscoreTest1_underscore.ts, 509, 30))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 509, 13))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 509, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 509, 13))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 509, 13))
 
         last<T>(list: T[], count: number): T[];
->last : Symbol(last, Decl(underscoreTest1_underscore.ts, 507, 50), Decl(underscoreTest1_underscore.ts, 509, 30))
+>last : Symbol(Static.last, Decl(underscoreTest1_underscore.ts, 507, 50), Decl(underscoreTest1_underscore.ts, 509, 30))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 510, 13))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 510, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 510, 13))
@@ -4353,7 +4353,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 510, 13))
 
         rest<T>(list: T[], index?: number): T[];
->rest : Symbol(rest, Decl(underscoreTest1_underscore.ts, 510, 47))
+>rest : Symbol(Static.rest, Decl(underscoreTest1_underscore.ts, 510, 47))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 512, 13))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 512, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 512, 13))
@@ -4361,28 +4361,28 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 512, 13))
 
         compact<T>(list: T[]): T[];
->compact : Symbol(compact, Decl(underscoreTest1_underscore.ts, 512, 48))
+>compact : Symbol(Static.compact, Decl(underscoreTest1_underscore.ts, 512, 48))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 514, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 514, 19))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 514, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 514, 16))
 
         flatten<T>(list: T[][]): T[];
->flatten : Symbol(flatten, Decl(underscoreTest1_underscore.ts, 514, 35), Decl(underscoreTest1_underscore.ts, 516, 37))
+>flatten : Symbol(Static.flatten, Decl(underscoreTest1_underscore.ts, 514, 35), Decl(underscoreTest1_underscore.ts, 516, 37))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 516, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 516, 19))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 516, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 516, 16))
 
         flatten<T>(array: any[], shallow?: boolean): T[];
->flatten : Symbol(flatten, Decl(underscoreTest1_underscore.ts, 514, 35), Decl(underscoreTest1_underscore.ts, 516, 37))
+>flatten : Symbol(Static.flatten, Decl(underscoreTest1_underscore.ts, 514, 35), Decl(underscoreTest1_underscore.ts, 516, 37))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 517, 16))
 >array : Symbol(array, Decl(underscoreTest1_underscore.ts, 517, 19))
 >shallow : Symbol(shallow, Decl(underscoreTest1_underscore.ts, 517, 32))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 517, 16))
 
         without<T>(list: T[], ...values: T[]): T[];
->without : Symbol(without, Decl(underscoreTest1_underscore.ts, 517, 57))
+>without : Symbol(Static.without, Decl(underscoreTest1_underscore.ts, 517, 57))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 519, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 519, 19))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 519, 16))
@@ -4391,21 +4391,21 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 519, 16))
 
         union<T>(...arrays: T[][]): T[];
->union : Symbol(union, Decl(underscoreTest1_underscore.ts, 519, 51))
+>union : Symbol(Static.union, Decl(underscoreTest1_underscore.ts, 519, 51))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 521, 14))
 >arrays : Symbol(arrays, Decl(underscoreTest1_underscore.ts, 521, 17))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 521, 14))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 521, 14))
 
         intersection<T>(...arrays: T[][]): T[];
->intersection : Symbol(intersection, Decl(underscoreTest1_underscore.ts, 521, 40))
+>intersection : Symbol(Static.intersection, Decl(underscoreTest1_underscore.ts, 521, 40))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 523, 21))
 >arrays : Symbol(arrays, Decl(underscoreTest1_underscore.ts, 523, 24))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 523, 21))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 523, 21))
 
         difference<T>(list: T[], ...others: T[][]): T[];
->difference : Symbol(difference, Decl(underscoreTest1_underscore.ts, 523, 47))
+>difference : Symbol(Static.difference, Decl(underscoreTest1_underscore.ts, 523, 47))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 525, 19))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 525, 22))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 525, 19))
@@ -4414,7 +4414,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 525, 19))
 
         uniq<T>(list: T[], isSorted?: boolean): T[];
->uniq : Symbol(uniq, Decl(underscoreTest1_underscore.ts, 525, 56), Decl(underscoreTest1_underscore.ts, 527, 52))
+>uniq : Symbol(Static.uniq, Decl(underscoreTest1_underscore.ts, 525, 56), Decl(underscoreTest1_underscore.ts, 527, 52))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 527, 13))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 527, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 527, 13))
@@ -4422,7 +4422,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 527, 13))
 
         uniq<T, U>(list: T[], isSorted: boolean, iterator: Iterator<T, U>, context?: any): U[];
->uniq : Symbol(uniq, Decl(underscoreTest1_underscore.ts, 525, 56), Decl(underscoreTest1_underscore.ts, 527, 52))
+>uniq : Symbol(Static.uniq, Decl(underscoreTest1_underscore.ts, 525, 56), Decl(underscoreTest1_underscore.ts, 527, 52))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 528, 13))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 528, 15))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 528, 19))
@@ -4436,7 +4436,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 528, 15))
 
         unique<T>(list: T[], isSorted?: boolean): T[];
->unique : Symbol(unique, Decl(underscoreTest1_underscore.ts, 528, 95), Decl(underscoreTest1_underscore.ts, 529, 54))
+>unique : Symbol(Static.unique, Decl(underscoreTest1_underscore.ts, 528, 95), Decl(underscoreTest1_underscore.ts, 529, 54))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 529, 15))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 529, 18))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 529, 15))
@@ -4444,7 +4444,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 529, 15))
 
         unique<T, U>(list: T[], isSorted: boolean, iterator: Iterator<T, U>, context?: any): U[];
->unique : Symbol(unique, Decl(underscoreTest1_underscore.ts, 528, 95), Decl(underscoreTest1_underscore.ts, 529, 54))
+>unique : Symbol(Static.unique, Decl(underscoreTest1_underscore.ts, 528, 95), Decl(underscoreTest1_underscore.ts, 529, 54))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 530, 15))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 530, 17))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 530, 21))
@@ -4458,7 +4458,7 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 530, 17))
 
         zip<T0, T1>(a0: T0[], a1: T1[]): Tuple2<T0, T1>[];
->zip : Symbol(zip, Decl(underscoreTest1_underscore.ts, 530, 97), Decl(underscoreTest1_underscore.ts, 532, 58), Decl(underscoreTest1_underscore.ts, 533, 76), Decl(underscoreTest1_underscore.ts, 534, 94))
+>zip : Symbol(Static.zip, Decl(underscoreTest1_underscore.ts, 530, 97), Decl(underscoreTest1_underscore.ts, 532, 58), Decl(underscoreTest1_underscore.ts, 533, 76), Decl(underscoreTest1_underscore.ts, 534, 94))
 >T0 : Symbol(T0, Decl(underscoreTest1_underscore.ts, 532, 12))
 >T1 : Symbol(T1, Decl(underscoreTest1_underscore.ts, 532, 15))
 >a0 : Symbol(a0, Decl(underscoreTest1_underscore.ts, 532, 20))
@@ -4470,7 +4470,7 @@ module Underscore {
 >T1 : Symbol(T1, Decl(underscoreTest1_underscore.ts, 532, 15))
 
         zip<T0, T1, T2>(a0: T0[], a1: T1[], a2: T2[]): Tuple3<T0, T1, T2>[];
->zip : Symbol(zip, Decl(underscoreTest1_underscore.ts, 530, 97), Decl(underscoreTest1_underscore.ts, 532, 58), Decl(underscoreTest1_underscore.ts, 533, 76), Decl(underscoreTest1_underscore.ts, 534, 94))
+>zip : Symbol(Static.zip, Decl(underscoreTest1_underscore.ts, 530, 97), Decl(underscoreTest1_underscore.ts, 532, 58), Decl(underscoreTest1_underscore.ts, 533, 76), Decl(underscoreTest1_underscore.ts, 534, 94))
 >T0 : Symbol(T0, Decl(underscoreTest1_underscore.ts, 533, 12))
 >T1 : Symbol(T1, Decl(underscoreTest1_underscore.ts, 533, 15))
 >T2 : Symbol(T2, Decl(underscoreTest1_underscore.ts, 533, 19))
@@ -4486,7 +4486,7 @@ module Underscore {
 >T2 : Symbol(T2, Decl(underscoreTest1_underscore.ts, 533, 19))
 
         zip<T0, T1, T2, T3>(a0: T0[], a1: T1[], a2: T2[], a3: T3[]): Tuple4<T0, T1, T2, T3>[];
->zip : Symbol(zip, Decl(underscoreTest1_underscore.ts, 530, 97), Decl(underscoreTest1_underscore.ts, 532, 58), Decl(underscoreTest1_underscore.ts, 533, 76), Decl(underscoreTest1_underscore.ts, 534, 94))
+>zip : Symbol(Static.zip, Decl(underscoreTest1_underscore.ts, 530, 97), Decl(underscoreTest1_underscore.ts, 532, 58), Decl(underscoreTest1_underscore.ts, 533, 76), Decl(underscoreTest1_underscore.ts, 534, 94))
 >T0 : Symbol(T0, Decl(underscoreTest1_underscore.ts, 534, 12))
 >T1 : Symbol(T1, Decl(underscoreTest1_underscore.ts, 534, 15))
 >T2 : Symbol(T2, Decl(underscoreTest1_underscore.ts, 534, 19))
@@ -4506,20 +4506,20 @@ module Underscore {
 >T3 : Symbol(T3, Decl(underscoreTest1_underscore.ts, 534, 23))
 
         zip(...arrays: any[][]): any[][];
->zip : Symbol(zip, Decl(underscoreTest1_underscore.ts, 530, 97), Decl(underscoreTest1_underscore.ts, 532, 58), Decl(underscoreTest1_underscore.ts, 533, 76), Decl(underscoreTest1_underscore.ts, 534, 94))
+>zip : Symbol(Static.zip, Decl(underscoreTest1_underscore.ts, 530, 97), Decl(underscoreTest1_underscore.ts, 532, 58), Decl(underscoreTest1_underscore.ts, 533, 76), Decl(underscoreTest1_underscore.ts, 534, 94))
 >arrays : Symbol(arrays, Decl(underscoreTest1_underscore.ts, 535, 12))
 
         object(list: any[][]): any;
->object : Symbol(object, Decl(underscoreTest1_underscore.ts, 535, 41), Decl(underscoreTest1_underscore.ts, 537, 35))
+>object : Symbol(Static.object, Decl(underscoreTest1_underscore.ts, 535, 41), Decl(underscoreTest1_underscore.ts, 537, 35))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 537, 15))
 
         object(keys: string[], values: any[]): any;
->object : Symbol(object, Decl(underscoreTest1_underscore.ts, 535, 41), Decl(underscoreTest1_underscore.ts, 537, 35))
+>object : Symbol(Static.object, Decl(underscoreTest1_underscore.ts, 535, 41), Decl(underscoreTest1_underscore.ts, 537, 35))
 >keys : Symbol(keys, Decl(underscoreTest1_underscore.ts, 538, 15))
 >values : Symbol(values, Decl(underscoreTest1_underscore.ts, 538, 30))
 
         indexOf<T>(list: T[], value: T, isSorted?: boolean): number;
->indexOf : Symbol(indexOf, Decl(underscoreTest1_underscore.ts, 538, 51))
+>indexOf : Symbol(Static.indexOf, Decl(underscoreTest1_underscore.ts, 538, 51))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 540, 16))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 540, 19))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 540, 16))
@@ -4528,7 +4528,7 @@ module Underscore {
 >isSorted : Symbol(isSorted, Decl(underscoreTest1_underscore.ts, 540, 39))
 
         lastIndexOf<T>(list: T[], value: T, fromIndex?: number): number;
->lastIndexOf : Symbol(lastIndexOf, Decl(underscoreTest1_underscore.ts, 540, 68))
+>lastIndexOf : Symbol(Static.lastIndexOf, Decl(underscoreTest1_underscore.ts, 540, 68))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 542, 20))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 542, 23))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 542, 20))
@@ -4537,7 +4537,7 @@ module Underscore {
 >fromIndex : Symbol(fromIndex, Decl(underscoreTest1_underscore.ts, 542, 43))
 
         sortedIndex<T>(list: T[], obj: T, propertyName: string): number;
->sortedIndex : Symbol(sortedIndex, Decl(underscoreTest1_underscore.ts, 542, 72), Decl(underscoreTest1_underscore.ts, 544, 72))
+>sortedIndex : Symbol(Static.sortedIndex, Decl(underscoreTest1_underscore.ts, 542, 72), Decl(underscoreTest1_underscore.ts, 544, 72))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 544, 20))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 544, 23))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 544, 20))
@@ -4546,7 +4546,7 @@ module Underscore {
 >propertyName : Symbol(propertyName, Decl(underscoreTest1_underscore.ts, 544, 41))
 
         sortedIndex<T>(list: T[], obj: T, iterator?: Iterator<T, any>, context?: any): number;
->sortedIndex : Symbol(sortedIndex, Decl(underscoreTest1_underscore.ts, 542, 72), Decl(underscoreTest1_underscore.ts, 544, 72))
+>sortedIndex : Symbol(Static.sortedIndex, Decl(underscoreTest1_underscore.ts, 542, 72), Decl(underscoreTest1_underscore.ts, 544, 72))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 545, 20))
 >list : Symbol(list, Decl(underscoreTest1_underscore.ts, 545, 23))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 545, 20))
@@ -4558,17 +4558,17 @@ module Underscore {
 >context : Symbol(context, Decl(underscoreTest1_underscore.ts, 545, 70))
 
         range(stop: number): number[];
->range : Symbol(range, Decl(underscoreTest1_underscore.ts, 545, 94), Decl(underscoreTest1_underscore.ts, 547, 38))
+>range : Symbol(Static.range, Decl(underscoreTest1_underscore.ts, 545, 94), Decl(underscoreTest1_underscore.ts, 547, 38))
 >stop : Symbol(stop, Decl(underscoreTest1_underscore.ts, 547, 14))
 
         range(start: number, stop: number, step?: number): number[];
->range : Symbol(range, Decl(underscoreTest1_underscore.ts, 545, 94), Decl(underscoreTest1_underscore.ts, 547, 38))
+>range : Symbol(Static.range, Decl(underscoreTest1_underscore.ts, 545, 94), Decl(underscoreTest1_underscore.ts, 547, 38))
 >start : Symbol(start, Decl(underscoreTest1_underscore.ts, 548, 14))
 >stop : Symbol(stop, Decl(underscoreTest1_underscore.ts, 548, 28))
 >step : Symbol(step, Decl(underscoreTest1_underscore.ts, 548, 42))
 
         bind<T extends Function>(func: T, object: any): T;
->bind : Symbol(bind, Decl(underscoreTest1_underscore.ts, 548, 68), Decl(underscoreTest1_underscore.ts, 550, 58))
+>bind : Symbol(Static.bind, Decl(underscoreTest1_underscore.ts, 548, 68), Decl(underscoreTest1_underscore.ts, 550, 58))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 550, 13))
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >func : Symbol(func, Decl(underscoreTest1_underscore.ts, 550, 33))
@@ -4577,7 +4577,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 550, 13))
 
         bind(func: Function, object: any, ...args: any[]): Function;
->bind : Symbol(bind, Decl(underscoreTest1_underscore.ts, 548, 68), Decl(underscoreTest1_underscore.ts, 550, 58))
+>bind : Symbol(Static.bind, Decl(underscoreTest1_underscore.ts, 548, 68), Decl(underscoreTest1_underscore.ts, 550, 58))
 >func : Symbol(func, Decl(underscoreTest1_underscore.ts, 551, 13))
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 551, 28))
@@ -4585,7 +4585,7 @@ module Underscore {
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
         bindAll<T>(object: T, ...methodNames: string[]): T;
->bindAll : Symbol(bindAll, Decl(underscoreTest1_underscore.ts, 551, 68))
+>bindAll : Symbol(Static.bindAll, Decl(underscoreTest1_underscore.ts, 551, 68))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 553, 16))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 553, 19))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 553, 16))
@@ -4593,14 +4593,14 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 553, 16))
 
         partial(func: Function, ...args: any[]): Function;
->partial : Symbol(partial, Decl(underscoreTest1_underscore.ts, 553, 59))
+>partial : Symbol(Static.partial, Decl(underscoreTest1_underscore.ts, 553, 59))
 >func : Symbol(func, Decl(underscoreTest1_underscore.ts, 555, 16))
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >args : Symbol(args, Decl(underscoreTest1_underscore.ts, 555, 31))
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
         memoize<T extends Function>(func: T, hashFunction?: Function): T;
->memoize : Symbol(memoize, Decl(underscoreTest1_underscore.ts, 555, 58))
+>memoize : Symbol(Static.memoize, Decl(underscoreTest1_underscore.ts, 555, 58))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 557, 16))
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >func : Symbol(func, Decl(underscoreTest1_underscore.ts, 557, 36))
@@ -4610,20 +4610,20 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 557, 16))
 
         delay(func: Function, wait: number, ...args: any[]): number;
->delay : Symbol(delay, Decl(underscoreTest1_underscore.ts, 557, 73))
+>delay : Symbol(Static.delay, Decl(underscoreTest1_underscore.ts, 557, 73))
 >func : Symbol(func, Decl(underscoreTest1_underscore.ts, 559, 14))
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >wait : Symbol(wait, Decl(underscoreTest1_underscore.ts, 559, 29))
 >args : Symbol(args, Decl(underscoreTest1_underscore.ts, 559, 43))
 
         defer(func: Function, ...args: any[]): number;
->defer : Symbol(defer, Decl(underscoreTest1_underscore.ts, 559, 68))
+>defer : Symbol(Static.defer, Decl(underscoreTest1_underscore.ts, 559, 68))
 >func : Symbol(func, Decl(underscoreTest1_underscore.ts, 561, 14))
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >args : Symbol(args, Decl(underscoreTest1_underscore.ts, 561, 29))
 
         throttle<T extends Function>(func: T, wait: number): T;
->throttle : Symbol(throttle, Decl(underscoreTest1_underscore.ts, 561, 54))
+>throttle : Symbol(Static.throttle, Decl(underscoreTest1_underscore.ts, 561, 54))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 563, 17))
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >func : Symbol(func, Decl(underscoreTest1_underscore.ts, 563, 37))
@@ -4632,7 +4632,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 563, 17))
 
         debounce<T extends Function>(func: T, wait: number, immediate?: boolean): T;
->debounce : Symbol(debounce, Decl(underscoreTest1_underscore.ts, 563, 63))
+>debounce : Symbol(Static.debounce, Decl(underscoreTest1_underscore.ts, 563, 63))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 565, 17))
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >func : Symbol(func, Decl(underscoreTest1_underscore.ts, 565, 37))
@@ -4642,7 +4642,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 565, 17))
 
         once<T extends Function>(func: T): T;
->once : Symbol(once, Decl(underscoreTest1_underscore.ts, 565, 84))
+>once : Symbol(Static.once, Decl(underscoreTest1_underscore.ts, 565, 84))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 567, 13))
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >func : Symbol(func, Decl(underscoreTest1_underscore.ts, 567, 33))
@@ -4650,7 +4650,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 567, 13))
 
         after<T extends Function>(count: number, func: T): T;
->after : Symbol(after, Decl(underscoreTest1_underscore.ts, 567, 45))
+>after : Symbol(Static.after, Decl(underscoreTest1_underscore.ts, 567, 45))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 569, 14))
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >count : Symbol(count, Decl(underscoreTest1_underscore.ts, 569, 34))
@@ -4659,7 +4659,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 569, 14))
 
         wrap<T extends Function>(func: T, wrapper: (func: T, ...args: any[]) => any): T;
->wrap : Symbol(wrap, Decl(underscoreTest1_underscore.ts, 569, 61))
+>wrap : Symbol(Static.wrap, Decl(underscoreTest1_underscore.ts, 569, 61))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 571, 13))
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >func : Symbol(func, Decl(underscoreTest1_underscore.ts, 571, 33))
@@ -4671,37 +4671,37 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 571, 13))
 
         compose(...funcs: Function[]): Function;
->compose : Symbol(compose, Decl(underscoreTest1_underscore.ts, 571, 88))
+>compose : Symbol(Static.compose, Decl(underscoreTest1_underscore.ts, 571, 88))
 >funcs : Symbol(funcs, Decl(underscoreTest1_underscore.ts, 573, 16))
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
         keys(object: any): string[];
->keys : Symbol(keys, Decl(underscoreTest1_underscore.ts, 573, 48))
+>keys : Symbol(Static.keys, Decl(underscoreTest1_underscore.ts, 573, 48))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 575, 13))
 
         values(object: any): any[];
->values : Symbol(values, Decl(underscoreTest1_underscore.ts, 575, 36))
+>values : Symbol(Static.values, Decl(underscoreTest1_underscore.ts, 575, 36))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 577, 15))
 
         pairs(object: any): any[][];
->pairs : Symbol(pairs, Decl(underscoreTest1_underscore.ts, 577, 35))
+>pairs : Symbol(Static.pairs, Decl(underscoreTest1_underscore.ts, 577, 35))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 579, 14))
 
         invert(object: any): any;
->invert : Symbol(invert, Decl(underscoreTest1_underscore.ts, 579, 36))
+>invert : Symbol(Static.invert, Decl(underscoreTest1_underscore.ts, 579, 36))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 581, 15))
 
         functions(object: any): string[];
->functions : Symbol(functions, Decl(underscoreTest1_underscore.ts, 581, 33))
+>functions : Symbol(Static.functions, Decl(underscoreTest1_underscore.ts, 581, 33))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 583, 18))
 
         methods(object: any): string[];
->methods : Symbol(methods, Decl(underscoreTest1_underscore.ts, 583, 41))
+>methods : Symbol(Static.methods, Decl(underscoreTest1_underscore.ts, 583, 41))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 584, 16))
 
         extend<T>(destination: T, ...sources: any[]): T;
->extend : Symbol(extend, Decl(underscoreTest1_underscore.ts, 584, 39))
+>extend : Symbol(Static.extend, Decl(underscoreTest1_underscore.ts, 584, 39))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 586, 15))
 >destination : Symbol(destination, Decl(underscoreTest1_underscore.ts, 586, 18))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 586, 15))
@@ -4709,7 +4709,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 586, 15))
 
         pick<T>(object: T, ...keys: string[]): T;
->pick : Symbol(pick, Decl(underscoreTest1_underscore.ts, 586, 56))
+>pick : Symbol(Static.pick, Decl(underscoreTest1_underscore.ts, 586, 56))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 588, 13))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 588, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 588, 13))
@@ -4717,7 +4717,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 588, 13))
 
         omit<T>(object: T, ...keys: string[]): T;
->omit : Symbol(omit, Decl(underscoreTest1_underscore.ts, 588, 49))
+>omit : Symbol(Static.omit, Decl(underscoreTest1_underscore.ts, 588, 49))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 590, 13))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 590, 16))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 590, 13))
@@ -4725,7 +4725,7 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 590, 13))
 
         defaults<T>(object: T, ...defaults: any[]): T;
->defaults : Symbol(defaults, Decl(underscoreTest1_underscore.ts, 590, 49))
+>defaults : Symbol(Static.defaults, Decl(underscoreTest1_underscore.ts, 590, 49))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 592, 17))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 592, 20))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 592, 17))
@@ -4733,14 +4733,14 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 592, 17))
 
         clone<T>(object: T): T;
->clone : Symbol(clone, Decl(underscoreTest1_underscore.ts, 592, 54))
+>clone : Symbol(Static.clone, Decl(underscoreTest1_underscore.ts, 592, 54))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 594, 14))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 594, 17))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 594, 14))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 594, 14))
 
         tap<T>(object: T, interceptor: (object: T) => void): T;
->tap : Symbol(tap, Decl(underscoreTest1_underscore.ts, 594, 31))
+>tap : Symbol(Static.tap, Decl(underscoreTest1_underscore.ts, 594, 31))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 596, 12))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 596, 15))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 596, 12))
@@ -4750,12 +4750,12 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 596, 12))
 
         has(object: any, key: string): boolean;
->has : Symbol(has, Decl(underscoreTest1_underscore.ts, 596, 63))
+>has : Symbol(Static.has, Decl(underscoreTest1_underscore.ts, 596, 63))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 598, 12))
 >key : Symbol(key, Decl(underscoreTest1_underscore.ts, 598, 24))
 
         isEqual<T>(object: T, other: T): boolean;
->isEqual : Symbol(isEqual, Decl(underscoreTest1_underscore.ts, 598, 47))
+>isEqual : Symbol(Static.isEqual, Decl(underscoreTest1_underscore.ts, 598, 47))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 600, 16))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 600, 19))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 600, 16))
@@ -4763,78 +4763,78 @@ module Underscore {
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 600, 16))
 
         isEmpty(object: any): boolean;
->isEmpty : Symbol(isEmpty, Decl(underscoreTest1_underscore.ts, 600, 49))
+>isEmpty : Symbol(Static.isEmpty, Decl(underscoreTest1_underscore.ts, 600, 49))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 602, 16))
 
         isElement(object: any): boolean;
->isElement : Symbol(isElement, Decl(underscoreTest1_underscore.ts, 602, 38))
+>isElement : Symbol(Static.isElement, Decl(underscoreTest1_underscore.ts, 602, 38))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 603, 18))
 
         isArray(object: any): boolean;
->isArray : Symbol(isArray, Decl(underscoreTest1_underscore.ts, 603, 40))
+>isArray : Symbol(Static.isArray, Decl(underscoreTest1_underscore.ts, 603, 40))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 604, 16))
 
         isObject(value: any): boolean;
->isObject : Symbol(isObject, Decl(underscoreTest1_underscore.ts, 604, 38))
+>isObject : Symbol(Static.isObject, Decl(underscoreTest1_underscore.ts, 604, 38))
 >value : Symbol(value, Decl(underscoreTest1_underscore.ts, 605, 17))
 
         isArguments(object: any): boolean;
->isArguments : Symbol(isArguments, Decl(underscoreTest1_underscore.ts, 605, 38))
+>isArguments : Symbol(Static.isArguments, Decl(underscoreTest1_underscore.ts, 605, 38))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 606, 20))
 
         isFunction(object: any): boolean;
->isFunction : Symbol(isFunction, Decl(underscoreTest1_underscore.ts, 606, 42))
+>isFunction : Symbol(Static.isFunction, Decl(underscoreTest1_underscore.ts, 606, 42))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 607, 19))
 
         isString(object: any): boolean;
->isString : Symbol(isString, Decl(underscoreTest1_underscore.ts, 607, 41))
+>isString : Symbol(Static.isString, Decl(underscoreTest1_underscore.ts, 607, 41))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 608, 17))
 
         isNumber(object: any): boolean;
->isNumber : Symbol(isNumber, Decl(underscoreTest1_underscore.ts, 608, 39))
+>isNumber : Symbol(Static.isNumber, Decl(underscoreTest1_underscore.ts, 608, 39))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 609, 17))
 
         isFinite(object: any): boolean;
->isFinite : Symbol(isFinite, Decl(underscoreTest1_underscore.ts, 609, 39))
+>isFinite : Symbol(Static.isFinite, Decl(underscoreTest1_underscore.ts, 609, 39))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 610, 17))
 
         isBoolean(object: any): boolean;
->isBoolean : Symbol(isBoolean, Decl(underscoreTest1_underscore.ts, 610, 39))
+>isBoolean : Symbol(Static.isBoolean, Decl(underscoreTest1_underscore.ts, 610, 39))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 611, 18))
 
         isDate(object: any): boolean;
->isDate : Symbol(isDate, Decl(underscoreTest1_underscore.ts, 611, 40))
+>isDate : Symbol(Static.isDate, Decl(underscoreTest1_underscore.ts, 611, 40))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 612, 15))
 
         isRegExp(object: any): boolean;
->isRegExp : Symbol(isRegExp, Decl(underscoreTest1_underscore.ts, 612, 37))
+>isRegExp : Symbol(Static.isRegExp, Decl(underscoreTest1_underscore.ts, 612, 37))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 613, 17))
 
         isNaN(object: any): boolean;
->isNaN : Symbol(isNaN, Decl(underscoreTest1_underscore.ts, 613, 39))
+>isNaN : Symbol(Static.isNaN, Decl(underscoreTest1_underscore.ts, 613, 39))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 614, 14))
 
         isNull(object: any): boolean;
->isNull : Symbol(isNull, Decl(underscoreTest1_underscore.ts, 614, 36))
+>isNull : Symbol(Static.isNull, Decl(underscoreTest1_underscore.ts, 614, 36))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 615, 15))
 
         isUndefined(value: any): boolean;
->isUndefined : Symbol(isUndefined, Decl(underscoreTest1_underscore.ts, 615, 37))
+>isUndefined : Symbol(Static.isUndefined, Decl(underscoreTest1_underscore.ts, 615, 37))
 >value : Symbol(value, Decl(underscoreTest1_underscore.ts, 616, 20))
 
         noConflict(): Static;
->noConflict : Symbol(noConflict, Decl(underscoreTest1_underscore.ts, 616, 41))
+>noConflict : Symbol(Static.noConflict, Decl(underscoreTest1_underscore.ts, 616, 41))
 >Static : Symbol(Static, Decl(underscoreTest1_underscore.ts, 385, 5))
 
         identity<T>(value: T): T;
->identity : Symbol(identity, Decl(underscoreTest1_underscore.ts, 618, 29))
+>identity : Symbol(Static.identity, Decl(underscoreTest1_underscore.ts, 618, 29))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 620, 17))
 >value : Symbol(value, Decl(underscoreTest1_underscore.ts, 620, 20))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 620, 17))
 >T : Symbol(T, Decl(underscoreTest1_underscore.ts, 620, 17))
 
         times<U>(n: number, iterator: Iterator<number, U>, context?: any): U[];
->times : Symbol(times, Decl(underscoreTest1_underscore.ts, 620, 33))
+>times : Symbol(Static.times, Decl(underscoreTest1_underscore.ts, 620, 33))
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 622, 14))
 >n : Symbol(n, Decl(underscoreTest1_underscore.ts, 622, 17))
 >iterator : Symbol(iterator, Decl(underscoreTest1_underscore.ts, 622, 27))
@@ -4844,49 +4844,49 @@ module Underscore {
 >U : Symbol(U, Decl(underscoreTest1_underscore.ts, 622, 14))
 
         random(max: number): number;
->random : Symbol(random, Decl(underscoreTest1_underscore.ts, 622, 79), Decl(underscoreTest1_underscore.ts, 624, 36))
+>random : Symbol(Static.random, Decl(underscoreTest1_underscore.ts, 622, 79), Decl(underscoreTest1_underscore.ts, 624, 36))
 >max : Symbol(max, Decl(underscoreTest1_underscore.ts, 624, 15))
 
         random(min: number, max: number): number;
->random : Symbol(random, Decl(underscoreTest1_underscore.ts, 622, 79), Decl(underscoreTest1_underscore.ts, 624, 36))
+>random : Symbol(Static.random, Decl(underscoreTest1_underscore.ts, 622, 79), Decl(underscoreTest1_underscore.ts, 624, 36))
 >min : Symbol(min, Decl(underscoreTest1_underscore.ts, 625, 15))
 >max : Symbol(max, Decl(underscoreTest1_underscore.ts, 625, 27))
 
         mixin(object: any): void;
->mixin : Symbol(mixin, Decl(underscoreTest1_underscore.ts, 625, 49))
+>mixin : Symbol(Static.mixin, Decl(underscoreTest1_underscore.ts, 625, 49))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 627, 14))
 
         uniqueId(): number;
->uniqueId : Symbol(uniqueId, Decl(underscoreTest1_underscore.ts, 627, 33), Decl(underscoreTest1_underscore.ts, 629, 27))
+>uniqueId : Symbol(Static.uniqueId, Decl(underscoreTest1_underscore.ts, 627, 33), Decl(underscoreTest1_underscore.ts, 629, 27))
 
         uniqueId(prefix: string): string;
->uniqueId : Symbol(uniqueId, Decl(underscoreTest1_underscore.ts, 627, 33), Decl(underscoreTest1_underscore.ts, 629, 27))
+>uniqueId : Symbol(Static.uniqueId, Decl(underscoreTest1_underscore.ts, 627, 33), Decl(underscoreTest1_underscore.ts, 629, 27))
 >prefix : Symbol(prefix, Decl(underscoreTest1_underscore.ts, 630, 17))
 
         escape(s: string): string;
->escape : Symbol(escape, Decl(underscoreTest1_underscore.ts, 630, 41))
+>escape : Symbol(Static.escape, Decl(underscoreTest1_underscore.ts, 630, 41))
 >s : Symbol(s, Decl(underscoreTest1_underscore.ts, 632, 15))
 
         unescape(s: string): string;
->unescape : Symbol(unescape, Decl(underscoreTest1_underscore.ts, 632, 34))
+>unescape : Symbol(Static.unescape, Decl(underscoreTest1_underscore.ts, 632, 34))
 >s : Symbol(s, Decl(underscoreTest1_underscore.ts, 634, 17))
 
         result(object: any, property: string): any;
->result : Symbol(result, Decl(underscoreTest1_underscore.ts, 634, 36))
+>result : Symbol(Static.result, Decl(underscoreTest1_underscore.ts, 634, 36))
 >object : Symbol(object, Decl(underscoreTest1_underscore.ts, 636, 15))
 >property : Symbol(property, Decl(underscoreTest1_underscore.ts, 636, 27))
 
         templateSettings: TemplateSettings;
->templateSettings : Symbol(templateSettings, Decl(underscoreTest1_underscore.ts, 636, 51))
+>templateSettings : Symbol(Static.templateSettings, Decl(underscoreTest1_underscore.ts, 636, 51))
 >TemplateSettings : Symbol(TemplateSettings, Decl(underscoreTest1_underscore.ts, 378, 5))
 
         template(templateString: string): (data: any) => string;
->template : Symbol(template, Decl(underscoreTest1_underscore.ts, 638, 43), Decl(underscoreTest1_underscore.ts, 640, 64))
+>template : Symbol(Static.template, Decl(underscoreTest1_underscore.ts, 638, 43), Decl(underscoreTest1_underscore.ts, 640, 64))
 >templateString : Symbol(templateString, Decl(underscoreTest1_underscore.ts, 640, 17))
 >data : Symbol(data, Decl(underscoreTest1_underscore.ts, 640, 43))
 
         template(templateString: string, data: any, settings?: TemplateSettings): string;
->template : Symbol(template, Decl(underscoreTest1_underscore.ts, 638, 43), Decl(underscoreTest1_underscore.ts, 640, 64))
+>template : Symbol(Static.template, Decl(underscoreTest1_underscore.ts, 638, 43), Decl(underscoreTest1_underscore.ts, 640, 64))
 >templateString : Symbol(templateString, Decl(underscoreTest1_underscore.ts, 641, 17))
 >data : Symbol(data, Decl(underscoreTest1_underscore.ts, 641, 40))
 >settings : Symbol(settings, Decl(underscoreTest1_underscore.ts, 641, 51))
diff --git a/tests/baselines/reference/underscoreTest1.types b/tests/baselines/reference/underscoreTest1.types
index 7fe233c4490..37f3bdb12ab 100644
--- a/tests/baselines/reference/underscoreTest1.types
+++ b/tests/baselines/reference/underscoreTest1.types
@@ -31,7 +31,7 @@ _.each({ one: 1, two: 2, three: 3 }, (value: number, key?: string) => alert(valu
 >_.each : { <T>(list: T[], iterator: Iterator<T, void>, context?: any): void; <T>(list: Dictionary<T>, iterator: Iterator<T, void>, context?: any): void; }
 >_ : Underscore.Static
 >each : { <T>(list: T[], iterator: Iterator<T, void>, context?: any): void; <T>(list: Dictionary<T>, iterator: Iterator<T, void>, context?: any): void; }
->{ one: 1, two: 2, three: 3 } : { [x: string]: number; one: number; two: number; three: number; }
+>{ one: 1, two: 2, three: 3 } : { one: number; two: number; three: number; }
 >one : number
 >1 : number
 >two : number
@@ -68,7 +68,7 @@ _.map({ one: 1, two: 2, three: 3 }, (value: number, key?: string) => value * 3);
 >_.map : { <T, U>(list: T[], iterator: Iterator<T, U>, context?: any): U[]; <T, U>(list: Dictionary<T>, iterator: Iterator<T, U>, context?: any): U[]; }
 >_ : Underscore.Static
 >map : { <T, U>(list: T[], iterator: Iterator<T, U>, context?: any): U[]; <T, U>(list: Dictionary<T>, iterator: Iterator<T, U>, context?: any): U[]; }
->{ one: 1, two: 2, three: 3 } : { [x: string]: number; one: number; two: number; three: number; }
+>{ one: 1, two: 2, three: 3 } : { one: number; two: number; three: number; }
 >one : number
 >1 : number
 >two : number
@@ -124,9 +124,9 @@ var flat = _.reduceRight(list, (a, b) => a.concat(b), []);
 >a : number[]
 >b : number[]
 >a.concat(b) : number[]
->a.concat : { <U extends number[]>(...items: U[]): number[]; (...items: number[]): number[]; }
+>a.concat : (...items: (number | number[])[]) => number[]
 >a : number[]
->concat : { <U extends number[]>(...items: U[]): number[]; (...items: number[]): number[]; }
+>concat : (...items: (number | number[])[]) => number[]
 >b : number[]
 >[] : undefined[]
 
@@ -449,7 +449,7 @@ _.size({ one: 1, two: 2, three: 3 });
 >_.size : { <T>(list: T[]): number; <T>(list: Dictionary<T>): number; }
 >_ : Underscore.Static
 >size : { <T>(list: T[]): number; <T>(list: Dictionary<T>): number; }
->{ one: 1, two: 2, three: 3 } : { [x: string]: number; one: number; two: number; three: number; }
+>{ one: 1, two: 2, three: 3 } : { one: number; two: number; three: number; }
 >one : number
 >1 : number
 >two : number
diff --git a/tests/baselines/reference/unionAndIntersectionInference1.symbols b/tests/baselines/reference/unionAndIntersectionInference1.symbols
index 5e96790ea34..685b21dd215 100644
--- a/tests/baselines/reference/unionAndIntersectionInference1.symbols
+++ b/tests/baselines/reference/unionAndIntersectionInference1.symbols
@@ -157,21 +157,21 @@ interface Man {
 >Man : Symbol(Man, Decl(unionAndIntersectionInference1.ts, 51, 23))
 
     walks: boolean;
->walks : Symbol(walks, Decl(unionAndIntersectionInference1.ts, 55, 15))
+>walks : Symbol(Man.walks, Decl(unionAndIntersectionInference1.ts, 55, 15))
 }
 
 interface Bear {
 >Bear : Symbol(Bear, Decl(unionAndIntersectionInference1.ts, 57, 1))
 
     roars: boolean;
->roars : Symbol(roars, Decl(unionAndIntersectionInference1.ts, 59, 16))
+>roars : Symbol(Bear.roars, Decl(unionAndIntersectionInference1.ts, 59, 16))
 }
 
 interface Pig {
 >Pig : Symbol(Pig, Decl(unionAndIntersectionInference1.ts, 61, 1))
 
     oinks: boolean;
->oinks : Symbol(oinks, Decl(unionAndIntersectionInference1.ts, 63, 15))
+>oinks : Symbol(Pig.oinks, Decl(unionAndIntersectionInference1.ts, 63, 15))
 }
 
 declare function pigify<T>(y: T & Bear): T & Pig;
diff --git a/tests/baselines/reference/unionAndIntersectionInference1.types b/tests/baselines/reference/unionAndIntersectionInference1.types
index 073a677b659..5d23688f0b7 100644
--- a/tests/baselines/reference/unionAndIntersectionInference1.types
+++ b/tests/baselines/reference/unionAndIntersectionInference1.types
@@ -110,7 +110,7 @@ function foo1<a>(value: void|a): void {
 >a : a
 
     if (isVoid(value)) {
->isVoid(value) : value is void
+>isVoid(value) : boolean
 >isVoid : <a>(value: void | a) => value is void
 >value : void | a
 
@@ -130,7 +130,7 @@ function baz1<a>(value: void|a): void {
 >a : a
 
       if (isNonVoid(value)) {
->isNonVoid(value) : value is a
+>isNonVoid(value) : boolean
 >isNonVoid : <a>(value: void | a) => value is a
 >value : void | a
 
diff --git a/tests/baselines/reference/unionThisTypeInFunctions.js b/tests/baselines/reference/unionThisTypeInFunctions.js
new file mode 100644
index 00000000000..0d4b535ff8b
--- /dev/null
+++ b/tests/baselines/reference/unionThisTypeInFunctions.js
@@ -0,0 +1,18 @@
+//// [unionThisTypeInFunctions.ts]
+interface Real {
+    method(this: this, n: number): void;
+    data: string;
+}
+interface Fake {
+    method(this: this, n: number): void;
+    data: number;
+}
+function test(r: Real | Fake) {
+    r.method(12);
+}
+
+
+//// [unionThisTypeInFunctions.js]
+function test(r) {
+    r.method(12);
+}
diff --git a/tests/baselines/reference/unionThisTypeInFunctions.symbols b/tests/baselines/reference/unionThisTypeInFunctions.symbols
new file mode 100644
index 00000000000..eada1231750
--- /dev/null
+++ b/tests/baselines/reference/unionThisTypeInFunctions.symbols
@@ -0,0 +1,35 @@
+=== tests/cases/conformance/types/thisType/unionThisTypeInFunctions.ts ===
+interface Real {
+>Real : Symbol(Real, Decl(unionThisTypeInFunctions.ts, 0, 0))
+
+    method(this: this, n: number): void;
+>method : Symbol(Real.method, Decl(unionThisTypeInFunctions.ts, 0, 16))
+>this : Symbol(this, Decl(unionThisTypeInFunctions.ts, 1, 11))
+>n : Symbol(n, Decl(unionThisTypeInFunctions.ts, 1, 22))
+
+    data: string;
+>data : Symbol(Real.data, Decl(unionThisTypeInFunctions.ts, 1, 40))
+}
+interface Fake {
+>Fake : Symbol(Fake, Decl(unionThisTypeInFunctions.ts, 3, 1))
+
+    method(this: this, n: number): void;
+>method : Symbol(Fake.method, Decl(unionThisTypeInFunctions.ts, 4, 16))
+>this : Symbol(this, Decl(unionThisTypeInFunctions.ts, 5, 11))
+>n : Symbol(n, Decl(unionThisTypeInFunctions.ts, 5, 22))
+
+    data: number;
+>data : Symbol(Fake.data, Decl(unionThisTypeInFunctions.ts, 5, 40))
+}
+function test(r: Real | Fake) {
+>test : Symbol(test, Decl(unionThisTypeInFunctions.ts, 7, 1))
+>r : Symbol(r, Decl(unionThisTypeInFunctions.ts, 8, 14))
+>Real : Symbol(Real, Decl(unionThisTypeInFunctions.ts, 0, 0))
+>Fake : Symbol(Fake, Decl(unionThisTypeInFunctions.ts, 3, 1))
+
+    r.method(12);
+>r.method : Symbol(method, Decl(unionThisTypeInFunctions.ts, 0, 16), Decl(unionThisTypeInFunctions.ts, 4, 16))
+>r : Symbol(r, Decl(unionThisTypeInFunctions.ts, 8, 14))
+>method : Symbol(method, Decl(unionThisTypeInFunctions.ts, 0, 16), Decl(unionThisTypeInFunctions.ts, 4, 16))
+}
+
diff --git a/tests/baselines/reference/unionThisTypeInFunctions.types b/tests/baselines/reference/unionThisTypeInFunctions.types
new file mode 100644
index 00000000000..3c5181166b6
--- /dev/null
+++ b/tests/baselines/reference/unionThisTypeInFunctions.types
@@ -0,0 +1,37 @@
+=== tests/cases/conformance/types/thisType/unionThisTypeInFunctions.ts ===
+interface Real {
+>Real : Real
+
+    method(this: this, n: number): void;
+>method : (this: this, n: number) => void
+>this : this
+>n : number
+
+    data: string;
+>data : string
+}
+interface Fake {
+>Fake : Fake
+
+    method(this: this, n: number): void;
+>method : (this: this, n: number) => void
+>this : this
+>n : number
+
+    data: number;
+>data : number
+}
+function test(r: Real | Fake) {
+>test : (r: Real | Fake) => void
+>r : Real | Fake
+>Real : Real
+>Fake : Fake
+
+    r.method(12);
+>r.method(12) : void
+>r.method : ((this: Real, n: number) => void) | ((this: Fake, n: number) => void)
+>r : Real | Fake
+>method : ((this: Real, n: number) => void) | ((this: Fake, n: number) => void)
+>12 : number
+}
+
diff --git a/tests/baselines/reference/unionTypeCallSignatures2.symbols b/tests/baselines/reference/unionTypeCallSignatures2.symbols
index 32ce4c352b8..19279346cde 100644
--- a/tests/baselines/reference/unionTypeCallSignatures2.symbols
+++ b/tests/baselines/reference/unionTypeCallSignatures2.symbols
@@ -11,7 +11,7 @@ interface A {
 
     (x: Date): void;
 >x : Symbol(x, Decl(unionTypeCallSignatures2.ts, 3, 5))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     <T>(x: T[]): T[];
 >T : Symbol(T, Decl(unionTypeCallSignatures2.ts, 4, 5))
@@ -31,7 +31,7 @@ interface B {
 
     (x: Date): void;
 >x : Symbol(x, Decl(unionTypeCallSignatures2.ts, 10, 5))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     <T>(x: T[]): T[];
 >T : Symbol(T, Decl(unionTypeCallSignatures2.ts, 11, 5))
diff --git a/tests/baselines/reference/unionTypeFromArrayLiteral.symbols b/tests/baselines/reference/unionTypeFromArrayLiteral.symbols
index 74047b6be11..7699e89dedd 100644
--- a/tests/baselines/reference/unionTypeFromArrayLiteral.symbols
+++ b/tests/baselines/reference/unionTypeFromArrayLiteral.symbols
@@ -27,21 +27,21 @@ var arr5Tuple: {
 } = ["hello", true, false, " hello", true, 10, "any"]; // Tuple
 class C { foo() { } }
 >C : Symbol(C, Decl(unionTypeFromArrayLiteral.ts, 13, 54))
->foo : Symbol(foo, Decl(unionTypeFromArrayLiteral.ts, 14, 9))
+>foo : Symbol(C.foo, Decl(unionTypeFromArrayLiteral.ts, 14, 9))
 
 class D { foo2() { } }
 >D : Symbol(D, Decl(unionTypeFromArrayLiteral.ts, 14, 21))
->foo2 : Symbol(foo2, Decl(unionTypeFromArrayLiteral.ts, 15, 9))
+>foo2 : Symbol(D.foo2, Decl(unionTypeFromArrayLiteral.ts, 15, 9))
 
 class E extends C { foo3() { } }
 >E : Symbol(E, Decl(unionTypeFromArrayLiteral.ts, 15, 22))
 >C : Symbol(C, Decl(unionTypeFromArrayLiteral.ts, 13, 54))
->foo3 : Symbol(foo3, Decl(unionTypeFromArrayLiteral.ts, 16, 19))
+>foo3 : Symbol(E.foo3, Decl(unionTypeFromArrayLiteral.ts, 16, 19))
 
 class F extends C { foo4() { } }
 >F : Symbol(F, Decl(unionTypeFromArrayLiteral.ts, 16, 32))
 >C : Symbol(C, Decl(unionTypeFromArrayLiteral.ts, 13, 54))
->foo4 : Symbol(foo4, Decl(unionTypeFromArrayLiteral.ts, 17, 19))
+>foo4 : Symbol(F.foo4, Decl(unionTypeFromArrayLiteral.ts, 17, 19))
 
 var c: C, d: D, e: E, f: F;
 >c : Symbol(c, Decl(unionTypeFromArrayLiteral.ts, 18, 3))
diff --git a/tests/baselines/reference/unionTypeIndexSignature.symbols b/tests/baselines/reference/unionTypeIndexSignature.symbols
index 7295b860f3f..dc3923f2f24 100644
--- a/tests/baselines/reference/unionTypeIndexSignature.symbols
+++ b/tests/baselines/reference/unionTypeIndexSignature.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/types/union/unionTypeIndexSignature.ts ===
 var numOrDate: number | Date;
 >numOrDate : Symbol(numOrDate, Decl(unionTypeIndexSignature.ts, 0, 3))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 var anyVar: number;
 >anyVar : Symbol(anyVar, Decl(unionTypeIndexSignature.ts, 1, 3))
@@ -13,7 +13,7 @@ var unionOfDifferentReturnType: { [a: string]: number; } | { [a: string]: Date;
 >unionOfDifferentReturnType : Symbol(unionOfDifferentReturnType, Decl(unionTypeIndexSignature.ts, 6, 3))
 >a : Symbol(a, Decl(unionTypeIndexSignature.ts, 6, 35))
 >a : Symbol(a, Decl(unionTypeIndexSignature.ts, 6, 62))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 numOrDate = unionOfDifferentReturnType["hello"]; // number | Date
 >numOrDate : Symbol(numOrDate, Decl(unionTypeIndexSignature.ts, 0, 3))
@@ -41,7 +41,7 @@ var unionOfDifferentReturnType1: { [a: number]: number; } | { [a: number]: Date;
 >unionOfDifferentReturnType1 : Symbol(unionOfDifferentReturnType1, Decl(unionTypeIndexSignature.ts, 16, 3))
 >a : Symbol(a, Decl(unionTypeIndexSignature.ts, 16, 36))
 >a : Symbol(a, Decl(unionTypeIndexSignature.ts, 16, 63))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 numOrDate = unionOfDifferentReturnType1["hello"]; // any
 >numOrDate : Symbol(numOrDate, Decl(unionTypeIndexSignature.ts, 0, 3))
diff --git a/tests/baselines/reference/unionTypeParameterInference.symbols b/tests/baselines/reference/unionTypeParameterInference.symbols
index f2dbaac31ff..0e7e53f4049 100644
--- a/tests/baselines/reference/unionTypeParameterInference.symbols
+++ b/tests/baselines/reference/unionTypeParameterInference.symbols
@@ -4,7 +4,7 @@
 interface Foo<T> { prop: T; }
 >Foo : Symbol(Foo, Decl(unionTypeParameterInference.ts, 0, 0))
 >T : Symbol(T, Decl(unionTypeParameterInference.ts, 2, 14))
->prop : Symbol(prop, Decl(unionTypeParameterInference.ts, 2, 18))
+>prop : Symbol(Foo.prop, Decl(unionTypeParameterInference.ts, 2, 18))
 >T : Symbol(T, Decl(unionTypeParameterInference.ts, 2, 14))
 
 declare function lift<U>(value: U | Foo<U>): Foo<U>;
diff --git a/tests/baselines/reference/unionTypePropertyAccessibility.errors.txt b/tests/baselines/reference/unionTypePropertyAccessibility.errors.txt
index 83e69cbcfc3..33b20183b5e 100644
--- a/tests/baselines/reference/unionTypePropertyAccessibility.errors.txt
+++ b/tests/baselines/reference/unionTypePropertyAccessibility.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/conformance/types/union/unionTypePropertyAccessibility.ts(35,1): error TS2445: Property 'member' is protected and only accessible within class 'Protected' and its subclasses.
-tests/cases/conformance/types/union/unionTypePropertyAccessibility.ts(36,1): error TS2341: Property 'member' is private and only accessible within class 'Private'.
+tests/cases/conformance/types/union/unionTypePropertyAccessibility.ts(35,4): error TS2445: Property 'member' is protected and only accessible within class 'Protected' and its subclasses.
+tests/cases/conformance/types/union/unionTypePropertyAccessibility.ts(36,4): error TS2341: Property 'member' is private and only accessible within class 'Private'.
 tests/cases/conformance/types/union/unionTypePropertyAccessibility.ts(38,4): error TS2339: Property 'member' does not exist on type 'Default | Protected'.
 tests/cases/conformance/types/union/unionTypePropertyAccessibility.ts(39,4): error TS2339: Property 'member' does not exist on type 'Default | Private'.
 tests/cases/conformance/types/union/unionTypePropertyAccessibility.ts(40,4): error TS2339: Property 'member' does not exist on type 'Public | Protected'.
@@ -48,10 +48,10 @@ tests/cases/conformance/types/union/unionTypePropertyAccessibility.ts(47,5): err
     v1.member;
     v2.member;
     v3.member;
-    ~~~~~~~~~
+       ~~~~~~
 !!! error TS2445: Property 'member' is protected and only accessible within class 'Protected' and its subclasses.
     v4.member;
-    ~~~~~~~~~
+       ~~~~~~
 !!! error TS2341: Property 'member' is private and only accessible within class 'Private'.
     v5.member;
     v6.member;
diff --git a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction1.symbols b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction1.symbols
index 24ba3b8a8cd..3056f8d21c0 100644
--- a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction1.symbols
+++ b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction1.symbols
@@ -3,7 +3,7 @@ class Module {
 >Module : Symbol(Module, Decl(unionTypeWithRecursiveSubtypeReduction1.ts, 0, 0))
 
     public members: Class[];
->members : Symbol(members, Decl(unionTypeWithRecursiveSubtypeReduction1.ts, 0, 14))
+>members : Symbol(Module.members, Decl(unionTypeWithRecursiveSubtypeReduction1.ts, 0, 14))
 >Class : Symbol(Class, Decl(unionTypeWithRecursiveSubtypeReduction1.ts, 6, 1))
 }
 
@@ -11,7 +11,7 @@ class Namespace {
 >Namespace : Symbol(Namespace, Decl(unionTypeWithRecursiveSubtypeReduction1.ts, 2, 1))
 
     public members: (Class | Property)[];
->members : Symbol(members, Decl(unionTypeWithRecursiveSubtypeReduction1.ts, 4, 17))
+>members : Symbol(Namespace.members, Decl(unionTypeWithRecursiveSubtypeReduction1.ts, 4, 17))
 >Class : Symbol(Class, Decl(unionTypeWithRecursiveSubtypeReduction1.ts, 6, 1))
 >Property : Symbol(Property, Decl(unionTypeWithRecursiveSubtypeReduction1.ts, 10, 1))
 }
@@ -20,7 +20,7 @@ class Class {
 >Class : Symbol(Class, Decl(unionTypeWithRecursiveSubtypeReduction1.ts, 6, 1))
 
     public parent: Namespace;
->parent : Symbol(parent, Decl(unionTypeWithRecursiveSubtypeReduction1.ts, 8, 13))
+>parent : Symbol(Class.parent, Decl(unionTypeWithRecursiveSubtypeReduction1.ts, 8, 13))
 >Namespace : Symbol(Namespace, Decl(unionTypeWithRecursiveSubtypeReduction1.ts, 2, 1))
 }
 
@@ -28,7 +28,7 @@ class Property {
 >Property : Symbol(Property, Decl(unionTypeWithRecursiveSubtypeReduction1.ts, 10, 1))
 
     public parent: Module | Class;
->parent : Symbol(parent, Decl(unionTypeWithRecursiveSubtypeReduction1.ts, 12, 16))
+>parent : Symbol(Property.parent, Decl(unionTypeWithRecursiveSubtypeReduction1.ts, 12, 16))
 >Module : Symbol(Module, Decl(unionTypeWithRecursiveSubtypeReduction1.ts, 0, 0))
 >Class : Symbol(Class, Decl(unionTypeWithRecursiveSubtypeReduction1.ts, 6, 1))
 }
diff --git a/tests/baselines/reference/unusedImportDeclaration.symbols b/tests/baselines/reference/unusedImportDeclaration.symbols
index a298ba94631..6a65f360559 100644
--- a/tests/baselines/reference/unusedImportDeclaration.symbols
+++ b/tests/baselines/reference/unusedImportDeclaration.symbols
@@ -25,7 +25,7 @@ class TesterB {
 >TesterB : Symbol(TesterB, Decl(unusedImportDeclaration_testerB.ts, 0, 0))
 
     me: string;
->me : Symbol(me, Decl(unusedImportDeclaration_testerB.ts, 0, 15))
+>me : Symbol(TesterB.me, Decl(unusedImportDeclaration_testerB.ts, 0, 15))
 }
 export = TesterB;
 >TesterB : Symbol(TesterB, Decl(unusedImportDeclaration_testerB.ts, 0, 0))
diff --git a/tests/baselines/reference/useStrictLikePrologueString01.js b/tests/baselines/reference/useStrictLikePrologueString01.js
new file mode 100644
index 00000000000..56df03abfe5
--- /dev/null
+++ b/tests/baselines/reference/useStrictLikePrologueString01.js
@@ -0,0 +1,14 @@
+//// [useStrictLikePrologueString01.ts]
+
+"hey!"
+" use strict "
+export function f() {   
+}
+
+//// [useStrictLikePrologueString01.js]
+"hey!";
+" use strict ";
+"use strict";
+function f() {
+}
+exports.f = f;
diff --git a/tests/baselines/reference/useStrictLikePrologueString01.symbols b/tests/baselines/reference/useStrictLikePrologueString01.symbols
new file mode 100644
index 00000000000..e96d48d9933
--- /dev/null
+++ b/tests/baselines/reference/useStrictLikePrologueString01.symbols
@@ -0,0 +1,7 @@
+=== tests/cases/compiler/useStrictLikePrologueString01.ts ===
+
+"hey!"
+" use strict "
+export function f() {   
+>f : Symbol(f, Decl(useStrictLikePrologueString01.ts, 2, 14))
+}
diff --git a/tests/baselines/reference/useStrictLikePrologueString01.types b/tests/baselines/reference/useStrictLikePrologueString01.types
new file mode 100644
index 00000000000..a12dfe3abd3
--- /dev/null
+++ b/tests/baselines/reference/useStrictLikePrologueString01.types
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/useStrictLikePrologueString01.ts ===
+
+"hey!"
+>"hey!" : string
+
+" use strict "
+>" use strict " : string
+
+export function f() {   
+>f : () => void
+}
diff --git a/tests/baselines/reference/usingModuleWithExportImportInValuePosition.symbols b/tests/baselines/reference/usingModuleWithExportImportInValuePosition.symbols
index a918e3ddec7..fc049a84260 100644
--- a/tests/baselines/reference/usingModuleWithExportImportInValuePosition.symbols
+++ b/tests/baselines/reference/usingModuleWithExportImportInValuePosition.symbols
@@ -9,8 +9,8 @@ export class Point {
 >Point : Symbol(Point, Decl(usingModuleWithExportImportInValuePosition.ts, 1, 28))
 
         constructor(public x: number, public y: number) { }
->x : Symbol(x, Decl(usingModuleWithExportImportInValuePosition.ts, 3, 20))
->y : Symbol(y, Decl(usingModuleWithExportImportInValuePosition.ts, 3, 37))
+>x : Symbol(Point.x, Decl(usingModuleWithExportImportInValuePosition.ts, 3, 20))
+>y : Symbol(Point.y, Decl(usingModuleWithExportImportInValuePosition.ts, 3, 37))
     }
     export module B {
 >B : Symbol(B, Decl(usingModuleWithExportImportInValuePosition.ts, 4, 5))
@@ -19,7 +19,7 @@ export class Point {
 >Id : Symbol(Id, Decl(usingModuleWithExportImportInValuePosition.ts, 5, 21))
 
             name: string;
->name : Symbol(name, Decl(usingModuleWithExportImportInValuePosition.ts, 6, 29))
+>name : Symbol(Id.name, Decl(usingModuleWithExportImportInValuePosition.ts, 6, 29))
         }
     }
 }
diff --git a/tests/baselines/reference/validStringAssignments.symbols b/tests/baselines/reference/validStringAssignments.symbols
index bb24a6c1574..cb949fd076e 100644
--- a/tests/baselines/reference/validStringAssignments.symbols
+++ b/tests/baselines/reference/validStringAssignments.symbols
@@ -17,6 +17,6 @@ var c: string = x;
 
 var d: String = x;
 >d : Symbol(d, Decl(validStringAssignments.ts, 5, 3))
->String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(validStringAssignments.ts, 0, 3))
 
diff --git a/tests/baselines/reference/validUndefinedAssignments.symbols b/tests/baselines/reference/validUndefinedAssignments.symbols
index 791834eefde..802bf55fee6 100644
--- a/tests/baselines/reference/validUndefinedAssignments.symbols
+++ b/tests/baselines/reference/validUndefinedAssignments.symbols
@@ -30,7 +30,7 @@ e = x; // should work
 
 class C { foo: string }
 >C : Symbol(C, Decl(validUndefinedAssignments.ts, 8, 6))
->foo : Symbol(foo, Decl(validUndefinedAssignments.ts, 10, 9))
+>foo : Symbol(C.foo, Decl(validUndefinedAssignments.ts, 10, 9))
 
 var f: C;
 >f : Symbol(f, Decl(validUndefinedAssignments.ts, 11, 3))
@@ -42,7 +42,7 @@ f = x;
 
 interface I { foo: string }
 >I : Symbol(I, Decl(validUndefinedAssignments.ts, 12, 6))
->foo : Symbol(foo, Decl(validUndefinedAssignments.ts, 14, 13))
+>foo : Symbol(I.foo, Decl(validUndefinedAssignments.ts, 14, 13))
 
 var g: I;
 >g : Symbol(g, Decl(validUndefinedAssignments.ts, 15, 3))
diff --git a/tests/baselines/reference/validUseOfThisInSuper.symbols b/tests/baselines/reference/validUseOfThisInSuper.symbols
index 2e71c859a4f..650eec44dde 100644
--- a/tests/baselines/reference/validUseOfThisInSuper.symbols
+++ b/tests/baselines/reference/validUseOfThisInSuper.symbols
@@ -3,7 +3,7 @@ class Base {
 >Base : Symbol(Base, Decl(validUseOfThisInSuper.ts, 0, 0))
 
     constructor(public b: Base) {
->b : Symbol(b, Decl(validUseOfThisInSuper.ts, 1, 16))
+>b : Symbol(Base.b, Decl(validUseOfThisInSuper.ts, 1, 16))
 >Base : Symbol(Base, Decl(validUseOfThisInSuper.ts, 0, 0))
     }
 }
diff --git a/tests/baselines/reference/varArgsOnConstructorTypes.symbols b/tests/baselines/reference/varArgsOnConstructorTypes.symbols
index 2b391612356..e810955f443 100644
--- a/tests/baselines/reference/varArgsOnConstructorTypes.symbols
+++ b/tests/baselines/reference/varArgsOnConstructorTypes.symbols
@@ -11,10 +11,10 @@ export class B extends A {
 >A : Symbol(A, Decl(varArgsOnConstructorTypes.ts, 0, 0))
 
     private p1: number;
->p1 : Symbol(p1, Decl(varArgsOnConstructorTypes.ts, 4, 26))
+>p1 : Symbol(B.p1, Decl(varArgsOnConstructorTypes.ts, 4, 26))
 
     private p2: string;
->p2 : Symbol(p2, Decl(varArgsOnConstructorTypes.ts, 5, 23))
+>p2 : Symbol(B.p2, Decl(varArgsOnConstructorTypes.ts, 5, 23))
 
     constructor(element: any, url: string) {
 >element : Symbol(element, Decl(varArgsOnConstructorTypes.ts, 8, 16))
@@ -25,15 +25,15 @@ export class B extends A {
 >element : Symbol(element, Decl(varArgsOnConstructorTypes.ts, 8, 16))
 
         this.p1 = element;
->this.p1 : Symbol(p1, Decl(varArgsOnConstructorTypes.ts, 4, 26))
+>this.p1 : Symbol(B.p1, Decl(varArgsOnConstructorTypes.ts, 4, 26))
 >this : Symbol(B, Decl(varArgsOnConstructorTypes.ts, 2, 1))
->p1 : Symbol(p1, Decl(varArgsOnConstructorTypes.ts, 4, 26))
+>p1 : Symbol(B.p1, Decl(varArgsOnConstructorTypes.ts, 4, 26))
 >element : Symbol(element, Decl(varArgsOnConstructorTypes.ts, 8, 16))
 
         this.p2 = url;
->this.p2 : Symbol(p2, Decl(varArgsOnConstructorTypes.ts, 5, 23))
+>this.p2 : Symbol(B.p2, Decl(varArgsOnConstructorTypes.ts, 5, 23))
 >this : Symbol(B, Decl(varArgsOnConstructorTypes.ts, 2, 1))
->p2 : Symbol(p2, Decl(varArgsOnConstructorTypes.ts, 5, 23))
+>p2 : Symbol(B.p2, Decl(varArgsOnConstructorTypes.ts, 5, 23))
 >url : Symbol(url, Decl(varArgsOnConstructorTypes.ts, 8, 29))
     }
 }
@@ -42,13 +42,13 @@ export interface I1 {
 >I1 : Symbol(I1, Decl(varArgsOnConstructorTypes.ts, 13, 1))
 
     register(inputClass: new(...params: any[]) => A);
->register : Symbol(register, Decl(varArgsOnConstructorTypes.ts, 15, 21), Decl(varArgsOnConstructorTypes.ts, 16, 53))
+>register : Symbol(I1.register, Decl(varArgsOnConstructorTypes.ts, 15, 21), Decl(varArgsOnConstructorTypes.ts, 16, 53))
 >inputClass : Symbol(inputClass, Decl(varArgsOnConstructorTypes.ts, 16, 13))
 >params : Symbol(params, Decl(varArgsOnConstructorTypes.ts, 16, 29))
 >A : Symbol(A, Decl(varArgsOnConstructorTypes.ts, 0, 0))
 
     register(inputClass: { new (...params: any[]): A; }[]);
->register : Symbol(register, Decl(varArgsOnConstructorTypes.ts, 15, 21), Decl(varArgsOnConstructorTypes.ts, 16, 53))
+>register : Symbol(I1.register, Decl(varArgsOnConstructorTypes.ts, 15, 21), Decl(varArgsOnConstructorTypes.ts, 16, 53))
 >inputClass : Symbol(inputClass, Decl(varArgsOnConstructorTypes.ts, 17, 13))
 >params : Symbol(params, Decl(varArgsOnConstructorTypes.ts, 17, 32))
 >A : Symbol(A, Decl(varArgsOnConstructorTypes.ts, 0, 0))
diff --git a/tests/baselines/reference/varAsID.symbols b/tests/baselines/reference/varAsID.symbols
index accc605e347..6206fa5901c 100644
--- a/tests/baselines/reference/varAsID.symbols
+++ b/tests/baselines/reference/varAsID.symbols
@@ -4,10 +4,10 @@ class Foo {
 >Foo : Symbol(Foo, Decl(varAsID.ts, 0, 0))
 
     var; // ok
->var : Symbol(var, Decl(varAsID.ts, 1, 11))
+>var : Symbol(Foo.var, Decl(varAsID.ts, 1, 11))
 
     x=1;
->x : Symbol(x, Decl(varAsID.ts, 2, 8))
+>x : Symbol(Foo.x, Decl(varAsID.ts, 2, 8))
 }
 
 var f = new Foo();
@@ -19,10 +19,10 @@ class Foo2 {
 >Foo2 : Symbol(Foo2, Decl(varAsID.ts, 6, 18))
 
     var // not an error, because of ASI.
->var : Symbol(var, Decl(varAsID.ts, 9, 12))
+>var : Symbol(Foo2.var, Decl(varAsID.ts, 9, 12))
 
     x=1;
->x : Symbol(x, Decl(varAsID.ts, 10, 7))
+>x : Symbol(Foo2.x, Decl(varAsID.ts, 10, 7))
 }
 
 var f2 = new Foo2();
diff --git a/tests/baselines/reference/vardecl.symbols b/tests/baselines/reference/vardecl.symbols
index 0860fc19500..98e6f1b5330 100644
--- a/tests/baselines/reference/vardecl.symbols
+++ b/tests/baselines/reference/vardecl.symbols
@@ -150,7 +150,7 @@ module m2 {
 >C : Symbol(C, Decl(vardecl.ts, 65, 11))
 
         constructor (public b) {
->b : Symbol(b, Decl(vardecl.ts, 68, 21))
+>b : Symbol(C.b, Decl(vardecl.ts, 68, 21))
         }
     }
 
@@ -158,7 +158,7 @@ module m2 {
 >C2 : Symbol(C2, Decl(vardecl.ts, 70, 5))
 
         constructor (public b) {
->b : Symbol(b, Decl(vardecl.ts, 73, 21))
+>b : Symbol(C2.b, Decl(vardecl.ts, 73, 21))
         }
     }
     var m;
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/visibilityOfCrossModuleTypeUsage.symbols b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.symbols
index d1132151097..6b685cd13a4 100644
--- a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.symbols
+++ b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.symbols
@@ -32,12 +32,12 @@ export interface IConfiguration {
 >IConfiguration : Symbol(IConfiguration, Decl(visibilityOfCrossModuleTypeUsage_commands.ts, 3, 69))
 
     workspace: server.IWorkspace;
->workspace : Symbol(workspace, Decl(visibilityOfCrossModuleTypeUsage_commands.ts, 5, 33))
+>workspace : Symbol(IConfiguration.workspace, Decl(visibilityOfCrossModuleTypeUsage_commands.ts, 5, 33))
 >server : Symbol(server, Decl(visibilityOfCrossModuleTypeUsage_commands.ts, 2, 61))
 >IWorkspace : Symbol(server.IWorkspace, Decl(visibilityOfCrossModuleTypeUsage_server.ts, 1, 1))
 
     server?: server.IServer;
->server : Symbol(server, Decl(visibilityOfCrossModuleTypeUsage_commands.ts, 6, 33))
+>server : Symbol(IConfiguration.server, Decl(visibilityOfCrossModuleTypeUsage_commands.ts, 6, 33))
 >server : Symbol(server, Decl(visibilityOfCrossModuleTypeUsage_commands.ts, 2, 61))
 >IServer : Symbol(server.IServer, Decl(visibilityOfCrossModuleTypeUsage_server.ts, 0, 0))
 }
@@ -51,7 +51,7 @@ export interface IWorkspace {
 >IWorkspace : Symbol(IWorkspace, Decl(visibilityOfCrossModuleTypeUsage_server.ts, 1, 1))
 
     toAbsolutePath(server: IServer, workspaceRelativePath?: string): string;
->toAbsolutePath : Symbol(toAbsolutePath, Decl(visibilityOfCrossModuleTypeUsage_server.ts, 3, 29))
+>toAbsolutePath : Symbol(IWorkspace.toAbsolutePath, Decl(visibilityOfCrossModuleTypeUsage_server.ts, 3, 29))
 >server : Symbol(server, Decl(visibilityOfCrossModuleTypeUsage_server.ts, 4, 19))
 >IServer : Symbol(IServer, Decl(visibilityOfCrossModuleTypeUsage_server.ts, 0, 0))
 >workspaceRelativePath : Symbol(workspaceRelativePath, Decl(visibilityOfCrossModuleTypeUsage_server.ts, 4, 35))
diff --git a/tests/baselines/reference/visibilityOfTypeParameters.symbols b/tests/baselines/reference/visibilityOfTypeParameters.symbols
index 1380822e9b2..1f80a77e2b3 100644
--- a/tests/baselines/reference/visibilityOfTypeParameters.symbols
+++ b/tests/baselines/reference/visibilityOfTypeParameters.symbols
@@ -4,7 +4,7 @@ export class MyClass {
 >MyClass : Symbol(MyClass, Decl(visibilityOfTypeParameters.ts, 0, 0))
 
     protected myMethod<T>(val: T): T {
->myMethod : Symbol(myMethod, Decl(visibilityOfTypeParameters.ts, 1, 22))
+>myMethod : Symbol(MyClass.myMethod, Decl(visibilityOfTypeParameters.ts, 1, 22))
 >T : Symbol(T, Decl(visibilityOfTypeParameters.ts, 2, 23))
 >val : Symbol(val, Decl(visibilityOfTypeParameters.ts, 2, 26))
 >T : Symbol(T, Decl(visibilityOfTypeParameters.ts, 2, 23))
diff --git a/tests/baselines/reference/voidOperatorWithBooleanType.symbols b/tests/baselines/reference/voidOperatorWithBooleanType.symbols
index 1d044a6d9c6..b8132c2a993 100644
--- a/tests/baselines/reference/voidOperatorWithBooleanType.symbols
+++ b/tests/baselines/reference/voidOperatorWithBooleanType.symbols
@@ -10,7 +10,7 @@ class A {
 >A : Symbol(A, Decl(voidOperatorWithBooleanType.ts, 3, 40))
 
     public a: boolean;
->a : Symbol(a, Decl(voidOperatorWithBooleanType.ts, 5, 9))
+>a : Symbol(A.a, Decl(voidOperatorWithBooleanType.ts, 5, 9))
 
     static foo() { return false; }
 >foo : Symbol(A.foo, Decl(voidOperatorWithBooleanType.ts, 6, 22))
diff --git a/tests/baselines/reference/voidOperatorWithNumberType.symbols b/tests/baselines/reference/voidOperatorWithNumberType.symbols
index 43f10478499..ae8371a6bab 100644
--- a/tests/baselines/reference/voidOperatorWithNumberType.symbols
+++ b/tests/baselines/reference/voidOperatorWithNumberType.symbols
@@ -13,7 +13,7 @@ class A {
 >A : Symbol(A, Decl(voidOperatorWithNumberType.ts, 4, 36))
 
     public a: number;
->a : Symbol(a, Decl(voidOperatorWithNumberType.ts, 6, 9))
+>a : Symbol(A.a, Decl(voidOperatorWithNumberType.ts, 6, 9))
 
     static foo() { return 1; }
 >foo : Symbol(A.foo, Decl(voidOperatorWithNumberType.ts, 7, 21))
diff --git a/tests/baselines/reference/voidOperatorWithStringType.symbols b/tests/baselines/reference/voidOperatorWithStringType.symbols
index 64fb0e600e8..448b5f79c00 100644
--- a/tests/baselines/reference/voidOperatorWithStringType.symbols
+++ b/tests/baselines/reference/voidOperatorWithStringType.symbols
@@ -13,7 +13,7 @@ class A {
 >A : Symbol(A, Decl(voidOperatorWithStringType.ts, 4, 40))
 
     public a: string;
->a : Symbol(a, Decl(voidOperatorWithStringType.ts, 6, 9))
+>a : Symbol(A.a, Decl(voidOperatorWithStringType.ts, 6, 9))
 
     static foo() { return ""; }
 >foo : Symbol(A.foo, Decl(voidOperatorWithStringType.ts, 7, 21))
diff --git a/tests/baselines/reference/widenedTypes.errors.txt b/tests/baselines/reference/widenedTypes.errors.txt
index 2277ef6eea7..beda634c2a6 100644
--- a/tests/baselines/reference/widenedTypes.errors.txt
+++ b/tests/baselines/reference/widenedTypes.errors.txt
@@ -6,8 +6,8 @@ tests/cases/compiler/widenedTypes.ts(11,1): error TS2322: Type 'string' is not a
 tests/cases/compiler/widenedTypes.ts(18,1): error TS2322: Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/widenedTypes.ts(23,5): error TS2322: Type 'number[]' is not assignable to type 'string[]'.
   Type 'number' is not assignable to type 'string'.
-tests/cases/compiler/widenedTypes.ts(24,5): error TS2322: Type '{ [x: string]: number; x: number; y: null; }' is not assignable to type '{ [x: string]: string; }'.
-  Index signatures are incompatible.
+tests/cases/compiler/widenedTypes.ts(24,5): error TS2322: Type '{ x: number; y: null; }' is not assignable to type '{ [x: string]: string; }'.
+  Property 'x' is incompatible with index signature.
     Type 'number' is not assignable to type 'string'.
 
 
@@ -52,6 +52,6 @@ tests/cases/compiler/widenedTypes.ts(24,5): error TS2322: Type '{ [x: string]: n
 !!! error TS2322:   Type 'number' is not assignable to type 'string'.
     var obj: { [x: string]: string; } = { x: 3, y: null }; // assignable because null is widened, and therefore BCT is any
         ~~~
-!!! error TS2322: Type '{ [x: string]: number; x: number; y: null; }' is not assignable to type '{ [x: string]: string; }'.
-!!! error TS2322:   Index signatures are incompatible.
+!!! error TS2322: Type '{ x: number; y: null; }' is not assignable to type '{ [x: string]: string; }'.
+!!! error TS2322:   Property 'x' is incompatible with index signature.
 !!! error TS2322:     Type 'number' is not assignable to type 'string'.
\ No newline at end of file
diff --git a/tests/baselines/reference/wideningTuples5.errors.txt b/tests/baselines/reference/wideningTuples5.errors.txt
index bfd72079f55..cd6bf6161c9 100644
--- a/tests/baselines/reference/wideningTuples5.errors.txt
+++ b/tests/baselines/reference/wideningTuples5.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/types/tuple/wideningTuples5.ts(1,6): error TS7005: Variable 'a' implicitly has an 'any' type.
-tests/cases/conformance/types/tuple/wideningTuples5.ts(1,9): error TS7005: Variable 'b' implicitly has an 'any' type.
+tests/cases/conformance/types/tuple/wideningTuples5.ts(1,6): error TS7031: Binding element 'a' implicitly has an 'any' type.
+tests/cases/conformance/types/tuple/wideningTuples5.ts(1,9): error TS7031: Binding element 'b' implicitly has an 'any' type.
 
 
 ==== tests/cases/conformance/types/tuple/wideningTuples5.ts (2 errors) ====
     var [a, b] = [undefined, null];
          ~
-!!! error TS7005: Variable 'a' implicitly has an 'any' type.
+!!! error TS7031: Binding element 'a' implicitly has an 'any' type.
             ~
-!!! error TS7005: Variable 'b' implicitly has an 'any' type.
\ No newline at end of file
+!!! error TS7031: Binding element 'b' implicitly has an 'any' type.
\ No newline at end of file
diff --git a/tests/baselines/reference/withImportDecl.symbols b/tests/baselines/reference/withImportDecl.symbols
index ae41e927cfa..4ba677d8878 100644
--- a/tests/baselines/reference/withImportDecl.symbols
+++ b/tests/baselines/reference/withImportDecl.symbols
@@ -80,5 +80,5 @@ b.foo;
 === tests/cases/compiler/withImportDecl_0.ts ===
 export class A { foo: string; }
 >A : Symbol(A, Decl(withImportDecl_0.ts, 0, 0))
->foo : Symbol(foo, Decl(withImportDecl_0.ts, 0, 16))
+>foo : Symbol(A.foo, Decl(withImportDecl_0.ts, 0, 16))
 
diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints.symbols b/tests/baselines/reference/wrappedAndRecursiveConstraints.symbols
index b0128b37797..4f56145951d 100644
--- a/tests/baselines/reference/wrappedAndRecursiveConstraints.symbols
+++ b/tests/baselines/reference/wrappedAndRecursiveConstraints.symbols
@@ -4,14 +4,14 @@
 class C<T extends Date> {
 >C : Symbol(C, Decl(wrappedAndRecursiveConstraints.ts, 0, 0))
 >T : Symbol(T, Decl(wrappedAndRecursiveConstraints.ts, 2, 8))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     constructor(public data: T) { }
->data : Symbol(data, Decl(wrappedAndRecursiveConstraints.ts, 3, 16))
+>data : Symbol(C.data, Decl(wrappedAndRecursiveConstraints.ts, 3, 16))
 >T : Symbol(T, Decl(wrappedAndRecursiveConstraints.ts, 2, 8))
 
     foo<U extends T>(x: U) {
->foo : Symbol(foo, Decl(wrappedAndRecursiveConstraints.ts, 3, 35))
+>foo : Symbol(C.foo, Decl(wrappedAndRecursiveConstraints.ts, 3, 35))
 >U : Symbol(U, Decl(wrappedAndRecursiveConstraints.ts, 4, 8))
 >T : Symbol(T, Decl(wrappedAndRecursiveConstraints.ts, 2, 8))
 >x : Symbol(x, Decl(wrappedAndRecursiveConstraints.ts, 4, 21))
@@ -24,10 +24,10 @@ class C<T extends Date> {
 
 interface Foo extends Date {
 >Foo : Symbol(Foo, Decl(wrappedAndRecursiveConstraints.ts, 7, 1))
->Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
     foo: string;
->foo : Symbol(foo, Decl(wrappedAndRecursiveConstraints.ts, 9, 28))
+>foo : Symbol(Foo.foo, Decl(wrappedAndRecursiveConstraints.ts, 9, 28))
 }
 
 var y: Foo = null;
diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints3.symbols b/tests/baselines/reference/wrappedAndRecursiveConstraints3.symbols
index 06279a5c264..db796c6eca0 100644
--- a/tests/baselines/reference/wrappedAndRecursiveConstraints3.symbols
+++ b/tests/baselines/reference/wrappedAndRecursiveConstraints3.symbols
@@ -11,7 +11,7 @@ class C<T extends { length: number }> {
 >T : Symbol(T, Decl(wrappedAndRecursiveConstraints3.ts, 2, 8))
 
     foo<U extends T>(x: U) {
->foo : Symbol(foo, Decl(wrappedAndRecursiveConstraints3.ts, 3, 25))
+>foo : Symbol(C.foo, Decl(wrappedAndRecursiveConstraints3.ts, 3, 25))
 >U : Symbol(U, Decl(wrappedAndRecursiveConstraints3.ts, 4, 8))
 >T : Symbol(T, Decl(wrappedAndRecursiveConstraints3.ts, 2, 8))
 >x : Symbol(x, Decl(wrappedAndRecursiveConstraints3.ts, 4, 21))
diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints4.errors.txt b/tests/baselines/reference/wrappedAndRecursiveConstraints4.errors.txt
index 60602351b46..47e8e6ff4f2 100644
--- a/tests/baselines/reference/wrappedAndRecursiveConstraints4.errors.txt
+++ b/tests/baselines/reference/wrappedAndRecursiveConstraints4.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints4.ts(13,12): error TS2345: Argument of type '{ [x: number]: undefined; length: number; charAt: (x: number) => void; }' is not assignable to parameter of type 'string'.
+tests/cases/conformance/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints4.ts(13,12): error TS2345: Argument of type '{ length: number; charAt: (x: number) => void; }' is not assignable to parameter of type 'string'.
 
 
 ==== tests/cases/conformance/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints4.ts (1 errors) ====
@@ -16,4 +16,4 @@ tests/cases/conformance/types/typeParameters/typeArgumentLists/wrappedAndRecursi
     var r = c.foo('');
     var r2 = r({ length: 3, charAt: (x: number) => { '' } }); // error
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2345: Argument of type '{ [x: number]: undefined; length: number; charAt: (x: number) => void; }' is not assignable to parameter of type 'string'.
\ No newline at end of file
+!!! error TS2345: Argument of type '{ length: number; charAt: (x: number) => void; }' is not assignable to parameter of type 'string'.
\ No newline at end of file
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/APISample_compile.ts b/tests/cases/compiler/APISample_compile.ts
index c63009f7d63..9672b9863fa 100644
--- a/tests/cases/compiler/APISample_compile.ts
+++ b/tests/cases/compiler/APISample_compile.ts
@@ -18,7 +18,7 @@ export function compile(fileNames: string[], options: ts.CompilerOptions): void
     var program = ts.createProgram(fileNames, options);
     var emitResult = program.emit();
 
-    var allDiagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
+    var allDiagnostics = ts.getPreEmitDiagnostics(program);
 
     allDiagnostics.forEach(diagnostic => {
         var { line, character } = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
diff --git a/tests/cases/compiler/APISample_parseConfig.ts b/tests/cases/compiler/APISample_parseConfig.ts
new file mode 100644
index 00000000000..3e88e50727e
--- /dev/null
+++ b/tests/cases/compiler/APISample_parseConfig.ts
@@ -0,0 +1,39 @@
+// @module: commonjs
+// @includebuiltfile: typescript_standalone.d.ts
+// @stripInternal:true
+
+/*
+ * Note: This test is a public API sample. The sample sources can be found 
+         at: https://github.com/Microsoft/TypeScript/wiki/Using-the-Compiler-API#a-minimal-compiler
+ *       Please log a "breaking change" issue for any API breaking change affecting this issue
+ */
+
+declare var process: any;
+declare var console: any;
+declare var os: any;
+
+import ts = require("typescript");
+
+function printError(error: ts.Diagnostic): void {
+    if (!error) {
+        return;
+    }
+    console.log(`${error.file && error.file.fileName}: ${error.messageText}`);
+}
+
+export function createProgram(rootFiles: string[], compilerOptionsJson: string): ts.Program {
+    const { config, error } = ts.parseConfigFileTextToJson("tsconfig.json", compilerOptionsJson)
+    if (error) {
+        printError(error);
+        return undefined;
+    }
+    const basePath: string = process.cwd();
+    const settings = ts.convertCompilerOptionsFromJson(config.config["compilerOptions"], basePath);
+    if (!settings.options) {
+        for (const err of settings.errors) {
+            printError(err);
+        }
+        return undefined;
+    }
+    return ts.createProgram(rootFiles, settings.options);
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/abstractProperty.ts b/tests/cases/compiler/abstractProperty.ts
new file mode 100644
index 00000000000..c0b76057a6b
--- /dev/null
+++ b/tests/cases/compiler/abstractProperty.ts
@@ -0,0 +1,22 @@
+//@target: ES5
+interface A {
+    prop: string;
+    raw: string;
+    m(): void;
+}
+abstract class B implements A {
+    abstract prop: string;
+    abstract raw: string;
+    abstract readonly ro: string;
+    abstract get readonlyProp(): string;
+    abstract set readonlyProp(val: string);
+    abstract m(): void;
+}
+class C extends B {
+    get prop() { return "foo"; }
+    set prop(v) { }
+    raw = "edge";
+    readonly ro = "readonly please";
+    readonlyProp: string; // don't have to give a value, in fact
+    m() { }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/abstractPropertyNegative.ts b/tests/cases/compiler/abstractPropertyNegative.ts
new file mode 100644
index 00000000000..16c09b10573
--- /dev/null
+++ b/tests/cases/compiler/abstractPropertyNegative.ts
@@ -0,0 +1,43 @@
+//@target: ES5
+interface A {
+    prop: string;
+    m(): string;
+}
+abstract class B implements A {
+    abstract prop: string;
+    public abstract readonly ro: string;
+    abstract get readonlyProp(): string;
+    abstract m(): string;
+    abstract get mismatch(): string;
+    abstract set mismatch(val: number); // error, not same type
+}
+class C extends B {
+    readonly ro = "readonly please";
+    abstract notAllowed: string;
+    get concreteWithNoBody(): string;
+}
+let c = new C();
+c.ro = "error: lhs of assignment can't be readonly";
+
+abstract class WrongTypeProperty {
+    abstract num: number;
+}
+class WrongTypePropertyImpl extends WrongTypeProperty {
+    num = "nope, wrong";
+}
+abstract class WrongTypeAccessor {
+    abstract get num(): number;
+}
+class WrongTypeAccessorImpl extends WrongTypeAccessor {
+    get num() { return "nope, wrong"; }
+}
+class WrongTypeAccessorImpl2 extends WrongTypeAccessor {
+    num = "nope, wrong";
+}
+
+abstract class AbstractAccessorMismatch {
+    abstract get p1(): string;
+    set p1(val: string) { };
+    get p2(): string { return "should work"; }
+    abstract set p2(val: string);
+}
diff --git a/tests/cases/compiler/arrowFunctionErrorSpan.ts b/tests/cases/compiler/arrowFunctionErrorSpan.ts
new file mode 100644
index 00000000000..4c7fff88a93
--- /dev/null
+++ b/tests/cases/compiler/arrowFunctionErrorSpan.ts
@@ -0,0 +1,53 @@
+function f(a: () => number) { }
+
+// oneliner
+f(() => { });
+
+// multiline, body
+f(() => {
+
+});
+
+// multiline 2, body
+f(() => {
+
+});
+
+// multiline 3, arrow on a new line
+f(()
+    => { });
+
+// multiline 4, arguments
+f((a,
+    b,
+    c,
+    d) => { });
+
+// single line with a comment
+f(/*
+    */() => { });
+
+// multi line with a comment
+f(/*
+    */() => { });
+
+// multi line with a comment 2
+f(/*
+    */() => { 
+
+    });
+
+// multi line with a comment 3
+f(  // comment 1
+    // comment 2
+    () =>
+    // comment 3
+    {
+        // comment 4
+    }
+    // comment 5
+); 
+
+// body is not a block
+f(_ => 1 +
+    2);
diff --git a/tests/cases/compiler/blockScopedBindingsReassignedInLoop1.ts b/tests/cases/compiler/blockScopedBindingsReassignedInLoop1.ts
new file mode 100644
index 00000000000..e052702bce2
--- /dev/null
+++ b/tests/cases/compiler/blockScopedBindingsReassignedInLoop1.ts
@@ -0,0 +1,7 @@
+declare function use(n: number): void;
+(function () {
+  'use strict'
+  for (let i = 0; i < 9; ++i) {
+    (() => use(++i))();
+  }
+})();
\ No newline at end of file
diff --git a/tests/cases/compiler/blockScopedBindingsReassignedInLoop2.ts b/tests/cases/compiler/blockScopedBindingsReassignedInLoop2.ts
new file mode 100644
index 00000000000..84d9f8d214b
--- /dev/null
+++ b/tests/cases/compiler/blockScopedBindingsReassignedInLoop2.ts
@@ -0,0 +1,41 @@
+for (let x = 1, y = 2; x < y; ++x, --y) {
+    let a = () => x++ + y++;
+    if (x == 1) {
+        break;
+    }
+    else {
+        y = 5;
+    }
+}
+
+for (let x = 1, y = 2; x < y; ++x, --y) {
+    let a = () => x++ + y++;
+    if (x == 1) {
+        continue;
+    }
+    else {
+        y = 5;
+    }
+}
+
+loop:
+for (let x = 1, y = 2; x < y; ++x, --y) {
+    let a = () => x++ + y++;
+    if (x == 1) {
+        break loop;
+    }
+    else {
+        y = 5;
+    }
+}
+
+loop:
+for (let x = 1, y = 2; x < y; ++x, --y) {
+    let a = () => x++ + y++;
+    if (x == 1) {
+        continue loop;
+    }
+    else {
+        y = 5;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/blockScopedBindingsReassignedInLoop3.ts b/tests/cases/compiler/blockScopedBindingsReassignedInLoop3.ts
new file mode 100644
index 00000000000..a68c708193a
--- /dev/null
+++ b/tests/cases/compiler/blockScopedBindingsReassignedInLoop3.ts
@@ -0,0 +1,91 @@
+
+for (let x = 1, y = 2; x < y; ++x, --y) {
+    let a = () => x++ + y++;
+    if (x == 1) {
+        break;
+    }
+    else {
+        for (let a = 1; a < 5; --a) {
+            let f = () => a;
+            if (a) {
+                a = x;
+                break;
+            }
+            else {
+                y++;
+            }
+        }
+        
+        y = 5;
+    }
+}
+
+
+for (let x = 1, y = 2; x < y; ++x, --y) {
+    let a = () => x++ + y++;
+    if (x == 1) {
+        continue;
+    }
+    else {
+        for (let a = 1; a < 5; --a) {
+            let f = () => a;
+            if (a) {
+                a = x;
+                continue;
+            }
+            else {
+                y++;
+            }
+        }
+        
+        y = 5;
+    }
+}
+
+loop2:
+for (let x = 1, y = 2; x < y; ++x, --y) {
+    let a = () => x++ + y++;
+    if (x == 1) {
+        break loop2;
+    }
+    else {
+        loop1:
+        for (let a = 1; a < 5; --a) {
+            let f = () => a;
+            if (a) {
+                a = x;
+                break loop1;
+            }
+            else {
+                y++;
+                break loop2
+            }
+        }
+        
+        y = 5;
+    }
+}
+
+loop2:
+for (let x = 1, y = 2; x < y; ++x, --y) {
+    let a = () => x++ + y++;
+    if (x == 1) {
+        continue loop2;
+    }
+    else {
+        loop1:
+        for (let a = 1; a < 5; --a) {
+            let f = () => a;
+            if (a) {
+                a = x;
+                continue loop1;
+            }
+            else {
+                y++;
+                continue loop2
+            }
+        }
+        
+        y = 5;
+    }
+}
diff --git a/tests/cases/compiler/blockScopedBindingsReassignedInLoop4.ts b/tests/cases/compiler/blockScopedBindingsReassignedInLoop4.ts
new file mode 100644
index 00000000000..82f4bcc5dd0
--- /dev/null
+++ b/tests/cases/compiler/blockScopedBindingsReassignedInLoop4.ts
@@ -0,0 +1,11 @@
+function f1() {
+    for (let x = 1, y = 2; x < y; ++x, --y) {
+        let a = () => x++ + y++;
+        if (x == 1) {
+            return 1;
+        }
+        else {
+            y = 5;
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/blockScopedBindingsReassignedInLoop5.ts b/tests/cases/compiler/blockScopedBindingsReassignedInLoop5.ts
new file mode 100644
index 00000000000..c6c577ea9fb
--- /dev/null
+++ b/tests/cases/compiler/blockScopedBindingsReassignedInLoop5.ts
@@ -0,0 +1,7 @@
+for (let x = 1, y = 2; x < y; ++x, --y) {
+    let a = () => x++ + y++;
+    if (x == 1) 
+        break;
+    else 
+        y = 5;
+}
diff --git a/tests/cases/compiler/blockScopedBindingsReassignedInLoop6.ts b/tests/cases/compiler/blockScopedBindingsReassignedInLoop6.ts
new file mode 100644
index 00000000000..e735bb61ac8
--- /dev/null
+++ b/tests/cases/compiler/blockScopedBindingsReassignedInLoop6.ts
@@ -0,0 +1,28 @@
+function f1() {
+    for (let [x, y] = [1, 2]; x < y; ++x, --y) {
+        let a = () => x++ + y++;
+        if (x == 1)
+            break;
+        else if (y == 2)
+            y = 5;
+        else
+            return;
+    }
+}
+
+function f2() {
+    for (let [{a: x, b: {c: y}}] = [{a: 1, b: {c: 2}}]; x < y; ++x, --y) {
+        let a = () => x++ + y++;
+        if (x == 1)
+            break;
+        else if (y == 2)
+            y = 5;
+        else
+            return;
+    }
+}
+
+
+
+
+
diff --git a/tests/cases/compiler/blockScopedFunctionDeclarationES5.ts b/tests/cases/compiler/blockScopedFunctionDeclarationES5.ts
new file mode 100644
index 00000000000..dbb725361a0
--- /dev/null
+++ b/tests/cases/compiler/blockScopedFunctionDeclarationES5.ts
@@ -0,0 +1,6 @@
+// @target: ES5
+if (true) {
+    function foo() { }
+    foo();
+}
+foo();
\ No newline at end of file
diff --git a/tests/cases/compiler/blockScopedFunctionDeclarationES6.ts b/tests/cases/compiler/blockScopedFunctionDeclarationES6.ts
new file mode 100644
index 00000000000..fd0e678b806
--- /dev/null
+++ b/tests/cases/compiler/blockScopedFunctionDeclarationES6.ts
@@ -0,0 +1,6 @@
+// @target: ES6
+if (true) {
+    function foo() { }
+    foo();
+}
+foo();
\ No newline at end of file
diff --git a/tests/cases/compiler/blockScopedFunctionDeclarationInStrictClass.ts b/tests/cases/compiler/blockScopedFunctionDeclarationInStrictClass.ts
new file mode 100644
index 00000000000..48d83e6ad87
--- /dev/null
+++ b/tests/cases/compiler/blockScopedFunctionDeclarationInStrictClass.ts
@@ -0,0 +1,10 @@
+// @target: ES5
+class c {
+    method() {
+        if (true) {
+            function foo() { }
+            foo(); // ok
+        }
+        foo(); // not ok
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/blockScopedFunctionDeclarationInStrictModule.ts b/tests/cases/compiler/blockScopedFunctionDeclarationInStrictModule.ts
new file mode 100644
index 00000000000..48c68770620
--- /dev/null
+++ b/tests/cases/compiler/blockScopedFunctionDeclarationInStrictModule.ts
@@ -0,0 +1,8 @@
+// @target: ES5
+// @module: amd
+if (true) {
+    function foo() { }
+    foo(); // ok
+}
+
+export = foo; // not ok
\ No newline at end of file
diff --git a/tests/cases/compiler/blockScopedFunctionDeclarationStrictES5.ts b/tests/cases/compiler/blockScopedFunctionDeclarationStrictES5.ts
new file mode 100644
index 00000000000..c5035e1130c
--- /dev/null
+++ b/tests/cases/compiler/blockScopedFunctionDeclarationStrictES5.ts
@@ -0,0 +1,7 @@
+// @target: ES5
+"use strict";
+if (true) {
+    function foo() { } // Error to declare function in block scope
+    foo(); // This call should be ok
+}
+foo(); // Error to find name foo
\ No newline at end of file
diff --git a/tests/cases/compiler/blockScopedFunctionDeclarationStrictES6.ts b/tests/cases/compiler/blockScopedFunctionDeclarationStrictES6.ts
new file mode 100644
index 00000000000..043890add06
--- /dev/null
+++ b/tests/cases/compiler/blockScopedFunctionDeclarationStrictES6.ts
@@ -0,0 +1,7 @@
+// @target: ES6
+"use strict";
+if (true) {
+    function foo() { } // Allowed to declare block scope function
+    foo(); // This call should be ok
+}
+foo(); // Cannot find name since foo is block scoped
\ No newline at end of file
diff --git a/tests/cases/compiler/blockScopedSameNameFunctionDeclarationES5.ts b/tests/cases/compiler/blockScopedSameNameFunctionDeclarationES5.ts
new file mode 100644
index 00000000000..a5e10d19af2
--- /dev/null
+++ b/tests/cases/compiler/blockScopedSameNameFunctionDeclarationES5.ts
@@ -0,0 +1,17 @@
+// @target: ES5
+function foo(a: number) {
+    if (a === 1) {
+        function foo() { } // duplicate function
+        foo(); 
+        foo(10); // not ok
+    }
+    else {
+        function foo() { } // duplicate function
+        foo(); 
+        foo(10); // not ok
+    }
+    foo(10); // not ok
+    foo(); 
+}
+foo(10);
+foo(); // not ok - needs number
\ No newline at end of file
diff --git a/tests/cases/compiler/blockScopedSameNameFunctionDeclarationES6.ts b/tests/cases/compiler/blockScopedSameNameFunctionDeclarationES6.ts
new file mode 100644
index 00000000000..c97e50964e7
--- /dev/null
+++ b/tests/cases/compiler/blockScopedSameNameFunctionDeclarationES6.ts
@@ -0,0 +1,17 @@
+// @target: ES6
+function foo(a: number) {
+    if (a === 10) {
+        function foo() { } // duplicate
+        foo();
+        foo(10); // not ok
+    }
+    else {
+        function foo() { } // duplicate
+        foo();
+        foo(10);// not ok
+    }
+    foo(10); // not ok
+    foo(); 
+}
+foo(10);
+foo(); // not ok - needs number
\ No newline at end of file
diff --git a/tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts b/tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts
new file mode 100644
index 00000000000..a0073c75d43
--- /dev/null
+++ b/tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts
@@ -0,0 +1,18 @@
+// @target: ES5
+"use strict";
+function foo(a: number) {
+    if (a === 1) {
+        function foo() { } // Error to declare function in block scope
+        foo();
+        foo(10); // not ok
+    }
+    else {
+        function foo() { } // Error to declare function in block scope
+        foo();
+        foo(10); // not ok
+    }
+    foo(10);
+    foo(); // not ok - needs number
+}
+foo(10);
+foo(); // not ok - needs number
\ No newline at end of file
diff --git a/tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES6.ts b/tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES6.ts
new file mode 100644
index 00000000000..34d73a05201
--- /dev/null
+++ b/tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES6.ts
@@ -0,0 +1,18 @@
+// @target: ES6
+"use strict";
+function foo(a: number) {
+    if (a === 10) {
+        function foo() { }
+        foo();
+        foo(10); // not ok
+    }
+    else {
+        function foo() { } 
+        foo();
+        foo(10); // not ok
+    }
+    foo(10);
+    foo(); // not ok
+}
+foo(10);
+foo(); // not ok - needs number
\ No newline at end of file
diff --git a/tests/cases/compiler/bluebirdStaticThis.ts b/tests/cases/compiler/bluebirdStaticThis.ts
new file mode 100644
index 00000000000..55b1d0022d8
--- /dev/null
+++ b/tests/cases/compiler/bluebirdStaticThis.ts
@@ -0,0 +1,141 @@
+// This version is reduced from the full d.ts by removing almost all the tests
+// and all the comments.
+// Then it adds explicit `this` arguments to the static members.
+// Tests by: Bart van der Schoor <https://github.com/Bartvds>
+declare class Promise<R> implements Promise.Thenable<R> {
+	constructor(callback: (resolve: (thenableOrResult: R | Promise.Thenable<R>) => void, reject: (error: any) => void) => void);
+    static try<R>(dit: typeof Promise, fn: () => Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>;
+    static try<R>(dit: typeof Promise, fn: () => R, args?: any[], ctx?: any): Promise<R>;
+
+    static attempt<R>(dit: typeof Promise, fn: () => Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>;
+    static attempt<R>(dit: typeof Promise, fn: () => R, args?: any[], ctx?: any): Promise<R>;
+
+    static method(dit: typeof Promise, fn: Function): Function;
+
+    static resolve(dit: typeof Promise): Promise<void>;
+    static resolve<R>(dit: typeof Promise, value: Promise.Thenable<R>): Promise<R>;
+    static resolve<R>(dit: typeof Promise, value: R): Promise<R>;
+
+    static reject(dit: typeof Promise, reason: any): Promise<any>;
+    static reject<R>(dit: typeof Promise, reason: any): Promise<R>;
+
+    static defer<R>(dit: typeof Promise): Promise.Resolver<R>;
+
+    static cast<R>(dit: typeof Promise, value: Promise.Thenable<R>): Promise<R>;
+    static cast<R>(dit: typeof Promise, value: R): Promise<R>;
+
+    static bind(dit: typeof Promise, thisArg: any): Promise<void>;
+
+    static is(dit: typeof Promise, value: any): boolean;
+
+    static longStackTraces(dit: typeof Promise): void;
+
+    static delay<R>(dit: typeof Promise, value: Promise.Thenable<R>, ms: number): Promise<R>;
+    static delay<R>(dit: typeof Promise, value: R, ms: number): Promise<R>;
+    static delay(dit: typeof Promise, ms: number): Promise<void>;
+
+    static promisify(dit: typeof Promise, nodeFunction: Function, receiver?: any): Function;
+
+    static promisifyAll(dit: typeof Promise, target: Object): Object;
+
+    static coroutine<R>(dit: typeof Promise, generatorFunction: Function): Function;
+
+    static spawn<R>(dit: typeof Promise, generatorFunction: Function): Promise<R>;
+
+    static noConflict(dit: typeof Promise): typeof Promise;
+
+    static onPossiblyUnhandledRejection(dit: typeof Promise, handler: (reason: any) => any): void;
+
+    static all<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<R[]>;
+    static all<R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R[]>;
+    static all<R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R[]>;
+    static all<R>(dit: typeof Promise, values: R[]): Promise<R[]>;
+
+    static props(dit: typeof Promise, object: Promise<Object>): Promise<Object>;
+    static props(dit: typeof Promise, object: Object): Promise<Object>;
+
+    static settle<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<Promise.Inspection<R>[]>;
+    static settle<R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<Promise.Inspection<R>[]>;
+    static settle<R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<Promise.Inspection<R>[]>;
+    static settle<R>(dit: typeof Promise, values: R[]): Promise<Promise.Inspection<R>[]>;
+
+    static any<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<R>;
+    static any<R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R>;
+    static any<R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R>;
+    static any<R>(dit: typeof Promise, values: R[]): Promise<R>;
+
+    static race<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>): Promise<R>;
+    static race<R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R>;
+    static race<R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R>;
+    static race<R>(dit: typeof Promise, values: R[]): Promise<R>;
+
+    static some<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, count: number): Promise<R[]>;
+    static some<R>(dit: typeof Promise, values: Promise.Thenable<R[]>, count: number): Promise<R[]>;
+    static some<R>(dit: typeof Promise, values: Promise.Thenable<R>[], count: number): Promise<R[]>;
+    static some<R>(dit: typeof Promise, values: R[], count: number): Promise<R[]>;
+
+    static join<R>(dit: typeof Promise, ...values: Promise.Thenable<R>[]): Promise<R[]>;
+    static join<R>(dit: typeof Promise, ...values: R[]): Promise<R[]>;
+
+    static map<R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>;
+    static map<R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>;
+    static map<R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>;
+    static map<R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>;
+    static map<R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>;
+    static map<R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>;
+    static map<R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>;
+    static map<R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>;
+
+    static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>;
+    static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>;
+
+    static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>;
+    static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>;
+
+    static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>;
+    static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>;
+
+    static reduce<R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>;
+    static reduce<R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>;
+
+    static filter<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>;
+    static filter<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>;
+    static filter<R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>;
+    static filter<R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>;
+    static filter<R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>;
+    static filter<R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>;
+    static filter<R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>;
+    static filter<R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>;
+}
+
+declare module Promise {
+	export interface Thenable<R> {
+		then<U>(onFulfilled: (value: R) => Thenable<U>, onRejected: (error: any) => Thenable<U>): Thenable<U>;
+		then<U>(onFulfilled: (value: R) => Thenable<U>, onRejected?: (error: any) => U): Thenable<U>;
+		then<U>(onFulfilled: (value: R) => U, onRejected: (error: any) => Thenable<U>): Thenable<U>;
+		then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): Thenable<U>;
+	}
+
+}
+
+declare module 'bluebird' {
+	export = Promise;
+}
+interface Foo {
+    a: number;
+    b: string;
+}
+var x: any;
+var arr: any[];
+var foo: Foo;
+var fooProm: Promise<Foo>;
+
+fooProm = Promise.try(Promise, () => {
+	return foo;
+});
+fooProm = Promise.try(Promise, () => {
+	return foo;
+}, arr);
+fooProm = Promise.try(Promise, () => {
+	return foo;
+}, arr, x);
\ No newline at end of file
diff --git a/tests/cases/compiler/capturedLetConstInLoop12.ts b/tests/cases/compiler/capturedLetConstInLoop12.ts
new file mode 100644
index 00000000000..5540f75635e
--- /dev/null
+++ b/tests/cases/compiler/capturedLetConstInLoop12.ts
@@ -0,0 +1,15 @@
+(function() {
+    "use strict";
+
+    for (let i = 0; i < 4; i++) {
+        (() => [i] = [i + 1])();
+    }
+})();
+
+(function() {
+    "use strict";
+
+    for (let i = 0; i < 4; i++) {
+        (() => ({a:i} = {a:i + 1}))();
+    }
+})();
\ No newline at end of file
diff --git a/tests/cases/compiler/commentsAfterFunctionExpression1.ts b/tests/cases/compiler/commentsAfterFunctionExpression1.ts
new file mode 100644
index 00000000000..04fb0aec3b1
--- /dev/null
+++ b/tests/cases/compiler/commentsAfterFunctionExpression1.ts
@@ -0,0 +1,6 @@
+// @removeComments: false
+var v = {
+    f: a => 0 /*t1*/,
+    g: (a => 0) /*t2*/,
+    h: (a => 0 /*t3*/)
+}
diff --git a/tests/cases/compiler/commentsOnObjectLiteral4.ts b/tests/cases/compiler/commentsOnObjectLiteral4.ts
index d685304f31e..dfb9e42b3cb 100644
--- a/tests/cases/compiler/commentsOnObjectLiteral4.ts
+++ b/tests/cases/compiler/commentsOnObjectLiteral4.ts
@@ -6,6 +6,6 @@ var v = {
   * @type {number}
   */
  get bar(): number {
-  return this._bar;
+  return 12;
  }
-}
\ 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/compilerOptionsDeclarationAndNoEmit.ts b/tests/cases/compiler/compilerOptionsDeclarationAndNoEmit.ts
new file mode 100644
index 00000000000..41a89011020
--- /dev/null
+++ b/tests/cases/compiler/compilerOptionsDeclarationAndNoEmit.ts
@@ -0,0 +1,6 @@
+// @declaration: true
+// @noEmit: true
+// @fileName: a.ts
+
+class c {
+}
diff --git a/tests/cases/compiler/compilerOptionsOutAndNoEmit.ts b/tests/cases/compiler/compilerOptionsOutAndNoEmit.ts
new file mode 100644
index 00000000000..126043826bd
--- /dev/null
+++ b/tests/cases/compiler/compilerOptionsOutAndNoEmit.ts
@@ -0,0 +1,6 @@
+// @out: outDir
+// @noEmit: true
+// @fileName: a.ts
+
+class c {
+}
diff --git a/tests/cases/compiler/compilerOptionsOutDirAndNoEmit.ts b/tests/cases/compiler/compilerOptionsOutDirAndNoEmit.ts
new file mode 100644
index 00000000000..fb701a52661
--- /dev/null
+++ b/tests/cases/compiler/compilerOptionsOutDirAndNoEmit.ts
@@ -0,0 +1,6 @@
+// @outDir: outDir
+// @noEmit: true
+// @fileName: a.ts
+
+class c {
+}
diff --git a/tests/cases/compiler/compilerOptionsOutFileAndNoEmit.ts b/tests/cases/compiler/compilerOptionsOutFileAndNoEmit.ts
new file mode 100644
index 00000000000..2e75c0a976f
--- /dev/null
+++ b/tests/cases/compiler/compilerOptionsOutFileAndNoEmit.ts
@@ -0,0 +1,6 @@
+// @outFile: a.js
+// @noEmit: true
+// @fileName: a.ts
+
+class c {
+}
diff --git a/tests/cases/compiler/contextualTyping24.ts b/tests/cases/compiler/contextualTyping24.ts
index be28ff3b04c..fad23fa313c 100644
--- a/tests/cases/compiler/contextualTyping24.ts
+++ b/tests/cases/compiler/contextualTyping24.ts
@@ -1 +1 @@
-var foo:(a:{():number; (i:number):number; })=>number; foo = function(a:string){return 5};
\ No newline at end of file
+var foo:(a:{():number; (i:number):number; })=>number; foo = function(this: void, a:string){return 5};
\ No newline at end of file
diff --git a/tests/cases/compiler/continueInLoopsWithCapturedBlockScopedBindings1.ts b/tests/cases/compiler/continueInLoopsWithCapturedBlockScopedBindings1.ts
new file mode 100644
index 00000000000..8a17435edd6
--- /dev/null
+++ b/tests/cases/compiler/continueInLoopsWithCapturedBlockScopedBindings1.ts
@@ -0,0 +1,13 @@
+// @target: ES5
+function foo() {
+    for (const i of [0, 1]) {
+        if (i === 0) {
+            continue;
+        }
+
+        // Trigger non-simple-loop emit
+        (() => {
+            return i;
+        })();
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/declarationEmitDefaultExportWithTempVarName.ts b/tests/cases/compiler/declarationEmitDefaultExportWithTempVarName.ts
new file mode 100644
index 00000000000..13c967c4fe5
--- /dev/null
+++ b/tests/cases/compiler/declarationEmitDefaultExportWithTempVarName.ts
@@ -0,0 +1,4 @@
+// @declaration: true
+// @module: system
+// @Filename: pi.ts
+export default 3.14159;
\ No newline at end of file
diff --git a/tests/cases/compiler/declarationEmitDefaultExportWithTempVarNameWithBundling.ts b/tests/cases/compiler/declarationEmitDefaultExportWithTempVarNameWithBundling.ts
new file mode 100644
index 00000000000..6bd5320f3fe
--- /dev/null
+++ b/tests/cases/compiler/declarationEmitDefaultExportWithTempVarNameWithBundling.ts
@@ -0,0 +1,6 @@
+// @declaration: true
+// @module: system
+// @outFile: app.js
+
+// @Filename: pi.ts
+export default 3.14159;
\ No newline at end of file
diff --git a/tests/cases/compiler/declarationEmit_bindingPatterns.ts b/tests/cases/compiler/declarationEmit_bindingPatterns.ts
new file mode 100644
index 00000000000..16d380307fd
--- /dev/null
+++ b/tests/cases/compiler/declarationEmit_bindingPatterns.ts
@@ -0,0 +1,7 @@
+// @declaration: true
+
+const k = ({x: z = 'y'}) => { }
+
+var a;
+function f({} = a, [] = a, { p: {} = a} = a) {
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/declarationEmit_classMemberNameConflict.ts b/tests/cases/compiler/declarationEmit_classMemberNameConflict.ts
new file mode 100644
index 00000000000..16f096d43ca
--- /dev/null
+++ b/tests/cases/compiler/declarationEmit_classMemberNameConflict.ts
@@ -0,0 +1,39 @@
+// @target: es5
+// @module: commonjs
+// @declaration: true
+
+export class C1 {
+    C1() { } // has to be the same as the class name
+
+    bar() {
+        return function (t: typeof C1) {
+        };
+    }
+}
+
+export class C2 {
+    C2: any // has to be the same as the class name
+
+    bar() {
+        return function (t: typeof C2) {
+        };
+    }
+}
+
+export class C3 {
+    get C3() { return 0; } // has to be the same as the class name
+
+    bar() {
+        return function (t: typeof C3) {
+        };
+    }
+}
+
+export class C4 {
+    set C4(v) { } // has to be the same as the class name
+
+    bar() {
+        return function (t: typeof C4) {
+        };
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/declarationEmit_classMemberNameConflict2.ts b/tests/cases/compiler/declarationEmit_classMemberNameConflict2.ts
new file mode 100644
index 00000000000..90b488ebec7
--- /dev/null
+++ b/tests/cases/compiler/declarationEmit_classMemberNameConflict2.ts
@@ -0,0 +1,24 @@
+// @target: es5
+// @module: commonjs
+// @declaration: true
+
+const Bar = 'bar';
+
+enum Hello {
+    World
+}
+
+enum Hello1 {
+    World1
+}
+
+class Foo {
+    // Same names + string => OK
+    Bar = Bar;
+
+    // Same names + enum => OK
+    Hello = Hello;
+
+    // Different names + enum => OK
+    Hello2 = Hello1;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/declarationEmit_expressionInExtends.ts b/tests/cases/compiler/declarationEmit_expressionInExtends.ts
new file mode 100644
index 00000000000..8544ca20d92
--- /dev/null
+++ b/tests/cases/compiler/declarationEmit_expressionInExtends.ts
@@ -0,0 +1,15 @@
+// @declaration: true
+
+var x: {
+    new<T>(s: any): Q;
+}
+
+class Q {
+    s: string;    
+}
+
+class B extends x<string> {    
+}
+
+var q: B;
+q.s;
\ No newline at end of file
diff --git a/tests/cases/compiler/declarationEmit_expressionInExtends2.ts b/tests/cases/compiler/declarationEmit_expressionInExtends2.ts
new file mode 100644
index 00000000000..0b2ccab8385
--- /dev/null
+++ b/tests/cases/compiler/declarationEmit_expressionInExtends2.ts
@@ -0,0 +1,13 @@
+// @declaration: true
+
+class C<T, U> {
+    x: T;
+    y: U;
+}
+
+function getClass<T>(c: T) {
+    return C;
+}
+
+class MyClass extends getClass(2) <string, number> {
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/declarationEmit_expressionInExtends3.ts b/tests/cases/compiler/declarationEmit_expressionInExtends3.ts
new file mode 100644
index 00000000000..348d0d188f7
--- /dev/null
+++ b/tests/cases/compiler/declarationEmit_expressionInExtends3.ts
@@ -0,0 +1,43 @@
+// @declaration: true
+
+export class ExportedClass<T> {
+	x: T;
+}
+
+class LocalClass<T, U> {
+    x: T;
+    y: U;
+}
+
+export interface ExportedInterface {
+    x: number;
+}
+
+interface LocalInterface {
+    x: number;
+}
+
+function getLocalClass<T>(c: T) {
+    return LocalClass;
+}
+
+function getExportedClass<T>(c: T) {
+    return ExportedClass;
+}
+
+
+
+export class MyClass extends getLocalClass<LocalInterface>(undefined)<string, number> { // error LocalClass is inaccisible
+}
+
+
+export class MyClass2 extends getExportedClass<LocalInterface>(undefined)<string> { // OK
+}
+
+
+export class MyClass3 extends getExportedClass<LocalInterface>(undefined)<LocalInterface> { // Error LocalInterface is inaccisble
+}
+
+
+export class MyClass4 extends getExportedClass<LocalInterface>(undefined)<ExportedInterface> { // OK
+}
diff --git a/tests/cases/compiler/declarationEmit_expressionInExtends4.ts b/tests/cases/compiler/declarationEmit_expressionInExtends4.ts
new file mode 100644
index 00000000000..6b3044f227f
--- /dev/null
+++ b/tests/cases/compiler/declarationEmit_expressionInExtends4.ts
@@ -0,0 +1,18 @@
+// @declaration: true
+
+function getSomething() {
+    return class D { }
+}
+
+class C extends getSomething()<number, string> {
+
+}
+
+class C2 extends SomeUndefinedFunction()<number, string> {
+
+}
+
+
+class C3 extends SomeUndefinedFunction {
+
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/declarationEmit_inferedDefaultExportType.ts b/tests/cases/compiler/declarationEmit_inferedDefaultExportType.ts
new file mode 100644
index 00000000000..3c3adc1af2f
--- /dev/null
+++ b/tests/cases/compiler/declarationEmit_inferedDefaultExportType.ts
@@ -0,0 +1,9 @@
+// @declaration: true
+// @module: commonjs
+
+// test.ts
+export default {
+  foo: [],
+  bar: undefined,
+  baz: null
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/declarationEmit_inferedDefaultExportType2.ts b/tests/cases/compiler/declarationEmit_inferedDefaultExportType2.ts
new file mode 100644
index 00000000000..274996cbe12
--- /dev/null
+++ b/tests/cases/compiler/declarationEmit_inferedDefaultExportType2.ts
@@ -0,0 +1,9 @@
+// @declaration: true
+// @module: commonjs
+
+// test.ts
+export = {
+  foo: [],
+  bar: undefined,
+  baz: null
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/declarationEmit_invalidExport.ts b/tests/cases/compiler/declarationEmit_invalidExport.ts
new file mode 100644
index 00000000000..8b0826dbf96
--- /dev/null
+++ b/tests/cases/compiler/declarationEmit_invalidExport.ts
@@ -0,0 +1,7 @@
+// @declaration: true
+
+if (false) {
+  export var myClass = 0;
+}
+export type MyClass = typeof myClass;
+}
diff --git a/tests/cases/compiler/destructuringInVariableDeclarations1.ts b/tests/cases/compiler/destructuringInVariableDeclarations1.ts
new file mode 100644
index 00000000000..275564c07c5
--- /dev/null
+++ b/tests/cases/compiler/destructuringInVariableDeclarations1.ts
@@ -0,0 +1,6 @@
+// @target: es6
+// @module: commonjs
+export let { toString } = 1;
+{
+    let { toFixed } = 1;
+}
diff --git a/tests/cases/compiler/destructuringInVariableDeclarations2.ts b/tests/cases/compiler/destructuringInVariableDeclarations2.ts
new file mode 100644
index 00000000000..07190dddd52
--- /dev/null
+++ b/tests/cases/compiler/destructuringInVariableDeclarations2.ts
@@ -0,0 +1,7 @@
+// @target: es6
+// @module: commonjs
+let { toString } = 1;
+{
+    let { toFixed } = 1;
+}
+export {};
diff --git a/tests/cases/compiler/destructuringInVariableDeclarations3.ts b/tests/cases/compiler/destructuringInVariableDeclarations3.ts
new file mode 100644
index 00000000000..7881b3073a1
--- /dev/null
+++ b/tests/cases/compiler/destructuringInVariableDeclarations3.ts
@@ -0,0 +1,6 @@
+// @target: es6
+// @module: amd
+export let { toString } = 1;
+{
+    let { toFixed } = 1;
+}
diff --git a/tests/cases/compiler/destructuringInVariableDeclarations4.ts b/tests/cases/compiler/destructuringInVariableDeclarations4.ts
new file mode 100644
index 00000000000..81ed4d04c4e
--- /dev/null
+++ b/tests/cases/compiler/destructuringInVariableDeclarations4.ts
@@ -0,0 +1,7 @@
+// @target: es6
+// @module: amd
+let { toString } = 1;
+{
+    let { toFixed } = 1;
+}
+export {};
diff --git a/tests/cases/compiler/destructuringInVariableDeclarations5.ts b/tests/cases/compiler/destructuringInVariableDeclarations5.ts
new file mode 100644
index 00000000000..610fa8715f3
--- /dev/null
+++ b/tests/cases/compiler/destructuringInVariableDeclarations5.ts
@@ -0,0 +1,6 @@
+// @target: es6
+// @module: umd
+export let { toString } = 1;
+{
+    let { toFixed } = 1;
+}
diff --git a/tests/cases/compiler/destructuringInVariableDeclarations6.ts b/tests/cases/compiler/destructuringInVariableDeclarations6.ts
new file mode 100644
index 00000000000..2e63209f4e8
--- /dev/null
+++ b/tests/cases/compiler/destructuringInVariableDeclarations6.ts
@@ -0,0 +1,7 @@
+// @target: es6
+// @module: umd
+let { toString } = 1;
+{
+    let { toFixed } = 1;
+}
+export {};
diff --git a/tests/cases/compiler/destructuringInVariableDeclarations7.ts b/tests/cases/compiler/destructuringInVariableDeclarations7.ts
new file mode 100644
index 00000000000..3a2827eccc3
--- /dev/null
+++ b/tests/cases/compiler/destructuringInVariableDeclarations7.ts
@@ -0,0 +1,6 @@
+// @target: es6
+// @module: system
+export let { toString } = 1;
+{
+    let { toFixed } = 1;
+}
diff --git a/tests/cases/compiler/destructuringInVariableDeclarations8.ts b/tests/cases/compiler/destructuringInVariableDeclarations8.ts
new file mode 100644
index 00000000000..4925c47d85b
--- /dev/null
+++ b/tests/cases/compiler/destructuringInVariableDeclarations8.ts
@@ -0,0 +1,7 @@
+// @target: es6
+// @module: system
+let { toString } = 1;
+{
+    let { toFixed } = 1;
+}
+export {};
diff --git a/tests/cases/compiler/emitSuperCallBeforeEmitParameterPropertyDeclaration1.ts b/tests/cases/compiler/emitSuperCallBeforeEmitParameterPropertyDeclaration1.ts
new file mode 100644
index 00000000000..5172ccfe21f
--- /dev/null
+++ b/tests/cases/compiler/emitSuperCallBeforeEmitParameterPropertyDeclaration1.ts
@@ -0,0 +1,12 @@
+class A {
+    blub = 6;
+}
+
+
+class B extends A {
+    constructor(public x: number) {
+        "use strict";
+        'someStringForEgngInject';
+        super()
+    }
+}
diff --git a/tests/cases/compiler/emitSuperCallBeforeEmitParameterPropertyDeclaration1ES6.ts b/tests/cases/compiler/emitSuperCallBeforeEmitParameterPropertyDeclaration1ES6.ts
new file mode 100644
index 00000000000..e62f753d725
--- /dev/null
+++ b/tests/cases/compiler/emitSuperCallBeforeEmitParameterPropertyDeclaration1ES6.ts
@@ -0,0 +1,13 @@
+// @target: ES6
+class A {
+    blub = 6;
+}
+
+
+class B extends A {
+    constructor(public x: number) {
+        "use strict";
+        'someStringForEgngInject';
+        super()
+    }
+}
diff --git a/tests/cases/compiler/emitSuperCallBeforeEmitPropertyDeclaration1.ts b/tests/cases/compiler/emitSuperCallBeforeEmitPropertyDeclaration1.ts
new file mode 100644
index 00000000000..52d41c3731a
--- /dev/null
+++ b/tests/cases/compiler/emitSuperCallBeforeEmitPropertyDeclaration1.ts
@@ -0,0 +1,15 @@
+class A {
+    blub = 6;
+}
+
+
+class B extends A {
+
+    blub = 12;
+
+    constructor() {
+        "use strict";
+        'someStringForEgngInject';
+        super()
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/emitSuperCallBeforeEmitPropertyDeclaration1ES6.ts b/tests/cases/compiler/emitSuperCallBeforeEmitPropertyDeclaration1ES6.ts
new file mode 100644
index 00000000000..f6c7164ae75
--- /dev/null
+++ b/tests/cases/compiler/emitSuperCallBeforeEmitPropertyDeclaration1ES6.ts
@@ -0,0 +1,15 @@
+// @target: ES6
+class A {
+    blub = 6;
+}
+
+
+class B extends A {
+
+    blub = 12;
+
+    constructor() {
+        'someStringForEgngInject';
+        super()
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.ts b/tests/cases/compiler/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.ts
new file mode 100644
index 00000000000..a2d8bf8473f
--- /dev/null
+++ b/tests/cases/compiler/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.ts
@@ -0,0 +1,13 @@
+class A {
+    blub = 6;
+}
+
+
+class B extends A {
+    blah = 2;
+    constructor(public x: number) {
+        "use strict";
+        'someStringForEgngInject';
+        super()
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1ES6.ts b/tests/cases/compiler/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1ES6.ts
new file mode 100644
index 00000000000..8bd8420f8f7
--- /dev/null
+++ b/tests/cases/compiler/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1ES6.ts
@@ -0,0 +1,14 @@
+// @target: ES6
+class A {
+    blub = 6;
+}
+
+
+class B extends A {
+    blah = 2;
+    constructor(public x: number) {
+        "use strict";
+        'someStringForEgngInject';
+        super()
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/enumAssignmentCompat4.ts b/tests/cases/compiler/enumAssignmentCompat4.ts
new file mode 100644
index 00000000000..0a5fc896604
--- /dev/null
+++ b/tests/cases/compiler/enumAssignmentCompat4.ts
@@ -0,0 +1,22 @@
+namespace M {
+    export enum MyEnum {
+        BAR
+    }
+    export var object2 = {
+        foo: MyEnum.BAR
+    };
+}
+
+namespace N {
+    export enum MyEnum {
+        FOO
+    };
+    export var object1 = {
+        foo: MyEnum.FOO
+    };
+}
+
+let broken = [
+    N.object1,
+    M.object2
+];
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/errorMessagesIntersectionTypes01.ts b/tests/cases/compiler/errorMessagesIntersectionTypes01.ts
new file mode 100644
index 00000000000..b5e375cb8a9
--- /dev/null
+++ b/tests/cases/compiler/errorMessagesIntersectionTypes01.ts
@@ -0,0 +1,16 @@
+interface Foo {
+    fooProp: boolean;
+}
+
+interface Bar {
+    barProp: string;
+}
+
+interface FooBar extends Foo, Bar {
+}
+
+declare function mixBar<T>(obj: T): T & Bar;
+
+let fooBar: FooBar = mixBar({
+    fooProp: "frizzlebizzle"
+});
\ No newline at end of file
diff --git a/tests/cases/compiler/errorMessagesIntersectionTypes02.ts b/tests/cases/compiler/errorMessagesIntersectionTypes02.ts
new file mode 100644
index 00000000000..3f21221e139
--- /dev/null
+++ b/tests/cases/compiler/errorMessagesIntersectionTypes02.ts
@@ -0,0 +1,16 @@
+interface Foo {
+    fooProp: "hello" | "world";
+}
+
+interface Bar {
+    barProp: string;
+}
+
+interface FooBar extends Foo, Bar {
+}
+
+declare function mixBar<T>(obj: T): T & Bar;
+
+let fooBar: FooBar = mixBar({
+    fooProp: "frizzlebizzle"
+});
\ No newline at end of file
diff --git a/tests/cases/compiler/errorMessagesIntersectionTypes03.ts b/tests/cases/compiler/errorMessagesIntersectionTypes03.ts
new file mode 100644
index 00000000000..73969bc17b3
--- /dev/null
+++ b/tests/cases/compiler/errorMessagesIntersectionTypes03.ts
@@ -0,0 +1,24 @@
+interface A {
+    a;
+}
+
+interface B {
+    b;
+}
+
+function f<T, U extends A, V extends U>(): void {
+    let t: T;
+    let u: U;
+    let v: V;
+
+    let a_and_b: A & B;
+    let t_and_b: T & B;
+
+    t = a_and_b;
+    u = a_and_b;
+    v = a_and_b;
+
+    t = t_and_b;
+    u = t_and_b;
+    v = t_and_b;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/errorMessagesIntersectionTypes04.ts b/tests/cases/compiler/errorMessagesIntersectionTypes04.ts
new file mode 100644
index 00000000000..74dcfa658e7
--- /dev/null
+++ b/tests/cases/compiler/errorMessagesIntersectionTypes04.ts
@@ -0,0 +1,22 @@
+interface A {
+    a;
+}
+
+interface B {
+    b;
+}
+
+function f<T, U extends A, V extends U>(): void {
+    let num: number;
+    let bool: boolean;
+    let str: string;
+
+    let a_and_b: A & B;
+    let num_and_bool: number & boolean;
+
+    num = a_and_b;
+    bool = a_and_b;
+    str = a_and_b;
+
+    str = num_and_bool;
+}
\ 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/exportEqualsAmd.ts b/tests/cases/compiler/exportEqualsAmd.ts
new file mode 100644
index 00000000000..132d9fe22cf
--- /dev/null
+++ b/tests/cases/compiler/exportEqualsAmd.ts
@@ -0,0 +1,2 @@
+// @module: amd
+export = { ["hi"]: "there" };
\ No newline at end of file
diff --git a/tests/cases/compiler/exportEqualsCommonJs.ts b/tests/cases/compiler/exportEqualsCommonJs.ts
new file mode 100644
index 00000000000..d075504ab03
--- /dev/null
+++ b/tests/cases/compiler/exportEqualsCommonJs.ts
@@ -0,0 +1,2 @@
+// @module: commonjs
+export = { ["hi"]: "there" };
\ No newline at end of file
diff --git a/tests/cases/compiler/exportEqualsDefaultProperty.ts b/tests/cases/compiler/exportEqualsDefaultProperty.ts
new file mode 100644
index 00000000000..1adce3cabe1
--- /dev/null
+++ b/tests/cases/compiler/exportEqualsDefaultProperty.ts
@@ -0,0 +1,12 @@
+
+// @Filename: exp.ts
+var x = {
+    "greeting": "hello, world",
+    "default": 42
+};
+
+export = x
+
+// @Filename: imp.ts
+import foo from "./exp";
+foo.toExponential(2);
diff --git a/tests/cases/compiler/exportEqualsUmd.ts b/tests/cases/compiler/exportEqualsUmd.ts
new file mode 100644
index 00000000000..250aaccd2b8
--- /dev/null
+++ b/tests/cases/compiler/exportEqualsUmd.ts
@@ -0,0 +1,2 @@
+// @module: umd
+export = { ["hi"]: "there" };
\ No newline at end of file
diff --git a/tests/cases/compiler/exportRedeclarationTypeAliases.ts b/tests/cases/compiler/exportRedeclarationTypeAliases.ts
new file mode 100644
index 00000000000..eb5cbcd4c6d
--- /dev/null
+++ b/tests/cases/compiler/exportRedeclarationTypeAliases.ts
@@ -0,0 +1,4 @@
+// @module: commonjs
+export type Foo = number;
+export function Foo(): number;
+export function Foo(): any {}
\ No newline at end of file
diff --git a/tests/cases/compiler/fallFromLastCase1.ts b/tests/cases/compiler/fallFromLastCase1.ts
new file mode 100644
index 00000000000..d8037c61a96
--- /dev/null
+++ b/tests/cases/compiler/fallFromLastCase1.ts
@@ -0,0 +1,24 @@
+// @noFallthroughCasesInSwitch: true
+
+declare function use(a: string);
+
+function foo1(a: number) {
+    switch (a) {
+        case 1:
+            use("1");
+            break;
+        case 2:
+            use("2");
+    }
+}
+
+
+function foo2(a: number) {
+    switch (a) {
+        case 1:
+            use("1");
+            break;
+        default:
+            use("2");
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/fallFromLastCase2.ts b/tests/cases/compiler/fallFromLastCase2.ts
new file mode 100644
index 00000000000..231d3512dbe
--- /dev/null
+++ b/tests/cases/compiler/fallFromLastCase2.ts
@@ -0,0 +1,28 @@
+// @noFallthroughCasesInSwitch: true
+
+declare function use(a: string);
+
+function foo1(a: number) {
+    switch (a) {
+        case 1:
+            use("1");
+            break;
+        case 2:
+            use("2");
+        case 3:
+            use("3");
+    }
+}
+
+
+function foo2(a: number) {
+    switch (a) {
+        case 1:
+            use("1");
+            break;
+        default:
+            use("2");
+        case 2:
+            use("3");
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/functionAndImportNameConflict.ts b/tests/cases/compiler/functionAndImportNameConflict.ts
new file mode 100644
index 00000000000..9126dd20910
--- /dev/null
+++ b/tests/cases/compiler/functionAndImportNameConflict.ts
@@ -0,0 +1,9 @@
+// @module: commonjs
+// @filename: f1.ts
+export function f() {
+}
+
+// @filename: f2.ts
+import {f} from './f1';
+export function f() {
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/implicitIndexSignatures.ts b/tests/cases/compiler/implicitIndexSignatures.ts
new file mode 100644
index 00000000000..2e36a91bada
--- /dev/null
+++ b/tests/cases/compiler/implicitIndexSignatures.ts
@@ -0,0 +1,45 @@
+type StringMap = { [x: string]: string };
+
+const empty1 = {};
+let empty2: {};
+const names1 = { a: "foo", b: "bar" };
+let names2: { a: string, b: string };
+let map: StringMap;
+map = { x: "xxx", y: "yyy" };
+map = empty1;
+map = empty2;
+map = names1;
+map = names2;
+
+declare function getStringIndexValue<T>(map: { [x: string]: T }): T;
+declare function getNumberIndexValue<T>(map: { [x: number]: T }): T;
+
+function f1() {
+    const o1 = { a: 1, b: 2 };
+    let o2: { a: number, b: number };
+    const v1 = getStringIndexValue(o1);
+    const v2 = getStringIndexValue(o2);
+}
+
+function f2() {
+    const o1 = { a: "1", b: "2" };
+    let o2: { a: string, b: string };
+    const v1 = getStringIndexValue(o1);
+    const v2 = getStringIndexValue(o2);
+}
+
+function f3() {
+    const o1 = { a: 1, b: "2" };
+    let o2: { a: number, b: string };
+    const v1 = getStringIndexValue(o1);
+    const v2 = getStringIndexValue(o2);
+}
+
+function f4() {
+    const o1 = { 0: "0", 1: "1", count: 2 };
+    let o2: { 0: string, 1: string, count: number };    
+    const v1 = getStringIndexValue(o1);
+    const v2 = getStringIndexValue(o2);
+    const v3 = getNumberIndexValue(o1);
+    const v4 = getNumberIndexValue(o2);
+}
diff --git a/tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule.ts b/tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule.ts
index 99356afd3b7..0743ac6f4ca 100644
--- a/tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule.ts
+++ b/tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule.ts
@@ -4,7 +4,7 @@ export module m {
 }
 
 // @Filename: importAliasAnExternalModuleInsideAnInternalModule_file1.ts 
-import r = require('importAliasAnExternalModuleInsideAnInternalModule_file0');
+import r = require('./importAliasAnExternalModuleInsideAnInternalModule_file0');
 module m_private {
     //import r2 = require('m'); // would be error
     export import C = r; // no error
diff --git a/tests/cases/compiler/inferenceLimit.ts b/tests/cases/compiler/inferenceLimit.ts
new file mode 100644
index 00000000000..adaf13bad22
--- /dev/null
+++ b/tests/cases/compiler/inferenceLimit.ts
@@ -0,0 +1,41 @@
+// @target: es6
+// @module: commonjs
+// @filename: file1.ts
+"use strict";
+import * as MyModule from "./mymodule";
+
+export class BrokenClass {
+
+  constructor() {}
+
+  public brokenMethod(field: string, value: string) {
+  return new Promise<Array<MyModule.MyModel>>((resolve, reject) => {
+
+    let result: Array<MyModule.MyModel> = [];
+
+    let populateItems = (order) => {
+      return new Promise((resolve, reject) => {
+        this.doStuff(order.id)
+          .then((items) => {
+            order.items = items;
+            resolve(order);
+          });
+      });
+    };
+
+    return Promise.all(result.map(populateItems))
+      .then((orders: Array<MyModule.MyModel>) => {
+        resolve(orders);
+      });
+    });
+  }
+
+  public async doStuff(id: number) {
+    return;
+  }
+}
+
+// @filename: mymodule.ts
+export interface MyModel {
+    id: number;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/invalidThisEmitInContextualObjectLiteral.ts b/tests/cases/compiler/invalidThisEmitInContextualObjectLiteral.ts
new file mode 100644
index 00000000000..c01e4993950
--- /dev/null
+++ b/tests/cases/compiler/invalidThisEmitInContextualObjectLiteral.ts
@@ -0,0 +1,12 @@
+interface IDef {
+	p1: (e:string) => void;
+	p2: () => (n: number) => any;
+}
+
+class TestController {
+	public m(def: IDef) { }
+	public p = this.m({
+		p1: e => { },
+		p2: () => { return vvvvvvvvv => this; },
+	});
+}
diff --git a/tests/cases/compiler/jsFileCompilationDecoratorSyntax.ts b/tests/cases/compiler/jsFileCompilationDecoratorSyntax.ts
index 2ef95db01fe..6627fb5dca0 100644
--- a/tests/cases/compiler/jsFileCompilationDecoratorSyntax.ts
+++ b/tests/cases/compiler/jsFileCompilationDecoratorSyntax.ts
@@ -1,3 +1,5 @@
 // @allowJs: true
+// @noEmit: true
+// @experimentalDecorators: true
 // @filename: a.js
-@internal class C { }
\ No newline at end of file
+@internal class C { }
diff --git a/tests/cases/compiler/jsFileCompilationRestParamJsDocFunction.ts b/tests/cases/compiler/jsFileCompilationRestParamJsDocFunction.ts
new file mode 100644
index 00000000000..03ad2d1b2ff
--- /dev/null
+++ b/tests/cases/compiler/jsFileCompilationRestParamJsDocFunction.ts
@@ -0,0 +1,27 @@
+// @allowJs: true
+// @out: apply.js
+// @module: amd
+
+// @filename: _apply.js
+/**
+ * A faster alternative to `Function#apply`, this function invokes `func`
+ * with the `this` binding of `thisArg` and the arguments of `args`.
+ *
+ * @private
+ * @param {Function} func The function to invoke.
+ * @param {*} thisArg The `this` binding of `func`.
+ * @param {...*} args The arguments to invoke `func` with.
+ * @returns {*} Returns the result of `func`.
+ */
+function apply(func, thisArg, args) {
+    var length = args.length;
+    switch (length) {
+        case 0: return func.call(thisArg);
+        case 1: return func.call(thisArg, args[0]);
+        case 2: return func.call(thisArg, args[0], args[1]);
+        case 3: return func.call(thisArg, args[0], args[1], args[2]);
+    }
+    return func.apply(thisArg, args);
+}
+
+export default apply;
\ No newline at end of file
diff --git a/tests/cases/compiler/jsxPreserveWithJsInput.ts b/tests/cases/compiler/jsxPreserveWithJsInput.ts
new file mode 100644
index 00000000000..f229e40a550
--- /dev/null
+++ b/tests/cases/compiler/jsxPreserveWithJsInput.ts
@@ -0,0 +1,18 @@
+// @outdir: out
+// @jsx: preserve
+// @allowjs: true
+
+// @filename: a.js
+var elemA = 42;
+
+// @filename: b.jsx
+var elemB = <b>{"test"}</b>;
+
+// @filename: c.js
+var elemC = <c>{42}</c>;
+
+// @filename: d.ts
+var elemD = 42;
+
+// @filename: e.tsx
+var elemE = <e>{true}</e>;
diff --git a/tests/cases/compiler/keepImportsInDts1.ts b/tests/cases/compiler/keepImportsInDts1.ts
new file mode 100644
index 00000000000..50bdc5830a8
--- /dev/null
+++ b/tests/cases/compiler/keepImportsInDts1.ts
@@ -0,0 +1,7 @@
+// @module: amd
+// @declaration: true
+
+// @filename: c:/test.d.ts
+export {}; 
+// @filename: c:/app/main.ts
+import "test"
\ No newline at end of file
diff --git a/tests/cases/compiler/keepImportsInDts2.ts b/tests/cases/compiler/keepImportsInDts2.ts
new file mode 100644
index 00000000000..407526d7595
--- /dev/null
+++ b/tests/cases/compiler/keepImportsInDts2.ts
@@ -0,0 +1,7 @@
+// @module: amd
+// @declaration: true
+
+// @filename: folder/test.ts
+export {};
+// @filename: main.ts
+import "./folder/test"
\ No newline at end of file
diff --git a/tests/cases/compiler/keepImportsInDts3.ts b/tests/cases/compiler/keepImportsInDts3.ts
new file mode 100644
index 00000000000..cdd83dce132
--- /dev/null
+++ b/tests/cases/compiler/keepImportsInDts3.ts
@@ -0,0 +1,8 @@
+// @module: amd
+// @declaration: true
+// @out: outputfile.js
+
+// @filename: c:/test.ts
+export {};
+// @filename: c:/app/main.ts
+import "test"
\ No newline at end of file
diff --git a/tests/cases/compiler/keepImportsInDts4.ts b/tests/cases/compiler/keepImportsInDts4.ts
new file mode 100644
index 00000000000..272932be488
--- /dev/null
+++ b/tests/cases/compiler/keepImportsInDts4.ts
@@ -0,0 +1,8 @@
+// @module: amd
+// @declaration: true
+// @out: outputfile.js
+
+// @filename: folder/test.ts
+export {};
+// @filename: main.ts
+import "./folder/test"
\ No newline at end of file
diff --git a/tests/cases/compiler/mergeWithImportedNamespace.ts b/tests/cases/compiler/mergeWithImportedNamespace.ts
new file mode 100644
index 00000000000..79a94fd0ba4
--- /dev/null
+++ b/tests/cases/compiler/mergeWithImportedNamespace.ts
@@ -0,0 +1,10 @@
+// @module:commonjs
+// @filename: f1.ts
+export namespace N { export var x = 1; }
+
+// @filename: f2.ts
+import {N} from "./f1";
+// partial revert of https://github.com/Microsoft/TypeScript/pull/7583 to prevent breaking changes
+export namespace N {
+    export interface I {x: any}
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/mergeWithImportedType.ts b/tests/cases/compiler/mergeWithImportedType.ts
new file mode 100644
index 00000000000..2310022012f
--- /dev/null
+++ b/tests/cases/compiler/mergeWithImportedType.ts
@@ -0,0 +1,8 @@
+// @module:commonjs
+// @filename: f1.ts
+export enum E {X}
+
+// @filename: f2.ts
+import {E} from "./f1";
+// partial revert of https://github.com/Microsoft/TypeScript/pull/7583 to prevent breaking changes
+export type E = E;
\ No newline at end of file
diff --git a/tests/cases/compiler/modularizeLibrary_ErrorFromUsingES6ArrayWithOnlyES6ArrayLib.ts b/tests/cases/compiler/modularizeLibrary_ErrorFromUsingES6ArrayWithOnlyES6ArrayLib.ts
new file mode 100644
index 00000000000..3f6b9a5e35a
--- /dev/null
+++ b/tests/cases/compiler/modularizeLibrary_ErrorFromUsingES6ArrayWithOnlyES6ArrayLib.ts
@@ -0,0 +1,9 @@
+// @lib: es2015.core
+// @target: es5
+
+// Error missing basic JavaScript objects
+function f(x: number, y: number, z: number) {
+    return Array.from(arguments);
+}
+
+f(1, 2, 3);
diff --git a/tests/cases/compiler/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.ts b/tests/cases/compiler/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.ts
new file mode 100644
index 00000000000..290cf0e4211
--- /dev/null
+++ b/tests/cases/compiler/modularizeLibrary_ErrorFromUsingES6FeaturesWithOnlyES5Lib.ts
@@ -0,0 +1,57 @@
+// @lib: es5
+// @target: es6
+
+// All will be error from using ES6 features but only include ES5 library
+// Using Es6 array
+function f(x: number, y: number, z: number) {
+    return Array.from(arguments);
+}
+
+f(1, 2, 3);  // no error
+
+// Using ES6 collection
+var m = new Map<string, number>();
+m.clear();
+// Using ES6 iterable
+m.keys();
+
+// Using ES6 function
+function Baz() { }
+Baz.name;
+
+// Using ES6 math
+Math.sign(1);
+
+// Using ES6 object
+var o = {
+    a: 2,
+    [Symbol.hasInstance](value: any) {
+        return false;
+    }
+};
+o.hasOwnProperty(Symbol.hasInstance);
+
+// Using Es6 proxy
+var t = {}
+var p = new Proxy(t, {});
+
+// Using ES6 reflect
+Reflect.isExtensible({});
+
+// Using Es6 regexp
+var reg = new RegExp("/s");
+reg.flags;
+
+// Using ES6 string
+var str = "Hello world";
+str.includes("hello", 0);
+
+// Using ES6 symbol
+var s = Symbol();
+
+// Using ES6 wellknown-symbol
+const o1 = {
+    [Symbol.hasInstance](value: any) {
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/modularizeLibrary_ErrorFromUsingWellknownSymbolWithOutES6WellknownSymbolLib.ts b/tests/cases/compiler/modularizeLibrary_ErrorFromUsingWellknownSymbolWithOutES6WellknownSymbolLib.ts
new file mode 100644
index 00000000000..c3e1d616ea5
--- /dev/null
+++ b/tests/cases/compiler/modularizeLibrary_ErrorFromUsingWellknownSymbolWithOutES6WellknownSymbolLib.ts
@@ -0,0 +1,9 @@
+// @lib: es5,es2015.core
+
+function f(x: number, y: number, z: number) {
+    return Array.from(arguments);
+}
+
+f(1, 2, 3);   // no error
+let a = ['c', 'd'];
+a[Symbol.isConcatSpreadable] = false;
\ No newline at end of file
diff --git a/tests/cases/compiler/modularizeLibrary_NoErrorDuplicateLibOptions1.ts b/tests/cases/compiler/modularizeLibrary_NoErrorDuplicateLibOptions1.ts
new file mode 100644
index 00000000000..4b2a88c1320
--- /dev/null
+++ b/tests/cases/compiler/modularizeLibrary_NoErrorDuplicateLibOptions1.ts
@@ -0,0 +1,83 @@
+// @lib: es5,es6,es6
+// @target: es6
+
+// Using Es6 array
+function f(x: number, y: number, z: number) {
+    return Array.from(arguments);
+}
+
+f(1, 2, 3);  // no error
+
+// Using ES6 collection
+var m = new Map<string, number>();
+m.clear();
+// Using ES6 iterable
+m.keys();
+
+// Using ES6 function
+function Baz() { }
+Baz.name;
+
+// Using ES6 generator
+function* gen() {
+    let i = 0;
+    while (i < 10) {
+        yield i;
+        i++;
+    }
+}
+
+function* gen2() {
+    let i = 0;
+    while (i < 10) {
+        yield i;
+        i++;
+    }
+}
+
+// Using ES6 math
+Math.sign(1);
+
+// Using ES6 object
+var o = {
+    a: 2,
+    [Symbol.hasInstance](value: any) {
+        return false;
+    }
+};
+o.hasOwnProperty(Symbol.hasInstance);
+
+// Using ES6 promise
+async function out() {
+    return new Promise(function (resolve, reject) {});
+}
+
+declare var console: any;
+out().then(() => {
+    console.log("Yea!");
+});
+
+// Using Es6 proxy
+var t = {}
+var p = new Proxy(t, {});
+
+// Using ES6 reflect
+Reflect.isExtensible({});
+
+// Using Es6 regexp
+var reg = new RegExp("/s");
+reg.flags;
+
+// Using ES6 string
+var str = "Hello world";
+str.includes("hello", 0);
+
+// Using ES6 symbol
+var s = Symbol();
+
+// Using ES6 wellknown-symbol
+const o1 = {
+    [Symbol.hasInstance](value: any) {
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/modularizeLibrary_NoErrorDuplicateLibOptions2.ts b/tests/cases/compiler/modularizeLibrary_NoErrorDuplicateLibOptions2.ts
new file mode 100644
index 00000000000..9ddfac81223
--- /dev/null
+++ b/tests/cases/compiler/modularizeLibrary_NoErrorDuplicateLibOptions2.ts
@@ -0,0 +1,83 @@
+// @lib: es5,es2015,es2015.core,es2015.symbol.wellknown
+// @target: es6
+
+// Using Es6 array
+function f(x: number, y: number, z: number) {
+    return Array.from(arguments);
+}
+
+f(1, 2, 3);  // no error
+
+// Using ES6 collection
+var m = new Map<string, number>();
+m.clear();
+// Using ES6 iterable
+m.keys();
+
+// Using ES6 function
+function Baz() { }
+Baz.name;
+
+// Using ES6 generator
+function* gen() {
+    let i = 0;
+    while (i < 10) {
+        yield i;
+        i++;
+    }
+}
+
+function* gen2() {
+    let i = 0;
+    while (i < 10) {
+        yield i;
+        i++;
+    }
+}
+
+// Using ES6 math
+Math.sign(1);
+
+// Using ES6 object
+var o = {
+    a: 2,
+    [Symbol.hasInstance](value: any) {
+        return false;
+    }
+};
+o.hasOwnProperty(Symbol.hasInstance);
+
+// Using ES6 promise
+async function out() {
+    return new Promise(function (resolve, reject) {});
+}
+
+declare var console: any;
+out().then(() => {
+    console.log("Yea!");
+});
+
+// Using Es6 proxy
+var t = {}
+var p = new Proxy(t, {});
+
+// Using ES6 reflect
+Reflect.isExtensible({});
+
+// Using Es6 regexp
+var reg = new RegExp("/s");
+reg.flags;
+
+// Using ES6 string
+var str = "Hello world";
+str.includes("hello", 0);
+
+// Using ES6 symbol
+var s = Symbol();
+
+// Using ES6 wellknown-symbol
+const o1 = {
+    [Symbol.hasInstance](value: any) {
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/modularizeLibrary_TargetES5UsingES6Lib.ts b/tests/cases/compiler/modularizeLibrary_TargetES5UsingES6Lib.ts
new file mode 100644
index 00000000000..e308912757b
--- /dev/null
+++ b/tests/cases/compiler/modularizeLibrary_TargetES5UsingES6Lib.ts
@@ -0,0 +1,83 @@
+// @lib: es5,es6
+// @target: es6
+
+// Using Es6 array
+function f(x: number, y: number, z: number) {
+    return Array.from(arguments);
+}
+
+f(1, 2, 3);  // no error
+
+// Using ES6 collection
+var m = new Map<string, number>();
+m.clear();
+// Using ES6 iterable
+m.keys();
+
+// Using ES6 function
+function Baz() { }
+Baz.name;
+
+// Using ES6 generator
+function* gen() {
+    let i = 0;
+    while (i < 10) {
+        yield i;
+        i++;
+    }
+}
+
+function* gen2() {
+    let i = 0;
+    while (i < 10) {
+        yield i;
+        i++;
+    }
+}
+
+// Using ES6 math
+Math.sign(1);
+
+// Using ES6 object
+var o = {
+    a: 2,
+    [Symbol.hasInstance](value: any) {
+        return false;
+    }
+};
+o.hasOwnProperty(Symbol.hasInstance);
+
+// Using ES6 promise
+async function out() {
+    return new Promise(function (resolve, reject) {});
+}
+
+declare var console: any;
+out().then(() => {
+    console.log("Yea!");
+});
+
+// Using Es6 proxy
+var t = {}
+var p = new Proxy(t, {});
+
+// Using ES6 reflect
+Reflect.isExtensible({});
+
+// Using Es6 regexp
+var reg = new RegExp("/s");
+reg.flags;
+
+// Using ES6 string
+var str = "Hello world";
+str.includes("hello", 0);
+
+// Using ES6 symbol
+var s = Symbol();
+
+// Using ES6 wellknown-symbol
+const o1 = {
+    [Symbol.hasInstance](value: any) {
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/modularizeLibrary_TargetES6UsingES6Lib.ts b/tests/cases/compiler/modularizeLibrary_TargetES6UsingES6Lib.ts
new file mode 100644
index 00000000000..3a938fe1a69
--- /dev/null
+++ b/tests/cases/compiler/modularizeLibrary_TargetES6UsingES6Lib.ts
@@ -0,0 +1,56 @@
+// @lib: es6
+// @target: es6
+
+// Using Es6 array
+function f(x: number, y: number, z: number) {
+    return Array.from(arguments);
+}
+
+f(1, 2, 3);  // no error
+
+// Using ES6 collection
+var m = new Map<string, number>();
+m.clear();
+// Using ES6 iterable
+m.keys();
+
+// Using ES6 function
+function Baz() { }
+Baz.name;
+
+// Using ES6 math
+Math.sign(1);
+
+// Using ES6 object
+var o = {
+    a: 2,
+    [Symbol.hasInstance](value: any) {
+        return false;
+    }
+};
+o.hasOwnProperty(Symbol.hasInstance);
+
+// Using Es6 proxy
+var t = {}
+var p = new Proxy(t, {});
+
+// Using ES6 reflect
+Reflect.isExtensible({});
+
+// Using Es6 regexp
+var reg = new RegExp("/s");
+reg.flags;
+
+// Using ES6 string
+var str = "Hello world";
+str.includes("hello", 0);
+
+// Using ES6 symbol
+var s = Symbol();
+
+// Using ES6 wellknown-symbol
+const o1 = {
+    [Symbol.hasInstance](value: any) {
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/modularizeLibrary_UsingES5LibAndES6ArrayLib.ts b/tests/cases/compiler/modularizeLibrary_UsingES5LibAndES6ArrayLib.ts
new file mode 100644
index 00000000000..b7697af1f7f
--- /dev/null
+++ b/tests/cases/compiler/modularizeLibrary_UsingES5LibAndES6ArrayLib.ts
@@ -0,0 +1,9 @@
+// @lib: es5,es2015.core
+// @target: es5
+
+// No error
+function f(x: number, y: number, z: number) {
+    return Array.from(arguments);
+}
+
+f(1, 2, 3);
\ No newline at end of file
diff --git a/tests/cases/compiler/modularizeLibrary_UsingES5LibAndES6FeatureLibs.ts b/tests/cases/compiler/modularizeLibrary_UsingES5LibAndES6FeatureLibs.ts
new file mode 100644
index 00000000000..327df2e679f
--- /dev/null
+++ b/tests/cases/compiler/modularizeLibrary_UsingES5LibAndES6FeatureLibs.ts
@@ -0,0 +1,15 @@
+// @lib: es5,es2015.core,es2015.symbol,es2015.proxy,es2015.generator,es2015.iterable,es2015.reflect
+// @target: es6
+
+var s = Symbol();
+var t = {};
+var p = new Proxy(t, {});
+
+Reflect.ownKeys({});
+
+function* idGen() {
+    let i = 10;
+    while (i < 20) {
+        yield i + 2;
+    }
+}
diff --git a/tests/cases/compiler/modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.ts b/tests/cases/compiler/modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.ts
new file mode 100644
index 00000000000..51a0ee5d1f5
--- /dev/null
+++ b/tests/cases/compiler/modularizeLibrary_UsingES5LibES6ArrayLibES6WellknownSymbolLib.ts
@@ -0,0 +1,9 @@
+// @lib: es5,es2015.core,es2015.symbol.wellknown
+
+function f(x: number, y: number, z: number) {
+    return Array.from(arguments);
+}
+
+f(1, 2, 3);   // no error
+let a = ['c', 'd'];
+a[Symbol.isConcatSpreadable] = false;
\ No newline at end of file
diff --git a/tests/cases/compiler/moduleNoneErrors.ts b/tests/cases/compiler/moduleNoneErrors.ts
new file mode 100644
index 00000000000..c5f34a28c77
--- /dev/null
+++ b/tests/cases/compiler/moduleNoneErrors.ts
@@ -0,0 +1,5 @@
+// @module: none
+// @Filename: a.ts
+export class Foo {
+    foo: string;
+}
diff --git a/tests/cases/compiler/module_augmentUninstantiatedModule.ts b/tests/cases/compiler/module_augmentUninstantiatedModule.ts
new file mode 100644
index 00000000000..4d71c6c1389
--- /dev/null
+++ b/tests/cases/compiler/module_augmentUninstantiatedModule.ts
@@ -0,0 +1,9 @@
+declare module "foo" {
+   namespace M {}
+   var M;
+   export = M;
+}
+
+declare module "bar" {
+    module "foo" {}
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/module_augmentUninstantiatedModule2.ts b/tests/cases/compiler/module_augmentUninstantiatedModule2.ts
new file mode 100644
index 00000000000..101e26bf85b
--- /dev/null
+++ b/tests/cases/compiler/module_augmentUninstantiatedModule2.ts
@@ -0,0 +1,2 @@
+// @module: commonjs
// @moduleResolution: node



// @fileName: app.ts
import ng = require("angular");
import "./moduleAugmentation";

var x: number = ng.getNumber();

// @filename: moduleAugmentation.ts
import * as ng from "angular"
declare module "angular" {
    export interface IAngularStatic {
        getNumber: () => number;
    }
}

// @filename: node_modules/angular/index.d.ts
+declare var ng: ng.IAngularStatic;

declare module ng {
   export interface IModule {
      name: string;
   }

   export interface IAngularStatic {
       module: (s: string) => IModule;
   }
}

export = ng;

\ No newline at end of file
diff --git a/tests/cases/compiler/newNamesInGlobalAugmentations1.ts b/tests/cases/compiler/newNamesInGlobalAugmentations1.ts
new file mode 100644
index 00000000000..73ed4e5e2e8
--- /dev/null
+++ b/tests/cases/compiler/newNamesInGlobalAugmentations1.ts
@@ -0,0 +1,22 @@
+// @target: es6
+
+// @filename: f1.d.ts
+export {};
+
+declare module M.M1 {
+    export let x: number;
+}
+declare global {
+    interface SymbolConstructor {
+        observable: symbol;
+    }
+    class Cls {x}
+    let [a, b]: number[];
+    export import X = M.M1.x;
+}
+
+// @filename: main.ts
+
+Symbol.observable;
+new Cls().x
+let c = a + b + X;
\ No newline at end of file
diff --git a/tests/cases/compiler/noErrorOnEmptyDts.ts b/tests/cases/compiler/noErrorOnEmptyDts.ts
deleted file mode 100644
index 1266ea2bd75..00000000000
--- a/tests/cases/compiler/noErrorOnEmptyDts.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// @module: commonjs
-
-// @filename: c:/node_modules/test.d.ts
-
-// comment
-
-// @filename: c:/app/main.ts
-import "test"
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitAnyDestructuringInPrivateMethod.ts b/tests/cases/compiler/noImplicitAnyDestructuringInPrivateMethod.ts
new file mode 100644
index 00000000000..b6ff1fa6969
--- /dev/null
+++ b/tests/cases/compiler/noImplicitAnyDestructuringInPrivateMethod.ts
@@ -0,0 +1,13 @@
+// @noimplicitany: true
+// @declaration: true
+type Arg = {
+    a: number;
+};
+export class Bar {
+    private bar({ a, }: Arg): number {
+        return a;
+    }
+}
+export declare class Bar2 {
+    private bar({ a, });
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitAnyDestructuringParameterDeclaration.ts b/tests/cases/compiler/noImplicitAnyDestructuringParameterDeclaration.ts
new file mode 100644
index 00000000000..9f4e579dcff
--- /dev/null
+++ b/tests/cases/compiler/noImplicitAnyDestructuringParameterDeclaration.ts
@@ -0,0 +1,11 @@
+// @noimplicitany: true
+function f1([a], {b}, c, d) { // error
+}
+function f2([a = undefined], {b = null}, c = undefined, d = null) { // error
+}
+function f3([a]: [any], {b}: { b: any }, c: any, d: any) {
+}
+function f4({b}: { b }, x: { b }) { // error in type instead
+}
+function f5([a1] = [undefined], {b1} = { b1: null }, c1 = undefined, d1 = null) { // error
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitAnyDestructuringVarDeclaration.ts b/tests/cases/compiler/noImplicitAnyDestructuringVarDeclaration.ts
new file mode 100644
index 00000000000..6988416d4de
--- /dev/null
+++ b/tests/cases/compiler/noImplicitAnyDestructuringVarDeclaration.ts
@@ -0,0 +1,10 @@
+// @noimplicitany: true
+var [a], {b}, c, d; // error
+
+var [a1 = undefined], {b1 = null}, c1 = undefined, d1 = null; // error
+
+var [a2]: [any], {b2}: { b2: any }, c2: any, d2: any;
+
+var {b3}: { b3 }, c3: { b3 }; // error in type instead
+
+var [a1] = [undefined], {b1} = { b1: null }, c1 = undefined, d1 = null; // error
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitReturnInConstructors.ts b/tests/cases/compiler/noImplicitReturnInConstructors.ts
new file mode 100644
index 00000000000..ac6f5145318
--- /dev/null
+++ b/tests/cases/compiler/noImplicitReturnInConstructors.ts
@@ -0,0 +1,6 @@
+// @noImplicitReturns: true
+class C {
+  constructor() {
+    return;
+  }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitReturnsInAsync1.ts b/tests/cases/compiler/noImplicitReturnsInAsync1.ts
new file mode 100644
index 00000000000..a4aadd81f75
--- /dev/null
+++ b/tests/cases/compiler/noImplicitReturnsInAsync1.ts
@@ -0,0 +1,9 @@
+// @target: es6
+// @noImplicitReturns: true
+
+async function test(isError: boolean = false) {
+    if (isError === true) {
+        return;
+    }
+    let x = await Promise.resolve("The test is passed without an error.");
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitReturnsInAsync2.ts b/tests/cases/compiler/noImplicitReturnsInAsync2.ts
new file mode 100644
index 00000000000..20488b6bd37
--- /dev/null
+++ b/tests/cases/compiler/noImplicitReturnsInAsync2.ts
@@ -0,0 +1,38 @@
+// @target: es6
+// @noImplicitReturns: true
+
+// Should be an error, Promise<number>, currently retorted correctly 
+async function test3(isError: boolean = true) {
+    if (isError === true) {
+        return 6;
+    }
+}
+
+// Should not be an error, Promise<any>, currently **not** working
+async function test4(isError: boolean = true) {  
+    if (isError === true) {
+        return undefined;
+    }
+}
+
+// should not be error, Promise<any> currently working correctly 
+async function test5(isError: boolean = true): Promise<any> { //should not be error
+    if (isError === true) {
+        return undefined;
+    }
+}
+
+
+// should be error, currently reported correctly 
+async function test6(isError: boolean = true): Promise<number> { 
+    if (isError === true) {
+        return undefined;
+    }
+}
+
+// infered to be Promise<void>, should not be an error, currently reported correctly 
+async function test7(isError: boolean = true) { 
+    if (isError === true) {
+        return;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitReturnsWithProtectedBlocks1.ts b/tests/cases/compiler/noImplicitReturnsWithProtectedBlocks1.ts
new file mode 100644
index 00000000000..4b2174386fa
--- /dev/null
+++ b/tests/cases/compiler/noImplicitReturnsWithProtectedBlocks1.ts
@@ -0,0 +1,12 @@
+// @noImplicitReturns: true
+declare function log(s: string): void;
+declare function get(): number;
+
+function main1() : number {
+    try {
+        return get();
+    }
+    finally {
+        log("in finally");
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitReturnsWithProtectedBlocks2.ts b/tests/cases/compiler/noImplicitReturnsWithProtectedBlocks2.ts
new file mode 100644
index 00000000000..fbd12526cf9
--- /dev/null
+++ b/tests/cases/compiler/noImplicitReturnsWithProtectedBlocks2.ts
@@ -0,0 +1,15 @@
+// @noImplicitReturns: true
+declare function log(s: string): void;
+declare function get(): number;
+
+function main1() : number {
+    try {
+        return get();
+    }
+    catch(e) {
+        log("in catch");
+    }
+    finally {
+        log("in finally");
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitReturnsWithProtectedBlocks3.ts b/tests/cases/compiler/noImplicitReturnsWithProtectedBlocks3.ts
new file mode 100644
index 00000000000..1cbb12b1ae0
--- /dev/null
+++ b/tests/cases/compiler/noImplicitReturnsWithProtectedBlocks3.ts
@@ -0,0 +1,12 @@
+// @noImplicitReturns: true
+declare function log(s: string): void;
+declare function get(): number;
+
+function main1() : number {
+    try {
+        return get();
+    }
+    catch(e) {
+        log("in catch");
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitReturnsWithoutReturnExpression.ts b/tests/cases/compiler/noImplicitReturnsWithoutReturnExpression.ts
new file mode 100644
index 00000000000..f532b1280d3
--- /dev/null
+++ b/tests/cases/compiler/noImplicitReturnsWithoutReturnExpression.ts
@@ -0,0 +1,25 @@
+// @noImplicitReturns: true
+function isMissingReturnExpression(): number {
+    return;
+}
+
+function isMissingReturnExpression2(): any {
+    return;
+}
+
+function isMissingReturnExpression3(): number|void {
+    return;
+}
+
+function isMissingReturnExpression4(): void {
+    return;
+}
+
+function isMissingReturnExpression5(x) {
+    if (x) {
+        return 0;
+    }
+    else {
+        return;
+    }
+}
diff --git a/tests/cases/compiler/noImplicitThisFunctions.ts b/tests/cases/compiler/noImplicitThisFunctions.ts
new file mode 100644
index 00000000000..45f0e5a1eb9
--- /dev/null
+++ b/tests/cases/compiler/noImplicitThisFunctions.ts
@@ -0,0 +1,19 @@
+// @noImplicitThis: true
+
+function f1(x) {
+    // implicit any is still allowed
+    return x + 1;
+}
+
+function f2(y: number) {
+    // ok: no reference to this
+    return y + 1;
+}
+
+function f3(z: number): number {
+    // error: this is implicitly any
+    return this.a + z;
+}
+
+// error: `this` is `window`, but is still of type `any`
+let f4: (b: number) => number = b => this.c + b;
diff --git a/tests/cases/compiler/noImplicitUseStrict_amd.ts b/tests/cases/compiler/noImplicitUseStrict_amd.ts
new file mode 100644
index 00000000000..3a2a4760221
--- /dev/null
+++ b/tests/cases/compiler/noImplicitUseStrict_amd.ts
@@ -0,0 +1,4 @@
+// @module: amd
+// @noImplicitUseStrict: true
+
+export var x = 0;
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitUseStrict_commonjs.ts b/tests/cases/compiler/noImplicitUseStrict_commonjs.ts
new file mode 100644
index 00000000000..f8377dba07a
--- /dev/null
+++ b/tests/cases/compiler/noImplicitUseStrict_commonjs.ts
@@ -0,0 +1,4 @@
+// @module: commonjs
+// @noImplicitUseStrict: true
+
+export var x = 0;
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitUseStrict_es6.ts b/tests/cases/compiler/noImplicitUseStrict_es6.ts
new file mode 100644
index 00000000000..f56b0fd9021
--- /dev/null
+++ b/tests/cases/compiler/noImplicitUseStrict_es6.ts
@@ -0,0 +1,5 @@
+// @module: es6
+// @target: es6
+// @noImplicitUseStrict: true
+
+export var x = 0;
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitUseStrict_system.ts b/tests/cases/compiler/noImplicitUseStrict_system.ts
new file mode 100644
index 00000000000..37ff5de469d
--- /dev/null
+++ b/tests/cases/compiler/noImplicitUseStrict_system.ts
@@ -0,0 +1,4 @@
+// @module: system
+// @noImplicitUseStrict: true
+
+export var x = 0;
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitUseStrict_umd.ts b/tests/cases/compiler/noImplicitUseStrict_umd.ts
new file mode 100644
index 00000000000..f26f2ee2aff
--- /dev/null
+++ b/tests/cases/compiler/noImplicitUseStrict_umd.ts
@@ -0,0 +1,4 @@
+// @module: umd
+// @noImplicitUseStrict: true
+
+export var x = 0;
\ No newline at end of file
diff --git a/tests/cases/compiler/nonIdenticalTypeConstraints.ts b/tests/cases/compiler/nonIdenticalTypeConstraints.ts
new file mode 100644
index 00000000000..c0271edc91a
--- /dev/null
+++ b/tests/cases/compiler/nonIdenticalTypeConstraints.ts
@@ -0,0 +1,38 @@
+class Different {
+    a: number;
+    b: string;
+    c: boolean;
+}
+
+class Foo<T extends Function> {
+    n: T;
+}
+interface Foo<T extends Different> {
+    y: T;
+}
+interface Qux<T extends Different> {
+    y: T;
+}
+class Qux<T extends Function> {
+    n: T;
+}
+
+class Bar<T extends Function> {
+    n: T;
+}
+interface Bar<T extends Function> {
+    y: T;
+}
+interface Baz<T extends Function> {
+    y: T;
+}
+class Baz<T extends Function> {
+    n: T;
+}
+
+class Quux<T> {
+    n: T;
+}
+interface Quux<U> {
+    m: U;
+}
\ No newline at end of file
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/pathMappingBasedModuleResolution1_classic.ts b/tests/cases/compiler/pathMappingBasedModuleResolution1_classic.ts
index 20845a49372..054d6ed8a0b 100644
--- a/tests/cases/compiler/pathMappingBasedModuleResolution1_classic.ts
+++ b/tests/cases/compiler/pathMappingBasedModuleResolution1_classic.ts
@@ -1,5 +1,5 @@
 // @module: amd
-// @traceModuleResolution: true
+// @traceResolution: true
 
 // paths should error in the absence of baseurl
 
diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution1_node.ts b/tests/cases/compiler/pathMappingBasedModuleResolution1_node.ts
index 392e85bd7c3..a0ce95f2c1a 100644
--- a/tests/cases/compiler/pathMappingBasedModuleResolution1_node.ts
+++ b/tests/cases/compiler/pathMappingBasedModuleResolution1_node.ts
@@ -1,5 +1,5 @@
 // @module: commonjs
-// @traceModuleResolution: true
+// @traceResolution: true
 
 // paths should error in the absence of baseurl
 // @filename: c:/root/tsconfig.json
diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution2_classic.ts b/tests/cases/compiler/pathMappingBasedModuleResolution2_classic.ts
index 6c84a197eeb..f24e857fa41 100644
--- a/tests/cases/compiler/pathMappingBasedModuleResolution2_classic.ts
+++ b/tests/cases/compiler/pathMappingBasedModuleResolution2_classic.ts
@@ -1,5 +1,5 @@
 // @module: amd
-// @traceModuleResolution: true
+// @traceResolution: true
 
 // baseurl is defined in tsconfig.json
 // paths has errors
diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution2_node.ts b/tests/cases/compiler/pathMappingBasedModuleResolution2_node.ts
index 78ef7215e73..ac4d51bacf5 100644
--- a/tests/cases/compiler/pathMappingBasedModuleResolution2_node.ts
+++ b/tests/cases/compiler/pathMappingBasedModuleResolution2_node.ts
@@ -1,5 +1,5 @@
 // @module: commonjs
-// @traceModuleResolution: true
+// @traceResolution: true
 
 // baseurl is defined in tsconfig.json
 // paths has errors
diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution3_classic.ts b/tests/cases/compiler/pathMappingBasedModuleResolution3_classic.ts
index d46308d089f..350346adebc 100644
--- a/tests/cases/compiler/pathMappingBasedModuleResolution3_classic.ts
+++ b/tests/cases/compiler/pathMappingBasedModuleResolution3_classic.ts
@@ -1,7 +1,7 @@
 // @moduleResolution: classic
 // @module: amd
 // @baseUrl: c:/root
-// @traceModuleResolution: true
+// @traceResolution: true
 
 // baseUrl set via command line
 
diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution3_node.ts b/tests/cases/compiler/pathMappingBasedModuleResolution3_node.ts
index 30e95c9303e..6cab1df06b0 100644
--- a/tests/cases/compiler/pathMappingBasedModuleResolution3_node.ts
+++ b/tests/cases/compiler/pathMappingBasedModuleResolution3_node.ts
@@ -1,7 +1,7 @@
 // @moduleResolution: node
 // @module: commonjs
 // @baseUrl: c:/root
-// @traceModuleResolution: true
+// @traceResolution: true
 
 // baseUrl set via command line
 
diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution4_classic.ts b/tests/cases/compiler/pathMappingBasedModuleResolution4_classic.ts
index 723de05b70c..fbf11e61716 100644
--- a/tests/cases/compiler/pathMappingBasedModuleResolution4_classic.ts
+++ b/tests/cases/compiler/pathMappingBasedModuleResolution4_classic.ts
@@ -1,6 +1,6 @@
 // @moduleResolution: classic
 // @module: amd
-// @traceModuleResolution: true
+// @traceResolution: true
 
 // baseUrl set via command line
 
diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution4_node.ts b/tests/cases/compiler/pathMappingBasedModuleResolution4_node.ts
index e68635e205e..cfb90ca1cc5 100644
--- a/tests/cases/compiler/pathMappingBasedModuleResolution4_node.ts
+++ b/tests/cases/compiler/pathMappingBasedModuleResolution4_node.ts
@@ -1,6 +1,6 @@
 // @moduleResolution: node
 // @module: commonjs
-// @traceModuleResolution: true
+// @traceResolution: true
 
 // baseUrl set via command line
 
diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution5_classic.ts b/tests/cases/compiler/pathMappingBasedModuleResolution5_classic.ts
index a7662688e37..9779f0ca644 100644
--- a/tests/cases/compiler/pathMappingBasedModuleResolution5_classic.ts
+++ b/tests/cases/compiler/pathMappingBasedModuleResolution5_classic.ts
@@ -1,5 +1,5 @@
 // @module: amd
-// @traceModuleResolution: true
+// @traceResolution: true
 
 // paths is defined in tsconfig.json
 // @filename: c:/root/tsconfig.json
diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution5_node.ts b/tests/cases/compiler/pathMappingBasedModuleResolution5_node.ts
index ef5ef0afd6a..3606ab08cd1 100644
--- a/tests/cases/compiler/pathMappingBasedModuleResolution5_node.ts
+++ b/tests/cases/compiler/pathMappingBasedModuleResolution5_node.ts
@@ -1,5 +1,5 @@
 // @module: commonjs
-// @traceModuleResolution: true
+// @traceResolution: true
 
 // paths is defined in tsconfig.json
 // @filename: c:/root/tsconfig.json
diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution6_classic.ts b/tests/cases/compiler/pathMappingBasedModuleResolution6_classic.ts
index adaba8478c9..5ce4bd2a18f 100644
--- a/tests/cases/compiler/pathMappingBasedModuleResolution6_classic.ts
+++ b/tests/cases/compiler/pathMappingBasedModuleResolution6_classic.ts
@@ -1,5 +1,5 @@
 // @module: amd
-// @traceModuleResolution: true
+// @traceResolution: true
 
 // @filename: c:/root/src/tsconfig.json
 {
diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution6_node.ts b/tests/cases/compiler/pathMappingBasedModuleResolution6_node.ts
index a3d0feadf7c..29a82e5412d 100644
--- a/tests/cases/compiler/pathMappingBasedModuleResolution6_node.ts
+++ b/tests/cases/compiler/pathMappingBasedModuleResolution6_node.ts
@@ -1,5 +1,5 @@
 // @module: commonjs
-// @traceModuleResolution: true
+// @traceResolution: true
 
 // @filename: c:/root/src/tsconfig.json
 {
diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution7_classic.ts b/tests/cases/compiler/pathMappingBasedModuleResolution7_classic.ts
index af092df5ce9..81c2328df67 100644
--- a/tests/cases/compiler/pathMappingBasedModuleResolution7_classic.ts
+++ b/tests/cases/compiler/pathMappingBasedModuleResolution7_classic.ts
@@ -1,5 +1,5 @@
 // @module: amd
-// @traceModuleResolution: true
+// @traceResolution: true
 
 // @filename: c:/root/src/tsconfig.json
 {
diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution7_node.ts b/tests/cases/compiler/pathMappingBasedModuleResolution7_node.ts
index faecbe4adb9..1ba9630e0cf 100644
--- a/tests/cases/compiler/pathMappingBasedModuleResolution7_node.ts
+++ b/tests/cases/compiler/pathMappingBasedModuleResolution7_node.ts
@@ -1,5 +1,5 @@
 // @module: commonjs
-// @traceModuleResolution: true
+// @traceResolution: true
 
 // @filename: c:/root/src/tsconfig.json
 {
diff --git a/tests/cases/compiler/pathsValidation1.ts b/tests/cases/compiler/pathsValidation1.ts
new file mode 100644
index 00000000000..45a4409cf03
--- /dev/null
+++ b/tests/cases/compiler/pathsValidation1.ts
@@ -0,0 +1,11 @@
+// @filename: tsconfig.json
+{
+    "compilerOptions": {
+        "baseUrl": ".",
+        "paths": {
+            "*": "*"
+        }
+    }
+}
+// @filename: a.ts
+let x = 1;
\ No newline at end of file
diff --git a/tests/cases/compiler/pathsValidation2.ts b/tests/cases/compiler/pathsValidation2.ts
new file mode 100644
index 00000000000..b15ad4e236a
--- /dev/null
+++ b/tests/cases/compiler/pathsValidation2.ts
@@ -0,0 +1,11 @@
+// @filename: tsconfig.json
+{
+    "compilerOptions": {
+        "baseUrl": ".",
+        "paths": {
+            "*": [1]
+        }
+    }
+}
+// @filename: a.ts
+let x = 1;
\ No newline at end of file
diff --git a/tests/cases/compiler/protectedMembers.ts b/tests/cases/compiler/protectedMembers.ts
index ae32e472425..b7528f26068 100644
--- a/tests/cases/compiler/protectedMembers.ts
+++ b/tests/cases/compiler/protectedMembers.ts
@@ -82,7 +82,6 @@ interface E extends C {
 }
 
 class CC {
-    // Error, constructor cannot be protected
     protected constructor() {
     }
 }
diff --git a/tests/cases/compiler/relativeNamesInClassicResolution.ts b/tests/cases/compiler/relativeNamesInClassicResolution.ts
new file mode 100644
index 00000000000..7c73a2e3cad
--- /dev/null
+++ b/tests/cases/compiler/relativeNamesInClassicResolution.ts
@@ -0,0 +1,7 @@
+// @module:amd
+
+// @filename: somefolder/a.ts
+import {x} from "./b"
+
+// @filename: b.ts
+export let x = 1;
\ No newline at end of file
diff --git a/tests/cases/compiler/shorthand-property-es5-es6.ts b/tests/cases/compiler/shorthand-property-es5-es6.ts
new file mode 100644
index 00000000000..8c8ae4368a0
--- /dev/null
+++ b/tests/cases/compiler/shorthand-property-es5-es6.ts
@@ -0,0 +1,8 @@
+// @target: ES5
+// @module: ES6
+// @declaration: true
+
+// @filename: test.ts
+import {foo} from './foo';
+const baz = 42;
+const bar = { foo, baz };
diff --git a/tests/cases/compiler/shorthand-property-es6-amd.ts b/tests/cases/compiler/shorthand-property-es6-amd.ts
new file mode 100644
index 00000000000..0f2a62ad86c
--- /dev/null
+++ b/tests/cases/compiler/shorthand-property-es6-amd.ts
@@ -0,0 +1,8 @@
+// @target: ES6
+// @module: amd
+// @declaration: true
+
+// @filename: test.ts
+import {foo} from './foo';
+const baz = 42;
+const bar = { foo, baz };
diff --git a/tests/cases/compiler/shorthand-property-es6-es6.ts b/tests/cases/compiler/shorthand-property-es6-es6.ts
new file mode 100644
index 00000000000..f904e4f8dcf
--- /dev/null
+++ b/tests/cases/compiler/shorthand-property-es6-es6.ts
@@ -0,0 +1,8 @@
+// @target: ES6
+// @module: ES6
+// @declaration: true
+
+// @filename: test.ts
+import {foo} from './foo';
+const baz = 42;
+const bar = { foo, baz };
diff --git a/tests/cases/compiler/staticAnonymousTypeNotReferencingTypeParameter.ts b/tests/cases/compiler/staticAnonymousTypeNotReferencingTypeParameter.ts
new file mode 100644
index 00000000000..3923e1d707f
--- /dev/null
+++ b/tests/cases/compiler/staticAnonymousTypeNotReferencingTypeParameter.ts
@@ -0,0 +1,141 @@
+// This test case is a condensed version of Angular 2's ListWrapper. Prior to #7448
+// this would cause the compiler to run out of memory.
+
+function outer<T>(x: T) {
+  class Inner {
+    static y: T = x;
+  }
+  return Inner;
+}
+let y: number = outer(5).y;
+
+class ListWrapper2 {
+  static clone<T>(dit: typeof ListWrapper2, array: T[]): T[] { return array.slice(0); }
+  static reversed<T>(dit: typeof ListWrapper2, array: T[]): T[] {
+    var a = ListWrapper2.clone(dit, array);
+    return a;
+  }
+}
+namespace tessst {
+    /**
+     * Iterates through 'array' by index and performs the callback on each element of array until the callback
+     * returns a truthy value, then returns that value.
+     * If no such value is found, the callback is applied to each element of array and undefined is returned.
+     */
+    export function funkyFor<T, U>(array: T[], callback: (element: T, index: number) => U): U {
+        if (array) {
+            for (let i = 0, len = array.length; i < len; i++) {
+                const result = callback(array[i], i);
+                if (result) {
+                    return result;
+                }
+            }
+        }
+        return undefined;
+    }
+}
+interface Scanner {
+  scanRange<T>(start: number, length: number, callback: () => T): T;
+}
+class ListWrapper {
+  // JS has no way to express a statically fixed size list, but dart does so we
+  // keep both methods.
+  static createFixedSize(dit: typeof ListWrapper, size: number): any[] { return new Array(size); }
+  static createGrowableSize(dit: typeof ListWrapper, size: number): any[] { return new Array(size); }
+  static clone<T>(dit: typeof ListWrapper, array: T[]): T[] { return array.slice(0); }
+  static forEachWithIndex<T>(dit: typeof ListWrapper, array: T[], fn: (t: T, n: number) => void) {
+    for (var i = 0; i < array.length; i++) {
+      fn(array[i], i);
+    }
+  }
+  static first<T>(dit: typeof ListWrapper, array: T[]): T {
+    if (!array) return null;
+    return array[0];
+  }
+  static last<T>(dit: typeof ListWrapper, array: T[]): T {
+    if (!array || array.length == 0) return null;
+    return array[array.length - 1];
+  }
+  static indexOf<T>(dit: typeof ListWrapper, array: T[], value: T, startIndex: number = 0): number {
+    return array.indexOf(value, startIndex);
+  }
+  static contains<T>(dit: typeof ListWrapper, list: T[], el: T): boolean { return list.indexOf(el) !== -1; }
+  static reversed<T>(dit: typeof ListWrapper, array: T[]): T[] {
+    var a = ListWrapper.clone(dit, array);
+    let scanner: Scanner;
+    scanner.scanRange(3, 5, () => {  });
+    return tessst.funkyFor(array, t => t.toString()) ? a.reverse() : a;
+  }
+  static concat(dit: typeof ListWrapper, a: any[], b: any[]): any[] { return a.concat(b); }
+  static insert<T>(dit: typeof ListWrapper, list: T[], index: number, value: T) { list.splice(index, 0, value); }
+  static removeAt<T>(dit: typeof ListWrapper, list: T[], index: number): T {
+    var res = list[index];
+    list.splice(index, 1);
+    return res;
+  }
+  static removeAll<T>(dit: typeof ListWrapper, list: T[], items: T[]) {
+    for (var i = 0; i < items.length; ++i) {
+      var index = list.indexOf(items[i]);
+      list.splice(index, 1);
+    }
+  }
+  static remove<T>(dit: typeof ListWrapper, list: T[], el: T): boolean {
+    var index = list.indexOf(el);
+    if (index > -1) {
+      list.splice(index, 1);
+      return true;
+    }
+    return false;
+  }
+  static clear(dit: typeof ListWrapper, list: any[]) { list.length = 0; }
+  static isEmpty(dit: typeof ListWrapper, list: any[]): boolean { return list.length == 0; }
+  static fill(dit: typeof ListWrapper, list: any[], value: any, start: number = 0, end: number = null) {
+    list.fill(value, start, end === null ? list.length : end);
+  }
+  static equals(dit: typeof ListWrapper, a: any[], b: any[]): boolean {
+    if (a.length != b.length) return false;
+    for (var i = 0; i < a.length; ++i) {
+      if (a[i] !== b[i]) return false;
+    }
+    return true;
+  }
+  static slice<T>(dit: typeof ListWrapper, l: T[], from: number = 0, to: number = null): T[] {
+    return l.slice(from, to === null ? undefined : to);
+  }
+  static splice<T>(dit: typeof ListWrapper, l: T[], from: number, length: number): T[] { return l.splice(from, length); }
+  static sort<T>(dit: typeof ListWrapper, l: T[], compareFn?: (a: T, b: T) => number) {
+    if (isPresent(compareFn)) {
+      l.sort(compareFn);
+    } else {
+      l.sort();
+    }
+  }
+  static toString<T>(dit: typeof ListWrapper, l: T[]): string { return l.toString(); }
+  static toJSON<T>(dit: typeof ListWrapper, l: T[]): string { return JSON.stringify(l); }
+
+  static maximum<T>(dit: typeof ListWrapper, list: T[], predicate: (t: T) => number): T {
+    if (list.length == 0) {
+      return null;
+    }
+    var solution: T = null;
+    var maxValue = -Infinity;
+    for (var index = 0; index < list.length; index++) {
+      var candidate = list[index];
+      if (isBlank(candidate)) {
+        continue;
+      }
+      var candidateValue = predicate(candidate);
+      if (candidateValue > maxValue) {
+        solution = candidate;
+        maxValue = candidateValue;
+      }
+    }
+    return solution;
+  }
+}
+let cloned = ListWrapper.clone(ListWrapper, [1,2,3,4]);
+declare function isBlank(x: any): boolean;
+declare function isPresent<T>(compareFn?: (a: T, b: T) => number): boolean;
+interface Array<T> {
+	fill(value: any, start: number, end: number): void;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/systemModuleTargetES6.ts b/tests/cases/compiler/systemModuleTargetES6.ts
new file mode 100644
index 00000000000..a41b0a62c86
--- /dev/null
+++ b/tests/cases/compiler/systemModuleTargetES6.ts
@@ -0,0 +1,15 @@
+// @target: ES6
+// @module: System
+export class MyClass { }
+export class MyClass2 {
+    static value = 42;
+    static getInstance() { return MyClass2.value; }
+}
+
+export function myFunction() {
+    return new MyClass();
+}
+
+export function myFunction2() {
+    return new MyClass2();
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/typeReferenceDirectives1.ts b/tests/cases/compiler/typeReferenceDirectives1.ts
new file mode 100644
index 00000000000..2127bd13f7b
--- /dev/null
+++ b/tests/cases/compiler/typeReferenceDirectives1.ts
@@ -0,0 +1,14 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+// @declaration: true
+// @typesRoot: /
+
+
+// @filename: /types/lib/index.d.ts
+interface $ { x }
+
+// @filename: /app.ts
+/// <reference types="lib"/>
+interface A {
+    x: $
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/typeReferenceDirectives10.ts b/tests/cases/compiler/typeReferenceDirectives10.ts
new file mode 100644
index 00000000000..bf0768993c9
--- /dev/null
+++ b/tests/cases/compiler/typeReferenceDirectives10.ts
@@ -0,0 +1,17 @@
+// @noImplicitReferences: true
+// @declaration: true
+// @typesRoot: /
+// @traceResolution: true
+
+// @filename: /ref.d.ts
+export interface $ { x }
+
+// @filename: /types/lib/index.d.ts
+declare let $: { x: number }
+
+// @filename: /app.ts
+/// <reference types="lib"/>
+import {$} from "./ref";
+export interface A {
+    x: $
+}
diff --git a/tests/cases/compiler/typeReferenceDirectives11.ts b/tests/cases/compiler/typeReferenceDirectives11.ts
new file mode 100644
index 00000000000..d199277ac62
--- /dev/null
+++ b/tests/cases/compiler/typeReferenceDirectives11.ts
@@ -0,0 +1,20 @@
+// @noImplicitReferences: true
+// @declaration: true
+// @typesRoot: /
+// @traceResolution: true
+// @types: lib
+// @out: output.js
+// @module: amd
+
+// @filename: /types/lib/index.d.ts
+
+interface Lib { x }
+
+// @filename: /mod1.ts
+
+export function foo(): Lib { return {x: 1} }
+
+// @filename: /mod2.ts
+
+import {foo} from "./mod1";
+export const bar = foo();
\ No newline at end of file
diff --git a/tests/cases/compiler/typeReferenceDirectives12.ts b/tests/cases/compiler/typeReferenceDirectives12.ts
new file mode 100644
index 00000000000..df449dc0ef9
--- /dev/null
+++ b/tests/cases/compiler/typeReferenceDirectives12.ts
@@ -0,0 +1,38 @@
+// @noImplicitReferences: true
+// @declaration: true
+// @typesRoot: /
+// @traceResolution: true
+// @out: output.js
+// @module: amd
+
+// @filename: /types/lib/index.d.ts
+
+interface Lib { x }
+
+// @filename: /main.ts
+export class Cls {
+    x
+}
+
+// @filename: /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;
+    }
+}
+
+// @filename: /mod2.ts
+import { Cls } from "./main";
+import "./mod1";
+
+export const cls = Cls;
+export const foo = new Cls().foo();
+export const bar = Cls.bar();
\ No newline at end of file
diff --git a/tests/cases/compiler/typeReferenceDirectives13.ts b/tests/cases/compiler/typeReferenceDirectives13.ts
new file mode 100644
index 00000000000..816d419e9d5
--- /dev/null
+++ b/tests/cases/compiler/typeReferenceDirectives13.ts
@@ -0,0 +1,17 @@
+// @noImplicitReferences: true
+// @declaration: true
+// @typesRoot: /
+// @traceResolution: true
+
+// @filename: /ref.d.ts
+export interface $ { x }
+
+// @filename: /types/lib/index.d.ts
+declare let $: { x: number }
+
+// @filename: /app.ts
+/// <reference types="lib"/>
+import {$} from "./ref";
+export interface A {
+    x: () => typeof $
+}
diff --git a/tests/cases/compiler/typeReferenceDirectives2.ts b/tests/cases/compiler/typeReferenceDirectives2.ts
new file mode 100644
index 00000000000..eb651728cea
--- /dev/null
+++ b/tests/cases/compiler/typeReferenceDirectives2.ts
@@ -0,0 +1,13 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+// @declaration: true
+// @typesRoot: /
+// @types: lib
+
+// @filename: /types/lib/index.d.ts
+interface $ { x }
+
+// @filename: /app.ts
+interface A {
+    x: $
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/typeReferenceDirectives3.ts b/tests/cases/compiler/typeReferenceDirectives3.ts
new file mode 100644
index 00000000000..bf81268d141
--- /dev/null
+++ b/tests/cases/compiler/typeReferenceDirectives3.ts
@@ -0,0 +1,19 @@
+// @noImplicitReferences: true
+// @declaration: true
+// @typesRoot: /
+// @traceResolution: true
+
+// $ comes from d.ts file - no need to add type reference directive
+
+// @filename: /ref.d.ts
+interface $ { x }
+
+// @filename: /types/lib/index.d.ts
+declare let $: { x: number }
+
+// @filename: /app.ts
+/// <reference types="lib"/>
+/// <reference path="ref.d.ts" />
+interface A {
+    x: () => $
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/typeReferenceDirectives4.ts b/tests/cases/compiler/typeReferenceDirectives4.ts
new file mode 100644
index 00000000000..48eb8a5324a
--- /dev/null
+++ b/tests/cases/compiler/typeReferenceDirectives4.ts
@@ -0,0 +1,20 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+// @declaration: true
+// @typesRoot: /
+
+// $ comes from d.ts file - no need to add type reference directive
+
+// @filename: /ref.d.ts
+interface $ { x }
+
+// @filename: /types/lib/index.d.ts
+declare let $: { x: number }
+
+
+// @filename: /app.ts
+/// <reference path="./ref.d.ts"/>
+/// <reference types="lib"/>
+
+let x: $;
+let y = () => x
\ No newline at end of file
diff --git a/tests/cases/compiler/typeReferenceDirectives5.ts b/tests/cases/compiler/typeReferenceDirectives5.ts
new file mode 100644
index 00000000000..675f932da68
--- /dev/null
+++ b/tests/cases/compiler/typeReferenceDirectives5.ts
@@ -0,0 +1,17 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+// @declaration: true
+// @typesRoot: /
+
+// @filename: /ref.d.ts
+export interface $ { x }
+
+// @filename: /types/lib/index.d.ts
+declare let $: { x: number }
+
+// @filename: /app.ts
+/// <reference types="lib"/>
+import {$} from "./ref";
+export interface A {
+    x: typeof $;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/typeReferenceDirectives6.ts b/tests/cases/compiler/typeReferenceDirectives6.ts
new file mode 100644
index 00000000000..120a743009c
--- /dev/null
+++ b/tests/cases/compiler/typeReferenceDirectives6.ts
@@ -0,0 +1,21 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+// @declaration: true
+// @typesRoot: /
+
+// $ comes from type declaration file - type reference directive should be added
+
+// @filename: /ref.d.ts
+declare let $: { x: number }
+    
+// @filename: /types/lib/index.d.ts
+interface $ { x }
+
+
+// @filename: /app.ts
+/// <reference path="./ref.d.ts"/>
+/// <reference types="lib"/>
+
+let x: $;
+let y = () => x
+
diff --git a/tests/cases/compiler/typeReferenceDirectives7.ts b/tests/cases/compiler/typeReferenceDirectives7.ts
new file mode 100644
index 00000000000..f18fed37741
--- /dev/null
+++ b/tests/cases/compiler/typeReferenceDirectives7.ts
@@ -0,0 +1,18 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+// @declaration: true
+// @typesRoot: /
+
+// local value shadows global - no need to add type reference directive 
+   
+// @filename: /types/lib/index.d.ts
+declare let $: { x: number }
+
+
+// @filename: /app.ts
+/// <reference types="lib"/>
+
+export let $ = 1;
+
+export let x: typeof $;
+export let y = () => x
\ No newline at end of file
diff --git a/tests/cases/compiler/typeReferenceDirectives8.ts b/tests/cases/compiler/typeReferenceDirectives8.ts
new file mode 100644
index 00000000000..2465d2afb10
--- /dev/null
+++ b/tests/cases/compiler/typeReferenceDirectives8.ts
@@ -0,0 +1,18 @@
+// @noImplicitReferences: true
+// @declaration: true
+// @typesRoot: /
+// @traceResolution: true
+// @types: lib
+
+// @filename: /types/lib/index.d.ts
+
+interface Lib { x }
+
+// @filename: /mod1.ts
+
+export function foo(): Lib { return {x: 1} }
+
+// @filename: /mod2.ts
+
+import {foo} from "./mod1";
+export const bar = foo();
\ No newline at end of file
diff --git a/tests/cases/compiler/typeReferenceDirectives9.ts b/tests/cases/compiler/typeReferenceDirectives9.ts
new file mode 100644
index 00000000000..eb8d6abaef1
--- /dev/null
+++ b/tests/cases/compiler/typeReferenceDirectives9.ts
@@ -0,0 +1,36 @@
+// @noImplicitReferences: true
+// @declaration: true
+// @typesRoot: /
+// @traceResolution: true
+
+// @filename: /types/lib/index.d.ts
+
+interface Lib { x }
+
+// @filename: /main.ts
+export class Cls {
+    x
+}
+
+// @filename: /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;
+    }
+}
+
+// @filename: /mod2.ts
+import { Cls } from "./main";
+import "./mod1";
+
+export const cls = Cls;
+export const foo = new Cls().foo();
+export const bar = Cls.bar();
\ No newline at end of file
diff --git a/tests/cases/compiler/useStrictLikePrologueString01.ts b/tests/cases/compiler/useStrictLikePrologueString01.ts
new file mode 100644
index 00000000000..b76e38ebb06
--- /dev/null
+++ b/tests/cases/compiler/useStrictLikePrologueString01.ts
@@ -0,0 +1,7 @@
+//@target: commonjs
+//@target: es5
+
+"hey!"
+" use strict "
+export function f() {   
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility.ts b/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility.ts
index c2e4855e63a..1c9a801429d 100644
--- a/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility.ts
+++ b/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility.ts
@@ -1,18 +1,20 @@
+// @declaration: true
+
 class C {
     public constructor(public x: number) { }
 }
 
 class D {
-    private constructor(public x: number) { } // error
+    private constructor(public x: number) { }
 }
 
 class E {
-    protected constructor(public x: number) { } // error
+    protected constructor(public x: number) { }
 }
 
 var c = new C(1);
-var d = new D(1);
-var e = new E(1);
+var d = new D(1); // error
+var e = new E(1); // error
 
 module Generic {
     class C<T> {
@@ -20,14 +22,14 @@ module Generic {
     }
 
     class D<T> {
-        private constructor(public x: T) { } // error
+        private constructor(public x: T) { }
     }
 
     class E<T> {
-        protected constructor(public x: T) { } // error
+        protected constructor(public x: T) { }
     }
 
     var c = new C(1);
-    var d = new D(1);
-    var e = new E(1);
+    var d = new D(1); // error
+    var e = new E(1); // error
 }
diff --git a/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts b/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts
new file mode 100644
index 00000000000..2a961e2c067
--- /dev/null
+++ b/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility2.ts
@@ -0,0 +1,42 @@
+// @declaration: true
+
+class BaseA {
+    public constructor(public x: number) { }
+    createInstance() { new BaseA(1); }
+}
+
+class BaseB {
+    protected constructor(public x: number) { }
+    createInstance() { new BaseB(1); }
+}
+
+class BaseC {
+     private constructor(public x: number) { }
+     createInstance() { new BaseC(1); }
+}
+
+class DerivedA extends BaseA {
+    constructor(public x: number) { super(x); }
+    createInstance() { new DerivedA(1); }
+    createBaseInstance() { new BaseA(1); }
+}
+
+class DerivedB extends BaseB {
+    constructor(public x: number) { super(x); }
+    createInstance() { new DerivedB(1); }
+    createBaseInstance() { new BaseB(1); } // error
+}
+
+class DerivedC extends BaseC { // error
+    constructor(public x: number) { super(x); }
+    createInstance() { new DerivedC(1); }
+    createBaseInstance() { new BaseC(1); } // error
+}
+
+var ba = new BaseA(1);
+var bb = new BaseB(1); // error
+var bc = new BaseC(1); // error
+
+var da = new DerivedA(1);
+var db = new DerivedB(1);
+var dc = new DerivedC(1);
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility3.ts b/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility3.ts
new file mode 100644
index 00000000000..91bb4873d96
--- /dev/null
+++ b/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility3.ts
@@ -0,0 +1,35 @@
+// @declaration: true
+
+class Foo {
+     constructor(public x: number) { }
+}
+
+class Bar {
+    public constructor(public x: number) { }
+}
+
+class Baz {
+    protected constructor(public x: number) { }
+}
+
+class Qux {
+     private constructor(public x: number) { }
+}
+
+// b is public
+let a = Foo;
+a = Bar;
+a = Baz; // error Baz is protected
+a = Qux; // error Qux is private
+
+// b is protected
+let b = Baz;
+b = Foo;
+b = Bar;
+b = Qux; // error Qux is private
+
+// c is private
+let c = Qux;
+c = Foo;
+c = Bar;
+c = Baz;
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility4.ts b/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility4.ts
new file mode 100644
index 00000000000..3760f2176ae
--- /dev/null
+++ b/tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility4.ts
@@ -0,0 +1,31 @@
+// @declaration: true
+
+class A {
+    private constructor() { }
+
+    method() {
+        class B {
+            method() {
+                new A(); // OK
+            }
+        }
+
+        class C extends A { // OK
+        }
+    }
+}
+
+class D {
+    protected constructor() { }
+
+    method() {
+        class E {
+            method() {
+                new D(); // OK
+            }
+        }
+
+        class F extends D { // OK
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/constructorDeclarations/classConstructorOverloadsAccessibility.ts b/tests/cases/conformance/classes/constructorDeclarations/classConstructorOverloadsAccessibility.ts
new file mode 100644
index 00000000000..5ed20d03853
--- /dev/null
+++ b/tests/cases/conformance/classes/constructorDeclarations/classConstructorOverloadsAccessibility.ts
@@ -0,0 +1,34 @@
+// @declaration: true
+
+class A {
+	public constructor(a: boolean) // error
+	protected constructor(a: number) // error
+	private constructor(a: string)
+	private constructor() { 
+		
+	}
+}
+
+class B {
+	protected constructor(a: number) // error
+	constructor(a: string)
+	constructor() { 
+		
+	}
+}
+
+class C {
+	protected constructor(a: number)
+	protected constructor(a: string)
+	protected constructor() { 
+		
+	}
+}
+
+class D {
+	constructor(a: number)
+	constructor(a: string)
+	public constructor() { 
+		
+	}
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/members/accessibility/privateClassPropertyAccessibleWithinNestedClass.ts b/tests/cases/conformance/classes/members/accessibility/privateClassPropertyAccessibleWithinNestedClass.ts
new file mode 100644
index 00000000000..a958a5ae624
--- /dev/null
+++ b/tests/cases/conformance/classes/members/accessibility/privateClassPropertyAccessibleWithinNestedClass.ts
@@ -0,0 +1,38 @@
+// @target: ES5
+// no errors
+
+class C {
+    private x: string;
+    private get y() { return this.x; }
+    private set y(x) { this.y = this.x; }
+    private foo() { return this.foo; }
+
+    private static x: string;
+    private static get y() { return this.x; }
+    private static set y(x) { this.y = this.x; }
+    private static foo() { return this.foo; }
+    private static bar() { this.foo(); }
+
+    private bar() {
+        class C2 {
+            private foo() {
+                let x: C;
+                var x1 = x.foo;
+                var x2 = x.bar;
+                var x3 = x.x;
+                var x4 = x.y;
+
+                var sx1 = C.x;
+                var sx2 = C.y;
+                var sx3 = C.bar;
+                var sx4 = C.foo;
+
+                let y = new C();
+                var y1 = y.foo;
+                var y2 = y.bar;
+                var y3 = y.x;
+                var y4 = y.y;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/members/accessibility/privateProtectedMembersAreNotAccessibleDestructuring.ts b/tests/cases/conformance/classes/members/accessibility/privateProtectedMembersAreNotAccessibleDestructuring.ts
new file mode 100644
index 00000000000..4473756d98d
--- /dev/null
+++ b/tests/cases/conformance/classes/members/accessibility/privateProtectedMembersAreNotAccessibleDestructuring.ts
@@ -0,0 +1,20 @@
+class K {
+    private priv;
+    protected prot;
+    private privateMethod() { }
+    m() {
+        let { priv: a, prot: b } = this; // ok
+        let { priv, prot } = new K(); // ok
+    }
+}
+class C extends K {
+    m2() {
+        let { priv: a } = this; // error
+        let { prot: b } = this; // ok
+    }
+}
+let k = new K();
+let { priv } = k; // error 
+let { prot } = k; // error
+let { privateMethod } = k; // error
+let { priv: a, prot: b, privateMethod: f } = k; // error
diff --git a/tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedClass.ts b/tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedClass.ts
new file mode 100644
index 00000000000..3482d1a09e9
--- /dev/null
+++ b/tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedClass.ts
@@ -0,0 +1,38 @@
+// @target: ES5
+// no errors
+
+class C {
+    protected x: string;
+    protected get y() { return this.x; }
+    protected set y(x) { this.y = this.x; }
+    protected foo() { return this.foo; }
+
+    protected static x: string;
+    protected static get y() { return this.x; }
+    protected static set y(x) { this.y = this.x; }
+    protected static foo() { return this.foo; }
+    protected static bar() { this.foo(); }
+
+    protected bar() {
+        class C2 {
+            protected foo() {
+                let x: C;
+                var x1 = x.foo;
+                var x2 = x.bar;
+                var x3 = x.x;
+                var x4 = x.y;
+
+                var sx1 = C.x;
+                var sx2 = C.y;
+                var sx3 = C.bar;
+                var sx4 = C.foo;
+
+                let y = new C();
+                var y1 = y.foo;
+                var y2 = y.bar;
+                var y3 = y.x;
+                var y4 = y.y;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass.ts b/tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass.ts
new file mode 100644
index 00000000000..aae17b8362f
--- /dev/null
+++ b/tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass.ts
@@ -0,0 +1,39 @@
+// @target: ES5
+
+class B {
+    protected x: string;
+    protected static x: string;
+}
+
+class C extends B {
+    protected get y() { return this.x; }
+    protected set y(x) { this.y = this.x; }
+    protected foo() { return this.x; }
+
+    protected static get y() { return this.x; }
+    protected static set y(x) { this.y = this.x; }
+    protected static foo() { return this.x; }
+    protected static bar() { this.foo(); }
+    
+    protected bar() { 
+        class D {
+            protected foo() {
+                var c = new C();
+                var c1 = c.y;
+                var c2 = c.x;
+                var c3 = c.foo;
+                var c4 = c.bar;
+                var c5 = c.z; // error
+                
+                var sc1 = C.x;
+                var sc2 = C.y;
+                var sc3 = C.foo;
+                var sc4 = C.bar;
+            }
+        }
+    }
+}
+
+class E extends C {
+    protected z: string;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts b/tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts
new file mode 100644
index 00000000000..1128da70795
--- /dev/null
+++ b/tests/cases/conformance/classes/members/accessibility/protectedClassPropertyAccessibleWithinNestedSubclass1.ts
@@ -0,0 +1,114 @@
+class Base {
+    protected x: string;
+    method() {
+        class A {
+            methoda() {
+                var b: Base;
+                var d1: Derived1;
+                var d2: Derived2;
+                var d3: Derived3;
+                var d4: Derived4;
+
+                b.x;            // OK, accessed within their declaring class
+                d1.x;           // OK, accessed within their declaring class
+                d2.x;           // OK, accessed within their declaring class
+                d3.x;           // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
+                d4.x;           // OK, accessed within their declaring class
+            }
+        }
+    }
+}
+
+class Derived1 extends Base {
+    method1() {
+        class B {
+            method1b() {
+                var b: Base;
+                var d1: Derived1;
+                var d2: Derived2;
+                var d3: Derived3;
+                var d4: Derived4;
+
+                b.x;            // Error, isn't accessed through an instance of the enclosing class
+                d1.x;           // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class
+                d2.x;           // Error, isn't accessed through an instance of the enclosing class
+                d3.x;           // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
+                d4.x;           // Error, isn't accessed through an instance of the enclosing class
+            }
+        }
+    }
+}
+
+class Derived2 extends Base {
+    method2() {
+        class C {
+            method2c() {
+                var b: Base;
+                var d1: Derived1;
+                var d2: Derived2;
+                var d3: Derived3;
+                var d4: Derived4;
+
+                b.x;            // Error, isn't accessed through an instance of the enclosing class
+                d1.x;           // Error, isn't accessed through an instance of the enclosing class
+                d2.x;           // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class
+                d3.x;           // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
+                d4.x;           // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class or one of its subclasses
+            }
+        }
+    }
+}
+
+class Derived3 extends Derived1 {
+    protected x: string;
+    method3() {
+        class D {
+            method3d() {
+                var b: Base;
+                var d1: Derived1;
+                var d2: Derived2;
+                var d3: Derived3;
+                var d4: Derived4;
+
+                b.x;            // Error, isn't accessed through an instance of the enclosing class
+                d1.x;           // Error, isn't accessed through an instance of the enclosing class
+                d2.x;           // Error, isn't accessed through an instance of the enclosing class
+                d3.x;           // OK, accessed within their declaring class
+                d4.x;           // Error, isn't accessed through an instance of the enclosing class
+            }
+        }
+    }
+}
+
+class Derived4 extends Derived2 {
+    method4() {
+        class E {
+            method4e() {
+                var b: Base;
+                var d1: Derived1;
+                var d2: Derived2;
+                var d3: Derived3;
+                var d4: Derived4;
+
+                b.x;            // Error, isn't accessed through an instance of the enclosing class
+                d1.x;           // Error, isn't accessed through an instance of the enclosing class
+                d2.x;           // Error, isn't accessed through an instance of the enclosing class
+                d3.x;           // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
+                d4.x;           // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class
+            }
+        }
+    }
+}
+
+
+var b: Base;
+var d1: Derived1;
+var d2: Derived2;
+var d3: Derived3;
+var d4: Derived4;
+
+b.x;                    // Error, neither within their declaring class nor classes derived from their declaring class
+d1.x;                   // Error, neither within their declaring class nor classes derived from their declaring class
+d2.x;                   // Error, neither within their declaring class nor classes derived from their declaring class
+d3.x;                   // Error, neither within their declaring class nor classes derived from their declaring class
+d4.x;                   // Error, neither within their declaring class nor classes derived from their declaring class
\ No newline at end of file
diff --git a/tests/cases/conformance/declarationEmit/typePredicates/declarationEmitIdentifierPredicates01.ts b/tests/cases/conformance/declarationEmit/typePredicates/declarationEmitIdentifierPredicates01.ts
new file mode 100644
index 00000000000..c4a223f07ef
--- /dev/null
+++ b/tests/cases/conformance/declarationEmit/typePredicates/declarationEmitIdentifierPredicates01.ts
@@ -0,0 +1,6 @@
+// @declaration: true
+// @module: commonjs
+
+export function f(x: any): x is number {
+    return typeof x === "number";
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/declarationEmit/typePredicates/declarationEmitIdentifierPredicatesWithPrivateName01.ts b/tests/cases/conformance/declarationEmit/typePredicates/declarationEmitIdentifierPredicatesWithPrivateName01.ts
new file mode 100644
index 00000000000..1398b2bc040
--- /dev/null
+++ b/tests/cases/conformance/declarationEmit/typePredicates/declarationEmitIdentifierPredicatesWithPrivateName01.ts
@@ -0,0 +1,10 @@
+// @declaration: true
+// @module: commonjs
+
+interface I {
+    a: number;
+}
+
+export function f(x: any): x is I {
+    return typeof x.a === "number";
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicates01.ts b/tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicates01.ts
new file mode 100644
index 00000000000..69af9c5b077
--- /dev/null
+++ b/tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicates01.ts
@@ -0,0 +1,11 @@
+// @declaration: true
+// @module: commonjs
+
+export class C {
+    m(): this is D {
+        return this instanceof D;
+    }
+}
+
+export class D extends C {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicates02.ts b/tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicates02.ts
new file mode 100644
index 00000000000..02f2a798831
--- /dev/null
+++ b/tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicates02.ts
@@ -0,0 +1,15 @@
+// @declaration: true
+// @module: commonjs
+
+export interface Foo {
+    a: string;
+    b: number;
+    c: boolean;
+}
+
+export const obj = {
+    m(): this is Foo {
+        let dis = this as Foo;
+        return dis.a != null && dis.b != null && dis.c != null;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName01.ts b/tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName01.ts
new file mode 100644
index 00000000000..461c7d17571
--- /dev/null
+++ b/tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName01.ts
@@ -0,0 +1,11 @@
+// @declaration: true
+// @module: commonjs
+
+export class C {
+    m(): this is D {
+        return this instanceof D;
+    }
+}
+
+class D extends C {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName02.ts b/tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName02.ts
new file mode 100644
index 00000000000..c238bb16ec8
--- /dev/null
+++ b/tests/cases/conformance/declarationEmit/typePredicates/declarationEmitThisPredicatesWithPrivateName02.ts
@@ -0,0 +1,15 @@
+// @declaration: true
+// @module: commonjs
+
+interface Foo {
+    a: string;
+    b: number;
+    c: boolean;
+}
+
+export const obj = {
+    m(): this is Foo {
+        let dis = this as Foo;
+        return dis.a != null && dis.b != null && dis.c != null;
+    }
+}
\ 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/es6/classDeclaration/superCallBeforeThisAccessing1.ts b/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing1.ts
new file mode 100644
index 00000000000..e5d63f2e930
--- /dev/null
+++ b/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing1.ts
@@ -0,0 +1,15 @@
+declare var Factory: any
+
+class Base {
+    constructor(c) { }
+}
+class D extends Base {
+    private _t;
+    constructor() {
+        super(i);
+        var s = {
+            t: this._t
+        }
+        var i = Factory.create(s);
+    }
+}
diff --git a/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing2.ts b/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing2.ts
new file mode 100644
index 00000000000..1b0a0d541e9
--- /dev/null
+++ b/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing2.ts
@@ -0,0 +1,9 @@
+class Base {
+    constructor(c) { }
+}
+class D extends Base {
+    private _t;
+    constructor() {
+        super(() => { this._t }); // no error. only check when this is directly accessing in constructor
+    }
+}
diff --git a/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing3.ts b/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing3.ts
new file mode 100644
index 00000000000..1386998aaae
--- /dev/null
+++ b/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing3.ts
@@ -0,0 +1,12 @@
+class Base {
+    constructor(c) { }
+}
+class D extends Base {
+    private _t;
+    constructor() {
+        let x = () => { this._t };
+        x();  // no error; we only check super is called before this when the container is a constructor
+        this._t;  // error
+        super(undefined);
+    }
+}
diff --git a/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing4.ts b/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing4.ts
new file mode 100644
index 00000000000..9135e03b0ce
--- /dev/null
+++ b/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing4.ts
@@ -0,0 +1,15 @@
+class D extends null {
+    private _t;
+    constructor() {
+        this._t;
+        super();
+    }
+}
+
+class E extends null {
+    private _t;
+    constructor() {
+        super();
+        this._t;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing5.ts b/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing5.ts
new file mode 100644
index 00000000000..17820277585
--- /dev/null
+++ b/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing5.ts
@@ -0,0 +1,6 @@
+class D extends null {
+    private _t;
+    constructor() {
+        this._t;  // No error
+    }
+}
diff --git a/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing6.ts b/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing6.ts
new file mode 100644
index 00000000000..8f36f2eb056
--- /dev/null
+++ b/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing6.ts
@@ -0,0 +1,9 @@
+class Base {
+    constructor(c) { }
+}
+class D extends Base {
+    private _t;
+    constructor() {
+        super(this); 
+    }
+}
diff --git a/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing7.ts b/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing7.ts
new file mode 100644
index 00000000000..d40c96a60f3
--- /dev/null
+++ b/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing7.ts
@@ -0,0 +1,12 @@
+class Base {
+    constructor(c) { }
+}
+class D extends Base {
+    private _t;
+    constructor() {
+        let x = {
+            j: this._t,
+        }
+        super(undefined);
+    }
+}
diff --git a/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing8.ts b/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing8.ts
new file mode 100644
index 00000000000..5742cdab845
--- /dev/null
+++ b/tests/cases/conformance/es6/classDeclaration/superCallBeforeThisAccessing8.ts
@@ -0,0 +1,12 @@
+class Base {
+    constructor(c) { }
+}
+class D extends Base {
+    private _t;
+    constructor() {
+        let x = {
+            k: super(undefined), 
+            j: this._t,  // no error
+        }
+    }
+}
diff --git a/tests/cases/conformance/es6/modules/defaultExportInAwaitExpression01.ts b/tests/cases/conformance/es6/modules/defaultExportInAwaitExpression01.ts
new file mode 100644
index 00000000000..45f15423016
--- /dev/null
+++ b/tests/cases/conformance/es6/modules/defaultExportInAwaitExpression01.ts
@@ -0,0 +1,12 @@
+// @target: ES6
+// @module: umd
+// @filename: a.ts
+const x = new Promise( ( resolve, reject ) => { resolve( {} ); } );
+export default x;
+
+// @filename: b.ts
+import x from './a';
+
+( async function() {
+    const value = await x;
+}() );
diff --git a/tests/cases/conformance/es6/modules/defaultExportInAwaitExpression02.ts b/tests/cases/conformance/es6/modules/defaultExportInAwaitExpression02.ts
new file mode 100644
index 00000000000..cd878540a3c
--- /dev/null
+++ b/tests/cases/conformance/es6/modules/defaultExportInAwaitExpression02.ts
@@ -0,0 +1,12 @@
+// @target: ES6
+// @module: commonjs
+// @filename: a.ts
+const x = new Promise( ( resolve, reject ) => { resolve( {} ); } );
+export default x;
+
+// @filename: b.ts
+import x from './a';
+
+( async function() {
+    const value = await x;
+}() );
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/es6/variableDeclarations/VariableDeclaration12_es6.ts b/tests/cases/conformance/es6/variableDeclarations/VariableDeclaration12_es6.ts
new file mode 100644
index 00000000000..f9839cf8502
--- /dev/null
+++ b/tests/cases/conformance/es6/variableDeclarations/VariableDeclaration12_es6.ts
@@ -0,0 +1,4 @@
+// @target:es6
+
+let
+x
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/variableDeclarations/VariableDeclaration13_es6.ts b/tests/cases/conformance/es6/variableDeclarations/VariableDeclaration13_es6.ts
new file mode 100644
index 00000000000..0f20b02c01c
--- /dev/null
+++ b/tests/cases/conformance/es6/variableDeclarations/VariableDeclaration13_es6.ts
@@ -0,0 +1,6 @@
+// @target:es6
+
+// An ExpressionStatement cannot start with the two token sequence `let [` because
+// that would make it ambiguous with a `let` LexicalDeclaration whose first LexicalBinding was an ArrayBindingPattern.
+var let: any;
+let[0] = 100;
\ No newline at end of file
diff --git a/tests/cases/conformance/expressions/elementAccess/letIdentifierInElementAccess01.ts b/tests/cases/conformance/expressions/elementAccess/letIdentifierInElementAccess01.ts
new file mode 100644
index 00000000000..f0f71dc6ceb
--- /dev/null
+++ b/tests/cases/conformance/expressions/elementAccess/letIdentifierInElementAccess01.ts
@@ -0,0 +1,2 @@
+var let: any = {};
+(let[0] = 100);
\ No newline at end of file
diff --git a/tests/cases/conformance/expressions/thisKeyword/thisInObjectLiterals.ts b/tests/cases/conformance/expressions/thisKeyword/thisInObjectLiterals.ts
index da38484bc07..ddfbb790980 100644
--- a/tests/cases/conformance/expressions/thisKeyword/thisInObjectLiterals.ts
+++ b/tests/cases/conformance/expressions/thisKeyword/thisInObjectLiterals.ts
@@ -8,7 +8,7 @@ class MyClass {
     }
 }
 
-//type of 'this' in an object literal property of a function type is Any
+//type of 'this' in an object literal method is the type of the object literal
 var obj = {
     f() {
         return this.spaaace;
diff --git a/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormFunctionEquality.ts b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormFunctionEquality.ts
new file mode 100644
index 00000000000..baff942bb8e
--- /dev/null
+++ b/tests/cases/conformance/expressions/typeGuards/typeGuardOfFormFunctionEquality.ts
@@ -0,0 +1,14 @@
+declare function isString1(a: number, b: Object): b is string;
+
+declare function isString2(a: Object): a is string;
+
+switch (isString1(0, "")) {
+    case isString2(""):
+    default:
+}
+
+var x = isString1(0, "") === isString2("");
+
+function isString3(a: number, b: number, c: Object): c is string {
+    return isString1(0, c);
+}
diff --git a/tests/cases/conformance/expressions/typeGuards/typePredicateOnVariableDeclaration01.ts b/tests/cases/conformance/expressions/typeGuards/typePredicateOnVariableDeclaration01.ts
new file mode 100644
index 00000000000..a445e18ee40
--- /dev/null
+++ b/tests/cases/conformance/expressions/typeGuards/typePredicateOnVariableDeclaration01.ts
@@ -0,0 +1,3 @@
+// @declaration: true
+
+var x: this is string;
\ No newline at end of file
diff --git a/tests/cases/conformance/expressions/typeGuards/typePredicateOnVariableDeclaration02.ts b/tests/cases/conformance/expressions/typeGuards/typePredicateOnVariableDeclaration02.ts
new file mode 100644
index 00000000000..4b010287337
--- /dev/null
+++ b/tests/cases/conformance/expressions/typeGuards/typePredicateOnVariableDeclaration02.ts
@@ -0,0 +1,3 @@
+// @declaration: true
+
+var y: z is number;
\ No newline at end of file
diff --git a/tests/cases/conformance/externalModules/relativePathToDeclarationFile.ts b/tests/cases/conformance/externalModules/relativePathToDeclarationFile.ts
index 8d166122b46..71b8a1eb1a2 100644
--- a/tests/cases/conformance/externalModules/relativePathToDeclarationFile.ts
+++ b/tests/cases/conformance/externalModules/relativePathToDeclarationFile.ts
@@ -1,3 +1,4 @@
+// @ModuleResolution: classic
 // @Filename: test/foo.d.ts
 export declare module M2 {
 	export var x: boolean;
diff --git a/tests/cases/conformance/externalModules/umd-augmentation-1.ts b/tests/cases/conformance/externalModules/umd-augmentation-1.ts
new file mode 100644
index 00000000000..312f21846e6
--- /dev/null
+++ b/tests/cases/conformance/externalModules/umd-augmentation-1.ts
@@ -0,0 +1,39 @@
+// @module: commonjs
+// @noImplicitReferences: true
+
+// @filename: node_modules/math2d/index.d.ts
+export as namespace Math2d;
+
+export interface Point {
+	x: number;
+	y: number;
+}
+
+export class Vector implements Point {
+	x: number;
+	y: number;
+	constructor(x: number, y: number);
+
+	translate(dx: number, dy: number): Vector;
+}
+
+export function getLength(p: Vector): number;
+
+// @filename: math2d-augment.d.ts
+import * as Math2d from 'math2d';
+// Augment the module
+declare module 'math2d' {
+	// Add a method to the class
+	interface Vector {
+		reverse(): Math2d.Point;
+	}
+}
+
+// @filename: b.ts
+/// <reference path="math2d-augment.d.ts" />
+import * as m from 'math2d';
+let v = new m.Vector(3, 2);
+let magnitude = m.getLength(v);
+let p: m.Point = v.translate(5, 5);
+p = v.reverse();
+var t = p.x;
diff --git a/tests/cases/conformance/externalModules/umd-augmentation-2.ts b/tests/cases/conformance/externalModules/umd-augmentation-2.ts
new file mode 100644
index 00000000000..2f8330e7fa2
--- /dev/null
+++ b/tests/cases/conformance/externalModules/umd-augmentation-2.ts
@@ -0,0 +1,39 @@
+// @module: commonjs
+// @noImplicitReferences: true
+
+// @filename: node_modules/math2d/index.d.ts
+export as namespace Math2d;
+
+export interface Point {
+	x: number;
+	y: number;
+}
+
+export class Vector implements Point {
+	x: number;
+	y: number;
+	constructor(x: number, y: number);
+
+	translate(dx: number, dy: number): Vector;
+}
+
+export function getLength(p: Vector): number;
+
+// @filename: math2d-augment.d.ts
+import * as Math2d from 'math2d';
+// Augment the module
+declare module 'math2d' {
+	// Add a method to the class
+	interface Vector {
+		reverse(): Math2d.Point;
+	}
+}
+
+// @filename: a.ts
+/// <reference path="node_modules/math2d/index.d.ts" />
+/// <reference path="math2d-augment.d.ts" />
+let v = new Math2d.Vector(3, 2);
+let magnitude = Math2d.getLength(v);
+let p: Math2d.Point = v.translate(5, 5);
+p = v.reverse();
+var t = p.x;
diff --git a/tests/cases/conformance/externalModules/umd-augmentation-3.ts b/tests/cases/conformance/externalModules/umd-augmentation-3.ts
new file mode 100644
index 00000000000..1524d7128de
--- /dev/null
+++ b/tests/cases/conformance/externalModules/umd-augmentation-3.ts
@@ -0,0 +1,45 @@
+// @module: commonjs
+// @noImplicitReferences: true
+
+// @filename: node_modules/math2d/index.d.ts
+export as namespace Math2d;
+
+export = M2D;
+
+declare namespace M2D {
+	interface Point {
+		x: number;
+		y: number;
+	}
+
+	class Vector implements Point {
+		x: number;
+		y: number;
+		constructor(x: number, y: number);
+
+		translate(dx: number, dy: number): Vector;
+	}
+
+	function getLength(p: Vector): number;
+
+}
+
+
+// @filename: math2d-augment.d.ts
+import * as Math2d from 'math2d';
+// Augment the module
+declare module 'math2d' {
+	// Add a method to the class
+	interface Vector {
+		reverse(): Math2d.Point;
+	}
+}
+
+// @filename: b.ts
+/// <reference path="math2d-augment.d.ts" />
+import * as m from 'math2d';
+let v = new m.Vector(3, 2);
+let magnitude = m.getLength(v);
+let p: m.Point = v.translate(5, 5);
+p = v.reverse();
+var t = p.x;
diff --git a/tests/cases/conformance/externalModules/umd-augmentation-4.ts b/tests/cases/conformance/externalModules/umd-augmentation-4.ts
new file mode 100644
index 00000000000..729465504c1
--- /dev/null
+++ b/tests/cases/conformance/externalModules/umd-augmentation-4.ts
@@ -0,0 +1,45 @@
+// @module: commonjs
+// @noImplicitReferences: true
+
+// @filename: node_modules/math2d/index.d.ts
+export as namespace Math2d;
+
+export = M2D;
+
+declare namespace M2D {
+	interface Point {
+		x: number;
+		y: number;
+	}
+
+	class Vector implements Point {
+		x: number;
+		y: number;
+		constructor(x: number, y: number);
+
+		translate(dx: number, dy: number): Vector;
+	}
+
+	function getLength(p: Vector): number;
+
+}
+
+
+// @filename: math2d-augment.d.ts
+import * as Math2d from 'math2d';
+// Augment the module
+declare module 'math2d' {
+	// Add a method to the class
+	interface Vector {
+		reverse(): Math2d.Point;
+	}
+}
+
+// @filename: a.ts
+/// <reference path="node_modules/math2d/index.d.ts" />
+/// <reference path="math2d-augment.d.ts" />
+let v = new Math2d.Vector(3, 2);
+let magnitude = Math2d.getLength(v);
+let p: Math2d.Point = v.translate(5, 5);
+p = v.reverse();
+var t = p.x;
diff --git a/tests/cases/conformance/externalModules/umd-errors.ts b/tests/cases/conformance/externalModules/umd-errors.ts
new file mode 100644
index 00000000000..95e6cb7c7a4
--- /dev/null
+++ b/tests/cases/conformance/externalModules/umd-errors.ts
@@ -0,0 +1,31 @@
+// @module: commonjs
+
+// @filename: err1.d.ts
+// Illegal, can't be in script file
+export as namespace Foo;
+
+// @filename: err2.d.ts
+// Illegal, can't be in external ambient module
+declare module "Foo" {
+	export as namespace Bar;
+}
+
+// @filename: err3.d.ts
+// Illegal, can't have modifiers
+export var p;
+static export as namespace oo1;
+declare export as namespace oo2;
+public export as namespace oo3;
+const export as namespace oo4;
+
+// @filename: err4.d.ts
+// Illegal, must be at top-level
+export namespace B {
+	export as namespace C1;
+}
+
+// @filename: err5.ts
+// Illegal, may not appear in implementation files
+export var v;
+export as namespace C2;
+
diff --git a/tests/cases/conformance/externalModules/umd1.ts b/tests/cases/conformance/externalModules/umd1.ts
new file mode 100644
index 00000000000..5ceb7fa59ba
--- /dev/null
+++ b/tests/cases/conformance/externalModules/umd1.ts
@@ -0,0 +1,14 @@
+// @module: commonjs
+// @noImplicitReferences: true
+
+// @filename: foo.d.ts
+export var x: number;
+export function fn(): void;
+export interface Thing { n: typeof x }
+export as namespace Foo;
+
+// @filename: a.ts
+/// <reference path="foo.d.ts" />
+Foo.fn();
+let x: Foo.Thing;
+let y: number = x.n;
diff --git a/tests/cases/conformance/externalModules/umd2.ts b/tests/cases/conformance/externalModules/umd2.ts
new file mode 100644
index 00000000000..2fb98491ebf
--- /dev/null
+++ b/tests/cases/conformance/externalModules/umd2.ts
@@ -0,0 +1,12 @@
+// @module: commonjs
+// @noImplicitReferences: true
+
+// @filename: foo.d.ts
+export var x: number;
+export function fn(): void;
+export as namespace Foo;
+
+// @filename: a.ts
+Foo.fn();
+let x: Foo.Thing;
+let y: number = x.n;
diff --git a/tests/cases/conformance/externalModules/umd3.ts b/tests/cases/conformance/externalModules/umd3.ts
new file mode 100644
index 00000000000..dad0dfc644d
--- /dev/null
+++ b/tests/cases/conformance/externalModules/umd3.ts
@@ -0,0 +1,14 @@
+// @module: commonjs
+// @noImplicitReferences: true
+
+// @filename: foo.d.ts
+export var x: number;
+export function fn(): void;
+export interface Thing { n: typeof x }
+export as namespace Foo;
+
+// @filename: a.ts
+import * as Foo from './foo';
+Foo.fn();
+let x: Foo.Thing;
+let y: number = x.n;
diff --git a/tests/cases/conformance/externalModules/umd4.ts b/tests/cases/conformance/externalModules/umd4.ts
new file mode 100644
index 00000000000..e927d21f1cc
--- /dev/null
+++ b/tests/cases/conformance/externalModules/umd4.ts
@@ -0,0 +1,14 @@
+// @module: commonjs
+// @noImplicitReferences: true
+
+// @filename: foo.d.ts
+export var x: number;
+export function fn(): void;
+export interface Thing { n: typeof x }
+export as namespace Foo;
+
+// @filename: a.ts
+import * as Bar from './foo';
+Bar.fn();
+let x: Bar.Thing;
+let y: number = x.n;
diff --git a/tests/cases/conformance/externalModules/umd5.ts b/tests/cases/conformance/externalModules/umd5.ts
new file mode 100644
index 00000000000..b6d949c2d0a
--- /dev/null
+++ b/tests/cases/conformance/externalModules/umd5.ts
@@ -0,0 +1,16 @@
+// @module: commonjs
+// @noImplicitReferences: true
+
+// @filename: foo.d.ts
+export var x: number;
+export function fn(): void;
+export interface Thing { n: typeof x }
+export as namespace Foo;
+
+// @filename: a.ts
+import * as Bar from './foo';
+Bar.fn();
+let x: Bar.Thing;
+let y: number = x.n;
+// should error
+let z = Foo;
diff --git a/tests/cases/conformance/externalModules/umd6.ts b/tests/cases/conformance/externalModules/umd6.ts
new file mode 100644
index 00000000000..2f9e49072cf
--- /dev/null
+++ b/tests/cases/conformance/externalModules/umd6.ts
@@ -0,0 +1,13 @@
+// @module: commonjs
+// @noImplicitReferences: true
+
+// @filename: foo.d.ts
+declare namespace Thing {
+	export function fn(): number;
+}
+export = Thing;
+export as namespace Foo;
+
+// @filename: a.ts
+/// <reference path="foo.d.ts" />
+let y: number = Foo.fn();
diff --git a/tests/cases/conformance/externalModules/umd7.ts b/tests/cases/conformance/externalModules/umd7.ts
new file mode 100644
index 00000000000..9b9a9959efc
--- /dev/null
+++ b/tests/cases/conformance/externalModules/umd7.ts
@@ -0,0 +1,11 @@
+// @module: commonjs
+// @noImplicitReferences: true
+
+// @filename: foo.d.ts
+declare function Thing(): number;
+export = Thing;
+export as namespace Foo;
+
+// @filename: a.ts
+/// <reference path="foo.d.ts" />
+let y: number = Foo();
diff --git a/tests/cases/conformance/externalModules/umd8.ts b/tests/cases/conformance/externalModules/umd8.ts
new file mode 100644
index 00000000000..caab734f5e0
--- /dev/null
+++ b/tests/cases/conformance/externalModules/umd8.ts
@@ -0,0 +1,15 @@
+// @module: commonjs
+// @noImplicitReferences: true
+
+// @filename: foo.d.ts
+declare class Thing {
+	foo(): number;
+}
+export = Thing;
+export as namespace Foo;
+
+// @filename: a.ts
+/// <reference path="foo.d.ts" />
+let y: Foo;
+y.foo();
+
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution12.tsx b/tests/cases/conformance/jsx/tsxAttributeResolution12.tsx
new file mode 100644
index 00000000000..a9be0aad7b9
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution12.tsx
@@ -0,0 +1,46 @@
+//@jsx: preserve
+
+//@filename: react.d.ts
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements {
+	}
+	interface ElementAttributesProperty {
+		props;
+	}
+	interface IntrinsicAttributes {
+		ref?: string;
+	}
+}
+
+//@filename: file.tsx
+
+declare class Component<P, S>  {
+	constructor(props?: P, context?: any);
+	setState(f: (prevState: S, props: P) => S, callback?: () => any): void;
+	setState(state: S, callback?: () => any): void;
+	forceUpdate(callBack?: () => any): void;
+	render(): JSX.Element;
+	props: P;
+	state: S;
+	context: {};
+}
+
+
+interface ComponentClass<P> {
+	new (props?: P, context?: any): Component<P, any>;
+}
+
+declare module TestMod {
+	interface TestClass extends ComponentClass<{reqd: any}> {
+	}
+	var Test: TestClass;
+}
+
+// Errors correctly
+const T = TestMod.Test;
+var t1 = <T />;
+
+// Should error
+var t2 = <TestMod.Test />;
+
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution13.tsx b/tests/cases/conformance/jsx/tsxAttributeResolution13.tsx
new file mode 100644
index 00000000000..1b5937a7db2
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution13.tsx
@@ -0,0 +1,5 @@
+//@jsx: preserve
+
+//@filename: test.tsx
+function Test() { }
+<Test></Test>
diff --git a/tests/cases/conformance/references/library-reference-1.ts b/tests/cases/conformance/references/library-reference-1.ts
new file mode 100644
index 00000000000..ca25441521f
--- /dev/null
+++ b/tests/cases/conformance/references/library-reference-1.ts
@@ -0,0 +1,13 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+// @typesRoot: /
+
+// We can find typings in the ./types folder
+
+// @filename: /types/jquery/index.d.ts
+declare var $: { foo(): void };
+
+
+// @filename: /consumer.ts
+/// <reference types="jquery" />
+$.foo();
diff --git a/tests/cases/conformance/references/library-reference-10.ts b/tests/cases/conformance/references/library-reference-10.ts
new file mode 100644
index 00000000000..11e065b0a7d
--- /dev/null
+++ b/tests/cases/conformance/references/library-reference-10.ts
@@ -0,0 +1,18 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+// @typesRoot: /
+
+// package.json in a primary reference can refer to another file
+
+// @filename: /types/jquery/package.json
+{
+    "typings": "jquery.d.ts"
+}
+
+// @filename: /types/jquery/jquery.d.ts
+declare var $: { foo(): void };
+
+
+// @filename: /consumer.ts
+/// <reference types="jquery" />
+$.foo();
diff --git a/tests/cases/conformance/references/library-reference-11.ts b/tests/cases/conformance/references/library-reference-11.ts
new file mode 100644
index 00000000000..39c8af56543
--- /dev/null
+++ b/tests/cases/conformance/references/library-reference-11.ts
@@ -0,0 +1,17 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+
+// package.json in a secondary reference can refer to another file
+
+// @filename: /a/node_modules/jquery/package.json
+{
+    "typings": "jquery.d.ts"
+}
+
+// @filename: /a/node_modules/jquery/jquery.d.ts
+declare var $: { foo(): void };
+
+
+// @filename: /a/b/consumer.ts
+/// <reference types="jquery" />
+$.foo();
diff --git a/tests/cases/conformance/references/library-reference-12.ts b/tests/cases/conformance/references/library-reference-12.ts
new file mode 100644
index 00000000000..c61d6d916ff
--- /dev/null
+++ b/tests/cases/conformance/references/library-reference-12.ts
@@ -0,0 +1,17 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+
+// package.json in a secondary reference can refer to another file
+
+// @filename: /a/node_modules/jquery/package.json
+{
+    "types": "dist/jquery.d.ts"
+}
+
+// @filename: /a/node_modules/jquery/dist/jquery.d.ts
+declare var $: { foo(): void };
+
+
+// @filename: /a/b/consumer.ts
+/// <reference types="jquery" />
+$.foo();
diff --git a/tests/cases/conformance/references/library-reference-13.ts b/tests/cases/conformance/references/library-reference-13.ts
new file mode 100644
index 00000000000..a96437f9b2c
--- /dev/null
+++ b/tests/cases/conformance/references/library-reference-13.ts
@@ -0,0 +1,18 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+
+// load type declarations from types section of tsconfig
+
+// @filename: /a/tsconfig.json
+{
+    "compilerOptions": {
+        "types": [ "jquery" ]
+    }
+}
+
+// @filename: /a/types/jquery/index.d.ts
+declare var $: { foo(): void };
+
+
+// @filename: /a/b/consumer.ts
+$.foo();
diff --git a/tests/cases/conformance/references/library-reference-14.ts b/tests/cases/conformance/references/library-reference-14.ts
new file mode 100644
index 00000000000..53bca2ab40d
--- /dev/null
+++ b/tests/cases/conformance/references/library-reference-14.ts
@@ -0,0 +1,11 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+// @types: jquery
+// @typesRoot: /a
+
+// @filename: /a/types/jquery/index.d.ts
+declare var $: { foo(): void };
+
+
+// @filename: /a/b/consumer.ts
+$.foo();
diff --git a/tests/cases/conformance/references/library-reference-15.ts b/tests/cases/conformance/references/library-reference-15.ts
new file mode 100644
index 00000000000..92c96e74c97
--- /dev/null
+++ b/tests/cases/conformance/references/library-reference-15.ts
@@ -0,0 +1,10 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+// @types: jquery
+
+// @filename: /a/types/jquery/index.d.ts
+declare var $: { foo(): void };
+
+
+// @filename: /a/b/consumer.ts
+$.foo();
diff --git a/tests/cases/conformance/references/library-reference-2.ts b/tests/cases/conformance/references/library-reference-2.ts
new file mode 100644
index 00000000000..d8975664428
--- /dev/null
+++ b/tests/cases/conformance/references/library-reference-2.ts
@@ -0,0 +1,18 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+// @typesRoot: /
+
+// package.json in a primary reference can refer to another file
+
+// @filename: /types/jquery/package.json
+{
+    "types": "jquery.d.ts"
+}
+
+// @filename: /types/jquery/jquery.d.ts
+declare var $: { foo(): void };
+
+
+// @filename: /consumer.ts
+/// <reference types="jquery" />
+$.foo();
diff --git a/tests/cases/conformance/references/library-reference-3.ts b/tests/cases/conformance/references/library-reference-3.ts
new file mode 100644
index 00000000000..1af6df89d19
--- /dev/null
+++ b/tests/cases/conformance/references/library-reference-3.ts
@@ -0,0 +1,12 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+// @typesRoot: /src
+
+// Secondary references are possible
+
+// @filename: /src/node_modules/jquery/index.d.ts
+declare var $: { foo(): void };
+
+// @filename: /src/consumer.ts
+/// <reference types="jquery" />
+$.foo();
diff --git a/tests/cases/conformance/references/library-reference-4.ts b/tests/cases/conformance/references/library-reference-4.ts
new file mode 100644
index 00000000000..92f1b4008be
--- /dev/null
+++ b/tests/cases/conformance/references/library-reference-4.ts
@@ -0,0 +1,23 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+// @typesRoot: /src
+
+// Secondary references may be duplicated if they agree in content
+
+// @filename: /node_modules/foo/index.d.ts
+/// <reference types="alpha" />
+declare var foo: any;
+
+// @filename: /node_modules/foo/node_modules/alpha/index.d.ts
+declare var alpha: any;
+
+// @filename: /node_modules/bar/index.d.ts
+/// <reference types="alpha" />
+declare var bar: any;
+
+// @filename: /node_modules/bar/node_modules/alpha/index.d.ts
+declare var alpha: any;
+
+// @filename: /src/root.ts
+/// <reference types="foo" />
+/// <reference types="bar" />
diff --git a/tests/cases/conformance/references/library-reference-5.ts b/tests/cases/conformance/references/library-reference-5.ts
new file mode 100644
index 00000000000..4660da00a2a
--- /dev/null
+++ b/tests/cases/conformance/references/library-reference-5.ts
@@ -0,0 +1,22 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+
+// Secondary references may not be duplicated if they disagree in content
+
+// @filename: /node_modules/foo/index.d.ts
+/// <reference types="alpha" />
+declare var foo: any;
+
+// @filename: /node_modules/foo/node_modules/alpha/index.d.ts
+declare var alpha: any;
+
+// @filename: /node_modules/bar/index.d.ts
+/// <reference types="alpha" />
+declare var bar: any;
+
+// @filename: /node_modules/bar/node_modules/alpha/index.d.ts
+declare var alpha: {};
+
+// @filename: /src/root.ts
+/// <reference types="foo" />
+/// <reference types="bar" />
diff --git a/tests/cases/conformance/references/library-reference-6.ts b/tests/cases/conformance/references/library-reference-6.ts
new file mode 100644
index 00000000000..a746262dd73
--- /dev/null
+++ b/tests/cases/conformance/references/library-reference-6.ts
@@ -0,0 +1,15 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+
+// The primary lookup folder is relative to tsconfig.json, if present
+
+// @filename: /types/alpha/index.d.ts
+declare var alpha: { a: string };
+
+// @filename: /src/foo.ts
+/// <reference types="alpha" />
+var x: string = alpha.a;
+
+// @filename: /tsconfig.json
+{
+}
diff --git a/tests/cases/conformance/references/library-reference-7.ts b/tests/cases/conformance/references/library-reference-7.ts
new file mode 100644
index 00000000000..e938aef7d3a
--- /dev/null
+++ b/tests/cases/conformance/references/library-reference-7.ts
@@ -0,0 +1,11 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+
+// Secondary references are possible
+
+// @filename: /src/node_modules/jquery/index.d.ts
+declare var $: { foo(): void };
+
+// @filename: /src/consumer.ts
+/// <reference types="jquery" />
+$.foo();
diff --git a/tests/cases/conformance/references/library-reference-8.ts b/tests/cases/conformance/references/library-reference-8.ts
new file mode 100644
index 00000000000..9de93776989
--- /dev/null
+++ b/tests/cases/conformance/references/library-reference-8.ts
@@ -0,0 +1,19 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+// @typesRoot: /
+
+// Don't crash in circular library reference situations
+
+// @filename: /types/alpha/index.d.ts
+/// <reference types="beta" />
+declare var alpha: { a: string };
+
+// @filename: /types/beta/index.d.ts
+/// <reference types="alpha" />
+declare var beta: { b: string };
+
+// @filename: /foo.ts
+/// <reference types="alpha" />
+/// <reference types="beta" />
+var x: string = alpha.a + beta.b;
+
diff --git a/tests/cases/conformance/references/library-reference-9.ts b/tests/cases/conformance/references/library-reference-9.ts
new file mode 100644
index 00000000000..a187d3c23b9
--- /dev/null
+++ b/tests/cases/conformance/references/library-reference-9.ts
@@ -0,0 +1,20 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+
+// Use types search path
+
+// @filename: /share/typelib/alpha/index.d.ts
+declare var alpha: { a: string };
+
+// @filename: /base/src/foo.ts
+/// <reference types="alpha" />
+var x: string = alpha.a;
+
+// @filename: /tsconfig.json
+{
+    "compilerOptions": {
+        "typesSearchPaths": [
+            "./share/typelib"
+        ]
+    }
+}
diff --git a/tests/cases/conformance/salsa/malformedTags.ts b/tests/cases/conformance/salsa/malformedTags.ts
new file mode 100644
index 00000000000..1128ce73f15
--- /dev/null
+++ b/tests/cases/conformance/salsa/malformedTags.ts
@@ -0,0 +1,10 @@
+// @allowJS: true
+// @suppressOutputPathCheck: true
+
+// @filename: myFile02.js
+/**
+ * Checks if `value` is classified as an `Array` object.
+ *
+ * @type Function
+ */
+var isArray = Array.isArray;
diff --git a/tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes01.tsx b/tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes01.tsx
index ce6f4b7ac2f..2235961086f 100644
--- a/tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes01.tsx
+++ b/tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes01.tsx
@@ -2,9 +2,12 @@
 // @declaration: true
 
 namespace JSX {
-    interface IntrinsicElements {
+    export interface IntrinsicElements {
         span: {};
     }
+    export interface Element {
+		something?: any;
+    }
 }
 
 const FooComponent = (props: { foo: "A" | "B" | "C" }) => <span>{props.foo}</span>;
diff --git a/tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializer.ts b/tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializer.ts
new file mode 100644
index 00000000000..c02aa5b63e8
--- /dev/null
+++ b/tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializer.ts
@@ -0,0 +1,29 @@
+// @noImplicitAny: true
+interface Show {
+    show: (x: number) => string;
+}
+function f({ show = v => v.toString() }: Show) {}
+function f2({ "show": showRename = v => v.toString() }: Show) {}
+function f3({ ["show"]: showRename = v => v.toString() }: Show) {}
+
+interface Nested {
+    nested: Show
+}
+function ff({ nested = { show: v => v.toString() } }: Nested) {}
+
+interface Tuples {
+    prop: [string, number];
+}
+function g({ prop = ["hello", 1234] }: Tuples) {}
+
+interface StringUnion {
+    prop: "foo" | "bar";
+}
+function h({ prop = "foo" }: StringUnion) {}
+
+interface StringIdentity {
+    stringIdentity(s: string): string;
+}
+let { stringIdentity: id = arg => arg }: StringIdentity = { stringIdentity: x => x};
+
+
diff --git a/tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts b/tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts
new file mode 100644
index 00000000000..fb71da7b655
--- /dev/null
+++ b/tests/cases/conformance/types/contextualTypes/methodDeclarations/contextuallyTypedBindingInitializerNegative.ts
@@ -0,0 +1,27 @@
+// @noImplicitAny: true
+interface Show {
+    show: (x: number) => string;
+}
+function f({ show: showRename = v => v }: Show) {}
+function f2({ "show": showRename = v => v }: Show) {}
+function f3({ ["show"]: showRename = v => v }: Show) {}
+
+interface Nested {
+    nested: Show
+}
+function ff({ nested: nestedRename = { show: v => v } }: Nested) {}
+
+interface StringIdentity {
+    stringIdentity(s: string): string;
+}
+let { stringIdentity: id = arg => arg.length }: StringIdentity = { stringIdentity: x => x};
+
+interface Tuples {
+    prop: [string, number];
+}
+function g({ prop = [101, 1234] }: Tuples) {}
+
+interface StringUnion {
+    prop: "foo" | "bar";
+}
+function h({ prop = "baz" }: StringUnion) {}
diff --git a/tests/cases/conformance/types/intersection/operatorsAndIntersectionTypes.ts b/tests/cases/conformance/types/intersection/operatorsAndIntersectionTypes.ts
new file mode 100644
index 00000000000..5689d221840
--- /dev/null
+++ b/tests/cases/conformance/types/intersection/operatorsAndIntersectionTypes.ts
@@ -0,0 +1,30 @@
+type Guid = string & { $Guid };          // Tagged string type
+type SerialNo = number & { $SerialNo };  // Tagged number type
+
+function createGuid() {
+    return "21EC2020-3AEA-4069-A2DD-08002B30309D" as Guid;
+}
+
+function createSerialNo() {
+    return 12345 as SerialNo;
+}
+
+let map1: { [x: string]: number } = {};
+let guid = createGuid();
+map1[guid] = 123;  // Can with tagged string
+
+let map2: { [x: number]: string } = {};
+let serialNo = createSerialNo();
+map2[serialNo] = "hello";  // Can index with tagged number
+
+const s1 = "{" + guid + "}";
+const s2 = guid.toLowerCase();
+const s3 = guid + guid;
+const s4 = guid + serialNo;
+const s5 = serialNo.toPrecision(0);
+const n1 = serialNo * 3;
+const n2 = serialNo + serialNo;
+const b1 = guid === "";
+const b2 = guid === guid;
+const b3 = serialNo === 0;
+const b4 = serialNo === serialNo;
diff --git a/tests/cases/conformance/types/members/typesWithPrivateConstructor.ts b/tests/cases/conformance/types/members/typesWithPrivateConstructor.ts
index 4fb24ca58e4..321864e1751 100644
--- a/tests/cases/conformance/types/members/typesWithPrivateConstructor.ts
+++ b/tests/cases/conformance/types/members/typesWithPrivateConstructor.ts
@@ -1,10 +1,10 @@
-// private constructors are not allowed
+// @declaration: true
 
 class C {
     private constructor() { }
 }
 
-var c = new C();
+var c = new C(); // error C is private
 var r: () => void = c.constructor;
 
 class C2 {
@@ -12,5 +12,5 @@ class C2 {
     private constructor(x: any) { }
 }
 
-var c2 = new C2();
+var c2 = new C2(); // error C2 is private
 var r2: (x: number) => void = c2.constructor;
\ No newline at end of file
diff --git a/tests/cases/conformance/types/members/typesWithProtectedConstructor.ts b/tests/cases/conformance/types/members/typesWithProtectedConstructor.ts
new file mode 100644
index 00000000000..e7f6adc38a8
--- /dev/null
+++ b/tests/cases/conformance/types/members/typesWithProtectedConstructor.ts
@@ -0,0 +1,16 @@
+// @declaration: true
+
+class C {
+    protected constructor() { }
+}
+
+var c = new C(); // error C is protected
+var r: () => void = c.constructor;
+
+class C2 {
+    protected constructor(x: number);
+    protected constructor(x: any) { }
+}
+
+var c2 = new C2(); // error C2 is protected
+var r2: (x: number) => void = c2.constructor;
\ No newline at end of file
diff --git a/tests/cases/conformance/types/thisType/looseThisTypeInFunctions.ts b/tests/cases/conformance/types/thisType/looseThisTypeInFunctions.ts
new file mode 100644
index 00000000000..b151961e324
--- /dev/null
+++ b/tests/cases/conformance/types/thisType/looseThisTypeInFunctions.ts
@@ -0,0 +1,47 @@
+interface I {
+    n: number;
+    explicitThis(this: this, m: number): number;
+}
+interface Unused {
+    implicitNoThis(m: number): number;
+}
+class C implements I {
+    n: number;
+    explicitThis(this: this, m: number): number {
+        return this.n + m;
+    }
+    implicitThis(m: number): number {
+        return this.n + m;
+    }
+    explicitVoid(this: void, m: number): number {
+        return m + 1;
+    }
+}
+let c = new C();
+c.explicitVoid = c.explicitThis; // error, 'void' is missing everything
+let o = { 
+    n: 101,
+    explicitThis: function (m: number) { 
+        return m + this.n.length; // ok, this.n: any
+    },
+    implicitThis(m: number): number { return m; } 
+};
+let i: I = o;
+let o2: I = {
+    n: 1001,
+    explicitThis: function (m) {
+         return m + this.n.length;  // error, this.n: number, no member 'length'
+    },
+}
+let x = i.explicitThis;
+let n = x(12); // callee:void doesn't match this:I
+let u: Unused;
+let y = u.implicitNoThis;
+n = y(12); // ok, callee:void matches this:any
+c.explicitVoid = c.implicitThis // ok, implicitThis(this:any)
+o.implicitThis = c.implicitThis; // ok, implicitThis(this:any)
+o.implicitThis = c.explicitThis; // ok, implicitThis(this:any) is assignable to explicitThis(this: this)
+o.implicitThis = i.explicitThis;
+i.explicitThis = function(m) {
+     return this.n.length;  // error, this.n: number
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/types/thisType/thisTypeInFunctions.ts b/tests/cases/conformance/types/thisType/thisTypeInFunctions.ts
new file mode 100644
index 00000000000..481e1630092
--- /dev/null
+++ b/tests/cases/conformance/types/thisType/thisTypeInFunctions.ts
@@ -0,0 +1,193 @@
+// body checking
+class B {
+    n: number;
+}
+class C {
+    n: number;
+    explicitThis(this: this, m: number): number {
+        return this.n + m;
+    }
+    explicitC(this: C, m: number): number {
+        return this.n + m;
+    }
+    explicitProperty(this: {n: number}, m: number): number {
+        return this.n + m;
+    }
+    explicitVoid(this: void, m: number): number {
+        return m + 1;
+    }
+}
+class D extends C { }
+interface I {
+    a: number;
+    explicitVoid1(this: void): number;
+    explicitVoid2(this: void): number;
+    explicitStructural(this: {a: number}): number;
+    explicitInterface(this: I): number;
+    explicitThis(this: this): number;
+}
+function explicitStructural(this: { y: number }, x: number): number {
+    return x + this.y;
+}
+function justThis(this: { y: number }): number {
+    return this.y;
+}
+function implicitThis(n: number): number {
+    return this.m + n + 12;
+}
+let impl: I = {
+    a: 12,
+    explicitVoid2: () => this.a, // ok, this: any because it refers to some outer object (window?)
+    explicitVoid1() { return 12; },
+    explicitStructural() {
+        return this.a;
+    },
+    explicitInterface() {
+        return this.a;
+    },
+    explicitThis() {
+        return this.a;
+    },
+}
+impl.explicitVoid1 = function () { return 12; };
+impl.explicitVoid2 = () => 12;
+impl.explicitStructural = function() { return this.a; };
+impl.explicitInterface = function() { return this.a; };
+impl.explicitStructural = () => 12;
+impl.explicitInterface = () => 12;
+impl.explicitThis = function () { return this.a; };
+// parameter checking
+let ok: {y: number, f: (this: { y: number }, x: number) => number} = { y: 12, f: explicitStructural };
+let implicitAnyOk: {notSpecified: number, f: (x: number) => number} = { notSpecified: 12, f: implicitThis };
+ok.f(13);
+implicitThis(12);
+implicitAnyOk.f(12);
+
+let c = new C();
+let d = new D();
+let ripped = c.explicitC;
+c.explicitC(12);
+c.explicitProperty(12);
+c.explicitThis(12);
+d.explicitC(12);
+d.explicitProperty(12);
+d.explicitThis(12);
+let reconstructed: { 
+    n: number,
+    explicitThis(this: C, m: number): number, // note: this: this is not allowed in an object literal type.
+    explicitC(this: C, m: number): number,
+    explicitProperty: (this: {n : number}, m: number) => number,
+    explicitVoid(this: void, m: number): number,
+} = { 
+    n: 12,
+    explicitThis: c.explicitThis,
+    explicitC: c.explicitC,
+    explicitProperty: c.explicitProperty,
+    explicitVoid: c.explicitVoid
+};
+reconstructed.explicitThis(10);
+reconstructed.explicitProperty(11);
+let explicitVoid = reconstructed.explicitVoid;
+explicitVoid(12);
+// assignment checking
+let unboundToSpecified: (this: { y: number }, x: number) => number = x => x + this.y; // ok, this:any
+let specifiedToSpecified: (this: {y: number}, x: number) => number = explicitStructural;
+let anyToSpecified: (this: { y: number }, x: number) => number = function(x: number): number { return x + 12; };
+
+let unspecifiedLambda: (x: number) => number = x => x + 12;
+let specifiedLambda: (this: void, x: number) => number = x => x + 12;
+let unspecifiedLambdaToSpecified: (this: {y: number}, x: number) => number = unspecifiedLambda;
+let specifiedLambdaToSpecified: (this: {y: number}, x: number) => number = specifiedLambda;
+
+
+let explicitCFunction: (this: C, m: number) => number;
+let explicitPropertyFunction: (this: {n: number}, m: number) => number;
+c.explicitC = explicitCFunction;
+c.explicitC = function(this: C, m: number) { return this.n + m };
+c.explicitProperty = explicitPropertyFunction;
+c.explicitProperty = function(this: {n: number}, m: number) { return this.n + m };
+c.explicitProperty = reconstructed.explicitProperty;
+
+// lambdas are assignable to anything
+c.explicitC = m => m;
+c.explicitThis = m => m;
+c.explicitProperty = m => m;
+
+// this inside lambdas refer to outer scope
+// the outer-scoped lambda at top-level is still just `any`
+c.explicitC = m => m + this.n;
+c.explicitThis = m => m + this.n;
+c.explicitProperty = m => m + this.n;
+
+//NOTE: this=C here, I guess?
+c.explicitThis = explicitCFunction;
+c.explicitThis = function(this: C, m: number) { return this.n + m };
+
+// this:any compatibility
+c.explicitC = function(m) { return this.n + m };
+c.explicitProperty = function(m) { return this.n + m };
+c.explicitThis = function(m) { return this.n + m };
+
+// this: contextual typing
+c.explicitThis = function(this, m) { return this.n + m };
+
+// this: superclass compatibility
+c.explicitC = function(this: B, m: number) { return this.n + m };
+
+// this:void compatibility
+c.explicitVoid = n => n;
+
+// class-based assignability
+class Base1 {
+    x: number;
+    public polymorphic(this: this): number { return this.x; }
+    explicit(this: Base1): number { return this.x; }
+    static explicitStatic(this: typeof Base1): number { return this.y; }
+    static y: number;
+}
+class Derived1 extends Base1 {
+    y: number
+}
+class Base2 {
+    y: number
+    polymorphic(this: this): number { return this.y; }
+    explicit(this: Base1): number { return this.x; }
+}
+class Derived2 extends Base2 {
+    x: number
+}
+let b1 = new Base1();
+let b2 = new Base2();
+let d1 = new Derived1();
+let d2 = new Derived2();
+d2.polymorphic = d1.polymorphic // ok, 'x' and 'y' in { x, y }
+d1.polymorphic = d2.polymorphic // ok, 'x' and 'y' in { x, y }
+
+// bivariance-allowed cases
+d1.polymorphic = b2.polymorphic // ok, 'y' in D: { x, y }
+d2.polymorphic = d1.explicit // ok, 'y' in { x, y }
+b1.polymorphic = d2.polymorphic // ok, 'x' and 'y' not in Base1: { x }
+b1.explicit = d2.polymorphic // ok, 'x' and 'y' not in Base1: { x }
+
+////// use this-type for construction with new ////
+function InterfaceThis(this: I) {
+    this.a = 12;
+}
+function LiteralTypeThis(this: {x: string}) {
+    this.x = "ok";
+}
+function AnyThis(this: any) {
+    this.x = "ok";
+}
+let interfaceThis = new InterfaceThis();
+let literalTypeThis = new LiteralTypeThis();
+let anyThis = new AnyThis();
+
+//// type parameter inference ////
+declare var f: { 
+    (this: void, x: number): number, 
+    call<U>(this: (...argArray: any[]) => U, ...argArray: any[]): U;
+};
+let n: number = f.call(12);
+
+function missingTypeIsImplicitAny(this, a: number) { return this.anything + a; } 
diff --git a/tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts b/tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts
new file mode 100644
index 00000000000..597fe5a836e
--- /dev/null
+++ b/tests/cases/conformance/types/thisType/thisTypeInFunctionsNegative.ts
@@ -0,0 +1,177 @@
+class C {
+    n: number;
+    explicitThis(this: this, m: number): number {
+        return this.n + m;
+    }
+    implicitThis(m: number): number {
+        return this.n + m;
+    }
+    explicitC(this: C, m: number): number {
+        return this.n + m;
+    }
+    explicitProperty(this: {n: number}, m: number): number {
+        return this.n + m;
+    }
+    explicitVoid(this: void, m: number): number {
+		return this.n + m; // 'n' doesn't exist on type 'void'.
+    }
+}
+class D {
+	x: number;
+	explicitThis(this: this, m: number): number {
+		return this.x + m;
+	}
+	explicitD(this: D, m: number): number {
+		return this.x + m;
+	}
+}
+interface I {
+    a: number;
+    explicitVoid1(this: void): number;
+    explicitVoid2(this: void): number;
+    explicitStructural(this: {a: number}): number;
+    explicitInterface(this: I): number;
+    explicitThis(this: this): number; // TODO: Allow `this` types for interfaces
+}
+let impl: I = {
+    a: 12,
+    explicitVoid1() {
+        return this.a; // error, no 'a' in 'void'
+    },
+    explicitVoid2: () => this.a, // ok, `this:any` because it refers to an outer object
+    explicitStructural: () => 12,
+    explicitInterface: () => 12,
+    explicitThis() {
+        return this.a;
+    },
+}
+let implExplicitStructural = impl.explicitStructural;
+implExplicitStructural(); // error, no 'a' in 'void'
+let implExplicitInterface = impl.explicitInterface;
+implExplicitInterface(); // error, no 'a' in 'void' 
+function explicitStructural(this: { y: number }, x: number): number {
+    return x + this.y;
+}
+function propertyName(this: { y: number }, x: number): number {
+    return x + this.notFound;
+}
+function voidThisSpecified(this: void, x: number): number {
+    return x + this.notSpecified;
+}
+let ok: {y: number, f: (this: { y: number }, x: number) => number} = { y: 12, explicitStructural };
+let wrongPropertyType: {y: string, f: (this: { y: number }, x: number) => number} = { y: 'foo', explicitStructural };
+let wrongPropertyName: {wrongName: number, f: (this: { y: number }, x: number) => number} = { wrongName: 12, explicitStructural };
+
+ok.f(); // not enough arguments
+ok.f('wrong type');
+ok.f(13, 'too many arguments');
+wrongPropertyType.f(13);
+wrongPropertyName.f(13);
+
+let c = new C();
+c.explicitC(); // not enough arguments
+c.explicitC('wrong type');
+c.explicitC(13, 'too many arguments');
+c.explicitThis(); // not enough arguments
+c.explicitThis('wrong type 2');
+c.explicitThis(14, 'too many arguments 2');
+c.implicitThis(); // not enough arguments
+c.implicitThis('wrong type 2');
+c.implicitThis(14, 'too many arguments 2');
+c.explicitProperty(); // not enough arguments
+c.explicitProperty('wrong type 3');
+c.explicitProperty(15, 'too many arguments 3');
+
+// oops, this triggers contextual typing, which needs to be updated to understand that =>'s `this` is void.
+let specifiedToVoid: (this: void, x: number) => number = explicitStructural;
+
+let reconstructed: { 
+    n: number,
+    explicitThis(this: C, m: number): number, // note: this: this is not allowed in an object literal type.
+    explicitC(this: C, m: number): number,
+    explicitProperty: (this: {n : number}, m: number) => number,
+    explicitVoid(this: void, m: number): number,
+} = { 
+    n: 12,
+    explicitThis: c.explicitThis,
+    explicitC: c.explicitC,
+    explicitProperty: c.explicitProperty,
+    explicitVoid: c.explicitVoid
+};;
+
+// lambdas have this: void for assignability purposes (and this unbound (free) for body checking)
+let d = new D();
+let explicitXProperty: (this: { x: number }, m: number) => number;
+
+// from differing object types
+c.explicitC = function(this: D, m: number) { return this.x + m };
+c.explicitProperty = explicitXProperty;
+
+c.explicitC = d.explicitD;
+c.explicitC = d.explicitThis;
+c.explicitThis = d.explicitD;
+c.explicitThis = d.explicitThis;
+c.explicitProperty = d.explicitD;
+c.explicitThis = d.explicitThis;
+c.explicitVoid = d.explicitD;
+c.explicitVoid = d.explicitThis;
+
+/// class-based polymorphic assignability (with inheritance!) ///
+
+class Base1 {
+    x: number
+    public polymorphic(this: this): number { return this.x; }
+    explicit(this: Base1): number { return this.x; }
+    static explicitStatic(this: typeof Base1): number { return this.x; }
+}
+class Derived1 extends Base1 {
+    y: number
+}
+class Base2 {
+    y: number
+    polymorphic(this: this): number { return this.y; }
+    explicit(this: Base1): number { return this.x; }
+}
+class Derived2 extends Base2 {
+    x: number
+}
+
+
+let b1 = new Base1();
+let d1 = new Derived1();
+let b2 = new Base2();
+let d2 = new Derived2();
+
+b1.polymorphic = b2.polymorphic // error, 'this.y' not in Base1: { x }
+b1.explicit = b2.polymorphic // error, 'y' not in Base1: { x }
+
+d1.explicit = b2.polymorphic // error, 'y' not in Base1: { x }
+
+////// use this-type for construction with new ////
+function VoidThis(this: void) {
+
+}
+let voidThis = new VoidThis();
+
+///// syntax-ish errors /////
+class ThisConstructor {
+    constructor(this: ThisConstructor, private n: number) {
+    }
+    set p(this: void) {
+    }
+}
+interface ThisConstructorInterface {
+    new(this: ThisConstructor, n: number);
+}
+var thisConstructorType: new (this: number) => number;
+function notFirst(a: number, this: C): number { return this.n; }
+
+///// parse errors /////
+function modifiers(async this: C): number { return this.n; }
+function restParam(...this: C): number { return this.n; }
+function optional(this?: C): number { return this.n; }
+function decorated(@deco() this: C): number { return this.n; }
+function initializer(this: C = new C()): number { return this.n; }
+
+// can't name parameters 'this' in a lambda.
+c.explicitProperty = (this, m) => m + this.n;
diff --git a/tests/cases/conformance/types/thisType/thisTypeInObjectLiterals.ts b/tests/cases/conformance/types/thisType/thisTypeInObjectLiterals.ts
new file mode 100644
index 00000000000..cfdb0883fed
--- /dev/null
+++ b/tests/cases/conformance/types/thisType/thisTypeInObjectLiterals.ts
@@ -0,0 +1,29 @@
+let o = {
+    d: "bar",
+    m() {
+        return this.d.length;
+    }
+}
+let mutuallyRecursive = {
+    a: 100,
+    start() {
+        return this.passthrough(this.a);
+    },
+    passthrough(n: number) {
+        return this.sub1(n);
+    },
+    sub1(n: number): number {
+        if (n > 0) {
+            return this.passthrough(n - 1);
+        }
+        return n;
+    }
+}
+var i: number = mutuallyRecursive.start();
+interface I {
+    a: number;
+    start(): number;
+    passthrough(n: number): number;
+    sub1(n: number): number;
+}
+var impl: I = mutuallyRecursive;
diff --git a/tests/cases/conformance/types/thisType/unionThisTypeInFunctions.ts b/tests/cases/conformance/types/thisType/unionThisTypeInFunctions.ts
new file mode 100644
index 00000000000..4f74058cc48
--- /dev/null
+++ b/tests/cases/conformance/types/thisType/unionThisTypeInFunctions.ts
@@ -0,0 +1,11 @@
+interface Real {
+    method(this: this, n: number): void;
+    data: string;
+}
+interface Fake {
+    method(this: this, n: number): void;
+    data: number;
+}
+function test(r: Real | Fake) {
+    r.method(12);
+}
diff --git a/tests/cases/conformance/types/typeRelationships/comparable/equalityWithIntersectionTypes01.ts b/tests/cases/conformance/types/typeRelationships/comparable/equalityWithIntersectionTypes01.ts
new file mode 100644
index 00000000000..74c0ebb7412
--- /dev/null
+++ b/tests/cases/conformance/types/typeRelationships/comparable/equalityWithIntersectionTypes01.ts
@@ -0,0 +1,24 @@
+interface I1 {
+    p1: number
+}
+
+interface I2 extends I1 {
+    p2: number;
+}
+
+interface I3 {
+    p3: number;
+}
+
+var x = { p1: 10, p2: 20, p3: 30 };
+var y: I1 & I3 = x;
+var z: I2 = x;
+
+if (y === z || z === y) {
+}
+else if (y !== z || z !== y) {
+}
+else if (y == z || z == y) {
+}
+else if (y != z || z != y) {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/types/typeRelationships/comparable/equalityWithUnionTypes01.ts b/tests/cases/conformance/types/typeRelationships/comparable/equalityWithUnionTypes01.ts
new file mode 100644
index 00000000000..d83277b975a
--- /dev/null
+++ b/tests/cases/conformance/types/typeRelationships/comparable/equalityWithUnionTypes01.ts
@@ -0,0 +1,20 @@
+interface I1 {
+    p1: number
+}
+
+interface I2 extends I1 {
+    p2: number;
+}
+
+var x = { p1: 10, p2: 20 };
+var y: number | I2 = x;
+var z: I1 = x;
+
+if (y === z || z === y) {
+}
+else if (y !== z || z !== y) {
+}
+else if (y == z || z == y) {
+}
+else if (y != z || z != y) {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/types/typeRelationships/comparable/switchCaseWithIntersectionTypes01.ts b/tests/cases/conformance/types/typeRelationships/comparable/switchCaseWithIntersectionTypes01.ts
new file mode 100644
index 00000000000..fd629306b10
--- /dev/null
+++ b/tests/cases/conformance/types/typeRelationships/comparable/switchCaseWithIntersectionTypes01.ts
@@ -0,0 +1,25 @@
+
+var strAndNum: string & number;
+var numAndBool: number & boolean;
+var str: string;
+var num: number;
+var bool: boolean;
+
+switch (strAndNum) {
+    // Identical
+    case strAndNum:
+        break;
+
+    // Constituents
+    case str:
+    case num:
+        break;
+
+    // Overlap in constituents
+    case numAndBool:
+        break;
+
+    // No relation
+    case bool:
+        break;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/types/typeRelationships/comparable/switchCaseWithUnionTypes01.ts b/tests/cases/conformance/types/typeRelationships/comparable/switchCaseWithUnionTypes01.ts
new file mode 100644
index 00000000000..bdbfaf2df47
--- /dev/null
+++ b/tests/cases/conformance/types/typeRelationships/comparable/switchCaseWithUnionTypes01.ts
@@ -0,0 +1,25 @@
+
+var strOrNum: string | number;
+var numOrBool: number | boolean;
+var str: string;
+var num: number;
+var bool: boolean;
+
+switch (strOrNum) {
+    // Identical
+    case strOrNum:
+        break;
+
+    // Constituents
+    case str:
+    case num:
+        break;
+
+    // Overlap in constituents
+    case numOrBool:
+        break;
+
+    // No relation
+    case bool:
+        break;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithIntersectionTypes01.ts b/tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithIntersectionTypes01.ts
new file mode 100644
index 00000000000..1afc760ef85
--- /dev/null
+++ b/tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithIntersectionTypes01.ts
@@ -0,0 +1,20 @@
+interface I1 {
+    p1: number
+}
+
+interface I2 extends I1 {
+    p2: number;
+}
+
+interface I3 {
+    p3: number;
+}
+
+var x = { p1: 10, p2: 20, p3: 30 };
+var y: I1 & I3 = x;
+var z: I2 = x;
+
+var a = <I1 & I3>z;
+var b = <I3>z;
+var c = <I2>z;
+var d = <I1>y;
diff --git a/tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithUnionTypes01.ts b/tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithUnionTypes01.ts
new file mode 100644
index 00000000000..3010c5f159a
--- /dev/null
+++ b/tests/cases/conformance/types/typeRelationships/comparable/typeAssertionsWithUnionTypes01.ts
@@ -0,0 +1,16 @@
+interface I1 {
+    p1: number
+}
+
+interface I2 extends I1 {
+    p2: number;
+}
+
+var x = { p1: 10, p2: 20 };
+var y: number | I2 = x;
+var z: I1 = x;
+
+var a = <number | I2>z;
+var b = <number>z;
+var c = <I2>z;
+var d = <I1>y;
diff --git a/tests/cases/fourslash/cancellationWhenfindingAllRefsOnDefinition.ts b/tests/cases/fourslash/cancellationWhenfindingAllRefsOnDefinition.ts
index 09f580bb965..48a698c5a47 100644
--- a/tests/cases/fourslash/cancellationWhenfindingAllRefsOnDefinition.ts
+++ b/tests/cases/fourslash/cancellationWhenfindingAllRefsOnDefinition.ts
@@ -17,7 +17,7 @@
 ////}
 
 //@Filename: findAllRefsOnDefinition.ts
-////import Second = require("findAllRefsOnDefinition-import");
+////import Second = require("./findAllRefsOnDefinition-import");
 ////
 ////var second = new Second.Test()
 ////second.start();
diff --git a/tests/cases/fourslash/cloduleAsBaseClass2.ts b/tests/cases/fourslash/cloduleAsBaseClass2.ts
index be2072afc43..310ae72d664 100644
--- a/tests/cases/fourslash/cloduleAsBaseClass2.ts
+++ b/tests/cases/fourslash/cloduleAsBaseClass2.ts
@@ -15,7 +15,7 @@
 ////export = A;
 
 // @Filename: cloduleAsBaseClass2_1.ts
-////import B = require('cloduleAsBaseClass2_0');
+////import B = require('./cloduleAsBaseClass2_0');
 ////class D extends B {
 ////    constructor() {
 ////        super(1);
diff --git a/tests/cases/fourslash/commentBraceCompletionPosition.ts b/tests/cases/fourslash/commentBraceCompletionPosition.ts
new file mode 100644
index 00000000000..23b8240dcaf
--- /dev/null
+++ b/tests/cases/fourslash/commentBraceCompletionPosition.ts
@@ -0,0 +1,23 @@
+/// <reference path="fourslash.ts" />
+
+//// /**
+////  *  inside jsdoc /*1*/
+////  */
+//// function f() {
+////     // inside regular comment /*2*/
+////     var c = "";
+////
+////    /* inside multi-
+////       line comment /*3*/ 
+////    */
+////    var y =12;
+//// }
+
+goTo.marker('1');
+verify.not.isValidBraceCompletionAtPostion('(');
+
+goTo.marker('2');
+verify.not.isValidBraceCompletionAtPostion('(');
+
+goTo.marker('3');
+verify.not.isValidBraceCompletionAtPostion('(');
\ No newline at end of file
diff --git a/tests/cases/fourslash/commentsClassMembers.ts b/tests/cases/fourslash/commentsClassMembers.ts
index 54b4f0253d4..d719253a57b 100644
--- a/tests/cases/fourslash/commentsClassMembers.ts
+++ b/tests/cases/fourslash/commentsClassMembers.ts
@@ -694,7 +694,7 @@ verify.completionListContains("a", "(parameter) a: number", "this is first param
 verify.quickInfoIs("(parameter) a: number", "this is first parameter a\nmore info about a");
 
 goTo.marker('116');
-verify.quickInfoIs("class cWithConstructorProperty", "");
+verify.quickInfoIs("this: this", "");
 
 goTo.marker('117');
 verify.quickInfoIs("(local var) bbbb: number", "");
diff --git a/tests/cases/fourslash/commentsExternalModules.ts b/tests/cases/fourslash/commentsExternalModules.ts
index 088a60d9119..c4bba7c444f 100644
--- a/tests/cases/fourslash/commentsExternalModules.ts
+++ b/tests/cases/fourslash/commentsExternalModules.ts
@@ -27,7 +27,7 @@
 
 // @Filename: commentsExternalModules_file1.ts
 /////**This is on import declaration*/
-////import ex/*9*/tMod = require("commentsExternalModules_file0");
+////import ex/*9*/tMod = require("./commentsExternalModules_file0");
 /////*10*/extMod./*11*/m1./*12*/fooExp/*13q*/ort(/*13*/);
 ////var new/*14*/Var = new extMod.m1.m2./*15*/c();
 
@@ -69,10 +69,10 @@ verify.memberListContains("i", "var m1.m2.i: m1.m2.c", "i");
 
 goTo.file("commentsExternalModules_file1.ts");
 goTo.marker('9');
-verify.quickInfoIs('import extMod = require("commentsExternalModules_file0")', "This is on import declaration");
+verify.quickInfoIs('import extMod = require("./commentsExternalModules_file0")', "This is on import declaration");
 
 goTo.marker('10');
-verify.completionListContains("extMod", 'import extMod = require("commentsExternalModules_file0")', "This is on import declaration");
+verify.completionListContains("extMod", 'import extMod = require("./commentsExternalModules_file0")', "This is on import declaration");
 
 goTo.marker('11');
 verify.memberListContains("m1", "namespace extMod.m1");
diff --git a/tests/cases/fourslash/commentsImportDeclaration.ts b/tests/cases/fourslash/commentsImportDeclaration.ts
index 35c6d45330d..884c63253d4 100644
--- a/tests/cases/fourslash/commentsImportDeclaration.ts
+++ b/tests/cases/fourslash/commentsImportDeclaration.ts
@@ -20,7 +20,7 @@
 // @Filename: commentsImportDeclaration_file1.ts
 ///////<reference path='commentsImportDeclaration_file0.ts'/>
 /////** Import declaration*/
-////import /*3*/extMod = require("commentsImportDeclaration_file0/*4*/");
+////import /*3*/extMod = require("./commentsImportDeclaration_file0/*4*/");
 ////extMod./*6*/m1./*7*/fooEx/*8q*/port(/*8*/);
 ////var new/*9*/Var = new extMod.m1.m2./*10*/c();
 
@@ -28,7 +28,7 @@ goTo.marker('2');
 verify.quickInfoIs("namespace m1", "NamespaceComment");
 
 goTo.marker('3');
-verify.quickInfoIs('import extMod = require("commentsImportDeclaration_file0")', "Import declaration");
+verify.quickInfoIs('import extMod = require("./commentsImportDeclaration_file0")', "Import declaration");
 
 goTo.marker('6');
 verify.memberListContains("m1", "namespace extMod.m1");
diff --git a/tests/cases/fourslash/completionInNamedImportLocation.ts b/tests/cases/fourslash/completionInNamedImportLocation.ts
new file mode 100644
index 00000000000..596de652cc3
--- /dev/null
+++ b/tests/cases/fourslash/completionInNamedImportLocation.ts
@@ -0,0 +1,23 @@
+/// <reference path='fourslash.ts'/>
+
+// @Filename: file.ts
+////export var x = 10;
+////export var y = 10;
+////export default class C {
+////}
+
+
+// @Filename: a.ts
+////import { /*1*/ } from "./file";
+////import { x, /*2*/ } from "./file";
+
+goTo.file("a.ts");
+goTo.marker('1');
+verify.completionListContains("x", "var x: number");
+verify.completionListContains("y", "var y: number");
+verify.not.completionListContains("C");
+
+goTo.marker('2');
+verify.not.completionListContains("x", "var x: number");
+verify.completionListContains("y", "var y: number");
+verify.not.completionListContains("C");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListEnumMembers.ts b/tests/cases/fourslash/completionListEnumMembers.ts
index 9c24f6228b0..4f81af5a845 100644
--- a/tests/cases/fourslash/completionListEnumMembers.ts
+++ b/tests/cases/fourslash/completionListEnumMembers.ts
@@ -21,4 +21,4 @@ verify.memberListCount(0);
 goTo.marker('enumValueReference');
 verify.memberListContains("toString");
 verify.memberListContains("toFixed");
-verify.memberListCount(5);
+verify.memberListCount(6);
diff --git a/tests/cases/fourslash/completionListForTransitivelyExportedMembers01.ts b/tests/cases/fourslash/completionListForTransitivelyExportedMembers01.ts
index 017b04592c1..c9fe659cd91 100644
--- a/tests/cases/fourslash/completionListForTransitivelyExportedMembers01.ts
+++ b/tests/cases/fourslash/completionListForTransitivelyExportedMembers01.ts
@@ -24,11 +24,11 @@
 
 // @Filename: C.ts
 ////export var cVar = "see!";
-////export * from "A";
-////export * from "B"
+////export * from "./A";
+////export * from "./B"
 
 // @Filename: D.ts
-////import * as c from "C";
+////import * as c from "./C";
 ////var x = c./**/
 
 goTo.marker();
diff --git a/tests/cases/fourslash/completionListForTransitivelyExportedMembers02.ts b/tests/cases/fourslash/completionListForTransitivelyExportedMembers02.ts
index 868859746b4..6f2e2f490b1 100644
--- a/tests/cases/fourslash/completionListForTransitivelyExportedMembers02.ts
+++ b/tests/cases/fourslash/completionListForTransitivelyExportedMembers02.ts
@@ -25,11 +25,11 @@
 
 // @Filename: C.ts
 ////export var cVar = "see!";
-////export * from "A";
-////export * from "B"
+////export * from "./A";
+////export * from "./B"
 
 // @Filename: D.ts
-////import * as c from "C";
+////import * as c from "./C";
 ////var x = c.Inner./**/
 
 goTo.marker();
diff --git a/tests/cases/fourslash/completionListForTransitivelyExportedMembers03.ts b/tests/cases/fourslash/completionListForTransitivelyExportedMembers03.ts
index 78ef3ec7c72..ae92a706e50 100644
--- a/tests/cases/fourslash/completionListForTransitivelyExportedMembers03.ts
+++ b/tests/cases/fourslash/completionListForTransitivelyExportedMembers03.ts
@@ -25,11 +25,11 @@
 
 // @Filename: C.ts
 ////export var cVar = "see!";
-////export * from "A";
-////export * from "B"
+////export * from "./A";
+////export * from "./B"
 
 // @Filename: D.ts
-////import * as c from "C";
+////import * as c from "./C";
 ////var x: c./**/
 
 goTo.marker();
diff --git a/tests/cases/fourslash/completionListForTransitivelyExportedMembers04.ts b/tests/cases/fourslash/completionListForTransitivelyExportedMembers04.ts
index 114e370d31d..44f2bf224ad 100644
--- a/tests/cases/fourslash/completionListForTransitivelyExportedMembers04.ts
+++ b/tests/cases/fourslash/completionListForTransitivelyExportedMembers04.ts
@@ -1,5 +1,5 @@
 ///<reference path="fourslash.ts" />
-
+// @ModuleResolution: classic
 
 // @Filename: A.ts
 ////export interface I1 { one: number }
diff --git a/tests/cases/fourslash/completionListInExportClause01.ts b/tests/cases/fourslash/completionListInExportClause01.ts
index 12726444bd2..741a1ac333c 100644
--- a/tests/cases/fourslash/completionListInExportClause01.ts
+++ b/tests/cases/fourslash/completionListInExportClause01.ts
@@ -6,11 +6,11 @@
 ////export function baz() { return 10; }
 
 // @Filename: m2.ts
-////export {/*1*/, /*2*/ from "m1"
-////export {/*3*/} from "m1"
-////export {foo,/*4*/ from "m1"
-////export {bar as /*5*/, /*6*/ from "m1"
-////export {foo, bar, baz as b,/*7*/} from "m1"
+////export {/*1*/, /*2*/ from "./m1"
+////export {/*3*/} from "./m1"
+////export {foo,/*4*/ from "./m1"
+////export {bar as /*5*/, /*6*/ from "./m1"
+////export {foo, bar, baz as b,/*7*/} from "./m1"
 
 function verifyCompletionAtMarker(marker: string, showBuilder: boolean, ...completions: string[]) {
     goTo.marker(marker);
diff --git a/tests/cases/fourslash/completionListInImportClause01.ts b/tests/cases/fourslash/completionListInImportClause01.ts
index 2b679ffe550..fb2beadc566 100644
--- a/tests/cases/fourslash/completionListInImportClause01.ts
+++ b/tests/cases/fourslash/completionListInImportClause01.ts
@@ -1,4 +1,5 @@
 /// <reference path='fourslash.ts'/>
+// @ModuleResolution: classic
 
 // @Filename: m1.ts
 ////export var foo: number = 1;
diff --git a/tests/cases/fourslash/definition.ts b/tests/cases/fourslash/definition.ts
index f403965fe12..13abe094376 100644
--- a/tests/cases/fourslash/definition.ts
+++ b/tests/cases/fourslash/definition.ts
@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
 // @Filename: b.ts
-////import n = require('a/*1*/');
+////import n = require('./a/*1*/');
 ////var x = new n.Foo();
 
 // @Filename: a.ts
diff --git a/tests/cases/fourslash/exportEqualCallableInterface.ts b/tests/cases/fourslash/exportEqualCallableInterface.ts
index 9ac54b31363..795df0c8695 100644
--- a/tests/cases/fourslash/exportEqualCallableInterface.ts
+++ b/tests/cases/fourslash/exportEqualCallableInterface.ts
@@ -9,7 +9,7 @@
 
 // @Filename: exportEqualCallableInterface_file1.ts
 ///////<reference path='exportEqualCallableInterface_file0.ts'/>
-////import test = require('exportEqualCallableInterface_file0');
+////import test = require('./exportEqualCallableInterface_file0');
 ////var t2: test;
 ////t2./**/
 
diff --git a/tests/cases/fourslash/exportEqualTypes.ts b/tests/cases/fourslash/exportEqualTypes.ts
index 3fa3b71fef6..5da26aeb838 100644
--- a/tests/cases/fourslash/exportEqualTypes.ts
+++ b/tests/cases/fourslash/exportEqualTypes.ts
@@ -9,13 +9,13 @@
 
 // @Filename: exportEqualTypes_file1.ts
 ///////<reference path='exportEqualTypes_file0.ts'/>
-////import test = require('exportEqualTypes_file0');
+////import test = require('./exportEqualTypes_file0');
 ////var t: /*1*/test;  // var 't' should be of type 'test'
 ////var /*2*/r1 = t(); // Should return a Date
 ////var /*3*/r2 = t./*4*/foo; // t should have 'foo' in dropdown list and be of type 'string'
 
 goTo.marker('1');
-verify.quickInfoIs("import test = require('exportEqualTypes_file0')");
+verify.quickInfoIs("import test = require('./exportEqualTypes_file0')");
 goTo.marker('2');
 verify.quickInfoIs('var r1: Date');
 goTo.marker('3');
diff --git a/tests/cases/fourslash/externalModuleIntellisense.ts b/tests/cases/fourslash/externalModuleIntellisense.ts
index 4d909ceed21..93c7143a9c6 100644
--- a/tests/cases/fourslash/externalModuleIntellisense.ts
+++ b/tests/cases/fourslash/externalModuleIntellisense.ts
@@ -14,7 +14,7 @@
 
 // @Filename: externalModuleIntellisense_file1.ts
 ///////<reference path='externalModuleIntellisense_file0.ts'/>
-////import express = require('externalModuleIntellisense_file0');
+////import express = require('./externalModuleIntellisense_file0');
 ////var x = express();/*1*/
 
 goTo.marker('1');
diff --git a/tests/cases/fourslash/externalModuleWithExportAssignment.ts b/tests/cases/fourslash/externalModuleWithExportAssignment.ts
index 09798ec5492..5d7e60f6ee5 100644
--- a/tests/cases/fourslash/externalModuleWithExportAssignment.ts
+++ b/tests/cases/fourslash/externalModuleWithExportAssignment.ts
@@ -18,7 +18,7 @@
 ////export = m2;
 
 // @Filename: externalModuleWithExportAssignment_file1.ts
-////import /*1*/a1 = require("externalModuleWithExportAssignment_file0");
+////import /*1*/a1 = require("./externalModuleWithExportAssignment_file0");
 ////export var /*2*/a = a1;
 ////a./*3*/test1(/*4*/null, null, null);
 ////var /*6*/r1 = a.test2(/*5*/);
@@ -30,7 +30,7 @@
 
 goTo.file("externalModuleWithExportAssignment_file1.ts");
 goTo.marker('1');
-verify.quickInfoIs('import a1 = require("externalModuleWithExportAssignment_file0")');
+verify.quickInfoIs('import a1 = require("./externalModuleWithExportAssignment_file0")');
 
 goTo.marker('2');
 verify.quickInfoIs("var a: {\n    (): a1.connectExport;\n    test1: a1.connectModule;\n    test2(): a1.connectModule;\n}", undefined);
diff --git a/tests/cases/fourslash/findAllRefsInClassExpression.ts b/tests/cases/fourslash/findAllRefsInClassExpression.ts
new file mode 100644
index 00000000000..951acdd336c
--- /dev/null
+++ b/tests/cases/fourslash/findAllRefsInClassExpression.ts
@@ -0,0 +1,16 @@
+/// <reference path='fourslash.ts'/>
+
+////interface I { [|boom|](): void; }
+////new class C implements I {
+////   [|boom|](){}
+////}
+
+let ranges = test.ranges()
+for (let range of ranges) {
+    goTo.position(range.start);
+
+    verify.referencesCountIs(ranges.length);
+    for (let expectedReference of ranges) {
+        verify.referencesAtPositionContains(expectedReference);
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName03.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName03.ts
index 304fa9e42e9..8dc2b1e7bb8 100644
--- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName03.ts
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName03.ts
@@ -6,7 +6,7 @@
 ////}
 ////
 ////var foo: I;
-////var [{ [|property1|]: prop1 }, { property1, property2 } ] = [foo, foo];
+////var [{ [|property1|]: prop1 }, { [|property1|], property2 } ] = [foo, foo];
 
 let ranges = test.ranges();
 for (let range of ranges) {
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts
index bdb37525f71..dfa0997774e 100644
--- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts
@@ -6,14 +6,12 @@
 ////}
 ////
 ////function f({ /**/[|property1|]: p1 }: I,
-////           { /*SHOULD_BE_A_REFERENCE*/property1 }: I,
+////           { [|property1|] }: I,
 ////           { property1: p2 }) {
 ////
-////    return property1 + 1;
+////    return [|property1|] + 1;
 ////}
 
-// NOTE: In the future, the identifier at
-//       SHOULD_BE_A_REFERENCE should be in the set of ranges.
 goTo.marker();
 
 let ranges = test.ranges();
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts
index 67c7029861e..379d1d4d5f5 100644
--- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts
@@ -8,12 +8,12 @@
 ////var elems: I[];
 ////for (let { [|property1|]: p } of elems) {
 ////}
-////for (let { property1 } of elems) {
+////for (let { [|property1|] } of elems) {
 ////}
 ////for (var { [|property1|]: p1 } of elems) {
 ////}
 ////var p2;
-////for ({ property1 : p2 } of elems) {
+////for ({ [|property1|] : p2 } of elems) {
 ////}
 
 // Note: if this test ever changes, consider updating
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName09.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName09.ts
index e45359bcf1c..0b82c73e31d 100644
--- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName09.ts
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName09.ts
@@ -1,19 +1,17 @@
 /// <reference path='fourslash.ts'/>
 
 ////interface I {
-////    /*SHOULD_BE_A_REFERENCE1*/property1: number;
+////    [|property1|]: number;
 ////    property2: string;
 ////}
 ////
-////function f({ /*SHOULD_BE_A_REFERENCE2*/property1: p1 }: I,
+////function f({ [|property1|]: p1 }: I,
 ////           { /**/[|property1|] }: I,
 ////           { property1: p2 }) {
 ////
 ////    return [|property1|] + 1;
 ////}
 
-// NOTE: In the future, the identifiers at
-//       SHOULD_BE_A_REFERENCE[1/2] should be in the set of ranges.
 goTo.marker();
 
 let ranges = test.ranges();
diff --git a/tests/cases/fourslash/findAllRefsOnDefinition.ts b/tests/cases/fourslash/findAllRefsOnDefinition.ts
index 34144b74899..a25a6e1285f 100644
--- a/tests/cases/fourslash/findAllRefsOnDefinition.ts
+++ b/tests/cases/fourslash/findAllRefsOnDefinition.ts
@@ -17,7 +17,7 @@
 ////}
 
 //@Filename: findAllRefsOnDefinition.ts
-////import Second = require("findAllRefsOnDefinition-import");
+////import Second = require("./findAllRefsOnDefinition-import");
 ////
 ////var second = new Second.Test()
 ////second.start();
diff --git a/tests/cases/fourslash/findAllRefsOnDefinition2.ts b/tests/cases/fourslash/findAllRefsOnDefinition2.ts
index 1c03d392e4d..c9a116d4622 100644
--- a/tests/cases/fourslash/findAllRefsOnDefinition2.ts
+++ b/tests/cases/fourslash/findAllRefsOnDefinition2.ts
@@ -9,7 +9,7 @@
 ////}
 
 //@Filename: findAllRefsOnDefinition2.ts
-////import Second = require("findAllRefsOnDefinition2-import");
+////import Second = require("./findAllRefsOnDefinition2-import");
 ////
 ////var start: Second.Test.start;
 ////var stop: Second.Test.stop;
diff --git a/tests/cases/fourslash/findAllRefsOnImportAliases.ts b/tests/cases/fourslash/findAllRefsOnImportAliases.ts
index dbfab33aa86..8460e3f39b2 100644
--- a/tests/cases/fourslash/findAllRefsOnImportAliases.ts
+++ b/tests/cases/fourslash/findAllRefsOnImportAliases.ts
@@ -5,12 +5,12 @@
 ////}
 
 //@Filename: b.ts
-////import { /*2*/Class } from "a";
+////import { /*2*/Class } from "./a";
 ////
 ////var c = new /*3*/Class();
 
 //@Filename: c.ts
-////export { /*4*/Class } from "a";
+////export { /*4*/Class } from "./a";
 
 goTo.file("a.ts");
 goTo.marker("1");
diff --git a/tests/cases/fourslash/findAllRefsOnImportAliases2.ts b/tests/cases/fourslash/findAllRefsOnImportAliases2.ts
index dca6b13bbd2..ab7a99e1e74 100644
--- a/tests/cases/fourslash/findAllRefsOnImportAliases2.ts
+++ b/tests/cases/fourslash/findAllRefsOnImportAliases2.ts
@@ -5,12 +5,12 @@
 ////}
 
 //@Filename: b.ts
-////import { /*2*/Class as /*3*/C2} from "a";
+////import { /*2*/Class as /*3*/C2} from "./a";
 ////
 ////var c = new C2();
 
 //@Filename: c.ts
-////export { /*4*/Class as /*5*/C3 } from "a";
+////export { /*4*/Class as /*5*/C3 } from "./a";
 
 goTo.file("a.ts");
 goTo.marker("1");
diff --git a/tests/cases/fourslash/findReferencesJSXTagName.ts b/tests/cases/fourslash/findReferencesJSXTagName.ts
new file mode 100644
index 00000000000..a6170b4fc8f
--- /dev/null
+++ b/tests/cases/fourslash/findReferencesJSXTagName.ts
@@ -0,0 +1,22 @@
+/// <reference path='fourslash.ts'/>
+
+// @Filename: index.tsx
+////import { /*1*/SubmissionComp } from "./RedditSubmission"
+////function displaySubreddit(subreddit: string) {
+////    let components = submissions
+////        .map((value, index) => </*2*/SubmissionComp key={ index } elementPosition= { index } {...value.data} />);
+////}
+
+// @Filename: RedditSubmission.ts
+////export const /*3*/SubmissionComp = (submission: SubmissionProps) =>
+////    <div style={{ fontFamily: "sans-serif" }}></div>;
+
+
+goTo.marker("1");
+verify.referencesCountIs(3);
+
+goTo.marker("2");
+verify.referencesCountIs(3);
+
+goTo.marker("3");
+verify.referencesCountIs(3);
\ No newline at end of file
diff --git a/tests/cases/fourslash/findReferencesJSXTagName2.ts b/tests/cases/fourslash/findReferencesJSXTagName2.ts
new file mode 100644
index 00000000000..a7bb7fd97dd
--- /dev/null
+++ b/tests/cases/fourslash/findReferencesJSXTagName2.ts
@@ -0,0 +1,11 @@
+/// <reference path='fourslash.ts'/>
+
+// @Filename: index.tsx
+////const /*1*/obj = {Component: () => <div/>};
+////const element = </*2*/obj.Component/>;
+
+goTo.marker("1");
+verify.referencesCountIs(2);
+
+goTo.marker("2");
+verify.referencesCountIs(2);
\ No newline at end of file
diff --git a/tests/cases/fourslash/formattingJsxTexts.ts b/tests/cases/fourslash/formattingJsxTexts.ts
new file mode 100644
index 00000000000..7772d11d66b
--- /dev/null
+++ b/tests/cases/fourslash/formattingJsxTexts.ts
@@ -0,0 +1,116 @@
+/// <reference path='fourslash.ts' />
+
+//@Filename: file.tsx
+////<option>
+////    homu   ;      homu
+////    homu;homu
+////    homu   :    homu
+////    homu:homu
+////    homu    ?     homu
+////    homu    .    homu
+////
+////    homu    [   homu   ]   homu
+////
+////    !     homu
+////    --    Type
+////    homu    --
+////    homu    ++
+////    ++     homu
+////
+////    homu  ,   homu
+////
+////    var    homu
+////    throw    homu
+////    new    homu
+////    delete   homu
+////    return       homu
+////    typeof     homu
+////    await     homu
+////
+////    abstract  homu
+////    class     homu
+////    declare   homu
+////    default   homu
+////    enum      homu
+////    export    homu
+////    homu    extends   homu
+////    get       homu
+////    homu    implements     homu
+////    interface      homu
+////    module    homu
+////    namespace      homu
+////    private   homu
+////    public    homu
+////    protected      homu
+////    set       homu
+////    static    homu
+////    type      homu
+////
+////    homu    =>    homu
+////    homu=>homu
+////
+////    ...       homu
+////
+////    homu     @     homu
+////    homu@homu
+////
+////    (    homu   )    homu
+////</option>;
+
+format.document();
+
+verify.currentFileContentIs(`<option>
+    homu   ;      homu
+    homu;homu
+    homu   :    homu
+    homu:homu
+    homu    ?     homu
+    homu    .    homu
+
+    homu    [   homu   ]   homu
+
+    !     homu
+    --    Type
+    homu    --
+    homu    ++
+    ++     homu
+
+    homu  ,   homu
+
+    var    homu
+    throw    homu
+    new    homu
+    delete   homu
+    return       homu
+    typeof     homu
+    await     homu
+
+    abstract  homu
+    class     homu
+    declare   homu
+    default   homu
+    enum      homu
+    export    homu
+    homu    extends   homu
+    get       homu
+    homu    implements     homu
+    interface      homu
+    module    homu
+    namespace      homu
+    private   homu
+    public    homu
+    protected      homu
+    set       homu
+    static    homu
+    type      homu
+
+    homu    =>    homu
+    homu=>homu
+
+    ...       homu
+
+    homu     @     homu
+    homu@homu
+
+    (    homu   )    homu
+</option>;`);
\ No newline at end of file
diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts
index b69a757f01e..34d508d5c7e 100644
--- a/tests/cases/fourslash/fourslash.ts
+++ b/tests/cases/fourslash/fourslash.ts
@@ -136,6 +136,7 @@ declare namespace FourSlashInterface {
         typeDefinitionCountIs(expectedCount: number): void;
         definitionLocationExists(): void;
         verifyDefinitionsName(name: string, containerName: string): void;
+        isValidBraceCompletionAtPostion(openingBrace?: string): void;
     }
     class verify extends verifyNegatable {
         assertHasRanges(ranges: FourSlash.Range[]): void;
@@ -173,6 +174,7 @@ declare namespace FourSlashInterface {
         noMatchingBracePositionInCurrentFile(bracePosition: number): void;
         DocCommentTemplate(expectedText: string, expectedOffset: number, empty?: boolean): void;
         noDocCommentTemplate(): void;
+
         getScriptLexicalStructureListCount(count: number): void;
         getScriptLexicalStructureListContains(name: string, kind: string, fileName?: string, parentName?: string, isAdditionalSpan?: boolean, markerPosition?: number): void;
         navigationItemsListCount(count: number, searchValue: string, matchKind?: string): void;
diff --git a/tests/cases/fourslash/getJavaScriptCompletions15.ts b/tests/cases/fourslash/getJavaScriptCompletions15.ts
index fbcbc2d4692..2903cb6fa7c 100644
--- a/tests/cases/fourslash/getJavaScriptCompletions15.ts
+++ b/tests/cases/fourslash/getJavaScriptCompletions15.ts
@@ -11,11 +11,11 @@
 //// export var V = "123"
 
 // @Filename: main.js
-//// import ref1 = require("refFile1");
-//// var ref2 = require("refFile2");
+//// import ref1 = require("./refFile1");
+//// var ref2 = require("./refFile2");
 //// ref1.V./*1*/;
 //// ref2.V./*2*/;
-//// var v = { x: require("refFile3") };
+//// var v = { x: require("./refFile3") };
 //// v.x./*3*/;
 //// v.x.V./*4*/;
 
diff --git a/tests/cases/fourslash/getJavaScriptGlobalCompletions1.ts b/tests/cases/fourslash/getJavaScriptGlobalCompletions1.ts
new file mode 100644
index 00000000000..240df24bf52
--- /dev/null
+++ b/tests/cases/fourslash/getJavaScriptGlobalCompletions1.ts
@@ -0,0 +1,15 @@
+/// <reference path="fourslash.ts" />
+
+// @allowNonTsExtensions: true
+// @Filename: Foo.js
+//// function f() {
+////     // helloWorld leaks from here into the global space?
+////     if (helloWorld) {
+////         return 3;
+////     }
+////     return 5;
+//// }
+//// 
+//// hello/**/
+
+verify.completionListContains('helloWorld');
diff --git a/tests/cases/fourslash/getJavaScriptQuickInfo8.ts b/tests/cases/fourslash/getJavaScriptQuickInfo8.ts
new file mode 100644
index 00000000000..09ac27ce595
--- /dev/null
+++ b/tests/cases/fourslash/getJavaScriptQuickInfo8.ts
@@ -0,0 +1,29 @@
+/// <reference path="fourslash.ts" />
+
+// @allowNonTsExtensions: true
+// @Filename: file.js
+//// let x = {
+//// 	/** @type {number} */
+//// 	get m() {
+//// 		return undefined;
+//// 	}
+//// }
+//// x.m/*1*/;
+////
+//// class Foo {
+//// 	/** @type {string} */
+//// 	get b() {
+//// 		return undefined;
+//// 	}
+//// }
+//// var y = new Foo();
+//// y.b/*2*/;
+
+goTo.marker('1');
+edit.insert('.');
+verify.memberListContains('toFixed', undefined, undefined, 'method');
+edit.backspace();
+
+goTo.marker('2');
+edit.insert('.');
+verify.memberListContains('substr', undefined, undefined, 'method');
diff --git a/tests/cases/fourslash/getJavaScriptSemanticDiagnostics2.ts b/tests/cases/fourslash/getJavaScriptSemanticDiagnostics2.ts
index 198c39abe42..9ab29b41798 100644
--- a/tests/cases/fourslash/getJavaScriptSemanticDiagnostics2.ts
+++ b/tests/cases/fourslash/getJavaScriptSemanticDiagnostics2.ts
@@ -11,12 +11,5 @@ verify.getSemanticDiagnostics(`[
     "length": 11,
     "category": "error",
     "code": 8003
-  },
-  {
-    "message": "Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.",
-    "start": 0,
-    "length": 11,
-    "category": "error",
-    "code": 1148
   }
 ]`);
\ No newline at end of file
diff --git a/tests/cases/fourslash/getJavaScriptSemanticDiagnostics21.ts b/tests/cases/fourslash/getJavaScriptSemanticDiagnostics21.ts
index b71677554a2..8a7120acbb3 100644
--- a/tests/cases/fourslash/getJavaScriptSemanticDiagnostics21.ts
+++ b/tests/cases/fourslash/getJavaScriptSemanticDiagnostics21.ts
@@ -1,15 +1,8 @@
 /// <reference path="fourslash.ts" />
 
 // @allowJs: true
+// @experimentalDecorators: true
 // @Filename: a.js
 //// @internal class C {}
 
-verify.getSemanticDiagnostics(`[
-  {
-    "message": "'decorators' can only be used in a .ts file.",
-    "start": 0,
-    "length": 9,
-    "category": "error",
-    "code": 8017
-  }
-]`);
\ No newline at end of file
+verify.getSemanticDiagnostics(`[]`);
diff --git a/tests/cases/fourslash/getPreProcessedFile.ts b/tests/cases/fourslash/getPreProcessedFile.ts
index aa0ff4c0669..03ce481c8ba 100644
--- a/tests/cases/fourslash/getPreProcessedFile.ts
+++ b/tests/cases/fourslash/getPreProcessedFile.ts
@@ -1,4 +1,5 @@
 /// <reference path="fourslash.ts" />
+// @ModuleResolution: classic
 
 // @Filename: refFile1.ts
 //// class D { }
diff --git a/tests/cases/fourslash/goToDefinitionExternalModuleName.ts b/tests/cases/fourslash/goToDefinitionExternalModuleName.ts
index f403965fe12..13abe094376 100644
--- a/tests/cases/fourslash/goToDefinitionExternalModuleName.ts
+++ b/tests/cases/fourslash/goToDefinitionExternalModuleName.ts
@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
 // @Filename: b.ts
-////import n = require('a/*1*/');
+////import n = require('./a/*1*/');
 ////var x = new n.Foo();
 
 // @Filename: a.ts
diff --git a/tests/cases/fourslash/goToDefinitionExternalModuleName2.ts b/tests/cases/fourslash/goToDefinitionExternalModuleName2.ts
index df7b3310394..06be8e676dd 100644
--- a/tests/cases/fourslash/goToDefinitionExternalModuleName2.ts
+++ b/tests/cases/fourslash/goToDefinitionExternalModuleName2.ts
@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
 // @Filename: b.ts
-////import n = require('a/*1*/');
+////import n = require('./a/*1*/');
 ////var x = new n.Foo();
 
 // @Filename: a.ts
diff --git a/tests/cases/fourslash/goToDefinitionImportedNames.ts b/tests/cases/fourslash/goToDefinitionImportedNames.ts
index 64eb2df96bf..98a791d23ae 100644
--- a/tests/cases/fourslash/goToDefinitionImportedNames.ts
+++ b/tests/cases/fourslash/goToDefinitionImportedNames.ts
@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @Filename: b.ts
-////export {/*classAliasDefinition*/Class} from "a";
+////export {/*classAliasDefinition*/Class} from "./a";
 
 
 // @Filename: a.ts
diff --git a/tests/cases/fourslash/goToDefinitionImportedNames2.ts b/tests/cases/fourslash/goToDefinitionImportedNames2.ts
index 8533dad62a8..e5ab58d10cf 100644
--- a/tests/cases/fourslash/goToDefinitionImportedNames2.ts
+++ b/tests/cases/fourslash/goToDefinitionImportedNames2.ts
@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @Filename: b.ts
-////import {/*classAliasDefinition*/Class} from "a";
+////import {/*classAliasDefinition*/Class} from "./a";
 
 
 // @Filename: a.ts
diff --git a/tests/cases/fourslash/goToDefinitionImportedNames3.ts b/tests/cases/fourslash/goToDefinitionImportedNames3.ts
index d55137575ef..5e9376d70cb 100644
--- a/tests/cases/fourslash/goToDefinitionImportedNames3.ts
+++ b/tests/cases/fourslash/goToDefinitionImportedNames3.ts
@@ -1,20 +1,20 @@
 /// <reference path='fourslash.ts' />
 
 // @Filename: e.ts
-//// import {M, /*classAliasDefinition*/C, I} from "d";
+//// import {M, /*classAliasDefinition*/C, I} from "./d";
 //// var c = new /*classReference*/C();
 
 
 // @Filename: d.ts
-////export * from "c";
+////export * from "./c";
 
 
 // @Filename: c.ts
-////export {Module as M, Class as C, Interface as I} from "b";
+////export {Module as M, Class as C, Interface as I} from "./b";
 
 
 // @Filename: b.ts
-////export * from "a";
+////export * from "./a";
 
 
 // @Filename: a.ts
@@ -31,7 +31,7 @@ goTo.file("e.ts");
 
 goTo.marker('classReference');
 goTo.definition();
-verify.caretAtMarker('classAliasDefinition');
+verify.caretAtMarker('classDefinition');
 
 goTo.marker('classAliasDefinition');
 goTo.definition();
diff --git a/tests/cases/fourslash/goToDefinitionImportedNames4.ts b/tests/cases/fourslash/goToDefinitionImportedNames4.ts
index cce49af874b..e0ef512dc41 100644
--- a/tests/cases/fourslash/goToDefinitionImportedNames4.ts
+++ b/tests/cases/fourslash/goToDefinitionImportedNames4.ts
@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @Filename: b.ts
-////import {Class as /*classAliasDefinition*/ClassAlias} from "a";
+////import {Class as /*classAliasDefinition*/ClassAlias} from "./a";
 
 
 // @Filename: a.ts
diff --git a/tests/cases/fourslash/goToDefinitionImportedNames5.ts b/tests/cases/fourslash/goToDefinitionImportedNames5.ts
index 46a8c45e272..abd3bee998a 100644
--- a/tests/cases/fourslash/goToDefinitionImportedNames5.ts
+++ b/tests/cases/fourslash/goToDefinitionImportedNames5.ts
@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @Filename: b.ts
-////export {Class as /*classAliasDefinition*/ClassAlias} from "a";
+////export {Class as /*classAliasDefinition*/ClassAlias} from "./a";
 
 
 // @Filename: a.ts
diff --git a/tests/cases/fourslash/goToDefinitionImportedNames6.ts b/tests/cases/fourslash/goToDefinitionImportedNames6.ts
index 27b6c55d107..c665946c3b1 100644
--- a/tests/cases/fourslash/goToDefinitionImportedNames6.ts
+++ b/tests/cases/fourslash/goToDefinitionImportedNames6.ts
@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @Filename: b.ts
-////import /*moduleAliasDefinition*/alias = require("a");
+////import /*moduleAliasDefinition*/alias = require("./a");
 
 
 // @Filename: a.ts
diff --git a/tests/cases/fourslash/goToDefinitionImportedNames7.ts b/tests/cases/fourslash/goToDefinitionImportedNames7.ts
index 3c367600b1f..d5bcc499c7c 100644
--- a/tests/cases/fourslash/goToDefinitionImportedNames7.ts
+++ b/tests/cases/fourslash/goToDefinitionImportedNames7.ts
@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @Filename: b.ts
-////import /*classAliasDefinition*/defaultExport from "a";
+////import /*classAliasDefinition*/defaultExport from "./a";
 
 
 // @Filename: a.ts
diff --git a/tests/cases/fourslash/goToDefinitionTypeReferenceDirective.ts b/tests/cases/fourslash/goToDefinitionTypeReferenceDirective.ts
new file mode 100644
index 00000000000..3aaa3ab980f
--- /dev/null
+++ b/tests/cases/fourslash/goToDefinitionTypeReferenceDirective.ts
@@ -0,0 +1,13 @@
+/// <reference path="fourslash.ts"/>
+
+// @typesRoot: src
+// @Filename: src/types/lib/index.d.ts
+/////*0*/declare let $: {x: number};
+
+// @Filename: src/app.ts
+//// /// <reference types="lib/*1*/"/>
+//// $.x;
+
+goTo.marker("1");
+goTo.definition();
+verify.caretAtMarker("0");
\ No newline at end of file
diff --git a/tests/cases/fourslash/goToTypeDefinitionAliases.ts b/tests/cases/fourslash/goToTypeDefinitionAliases.ts
index 19abc22ca30..da9d3d5a84e 100644
--- a/tests/cases/fourslash/goToTypeDefinitionAliases.ts
+++ b/tests/cases/fourslash/goToTypeDefinitionAliases.ts
@@ -7,12 +7,12 @@
 ////export {I as I2};
 
 // @Filename: goToTypeDefinitioAliases_module2.ts
-////import {I2 as I3} from "goToTypeDefinitioAliases_module1";
+////import {I2 as I3} from "./goToTypeDefinitioAliases_module1";
 ////var v1: I3;
 ////export {v1 as v2};
 
 // @Filename: goToTypeDefinitioAliases_module3.ts
-////import {/*reference1*/v2 as v3} from "goToTypeDefinitioAliases_module2";
+////import {/*reference1*/v2 as v3} from "./goToTypeDefinitioAliases_module2";
 /////*reference2*/v3;
 
 goTo.marker('reference1');
diff --git a/tests/cases/fourslash/instanceTypesForGenericType1.ts b/tests/cases/fourslash/instanceTypesForGenericType1.ts
index 96ee175383e..a3d119785bf 100644
--- a/tests/cases/fourslash/instanceTypesForGenericType1.ts
+++ b/tests/cases/fourslash/instanceTypesForGenericType1.ts
@@ -11,4 +11,4 @@ goTo.marker('1');
 verify.quickInfoIs('(property) G<T>.self: G<T>');
 
 goTo.marker('2');
-verify.quickInfoIs('class G<T>');
\ No newline at end of file
+verify.quickInfoIs('this: this');
\ No newline at end of file
diff --git a/tests/cases/fourslash/javaScriptModules13.ts b/tests/cases/fourslash/javaScriptModules13.ts
index cb3ef36783f..bcf263a4b8c 100644
--- a/tests/cases/fourslash/javaScriptModules13.ts
+++ b/tests/cases/fourslash/javaScriptModules13.ts
@@ -13,7 +13,7 @@
 //// var y = 10;
 
 // @Filename: consumer.js
-//// var x = require('myMod');
+//// var x = require('./myMod');
 //// /**/;
 
 goTo.file('consumer.js');
diff --git a/tests/cases/fourslash/javaScriptModules15.ts b/tests/cases/fourslash/javaScriptModules15.ts
index 5cd7545c83d..0636f0360af 100644
--- a/tests/cases/fourslash/javaScriptModules15.ts
+++ b/tests/cases/fourslash/javaScriptModules15.ts
@@ -14,7 +14,7 @@
 //// }
 
 // @Filename: consumer.js
-//// var x = require('myMod');
+//// var x = require('./myMod');
 //// x/**/;
 
 goTo.file('consumer.js');
diff --git a/tests/cases/fourslash/javaScriptModules16.ts b/tests/cases/fourslash/javaScriptModules16.ts
index c34660df59f..09a777f7d2c 100644
--- a/tests/cases/fourslash/javaScriptModules16.ts
+++ b/tests/cases/fourslash/javaScriptModules16.ts
@@ -9,7 +9,7 @@
 //// exports.b = true;
 
 // @Filename: consumer.js
-//// var x = require('myMod');
+//// var x = require('./myMod');
 //// x/**/;
 
 goTo.file('consumer.js');
diff --git a/tests/cases/fourslash/javaScriptModules19.ts b/tests/cases/fourslash/javaScriptModules19.ts
index 91e2439dcc9..564cbea722f 100644
--- a/tests/cases/fourslash/javaScriptModules19.ts
+++ b/tests/cases/fourslash/javaScriptModules19.ts
@@ -11,7 +11,7 @@
 //// var y = 10;
 
 // @Filename: consumer.js
-//// var x = require('myMod');
+//// var x = require('./myMod');
 //// /**/;
 
 goTo.file('consumer.js');
diff --git a/tests/cases/fourslash/javascriptModules20.ts b/tests/cases/fourslash/javascriptModules20.ts
new file mode 100644
index 00000000000..7ef5c73e1c3
--- /dev/null
+++ b/tests/cases/fourslash/javascriptModules20.ts
@@ -0,0 +1,13 @@
+/// <reference path='fourslash.ts'/>
+// @allowJs: true
+
+// @Filename: mod.js
+//// function foo() { return {a: true}; }
+//// module.exports = foo();
+
+// @Filename: app.js
+//// import * as mod from "./mod"
+//// mod./**/
+
+goTo.marker();
+verify.completionListContains('a');
diff --git a/tests/cases/fourslash/javascriptModules21.ts b/tests/cases/fourslash/javascriptModules21.ts
new file mode 100644
index 00000000000..3a046515924
--- /dev/null
+++ b/tests/cases/fourslash/javascriptModules21.ts
@@ -0,0 +1,14 @@
+/// <reference path='fourslash.ts'/>
+// @allowJs: true
+// @module: system
+
+// @Filename: mod.js
+//// function foo() { return {a: true}; }
+//// module.exports = foo();
+
+// @Filename: app.js
+//// import mod from "./mod"
+//// mod./**/
+
+goTo.marker();
+verify.completionListContains('a');
diff --git a/tests/cases/fourslash/javascriptModules22.ts b/tests/cases/fourslash/javascriptModules22.ts
new file mode 100644
index 00000000000..89fa99b5ea2
--- /dev/null
+++ b/tests/cases/fourslash/javascriptModules22.ts
@@ -0,0 +1,32 @@
+/// <reference path='fourslash.ts'/>
+// @allowJs: true
+
+// @Filename: mod.js
+//// function foo() { return {a: "hello, world"}; }
+//// module.exports = foo();
+
+// @Filename: mod2.js
+//// var x = {name: 'test'};
+//// (function createExport(obj){
+////     module.exports = {
+////         "default": x,
+////         "sausages": {eggs: 2}
+////     };
+//// })();
+
+// @Filename: app.js
+//// import {a} from "./mod"
+//// import def, {sausages} from "./mod2"
+//// a./**/
+
+goTo.marker();
+verify.completionListContains('toString');
+
+edit.backspace(2);
+edit.insert("def.");
+verify.completionListContains("name");
+
+edit.insert("name;\nsausages.");
+verify.completionListContains("eggs");
+edit.insert("eggs;");
+verify.numberOfErrorsInCurrentFile(0);
diff --git a/tests/cases/fourslash/javascriptModules23.ts b/tests/cases/fourslash/javascriptModules23.ts
new file mode 100644
index 00000000000..eafbea87baa
--- /dev/null
+++ b/tests/cases/fourslash/javascriptModules23.ts
@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts'/>
+
+// @Filename: mod.ts
+//// var foo = {a: "test"};
+//// export = foo;
+
+// @Filename: app.ts
+//// import {a} from "./mod"
+//// a./**/
+
+goTo.marker();
+verify.completionListContains('toString');
diff --git a/tests/cases/fourslash/javascriptModules24.ts b/tests/cases/fourslash/javascriptModules24.ts
new file mode 100644
index 00000000000..5a0dd892db7
--- /dev/null
+++ b/tests/cases/fourslash/javascriptModules24.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts'/>
+
+// @Filename: mod.ts
+//// function foo() { return 42; }
+//// namespace foo {
+////   export function bar (a: string) { return a; }
+//// }
+//// export = foo;
+
+// @Filename: app.ts
+//// import * as foo from "./mod"
+//// foo/*1*/();
+//// foo.bar(/*2*/"test");
+
+goTo.marker('1');
+
+/**** BUG: Should be an error to invoke a call signature on a namespace import ****/
+//verify.errorExistsBeforeMarker('1');
+verify.quickInfoIs("(alias) foo(): number\nimport foo");
+goTo.marker('2');
+verify.signatureHelpArgumentCountIs(1);
diff --git a/tests/cases/fourslash/jsDocFunctionSignatures2.ts b/tests/cases/fourslash/jsDocFunctionSignatures2.ts
new file mode 100644
index 00000000000..174ea7d6560
--- /dev/null
+++ b/tests/cases/fourslash/jsDocFunctionSignatures2.ts
@@ -0,0 +1,12 @@
+///<reference path="fourslash.ts" />
+
+// @allowNonTsExtensions: true
+// @Filename: Foo.js
+
+//// /** @type {function(string, boolean=): number} */
+//// var f6;
+//// 
+//// f6('', /**/false)
+
+goTo.marker();
+verify.currentSignatureHelpIs('f6(p0: string, p1?: boolean): number')
diff --git a/tests/cases/fourslash/jsDocFunctionSignatures3.ts b/tests/cases/fourslash/jsDocFunctionSignatures3.ts
new file mode 100644
index 00000000000..3679035d31d
--- /dev/null
+++ b/tests/cases/fourslash/jsDocFunctionSignatures3.ts
@@ -0,0 +1,32 @@
+///<reference path="fourslash.ts" />
+
+// @allowNonTsExtensions: true
+// @Filename: Foo.js
+
+//// var someObject = {
+////     /**
+////      * @param {string} param1 Some string param.
+////      * @param {number} parm2  Some number param.
+////      */
+////     someMethod: function(param1, param2) {
+////         console.log(param1/*1*/);
+////         return false;
+////     },
+////     /**
+////      * @param {number} p1  Some number param.
+////      */
+////     otherMethod(p1) {
+////         p1/*2*/
+////     }
+////     
+//// };
+
+goTo.marker('1');
+edit.insert('.');
+verify.memberListContains('substr', undefined, undefined, 'method');
+edit.backspace();
+
+goTo.marker('2');
+edit.insert('.');
+verify.memberListContains('toFixed', undefined, undefined, 'method');
+edit.backspace();
diff --git a/tests/cases/fourslash/jsDocFunctionSignatures4.ts b/tests/cases/fourslash/jsDocFunctionSignatures4.ts
new file mode 100644
index 00000000000..e2b443d8d40
--- /dev/null
+++ b/tests/cases/fourslash/jsDocFunctionSignatures4.ts
@@ -0,0 +1,11 @@
+///<reference path="fourslash.ts" />
+
+// @allowNonTsExtensions: true
+// @Filename: Foo.js
+
+//// /** @param {function ({OwnerID:string,AwayID:string}):void} x
+////   * @param {function (string):void} y */
+//// function fn(x, y) { }
+
+verify.numberOfErrorsInCurrentFile(0);
+
diff --git a/tests/cases/fourslash/jsDocGenerics1.ts b/tests/cases/fourslash/jsDocGenerics1.ts
new file mode 100644
index 00000000000..61358e3f490
--- /dev/null
+++ b/tests/cases/fourslash/jsDocGenerics1.ts
@@ -0,0 +1,34 @@
+///<reference path="fourslash.ts" />
+
+// @allowNonTsExtensions: true
+// @Filename: ref.d.ts
+//// namespace Thing {
+////     export interface Thung {
+////         a: number;
+////     ]
+//// ]
+
+
+// @Filename: Foo.js
+////
+//// /** @type {Array<number>} */
+//// var v;
+//// v[0]./*1*/
+////
+//// /** @type {{x: Array<Array<number>>}} */
+//// var w;
+//// w.x[0][0]./*2*/
+////
+//// /** @type {Array<Thing.Thung>} */
+//// var x;
+//// x[0].a./*3*/
+
+
+goTo.marker('1');
+verify.memberListContains("toFixed", /*displayText:*/ undefined, /*documentation*/ undefined, "method");
+
+goTo.marker('2');
+verify.memberListContains("toFixed", /*displayText:*/ undefined, /*documentation*/ undefined, "method");
+
+goTo.marker('3');
+verify.memberListContains("toFixed", /*displayText:*/ undefined, /*documentation*/ undefined, "method");
diff --git a/tests/cases/fourslash/jsxBraceCompletionPosition.ts b/tests/cases/fourslash/jsxBraceCompletionPosition.ts
new file mode 100644
index 00000000000..c1c331435ce
--- /dev/null
+++ b/tests/cases/fourslash/jsxBraceCompletionPosition.ts
@@ -0,0 +1,47 @@
+/// <reference path="fourslash.ts" />
+
+//@Filename: file.tsx
+//// declare var React: any;
+////
+//// var x = <div a="/*2*/" b={/*3*/}>
+//// /*1*/
+//// </div>;
+//// var y = <div>/*4*/</div>
+//// var z = <div>
+////     hello /*5*/
+//// </div>
+//// var z2 = <div> { /*6*/
+//// </div>
+//// var z3 = <div>
+////     {
+//// /*7*/
+//// }
+//// </div>
+
+goTo.marker('1');
+verify.not.isValidBraceCompletionAtPostion('(');
+verify.isValidBraceCompletionAtPostion('{');
+
+goTo.marker('2');
+verify.not.isValidBraceCompletionAtPostion('(');
+verify.not.isValidBraceCompletionAtPostion('{');
+
+goTo.marker('3');
+verify.not.isValidBraceCompletionAtPostion('(');
+verify.isValidBraceCompletionAtPostion('{');
+
+goTo.marker('4');
+verify.not.isValidBraceCompletionAtPostion('(');
+verify.isValidBraceCompletionAtPostion('{');
+
+goTo.marker('5');
+verify.not.isValidBraceCompletionAtPostion('(');
+verify.isValidBraceCompletionAtPostion('{');
+
+goTo.marker('6');
+verify.not.isValidBraceCompletionAtPostion('(');
+verify.isValidBraceCompletionAtPostion('{');
+
+goTo.marker('7');
+verify.not.isValidBraceCompletionAtPostion('(');
+verify.isValidBraceCompletionAtPostion('{');
\ No newline at end of file
diff --git a/tests/cases/fourslash/memberListOfEnumFromExternalModule.ts b/tests/cases/fourslash/memberListOfEnumFromExternalModule.ts
index c93c8292138..42171ff2e8b 100644
--- a/tests/cases/fourslash/memberListOfEnumFromExternalModule.ts
+++ b/tests/cases/fourslash/memberListOfEnumFromExternalModule.ts
@@ -5,7 +5,7 @@
 ////var topic = Topic.One;
 
 // @Filename: memberListOfEnumFromExternalModule_file1.ts
-////import t = require('memberListOfEnumFromExternalModule_file0');
+////import t = require('./memberListOfEnumFromExternalModule_file0');
 ////var topic = t.Topic./*1*/
 
 goTo.file("memberListOfEnumFromExternalModule_file1.ts");
diff --git a/tests/cases/fourslash/memberListOnExplicitThis.ts b/tests/cases/fourslash/memberListOnExplicitThis.ts
new file mode 100644
index 00000000000..b776a7c0641
--- /dev/null
+++ b/tests/cases/fourslash/memberListOnExplicitThis.ts
@@ -0,0 +1,29 @@
+/// <reference path='fourslash.ts'/>
+
+////interface Restricted {
+////   n: number;
+////}
+////class C1 implements Restricted {
+////   n: number;
+////   m: number;
+////   f(this: this) {this./*1*/} // test on 'this.'
+////   g(this: Restricted) {this./*2*/}
+////}
+////function f(this: void) {this./*3*/}
+////function g(this: Restricted) {this./*4*/}
+
+goTo.marker('1');
+verify.memberListContains('f', '(method) C1.f(this: this): void');
+verify.memberListContains('g', '(method) C1.g(this: Restricted): void');
+verify.memberListContains('n', '(property) C1.n: number');
+verify.memberListContains('m', '(property) C1.m: number');
+
+goTo.marker('2');
+verify.memberListContains('n', '(property) Restricted.n: number');
+
+goTo.marker('3');
+verify.memberListIsEmpty();
+
+goTo.marker('4');
+verify.memberListContains('n', '(property) Restricted.n: number');
+
diff --git a/tests/cases/fourslash/mergedDeclarationsWithExportAssignment1.ts b/tests/cases/fourslash/mergedDeclarationsWithExportAssignment1.ts
index 00b9aaf8447..791f519aa28 100644
--- a/tests/cases/fourslash/mergedDeclarationsWithExportAssignment1.ts
+++ b/tests/cases/fourslash/mergedDeclarationsWithExportAssignment1.ts
@@ -11,7 +11,7 @@
 
 // @Filename: mergedDeclarationsWithExportAssignment1_file1.ts
 ///////<reference path='mergedDeclarationsWithExportAssignment1_file0.ts'/>
-////import /*1*/Foo = require('mergedDeclarationsWithExportAssignment1_file0');
+////import /*1*/Foo = require('./mergedDeclarationsWithExportAssignment1_file0');
 ////var /*3*/z = new /*2*/Foo();
 ////var /*5*/r2 = Foo./*4*/x;
 
@@ -19,7 +19,7 @@
 edit.insert('');
 
 goTo.marker('1');
-verify.quickInfoIs("import Foo = require('mergedDeclarationsWithExportAssignment1_file0')");
+verify.quickInfoIs("import Foo = require('./mergedDeclarationsWithExportAssignment1_file0')");
 
 goTo.marker('2');
 verify.completionListContains('Foo');
diff --git a/tests/cases/fourslash/navigationBarItemsInsideMethodsAndConstructors.ts b/tests/cases/fourslash/navigationBarItemsInsideMethodsAndConstructors.ts
new file mode 100644
index 00000000000..4dcca43af35
--- /dev/null
+++ b/tests/cases/fourslash/navigationBarItemsInsideMethodsAndConstructors.ts
@@ -0,0 +1,42 @@
+/// <reference path="fourslash.ts"/>
+
+////class Class {
+////    constructor() {
+////        {| "itemName": "LocalFunctionInConstructor", "kind": "function", "parentName": "Class"|}function LocalFunctionInConstructor() {
+////
+////        }
+////
+////        {| "itemName": "LocalInterfaceInConstrcutor", "kind": "interface", "parentName": "foo"|}interface LocalInterfaceInConstrcutor {
+////        }
+////
+////        enum LocalEnumInConstructor {
+////            {| "itemName": "LocalEnumMemberInConstructor", "kind": "property", "parentName": "LocalEnumInConstructor"|}LocalEnumMemberInConstructor,
+////        }
+////    }
+////
+////    method() {
+////        {| "itemName": "LocalFunctionInMethod", "kind": "function", "parentName": "foo"|}function LocalFunctionInMethod() {
+////            {| "itemName": "LocalFunctionInLocalFunctionInMethod", "kind": "function", "parentName": "bar"|}function LocalFunctionInLocalFunctionInMethod() {
+////
+////            }
+////        }
+////
+////        {| "itemName": "LocalInterfaceInMethod", "kind": "interface", "parentName": "foo"|}interface LocalInterfaceInMethod {
+////        }
+////
+////        enum LocalEnumInMethod {
+////            {| "itemName": "LocalEnumMemberInMethod", "kind": "property", "parentName": "foo"|}LocalEnumMemberInMethod,
+////        }
+////    }
+////
+////    emptyMethod() { // Non child functions method should not be duplicated
+////
+////    }
+////}
+
+test.markers().forEach((marker) => {
+    verify.getScriptLexicalStructureListContains(marker.data.itemName, marker.data.kind, marker.fileName, marker.data.parentName);
+});
+
+// no other items
+verify.getScriptLexicalStructureListCount(17);
diff --git a/tests/cases/fourslash/objectLiteralBindingInParameter.ts b/tests/cases/fourslash/objectLiteralBindingInParameter.ts
new file mode 100644
index 00000000000..b1cbd21d929
--- /dev/null
+++ b/tests/cases/fourslash/objectLiteralBindingInParameter.ts
@@ -0,0 +1,35 @@
+/// <reference path="fourslash.ts"/>
+
+////interface I { x1: number; x2: string }
+////function f(cb: (ev: I) => any) { }
+////f(({/*1*/}) => 0);
+
+////[<I>null].reduce(({/*2*/}, b) => b);
+
+////interface Foo {
+////    m(x: { x1: number, x2: number }): void;
+////    prop: I;
+////}
+////let x: Foo = {
+////    m({ /*3*/ }) {
+////    },
+////    get prop(): I { return undefined; },
+////    set prop({ /*4*/ }) {
+////    }
+////};
+
+goTo.marker("1");
+verify.completionListContains("x1");
+verify.completionListContains("x2");
+
+goTo.marker("2");
+verify.completionListContains("x1");
+verify.completionListContains("x2");
+
+goTo.marker("3");
+verify.completionListContains("x1");
+verify.completionListContains("x2");
+
+goTo.marker("4");
+verify.completionListContains("x1");
+verify.completionListContains("x2");
\ No newline at end of file
diff --git a/tests/cases/fourslash/quickInfoDisplayPartsExternalModuleAlias.ts b/tests/cases/fourslash/quickInfoDisplayPartsExternalModuleAlias.ts
index 77e12476574..36ca4edac8d 100644
--- a/tests/cases/fourslash/quickInfoDisplayPartsExternalModuleAlias.ts
+++ b/tests/cases/fourslash/quickInfoDisplayPartsExternalModuleAlias.ts
@@ -7,9 +7,9 @@
 ////}
 
 // @Filename: quickInfoDisplayPartsExternalModuleAlias_file1.ts
-////import /*1*/a1 = require(/*mod1*/"quickInfoDisplayPartsExternalModuleAlias_file0");
+////import /*1*/a1 = require(/*mod1*/"./quickInfoDisplayPartsExternalModuleAlias_file0");
 ////new /*2*/a1.m1.c();
-////export import /*3*/a2 = require(/*mod2*/"quickInfoDisplayPartsExternalModuleAlias_file0");
+////export import /*3*/a2 = require(/*mod2*/"./quickInfoDisplayPartsExternalModuleAlias_file0");
 ////new /*4*/a2.m1.c();
 
 var marker = 0;
@@ -24,7 +24,7 @@ function verifyImport(name: string, isExported: boolean) {
         [{ text: "import", kind: "keyword" }, { text: " ", kind: "space" }, { text: name, kind: "aliasName" },
             { text: " ", kind: "space" }, { text: "=", kind: "operator" }, { text: " ", kind: "space" },
             { text: "require", kind: "keyword" }, { text: "(", kind: "punctuation" },
-            { text: "\"quickInfoDisplayPartsExternalModuleAlias_file0\"", kind: "stringLiteral" },
+            { text: "\"./quickInfoDisplayPartsExternalModuleAlias_file0\"", kind: "stringLiteral" },
             { text: ")", kind: "punctuation" }],
         []);
 }
@@ -35,7 +35,7 @@ verifyImport("a2", /*isExported*/true);
 
 function verifyExternalModuleStringLiteral(marker: string) {
     goTo.marker(marker);
-    verify.verifyQuickInfoDisplayParts("module", "", { start: test.markerByName(marker).position, length: "\"quickInfoDisplayPartsExternalModuleAlias_file0\"".length },
+    verify.verifyQuickInfoDisplayParts("module", "", { start: test.markerByName(marker).position, length: "\"./quickInfoDisplayPartsExternalModuleAlias_file0\"".length },
         [{ text: "module", kind: "keyword" }, { text: " ", kind: "space" }, { text: "a1", kind: "aliasName" }],
         []);
 }
diff --git a/tests/cases/fourslash/quickInfoExportAssignmentOfGenericInterface.ts b/tests/cases/fourslash/quickInfoExportAssignmentOfGenericInterface.ts
index bf77d12669f..e0b67a9f47d 100644
--- a/tests/cases/fourslash/quickInfoExportAssignmentOfGenericInterface.ts
+++ b/tests/cases/fourslash/quickInfoExportAssignmentOfGenericInterface.ts
@@ -7,7 +7,7 @@
 ////export = Foo;
 
 // @Filename: quickInfoExportAssignmentOfGenericInterface_1.ts
-////import a = require('quickInfoExportAssignmentOfGenericInterface_0');
+////import a = require('./quickInfoExportAssignmentOfGenericInterface_0');
 ////export var /*1*/x: a<a<string>>;
 ////x.a;
 
diff --git a/tests/cases/fourslash/quickInfoForRequire.ts b/tests/cases/fourslash/quickInfoForRequire.ts
index 91d59cb4318..8e714c08736 100644
--- a/tests/cases/fourslash/quickInfoForRequire.ts
+++ b/tests/cases/fourslash/quickInfoForRequire.ts
@@ -4,7 +4,7 @@
 ////export class a{}
 
 //@Filename: quickInfoForRequire_input.ts
-////import a = require("AA/B/*1*/B");
+////import a = require("./AA/B/*1*/B");
 
 goTo.marker('1');
 verify.quickInfoIs('module a');
diff --git a/tests/cases/fourslash/quickInfoOnPrivateConstructorCall.ts b/tests/cases/fourslash/quickInfoOnPrivateConstructorCall.ts
new file mode 100644
index 00000000000..5ebdcd815b2
--- /dev/null
+++ b/tests/cases/fourslash/quickInfoOnPrivateConstructorCall.ts
@@ -0,0 +1,9 @@
+/// <reference path='fourslash.ts' />
+
+////class A {
+////    private constructor() {}
+////}
+////var x = new A(/*1*/
+
+goTo.marker("1");
+verify.not.signatureHelpPresent();
\ No newline at end of file
diff --git a/tests/cases/fourslash/quickInfoOnProtectedConstructorCall.ts b/tests/cases/fourslash/quickInfoOnProtectedConstructorCall.ts
new file mode 100644
index 00000000000..094a07f3d51
--- /dev/null
+++ b/tests/cases/fourslash/quickInfoOnProtectedConstructorCall.ts
@@ -0,0 +1,9 @@
+/// <reference path='fourslash.ts' />
+
+////class A {
+////    protected constructor() {}
+////}
+////var x = new A(/*1*/
+
+goTo.marker("1");
+verify.not.signatureHelpPresent();
\ No newline at end of file
diff --git a/tests/cases/fourslash/quickInfoOnThis.ts b/tests/cases/fourslash/quickInfoOnThis.ts
index c4eecfca5d5..91083d41e6b 100644
--- a/tests/cases/fourslash/quickInfoOnThis.ts
+++ b/tests/cases/fourslash/quickInfoOnThis.ts
@@ -1,15 +1,95 @@
 /// <reference path='fourslash.ts' />
-
-////function someFn1(someFn: { (): void; }) { }
+////interface Restricted {
+////    n: number;
+////}
+////function wrapper(wrapped: { (): void; }) { }
 ////class Foo {
-////    public bar() {
-////        someFn1(
-////            function doSomething() {
-////                console.log(th/**/is);
+////    n: number;
+////    public explicitThis(this: this) {
+////        wrapper(
+////            function explicitVoid(this: void) {
+////                console.log(th/*1*/is);
 ////            }
 ////        )
+////        console.log(th/*2*/is);
+////    }
+////    public explicitInterface(th/*3*/is: Restricted) {
+////        console.log(th/*4*/is);
+////    }
+////    public explicitClass(th/*5*/is: Foo) {
+////        console.log(th/*6*/is);
 ////    }
 ////}
+////class Bar<T> {
+////    public explicitThis(this: this) {
+////        console.log(th/*7*/is);
+////    }
+////    public explicitClass(this: Bar<T>) {
+////        console.log(thi/*8*/s);
+////    }
+////}
+////
+////function implicitAny(x: number): void {
+////    return th/*9*/is;
+////}
+////function explicitVoid(th/*10*/is: void, x: number): void {
+////    return th/*11*/is;
+////}
+////function explicitInterface(th/*12*/is: Restricted): void {
+////    console.log(thi/*13*/s);
+////}
+////function explicitLiteral(th/*14*/is: { n: number }): void {
+////    console.log(th/*15*/is);
+////}
+////
+////interface ContextualInterface {
+////    m: number;
+////    method(this: this, n: number);
+////}
+////let o: ContextualInterface = {
+////    m: 12,
+////    method(n) {
+////        let x = this/*16*/.m;
+////    }
+////}
+////interface ContextualInterface2 {
+////    (this: void, n: number): void;
+////}
+////let contextualInterface2: ContextualInterface2 = function (th/*17*/is, n) { }
 
-goTo.marker();
+goTo.marker('1');
+verify.quickInfoIs('void');
+goTo.marker('2');
+verify.quickInfoIs('this: this');
+goTo.marker('3');
+verify.quickInfoIs('(parameter) this: Restricted');
+goTo.marker('4');
+verify.quickInfoIs('this: Restricted');
+goTo.marker('5');
+verify.quickInfoIs('(parameter) this: Foo');
+goTo.marker('6');
+verify.quickInfoIs('this: Foo');
+goTo.marker('7');
+verify.quickInfoIs('this: this');
+goTo.marker('8');
+verify.quickInfoIs('this: Bar<T>');
+goTo.marker('9');
 verify.quickInfoIs('any');
+goTo.marker('10');
+verify.quickInfoIs('(parameter) this: void');
+goTo.marker('11');
+verify.quickInfoIs('void');
+goTo.marker('12');
+verify.quickInfoIs('(parameter) this: Restricted');
+goTo.marker('13');
+verify.quickInfoIs('this: Restricted');
+goTo.marker('14');
+
+verify.quickInfoIs('(parameter) this: {\n    n: number;\n}');
+goTo.marker('15');
+verify.quickInfoIs('this: {\n    n: number;\n}');
+
+goTo.marker('16');
+verify.quickInfoIs('this: ContextualInterface');
+goTo.marker('17');
+verify.quickInfoIs('(parameter) this: void');
diff --git a/tests/cases/fourslash/renameDefaultImport.ts b/tests/cases/fourslash/renameDefaultImport.ts
new file mode 100644
index 00000000000..fd9534e65f7
--- /dev/null
+++ b/tests/cases/fourslash/renameDefaultImport.ts
@@ -0,0 +1,19 @@
+/// <reference path='fourslash.ts' />
+
+// @Filename: B.ts
+////export default class [|B|] {
+////    test() {
+////    }
+////}
+
+// @Filename: A.ts
+////import [|B|] from "./B";
+////let b = new [|B|]();
+////b.test();
+
+let ranges = test.ranges()
+for (let range of ranges) {
+    goTo.file(range.fileName);
+    goTo.position(range.start);
+    verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
+}
diff --git a/tests/cases/fourslash/renameDefaultImportDifferentName.ts b/tests/cases/fourslash/renameDefaultImportDifferentName.ts
new file mode 100644
index 00000000000..5965f1a63e9
--- /dev/null
+++ b/tests/cases/fourslash/renameDefaultImportDifferentName.ts
@@ -0,0 +1,23 @@
+/// <reference path='fourslash.ts' />
+
+// @Filename: B.ts
+////export default class /*1*/C {
+////    test() {
+////    }
+////}
+
+// @Filename: A.ts
+////import [|B|] from "./B";
+////let b = new [|B|]();
+////b.test();
+
+goTo.file("B.ts");
+goTo.marker("1");
+verify.occurrencesAtPositionCount(1);
+
+goTo.file("A.ts");
+let ranges = test.ranges()
+for (let range of ranges) {
+    goTo.position(range.start);
+    verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
+}
diff --git a/tests/cases/fourslash/renameDestructuringAssignment.ts b/tests/cases/fourslash/renameDestructuringAssignment.ts
new file mode 100644
index 00000000000..b7b18f661d2
--- /dev/null
+++ b/tests/cases/fourslash/renameDestructuringAssignment.ts
@@ -0,0 +1,14 @@
+/// <reference path='fourslash.ts' />
+
+////interface I {
+////    [|x|]: number;
+////}
+////var a: I;
+////var x;
+////({ [|x|]: x } = a);
+
+let ranges = test.ranges()
+for (let range of ranges) {
+    goTo.position(range.start);
+    verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
+}
diff --git a/tests/cases/fourslash/renameDestructuringAssignmentInFor.ts b/tests/cases/fourslash/renameDestructuringAssignmentInFor.ts
new file mode 100644
index 00000000000..6be57b81fa2
--- /dev/null
+++ b/tests/cases/fourslash/renameDestructuringAssignmentInFor.ts
@@ -0,0 +1,20 @@
+/// <reference path='fourslash.ts' />
+
+////interface I {
+////    /*1*/[|property1|]: number;
+////    property2: string;
+////}
+////var elems: I[];
+////
+////var p2: number, property1: number;
+////for ({ [|property1|] } = elems[0]; p2 < 100; p2++) {
+////   p2 = property1++;
+////}
+////for ({ /*2*/[|property1|]: p2 } = elems[0]; p2 < 100; p2++) {
+////}
+
+goTo.marker("1");
+verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
+
+goTo.marker("2");
+verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
diff --git a/tests/cases/fourslash/renameDestructuringAssignmentInFor2.ts b/tests/cases/fourslash/renameDestructuringAssignmentInFor2.ts
new file mode 100644
index 00000000000..ca75e42394b
--- /dev/null
+++ b/tests/cases/fourslash/renameDestructuringAssignmentInFor2.ts
@@ -0,0 +1,20 @@
+/// <reference path='fourslash.ts' />
+
+////interface I {
+////    property1: number;
+////    property2: string;
+////}
+////var elems: I[];
+////
+////var p2: number, [|property1|]: number;
+////for ({ [|property1|] } = elems[0]; p2 < 100; p2++) {
+////   p2 = [|property1|]++;
+////}
+////for ({ property1: p2 } = elems[0]; p2 < 100; p2++) {
+////}
+
+let ranges = test.ranges()
+for (let range of ranges) {
+    goTo.position(range.start);
+    verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
+}
diff --git a/tests/cases/fourslash/renameDestructuringAssignmentInForOf.ts b/tests/cases/fourslash/renameDestructuringAssignmentInForOf.ts
new file mode 100644
index 00000000000..d965875d259
--- /dev/null
+++ b/tests/cases/fourslash/renameDestructuringAssignmentInForOf.ts
@@ -0,0 +1,20 @@
+/// <reference path='fourslash.ts' />
+
+////interface I {
+////    /*1*/[|property1|]: number;
+////    property2: string;
+////}
+////var elems: I[];
+////
+////var property1: number, p2: number;
+////for ({ [|property1|] } of elems) {
+////    property1++;
+////}
+////for ({ /*2*/[|property1|]: p2 } of elems) {
+////}
+
+goTo.marker("1");
+verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
+
+goTo.marker("2");
+verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
\ No newline at end of file
diff --git a/tests/cases/fourslash/renameDestructuringAssignmentInForOf2.ts b/tests/cases/fourslash/renameDestructuringAssignmentInForOf2.ts
new file mode 100644
index 00000000000..401b6776d2e
--- /dev/null
+++ b/tests/cases/fourslash/renameDestructuringAssignmentInForOf2.ts
@@ -0,0 +1,20 @@
+/// <reference path='fourslash.ts' />
+
+////interface I {
+////    property1: number;
+////    property2: string;
+////}
+////var elems: I[];
+////
+////var [|property1|]: number, p2: number;
+////for ({ [|property1|] } of elems) {
+////    [|property1|]++;
+////}
+////for ({ property1: p2 } of elems) {
+////}
+
+let ranges = test.ranges()
+for (let range of ranges) {
+    goTo.position(range.start);
+    verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
+}
diff --git a/tests/cases/fourslash/renameDestructuringAssignmentNestedInArrayLiteral.ts b/tests/cases/fourslash/renameDestructuringAssignmentNestedInArrayLiteral.ts
new file mode 100644
index 00000000000..9d5d2a041e5
--- /dev/null
+++ b/tests/cases/fourslash/renameDestructuringAssignmentNestedInArrayLiteral.ts
@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts' />
+
+////interface I {
+////    /*1*/[|property1|]: number;
+////    property2: string;
+////}
+////var elems: I[], p1: number, property1: number;
+////[{ /*2*/[|property1|]: p1 }] = elems;
+////[{ [|property1|] }] = elems;
+
+goTo.marker("1");
+verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
+
+goTo.marker("2");
+verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
diff --git a/tests/cases/fourslash/renameDestructuringAssignmentNestedInArrayLiteral2.ts b/tests/cases/fourslash/renameDestructuringAssignmentNestedInArrayLiteral2.ts
new file mode 100644
index 00000000000..c4db2de512f
--- /dev/null
+++ b/tests/cases/fourslash/renameDestructuringAssignmentNestedInArrayLiteral2.ts
@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts' />
+
+////interface I {
+////    property1: number;
+////    property2: string;
+////}
+////var elems: I[], p1: number, [|property1|]: number;
+////[{ property1: p1 }] = elems;
+////[{ [|property1|] }] = elems;
+
+let ranges = test.ranges()
+for (let range of ranges) {
+    goTo.position(range.start);
+    verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
+}
diff --git a/tests/cases/fourslash/renameDestructuringAssignmentNestedInFor.ts b/tests/cases/fourslash/renameDestructuringAssignmentNestedInFor.ts
new file mode 100644
index 00000000000..e603c82dbd7
--- /dev/null
+++ b/tests/cases/fourslash/renameDestructuringAssignmentNestedInFor.ts
@@ -0,0 +1,22 @@
+/// <reference path='fourslash.ts' />
+
+////interface MultiRobot {
+////    name: string;
+////    skills: {
+////        /*1*/[|primary|]: string;
+////        secondary: string;
+////    };
+////}
+////let multiRobot: MultiRobot;
+////for ({ skills: { /*2*/[|primary|]: primaryA, secondary: secondaryA } } = multiRobot, i = 0; i < 1; i++) {
+////    console.log(primaryA);
+////}
+////for ({ skills: { [|primary|], secondary } } = multiRobot, i = 0; i < 1; i++) {
+////    console.log(primary);
+////}
+
+goTo.marker("1");
+verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
+
+goTo.marker("2");
+verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
diff --git a/tests/cases/fourslash/renameDestructuringAssignmentNestedInFor2.ts b/tests/cases/fourslash/renameDestructuringAssignmentNestedInFor2.ts
new file mode 100644
index 00000000000..89dc899c5bf
--- /dev/null
+++ b/tests/cases/fourslash/renameDestructuringAssignmentNestedInFor2.ts
@@ -0,0 +1,23 @@
+/// <reference path='fourslash.ts' />
+
+////interface MultiRobot {
+////    name: string;
+////    skills: {
+////        primary: string;
+////        secondary: string;
+////    };
+////}
+////let multiRobot: MultiRobot, [|primary|]: string;
+////for ({ skills: { primary: primaryA, secondary: secondaryA } } = multiRobot, i = 0; i < 1; i++) {
+////    console.log(primaryA);
+////}
+////for ({ skills: { [|primary|], secondary } } = multiRobot, i = 0; i < 1; i++) {
+////    console.log([|primary|]);
+////}
+
+let ranges = test.ranges()
+for (let range of ranges) {
+    goTo.position(range.start);
+    verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
+}
+
diff --git a/tests/cases/fourslash/renameDestructuringAssignmentNestedInForOf.ts b/tests/cases/fourslash/renameDestructuringAssignmentNestedInForOf.ts
new file mode 100644
index 00000000000..bef88d201d4
--- /dev/null
+++ b/tests/cases/fourslash/renameDestructuringAssignmentNestedInForOf.ts
@@ -0,0 +1,22 @@
+/// <reference path='fourslash.ts' />
+
+////interface MultiRobot {
+////    name: string;
+////    skills: {
+////        /*1*/[|primary|]: string;
+////        secondary: string;
+////    };
+////}
+////let multiRobots: MultiRobot[];
+////for ({ skills: { /*2*/[|primary|]: primaryA, secondary: secondaryA } } of multiRobots) {
+////    console.log(primaryA);
+////}
+////for ({ skills: { [|primary|], secondary } } of multiRobots) {
+////    console.log(primary);
+////}
+
+goTo.marker("1");
+verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
+
+goTo.marker("2");
+verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
diff --git a/tests/cases/fourslash/renameDestructuringAssignmentNestedInForOf2.ts b/tests/cases/fourslash/renameDestructuringAssignmentNestedInForOf2.ts
new file mode 100644
index 00000000000..b684e6b6a81
--- /dev/null
+++ b/tests/cases/fourslash/renameDestructuringAssignmentNestedInForOf2.ts
@@ -0,0 +1,23 @@
+/// <reference path='fourslash.ts' />
+
+////interface MultiRobot {
+////    name: string;
+////    skills: {
+////        primary: string;
+////        secondary: string;
+////    };
+////}
+////let multiRobots: MultiRobot[], [|primary|]: string;
+////for ({ skills: { primary: primaryA, secondary: secondaryA } } of multiRobots) {
+////    console.log(primaryA);
+////}
+////for ({ skills: { [|primary|], secondary } } of multiRobots) {
+////    console.log([|primary|]);
+////}
+
+
+let ranges = test.ranges()
+for (let range of ranges) {
+    goTo.position(range.start);
+    verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
+}
diff --git a/tests/cases/fourslash/renameDestructuringClassProperty.ts b/tests/cases/fourslash/renameDestructuringClassProperty.ts
new file mode 100644
index 00000000000..acc58f999c4
--- /dev/null
+++ b/tests/cases/fourslash/renameDestructuringClassProperty.ts
@@ -0,0 +1,23 @@
+/// <reference path='fourslash.ts' />
+
+////class A {
+////    [|foo|]: string;
+////}
+////class B {
+////    syntax1(a: A): void {
+////        let { [|foo|] } = a;
+////    }
+////    syntax2(a: A): void {
+////        let { [|foo|]: foo } = a;
+////    }
+////    syntax11(a: A): void {
+////        let { [|foo|] } = a;
+////        [|foo|] = "newString";
+////    }
+////}
+
+let ranges = test.ranges()
+for (let range of ranges) {
+    goTo.position(range.start);
+    verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
+}
diff --git a/tests/cases/fourslash/renameDestructuringDeclarationInFor.ts b/tests/cases/fourslash/renameDestructuringDeclarationInFor.ts
new file mode 100644
index 00000000000..0edf9085092
--- /dev/null
+++ b/tests/cases/fourslash/renameDestructuringDeclarationInFor.ts
@@ -0,0 +1,20 @@
+/// <reference path='fourslash.ts' />
+
+////interface I {
+////    [|property1|]: number;
+////    property2: string;
+////}
+////var elems: I[];
+////
+////var p2: number, property1: number;
+////for (let { [|property1|]: p2 } = elems[0]; p2 < 100; p2++) {
+////}
+////for (let { [|property1|] } = elems[0]; p2 < 100; p2++) {
+////    [|property1|] = p2;
+////}
+
+let ranges = test.ranges()
+for (let range of ranges) {
+    goTo.position(range.start);
+    verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
+}
diff --git a/tests/cases/fourslash/renameDestructuringDeclarationInForOf.ts b/tests/cases/fourslash/renameDestructuringDeclarationInForOf.ts
new file mode 100644
index 00000000000..1c2b04b7ab5
--- /dev/null
+++ b/tests/cases/fourslash/renameDestructuringDeclarationInForOf.ts
@@ -0,0 +1,19 @@
+/// <reference path='fourslash.ts' />
+
+////interface I {
+////    [|property1|]: number;
+////    property2: string;
+////}
+////var elems: I[];
+////
+////for (let { [|property1|] } of elems) {
+////    [|property1|]++;
+////}
+////for (let { [|property1|]: p2 } of elems) {
+////}
+
+let ranges = test.ranges()
+for (let range of ranges) {
+    goTo.position(range.start);
+    verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
+}
diff --git a/tests/cases/fourslash/renameDestructuringFunctionParameter.ts b/tests/cases/fourslash/renameDestructuringFunctionParameter.ts
new file mode 100644
index 00000000000..d1df0f58275
--- /dev/null
+++ b/tests/cases/fourslash/renameDestructuringFunctionParameter.ts
@@ -0,0 +1,10 @@
+/// <reference path='fourslash.ts' />
+
+////function f({[|a|]}: {[|a|]}) {
+////    f({[|a|]});
+////}
+let ranges = test.ranges();
+for (let range of ranges) {
+    goTo.position(range.start);
+    verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
+}
diff --git a/tests/cases/fourslash/renameDestructuringNestedBindingElement.ts b/tests/cases/fourslash/renameDestructuringNestedBindingElement.ts
new file mode 100644
index 00000000000..1c4254b14ae
--- /dev/null
+++ b/tests/cases/fourslash/renameDestructuringNestedBindingElement.ts
@@ -0,0 +1,22 @@
+/// <reference path='fourslash.ts' />
+
+////interface MultiRobot {
+////    name: string;
+////    skills: {
+////        [|primary|]: string;
+////        secondary: string;
+////    };
+////}
+////let multiRobots: MultiRobot[];
+////for (let { skills: {[|primary|]: primaryA, secondary: secondaryA } } of multiRobots) {
+////    console.log(primaryA);
+////}
+////for (let { skills: {[|primary|], secondary } } of multiRobots) {
+////    console.log([|primary|]);
+////}
+
+let ranges = test.ranges()
+for (let range of ranges) {
+    goTo.position(range.start);
+    verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
+}
diff --git a/tests/cases/fourslash/renameImportAndExportInDiffFiles.ts b/tests/cases/fourslash/renameImportAndExportInDiffFiles.ts
new file mode 100644
index 00000000000..7b098721196
--- /dev/null
+++ b/tests/cases/fourslash/renameImportAndExportInDiffFiles.ts
@@ -0,0 +1,18 @@
+/// <reference path='fourslash.ts' />
+
+// @Filename: a.ts
+////export var /*1*/a;
+
+// @Filename: b.ts
+////import { /*2*/a } from './a';
+////export { /*3*/a };
+
+goTo.file("a.ts");
+goTo.marker("1");
+
+goTo.file("b.ts");
+goTo.marker("2");
+verify.referencesCountIs(3);
+
+goTo.marker("3");
+verify.referencesCountIs(3);
\ No newline at end of file
diff --git a/tests/cases/fourslash/selfReferencedExternalModule.ts b/tests/cases/fourslash/selfReferencedExternalModule.ts
index 39d785ffb0d..3c96c320784 100644
--- a/tests/cases/fourslash/selfReferencedExternalModule.ts
+++ b/tests/cases/fourslash/selfReferencedExternalModule.ts
@@ -1,9 +1,9 @@
 /// <reference path='fourslash.ts' />
 // @Filename: app.ts
-////export import A = require('app');
+////export import A = require('./app');
 ////export var I = 1;
 ////A./**/I
 
 goTo.marker();
-verify.completionListContains("A", "import A = require('app')");
+verify.completionListContains("A", "import A = require('./app')");
 verify.completionListContains("I", "var I: number");
diff --git a/tests/cases/fourslash/selfReferencedExternalModule2.ts b/tests/cases/fourslash/selfReferencedExternalModule2.ts
index ab1f7a6c901..698cfdde11f 100644
--- a/tests/cases/fourslash/selfReferencedExternalModule2.ts
+++ b/tests/cases/fourslash/selfReferencedExternalModule2.ts
@@ -1,12 +1,12 @@
 /// <reference path='fourslash.ts' />
 // @Filename: app.ts
-////export import A = require('app2');
+////export import A = require('./app2');
 ////export var I = 1;
 ////A./*1*/Y;
 ////A.B.A.B./*2*/I;
 
 // @Filename: app2.ts
-////export import B = require('app');
+////export import B = require('./app');
 ////export var Y = 1;
 
 goTo.marker("1");
diff --git a/tests/cases/fourslash/server/definition01.ts b/tests/cases/fourslash/server/definition01.ts
index 8bf6e73c840..c0c297f89e5 100644
--- a/tests/cases/fourslash/server/definition01.ts
+++ b/tests/cases/fourslash/server/definition01.ts
@@ -1,7 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
 // @Filename: b.ts
-////import n = require('a/*1*/');
+////import n = require('./a/*1*/');
 ////var x = new n.Foo();
 
 // @Filename: a.ts
diff --git a/tests/cases/fourslash/server/projectInfo01.ts b/tests/cases/fourslash/server/projectInfo01.ts
index 656647715f0..0d8707bf8a1 100644
--- a/tests/cases/fourslash/server/projectInfo01.ts
+++ b/tests/cases/fourslash/server/projectInfo01.ts
@@ -4,7 +4,7 @@
 ////export var test = "test String"
 
 // @Filename: b.ts
-////import test from "a"
+////import test from "./a"
 
 // @Filename: c.ts
 /////// <reference path="a.ts"/>
diff --git a/tests/cases/fourslash/server/typedefinition01.ts b/tests/cases/fourslash/server/typedefinition01.ts
index e7c37747aba..bde9f4dc4d8 100644
--- a/tests/cases/fourslash/server/typedefinition01.ts
+++ b/tests/cases/fourslash/server/typedefinition01.ts
@@ -1,7 +1,7 @@
 /// <reference path="../fourslash.ts"/>
 
 // @Filename: b.ts
-////import n = require('a');
+////import n = require('./a');
 ////var x/*1*/ = new n.Foo();
 
 // @Filename: a.ts
diff --git a/tests/cases/fourslash/shims-pp/getPreProcessedFile.ts b/tests/cases/fourslash/shims-pp/getPreProcessedFile.ts
index aa0ff4c0669..03ce481c8ba 100644
--- a/tests/cases/fourslash/shims-pp/getPreProcessedFile.ts
+++ b/tests/cases/fourslash/shims-pp/getPreProcessedFile.ts
@@ -1,4 +1,5 @@
 /// <reference path="fourslash.ts" />
+// @ModuleResolution: classic
 
 // @Filename: refFile1.ts
 //// class D { }
diff --git a/tests/cases/fourslash/shims-pp/getReferencesAtPosition.ts b/tests/cases/fourslash/shims-pp/getReferencesAtPosition.ts
index 34144b74899..a25a6e1285f 100644
--- a/tests/cases/fourslash/shims-pp/getReferencesAtPosition.ts
+++ b/tests/cases/fourslash/shims-pp/getReferencesAtPosition.ts
@@ -17,7 +17,7 @@
 ////}
 
 //@Filename: findAllRefsOnDefinition.ts
-////import Second = require("findAllRefsOnDefinition-import");
+////import Second = require("./findAllRefsOnDefinition-import");
 ////
 ////var second = new Second.Test()
 ////second.start();
diff --git a/tests/cases/fourslash/shims-pp/goToDefinitionTypeReferenceDirective.ts b/tests/cases/fourslash/shims-pp/goToDefinitionTypeReferenceDirective.ts
new file mode 100644
index 00000000000..3aaa3ab980f
--- /dev/null
+++ b/tests/cases/fourslash/shims-pp/goToDefinitionTypeReferenceDirective.ts
@@ -0,0 +1,13 @@
+/// <reference path="fourslash.ts"/>
+
+// @typesRoot: src
+// @Filename: src/types/lib/index.d.ts
+/////*0*/declare let $: {x: number};
+
+// @Filename: src/app.ts
+//// /// <reference types="lib/*1*/"/>
+//// $.x;
+
+goTo.marker("1");
+goTo.definition();
+verify.caretAtMarker("0");
\ No newline at end of file
diff --git a/tests/cases/fourslash/shims/getPreProcessedFile.ts b/tests/cases/fourslash/shims/getPreProcessedFile.ts
index aa0ff4c0669..03ce481c8ba 100644
--- a/tests/cases/fourslash/shims/getPreProcessedFile.ts
+++ b/tests/cases/fourslash/shims/getPreProcessedFile.ts
@@ -1,4 +1,5 @@
 /// <reference path="fourslash.ts" />
+// @ModuleResolution: classic
 
 // @Filename: refFile1.ts
 //// class D { }
diff --git a/tests/cases/fourslash/shims/getReferencesAtPosition.ts b/tests/cases/fourslash/shims/getReferencesAtPosition.ts
index 34144b74899..a25a6e1285f 100644
--- a/tests/cases/fourslash/shims/getReferencesAtPosition.ts
+++ b/tests/cases/fourslash/shims/getReferencesAtPosition.ts
@@ -17,7 +17,7 @@
 ////}
 
 //@Filename: findAllRefsOnDefinition.ts
-////import Second = require("findAllRefsOnDefinition-import");
+////import Second = require("./findAllRefsOnDefinition-import");
 ////
 ////var second = new Second.Test()
 ////second.start();
diff --git a/tests/cases/fourslash/shims/goToDefinitionTypeReferenceDirective.ts b/tests/cases/fourslash/shims/goToDefinitionTypeReferenceDirective.ts
new file mode 100644
index 00000000000..3aaa3ab980f
--- /dev/null
+++ b/tests/cases/fourslash/shims/goToDefinitionTypeReferenceDirective.ts
@@ -0,0 +1,13 @@
+/// <reference path="fourslash.ts"/>
+
+// @typesRoot: src
+// @Filename: src/types/lib/index.d.ts
+/////*0*/declare let $: {x: number};
+
+// @Filename: src/app.ts
+//// /// <reference types="lib/*1*/"/>
+//// $.x;
+
+goTo.marker("1");
+goTo.definition();
+verify.caretAtMarker("0");
\ No newline at end of file
diff --git a/tests/cases/fourslash/signatureHelpThis.ts b/tests/cases/fourslash/signatureHelpThis.ts
new file mode 100644
index 00000000000..2ac19c823c0
--- /dev/null
+++ b/tests/cases/fourslash/signatureHelpThis.ts
@@ -0,0 +1,43 @@
+/// <reference path='fourslash.ts' />
+////class Foo<T> {
+////    public implicitAny(n: number) {
+////    }
+////    public explicitThis(this: this, n: number) {
+////        console.log(this);
+////    }
+////    public explicitClass(this: Foo<T>, n: number) {
+////        console.log(this);
+////    }
+////}
+////
+////function implicitAny(x: number): void {
+////    return this;
+////}
+////function explicitVoid(this: void, x: number): void {
+////    return this;
+////}
+////function explicitLiteral(this: { n: number }, x: number): void {
+////    console.log(this);
+////}
+////let foo = new Foo<number>();
+////foo.implicitAny(/*1*/);
+////foo.explicitThis(/*2*/);
+////foo.explicitClass(/*3*/);
+////implicitAny(/*4*/12);
+////explicitVoid(/*5*/13);
+////let o = { n: 14, m: explicitLiteral };
+////o.m(/*6*/);
+
+
+goTo.marker('1');
+verify.currentParameterHelpArgumentNameIs("n");
+goTo.marker('2');
+verify.currentParameterHelpArgumentNameIs("n");
+goTo.marker('3');
+verify.currentParameterHelpArgumentNameIs("n");
+goTo.marker('4');
+verify.currentParameterHelpArgumentNameIs("x");
+goTo.marker('5');
+verify.currentParameterHelpArgumentNameIs("x");
+goTo.marker('6');
+verify.currentParameterHelpArgumentNameIs("x");
diff --git a/tests/cases/fourslash/stringBraceCompletionPosition.ts b/tests/cases/fourslash/stringBraceCompletionPosition.ts
new file mode 100644
index 00000000000..09a9a86b0f1
--- /dev/null
+++ b/tests/cases/fourslash/stringBraceCompletionPosition.ts
@@ -0,0 +1,16 @@
+/// <reference path="fourslash.ts" />
+
+//// var x = "/*1*/";
+//// var x = '/*2*/';
+//// var x = "hello \
+////     /*3*/";
+
+goTo.marker('1');
+verify.not.isValidBraceCompletionAtPostion('(');
+
+goTo.marker('2');
+verify.not.isValidBraceCompletionAtPostion('(');
+
+goTo.marker('3');
+verify.not.isValidBraceCompletionAtPostion('(');
+
diff --git a/tests/cases/fourslash/stringTemplateBraceCompletionPosition.ts b/tests/cases/fourslash/stringTemplateBraceCompletionPosition.ts
new file mode 100644
index 00000000000..33bcd4d0625
--- /dev/null
+++ b/tests/cases/fourslash/stringTemplateBraceCompletionPosition.ts
@@ -0,0 +1,16 @@
+/// <reference path="fourslash.ts" />
+
+//// var x = `/*1*/`;
+//// var y = `hello /*2*/world, ${100}how /*3*/are you{ 200 } to/*4*/day!?`
+
+goTo.marker('1');
+verify.not.isValidBraceCompletionAtPostion('(');
+
+goTo.marker('2');
+verify.not.isValidBraceCompletionAtPostion('(');
+
+goTo.marker('3');
+verify.not.isValidBraceCompletionAtPostion('(');
+
+goTo.marker('4');
+verify.not.isValidBraceCompletionAtPostion('(');
diff --git a/tests/cases/fourslash/superInsideInnerClass.ts b/tests/cases/fourslash/superInsideInnerClass.ts
new file mode 100644
index 00000000000..3b85179b0d8
--- /dev/null
+++ b/tests/cases/fourslash/superInsideInnerClass.ts
@@ -0,0 +1,15 @@
+/// <reference path="fourslash.ts" />
+////class Base {
+////	constructor(n: number) {
+////	}
+////}
+////class Derived extends Base {
+////	constructor() {
+////		class Nested {
+////			[super(/*1*/)] = 11111
+////		}
+////	}
+////}
+
+goTo.marker('1');
+verify.signatureHelpCountIs(0);
diff --git a/tests/cases/fourslash/thisBindingInLambda.ts b/tests/cases/fourslash/thisBindingInLambda.ts
index f6dfdbdec08..d9c43796bd8 100644
--- a/tests/cases/fourslash/thisBindingInLambda.ts
+++ b/tests/cases/fourslash/thisBindingInLambda.ts
@@ -9,4 +9,4 @@
 ////}
 
 goTo.marker();
-verify.quickInfoIs('class Greeter');
+verify.quickInfoIs('this: this');
diff --git a/tests/cases/fourslash/thisPredicateFunctionCompletions01.ts b/tests/cases/fourslash/thisPredicateFunctionCompletions01.ts
new file mode 100644
index 00000000000..8c9abb85418
--- /dev/null
+++ b/tests/cases/fourslash/thisPredicateFunctionCompletions01.ts
@@ -0,0 +1,52 @@
+/// <reference path="fourslash.ts" />
+
+//// class FileSystemObject {
+////     isFile(): this is Item {
+////         return this instanceof Item;
+////     }
+////     isDirectory(): this is Directory {
+////         return this instanceof Directory;
+////     }
+////     isNetworked(): this is (Networked & this) {
+////        return !!(this as Networked).host;
+////     }
+////     constructor(public path: string) {}
+//// }
+////
+//// class Item extends FileSystemObject {
+////     constructor(path: string, public content: string) { super(path); }
+//// }
+//// class Directory extends FileSystemObject {
+////     children: FileSystemObject[];
+//// }
+//// interface Networked {
+////     host: string;
+//// }
+////
+//// const obj: FileSystemObject = new Item("/foo", "");
+//// if (obj.isFile()) {
+////     obj./*1*/;
+////     if (obj.isNetworked()) {
+////         obj./*2*/;
+////     }
+//// }
+//// if (obj.isDirectory()) {
+////     obj./*3*/;
+////     if (obj.isNetworked()) {
+////         obj./*4*/;
+////     }
+//// }
+//// if (obj.isNetworked()) {
+////     obj./*5*/;
+//// }
+
+goTo.marker("1");
+verify.completionListContains("content");
+goTo.marker("2");
+verify.completionListContains("host");
+goTo.marker("3");
+verify.completionListContains("children");
+goTo.marker("4");
+verify.completionListContains("host");
+goTo.marker("5");
+verify.completionListContains("host");
\ No newline at end of file
diff --git a/tests/cases/fourslash/thisPredicateFunctionCompletions02.ts b/tests/cases/fourslash/thisPredicateFunctionCompletions02.ts
new file mode 100644
index 00000000000..e2e311ea649
--- /dev/null
+++ b/tests/cases/fourslash/thisPredicateFunctionCompletions02.ts
@@ -0,0 +1,43 @@
+/// <reference path="fourslash.ts" />
+
+//// interface Sundries {
+////     broken: boolean;
+//// }
+////
+//// interface Supplies {
+////     spoiled: boolean;
+//// }
+////
+//// interface Crate<T> {
+////     contents: T;
+////     isSundries(): this is Crate<Sundries>;
+////     isSupplies(): this is Crate<Supplies>;
+////     isPackedTight(): this is (this & {extraContents: T});
+//// }
+//// const crate: Crate<any>;
+//// if (crate.isPackedTight()) {
+////     crate./*1*/;
+//// }
+//// if (crate.isSundries()) {
+////     crate.contents./*2*/;
+////     if (crate.isPackedTight()) {
+////         crate./*3*/;
+////     }
+//// }
+//// if (crate.isSupplies()) {
+////     crate.contents./*4*/;
+////     if (crate.isPackedTight()) {
+////         crate./*5*/;
+////     }
+//// }
+
+goTo.marker("1");
+verify.completionListContains("extraContents");
+goTo.marker("2");
+verify.completionListContains("broken");
+goTo.marker("3");
+verify.completionListContains("extraContents");
+goTo.marker("4");
+verify.completionListContains("spoiled");
+goTo.marker("5");
+verify.completionListContains("extraContents");
\ No newline at end of file
diff --git a/tests/cases/fourslash/thisPredicateFunctionCompletions.ts b/tests/cases/fourslash/thisPredicateFunctionCompletions03.ts
similarity index 100%
rename from tests/cases/fourslash/thisPredicateFunctionCompletions.ts
rename to tests/cases/fourslash/thisPredicateFunctionCompletions03.ts
diff --git a/tests/cases/fourslash/thisPredicateFunctionQuickInfo01.ts b/tests/cases/fourslash/thisPredicateFunctionQuickInfo01.ts
new file mode 100644
index 00000000000..135df559189
--- /dev/null
+++ b/tests/cases/fourslash/thisPredicateFunctionQuickInfo01.ts
@@ -0,0 +1,59 @@
+/// <reference path="fourslash.ts" />
+
+//// class FileSystemObject {
+////     /*1*/isFile(): this is Item {
+////         return this instanceof Item;
+////     }
+////     /*2*/isDirectory(): this is Directory {
+////         return this instanceof Directory;
+////     }
+////     /*3*/isNetworked(): this is (Networked & this) {
+////        return !!(this as Networked).host;
+////     }
+////     constructor(public path: string) {}
+//// }
+////
+//// class Item extends FileSystemObject {
+////     constructor(path: string, public content: string) { super(path); }
+//// }
+//// class Directory extends FileSystemObject {
+////     children: FileSystemObject[];
+//// }
+//// interface Networked {
+////     host: string;
+//// }
+////
+//// const obj: FileSystemObject = new Item("/foo", "");
+//// if (obj.isFile/*4*/()) {
+////     obj.;
+////     if (obj.isNetworked/*5*/()) {
+////         obj.;
+////     }
+//// }
+//// if (obj.isDirectory/*6*/()) {
+////     obj.;
+////     if (obj.isNetworked/*7*/()) {
+////         obj.;
+////     }
+//// }
+//// if (obj.isNetworked/*8*/()) {
+////     obj.;
+//// }
+
+goTo.marker("1");
+verify.quickInfoIs("(method) FileSystemObject.isFile(): this is Item");
+goTo.marker("2");
+verify.quickInfoIs("(method) FileSystemObject.isDirectory(): this is Directory");
+goTo.marker("3");
+verify.quickInfoIs("(method) FileSystemObject.isNetworked(): this is Networked & this");
+
+goTo.marker("4");
+verify.quickInfoIs("(method) FileSystemObject.isFile(): this is Item");
+goTo.marker("5");
+verify.quickInfoIs("(method) FileSystemObject.isNetworked(): this is Networked & Item");
+goTo.marker("6");
+verify.quickInfoIs("(method) FileSystemObject.isDirectory(): this is Directory");
+goTo.marker("7");
+verify.quickInfoIs("(method) FileSystemObject.isNetworked(): this is Networked & Directory");
+goTo.marker("8");
+verify.quickInfoIs("(method) FileSystemObject.isNetworked(): this is Networked & FileSystemObject");
\ No newline at end of file
diff --git a/tests/cases/fourslash/thisPredicateFunctionQuickInfo02.ts b/tests/cases/fourslash/thisPredicateFunctionQuickInfo02.ts
new file mode 100644
index 00000000000..b8135026c82
--- /dev/null
+++ b/tests/cases/fourslash/thisPredicateFunctionQuickInfo02.ts
@@ -0,0 +1,57 @@
+/// <reference path="fourslash.ts" />
+
+//// interface Sundries {
+////     broken: boolean;
+//// }
+////
+//// interface Supplies {
+////     spoiled: boolean;
+//// }
+////
+//// interface Crate<T> {
+////     contents: T;
+////     /*1*/isSundries(): this is Crate<Sundries>;
+////     /*2*/isSupplies(): this is Crate<Supplies>;
+////     /*3*/isPackedTight(): this is (this & {extraContents: T});
+//// }
+//// const crate: Crate<any>;
+//// if (crate.isPackedTight/*4*/()) {
+////     crate.;
+//// }
+//// if (crate.isSundries/*5*/()) {
+////     crate.contents.;
+////     if (crate.isPackedTight/*6*/()) {
+////        crate.;
+////     }
+//// }
+//// if (crate.isSupplies/*7*/()) {
+////     crate.contents.;
+////     if (crate.isPackedTight/*8*/()) {
+////        crate.;
+////     }
+//// }
+
+goTo.marker("1");
+verify.quickInfoIs("(method) Crate<T>.isSundries(): this is Crate<Sundries>");
+goTo.marker("2");
+verify.quickInfoIs("(method) Crate<T>.isSupplies(): this is Crate<Supplies>");
+goTo.marker("3");
+verify.quickInfoIs(`(method) Crate<T>.isPackedTight(): this is this & {
+    extraContents: T;
+}`);
+goTo.marker("4");
+verify.quickInfoIs(`(method) Crate<any>.isPackedTight(): this is Crate<any> & {
+    extraContents: any;
+}`);
+goTo.marker("5");
+verify.quickInfoIs("(method) Crate<any>.isSundries(): this is Crate<Sundries>");
+goTo.marker("6");
+verify.quickInfoIs(`(method) Crate<Sundries>.isPackedTight(): this is Crate<Sundries> & {
+    extraContents: Sundries;
+}`);
+goTo.marker("7");
+verify.quickInfoIs("(method) Crate<any>.isSupplies(): this is Crate<Supplies>");
+goTo.marker("8");
+verify.quickInfoIs(`(method) Crate<Supplies>.isPackedTight(): this is Crate<Supplies> & {
+    extraContents: Supplies;
+}`);
\ No newline at end of file
diff --git a/tests/cases/fourslash/thisPredicateMemberCompletions.ts b/tests/cases/fourslash/thisPredicateMemberCompletions.ts
deleted file mode 100644
index 24ce742faac..00000000000
--- a/tests/cases/fourslash/thisPredicateMemberCompletions.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-/// <reference path="fourslash.ts" />
-
-//// class FileSystemObject {
-////     get is/*1*/File(): this is Item {
-////         return this instanceof Item;
-////     }
-////     set is/*2*/File(param) {
-////         // noop
-////     }
-////     get is/*3*/Directory(): this is Directory {
-////         return this instanceof Directory;
-////     }
-////     is/*4*/Networked: this is (Networked & this);
-////     constructor(public path: string) {}
-//// }
-////
-//// class Item extends FileSystemObject {
-////     constructor(path: string, public content: string) { super(path); }
-//// }
-//// class Directory extends FileSystemObject {
-////     children: FileSystemObject[];
-//// }
-//// interface Networked {
-////     host: string;
-//// }
-////
-//// interface Sundries {
-////     broken: boolean;
-//// }
-////
-//// interface Supplies {
-////     spoiled: boolean;
-//// }
-////
-//// interface Crate<T> {
-////     contents: T;
-////     is/*5*/Sundries: this is Crate<Sundries>;
-////     is/*6*/Supplies: this is Crate<Supplies>;
-////     is/*7*/PackedTight: this is (this & {extraContents: T});
-//// }
-////
-//// const obj: FileSystemObject = new Item("/foo", "");
-//// if (obj.is/*8*/File) {
-////     obj./*9*/;
-////     if (obj.is/*10*/Networked) {
-////         obj./*11*/;
-////     }
-//// }
-//// if (obj.is/*12*/Directory) {
-////     obj./*13*/;
-////     if (obj.is/*14*/Networked) {
-////         obj./*15*/;
-////     }
-//// }
-//// if (obj.is/*16*/Networked) {
-////     obj./*17*/;
-//// }
-////
-//// const crate: Crate<any>;
-//// if (crate.is/*18*/PackedTight) {
-////     crate./*19*/;
-//// }
-//// if (crate.is/*20*/Sundries) {
-////     crate.contents./*21*/;
-////     if (crate.is/*22*/PackedTight) {
-////         crate./*23*/
-////     }
-//// }
-//// if (crate.is/*24*/Supplies) {
-////     crate.contents./*25*/;
-////     if (crate.is/*26*/PackedTight) {
-////         crate./*27*/
-////     }
-//// }
-
-goTo.marker("9");
-verify.completionListContains("content");
-goTo.marker("11");
-verify.completionListContains("host");
-goTo.marker("13");
-verify.completionListContains("children");
-goTo.marker("15");
-verify.completionListContains("host");
-goTo.marker("17");
-verify.completionListContains("host");
-goTo.marker("19");
-verify.completionListContains("extraContents");
-goTo.marker("21");
-verify.completionListContains("broken");
-goTo.marker("23");
-verify.completionListContains("extraContents");
-goTo.marker("25");
-verify.completionListContains("spoiled");
-goTo.marker("27");
-verify.completionListContains("extraContents");
\ No newline at end of file
diff --git a/tests/cases/fourslash/thisPredicateMemberQuickInfo.ts b/tests/cases/fourslash/thisPredicateMemberQuickInfo.ts
deleted file mode 100644
index 20d519e0008..00000000000
--- a/tests/cases/fourslash/thisPredicateMemberQuickInfo.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-/// <reference path="fourslash.ts" />
-
-//// class FileSystemObject {
-////     get is/*1*/File(): this is Item {
-////         return this instanceof Item;
-////     }
-////     set is/*2*/File(param) {
-////         // noop
-////     }
-////     get is/*3*/Directory(): this is Directory {
-////         return this instanceof Directory;
-////     }
-////     is/*4*/Networked: this is (Networked & this);
-////     constructor(public path: string) {}
-//// }
-////
-//// class Item extends FileSystemObject {
-////     constructor(path: string, public content: string) { super(path); }
-//// }
-//// class Directory extends FileSystemObject {
-////     children: FileSystemObject[];
-//// }
-//// interface Networked {
-////     host: string;
-//// }
-////
-//// interface Sundries {
-////     broken: boolean;
-//// }
-////
-//// interface Supplies {
-////     spoiled: boolean;
-//// }
-////
-//// interface Crate<T> {
-////     contents: T;
-////     is/*5*/Sundries: this is Crate<Sundries>;
-////     is/*6*/Supplies: this is Crate<Supplies>;
-////     is/*7*/PackedTight: this is (this & {extraContents: T});
-//// }
-////
-//// const obj: FileSystemObject = new Item("/foo", "");
-//// if (obj.is/*8*/File) {
-////     obj./*9*/;
-////     if (obj.is/*10*/Networked) {
-////         obj./*11*/;
-////     }
-//// }
-//// if (obj.is/*12*/Directory) {
-////     obj./*13*/;
-////     if (obj.is/*14*/Networked) {
-////         obj./*15*/;
-////     }
-//// }
-//// if (obj.is/*16*/Networked) {
-////     obj./*17*/;
-//// }
-////
-//// const crate: Crate<any>;
-//// if (crate.is/*18*/PackedTight) {
-////     crate./*19*/;
-//// }
-//// if (crate.is/*20*/Sundries) {
-////     crate.contents./*21*/;
-////     if (crate.is/*22*/PackedTight) {
-////         crate./*23*/
-////     }
-//// }
-//// if (crate.is/*24*/Supplies) {
-////     crate.contents./*25*/;
-////     if (crate.is/*26*/PackedTight) {
-////         crate./*27*/
-////     }
-//// }
-
-goTo.marker("1");
-verify.quickInfoIs("(property) FileSystemObject.isFile: this is Item");
-goTo.marker("2");
-verify.quickInfoIs("(property) FileSystemObject.isFile: this is Item");
-goTo.marker("3");
-verify.quickInfoIs("(property) FileSystemObject.isDirectory: this is Directory");
-goTo.marker("4");
-verify.quickInfoIs("(property) FileSystemObject.isNetworked: this is Networked & this");
-goTo.marker("5");
-verify.quickInfoIs("(property) Crate<T>.isSundries: this is Crate<Sundries>");
-goTo.marker("6");
-verify.quickInfoIs("(property) Crate<T>.isSupplies: this is Crate<Supplies>");
-goTo.marker("7");
-verify.quickInfoIs(`(property) Crate<T>.isPackedTight: this is this & {
-    extraContents: T;
-}`);
-goTo.marker("8");
-verify.quickInfoIs("(property) FileSystemObject.isFile: this is Item");
-goTo.marker("10");
-verify.quickInfoIs("(property) FileSystemObject.isNetworked: this is Networked & Item");
-goTo.marker("12");
-verify.quickInfoIs("(property) FileSystemObject.isDirectory: this is Directory");
-goTo.marker("14");
-verify.quickInfoIs("(property) FileSystemObject.isNetworked: this is Networked & Directory");
-goTo.marker("16");
-verify.quickInfoIs("(property) FileSystemObject.isNetworked: this is Networked & FileSystemObject");
-goTo.marker("18");
-verify.quickInfoIs(`(property) Crate<any>.isPackedTight: this is Crate<any> & {
-    extraContents: any;
-}`);
-goTo.marker("20");
-verify.quickInfoIs("(property) Crate<any>.isSundries: this is Crate<Sundries>");
-goTo.marker("22");
-verify.quickInfoIs(`(property) Crate<Sundries>.isPackedTight: this is Crate<Sundries> & {
-    extraContents: Sundries;
-}`);
-goTo.marker("24");
-verify.quickInfoIs("(property) Crate<any>.isSupplies: this is Crate<Supplies>");
-goTo.marker("26");
-verify.quickInfoIs(`(property) Crate<Supplies>.isPackedTight: this is Crate<Supplies> & {
-    extraContents: Supplies;
-}`);
\ No newline at end of file
diff --git a/tests/cases/fourslash/tsxCompletion11.ts b/tests/cases/fourslash/tsxCompletion11.ts
new file mode 100644
index 00000000000..5d9c869a9b6
--- /dev/null
+++ b/tests/cases/fourslash/tsxCompletion11.ts
@@ -0,0 +1,14 @@
+/// <reference path='fourslash.ts' />
+
+//@module: commonjs
+//@jsx: preserve
+
+//@Filename: exporter.tsx
+//// export class Thing { }
+
+//@Filename: file.tsx
+//// import {Thing} from './exporter';
+//// var x1 = <div></**/
+
+goTo.marker();
+verify.completionListContains('Thing');
diff --git a/tests/cases/fourslash/tsxCompletionOnOpeningTagWithoutJSX1.ts b/tests/cases/fourslash/tsxCompletionOnOpeningTagWithoutJSX1.ts
index 1b745f6e418..d0ef579f401 100644
--- a/tests/cases/fourslash/tsxCompletionOnOpeningTagWithoutJSX1.ts
+++ b/tests/cases/fourslash/tsxCompletionOnOpeningTagWithoutJSX1.ts
@@ -4,4 +4,4 @@
 //// var x = </**/;
 
 goTo.marker();
-verify.memberListCount(41);
+verify.memberListCount(42);
diff --git a/tests/cases/fourslash/validBraceCompletionPosition.ts b/tests/cases/fourslash/validBraceCompletionPosition.ts
new file mode 100644
index 00000000000..57c30c27c21
--- /dev/null
+++ b/tests/cases/fourslash/validBraceCompletionPosition.ts
@@ -0,0 +1,23 @@
+/// <reference path="fourslash.ts" />
+
+//// function parseInt(/*1*/){}
+//// class aa/*2*/{
+////   public b/*3*/(){}
+//// }
+//// interface I/*4*/{}
+//// var x = /*5*/{ a:true }
+
+goTo.marker('1');
+verify.isValidBraceCompletionAtPostion('(');
+
+goTo.marker('2');
+verify.isValidBraceCompletionAtPostion('(');
+
+goTo.marker('3');
+verify.isValidBraceCompletionAtPostion('(');
+
+goTo.marker('4');
+verify.isValidBraceCompletionAtPostion('(');
+
+goTo.marker('5');
+verify.isValidBraceCompletionAtPostion('(');
\ No newline at end of file
diff --git a/tests/cases/fourslash/verifySingleFileEmitOutput1.ts b/tests/cases/fourslash/verifySingleFileEmitOutput1.ts
index f1c9002390f..1921a6fe053 100644
--- a/tests/cases/fourslash/verifySingleFileEmitOutput1.ts
+++ b/tests/cases/fourslash/verifySingleFileEmitOutput1.ts
@@ -7,7 +7,7 @@
 ////}
 
 // @Filename: verifySingleFileEmitOutput1_file1.ts
-////import f = require("verifySingleFileEmitOutput1_file0");
+////import f = require("./verifySingleFileEmitOutput1_file0");
 ////var /**/b = new f.A();
 
 goTo.marker();
diff --git a/tests/cases/project/declarationDir.json b/tests/cases/project/declarationDir.json
new file mode 100644
index 00000000000..3322694ddbd
--- /dev/null
+++ b/tests/cases/project/declarationDir.json
@@ -0,0 +1,12 @@
+{
+    "scenario": "declarationDir: specify declarationDir only",
+    "projectRoot": "tests/cases/projects/declarationDir",
+    "inputFiles": [
+        "a.ts",
+        "subfolder/b.ts",
+        "subfolder/c.ts"
+    ],
+    "declaration": true,
+    "declarationDir": "declarations",
+    "baselineCheck": true
+}
\ No newline at end of file
diff --git a/tests/cases/project/declarationDir2.json b/tests/cases/project/declarationDir2.json
new file mode 100644
index 00000000000..c943ed7f57b
--- /dev/null
+++ b/tests/cases/project/declarationDir2.json
@@ -0,0 +1,13 @@
+{
+    "scenario": "declarationDir: specify declarationDir with outDir",
+    "projectRoot": "tests/cases/projects/declarationDir",
+    "inputFiles": [
+        "a.ts",
+        "subfolder/b.ts",
+        "subfolder/c.ts"
+    ],
+    "outDir": "out",
+    "declaration": true,
+    "declarationDir": "declarations",
+    "baselineCheck": true
+}
\ No newline at end of file
diff --git a/tests/cases/project/declarationDir3.json b/tests/cases/project/declarationDir3.json
new file mode 100644
index 00000000000..b86e454c69d
--- /dev/null
+++ b/tests/cases/project/declarationDir3.json
@@ -0,0 +1,13 @@
+{
+    "scenario": "declarationDir: specify declarationDir with bundled output file",
+    "projectRoot": "tests/cases/projects/declarationDir",
+    "inputFiles": [
+        "a.ts",
+        "subfolder/b.ts",
+        "subfolder/c.ts"
+    ],
+    "out": "out.js",
+    "declaration": true,
+    "declarationDir": "declarations",
+    "baselineCheck": true
+}
\ No newline at end of file
diff --git a/tests/cases/projects/declarationDir/a.ts b/tests/cases/projects/declarationDir/a.ts
new file mode 100644
index 00000000000..1b2c4286dc1
--- /dev/null
+++ b/tests/cases/projects/declarationDir/a.ts
@@ -0,0 +1,4 @@
+import {B} from './subfolder/b';
+export class A {
+    b: B;
+}
\ No newline at end of file
diff --git a/tests/cases/projects/declarationDir/subfolder/b.ts b/tests/cases/projects/declarationDir/subfolder/b.ts
new file mode 100644
index 00000000000..d87c6898050
--- /dev/null
+++ b/tests/cases/projects/declarationDir/subfolder/b.ts
@@ -0,0 +1,3 @@
+export class B {
+    
+}
\ No newline at end of file
diff --git a/tests/cases/projects/declarationDir/subfolder/c.ts b/tests/cases/projects/declarationDir/subfolder/c.ts
new file mode 100644
index 00000000000..17b540b0346
--- /dev/null
+++ b/tests/cases/projects/declarationDir/subfolder/c.ts
@@ -0,0 +1,5 @@
+import {A} from '../a';
+
+export class C {
+    a: A;
+}
\ No newline at end of file
diff --git a/tests/cases/unittests/cachingInServerLSHost.ts b/tests/cases/unittests/cachingInServerLSHost.ts
index 59f97f434e6..2fe8098ab33 100644
--- a/tests/cases/unittests/cachingInServerLSHost.ts
+++ b/tests/cases/unittests/cachingInServerLSHost.ts
@@ -7,10 +7,16 @@ module ts {
     }
 
     function createDefaultServerHost(fileMap: Map<File>): server.ServerHost  {
-        const directories: Map<string> = {};
-        for (const f in fileMap) {
-            directories[getDirectoryPath(f)] = f;
-        }
+        let existingDirectories: Map<boolean> = {};
+        forEachValue(fileMap, v => {
+            let dir = getDirectoryPath(v.name);
+            let previous: string;
+            do {
+                existingDirectories[dir] = true;
+                previous = dir;
+                dir = getDirectoryPath(dir);
+            } while (dir !== previous);
+        });
         return {
             args: <string[]>[],
             newLine: "\r\n",
@@ -30,7 +36,7 @@ module ts {
                 return hasProperty(fileMap, path);
             },
             directoryExists: (path: string): boolean => {
-                return hasProperty(directories, path);
+                return hasProperty(existingDirectories, path);
             },
             createDirectory: (path: string) => {
             },
@@ -40,6 +46,7 @@ module ts {
             getCurrentDirectory: (): string => {
                 return "";
             },
+            getEnvironmentVariable: (name: string) => "",
             readDirectory: (path: string, extension?: string, exclude?: string[]): string[] => {
                 throw new Error("NYI");
             },
@@ -73,8 +80,8 @@ module ts {
         let projectService = new server.ProjectService(serverHost, logger);
         let rootScriptInfo = projectService.openFile(rootFile, /* openedByClient */true);
         let project = projectService.createInferredProject(rootScriptInfo);
-        project.setProjectOptions( {files: [rootScriptInfo.fileName], compilerOptions: {module: ts.ModuleKind.AMD} } ); 
-        return { 
+        project.setProjectOptions( {files: [rootScriptInfo.fileName], compilerOptions: {module: ts.ModuleKind.AMD} } );
+        return {
             project,
             rootScriptInfo
         };
@@ -91,22 +98,22 @@ module ts {
                 name: "c:/f1.ts",
                 content: `foo()`
             };
-            
+
             let serverHost = createDefaultServerHost({ [root.name]: root, [imported.name]: imported });
             let { project, rootScriptInfo } = createProject(root.name, serverHost);
 
             // ensure that imported file was found
             let diags = project.compilerService.languageService.getSemanticDiagnostics(imported.name);
             assert.equal(diags.length, 1);
-            
+
             let originalFileExists = serverHost.fileExists;
             {
                 // patch fileExists to make sure that disk is not touched
                 serverHost.fileExists = (fileName): boolean => {
-                    assert.isTrue(false, "fileExists should not be called"); 
+                    assert.isTrue(false, "fileExists should not be called");
                     return false;
                 };
-                
+
                 let newContent = `import {x} from "f1"
                 var x: string = 1;`;
                 rootScriptInfo.editContent(0, rootScriptInfo.content.length, newContent);
@@ -123,11 +130,11 @@ module ts {
                     }
                     fileExistsIsCalled = true;
                     assert.isTrue(fileName.indexOf('/f2.') !== -1);
-                    return originalFileExists(fileName);
+                    return originalFileExists.call(serverHost, fileName);
                 };
                 let newContent = `import {x} from "f2"`;
                 rootScriptInfo.editContent(0, rootScriptInfo.content.length, newContent);
-                
+
                 try {
                     // trigger synchronization to make sure that LSHost will try to find 'f2' module on disk
                     project.compilerService.languageService.getSemanticDiagnostics(imported.name);
@@ -136,7 +143,7 @@ module ts {
                 catch(e) {
                     assert.isTrue(e.message.indexOf(`Could not find file: '${imported.name}'.`) === 0);
                 }
-                
+
                 assert.isTrue(fileExistsIsCalled);
             }
             {
@@ -144,45 +151,45 @@ module ts {
                 serverHost.fileExists = (fileName): boolean => {
                     if (fileName === "lib.d.ts") {
                         return false;
-                    }                    
+                    }
                     fileExistsCalled = true;
                     assert.isTrue(fileName.indexOf('/f1.') !== -1);
-                    return originalFileExists(fileName);
+                    return originalFileExists.call(serverHost, fileName);
                 };
-                
+
                 let newContent = `import {x} from "f1"`;
                 rootScriptInfo.editContent(0, rootScriptInfo.content.length, newContent);
                 project.compilerService.languageService.getSemanticDiagnostics(imported.name);
                 assert.isTrue(fileExistsCalled);
-                
+
                 // setting compiler options discards module resolution cache
                 fileExistsCalled = false;
-                
+
                 let opts = ts.clone(project.projectOptions);
                 opts.compilerOptions = ts.clone(opts.compilerOptions);
                 opts.compilerOptions.target = ts.ScriptTarget.ES5;
                 project.setProjectOptions(opts);
-                
+
                 project.compilerService.languageService.getSemanticDiagnostics(imported.name);
                 assert.isTrue(fileExistsCalled);
             }
         });
-        
+
         it("loads missing files from disk", () => {
             let root: File = {
                 name: 'c:/foo.ts',
                 content: `import {x} from "bar"`
             };
-            
+
             let imported: File = {
                 name: 'c:/bar.d.ts',
                 content: `export var y = 1`
-            };            
-            
+            };
+
             let fileMap: Map<File> = { [root.name]: root };
             let serverHost = createDefaultServerHost(fileMap);
             let originalFileExists = serverHost.fileExists;
-            
+
             let fileExistsCalledForBar = false;
             serverHost.fileExists = fileName => {
                 if (fileName === "lib.d.ts") {
@@ -192,24 +199,24 @@ module ts {
                     fileExistsCalledForBar = fileName.indexOf("/bar.") !== -1;
                 }
                 
-                return originalFileExists(fileName);
+                return originalFileExists.call(serverHost, fileName);
             };
-            
+
             let { project, rootScriptInfo } = createProject(root.name, serverHost);
 
             let diags = project.compilerService.languageService.getSemanticDiagnostics(root.name);
             assert.isTrue(fileExistsCalledForBar, "'fileExists' should be called");
             assert.isTrue(diags.length === 1, "one diagnostic expected");
             assert.isTrue(typeof diags[0].messageText === "string" && ((<string>diags[0].messageText).indexOf("Cannot find module") === 0), "should be 'cannot find module' message");
-            
+
             // assert that import will success once file appear on disk
             fileMap[imported.name] = imported;
             fileExistsCalledForBar = false;
             rootScriptInfo.editContent(0, rootScriptInfo.content.length, `import {y} from "bar"`)
-            
+
             diags = project.compilerService.languageService.getSemanticDiagnostics(root.name);
             assert.isTrue(fileExistsCalledForBar, "'fileExists' should be called");
             assert.isTrue(diags.length === 0);
         })
     });
-}
\ No newline at end of file
+}
diff --git a/tests/cases/unittests/commandLineParsing.ts b/tests/cases/unittests/commandLineParsing.ts
new file mode 100644
index 00000000000..e220c243558
--- /dev/null
+++ b/tests/cases/unittests/commandLineParsing.ts
@@ -0,0 +1,316 @@
+/// <reference path="..\..\..\src\harness\harness.ts" />
+/// <reference path="..\..\..\src\compiler\commandLineParser.ts" />
+
+namespace ts {
+    describe('parseCommandLine', () => {
+
+        function assertParseResult(commandLine: string[], expectedParsedCommandLine: ts.ParsedCommandLine) {
+            const parsed = ts.parseCommandLine(commandLine);
+            const parsedCompilerOptions = JSON.stringify(parsed.options);
+            const expectedCompilerOptions = JSON.stringify(expectedParsedCommandLine.options);
+            assert.equal(parsedCompilerOptions, expectedCompilerOptions);
+
+            const parsedErrors = parsed.errors;
+            const expectedErrors = expectedParsedCommandLine.errors;
+            assert.isTrue(parsedErrors.length === expectedErrors.length, `Expected error: ${JSON.stringify(expectedErrors)}. Actual error: ${JSON.stringify(parsedErrors)}.`);
+            for (let i = 0; i < parsedErrors.length; ++i) {
+                const parsedError = parsedErrors[i];
+                const expectedError = expectedErrors[i]; 
+                assert.equal(parsedError.code, expectedError.code);
+                assert.equal(parsedError.category, expectedError.category);
+                assert.equal(parsedError.messageText, expectedError.messageText);
+            }
+
+            const parsedFileNames = parsed.fileNames;
+            const expectedFileNames = expectedParsedCommandLine.fileNames;
+            assert.isTrue(parsedFileNames.length === expectedFileNames.length, `Expected fileNames: [${JSON.stringify(expectedFileNames)}]. Actual fileNames: [${JSON.stringify(parsedFileNames)}].`);
+            for (let i = 0; i < parsedFileNames.length; ++i) {
+                const parsedFileName = parsedFileNames[i];
+                const expectedFileName = expectedFileNames[i]; 
+                assert.equal(parsedFileName, expectedFileName);
+            }
+        }
+
+        it("Parse single option of library flag ", () => {
+            // --lib es6 0.ts
+            assertParseResult(["--lib", "es6", "0.ts"],
+                {
+                    errors: [],
+                    fileNames: ["0.ts"],
+                    options: {
+                        lib: ["lib.es2015.d.ts"]
+                    }
+                });
+        });
+
+        it("Parse multiple options of library flags ", () => {
+            // --lib es5,es2015.symbol.wellknown 0.ts
+            assertParseResult(["--lib", "es5,es2015.symbol.wellknown", "0.ts"],
+                {
+                    errors: [],
+                    fileNames: ["0.ts"],
+                    options: {
+                        lib: ["lib.es5.d.ts", "lib.es2015.symbol.wellknown.d.ts"]
+                    }
+                });
+        });
+
+        it("Parse invalid option of library flags ", () => {
+            // --lib es5,invalidOption 0.ts
+            assertParseResult(["--lib", "es5,invalidOption", "0.ts"],
+                {
+                    errors: [{
+                        messageText: "Argument for '--lib' option must be:  'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
+                        category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
+                        code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
+
+                        file: undefined,
+                        start: undefined,
+                        length: undefined,
+                    }],
+                    fileNames: ["0.ts"],
+                    options: {
+                        lib: ["lib.es5.d.ts"]
+                    }
+                });
+        });
+        it("Parse empty options of --jsx ", () => {
+            // 0.ts --jsx
+            assertParseResult(["0.ts", "--jsx"],
+                {
+                    errors: [{
+                        messageText: "Compiler option 'jsx' expects an argument.",
+                        category: ts.Diagnostics.Compiler_option_0_expects_an_argument.category,
+                        code: ts.Diagnostics.Compiler_option_0_expects_an_argument.code,
+
+                        file: undefined,
+                        start: undefined,
+                        length: undefined,
+                    }, {
+                            messageText: "Argument for '--jsx' option must be:  'preserve', 'react'",
+                            category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
+                            code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
+
+                            file: undefined,
+                            start: undefined,
+                            length: undefined,
+                        }],
+                    fileNames: ["0.ts"],
+                    options: {}
+                });
+        });
+
+        it("Parse empty options of --module ", () => {
+            // 0.ts --
+            assertParseResult(["0.ts", "--module"],
+                {
+                    errors: [{
+                        messageText: "Compiler option 'module' expects an argument.",
+                        category: ts.Diagnostics.Compiler_option_0_expects_an_argument.category,
+                        code: ts.Diagnostics.Compiler_option_0_expects_an_argument.code,
+
+                        file: undefined,
+                        start: undefined,
+                        length: undefined,
+                    }, {
+                            messageText: "Argument for '--module' option must be:  'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015'", 
+                            category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
+                            code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
+
+                            file: undefined,
+                            start: undefined,
+                            length: undefined,
+                        }],
+                    fileNames: ["0.ts"],
+                    options: {}
+                });
+        });
+
+        it("Parse empty options of --newLine ", () => {
+            // 0.ts --newLine
+            assertParseResult(["0.ts", "--newLine"],
+                {
+                    errors: [{
+                        messageText: "Compiler option 'newLine' expects an argument.",
+                        category: ts.Diagnostics.Compiler_option_0_expects_an_argument.category,
+                        code: ts.Diagnostics.Compiler_option_0_expects_an_argument.code,
+
+                        file: undefined,
+                        start: undefined,
+                        length: undefined,
+                    }, {
+                            messageText: "Argument for '--newLine' option must be:  'crlf', 'lf'",
+                            category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
+                            code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
+
+                            file: undefined,
+                            start: undefined,
+                            length: undefined,
+                        }],
+                    fileNames: ["0.ts"],
+                    options: {}
+                });
+        });
+
+        it("Parse empty options of --target ", () => {
+            // 0.ts --target
+            assertParseResult(["0.ts", "--target"],
+                {
+                    errors: [{
+                        messageText: "Compiler option 'target' expects an argument.",
+                        category: ts.Diagnostics.Compiler_option_0_expects_an_argument.category,
+                        code: ts.Diagnostics.Compiler_option_0_expects_an_argument.code,
+
+                        file: undefined,
+                        start: undefined,
+                        length: undefined,
+                    }, {
+                            messageText: "Argument for '--target' option must be:  'es3', 'es5', 'es6', 'es2015'",
+                            category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
+                            code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
+
+                            file: undefined,
+                            start: undefined,
+                            length: undefined,
+                        }],
+                    fileNames: ["0.ts"],
+                    options: {}
+                });
+        });
+
+        it("Parse empty options of --moduleResolution ", () => {
+            // 0.ts --moduleResolution
+            assertParseResult(["0.ts", "--moduleResolution"],
+                {
+                    errors: [{
+                        messageText: "Compiler option 'moduleResolution' expects an argument.",
+                        category: ts.Diagnostics.Compiler_option_0_expects_an_argument.category,
+                        code: ts.Diagnostics.Compiler_option_0_expects_an_argument.code,
+
+                        file: undefined,
+                        start: undefined,
+                        length: undefined,
+                    }, {
+                            messageText: "Argument for '--moduleResolution' option must be:  'node', 'classic'",
+                            category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
+                            code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
+
+                            file: undefined,
+                            start: undefined,
+                            length: undefined,
+                        }],
+                    fileNames: ["0.ts"],
+                    options: {}
+                });
+        });
+
+        it("Parse empty options of --lib ", () => {
+            // 0.ts --lib
+            assertParseResult(["0.ts", "--lib"],
+                {
+                    errors: [{
+                        messageText: "Compiler option 'lib' expects an argument.",
+                        category: ts.Diagnostics.Compiler_option_0_expects_an_argument.category,
+                        code: ts.Diagnostics.Compiler_option_0_expects_an_argument.code,
+
+                        file: undefined,
+                        start: undefined,
+                        length: undefined,
+                    }, {
+                        messageText: "Argument for '--lib' option must be:  'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
+                        category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
+                        code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
+
+                        file: undefined,
+                        start: undefined,
+                        length: undefined,
+                    }],
+                    fileNames: ["0.ts"],
+                    options: {
+                        lib: []
+                    }
+                });
+        });
+
+        it("Parse --lib option with extra comma ", () => {
+            // --lib es5, es7 0.ts
+            assertParseResult(["--lib", "es5,", "es7", "0.ts"],
+                {
+                    errors: [{
+                        messageText: "Argument for '--lib' option must be:  'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
+                        category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
+                        code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
+
+                        file: undefined,
+                        start: undefined,
+                        length: undefined,
+                    }],
+                    fileNames: ["es7", "0.ts"],
+                    options: {
+                        lib: ["lib.es5.d.ts"]
+                    }
+                });
+        });
+
+        it("Parse --lib option with trailing white-space ", () => {
+            // --lib es5, es7 0.ts
+            assertParseResult(["--lib", "es5, ", "es7", "0.ts"],
+                {
+                    errors: [{
+                        messageText: "Argument for '--lib' option must be:  'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
+                        category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
+                        code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
+
+                        file: undefined,
+                        start: undefined,
+                        length: undefined,
+                    }],
+                    fileNames: ["es7", "0.ts"],
+                    options: {
+                        lib: ["lib.es5.d.ts"]
+                    }
+                });
+        });
+
+        it("Parse multiple compiler flags with input files at the end", () => {
+            // --lib es5,es2015.symbol.wellknown --target es5 0.ts
+            assertParseResult(["--lib", "es5,es2015.symbol.wellknown", "--target", "es5", "0.ts"],
+                {
+                    errors: [],
+                    fileNames: ["0.ts"],
+                    options: {
+                        lib: ["lib.es5.d.ts", "lib.es2015.symbol.wellknown.d.ts"],
+                        target: ts.ScriptTarget.ES5,
+                    }
+                });
+        });
+
+        it("Parse multiple compiler flags with input files in the middle", () => {
+            // --module commonjs --target es5 0.ts --lib es5,es2015.symbol.wellknown
+            assertParseResult(["--module", "commonjs", "--target", "es5", "0.ts", "--lib", "es5,es2015.symbol.wellknown"],
+                {
+                    errors: [],
+                    fileNames: ["0.ts"],
+                    options: {
+                        module: ts.ModuleKind.CommonJS,
+                        target: ts.ScriptTarget.ES5,
+                        lib: ["lib.es5.d.ts", "lib.es2015.symbol.wellknown.d.ts"],
+                    }
+                });
+        });
+
+        it("Parse multiple library compiler flags ", () => {
+            // --module commonjs --target es5 --lib es5 0.ts --library es2015.array,es2015.symbol.wellknown
+            assertParseResult(["--module", "commonjs", "--target", "es5", "--lib", "es5", "0.ts", "--lib", "es2015.core, es2015.symbol.wellknown "],
+                {
+                    errors: [],
+                    fileNames: ["0.ts"],
+                    options: {
+                        module: ts.ModuleKind.CommonJS,
+                        target: ts.ScriptTarget.ES5,
+                        lib: ["lib.es2015.core.d.ts", "lib.es2015.symbol.wellknown.d.ts"],
+                    }
+                });
+        });
+    });
+}
diff --git a/tests/cases/unittests/convertCompilerOptionsFromJson.ts b/tests/cases/unittests/convertCompilerOptionsFromJson.ts
new file mode 100644
index 00000000000..ed1d96a0fb7
--- /dev/null
+++ b/tests/cases/unittests/convertCompilerOptionsFromJson.ts
@@ -0,0 +1,479 @@
+/// <reference path="..\..\..\src\harness\harness.ts" />
+/// <reference path="..\..\..\src\compiler\commandLineParser.ts" />
+
+namespace ts {
+    describe('convertCompilerOptionsFromJson', () => {
+        function assertCompilerOptions(json: any, configFileName: string, expectedResult: { compilerOptions: CompilerOptions, errors: Diagnostic[] }) {
+            const { options: actualCompilerOptions, errors: actualErrors} = convertCompilerOptionsFromJson(json["compilerOptions"], "/apath/", configFileName);
+            
+            const parsedCompilerOptions = JSON.stringify(actualCompilerOptions);
+            const expectedCompilerOptions = JSON.stringify(expectedResult.compilerOptions);
+            assert.equal(parsedCompilerOptions, expectedCompilerOptions);
+            
+            const expectedErrors = expectedResult.errors;
+            assert.isTrue(expectedResult.errors.length === actualErrors.length, `Expected error: ${JSON.stringify(expectedResult.errors)}. Actual error: ${JSON.stringify(actualErrors)}.`);
+            for (let i = 0; i < actualErrors.length; ++i) {
+                const actualError = actualErrors[i];
+                const expectedError = expectedErrors[i]; 
+                assert.equal(actualError.code, expectedError.code);
+                assert.equal(actualError.category, expectedError.category);
+                assert.equal(actualError.messageText, expectedError.messageText);
+            }
+        }
+        
+        // tsconfig.json tests
+        it("Convert correctly format tsconfig.json to compiler-options ", () => {
+            assertCompilerOptions(
+                {
+                    "compilerOptions": {
+                        "module": "commonjs",
+                        "target": "es5",
+                        "noImplicitAny": false,
+                        "sourceMap": false,
+                        "lib": ["es5", "es2015.core", "es2015.symbol"]
+                    }
+                }, "tsconfig.json",
+                {
+                    compilerOptions: <CompilerOptions>{
+                        module: ModuleKind.CommonJS,
+                        target: ScriptTarget.ES5,
+                        noImplicitAny: false,
+                        sourceMap: false,
+                        lib: ["lib.es5.d.ts", "lib.es2015.core.d.ts", "lib.es2015.symbol.d.ts"]
+                    },
+                    errors: <Diagnostic[]>[]
+                }
+            );
+        });
+
+        it("Convert correctly format tsconfig.json with allowJs is false to compiler-options ", () => {
+            assertCompilerOptions(
+                {
+                    "compilerOptions": {
+                        "module": "commonjs",
+                        "target": "es5",
+                        "noImplicitAny": false,
+                        "sourceMap": false,
+                        "allowJs": false,
+                        "lib": ["es5", "es2015.core", "es2015.symbol"]
+                    }
+                }, "tsconfig.json",
+                {
+                    compilerOptions: <CompilerOptions>{
+                        module: ModuleKind.CommonJS,
+                        target: ScriptTarget.ES5,
+                        noImplicitAny: false,
+                        sourceMap: false,
+                        allowJs: false,
+                        lib: ["lib.es5.d.ts", "lib.es2015.core.d.ts", "lib.es2015.symbol.d.ts"]
+                    },
+                    errors: <Diagnostic[]>[]
+                }
+            );
+        });
+
+        it("Convert incorrect option of jsx to compiler-options ", () => {
+            assertCompilerOptions(
+                {
+                    "compilerOptions": {
+                        "module": "commonjs",
+                        "target": "es5",
+                        "noImplicitAny": false,
+                        "sourceMap": false,
+                        "jsx": ""
+                    }
+                }, "tsconfig.json",
+                {
+                    compilerOptions: <CompilerOptions>{
+                        module: ModuleKind.CommonJS,
+                        target: ScriptTarget.ES5,
+                        noImplicitAny: false,
+                        sourceMap: false,
+                    },
+                    errors: [{
+                        file: undefined,
+                        start: 0,
+                        length: 0,
+                        messageText: "Argument for '--jsx' option must be:  'preserve', 'react'",
+                        code: Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
+                        category: Diagnostics.Argument_for_0_option_must_be_Colon_1.category
+                    }]
+                }
+            );
+        });
+
+        it("Convert incorrect option of module to compiler-options ", () => {
+            assertCompilerOptions(
+                {
+                    "compilerOptions": {
+                        "module": "",
+                        "target": "es5",
+                        "noImplicitAny": false,
+                        "sourceMap": false,
+                    }
+                }, "tsconfig.json",
+                {
+                    compilerOptions: <CompilerOptions>{
+                        target: ScriptTarget.ES5,
+                        noImplicitAny: false,
+                        sourceMap: false,
+                    },
+                    errors: [{
+                        file: undefined,
+                        start: 0,
+                        length: 0,
+                        messageText: "Argument for '--module' option must be:  'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015'",
+                        code: Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
+                        category: Diagnostics.Argument_for_0_option_must_be_Colon_1.category
+                    }]
+                }
+            );
+        });
+
+        it("Convert incorrect option of newLine to compiler-options ", () => {
+            assertCompilerOptions(
+                {
+                    "compilerOptions": {
+                        "newLine": "",
+                        "target": "es5",
+                        "noImplicitAny": false,
+                        "sourceMap": false,
+                    }
+                }, "tsconfig.json",
+                {
+                    compilerOptions: <CompilerOptions>{
+                        target: ScriptTarget.ES5,
+                        noImplicitAny: false,
+                        sourceMap: false,
+                    },
+                    errors: [{
+                        file: undefined,
+                        start: 0,
+                        length: 0,
+                        messageText: "Argument for '--newLine' option must be:  'crlf', 'lf'",
+                        code: Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
+                        category: Diagnostics.Argument_for_0_option_must_be_Colon_1.category
+                    }]
+                }
+            );
+        });
+
+        it("Convert incorrect option of target to compiler-options ", () => {
+            assertCompilerOptions(
+                {
+                    "compilerOptions": {
+                        "target": "",
+                        "noImplicitAny": false,
+                        "sourceMap": false,
+                    }
+                }, "tsconfig.json",
+                {
+                    compilerOptions: <CompilerOptions>{
+                        noImplicitAny: false,
+                        sourceMap: false,
+                    },
+                    errors: [{
+                        file: undefined,
+                        start: 0,
+                        length: 0,
+                        messageText: "Argument for '--target' option must be:  'es3', 'es5', 'es6', 'es2015'",
+                        code: Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
+                        category: Diagnostics.Argument_for_0_option_must_be_Colon_1.category
+                    }]
+                }
+            );
+        });
+
+        it("Convert incorrect option of module-resolution to compiler-options ", () => {
+            assertCompilerOptions(
+                {
+                    "compilerOptions": {
+                        "moduleResolution": "",
+                        "noImplicitAny": false,
+                        "sourceMap": false,
+                    }
+                }, "tsconfig.json",
+                {
+                    compilerOptions: <CompilerOptions>{
+                        noImplicitAny: false,
+                        sourceMap: false,
+                    },
+                    errors: [{
+                        file: undefined,
+                        start: 0,
+                        length: 0,
+                        messageText: "Argument for '--moduleResolution' option must be:  'node', 'classic'",
+                        code: Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
+                        category: Diagnostics.Argument_for_0_option_must_be_Colon_1.category
+                    }]
+                }
+            );
+        });
+
+        it("Convert incorrect option of libs to compiler-options ", () => {
+            assertCompilerOptions(
+                {
+                    "compilerOptions": {
+                        "module": "commonjs",
+                        "target": "es5",
+                        "noImplicitAny": false,
+                        "sourceMap": false,
+                        "lib": ["es5", "es2015.core", "incorrectLib"]
+                    }
+                }, "tsconfig.json",
+                {
+                    compilerOptions: <CompilerOptions>{
+                        module: ModuleKind.CommonJS,
+                        target: ScriptTarget.ES5,
+                        noImplicitAny: false,
+                        sourceMap: false,
+                        lib: ["lib.es5.d.ts", "lib.es2015.core.d.ts"]
+                    },
+                    errors: [{
+                        file: undefined,
+                        start: 0,
+                        length: 0,
+                        messageText: "Argument for '--lib' option must be:  'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
+                        code: Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
+                        category: Diagnostics.Argument_for_0_option_must_be_Colon_1.category
+                    }]
+                }
+            );
+        });
+
+        it("Convert empty string option of libs to compiler-options ", () => {
+            assertCompilerOptions(
+                {
+                    "compilerOptions": {
+                        "module": "commonjs",
+                        "target": "es5",
+                        "noImplicitAny": false,
+                        "sourceMap": false,
+                        "lib": ["es5", ""]
+                    }
+                }, "tsconfig.json",
+                {
+                    compilerOptions: <CompilerOptions>{
+                        module: ModuleKind.CommonJS,
+                        target: ScriptTarget.ES5,
+                        noImplicitAny: false,
+                        sourceMap: false,
+                        lib: ["lib.es5.d.ts"]
+                    },
+                    errors: [{
+                        file: undefined,
+                        start: 0,
+                        length: 0,
+                        messageText: "Argument for '--lib' option must be:  'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
+                        code: Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
+                        category: Diagnostics.Argument_for_0_option_must_be_Colon_1.category
+                    }]
+                }
+            );
+        });
+
+        it("Convert empty string option of libs to compiler-options ", () => {
+            assertCompilerOptions(
+                {
+                    "compilerOptions": {
+                        "module": "commonjs",
+                        "target": "es5",
+                        "noImplicitAny": false,
+                        "sourceMap": false,
+                        "lib": [""]
+                    }
+                }, "tsconfig.json",
+                {
+                    compilerOptions: <CompilerOptions>{
+                        module: ModuleKind.CommonJS,
+                        target: ScriptTarget.ES5,
+                        noImplicitAny: false,
+                        sourceMap: false,
+                        lib: []
+                    },
+                    errors: [{
+                        file: undefined,
+                        start: 0,
+                        length: 0,
+                        messageText: "Argument for '--lib' option must be:  'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
+                        code: Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
+                        category: Diagnostics.Argument_for_0_option_must_be_Colon_1.category
+                    }]
+                }
+            );
+        });
+
+        it("Convert trailing-whitespace string option of libs to compiler-options ", () => {
+            assertCompilerOptions(
+                {
+                    "compilerOptions": {
+                        "module": "commonjs",
+                        "target": "es5",
+                        "noImplicitAny": false,
+                        "sourceMap": false,
+                        "lib": ["   "]
+                    }
+                }, "tsconfig.json",
+                {
+                    compilerOptions: <CompilerOptions>{
+                        module: ModuleKind.CommonJS,
+                        target: ScriptTarget.ES5,
+                        noImplicitAny: false,
+                        sourceMap: false,
+                        lib: []
+                    },
+                    errors: [{
+                        file: undefined,
+                        start: 0,
+                        length: 0,
+                        messageText: "Argument for '--lib' option must be:  'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
+                        code: Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
+                        category: Diagnostics.Argument_for_0_option_must_be_Colon_1.category
+                    }]
+                }
+            );
+        });
+
+        it("Convert empty option of libs to compiler-options ", () => {
+            assertCompilerOptions(
+                {
+                    "compilerOptions": {
+                        "module": "commonjs",
+                        "target": "es5",
+                        "noImplicitAny": false,
+                        "sourceMap": false,
+                        "lib": []
+                    }
+                }, "tsconfig.json",
+                {
+                    compilerOptions: <CompilerOptions>{
+                        module: ModuleKind.CommonJS,
+                        target: ScriptTarget.ES5,
+                        noImplicitAny: false,
+                        sourceMap: false,
+                        lib: []
+                    },
+                    errors: []
+                }
+            );
+        });
+
+        it("Convert incorrectly format tsconfig.json to compiler-options ", () => {
+            assertCompilerOptions(
+                {
+                    "compilerOptions": {
+                        "modu": "commonjs",
+                    }
+                }, "tsconfig.json",
+                {
+                    compilerOptions: {},
+                    errors: [{
+                        file: undefined,
+                        start: 0,
+                        length: 0,
+                        messageText: "Unknown compiler option 'modu'.",
+                        code: Diagnostics.Unknown_compiler_option_0.code,
+                        category: Diagnostics.Unknown_compiler_option_0.category
+                    }]
+                }
+            );
+        });
+
+        it("Convert default tsconfig.json to compiler-options ", () => {
+            assertCompilerOptions({}, "tsconfig.json",
+                {
+                    compilerOptions: {} as CompilerOptions,
+                    errors: <Diagnostic[]>[]
+                }
+            );
+        });
+
+        // jsconfig.json
+        it("Convert correctly format jsconfig.json to compiler-options ", () => {
+            assertCompilerOptions(
+                {
+                    "compilerOptions": {
+                        "module": "commonjs",
+                        "target": "es5",
+                        "noImplicitAny": false,
+                        "sourceMap": false,
+                        "lib": ["es5", "es2015.core", "es2015.symbol"]
+                    }
+                }, "jsconfig.json",
+                {
+                    compilerOptions: <CompilerOptions>{
+                        allowJs: true,
+                        module: ModuleKind.CommonJS,
+                        target: ScriptTarget.ES5,
+                        noImplicitAny: false,
+                        sourceMap: false,
+                        lib: ["lib.es5.d.ts", "lib.es2015.core.d.ts", "lib.es2015.symbol.d.ts"]
+                    },
+                    errors: <Diagnostic[]>[]
+                }
+            );
+        });
+
+        it("Convert correctly format jsconfig.json with allowJs is false to compiler-options ", () => {
+            assertCompilerOptions(
+                {
+                    "compilerOptions": {
+                        "module": "commonjs",
+                        "target": "es5",
+                        "noImplicitAny": false,
+                        "sourceMap": false,
+                        "allowJs": false,
+                        "lib": ["es5", "es2015.core", "es2015.symbol"]
+                    }
+                }, "jsconfig.json",
+                {
+                    compilerOptions: <CompilerOptions>{
+                        allowJs: false,
+                        module: ModuleKind.CommonJS,
+                        target: ScriptTarget.ES5,
+                        noImplicitAny: false,
+                        sourceMap: false,
+                        lib: ["lib.es5.d.ts", "lib.es2015.core.d.ts", "lib.es2015.symbol.d.ts"]
+                    },
+                    errors: <Diagnostic[]>[]
+                }
+            );
+        });
+
+        it("Convert incorrectly format jsconfig.json to compiler-options ", () => {
+            assertCompilerOptions(
+                {
+                    "compilerOptions": {
+                        "modu": "commonjs",
+                    }
+                }, "jsconfig.json",
+                {
+                    compilerOptions: 
+                    {
+                        allowJs: true
+                    },
+                    errors: [{
+                        file: undefined,
+                        start: 0,
+                        length: 0,
+                        messageText: "Unknown compiler option 'modu'.",
+                        code: Diagnostics.Unknown_compiler_option_0.code,
+                        category: Diagnostics.Unknown_compiler_option_0.category
+                    }]
+                }
+            );
+        });
+
+        it("Convert default jsconfig.json to compiler-options ", () => {
+            assertCompilerOptions({}, "jsconfig.json",
+                {
+                    compilerOptions: 
+                    {
+                        allowJs: true
+                    },
+                    errors: <Diagnostic[]>[]
+                }
+            );
+        });
+    });
+}
diff --git a/tests/cases/unittests/convertToBase64.ts b/tests/cases/unittests/convertToBase64.ts
index 76f56f77477..c73d7531c40 100644
--- a/tests/cases/unittests/convertToBase64.ts
+++ b/tests/cases/unittests/convertToBase64.ts
@@ -8,26 +8,28 @@ module ts {
             assert.equal(actual, expected, "Encoded string using convertToBase64 does not match buffer.toString('base64')");
         }
 
-        it("Converts ASCII charaters correctly", () => {
-            runTest(" !\"#$ %&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~");
-        });
+        if (Buffer) {
+            it("Converts ASCII charaters correctly", () => {
+                runTest(" !\"#$ %&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~");
+            });
 
-        it("Converts escape sequences correctly", () => {
-            runTest("\t\n\r\\\"\'\u0062");
-        });
+            it("Converts escape sequences correctly", () => {
+                runTest("\t\n\r\\\"\'\u0062");
+            });
 
-        it("Converts simple unicode characters correctly", () => {
-            runTest("ΠΣ ٵپ औठ ⺐⺠");
-        });
+            it("Converts simple unicode characters correctly", () => {
+                runTest("ΠΣ ٵپ औठ ⺐⺠");
+            });
 
-        it("Converts simple code snippet correctly", () => {
-            runTest(`/// <reference path="file.ts" /> 
+            it("Converts simple code snippet correctly", () => {
+                runTest(`/// <reference path="file.ts" /> 
 var x: string = "string";
 console.log(x);`);
-        });
+            });
 
-        it("Converts simple code snippet with unicode characters correctly", () => {
-            runTest(`var Π = 3.1415; console.log(Π);`);
-        });
+            it("Converts simple code snippet with unicode characters correctly", () => {
+                runTest(`var Π = 3.1415; console.log(Π);`);
+            });
+        }
     });
 }
diff --git a/tests/cases/unittests/convertTypingOptionsFromJson.ts b/tests/cases/unittests/convertTypingOptionsFromJson.ts
new file mode 100644
index 00000000000..3cd15a17c61
--- /dev/null
+++ b/tests/cases/unittests/convertTypingOptionsFromJson.ts
@@ -0,0 +1,187 @@
+/// <reference path="..\..\..\src\harness\harness.ts" />
+/// <reference path="..\..\..\src\compiler\commandLineParser.ts" />
+
+namespace ts {
+    describe('convertTypingOptionsFromJson', () => {
+        function assertTypingOptions(json: any, configFileName: string, expectedResult: { typingOptions: TypingOptions, errors: Diagnostic[] }) {
+            const { options: actualTypingOptions, errors: actualErrors } = convertTypingOptionsFromJson(json["typingOptions"], "/apath/", configFileName);
+            const parsedTypingOptions = JSON.stringify(actualTypingOptions);
+            const expectedTypingOptions = JSON.stringify(expectedResult.typingOptions);
+            assert.equal(parsedTypingOptions, expectedTypingOptions);
+            
+            const expectedErrors = expectedResult.errors;
+            assert.isTrue(expectedResult.errors.length === actualErrors.length, `Expected error: ${JSON.stringify(expectedResult.errors)}. Actual error: ${JSON.stringify(actualErrors)}.`);
+            for (let i = 0; i < actualErrors.length; ++i) {
+                const actualError = actualErrors[i];
+                const expectedError = expectedErrors[i]; 
+                assert.equal(actualError.code, expectedError.code, `Expected error-code: ${JSON.stringify(expectedError.code)}. Actual error-code: ${JSON.stringify(actualError.code)}.`);
+                assert.equal(actualError.category, expectedError.category, `Expected error-category: ${JSON.stringify(expectedError.category)}. Actual error-category: ${JSON.stringify(actualError.category)}.`);
+            }
+        }
+
+        // tsconfig.json
+        it("Convert correctly format tsconfig.json to typing-options ", () => {
+            assertTypingOptions(
+                {
+                    "typingOptions":
+                    {
+                        "enableAutoDiscovery": true,
+                        "include": ["0.d.ts", "1.d.ts"],
+                        "exclude": ["0.js", "1.js"]
+                    }
+                },
+                "tsconfig.json",
+                {
+                    typingOptions:
+                    {
+                        enableAutoDiscovery: true,
+                        include: ["0.d.ts", "1.d.ts"],
+                        exclude: ["0.js", "1.js"]
+                    },
+                    errors: <Diagnostic[]>[]
+            });
+        });
+ 
+        it("Convert incorrect format tsconfig.json to typing-options ", () => {
+            assertTypingOptions(
+                {
+                    "typingOptions":
+                    {
+                        "enableAutoDiscovy": true,
+                    }
+                }, "tsconfig.json",
+                {
+                    typingOptions:
+                    {
+                        enableAutoDiscovery: false,
+                        include: [],
+                        exclude: []
+                    },
+                    errors: [
+                        {
+                            category: Diagnostics.Unknown_typing_option_0.category,
+                            code: Diagnostics.Unknown_typing_option_0.code,
+                            file: undefined,
+                            start: 0,
+                            length: 0,
+                            messageText: undefined
+                        }
+                    ]
+                });
+        });
+
+        it("Convert default tsconfig.json to typing-options ", () => {
+            assertTypingOptions({}, "tsconfig.json",
+                {
+                    typingOptions:
+                    {
+                        enableAutoDiscovery: false,
+                        include: [],
+                        exclude: []
+                    },
+                    errors: <Diagnostic[]>[]
+                });
+        });
+
+        it("Convert tsconfig.json with only enableAutoDiscovery property to typing-options ", () => {
+            assertTypingOptions(
+                {
+                    "typingOptions":
+                    {
+                        "enableAutoDiscovery": true
+                    }
+                }, "tsconfig.json",
+                {
+                    typingOptions:
+                    {
+                        enableAutoDiscovery: true,
+                        include: [],
+                        exclude: []
+                    },
+                    errors: <Diagnostic[]>[]
+                });
+        });
+
+        // jsconfig.json
+        it("Convert jsconfig.json to typing-options ", () => {
+            assertTypingOptions(
+                {
+                    "typingOptions":
+                    {
+                        "enableAutoDiscovery": false,
+                        "include": ["0.d.ts"],
+                        "exclude": ["0.js"]
+                    }
+                }, "jsconfig.json",
+                {
+                    typingOptions:
+                    {
+                        enableAutoDiscovery: false,
+                        include: ["0.d.ts"],
+                        exclude: ["0.js"]
+                    },
+                    errors: <Diagnostic[]>[]
+                });
+        });
+
+        it("Convert default jsconfig.json to typing-options ", () => {
+            assertTypingOptions({ }, "jsconfig.json",
+                {
+                    typingOptions:
+                    {
+                        enableAutoDiscovery: true,
+                        include: [],
+                        exclude: []
+                    },
+                    errors: <Diagnostic[]>[]
+                });
+        });
+
+        it("Convert incorrect format jsconfig.json to typing-options ", () => {
+            assertTypingOptions(
+                {
+                    "typingOptions":
+                    {
+                        "enableAutoDiscovy": true,
+                    }
+                }, "jsconfig.json",
+                {
+                    typingOptions:
+                    {
+                        enableAutoDiscovery: true,
+                        include: [],
+                        exclude: []
+                    },
+                    errors: [
+                        {
+                            category: Diagnostics.Unknown_compiler_option_0.category,
+                            code: Diagnostics.Unknown_typing_option_0.code,
+                            file: undefined,
+                            start: 0,
+                            length: 0,
+                            messageText: undefined
+                        }
+                    ]
+                });
+        });
+
+        it("Convert jsconfig.json with only enableAutoDiscovery property to typing-options ", () => {
+            assertTypingOptions(
+                {
+                    "typingOptions":
+                    {
+                        "enableAutoDiscovery": false
+                    }
+                }, "jsconfig.json",
+                {
+                    typingOptions:
+                    {
+                        enableAutoDiscovery: false,
+                        include: [],
+                        exclude: []
+                    },
+                    errors: <Diagnostic[]>[]
+                });
+        });
+    });
+}
diff --git a/tests/cases/unittests/jsDocParsing.ts b/tests/cases/unittests/jsDocParsing.ts
index b742ef783df..4d384f04e1c 100644
--- a/tests/cases/unittests/jsDocParsing.ts
+++ b/tests/cases/unittests/jsDocParsing.ts
@@ -27,41 +27,41 @@ module ts {
                 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("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("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", () => {
                 parsesIncorrectly("emptyType", "{}");
@@ -284,4 +284,4 @@ module ts {
             });
         });
     });
-}
\ No newline at end of file
+}
diff --git a/tests/cases/unittests/moduleResolution.ts b/tests/cases/unittests/moduleResolution.ts
index 1173f579f2c..29fde331892 100644
--- a/tests/cases/unittests/moduleResolution.ts
+++ b/tests/cases/unittests/moduleResolution.ts
@@ -48,7 +48,7 @@ module ts {
                     return hasProperty(directories, path); 
                 },
                 fileExists: path => {
-                    assert.isTrue(hasProperty(directories, getDirectoryPath(path)), "'fileExists' request in non-existing directory");
+                    assert.isTrue(hasProperty(directories, getDirectoryPath(path)), `'fileExists' '${path}' request in non-existing directory`);
                     return hasProperty(map, path);
                 }
             }
@@ -204,6 +204,13 @@ module ts {
                     "/a/b/c/d/node_modules/foo/index.ts",
                     "/a/b/c/d/node_modules/foo/index.tsx",
                     "/a/b/c/d/node_modules/foo/index.d.ts",
+                    "/a/b/c/d/node_modules/@types/foo.ts",
+                    "/a/b/c/d/node_modules/@types/foo.tsx",
+                    "/a/b/c/d/node_modules/@types/foo.d.ts",
+                    "/a/b/c/d/node_modules/@types/foo/package.json",
+                    "/a/b/c/d/node_modules/@types/foo/index.ts",
+                    "/a/b/c/d/node_modules/@types/foo/index.tsx",
+                    "/a/b/c/d/node_modules/@types/foo/index.d.ts",
                     "/a/b/c/node_modules/foo.ts",
                     "/a/b/c/node_modules/foo.tsx",
                     "/a/b/c/node_modules/foo.d.ts",
@@ -211,6 +218,13 @@ module ts {
                     "/a/b/c/node_modules/foo/index.ts",
                     "/a/b/c/node_modules/foo/index.tsx",
                     "/a/b/c/node_modules/foo/index.d.ts",
+                    "/a/b/c/node_modules/@types/foo.ts",
+                    "/a/b/c/node_modules/@types/foo.tsx",
+                    "/a/b/c/node_modules/@types/foo.d.ts",
+                    "/a/b/c/node_modules/@types/foo/package.json",
+                    "/a/b/c/node_modules/@types/foo/index.ts",
+                    "/a/b/c/node_modules/@types/foo/index.tsx",
+                    "/a/b/c/node_modules/@types/foo/index.d.ts",
                 ])
             }
         });
@@ -246,6 +260,13 @@ module ts {
                     "/a/node_modules/b/c/node_modules/d/node_modules/foo/index.ts",
                     "/a/node_modules/b/c/node_modules/d/node_modules/foo/index.tsx",
                     "/a/node_modules/b/c/node_modules/d/node_modules/foo/index.d.ts",
+                    "/a/node_modules/b/c/node_modules/d/node_modules/@types/foo.ts",
+                    "/a/node_modules/b/c/node_modules/d/node_modules/@types/foo.tsx",
+                    "/a/node_modules/b/c/node_modules/d/node_modules/@types/foo.d.ts",
+                    "/a/node_modules/b/c/node_modules/d/node_modules/@types/foo/package.json",
+                    "/a/node_modules/b/c/node_modules/d/node_modules/@types/foo/index.ts",
+                    "/a/node_modules/b/c/node_modules/d/node_modules/@types/foo/index.tsx",
+                    "/a/node_modules/b/c/node_modules/d/node_modules/@types/foo/index.d.ts",
                     "/a/node_modules/b/c/node_modules/foo.ts",
                     "/a/node_modules/b/c/node_modules/foo.tsx",
                     "/a/node_modules/b/c/node_modules/foo.d.ts",
@@ -253,6 +274,13 @@ module ts {
                     "/a/node_modules/b/c/node_modules/foo/index.ts",
                     "/a/node_modules/b/c/node_modules/foo/index.tsx",
                     "/a/node_modules/b/c/node_modules/foo/index.d.ts",
+                    "/a/node_modules/b/c/node_modules/@types/foo.ts",
+                    "/a/node_modules/b/c/node_modules/@types/foo.tsx",
+                    "/a/node_modules/b/c/node_modules/@types/foo.d.ts",
+                    "/a/node_modules/b/c/node_modules/@types/foo/package.json",
+                    "/a/node_modules/b/c/node_modules/@types/foo/index.ts",
+                    "/a/node_modules/b/c/node_modules/@types/foo/index.tsx",
+                    "/a/node_modules/b/c/node_modules/@types/foo/index.d.ts",
                     "/a/node_modules/b/node_modules/foo.ts",
                     "/a/node_modules/b/node_modules/foo.tsx",
                     "/a/node_modules/b/node_modules/foo.d.ts",
@@ -260,6 +288,13 @@ module ts {
                     "/a/node_modules/b/node_modules/foo/index.ts",
                     "/a/node_modules/b/node_modules/foo/index.tsx",
                     "/a/node_modules/b/node_modules/foo/index.d.ts",
+                    "/a/node_modules/b/node_modules/@types/foo.ts",
+                    "/a/node_modules/b/node_modules/@types/foo.tsx",
+                    "/a/node_modules/b/node_modules/@types/foo.d.ts",
+                    "/a/node_modules/b/node_modules/@types/foo/package.json",
+                    "/a/node_modules/b/node_modules/@types/foo/index.ts",
+                    "/a/node_modules/b/node_modules/@types/foo/index.tsx",
+                    "/a/node_modules/b/node_modules/@types/foo/index.d.ts",
                     "/a/node_modules/foo.ts",
                     "/a/node_modules/foo.tsx",
                     "/a/node_modules/foo.d.ts",
@@ -267,7 +302,6 @@ module ts {
                     "/a/node_modules/foo/index.ts",
                     "/a/node_modules/foo/index.tsx"
                 ]);
-
             }
         });
     });
@@ -664,6 +698,13 @@ import b = require("./moduleB.ts");
                     "/root/folder1/node_modules/file6/index.ts",
                     "/root/folder1/node_modules/file6/index.tsx",
                     "/root/folder1/node_modules/file6/index.d.ts",
+                    "/root/folder1/node_modules/@types/file6.ts",
+                    "/root/folder1/node_modules/@types/file6.tsx",
+                    "/root/folder1/node_modules/@types/file6.d.ts",
+                    "/root/folder1/node_modules/@types/file6/package.json",
+                    "/root/folder1/node_modules/@types/file6/index.ts",
+                    "/root/folder1/node_modules/@types/file6/index.tsx",
+                    "/root/folder1/node_modules/@types/file6/index.d.ts"
                     // success on /root/node_modules/file6.ts
                 ]);
 
@@ -814,7 +855,6 @@ import b = require("./moduleB.ts");
 
         it ("classic + rootDirs", () => {
             test(/*hasDirectoryExists*/ false);
-            test(/*hasDirectoryExists*/ true);
 
             function test(hasDirectoryExists: boolean) {
                 let file1: File = { name: "/root/folder1/file1.ts" };
@@ -844,24 +884,20 @@ import b = require("./moduleB.ts");
                     "/root/generated/folder1/file1.d.ts",
                     // then try alternative rootDir entry
                 ]);
-                check("../folder1/file1_1", file3, file4, [
-                    // load from initial location
+                check("folder1/file1_1", file3, file4, [
+                    // current location
+                    "/root/generated/folder2/folder1/file1_1.ts",
+                    "/root/generated/folder2/folder1/file1_1.tsx",
+                    "/root/generated/folder2/folder1/file1_1.d.ts",
+                    // other entry in rootDirs
                     "/root/generated/folder1/file1_1.ts",
                     "/root/generated/folder1/file1_1.tsx",
                     "/root/generated/folder1/file1_1.d.ts",
-                    // load from alternative rootDir entry
-                    "/root/folder1/file1_1.ts",
-                    "/root/folder1/file1_1.tsx",
-                    "/root/folder1/file1_1.d.ts",
-                    // fallback to classic
-                    // step1: initial location 
-                    "/root/generated/folder1/file1_1.ts",
-                    "/root/generated/folder1/file1_1.tsx",
-                    "/root/generated/folder1/file1_1.d.ts",
-                    // step2: walk 1 level up
+                    // fallback
                     "/root/folder1/file1_1.ts",
                     "/root/folder1/file1_1.tsx",
                     "/root/folder1/file1_1.d.ts",
+                    // found one
                 ]);
 
                 function check(name: string, container: File, expected: File, expectedFailedLookups: string[]) {
@@ -918,4 +954,119 @@ import b = require("./moduleB.ts");
             assert(!result.resolvedModule);
         });
     });
+
+    describe("Type reference directive resolution: ", () => {
+        function test(typesRoot: string, typeDirective: string, primary: boolean, initialFile: File, targetFile: File, ...otherFiles: File[]) {
+            const host = createModuleResolutionHost(false, ...[initialFile, targetFile].concat(...otherFiles));
+            const result = resolveTypeReferenceDirective(typeDirective, initialFile.name, {typesRoot}, host);
+            assert(result.resolvedTypeReferenceDirective.resolvedFileName !== undefined, "expected type directive to be resolved");
+            assert.equal(result.resolvedTypeReferenceDirective.resolvedFileName, targetFile.name, "unexpected result of type reference resolution");
+            assert.equal(result.resolvedTypeReferenceDirective.primary, primary, "unexpected 'primary' value");
+        }
+
+        it("Can be resolved from primary location", () => {
+            {
+                const f1 = { name: "/root/src/app.ts" }
+                const f2 = { name: "/root/src/types/lib/index.d.ts" }; 
+                test(/*typesRoot*/"/root/src", /* typeDirective */"lib", /*primary*/ true, f1, f2);
+            }
+            {
+                const f1 = { name: "/root/src/app.ts" }
+                const f2 = { name: "/root/src/types/lib/typings/lib.d.ts" };
+                const package = { name: "/root/src/types/lib/package.json", content: JSON.stringify({types: "typings/lib.d.ts"}) }; 
+                test(/*typesRoot*/"/root/src", /* typeDirective */"lib", /*primary*/ true, f1, f2, package);
+            }
+            {
+                const f1 = { name: "/root/src/app.ts" }
+                const f2 = { name: "/root/src/node_modules/lib/index.d.ts" }; 
+                test(/*typesRoot*/"/root/src", /* typeDirective */"lib", /*primary*/ true, f1, f2);
+            }
+            {
+                const f1 = { name: "/root/src/app.ts" }
+                const f2 = { name: "/root/src/node_modules/lib/typings/lib.d.ts" };
+                const package = { name: "/root/src/node_modules/lib/package.json", content: JSON.stringify({types: "typings/lib.d.ts"}) }; 
+                test(/*typesRoot*/"/root/src", /* typeDirective */"lib", /*primary*/ true, f1, f2, package);
+            }
+            {
+                const f1 = { name: "/root/src/app.ts" }
+                const f2 = { name: "/root/src/node_modules/@types/lib/index.d.ts" }; 
+                test(/*typesRoot*/"/root/src", /* typeDirective */"lib", /*primary*/ true, f1, f2);
+            }
+            {
+                const f1 = { name: "/root/src/app.ts" }
+                const f2 = { name: "/root/src/node_modules/@types/lib/typings/lib.d.ts" };
+                const package = { name: "/root/src/node_modules/@types/lib/package.json", content: JSON.stringify({types: "typings/lib.d.ts"}) }; 
+                test(/*typesRoot*/"/root/src", /* typeDirective */"lib", /*primary*/ true, f1, f2, package);
+            }
+        });
+        it("Can be resolved from secondary location", () => {
+            {
+                const f1 = { name: "/root/src/app.ts" }
+                const f2 = { name: "/root/node_modules/lib.d.ts" };
+                test(/*typesRoot*/"/root/src", /* typeDirective */"lib", /*primary*/ false, f1, f2);
+            }
+            {
+                const f1 = { name: "/root/src/app.ts" }
+                const f2 = { name: "/root/node_modules/lib/index.d.ts" };
+                test(/*typesRoot*/"/root/src", /* typeDirective */"lib", /*primary*/ false, f1, f2);
+            }
+            {
+                const f1 = { name: "/root/src/app.ts" }
+                const f2 = { name: "/root/node_modules/lib/typings/lib.d.ts" };
+                const package = { name: "/root/node_modules/lib/package.json", content: JSON.stringify({typings: "typings/lib.d.ts"}) };
+                test(/*typesRoot*/"/root/src", /* typeDirective */"lib", /*primary*/ false, f1, f2, package);
+            }
+            {
+                const f1 = { name: "/root/src/app.ts" }
+                const f2 = { name: "/root/node_modules/@types/lib/index.d.ts" };
+                test(/*typesRoot*/"/root/src", /* typeDirective */"lib", /*primary*/ false, f1, f2);
+            }
+            {
+                const f1 = { name: "/root/src/app.ts" }
+                const f2 = { name: "/root/node_modules/@types/lib/typings/lib.d.ts" };
+                const package = { name: "/root/node_modules/@types/lib/package.json", content: JSON.stringify({typings: "typings/lib.d.ts"}) };
+                test(/*typesRoot*/"/root/src", /* typeDirective */"lib", /*primary*/ false, f1, f2, package);
+            }
+        });
+        it("Primary resolution overrides secondary resolutions", () => {
+            {
+                const f1 = { name: "/root/src/a/b/c/app.ts" };
+                const f2 = { name: "/root/src/types/lib/index.d.ts" };
+                const f3 = { name: "/root/src/a/b/node_modules/lib.d.ts" }
+                test(/*typesRoot*/"/root/src", /* typeDirective */"lib", /*primary*/ true, f1, f2, f3);
+            }
+        })
+        it("Reused program keeps errors", () => {
+            const f1 = { name: "/root/src/a/b/c/d/e/app.ts", content: `/// <reference types="lib"/>` };
+            const f2 = { name: "/root/src/a/b/c/d/node_modules/lib/index.d.ts", content: `declare var x: number;` };
+            const f3 = { name: "/root/src/a/b/c/d/f/g/app.ts", content: `/// <reference types="lib"/>` };
+            const f4 = { name: "/root/src/a/b/c/d/f/node_modules/lib/index.d.ts", content: `declare var x: number;` };
+            const files = [f1, f2, f3, f4];
+            
+            const names = map(files, f => f.name);
+            const sourceFiles = arrayToMap(map(files, f => createSourceFile(f.name, f.content, ScriptTarget.ES6)), f => f.fileName);
+            const compilerHost: CompilerHost = {
+                fileExists : fileName => hasProperty(sourceFiles, fileName),
+                getSourceFile: fileName => sourceFiles[fileName],
+                getDefaultLibFileName: () => "lib.d.ts",
+                writeFile(file, text) {
+                    throw new Error("NYI");
+                },
+                getCurrentDirectory: () => "/",
+                getCanonicalFileName: f => f.toLowerCase(),
+                getNewLine: () => "\r\n",
+                useCaseSensitiveFileNames: () => false,
+                readFile: fileName => hasProperty(sourceFiles, fileName) ? sourceFiles[fileName].text : undefined
+            };
+            const program1 = createProgram(names, {}, compilerHost);
+            const diagnostics1 = program1.getFileProcessingDiagnostics().getDiagnostics();
+            assert.equal(diagnostics1.length, 1, "expected one diagnostic");
+
+            const program2 = createProgram(names, {}, compilerHost, program1);
+            assert.isTrue(program1.structureIsReused);
+            const diagnostics2 = program1.getFileProcessingDiagnostics().getDiagnostics();
+            assert.equal(diagnostics2.length, 1, "expected one diagnostic");
+            assert.equal(diagnostics1[0].messageText, diagnostics2[0].messageText, "expected one diagnostic");
+        })
+    });
 }
\ No newline at end of file
diff --git a/tests/cases/unittests/reuseProgramStructure.ts b/tests/cases/unittests/reuseProgramStructure.ts
index 5f313eeae2b..61d5d56ca2c 100644
--- a/tests/cases/unittests/reuseProgramStructure.ts
+++ b/tests/cases/unittests/reuseProgramStructure.ts
@@ -118,13 +118,13 @@ module ts {
                 return "";
             },
             getCanonicalFileName(fileName): string {
-                return sys.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
+                return sys && sys.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
             },
             useCaseSensitiveFileNames(): boolean {
-                return sys.useCaseSensitiveFileNames;
+                return sys && sys.useCaseSensitiveFileNames;
             },
             getNewLine(): string {
-                return sys.newLine;
+                return sys ? sys.newLine : newLine;
             },
             fileExists: fileName => hasProperty(files, fileName),
             readFile: fileName => {
@@ -160,36 +160,55 @@ module ts {
         return size;
     }
 
-    function checkResolvedModulesCache(program: Program, fileName: string, expectedContent: Map<ResolvedModule>): void {
+    function checkResolvedModule(expected: ResolvedModule, actual: ResolvedModule): void {
+        assert.isTrue(actual !== undefined);
+        assert.isTrue(expected.resolvedFileName === actual.resolvedFileName, `'resolvedFileName': expected '${expected.resolvedFileName}' to be equal to '${actual.resolvedFileName}'`);
+        assert.isTrue(expected.isExternalLibraryImport === actual.isExternalLibraryImport, `'isExternalLibraryImport': expected '${expected.isExternalLibraryImport}' to be equal to '${actual.isExternalLibraryImport}'`);
+    }
+
+    function checkResolvedTypeDirective(expected: ResolvedTypeReferenceDirective, actual: ResolvedTypeReferenceDirective): void {
+        assert.isTrue(actual !== undefined);
+        assert.isTrue(expected.resolvedFileName === actual.resolvedFileName, `'resolvedFileName': expected '${expected.resolvedFileName}' to be equal to '${actual.resolvedFileName}'`);
+        assert.isTrue(expected.primary === actual.primary, `'primary': expected '${expected.primary}' to be equal to '${actual.primary}'`);
+    }
+
+    function checkCache<T>(caption: string, program: Program, fileName: string, expectedContent: Map<T>, getCache: (f: SourceFile) => Map<T>, entryChecker: (expected: T, original:T) => void): void {
         let file = program.getSourceFile(fileName);
         assert.isTrue(file !== undefined, `cannot find file ${fileName}`);
+        const cache = getCache(file)
         if (expectedContent === undefined) {
-            assert.isTrue(file.resolvedModules === undefined, "expected resolvedModules to be undefined");
+            assert.isTrue(cache === undefined, `expected ${caption} to be undefined`);
         }
         else {
-            assert.isTrue(file.resolvedModules !== undefined, "expected resolvedModuled to be set");
-            let actualCacheSize = getSizeOfMap(file.resolvedModules);
+            assert.isTrue(cache !== undefined, `expected ${caption} to be set`);
+            let actualCacheSize = getSizeOfMap(cache);
             let expectedSize = getSizeOfMap(expectedContent);
             assert.isTrue(actualCacheSize === expectedSize, `expected actual size: ${actualCacheSize} to be equal to ${expectedSize}`);
 
             for (let id in expectedContent) {
                 if (hasProperty(expectedContent, id)) {
-                    assert.isTrue(hasProperty(file.resolvedModules, id), `expected ${id} to be found in resolved modules`);
+
                     if (expectedContent[id]) {
                         const expected = expectedContent[id];
-                        const actual = file.resolvedModules[id];
-                        assert.isTrue(actual !== undefined);
-                        assert.isTrue(expected.resolvedFileName === actual.resolvedFileName, `'resolvedFileName': expected '${expected.resolvedFileName}' to be equal to '${actual.resolvedFileName}'`);
-                        assert.isTrue(expected.isExternalLibraryImport === actual.isExternalLibraryImport, `'shouldBeProperExternalModule': expected '${expected.isExternalLibraryImport}' to be equal to '${actual.isExternalLibraryImport}'`);
-                    }
-                    else {
-                        assert.isTrue(file.resolvedModules[id] === undefined);
+                        const actual = cache[id];
+                        entryChecker(expected, actual);
                     }
                 }
+                else {
+                    assert.isTrue(cache[id] === undefined);
+                }
             }
         }
     }
 
+    function checkResolvedModulesCache(program: Program, fileName: string, expectedContent: Map<ResolvedModule>): void {
+        checkCache("resolved modules", program, fileName, expectedContent, f => f.resolvedModules, checkResolvedModule);
+    }
+
+    function checkResolvedTypeDirectivesCache(program: Program, fileName: string, expectedContent: Map<ResolvedTypeReferenceDirective>): void {
+        checkCache("resolved type directives", program, fileName, expectedContent, f => f.resolvedTypeReferenceDirectiveNames, checkResolvedTypeDirective);
+    }
+
     describe("Reuse program structure", () => {
         let target = ScriptTarget.Latest;
         let files = [
@@ -197,9 +216,11 @@ module ts {
                 `
 /// <reference path='b.ts'/>
 /// <reference path='non-existing-file.ts'/>
+/// <reference types="typerefs" />
 `, "",`var x = 1`) },
             { name: "b.ts", text: SourceText.New(`/// <reference path='c.ts'/>`, "", `var y = 2`) },
             { name: "c.ts", text: SourceText.New("", "", `var z = 1;`) },
+            { name: "types/typerefs/index.d.ts", text: SourceText.New("", "", `declare let z: number;`) },
         ]
 
         it("successful if change does not affect imports", () => {
@@ -213,6 +234,17 @@ module ts {
             assert.equal(program1Diagnostics.length, program2Diagnostics.length);
         });
 
+        it("successful if change does not affect type reference directives", () => {
+            var program_1 = newProgram(files, ["a.ts"], { target });
+            var program_2 = updateProgram(program_1, ["a.ts"], { target }, files => {
+                files[0].text = files[0].text.updateProgram("var x = 100");
+            });
+            assert.isTrue(program_1.structureIsReused);
+            let program1Diagnostics = program_1.getSemanticDiagnostics(program_1.getSourceFile("a.ts"))
+            let program2Diagnostics = program_2.getSemanticDiagnostics(program_1.getSourceFile("a.ts"))
+            assert.equal(program1Diagnostics.length, program2Diagnostics.length);
+        });
+
         it("fails if change affects tripleslash references", () => {
             var program_1 = newProgram(files, ["a.ts"], { target });
             var program_2 = updateProgram(program_1, ["a.ts"], { target }, files => {
@@ -232,11 +264,35 @@ module ts {
             assert.isTrue(!program_1.structureIsReused);
         });
 
+        it("fails if change affects type directives", () => {
+            var program_1 = newProgram(files, ["a.ts"], { target });
+            var program_2 = updateProgram(program_1, ["a.ts"], { target }, files => {
+                let newReferences = `
+/// <reference path='b.ts'/>
+/// <reference path='non-existing-file.ts'/>
+/// <reference types="typerefs1" />`;
+                files[0].text = files[0].text.updateReferences(newReferences);
+            });
+            assert.isTrue(!program_1.structureIsReused);
+        });
+
         it("fails if module kind changes", () => {
             var program_1 = newProgram(files, ["a.ts"], { target, module: ModuleKind.CommonJS });
             var program_2 = updateProgram(program_1, ["a.ts"], { target, module: ModuleKind.AMD }, files => void 0);
             assert.isTrue(!program_1.structureIsReused);
         });
+        
+        it("fails if rootdir changes", () => {
+            var program_1 = newProgram(files, ["a.ts"], { target, module: ModuleKind.CommonJS, rootDir: "/a/b" });
+            var program_2 = updateProgram(program_1, ["a.ts"], { target, module: ModuleKind.CommonJS, rootDir: "/a/c" }, files => void 0);
+            assert.isTrue(!program_1.structureIsReused);
+        });
+
+        it("fails if config path changes", () => {
+            var program_1 = newProgram(files, ["a.ts"], { target, module: ModuleKind.CommonJS, configFilePath: "/a/b/tsconfig.json" });
+            var program_2 = updateProgram(program_1, ["a.ts"], { target, module: ModuleKind.CommonJS, configFilePath: "/a/c/tsconfig.json" }, files => void 0);
+            assert.isTrue(!program_1.structureIsReused);
+        });
 
         it("resolution cache follows imports", () => {
             let files = [
@@ -274,5 +330,49 @@ module ts {
             assert.isTrue(!program_3.structureIsReused);
             checkResolvedModulesCache(program_4, "a.ts", { "b": { resolvedFileName: "b.ts" }, "c": undefined });
         });
-    })
+
+        it("resolved type directives cache follows type directives", () => {
+            let files = [
+                { name: "/a.ts", text: SourceText.New("/// <reference types='typedefs'/>", "", "var x = $") },
+                { name: "/types/typedefs/index.d.ts", text: SourceText.New("", "", "declare var $: number") },
+            ];
+            var options: CompilerOptions = { target, typesRoot: "/" };
+
+            var program_1 = newProgram(files, ["/a.ts"], options);
+            checkResolvedTypeDirectivesCache(program_1, "/a.ts", { "typedefs": { resolvedFileName: "/types/typedefs/index.d.ts", primary: true } });
+            checkResolvedTypeDirectivesCache(program_1, "/types/typedefs/index.d.ts", undefined);
+
+            var program_2 = updateProgram(program_1, ["/a.ts"], options, files => {
+                files[0].text = files[0].text.updateProgram("var x = 2");
+            });
+            assert.isTrue(program_1.structureIsReused);
+
+            // content of resolution cache should not change
+            checkResolvedTypeDirectivesCache(program_1, "/a.ts", { "typedefs": { resolvedFileName: "/types/typedefs/index.d.ts", primary: true } });
+            checkResolvedTypeDirectivesCache(program_1, "/types/typedefs/index.d.ts", undefined);
+
+            // type reference directives has changed - program is not reused
+            var program_3 = updateProgram(program_2, ["/a.ts"], options, files => {
+                files[0].text = files[0].text.updateReferences("");
+            });
+
+            assert.isTrue(!program_2.structureIsReused);
+            checkResolvedTypeDirectivesCache(program_3, "/a.ts", undefined);
+
+            var program_4 = updateProgram(program_3, ["/a.ts"], options, files => {
+                let newReferences = `/// <reference types="typedefs"/>
+                /// <reference types="typedefs2"/>
+                `;
+                files[0].text = files[0].text.updateReferences(newReferences);
+            });
+            assert.isTrue(!program_3.structureIsReused);
+            checkResolvedTypeDirectivesCache(program_1, "/a.ts", { "typedefs": { resolvedFileName: "/types/typedefs/index.d.ts", primary: true } });
+        });
+    });
+
+    describe("host is optional", () => {
+        it("should work if host is not provided", () => {
+            createProgram([], {});
+        })
+    });
 }
\ No newline at end of file
diff --git a/tests/cases/unittests/services/colorization.ts b/tests/cases/unittests/services/colorization.ts
index 82f2e106aa4..f40dc730800 100644
--- a/tests/cases/unittests/services/colorization.ts
+++ b/tests/cases/unittests/services/colorization.ts
@@ -9,10 +9,10 @@ interface ClassificationEntry {
 
 describe('Colorization', function () {
     // Use the shim adapter to ensure test coverage of the shim layer for the classifier
-    var languageServiceAdapter = new Harness.LanguageService.ShimLanugageServiceAdapter(/*preprocessToResolve*/ false);
+    var languageServiceAdapter = new Harness.LanguageService.ShimLanguageServiceAdapter(/*preprocessToResolve*/ false);
     var classifier = languageServiceAdapter.getClassifier();
 
-    function getEntryAtPosistion(result: ts.ClassificationResult, position: number) {
+    function getEntryAtPosition(result: ts.ClassificationResult, position: number) {
         var entryPosition = 0;
         for (var i = 0, n = result.entries.length; i < n; i++) {
             var entry = result.entries[i];
@@ -55,7 +55,7 @@ describe('Colorization', function () {
                 var actualEntryPosition = expectedEntry.position !== undefined ? expectedEntry.position : text.indexOf(expectedEntry.value);
                 assert(actualEntryPosition >= 0, "token: '" + expectedEntry.value + "' does not exit in text: '" + text + "'.");
 
-                var actualEntry = getEntryAtPosistion(result, actualEntryPosition);
+                var actualEntry = getEntryAtPosition(result, actualEntryPosition);
 
                 assert(actualEntry, "Could not find classification entry for '" + expectedEntry.value + "' at position: " + actualEntryPosition);
                 assert.equal(actualEntry.classification, expectedEntry.classification, "Classification class does not match expected. Expected: " + ts.TokenClass[expectedEntry.classification] + ", Actual: " + ts.TokenClass[actualEntry.classification]);
diff --git a/tests/cases/unittests/services/preProcessFile.ts b/tests/cases/unittests/services/preProcessFile.ts
index d9ddaf0f256..7fa25b440c5 100644
--- a/tests/cases/unittests/services/preProcessFile.ts
+++ b/tests/cases/unittests/services/preProcessFile.ts
@@ -1,48 +1,41 @@
 /// <reference path="..\..\..\..\src\harness\external\mocha.d.ts" />
 /// <reference path="..\..\..\..\src\harness\harnessLanguageService.ts" />
 
+declare namespace chai.assert {
+    function deepEqual(actual: any, expected: any): void;
+}
+
 describe('PreProcessFile:', function () {
     function test(sourceText: string, readImportFile: boolean, detectJavaScriptImports: boolean, expectedPreProcess: ts.PreProcessedFileInfo): void {
         var resultPreProcess = ts.preProcessFile(sourceText, readImportFile, detectJavaScriptImports);
 
-        var resultIsLibFile = resultPreProcess.isLibFile;
-        var resultImportedFiles = resultPreProcess.importedFiles;
-        var resultReferencedFiles = resultPreProcess.referencedFiles;
+        assert.equal(resultPreProcess.isLibFile, expectedPreProcess.isLibFile, "Pre-processed file has different value for isLibFile. Expected: " + expectedPreProcess.isLibFile + ". Actual: " + resultPreProcess.isLibFile);
 
-        var expectedIsLibFile = expectedPreProcess.isLibFile;
-        var expectedImportedFiles = expectedPreProcess.importedFiles;
-        var expectedReferencedFiles = expectedPreProcess.referencedFiles;
+        checkFileReferenceList("Imported files", expectedPreProcess.importedFiles, resultPreProcess.importedFiles);
+        checkFileReferenceList("Referenced files", expectedPreProcess.referencedFiles, resultPreProcess.referencedFiles);
+        checkFileReferenceList("Type reference directives", expectedPreProcess.typeReferenceDirectives, resultPreProcess.typeReferenceDirectives);
 
-        assert.equal(resultIsLibFile, expectedIsLibFile, "Pre-processed file has different value for isLibFile. Expected: " + expectedPreProcess + ". Actual: " + resultIsLibFile);
+        assert.deepEqual(resultPreProcess.ambientExternalModules, expectedPreProcess.ambientExternalModules);
+    }
 
-        assert.equal(resultImportedFiles.length, expectedImportedFiles.length,
-            "Array's length of imported files does not match expected. Expected: " + expectedImportedFiles.length + ". Actual: " + resultImportedFiles.length);
-
-        assert.equal(resultReferencedFiles.length, expectedReferencedFiles.length,
-            "Array's length of referenced files does not match expected. Expected: " + expectedReferencedFiles.length + ". Actual: " + resultReferencedFiles.length);
-
-        for (var i = 0; i < expectedImportedFiles.length; ++i) {
-            var resultImportedFile = resultImportedFiles[i];
-            var expectedImportedFile = expectedImportedFiles[i];
-
-            assert.equal(resultImportedFile.fileName, expectedImportedFile.fileName, "Imported file path does not match expected. Expected: " + expectedImportedFile.fileName + ". Actual: " + resultImportedFile.fileName + ".");
-
-            assert.equal(resultImportedFile.pos, expectedImportedFile.pos, "Imported file position does not match expected. Expected: " + expectedImportedFile.pos + ". Actual: " + resultImportedFile.pos + ".");
-
-            assert.equal(resultImportedFile.end, expectedImportedFile.end, "Imported file length does not match expected. Expected: " + expectedImportedFile.end + ". Actual: " + resultImportedFile.end + ".");
+    function checkFileReferenceList(kind: string, expected: ts.FileReference[], actual: ts.FileReference[]) {
+        if (expected === actual) {
+            return;
         }
+        if (!expected) {
+            assert.isTrue(false, `Expected ${JSON.stringify(expected)}, got ${JSON.stringify(actual)}`);
+        }
+        assert.equal(actual.length, expected.length, `[${kind}] Actual array's length does not match expected length. Expected files: ${JSON.stringify(expected)}, actual files: ${JSON.stringify(actual)}`);
 
-        for (var i = 0; i < expectedReferencedFiles.length; ++i) {
-            var resultReferencedFile = resultReferencedFiles[i];
-            var expectedReferencedFile = expectedReferencedFiles[i];
-
-            assert.equal(resultReferencedFile.fileName, expectedReferencedFile.fileName, "Referenced file path does not match expected. Expected: " + expectedReferencedFile.fileName + ". Actual: " + resultReferencedFile.fileName + ".");
-
-            assert.equal(resultReferencedFile.pos, expectedReferencedFile.pos, "Referenced file position does not match expected. Expected: " + expectedReferencedFile.pos + ". Actual: " + resultReferencedFile.pos + ".");
-
-            assert.equal(resultReferencedFile.end, expectedReferencedFile.end, "Referenced file length does not match expected. Expected: " + expectedReferencedFile.end + ". Actual: " + resultReferencedFile.end + ".");
+        for (var i = 0; i < expected.length; ++i) {
+            var actualReference = actual[i];
+            var expectedReference = expected[i];
+            assert.equal(actualReference.fileName, expectedReference.fileName, `[${kind}] actual file path does not match expected. Expected: "${expectedReference.fileName}". Actual: "${actualReference.fileName}".`);
+            assert.equal(actualReference.pos, expectedReference.pos, `[${kind}] actual file start position does not match expected. Expected: "${expectedReference.pos}". Actual: "${actualReference.pos}".`);
+            assert.equal(actualReference.end, expectedReference.end, `[${kind}] actual file end pos does not match expected. Expected: "${expectedReference.end}". Actual: "${actualReference.end}".`);
         }
     }
+    
     describe("Test preProcessFiles,", function () {
         it("Correctly return referenced files from triple slash", function () {
             test("///<reference path = \"refFile1.ts\" />" + "\n" + "///<reference path =\"refFile2.ts\"/>" + "\n" + "///<reference path=\"refFile3.ts\" />" + "\n" + "///<reference path= \"..\\refFile4d.ts\" />", 
@@ -52,6 +45,7 @@ describe('PreProcessFile:', function () {
                     referencedFiles: [{ fileName: "refFile1.ts", pos: 0, end: 37 }, { fileName: "refFile2.ts", pos: 38, end: 73 },
                         { fileName: "refFile3.ts", pos: 74, end: 109 }, { fileName: "..\\refFile4d.ts", pos: 110, end: 150 }],
                     importedFiles: <ts.FileReference[]>[],
+                    typeReferenceDirectives: [],
                     ambientExternalModules: undefined,
                     isLibFile: false
                 });
@@ -64,6 +58,7 @@ describe('PreProcessFile:', function () {
                 {
                     referencedFiles: <ts.FileReference[]>[],
                     importedFiles: <ts.FileReference[]>[],
+                    typeReferenceDirectives: [],
                     ambientExternalModules: undefined,
                     isLibFile: false
                 });
@@ -75,6 +70,7 @@ describe('PreProcessFile:', function () {
                 /* detectJavaScriptImports */ false,
                 {
                     referencedFiles: <ts.FileReference[]>[],
+                    typeReferenceDirectives: [],
                     importedFiles: [{ fileName: "r1.ts", pos: 20, end: 25 }, { fileName: "r2.ts", pos: 49, end: 54 }, { fileName: "r3.ts", pos: 78, end: 83 },
                         { fileName: "r4.ts", pos: 106, end: 111 }, { fileName: "r5.ts", pos: 138, end: 143 }],
                     ambientExternalModules: undefined,
@@ -88,6 +84,7 @@ describe('PreProcessFile:', function () {
                 /* detectJavaScriptImports */ false,
                 {
                     referencedFiles: <ts.FileReference[]>[],
+                    typeReferenceDirectives: [],
                     importedFiles: <ts.FileReference[]>[],
                     ambientExternalModules: undefined,
                     isLibFile: false
@@ -100,6 +97,7 @@ describe('PreProcessFile:', function () {
                 /* detectJavaScriptImports */ false,
                 {
                     referencedFiles: <ts.FileReference[]>[],
+                    typeReferenceDirectives: [],
                     importedFiles: [{ fileName: "r3.ts", pos: 73, end: 78 }],
                     ambientExternalModules: undefined,
                     isLibFile: false
@@ -112,6 +110,7 @@ describe('PreProcessFile:', function () {
                 /* detectJavaScriptImports */ false,
                 {
                     referencedFiles: [{ fileName: "refFile1.ts", pos: 0, end: 35 }, { fileName: "refFile2.ts", pos: 36, end: 71 }],
+                    typeReferenceDirectives: [],
                     importedFiles: [{ fileName: "r1.ts", pos: 92, end: 97 }, { fileName: "r2.ts", pos: 121, end: 126 }],
                     ambientExternalModules: undefined,
                     isLibFile: false
@@ -124,6 +123,7 @@ describe('PreProcessFile:', function () {
                 /* detectJavaScriptImports */ false,
                 {
                     referencedFiles: [{ fileName: "refFile1.ts", pos: 0, end: 35 }],
+                    typeReferenceDirectives: [],
                     importedFiles: [{ fileName: "r1.ts", pos: 91, end: 96 }, { fileName: "r3.ts", pos: 148, end: 153 }],
                     ambientExternalModules: undefined,
                     isLibFile: false
@@ -142,6 +142,7 @@ describe('PreProcessFile:', function () {
                 /* detectJavaScriptImports */ false,
                 {
                     referencedFiles: [],
+                    typeReferenceDirectives: [],
                     importedFiles: [
                         { fileName: "m1", pos: 20, end: 22 },
                         { fileName: "m2", pos: 51, end: 53 },
@@ -165,6 +166,7 @@ describe('PreProcessFile:', function () {
                 /* detectJavaScriptImports */ false,
                 {
                     referencedFiles: [],
+                    typeReferenceDirectives: [],
                     importedFiles: [
                         { fileName: "m1", pos: 14, end: 16 },
                         { fileName: "m2", pos: 36, end: 38 },
@@ -183,11 +185,12 @@ describe('PreProcessFile:', function () {
                function foo() {
                }
                `, 
-                /* readImports */ false,
+                /* readImports */ true,
                 /* detectJavaScriptImports */ false,
  
                {
                    referencedFiles: [],
+                   typeReferenceDirectives: [],
                    importedFiles: [],
                    ambientExternalModules: ["B"],
                    isLibFile: false
@@ -200,6 +203,7 @@ describe('PreProcessFile:', function () {
                 /* detectJavaScriptImports */ false,
                 {
                     referencedFiles: [],
+                    typeReferenceDirectives: [],
                     importedFiles: [
                         { fileName: "m1", pos: 26, end: 28 }
                     ],
@@ -218,6 +222,7 @@ describe('PreProcessFile:', function () {
                 /* detectJavaScriptImports */ true,
                 {
                     referencedFiles: [],
+                    typeReferenceDirectives: [],
                     importedFiles: [
                         { fileName: "m1", pos: 39, end: 41 },
                         { fileName: "m2", pos: 74, end: 76 },
@@ -237,6 +242,7 @@ describe('PreProcessFile:', function () {
                 /* detectJavaScriptImports */ true,
                 {
                     referencedFiles: [],
+                    typeReferenceDirectives: [],
                     importedFiles: [
                         { fileName: "mod1", pos: 21, end: 25 },
                         { fileName: "mod2", pos: 29, end: 33 },
@@ -254,6 +260,7 @@ describe('PreProcessFile:', function () {
                 /* detectJavaScriptImports */ true,
                 {
                     referencedFiles: [],
+                    typeReferenceDirectives: [],
                     importedFiles: [
                         { fileName: "mod1", pos: 28, end: 32 },
                         { fileName: "mod2", pos: 36, end: 40 },
@@ -262,6 +269,196 @@ describe('PreProcessFile:', function () {
                     isLibFile: false
                 })
         });
+        it("correctly handles augmentations in external modules - 1", () => {
+            test(`
+            declare module "../Observable" {
+                interface I {}
+            }
+            
+            export {}
+            `, 
+            /*readImportFile*/ true,
+            /*detectJavaScriptImports*/ false,
+            {
+                referencedFiles: [],
+                typeReferenceDirectives: [],
+                importedFiles: [
+                    { "fileName": "../Observable", "pos": 28, "end": 41 }
+                ],
+                ambientExternalModules: undefined,
+                isLibFile: false
+            })
+        });
+        it("correctly handles augmentations in external modules - 2", () => {
+            test(`
+            declare module "../Observable" {
+                interface I {}
+            }
+            
+            import * as x from "m";
+            `, 
+            /*readImportFile*/ true,
+            /*detectJavaScriptImports*/ false,
+            {
+                referencedFiles: [],
+                typeReferenceDirectives: [],
+                importedFiles: [
+                    { "fileName": "m", "pos": 135, "end": 136 },
+                    { "fileName": "../Observable", "pos": 28, "end": 41 }
+                ],
+                ambientExternalModules: undefined,
+                isLibFile: false
+            })
+        });
+        it("correctly handles augmentations in external modules - 3", () => {
+            test(`
+            declare module "../Observable" {
+                interface I {}
+            }
+            
+            import m = require("m");
+            `, 
+            /*readImportFile*/ true,
+            /*detectJavaScriptImports*/ false,
+            {
+                referencedFiles: [],
+                typeReferenceDirectives: [],
+                importedFiles: [
+                    { "fileName": "m", "pos": 135, "end": 136 },
+                    { "fileName": "../Observable", "pos": 28, "end": 41 }
+                ],
+                ambientExternalModules: undefined,
+                isLibFile: false
+            })
+        });
+        it("correctly handles augmentations in external modules - 4", () => {
+            test(`
+            declare module "../Observable" {
+                interface I {}
+            }
+            namespace N {}
+            export = N;
+            `, 
+            /*readImportFile*/ true,
+            /*detectJavaScriptImports*/ false,
+            {
+                referencedFiles: [],
+                typeReferenceDirectives: [],
+                importedFiles: [
+                    { "fileName": "../Observable", "pos": 28, "end": 41 }
+                ],
+                ambientExternalModules: undefined,
+                isLibFile: false
+            })
+        });
+        it("correctly handles augmentations in external modules - 5", () => {
+            test(`
+            declare module "../Observable" {
+                interface I {}
+            }
+            namespace N {}
+            export import IN = N;
+            `, 
+            /*readImportFile*/ true,
+            /*detectJavaScriptImports*/ false,
+            {
+                referencedFiles: [],
+                typeReferenceDirectives: [],
+                importedFiles: [
+                    { "fileName": "../Observable", "pos": 28, "end": 41 }
+                ],
+                ambientExternalModules: undefined,
+                isLibFile: false
+            })
+        });
+        it("correctly handles augmentations in external modules - 6", () => {
+            test(`
+            declare module "../Observable" {
+                interface I {}
+            }
+            export let x = 1;
+            `, 
+            /*readImportFile*/ true,
+            /*detectJavaScriptImports*/ false,
+            {
+                referencedFiles: [],
+                typeReferenceDirectives: [],
+                importedFiles: [
+                    { "fileName": "../Observable", "pos": 28, "end": 41 }
+                ],
+                ambientExternalModules: undefined,
+                isLibFile: false
+            })
+        });
+        it ("correctly handles augmentations in ambient external modules - 1", () => {
+            test(`
+            declare module "m1" {
+                export * from "m2";
+                declare module "augmentation" {
+                    interface I {}
+                }
+            }
+            `, 
+            /*readImportFile*/ true,
+            /*detectJavaScriptImports*/ false,
+            {
+                referencedFiles: [],
+                typeReferenceDirectives: [],
+                importedFiles: [
+                    { "fileName": "m2", "pos": 65, "end": 67 },
+                    { "fileName": "augmentation", "pos": 102, "end": 114 }
+                ],
+                ambientExternalModules: ["m1"],
+                isLibFile: false
+            });
+        });
+        it ("correctly handles augmentations in ambient external modules - 2", () => {
+            test(`
+            namespace M { var x; }
+            import IM = M;
+            declare module "m1" {
+                export * from "m2";
+                declare module "augmentation" {
+                    interface I {}
+                }
+            }
+            `, 
+            /*readImportFile*/ true,
+            /*detectJavaScriptImports*/ false,
+            {
+                referencedFiles: [],
+                typeReferenceDirectives: [],
+                importedFiles: [
+                    { "fileName": "m2", "pos": 127, "end": 129 },
+                    { "fileName": "augmentation", "pos": 164, "end": 176 }
+                ],
+                ambientExternalModules: ["m1"],
+                isLibFile: false
+            });
+        });
+        it ("correctly recognizes type reference directives", () => {
+            test(`
+            /// <reference path="a"/>
+            /// <reference types="a1"/>
+            /// <reference path="a2"/>
+            /// <reference types="a3"/>
+            `,
+            /*readImportFile*/ true,
+            /*detectJavaScriptImports*/ false,
+            {
+                referencedFiles: [
+                    { "pos": 13, "end": 38, "fileName": "a" },
+                    { "pos": 91, "end": 117, "fileName": "a2" }
+                ],
+                typeReferenceDirectives: [
+                    { "pos": 51, "end": 78, "fileName": "a1" },
+                    { "pos": 130, "end": 157, "fileName": "a3" }
+                ],
+                importedFiles: [],
+                ambientExternalModules: undefined,
+                isLibFile: false
+            });
+        })
     });
 });
 
diff --git a/tests/cases/unittests/session.ts b/tests/cases/unittests/session.ts
index 41f4bc599f6..5625bdb6bf3 100644
--- a/tests/cases/unittests/session.ts
+++ b/tests/cases/unittests/session.ts
@@ -17,6 +17,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 {}
     };
@@ -36,7 +37,7 @@ namespace ts.server {
         let lastSent: protocol.Message;
 
         beforeEach(() => {
-            session = new Session(mockHost, Buffer.byteLength, process.hrtime, mockLogger);
+            session = new Session(mockHost, Utils.byteLength, process.hrtime, mockLogger);
             session.send = (msg: protocol.Message) => {
                 lastSent = msg;
             };
@@ -161,7 +162,7 @@ namespace ts.server {
             it("is an overrideable handle which sends protocol messages over the wire", () => {
                 const msg = {seq: 0, type: "none"};
                 const strmsg = JSON.stringify(msg);
-                const len = 1 + Buffer.byteLength(strmsg, "utf8");
+                const len = 1 + Utils.byteLength(strmsg, "utf8");
                 const resultMsg = `Content-Length: ${len}\r\n\r\n${strmsg}\n`;
 
                 session.send = Session.prototype.send;
@@ -253,7 +254,7 @@ namespace ts.server {
             lastSent: protocol.Message;
             customHandler = "testhandler";
             constructor() {
-                super(mockHost, Buffer.byteLength, process.hrtime, mockLogger);
+                super(mockHost, Utils.byteLength, process.hrtime, mockLogger);
                 this.addProtocolHandler(this.customHandler, () => {
                     return {response: undefined, responseRequired: true};
                 });
@@ -311,7 +312,7 @@ namespace ts.server {
         class InProcSession extends Session {
             private queue: protocol.Request[] = [];
             constructor(private client: InProcClient) {
-                super(mockHost, Buffer.byteLength, process.hrtime, mockLogger);
+                super(mockHost, Utils.byteLength, process.hrtime, mockLogger);
                 this.addProtocolHandler("echo", (req: protocol.Request) => ({
                     response: req.arguments,
                     responseRequired: true
diff --git a/tests/cases/unittests/transpile.ts b/tests/cases/unittests/transpile.ts
index 084b2b08eab..fb16388ce2f 100644
--- a/tests/cases/unittests/transpile.ts
+++ b/tests/cases/unittests/transpile.ts
@@ -5,300 +5,195 @@ module ts {
 
         interface TranspileTestSettings {
             options?: TranspileOptions;
-            expectedOutput?: string;
-            expectedDiagnosticCodes?: number[];
         }
 
-        function checkDiagnostics(diagnostics: Diagnostic[], expectedDiagnosticCodes?: number[]) {
-            if(!expectedDiagnosticCodes) {
-                return;
-            }
+        function transpilesCorrectly(name: string, input: string, testSettings: TranspileTestSettings) {
+            describe(name, () => {
+                let justName: string;
+                let transpileOptions: TranspileOptions;
+                let canUseOldTranspile: boolean;
+                let toBeCompiled: Harness.Compiler.TestFile[];
+                let transpileResult: TranspileOutput;
+                let oldTranspileResult: string;
+                let oldTranspileDiagnostics: Diagnostic[];
 
-            for (let i = 0; i < expectedDiagnosticCodes.length; i++) {
-                assert.equal(expectedDiagnosticCodes[i], diagnostics[i] && diagnostics[i].code, `Could not find expeced diagnostic.`);
-            }
-            assert.equal(diagnostics.length, expectedDiagnosticCodes.length, "Resuting diagnostics count does not match expected");
-        }
+                before(() => {
+                    transpileOptions = testSettings.options || {};
+                    if (!transpileOptions.compilerOptions) {
+                        transpileOptions.compilerOptions = {};
+                    }
 
-        function test(input: string, testSettings: TranspileTestSettings): void {
+                    if (transpileOptions.compilerOptions.newLine === undefined) {
+                        // use \r\n as default new line
+                        transpileOptions.compilerOptions.newLine = ts.NewLineKind.CarriageReturnLineFeed;
+                    }
 
-            let transpileOptions: TranspileOptions = testSettings.options || {};
-            if (!transpileOptions.compilerOptions) {
-                transpileOptions.compilerOptions = {};
-            }
-            if(transpileOptions.compilerOptions.newLine === undefined) {
-                // use \r\n as default new line
-                transpileOptions.compilerOptions.newLine = ts.NewLineKind.CarriageReturnLineFeed;
-            }
+                    transpileOptions.compilerOptions.sourceMap = true;
 
-            let canUseOldTranspile = !transpileOptions.renamedDependencies;
+                    if (!transpileOptions.fileName) {
+                        transpileOptions.fileName = transpileOptions.compilerOptions.jsx ? "file.tsx" : "file.ts";
+                    }
 
-            transpileOptions.reportDiagnostics = true;
-            let transpileModuleResult = transpileModule(input, transpileOptions);
+                    transpileOptions.reportDiagnostics = true;
 
-            checkDiagnostics(transpileModuleResult.diagnostics, testSettings.expectedDiagnosticCodes);
+                    justName = "transpile/" + name.replace(/[^a-z0-9\-. ]/ig, "") + (transpileOptions.compilerOptions.jsx ? ".tsx" : ".ts");
+                    toBeCompiled = [{
+                        unitName: transpileOptions.fileName,
+                        content: input
+                    }];
 
-            if (testSettings.expectedOutput !== undefined) {
-                assert.equal(transpileModuleResult.outputText, testSettings.expectedOutput);
-            }
+                    canUseOldTranspile = !transpileOptions.renamedDependencies;
+                    transpileResult = transpileModule(input, transpileOptions);
 
-            if (canUseOldTranspile) {
-                let diagnostics: Diagnostic[] = [];
-                let transpileResult = transpile(input, transpileOptions.compilerOptions, transpileOptions.fileName, diagnostics, transpileOptions.moduleName);
-                checkDiagnostics(diagnostics, testSettings.expectedDiagnosticCodes);
-                if (testSettings.expectedOutput) {
-                    assert.equal(transpileResult, testSettings.expectedOutput);
-                }
-            }
-
-            // check source maps
-            if (!transpileOptions.compilerOptions) {
-                transpileOptions.compilerOptions = {};
-            }
-
-            if (!transpileOptions.fileName) {
-                transpileOptions.fileName = transpileOptions.compilerOptions.jsx ? "file.tsx" : "file.ts";
-            }
-
-            transpileOptions.compilerOptions.sourceMap = true;
-            let transpileModuleResultWithSourceMap = transpileModule(input, transpileOptions);
-            assert.isTrue(transpileModuleResultWithSourceMap.sourceMapText !== undefined);
-
-            let expectedSourceMapFileName = removeFileExtension(getBaseFileName(normalizeSlashes(transpileOptions.fileName))) + ".js.map";
-            let expectedSourceMappingUrlLine = `//# sourceMappingURL=${expectedSourceMapFileName}`;
-
-            if (testSettings.expectedOutput !== undefined) {
-                assert.equal(transpileModuleResultWithSourceMap.outputText, testSettings.expectedOutput + expectedSourceMappingUrlLine);
-            }
-            else {
-                // expected output is not set, just verify that output text has sourceMappingURL as a last line
-                let output = transpileModuleResultWithSourceMap.outputText;
-                assert.isTrue(output.length >= expectedSourceMappingUrlLine.length);
-                if (output.length === expectedSourceMappingUrlLine.length) {
-                    assert.equal(output, expectedSourceMappingUrlLine);
-                }
-                else {
-                    let suffix = getNewLineCharacter(transpileOptions.compilerOptions) + expectedSourceMappingUrlLine
-                    assert.isTrue(output.indexOf(suffix, output.length - suffix.length) !== -1);
-                }
-            }
-
-        }
-
-        it("Generates correct compilerOptions diagnostics", () => {
-            // Expecting 5047: "Option 'isolatedModules' can only be used when either option'--module' is provided or option 'target' is 'ES6' or higher."
-            test(`var x = 0;`, { expectedDiagnosticCodes: [5047] });
-        });
-
-        it("Generates no diagnostics with valid inputs", () => {
-            // No errors
-            test(`var x = 0;`, { options: { compilerOptions: { module: ModuleKind.CommonJS } } });
-        });
-
-        it("Generates no diagnostics for missing file references", () => {
-            test(`/// <reference path="file2.ts" />
-var x = 0;`,
-                { options: { compilerOptions: { module: ModuleKind.CommonJS } } });
-        });
-
-        it("Generates no diagnostics for missing module imports", () => {
-            test(`import {a} from "module2";`,
-                { options: { compilerOptions: { module: ModuleKind.CommonJS } } });
-        });
-
-        it("Generates expected syntactic diagnostics", () => {
-            test(`a b`,
-                { options: { compilerOptions: { module: ModuleKind.CommonJS } }, expectedDiagnosticCodes: [1005] }); /// 1005: ';' Expected
-        });
-
-        it("Does not generate semantic diagnostics", () => {
-            test(`var x: string = 0;`,
-                { options: { compilerOptions: { module: ModuleKind.CommonJS } } });
-        });
-
-        it("Generates module output", () => {
-            test(`var x = 0;`,
-                {
-                    options: { compilerOptions: { module: ModuleKind.AMD } },
-                    expectedOutput: `define(["require", "exports"], function (require, exports) {\r\n    "use strict";\r\n    var x = 0;\r\n});\r\n`
+                    if (canUseOldTranspile) {
+                        oldTranspileDiagnostics = [];
+                        oldTranspileResult = transpile(input, transpileOptions.compilerOptions, transpileOptions.fileName, oldTranspileDiagnostics, transpileOptions.moduleName);
+                    }
                 });
-        });
 
-        it("Uses correct newLine character", () => {
-            test(`var x = 0;`,
-                {
-                    options: { compilerOptions: { module: ModuleKind.CommonJS, newLine: NewLineKind.LineFeed } },
-                    expectedOutput: `"use strict";\nvar x = 0;\n`
+                after(() => {
+                    justName = undefined;
+                    transpileOptions = undefined;
+                    canUseOldTranspile = undefined;
+                    toBeCompiled = undefined;
+                    transpileResult = undefined;
+                    oldTranspileResult = undefined;
+                    oldTranspileDiagnostics = undefined;
                 });
-        });
 
-        it("Sets module name", () => {
-            let output =
-                `System.register("NamedModule", [], function(exports_1, context_1) {\n` +
-                `    "use strict";\n` +
-                `    var __moduleName = context_1 && context_1.id;\n` +
-                `    var x;\n` +
-                `    return {\n` +
-                `        setters:[],\n` +
-                `        execute: function() {\n` +
-                `            var x = 1;\n` +
-                `        }\n` +
-                `    }\n` +
-                `});\n`;
-            test("var x = 1;",
-                {
-                    options: { compilerOptions: { module: ModuleKind.System, newLine: NewLineKind.LineFeed }, moduleName: "NamedModule" },
-                    expectedOutput: output
-                })
-        });
-
-        it("No extra errors for file without extension", () => {
-            test(`"use strict";\r\nvar x = 0;`, { options: { compilerOptions: { module: ModuleKind.CommonJS }, fileName: "file" } });
-        });
-
-        it("Rename dependencies - System", () => {
-            let input =
-                `import {foo} from "SomeName";\n` +
-                `declare function use(a: any);\n` +
-                `use(foo);`
-            let output =
-                `System.register(["SomeOtherName"], function(exports_1, context_1) {\n` +
-                `    "use strict";\n` +
-                `    var __moduleName = context_1 && context_1.id;\n` +
-                `    var SomeName_1;\n` +
-                `    return {\n` +
-                `        setters:[\n` +
-                `            function (SomeName_1_1) {\n` +
-                `                SomeName_1 = SomeName_1_1;\n` +
-                `            }],\n` +
-                `        execute: function() {\n` +
-                `            use(SomeName_1.foo);\n` +
-                `        }\n` +
-                `    }\n` +
-                `});\n`
-
-            test(input,
-                {
-                    options: { compilerOptions: { module: ModuleKind.System, newLine: NewLineKind.LineFeed }, renamedDependencies: { "SomeName": "SomeOtherName" } },
-                    expectedOutput: output
-                });
-        });
-
-        it("Rename dependencies - AMD", () => {
-            let input =
-                `import {foo} from "SomeName";\n` +
-                `declare function use(a: any);\n` +
-                `use(foo);`
-            let output =
-                `define(["require", "exports", "SomeOtherName"], function (require, exports, SomeName_1) {\n` +
-                `    "use strict";\n` +
-                `    use(SomeName_1.foo);\n` +
-                `});\n`;
-
-            test(input,
-                {
-                    options: { compilerOptions: { module: ModuleKind.AMD, newLine: NewLineKind.LineFeed }, renamedDependencies: { "SomeName": "SomeOtherName" } },
-                    expectedOutput: output
-                });
-        });
-
-        it("Rename dependencies - UMD", () => {
-            let input =
-                `import {foo} from "SomeName";\n` +
-                `declare function use(a: any);\n` +
-                `use(foo);`
-            let output =
-                `(function (factory) {\n` +
-                `    if (typeof module === 'object' && typeof module.exports === 'object') {\n` +
-                `        var v = factory(require, exports); if (v !== undefined) module.exports = v;\n` +
-                `    }\n` +
-                `    else if (typeof define === 'function' && define.amd) {\n` +
-                `        define(["require", "exports", "SomeOtherName"], factory);\n` +
-                `    }\n` +
-                `})(function (require, exports) {\n` +
-                `    "use strict";\n` +
-                `    var SomeName_1 = require("SomeOtherName");\n` +
-                `    use(SomeName_1.foo);\n` +
-                `});\n`;
-
-            test(input,
-                {
-                    options: { compilerOptions: { module: ModuleKind.UMD, newLine: NewLineKind.LineFeed }, renamedDependencies: { "SomeName": "SomeOtherName" } },
-                    expectedOutput: output
-                });
-        });
-
-        it("Transpile with emit decorators and emit metadata", () => {
-            let input =
-                `import {db} from './db';\n` +
-                `function someDecorator(target) {\n` +
-                `    return target;\n` +
-                `} \n` +
-                `@someDecorator\n` +
-                `class MyClass {\n` +
-                `    db: db;\n` +
-                `    constructor(db: db) {\n` +
-                `        this.db = db;\n` +
-                `        this.db.doSomething(); \n` +
-                `    }\n` +
-                `}\n` +
-                `export {MyClass}; \n`
-            let output =
-                `"use strict";\n` +
-                `var db_1 = require(\'./db\');\n` +
-                `function someDecorator(target) {\n` +
-                `    return target;\n` +
-                `}\n` +
-                `var MyClass = (function () {\n` +
-                `    function MyClass(db) {\n` +
-                `        this.db = db;\n` +
-                `        this.db.doSomething();\n` +
-                `    }\n` +
-                `    return MyClass;\n` +
-                `}());\n` +
-                `MyClass = __decorate([\n` +
-                `    someDecorator, \n` +
-                `    __metadata(\'design:paramtypes\', [(typeof (_a = typeof db_1.db !== \'undefined\' && db_1.db) === \'function\' && _a) || Object])\n` +
-                `], MyClass);\n` +
-                `exports.MyClass = MyClass;\n` +
-                `var _a;\n`;
-
-            test(input,
-                {
-                    options: {
-                        compilerOptions: {
-                            module: ModuleKind.CommonJS,
-                            newLine: NewLineKind.LineFeed,
-                            noEmitHelpers: true,
-                            emitDecoratorMetadata: true,
-                            experimentalDecorators: true,
-                            target: ScriptTarget.ES5,
+                it("Correct errors for " + justName, () => {
+                    Harness.Baseline.runBaseline("Correct errors", justName.replace(/\.tsx?$/, ".errors.txt"), () => {
+                        if (transpileResult.diagnostics.length === 0) {
+                            return null;
                         }
-                    },
-                    expectedOutput: output
+
+                        return Harness.Compiler.getErrorBaseline(toBeCompiled, transpileResult.diagnostics);
+                    });
                 });
-        });
 
-        it("Supports backslashes in file name", () => {
-            test("var x", { expectedOutput: `"use strict";\r\nvar x;\r\n`, options: { fileName: "a\\b.ts" }});
-        });
+                if (canUseOldTranspile) {
+                    it("Correct errors (old transpile) for " + justName, () => {
+                        Harness.Baseline.runBaseline("Correct errors", justName.replace(/\.tsx?$/, ".oldTranspile.errors.txt"), () => {
+                            if (oldTranspileDiagnostics.length === 0) {
+                                return null;
+                            }
 
-        it("transpile file as 'tsx' if 'jsx' is specified", () => {
-            let input = `var x = <div/>`;
-            let output = `"use strict";\nvar x = React.createElement("div", null);\n`;
-            test(input, {
-                expectedOutput: output,
-                options: { compilerOptions: { jsx: JsxEmit.React, newLine: NewLineKind.LineFeed } }
-            })
-        });
-        it("transpile .js files", () => {
-            const input = "const a = 10;";
-            const output = `"use strict";\nvar a = 10;\n`;
-            test(input, {
-                expectedOutput: output,
-                options: { compilerOptions: { newLine: NewLineKind.LineFeed, module: ModuleKind.CommonJS }, fileName: "input.js", reportDiagnostics: true },
-                expectedDiagnosticCodes: []
+                            return Harness.Compiler.getErrorBaseline(toBeCompiled, oldTranspileDiagnostics);
+                        });
+                    });
+                }
+
+                it("Correct output for " + justName, () => {
+                    Harness.Baseline.runBaseline("Correct output", justName.replace(/\.tsx?$/, ".js"), () => {
+                        return transpileResult.outputText;
+                    });
+                });
+
+
+                if (canUseOldTranspile) {
+                    it("Correct output (old transpile) for " + justName, () => {
+                        Harness.Baseline.runBaseline("Correct output", justName.replace(/\.tsx?$/, ".oldTranspile.js"), () => {
+                            return oldTranspileResult;
+                        });
+                    });
+                }
             });
-        })
+        }
+
+        transpilesCorrectly("Generates no diagnostics with valid inputs", `var x = 0;`, {
+            options: { compilerOptions: { module: ModuleKind.CommonJS } }
+        });
+
+        transpilesCorrectly("Generates no diagnostics for missing file references", `/// <reference path="file2.ts" />
+var x = 0;`, {
+            options: { compilerOptions: { module: ModuleKind.CommonJS } }
+        });
+
+        transpilesCorrectly("Generates no diagnostics for missing module imports", `import {a} from "module2";`, {
+            options: { compilerOptions: { module: ModuleKind.CommonJS } }
+        });
+
+        transpilesCorrectly("Generates expected syntactic diagnostics", `a b`, {
+            options: { compilerOptions: { module: ModuleKind.CommonJS } }
+        });
+
+        transpilesCorrectly("Does not generate semantic diagnostics", `var x: string = 0;`, {
+            options: { compilerOptions: { module: ModuleKind.CommonJS } }
+        });
+
+        transpilesCorrectly("Generates module output", `var x = 0;`, {
+            options: { compilerOptions: { module: ModuleKind.AMD } }
+        });
+
+        transpilesCorrectly("Uses correct newLine character", `var x = 0;`, {
+            options: { compilerOptions: { module: ModuleKind.CommonJS, newLine: NewLineKind.LineFeed } }
+        });
+
+        transpilesCorrectly("Sets module name", "var x = 1;", {
+            options: { compilerOptions: { module: ModuleKind.System, newLine: NewLineKind.LineFeed }, moduleName: "NamedModule" }
+        });
+
+        transpilesCorrectly("No extra errors for file without extension", `"use strict";\r\nvar x = 0;`, {
+            options: { compilerOptions: { module: ModuleKind.CommonJS }, fileName: "file" }
+        });
+
+        transpilesCorrectly("Rename dependencies - System",
+            `import {foo} from "SomeName";\n` +
+            `declare function use(a: any);\n` +
+            `use(foo);`, {
+            options: { compilerOptions: { module: ModuleKind.System, newLine: NewLineKind.LineFeed }, renamedDependencies: { "SomeName": "SomeOtherName" } }
+        });
+
+        transpilesCorrectly("Rename dependencies - AMD",
+            `import {foo} from "SomeName";\n` +
+            `declare function use(a: any);\n` +
+            `use(foo);`, {
+            options: { compilerOptions: { module: ModuleKind.AMD, newLine: NewLineKind.LineFeed }, renamedDependencies: { "SomeName": "SomeOtherName" } }
+        });
+
+        transpilesCorrectly("Rename dependencies - UMD",
+            `import {foo} from "SomeName";\n` +
+            `declare function use(a: any);\n` +
+            `use(foo);`, {
+            options: { compilerOptions: { module: ModuleKind.UMD, newLine: NewLineKind.LineFeed }, renamedDependencies: { "SomeName": "SomeOtherName" } }
+        });
+
+        transpilesCorrectly("Transpile with emit decorators and emit metadata",
+            `import {db} from './db';\n` +
+            `function someDecorator(target) {\n` +
+            `    return target;\n` +
+            `} \n` +
+            `@someDecorator\n` +
+            `class MyClass {\n` +
+            `    db: db;\n` +
+            `    constructor(db: db) {\n` +
+            `        this.db = db;\n` +
+            `        this.db.doSomething(); \n` +
+            `    }\n` +
+            `}\n` +
+            `export {MyClass}; \n`, {
+            options: {
+                compilerOptions: {
+                    module: ModuleKind.CommonJS,
+                    newLine: NewLineKind.LineFeed,
+                    noEmitHelpers: true,
+                    emitDecoratorMetadata: true,
+                    experimentalDecorators: true,
+                    target: ScriptTarget.ES5,
+                }
+            }
+        });
+
+        transpilesCorrectly("Supports backslashes in file name", "var x", {
+            options: { fileName: "a\\b.ts" }
+        });
+
+        transpilesCorrectly("transpile file as 'tsx' if 'jsx' is specified", `var x = <div/>`, {
+            options: { compilerOptions: { jsx: JsxEmit.React, newLine: NewLineKind.LineFeed } }
+        });
+
+        transpilesCorrectly("transpile .js files", "const a = 10;", {
+            options: { compilerOptions: { newLine: NewLineKind.LineFeed, module: ModuleKind.CommonJS }, fileName: "input.js", reportDiagnostics: true }
+        });
     });
 }
diff --git a/tests/cases/unittests/tsconfigParsing.ts b/tests/cases/unittests/tsconfigParsing.ts
index 3603d22f314..29283acfe3c 100644
--- a/tests/cases/unittests/tsconfigParsing.ts
+++ b/tests/cases/unittests/tsconfigParsing.ts
@@ -13,6 +13,12 @@ namespace ts {
              assert.isTrue(undefined === parsed.config);
              assert.isTrue(undefined !== parsed.error);
         }
+        
+        function assertParseErrorWithExcludesKeyword(jsonText: string) {
+             let parsed = ts.parseConfigFileTextToJson("/apath/tsconfig.json", jsonText);
+             let parsedCommand = ts.parseJsonConfigFileContent(parsed, ts.sys, "tests/cases/unittests");
+             assert.isTrue(undefined !== parsedCommand.errors);
+        }
 
         it("returns empty config for file with only whitespaces", () => {
             assertParseResult("", { config : {} });
@@ -82,5 +88,37 @@ namespace ts {
         it("returns object with error when json is invalid", () => {
              assertParseError("invalid");
         });
+
+        it("returns object when users correctly specify library", () => {
+            assertParseResult(
+                `{
+                    "compilerOptions": {
+                        "lib": "es5"
+                    }
+                }`, {
+                    config: { compilerOptions: { lib: "es5" } }
+                });
+
+            assertParseResult(
+                `{
+                    "compilerOptions": {
+                        "lib": "es5,es6"
+                    }
+                }`, {
+                    config: { compilerOptions: { lib: "es5,es6" } }
+                });
+        });
+        
+        it("returns error when tsconfig have excludes", () => {
+            assertParseErrorWithExcludesKeyword(
+                `{
+                    "compilerOptions": {
+                        "lib": "es5"
+                    },
+                    "excludes": [
+                        "foge.ts"
+                    ]
+                }`);
+        });
     });
 }
diff --git a/tests/webTestServer.ts b/tests/webTestServer.ts
index dab552e2619..9eaddc3c638 100644
--- a/tests/webTestServer.ts
+++ b/tests/webTestServer.ts
@@ -48,6 +48,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(path: string, spec?: string, options?: any) {
     options = options || <{ recursive?: boolean; }>{};
@@ -94,28 +141,16 @@ function deleteFolderRecursive(path: 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
-        var parts = switchToForwardSlashes(path).split('/');
-        for (var i = 0; i < parts.length; i++) {
-            var 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 ///
 
 function handleResolutionRequest(filePath: string, res: http.ServerResponse) {    
-    var resolvedPath = path.resolve(filePath, '');
-    resolvedPath = resolvedPath.substring(resolvedPath.indexOf('tests'));
+    var resolvedPath = path.resolve(filePath);
     resolvedPath = switchToForwardSlashes(resolvedPath);
-    send('success', res, resolvedPath);
+    send('success', res, resolvedPath, 'text/javascript');
     return;
 }
 
@@ -174,6 +209,7 @@ function getRequestOperation(req: http.ServerRequest, filename: string) {
         else return RequestType.GetDir;
     }
     else {
+
         var queryData: any = url.parse(req.url, 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
@@ -223,7 +259,7 @@ function handleRequestOperation(req: http.ServerRequest, res: http.ServerRespons
             send('success', res, null);
             break;
         case RequestType.WriteDir:
-            fs.mkdirSync(reqPath);
+            ensureDirectoriesExist(reqPath);
             send('success', res, null);
             break;
         case RequestType.DeleteFile:
diff --git a/tslint.json b/tslint.json
index 2d2e42d4383..f789af46cea 100644
--- a/tslint.json
+++ b/tslint.json
@@ -13,7 +13,8 @@
         ],
         "no-var-keyword": true,
         "quotemark": [true,
-            "double"
+            "double",
+            "avoid-escape"
         ],
         "semicolon": true,
         "whitespace": [true,
@@ -37,7 +38,7 @@
         "no-internal-module": true,
         "no-trailing-whitespace": true,
         "no-inferrable-types": true,
-        "no-null": true,
+        "no-null-keyword": true,
         "no-unused-variable": true,
         "boolean-trivia": true,
         "type-operator-spacing": true,